From d401f3198a2b3675d602bfc2739c170efb78bee1 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Fri, 3 Dec 2021 09:49:42 +0100
Subject: [PATCH 0001/1963] fix(server) add cmake find file for python3 (#4815)

---
 tools/cmake/CMakeFindFrameworks.cmake         |  32 +
 .../cmake/FindPackageHandleStandardArgs.cmake | 386 ++++++++
 tools/cmake/FindPackageMessage.cmake          |  47 +
 tools/cmake/FindPython/Support.cmake          | 925 ++++++++++++++++++
 tools/cmake/FindPython3.cmake                 | 146 +++
 5 files changed, 1536 insertions(+)
 create mode 100644 tools/cmake/CMakeFindFrameworks.cmake
 create mode 100644 tools/cmake/FindPackageHandleStandardArgs.cmake
 create mode 100644 tools/cmake/FindPackageMessage.cmake
 create mode 100644 tools/cmake/FindPython/Support.cmake
 create mode 100644 tools/cmake/FindPython3.cmake

diff --git a/tools/cmake/CMakeFindFrameworks.cmake b/tools/cmake/CMakeFindFrameworks.cmake
new file mode 100644
index 00000000000..6c4c5272963
--- /dev/null
+++ b/tools/cmake/CMakeFindFrameworks.cmake
@@ -0,0 +1,32 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#.rst:
+# CMakeFindFrameworks
+# -------------------
+#
+# helper module to find OSX frameworks
+#
+# This module reads hints about search locations from variables::
+#
+#   CMAKE_FIND_FRAMEWORK_EXTRA_LOCATIONS - Extra directories
+
+if(NOT CMAKE_FIND_FRAMEWORKS_INCLUDED)
+  set(CMAKE_FIND_FRAMEWORKS_INCLUDED 1)
+  macro(CMAKE_FIND_FRAMEWORKS fwk)
+    set(${fwk}_FRAMEWORKS)
+    if(APPLE)
+      foreach(dir
+          ~/Library/Frameworks/${fwk}.framework
+          /usr/local/Frameworks/${fwk}.framework
+          /Library/Frameworks/${fwk}.framework
+          /System/Library/Frameworks/${fwk}.framework
+          /Network/Library/Frameworks/${fwk}.framework
+          ${CMAKE_FIND_FRAMEWORK_EXTRA_LOCATIONS})
+        if(EXISTS ${dir})
+          set(${fwk}_FRAMEWORKS ${${fwk}_FRAMEWORKS} ${dir})
+        endif()
+      endforeach()
+    endif()
+  endmacro()
+endif()
diff --git a/tools/cmake/FindPackageHandleStandardArgs.cmake b/tools/cmake/FindPackageHandleStandardArgs.cmake
new file mode 100644
index 00000000000..b3f25083a60
--- /dev/null
+++ b/tools/cmake/FindPackageHandleStandardArgs.cmake
@@ -0,0 +1,386 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindPackageHandleStandardArgs
+-----------------------------
+
+This module provides a function intended to be used in :ref:`Find Modules`
+implementing :command:`find_package(<PackageName>)` calls.  It handles the
+``REQUIRED``, ``QUIET`` and version-related arguments of ``find_package``.
+It also sets the ``<PackageName>_FOUND`` variable.  The package is
+considered found if all variables listed contain valid results, e.g.
+valid filepaths.
+
+.. command:: find_package_handle_standard_args
+
+  There are two signatures::
+
+    find_package_handle_standard_args(<PackageName>
+      (DEFAULT_MSG|<custom-failure-message>)
+      <required-var>...
+      )
+
+    find_package_handle_standard_args(<PackageName>
+      [FOUND_VAR <result-var>]
+      [REQUIRED_VARS <required-var>...]
+      [VERSION_VAR <version-var>]
+      [HANDLE_COMPONENTS]
+      [CONFIG_MODE]
+      [FAIL_MESSAGE <custom-failure-message>]
+      )
+
+  The ``<PackageName>_FOUND`` variable will be set to ``TRUE`` if all
+  the variables ``<required-var>...`` are valid and any optional
+  constraints are satisfied, and ``FALSE`` otherwise.  A success or
+  failure message may be displayed based on the results and on
+  whether the ``REQUIRED`` and/or ``QUIET`` option was given to
+  the :command:`find_package` call.
+
+  The options are:
+
+  ``(DEFAULT_MSG|<custom-failure-message>)``
+    In the simple signature this specifies the failure message.
+    Use ``DEFAULT_MSG`` to ask for a default message to be computed
+    (recommended).  Not valid in the full signature.
+
+  ``FOUND_VAR <result-var>``
+    Obsolete.  Specifies either ``<PackageName>_FOUND`` or
+    ``<PACKAGENAME>_FOUND`` as the result variable.  This exists only
+    for compatibility with older versions of CMake and is now ignored.
+    Result variables of both names are always set for compatibility.
+
+  ``REQUIRED_VARS <required-var>...``
+    Specify the variables which are required for this package.
+    These may be named in the generated failure message asking the
+    user to set the missing variable values.  Therefore these should
+    typically be cache entries such as ``FOO_LIBRARY`` and not output
+    variables like ``FOO_LIBRARIES``.
+
+  ``VERSION_VAR <version-var>``
+    Specify the name of a variable that holds the version of the package
+    that has been found.  This version will be checked against the
+    (potentially) specified required version given to the
+    :command:`find_package` call, including its ``EXACT`` option.
+    The default messages include information about the required
+    version and the version which has been actually found, both
+    if the version is ok or not.
+
+  ``HANDLE_COMPONENTS``
+    Enable handling of package components.  In this case, the command
+    will report which components have been found and which are missing,
+    and the ``<PackageName>_FOUND`` variable will be set to ``FALSE``
+    if any of the required components (i.e. not the ones listed after
+    the ``OPTIONAL_COMPONENTS`` option of :command:`find_package`) are
+    missing.
+
+  ``CONFIG_MODE``
+    Specify that the calling find module is a wrapper around a
+    call to ``find_package(<PackageName> NO_MODULE)``.  This implies
+    a ``VERSION_VAR`` value of ``<PackageName>_VERSION``.  The command
+    will automatically check whether the package configuration file
+    was found.
+
+  ``FAIL_MESSAGE <custom-failure-message>``
+    Specify a custom failure message instead of using the default
+    generated message.  Not recommended.
+
+Example for the simple signature:
+
+.. code-block:: cmake
+
+  find_package_handle_standard_args(LibXml2 DEFAULT_MSG
+    LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
+
+The ``LibXml2`` package is considered to be found if both
+``LIBXML2_LIBRARY`` and ``LIBXML2_INCLUDE_DIR`` are valid.
+Then also ``LibXml2_FOUND`` is set to ``TRUE``.  If it is not found
+and ``REQUIRED`` was used, it fails with a
+:command:`message(FATAL_ERROR)`, independent whether ``QUIET`` was
+used or not.  If it is found, success will be reported, including
+the content of the first ``<required-var>``.  On repeated CMake runs,
+the same message will not be printed again.
+
+Example for the full signature:
+
+.. code-block:: cmake
+
+  find_package_handle_standard_args(LibArchive
+    REQUIRED_VARS LibArchive_LIBRARY LibArchive_INCLUDE_DIR
+    VERSION_VAR LibArchive_VERSION)
+
+In this case, the ``LibArchive`` package is considered to be found if
+both ``LibArchive_LIBRARY`` and ``LibArchive_INCLUDE_DIR`` are valid.
+Also the version of ``LibArchive`` will be checked by using the version
+contained in ``LibArchive_VERSION``.  Since no ``FAIL_MESSAGE`` is given,
+the default messages will be printed.
+
+Another example for the full signature:
+
+.. code-block:: cmake
+
+  find_package(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
+  find_package_handle_standard_args(Automoc4  CONFIG_MODE)
+
+In this case, a ``FindAutmoc4.cmake`` module wraps a call to
+``find_package(Automoc4 NO_MODULE)`` and adds an additional search
+directory for ``automoc4``.  Then the call to
+``find_package_handle_standard_args`` produces a proper success/failure
+message.
+#]=======================================================================]
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
+
+# internal helper macro
+macro(_FPHSA_FAILURE_MESSAGE _msg)
+  if (${_NAME}_FIND_REQUIRED)
+    message(FATAL_ERROR "${_msg}")
+  else ()
+    if (NOT ${_NAME}_FIND_QUIETLY)
+      message(STATUS "${_msg}")
+    endif ()
+  endif ()
+endmacro()
+
+
+# internal helper macro to generate the failure message when used in CONFIG_MODE:
+macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
+  # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
+  if(${_NAME}_CONFIG)
+    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing:${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
+  else()
+    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
+    # List them all in the error message:
+    if(${_NAME}_CONSIDERED_CONFIGS)
+      set(configsText "")
+      list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
+      math(EXPR configsCount "${configsCount} - 1")
+      foreach(currentConfigIndex RANGE ${configsCount})
+        list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
+        list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
+        string(APPEND configsText "    ${filename} (version ${version})\n")
+      endforeach()
+      if (${_NAME}_NOT_FOUND_MESSAGE)
+        string(APPEND configsText "    Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n")
+      endif()
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
+
+    else()
+      # Simple case: No Config-file was found at all:
+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
+    endif()
+  endif()
+endmacro()
+
+
+function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
+
+  # Set up the arguments for `cmake_parse_arguments`.
+  set(options  CONFIG_MODE  HANDLE_COMPONENTS)
+  set(oneValueArgs  FAIL_MESSAGE  VERSION_VAR  FOUND_VAR)
+  set(multiValueArgs REQUIRED_VARS)
+
+  # Check whether we are in 'simple' or 'extended' mode:
+  set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
+  list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
+
+  if(${INDEX} EQUAL -1)
+    set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
+    set(FPHSA_REQUIRED_VARS ${ARGN})
+    set(FPHSA_VERSION_VAR)
+  else()
+    cmake_parse_arguments(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
+
+    if(FPHSA_UNPARSED_ARGUMENTS)
+      message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
+    endif()
+
+    if(NOT FPHSA_FAIL_MESSAGE)
+      set(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
+    endif()
+
+    # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
+    # when it successfully found the config-file, including version checking:
+    if(FPHSA_CONFIG_MODE)
+      list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
+      list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
+      set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
+    endif()
+
+    if(NOT FPHSA_REQUIRED_VARS)
+      message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
+    endif()
+  endif()
+
+  # now that we collected all arguments, process them
+
+  if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
+    set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  endif()
+
+  list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
+
+  string(TOUPPER ${_NAME} _NAME_UPPER)
+  string(TOLOWER ${_NAME} _NAME_LOWER)
+
+  if(FPHSA_FOUND_VAR)
+    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
+      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
+    else()
+      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
+    endif()
+  else()
+    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
+  endif()
+
+  # collect all variables which were not found, so they can be printed, so the
+  # user knows better what went wrong (#6375)
+  set(MISSING_VARS "")
+  set(DETAILS "")
+  # check if all passed variables are valid
+  set(FPHSA_FOUND_${_NAME} TRUE)
+  foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
+    if(NOT ${_CURRENT_VAR})
+      set(FPHSA_FOUND_${_NAME} FALSE)
+      string(APPEND MISSING_VARS " ${_CURRENT_VAR}")
+    else()
+      string(APPEND DETAILS "[${${_CURRENT_VAR}}]")
+    endif()
+  endforeach()
+  if(FPHSA_FOUND_${_NAME})
+    set(${_NAME}_FOUND TRUE)
+    set(${_NAME_UPPER}_FOUND TRUE)
+  else()
+    set(${_NAME}_FOUND FALSE)
+    set(${_NAME_UPPER}_FOUND FALSE)
+  endif()
+
+  # component handling
+  unset(FOUND_COMPONENTS_MSG)
+  unset(MISSING_COMPONENTS_MSG)
+
+  if(FPHSA_HANDLE_COMPONENTS)
+    foreach(comp ${${_NAME}_FIND_COMPONENTS})
+      if(${_NAME}_${comp}_FOUND)
+
+        if(NOT DEFINED FOUND_COMPONENTS_MSG)
+          set(FOUND_COMPONENTS_MSG "found components: ")
+        endif()
+        string(APPEND FOUND_COMPONENTS_MSG " ${comp}")
+
+      else()
+
+        if(NOT DEFINED MISSING_COMPONENTS_MSG)
+          set(MISSING_COMPONENTS_MSG "missing components: ")
+        endif()
+        string(APPEND MISSING_COMPONENTS_MSG " ${comp}")
+
+        if(${_NAME}_FIND_REQUIRED_${comp})
+          set(${_NAME}_FOUND FALSE)
+          string(APPEND MISSING_VARS " ${comp}")
+        endif()
+
+      endif()
+    endforeach()
+    set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
+    string(APPEND DETAILS "[c${COMPONENT_MSG}]")
+  endif()
+
+  # version handling:
+  set(VERSION_MSG "")
+  set(VERSION_OK TRUE)
+
+  # check with DEFINED here as the requested or found version may be "0"
+  if (DEFINED ${_NAME}_FIND_VERSION)
+    if(DEFINED ${FPHSA_VERSION_VAR})
+      set(_FOUND_VERSION ${${FPHSA_VERSION_VAR}})
+
+      if(${_NAME}_FIND_VERSION_EXACT)       # exact version required
+        # count the dots in the version string
+        string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${_FOUND_VERSION}")
+        # add one dot because there is one dot more than there are components
+        string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS)
+        if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT)
+          # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT
+          # is at most 4 here. Therefore a simple lookup table is used.
+          if (${_NAME}_FIND_VERSION_COUNT EQUAL 1)
+            set(_VERSION_REGEX "[^.]*")
+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2)
+            set(_VERSION_REGEX "[^.]*\\.[^.]*")
+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3)
+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*")
+          else ()
+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*")
+          endif ()
+          string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${_FOUND_VERSION}")
+          unset(_VERSION_REGEX)
+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD)
+            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+            set(VERSION_OK FALSE)
+          else ()
+            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
+          endif ()
+          unset(_VERSION_HEAD)
+        else ()
+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _FOUND_VERSION)
+            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
+            set(VERSION_OK FALSE)
+          else ()
+            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
+          endif ()
+        endif ()
+        unset(_VERSION_DOTS)
+
+      else()     # minimum version specified:
+        if (${_NAME}_FIND_VERSION VERSION_GREATER _FOUND_VERSION)
+          set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
+          set(VERSION_OK FALSE)
+        else ()
+          set(VERSION_MSG "(found suitable version \"${_FOUND_VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
+        endif ()
+      endif()
+
+    else()
+
+      # if the package was not found, but a version was given, add that to the output:
+      if(${_NAME}_FIND_VERSION_EXACT)
+        set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
+      else()
+        set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
+      endif()
+
+    endif()
+  else ()
+    # Check with DEFINED as the found version may be 0.
+    if(DEFINED ${FPHSA_VERSION_VAR})
+      set(VERSION_MSG "(found version \"${${FPHSA_VERSION_VAR}}\")")
+    endif()
+  endif ()
+
+  if(VERSION_OK)
+    string(APPEND DETAILS "[v${${FPHSA_VERSION_VAR}}(${${_NAME}_FIND_VERSION})]")
+  else()
+    set(${_NAME}_FOUND FALSE)
+  endif()
+
+
+  # print the result:
+  if (${_NAME}_FOUND)
+    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
+  else ()
+
+    if(FPHSA_CONFIG_MODE)
+      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
+    else()
+      if(NOT VERSION_OK)
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
+      else()
+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing:${MISSING_VARS}) ${VERSION_MSG}")
+      endif()
+    endif()
+
+  endif ()
+
+  set(${_NAME}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
+  set(${_NAME_UPPER}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
+endfunction()
\ No newline at end of file
diff --git a/tools/cmake/FindPackageMessage.cmake b/tools/cmake/FindPackageMessage.cmake
new file mode 100644
index 00000000000..947dca9e7e9
--- /dev/null
+++ b/tools/cmake/FindPackageMessage.cmake
@@ -0,0 +1,47 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#.rst:
+# FindPackageMessage
+# ------------------
+#
+#
+#
+# FIND_PACKAGE_MESSAGE(<name> "message for user" "find result details")
+#
+# This macro is intended to be used in FindXXX.cmake modules files.  It
+# will print a message once for each unique find result.  This is useful
+# for telling the user where a package was found.  The first argument
+# specifies the name (XXX) of the package.  The second argument
+# specifies the message to display.  The third argument lists details
+# about the find result so that if they change the message will be
+# displayed again.  The macro also obeys the QUIET argument to the
+# find_package command.
+#
+# Example:
+#
+# ::
+#
+#   if(X11_FOUND)
+#     FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}"
+#       "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
+#   else()
+#    ...
+#   endif()
+
+function(FIND_PACKAGE_MESSAGE pkg msg details)
+  # Avoid printing a message repeatedly for the same find result.
+  if(NOT ${pkg}_FIND_QUIETLY)
+    string(REPLACE "\n" "" details "${details}")
+    set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
+    if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
+      # The message has not yet been printed.
+      message(STATUS "${msg}")
+
+      # Save the find details in the cache to avoid printing the same
+      # message again.
+      set("${DETAILS_VAR}" "${details}"
+              CACHE INTERNAL "Details about finding ${pkg}")
+    endif()
+  endif()
+endfunction()
\ No newline at end of file
diff --git a/tools/cmake/FindPython/Support.cmake b/tools/cmake/FindPython/Support.cmake
new file mode 100644
index 00000000000..a73edac70c6
--- /dev/null
+++ b/tools/cmake/FindPython/Support.cmake
@@ -0,0 +1,925 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#
+# This file is a "template" file used by various FindPython modules.
+#
+
+cmake_policy (VERSION 3.7)
+
+#
+# Initial configuration
+#
+if (NOT DEFINED _PYTHON_PREFIX)
+  message (FATAL_ERROR "FindPython: INTERNAL ERROR")
+endif()
+if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
+  message (FATAL_ERROR "FindPython: INTERNAL ERROR")
+endif()
+if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
+  set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
+  set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+else()
+  message (FATAL_ERROR "FindPython: INTERNAL ERROR")
+endif()
+
+
+#
+# helper commands
+#
+macro (_PYTHON_DISPLAY_FAILURE _PYTHON_MSG)
+  if (${_PYTHON_PREFIX}_FIND_REQUIRED)
+    message (FATAL_ERROR "${_PYTHON_MSG}")
+  else()
+    if (NOT ${_PYTHON_PREFIX}_FIND_QUIETLY)
+      message(STATUS "${_PYTHON_MSG}")
+    endif ()
+  endif()
+
+  set (${_PYTHON_PREFIX}_FOUND FALSE)
+  string (TOUPPER "${_PYTHON_PREFIX}" _${_PYTHON_PREFIX}_UPPER_PREFIX)
+  set (${_PYTHON_UPPER_PREFIX}_FOUND FALSE)
+  return()
+endmacro()
+
+
+function (_PYTHON_GET_FRAMEWORKS _PYTHON_PGF_FRAMEWORK_PATHS _PYTHON_VERSION)
+  set (_PYTHON_FRAMEWORK_PATHS)
+  foreach (_PYTHON_FRAMEWORK IN LISTS Python_FRAMEWORKS)
+    list (APPEND _PYTHON_FRAMEWORK_PATHS
+            "${_PYTHON_FRAMEWORK}/Versions/${_PYTHON_VERSION}")
+  endforeach()
+  set (${_PYTHON_PGF_FRAMEWORK_PATHS} ${_PYTHON_FRAMEWORK_PATHS} PARENT_SCOPE)
+endfunction()
+
+
+function (_PYTHON_VALIDATE_INTERPRETER)
+  if (NOT ${_PYTHON_PREFIX}_EXECUTABLE)
+    return()
+  endif()
+
+  if (${_PYTHON_PREFIX}_EXECUTABLE MATCHES "python${CMAKE_EXECUTABLE_SUFFIX}$")
+    # executable found do not have version in name
+    # ensure major version is OK
+    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
+            "import sys; sys.stdout.write(str(sys.version_info[0]))"
+            RESULT_VARIABLE result
+            OUTPUT_VARIABLE version
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (result OR NOT version EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
+      # interpreter not usable or has wrong major version
+      set (${_PYTHON_PREFIX}_EXECUTABLE ${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND CACHE INTERNAL "" FORCE)
+      return()
+    endif()
+  endif()
+
+  if (CMAKE_SIZEOF_VOID_P AND "Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+          AND NOT CMAKE_CROSSCOMPILING)
+    # In this case, interpreter must have same architecture as environment
+    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
+            "import sys, struct; sys.stdout.write(str(struct.calcsize(\"P\")))"
+            RESULT_VARIABLE result
+            OUTPUT_VARIABLE size
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (result OR NOT size EQUAL CMAKE_SIZEOF_VOID_P)
+      # interpreter not usable or has wrong architecture
+      set (${_PYTHON_PREFIX}_EXECUTABLE ${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND CACHE INTERNAL "" FORCE)
+      return()
+    endif()
+  endif()
+endfunction()
+
+
+function (_PYTHON_FIND_RUNTIME_LIBRARY _PYTHON_LIB)
+  string (REPLACE "_RUNTIME" "" _PYTHON_LIB "${_PYTHON_LIB}")
+  # look at runtime part on systems supporting it
+  if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR
+  (CMAKE_SYSTEM_NAME MATCHES "MSYS|CYGWIN"
+          AND ${_PYTHON_LIB} MATCHES "${CMAKE_IMPORT_LIBRARY_SUFFIX}$"))
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
+    # MSYS has a special syntax for runtime libraries
+    if (CMAKE_SYSTEM_NAME MATCHES "MSYS")
+      list (APPEND CMAKE_FIND_LIBRARY_PREFIXES "msys-")
+    endif()
+    find_library (${ARGV})
+  endif()
+endfunction()
+
+
+function (_PYTHON_SET_LIBRARY_DIRS _PYTHON_SLD_RESULT)
+  unset (_PYTHON_DIRS)
+  set (_PYTHON_LIBS ${ARGV})
+  list (REMOVE_AT _PYTHON_LIBS 0)
+  foreach (_PYTHON_LIB IN LISTS _PYTHON_LIBS)
+    if (${_PYTHON_LIB})
+      get_filename_component (_PYTHON_DIR "${${_PYTHON_LIB}}" DIRECTORY)
+      list (APPEND _PYTHON_DIRS "${_PYTHON_DIR}")
+    endif()
+  endforeach()
+  if (_PYTHON_DIRS)
+    list (REMOVE_DUPLICATES _PYTHON_DIRS)
+  endif()
+  set (${_PYTHON_SLD_RESULT} ${_PYTHON_DIRS} PARENT_SCOPE)
+endfunction()
+
+
+# If major version is specified, it must be the same as internal major version
+if (DEFINED ${_PYTHON_PREFIX}_FIND_VERSION_MAJOR
+        AND NOT ${_PYTHON_PREFIX}_FIND_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
+  _python_display_failure ("Could NOT find ${_PYTHON_PREFIX}: Wrong major version specified is \"${${_PYTHON_PREFIX}_FIND_VERSION_MAJOR}\", but expected major version is \"${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}\"")
+endif()
+
+
+# handle components
+if (NOT ${_PYTHON_PREFIX}_FIND_COMPONENTS)
+  set (${_PYTHON_PREFIX}_FIND_COMPONENTS Interpreter)
+  set (${_PYTHON_PREFIX}_FIND_REQUIRED_Interpreter TRUE)
+endif()
+foreach (_${_PYTHON_PREFIX}_COMPONENT IN LISTS ${_PYTHON_PREFIX}_FIND_COMPONENTS)
+  set (${_PYTHON_PREFIX}_${_${_PYTHON_PREFIX}_COMPONENT}_FOUND FALSE)
+endforeach()
+unset (_${_PYTHON_PREFIX}_FIND_VERSIONS)
+
+# Set versions to search
+## default: search any version
+set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${_${_PYTHON_PREFIX}_VERSIONS})
+
+if (${_PYTHON_PREFIX}_FIND_VERSION_COUNT GREATER 1)
+  if (${_PYTHON_PREFIX}_FIND_VERSION_EXACT)
+    set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_FIND_VERSION_MAJOR}.${${_PYTHON_PREFIX}_FIND_VERSION_MINOR})
+  else()
+    unset (_${_PYTHON_PREFIX}_FIND_VERSIONS)
+    # add all compatible versions
+    foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_VERSIONS)
+      if (_${_PYTHON_PREFIX}_VERSION VERSION_GREATER_EQUAL ${_PYTHON_PREFIX}_FIND_VERSION)
+        list (APPEND _${_PYTHON_PREFIX}_FIND_VERSIONS ${_${_PYTHON_PREFIX}_VERSION})
+      endif()
+    endforeach()
+  endif()
+endif()
+
+# Anaconda distribution: define which architectures can be used
+if (CMAKE_SIZEOF_VOID_P)
+  # In this case, search only for 64bit or 32bit
+  math (EXPR _${_PYTHON_PREFIX}_ARCH "${CMAKE_SIZEOF_VOID_P} * 8")
+  set (_${_PYTHON_PREFIX}_ARCH2 ${_${_PYTHON_PREFIX}_ARCH})
+else()
+  # architecture unknown, search for both 64bit and 32bit
+  set (_${_PYTHON_PREFIX}_ARCH 64)
+  set (_${_PYTHON_PREFIX}_ARCH2 32)
+endif()
+
+# IronPython support
+if (CMAKE_SIZEOF_VOID_P)
+  # In this case, search only for 64bit or 32bit
+  math (EXPR _${_PYTHON_PREFIX}_ARCH "${CMAKE_SIZEOF_VOID_P} * 8")
+  set (_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES ipy${_${_PYTHON_PREFIX}_ARCH} ipy)
+else()
+  # architecture unknown, search for natural interpreter
+  set (_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES ipy)
+endif()
+
+# Apple frameworks handling
+include (${CMAKE_CURRENT_LIST_DIR}/../CMakeFindFrameworks.cmake)
+cmake_find_frameworks (Python)
+
+# Save CMAKE_FIND_FRAMEWORK
+if (DEFINED CMAKE_FIND_FRAMEWORK)
+  set (_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
+else()
+  unset (_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK)
+endif()
+# To avoid picking up the system elements pre-maturely.
+set (CMAKE_FIND_FRAMEWORK LAST)
+
+
+unset (_${_PYTHON_PREFIX}_REQUIRED_VARS)
+unset (_${_PYTHON_PREFIX}_CACHED_VARS)
+
+
+# first step, search for the interpreter
+if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
+  if (${_PYTHON_PREFIX}_FIND_REQUIRED_Interpreter)
+    list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_EXECUTABLE)
+    list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_EXECUTABLE)
+  endif()
+
+  set (_${_PYTHON_PREFIX}_HINTS "${${_PYTHON_PREFIX}_ROOT_DIR}" ENV ${_PYTHON_PREFIX}_ROOT_DIR)
+
+  # look-up for various versions and locations
+  foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
+    string (REPLACE "." "" _${_PYTHON_PREFIX}_VERSION_NO_DOTS ${_${_PYTHON_PREFIX}_VERSION})
+
+    _python_get_frameworks (_${_PYTHON_PREFIX}_FRAMEWORK_PATHS ${_${_PYTHON_PREFIX}_VERSION})
+
+    # try using HINTS
+    find_program (${_PYTHON_PREFIX}_EXECUTABLE
+            NAMES python${_${_PYTHON_PREFIX}_VERSION}
+            NAMES_PER_DIR
+            HINTS ${_${_PYTHON_PREFIX}_HINTS}
+            PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
+            PATH_SUFFIXES bin
+            NO_SYSTEM_ENVIRONMENT_PATH
+            NO_CMAKE_SYSTEM_PATH)
+    # try using registry
+    if (WIN32)
+      find_program (${_PYTHON_PREFIX}_EXECUTABLE
+              NAMES python${_${_PYTHON_PREFIX}_VERSION} python
+              ${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
+              NAMES_PER_DIR
+              HINTS ${_${_PYTHON_PREFIX}_HINTS}
+              PATHS [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+              [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+              [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH2}\\InstallPath]
+              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH2}\\InstallPath]
+              [HKEY_LOCAL_MACHINE\\SOFTWARE\\IronPython\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+              PATH_SUFFIXES bin
+              NO_SYSTEM_ENVIRONMENT_PATH
+              NO_CMAKE_SYSTEM_PATH)
+    endif()
+    # try in standard paths
+    find_program (${_PYTHON_PREFIX}_EXECUTABLE
+            NAMES python${_${_PYTHON_PREFIX}_VERSION})
+
+    _python_validate_interpreter ()
+    if (${_PYTHON_PREFIX}_EXECUTABLE)
+      break()
+    endif()
+  endforeach()
+
+  # try more generic names
+  if (NOT ${_PYTHON_PREFIX}_EXECUTABLE)
+    find_program (${_PYTHON_PREFIX}_EXECUTABLE
+            NAMES python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR} python
+            ${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
+            HINTS ${_${_PYTHON_PREFIX}_HINTS}
+            PATH_SUFFIXES bin)
+
+    _python_validate_interpreter ()
+  endif()
+
+  # retrieve exact version of executable found
+  if (${_PYTHON_PREFIX}_EXECUTABLE)
+    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
+            "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:3]]))"
+            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+            OUTPUT_VARIABLE ${_PYTHON_PREFIX}_VERSION
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (NOT _${_PYTHON_PREFIX}_RESULT)
+      string (REGEX MATCHALL "[0-9]+" _${_PYTHON_PREFIX}_VERSIONS "${${_PYTHON_PREFIX}_VERSION}")
+      list (GET _${_PYTHON_PREFIX}_VERSIONS 0 ${_PYTHON_PREFIX}_VERSION_MAJOR)
+      list (GET _${_PYTHON_PREFIX}_VERSIONS 1 ${_PYTHON_PREFIX}_VERSION_MINOR)
+      list (GET _${_PYTHON_PREFIX}_VERSIONS 2 ${_PYTHON_PREFIX}_VERSION_PATCH)
+    else()
+      # Interpreter is not usable
+      set (${_PYTHON_PREFIX}_EXECUTABLE ${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND CACHE INTERNAL "" FORCE)
+      unset (${_PYTHON_PREFIX}_VERSION)
+    endif()
+  endif()
+
+  if (${_PYTHON_PREFIX}_EXECUTABLE
+          AND ${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
+    set (${_PYTHON_PREFIX}_Interpreter_FOUND TRUE)
+    # Use interpreter version for future searches to ensure consistency
+    set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
+  endif()
+
+  if (${_PYTHON_PREFIX}_Interpreter_FOUND)
+    # retrieve interpreter identity
+    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -V
+            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+            OUTPUT_VARIABLE ${_PYTHON_PREFIX}_INTERPRETER_ID
+            ERROR_VARIABLE ${_PYTHON_PREFIX}_INTERPRETER_ID)
+    if (NOT _${_PYTHON_PREFIX}_RESULT)
+      if (${_PYTHON_PREFIX}_INTERPRETER_ID MATCHES "Anaconda")
+        set (${_PYTHON_PREFIX}_INTERPRETER_ID "Anaconda")
+      elseif (${_PYTHON_PREFIX}_INTERPRETER_ID MATCHES "Enthought")
+        set (${_PYTHON_PREFIX}_INTERPRETER_ID "Canopy")
+      else()
+        string (REGEX REPLACE "^([^ ]+).*" "\\1" ${_PYTHON_PREFIX}_INTERPRETER_ID "${${_PYTHON_PREFIX}_INTERPRETER_ID}")
+        if (${_PYTHON_PREFIX}_INTERPRETER_ID STREQUAL "Python")
+          # try to get a more precise ID
+          execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c "import sys; print(sys.copyright)"
+                  RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+                  OUTPUT_VARIABLE ${_PYTHON_PREFIX}_COPYRIGHT
+                  ERROR_QUIET)
+          if (${_PYTHON_PREFIX}_COPYRIGHT MATCHES "ActiveState")
+            set (${_PYTHON_PREFIX}_INTERPRETER_ID "ActivePython")
+          endif()
+        endif()
+      endif()
+    else()
+      set (${_PYTHON_PREFIX}_INTERPRETER_ID Python)
+    endif()
+  else()
+    unset (${_PYTHON_PREFIX}_INTERPRETER_ID)
+  endif()
+
+  # retrieve various package installation directories
+  execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c "import sys; from distutils import sysconfig;sys.stdout.write(';'.join([sysconfig.get_python_lib(plat_specific=False,standard_lib=True),sysconfig.get_python_lib(plat_specific=True,standard_lib=True),sysconfig.get_python_lib(plat_specific=False,standard_lib=False),sysconfig.get_python_lib(plat_specific=True,standard_lib=False)]))"
+
+          RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+          OUTPUT_VARIABLE _${_PYTHON_PREFIX}_LIBPATHS
+          ERROR_QUIET)
+  if (NOT _${_PYTHON_PREFIX}_RESULT)
+    list (GET _${_PYTHON_PREFIX}_LIBPATHS 0 ${_PYTHON_PREFIX}_STDLIB)
+    list (GET _${_PYTHON_PREFIX}_LIBPATHS 1 ${_PYTHON_PREFIX}_STDARCH)
+    list (GET _${_PYTHON_PREFIX}_LIBPATHS 2 ${_PYTHON_PREFIX}_SITELIB)
+    list (GET _${_PYTHON_PREFIX}_LIBPATHS 3 ${_PYTHON_PREFIX}_SITEARCH)
+  else()
+    unset (${_PYTHON_PREFIX}_STDLIB)
+    unset (${_PYTHON_PREFIX}_STDARCH)
+    unset (${_PYTHON_PREFIX}_SITELIB)
+    unset (${_PYTHON_PREFIX}_SITEARCH)
+  endif()
+
+  mark_as_advanced (${_PYTHON_PREFIX}_EXECUTABLE)
+endif()
+
+
+# second step, search for compiler (IronPython)
+if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
+  if (${_PYTHON_PREFIX}_FIND_REQUIRED_Compiler)
+    list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_COMPILER)
+    list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_COMPILER)
+  endif()
+
+  # IronPython specific artifacts
+  # If IronPython interpreter is found, use its path
+  unset (_${_PYTHON_PREFIX}_IRON_ROOT)
+  if (${_PYTHON_PREFIX}_Interpreter_FOUND AND ${_PYTHON_PREFIX}_INTERPRETER_ID STREQUAL "IronPython")
+    get_filename_component (_${_PYTHON_PREFIX}_IRON_ROOT "${${_PYTHON_PREFIX}_EXECUTABLE}" DIRECTORY)
+  endif()
+
+  # try using root dir and registry
+  foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
+    find_program (${_PYTHON_PREFIX}_COMPILER
+            NAMES ipyc
+            HINTS ${_${_PYTHON_PREFIX}_IRON_ROOT} ${_${_PYTHON_PREFIX}_HINTS}
+            PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\IronPython\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+            NO_SYSTEM_ENVIRONMENT_PATH
+            NO_CMAKE_SYSTEM_PATH)
+    if (${_PYTHON_PREFIX}_COMPILER)
+      break()
+    endif()
+  endforeach()
+  # try in standard paths
+  find_program (${_PYTHON_PREFIX}_COMPILER
+          NAMES ipyc)
+
+  if (${_PYTHON_PREFIX}_COMPILER)
+    # retrieve python environment version from compiler
+    set (_${_PYTHON_PREFIX}_VERSION_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PythonCompilerVersion.dir")
+    file (WRITE "${_${_PYTHON_PREFIX}_VERSION_DIR}/version.py" "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:3]]))\n")
+    execute_process (COMMAND "${${_PYTHON_PREFIX}_COMPILER}" /target:exe /embed "${_${_PYTHON_PREFIX}_VERSION_DIR}/version.py"
+            WORKING_DIRECTORY "${_${_PYTHON_PREFIX}_VERSION_DIR}"
+            OUTPUT_QUIET
+            ERROR_QUIET)
+    execute_process (COMMAND "${_${_PYTHON_PREFIX}_VERSION_DIR}/version"
+            WORKING_DIRECTORY "${_${_PYTHON_PREFIX}_VERSION_DIR}"
+            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_VERSION
+            ERROR_QUIET)
+    if (NOT _${_PYTHON_PREFIX}_RESULT)
+      string (REGEX MATCHALL "[0-9]+" _${_PYTHON_PREFIX}_VERSIONS "${_${_PYTHON_PREFIX}_VERSION}")
+      list (GET _${_PYTHON_PREFIX}_VERSIONS 0 _${_PYTHON_PREFIX}_VERSION_MAJOR)
+      list (GET _${_PYTHON_PREFIX}_VERSIONS 1 _${_PYTHON_PREFIX}_VERSION_MINOR)
+      list (GET _${_PYTHON_PREFIX}_VERSIONS 2 _${_PYTHON_PREFIX}_VERSION_PATCH)
+
+      if (NOT ${_PYTHON_PREFIX}_Interpreter_FOUND)
+        # set public version information
+        set (${_PYTHON_PREFIX}_VERSION ${_${_PYTHON_PREFIX}_VERSION})
+        set (${_PYTHON_PREFIX}_VERSION_MAJOR ${_${_PYTHON_PREFIX}_VERSION_MAJOR})
+        set (${_PYTHON_PREFIX}_VERSION_MINOR ${_${_PYTHON_PREFIX}_VERSION_MINOR})
+        set (${_PYTHON_PREFIX}_VERSION_PATCH ${_${_PYTHON_PREFIX}_VERSION_PATCH})
+      endif()
+    else()
+      # compiler not usable
+      set (${_PYTHON_PREFIX}_COMPILER ${_PYTHON_PREFIX}_COMPILER-NOTFOUND CACHE INTERNAL "" FORCE)
+    endif()
+    file (REMOVE_RECURSE "${_${_PYTHON_PREFIX}_VERSION_DIR}")
+  endif()
+
+  if (${_PYTHON_PREFIX}_COMPILER)
+    if (${_PYTHON_PREFIX}_Interpreter_FOUND)
+      # Compiler must be compatible with interpreter
+      if (${_${_PYTHON_PREFIX}_VERSION_MAJOR}.${_${_PYTHON_PREFIX}_VERSION_MINOR} VERSION_EQUAL ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
+        set (${_PYTHON_PREFIX}_Compiler_FOUND TRUE)
+      endif()
+    elseif (${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
+      set (${_PYTHON_PREFIX}_Compiler_FOUND TRUE)
+      # Use compiler version for future searches to ensure consistency
+      set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
+    endif()
+  endif()
+
+  if (${_PYTHON_PREFIX}_Compiler_FOUND)
+    set (${_PYTHON_PREFIX}_COMPILER_ID IronPython)
+  else()
+    unset (${_PYTHON_PREFIX}_COMPILER_ID)
+  endif()
+
+  mark_as_advanced (${_PYTHON_PREFIX}_COMPILER)
+endif()
+
+
+# third step, search for the development artifacts
+## Development environment is not compatible with IronPython interpreter
+if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+        AND NOT ${_PYTHON_PREFIX}_INTERPRETER_ID STREQUAL "IronPython")
+  if (${_PYTHON_PREFIX}_FIND_REQUIRED_Development)
+    list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_LIBRARY
+            ${_PYTHON_PREFIX}_INCLUDE_DIR)
+    list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_LIBRARY
+            ${_PYTHON_PREFIX}_LIBRARY_RELEASE
+            ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
+            ${_PYTHON_PREFIX}_LIBRARY_DEBUG
+            ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG
+            ${_PYTHON_PREFIX}_INCLUDE_DIR)
+  endif()
+
+  # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
+  unset (_${_PYTHON_PREFIX}_CMAKE_FIND_LIBRARY_SUFFIXES)
+  if (DEFINED ${_PYTHON_PREFIX}_USE_STATIC_LIBS AND NOT WIN32)
+    set(_${_PYTHON_PREFIX}_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+    if(${_PYTHON_PREFIX}_USE_STATIC_LIBS)
+      set (CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
+    else()
+      list (REMOVE_ITEM CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
+    endif()
+  else()
+  endif()
+
+  # if python interpreter is found, use its location and version to ensure consistency
+  # between interpreter and development environment
+  unset (_${_PYTHON_PREFIX}_PREFIX)
+  if (${_PYTHON_PREFIX}_Interpreter_FOUND)
+    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
+            "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.PREFIX)"
+            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_PREFIX
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (_${_PYTHON_PREFIX}_RESULT)
+      unset (_${_PYTHON_PREFIX}_PREFIX)
+    endif()
+  endif()
+  set (_${_PYTHON_PREFIX}_HINTS "${_${_PYTHON_PREFIX}_PREFIX}" "${${_PYTHON_PREFIX}_ROOT_DIR}" ENV ${_PYTHON_PREFIX}_ROOT_DIR)
+
+  foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
+    string (REPLACE "." "" _${_PYTHON_PREFIX}_VERSION_NO_DOTS ${_${_PYTHON_PREFIX}_VERSION})
+
+    # try to use pythonX.Y-config tool
+    set (_${_PYTHON_PREFIX}_CONFIG_NAMES)
+    if (DEFINED CMAKE_LIBRARY_ARCHITECTURE)
+      set (_${_PYTHON_PREFIX}_CONFIG_NAMES "${CMAKE_LIBRARY_ARCHITECTURE}-python${_${_PYTHON_PREFIX}_VERSION}-config")
+    endif()
+    list (APPEND _${_PYTHON_PREFIX}_CONFIG_NAMES "python${_${_PYTHON_PREFIX}_VERSION}-config")
+    find_program (_${_PYTHON_PREFIX}_CONFIG
+            NAMES ${_${_PYTHON_PREFIX}_CONFIG_NAMES}
+            HINTS ${_${_PYTHON_PREFIX}_HINTS}
+            PATH_SUFFIXES bin)
+    unset (_${_PYTHON_PREFIX}_CONFIG_NAMES)
+
+    if (NOT _${_PYTHON_PREFIX}_CONFIG)
+      continue()
+    endif()
+
+    # retrieve root install directory
+    execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --prefix
+            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_PREFIX
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (_${_PYTHON_PREFIX}_RESULT)
+      # python-config is not usable
+      unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
+      continue()
+    endif()
+    set (_${_PYTHON_PREFIX}_HINTS "${_${_PYTHON_PREFIX}_PREFIX}" "${${_PYTHON_PREFIX}_ROOT_DIR}" ENV ${_PYTHON_PREFIX}_ROOT_DIR)
+
+    # retrieve library
+    execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --ldflags
+            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_FLAGS
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (NOT _${_PYTHON_PREFIX}_RESULT)
+      # retrieve library directory
+      string (REGEX MATCHALL "-L[^ ]+" _${_PYTHON_PREFIX}_LIB_DIRS "${_${_PYTHON_PREFIX}_FLAGS}")
+      string (REPLACE "-L" "" _${_PYTHON_PREFIX}_LIB_DIRS "${_${_PYTHON_PREFIX}_LIB_DIRS}")
+      list (REMOVE_DUPLICATES _${_PYTHON_PREFIX}_LIB_DIRS)
+      # retrieve library name
+      string (REGEX MATCHALL "-lpython[^ ]+" _${_PYTHON_PREFIX}_LIB_NAMES "${_${_PYTHON_PREFIX}_FLAGS}")
+      string (REPLACE "-l" "" _${_PYTHON_PREFIX}_LIB_NAMES "${_${_PYTHON_PREFIX}_LIB_NAMES}")
+      list (REMOVE_DUPLICATES _${_PYTHON_PREFIX}_LIB_NAMES)
+
+      find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
+              NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES}
+              NAMES_PER_DIR
+              HINTS ${_${_PYTHON_PREFIX}_HINTS} ${_${_PYTHON_PREFIX}_LIB_DIRS}
+              PATH_SUFFIXES lib
+              NO_SYSTEM_ENVIRONMENT_PATH
+              NO_CMAKE_SYSTEM_PATH)
+      # retrieve runtime library
+      if (${_PYTHON_PREFIX}_LIBRARY_RELEASE)
+        get_filename_component (_${_PYTHON_PREFIX}_PATH "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}" DIRECTORY)
+        _python_find_runtime_library (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
+                NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES}
+                NAMES_PER_DIR
+                HINTS ${_${_PYTHON_PREFIX}_PATH} ${_${_PYTHON_PREFIX}_HINTS}
+                PATH_SUFFIXES bin
+                NO_SYSTEM_ENVIRONMENT_PATH
+                NO_CMAKE_SYSTEM_PATH)
+      endif()
+    endif()
+
+    # retrieve include directory
+    execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --includes
+            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_FLAGS
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (NOT _${_PYTHON_PREFIX}_RESULT)
+      # retrieve include directory
+      string (REGEX MATCHALL "-I[^ ]+" _${_PYTHON_PREFIX}_INCLUDE_DIRS "${_${_PYTHON_PREFIX}_FLAGS}")
+      string (REPLACE "-I" "" _${_PYTHON_PREFIX}_INCLUDE_DIRS "${_${_PYTHON_PREFIX}_INCLUDE_DIRS}")
+      list (REMOVE_DUPLICATES _${_PYTHON_PREFIX}_INCLUDE_DIRS)
+
+      find_path (${_PYTHON_PREFIX}_INCLUDE_DIR
+              NAMES Python.h
+              HINTS ${_${_PYTHON_PREFIX}_INCLUDE_DIRS}
+              NO_SYSTEM_ENVIRONMENT_PATH
+              NO_CMAKE_SYSTEM_PATH)
+    endif()
+
+    if (${_PYTHON_PREFIX}_LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_INCLUDE_DIR)
+      break()
+    endif()
+  endforeach()
+
+  # Rely on HINTS and standard paths if config tool failed to locate artifacts
+  if (NOT (${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG) OR NOT ${_PYTHON_PREFIX}_INCLUDE_DIR)
+    foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
+      string (REPLACE "." "" _${_PYTHON_PREFIX}_VERSION_NO_DOTS ${_${_PYTHON_PREFIX}_VERSION})
+
+      _python_get_frameworks (_${_PYTHON_PREFIX}_FRAMEWORK_PATHS ${_${_PYTHON_PREFIX}_VERSION})
+
+      # search first in known locations
+      find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
+              NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}
+              python${_${_PYTHON_PREFIX}_VERSION}mu
+              python${_${_PYTHON_PREFIX}_VERSION}m
+              python${_${_PYTHON_PREFIX}_VERSION}u
+              python${_${_PYTHON_PREFIX}_VERSION}
+              NAMES_PER_DIR
+              HINTS ${_${_PYTHON_PREFIX}_HINTS}
+              PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
+              [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+              [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+              PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE} lib libs
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}mu
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}m
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}u
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config
+              NO_SYSTEM_ENVIRONMENT_PATH
+              NO_CMAKE_SYSTEM_PATH)
+      # search in all default paths
+      find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
+              NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}
+              python${_${_PYTHON_PREFIX}_VERSION}mu
+              python${_${_PYTHON_PREFIX}_VERSION}m
+              python${_${_PYTHON_PREFIX}_VERSION}u
+              python${_${_PYTHON_PREFIX}_VERSION}
+              NAMES_PER_DIR
+              PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE} lib libs
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}mu
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}m
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}u
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}
+              lib/python${_${_PYTHON_PREFIX}_VERSION}/config)
+      # retrieve runtime library
+      if (${_PYTHON_PREFIX}_LIBRARY_RELEASE)
+        get_filename_component (_${_PYTHON_PREFIX}_PATH "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}" DIRECTORY)
+        _python_find_runtime_library (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
+                NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}
+                python${_${_PYTHON_PREFIX}_VERSION}mu
+                python${_${_PYTHON_PREFIX}_VERSION}m
+                python${_${_PYTHON_PREFIX}_VERSION}u
+                python${_${_PYTHON_PREFIX}_VERSION}
+                NAMES_PER_DIR
+                HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS}
+                PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
+                [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+                [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+                PATH_SUFFIXES bin)
+      endif()
+
+      if (WIN32)
+        # search for debug library
+        if (${_PYTHON_PREFIX}_LIBRARY_RELEASE)
+          # use library location as a hint
+          get_filename_component (_${_PYTHON_PREFIX}_PATH "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}" DIRECTORY)
+          find_library (${_PYTHON_PREFIX}_LIBRARY_DEBUG
+                  NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}_d
+                  NAMES_PER_DIR
+                  HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS}
+                  NO_DEFAULT_PATH)
+        else()
+          # search first in known locations
+          find_library (${_PYTHON_PREFIX}_LIBRARY_DEBUG
+                  NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}_d
+                  NAMES_PER_DIR
+                  HINTS ${_${_PYTHON_PREFIX}_HINTS}
+                  PATHS [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+                  [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+                  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+                  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+                  PATH_SUFFIXES lib libs
+                  NO_SYSTEM_ENVIRONMENT_PATH
+                  NO_CMAKE_SYSTEM_PATH)
+          # search in all default paths
+          find_library (${_PYTHON_PREFIX}_LIBRARY_DEBUG
+                  NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}_d
+                  NAMES_PER_DIR
+                  PATH_SUFFIXES lib libs)
+        endif()
+        if (${_PYTHON_PREFIX}_LIBRARY_DEBUG)
+          get_filename_component (_${_PYTHON_PREFIX}_PATH "${${_PYTHON_PREFIX}_LIBRARY_DEBUG}" DIRECTORY)
+          _python_find_runtime_library (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG
+                  NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}_d
+                  NAMES_PER_DIR
+                  HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS}
+                  PATHS [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+                  [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+                  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+                  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+                  PATH_SUFFIXES bin)
+        endif()
+      endif()
+
+      # Don't search for include dir until library location is known
+      if (${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
+        unset (_${_PYTHON_PREFIX}_INCLUDE_HINTS)
+        foreach (_${_PYTHON_PREFIX}_LIB IN ITEMS ${_PYTHON_PREFIX}_LIBRARY_RELEASE ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
+          if (${_${_PYTHON_PREFIX}_LIB})
+            # Use the library's install prefix as a hint
+            if (${_${_PYTHON_PREFIX}_LIB} MATCHES "^(.+/Frameworks/Python.framework/Versions/[0-9.]+)")
+              list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${CMAKE_MATCH_1}")
+            elseif (${_${_PYTHON_PREFIX}_LIB} MATCHES "^(.+)/lib(64|32)?/python[0-9.]+/config")
+              list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${CMAKE_MATCH_1}")
+            elseif (DEFINED CMAKE_LIBRARY_ARCHITECTURE AND ${_${_PYTHON_PREFIX}_LIB} MATCHES "^(.+)/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+              list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${CMAKE_MATCH_1}")
+            else()
+              # assume library is in a directory under root
+              get_filename_component (_${_PYTHON_PREFIX}_PREFIX "${${_${_PYTHON_PREFIX}_LIB}}" DIRECTORY)
+              get_filename_component (_${_PYTHON_PREFIX}_PREFIX "${_${_PYTHON_PREFIX}_PREFIX}" DIRECTORY)
+              list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${_${_PYTHON_PREFIX}_PREFIX}")
+            endif()
+          endif()
+        endforeach()
+        list (REMOVE_DUPLICATES _${_PYTHON_PREFIX}_INCLUDE_HINTS)
+
+        find_path (${_PYTHON_PREFIX}_INCLUDE_DIR
+                NAMES Python.h
+                HINTS ${_${_PYTHON_PREFIX}_INCLUDE_HINTS} ${_${_PYTHON_PREFIX}_HINTS}
+                PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
+                [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+                [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
+                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
+                PATH_SUFFIXES include/python${_${_PYTHON_PREFIX}_VERSION}mu
+                include/python${_${_PYTHON_PREFIX}_VERSION}m
+                include/python${_${_PYTHON_PREFIX}_VERSION}u
+                include/python${_${_PYTHON_PREFIX}_VERSION}
+                include
+                NO_SYSTEM_ENVIRONMENT_PATH
+                NO_CMAKE_SYSTEM_PATH)
+      endif()
+
+      if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG) AND ${_PYTHON_PREFIX}_INCLUDE_DIR)
+        break()
+      endif()
+    endforeach()
+
+    # search header file in standard locations
+    find_path (${_PYTHON_PREFIX}_INCLUDE_DIR
+            NAMES Python.h)
+  endif()
+
+  if (${_PYTHON_PREFIX}_INCLUDE_DIR)
+    # retrieve version from header file
+    file (STRINGS "${${_PYTHON_PREFIX}_INCLUDE_DIR}/patchlevel.h" _${_PYTHON_PREFIX}_VERSION
+            REGEX "^#define[ \t]+PY_VERSION[ \t]+\"[^\"]+\"")
+    string (REGEX REPLACE "^#define[ \t]+PY_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
+            _${_PYTHON_PREFIX}_VERSION "${_${_PYTHON_PREFIX}_VERSION}")
+    string (REGEX MATCHALL "[0-9]+" _${_PYTHON_PREFIX}_VERSIONS "${_${_PYTHON_PREFIX}_VERSION}")
+    list (GET _${_PYTHON_PREFIX}_VERSIONS 0 _${_PYTHON_PREFIX}_VERSION_MAJOR)
+    list (GET _${_PYTHON_PREFIX}_VERSIONS 1 _${_PYTHON_PREFIX}_VERSION_MINOR)
+    list (GET _${_PYTHON_PREFIX}_VERSIONS 2 _${_PYTHON_PREFIX}_VERSION_PATCH)
+
+    if (NOT ${_PYTHON_PREFIX}_Interpreter_FOUND AND NOT ${_PYTHON_PREFIX}_Compiler_FOUND)
+      # set public version information
+      set (${_PYTHON_PREFIX}_VERSION ${_${_PYTHON_PREFIX}_VERSION})
+      set (${_PYTHON_PREFIX}_VERSION_MAJOR ${_${_PYTHON_PREFIX}_VERSION_MAJOR})
+      set (${_PYTHON_PREFIX}_VERSION_MINOR ${_${_PYTHON_PREFIX}_VERSION_MINOR})
+      set (${_PYTHON_PREFIX}_VERSION_PATCH ${_${_PYTHON_PREFIX}_VERSION_PATCH})
+    endif()
+  endif()
+
+  # define public variables
+  include (${CMAKE_CURRENT_LIST_DIR}/../SelectLibraryConfigurations.cmake)
+  select_library_configurations (${_PYTHON_PREFIX})
+  if (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE)
+    set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE}")
+  elseif (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG)
+    set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG}")
+  else()
+    set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY "$${_PYTHON_PREFIX}_RUNTIME_LIBRARY-NOTFOUND")
+  endif()
+
+  _python_set_library_dirs (${_PYTHON_PREFIX}_LIBRARY_DIRS
+          ${_PYTHON_PREFIX}_LIBRARY_RELEASE ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
+  if (UNIX)
+    if (${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$"
+            OR ${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$")
+      set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DIRS ${${_PYTHON_PREFIX}_LIBRARY_DIRS})
+    endif()
+  else()
+    _python_set_library_dirs (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DIRS
+            ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG)
+  endif()
+
+  set (${_PYTHON_PREFIX}_INCLUDE_DIRS "${${_PYTHON_PREFIX}_INCLUDE_DIR}")
+
+  mark_as_advanced (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
+          ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG
+          ${_PYTHON_PREFIX}_INCLUDE_DIR)
+
+  if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
+          AND ${_PYTHON_PREFIX}_INCLUDE_DIR)
+    if (${_PYTHON_PREFIX}_Interpreter_FOUND OR ${_PYTHON_PREFIX}_Compiler_FOUND)
+      # development environment must be compatible with interpreter/compiler
+      if (${_${_PYTHON_PREFIX}_VERSION_MAJOR}.${_${_PYTHON_PREFIX}_VERSION_MINOR} VERSION_EQUAL ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
+        set (${_PYTHON_PREFIX}_Development_FOUND TRUE)
+      endif()
+    elseif (${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
+      set (${_PYTHON_PREFIX}_Development_FOUND TRUE)
+    endif()
+  endif()
+
+  # Restore the original find library ordering
+  if (DEFINED _${_PYTHON_PREFIX}_CMAKE_FIND_LIBRARY_SUFFIXES)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES ${_${_PYTHON_PREFIX}_CMAKE_FIND_LIBRARY_SUFFIXES})
+  endif()
+endif()
+
+# final validation
+if (${_PYTHON_PREFIX}_VERSION_MAJOR AND
+        NOT ${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
+  _python_display_failure ("Could NOT find ${_PYTHON_PREFIX}: Found unsuitable major version \"${${_PYTHON_PREFIX}_VERSION_MAJOR}\", but required major version is exact version \"${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}\"")
+endif()
+
+include (${CMAKE_CURRENT_LIST_DIR}/../FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args (${_PYTHON_PREFIX}
+        REQUIRED_VARS ${_${_PYTHON_PREFIX}_REQUIRED_VARS}
+        VERSION_VAR ${_PYTHON_PREFIX}_VERSION
+        HANDLE_COMPONENTS)
+
+# Create imported targets and helper functions
+if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+        AND ${_PYTHON_PREFIX}_Interpreter_FOUND
+        AND NOT TARGET ${_PYTHON_PREFIX}::Interpreter)
+  add_executable (${_PYTHON_PREFIX}::Interpreter IMPORTED)
+  set_property (TARGET ${_PYTHON_PREFIX}::Interpreter
+          PROPERTY IMPORTED_LOCATION "${${_PYTHON_PREFIX}_EXECUTABLE}")
+endif()
+
+if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+        AND ${_PYTHON_PREFIX}_Compiler_FOUND
+        AND NOT TARGET ${_PYTHON_PREFIX}::Compiler)
+  add_executable (${_PYTHON_PREFIX}::Compiler IMPORTED)
+  set_property (TARGET ${_PYTHON_PREFIX}::Compiler
+          PROPERTY IMPORTED_LOCATION "${${_PYTHON_PREFIX}_COMPILER}")
+endif()
+
+if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+        AND ${_PYTHON_PREFIX}_Development_FOUND AND NOT TARGET ${_PYTHON_PREFIX}::Python)
+
+  if (${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$"
+          OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$"
+          OR ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG)
+    set (_${_PYTHON_PREFIX}_LIBRARY_TYPE SHARED)
+  else()
+    set (_${_PYTHON_PREFIX}_LIBRARY_TYPE STATIC)
+  endif()
+
+  add_library (${_PYTHON_PREFIX}::Python ${_${_PYTHON_PREFIX}_LIBRARY_TYPE} IMPORTED)
+
+  set_property (TARGET ${_PYTHON_PREFIX}::Python
+          PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${${_PYTHON_PREFIX}_INCLUDE_DIR}")
+
+  if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE)
+          OR (${_PYTHON_PREFIX}_LIBRARY_DEBUG AND ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG))
+    # System manage shared libraries in two parts: import and runtime
+    if (${_PYTHON_PREFIX}_LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
+      set_property (TARGET ${_PYTHON_PREFIX}::Python PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
+      set_target_properties (${_PYTHON_PREFIX}::Python
+              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+              IMPORTED_IMPLIB_RELEASE "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}"
+              IMPORTED_LOCATION_RELEASE "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE}")
+      set_target_properties (${_PYTHON_PREFIX}::Python
+              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+              IMPORTED_IMPLIB_DEBUG "${${_PYTHON_PREFIX}_LIBRARY_DEBUG}"
+              IMPORTED_LOCATION_DEBUG "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG}")
+    else()
+      set_target_properties (${_PYTHON_PREFIX}::Python
+              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+              IMPORTED_IMPLIB "${${_PYTHON_PREFIX}_LIBRARY}"
+              IMPORTED_LOCATION "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY}")
+    endif()
+  else()
+    if (${_PYTHON_PREFIX}_LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
+      set_property (TARGET ${_PYTHON_PREFIX}::Python PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
+      set_target_properties (${_PYTHON_PREFIX}::Python
+              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+              IMPORTED_LOCATION_RELEASE "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}")
+      set_target_properties (${_PYTHON_PREFIX}::Python
+              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+              IMPORTED_LOCATION_DEBUG "${${_PYTHON_PREFIX}_LIBRARY_DEBUG}")
+    else()
+      set_target_properties (${_PYTHON_PREFIX}::Python
+              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+              IMPORTED_LOCATION "${${_PYTHON_PREFIX}_LIBRARY}")
+    endif()
+  endif()
+
+  if (_${_PYTHON_PREFIX}_CONFIG AND _${_PYTHON_PREFIX}_LIBRARY_TYPE STREQUAL "STATIC")
+    # extend link information with dependent libraries
+    execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --ldflags
+            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
+            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_FLAGS
+            ERROR_QUIET
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (NOT _${_PYTHON_PREFIX}_RESULT)
+      string (REGEX MATCHALL "-[Ll][^ ]+" _${_PYTHON_PREFIX}_LINK_LIBRARIES "${_${_PYTHON_PREFIX}_FLAGS}")
+      # remove elements relative to python library itself
+      list (FILTER _${_PYTHON_PREFIX}_LINK_LIBRARIES EXCLUDE REGEX "-lpython")
+      foreach (_${_PYTHON_PREFIX}_DIR IN LISTS ${_PYTHON_PREFIX}_LIBRARY_DIRS)
+        list (FILTER _${_PYTHON_PREFIX}_LINK_LIBRARIES EXCLUDE REGEX "-L${${_PYTHON_PREFIX}_DIR}")
+      endforeach()
+      set_property (TARGET ${_PYTHON_PREFIX}::Python
+              PROPERTY INTERFACE_LINK_LIBRARIES ${_${_PYTHON_PREFIX}_LINK_LIBRARIES})
+    endif()
+  endif()
+
+  #
+  # PYTHON_ADD_LIBRARY (<name> [STATIC|SHARED|MODULE] src1 src2 ... srcN)
+  # It is used to build modules for python.
+  #
+  function (__${_PYTHON_PREFIX}_ADD_LIBRARY prefix name)
+    cmake_parse_arguments (PARSE_ARGV 2 PYTHON_ADD_LIBRARY
+            "STATIC;SHARED;MODULE" "" "")
+
+    unset (type)
+    if (NOT (PYTHON_ADD_LIBRARY_STATIC
+            OR PYTHON_ADD_LIBRARY_SHARED
+            OR PYTHON_ADD_LIBRARY_MODULE))
+      set (type MODULE)
+    endif()
+    add_library (${name} ${type} ${ARGN})
+    target_link_libraries (${name} PRIVATE ${prefix}::Python)
+
+    # customize library name to follow module name rules
+    get_property (type TARGET ${name} PROPERTY TYPE)
+    if (type STREQUAL "MODULE_LIBRARY")
+      set_property (TARGET ${name} PROPERTY PREFIX "")
+      if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+        set_property (TARGET ${name} PROPERTY SUFFIX ".pyd")
+      endif()
+    endif()
+  endfunction()
+endif()
+
+# final clean-up
+
+# Restore CMAKE_FIND_FRAMEWORK
+if (DEFINED _${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK)
+  set (CMAKE_FIND_FRAMEWORK ${_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK})
+  unset (_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK)
+else()
+  unset (CMAKE_FIND_FRAMEWORK)
+endif()
+
+unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
\ No newline at end of file
diff --git a/tools/cmake/FindPython3.cmake b/tools/cmake/FindPython3.cmake
new file mode 100644
index 00000000000..325aff57905
--- /dev/null
+++ b/tools/cmake/FindPython3.cmake
@@ -0,0 +1,146 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindPython3
+-----------
+
+Find Python 3 interpreter, compiler and development environment (include
+directories and libraries).
+
+Three components are supported:
+
+* ``Interpreter``: search for Python 3 interpreter
+* ``Compiler``: search for Python 3 compiler. Only offered by IronPython.
+* ``Development``: search for development artifacts (include directories and
+  libraries)
+
+If no ``COMPONENTS`` is specified, ``Interpreter`` is assumed.
+
+To ensure consistent versions between components ``Interpreter``, ``Compiler``
+and ``Development``, specify all components at the same time::
+
+  find_package (Python3 COMPONENTS Interpreter Development)
+
+This module looks only for version 3 of Python. This module can be used
+concurrently with :module:`FindPython2` module to use both Python versions.
+
+The :module:`FindPython` module can be used if Python version does not matter
+for you.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :ref:`Imported Targets <Imported Targets>`:
+
+``Python3::Interpreter``
+  Python 3 interpreter. Target defined if component ``Interpreter`` is found.
+``Python3::Compiler``
+  Python 3 compiler. Target defined if component ``Compiler`` is found.
+``Python3::Python``
+  Python 3 library. Target defined if component ``Development`` is found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module will set the following variables in your project
+(see :ref:`Standard Variable Names <CMake Developer Standard Variable Names>`):
+
+``Python3_FOUND``
+  System has the Python 3 requested components.
+``Python3_Interpreter_FOUND``
+  System has the Python 3 interpreter.
+``Python3_EXECUTABLE``
+  Path to the Python 3 interpreter.
+``Python3_INTERPRETER_ID``
+  A short string unique to the interpreter. Possible values include:
+    * Python
+    * ActivePython
+    * Anaconda
+    * Canopy
+    * IronPython
+``Python3_STDLIB``
+  Standard platform independent installation directory.
+
+  Information returned by
+  ``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=True)``.
+``Python3_STDARCH``
+  Standard platform dependent installation directory.
+
+  Information returned by
+  ``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=True)``.
+``Python3_SITELIB``
+  Third-party platform independent installation directory.
+
+  Information returned by
+  ``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=False)``.
+``Python3_SITEARCH``
+  Third-party platform dependent installation directory.
+
+  Information returned by
+  ``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=False)``.
+``Python3_Compiler_FOUND``
+  System has the Python 3 compiler.
+``Python3_COMPILER``
+  Path to the Python 3 compiler. Only offered by IronPython.
+``Python3_COMPILER_ID``
+  A short string unique to the compiler. Possible values include:
+    * IronPython
+``Python3_Development_FOUND``
+  System has the Python 3 development artifacts.
+``Python3_INCLUDE_DIRS``
+  The Python 3 include directories.
+``Python3_LIBRARIES``
+  The Python 3 libraries.
+``Python3_LIBRARY_DIRS``
+  The Python 3 library directories.
+``Python3_RUNTIME_LIBRARY_DIRS``
+  The Python 3 runtime library directories.
+``Python3_VERSION``
+  Python 3 version.
+``Python3_VERSION_MAJOR``
+  Python 3 major version.
+``Python3_VERSION_MINOR``
+  Python 3 minor version.
+``Python3_VERSION_PATCH``
+  Python 3 patch version.
+
+Hints
+^^^^^
+
+``Python3_ROOT_DIR``
+  Define the root directory of a Python 3 installation.
+
+``Python3_USE_STATIC_LIBS``
+  * If not defined, search for shared libraries and static libraries in that
+    order.
+  * If set to TRUE, search **only** for static libraries.
+  * If set to FALSE, search **only** for shared libraries.
+
+Commands
+^^^^^^^^
+
+This module defines the command ``Python3_add_library`` which have the same
+semantic as :command:`add_library` but take care of Python module naming rules
+(only applied if library is of type ``MODULE``) and add dependency to target
+``Python3::Python``::
+
+  Python3_add_library (my_module MODULE src1.cpp)
+
+If library type is not specified, ``MODULE`` is assumed.
+#]=======================================================================]
+
+
+set (_PYTHON_PREFIX Python3)
+
+set (_Python3_REQUIRED_VERSION_MAJOR 3)
+
+include (${CMAKE_CURRENT_LIST_DIR}/FindPython/Support.cmake)
+
+if (COMMAND __Python3_add_library)
+  macro (Python3_add_library)
+    __Python3_add_library (Python3 ${ARGV})
+  endmacro()
+endif()
+
+unset (_PYTHON_PREFIX)
\ No newline at end of file

From caeba3a903aecfd9d7c75a5f4e9ab5f46b45bb1f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 3 Dec 2021 23:27:56 +0100
Subject: [PATCH 0002/1963] fix(examples): Set a maximum number of
 Subscriptions for the CTT tests

---
 examples/server_ctt.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 911aa66dea5..7d745934b16 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1226,6 +1226,9 @@ int main(int argc, char **argv) {
     config.maxNodesPerNodeManagement = MAX_OPERATION_LIMIT;
     config.maxMonitoredItemsPerCall = MAX_OPERATION_LIMIT;
 
+    /* Set Subscription limits */
+    config.maxSubscriptions = 100;
+
     /* If RequestTimestamp is '0', log the warning and proceed */
     config.verifyRequestTimestamp = UA_RULEHANDLING_WARN;
     if(enableTime)

From fc89dd1753e7c0eb95adbe8bc48f58b87cf208e9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 3 Dec 2021 23:31:17 +0100
Subject: [PATCH 0003/1963] fix(core): Use UA_String for PolicyURIs (instead of
 UA_ByteString)

---
 include/open62541/plugin/securitypolicy.h | 8 ++++----
 src/ua_securechannel.c                    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/open62541/plugin/securitypolicy.h b/include/open62541/plugin/securitypolicy.h
index fc6b3a93253..1220b5d3038 100644
--- a/include/open62541/plugin/securitypolicy.h
+++ b/include/open62541/plugin/securitypolicy.h
@@ -16,7 +16,7 @@
 
 _UA_BEGIN_DECLS
 
-extern UA_EXPORT const UA_ByteString UA_SECURITY_POLICY_NONE_URI;
+extern UA_EXPORT const UA_String UA_SECURITY_POLICY_NONE_URI;
 
 struct UA_SecurityPolicy;
 typedef struct UA_SecurityPolicy UA_SecurityPolicy;
@@ -296,7 +296,7 @@ struct UA_SecurityPolicy {
     void *policyContext;
 
     /* The policy uri that identifies the implemented algorithms */
-    UA_ByteString policyUri;
+    UA_String policyUri;
 
     /* The local certificate is specific for each SecurityPolicy since it
      * depends on the used key length. */
@@ -333,8 +333,8 @@ struct UA_PubSubSecurityPolicy;
 typedef struct UA_PubSubSecurityPolicy UA_PubSubSecurityPolicy;
 
 struct UA_PubSubSecurityPolicy {
-    UA_ByteString policyUri; /* The policy uri that identifies the implemented
-                              * algorithms */
+    UA_String policyUri; /* The policy uri that identifies the implemented
+                          * algorithms */
     UA_SecurityPolicySymmetricModule symmetricModule;
 
     /* Create the context for the WriterGroup. The keys and nonce can be NULL
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index dce41d50023..1e3aa184554 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -22,7 +22,7 @@
 #define UA_BITMASK_MESSAGETYPE 0x00ffffffu
 #define UA_BITMASK_CHUNKTYPE 0xff000000u
 
-const UA_ByteString UA_SECURITY_POLICY_NONE_URI =
+const UA_String UA_SECURITY_POLICY_NONE_URI =
     {47, (UA_Byte *)"http://opcfoundation.org/UA/SecurityPolicy#None"};
 
 #ifdef UA_ENABLE_UNIT_TEST_FAILURE_HOOKS

From 9ee1ffe96dfc0c7acfd08b5a27cbc85a77e28afd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 3 Dec 2021 23:32:58 +0100
Subject: [PATCH 0004/1963] fix(plugin): Define the SecurityPolicyUri for the
 x509 UserTokenPolicies

---
 plugins/ua_accesscontrol_default.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 1fa619796b7..846eb770f46 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -363,35 +363,38 @@ UA_AccessControl_default(UA_ServerConfig *config,
     if(allowAnonymous) {
         ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_ANONYMOUS;
         ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(ANONYMOUS_POLICY);
-        if (!ac->userTokenPolicies[policies].policyId.data)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
         policies++;
     }
 
     if(verifyX509) {
         ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_CERTIFICATE;
         ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(CERTIFICATE_POLICY);
-        if (!ac->userTokenPolicies[policies].policyId.data)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
+#if UA_LOGLEVEL <= 400
+        if(UA_ByteString_equal(userTokenPolicyUri, &UA_SECURITY_POLICY_NONE_URI)) {
+            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                           "x509 Certificate Authentication configured, "
+                           "but no encrypting SecurityPolicy. "
+                           "This can leak credentials on the network.");
+        }
+#endif
+        UA_ByteString_copy(userTokenPolicyUri,
+                           &ac->userTokenPolicies[policies].securityPolicyUri);
         policies++;
     }
 
     if(usernamePasswordLoginSize > 0) {
         ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_USERNAME;
         ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(USERNAME_POLICY);
-        if(!ac->userTokenPolicies[policies].policyId.data)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-
 #if UA_LOGLEVEL <= 400
-        const UA_String noneUri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
-        if(UA_ByteString_equal(userTokenPolicyUri, &noneUri)) {
+        if(UA_ByteString_equal(userTokenPolicyUri, &UA_SECURITY_POLICY_NONE_URI)) {
             UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
-                           "Username/Password configured, but no encrypting SecurityPolicy. "
+                           "Username/Password Authentication configured, "
+                           "but no encrypting SecurityPolicy. "
                            "This can leak credentials on the network.");
         }
 #endif
-        return UA_ByteString_copy(userTokenPolicyUri,
-                                  &ac->userTokenPolicies[policies].securityPolicyUri);
+        UA_ByteString_copy(userTokenPolicyUri,
+                           &ac->userTokenPolicies[policies].securityPolicyUri);
     }
     return UA_STATUSCODE_GOOD;
 }

From 5ee638c8f9db337ba5c2b501b77c0cf20ff16465 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Dec 2021 00:50:10 +0100
Subject: [PATCH 0005/1963] refactor(el): Forward (optional) KeyValue
 parameters to the ConnectionCallback

---
 arch/eventloop_posix_tcp.c           | 13 +++++++------
 include/open62541/plugin/eventloop.h | 22 +++++++++++++++++++---
 tests/check_eventloop_tcp.c          | 11 +++++++----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 66dd0ab6263..cdf6aa08c3f 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -123,7 +123,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
 
         /* The socket has opened. Signal it to the application. */
         cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
-                               UA_STATUSCODE_GOOD, UA_BYTESTRING_NULL);
+                               UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
         UA_EventLoop_modifyFD(cm->eventSource.eventLoop, fd, UA_POSIX_EVENT_READ,
@@ -164,7 +164,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
         /* Callback to the application layer */
         response.length = (size_t)ret; /* Set the length of the received buffer */
         cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
-                               UA_STATUSCODE_GOOD, response);
+                               UA_STATUSCODE_GOOD, 0, NULL, response);
     } else if(UA_ERRNO != UA_INTERRUPTED && UA_ERRNO != UA_EAGAIN) {
         /* Orderly shutdown of the connection. Signal to the application and
          * then close the connection. We end up in this path after shutdown was
@@ -177,7 +177,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
         /* Close the connection if not a temporary error on a nonblocking socket */
         cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
                                UA_STATUSCODE_BADCONNECTIONCLOSED,
-                               UA_BYTESTRING_NULL);
+                               0, NULL, UA_BYTESTRING_NULL);
         TCP_close(cm, fd);
     }
 
@@ -256,7 +256,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
     /* The socket has opened. Signal it to the application. The callback can
      * switch out the context. So put it into a temp variable.  */
     cm->connectionCallback(cm, (uintptr_t)newsockfd, &ctx, UA_STATUSCODE_GOOD,
-                           UA_BYTESTRING_NULL);
+                           0, NULL, UA_BYTESTRING_NULL);
 
     /* Register in the EventLoop. Signal to the user if registering failed. */
     res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newsockfd,
@@ -265,7 +265,8 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                                   &cm->eventSource, ctx);
     if(res != UA_STATUSCODE_GOOD) {
         cm->connectionCallback(cm, (uintptr_t)newsockfd, &ctx,
-                               UA_STATUSCODE_BADINTERNALERROR, UA_BYTESTRING_NULL);
+                               UA_STATUSCODE_BADINTERNALERROR,
+                               0, NULL, UA_BYTESTRING_NULL);
         UA_close(newsockfd);
     }
 
@@ -390,7 +391,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     UA_StatusCode res =
         UA_EventLoop_registerFD(cm->eventSource.eventLoop, listenSocket,
                                 UA_POSIX_EVENT_READ,
-                                (UA_FDCallback) TCP_listenSocketCallback,
+                                (UA_FDCallback)TCP_listenSocketCallback,
                                 &cm->eventSource, NULL);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 3f15a4d816c..e2e20bb38a8 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -192,12 +192,28 @@ typedef struct UA_ConnectionManager UA_ConnectionManager;
 
 /**
  * The ConnectionCallback is the only interface from the connection back to the
- * application. The connectionId is announced to the application when it is
- * first used for the callback. The context is a double-pointer so the context
- * can be overwritten by the application */
+ * application.
+ *
+ * - The connectionId is initially unknown to the target application and
+ *   "announced" to the application when first used first in this callback.
+ *
+ * - The context is attached to the connection. Initially a default context is set.
+ *   The context can be replaced within the callback (via the double-pointer).
+ *
+ * - The status indicates whether the connection is closing down. If status !=
+ *   GOOD, then the application should clean up the context, as this is the last
+ *   time the callback will be called for this connection.
+ *
+ * - The parameters are a key-value list with additional information. The
+ *   possible keys and their meaning are documented for the individual
+ *   ConnectionManager implementations.
+ *
+ * - The msg ByteString is the message (or packet) received on the
+ *   connection. Can be empty. */
 typedef void
 (*UA_ConnectionCallback)(UA_ConnectionManager *cm, uintptr_t connectionId,
                          void **connectionContext, UA_StatusCode status,
+                         size_t paramsSize, UA_KeyValuePair *params,
                          UA_ByteString msg);
 
 struct UA_ConnectionManager {
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index 81027701103..acbf815cdd3 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -16,8 +16,9 @@
 UA_EventLoop *el;
 
 static void noopCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                   void **connectionContext, UA_StatusCode status,
-                   UA_ByteString msg) {}
+                         void **connectionContext, UA_StatusCode status,
+                         size_t paramsSize, UA_KeyValuePair *params,
+                         UA_ByteString msg) {}
 
 START_TEST(listenTCP) {
     el = UA_EventLoop_new(UA_Log_Stdout);
@@ -58,6 +59,7 @@ static UA_Boolean received;
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void **connectionContext, UA_StatusCode status,
+                   size_t paramsSize, UA_KeyValuePair *params,
                    UA_ByteString msg) {
     if(*connectionContext != NULL)
         clientId = connectionId;
@@ -76,8 +78,9 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 static void
 illegalConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                   void **connectionContext, UA_StatusCode status,
-                   UA_ByteString msg) {
+                          void **connectionContext, UA_StatusCode status,
+                          size_t paramsSize, UA_KeyValuePair *params,
+                          UA_ByteString msg) {
     UA_StatusCode rv = UA_EventLoop_run(el, 1);
     ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);
     if(*connectionContext != NULL)

From a70790354f54b77906e823fd28b097ee376a74b5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Dec 2021 00:55:34 +0100
Subject: [PATCH 0006/1963] feat(el): Add UA_EventLoop_findEventSource

---
 arch/eventloop_posix.c               | 13 +++++++++++++
 include/open62541/plugin/eventloop.h |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index d62620984ba..b8baa216f47 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -470,6 +470,19 @@ UA_EventLoop_deregisterEventSource(UA_EventLoop *el, UA_EventSource *es) {
     return UA_STATUSCODE_GOOD;
 }
 
+UA_EventSource *
+UA_EventLoop_findEventSource(UA_EventLoop *el, const UA_String name) {
+    UA_LOCK(&el->elMutex);
+    UA_EventSource *s = el->eventSources;
+    while(s) {
+        if(UA_String_equal(&name, &s->name))
+            break;
+        s = s->next;
+    }
+    UA_UNLOCK(&el->elMutex);
+    return s;
+}
+
 /********************************/
 /* Registering File Descriptors */
 /********************************/
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index e2e20bb38a8..66ffc313abb 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -178,6 +178,11 @@ UA_EXPORT UA_StatusCode
 UA_EventLoop_deregisterEventSource(UA_EventLoop *el,
                                    UA_EventSource *es);
 
+/* Look up the EventSource by name. Returns the first EventSource of that name
+ * (duplicates should be avoided). */
+UA_EXPORT UA_EventSource *
+UA_EventLoop_findEventSource(UA_EventLoop *el, const UA_String name);
+
 /**
  * Connection Manager
  * ------------------

From 0987dbe335add507af92d404245a40aa25eb9c09 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Dec 2021 01:04:56 +0100
Subject: [PATCH 0007/1963] feat(el): Add an EventSourceType tag

So we can correctly cast after looking up by name.
---
 arch/eventloop_posix_tcp.c           |  1 +
 include/open62541/plugin/eventloop.h | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index cdf6aa08c3f..53779ed0731 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -775,6 +775,7 @@ UA_ConnectionManager_TCP_new(const UA_String eventSourceName) {
     if(!cm)
         return NULL;
 
+    cm->cm.eventSource.eventSourceType = UA_EVENTSOURCETYPE_CONNECTIONMANAGER;
     UA_String_copy(&eventSourceName, &cm->cm.eventSource.name);
     cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *)) TCP_eventSourceStart;
     cm->cm.eventSource.stop = (void (*)(UA_EventSource *))TCP_eventSourceStop;
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 66ffc313abb..61b285d2662 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -146,21 +146,30 @@ typedef enum {
                                        * EventLoop cycles to finish */
 } UA_EventSourceState;
 
+/* Type-tag for proper casting of the difference EventSource (e.g. when they are
+ * looked up via UA_EventLoop_findEventSource). */
+typedef enum {
+    UA_EVENTSOURCETYPE_ANY = 0,
+    UA_EVENTSOURCETYPE_CONNECTIONMANAGER
+} UA_EventSourceType;
+
 struct UA_EventSource {
     struct UA_EventSource *next; /* Singly-linked list for use by the
                                   * application that registered the ES */
 
+    UA_EventSourceType eventSourceType;
+
     /* Configuration
      * ~~~~~~~~~~~~~ */
-    UA_String name;                 /* Unique name of the ES for logging */
+    UA_String name;                 /* Unique name of the ES */
+    UA_EventLoop *eventLoop;        /* EventLoop where the ES is registered */
     void *application;              /* Application to which the ES belongs */
-    size_t paramsSize;
-    UA_KeyValuePair *params;        /* Configuration parameters */
+    size_t paramsSize;              /* Configuration parameters */
+    UA_KeyValuePair *params;
 
     /* Lifecycle
      * ~~~~~~~~~ */
     UA_EventSourceState state;
-    UA_EventLoop *eventLoop; /* EventLoop where the ES is registered */
     UA_StatusCode (*start)(UA_EventSource *es);
     void (*stop)(UA_EventSource *es); /* Asynchronous. Iterate theven EventLoop
                                        * until the EventSource is stopped. */

From a02317969a026cfb962a39b34534af09ea422d2a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Dec 2021 01:07:06 +0100
Subject: [PATCH 0008/1963] refactor(el): Simplify logging in the TCP
 EventSource

---
 arch/eventloop_posix_tcp.c | 56 +++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 53779ed0731..668dfed0515 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -77,7 +77,7 @@ static UA_StatusCode
 TCP_close(UA_ConnectionManager *cm, UA_FD fd) {
     UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                  UA_LOGCATEGORY_NETWORK,
-                 "TCP #%u\t| Closing connection", (unsigned)fd);
+                 "TCP %u\t| Closing connection", (unsigned)fd);
 
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
 
@@ -94,7 +94,7 @@ TCP_close(UA_ConnectionManager *cm, UA_FD fd) {
     tcm->fdCount--;
 
     UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
-                UA_LOGCATEGORY_NETWORK, "TCP #%u\t| Socket closed", (unsigned)fd);
+                UA_LOGCATEGORY_NETWORK, "TCP %u\t| Socket closed", (unsigned)fd);
 
     /* Stopped? */
     if(tcm->fdCount == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
@@ -112,14 +112,14 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                              void **fdcontext, short event) {
     UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                  UA_LOGCATEGORY_NETWORK,
-                 "TCP #%u\t| Activity on the socket", (unsigned)fd);
+                 "TCP %u\t| Activity on the socket", (unsigned)fd);
 
     /* Write-Event, a new connection has opened.  */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(event & UA_POSIX_EVENT_WRITE) {
         UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                      UA_LOGCATEGORY_NETWORK,
-                     "TCP #%u\t| Opening a new connection", (unsigned)fd);
+                     "TCP %u\t| Opening a new connection", (unsigned)fd);
 
         /* The socket has opened. Signal it to the application. */
         cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
@@ -133,7 +133,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
 
     UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                  UA_LOGCATEGORY_NETWORK,
-                 "TCP #%u\t| Allocate receive buffer", (unsigned)fd);
+                 "TCP %u\t| Allocate receive buffer", (unsigned)fd);
 
     /* Allocate the receive-buffer */
     UA_ByteString response;
@@ -147,18 +147,18 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
     ssize_t ret = UA_recv(fd, (char*)response.data, response.length, MSG_DONTWAIT);
     UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                  UA_LOGCATEGORY_NETWORK,
-                 "TCP #%u\t| recv(...) returned %zd", (unsigned)fd, ret);
+                 "TCP %u\t| recv(...) returned %zd", (unsigned)fd, ret);
 #else
     int ret = UA_recv(fd, (char*)response.data, response.length, MSG_DONTWAIT);
     UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                  UA_LOGCATEGORY_NETWORK,
-                 "TCP #%u\t| recv(...) returned %d", (unsigned)fd, ret);
+                 "TCP %u\t| recv(...) returned %d", (unsigned)fd, ret);
 #endif
 
     if(ret > 0) {
         UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                      UA_LOGCATEGORY_NETWORK,
-                     "TCP #%u\t| Received message of size %u",
+                     "TCP %u\t| Received message of size %u",
                      (unsigned)fd, (unsigned)ret);
 
         /* Callback to the application layer */
@@ -172,7 +172,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
          * iteration and the socket is known to be unused. */
         UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                      UA_LOGCATEGORY_NETWORK,
-                     "TCP #%u\t| recv signaled closed connection", (unsigned)fd);
+                     "TCP %u\t| recv signaled closed connection", (unsigned)fd);
 
         /* Close the connection if not a temporary error on a nonblocking socket */
         cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
@@ -190,7 +190,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                          void **fdcontext, short event) {
     UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                  UA_LOGCATEGORY_NETWORK,
-                 "TCP #%u\t| Callback on server socket", (unsigned)fd);
+                 "TCP %u\t| Callback on server socket", (unsigned)fd);
 
     /* Try to accept a new connection */
     struct sockaddr_storage remote;
@@ -206,7 +206,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                                UA_LOGCATEGORY_NETWORK,
-                               "TCP #%u\t| Error %s, closing the server socket",
+                               "TCP %u\t| Error %s, closing the server socket",
                                (unsigned)fd, errno_str));
         }
         TCP_close(cm, fd);
@@ -226,13 +226,13 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                                UA_LOGCATEGORY_NETWORK,
-                               "TCP #%u\t| getnameinfo(...) could not resolve the "
+                               "TCP %u\t| getnameinfo(...) could not resolve the "
                                "hostname (%s)", (unsigned)fd, errno_str));
         }
     }
     UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                 UA_LOGCATEGORY_NETWORK,
-                "TCP #%u\t| Connection opened from \"%s\" via the server socket #%u",
+                "TCP %u\t| Connection opened from \"%s\" via the server socket %u",
                 (unsigned)newsockfd, hoststr, (unsigned)fd);
 #endif
 
@@ -245,7 +245,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                            UA_LOGCATEGORY_NETWORK,
-                           "TCP #%u\t| Error seeting the TCP options (%s), closing",
+                           "TCP %u\t| Error seeting the TCP options (%s), closing",
                            (unsigned)newsockfd, errno_str));
         /* Close the new socket */
         UA_close(newsockfd);
@@ -305,7 +305,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                           UA_LOGCATEGORY_NETWORK,
-                          "TCP #%u\t| Error opening the listen socket for "
+                          "TCP %u\t| Error opening the listen socket for "
                           "\"%s\" on port %s(%s)",
                           (unsigned)listenSocket, hoststr, portstr, errno_str));
         return;
@@ -313,7 +313,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
 
     UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                 UA_LOGCATEGORY_NETWORK,
-                "TCP #%u\t| New server socket for \"%s\" on port %s",
+                "TCP %u\t| New server socket for \"%s\" on port %s",
                 (unsigned)listenSocket, hoststr, portstr);
 
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
@@ -326,7 +326,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                      (const char*)&optval, sizeof(optval)) == -1) {
         UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                        UA_LOGCATEGORY_NETWORK,
-                       "TCP #%u\t| Could not set an IPv6 socket to IPv6 only, closing",
+                       "TCP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return;
@@ -338,7 +338,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                      (const char *)&optval, sizeof(optval)) == -1) {
         UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                        UA_LOGCATEGORY_NETWORK,
-                       "TCP #%u\t| Could not make the socket reusable, closing",
+                       "TCP %u\t| Could not make the socket reusable, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return;
@@ -348,7 +348,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     if(TCP_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                        UA_LOGCATEGORY_NETWORK,
-                       "TCP #%u\t| Could not set the socket non-blocking, closing",
+                       "TCP %u\t| Could not set the socket non-blocking, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return;
@@ -358,7 +358,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     if(TCP_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                        UA_LOGCATEGORY_NETWORK,
-                       "TCP #%u\t| Could not disable SIGPIPE, closing",
+                       "TCP %u\t| Could not disable SIGPIPE, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return;
@@ -370,7 +370,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                           UA_LOGCATEGORY_NETWORK,
-                          "TCP #%u\t| Error binding the socket to the address (%s), closing",
+                          "TCP %u\t| Error binding the socket to the address (%s), closing",
                           (unsigned)listenSocket, errno_str));
         UA_close(listenSocket);
         return;
@@ -381,7 +381,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                           UA_LOGCATEGORY_NETWORK,
-                          "TCP #%u\t| Error listening on the socket (%s), closing",
+                          "TCP %u\t| Error listening on the socket (%s), closing",
                           (unsigned)listenSocket, errno_str));
         UA_close(listenSocket);
         return;
@@ -396,7 +396,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                        UA_LOGCATEGORY_NETWORK,
-                       "TCP #%u\t| Error registering the socket in the "
+                       "TCP %u\t| Error registering the socket in the "
                        "EventLoop, closing", (unsigned)listenSocket);
         UA_close(listenSocket);
         return;
@@ -450,7 +450,7 @@ static UA_StatusCode
 TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                  UA_LOGCATEGORY_NETWORK,
-                 "TCP #%u\t| Shutdown called", (unsigned)connectionId);
+                 "TCP %u\t| Shutdown called", (unsigned)connectionId);
 
     /* Shutdown, will be picked up by the next iteration of the event loop */
 #ifndef _WIN32
@@ -463,7 +463,7 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                            UA_LOGCATEGORY_NETWORK,
-                           "TCP #%u\t| Error shutting down the socket (%s), closing",
+                           "TCP %u\t| Error shutting down the socket (%s), closing",
                            (unsigned)connectionId, errno_str));
         retval = TCP_close(cm, (UA_FD)connectionId);
     }
@@ -484,7 +484,7 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
         do {
             UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                          UA_LOGCATEGORY_NETWORK,
-                         "TCP #%u\t| Attempting to send", (unsigned)connectionId);
+                         "TCP %u\t| Attempting to send", (unsigned)connectionId);
             size_t bytes_to_send = buf->length - nWritten;
             n = UA_send((UA_FD)connectionId,
                         (const char*)buf->data + nWritten,
@@ -493,7 +493,7 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                 UA_LOG_SOCKET_ERRNO_GAI_WRAP(
                     UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                                  UA_LOGCATEGORY_NETWORK,
-                                 "TCP #%u\t| Send failed with error %s",
+                                 "TCP %u\t| Send failed with error %s",
                                  (unsigned)connectionId, errno_str));
                 TCP_shutdownConnection(cm, connectionId);
                 UA_ByteString_clear(buf);
@@ -627,7 +627,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
 
     UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                 UA_LOGCATEGORY_NETWORK,
-                "TCP #%u\t| New connection to \"%s\" on port %s",
+                "TCP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
     return UA_STATUSCODE_GOOD;

From b260b40c2e0e2f367bafa5430bd368b9e99f59e5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Dec 2021 10:02:55 +0100
Subject: [PATCH 0009/1963] refactor(core): UA_KeyValueMap_get takes a const
 pointer

---
 include/open62541/util.h | 4 ++--
 src/ua_util.c            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/open62541/util.h b/include/open62541/util.h
index 0409d08a5fa..ee4489b548e 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -53,13 +53,13 @@ UA_KeyValueMap_set(UA_KeyValuePair **map, size_t *mapSize,
 
 /* Returns a pointer to the value or NULL if the key is not found.*/
 UA_EXPORT const UA_Variant *
-UA_KeyValueMap_get(UA_KeyValuePair *map, size_t mapSize,
+UA_KeyValueMap_get(const UA_KeyValuePair *map, size_t mapSize,
                    const UA_QualifiedName key);
 
 /* Returns NULL if the value for the key is not defined or not of the right
  * datatype and scalar/array */
 UA_EXPORT const void *
-UA_KeyValueMap_getScalar(UA_KeyValuePair *map, size_t mapSize,
+UA_KeyValueMap_getScalar(const UA_KeyValuePair *map, size_t mapSize,
                          const UA_QualifiedName key,
                          const UA_DataType *type);
 
diff --git a/src/ua_util.c b/src/ua_util.c
index 0380bd835bf..8b36f130c8b 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -253,7 +253,7 @@ UA_KeyValueMap_set(UA_KeyValuePair **map, size_t *mapSize,
 }
 
 const UA_Variant *
-UA_KeyValueMap_get(UA_KeyValuePair *map, size_t mapSize,
+UA_KeyValueMap_get(const UA_KeyValuePair *map, size_t mapSize,
                    const UA_QualifiedName key) {
     for(size_t i = 0; i < mapSize; i++) {
         if(map[i].key.namespaceIndex == key.namespaceIndex &&
@@ -266,7 +266,7 @@ UA_KeyValueMap_get(UA_KeyValuePair *map, size_t mapSize,
 
 /* Returns NULL if the parameter is not defined or not of the right datatype */
 const void *
-UA_KeyValueMap_getScalar(UA_KeyValuePair *map, size_t mapSize,
+UA_KeyValueMap_getScalar(const UA_KeyValuePair *map, size_t mapSize,
                          const UA_QualifiedName key,
                          const UA_DataType *type) {
     const UA_Variant *v = UA_KeyValueMap_get(map, mapSize, key);

From 24df7a604127087b8d4b8810b05f209fa4505a89 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Dec 2021 10:04:01 +0100
Subject: [PATCH 0010/1963] refactor(el): Make KeyValue-maps in the callbacks
 const

---
 arch/eventloop_posix_tcp.c           |  5 ++---
 include/open62541/plugin/eventloop.h | 10 +++++++---
 tests/check_eventloop_tcp.c          |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 668dfed0515..e0f4ed9e0a0 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -472,7 +472,7 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 
 static UA_StatusCode
 TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
-                       size_t paramsSize, UA_KeyValuePair *params,
+                       size_t paramsSize, const UA_KeyValuePair *params,
                        UA_ByteString *buf) {
     /* Prevent OS signals when sending to a closed socket */
     int flags = MSG_NOSIGNAL;
@@ -510,9 +510,8 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 static UA_StatusCode
 TCP_openConnection(UA_ConnectionManager *cm,
-                   size_t paramsSize, UA_KeyValuePair *params,
+                   size_t paramsSize, const UA_KeyValuePair *params,
                    void *context) {
-
     /* Get the connection parameters */
     char hostname[256];
     char portStr[16];
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 61b285d2662..597a7b63254 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -227,7 +227,7 @@ typedef struct UA_ConnectionManager UA_ConnectionManager;
 typedef void
 (*UA_ConnectionCallback)(UA_ConnectionManager *cm, uintptr_t connectionId,
                          void **connectionContext, UA_StatusCode status,
-                         size_t paramsSize, UA_KeyValuePair *params,
+                         size_t paramsSize, const UA_KeyValuePair *params,
                          UA_ByteString msg);
 
 struct UA_ConnectionManager {
@@ -258,12 +258,16 @@ struct UA_ConnectionManager {
      * (for TCP). Other protocols (e.g. MQTT, AMQP, etc.) may required
      * additional arguments to open a connection.
      *
+     * The provided context is set as the initial context attached to this
+     * connection. It is already set before the first call to
+     * cm->connectionCallback.
+     *
      * The connection is opened asynchronously. The ConnectionCallback is
      * triggered when the connection is fully opened (UA_STATUSCODE_GOOD) or has
      * failed (with an error code). */
     UA_StatusCode
     (*openConnection)(UA_ConnectionManager *cm,
-                      size_t paramsSize, UA_KeyValuePair *params,
+                      size_t paramsSize, const UA_KeyValuePair *params,
                       void *context);
 
     /* Connection Activities
@@ -290,7 +294,7 @@ struct UA_ConnectionManager {
      * example a tx-time for sending in time-synchronized TSN settings. */
     UA_StatusCode
     (*sendWithConnection)(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          size_t paramsSize, UA_KeyValuePair *params,
+                          size_t paramsSize, const UA_KeyValuePair *params,
                           UA_ByteString *buf);
 
     /* When a connection is closed, cm->connectionCallback is called with
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index acbf815cdd3..7a430005185 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -17,7 +17,7 @@ UA_EventLoop *el;
 
 static void noopCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                          void **connectionContext, UA_StatusCode status,
-                         size_t paramsSize, UA_KeyValuePair *params,
+                         size_t paramsSize, const UA_KeyValuePair *params,
                          UA_ByteString msg) {}
 
 START_TEST(listenTCP) {
@@ -59,7 +59,7 @@ static UA_Boolean received;
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void **connectionContext, UA_StatusCode status,
-                   size_t paramsSize, UA_KeyValuePair *params,
+                   size_t paramsSize, const UA_KeyValuePair *params,
                    UA_ByteString msg) {
     if(*connectionContext != NULL)
         clientId = connectionId;
@@ -79,7 +79,7 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 static void
 illegalConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                           void **connectionContext, UA_StatusCode status,
-                          size_t paramsSize, UA_KeyValuePair *params,
+                          size_t paramsSize, const UA_KeyValuePair *params,
                           UA_ByteString msg) {
     UA_StatusCode rv = UA_EventLoop_run(el, 1);
     ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);

From 28f85f05ea9e26b44e57eb7e6e18d179df0dbedd Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Tue, 7 Dec 2021 12:09:50 +0100
Subject: [PATCH 0011/1963] fix(ci) build debian package branch only for
 standard releases (eg. no rc) (#4822)

---
 .github/workflows/debian_packing.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/debian_packing.yml b/.github/workflows/debian_packing.yml
index 345a7519e25..4b2d06df116 100644
--- a/.github/workflows/debian_packing.yml
+++ b/.github/workflows/debian_packing.yml
@@ -4,7 +4,8 @@ on:
   push:
     branches: [ main, master ]
     tags:
-      - v1.*
+      - 'v1.*'
+      - 'v1.*.*'
 
 jobs:
   Debian-Package-Branch-Preperation:

From 506c785bcb1869301c5a64fc4dc2ffbeae9ec38a Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Tue, 7 Dec 2021 16:01:28 +0100
Subject: [PATCH 0012/1963] feat(build): Move modules to cmake3.12 (or less)
 specific directory such that they are not included for newer cmake versions.
 (#4824)

Newer cmake versions already have these modules packaged and we should use those in favor of possibly outdated ones.
---
 CMakeLists.txt                                                 | 3 +++
 tools/{cmake => cmake3.12}/CMakeFindFrameworks.cmake           | 0
 tools/{cmake => cmake3.12}/FindPackageHandleStandardArgs.cmake | 0
 tools/{cmake => cmake3.12}/FindPackageMessage.cmake            | 0
 tools/{cmake => cmake3.12}/FindPython/Support.cmake            | 0
 tools/{cmake => cmake3.12}/FindPython3.cmake                   | 0
 6 files changed, 3 insertions(+)
 rename tools/{cmake => cmake3.12}/CMakeFindFrameworks.cmake (100%)
 rename tools/{cmake => cmake3.12}/FindPackageHandleStandardArgs.cmake (100%)
 rename tools/{cmake => cmake3.12}/FindPackageMessage.cmake (100%)
 rename tools/{cmake => cmake3.12}/FindPython/Support.cmake (100%)
 rename tools/{cmake => cmake3.12}/FindPython3.cmake (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5c31e902d8..1f7c6fdfda8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,9 @@ endif()
 string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_LOWER_CASE)
 
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/tools/cmake")
+if(${CMAKE_VERSION} VERSION_LESS 3.12)
+    set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/tools/cmake3.12")
+endif()
 find_package(Python3 REQUIRED)
 set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
 find_package(Git)
diff --git a/tools/cmake/CMakeFindFrameworks.cmake b/tools/cmake3.12/CMakeFindFrameworks.cmake
similarity index 100%
rename from tools/cmake/CMakeFindFrameworks.cmake
rename to tools/cmake3.12/CMakeFindFrameworks.cmake
diff --git a/tools/cmake/FindPackageHandleStandardArgs.cmake b/tools/cmake3.12/FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from tools/cmake/FindPackageHandleStandardArgs.cmake
rename to tools/cmake3.12/FindPackageHandleStandardArgs.cmake
diff --git a/tools/cmake/FindPackageMessage.cmake b/tools/cmake3.12/FindPackageMessage.cmake
similarity index 100%
rename from tools/cmake/FindPackageMessage.cmake
rename to tools/cmake3.12/FindPackageMessage.cmake
diff --git a/tools/cmake/FindPython/Support.cmake b/tools/cmake3.12/FindPython/Support.cmake
similarity index 100%
rename from tools/cmake/FindPython/Support.cmake
rename to tools/cmake3.12/FindPython/Support.cmake
diff --git a/tools/cmake/FindPython3.cmake b/tools/cmake3.12/FindPython3.cmake
similarity index 100%
rename from tools/cmake/FindPython3.cmake
rename to tools/cmake3.12/FindPython3.cmake

From 40626280ca167781bb88453be222b894fa643e1f Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Tue, 7 Dec 2021 23:54:33 +0100
Subject: [PATCH 0013/1963] fix(deps): Avoid adding offset to nullptr. Might
 have security impact? (#4825)

---
 deps/ziptree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 0bbf8f67d16..7c8ad6153c9 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -45,13 +45,13 @@ struct zip_entry {
 void *
 __ZIP_INSERT(zip_cmp_cb cmp, unsigned short fieldoffset,
              unsigned short keyoffset, void *root, void *elm) {
-    struct zip_entry *root_entry = ZIP_ENTRY_PTR(root);
     struct zip_entry *elm_entry  = ZIP_ENTRY_PTR(elm);
     if(!root) {
         elm_entry->left = NULL;
         elm_entry->right = NULL;
         return elm;
     }
+    struct zip_entry *root_entry = ZIP_ENTRY_PTR(root);
     enum ZIP_CMP order = cmp(ZIP_KEY_PTR(elm), ZIP_KEY_PTR(root));
     if(order == ZIP_CMP_LESS) {
         if(__ZIP_INSERT(cmp, fieldoffset, keyoffset, root_entry->left, elm) == elm) {

From 7daacb34f6a9864c344e9bbcc3a0343c3cc9d582 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 8 Dec 2021 16:15:01 +0100
Subject: [PATCH 0014/1963] fix(server) change namespaceSize variable type
 (#4823)

---
 src/server/ua_server.c          | 2 +-
 src/server/ua_server_internal.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 7ce8048bbba..c2560363731 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -66,7 +66,7 @@ UA_UInt16 addNamespace(UA_Server *server, const UA_String name) {
     /* Check if the namespace already exists in the server's namespace array */
     for(UA_UInt16 i = 0; i < server->namespacesSize; ++i) {
         if(UA_String_equal(&name, &server->namespaces[i]))
-            return i;
+            return (UA_UInt16) i;
     }
 
     /* Make the array bigger */
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 9f5c087c471..0391546f6d3 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -12,6 +12,7 @@
  *    Copyright 2017 (c) Julian Grothoff
  *    Copyright 2019 (c) Kalycito Infotech Private Limited
  *    Copyright 2019 (c) HMS Industrial Networks AB (Author: Jonas Green)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
 #ifndef UA_SERVER_INTERNAL_H_

From 4c0c82cef2d26b9b59111544d76acfe152da83aa Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Sat, 11 Dec 2021 14:29:00 +0100
Subject: [PATCH 0015/1963] feat(build): Add .idea project files (#4830)

This commit adds the .idea directory that contains project and
formatting definitions for CLion users. No user specific data is
contained in the directory. Opening the project in CLion will
automatically use the project files.
---
 .gitignore                           |  1 -
 .idea/.gitignore                     |  8 +++++
 .idea/codeStyles/Project.xml         | 45 ++++++++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml |  5 +++
 .idea/csv-plugin.xml                 | 51 ++++++++++++++++++++++++++++
 .idea/misc.xml                       | 12 +++++++
 .idea/modules.xml                    |  8 +++++
 .idea/open62541.iml                  |  2 ++
 .idea/vcs.xml                        |  8 +++++
 9 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/csv-plugin.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/open62541.iml
 create mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index 1ec893db20b..e6d2e291239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,7 +78,6 @@ Makefile
 /exampleClient_legacy
 /src_generated/
 /build
-/.idea
 /cmake-build*
 /tools/certs/certs/*
 Pipfile
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000000..13566b81b01
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000000..8e53702d295
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,45 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C>
+      <option name="KEEP_NESTED_NAMESPACES_IN_ONE_LINE" value="true" />
+      <option name="FUNCTION_TOP_AFTER_RETURN_TYPE_WRAP" value="2" />
+      <option name="LAMBDA_CAPTURE_LIST_ALIGN_MULTILINE" value="true" />
+      <option name="FUNCTION_CALL_ARGUMENTS_ALIGN_MULTILINE_PARS" value="true" />
+      <option name="CLASS_CONSTRUCTOR_INIT_LIST_WRAP" value="0" />
+      <option name="CLASS_CONSTRUCTOR_INIT_LIST_NEW_LINE_BEFORE_COLON" value="0" />
+      <option name="CLASS_CONSTRUCTOR_INIT_LIST_NEW_LINE_AFTER_COLON" value="2" />
+      <option name="SUPERCLASS_LIST_BEFORE_COLON" value="0" />
+      <option name="SUPERCLASS_LIST_AFTER_COLON" value="2" />
+    </Objective-C>
+    <Objective-C-extensions>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+    <codeStyleSettings language="CMake">
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+    </codeStyleSettings>
+    <codeStyleSettings language="ObjectiveC">
+      <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
+      <option name="BLANK_LINES_AFTER_IMPORTS" value="0" />
+      <option name="INDENT_CASE_FROM_SWITCH" value="false" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+      <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="LABEL_INDENT_ABSOLUTE" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 00000000000..79ee123c2b2
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/csv-plugin.xml b/.idea/csv-plugin.xml
new file mode 100644
index 00000000000..e85272a2a04
--- /dev/null
+++ b/.idea/csv-plugin.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CsvFileAttributes">
+    <option name="attributeMap">
+      <map>
+        <entry key="/deps/ua-nodeset/DotNet/Opc.Ua.StatusCodes.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
+        <entry key="/deps/ua-nodeset/Schema/StatusCode.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
+        <entry key="/deps/ua-nodeset/Schema/UNECE_to_OPCUA.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
+        <entry key="/deps/ua-nodeset/Schema/rec20_latest_a2-3.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
+        <entry key="/tools/schema/NodeIds.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
+        <entry key="/tools/schema/StatusCode.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000000..97470699605
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="CidrRootsConfiguration">
+    <sourceRoots>
+      <file path="$PROJECT_DIR$/arch" />
+      <file path="$PROJECT_DIR$/include" />
+      <file path="$PROJECT_DIR$/plugins" />
+      <file path="$PROJECT_DIR$/src" />
+    </sourceRoots>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000000..2e2b5d56c99
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/open62541.iml" filepath="$PROJECT_DIR$/.idea/open62541.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/open62541.iml b/.idea/open62541.iml
new file mode 100644
index 00000000000..f08604bb65b
--- /dev/null
+++ b/.idea/open62541.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000000..9f4ebebc6e4
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/deps/mdnsd" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/deps/ua-nodeset" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From 68520bb0d5dcaaf671cea79c369c6893e09249c0 Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Thu, 9 Dec 2021 12:12:16 +0100
Subject: [PATCH 0016/1963] fix: Fuzzing didn't compile because of missing
 sources.

---
 tests/fuzz/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index cc011927154..2b990250065 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -62,6 +62,8 @@ link_libraries("-fsanitize=fuzzer")
 
 # Use different plugins for testing
 set(fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_clock.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_networklayers.c
     ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c

From b541eca487db470a3f31aa596e4b3350a4c33359 Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Thu, 9 Dec 2021 12:04:33 +0100
Subject: [PATCH 0017/1963] refactor: Reduce log spam in eventloop

---
 arch/eventloop_posix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index b8baa216f47..f7cb3d4839a 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -268,7 +268,7 @@ processFDs(UA_EventLoop *el, UA_DateTime usedTimeout) {
 
     /* Nothing to do? */
     if(highestfd == UA_INVALID_FD) {
-        UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_TRACE(el->logger, UA_LOGCATEGORY_EVENTLOOP,
                      "No valid FDs for processing");
         return UA_STATUSCODE_GOOD;
     }
@@ -347,7 +347,7 @@ UA_StatusCode
 UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP, "iterate the EventLoop");
+    UA_LOG_TRACE(el->logger, UA_LOGCATEGORY_EVENTLOOP, "iterate the EventLoop");
 
     if(el->executing) {
         UA_LOG_ERROR(el->logger,

From f1b3f0f0f4145e2907fc57495e4e28fc532fab59 Mon Sep 17 00:00:00 2001
From: David Korczynski <david@adalogics.com>
Date: Fri, 26 Nov 2021 20:52:27 +0000
Subject: [PATCH 0018/1963] feat(ci): Add CIFuzz integration

---
 .github/workflows/cifuzz.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/cifuzz.yml

diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
new file mode 100644
index 00000000000..190798db298
--- /dev/null
+++ b/.github/workflows/cifuzz.yml
@@ -0,0 +1,24 @@
+name: CIFuzz
+on: [pull_request]
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Build Fuzzers
+      id: build
+      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'open62541'
+        dry-run: false
+    - name: Run Fuzzers
+      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'open62541'
+        fuzz-seconds: 600
+        dry-run: false
+    - name: Upload Crash
+      uses: actions/upload-artifact@v1
+      if: failure() && steps.build.outcome == 'success'
+      with:
+        name: artifacts
+        path: ./out/artifacts

From 93823da590c63fb20884db678663ac3cbe58e377 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Thu, 16 Dec 2021 11:21:30 +0100
Subject: [PATCH 0019/1963] fix(build) adjust variable type to solve reported
 code scanning finding(#4854)

---
 src/server/ua_server.c     | 2 +-
 tools/prepare_packaging.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index c2560363731..40c8ef21052 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -64,7 +64,7 @@ UA_UInt16 addNamespace(UA_Server *server, const UA_String name) {
     setupNs1Uri(server);
 
     /* Check if the namespace already exists in the server's namespace array */
-    for(UA_UInt16 i = 0; i < server->namespacesSize; ++i) {
+    for(size_t i = 0; i < server->namespacesSize; ++i) {
         if(UA_String_equal(&name, &server->namespaces[i]))
             return (UA_UInt16) i;
     }
diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index 6bcc033f19b..32da9549612 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -23,7 +23,7 @@
 # v1.2.3-5-g4538abcd-dirty
 # git_describe_version = "v1.2.3"
 
-m = re.match(r"^v([0-9]+)(\.[0-9]+)?(\.[0-9]+)?(-(.*)+)?$", git_describe_version)
+m = re.match(r"^v([0-9]{1,4})(\.[0-9]{1,4}){0,2}(-(.*){1,100})?$", git_describe_version)
 version_major = m.group(1) if m.group(1) is not None else "0"
 version_minor = m.group(2).replace(".", "") if m.group(2) is not None else "0"
 version_patch = m.group(3).replace(".", "") if m.group(3) is not None else "0"

From a01858fe70eccb133f9d42de99734a88504d8eae Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Dec 2021 14:00:13 +0100
Subject: [PATCH 0020/1963] Revert "Revert "Merge branch 'master' into 1.3""

This reverts commit 5de6a2e7c360a5eb2f461bf9fe88f9efe5cf80d9.
---
 .github/workflows/build_linux.yml             |   6 +
 .github/workflows/coverage.yml                |  32 +
 CMakeLists.txt                                |  23 +-
 CONTRIBUTING.md                               |   1 +
 {src => arch/common}/ua_timer.c               |   7 +-
 {src => arch/common}/ua_timer.h               |   6 +-
 arch/eCos/ua_architecture.h                   |   3 +-
 arch/eventloop_posix.c                        | 596 +++++++++++++
 arch/eventloop_posix.h                        |  99 ++
 arch/eventloop_posix_tcp.c                    | 788 ++++++++++++++++
 arch/posix/ua_architecture.h                  |   2 +-
 arch/vxworks/ua_architecture.h                |   3 +-
 arch/wec7/ua_architecture.h                   |   3 +-
 deps/ua-nodeset                               |   2 +-
 examples/CMakeLists.txt                       |   1 +
 examples/events/client_eventfilter.c          |  94 +-
 examples/events/server_random_events.c        |  10 +-
 examples/nodeset/CMakeLists.txt               |   2 +-
 .../nodeset/pubsub_nodeset_rt_publisher.c     |  12 +-
 .../nodeset/pubsub_nodeset_rt_subscriber.c    |  12 +-
 .../pubsub_realtime/pubsub_TSN_loopback.c     | 114 ++-
 .../pubsub_realtime/pubsub_TSN_publisher.c    | 134 ++-
 .../tutorial_server_historicaldata_circular.c | 133 +++
 include/open62541/client.h                    |   4 +
 include/open62541/plugin/eventloop.h          | 302 +++++++
 include/open62541/plugin/log.h                |   5 +-
 include/open62541/plugin/nodestore.h          |  45 +-
 include/open62541/server.h                    |  30 +-
 include/open62541/types.h                     |   5 +-
 include/open62541/util.h                      |  34 +-
 .../ua_history_data_backend_memory.c          | 261 ++++++
 .../ua_history_data_gathering_default.c       |  28 +
 .../historydata/history_data_backend_memory.h |  10 +
 .../history_data_gathering_default.h          |   8 +
 plugins/ua_config_default.c                   |  28 +-
 plugins/ua_log_stdout.c                       |   5 +-
 plugins/ua_log_syslog.c                       |   5 +-
 plugins/ua_nodestore_hashmap.c                |  17 +-
 plugins/ua_nodestore_ziptree.c                |  33 +-
 plugins/ua_pubsub_ethernet.c                  |   2 +-
 plugins/ua_pubsub_udp.c                       |   1 +
 src/client/ua_client.c                        |  53 +-
 src/client/ua_client_internal.h               |   4 +-
 src/pubsub/ua_pubsub.h                        |   1 +
 src/pubsub/ua_pubsub_manager.c                |  27 +-
 src/pubsub/ua_pubsub_networkmessage.c         |   9 +-
 src/pubsub/ua_pubsub_networkmessage.h         |   4 +
 src/pubsub/ua_pubsub_reader.c                 |  55 +-
 src/pubsub/ua_pubsub_readergroup.c            |   2 +-
 src/pubsub/ua_pubsub_writergroup.c            |  88 +-
 src/server/ua_nodes.c                         |  39 +-
 src/server/ua_server.c                        |  72 +-
 src/server/ua_server_config.c                 |  13 +
 src/server/ua_server_internal.h               |  36 +-
 src/server/ua_services_attribute.c            |  56 +-
 src/server/ua_services_method.c               |  53 +-
 src/server/ua_services_securechannel.c        |   6 +-
 src/server/ua_services_session.c              |   6 +-
 src/server/ua_services_view.c                 |  98 +-
 src/server/ua_session.c                       |  53 +-
 src/server/ua_subscription.c                  |   4 +-
 src/server/ua_subscription.h                  |   9 +-
 src/server/ua_subscription_events.c           | 308 +++++--
 src/server/ua_subscription_monitoreditem.c    |   4 +-
 src/ua_securechannel.h                        |   1 +
 src/ua_types_print.c                          |  48 +-
 src/ua_util.c                                 |  73 +-
 src/ua_util_internal.h                        |   3 +
 tests/CMakeLists.txt                          |  39 +-
 tests/check_eventloop.c                       |  65 ++
 tests/check_eventloop_tcp.c                   | 256 ++++++
 tests/check_types_memory.c                    |  73 +-
 tests/nodeset-compiler/CMakeLists.txt         |   2 +-
 .../pubsub/check_pubsub_encrypted_rt_levels.c | 843 ++++++++++++++++++
 tests/server/check_nodestore.c                |  23 +-
 .../check_server_historical_data_circular.c   | 294 ++++++
 tests/server/check_server_readspeed.c         |   5 +-
 tools/ci.sh                                   |  50 ++
 tools/cmake/FindCheck.cmake                   |   2 +-
 tools/cmake/FindGcov.cmake                    | 162 ++++
 tools/cmake/Findcodecov.cmake                 | 265 ++++++
 .../backend_open62541_typedefinitions.py      |   2 +-
 tools/nodeset_compiler/nodes.py               |   3 +
 83 files changed, 5532 insertions(+), 583 deletions(-)
 create mode 100644 .github/workflows/coverage.yml
 rename {src => arch/common}/ua_timer.c (98%)
 rename {src => arch/common}/ua_timer.h (97%)
 create mode 100644 arch/eventloop_posix.c
 create mode 100644 arch/eventloop_posix.h
 create mode 100644 arch/eventloop_posix_tcp.c
 create mode 100644 examples/tutorial_server_historicaldata_circular.c
 create mode 100644 include/open62541/plugin/eventloop.h
 create mode 100644 tests/check_eventloop.c
 create mode 100644 tests/check_eventloop_tcp.c
 create mode 100644 tests/pubsub/check_pubsub_encrypted_rt_levels.c
 create mode 100644 tests/server/check_server_historical_data_circular.c
 create mode 100644 tools/cmake/FindGcov.cmake
 create mode 100644 tools/cmake/Findcodecov.cmake

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 4dbbc2c1074..7c54cfa8438 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -11,6 +11,12 @@ jobs:
           - build_name: "Debug Build & Unit Tests (gcc)"
             cmd_deps: ""
             cmd_action: unit_tests
+          - build_name: "Debug Build & Unit Tests (gcc, 32bit)"
+            cmd_deps: |
+                sudo dpkg --add-architecture i386
+                sudo apt-get update
+                sudo apt-get install -y -qq gcc-multilib libsubunit-dev:i386 check:i386
+            cmd_action: unit_tests_32
           - build_name: "Debug Build & Unit Tests with multithreading (gcc)"
             cmd_deps: ""
             cmd_action: unit_tests_mt
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
new file mode 100644
index 00000000000..5b5dce53134
--- /dev/null
+++ b/.github/workflows/coverage.yml
@@ -0,0 +1,32 @@
+name: "Coverage Test"
+on:
+  push:
+    branches: [ main, master ]
+    tags:
+      - v1.*
+  pull_request:
+    branches: [ main, master ]
+    tags:
+      - v1.*
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y -qq python3-sphinx graphviz check libmbedtls-dev
+      - name: Fetch
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Execute Tests
+        run: source tools/ci.sh && unit_tests_with_coverage
+        env:
+          ETHERNET_INTERFACE: eth0
+      - name: Debug print
+        run: |
+          tree .
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcca1eee6f6..bc53b7112fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,11 +117,14 @@ GET_PROPERTY(ua_architecture_sources GLOBAL PROPERTY UA_ARCHITECTURE_SOURCES)
 
 set(ua_architecture_sources ${ua_architecture_sources}
     ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
 )
 
 set(ua_architecture_headers ${ua_architecture_headers}
     ${PROJECT_SOURCE_DIR}/include/open62541/network_tcp.h
     ${PROJECT_SOURCE_DIR}/include/open62541/architecture_functions.h
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h
 )
 
 if(UA_ENABLE_WEBSOCKET_SERVER)
@@ -289,8 +292,9 @@ if((UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS) AND (NOT (UA_ENABLE_SUBSCRIPTIONS
 endif()
 
 if(UA_ENABLE_COVERAGE)
-  set(CMAKE_BUILD_TYPE DEBUG)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
+  # We are using the scripts provided at for coverage testing: https://github.com/RWTH-HPC/CMake-codecov
+  set(ENABLE_COVERAGE ON)
+  find_package(codecov REQUIRED)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
 endif()
@@ -673,7 +677,10 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST
 
     # Force 32bit build
     if(UA_FORCE_32BIT)
-	check_add_cc_flag("-m32")
+      if(MSVC)
+        message(FATAL_ERROR "Select the 32bit (cross-) compiler instead of forcing compiler options")
+      endif()
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") # GCC and Clang, possibly more
     endif()
 
     if(NOT MINGW AND NOT UA_BUILD_OSS_FUZZ)
@@ -856,6 +863,7 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/pubsub.h
                      ${PROJECT_SOURCE_DIR}/deps/ziptree.h
                      ${PROJECT_SOURCE_DIR}/deps/aa_tree.h
+                     ${PROJECT_SOURCE_DIR}/include/open62541/plugin/eventloop.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h
                      ${historizing_exported_headers}
                      ${PROJECT_SOURCE_DIR}/include/open62541/server_pubsub.h
@@ -875,7 +883,7 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated_handling.h
                      ${PROJECT_SOURCE_DIR}/src/ua_connection_internal.h
                      ${PROJECT_SOURCE_DIR}/src/ua_securechannel.h
-                     ${PROJECT_SOURCE_DIR}/src/ua_timer.h
+                     ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_session.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_subscription.h
                      ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage.h
@@ -896,7 +904,7 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c
                 ${PROJECT_SOURCE_DIR}/src/ua_util.c
-                ${PROJECT_SOURCE_DIR}/src/ua_timer.c
+                ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.c
                 ${PROJECT_SOURCE_DIR}/src/ua_connection.c
                 ${PROJECT_SOURCE_DIR}/src/ua_securechannel.c
                 ${PROJECT_SOURCE_DIR}/src/ua_securechannel_crypto.c
@@ -1360,8 +1368,11 @@ else()
                       open62541-generator-statuscode
                       open62541-generator-namespace
                       )
-
+    if(UA_ENABLE_COVERAGE)
+        add_coverage(open62541-object)
+    endif()
     target_include_directories(open62541-object PRIVATE ${PROJECT_SOURCE_DIR}/src)
+    target_include_directories(open62541-object PRIVATE ${PROJECT_SOURCE_DIR}/arch) # TODO: Remove once the EventLoop is integrated
 
     add_library(open62541-plugins OBJECT ${default_plugin_sources} ${ua_architecture_sources} ${exported_headers})
     add_dependencies(open62541-plugins open62541-generator-types open62541-generator-transport open62541-generator-namespace)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2f1f73a1da9..92966dd71d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -103,6 +103,7 @@ The scope is optional, but recommended to be used. It should be the name of the
 The following is the list of supported scopes:
 
 - **arch**: Changes to specific architecture code in `root/arch`
+- **el**: Changes to the eventloop and associated event sources (also networking)
 - **client**: Changes only affecting client code
 - **core**: Core functionality used by the client and server
 - **ex**: Example code changes
diff --git a/src/ua_timer.c b/arch/common/ua_timer.c
similarity index 98%
rename from src/ua_timer.c
rename to arch/common/ua_timer.c
index 4d9507907a2..51c0bf31a58 100644
--- a/src/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -6,7 +6,6 @@
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  */
 
-#include "ua_util_internal.h"
 #include "ua_timer.h"
 
 /* There may be several entries with the same nextTime in the tree. We give them
@@ -273,6 +272,12 @@ UA_Timer_process(UA_Timer *t, UA_DateTime nowMonotonic,
     return next;
 }
 
+UA_DateTime
+UA_Timer_nextRepeatedTime(UA_Timer *t) {
+    UA_TimerEntry *first = (UA_TimerEntry*)aa_min(&t->root);
+    return (first) ? first->nextTime : UA_INT64_MAX;
+}
+
 void
 UA_Timer_clear(UA_Timer *t) {
     UA_LOCK(&t->timerMutex);
diff --git a/src/ua_timer.h b/arch/common/ua_timer.h
similarity index 97%
rename from src/ua_timer.h
rename to arch/common/ua_timer.h
index 99810e7b43d..00e406b1254 100644
--- a/src/ua_timer.h
+++ b/arch/common/ua_timer.h
@@ -9,7 +9,8 @@
 #ifndef UA_TIMER_H_
 #define UA_TIMER_H_
 
-#include "ua_util_internal.h"
+#include <open62541/types.h>
+#include <open62541/util.h>
 #include "aa_tree.h"
 
 _UA_BEGIN_DECLS
@@ -55,6 +56,9 @@ typedef struct {
 void
 UA_Timer_init(UA_Timer *t);
 
+UA_DateTime
+UA_Timer_nextRepeatedTime(UA_Timer *t);
+
 UA_StatusCode
 UA_Timer_addTimedCallback(UA_Timer *t, UA_ApplicationCallback callback,
                           void *application, void *data, UA_DateTime date,
diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
index 4980b93ab55..c6ef58dbd60 100644
--- a/arch/eCos/ua_architecture.h
+++ b/arch/eCos/ua_architecture.h
@@ -39,7 +39,8 @@
 #define UA_WOULDBLOCK EWOULDBLOCK
 #define UA_ERR_CONNECTION_PROGRESS EINPROGRESS
 
-#define UA_getnameinfo getnameinfo
+#define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
+    getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 #define UA_send send
 #define UA_recv recv
 #define UA_sendto sendto
diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
new file mode 100644
index 00000000000..d62620984ba
--- /dev/null
+++ b/arch/eventloop_posix.c
@@ -0,0 +1,596 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#include "eventloop_posix.h"
+#include "common/ua_timer.h"
+
+typedef struct {
+    UA_FD fd;
+    short eventMask;
+    UA_EventSource *es;
+    UA_FDCallback callback;
+    void *fdcontext;
+} UA_RegisteredFD;
+
+struct UA_EventLoop {
+    UA_EventLoopState state;
+    const UA_Logger *logger;
+    
+    /* Timer */
+    UA_Timer timer;
+
+    /* Linked List of Delayed Callbacks */
+    UA_DelayedCallback *delayedCallbacks;
+
+    /* Pointers to registered EventSources */
+    UA_EventSource *eventSources;
+
+    /* Registered file descriptors */
+    size_t fdsSize;
+    UA_RegisteredFD *fds;
+
+    /* Flag determining whether the eventloop is currently within the "run" method */
+    UA_Boolean executing;
+
+#if UA_MULTITHREADING >= 100
+    UA_Lock elMutex;
+#endif
+};
+
+/*********/
+/* Timer */
+/*********/
+
+static UA_StatusCode
+processFDs(UA_EventLoop *el, UA_DateTime usedTimeout);
+
+static void
+timerExecutionTrampoline(void *executionApplication, UA_ApplicationCallback cb,
+                         void *callbackApplication, void *data) {
+    cb(callbackApplication, data);
+}
+
+UA_StatusCode
+UA_EventLoop_addTimedCallback(UA_EventLoop *el, UA_Callback callback,
+                              void *application, void *data, UA_DateTime date,
+                              UA_UInt64 *callbackId) {
+    return UA_Timer_addTimedCallback(&el->timer, callback, application,
+                                     data, date, callbackId);
+}
+
+UA_StatusCode
+UA_EventLoop_addCyclicCallback(UA_EventLoop *el, UA_Callback cb,
+                               void *application, void *data, UA_Double interval_ms,
+                               UA_DateTime *baseTime, UA_TimerPolicy timerPolicy,
+                               UA_UInt64 *callbackId) {
+    return UA_Timer_addRepeatedCallback(&el->timer, cb, application, data,
+                                        interval_ms, baseTime, timerPolicy, callbackId);
+}
+
+UA_StatusCode
+UA_EventLoop_modifyCyclicCallback(UA_EventLoop *el, UA_UInt64 callbackId,
+                                  UA_Double interval_ms, UA_DateTime *baseTime,
+                                  UA_TimerPolicy timerPolicy) {
+    return UA_Timer_changeRepeatedCallback(&el->timer, callbackId, interval_ms,
+                                           baseTime, timerPolicy);
+}
+
+void
+UA_EventLoop_removeCyclicCallback(UA_EventLoop *el, UA_UInt64 callbackId) {
+    UA_Timer_removeCallback(&el->timer, callbackId);
+}
+
+void
+UA_EventLoop_addDelayedCallback(UA_EventLoop *el, UA_DelayedCallback *dc) {
+    UA_LOCK(&el->elMutex);
+    dc->next = el->delayedCallbacks;
+    el->delayedCallbacks = dc;
+    UA_UNLOCK(&el->elMutex);
+}
+
+/* Process and then free registered delayed callbacks */
+static void
+processDelayed(UA_EventLoop *el) {
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+    while(el->delayedCallbacks) {
+        UA_DelayedCallback *dc = el->delayedCallbacks;
+        el->delayedCallbacks = dc->next;
+        /* Delayed Callbacks might have no cb pointer if all we want to do is
+         * free the memory */
+        if(dc->callback) {
+            UA_UNLOCK(&el->elMutex);
+            dc->callback(dc->application, dc->data);
+            UA_LOCK(&el->elMutex);
+        }
+        UA_free(dc);
+    }
+}
+
+/***********************/
+/* EventLoop Lifecycle */
+/***********************/
+
+UA_EventLoop *
+UA_EventLoop_new(const UA_Logger *logger) {
+    UA_EventLoop *el = (UA_EventLoop*)UA_malloc(sizeof(UA_EventLoop));
+    if(!el)
+        return NULL;
+    memset(el, 0, sizeof(UA_EventLoop));
+    UA_LOCK_INIT(&el->elMutex);
+    el->logger = logger;
+    UA_Timer_init(&el->timer);
+    return el;
+}
+
+UA_StatusCode
+UA_EventLoop_delete(UA_EventLoop *el) {
+    UA_LOCK(&el->elMutex);
+
+    /* Check if the EventLoop can be deleted */
+    if(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+       el->state != UA_EVENTLOOPSTATE_FRESH) {
+        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                       "Cannot delete a running EventLoop");
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Deregister and delete all the EventSources */
+    while(el->eventSources) {
+        UA_EventSource *es = el->eventSources;
+        UA_UNLOCK(&el->elMutex);
+        UA_EventLoop_deregisterEventSource(el, es);
+        UA_LOCK(&el->elMutex);
+        es->free(es);
+    }
+
+    /* Remove the repeated timed callbacks */
+    UA_Timer_clear(&el->timer);
+
+    /* Process remaining delayed callbacks */
+    processDelayed(el);
+
+    /* free the file descriptors */
+    UA_free(el->fds);
+
+    /* Clean up */
+    UA_UNLOCK(&el->elMutex);
+    UA_LOCK_DESTROY(&el->elMutex);
+    UA_free(el);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_EventLoopState
+UA_EventLoop_getState(UA_EventLoop *el) {
+    return el->state;
+}
+
+UA_DateTime
+UA_EventLoop_nextCyclicTime(UA_EventLoop *el) {
+    return UA_Timer_nextRepeatedTime(&el->timer);
+}
+
+UA_StatusCode
+UA_EventLoop_start(UA_EventLoop *el) {
+    UA_LOCK(&el->elMutex);
+    if(el->state != UA_EVENTLOOPSTATE_FRESH &&
+       el->state != UA_EVENTLOOPSTATE_STOPPED) {
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP, "Starting the EventLoop");
+
+    UA_EventSource *es = el->eventSources;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    while(es) {
+        UA_UNLOCK(&el->elMutex);
+        res |= es->start(es);
+        UA_LOCK(&el->elMutex);
+        es = es->next;
+    }
+
+    el->state = UA_EVENTLOOPSTATE_STARTED;
+    UA_UNLOCK(&el->elMutex);
+    return res;
+}
+
+static void
+checkClosed(UA_EventLoop *el) {
+    UA_EventSource *es = el->eventSources;
+    while(es) {
+        if(es->state != UA_EVENTSOURCESTATE_STOPPED)
+            return;
+        es = es->next;
+    }
+
+    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP, "The EventLoop has stopped");
+    el->state = UA_EVENTLOOPSTATE_STOPPED;
+}
+
+void
+UA_EventLoop_stop(UA_EventLoop *el) {
+    UA_LOCK(&el->elMutex);
+
+    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP, "Stopping the EventLoop");
+
+    /* Shutdown all event sources. This will close open connections. */
+    UA_EventSource *es = el->eventSources;
+    while(es) {
+        if(es->state == UA_EVENTSOURCESTATE_STARTING ||
+           es->state == UA_EVENTSOURCESTATE_STARTED)
+            es->stop(es);
+        es = es->next;
+    }
+
+    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "All EventSources are stopped");
+
+    el->state = UA_EVENTLOOPSTATE_STOPPING;
+    checkClosed(el);
+    UA_UNLOCK(&el->elMutex);
+}
+
+/* After every select, reset the file-descriptors to listen on */
+static UA_FD
+setFDSets(UA_EventLoop *el, fd_set *readset, fd_set *writeset, fd_set *errset) {
+    FD_ZERO(readset);
+    FD_ZERO(writeset);
+    FD_ZERO(errset);
+    UA_FD highestfd = UA_INVALID_FD;
+    for(size_t i = 0; i < el->fdsSize; i++) {
+
+        UA_FD currentFD = el->fds[i].fd;
+        /* Add to the fd_sets */
+        if(el->fds[i].eventMask & UA_POSIX_EVENT_READ)
+            UA_fd_set(currentFD, readset);
+        if(el->fds[i].eventMask & UA_POSIX_EVENT_WRITE)
+            UA_fd_set(currentFD, writeset);
+        if(el->fds[i].eventMask & UA_POSIX_EVENT_ERR)
+            UA_fd_set(currentFD, errset);
+
+        /* Highest fd? */
+        if(currentFD > highestfd || highestfd == UA_INVALID_FD)
+            highestfd = currentFD;
+    }
+    return highestfd;
+}
+
+static UA_StatusCode
+processFDs(UA_EventLoop *el, UA_DateTime usedTimeout) {
+    fd_set readset, writeset, errset;
+    UA_FD highestfd = setFDSets(el, &readset, &writeset, &errset);
+
+    /* Nothing to do? */
+    if(highestfd == UA_INVALID_FD) {
+        UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "No valid FDs for processing");
+        return UA_STATUSCODE_GOOD;
+    }
+
+    struct timeval tmptv = {
+#ifndef _WIN32
+        (time_t)(usedTimeout / UA_DATETIME_SEC),
+        (suseconds_t)((usedTimeout % UA_DATETIME_SEC) / UA_DATETIME_USEC)
+#else
+        (long)(usedTimeout / UA_DATETIME_SEC),
+        (long)((usedTimeout % UA_DATETIME_SEC) / UA_DATETIME_USEC)
+#endif
+    };
+
+    int selectStatus =  UA_select(highestfd+1, &readset, &writeset, &errset, &tmptv);
+    if(selectStatus < 0) {
+        /* We will retry, only log the error */
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(UA_EventLoop_getLogger(el),
+                           UA_LOGCATEGORY_EVENTLOOP,
+                           "Error during select: %s", errno_str));
+        el->executing = false;
+        return UA_STATUSCODE_GOODCALLAGAIN;
+    }
+
+    /* Loop over all registered FD to see if an event arrived. Yes, this is why
+      * select is slow for many open sockets. */
+    for(size_t i = 0; i < el->fdsSize; i++) {
+        UA_RegisteredFD *rfd = &el->fds[i];
+        UA_FD fd = rfd->fd;
+        UA_assert(fd > 0);
+
+        UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "Processing fd: %u", (unsigned)fd);
+
+        /* Error Event */
+        if((rfd->eventMask & UA_POSIX_EVENT_ERR) && UA_fd_isset(fd, &errset)) {
+            UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                         "Processing error event for fd: %u", (unsigned)fd);
+            UA_UNLOCK(&el->elMutex);
+            rfd->callback(rfd->es, fd, &rfd->fdcontext, UA_POSIX_EVENT_ERR);
+            UA_LOCK(&el->elMutex);
+            if(i == el->fdsSize || fd != el->fds[i].fd)
+                i--; /* The fd has removed itself */
+            continue;
+        }
+
+        /* Read Event */
+        if((rfd->eventMask & UA_POSIX_EVENT_READ) && UA_fd_isset(fd, &readset)) {
+            UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                         "Processing read event for fd: %u", (unsigned)fd);
+            UA_UNLOCK(&el->elMutex);
+            rfd->callback(rfd->es, fd, &rfd->fdcontext, UA_POSIX_EVENT_READ);
+            UA_LOCK(&el->elMutex);
+            if(i == el->fdsSize || fd != el->fds[i].fd)
+                i--; /* The fd has removed itself */
+            continue;
+        }
+
+        /* Write Event */
+        if((rfd->eventMask & UA_POSIX_EVENT_WRITE) && UA_fd_isset(fd, &writeset)) {
+            UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                         "Processing write event for fd: %u", (unsigned)fd);
+            UA_UNLOCK(&el->elMutex);
+            rfd->callback(rfd->es, fd, &rfd->fdcontext, UA_POSIX_EVENT_WRITE);
+            UA_LOCK(&el->elMutex);
+            if(i == el->fdsSize || fd != el->fds[i].fd)
+                i--; /* The fd has removed itself */
+            continue;
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
+    UA_LOCK(&el->elMutex);
+
+    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP, "iterate the EventLoop");
+
+    if(el->executing) {
+        UA_LOG_ERROR(el->logger,
+                     UA_LOGCATEGORY_EVENTLOOP,
+                     "Cannot run EventLoop from the run method itself");
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    /* TODO: use check macros instead
+    UA_CHECK_ERROR(!el->executing, return UA_STATUSCODE_BADINTERNALERROR, el->logger,
+                   UA_LOGCATEGORY_EVENTLOOP,
+                   "Cannot run eventloop from the run method itself");
+    */
+
+    el->executing = true;
+
+    if(el->state == UA_EVENTLOOPSTATE_FRESH ||
+       el->state == UA_EVENTLOOPSTATE_STOPPED) {
+        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                       "Cannot iterate a stopped EventLoop");
+        el->executing = false;
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Process cyclic callbacks */
+    UA_DateTime dateBeforeCallback = UA_DateTime_nowMonotonic();
+
+    UA_UNLOCK(&el->elMutex);
+    UA_DateTime dateOfNextCallback =
+        UA_Timer_process(&el->timer, dateBeforeCallback, timerExecutionTrampoline, NULL);
+    UA_LOCK(&el->elMutex);
+
+    UA_DateTime dateAfterCallback = UA_DateTime_nowMonotonic();
+
+    UA_DateTime processTimerDuration = dateAfterCallback - dateBeforeCallback;
+
+    UA_DateTime callbackTimeout = dateOfNextCallback - dateAfterCallback;
+    UA_DateTime maxTimeout = UA_MAX(timeout * UA_DATETIME_MSEC - processTimerDuration, 0);
+
+    UA_DateTime usedTimeout = UA_MIN(callbackTimeout, maxTimeout);
+
+    /* Listen on the active file-descriptors (sockets) from the ConnectionManagers */
+    UA_StatusCode rv = processFDs(el, usedTimeout);
+    if(rv == UA_STATUSCODE_GOODCALLAGAIN) {
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_GOOD;
+    }
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&el->elMutex);
+        return rv;
+    }
+
+    /* Process and then free registered delayed callbacks */
+    processDelayed(el);
+
+    /* Check if the last EventSource was successfully stopped */
+    if(el->state == UA_EVENTLOOPSTATE_STOPPING)
+        checkClosed(el);
+
+    el->executing = false;
+    UA_UNLOCK(&el->elMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
+
+/*****************************/
+/* Registering Event Sources */
+/*****************************/
+
+UA_StatusCode
+UA_EventLoop_registerEventSource(UA_EventLoop *el, UA_EventSource *es) {
+    /* Already registered? */
+    if(es->state != UA_EVENTSOURCESTATE_FRESH) {
+        UA_LOG_ERROR(UA_EventLoop_getLogger(el), UA_LOGCATEGORY_NETWORK,
+                     "Cannot register the EventSource \"%.*s\": already registered",
+                     (int)es->name.length, (char*)es->name.data);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Add to linked list */
+    UA_LOCK(&el->elMutex);
+    es->next = el->eventSources;
+    el->eventSources = es;
+    UA_UNLOCK(&el->elMutex);
+
+    es->eventLoop = el;
+    es->state = UA_EVENTSOURCESTATE_STOPPED;
+
+    /* Start if the entire EventLoop is started */
+    if(el->state == UA_EVENTLOOPSTATE_STARTED)
+        return es->start(es);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_EventLoop_deregisterEventSource(UA_EventLoop *el, UA_EventSource *es) {
+    if(es->state != UA_EVENTSOURCESTATE_STOPPED) {
+        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                       "Cannot deregister the EventSource %.*s. Has to be stopped first",
+                       (int)es->name.length, es->name.data);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Remove from the linked list */
+    UA_LOCK(&el->elMutex);
+    UA_EventSource **s = &el->eventSources;
+    while(*s) {
+        if(*s == es) {
+            *s = es->next;
+            break;
+        }
+        s = &(*s)->next;
+    }
+    UA_UNLOCK(&el->elMutex);
+
+    /* Set the state to non-registered */
+    es->state = UA_EVENTSOURCESTATE_FRESH;
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/********************************/
+/* Registering File Descriptors */
+/********************************/
+
+UA_StatusCode
+UA_EventLoop_registerFD(UA_EventLoop *el, UA_FD fd, short eventMask,
+                        UA_FDCallback cb, UA_EventSource *es, void *fdcontext) {
+    UA_LOCK(&el->elMutex);
+
+    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Registering fd: %u", (unsigned)fd);
+
+    /* Realloc */
+    UA_RegisteredFD *fds_tmp = (UA_RegisteredFD*)
+        UA_realloc(el->fds, sizeof(UA_RegisteredFD) * (el->fdsSize + 1));
+    if(!fds_tmp) {
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    el->fds = fds_tmp;
+
+    /* Add to the last entry */
+    el->fds[el->fdsSize].callback = cb;
+    el->fds[el->fdsSize].eventMask = eventMask;
+    el->fds[el->fdsSize].es = es;
+    el->fds[el->fdsSize].fdcontext = fdcontext;
+    el->fds[el->fdsSize].fd = fd;
+    el->fdsSize++;
+
+    UA_UNLOCK(&el->elMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_EventLoop_modifyFD(UA_EventLoop *el, UA_FD fd, short eventMask,
+                      UA_FDCallback cb, void *fdcontext) {
+    UA_LOCK(&el->elMutex);
+
+    /* Find the entry */
+    size_t i = 0;
+    for(; i < el->fdsSize; i++) {
+        if(el->fds[i].fd == fd)
+            break;
+    }
+
+    /* Not found? */
+    if(i == el->fdsSize) {
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+
+    /* Modify */
+    el->fds[i].callback = cb;
+    el->fds[i].eventMask = eventMask;
+    el->fds[i].fdcontext = fdcontext;
+
+    UA_UNLOCK(&el->elMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd) {
+    UA_LOCK(&el->elMutex);
+
+    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Unregistering fd: %u", (unsigned)fd);
+
+    /* Find the entry */
+    size_t i = 0;
+    for(; i < el->fdsSize; i++) {
+        if(el->fds[i].fd == fd)
+            break;
+    }
+
+    /* Not found? */
+    if(i == el->fdsSize) {
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+
+    if(el->fdsSize > 1) {
+        /* Move the last entry in the ith slot and realloc. */
+        el->fdsSize--;
+        el->fds[i] = el->fds[el->fdsSize];
+        UA_RegisteredFD *fds_tmp = (UA_RegisteredFD*)
+            UA_realloc(el->fds, sizeof(UA_RegisteredFD) * el->fdsSize);
+        /* if realloc fails the fds are still in a correct state with 
+         * possibly lost memory, so failing silently here is ok */
+        if(fds_tmp)
+            el->fds = fds_tmp;
+    } else {
+        /* Remove the last entry */
+        UA_free(el->fds);
+        el->fds = NULL;
+        el->fdsSize = 0;
+    }
+
+    UA_UNLOCK(&el->elMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
+void
+UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es, UA_FDCallback cb) {
+    for(size_t i = 0; i < el->fdsSize; i++) {
+        if(el->fds[i].es != es)
+            continue;
+        UA_FD fd = el->fds[i].fd;
+        cb(es, fd, el->fds[i].fdcontext, 0);
+        if(i == el->fdsSize || fd != el->fds[i].fd)
+            i--; /* The fd has removed itself */
+    }
+}
+
+/* Helper Functions */
+
+const UA_Logger *
+UA_EventLoop_getLogger(UA_EventLoop *el) {
+    return el->logger;
+}
+
+void
+UA_EventLoop_setLogger(UA_EventLoop *el, const UA_Logger *logger) {
+    el->logger = logger;
+}
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
new file mode 100644
index 00000000000..fcc1dd8ce31
--- /dev/null
+++ b/arch/eventloop_posix.h
@@ -0,0 +1,99 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#ifndef UA_EVENTLOOP_POSIX_H_
+#define UA_EVENTLOOP_POSIX_H_
+
+#include <open62541/config.h>
+#include <open62541/plugin/eventloop.h>
+
+/* A macro-forest to work around small differences between POSIX and
+ * nearly-POSIX architectures */
+
+#if defined(_WIN32) /* Windows */
+# include <winsock2.h>
+# if !defined(__MINGW32__) || defined(__clang__)
+#  define UA_FD SOCKET /* On MSVC, a socket is a pointer and not an int */
+#  define UA_INVALID_FD INVALID_SOCKET
+//#  define UA_close(s) closesocket(s) /* closesocket() takes a SOCKET (and sock() an int) */
+# endif
+# define UA_ERRNO WSAGetLastError()
+# define UA_INTERRUPTED WSAEINTR
+# define UA_AGAIN WSAEWOULDBLOCK
+# define UA_EAGAIN EAGAIN
+# define UA_WOULDBLOCK WSAEWOULDBLOCK
+# define UA_ERR_CONNECTION_PROGRESS WSAEWOULDBLOCK
+#else /* Unix */
+# include <sys/select.h>
+#endif
+
+/* Catch-all for the architectures that are "actually POSIX" */
+#ifndef UA_FD
+# define UA_FD int
+# define UA_INVALID_FD -1
+//# define UA_close(s) close(s)
+#endif
+#ifndef UA_ERRNO
+# define UA_ERRNO errno
+# define UA_INTERRUPTED EINTR
+# define UA_AGAIN EAGAIN
+# define UA_EAGAIN EAGAIN
+# define UA_WOULDBLOCK EWOULDBLOCK
+# define UA_ERR_CONNECTION_PROGRESS EINPROGRESS
+#endif
+
+/* Workaround a bug in early glibc. Additionally, some non-glibc implementations
+ * use a macro for FD_SET that triggers a cast-warning (e.g. early BSD libc or
+ * musl libc). */
+#if (!defined(__GNU_LIBRARY__) && defined(FD_SET)) ||       \
+    (defined(__GNU_LIBRARY__) && (__GNU_LIBRARY__ <= 6) &&  \
+     (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 16))
+# define UA_FD_SET(fd, fds) FD_SET((unsigned int)fd, fds)
+# define UA_FD_ISSET(fd, fds) FD_ISSET((unsigned int)fd, fds)
+#else
+# define UA_FD_SET(fd, fds) FD_SET((UA_FD)fd, fds)
+# define UA_FD_ISSET(fd, fds) FD_ISSET((UA_FD)fd, fds)
+#endif
+
+_UA_BEGIN_DECLS
+
+/* POSIX events are based on sockets / file descriptors. The EventSources can
+ * register their fd in the EventLoop so that they are considered by the
+ * EventLoop dropping into "select" to wait for events. */
+
+/* POSIX-select can listen for three types of events. It has to be selected
+ * for each registered fd which events they are interested in.  */
+#define UA_POSIX_EVENT_READ 1
+#define UA_POSIX_EVENT_WRITE 2
+#define UA_POSIX_EVENT_ERR 4
+
+typedef void
+(*UA_FDCallback)(UA_EventSource *es, UA_FD fd, void *fdcontext, short event);
+
+UA_StatusCode
+UA_EventLoop_registerFD(UA_EventLoop *el, UA_FD fd, short eventMask,
+                        UA_FDCallback cb, UA_EventSource *es, void *fdcontext);
+
+/* Change the fd settings (event mask, callback) in-place. Fails only if the fd
+ * no longer exists. */
+UA_StatusCode
+UA_EventLoop_modifyFD(UA_EventLoop *el, UA_FD fd, short eventMask,
+                      UA_FDCallback cb, void *fdcontext);
+
+/* During processing of an fd-event, the fd may deregister itself. But in the
+ * fd-callback they must not deregister another fd. */
+UA_StatusCode
+UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd);
+
+/* Call the callback for all fd that are registered from that event source */
+void
+UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es, UA_FDCallback cb);
+
+_UA_END_DECLS
+
+#endif /* UA_EVENTLOOP_POSIX_H_ */
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
new file mode 100644
index 00000000000..66dd0ab6263
--- /dev/null
+++ b/arch/eventloop_posix_tcp.c
@@ -0,0 +1,788 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#include "eventloop_posix.h"
+
+#define UA_MAXBACKLOG 100
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+#ifndef MSG_DONTWAIT
+#define MSG_DONTWAIT 0
+#endif
+
+typedef struct {
+    UA_ConnectionManager cm;
+    size_t fdCount; /* Number of fd registered in the EventLoop */
+    size_t recvBufferSize;
+} TCPConnectionManager;
+
+static UA_StatusCode
+TCP_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                       UA_ByteString *buf, size_t bufSize) {
+    return UA_ByteString_allocBuffer(buf, bufSize);
+}
+
+static void
+TCP_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                      UA_ByteString *buf) {
+    UA_ByteString_clear(buf);
+}
+
+/* Set the socket non-blocking */
+static UA_StatusCode
+TCP_setNonBlocking(UA_FD sockfd) {
+#ifndef _WIN32
+    int opts = fcntl(sockfd, F_GETFL);
+    if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#else
+    u_long iMode = 1;
+    if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Don't have the socket create interrupt signals */
+static UA_StatusCode
+TCP_setNoSigPipe(UA_FD sockfd) {
+#ifdef SO_NOSIGPIPE
+    int val = 1;
+    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
+    if(res < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Do not merge packets on the socket (disable Nagle's algorithm) */
+static UA_StatusCode
+TCP_setNoNagle(UA_FD sockfd) {
+    int val = 1;
+    int res = UA_setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
+    if(res < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+TCP_close(UA_ConnectionManager *cm, UA_FD fd) {
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                 UA_LOGCATEGORY_NETWORK,
+                 "TCP #%u\t| Closing connection", (unsigned)fd);
+
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+
+    /* Close the fd and deregister */
+    int ret = UA_close(fd);
+    if(ret != 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    UA_StatusCode sc = UA_EventLoop_deregisterFD(tcm->cm.eventSource.eventLoop, fd);
+    if(sc != UA_STATUSCODE_GOOD)
+        return sc;
+
+    /* Reduce the count */
+    UA_assert(tcm->fdCount > 0);
+    tcm->fdCount--;
+
+    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOGCATEGORY_NETWORK, "TCP #%u\t| Socket closed", (unsigned)fd);
+
+    /* Stopped? */
+    if(tcm->fdCount == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
+        UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_NETWORK,
+                     "TCP\t| All sockets closed, the EventLoop has stopped");
+        cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Gets called when a connection socket opens, receives data or closes */
+static void
+TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
+                             void **fdcontext, short event) {
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                 UA_LOGCATEGORY_NETWORK,
+                 "TCP #%u\t| Activity on the socket", (unsigned)fd);
+
+    /* Write-Event, a new connection has opened.  */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(event & UA_POSIX_EVENT_WRITE) {
+        UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_NETWORK,
+                     "TCP #%u\t| Opening a new connection", (unsigned)fd);
+
+        /* The socket has opened. Signal it to the application. */
+        cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
+                               UA_STATUSCODE_GOOD, UA_BYTESTRING_NULL);
+
+        /* Now we are interested in read-events. */
+        UA_EventLoop_modifyFD(cm->eventSource.eventLoop, fd, UA_POSIX_EVENT_READ,
+                              (UA_FDCallback)TCP_connectionSocketCallback, *fdcontext);
+        return;
+    }
+
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                 UA_LOGCATEGORY_NETWORK,
+                 "TCP #%u\t| Allocate receive buffer", (unsigned)fd);
+
+    /* Allocate the receive-buffer */
+    UA_ByteString response;
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    res = UA_ByteString_allocBuffer(&response, tcm->recvBufferSize);
+    if(res != UA_STATUSCODE_GOOD)
+        return; /* Retry in the next iteration */
+
+    /* Receive */
+#ifndef _WIN32
+    ssize_t ret = UA_recv(fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                 UA_LOGCATEGORY_NETWORK,
+                 "TCP #%u\t| recv(...) returned %zd", (unsigned)fd, ret);
+#else
+    int ret = UA_recv(fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                 UA_LOGCATEGORY_NETWORK,
+                 "TCP #%u\t| recv(...) returned %d", (unsigned)fd, ret);
+#endif
+
+    if(ret > 0) {
+        UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_NETWORK,
+                     "TCP #%u\t| Received message of size %u",
+                     (unsigned)fd, (unsigned)ret);
+
+        /* Callback to the application layer */
+        response.length = (size_t)ret; /* Set the length of the received buffer */
+        cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
+                               UA_STATUSCODE_GOOD, response);
+    } else if(UA_ERRNO != UA_INTERRUPTED && UA_ERRNO != UA_EAGAIN) {
+        /* Orderly shutdown of the connection. Signal to the application and
+         * then close the connection. We end up in this path after shutdown was
+         * called on the socket. Here, we then are in the next EventLoop
+         * iteration and the socket is known to be unused. */
+        UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_NETWORK,
+                     "TCP #%u\t| recv signaled closed connection", (unsigned)fd);
+
+        /* Close the connection if not a temporary error on a nonblocking socket */
+        cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
+                               UA_STATUSCODE_BADCONNECTIONCLOSED,
+                               UA_BYTESTRING_NULL);
+        TCP_close(cm, fd);
+    }
+
+    UA_ByteString_clear(&response);
+}
+
+/* Gets called when a new connection opens or if the listenSocket is closed */
+static void
+TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
+                         void **fdcontext, short event) {
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                 UA_LOGCATEGORY_NETWORK,
+                 "TCP #%u\t| Callback on server socket", (unsigned)fd);
+
+    /* Try to accept a new connection */
+    struct sockaddr_storage remote;
+    socklen_t remote_size = sizeof(remote);
+    UA_FD newsockfd = UA_accept(fd, (struct sockaddr*)&remote, &remote_size);
+    if(newsockfd == UA_INVALID_FD) {
+        /* Temporary error -- retry */
+        if(UA_ERRNO == UA_INTERRUPTED)
+            return;
+
+        /* Close the listen socket */
+        if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPING) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                               UA_LOGCATEGORY_NETWORK,
+                               "TCP #%u\t| Error %s, closing the server socket",
+                               (unsigned)fd, errno_str));
+        }
+        TCP_close(cm, fd);
+        return;
+    }
+
+    /* Log the name of the remote host */
+#if UA_LOGLEVEL <= 300
+    char hoststr[256];
+    int get_res = UA_getnameinfo((struct sockaddr *)&remote, sizeof(remote),
+                                 hoststr, sizeof(hoststr), NULL, 0, 0);
+    if(get_res != 0) {
+        get_res = UA_getnameinfo((struct sockaddr *)&remote, sizeof(remote),
+                                 hoststr, sizeof(hoststr), NULL, 0, NI_NUMERICHOST);
+        if(get_res != 0) {
+            hoststr[0] = 0;
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                               UA_LOGCATEGORY_NETWORK,
+                               "TCP #%u\t| getnameinfo(...) could not resolve the "
+                               "hostname (%s)", (unsigned)fd, errno_str));
+        }
+    }
+    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOGCATEGORY_NETWORK,
+                "TCP #%u\t| Connection opened from \"%s\" via the server socket #%u",
+                (unsigned)newsockfd, hoststr, (unsigned)fd);
+#endif
+
+    /* Configure the new socket */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    res |= TCP_setNonBlocking(newsockfd); /* Set the socket non-blocking */
+    res |= TCP_setNoSigPipe(newsockfd);   /* Supress interrupts from the socket */
+    res |= TCP_setNoNagle(newsockfd);     /* Disable Nagle's algorithm */
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                           UA_LOGCATEGORY_NETWORK,
+                           "TCP #%u\t| Error seeting the TCP options (%s), closing",
+                           (unsigned)newsockfd, errno_str));
+        /* Close the new socket */
+        UA_close(newsockfd);
+        return;
+    }
+
+    void *ctx = cm->initialConnectionContext;
+    /* The socket has opened. Signal it to the application. The callback can
+     * switch out the context. So put it into a temp variable.  */
+    cm->connectionCallback(cm, (uintptr_t)newsockfd, &ctx, UA_STATUSCODE_GOOD,
+                           UA_BYTESTRING_NULL);
+
+    /* Register in the EventLoop. Signal to the user if registering failed. */
+    res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newsockfd,
+                                  UA_POSIX_EVENT_READ,
+                                  (UA_FDCallback)TCP_connectionSocketCallback,
+                                  &cm->eventSource, ctx);
+    if(res != UA_STATUSCODE_GOOD) {
+        cm->connectionCallback(cm, (uintptr_t)newsockfd, &ctx,
+                               UA_STATUSCODE_BADINTERNALERROR, UA_BYTESTRING_NULL);
+        UA_close(newsockfd);
+    }
+
+    /* Increase the count of registered fd */
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    tcm->fdCount++;
+}
+
+static void
+TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
+    /* Get logging information */
+    char hoststr[256];
+    char portstr[16];
+    int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                                 hoststr, sizeof(hoststr),
+                                 portstr, sizeof(portstr), NI_NUMERICSERV);
+    if(get_res != 0) {
+        get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                                 hoststr, sizeof(hoststr),
+                                 portstr, sizeof(portstr),
+                                 NI_NUMERICHOST | NI_NUMERICSERV);
+        if(get_res != 0) {
+            hoststr[0] = 0;
+            portstr[0] = 0;
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                               UA_LOGCATEGORY_NETWORK,
+                               "TCP\t| getnameinfo(...) could not resolve the hostname (%s)",
+                               errno_str));
+        }
+    }
+    
+    /* Create the server socket */
+    UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+    if(listenSocket == UA_INVALID_SOCKET) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                          UA_LOGCATEGORY_NETWORK,
+                          "TCP #%u\t| Error opening the listen socket for "
+                          "\"%s\" on port %s(%s)",
+                          (unsigned)listenSocket, hoststr, portstr, errno_str));
+        return;
+    }
+
+    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOGCATEGORY_NETWORK,
+                "TCP #%u\t| New server socket for \"%s\" on port %s",
+                (unsigned)listenSocket, hoststr, portstr);
+
+    /* Some Linux distributions have net.ipv6.bindv6only not activated. So
+     * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
+     * AF_INET6 sockets only for IPv6. */
+    int optval = 1;
+#if UA_IPV6
+    if(ai->ai_family == AF_INET6 &&
+       UA_setsockopt(listenSocket, IPPROTO_IPV6, IPV6_V6ONLY,
+                     (const char*)&optval, sizeof(optval)) == -1) {
+        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                       UA_LOGCATEGORY_NETWORK,
+                       "TCP #%u\t| Could not set an IPv6 socket to IPv6 only, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+#endif
+
+    /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
+    if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR,
+                     (const char *)&optval, sizeof(optval)) == -1) {
+        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                       UA_LOGCATEGORY_NETWORK,
+                       "TCP #%u\t| Could not make the socket reusable, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Set the socket non-blocking */
+    if(TCP_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                       UA_LOGCATEGORY_NETWORK,
+                       "TCP #%u\t| Could not set the socket non-blocking, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Supress interrupts from the socket */
+    if(TCP_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                       UA_LOGCATEGORY_NETWORK,
+                       "TCP #%u\t| Could not disable SIGPIPE, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Bind socket to address */
+    int ret = UA_bind(listenSocket, ai->ai_addr, (socklen_t)ai->ai_addrlen);
+    if(ret < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                          UA_LOGCATEGORY_NETWORK,
+                          "TCP #%u\t| Error binding the socket to the address (%s), closing",
+                          (unsigned)listenSocket, errno_str));
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Start listening */
+    if(UA_listen(listenSocket, UA_MAXBACKLOG) < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                          UA_LOGCATEGORY_NETWORK,
+                          "TCP #%u\t| Error listening on the socket (%s), closing",
+                          (unsigned)listenSocket, errno_str));
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Register the socket */
+    UA_StatusCode res =
+        UA_EventLoop_registerFD(cm->eventSource.eventLoop, listenSocket,
+                                UA_POSIX_EVENT_READ,
+                                (UA_FDCallback) TCP_listenSocketCallback,
+                                &cm->eventSource, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                       UA_LOGCATEGORY_NETWORK,
+                       "TCP #%u\t| Error registering the socket in the "
+                       "EventLoop, closing", (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Increase the registered fd count */
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    tcm->fdCount++;
+}
+
+static UA_StatusCode
+TCP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostname,
+                                   const char *port) {
+    /* Get all the interface and IPv4/6 combinations for the configured hostname */
+    struct addrinfo hints, *res;
+    memset(&hints, 0, sizeof hints);
+#if UA_IPV6
+    hints.ai_family = AF_UNSPEC; /* Allow IPv4 and IPv6 */
+#else
+    hints.ai_family = AF_INET;   /* IPv4 only */
+#endif
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_PASSIVE;
+    hints.ai_protocol = IPPROTO_TCP;
+#ifdef AI_ADDRCONFIG
+    hints.ai_flags |= AI_ADDRCONFIG; /* Only return IPv4/IPv6 if at least one
+                                      * such address is configured */
+#endif
+
+    int retcode = UA_getaddrinfo(hostname, port, &hints, &res);
+    if(retcode != 0) {
+        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+           UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                          UA_LOGCATEGORY_NETWORK,
+                          "TCP\t| getaddrinfo lookup for \"%s\" on port %s failed (%s)",
+                          hostname, port, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Add listen sockets */
+    struct addrinfo *ai = res;
+    while(ai) {
+        TCP_registerListenSocket(cm, ai);
+        ai = ai->ai_next;
+    }
+    UA_freeaddrinfo(res);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                 UA_LOGCATEGORY_NETWORK,
+                 "TCP #%u\t| Shutdown called", (unsigned)connectionId);
+
+    /* Shutdown, will be picked up by the next iteration of the event loop */
+#ifndef _WIN32
+    int res = UA_shutdown((UA_FD)connectionId, SHUT_RDWR);
+#else
+    int res = UA_shutdown((UA_FD)connectionId, SD_BOTH);
+#endif
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(res != 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                           UA_LOGCATEGORY_NETWORK,
+                           "TCP #%u\t| Error shutting down the socket (%s), closing",
+                           (unsigned)connectionId, errno_str));
+        retval = TCP_close(cm, (UA_FD)connectionId);
+    }
+    return retval;
+}
+
+static UA_StatusCode
+TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
+                       size_t paramsSize, UA_KeyValuePair *params,
+                       UA_ByteString *buf) {
+    /* Prevent OS signals when sending to a closed socket */
+    int flags = MSG_NOSIGNAL;
+
+    /* Send the full buffer. This may require several calls to send */
+    size_t nWritten = 0;
+    do {
+        ssize_t n = 0;
+        do {
+            UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                         UA_LOGCATEGORY_NETWORK,
+                         "TCP #%u\t| Attempting to send", (unsigned)connectionId);
+            size_t bytes_to_send = buf->length - nWritten;
+            n = UA_send((UA_FD)connectionId,
+                        (const char*)buf->data + nWritten,
+                        bytes_to_send, flags);
+            if(n < 0 && UA_ERRNO != UA_INTERRUPTED && UA_ERRNO != UA_AGAIN) {
+                UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+                    UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                                 UA_LOGCATEGORY_NETWORK,
+                                 "TCP #%u\t| Send failed with error %s",
+                                 (unsigned)connectionId, errno_str));
+                TCP_shutdownConnection(cm, connectionId);
+                UA_ByteString_clear(buf);
+                return UA_STATUSCODE_BADCONNECTIONCLOSED;
+            }
+        } while(n < 0);
+        nWritten += (size_t)n;
+    } while(nWritten < buf->length);
+
+    /* Free the buffer */
+    UA_ByteString_clear(buf);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+TCP_openConnection(UA_ConnectionManager *cm,
+                   size_t paramsSize, UA_KeyValuePair *params,
+                   void *context) {
+
+    /* Get the connection parameters */
+    char hostname[256];
+    char portStr[16];
+
+    /* Prepare the port parameter as a string */
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "target-port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(!port) {
+        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_EVENTLOOP,
+                     "TCP\t| Open TCP Connection: No target port defined, aborting");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_snprintf(portStr, 6, "%d", *port);
+
+    /* Prepare the hostname string */
+    const UA_String *host = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "target-hostname"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!host) {
+        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_EVENTLOOP,
+                     "TCP\t| Open TCP Connection: No target hostname defined, aborting");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    if(host->length >= 256) {
+        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_EVENTLOOP,
+                     "TCP\t| Open TCP Connection: No target hostname too long, aborting");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    strncpy(hostname, (const char*)host->data, host->length);
+    hostname[host->length] = 0;
+
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                 UA_LOGCATEGORY_NETWORK, "TCP\t| Open a connection to \"%s\" on port %s",
+                 hostname, portStr);
+
+    /* Create the socket description from the connectString
+     * TODO: Make this non-blocking */
+    struct addrinfo hints, *info;
+    memset(&hints, 0, sizeof(struct addrinfo));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_STREAM;
+    int error = getaddrinfo(hostname, portStr, &hints, &info);
+    if(error != 0) {
+        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                       UA_LOGCATEGORY_NETWORK,
+                       "TCP\t| Lookup of %s failed with error %d - %s",
+                       hostname, error, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Create a socket */
+    UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
+    if(newSock == UA_INVALID_SOCKET) {
+        freeaddrinfo(info);
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                           UA_LOGCATEGORY_NETWORK,
+                           "TCP\t| Could not create socket to connect to %s (%s)",
+                           hostname, errno_str));
+        return UA_STATUSCODE_BADDISCONNECT;
+    }
+
+    /* Set the socket options */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    res |= TCP_setNonBlocking(newSock);
+    res |= TCP_setNoSigPipe(newSock);
+    res |= TCP_setNoNagle(newSock);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                           UA_LOGCATEGORY_NETWORK,
+                           "TCP\t| Could not set socket options: %s", errno_str));
+        freeaddrinfo(info);
+        UA_close(newSock);
+        return res;
+    }
+
+    /* Non-blocking connect */
+    error = UA_connect(newSock, info->ai_addr, info->ai_addrlen);
+    freeaddrinfo(info);
+    if(error != 0 && UA_ERRNO != UA_ERR_CONNECTION_PROGRESS) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                         UA_LOGCATEGORY_NETWORK,
+                         "TCP\t| Connecting the socket to %s failed (%s)",
+                         hostname, errno_str));
+        return UA_STATUSCODE_BADDISCONNECT;
+    }
+
+    /* Register the fd to trigger when output is possible (the connection is open) */
+    res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newSock, UA_POSIX_EVENT_WRITE,
+                                  (UA_FDCallback)TCP_connectionSocketCallback,
+                                  &cm->eventSource, context);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_NETWORK,
+                     "TCP\t| Registering the socket to connect to %s failed", hostname);
+        UA_close(newSock);
+        return res;
+    }
+
+    /* Increase the count */
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    tcm->fdCount++;
+
+    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOGCATEGORY_NETWORK,
+                "TCP #%u\t| New connection to \"%s\" on port %s",
+                (unsigned)newSock, hostname, portStr);
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Asynchronously register the listenSocket */
+static UA_StatusCode
+TCP_eventSourceStart(UA_ConnectionManager *cm) {
+    /* Check the state */
+    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
+        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_EVENTLOOP, "To start the TCP ConnectionManager, "
+                     "it has to be registered in an EventLoop and not started");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Initialize networking */
+#ifdef _WIN32
+    WSADATA wsaData;
+    WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
+
+    /* Listening on a socket? */
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(cm->eventSource.params,
+                                 cm->eventSource.paramsSize,
+                                 UA_QUALIFIEDNAME(0, "listen-port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(!port) {
+        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_EVENTLOOP,
+                     "TCP\t| No port configured, don't accept connections");
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Prepare the port parameter as a string */
+    char portno[6];
+    UA_snprintf(portno, 6, "%d", *port);
+
+    /* Get the hostnames configuration */
+    const UA_Variant *hostNames =
+        UA_KeyValueMap_get(cm->eventSource.params,
+                           cm->eventSource.paramsSize,
+                           UA_QUALIFIEDNAME(0, "listen-hostnames"));
+    if(!hostNames) {
+        /* No hostnames configured */
+        UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                    UA_LOGCATEGORY_NETWORK, "TCP\t| Listening on all interfaces");
+        TCP_registerListenSocketDomainName(cm, NULL, portno);
+    } else if(hostNames->type != &UA_TYPES[UA_TYPES_STRING]) {
+        /* Wrong datatype */
+           UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                        UA_LOGCATEGORY_EVENTLOOP,
+                        "TCP\t| The hostnames have to be strings");
+           return UA_STATUSCODE_BADINTERNALERROR;
+    } else {
+        size_t interfaces = hostNames->arrayLength;
+        if(UA_Variant_isScalar(hostNames))
+            interfaces = 1;
+        if(interfaces == 0) {
+            UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                         UA_LOGCATEGORY_EVENTLOOP, "TCP\t| Listening on all interfaces");
+            TCP_registerListenSocketDomainName(cm, NULL, portno);
+        } else {
+            /* Iterate over the configured hostnames */
+            UA_String *hostStrings = (UA_String*)hostNames->data;
+            for(size_t i = 0; i < hostNames->arrayLength; i++) {
+                char hostname[512];
+                if(hostStrings[i].length >= sizeof(hostname))
+                    continue;
+                memcpy(hostname, hostStrings[i].data, hostStrings->length);
+                hostname[hostStrings->length] = '\0';
+                TCP_registerListenSocketDomainName(cm, hostname, portno);
+            }
+        }
+    }
+
+    /* The receive buffersize was configured? */
+    const UA_UInt16 *bufSize = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(cm->eventSource.params,
+                                 cm->eventSource.paramsSize,
+                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(bufSize)
+        ((TCPConnectionManager*)cm)->recvBufferSize = *bufSize;
+    
+    /* Set the EventSource to the started state */
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+TCP_shutdownCallback(UA_EventSource *es, UA_FD fd, void *fdcontext, short event) {
+    TCP_shutdownConnection((UA_ConnectionManager*)es, (uintptr_t)fd);
+}
+
+static void
+TCP_eventSourceStop(UA_ConnectionManager *cm) {
+    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOGCATEGORY_NETWORK, "TCP\t| Shutting down the ConnectionManager");
+
+    /* Shut down all registered fd. The cm is set to "stopped" when the last fd
+     * is closed and deregistered in the callback from the EventLoop. */
+    UA_EventLoop_iterateFD(cm->eventSource.eventLoop, &cm->eventSource,
+                           TCP_shutdownCallback);
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
+
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+
+    /* Closed? */
+    if(tcm->fdCount == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING)
+        cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+
+    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOGCATEGORY_NETWORK, "TCP\t| EventSource successfully stopped");
+}
+
+static UA_StatusCode
+TCP_eventSourceDelete(UA_ConnectionManager *cm) {
+    if(cm->eventSource.state >= UA_EVENTSOURCESTATE_STARTING) {
+        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                     UA_LOGCATEGORY_EVENTLOOP,
+                     "TCP\t| The EventSource must be stopped before it can be deleted");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_deinitialize_architecture_network();
+
+    /* Delete the parameters */
+    UA_Array_delete(cm->eventSource.params,
+                    cm->eventSource.paramsSize,
+                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    cm->eventSource.params = NULL;
+    cm->eventSource.paramsSize = 0;
+
+    UA_String_clear(&cm->eventSource.name);
+    UA_free(cm);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_ConnectionManager *
+UA_ConnectionManager_TCP_new(const UA_String eventSourceName) {
+    TCPConnectionManager *cm = (TCPConnectionManager*)
+        UA_calloc(1, sizeof(TCPConnectionManager));
+    if(!cm)
+        return NULL;
+
+    UA_String_copy(&eventSourceName, &cm->cm.eventSource.name);
+    cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *)) TCP_eventSourceStart;
+    cm->cm.eventSource.stop = (void (*)(UA_EventSource *))TCP_eventSourceStop;
+    cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))TCP_eventSourceDelete;
+    cm->cm.openConnection = TCP_openConnection;
+    cm->cm.allocNetworkBuffer = TCP_allocNetworkBuffer;
+    cm->cm.freeNetworkBuffer = TCP_freeNetworkBuffer;
+    cm->cm.sendWithConnection = TCP_sendWithConnection;
+    cm->cm.closeConnection = TCP_shutdownConnection;
+    cm->recvBufferSize = 1 << 14; /* TODO: Read from the config */
+    return &cm->cm;
+}
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index a8522a8cd22..3cf2dc2b868 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -76,9 +76,9 @@ void UA_sleep_ms(unsigned long ms);
 
 #define UA_ENABLE_LOG_COLORS
 
-#define UA_poll poll
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
     getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
+#define UA_poll poll
 #define UA_send send
 #define UA_recv recv
 #define UA_sendto sendto
diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
index b8899b28213..a7f67338f88 100644
--- a/arch/vxworks/ua_architecture.h
+++ b/arch/vxworks/ua_architecture.h
@@ -64,7 +64,8 @@
 
 #define UA_ENABLE_LOG_COLORS
 
-#define UA_getnameinfo getnameinfo
+#define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
+    getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 #define UA_send send
 #define UA_recv recv
 #define UA_sendto sendto
diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
index 57370190cd8..d27df762a5a 100644
--- a/arch/wec7/ua_architecture.h
+++ b/arch/wec7/ua_architecture.h
@@ -83,7 +83,8 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_ERRNO WSAGetLastError()
 #endif
 
-#define UA_getnameinfo getnameinfo
+#define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
+    getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 #define UA_send(sockfd, buf, len, flags) send(sockfd, buf, (int)(len), flags)
 #define UA_recv recv
 #define UA_sendto(sockfd, buf, len, flags, dest_addr, addrlen) sendto(sockfd, (const char*)(buf), (int)(len), flags, dest_addr, (int) (addrlen))
diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 393b633468a..f71b3f411d5 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 393b633468a5d1d062dd253e1488d1d8ba335b6f
+Subproject commit f71b3f411d5cb16097c3ae0c744f67ad45535ffb
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 4559d9a940d..e2ca238dcfc 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -165,6 +165,7 @@ add_example(server_loglevel server_loglevel.c)
 
 if(UA_ENABLE_HISTORIZING)
     add_example(tutorial_server_historicaldata tutorial_server_historicaldata.c)
+    add_example(tutorial_server_historicaldata_circular tutorial_server_historicaldata_circular.c)
 endif()
 
 if(UA_ENABLE_ENCRYPTION OR UA_ENABLE_ENCRYPTION STREQUAL "MBEDTLS" OR UA_ENABLE_ENCRYPTION STREQUAL "OPENSSL")
diff --git a/examples/events/client_eventfilter.c b/examples/events/client_eventfilter.c
index 44663eb1e38..97892c0a1f0 100644
--- a/examples/events/client_eventfilter.c
+++ b/examples/events/client_eventfilter.c
@@ -108,14 +108,14 @@ setupOrFilter(UA_ContentFilterElement *element){
 }
 
 static void
-setupOfTypeFilter(UA_ContentFilterElement *element, UA_UInt32 typeId){
+setupOfTypeFilter(UA_ContentFilterElement *element, UA_UInt16 nsIndex, UA_UInt32 typeId){
     element->filterOperands[0].content.decoded.type = &UA_TYPES[UA_TYPES_LITERALOPERAND];
     element->filterOperands[0].encoding = UA_EXTENSIONOBJECT_DECODED;
     UA_LiteralOperand *literalOperand = UA_LiteralOperand_new();
     UA_LiteralOperand_init(literalOperand);
     UA_NodeId *nodeId = UA_NodeId_new();
     UA_NodeId_init(nodeId);
-    nodeId->namespaceIndex = 0;
+    nodeId->namespaceIndex = nsIndex;
     nodeId->identifierType = UA_NODEIDTYPE_NUMERIC;
     nodeId->identifier.numeric = typeId;
     UA_Variant_setScalar(&literalOperand->value, nodeId, &UA_TYPES[UA_TYPES_NODEID]);
@@ -133,6 +133,14 @@ setupOfTypeFilter(UA_ContentFilterElement *element, UA_UInt32 typeId){
  *
  * filterSelection 0:
  *      ( (OfType AUDITEVENTTYPE ) (or) (OfType EVENTQUEUEOVERFLOWEVENTTYPE) )
+ * filterSelection 2:
+ *      ((EventTypeId == NodeID("StartScanEvent")           ||
+ *        (EventTypeId == NodeID("DcpScanFinishedEvent")    ||
+ *        (EventTypeId == NodeID("ScanFinishedEvent")       ||
+ *        (EventTypeId == NodeID("CancelScanEvent")         ||
+ *        (EventTypeId == NodeID("CancelScanFinishedEvent") ||
+ *        (EventTypeId == NodeID("ShutdownEvent"))
+ *
  */
 static UA_StatusCode
 setupWhereClauses(UA_ContentFilter *contentFilter, UA_UInt16 whereClauseSize, UA_UInt16 filterSelection){
@@ -147,7 +155,7 @@ setupWhereClauses(UA_ContentFilter *contentFilter, UA_UInt16 whereClauseSize, UA
     }
     UA_StatusCode result = UA_STATUSCODE_GOOD;
     switch(filterSelection) {
-        case 0:
+        case 0: {
             contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OR;
             contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OFTYPE;
             contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_OFTYPE;
@@ -156,17 +164,77 @@ setupWhereClauses(UA_ContentFilter *contentFilter, UA_UInt16 whereClauseSize, UA
             contentFilter->elements[2].filterOperandsSize = 1;
             /* Setup Operand Arrays */
             result = setupOperandArrays(contentFilter);
-            if(result != UA_STATUSCODE_GOOD){
+            if(result != UA_STATUSCODE_GOOD) {
                 UA_ContentFilter_clear(contentFilter);
                 return UA_STATUSCODE_BADCONFIGURATIONERROR;
             }
             /* first Element (OR) */
             setupOrFilter(&contentFilter->elements[0]);
             /* second Element (OfType) */
-            setupOfTypeFilter(&contentFilter->elements[1], 60443);
+            setupOfTypeFilter(&contentFilter->elements[1], 1, 5003);
             /* third Element (OfType) */
-            setupOfTypeFilter(&contentFilter->elements[2], UA_NS0ID_EVENTQUEUEOVERFLOWEVENTTYPE);
+            setupOfTypeFilter(&contentFilter->elements[2], 0,
+                              UA_NS0ID_EVENTQUEUEOVERFLOWEVENTTYPE);
+            break;
+        }
+        case 1: {
+            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+            UA_UInt32 placeholder_ScanFinishedEvent = 10000;
+            setupOfTypeFilter(&contentFilter->elements[0], 1,
+                              placeholder_ScanFinishedEvent);
+            break;
+        }
+        case 2: {
+            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OR;
+            contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OR;
+            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_OR;
+            contentFilter->elements[3].filterOperator = UA_FILTEROPERATOR_OR;
+            contentFilter->elements[4].filterOperator = UA_FILTEROPERATOR_OR;
+            contentFilter->elements[5].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+            contentFilter->elements[6].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+            contentFilter->elements[7].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+            contentFilter->elements[8].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+            contentFilter->elements[9].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+            contentFilter->elements[10].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+
+            // init or clauses
+            setupOrFilter(&contentFilter->elements[0]);
+            setupOrFilter(&contentFilter->elements[1]);
+            setupOrFilter(&contentFilter->elements[2]);
+            setupOrFilter(&contentFilter->elements[3]);
+            setupOrFilter(&contentFilter->elements[4]);
+            // init oftype
+            UA_UInt32 placeholder_StartScanEvent = 10000;
+            UA_UInt32 placeholder_DcpScanFinishedEvent = 10001;
+            UA_UInt32 CancelScanEvent = 10003;
+            UA_UInt32 placeholder_CancelScanFinishedEvent = 10004;
+            UA_UInt32 placeholder_ShutdownEvent = 10005;
+            UA_UInt32 placeholder_ShutdownEvent_1 = 10006;
+            setupOfTypeFilter(&contentFilter->elements[5], 1, placeholder_StartScanEvent);
+            setupOfTypeFilter(&contentFilter->elements[6], 1,
+                              placeholder_DcpScanFinishedEvent);
+            setupOfTypeFilter(&contentFilter->elements[7], 1,
+                              placeholder_ShutdownEvent_1);
+            setupOfTypeFilter(&contentFilter->elements[8], 1, CancelScanEvent);
+            setupOfTypeFilter(&contentFilter->elements[9], 1,
+                              placeholder_CancelScanFinishedEvent);
+            setupOfTypeFilter(&contentFilter->elements[10], 1, placeholder_ShutdownEvent);
             break;
+        }
+        case 3:{
+            UA_UInt32 placeholder_ShutdownEvent_2 = 10000;
+            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+            setupOfTypeFilter(&contentFilter->elements[0], 1, placeholder_ShutdownEvent_2);
+            break;
+        }
+        case 4: {
+            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_AND;
+            contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_AND;
+            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_EQUALS;
+            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_EQUALS;
+            break;
+        }
         default:
             UA_ContentFilter_clear(contentFilter);
             return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -175,11 +243,10 @@ setupWhereClauses(UA_ContentFilter *contentFilter, UA_UInt16 whereClauseSize, UA
 }
 
 static void
-handler_events(UA_Client *client, UA_UInt32 subId, void *subContext,
+handler_events_filter(UA_Client *client, UA_UInt32 subId, void *subContext,
                UA_UInt32 monId, void *monContext,
                size_t nEventFields, UA_Variant *eventFields) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Notification");
-
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Received Event Notification (Filter passed)");
     for(size_t i = 0; i < nEventFields; ++i) {
         if(UA_Variant_hasScalarType(&eventFields[i], &UA_TYPES[UA_TYPES_UINT16])) {
             UA_UInt16 severity = *(UA_UInt16 *)eventFields[i].data;
@@ -188,8 +255,7 @@ handler_events(UA_Client *client, UA_UInt32 subId, void *subContext,
             UA_LocalizedText *lt = (UA_LocalizedText *)eventFields[i].data;
             UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                         "Message: '%.*s'", (int)lt->text.length, lt->text.data);
-        }
-        else {
+        } else {
 #ifdef UA_ENABLE_TYPEDESCRIPTION
             UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                         "Don't know how to handle type: '%s'", eventFields[i].type->typeName);
@@ -262,11 +328,11 @@ int main(int argc, char *argv[]) {
     UA_MonitoredItemCreateResult result =
         UA_Client_MonitoredItems_createEvent(client, subId,
                                              UA_TIMESTAMPSTORETURN_BOTH, item,
-                                             &monId, handler_events, NULL);
+                                             &monId, handler_events_filter, NULL);
 
     if(result.statusCode != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                    "Could not add the MonitoredItem with %s", UA_StatusCode_name(retval));
+                    "Could not add the MonitoredItem with %s", UA_StatusCode_name(result.statusCode));
         goto cleanup;
     } else {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
@@ -276,7 +342,7 @@ int main(int argc, char *argv[]) {
     monId = result.monitoredItemId;
 
     while(running)
-        retval = UA_Client_run_iterate(client, 100);
+        UA_Client_run_iterate(client, 100);
 
     /* Delete the subscription */
     cleanup:
diff --git a/examples/events/server_random_events.c b/examples/events/server_random_events.c
index 889a677707d..6e1b90fee63 100644
--- a/examples/events/server_random_events.c
+++ b/examples/events/server_random_events.c
@@ -48,27 +48,27 @@ addSampleEventTypes(UA_Server *server) {
         UA_Array_new(SAMPLE_EVENT_TYPES_COUNT, &UA_TYPES[UA_TYPES_NODEID]);
     UA_StatusCode retval = addEventType(server, "SampleBaseEventType",
                                         UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE),
-                                        UA_NODEID_NULL,
+                                        UA_NODEID_NUMERIC(1, 5000),
                                         &eventTypes[0]);
     if (retval != UA_STATUSCODE_GOOD) return retval;
     retval = addEventType(server, "SampleDeviceFailureEventType",
                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE),
-                          UA_NODEID_NULL,
+                          UA_NODEID_NUMERIC(1, 5001),
                           &eventTypes[1]);
     if (retval != UA_STATUSCODE_GOOD) return retval;
     retval = addEventType(server, "SampleEventQueueOverflowEventType",
                           UA_NODEID_NUMERIC(0, UA_NS0ID_EVENTQUEUEOVERFLOWEVENTTYPE),
-                          UA_NODEID_NULL,
+                          UA_NODEID_NUMERIC(1, 5002),
                           &eventTypes[2]);
     if (retval != UA_STATUSCODE_GOOD) return retval;
     retval = addEventType(server, "SampleProgressEventType",
                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE),
-                          UA_NODEID_NULL,
+                          UA_NODEID_NUMERIC(1, 5003),
                           &eventTypes[3]);
     if (retval != UA_STATUSCODE_GOOD) return retval;
     retval = addEventType(server, "SampleAuditSecurityEventType",
                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE),
-                          UA_NODEID_NUMERIC(0,60443),
+                          UA_NODEID_NUMERIC(1, 5004),
                           &eventTypes[4]);
     if (retval != UA_STATUSCODE_GOOD) return retval;
     return UA_STATUSCODE_GOOD;
diff --git a/examples/nodeset/CMakeLists.txt b/examples/nodeset/CMakeLists.txt
index 5c699db6cdd..d404770005a 100644
--- a/examples/nodeset/CMakeLists.txt
+++ b/examples/nodeset/CMakeLists.txt
@@ -91,7 +91,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     ua_generate_nodeset_and_datatypes(
         NAME "plc"
         # PLCopen does not define custom types. Only generate the nodeset
-        FILE_NS "${FILE_NS_DIRPREFIX}/PLCopen/Opc.Ua.Plc.NodeSet2.xml"
+        FILE_NS "${FILE_NS_DIRPREFIX}/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml"
         # PLCopen depends on the di nodeset, which must be generated before
         DEPENDS "di"
         INTERNAL
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
index 2c3a88a7d01..dd80286987b 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
@@ -206,9 +206,9 @@ changePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier,
 /* Remove the callback added for cyclic repetition */
 static void
 removePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier, UA_UInt64 callbackId){
-    if(callbackId && (pthread_join(callbackId, NULL) != 0))
+    if(callbackId && (pthread_join((pthread_t)callbackId, NULL) != 0))
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                       "Pthread Join Failed thread: %ld\n", callbackId);
+                       "Pthread Join Failed thread: %lu\n", (long unsigned)callbackId);
 }
 
 /**
@@ -705,8 +705,8 @@ int main(int argc, char **argv) {
         size_t pubLoopVariable               = 0;
         for (pubLoopVariable = 0; pubLoopVariable < measurementsPublisher;
              pubLoopVariable++) {
-            fprintf(fpPublisher, "%ld,%ld.%09ld,%lf\n",
-                    publishCounterValue[pubLoopVariable],
+            fprintf(fpPublisher, "%lu,%ld.%09ld,%lf\n",
+                    (long unsigned)publishCounterValue[pubLoopVariable],
                     publishTimestamp[pubLoopVariable].tv_sec,
                     publishTimestamp[pubLoopVariable].tv_nsec,
                     pressureValues[pubLoopVariable]);
@@ -717,8 +717,8 @@ int main(int argc, char **argv) {
         size_t pubLoopVariable               = 0;
         for (pubLoopVariable = 0; pubLoopVariable < measurementsPublisher;
              pubLoopVariable++) {
-             printf("%ld,%ld.%09ld,%lf\n",
-                    publishCounterValue[pubLoopVariable],
+             printf("%lu,%ld.%09ld,%lf\n",
+                    (long unsigned)publishCounterValue[pubLoopVariable],
                     publishTimestamp[pubLoopVariable].tv_sec,
                     publishTimestamp[pubLoopVariable].tv_nsec,
                     pressureValues[pubLoopVariable]);
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
index bae0e5dd5a5..54c2d7a8a83 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
@@ -194,9 +194,9 @@ changePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier, UA_UInt
 /* Remove the callback added for cyclic repetition */
 static void
 removePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier, UA_UInt64 callbackId) {
-    if(callbackId && (pthread_join(callbackId, NULL) != 0))
+    if(callbackId && (pthread_join((pthread_t)callbackId, NULL) != 0))
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                       "Pthread Join Failed thread: %ld\n", callbackId);
+                       "Pthread Join Failed thread: %lu\n", (long unsigned)callbackId);
 }
 
 /**
@@ -665,8 +665,8 @@ int main(int argc, char **argv) {
         size_t subLoopVariable               = 0;
         for (subLoopVariable = 0; subLoopVariable < measurementsSubscriber;
              subLoopVariable++) {
-             fprintf(fpSubscriber, "%ld,%ld.%09ld,%lf\n",
-                     subscribeCounterValue[subLoopVariable],
+             fprintf(fpSubscriber, "%lu,%ld.%09ld,%lf\n",
+                     (long unsigned)subscribeCounterValue[subLoopVariable],
                      subscribeTimestamp[subLoopVariable].tv_sec,
                      subscribeTimestamp[subLoopVariable].tv_nsec,
                      pressureValues[subLoopVariable]);
@@ -677,8 +677,8 @@ int main(int argc, char **argv) {
         size_t subLoopVariable               = 0;
         for (subLoopVariable = 0; subLoopVariable < measurementsSubscriber;
              subLoopVariable++) {
-             fprintf(fpSubscriber, "%ld,%ld.%09ld,%lf\n",
-                     subscribeCounterValue[subLoopVariable],
+             fprintf(fpSubscriber, "%lu,%ld.%09ld,%lf\n",
+                     (long unsigned)subscribeCounterValue[subLoopVariable],
                      subscribeTimestamp[subLoopVariable].tv_sec,
                      subscribeTimestamp[subLoopVariable].tv_nsec,
                      pressureValues[subLoopVariable]);
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index 872241f5172..da169417185 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -79,6 +79,7 @@
 #include <open62541/types_generated.h>
 #include <open62541/plugin/pubsub_ethernet.h>
 
+#include <open62541/plugin/securitypolicy_default.h>
 #include <linux/if_link.h>
 #include <linux/if_xdp.h>
 
@@ -103,12 +104,10 @@ UA_DataSetReaderConfig readerConfig;
 /* Qbv offset */
 #define             DEFAULT_QBV_OFFSET                    125
 #define             DEFAULT_SOCKET_PRIORITY               3
-#if defined(PUBLISHER)
 #define             PUBLISHER_ID                          2235
 #define             WRITER_GROUP_ID                       100
 #define             DATA_SET_WRITER_ID                    62541
 #define             DEFAULT_PUBLISHING_MAC_ADDRESS        "opc.eth://01-00-5E-00-00-01:8.3"
-#endif
 #if defined(SUBSCRIBER)
 #define             PUBLISHER_ID_SUB                     2234
 #define             WRITER_GROUP_ID_SUB                  101
@@ -125,9 +124,11 @@ UA_DataSetReaderConfig readerConfig;
 #define             MILLI_SECONDS                         1000 * 1000
 #define             SECONDS                               1000 * 1000 * 1000
 #define             SECONDS_SLEEP                         5
+#if defined(PUBLISHER)
 /* Publisher will sleep for 60% of cycle time and then prepares the */
 /* transmission packet within 40% */
 static UA_Double  pubWakeupPercentage     = 0.6;
+#endif
 /* Subscriber will wakeup only during start of cycle and check whether */
 /* the packets are received */
 static UA_Double  subWakeupPercentage     = 0;
@@ -150,6 +151,24 @@ static UA_Double  userAppWakeupPercentage = 0.3;
 #define             CLOCKID                                 CLOCK_TAI
 #define             ETH_TRANSPORT_PROFILE                   "http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp"
 
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+#define             UA_AES128CTR_SIGNING_KEY_LENGTH          32
+#define             UA_AES128CTR_KEY_LENGTH                  16
+#define             UA_AES128CTR_KEYNONCE_LENGTH             4
+
+#if defined(PUBLISHER)
+UA_Byte signingKeyPub[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
+UA_Byte encryptingKeyPub[UA_AES128CTR_KEY_LENGTH] = {0};
+UA_Byte keyNoncePub[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
+#endif
+
+#if defined(SUBSCRIBER)
+UA_Byte signingKeySub[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
+UA_Byte encryptingKeySub[UA_AES128CTR_KEY_LENGTH] = {0};
+UA_Byte keyNonceSub[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
+#endif
+#endif
+
 /* If the Hardcoded publisher/subscriber MAC addresses need to be changed,
  * change PUBLISHING_MAC_ADDRESS and SUBSCRIBING_MAC_ADDRESS
  */
@@ -334,7 +353,7 @@ addPubSubApplicationCallback(UA_Server *server, UA_NodeId identifier,
         char threadNamePub[10] = "Publisher";
         *callbackId            = threadCreation((UA_Int16)pubPriority, (size_t)pubCore, publisherETF, threadNamePub, threadArguments);
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                    "Publisher thread callback Id: %ld\n", *callbackId);
+                    "Publisher thread callback Id: %lu\n", (long unsigned)*callbackId);
 #endif
     }
     else {
@@ -343,7 +362,7 @@ addPubSubApplicationCallback(UA_Server *server, UA_NodeId identifier,
         char threadNameSub[11] = "Subscriber";
         *callbackId            = threadCreation((UA_Int16)subPriority,(size_t)subCore, subscriber, threadNameSub, threadArguments);
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                    "Subscriber thread callback Id: %ld\n", *callbackId);
+                    "Subscriber thread callback Id: %lu\n", (long unsigned)*callbackId);
 #endif
     }
 
@@ -363,9 +382,9 @@ changePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier,
 /* Remove the callback added for cyclic repetition */
 static void
 removePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier, UA_UInt64 callbackId) {
-    if(callbackId && (pthread_join(callbackId, NULL) != 0))
+    if(callbackId && (pthread_join((pthread_t)callbackId, NULL) != 0))
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                       "Pthread Join Failed thread: %ld\n", callbackId);
+                       "Pthread Join Failed thread: %lu\n", (long unsigned)callbackId);
 
 }
 
@@ -454,12 +473,29 @@ addReaderGroup(UA_Server *server) {
         readerGroupConfig.timeout = 0;  //Blocking  socket
     }
 
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    /* Encryption settings */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+#endif
+
     readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
     readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
     readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
 
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKeySub};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKeySub};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNonceSub};
+    // TODO security token not necessary for readergroup (extracted from security-header)
+    UA_Server_setReaderGroupEncryptionKeys(server, readerGroupIdentifier, 1, sk, ek, kn);
+#endif
+
 }
 
 /* Set SubscribedDataSet type to TargetVariables data type
@@ -811,6 +847,12 @@ addWriterGroup(UA_Server *server) {
 
     writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
     writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[1];
+#endif
     /* The configuration flags for the messages are encapsulated inside the
      * message- and transport settings extension objects. These extension
      * objects are defined by the standard. e.g.
@@ -827,6 +869,14 @@ addWriterGroup(UA_Server *server) {
     UA_Server_addWriterGroup(server, connectionIdent, &writerGroupConfig, &writerGroupIdent);
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
     UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKeyPub};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKeyPub};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNoncePub};
+    UA_Server_setWriterGroupEncryptionKeys(server, writerGroupIdent, 1, sk, ek, kn);
+#endif
 }
 
 /* DataSetWriter handling */
@@ -859,7 +909,8 @@ updateMeasurementsPublisher(struct timespec start_time,
     }
 
     if(consolePrint)
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"Pub:%ld,%ld.%09ld\n", counterValue, start_time.tv_sec, start_time.tv_nsec);
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"Pub:%lu,%ld.%09ld\n",
+                    (long unsigned)counterValue, start_time.tv_sec, start_time.tv_nsec);
 
     if (signalTerm != UA_TRUE){
         publishTimestamp[measurementsPublisher]        = start_time;
@@ -884,7 +935,8 @@ updateMeasurementsSubscriber(struct timespec receive_time, UA_UInt64 counterValu
     }
 
     if(consolePrint)
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"Sub:%ld,%ld.%09ld\n", counterValue, receive_time.tv_sec, receive_time.tv_nsec);
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"Sub:%lu,%ld.%09ld\n",
+                    (long unsigned)counterValue, receive_time.tv_sec, receive_time.tv_nsec);
 
     if (signalTerm != UA_TRUE){
         subscribeTimestamp[measurementsSubscriber]     = receive_time;
@@ -894,6 +946,7 @@ updateMeasurementsSubscriber(struct timespec receive_time, UA_UInt64 counterValu
 }
 #endif
 
+#if defined(PUBLISHER)
 /**
  * **Publisher thread routine**
  *
@@ -972,6 +1025,7 @@ void *publisherETF(void *arg) {
     runningServer = UA_FALSE;
     return (void*)NULL;
 }
+#endif
 
 #if defined(SUBSCRIBER)
 /**
@@ -1028,6 +1082,9 @@ void *subscriber(void *arg) {
     if (*runningSub == UA_FALSE)
         signalTerm = UA_TRUE;
 
+#if defined(SUBSCRIBER) && !defined(PUBLISHER)
+    runningServer = UA_FALSE;
+#endif
     UA_free(threadArgumentsSubscriber);
     return (void*)NULL;
 }
@@ -1058,7 +1115,11 @@ void *userApplicationPubSub(void *arg) {
     nextnanosleeptimeUserApplication.tv_nsec = threadBaseTime.tv_nsec + (__syscall_slong_t)(cycleTimeInMsec * MILLI_SECONDS * userAppWakeupPercentage);
     nanoSecondFieldConversion(&nextnanosleeptimeUserApplication);
 
+#if defined(PUBLISHER) && defined(SUBSCRIBER)
     while (*runningSub || *runningPub) {
+#else
+    while (*runningSub) {
+#endif
         /* The User application threads wakes up at the configured userApp wake up percentage (30%) of each cycle */
         clock_nanosleep(CLOCKID, TIMER_ABSTIME, &nextnanosleeptimeUserApplication, NULL);
 #if defined(SUBSCRIBER)
@@ -1144,7 +1205,7 @@ static pthread_t threadCreation(UA_Int16 threadPriority, size_t coreAffinity, vo
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,":%s Cannot create thread\n", applicationName);
 
     if (CPU_ISSET(coreAffinity, &cpuset))
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"%s CPU CORE: %ld\n", applicationName, coreAffinity);
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"%s CPU CORE: %lu\n", applicationName, (long unsigned)coreAffinity);
 
    return threadID;
 }
@@ -1259,7 +1320,6 @@ static void removeServerNodes(UA_Server *server) {
     }
     UA_Server_deleteNode(server, runningPubStatusNodeID, UA_TRUE);
     UA_NodeId_clear(&runningPubStatusNodeID);
-
     UA_Server_deleteNode(server, subNodeID, UA_TRUE);
     UA_NodeId_clear(&subNodeID);
     for (UA_Int32 iterator = 0; iterator < REPEATED_NODECOUNTS; iterator++)
@@ -1463,6 +1523,24 @@ int main(int argc, char **argv) {
 
     UA_ServerConfig_setMinimal(config, PORT_NUMBER, NULL);
 
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+#if defined(PUBLISHER) && defined(SUBSCRIBER)
+    /* Instantiate the PubSub SecurityPolicy */
+    config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
+        UA_calloc(2, sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 2;
+#else
+    config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
+        UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+#endif
+#endif
+
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && defined(PUBLISHER)
+    UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[1],
+                                      &config->logger);
+#endif
+
 #if defined(PUBLISHER)
     UA_NetworkAddressUrlDataType networkAddressUrlPub;
 #endif
@@ -1512,6 +1590,10 @@ if (enableCsvLog)
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
 #endif
 
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && defined(SUBSCRIBER)
+    UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
+                                      &config->logger);
+#endif
 #if defined (PUBLISHER) && defined(SUBSCRIBER)
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
 #endif
@@ -1537,7 +1619,10 @@ if (enableCsvLog)
 #endif
 
     retval |= UA_Server_run(server, &runningServer);
+#if defined(SUBSCRIBER)
     UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier);
+#endif
+
 #if defined(PUBLISHER) || defined(SUBSCRIBER)
     returnValue = pthread_join(userThreadID, NULL);
     if (returnValue != 0)
@@ -1550,8 +1635,8 @@ if (enableCsvLog)
         size_t pubLoopVariable = 0;
         for (pubLoopVariable = 0; pubLoopVariable < measurementsPublisher;
              pubLoopVariable++) {
-            fprintf(fpPublisher, "%ld,%ld.%09ld\n",
-                    publishCounterValue[pubLoopVariable],
+            fprintf(fpPublisher, "%lu,%ld.%09ld\n",
+                    (long unsigned)publishCounterValue[pubLoopVariable],
                     publishTimestamp[pubLoopVariable].tv_sec,
                     publishTimestamp[pubLoopVariable].tv_nsec);
         }
@@ -1561,8 +1646,8 @@ if (enableCsvLog)
         size_t subLoopVariable = 0;
         for (subLoopVariable = 0; subLoopVariable < measurementsSubscriber;
              subLoopVariable++) {
-            fprintf(fpSubscriber, "%ld,%ld.%09ld\n",
-                    subscribeCounterValue[subLoopVariable],
+            fprintf(fpSubscriber, "%lu,%ld.%09ld\n",
+                    (long unsigned)subscribeCounterValue[subLoopVariable],
                     subscribeTimestamp[subLoopVariable].tv_sec,
                     subscribeTimestamp[subLoopVariable].tv_nsec);
         }
@@ -1574,6 +1659,7 @@ if (enableCsvLog)
     UA_Server_delete(server);
     UA_free(serverConfig);
 #endif
+
 #if defined(PUBLISHER)
     UA_free(runningPub);
     UA_free(pubCounterData);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index 2b2615ff1f1..7910579f1de 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -80,6 +80,8 @@
 #include <open62541/types_generated.h>
 #include <open62541/plugin/pubsub_ethernet.h>
 
+#include <open62541/plugin/securitypolicy_default.h>
+
 #include "ua_pubsub.h"
 
 #include <linux/if_link.h>
@@ -110,12 +112,10 @@ UA_DataSetReaderConfig readerConfig;
 #define             DATA_SET_WRITER_ID                    62541
 #define             DEFAULT_PUBLISHING_MAC_ADDRESS        "opc.eth://01-00-5E-7F-00-01:8.3"
 #endif
-#if defined(SUBSCRIBER)
 #define             PUBLISHER_ID_SUB                      2235
 #define             WRITER_GROUP_ID_SUB                   100
 #define             DATA_SET_WRITER_ID_SUB                62541
 #define             DEFAULT_SUBSCRIBING_MAC_ADDRESS       "opc.eth://01-00-5E-00-00-01:8.3"
-#endif
 #define             REPEATED_NODECOUNTS                   2    // Default to publish 64 bytes
 #define             PORT_NUMBER                           62541
 #define             DEFAULT_XDP_QUEUE                     2
@@ -129,9 +129,11 @@ UA_DataSetReaderConfig readerConfig;
 /* Publisher will sleep for 60% of cycle time and then prepares the */
 /* transmission packet within 40% */
 static UA_Double  pubWakeupPercentage     = 0.6;
+#if defined(SUBSCRIBER)
 /* Subscriber will wakeup only during start of cycle and check whether */
 /* the packets are received */
 static UA_Double  subWakeupPercentage     = 0;
+#endif
 /* User application Pub/Sub will wakeup at the 30% of cycle time and handles the */
 /* user data such as read and write in Information model */
 static UA_Double  userAppWakeupPercentage = 0.3;
@@ -153,6 +155,24 @@ static UA_Double  userAppWakeupPercentage = 0.3;
 #define             ETH_TRANSPORT_PROFILE                   "http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp"
 #define             LATENCY_CSV_FILE_NAME                   "latencyT1toT8.csv"
 
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+#define             UA_AES128CTR_SIGNING_KEY_LENGTH          32
+#define             UA_AES128CTR_KEY_LENGTH                  16
+#define             UA_AES128CTR_KEYNONCE_LENGTH             4
+
+#if defined(PUBLISHER)
+UA_Byte signingKeyPub[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
+UA_Byte encryptingKeyPub[UA_AES128CTR_KEY_LENGTH] = {0};
+UA_Byte keyNoncePub[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
+#endif
+
+#if defined(SUBSCRIBER)
+UA_Byte signingKeySub[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
+UA_Byte encryptingKeySub[UA_AES128CTR_KEY_LENGTH] = {0};
+UA_Byte keyNonceSub[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
+#endif
+#endif
+
 /* If the Hardcoded publisher/subscriber MAC addresses need to be changed,
  * change PUBLISHING_MAC_ADDRESS and SUBSCRIBING_MAC_ADDRESS
  */
@@ -336,7 +356,7 @@ addPubSubApplicationCallback(UA_Server *server, UA_NodeId identifier,
         char threadNamePub[10] = "Publisher";
         *callbackId            = threadCreation((UA_Int16)pubPriority, (size_t)pubCore, publisherETF, threadNamePub, threadArguments);
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                    "Publisher thread callback Id: %ld\n", *callbackId);
+                    "Publisher thread callback Id: %lu\n", (unsigned long)*callbackId);
 #endif
     }
     else {
@@ -345,7 +365,7 @@ addPubSubApplicationCallback(UA_Server *server, UA_NodeId identifier,
         char threadNameSub[11] = "Subscriber";
         *callbackId            = threadCreation((UA_Int16)subPriority, (size_t)subCore, subscriber, threadNameSub, threadArguments);
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                    "Subscriber thread callback Id: %ld\n", *callbackId);
+                    "Subscriber thread callback Id: %lu\n", (unsigned long)*callbackId);
 #endif
     }
 
@@ -365,9 +385,9 @@ changePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier,
 /* Remove the callback added for cyclic repetition */
 static void
 removePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier, UA_UInt64 callbackId) {
-    if(callbackId && (pthread_join(callbackId, NULL) != 0))
+    if(callbackId && (pthread_join((pthread_t)callbackId, NULL) != 0))
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                       "Pthread Join Failed thread: %ld\n", callbackId);
+                       "Pthread Join Failed thread: %lu\n", (unsigned long)callbackId);
 }
 
 /**
@@ -456,14 +476,31 @@ addReaderGroup(UA_Server *server) {
         readerGroupConfig.timeout = 0;  //Blocking  socket
     }
 
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    /* Encryption settings */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[1];
+#endif
+
     readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
     readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
     readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
 
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKeySub};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKeySub};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNonceSub};
+    // TODO security token not necessary for readergroup (extracted from security-header)
+    UA_Server_setReaderGroupEncryptionKeys(server, readerGroupIdentifier, 1, sk, ek, kn);
+#endif
 }
 
+
 /* Set SubscribedDataSet type to TargetVariables data type
  * Add SubscriberCounter variable to the DataSetReader */
 static void addSubscribedVariables (UA_Server *server) {
@@ -817,6 +854,13 @@ addWriterGroup(UA_Server *server) {
 
     writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
     writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+#endif
+
     /* The configuration flags for the messages are encapsulated inside the
      * message- and transport settings extension objects. These extension
      * objects are defined by the standard. e.g.
@@ -833,6 +877,14 @@ addWriterGroup(UA_Server *server) {
     UA_Server_addWriterGroup(server, connectionIdent, &writerGroupConfig, &writerGroupIdent);
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
     UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKeyPub};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKeyPub};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNoncePub};
+    UA_Server_setWriterGroupEncryptionKeys(server, writerGroupIdent, 1, sk, ek, kn);
+#endif
 }
 
 /* DataSetWriter handling */
@@ -864,7 +916,8 @@ updateMeasurementsPublisher(struct timespec start_time,
     }
 
     if(consolePrint)
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"Pub:%ld,%ld.%09ld\n", counterValue, start_time.tv_sec, start_time.tv_nsec);
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"Pub:%lu,%ld.%09ld\n",
+                    (long unsigned)counterValue, start_time.tv_sec, start_time.tv_nsec);
 
 
     if (signalTerm != UA_TRUE){
@@ -890,7 +943,8 @@ updateMeasurementsSubscriber(struct timespec receive_time,
     }
 
     if(consolePrint)
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"Sub:%ld,%ld.%09ld\n", counterValue, receive_time.tv_sec, receive_time.tv_nsec);
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"Sub:%lu,%ld.%09ld\n",
+                    (long unsigned)counterValue, receive_time.tv_sec, receive_time.tv_nsec);
 
     if (signalTerm != UA_TRUE)
     {
@@ -969,6 +1023,9 @@ void *publisherETF(void *arg) {
         nanoSecondFieldConversion(&nextnanosleeptime);
     }
 
+#if defined(PUBLISHER) && !defined(SUBSCRIBER)
+    runningServer = UA_FALSE;
+#endif
     UA_free(threadArgumentsPublisher);
     return (void*)NULL;
 }
@@ -1066,7 +1123,11 @@ void *userApplicationPubSub(void *arg) {
         *repeatedCounterData[iterator] = repeatedCounterValue;
     }
 
+#if defined(PUBLISHER) && defined(SUBSCRIBER)
     while (*runningPub || *runningSub) {
+#else
+    while (*runningPub) {
+#endif
         /* The User application threads wakes up at the configured userApp wake up percentage (30%) of each cycle */
         clock_nanosleep(CLOCKID, TIMER_ABSTIME, &nextnanosleeptimeUserApplication, NULL);
 #if defined(PUBLISHER)
@@ -1150,7 +1211,7 @@ static pthread_t threadCreation(UA_Int16 threadPriority, size_t coreAffinity, vo
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,":%s Cannot create thread\n", applicationName);
 
     if (CPU_ISSET(coreAffinity, &cpuset))
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"%s CPU CORE: %ld\n", applicationName, coreAffinity);
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"%s CPU CORE: %lu\n", applicationName, (unsigned long)coreAffinity);
 
    return threadID;
 }
@@ -1263,7 +1324,6 @@ static void removeServerNodes(UA_Server *server) {
     }
     UA_Server_deleteNode(server, runningPubStatusNodeID, UA_TRUE);
     UA_NodeId_clear(&runningPubStatusNodeID);
-
     UA_Server_deleteNode(server, subNodeID, UA_TRUE);
     UA_NodeId_clear(&subNodeID);
     for (UA_Int32 iterator = 0; iterator < REPEATED_NODECOUNTS; iterator++)
@@ -1274,7 +1334,7 @@ static void removeServerNodes(UA_Server *server) {
     UA_Server_deleteNode(server, runningSubStatusNodeID, UA_TRUE);
     UA_NodeId_clear(&runningSubStatusNodeID);
 }
-
+#if defined (PUBLISHER) && defined(SUBSCRIBER)
 /**
  * **Time Difference Calculation**
  *
@@ -1345,8 +1405,8 @@ static void computeLatencyAndGenerateCsv(char *latencyFileName) {
 
         if(((latencyCharIndex - prevLatencyCharIndex) + latencyCharIndex + 3) < MAX_MEASUREMENTS_FILEWRITE) {
             latencyCharIndex += (UA_UInt64)sprintf(&latency_measurements[latencyCharIndex],
-                                                   "%0.3f, %ld, %ld\n",
-                                                   finalTime, missed_counter, repeated_counter);
+                                                   "%0.3f, %lu, %lu\n",
+                                                   finalTime, (unsigned long)missed_counter, (unsigned long)repeated_counter);
         }
         else {
             UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
@@ -1358,10 +1418,10 @@ static void computeLatencyAndGenerateCsv(char *latencyFileName) {
     }
 
     /* Write into the latency file */
-    fwrite(&latency_measurements[0], prevLatencyCharIndex, 1, fp_latency);
+    fwrite(&latency_measurements[0], (size_t)prevLatencyCharIndex, 1, fp_latency);
     fclose(fp_latency);
 }
-
+#endif
 /**
  * **Usage function**
  *
@@ -1557,6 +1617,23 @@ int main(int argc, char **argv) {
     }
 
     UA_ServerConfig_setMinimal(config, PORT_NUMBER, NULL);
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+#if defined(PUBLISHER) && defined(SUBSCRIBER)
+    /* Instantiate the PubSub SecurityPolicy */
+    config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
+        UA_calloc(2, sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 2;
+#else
+    config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
+        UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+#endif
+#endif
+
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && defined(PUBLISHER)
+    UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
+                                      &config->logger);
+#endif
 
 #if defined(PUBLISHER)
     UA_NetworkAddressUrlDataType networkAddressUrlPub;
@@ -1606,6 +1683,11 @@ if (enableCsvLog) {
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
 #endif
 
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && defined(SUBSCRIBER)
+    UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[1],
+                                      &config->logger);
+#endif
+
 #if defined (PUBLISHER) && defined(SUBSCRIBER)
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
 #endif
@@ -1631,23 +1713,24 @@ if (enableCsvLog) {
 #endif
 
     retval |= UA_Server_run(server, &runningServer);
+#if defined(SUBSCRIBER)
     UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier);
+#endif
 #if defined(PUBLISHER) || defined(SUBSCRIBER)
     returnValue = pthread_join(userThreadID, NULL);
     if (returnValue != 0)
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"\nPthread Join Failed for User thread:%d\n", returnValue);
 #endif
-
     if (enableCsvLog) {
 #if defined(PUBLISHER)
         /* Write the published data in the publisher_T1.csv file */
         size_t pubLoopVariable               = 0;
         for (pubLoopVariable = 0; pubLoopVariable < measurementsPublisher;
              pubLoopVariable++) {
-            fprintf(fpPublisher, "%ld,%ld.%09ld\n",
-                    publishCounterValue[pubLoopVariable],
-                    publishTimestamp[pubLoopVariable].tv_sec,
-                    publishTimestamp[pubLoopVariable].tv_nsec);
+            fprintf(fpPublisher, "%lu,%lu.%09lu\n",
+                    (long unsigned)publishCounterValue[pubLoopVariable],
+                    (long unsigned)publishTimestamp[pubLoopVariable].tv_sec,
+                    (long unsigned)publishTimestamp[pubLoopVariable].tv_nsec);
         }
 #endif
 #if defined(SUBSCRIBER)
@@ -1655,17 +1738,19 @@ if (enableCsvLog) {
         size_t subLoopVariable               = 0;
         for (subLoopVariable = 0; subLoopVariable < measurementsSubscriber;
              subLoopVariable++) {
-            fprintf(fpSubscriber, "%ld,%ld.%09ld\n",
-                    subscribeCounterValue[subLoopVariable],
-                    subscribeTimestamp[subLoopVariable].tv_sec,
-                    subscribeTimestamp[subLoopVariable].tv_nsec);
+            fprintf(fpSubscriber, "%lu,%lu.%09lu\n",
+                    (long unsigned)subscribeCounterValue[subLoopVariable],
+                    (long unsigned)subscribeTimestamp[subLoopVariable].tv_sec,
+                    (long unsigned)subscribeTimestamp[subLoopVariable].tv_nsec);
         }
 #endif
     }
 
     if(enableLatencyCsvLog) {
+#if defined (PUBLISHER) && defined(SUBSCRIBER)
         char *latencyCsvName = LATENCY_CSV_FILE_NAME;
         computeLatencyAndGenerateCsv(latencyCsvName);
+#endif
     }
 
 #if defined(PUBLISHER) || defined(SUBSCRIBER)
@@ -1688,7 +1773,6 @@ if (enableCsvLog) {
     if (enableCsvLog)
         fclose(fpPublisher);
 #endif
-
 #if defined(SUBSCRIBER)
     UA_free(runningSub);
     UA_free(subCounterData);
diff --git a/examples/tutorial_server_historicaldata_circular.c b/examples/tutorial_server_historicaldata_circular.c
new file mode 100644
index 00000000000..bc61f8327f0
--- /dev/null
+++ b/examples/tutorial_server_historicaldata_circular.c
@@ -0,0 +1,133 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ *
+ * Copyright 2019 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ * Copyright 2021 (c) luibass92 <luibass92@live.it> (Author: Luigi Bassetta)
+ */
+
+#include <open62541/plugin/historydata/history_data_backend_memory.h>
+#include <open62541/plugin/historydata/history_data_gathering_default.h>
+#include <open62541/plugin/historydata/history_database_default.h>
+#include <open62541/plugin/historydatabase.h>
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <signal.h>
+#include <stdlib.h>
+
+static volatile UA_Boolean running = true;
+static void stopHandler(int sign) {
+    (void)sign;
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+int main(void) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+
+    /* We need a gathering for the plugin to constuct.
+     * The UA_HistoryDataGathering is responsible to collect data and store it to the database.
+     * We will use this gathering for one node, only. initialNodeIdStoreSize = 1
+     * The store will NOT automatically grow if you register more than one node will return a UA_STATUS_BADOUTOFMEMORY. */
+    UA_HistoryDataGathering gathering = UA_HistoryDataGathering_Circular(1);
+
+    /* We set the responsible plugin in the configuration. UA_HistoryDatabase is
+     * the main plugin which handles the historical data service. */
+    config->historyDatabase = UA_HistoryDatabase_default(gathering);
+
+    /* Define the attribute of the uint32 variable node */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    UA_UInt32 myUint32 = 40;
+    UA_Variant_setScalar(&attr.value, &myUint32, &UA_TYPES[UA_TYPES_UINT32]);
+    attr.description = UA_LOCALIZEDTEXT("en-US","myUintValue");
+    attr.displayName = UA_LOCALIZEDTEXT("en-US","myUintValue");
+    attr.dataType = UA_TYPES[UA_TYPES_UINT32].typeId;
+    /* We set the access level to also support history read
+     * This is what will be reported to clients */
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD;
+    /* We also set this node to historizing, so the server internals also know from it. */
+    attr.historizing = true;
+
+    /* Add the variable node to the information model */
+    UA_NodeId uint32NodeId = UA_NODEID_STRING(1, "myUintValue");
+    UA_QualifiedName uint32Name = UA_QUALIFIEDNAME(1, "myUintValue");
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_NodeId outNodeId;
+    UA_NodeId_init(&outNodeId);
+    UA_StatusCode retval = UA_Server_addVariableNode(server,
+                                                     uint32NodeId,
+                                                     parentNodeId,
+                                                     parentReferenceNodeId,
+                                                     uint32Name,
+                                                     UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                                     attr,
+                                                     NULL,
+                                                     &outNodeId);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                "UA_Server_addVariableNode %s", UA_StatusCode_name(retval));
+
+    /* Now we define the settings for our node */
+    UA_HistorizingNodeIdSettings setting;
+
+    /* There is a memory based database plugin. We will use that. We just
+     * reserve space for 3 nodes with 10 values each. This will NOT automatically grow
+     * but will store data as a circular buffer of size 10. The 11th value will be
+     * stored replacing the oldest one and the process will continue like that. */
+    setting.historizingBackend = UA_HistoryDataBackend_Memory_Circular(3, 10);
+
+    /* We want the server to serve a maximum of 100 values per request. This
+     * value depend on the plattform you are running the server. A big server
+     * can serve more values, smaller ones less. */
+    setting.maxHistoryDataResponseSize = 100;
+
+    /* If we have a sensor which do not report updates
+     * and need to be polled we change the setting like that.
+     * The polling interval in ms.
+     *
+    setting.pollingInterval = 100;
+     *
+     * Set the update strategie to polling.
+     *
+    setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_POLL;
+     */
+
+    /* If you want to insert the values to the database yourself, we can set the user strategy here.
+     * This is useful if you for example want a value stored, if a defined delta is reached.
+     * Then you should use a local monitored item with a fuzziness and store the value in the callback.
+     *
+    setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
+     */
+
+    /* We want the values stored in the database, when the nodes value is
+     * set. */
+    setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_VALUESET;
+
+    /* At the end we register the node for gathering data in the database. */
+    retval = gathering.registerNodeId(server, gathering.context, &outNodeId, setting);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "registerNodeId %s", UA_StatusCode_name(retval));
+
+    /* If you use UA_HISTORIZINGUPDATESTRATEGY_POLL, then start the polling.
+     *
+    retval = gathering.startPoll(server, gathering.context, &outNodeId);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "startPoll %s", UA_StatusCode_name(retval));
+    */
+    retval = UA_Server_run(server, &running);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "UA_Server_run %s", UA_StatusCode_name(retval));
+    /*
+     * If you use UA_HISTORIZINGUPDATESTRATEGY_POLL, then stop the polling.
+     *
+    retval = gathering.stopPoll(server, gathering.context, &outNodeId);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "stopPoll %s", UA_StatusCode_name(retval));
+    */
+
+    UA_Server_delete(server);
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/include/open62541/client.h b/include/open62541/client.h
index 08bf3fd5f46..47da9b2c5e2 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -27,6 +27,7 @@
 #include <open62541/plugin/log.h>
 #include <open62541/plugin/network.h>
 #include <open62541/plugin/securitypolicy.h>
+#include <open62541/plugin/eventloop.h>
 
 _UA_BEGIN_DECLS
 
@@ -119,6 +120,9 @@ typedef struct {
                                               * up together with the
                                               * configuration. So it is possible
                                               * to allocate them on ROM. */
+    /* EventLoop */
+    UA_EventLoop *eventLoop;
+    UA_Boolean externalEventLoop; /* The EventLoop is not deleted with the config */
 
     /* Available SecurityPolicies */
     size_t securityPoliciesSize;
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
new file mode 100644
index 00000000000..3f15a4d816c
--- /dev/null
+++ b/include/open62541/plugin/eventloop.h
@@ -0,0 +1,302 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#ifndef UA_EVENTLOOP_H_
+#define UA_EVENTLOOP_H_
+
+#include <open62541/types.h>
+#include <open62541/types_generated.h>
+#include <open62541/util.h>
+#include <open62541/plugin/log.h>
+
+_UA_BEGIN_DECLS
+
+struct UA_EventLoop;
+typedef struct UA_EventLoop UA_EventLoop;
+
+struct UA_EventSource;
+typedef struct UA_EventSource UA_EventSource;
+
+/**
+ * Event Loop Subsystem
+ * ====================
+ *
+ * An OPC UA-enabled application can have several clients and servers. And
+ * server can serve different transport-level protocols for OPC UA. The
+ * EventLoop is a central module that provides a unified control-flow for all of
+ * these. Hence, several applications can share an EventLoop.
+ *
+ * The EventLoop and the ConnectionManager implementation is
+ * architecture-specific. The goal is to have a single call to "select" (epoll,
+ * kqueue, ...) in the EventLoop that covers all ConnectionManagers. Hence the
+ * EventLoop plugin implementation must know implementation details of the
+ * ConnectionManager implementations. So the EventLoop can extract socket
+ * information, etc. from the ConnectionManagers.
+ *
+ * Event Loop
+ * ----------
+ * The EventLoop implementation is part of the selected architecture. For
+ * example, "Win32/POSIX" stands for a Windows environment with an EventLoop
+ * that uses the POSIX API. Several EventLoops can be instantiated in parallel.
+ * But the globally defined functions are the same everywhere. */
+
+typedef void (*UA_Callback)(void *application, void *context);
+
+/* To be executed in the next EventLoop cycle */
+typedef struct UA_DelayedCallback {
+    struct UA_DelayedCallback *next; /* Singly-linked list */
+    UA_Callback callback;
+    void *application;
+    void *data;
+} UA_DelayedCallback;
+
+typedef enum {
+    UA_EVENTLOOPSTATE_FRESH = 0,
+    UA_EVENTLOOPSTATE_STARTED,
+    UA_EVENTLOOPSTATE_STOPPING, /* stopping in progress, needs EventLoop
+                                 * cycles to finish */
+    UA_EVENTLOOPSTATE_STOPPED
+} UA_EventLoopState;
+
+/**
+ * EventLoop Lifecycle
+ * ~~~~~~~~~~~~~~~~~~~ */
+
+UA_EXPORT UA_EventLoop *
+UA_EventLoop_new(const UA_Logger *logger);
+
+/* Clean up the EventLoop and free allocated memory. Can fail if the EventLoop
+ * is not stopped. */
+UA_EXPORT UA_StatusCode
+UA_EventLoop_delete(UA_EventLoop *el);
+
+UA_EXPORT UA_EventLoopState
+UA_EventLoop_getState(UA_EventLoop *el);
+
+UA_EXPORT UA_StatusCode
+UA_EventLoop_start(UA_EventLoop *el);
+
+/* Stop all EventSources. This is asynchronous and might need a few
+ * iterations of the main-loop to succeed. */
+UA_EXPORT void
+UA_EventLoop_stop(UA_EventLoop *el);
+
+/* Process events for at most "timeout" ms or until an unrecoverable error
+ * occurs. If timeout==0, then only already received events are processed. */
+UA_EXPORT UA_StatusCode
+UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout);
+
+/* Time of the next cyclic callback. Returns the max DateTime if no cyclic
+ * callback is registered. */
+UA_EXPORT UA_DateTime
+UA_EventLoop_nextCyclicTime(UA_EventLoop *el);
+
+/**
+ * Cyclic and Delayed Callbacks
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Cyclic callbacks are executed regularly with an interval. A delayed callback
+ * is executed in the next cycle of the EventLoop. The memory for the delayed
+ * callback is freed after the execution. */
+
+/* The execution interval is in ms. Returns the callbackId if the pointer is
+ * non-NULL. */
+UA_EXPORT UA_StatusCode
+UA_EventLoop_addCyclicCallback(UA_EventLoop *el, UA_Callback cb,
+                               void *application, void *data, UA_Double interval_ms,
+                               UA_DateTime *baseTime, UA_TimerPolicy timerPolicy,
+                               UA_UInt64 *callbackId);
+
+UA_EXPORT UA_StatusCode
+UA_EventLoop_addTimedCallback(UA_EventLoop *el, UA_Callback callback,
+                              void *application, void *data, UA_DateTime date,
+                              UA_UInt64 *callbackId);
+UA_EXPORT UA_StatusCode
+UA_EventLoop_modifyCyclicCallback(UA_EventLoop *el, UA_UInt64 callbackId,
+                                  UA_Double interval_ms, UA_DateTime *baseTime,
+                                  UA_TimerPolicy timerPolicy);
+
+UA_EXPORT void
+UA_EventLoop_removeCyclicCallback(UA_EventLoop *el, UA_UInt64 callbackId);
+
+UA_EXPORT void
+UA_EventLoop_addDelayedCallback(UA_EventLoop *el, UA_DelayedCallback *dc);
+
+/* Helper Functions */
+UA_EXPORT const UA_Logger *
+UA_EventLoop_getLogger(UA_EventLoop *el);
+
+UA_EXPORT void
+UA_EventLoop_setLogger(UA_EventLoop *el, const UA_Logger *logger);
+
+/**
+ * Event Source
+ * ------------ */
+
+typedef enum {
+    UA_EVENTSOURCESTATE_FRESH = 0,
+    UA_EVENTSOURCESTATE_STOPPED,      /* Registered but stopped */
+    UA_EVENTSOURCESTATE_STARTING,
+    UA_EVENTSOURCESTATE_STARTED,
+    UA_EVENTSOURCESTATE_STOPPING      /* Stopping in progress, needs
+                                       * EventLoop cycles to finish */
+} UA_EventSourceState;
+
+struct UA_EventSource {
+    struct UA_EventSource *next; /* Singly-linked list for use by the
+                                  * application that registered the ES */
+
+    /* Configuration
+     * ~~~~~~~~~~~~~ */
+    UA_String name;                 /* Unique name of the ES for logging */
+    void *application;              /* Application to which the ES belongs */
+    size_t paramsSize;
+    UA_KeyValuePair *params;        /* Configuration parameters */
+
+    /* Lifecycle
+     * ~~~~~~~~~ */
+    UA_EventSourceState state;
+    UA_EventLoop *eventLoop; /* EventLoop where the ES is registered */
+    UA_StatusCode (*start)(UA_EventSource *es);
+    void (*stop)(UA_EventSource *es); /* Asynchronous. Iterate theven EventLoop
+                                       * until the EventSource is stopped. */
+    UA_StatusCode (*free)(UA_EventSource *es);
+};
+
+/* Register the ES. Immediately starts the ES if the EventLoop is already
+ * started. Otherwise the ES is started together with the EventLoop. */
+UA_EXPORT UA_StatusCode
+UA_EventLoop_registerEventSource(UA_EventLoop *el,
+                                 UA_EventSource *es);
+
+/* If still registered, call _stop (but not _clear) on the CM and deregister. */
+UA_EXPORT UA_StatusCode
+UA_EventLoop_deregisterEventSource(UA_EventLoop *el,
+                                   UA_EventSource *es);
+
+/**
+ * Connection Manager
+ * ------------------
+ * Every Connection is created by a ConnectionManager. Every ConnectionManager
+ * belongs to just one application. A ConnectionManager can act purely as a
+ * passive "Factory" for Connections. But it can also be stateful. For example,
+ * it can keep a session to an MQTT broker open which is used by individual
+ * connections that are each bound to an MQTT topic. */
+
+struct UA_ConnectionManager;
+typedef struct UA_ConnectionManager UA_ConnectionManager;
+
+/**
+ * The ConnectionCallback is the only interface from the connection back to the
+ * application. The connectionId is announced to the application when it is
+ * first used for the callback. The context is a double-pointer so the context
+ * can be overwritten by the application */
+typedef void
+(*UA_ConnectionCallback)(UA_ConnectionManager *cm, uintptr_t connectionId,
+                         void **connectionContext, UA_StatusCode status,
+                         UA_ByteString msg);
+
+struct UA_ConnectionManager {
+    /* Every ConnectionManager is treated like an EventSource from the
+     * perspective of the EventLoop. */
+    UA_EventSource eventSource;
+
+    /* Passively listen for new connections
+     * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+     * Some ConnectionManagers passively listen to open new Connections. The
+     * configuration parameters stored in the EventSource are used during
+     * "start" of the EventSource to set this up. The "connectionCallback"
+     * callback is used to indicate that a new connection has been are created
+     * (status==Good, msg=empty).
+     *
+     * The callback depends on the application and has to be manually
+     * configured. */
+    UA_ConnectionCallback connectionCallback;
+    void *initialConnectionContext;
+
+    /* Actively Open a Connection
+     * ~~~~~~~~~~~~~~~~~~~~~~~~~~
+     * Some ConnectionManagers can actively open a new Connection. Connecting is
+     * asynchronous. cm->connectionCallback is called when the connection is
+     * open (status=GOOD) or aborted (status!=GOOD) when connecting failed.
+     *
+     * The parameters describe the connection. For example hostname and port
+     * (for TCP). Other protocols (e.g. MQTT, AMQP, etc.) may required
+     * additional arguments to open a connection.
+     *
+     * The connection is opened asynchronously. The ConnectionCallback is
+     * triggered when the connection is fully opened (UA_STATUSCODE_GOOD) or has
+     * failed (with an error code). */
+    UA_StatusCode
+    (*openConnection)(UA_ConnectionManager *cm,
+                      size_t paramsSize, UA_KeyValuePair *params,
+                      void *context);
+
+    /* Connection Activities
+     * ~~~~~~~~~~~~~~~~~~~~~
+     * The following are activities to be performed on an open connection.
+     *
+     * Each ConnectionManager allocates and frees his own memory for the network
+     * buffers. This enables, for example, zero-copy neworking mechanisms. The
+     * connectionId is part of the API to enable cases where memory is
+     * statically allocated for every connection */
+    UA_StatusCode
+    (*allocNetworkBuffer)(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          UA_ByteString *buf, size_t bufSize);
+    void
+    (*freeNetworkBuffer)(UA_ConnectionManager *cm, uintptr_t connectionId,
+                         UA_ByteString *buf);
+
+    /* Send a message. Sending is asynchronous. That is, the function returns
+     * before the message is ACKed from remote. The memory for the buffer is
+     * expected to be allocated with allocNetworkBuffer and is released
+     * internally (also if sending fails).
+     *
+     * Some ConnectionManagers can accept additional parameters for sending. For
+     * example a tx-time for sending in time-synchronized TSN settings. */
+    UA_StatusCode
+    (*sendWithConnection)(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          size_t paramsSize, UA_KeyValuePair *params,
+                          UA_ByteString *buf);
+
+    /* When a connection is closed, cm->connectionCallback is called with
+     * (status=BadConnectionClosed, msg=empty). Then the connection is cleared
+     * up inside the ConnectionManager. This is the case both for connections
+     * that are actively closed and those that are closed remotely. The return
+     * code is non-good only if the connection is already closed. */
+    UA_StatusCode
+    (*closeConnection)(UA_ConnectionManager *cm, uintptr_t connectionId);
+};
+
+/**
+ * TCP Connection Manager
+ * ~~~~~~~~~~~~~~~~~~~~~~
+ * Listens on the network and manages TCP connections. The configuration
+ * parameters have to set before calling _start to take effect.
+ *
+ * Configuration Parameters:
+ * - 0:listen-port [uint16]: Port to listen for new connections (default: do not
+ *                           listen on any port).
+ * - 0:listen-hostnames [string | string array]: Hostnames of the devices to
+ *                                               listen on (default: listen on
+ *                                               all devices).
+ * - 0:recv-bufsize [uint16]: Size of the buffer that is allocated for receiving
+ *                            messages (default 16kB).
+ *
+ * Open Connection Parameters:
+ * - 0:target-hostname [string]: Hostname (or IPv4/IPv6 address) of the target
+ *                               (required).
+ * - 0:target-port [uint16]: Port of the target host (required).
+ *
+ * Send Parameters:
+ * No additional parameters for sending over an established TCP socket defined. */
+UA_EXPORT UA_ConnectionManager *
+UA_ConnectionManager_TCP_new(const UA_String eventSourceName);
+
+_UA_END_DECLS
+
+#endif /* UA_EVENTLOOP_H_ */
diff --git a/include/open62541/plugin/log.h b/include/open62541/plugin/log.h
index e8a9bbc06e9..aa09ecc3bf8 100644
--- a/include/open62541/plugin/log.h
+++ b/include/open62541/plugin/log.h
@@ -37,6 +37,8 @@ typedef enum {
     UA_LOGLEVEL_FATAL
 } UA_LogLevel;
 
+#define UA_LOGCATEGORIES 8
+
 typedef enum {
     UA_LOGCATEGORY_NETWORK = 0,
     UA_LOGCATEGORY_SECURECHANNEL,
@@ -44,7 +46,8 @@ typedef enum {
     UA_LOGCATEGORY_SERVER,
     UA_LOGCATEGORY_CLIENT,
     UA_LOGCATEGORY_USERLAND,
-    UA_LOGCATEGORY_SECURITYPOLICY
+    UA_LOGCATEGORY_SECURITYPOLICY,
+    UA_LOGCATEGORY_EVENTLOOP
 } UA_LogCategory;
 
 typedef struct {
diff --git a/include/open62541/plugin/nodestore.h b/include/open62541/plugin/nodestore.h
index cd0524ec0d3..bcdd1b58d5a 100644
--- a/include/open62541/plugin/nodestore.h
+++ b/include/open62541/plugin/nodestore.h
@@ -209,18 +209,18 @@ typedef struct {
 
 /* The maximum number of ReferrenceTypes. Must be a multiple of 32. */
 #define UA_REFERENCETYPESET_MAX 128
-typedef struct { UA_UInt32 bits[UA_REFERENCETYPESET_MAX / 32]; } UA_ReferenceTypeSet;
+typedef struct {
+    UA_UInt32 bits[UA_REFERENCETYPESET_MAX / 32];
+} UA_ReferenceTypeSet;
+
+UA_EXPORT extern const UA_ReferenceTypeSet UA_REFERENCETYPESET_NONE;
+UA_EXPORT extern const UA_ReferenceTypeSet UA_REFERENCETYPESET_ALL;
 
 static UA_INLINE void
 UA_ReferenceTypeSet_init(UA_ReferenceTypeSet *set) {
     memset(set, 0, sizeof(UA_ReferenceTypeSet));
 }
 
-static UA_INLINE void
-UA_ReferenceTypeSet_any(UA_ReferenceTypeSet *set) {
-    memset(set, -1, sizeof(UA_ReferenceTypeSet));
-}
-
 static UA_INLINE UA_ReferenceTypeSet
 UA_REFTYPESET(UA_Byte index) {
     UA_Byte i = index / 32, j = index % 32;
@@ -959,10 +959,35 @@ typedef struct {
 
     void (*deleteNode)(void *nsCtx, UA_Node *node);
 
-    /* ``Get`` returns a pointer to an immutable node. ``Release`` indicates
-     * that the pointer is no longer accessed afterwards. */
-    const UA_Node * (*getNode)(void *nsCtx, const UA_NodeId *nodeId);
-
+    /* ``Get`` returns a pointer to an immutable node. Call ``releaseNode`` to
+     * indicate when the pointer is no longer accessed.
+     *
+     * It can be indicated if only a subset of the attributes and referencs need
+     * to be accessed. That is relevant when the nodestore accesses a slow
+     * storage backend for the attributes. The attribute mask is a bitfield with
+     * ORed entries from UA_NodeAttributesMask.
+     *
+     * The returned node always contains the context-pointer and other fields
+     * specific to open626541 (not official attributes).
+     *
+     * The NodeStore does not complain if attributes and references that don't
+     * exist (for that node) are requested. Attributes and references in
+     * addition to those specified can be returned. For example, if the full
+     * node already is kept in memory by the Nodestore. */
+    const UA_Node * (*getNode)(void *nsCtx, const UA_NodeId *nodeId,
+                               UA_UInt32 attributeMask,
+                               UA_ReferenceTypeSet references,
+                               UA_BrowseDirection referenceDirections);
+
+    /* Similar to the normal ``getNode``. But it can take advantage of the
+     * NodePointer structure, e.g. if it contains a direct pointer. */
+    const UA_Node * (*getNodeFromPtr)(void *nsCtx, UA_NodePointer ptr,
+                                      UA_UInt32 attributeMask,
+                                      UA_ReferenceTypeSet references,
+                                      UA_BrowseDirection referenceDirections);
+
+    /* Release a node that has been retrieved with ``getNode`` or
+     * ``getNodeFromPtr``. */
     void (*releaseNode)(void *nsCtx, const UA_Node *node);
 
     /* Returns an editable copy of a node (needs to be deleted with the
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 1513b5ba066..d20008ed3ac 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -24,6 +24,7 @@
 #include <open62541/types_generated.h>
 #include <open62541/types_generated_handling.h>
 
+#include <open62541/plugin/eventloop.h>
 #include <open62541/plugin/securitypolicy.h>
 #include <open62541/plugin/accesscontrol.h>
 #include <open62541/plugin/nodestore.h>
@@ -119,6 +120,10 @@ struct UA_ServerConfig {
      *    with custom data types are provided in
      *    ``/examples/custom_datatype/``. */
 
+    /* EventLoop */
+    UA_EventLoop *eventLoop;
+    UA_Boolean externalEventLoop; /* The EventLoop is not deleted with the config */
+
     /* Networking */
     size_t networkLayersSize;
     UA_ServerNetworkLayer *networkLayers;
@@ -424,28 +429,29 @@ UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId);
 
 UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_setSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                              const char *name, const UA_Variant *parameter);
+                              const UA_QualifiedName key,
+                              const UA_Variant *value);
 
 UA_EXPORT void UA_THREADSAFE
 UA_Server_deleteSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                                 const char *name);
+                                 const UA_QualifiedName key);
 
 /* Returns NULL if the session or the parameter are not defined. Returns a deep
  * copy otherwise */
 UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_getSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                              const char *name, UA_Variant *outParameter);
-
-/* Returns NULL if the parameter is not defined or not of the right datatype */
-UA_EXPORT UA_StatusCode UA_THREADSAFE
-UA_Server_getSessionScalarParameter(UA_Server *server, const UA_NodeId *sessionId,
-                                    const char *name, const UA_DataType *type,
-                                    UA_Variant *outParameter);
+                              const UA_QualifiedName key,
+                              UA_Variant *outValue);
 
+/* Returns NULL if the parameter is not defined or not a scalar or not of the
+ * right datatype. Otherwise a deep copy of the scalar value is filled at the
+ * target location of the void pointer. */
 UA_EXPORT UA_StatusCode UA_THREADSAFE
-UA_Server_getSessionArrayParameter(UA_Server *server, const UA_NodeId *sessionId,
-                                   const char *name, const UA_DataType *type,
-                                   UA_Variant *outParameter);
+UA_Server_getSessionParameter_scalar(UA_Server *server,
+                                     const UA_NodeId *sessionId,
+                                     const UA_QualifiedName key,
+                                     const UA_DataType *type,
+                                     void *outValue);
 
 /**
  * Reading and Writing Node Attributes
diff --git a/include/open62541/types.h b/include/open62541/types.h
index d8cdf685a2f..2e96882b9b0 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1106,7 +1106,10 @@ void UA_EXPORT UA_delete(void *p, const UA_DataType *type);
  *
  * @param p The memory location of the variable
  * @param type The datatype description of the variable
- * @param output A string that is memory-allocated for the pretty-printed output
+ * @param output A string that is used for the pretty-printed output. If the
+ *        memory for string is already allocated, we try to use the existing
+ *        string (the length is adjusted). If the string is empty, memory
+ *        is allocated for it.
  * @return Indicates whether the operation succeeded*/
 #ifdef UA_ENABLE_TYPEDESCRIPTION
 UA_StatusCode UA_EXPORT
diff --git a/include/open62541/util.h b/include/open62541/util.h
index 79e49f20c36..0409d08a5fa 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -47,44 +47,26 @@ typedef enum {
  * invalidates pointers into the previous array. If the key exists already, the
  * value is overwritten. */
 UA_EXPORT UA_StatusCode
-UA_KeyValueMap_setQualified(UA_KeyValuePair **map, size_t *mapSize,
-                            const UA_QualifiedName *key,
-                            const UA_Variant *value);
-
-/* Simplified version that assumes the key is in namespace 0 */
-UA_EXPORT UA_StatusCode
 UA_KeyValueMap_set(UA_KeyValuePair **map, size_t *mapSize,
-                   const char *key, const UA_Variant *value);
+                   const UA_QualifiedName key,
+                   const UA_Variant *value);
 
-/* Returns a pointer into underlying array or NULL if the key is not found.*/
-UA_EXPORT const UA_Variant *
-UA_KeyValueMap_getQualified(UA_KeyValuePair *map, size_t mapSize,
-                            const UA_QualifiedName *key);
-
-/* Simplified version that assumes the key is in namespace 0 */
+/* Returns a pointer to the value or NULL if the key is not found.*/
 UA_EXPORT const UA_Variant *
 UA_KeyValueMap_get(UA_KeyValuePair *map, size_t mapSize,
-                   const char *key);
+                   const UA_QualifiedName key);
 
 /* Returns NULL if the value for the key is not defined or not of the right
  * datatype and scalar/array */
-UA_EXPORT const UA_Variant *
+UA_EXPORT const void *
 UA_KeyValueMap_getScalar(UA_KeyValuePair *map, size_t mapSize,
-                         const char *key, const UA_DataType *type);
-
-UA_EXPORT const UA_Variant *
-UA_KeyValueMap_getArray(UA_KeyValuePair *map, size_t mapSize,
-                        const char *key, const UA_DataType *type);
+                         const UA_QualifiedName key,
+                         const UA_DataType *type);
 
 /* Remove a single entry. To delete the entire map, use UA_Array_delete. */
 UA_EXPORT void
-UA_KeyValueMap_deleteQualified(UA_KeyValuePair **map, size_t *mapSize,
-                               const UA_QualifiedName *key);
-
-/* Simplified version that assumes the key is in namespace 0 */
-UA_EXPORT void
 UA_KeyValueMap_delete(UA_KeyValuePair **map, size_t *mapSize,
-                      const char *key);
+                      const UA_QualifiedName key);
 
 /**
  * Endpoint URL Parser
diff --git a/plugins/historydata/ua_history_data_backend_memory.c b/plugins/historydata/ua_history_data_backend_memory.c
index 74421638699..3e99794ec33 100644
--- a/plugins/historydata/ua_history_data_backend_memory.c
+++ b/plugins/historydata/ua_history_data_backend_memory.c
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ *    Copyright 2021 (c) luibass92 <luibass92@live.it> (Author: Luigi Bassetta)
  */
 
 #include <open62541/plugin/historydata/history_data_backend_memory.h>
@@ -26,6 +27,8 @@ typedef struct {
     UA_DataValueMemoryStoreItem **dataStore;
     size_t storeEnd;
     size_t storeSize;
+    /* New field useful for circular buffer management */
+    size_t lastInserted;
 } UA_NodeIdStoreContextItem_backend_memory;
 
 static void
@@ -603,3 +606,261 @@ UA_HistoryDataBackend_Memory_clear(UA_HistoryDataBackend *backend)
     UA_MemoryStoreContext_delete(ctx);
     memset(backend, 0, sizeof(UA_HistoryDataBackend));
 }
+
+/* Circular buffer implementation */
+
+static UA_NodeIdStoreContextItem_backend_memory *
+getNewNodeIdContext_backend_memory_Circular(UA_MemoryStoreContext *context,
+                                            UA_Server *server,
+                                            const UA_NodeId *nodeId) {
+    UA_MemoryStoreContext *ctx = (UA_MemoryStoreContext *)context;
+    if(ctx->storeEnd >= ctx->storeSize) {
+        return NULL;
+    }
+    UA_NodeIdStoreContextItem_backend_memory *item = &ctx->dataStore[ctx->storeEnd];
+    UA_NodeId_copy(nodeId, &item->nodeId);
+    UA_DataValueMemoryStoreItem **store = (UA_DataValueMemoryStoreItem **)UA_calloc(ctx->initialStoreSize, sizeof(UA_DataValueMemoryStoreItem *));
+    if(!store) {
+        UA_NodeIdStoreContextItem_clear(item);
+        return NULL;
+    }
+    item->dataStore = store;
+    item->storeSize = ctx->initialStoreSize;
+    item->storeEnd = 0;
+    ++ctx->storeEnd;
+    return item;
+}
+
+static UA_NodeIdStoreContextItem_backend_memory *
+getNodeIdStoreContextItem_backend_memory_Circular(UA_MemoryStoreContext *context,
+                                                  UA_Server *server,
+                                                  const UA_NodeId *nodeId) {
+    for(size_t i = 0; i < context->storeEnd; ++i) {
+        if(UA_NodeId_equal(nodeId, &context->dataStore[i].nodeId)) {
+            return &context->dataStore[i];
+        }
+    }
+    return getNewNodeIdContext_backend_memory_Circular(context, server, nodeId);
+}
+
+static UA_StatusCode
+serverSetHistoryData_backend_memory_Circular(UA_Server *server,
+                                             void *context,
+                                             const UA_NodeId *sessionId,
+                                             void *sessionContext,
+                                             const UA_NodeId *nodeId,
+                                             UA_Boolean historizing,
+                                             const UA_DataValue *value) {
+    UA_NodeIdStoreContextItem_backend_memory *item = getNodeIdStoreContextItem_backend_memory_Circular((UA_MemoryStoreContext *)context, server, nodeId);
+    if(item == NULL) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    if(item->lastInserted >= item->storeSize) {
+        /* If the buffer size is overcomed, push new elements from the start of the buffer */
+        item->lastInserted = 0;
+    }
+    UA_DateTime timestamp = 0;
+    if(value->hasSourceTimestamp) {
+        timestamp = value->sourceTimestamp;
+    } else if(value->hasServerTimestamp) {
+        timestamp = value->serverTimestamp;
+    } else {
+        timestamp = UA_DateTime_now();
+    }
+    UA_DataValueMemoryStoreItem *newItem = (UA_DataValueMemoryStoreItem *)UA_calloc(1, sizeof(UA_DataValueMemoryStoreItem));
+    newItem->timestamp = timestamp;
+    UA_DataValue_copy(value, &newItem->value);
+
+    /* This implementation does NOT sort values by timestamp */
+
+    if(item->dataStore[item->lastInserted] != NULL) {
+        UA_DataValueMemoryStoreItem_clear(item->dataStore[item->lastInserted]);
+        UA_free(item->dataStore[item->lastInserted]);
+    }
+    item->dataStore[item->lastInserted] = newItem;
+    ++item->lastInserted;
+
+    if(item->storeEnd < item->storeSize) {
+        ++item->storeEnd;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static size_t
+getResultSize_service_Circular(const UA_HistoryDataBackend *backend, UA_Server *server,
+                               const UA_NodeId *sessionId, void *sessionContext,
+                               const UA_NodeId *nodeId, UA_DateTime start,
+                               UA_DateTime end, UA_UInt32 numValuesPerNode,
+                               UA_Boolean returnBounds, size_t *startIndex,
+                               size_t *endIndex, UA_Boolean *addFirst,
+                               UA_Boolean *addLast, UA_Boolean *reverse) {
+    *startIndex = 0;
+    *endIndex = backend->lastIndex(server, backend->context, sessionId, sessionContext, nodeId);
+    *addFirst = false;
+    *addLast = false;
+    if(end == LLONG_MIN) {
+        *reverse = false;
+    } else if(start == LLONG_MIN) {
+        *reverse = true;
+    } else {
+        *reverse = end < start;
+    }
+
+    size_t size = 0;
+    const UA_NodeIdStoreContextItem_backend_memory *item = getNodeIdStoreContextItem_backend_memory_Circular((UA_MemoryStoreContext *)backend->context, server, nodeId);
+    if(item == NULL) {
+        size = 0;
+    } else {
+        size = item->storeEnd;
+    }
+    return size;
+}
+
+static UA_StatusCode
+getHistoryData_service_Circular(UA_Server *server,
+                                const UA_NodeId *sessionId,
+                                void *sessionContext,
+                                const UA_HistoryDataBackend *backend,
+                                const UA_DateTime start,
+                                const UA_DateTime end,
+                                const UA_NodeId *nodeId,
+                                size_t maxSize,
+                                UA_UInt32 numValuesPerNode,
+                                UA_Boolean returnBounds,
+                                UA_TimestampsToReturn timestampsToReturn,
+                                UA_NumericRange range,
+                                UA_Boolean releaseContinuationPoints,
+                                const UA_ByteString *continuationPoint,
+                                UA_ByteString *outContinuationPoint,
+                                UA_HistoryData *historyData) {
+    size_t *resultSize = &historyData->dataValuesSize;
+    UA_DataValue **result = &historyData->dataValues;
+    size_t skip = 0;
+    UA_ByteString backendContinuationPoint;
+    UA_ByteString_init(&backendContinuationPoint);
+    if(continuationPoint->length > 0) {
+        if(continuationPoint->length < sizeof(size_t))
+            return UA_STATUSCODE_BADCONTINUATIONPOINTINVALID;
+        skip = *((size_t *)(continuationPoint->data));
+        backendContinuationPoint.length = continuationPoint->length - sizeof(size_t);
+        backendContinuationPoint.data = continuationPoint->data + sizeof(size_t);
+    }
+    size_t storeEnd = backend->getEnd(server, backend->context, sessionId, sessionContext, nodeId);
+    size_t startIndex;
+    size_t endIndex;
+    UA_Boolean addFirst;
+    UA_Boolean addLast;
+    UA_Boolean reverse;
+    size_t _resultSize = getResultSize_service_Circular(backend,
+                                                        server,
+                                                        sessionId,
+                                                        sessionContext,
+                                                        nodeId,
+                                                        start,
+                                                        end,
+                                                        numValuesPerNode == 0 ? 0 : numValuesPerNode + (UA_UInt32)skip,
+                                                        returnBounds,
+                                                        &startIndex,
+                                                        &endIndex,
+                                                        &addFirst,
+                                                        &addLast,
+                                                        &reverse);
+    *resultSize = _resultSize - skip;
+    if(*resultSize > maxSize) {
+        *resultSize = maxSize;
+    }
+    UA_DataValue *outResult = (UA_DataValue *)UA_Array_new(*resultSize, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    if(!outResult) {
+        *resultSize = 0;
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    *result = outResult;
+    size_t counter = 0;
+    if(addFirst) {
+        if(skip == 0) {
+            outResult[counter].hasStatus = true;
+            outResult[counter].status = UA_STATUSCODE_BADBOUNDNOTFOUND;
+            outResult[counter].hasSourceTimestamp = true;
+            if(start == LLONG_MIN) {
+                outResult[counter].sourceTimestamp = end;
+            } else {
+                outResult[counter].sourceTimestamp = start;
+            }
+            ++counter;
+        }
+    }
+    UA_ByteString backendOutContinuationPoint;
+    UA_ByteString_init(&backendOutContinuationPoint);
+    if(endIndex != storeEnd && startIndex != storeEnd) {
+        size_t retval = 0;
+        size_t valueSize = *resultSize - counter;
+        if(valueSize + skip > _resultSize - addFirst - addLast) {
+            if(skip == 0) {
+                valueSize = _resultSize - addFirst - addLast;
+            } else {
+                valueSize = _resultSize - skip - addLast;
+            }
+        }
+        UA_StatusCode ret = UA_STATUSCODE_GOOD;
+        if(valueSize > 0)
+            ret = backend->copyDataValues(server,
+                                          backend->context,
+                                          sessionId,
+                                          sessionContext,
+                                          nodeId,
+                                          startIndex,
+                                          endIndex,
+                                          reverse,
+                                          valueSize,
+                                          range,
+                                          releaseContinuationPoints,
+                                          &backendContinuationPoint,
+                                          &backendOutContinuationPoint,
+                                          &retval,
+                                          &outResult[counter]);
+        if(ret != UA_STATUSCODE_GOOD) {
+            UA_Array_delete(outResult, *resultSize, &UA_TYPES[UA_TYPES_DATAVALUE]);
+            *result = NULL;
+            *resultSize = 0;
+            return ret;
+        }
+        counter += retval;
+    }
+    if(addLast && counter < *resultSize) {
+        outResult[counter].hasStatus = true;
+        outResult[counter].status = UA_STATUSCODE_BADBOUNDNOTFOUND;
+        outResult[counter].hasSourceTimestamp = true;
+        if(start == LLONG_MIN && storeEnd != backend->firstIndex(server, backend->context, sessionId, sessionContext, nodeId)) {
+            outResult[counter].sourceTimestamp = backend->getDataValue(server, backend->context, sessionId, sessionContext, nodeId, endIndex)->sourceTimestamp - UA_DATETIME_SEC;
+        } else if(end == LLONG_MIN && storeEnd != backend->firstIndex(server, backend->context, sessionId, sessionContext, nodeId)) {
+            outResult[counter].sourceTimestamp = backend->getDataValue(server, backend->context, sessionId, sessionContext, nodeId, endIndex)->sourceTimestamp + UA_DATETIME_SEC;
+        } else {
+            outResult[counter].sourceTimestamp = end;
+        }
+    }
+    // there are more values
+    if(skip + *resultSize < _resultSize
+       // there are not more values for this request, but there are more values in
+       // database
+       || (backendOutContinuationPoint.length > 0 && numValuesPerNode != 0)
+       // we deliver just one value which is a FIRST/LAST value
+       || (skip == 0 && addFirst == true && *resultSize == 1)) {
+        if(UA_ByteString_allocBuffer(outContinuationPoint, backendOutContinuationPoint.length + sizeof(size_t)) != UA_STATUSCODE_GOOD) {
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
+        *((size_t *)(outContinuationPoint->data)) = skip + *resultSize;
+        if(backendOutContinuationPoint.length > 0)
+            memcpy(outContinuationPoint->data + sizeof(size_t), backendOutContinuationPoint.data, backendOutContinuationPoint.length);
+    }
+    UA_ByteString_clear(&backendOutContinuationPoint);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_HistoryDataBackend
+UA_HistoryDataBackend_Memory_Circular(size_t initialNodeIdStoreSize, size_t initialDataStoreSize) {
+    UA_HistoryDataBackend result = UA_HistoryDataBackend_Memory(initialNodeIdStoreSize, initialDataStoreSize);
+    result.serverSetHistoryData = &serverSetHistoryData_backend_memory_Circular;
+    result.getHistoryData = &getHistoryData_service_Circular;
+    return result;
+}
diff --git a/plugins/historydata/ua_history_data_gathering_default.c b/plugins/historydata/ua_history_data_gathering_default.c
index ada881fd1ce..db55473c4a0 100644
--- a/plugins/historydata/ua_history_data_gathering_default.c
+++ b/plugins/historydata/ua_history_data_gathering_default.c
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ *    Copyright 2021 (c) luibass92 <luibass92@live.it> (Author: Luigi Bassetta)
  */
 
 #include <open62541/client_subscriptions.h>
@@ -228,3 +229,30 @@ UA_HistoryDataGathering_Default(size_t initialNodeIdStoreSize)
     gathering.context = context;
     return gathering;
 }
+
+/* Circular buffer implementation */
+
+static UA_StatusCode
+registerNodeId_gathering_circular(UA_Server *server, void *context,
+                                  const UA_NodeId *nodeId,
+                                  const UA_HistorizingNodeIdSettings setting) {
+    UA_NodeIdStoreContext *ctx = (UA_NodeIdStoreContext *)context;
+    if(getNodeIdStoreContextItem_gathering_default(ctx, nodeId)) {
+        return UA_STATUSCODE_BADNODEIDEXISTS;
+    }
+    if(ctx->storeEnd >= ctx->storeSize || !ctx->dataStore) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    UA_NodeId_copy(nodeId, &ctx->dataStore[ctx->storeEnd].nodeId);
+    size_t current = ctx->storeEnd;
+    ctx->dataStore[current].setting = setting;
+    ++ctx->storeEnd;
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_HistoryDataGathering
+UA_HistoryDataGathering_Circular(size_t initialNodeIdStoreSize) {
+    UA_HistoryDataGathering gathering = UA_HistoryDataGathering_Default(initialNodeIdStoreSize);
+    gathering.registerNodeId = &registerNodeId_gathering_circular;
+    return gathering;
+}
diff --git a/plugins/include/open62541/plugin/historydata/history_data_backend_memory.h b/plugins/include/open62541/plugin/historydata/history_data_backend_memory.h
index 7c0ec59eb57..17f1b87c9b7 100644
--- a/plugins/include/open62541/plugin/historydata/history_data_backend_memory.h
+++ b/plugins/include/open62541/plugin/historydata/history_data_backend_memory.h
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ *    Copyright 2021 (c) luibass92 <luibass92@live.it> (Author: Luigi Bassetta)
  */
 
 #ifndef UA_HISTORYDATABACKEND_MEMORY_H_
@@ -17,6 +18,15 @@ _UA_BEGIN_DECLS
 UA_HistoryDataBackend UA_EXPORT
 UA_HistoryDataBackend_Memory(size_t initialNodeIdStoreSize, size_t initialDataStoreSize);
 
+/* This function construct a UA_HistoryDataBackend which implements a circular buffer in memory.
+ *
+ * initialNodeIdStoreSize is the maximum number of NodeIds that will be historized. This number cannot be overcomed.
+ * initialDataStoreSize is the maximum number of UA_DataValueMemoryStoreItem that will be saved in the circular buffer for a particular NodeId.
+ *                      Subsequent UA_DataValueMemoryStoreItem will be saved replacing the oldest ones following the logic of circular buffers.
+ */
+UA_HistoryDataBackend UA_EXPORT
+UA_HistoryDataBackend_Memory_Circular(size_t initialNodeIdStoreSize, size_t initialDataStoreSize);
+
 void UA_EXPORT
 UA_HistoryDataBackend_Memory_clear(UA_HistoryDataBackend *backend);
 
diff --git a/plugins/include/open62541/plugin/historydata/history_data_gathering_default.h b/plugins/include/open62541/plugin/historydata/history_data_gathering_default.h
index cfd039e4bf9..7985bc763f2 100644
--- a/plugins/include/open62541/plugin/historydata/history_data_gathering_default.h
+++ b/plugins/include/open62541/plugin/historydata/history_data_gathering_default.h
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ *    Copyright 2021 (c) luibass92 <luibass92@live.it> (Author: Luigi Bassetta)
  */
 
 #ifndef UA_HISTORYDATAGATHERING_DEFAULT_H_
@@ -15,6 +16,13 @@ _UA_BEGIN_DECLS
 UA_HistoryDataGathering UA_EXPORT
 UA_HistoryDataGathering_Default(size_t initialNodeIdStoreSize);
 
+/* This function construct a UA_HistoryDataGathering which implements a circular buffer in memory.
+ *
+ * initialNodeIdStoreSize is the maximum number of NodeIds for which the data will be gathered. This number cannot be overcomed.
+ */
+UA_HistoryDataGathering UA_EXPORT
+UA_HistoryDataGathering_Circular(size_t initialNodeIdStoreSize);
+
 _UA_END_DECLS
 
 #endif /* UA_HISTORYDATAGATHERING_DEFAULT_H_ */
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 6e4ed55a30a..ab0c66d9340 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -41,15 +41,17 @@ UA_DURATIONRANGE(UA_Duration min, UA_Duration max) {
     return range;
 }
 
+static UA_StatusCode
+setDefaultConfig(UA_ServerConfig *conf);
+
 UA_Server *
 UA_Server_new() {
     UA_ServerConfig config;
     memset(&config, 0, sizeof(UA_ServerConfig));
-    /* Set a default logger and NodeStore for the initialization */
-    config.logger = UA_Log_Stdout_;
-    if(UA_STATUSCODE_GOOD != UA_Nodestore_HashMap(&config.nodestore)) {
+
+    UA_StatusCode res = setDefaultConfig(&config);
+    if(res != UA_STATUSCODE_GOOD)
         return NULL;
-    }
 
     return UA_Server_newWithConfig(&config);
 }
@@ -125,14 +127,22 @@ setDefaultConfig(UA_ServerConfig *conf) {
     if(!conf)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
+    /* NodeStore */
     if(conf->nodestore.context == NULL)
         UA_Nodestore_HashMap(&conf->nodestore);
 
-    /* --> Start setting the default static config <-- */
-    /* Allow user to set his own logger */
+    /* Logging */
     if(!conf->logger.log)
         conf->logger = UA_Log_Stdout_;
 
+    /* EventLoop */
+    if(conf->eventLoop == NULL) {
+        conf->eventLoop = UA_EventLoop_new(&conf->logger);
+        conf->externalEventLoop = false;
+    }
+
+    /* --> Start setting the default static config <-- */
+
     conf->shutdownDelay = 0.0;
 
     /* Server Description */
@@ -752,6 +762,12 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
        config->logger.clear = UA_Log_Stdout_clear;
     }
 
+    /* EventLoop */
+    if(config->eventLoop == NULL) {
+        config->eventLoop = UA_EventLoop_new(&config->logger);
+        config->externalEventLoop = false;
+    }
+
     if (config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
         UA_Array_delete(config->sessionLocaleIds, config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
     }
diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index ce0630bf5be..109fa1e7a69 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -41,8 +41,9 @@ const char *logLevelNames[6] = {"trace", "debug",
                                 ANSI_COLOR_YELLOW "warn",
                                 ANSI_COLOR_RED "error",
                                 ANSI_COLOR_MAGENTA "fatal"};
-const char *logCategoryNames[7] = {"network", "channel", "session", "server",
-                                   "client", "userland", "securitypolicy"};
+const char *logCategoryNames[UA_LOGCATEGORIES] =
+    {"network", "channel", "session", "server",
+     "client", "userland", "securitypolicy", "eventloop"};
 
 #ifdef __clang__
 __attribute__((__format__(__printf__, 4 , 0)))
diff --git a/plugins/ua_log_syslog.c b/plugins/ua_log_syslog.c
index 31264aeb26f..dcbae585840 100644
--- a/plugins/ua_log_syslog.c
+++ b/plugins/ua_log_syslog.c
@@ -13,8 +13,9 @@
 
 const char *syslogLevelNames[6] = {"trace", "debug", "info",
                                    "warn", "error", "fatal"};
-const char *syslogCategoryNames[7] = {"network", "channel", "session", "server",
-                                      "client", "userland", "securitypolicy"};
+const char *syslogCategoryNames[UA_LOGCATEGORIES] =
+    {"network", "channel", "session", "server",
+     "client", "userland", "securitypolicy", "eventloop"};
 
 #ifdef __clang__
 __attribute__((__format__(__printf__, 4 , 0)))
diff --git a/plugins/ua_nodestore_hashmap.c b/plugins/ua_nodestore_hashmap.c
index 2d3c30846ee..002eda2dd6b 100644
--- a/plugins/ua_nodestore_hashmap.c
+++ b/plugins/ua_nodestore_hashmap.c
@@ -254,7 +254,10 @@ UA_NodeMap_deleteNode(void *context, UA_Node *node) {
 }
 
 static const UA_Node *
-UA_NodeMap_getNode(void *context, const UA_NodeId *nodeid) {
+UA_NodeMap_getNode(void *context, const UA_NodeId *nodeid,
+                   UA_UInt32 attributeMask,
+                   UA_ReferenceTypeSet references,
+                   UA_BrowseDirection referenceDirections) {
     UA_NodeMap *ns = (UA_NodeMap*)context;
     UA_NodeMapSlot *slot = findOccupiedSlot(ns, nodeid);
     if(!slot)
@@ -263,6 +266,17 @@ UA_NodeMap_getNode(void *context, const UA_NodeId *nodeid) {
     return &slot->entry->node;
 }
 
+static const UA_Node *
+UA_NodeMap_getNodeFromPtr(void *context, UA_NodePointer ptr,
+                          UA_UInt32 attributeMask,
+                          UA_ReferenceTypeSet references,
+                          UA_BrowseDirection referenceDirections) {
+    if(!UA_NodePointer_isLocal(ptr))
+        return NULL;
+    UA_NodeId id = UA_NodePointer_toNodeId(ptr);
+    return UA_NodeMap_getNode(context, &id, attributeMask, references, referenceDirections);
+}
+
 static void
 UA_NodeMap_releaseNode(void *context, const UA_Node *node) {
     if (!node)
@@ -513,6 +527,7 @@ UA_Nodestore_HashMap(UA_Nodestore *ns) {
     ns->newNode = UA_NodeMap_newNode;
     ns->deleteNode = UA_NodeMap_deleteNode;
     ns->getNode = UA_NodeMap_getNode;
+    ns->getNodeFromPtr = UA_NodeMap_getNodeFromPtr;
     ns->releaseNode = UA_NodeMap_releaseNode;
     ns->getNodeCopy = UA_NodeMap_getNodeCopy;
     ns->insertNode = UA_NodeMap_insertNode;
diff --git a/plugins/ua_nodestore_ziptree.c b/plugins/ua_nodestore_ziptree.c
index c4a1d5895f7..88fb811574e 100644
--- a/plugins/ua_nodestore_ziptree.c
+++ b/plugins/ua_nodestore_ziptree.c
@@ -139,7 +139,10 @@ zipNsDeleteNode(void *nsCtx, UA_Node *node) {
 }
 
 static const UA_Node *
-zipNsGetNode(void *nsCtx, const UA_NodeId *nodeId) {
+zipNsGetNode(void *nsCtx, const UA_NodeId *nodeId,
+             UA_UInt32 attributeMask,
+             UA_ReferenceTypeSet references,
+             UA_BrowseDirection referenceDirections) {
     ZipContext *ns = (ZipContext*)nsCtx;
     NodeEntry dummy;
     dummy.nodeIdHash = UA_NodeId_hash(nodeId);
@@ -151,6 +154,18 @@ zipNsGetNode(void *nsCtx, const UA_NodeId *nodeId) {
     return (const UA_Node*)&entry->nodeId;
 }
 
+static const UA_Node *
+zipNsGetNodeFromPtr(void *nsCtx, UA_NodePointer ptr,
+                    UA_UInt32 attributeMask,
+                    UA_ReferenceTypeSet references,
+                    UA_BrowseDirection referenceDirections) {
+    if(!UA_NodePointer_isLocal(ptr))
+        return NULL;
+    UA_NodeId id = UA_NodePointer_toNodeId(ptr);
+    return zipNsGetNode(nsCtx, &id, attributeMask,
+                        references, referenceDirections);
+}
+
 static void
 zipNsReleaseNode(void *nsCtx, const UA_Node *node) {
     if(!node)
@@ -163,9 +178,12 @@ zipNsReleaseNode(void *nsCtx, const UA_Node *node) {
 
 static UA_StatusCode
 zipNsGetNodeCopy(void *nsCtx, const UA_NodeId *nodeId,
-                         UA_Node **outNode) {
-    /* Find the node */
-    const UA_Node *node = zipNsGetNode(nsCtx, nodeId);
+                 UA_Node **outNode) {
+    /* Get the node (with all attributes and references, the mask and refs are
+       currently noy evaluated within the plugin.) */
+    const UA_Node *node =
+        zipNsGetNode(nsCtx, nodeId, UA_NODEATTRIBUTESMASK_ALL,
+                     UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
     if(!node)
         return UA_STATUSCODE_BADNODEIDUNKNOWN;
 
@@ -261,8 +279,10 @@ zipNsInsertNode(void *nsCtx, UA_Node *node, UA_NodeId *addedNodeId) {
 
 static UA_StatusCode
 zipNsReplaceNode(void *nsCtx, UA_Node *node) {
-    /* Find the node */
-    const UA_Node *oldNode = zipNsGetNode(nsCtx, &node->head.nodeId);
+    /* Find the node (the mask and refs are not evaluated yet by the plugin)*/
+    const UA_Node *oldNode =
+        zipNsGetNode(nsCtx, &node->head.nodeId, UA_NODEATTRIBUTESMASK_ALL,
+                     UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
     if(!oldNode) {
         deleteEntry(container_of(node, NodeEntry, nodeId));
         return UA_STATUSCODE_BADNODEIDUNKNOWN;
@@ -372,6 +392,7 @@ UA_Nodestore_ZipTree(UA_Nodestore *ns) {
     ns->newNode = zipNsNewNode;
     ns->deleteNode = zipNsDeleteNode;
     ns->getNode = zipNsGetNode;
+    ns->getNodeFromPtr = zipNsGetNodeFromPtr;
     ns->releaseNode = zipNsReleaseNode;
     ns->getNodeCopy = zipNsGetNodeCopy;
     ns->insertNode = zipNsInsertNode;
diff --git a/plugins/ua_pubsub_ethernet.c b/plugins/ua_pubsub_ethernet.c
index 0f1889550d3..8032ca6a64c 100644
--- a/plugins/ua_pubsub_ethernet.c
+++ b/plugins/ua_pubsub_ethernet.c
@@ -1243,7 +1243,7 @@ UA_PubSubChannelEthernet_receive(UA_PubSubChannel *channel,
                                            * VLAN header size is stripped before it is recieved
                                            * so the packet length is less than 60bytes */
 
-        messageLength = messageLength + ((size_t)dataLen - sizeof(struct ether_header));
+        messageLength = ((size_t)dataLen - sizeof(struct ether_header));
         buffer.length = messageLength;
 
         retval = receiveCallback(channel, receiveCallbackContext, &buffer);
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 80161f84777..b42968cd6c2 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -631,6 +631,7 @@ UA_PubSubChannelUDPMC_receive(UA_PubSubChannel *channel,
         UA_DateTime newTimeoutValue = remainingTimeoutValue - receiveDuration;
         timeoutValue.tv_sec = (long int)(newTimeoutValue  / UA_DATETIME_SEC);
         timeoutValue.tv_usec = (long int)((newTimeoutValue % UA_DATETIME_SEC) * 100);
+
     } while(true); /* TODO:Need to handle for jumbo frames*/
                                              /* 1518 bytes is the maximum size of ethernet packet
                                               * where 18 bytes used for header size, 28 bytes of header
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d9b36535027..ffe2fc2e61d 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -16,6 +16,7 @@
  *    Copyright 2017 (c) Mark Giraud, Fraunhofer IOSB
  *    Copyright 2018 (c) Kalycito Infotech Private Limited
  *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
  */
 
 #include <open62541/transport_generated.h>
@@ -32,7 +33,6 @@ static void
 UA_Client_init(UA_Client* client) {
     UA_SecureChannel_init(&client->channel, &client->config.localConnectionConfig);
     client->connectStatus = UA_STATUSCODE_GOOD;
-    UA_Timer_init(&client->timer);
     notifyClientState(client);
 }
 
@@ -70,6 +70,19 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
     UA_free(config->securityPolicies);
     config->securityPolicies = 0;
 
+    /* Stop and delete the EventLoop */
+    if(config->eventLoop && !config->externalEventLoop) {
+        if(UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_FRESH &&
+           UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_STOPPED) {
+            UA_EventLoop_stop(config->eventLoop);
+            while(UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_STOPPED) {
+                UA_EventLoop_run(config->eventLoop, 100);
+            }
+        }
+        UA_EventLoop_delete(config->eventLoop);
+        config->eventLoop = NULL;
+    }
+
     /* Logger */
     if(config->logger.clear)
         config->logger.clear(config->logger.context);
@@ -99,8 +112,6 @@ UA_Client_clear(UA_Client *client) {
     UA_Client_Subscriptions_clean(client);
 #endif
 
-    /* Delete the timed work */
-    UA_Timer_clear(&client->timer);
 }
 
 void
@@ -592,27 +603,29 @@ UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
 UA_StatusCode UA_EXPORT
 UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
-    return UA_Timer_addTimedCallback(&client->timer, (UA_ApplicationCallback)callback,
+    return UA_EventLoop_addTimedCallback(client->config.eventLoop, (UA_Callback)callback,
                                      client, data, date, callbackId);
 }
 
 UA_StatusCode
 UA_Client_addRepeatedCallback(UA_Client *client, UA_ClientCallback callback,
                               void *data, UA_Double interval_ms, UA_UInt64 *callbackId) {
-    return UA_Timer_addRepeatedCallback(&client->timer, (UA_ApplicationCallback)callback,
-                                        client, data, interval_ms, NULL,
-                                        UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, callbackId);
+
+    return UA_EventLoop_addCyclicCallback(
+        client->config.eventLoop, (UA_Callback)callback, client, data,
+        interval_ms, NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, callbackId);
 }
 
 UA_StatusCode
 UA_Client_changeRepeatedCallbackInterval(UA_Client *client, UA_UInt64 callbackId,
                                          UA_Double interval_ms) {
-    return UA_Timer_changeRepeatedCallback(&client->timer, callbackId, interval_ms, NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
+    return UA_EventLoop_modifyCyclicCallback(client->config.eventLoop, callbackId,
+                                             interval_ms, NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
 }
 
 void
 UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId) {
-    UA_Timer_removeCallback(&client->timer, callbackId);
+    UA_EventLoop_removeCyclicCallback(client->config.eventLoop, callbackId);
 }
 
 static void
@@ -672,19 +685,23 @@ UA_Client_backgroundConnectivity(UA_Client *client) {
         client->pendingConnectivityCheck = true;
 }
 
-static void
-clientExecuteRepeatedCallback(void *executionApplication, UA_ApplicationCallback cb,
-                              void *callbackApplication, void *data) {
-    cb(callbackApplication, data);
-}
-
 UA_StatusCode
 UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_CHECK_ERROR(UA_EventLoop_getState(cc->eventLoop) != UA_EVENTLOOPSTATE_STOPPED,
+                   return UA_STATUSCODE_BAD, &client->config.logger, UA_LOGCATEGORY_CLIENT,
+                   "Eventloop was explicitly stopped.");
+
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
+    if(UA_EventLoop_getState(cc->eventLoop) == UA_EVENTLOOPSTATE_FRESH) {
+        rv = UA_EventLoop_start(cc->eventLoop);
+        UA_CHECK_STATUS(rv, return rv);
+    }
+
     /* Process timed (repeated) jobs */
     UA_DateTime now = UA_DateTime_nowMonotonic();
-    UA_DateTime maxDate =
-        UA_Timer_process(&client->timer, now, (UA_TimerExecutionCallback)
-                         clientExecuteRepeatedCallback, client);
+    UA_EventLoop_run(client->config.eventLoop, 0);
+    UA_DateTime maxDate = UA_EventLoop_nextCyclicTime(client->config.eventLoop);
     if(maxDate > now + ((UA_DateTime)timeout * UA_DATETIME_MSEC))
         maxDate = now + ((UA_DateTime)timeout * UA_DATETIME_MSEC);
 
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index be9a751a469..5757f5134b9 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -20,7 +20,8 @@
 
 #include "open62541_queue.h"
 #include "ua_securechannel.h"
-#include "ua_timer.h"
+#include "common/ua_timer.h"
+#include "ua_util_internal.h"
 
 _UA_BEGIN_DECLS
 
@@ -109,7 +110,6 @@ typedef struct CustomCallback {
 
 struct UA_Client {
     UA_ClientConfig config;
-    UA_Timer timer;
 
     /* Overall connection status */
     UA_StatusCode connectStatus;
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 19dd924895a..834541e7958 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -278,6 +278,7 @@ UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server,
 
 UA_StatusCode
 UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
+                                        UA_ReaderGroup *readerGroup,
                                         UA_DataSetReader *dataSetReader,
                                         UA_DataSetMessage *dsm, UA_UInt16 *writerId,
                                         UA_Byte dsmCount, UA_NetworkMessage *nm);
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 968f1afefbe..c12a01d1316 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2017-2019 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2018 Fraunhofer IOSB (Author: Julius Pfrommer)
+ * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  */
 
 #include <open62541/server_pubsub.h>
@@ -316,12 +317,10 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     /* Stop and unfreeze all WriterGroups */
     UA_PubSubConnection *tmpConnection;
     TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry){
-        for(size_t i = 0; i < pubSubManager->connectionsSize; i++) {
-            UA_WriterGroup *writerGroup;
-            LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
-                UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_DISABLED, writerGroup);
-                UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup->identifier);
-            }
+        UA_WriterGroup *writerGroup;
+        LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
+            UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_DISABLED, writerGroup);
+            UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup->identifier);
         }
     }
 
@@ -352,20 +351,22 @@ UA_StatusCode
 UA_PubSubManager_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
                                      void *data, UA_Double interval_ms, UA_DateTime *baseTime,
                                      UA_TimerPolicy timerPolicy, UA_UInt64 *callbackId) {
-    return UA_Timer_addRepeatedCallback(&server->timer, (UA_ApplicationCallback)callback,
-                                        server, data, interval_ms, baseTime, timerPolicy, callbackId);
+    return UA_EventLoop_addCyclicCallback(server->config.eventLoop, (UA_Callback)callback,
+                                          server, data, interval_ms, baseTime,
+                                          timerPolicy, callbackId);
 }
 
 UA_StatusCode
 UA_PubSubManager_changeRepeatedCallback(UA_Server *server, UA_UInt64 callbackId,
                                         UA_Double interval_ms, UA_DateTime *baseTime,
                                         UA_TimerPolicy timerPolicy) {
-    return UA_Timer_changeRepeatedCallback(&server->timer, callbackId, interval_ms, baseTime, timerPolicy);
+    return UA_EventLoop_modifyCyclicCallback(server->config.eventLoop, callbackId,
+                                             interval_ms, baseTime, timerPolicy);
 }
 
 void
 UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callbackId) {
-    UA_Timer_removeCallback(&server->timer, callbackId);
+    UA_EventLoop_removeCyclicCallback(server->config.eventLoop, callbackId);
 }
 
 
@@ -427,7 +428,7 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCom
                     /* use a timed callback, because one notification is enough, 
                     we assume that MessageReceiveTimeout configuration is in [ms], we do not handle or check fractions */
                     UA_UInt64 interval = (UA_UInt64)(reader->config.messageReceiveTimeout * UA_DATETIME_MSEC);
-                    ret = UA_Timer_addTimedCallback(&server->timer, (UA_ApplicationCallback) reader->msgRcvTimeoutTimerCallback, 
+                    ret = UA_EventLoop_addTimedCallback(server->config.eventLoop, (UA_Callback) reader->msgRcvTimeoutTimerCallback,
                         server, reader, UA_DateTime_nowMonotonic() + (UA_DateTime) interval, &(reader->msgRcvTimeoutTimerId));
                     if (ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -475,7 +476,7 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComp
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
-                    UA_Timer_removeCallback(&server->timer, reader->msgRcvTimeoutTimerId);
+                    UA_EventLoop_removeCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId);
                     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                         "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
                             "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
@@ -515,7 +516,7 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
-                    ret = UA_Timer_changeRepeatedCallback(&server->timer, reader->msgRcvTimeoutTimerId,
+                    ret = UA_EventLoop_modifyCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId,
                                                           reader->config.messageReceiveTimeout, NULL,
                                                           UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
                     if (ret == UA_STATUSCODE_GOOD) {
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 010f8d1f3b7..54d18cde5b1 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -49,6 +49,10 @@ const UA_Byte DS_MESSAGEHEADER_PICOSECONDS_INCLUDED_MASK = 32;
 const UA_Byte NM_SHIFT_LEN = 2;
 const UA_Byte DS_MH_SHIFT_LEN = 1;
 
+/* Static memory allocation for the message nonce */
+#define MESSAGE_NONCE_LENGTH      8
+static UA_Byte MessageNonceGenerated[MESSAGE_NONCE_LENGTH];
+
 static UA_Boolean UA_NetworkMessage_ExtendedFlags1Enabled(const UA_NetworkMessage* src);
 static UA_Boolean UA_NetworkMessage_ExtendedFlags2Enabled(const UA_NetworkMessage* src);
 static UA_Boolean UA_DataSetMessageHeader_DataSetFlags2Enabled(const UA_DataSetMessageHeader* src);
@@ -762,7 +766,8 @@ UA_SecurityHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
     // MessageNonce
     if(nonceLength > 0) {
         //TODO: check for memory leaks
-        rv = UA_ByteString_allocBuffer(&dst->securityHeader.messageNonce, nonceLength);
+        dst->securityHeader.messageNonce.length = MESSAGE_NONCE_LENGTH;
+        dst->securityHeader.messageNonce.data = MessageNonceGenerated;
         UA_CHECK_STATUS(rv, return rv);
         for (UA_Byte i = 0; i < nonceLength; i++) {
             rv = UA_Byte_decodeBinary(src, offset,
@@ -1095,8 +1100,6 @@ UA_NetworkMessage_clear(UA_NetworkMessage* p) {
     if(p->promotedFieldsEnabled)
         UA_Array_delete(p->promotedFields, p->promotedFieldsSize, &UA_TYPES[UA_TYPES_VARIANT]);
 
-    UA_ByteString_clear(&p->securityHeader.messageNonce);
-
     if(p->networkMessageType == UA_NETWORKMESSAGE_DATASET) {
         if(p->payloadHeaderEnabled) {
             if(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != NULL) {
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 19d8295887a..64369d1d6ff 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -221,6 +221,10 @@ typedef struct {
     UA_Boolean RTsubscriberEnabled; /* Addtional offsets computation like publisherId, WGId if this bool enabled */
     UA_NetworkMessage *nm; /* The precomputed NetworkMessage for subscriber */
     size_t rawMessageLength;
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    UA_ByteString encryptBuffer; /* The precomputed message buffer is copied into the encrypt buffer for encryption and signing*/
+    UA_Byte *payloadPosition; /* Payload Position of the message to encrypt*/
+#endif
 } UA_NetworkMessageOffsetBuffer;
 
 /**
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index f9e7bbc91c6..52c4bf0c775 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -32,6 +32,12 @@
 /* This functionality of this API will be used in future to create mirror Variables - TODO */
 /* #define UA_MAX_SIZENAME           64 */ /* Max size of Qualified Name of Subscribed Variable */
 
+/* Static memory allocation for the message nonce */
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+#define MESSAGE_NONCE_LENGTH      8
+static UA_Byte MessageNonceGenerated[MESSAGE_NONCE_LENGTH];
+#endif
+
 /* Clear DataSetReader */
 static void
 UA_DataSetReader_clear(UA_Server *server, UA_DataSetReader *dataSetReader);
@@ -210,10 +216,9 @@ UA_DataSetReader_generateDataSetMessage(UA_Server *server,
 }
 
 UA_StatusCode
-UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
-                                        UA_DataSetReader *dataSetReader,
-                                        UA_DataSetMessage *dsm, UA_UInt16 *writerId,
-                                        UA_Byte dsmCount, UA_NetworkMessage *nm) {
+UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection, UA_ReaderGroup *readerGroup,
+                                        UA_DataSetReader *dataSetReader, UA_DataSetMessage *dsm, UA_UInt16 *writerId, UA_Byte dsmCount,
+                                        UA_NetworkMessage *nm) {
     UA_ExtensionObject *settings = &dataSetReader->config.messageSettings;
     if(settings->content.decoded.type != &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE])
         return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -242,6 +247,28 @@ UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
                                  (u64)UA_UADPNETWORKMESSAGECONTENTMASK_DATASETCLASSID) != 0;
     nm->promotedFieldsEnabled = ((u64)dsrm->networkMessageContentMask &
                                  (u64)UA_UADPNETWORKMESSAGECONTENTMASK_PROMOTEDFIELDS) != 0;
+    /* Set the SecurityHeader */
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    if(readerGroup->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
+        nm->securityEnabled = true;
+        nm->securityHeader.networkMessageSigned = true;
+        if(readerGroup->config.securityMode >= UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
+            nm->securityHeader.networkMessageEncrypted = true;
+        nm->securityHeader.securityTokenId = readerGroup->securityTokenId;
+
+        /* Generate the MessageNonce */
+        nm->securityHeader.messageNonce.length = MESSAGE_NONCE_LENGTH;
+        nm->securityHeader.messageNonce.data = MessageNonceGenerated;
+
+        nm->securityHeader.messageNonce.length = 4; /* Generate 4 random bytes */
+        UA_StatusCode rv = readerGroup->config.securityPolicy->symmetricModule.
+            generateNonce(readerGroup->config.securityPolicy->policyContext,
+                          &nm->securityHeader.messageNonce);
+        if(rv != UA_STATUSCODE_GOOD)
+            return rv;
+        nm->securityHeader.messageNonce.length = 8;
+    }
+#endif
     nm->version = 1;
     nm->networkMessageType = UA_NETWORKMESSAGE_DATASET;
 
@@ -1360,6 +1387,26 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
     UA_DataSetReader *dataSetReader = LIST_FIRST(&readerGroup->readers);
     UA_NetworkMessage *nm = dataSetReader->bufferedMessage.nm;
 
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    UA_NetworkMessage currentNetworkMessage;
+    memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
+    UA_StatusCode rv;
+    size_t payLoadPosition = 0;
+    rv = UA_NetworkMessage_decodeHeaders(
+        buffer, &payLoadPosition, &currentNetworkMessage);
+
+    UA_CHECK_STATUS_ERROR(rv, return rv, &server->config.logger, UA_LOGCATEGORY_SERVER,
+                          "PubSub receive. decoding headers failed");
+    rv = verifyAndDecryptNetworkMessage(&server->config.logger,
+                                        buffer,
+                                        &payLoadPosition,
+                                        &currentNetworkMessage,
+                                        readerGroup);
+    UA_CHECK_STATUS_WARN(rv, return rv, &server->config.logger, UA_LOGCATEGORY_SERVER,
+                         "Subscribe failed. verify and decrypt network message failed.");
+    UA_NetworkMessage_clear(&currentNetworkMessage);
+#endif
+
     /* Decode only the necessary offset and update the networkMessage */
     UA_StatusCode res =
         UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage,
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index dffe0ef062d..e82549762e9 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -563,7 +563,7 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
-    res = UA_DataSetReader_generateNetworkMessage(pubSubConnection, dataSetReader, dsm,
+    res = UA_DataSetReader_generateNetworkMessage(pubSubConnection, rg, dataSetReader, dsm,
                                                   dsWriterIds, 1, networkMessage);
     if(res != UA_STATUSCODE_GOOD) {
         UA_free(networkMessage->payload.dataSetPayload.sizes);
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 46878d151e1..cde8709181a 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -27,6 +27,14 @@
 static void
 UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup);
 
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+static UA_StatusCode
+encryptAndSign(UA_WriterGroup *wg, const UA_NetworkMessage *nm,
+               UA_Byte *signStart, UA_Byte *encryptStart,
+               UA_Byte *msgEnd);
+
+#endif
+
 static UA_StatusCode
 generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
                        UA_DataSetMessage *dsm, UA_UInt16 *writerIds, UA_Byte dsmCount,
@@ -286,6 +294,13 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
 
     /* Allocate the buffer. Allocate on the stack if the buffer is small. */
     msgSize = UA_NetworkMessage_calcSizeBinary(&networkMessage, NULL);
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    if(wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
+        UA_PubSubSecurityPolicy *sp = wg->config.securityPolicy;
+        msgSize += sp->symmetricModule.cryptoModule.
+                   signatureAlgorithm.getLocalSignatureSize(sp->policyContext);
+    }
+#endif
     res = UA_ByteString_allocBuffer(&buf, msgSize);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
@@ -294,7 +309,21 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
     /* Encode the NetworkMessage */
     bufEnd = &wg->bufferedMessage.buffer.data[wg->bufferedMessage.buffer.length];
     bufPos = wg->bufferedMessage.buffer.data;
-    UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, NULL);
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    if (wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE){
+        UA_Byte *payloadPosition;
+        UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, &payloadPosition);
+        wg->bufferedMessage.payloadPosition = payloadPosition;
+        wg->bufferedMessage.nm = (UA_NetworkMessage *)UA_malloc(sizeof(networkMessage));
+        wg->bufferedMessage.nm->securityHeader.networkMessageEncrypted = networkMessage.securityHeader.networkMessageEncrypted;
+        wg->bufferedMessage.nm->securityHeader.networkMessageSigned = networkMessage.securityHeader.networkMessageSigned;
+        UA_ByteString_copy(&networkMessage.securityHeader.messageNonce, &wg->bufferedMessage.nm->securityHeader.messageNonce);
+        UA_ByteString_allocBuffer(&wg->bufferedMessage.encryptBuffer, msgSize);
+        UA_ByteString_clear(&networkMessage.securityHeader.messageNonce);
+    }
+#endif
+    if (wg->config.securityMode <= UA_MESSAGESECURITYMODE_NONE)
+        UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, NULL);
 
  cleanup:
     UA_free(networkMessage.payload.dataSetPayload.sizes);
@@ -348,8 +377,18 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
         }
         dataSetWriter->configurationFrozen = UA_FALSE;
     }
-    if(wg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE)
+    if(wg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
         UA_ByteString_clear(&wg->bufferedMessage.buffer);
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+        if (wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
+            if (wg->bufferedMessage.nm != NULL) {
+                UA_ByteString_clear(&wg->bufferedMessage.nm->securityHeader.messageNonce);
+                UA_free(wg->bufferedMessage.nm);
+            }
+            UA_ByteString_clear(&wg->bufferedMessage.encryptBuffer);
+        }
+#endif
+    }
 
     return UA_STATUSCODE_GOOD;
 }
@@ -699,7 +738,7 @@ encryptAndSign(UA_WriterGroup *wg, const UA_NetworkMessage *nm,
                                     signStart};
 
         size_t sigSize = wg->config.securityPolicy->symmetricModule.cryptoModule.
-            signatureAlgorithm.getLocalSignatureSize(channelContext);
+                     signatureAlgorithm.getLocalSignatureSize(channelContext);
         UA_ByteString signature = {sigSize, msgEnd};
 
         rv = wg->config.securityPolicy->symmetricModule.cryptoModule.
@@ -949,19 +988,18 @@ sendNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
 
 static UA_StatusCode
 sendBufferedNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
-                           UA_NetworkMessageOffsetBuffer *buffer,
+                           UA_ByteString *buffer,
                            UA_ExtensionObject *transportSettings) {
-    if(UA_NetworkMessage_updateBufferedMessage(buffer) != UA_STATUSCODE_GOOD)
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub sending. Unknown field type.");
+
     return connection->channel->send(connection->channel,
-                                     transportSettings, &buffer->buffer);
+                                     transportSettings, buffer);
 }
 
 /* This callback triggers the collection and publish of NetworkMessages and the
  * contained DataSetMessages. */
 void
 UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "Publish Callback");
 
     // TODO: review if its okay to force correct value from caller side instead
@@ -997,14 +1035,39 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     }
 
     if(writerGroup->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
-        UA_StatusCode res =
-            sendBufferedNetworkMessage(server, connection, &writerGroup->bufferedMessage,
-                                       &writerGroup->config.transportSettings);
+        if(UA_NetworkMessage_updateBufferedMessage(&writerGroup->bufferedMessage) != UA_STATUSCODE_GOOD)
+            UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                         "PubSub sending. Unknown field type.");
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+        if (writerGroup->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
+            size_t sigSize = writerGroup->config.securityPolicy->symmetricModule.cryptoModule.
+                            signatureAlgorithm.getLocalSignatureSize(writerGroup->securityPolicyContext);
+
+            UA_Byte payloadOffset        = (UA_Byte)(writerGroup->bufferedMessage.payloadPosition - writerGroup->bufferedMessage.buffer.data);
+            memcpy(writerGroup->bufferedMessage.encryptBuffer.data, writerGroup->bufferedMessage.buffer.data, writerGroup->bufferedMessage.buffer.length);
+            res = encryptAndSign(writerGroup, writerGroup->bufferedMessage.nm,
+                                              writerGroup->bufferedMessage.encryptBuffer.data,
+                                              writerGroup->bufferedMessage.encryptBuffer.data + payloadOffset,
+                                              writerGroup->bufferedMessage.encryptBuffer.data + writerGroup->bufferedMessage.encryptBuffer.length - sigSize);
+
+            if(res != UA_STATUSCODE_GOOD)
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "PubSub Encryption failed");
+            /* Send the encrypted buffered network message
+             * if PubSub encryption is enabled */
+            res = sendBufferedNetworkMessage(server, connection, &writerGroup->bufferedMessage.encryptBuffer,
+                                             &writerGroup->config.transportSettings);
+        }
+#endif
+        if (writerGroup->config.securityMode < UA_MESSAGESECURITYMODE_NONE)
+            res = sendBufferedNetworkMessage(server, connection, &writerGroup->bufferedMessage.buffer,
+                                             &writerGroup->config.transportSettings);
+
         if(res == UA_STATUSCODE_GOOD) {
             writerGroup->sequenceNumber++;
         } else {
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Publish failed. RT fixed size. sendBufferedNetworkMessage failed");
+                         "Publish failed. sendBufferedNetworkMessage failed. StatusCode %s", UA_StatusCode_name(res));
             UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writerGroup);
         }
         return;
@@ -1022,7 +1085,6 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
      * But only if they do not contain promoted fields. NM with only DSM are
      * sent out right away. The others are kept in a buffer for "batching". */
     size_t dsmCount = 0;
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_STACKARRAY(UA_UInt16, dsWriterIds, writerGroup->writersCount);
     UA_STACKARRAY(UA_DataSetMessage, dsmStore, writerGroup->writersCount);
     UA_DataSetWriter *dsw;
diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index c4816b97896..29f97148a16 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -15,6 +15,37 @@
 #include "ua_types_encoding_binary.h"
 #include "aa_tree.h"
 
+/*********************/
+/* ReferenceType Set */
+/*********************/
+
+#define UA_REFTYPES_ALL_MASK (~(UA_UInt32)0)
+#define UA_REFTYPES_ALL_MASK2 UA_REFTYPES_ALL_MASK, UA_REFTYPES_ALL_MASK
+#define UA_REFTYPES_ALL_MASK4 UA_REFTYPES_ALL_MASK2, UA_REFTYPES_ALL_MASK2
+#if (UA_REFERENCETYPESET_MAX) / 32 > 8
+# error Adjust macros to support than 256 reference types
+#elif (UA_REFERENCETYPESET_MAX) / 32 == 8
+# define UA_REFTYPES_ALL_ARRAY UA_REFTYPES_ALL_MASK4, UA_REFTYPES_ALL_MASK4
+#elif (UA_REFERENCETYPESET_MAX) / 32 == 7
+# define UA_REFTYPES_ALL_ARRAY                                          \
+    UA_REFTYPES_ALL_MASK4, UA_REFTYPES_ALL_MASK2, UA_REFTYPES_ALL_MASK
+#elif (UA_REFERENCETYPESET_MAX) / 32 == 6
+# define UA_REFTYPES_ALL_ARRAY UA_REFTYPES_ALL_MASK4, UA_REFTYPES_ALL_MASK2
+#elif (UA_REFERENCETYPESET_MAX) / 32 == 5
+# define UA_REFTYPES_ALL_ARRAY UA_REFTYPES_ALL_MASK4, UA_REFTYPES_ALL_MASK
+#elif (UA_REFERENCETYPESET_MAX) / 32 == 4
+# define UA_REFTYPES_ALL_ARRAY UA_REFTYPES_ALL_MASK4
+#elif (UA_REFERENCETYPESET_MAX) / 32 == 3
+# define UA_REFTYPES_ALL_ARRAY UA_REFTYPES_ALL_MASK2, UA_REFTYPES_ALL_MASK
+#elif (UA_REFERENCETYPESET_MAX) / 32 == 2
+# define UA_REFTYPES_ALL_ARRAY UA_REFTYPES_ALL_MASK2
+#else
+# define UA_REFTYPES_ALL_ARRAY UA_REFTYPES_ALL_MASK
+#endif
+
+const UA_ReferenceTypeSet UA_REFERENCETYPESET_NONE = {0};
+const UA_ReferenceTypeSet UA_REFERENCETYPESET_ALL  = {{UA_REFTYPES_ALL_ARRAY}};
+
 /*****************/
 /* Node Pointers */
 /*****************/
@@ -358,14 +389,6 @@ UA_NodeReferenceKind_findTarget(const UA_NodeReferenceKind *rk,
     return NULL;
 }
 
-const UA_Node *
-UA_NODESTORE_GETFROMREF(UA_Server *server, UA_NodePointer target) {
-    if(!UA_NodePointer_isLocal(target))
-        return NULL;
-    UA_NodeId id = UA_NodePointer_toNodeId(target);
-    return UA_NODESTORE_GET(server, &id);
-}
-
 /* General node handling methods. There is no UA_Node_new() method here.
  * Creating nodes is part of the Nodestore layer */
 
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index d68df17700f..7ce8048bbba 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -156,10 +156,6 @@ UA_Server_forEachChildNodeCall(UA_Server *server, UA_NodeId parentNodeId,
 /* Server Lifecycle */
 /********************/
 
-static void
-serverExecuteRepeatedCallback(UA_Server *server, UA_ApplicationCallback cb,
-                              void *callbackApplication, void *data);
-
 /* The server needs to be stopped before it can be deleted */
 void UA_Server_delete(UA_Server *server) {
     UA_LOCK(&server->serviceMutex);
@@ -204,16 +200,20 @@ void UA_Server_delete(UA_Server *server) {
     UA_AsyncManager_clear(&server->asyncManager, server);
 #endif
 
+    /* Stop the EventLoop and iterate until stopped or an error occurs */
+    UA_EventLoop_stop(server->config.eventLoop);
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    UA_EventLoopState state = UA_EventLoop_getState(server->config.eventLoop);
+    while(res == UA_STATUSCODE_GOOD && state != UA_EVENTLOOPSTATE_STOPPED) {
+        res = UA_EventLoop_run(server->config.eventLoop, 100);
+        state = UA_EventLoop_getState(server->config.eventLoop);
+    }
+
     /* Clean up the Admin Session */
     UA_Session_clear(&server->adminSession, server);
 
     UA_UNLOCK(&server->serviceMutex); /* The timer has its own mutex */
 
-    /* Execute all remaining delayed events and clean up the timer */
-    UA_Timer_process(&server->timer, UA_DateTime_nowMonotonic() + 1,
-             (UA_TimerExecutionCallback)serverExecuteRepeatedCallback, server);
-    UA_Timer_clear(&server->timer);
-
     /* Clean up the config */
     UA_ServerConfig_clean(&server->config);
 
@@ -272,9 +272,6 @@ UA_Server_init(UA_Server *server) {
     UA_LOCK_INIT(&server->serviceMutex);
 #endif
 
-    /* Initialize the handling of repeated callbacks */
-    UA_Timer_init(&server->timer);
-
     /* Initialize the adminSession */
     UA_Session_init(&server->adminSession);
     server->adminSession.sessionId.identifierType = UA_NODEIDTYPE_GUID;
@@ -335,15 +332,21 @@ UA_Server *
 UA_Server_newWithConfig(UA_ServerConfig *config) {
     UA_CHECK_MEM(config, return NULL);
 
+    UA_CHECK_LOG(config->eventLoop != NULL, return NULL, ERROR,
+                 &config->logger, UA_LOGCATEGORY_SERVER, "No EventLoop configured");
+
     UA_Server *server = (UA_Server *)UA_calloc(1, sizeof(UA_Server));
     UA_CHECK_MEM(server, UA_ServerConfig_clean(config); return NULL);
 
     server->config = *config;
+
     /* The config might have been "moved" into the server struct. Ensure that
      * the logger pointer is correct. */
     for(size_t i = 0; i < server->config.securityPoliciesSize; i++)
         server->config.securityPolicies[i].logger = &server->config.logger;
 
+    UA_EventLoop_setLogger(server->config.eventLoop, &server->config.logger);
+
     /* Reset the old config */
     memset(config, 0, sizeof(UA_ServerConfig));
     return UA_Server_init(server);
@@ -371,9 +374,9 @@ UA_Server_addTimedCallback(UA_Server *server, UA_ServerCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode retval =
-        UA_Timer_addTimedCallback(&server->timer,
-                                  (UA_ApplicationCallback)callback,
-                                  server, data, date, callbackId);
+        UA_EventLoop_addTimedCallback(server->config.eventLoop,
+                                      (UA_Callback)callback,
+                                      server, data, date, callbackId);
     UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
@@ -382,10 +385,10 @@ UA_StatusCode
 addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
                               void *data, UA_Double interval_ms,
                               UA_UInt64 *callbackId) {
-    return UA_Timer_addRepeatedCallback(&server->timer,
-                                        (UA_ApplicationCallback)callback,
-                                         server, data, interval_ms, NULL,
-                                         UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, callbackId);
+    return UA_EventLoop_addCyclicCallback(server->config.eventLoop, (UA_Callback) callback,
+                                          server, data, interval_ms, NULL,
+                                          UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                          callbackId);
 }
 
 UA_StatusCode
@@ -402,8 +405,9 @@ UA_Server_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
 UA_StatusCode
 changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId,
                                UA_Double interval_ms) {
-    return UA_Timer_changeRepeatedCallback(&server->timer, callbackId,
-                                           interval_ms, NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
+    return UA_EventLoop_modifyCyclicCallback(server->config.eventLoop, callbackId,
+                                             interval_ms, NULL,
+                                             UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
 }
 
 UA_StatusCode
@@ -418,7 +422,7 @@ UA_Server_changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId
 
 void
 removeCallback(UA_Server *server, UA_UInt64 callbackId) {
-    UA_Timer_removeCallback(&server->timer, callbackId);
+    UA_EventLoop_removeCyclicCallback(server->config.eventLoop, callbackId);
 }
 
 void
@@ -549,14 +553,16 @@ UA_Server_run_startup(UA_Server *server) {
                  "This should only be used for specific fuzzing builds.");
 #endif
 
+    UA_StatusCode retVal = UA_EventLoop_start(server->config.eventLoop);
+    UA_CHECK_STATUS(retVal, return retVal);
+
     /* ensure that the uri for ns1 is set up from the app description */
     setupNs1Uri(server);
 
     /* write ServerArray with same ApplicationURI value as NamespaceArray */
-    UA_StatusCode retVal =
-        writeNs0VariableArray(server, UA_NS0ID_SERVER_SERVERARRAY,
-                              &server->config.applicationDescription.applicationUri,
-                              1, &UA_TYPES[UA_TYPES_STRING]);
+    retVal = writeNs0VariableArray(server, UA_NS0ID_SERVER_SERVERARRAY,
+                                   &server->config.applicationDescription.applicationUri,
+                                   1, &UA_TYPES[UA_TYPES_STRING]);
     UA_CHECK_STATUS(retVal, return retVal);
 
     if(server->state > UA_SERVERLIFECYCLE_FRESH)
@@ -630,22 +636,12 @@ UA_Server_run_startup(UA_Server *server) {
     return result;
 }
 
-static void
-serverExecuteRepeatedCallback(UA_Server *server, UA_ApplicationCallback cb,
-                              void *callbackApplication, void *data) {
-    /* Service mutex is not set inside the timer that triggers the callback */
-    /* The following check cannot be used since another thread can take the
-     * serviceMutex during a server_iterate_call. */
-    //UA_LOCK_ASSERT(&server->serviceMutex, 0);
-    cb(callbackApplication, data);
-}
-
 UA_UInt16
 UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
     /* Process repeated work */
     UA_DateTime now = UA_DateTime_nowMonotonic();
-    UA_DateTime nextRepeated = UA_Timer_process(&server->timer, now,
-                     (UA_TimerExecutionCallback)serverExecuteRepeatedCallback, server);
+    UA_EventLoop_run(server->config.eventLoop, 0);
+    UA_DateTime nextRepeated = UA_EventLoop_nextCyclicTime(server->config.eventLoop);
     UA_DateTime latest = now + (UA_MAXTIMEOUT * UA_DATETIME_MSEC);
     if(nextRepeated > latest)
         nextRepeated = latest;
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 692465d70d1..950099ee09c 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -29,6 +29,19 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
     /* Custom DataTypes */
     /* nothing to do */
 
+    /* Stop and delete the EventLoop */
+    if(config->eventLoop && !config->externalEventLoop) {
+        if(UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_FRESH &&
+           UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_STOPPED) {
+            UA_EventLoop_stop(config->eventLoop);
+            while(UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_STOPPED) {
+                UA_EventLoop_run(config->eventLoop, 100);
+            }
+        }
+        UA_EventLoop_delete(config->eventLoop);
+        config->eventLoop = NULL;
+    }
+
     /* Networking */
     for(size_t i = 0; i < config->networkLayersSize; ++i)
         config->networkLayers[i].clear(&config->networkLayers[i]);
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 7f1ec4908d1..9f5c087c471 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -23,7 +23,7 @@
 #include "ua_connection_internal.h"
 #include "ua_session.h"
 #include "ua_server_async.h"
-#include "ua_timer.h"
+#include "common/ua_timer.h" /* arch-folder, TODO: Remove after the EventLoop is integrated */
 #include "ua_util_internal.h"
 #include "ziptree.h"
 
@@ -66,13 +66,13 @@ typedef enum {
 } UA_DiagnosticEvent;
 
 typedef struct channel_entry {
-    UA_TimerEntry cleanupCallback;
+    UA_DelayedCallback cleanupCallback;
     TAILQ_ENTRY(channel_entry) pointers;
     UA_SecureChannel channel;
 } channel_entry;
 
 typedef struct session_list_entry {
-    UA_TimerEntry cleanupCallback;
+    UA_DelayedCallback cleanupCallback;
     LIST_ENTRY(session_list_entry) pointers;
     UA_Session session;
 } session_list_entry;
@@ -111,9 +111,6 @@ struct UA_Server {
     size_t namespacesSize;
     UA_String *namespaces;
 
-    /* Callbacks with a repetition interval */
-    UA_Timer timer;
-
     /* For bootstrapping, omit some consistency checks, creating a reference to
      * the parent and member instantiation */
     UA_Boolean bootstrapNS0;
@@ -588,12 +585,29 @@ UA_StatusCode writeNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
 #define UA_NODESTORE_DELETE(server, node)                               \
     server->config.nodestore.deleteNode(server->config.nodestore.context, node)
 
-#define UA_NODESTORE_GET(server, nodeid)                                \
-    server->config.nodestore.getNode(server->config.nodestore.context, nodeid)
+/* Get the node with all attributes and references */
+static UA_INLINE const UA_Node *
+UA_NODESTORE_GET(UA_Server *server, const UA_NodeId *nodeId) {
+    return server->config.nodestore.
+        getNode(server->config.nodestore.context, nodeId, UA_NODEATTRIBUTESMASK_ALL,
+                UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
+}
 
-/* Returns NULL if the target is an external Reference (per the ExpandedNodeId) */
-const UA_Node *
-UA_NODESTORE_GETFROMREF(UA_Server *server, UA_NodePointer target);
+/* Get the node with all attributes and references */
+static UA_INLINE const UA_Node *
+UA_NODESTORE_GETFROMREF(UA_Server *server, UA_NodePointer target) {
+    return server->config.nodestore.
+        getNodeFromPtr(server->config.nodestore.context, target, UA_NODEATTRIBUTESMASK_ALL,
+                       UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
+}
+
+#define UA_NODESTORE_GET_SELECTIVE(server, nodeid, attrMask, refs, refDirs) \
+    server->config.nodestore.getNode(server->config.nodestore.context,      \
+                                     nodeid, attrMask, refs, refDirs)
+
+#define UA_NODESTORE_GETFROMREF_SELECTIVE(server, target, attrMask, refs, refDirs) \
+    server->config.nodestore.getNodeFromPtr(server->config.nodestore.context,      \
+                                            target, attrMask, refs, refDirs)
 
 #define UA_NODESTORE_RELEASE(server, node)                              \
     server->config.nodestore.releaseNode(server->config.nodestore.context, node)
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 8e892ddcfa3..697f68753f2 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -27,6 +27,40 @@
 #include <open62541/plugin/historydatabase.h>
 #endif
 
+static UA_UInt32
+attributeId2AttributeMask(UA_AttributeId id) {
+    switch(id) {
+    case UA_ATTRIBUTEID_NODEID: return UA_NODEATTRIBUTESMASK_NODEID;
+    case UA_ATTRIBUTEID_NODECLASS: return UA_NODEATTRIBUTESMASK_NODECLASS;
+    case UA_ATTRIBUTEID_BROWSENAME: return UA_NODEATTRIBUTESMASK_BROWSENAME;
+    case UA_ATTRIBUTEID_DISPLAYNAME: return UA_NODEATTRIBUTESMASK_DISPLAYNAME;
+    case UA_ATTRIBUTEID_DESCRIPTION: return UA_NODEATTRIBUTESMASK_DESCRIPTION;
+    case UA_ATTRIBUTEID_WRITEMASK: return UA_NODEATTRIBUTESMASK_WRITEMASK;
+    case UA_ATTRIBUTEID_USERWRITEMASK: return UA_NODEATTRIBUTESMASK_USERWRITEMASK;
+    case UA_ATTRIBUTEID_ISABSTRACT: return UA_NODEATTRIBUTESMASK_ISABSTRACT;
+    case UA_ATTRIBUTEID_SYMMETRIC: return UA_NODEATTRIBUTESMASK_SYMMETRIC;
+    case UA_ATTRIBUTEID_INVERSENAME: return UA_NODEATTRIBUTESMASK_INVERSENAME;
+    case UA_ATTRIBUTEID_CONTAINSNOLOOPS: return UA_NODEATTRIBUTESMASK_CONTAINSNOLOOPS;
+    case UA_ATTRIBUTEID_EVENTNOTIFIER: return UA_NODEATTRIBUTESMASK_EVENTNOTIFIER;
+    case UA_ATTRIBUTEID_VALUE: return UA_NODEATTRIBUTESMASK_VALUE;
+    case UA_ATTRIBUTEID_DATATYPE: return UA_NODEATTRIBUTESMASK_DATATYPE;
+    case UA_ATTRIBUTEID_VALUERANK: return UA_NODEATTRIBUTESMASK_VALUERANK;
+    case UA_ATTRIBUTEID_ARRAYDIMENSIONS: return UA_NODEATTRIBUTESMASK_ARRAYDIMENSIONS;
+    case UA_ATTRIBUTEID_ACCESSLEVEL: return UA_NODEATTRIBUTESMASK_ACCESSLEVEL;
+    case UA_ATTRIBUTEID_USERACCESSLEVEL: return UA_NODEATTRIBUTESMASK_USERACCESSLEVEL;
+    case UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL: return UA_NODEATTRIBUTESMASK_MINIMUMSAMPLINGINTERVAL;
+    case UA_ATTRIBUTEID_HISTORIZING: return UA_NODEATTRIBUTESMASK_HISTORIZING;
+    case UA_ATTRIBUTEID_EXECUTABLE: return UA_NODEATTRIBUTESMASK_EXECUTABLE;
+    case UA_ATTRIBUTEID_USEREXECUTABLE: return UA_NODEATTRIBUTESMASK_USEREXECUTABLE;
+    case UA_ATTRIBUTEID_DATATYPEDEFINITION: return UA_NODEATTRIBUTESMASK_DATATYPEDEFINITION;
+    case UA_ATTRIBUTEID_ROLEPERMISSIONS: return UA_NODEATTRIBUTESMASK_ROLEPERMISSIONS;
+    case UA_ATTRIBUTEID_USERROLEPERMISSIONS: return UA_NODEATTRIBUTESMASK_ROLEPERMISSIONS;
+    case UA_ATTRIBUTEID_ACCESSRESTRICTIONS: return UA_NODEATTRIBUTESMASK_ACCESSRESTRICTIONS;
+    case UA_ATTRIBUTEID_ACCESSLEVELEX: return UA_NODEATTRIBUTESMASK_ACCESSLEVEL;
+    default: return UA_NODEATTRIBUTESMASK_NONE;
+    }
+}
+
 /******************/
 /* Access Control */
 /******************/
@@ -131,7 +165,11 @@ readValueAttributeFromNode(UA_Server *server, UA_Session *session,
                                        &vn->head.nodeId, vn->head.context, rangeptr,
                                        &vn->value.data.value);
         UA_LOCK(&server->serviceMutex);
-        vn = (const UA_VariableNode*)UA_NODESTORE_GET(server, &vn->head.nodeId);
+        vn = (const UA_VariableNode*)
+            UA_NODESTORE_GET_SELECTIVE(server, &vn->head.nodeId,
+                                       UA_NODEATTRIBUTESMASK_VALUE,
+                                       UA_REFERENCETYPESET_NONE,
+                                       UA_BROWSEDIRECTION_INVALID);
         if(!vn)
             return UA_STATUSCODE_BADNODEIDUNKNOWN;
     }
@@ -562,8 +600,12 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
 static void
 Operation_Read(UA_Server *server, UA_Session *session, UA_ReadRequest *request,
                UA_ReadValueId *rvi, UA_DataValue *result) {
-    /* Get the node */
-    const UA_Node *node = UA_NODESTORE_GET(server, &rvi->nodeId);
+    /* Get the node (with only the selected attribute if the NodeStore supports that) */
+    const UA_Node *node =
+        UA_NODESTORE_GET_SELECTIVE(server, &rvi->nodeId,
+                                   attributeId2AttributeMask((UA_AttributeId)rvi->attributeId),
+                                   UA_REFERENCETYPESET_NONE,
+                                   UA_BROWSEDIRECTION_INVALID);
 
     /* Perform the read operation */
     if(node) {
@@ -620,8 +662,12 @@ UA_Server_readWithSession(UA_Server *server, UA_Session *session,
     UA_DataValue dv;
     UA_DataValue_init(&dv);
 
-    /* Get the node */
-    const UA_Node *node = UA_NODESTORE_GET(server, &item->nodeId);
+    /* Get the node (with only the selected attribute if the NodeStore supports it) */
+    const UA_Node *node =
+        UA_NODESTORE_GET_SELECTIVE(server, &item->nodeId,
+                                   attributeId2AttributeMask((UA_AttributeId)item->attributeId),
+                                   UA_REFERENCETYPESET_NONE,
+                                   UA_BROWSEDIRECTION_INVALID);
     if(!node) {
         dv.hasStatus = true;
         dv.status = UA_STATUSCODE_BADNODEIDUNKNOWN;
diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 83e506cf9d8..25f876f7733 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -23,14 +23,19 @@ getArgumentsVariableNode(UA_Server *server, const UA_NodeHead *head,
                          UA_String withBrowseName) {
     for(size_t i = 0; i < head->referencesSize; ++i) {
         const UA_NodeReferenceKind *rk = &head->references[i];
-        if(rk->isInverse != false)
+        if(rk->isInverse)
             continue;
         if(rk->referenceTypeIndex != UA_REFERENCETYPEINDEX_HASPROPERTY)
             continue;
         const UA_ReferenceTarget *t = NULL;
         while((t = UA_NodeReferenceKind_iterate(rk, t))) {
+            /* Get only the NodeClass and Value attributes, no references */
             const UA_Node *refTarget =
-                UA_NODESTORE_GETFROMREF(server, t->targetId);
+                UA_NODESTORE_GETFROMREF_SELECTIVE(server, t->targetId,
+                                                  UA_NODEATTRIBUTESMASK_NODECLASS |
+                                                  UA_NODEATTRIBUTESMASK_VALUE,
+                                                  UA_REFERENCETYPESET_NONE,
+                                                  UA_BROWSEDIRECTION_INVALID);
             if(!refTarget)
                 continue;
             if(refTarget->head.nodeClass == UA_NODECLASS_VARIABLE &&
@@ -327,15 +332,29 @@ Operation_CallMethodAsync(UA_Server *server, UA_Session *session, UA_UInt32 requ
                           UA_UInt32 requestHandle, size_t opIndex,
                           UA_CallMethodRequest *opRequest, UA_CallMethodResult *opResult,
                           UA_AsyncResponse **ar) {
-    /* Get the method node */
-    const UA_Node *method = UA_NODESTORE_GET(server, &opRequest->methodId);
+    /* Get the method node. We only need the nodeClass and executable attribute.
+     * Take all forward hasProperty references to get the input/output argument
+     * definition variables. */
+    const UA_Node *method =
+        UA_NODESTORE_GET_SELECTIVE(server, &opRequest->methodId,
+                                   UA_NODEATTRIBUTESMASK_NODECLASS |
+                                   UA_NODEATTRIBUTESMASK_EXECUTABLE,
+                                   UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASPROPERTY),
+                                   UA_BROWSEDIRECTION_FORWARD);
     if(!method) {
         opResult->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
         return;
     }
 
-    /* Get the object node */
-    const UA_Node *object = UA_NODESTORE_GET(server, &opRequest->objectId);
+    /* Get the object node. We only need the NodeClass attribute. But take all
+     * references for now.
+     *
+     * TODO: Which references do we need actually? */
+    const UA_Node *object =
+        UA_NODESTORE_GET_SELECTIVE(server, &opRequest->objectId,
+                                   UA_NODEATTRIBUTESMASK_NODECLASS,
+                                   UA_REFERENCETYPESET_ALL,
+                                   UA_BROWSEDIRECTION_BOTH);
     if(!object) {
         opResult->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
         UA_NODESTORE_RELEASE(server, method);
@@ -410,15 +429,29 @@ Service_CallAsync(UA_Server *server, UA_Session *session, UA_UInt32 requestId,
 static void
 Operation_CallMethod(UA_Server *server, UA_Session *session, void *context,
                      const UA_CallMethodRequest *request, UA_CallMethodResult *result) {
-    /* Get the method node */
-    const UA_Node *method = UA_NODESTORE_GET(server, &request->methodId);
+    /* Get the method node. We only need the nodeClass and executable attribute.
+     * Take all forward hasProperty references to get the input/output argument
+     * definition variables. */
+    const UA_Node *method =
+        UA_NODESTORE_GET_SELECTIVE(server, &request->methodId,
+                                   UA_NODEATTRIBUTESMASK_NODECLASS |
+                                   UA_NODEATTRIBUTESMASK_EXECUTABLE,
+                                   UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASPROPERTY),
+                                   UA_BROWSEDIRECTION_FORWARD);
     if(!method) {
         result->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
         return;
     }
 
-    /* Get the object node */
-    const UA_Node *object = UA_NODESTORE_GET(server, &request->objectId);
+    /* Get the object node. We only need the NodeClass attribute. But take all
+     * references for now.
+     *
+     * TODO: Which references do we need actually? */
+    const UA_Node *object =
+        UA_NODESTORE_GET_SELECTIVE(server, &request->objectId,
+                                   UA_NODEATTRIBUTESMASK_NODECLASS,
+                                   UA_REFERENCETYPESET_ALL,
+                                   UA_BROWSEDIRECTION_BOTH);
     if(!object) {
         result->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
         UA_NODESTORE_RELEASE(server, method);
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index a4a4890ab98..e20cd137c64 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -68,12 +68,10 @@ removeSecureChannel(UA_Server *server, channel_entry *entry,
 
     /* Add a delayed callback to remove the channel when the currently
      * scheduled jobs have completed */
-    entry->cleanupCallback.callback = (UA_ApplicationCallback)removeSecureChannelCallback;
+    entry->cleanupCallback.callback = (UA_Callback)removeSecureChannelCallback;
     entry->cleanupCallback.application = NULL;
     entry->cleanupCallback.data = entry;
-    entry->cleanupCallback.nextTime = UA_DateTime_nowMonotonic() + 1;
-    entry->cleanupCallback.interval = 0; /* Remove the structure */
-    UA_Timer_addTimerEntry(&server->timer, &entry->cleanupCallback, NULL);
+    UA_EventLoop_addDelayedCallback(server->config.eventLoop, &entry->cleanupCallback);
 }
 
 void
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index c7042296421..687de97779e 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -88,12 +88,10 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
 
     /* Add a delayed callback to remove the session when the currently
      * scheduled jobs have completed */
-    sentry->cleanupCallback.callback = (UA_ApplicationCallback)removeSessionCallback;
+    sentry->cleanupCallback.callback = (UA_Callback)removeSessionCallback;
     sentry->cleanupCallback.application = server;
     sentry->cleanupCallback.data = sentry;
-    sentry->cleanupCallback.nextTime = UA_DateTime_nowMonotonic() + 1;
-    sentry->cleanupCallback.interval = 0; /* Remove the structure */
-    UA_Timer_addTimerEntry(&server->timer, &sentry->cleanupCallback, NULL);
+    UA_EventLoop_addDelayedCallback(server->config.eventLoop, &sentry->cleanupCallback);
 }
 
 UA_StatusCode
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 9947ab91718..7233b401ac7 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -22,16 +22,37 @@
 
 #define UA_MAX_TREE_RECURSE 50 /* How deep up/down the tree do we recurse at most? */
 
+static UA_UInt32
+resultMask2AttributesMask(UA_UInt32 resultMask) {
+    UA_UInt32 result = 0;
+    if(resultMask & UA_BROWSERESULTMASK_NODECLASS)
+        result |= UA_NODEATTRIBUTESMASK_NODECLASS;
+    if(resultMask & UA_BROWSERESULTMASK_BROWSENAME)
+        result |= UA_NODEATTRIBUTESMASK_BROWSENAME;
+    if(resultMask & UA_BROWSERESULTMASK_DISPLAYNAME)
+        result |= UA_NODEATTRIBUTESMASK_DISPLAYNAME;
+    return result;
+}
+
 UA_StatusCode
 referenceTypeIndices(UA_Server *server, const UA_NodeId *refType,
                      UA_ReferenceTypeSet *indices, UA_Boolean includeSubtypes) {
     if(UA_NodeId_isNull(refType)) {
-        UA_ReferenceTypeSet_any(indices);
+        *indices = UA_REFERENCETYPESET_ALL;
         return UA_STATUSCODE_GOOD;
     }
 
     UA_ReferenceTypeSet_init(indices);
-    const UA_Node *refNode = UA_NODESTORE_GET(server, refType);
+
+    /* Get the node with only the NodeClass attribute. If it is a
+     * ReferenceTypeNode, then the indices are always included, as this is an
+     * open62541 specific field (not selectable via the attribute id). */
+    const UA_Node *refNode =
+        UA_NODESTORE_GET_SELECTIVE(server, refType,
+                                   UA_NODEATTRIBUTESMASK_NODECLASS,
+                                   UA_REFERENCETYPESET_NONE,
+                                   UA_BROWSEDIRECTION_INVALID);
+
     if(!refNode)
         return UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
 
@@ -82,7 +103,13 @@ isNodeInTreeNoCircular(UA_Server *server,
     if(visitedRefs->depth >= UA_MAX_TREE_RECURSE)
         return false;
 
-    const UA_Node *node = UA_NODESTORE_GETFROMREF(server, leafNode);
+    /* Get the node without attributes (if the NodeStore supports it) and only
+     * the relevant references in inverse direction */
+    const UA_Node *node =
+        UA_NODESTORE_GETFROMREF_SELECTIVE(server, leafNode,
+                                          UA_NODEATTRIBUTESMASK_NONE,
+                                          *relevantRefs,
+                                          UA_BROWSEDIRECTION_INVERSE);
     if(!node)
         return false;
 
@@ -299,7 +326,12 @@ browseRecursiveInner(UA_Server *server, RefTree *rt, UA_UInt16 depth, UA_Boolean
     if(depth >= UA_MAX_TREE_RECURSE)
         return UA_STATUSCODE_GOOD;
 
-    const UA_Node *node = UA_NODESTORE_GETFROMREF(server, nodeP);
+    /* We only look at the NodeClass attribute and a subset of the references.
+     * Get a node with only these elements if the NodeStore supports that. */
+    const UA_Node *node =
+        UA_NODESTORE_GETFROMREF_SELECTIVE(server, nodeP,
+                                          UA_NODEATTRIBUTESMASK_NODECLASS,
+                                          *refTypes, browseDirection);
     if(!node)
         return UA_STATUSCODE_BADNODEIDUNKNOWN;
 
@@ -572,8 +604,19 @@ browseReferences(UA_Server *server, const UA_NodeHead *head,
             return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Get the node with additional reference types if we need to lookup the
+     * TypeDefinition */
+    UA_ReferenceTypeSet resultRefs = cp->relevantReferences;
+    if(bd->resultMask & UA_BROWSERESULTMASK_TYPEDEFINITION) {
+        resultRefs = UA_ReferenceTypeSet_union(resultRefs,
+                                               UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASTYPEDEFINITION));
+        resultRefs = UA_ReferenceTypeSet_union(resultRefs,
+                                               UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASSUBTYPE));
+    }
+
     /* Loop over the ReferenceTypes */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
     for(; i < head->referencesSize; ++i) {
         UA_NodeReferenceKind *rk = &head->references[i];
 
@@ -595,9 +638,13 @@ browseReferences(UA_Server *server, const UA_NodeHead *head,
         if(!ref)
             ref = UA_NodeReferenceKind_iterate(rk, ref);
         for(;ref; ref = UA_NodeReferenceKind_iterate(rk, ref)) {
-            /* Get the node if it is not a remote reference */
+            /* Get the node (NULL if is a remote reference). Include only the
+             * ReferenceTypes we are interested in, including those for figuring
+             * out the TypeDefinition (if that was requested). */
             const UA_Node *target =
-                UA_NODESTORE_GETFROMREF(server, ref->targetId);
+                UA_NODESTORE_GETFROMREF_SELECTIVE(server, ref->targetId,
+                                                  resultMask2AttributesMask(bd->resultMask),
+                                                  resultRefs, bd->browseDirection);
 
             /* Test if the node class matches */
             if(target && !matchClassMask(target, bd->nodeClassMask)) {
@@ -653,7 +700,11 @@ browseWithContinuation(UA_Server *server, UA_Session *session,
 
     /* Is the reference type valid? */
     if(!UA_NodeId_isNull(&descr->referenceTypeId)) {
-        const UA_Node *reftype = UA_NODESTORE_GET(server, &descr->referenceTypeId);
+        const UA_Node *reftype =
+            UA_NODESTORE_GET_SELECTIVE(server, &descr->referenceTypeId,
+                                       UA_NODEATTRIBUTESMASK_NODECLASS,
+                                       UA_REFERENCETYPESET_NONE,
+                                       UA_BROWSEDIRECTION_INVALID);
         if(!reftype) {
             result->statusCode = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
             return true;
@@ -668,7 +719,11 @@ browseWithContinuation(UA_Server *server, UA_Session *session,
         }
     }
 
-    const UA_Node *node = UA_NODESTORE_GET(server, &descr->nodeId);
+    /* Get node with only the selected references and attributes */
+    const UA_Node *node =
+        UA_NODESTORE_GET_SELECTIVE(server, &descr->nodeId,
+                                   resultMask2AttributesMask(descr->resultMask),
+                                   cp->relevantReferences, descr->browseDirection);
     if(!node) {
         result->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
         return true;
@@ -990,8 +1045,16 @@ walkBrowsePathElement(UA_Server *server, UA_Session *session,
             continue;
         }
 
-        /* Local Node. Add to the tree of results at the next depth. */
-        const UA_Node *node = UA_NODESTORE_GET(server, &current->targets[i].nodeId);
+        /* Local Node. Add to the tree of results at the next depth. Get only
+         * the NodeClass + BrowseName attribute and the selected ReferenceTypes
+         * if the nodestore supports that. */
+        const UA_Node *node =
+            UA_NODESTORE_GET_SELECTIVE(server, &current->targets[i].nodeId,
+                                       UA_NODEATTRIBUTESMASK_NODECLASS |
+                                       UA_NODEATTRIBUTESMASK_BROWSENAME,
+                                       refTypes,
+                                       elem->isInverse ? UA_BROWSEDIRECTION_INVERSE :
+                                                         UA_BROWSEDIRECTION_FORWARD);
         if(!node)
             continue;
 
@@ -1076,7 +1139,11 @@ Operation_TranslateBrowsePathToNodeIds(UA_Server *server, UA_Session *session,
     }
 
     /* Check if the starting node exists */
-    const UA_Node *startingNode = UA_NODESTORE_GET(server, &path->startingNode);
+    const UA_Node *startingNode =
+        UA_NODESTORE_GET_SELECTIVE(server, &path->startingNode,
+                                   UA_NODEATTRIBUTESMASK_NONE,
+                                   UA_REFERENCETYPESET_NONE,
+                                   UA_BROWSEDIRECTION_INVALID);
     if(!startingNode) {
         result->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
         return;
@@ -1141,8 +1208,13 @@ Operation_TranslateBrowsePathToNodeIds(UA_Server *server, UA_Session *session,
     result->targets = tmpResults;
 
     for(size_t k = 0; k < next->size; k++) {
-        /* Check the BrowseName. It has been filtered only via its hash so far. */
-        const UA_Node *node = UA_NODESTORE_GET(server, &next->targets[k].nodeId);
+        /* Check the BrowseName. It has been filtered only via its hash so far.
+         * Get only the BrowseName attribute if the nodestore supports that. */
+        const UA_Node *node =
+            UA_NODESTORE_GET_SELECTIVE(server, &next->targets[k].nodeId,
+                                       UA_NODEATTRIBUTESMASK_BROWSENAME,
+                                       UA_REFERENCETYPESET_NONE,
+                                       UA_BROWSEDIRECTION_INVALID);
         if(!node)
             continue;
         UA_Boolean match = UA_QualifiedName_equal(browseNameFilter, &node->head.browseName);
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index cee06721ffd..2e11ada49ac 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -8,6 +8,7 @@
  */
 
 #include "ua_session.h"
+#include "open62541/types.h"
 #include "ua_server_internal.h"
 #ifdef UA_ENABLE_SUBSCRIPTIONS
 #include "ua_subscription.h"
@@ -224,30 +225,31 @@ UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId) {
 
 UA_StatusCode
 UA_Server_setSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                              const char *name, const UA_Variant *parameter) {
+                              const UA_QualifiedName key, const UA_Variant *value) {
     UA_LOCK(&server->serviceMutex);
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
     UA_StatusCode res = UA_STATUSCODE_BADSESSIONIDINVALID;
     if(session)
         res = UA_KeyValueMap_set(&session->params, &session->paramsSize,
-                                 name, parameter);
+                                 key, value);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
 
 void
 UA_Server_deleteSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                                 const char *name) {
+                                 const UA_QualifiedName key) {
     UA_LOCK(&server->serviceMutex);
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
     if(session)
-        UA_KeyValueMap_delete(&session->params, &session->paramsSize, name);
+        UA_KeyValueMap_delete(&session->params, &session->paramsSize, key);
     UA_UNLOCK(&server->serviceMutex);
 }
 
 UA_StatusCode
 UA_Server_getSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                              const char *name, UA_Variant *outParameter) {
+                              const UA_QualifiedName key,
+                              UA_Variant *outParameter) {
     UA_LOCK(&server->serviceMutex);
     if(!outParameter) {
         UA_UNLOCK(&server->serviceMutex);
@@ -261,7 +263,7 @@ UA_Server_getSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
     }
 
     const UA_Variant *param =
-        UA_KeyValueMap_get(session->params, session->paramsSize, name);
+        UA_KeyValueMap_get(session->params, session->paramsSize, key);
     if(!param) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
@@ -273,9 +275,10 @@ UA_Server_getSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
 }
 
 UA_StatusCode
-UA_Server_getSessionScalarParameter(UA_Server *server, const UA_NodeId *sessionId,
-                                    const char *name, const UA_DataType *type,
-                                    UA_Variant *outParameter) {
+UA_Server_getSessionParameter_scalar(UA_Server *server, const UA_NodeId *sessionId,
+                                     const UA_QualifiedName key,
+                                     const UA_DataType *type,
+                                     void *outParameter) {
     UA_LOCK(&server->serviceMutex);
     if(!outParameter) {
         UA_UNLOCK(&server->serviceMutex);
@@ -289,41 +292,13 @@ UA_Server_getSessionScalarParameter(UA_Server *server, const UA_NodeId *sessionI
     }
 
     const UA_Variant *param =
-        UA_KeyValueMap_get(session->params, session->paramsSize, name);
+        UA_KeyValueMap_get(session->params, session->paramsSize, key);
     if(!param || !UA_Variant_hasScalarType(param, type)) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
-    UA_StatusCode res = UA_Variant_copy(param, outParameter);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-UA_StatusCode
-UA_Server_getSessionArrayParameter(UA_Server *server, const UA_NodeId *sessionId,
-                                   const char *name, const UA_DataType *type,
-                                   UA_Variant *outParameter) {
-    UA_LOCK(&server->serviceMutex);
-    if(!outParameter) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
-    if(!session) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADSESSIONIDINVALID;
-    }
-
-    const UA_Variant *param =
-        UA_KeyValueMap_get(session->params, session->paramsSize, name);
-    if(!param || !UA_Variant_hasArrayType(param, type)) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADNOTFOUND;
-    }
-
-    UA_StatusCode res = UA_Variant_copy(param, outParameter);
+    UA_StatusCode res = UA_copy(param->data, outParameter, type);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 8e72dc84f05..1cddf691bed 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -89,9 +89,7 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     sub->delayedFreePointers.callback = NULL;
     sub->delayedFreePointers.application = server;
     sub->delayedFreePointers.data = NULL;
-    sub->delayedFreePointers.nextTime = UA_DateTime_nowMonotonic() + 1;
-    sub->delayedFreePointers.interval = 0; /* Remove the structure */
-    UA_Timer_addTimerEntry(&server->timer, &sub->delayedFreePointers, NULL);
+    UA_EventLoop_addDelayedCallback(server->config.eventLoop, &sub->delayedFreePointers);
 }
 
 UA_MonitoredItem *
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index ddc0b23c647..07387cf50ab 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -12,6 +12,7 @@
  *    Copyright 2019 (c) HMS Industrial Networks AB (Author: Jonas Green)
  *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
  */
 
 #ifndef UA_SUBSCRIPTION_H_
@@ -22,7 +23,7 @@
 #include <open62541/plugin/nodestore.h>
 
 #include "ua_session.h"
-#include "ua_timer.h"
+#include "common/ua_timer.h"
 #include "ua_util_internal.h"
 
 _UA_BEGIN_DECLS
@@ -101,7 +102,7 @@ typedef TAILQ_HEAD(NotificationMessageQueue, UA_NotificationMessageEntry)
 /*****************/
 
 struct UA_MonitoredItem {
-    UA_TimerEntry delayedFreePointers;
+    UA_DelayedCallback delayedFreePointers;
     LIST_ENTRY(UA_MonitoredItem) listEntry; /* Linked list in the Subscription */
     UA_MonitoredItem *next; /* Linked list of MonitoredItems directly attached
                              * to a Node. Initialized to ~0 to indicate that the
@@ -239,7 +240,7 @@ typedef enum {
  * may keep Subscriptions intact beyond the Session lifetime. They can then be
  * re-bound to a new Session with the TransferSubscription Service. */
 struct UA_Subscription {
-    UA_TimerEntry delayedFreePointers;
+    UA_DelayedCallback delayedFreePointers;
     LIST_ENTRY(UA_Subscription) serverListEntry;
     /* Ordered according to the priority byte and round-robin scheduling for
      * late subscriptions. See ua_session.h. Only set if session != NULL. */
@@ -326,7 +327,7 @@ UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *sessio
                                            const UA_ContentFilter *contentFilter,
                                            UA_ContentFilterResult *contentFilterResult);
 #endif
- 
+
 /* Setting an integer value within bounds */
 #define UA_BOUNDEDVALUE_SETWBOUNDS(BOUNDS, SRC, DST) { \
         if(SRC > BOUNDS.max) DST = BOUNDS.max;         \
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 591d5657b6a..1fd74b2dcd3 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -162,6 +162,29 @@ isValidEvent(UA_Server *server, const UA_NodeId *validEventParent,
     return isSubtypeOfBaseEvent;
 }
 
+/* Resolves a variant of type string or boolean into a corresponding status code */
+static UA_StatusCode
+resolveBoolean(UA_Variant operand) {
+    UA_String value;
+    value = UA_STRING("True");
+    if(((operand.type == &UA_TYPES[UA_TYPES_STRING]) &&
+        (UA_String_equal((UA_String *)operand.data, &value))) ||
+       ((operand.type == &UA_TYPES[UA_TYPES_BOOLEAN]) &&
+        (*(UA_Boolean *)operand.data == UA_TRUE))) {
+        return UA_STATUSCODE_GOOD;
+    }
+    value = UA_STRING("False");
+    if(((operand.type == &UA_TYPES[UA_TYPES_STRING]) &&
+        (UA_String_equal((UA_String *)operand.data, &value))) ||
+       ((operand.type == &UA_TYPES[UA_TYPES_BOOLEAN]) &&
+        (*(UA_Boolean *)operand.data == UA_FALSE))) {
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+
+    /* If the operand can't be resolved, an error is returned */
+    return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+}
+
 /* Part 4: 7.4.4.5 SimpleAttributeOperand
  * The clause can point to any attribute of nodes. Either a child of the event
  * node and also the event type. */
@@ -233,6 +256,7 @@ resolveOperand(UA_Server *server, UA_Session *session, const UA_NodeId *origin,
 
     UA_StatusCode res;
     UA_Variant variant;
+    UA_Variant_init(&variant);
     /*SimpleAttributeOperands*/
     if(contentFilter->elements[index].filterOperands[nr].content.decoded.type ==
        &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]) {
@@ -246,23 +270,17 @@ resolveOperand(UA_Server *server, UA_Session *session, const UA_NodeId *origin,
     } else if(contentFilter->elements[index].filterOperands[nr].content.decoded.type ==
               &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
         variant = ((UA_LiteralOperand *)contentFilter->elements[index]
-            .filterOperands[nr]
-            .content.decoded.data)
-            ->value;
+            .filterOperands[nr].content.decoded.data)->value;
         res = UA_STATUSCODE_GOOD;
     } else if(contentFilter->elements[index].filterOperands[nr].content.decoded.type ==
               &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
         res = evaluateWhereClauseContentFilter(
             server, session, origin, contentFilter, contentFilterResult, valueResult,
             (UA_UInt16)((UA_ElementOperand *)contentFilter->elements[index]
-                .filterOperands[nr]
-                .content.decoded.data)
-                ->index);
+                .filterOperands[nr].content.decoded.data)->index);
         variant =
             valueResult[(UA_UInt16)((UA_ElementOperand *)contentFilter->elements[index]
-                .filterOperands[nr]
-                .content.decoded.data)
-                ->index];
+                .filterOperands[nr].content.decoded.data)->index];
         /*ElementOperands*/
     } else {
         res = UA_STATUSCODE_BADFILTEROPERANDINVALID;
@@ -274,6 +292,161 @@ resolveOperand(UA_Server *server, UA_Session *session, const UA_NodeId *origin,
     return variant;
 }
 
+static UA_StatusCode
+ofTypeOperator(UA_Server *server, UA_Session *session,
+               const UA_NodeId *eventNode,
+               const UA_ContentFilter *contentFilter,
+               UA_ContentFilterResult *contentFilterResult,
+               UA_Variant* valueResult, UA_UInt16 index,
+               UA_UInt16 nr, UA_ContentFilterElement *pElement){
+    UA_Boolean result = false;
+    valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    if(pElement->filterOperandsSize != 1)
+        return UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+    if(pElement->filterOperands[0].content.decoded.type !=
+       &UA_TYPES[UA_TYPES_LITERALOPERAND])
+        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+
+    UA_LiteralOperand *literalOperand =
+        (UA_LiteralOperand *) pElement->filterOperands[0].content.decoded.data;
+    if(!UA_Variant_isScalar(&literalOperand->value))
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    if(literalOperand->value.type != &UA_TYPES[UA_TYPES_NODEID] || literalOperand->value.data == NULL)
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    UA_NodeId *literalOperandNodeId = (UA_NodeId *) literalOperand->value.data;
+    UA_Variant typeNodeIdVariant;
+    UA_Variant_init(&typeNodeIdVariant);
+    UA_StatusCode readStatusCode =
+        readObjectProperty(server, *eventNode, UA_QUALIFIEDNAME(0, "EventType"),
+                           &typeNodeIdVariant);
+    if(readStatusCode != UA_STATUSCODE_GOOD)
+        return readStatusCode;
+
+    if(!UA_Variant_isScalar(&typeNodeIdVariant) ||
+       typeNodeIdVariant.type != &UA_TYPES[UA_TYPES_NODEID] ||
+       typeNodeIdVariant.data == NULL) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "EventType has an invalid type.");
+        UA_Variant_clear(&typeNodeIdVariant);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    //check if the eventtype-nodeid is equal to the given oftype argument
+    result = UA_NodeId_equal((UA_NodeId*) typeNodeIdVariant.data, literalOperandNodeId);
+    //check if the eventtype-nodeid is a subtype of the given oftype argument
+    if(!result)
+        result = isNodeInTree_singleRef(server,
+                                        (UA_NodeId*) typeNodeIdVariant.data,
+                                        literalOperandNodeId,
+                                        UA_REFERENCETYPEINDEX_HASSUBTYPE);
+    UA_Variant_clear(&typeNodeIdVariant);
+    if(!result)
+        return UA_STATUSCODE_BADNOMATCH;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+andOperator(UA_Server *server, UA_Session *session,
+            const UA_NodeId *eventNode,
+            const UA_ContentFilter *contentFilter,
+            UA_ContentFilterResult *contentFilterResult,
+            UA_Variant* valueResult, UA_UInt16 index,
+            UA_UInt16 nr, UA_ContentFilterElement *pElement) {
+    UA_StatusCode firstBoolean_and = resolveBoolean(
+        resolveOperand(server, session, eventNode, contentFilter,
+                       contentFilterResult, valueResult, index, 0));
+    if(firstBoolean_and == UA_STATUSCODE_BADNOMATCH) {
+        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+    /* Evaluation of second operand */
+    UA_StatusCode secondBoolean = resolveBoolean(
+        resolveOperand(server, session, eventNode, contentFilter,
+                       contentFilterResult, valueResult, index, 1));
+
+    /* Filteroperator AND */
+    if(secondBoolean == UA_STATUSCODE_BADNOMATCH) {
+        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_BADNOMATCH;
+    } else if((firstBoolean_and == UA_STATUSCODE_GOOD) &&
+              (secondBoolean == UA_STATUSCODE_GOOD)) {
+        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_GOOD;
+    } else {
+        return UA_STATUSCODE_BADFILTERELEMENTINVALID;
+    }
+}
+
+static UA_StatusCode
+orOperator(UA_Server *server, UA_Session *session,
+           const UA_NodeId *eventNode,
+           const UA_ContentFilter *contentFilter,
+           UA_ContentFilterResult *contentFilterResult,
+           UA_Variant* valueResult, UA_UInt16 index,
+           UA_UInt16 nr, UA_ContentFilterElement *pElement) {
+    UA_StatusCode firstBoolean_or = resolveBoolean(
+        resolveOperand(server, session, eventNode, contentFilter,
+                       contentFilterResult, valueResult, index, 0));
+    if(firstBoolean_or == UA_STATUSCODE_GOOD) {
+        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_GOOD;
+    }
+    /* Evaluation of second operand */
+    UA_StatusCode secondBoolean = resolveBoolean(
+        resolveOperand(server, session, eventNode, contentFilter,
+                       contentFilterResult, valueResult, index, 1));
+
+    if(secondBoolean == UA_STATUSCODE_GOOD) {
+        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_GOOD;
+    } else if((firstBoolean_or == UA_STATUSCODE_BADNOMATCH) &&
+              (secondBoolean == UA_STATUSCODE_BADNOMATCH)) {
+        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_BADNOMATCH;
+    } else {
+        return UA_STATUSCODE_BADFILTERELEMENTINVALID;
+    }
+}
+
+static UA_StatusCode
+isNullOperator(UA_Server *server, UA_Session *session,
+           const UA_NodeId *eventNode,
+           const UA_ContentFilter *contentFilter,
+           UA_ContentFilterResult *contentFilterResult,
+           UA_Variant* valueResult, UA_UInt16 index,
+           UA_UInt16 nr, UA_ContentFilterElement *pElement) {
+    /* Checking if operand is NULL. This is done by reducing the operand to a
+    * variant and then checking if it is empty. */
+    UA_Variant operand =
+        resolveOperand(server, session, eventNode, contentFilter,
+                       contentFilterResult, valueResult, index, 0);
+    valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    if(!UA_Variant_isEmpty(&operand)) {
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+notOperator(UA_Server *server, UA_Session *session,
+               const UA_NodeId *eventNode,
+               const UA_ContentFilter *contentFilter,
+               UA_ContentFilterResult *contentFilterResult,
+               UA_Variant* valueResult, UA_UInt16 index,
+               UA_UInt16 nr, UA_ContentFilterElement *pElement) {
+    /* Inverting the boolean value of the operand. */
+    UA_StatusCode res = resolveBoolean(
+        resolveOperand(server, session, eventNode, contentFilter,
+                       contentFilterResult, valueResult, index, 0));
+    valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    //invert result
+    if(res == UA_STATUSCODE_GOOD) {
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
 static UA_StatusCode
 evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
                                  const UA_NodeId *eventNode,
@@ -289,97 +462,72 @@ evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
 
     /* The first element needs to be evaluated, this might be linked to other
      * elements, which are evaluated in these cases. See 7.4.1 in Part 4. */
-    UA_ContentFilterElement *pElement = &contentFilter->elements[0];
+    UA_ContentFilterElement *pElement = &contentFilter->elements[index];
     switch(pElement->filterOperator) {
         case UA_FILTEROPERATOR_INVIEW:
+            return UA_STATUSCODE_BADEVENTFILTERINVALID;
         case UA_FILTEROPERATOR_RELATEDTO: {
             /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
             return UA_STATUSCODE_BADEVENTFILTERINVALID;
         }
         case UA_FILTEROPERATOR_EQUALS:
-        case UA_FILTEROPERATOR_ISNULL: {
-            /* Checking if operand is NULL. This is done by reducing the operand to a
-            * variant and then checking if it is empty. */
-            UA_Variant operand =
-                resolveOperand(server, session, eventNode, contentFilter,
-                               contentFilterResult, valueResult, index, 0);
-            valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-            if(UA_Variant_isEmpty(&operand)) {
-                contentFilterResult->elementResults[index].statusCode =
-                    UA_STATUSCODE_GOOD;
-                break;
-            }
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+        case UA_FILTEROPERATOR_ISNULL:
             contentFilterResult->elementResults[index].statusCode =
-                UA_STATUSCODE_BADNOMATCH;
+                isNullOperator(server, session, eventNode, contentFilter,
+                               contentFilterResult, valueResult, index, 0, pElement);
             break;
-        }
         case UA_FILTEROPERATOR_GREATERTHAN:
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
         case UA_FILTEROPERATOR_LESSTHAN:
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
         case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
         case UA_FILTEROPERATOR_LESSTHANOREQUAL:
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
         case UA_FILTEROPERATOR_LIKE:
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
         case UA_FILTEROPERATOR_NOT:
+            contentFilterResult->elementResults[index].statusCode =
+                notOperator(server, session, eventNode, contentFilter,
+                            contentFilterResult, valueResult, index, 0, pElement);
+            break;
         case UA_FILTEROPERATOR_BETWEEN:
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
         case UA_FILTEROPERATOR_INLIST:
-        case UA_FILTEROPERATOR_AND:
-        case UA_FILTEROPERATOR_OR:
-        case UA_FILTEROPERATOR_CAST:
-        case UA_FILTEROPERATOR_BITWISEAND:
-        case UA_FILTEROPERATOR_BITWISEOR:
             return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-
-        case UA_FILTEROPERATOR_OFTYPE: {
-            UA_Boolean result = UA_FALSE;
-            if(pElement->filterOperandsSize != 1)
-                return UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-            if(pElement->filterOperands[0].content.decoded.type !=
-                &UA_TYPES[UA_TYPES_LITERALOPERAND])
+        case UA_FILTEROPERATOR_AND: {
+            contentFilterResult->elementResults[index].statusCode =
+                andOperator(server, session, eventNode, contentFilter,
+                            contentFilterResult, valueResult, index, 0, pElement);
+            break;
+            case UA_FILTEROPERATOR_OR:
+                contentFilterResult->elementResults[index].statusCode =
+                    orOperator(server, session, eventNode, contentFilter,
+                               contentFilterResult, valueResult, index, 0, pElement);
+                break;
+            case UA_FILTEROPERATOR_CAST:
                 return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-
-            UA_LiteralOperand *pOperand =
-                (UA_LiteralOperand *) pElement->filterOperands[0].content.decoded.data;
-            if(!UA_Variant_isScalar(&pOperand->value))
-                return UA_STATUSCODE_BADEVENTFILTERINVALID;
-
-            if(pOperand->value.type != &UA_TYPES[UA_TYPES_NODEID] ||
-               pOperand->value.data == NULL) {
-                result = UA_FALSE;
-            } else {
-                UA_NodeId *pOperandNodeId = (UA_NodeId *) pOperand->value.data;
-                UA_QualifiedName eventTypeQualifiedName = UA_QUALIFIEDNAME(0, "EventType");
-                UA_Variant typeNodeIdVariant;
-                UA_Variant_init(&typeNodeIdVariant);
-                UA_StatusCode readStatusCode =
-                    readObjectProperty(server, *eventNode, eventTypeQualifiedName,
-                                       &typeNodeIdVariant);
-                if(readStatusCode != UA_STATUSCODE_GOOD)
-                    return readStatusCode;
-
-                if(!UA_Variant_isScalar(&typeNodeIdVariant) ||
-                   typeNodeIdVariant.type != &UA_TYPES[UA_TYPES_NODEID] ||
-                   typeNodeIdVariant.data == NULL) {
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                 "EventType has an invalid type.");
-                    UA_Variant_clear(&typeNodeIdVariant);
-                    return UA_STATUSCODE_BADINTERNALERROR;
-                }
-
-                result = isNodeInTree_singleRef(server,
-                                                (UA_NodeId*) typeNodeIdVariant.data,
-                                                pOperandNodeId,
-                                                UA_REFERENCETYPEINDEX_HASSUBTYPE);
-                UA_Variant_clear(&typeNodeIdVariant);
-            }
-
-            if(result)
-                return UA_STATUSCODE_GOOD;
-            else
-                return UA_STATUSCODE_BADNOMATCH;
+            case UA_FILTEROPERATOR_BITWISEAND:
+                return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+            case UA_FILTEROPERATOR_BITWISEOR:
+                return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+            case UA_FILTEROPERATOR_OFTYPE:
+                contentFilterResult->elementResults[index].statusCode =
+                    ofTypeOperator(server, session, eventNode, contentFilter,
+                                   contentFilterResult, valueResult, index, 0, pElement);
+                break;
+            default:
+                return UA_STATUSCODE_BADFILTEROPERATORINVALID;
         }
-            break;
-    default:
-        return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-        break;
+    }
+    if(valueResult[index].type == &UA_TYPES[UA_TYPES_BOOLEAN]) {
+        UA_Boolean *result = UA_Boolean_new();
+        if(contentFilterResult->elementResults[index].statusCode == UA_STATUSCODE_GOOD)
+            *result = true;
+        else
+            *result = false;
+        valueResult[index].data = result;
     }
     return contentFilterResult->elementResults[index].statusCode;
 }
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index daf864d4b2c..752370139bc 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -599,9 +599,7 @@ UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *mon) {
     mon->delayedFreePointers.callback = NULL;
     mon->delayedFreePointers.application = server;
     mon->delayedFreePointers.data = NULL;
-    mon->delayedFreePointers.nextTime = UA_DateTime_nowMonotonic() + 1;
-    mon->delayedFreePointers.interval = 0;
-    UA_Timer_addTimerEntry(&server->timer, &mon->delayedFreePointers, NULL);
+    UA_EventLoop_addDelayedCallback(server->config.eventLoop, &mon->delayedFreePointers);
 }
 
 void
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index ed883401dc3..718be82c334 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -18,6 +18,7 @@
 #include <open62541/transport_generated.h>
 
 #include "open62541_queue.h"
+#include "ua_util_internal.h"
 #include "ua_connection_internal.h"
 
 _UA_BEGIN_DECLS
diff --git a/src/ua_types_print.c b/src/ua_types_print.c
index 48566da2214..ec4cbb779c1 100644
--- a/src/ua_types_print.c
+++ b/src/ua_types_print.c
@@ -774,33 +774,45 @@ UA_print(const void *p, const UA_DataType *type, UA_String *output) {
     ctx.depth = 0;
     TAILQ_INIT(&ctx.outputs);
 
+    /* Allocate before the goto */
+    size_t total = 0;
+    size_t pos = 0;
+    UA_PrintOutput *out, *out_tmp;
+
     /* Encode */
     UA_StatusCode retval = printJumpTable[type->typeKind](&ctx, p, type);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    /* If printing succeeded the output cannot be empty*/
+    TAILQ_FOREACH(out, &ctx.outputs, next)
+        total += out->length;
+    UA_assert(total > 0);
 
-    /* Allocate memory for the output */
-    if(retval == UA_STATUSCODE_GOOD) {
-        size_t total = 0;
-        UA_PrintOutput *out;
-        TAILQ_FOREACH(out, &ctx.outputs, next)
-            total += out->length;
+    if(output->length == 0) {
+        /* Allocate memory for the output */
         retval = UA_ByteString_allocBuffer((UA_String*)output, total);
+    } else {
+        /* Check if the buffer is large enough */
+        if(output->length >= total)
+            output->length = total;
+        else
+            retval = UA_STATUSCODE_BADOUTOFMEMORY;
     }
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
 
-    /* Write the output */
-    if(retval == UA_STATUSCODE_GOOD) {
-        size_t pos = 0;
-        UA_PrintOutput *out;
-        TAILQ_FOREACH(out, &ctx.outputs, next) {
-            memcpy(&output->data[pos], out->data, out->length);
-            pos += out->length;
-        }
+    /* Write to the output buffer */
+    TAILQ_FOREACH(out, &ctx.outputs, next) {
+        memcpy(&output->data[pos], out->data, out->length);
+        pos += out->length;
     }
 
+ cleanup:
     /* Free the context */
-    UA_PrintOutput *o, *o2;
-    TAILQ_FOREACH_SAFE(o, &ctx.outputs, next, o2) {
-        TAILQ_REMOVE(&ctx.outputs, o, next);
-        UA_free(o);
+    TAILQ_FOREACH_SAFE(out, &ctx.outputs, next, out_tmp) {
+        TAILQ_REMOVE(&ctx.outputs, out, next);
+        UA_free(out);
     }
     return retval;
 }
diff --git a/src/ua_util.c b/src/ua_util.c
index 6ed211912a6..0380bd835bf 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -211,7 +211,7 @@ UA_ByteString_toBase64(const UA_ByteString *byteString,
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_ByteString_fromBase64(UA_ByteString *bs,
                          const UA_String *input) {
     UA_ByteString_init(bs);
@@ -228,11 +228,11 @@ UA_ByteString_fromBase64(UA_ByteString *bs,
 /* Key Value Map */
 
 UA_StatusCode
-UA_KeyValueMap_setQualified(UA_KeyValuePair **map, size_t *mapSize,
-                            const UA_QualifiedName *key,
-                            const UA_Variant *value) {
+UA_KeyValueMap_set(UA_KeyValuePair **map, size_t *mapSize,
+                   const UA_QualifiedName key,
+                   const UA_Variant *value) {
     /* Parameter exists already */
-    const UA_Variant *v = UA_KeyValueMap_getQualified(*map, *mapSize, key);
+    const UA_Variant *v = UA_KeyValueMap_get(*map, *mapSize, key);
     if(v) {
         UA_Variant copyV;
         UA_StatusCode res = UA_Variant_copy(v, &copyV);
@@ -246,69 +246,43 @@ UA_KeyValueMap_setQualified(UA_KeyValuePair **map, size_t *mapSize,
 
     /* Append to the array */
     UA_KeyValuePair pair;
-    pair.key = *key;
+    pair.key = key;
     pair.value = *value;
     return UA_Array_appendCopy((void**)map, mapSize, &pair,
                                &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
 }
 
-UA_StatusCode
-UA_KeyValueMap_set(UA_KeyValuePair **map, size_t *mapSize,
-                   const char *key, const UA_Variant *value) {
-    UA_QualifiedName qnKey;
-    qnKey.namespaceIndex = 0;
-    qnKey.name = UA_STRING((char*)(uintptr_t)key);
-    return UA_KeyValueMap_setQualified(map, mapSize, &qnKey, value);
-}
-
 const UA_Variant *
-UA_KeyValueMap_getQualified(UA_KeyValuePair *map, size_t mapSize,
-                            const UA_QualifiedName *key) {
+UA_KeyValueMap_get(UA_KeyValuePair *map, size_t mapSize,
+                   const UA_QualifiedName key) {
     for(size_t i = 0; i < mapSize; i++) {
-        if(map[i].key.namespaceIndex == key->namespaceIndex &&
-           UA_String_equal(&map[i].key.name, &key->name))
+        if(map[i].key.namespaceIndex == key.namespaceIndex &&
+           UA_String_equal(&map[i].key.name, &key.name))
             return &map[i].value;
 
     }
     return NULL;
 }
 
-const UA_Variant *
-UA_KeyValueMap_get(UA_KeyValuePair *map, size_t mapSize,
-                   const char *key) {
-    UA_QualifiedName qnKey;
-    qnKey.namespaceIndex = 0;
-    qnKey.name = UA_STRING((char*)(uintptr_t)key);
-    return UA_KeyValueMap_getQualified(map, mapSize, &qnKey);
-}
-
 /* Returns NULL if the parameter is not defined or not of the right datatype */
-const UA_Variant *
+const void *
 UA_KeyValueMap_getScalar(UA_KeyValuePair *map, size_t mapSize,
-                         const char *key, const UA_DataType *type) {
+                         const UA_QualifiedName key,
+                         const UA_DataType *type) {
     const UA_Variant *v = UA_KeyValueMap_get(map, mapSize, key);
     if(!v || !UA_Variant_hasScalarType(v, type))
         return NULL;
-    return v;
-}
-
-const UA_Variant *
-UA_KeyValueMap_getArray(UA_KeyValuePair *map, size_t mapSize,
-                        const char *key, const UA_DataType *type) {
-    const UA_Variant *v = UA_KeyValueMap_get(map, mapSize, key);
-    if(!v || !UA_Variant_hasArrayType(v, type))
-        return NULL;
-    return v;
+    return v->data;
 }
 
 void
-UA_KeyValueMap_deleteQualified(UA_KeyValuePair **map, size_t *mapSize,
-                               const UA_QualifiedName *key) {
+UA_KeyValueMap_delete(UA_KeyValuePair **map, size_t *mapSize,
+                      const UA_QualifiedName key) {
     UA_KeyValuePair *m = *map;
     size_t s = *mapSize;
     for(size_t i = 0; i < s; i++) {
-        if(m[i].key.namespaceIndex != key->namespaceIndex ||
-           !UA_String_equal(&m[i].key.name, &key->name))
+        if(m[i].key.namespaceIndex != key.namespaceIndex ||
+           !UA_String_equal(&m[i].key.name, &key.name))
             continue;
 
         /* Clean the pair */
@@ -327,15 +301,6 @@ UA_KeyValueMap_deleteQualified(UA_KeyValuePair **map, size_t *mapSize,
                            * array around. Resize never fails when reducing
                            * the size to zero. Reduce the size integer in
                            * any case. */
-        return;
+        break;
     }
 }
-
-void
-UA_KeyValueMap_delete(UA_KeyValuePair **map, size_t *mapSize,
-                      const char *key) {
-    UA_QualifiedName qnKey;
-    qnKey.namespaceIndex = 0;
-    qnKey.name = UA_STRING((char*)(uintptr_t)key);
-    UA_KeyValueMap_deleteQualified(map, mapSize, &qnKey);
-}
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 9ee206c51d9..949bff6e510 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -185,6 +185,9 @@ isTrue(uint8_t expr) {
 #define UA_CHECK_STATUS_INFO(STATUSCODE, EVAL, LOGGER, CAT, ...)                         \
     UA_MACRO_EXPAND(                                                                     \
         UA_CHECK_STATUS_LOG(STATUSCODE, EVAL, INFO, LOGGER, CAT, __VA_ARGS__))
+#define UA_CHECK_STATUS_DEBUG(STATUSCODE, EVAL, LOGGER, CAT, ...)                         \
+    UA_MACRO_EXPAND(                                                                     \
+        UA_CHECK_STATUS_LOG(STATUSCODE, EVAL, DEBUG, LOGGER, CAT, __VA_ARGS__))
 
 #define UA_CHECK_MEM_FATAL(PTR, EVAL, LOGGER, CAT, ...)                        \
     UA_MACRO_EXPAND(                                                                     \
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ed88551f4d8..1bd779e17b3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,6 +23,7 @@ include_directories(${open62541_BUILD_INCLUDE_DIRS})
 # ua_server_internal.h
 include_directories("${PROJECT_SOURCE_DIR}/src")
 include_directories("${PROJECT_SOURCE_DIR}/src/server")
+include_directories("${PROJECT_SOURCE_DIR}/arch/common")
 # testing_clock.h
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/testing-plugins")
 # #include <src_generated/<...>.h>
@@ -65,7 +66,10 @@ endif()
 
 
 # Use different plugins for testing
-set(test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
+set(test_plugin_sources
+    ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_clock.c
     ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
     ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c
@@ -156,6 +160,9 @@ endif()
 add_library(open62541-testplugins OBJECT ${test_plugin_sources} ${PROJECT_SOURCE_DIR}/arch/${UA_ARCHITECTURE}/ua_architecture_functions.c)
 add_dependencies(open62541-testplugins open62541)
 target_compile_definitions(open62541-testplugins PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
+if(UA_ENABLE_COVERAGE)
+    add_coverage(open62541-testplugins)
+endif()
 
 # Workaround some clang warnings in the uni tests
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang"))
@@ -255,6 +262,14 @@ add_executable(check_timer check_timer.c $<TARGET_OBJECTS:open62541-object> $<TA
 target_link_libraries(check_timer ${LIBS})
 add_test_valgrind(timer ${TESTS_BINARY_DIR}/check_timer)
 
+add_executable(check_eventloop check_eventloop.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+target_link_libraries(check_eventloop ${LIBS})
+add_test_valgrind(eventloop ${TESTS_BINARY_DIR}/check_eventloop)
+
+add_executable(check_eventloop_tcp check_eventloop_tcp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+target_link_libraries(check_eventloop_tcp ${LIBS})
+add_test_valgrind(eventloop_tcp ${TESTS_BINARY_DIR}/check_eventloop_tcp)
+
 # Test Server
 
 add_executable(check_accesscontrol server/check_accesscontrol.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
@@ -343,6 +358,10 @@ if(UA_ENABLE_HISTORIZING)
     add_executable(check_server_historical_data server/check_server_historical_data.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
     target_link_libraries(check_server_historical_data ${LIBS})
     add_test_valgrind(server_historical_data ${TESTS_BINARY_DIR}/check_server_historical_data)
+
+    add_executable(check_server_historical_data_circular server/check_server_historical_data_circular.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    target_link_libraries(check_server_historical_data_circular ${LIBS})
+    add_test_valgrind(server_historical_data_circular ${TESTS_BINARY_DIR}/check_server_historical_data_circular)
 endif()
 
 add_executable(check_session server/check_session.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
@@ -447,14 +466,22 @@ if(UA_ENABLE_PUBSUB)
                 $<TARGET_OBJECTS:open62541-testplugins>)
         target_link_libraries(check_pubsub_subscribe_encrypted ${LIBS})
         add_test_valgrind(check_pubsub_subscribe_encrypted ${TESTS_BINARY_DIR}/check_pubsub_subscribe_encrypted)
+
+        add_executable(check_pubsub_encrypted_rt_levels pubsub/check_pubsub_encrypted_rt_levels.c
+                $<TARGET_OBJECTS:open62541-object>
+                $<TARGET_OBJECTS:open62541-testplugins>)
+        target_link_libraries(check_pubsub_encrypted_rt_levels ${LIBS})
+        add_test_valgrind(check_pubsub_encrypted_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_encrypted_rt_levels)
     endif()
 
     if (UA_ENABLE_PUBSUB_MONITORING)
-        add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c 
-            $<TARGET_OBJECTS:open62541-object>
-            $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS})
-        add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout)
+        if(NOT UA_ENABLE_PUBSUB_ENCRYPTION) #ToDO: Multiple Receive handling for PubsubEncryption
+            add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c 
+                    $<TARGET_OBJECTS:open62541-object>
+                    $<TARGET_OBJECTS:open62541-testplugins>)
+            target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS})
+            add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout)
+        endif()
     endif()
 
     if(UA_ENABLE_PUBSUB_ETH_UADP)
diff --git a/tests/check_eventloop.c b/tests/check_eventloop.c
new file mode 100644
index 00000000000..9679eba4ebe
--- /dev/null
+++ b/tests/check_eventloop.c
@@ -0,0 +1,65 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/plugin/eventloop.h>
+#include "testing_clock.h"
+#include <time.h>
+#include <check.h>
+
+#define N_EVENTS 10000
+
+UA_EventLoop *el;
+size_t count = 0;
+
+static void
+timerCallback(void *application, void *data) {
+    count++;
+}
+
+/* Create empty events with different callback intervals */
+static void
+createEvents(UA_UInt32 events) {
+    for(size_t i = 0; i < events; i++) {
+        UA_Double interval = (UA_Double)i+1;
+        UA_StatusCode retval =
+            UA_EventLoop_addCyclicCallback(el, timerCallback, NULL, NULL, interval, NULL,
+                                           UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, NULL);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    }
+}
+
+START_TEST(benchmarkTimer) {
+    el = UA_EventLoop_new(NULL);
+    createEvents(N_EVENTS);
+
+    clock_t begin = clock();
+    for(size_t i = 0; i < 1000; i++) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+
+    clock_t finish = clock();
+    double time_spent = (double)(finish - begin) / CLOCKS_PER_SEC;
+    printf("duration was %f s\n", time_spent);
+    printf("%lu callbacks\n", (unsigned long)count);
+
+    UA_EventLoop_stop(el);
+    UA_EventLoop_delete(el);
+    el = NULL;
+} END_TEST
+
+int main(void) {
+    Suite *s  = suite_create("Test EventLoop");
+    TCase *tc = tcase_create("test cases");
+    tcase_add_test(tc, benchmarkTimer);
+    suite_add_tcase(s, tc);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all (sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
new file mode 100644
index 00000000000..81027701103
--- /dev/null
+++ b/tests/check_eventloop_tcp.c
@@ -0,0 +1,256 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/plugin/eventloop.h>
+#include <open62541/plugin/log_stdout.h>
+#include "open62541/types.h"
+#include "open62541/types_generated.h"
+
+#include "testing_clock.h"
+#include <time.h>
+#include <check.h>
+
+#define N_EVENTS 10000
+
+UA_EventLoop *el;
+
+static void noopCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                   void **connectionContext, UA_StatusCode status,
+                   UA_ByteString msg) {}
+
+START_TEST(listenTCP) {
+    el = UA_EventLoop_new(UA_Log_Stdout);
+
+    UA_UInt16 port = 4840;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_ConnectionManager *cm = UA_ConnectionManager_TCP_new(UA_STRING("tcpCM"));
+    cm->connectionCallback = noopCallback;
+    UA_KeyValueMap_set(&cm->eventSource.params,
+                       &cm->eventSource.paramsSize,
+                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    UA_EventLoop_registerEventSource(el, &cm->eventSource);
+
+    UA_EventLoop_start(el);
+
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
+    /* Stop the EventLoop */
+    UA_EventLoop_stop(el);
+    while(UA_EventLoop_getState(el) != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    UA_EventLoop_delete(el);
+    el = NULL;
+} END_TEST
+
+static unsigned connCount;
+static char *testMsg = "open62541";
+static uintptr_t clientId;
+static UA_Boolean received;
+static void
+connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                   void **connectionContext, UA_StatusCode status,
+                   UA_ByteString msg) {
+    if(*connectionContext != NULL)
+        clientId = connectionId;
+    if(msg.length == 0 && status == UA_STATUSCODE_GOOD)
+        connCount++;
+    if(status != UA_STATUSCODE_GOOD) {
+        connCount--;
+    }
+
+    if(msg.length > 0) {
+        UA_ByteString rcv = UA_BYTESTRING(testMsg);
+        ck_assert(UA_String_equal(&msg, &rcv));
+        received = true;
+    }
+}
+
+static void
+illegalConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                   void **connectionContext, UA_StatusCode status,
+                   UA_ByteString msg) {
+    UA_StatusCode rv = UA_EventLoop_run(el, 1);
+    ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);
+    if(*connectionContext != NULL)
+        clientId = connectionId;
+    if(msg.length == 0 && status == UA_STATUSCODE_GOOD)
+        connCount++;
+    if(status != UA_STATUSCODE_GOOD)
+        connCount--;
+    if(msg.length > 0) {
+        UA_ByteString rcv = UA_BYTESTRING(testMsg);
+        ck_assert(UA_String_equal(&msg, &rcv));
+        received = true;
+    }
+}
+
+START_TEST(runEventloopFailsIfCalledFromCallback) {
+    el = UA_EventLoop_new(UA_Log_Stdout);
+
+    UA_UInt16 port = 4840;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_ConnectionManager *cm = UA_ConnectionManager_TCP_new(UA_STRING("tcpCM"));
+    cm->connectionCallback = illegalConnectionCallback;
+    UA_KeyValueMap_set(&cm->eventSource.params,
+                       &cm->eventSource.paramsSize,
+                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    UA_EventLoop_registerEventSource(el, &cm->eventSource);
+
+    connCount = 0;
+    UA_EventLoop_start(el);
+
+    /* Open a client connection */
+    clientId = 0;
+
+    UA_String targetHost = UA_STRING("localhost");
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "target-port");
+    params[0].value = portVar;
+    params[1].key = UA_QUALIFIEDNAME(0, "target-hostname");
+    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+    UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(clientId != 0);
+    ck_assert_uint_eq(connCount, 2);
+
+    /* Send a message from the client */
+    received = false;
+    UA_ByteString snd;
+    retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    memcpy(snd.data, testMsg, strlen(testMsg));
+    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(received);
+
+    /* Close the connection */
+    retval = cm->closeConnection(cm, clientId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(connCount, 2);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_eq(connCount, 0);
+
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
+    /* Stop the EventLoop */
+    UA_EventLoop_stop(el);
+    while(UA_EventLoop_getState(el) != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    UA_EventLoop_delete(el);
+    el = NULL;
+} END_TEST
+
+START_TEST(connectTCP) {
+    el = UA_EventLoop_new(UA_Log_Stdout);
+
+    UA_UInt16 port = 4840;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_ConnectionManager *cm = UA_ConnectionManager_TCP_new(UA_STRING("tcpCM"));
+    cm->connectionCallback = connectionCallback;
+    UA_KeyValueMap_set(&cm->eventSource.params,
+                       &cm->eventSource.paramsSize,
+                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    UA_EventLoop_registerEventSource(el, &cm->eventSource);
+
+    connCount = 0;
+    UA_EventLoop_start(el);
+
+    /* Open a client connection */
+    clientId = 0;
+
+    UA_String targetHost = UA_STRING("localhost");
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "target-port");
+    params[0].value = portVar;
+    params[1].key = UA_QUALIFIEDNAME(0, "target-hostname");
+    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+    UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(clientId != 0);
+    ck_assert_uint_eq(connCount, 2);
+
+    /* Send a message from the client */
+    received = false;
+    UA_ByteString snd;
+    retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    memcpy(snd.data, testMsg, strlen(testMsg));
+    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(received);
+
+    /* Close the connection */
+    retval = cm->closeConnection(cm, clientId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(connCount, 2);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_eq(connCount, 0);
+
+    /* Stop the EventLoop */
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
+    /* Stop the EventLoop */
+    UA_EventLoop_stop(el);
+    while(UA_EventLoop_getState(el) != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
+        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    UA_EventLoop_delete(el);
+    el = NULL;
+} END_TEST
+
+int main(void) {
+    Suite *s  = suite_create("Test TCP EventLoop");
+    TCase *tc = tcase_create("test cases");
+    tcase_add_test(tc, listenTCP);
+    tcase_add_test(tc, connectTCP);
+    tcase_add_test(tc, runEventloopFailsIfCalledFromCallback);
+    suite_add_tcase(s, tc);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all (sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/check_types_memory.c b/tests/check_types_memory.c
index 4748b6ebf28..34b594810b9 100644
--- a/tests/check_types_memory.c
+++ b/tests/check_types_memory.c
@@ -15,57 +15,6 @@
 
 #include "check.h"
 
-/* Define types to a dummy value if they are not available (e.g. not built with
- * NS0 full) */
-#ifndef UA_TYPES_UNION
-#define UA_TYPES_UNION UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_HISTORYREADDETAILS
-#define UA_TYPES_HISTORYREADDETAILS UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_NOTIFICATIONDATA
-#define UA_TYPES_NOTIFICATIONDATA UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_MONITORINGFILTER
-#define UA_TYPES_MONITORINGFILTER UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_MONITORINGFILTERRESULT
-#define UA_TYPES_MONITORINGFILTERRESULT UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_DATASETREADERMESSAGEDATATYPE
-#define UA_TYPES_DATASETREADERMESSAGEDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_WRITERGROUPTRANSPORTDATATYPE
-#define UA_TYPES_WRITERGROUPTRANSPORTDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_CONNECTIONTRANSPORTDATATYPE
-#define UA_TYPES_CONNECTIONTRANSPORTDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_WRITERGROUPMESSAGEDATATYPE
-#define UA_TYPES_WRITERGROUPMESSAGEDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_READERGROUPTRANSPORTDATATYPE
-#define UA_TYPES_READERGROUPTRANSPORTDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_PUBLISHEDDATASETSOURCEDATATYPE
-#define UA_TYPES_PUBLISHEDDATASETSOURCEDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_DATASETREADERTRANSPORTDATATYPE
-#define UA_TYPES_DATASETREADERTRANSPORTDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_DATASETWRITERTRANSPORTDATATYPE
-#define UA_TYPES_DATASETWRITERTRANSPORTDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_SUBSCRIBEDDATASETDATATYPE
-#define UA_TYPES_SUBSCRIBEDDATASETDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_READERGROUPMESSAGEDATATYPE
-#define UA_TYPES_READERGROUPMESSAGEDATATYPE UA_TYPES_COUNT
-#endif
-#ifndef UA_TYPES_DATASETWRITERMESSAGEDATATYPE
-#define UA_TYPES_DATASETWRITERMESSAGEDATATYPE UA_TYPES_COUNT
-#endif
-
 START_TEST(newAndEmptyObjectShallBeDeleted) {
     // given
     void *obj = UA_new(&UA_TYPES[_i]);
@@ -106,18 +55,6 @@ START_TEST(arrayCopyShallMakeADeepCopy) {
 END_TEST
 
 START_TEST(encodeShallYieldDecode) {
-    /* floating point types may change the representaton due to several possible NaN values. */
-    if(_i != UA_TYPES_FLOAT || _i != UA_TYPES_DOUBLE ||
-       _i != UA_TYPES_CREATESESSIONREQUEST || _i != UA_TYPES_CREATESESSIONRESPONSE ||
-       _i != UA_TYPES_VARIABLEATTRIBUTES || _i != UA_TYPES_READREQUEST
-#ifdef UA_ENABLE_SUBSCRIPTIONS
-       ||
-       _i != UA_TYPES_MONITORINGPARAMETERS || _i != UA_TYPES_MONITOREDITEMCREATERESULT ||
-       _i != UA_TYPES_CREATESUBSCRIPTIONREQUEST || _i != UA_TYPES_CREATESUBSCRIPTIONRESPONSE
-#endif
-       )
-        return;
-
     // given
     UA_ByteString msg1, msg2;
     void *obj1 = UA_new(&UA_TYPES[_i]);
@@ -154,6 +91,16 @@ START_TEST(encodeShallYieldDecode) {
                   UA_TYPES[_i].typeId.identifier.numeric);
     ck_assert(UA_order(obj1, obj2, &UA_TYPES[_i]) == UA_ORDER_EQ);
 
+    // pretty-print the value
+#ifdef UA_ENABLE_TYPEDESCRIPTION
+    UA_Byte staticBuf[4096];
+    UA_String buf;
+    buf.data = staticBuf;
+    buf.length = 4096;
+    retval = UA_print(obj2, &UA_TYPES[_i], &buf);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+#endif
+
     // finally
     UA_delete(obj1, &UA_TYPES[_i]);
     UA_delete(obj2, &UA_TYPES[_i]);
diff --git a/tests/nodeset-compiler/CMakeLists.txt b/tests/nodeset-compiler/CMakeLists.txt
index 5f0c8e2ca3d..5720a2c2f19 100644
--- a/tests/nodeset-compiler/CMakeLists.txt
+++ b/tests/nodeset-compiler/CMakeLists.txt
@@ -45,7 +45,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     ua_generate_nodeset_and_datatypes(
         NAME "tests-plc"
         # PLCopen does not define custom types. Only generate the nodeset
-        FILE_NS "${open62541_NODESET_DIR}/PLCopen/Opc.Ua.Plc.NodeSet2.xml"
+        FILE_NS "${open62541_NODESET_DIR}/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml"
         # PLCopen depends on the di nodeset, which must be generated before
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
         DEPENDS "tests-di"
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
new file mode 100644
index 00000000000..e3fb968e578
--- /dev/null
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -0,0 +1,843 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2020 -2021 Kalycito Infotech Private Limited (Author: Keerthivasan)
+ */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include "open62541/server_pubsub.h"
+#include <open62541/plugin/securitypolicy_default.h>
+
+#include "ua_pubsub.h"
+#include "ua_pubsub_networkmessage.h"
+
+#include <check.h>
+#include <stdio.h>
+
+UA_Server *server = NULL;
+UA_NodeId connectionIdentifier, publishedDataSetIdent, writerGroupIdent, dataSetWriterIdent, dataSetFieldIdent, dataSetFieldIdent1,  readerGroupIdentifier, readerIdentifier;
+
+UA_UInt32    *subValue;
+UA_DataValue *subDataValueRT;
+UA_UInt32    *subValue1;
+UA_DataValue *subDataValueRT1;
+UA_NodeId    subNodeId;
+UA_NodeId    subNodeId1;
+UA_NodeId    pubNodeId;
+UA_NodeId    pubNodeId1;
+#define             UA_AES128CTR_SIGNING_KEY_LENGTH          32
+#define             UA_AES128CTR_KEY_LENGTH                  16
+#define             UA_AES128CTR_KEYNONCE_LENGTH             4
+
+UA_Byte signingKeyPub[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
+UA_Byte encryptingKeyPub[UA_AES128CTR_KEY_LENGTH] = {0};
+UA_Byte keyNoncePub[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
+
+typedef struct {
+    UA_ByteString *buffer;
+} UA_ReceiveContext;
+
+static UA_StatusCode
+addMinimalPubSubConfiguration(void){
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    /* Add one PubSubConnection */
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(connectionConfig));
+    connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
+    connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    connectionConfig.enabled = UA_TRUE;
+    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.publisherId.numeric = 2234;
+    retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
+    if(retVal != UA_STATUSCODE_GOOD)
+        return retVal;
+
+    /* Add one PublishedDataSet */
+    UA_PublishedDataSetConfig publishedDataSetConfig;
+    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    publishedDataSetConfig.name = UA_STRING("Demo PDS");
+    /* Add one DataSetField to the PDS */
+    UA_AddPublishedDataSetResult addResult = UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent);
+    return addResult.addResult;
+}
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+    /* Instantiate the PubSub SecurityPolicy */
+    config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
+        UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
+                                      &config->logger);
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+static UA_StatusCode
+recvTestFun(UA_PubSubChannel *channel, void *context, const UA_ByteString *buffer) {
+    UA_ReceiveContext *ctx = (UA_ReceiveContext*)context;
+    memcpy(ctx->buffer->data, buffer->data, buffer->length);
+    ctx->buffer->length = buffer->length;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void receiveSingleMessageRT(UA_PubSubConnection *connection, UA_ReaderGroup *readerGroup) {
+    UA_ByteString buffer;
+    UA_DataSetReader *dataSetReader = LIST_FIRST(&readerGroup->readers);
+    if (UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
+        ck_abort_msg("Message buffer allocation failed!");
+    }
+
+    if(!connection->channel) {
+        ck_abort_msg("No connection established");
+        return;
+    }
+
+    UA_ReceiveContext testCtx = {&buffer};
+    UA_StatusCode retval = connection->channel->receive(connection->channel, NULL, recvTestFun, &testCtx, 1000000);
+    if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
+        buffer.length = 512;
+        UA_ByteString_clear(&buffer);
+        ck_abort_msg("Expected message not received!");
+    }
+
+    UA_NetworkMessage currentNetworkMessage;
+    memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
+    size_t payLoadPosition = 0;
+    UA_NetworkMessage_decodeHeaders(&buffer, &payLoadPosition, &currentNetworkMessage);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    verifyAndDecryptNetworkMessage(&config->logger,
+                                   &buffer,
+                                   &payLoadPosition,
+                                   &currentNetworkMessage,
+                                   readerGroup);
+    UA_NetworkMessage_clear(&currentNetworkMessage);
+    size_t currentPosition = 0;
+    /* Decode only the necessary offset and update the networkMessage */
+    if(UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage, &buffer, &currentPosition) != UA_STATUSCODE_GOOD) {
+        ck_abort_msg("PubSub receive. Unknown field type!");
+    }
+
+    /* Check the decoded message is the expected one */
+    if((dataSetReader->bufferedMessage.nm->groupHeader.writerGroupId != dataSetReader->config.writerGroupId) ||
+       (*dataSetReader->bufferedMessage.nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != dataSetReader->config.dataSetWriterId)) {
+        ck_abort_msg("PubSub receive. Unknown message received. Will not be processed.");
+    }
+
+    UA_ReaderGroup *rg =
+        UA_ReaderGroup_findRGbyId(server, dataSetReader->linkedReaderGroup);
+
+    UA_DataSetReader_process(server, rg, dataSetReader,
+                             dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages);
+
+    /* Delete the payload value of every dsf's decoded */
+     UA_DataSetMessage *dsm = dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages;
+     if(dsm->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
+         for(UA_UInt16 i = 0; i < dsm->data.keyFrameData.fieldCount; i++) {
+             UA_Variant_clear(&dsm->data.keyFrameData.dataSetFields[i].value);
+         }
+     }
+
+    UA_ByteString_clear(&buffer);
+}
+
+/* If the external data source is written over the information model, the
+ * externalDataWriteCallback will be triggered. The user has to take care and assure
+ * that the write leads not to synchronization issues and race conditions. */
+static UA_StatusCode
+externalDataWriteCallback(UA_Server *serverLocal, const UA_NodeId *sessionId,
+                          void *sessionContext, const UA_NodeId *nodeId,
+                          void *nodeContext, const UA_NumericRange *range,
+                          const UA_DataValue *data){
+    if(UA_NodeId_equal(nodeId, &subNodeId)){
+        memcpy(subValue, data->value.data, sizeof(UA_UInt32));
+    }
+
+    if(UA_NodeId_equal(nodeId, &subNodeId1)){
+        memcpy(subValue1, data->value.data, sizeof(UA_UInt32));
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+externalDataReadNotificationCallback(UA_Server *serverLocal, const UA_NodeId *sessionId,
+                                     void *sessionContext, const UA_NodeId *nodeid,
+                                     void *nodeContext, const UA_NumericRange *range){
+    //allow read without any preparation
+    return UA_STATUSCODE_GOOD;
+}
+
+START_TEST(SetupInvalidPubSubConfig) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
+    writerGroupConfig.publishingInterval = 100;
+    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.writerGroupId = 100;
+    writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+    UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
+    wgm->networkMessageContentMask = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    writerGroupConfig.messageSettings.content.decoded.data = wgm;
+    writerGroupConfig.messageSettings.content.decoded.type =
+            &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    ck_assert(UA_Server_addWriterGroup(server, connectionIdentifier, &writerGroupConfig, &writerGroupIdent) == UA_STATUSCODE_GOOD);
+    UA_UadpWriterGroupMessageDataType_delete(wgm);
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKeyPub};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKeyPub};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNoncePub};
+    UA_Server_setWriterGroupEncryptionKeys(server, writerGroupIdent, 1, sk, ek, kn);
+    UA_DataSetFieldConfig dsfConfig;
+    memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
+    // Create Variant and configure as DataSetField source
+    UA_VariableAttributes attributes = UA_VariableAttributes_default;
+    UA_UInt32 *intValue = UA_UInt32_new();
+    *intValue = (UA_UInt32) 1000;
+    UA_Variant variant;
+    memset(&variant, 0, sizeof(UA_Variant));
+    UA_Variant_setScalar(&variant, intValue, &UA_TYPES[UA_TYPES_UINT32]);
+    attributes.value = variant;
+    UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                              UA_QUALIFIEDNAME(1, "variable"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              attributes, NULL, NULL);
+    dsfConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 1000);
+    dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    /* Not using static value source */
+    ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent).result == UA_STATUSCODE_GOOD);
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING("Test DataSetWriter");
+    dataSetWriterConfig.dataSetWriterId = 62541;
+    /* UA_Server_addDataSetWriter fails because fields in PDS is not RT capable */
+    ck_assert(UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent) == UA_STATUSCODE_BADCONFIGURATIONERROR);
+    /* Reader Group */
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+    readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+    retVal =  UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
+                                       &readerGroupIdentifier);
+    // TODO security token not necessary for readergroup (extracted from security-header)
+    UA_Server_setReaderGroupEncryptionKeys(server, readerGroupIdentifier, 1, sk, ek, kn);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    /* Data Set Reader */
+    UA_DataSetReaderConfig readerConfig;
+    memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+    readerConfig.name = UA_STRING ("DataSetReader Test");
+    UA_UInt16 publisherIdentifier = 2234;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId    = 100;
+    readerConfig.dataSetWriterId  = 62541;
+    readerConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    readerConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE];
+    UA_UadpDataSetReaderMessageDataType *dataSetReaderMessage = UA_UadpDataSetReaderMessageDataType_new();
+    dataSetReaderMessage->networkMessageContentMask           = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    readerConfig.messageSettings.content.decoded.data = dataSetReaderMessage;
+    /* Setting up Meta data configuration in DataSetReader for DateTime DataType */
+    UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+    /* FilltestMetadata function in subscriber implementation */
+    UA_DataSetMetaDataType_init(pMetaData);
+    pMetaData->name = UA_STRING("DataSet Test");
+    /* Static definition of number of fields size to 1 to create one
+    targetVariable */
+    pMetaData->fieldsSize = 1;
+    pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
+                         &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+    /* DateTime DataType */
+    UA_FieldMetaData_init(&pMetaData->fields[0]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_DATETIME].typeId,
+                   &pMetaData->fields[0].dataType);
+    pMetaData->fields[0].builtInType = UA_NS0ID_DATETIME;
+    pMetaData->fields[0].valueRank = -1; /* scalar */
+
+    /* Add Subscribed Variables */
+    UA_NodeId folderId;
+    UA_NodeId newnodeId;
+    UA_String folderName = readerConfig.dataSetMetaData.name;
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName;
+    if (folderName.length > 0) {
+        oAttr.displayName.locale = UA_STRING ("en-US");
+        oAttr.displayName.text = folderName;
+        folderBrowseName.namespaceIndex = 1;
+        folderBrowseName.name = folderName;
+      }
+    else {
+        oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
+        folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
+    }
+
+    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+                             folderBrowseName, UA_NODEID_NUMERIC (0,
+                             UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    /* Variable to subscribe data */
+    UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+    vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed DateTime");
+    vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed DateTime");
+    vAttr.dataType    = UA_TYPES[UA_TYPES_DATETIME].typeId;
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 50002),
+                                       folderId,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed DateTime"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize = 1;
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables     = (UA_FieldTargetVariable *)
+        UA_calloc(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize, sizeof(UA_FieldTargetVariable));
+
+    /* For creating Targetvariable */
+    UA_FieldTargetDataType_init(&readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable);
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable.targetNodeId = subNodeId;
+
+    retVal = UA_Server_addDataSetReader (server, readerGroupIdentifier, &readerConfig,
+                                          &readerIdentifier);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_NodeId readerIdentifier2;
+    retVal = UA_Server_addDataSetReader (server, readerGroupIdentifier, &readerConfig,
+                                          &readerIdentifier2);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_UadpDataSetReaderMessageDataType_delete(dataSetReaderMessage);
+
+    UA_FieldTargetDataType_clear(&readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable);
+    UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
+    UA_free(readerConfig.dataSetMetaData.fields);
+    UA_Variant_clear(&variant);
+
+    ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_BADNOTIMPLEMENTED); // Multiple DSR not supported
+
+    ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    retVal = UA_Server_removeDataSetReader(server, readerIdentifier2);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_BADNOTSUPPORTED); // DateTime not supported
+    ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+} END_TEST
+
+START_TEST(PublishAndSubscribeSingleFieldWithFixedOffsets) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
+    UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
+    writerGroupConfig.publishingInterval = 100;
+    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.writerGroupId = 100;
+    writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+    UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
+    wgm->networkMessageContentMask = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    writerGroupConfig.messageSettings.content.decoded.data = wgm;
+    writerGroupConfig.messageSettings.content.decoded.type =
+            &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    ck_assert(UA_Server_addWriterGroup(server, connectionIdentifier, &writerGroupConfig, &writerGroupIdent) == UA_STATUSCODE_GOOD);
+    UA_UadpWriterGroupMessageDataType_delete(wgm);
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKeyPub};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKeyPub};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNoncePub};
+    UA_Server_setWriterGroupEncryptionKeys(server, writerGroupIdent, 1, sk, ek, kn);
+    UA_DataSetFieldConfig dsfConfig;
+    memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
+    // Create Variant and configure as DataSetField source
+    UA_UInt32 *intValue = UA_UInt32_new();
+    *intValue = 1000;
+    UA_DataValue *dataValue = UA_DataValue_new();
+    UA_Variant_setScalar(&dataValue->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
+    dsfConfig.field.variable.fieldNameAlias = UA_STRING("Published Int32");
+    dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
+    dsfConfig.field.variable.rtValueSource.staticValueSource = &dataValue;
+    dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent).result == UA_STATUSCODE_GOOD);
+
+    /* Add dataset writer */
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING("Test DataSetWriter");
+    dataSetWriterConfig.dataSetWriterId = 62541;
+    ck_assert(UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent) == UA_STATUSCODE_GOOD);
+    /* Reader Group */
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+    readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+    retVal =  UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
+                                       &readerGroupIdentifier);
+    // TODO security token not necessary for readergroup (extracted from security-header)
+    UA_Server_setReaderGroupEncryptionKeys(server, readerGroupIdentifier, 1, sk, ek, kn);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    /* Data Set Reader */
+    UA_DataSetReaderConfig readerConfig;
+    memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+    readerConfig.name = UA_STRING ("DataSetReader Test");
+    UA_UInt16 publisherIdentifier = 2234;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId    = 100;
+    readerConfig.dataSetWriterId  = 62541;
+    readerConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    readerConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE];
+    UA_UadpDataSetReaderMessageDataType *dataSetReaderMessage = UA_UadpDataSetReaderMessageDataType_new();
+    dataSetReaderMessage->networkMessageContentMask           = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    readerConfig.messageSettings.content.decoded.data = dataSetReaderMessage;
+    /* Setting up Meta data configuration in DataSetReader for DateTime DataType */
+    UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+    /* FilltestMetadata function in subscriber implementation */
+    UA_DataSetMetaDataType_init(pMetaData);
+    pMetaData->name = UA_STRING("DataSet Test");
+    /* Static definition of number of fields size to 1 to create one
+    targetVariable */
+    pMetaData->fieldsSize = 1;
+    pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
+                         &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+    /* UInt32 DataType */
+    UA_FieldMetaData_init(&pMetaData->fields[0]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_UINT32].typeId,
+                   &pMetaData->fields[0].dataType);
+    pMetaData->fields[0].builtInType = UA_NS0ID_UINT32;
+    pMetaData->fields[0].valueRank = -1; /* scalar */
+
+    /* Add Subscribed Variables */
+    UA_NodeId folderId;
+    UA_String folderName = readerConfig.dataSetMetaData.name;
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName;
+    if (folderName.length > 0) {
+        oAttr.displayName.locale = UA_STRING ("en-US");
+        oAttr.displayName.text = folderName;
+        folderBrowseName.namespaceIndex = 1;
+        folderBrowseName.name = folderName;
+      }
+    else {
+        oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
+        folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
+    }
+
+    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+                             folderBrowseName, UA_NODEID_NUMERIC (0,
+                             UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    /* Variable to subscribe data */
+    UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+    vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
+    vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
+    vAttr.dataType    = UA_TYPES[UA_TYPES_UINT32].typeId;
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 50002),
+                                       folderId,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed UInt32"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &subNodeId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    subValue        = UA_UInt32_new();
+    subDataValueRT  = UA_DataValue_new();
+    subDataValueRT->hasValue = UA_TRUE;
+    UA_Variant_setScalar(&subDataValueRT->value, subValue, &UA_TYPES[UA_TYPES_UINT32]);
+    /* Set the value backend of the above create node to 'external value source' */
+    UA_ValueBackend valueBackend;
+    valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+    valueBackend.backend.external.value = &subDataValueRT;
+    valueBackend.backend.external.callback.userWrite = externalDataWriteCallback;
+    valueBackend.backend.external.callback.notificationRead = externalDataReadNotificationCallback;
+    UA_Server_setVariableNode_valueBackend(server, subNodeId, valueBackend);
+
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize = 1;
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables     = (UA_FieldTargetVariable *)
+        UA_calloc(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize, sizeof(UA_FieldTargetVariable));
+
+    /* For creating Targetvariable */
+    UA_FieldTargetDataType_init(&readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable);
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable.targetNodeId = subNodeId;
+
+    retVal = UA_Server_addDataSetReader (server, readerGroupIdentifier, &readerConfig,
+                                          &readerIdentifier);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    UA_UadpDataSetReaderMessageDataType_delete(dataSetReaderMessage);
+    UA_FieldTargetDataType_clear(&readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable);
+    UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
+    UA_free(readerConfig.dataSetMetaData.fields);
+
+    ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    ck_assert(UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
+    ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
+
+    ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+
+    UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
+    receiveSingleMessageRT(connection, readerGroup);
+   /* Read data received by the Subscriber */
+    UA_Variant *subscribedNodeData = UA_Variant_new();
+    retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 50002), subscribedNodeData);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    ck_assert((*(UA_UInt32 *)subscribedNodeData->data) == 1000);
+    UA_Variant_clear(subscribedNodeData);
+    UA_free(subscribedNodeData);
+    ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    UA_DataValue_delete(dataValue);
+    UA_free(subValue);
+    UA_free(subDataValueRT);
+} END_TEST
+
+
+START_TEST(PublishPDSWithMultipleFieldsAndSubscribeFixedSize) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
+    UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
+    /* Add Subscribed Variables */
+    UA_NodeId folderId1;
+    UA_String folderName1 = UA_STRING("PubNodes");
+    UA_ObjectAttributes oAttr1 = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName1;
+    if (folderName1.length > 0) {
+        oAttr1.displayName.locale = UA_STRING ("en-US");
+        oAttr1.displayName.text = folderName1;
+        folderBrowseName1.namespaceIndex = 1;
+        folderBrowseName1.name = folderName1;
+      }
+    else {
+        oAttr1.displayName = UA_LOCALIZEDTEXT ("en-US", "Published Variables");
+        folderBrowseName1 = UA_QUALIFIEDNAME (1, "Published Variables");
+    }
+
+    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+                             folderBrowseName1, UA_NODEID_NUMERIC (0,
+                             UA_NS0ID_BASEOBJECTTYPE), oAttr1, NULL, &folderId1);
+    UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+    UA_UInt32 value            = 0;
+    vAttr.accessLevel           = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
+    UA_Variant_setScalar(&vAttr.value, &value, &UA_TYPES[UA_TYPES_UINT32]);
+    vAttr.displayName           = UA_LOCALIZEDTEXT("en-US", "Published variable");
+    vAttr.dataType              = UA_TYPES[UA_TYPES_UINT32].typeId;
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 60000),
+                                       folderId1,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed DateTime"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &pubNodeId);
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 60001),
+                                       folderId1,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed1 DateTime"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &pubNodeId1);
+    UA_DataSetFieldConfig dsfConfig;
+    memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
+    UA_UInt32 *intValue = UA_UInt32_new();
+    *intValue = 1000;
+    UA_DataValue *dataValue = UA_DataValue_new();
+    UA_Variant_setScalar(&dataValue->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
+    dataValue->hasValue = true;
+    dsfConfig.field.variable.fieldNameAlias = UA_STRING("Published UInt32");
+    dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+
+    /* Set the value backend of the above create node to 'external value source' */
+    UA_ValueBackend valueBackend;
+    valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+    valueBackend.backend.external.value = &dataValue;
+    valueBackend.backend.external.callback.userWrite = externalDataWriteCallback;
+    valueBackend.backend.external.callback.notificationRead = externalDataReadNotificationCallback;
+    UA_Server_setVariableNode_valueBackend(server, UA_NODEID_NUMERIC(1, 60000), valueBackend);
+    dsfConfig.field.variable.rtValueSource.rtInformationModelNode = true;
+    dsfConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 60000);
+    ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, NULL).result == UA_STATUSCODE_GOOD);
+
+    UA_DataSetFieldConfig dsfConfig1;
+    memset(&dsfConfig1, 0, sizeof(UA_DataSetFieldConfig));
+    UA_UInt32 *intValue1 = UA_UInt32_new();
+    *intValue1 = 2000;
+    UA_DataValue *dataValue1 = UA_DataValue_new();
+    UA_Variant_setScalar(&dataValue1->value, intValue1, &UA_TYPES[UA_TYPES_UINT32]);
+    dataValue->hasValue = true;
+    dsfConfig1.field.variable.fieldNameAlias = UA_STRING("Published1 UInt32");
+    dsfConfig1.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    /* Set the value backend of the above create node to 'external value source' */
+    UA_ValueBackend valueBackend1;
+    valueBackend1.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+    valueBackend1.backend.external.value = &dataValue1;
+    valueBackend1.backend.external.callback.userWrite = externalDataWriteCallback;
+    valueBackend1.backend.external.callback.notificationRead = externalDataReadNotificationCallback;
+    UA_Server_setVariableNode_valueBackend(server, UA_NODEID_NUMERIC(1, 60001), valueBackend1);
+    dsfConfig1.field.variable.rtValueSource.rtInformationModelNode = true;
+    dsfConfig1.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 60001);
+    ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig1, NULL).result == UA_STATUSCODE_GOOD);
+
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
+    writerGroupConfig.publishingInterval = 100;
+    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.writerGroupId = 100;
+    writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+    UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
+    wgm->networkMessageContentMask = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                      (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    writerGroupConfig.messageSettings.content.decoded.data = wgm;
+    writerGroupConfig.messageSettings.content.decoded.type =
+            &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    ck_assert(UA_Server_addWriterGroup(server, connectionIdentifier, &writerGroupConfig, &writerGroupIdent) == UA_STATUSCODE_GOOD);
+    UA_UadpWriterGroupMessageDataType_delete(wgm);
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKeyPub};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKeyPub};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNoncePub};
+    UA_Server_setWriterGroupEncryptionKeys(server, writerGroupIdent, 1, sk, ek, kn);
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING("Test DataSetWriter");
+    dataSetWriterConfig.dataSetWriterId = 62541;
+    ck_assert(UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent) == UA_STATUSCODE_GOOD);
+
+
+    /* Reader Group */
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+    readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+    retVal =  UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
+                                       &readerGroupIdentifier);
+    // TODO security token not necessary for readergroup (extracted from security-header)
+    UA_Server_setReaderGroupEncryptionKeys(server, readerGroupIdentifier, 1, sk, ek, kn);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    /* Data Set Reader */
+    UA_DataSetReaderConfig readerConfig;
+    memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+    readerConfig.name = UA_STRING ("DataSetReader Test");
+    UA_UInt16 publisherIdentifier = 2234;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId    = 100;
+    readerConfig.dataSetWriterId  = 62541;
+    readerConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    readerConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE];
+    UA_UadpDataSetReaderMessageDataType *dataSetReaderMessage = UA_UadpDataSetReaderMessageDataType_new();
+    dataSetReaderMessage->networkMessageContentMask           = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    readerConfig.messageSettings.content.decoded.data = dataSetReaderMessage;
+    /* Setting up Meta data configuration in DataSetReader for DateTime DataType */
+    UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+    /* FilltestMetadata function in subscriber implementation */
+    UA_DataSetMetaDataType_init(pMetaData);
+    pMetaData->name = UA_STRING("DataSet Test");
+    /* Static definition of number of fields size to 1 to create one
+    targetVariable */
+    pMetaData->fieldsSize = 2;
+    pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
+                         &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+    /* UInt32 DataType */
+    UA_FieldMetaData_init(&pMetaData->fields[0]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_UINT32].typeId,
+                   &pMetaData->fields[0].dataType);
+    pMetaData->fields[0].builtInType = UA_NS0ID_UINT32;
+    pMetaData->fields[0].valueRank = -1; /* scalar */
+
+    UA_FieldMetaData_init(&pMetaData->fields[1]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_UINT32].typeId,
+                   &pMetaData->fields[1].dataType);
+    pMetaData->fields[1].builtInType = UA_NS0ID_UINT32;
+    pMetaData->fields[1].valueRank = -1; /* scalar */
+
+    /* Add Subscribed Variables */
+    UA_NodeId folderId;
+    UA_String folderName = readerConfig.dataSetMetaData.name;
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName;
+    if (folderName.length > 0) {
+        oAttr.displayName.locale = UA_STRING ("en-US");
+        oAttr.displayName.text = folderName;
+        folderBrowseName.namespaceIndex = 1;
+        folderBrowseName.name = folderName;
+      }
+    else {
+        oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
+        folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
+    }
+
+    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+                             folderBrowseName, UA_NODEID_NUMERIC (0,
+                             UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    /* Variable to subscribe data */
+    vAttr = UA_VariableAttributes_default;
+    vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
+    vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
+    vAttr.dataType    = UA_TYPES[UA_TYPES_UINT32].typeId;
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 60003),
+                                       folderId1,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed UInt32"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &subNodeId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    subValue        = UA_UInt32_new();
+    subDataValueRT  = UA_DataValue_new();
+    subDataValueRT->hasValue = UA_TRUE;
+    UA_Variant_setScalar(&subDataValueRT->value, subValue, &UA_TYPES[UA_TYPES_UINT32]);
+    /* Set the value backend of the above create node to 'external value source' */
+    valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+    valueBackend.backend.external.value = &subDataValueRT;
+    valueBackend.backend.external.callback.userWrite = externalDataWriteCallback;
+    valueBackend.backend.external.callback.notificationRead = externalDataReadNotificationCallback;
+    UA_Server_setVariableNode_valueBackend(server, subNodeId, valueBackend);
+
+    vAttr = UA_VariableAttributes_default;
+    vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed1 UInt32");
+    vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed1 UInt32");
+    vAttr.dataType    = UA_TYPES[UA_TYPES_UINT32].typeId;
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 60004),
+                                       folderId,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed1 UInt32"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &subNodeId1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    subValue1        = UA_UInt32_new();
+    subDataValueRT1  = UA_DataValue_new();
+    subDataValueRT1->hasValue = UA_TRUE;
+    UA_Variant_setScalar(&subDataValueRT1->value, subValue1, &UA_TYPES[UA_TYPES_UINT32]);
+    /* Set the value backend of the above create node to 'external value source' */
+    valueBackend1.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+    valueBackend1.backend.external.value = &subDataValueRT1;
+    valueBackend1.backend.external.callback.userWrite = externalDataWriteCallback;
+    valueBackend1.backend.external.callback.notificationRead = externalDataReadNotificationCallback;
+    UA_Server_setVariableNode_valueBackend(server, subNodeId1, valueBackend1);
+
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize = 2;
+    UA_FieldTargetVariable *targetVars = (UA_FieldTargetVariable*) UA_calloc(2, sizeof(UA_FieldTargetVariable));
+    UA_FieldTargetDataType_init(&targetVars[0].targetVariable);
+    targetVars[0].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+    targetVars[0].targetVariable.targetNodeId = UA_NODEID_NUMERIC(1, 60003);
+    UA_FieldTargetDataType_init(&targetVars[1].targetVariable);
+    targetVars[1].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+    targetVars[1].targetVariable.targetNodeId = UA_NODEID_NUMERIC(1, 60004);
+    readerConfig.subscribedDataSetType = UA_PUBSUB_SDS_TARGET;
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables = targetVars;
+
+    retVal = UA_Server_addDataSetReader(server, readerGroupIdentifier, &readerConfig,
+                                        &readerIdentifier);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    UA_UadpDataSetReaderMessageDataType_delete(dataSetReaderMessage);
+    UA_FieldTargetDataType_clear(&targetVars[0].targetVariable);
+    UA_FieldTargetDataType_clear(&targetVars[1].targetVariable);
+    UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
+    UA_free(readerConfig.dataSetMetaData.fields);
+
+    ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    ck_assert(UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
+    ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
+
+    ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+
+    UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
+    receiveSingleMessageRT(connection, readerGroup);
+   /* Read data received by the Subscriber */
+    UA_Variant *subscribedNodeData = UA_Variant_new();
+    retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 60003), subscribedNodeData);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    ck_assert((*(UA_UInt32 *)subscribedNodeData->data) == 1000);
+    UA_Variant_clear(subscribedNodeData);
+    UA_free(subscribedNodeData);
+   /* Read data received by the Subscriber */
+    UA_Variant *subscribedNodeData1 = UA_Variant_new();
+    retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 60004), subscribedNodeData1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    ck_assert((*(UA_UInt32 *)subscribedNodeData1->data) == 2000);
+    UA_Variant_clear(subscribedNodeData1);
+    UA_free(subscribedNodeData1);
+    ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    UA_Server_deleteNode(server, pubNodeId1, UA_TRUE);
+    UA_NodeId_clear(&pubNodeId);
+    UA_Server_deleteNode(server, pubNodeId1, UA_TRUE);
+    UA_NodeId_clear(&pubNodeId1);
+    UA_Server_deleteNode(server, subNodeId, UA_TRUE);
+    UA_NodeId_clear(&subNodeId);
+    UA_Server_deleteNode(server, subNodeId1, UA_TRUE);
+    UA_NodeId_clear(&subNodeId1);
+    UA_free(subValue);
+    UA_free(subDataValueRT);
+    UA_free(subValue1);
+    UA_free(subDataValueRT1);
+    /* Free external data source */
+    UA_free(intValue);
+    UA_free(dataValue);
+    /* Free external data source */
+    UA_free(intValue1);
+    UA_free(dataValue1);
+} END_TEST
+
+int main(void) {
+    TCase *tc_pubsub_encryption_rt = tcase_create("PubSub encryption RT with fixed offsets");
+    tcase_add_checked_fixture(tc_pubsub_encryption_rt, setup, teardown);
+    tcase_add_test(tc_pubsub_encryption_rt, SetupInvalidPubSubConfig);
+    tcase_add_test(tc_pubsub_encryption_rt, PublishAndSubscribeSingleFieldWithFixedOffsets);
+    tcase_add_test(tc_pubsub_encryption_rt, PublishPDSWithMultipleFieldsAndSubscribeFixedSize);
+
+    Suite *s = suite_create("PubSub encryption RT configuration levels");
+    suite_add_tcase(s, tc_pubsub_encryption_rt);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/server/check_nodestore.c b/tests/server/check_nodestore.c
index b8762748e6b..04de9158915 100644
--- a/tests/server/check_nodestore.c
+++ b/tests/server/check_nodestore.c
@@ -5,6 +5,8 @@
 #include <open62541/types.h>
 #include <open62541/util.h>
 #include <open62541/plugin/nodestore_default.h>
+#include "open62541/plugin/nodestore.h"
+#include "open62541/types_generated.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -79,7 +81,8 @@ START_TEST(findNodeInUA_NodeStoreWithSingleEntry) {
     UA_Node* n1 = createNode(0,2253);
     ns.insertNode(ns.context, n1, NULL);
     UA_NodeId in1 = UA_NODEID_NUMERIC(0,2253);
-    const UA_Node* nr = ns.getNode(ns.context, &in1);
+    const UA_Node* nr = ns.getNode(ns.context, &in1, ~(UA_UInt32)0,
+                                   UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
     ck_assert_uint_eq((uintptr_t)n1, (uintptr_t)nr);
     ns.releaseNode(ns.context, nr);
 }
@@ -89,7 +92,8 @@ START_TEST(failToFindNodeInOtherUA_NodeStore) {
     UA_Node* n1 = createNode(0,2255);
     ns.insertNode(ns.context, n1, NULL);
     UA_NodeId in1 = UA_NODEID_NUMERIC(1, 2255);
-    const UA_Node* nr = ns.getNode(ns.context, &in1);
+    const UA_Node* nr = ns.getNode(ns.context, &in1, ~(UA_UInt32)0,
+                                   UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
     ck_assert_uint_eq((uintptr_t)nr, 0);
 }
 END_TEST
@@ -109,7 +113,8 @@ START_TEST(findNodeInUA_NodeStoreWithSeveralEntries) {
     ns.insertNode(ns.context, n6, NULL);
 
     UA_NodeId in3 = UA_NODEID_NUMERIC(0, 2257);
-    const UA_Node* nr = ns.getNode(ns.context, &in3);
+    const UA_Node* nr = ns.getNode(ns.context, &in3, ~(UA_UInt32)0,
+                                   UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
     ck_assert_uint_eq((uintptr_t)nr, (uintptr_t)n3);
     ns.releaseNode(ns.context, nr);
 }
@@ -144,7 +149,8 @@ START_TEST(findNodeInExpandedNamespace) {
     }
     // when
     UA_Node *n2 = createNode(0,25);
-    const UA_Node* nr = ns.getNode(ns.context, &n2->head.nodeId);
+    const UA_Node* nr = ns.getNode(ns.context, &n2->head.nodeId, ~(UA_UInt32)0,
+                                   UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
     ck_assert_int_eq(nr->head.nodeId.identifier.numeric, n2->head.nodeId.identifier.numeric);
     ns.releaseNode(ns.context, nr);
     ns.deleteNode(ns.context, n2);
@@ -179,7 +185,8 @@ START_TEST(failToFindNonExistentNodeInUA_NodeStoreWithSeveralEntries) {
     ns.insertNode(ns.context, n5, NULL);
 
     UA_NodeId id = UA_NODEID_NUMERIC(0, 12);
-    const UA_Node* nr = ns.getNode(ns.context, &id);
+    const UA_Node* nr = ns.getNode(ns.context, &id, ~(UA_UInt32)0,
+                                   UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
     ck_assert_uint_eq((uintptr_t)nr, 0);
 }
 END_TEST
@@ -203,7 +210,8 @@ static void *profileGetThread(void *arg) {
     for(UA_Int32 x = 0; x<test->rounds; x++) {
         for(UA_Int32 i=test->min_val; i<max_val; i++) {
             id.identifier.numeric = i+1;
-            const UA_Node *n = ns.getNode(ns.context, &id);
+            const UA_Node* n = ns.getNode(ns.context, &id, ~(UA_UInt32)0,
+                                          UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
             ns.releaseNode(ns.context, n);
         }
     }
@@ -238,7 +246,8 @@ START_TEST(profileGetDelete) {
     UA_NodeId id = UA_NODEID_NULL;
     for(size_t i = 0; i < N; i++) {
         id.identifier.numeric = (UA_UInt32)i+1;
-        const UA_Node *node = ns.getNode(ns.context, &id);
+        const UA_Node *node = ns.getNode(ns.context, &id, ~(UA_UInt32)0,
+                                         UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
         ns.releaseNode(ns.context, node);
     }
     end = clock();
diff --git a/tests/server/check_server_historical_data_circular.c b/tests/server/check_server_historical_data_circular.c
new file mode 100644
index 00000000000..5a40e232d97
--- /dev/null
+++ b/tests/server/check_server_historical_data_circular.c
@@ -0,0 +1,294 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) luibass92 <luibass92@live.it> (Author: Luigi Bassetta)
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/historydata/history_data_backend.h>
+#include <open62541/plugin/historydata/history_data_backend_memory.h>
+#include <open62541/plugin/historydata/history_data_gathering_default.h>
+#include <open62541/plugin/historydata/history_database_default.h>
+#include <open62541/plugin/historydatabase.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include "client/ua_client_internal.h"
+#include "server/ua_server_internal.h"
+
+#include <check.h>
+
+#include "testing_clock.h"
+#include "testing_networklayers.h"
+#include "thread_wrapper.h"
+#include <stddef.h>
+
+static UA_Server *server;
+#ifdef UA_ENABLE_HISTORIZING
+static UA_HistoryDataGathering *gathering;
+#endif
+static UA_Boolean running;
+static THREAD_HANDLE server_thread;
+static MUTEX_HANDLE serverMutex;
+
+static UA_Client *client;
+static UA_NodeId parentNodeId;
+static UA_NodeId parentReferenceNodeId;
+static UA_NodeId outNodeId;
+
+static void serverMutexLock(void) {
+    if (!(MUTEX_LOCK(serverMutex))) {
+        fprintf(stderr, "Mutex cannot be locked.\n");
+        exit(1);
+    }
+}
+
+static void serverMutexUnlock(void) {
+    if (!(MUTEX_UNLOCK(serverMutex))) {
+        fprintf(stderr, "Mutex cannot be unlocked.\n");
+        exit(1);
+    }
+}
+
+THREAD_CALLBACK(serverloop) {
+    while(running) {
+        serverMutexLock();
+        UA_Server_run_iterate(server, false);
+        serverMutexUnlock();
+    }
+    return 0;
+}
+
+static void setup(void) {
+    if (!(MUTEX_INIT(serverMutex))) {
+        fprintf(stderr, "Server mutex was not created correctly.\n");
+        exit(1);
+    }
+    running = true;
+
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+
+#ifdef UA_ENABLE_HISTORIZING
+    gathering = (UA_HistoryDataGathering*)UA_calloc(1, sizeof(UA_HistoryDataGathering));
+    *gathering = UA_HistoryDataGathering_Circular(1);
+    config->historyDatabase = UA_HistoryDatabase_default(*gathering);
+#endif
+
+    UA_StatusCode retval = UA_Server_run_startup(server);
+    if(retval != UA_STATUSCODE_GOOD) {
+        fprintf(stderr, "Error while calling Server_run_startup. %s\n", UA_StatusCode_name(retval));
+        UA_Server_delete(server);
+        exit(1);
+    }
+
+    THREAD_CREATE(server_thread, serverloop);
+    /* Define the attribute of the uint32 variable node */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    UA_UInt32 myUint32 = 40;
+    UA_Variant_setScalar(&attr.value, &myUint32, &UA_TYPES[UA_TYPES_UINT32]);
+    attr.description = UA_LOCALIZEDTEXT("en-US","the answer");
+    attr.displayName = UA_LOCALIZEDTEXT("en-US","the answer");
+    attr.dataType = UA_TYPES[UA_TYPES_UINT32].typeId;
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD | UA_ACCESSLEVELMASK_HISTORYWRITE;
+    attr.historizing = true;
+
+    /* Add the variable node to the information model */
+    UA_NodeId uint32NodeId = UA_NODEID_STRING(1, "the.answer");
+    UA_QualifiedName uint32Name = UA_QUALIFIEDNAME(1, "the answer");
+    parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_NodeId_init(&outNodeId);
+    retval = UA_Server_addVariableNode(server, uint32NodeId, parentNodeId,
+                                       parentReferenceNodeId, uint32Name,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                       attr, NULL, &outNodeId);
+    if (retval != UA_STATUSCODE_GOOD) {
+        fprintf(stderr, "Error adding variable node. %s\n", UA_StatusCode_name(retval));
+        UA_Server_delete(server);
+        exit(1);
+    }
+
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    if (retval != UA_STATUSCODE_GOOD) {
+        fprintf(stderr, "Client can not connect to opc.tcp://localhost:4840. %s\n", UA_StatusCode_name(retval));
+        UA_Client_delete(client);
+        UA_Server_delete(server);
+        exit(1);
+    }
+
+    UA_Client_recv = client->connection.recv;
+    client->connection.recv = UA_Client_recvTesting;
+}
+
+static void teardown(void) {
+    /* cleanup */
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_NodeId_clear(&parentNodeId);
+    UA_NodeId_clear(&parentReferenceNodeId);
+    UA_NodeId_clear(&outNodeId);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+#ifdef UA_ENABLE_HISTORIZING
+    UA_free(gathering);
+#endif
+    if (!MUTEX_DESTROY(serverMutex)) {
+        fprintf(stderr, "Server mutex was not destroyed correctly.\n");
+        exit(1);
+    }
+}
+
+#ifdef UA_ENABLE_HISTORIZING
+
+#include <stdio.h>
+#include "ua_session.h"
+
+static UA_StatusCode
+setUInt32(UA_Client *thisClient, UA_NodeId node, UA_UInt32 value)
+{
+    UA_Variant variant;
+    UA_Variant_setScalar(&variant, &value, &UA_TYPES[UA_TYPES_UINT32]);
+    return UA_Client_writeValueAttribute(thisClient, node, &variant);
+}
+
+
+void
+Service_HistoryRead(UA_Server *server, UA_Session *session,
+                    const UA_HistoryReadRequest *request,
+                    UA_HistoryReadResponse *response);
+
+static void
+requestHistory(UA_DateTime start,
+               UA_DateTime end,
+               UA_HistoryReadResponse * response,
+               UA_UInt32 numValuesPerNode,
+               UA_Boolean returnBounds,
+               UA_ByteString *continuationPoint)
+{
+    UA_ReadRawModifiedDetails *details = UA_ReadRawModifiedDetails_new();
+    details->startTime = start;
+    details->endTime = end;
+    details->isReadModified = false;
+    details->numValuesPerNode = numValuesPerNode;
+    details->returnBounds = returnBounds;
+
+    UA_HistoryReadValueId *valueId = UA_HistoryReadValueId_new();
+    UA_NodeId_copy(&outNodeId, &valueId->nodeId);
+    if (continuationPoint)
+        UA_ByteString_copy(continuationPoint, &valueId->continuationPoint);
+
+    UA_HistoryReadRequest request;
+    UA_HistoryReadRequest_init(&request);
+    request.historyReadDetails.encoding = UA_EXTENSIONOBJECT_DECODED;
+    request.historyReadDetails.content.decoded.type = &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS];
+    request.historyReadDetails.content.decoded.data = details;
+
+    request.timestampsToReturn = UA_TIMESTAMPSTORETURN_BOTH;
+
+    request.nodesToReadSize = 1;
+    request.nodesToRead = valueId;
+
+    UA_LOCK(&server->serviceMutex);
+    Service_HistoryRead(server, &server->adminSession, &request, response);
+    UA_UNLOCK(&server->serviceMutex);
+    UA_HistoryReadRequest_clear(&request);
+}
+
+
+START_TEST(Server_HistorizingStrategyValueSet)
+{
+    // init to a defined value
+    UA_StatusCode retval = setUInt32(client, outNodeId, 43);
+    ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+
+    // set a data backend
+    UA_HistorizingNodeIdSettings setting;
+    setting.historizingBackend = UA_HistoryDataBackend_Memory_Circular(3, 10);
+    setting.maxHistoryDataResponseSize = 10;
+    setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_VALUESET;
+    serverMutexLock();
+    retval = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
+    serverMutexUnlock();
+    ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+
+    // Fill the data overcoming the buffer size and starting to write new values replacing the old ones.
+    // The circular buffer size is 10, the number of elements historized is 15 (from 0 to 14). So the final buffer will be:
+    //
+    //                  | 10 | 11 | 12 | 13 | 14 | 5 | 6 | 7 | 8 | 9 |
+    //
+    UA_fakeSleep(100);
+    UA_DateTime start = UA_DateTime_now();
+    UA_fakeSleep(100);
+    for (UA_UInt32 i = 0; i < 15; ++i) {
+        retval = setUInt32(client, outNodeId, i);
+        ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+        UA_fakeSleep(100);
+    }
+    UA_DateTime end = UA_DateTime_now();
+
+    // request
+    UA_HistoryReadResponse response;
+    UA_HistoryReadResponse_init(&response);
+    requestHistory(start, end, &response, 0, false, NULL);
+
+    // test the response
+    ck_assert_str_eq(UA_StatusCode_name(response.responseHeader.serviceResult), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+    ck_assert_uint_eq(response.resultsSize, 1);
+    for (size_t i = 0; i < response.resultsSize; ++i) {
+        ck_assert_str_eq(UA_StatusCode_name(response.results[i].statusCode), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+        ck_assert_uint_eq(response.results[i].historyData.encoding, UA_EXTENSIONOBJECT_DECODED);
+        ck_assert(response.results[i].historyData.content.decoded.type == &UA_TYPES[UA_TYPES_HISTORYDATA]);
+        UA_HistoryData * data = (UA_HistoryData *)response.results[i].historyData.content.decoded.data;
+        ck_assert(data->dataValuesSize > 0);
+        for (size_t j = 0; j < data->dataValuesSize; ++j) {
+            ck_assert(data->dataValues[j].sourceTimestamp >= start && data->dataValues[j].sourceTimestamp < end);
+            ck_assert_uint_eq(data->dataValues[j].hasSourceTimestamp, true);
+            ck_assert_str_eq(UA_StatusCode_name(data->dataValues[j].status), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+            ck_assert_uint_eq(data->dataValues[j].hasValue, true);
+            ck_assert(data->dataValues[j].value.type == &UA_TYPES[UA_TYPES_UINT32]);
+            UA_UInt32 * value = (UA_UInt32 *)data->dataValues[j].value.data;
+            if(j >= 5)
+                ck_assert_uint_eq(*value, j);
+            else
+                ck_assert_uint_eq(*value, j + 10);
+        }
+    }
+    UA_HistoryReadResponse_clear(&response);
+    UA_HistoryDataBackend_Memory_clear(&setting.historizingBackend);
+}
+END_TEST
+
+#endif /*UA_ENABLE_HISTORIZING*/
+
+static Suite* testSuite_Client(void)
+{
+    Suite *s = suite_create("Server Historical Data");
+    TCase *tc_server = tcase_create("Server Historical Data Circular");
+    tcase_add_checked_fixture(tc_server, setup, teardown);
+#ifdef UA_ENABLE_HISTORIZING
+    tcase_add_test(tc_server, Server_HistorizingStrategyValueSet);
+#endif /* UA_ENABLE_HISTORIZING */
+    suite_add_tcase(s, tc_server);
+
+    return s;
+}
+
+int main(void)
+{
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/server/check_server_readspeed.c b/tests/server/check_server_readspeed.c
index 5afd4e611e7..b75b8aff977 100644
--- a/tests/server/check_server_readspeed.c
+++ b/tests/server/check_server_readspeed.c
@@ -24,10 +24,7 @@ static UA_Server *server;
 static UA_NodeId readNodeIds[READNODES];
 
 static void setup(void) {
-    UA_ServerConfig config;
-    memset(&config, 0, sizeof(UA_ServerConfig));
-    UA_Nodestore_HashMap(&config.nodestore);
-    server = UA_Server_newWithConfig(&config);
+    server = UA_Server_new();
 }
 
 static void teardown(void) {
diff --git a/tools/ci.sh b/tools/ci.sh
index cb27c189652..58267b73aaa 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -150,6 +150,28 @@ function unit_tests {
     make test ARGS="-V"
 }
 
+function unit_tests_32 {
+    mkdir -p build; cd build; rm -rf *
+    cmake -DCMAKE_BUILD_TYPE=Debug \
+          -DUA_BUILD_EXAMPLES=ON \
+          -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_DISCOVERY=ON \
+          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
+          -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
+          -DUA_ENABLE_HISTORIZING=ON \
+          -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_PUBSUB=ON \
+          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
+          -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_FORCE_32BIT=ON \
+          ..
+          #-DUA_ENABLE_PUBSUB_ETH_UADP=ON \ # TODO: Enable this
+    make ${MAKEOPTS}
+    set_capabilities
+    make test ARGS="-V"
+}
+
 function unit_tests_mt {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
@@ -210,6 +232,34 @@ function unit_tests_encryption_mbedtls_pubsub {
     make test ARGS="-V"
 }
 
+##########################################
+# Build and Run Unit Tests with Coverage #
+##########################################
+
+function unit_tests_with_coverage {
+    mkdir -p build; cd build; rm -rf *
+    cmake -DCMAKE_BUILD_TYPE=Debug \
+          -DUA_BUILD_EXAMPLES=ON \
+          -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_COVERAGE=ON \
+          -DUA_ENABLE_DISCOVERY=ON \
+          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
+          -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
+          -DUA_ENABLE_HISTORIZING=ON \
+          -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_PUBSUB=ON \
+          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
+          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
+          -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_ENABLE_ENCRYPTION=MBEDTLS \
+          ..
+    make ${MAKEOPTS}
+    set_capabilities
+    make test ARGS="-V"
+    make gcov
+}
+
 ##########################################
 # Build and Run Unit Tests with Valgrind #
 ##########################################
diff --git a/tools/cmake/FindCheck.cmake b/tools/cmake/FindCheck.cmake
index ed410c16b83..5220315bcde 100644
--- a/tools/cmake/FindCheck.cmake
+++ b/tools/cmake/FindCheck.cmake
@@ -17,7 +17,7 @@
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 
-INCLUDE( FindPkgConfig )
+find_package(PkgConfig REQUIRED)
 
 # Take care about check.pc settings
 PKG_SEARCH_MODULE( CHECK check )
diff --git a/tools/cmake/FindGcov.cmake b/tools/cmake/FindGcov.cmake
new file mode 100644
index 00000000000..db03e534d00
--- /dev/null
+++ b/tools/cmake/FindGcov.cmake
@@ -0,0 +1,162 @@
+# This file is part of CMake-codecov.
+#
+# Copyright (c)
+#   2015-2020 RWTH Aachen University, Federal Republic of Germany
+#
+# See the LICENSE file in the package base directory for details
+#
+# Written by Alexander Haase, alexander.haase@rwth-aachen.de
+#
+
+
+# include required Modules
+include(FindPackageHandleStandardArgs)
+
+
+# Search for gcov binary.
+set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
+set(CMAKE_REQUIRED_QUIET ${codecov_FIND_QUIETLY})
+
+get_property(ENABLED_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
+foreach (LANG ${ENABLED_LANGUAGES})
+	# Gcov evaluation is dependent on the used compiler. Check gcov support for
+	# each compiler that is used. If gcov binary was already found for this
+	# compiler, do not try to find it again.
+	if (NOT GCOV_${CMAKE_${LANG}_COMPILER_ID}_BIN)
+		get_filename_component(COMPILER_PATH "${CMAKE_${LANG}_COMPILER}" PATH)
+
+		if ("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "GNU")
+			# Some distributions like OSX (homebrew) ship gcov with the compiler
+			# version appended as gcov-x. To find this binary we'll build the
+			# suggested binary name with the compiler version.
+			string(REGEX MATCH "^[0-9]+" GCC_VERSION
+				"${CMAKE_${LANG}_COMPILER_VERSION}")
+
+			find_program(GCOV_BIN NAMES gcov-${GCC_VERSION} gcov
+				HINTS ${COMPILER_PATH})
+
+		elseif ("${CMAKE_${LANG}_COMPILER_ID}" MATCHES "^(Apple)?Clang$")
+			# Some distributions like Debian ship llvm-cov with the compiler
+			# version appended as llvm-cov-x.y. To find this binary we'll build
+			# the suggested binary name with the compiler version.
+			string(REGEX MATCH "^[0-9]+.[0-9]+" LLVM_VERSION
+				"${CMAKE_${LANG}_COMPILER_VERSION}")
+
+			# llvm-cov prior version 3.5 seems to be not working with coverage
+			# evaluation tools, but these versions are compatible with the gcc
+			# gcov tool.
+			if(LLVM_VERSION VERSION_GREATER 3.4)
+				find_program(LLVM_COV_BIN NAMES "llvm-cov-${LLVM_VERSION}"
+					"llvm-cov" HINTS ${COMPILER_PATH})
+				mark_as_advanced(LLVM_COV_BIN)
+
+				if (LLVM_COV_BIN)
+					find_program(LLVM_COV_WRAPPER "llvm-cov-wrapper" PATHS
+						${CMAKE_MODULE_PATH})
+					if (LLVM_COV_WRAPPER)
+						set(GCOV_BIN "${LLVM_COV_WRAPPER}" CACHE FILEPATH "")
+
+						# set additional parameters
+						set(GCOV_${CMAKE_${LANG}_COMPILER_ID}_ENV
+							"LLVM_COV_BIN=${LLVM_COV_BIN}" CACHE STRING
+							"Environment variables for llvm-cov-wrapper.")
+						mark_as_advanced(GCOV_${CMAKE_${LANG}_COMPILER_ID}_ENV)
+					endif ()
+				endif ()
+			endif ()
+
+			if (NOT GCOV_BIN)
+				# Fall back to gcov binary if llvm-cov was not found or is
+				# incompatible. This is the default on OSX, but may crash on
+				# recent Linux versions.
+				find_program(GCOV_BIN gcov HINTS ${COMPILER_PATH})
+			endif ()
+		endif ()
+
+
+		if (GCOV_BIN)
+			set(GCOV_${CMAKE_${LANG}_COMPILER_ID}_BIN "${GCOV_BIN}" CACHE STRING
+				"${LANG} gcov binary.")
+
+			if (NOT CMAKE_REQUIRED_QUIET)
+				message("-- Found gcov evaluation for "
+				"${CMAKE_${LANG}_COMPILER_ID}: ${GCOV_BIN}")
+			endif()
+
+			unset(GCOV_BIN CACHE)
+		endif ()
+	endif ()
+endforeach ()
+
+
+
+
+# Add a new global target for all gcov targets. This target could be used to
+# generate the gcov files for the whole project instead of calling <TARGET>-gcov
+# for each target.
+if (NOT TARGET gcov)
+	add_custom_target(gcov)
+endif (NOT TARGET gcov)
+
+
+
+# This function will add gcov evaluation for target <TNAME>. Only sources of
+# this target will be evaluated and no dependencies will be added. It will call
+# Gcov on any source file of <TNAME> once and store the gcov file in the same
+# directory.
+function (add_gcov_target TNAME)
+	get_target_property(TBIN_DIR ${TNAME} BINARY_DIR)
+	set(TDIR ${TBIN_DIR}/CMakeFiles/${TNAME}.dir)
+
+	# We don't have to check, if the target has support for coverage, thus this
+	# will be checked by add_coverage_target in Findcoverage.cmake. Instead we
+	# have to determine which gcov binary to use.
+	get_target_property(TSOURCES ${TNAME} SOURCES)
+	set(SOURCES "")
+	set(TCOMPILER "")
+	foreach (FILE ${TSOURCES})
+		codecov_path_of_source(${FILE} FILE)
+		if (NOT "${FILE}" STREQUAL "")
+			codecov_lang_of_source(${FILE} LANG)
+			if (NOT "${LANG}" STREQUAL "")
+				list(APPEND SOURCES "${FILE}")
+				set(TCOMPILER ${CMAKE_${LANG}_COMPILER_ID})
+			endif ()
+		endif ()
+	endforeach ()
+
+	# If no gcov binary was found, coverage data can't be evaluated.
+	if (NOT GCOV_${TCOMPILER}_BIN)
+		message(WARNING "No coverage evaluation binary found for ${TCOMPILER}.")
+		return()
+	endif ()
+
+	set(GCOV_BIN "${GCOV_${TCOMPILER}_BIN}")
+	set(GCOV_ENV "${GCOV_${TCOMPILER}_ENV}")
+
+
+	set(BUFFER "")
+	set(NULL_DEVICE "/dev/null")
+	if(WIN32)
+		set(NULL_DEVICE "NUL")
+	endif()
+	foreach(FILE ${SOURCES})
+		get_filename_component(FILE_PATH "${TDIR}/${FILE}" PATH)
+
+		# call gcov
+		add_custom_command(OUTPUT ${TDIR}/${FILE}.gcov
+			COMMAND ${GCOV_ENV} ${GCOV_BIN} -p ${TDIR}/${FILE}.gcno > ${NULL_DEVICE}
+			DEPENDS ${TNAME} ${TDIR}/${FILE}.gcno
+			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+		)
+
+		list(APPEND BUFFER ${TDIR}/${FILE}.gcov)
+	endforeach()
+
+
+	# add target for gcov evaluation of <TNAME>
+	add_custom_target(${TNAME}-gcov DEPENDS ${BUFFER})
+
+	# add evaluation target to the global gcov target.
+	add_dependencies(gcov ${TNAME}-gcov)
+endfunction (add_gcov_target)
diff --git a/tools/cmake/Findcodecov.cmake b/tools/cmake/Findcodecov.cmake
new file mode 100644
index 00000000000..9fe2485623f
--- /dev/null
+++ b/tools/cmake/Findcodecov.cmake
@@ -0,0 +1,265 @@
+# This file is part of CMake-codecov.
+#
+# Copyright (c)
+#   2015-2020 RWTH Aachen University, Federal Republic of Germany
+#
+# See the LICENSE file in the package base directory for details
+#
+# Written by Alexander Haase, alexander.haase@rwth-aachen.de
+#
+
+set(COVERAGE_FLAG_CANDIDATES
+	# gcc and clang
+	"-O0 -g -fprofile-arcs -ftest-coverage"
+
+	# gcc and clang fallback
+	"-O0 -g --coverage"
+)
+
+
+# Add coverage support for target ${TNAME} and register target for coverage
+# evaluation. If coverage is disabled or not supported, this function will
+# simply do nothing.
+#
+# Note: This function is only a wrapper to define this function always, even if
+#   coverage is not supported by the compiler or disabled. This function must
+#   be defined here, because the module will be exited, if there is no coverage
+#   support by the compiler or it is disabled by the user.
+function (add_coverage TNAME)
+	# only add coverage for target, if coverage is support and enabled.
+	if (ENABLE_COVERAGE)
+		foreach (TNAME ${ARGV})
+			add_coverage_target(${TNAME})
+		endforeach ()
+	endif ()
+endfunction (add_coverage)
+
+
+# Add global target to gather coverage information after all targets have been
+# added. Other evaluation functions could be added here, after checks for the
+# specific module have been passed.
+#
+# Note: This function is only a wrapper to define this function always, even if
+#   coverage is not supported by the compiler or disabled. This function must
+#   be defined here, because the module will be exited, if there is no coverage
+#   support by the compiler or it is disabled by the user.
+function (coverage_evaluate)
+	# add lcov evaluation
+	if (LCOV_FOUND)
+		lcov_capture_initial()
+		lcov_capture()
+	endif (LCOV_FOUND)
+endfunction ()
+
+
+# Exit this module, if coverage is disabled. add_coverage is defined before this
+# return, so this module can be exited now safely without breaking any build-
+# scripts.
+if (NOT ENABLE_COVERAGE)
+	return()
+endif ()
+
+
+
+
+# Find the required flags foreach language.
+set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
+set(CMAKE_REQUIRED_QUIET ${codecov_FIND_QUIETLY})
+
+get_property(ENABLED_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
+foreach (LANG ${ENABLED_LANGUAGES})
+	if (NOT ${LANG} MATCHES "^(C|CXX|Fortran)$")
+		message(STATUS "Skipping coverage for unsupported language: ${LANG}")
+		continue()
+	endif ()
+
+	# Coverage flags are not dependent on language, but the used compiler. So
+	# instead of searching flags foreach language, search flags foreach compiler
+	# used.
+	set(COMPILER ${CMAKE_${LANG}_COMPILER_ID})
+	if (NOT COVERAGE_${COMPILER}_FLAGS)
+		foreach (FLAG ${COVERAGE_FLAG_CANDIDATES})
+			if(NOT CMAKE_REQUIRED_QUIET)
+				message(STATUS "Try ${COMPILER} code coverage flag = [${FLAG}]")
+			endif()
+
+			set(CMAKE_REQUIRED_FLAGS "${FLAG}")
+			unset(COVERAGE_FLAG_DETECTED CACHE)
+
+			if (${LANG} STREQUAL "C")
+				include(CheckCCompilerFlag)
+				check_c_compiler_flag("${FLAG}" COVERAGE_FLAG_DETECTED)
+
+			elseif (${LANG} STREQUAL "CXX")
+				include(CheckCXXCompilerFlag)
+				check_cxx_compiler_flag("${FLAG}" COVERAGE_FLAG_DETECTED)
+
+			elseif (${LANG} STREQUAL "Fortran")
+				# CheckFortranCompilerFlag was introduced in CMake 3.x. To be
+				# compatible with older Cmake versions, we will check if this
+				# module is present before we use it. Otherwise we will define
+				# Fortran coverage support as not available.
+				include(CheckFortranCompilerFlag OPTIONAL
+					RESULT_VARIABLE INCLUDED)
+				if (INCLUDED)
+					check_fortran_compiler_flag("${FLAG}"
+						COVERAGE_FLAG_DETECTED)
+				elseif (NOT CMAKE_REQUIRED_QUIET)
+					message("-- Performing Test COVERAGE_FLAG_DETECTED")
+					message("-- Performing Test COVERAGE_FLAG_DETECTED - Failed"
+						" (Check not supported)")
+				endif ()
+			endif()
+
+			if (COVERAGE_FLAG_DETECTED)
+				set(COVERAGE_${COMPILER}_FLAGS "${FLAG}"
+					CACHE STRING "${COMPILER} flags for code coverage.")
+				mark_as_advanced(COVERAGE_${COMPILER}_FLAGS)
+				break()
+			else ()
+				message(WARNING "Code coverage is not available for ${COMPILER}"
+				        " compiler. Targets using this compiler will be "
+				        "compiled without it.")
+			endif ()
+		endforeach ()
+	endif ()
+endforeach ()
+
+set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
+
+
+
+
+# Helper function to get the language of a source file.
+function (codecov_lang_of_source FILE RETURN_VAR)
+	# Usually, only the last extension of the file should be checked, to avoid
+	# template files (i.e. *.t.cpp) are checked with the full file extension.
+	# However, this feature requires CMake 3.14 or later.
+	set(EXT_COMP "LAST_EXT")
+	if(${CMAKE_VERSION} VERSION_LESS "3.14.0")
+		set(EXT_COMP "EXT")
+	endif()
+
+	get_filename_component(FILE_EXT "${FILE}" ${EXT_COMP})
+	string(TOLOWER "${FILE_EXT}" FILE_EXT)
+	string(SUBSTRING "${FILE_EXT}" 1 -1 FILE_EXT)
+
+	get_property(ENABLED_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
+	foreach (LANG ${ENABLED_LANGUAGES})
+		list(FIND CMAKE_${LANG}_SOURCE_FILE_EXTENSIONS "${FILE_EXT}" TEMP)
+		if (NOT ${TEMP} EQUAL -1)
+			set(${RETURN_VAR} "${LANG}" PARENT_SCOPE)
+			return()
+		endif ()
+	endforeach()
+
+	set(${RETURN_VAR} "" PARENT_SCOPE)
+endfunction ()
+
+
+# Helper function to get the relative path of the source file destination path.
+# This path is needed by FindGcov and FindLcov cmake files to locate the
+# captured data.
+function (codecov_path_of_source FILE RETURN_VAR)
+	string(REGEX MATCH "TARGET_OBJECTS:([^ >]+)" _source ${FILE})
+
+	# If expression was found, SOURCEFILE is a generator-expression for an
+	# object library. Currently we found no way to call this function automatic
+	# for the referenced target, so it must be called in the directoryso of the
+	# object library definition.
+	if (NOT "${_source}" STREQUAL "")
+		set(${RETURN_VAR} "" PARENT_SCOPE)
+		return()
+	endif ()
+
+
+	string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" FILE "${FILE}")
+	if(IS_ABSOLUTE ${FILE})
+		file(RELATIVE_PATH FILE ${CMAKE_CURRENT_SOURCE_DIR} ${FILE})
+	endif()
+
+	# get the right path for file
+	string(REPLACE ".." "__" PATH "${FILE}")
+
+	set(${RETURN_VAR} "${PATH}" PARENT_SCOPE)
+endfunction()
+
+
+
+
+# Add coverage support for target ${TNAME} and register target for coverage
+# evaluation.
+function(add_coverage_target TNAME)
+	# Check if all sources for target use the same compiler. If a target uses
+	# e.g. C and Fortran mixed and uses different compilers (e.g. clang and
+	# gfortran) this can trigger huge problems, because different compilers may
+	# use different implementations for code coverage.
+	get_target_property(TSOURCES ${TNAME} SOURCES)
+	set(TARGET_COMPILER "")
+	set(ADDITIONAL_FILES "")
+	foreach (FILE ${TSOURCES})
+		# If expression was found, FILE is a generator-expression for an object
+		# library. Object libraries will be ignored.
+		string(REGEX MATCH "TARGET_OBJECTS:([^ >]+)" _file ${FILE})
+		if ("${_file}" STREQUAL "")
+			codecov_lang_of_source(${FILE} LANG)
+			if (LANG)
+				list(APPEND TARGET_COMPILER ${CMAKE_${LANG}_COMPILER_ID})
+
+				list(APPEND ADDITIONAL_FILES "${FILE}.gcno")
+				list(APPEND ADDITIONAL_FILES "${FILE}.gcda")
+			endif ()
+		endif ()
+	endforeach ()
+
+	list(REMOVE_DUPLICATES TARGET_COMPILER)
+	list(LENGTH TARGET_COMPILER NUM_COMPILERS)
+
+	if (NUM_COMPILERS GREATER 1)
+		message(WARNING "Can't use code coverage for target ${TNAME}, because "
+		        "it will be compiled by incompatible compilers. Target will be "
+		        "compiled without code coverage.")
+		return()
+
+	elseif (NUM_COMPILERS EQUAL 0)
+		message(WARNING "Can't use code coverage for target ${TNAME}, because "
+		        "it uses an unknown compiler. Target will be compiled without "
+		        "code coverage.")
+		return()
+
+	elseif (NOT DEFINED "COVERAGE_${TARGET_COMPILER}_FLAGS")
+		# A warning has been printed before, so just return if flags for this
+		# compiler aren't available.
+		return()
+	endif()
+
+
+	# enable coverage for target
+	set_property(TARGET ${TNAME} APPEND_STRING
+		PROPERTY COMPILE_FLAGS " ${COVERAGE_${TARGET_COMPILER}_FLAGS}")
+	set_property(TARGET ${TNAME} APPEND_STRING
+		PROPERTY LINK_FLAGS " ${COVERAGE_${TARGET_COMPILER}_FLAGS}")
+
+
+	# Add gcov files generated by compiler to clean target.
+	set(CLEAN_FILES "")
+	foreach (FILE ${ADDITIONAL_FILES})
+		codecov_path_of_source(${FILE} FILE)
+		list(APPEND CLEAN_FILES "CMakeFiles/${TNAME}.dir/${FILE}")
+	endforeach()
+
+	if(${CMAKE_VERSION} VERSION_LESS "3.15.0")
+		set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+			"${CLEAN_FILES}")
+	else()
+		set_directory_properties(PROPERTIES ADDITIONAL_CLEAN_FILES
+			"${CLEAN_FILES}")
+	endif()
+
+
+	add_gcov_target(${TNAME})
+endfunction(add_coverage_target)
+
+# Include modules for parsing the collected data and output it in a readable
+# format (like gcov and lcov).
+find_package(Gcov)
diff --git a/tools/nodeset_compiler/backend_open62541_typedefinitions.py b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
index 989d64a9087..f35408f6cad 100644
--- a/tools/nodeset_compiler/backend_open62541_typedefinitions.py
+++ b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
@@ -246,7 +246,7 @@ def print_enum_typedef(enum):
             return "typedef enum {\n    " + ",\n    ".join(
                 map(lambda kv: makeCIdentifier("UA_" + enum.name.upper() + "_" + kv[0].upper()) +
                                " = " + kv[1], values)) + \
-                   ",\n    __UA_{0}_FORCE32BIT = 0x7fffffff\n".format(makeCIdentifier(enum.name.upper())) + "} " + \
+                   "{}\n    __UA_{}_FORCE32BIT = 0x7fffffff\n".format("," if len(enum.elements) != 0 else "", makeCIdentifier(enum.name.upper())) + "} " + \
                    "UA_{0};\nUA_STATIC_ASSERT(sizeof(UA_{0}) == sizeof(UA_Int32), enum_must_be_32bit);".format(
                        makeCIdentifier(enum.name))
 
diff --git a/tools/nodeset_compiler/nodes.py b/tools/nodeset_compiler/nodes.py
index 99a95d236d6..ae88ccdcd04 100644
--- a/tools/nodeset_compiler/nodes.py
+++ b/tools/nodeset_compiler/nodes.py
@@ -559,6 +559,9 @@ def buildEncoding(self, nodeset, indent=0, force=False, namespaceMapping=None):
                         isOptional = str(av)
                     elif at == "ArrayDimensions":
                         arrayDimensions = int(av)
+                    elif at == "AllowSubTypes":
+                        # ignore
+                        continue
                     else:
                         logger.warn("Unknown Field Attribute " + str(at))
                 # This can either be an enumeration OR a structure, not both.

From 73c5bff7ccdd0423f8073bed1edd6f7363042459 Mon Sep 17 00:00:00 2001
From: Stefan Profanter <Pro@users.noreply.github.com>
Date: Mon, 20 Dec 2021 12:09:38 +0100
Subject: [PATCH 0021/1963] fix(build): Use `#!/usr/bin/env python3` instead of
 `#!/usr/bin/env python` (#4862)

The newer Ubuntu since 20.04 do not have the `python` binary.
There one explicitly needs to choose between `python2` or `python3`.

See also:
https://askubuntu.com/q/1296790/141958
---
 tools/amalgamate.py                       | 2 +-
 tools/c2rst.py                            | 2 +-
 tools/gdb-prettyprint.py                  | 2 +-
 tools/generate_datatypes.py               | 2 +-
 tools/generate_nodeid_header.py           | 2 +-
 tools/generate_statuscode_descriptions.py | 2 +-
 tools/nodeset_compiler/nodeset.py         | 2 +-
 tools/nodeset_compiler/nodeset_testing.py | 2 +-
 tools/prepare_packaging.py                | 2 +-
 tools/update_copyright_header.py          | 2 +-
 tools/valgrind_check_error.py             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/amalgamate.py b/tools/amalgamate.py
index 8db9d2f7c1d..6e042a6ac91 100755
--- a/tools/amalgamate.py
+++ b/tools/amalgamate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # coding: UTF-8
 # This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/tools/c2rst.py b/tools/c2rst.py
index b9971e54c1c..036b6b921f6 100755
--- a/tools/c2rst.py
+++ b/tools/c2rst.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this 
diff --git a/tools/gdb-prettyprint.py b/tools/gdb-prettyprint.py
index ca80df449ae..486ee9a7e97 100644
--- a/tools/gdb-prettyprint.py
+++ b/tools/gdb-prettyprint.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Load into gdb with 'source <path-to>/tools/gdb-prettyprint.py'
 # Make sure to have 'set print pretty on' to get nice structure printouts
diff --git a/tools/generate_datatypes.py b/tools/generate_datatypes.py
index 3ad6a8a3040..227dd41c858 100755
--- a/tools/generate_datatypes.py
+++ b/tools/generate_datatypes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/tools/generate_nodeid_header.py b/tools/generate_nodeid_header.py
index b7c8a9f733a..14b7062cd49 100644
--- a/tools/generate_nodeid_header.py
+++ b/tools/generate_nodeid_header.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this 
diff --git a/tools/generate_statuscode_descriptions.py b/tools/generate_statuscode_descriptions.py
index 9679af234ac..d6ced7df8c0 100755
--- a/tools/generate_statuscode_descriptions.py
+++ b/tools/generate_statuscode_descriptions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this 
diff --git a/tools/nodeset_compiler/nodeset.py b/tools/nodeset_compiler/nodeset.py
index 1889ff6d759..b5e016cc9fc 100644
--- a/tools/nodeset_compiler/nodeset.py
+++ b/tools/nodeset_compiler/nodeset.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 ### This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/tools/nodeset_compiler/nodeset_testing.py b/tools/nodeset_compiler/nodeset_testing.py
index a1121086788..5997f82e8bd 100644
--- a/tools/nodeset_compiler/nodeset_testing.py
+++ b/tools/nodeset_compiler/nodeset_testing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ### This Source Code Form is subject to the terms of the Mozilla Public
 ### License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index bb775b1f407..84d7b2d0df0 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/tools/update_copyright_header.py b/tools/update_copyright_header.py
index a8d950df84a..1ce6fed68d4 100755
--- a/tools/update_copyright_header.py
+++ b/tools/update_copyright_header.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/tools/valgrind_check_error.py b/tools/valgrind_check_error.py
index e192cecce3f..a263f6aac26 100755
--- a/tools/valgrind_check_error.py
+++ b/tools/valgrind_check_error.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # coding: UTF-8
 # This Source Code Form is subject to the terms of the Mozilla Public

From 5e90cfd19a99aa31fa25f888a20330e522c1bc46 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Tue, 21 Dec 2021 11:12:42 +0100
Subject: [PATCH 0022/1963] feat(server) added dedicated event filter test,
 event-filter isNull and compare operator added, simplify filter by adding
 UA_FilterOperatorContext

* feat(ci): feat(server) added dedicated event filter test

* feat(server) event-filter isNull and compare operator added, event-filter unit test case added, lookup method for data type precedence added

* feat(server) event-filter inList, between, bitwiseAnd, bitwaseOr added. Several casting rules added.

* simplify filter by adding UA_FilterOperatorContext

Co-authored-by: Julius Pfrommer <julius.pfrommer@web.de>
---
 include/open62541/types.h                     |   5 +
 src/server/ua_services_monitoreditem.c        |   1 +
 src/server/ua_subscription_events.c           | 794 +++++++++++++----
 src/ua_types.c                                |  45 +
 tests/CMakeLists.txt                          |   4 +
 .../server/check_subscription_event_filter.c  | 799 ++++++++++++++++++
 6 files changed, 1463 insertions(+), 185 deletions(-)
 create mode 100644 tests/server/check_subscription_event_filter.c

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 2e96882b9b0..bd506983cc1 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1046,6 +1046,11 @@ typedef struct UA_DataTypeArray {
 UA_Boolean
 UA_DataType_isNumeric(const UA_DataType *type);
 
+/* Return the Data Type Precedence-Rank defined in Part 4.
+ * If there is no Precedence-Rank assigned with the type -1 is returned.*/
+UA_Int16
+UA_DataType_getPrecedence(const UA_DataType *type);
+
 /**
  * Builtin data types can be accessed as UA_TYPES[UA_TYPES_XXX], where XXX is
  * the name of the data type. If only the NodeId of a type is known, use the
diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 924b024b558..89a2b150326 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -287,6 +287,7 @@ checkEventFilterParam(UA_Server *server, UA_Session *session,
                 return whereResult;
             }
         }
+        UA_ContentFilterResult_clear(&contentFilterResult);
     }
     //check the select clause for logical consistency
     UA_StatusCode selectClauseValidationResult[128];
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 1fd74b2dcd3..c97c52d0c74 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -12,13 +12,18 @@
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
 
-//forward declaration
+typedef struct {
+    UA_Server *server;
+    UA_Session *session;
+    const UA_NodeId *eventNode;
+    const UA_ContentFilter *contentFilter;
+    UA_ContentFilterResult *contentFilterResult;
+    UA_Variant *valueResult;
+    UA_UInt16 index;
+} UA_FilterOperatorContext;
+
 static UA_StatusCode
-evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
-                                 const UA_NodeId *eventNode,
-                                 const UA_ContentFilter *contentFilter,
-                                 UA_ContentFilterResult *contentFilterResult,
-                                 UA_Variant* valueResult, UA_UInt16 index);
+evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx);
 
 /* We use a 16-Byte ByteString as an identifier */
 UA_StatusCode
@@ -60,7 +65,7 @@ UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
 
     /* Create an ObjectNode which represents the event */
     UA_QualifiedName name;
-    // set a dummy name. This is not used.
+    /*  set a dummy name. This is not used. */
     name = UA_QUALIFIEDNAME(0,"E");
     UA_NodeId newNodeId = UA_NODEID_NULL;
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
@@ -249,58 +254,47 @@ resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session, const UA_N
 /* Resolve operands to variants according to the operand type.
  * Part 4: 7.17.3 Table 142 specifies the allowed types. */
 static UA_Variant
-resolveOperand(UA_Server *server, UA_Session *session, const UA_NodeId *origin,
-               const UA_ContentFilter *contentFilter,
-               UA_ContentFilterResult *contentFilterResult, UA_Variant *valueResult,
-               UA_UInt16 index, UA_UInt16 nr) {
-
+resolveOperand(UA_FilterOperatorContext *ctx, UA_UInt16 nr) {
     UA_StatusCode res;
     UA_Variant variant;
     UA_Variant_init(&variant);
     /*SimpleAttributeOperands*/
-    if(contentFilter->elements[index].filterOperands[nr].content.decoded.type ==
+    if(ctx->contentFilter->elements[ctx->index].filterOperands[nr].content.decoded.type ==
        &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]) {
-        res = resolveSimpleAttributeOperand(
-            server, session, origin,
-            (UA_SimpleAttributeOperand *)contentFilter->elements[index]
-                .filterOperands[nr]
-                .content.decoded.data,
-            &variant);
+        res = resolveSimpleAttributeOperand(ctx->server, ctx->session, ctx->eventNode,
+                                            (UA_SimpleAttributeOperand *)ctx->contentFilter->elements[ctx->index]
+                                            .filterOperands[nr].content.decoded.data,
+                                            &variant);
         /*LiteralAttribute*/
-    } else if(contentFilter->elements[index].filterOperands[nr].content.decoded.type ==
+    } else if(ctx->contentFilter->elements[ctx->index].filterOperands[nr].content.decoded.type ==
               &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
-        variant = ((UA_LiteralOperand *)contentFilter->elements[index]
-            .filterOperands[nr].content.decoded.data)->value;
+        variant = ((UA_LiteralOperand *)ctx->contentFilter->elements[ctx->index]
+                   .filterOperands[nr].content.decoded.data)->value;
         res = UA_STATUSCODE_GOOD;
-    } else if(contentFilter->elements[index].filterOperands[nr].content.decoded.type ==
+    } else if(ctx->contentFilter->elements[ctx->index].filterOperands[nr].content.decoded.type ==
               &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
-        res = evaluateWhereClauseContentFilter(
-            server, session, origin, contentFilter, contentFilterResult, valueResult,
-            (UA_UInt16)((UA_ElementOperand *)contentFilter->elements[index]
-                .filterOperands[nr].content.decoded.data)->index);
-        variant =
-            valueResult[(UA_UInt16)((UA_ElementOperand *)contentFilter->elements[index]
-                .filterOperands[nr].content.decoded.data)->index];
+        UA_UInt16 oldIndex = ctx->index;
+        ctx->index = (UA_UInt16)((UA_ElementOperand *)ctx->contentFilter->elements[ctx->index]
+                                 .filterOperands[nr].content.decoded.data)->index;
+        res = evaluateWhereClauseContentFilter(ctx);
+        variant = ctx->valueResult[ctx->index];
+        ctx->index = oldIndex; /* restore the old index */
         /*ElementOperands*/
     } else {
         res = UA_STATUSCODE_BADFILTEROPERANDINVALID;
     }
     if(res != UA_STATUSCODE_GOOD && res != UA_STATUSCODE_BADNOMATCH) {
         variant.type = NULL;
-        contentFilterResult->elementResults[index].operandStatusCodes[nr] = res;
+        ctx->contentFilterResult->elementResults[ctx->index].operandStatusCodes[nr] = res;
     }
     return variant;
 }
 
 static UA_StatusCode
-ofTypeOperator(UA_Server *server, UA_Session *session,
-               const UA_NodeId *eventNode,
-               const UA_ContentFilter *contentFilter,
-               UA_ContentFilterResult *contentFilterResult,
-               UA_Variant* valueResult, UA_UInt16 index,
-               UA_UInt16 nr, UA_ContentFilterElement *pElement){
+ofTypeOperator(UA_FilterOperatorContext *ctx) {
+    UA_ContentFilterElement *pElement = &ctx->contentFilter->elements[ctx->index];
     UA_Boolean result = false;
-    valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
     if(pElement->filterOperandsSize != 1)
         return UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
     if(pElement->filterOperands[0].content.decoded.type !=
@@ -319,24 +313,24 @@ ofTypeOperator(UA_Server *server, UA_Session *session,
     UA_Variant typeNodeIdVariant;
     UA_Variant_init(&typeNodeIdVariant);
     UA_StatusCode readStatusCode =
-        readObjectProperty(server, *eventNode, UA_QUALIFIEDNAME(0, "EventType"),
-                           &typeNodeIdVariant);
+        readObjectProperty(ctx->server, *ctx->eventNode,
+                           UA_QUALIFIEDNAME(0, "EventType"), &typeNodeIdVariant);
     if(readStatusCode != UA_STATUSCODE_GOOD)
         return readStatusCode;
 
     if(!UA_Variant_isScalar(&typeNodeIdVariant) ||
        typeNodeIdVariant.type != &UA_TYPES[UA_TYPES_NODEID] ||
        typeNodeIdVariant.data == NULL) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&ctx->server->config.logger, UA_LOGCATEGORY_SERVER,
                      "EventType has an invalid type.");
         UA_Variant_clear(&typeNodeIdVariant);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    //check if the eventtype-nodeid is equal to the given oftype argument
+    /* check if the eventtype-nodeid is equal to the given oftype argument */
     result = UA_NodeId_equal((UA_NodeId*) typeNodeIdVariant.data, literalOperandNodeId);
-    //check if the eventtype-nodeid is a subtype of the given oftype argument
+    /* check if the eventtype-nodeid is a subtype of the given oftype argument */
     if(!result)
-        result = isNodeInTree_singleRef(server,
+        result = isNodeInTree_singleRef(ctx->server,
                                         (UA_NodeId*) typeNodeIdVariant.data,
                                         literalOperandNodeId,
                                         UA_REFERENCETYPEINDEX_HASSUBTYPE);
@@ -347,189 +341,616 @@ ofTypeOperator(UA_Server *server, UA_Session *session,
 }
 
 static UA_StatusCode
-andOperator(UA_Server *server, UA_Session *session,
-            const UA_NodeId *eventNode,
-            const UA_ContentFilter *contentFilter,
-            UA_ContentFilterResult *contentFilterResult,
-            UA_Variant* valueResult, UA_UInt16 index,
-            UA_UInt16 nr, UA_ContentFilterElement *pElement) {
-    UA_StatusCode firstBoolean_and = resolveBoolean(
-        resolveOperand(server, session, eventNode, contentFilter,
-                       contentFilterResult, valueResult, index, 0));
+andOperator(UA_FilterOperatorContext *ctx) {
+    UA_StatusCode firstBoolean_and = resolveBoolean(resolveOperand(ctx, 0));
     if(firstBoolean_and == UA_STATUSCODE_BADNOMATCH) {
-        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
         return UA_STATUSCODE_BADNOMATCH;
     }
     /* Evaluation of second operand */
-    UA_StatusCode secondBoolean = resolveBoolean(
-        resolveOperand(server, session, eventNode, contentFilter,
-                       contentFilterResult, valueResult, index, 1));
-
+    UA_StatusCode secondBoolean = resolveBoolean(resolveOperand(ctx, 1));
     /* Filteroperator AND */
     if(secondBoolean == UA_STATUSCODE_BADNOMATCH) {
-        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
         return UA_STATUSCODE_BADNOMATCH;
-    } else if((firstBoolean_and == UA_STATUSCODE_GOOD) &&
-              (secondBoolean == UA_STATUSCODE_GOOD)) {
-        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    }
+    if((firstBoolean_and == UA_STATUSCODE_GOOD) &&
+       (secondBoolean == UA_STATUSCODE_GOOD)) {
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
         return UA_STATUSCODE_GOOD;
-    } else {
-        return UA_STATUSCODE_BADFILTERELEMENTINVALID;
     }
+    return UA_STATUSCODE_BADFILTERELEMENTINVALID;
 }
 
 static UA_StatusCode
-orOperator(UA_Server *server, UA_Session *session,
-           const UA_NodeId *eventNode,
-           const UA_ContentFilter *contentFilter,
-           UA_ContentFilterResult *contentFilterResult,
-           UA_Variant* valueResult, UA_UInt16 index,
-           UA_UInt16 nr, UA_ContentFilterElement *pElement) {
-    UA_StatusCode firstBoolean_or = resolveBoolean(
-        resolveOperand(server, session, eventNode, contentFilter,
-                       contentFilterResult, valueResult, index, 0));
+orOperator(UA_FilterOperatorContext *ctx) {
+    UA_StatusCode firstBoolean_or = resolveBoolean(resolveOperand(ctx, 0));
     if(firstBoolean_or == UA_STATUSCODE_GOOD) {
-        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
         return UA_STATUSCODE_GOOD;
     }
     /* Evaluation of second operand */
-    UA_StatusCode secondBoolean = resolveBoolean(
-        resolveOperand(server, session, eventNode, contentFilter,
-                       contentFilterResult, valueResult, index, 1));
-
+    UA_StatusCode secondBoolean = resolveBoolean(resolveOperand(ctx, 1));
     if(secondBoolean == UA_STATUSCODE_GOOD) {
-        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
         return UA_STATUSCODE_GOOD;
-    } else if((firstBoolean_or == UA_STATUSCODE_BADNOMATCH) &&
-              (secondBoolean == UA_STATUSCODE_BADNOMATCH)) {
-        valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    } 
+    if((firstBoolean_or == UA_STATUSCODE_BADNOMATCH) &&
+       (secondBoolean == UA_STATUSCODE_BADNOMATCH)) {
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
         return UA_STATUSCODE_BADNOMATCH;
+    }
+    return UA_STATUSCODE_BADFILTERELEMENTINVALID;
+}
+
+static UA_Boolean
+isNumericUnsigned(UA_UInt32 dataTypeKind){
+    if(dataTypeKind == UA_DATATYPEKIND_UINT64 ||
+       dataTypeKind == UA_DATATYPEKIND_UINT32 ||
+       dataTypeKind == UA_DATATYPEKIND_UINT16 ||
+       dataTypeKind == UA_DATATYPEKIND_BYTE)
+        return true;
+    return false;
+}
+
+static UA_Boolean
+isNumericSigned(UA_UInt32 dataTypeKind){
+    if(dataTypeKind == UA_DATATYPEKIND_INT64 ||
+       dataTypeKind == UA_DATATYPEKIND_INT32 ||
+       dataTypeKind == UA_DATATYPEKIND_INT16 ||
+       dataTypeKind == UA_DATATYPEKIND_SBYTE)
+        return true;
+    return false;
+}
+
+static UA_Boolean
+isFloatingPoint(UA_UInt32 dataTypeKind){
+    if(dataTypeKind == UA_DATATYPEKIND_FLOAT ||
+       dataTypeKind == UA_DATATYPEKIND_DOUBLE)
+        return true;
+    return false;
+}
+
+static UA_Boolean
+isStringType(UA_UInt32 dataTypeKind){
+    if(dataTypeKind == UA_DATATYPEKIND_STRING ||
+       dataTypeKind == UA_DATATYPEKIND_BYTESTRING)
+        return true;
+    return false;
+}
+
+
+
+static UA_StatusCode
+implicitNumericVariantTransformation(UA_Variant *variant, void *data){
+    if(variant->type == &UA_TYPES[UA_TYPES_UINT64]){
+        *(UA_UInt64 *)data = *(UA_UInt64 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT32]){
+        *(UA_UInt64 *)data = *(UA_UInt32 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT16]){
+        *(UA_UInt64 *)data = *(UA_UInt16 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_BYTE]){
+        *(UA_UInt64 *)data = *(UA_Byte *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_INT64]){
+        *(UA_Int64 *)data = *(UA_Int64 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_INT32]){
+        *(UA_Int64 *)data = *(UA_Int32 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_INT16]){
+        *(UA_Int64 *)data = *(UA_Int16 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
+        *(UA_Int64 *)data = *(UA_SByte *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_DOUBLE]){
+        *(UA_Double *)data = *(UA_Double *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_DOUBLE]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
+        *(UA_Double *)data = *(UA_Float *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_DOUBLE]);
     } else {
-        return UA_STATUSCODE_BADFILTERELEMENTINVALID;
+        return UA_STATUSCODE_BADTYPEMISMATCH;
     }
+    return UA_STATUSCODE_GOOD;
 }
 
+/* 0 -> Same Type, 1 -> Implicit Cast, 2 -> Only explicit Cast, -1 -> cast invalid */
+static UA_SByte convertLookup[21][21] = {
+    { 0, 1,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
+    { 2, 0,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
+    {-1,-1, 0,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+    {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
+    { 2,2,-1,-1, 0,-1, 2,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1, 2,-1,-1, 1,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 0,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1, 2,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 0, 1, 1,-1, 2,-1, 2,-1,-1, 2, 1, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 0, 1,-1, 2, 2, 2,-1,-1, 2, 2, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 0,-1, 2, 2, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1,-1,-1,-1, 1,-1,-1,-1,-1,-1, 0,-1,-1, 1,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 0,-1, 2,-1,-1, 1, 1, 1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1,-1,-1, 0,-1,-1,-1, 2, 1, 1,-1},
+    { 1, 1,-1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1,-1, 0, 2, 2, 1, 1, 1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 0,-1,-1,-1,-1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1, 0,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 2, 1, 2,-1,-1, 0, 1, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 1, 1,-1, 2, 2, 2,-1,-1, 2, 0, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 1,-1, 2, 2, 2,-1,-1, 2, 2, 0,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0}
+};
+
+/* This array maps the index of the
+ * standard DataType-Kind order to the
+ * order of the type convertion array */
+static UA_Byte dataTypeKindIndex[30] = {
+    0,   12,  1,  8, 17,
+    9,   18, 10, 19,  6,
+    4,   14,  3,  7,  2,
+    20,  11,  5, 13, 16,
+    15, 255,255,255,255,
+    255,255,255,255,255
+};
+
+/*
+ * The OPC UA Standard defines in Part 4 several data type casting-rules. (see 1.04 part 4 Table 122)
+ * Return:
+ *      0 -> same type
+ *      1 -> types can be casted implicit
+ *      2 -> types can only be explicitly casted
+ *     -1 -> types can't be casted
+ */
+static UA_SByte
+checkTypeCastingOption(const UA_DataType *cast_target, const UA_DataType *cast_source) {
+    UA_Byte firstOperatorTypeKindIndex = UA_BYTE_MAX;
+    UA_Byte secondOperatorTypeKindIndex = UA_BYTE_MAX;
+    firstOperatorTypeKindIndex = dataTypeKindIndex[cast_target->typeKind];
+    secondOperatorTypeKindIndex = dataTypeKindIndex[cast_source->typeKind];
+
+    if(firstOperatorTypeKindIndex == UA_BYTE_MAX || secondOperatorTypeKindIndex == UA_BYTE_MAX)
+        return -1;
+
+    return convertLookup[firstOperatorTypeKindIndex][secondOperatorTypeKindIndex];
+}
+
+/* Compare operation for equal, gt, le, gte, lee
+ * UA_STATUSCODE_GOOD if the comparison was true
+ * UA_STATUSCODE_BADNOMATCH if the comparison was false
+ * UA_STATUSCODE_BADFILTEROPERATORINVALID for invalid operators
+ * UA_STATUSCODE_BADTYPEMISMATCH if one of the operands was not numeric
+ * ToDo Array-Casting
+ */
 static UA_StatusCode
-isNullOperator(UA_Server *server, UA_Session *session,
-           const UA_NodeId *eventNode,
-           const UA_ContentFilter *contentFilter,
-           UA_ContentFilterResult *contentFilterResult,
-           UA_Variant* valueResult, UA_UInt16 index,
-           UA_UInt16 nr, UA_ContentFilterElement *pElement) {
+compareOperation(UA_Variant *firstOperand, UA_Variant *secondOperand, UA_FilterOperator op) {
+    /* get precedence of the operand types */
+    UA_Int16 firstOperand_precedence = UA_DataType_getPrecedence(firstOperand->type);
+    UA_Int16 secondOperand_precedence = UA_DataType_getPrecedence(secondOperand->type);
+    /* if the types are not equal and one of the precedence-ranks is -1, then there is
+       no implicit conversion possible and therefore no compare */
+    if(!UA_NodeId_equal(&firstOperand->type->typeId, &secondOperand->type->typeId) &&
+       (firstOperand_precedence == -1 || secondOperand_precedence == -1)){
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+    }
+    /* check if the precedence order of the operators is swapped */
+    UA_Variant *firstCompareOperand = firstOperand;
+    UA_Variant *secondCompareOperand = secondOperand;
+    UA_Boolean swapped = false;
+    if (firstOperand_precedence < secondOperand_precedence){
+        firstCompareOperand = secondOperand;
+        secondCompareOperand = firstOperand;
+        swapped = true;
+    }
+    UA_SByte castRule =
+        checkTypeCastingOption(firstCompareOperand->type, secondCompareOperand->type);
+
+    if(!(castRule == 0 || castRule == 1)){
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+    }
+
+    /* The operand Data-Types influence the behavior and steps for the comparison.
+     * We need to check the operand types and store a rule which is used to select
+     * the right behavior afterwards. */
+    enum compareHandlingRuleEnum {
+        UA_TYPES_EQUAL_ORDERED,
+        UA_TYPES_EQUAL_UNORDERED,
+        UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED,
+        UA_TYPES_DIFFERENT_NUMERIC_SIGNED,
+        UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT,
+        UA_TYPES_DIFFERENT_TEXT,
+        UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN,
+        UA_TYPES_DIFFERENT_COMPARE_EXPLIC
+    } compareHandlingRuleEnum;
+
+    if(castRule == 0 &&
+       (UA_DataType_isNumeric(firstOperand->type) ||
+        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_DATETIME ||
+        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_STRING ||
+        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_BYTESTRING)){
+        /* Data-Types with a natural order (allow le, gt, lee, gte) */
+        compareHandlingRuleEnum = UA_TYPES_EQUAL_ORDERED;
+    } else if(castRule == 0){
+        /* Data-Types without a natural order (le, gt, lee, gte are not allowed) */
+        compareHandlingRuleEnum = UA_TYPES_EQUAL_UNORDERED;
+    } else if(castRule == 1 &&
+              isNumericSigned(firstOperand->type->typeKind) &&
+              isNumericSigned(secondOperand->type->typeKind)){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_SIGNED;
+    } else if(castRule == 1 &&
+              isNumericUnsigned(firstOperand->type->typeKind) &&
+              isNumericUnsigned(secondOperand->type->typeKind)){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED;
+    } else if(castRule == 1 &&
+              isFloatingPoint(firstOperand->type->typeKind) &&
+              isFloatingPoint(secondOperand->type->typeKind)){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT;
+    } else if(castRule == 1 &&
+              isStringType(firstOperand->type->typeKind)&&
+              isStringType(secondOperand->type->typeKind)){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_TEXT;
+    } else if(castRule == -1 || castRule == 2){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_COMPARE_EXPLIC;
+    } else {
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN;
+    }
+
+    if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN)
+        return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+
+    if(swapped){
+        firstCompareOperand = secondCompareOperand;
+        secondCompareOperand = firstCompareOperand;
+    }
+
+    if(op == UA_FILTEROPERATOR_EQUALS){
+        UA_Byte variantContent[16];
+        memset(&variantContent, 0, sizeof(UA_Byte) * 16);
+        if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_SIGNED ||
+           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED ||
+           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT) {
+            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
+            implicitNumericVariantTransformation(secondCompareOperand, &variantContent[8]);
+        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_TEXT) {
+            firstCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
+            secondCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
+        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN ||
+                  compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_EXPLIC ){
+            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+        }
+        if(UA_order(firstCompareOperand, secondCompareOperand, &UA_TYPES[UA_TYPES_VARIANT]) == UA_ORDER_EQ) {
+            return UA_STATUSCODE_GOOD;
+        }
+    } else {
+        UA_Byte variantContent[16];
+        if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_SIGNED ||
+           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED ||
+           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT) {
+            memset(&variantContent, 0, sizeof(UA_Byte) * 16);
+            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
+            implicitNumericVariantTransformation(secondCompareOperand, &variantContent[8]);
+        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_TEXT) {
+            firstCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
+            secondCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
+        } else if(compareHandlingRuleEnum == UA_TYPES_EQUAL_UNORDERED) {
+            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN ||
+                  compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_EXPLIC) {
+            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+        }
+        UA_Order gte_result = UA_order(firstCompareOperand, secondCompareOperand, &UA_TYPES[UA_TYPES_VARIANT]);
+        if(op == UA_FILTEROPERATOR_LESSTHAN) {
+            if(gte_result == UA_ORDER_LESS) {
+                return UA_STATUSCODE_GOOD;
+            }
+        } else if(op == UA_FILTEROPERATOR_GREATERTHAN) {
+            if(gte_result == UA_ORDER_MORE) {
+                return UA_STATUSCODE_GOOD;
+            }
+        } else if(op == UA_FILTEROPERATOR_LESSTHANOREQUAL) {
+            if(gte_result == UA_ORDER_LESS || gte_result == UA_ORDER_EQ) {
+                return UA_STATUSCODE_GOOD;
+            }
+        } else if(op == UA_FILTEROPERATOR_GREATERTHANOREQUAL) {
+            if(gte_result == UA_ORDER_MORE || gte_result == UA_ORDER_EQ) {
+                return UA_STATUSCODE_GOOD;
+            }
+        }
+    }
+    return UA_STATUSCODE_BADNOMATCH;
+}
+
+static UA_StatusCode
+compareOperator(UA_FilterOperatorContext *ctx) {
+    UA_Variant firstOperand = resolveOperand(ctx, 0);
+    if(UA_Variant_isEmpty(&firstOperand))
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    UA_Variant secondOperand = resolveOperand(ctx, 1);
+    if(UA_Variant_isEmpty(&secondOperand)) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+    /* ToDo remove the following restriction: Add support for arrays */
+    if(!UA_Variant_isScalar(&firstOperand) || !UA_Variant_isScalar(&secondOperand)){
+        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+    }
+    return compareOperation(&firstOperand, &secondOperand,
+                            ctx->contentFilter->elements[ctx->index].filterOperator);
+}
+
+static UA_StatusCode
+bitwiseOperator(UA_FilterOperatorContext *ctx) {
+    /* The bitwise operators all have 2 operands which are evaluated equally. */
+    UA_Variant firstOperand = resolveOperand(ctx, 0);
+    if(UA_Variant_isEmpty(&firstOperand)) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+    UA_Variant secondOperand = resolveOperand(ctx, 1);
+    if(UA_Variant_isEmpty(&secondOperand)) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+
+    UA_Boolean bitwiseAnd =
+        ctx->contentFilter->elements[ctx->index].filterOperator == UA_FILTEROPERATOR_BITWISEAND;
+
+    /* check if the operators are integers */
+    if(!UA_DataType_isNumeric(firstOperand.type) ||
+       !UA_DataType_isNumeric(secondOperand.type) ||
+       !UA_Variant_isScalar(&firstOperand) ||
+       !UA_Variant_isScalar(&secondOperand) ||
+       (firstOperand.type == &UA_TYPES[UA_TYPES_DOUBLE]) ||
+       (secondOperand.type == &UA_TYPES[UA_TYPES_DOUBLE]) ||
+       (secondOperand.type == &UA_TYPES[UA_TYPES_FLOAT]) ||
+       (firstOperand.type == &UA_TYPES[UA_TYPES_FLOAT])) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+
+    /* check which is the return type (higher precedence == bigger integer)*/
+    UA_Int16 precedence = UA_DataType_getPrecedence(firstOperand.type);
+    if(precedence > UA_DataType_getPrecedence(secondOperand.type)) {
+        precedence = UA_DataType_getPrecedence(secondOperand.type);
+    }
+
+    switch(precedence){
+        case 3:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT64];
+            UA_Int64 result_int64;
+            if(bitwiseAnd) {
+                result_int64 = *((UA_Int64 *)firstOperand.data) & *((UA_Int64 *)secondOperand.data);
+            } else {
+                result_int64 = *((UA_Int64 *)firstOperand.data) | *((UA_Int64 *)secondOperand.data);
+            }
+            UA_Int64_copy(&result_int64, (UA_Int64 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 4:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT64];
+            UA_UInt64 result_uint64s;
+            if(bitwiseAnd) {
+                result_uint64s = *((UA_UInt64 *)firstOperand.data) & *((UA_UInt64 *)secondOperand.data);
+            } else {
+                result_uint64s = *((UA_UInt64 *)firstOperand.data) | *((UA_UInt64 *)secondOperand.data);
+            }
+            UA_UInt64_copy(&result_uint64s, (UA_UInt64 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 5:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT32];
+            UA_Int32 result_int32;
+            if(bitwiseAnd) {
+                result_int32 = *((UA_Int32 *)firstOperand.data) & *((UA_Int32 *)secondOperand.data);
+            } else {
+                result_int32 = *((UA_Int32 *)firstOperand.data) | *((UA_Int32 *)secondOperand.data);
+            }
+            UA_Int32_copy(&result_int32, (UA_Int32 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 6:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT32];
+            UA_UInt32 result_uint32;
+            if(bitwiseAnd) {
+                result_uint32 = *((UA_UInt32 *)firstOperand.data) & *((UA_UInt32 *)secondOperand.data);
+            } else {
+                result_uint32 = *((UA_UInt32 *)firstOperand.data) | *((UA_UInt32 *)secondOperand.data);
+            }
+            UA_UInt32_copy(&result_uint32, (UA_UInt32 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 8:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT16];
+            UA_Int16 result_int16;
+            if(bitwiseAnd) {
+                result_int16 = *((UA_Int16 *)firstOperand.data) & *((UA_Int16 *)secondOperand.data);
+            } else {
+                result_int16 = *((UA_Int16 *)firstOperand.data) | *((UA_Int16 *)secondOperand.data);
+            }
+            UA_Int16_copy(&result_int16, (UA_Int16 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 9:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT16];
+            UA_UInt16 result_uint16;
+            if(bitwiseAnd) {
+                result_uint16 = *((UA_UInt16 *)firstOperand.data) & *((UA_UInt16 *)secondOperand.data);
+            } else {
+                result_uint16 = *((UA_UInt16 *)firstOperand.data) | *((UA_UInt16 *)secondOperand.data);
+            }
+            UA_UInt16_copy(&result_uint16, (UA_UInt16 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 10:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_SBYTE];
+            UA_SByte result_sbyte;
+            if(bitwiseAnd) {
+                result_sbyte = *((UA_SByte *)firstOperand.data) & *((UA_SByte *)secondOperand.data);
+            } else {
+                result_sbyte = *((UA_SByte *)firstOperand.data) | *((UA_SByte *)secondOperand.data);
+            }
+            UA_SByte_copy(&result_sbyte, (UA_SByte *) ctx->valueResult[ctx->index].data);
+            break;
+        case 11:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BYTE];
+            UA_Byte result_byte;
+            if(bitwiseAnd) {
+                result_byte = *((UA_Byte *)firstOperand.data) & *((UA_Byte *)secondOperand.data);
+            } else {
+                result_byte = *((UA_Byte *)firstOperand.data) | *((UA_Byte *)secondOperand.data);
+            }
+            UA_Byte_copy(&result_byte, (UA_Byte *) ctx->valueResult[ctx->index].data);
+            break;
+        default:
+            return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+betweenOperator(UA_FilterOperatorContext *ctx) {
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+
+    UA_Variant firstOperand = resolveOperand(ctx, 0);
+    UA_Variant secondOperand = resolveOperand(ctx, 1);
+    UA_Variant thirdOperand = resolveOperand(ctx, 2);
+
+    if((UA_Variant_isEmpty(&firstOperand) ||
+        UA_Variant_isEmpty(&secondOperand) ||
+        UA_Variant_isEmpty(&thirdOperand)) ||
+       (!UA_DataType_isNumeric(firstOperand.type) ||
+        !UA_DataType_isNumeric(secondOperand.type) ||
+        !UA_DataType_isNumeric(thirdOperand.type)) ||
+       (!UA_Variant_isScalar(&firstOperand) ||
+        !UA_Variant_isScalar(&secondOperand) ||
+        !UA_Variant_isScalar(&thirdOperand))) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+
+    /* Between can be evaluated through greaterThanOrEqual and lessThanOrEqual */
+    if(compareOperation(&firstOperand, &secondOperand, UA_FILTEROPERATOR_GREATERTHANOREQUAL) == UA_STATUSCODE_GOOD &&
+       compareOperation(&firstOperand, &thirdOperand, UA_FILTEROPERATOR_LESSTHANOREQUAL) == UA_STATUSCODE_GOOD){
+        return UA_STATUSCODE_GOOD;
+    }
+    return UA_STATUSCODE_BADNOMATCH;
+}
+
+static UA_StatusCode
+inListOperator(UA_FilterOperatorContext *ctx) {
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    UA_Variant firstOperand = resolveOperand(ctx, 0);
+
+    if(UA_Variant_isEmpty(&firstOperand) ||
+       !UA_Variant_isScalar(&firstOperand)) {
+        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+    }
+
+    /* Evaluating the list of operands */
+    for(size_t i = 1; i < ctx->contentFilter->elements[ctx->index].filterOperandsSize; i++) {
+        /* Resolving the current operand */
+        UA_Variant currentOperator = resolveOperand(ctx, (UA_UInt16)i);
+
+        /* Check if the operand conforms to the operator*/
+        if(UA_Variant_isEmpty(&currentOperator) ||
+           !UA_Variant_isScalar(&currentOperator)) {
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+        }
+        if(compareOperation(&firstOperand, &currentOperator, UA_FILTEROPERATOR_EQUALS)) {
+            return UA_STATUSCODE_GOOD;
+        }
+    }
+    return UA_STATUSCODE_BADNOMATCH;
+}
+
+static UA_StatusCode
+isNullOperator(UA_FilterOperatorContext *ctx) {
     /* Checking if operand is NULL. This is done by reducing the operand to a
     * variant and then checking if it is empty. */
-    UA_Variant operand =
-        resolveOperand(server, session, eventNode, contentFilter,
-                       contentFilterResult, valueResult, index, 0);
-    valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    if(!UA_Variant_isEmpty(&operand)) {
+    UA_Variant operand = resolveOperand(ctx, 0);
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    if(!UA_Variant_isEmpty(&operand))
         return UA_STATUSCODE_BADNOMATCH;
-    }
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-notOperator(UA_Server *server, UA_Session *session,
-               const UA_NodeId *eventNode,
-               const UA_ContentFilter *contentFilter,
-               UA_ContentFilterResult *contentFilterResult,
-               UA_Variant* valueResult, UA_UInt16 index,
-               UA_UInt16 nr, UA_ContentFilterElement *pElement) {
+notOperator(UA_FilterOperatorContext *ctx) {
     /* Inverting the boolean value of the operand. */
-    UA_StatusCode res = resolveBoolean(
-        resolveOperand(server, session, eventNode, contentFilter,
-                       contentFilterResult, valueResult, index, 0));
-    valueResult[index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    //invert result
-    if(res == UA_STATUSCODE_GOOD) {
+    UA_StatusCode res = resolveBoolean(resolveOperand(ctx, 0));
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    /* invert result */
+    if(res == UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADNOMATCH;
-    }
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
-                                 const UA_NodeId *eventNode,
-                                 const UA_ContentFilter *contentFilter,
-                                 UA_ContentFilterResult *contentFilterResult,
-                                 UA_Variant* valueResult, UA_UInt16 index) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx) {
+    UA_LOCK_ASSERT(&ctx->server->serviceMutex, 1);
 
-    if(contentFilter->elements == NULL || contentFilter->elementsSize == 0) {
+    if(ctx->contentFilter->elements == NULL || ctx->contentFilter->elementsSize == 0) {
         /* Nothing to do.*/
         return UA_STATUSCODE_GOOD;
     }
 
     /* The first element needs to be evaluated, this might be linked to other
      * elements, which are evaluated in these cases. See 7.4.1 in Part 4. */
-    UA_ContentFilterElement *pElement = &contentFilter->elements[index];
+    UA_ContentFilterElement *pElement = &ctx->contentFilter->elements[ctx->index];
+    UA_StatusCode *result = &ctx->contentFilterResult->elementResults[ctx->index].statusCode;
     switch(pElement->filterOperator) {
         case UA_FILTEROPERATOR_INVIEW:
-            return UA_STATUSCODE_BADEVENTFILTERINVALID;
-        case UA_FILTEROPERATOR_RELATEDTO: {
+            /* Fallthrough */
+        case UA_FILTEROPERATOR_RELATEDTO:
             /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
             return UA_STATUSCODE_BADEVENTFILTERINVALID;
-        }
         case UA_FILTEROPERATOR_EQUALS:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-        case UA_FILTEROPERATOR_ISNULL:
-            contentFilterResult->elementResults[index].statusCode =
-                isNullOperator(server, session, eventNode, contentFilter,
-                               contentFilterResult, valueResult, index, 0, pElement);
-            break;
+            /* Fallthrough */
         case UA_FILTEROPERATOR_GREATERTHAN:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+            /* Fallthrough */
         case UA_FILTEROPERATOR_LESSTHAN:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+            /* Fallthrough */
         case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+            /* Fallthrough */
         case UA_FILTEROPERATOR_LESSTHANOREQUAL:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+            *result = compareOperator(ctx);
+            break;
         case UA_FILTEROPERATOR_LIKE:
             return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
         case UA_FILTEROPERATOR_NOT:
-            contentFilterResult->elementResults[index].statusCode =
-                notOperator(server, session, eventNode, contentFilter,
-                            contentFilterResult, valueResult, index, 0, pElement);
+            *result = notOperator(ctx);
             break;
         case UA_FILTEROPERATOR_BETWEEN:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+            *result = betweenOperator(ctx);
+            break;
         case UA_FILTEROPERATOR_INLIST:
+            /* ToDo currently only numeric types are allowed */
+            *result = inListOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_ISNULL:
+            *result = isNullOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_AND:
+            *result = andOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_OR:
+            *result = orOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_CAST:
             return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-        case UA_FILTEROPERATOR_AND: {
-            contentFilterResult->elementResults[index].statusCode =
-                andOperator(server, session, eventNode, contentFilter,
-                            contentFilterResult, valueResult, index, 0, pElement);
+        case UA_FILTEROPERATOR_BITWISEAND:
+            *result = bitwiseOperator(ctx);
             break;
-            case UA_FILTEROPERATOR_OR:
-                contentFilterResult->elementResults[index].statusCode =
-                    orOperator(server, session, eventNode, contentFilter,
-                               contentFilterResult, valueResult, index, 0, pElement);
-                break;
-            case UA_FILTEROPERATOR_CAST:
-                return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-            case UA_FILTEROPERATOR_BITWISEAND:
-                return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-            case UA_FILTEROPERATOR_BITWISEOR:
-                return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-            case UA_FILTEROPERATOR_OFTYPE:
-                contentFilterResult->elementResults[index].statusCode =
-                    ofTypeOperator(server, session, eventNode, contentFilter,
-                                   contentFilterResult, valueResult, index, 0, pElement);
-                break;
-            default:
-                return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-        }
+        case UA_FILTEROPERATOR_BITWISEOR:
+            *result = bitwiseOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_OFTYPE:
+            *result = ofTypeOperator(ctx);
+            break;
+        default:
+            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
     }
-    if(valueResult[index].type == &UA_TYPES[UA_TYPES_BOOLEAN]) {
-        UA_Boolean *result = UA_Boolean_new();
-        if(contentFilterResult->elementResults[index].statusCode == UA_STATUSCODE_GOOD)
-            *result = true;
+
+    if(ctx->valueResult[ctx->index].type == &UA_TYPES[UA_TYPES_BOOLEAN]) {
+        UA_Boolean *res = UA_Boolean_new();
+        if(ctx->contentFilterResult->elementResults[ctx->index].statusCode == UA_STATUSCODE_GOOD)
+            *res = true;
         else
-            *result = false;
-        valueResult[index].data = result;
+            *res = false;
+        ctx->valueResult[ctx->index].data = res;
     }
-    return contentFilterResult->elementResults[index].statusCode;
+    return ctx->contentFilterResult->elementResults[ctx->index].statusCode;
 }
 
 UA_StatusCode
@@ -539,18 +960,27 @@ UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *sessio
                                            UA_ContentFilterResult *contentFilterResult) {
     if(contentFilter->elementsSize == 0)
         return UA_STATUSCODE_GOOD;
-    //TODO add maximum lenth size to the server config
+    /* TODO add maximum lenth size to the server config */
     if (contentFilter->elementsSize > 256)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     UA_STACKARRAY(UA_Variant, valueResult, contentFilter->elementsSize);
     for(size_t i = 0; i < contentFilter->elementsSize; ++i) {
         UA_Variant_init(&valueResult[i]);
     }
-    UA_StatusCode res = evaluateWhereClauseContentFilter(
-        server, session, eventNode, contentFilter, contentFilterResult, valueResult, 0);
-    for(size_t i = 0; i < contentFilter->elementsSize; i++) {
-        if(!UA_Variant_isEmpty(&valueResult[i]))
-            UA_Variant_clear(&valueResult[i]);
+
+    UA_FilterOperatorContext ctx;
+    ctx.server = server;
+    ctx.session = session;
+    ctx.eventNode = eventNode;
+    ctx.contentFilter = contentFilter;
+    ctx.contentFilterResult = contentFilterResult;
+    ctx.valueResult = valueResult;
+    ctx.index = 0;
+
+    UA_StatusCode res = evaluateWhereClauseContentFilter(&ctx);
+    for(size_t i = 0; i < ctx.contentFilter->elementsSize; i++) {
+        if(!UA_Variant_isEmpty(&ctx.valueResult[i]))
+            UA_Variant_clear(&ctx.valueResult[i]);
     }
     return res;
 }
@@ -571,7 +1001,7 @@ UA_Server_filterEvent(UA_Server *server, UA_Session *session,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     efl->eventFieldsSize = filter->selectClausesSize;
 
-    //empty event filter result
+    /* empty event filter result */
     UA_EventFilterResult_init(result);
     result->selectClauseResultsSize = filter->selectClausesSize;
     result->selectClauseResults = (UA_StatusCode *)
@@ -581,7 +1011,7 @@ UA_Server_filterEvent(UA_Server *server, UA_Session *session,
         UA_EventFilterResult_clear(result);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    //prepare content filter result structure
+    /* prepare content filter result structure */
     if(filter->whereClause.elementsSize != 0) {
         result->whereClauseResult.elementResultsSize = filter->whereClause.elementsSize;
         result->whereClauseResult.elementResults = (UA_ContentFilterElementResult *)
@@ -975,7 +1405,7 @@ UA_Event_staticSelectClauseValidation(UA_Server *server,
         return;
     for(size_t i = 0; i < eventFilter->selectClausesSize; ++i) {
         result[i] = UA_STATUSCODE_GOOD;
-        ///typedefenitionid or browsepath of any clause is not NULL ?
+        /* /typedefenitionid or browsepath of any clause is not NULL ? */
         if(UA_NodeId_isNull(&eventFilter->selectClauses[i].typeDefinitionId)) {
             result[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
             continue;
@@ -993,7 +1423,7 @@ UA_Event_staticSelectClauseValidation(UA_Server *server,
             result[i] = UA_STATUSCODE_BADBROWSENAMEINVALID;
             continue;
         }
-        //eventType is a subtype of BaseEventType ?
+        /* eventType is a subtype of BaseEventType ? */
         UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
         if(!isNodeInTree_singleRef(
             server, &eventFilter->selectClauses[i].typeDefinitionId,
@@ -1001,13 +1431,13 @@ UA_Event_staticSelectClauseValidation(UA_Server *server,
             result[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
             continue;
         }
-        //attributeId is valid ?
+        /* attributeId is valid ? */
         if(!((0 < eventFilter->selectClauses[i].attributeId) &&
              (eventFilter->selectClauses[i].attributeId < 28))) {
             result[i] = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
             continue;
         }
-        //browsePath contains null ?
+        /* browsePath contains null ? */
         for(size_t j = 0; j < eventFilter->selectClauses[i].browsePathSize; ++j) {
             if(UA_QualifiedName_isNull(
                 &eventFilter->selectClauses[i].browsePath[j])) {
@@ -1017,10 +1447,10 @@ UA_Event_staticSelectClauseValidation(UA_Server *server,
         }
         if(result[i] != UA_STATUSCODE_GOOD)
             continue;
-        //indexRange is defined ?
+        /*indexRange is defined ? */
         if(!UA_String_equal(&eventFilter->selectClauses[i].indexRange,
                             &UA_STRING_NULL)) {
-            //indexRange is parsable ?
+            /* indexRange is parsable ? */
             UA_NumericRange numericRange = UA_NUMERICRANGE("");
             if(UA_NumericRange_parse(&numericRange,
                                      eventFilter->selectClauses[i].indexRange) !=
@@ -1029,7 +1459,7 @@ UA_Event_staticSelectClauseValidation(UA_Server *server,
                 continue;
             }
             UA_free(numericRange.dimensions);
-            //attributeId is value ?
+            /* attributeId is value ? */
             if(eventFilter->selectClauses[i].attributeId != UA_ATTRIBUTEID_VALUE) {
                 result[i] = UA_STATUSCODE_BADTYPEMISMATCH;
                 continue;
@@ -1130,7 +1560,7 @@ UA_Event_staticWhereClauseValidation(UA_Server *server,
                 break;
             }
             case UA_FILTEROPERATOR_INLIST: {
-                if(ef.filterOperandsSize >= 2) {
+                if(ef.filterOperandsSize <= 2) {
                     er->statusCode =
                         UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
                     break;
@@ -1164,12 +1594,6 @@ UA_Event_staticWhereClauseValidation(UA_Server *server,
                     (UA_LiteralOperand *)ef.filterOperands[0]
                         .content.decoded.data;
 
-                if(((UA_NodeId *)literalOperand->value.data)->identifierType !=
-                   UA_NODEIDTYPE_NUMERIC) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADATTRIBUTEIDINVALID;
-                    break;
-                }
                 /* Make sure the &pOperand->nodeId is a subtype of BaseEventType */
                 UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
                 if(!isNodeInTree_singleRef(
diff --git a/src/ua_types.c b/src/ua_types.c
index 04a19b3da91..83afebc9f68 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1847,6 +1847,51 @@ UA_DataType_isNumeric(const UA_DataType *type) {
     }
 }
 
+UA_Int16
+UA_DataType_getPrecedence(const UA_DataType *type){
+    //Defined in Part 4 Table 123 "Data Precedence Rules"
+    switch(type->typeKind) {
+        case UA_DATATYPEKIND_DOUBLE:
+            return 1;
+        case UA_DATATYPEKIND_FLOAT:
+            return 2;
+        case UA_DATATYPEKIND_INT64:
+            return 3;
+        case UA_DATATYPEKIND_UINT64:
+            return 4;
+        case UA_DATATYPEKIND_INT32:
+            return 5;
+        case UA_DATATYPEKIND_UINT32:
+            return 6;
+        case UA_DATATYPEKIND_STATUSCODE:
+            return 7;
+        case UA_DATATYPEKIND_INT16:
+            return 8;
+        case UA_DATATYPEKIND_UINT16:
+            return 9;
+        case UA_DATATYPEKIND_SBYTE:
+            return 10;
+        case UA_DATATYPEKIND_BYTE:
+            return 11;
+        case UA_DATATYPEKIND_BOOLEAN:
+            return 12;
+        case UA_DATATYPEKIND_GUID:
+            return 13;
+        case UA_DATATYPEKIND_STRING:
+            return 14;
+        case UA_DATATYPEKIND_EXPANDEDNODEID:
+            return 15;
+        case UA_DATATYPEKIND_NODEID:
+            return 16;
+        case UA_DATATYPEKIND_LOCALIZEDTEXT:
+            return 17;
+        case UA_DATATYPEKIND_QUALIFIEDNAME:
+            return 18;
+        default:
+            return -1;
+    }
+}
+
 /**********************/
 /* Parse NumericRange */
 /**********************/
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1bd779e17b3..dbac6e9585f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -348,6 +348,10 @@ if(UA_ENABLE_SUBSCRIPTIONS)
   add_executable(check_subscription_events server/check_subscription_events.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
   target_link_libraries(check_subscription_events ${LIBS})
   add_test_valgrind(subscription_events ${TESTS_BINARY_DIR}/check_subscription_events)
+
+  add_executable(check_subscription_event_filter server/check_subscription_event_filter.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+  target_link_libraries(check_subscription_event_filter ${LIBS})
+  add_test_valgrind(check_subscription_event_filter ${TESTS_BINARY_DIR}/check_subscription_event_filter)
 endif()
 
 add_executable(check_nodestore server/check_nodestore.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
new file mode 100644
index 00000000000..1d153adb1c9
--- /dev/null
+++ b/tests/server/check_subscription_event_filter.c
@@ -0,0 +1,799 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*
+*    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
+*/
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include "server/ua_server_internal.h"
+#include "server/ua_services.h"
+
+#include <open62541/client_config_default.h>
+#include <open62541/client_subscriptions.h>
+
+#include <check.h>
+
+#include "testing_clock.h"
+#include "thread_wrapper.h"
+
+static UA_Server *server;
+static UA_Boolean running;
+static size_t serverIterations;
+static THREAD_HANDLE server_thread;
+static MUTEX_HANDLE serverMutex;
+UA_NodeId EventType_A_Layer_1, EventType_B_Layer_1, EventType_C_Layer_2, EventType_D_Layer_3;
+
+UA_Client *client;
+static UA_UInt32 subscriptionId;
+static UA_UInt32 monitoredItemId;
+
+UA_Double publishingInterval = 500.0;
+static UA_SimpleAttributeOperand *selectClauses;
+static UA_Boolean notificationReceived;
+static UA_UInt32 defaultSlectClauseSize = 4;
+static UA_NodeId eventType;
+
+static void
+addEventType(char* name, UA_NodeId parentNodeId, UA_NodeId requestedId, UA_NodeId* newEventType) {
+    UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
+    attr.description = UA_LOCALIZEDTEXT("en-US", name);
+    UA_StatusCode retval = UA_Server_addObjectTypeNode(server, requestedId,
+                                                       parentNodeId,
+                                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
+                                                       UA_QUALIFIEDNAME(0, name),
+                                                       attr, NULL, newEventType);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+}
+
+/* Event Structure below
+         EventType
+             - EventType_A_Layer_1
+             - EventType_B_Layer_1
+                 - EventType_C_Layer_2
+                     - EventType_D_Layer_3
+*/
+static void addEventTypes(void){
+    addEventType("EventType_A_Layer_1",
+                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE),
+                  UA_NODEID_NUMERIC(1, 5000),
+                  &EventType_A_Layer_1);
+    addEventType("EventType_B_Layer_1",
+                 UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE),
+                 UA_NODEID_NUMERIC(1, 5001),
+                 &EventType_B_Layer_1);
+    addEventType("EventType_C_Layer_2",
+                 EventType_B_Layer_1,
+                 UA_NODEID_NUMERIC(1, 5002),
+                 &EventType_C_Layer_2);
+    addEventType("EventType_D_Layer_3",
+                 EventType_C_Layer_2,
+                 UA_NODEID_NUMERIC(1, 5003),
+                 &EventType_D_Layer_3);
+}
+
+static void
+setupSelectClauses(void) {
+    /* Check for severity (set manually), message (set manually), eventType
+     * (automatic) and sourceNode (automatic) */
+    selectClauses = (UA_SimpleAttributeOperand *)
+        UA_Array_new(defaultSlectClauseSize, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+    ck_assert_ptr_ne(selectClauses, NULL);
+    for(size_t i = 0; i < defaultSlectClauseSize; ++i) {
+        UA_SimpleAttributeOperand_init(&selectClauses[i]);
+        selectClauses[i].typeDefinitionId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
+        selectClauses[i].browsePathSize = 1;
+        selectClauses[i].attributeId = UA_ATTRIBUTEID_VALUE;
+        selectClauses[i].browsePath = (UA_QualifiedName *)
+            UA_Array_new(selectClauses[i].browsePathSize, &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
+        ck_assert_ptr_ne(selectClauses[i].browsePath, NULL);
+    }
+    selectClauses[0].browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "Severity");
+    selectClauses[1].browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "Message");
+    selectClauses[2].browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "EventType");
+    selectClauses[3].browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "SourceNode");
+}
+
+static void
+handler_events_simple(UA_Client *lclient, UA_UInt32 subId, void *subContext,
+                      UA_UInt32 monId, void *monContext,
+                      size_t nEventFields, UA_Variant *eventFields) {
+    UA_Boolean foundSeverity = UA_FALSE;
+    UA_Boolean foundMessage = UA_FALSE;
+    UA_Boolean foundType = UA_FALSE;
+    UA_Boolean foundSource = UA_FALSE;
+    ck_assert_uint_eq(*(UA_UInt32 *) monContext, monitoredItemId);
+    ck_assert_uint_eq(nEventFields, defaultSlectClauseSize);
+    /*  check all event fields */
+    for(size_t i = 0; i < nEventFields; i++) {
+        /*  find out which attribute of the event is being looked at */
+        if(UA_Variant_hasScalarType(&eventFields[i], &UA_TYPES[UA_TYPES_UINT16])) {
+            /*  Severity */
+            ck_assert_uint_eq(*((UA_UInt16 *) (eventFields[i].data)), 1000);
+            foundSeverity = UA_TRUE;
+        } else if(UA_Variant_hasScalarType(&eventFields[i], &UA_TYPES[UA_TYPES_LOCALIZEDTEXT])) {
+            /*  Message */
+            UA_LocalizedText comp = UA_LOCALIZEDTEXT("en-US", "Generated Event");
+            ck_assert(UA_String_equal(&((UA_LocalizedText *) eventFields[i].data)->locale, &comp.locale));
+            ck_assert(UA_String_equal(&((UA_LocalizedText *) eventFields[i].data)->text, &comp.text));
+            foundMessage = UA_TRUE;
+        } else if(UA_Variant_hasScalarType(&eventFields[i], &UA_TYPES[UA_TYPES_NODEID])) {
+            /*  either SourceNode or EventType */
+            UA_NodeId serverId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER);
+            if(UA_NodeId_equal((UA_NodeId *) eventFields[i].data, &eventType)) {
+                /*  EventType */
+                foundType = UA_TRUE;
+            } else if(UA_NodeId_equal((UA_NodeId *) eventFields[i].data, &serverId)) {
+                /*  SourceNode */
+                foundSource = UA_TRUE;
+            } else {
+                ck_assert_msg(UA_FALSE, "NodeId doesn't match");
+            }
+        } else {
+            ck_assert_msg(UA_FALSE, "Field doesn't match");
+        }
+    }
+    ck_assert_uint_eq(foundMessage, UA_TRUE);
+    ck_assert_uint_eq(foundSeverity, UA_TRUE);
+    ck_assert_uint_eq(foundType, UA_TRUE);
+    ck_assert_uint_eq(foundSource, UA_TRUE);
+    notificationReceived = true;
+}
+
+static void serverMutexLock(void) {
+    if (!(MUTEX_LOCK(serverMutex))) {
+        fprintf(stderr, "Mutex cannot be locked.\n");
+        exit(1);
+    }
+}
+
+static void serverMutexUnlock(void) {
+    if (!(MUTEX_UNLOCK(serverMutex))) {
+        fprintf(stderr, "Mutex cannot be unlocked.\n");
+        exit(1);
+    }
+}
+
+THREAD_CALLBACK(serverloop) {
+    while (running) {
+        serverMutexLock();
+        UA_Server_run_iterate(server, false);
+        serverIterations++;
+        serverMutexUnlock();
+    }
+    return 0;
+}
+
+static void
+sleepUntilAnswer(UA_Double sleepMs) {
+    UA_fakeSleep((UA_UInt32)sleepMs);
+    serverMutexLock();
+    size_t oldIterations = serverIterations;
+    size_t newIterations;
+    serverMutexUnlock();
+    while(true) {
+        serverMutexLock();
+        newIterations = serverIterations;
+        serverMutexUnlock();
+        if(oldIterations != newIterations)
+            return;
+        UA_realSleep(1);
+    }
+}
+
+static void setup(void){
+    /* Setup Server */
+    if (!MUTEX_INIT(serverMutex)) {
+        fprintf(stderr, "Server mutex was not created correctly.");
+        exit(1);
+    }
+    running = true;
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+
+    config->maxPublishReqPerSession = 5;
+    UA_Server_run_startup(server);
+    addEventTypes();
+    THREAD_CREATE(server_thread, serverloop);
+
+    /* Setup Client */
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    if(retval != UA_STATUSCODE_GOOD) {
+        fprintf(stderr, "Client can not connect to opc.tcp://localhost:4840. %s",
+                UA_StatusCode_name(retval));
+        exit(1);
+    }
+    /*  Create subscription */
+    UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
+    UA_CreateSubscriptionResponse response =
+        UA_Client_Subscriptions_create(client, request, NULL, NULL, NULL);
+    subscriptionId = response.subscriptionId;
+    sleepUntilAnswer(publishingInterval + 100);
+}
+
+static void
+removeSubscription(void) {
+    UA_DeleteSubscriptionsRequest deleteSubscriptionsRequest;
+    UA_DeleteSubscriptionsRequest_init(&deleteSubscriptionsRequest);
+    UA_UInt32 removeId = subscriptionId;
+    deleteSubscriptionsRequest.subscriptionIdsSize = 1;
+    deleteSubscriptionsRequest.subscriptionIds = &removeId;
+
+    UA_DeleteSubscriptionsResponse deleteSubscriptionsResponse;
+    UA_DeleteSubscriptionsResponse_init(&deleteSubscriptionsResponse);
+    UA_LOCK(&server->serviceMutex);
+    Service_DeleteSubscriptions(server, &server->adminSession, &deleteSubscriptionsRequest,
+                                &deleteSubscriptionsResponse);
+    UA_UNLOCK(&server->serviceMutex);
+    UA_DeleteSubscriptionsResponse_clear(&deleteSubscriptionsResponse);
+}
+
+static void teardown(void) {
+    /* Delete Server */
+    running = false;
+    THREAD_JOIN(server_thread);
+    removeSubscription();
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+
+    /* Delete Client */
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+    if (!MUTEX_DESTROY(serverMutex)) {
+        fprintf(stderr, "Server mutex was not destroyed correctly.");
+        exit(1);
+    }
+}
+
+static UA_MonitoredItemCreateResult
+addMonitoredItem(UA_Client_EventNotificationCallback handler, UA_EventFilter *filter, bool discardOldest) {
+    UA_MonitoredItemCreateRequest item;
+    UA_MonitoredItemCreateRequest_init(&item);
+    item.itemToMonitor.nodeId = UA_NODEID_NUMERIC(0, 2253); /*  Root->Objects->Server */
+    item.itemToMonitor.attributeId = UA_ATTRIBUTEID_EVENTNOTIFIER;
+    item.monitoringMode = UA_MONITORINGMODE_REPORTING;
+
+    if (filter) {
+        item.requestedParameters.filter.encoding = UA_EXTENSIONOBJECT_DECODED;
+        item.requestedParameters.filter.content.decoded.data = filter;
+        item.requestedParameters.filter.content.decoded.type = &UA_TYPES[UA_TYPES_EVENTFILTER];
+    }
+
+    item.requestedParameters.queueSize = 1;
+    item.requestedParameters.discardOldest = discardOldest;
+
+    return UA_Client_MonitoredItems_createEvent(client, subscriptionId,
+                                                UA_TIMESTAMPSTORETURN_BOTH, item,
+                                                &monitoredItemId, handler, NULL);
+}
+
+static UA_StatusCode
+eventSetup(UA_NodeId *eventNodeId) {
+    UA_StatusCode retval;
+    serverMutexLock();
+    retval = UA_Server_createEvent(server, eventType, eventNodeId);
+    serverMutexUnlock();
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    /*  add a severity to the event */
+    UA_Variant value;
+    UA_RelativePathElement rpe;
+    UA_RelativePathElement_init(&rpe);
+    rpe.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY);
+    rpe.isInverse = false;
+    rpe.includeSubtypes = false;
+    UA_BrowsePath bp;
+    UA_BrowsePath_init(&bp);
+    bp.startingNode = *eventNodeId;
+    bp.relativePath.elementsSize = 1;
+    bp.relativePath.elements = &rpe;
+    rpe.targetName = UA_QUALIFIEDNAME(0, "Severity");
+    serverMutexLock();
+    UA_BrowsePathResult bpr = UA_Server_translateBrowsePathToNodeIds(server, &bp);
+    serverMutexUnlock();
+    ck_assert_uint_eq(bpr.statusCode, UA_STATUSCODE_GOOD);
+    /*  number with no special meaning */
+    UA_UInt16 eventSeverity = 1000;
+    UA_Variant_setScalar(&value, &eventSeverity, &UA_TYPES[UA_TYPES_UINT16]);
+    serverMutexLock();
+    retval = UA_Server_writeValue(server, bpr.targets[0].targetId.nodeId, value);
+    serverMutexUnlock();
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_BrowsePathResult_clear(&bpr);
+
+    /* add a message to the event */
+    rpe.targetName = UA_QUALIFIEDNAME(0, "Message");
+    serverMutexLock();
+    bpr = UA_Server_translateBrowsePathToNodeIds(server, &bp);
+    serverMutexUnlock();
+    ck_assert_uint_eq(bpr.statusCode, UA_STATUSCODE_GOOD);
+    UA_LocalizedText message = UA_LOCALIZEDTEXT("en-US", "Generated Event");
+    UA_Variant_setScalar(&value, &message, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+    serverMutexLock();
+    retval = UA_Server_writeValue(server, bpr.targets[0].targetId.nodeId, value);
+    serverMutexUnlock();
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_BrowsePathResult_clear(&bpr);
+
+    return retval;
+}
+
+static UA_StatusCode
+triggerEventLocked(const UA_NodeId eventNodeId, const UA_NodeId origin,
+                   UA_ByteString *outEventId, const UA_Boolean deleteEventNode) {
+    serverMutexLock();
+    UA_StatusCode retval = UA_Server_triggerEvent(server, eventNodeId, origin,
+                                                  outEventId, deleteEventNode);
+    serverMutexUnlock();
+    return retval;
+}
+
+static void deleteMonitoredItems(void){
+    /*  delete the monitoredItem */
+    UA_DeleteMonitoredItemsRequest deleteRequest;
+    UA_DeleteMonitoredItemsRequest_init(&deleteRequest);
+    deleteRequest.subscriptionId = subscriptionId;
+    deleteRequest.monitoredItemIds = &monitoredItemId;
+    deleteRequest.monitoredItemIdsSize = 1;
+
+    UA_DeleteMonitoredItemsResponse deleteResponse =
+        UA_Client_MonitoredItems_delete(client, deleteRequest);
+
+    sleepUntilAnswer(publishingInterval + 100);
+    ck_assert_uint_eq(deleteResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(deleteResponse.resultsSize, 1);
+    ck_assert_uint_eq(*(deleteResponse.results), UA_STATUSCODE_GOOD);
+
+    UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
+}
+
+static void
+checkForEvent(UA_MonitoredItemCreateResult *createResult, UA_Boolean expect){
+    /*  let the client fetch the event and check if the correct values were received */
+    notificationReceived = false;
+    sleepUntilAnswer(publishingInterval + 100);
+    UA_StatusCode retval = UA_Client_run_iterate(client, 0);
+    sleepUntilAnswer(publishingInterval + 100);
+    retval |= UA_Client_run_iterate(client, 0);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(notificationReceived, expect);
+    ck_assert_uint_eq(createResult->revisedQueueSize, 1);
+}
+
+/*  helper functions for the generation of the content-filter */
+static void
+setupContentFilter(UA_ContentFilter *contentFilter, size_t elements){
+    UA_ContentFilter_init(contentFilter);
+    contentFilter->elementsSize = elements;
+    contentFilter->elements  = (UA_ContentFilterElement *)
+        UA_Array_new(contentFilter->elementsSize, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+    ck_assert_ptr_ne(contentFilter->elements, NULL);
+    for(size_t i = 0; i < contentFilter->elementsSize; ++i) {
+        UA_ContentFilterElement_init(&contentFilter->elements[i]);
+    }
+}
+
+static void
+setupOperandArrays(UA_ContentFilterElement *contentFilterElement){
+    contentFilterElement->filterOperands = (UA_ExtensionObject*)
+        UA_Array_new(
+            contentFilterElement->filterOperandsSize, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    ck_assert_ptr_ne(contentFilterElement->filterOperands, NULL);
+    for(size_t n =0; n< contentFilterElement->filterOperandsSize; ++n) {
+        UA_ExtensionObject_init(&contentFilterElement->filterOperands[n]);
+    }
+}
+
+static void
+setupNotFilter(UA_ContentFilterElement *element){
+    element->filterOperator = UA_FILTEROPERATOR_NOT;
+    element->filterOperandsSize = 1;
+    setupOperandArrays(element);
+}
+
+static void
+setupOfTypeFilter(UA_ContentFilterElement *element){
+    element->filterOperator = UA_FILTEROPERATOR_OFTYPE;
+    element->filterOperandsSize = 1;
+    setupOperandArrays(element);
+}
+
+static void
+setupEqualsFilter(UA_ContentFilterElement *element, UA_FilterOperator compareOperator){
+    switch(compareOperator) {
+    case UA_FILTEROPERATOR_EQUALS:
+        element->filterOperator = UA_FILTEROPERATOR_EQUALS;
+        break;
+    case UA_FILTEROPERATOR_LESSTHAN:
+        element->filterOperator = UA_FILTEROPERATOR_LESSTHAN;
+        break;
+    case UA_FILTEROPERATOR_GREATERTHAN:
+        element->filterOperator = UA_FILTEROPERATOR_GREATERTHAN;
+        break;
+    default:
+        element->filterOperator = UA_FILTEROPERATOR_EQUALS;
+        break;
+    }
+    element->filterOperandsSize = 2;
+    setupOperandArrays(element);
+}
+
+static void
+setupBetweenFilter(UA_ContentFilterElement *element){
+    element->filterOperator = UA_FILTEROPERATOR_BETWEEN;
+    element->filterOperandsSize = 3;
+    setupOperandArrays(element);
+}
+
+static void
+setupInListFilter(UA_ContentFilterElement *element, UA_UInt16 elements){
+    element->filterOperator = UA_FILTEROPERATOR_INLIST;
+    element->filterOperandsSize = elements;
+    setupOperandArrays(element);
+}
+
+/*static void
+setupElementOperand(UA_ContentFilterElement *element, size_t count, UA_UInt32 *indexes){
+    for(size_t i = 0; i < count; ++i) {
+        element->filterOperands[i].content.decoded.type = &UA_TYPES[UA_TYPES_ELEMENTOPERAND];
+        element->filterOperands[i].encoding = UA_EXTENSIONOBJECT_DECODED;
+        UA_ElementOperand *firstElementOperand = UA_ElementOperand_new();
+        UA_ElementOperand_init(firstElementOperand);
+        firstElementOperand->index = indexes[i];
+        element->filterOperands[i].content.decoded.data = firstElementOperand;
+    }
+}*/
+
+static void
+setupLiteralOperand(UA_ContentFilterElement *element, size_t count, UA_Variant *literals){
+    for(size_t i = 0; i < count; ++i) {
+        element->filterOperands[i].content.decoded.type = &UA_TYPES[UA_TYPES_LITERALOPERAND];
+        element->filterOperands[i].encoding = UA_EXTENSIONOBJECT_DECODED;
+        UA_LiteralOperand *literalOperand = UA_LiteralOperand_new();
+        UA_LiteralOperand_init(literalOperand);
+        literalOperand->value = literals[i];
+        element->filterOperands[i].content.decoded.data = literalOperand;
+    }
+}
+
+/* Test Case "not-Operator" Description:
+ Phase 1:
+  Action -> Fire default "EventType_A_Layer_1" Event
+  Event-Source: Server-Object
+  Filters: Select(Severity, Message, EventType, SourceNode) Where (!true)
+  Expect: No Notification
+Phase 2:
+  Action -> Fire default "EventType_A_Layer_1" Event
+  Event-Source: Server-Object
+  Filters: Select(Severity, Message, EventType, SourceNode) Where (!false)
+  Expect: Get Notification */
+START_TEST(notOperatorValidation) {
+    /* setup event filter */
+    UA_EventFilter filter;
+    UA_EventFilter_init(&filter);
+    setupSelectClauses();
+    filter.selectClauses = selectClauses;
+    filter.selectClausesSize = defaultSlectClauseSize;
+    setupContentFilter(&filter.whereClause, 1);
+    setupNotFilter(&filter.whereClause.elements[0]);
+    UA_Boolean condition = true;
+    UA_Variant literalContent;
+    UA_Variant_init(&literalContent);
+    UA_Variant_setScalar(&literalContent, &condition, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 1, &literalContent);
+    /* setup event */
+    eventType = EventType_A_Layer_1;
+    UA_NodeId eventNodeId;
+    UA_StatusCode retval = eventSetup(&eventNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    /*  add a monitored item (with filter) */
+    UA_MonitoredItemCreateResult createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    checkForEvent(&createResult, false);
+    deleteMonitoredItems();
+    UA_free(filter.whereClause.elements[0].filterOperands->content.decoded.data);
+
+    condition = false;
+    UA_Variant_setScalarCopy(&literalContent, &condition, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 1, &literalContent);
+    createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    eventSetup(&eventNodeId);
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, true);
+    deleteMonitoredItems();
+    UA_EventFilter_clear(&filter);
+} END_TEST
+
+/* Test Case "ofType-Operator" Description:
+ Phase 1:
+  Action -> Fire default "EventType_A_Layer_1" Event
+  Event-Source: Server-Object
+  Filters: Select(Severity, Message, EventType, SourceNode) Where (ofType EventType_B_Layer_1)
+  Expect: No Notification
+Phase 2:
+  Action -> Fire default "EventType_B_Layer_1" Event
+  Event-Source: Server-Object
+  Filters: Select(Severity, Message, EventType, SourceNode) Where (ofType EventType_B_Layer_1)
+  Expect: Get Notification
+*/
+START_TEST(ofTypeOperatorValidation) {
+    /* setup event filter */
+    UA_EventFilter filter;
+    UA_EventFilter_init(&filter);
+    setupSelectClauses();
+    filter.selectClauses = selectClauses;
+    filter.selectClausesSize = defaultSlectClauseSize;
+    setupContentFilter(&filter.whereClause, 1);
+    setupOfTypeFilter(&filter.whereClause.elements[0]);
+    UA_Variant literalContent;
+    UA_NodeId *nodeId = UA_NodeId_new();
+    UA_NodeId_init(nodeId);
+    *nodeId = EventType_B_Layer_1;
+    UA_Variant_setScalar(&literalContent, nodeId, &UA_TYPES[UA_TYPES_NODEID]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 1, &literalContent);
+    /* setup event */
+    eventType = EventType_A_Layer_1;
+    UA_NodeId eventNodeId;
+    UA_StatusCode retval = eventSetup(&eventNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    /*  add a monitored item (with filter) */
+    UA_MonitoredItemCreateResult createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, false);
+    /*  trigger the event */
+    eventType = EventType_B_Layer_1;
+    eventSetup(&eventNodeId);
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, true);
+    deleteMonitoredItems();
+    UA_EventFilter_clear(&filter);
+} END_TEST
+
+START_TEST(orTypeOperatorValidation) {
+
+} END_TEST
+
+START_TEST(andTypeOperatorValidation) {
+
+} END_TEST
+
+START_TEST(equalOperatorValidation) {
+    /*  setup event filter */
+    UA_EventFilter filter;
+    UA_EventFilter_init(&filter);
+    setupSelectClauses();
+    filter.selectClauses = selectClauses;
+    filter.selectClausesSize = defaultSlectClauseSize;
+    setupContentFilter(&filter.whereClause, 1);
+    setupEqualsFilter(&filter.whereClause.elements[0], UA_FILTEROPERATOR_EQUALS);
+    /*  setup operands */
+    UA_UInt32 left = 62541;
+    UA_UInt32 right = 62541;
+    UA_Variant literalContent[2];
+    memset(literalContent, 0, sizeof(UA_Variant) * 2);
+    UA_Variant_setScalar(&literalContent[0], &left, &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant_setScalar(&literalContent[1], &right, &UA_TYPES[UA_TYPES_UINT32]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 2, literalContent);
+    /*  setup event */
+    eventType = EventType_A_Layer_1;
+    UA_NodeId eventNodeId;
+    UA_StatusCode retval = eventSetup(&eventNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    /*  add a monitored item (with filter) */
+    UA_MonitoredItemCreateResult createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, true);
+    deleteMonitoredItems();
+    UA_free(filter.whereClause.elements->filterOperands[0].content.decoded.data);
+    UA_free(filter.whereClause.elements->filterOperands[1].content.decoded.data);
+
+    left = 62542;
+    UA_Variant_setScalar(&literalContent[0], &left, &UA_TYPES[UA_TYPES_UINT32]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 2, literalContent);
+    createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    eventSetup(&eventNodeId);
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, false);
+    deleteMonitoredItems();
+    UA_free(filter.whereClause.elements->filterOperands[0].content.decoded.data);
+    UA_free(filter.whereClause.elements->filterOperands[1].content.decoded.data);
+
+    /* test types wich need implicit cast */
+    UA_UInt64 left_big = 62541;
+    UA_Variant_setScalar(&literalContent[0], &left_big, &UA_TYPES[UA_TYPES_UINT64]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 2, literalContent);
+    createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    eventSetup(&eventNodeId);
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, true);
+    deleteMonitoredItems();
+    UA_free(filter.whereClause.elements->filterOperands[0].content.decoded.data);
+    UA_free(filter.whereClause.elements->filterOperands[1].content.decoded.data);
+
+    /*  check equal with nodeid */
+    UA_NodeId left_nodeid = UA_NODEID_NUMERIC(0, 14123);
+    UA_NodeId right_nodeid = UA_NODEID_NUMERIC(0, 14123);
+    memset(literalContent, 0, sizeof(UA_Variant) * 2);
+    UA_Variant_setScalarCopy(&literalContent[0], &left_nodeid, &UA_TYPES[UA_TYPES_NODEID]);
+    UA_Variant_setScalarCopy(&literalContent[1], &right_nodeid, &UA_TYPES[UA_TYPES_NODEID]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 2, literalContent);
+    /*  setup event */
+    eventType = EventType_A_Layer_1;
+    eventSetup(&eventNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    /*  add a monitored item (with filter) */
+    createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, true);
+    deleteMonitoredItems();
+    UA_EventFilter_clear(&filter);
+    } END_TEST
+
+START_TEST(orderedCompareOperatorValidation) {
+    /*  setup event filter */
+    UA_EventFilter filter;
+    UA_EventFilter_init(&filter);
+    setupSelectClauses();
+    filter.selectClauses = selectClauses;
+    filter.selectClausesSize = defaultSlectClauseSize;
+    setupContentFilter(&filter.whereClause, 1);
+    setupEqualsFilter(&filter.whereClause.elements[0], UA_FILTEROPERATOR_LESSTHAN);
+    /*  setup operands */
+    UA_UInt32 left = 100;
+    UA_UInt32 right = 1000;
+    UA_Variant literalContent[2];
+    memset(literalContent, 0, sizeof(UA_Variant) * 2);
+    UA_Variant_setScalarCopy(&literalContent[0], &left, &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant_setScalarCopy(&literalContent[1], &right, &UA_TYPES[UA_TYPES_UINT32]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 2, literalContent);
+    /*  setup event */
+    eventType = EventType_A_Layer_1;
+    UA_NodeId eventNodeId;
+    UA_StatusCode retval = eventSetup(&eventNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    /*  add a monitored item (with filter) */
+    UA_MonitoredItemCreateResult createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, true);
+    deleteMonitoredItems();
+    UA_EventFilter_clear(&filter);
+} END_TEST
+
+START_TEST(betweenOperatorValidation) {
+    /*  setup event filter */
+    UA_EventFilter filter;
+    UA_EventFilter_init(&filter);
+    setupSelectClauses();
+    filter.selectClauses = selectClauses;
+    filter.selectClausesSize = defaultSlectClauseSize;
+    setupContentFilter(&filter.whereClause, 1);
+    setupBetweenFilter(&filter.whereClause.elements[0]);
+    /*  setup operands */
+    UA_UInt32 range_element = 40;
+    UA_UInt32 range_start = 10;
+    UA_UInt32 range_stop = 100;
+    UA_Variant literalContent[3];
+    memset(literalContent, 0, sizeof(UA_Variant) * 3);
+    UA_Variant_setScalarCopy(&literalContent[0], &range_element, &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant_setScalarCopy(&literalContent[1], &range_start, &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant_setScalarCopy(&literalContent[2], &range_stop, &UA_TYPES[UA_TYPES_UINT32]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 3, literalContent);
+    /*  setup event */
+    eventType = EventType_A_Layer_1;
+    UA_NodeId eventNodeId;
+    UA_StatusCode retval = eventSetup(&eventNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    /*  add a monitored item (with filter) */
+    UA_MonitoredItemCreateResult createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, true);
+    deleteMonitoredItems();
+    UA_EventFilter_clear(&filter);
+} END_TEST
+
+START_TEST(inListOperatorValidation) {
+    /*  setup event filter */
+    UA_EventFilter filter;
+    UA_EventFilter_init(&filter);
+    setupSelectClauses();
+    filter.selectClauses = selectClauses;
+    filter.selectClausesSize = defaultSlectClauseSize;
+    setupContentFilter(&filter.whereClause, 1);
+    setupInListFilter(&filter.whereClause.elements[0], 4);
+    /*  setup operands */
+    UA_UInt32 target_element = 40;
+    UA_UInt32 element_1 = 10;
+    UA_UInt32 element_2 = 100;
+    UA_UInt32 element_3 = 40;
+    UA_Variant literalContent[4];
+    memset(literalContent, 0, sizeof(UA_Variant) * 4);
+    UA_Variant_setScalarCopy(&literalContent[0], &target_element, &UA_TYPES[UA_TYPES_INT32]);
+    UA_Variant_setScalarCopy(&literalContent[1], &element_1, &UA_TYPES[UA_TYPES_INT32]);
+    UA_Variant_setScalarCopy(&literalContent[2], &element_2, &UA_TYPES[UA_TYPES_INT32]);
+    UA_Variant_setScalarCopy(&literalContent[3], &element_3, &UA_TYPES[UA_TYPES_INT32]);
+    setupLiteralOperand(&filter.whereClause.elements[0], 4, literalContent);
+    /*  setup event */
+    eventType = EventType_A_Layer_1;
+    UA_NodeId eventNodeId;
+    UA_StatusCode retval = eventSetup(&eventNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    /*  add a monitored item (with filter) */
+    UA_MonitoredItemCreateResult createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    monitoredItemId = createResult.monitoredItemId;
+    /*  trigger the event */
+    retval = triggerEventLocked(eventNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER), NULL, UA_TRUE);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    checkForEvent(&createResult, true);
+    deleteMonitoredItems();
+    UA_EventFilter_clear(&filter);
+} END_TEST
+
+static Suite *testSuite_Client(void) {
+    Suite *s = suite_create("Server Subscription Event Filters");
+    TCase *tc_server = tcase_create("Basic Event Filters");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, notOperatorValidation);
+    tcase_add_test(tc_server, ofTypeOperatorValidation);
+    tcase_add_test(tc_server, orTypeOperatorValidation);
+    tcase_add_test(tc_server, andTypeOperatorValidation);
+    tcase_add_test(tc_server, equalOperatorValidation);
+    tcase_add_test(tc_server, orderedCompareOperatorValidation);
+    tcase_add_test(tc_server, betweenOperatorValidation);
+    tcase_add_test(tc_server, inListOperatorValidation);
+
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 482c98760bd861610442211379978f6136c2eb7f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Dec 2021 00:17:53 +0100
Subject: [PATCH 0023/1963] refactor(server): Split event filter into separate
 file

---
 CMakeLists.txt                             |    4 +-
 src/server/ua_server_internal.h            |    9 +
 src/server/ua_subscription_events.c        | 1202 +------------------
 src/server/ua_subscription_events_filter.c | 1203 ++++++++++++++++++++
 4 files changed, 1220 insertions(+), 1198 deletions(-)
 create mode 100644 src/server/ua_subscription_events_filter.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ba62a51d45..489a0dea104 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1118,7 +1118,9 @@ if(UA_ENABLE_SUBSCRIPTIONS)
         if(UA_NAMESPACE_ZERO STREQUAL "MINIMAL")
             message(FATAL_ERROR "Events require at least the reduced Namespace Zero")
         endif()
-        list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_subscription_events.c)
+        list(APPEND lib_sources
+                    ${PROJECT_SOURCE_DIR}/src/server/ua_subscription_events.c
+                    ${PROJECT_SOURCE_DIR}/src/server/ua_subscription_events_filter.c)
         if(UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS)
             list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_subscription_alarms_conditions.c)
         endif()
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 0391546f6d3..3db6e6af0a9 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -387,11 +387,20 @@ void monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *monitored
 UA_Subscription *
 UA_Server_getSubscriptionById(UA_Server *server, UA_UInt32 subscriptionId);
 
+#ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
 UA_StatusCode
 triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
              const UA_NodeId origin, UA_ByteString *outEventId,
              const UA_Boolean deleteEventNode);
 
+/* Filters the given event with the given filter and writes the results into a
+ * notification */
+UA_StatusCode
+filterEvent(UA_Server *server, UA_Session *session,
+            const UA_NodeId *eventNode, UA_EventFilter *filter,
+            UA_EventFieldList *efl, UA_EventFilterResult *result);
+
+#endif /* UA_ENABLE_SUBSCRIPTIONS_EVENTS */
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
 UA_BrowsePathResult
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index c97c52d0c74..046841e88cf 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -12,19 +12,6 @@
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
 
-typedef struct {
-    UA_Server *server;
-    UA_Session *session;
-    const UA_NodeId *eventNode;
-    const UA_ContentFilter *contentFilter;
-    UA_ContentFilterResult *contentFilterResult;
-    UA_Variant *valueResult;
-    UA_UInt16 index;
-} UA_FilterOperatorContext;
-
-static UA_StatusCode
-evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx);
-
 /* We use a 16-Byte ByteString as an identifier */
 UA_StatusCode
 UA_Event_generateEventId(UA_ByteString *generatedId) {
@@ -117,957 +104,6 @@ UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_Boolean
-isValidEvent(UA_Server *server, const UA_NodeId *validEventParent,
-             const UA_NodeId *eventId) {
-    /* find the eventType variableNode */
-    UA_QualifiedName findName = UA_QUALIFIEDNAME(0, "EventType");
-    UA_BrowsePathResult bpr = browseSimplifiedBrowsePath(server, *eventId, 1, &findName);
-    if(bpr.statusCode != UA_STATUSCODE_GOOD || bpr.targetsSize < 1) {
-        UA_BrowsePathResult_clear(&bpr);
-        return false;
-    }
-
-    /* Get the EventType Property Node */
-    UA_Variant tOutVariant;
-    UA_Variant_init(&tOutVariant);
-
-    /* Read the Value of EventType Property Node (the Value should be a NodeId) */
-    UA_StatusCode retval = readWithReadValue(server, &bpr.targets[0].targetId.nodeId,
-                                             UA_ATTRIBUTEID_VALUE, &tOutVariant);
-    if(retval != UA_STATUSCODE_GOOD ||
-       !UA_Variant_hasScalarType(&tOutVariant, &UA_TYPES[UA_TYPES_NODEID])) {
-        UA_BrowsePathResult_clear(&bpr);
-        return false;
-    }
-
-    const UA_NodeId *tEventType = (UA_NodeId*)tOutVariant.data;
-
-    /* check whether the EventType is a Subtype of CondtionType
-     * (Part 9 first implementation) */
-    UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
-    if(UA_NodeId_equal(validEventParent, &conditionTypeId) &&
-       isNodeInTree_singleRef(server, tEventType, &conditionTypeId,
-                              UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-        UA_BrowsePathResult_clear(&bpr);
-        UA_Variant_clear(&tOutVariant);
-        return true;
-    }
-
-    /*EventType is not a Subtype of CondtionType
-     *(ConditionId Clause won't be present in Events, which are not Conditions)*/
-    /* check whether Valid Event other than Conditions */
-    UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
-    UA_Boolean isSubtypeOfBaseEvent =
-        isNodeInTree_singleRef(server, tEventType, &baseEventTypeId,
-                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
-
-    UA_BrowsePathResult_clear(&bpr);
-    UA_Variant_clear(&tOutVariant);
-    return isSubtypeOfBaseEvent;
-}
-
-/* Resolves a variant of type string or boolean into a corresponding status code */
-static UA_StatusCode
-resolveBoolean(UA_Variant operand) {
-    UA_String value;
-    value = UA_STRING("True");
-    if(((operand.type == &UA_TYPES[UA_TYPES_STRING]) &&
-        (UA_String_equal((UA_String *)operand.data, &value))) ||
-       ((operand.type == &UA_TYPES[UA_TYPES_BOOLEAN]) &&
-        (*(UA_Boolean *)operand.data == UA_TRUE))) {
-        return UA_STATUSCODE_GOOD;
-    }
-    value = UA_STRING("False");
-    if(((operand.type == &UA_TYPES[UA_TYPES_STRING]) &&
-        (UA_String_equal((UA_String *)operand.data, &value))) ||
-       ((operand.type == &UA_TYPES[UA_TYPES_BOOLEAN]) &&
-        (*(UA_Boolean *)operand.data == UA_FALSE))) {
-        return UA_STATUSCODE_BADNOMATCH;
-    }
-
-    /* If the operand can't be resolved, an error is returned */
-    return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-}
-
-/* Part 4: 7.4.4.5 SimpleAttributeOperand
- * The clause can point to any attribute of nodes. Either a child of the event
- * node and also the event type. */
-static UA_StatusCode
-resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session, const UA_NodeId *origin,
-                              const UA_SimpleAttributeOperand *sao, UA_Variant *value) {
-    /* Prepare the ReadValueId */
-    UA_ReadValueId rvi;
-    UA_ReadValueId_init(&rvi);
-    rvi.indexRange = sao->indexRange;
-    rvi.attributeId = sao->attributeId;
-
-    UA_DataValue v;
-
-    if(sao->browsePathSize == 0) {
-        /* If this list (browsePath) is empty, the Node is the instance of the
-         * TypeDefinition. (Part 4, 7.4.4.5) */
-        rvi.nodeId = *origin;
-
-        /* A Condition is an indirection. Look up the target node. */
-        /* TODO: check for Branches! One Condition could have multiple Branches */
-        UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
-        if(UA_NodeId_equal(&sao->typeDefinitionId, &conditionTypeId)) {
-#ifdef UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS
-            UA_StatusCode res = UA_getConditionId(server, origin, &rvi.nodeId);
-            if(res != UA_STATUSCODE_GOOD)
-                return res;
-#else
-            return UA_STATUSCODE_BADNOTSUPPORTED;
-#endif
-        }
-
-        v = UA_Server_readWithSession(server, session, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-
-    } else {
-        /* Resolve the browse path, starting from the event-source (and not the
-         * typeDefinitionId). */
-        UA_BrowsePathResult bpr =
-            browseSimplifiedBrowsePath(server, *origin, sao->browsePathSize, sao->browsePath);
-        if(bpr.targetsSize == 0 && bpr.statusCode == UA_STATUSCODE_GOOD)
-            bpr.statusCode = UA_STATUSCODE_BADNOTFOUND;
-        if(bpr.statusCode != UA_STATUSCODE_GOOD) {
-            UA_StatusCode res = bpr.statusCode;
-            UA_BrowsePathResult_clear(&bpr);
-            return res;
-        }
-
-        /* Use the first match */
-        rvi.nodeId = bpr.targets[0].targetId.nodeId;
-        v = UA_Server_readWithSession(server, session, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-        UA_BrowsePathResult_clear(&bpr);
-    }
-
-    /* Move the result to the output */
-    if(v.status == UA_STATUSCODE_GOOD && v.hasValue)
-        *value = v.value;
-    else
-        UA_Variant_clear(&v.value);
-    return v.status;
-}
-
-/* Resolve operands to variants according to the operand type.
- * Part 4: 7.17.3 Table 142 specifies the allowed types. */
-static UA_Variant
-resolveOperand(UA_FilterOperatorContext *ctx, UA_UInt16 nr) {
-    UA_StatusCode res;
-    UA_Variant variant;
-    UA_Variant_init(&variant);
-    /*SimpleAttributeOperands*/
-    if(ctx->contentFilter->elements[ctx->index].filterOperands[nr].content.decoded.type ==
-       &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]) {
-        res = resolveSimpleAttributeOperand(ctx->server, ctx->session, ctx->eventNode,
-                                            (UA_SimpleAttributeOperand *)ctx->contentFilter->elements[ctx->index]
-                                            .filterOperands[nr].content.decoded.data,
-                                            &variant);
-        /*LiteralAttribute*/
-    } else if(ctx->contentFilter->elements[ctx->index].filterOperands[nr].content.decoded.type ==
-              &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
-        variant = ((UA_LiteralOperand *)ctx->contentFilter->elements[ctx->index]
-                   .filterOperands[nr].content.decoded.data)->value;
-        res = UA_STATUSCODE_GOOD;
-    } else if(ctx->contentFilter->elements[ctx->index].filterOperands[nr].content.decoded.type ==
-              &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
-        UA_UInt16 oldIndex = ctx->index;
-        ctx->index = (UA_UInt16)((UA_ElementOperand *)ctx->contentFilter->elements[ctx->index]
-                                 .filterOperands[nr].content.decoded.data)->index;
-        res = evaluateWhereClauseContentFilter(ctx);
-        variant = ctx->valueResult[ctx->index];
-        ctx->index = oldIndex; /* restore the old index */
-        /*ElementOperands*/
-    } else {
-        res = UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-    if(res != UA_STATUSCODE_GOOD && res != UA_STATUSCODE_BADNOMATCH) {
-        variant.type = NULL;
-        ctx->contentFilterResult->elementResults[ctx->index].operandStatusCodes[nr] = res;
-    }
-    return variant;
-}
-
-static UA_StatusCode
-ofTypeOperator(UA_FilterOperatorContext *ctx) {
-    UA_ContentFilterElement *pElement = &ctx->contentFilter->elements[ctx->index];
-    UA_Boolean result = false;
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    if(pElement->filterOperandsSize != 1)
-        return UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-    if(pElement->filterOperands[0].content.decoded.type !=
-       &UA_TYPES[UA_TYPES_LITERALOPERAND])
-        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-
-    UA_LiteralOperand *literalOperand =
-        (UA_LiteralOperand *) pElement->filterOperands[0].content.decoded.data;
-    if(!UA_Variant_isScalar(&literalOperand->value))
-        return UA_STATUSCODE_BADEVENTFILTERINVALID;
-
-    if(literalOperand->value.type != &UA_TYPES[UA_TYPES_NODEID] || literalOperand->value.data == NULL)
-        return UA_STATUSCODE_BADEVENTFILTERINVALID;
-
-    UA_NodeId *literalOperandNodeId = (UA_NodeId *) literalOperand->value.data;
-    UA_Variant typeNodeIdVariant;
-    UA_Variant_init(&typeNodeIdVariant);
-    UA_StatusCode readStatusCode =
-        readObjectProperty(ctx->server, *ctx->eventNode,
-                           UA_QUALIFIEDNAME(0, "EventType"), &typeNodeIdVariant);
-    if(readStatusCode != UA_STATUSCODE_GOOD)
-        return readStatusCode;
-
-    if(!UA_Variant_isScalar(&typeNodeIdVariant) ||
-       typeNodeIdVariant.type != &UA_TYPES[UA_TYPES_NODEID] ||
-       typeNodeIdVariant.data == NULL) {
-        UA_LOG_ERROR(&ctx->server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "EventType has an invalid type.");
-        UA_Variant_clear(&typeNodeIdVariant);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    /* check if the eventtype-nodeid is equal to the given oftype argument */
-    result = UA_NodeId_equal((UA_NodeId*) typeNodeIdVariant.data, literalOperandNodeId);
-    /* check if the eventtype-nodeid is a subtype of the given oftype argument */
-    if(!result)
-        result = isNodeInTree_singleRef(ctx->server,
-                                        (UA_NodeId*) typeNodeIdVariant.data,
-                                        literalOperandNodeId,
-                                        UA_REFERENCETYPEINDEX_HASSUBTYPE);
-    UA_Variant_clear(&typeNodeIdVariant);
-    if(!result)
-        return UA_STATUSCODE_BADNOMATCH;
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-andOperator(UA_FilterOperatorContext *ctx) {
-    UA_StatusCode firstBoolean_and = resolveBoolean(resolveOperand(ctx, 0));
-    if(firstBoolean_and == UA_STATUSCODE_BADNOMATCH) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_BADNOMATCH;
-    }
-    /* Evaluation of second operand */
-    UA_StatusCode secondBoolean = resolveBoolean(resolveOperand(ctx, 1));
-    /* Filteroperator AND */
-    if(secondBoolean == UA_STATUSCODE_BADNOMATCH) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_BADNOMATCH;
-    }
-    if((firstBoolean_and == UA_STATUSCODE_GOOD) &&
-       (secondBoolean == UA_STATUSCODE_GOOD)) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_GOOD;
-    }
-    return UA_STATUSCODE_BADFILTERELEMENTINVALID;
-}
-
-static UA_StatusCode
-orOperator(UA_FilterOperatorContext *ctx) {
-    UA_StatusCode firstBoolean_or = resolveBoolean(resolveOperand(ctx, 0));
-    if(firstBoolean_or == UA_STATUSCODE_GOOD) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_GOOD;
-    }
-    /* Evaluation of second operand */
-    UA_StatusCode secondBoolean = resolveBoolean(resolveOperand(ctx, 1));
-    if(secondBoolean == UA_STATUSCODE_GOOD) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_GOOD;
-    } 
-    if((firstBoolean_or == UA_STATUSCODE_BADNOMATCH) &&
-       (secondBoolean == UA_STATUSCODE_BADNOMATCH)) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_BADNOMATCH;
-    }
-    return UA_STATUSCODE_BADFILTERELEMENTINVALID;
-}
-
-static UA_Boolean
-isNumericUnsigned(UA_UInt32 dataTypeKind){
-    if(dataTypeKind == UA_DATATYPEKIND_UINT64 ||
-       dataTypeKind == UA_DATATYPEKIND_UINT32 ||
-       dataTypeKind == UA_DATATYPEKIND_UINT16 ||
-       dataTypeKind == UA_DATATYPEKIND_BYTE)
-        return true;
-    return false;
-}
-
-static UA_Boolean
-isNumericSigned(UA_UInt32 dataTypeKind){
-    if(dataTypeKind == UA_DATATYPEKIND_INT64 ||
-       dataTypeKind == UA_DATATYPEKIND_INT32 ||
-       dataTypeKind == UA_DATATYPEKIND_INT16 ||
-       dataTypeKind == UA_DATATYPEKIND_SBYTE)
-        return true;
-    return false;
-}
-
-static UA_Boolean
-isFloatingPoint(UA_UInt32 dataTypeKind){
-    if(dataTypeKind == UA_DATATYPEKIND_FLOAT ||
-       dataTypeKind == UA_DATATYPEKIND_DOUBLE)
-        return true;
-    return false;
-}
-
-static UA_Boolean
-isStringType(UA_UInt32 dataTypeKind){
-    if(dataTypeKind == UA_DATATYPEKIND_STRING ||
-       dataTypeKind == UA_DATATYPEKIND_BYTESTRING)
-        return true;
-    return false;
-}
-
-
-
-static UA_StatusCode
-implicitNumericVariantTransformation(UA_Variant *variant, void *data){
-    if(variant->type == &UA_TYPES[UA_TYPES_UINT64]){
-        *(UA_UInt64 *)data = *(UA_UInt64 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT32]){
-        *(UA_UInt64 *)data = *(UA_UInt32 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT16]){
-        *(UA_UInt64 *)data = *(UA_UInt16 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_BYTE]){
-        *(UA_UInt64 *)data = *(UA_Byte *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_INT64]){
-        *(UA_Int64 *)data = *(UA_Int64 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_INT32]){
-        *(UA_Int64 *)data = *(UA_Int32 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_INT16]){
-        *(UA_Int64 *)data = *(UA_Int16 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
-        *(UA_Int64 *)data = *(UA_SByte *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_DOUBLE]){
-        *(UA_Double *)data = *(UA_Double *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_DOUBLE]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
-        *(UA_Double *)data = *(UA_Float *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_DOUBLE]);
-    } else {
-        return UA_STATUSCODE_BADTYPEMISMATCH;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-/* 0 -> Same Type, 1 -> Implicit Cast, 2 -> Only explicit Cast, -1 -> cast invalid */
-static UA_SByte convertLookup[21][21] = {
-    { 0, 1,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
-    { 2, 0,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
-    {-1,-1, 0,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
-    {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
-    { 2,2,-1,-1, 0,-1, 2,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
-    {-1,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1, 2,-1,-1, 1,-1,-1,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 1,-1, 0,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
-    {-1,-1, 2,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 0, 1, 1,-1, 2,-1, 2,-1,-1, 2, 1, 1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 0, 1,-1, 2, 2, 2,-1,-1, 2, 2, 1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 0,-1, 2, 2, 2,-1,-1, 2, 2, 2,-1},
-    {-1,-1,-1,-1,-1, 1,-1,-1,-1,-1,-1, 0,-1,-1, 1,-1,-1,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 0,-1, 2,-1,-1, 1, 1, 1,-1},
-    {-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1,-1,-1, 0,-1,-1,-1, 2, 1, 1,-1},
-    { 1, 1,-1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1,-1, 0, 2, 2, 1, 1, 1,-1},
-    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 0,-1,-1,-1,-1,-1},
-    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1, 0,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 2, 1, 2,-1,-1, 0, 1, 1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 1, 1,-1, 2, 2, 2,-1,-1, 2, 0, 1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 1,-1, 2, 2, 2,-1,-1, 2, 2, 0,-1},
-    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0}
-};
-
-/* This array maps the index of the
- * standard DataType-Kind order to the
- * order of the type convertion array */
-static UA_Byte dataTypeKindIndex[30] = {
-    0,   12,  1,  8, 17,
-    9,   18, 10, 19,  6,
-    4,   14,  3,  7,  2,
-    20,  11,  5, 13, 16,
-    15, 255,255,255,255,
-    255,255,255,255,255
-};
-
-/*
- * The OPC UA Standard defines in Part 4 several data type casting-rules. (see 1.04 part 4 Table 122)
- * Return:
- *      0 -> same type
- *      1 -> types can be casted implicit
- *      2 -> types can only be explicitly casted
- *     -1 -> types can't be casted
- */
-static UA_SByte
-checkTypeCastingOption(const UA_DataType *cast_target, const UA_DataType *cast_source) {
-    UA_Byte firstOperatorTypeKindIndex = UA_BYTE_MAX;
-    UA_Byte secondOperatorTypeKindIndex = UA_BYTE_MAX;
-    firstOperatorTypeKindIndex = dataTypeKindIndex[cast_target->typeKind];
-    secondOperatorTypeKindIndex = dataTypeKindIndex[cast_source->typeKind];
-
-    if(firstOperatorTypeKindIndex == UA_BYTE_MAX || secondOperatorTypeKindIndex == UA_BYTE_MAX)
-        return -1;
-
-    return convertLookup[firstOperatorTypeKindIndex][secondOperatorTypeKindIndex];
-}
-
-/* Compare operation for equal, gt, le, gte, lee
- * UA_STATUSCODE_GOOD if the comparison was true
- * UA_STATUSCODE_BADNOMATCH if the comparison was false
- * UA_STATUSCODE_BADFILTEROPERATORINVALID for invalid operators
- * UA_STATUSCODE_BADTYPEMISMATCH if one of the operands was not numeric
- * ToDo Array-Casting
- */
-static UA_StatusCode
-compareOperation(UA_Variant *firstOperand, UA_Variant *secondOperand, UA_FilterOperator op) {
-    /* get precedence of the operand types */
-    UA_Int16 firstOperand_precedence = UA_DataType_getPrecedence(firstOperand->type);
-    UA_Int16 secondOperand_precedence = UA_DataType_getPrecedence(secondOperand->type);
-    /* if the types are not equal and one of the precedence-ranks is -1, then there is
-       no implicit conversion possible and therefore no compare */
-    if(!UA_NodeId_equal(&firstOperand->type->typeId, &secondOperand->type->typeId) &&
-       (firstOperand_precedence == -1 || secondOperand_precedence == -1)){
-        return UA_STATUSCODE_BADTYPEMISMATCH;
-    }
-    /* check if the precedence order of the operators is swapped */
-    UA_Variant *firstCompareOperand = firstOperand;
-    UA_Variant *secondCompareOperand = secondOperand;
-    UA_Boolean swapped = false;
-    if (firstOperand_precedence < secondOperand_precedence){
-        firstCompareOperand = secondOperand;
-        secondCompareOperand = firstOperand;
-        swapped = true;
-    }
-    UA_SByte castRule =
-        checkTypeCastingOption(firstCompareOperand->type, secondCompareOperand->type);
-
-    if(!(castRule == 0 || castRule == 1)){
-        return UA_STATUSCODE_BADTYPEMISMATCH;
-    }
-
-    /* The operand Data-Types influence the behavior and steps for the comparison.
-     * We need to check the operand types and store a rule which is used to select
-     * the right behavior afterwards. */
-    enum compareHandlingRuleEnum {
-        UA_TYPES_EQUAL_ORDERED,
-        UA_TYPES_EQUAL_UNORDERED,
-        UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED,
-        UA_TYPES_DIFFERENT_NUMERIC_SIGNED,
-        UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT,
-        UA_TYPES_DIFFERENT_TEXT,
-        UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN,
-        UA_TYPES_DIFFERENT_COMPARE_EXPLIC
-    } compareHandlingRuleEnum;
-
-    if(castRule == 0 &&
-       (UA_DataType_isNumeric(firstOperand->type) ||
-        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_DATETIME ||
-        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_STRING ||
-        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_BYTESTRING)){
-        /* Data-Types with a natural order (allow le, gt, lee, gte) */
-        compareHandlingRuleEnum = UA_TYPES_EQUAL_ORDERED;
-    } else if(castRule == 0){
-        /* Data-Types without a natural order (le, gt, lee, gte are not allowed) */
-        compareHandlingRuleEnum = UA_TYPES_EQUAL_UNORDERED;
-    } else if(castRule == 1 &&
-              isNumericSigned(firstOperand->type->typeKind) &&
-              isNumericSigned(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_SIGNED;
-    } else if(castRule == 1 &&
-              isNumericUnsigned(firstOperand->type->typeKind) &&
-              isNumericUnsigned(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED;
-    } else if(castRule == 1 &&
-              isFloatingPoint(firstOperand->type->typeKind) &&
-              isFloatingPoint(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT;
-    } else if(castRule == 1 &&
-              isStringType(firstOperand->type->typeKind)&&
-              isStringType(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_TEXT;
-    } else if(castRule == -1 || castRule == 2){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_COMPARE_EXPLIC;
-    } else {
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN;
-    }
-
-    if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN)
-        return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-
-    if(swapped){
-        firstCompareOperand = secondCompareOperand;
-        secondCompareOperand = firstCompareOperand;
-    }
-
-    if(op == UA_FILTEROPERATOR_EQUALS){
-        UA_Byte variantContent[16];
-        memset(&variantContent, 0, sizeof(UA_Byte) * 16);
-        if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_SIGNED ||
-           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED ||
-           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT) {
-            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
-            implicitNumericVariantTransformation(secondCompareOperand, &variantContent[8]);
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_TEXT) {
-            firstCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
-            secondCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN ||
-                  compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_EXPLIC ){
-            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-        }
-        if(UA_order(firstCompareOperand, secondCompareOperand, &UA_TYPES[UA_TYPES_VARIANT]) == UA_ORDER_EQ) {
-            return UA_STATUSCODE_GOOD;
-        }
-    } else {
-        UA_Byte variantContent[16];
-        if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_SIGNED ||
-           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED ||
-           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT) {
-            memset(&variantContent, 0, sizeof(UA_Byte) * 16);
-            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
-            implicitNumericVariantTransformation(secondCompareOperand, &variantContent[8]);
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_TEXT) {
-            firstCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
-            secondCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
-        } else if(compareHandlingRuleEnum == UA_TYPES_EQUAL_UNORDERED) {
-            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN ||
-                  compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_EXPLIC) {
-            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-        }
-        UA_Order gte_result = UA_order(firstCompareOperand, secondCompareOperand, &UA_TYPES[UA_TYPES_VARIANT]);
-        if(op == UA_FILTEROPERATOR_LESSTHAN) {
-            if(gte_result == UA_ORDER_LESS) {
-                return UA_STATUSCODE_GOOD;
-            }
-        } else if(op == UA_FILTEROPERATOR_GREATERTHAN) {
-            if(gte_result == UA_ORDER_MORE) {
-                return UA_STATUSCODE_GOOD;
-            }
-        } else if(op == UA_FILTEROPERATOR_LESSTHANOREQUAL) {
-            if(gte_result == UA_ORDER_LESS || gte_result == UA_ORDER_EQ) {
-                return UA_STATUSCODE_GOOD;
-            }
-        } else if(op == UA_FILTEROPERATOR_GREATERTHANOREQUAL) {
-            if(gte_result == UA_ORDER_MORE || gte_result == UA_ORDER_EQ) {
-                return UA_STATUSCODE_GOOD;
-            }
-        }
-    }
-    return UA_STATUSCODE_BADNOMATCH;
-}
-
-static UA_StatusCode
-compareOperator(UA_FilterOperatorContext *ctx) {
-    UA_Variant firstOperand = resolveOperand(ctx, 0);
-    if(UA_Variant_isEmpty(&firstOperand))
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    UA_Variant secondOperand = resolveOperand(ctx, 1);
-    if(UA_Variant_isEmpty(&secondOperand)) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-    /* ToDo remove the following restriction: Add support for arrays */
-    if(!UA_Variant_isScalar(&firstOperand) || !UA_Variant_isScalar(&secondOperand)){
-        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-    }
-    return compareOperation(&firstOperand, &secondOperand,
-                            ctx->contentFilter->elements[ctx->index].filterOperator);
-}
-
-static UA_StatusCode
-bitwiseOperator(UA_FilterOperatorContext *ctx) {
-    /* The bitwise operators all have 2 operands which are evaluated equally. */
-    UA_Variant firstOperand = resolveOperand(ctx, 0);
-    if(UA_Variant_isEmpty(&firstOperand)) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-    UA_Variant secondOperand = resolveOperand(ctx, 1);
-    if(UA_Variant_isEmpty(&secondOperand)) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-
-    UA_Boolean bitwiseAnd =
-        ctx->contentFilter->elements[ctx->index].filterOperator == UA_FILTEROPERATOR_BITWISEAND;
-
-    /* check if the operators are integers */
-    if(!UA_DataType_isNumeric(firstOperand.type) ||
-       !UA_DataType_isNumeric(secondOperand.type) ||
-       !UA_Variant_isScalar(&firstOperand) ||
-       !UA_Variant_isScalar(&secondOperand) ||
-       (firstOperand.type == &UA_TYPES[UA_TYPES_DOUBLE]) ||
-       (secondOperand.type == &UA_TYPES[UA_TYPES_DOUBLE]) ||
-       (secondOperand.type == &UA_TYPES[UA_TYPES_FLOAT]) ||
-       (firstOperand.type == &UA_TYPES[UA_TYPES_FLOAT])) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-
-    /* check which is the return type (higher precedence == bigger integer)*/
-    UA_Int16 precedence = UA_DataType_getPrecedence(firstOperand.type);
-    if(precedence > UA_DataType_getPrecedence(secondOperand.type)) {
-        precedence = UA_DataType_getPrecedence(secondOperand.type);
-    }
-
-    switch(precedence){
-        case 3:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT64];
-            UA_Int64 result_int64;
-            if(bitwiseAnd) {
-                result_int64 = *((UA_Int64 *)firstOperand.data) & *((UA_Int64 *)secondOperand.data);
-            } else {
-                result_int64 = *((UA_Int64 *)firstOperand.data) | *((UA_Int64 *)secondOperand.data);
-            }
-            UA_Int64_copy(&result_int64, (UA_Int64 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 4:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT64];
-            UA_UInt64 result_uint64s;
-            if(bitwiseAnd) {
-                result_uint64s = *((UA_UInt64 *)firstOperand.data) & *((UA_UInt64 *)secondOperand.data);
-            } else {
-                result_uint64s = *((UA_UInt64 *)firstOperand.data) | *((UA_UInt64 *)secondOperand.data);
-            }
-            UA_UInt64_copy(&result_uint64s, (UA_UInt64 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 5:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT32];
-            UA_Int32 result_int32;
-            if(bitwiseAnd) {
-                result_int32 = *((UA_Int32 *)firstOperand.data) & *((UA_Int32 *)secondOperand.data);
-            } else {
-                result_int32 = *((UA_Int32 *)firstOperand.data) | *((UA_Int32 *)secondOperand.data);
-            }
-            UA_Int32_copy(&result_int32, (UA_Int32 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 6:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT32];
-            UA_UInt32 result_uint32;
-            if(bitwiseAnd) {
-                result_uint32 = *((UA_UInt32 *)firstOperand.data) & *((UA_UInt32 *)secondOperand.data);
-            } else {
-                result_uint32 = *((UA_UInt32 *)firstOperand.data) | *((UA_UInt32 *)secondOperand.data);
-            }
-            UA_UInt32_copy(&result_uint32, (UA_UInt32 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 8:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT16];
-            UA_Int16 result_int16;
-            if(bitwiseAnd) {
-                result_int16 = *((UA_Int16 *)firstOperand.data) & *((UA_Int16 *)secondOperand.data);
-            } else {
-                result_int16 = *((UA_Int16 *)firstOperand.data) | *((UA_Int16 *)secondOperand.data);
-            }
-            UA_Int16_copy(&result_int16, (UA_Int16 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 9:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT16];
-            UA_UInt16 result_uint16;
-            if(bitwiseAnd) {
-                result_uint16 = *((UA_UInt16 *)firstOperand.data) & *((UA_UInt16 *)secondOperand.data);
-            } else {
-                result_uint16 = *((UA_UInt16 *)firstOperand.data) | *((UA_UInt16 *)secondOperand.data);
-            }
-            UA_UInt16_copy(&result_uint16, (UA_UInt16 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 10:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_SBYTE];
-            UA_SByte result_sbyte;
-            if(bitwiseAnd) {
-                result_sbyte = *((UA_SByte *)firstOperand.data) & *((UA_SByte *)secondOperand.data);
-            } else {
-                result_sbyte = *((UA_SByte *)firstOperand.data) | *((UA_SByte *)secondOperand.data);
-            }
-            UA_SByte_copy(&result_sbyte, (UA_SByte *) ctx->valueResult[ctx->index].data);
-            break;
-        case 11:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BYTE];
-            UA_Byte result_byte;
-            if(bitwiseAnd) {
-                result_byte = *((UA_Byte *)firstOperand.data) & *((UA_Byte *)secondOperand.data);
-            } else {
-                result_byte = *((UA_Byte *)firstOperand.data) | *((UA_Byte *)secondOperand.data);
-            }
-            UA_Byte_copy(&result_byte, (UA_Byte *) ctx->valueResult[ctx->index].data);
-            break;
-        default:
-            return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-betweenOperator(UA_FilterOperatorContext *ctx) {
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-
-    UA_Variant firstOperand = resolveOperand(ctx, 0);
-    UA_Variant secondOperand = resolveOperand(ctx, 1);
-    UA_Variant thirdOperand = resolveOperand(ctx, 2);
-
-    if((UA_Variant_isEmpty(&firstOperand) ||
-        UA_Variant_isEmpty(&secondOperand) ||
-        UA_Variant_isEmpty(&thirdOperand)) ||
-       (!UA_DataType_isNumeric(firstOperand.type) ||
-        !UA_DataType_isNumeric(secondOperand.type) ||
-        !UA_DataType_isNumeric(thirdOperand.type)) ||
-       (!UA_Variant_isScalar(&firstOperand) ||
-        !UA_Variant_isScalar(&secondOperand) ||
-        !UA_Variant_isScalar(&thirdOperand))) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-
-    /* Between can be evaluated through greaterThanOrEqual and lessThanOrEqual */
-    if(compareOperation(&firstOperand, &secondOperand, UA_FILTEROPERATOR_GREATERTHANOREQUAL) == UA_STATUSCODE_GOOD &&
-       compareOperation(&firstOperand, &thirdOperand, UA_FILTEROPERATOR_LESSTHANOREQUAL) == UA_STATUSCODE_GOOD){
-        return UA_STATUSCODE_GOOD;
-    }
-    return UA_STATUSCODE_BADNOMATCH;
-}
-
-static UA_StatusCode
-inListOperator(UA_FilterOperatorContext *ctx) {
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    UA_Variant firstOperand = resolveOperand(ctx, 0);
-
-    if(UA_Variant_isEmpty(&firstOperand) ||
-       !UA_Variant_isScalar(&firstOperand)) {
-        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-    }
-
-    /* Evaluating the list of operands */
-    for(size_t i = 1; i < ctx->contentFilter->elements[ctx->index].filterOperandsSize; i++) {
-        /* Resolving the current operand */
-        UA_Variant currentOperator = resolveOperand(ctx, (UA_UInt16)i);
-
-        /* Check if the operand conforms to the operator*/
-        if(UA_Variant_isEmpty(&currentOperator) ||
-           !UA_Variant_isScalar(&currentOperator)) {
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-        }
-        if(compareOperation(&firstOperand, &currentOperator, UA_FILTEROPERATOR_EQUALS)) {
-            return UA_STATUSCODE_GOOD;
-        }
-    }
-    return UA_STATUSCODE_BADNOMATCH;
-}
-
-static UA_StatusCode
-isNullOperator(UA_FilterOperatorContext *ctx) {
-    /* Checking if operand is NULL. This is done by reducing the operand to a
-    * variant and then checking if it is empty. */
-    UA_Variant operand = resolveOperand(ctx, 0);
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    if(!UA_Variant_isEmpty(&operand))
-        return UA_STATUSCODE_BADNOMATCH;
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-notOperator(UA_FilterOperatorContext *ctx) {
-    /* Inverting the boolean value of the operand. */
-    UA_StatusCode res = resolveBoolean(resolveOperand(ctx, 0));
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    /* invert result */
-    if(res == UA_STATUSCODE_GOOD)
-        return UA_STATUSCODE_BADNOMATCH;
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx) {
-    UA_LOCK_ASSERT(&ctx->server->serviceMutex, 1);
-
-    if(ctx->contentFilter->elements == NULL || ctx->contentFilter->elementsSize == 0) {
-        /* Nothing to do.*/
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* The first element needs to be evaluated, this might be linked to other
-     * elements, which are evaluated in these cases. See 7.4.1 in Part 4. */
-    UA_ContentFilterElement *pElement = &ctx->contentFilter->elements[ctx->index];
-    UA_StatusCode *result = &ctx->contentFilterResult->elementResults[ctx->index].statusCode;
-    switch(pElement->filterOperator) {
-        case UA_FILTEROPERATOR_INVIEW:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_RELATEDTO:
-            /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
-            return UA_STATUSCODE_BADEVENTFILTERINVALID;
-        case UA_FILTEROPERATOR_EQUALS:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_GREATERTHAN:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_LESSTHAN:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_LESSTHANOREQUAL:
-            *result = compareOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_LIKE:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-        case UA_FILTEROPERATOR_NOT:
-            *result = notOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_BETWEEN:
-            *result = betweenOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_INLIST:
-            /* ToDo currently only numeric types are allowed */
-            *result = inListOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_ISNULL:
-            *result = isNullOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_AND:
-            *result = andOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_OR:
-            *result = orOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_CAST:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-        case UA_FILTEROPERATOR_BITWISEAND:
-            *result = bitwiseOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_BITWISEOR:
-            *result = bitwiseOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_OFTYPE:
-            *result = ofTypeOperator(ctx);
-            break;
-        default:
-            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-    }
-
-    if(ctx->valueResult[ctx->index].type == &UA_TYPES[UA_TYPES_BOOLEAN]) {
-        UA_Boolean *res = UA_Boolean_new();
-        if(ctx->contentFilterResult->elementResults[ctx->index].statusCode == UA_STATUSCODE_GOOD)
-            *res = true;
-        else
-            *res = false;
-        ctx->valueResult[ctx->index].data = res;
-    }
-    return ctx->contentFilterResult->elementResults[ctx->index].statusCode;
-}
-
-UA_StatusCode
-UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
-                                           const UA_NodeId *eventNode,
-                                           const UA_ContentFilter *contentFilter,
-                                           UA_ContentFilterResult *contentFilterResult) {
-    if(contentFilter->elementsSize == 0)
-        return UA_STATUSCODE_GOOD;
-    /* TODO add maximum lenth size to the server config */
-    if (contentFilter->elementsSize > 256)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_STACKARRAY(UA_Variant, valueResult, contentFilter->elementsSize);
-    for(size_t i = 0; i < contentFilter->elementsSize; ++i) {
-        UA_Variant_init(&valueResult[i]);
-    }
-
-    UA_FilterOperatorContext ctx;
-    ctx.server = server;
-    ctx.session = session;
-    ctx.eventNode = eventNode;
-    ctx.contentFilter = contentFilter;
-    ctx.contentFilterResult = contentFilterResult;
-    ctx.valueResult = valueResult;
-    ctx.index = 0;
-
-    UA_StatusCode res = evaluateWhereClauseContentFilter(&ctx);
-    for(size_t i = 0; i < ctx.contentFilter->elementsSize; i++) {
-        if(!UA_Variant_isEmpty(&ctx.valueResult[i]))
-            UA_Variant_clear(&ctx.valueResult[i]);
-    }
-    return res;
-}
-
-/* Filters the given event with the given filter and writes the results into a
- * notification */
-static UA_StatusCode
-UA_Server_filterEvent(UA_Server *server, UA_Session *session,
-                      const UA_NodeId *eventNode, UA_EventFilter *filter,
-                      UA_EventFieldList *efl, UA_EventFilterResult *result) {
-    if(filter->selectClausesSize == 0)
-        return UA_STATUSCODE_BADEVENTFILTERINVALID;
-
-    UA_EventFieldList_init(efl);
-    efl->eventFields = (UA_Variant *)
-        UA_Array_new(filter->selectClausesSize, &UA_TYPES[UA_TYPES_VARIANT]);
-    if(!efl->eventFields)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    efl->eventFieldsSize = filter->selectClausesSize;
-
-    /* empty event filter result */
-    UA_EventFilterResult_init(result);
-    result->selectClauseResultsSize = filter->selectClausesSize;
-    result->selectClauseResults = (UA_StatusCode *)
-        UA_Array_new(filter->selectClausesSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
-    if(!result->selectClauseResults) {
-        UA_EventFieldList_clear(efl);
-        UA_EventFilterResult_clear(result);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    /* prepare content filter result structure */
-    if(filter->whereClause.elementsSize != 0) {
-        result->whereClauseResult.elementResultsSize = filter->whereClause.elementsSize;
-        result->whereClauseResult.elementResults = (UA_ContentFilterElementResult *)
-            UA_Array_new(filter->whereClause.elementsSize,
-            &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
-        if(!result->whereClauseResult.elementResults) {
-            UA_EventFieldList_clear(efl);
-            UA_EventFilterResult_clear(result);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        for(size_t i = 0; i < result->whereClauseResult.elementResultsSize; ++i) {
-            result->whereClauseResult.elementResults[i].operandStatusCodesSize =
-            filter->whereClause.elements->filterOperandsSize;
-            result->whereClauseResult.elementResults[i].operandStatusCodes =
-                (UA_StatusCode *)UA_Array_new(
-                    filter->whereClause.elements->filterOperandsSize,
-                    &UA_TYPES[UA_TYPES_STATUSCODE]);
-            if(!result->whereClauseResult.elementResults[i].operandStatusCodes) {
-                UA_EventFieldList_clear(efl);
-                UA_EventFilterResult_clear(result);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-        }
-    }
-
-    /* Apply the content (where) filter */
-    UA_StatusCode res =
-        UA_Server_evaluateWhereClauseContentFilter(server, session, eventNode,
-                                                   &filter->whereClause, &result->whereClauseResult);
-    if(res != UA_STATUSCODE_GOOD){
-        UA_EventFieldList_clear(efl);
-        UA_EventFilterResult_clear(result);
-        return res;
-    }
-
-    /* Apply the select filter */
-    /* Check if the browsePath is BaseEventType, in which case nothing more
-     * needs to be checked */
-    UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
-    for(size_t i = 0; i < filter->selectClausesSize; i++) {
-        if(!UA_NodeId_equal(&filter->selectClauses[i].typeDefinitionId, &baseEventTypeId) &&
-           !isValidEvent(server, &filter->selectClauses[i].typeDefinitionId, eventNode)) {
-            UA_Variant_init(&efl->eventFields[i]);
-            /* EventFilterResult currently isn't being used
-            notification->result.selectClauseResults[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID; */
-            continue;
-        }
-
-        /* TODO: Put the result into the selectClausResults */
-        resolveSimpleAttributeOperand(server, session, eventNode,
-                                      &filter->selectClauses[i], &efl->eventFields[i]);
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
 static UA_StatusCode
 eventSetStandardFields(UA_Server *server, const UA_NodeId *event,
                        const UA_NodeId *origin, UA_ByteString *outEventId) {
@@ -1154,9 +190,9 @@ UA_Event_addEventToMonitoredItem(UA_Server *server, const UA_NodeId *event,
 
     UA_Subscription *sub = mon->subscription;
     UA_Session *session = sub->session;
-    UA_StatusCode retval = UA_Server_filterEvent(server, session, event,
-                                                 eventFilter, &notification->data.event,
-                                                 &notification->result);
+    UA_StatusCode retval = filterEvent(server, session, event,
+                                       eventFilter, &notification->data.event,
+                                       &notification->result);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_Notification_delete(notification);
         if(retval == UA_STATUSCODE_BADNOMATCH)
@@ -1208,8 +244,8 @@ setHistoricalEvent(UA_Server *server, const UA_NodeId *origin,
     UA_EventFilter *filter = (UA_EventFilter*) historicalEventFilterValue.data;
     UA_EventFieldList efl;
     UA_EventFilterResult result;
-    retval = UA_Server_filterEvent(server, &server->adminSession,
-                                   eventNodeId, filter, &efl, &result);
+    retval = filterEvent(server, &server->adminSession,
+                         eventNodeId, filter, &efl, &result);
     if(retval == UA_STATUSCODE_GOOD)
         server->config.historyDatabase.setEvent(server, server->config.historyDatabase.context,
                                                 origin, emitNodeId, filter, &efl);
@@ -1387,234 +423,6 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
     return retval;
 }
 
-/*
- * Initial select clause validation. The following checks are currently performed:
- * - Check if typedefenitionid or browsepath of any clause is NULL
- * - Check if the eventType is a subtype of BaseEventType
- * - Check if attributeId is valid
- * - Check if browsePath contains null
- * - Check if indexRange is defined and if it is parsable
- * - Check if attributeId is value
- */
-void
-UA_Event_staticSelectClauseValidation(UA_Server *server,
-                                      const UA_EventFilter *eventFilter,
-                                      UA_StatusCode *result) {
-    /* The selectClause only has to be checked, if the size is not zero */
-    if(eventFilter->selectClausesSize == 0)
-        return;
-    for(size_t i = 0; i < eventFilter->selectClausesSize; ++i) {
-        result[i] = UA_STATUSCODE_GOOD;
-        /* /typedefenitionid or browsepath of any clause is not NULL ? */
-        if(UA_NodeId_isNull(&eventFilter->selectClauses[i].typeDefinitionId)) {
-            result[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
-            continue;
-        }
-        /*ToDo: Check the following workaround. In UaExpert Event View the selection
-        * of the Server Object set up 7 select filter entries by default. The last
-        * element ist  from node 2782 (A&C ConditionType). Since the reduced
-        * information model dos not contain this type, the result has a brows path of
-        * "null" which results in an error. */
-        UA_NodeId ac_conditionType = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
-        if(UA_NodeId_equal(&eventFilter->selectClauses[i].typeDefinitionId, &ac_conditionType)) {
-            continue;
-        }
-        if(&eventFilter->selectClauses[i].browsePath[0] == NULL) {
-            result[i] = UA_STATUSCODE_BADBROWSENAMEINVALID;
-            continue;
-        }
-        /* eventType is a subtype of BaseEventType ? */
-        UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
-        if(!isNodeInTree_singleRef(
-            server, &eventFilter->selectClauses[i].typeDefinitionId,
-            &baseEventTypeId, UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-            result[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
-            continue;
-        }
-        /* attributeId is valid ? */
-        if(!((0 < eventFilter->selectClauses[i].attributeId) &&
-             (eventFilter->selectClauses[i].attributeId < 28))) {
-            result[i] = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
-            continue;
-        }
-        /* browsePath contains null ? */
-        for(size_t j = 0; j < eventFilter->selectClauses[i].browsePathSize; ++j) {
-            if(UA_QualifiedName_isNull(
-                &eventFilter->selectClauses[i].browsePath[j])) {
-                result[i] = UA_STATUSCODE_BADBROWSENAMEINVALID;
-                break;
-            }
-        }
-        if(result[i] != UA_STATUSCODE_GOOD)
-            continue;
-        /*indexRange is defined ? */
-        if(!UA_String_equal(&eventFilter->selectClauses[i].indexRange,
-                            &UA_STRING_NULL)) {
-            /* indexRange is parsable ? */
-            UA_NumericRange numericRange = UA_NUMERICRANGE("");
-            if(UA_NumericRange_parse(&numericRange,
-                                     eventFilter->selectClauses[i].indexRange) !=
-               UA_STATUSCODE_GOOD) {
-                result[i] = UA_STATUSCODE_BADINDEXRANGEINVALID;
-                continue;
-            }
-            UA_free(numericRange.dimensions);
-            /* attributeId is value ? */
-            if(eventFilter->selectClauses[i].attributeId != UA_ATTRIBUTEID_VALUE) {
-                result[i] = UA_STATUSCODE_BADTYPEMISMATCH;
-                continue;
-            }
-        }
-    }
-}
-
-/*
- * Initial content filter (where clause) check. Current checks:
- * - Number of operands for each (supported) operator
- */
-UA_StatusCode
-UA_Event_staticWhereClauseValidation(UA_Server *server,
-                                     const UA_ContentFilter *filter,
-                                     UA_ContentFilterResult *result) {
-    UA_ContentFilterResult_init(result);
-    result->elementResultsSize = filter->elementsSize;
-    if(result->elementResultsSize == 0)
-        return UA_STATUSCODE_GOOD;
-    result->elementResults =
-        (UA_ContentFilterElementResult *)UA_Array_new(
-            result->elementResultsSize,
-            &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
-    if(!result->elementResults)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    for(size_t i = 0; i < result->elementResultsSize; ++i) {
-        UA_ContentFilterElementResult *er = &result->elementResults[i];
-        UA_ContentFilterElement ef = filter->elements[i];
-        UA_ContentFilterElementResult_init(er);
-        er->operandStatusCodes =
-            (UA_StatusCode *)UA_Array_new(
-                ef.filterOperandsSize,
-                &UA_TYPES[UA_TYPES_STATUSCODE]);
-        er->operandStatusCodesSize = ef.filterOperandsSize;
-
-        switch(ef.filterOperator) {
-            case UA_FILTEROPERATOR_INVIEW:
-            case UA_FILTEROPERATOR_RELATEDTO: {
-                /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
-                er->statusCode =
-                    UA_STATUSCODE_BADEVENTFILTERINVALID;
-                break;
-            }
-            case UA_FILTEROPERATOR_EQUALS:
-            case UA_FILTEROPERATOR_GREATERTHAN:
-            case UA_FILTEROPERATOR_LESSTHAN:
-            case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
-            case UA_FILTEROPERATOR_LESSTHANOREQUAL:
-            case UA_FILTEROPERATOR_LIKE:
-            case UA_FILTEROPERATOR_CAST:
-            case UA_FILTEROPERATOR_BITWISEAND:
-            case UA_FILTEROPERATOR_BITWISEOR: {
-                if(ef.filterOperandsSize != 2) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_AND:
-            case UA_FILTEROPERATOR_OR: {
-                if(ef.filterOperandsSize != 2) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                for(size_t j = 0; j < 2; ++j) {
-                    if(ef.filterOperands[j].content.decoded.type !=
-                       &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
-                        er->operandStatusCodes[j] =
-                            UA_STATUSCODE_BADFILTEROPERANDINVALID;
-                        er->statusCode =
-                            UA_STATUSCODE_BADFILTEROPERANDINVALID;
-                        break;
-                    }
-                    if(((UA_ElementOperand *)ef.filterOperands[j]
-                        .content.decoded.data)->index > filter->elementsSize - 1) {
-                        er->operandStatusCodes[j] =
-                            UA_STATUSCODE_BADINDEXRANGEINVALID;
-                        er->statusCode =
-                            UA_STATUSCODE_BADINDEXRANGEINVALID;
-                        break;
-                    }
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_ISNULL:
-            case UA_FILTEROPERATOR_NOT: {
-                if(ef.filterOperandsSize != 1) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_INLIST: {
-                if(ef.filterOperandsSize <= 2) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_BETWEEN: {
-                if(ef.filterOperandsSize != 3) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_OFTYPE: {
-                if(ef.filterOperandsSize != 1) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->operandStatusCodesSize = ef.filterOperandsSize;
-                if(ef.filterOperands[0].content.decoded.type !=
-                   &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDINVALID;
-                    break;
-                }
-                UA_LiteralOperand *literalOperand =
-                    (UA_LiteralOperand *)ef.filterOperands[0]
-                        .content.decoded.data;
-
-                /* Make sure the &pOperand->nodeId is a subtype of BaseEventType */
-                UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
-                if(!isNodeInTree_singleRef(
-                    server, (UA_NodeId *)literalOperand->value.data, &baseEventTypeId,
-                    UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADNODEIDINVALID;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            default:
-                er->statusCode =
-                    UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-                break;
-        }
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
 UA_StatusCode
 UA_Server_triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
                        const UA_NodeId origin, UA_ByteString *outEventId,
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
new file mode 100644
index 00000000000..452718c7995
--- /dev/null
+++ b/src/server/ua_subscription_events_filter.c
@@ -0,0 +1,1203 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) Ari Breitkreuz, fortiss GmbH
+ *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
+ */
+
+#include "ua_server_internal.h"
+#include "ua_subscription.h"
+
+#ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
+
+typedef struct {
+    UA_Server *server;
+    UA_Session *session;
+    const UA_NodeId *eventNode;
+    const UA_ContentFilter *contentFilter;
+    UA_ContentFilterResult *contentFilterResult;
+    UA_Variant *valueResult;
+    UA_UInt16 index;
+} UA_FilterOperatorContext;
+
+static UA_StatusCode
+evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx);
+
+/* Resolves a variant of type string or boolean into a corresponding status code */
+static UA_StatusCode
+resolveBoolean(UA_Variant operand) {
+    UA_String value;
+    value = UA_STRING("True");
+    if(((operand.type == &UA_TYPES[UA_TYPES_STRING]) &&
+        (UA_String_equal((UA_String *)operand.data, &value))) ||
+       ((operand.type == &UA_TYPES[UA_TYPES_BOOLEAN]) &&
+        (*(UA_Boolean *)operand.data == UA_TRUE))) {
+        return UA_STATUSCODE_GOOD;
+    }
+    value = UA_STRING("False");
+    if(((operand.type == &UA_TYPES[UA_TYPES_STRING]) &&
+        (UA_String_equal((UA_String *)operand.data, &value))) ||
+       ((operand.type == &UA_TYPES[UA_TYPES_BOOLEAN]) &&
+        (*(UA_Boolean *)operand.data == UA_FALSE))) {
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+
+    /* If the operand can't be resolved, an error is returned */
+    return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+}
+
+/* Part 4: 7.4.4.5 SimpleAttributeOperand
+ * The clause can point to any attribute of nodes. Either a child of the event
+ * node and also the event type. */
+static UA_StatusCode
+resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session,
+                              const UA_NodeId *origin,
+                              const UA_SimpleAttributeOperand *sao,
+                              UA_Variant *value) {
+    /* Prepare the ReadValueId */
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.indexRange = sao->indexRange;
+    rvi.attributeId = sao->attributeId;
+
+    UA_DataValue v;
+
+    if(sao->browsePathSize == 0) {
+        /* If this list (browsePath) is empty, the Node is the instance of the
+         * TypeDefinition. (Part 4, 7.4.4.5) */
+        rvi.nodeId = *origin;
+
+        /* A Condition is an indirection. Look up the target node. */
+        /* TODO: check for Branches! One Condition could have multiple Branches */
+        UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
+        if(UA_NodeId_equal(&sao->typeDefinitionId, &conditionTypeId)) {
+#ifdef UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS
+            UA_StatusCode res = UA_getConditionId(server, origin, &rvi.nodeId);
+            if(res != UA_STATUSCODE_GOOD)
+                return res;
+#else
+            return UA_STATUSCODE_BADNOTSUPPORTED;
+#endif
+        }
+
+        v = UA_Server_readWithSession(server, session, &rvi,
+                                      UA_TIMESTAMPSTORETURN_NEITHER);
+    } else {
+        /* Resolve the browse path, starting from the event-source (and not the
+         * typeDefinitionId). */
+        UA_BrowsePathResult bpr =
+            browseSimplifiedBrowsePath(server, *origin,
+                                       sao->browsePathSize, sao->browsePath);
+        if(bpr.targetsSize == 0 && bpr.statusCode == UA_STATUSCODE_GOOD)
+            bpr.statusCode = UA_STATUSCODE_BADNOTFOUND;
+        if(bpr.statusCode != UA_STATUSCODE_GOOD) {
+            UA_StatusCode res = bpr.statusCode;
+            UA_BrowsePathResult_clear(&bpr);
+            return res;
+        }
+
+        /* Use the first match */
+        rvi.nodeId = bpr.targets[0].targetId.nodeId;
+        v = UA_Server_readWithSession(server, session, &rvi,
+                                      UA_TIMESTAMPSTORETURN_NEITHER);
+        UA_BrowsePathResult_clear(&bpr);
+    }
+
+    /* Move the result to the output */
+    if(v.status == UA_STATUSCODE_GOOD && v.hasValue)
+        *value = v.value;
+    else
+        UA_Variant_clear(&v.value);
+    return v.status;
+}
+
+/* Resolve operands to variants according to the operand type.
+ * Part 4: 7.17.3 Table 142 specifies the allowed types. */
+static UA_Variant
+resolveOperand(UA_FilterOperatorContext *ctx, UA_UInt16 nr) {
+    UA_StatusCode res;
+    UA_Variant variant;
+    UA_Variant_init(&variant);
+    UA_ExtensionObject *op = &ctx->contentFilter->elements[ctx->index].filterOperands[nr];
+    if(op->content.decoded.type == &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]) {
+        /* SimpleAttributeOperand */
+        res = resolveSimpleAttributeOperand(ctx->server, ctx->session, ctx->eventNode,
+                                (UA_SimpleAttributeOperand *)op->content.decoded.data,
+                                            &variant);
+    } else if(op->content.decoded.type == &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
+        /* LiteralOperand */
+        variant = ((UA_LiteralOperand *)op->content.decoded.data)->value;
+        res = UA_STATUSCODE_GOOD;
+    } else if(op->content.decoded.type == &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
+        /* ElementOperand */
+        UA_UInt16 oldIndex = ctx->index;
+        ctx->index = (UA_UInt16)((UA_ElementOperand *)op->content.decoded.data)->index;
+        res = evaluateWhereClauseContentFilter(ctx);
+        variant = ctx->valueResult[ctx->index];
+        ctx->index = oldIndex; /* restore the old index */
+    } else {
+        res = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+
+    if(res != UA_STATUSCODE_GOOD && res != UA_STATUSCODE_BADNOMATCH) {
+        variant.type = NULL;
+        ctx->contentFilterResult->elementResults[ctx->index].operandStatusCodes[nr] = res;
+    }
+
+    return variant;
+}
+
+static UA_StatusCode
+ofTypeOperator(UA_FilterOperatorContext *ctx) {
+    UA_ContentFilterElement *pElement = &ctx->contentFilter->elements[ctx->index];
+    UA_Boolean result = false;
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    if(pElement->filterOperandsSize != 1)
+        return UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+    if(pElement->filterOperands[0].content.decoded.type !=
+       &UA_TYPES[UA_TYPES_LITERALOPERAND])
+        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+
+    UA_LiteralOperand *literalOperand =
+        (UA_LiteralOperand *) pElement->filterOperands[0].content.decoded.data;
+    if(!UA_Variant_isScalar(&literalOperand->value))
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    if(literalOperand->value.type != &UA_TYPES[UA_TYPES_NODEID] || literalOperand->value.data == NULL)
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    UA_NodeId *literalOperandNodeId = (UA_NodeId *) literalOperand->value.data;
+    UA_Variant typeNodeIdVariant;
+    UA_Variant_init(&typeNodeIdVariant);
+    UA_StatusCode readStatusCode =
+        readObjectProperty(ctx->server, *ctx->eventNode,
+                           UA_QUALIFIEDNAME(0, "EventType"), &typeNodeIdVariant);
+    if(readStatusCode != UA_STATUSCODE_GOOD)
+        return readStatusCode;
+
+    if(!UA_Variant_isScalar(&typeNodeIdVariant) ||
+       typeNodeIdVariant.type != &UA_TYPES[UA_TYPES_NODEID] ||
+       typeNodeIdVariant.data == NULL) {
+        UA_LOG_ERROR(&ctx->server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "EventType has an invalid type.");
+        UA_Variant_clear(&typeNodeIdVariant);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    /* check if the eventtype-nodeid is equal to the given oftype argument */
+    result = UA_NodeId_equal((UA_NodeId*) typeNodeIdVariant.data, literalOperandNodeId);
+    /* check if the eventtype-nodeid is a subtype of the given oftype argument */
+    if(!result)
+        result = isNodeInTree_singleRef(ctx->server,
+                                        (UA_NodeId*) typeNodeIdVariant.data,
+                                        literalOperandNodeId,
+                                        UA_REFERENCETYPEINDEX_HASSUBTYPE);
+    UA_Variant_clear(&typeNodeIdVariant);
+    if(!result)
+        return UA_STATUSCODE_BADNOMATCH;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+andOperator(UA_FilterOperatorContext *ctx) {
+    UA_StatusCode firstBoolean_and = resolveBoolean(resolveOperand(ctx, 0));
+    if(firstBoolean_and == UA_STATUSCODE_BADNOMATCH) {
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+    /* Evaluation of second operand */
+    UA_StatusCode secondBoolean = resolveBoolean(resolveOperand(ctx, 1));
+    /* Filteroperator AND */
+    if(secondBoolean == UA_STATUSCODE_BADNOMATCH) {
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+    if((firstBoolean_and == UA_STATUSCODE_GOOD) &&
+       (secondBoolean == UA_STATUSCODE_GOOD)) {
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_GOOD;
+    }
+    return UA_STATUSCODE_BADFILTERELEMENTINVALID;
+}
+
+static UA_StatusCode
+orOperator(UA_FilterOperatorContext *ctx) {
+    UA_StatusCode firstBoolean_or = resolveBoolean(resolveOperand(ctx, 0));
+    if(firstBoolean_or == UA_STATUSCODE_GOOD) {
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_GOOD;
+    }
+    /* Evaluation of second operand */
+    UA_StatusCode secondBoolean = resolveBoolean(resolveOperand(ctx, 1));
+    if(secondBoolean == UA_STATUSCODE_GOOD) {
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_GOOD;
+    } 
+    if((firstBoolean_or == UA_STATUSCODE_BADNOMATCH) &&
+       (secondBoolean == UA_STATUSCODE_BADNOMATCH)) {
+        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+    return UA_STATUSCODE_BADFILTERELEMENTINVALID;
+}
+
+static UA_Boolean
+isNumericUnsigned(UA_UInt32 dataTypeKind){
+    if(dataTypeKind == UA_DATATYPEKIND_UINT64 ||
+       dataTypeKind == UA_DATATYPEKIND_UINT32 ||
+       dataTypeKind == UA_DATATYPEKIND_UINT16 ||
+       dataTypeKind == UA_DATATYPEKIND_BYTE)
+        return true;
+    return false;
+}
+
+static UA_Boolean
+isNumericSigned(UA_UInt32 dataTypeKind){
+    if(dataTypeKind == UA_DATATYPEKIND_INT64 ||
+       dataTypeKind == UA_DATATYPEKIND_INT32 ||
+       dataTypeKind == UA_DATATYPEKIND_INT16 ||
+       dataTypeKind == UA_DATATYPEKIND_SBYTE)
+        return true;
+    return false;
+}
+
+static UA_Boolean
+isFloatingPoint(UA_UInt32 dataTypeKind){
+    if(dataTypeKind == UA_DATATYPEKIND_FLOAT ||
+       dataTypeKind == UA_DATATYPEKIND_DOUBLE)
+        return true;
+    return false;
+}
+
+static UA_Boolean
+isStringType(UA_UInt32 dataTypeKind){
+    if(dataTypeKind == UA_DATATYPEKIND_STRING ||
+       dataTypeKind == UA_DATATYPEKIND_BYTESTRING)
+        return true;
+    return false;
+}
+
+static UA_StatusCode
+implicitNumericVariantTransformation(UA_Variant *variant, void *data){
+    if(variant->type == &UA_TYPES[UA_TYPES_UINT64]){
+        *(UA_UInt64 *)data = *(UA_UInt64 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT32]){
+        *(UA_UInt64 *)data = *(UA_UInt32 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT16]){
+        *(UA_UInt64 *)data = *(UA_UInt16 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_BYTE]){
+        *(UA_UInt64 *)data = *(UA_Byte *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_INT64]){
+        *(UA_Int64 *)data = *(UA_Int64 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_INT32]){
+        *(UA_Int64 *)data = *(UA_Int32 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_INT16]){
+        *(UA_Int64 *)data = *(UA_Int16 *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
+        *(UA_Int64 *)data = *(UA_SByte *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_DOUBLE]){
+        *(UA_Double *)data = *(UA_Double *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_DOUBLE]);
+    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
+        *(UA_Double *)data = *(UA_Float *)variant->data;
+        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_DOUBLE]);
+    } else {
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+/* 0 -> Same Type, 1 -> Implicit Cast, 2 -> Only explicit Cast, -1 -> cast invalid */
+static UA_SByte convertLookup[21][21] = {
+    { 0, 1,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
+    { 2, 0,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
+    {-1,-1, 0,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+    {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 0,-1, 2,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1, 2,-1,-1, 1,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 0,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1, 2,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 0, 1, 1,-1, 2,-1, 2,-1,-1, 2, 1, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 0, 1,-1, 2, 2, 2,-1,-1, 2, 2, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 0,-1, 2, 2, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1,-1,-1,-1, 1,-1,-1,-1,-1,-1, 0,-1,-1, 1,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 0,-1, 2,-1,-1, 1, 1, 1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1,-1,-1, 0,-1,-1,-1, 2, 1, 1,-1},
+    { 1, 1,-1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1,-1, 0, 2, 2, 1, 1, 1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 0,-1,-1,-1,-1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1, 0,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 2, 1, 2,-1,-1, 0, 1, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 1, 1,-1, 2, 2, 2,-1,-1, 2, 0, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 1,-1, 2, 2, 2,-1,-1, 2, 2, 0,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0}
+};
+
+/* This array maps the index of the
+ * standard DataType-Kind order to the
+ * order of the type convertion array */
+static UA_Byte dataTypeKindIndex[30] = {
+    0,   12,  1,  8, 17,
+    9,   18, 10, 19,  6,
+    4,   14,  3,  7,  2,
+    20,  11,  5, 13, 16,
+    15, 255,255,255,255,
+    255,255,255,255,255
+};
+
+/* The OPC UA Standard defines in Part 4 several data type casting-rules. (see
+ * 1.04 part 4 Table 122)
+ * Return:
+ *      0 -> same type
+ *      1 -> types can be casted implicit
+ *      2 -> types can only be explicitly casted
+ *     -1 -> types can't be casted */
+static UA_SByte
+checkTypeCastingOption(const UA_DataType *cast_target, const UA_DataType *cast_source) {
+    UA_Byte firstOperatorTypeKindIndex = dataTypeKindIndex[cast_target->typeKind];
+    UA_Byte secondOperatorTypeKindIndex = dataTypeKindIndex[cast_source->typeKind];
+    if(firstOperatorTypeKindIndex == UA_BYTE_MAX ||
+       secondOperatorTypeKindIndex == UA_BYTE_MAX)
+        return -1;
+
+    return convertLookup[firstOperatorTypeKindIndex][secondOperatorTypeKindIndex];
+}
+
+/* Compare operation for equal, gt, le, gte, lee
+ * UA_STATUSCODE_GOOD if the comparison was true
+ * UA_STATUSCODE_BADNOMATCH if the comparison was false
+ * UA_STATUSCODE_BADFILTEROPERATORINVALID for invalid operators
+ * UA_STATUSCODE_BADTYPEMISMATCH if one of the operands was not numeric
+ * ToDo Array-Casting
+ */
+static UA_StatusCode
+compareOperation(UA_Variant *firstOperand, UA_Variant *secondOperand, UA_FilterOperator op) {
+    /* get precedence of the operand types */
+    UA_Int16 firstOperand_precedence = UA_DataType_getPrecedence(firstOperand->type);
+    UA_Int16 secondOperand_precedence = UA_DataType_getPrecedence(secondOperand->type);
+    /* if the types are not equal and one of the precedence-ranks is -1, then there is
+       no implicit conversion possible and therefore no compare */
+    if(!UA_NodeId_equal(&firstOperand->type->typeId, &secondOperand->type->typeId) &&
+       (firstOperand_precedence == -1 || secondOperand_precedence == -1)){
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+    }
+    /* check if the precedence order of the operators is swapped */
+    UA_Variant *firstCompareOperand = firstOperand;
+    UA_Variant *secondCompareOperand = secondOperand;
+    UA_Boolean swapped = false;
+    if (firstOperand_precedence < secondOperand_precedence){
+        firstCompareOperand = secondOperand;
+        secondCompareOperand = firstOperand;
+        swapped = true;
+    }
+    UA_SByte castRule =
+        checkTypeCastingOption(firstCompareOperand->type, secondCompareOperand->type);
+
+    if(!(castRule == 0 || castRule == 1)){
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+    }
+
+    /* The operand Data-Types influence the behavior and steps for the comparison.
+     * We need to check the operand types and store a rule which is used to select
+     * the right behavior afterwards. */
+    enum compareHandlingRuleEnum {
+        UA_TYPES_EQUAL_ORDERED,
+        UA_TYPES_EQUAL_UNORDERED,
+        UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED,
+        UA_TYPES_DIFFERENT_NUMERIC_SIGNED,
+        UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT,
+        UA_TYPES_DIFFERENT_TEXT,
+        UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN,
+        UA_TYPES_DIFFERENT_COMPARE_EXPLIC
+    } compareHandlingRuleEnum;
+
+    if(castRule == 0 &&
+       (UA_DataType_isNumeric(firstOperand->type) ||
+        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_DATETIME ||
+        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_STRING ||
+        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_BYTESTRING)){
+        /* Data-Types with a natural order (allow le, gt, lee, gte) */
+        compareHandlingRuleEnum = UA_TYPES_EQUAL_ORDERED;
+    } else if(castRule == 0){
+        /* Data-Types without a natural order (le, gt, lee, gte are not allowed) */
+        compareHandlingRuleEnum = UA_TYPES_EQUAL_UNORDERED;
+    } else if(castRule == 1 &&
+              isNumericSigned(firstOperand->type->typeKind) &&
+              isNumericSigned(secondOperand->type->typeKind)){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_SIGNED;
+    } else if(castRule == 1 &&
+              isNumericUnsigned(firstOperand->type->typeKind) &&
+              isNumericUnsigned(secondOperand->type->typeKind)){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED;
+    } else if(castRule == 1 &&
+              isFloatingPoint(firstOperand->type->typeKind) &&
+              isFloatingPoint(secondOperand->type->typeKind)){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT;
+    } else if(castRule == 1 &&
+              isStringType(firstOperand->type->typeKind)&&
+              isStringType(secondOperand->type->typeKind)){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_TEXT;
+    } else if(castRule == -1 || castRule == 2){
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_COMPARE_EXPLIC;
+    } else {
+        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN;
+    }
+
+    if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN)
+        return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+
+    if(swapped){
+        firstCompareOperand = secondCompareOperand;
+        secondCompareOperand = firstCompareOperand;
+    }
+
+    if(op == UA_FILTEROPERATOR_EQUALS){
+        UA_Byte variantContent[16];
+        memset(&variantContent, 0, sizeof(UA_Byte) * 16);
+        if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_SIGNED ||
+           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED ||
+           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT) {
+            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
+            implicitNumericVariantTransformation(secondCompareOperand, &variantContent[8]);
+        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_TEXT) {
+            firstCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
+            secondCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
+        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN ||
+                  compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_EXPLIC ){
+            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+        }
+        if(UA_order(firstCompareOperand, secondCompareOperand, &UA_TYPES[UA_TYPES_VARIANT]) == UA_ORDER_EQ) {
+            return UA_STATUSCODE_GOOD;
+        }
+    } else {
+        UA_Byte variantContent[16];
+        if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_SIGNED ||
+           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED ||
+           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT) {
+            memset(&variantContent, 0, sizeof(UA_Byte) * 16);
+            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
+            implicitNumericVariantTransformation(secondCompareOperand, &variantContent[8]);
+        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_TEXT) {
+            firstCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
+            secondCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
+        } else if(compareHandlingRuleEnum == UA_TYPES_EQUAL_UNORDERED) {
+            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN ||
+                  compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_EXPLIC) {
+            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+        }
+        UA_Order gte_result = UA_order(firstCompareOperand, secondCompareOperand,
+                                       &UA_TYPES[UA_TYPES_VARIANT]);
+        if(op == UA_FILTEROPERATOR_LESSTHAN) {
+            if(gte_result == UA_ORDER_LESS) {
+                return UA_STATUSCODE_GOOD;
+            }
+        } else if(op == UA_FILTEROPERATOR_GREATERTHAN) {
+            if(gte_result == UA_ORDER_MORE) {
+                return UA_STATUSCODE_GOOD;
+            }
+        } else if(op == UA_FILTEROPERATOR_LESSTHANOREQUAL) {
+            if(gte_result == UA_ORDER_LESS || gte_result == UA_ORDER_EQ) {
+                return UA_STATUSCODE_GOOD;
+            }
+        } else if(op == UA_FILTEROPERATOR_GREATERTHANOREQUAL) {
+            if(gte_result == UA_ORDER_MORE || gte_result == UA_ORDER_EQ) {
+                return UA_STATUSCODE_GOOD;
+            }
+        }
+    }
+    return UA_STATUSCODE_BADNOMATCH;
+}
+
+static UA_StatusCode
+compareOperator(UA_FilterOperatorContext *ctx) {
+    UA_Variant firstOperand = resolveOperand(ctx, 0);
+    if(UA_Variant_isEmpty(&firstOperand))
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    UA_Variant secondOperand = resolveOperand(ctx, 1);
+    if(UA_Variant_isEmpty(&secondOperand)) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+    /* ToDo remove the following restriction: Add support for arrays */
+    if(!UA_Variant_isScalar(&firstOperand) || !UA_Variant_isScalar(&secondOperand)){
+        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+    }
+    return compareOperation(&firstOperand, &secondOperand,
+                            ctx->contentFilter->elements[ctx->index].filterOperator);
+}
+
+static UA_StatusCode
+bitwiseOperator(UA_FilterOperatorContext *ctx) {
+    /* The bitwise operators all have 2 operands which are evaluated equally. */
+    UA_Variant firstOperand = resolveOperand(ctx, 0);
+    if(UA_Variant_isEmpty(&firstOperand)) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+    UA_Variant secondOperand = resolveOperand(ctx, 1);
+    if(UA_Variant_isEmpty(&secondOperand)) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+
+    UA_Boolean bitwiseAnd =
+        ctx->contentFilter->elements[ctx->index].filterOperator == UA_FILTEROPERATOR_BITWISEAND;
+
+    /* check if the operators are integers */
+    if(!UA_DataType_isNumeric(firstOperand.type) ||
+       !UA_DataType_isNumeric(secondOperand.type) ||
+       !UA_Variant_isScalar(&firstOperand) ||
+       !UA_Variant_isScalar(&secondOperand) ||
+       (firstOperand.type == &UA_TYPES[UA_TYPES_DOUBLE]) ||
+       (secondOperand.type == &UA_TYPES[UA_TYPES_DOUBLE]) ||
+       (secondOperand.type == &UA_TYPES[UA_TYPES_FLOAT]) ||
+       (firstOperand.type == &UA_TYPES[UA_TYPES_FLOAT])) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+
+    /* check which is the return type (higher precedence == bigger integer)*/
+    UA_Int16 precedence = UA_DataType_getPrecedence(firstOperand.type);
+    if(precedence > UA_DataType_getPrecedence(secondOperand.type)) {
+        precedence = UA_DataType_getPrecedence(secondOperand.type);
+    }
+
+    switch(precedence){
+        case 3:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT64];
+            UA_Int64 result_int64;
+            if(bitwiseAnd) {
+                result_int64 = *((UA_Int64 *)firstOperand.data) & *((UA_Int64 *)secondOperand.data);
+            } else {
+                result_int64 = *((UA_Int64 *)firstOperand.data) | *((UA_Int64 *)secondOperand.data);
+            }
+            UA_Int64_copy(&result_int64, (UA_Int64 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 4:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT64];
+            UA_UInt64 result_uint64s;
+            if(bitwiseAnd) {
+                result_uint64s = *((UA_UInt64 *)firstOperand.data) & *((UA_UInt64 *)secondOperand.data);
+            } else {
+                result_uint64s = *((UA_UInt64 *)firstOperand.data) | *((UA_UInt64 *)secondOperand.data);
+            }
+            UA_UInt64_copy(&result_uint64s, (UA_UInt64 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 5:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT32];
+            UA_Int32 result_int32;
+            if(bitwiseAnd) {
+                result_int32 = *((UA_Int32 *)firstOperand.data) & *((UA_Int32 *)secondOperand.data);
+            } else {
+                result_int32 = *((UA_Int32 *)firstOperand.data) | *((UA_Int32 *)secondOperand.data);
+            }
+            UA_Int32_copy(&result_int32, (UA_Int32 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 6:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT32];
+            UA_UInt32 result_uint32;
+            if(bitwiseAnd) {
+                result_uint32 = *((UA_UInt32 *)firstOperand.data) & *((UA_UInt32 *)secondOperand.data);
+            } else {
+                result_uint32 = *((UA_UInt32 *)firstOperand.data) | *((UA_UInt32 *)secondOperand.data);
+            }
+            UA_UInt32_copy(&result_uint32, (UA_UInt32 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 8:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT16];
+            UA_Int16 result_int16;
+            if(bitwiseAnd) {
+                result_int16 = *((UA_Int16 *)firstOperand.data) & *((UA_Int16 *)secondOperand.data);
+            } else {
+                result_int16 = *((UA_Int16 *)firstOperand.data) | *((UA_Int16 *)secondOperand.data);
+            }
+            UA_Int16_copy(&result_int16, (UA_Int16 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 9:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT16];
+            UA_UInt16 result_uint16;
+            if(bitwiseAnd) {
+                result_uint16 = *((UA_UInt16 *)firstOperand.data) & *((UA_UInt16 *)secondOperand.data);
+            } else {
+                result_uint16 = *((UA_UInt16 *)firstOperand.data) | *((UA_UInt16 *)secondOperand.data);
+            }
+            UA_UInt16_copy(&result_uint16, (UA_UInt16 *) ctx->valueResult[ctx->index].data);
+            break;
+        case 10:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_SBYTE];
+            UA_SByte result_sbyte;
+            if(bitwiseAnd) {
+                result_sbyte = *((UA_SByte *)firstOperand.data) & *((UA_SByte *)secondOperand.data);
+            } else {
+                result_sbyte = *((UA_SByte *)firstOperand.data) | *((UA_SByte *)secondOperand.data);
+            }
+            UA_SByte_copy(&result_sbyte, (UA_SByte *) ctx->valueResult[ctx->index].data);
+            break;
+        case 11:
+            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BYTE];
+            UA_Byte result_byte;
+            if(bitwiseAnd) {
+                result_byte = *((UA_Byte *)firstOperand.data) & *((UA_Byte *)secondOperand.data);
+            } else {
+                result_byte = *((UA_Byte *)firstOperand.data) | *((UA_Byte *)secondOperand.data);
+            }
+            UA_Byte_copy(&result_byte, (UA_Byte *) ctx->valueResult[ctx->index].data);
+            break;
+        default:
+            return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+betweenOperator(UA_FilterOperatorContext *ctx) {
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+
+    UA_Variant firstOperand = resolveOperand(ctx, 0);
+    UA_Variant secondOperand = resolveOperand(ctx, 1);
+    UA_Variant thirdOperand = resolveOperand(ctx, 2);
+
+    if((UA_Variant_isEmpty(&firstOperand) ||
+        UA_Variant_isEmpty(&secondOperand) ||
+        UA_Variant_isEmpty(&thirdOperand)) ||
+       (!UA_DataType_isNumeric(firstOperand.type) ||
+        !UA_DataType_isNumeric(secondOperand.type) ||
+        !UA_DataType_isNumeric(thirdOperand.type)) ||
+       (!UA_Variant_isScalar(&firstOperand) ||
+        !UA_Variant_isScalar(&secondOperand) ||
+        !UA_Variant_isScalar(&thirdOperand))) {
+        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    }
+
+    /* Between can be evaluated through greaterThanOrEqual and lessThanOrEqual */
+    if(compareOperation(&firstOperand, &secondOperand, UA_FILTEROPERATOR_GREATERTHANOREQUAL) == UA_STATUSCODE_GOOD &&
+       compareOperation(&firstOperand, &thirdOperand, UA_FILTEROPERATOR_LESSTHANOREQUAL) == UA_STATUSCODE_GOOD){
+        return UA_STATUSCODE_GOOD;
+    }
+    return UA_STATUSCODE_BADNOMATCH;
+}
+
+static UA_StatusCode
+inListOperator(UA_FilterOperatorContext *ctx) {
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    UA_Variant firstOperand = resolveOperand(ctx, 0);
+
+    if(UA_Variant_isEmpty(&firstOperand) ||
+       !UA_Variant_isScalar(&firstOperand)) {
+        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+    }
+
+    /* Evaluating the list of operands */
+    for(size_t i = 1; i < ctx->contentFilter->elements[ctx->index].filterOperandsSize; i++) {
+        /* Resolving the current operand */
+        UA_Variant currentOperator = resolveOperand(ctx, (UA_UInt16)i);
+
+        /* Check if the operand conforms to the operator*/
+        if(UA_Variant_isEmpty(&currentOperator) ||
+           !UA_Variant_isScalar(&currentOperator)) {
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+        }
+        if(compareOperation(&firstOperand, &currentOperator, UA_FILTEROPERATOR_EQUALS)) {
+            return UA_STATUSCODE_GOOD;
+        }
+    }
+    return UA_STATUSCODE_BADNOMATCH;
+}
+
+static UA_StatusCode
+isNullOperator(UA_FilterOperatorContext *ctx) {
+    /* Checking if operand is NULL. This is done by reducing the operand to a
+    * variant and then checking if it is empty. */
+    UA_Variant operand = resolveOperand(ctx, 0);
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    if(!UA_Variant_isEmpty(&operand))
+        return UA_STATUSCODE_BADNOMATCH;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+notOperator(UA_FilterOperatorContext *ctx) {
+    /* Inverting the boolean value of the operand. */
+    UA_StatusCode res = resolveBoolean(resolveOperand(ctx, 0));
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    /* invert result */
+    if(res == UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BADNOMATCH;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx) {
+    UA_LOCK_ASSERT(&ctx->server->serviceMutex, 1);
+
+    if(ctx->contentFilter->elements == NULL || ctx->contentFilter->elementsSize == 0) {
+        /* Nothing to do.*/
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* The first element needs to be evaluated, this might be linked to other
+     * elements, which are evaluated in these cases. See 7.4.1 in Part 4. */
+    UA_ContentFilterElement *pElement = &ctx->contentFilter->elements[ctx->index];
+    UA_StatusCode *result = &ctx->contentFilterResult->elementResults[ctx->index].statusCode;
+    switch(pElement->filterOperator) {
+        case UA_FILTEROPERATOR_INVIEW:
+            /* Fallthrough */
+        case UA_FILTEROPERATOR_RELATEDTO:
+            /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
+            return UA_STATUSCODE_BADEVENTFILTERINVALID;
+        case UA_FILTEROPERATOR_EQUALS:
+            /* Fallthrough */
+        case UA_FILTEROPERATOR_GREATERTHAN:
+            /* Fallthrough */
+        case UA_FILTEROPERATOR_LESSTHAN:
+            /* Fallthrough */
+        case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
+            /* Fallthrough */
+        case UA_FILTEROPERATOR_LESSTHANOREQUAL:
+            *result = compareOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_LIKE:
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+        case UA_FILTEROPERATOR_NOT:
+            *result = notOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_BETWEEN:
+            *result = betweenOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_INLIST:
+            /* ToDo currently only numeric types are allowed */
+            *result = inListOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_ISNULL:
+            *result = isNullOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_AND:
+            *result = andOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_OR:
+            *result = orOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_CAST:
+            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+        case UA_FILTEROPERATOR_BITWISEAND:
+            *result = bitwiseOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_BITWISEOR:
+            *result = bitwiseOperator(ctx);
+            break;
+        case UA_FILTEROPERATOR_OFTYPE:
+            *result = ofTypeOperator(ctx);
+            break;
+        default:
+            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+    }
+
+    if(ctx->valueResult[ctx->index].type == &UA_TYPES[UA_TYPES_BOOLEAN]) {
+        UA_Boolean *res = UA_Boolean_new();
+        if(ctx->contentFilterResult->elementResults[ctx->index].statusCode == UA_STATUSCODE_GOOD)
+            *res = true;
+        else
+            *res = false;
+        ctx->valueResult[ctx->index].data = res;
+    }
+    return ctx->contentFilterResult->elementResults[ctx->index].statusCode;
+}
+
+/* Exposes the filters For unit tests */
+UA_StatusCode
+UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
+                                           const UA_NodeId *eventNode,
+                                           const UA_ContentFilter *contentFilter,
+                                           UA_ContentFilterResult *contentFilterResult) {
+    if(contentFilter->elementsSize == 0)
+        return UA_STATUSCODE_GOOD;
+    /* TODO add maximum lenth size to the server config */
+    if(contentFilter->elementsSize > 256)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_Variant valueResult[256];
+    for(size_t i = 0; i < contentFilter->elementsSize; ++i) {
+        UA_Variant_init(&valueResult[i]);
+    }
+
+    UA_FilterOperatorContext ctx;
+    ctx.server = server;
+    ctx.session = session;
+    ctx.eventNode = eventNode;
+    ctx.contentFilter = contentFilter;
+    ctx.contentFilterResult = contentFilterResult;
+    ctx.valueResult = valueResult;
+    ctx.index = 0;
+
+    UA_StatusCode res = evaluateWhereClauseContentFilter(&ctx);
+    for(size_t i = 0; i < ctx.contentFilter->elementsSize; i++) {
+        if(!UA_Variant_isEmpty(&ctx.valueResult[i]))
+            UA_Variant_clear(&ctx.valueResult[i]);
+    }
+    return res;
+}
+
+static UA_Boolean
+isValidEvent(UA_Server *server, const UA_NodeId *validEventParent,
+             const UA_NodeId *eventId) {
+    /* find the eventType variableNode */
+    UA_QualifiedName findName = UA_QUALIFIEDNAME(0, "EventType");
+    UA_BrowsePathResult bpr = browseSimplifiedBrowsePath(server, *eventId, 1, &findName);
+    if(bpr.statusCode != UA_STATUSCODE_GOOD || bpr.targetsSize < 1) {
+        UA_BrowsePathResult_clear(&bpr);
+        return false;
+    }
+
+    /* Get the EventType Property Node */
+    UA_Variant tOutVariant;
+    UA_Variant_init(&tOutVariant);
+
+    /* Read the Value of EventType Property Node (the Value should be a NodeId) */
+    UA_StatusCode retval = readWithReadValue(server, &bpr.targets[0].targetId.nodeId,
+                                             UA_ATTRIBUTEID_VALUE, &tOutVariant);
+    if(retval != UA_STATUSCODE_GOOD ||
+       !UA_Variant_hasScalarType(&tOutVariant, &UA_TYPES[UA_TYPES_NODEID])) {
+        UA_BrowsePathResult_clear(&bpr);
+        return false;
+    }
+
+    const UA_NodeId *tEventType = (UA_NodeId*)tOutVariant.data;
+
+    /* check whether the EventType is a Subtype of CondtionType
+     * (Part 9 first implementation) */
+    UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
+    if(UA_NodeId_equal(validEventParent, &conditionTypeId) &&
+       isNodeInTree_singleRef(server, tEventType, &conditionTypeId,
+                              UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+        UA_BrowsePathResult_clear(&bpr);
+        UA_Variant_clear(&tOutVariant);
+        return true;
+    }
+
+    /*EventType is not a Subtype of CondtionType
+     *(ConditionId Clause won't be present in Events, which are not Conditions)*/
+    /* check whether Valid Event other than Conditions */
+    UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
+    UA_Boolean isSubtypeOfBaseEvent =
+        isNodeInTree_singleRef(server, tEventType, &baseEventTypeId,
+                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
+
+    UA_BrowsePathResult_clear(&bpr);
+    UA_Variant_clear(&tOutVariant);
+    return isSubtypeOfBaseEvent;
+}
+
+UA_StatusCode
+filterEvent(UA_Server *server, UA_Session *session,
+            const UA_NodeId *eventNode, UA_EventFilter *filter,
+            UA_EventFieldList *efl, UA_EventFilterResult *result) {
+    if(filter->selectClausesSize == 0)
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    UA_EventFieldList_init(efl);
+    efl->eventFields = (UA_Variant *)
+        UA_Array_new(filter->selectClausesSize, &UA_TYPES[UA_TYPES_VARIANT]);
+    if(!efl->eventFields)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    efl->eventFieldsSize = filter->selectClausesSize;
+
+    /* empty event filter result */
+    UA_EventFilterResult_init(result);
+    result->selectClauseResultsSize = filter->selectClausesSize;
+    result->selectClauseResults = (UA_StatusCode *)
+        UA_Array_new(filter->selectClausesSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
+    if(!result->selectClauseResults) {
+        UA_EventFieldList_clear(efl);
+        UA_EventFilterResult_clear(result);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    /* prepare content filter result structure */
+    if(filter->whereClause.elementsSize != 0) {
+        result->whereClauseResult.elementResultsSize = filter->whereClause.elementsSize;
+        result->whereClauseResult.elementResults = (UA_ContentFilterElementResult *)
+            UA_Array_new(filter->whereClause.elementsSize,
+            &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+        if(!result->whereClauseResult.elementResults) {
+            UA_EventFieldList_clear(efl);
+            UA_EventFilterResult_clear(result);
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
+        for(size_t i = 0; i < result->whereClauseResult.elementResultsSize; ++i) {
+            result->whereClauseResult.elementResults[i].operandStatusCodesSize =
+            filter->whereClause.elements->filterOperandsSize;
+            result->whereClauseResult.elementResults[i].operandStatusCodes =
+                (UA_StatusCode *)UA_Array_new(
+                    filter->whereClause.elements->filterOperandsSize,
+                    &UA_TYPES[UA_TYPES_STATUSCODE]);
+            if(!result->whereClauseResult.elementResults[i].operandStatusCodes) {
+                UA_EventFieldList_clear(efl);
+                UA_EventFilterResult_clear(result);
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+        }
+    }
+
+    /* Apply the content (where) filter */
+    UA_StatusCode res =
+        UA_Server_evaluateWhereClauseContentFilter(server, session, eventNode,
+                                                   &filter->whereClause, &result->whereClauseResult);
+    if(res != UA_STATUSCODE_GOOD){
+        UA_EventFieldList_clear(efl);
+        UA_EventFilterResult_clear(result);
+        return res;
+    }
+
+    /* Apply the select filter */
+    /* Check if the browsePath is BaseEventType, in which case nothing more
+     * needs to be checked */
+    UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
+    for(size_t i = 0; i < filter->selectClausesSize; i++) {
+        if(!UA_NodeId_equal(&filter->selectClauses[i].typeDefinitionId, &baseEventTypeId) &&
+           !isValidEvent(server, &filter->selectClauses[i].typeDefinitionId, eventNode)) {
+            UA_Variant_init(&efl->eventFields[i]);
+            /* EventFilterResult currently isn't being used
+            notification->result.selectClauseResults[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID; */
+            continue;
+        }
+
+        /* TODO: Put the result into the selectClausResults */
+        resolveSimpleAttributeOperand(server, session, eventNode,
+                                      &filter->selectClauses[i], &efl->eventFields[i]);
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/*****************************************/
+/* Validation of Filters during Creation */
+/*****************************************/
+
+/* Initial select clause validation. The following checks are currently performed:
+ * - Check if typedefenitionid or browsepath of any clause is NULL
+ * - Check if the eventType is a subtype of BaseEventType
+ * - Check if attributeId is valid
+ * - Check if browsePath contains null
+ * - Check if indexRange is defined and if it is parsable
+ * - Check if attributeId is value */
+void
+UA_Event_staticSelectClauseValidation(UA_Server *server,
+                                      const UA_EventFilter *eventFilter,
+                                      UA_StatusCode *result) {
+    /* The selectClause only has to be checked, if the size is not zero */
+    if(eventFilter->selectClausesSize == 0)
+        return;
+    for(size_t i = 0; i < eventFilter->selectClausesSize; ++i) {
+        result[i] = UA_STATUSCODE_GOOD;
+        /* /typedefenitionid or browsepath of any clause is not NULL ? */
+        if(UA_NodeId_isNull(&eventFilter->selectClauses[i].typeDefinitionId)) {
+            result[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
+            continue;
+        }
+        /*ToDo: Check the following workaround. In UaExpert Event View the selection
+        * of the Server Object set up 7 select filter entries by default. The last
+        * element ist  from node 2782 (A&C ConditionType). Since the reduced
+        * information model dos not contain this type, the result has a brows path of
+        * "null" which results in an error. */
+        UA_NodeId ac_conditionType = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
+        if(UA_NodeId_equal(&eventFilter->selectClauses[i].typeDefinitionId, &ac_conditionType)) {
+            continue;
+        }
+        if(&eventFilter->selectClauses[i].browsePath[0] == NULL) {
+            result[i] = UA_STATUSCODE_BADBROWSENAMEINVALID;
+            continue;
+        }
+        /* eventType is a subtype of BaseEventType ? */
+        UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
+        if(!isNodeInTree_singleRef(
+            server, &eventFilter->selectClauses[i].typeDefinitionId,
+            &baseEventTypeId, UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+            result[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
+            continue;
+        }
+        /* attributeId is valid ? */
+        if(!((0 < eventFilter->selectClauses[i].attributeId) &&
+             (eventFilter->selectClauses[i].attributeId < 28))) {
+            result[i] = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
+            continue;
+        }
+        /* browsePath contains null ? */
+        for(size_t j = 0; j < eventFilter->selectClauses[i].browsePathSize; ++j) {
+            if(UA_QualifiedName_isNull(
+                &eventFilter->selectClauses[i].browsePath[j])) {
+                result[i] = UA_STATUSCODE_BADBROWSENAMEINVALID;
+                break;
+            }
+        }
+        if(result[i] != UA_STATUSCODE_GOOD)
+            continue;
+        /*indexRange is defined ? */
+        if(!UA_String_equal(&eventFilter->selectClauses[i].indexRange,
+                            &UA_STRING_NULL)) {
+            /* indexRange is parsable ? */
+            UA_NumericRange numericRange = UA_NUMERICRANGE("");
+            if(UA_NumericRange_parse(&numericRange,
+                                     eventFilter->selectClauses[i].indexRange) !=
+               UA_STATUSCODE_GOOD) {
+                result[i] = UA_STATUSCODE_BADINDEXRANGEINVALID;
+                continue;
+            }
+            UA_free(numericRange.dimensions);
+            /* attributeId is value ? */
+            if(eventFilter->selectClauses[i].attributeId != UA_ATTRIBUTEID_VALUE) {
+                result[i] = UA_STATUSCODE_BADTYPEMISMATCH;
+                continue;
+            }
+        }
+    }
+}
+
+/* Initial content filter (where clause) check. Current checks:
+ * - Number of operands for each (supported) operator */
+UA_StatusCode
+UA_Event_staticWhereClauseValidation(UA_Server *server,
+                                     const UA_ContentFilter *filter,
+                                     UA_ContentFilterResult *result) {
+    UA_ContentFilterResult_init(result);
+    result->elementResultsSize = filter->elementsSize;
+    if(result->elementResultsSize == 0)
+        return UA_STATUSCODE_GOOD;
+    result->elementResults =
+        (UA_ContentFilterElementResult *)UA_Array_new(
+            result->elementResultsSize,
+            &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+    if(!result->elementResults)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    for(size_t i = 0; i < result->elementResultsSize; ++i) {
+        UA_ContentFilterElementResult *er = &result->elementResults[i];
+        UA_ContentFilterElement ef = filter->elements[i];
+        UA_ContentFilterElementResult_init(er);
+        er->operandStatusCodes =
+            (UA_StatusCode *)UA_Array_new(
+                ef.filterOperandsSize,
+                &UA_TYPES[UA_TYPES_STATUSCODE]);
+        er->operandStatusCodesSize = ef.filterOperandsSize;
+
+        switch(ef.filterOperator) {
+            case UA_FILTEROPERATOR_INVIEW:
+            case UA_FILTEROPERATOR_RELATEDTO: {
+                /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
+                er->statusCode =
+                    UA_STATUSCODE_BADEVENTFILTERINVALID;
+                break;
+            }
+            case UA_FILTEROPERATOR_EQUALS:
+            case UA_FILTEROPERATOR_GREATERTHAN:
+            case UA_FILTEROPERATOR_LESSTHAN:
+            case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
+            case UA_FILTEROPERATOR_LESSTHANOREQUAL:
+            case UA_FILTEROPERATOR_LIKE:
+            case UA_FILTEROPERATOR_CAST:
+            case UA_FILTEROPERATOR_BITWISEAND:
+            case UA_FILTEROPERATOR_BITWISEOR: {
+                if(ef.filterOperandsSize != 2) {
+                    er->statusCode =
+                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+                    break;
+                }
+                er->statusCode = UA_STATUSCODE_GOOD;
+                break;
+            }
+            case UA_FILTEROPERATOR_AND:
+            case UA_FILTEROPERATOR_OR: {
+                if(ef.filterOperandsSize != 2) {
+                    er->statusCode =
+                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+                    break;
+                }
+                for(size_t j = 0; j < 2; ++j) {
+                    if(ef.filterOperands[j].content.decoded.type !=
+                       &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
+                        er->operandStatusCodes[j] =
+                            UA_STATUSCODE_BADFILTEROPERANDINVALID;
+                        er->statusCode =
+                            UA_STATUSCODE_BADFILTEROPERANDINVALID;
+                        break;
+                    }
+                    if(((UA_ElementOperand *)ef.filterOperands[j]
+                        .content.decoded.data)->index > filter->elementsSize - 1) {
+                        er->operandStatusCodes[j] =
+                            UA_STATUSCODE_BADINDEXRANGEINVALID;
+                        er->statusCode =
+                            UA_STATUSCODE_BADINDEXRANGEINVALID;
+                        break;
+                    }
+                }
+                er->statusCode = UA_STATUSCODE_GOOD;
+                break;
+            }
+            case UA_FILTEROPERATOR_ISNULL:
+            case UA_FILTEROPERATOR_NOT: {
+                if(ef.filterOperandsSize != 1) {
+                    er->statusCode =
+                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+                    break;
+                }
+                er->statusCode = UA_STATUSCODE_GOOD;
+                break;
+            }
+            case UA_FILTEROPERATOR_INLIST: {
+                if(ef.filterOperandsSize <= 2) {
+                    er->statusCode =
+                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+                    break;
+                }
+                er->statusCode = UA_STATUSCODE_GOOD;
+                break;
+            }
+            case UA_FILTEROPERATOR_BETWEEN: {
+                if(ef.filterOperandsSize != 3) {
+                    er->statusCode =
+                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+                    break;
+                }
+                er->statusCode = UA_STATUSCODE_GOOD;
+                break;
+            }
+            case UA_FILTEROPERATOR_OFTYPE: {
+                if(ef.filterOperandsSize != 1) {
+                    er->statusCode =
+                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+                    break;
+                }
+                er->operandStatusCodesSize = ef.filterOperandsSize;
+                if(ef.filterOperands[0].content.decoded.type !=
+                   &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
+                    er->statusCode =
+                        UA_STATUSCODE_BADFILTEROPERANDINVALID;
+                    break;
+                }
+                UA_LiteralOperand *literalOperand =
+                    (UA_LiteralOperand *)ef.filterOperands[0]
+                        .content.decoded.data;
+
+                /* Make sure the &pOperand->nodeId is a subtype of BaseEventType */
+                UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
+                if(!isNodeInTree_singleRef(
+                    server, (UA_NodeId *)literalOperand->value.data, &baseEventTypeId,
+                    UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+                    er->statusCode =
+                        UA_STATUSCODE_BADNODEIDINVALID;
+                    break;
+                }
+                er->statusCode = UA_STATUSCODE_GOOD;
+                break;
+            }
+            default:
+                er->statusCode =
+                    UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+                break;
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif /* UA_ENABLE_SUBSCRIPTIONS_EVENTS */

From ac3abb1846dec89f04b70e50f5dbc895df62dac7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Dec 2021 00:30:57 +0100
Subject: [PATCH 0024/1963] fix(server): Correct the status code for
 unsupported filters

---
 src/server/ua_services_monitoreditem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 89a2b150326..5a927ff37a1 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -170,7 +170,7 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
          * DataChangeFilter */
         if(params->filter.encoding != UA_EXTENSIONOBJECT_ENCODED_NOBODY &&
            params->filter.content.decoded.type != &UA_TYPES[UA_TYPES_DATACHANGEFILTER])
-            return UA_STATUSCODE_BADMONITOREDITEMFILTERUNSUPPORTED;
+            return UA_STATUSCODE_BADFILTERNOTALLOWED;
 
         /* Check the deadband and adjust if necessary. */
         if(params->filter.content.decoded.type == &UA_TYPES[UA_TYPES_DATACHANGEFILTER]) {

From 17b247a61dd3351add51cc38082460634b162b40 Mon Sep 17 00:00:00 2001
From: jackybek <jackybek@gmail.com>
Date: Sat, 25 Dec 2021 18:03:22 +0800
Subject: [PATCH 0025/1963] fix(pubsub): Missing comma (#4873)

---
 deps/mqtt-c/mqtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mqtt-c/mqtt.c b/deps/mqtt-c/mqtt.c
index a44c6767656..920583897f0 100644
--- a/deps/mqtt-c/mqtt.c
+++ b/deps/mqtt-c/mqtt.c
@@ -244,7 +244,7 @@ enum MQTTErrors mqtt_connect(struct mqtt_client *client,
                                                       client->mq.curr, client->mq.curr_sz,
                                                       client_id, will_topic, will_message,
                                                       will_message_size,user_name, password,
-                                                      caFilePath, caPath, clientCertPath, clientKeyPath
+                                                      caFilePath, caPath, clientCertPath, clientKeyPath,
                                                       connect_flags, keep_alive
                                                       ),
                          1

From 4db2f75ad96534d3100357ab49f6a07fb8cb838e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Dec 2021 20:00:08 +0100
Subject: [PATCH 0026/1963] refactor(el): Assert that all file descriptors are
 removed during shutdown

---
 arch/eventloop_posix.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index f7cb3d4839a..fccd53a8f21 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -155,8 +155,9 @@ UA_EventLoop_delete(UA_EventLoop *el) {
     /* Process remaining delayed callbacks */
     processDelayed(el);
 
-    /* free the file descriptors */
-    UA_free(el->fds);
+    /* All file descriptors were removed together with the coresponding
+     * EventSource */
+    UA_assert(el->fdsSize == 0);
 
     /* Clean up */
     UA_UNLOCK(&el->elMutex);

From dd3dbc907d7a68c3180963f6a87a4e1dde0aeeff Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 Dec 2021 10:36:47 +0100
Subject: [PATCH 0027/1963] refactor(el): Switch from select to poll for the
 TCP ConnectionManager

---
 arch/eventloop_posix.c        | 184 +++++++++++++---------------------
 arch/eventloop_posix.h        |  10 +-
 arch/eventloop_posix_tcp.c    |  20 ++--
 include/open62541/config.h.in |   7 ++
 4 files changed, 87 insertions(+), 134 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index fccd53a8f21..bd55b3d775e 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -10,8 +10,9 @@
 #include "common/ua_timer.h"
 
 typedef struct {
-    UA_FD fd;
-    short eventMask;
+    /* The members fd and events are stored in the separate pollfds array:
+     * UA_FD fd;
+     * short events; */
     UA_EventSource *es;
     UA_FDCallback callback;
     void *fdcontext;
@@ -33,6 +34,7 @@ struct UA_EventLoop {
     /* Registered file descriptors */
     size_t fdsSize;
     UA_RegisteredFD *fds;
+    struct pollfd *pollfds; /* has the same size as "fds" */
 
     /* Flag determining whether the eventloop is currently within the "run" method */
     UA_Boolean executing;
@@ -46,9 +48,6 @@ struct UA_EventLoop {
 /* Timer */
 /*********/
 
-static UA_StatusCode
-processFDs(UA_EventLoop *el, UA_DateTime usedTimeout);
-
 static void
 timerExecutionTrampoline(void *executionApplication, UA_ApplicationCallback cb,
                          void *callbackApplication, void *data) {
@@ -237,109 +236,52 @@ UA_EventLoop_stop(UA_EventLoop *el) {
     UA_UNLOCK(&el->elMutex);
 }
 
-/* After every select, reset the file-descriptors to listen on */
-static UA_FD
-setFDSets(UA_EventLoop *el, fd_set *readset, fd_set *writeset, fd_set *errset) {
-    FD_ZERO(readset);
-    FD_ZERO(writeset);
-    FD_ZERO(errset);
-    UA_FD highestfd = UA_INVALID_FD;
-    for(size_t i = 0; i < el->fdsSize; i++) {
-
-        UA_FD currentFD = el->fds[i].fd;
-        /* Add to the fd_sets */
-        if(el->fds[i].eventMask & UA_POSIX_EVENT_READ)
-            UA_fd_set(currentFD, readset);
-        if(el->fds[i].eventMask & UA_POSIX_EVENT_WRITE)
-            UA_fd_set(currentFD, writeset);
-        if(el->fds[i].eventMask & UA_POSIX_EVENT_ERR)
-            UA_fd_set(currentFD, errset);
-
-        /* Highest fd? */
-        if(currentFD > highestfd || highestfd == UA_INVALID_FD)
-            highestfd = currentFD;
-    }
-    return highestfd;
-}
-
 static UA_StatusCode
-processFDs(UA_EventLoop *el, UA_DateTime usedTimeout) {
-    fd_set readset, writeset, errset;
-    UA_FD highestfd = setFDSets(el, &readset, &writeset, &errset);
-
-    /* Nothing to do? */
-    if(highestfd == UA_INVALID_FD) {
-        UA_LOG_TRACE(el->logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "No valid FDs for processing");
-        return UA_STATUSCODE_GOOD;
-    }
-
-    struct timeval tmptv = {
-#ifndef _WIN32
-        (time_t)(usedTimeout / UA_DATETIME_SEC),
-        (suseconds_t)((usedTimeout % UA_DATETIME_SEC) / UA_DATETIME_USEC)
-#else
+pollFDs(UA_EventLoop *el, UA_DateTime usedTimeout) {
+    /* Poll the registered sockets */
+#ifdef _GNU_SOURCE
+    struct timespec precisionTimeout = {
         (long)(usedTimeout / UA_DATETIME_SEC),
-        (long)((usedTimeout % UA_DATETIME_SEC) / UA_DATETIME_USEC)
-#endif
+        (long)((usedTimeout % UA_DATETIME_SEC) * 100)
     };
+    int pollStatus = ppoll(el->pollfds, el->fdsSize, &precisionTimeout, NULL);
+#else
+    int pollStatus = UA_poll(el->pollfds, el->fdsSize, usedTimeout / UA_DATETIME_MSEC);
+#endif
 
-    int selectStatus =  UA_select(highestfd+1, &readset, &writeset, &errset, &tmptv);
-    if(selectStatus < 0) {
+    if(pollStatus < 0) {
         /* We will retry, only log the error */
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(UA_EventLoop_getLogger(el),
                            UA_LOGCATEGORY_EVENTLOOP,
-                           "Error during select: %s", errno_str));
-        el->executing = false;
+                           "Error during poll: %s", errno_str));
         return UA_STATUSCODE_GOODCALLAGAIN;
     }
 
     /* Loop over all registered FD to see if an event arrived. Yes, this is why
-      * select is slow for many open sockets. */
+     * poll is slow for many open sockets. */
+    int processed = 0;
     for(size_t i = 0; i < el->fdsSize; i++) {
-        UA_RegisteredFD *rfd = &el->fds[i];
-        UA_FD fd = rfd->fd;
-        UA_assert(fd > 0);
-
-        UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "Processing fd: %u", (unsigned)fd);
+        /* All done */
+        if(processed >= pollStatus)
+            break;
 
-        /* Error Event */
-        if((rfd->eventMask & UA_POSIX_EVENT_ERR) && UA_fd_isset(fd, &errset)) {
-            UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
-                         "Processing error event for fd: %u", (unsigned)fd);
-            UA_UNLOCK(&el->elMutex);
-            rfd->callback(rfd->es, fd, &rfd->fdcontext, UA_POSIX_EVENT_ERR);
-            UA_LOCK(&el->elMutex);
-            if(i == el->fdsSize || fd != el->fds[i].fd)
-                i--; /* The fd has removed itself */
+        /* Nothing to do for this fd */
+        if(el->pollfds[i].revents == 0)
             continue;
-        }
 
-        /* Read Event */
-        if((rfd->eventMask & UA_POSIX_EVENT_READ) && UA_fd_isset(fd, &readset)) {
-            UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
-                         "Processing read event for fd: %u", (unsigned)fd);
-            UA_UNLOCK(&el->elMutex);
-            rfd->callback(rfd->es, fd, &rfd->fdcontext, UA_POSIX_EVENT_READ);
-            UA_LOCK(&el->elMutex);
-            if(i == el->fdsSize || fd != el->fds[i].fd)
-                i--; /* The fd has removed itself */
-            continue;
-        }
+        /* Process the fd */
+        UA_RegisteredFD *rfd = &el->fds[i];
+        UA_FD fd = el->pollfds[i].fd;
+        short revent = el->pollfds[i].revents;
+        UA_UNLOCK(&el->elMutex);
+        rfd->callback(rfd->es, fd, &rfd->fdcontext, revent);
+        UA_LOCK(&el->elMutex);
+        processed++;
 
-        /* Write Event */
-        if((rfd->eventMask & UA_POSIX_EVENT_WRITE) && UA_fd_isset(fd, &writeset)) {
-            UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
-                         "Processing write event for fd: %u", (unsigned)fd);
-            UA_UNLOCK(&el->elMutex);
-            rfd->callback(rfd->es, fd, &rfd->fdcontext, UA_POSIX_EVENT_WRITE);
-            UA_LOCK(&el->elMutex);
-            if(i == el->fdsSize || fd != el->fds[i].fd)
-                i--; /* The fd has removed itself */
-            continue;
-        }
+        /* The fd has removed itself from within the callback? */
+        if(i >= el->fdsSize || fd != el->pollfds[i].fd)
+            i--;
     }
     return UA_STATUSCODE_GOOD;
 }
@@ -392,15 +334,7 @@ UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
     UA_DateTime usedTimeout = UA_MIN(callbackTimeout, maxTimeout);
 
     /* Listen on the active file-descriptors (sockets) from the ConnectionManagers */
-    UA_StatusCode rv = processFDs(el, usedTimeout);
-    if(rv == UA_STATUSCODE_GOODCALLAGAIN) {
-        UA_UNLOCK(&el->elMutex);
-        return UA_STATUSCODE_GOOD;
-    }
-    if(rv != UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&el->elMutex);
-        return rv;
-    }
+    UA_StatusCode rv = pollFDs(el, usedTimeout);
 
     /* Process and then free registered delayed callbacks */
     processDelayed(el);
@@ -411,7 +345,7 @@ UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
 
     el->executing = false;
     UA_UNLOCK(&el->elMutex);
-    return UA_STATUSCODE_GOOD;
+    return rv;
 }
 
 
@@ -505,12 +439,20 @@ UA_EventLoop_registerFD(UA_EventLoop *el, UA_FD fd, short eventMask,
     }
     el->fds = fds_tmp;
 
+    struct pollfd *pollfds_tmp = (struct pollfd*)
+        UA_realloc(el->pollfds, sizeof(struct pollfd) *(el->fdsSize + 1));
+    if(!pollfds_tmp) {
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    el->pollfds = pollfds_tmp;
+
     /* Add to the last entry */
     el->fds[el->fdsSize].callback = cb;
-    el->fds[el->fdsSize].eventMask = eventMask;
     el->fds[el->fdsSize].es = es;
     el->fds[el->fdsSize].fdcontext = fdcontext;
-    el->fds[el->fdsSize].fd = fd;
+    el->pollfds[el->fdsSize].fd = fd;
+    el->pollfds[el->fdsSize].events = eventMask;
     el->fdsSize++;
 
     UA_UNLOCK(&el->elMutex);
@@ -525,7 +467,7 @@ UA_EventLoop_modifyFD(UA_EventLoop *el, UA_FD fd, short eventMask,
     /* Find the entry */
     size_t i = 0;
     for(; i < el->fdsSize; i++) {
-        if(el->fds[i].fd == fd)
+        if(el->pollfds[i].fd == fd)
             break;
     }
 
@@ -537,7 +479,7 @@ UA_EventLoop_modifyFD(UA_EventLoop *el, UA_FD fd, short eventMask,
 
     /* Modify */
     el->fds[i].callback = cb;
-    el->fds[i].eventMask = eventMask;
+    el->pollfds[i].events = eventMask;
     el->fds[i].fdcontext = fdcontext;
 
     UA_UNLOCK(&el->elMutex);
@@ -554,7 +496,7 @@ UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd) {
     /* Find the entry */
     size_t i = 0;
     for(; i < el->fdsSize; i++) {
-        if(el->fds[i].fd == fd)
+        if(el->pollfds[i].fd == fd)
             break;
     }
 
@@ -564,21 +506,28 @@ UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd) {
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
-    if(el->fdsSize > 1) {
-        /* Move the last entry in the ith slot and realloc. */
-        el->fdsSize--;
+    el->fdsSize--;
+    if(el->fdsSize > 0) {
+        /* Move the last entry to the ith slot and realloc. */
         el->fds[i] = el->fds[el->fdsSize];
+        el->pollfds[i] = el->pollfds[el->fdsSize];
+
+        /* If realloc fails the fds are still in a correct state with
+         * possibly lost memory, so failing silently here is ok */
         UA_RegisteredFD *fds_tmp = (UA_RegisteredFD*)
             UA_realloc(el->fds, sizeof(UA_RegisteredFD) * el->fdsSize);
-        /* if realloc fails the fds are still in a correct state with 
-         * possibly lost memory, so failing silently here is ok */
         if(fds_tmp)
             el->fds = fds_tmp;
+        struct pollfd *pollfds_tmp = (struct pollfd*)
+            UA_realloc(el->pollfds, sizeof(struct pollfd) * el->fdsSize);
+        if(pollfds_tmp)
+            el->pollfds = pollfds_tmp;
     } else {
-        /* Remove the last entry */
+        /* Free the lists */
         UA_free(el->fds);
         el->fds = NULL;
-        el->fdsSize = 0;
+        UA_free(el->pollfds);
+        el->pollfds = NULL;
     }
 
     UA_UNLOCK(&el->elMutex);
@@ -590,10 +539,13 @@ UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es, UA_FDCallback cb) {
     for(size_t i = 0; i < el->fdsSize; i++) {
         if(el->fds[i].es != es)
             continue;
-        UA_FD fd = el->fds[i].fd;
+
+        UA_FD fd = el->pollfds[i].fd;
         cb(es, fd, el->fds[i].fdcontext, 0);
-        if(i == el->fdsSize || fd != el->fds[i].fd)
-            i--; /* The fd has removed itself */
+
+        /* The fd has removed itself from within the callback? */
+        if(i >= el->fdsSize || fd != el->pollfds[i].fd)
+            i--;
     }
 }
 
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index fcc1dd8ce31..dae212f22d2 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -29,7 +29,7 @@
 # define UA_WOULDBLOCK WSAEWOULDBLOCK
 # define UA_ERR_CONNECTION_PROGRESS WSAEWOULDBLOCK
 #else /* Unix */
-# include <sys/select.h>
+# include <sys/poll.h>
 #endif
 
 /* Catch-all for the architectures that are "actually POSIX" */
@@ -64,13 +64,7 @@ _UA_BEGIN_DECLS
 
 /* POSIX events are based on sockets / file descriptors. The EventSources can
  * register their fd in the EventLoop so that they are considered by the
- * EventLoop dropping into "select" to wait for events. */
-
-/* POSIX-select can listen for three types of events. It has to be selected
- * for each registered fd which events they are interested in.  */
-#define UA_POSIX_EVENT_READ 1
-#define UA_POSIX_EVENT_WRITE 2
-#define UA_POSIX_EVENT_ERR 4
+ * EventLoop dropping into "poll" to wait for events. */
 
 typedef void
 (*UA_FDCallback)(UA_EventSource *es, UA_FD fd, void *fdcontext, short event);
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index e0f4ed9e0a0..aa2653e93ed 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -36,7 +36,8 @@ TCP_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_ByteString_clear(buf);
 }
 
-/* Set the socket non-blocking */
+/* Set the socket non-blocking. If the listen-socket is nonblocking, incoming
+ * connections inherit this state. */
 static UA_StatusCode
 TCP_setNonBlocking(UA_FD sockfd) {
 #ifndef _WIN32
@@ -116,7 +117,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
 
     /* Write-Event, a new connection has opened.  */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    if(event & UA_POSIX_EVENT_WRITE) {
+    if(event == UA_POLLOUT) {
         UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                      UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| Opening a new connection", (unsigned)fd);
@@ -126,8 +127,9 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                                UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
-        UA_EventLoop_modifyFD(cm->eventSource.eventLoop, fd, UA_POSIX_EVENT_READ,
-                              (UA_FDCallback)TCP_connectionSocketCallback, *fdcontext);
+        UA_EventLoop_modifyFD(cm->eventSource.eventLoop, fd, UA_POLLIN,
+                              (UA_FDCallback)TCP_connectionSocketCallback,
+                              *fdcontext);
         return;
     }
 
@@ -238,7 +240,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
 
     /* Configure the new socket */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    res |= TCP_setNonBlocking(newsockfd); /* Set the socket non-blocking */
+    /* res |= TCP_setNonBlocking(newsockfd); Inherited from the listen-socket */
     res |= TCP_setNoSigPipe(newsockfd);   /* Supress interrupts from the socket */
     res |= TCP_setNoNagle(newsockfd);     /* Disable Nagle's algorithm */
     if(res != UA_STATUSCODE_GOOD) {
@@ -259,8 +261,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                            0, NULL, UA_BYTESTRING_NULL);
 
     /* Register in the EventLoop. Signal to the user if registering failed. */
-    res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newsockfd,
-                                  UA_POSIX_EVENT_READ,
+    res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newsockfd, UA_POLLIN,
                                   (UA_FDCallback)TCP_connectionSocketCallback,
                                   &cm->eventSource, ctx);
     if(res != UA_STATUSCODE_GOOD) {
@@ -389,8 +390,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
 
     /* Register the socket */
     UA_StatusCode res =
-        UA_EventLoop_registerFD(cm->eventSource.eventLoop, listenSocket,
-                                UA_POSIX_EVENT_READ,
+        UA_EventLoop_registerFD(cm->eventSource.eventLoop, listenSocket, UA_POLLIN,
                                 (UA_FDCallback)TCP_listenSocketCallback,
                                 &cm->eventSource, NULL);
     if(res != UA_STATUSCODE_GOOD) {
@@ -609,7 +609,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     }
 
     /* Register the fd to trigger when output is possible (the connection is open) */
-    res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newSock, UA_POSIX_EVENT_WRITE,
+    res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newSock, UA_POLLOUT,
                                   (UA_FDCallback)TCP_connectionSocketCallback,
                                   &cm->eventSource, context);
     if(res != UA_STATUSCODE_GOOD) {
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index f400173649e..82a77768e94 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -126,11 +126,18 @@
 # ifndef _DEFAULT_SOURCE
 #  define _DEFAULT_SOURCE
 # endif
+
 /* On older systems we need to define _BSD_SOURCE.
  * _DEFAULT_SOURCE is an alias for that. */
 # ifndef _BSD_SOURCE
 #  define _BSD_SOURCE
 # endif
+
+/* Define _GNU_SOURCE to get functions like ppoll. Comment this out to
+ * only use standard POSIX definitions. */
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+# endif
 #endif
 
 // specific architectures can undef this

From 0bca663c2ba79f28f219a97e506cb5159b7f45b6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Dec 2021 18:43:42 +0100
Subject: [PATCH 0028/1963] refactor(arch): Replace UA_ERR_CONNECTION_PROGRESS
 with UA_WOULDBLOCK everywhere

---
 arch/Readme.md                 |  1 -
 arch/common/ua_lwip.h          |  1 -
 arch/eCos/ua_architecture.h    |  1 -
 arch/eventloop_posix.h         | 15 ---------------
 arch/eventloop_posix_tcp.c     |  2 +-
 arch/network_tcp.c             |  2 +-
 arch/posix/ua_architecture.h   |  1 -
 arch/vxworks/ua_architecture.h |  1 -
 arch/wec7/ua_architecture.h    |  1 -
 arch/win32/ua_architecture.h   |  2 --
 10 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/arch/Readme.md b/arch/Readme.md
index db1ed466d86..00665d65213 100644
--- a/arch/Readme.md
+++ b/arch/Readme.md
@@ -95,7 +95,6 @@ To port to a new architecture you should follow these steps:
     //#define UA_AGAIN
     //#define UA_EAGAIN
     //#define UA_WOULDBLOCK
-    //#define UA_ERR_CONNECTION_PROGRESS
     //#define UA_INTERRUPTED
     
     /*
diff --git a/arch/common/ua_lwip.h b/arch/common/ua_lwip.h
index 06f9ec30707..aa731447cf5 100644
--- a/arch/common/ua_lwip.h
+++ b/arch/common/ua_lwip.h
@@ -35,7 +35,6 @@
 #define UA_AGAIN EAGAIN
 #define UA_EAGAIN EAGAIN
 #define UA_WOULDBLOCK EWOULDBLOCK
-#define UA_ERR_CONNECTION_PROGRESS EINPROGRESS
 
 #define UA_send lwip_send
 #define UA_recv lwip_recv
diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
index c6ef58dbd60..6c7dc754b15 100644
--- a/arch/eCos/ua_architecture.h
+++ b/arch/eCos/ua_architecture.h
@@ -37,7 +37,6 @@
 #define UA_AGAIN EAGAIN
 #define UA_EAGAIN EAGAIN
 #define UA_WOULDBLOCK EWOULDBLOCK
-#define UA_ERR_CONNECTION_PROGRESS EINPROGRESS
 
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
     getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index dae212f22d2..beff62a2810 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -27,7 +27,6 @@
 # define UA_AGAIN WSAEWOULDBLOCK
 # define UA_EAGAIN EAGAIN
 # define UA_WOULDBLOCK WSAEWOULDBLOCK
-# define UA_ERR_CONNECTION_PROGRESS WSAEWOULDBLOCK
 #else /* Unix */
 # include <sys/poll.h>
 #endif
@@ -44,20 +43,6 @@
 # define UA_AGAIN EAGAIN
 # define UA_EAGAIN EAGAIN
 # define UA_WOULDBLOCK EWOULDBLOCK
-# define UA_ERR_CONNECTION_PROGRESS EINPROGRESS
-#endif
-
-/* Workaround a bug in early glibc. Additionally, some non-glibc implementations
- * use a macro for FD_SET that triggers a cast-warning (e.g. early BSD libc or
- * musl libc). */
-#if (!defined(__GNU_LIBRARY__) && defined(FD_SET)) ||       \
-    (defined(__GNU_LIBRARY__) && (__GNU_LIBRARY__ <= 6) &&  \
-     (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 16))
-# define UA_FD_SET(fd, fds) FD_SET((unsigned int)fd, fds)
-# define UA_FD_ISSET(fd, fds) FD_ISSET((unsigned int)fd, fds)
-#else
-# define UA_FD_SET(fd, fds) FD_SET((UA_FD)fd, fds)
-# define UA_FD_ISSET(fd, fds) FD_ISSET((UA_FD)fd, fds)
 #endif
 
 _UA_BEGIN_DECLS
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index aa2653e93ed..2df6cef604b 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -599,7 +599,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     /* Non-blocking connect */
     error = UA_connect(newSock, info->ai_addr, info->ai_addrlen);
     freeaddrinfo(info);
-    if(error != 0 && UA_ERRNO != UA_ERR_CONNECTION_PROGRESS) {
+    if(error != 0 && UA_ERRNO != UA_WOULDBLOCK) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                          UA_LOGCATEGORY_NETWORK,
diff --git a/arch/network_tcp.c b/arch/network_tcp.c
index e5998e3638d..ea62719a1b8 100644
--- a/arch/network_tcp.c
+++ b/arch/network_tcp.c
@@ -764,7 +764,7 @@ UA_ClientConnectionTCP_poll(UA_Connection *connection, UA_UInt32 timeout,
         }
 
         /* The connection failed */
-        if((UA_ERRNO != UA_ERR_CONNECTION_PROGRESS)) {
+        if(UA_ERRNO != UA_WOULDBLOCK && UA_ERRNO != UA_INPROGRESS) {
             UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
                            "Connection to %.*s failed with error: %s",
                            (int)tcpConnection->endpointUrl.length,
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 3cf2dc2b868..966671715af 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -69,7 +69,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_AGAIN EAGAIN
 #define UA_EAGAIN EAGAIN
 #define UA_WOULDBLOCK EWOULDBLOCK
-#define UA_ERR_CONNECTION_PROGRESS EINPROGRESS
 
 #define UA_POLLIN POLLIN
 #define UA_POLLOUT POLLOUT
diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
index a7f67338f88..9a7e60a87bc 100644
--- a/arch/vxworks/ua_architecture.h
+++ b/arch/vxworks/ua_architecture.h
@@ -60,7 +60,6 @@
 #define UA_AGAIN EAGAIN
 #define UA_EAGAIN EAGAIN
 #define UA_WOULDBLOCK EWOULDBLOCK
-#define UA_ERR_CONNECTION_PROGRESS EINPROGRESS
 
 #define UA_ENABLE_LOG_COLORS
 
diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
index d27df762a5a..3473da5679f 100644
--- a/arch/wec7/ua_architecture.h
+++ b/arch/wec7/ua_architecture.h
@@ -74,7 +74,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_AGAIN WSAEWOULDBLOCK
 #define UA_EAGAIN EAGAIN
 #define UA_WOULDBLOCK WSAEWOULDBLOCK
-#define UA_ERR_CONNECTION_PROGRESS WSAEWOULDBLOCK
 
 #define UA_fd_set(fd, fds) FD_SET((UA_SOCKET)fd, fds)
 #define UA_fd_isset(fd, fds) FD_ISSET((UA_SOCKET)fd, fds)
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 4372d0cf391..62f49cf2f50 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -82,8 +82,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_AGAIN WSAEWOULDBLOCK
 #define UA_EAGAIN EAGAIN
 #define UA_WOULDBLOCK WSAEWOULDBLOCK
-#define UA_ERR_CONNECTION_PROGRESS WSAEWOULDBLOCK
-
 #define UA_POLLIN POLLRDNORM
 #define UA_POLLOUT POLLWRNORM
 

From 09a19278baa4af821ac3d056a9e693f6cf4a14ee Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Dec 2021 18:44:19 +0100
Subject: [PATCH 0029/1963] refactor(arch): Clean up socket definitions for
 MinGW

---
 arch/eventloop_posix.h       |  2 --
 arch/win32/ua_architecture.h | 15 ++-------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index beff62a2810..59c0fafc4a8 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -20,7 +20,6 @@
 # if !defined(__MINGW32__) || defined(__clang__)
 #  define UA_FD SOCKET /* On MSVC, a socket is a pointer and not an int */
 #  define UA_INVALID_FD INVALID_SOCKET
-//#  define UA_close(s) closesocket(s) /* closesocket() takes a SOCKET (and sock() an int) */
 # endif
 # define UA_ERRNO WSAGetLastError()
 # define UA_INTERRUPTED WSAEINTR
@@ -35,7 +34,6 @@
 #ifndef UA_FD
 # define UA_FD int
 # define UA_INVALID_FD -1
-//# define UA_close(s) close(s)
 #endif
 #ifndef UA_ERRNO
 # define UA_ERRNO errno
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 62f49cf2f50..ba9db26bac4 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -11,10 +11,6 @@
 #ifndef PLUGINS_ARCH_WIN32_UA_ARCHITECTURE_H_
 #define PLUGINS_ARCH_WIN32_UA_ARCHITECTURE_H_
 
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
-#endif
-
 /* Disable some security warnings on MSVC */
 #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
 # define _CRT_SECURE_NO_WARNINGS
@@ -42,7 +38,6 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <ws2tcpip.h>
-#include <winsock2.h>
 
 #if defined (_MSC_VER) || defined(__clang__)
 # ifndef UNDER_CE
@@ -69,14 +64,8 @@ void UA_sleep_ms(unsigned long ms);
 // #define UA_ENABLE_LOG_COLORS
 
 #define UA_IPV6 1
-
-#if defined(__MINGW32__) && !defined(__clang__) //mingw defines SOCKET as long long unsigned int, giving errors in logging and when comparing with UA_Int32
-# define UA_SOCKET int
-# define UA_INVALID_SOCKET -1
-#else
-# define UA_SOCKET SOCKET
-# define UA_INVALID_SOCKET INVALID_SOCKET
-#endif
+#define UA_SOCKET SOCKET
+#define UA_INVALID_SOCKET INVALID_SOCKET
 #define UA_ERRNO WSAGetLastError()
 #define UA_INTERRUPTED WSAEINTR
 #define UA_AGAIN WSAEWOULDBLOCK

From b20fcfe291c8a9353961c78a0e734c5ce0835622 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Dec 2021 20:58:13 +0100
Subject: [PATCH 0030/1963] refactor(arch): Remove the duplicity of UA_AGAIN,
 UA_EAGAIN

---
 arch/Readme.md                 | 3 +--
 arch/common/ua_lwip.h          | 3 +--
 arch/eCos/ua_architecture.h    | 3 +--
 arch/eventloop_posix_tcp.c     | 9 +++++++--
 arch/network_tcp.c             | 2 +-
 arch/posix/ua_architecture.h   | 3 +--
 arch/vxworks/ua_architecture.h | 3 +--
 arch/wec7/ua_architecture.h    | 3 +--
 arch/win32/ua_architecture.h   | 3 +--
 9 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/arch/Readme.md b/arch/Readme.md
index 00665d65213..a055890fc99 100644
--- a/arch/Readme.md
+++ b/arch/Readme.md
@@ -90,10 +90,9 @@ To port to a new architecture you should follow these steps:
     //#define UA_IPV6 1 //or 0
     //#define UA_SOCKET
     //#define UA_INVALID_SOCKET
-    //#define UA_ERRNO  
+    //#define UA_ERRNO
     //#define UA_INTERRUPTED
     //#define UA_AGAIN
-    //#define UA_EAGAIN
     //#define UA_WOULDBLOCK
     //#define UA_INTERRUPTED
     
diff --git a/arch/common/ua_lwip.h b/arch/common/ua_lwip.h
index aa731447cf5..82c3de0ba54 100644
--- a/arch/common/ua_lwip.h
+++ b/arch/common/ua_lwip.h
@@ -32,8 +32,7 @@
 #define UA_INVALID_SOCKET -1
 #define UA_ERRNO errno
 #define UA_INTERRUPTED EINTR
-#define UA_AGAIN EAGAIN
-#define UA_EAGAIN EAGAIN
+#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
 #define UA_WOULDBLOCK EWOULDBLOCK
 
 #define UA_send lwip_send
diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
index 6c7dc754b15..2b1b1db92d4 100644
--- a/arch/eCos/ua_architecture.h
+++ b/arch/eCos/ua_architecture.h
@@ -34,8 +34,7 @@
 #define UA_INVALID_SOCKET -1
 #define UA_ERRNO errno
 #define UA_INTERRUPTED EINTR
-#define UA_AGAIN EAGAIN
-#define UA_EAGAIN EAGAIN
+#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
 #define UA_WOULDBLOCK EWOULDBLOCK
 
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 2df6cef604b..5e001b32b4b 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -167,7 +167,9 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
         response.length = (size_t)ret; /* Set the length of the received buffer */
         cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
                                UA_STATUSCODE_GOOD, 0, NULL, response);
-    } else if(UA_ERRNO != UA_INTERRUPTED && UA_ERRNO != UA_EAGAIN) {
+    } else if(UA_ERRNO != UA_INTERRUPTED &&
+              UA_ERRNO != UA_WOULDBLOCK &&
+              UA_ERRNO != UA_AGAIN) {
         /* Orderly shutdown of the connection. Signal to the application and
          * then close the connection. We end up in this path after shutdown was
          * called on the socket. Here, we then are in the next EventLoop
@@ -489,7 +491,10 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
             n = UA_send((UA_FD)connectionId,
                         (const char*)buf->data + nWritten,
                         bytes_to_send, flags);
-            if(n < 0 && UA_ERRNO != UA_INTERRUPTED && UA_ERRNO != UA_AGAIN) {
+            if(n < 0 &&
+               UA_ERRNO != UA_INTERRUPTED &&
+               UA_ERRNO != UA_WOULDBLOCK &&
+               UA_ERRNO != UA_AGAIN) {
                 UA_LOG_SOCKET_ERRNO_GAI_WRAP(
                     UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                                  UA_LOGCATEGORY_NETWORK,
diff --git a/arch/network_tcp.c b/arch/network_tcp.c
index ea62719a1b8..ea9de4cf776 100644
--- a/arch/network_tcp.c
+++ b/arch/network_tcp.c
@@ -153,7 +153,7 @@ connection_recv(UA_Connection *connection, UA_ByteString *response,
         if(internallyAllocated)
             UA_ByteString_clear(response);
         if(UA_ERRNO == UA_INTERRUPTED || (timeout > 0) ?
-           false : (UA_ERRNO == UA_EAGAIN || UA_ERRNO == UA_WOULDBLOCK))
+           false : (UA_ERRNO == UA_AGAIN || UA_ERRNO == UA_WOULDBLOCK))
             return UA_STATUSCODE_GOOD; /* statuscode_good but no data -> retry */
         connection->close(connection);
         return UA_STATUSCODE_BADCONNECTIONCLOSED;
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 966671715af..0fa808c699f 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -66,8 +66,7 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_INVALID_SOCKET -1
 #define UA_ERRNO errno
 #define UA_INTERRUPTED EINTR
-#define UA_AGAIN EAGAIN
-#define UA_EAGAIN EAGAIN
+#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
 #define UA_WOULDBLOCK EWOULDBLOCK
 
 #define UA_POLLIN POLLIN
diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
index 9a7e60a87bc..b4409c272a3 100644
--- a/arch/vxworks/ua_architecture.h
+++ b/arch/vxworks/ua_architecture.h
@@ -57,8 +57,7 @@
 #define UA_INVALID_SOCKET -1
 #define UA_ERRNO errno
 #define UA_INTERRUPTED EINTR
-#define UA_AGAIN EAGAIN
-#define UA_EAGAIN EAGAIN
+#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
 #define UA_WOULDBLOCK EWOULDBLOCK
 
 #define UA_ENABLE_LOG_COLORS
diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
index 3473da5679f..3e5252d2e7a 100644
--- a/arch/wec7/ua_architecture.h
+++ b/arch/wec7/ua_architecture.h
@@ -71,8 +71,7 @@ void UA_sleep_ms(unsigned long ms);
 #endif
 #define UA_ERRNO WSAGetLastError()
 #define UA_INTERRUPTED WSAEINTR
-#define UA_AGAIN WSAEWOULDBLOCK
-#define UA_EAGAIN EAGAIN
+#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
 #define UA_WOULDBLOCK WSAEWOULDBLOCK
 
 #define UA_fd_set(fd, fds) FD_SET((UA_SOCKET)fd, fds)
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index ba9db26bac4..f4a4a5da0ca 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -68,8 +68,7 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_INVALID_SOCKET INVALID_SOCKET
 #define UA_ERRNO WSAGetLastError()
 #define UA_INTERRUPTED WSAEINTR
-#define UA_AGAIN WSAEWOULDBLOCK
-#define UA_EAGAIN EAGAIN
+#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
 #define UA_WOULDBLOCK WSAEWOULDBLOCK
 #define UA_POLLIN POLLRDNORM
 #define UA_POLLOUT POLLWRNORM

From 6b537bb2b543c4822cb4529323d37807b37ec2af Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Dec 2021 20:59:28 +0100
Subject: [PATCH 0031/1963] refactor(arch): Simplify the networking macros for
 the EventLoop

---
 arch/eventloop_posix.h     | 32 +++-----------------------------
 arch/eventloop_posix_tcp.c |  4 ++--
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 59c0fafc4a8..328ff2a5128 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -12,36 +12,10 @@
 #include <open62541/config.h>
 #include <open62541/plugin/eventloop.h>
 
-/* A macro-forest to work around small differences between POSIX and
- * nearly-POSIX architectures */
+/* TODO: Move the macro-forest from /arch/<arch>/ua_architecture.h */
 
-#if defined(_WIN32) /* Windows */
-# include <winsock2.h>
-# if !defined(__MINGW32__) || defined(__clang__)
-#  define UA_FD SOCKET /* On MSVC, a socket is a pointer and not an int */
-#  define UA_INVALID_FD INVALID_SOCKET
-# endif
-# define UA_ERRNO WSAGetLastError()
-# define UA_INTERRUPTED WSAEINTR
-# define UA_AGAIN WSAEWOULDBLOCK
-# define UA_EAGAIN EAGAIN
-# define UA_WOULDBLOCK WSAEWOULDBLOCK
-#else /* Unix */
-# include <sys/poll.h>
-#endif
-
-/* Catch-all for the architectures that are "actually POSIX" */
-#ifndef UA_FD
-# define UA_FD int
-# define UA_INVALID_FD -1
-#endif
-#ifndef UA_ERRNO
-# define UA_ERRNO errno
-# define UA_INTERRUPTED EINTR
-# define UA_AGAIN EAGAIN
-# define UA_EAGAIN EAGAIN
-# define UA_WOULDBLOCK EWOULDBLOCK
-#endif
+#define UA_FD UA_SOCKET
+#define UA_INVALID_FD UA_INVALID_SOCKET
 
 _UA_BEGIN_DECLS
 
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 5e001b32b4b..750fc7bdfe6 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -304,7 +304,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     
     /* Create the server socket */
     UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-    if(listenSocket == UA_INVALID_SOCKET) {
+    if(listenSocket == UA_INVALID_FD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                           UA_LOGCATEGORY_NETWORK,
@@ -576,7 +576,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
 
     /* Create a socket */
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
-    if(newSock == UA_INVALID_SOCKET) {
+    if(newSock == UA_INVALID_FD) {
         freeaddrinfo(info);
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),

From 14974576ab32148d8859797669a69898106ff556 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Dec 2021 21:36:12 +0100
Subject: [PATCH 0032/1963] feat(el): Poll if 'send' blocks with EWOULDBLOCK

Adapter for the EventLoop from commit
524bf009783343df5504fcf85ff2d784e959a42d by Emmanuel Pacaud
<emmanuel.pacaud@lapp.in2p3.fr>
---
 arch/eCos/ua_architecture.h    |  1 +
 arch/eventloop_posix_tcp.c     | 41 +++++++++++++++++++++++-----------
 arch/network_tcp.c             |  2 +-
 arch/posix/ua_architecture.h   |  1 +
 arch/vxworks/ua_architecture.h |  1 +
 arch/wec7/ua_architecture.h    | 10 +++------
 arch/win32/ua_architecture.h   |  1 +
 7 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
index 2b1b1db92d4..8c1fbd35121 100644
--- a/arch/eCos/ua_architecture.h
+++ b/arch/eCos/ua_architecture.h
@@ -35,6 +35,7 @@
 #define UA_ERRNO errno
 #define UA_INTERRUPTED EINTR
 #define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
+#define UA_INPROGRESS EINPROGRESS
 #define UA_WOULDBLOCK EWOULDBLOCK
 
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 750fc7bdfe6..18835e6a162 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -479,6 +479,10 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     /* Prevent OS signals when sending to a closed socket */
     int flags = MSG_NOSIGNAL;
 
+    struct pollfd tmp_poll_fd;
+    tmp_poll_fd.fd = (UA_FD)connectionId;
+    tmp_poll_fd.events = UA_POLLOUT;
+
     /* Send the full buffer. This may require several calls to send */
     size_t nWritten = 0;
     do {
@@ -491,18 +495,27 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
             n = UA_send((UA_FD)connectionId,
                         (const char*)buf->data + nWritten,
                         bytes_to_send, flags);
-            if(n < 0 &&
-               UA_ERRNO != UA_INTERRUPTED &&
-               UA_ERRNO != UA_WOULDBLOCK &&
-               UA_ERRNO != UA_AGAIN) {
-                UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-                    UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
-                                 UA_LOGCATEGORY_NETWORK,
-                                 "TCP %u\t| Send failed with error %s",
-                                 (unsigned)connectionId, errno_str));
-                TCP_shutdownConnection(cm, connectionId);
-                UA_ByteString_clear(buf);
-                return UA_STATUSCODE_BADCONNECTIONCLOSED;
+            if(n < 0) {
+                /* An error we cannot recover from? */
+                if(UA_ERRNO != UA_INTERRUPTED &&
+                   UA_ERRNO != UA_WOULDBLOCK &&
+                   UA_ERRNO != UA_AGAIN) {
+                    UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+                       UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                                    UA_LOGCATEGORY_NETWORK,
+                                    "TCP %u\t| Send failed with error %s",
+                                    (unsigned)connectionId, errno_str));
+                    TCP_shutdownConnection(cm, connectionId);
+                    UA_ByteString_clear(buf);
+                    return UA_STATUSCODE_BADCONNECTIONCLOSED;
+                }
+
+                /* Poll for the socket resources to become available and retry
+                 * (blocking) */
+                int poll_ret;
+                do {
+                    poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
+                } while(poll_ret == 0 || (poll_ret < 0 && UA_ERRNO == UA_INTERRUPTED));
             }
         } while(n < 0);
         nWritten += (size_t)n;
@@ -604,7 +617,9 @@ TCP_openConnection(UA_ConnectionManager *cm,
     /* Non-blocking connect */
     error = UA_connect(newSock, info->ai_addr, info->ai_addrlen);
     freeaddrinfo(info);
-    if(error != 0 && UA_ERRNO != UA_WOULDBLOCK) {
+    if(error != 0 &&
+       UA_ERRNO != UA_INPROGRESS &&
+       UA_ERRNO != UA_WOULDBLOCK) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
                          UA_LOGCATEGORY_NETWORK,
diff --git a/arch/network_tcp.c b/arch/network_tcp.c
index ea9de4cf776..2a77e514a2c 100644
--- a/arch/network_tcp.c
+++ b/arch/network_tcp.c
@@ -795,7 +795,7 @@ UA_ClientConnectionTCP_poll(UA_Connection *connection, UA_UInt32 timeout,
                         tcpConnection->server->ai_addrlen);
         if((error == -1 && UA_ERRNO == EISCONN) || (error == 0))
             resultsize = 1;
-        if(error == -1 && UA_ERRNO != EALREADY && UA_ERRNO != EINPROGRESS)
+        if(error == -1 && UA_ERRNO != UA_ALREADY && UA_ERRNO != UA_INPROGRESS)
             break;
     } while(resultsize == 0);
 #else
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 0fa808c699f..4d2cb1f8f1a 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -67,6 +67,7 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_ERRNO errno
 #define UA_INTERRUPTED EINTR
 #define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
+#define UA_INPROGRESS EINPROGRESS
 #define UA_WOULDBLOCK EWOULDBLOCK
 
 #define UA_POLLIN POLLIN
diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
index b4409c272a3..de4e202b33a 100644
--- a/arch/vxworks/ua_architecture.h
+++ b/arch/vxworks/ua_architecture.h
@@ -58,6 +58,7 @@
 #define UA_ERRNO errno
 #define UA_INTERRUPTED EINTR
 #define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
+#define UA_INPROGRESS EINPROGRESS
 #define UA_WOULDBLOCK EWOULDBLOCK
 
 #define UA_ENABLE_LOG_COLORS
diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
index 3e5252d2e7a..59f60b6b8b6 100644
--- a/arch/wec7/ua_architecture.h
+++ b/arch/wec7/ua_architecture.h
@@ -62,16 +62,12 @@ void UA_sleep_ms(unsigned long ms);
 // Windows does not support ansi colors
 // #define UA_ENABLE_LOG_COLORS
 
-#if defined(__MINGW32__) //mingw defines SOCKET as long long unsigned int, giving errors in logging and when comparing with UA_Int32
-# define UA_SOCKET int
-# define UA_INVALID_SOCKET -1
-#else
-# define UA_SOCKET SOCKET
-# define UA_INVALID_SOCKET INVALID_SOCKET
-#endif
+#define UA_SOCKET SOCKET
+#define UA_INVALID_SOCKET INVALID_SOCKET
 #define UA_ERRNO WSAGetLastError()
 #define UA_INTERRUPTED WSAEINTR
 #define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
+#define UA_INPROGRESS EINPROGRESS
 #define UA_WOULDBLOCK WSAEWOULDBLOCK
 
 #define UA_fd_set(fd, fds) FD_SET((UA_SOCKET)fd, fds)
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index f4a4a5da0ca..d39896f6135 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -69,6 +69,7 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_ERRNO WSAGetLastError()
 #define UA_INTERRUPTED WSAEINTR
 #define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
+#define UA_INPROGRESS WSAEINPROGRESS
 #define UA_WOULDBLOCK WSAEWOULDBLOCK
 #define UA_POLLIN POLLRDNORM
 #define UA_POLLOUT POLLWRNORM

From 9d21e357319cca00af8ee4f7d8591e1e58eb1f34 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Dec 2021 00:34:28 +0100
Subject: [PATCH 0033/1963] refactor(el): Simplify the timeout computation

---
 arch/eventloop_posix.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index bd55b3d775e..cb67b5a1554 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -237,16 +237,19 @@ UA_EventLoop_stop(UA_EventLoop *el) {
 }
 
 static UA_StatusCode
-pollFDs(UA_EventLoop *el, UA_DateTime usedTimeout) {
+pollFDs(UA_EventLoop *el, UA_DateTime listenTimeout) {
+    UA_assert(listenTimeout >= 0);
     /* Poll the registered sockets */
 #ifdef _GNU_SOURCE
     struct timespec precisionTimeout = {
-        (long)(usedTimeout / UA_DATETIME_SEC),
-        (long)((usedTimeout % UA_DATETIME_SEC) * 100)
+        (long)(listenTimeout / UA_DATETIME_SEC),
+        (long)((listenTimeout % UA_DATETIME_SEC) * 100)
     };
-    int pollStatus = ppoll(el->pollfds, el->fdsSize, &precisionTimeout, NULL);
+    int pollStatus = ppoll(el->pollfds, el->fdsSize,
+                           &precisionTimeout, NULL);
 #else
-    int pollStatus = UA_poll(el->pollfds, el->fdsSize, usedTimeout / UA_DATETIME_MSEC);
+    int pollStatus = UA_poll(el->pollfds, el->fdsSize,
+                             (int)(listenTimeout / UA_DATETIME_MSEC));
 #endif
 
     if(pollStatus < 0) {
@@ -290,7 +293,7 @@ UA_StatusCode
 UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_TRACE(el->logger, UA_LOGCATEGORY_EVENTLOOP, "iterate the EventLoop");
+    UA_LOG_TRACE(el->logger, UA_LOGCATEGORY_EVENTLOOP, "Iterate the EventLoop");
 
     if(el->executing) {
         UA_LOG_ERROR(el->logger,
@@ -324,17 +327,16 @@ UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
         UA_Timer_process(&el->timer, dateBeforeCallback, timerExecutionTrampoline, NULL);
     UA_LOCK(&el->elMutex);
 
-    UA_DateTime dateAfterCallback = UA_DateTime_nowMonotonic();
-
-    UA_DateTime processTimerDuration = dateAfterCallback - dateBeforeCallback;
-
-    UA_DateTime callbackTimeout = dateOfNextCallback - dateAfterCallback;
-    UA_DateTime maxTimeout = UA_MAX(timeout * UA_DATETIME_MSEC - processTimerDuration, 0);
-
-    UA_DateTime usedTimeout = UA_MIN(callbackTimeout, maxTimeout);
+    /* Compute the remaining time */
+    UA_DateTime maxDate = dateBeforeCallback + (timeout * UA_DATETIME_MSEC);
+    if(dateOfNextCallback > maxDate)
+        dateOfNextCallback = maxDate;
+    UA_DateTime listenTimeout = dateOfNextCallback - UA_DateTime_nowMonotonic();
+    if(listenTimeout < 0)
+        listenTimeout = 0;
 
     /* Listen on the active file-descriptors (sockets) from the ConnectionManagers */
-    UA_StatusCode rv = pollFDs(el, usedTimeout);
+    UA_StatusCode rv = pollFDs(el, listenTimeout);
 
     /* Process and then free registered delayed callbacks */
     processDelayed(el);

From 843c6ce8eb828ee1f551ab6d466c7f154796e005 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Dec 2021 23:26:59 +0100
Subject: [PATCH 0034/1963] refactor(el): Use a context pointer for the POSIX
 fd iterator

---
 arch/eventloop_posix.c     |  7 +++++--
 arch/eventloop_posix.h     | 14 +++++++++++---
 arch/eventloop_posix_tcp.c |  8 +++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index cb67b5a1554..02fcc6d2c40 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -537,13 +537,16 @@ UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd) {
 }
 
 void
-UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es, UA_FDCallback cb) {
+UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es,
+                       UA_EventLoopPOSIXIterateCB cb, void *iterateContext) {
     for(size_t i = 0; i < el->fdsSize; i++) {
         if(el->fds[i].es != es)
             continue;
 
         UA_FD fd = el->pollfds[i].fd;
-        cb(es, fd, el->fds[i].fdcontext, 0);
+        int done = cb(es, fd, el->fds[i].fdcontext, iterateContext);
+        if(done)
+            break;
 
         /* The fd has removed itself from within the callback? */
         if(i >= el->fdsSize || fd != el->pollfds[i].fd)
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 328ff2a5128..10371672613 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -24,7 +24,7 @@ _UA_BEGIN_DECLS
  * EventLoop dropping into "poll" to wait for events. */
 
 typedef void
-(*UA_FDCallback)(UA_EventSource *es, UA_FD fd, void *fdcontext, short event);
+(*UA_FDCallback)(UA_EventSource *es, UA_FD fd, void **fdcontext, short event);
 
 UA_StatusCode
 UA_EventLoop_registerFD(UA_EventLoop *el, UA_FD fd, short eventMask,
@@ -41,9 +41,17 @@ UA_EventLoop_modifyFD(UA_EventLoop *el, UA_FD fd, short eventMask,
 UA_StatusCode
 UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd);
 
-/* Call the callback for all fd that are registered from that event source */
+/* abort the iteration if the returned boolean is true */
+typedef UA_Boolean
+(*UA_EventLoopPOSIXIterateCB)(UA_EventSource *es, UA_FD fd,
+                              void *fdContext, void *iterateContext);
+
+/* Call the callback for all fd that are registered from that event source. The
+ * callback is called with the 'event' argument set to zero to disambiguate from
+ * a callback after 'poll'. */
 void
-UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es, UA_FDCallback cb);
+UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es,
+                       UA_EventLoopPOSIXIterateCB cb, void *iterateContext);
 
 _UA_END_DECLS
 
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 18835e6a162..7121ae7e0e4 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -738,9 +738,11 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
     return UA_STATUSCODE_GOOD;
 }
 
-static void
-TCP_shutdownCallback(UA_EventSource *es, UA_FD fd, void *fdcontext, short event) {
+static UA_Boolean
+TCP_shutdownCallback(UA_EventSource *es, UA_FD fd,
+                     void *fdContext, void *iterateContext) {
     TCP_shutdownConnection((UA_ConnectionManager*)es, (uintptr_t)fd);
+    return false;
 }
 
 static void
@@ -751,7 +753,7 @@ TCP_eventSourceStop(UA_ConnectionManager *cm) {
     /* Shut down all registered fd. The cm is set to "stopped" when the last fd
      * is closed and deregistered in the callback from the EventLoop. */
     UA_EventLoop_iterateFD(cm->eventSource.eventLoop, &cm->eventSource,
-                           TCP_shutdownCallback);
+                           TCP_shutdownCallback, NULL);
     cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;

From 1bd54abce8e66a52eade4058be0405c1dcefb1e3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Dec 2021 00:21:40 +0100
Subject: [PATCH 0035/1963] style(el): Improve readability of eventloop_posix.c

---
 arch/eventloop_posix.c | 107 ++++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 44 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 02fcc6d2c40..cbd0af982bd 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -10,7 +10,8 @@
 #include "common/ua_timer.h"
 
 typedef struct {
-    /* The members fd and events are stored in the separate pollfds array:
+    /* The members fd and events are stored in the separate
+     * pollfds array:
      * UA_FD fd;
      * short events; */
     UA_EventSource *es;
@@ -36,7 +37,8 @@ struct UA_EventLoop {
     UA_RegisteredFD *fds;
     struct pollfd *pollfds; /* has the same size as "fds" */
 
-    /* Flag determining whether the eventloop is currently within the "run" method */
+    /* Flag determining whether the eventloop is currently within the
+     * "run" method */
     UA_Boolean executing;
 
 #if UA_MULTITHREADING >= 100
@@ -49,14 +51,17 @@ struct UA_EventLoop {
 /*********/
 
 static void
-timerExecutionTrampoline(void *executionApplication, UA_ApplicationCallback cb,
-                         void *callbackApplication, void *data) {
+timerExecutionTrampoline(void *executionApplication,
+                         UA_ApplicationCallback cb,
+                         void *callbackApplication,
+                         void *data) {
     cb(callbackApplication, data);
 }
 
 UA_StatusCode
 UA_EventLoop_addTimedCallback(UA_EventLoop *el, UA_Callback callback,
-                              void *application, void *data, UA_DateTime date,
+                              void *application, void *data,
+                              UA_DateTime date,
                               UA_UInt64 *callbackId) {
     return UA_Timer_addTimedCallback(&el->timer, callback, application,
                                      data, date, callbackId);
@@ -64,28 +69,36 @@ UA_EventLoop_addTimedCallback(UA_EventLoop *el, UA_Callback callback,
 
 UA_StatusCode
 UA_EventLoop_addCyclicCallback(UA_EventLoop *el, UA_Callback cb,
-                               void *application, void *data, UA_Double interval_ms,
-                               UA_DateTime *baseTime, UA_TimerPolicy timerPolicy,
+                               void *application, void *data,
+                               UA_Double interval_ms,
+                               UA_DateTime *baseTime,
+                               UA_TimerPolicy timerPolicy,
                                UA_UInt64 *callbackId) {
-    return UA_Timer_addRepeatedCallback(&el->timer, cb, application, data,
-                                        interval_ms, baseTime, timerPolicy, callbackId);
+    return UA_Timer_addRepeatedCallback(&el->timer, cb, application,
+                                        data, interval_ms, baseTime,
+                                        timerPolicy, callbackId);
 }
 
 UA_StatusCode
-UA_EventLoop_modifyCyclicCallback(UA_EventLoop *el, UA_UInt64 callbackId,
-                                  UA_Double interval_ms, UA_DateTime *baseTime,
+UA_EventLoop_modifyCyclicCallback(UA_EventLoop *el,
+                                  UA_UInt64 callbackId,
+                                  UA_Double interval_ms,
+                                  UA_DateTime *baseTime,
                                   UA_TimerPolicy timerPolicy) {
-    return UA_Timer_changeRepeatedCallback(&el->timer, callbackId, interval_ms,
-                                           baseTime, timerPolicy);
+    return UA_Timer_changeRepeatedCallback(&el->timer, callbackId,
+                                           interval_ms, baseTime,
+                                           timerPolicy);
 }
 
 void
-UA_EventLoop_removeCyclicCallback(UA_EventLoop *el, UA_UInt64 callbackId) {
+UA_EventLoop_removeCyclicCallback(UA_EventLoop *el,
+                                  UA_UInt64 callbackId) {
     UA_Timer_removeCallback(&el->timer, callbackId);
 }
 
 void
-UA_EventLoop_addDelayedCallback(UA_EventLoop *el, UA_DelayedCallback *dc) {
+UA_EventLoop_addDelayedCallback(UA_EventLoop *el,
+                                UA_DelayedCallback *dc) {
     UA_LOCK(&el->elMutex);
     dc->next = el->delayedCallbacks;
     el->delayedCallbacks = dc;
@@ -99,8 +112,8 @@ processDelayed(UA_EventLoop *el) {
     while(el->delayedCallbacks) {
         UA_DelayedCallback *dc = el->delayedCallbacks;
         el->delayedCallbacks = dc->next;
-        /* Delayed Callbacks might have no cb pointer if all we want to do is
-         * free the memory */
+        /* Delayed Callbacks might have no cb pointer if all
+         * we want to do is free the memory */
         if(dc->callback) {
             UA_UNLOCK(&el->elMutex);
             dc->callback(dc->application, dc->data);
@@ -116,7 +129,8 @@ processDelayed(UA_EventLoop *el) {
 
 UA_EventLoop *
 UA_EventLoop_new(const UA_Logger *logger) {
-    UA_EventLoop *el = (UA_EventLoop*)UA_malloc(sizeof(UA_EventLoop));
+    UA_EventLoop *el = (UA_EventLoop*)
+        UA_malloc(sizeof(UA_EventLoop));
     if(!el)
         return NULL;
     memset(el, 0, sizeof(UA_EventLoop));
@@ -154,8 +168,8 @@ UA_EventLoop_delete(UA_EventLoop *el) {
     /* Process remaining delayed callbacks */
     processDelayed(el);
 
-    /* All file descriptors were removed together with the coresponding
-     * EventSource */
+    /* All file descriptors were removed together with the
+     * coresponding EventSource */
     UA_assert(el->fdsSize == 0);
 
     /* Clean up */
@@ -184,7 +198,8 @@ UA_EventLoop_start(UA_EventLoop *el) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP, "Starting the EventLoop");
+    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                "Starting the EventLoop");
 
     UA_EventSource *es = el->eventSources;
     UA_StatusCode res = UA_STATUSCODE_GOOD;
@@ -209,7 +224,8 @@ checkClosed(UA_EventLoop *el) {
         es = es->next;
     }
 
-    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP, "The EventLoop has stopped");
+    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                "The EventLoop has stopped");
     el->state = UA_EVENTLOOPSTATE_STOPPED;
 }
 
@@ -217,9 +233,10 @@ void
 UA_EventLoop_stop(UA_EventLoop *el) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP, "Stopping the EventLoop");
+    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                "Stopping the EventLoop");
 
-    /* Shutdown all event sources. This will close open connections. */
+    /* Shutdown all event sources. This closes open connections. */
     UA_EventSource *es = el->eventSources;
     while(es) {
         if(es->state == UA_EVENTSOURCESTATE_STARTING ||
@@ -261,8 +278,8 @@ pollFDs(UA_EventLoop *el, UA_DateTime listenTimeout) {
         return UA_STATUSCODE_GOODCALLAGAIN;
     }
 
-    /* Loop over all registered FD to see if an event arrived. Yes, this is why
-     * poll is slow for many open sockets. */
+    /* Loop over all registered FD to see if an event arrived. Yes,
+     * this is why poll is slow for many open sockets. */
     int processed = 0;
     for(size_t i = 0; i < el->fdsSize; i++) {
         /* All done */
@@ -293,7 +310,8 @@ UA_StatusCode
 UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_TRACE(el->logger, UA_LOGCATEGORY_EVENTLOOP, "Iterate the EventLoop");
+    UA_LOG_TRACE(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Iterate the EventLoop");
 
     if(el->executing) {
         UA_LOG_ERROR(el->logger,
@@ -302,11 +320,6 @@ UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
         UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    /* TODO: use check macros instead
-    UA_CHECK_ERROR(!el->executing, return UA_STATUSCODE_BADINTERNALERROR, el->logger,
-                   UA_LOGCATEGORY_EVENTLOOP,
-                   "Cannot run eventloop from the run method itself");
-    */
 
     el->executing = true;
 
@@ -320,22 +333,24 @@ UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
     }
 
     /* Process cyclic callbacks */
-    UA_DateTime dateBeforeCallback = UA_DateTime_nowMonotonic();
+    UA_DateTime dateBefore = UA_DateTime_nowMonotonic();
 
     UA_UNLOCK(&el->elMutex);
-    UA_DateTime dateOfNextCallback =
-        UA_Timer_process(&el->timer, dateBeforeCallback, timerExecutionTrampoline, NULL);
+    UA_DateTime dateNext =
+        UA_Timer_process(&el->timer, dateBefore,
+                         timerExecutionTrampoline, NULL);
     UA_LOCK(&el->elMutex);
 
     /* Compute the remaining time */
-    UA_DateTime maxDate = dateBeforeCallback + (timeout * UA_DATETIME_MSEC);
-    if(dateOfNextCallback > maxDate)
-        dateOfNextCallback = maxDate;
-    UA_DateTime listenTimeout = dateOfNextCallback - UA_DateTime_nowMonotonic();
+    UA_DateTime maxDate = dateBefore + (timeout * UA_DATETIME_MSEC);
+    if(dateNext > maxDate)
+        dateNext = maxDate;
+    UA_DateTime listenTimeout = dateNext - UA_DateTime_nowMonotonic();
     if(listenTimeout < 0)
         listenTimeout = 0;
 
-    /* Listen on the active file-descriptors (sockets) from the ConnectionManagers */
+    /* Listen on the active file-descriptors (sockets) from the
+     * ConnectionManagers */
     UA_StatusCode rv = pollFDs(el, listenTimeout);
 
     /* Process and then free registered delayed callbacks */
@@ -360,7 +375,8 @@ UA_EventLoop_registerEventSource(UA_EventLoop *el, UA_EventSource *es) {
     /* Already registered? */
     if(es->state != UA_EVENTSOURCESTATE_FRESH) {
         UA_LOG_ERROR(UA_EventLoop_getLogger(el), UA_LOGCATEGORY_NETWORK,
-                     "Cannot register the EventSource \"%.*s\": already registered",
+                     "Cannot register the EventSource \"%.*s\": "
+                     "already registered",
                      (int)es->name.length, (char*)es->name.data);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -384,7 +400,8 @@ UA_StatusCode
 UA_EventLoop_deregisterEventSource(UA_EventLoop *el, UA_EventSource *es) {
     if(es->state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_EVENTLOOP,
-                       "Cannot deregister the EventSource %.*s. Has to be stopped first",
+                       "Cannot deregister the EventSource %.*s: "
+                       "Has to be stopped first",
                        (int)es->name.length, es->name.data);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -426,7 +443,8 @@ UA_EventLoop_findEventSource(UA_EventLoop *el, const UA_String name) {
 
 UA_StatusCode
 UA_EventLoop_registerFD(UA_EventLoop *el, UA_FD fd, short eventMask,
-                        UA_FDCallback cb, UA_EventSource *es, void *fdcontext) {
+                        UA_FDCallback cb, UA_EventSource *es,
+                        void *fdcontext) {
     UA_LOCK(&el->elMutex);
 
     UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
@@ -538,7 +556,8 @@ UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd) {
 
 void
 UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es,
-                       UA_EventLoopPOSIXIterateCB cb, void *iterateContext) {
+                       UA_EventLoopPOSIXIterateCB cb,
+                       void *iterateContext) {
     for(size_t i = 0; i < el->fdsSize; i++) {
         if(el->fds[i].es != es)
             continue;

From 5082bf32e75306e9937c34bfef63fb474020b776 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Dec 2021 20:35:41 +0100
Subject: [PATCH 0036/1963] refactor(el): The EventLoop contains methods
 pointers

This allows several EventLoop implementations to be run concurrently.
---
 CMakeLists.txt                             |   2 +-
 arch/eventloop_posix.c                     | 272 +++++++++----------
 arch/eventloop_posix.h                     |  67 ++++-
 arch/eventloop_posix_tcp.c                 | 130 ++++-----
 include/open62541/plugin/eventloop.h       | 292 +++++++++++++--------
 plugins/ua_config_default.c                |   4 +-
 src/client/ua_client.c                     |  49 ++--
 src/pubsub/ua_pubsub_manager.c             |  28 +-
 src/server/ua_server.c                     |  47 ++--
 src/server/ua_server_config.c              |  15 +-
 src/server/ua_services_securechannel.c     |   3 +-
 src/server/ua_services_session.c           |   3 +-
 src/server/ua_subscription.c               |   3 +-
 src/server/ua_subscription_monitoreditem.c |   3 +-
 tests/check_eventloop.c                    |  12 +-
 tests/check_eventloop_tcp.c                |  66 ++---
 16 files changed, 550 insertions(+), 446 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 489a0dea104..e98cc2316b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,6 +120,7 @@ GET_PROPERTY(ua_architecture_sources GLOBAL PROPERTY UA_ARCHITECTURE_SOURCES)
 
 set(ua_architecture_sources ${ua_architecture_sources}
     ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
 )
@@ -127,7 +128,6 @@ set(ua_architecture_sources ${ua_architecture_sources}
 set(ua_architecture_headers ${ua_architecture_headers}
     ${PROJECT_SOURCE_DIR}/include/open62541/network_tcp.h
     ${PROJECT_SOURCE_DIR}/include/open62541/architecture_functions.h
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h
 )
 
 if(UA_ENABLE_WEBSOCKET_SERVER)
diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index cbd0af982bd..d9cbe12fa92 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -7,44 +7,9 @@
  */
 
 #include "eventloop_posix.h"
-#include "common/ua_timer.h"
-
-typedef struct {
-    /* The members fd and events are stored in the separate
-     * pollfds array:
-     * UA_FD fd;
-     * short events; */
-    UA_EventSource *es;
-    UA_FDCallback callback;
-    void *fdcontext;
-} UA_RegisteredFD;
-
-struct UA_EventLoop {
-    UA_EventLoopState state;
-    const UA_Logger *logger;
-    
-    /* Timer */
-    UA_Timer timer;
-
-    /* Linked List of Delayed Callbacks */
-    UA_DelayedCallback *delayedCallbacks;
-
-    /* Pointers to registered EventSources */
-    UA_EventSource *eventSources;
-
-    /* Registered file descriptors */
-    size_t fdsSize;
-    UA_RegisteredFD *fds;
-    struct pollfd *pollfds; /* has the same size as "fds" */
 
-    /* Flag determining whether the eventloop is currently within the
-     * "run" method */
-    UA_Boolean executing;
-
-#if UA_MULTITHREADING >= 100
-    UA_Lock elMutex;
-#endif
-};
+static UA_StatusCode
+POSIX_EL_deregisterEventSource(POSIX_EL *el, UA_EventSource *es);
 
 /*********/
 /* Timer */
@@ -58,47 +23,58 @@ timerExecutionTrampoline(void *executionApplication,
     cb(callbackApplication, data);
 }
 
-UA_StatusCode
-UA_EventLoop_addTimedCallback(UA_EventLoop *el, UA_Callback callback,
-                              void *application, void *data,
-                              UA_DateTime date,
-                              UA_UInt64 *callbackId) {
+static UA_DateTime
+POSIX_EL_nextCyclicTime(UA_EventLoop *public_el) {
+    POSIX_EL *el = (POSIX_EL*)public_el;
+    return UA_Timer_nextRepeatedTime(&el->timer);
+}
+
+static UA_StatusCode
+POSIX_EL_addTimedCallback(UA_EventLoop *public_el, UA_Callback callback,
+                          void *application, void *data,
+                          UA_DateTime date,
+                          UA_UInt64 *callbackId) {
+    POSIX_EL *el = (POSIX_EL*)public_el;
     return UA_Timer_addTimedCallback(&el->timer, callback, application,
                                      data, date, callbackId);
 }
 
-UA_StatusCode
-UA_EventLoop_addCyclicCallback(UA_EventLoop *el, UA_Callback cb,
-                               void *application, void *data,
-                               UA_Double interval_ms,
-                               UA_DateTime *baseTime,
-                               UA_TimerPolicy timerPolicy,
-                               UA_UInt64 *callbackId) {
+static UA_StatusCode
+POSIX_EL_addCyclicCallback(UA_EventLoop *public_el, UA_Callback cb,
+                           void *application, void *data,
+                           UA_Double interval_ms,
+                           UA_DateTime *baseTime,
+                           UA_TimerPolicy timerPolicy,
+                           UA_UInt64 *callbackId) {
+    POSIX_EL *el = (POSIX_EL*)public_el;
     return UA_Timer_addRepeatedCallback(&el->timer, cb, application,
                                         data, interval_ms, baseTime,
                                         timerPolicy, callbackId);
 }
 
-UA_StatusCode
-UA_EventLoop_modifyCyclicCallback(UA_EventLoop *el,
-                                  UA_UInt64 callbackId,
-                                  UA_Double interval_ms,
-                                  UA_DateTime *baseTime,
-                                  UA_TimerPolicy timerPolicy) {
+static UA_StatusCode
+POSIX_EL_modifyCyclicCallback(UA_EventLoop *public_el,
+                              UA_UInt64 callbackId,
+                              UA_Double interval_ms,
+                              UA_DateTime *baseTime,
+                              UA_TimerPolicy timerPolicy) {
+    POSIX_EL *el = (POSIX_EL*)public_el;
     return UA_Timer_changeRepeatedCallback(&el->timer, callbackId,
                                            interval_ms, baseTime,
                                            timerPolicy);
 }
 
-void
-UA_EventLoop_removeCyclicCallback(UA_EventLoop *el,
-                                  UA_UInt64 callbackId) {
+static void
+POSIX_EL_removeCyclicCallback(UA_EventLoop *public_el,
+                              UA_UInt64 callbackId) {
+    POSIX_EL *el = (POSIX_EL*)public_el;
     UA_Timer_removeCallback(&el->timer, callbackId);
 }
 
-void
-UA_EventLoop_addDelayedCallback(UA_EventLoop *el,
-                                UA_DelayedCallback *dc) {
+static void
+POSIX_EL_addDelayedCallback(UA_EventLoop *public_el,
+                            UA_DelayedCallback *dc) {
+    POSIX_EL *el = (POSIX_EL*)public_el;
     UA_LOCK(&el->elMutex);
     dc->next = el->delayedCallbacks;
     el->delayedCallbacks = dc;
@@ -107,7 +83,7 @@ UA_EventLoop_addDelayedCallback(UA_EventLoop *el,
 
 /* Process and then free registered delayed callbacks */
 static void
-processDelayed(UA_EventLoop *el) {
+processDelayed(POSIX_EL *el) {
     UA_LOCK_ASSERT(&el->elMutex, 1);
     while(el->delayedCallbacks) {
         UA_DelayedCallback *dc = el->delayedCallbacks;
@@ -127,27 +103,14 @@ processDelayed(UA_EventLoop *el) {
 /* EventLoop Lifecycle */
 /***********************/
 
-UA_EventLoop *
-UA_EventLoop_new(const UA_Logger *logger) {
-    UA_EventLoop *el = (UA_EventLoop*)
-        UA_malloc(sizeof(UA_EventLoop));
-    if(!el)
-        return NULL;
-    memset(el, 0, sizeof(UA_EventLoop));
-    UA_LOCK_INIT(&el->elMutex);
-    el->logger = logger;
-    UA_Timer_init(&el->timer);
-    return el;
-}
-
-UA_StatusCode
-UA_EventLoop_delete(UA_EventLoop *el) {
+static UA_StatusCode
+POSIX_EL_free(POSIX_EL *el) {
     UA_LOCK(&el->elMutex);
 
     /* Check if the EventLoop can be deleted */
-    if(el->state != UA_EVENTLOOPSTATE_STOPPED &&
-       el->state != UA_EVENTLOOPSTATE_FRESH) {
-        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    if(el->eventLoop.state != UA_EVENTLOOPSTATE_STOPPED &&
+       el->eventLoop.state != UA_EVENTLOOPSTATE_FRESH) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                        "Cannot delete a running EventLoop");
         UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -157,7 +120,7 @@ UA_EventLoop_delete(UA_EventLoop *el) {
     while(el->eventSources) {
         UA_EventSource *es = el->eventSources;
         UA_UNLOCK(&el->elMutex);
-        UA_EventLoop_deregisterEventSource(el, es);
+        POSIX_EL_deregisterEventSource(el, es);
         UA_LOCK(&el->elMutex);
         es->free(es);
     }
@@ -179,26 +142,16 @@ UA_EventLoop_delete(UA_EventLoop *el) {
     return UA_STATUSCODE_GOOD;
 }
 
-UA_EventLoopState
-UA_EventLoop_getState(UA_EventLoop *el) {
-    return el->state;
-}
-
-UA_DateTime
-UA_EventLoop_nextCyclicTime(UA_EventLoop *el) {
-    return UA_Timer_nextRepeatedTime(&el->timer);
-}
-
-UA_StatusCode
-UA_EventLoop_start(UA_EventLoop *el) {
+static UA_StatusCode
+POSIX_EL_start(POSIX_EL *el) {
     UA_LOCK(&el->elMutex);
-    if(el->state != UA_EVENTLOOPSTATE_FRESH &&
-       el->state != UA_EVENTLOOPSTATE_STOPPED) {
+    if(el->eventLoop.state != UA_EVENTLOOPSTATE_FRESH &&
+       el->eventLoop.state != UA_EVENTLOOPSTATE_STOPPED) {
         UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                 "Starting the EventLoop");
 
     UA_EventSource *es = el->eventSources;
@@ -210,13 +163,15 @@ UA_EventLoop_start(UA_EventLoop *el) {
         es = es->next;
     }
 
-    el->state = UA_EVENTLOOPSTATE_STARTED;
+    /* Dirty-write the state that is const "outside" */
+    *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
+        UA_EVENTLOOPSTATE_STARTED;
     UA_UNLOCK(&el->elMutex);
     return res;
 }
 
 static void
-checkClosed(UA_EventLoop *el) {
+checkClosed(POSIX_EL *el) {
     UA_EventSource *es = el->eventSources;
     while(es) {
         if(es->state != UA_EVENTSOURCESTATE_STOPPED)
@@ -224,16 +179,18 @@ checkClosed(UA_EventLoop *el) {
         es = es->next;
     }
 
-    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                 "The EventLoop has stopped");
-    el->state = UA_EVENTLOOPSTATE_STOPPED;
+    /* Dirty-write the state that is const "outside" */
+    *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
+        UA_EVENTLOOPSTATE_STOPPED;
 }
 
-void
-UA_EventLoop_stop(UA_EventLoop *el) {
+static void
+POSIX_EL_stop(POSIX_EL *el) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_INFO(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                 "Stopping the EventLoop");
 
     /* Shutdown all event sources. This closes open connections. */
@@ -245,16 +202,17 @@ UA_EventLoop_stop(UA_EventLoop *el) {
         es = es->next;
     }
 
-    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                  "All EventSources are stopped");
 
-    el->state = UA_EVENTLOOPSTATE_STOPPING;
+    *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
+        UA_EVENTLOOPSTATE_STOPPING;
     checkClosed(el);
     UA_UNLOCK(&el->elMutex);
 }
 
 static UA_StatusCode
-pollFDs(UA_EventLoop *el, UA_DateTime listenTimeout) {
+pollFDs(POSIX_EL *el, UA_DateTime listenTimeout) {
     UA_assert(listenTimeout >= 0);
     /* Poll the registered sockets */
 #ifdef _GNU_SOURCE
@@ -272,9 +230,9 @@ pollFDs(UA_EventLoop *el, UA_DateTime listenTimeout) {
     if(pollStatus < 0) {
         /* We will retry, only log the error */
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(UA_EventLoop_getLogger(el),
-                           UA_LOGCATEGORY_EVENTLOOP,
-                           "Error during poll: %s", errno_str));
+           UA_LOG_WARNING(el->eventLoop.logger,
+                          UA_LOGCATEGORY_EVENTLOOP,
+                          "Error during poll: %s", errno_str));
         return UA_STATUSCODE_GOODCALLAGAIN;
     }
 
@@ -306,15 +264,15 @@ pollFDs(UA_EventLoop *el, UA_DateTime listenTimeout) {
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
-UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
+static UA_StatusCode
+POSIX_EL_run(POSIX_EL *el, UA_UInt32 timeout) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_TRACE(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOG_TRACE(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Iterate the EventLoop");
 
     if(el->executing) {
-        UA_LOG_ERROR(el->logger,
+        UA_LOG_ERROR(el->eventLoop.logger,
                      UA_LOGCATEGORY_EVENTLOOP,
                      "Cannot run EventLoop from the run method itself");
         UA_UNLOCK(&el->elMutex);
@@ -323,9 +281,9 @@ UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
 
     el->executing = true;
 
-    if(el->state == UA_EVENTLOOPSTATE_FRESH ||
-       el->state == UA_EVENTLOOPSTATE_STOPPED) {
-        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    if(el->eventLoop.state == UA_EVENTLOOPSTATE_FRESH ||
+       el->eventLoop.state == UA_EVENTLOOPSTATE_STOPPED) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                        "Cannot iterate a stopped EventLoop");
         el->executing = false;
         UA_UNLOCK(&el->elMutex);
@@ -357,7 +315,7 @@ UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
     processDelayed(el);
 
     /* Check if the last EventSource was successfully stopped */
-    if(el->state == UA_EVENTLOOPSTATE_STOPPING)
+    if(el->eventLoop.state == UA_EVENTLOOPSTATE_STOPPING)
         checkClosed(el);
 
     el->executing = false;
@@ -370,11 +328,11 @@ UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout) {
 /* Registering Event Sources */
 /*****************************/
 
-UA_StatusCode
-UA_EventLoop_registerEventSource(UA_EventLoop *el, UA_EventSource *es) {
+static UA_StatusCode
+POSIX_EL_registerEventSource(POSIX_EL *el, UA_EventSource *es) {
     /* Already registered? */
     if(es->state != UA_EVENTSOURCESTATE_FRESH) {
-        UA_LOG_ERROR(UA_EventLoop_getLogger(el), UA_LOGCATEGORY_NETWORK,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "Cannot register the EventSource \"%.*s\": "
                      "already registered",
                      (int)es->name.length, (char*)es->name.data);
@@ -387,19 +345,19 @@ UA_EventLoop_registerEventSource(UA_EventLoop *el, UA_EventSource *es) {
     el->eventSources = es;
     UA_UNLOCK(&el->elMutex);
 
-    es->eventLoop = el;
+    es->eventLoop = &el->eventLoop;
     es->state = UA_EVENTSOURCESTATE_STOPPED;
 
     /* Start if the entire EventLoop is started */
-    if(el->state == UA_EVENTLOOPSTATE_STARTED)
+    if(el->eventLoop.state == UA_EVENTLOOPSTATE_STARTED)
         return es->start(es);
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
-UA_EventLoop_deregisterEventSource(UA_EventLoop *el, UA_EventSource *es) {
+static UA_StatusCode
+POSIX_EL_deregisterEventSource(POSIX_EL *el, UA_EventSource *es) {
     if(es->state != UA_EVENTSOURCESTATE_STOPPED) {
-        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                        "Cannot deregister the EventSource %.*s: "
                        "Has to be stopped first",
                        (int)es->name.length, es->name.data);
@@ -424,8 +382,8 @@ UA_EventLoop_deregisterEventSource(UA_EventLoop *el, UA_EventSource *es) {
     return UA_STATUSCODE_GOOD;
 }
 
-UA_EventSource *
-UA_EventLoop_findEventSource(UA_EventLoop *el, const UA_String name) {
+static UA_EventSource *
+POSIX_EL_findEventSource(POSIX_EL *el, const UA_String name) {
     UA_LOCK(&el->elMutex);
     UA_EventSource *s = el->eventSources;
     while(s) {
@@ -442,12 +400,12 @@ UA_EventLoop_findEventSource(UA_EventLoop *el, const UA_String name) {
 /********************************/
 
 UA_StatusCode
-UA_EventLoop_registerFD(UA_EventLoop *el, UA_FD fd, short eventMask,
-                        UA_FDCallback cb, UA_EventSource *es,
-                        void *fdcontext) {
+POSIX_EL_registerFD(POSIX_EL *el, UA_FD fd, short eventMask,
+                    UA_FDCallback cb, UA_EventSource *es,
+                    void *fdcontext) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Registering fd: %u", (unsigned)fd);
 
     /* Realloc */
@@ -480,8 +438,8 @@ UA_EventLoop_registerFD(UA_EventLoop *el, UA_FD fd, short eventMask,
 }
 
 UA_StatusCode
-UA_EventLoop_modifyFD(UA_EventLoop *el, UA_FD fd, short eventMask,
-                      UA_FDCallback cb, void *fdcontext) {
+POSIX_EL_modifyFD(POSIX_EL *el, UA_FD fd, short eventMask,
+                  UA_FDCallback cb, void *fdcontext) {
     UA_LOCK(&el->elMutex);
 
     /* Find the entry */
@@ -507,10 +465,10 @@ UA_EventLoop_modifyFD(UA_EventLoop *el, UA_FD fd, short eventMask,
 }
 
 UA_StatusCode
-UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd) {
+POSIX_EL_deregisterFD(POSIX_EL *el, UA_FD fd) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Unregistering fd: %u", (unsigned)fd);
 
     /* Find the entry */
@@ -555,9 +513,9 @@ UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd) {
 }
 
 void
-UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es,
-                       UA_EventLoopPOSIXIterateCB cb,
-                       void *iterateContext) {
+POSIX_EL_iterateFD(POSIX_EL *el, UA_EventSource *es,
+                   POSIX_EL_IterateCallback cb,
+                   void *iterateContext) {
     for(size_t i = 0; i < el->fdsSize; i++) {
         if(el->fds[i].es != es)
             continue;
@@ -573,14 +531,36 @@ UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es,
     }
 }
 
-/* Helper Functions */
+UA_EventLoop *
+UA_EventLoop_new_POSIX(const UA_Logger *logger) {
+    POSIX_EL *el = (POSIX_EL*)UA_malloc(sizeof(POSIX_EL));
+    if(!el)
+        return NULL;
+    memset(el, 0, sizeof(POSIX_EL));
+    UA_LOCK_INIT(&el->elMutex);
+    UA_Timer_init(&el->timer);
 
-const UA_Logger *
-UA_EventLoop_getLogger(UA_EventLoop *el) {
-    return el->logger;
-}
+    /* Set the public EventLoop content */
+    el->eventLoop.logger = logger;
 
-void
-UA_EventLoop_setLogger(UA_EventLoop *el, const UA_Logger *logger) {
-    el->logger = logger;
+    el->eventLoop.start = (UA_StatusCode (*)(UA_EventLoop*))POSIX_EL_start;
+    el->eventLoop.stop = (void (*)(UA_EventLoop*))POSIX_EL_stop;
+    el->eventLoop.run = (UA_StatusCode (*)(UA_EventLoop*, UA_UInt32))POSIX_EL_run;
+    el->eventLoop.free = (UA_StatusCode (*)(UA_EventLoop*))POSIX_EL_free;
+
+    el->eventLoop.nextCyclicTime = POSIX_EL_nextCyclicTime;
+    el->eventLoop.addCyclicCallback = POSIX_EL_addCyclicCallback;
+    el->eventLoop.modifyCyclicCallback = POSIX_EL_modifyCyclicCallback;
+    el->eventLoop.removeCyclicCallback = POSIX_EL_removeCyclicCallback;
+    el->eventLoop.addTimedCallback = POSIX_EL_addTimedCallback;
+    el->eventLoop.addDelayedCallback = POSIX_EL_addDelayedCallback;
+    
+    el->eventLoop.registerEventSource =
+        (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))POSIX_EL_registerEventSource;
+    el->eventLoop.deregisterEventSource =
+        (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))POSIX_EL_deregisterEventSource;
+    el->eventLoop.findEventSource =
+        (UA_EventSource* (*)(UA_EventLoop*, const UA_String))POSIX_EL_findEventSource;
+
+    return &el->eventLoop;
 }
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 10371672613..17e6de10f57 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -12,10 +12,9 @@
 #include <open62541/config.h>
 #include <open62541/plugin/eventloop.h>
 
-/* TODO: Move the macro-forest from /arch/<arch>/ua_architecture.h */
+#if defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32)
 
-#define UA_FD UA_SOCKET
-#define UA_INVALID_FD UA_INVALID_SOCKET
+#include "common/ua_timer.h"
 
 _UA_BEGIN_DECLS
 
@@ -23,36 +22,80 @@ _UA_BEGIN_DECLS
  * register their fd in the EventLoop so that they are considered by the
  * EventLoop dropping into "poll" to wait for events. */
 
+/* TODO: Move the macro-forest from /arch/<arch>/ua_architecture.h */
+
+#define UA_FD UA_SOCKET
+#define UA_INVALID_FD UA_INVALID_SOCKET
+
 typedef void
 (*UA_FDCallback)(UA_EventSource *es, UA_FD fd, void **fdcontext, short event);
 
+typedef struct {
+    /* The members fd and events are stored in the separate
+     * pollfds array:
+     * - UA_FD fd;
+     * - short events; */
+    UA_EventSource *es;
+    UA_FDCallback callback;
+    void *fdcontext;
+} UA_RegisteredFD;
+
+typedef struct {
+    UA_EventLoop eventLoop;
+    
+    /* Timer */
+    UA_Timer timer;
+
+    /* Linked List of Delayed Callbacks */
+    UA_DelayedCallback *delayedCallbacks;
+
+    /* Pointers to registered EventSources */
+    UA_EventSource *eventSources;
+
+    /* Registered file descriptors */
+    size_t fdsSize;
+    UA_RegisteredFD *fds;
+    struct pollfd *pollfds; /* has the same size as "fds" */
+
+    /* Flag determining whether the eventloop is currently within the
+     * "run" method */
+    UA_Boolean executing;
+
+#if UA_MULTITHREADING >= 100
+    UA_Lock elMutex;
+#endif
+} POSIX_EL;
+
 UA_StatusCode
-UA_EventLoop_registerFD(UA_EventLoop *el, UA_FD fd, short eventMask,
-                        UA_FDCallback cb, UA_EventSource *es, void *fdcontext);
+POSIX_EL_registerFD(POSIX_EL *el, UA_FD fd, short eventMask,
+                    UA_FDCallback cb, UA_EventSource *es, void *fdcontext);
 
 /* Change the fd settings (event mask, callback) in-place. Fails only if the fd
  * no longer exists. */
 UA_StatusCode
-UA_EventLoop_modifyFD(UA_EventLoop *el, UA_FD fd, short eventMask,
-                      UA_FDCallback cb, void *fdcontext);
+POSIX_EL_modifyFD(POSIX_EL *el, UA_FD fd, short eventMask,
+                  UA_FDCallback cb, void *fdcontext);
 
 /* During processing of an fd-event, the fd may deregister itself. But in the
  * fd-callback they must not deregister another fd. */
 UA_StatusCode
-UA_EventLoop_deregisterFD(UA_EventLoop *el, UA_FD fd);
+POSIX_EL_deregisterFD(POSIX_EL *el, UA_FD fd);
 
 /* abort the iteration if the returned boolean is true */
 typedef UA_Boolean
-(*UA_EventLoopPOSIXIterateCB)(UA_EventSource *es, UA_FD fd,
-                              void *fdContext, void *iterateContext);
+(*POSIX_EL_IterateCallback)(UA_EventSource *es, UA_FD fd,
+                            void *fdContext, void *iterateContext);
 
 /* Call the callback for all fd that are registered from that event source. The
  * callback is called with the 'event' argument set to zero to disambiguate from
  * a callback after 'poll'. */
 void
-UA_EventLoop_iterateFD(UA_EventLoop *el, UA_EventSource *es,
-                       UA_EventLoopPOSIXIterateCB cb, void *iterateContext);
+POSIX_EL_iterateFD(POSIX_EL *el, UA_EventSource *es,
+                   POSIX_EL_IterateCallback callback,
+                   void *iterateContext);
 
 _UA_END_DECLS
 
+#endif /* defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32) */
+
 #endif /* UA_EVENTLOOP_POSIX_H_ */
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 7121ae7e0e4..503b433f9fd 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -76,7 +76,7 @@ TCP_setNoNagle(UA_FD sockfd) {
 
 static UA_StatusCode
 TCP_close(UA_ConnectionManager *cm, UA_FD fd) {
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Closing connection", (unsigned)fd);
 
@@ -86,7 +86,8 @@ TCP_close(UA_ConnectionManager *cm, UA_FD fd) {
     int ret = UA_close(fd);
     if(ret != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
-    UA_StatusCode sc = UA_EventLoop_deregisterFD(tcm->cm.eventSource.eventLoop, fd);
+    UA_StatusCode sc =
+        POSIX_EL_deregisterFD((POSIX_EL*)tcm->cm.eventSource.eventLoop, fd);
     if(sc != UA_STATUSCODE_GOOD)
         return sc;
 
@@ -94,12 +95,12 @@ TCP_close(UA_ConnectionManager *cm, UA_FD fd) {
     UA_assert(tcm->fdCount > 0);
     tcm->fdCount--;
 
-    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                 UA_LOGCATEGORY_NETWORK, "TCP %u\t| Socket closed", (unsigned)fd);
 
     /* Stopped? */
     if(tcm->fdCount == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
-        UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_NETWORK,
                      "TCP\t| All sockets closed, the EventLoop has stopped");
         cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
@@ -111,14 +112,14 @@ TCP_close(UA_ConnectionManager *cm, UA_FD fd) {
 static void
 TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                              void **fdcontext, short event) {
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Activity on the socket", (unsigned)fd);
 
     /* Write-Event, a new connection has opened.  */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(event == UA_POLLOUT) {
-        UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| Opening a new connection", (unsigned)fd);
 
@@ -127,13 +128,12 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                                UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
-        UA_EventLoop_modifyFD(cm->eventSource.eventLoop, fd, UA_POLLIN,
-                              (UA_FDCallback)TCP_connectionSocketCallback,
-                              *fdcontext);
+        POSIX_EL_modifyFD((POSIX_EL*)cm->eventSource.eventLoop, fd, UA_POLLIN,
+                          (UA_FDCallback)TCP_connectionSocketCallback, *fdcontext);
         return;
     }
 
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Allocate receive buffer", (unsigned)fd);
 
@@ -147,18 +147,18 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
     /* Receive */
 #ifndef _WIN32
     ssize_t ret = UA_recv(fd, (char*)response.data, response.length, MSG_DONTWAIT);
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| recv(...) returned %zd", (unsigned)fd, ret);
 #else
     int ret = UA_recv(fd, (char*)response.data, response.length, MSG_DONTWAIT);
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| recv(...) returned %d", (unsigned)fd, ret);
 #endif
 
     if(ret > 0) {
-        UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| Received message of size %u",
                      (unsigned)fd, (unsigned)ret);
@@ -174,7 +174,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
          * then close the connection. We end up in this path after shutdown was
          * called on the socket. Here, we then are in the next EventLoop
          * iteration and the socket is known to be unused. */
-        UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| recv signaled closed connection", (unsigned)fd);
 
@@ -192,7 +192,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
 static void
 TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                          void **fdcontext, short event) {
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Callback on server socket", (unsigned)fd);
 
@@ -208,7 +208,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
         /* Close the listen socket */
         if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPING) {
             UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                                UA_LOGCATEGORY_NETWORK,
                                "TCP %u\t| Error %s, closing the server socket",
                                (unsigned)fd, errno_str));
@@ -228,13 +228,13 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
         if(get_res != 0) {
             hoststr[0] = 0;
             UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                                UA_LOGCATEGORY_NETWORK,
                                "TCP %u\t| getnameinfo(...) could not resolve the "
                                "hostname (%s)", (unsigned)fd, errno_str));
         }
     }
-    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                 UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| Connection opened from \"%s\" via the server socket %u",
                 (unsigned)newsockfd, hoststr, (unsigned)fd);
@@ -247,7 +247,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
     res |= TCP_setNoNagle(newsockfd);     /* Disable Nagle's algorithm */
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                            UA_LOGCATEGORY_NETWORK,
                            "TCP %u\t| Error seeting the TCP options (%s), closing",
                            (unsigned)newsockfd, errno_str));
@@ -263,9 +263,9 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                            0, NULL, UA_BYTESTRING_NULL);
 
     /* Register in the EventLoop. Signal to the user if registering failed. */
-    res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newsockfd, UA_POLLIN,
-                                  (UA_FDCallback)TCP_connectionSocketCallback,
-                                  &cm->eventSource, ctx);
+    res = POSIX_EL_registerFD((POSIX_EL*)cm->eventSource.eventLoop, newsockfd,
+                              UA_POLLIN, (UA_FDCallback)TCP_connectionSocketCallback,
+                              &cm->eventSource, ctx);
     if(res != UA_STATUSCODE_GOOD) {
         cm->connectionCallback(cm, (uintptr_t)newsockfd, &ctx,
                                UA_STATUSCODE_BADINTERNALERROR,
@@ -295,7 +295,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
             hoststr[0] = 0;
             portstr[0] = 0;
             UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                                UA_LOGCATEGORY_NETWORK,
                                "TCP\t| getnameinfo(...) could not resolve the hostname (%s)",
                                errno_str));
@@ -306,7 +306,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                           UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error opening the listen socket for "
                           "\"%s\" on port %s(%s)",
@@ -314,7 +314,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
         return;
     }
 
-    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                 UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| New server socket for \"%s\" on port %s",
                 (unsigned)listenSocket, hoststr, portstr);
@@ -327,7 +327,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     if(ai->ai_family == AF_INET6 &&
        UA_setsockopt(listenSocket, IPPROTO_IPV6, IPV6_V6ONLY,
                      (const char*)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                        UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
                        (unsigned)listenSocket);
@@ -339,7 +339,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
     if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR,
                      (const char *)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                        UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not make the socket reusable, closing",
                        (unsigned)listenSocket);
@@ -349,7 +349,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
 
     /* Set the socket non-blocking */
     if(TCP_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                        UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not set the socket non-blocking, closing",
                        (unsigned)listenSocket);
@@ -359,7 +359,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
 
     /* Supress interrupts from the socket */
     if(TCP_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                        UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not disable SIGPIPE, closing",
                        (unsigned)listenSocket);
@@ -371,7 +371,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     int ret = UA_bind(listenSocket, ai->ai_addr, (socklen_t)ai->ai_addrlen);
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                           UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error binding the socket to the address (%s), closing",
                           (unsigned)listenSocket, errno_str));
@@ -382,7 +382,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     /* Start listening */
     if(UA_listen(listenSocket, UA_MAXBACKLOG) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                           UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error listening on the socket (%s), closing",
                           (unsigned)listenSocket, errno_str));
@@ -392,11 +392,11 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
 
     /* Register the socket */
     UA_StatusCode res =
-        UA_EventLoop_registerFD(cm->eventSource.eventLoop, listenSocket, UA_POLLIN,
-                                (UA_FDCallback)TCP_listenSocketCallback,
-                                &cm->eventSource, NULL);
+        POSIX_EL_registerFD((POSIX_EL*)cm->eventSource.eventLoop, listenSocket,
+                            UA_POLLIN, (UA_FDCallback)TCP_listenSocketCallback,
+                            &cm->eventSource, NULL);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                        UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error registering the socket in the "
                        "EventLoop, closing", (unsigned)listenSocket);
@@ -431,7 +431,7 @@ TCP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostnam
     int retcode = UA_getaddrinfo(hostname, port, &hints, &res);
     if(retcode != 0) {
         UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-           UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                           UA_LOGCATEGORY_NETWORK,
                           "TCP\t| getaddrinfo lookup for \"%s\" on port %s failed (%s)",
                           hostname, port, errno_str));
@@ -450,7 +450,7 @@ TCP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostnam
 
 static UA_StatusCode
 TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Shutdown called", (unsigned)connectionId);
 
@@ -463,7 +463,7 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(res != 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                            UA_LOGCATEGORY_NETWORK,
                            "TCP %u\t| Error shutting down the socket (%s), closing",
                            (unsigned)connectionId, errno_str));
@@ -488,7 +488,7 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     do {
         ssize_t n = 0;
         do {
-            UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+            UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                          UA_LOGCATEGORY_NETWORK,
                          "TCP %u\t| Attempting to send", (unsigned)connectionId);
             size_t bytes_to_send = buf->length - nWritten;
@@ -501,7 +501,7 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                    UA_ERRNO != UA_WOULDBLOCK &&
                    UA_ERRNO != UA_AGAIN) {
                     UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-                       UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+                       UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                                     UA_LOGCATEGORY_NETWORK,
                                     "TCP %u\t| Send failed with error %s",
                                     (unsigned)connectionId, errno_str));
@@ -540,7 +540,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
                                  UA_QUALIFIEDNAME(0, "target-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
-        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| Open TCP Connection: No target port defined, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -553,13 +553,13 @@ TCP_openConnection(UA_ConnectionManager *cm,
                                  UA_QUALIFIEDNAME(0, "target-hostname"),
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!host) {
-        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| Open TCP Connection: No target hostname defined, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     if(host->length >= 256) {
-        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| Open TCP Connection: No target hostname too long, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -567,7 +567,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     strncpy(hostname, (const char*)host->data, host->length);
     hostname[host->length] = 0;
 
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK, "TCP\t| Open a connection to \"%s\" on port %s",
                  hostname, portStr);
 
@@ -580,7 +580,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     int error = getaddrinfo(hostname, portStr, &hints, &info);
     if(error != 0) {
         UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-        UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                        UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Lookup of %s failed with error %d - %s",
                        hostname, error, errno_str));
@@ -592,7 +592,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     if(newSock == UA_INVALID_FD) {
         freeaddrinfo(info);
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                            UA_LOGCATEGORY_NETWORK,
                            "TCP\t| Could not create socket to connect to %s (%s)",
                            hostname, errno_str));
@@ -606,7 +606,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     res |= TCP_setNoNagle(newSock);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                            UA_LOGCATEGORY_NETWORK,
                            "TCP\t| Could not set socket options: %s", errno_str));
         freeaddrinfo(info);
@@ -621,7 +621,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
        UA_ERRNO != UA_INPROGRESS &&
        UA_ERRNO != UA_WOULDBLOCK) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+            UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                          UA_LOGCATEGORY_NETWORK,
                          "TCP\t| Connecting the socket to %s failed (%s)",
                          hostname, errno_str));
@@ -629,11 +629,11 @@ TCP_openConnection(UA_ConnectionManager *cm,
     }
 
     /* Register the fd to trigger when output is possible (the connection is open) */
-    res = UA_EventLoop_registerFD(cm->eventSource.eventLoop, newSock, UA_POLLOUT,
-                                  (UA_FDCallback)TCP_connectionSocketCallback,
-                                  &cm->eventSource, context);
+    res = POSIX_EL_registerFD((POSIX_EL*)cm->eventSource.eventLoop, newSock,
+                              UA_POLLOUT, (UA_FDCallback)TCP_connectionSocketCallback,
+                              &cm->eventSource, context);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_NETWORK,
                      "TCP\t| Registering the socket to connect to %s failed", hostname);
         UA_close(newSock);
@@ -644,7 +644,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     tcm->fdCount++;
 
-    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                 UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
@@ -657,7 +657,7 @@ static UA_StatusCode
 TCP_eventSourceStart(UA_ConnectionManager *cm) {
     /* Check the state */
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
-        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_EVENTLOOP, "To start the TCP ConnectionManager, "
                      "it has to be registered in an EventLoop and not started");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -676,7 +676,7 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
                                  UA_QUALIFIEDNAME(0, "listen-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
-        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| No port configured, don't accept connections");
         return UA_STATUSCODE_GOOD;
@@ -693,12 +693,12 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
                            UA_QUALIFIEDNAME(0, "listen-hostnames"));
     if(!hostNames) {
         /* No hostnames configured */
-        UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                     UA_LOGCATEGORY_NETWORK, "TCP\t| Listening on all interfaces");
         TCP_registerListenSocketDomainName(cm, NULL, portno);
     } else if(hostNames->type != &UA_TYPES[UA_TYPES_STRING]) {
         /* Wrong datatype */
-           UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+           UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                         UA_LOGCATEGORY_EVENTLOOP,
                         "TCP\t| The hostnames have to be strings");
            return UA_STATUSCODE_BADINTERNALERROR;
@@ -707,7 +707,7 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
         if(UA_Variant_isScalar(hostNames))
             interfaces = 1;
         if(interfaces == 0) {
-            UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+            UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                          UA_LOGCATEGORY_EVENTLOOP, "TCP\t| Listening on all interfaces");
             TCP_registerListenSocketDomainName(cm, NULL, portno);
         } else {
@@ -747,13 +747,13 @@ TCP_shutdownCallback(UA_EventSource *es, UA_FD fd,
 
 static void
 TCP_eventSourceStop(UA_ConnectionManager *cm) {
-    UA_LOG_INFO(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                 UA_LOGCATEGORY_NETWORK, "TCP\t| Shutting down the ConnectionManager");
 
     /* Shut down all registered fd. The cm is set to "stopped" when the last fd
      * is closed and deregistered in the callback from the EventLoop. */
-    UA_EventLoop_iterateFD(cm->eventSource.eventLoop, &cm->eventSource,
-                           TCP_shutdownCallback, NULL);
+    POSIX_EL_iterateFD((POSIX_EL*)cm->eventSource.eventLoop,
+                       &cm->eventSource, TCP_shutdownCallback, NULL);
     cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
@@ -762,14 +762,14 @@ TCP_eventSourceStop(UA_ConnectionManager *cm) {
     if(tcm->fdCount == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING)
         cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
 
-    UA_LOG_DEBUG(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
-                UA_LOGCATEGORY_NETWORK, "TCP\t| EventSource successfully stopped");
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
+                 UA_LOGCATEGORY_NETWORK, "TCP\t| EventSource successfully stopped");
 }
 
 static UA_StatusCode
 TCP_eventSourceDelete(UA_ConnectionManager *cm) {
     if(cm->eventSource.state >= UA_EVENTSOURCESTATE_STARTING) {
-        UA_LOG_ERROR(UA_EventLoop_getLogger(cm->eventSource.eventLoop),
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| The EventSource must be stopped before it can be deleted");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -790,7 +790,7 @@ TCP_eventSourceDelete(UA_ConnectionManager *cm) {
 }
 
 UA_ConnectionManager *
-UA_ConnectionManager_TCP_new(const UA_String eventSourceName) {
+UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName) {
     TCPConnectionManager *cm = (TCPConnectionManager*)
         UA_calloc(1, sizeof(TCPConnectionManager));
     if(!cm)
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 597a7b63254..4f5a5642bb2 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -22,6 +22,12 @@ typedef struct UA_EventLoop UA_EventLoop;
 struct UA_EventSource;
 typedef struct UA_EventSource UA_EventSource;
 
+struct UA_ConnectionManager;
+typedef struct UA_ConnectionManager UA_ConnectionManager;
+
+struct UA_InterruptManager;
+typedef struct UA_InterruptManager UA_InterruptManager;
+
 /**
  * Event Loop Subsystem
  * ====================
@@ -63,80 +69,90 @@ typedef enum {
     UA_EVENTLOOPSTATE_STOPPED
 } UA_EventLoopState;
 
-/**
- * EventLoop Lifecycle
- * ~~~~~~~~~~~~~~~~~~~ */
+struct UA_EventLoop {
+    /* Configuration
+     * ~~~~~~~~~~~~~~~
+     * The configuration should be set before the EventLoop is started */
+    const UA_Logger *logger;
+    size_t paramsSize;
+    UA_KeyValuePair *params; /* See the implementation-specific documentation */
+
+    /* EventLoop Lifecycle
+     * ~~~~~~~~~~~~~~~~~~~~ */
+    const volatile UA_EventLoopState state; /* Only read the state from outside */
+
+    /* Start the EventLoop and start all already registered EventSources */
+    UA_StatusCode (*start)(UA_EventLoop *el);
+
+    /* Stop all EventSources. This is asynchronous and might need a few
+     * iterations of the main-loop to succeed. */
+    void (*stop)(UA_EventLoop *el);
+
+    /* Process events for at most "timeout" ms or until an unrecoverable error
+     * occurs. If timeout==0, then only already received events are
+     * processed. */
+    UA_StatusCode (*run)(UA_EventLoop *el, UA_UInt32 timeout);
+
+    /* Clean up the EventLoop and free allocated memory. Can fail if the
+     * EventLoop is not stopped. */
+    UA_StatusCode (*free)(UA_EventLoop *el);
+
+    /* Cyclic and Delayed Callbacks
+     * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+     * Cyclic callbacks are executed regularly with an interval. A delayed
+     * callback is executed in the next cycle of the EventLoop. The memory for
+     * the delayed callback is freed after the execution. */
+
+    /* Time of the next cyclic callback. Returns the max DateTime if no cyclic
+     * callback is registered. */
+    UA_DateTime (*nextCyclicTime)(UA_EventLoop *el);
+
+    /* The execution interval is in ms. Returns the callbackId if the pointer is
+     * non-NULL. */
+    UA_StatusCode
+    (*addCyclicCallback)(UA_EventLoop *el, UA_Callback cb, void *application,
+                         void *data, UA_Double interval_ms, UA_DateTime *baseTime,
+                         UA_TimerPolicy timerPolicy, UA_UInt64 *callbackId);
 
-UA_EXPORT UA_EventLoop *
-UA_EventLoop_new(const UA_Logger *logger);
+    UA_StatusCode
+    (*modifyCyclicCallback)(UA_EventLoop *el, UA_UInt64 callbackId,
+                            UA_Double interval_ms, UA_DateTime *baseTime,
+                            UA_TimerPolicy timerPolicy);
 
-/* Clean up the EventLoop and free allocated memory. Can fail if the EventLoop
- * is not stopped. */
-UA_EXPORT UA_StatusCode
-UA_EventLoop_delete(UA_EventLoop *el);
+    void (*removeCyclicCallback)(UA_EventLoop *el, UA_UInt64 callbackId);
 
-UA_EXPORT UA_EventLoopState
-UA_EventLoop_getState(UA_EventLoop *el);
+    /* Like a cyclic callback, but executed only once */
+    UA_StatusCode
+    (*addTimedCallback)(UA_EventLoop *el, UA_Callback cb, void *application,
+                        void *data, UA_DateTime date, UA_UInt64 *callbackId);
 
-UA_EXPORT UA_StatusCode
-UA_EventLoop_start(UA_EventLoop *el);
+    void (*addDelayedCallback)(UA_EventLoop *el, UA_DelayedCallback *dc);
 
-/* Stop all EventSources. This is asynchronous and might need a few
- * iterations of the main-loop to succeed. */
-UA_EXPORT void
-UA_EventLoop_stop(UA_EventLoop *el);
+    /* Manage EventSources
+     * ~~~~~~~~~~~~~~~~~~~ */
 
-/* Process events for at most "timeout" ms or until an unrecoverable error
- * occurs. If timeout==0, then only already received events are processed. */
-UA_EXPORT UA_StatusCode
-UA_EventLoop_run(UA_EventLoop *el, UA_UInt32 timeout);
+    /* Register the ES. Immediately starts the ES if the EventLoop is already
+     * started. Otherwise the ES is started together with the EventLoop. */
+    UA_StatusCode
+    (*registerEventSource)(UA_EventLoop *el, UA_EventSource *es);
 
-/* Time of the next cyclic callback. Returns the max DateTime if no cyclic
- * callback is registered. */
-UA_EXPORT UA_DateTime
-UA_EventLoop_nextCyclicTime(UA_EventLoop *el);
+    /* Stops the EventSource before deregistrering it */
+    UA_StatusCode
+    (*deregisterEventSource)(UA_EventLoop *el, UA_EventSource *es);
 
-/**
- * Cyclic and Delayed Callbacks
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Cyclic callbacks are executed regularly with an interval. A delayed callback
- * is executed in the next cycle of the EventLoop. The memory for the delayed
- * callback is freed after the execution. */
-
-/* The execution interval is in ms. Returns the callbackId if the pointer is
- * non-NULL. */
-UA_EXPORT UA_StatusCode
-UA_EventLoop_addCyclicCallback(UA_EventLoop *el, UA_Callback cb,
-                               void *application, void *data, UA_Double interval_ms,
-                               UA_DateTime *baseTime, UA_TimerPolicy timerPolicy,
-                               UA_UInt64 *callbackId);
-
-UA_EXPORT UA_StatusCode
-UA_EventLoop_addTimedCallback(UA_EventLoop *el, UA_Callback callback,
-                              void *application, void *data, UA_DateTime date,
-                              UA_UInt64 *callbackId);
-UA_EXPORT UA_StatusCode
-UA_EventLoop_modifyCyclicCallback(UA_EventLoop *el, UA_UInt64 callbackId,
-                                  UA_Double interval_ms, UA_DateTime *baseTime,
-                                  UA_TimerPolicy timerPolicy);
-
-UA_EXPORT void
-UA_EventLoop_removeCyclicCallback(UA_EventLoop *el, UA_UInt64 callbackId);
-
-UA_EXPORT void
-UA_EventLoop_addDelayedCallback(UA_EventLoop *el, UA_DelayedCallback *dc);
-
-/* Helper Functions */
-UA_EXPORT const UA_Logger *
-UA_EventLoop_getLogger(UA_EventLoop *el);
-
-UA_EXPORT void
-UA_EventLoop_setLogger(UA_EventLoop *el, const UA_Logger *logger);
+    /* Look up the EventSource by name. Returns the first EventSource of that
+     * name (duplicates should be avoided). */
+    UA_EventSource *
+    (*findEventSource)(UA_EventLoop *el, const UA_String name);
+};
 
 /**
  * Event Source
- * ------------ */
-
+ * ------------
+ * Event Sources are attached to an EventLoop. Typically the event source and
+ * the EventLoop are developed together and share a private API in the
+ * background. */
+ 
 typedef enum {
     UA_EVENTSOURCESTATE_FRESH = 0,
     UA_EVENTSOURCESTATE_STOPPED,      /* Registered but stopped */
@@ -176,22 +192,6 @@ struct UA_EventSource {
     UA_StatusCode (*free)(UA_EventSource *es);
 };
 
-/* Register the ES. Immediately starts the ES if the EventLoop is already
- * started. Otherwise the ES is started together with the EventLoop. */
-UA_EXPORT UA_StatusCode
-UA_EventLoop_registerEventSource(UA_EventLoop *el,
-                                 UA_EventSource *es);
-
-/* If still registered, call _stop (but not _clear) on the CM and deregister. */
-UA_EXPORT UA_StatusCode
-UA_EventLoop_deregisterEventSource(UA_EventLoop *el,
-                                   UA_EventSource *es);
-
-/* Look up the EventSource by name. Returns the first EventSource of that name
- * (duplicates should be avoided). */
-UA_EXPORT UA_EventSource *
-UA_EventLoop_findEventSource(UA_EventLoop *el, const UA_String name);
-
 /**
  * Connection Manager
  * ------------------
@@ -201,51 +201,47 @@ UA_EventLoop_findEventSource(UA_EventLoop *el, const UA_String name);
  * it can keep a session to an MQTT broker open which is used by individual
  * connections that are each bound to an MQTT topic. */
 
-struct UA_ConnectionManager;
-typedef struct UA_ConnectionManager UA_ConnectionManager;
-
-/**
- * The ConnectionCallback is the only interface from the connection back to the
- * application.
- *
- * - The connectionId is initially unknown to the target application and
- *   "announced" to the application when first used first in this callback.
- *
- * - The context is attached to the connection. Initially a default context is set.
- *   The context can be replaced within the callback (via the double-pointer).
- *
- * - The status indicates whether the connection is closing down. If status !=
- *   GOOD, then the application should clean up the context, as this is the last
- *   time the callback will be called for this connection.
- *
- * - The parameters are a key-value list with additional information. The
- *   possible keys and their meaning are documented for the individual
- *   ConnectionManager implementations.
- *
- * - The msg ByteString is the message (or packet) received on the
- *   connection. Can be empty. */
-typedef void
-(*UA_ConnectionCallback)(UA_ConnectionManager *cm, uintptr_t connectionId,
-                         void **connectionContext, UA_StatusCode status,
-                         size_t paramsSize, const UA_KeyValuePair *params,
-                         UA_ByteString msg);
-
 struct UA_ConnectionManager {
     /* Every ConnectionManager is treated like an EventSource from the
      * perspective of the EventLoop. */
     UA_EventSource eventSource;
 
+    /* The ConnectionCallback is the only interface from the connection back to
+     * the application.
+     *
+     * - The connectionId is initially unknown to the target application and
+     *   "announced" to the application when first used first in this callback.
+     *
+     * - The context is attached to the connection. Initially a default context
+     *   is set. The context can be replaced within the callback (via the
+     *   double-pointer).
+     *
+     * - The status indicates whether the connection is closing down. If status
+     *   != GOOD, then the application should clean up the context, as this is
+     *   the last time the callback will be called for this connection.
+     *
+     * - The parameters are a key-value list with additional information. The
+     *   possible keys and their meaning are documented for the individual
+     *   ConnectionManager implementations.
+     *
+     * - The msg ByteString is the message (or packet) received on the
+     *   connection. Can be empty. */
+    void
+    (*connectionCallback)(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void **connectionContext, UA_StatusCode status,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          UA_ByteString msg);
+
     /* Passively listen for new connections
      * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      * Some ConnectionManagers passively listen to open new Connections. The
      * configuration parameters stored in the EventSource are used during
-     * "start" of the EventSource to set this up. The "connectionCallback"
+     * 'start' of the EventSource to set this up. The 'connectionCallback'
      * callback is used to indicate that a new connection has been are created
      * (status==Good, msg=empty).
      *
-     * The callback depends on the application and has to be manually
-     * configured. */
-    UA_ConnectionCallback connectionCallback;
+     * The context an internally created new connection is initialized with.
+     * Before calling the 'connectionCallback' for it the first time. */
     void *initialConnectionContext;
 
     /* Actively Open a Connection
@@ -306,11 +302,75 @@ struct UA_ConnectionManager {
     (*closeConnection)(UA_ConnectionManager *cm, uintptr_t connectionId);
 };
 
+/**
+ * Interrupt Manager
+ * -----------------
+ * The Interrupt Manager allows to register to listen for system interrupts.
+ * Triggering the interrupt calls the callback associated with it.
+ *
+ * The implementations of the interrupt manager for the different platforms
+ * shall be designed such that:
+ *
+ * Registered interrupts are only intercepted from within the running EventLoop
+ *
+ * Processing an interrupt in the EventLoop is handled similarly to handling a
+ * network event: all methods and also memory allocation are available from
+ * within the interrupt callback. */
+
+/* Interrupts can have additional key-value 'instanceInfos' for each individual
+ * triggering. See the architecture-specific documentation. */
+typedef void
+(*UA_InterruptCallback)(UA_InterruptManager *im,
+                        uintptr_t interruptHandle, void *interruptContext,
+                        size_t instanceInfosSize,
+                        const UA_KeyValuePair *instanceInfos);
+
+struct UA_InterruptManager {
+    /* Every InterruptManager is treated like an EventSource from the
+     * perspective of the EventLoop. */
+    UA_EventSource eventSource;
+
+    /* Register an interrupt. The handle and context information is passed
+     * through to the callback.
+     *
+     * The interruptHandle is a numerical identifier of the interrupt. In some
+     * cases, such as POSIX signals, this is enough information to register
+     * callback. For other interrupt systems (architectures) additional
+     * parameters may be required and can be passed in via the parameters
+     * key-value list. See the implementation-specific documentation.
+     *
+     * The interruptContext is opaque user-defined information and passed
+     * through to the callback without modification. */
+    UA_StatusCode
+    (*registerInterrupt)(UA_InterruptManager *im, uintptr_t interruptHandle,
+                         size_t paramsSize, const UA_KeyValuePair *params,
+                         UA_InterruptCallback callback, void *interruptContext);
+
+    /* Remove a registered interrupt. Returns no error code if the interrupt is
+     * already deregistered. */
+    void
+    (*deregisterInterrupt)(UA_InterruptManager *im, uintptr_t interruptHandle);
+};
+
+/**
+ * POSIX-Specific Implementation
+ * -----------------------------
+ * The POSIX compatibility of WIN32 is 'close enough'. So a joint implementation
+ * is provided. */
+
+#if defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32)
+
+UA_EXPORT UA_EventLoop *
+UA_EventLoop_new_POSIX(const UA_Logger *logger);
+
 /**
  * TCP Connection Manager
  * ~~~~~~~~~~~~~~~~~~~~~~
- * Listens on the network and manages TCP connections. The configuration
- * parameters have to set before calling _start to take effect.
+ * Listens on the network and manages TCP connections. This should be available
+ * for all architectures.
+ *
+ * The configuration parameters have to set before calling _start to take
+ * effect.
  *
  * Configuration Parameters:
  * - 0:listen-port [uint16]: Port to listen for new connections (default: do not
@@ -329,7 +389,9 @@ struct UA_ConnectionManager {
  * Send Parameters:
  * No additional parameters for sending over an established TCP socket defined. */
 UA_EXPORT UA_ConnectionManager *
-UA_ConnectionManager_TCP_new(const UA_String eventSourceName);
+UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
+
+#endif /* defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32) */
 
 _UA_END_DECLS
 
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index ab0c66d9340..15e9cc65608 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -137,7 +137,7 @@ setDefaultConfig(UA_ServerConfig *conf) {
 
     /* EventLoop */
     if(conf->eventLoop == NULL) {
-        conf->eventLoop = UA_EventLoop_new(&conf->logger);
+        conf->eventLoop = UA_EventLoop_new_POSIX(&conf->logger);
         conf->externalEventLoop = false;
     }
 
@@ -764,7 +764,7 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
 
     /* EventLoop */
     if(config->eventLoop == NULL) {
-        config->eventLoop = UA_EventLoop_new(&config->logger);
+        config->eventLoop = UA_EventLoop_new_POSIX(&config->logger);
         config->externalEventLoop = false;
     }
 
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index ffe2fc2e61d..5db10fd9e02 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -71,15 +71,16 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
     config->securityPolicies = 0;
 
     /* Stop and delete the EventLoop */
-    if(config->eventLoop && !config->externalEventLoop) {
-        if(UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_FRESH &&
-           UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_STOPPED) {
-            UA_EventLoop_stop(config->eventLoop);
-            while(UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_STOPPED) {
-                UA_EventLoop_run(config->eventLoop, 100);
+    UA_EventLoop *el = config->eventLoop;
+    if(el && !config->externalEventLoop) {
+        if(el->state != UA_EVENTLOOPSTATE_FRESH &&
+           el->state != UA_EVENTLOOPSTATE_STOPPED) {
+            el->stop(el);
+            while(el->state != UA_EVENTLOOPSTATE_STOPPED) {
+                el->run(el, 100);
             }
         }
-        UA_EventLoop_delete(config->eventLoop);
+        el->free(el);
         config->eventLoop = NULL;
     }
 
@@ -603,29 +604,33 @@ UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
 UA_StatusCode UA_EXPORT
 UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
-    return UA_EventLoop_addTimedCallback(client->config.eventLoop, (UA_Callback)callback,
-                                     client, data, date, callbackId);
+    return client->config.eventLoop->
+        addTimedCallback(client->config.eventLoop, (UA_Callback)callback,
+                         client, data, date, callbackId);
 }
 
 UA_StatusCode
 UA_Client_addRepeatedCallback(UA_Client *client, UA_ClientCallback callback,
                               void *data, UA_Double interval_ms, UA_UInt64 *callbackId) {
 
-    return UA_EventLoop_addCyclicCallback(
-        client->config.eventLoop, (UA_Callback)callback, client, data,
-        interval_ms, NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, callbackId);
+    return client->config.eventLoop->
+        addCyclicCallback(client->config.eventLoop, (UA_Callback)callback,
+                          client, data, interval_ms, NULL,
+                          UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, callbackId);
 }
 
 UA_StatusCode
 UA_Client_changeRepeatedCallbackInterval(UA_Client *client, UA_UInt64 callbackId,
                                          UA_Double interval_ms) {
-    return UA_EventLoop_modifyCyclicCallback(client->config.eventLoop, callbackId,
-                                             interval_ms, NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
+    return client->config.eventLoop->
+        modifyCyclicCallback(client->config.eventLoop, callbackId, interval_ms,
+                             NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
 }
 
 void
 UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId) {
-    UA_EventLoop_removeCyclicCallback(client->config.eventLoop, callbackId);
+    client->config.eventLoop->
+        removeCyclicCallback(client->config.eventLoop, callbackId);
 }
 
 static void
@@ -688,20 +693,22 @@ UA_Client_backgroundConnectivity(UA_Client *client) {
 UA_StatusCode
 UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
     UA_ClientConfig *cc = UA_Client_getConfig(client);
-    UA_CHECK_ERROR(UA_EventLoop_getState(cc->eventLoop) != UA_EVENTLOOPSTATE_STOPPED,
-                   return UA_STATUSCODE_BAD, &client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_EventLoop *el = cc->eventLoop;
+    UA_CHECK_ERROR(el->state != UA_EVENTLOOPSTATE_STOPPED,
+                   return UA_STATUSCODE_BAD,
+                   &client->config.logger, UA_LOGCATEGORY_CLIENT,
                    "Eventloop was explicitly stopped.");
 
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
-    if(UA_EventLoop_getState(cc->eventLoop) == UA_EVENTLOOPSTATE_FRESH) {
-        rv = UA_EventLoop_start(cc->eventLoop);
+    if(el->state == UA_EVENTLOOPSTATE_FRESH) {
+        rv = el->start(el);
         UA_CHECK_STATUS(rv, return rv);
     }
 
     /* Process timed (repeated) jobs */
     UA_DateTime now = UA_DateTime_nowMonotonic();
-    UA_EventLoop_run(client->config.eventLoop, 0);
-    UA_DateTime maxDate = UA_EventLoop_nextCyclicTime(client->config.eventLoop);
+    el->run(el, 0);
+    UA_DateTime maxDate = el->nextCyclicTime(el);
     if(maxDate > now + ((UA_DateTime)timeout * UA_DATETIME_MSEC))
         maxDate = now + ((UA_DateTime)timeout * UA_DATETIME_MSEC);
 
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index c12a01d1316..98f10e77f27 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -351,22 +351,23 @@ UA_StatusCode
 UA_PubSubManager_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
                                      void *data, UA_Double interval_ms, UA_DateTime *baseTime,
                                      UA_TimerPolicy timerPolicy, UA_UInt64 *callbackId) {
-    return UA_EventLoop_addCyclicCallback(server->config.eventLoop, (UA_Callback)callback,
-                                          server, data, interval_ms, baseTime,
-                                          timerPolicy, callbackId);
+    return server->config.eventLoop->
+        addCyclicCallback(server->config.eventLoop, (UA_Callback)callback, server, data,
+                          interval_ms, baseTime, timerPolicy, callbackId);
 }
 
 UA_StatusCode
 UA_PubSubManager_changeRepeatedCallback(UA_Server *server, UA_UInt64 callbackId,
                                         UA_Double interval_ms, UA_DateTime *baseTime,
                                         UA_TimerPolicy timerPolicy) {
-    return UA_EventLoop_modifyCyclicCallback(server->config.eventLoop, callbackId,
-                                             interval_ms, baseTime, timerPolicy);
+    return server->config.eventLoop->
+        modifyCyclicCallback(server->config.eventLoop, callbackId, interval_ms,
+                             baseTime, timerPolicy);
 }
 
 void
 UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callbackId) {
-    UA_EventLoop_removeCyclicCallback(server->config.eventLoop, callbackId);
+    server->config.eventLoop->removeCyclicCallback(server->config.eventLoop, callbackId);
 }
 
 
@@ -428,8 +429,10 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCom
                     /* use a timed callback, because one notification is enough, 
                     we assume that MessageReceiveTimeout configuration is in [ms], we do not handle or check fractions */
                     UA_UInt64 interval = (UA_UInt64)(reader->config.messageReceiveTimeout * UA_DATETIME_MSEC);
-                    ret = UA_EventLoop_addTimedCallback(server->config.eventLoop, (UA_Callback) reader->msgRcvTimeoutTimerCallback,
-                        server, reader, UA_DateTime_nowMonotonic() + (UA_DateTime) interval, &(reader->msgRcvTimeoutTimerId));
+                    ret = server->config.eventLoop->
+                        addTimedCallback(server->config.eventLoop, (UA_Callback) reader->msgRcvTimeoutTimerCallback,
+                                         server, reader, UA_DateTime_nowMonotonic() + (UA_DateTime) interval,
+                                         &(reader->msgRcvTimeoutTimerId));
                     if (ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                             "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s'- MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
@@ -476,7 +479,7 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComp
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
-                    UA_EventLoop_removeCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId);
+                    server->config.eventLoop->removeCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId);
                     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                         "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
                             "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
@@ -516,9 +519,10 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
-                    ret = UA_EventLoop_modifyCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId,
-                                                          reader->config.messageReceiveTimeout, NULL,
-                                                          UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
+                    ret = server->config.eventLoop->
+                        modifyCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId,
+                                             reader->config.messageReceiveTimeout, NULL,
+                                             UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
                     if (ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                             "UA_PubSubComponent_updateMonitoringInterval(): DataSetReader '%.*s' - MessageReceiveTimeout: new MessageReceiveTimeout = '%f' "
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 40c8ef21052..a5fa4edfa50 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -201,12 +201,13 @@ void UA_Server_delete(UA_Server *server) {
 #endif
 
     /* Stop the EventLoop and iterate until stopped or an error occurs */
-    UA_EventLoop_stop(server->config.eventLoop);
+    if(server->config.eventLoop->state == UA_EVENTLOOPSTATE_STARTED)
+        server->config.eventLoop->stop(server->config.eventLoop);
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    UA_EventLoopState state = UA_EventLoop_getState(server->config.eventLoop);
-    while(res == UA_STATUSCODE_GOOD && state != UA_EVENTLOOPSTATE_STOPPED) {
-        res = UA_EventLoop_run(server->config.eventLoop, 100);
-        state = UA_EventLoop_getState(server->config.eventLoop);
+    while(res == UA_STATUSCODE_GOOD &&
+          (server->config.eventLoop->state != UA_EVENTLOOPSTATE_FRESH &&
+           server->config.eventLoop->state != UA_EVENTLOOPSTATE_STOPPED)) {
+        res = server->config.eventLoop->run(server->config.eventLoop, 100);
     }
 
     /* Clean up the Admin Session */
@@ -345,7 +346,7 @@ UA_Server_newWithConfig(UA_ServerConfig *config) {
     for(size_t i = 0; i < server->config.securityPoliciesSize; i++)
         server->config.securityPolicies[i].logger = &server->config.logger;
 
-    UA_EventLoop_setLogger(server->config.eventLoop, &server->config.logger);
+    server->config.eventLoop->logger = &server->config.logger;
 
     /* Reset the old config */
     memset(config, 0, sizeof(UA_ServerConfig));
@@ -373,22 +374,20 @@ UA_StatusCode
 UA_Server_addTimedCallback(UA_Server *server, UA_ServerCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode retval =
-        UA_EventLoop_addTimedCallback(server->config.eventLoop,
-                                      (UA_Callback)callback,
-                                      server, data, date, callbackId);
+    UA_StatusCode retval = server->config.eventLoop->
+        addTimedCallback(server->config.eventLoop, (UA_Callback)callback,
+                         server, data, date, callbackId);
     UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
 
 UA_StatusCode
 addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
-                              void *data, UA_Double interval_ms,
-                              UA_UInt64 *callbackId) {
-    return UA_EventLoop_addCyclicCallback(server->config.eventLoop, (UA_Callback) callback,
-                                          server, data, interval_ms, NULL,
-                                          UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-                                          callbackId);
+                    void *data, UA_Double interval_ms, UA_UInt64 *callbackId) {
+    return server->config.eventLoop->
+        addCyclicCallback(server->config.eventLoop, (UA_Callback) callback,
+                          server, data, interval_ms, NULL,
+                          UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, callbackId);
 }
 
 UA_StatusCode
@@ -405,9 +404,9 @@ UA_Server_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
 UA_StatusCode
 changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId,
                                UA_Double interval_ms) {
-    return UA_EventLoop_modifyCyclicCallback(server->config.eventLoop, callbackId,
-                                             interval_ms, NULL,
-                                             UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
+    return server->config.eventLoop->
+        modifyCyclicCallback(server->config.eventLoop, callbackId, interval_ms,
+                             NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
 }
 
 UA_StatusCode
@@ -422,7 +421,8 @@ UA_Server_changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId
 
 void
 removeCallback(UA_Server *server, UA_UInt64 callbackId) {
-    UA_EventLoop_removeCyclicCallback(server->config.eventLoop, callbackId);
+    server->config.eventLoop->removeCyclicCallback(server->config.eventLoop,
+                                                   callbackId);
 }
 
 void
@@ -553,7 +553,7 @@ UA_Server_run_startup(UA_Server *server) {
                  "This should only be used for specific fuzzing builds.");
 #endif
 
-    UA_StatusCode retVal = UA_EventLoop_start(server->config.eventLoop);
+    UA_StatusCode retVal = server->config.eventLoop->start(server->config.eventLoop);
     UA_CHECK_STATUS(retVal, return retVal);
 
     /* ensure that the uri for ns1 is set up from the app description */
@@ -640,8 +640,9 @@ UA_UInt16
 UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
     /* Process repeated work */
     UA_DateTime now = UA_DateTime_nowMonotonic();
-    UA_EventLoop_run(server->config.eventLoop, 0);
-    UA_DateTime nextRepeated = UA_EventLoop_nextCyclicTime(server->config.eventLoop);
+    server->config.eventLoop->run(server->config.eventLoop, 0);
+    UA_DateTime nextRepeated =
+        server->config.eventLoop->nextCyclicTime(server->config.eventLoop);
     UA_DateTime latest = now + (UA_MAXTIMEOUT * UA_DATETIME_MSEC);
     if(nextRepeated > latest)
         nextRepeated = latest;
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 950099ee09c..1fff38b76d0 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -30,15 +30,16 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
     /* nothing to do */
 
     /* Stop and delete the EventLoop */
-    if(config->eventLoop && !config->externalEventLoop) {
-        if(UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_FRESH &&
-           UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_STOPPED) {
-            UA_EventLoop_stop(config->eventLoop);
-            while(UA_EventLoop_getState(config->eventLoop) != UA_EVENTLOOPSTATE_STOPPED) {
-                UA_EventLoop_run(config->eventLoop, 100);
+    UA_EventLoop *el = config->eventLoop;
+    if(el && !config->externalEventLoop) {
+        if(el->state != UA_EVENTLOOPSTATE_FRESH &&
+           el->state != UA_EVENTLOOPSTATE_STOPPED) {
+            el->stop(el);
+            while(el->state != UA_EVENTLOOPSTATE_STOPPED) {
+                el->run(el, 100);
             }
         }
-        UA_EventLoop_delete(config->eventLoop);
+        el->free(el);
         config->eventLoop = NULL;
     }
 
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index e20cd137c64..c4f6dc96a61 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -71,7 +71,8 @@ removeSecureChannel(UA_Server *server, channel_entry *entry,
     entry->cleanupCallback.callback = (UA_Callback)removeSecureChannelCallback;
     entry->cleanupCallback.application = NULL;
     entry->cleanupCallback.data = entry;
-    UA_EventLoop_addDelayedCallback(server->config.eventLoop, &entry->cleanupCallback);
+    server->config.eventLoop->
+        addDelayedCallback(server->config.eventLoop, &entry->cleanupCallback);
 }
 
 void
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 687de97779e..b23541d3ddf 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -91,7 +91,8 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
     sentry->cleanupCallback.callback = (UA_Callback)removeSessionCallback;
     sentry->cleanupCallback.application = server;
     sentry->cleanupCallback.data = sentry;
-    UA_EventLoop_addDelayedCallback(server->config.eventLoop, &sentry->cleanupCallback);
+    server->config.eventLoop->
+        addDelayedCallback(server->config.eventLoop, &sentry->cleanupCallback);
 }
 
 UA_StatusCode
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 1cddf691bed..a76dd305ca7 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -89,7 +89,8 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     sub->delayedFreePointers.callback = NULL;
     sub->delayedFreePointers.application = server;
     sub->delayedFreePointers.data = NULL;
-    UA_EventLoop_addDelayedCallback(server->config.eventLoop, &sub->delayedFreePointers);
+    server->config.eventLoop->
+        addDelayedCallback(server->config.eventLoop, &sub->delayedFreePointers);
 }
 
 UA_MonitoredItem *
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 752370139bc..4a11fffe135 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -599,7 +599,8 @@ UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *mon) {
     mon->delayedFreePointers.callback = NULL;
     mon->delayedFreePointers.application = server;
     mon->delayedFreePointers.data = NULL;
-    UA_EventLoop_addDelayedCallback(server->config.eventLoop, &mon->delayedFreePointers);
+    server->config.eventLoop->
+        addDelayedCallback(server->config.eventLoop, &mon->delayedFreePointers);
 }
 
 void
diff --git a/tests/check_eventloop.c b/tests/check_eventloop.c
index 9679eba4ebe..3a66b1724b5 100644
--- a/tests/check_eventloop.c
+++ b/tests/check_eventloop.c
@@ -23,19 +23,19 @@ createEvents(UA_UInt32 events) {
     for(size_t i = 0; i < events; i++) {
         UA_Double interval = (UA_Double)i+1;
         UA_StatusCode retval =
-            UA_EventLoop_addCyclicCallback(el, timerCallback, NULL, NULL, interval, NULL,
-                                           UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, NULL);
+            el->addCyclicCallback(el, timerCallback, NULL, NULL, interval, NULL,
+                                  UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, NULL);
         ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     }
 }
 
 START_TEST(benchmarkTimer) {
-    el = UA_EventLoop_new(NULL);
+    el = UA_EventLoop_new_POSIX(NULL);
     createEvents(N_EVENTS);
 
     clock_t begin = clock();
     for(size_t i = 0; i < 1000; i++) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
 
@@ -44,8 +44,8 @@ START_TEST(benchmarkTimer) {
     printf("duration was %f s\n", time_spent);
     printf("%lu callbacks\n", (unsigned long)count);
 
-    UA_EventLoop_stop(el);
-    UA_EventLoop_delete(el);
+    el->stop(el);
+    el->free(el);
     el = NULL;
 } END_TEST
 
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index 7a430005185..2a8febbd1df 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -21,34 +21,34 @@ static void noopCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                          UA_ByteString msg) {}
 
 START_TEST(listenTCP) {
-    el = UA_EventLoop_new(UA_Log_Stdout);
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
 
     UA_UInt16 port = 4840;
     UA_Variant portVar;
     UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_ConnectionManager *cm = UA_ConnectionManager_TCP_new(UA_STRING("tcpCM"));
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
     cm->connectionCallback = noopCallback;
     UA_KeyValueMap_set(&cm->eventSource.params,
                        &cm->eventSource.paramsSize,
                        UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
-    UA_EventLoop_registerEventSource(el, &cm->eventSource);
+    el->registerEventSource(el, &cm->eventSource);
 
-    UA_EventLoop_start(el);
+    el->start(el);
 
     for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     int max_stop_iteration_count = 1000;
     int iteration = 0;
     /* Stop the EventLoop */
-    UA_EventLoop_stop(el);
-    while(UA_EventLoop_getState(el) != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
         iteration++;
     }
-    UA_EventLoop_delete(el);
+    el->free(el);
     el = NULL;
 } END_TEST
 
@@ -81,7 +81,7 @@ illegalConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                           void **connectionContext, UA_StatusCode status,
                           size_t paramsSize, const UA_KeyValuePair *params,
                           UA_ByteString msg) {
-    UA_StatusCode rv = UA_EventLoop_run(el, 1);
+    UA_StatusCode rv = el->run(el, 1);
     ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);
     if(*connectionContext != NULL)
         clientId = connectionId;
@@ -97,20 +97,20 @@ illegalConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 }
 
 START_TEST(runEventloopFailsIfCalledFromCallback) {
-    el = UA_EventLoop_new(UA_Log_Stdout);
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
 
     UA_UInt16 port = 4840;
     UA_Variant portVar;
     UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_ConnectionManager *cm = UA_ConnectionManager_TCP_new(UA_STRING("tcpCM"));
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
     cm->connectionCallback = illegalConnectionCallback;
     UA_KeyValueMap_set(&cm->eventSource.params,
                        &cm->eventSource.paramsSize,
                        UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
-    UA_EventLoop_registerEventSource(el, &cm->eventSource);
+    el->registerEventSource(el, &cm->eventSource);
 
     connCount = 0;
-    UA_EventLoop_start(el);
+    el->start(el);
 
     /* Open a client connection */
     clientId = 0;
@@ -125,7 +125,7 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(clientId != 0);
@@ -140,7 +140,7 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(received);
@@ -150,7 +150,7 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(connCount, 2);
     for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert_uint_eq(connCount, 0);
@@ -158,31 +158,32 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     int max_stop_iteration_count = 1000;
     int iteration = 0;
     /* Stop the EventLoop */
-    UA_EventLoop_stop(el);
-    while(UA_EventLoop_getState(el) != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
         iteration++;
     }
-    UA_EventLoop_delete(el);
+    el->free(el);
     el = NULL;
 } END_TEST
 
 START_TEST(connectTCP) {
-    el = UA_EventLoop_new(UA_Log_Stdout);
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
 
     UA_UInt16 port = 4840;
     UA_Variant portVar;
     UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_ConnectionManager *cm = UA_ConnectionManager_TCP_new(UA_STRING("tcpCM"));
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
     cm->connectionCallback = connectionCallback;
     UA_KeyValueMap_set(&cm->eventSource.params,
                        &cm->eventSource.paramsSize,
                        UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
-    UA_EventLoop_registerEventSource(el, &cm->eventSource);
+    el->registerEventSource(el, &cm->eventSource);
 
     connCount = 0;
-    UA_EventLoop_start(el);
+    el->start(el);
 
     /* Open a client connection */
     clientId = 0;
@@ -197,7 +198,7 @@ START_TEST(connectTCP) {
     UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(clientId != 0);
@@ -212,7 +213,7 @@ START_TEST(connectTCP) {
     retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(received);
@@ -222,7 +223,7 @@ START_TEST(connectTCP) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(connCount, 2);
     for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert_uint_eq(connCount, 0);
@@ -231,13 +232,14 @@ START_TEST(connectTCP) {
     int max_stop_iteration_count = 1000;
     int iteration = 0;
     /* Stop the EventLoop */
-    UA_EventLoop_stop(el);
-    while(UA_EventLoop_getState(el) != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
-        UA_DateTime next = UA_EventLoop_run(el, 1);
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
         iteration++;
     }
-    UA_EventLoop_delete(el);
+    el->free(el);
     el = NULL;
 } END_TEST
 

From 37679473d0fc4ff0c0fddc538f762c44dc781fc2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 30 Dec 2021 22:10:55 +0100
Subject: [PATCH 0037/1963] refactor(el): Switch to epoll for the EventLoop on
 Linux

---
 CMakeLists.txt                |   2 +
 arch/eventloop_posix.c        | 396 +++++++++++-----------------------
 arch/eventloop_posix.h        |  83 +++----
 arch/eventloop_posix_epoll.c  | 121 +++++++++++
 arch/eventloop_posix_select.c | 172 +++++++++++++++
 arch/eventloop_posix_tcp.c    | 390 ++++++++++++++++++---------------
 tests/CMakeLists.txt          |   2 +
 tests/check_eventloop_tcp.c   |   9 +-
 8 files changed, 687 insertions(+), 488 deletions(-)
 create mode 100644 arch/eventloop_posix_epoll.c
 create mode 100644 arch/eventloop_posix_select.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e98cc2316b5..2fb55eb3951 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,8 @@ set(ua_architecture_sources ${ua_architecture_sources}
     ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
 )
 
diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index d9cbe12fa92..d61eef1d62a 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -7,9 +7,7 @@
  */
 
 #include "eventloop_posix.h"
-
-static UA_StatusCode
-POSIX_EL_deregisterEventSource(POSIX_EL *el, UA_EventSource *es);
+#include "open62541/plugin/eventloop.h"
 
 /*********/
 /* Timer */
@@ -24,57 +22,59 @@ timerExecutionTrampoline(void *executionApplication,
 }
 
 static UA_DateTime
-POSIX_EL_nextCyclicTime(UA_EventLoop *public_el) {
-    POSIX_EL *el = (POSIX_EL*)public_el;
+UA_EventLoopPOSIX_nextCyclicTime(UA_EventLoop *public_el) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
     return UA_Timer_nextRepeatedTime(&el->timer);
 }
 
 static UA_StatusCode
-POSIX_EL_addTimedCallback(UA_EventLoop *public_el, UA_Callback callback,
-                          void *application, void *data,
-                          UA_DateTime date,
-                          UA_UInt64 *callbackId) {
-    POSIX_EL *el = (POSIX_EL*)public_el;
+UA_EventLoopPOSIX_addTimedCallback(UA_EventLoop *public_el,
+                                   UA_Callback callback,
+                                   void *application, void *data,
+                                   UA_DateTime date,
+                                   UA_UInt64 *callbackId) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
     return UA_Timer_addTimedCallback(&el->timer, callback, application,
                                      data, date, callbackId);
 }
 
 static UA_StatusCode
-POSIX_EL_addCyclicCallback(UA_EventLoop *public_el, UA_Callback cb,
-                           void *application, void *data,
-                           UA_Double interval_ms,
-                           UA_DateTime *baseTime,
-                           UA_TimerPolicy timerPolicy,
-                           UA_UInt64 *callbackId) {
-    POSIX_EL *el = (POSIX_EL*)public_el;
+UA_EventLoopPOSIX_addCyclicCallback(UA_EventLoop *public_el,
+                                    UA_Callback cb,
+                                    void *application, void *data,
+                                    UA_Double interval_ms,
+                                    UA_DateTime *baseTime,
+                                    UA_TimerPolicy timerPolicy,
+                                    UA_UInt64 *callbackId) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
     return UA_Timer_addRepeatedCallback(&el->timer, cb, application,
                                         data, interval_ms, baseTime,
                                         timerPolicy, callbackId);
 }
 
 static UA_StatusCode
-POSIX_EL_modifyCyclicCallback(UA_EventLoop *public_el,
-                              UA_UInt64 callbackId,
-                              UA_Double interval_ms,
-                              UA_DateTime *baseTime,
-                              UA_TimerPolicy timerPolicy) {
-    POSIX_EL *el = (POSIX_EL*)public_el;
+UA_EventLoopPOSIX_modifyCyclicCallback(UA_EventLoop *public_el,
+                                       UA_UInt64 callbackId,
+                                       UA_Double interval_ms,
+                                       UA_DateTime *baseTime,
+                                       UA_TimerPolicy timerPolicy) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
     return UA_Timer_changeRepeatedCallback(&el->timer, callbackId,
                                            interval_ms, baseTime,
                                            timerPolicy);
 }
 
 static void
-POSIX_EL_removeCyclicCallback(UA_EventLoop *public_el,
-                              UA_UInt64 callbackId) {
-    POSIX_EL *el = (POSIX_EL*)public_el;
+UA_EventLoopPOSIX_removeCyclicCallback(UA_EventLoop *public_el,
+                                       UA_UInt64 callbackId) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
     UA_Timer_removeCallback(&el->timer, callbackId);
 }
 
 static void
-POSIX_EL_addDelayedCallback(UA_EventLoop *public_el,
-                            UA_DelayedCallback *dc) {
-    POSIX_EL *el = (POSIX_EL*)public_el;
+UA_EventLoopPOSIX_addDelayedCallback(UA_EventLoop *public_el,
+                                     UA_DelayedCallback *dc) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
     UA_LOCK(&el->elMutex);
     dc->next = el->delayedCallbacks;
     el->delayedCallbacks = dc;
@@ -83,7 +83,7 @@ POSIX_EL_addDelayedCallback(UA_EventLoop *public_el,
 
 /* Process and then free registered delayed callbacks */
 static void
-processDelayed(POSIX_EL *el) {
+processDelayed(UA_EventLoopPOSIX *el) {
     UA_LOCK_ASSERT(&el->elMutex, 1);
     while(el->delayedCallbacks) {
         UA_DelayedCallback *dc = el->delayedCallbacks;
@@ -104,46 +104,7 @@ processDelayed(POSIX_EL *el) {
 /***********************/
 
 static UA_StatusCode
-POSIX_EL_free(POSIX_EL *el) {
-    UA_LOCK(&el->elMutex);
-
-    /* Check if the EventLoop can be deleted */
-    if(el->eventLoop.state != UA_EVENTLOOPSTATE_STOPPED &&
-       el->eventLoop.state != UA_EVENTLOOPSTATE_FRESH) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                       "Cannot delete a running EventLoop");
-        UA_UNLOCK(&el->elMutex);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Deregister and delete all the EventSources */
-    while(el->eventSources) {
-        UA_EventSource *es = el->eventSources;
-        UA_UNLOCK(&el->elMutex);
-        POSIX_EL_deregisterEventSource(el, es);
-        UA_LOCK(&el->elMutex);
-        es->free(es);
-    }
-
-    /* Remove the repeated timed callbacks */
-    UA_Timer_clear(&el->timer);
-
-    /* Process remaining delayed callbacks */
-    processDelayed(el);
-
-    /* All file descriptors were removed together with the
-     * coresponding EventSource */
-    UA_assert(el->fdsSize == 0);
-
-    /* Clean up */
-    UA_UNLOCK(&el->elMutex);
-    UA_LOCK_DESTROY(&el->elMutex);
-    UA_free(el);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-POSIX_EL_start(POSIX_EL *el) {
+UA_EventLoopPOSIX_start(UA_EventLoopPOSIX *el) {
     UA_LOCK(&el->elMutex);
     if(el->eventLoop.state != UA_EVENTLOOPSTATE_FRESH &&
        el->eventLoop.state != UA_EVENTLOOPSTATE_STOPPED) {
@@ -154,8 +115,19 @@ POSIX_EL_start(POSIX_EL *el) {
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                 "Starting the EventLoop");
 
-    UA_EventSource *es = el->eventSources;
+#ifdef UA_HAVE_EPOLL
+    el->epollfd = epoll_create1(0);
+    if(el->epollfd == -1) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "TCP\t| Could not create the epoll socket (%s)",
+                          errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+#endif
+
     UA_StatusCode res = UA_STATUSCODE_GOOD;
+    UA_EventSource *es = el->eventSources;
     while(es) {
         UA_UNLOCK(&el->elMutex);
         res |= es->start(es);
@@ -163,15 +135,16 @@ POSIX_EL_start(POSIX_EL *el) {
         es = es->next;
     }
 
-    /* Dirty-write the state that is const "outside" */
+    /* Dirty-write the state that is const "from the outside" */
     *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
         UA_EVENTLOOPSTATE_STARTED;
+
     UA_UNLOCK(&el->elMutex);
     return res;
 }
 
 static void
-checkClosed(POSIX_EL *el) {
+checkClosed(UA_EventLoopPOSIX *el) {
     UA_EventSource *es = el->eventSources;
     while(es) {
         if(es->state != UA_EVENTSOURCESTATE_STOPPED)
@@ -179,17 +152,29 @@ checkClosed(POSIX_EL *el) {
         es = es->next;
     }
 
-    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                "The EventLoop has stopped");
-    /* Dirty-write the state that is const "outside" */
+    /* Dirty-write the state that is const "from the outside" */
     *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
         UA_EVENTLOOPSTATE_STOPPED;
+
+    /* Close the epoll/IOCP socket once all EventSources have shut down */
+#ifdef UA_HAVE_EPOLL
+    close(el->epollfd);
+#endif
+
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                "The EventLoop has stopped");
 }
 
 static void
-POSIX_EL_stop(POSIX_EL *el) {
+UA_EventLoopPOSIX_stop(UA_EventLoopPOSIX *el) {
     UA_LOCK(&el->elMutex);
 
+    if(el->eventLoop.state != UA_EVENTLOOPSTATE_STARTED) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                       "The EventLoop is not running, cannot be stopped");
+        return;
+    }
+
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                 "Stopping the EventLoop");
 
@@ -212,60 +197,7 @@ POSIX_EL_stop(POSIX_EL *el) {
 }
 
 static UA_StatusCode
-pollFDs(POSIX_EL *el, UA_DateTime listenTimeout) {
-    UA_assert(listenTimeout >= 0);
-    /* Poll the registered sockets */
-#ifdef _GNU_SOURCE
-    struct timespec precisionTimeout = {
-        (long)(listenTimeout / UA_DATETIME_SEC),
-        (long)((listenTimeout % UA_DATETIME_SEC) * 100)
-    };
-    int pollStatus = ppoll(el->pollfds, el->fdsSize,
-                           &precisionTimeout, NULL);
-#else
-    int pollStatus = UA_poll(el->pollfds, el->fdsSize,
-                             (int)(listenTimeout / UA_DATETIME_MSEC));
-#endif
-
-    if(pollStatus < 0) {
-        /* We will retry, only log the error */
-        UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_WARNING(el->eventLoop.logger,
-                          UA_LOGCATEGORY_EVENTLOOP,
-                          "Error during poll: %s", errno_str));
-        return UA_STATUSCODE_GOODCALLAGAIN;
-    }
-
-    /* Loop over all registered FD to see if an event arrived. Yes,
-     * this is why poll is slow for many open sockets. */
-    int processed = 0;
-    for(size_t i = 0; i < el->fdsSize; i++) {
-        /* All done */
-        if(processed >= pollStatus)
-            break;
-
-        /* Nothing to do for this fd */
-        if(el->pollfds[i].revents == 0)
-            continue;
-
-        /* Process the fd */
-        UA_RegisteredFD *rfd = &el->fds[i];
-        UA_FD fd = el->pollfds[i].fd;
-        short revent = el->pollfds[i].revents;
-        UA_UNLOCK(&el->elMutex);
-        rfd->callback(rfd->es, fd, &rfd->fdcontext, revent);
-        UA_LOCK(&el->elMutex);
-        processed++;
-
-        /* The fd has removed itself from within the callback? */
-        if(i >= el->fdsSize || fd != el->pollfds[i].fd)
-            i--;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-POSIX_EL_run(POSIX_EL *el, UA_UInt32 timeout) {
+UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
     UA_LOCK(&el->elMutex);
 
     UA_LOG_TRACE(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
@@ -309,7 +241,7 @@ POSIX_EL_run(POSIX_EL *el, UA_UInt32 timeout) {
 
     /* Listen on the active file-descriptors (sockets) from the
      * ConnectionManagers */
-    UA_StatusCode rv = pollFDs(el, listenTimeout);
+    UA_StatusCode rv = UA_EventLoopPOSIX_pollFDs(el, listenTimeout);
 
     /* Process and then free registered delayed callbacks */
     processDelayed(el);
@@ -323,13 +255,13 @@ POSIX_EL_run(POSIX_EL *el, UA_UInt32 timeout) {
     return rv;
 }
 
-
 /*****************************/
 /* Registering Event Sources */
 /*****************************/
 
 static UA_StatusCode
-POSIX_EL_registerEventSource(POSIX_EL *el, UA_EventSource *es) {
+UA_EventLoopPOSIX_registerEventSource(UA_EventLoopPOSIX *el,
+                                      UA_EventSource *es) {
     /* Already registered? */
     if(es->state != UA_EVENTSOURCESTATE_FRESH) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -355,7 +287,8 @@ POSIX_EL_registerEventSource(POSIX_EL *el, UA_EventSource *es) {
 }
 
 static UA_StatusCode
-POSIX_EL_deregisterEventSource(POSIX_EL *el, UA_EventSource *es) {
+UA_EventLoopPOSIX_deregisterEventSource(UA_EventLoopPOSIX *el,
+                                        UA_EventSource *es) {
     if(es->state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                        "Cannot deregister the EventSource %.*s: "
@@ -383,7 +316,8 @@ POSIX_EL_deregisterEventSource(POSIX_EL *el, UA_EventSource *es) {
 }
 
 static UA_EventSource *
-POSIX_EL_findEventSource(POSIX_EL *el, const UA_String name) {
+UA_EventLoopPOSIX_findEventSource(UA_EventLoopPOSIX *el,
+                                  const UA_String name) {
     UA_LOCK(&el->elMutex);
     UA_EventSource *s = el->eventSources;
     while(s) {
@@ -395,172 +329,90 @@ POSIX_EL_findEventSource(POSIX_EL *el, const UA_String name) {
     return s;
 }
 
-/********************************/
-/* Registering File Descriptors */
-/********************************/
+/*************************/
+/* Initialize and Delete */
+/*************************/
 
-UA_StatusCode
-POSIX_EL_registerFD(POSIX_EL *el, UA_FD fd, short eventMask,
-                    UA_FDCallback cb, UA_EventSource *es,
-                    void *fdcontext) {
+static UA_StatusCode
+UA_EventLoopPOSIX_free(UA_EventLoopPOSIX *el) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                 "Registering fd: %u", (unsigned)fd);
-
-    /* Realloc */
-    UA_RegisteredFD *fds_tmp = (UA_RegisteredFD*)
-        UA_realloc(el->fds, sizeof(UA_RegisteredFD) * (el->fdsSize + 1));
-    if(!fds_tmp) {
-        UA_UNLOCK(&el->elMutex);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    el->fds = fds_tmp;
-
-    struct pollfd *pollfds_tmp = (struct pollfd*)
-        UA_realloc(el->pollfds, sizeof(struct pollfd) *(el->fdsSize + 1));
-    if(!pollfds_tmp) {
+    /* Check if the EventLoop can be deleted */
+    if(el->eventLoop.state != UA_EVENTLOOPSTATE_STOPPED &&
+       el->eventLoop.state != UA_EVENTLOOPSTATE_FRESH) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                       "Cannot delete a running EventLoop");
         UA_UNLOCK(&el->elMutex);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    el->pollfds = pollfds_tmp;
-
-    /* Add to the last entry */
-    el->fds[el->fdsSize].callback = cb;
-    el->fds[el->fdsSize].es = es;
-    el->fds[el->fdsSize].fdcontext = fdcontext;
-    el->pollfds[el->fdsSize].fd = fd;
-    el->pollfds[el->fdsSize].events = eventMask;
-    el->fdsSize++;
-
-    UA_UNLOCK(&el->elMutex);
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-POSIX_EL_modifyFD(POSIX_EL *el, UA_FD fd, short eventMask,
-                  UA_FDCallback cb, void *fdcontext) {
-    UA_LOCK(&el->elMutex);
-
-    /* Find the entry */
-    size_t i = 0;
-    for(; i < el->fdsSize; i++) {
-        if(el->pollfds[i].fd == fd)
-            break;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* Not found? */
-    if(i == el->fdsSize) {
+    /* Deregister and delete all the EventSources */
+    while(el->eventSources) {
+        UA_EventSource *es = el->eventSources;
         UA_UNLOCK(&el->elMutex);
-        return UA_STATUSCODE_BADNOTFOUND;
+        UA_EventLoopPOSIX_deregisterEventSource(el, es);
+        UA_LOCK(&el->elMutex);
+        es->free(es);
     }
 
-    /* Modify */
-    el->fds[i].callback = cb;
-    el->pollfds[i].events = eventMask;
-    el->fds[i].fdcontext = fdcontext;
-
-    UA_UNLOCK(&el->elMutex);
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-POSIX_EL_deregisterFD(POSIX_EL *el, UA_FD fd) {
-    UA_LOCK(&el->elMutex);
-
-    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                 "Unregistering fd: %u", (unsigned)fd);
-
-    /* Find the entry */
-    size_t i = 0;
-    for(; i < el->fdsSize; i++) {
-        if(el->pollfds[i].fd == fd)
-            break;
-    }
+    /* Remove the repeated timed callbacks */
+    UA_Timer_clear(&el->timer);
 
-    /* Not found? */
-    if(i == el->fdsSize) {
-        UA_UNLOCK(&el->elMutex);
-        return UA_STATUSCODE_BADNOTFOUND;
-    }
+    /* Process remaining delayed callbacks */
+    processDelayed(el);
 
-    el->fdsSize--;
-    if(el->fdsSize > 0) {
-        /* Move the last entry to the ith slot and realloc. */
-        el->fds[i] = el->fds[el->fdsSize];
-        el->pollfds[i] = el->pollfds[el->fdsSize];
-
-        /* If realloc fails the fds are still in a correct state with
-         * possibly lost memory, so failing silently here is ok */
-        UA_RegisteredFD *fds_tmp = (UA_RegisteredFD*)
-            UA_realloc(el->fds, sizeof(UA_RegisteredFD) * el->fdsSize);
-        if(fds_tmp)
-            el->fds = fds_tmp;
-        struct pollfd *pollfds_tmp = (struct pollfd*)
-            UA_realloc(el->pollfds, sizeof(struct pollfd) * el->fdsSize);
-        if(pollfds_tmp)
-            el->pollfds = pollfds_tmp;
-    } else {
-        /* Free the lists */
-        UA_free(el->fds);
-        el->fds = NULL;
-        UA_free(el->pollfds);
-        el->pollfds = NULL;
-    }
+#ifdef _WIN32
+    /* Stop the Windows networking subsystem */
+    WSACleanup();
+#endif
 
+    /* Clean up */
     UA_UNLOCK(&el->elMutex);
+    UA_LOCK_DESTROY(&el->elMutex);
+    UA_free(el);
     return UA_STATUSCODE_GOOD;
 }
 
-void
-POSIX_EL_iterateFD(POSIX_EL *el, UA_EventSource *es,
-                   POSIX_EL_IterateCallback cb,
-                   void *iterateContext) {
-    for(size_t i = 0; i < el->fdsSize; i++) {
-        if(el->fds[i].es != es)
-            continue;
-
-        UA_FD fd = el->pollfds[i].fd;
-        int done = cb(es, fd, el->fds[i].fdcontext, iterateContext);
-        if(done)
-            break;
-
-        /* The fd has removed itself from within the callback? */
-        if(i >= el->fdsSize || fd != el->pollfds[i].fd)
-            i--;
-    }
-}
-
 UA_EventLoop *
 UA_EventLoop_new_POSIX(const UA_Logger *logger) {
-    POSIX_EL *el = (POSIX_EL*)UA_malloc(sizeof(POSIX_EL));
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)
+        UA_calloc(1, sizeof(UA_EventLoopPOSIX));
     if(!el)
         return NULL;
-    memset(el, 0, sizeof(POSIX_EL));
+
     UA_LOCK_INIT(&el->elMutex);
     UA_Timer_init(&el->timer);
 
+#ifdef _WIN32
+    /* Start the WSA networking subsystem on Windows */
+    WSADATA wsaData;
+    WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
+
     /* Set the public EventLoop content */
     el->eventLoop.logger = logger;
 
-    el->eventLoop.start = (UA_StatusCode (*)(UA_EventLoop*))POSIX_EL_start;
-    el->eventLoop.stop = (void (*)(UA_EventLoop*))POSIX_EL_stop;
-    el->eventLoop.run = (UA_StatusCode (*)(UA_EventLoop*, UA_UInt32))POSIX_EL_run;
-    el->eventLoop.free = (UA_StatusCode (*)(UA_EventLoop*))POSIX_EL_free;
-
-    el->eventLoop.nextCyclicTime = POSIX_EL_nextCyclicTime;
-    el->eventLoop.addCyclicCallback = POSIX_EL_addCyclicCallback;
-    el->eventLoop.modifyCyclicCallback = POSIX_EL_modifyCyclicCallback;
-    el->eventLoop.removeCyclicCallback = POSIX_EL_removeCyclicCallback;
-    el->eventLoop.addTimedCallback = POSIX_EL_addTimedCallback;
-    el->eventLoop.addDelayedCallback = POSIX_EL_addDelayedCallback;
+    el->eventLoop.start = (UA_StatusCode (*)(UA_EventLoop*))UA_EventLoopPOSIX_start;
+    el->eventLoop.stop = (void (*)(UA_EventLoop*))UA_EventLoopPOSIX_stop;
+    el->eventLoop.run = (UA_StatusCode (*)(UA_EventLoop*, UA_UInt32))UA_EventLoopPOSIX_run;
+    el->eventLoop.free = (UA_StatusCode (*)(UA_EventLoop*))UA_EventLoopPOSIX_free;
+
+    el->eventLoop.nextCyclicTime = UA_EventLoopPOSIX_nextCyclicTime;
+    el->eventLoop.addCyclicCallback = UA_EventLoopPOSIX_addCyclicCallback;
+    el->eventLoop.modifyCyclicCallback = UA_EventLoopPOSIX_modifyCyclicCallback;
+    el->eventLoop.removeCyclicCallback = UA_EventLoopPOSIX_removeCyclicCallback;
+    el->eventLoop.addTimedCallback = UA_EventLoopPOSIX_addTimedCallback;
+    el->eventLoop.addDelayedCallback = UA_EventLoopPOSIX_addDelayedCallback;
     
     el->eventLoop.registerEventSource =
-        (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))POSIX_EL_registerEventSource;
+        (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))
+        UA_EventLoopPOSIX_registerEventSource;
     el->eventLoop.deregisterEventSource =
-        (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))POSIX_EL_deregisterEventSource;
+        (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))
+        UA_EventLoopPOSIX_deregisterEventSource;
     el->eventLoop.findEventSource =
-        (UA_EventSource* (*)(UA_EventLoop*, const UA_String))POSIX_EL_findEventSource;
+        (UA_EventSource* (*)(UA_EventLoop*, const UA_String))
+        UA_EventLoopPOSIX_findEventSource;
 
     return &el->eventLoop;
 }
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 17e6de10f57..5ac83cddf7a 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -15,6 +15,13 @@
 #if defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32)
 
 #include "common/ua_timer.h"
+#include "open62541_queue.h"
+
+/* epoll_pwait returns bogus data with the tc compiler */
+#if defined(__linux__) && !defined(__TINYC__)
+# define UA_HAVE_EPOLL
+# include <sys/epoll.h>
+#endif
 
 _UA_BEGIN_DECLS
 
@@ -27,22 +34,30 @@ _UA_BEGIN_DECLS
 #define UA_FD UA_SOCKET
 #define UA_INVALID_FD UA_INVALID_SOCKET
 
-typedef void
-(*UA_FDCallback)(UA_EventSource *es, UA_FD fd, void **fdcontext, short event);
+struct UA_RegisteredFD;
+typedef struct UA_RegisteredFD UA_RegisteredFD;
 
-typedef struct {
-    /* The members fd and events are stored in the separate
-     * pollfds array:
-     * - UA_FD fd;
-     * - short events; */
-    UA_EventSource *es;
+/* Bitmask to be used for the UA_FDCallback event argument */
+#define UA_FDEVENT_IN 1
+#define UA_FDEVENT_OUT 2
+#define UA_FDEVENT_ERR 4
+
+typedef void (*UA_FDCallback)(UA_EventSource *es, UA_RegisteredFD *rfd, short event);
+
+struct UA_RegisteredFD {
+    LIST_ENTRY(UA_RegisteredFD) es_pointers; /* Register FD in the EventSource */
+
+    UA_FD fd;
+    short listenEvents; /* UA_FDEVENT_IN | UA_FDEVENT_OUT*/
+
+    UA_EventSource *es; /* Backpointer to the EventSource */
     UA_FDCallback callback;
-    void *fdcontext;
-} UA_RegisteredFD;
+    void *context;
+};
 
 typedef struct {
     UA_EventLoop eventLoop;
-    
+
     /* Timer */
     UA_Timer timer;
 
@@ -52,47 +67,39 @@ typedef struct {
     /* Pointers to registered EventSources */
     UA_EventSource *eventSources;
 
-    /* Registered file descriptors */
-    size_t fdsSize;
-    UA_RegisteredFD *fds;
-    struct pollfd *pollfds; /* has the same size as "fds" */
-
     /* Flag determining whether the eventloop is currently within the
      * "run" method */
     UA_Boolean executing;
 
+#if defined(UA_HAVE_EPOLL)
+    UA_FD epollfd;
+#else
+    /* Explicit list of file descriptors */
+    size_t fdsSize;
+    UA_RegisteredFD **fds;
+#endif
+
 #if UA_MULTITHREADING >= 100
     UA_Lock elMutex;
 #endif
-} POSIX_EL;
+} UA_EventLoopPOSIX;
 
-UA_StatusCode
-POSIX_EL_registerFD(POSIX_EL *el, UA_FD fd, short eventMask,
-                    UA_FDCallback cb, UA_EventSource *es, void *fdcontext);
+/* The following functions differ between epoll and normal select */
 
-/* Change the fd settings (event mask, callback) in-place. Fails only if the fd
- * no longer exists. */
+/* Register to start receiving events */
 UA_StatusCode
-POSIX_EL_modifyFD(POSIX_EL *el, UA_FD fd, short eventMask,
-                  UA_FDCallback cb, void *fdcontext);
+UA_EventLoopPOSIX_registerFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd);
 
-/* During processing of an fd-event, the fd may deregister itself. But in the
- * fd-callback they must not deregister another fd. */
+/* Modify the events that the fd listens on */
 UA_StatusCode
-POSIX_EL_deregisterFD(POSIX_EL *el, UA_FD fd);
-
-/* abort the iteration if the returned boolean is true */
-typedef UA_Boolean
-(*POSIX_EL_IterateCallback)(UA_EventSource *es, UA_FD fd,
-                            void *fdContext, void *iterateContext);
+UA_EventLoopPOSIX_modifyFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd);
 
-/* Call the callback for all fd that are registered from that event source. The
- * callback is called with the 'event' argument set to zero to disambiguate from
- * a callback after 'poll'. */
+/* Deregister but do not close the fd. No further events are received. */
 void
-POSIX_EL_iterateFD(POSIX_EL *el, UA_EventSource *es,
-                   POSIX_EL_IterateCallback callback,
-                   void *iterateContext);
+UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd);
+
+UA_StatusCode
+UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout);
 
 _UA_END_DECLS
 
diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
new file mode 100644
index 00000000000..a393499d6a9
--- /dev/null
+++ b/arch/eventloop_posix_epoll.c
@@ -0,0 +1,121 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ */
+
+#include "eventloop_posix.h"
+#ifdef __linux__
+#include <linux/version.h>
+#endif
+
+#if defined(UA_HAVE_EPOLL)
+
+UA_StatusCode
+UA_EventLoopPOSIX_registerFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
+    struct epoll_event event;
+    memset(&event, 0, sizeof(struct epoll_event));
+    event.data.ptr = rfd;
+    event.events = 0;
+    if(rfd->listenEvents & UA_FDEVENT_IN)
+        event.events |= EPOLLIN;
+    if(rfd->listenEvents & UA_FDEVENT_OUT)
+        event.events |= EPOLLOUT;
+            
+    int err = epoll_ctl(el->epollfd, EPOLL_CTL_ADD, rfd->fd, &event);
+    if(err != 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "TCP %u\t| Could not register for epoll (%s)",
+                          rfd->fd, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_EventLoopPOSIX_modifyFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
+    struct epoll_event event;
+    event.data.ptr = rfd;
+    event.events = 0;
+    if(rfd->listenEvents & UA_FDEVENT_IN)
+        event.events |= EPOLLIN;
+    if(rfd->listenEvents & UA_FDEVENT_OUT)
+        event.events |= EPOLLOUT;
+            
+    int err = epoll_ctl(el->epollfd, EPOLL_CTL_MOD, rfd->fd, &event);
+    if(err != 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "TCP %u\t| Could not modify for epoll (%s)",
+                          rfd->fd, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+void
+UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
+    int res = epoll_ctl(el->epollfd, EPOLL_CTL_DEL, rfd->fd, NULL);
+    if(res != 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "TCP %u\t| Could not deregister from epoll (%s)",
+                          rfd->fd, errno_str));
+    }
+}
+
+UA_StatusCode
+UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
+    UA_assert(listenTimeout >= 0);
+
+    /* Poll the registered sockets */
+    struct epoll_event epoll_events[64];
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0)
+    int events = epoll_pwait(el->epollfd, epoll_events, 64,
+                             (int)(listenTimeout / UA_DATETIME_MSEC), NULL);
+#else
+    struct timespec precisionTimeout = {
+        (long)(listenTimeout / UA_DATETIME_SEC),
+        (long)((listenTimeout % UA_DATETIME_SEC) * 100)
+    };
+    int events = epoll_pwait2(el->epollfd, epoll_events, 64,
+                              precisionTimeout, NULL);
+#endif
+
+    /* Handle error conditions */
+    if(events == -1) {
+        if(errno == EINTR) {
+            /* We will retry, only log the error */
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                           "Timeout during poll");
+            return UA_STATUSCODE_GOOD;
+        }
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "TCP\t| Error %s, closing the server socket",
+                          errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Process all received events */
+    for(int i = 0; i < events; i++) {
+        UA_RegisteredFD *rfd = (UA_RegisteredFD*)epoll_events[i].data.ptr;
+        short revent = 0;
+        if(epoll_events[i].events == EPOLLIN) {
+            revent = UA_FDEVENT_IN;
+        } else if(epoll_events[i].events == EPOLLOUT) {
+            revent = UA_FDEVENT_OUT;
+        } else {
+            revent = UA_FDEVENT_ERR;
+        }
+        
+        UA_UNLOCK(&el->elMutex);
+        rfd->callback(rfd->es, rfd, revent);
+        UA_LOCK(&el->elMutex);
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif /* defined(UA_HAVE_EPOLL) */
diff --git a/arch/eventloop_posix_select.c b/arch/eventloop_posix_select.c
new file mode 100644
index 00000000000..fc08906fd53
--- /dev/null
+++ b/arch/eventloop_posix_select.c
@@ -0,0 +1,172 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ */
+
+#include "eventloop_posix.h"
+
+#if !defined(UA_HAVE_EPOLL)
+
+UA_StatusCode
+UA_EventLoopPOSIX_registerFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
+    UA_LOCK(&el->elMutex);
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Registering fd: %u", (unsigned)rfd->fd);
+
+    /* Realloc */
+    UA_RegisteredFD **fds_tmp = (UA_RegisteredFD**)
+        UA_realloc(el->fds, sizeof(UA_RegisteredFD*) * (el->fdsSize + 1));
+    if(!fds_tmp) {
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    el->fds = fds_tmp;
+
+    /* Add to the last entry */
+    el->fds[el->fdsSize] = rfd;
+    el->fdsSize++;
+
+    UA_UNLOCK(&el->elMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_EventLoopPOSIX_modifyFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
+    /* Do nothing, it is enough if the data was changed in the rfd */
+    return UA_STATUSCODE_GOOD;
+}
+
+void
+UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
+    UA_LOCK(&el->elMutex);
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Unregistering fd: %u", (unsigned)rfd->fd);
+
+    /* Find the entry */
+    size_t i = 0;
+    for(; i < el->fdsSize; i++) {
+        if(el->fds[i] == rfd)
+            break;
+    }
+
+    /* Not found? */
+    if(i == el->fdsSize) {
+        UA_UNLOCK(&el->elMutex);
+        return;
+    }
+
+    if(el->fdsSize > 1) {
+        /* Move the last entry in the ith slot and realloc. */
+        el->fdsSize--;
+        el->fds[i] = el->fds[el->fdsSize];
+        UA_RegisteredFD **fds_tmp = (UA_RegisteredFD**)
+            UA_realloc(el->fds, sizeof(UA_RegisteredFD*) * el->fdsSize);
+        /* if realloc fails the fds are still in a correct state with 
+         * possibly lost memory, so failing silently here is ok */
+        if(fds_tmp)
+            el->fds = fds_tmp;
+    } else {
+        /* Remove the last entry */
+        UA_free(el->fds);
+        el->fds = NULL;
+        el->fdsSize = 0;
+    }
+
+    UA_UNLOCK(&el->elMutex);
+}
+
+static UA_FD
+setFDSets(UA_EventLoopPOSIX *el, fd_set *readset, fd_set *writeset, fd_set *errset) {
+    FD_ZERO(readset);
+    FD_ZERO(writeset);
+    FD_ZERO(errset);
+    UA_FD highestfd = UA_INVALID_FD;
+    for(size_t i = 0; i < el->fdsSize; i++) {
+
+        UA_FD currentFD = el->fds[i]->fd;
+        /* Add to the fd_sets */
+        if(el->fds[i]->listenEvents & UA_FDEVENT_IN)
+            UA_fd_set(currentFD, readset);
+        if(el->fds[i]->listenEvents & UA_FDEVENT_OUT)
+            UA_fd_set(currentFD, writeset);
+
+        /* Always return errors */
+        UA_fd_set(currentFD, errset);
+
+        /* Highest fd? */
+        if(currentFD > highestfd || highestfd == UA_INVALID_FD)
+            highestfd = currentFD;
+    }
+    return highestfd;
+}
+
+UA_StatusCode
+UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
+    UA_assert(listenTimeout >= 0);
+
+    fd_set readset, writeset, errset;
+    UA_FD highestfd = setFDSets(el, &readset, &writeset, &errset);
+
+    /* Nothing to do? */
+    if(highestfd == UA_INVALID_FD) {
+        UA_LOG_TRACE(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "No valid FDs for processing");
+        return UA_STATUSCODE_GOOD;
+    }
+
+    struct timeval tmptv = {
+#ifndef _WIN32
+        (time_t)(listenTimeout / UA_DATETIME_SEC),
+        (suseconds_t)((listenTimeout % UA_DATETIME_SEC) / UA_DATETIME_USEC)
+#else
+        (long)(listenTimeout / UA_DATETIME_SEC),
+        (long)((listenTimeout % UA_DATETIME_SEC) / UA_DATETIME_USEC)
+#endif
+    };
+
+    int selectStatus = UA_select(highestfd+1, &readset, &writeset, &errset, &tmptv);
+    if(selectStatus < 0) {
+        /* We will retry, only log the error */
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                           "Error during select: %s", errno_str));
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Loop over all registered FD to see if an event arrived. Yes, this is why
+      * select is slow for many open sockets. */
+    for(size_t i = 0; i < el->fdsSize; i++) {
+        UA_RegisteredFD *rfd = el->fds[i];
+        UA_FD fd = rfd->fd;
+
+        /* Error Event */
+        short event = 0;
+        if(UA_fd_isset(fd, &readset)) {
+            event = UA_FDEVENT_IN;
+        } else if(UA_fd_isset(fd, &writeset)) {
+            event = UA_FDEVENT_OUT;
+        } else if(UA_fd_isset(fd, &errset)) {
+            event = UA_FDEVENT_ERR;
+        } else {
+            continue;
+        }
+        
+        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "Processing event %u on fd %u", (unsigned)event, (unsigned)fd);
+
+        UA_UNLOCK(&el->elMutex);
+        rfd->callback(rfd->es, rfd, event);
+        UA_LOCK(&el->elMutex);
+
+        /* The fd has removed itself */
+        if(i == el->fdsSize || rfd != el->fds[i])
+            i--;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif /* !defined(UA_HAVE_EPOLL) */
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 503b433f9fd..b8176ba2782 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -20,10 +20,33 @@
 
 typedef struct {
     UA_ConnectionManager cm;
-    size_t fdCount; /* Number of fd registered in the EventLoop */
+
+    size_t fdsSize;
+    LIST_HEAD(, UA_RegisteredFD) fds;
+
     size_t recvBufferSize;
 } TCPConnectionManager;
 
+static UA_StatusCode
+TCPConnectionManager_register(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
+    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, rfd);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+    LIST_INSERT_HEAD(&tcm->fds, rfd, es_pointers);
+    tcm->fdsSize++;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+TCPConnectionManager_deregister(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
+    UA_EventLoopPOSIX_deregisterFD(el, rfd);
+    LIST_REMOVE(rfd, es_pointers);
+    UA_assert(tcm->fdsSize > 0);
+    tcm->fdsSize--;
+}
+
 static UA_StatusCode
 TCP_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
                        UA_ByteString *buf, size_t bufSize) {
@@ -75,97 +98,88 @@ TCP_setNoNagle(UA_FD sockfd) {
 }
 
 static UA_StatusCode
-TCP_close(UA_ConnectionManager *cm, UA_FD fd) {
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Closing connection", (unsigned)fd);
-
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-
-    /* Close the fd and deregister */
-    int ret = UA_close(fd);
-    if(ret != 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-    UA_StatusCode sc =
-        POSIX_EL_deregisterFD((POSIX_EL*)tcm->cm.eventSource.eventLoop, fd);
-    if(sc != UA_STATUSCODE_GOOD)
-        return sc;
-
-    /* Reduce the count */
-    UA_assert(tcm->fdCount > 0);
-    tcm->fdCount--;
+TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "TCP %u\t| Closing connection", (unsigned)rfd->fd);
+
+    /* Deregister from the EventLoop */
+    TCPConnectionManager_deregister(tcm, rfd);
+
+    /* Close the socket */
+    int ret = UA_close(rfd->fd);
+    if(ret == 0) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP %u\t| Socket closed", (unsigned)rfd->fd);
+    } else {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "TCP %u\t| Could not close the socket (%s)",
+                          (unsigned)rfd->fd, errno_str));
+    }
 
-    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
-                UA_LOGCATEGORY_NETWORK, "TCP %u\t| Socket closed", (unsigned)fd);
+    /* Free the rfd */
+    UA_free(rfd);
 
     /* Stopped? */
-    if(tcm->fdCount == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
-        UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
+    if(tcm->fdsSize == 0 && tcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
+        UA_LOG_DEBUG(tcm->cm.eventSource.eventLoop->logger,
                      UA_LOGCATEGORY_NETWORK,
                      "TCP\t| All sockets closed, the EventLoop has stopped");
-        cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+        tcm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
     }
     return UA_STATUSCODE_GOOD;
 }
 
 /* Gets called when a connection socket opens, receives data or closes */
 static void
-TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
-                             void **fdcontext, short event) {
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Activity on the socket", (unsigned)fd);
+TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
+                             short event) {
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "TCP %u\t| Activity on the socket", (unsigned)rfd->fd);
 
     /* Write-Event, a new connection has opened.  */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    if(event == UA_POLLOUT) {
-        UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_NETWORK,
-                     "TCP %u\t| Opening a new connection", (unsigned)fd);
+    if(event == UA_FDEVENT_OUT) {
+        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "TCP %u\t| Opening a new connection", (unsigned)rfd->fd);
 
-        /* The socket has opened. Signal it to the application. */
-        cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
+        /* A new socket has opened. Signal it to the application. */
+        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
                                UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
-        POSIX_EL_modifyFD((POSIX_EL*)cm->eventSource.eventLoop, fd, UA_POLLIN,
-                          (UA_FDCallback)TCP_connectionSocketCallback, *fdcontext);
+        rfd->listenEvents = UA_FDEVENT_IN;
+        UA_EventLoopPOSIX_modifyFD(el, rfd);
         return;
     }
 
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Allocate receive buffer", (unsigned)fd);
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "TCP %u\t| Allocate receive buffer", (unsigned)rfd->fd);
 
     /* Allocate the receive-buffer */
     UA_ByteString response;
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     res = UA_ByteString_allocBuffer(&response, tcm->recvBufferSize);
     if(res != UA_STATUSCODE_GOOD)
         return; /* Retry in the next iteration */
 
     /* Receive */
 #ifndef _WIN32
-    ssize_t ret = UA_recv(fd, (char*)response.data, response.length, MSG_DONTWAIT);
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| recv(...) returned %zd", (unsigned)fd, ret);
+    ssize_t ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
 #else
-    int ret = UA_recv(fd, (char*)response.data, response.length, MSG_DONTWAIT);
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| recv(...) returned %d", (unsigned)fd, ret);
+    int ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
 #endif
 
     if(ret > 0) {
-        UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_NETWORK,
+        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| Received message of size %u",
-                     (unsigned)fd, (unsigned)ret);
+                     (unsigned)rfd->fd, (unsigned)ret);
 
         /* Callback to the application layer */
         response.length = (size_t)ret; /* Set the length of the received buffer */
-        cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
+        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
                                UA_STATUSCODE_GOOD, 0, NULL, response);
     } else if(UA_ERRNO != UA_INTERRUPTED &&
               UA_ERRNO != UA_WOULDBLOCK &&
@@ -174,15 +188,14 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
          * then close the connection. We end up in this path after shutdown was
          * called on the socket. Here, we then are in the next EventLoop
          * iteration and the socket is known to be unused. */
-        UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_NETWORK,
-                     "TCP %u\t| recv signaled closed connection", (unsigned)fd);
+        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "TCP %u\t| recv signaled closed connection", (unsigned)rfd->fd);
 
         /* Close the connection if not a temporary error on a nonblocking socket */
-        cm->connectionCallback(cm, (uintptr_t)fd, fdcontext,
+        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
                                UA_STATUSCODE_BADCONNECTIONCLOSED,
                                0, NULL, UA_BYTESTRING_NULL);
-        TCP_close(cm, fd);
+        TCP_close(tcm, rfd);
     }
 
     UA_ByteString_clear(&response);
@@ -190,16 +203,17 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
 
 /* Gets called when a new connection opens or if the listenSocket is closed */
 static void
-TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
-                         void **fdcontext, short event) {
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Callback on server socket", (unsigned)fd);
+TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
+                         short event) {
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "TCP %u\t| Callback on server socket", (unsigned)rfd->fd);
 
     /* Try to accept a new connection */
     struct sockaddr_storage remote;
     socklen_t remote_size = sizeof(remote);
-    UA_FD newsockfd = UA_accept(fd, (struct sockaddr*)&remote, &remote_size);
+    UA_FD newsockfd = UA_accept(rfd->fd, (struct sockaddr*)&remote, &remote_size);
     if(newsockfd == UA_INVALID_FD) {
         /* Temporary error -- retry */
         if(UA_ERRNO == UA_INTERRUPTED)
@@ -208,12 +222,11 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
         /* Close the listen socket */
         if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPING) {
             UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                               UA_LOGCATEGORY_NETWORK,
+                UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                                "TCP %u\t| Error %s, closing the server socket",
-                               (unsigned)fd, errno_str));
+                               (unsigned)rfd->fd, errno_str));
         }
-        TCP_close(cm, fd);
+        TCP_close(tcm, rfd);
         return;
     }
 
@@ -231,13 +244,13 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
                 UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                                UA_LOGCATEGORY_NETWORK,
                                "TCP %u\t| getnameinfo(...) could not resolve the "
-                               "hostname (%s)", (unsigned)fd, errno_str));
+                               "hostname (%s)", (unsigned)rfd->fd, errno_str));
         }
     }
     UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                 UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| Connection opened from \"%s\" via the server socket %u",
-                (unsigned)newsockfd, hoststr, (unsigned)fd);
+                (unsigned)newsockfd, hoststr, (unsigned)rfd->fd);
 #endif
 
     /* Configure the new socket */
@@ -256,30 +269,45 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_FD fd,
         return;
     }
 
-    void *ctx = cm->initialConnectionContext;
-    /* The socket has opened. Signal it to the application. The callback can
-     * switch out the context. So put it into a temp variable.  */
-    cm->connectionCallback(cm, (uintptr_t)newsockfd, &ctx, UA_STATUSCODE_GOOD,
-                           0, NULL, UA_BYTESTRING_NULL);
+    /* Allocate the UA_RegisteredFD */
+    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
+        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
+    if(!newrfd) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP %u\t| Error allocating memory for the socket, closing",
+                       (unsigned)newsockfd);
+        UA_close(newsockfd);
+        return;
+    }
+
+    newrfd->fd = newsockfd;
+    newrfd->es = &cm->eventSource;
+    newrfd->callback = (UA_FDCallback)TCP_connectionSocketCallback;
+    newrfd->context = cm->initialConnectionContext;
+    newrfd->listenEvents = UA_FDEVENT_IN;
 
     /* Register in the EventLoop. Signal to the user if registering failed. */
-    res = POSIX_EL_registerFD((POSIX_EL*)cm->eventSource.eventLoop, newsockfd,
-                              UA_POLLIN, (UA_FDCallback)TCP_connectionSocketCallback,
-                              &cm->eventSource, ctx);
+    res = TCPConnectionManager_register(tcm, newrfd);
     if(res != UA_STATUSCODE_GOOD) {
-        cm->connectionCallback(cm, (uintptr_t)newsockfd, &ctx,
-                               UA_STATUSCODE_BADINTERNALERROR,
-                               0, NULL, UA_BYTESTRING_NULL);
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP %u\t| Error registering the socket, closing",
+                       (unsigned)newsockfd);
+        UA_free(newrfd);
         UA_close(newsockfd);
+        return;
     }
 
-    /* Increase the count of registered fd */
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    tcm->fdCount++;
+    /* The socket has opened. Signal it to the application. The callback can
+     * switch out the context. So put it into a temp variable.  */
+    cm->connectionCallback(cm, (uintptr_t)newsockfd, &newrfd->context,
+                           UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
 }
 
 static void
 TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
     /* Get logging information */
     char hoststr[256];
     char portstr[16];
@@ -295,8 +323,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
             hoststr[0] = 0;
             portstr[0] = 0;
             UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                               UA_LOGCATEGORY_NETWORK,
+                UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                                "TCP\t| getnameinfo(...) could not resolve the hostname (%s)",
                                errno_str));
         }
@@ -306,16 +333,14 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                          UA_LOGCATEGORY_NETWORK,
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error opening the listen socket for "
                           "\"%s\" on port %s(%s)",
                           (unsigned)listenSocket, hoststr, portstr, errno_str));
         return;
     }
 
-    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
-                UA_LOGCATEGORY_NETWORK,
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| New server socket for \"%s\" on port %s",
                 (unsigned)listenSocket, hoststr, portstr);
 
@@ -327,8 +352,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     if(ai->ai_family == AF_INET6 &&
        UA_setsockopt(listenSocket, IPPROTO_IPV6, IPV6_V6ONLY,
                      (const char*)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                       UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
@@ -339,8 +363,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
     if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR,
                      (const char *)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                       UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not make the socket reusable, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
@@ -349,8 +372,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
 
     /* Set the socket non-blocking */
     if(TCP_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                       UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not set the socket non-blocking, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
@@ -359,8 +381,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
 
     /* Supress interrupts from the socket */
     if(TCP_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                       UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not disable SIGPIPE, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
@@ -371,8 +392,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     int ret = UA_bind(listenSocket, ai->ai_addr, (socklen_t)ai->ai_addrlen);
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                          UA_LOGCATEGORY_NETWORK,
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error binding the socket to the address (%s), closing",
                           (unsigned)listenSocket, errno_str));
         UA_close(listenSocket);
@@ -382,31 +402,40 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     /* Start listening */
     if(UA_listen(listenSocket, UA_MAXBACKLOG) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                          UA_LOGCATEGORY_NETWORK,
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error listening on the socket (%s), closing",
                           (unsigned)listenSocket, errno_str));
         UA_close(listenSocket);
         return;
     }
 
-    /* Register the socket */
-    UA_StatusCode res =
-        POSIX_EL_registerFD((POSIX_EL*)cm->eventSource.eventLoop, listenSocket,
-                            UA_POLLIN, (UA_FDCallback)TCP_listenSocketCallback,
-                            &cm->eventSource, NULL);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                       UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Error registering the socket in the "
-                       "EventLoop, closing", (unsigned)listenSocket);
+    /* Allocate the UA_RegisteredFD */
+    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
+        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
+    if(!newrfd) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP %u\t| Error allocating memory for the socket, closing",
+                       (unsigned)listenSocket);
         UA_close(listenSocket);
         return;
     }
 
-    /* Increase the registered fd count */
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    tcm->fdCount++;
+    newrfd->fd = listenSocket;
+    newrfd->es = &cm->eventSource;
+    newrfd->callback = (UA_FDCallback)TCP_listenSocketCallback;
+    newrfd->context = cm->initialConnectionContext;
+    newrfd->listenEvents = UA_FDEVENT_IN;
+
+    /* Register in the EventLoop */
+    UA_StatusCode res = TCPConnectionManager_register(tcm, newrfd);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP %u\t| Error registering the socket, closing",
+                       (unsigned)listenSocket);
+        UA_free(newrfd);
+        UA_close(listenSocket);
+        return;
+    }
 }
 
 static UA_StatusCode
@@ -460,16 +489,14 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 #else
     int res = UA_shutdown((UA_FD)connectionId, SD_BOTH);
 #endif
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(res != 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                            UA_LOGCATEGORY_NETWORK,
-                           "TCP %u\t| Error shutting down the socket (%s), closing",
+                           "TCP %u\t| Error shutting down the socket (%s)",
                            (unsigned)connectionId, errno_str));
-        retval = TCP_close(cm, (UA_FD)connectionId);
     }
-    return retval;
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
@@ -515,7 +542,17 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                 int poll_ret;
                 do {
                     poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
-                } while(poll_ret == 0 || (poll_ret < 0 && UA_ERRNO == UA_INTERRUPTED));
+                    if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED) {
+                        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+                           UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
+                                        UA_LOGCATEGORY_NETWORK,
+                                        "TCP %u\t| Send failed with error %s",
+                                        (unsigned)connectionId, errno_str));
+                        TCP_shutdownConnection(cm, connectionId);
+                        UA_ByteString_clear(buf);
+                        return UA_STATUSCODE_BADCONNECTIONCLOSED;
+                    }
+                } while(poll_ret <= 0);
             }
         } while(n < 0);
         nWritten += (size_t)n;
@@ -530,6 +567,8 @@ static UA_StatusCode
 TCP_openConnection(UA_ConnectionManager *cm,
                    size_t paramsSize, const UA_KeyValuePair *params,
                    void *context) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
     /* Get the connection parameters */
     char hostname[256];
     char portStr[16];
@@ -540,8 +579,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
                                  UA_QUALIFIEDNAME(0, "target-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
-        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP\t| Open TCP Connection: No target port defined, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -553,23 +591,20 @@ TCP_openConnection(UA_ConnectionManager *cm,
                                  UA_QUALIFIEDNAME(0, "target-hostname"),
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!host) {
-        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP\t| Open TCP Connection: No target hostname defined, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     if(host->length >= 256) {
-        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| Open TCP Connection: No target hostname too long, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     strncpy(hostname, (const char*)host->data, host->length);
     hostname[host->length] = 0;
 
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK, "TCP\t| Open a connection to \"%s\" on port %s",
-                 hostname, portStr);
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "TCP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
 
     /* Create the socket description from the connectString
      * TODO: Make this non-blocking */
@@ -580,8 +615,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     int error = getaddrinfo(hostname, portStr, &hints, &info);
     if(error != 0) {
         UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                       UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Lookup of %s failed with error %d - %s",
                        hostname, error, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -592,8 +626,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     if(newSock == UA_INVALID_FD) {
         freeaddrinfo(info);
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                           UA_LOGCATEGORY_NETWORK,
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                            "TCP\t| Could not create socket to connect to %s (%s)",
                            hostname, errno_str));
         return UA_STATUSCODE_BADDISCONNECT;
@@ -606,8 +639,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
     res |= TCP_setNoNagle(newSock);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                           UA_LOGCATEGORY_NETWORK,
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                            "TCP\t| Could not set socket options: %s", errno_str));
         freeaddrinfo(info);
         UA_close(newSock);
@@ -621,31 +653,42 @@ TCP_openConnection(UA_ConnectionManager *cm,
        UA_ERRNO != UA_INPROGRESS &&
        UA_ERRNO != UA_WOULDBLOCK) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                         UA_LOGCATEGORY_NETWORK,
-                         "TCP\t| Connecting the socket to %s failed (%s)",
-                         hostname, errno_str));
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                           "TCP\t| Connecting the socket to %s failed (%s)",
+                           hostname, errno_str));
         return UA_STATUSCODE_BADDISCONNECT;
     }
 
+    /* Allocate the UA_RegisteredFD */
+    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
+        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
+    if(!newrfd) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP %u\t| Error allocating memory for the socket, closing",
+                       (unsigned)newSock);
+        UA_close(newSock);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    newrfd->fd = newSock;
+    newrfd->es = &cm->eventSource;
+    newrfd->callback = (UA_FDCallback)TCP_connectionSocketCallback;
+    newrfd->context = context;
+    newrfd->listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
+                                            * connection is open */
+
     /* Register the fd to trigger when output is possible (the connection is open) */
-    res = POSIX_EL_registerFD((POSIX_EL*)cm->eventSource.eventLoop, newSock,
-                              UA_POLLOUT, (UA_FDCallback)TCP_connectionSocketCallback,
-                              &cm->eventSource, context);
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    res = TCPConnectionManager_register(tcm, newrfd);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| Registering the socket to connect to %s failed", hostname);
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP\t| Registering the socket to connect to %s failed", hostname);
         UA_close(newSock);
+        UA_free(newrfd);
         return res;
     }
 
-    /* Increase the count */
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    tcm->fdCount++;
-
-    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
-                UA_LOGCATEGORY_NETWORK,
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
@@ -655,10 +698,12 @@ TCP_openConnection(UA_ConnectionManager *cm,
 /* Asynchronously register the listenSocket */
 static UA_StatusCode
 TCP_eventSourceStart(UA_ConnectionManager *cm) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
     /* Check the state */
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
-        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_EVENTLOOP, "To start the TCP ConnectionManager, "
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "To start the TCP ConnectionManager, "
                      "it has to be registered in an EventLoop and not started");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -676,8 +721,7 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
                                  UA_QUALIFIEDNAME(0, "listen-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
-        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP\t| No port configured, don't accept connections");
         return UA_STATUSCODE_GOOD;
     }
@@ -693,13 +737,12 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
                            UA_QUALIFIEDNAME(0, "listen-hostnames"));
     if(!hostNames) {
         /* No hostnames configured */
-        UA_LOG_INFO(cm->eventSource.eventLoop->logger,
-                    UA_LOGCATEGORY_NETWORK, "TCP\t| Listening on all interfaces");
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP\t| Listening on all interfaces");
         TCP_registerListenSocketDomainName(cm, NULL, portno);
     } else if(hostNames->type != &UA_TYPES[UA_TYPES_STRING]) {
         /* Wrong datatype */
-           UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                        UA_LOGCATEGORY_EVENTLOOP,
+           UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                         "TCP\t| The hostnames have to be strings");
            return UA_STATUSCODE_BADINTERNALERROR;
     } else {
@@ -707,8 +750,8 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
         if(UA_Variant_isScalar(hostNames))
             interfaces = 1;
         if(interfaces == 0) {
-            UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                         UA_LOGCATEGORY_EVENTLOOP, "TCP\t| Listening on all interfaces");
+            UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                         "TCP\t| Listening on all interfaces");
             TCP_registerListenSocketDomainName(cm, NULL, portno);
         } else {
             /* Iterate over the configured hostnames */
@@ -738,28 +781,27 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_Boolean
-TCP_shutdownCallback(UA_EventSource *es, UA_FD fd,
-                     void *fdContext, void *iterateContext) {
-    TCP_shutdownConnection((UA_ConnectionManager*)es, (uintptr_t)fd);
-    return false;
-}
-
 static void
 TCP_eventSourceStop(UA_ConnectionManager *cm) {
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                 UA_LOGCATEGORY_NETWORK, "TCP\t| Shutting down the ConnectionManager");
 
     /* Shut down all registered fd. The cm is set to "stopped" when the last fd
      * is closed and deregistered in the callback from the EventLoop. */
-    POSIX_EL_iterateFD((POSIX_EL*)cm->eventSource.eventLoop,
-                       &cm->eventSource, TCP_shutdownCallback, NULL);
+    UA_RegisteredFD *rfd, *rfd_tmp;
+    LIST_FOREACH_SAFE(rfd, &tcm->fds, es_pointers, rfd_tmp) {
+        if(rfd->callback == (UA_FDCallback)TCP_listenSocketCallback) {
+            TCP_close(tcm, rfd); /* Listen sockets are immediately closed.
+                                  * shutdown is unsupported for them on win32 */
+        } else {
+            TCP_shutdownConnection(cm, (uintptr_t)rfd->fd);
+        }
+    }
     cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-
     /* Closed? */
-    if(tcm->fdCount == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING)
+    if(tcm->fdsSize == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING)
         cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
 
     UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dbac6e9585f..64035cafd1d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -69,6 +69,8 @@ endif()
 set(test_plugin_sources
     ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_clock.c
     ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index 2a8febbd1df..c7024e4e390 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -197,7 +197,7 @@ START_TEST(connectTCP) {
 
     UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    for(size_t i = 0; i < 10; i++) {
+    for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
@@ -212,7 +212,7 @@ START_TEST(connectTCP) {
     memcpy(snd.data, testMsg, strlen(testMsg));
     retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    for(size_t i = 0; i < 10; i++) {
+    for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
@@ -222,14 +222,14 @@ START_TEST(connectTCP) {
     retval = cm->closeConnection(cm, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(connCount, 2);
-    for(size_t i = 0; i < 10; i++) {
+    for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert_uint_eq(connCount, 0);
 
     /* Stop the EventLoop */
-    int max_stop_iteration_count = 1000;
+    int max_stop_iteration_count = 10;
     int iteration = 0;
     /* Stop the EventLoop */
     el->stop(el);
@@ -239,6 +239,7 @@ START_TEST(connectTCP) {
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
         iteration++;
     }
+    ck_assert(el->state == UA_EVENTLOOPSTATE_STOPPED);
     el->free(el);
     el = NULL;
 } END_TEST

From 0c1cc5aeb27e60d5d2ce0db48755ee796ab6394c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Dec 2021 23:45:22 +0100
Subject: [PATCH 0038/1963] feat(el): Add InterruptManager API and a POSIX
 signal implementation

---
 CMakeLists.txt                       |   1 +
 arch/eventloop_posix_interrupt.c     | 480 +++++++++++++++++++++++++++
 include/open62541/plugin/eventloop.h |  14 +-
 tests/CMakeLists.txt                 |   5 +
 tests/check_eventloop_interrupt.c    |  97 ++++++
 tests/fuzz/CMakeLists.txt            |   3 +
 6 files changed, 598 insertions(+), 2 deletions(-)
 create mode 100644 arch/eventloop_posix_interrupt.c
 create mode 100644 tests/check_eventloop_interrupt.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fb55eb3951..cc63c3eae3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,6 +125,7 @@ set(ua_architecture_sources ${ua_architecture_sources}
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
 )
 
 set(ua_architecture_headers ${ua_architecture_headers}
diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
new file mode 100644
index 00000000000..1f19e3b2aef
--- /dev/null
+++ b/arch/eventloop_posix_interrupt.c
@@ -0,0 +1,480 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ */
+
+#include "eventloop_posix.h"
+#include <signal.h>
+
+/* Different implementation approaches:
+ * - Linux: Use signalfd
+ * - Other: Use the self-pipe trick (http://cr.yp.to/docs/selfpipe.html) */
+
+struct UA_RegisteredSignal;
+typedef struct UA_RegisteredSignal UA_RegisteredSignal;
+
+struct UA_RegisteredSignal {
+    UA_RegisteredFD rfd;
+
+    LIST_ENTRY(UA_RegisteredSignal) signalsEntry; /* List in the InterruptManager */
+    TAILQ_ENTRY(UA_RegisteredSignal) triggeredEntry;
+
+    UA_Boolean active; /* Signals are only active when the EventLoop is started */
+    UA_Boolean triggered;
+
+    int signal; /* POSIX identifier of the interrupt signal */
+    UA_InterruptCallback signalCallback;
+};
+
+typedef struct {
+    UA_InterruptManager im;
+    LIST_HEAD(, UA_RegisteredSignal) signals;
+#ifndef UA_HAVE_EPOLL
+    UA_RegisteredFD readFD;
+    UA_FD writeFD;
+    TAILQ_HEAD(, UA_RegisteredSignal) triggered;
+#endif
+} POSIXInterruptManager;
+
+#ifndef UA_HAVE_EPOLL
+/* On non-linux systems we can have at most one interrupt manager */
+static POSIXInterruptManager *singletonIM = NULL;
+#endif
+
+/* The following methods have to be implemented for epoll/self-pipe each. */
+static void activateSignal(UA_RegisteredSignal *rs);
+static void deactivateSignal(UA_RegisteredSignal *rs);
+
+#ifdef UA_HAVE_EPOLL
+#include <sys/signalfd.h>
+
+static void
+handlePOSIXInterruptEvent(UA_EventSource *es, UA_RegisteredFD *rfd, short event) {
+    UA_RegisteredSignal *rs = (UA_RegisteredSignal*)rfd;
+    struct signalfd_siginfo fdsi;
+    ssize_t s = read(rfd->fd, &fdsi, sizeof(fdsi));
+    if(s < (ssize_t)sizeof(fdsi)) {
+        /* A problem occured */
+        deactivateSignal(rs);
+        return;
+    }
+
+    /* Signal received */
+    UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Interrupt %u\t| Received a signal %u",
+                 (unsigned)rfd->fd, fdsi.ssi_signo);
+
+    rs->signalCallback((UA_InterruptManager *)es,
+                       (uintptr_t)rfd->fd, rfd->context, 0, NULL);
+}
+
+static void
+activateSignal(UA_RegisteredSignal *rs) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)rs->rfd.es->eventLoop;
+    if(rs->active)
+        return;
+
+    /* Block the normal signal handling */
+    sigset_t mask;
+    sigemptyset(&mask);
+    sigaddset(&mask, rs->signal);
+    int res2 = sigprocmask(SIG_BLOCK, &mask, NULL);
+    if(res2 == -1) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                           "Interrupt\t| Could not block the default "
+                           "signal handling with an error: %s",
+                           errno_str));
+        return;
+    }
+
+    /* Create the fd */
+    UA_FD newfd = signalfd(-1, &mask, 0);
+    if(newfd < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                           "Interrupt\t|Could not create a signal file "
+                           "description with error: %s",
+                           errno_str));
+        sigprocmask(SIG_UNBLOCK, &mask, NULL); /* restore signal */
+        return;
+    }
+
+    rs->rfd.fd = newfd;
+    rs->rfd.callback = handlePOSIXInterruptEvent;
+    rs->rfd.listenEvents = UA_FDEVENT_IN;
+
+    /* Register the fd in the EventLoop */
+    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, &rs->rfd);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                       "Interrupt\t|Could not register the a signal file "
+                       "description in the EventLoop");
+        UA_close(newfd);
+        sigprocmask(SIG_UNBLOCK, &mask, NULL); /* restore signal */
+        return;
+    }
+
+    rs->active = true;
+}
+
+static void
+deactivateSignal(UA_RegisteredSignal *rs) {
+    /* Only dectivate if active */
+    if(!rs->active)
+        return;
+    rs->active = false;
+    
+    /* Stop receiving the signal on the FD */
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)rs->rfd.es->eventLoop;
+    UA_EventLoopPOSIX_deregisterFD(el, &rs->rfd);
+
+    /* Unblock the signal */
+    sigset_t mask;
+    sigemptyset(&mask);
+    sigaddset(&mask, (int)rs->signal);
+    sigprocmask(SIG_UNBLOCK, &mask, NULL);
+
+    /* Clean up locally */
+    UA_close(rs->rfd.fd);
+}
+
+#else /* !UA_HAVE_EPOLL */
+
+static void
+triggerPOSIXInterruptEvent(int sig) {
+    UA_assert(singletonIM != NULL);
+
+    /* Don't call the interrupt callback right now.
+     * Instead, add to the triggered list and call from the EventLoop. */
+    UA_RegisteredSignal *rs;
+    LIST_FOREACH(rs, &singletonIM->signals, signalsEntry) {
+        if(rs->signal == sig) {
+            if(rs->triggered)
+                break; /* A signal can be only once in the triggered list -> is there
+                          already */
+
+            TAILQ_INSERT_TAIL(&singletonIM->triggered, rs, triggeredEntry);
+            rs->triggered = true;
+            break;
+        }
+    }
+
+#ifdef _WIN32
+    /* On WIN32 we have to re-arm the signal or it will go back to SIG_DFL */
+    signal(sig, triggerPOSIXInterruptEvent);
+#endif
+
+    /* Trigger the FD in the EventLoop for the self-pipe trick */
+#ifdef _WIN32
+    int err = send(singletonIM->writeFD, ".", 1, 0);
+#else
+    ssize_t err = write(singletonIM->writeFD, ".", 1);
+#endif
+    if(err <= 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(singletonIM->im.eventSource.eventLoop->logger,
+                           UA_LOGCATEGORY_EVENTLOOP,
+                           "Error signaling the interrupt on FD %u to the EventLoop (%s)",
+                           (unsigned)singletonIM->writeFD, errno_str));
+    }
+}
+
+static void
+activateSignal(UA_RegisteredSignal *rs) {
+    UA_assert(singletonIM != NULL);
+
+    /* Already active? */
+    if(rs->active)
+        return;
+
+    /* Register the signal on the OS level */
+    void (*prev)(int);
+    prev = signal(rs->signal, triggerPOSIXInterruptEvent);
+    if(prev == SIG_ERR) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(singletonIM->im.eventSource.eventLoop->logger,
+                           UA_LOGCATEGORY_EVENTLOOP,
+                           "Error registering the signal: %s", errno_str));
+        return;
+    }
+
+    rs->active = true;
+}
+
+static void
+deactivateSignal(UA_RegisteredSignal *rs) {
+    /* Only dectivate if active */
+    if(!rs->active)
+        return;
+    rs->active = false;
+
+    /* Stop receiving the signal */
+    signal(rs->signal, SIG_DFL);
+
+    /* Clean up locally */
+    if(rs->triggered) {
+        TAILQ_REMOVE(&singletonIM->triggered, rs, triggeredEntry);
+        rs->triggered = false;
+    }
+}
+
+/* Execute all triggered interrupts via the self-pipe trick from within the EventLoop */
+static void
+executeTriggeredPOSIXInterrupts(UA_EventSource *es, UA_RegisteredFD *rfd, short event) {
+    /* Re-arm the socket for the next signal by reading from it */
+    char buf[128];
+#ifdef _WIN32
+    recv(rfd->fd, buf, 128, 0); /* ignore the result */
+#else
+    ssize_t i;
+    do {
+        i = read(rfd->fd, buf, 128);
+    } while(i > 0);
+#endif
+
+    UA_RegisteredSignal *rs, *rs_tmp;
+    TAILQ_FOREACH_SAFE(rs, &singletonIM->triggered, triggeredEntry, rs_tmp) {
+        TAILQ_REMOVE(&singletonIM->triggered, rs, triggeredEntry);
+        rs->triggered = false;
+        rs->signalCallback(&singletonIM->im, (uintptr_t)rs->signal,
+                           rs->rfd.context, 0, NULL);
+    }
+}
+
+#endif /* !UA_HAVE_EPOLL */
+
+static UA_StatusCode
+registerPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle,
+                       size_t paramsSize, const UA_KeyValuePair *params,
+                       UA_InterruptCallback callback, void *interruptContext) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)im->eventSource.eventLoop;
+    if(paramsSize > 0) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "Interrupt\t| Supplied parameters invalid for the "
+                     "POSIX InterruptManager");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Was the signal already registered? */
+    POSIXInterruptManager *pim = (POSIXInterruptManager *)im;
+    UA_RegisteredSignal *rs;
+    LIST_FOREACH(rs, &pim->signals, signalsEntry) {
+        if(rs->signal == (int)interruptHandle) {
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                           "Interrupt\t| Signal %u already registered",
+                           (unsigned)interruptHandle);
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+
+    /* Create and populate the new context object */
+    rs = (UA_RegisteredSignal *)UA_calloc(1, sizeof(UA_RegisteredSignal));
+    if(!rs)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    rs->signal = (int)interruptHandle;
+    rs->signalCallback = callback;
+    rs->rfd.es = &im->eventSource;
+    rs->rfd.context = interruptContext;
+
+    /* Add to the InterruptManager */
+    LIST_INSERT_HEAD(&pim->signals, rs, signalsEntry);
+
+    /* Activate if we are already running */
+    if(pim->im.eventSource.state == UA_EVENTSOURCESTATE_STARTED)
+        activateSignal(rs);
+    
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+deregisterPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle) {
+    POSIXInterruptManager *pim = (POSIXInterruptManager *)im;
+    UA_RegisteredSignal *rs;
+    LIST_FOREACH(rs, &pim->signals, signalsEntry) {
+        if(rs->rfd.fd == (UA_FD)interruptHandle) {
+            deactivateSignal(rs);
+            LIST_REMOVE(rs, signalsEntry);
+            UA_free(rs);
+            return;
+        }
+    }
+}
+
+#ifdef _WIN32
+/* Windows has no pipes. Use a local TCP connection for the self-pipe trick.
+ * https://stackoverflow.com/a/3333565 */
+static int
+pair(SOCKET fds[2]) {
+    struct sockaddr_in inaddr;
+    struct sockaddr addr;
+    SOCKET lst = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    memset(&inaddr, 0, sizeof(inaddr));
+    memset(&addr, 0, sizeof(addr));
+    inaddr.sin_family = AF_INET;
+    inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    inaddr.sin_port = 0;
+    int yes = 1;
+    setsockopt(lst, SOL_SOCKET, SO_REUSEADDR, (char *)&yes, sizeof(yes));
+    bind(lst, (struct sockaddr *)&inaddr, sizeof(inaddr));
+    listen(lst, 1);
+    int len = sizeof(inaddr);
+    getsockname(lst, &addr, &len);
+    fds[0] = socket(AF_INET, SOCK_STREAM, 0);
+    int err = connect(fds[0], &addr, len);
+    fds[1] = accept(lst, 0, 0);
+    closesocket(lst);
+    return err;
+}
+#endif
+
+static UA_StatusCode
+startPOSIXInterruptManager(UA_EventSource *es) {
+    /* Check the state */
+    if(es->state != UA_EVENTSOURCESTATE_STOPPED) {
+        UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "Interrupt\t| To start the InterruptManager, "
+                     "it has to be registered in an EventLoop and not started");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+#ifndef UA_HAVE_EPOLL
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    /* Set the global pointer */
+    if(singletonIM != NULL) {
+        UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "Interrupt\t| There can be at most one active "
+                     "InterruptManager at a time");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+#endif
+
+    POSIXInterruptManager *pim = (POSIXInterruptManager *)es;
+    UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Interrupt\t| Starting the InterruptManager");
+
+#ifndef UA_HAVE_EPOLL
+    /* Create pipe for self-signaling */
+    UA_FD pipefd[2];
+#ifdef _WIN32
+    int err = pair(pipefd);
+#else
+    int err = pipe2(pipefd, O_NONBLOCK);
+#endif
+    if(err != 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "Interrupt\t| Could not open the pipe for "
+                          "self-signaling (%s)", errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Interrupt\t| Socket pair for the self-pipe: %u,%u",
+                 (unsigned)pipefd[0], (unsigned)pipefd[1]);
+
+    pim->writeFD = pipefd[1];
+    pim->readFD.fd = pipefd[0];
+    pim->readFD.context = pim;
+    pim->readFD.listenEvents = UA_FDEVENT_IN;
+    pim->readFD.callback = executeTriggeredPOSIXInterrupts;
+    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, &pim->readFD);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "Interrupt\t| Could not register the InterruptManager socket");
+        UA_close(pipefd[0]);
+        UA_close(pipefd[1]);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Register the singleton pointer */
+    singletonIM = pim;
+#endif
+
+    /* Activate the registered signal handlers */
+    UA_RegisteredSignal *rs;
+    LIST_FOREACH(rs, &pim->signals, signalsEntry) {
+        activateSignal(rs);
+    }
+
+    /* Set the EventSource to the started state */
+    es->state = UA_EVENTSOURCESTATE_STARTED;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+stopPOSIXInterruptManager(UA_EventSource *es) {
+    if(es->state != UA_EVENTSOURCESTATE_STARTED)
+        return;
+
+    UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Interrupt\t| Stopping the InterruptManager");
+
+    /* Close all registered signals */
+    POSIXInterruptManager *pim = (POSIXInterruptManager *)es;
+    UA_RegisteredSignal *rs;
+    LIST_FOREACH(rs, &pim->signals, signalsEntry) {
+        deactivateSignal(rs);
+    }
+
+#ifndef UA_HAVE_EPOLL
+    /* Close the FD for the self-pipe trick */
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    UA_EventLoopPOSIX_deregisterFD(el, &pim->readFD);
+    UA_close(pim->readFD.fd);
+    UA_close(pim->writeFD);
+
+    /* Reset the global pointer */
+    singletonIM = NULL;
+#endif
+
+    /* Immediately set to stopped */
+    es->state = UA_EVENTSOURCESTATE_STOPPED;
+}
+
+static UA_StatusCode
+freePOSIXInterruptmanager(UA_EventSource *es) {
+    if(es->state >= UA_EVENTSOURCESTATE_STARTING) {
+        UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "Interrupt\t| The EventSource must be stopped "
+                     "before it can be deleted");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    POSIXInterruptManager *pim = (POSIXInterruptManager *)es;
+    UA_RegisteredSignal *rs, *rs_tmp;
+    LIST_FOREACH_SAFE(rs, &pim->signals, signalsEntry, rs_tmp) {
+        deactivateSignal(rs);
+        LIST_REMOVE(rs, signalsEntry);
+        UA_free(rs);
+    }
+
+    UA_String_clear(&es->name);
+    UA_free(es);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_InterruptManager *
+UA_InterruptManager_new_POSIX(const UA_String eventSourceName) {
+    POSIXInterruptManager *pim =
+        (POSIXInterruptManager *)UA_calloc(1, sizeof(POSIXInterruptManager));
+    if(!pim)
+        return NULL;
+
+    LIST_INIT(&pim->signals);
+#ifndef UA_HAVE_EPOLL
+    TAILQ_INIT(&pim->triggered);
+#endif
+
+    UA_InterruptManager *im = &pim->im;
+    im->eventSource.eventSourceType = UA_EVENTSOURCETYPE_INTERRUPTMANAGER;
+    UA_String_copy(&eventSourceName, &im->eventSource.name);
+    im->eventSource.start = startPOSIXInterruptManager;
+    im->eventSource.stop = stopPOSIXInterruptManager;
+    im->eventSource.free = freePOSIXInterruptmanager;
+    im->registerInterrupt = registerPOSIXInterrupt;
+    im->deregisterInterrupt = deregisterPOSIXInterrupt;
+    return im;
+}
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 4f5a5642bb2..82f91cd3c7c 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -38,7 +38,7 @@ typedef struct UA_InterruptManager UA_InterruptManager;
  * these. Hence, several applications can share an EventLoop.
  *
  * The EventLoop and the ConnectionManager implementation is
- * architecture-specific. The goal is to have a single call to "select" (epoll,
+ * architecture-specific. The goal is to have a single call to "poll" (epoll,
  * kqueue, ...) in the EventLoop that covers all ConnectionManagers. Hence the
  * EventLoop plugin implementation must know implementation details of the
  * ConnectionManager implementations. So the EventLoop can extract socket
@@ -166,7 +166,8 @@ typedef enum {
  * looked up via UA_EventLoop_findEventSource). */
 typedef enum {
     UA_EVENTSOURCETYPE_ANY = 0,
-    UA_EVENTSOURCETYPE_CONNECTIONMANAGER
+    UA_EVENTSOURCETYPE_CONNECTIONMANAGER,
+    UA_EVENTSOURCETYPE_INTERRUPTMANAGER
 } UA_EventSourceType;
 
 struct UA_EventSource {
@@ -391,6 +392,15 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
 
+/**
+ * Signal Interrupt Manager
+ * ~~~~~~~~~~~~~~~~~~~~~~~~
+ * Create an instance of the interrupt manager that handles POSX signals. This
+ * interrupt manager takes the numerical interrupt identifiers from <signal.h>
+ * for the interruptHandle. */
+UA_EXPORT UA_InterruptManager *
+UA_InterruptManager_new_POSIX(const UA_String eventSourceName);
+
 #endif /* defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32) */
 
 _UA_END_DECLS
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 64035cafd1d..6a3811a53bf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -72,6 +72,7 @@ set(test_plugin_sources
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_clock.c
     ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
     ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c
@@ -272,6 +273,10 @@ add_executable(check_eventloop_tcp check_eventloop_tcp.c $<TARGET_OBJECTS:open62
 target_link_libraries(check_eventloop_tcp ${LIBS})
 add_test_valgrind(eventloop_tcp ${TESTS_BINARY_DIR}/check_eventloop_tcp)
 
+add_executable(check_eventloop_interrupt check_eventloop_interrupt.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+target_link_libraries(check_eventloop_interrupt ${LIBS})
+add_test_valgrind(eventloop_interrupt ${TESTS_BINARY_DIR}/check_eventloop_interrupt)
+
 # Test Server
 
 add_executable(check_accesscontrol server/check_accesscontrol.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
diff --git a/tests/check_eventloop_interrupt.c b/tests/check_eventloop_interrupt.c
new file mode 100644
index 00000000000..945cf1fbf51
--- /dev/null
+++ b/tests/check_eventloop_interrupt.c
@@ -0,0 +1,97 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/plugin/eventloop.h>
+#include <open62541/plugin/log_stdout.h>
+#include "open62541/types.h"
+#include "open62541/types_generated.h"
+
+#include "testing_clock.h"
+
+#include <signal.h>
+#include <check.h>
+
+#ifndef _WIN32
+#define TESTSIG SIGUSR1
+#else
+#define TESTSIG SIGINT
+#endif
+
+unsigned counter = 0;
+
+static void
+interruptCallback(UA_InterruptManager *im,
+                  uintptr_t interruptHandle, void *interruptContext,
+                  size_t instanceInfosSize, const UA_KeyValuePair *instanceInfos) {
+    counter++;
+}
+
+START_TEST(catchInterrupt) {
+    UA_EventLoop *el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    UA_InterruptManager *im = UA_InterruptManager_new_POSIX(UA_STRING("im1"));
+    el->registerEventSource(el, &im->eventSource);
+
+    im->registerInterrupt(im, TESTSIG, 0, NULL, interruptCallback, NULL);
+    el->start(el);
+
+    /* Send signal to self*/
+    raise(TESTSIG);
+    el->run(el, 0);
+    ck_assert_uint_eq(counter, 1);
+
+    /* Send signal to self*/
+    raise(TESTSIG);
+    el->run(el, 0);
+    ck_assert_uint_eq(counter, 2);
+
+    /* Stop the EventLoop */
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    el->free(el);
+    el = NULL;
+} END_TEST
+
+START_TEST(registerDuplicate) {
+    UA_EventLoop *el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    UA_InterruptManager *im = UA_InterruptManager_new_POSIX(UA_STRING("im1"));
+    el->registerEventSource(el, &im->eventSource);
+
+    el->start(el);
+
+    UA_StatusCode res =
+        im->registerInterrupt(im, TESTSIG, 0, NULL, interruptCallback, NULL);
+    ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+
+    /* Registering the same signal twice must fail */
+    res = im->registerInterrupt(im, TESTSIG, 0, NULL, interruptCallback, NULL);
+    ck_assert_uint_ne(res, UA_STATUSCODE_GOOD);
+
+    /* Stop the EventLoop */
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    el->free(el);
+    el = NULL;
+} END_TEST
+
+int main(void) {
+    Suite *s  = suite_create("Test EventLoop Interrupts");
+    TCase *tc = tcase_create("test cases");
+    tcase_add_test(tc, catchInterrupt);
+    tcase_add_test(tc, registerDuplicate);
+    suite_add_tcase(s, tc);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all (sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 2b990250065..4a914101c0b 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -63,7 +63,10 @@ link_libraries("-fsanitize=fuzzer")
 # Use different plugins for testing
 set(fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_clock.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_networklayers.c
     ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c

From 74e441ef83101c18f03e4a172cd84739923bd9fa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 3 Jan 2022 01:50:12 +0100
Subject: [PATCH 0039/1963] fix(el): Fix unlocking with mt enabled

---
 arch/eventloop_posix.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index d61eef1d62a..9fffeca7b58 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -172,6 +172,7 @@ UA_EventLoopPOSIX_stop(UA_EventLoopPOSIX *el) {
     if(el->eventLoop.state != UA_EVENTLOOPSTATE_STARTED) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                        "The EventLoop is not running, cannot be stopped");
+        UA_UNLOCK(&el->elMutex);
         return;
     }
 
@@ -193,6 +194,7 @@ UA_EventLoopPOSIX_stop(UA_EventLoopPOSIX *el) {
     *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
         UA_EVENTLOOPSTATE_STOPPING;
     checkClosed(el);
+
     UA_UNLOCK(&el->elMutex);
 }
 

From a0a5fe2433b83931a22b10f1c261cc881bbba57d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 1 Jan 2022 23:30:21 +0100
Subject: [PATCH 0040/1963] fix(build): Improve finding the check library on
 win32

---
 tools/cmake/FindCheck.cmake | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tools/cmake/FindCheck.cmake b/tools/cmake/FindCheck.cmake
index 5220315bcde..3eccef70061 100644
--- a/tools/cmake/FindCheck.cmake
+++ b/tools/cmake/FindCheck.cmake
@@ -16,11 +16,17 @@
 #  BSD license.
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-
-find_package(PkgConfig REQUIRED)
-
-# Take care about check.pc settings
-PKG_SEARCH_MODULE( CHECK check )
+if(WIN32)
+  # Manually define CHECK_INSTALL_DIR if vcpkg is not used
+  if(DEFINED VCPKG_INSTALLED_DIR)
+    set(CHECK_INSTALL_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+    # find_package(check CONFIG REQUIRED)
+  endif()
+else()
+    # Take care about check.pc settings
+    find_package(PkgConfig REQUIRED)
+    PKG_SEARCH_MODULE( CHECK check )
+endif()
 
 # Look for CHECK include dir and libraries
 IF( NOT CHECK_FOUND )

From f00bcac6dfbe9ca8a45aa765b3b78ac3f02e08a3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 3 Jan 2022 22:27:40 +0100
Subject: [PATCH 0041/1963] feat(el): Use a pre-allocated receive buffer for
 the TCP ConnectionManager

---
 arch/eventloop_posix_tcp.c | 95 +++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 42 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index b8176ba2782..06ce9c7a604 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -24,7 +24,8 @@ typedef struct {
     size_t fdsSize;
     LIST_HEAD(, UA_RegisteredFD) fds;
 
-    size_t recvBufferSize;
+    UA_ByteString rxBuffer; /* Reuse the receiver buffer. The size is configured
+                             * via the recv-bufsize parameter.*/
 } TCPConnectionManager;
 
 static UA_StatusCode
@@ -97,6 +98,19 @@ TCP_setNoNagle(UA_FD sockfd) {
     return UA_STATUSCODE_GOOD;
 }
 
+/* Test if the ConnectionManager can be stopped */
+static void
+TCP_checkStopped(TCPConnectionManager *tcm) {
+    if(tcm->fdsSize == 0 && tcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
+        UA_LOG_DEBUG(tcm->cm.eventSource.eventLoop->logger,
+                     UA_LOGCATEGORY_NETWORK,
+                     "TCP\t| All sockets closed, the EventLoop has stopped");
+
+        UA_ByteString_clear(&tcm->rxBuffer);
+        tcm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+    }
+}
+
 static UA_StatusCode
 TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
@@ -121,13 +135,9 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     /* Free the rfd */
     UA_free(rfd);
 
-    /* Stopped? */
-    if(tcm->fdsSize == 0 && tcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
-        UA_LOG_DEBUG(tcm->cm.eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| All sockets closed, the EventLoop has stopped");
-        tcm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
-    }
+    /* Stop if the tcm is stopping and this was the last open socket */
+    TCP_checkStopped(tcm);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -135,13 +145,11 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
 static void
 TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                              short event) {
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Activity on the socket", (unsigned)rfd->fd);
 
     /* Write-Event, a new connection has opened.  */
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(event == UA_FDEVENT_OUT) {
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| Opening a new connection", (unsigned)rfd->fd);
@@ -159,11 +167,9 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Allocate receive buffer", (unsigned)rfd->fd);
 
-    /* Allocate the receive-buffer */
-    UA_ByteString response;
-    res = UA_ByteString_allocBuffer(&response, tcm->recvBufferSize);
-    if(res != UA_STATUSCODE_GOOD)
-        return; /* Retry in the next iteration */
+    /* Use the already allocated receive-buffer */
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_ByteString response = tcm->rxBuffer;
 
     /* Receive */
 #ifndef _WIN32
@@ -172,33 +178,37 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     int ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
 #endif
 
-    if(ret > 0) {
-        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP %u\t| Received message of size %u",
-                     (unsigned)rfd->fd, (unsigned)ret);
+    /* Receive has failed */
+    if(ret <= 0) {
+        if(UA_ERRNO == UA_INTERRUPTED ||
+           UA_ERRNO == UA_WOULDBLOCK ||
+           UA_ERRNO == UA_AGAIN)
+            return; /* Temporary error on an non-blocking socket */
 
-        /* Callback to the application layer */
-        response.length = (size_t)ret; /* Set the length of the received buffer */
-        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
-                               UA_STATUSCODE_GOOD, 0, NULL, response);
-    } else if(UA_ERRNO != UA_INTERRUPTED &&
-              UA_ERRNO != UA_WOULDBLOCK &&
-              UA_ERRNO != UA_AGAIN) {
-        /* Orderly shutdown of the connection. Signal to the application and
-         * then close the connection. We end up in this path after shutdown was
+        /* Orderly shutdown of the socket. Signal to the application and then
+         * close the socket. We end up in this code-path after shutdown was
          * called on the socket. Here, we then are in the next EventLoop
          * iteration and the socket is known to be unused. */
+
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP %u\t| recv signaled closed connection", (unsigned)rfd->fd);
+                     "TCP %u\t| recv signaled the socket was shutdown",
+                     (unsigned)rfd->fd);
 
-        /* Close the connection if not a temporary error on a nonblocking socket */
         cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
                                UA_STATUSCODE_BADCONNECTIONCLOSED,
                                0, NULL, UA_BYTESTRING_NULL);
         TCP_close(tcm, rfd);
+        return;
     }
 
-    UA_ByteString_clear(&response);
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "TCP %u\t| Received message of size %u",
+                 (unsigned)rfd->fd, (unsigned)ret);
+
+    /* Callback to the application layer */
+    response.length = (size_t)ret; /* Set the length of the received buffer */
+    cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
+                           UA_STATUSCODE_GOOD, 0, NULL, response);
 }
 
 /* Gets called when a new connection opens or if the listenSocket is closed */
@@ -768,13 +778,18 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
     }
 
     /* The receive buffersize was configured? */
-    const UA_UInt16 *bufSize = (const UA_UInt16*)
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_UInt16 rxBufSize = 2u << 14; /* The default is 16kb */
+    const UA_UInt16 *configRxBufSize = (const UA_UInt16*)
         UA_KeyValueMap_getScalar(cm->eventSource.params,
                                  cm->eventSource.paramsSize,
                                  UA_QUALIFIEDNAME(0, "recv-bufsize"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
-    if(bufSize)
-        ((TCPConnectionManager*)cm)->recvBufferSize = *bufSize;
+    if(configRxBufSize)
+        rxBufSize = *configRxBufSize;
+    UA_StatusCode res = UA_ByteString_allocBuffer(&tcm->rxBuffer, rxBufSize);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
     
     /* Set the EventSource to the started state */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
@@ -787,6 +802,8 @@ TCP_eventSourceStop(UA_ConnectionManager *cm) {
     UA_LOG_INFO(cm->eventSource.eventLoop->logger,
                 UA_LOGCATEGORY_NETWORK, "TCP\t| Shutting down the ConnectionManager");
 
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
+
     /* Shut down all registered fd. The cm is set to "stopped" when the last fd
      * is closed and deregistered in the callback from the EventLoop. */
     UA_RegisteredFD *rfd, *rfd_tmp;
@@ -798,14 +815,9 @@ TCP_eventSourceStop(UA_ConnectionManager *cm) {
             TCP_shutdownConnection(cm, (uintptr_t)rfd->fd);
         }
     }
-    cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
-    /* Closed? */
-    if(tcm->fdsSize == 0 && cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING)
-        cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
-
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK, "TCP\t| EventSource successfully stopped");
+    /* All sockets closed? Otherwise iterate some more. */
+    TCP_checkStopped(tcm);
 }
 
 static UA_StatusCode
@@ -848,6 +860,5 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName) {
     cm->cm.freeNetworkBuffer = TCP_freeNetworkBuffer;
     cm->cm.sendWithConnection = TCP_sendWithConnection;
     cm->cm.closeConnection = TCP_shutdownConnection;
-    cm->recvBufferSize = 1 << 14; /* TODO: Read from the config */
     return &cm->cm;
 }

From c97fac6a3aaebe449e8bb11172fba9a312693130 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 3 Jan 2022 22:44:13 +0100
Subject: [PATCH 0042/1963] refactor(el): Simplify the TCP connection
 parameters

---
 arch/eventloop_posix_tcp.c           | 10 +++++-----
 include/open62541/plugin/eventloop.h |  5 ++---
 tests/check_eventloop_tcp.c          |  8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 06ce9c7a604..d021382493e 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -586,11 +586,11 @@ TCP_openConnection(UA_ConnectionManager *cm,
     /* Prepare the port parameter as a string */
     const UA_UInt16 *port = (const UA_UInt16*)
         UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "target-port"),
+                                 UA_QUALIFIEDNAME(0, "port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| Open TCP Connection: No target port defined, aborting");
+                     "TCP\t| Open TCP Connection: No port defined, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     UA_snprintf(portStr, 6, "%d", *port);
@@ -598,16 +598,16 @@ TCP_openConnection(UA_ConnectionManager *cm,
     /* Prepare the hostname string */
     const UA_String *host = (const UA_String*)
         UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "target-hostname"),
+                                 UA_QUALIFIEDNAME(0, "hostname"),
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!host) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| Open TCP Connection: No target hostname defined, aborting");
+                     "TCP\t| Open TCP Connection: No hostname defined, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     if(host->length >= 256) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "TCP\t| Open TCP Connection: No target hostname too long, aborting");
+                     "TCP\t| Open TCP Connection: Hostname too long, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     strncpy(hostname, (const char*)host->data, host->length);
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 82f91cd3c7c..97f49fd7edc 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -383,9 +383,8 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  *                            messages (default 16kB).
  *
  * Open Connection Parameters:
- * - 0:target-hostname [string]: Hostname (or IPv4/IPv6 address) of the target
- *                               (required).
- * - 0:target-port [uint16]: Port of the target host (required).
+ * - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
+ * - 0:port [uint16]: Port of the target host (required).
  *
  * Send Parameters:
  * No additional parameters for sending over an established TCP socket defined. */
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index c7024e4e390..fd421c7836d 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -117,9 +117,9 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
 
     UA_String targetHost = UA_STRING("localhost");
     UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "target-port");
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
     params[0].value = portVar;
-    params[1].key = UA_QUALIFIEDNAME(0, "target-hostname");
+    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
     UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
@@ -190,9 +190,9 @@ START_TEST(connectTCP) {
 
     UA_String targetHost = UA_STRING("localhost");
     UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "target-port");
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
     params[0].value = portVar;
-    params[1].key = UA_QUALIFIEDNAME(0, "target-hostname");
+    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
     UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);

From 9893e54b4488a40cf66f3654aba991ea83db27f7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 3 Jan 2022 23:01:30 +0100
Subject: [PATCH 0043/1963] feat(el): Forward the remote hostname to the
 application on first connect

---
 arch/eventloop_posix_tcp.c           | 13 ++++++++-----
 include/open62541/plugin/eventloop.h |  5 +++++
 tests/check_eventloop_tcp.c          | 12 +++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index d021382493e..3be99b4ec86 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -241,7 +241,6 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     }
 
     /* Log the name of the remote host */
-#if UA_LOGLEVEL <= 300
     char hoststr[256];
     int get_res = UA_getnameinfo((struct sockaddr *)&remote, sizeof(remote),
                                  hoststr, sizeof(hoststr), NULL, 0, 0);
@@ -261,7 +260,6 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                 UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| Connection opened from \"%s\" via the server socket %u",
                 (unsigned)newsockfd, hoststr, (unsigned)rfd->fd);
-#endif
 
     /* Configure the new socket */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
@@ -307,10 +305,15 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         return;
     }
 
-    /* The socket has opened. Signal it to the application. The callback can
-     * switch out the context. So put it into a temp variable.  */
+    /* Forward the remote hostname to the application */
+    UA_KeyValuePair kvp;
+    kvp.key = UA_QUALIFIEDNAME(0, "remote-hostname");
+    UA_String hostName = UA_STRING(hoststr);
+    UA_Variant_setScalar(&kvp.value, &hostName, &UA_TYPES[UA_TYPES_STRING]);
+
+    /* The socket has opened. Signal it to the application. */
     cm->connectionCallback(cm, (uintptr_t)newsockfd, &newrfd->context,
-                           UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
+                           UA_STATUSCODE_GOOD, 1, &kvp, UA_BYTESTRING_NULL);
 }
 
 static void
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 97f49fd7edc..51249fb2dfc 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -386,6 +386,11 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  * - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
  * - 0:port [uint16]: Port of the target host (required).
  *
+ * Connection Callback Paramters:
+ * - 0:remote-hostname [string]: When a new connection is opened by listening on
+ *                               a port, the first callback contains the remote
+ *                               hostname parameter.
+ *
  * Send Parameters:
  * No additional parameters for sending over an established TCP socket defined. */
 UA_EXPORT UA_ConnectionManager *
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index fd421c7836d..f770531a9bc 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -63,8 +63,18 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    UA_ByteString msg) {
     if(*connectionContext != NULL)
         clientId = connectionId;
-    if(msg.length == 0 && status == UA_STATUSCODE_GOOD)
+    if(msg.length == 0 && status == UA_STATUSCODE_GOOD) {
         connCount++;
+
+        /* The remote-hostname is set during the first callback */
+        if(paramsSize > 0) {
+            const void *hn =
+                UA_KeyValueMap_getScalar(params, paramsSize,
+                                         UA_QUALIFIEDNAME(0, "remote-hostname"),
+                                         &UA_TYPES[UA_TYPES_STRING]);
+            ck_assert(hn != NULL);
+        }
+    }
     if(status != UA_STATUSCODE_GOOD) {
         connCount--;
     }

From a8191ecab0091d3e8397a40668ea2ce7aece880e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 4 Jan 2022 23:13:49 +0100
Subject: [PATCH 0044/1963] feat(el): EventLoops manage their own time domain

---
 arch/eventloop_posix.c               | 34 ++++++++++++++++++++++++++--
 include/open62541/plugin/eventloop.h | 19 ++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 9fffeca7b58..8afa28621ac 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -225,7 +225,8 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
     }
 
     /* Process cyclic callbacks */
-    UA_DateTime dateBefore = UA_DateTime_nowMonotonic();
+    UA_DateTime dateBefore =
+        el->eventLoop.dateTime_nowMonotonic(&el->eventLoop);
 
     UA_UNLOCK(&el->elMutex);
     UA_DateTime dateNext =
@@ -237,7 +238,8 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
     UA_DateTime maxDate = dateBefore + (timeout * UA_DATETIME_MSEC);
     if(dateNext > maxDate)
         dateNext = maxDate;
-    UA_DateTime listenTimeout = dateNext - UA_DateTime_nowMonotonic();
+    UA_DateTime listenTimeout =
+        dateNext - el->eventLoop.dateTime_nowMonotonic(&el->eventLoop);
     if(listenTimeout < 0)
         listenTimeout = 0;
 
@@ -331,6 +333,28 @@ UA_EventLoopPOSIX_findEventSource(UA_EventLoopPOSIX *el,
     return s;
 }
 
+/***************/
+/* Time Domain */
+/***************/
+
+/* No special synchronization with an external source, just use the globally
+ * defined functions. */
+
+static UA_DateTime
+UA_EventLoopPOSIX_DateTime_now(UA_EventLoop *el) {
+    return UA_DateTime_now();
+}
+
+static UA_DateTime
+UA_EventLoopPOSIX_DateTime_nowMonotonic(UA_EventLoop *el) {
+    return UA_DateTime_nowMonotonic();
+}
+
+static UA_Int64
+UA_EventLoopPOSIX_DateTime_localTimeUtcOffset(UA_EventLoop *el) {
+    return UA_DateTime_localTimeUtcOffset();
+}
+
 /*************************/
 /* Initialize and Delete */
 /*************************/
@@ -399,6 +423,12 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger) {
     el->eventLoop.run = (UA_StatusCode (*)(UA_EventLoop*, UA_UInt32))UA_EventLoopPOSIX_run;
     el->eventLoop.free = (UA_StatusCode (*)(UA_EventLoop*))UA_EventLoopPOSIX_free;
 
+    el->eventLoop.dateTime_now = UA_EventLoopPOSIX_DateTime_now;
+    el->eventLoop.dateTime_nowMonotonic =
+        UA_EventLoopPOSIX_DateTime_nowMonotonic;
+    el->eventLoop.dateTime_localTimeUtcOffset =
+        UA_EventLoopPOSIX_DateTime_localTimeUtcOffset;
+
     el->eventLoop.nextCyclicTime = UA_EventLoopPOSIX_nextCyclicTime;
     el->eventLoop.addCyclicCallback = UA_EventLoopPOSIX_addCyclicCallback;
     el->eventLoop.modifyCyclicCallback = UA_EventLoopPOSIX_modifyCyclicCallback;
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 51249fb2dfc..1f2a921cfaf 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -97,6 +97,25 @@ struct UA_EventLoop {
      * EventLoop is not stopped. */
     UA_StatusCode (*free)(UA_EventLoop *el);
 
+    /* EventLoop Time Domain
+     * ~~~~~~~~~~~~~~~~~~~~~
+     * Each EventLoop instance can manage its own time domain. This affects the
+     * execution of timed/cyclic callbacks and time-based sending of network
+     * packets (if this is implemented). Managing independent time domains is
+     * important when different parts of a system a synchronized to different
+     * external (network-wide) clocks.
+     *
+     * Note that the logger configured in the EventLoop generates timestamps
+     * internally as well. If the logger uses a different time domain than the
+     * EventLoop, discrepancies may appear in the logs.
+     *
+     * The time domain of the EventLoop is exposed via the following functons.
+     * See `open62541/types.h` for the documentation of their equivalent
+     * globally defined functions. */
+    UA_DateTime (*dateTime_now)(UA_EventLoop *el);
+    UA_DateTime (*dateTime_nowMonotonic)(UA_EventLoop *el);
+    UA_Int64    (*dateTime_localTimeUtcOffset)(UA_EventLoop *el);
+
     /* Cyclic and Delayed Callbacks
      * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      * Cyclic callbacks are executed regularly with an interval. A delayed

From 9e5d2af6f047770eacb068a799ad446496c5a3e1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 8 Jan 2022 17:25:42 +0100
Subject: [PATCH 0045/1963] fix(el): Always use epoll_wait instead of
 epoll_pwait2

Support is documented
(https://man7.org/linux/man-pages/man2/epoll_pwait.2.html) but actually
lacking in glibc.
---
 arch/eventloop_posix_epoll.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
index a393499d6a9..89729f0e30e 100644
--- a/arch/eventloop_posix_epoll.c
+++ b/arch/eventloop_posix_epoll.c
@@ -6,9 +6,6 @@
  */
 
 #include "eventloop_posix.h"
-#ifdef __linux__
-#include <linux/version.h>
-#endif
 
 #if defined(UA_HAVE_EPOLL)
 
@@ -72,17 +69,17 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
 
     /* Poll the registered sockets */
     struct epoll_event epoll_events[64];
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,11,0)
-    int events = epoll_pwait(el->epollfd, epoll_events, 64,
-                             (int)(listenTimeout / UA_DATETIME_MSEC), NULL);
-#else
-    struct timespec precisionTimeout = {
-        (long)(listenTimeout / UA_DATETIME_SEC),
-        (long)((listenTimeout % UA_DATETIME_SEC) * 100)
-    };
-    int events = epoll_pwait2(el->epollfd, epoll_events, 64,
-                              precisionTimeout, NULL);
-#endif
+    int events = epoll_wait(el->epollfd, epoll_events, 64,
+                            (int)(listenTimeout / UA_DATETIME_MSEC));
+    /* TODO: Replace with pwait2 for higher-precision timeouts once this is
+     * available in the standard library.
+     *
+     * struct timespec precisionTimeout = {
+     *  (long)(listenTimeout / UA_DATETIME_SEC),
+     *   (long)((listenTimeout % UA_DATETIME_SEC) * 100)
+     * };
+     * int events = epoll_pwait2(el->epollfd, epoll_events, 64,
+     *                        precisionTimeout, NULL); */
 
     /* Handle error conditions */
     if(events == -1) {

From 7ca561e4a3d38c651224c71cbe822ae6a3e1c7b4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 9 Jan 2022 15:17:47 +0100
Subject: [PATCH 0046/1963] refactor(server): Remove unnecessary #include

---
 src/server/ua_server_ns0.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index ee1a319c6d9..cb349e1240c 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -13,9 +13,6 @@
  */
 
 #include "open62541/namespace0_generated.h"
-#include "open62541/nodeids.h"
-#include "open62541/types.h"
-#include "open62541/types_generated.h"
 
 #include "ua_server_internal.h"
 #include "ua_session.h"

From c4098bb0ab6d178aac71e099ba44e932f00647af Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Wed, 15 Dec 2021 17:25:42 +0100
Subject: [PATCH 0047/1963] fix(server): Fix default initialization for arrays
 (#4852)

---
 .idea/csv-plugin.xml                          | 21 ++++++++
 include/open62541/plugin/nodestore.h          | 12 +++--
 src/server/ua_server_internal.h               |  2 +-
 src/server/ua_services_attribute.c            |  8 ++-
 src/server/ua_services_nodemanagement.c       | 49 ++++++++-----------
 .../check_nodeset_compiler_testnodeset.c      |  3 +-
 tests/server/check_services_nodemanagement.c  | 25 +++++++++-
 7 files changed, 84 insertions(+), 36 deletions(-)

diff --git a/.idea/csv-plugin.xml b/.idea/csv-plugin.xml
index e85272a2a04..a875089f079 100644
--- a/.idea/csv-plugin.xml
+++ b/.idea/csv-plugin.xml
@@ -3,6 +3,13 @@
   <component name="CsvFileAttributes">
     <option name="attributeMap">
       <map>
+        <entry key="/deps/ua-nodeset/CAS/Opc.Ua.CAS.NodeIds.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
         <entry key="/deps/ua-nodeset/DotNet/Opc.Ua.StatusCodes.csv">
           <value>
             <Attribute>
@@ -10,6 +17,13 @@
             </Attribute>
           </value>
         </entry>
+        <entry key="/deps/ua-nodeset/IOLink/EngineeringUnits.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value=";" />
+            </Attribute>
+          </value>
+        </entry>
         <entry key="/deps/ua-nodeset/Schema/StatusCode.csv">
           <value>
             <Attribute>
@@ -24,6 +38,13 @@
             </Attribute>
           </value>
         </entry>
+        <entry key="/deps/ua-nodeset/Schema/rec20_latest_a1.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
         <entry key="/deps/ua-nodeset/Schema/rec20_latest_a2-3.csv">
           <value>
             <Attribute>
diff --git a/include/open62541/plugin/nodestore.h b/include/open62541/plugin/nodestore.h
index bcdd1b58d5a..81a033fa4c2 100644
--- a/include/open62541/plugin/nodestore.h
+++ b/include/open62541/plugin/nodestore.h
@@ -463,13 +463,17 @@ struct UA_NodeHead {
  * exact length in each dimensions can be further constrained with this
  * attribute.
  *
- * - For positive lengths, the variable value is guaranteed to be of the same
- *   length in this dimension.
+ * - For positive lengths, the variable value must have a dimension length less
+ *   or equal to the array dimension length defined in the VariableNode.
  * - The dimension length zero is a wildcard and the actual value may have any
- *   length in this dimension.
+ *   length in this dimension. Note that a value (variant) must have array
+ *   dimensions that are positive (not zero).
  *
  * Consistency between the array dimensions attribute in the variable and its
- * :ref:`variabletypenode` is ensured. */
+ * :ref:`variabletypenode` is ensured. However, we consider that an array of
+ * length zero (can also be a null-array with undefined length) has implicit
+ * array dimensions ``[0,0,...]``. These always match the required array
+ * dimensions. */
 
 /* Indicates whether a variable contains data inline or whether it points to an
  * external data source */
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 3db6bcb9a1f..8b58461e217 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -500,7 +500,7 @@ readValueAttribute(UA_Server *server, UA_Session *session,
 
 /* Test whether the value matches a variable definition given by
  * - datatype
- * - valueranke
+ * - valuerank
  * - array dimensions.
  * Sometimes it can be necessary to transform the content of the value, e.g.
  * byte array to bytestring or uint32 to some enum. If editableValue is non-NULL,
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index be21153d321..e3fef6f8007 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -992,9 +992,15 @@ UA_Boolean
 compatibleValueArrayDimensions(const UA_Variant *value, size_t targetArrayDimensionsSize,
                                const UA_UInt32 *targetArrayDimensions) {
     size_t valueArrayDimensionsSize = value->arrayDimensionsSize;
-    UA_UInt32 *valueArrayDimensions = value->arrayDimensions;
+    UA_UInt32 const *valueArrayDimensions = value->arrayDimensions;
     UA_UInt32 tempArrayDimensions;
     if(!valueArrayDimensions && !UA_Variant_isScalar(value)) {
+        /* An empty array implicitly has array dimensions [0,0,...] with the
+         * correct number of dimensions. So it always matches. */
+        if(value->arrayLength == 0)
+            return true;
+
+        /* Arrays with content and without array dimensions have one implicit dimension */
         valueArrayDimensionsSize = 1;
         tempArrayDimensions = (UA_UInt32)value->arrayLength;
         valueArrayDimensions = &tempArrayDimensions;
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 410ebe3584d..fd8b8975fcc 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -189,6 +189,7 @@ checkParentReference(UA_Server *server, UA_Session *session, const UA_NodeHead *
     return UA_STATUSCODE_GOOD;
 }
 
+/* Only BaseDataType can have empty values. Generate a default value. */
 static UA_StatusCode
 setDefaultValue(UA_Server *server, const UA_VariableNode *node) {
     /* Get the DataType */
@@ -238,35 +239,27 @@ setDefaultValue(UA_Server *server, const UA_VariableNode *node) {
         if(!data)
             return UA_STATUSCODE_BADOUTOFMEMORY;
         UA_Variant_setScalar(&val, data, type);
-    } else if(node->valueRank == 0) {
-        /* Use an empty array of one dimension */
-        UA_Variant_setArray(&val, NULL, 0, type);
     } else {
-        /* Write an array that matches the ArrayDimensions */
-        res = UA_Array_copy(node->arrayDimensions, node->arrayDimensionsSize,
-                            (void**)&val.arrayDimensions, &UA_TYPES[UA_TYPES_UINT32]);
-        if(res != UA_STATUSCODE_GOOD)
-            return res;
-        val.arrayDimensionsSize = node->arrayDimensionsSize;
-
-        /* No length restriction in the ArrayDimension -> use length 1 */
-        size_t size = 1;
-        for(size_t i = 0; i < val.arrayDimensionsSize; i++) {
-            if(val.arrayDimensions[i] == 0)
-                val.arrayDimensions[i] = 1;
-            size *= val.arrayDimensions[i];
-        }
-
-        /* Create the content array */
-        void *data = UA_Array_new(size, type);
-        if(!data) {
-            UA_Variant_clear(&val);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-
-        val.data = data;
-        val.arrayLength = size;
-        val.type = type;
+        /* Set an array
+         *
+         * https://reference.opcfoundation.org/v104/Core/docs/Part3/5.6.2/#Table13
+         * specifies ArrayDimensions as follows: This Attribute specifies the
+         * maximum supported length of each dimension. If the maximum is unknown
+         * the value shall be 0. The number of elements shall be equal to the
+         * value of the ValueRank Attribute. This Attribute shall be null if
+         * ValueRank <= 0.
+         *
+         * The (variant) values themselves cannot have ArrayDimensions with a
+         * dimension length of zero. We however consider that empty arrays
+         * (null-array or length zero) have implicit array dimensions [0,0,...].
+         * With the appropriate number of dimensions. So they always match.
+         *
+         * We automatically create a null array during the node creation when
+         * required for the type-checking..
+         *
+         * Also see the method 'compatibleValueArrayDimensions' where the
+         * compatibility of the ArrayDimensions is checked. */
+        UA_Variant_setArray(&val, NULL, 0, type);
     }
 
     /* Write the value */
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
index 798f915c839..d0d77d68428 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
@@ -90,7 +90,8 @@ START_TEST(check1dimValues) {
     // Point_1dim_noInit
     UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10007), &out);
     ck_assert(!UA_Variant_isScalar(&out));
-    ck_assert(out.arrayDimensionsSize == 1);
+    ck_assert(out.arrayDimensionsSize == 0);
+    ck_assert(out.arrayDimensions == NULL);
     UA_Variant_clear(&out);
     // Point_1dim_init
     UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10004), &out);
diff --git a/tests/server/check_services_nodemanagement.c b/tests/server/check_services_nodemanagement.c
index 1a9d5f8d32f..4772ec4f903 100644
--- a/tests/server/check_services_nodemanagement.c
+++ b/tests/server/check_services_nodemanagement.c
@@ -96,6 +96,28 @@ START_TEST(AddVariableNode_ValueRankZero) {
     ck_assert_int_eq(UA_STATUSCODE_GOOD, res);
 } END_TEST
 
+START_TEST(AddVariableNode_EmptyValueWithNonZeroValueRank) {
+    UA_VariableAttributes vattr = UA_VariableAttributes_default;
+    /* VariableNode with zero (unlimited dimensions */
+    vattr = UA_VariableAttributes_default;
+    UA_Variant_clear(&vattr.value);
+    vattr.valueRank = 2;
+    UA_UInt32 myIntegerDimensions2[2] = {0, 2};
+    vattr.arrayDimensions = myIntegerDimensions2;
+    vattr.arrayDimensionsSize = 2;
+    vattr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_INT32);
+    vattr.displayName = UA_LOCALIZEDTEXT("en-US", "myarraydims");
+    UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "myarraydims");
+    UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "myarraydims");
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_StatusCode retval = UA_Server_addVariableNode(server, myIntegerNodeId, parentNodeId,
+                                                     parentReferenceNodeId, myIntegerName,
+                                                     UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                                     vattr, NULL, NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+} END_TEST
+
 START_TEST(AddVariableNode_Matrix) {
     /* Add a variable node to the address space */
     UA_VariableAttributes attr = UA_VariableAttributes_default;
@@ -104,7 +126,7 @@ START_TEST(AddVariableNode_Matrix) {
 
     attr.dataType = UA_TYPES[UA_TYPES_DOUBLE].typeId;
     attr.valueRank = UA_VALUERANK_TWO_DIMENSIONS;
-    UA_UInt32 arrayDims[2] = {2,2};
+    UA_UInt32 arrayDims[2] = {2, 2};
     attr.arrayDimensions = arrayDims;
     attr.arrayDimensionsSize = 2;
     UA_Double zero[4] = {0.0, 0.0, 0.0, 0.0};
@@ -720,6 +742,7 @@ int main(void) {
     tcase_add_checked_fixture(tc_addnodes, setup, teardown);
     tcase_add_test(tc_addnodes, AddVariableNode);
     tcase_add_test(tc_addnodes, AddVariableNode_ValueRankZero);
+    tcase_add_test(tc_addnodes, AddVariableNode_EmptyValueWithNonZeroValueRank);
     tcase_add_test(tc_addnodes, AddVariableNode_Matrix);
     tcase_add_test(tc_addnodes, AddVariableNode_ExtensionObject);
     tcase_add_test(tc_addnodes, InstantiateVariableTypeNode);

From b061554990ab38cd9062212aaa69c322f1415f33 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 13 Jan 2022 18:27:46 +0100
Subject: [PATCH 0048/1963] feat(doc): Update the changelog with the implicit
 array dimensions

Remove the very old old changelog entries.
---
 CHANGELOG | 130 ++++--------------------------------------------------
 1 file changed, 8 insertions(+), 122 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3e05be6f115..44c197ab01d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,126 +1,12 @@
-This changelog reports changes to the public API. Internal refactorings and bug
+This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
-2018-02-05 pro <profanter at fortiss.org>
+2022-01-12 Mark Giraud <mark.giraud at iosb.fraunhofer.de>
 
- * Also pass client to monitoredItem/Events callback
+ * Empty arrays always match the array dimensions
 
-   The UA_MonitoredItemHandlingFunction and UA_MonitoredEventHandlingFunction
-   did not include a reference to the corresponding client used for the call of
-   processPublishResponse.
-   This now also allows to get the client context within the monitored item
-   handling function.
-
-   The API changes are detected by the type-matching in the compiler. So there
-   is little risk for bugs due to unaligned implementations.
-
-2017-09-07 jpfr <julius.pfrommer at web.de>
-
- * Make Client Highlevel Interface consistent
-
-   Two methods in the client highlevel interface were not conformant with the
-   API convention that array sizes are given before the array pointer. This
-   changes the signature of UA_Client_writeArrayDimensionsAttribute and
-   UA_Client_readArrayDimensionsAttribute.
-
-   The API changes are detected by the type-matching in the compiler. So there
-   is little risk for bugs due to unaligned implementations.
-
-2017-08-16 jpfr <julius.pfrommer at web.de>
-
- * Default Attribute Values for Node Attributes
-
-   The AddNodes service takes a structure with the attributes of the new node as
-   input. We began checking the consistency of the attributes more closely. You
-   can now use constant global definitions with default values as a starting
-   point. For example UA_VariableAttributes_default for adding a variable node.
-
- * All nodes have a context pointer
-
-   All nodes now carry a context pointer. The context pointer is initially set
-   to a user-defined memory location. The context pointer is passed to all
-   user-visible callbacks involving the node.
-
- * Global and node-type constructor/destructor
-
-   The constructors are fine-grained mechanisms to control the instantiation and
-   deletion of nodes. Constructors receive the node context pointer and can also
-   replace it.
-
-2017-08-13 Infinity95 <mark.giraud at student.kit.edu>
-
- * New/Delete methods for the server configuration
-
-   The default server configuration is no longer a constant global variable.
-   Instead, it is now handled with a pair of new/delete methods. This enables
-   the use of malloced members of the server configuration. With this change,
-   the endpoint descriptions are no longer generated in the server but are
-   created as part of the server configuration. See the example server
-   implementations on how to use the configuration generation. The change is a
-   precursor to the encryption implementation that ties into the generation of
-   endpoint descriptions in the server config.
-
-   The generation of the default server configuration is implemented as a
-   "plugin". So it comes with CC0 licensing and can be freely adjusted by users.
-
-   The TCP port in the default configuration is 4840. This is the recommended
-   port for OPC UA and now used throughout all examples.
-
-2017-07-04 jpfr <julius.pfrommer at web.de>
-
- * Return partially overlapping ranges
-
-   Test the integrity of the range and compute the max index used for every
-   dimension. The standard says in Part 4, Section 7.22:
-
-   When reading a value, the indexes may not speify a range that is within
-   the bounds of the array. The Server shall return a partial result if some
-   elements exist within the range.
-
-2017-07-03 jpfr <julius.pfrommer at web.de>
-
- * Implement asynchronous service calls for the client
-
-   All OPC UA services are asynchronous in nature. So several service calls can
-   be made without waiting for a response first. Responess may come in a
-   different ordering. The client takes a method pointer and a data pointer to
-   perform an asynchronous callback on the request response.
-
-   Synchronous service calls are still supported in the client. Asynchronous
-   responses are processed in the background until the synchronous response (the
-   client is waiting for) returns the control flow back to the user.
-
-2017-06-26 janitza-thbe
-
- * Enable IPv6 in the networklayer plugin
-
-   The server networklayer listens on several sockets for available networks and
-   IP versions. IPv4 connections are still supported.
-
-   The OPC Foundation ANSI C Stack before 2016 does not fully support IPv6. On
-   Windows, the 'localhost' target is resolved to IPv6 by default. Old
-   applications (e.g. the Conformance Testing Tools) need to connect to
-   127.0.0.1 instead of 'localhost' to force IPv4.
-
-2017-06-16 jpfr <julius.pfrommer at web.de>
-
- * Require the AccessLevel bit UA_ACCESSLEVELMASK_READ for reading
-
-   Set the bit by default when adding nodes for a smooth transition to the new
-   API. This will change at a later point with an additional node settings
-   argument for the AddNodes methods.
-
-2017-05-03 pro <profanter at fortiss.org>
-
- * Array dimensions are UInt32 also for the highlevel client read service
-
-2017-04-16 jpfr <julius.pfrommer at web.de>
-
- * Refactor UA_parseEndpointUrl to work with UA_String
-
-   The output hostname and path now point into the original endpointUrl with an
-   appropriate length.
-
-2017-04-14 jpfr <julius.pfrommer at web.de>
-
- * Auto-instantiate only child nodes marked as mandatory (fixes #1004)
+   We consider empty arrays (also null-arrays) to have implied array
+   dimensions [0,0,...]. So they always match the array dimensions
+   defined in the variable. With this, the initialization of
+   variables without a defined value has been simplified.
+   We now create a null array if one is required.

From 2d403265f3ccebc5e256a859d533eda5fb159714 Mon Sep 17 00:00:00 2001
From: Kjeld Flarup <kfa@deif.com>
Date: Thu, 20 Jan 2022 15:58:08 +0100
Subject: [PATCH 0049/1963] Fix error: missing braces around initializer
 [-Werror=missing-braces] Using {0} it not portable. Se also issue
 https://github.com/open62541/open62541/issues/2134 Signed-off-by: Kjeld
 Flarup <kfa@deif.com>

---
 include/open62541/types.h | 2 +-
 src/server/ua_nodes.c     | 2 +-
 src/ua_types.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index bd506983cc1..5a11322d28d 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -547,7 +547,7 @@ UA_EXPANDEDNODEID_BYTESTRING_ALLOC(UA_UInt16 nsIndex, const char *chars) {
 
 static UA_INLINE UA_ExpandedNodeId
 UA_EXPANDEDNODEID_NODEID(UA_NodeId nodeId) {
-    UA_ExpandedNodeId id = {0}; id.nodeId = nodeId; return id;
+    UA_ExpandedNodeId id; memset(&id, 0, sizeof(UA_ExpandedNodeId)); id.nodeId = nodeId; return id;
 }
 
 /* Does the ExpandedNodeId point to a local node? That is, are namespaceUri and
diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index 29f97148a16..79f33c4c77c 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -43,7 +43,7 @@
 # define UA_REFTYPES_ALL_ARRAY UA_REFTYPES_ALL_MASK
 #endif
 
-const UA_ReferenceTypeSet UA_REFERENCETYPESET_NONE = {0};
+const UA_ReferenceTypeSet UA_REFERENCETYPESET_NONE = {{0}};
 const UA_ReferenceTypeSet UA_REFERENCETYPESET_ALL  = {{UA_REFTYPES_ALL_ARRAY}};
 
 /*****************/
diff --git a/src/ua_types.c b/src/ua_types.c
index 83afebc9f68..fb0d432decb 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -38,7 +38,7 @@ const UA_String UA_STRING_NULL = {0};
 const UA_ByteString UA_BYTESTRING_NULL = {0};
 const UA_Guid UA_GUID_NULL = {0};
 const UA_NodeId UA_NODEID_NULL = {0};
-const UA_ExpandedNodeId UA_EXPANDEDNODEID_NULL = {0};
+const UA_ExpandedNodeId UA_EXPANDEDNODEID_NULL = { {0}, {0}, 0 };
 
 typedef UA_StatusCode
 (*UA_copySignature)(const void *src, void *dst, const UA_DataType *type);

From 5bac022548b0ff8167278a042a75c4fcfbdcc47d Mon Sep 17 00:00:00 2001
From: Kjeld Flarup <kfa@deif.com>
Date: Fri, 21 Jan 2022 12:32:33 +0100
Subject: [PATCH 0050/1963] Remove some const qualifiers which causes build
 with older openssl series (pre 1.1) to fail. Signed-off-by: Kjeld Flarup
 <kfa@deif.com>

---
 plugins/crypto/openssl/ua_openssl_create_certificate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/crypto/openssl/ua_openssl_create_certificate.c b/plugins/crypto/openssl/ua_openssl_create_certificate.c
index 4b07e88699d..815d57038c9 100644
--- a/plugins/crypto/openssl/ua_openssl_create_certificate.c
+++ b/plugins/crypto/openssl/ua_openssl_create_certificate.c
@@ -67,8 +67,9 @@ UA_String_chr(const UA_String *pUaStr, char needl) {
     return -1;
 }
 
+/* char *value cannot be const due to openssl 1.0 compatibility */
 static UA_StatusCode
-add_x509V3ext(X509 *x509, int nid, const char *value) {
+add_x509V3ext(X509 *x509, int nid, char *value) {
     X509_EXTENSION *ex;
     X509V3_CTX ctx;
     X509V3_set_ctx_nodb(&ctx);
@@ -261,7 +262,7 @@ UA_CreateCertificate(const UA_Logger *logger,
         goto cleanup;
     }
 
-    errRet = add_x509V3ext(x509, NID_subject_alt_name, (const char*) fullAltSubj.data);
+    errRet = add_x509V3ext(x509, NID_subject_alt_name, (char*) fullAltSubj.data);
     if(errRet != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                      "Create Certificate: Setting 'Subject Alternative Name:' failed.");

From 1282d829864cabd2d474e37daf4a722aa9c3f8fa Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Thu, 27 Jan 2022 09:12:14 +0100
Subject: [PATCH 0051/1963] fix(ex) completed event filter setup procedure

---
 examples/events/client_eventfilter.c | 217 ++++++++++++++++-----------
 1 file changed, 132 insertions(+), 85 deletions(-)

diff --git a/examples/events/client_eventfilter.c b/examples/events/client_eventfilter.c
index 97892c0a1f0..171676ecf1e 100644
--- a/examples/events/client_eventfilter.c
+++ b/examples/events/client_eventfilter.c
@@ -92,17 +92,17 @@ setupOperandArrays(UA_ContentFilter *contentFilter){
 }
 
 static void
-setupOrFilter(UA_ContentFilterElement *element){
+setupTwoOperandsFilter(UA_ContentFilterElement *element, UA_UInt32 firstOperandIndex, UA_UInt32 secondOperandIndex){
     element->filterOperands[0].content.decoded.type = &UA_TYPES[UA_TYPES_ELEMENTOPERAND];
     element->filterOperands[0].encoding = UA_EXTENSIONOBJECT_DECODED;
     element->filterOperands[1].content.decoded.type = &UA_TYPES[UA_TYPES_ELEMENTOPERAND];
     element->filterOperands[1].encoding = UA_EXTENSIONOBJECT_DECODED;
     UA_ElementOperand *firstElementOperand = UA_ElementOperand_new();
     UA_ElementOperand_init(firstElementOperand);
-    firstElementOperand->index = 1;
+    firstElementOperand->index = firstOperandIndex;
     UA_ElementOperand *secondElementOperand = UA_ElementOperand_new();
     UA_ElementOperand_init(secondElementOperand);
-    secondElementOperand->index = 2;
+    secondElementOperand->index = secondOperandIndex;
     element->filterOperands[0].content.decoded.data = firstElementOperand;
     element->filterOperands[1].content.decoded.data = secondElementOperand;
 }
@@ -122,6 +122,18 @@ setupOfTypeFilter(UA_ContentFilterElement *element, UA_UInt16 nsIndex, UA_UInt32
     element->filterOperands[0].content.decoded.data = literalOperand;
 }
 
+static void
+setupLiteralOperand(UA_ContentFilterElement *element, size_t count, UA_Variant *literals){
+    for(size_t i = 0; i < count; ++i) {
+        element->filterOperands[i].content.decoded.type = &UA_TYPES[UA_TYPES_LITERALOPERAND];
+        element->filterOperands[i].encoding = UA_EXTENSIONOBJECT_DECODED;
+        UA_LiteralOperand *literalOperand = UA_LiteralOperand_new();
+        UA_LiteralOperand_init(literalOperand);
+        literalOperand->value = literals[i];
+        element->filterOperands[i].content.decoded.data = literalOperand;
+    }
+}
+
 /**
  * Setting up WhereClauses
  * ^^^^^^^^^^^^^^^^^^^
@@ -155,97 +167,132 @@ setupWhereClauses(UA_ContentFilter *contentFilter, UA_UInt16 whereClauseSize, UA
     }
     UA_StatusCode result = UA_STATUSCODE_GOOD;
     switch(filterSelection) {
-        case 0: {
-            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OR;
-            contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            contentFilter->elements[0].filterOperandsSize = 2;
-            contentFilter->elements[1].filterOperandsSize = 1;
-            contentFilter->elements[2].filterOperandsSize = 1;
-            /* Setup Operand Arrays */
-            result = setupOperandArrays(contentFilter);
-            if(result != UA_STATUSCODE_GOOD) {
-                UA_ContentFilter_clear(contentFilter);
-                return UA_STATUSCODE_BADCONFIGURATIONERROR;
-            }
-            /* first Element (OR) */
-            setupOrFilter(&contentFilter->elements[0]);
-            /* second Element (OfType) */
-            setupOfTypeFilter(&contentFilter->elements[1], 1, 5003);
-            /* third Element (OfType) */
-            setupOfTypeFilter(&contentFilter->elements[2], 0,
-                              UA_NS0ID_EVENTQUEUEOVERFLOWEVENTTYPE);
-            break;
-        }
-        case 1: {
-            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            UA_UInt32 placeholder_ScanFinishedEvent = 10000;
-            setupOfTypeFilter(&contentFilter->elements[0], 1,
-                              placeholder_ScanFinishedEvent);
-            break;
-        }
-        case 2: {
-            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OR;
-            contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OR;
-            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_OR;
-            contentFilter->elements[3].filterOperator = UA_FILTEROPERATOR_OR;
-            contentFilter->elements[4].filterOperator = UA_FILTEROPERATOR_OR;
-            contentFilter->elements[5].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            contentFilter->elements[6].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            contentFilter->elements[7].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            contentFilter->elements[8].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            contentFilter->elements[9].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            contentFilter->elements[10].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-
-            // init or clauses
-            setupOrFilter(&contentFilter->elements[0]);
-            setupOrFilter(&contentFilter->elements[1]);
-            setupOrFilter(&contentFilter->elements[2]);
-            setupOrFilter(&contentFilter->elements[3]);
-            setupOrFilter(&contentFilter->elements[4]);
-            // init oftype
-            UA_UInt32 placeholder_StartScanEvent = 10000;
-            UA_UInt32 placeholder_DcpScanFinishedEvent = 10001;
-            UA_UInt32 CancelScanEvent = 10003;
-            UA_UInt32 placeholder_CancelScanFinishedEvent = 10004;
-            UA_UInt32 placeholder_ShutdownEvent = 10005;
-            UA_UInt32 placeholder_ShutdownEvent_1 = 10006;
-            setupOfTypeFilter(&contentFilter->elements[5], 1, placeholder_StartScanEvent);
-            setupOfTypeFilter(&contentFilter->elements[6], 1,
-                              placeholder_DcpScanFinishedEvent);
-            setupOfTypeFilter(&contentFilter->elements[7], 1,
-                              placeholder_ShutdownEvent_1);
-            setupOfTypeFilter(&contentFilter->elements[8], 1, CancelScanEvent);
-            setupOfTypeFilter(&contentFilter->elements[9], 1,
-                              placeholder_CancelScanFinishedEvent);
-            setupOfTypeFilter(&contentFilter->elements[10], 1, placeholder_ShutdownEvent);
-            break;
+    case 0: {
+        contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OR;
+        contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[0].filterOperandsSize = 2;
+        contentFilter->elements[1].filterOperandsSize = 1;
+        contentFilter->elements[2].filterOperandsSize = 1;
+        /* Setup Operand Arrays */
+        result = setupOperandArrays(contentFilter);
+        if(result != UA_STATUSCODE_GOOD) {
+            UA_ContentFilter_clear(contentFilter);
+            return UA_STATUSCODE_BADCONFIGURATIONERROR;
         }
-        case 3:{
-            UA_UInt32 placeholder_ShutdownEvent_2 = 10000;
-            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            setupOfTypeFilter(&contentFilter->elements[0], 1, placeholder_ShutdownEvent_2);
-            break;
+        /* first Element (OR) */
+        setupTwoOperandsFilter(&contentFilter->elements[0], 1, 2);
+        /* second Element (OfType) */
+        setupOfTypeFilter(&contentFilter->elements[1], 1, 5003);
+        /* third Element (OfType) */
+        setupOfTypeFilter(&contentFilter->elements[2], 0,
+                          UA_NS0ID_EVENTQUEUEOVERFLOWEVENTTYPE);
+        break;
+    }
+    case 1: {
+        contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[0].filterOperandsSize = 1;
+        /* Setup Operand Arrays */
+        result = setupOperandArrays(contentFilter);
+        if(result != UA_STATUSCODE_GOOD) {
+            UA_ContentFilter_clear(contentFilter);
+            return UA_STATUSCODE_BADCONFIGURATIONERROR;
         }
-        case 4: {
-            contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_AND;
-            contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OFTYPE;
-            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_AND;
-            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_EQUALS;
-            contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_EQUALS;
-            break;
+        setupOfTypeFilter(&contentFilter->elements[0], 1, 5001);
+        break;
+    }
+    case 2: {
+        contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_OR;
+        contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OR;
+        contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_OR;
+        contentFilter->elements[3].filterOperator = UA_FILTEROPERATOR_OR;
+        contentFilter->elements[4].filterOperator = UA_FILTEROPERATOR_OR;
+        contentFilter->elements[5].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[6].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[7].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[8].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[9].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[10].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+
+        contentFilter->elements[0].filterOperandsSize = 2;
+        contentFilter->elements[1].filterOperandsSize = 2;
+        contentFilter->elements[2].filterOperandsSize = 2;
+        contentFilter->elements[3].filterOperandsSize = 2;
+        contentFilter->elements[4].filterOperandsSize = 2;
+        contentFilter->elements[5].filterOperandsSize = 1;
+        contentFilter->elements[6].filterOperandsSize = 1;
+        contentFilter->elements[7].filterOperandsSize = 1;
+        contentFilter->elements[8].filterOperandsSize = 1;
+        contentFilter->elements[9].filterOperandsSize = 1;
+        contentFilter->elements[10].filterOperandsSize = 1;
+
+        /* Setup Operand Arrays */
+        result = setupOperandArrays(contentFilter);
+        if(result != UA_STATUSCODE_GOOD) {
+            UA_ContentFilter_clear(contentFilter);
+            return UA_STATUSCODE_BADCONFIGURATIONERROR;
         }
-        default:
+
+        // init or clauses
+        setupTwoOperandsFilter(&contentFilter->elements[0], 1, 2);
+        setupTwoOperandsFilter(&contentFilter->elements[1], 3, 4);
+        setupTwoOperandsFilter(&contentFilter->elements[2], 5, 6);
+        setupTwoOperandsFilter(&contentFilter->elements[3], 7, 8);
+        setupTwoOperandsFilter(&contentFilter->elements[4], 9, 10);
+        // init oftype
+        setupOfTypeFilter(&contentFilter->elements[5], 1, 5000);
+        setupOfTypeFilter(&contentFilter->elements[6], 1, 5001);
+        setupOfTypeFilter(&contentFilter->elements[7], 1, 5002);
+        setupOfTypeFilter(&contentFilter->elements[8], 1, 5003);
+        setupOfTypeFilter(&contentFilter->elements[9], 1, 5004);
+        setupOfTypeFilter(&contentFilter->elements[10], 0, UA_NS0ID_EVENTQUEUEOVERFLOWEVENTTYPE);
+        break;
+    }
+    case 3: {
+        contentFilter->elements[0].filterOperator = UA_FILTEROPERATOR_AND;
+        contentFilter->elements[1].filterOperator = UA_FILTEROPERATOR_OFTYPE;
+        contentFilter->elements[2].filterOperator = UA_FILTEROPERATOR_AND;
+        contentFilter->elements[3].filterOperator = UA_FILTEROPERATOR_EQUALS;
+        contentFilter->elements[4].filterOperator = UA_FILTEROPERATOR_EQUALS;
+
+        contentFilter->elements[0].filterOperandsSize = 2;
+        contentFilter->elements[1].filterOperandsSize = 1;
+        contentFilter->elements[2].filterOperandsSize = 2;
+        contentFilter->elements[3].filterOperandsSize = 2;
+        contentFilter->elements[4].filterOperandsSize = 2;
+
+        /* Setup Operand Arrays */
+        result = setupOperandArrays(contentFilter);
+        if(result != UA_STATUSCODE_GOOD) {
             UA_ContentFilter_clear(contentFilter);
             return UA_STATUSCODE_BADCONFIGURATIONERROR;
+        }
+
+        // init clauses
+        setupTwoOperandsFilter(&contentFilter->elements[0], 1, 2);
+        setupTwoOperandsFilter(&contentFilter->elements[2], 3, 4);
+        setupOfTypeFilter(&contentFilter->elements[1], 1, 5000);
+
+        UA_UInt32 literal_value;
+        UA_Variant literalContent[2];
+        memset(literalContent, 0, sizeof(UA_Variant) * 2);
+        UA_Variant_setScalar(&literalContent[0], &literal_value, &UA_TYPES[UA_TYPES_UINT32]);
+        UA_Variant_setScalar(&literalContent[1], &literal_value, &UA_TYPES[UA_TYPES_UINT32]);
+        setupLiteralOperand(&contentFilter->elements[3], 2, literalContent);
+        setupLiteralOperand(&contentFilter->elements[4], 2, literalContent);
+        break;
+    }
+    default:
+        UA_ContentFilter_clear(contentFilter);
+        return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
     return UA_STATUSCODE_GOOD;
 }
 
 static void
 handler_events_filter(UA_Client *client, UA_UInt32 subId, void *subContext,
-               UA_UInt32 monId, void *monContext,
-               size_t nEventFields, UA_Variant *eventFields) {
+                      UA_UInt32 monId, void *monContext,
+                      size_t nEventFields, UA_Variant *eventFields) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Received Event Notification (Filter passed)");
     for(size_t i = 0; i < nEventFields; ++i) {
         if(UA_Variant_hasScalarType(&eventFields[i], &UA_TYPES[UA_TYPES_UINT16])) {
@@ -314,7 +361,7 @@ int main(int argc, char *argv[]) {
     UA_EventFilter_init(&filter);
     filter.selectClauses = setupSelectClauses();
     filter.selectClausesSize = nSelectClauses;
-    retval = setupWhereClauses(&filter.whereClause, 3, 0);
+    retval = setupWhereClauses(&filter.whereClause, 5, 3);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_Client_delete(client);
         return EXIT_FAILURE;
@@ -345,7 +392,7 @@ int main(int argc, char *argv[]) {
         UA_Client_run_iterate(client, 100);
 
     /* Delete the subscription */
-    cleanup:
+cleanup:
     UA_MonitoredItemCreateResult_clear(&result);
     UA_Client_Subscriptions_deleteSingle(client, response.subscriptionId);
     UA_Array_delete(filter.selectClauses, nSelectClauses, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);

From c49678dd9148574f67033a79334a4fca879d8429 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Fri, 28 Jan 2022 15:09:39 +0100
Subject: [PATCH 0052/1963] fix(server) set correct compare operator result

---
 src/server/ua_subscription_events_filter.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 452718c7995..8abd1e48006 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -519,6 +519,7 @@ compareOperation(UA_Variant *firstOperand, UA_Variant *secondOperand, UA_FilterO
 
 static UA_StatusCode
 compareOperator(UA_FilterOperatorContext *ctx) {
+    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
     UA_Variant firstOperand = resolveOperand(ctx, 0);
     if(UA_Variant_isEmpty(&firstOperand))
         return UA_STATUSCODE_BADFILTEROPERANDINVALID;

From a0c28b8bb51e797ab96c4f1af7fc952871a5fdc5 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 22 Oct 2021 09:21:58 +0200
Subject: [PATCH 0053/1963] fix(nc): Support for multiple Depends inside a
 nodeset. Improved code generation of arrays and support of default values of
 basic data types.

---
 src/server/ua_services_nodemanagement.c       |  6 +-
 .../backend_open62541_datatypes.py            | 98 +++++++++++++------
 .../backend_open62541_nodes.py                | 17 ++--
 tools/nodeset_compiler/datatypes.py           | 15 ++-
 tools/nodeset_compiler/nodeset_compiler.py    |  6 ++
 5 files changed, 100 insertions(+), 42 deletions(-)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index fd8b8975fcc..64e1d0bf910 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -2085,7 +2085,11 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
     if(*retval == UA_STATUSCODE_BADDUPLICATEREFERENCENOTALLOWED) {
         /* Calculate common duplicate reference not allowed result and set bad
          * result if BOTH directions already existed */
-        if(firstExisted) {
+        if(UA_NodeId_equal(&item->sourceNodeId, &item->targetNodeId.nodeId)) {
+            *retval = UA_STATUSCODE_GOOD;
+            UA_LOG_INFO_SESSION(&server->config.logger, session, "The source node and the target node are identical. The check for duplicate references is skipped.");
+        }
+        else if(firstExisted) {
             *retval = UA_STATUSCODE_BADDUPLICATEREFERENCENOTALLOWED;
             return;
         }
diff --git a/tools/nodeset_compiler/backend_open62541_datatypes.py b/tools/nodeset_compiler/backend_open62541_datatypes.py
index a67fa44a60b..5fb1d12982f 100644
--- a/tools/nodeset_compiler/backend_open62541_datatypes.py
+++ b/tools/nodeset_compiler/backend_open62541_datatypes.py
@@ -2,7 +2,7 @@
                         Int16, UInt16, Int32, UInt32, Int64, UInt64, Float, Double, \
                         String, XmlElement, ByteString, Structure, ExtensionObject, LocalizedText, \
                         NodeId, ExpandedNodeId, DateTime, QualifiedName, StatusCode, \
-                        DiagnosticInfo, Guid
+                        DiagnosticInfo, Guid, BuiltinType
 import datetime
 import re
 
@@ -111,9 +111,20 @@ def generateDateTimeCode(value):
 def lowerFirstChar(inputString):
     return inputString[0].lower() + inputString[1:]
 
-def generateNodeValueCode(prepend , node, instanceName, valueName, global_var_code, asIndirect=False, nodeset=None):
+def generateNodeValueCode(prepend , node, instanceName, valueName, global_var_code, asIndirect=False, encRule=None, nodeset=None, idxList=None):
+    # TODO: The default values for the remaining data types still have to be added.
     if type(node) in [Boolean, Byte, SByte, Int16, UInt16, Int32, UInt32, Int64, UInt64, Float, Double]:
-        return prepend + " = (UA_" + node.__class__.__name__ + ") " + str(node.value) + ";"
+        if node.value is None:
+            if type(node) == Boolean:
+                node.value = False
+            elif type(node) == Double or type(node) == Float:
+                node.value = 0.0
+            else: 
+                node.value = 0
+        if encRule is None:
+            return prepend + " = (UA_" + node.__class__.__name__ + ") " + str(node.value) + ";"
+        else:
+            return prepend + " = (UA_" + encRule.member_type.name + ") " + str(node.value) + ";"
     elif isinstance(node, String):
         return prepend + " = " + generateStringCode(node.value, alloc=asIndirect) + ";"
     elif isinstance(node, XmlElement):
@@ -144,32 +155,61 @@ def generateNodeValueCode(prepend , node, instanceName, valueName, global_var_co
         if asIndirect == False:
             return prepend + " = *" + str(instanceName) + ";"
         return prepend + " = " + str(instanceName) + ";"
-    elif isinstance(node, Structure):
+    elif isinstance(node, list):
         code = []
-        for idx,subv in enumerate(node.value):
-            if isinstance(subv, list):
-                if len(subv) == 0:
-                    continue
-                logger.info("Structure contains array")
-                accessor = "->"
-                encField = node.encodingRule[idx].name
-                memberName = makeCIdentifier(lowerFirstChar(encField))
-                encTypeString = "UA_" + subv[0].__class__.__name__
-                instanceNameSafe = makeCIdentifier(instanceName)
-                code.append("UA_STACKARRAY(" + encTypeString + ", " + instanceNameSafe + "_" + memberName+", {0});".format(len(subv)))
-                encTypeArr = nodeset.getDataTypeNode(subv[0].__class__.__name__).typesArray
-                encTypeArrayString = encTypeArr + "[" + encTypeArr + "_" + subv[0].__class__.__name__.upper() + "]"
-                code.append("UA_init({instanceName}, &{typeArrayString});".format(instanceName=instanceNameSafe + "_" + memberName,
-                                                                                typeArrayString=encTypeArrayString))
-
-                for subArrayIdx,val in enumerate(subv):
-                    code.append(generateNodeValueCode(instanceNameSafe + "_" + memberName + "[" + str(subArrayIdx) + "]",
-                                                    val, instanceName,instanceName + "_gehtNed_member", global_var_code, asIndirect=False))
-                code.append(instanceName + accessor + memberName + "Size = {0};".format(len(subv)))
-                code.append(instanceName + accessor + memberName + " = " + instanceNameSafe+"_"+ memberName+";")
-            else:
-                code.append(generateNodeValueCode(prepend + "." + lowerFirstChar(subv.alias), subv, instanceName, valueName, global_var_code, asIndirect))
+        if idxList is None:
+            raise Exception("No index was passed and the code generation cannot generate the array element")
+        # Code generation for structure arrays with fields of type Buildin.
+        # Example:
+        #   Structure []
+        #     | | |_ UInt32
+        #    | |_ UInt32
+        #   |_ UInt16
+        if isinstance(encRule.member_type, BuiltinType):
+            # Initialize the stack array
+            typeOfArray = encRule.member_type.name
+            arrayName = encRule.name
+            code.append("UA_STACKARRAY(UA_" + typeOfArray + ", " + arrayName+", {0});".format(len(node)))
+            for idx,subv in enumerate(node):
+                code.append(generateNodeValueCode(arrayName + "[" + str(idx) + "]", subv, instanceName, valueName, global_var_code, asIndirect, encRule=encRule, idxList=idx))
+            code.append(prepend + "Size = {0};".format(len(node)))
+            code.append(prepend + " = " + arrayName +";")
+        # Code generation for structure arrays with fields of different types.
+        # Example:
+        #   Structure []
+        #     | |_ String
+        #    |_ Structure []
+        #          | |_ Double
+        #          |_ Double 
+        else:
+            arrayName = encRule.name
+            for idx,subv in enumerate(node):
+                encField = encRule.member_type.members[idx].name
+                subEncRule = encRule.member_type.members[idx]
+                code.append(generateNodeValueCode(arrayName + "[" + str(idxList) + "]" + "." + encField, subv, instanceName, valueName, global_var_code, asIndirect, encRule=subEncRule, idxList=idx))
         return "\n".join(code)
+    elif isinstance(node, Structure):
+        code = []
+        if encRule.is_array:
+            if len(node.value) == 0:
+                return "\n".join(code)
+            # Initialize the stack array
+            typeOfArray = encRule.member_type.name
+            arrayName = encRule.name
+            code.append("UA_STACKARRAY(UA_" + typeOfArray + ", " + arrayName+", {0});".format(len(node.value)))
+            # Values is a list of lists
+            # The current index must be passed so that the code path for evaluating lists has the current index value and can generate the code correctly.
+            for idx,subv in enumerate(node.value):
+                encField = encRule.name
+                subEncRule = encRule
+                code.append(generateNodeValueCode(prepend + "." + lowerFirstChar(encField), subv, instanceName, valueName, global_var_code, asIndirect, encRule=subEncRule, idxList=idx))
+            code.append(prepend + "Size = {0};".format(len(node.value)))
+            code.append(prepend + " = " + arrayName +";")
+
+        else:
+            for idx,subv in enumerate(node.value):
+                encField = encRule.member_type.members[idx].name
+                subEncRule = encRule.member_type.members[idx]
+                code.append(generateNodeValueCode(prepend + "." + lowerFirstChar(encField), subv, instanceName, valueName, global_var_code, asIndirect, encRule=subEncRule, idxList=idx))
 
-
-
+        return "\n".join(code)
diff --git a/tools/nodeset_compiler/backend_open62541_nodes.py b/tools/nodeset_compiler/backend_open62541_nodes.py
index 1818f9ba533..b7af3666dd4 100644
--- a/tools/nodeset_compiler/backend_open62541_nodes.py
+++ b/tools/nodeset_compiler/backend_open62541_nodes.py
@@ -20,6 +20,7 @@
 import logging
 
 import sys
+
 if sys.version_info[0] >= 3:
     # strings are already parsed to unicode
     def unicode(s):
@@ -305,6 +306,7 @@ def generateExtensionObjectSubtypeCode(node, parent, nodeset, global_var_code, i
         if subv is None:
             continue
         encField = node.encodingRule[idx].name
+        encRule = node.encodingRule[idx]
         memberName = makeCIdentifier(lowerFirstChar(encField))
 
         # Check if this is an array
@@ -331,16 +333,11 @@ def generateExtensionObjectSubtypeCode(node, parent, nodeset, global_var_code, i
             continue
 
         logger.debug("Encoding of field " + memberName + " is " + str(subv.encodingRule) + "defined by " + str(encField))
-        if subv.valueRank is None or subv.valueRank == 0:
-            if not subv.isNone():
-                # Some values can be optional
-                valueName = instanceName + accessor + memberName
-                code.append(generateNodeValueCode(valueName,
-                            subv, instanceName,valueName, global_var_code, asIndirect=False, nodeset=nodeset))
-        else:
-            memberName = makeCIdentifier(lowerFirstChar(encField))
-            code.append(generateNodeValueCode(instanceName + accessor + memberName + "Size", subv,
-                                              instanceName,valueName, global_var_code, asIndirect=False))
+        if not subv.isNone():
+            # Some values can be optional
+            valueName = instanceName + accessor + memberName
+            code.append(generateNodeValueCode(valueName,
+                        subv, instanceName,valueName, global_var_code, asIndirect=False, nodeset=nodeset, encRule=encRule))
 
     if not isArrayElement:
         code.append("UA_Variant_setScalar(&attr.value, " + instanceName + ", &" + typeArrayString + ");")
diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index 69fc063df8e..8dab0e38276 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -274,10 +274,21 @@ def __parseXMLSingleValue(self, xmlvalue, parentDataTypeNode, parent, parser, al
                                 t.parseXML(ebodypart)
                                 extobj.value.append(t)
                         elif isinstance(e.member_type, StructType):
+                            # information is_array!
                             structure = Structure()
                             structure.alias = ebodypart.localName
                             structure.value = []
-                            structure.__parseXMLSingleValue(ebodypart, parentDataTypeNode, parent, parser, alias=None, encodingPart=e.member_type)
+                            if e.is_array:
+                                values = []
+                                for el in ebodypart.childNodes:
+                                    if not el.nodeType == el.ELEMENT_NODE:
+                                        continue
+                                    structure.__parseXMLSingleValue(el, parentDataTypeNode, parent, parser, alias=None, encodingPart=e.member_type)
+                                    values.append(structure.value)
+                                    structure.value = []
+                                structure.value = values
+                            else:
+                                structure.__parseXMLSingleValue(ebodypart, parentDataTypeNode, parent, parser, alias=None, encodingPart=e.member_type)
                             extobj.value.append(structure)
                         elif isinstance(e.member_type, EnumerationType):
                             t = self.getTypeByString("Int32", None)
@@ -348,7 +359,7 @@ def __parseXMLSingleValue(self, xmlvalue, parentDataTypeNode, parent, parser, al
                                         self.value.append(t)
                         elif isinstance(e.member_type, StructType):
                             structure = Structure()
-                            structure.alias = ebodypart.localName
+                            structure.alias = e.name
                             structure.value = []
                             structure.__parseXMLSingleValue(childValue, parentDataTypeNode, parent, parser, alias=None, encodingPart=e.member_type)
                             self.value.append(structure)
diff --git a/tools/nodeset_compiler/nodeset_compiler.py b/tools/nodeset_compiler/nodeset_compiler.py
index 99a429ab5d5..3264fb4fcb9 100755
--- a/tools/nodeset_compiler/nodeset_compiler.py
+++ b/tools/nodeset_compiler/nodeset_compiler.py
@@ -114,6 +114,12 @@
 nsCount = 0
 loadedFiles = list()
 
+# Remove duplicate entries in typesArray, which occur when a nodeset has more than one depend.
+tmp_list = []
+for e in args.typesArray:
+    if e not in tmp_list:
+        tmp_list.append(e)
+args.typesArray = tmp_list
 def getTypesArray(nsIdx):
     if nsIdx < len(args.typesArray):
         return args.typesArray[nsIdx]

From 3befc2181a21d7bd577f9330c4dd0d7a4cc30735 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 21 Jan 2022 15:29:55 +0100
Subject: [PATCH 0054/1963] fix(nc): Create a Latest Flag which sets the NS0 to
 the latest Nodeset2.xml version. Fix a bug in the generation of the types.

---
 CMakeLists.txt                                | 22 ++++++++++++--
 .../backend_open62541_typedefinitions.py      | 30 +++++++++++++++----
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 180d6f79fa3..9da7ea307fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,8 +256,8 @@ if(UA_ENABLE_TPM2_KEYSTORE)
 endif()
 
 # Namespace Zero
-set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated namespace zero (minimal/reduced/full)")
-SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED" "FULL")
+set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated namespace zero (minimal/reduced/full/latest_1_05)")
+SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED" "FULL" "LATEST_1_05")
 if(UA_NAMESPACE_ZERO STREQUAL "MINIMAL")
     set(UA_GENERATED_NAMESPACE_ZERO OFF)
 else()
@@ -270,6 +270,12 @@ else()
     set(UA_GENERATED_NAMESPACE_ZERO_FULL OFF)
 endif()
 
+if(UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05")
+    set(UA_GENERATED_NAMESPACE_ZERO_LATEST_1_05 ON)
+else()
+    set(UA_GENERATED_NAMESPACE_ZERO_LATEST_1_05 OFF)
+endif()
+
 if(MSVC AND UA_NAMESPACE_ZERO STREQUAL "FULL")
     # For the full NS0 we need a stack size of 8MB (as it is default on linux)
     # See https://github.com/open62541/open62541/issues/1326
@@ -1169,7 +1175,7 @@ endif()
 # List of nodeset files combined into NS0 generated file
 set(UA_FILE_NODESETS)
 
-if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+if(UA_NAMESPACE_ZERO STREQUAL "FULL" OR UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05")
     if(NOT UA_FILE_NS0)
         set(UA_FILE_NS0 ${open62541_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
     endif()
@@ -1177,8 +1183,18 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
 
     if(NOT EXISTS "${UA_FILE_NS0}")
         message(FATAL_ERROR "File ${UA_FILE_NS0} not found. You probably need to initialize the git submodule for deps/ua-nodeset or set open62541_NODESET_DIR.")
+    else()
+        # If the "LATEST_1_05" flag is set, it must be checked whether the nodeset NS0 is on the latest version.
+        if(UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05")
+            file(READ ${UA_FILE_NS0} ver LIMIT 5000)
+            string(REGEX MATCH ".*http:\\/\\/opcfoundation\\.org\\/UA\\/\" Version=\"1\\.05" match ${ver})
+            if(NOT match)
+                message(FATAL_ERROR "File ${UA_FILE_NS0} is set incorrectly. You probably need to checkout the git submodule for deps/ua-nodeset to version 1.05. Therefore execute the following command inside the deps/ua-nodeset directory \ngit checkout v1.05")
+            endif()
+        endif()
     endif()
 
+
     set(UA_FILE_NODEIDS ${open62541_NODESET_DIR}/Schema/NodeIds.csv)
     set(UA_FILE_STATUSCODES ${open62541_NODESET_DIR}/Schema/StatusCode.csv)
     set(UA_FILE_TYPES_BSD ${open62541_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
diff --git a/tools/nodeset_compiler/backend_open62541_typedefinitions.py b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
index f35408f6cad..aaac8592a51 100644
--- a/tools/nodeset_compiler/backend_open62541_typedefinitions.py
+++ b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
@@ -156,6 +156,19 @@ def print_members(datatype, namespaceMap):
         before = None
         size = len(datatype.members)
         for i, member in enumerate(datatype.members):
+
+            # Abfrage member_type
+            if not member.member_type.members and isinstance(member.member_type, StructType):
+                type_name = "ExtensionObject"
+            else:
+                type_name = member.member_type.name
+
+            if before:
+                if not before.member_type.members and isinstance(before.member_type, StructType):
+                    type_name_before = "ExtensionObject"
+                else:
+                    type_name_before = before.member_type.name
+
             member_name = makeCIdentifier(member.name)
             member_name_capital = member_name
             if len(member_name) > 0:
@@ -164,7 +177,7 @@ def print_members(datatype, namespaceMap):
             m += "    UA_TYPENAME(\"%s\") /* .memberName */\n" % member_name_capital
             m += "    &UA_%s[UA_%s_%s], /* .memberType */\n" % (
                 member.member_type.outname.upper(), member.member_type.outname.upper(),
-                makeCIdentifier(member.member_type.name.upper()))
+                makeCIdentifier(type_name.upper()))
             m += "    "
             if not before and not isUnion:
                 m += "0,"
@@ -179,7 +192,7 @@ def print_members(datatype, namespaceMap):
                 if before.is_array or before.is_optional:
                     m += " - sizeof(void *),"
                 else:
-                    m += " - sizeof(UA_%s)," % makeCIdentifier(before.member_type.name)
+                    m += " - sizeof(UA_%s)," % makeCIdentifier(type_name_before)
             m += " /* .padding */\n"
             m += ("    true" if member.is_array else "    false") + ", /* .isArray */\n"
             m += ("    true" if member.is_optional else "    false") + "  /* .isOptional */\n}"
@@ -275,6 +288,11 @@ def print_struct_typedef(struct):
             returnstr += "    UA_%sSwitch switchField;\n" % struct.name
             returnstr += "    union {\n"
         for member in struct.members:
+            if not member.member_type.members and isinstance(member.member_type, StructType):
+                type_name = "ExtensionObject"
+            else:
+                type_name = member.member_type.name
+
             if member.is_array:
                 if struct.is_union:
                     returnstr += "        struct {\n        "
@@ -282,18 +300,18 @@ def print_struct_typedef(struct):
                 if struct.is_union:
                     returnstr += "        "
                 returnstr += "    UA_%s *%s;\n" % (
-                    makeCIdentifier(member.member_type.name), makeCIdentifier(member.name))
+                    makeCIdentifier(type_name), makeCIdentifier(member.name))
                 if struct.is_union:
                     returnstr += "        } " + makeCIdentifier(member.name) + ";\n"
             elif struct.is_union:
                 returnstr += "        UA_%s %s;\n" % (
-                makeCIdentifier(member.member_type.name), makeCIdentifier(member.name))
+                makeCIdentifier(type_name), makeCIdentifier(member.name))
             elif member.is_optional:
                 returnstr += "    UA_%s *%s;\n" % (
-                    makeCIdentifier(member.member_type.name), makeCIdentifier(member.name))
+                    makeCIdentifier(type_name), makeCIdentifier(member.name))
             else:
                 returnstr += "    UA_%s %s;\n" % (
-                    makeCIdentifier(member.member_type.name), makeCIdentifier(member.name))
+                    makeCIdentifier(type_name), makeCIdentifier(member.name))
         if struct.is_union:
             returnstr += "    } fields;\n"
         if struct.is_recursive:

From f73404023ddadfe6eeb9938f653cd6a62c8d72a8 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 3 Feb 2022 18:26:03 +0100
Subject: [PATCH 0055/1963] feat(el): integrate eventloop for server

---
 arch/network_tcp.c                     | 647 ++++++-------------------
 include/open62541/server.h             |   4 +
 plugins/ua_config_default.c            |  18 +-
 src/server/ua_server.c                 | 107 ++--
 src/server/ua_server_config.c          |   4 +
 src/server/ua_services_securechannel.c |   2 -
 src/ua_connection.c                    |  81 ++++
 src/ua_connection_internal.h           |  31 ++
 8 files changed, 355 insertions(+), 539 deletions(-)

diff --git a/arch/network_tcp.c b/arch/network_tcp.c
index 2a77e514a2c..311495bee29 100644
--- a/arch/network_tcp.c
+++ b/arch/network_tcp.c
@@ -25,6 +25,142 @@
 #define MSG_NOSIGNAL 0
 #endif
 
+typedef struct ConnectionEntry {
+    UA_Connection connection;
+    LIST_ENTRY(ConnectionEntry) pointers;
+} ConnectionEntry;
+
+typedef struct {
+    const UA_Logger *logger;
+    UA_UInt16 port;
+    UA_UInt16 maxConnections;
+    UA_SOCKET serverSockets[FD_SETSIZE];
+    UA_UInt16 serverSocketsSize;
+    LIST_HEAD(, ConnectionEntry) connections;
+    UA_UInt16 connectionsSize;
+} ServerNetworkLayerTCP;
+
+/***************************/
+/* Server NetworkLayer TCP */
+/***************************/
+
+#define MAXBACKLOG     100
+#define NOHELLOTIMEOUT 120000 /* timeout in ms before close the connection
+                               * if server does not receive Hello Message */
+
+static UA_StatusCode
+ServerNetworkLayerTCP_start(UA_ServerNetworkLayer *nl, const UA_Logger *logger,
+                            const UA_String *customHostname) {
+    UA_initialize_architecture_network();
+
+    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
+    layer->logger = logger;
+
+    /* Get addrinfo of the server and create server sockets */
+    char hostname[512];
+    if(customHostname->length) {
+        if(customHostname->length >= sizeof(hostname))
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        memcpy(hostname, customHostname->data, customHostname->length);
+        hostname[customHostname->length] = '\0';
+    }
+    char portno[6];
+    UA_snprintf(portno, 6, "%d", layer->port);
+    struct addrinfo hints;
+    memset(&hints, 0, sizeof hints);
+
+    /* Get the discovery url from the hostname */
+    UA_String du = UA_STRING_NULL;
+    char discoveryUrlBuffer[256];
+    if(customHostname->length) {
+        du.length = (size_t)UA_snprintf(discoveryUrlBuffer, 255, "opc.tcp://%.*s:%d/",
+                                        (int)customHostname->length, customHostname->data,
+                                        layer->port);
+        du.data = (UA_Byte*)discoveryUrlBuffer;
+    } else {
+        char hostnameBuffer[256];
+        if(UA_gethostname(hostnameBuffer, 255) == 0) {
+            du.length = (size_t)UA_snprintf(discoveryUrlBuffer, 255, "opc.tcp://%s:%d/",
+                                            hostnameBuffer, layer->port);
+            du.data = (UA_Byte*)discoveryUrlBuffer;
+        } else {
+            UA_LOG_ERROR(layer->logger, UA_LOGCATEGORY_NETWORK, "Could not get the hostname");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+    UA_String_copy(&du, &nl->discoveryUrl);
+
+    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
+                "TCP network layer listening on %.*s",
+                (int)nl->discoveryUrl.length, nl->discoveryUrl.data);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+ServerNetworkLayerTCP_listen(UA_ServerNetworkLayer *nl, UA_Server *server,
+                             UA_UInt16 timeout) {
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+ServerNetworkLayerTCP_stop(UA_ServerNetworkLayer *nl, UA_Server *server) {
+    UA_deinitialize_architecture_network();
+}
+
+/* run only when the server is stopped */
+static void
+ServerNetworkLayerTCP_clear(UA_ServerNetworkLayer *nl) {
+    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
+    UA_String_clear(&nl->discoveryUrl);
+
+    /* Hard-close and remove remaining connections. The server is no longer
+     * running. So this is safe. */
+    ConnectionEntry *e, *e_tmp;
+    LIST_FOREACH_SAFE(e, &layer->connections, pointers, e_tmp) {
+        LIST_REMOVE(e, pointers);
+        layer->connectionsSize--;
+        UA_free(e);
+        if(nl->statistics) {
+            nl->statistics->currentConnectionCount--;
+        }
+    }
+
+    /* Free the layer */
+    UA_free(layer);
+}
+
+UA_ServerNetworkLayer
+UA_ServerNetworkLayerTCP(UA_ConnectionConfig config, UA_UInt16 port,
+                         UA_UInt16 maxConnections) {
+    UA_ServerNetworkLayer nl;
+    memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
+    nl.clear = ServerNetworkLayerTCP_clear;
+    nl.localConnectionConfig = config;
+    nl.start = ServerNetworkLayerTCP_start;
+    nl.listen = ServerNetworkLayerTCP_listen;
+    nl.stop = ServerNetworkLayerTCP_stop;
+    nl.handle = NULL;
+
+    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP*)
+        UA_calloc(1,sizeof(ServerNetworkLayerTCP));
+    if(!layer)
+        return nl;
+    nl.handle = layer;
+
+    layer->port = port;
+    layer->maxConnections = maxConnections;
+
+    return nl;
+}
+
+typedef struct TCPClientConnection {
+    struct addrinfo hints, *server;
+    UA_DateTime connStart;
+    UA_String endpointUrl;
+    UA_UInt32 timeout;
+} TCPClientConnection;
+
+
 /****************************/
 /* Generic Socket Functions */
 /****************************/
@@ -72,8 +208,8 @@ connection_write(UA_Connection *connection, UA_ByteString *buf) {
         do {
             size_t bytes_to_send = buf->length - nWritten;
             n = UA_send(connection->sockfd,
-                     (const char*)buf->data + nWritten,
-                     bytes_to_send, flags);
+                        (const char*)buf->data + nWritten,
+                        bytes_to_send, flags);
             if(n<0) {
                 if(UA_ERRNO != UA_INTERRUPTED && UA_ERRNO != UA_AGAIN) {
                     connection->close(connection);
@@ -165,513 +301,6 @@ connection_recv(UA_Connection *connection, UA_ByteString *response,
 }
 
 
-/***************************/
-/* Server NetworkLayer TCP */
-/***************************/
-
-#define MAXBACKLOG     100
-#define NOHELLOTIMEOUT 120000 /* timeout in ms before close the connection
-                               * if server does not receive Hello Message */
-
-typedef struct ConnectionEntry {
-    UA_Connection connection;
-    LIST_ENTRY(ConnectionEntry) pointers;
-} ConnectionEntry;
-
-typedef struct {
-    const UA_Logger *logger;
-    UA_UInt16 port;
-    UA_UInt16 maxConnections;
-    UA_SOCKET serverSockets[FD_SETSIZE];
-    UA_UInt16 serverSocketsSize;
-    LIST_HEAD(, ConnectionEntry) connections;
-    UA_UInt16 connectionsSize;
-} ServerNetworkLayerTCP;
-
-static void
-ServerNetworkLayerTCP_freeConnection(UA_Connection *connection) {
-    UA_free(connection);
-}
-
-/* This performs only 'shutdown'. 'close' is called when the shutdown
- * socket is returned from select. */
-static void
-ServerNetworkLayerTCP_close(UA_Connection *connection) {
-    if(connection->state == UA_CONNECTIONSTATE_CLOSED)
-        return;
-    UA_shutdown((UA_SOCKET)connection->sockfd, 2);
-    connection->state = UA_CONNECTIONSTATE_CLOSED;
-}
-
-static UA_Boolean
-purgeFirstConnectionWithoutChannel(ServerNetworkLayerTCP *layer) {
-    ConnectionEntry *e;
-    LIST_FOREACH(e, &layer->connections, pointers) {
-        if(e->connection.channel == NULL) {
-            LIST_REMOVE(e, pointers);
-            layer->connectionsSize--;
-            UA_close(e->connection.sockfd);
-            e->connection.free(&e->connection);
-            return true;
-        }
-    }
-    return false;
-}
-
-static UA_StatusCode
-ServerNetworkLayerTCP_add(UA_ServerNetworkLayer *nl, ServerNetworkLayerTCP *layer,
-                          UA_Int32 newsockfd, struct sockaddr_storage *remote) {
-   if(layer->maxConnections && layer->connectionsSize >= layer->maxConnections &&
-      !purgeFirstConnectionWithoutChannel(layer)) {
-       return UA_STATUSCODE_BADTCPNOTENOUGHRESOURCES;
-   }
-
-    /* Set nonblocking */
-    UA_socket_set_nonblocking(newsockfd);//TODO: check return value
-
-    /* Do not merge packets on the socket (disable Nagle's algorithm) */
-    int dummy = 1;
-    if(UA_setsockopt(newsockfd, IPPROTO_TCP, TCP_NODELAY,
-               (const char *)&dummy, sizeof(dummy)) < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(layer->logger, UA_LOGCATEGORY_NETWORK,
-                             "Cannot set socket option TCP_NODELAY. Error: %s",
-                             errno_str));
-        return UA_STATUSCODE_BADUNEXPECTEDERROR;
-    }
-
-#if defined(UA_getnameinfo)
-    /* Get the peer name for logging */
-    char remote_name[100];
-    int res = UA_getnameinfo((struct sockaddr*)remote,
-                          sizeof(struct sockaddr_storage),
-                          remote_name, sizeof(remote_name),
-                          NULL, 0, NI_NUMERICHOST);
-    if(res == 0) {
-        UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                    "Connection %i | New connection over TCP from %s",
-                    (int)newsockfd, remote_name);
-    } else {
-        UA_LOG_SOCKET_ERRNO_WRAP(UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                                                "Connection %i | New connection over TCP, "
-                                                "getnameinfo failed with error: %s",
-                                                (int)newsockfd, errno_str));
-    }
-#else
-    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                "Connection %i | New connection over TCP",
-                (int)newsockfd);
-#endif
-    /* Allocate and initialize the connection */
-    ConnectionEntry *e = (ConnectionEntry*)UA_malloc(sizeof(ConnectionEntry));
-    if(!e) {
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-
-    UA_Connection *c = &e->connection;
-    memset(c, 0, sizeof(UA_Connection));
-    c->sockfd = newsockfd;
-    c->handle = layer;
-    c->send = connection_write;
-    c->close = ServerNetworkLayerTCP_close;
-    c->free = ServerNetworkLayerTCP_freeConnection;
-    c->getSendBuffer = connection_getsendbuffer;
-    c->releaseSendBuffer = connection_releasesendbuffer;
-    c->releaseRecvBuffer = connection_releaserecvbuffer;
-    c->state = UA_CONNECTIONSTATE_OPENING;
-    c->openingDate = UA_DateTime_nowMonotonic();
-
-    layer->connectionsSize++;
-
-    /* Add to the linked list */
-    LIST_INSERT_HEAD(&layer->connections, e, pointers);
-    if(nl->statistics) {
-        nl->statistics->currentConnectionCount++;
-        nl->statistics->cumulatedConnectionCount++;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-addServerSocket(ServerNetworkLayerTCP *layer, struct addrinfo *ai) {
-    /* Create the server socket */
-    UA_SOCKET newsock = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-    if(newsock == UA_INVALID_SOCKET)
-    {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                           "Error opening the server socket: %s", errno_str));
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-    /* Some Linux distributions have net.ipv6.bindv6only not activated. So
-     * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
-     * AF_INET6 sockets only for IPv6. */
-
-    int optval = 1;
-#if UA_IPV6
-    if(ai->ai_family == AF_INET6 &&
-       UA_setsockopt(newsock, IPPROTO_IPV6, IPV6_V6ONLY,
-                  (const char*)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                       "Could not set an IPv6 socket to IPv6 only");
-        UA_close(newsock);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-
-    }
-#endif
-    if(UA_setsockopt(newsock, SOL_SOCKET, SO_REUSEADDR,
-                  (const char *)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                       "Could not make the socket reusable");
-        UA_close(newsock);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-
-    if(UA_socket_set_nonblocking(newsock) != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                       "Could not set the server socket to nonblocking");
-        UA_close(newsock);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-    /* Bind socket to address */
-    int ret = UA_bind(newsock, ai->ai_addr, (socklen_t)ai->ai_addrlen);
-    if(ret < 0) {
-        /* If bind to specific address failed, try to bind *-socket */
-        if(ai->ai_family == AF_INET) {
-            struct sockaddr_in *sin = (struct sockaddr_in *)ai->ai_addr;
-            if(sin->sin_addr.s_addr != htonl(INADDR_ANY)) {
-                sin->sin_addr.s_addr = 0;
-                ret = 0;
-            }
-        }
-#if UA_IPV6
-        else if(ai->ai_family == AF_INET6) {
-            struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)ai->ai_addr;
-            if(!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-                memset(&sin6->sin6_addr, 0, sizeof(sin6->sin6_addr));
-                sin6->sin6_scope_id = 0;
-                ret = 0;
-            }
-        }
-#endif // UA_IPV6
-        if(ret == 0) {
-            ret = UA_bind(newsock, ai->ai_addr, (socklen_t)ai->ai_addrlen);
-            if(ret == 0) {
-                /* The second bind fixed the issue, inform the user. */
-                UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                    "Server socket bound to unspecified address");
-            }
-        }
-    }
-    if(ret < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                           "Error binding a server socket: %s", errno_str));
-        UA_close(newsock);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-    /* Start listening */
-    if(UA_listen(newsock, MAXBACKLOG) < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                       "Error listening on server socket: %s", errno_str));
-        UA_close(newsock);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-    if(layer->port == 0) {
-        /* Port was automatically chosen. Read it from the OS */
-        struct sockaddr_in returned_addr;
-        memset(&returned_addr, 0, sizeof(returned_addr));
-        socklen_t len = sizeof(returned_addr);
-        UA_getsockname(newsock, (struct sockaddr *)&returned_addr, &len);
-        layer->port = ntohs(returned_addr.sin_port);
-    }
-
-    layer->serverSockets[layer->serverSocketsSize] = newsock;
-    layer->serverSocketsSize++;
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-ServerNetworkLayerTCP_start(UA_ServerNetworkLayer *nl, const UA_Logger *logger,
-                            const UA_String *customHostname) {
-    UA_initialize_architecture_network();
-
-    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
-    layer->logger = logger;
-
-    /* Get addrinfo of the server and create server sockets */
-    char hostname[512];
-    if(customHostname->length) {
-        if(customHostname->length >= sizeof(hostname))
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        memcpy(hostname, customHostname->data, customHostname->length);
-        hostname[customHostname->length] = '\0';
-    }
-    char portno[6];
-    UA_snprintf(portno, 6, "%d", layer->port);
-    struct addrinfo hints, *res;
-    memset(&hints, 0, sizeof hints);
-#if UA_IPV6
-    hints.ai_family = AF_UNSPEC; /* allow IPv4 and IPv6 */
-#else
-    hints.ai_family = AF_INET;   /* enforce IPv4 only */
-#endif
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_flags = AI_PASSIVE;
-#ifdef AI_ADDRCONFIG
-    hints.ai_flags |= AI_ADDRCONFIG;
-#endif
-    hints.ai_protocol = IPPROTO_TCP;
-    int retcode = UA_getaddrinfo(customHostname->length ? hostname : NULL,
-                                 portno, &hints, &res);
-    if(retcode != 0) {
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                                                    "getaddrinfo lookup of %s failed with error %d - %s", hostname, retcode, errno_str));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* There might be serveral addrinfos (for different network cards,
-     * IPv4/IPv6). Add a server socket for all of them. */
-    struct addrinfo *ai = res;
-    for(layer->serverSocketsSize = 0;
-        layer->serverSocketsSize < FD_SETSIZE && ai != NULL;
-        ai = ai->ai_next) {
-        addServerSocket(layer, ai);
-    }
-    UA_freeaddrinfo(res);
-    
-    if(layer->serverSocketsSize == 0) {
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }    
-
-    /* Get the discovery url from the hostname */
-    UA_String du = UA_STRING_NULL;
-    char discoveryUrlBuffer[256];
-    if(customHostname->length) {
-        du.length = (size_t)UA_snprintf(discoveryUrlBuffer, 255, "opc.tcp://%.*s:%d/",
-                                        (int)customHostname->length, customHostname->data,
-                                        layer->port);
-        du.data = (UA_Byte*)discoveryUrlBuffer;
-    } else {
-        char hostnameBuffer[256];
-        if(UA_gethostname(hostnameBuffer, 255) == 0) {
-            du.length = (size_t)UA_snprintf(discoveryUrlBuffer, 255, "opc.tcp://%s:%d/",
-                                            hostnameBuffer, layer->port);
-            du.data = (UA_Byte*)discoveryUrlBuffer;
-        } else {
-            UA_LOG_ERROR(layer->logger, UA_LOGCATEGORY_NETWORK, "Could not get the hostname");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-    UA_String_copy(&du, &nl->discoveryUrl);
-
-    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                "TCP network layer listening on %.*s",
-                (int)nl->discoveryUrl.length, nl->discoveryUrl.data);
-    return UA_STATUSCODE_GOOD;
-}
-
-/* After every select, reset the sockets to listen on */
-static UA_Int32
-setFDSet(ServerNetworkLayerTCP *layer, fd_set *fdset) {
-    FD_ZERO(fdset);
-    UA_Int32 highestfd = 0;
-    for(UA_UInt16 i = 0; i < layer->serverSocketsSize; i++) {
-        UA_fd_set(layer->serverSockets[i], fdset);
-        if((UA_Int32)layer->serverSockets[i] > highestfd)
-            highestfd = (UA_Int32)layer->serverSockets[i];
-    }
-
-    ConnectionEntry *e;
-    LIST_FOREACH(e, &layer->connections, pointers) {
-        UA_fd_set(e->connection.sockfd, fdset);
-        if((UA_Int32)e->connection.sockfd > highestfd)
-            highestfd = (UA_Int32)e->connection.sockfd;
-    }
-
-    return highestfd;
-}
-
-static UA_StatusCode
-ServerNetworkLayerTCP_listen(UA_ServerNetworkLayer *nl, UA_Server *server,
-                             UA_UInt16 timeout) {
-    /* Every open socket can generate two jobs */
-    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
-
-    if(layer->serverSocketsSize == 0)
-        return UA_STATUSCODE_GOOD;
-
-    /* Listen on open sockets (including the server) */
-    fd_set fdset, errset;
-    UA_Int32 highestfd = setFDSet(layer, &fdset);
-    setFDSet(layer, &errset);
-    struct timeval tmptv = {0, timeout * 1000};
-    if(UA_select(highestfd+1, &fdset, NULL, &errset, &tmptv) < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_DEBUG(layer->logger, UA_LOGCATEGORY_NETWORK,
-                           "Socket select failed with %s", errno_str));
-        // we will retry, so do not return bad
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* Accept new connections via the server sockets */
-    for(UA_UInt16 i = 0; i < layer->serverSocketsSize; i++) {
-        if(!UA_fd_isset(layer->serverSockets[i], &fdset))
-            continue;
-
-        struct sockaddr_storage remote;
-        socklen_t remote_size = sizeof(remote);
-        UA_SOCKET newsockfd = UA_accept(layer->serverSockets[i],
-                                  (struct sockaddr*)&remote, &remote_size);
-        if(newsockfd == UA_INVALID_SOCKET)
-            continue;
-
-        UA_LOG_TRACE(layer->logger, UA_LOGCATEGORY_NETWORK,
-                    "Connection %i | New TCP connection on server socket %i",
-                    (int)newsockfd, (int)(layer->serverSockets[i]));
-
-        if(ServerNetworkLayerTCP_add(nl, layer, (UA_Int32)newsockfd, &remote) != UA_STATUSCODE_GOOD) {
-            UA_close(newsockfd);
-        }
-    }
-
-    /* Read from established sockets */
-    ConnectionEntry *e, *e_tmp;
-    UA_DateTime now = UA_DateTime_nowMonotonic();
-    LIST_FOREACH_SAFE(e, &layer->connections, pointers, e_tmp) {
-        if((e->connection.state == UA_CONNECTIONSTATE_OPENING) &&
-            (now > (e->connection.openingDate + (NOHELLOTIMEOUT * UA_DATETIME_MSEC)))) {
-            UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                        "Connection %i | Closed by the server (no Hello Message)",
-                         (int)(e->connection.sockfd));
-            LIST_REMOVE(e, pointers);
-            layer->connectionsSize--;
-            UA_close(e->connection.sockfd);
-            UA_Server_removeConnection(server, &e->connection);
-            if(nl->statistics) {
-                nl->statistics->connectionTimeoutCount--;
-                nl->statistics->currentConnectionCount--;
-            }
-            continue;
-        }
-
-        if(!UA_fd_isset(e->connection.sockfd, &errset) &&
-           !UA_fd_isset(e->connection.sockfd, &fdset))
-          continue;
-
-        UA_LOG_TRACE(layer->logger, UA_LOGCATEGORY_NETWORK,
-                    "Connection %i | Activity on the socket",
-                    (int)(e->connection.sockfd));
-
-        UA_ByteString buf = UA_BYTESTRING_NULL;
-        UA_StatusCode retval = connection_recv(&e->connection, &buf, 0);
-
-        if(retval == UA_STATUSCODE_GOOD) {
-            /* Process packets */
-            UA_Server_processBinaryMessage(server, &e->connection, &buf);
-            connection_releaserecvbuffer(&e->connection, &buf);
-        } else if(retval == UA_STATUSCODE_BADCONNECTIONCLOSED) {
-            /* The socket is shutdown but not closed */
-            UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                        "Connection %i | Closed",
-                        (int)(e->connection.sockfd));
-            LIST_REMOVE(e, pointers);
-            layer->connectionsSize--;
-            UA_close(e->connection.sockfd);
-            UA_Server_removeConnection(server, &e->connection);
-            if(nl->statistics) {
-                nl->statistics->currentConnectionCount--;
-            }
-        }
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-ServerNetworkLayerTCP_stop(UA_ServerNetworkLayer *nl, UA_Server *server) {
-    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
-    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                "Shutting down the TCP network layer");
-
-    /* Close the server sockets */
-    for(UA_UInt16 i = 0; i < layer->serverSocketsSize; i++) {
-        UA_shutdown(layer->serverSockets[i], 2);
-        UA_close(layer->serverSockets[i]);
-    }
-    layer->serverSocketsSize = 0;
-
-    /* Close open connections */
-    ConnectionEntry *e;
-    LIST_FOREACH(e, &layer->connections, pointers)
-        ServerNetworkLayerTCP_close(&e->connection);
-
-    /* Run recv on client sockets. This picks up the closed sockets and frees
-     * the connection. */
-    ServerNetworkLayerTCP_listen(nl, server, 0);
-
-    UA_deinitialize_architecture_network();
-}
-
-/* run only when the server is stopped */
-static void
-ServerNetworkLayerTCP_clear(UA_ServerNetworkLayer *nl) {
-    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
-    UA_String_clear(&nl->discoveryUrl);
-
-    /* Hard-close and remove remaining connections. The server is no longer
-     * running. So this is safe. */
-    ConnectionEntry *e, *e_tmp;
-    LIST_FOREACH_SAFE(e, &layer->connections, pointers, e_tmp) {
-        LIST_REMOVE(e, pointers);
-        layer->connectionsSize--;
-        UA_close(e->connection.sockfd);
-        UA_free(e);
-        if(nl->statistics) {
-            nl->statistics->currentConnectionCount--;
-        }
-    }
-
-    /* Free the layer */
-    UA_free(layer);
-}
-
-UA_ServerNetworkLayer
-UA_ServerNetworkLayerTCP(UA_ConnectionConfig config, UA_UInt16 port,
-                         UA_UInt16 maxConnections) {
-    UA_ServerNetworkLayer nl;
-    memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
-    nl.clear = ServerNetworkLayerTCP_clear;
-    nl.localConnectionConfig = config;
-    nl.start = ServerNetworkLayerTCP_start;
-    nl.listen = ServerNetworkLayerTCP_listen;
-    nl.stop = ServerNetworkLayerTCP_stop;
-    nl.handle = NULL;
-
-    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP*)
-        UA_calloc(1,sizeof(ServerNetworkLayerTCP));
-    if(!layer)
-        return nl;
-    nl.handle = layer;
-
-    layer->port = port;
-    layer->maxConnections = maxConnections;
-
-    return nl;
-}
-
-typedef struct TCPClientConnection {
-    struct addrinfo hints, *server;
-    UA_DateTime connStart;
-    UA_String endpointUrl;
-    UA_UInt32 timeout;
-} TCPClientConnection;
-
 /***************************/
 /* Client NetworkLayer TCP */
 /***************************/
diff --git a/include/open62541/server.h b/include/open62541/server.h
index ada3455c332..e4e5e7558f3 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -153,9 +153,13 @@ struct UA_ServerConfig {
     UA_EventLoop *eventLoop;
     UA_Boolean externalEventLoop; /* The EventLoop is not deleted with the config */
 
+    size_t connectionManagersSize;
+    UA_ConnectionManager *connectionManagers[10];
+
     /**
      * Networking
      * ^^^^^^^^^^ */
+
     size_t networkLayersSize;
     UA_ServerNetworkLayer *networkLayers;
     UA_String customHostname;
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 15e9cc65608..2b4d275ae63 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -141,7 +141,11 @@ setDefaultConfig(UA_ServerConfig *conf) {
         conf->externalEventLoop = false;
     }
 
-    /* --> Start setting the default static config <-- */
+    /* Eventsources */
+    conf->connectionManagersSize = 0;
+    /* conf->connectionManagers; */
+
+   /* --> Start setting the default static config <-- */
 
     conf->shutdownDelay = 0.0;
 
@@ -330,6 +334,18 @@ UA_ServerConfig_addNetworkLayerTCP(UA_ServerConfig *conf, UA_UInt16 portNumber,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     conf->networkLayersSize++;
 
+    /* TCP Eventsource */
+
+    UA_ConnectionManager *tcpCM = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
+    conf->connectionManagers[conf->connectionManagersSize] = tcpCM;
+    UA_UInt16 port = portNumber;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_KeyValueMap_set(&tcpCM->eventSource.params, &tcpCM->eventSource.paramsSize, UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    conf->connectionManagersSize++;
+
+    conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *) tcpCM);
+
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 1ba7413b806..667c9b47ad4 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -51,6 +51,7 @@
  *
  * Therefore one has to set the custom NS1 URI before one of the previously
  * mentioned steps. */
+
 void
 setupNs1Uri(UA_Server *server) {
     if(!server->namespaces[1].data) {
@@ -207,7 +208,10 @@ void UA_Server_delete(UA_Server *server) {
     while(res == UA_STATUSCODE_GOOD &&
           (server->config.eventLoop->state != UA_EVENTLOOPSTATE_FRESH &&
            server->config.eventLoop->state != UA_EVENTLOOPSTATE_STOPPED)) {
+
+        UA_UNLOCK(&server->serviceMutex);
         res = server->config.eventLoop->run(server->config.eventLoop, 100);
+        UA_LOCK(&server->serviceMutex);
     }
 
     /* Clean up the Admin Session */
@@ -546,6 +550,29 @@ UA_Server_getStatistics(UA_Server *server) {
     return stat;
 }
 
+/**************************/
+/* Setup Server EventLoop */
+/**************************/
+
+static
+UA_StatusCode
+UA_Server_setupEventLoop(UA_Server *server) {
+    UA_Server_BasicConnectionContext *ctx = (UA_Server_BasicConnectionContext*) UA_malloc(sizeof(UA_Server_BasicConnectionContext));
+    memset(ctx, 0, sizeof(UA_Server_BasicConnectionContext));
+    UA_CHECK_MEM(ctx, return UA_STATUSCODE_BADOUTOFMEMORY);
+
+    ctx->server = server;
+    ctx->isInitial = true;
+
+    /* TODO: map the connection managers to their names instead of "0" for TCP */
+    UA_ConnectionManager *tcpCM = UA_Server_getConfig(server)->connectionManagers[0];
+    ctx->cm = tcpCM;
+    tcpCM->connectionCallback = UA_Server_connectionCallback;
+    tcpCM->initialConnectionContext = ctx;
+
+    return UA_STATUSCODE_GOOD;
+}
+
 /********************/
 /* Main Server Loop */
 /********************/
@@ -571,7 +598,10 @@ UA_Server_run_startup(UA_Server *server) {
                  "This should only be used for specific fuzzing builds.");
 #endif
 
-    UA_StatusCode retVal = server->config.eventLoop->start(server->config.eventLoop);
+    UA_StatusCode retVal = UA_Server_setupEventLoop(server);
+    UA_CHECK_STATUS(retVal, return retVal);
+
+    retVal = server->config.eventLoop->start(server->config.eventLoop);
     UA_CHECK_STATUS(retVal, return retVal);
 
     /* ensure that the uri for ns1 is set up from the app description */
@@ -656,28 +686,9 @@ UA_Server_run_startup(UA_Server *server) {
 
 UA_UInt16
 UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
-    /* Process repeated work */
-    UA_DateTime now = UA_DateTime_nowMonotonic();
-    server->config.eventLoop->run(server->config.eventLoop, 0);
-    UA_DateTime nextRepeated =
-        server->config.eventLoop->nextCyclicTime(server->config.eventLoop);
-    UA_DateTime latest = now + (UA_MAXTIMEOUT * UA_DATETIME_MSEC);
-    if(nextRepeated > latest)
-        nextRepeated = latest;
 
     UA_UInt16 timeout = 0;
 
-    /* round always to upper value to avoid timeout to be set to 0
-    * if(nextRepeated - now) < (UA_DATETIME_MSEC/2) */
-    if(waitInternal)
-        timeout = (UA_UInt16)(((nextRepeated - now) + (UA_DATETIME_MSEC - 1)) / UA_DATETIME_MSEC);
-
-    /* Listen on the networklayer */
-    for(size_t i = 0; i < server->config.networkLayersSize; ++i) {
-        UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
-        nl->listen(nl, server, timeout);
-    }
-
 #if defined(UA_ENABLE_PUBSUB_MQTT)
     /* Listen on the pubsublayer, but only if the yield function is set */
     UA_PubSubConnection *connection;
@@ -688,11 +699,25 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
         }
     }
 #endif
+    /* Process repeated work */
+    UA_DateTime now = UA_DateTime_nowMonotonic();
+    UA_DateTime nextRepeated =
+        server->config.eventLoop->nextCyclicTime(server->config.eventLoop);
+    UA_DateTime latest = now + (UA_MAXTIMEOUT * UA_DATETIME_MSEC);
+    if(nextRepeated > latest)
+        nextRepeated = latest;
+    /* round always to upper value to avoid timeout to be set to 0
+    * if(nextRepeated - now) < (UA_DATETIME_MSEC/2) */
+    if(waitInternal)
+        timeout = (UA_UInt16)(((nextRepeated - now) + (UA_DATETIME_MSEC - 1)) / UA_DATETIME_MSEC);
 
-    UA_LOCK(&server->serviceMutex);
+    server->config.eventLoop->run(server->config.eventLoop, timeout);
 
 #if defined(UA_ENABLE_DISCOVERY_MULTICAST) && (UA_MULTITHREADING < 200)
+
+    UA_LOCK(&server->serviceMutex);
     if(server->config.mdnsEnabled) {
+
         /* TODO multicastNextRepeat does not consider new input data (requests)
          * on the socket. It will be handled on the next call. if needed, we
          * need to use select with timeout on the multicast socket
@@ -703,25 +728,52 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
         if(hasNext == UA_STATUSCODE_GOOD && multicastNextRepeat < nextRepeated)
             nextRepeated = multicastNextRepeat;
     }
-#endif
-
     UA_UNLOCK(&server->serviceMutex);
+#endif
 
-    now = UA_DateTime_nowMonotonic();
-    timeout = 0;
-    if(nextRepeated > now)
-        timeout = (UA_UInt16)((nextRepeated - now) / UA_DATETIME_MSEC);
     return timeout;
 }
 
+static
+bool
+allEventSourcesStopped(UA_ConnectionManager** sources, size_t count) {
+    UA_Boolean allStopped = true;
+    for (size_t i = 0; i < count; ++i) {
+        UA_ConnectionManager *source = sources[i];
+        allStopped = allStopped && source->eventSource.state == UA_EVENTSOURCESTATE_STOPPED;
+    }
+    return allStopped;
+}
+
 UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server) {
+
     /* Stop the netowrk layer */
     for(size_t i = 0; i < server->config.networkLayersSize; ++i) {
         UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
         nl->stop(nl, server);
     }
 
+    for (size_t i = 0; i < server->config.connectionManagersSize; ++i) {
+        UA_ConnectionManager *cm = server->config.connectionManagers[i];
+        if (cm->eventSource.eventLoop != NULL) {
+            cm->eventSource.stop(&cm->eventSource);
+        }
+    }
+
+    UA_DateTime elapsedTime = 0;
+    UA_DateTime startTime = UA_DateTime_nowMonotonic();
+    UA_DateTime timeout = UA_UINT32_MAX / 2;
+
+    UA_EventLoop *el = server->config.eventLoop;
+    while (!allEventSourcesStopped(server->config.connectionManagers,
+                                server->config.connectionManagersSize) &&
+                                elapsedTime < timeout)
+    {
+        el->run(el, 0);
+        elapsedTime = UA_DateTime_nowMonotonic() - startTime;
+    }
+
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     /* Stop multicast discovery */
     if(server->config.mdnsEnabled)
@@ -762,3 +814,4 @@ UA_Server_run(UA_Server *server, const volatile UA_Boolean *running) {
     }
     return UA_Server_run_shutdown(server);
 }
+
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 1fff38b76d0..49d204720a8 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -28,6 +28,10 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 
     /* Custom DataTypes */
     /* nothing to do */
+    for (size_t i = 0; i < config->connectionManagersSize; i++) {
+        UA_ConnectionManager* cm = config->connectionManagers[i];
+        UA_free(cm->initialConnectionContext);
+    }
 
     /* Stop and delete the EventLoop */
     UA_EventLoop *el = config->eventLoop;
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index 8852e738444..ec036621da0 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -34,8 +34,6 @@ removeSecureChannel(UA_Server *server, channel_entry *entry,
 
     /* Detach from the connection and close the connection */
     if(entry->channel.connection) {
-        if(entry->channel.connection->state != UA_CONNECTIONSTATE_CLOSED)
-            entry->channel.connection->close(entry->channel.connection);
         UA_Connection_detachSecureChannel(entry->channel.connection);
     }
 
diff --git a/src/ua_connection.c b/src/ua_connection.c
index f624fd65d6d..8ffbe87053a 100644
--- a/src/ua_connection.c
+++ b/src/ua_connection.c
@@ -18,6 +18,8 @@
 #include "ua_types_encoding_binary.h"
 #include "ua_util_internal.h"
 
+#include <open62541/plugin/eventloop.h>
+
 /* Hides some errors before sending them to a client according to the
  * standard. */
 static void
@@ -77,3 +79,82 @@ UA_Connection_attachSecureChannel(UA_Connection *connection, UA_SecureChannel *c
     if(UA_atomic_cmpxchg((void**)&channel->connection, NULL, connection) == NULL)
         UA_atomic_xchg((void**)&connection->channel, (void*)channel);
 }
+
+UA_StatusCode UA_Server_Connection_getSendBuffer(UA_Connection *connection, size_t length,
+                                                        UA_ByteString *buf) {
+    UA_Server_ConnectionContext *ctx = (UA_Server_ConnectionContext *) connection->handle;
+    UA_ConnectionManager *cm = ((UA_Server_BasicConnectionContext *)ctx)->cm;
+    return cm->allocNetworkBuffer(cm, ctx->connectionId, buf, length);
+}
+
+UA_StatusCode UA_Server_Connection_send(UA_Connection *connection, UA_ByteString *buf) {
+    UA_Server_ConnectionContext *ctx = (UA_Server_ConnectionContext *) connection->handle;
+    UA_ConnectionManager *cm = ((UA_Server_BasicConnectionContext *)ctx)->cm;
+
+    return cm->sendWithConnection(cm, ctx->connectionId, 0, NULL, buf);
+}
+
+void UA_Server_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf) {
+    UA_Server_ConnectionContext *ctx = (UA_Server_ConnectionContext *) connection->handle;
+    UA_ConnectionManager *cm = ((UA_Server_BasicConnectionContext *)ctx)->cm;
+    cm->freeNetworkBuffer(cm, ctx->connectionId, buf);
+}
+
+void UA_Server_Connection_close(UA_Connection *connection) {
+    UA_Server_ConnectionContext *ctx = (UA_Server_ConnectionContext *) connection->handle;
+    UA_ConnectionManager *cm = ((UA_Server_BasicConnectionContext *)ctx)->cm;
+    cm->closeConnection(cm, ctx->connectionId);
+}
+
+void
+UA_Server_connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                             void **connectionContext, UA_StatusCode stat,
+                             size_t paramsSize, const UA_KeyValuePair *params,
+                             UA_ByteString msg) {
+
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_SERVER,
+                 "connection callback for id: %lu", (unsigned long) connectionId);
+
+    UA_Server_BasicConnectionContext *ctx = (UA_Server_BasicConnectionContext *) *connectionContext;
+
+    if (stat != UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_SERVER, "closing connection");
+
+        if (!ctx->isInitial) {
+
+            UA_Server_ConnectionContext *serverctx = (UA_Server_ConnectionContext *) ctx;
+            /* Instead of removing the complete connection just detach the secure channel */
+            /* TODO: check if UA_Server_removeConnection is public api */
+            /* UA_Server_removeConnection(ctx->server, &serverctx->connection); */
+            UA_Connection_detachSecureChannel(&serverctx->connection);
+            free(*connectionContext);
+        }
+        return;
+    }
+
+    if (ctx->isInitial) {
+        UA_Server_ConnectionContext *newCtx = (UA_Server_ConnectionContext*) calloc(1, sizeof(UA_Server_ConnectionContext));
+        newCtx->base.isInitial = false;
+        newCtx->base.cm = ctx->cm;
+        newCtx->base.server = ctx->server;
+        newCtx->connectionId = connectionId;
+        newCtx->connection.close = UA_Server_Connection_close;
+        newCtx->connection.free = NULL;
+        newCtx->connection.getSendBuffer = UA_Server_Connection_getSendBuffer;
+        newCtx->connection.recv = NULL;
+        newCtx->connection.releaseRecvBuffer = UA_Server_Connection_releaseBuffer;
+        newCtx->connection.releaseSendBuffer = UA_Server_Connection_releaseBuffer;
+        newCtx->connection.send = UA_Server_Connection_send;
+        newCtx->connection.state = UA_CONNECTIONSTATE_CLOSED;
+
+        newCtx->connection.handle = newCtx;
+
+        *connectionContext = newCtx;
+    }
+
+    UA_Server_ConnectionContext *conCtx = (UA_Server_ConnectionContext *) *connectionContext;
+
+    if (msg.length > 0) {
+        UA_Server_processBinaryMessage(ctx->server, &conCtx->connection, &msg);
+    }
+}
diff --git a/src/ua_connection_internal.h b/src/ua_connection_internal.h
index cce876655e0..2f8eb63518a 100644
--- a/src/ua_connection_internal.h
+++ b/src/ua_connection_internal.h
@@ -12,10 +12,13 @@
 #define UA_CONNECTION_INTERNAL_H_
 
 #include <open62541/plugin/network.h>
+#include <open62541/plugin/eventloop.h>
 #include <open62541/transport_generated.h>
 
 _UA_BEGIN_DECLS
 
+
+
 /* When a fatal error occurs the Server shall send an Error Message to the
  * Client and close the socket. When a Client encounters one of these errors, it
  * shall also close the socket but does not send an Error Message. After the
@@ -29,6 +32,34 @@ void UA_Connection_detachSecureChannel(UA_Connection *connection);
 void UA_Connection_attachSecureChannel(UA_Connection *connection,
                                        UA_SecureChannel *channel);
 
+/********************************/
+/* Server Eventloop integration */
+/********************************/
+
+
+/* In this example, we integrate the server into an external "mainloop". This
+   can be for example the event-loop used in GUI toolkits, such as Qt or GTK. */
+
+typedef struct {
+    UA_Boolean isInitial;
+    UA_ConnectionManager *cm;
+    UA_Server *server;
+} UA_Server_BasicConnectionContext;
+
+typedef struct {
+    UA_Server_BasicConnectionContext base;
+    uintptr_t connectionId;
+    UA_Connection connection;
+} UA_Server_ConnectionContext;
+
+UA_StatusCode UA_Server_Connection_getSendBuffer(UA_Connection *connection, size_t length,
+                                                        UA_ByteString *buf);
+UA_StatusCode UA_Server_Connection_send(UA_Connection *connection, UA_ByteString *buf);
+void UA_Server_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf);
+void UA_Server_Connection_close(UA_Connection *connection);
+void UA_Server_connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId, void **connectionContext,
+                                  UA_StatusCode stat, size_t paramsSize, const UA_KeyValuePair *params, UA_ByteString msg);
+
 _UA_END_DECLS
 
 #endif /* UA_CONNECTION_INTERNAL_H_ */

From 96a1bc13a6dfde7bbce7cee63afd4a05da519599 Mon Sep 17 00:00:00 2001
From: jackybek <jackybek@gmail.com>
Date: Mon, 14 Feb 2022 16:48:54 +0800
Subject: [PATCH 0056/1963] fix(pubsub): cast MQTT settings to correct type
 (#4872)

---
 deps/mqtt-c/mqtt.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/deps/mqtt-c/mqtt.c b/deps/mqtt-c/mqtt.c
index 920583897f0..9bf75247197 100644
--- a/deps/mqtt-c/mqtt.c
+++ b/deps/mqtt-c/mqtt.c
@@ -1180,7 +1180,7 @@ ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
     if (useTLS) {
             if (caFilePath != NULL) {
             /* a caFilePath is present */
-            connect_flags |= MQTT_CONNECT_CAFILEPATH;
+            connect_flags |= (uint8_t)MQTT_CONNECT_CAFILEPATH;
             remaining_length += (uint32_t)__mqtt_packed_cstrlen(caFilePath);
         } else {
             connect_flags &= (uint8_t)~MQTT_CONNECT_CAFILEPATH;
@@ -1188,7 +1188,7 @@ ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
 
         if (caPath != NULL) {
             /* a caPath is present */
-            connect_flags |= MQTT_CONNECT_CAPATH;
+            connect_flags |= (uint8_t)MQTT_CONNECT_CAPATH;
             remaining_length += (uint32_t)__mqtt_packed_cstrlen(caPath);
         } else {
             connect_flags &= (uint8_t)~MQTT_CONNECT_CAPATH;
@@ -1196,7 +1196,7 @@ ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
 
         if (clientCertPath != NULL) {
             /* a clientCertPath is present */
-            connect_flags |= MQTT_CONNECT_CLIENTCERTPATH;
+            connect_flags |= (uint8_t)MQTT_CONNECT_CLIENTCERTPATH;
             remaining_length += (uint32_t)__mqtt_packed_cstrlen(clientCertPath);
         } else {
             connect_flags &= (uint8_t)~MQTT_CONNECT_CLIENTCERTPATH;
@@ -1204,17 +1204,26 @@ ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
 
         if (clientKeyPath != NULL) {
             /* a clientKeyPath is present */
-            connect_flags |= MQTT_CONNECT_CLIENTKEYPATH;
+            connect_flags |= (uint8_t)MQTT_CONNECT_CLIENTKEYPATH;
             remaining_length += (uint32_t)__mqtt_packed_cstrlen(clientKeyPath);
         } else {
             connect_flags &= (uint8_t)~MQTT_CONNECT_CLIENTKEYPATH;
         }
 
         if (useTLS) /* useTLS = true */
-            strncpy(strTLS, "1", 1);
+        {
+            //strncpy(strTLS, "1", 1);
+            strTLS[0] = '1';
+            strTLS[1] = '\0';
+        }
         else
-            strncpy(strTLS, "0", 1);
-        connect_flags |= MQTT_CONNECT_USETLS;
+        {
+            //strncpy(strTLS, "0", 1);
+            strTLS[0] = '0';
+            strTLS[1] = '\0';
+            
+        }
+        connect_flags |= (uint8_t)MQTT_CONNECT_USETLS;
         remaining_length += (uint32_t)__mqtt_packed_cstrlen(strTLS);
     }
 #endif

From ce12009917fdce230f6b0175eb1332eaf9553480 Mon Sep 17 00:00:00 2001
From: jackybek <jackybek@gmail.com>
Date: Mon, 14 Feb 2022 16:50:12 +0800
Subject: [PATCH 0057/1963] fix(deps): Fix typo useTSL -> useTLS

---
 deps/mqtt-c/mqtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mqtt-c/mqtt.c b/deps/mqtt-c/mqtt.c
index 9bf75247197..e2287d5ff86 100644
--- a/deps/mqtt-c/mqtt.c
+++ b/deps/mqtt-c/mqtt.c
@@ -1276,7 +1276,7 @@ ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
     if (connect_flags & MQTT_CONNECT_CAPATH) {
         buf += __mqtt_pack_str(buf, caPath);
     }
-    if (useTSL) {
+    if (useTLS) {
         if (connect_flags & MQTT_CONNECT_CLIENTCERTPATH) {
             buf += __mqtt_pack_str(buf, clientCertPath);
         }

From 0f5bc8fa0ea0603798b66bd896f5091a5020cc6b Mon Sep 17 00:00:00 2001
From: Sebastian Friedl <sebastian.friedl@isw.uni-stuttgart.de>
Date: Tue, 15 Feb 2022 15:29:36 +0000
Subject: [PATCH 0058/1963] Revert "fix(nc): skipping nodeset issues wrong
 counter for TypesArray"

This reverts commit ca50a8d4fe8563932a761c3b1992d7017778097f.
Obsolete due to functionality introduce with
commit a0c28b8bb51e797ab96c4f1af7fc952871a5fdc5
---
 tools/nodeset_compiler/nodeset_compiler.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/nodeset_compiler/nodeset_compiler.py b/tools/nodeset_compiler/nodeset_compiler.py
index 3264fb4fcb9..a9cb9b22697 100755
--- a/tools/nodeset_compiler/nodeset_compiler.py
+++ b/tools/nodeset_compiler/nodeset_compiler.py
@@ -129,7 +129,6 @@ def getTypesArray(nsIdx):
 for xmlfile in args.existing:
     if xmlfile.name in loadedFiles:
         logger.info("Skipping Nodeset since it is already loaded: {} ".format(xmlfile.name))
-        nsCount +=1
         continue
     loadedFiles.append(xmlfile.name)
     logger.info("Preprocessing (existing) " + str(xmlfile.name))
@@ -138,7 +137,6 @@ def getTypesArray(nsIdx):
 for xmlfile in args.infiles:
     if xmlfile.name in loadedFiles:
         logger.info("Skipping Nodeset since it is already loaded: {} ".format(xmlfile.name))
-        nsCount +=1
         continue
     loadedFiles.append(xmlfile.name)
     logger.info("Preprocessing " + str(xmlfile.name))

From 0e3786cf9a0daaa161c301c942f90f87da572db5 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Mon, 14 Feb 2022 13:09:02 +0100
Subject: [PATCH 0059/1963] feat(pubsub): Recognize the PDS name

Part 14 requires that a PDS has a unique name within the Publisher. Make
the corresponding check before creating a new PDS.

The new function UA_PublishedDataSet_findPDSbyName may be also used in
future by new applications e.g. OPC UA FX.

By the way, added utility function UA_String_isEmpty to the core
library.
---
 include/open62541/types.h                     |  3 ++
 src/pubsub/ua_pubsub.h                        |  3 ++
 src/pubsub/ua_pubsub_manager.c                | 13 +++++
 src/pubsub/ua_pubsub_writer.c                 | 11 +++++
 src/ua_types.c                                |  5 ++
 tests/pubsub/check_pubsub_pds.c               |  1 +
 tests/pubsub/check_pubsub_publish.c           | 47 ++++++++++++++++++-
 .../pubsub/check_pubsub_subscribe_rt_levels.c |  8 ++++
 8 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 25face4d577..d5b13bdf05f 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -186,6 +186,9 @@ UA_String_fromChars(const char *src) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
 UA_Boolean UA_EXPORT
 UA_String_equal(const UA_String *s1, const UA_String *s2);
 
+UA_Boolean UA_EXPORT
+UA_String_isEmpty(const UA_String *s);
+
 UA_EXPORT extern const UA_String UA_STRING_NULL;
 
 /**
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 834541e7958..c004fa9066f 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -54,6 +54,9 @@ UA_PublishedDataSetConfig_copy(const UA_PublishedDataSetConfig *src,
 UA_PublishedDataSet *
 UA_PublishedDataSet_findPDSbyId(UA_Server *server, UA_NodeId identifier);
 
+UA_PublishedDataSet *
+UA_PublishedDataSet_findPDSbyName(UA_Server *server, UA_String name);
+
 void
 UA_PublishedDataSet_clear(UA_Server *server,
                           UA_PublishedDataSet *publishedDataSet);
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 98f10e77f27..4d0704afd65 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -157,6 +157,19 @@ UA_Server_addPublishedDataSet(UA_Server *server,
         return result;
     }
 
+    if(UA_String_isEmpty(&publishedDataSetConfig->name))
+    {
+        // DataSet has to have a valid name
+        return result;
+    }
+
+    if(UA_PublishedDataSet_findPDSbyName(server, publishedDataSetConfig->name))
+    {
+        // DataSet name has to be unique in the publisher
+        result.addResult = UA_STATUSCODE_BADBROWSENAMEDUPLICATED;
+        return result;
+    }
+
     /* Create new PDS and add to UA_PubSubManager */
     UA_PublishedDataSet *newPDS = (UA_PublishedDataSet *)
         UA_calloc(1, sizeof(UA_PublishedDataSet));
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 554dfe5a999..ddb300e870c 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -196,6 +196,17 @@ UA_PublishedDataSet_findPDSbyId(UA_Server *server, UA_NodeId identifier) {
     return tmpPDS;
 }
 
+UA_PublishedDataSet *
+UA_PublishedDataSet_findPDSbyName(UA_Server *server, UA_String name) {
+    UA_PublishedDataSet *tmpPDS = NULL;
+    TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry) {
+        if(UA_String_equal(&name, &tmpPDS->config.name))
+            break;
+    }
+
+    return tmpPDS;
+}
+
 void
 UA_PublishedDataSetConfig_clear(UA_PublishedDataSetConfig *pdsConfig) {
     //delete pds config
diff --git a/src/ua_types.c b/src/ua_types.c
index 4e0fed294b1..c12dd71a71a 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -134,6 +134,11 @@ UA_String_equal(const UA_String *s1, const UA_String *s2) {
     return (stringOrder(s1, s2, NULL) == UA_ORDER_EQ);
 }
 
+UA_Boolean
+UA_String_isEmpty(const UA_String *s) {
+    return (s->length == 0 || s->data == NULL);
+}
+
 /* Do not expose UA_String_equal_ignorecase to public API as it currently only handles
  * ASCII strings, and not UTF8! */
 UA_Boolean
diff --git a/tests/pubsub/check_pubsub_pds.c b/tests/pubsub/check_pubsub_pds.c
index 4db36f5e8b2..e89203f3b8d 100644
--- a/tests/pubsub/check_pubsub_pds.c
+++ b/tests/pubsub/check_pubsub_pds.c
@@ -38,6 +38,7 @@ START_TEST(AddPDSWithMinimalValidConfiguration){
     ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_NodeId newPDSNodeID;
+    pdsConfig.name = UA_STRING("TEST PDS 2");
     retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &newPDSNodeID).addResult;
     ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 2);
     ck_assert_int_eq(newPDSNodeID.identifierType, UA_NODEIDTYPE_NUMERIC);
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index c9134d7712d..bca84a755aa 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -17,6 +17,8 @@
 UA_Server *server = NULL;
 UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
         publishedDataSet1, publishedDataSet2, dataSetWriter1, dataSetWriter2, dataSetWriter3;
+#define publishedDataSet1Name "PublishedDataSet 1"
+#define publishedDataSet2Name "PublishedDataSet 2"
 
 static void setup(void) {
     server = UA_Server_new();
@@ -164,8 +166,9 @@ static void setupDataSetWriterTestEnvironment(void){
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-    pdsConfig.name = UA_STRING("PublishedDataSet 1");
+    pdsConfig.name = UA_STRING(publishedDataSet1Name);
     UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    pdsConfig.name = UA_STRING(publishedDataSet2Name);
     UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2);
 }
 
@@ -254,6 +257,42 @@ START_TEST(GetDataSetWriterConfigurationAndCompareValues){
         UA_DataSetWriterConfig_clear(&dataSetWiterConfigCopy);
     } END_TEST
 
+START_TEST(AddPDSEmptyName){
+    UA_PublishedDataSetConfig pdsConfig;
+    memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    UA_AddPublishedDataSetResult res = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    ck_assert_int_eq(res.addResult, UA_STATUSCODE_BADINVALIDARGUMENT);
+    } END_TEST
+
+START_TEST(AddPDSDuplicatedName){
+    UA_PublishedDataSetConfig pdsConfig;
+    memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    pdsConfig.name = UA_STRING(publishedDataSet1Name);
+    UA_AddPublishedDataSetResult res = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    ck_assert_int_eq(res.addResult, UA_STATUSCODE_GOOD);
+    res = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    ck_assert_int_eq(res.addResult, UA_STATUSCODE_BADBROWSENAMEDUPLICATED);
+    UA_Server_removePublishedDataSet(server, publishedDataSet1);
+    } END_TEST
+
+START_TEST(FindPDS){
+        setupDataSetWriterTestEnvironment();
+        UA_PublishedDataSet *pdsById = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
+        ck_assert_ptr_ne(pdsById, NULL);
+        UA_PublishedDataSet *pdsByName = UA_PublishedDataSet_findPDSbyName(server, UA_STRING(publishedDataSet1Name));
+        ck_assert_ptr_ne(pdsByName, NULL);
+        ck_assert_ptr_eq(pdsById, pdsByName);
+        pdsById = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet2);
+        ck_assert_ptr_ne(pdsById, NULL);
+        pdsByName = UA_PublishedDataSet_findPDSbyName(server, UA_STRING(publishedDataSet2Name));
+        ck_assert_ptr_ne(pdsByName, NULL);
+        ck_assert_ptr_eq(pdsById, pdsByName);
+        UA_Server_removePublishedDataSet(server, publishedDataSet1);
+        UA_Server_removePublishedDataSet(server, publishedDataSet2);
+    } END_TEST
+
 static void setupDataSetFieldTestEnvironment(void){
     setupDataSetWriterTestEnvironment();
     UA_DataSetWriterConfig dataSetWriterConfig;
@@ -384,8 +423,9 @@ START_TEST(SinglePublishDataSetField){
         UA_PublishedDataSetConfig pdsConfig;
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-        pdsConfig.name = UA_STRING("PublishedDataSet 1");
+        pdsConfig.name = UA_STRING(publishedDataSet1Name);
         UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+        pdsConfig.name = UA_STRING(publishedDataSet2Name);
         UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2);
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
@@ -443,6 +483,9 @@ int main(void) {
     tcase_add_test(tc_add_pubsub_datasetwriter, AddDataSetWriterWithNullConfig);
     tcase_add_test(tc_add_pubsub_datasetwriter, AddDataSetWriterWithInvalidPDSId);
     tcase_add_test(tc_add_pubsub_datasetwriter, GetDataSetWriterConfigurationAndCompareValues);
+    tcase_add_test(tc_add_pubsub_datasetwriter, AddPDSEmptyName);
+    tcase_add_test(tc_add_pubsub_datasetwriter, AddPDSDuplicatedName);
+    tcase_add_test(tc_add_pubsub_datasetwriter, FindPDS);
 
     TCase *tc_add_pubsub_datasetfields = tcase_create("PubSub DataSetField items handling");
     tcase_add_checked_fixture(tc_add_pubsub_datasetfields, setup, teardown);
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 1730ac6077b..b4355991052 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -333,6 +333,8 @@ START_TEST(SubscribeSingleFieldWithFixedOffsets) {
     UA_DataValue_delete(dataValue);
     UA_free(subValue);
     UA_free(subDataValueRT);
+
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, publishedDataSetIdent));
 } END_TEST
 
 START_TEST(SetupInvalidPubSubConfigReader) {
@@ -475,6 +477,8 @@ START_TEST(SetupInvalidPubSubConfigReader) {
         ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_BADNOTSUPPORTED); // DateTime not supported
         ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
         ck_assert(UA_Server_unfreezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
+
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, publishedDataSetIdent));
     } END_TEST
 
 START_TEST(SetupInvalidPubSubConfig) {
@@ -526,6 +530,8 @@ START_TEST(SetupInvalidPubSubConfig) {
     ck_assert(UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent) == UA_STATUSCODE_BADCONFIGURATIONERROR);
 
     UA_Variant_clear(&variant);
+
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, publishedDataSetIdent));
 } END_TEST
 
 /* additional SubscriberBeforeWriteCallback test data */
@@ -707,6 +713,8 @@ static void PublishSubscribeWithWriteCallback_Helper(
 
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePubSubConnection(server, connectionIdentifier));
 
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, publishedDataSetIdent));
+
     UA_NodeId_clear(&connectionIdentifier);
     UA_NodeId_clear(&publishedDataSetIdent);
     UA_NodeId_clear(&writerGroupIdent);

From 5f5214427b62e96e066270f4c2798f68b1375213 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Mon, 14 Feb 2022 19:41:16 +0100
Subject: [PATCH 0060/1963] Added error logging to the new checks.

---
 src/pubsub/ua_pubsub_manager.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 4d0704afd65..f14100d6f27 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -160,12 +160,16 @@ UA_Server_addPublishedDataSet(UA_Server *server,
     if(UA_String_isEmpty(&publishedDataSetConfig->name))
     {
         // DataSet has to have a valid name
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PublishedDataSet creation failed. Invalid name.");
         return result;
     }
 
     if(UA_PublishedDataSet_findPDSbyName(server, publishedDataSetConfig->name))
     {
         // DataSet name has to be unique in the publisher
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PublishedDataSet creation failed. DataSet with the same name already exists.");
         result.addResult = UA_STATUSCODE_BADBROWSENAMEDUPLICATED;
         return result;
     }

From 683c4b9e543fd4d12e92ad759c884ff3685a41d1 Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Fri, 18 Feb 2022 12:50:03 +0100
Subject: [PATCH 0061/1963] fix(server): Decrease logging severity in
 isConditionOrBranch

---
 src/server/ua_subscription_alarms_conditions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 0be6d9142b5..e2ebbf60c5c 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -540,7 +540,7 @@ isConditionOrBranch(UA_Server *server, const UA_NodeId *condition,
                     const UA_NodeId *conditionSource, UA_Boolean *isCallerAC) {
     UA_Condition *cond = getCondition(server, conditionSource, condition);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         return false;
     }

From 358df0156e152c92abfe09816b0dd56f20dc430f Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Mon, 14 Feb 2022 14:55:03 +0100
Subject: [PATCH 0062/1963] feat(el): add udp connection-manager

---
 arch/eventloop_posix.c               |   2 +-
 arch/eventloop_posix_epoll.c         |   4 +-
 arch/eventloop_posix_udp.c           | 794 +++++++++++++++++++++++++++
 include/open62541/plugin/eventloop.h |  32 ++
 4 files changed, 829 insertions(+), 3 deletions(-)
 create mode 100644 arch/eventloop_posix_udp.c

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 8afa28621ac..9dcbf98fa1e 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -120,7 +120,7 @@ UA_EventLoopPOSIX_start(UA_EventLoopPOSIX *el) {
     if(el->epollfd == -1) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                          "TCP\t| Could not create the epoll socket (%s)",
+                          "Eventloop\t| Could not create the epoll socket (%s)",
                           errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
index 89729f0e30e..6b182f8ed5d 100644
--- a/arch/eventloop_posix_epoll.c
+++ b/arch/eventloop_posix_epoll.c
@@ -100,9 +100,9 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
     for(int i = 0; i < events; i++) {
         UA_RegisteredFD *rfd = (UA_RegisteredFD*)epoll_events[i].data.ptr;
         short revent = 0;
-        if(epoll_events[i].events == EPOLLIN) {
+        if((epoll_events[i].events & EPOLLIN) == EPOLLIN) {
             revent = UA_FDEVENT_IN;
-        } else if(epoll_events[i].events == EPOLLOUT) {
+        } else if((epoll_events[i].events & EPOLLOUT) == EPOLLOUT) {
             revent = UA_FDEVENT_OUT;
         } else {
             revent = UA_FDEVENT_ERR;
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
new file mode 100644
index 00000000000..d1c66f3b74c
--- /dev/null
+++ b/arch/eventloop_posix_udp.c
@@ -0,0 +1,794 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#include "eventloop_posix.h"
+
+#define UA_MAXBACKLOG 100
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+#ifndef MSG_DONTWAIT
+#define MSG_DONTWAIT 0
+#endif
+
+typedef struct {
+    UA_ConnectionManager cm;
+
+    size_t fdsSize;
+    LIST_HEAD(, UA_RegisteredFD) fds;
+
+    UA_ByteString rxBuffer; /* Reuse the receiver buffer. The size is configured
+                             * via the recv-bufsize parameter.*/
+} UDPConnectionManager;
+
+static UA_StatusCode
+UDPConnectionManager_register(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ucm->cm.eventSource.eventLoop;
+    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, rfd);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+    LIST_INSERT_HEAD(&ucm->fds, rfd, es_pointers);
+    ucm->fdsSize++;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+UDPConnectionManager_deregister(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ucm->cm.eventSource.eventLoop;
+    UA_EventLoopPOSIX_deregisterFD(el, rfd);
+    LIST_REMOVE(rfd, es_pointers);
+    UA_assert(ucm->fdsSize > 0);
+    ucm->fdsSize--;
+}
+
+static UA_StatusCode
+UDP_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                       UA_ByteString *buf, size_t bufSize) {
+    return UA_ByteString_allocBuffer(buf, bufSize);
+}
+
+static void
+UDP_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                      UA_ByteString *buf) {
+    UA_ByteString_clear(buf);
+}
+
+/* Set the socket non-blocking. If the listen-socket is nonblocking, incoming
+ * connections inherit this state. */
+static UA_StatusCode
+UDP_setNonBlocking(UA_FD sockfd) {
+#ifndef _WIN32
+    int opts = fcntl(sockfd, F_GETFL);
+    if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#else
+    u_long iMode = 1;
+    if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Don't have the socket create interrupt signals */
+static UA_StatusCode
+UDP_setNoSigPipe(UA_FD sockfd) {
+#ifdef SO_NOSIGPIPE
+    int val = 1;
+    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
+    if(res < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Test if the ConnectionManager can be stopped */
+static void
+UDP_checkStopped(UDPConnectionManager *ucm) {
+    if(ucm->fdsSize == 0 && ucm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
+        UA_LOG_DEBUG(ucm->cm.eventSource.eventLoop->logger,
+                     UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| All sockets closed, the EventLoop has stopped");
+
+        UA_ByteString_clear(&ucm->rxBuffer);
+        ucm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+    }
+}
+
+static UA_StatusCode
+UDP_close(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ucm->cm.eventSource.eventLoop;
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "UDP %u\t| Closing connection", (unsigned)rfd->fd);
+
+    /* Deregister from the EventLoop */
+    UDPConnectionManager_deregister(ucm, rfd);
+
+    /* Close the socket */
+    int ret = UA_close(rfd->fd);
+    if(ret == 0) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "UDP %u\t| Socket closed", (unsigned)rfd->fd);
+    } else {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "UDP %u\t| Could not close the socket (%s)",
+                          (unsigned)rfd->fd, errno_str));
+    }
+
+    /* Free the rfd */
+    UA_free(rfd);
+
+    /* Stop if the ucm is stopping and this was the last open socket */
+    UDP_checkStopped(ucm);
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Gets called when a socket receives data or closes */
+static void
+UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
+                             short event) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "UDP %u\t| Activity on the socket", (unsigned)rfd->fd);
+
+    /* Write-Event, a new connection has opened.  */
+    if(event == UA_FDEVENT_OUT) {
+        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP %u\t| Opening a new connection", (unsigned)rfd->fd);
+
+        /* A new socket has opened. Signal it to the application. */
+        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
+                               UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
+
+        /* Now we are interested in read-events. */
+        rfd->listenEvents = UA_FDEVENT_IN;
+        UA_EventLoopPOSIX_modifyFD(el, rfd);
+        return;
+    }
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "UDP %u\t| Allocate receive buffer", (unsigned)rfd->fd);
+
+    /* Use the already allocated receive-buffer */
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_ByteString response = ucm->rxBuffer;
+
+    /* Receive */
+#ifndef _WIN32
+    ssize_t ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+#else
+    int ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+#endif
+
+    /* Receive has failed */
+    if(ret <= 0) {
+        if(UA_ERRNO == UA_INTERRUPTED) {
+            return; /* Temporary error on an non-blocking socket */
+        }
+
+        /* For UDP sockets UA_WOULDBLOCK for recv means that we actually do
+         * not receive anything although a signal for EPOLL was received
+         * The signal mus thus be EPOLLERR signaling for the write end of a pipe
+         * that the read end has been closed */
+        UA_assert(UA_ERRNO == UA_WOULDBLOCK || UA_ERRNO == UA_AGAIN);
+
+        /* Orderly shutdown of the socket. Signal to the application and then
+         * close the socket. We end up in this code-path after shutdown was
+         * called on the socket. Here, we then are in the next EventLoop
+         * iteration and the socket is known to be unused. */
+
+        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP %u\t| recv signaled the socket was shutdown",
+                     (unsigned)rfd->fd);
+
+        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
+                               UA_STATUSCODE_BADCONNECTIONCLOSED,
+                               0, NULL, UA_BYTESTRING_NULL);
+        UDP_close(ucm, rfd);
+        return;
+    }
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "UDP %u\t| Received message of size %u",
+                 (unsigned)rfd->fd, (unsigned)ret);
+
+    /* Callback to the application layer */
+    response.length = (size_t)ret; /* Set the length of the received buffer */
+    cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
+                           UA_STATUSCODE_GOOD, 0, NULL, response);
+}
+
+static void
+UDP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
+    /* Get logging information */
+    char hoststr[256];
+    char portstr[16];
+    int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                                 hoststr, sizeof(hoststr),
+                                 portstr, sizeof(portstr), NI_NUMERICSERV);
+    if(get_res != 0) {
+        get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                                 hoststr, sizeof(hoststr),
+                                 portstr, sizeof(portstr),
+                                 NI_NUMERICHOST | NI_NUMERICSERV);
+        if(get_res != 0) {
+            hoststr[0] = 0;
+            portstr[0] = 0;
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                               "UDP\t| getnameinfo(...) could not resolve the hostname (%s)",
+                               errno_str));
+        }
+    }
+    
+    /* Create the server socket */
+    UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+    if(listenSocket == UA_INVALID_FD) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "UDP %u\t| Error opening the listen socket for "
+                          "\"%s\" on port %s(%s)",
+                          (unsigned)listenSocket, hoststr, portstr, errno_str));
+        return;
+    }
+
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                "UDP %u\t| New server socket for \"%s\" on port %s",
+                (unsigned)listenSocket, hoststr, portstr);
+
+    /* Some Linux distributions have net.ipv6.bindv6only not activated. So
+     * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
+     * AF_INET6 sockets only for IPv6. */
+    int optval = 1;
+#if UA_IPV6
+    if(ai->ai_family == AF_INET6 &&
+       UA_setsockopt(listenSocket, IPPROTO_IPV6, IPV6_V6ONLY,
+                     (const char*)&optval, sizeof(optval)) == -1) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+#endif
+
+    /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
+    if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR,
+                     (const char *)&optval, sizeof(optval)) == -1) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| Could not make the socket reusable, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Set the socket non-blocking */
+    if(UDP_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| Could not set the socket non-blocking, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Supress interrupts from the socket */
+    if(UDP_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| Could not disable SIGPIPE, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Bind socket to address */
+    int ret = UA_bind(listenSocket, ai->ai_addr, (socklen_t)ai->ai_addrlen);
+    if(ret < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "UDP %u\t| Error binding the socket to the address (%s), closing",
+                          (unsigned)listenSocket, errno_str));
+        UA_close(listenSocket);
+        return;
+    }
+
+    /* Allocate the UA_RegisteredFD */
+    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
+        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
+    if(!newrfd) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| Error allocating memory for the socket, closing",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return;
+    }
+
+    newrfd->fd = listenSocket;
+    newrfd->es = &cm->eventSource;
+    newrfd->callback = (UA_FDCallback)UDP_connectionSocketCallback;
+    newrfd->context = cm->initialConnectionContext;
+    newrfd->listenEvents = UA_FDEVENT_IN;
+
+    /* Register in the EventLoop */
+    UA_StatusCode res = UDPConnectionManager_register(ucm, newrfd);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| Error registering the socket, closing",
+                       (unsigned)listenSocket);
+        UA_free(newrfd);
+        UA_close(listenSocket);
+        return;
+    }
+}
+
+static UA_StatusCode
+UDP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostname,
+                                   const char *port) {
+    /* Get all the interface and IPv4/6 combinations for the configured hostname */
+    struct addrinfo hints, *res;
+    memset(&hints, 0, sizeof hints);
+#if UA_IPV6
+    hints.ai_family = AF_UNSPEC; /* Allow IPv4 and IPv6 */
+#else
+    hints.ai_family = AF_INET;   /* IPv4 only */
+#endif
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_flags = AI_PASSIVE;
+    hints.ai_protocol = IPPROTO_UDP;
+#ifdef AI_ADDRCONFIG
+    hints.ai_flags |= AI_ADDRCONFIG; /* Only return IPv4/IPv6 if at least one
+                                      * such address is configured */
+#endif
+
+    int retcode = UA_getaddrinfo(hostname, port, &hints, &res);
+    if(retcode != 0) {
+        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
+                          UA_LOGCATEGORY_NETWORK,
+                          "UDP\t| getaddrinfo lookup for \"%s\" on port %s failed (%s)",
+                          hostname, port, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Add listen sockets */
+    struct addrinfo *ai = res;
+    while(ai) {
+        UDP_registerListenSocket(cm, ai);
+        ai = ai->ai_next;
+    }
+    UA_freeaddrinfo(res);
+    return UA_STATUSCODE_GOOD;
+}
+
+#ifdef WIN32
+static
+UA_RegisteredFD *
+findRegisteredFD(UDPConnectionManager *cm, uintptr_t connectionId) {
+    UA_RegisteredFD *rfd, *rfd_tmp;
+    LIST_FOREACH_SAFE(rfd, &cm->fds, es_pointers, rfd_tmp) {
+
+        if (rfd->fd == connectionId) {
+            return rfd;
+        }
+    }
+    return NULL;
+}
+static
+void delayedShutdownCallback(void* application, void* data) {
+
+    UA_ConnectionManager *cm = (UA_ConnectionManager*) application;
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_RegisteredFD* rfd = (UA_RegisteredFD *) data;
+
+    UA_ByteString response = ucm->rxBuffer;
+    int ret = UA_recv(rfd->fd, (char *)response.data, response.length, MSG_DONTWAIT);
+    if(ret == 0 || ret == -1) {
+        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
+                               UA_STATUSCODE_BADCONNECTIONCLOSED,
+                               0, NULL, UA_BYTESTRING_NULL);
+        UDP_close(ucm, rfd);
+    } else {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
+                         UA_LOGCATEGORY_NETWORK,
+                         "UDP %u\t| Error shutting down the socket , windows implementation for processing pending data is not implemented (%s)",
+                         (unsigned)rfd->fd, errno_str));
+        return;
+    }
+}
+#endif
+
+static UA_StatusCode
+UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
+                 UA_LOGCATEGORY_NETWORK,
+                 "UDP %u\t| Shutdown called", (unsigned)connectionId);
+
+   /* Shutdown, will be picked up by the next iteration of the event loop */
+#ifndef _WIN32
+    int res = UA_shutdown((UA_FD)connectionId, SHUT_RDWR);
+#else
+    /* In windows we must let the eventloop call shutdown explicitly as a delayed callback in the next cycle
+     * shutdown(...) will not cause an event for select(...) on the given file descriptor
+     * */
+    int res = UA_shutdown((UA_FD)connectionId, SD_SEND);
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_RegisteredFD* rfd = findRegisteredFD(ucm, (UA_FD) connectionId);
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+
+    UA_DelayedCallback *explicitlyDelayedShutdownCallback = UA_malloc(sizeof(UA_DelayedCallback));
+    explicitlyDelayedShutdownCallback->callback = delayedShutdownCallback;
+    explicitlyDelayedShutdownCallback->application = cm;
+    explicitlyDelayedShutdownCallback->data = rfd;
+    el->addDelayedCallback(el, explicitlyDelayedShutdownCallback);
+#endif
+    if(res != 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
+                           UA_LOGCATEGORY_NETWORK,
+                           "UDP %u\t| Error shutting down the socket (%s)",
+                           (unsigned)connectionId, errno_str));
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
+                       size_t paramsSize, const UA_KeyValuePair *params,
+                       UA_ByteString *buf) {
+    /* Prevent OS signals when sending to a closed socket */
+    int flags = MSG_NOSIGNAL;
+
+    struct pollfd tmp_poll_fd;
+    tmp_poll_fd.fd = (UA_FD)connectionId;
+    tmp_poll_fd.events = UA_POLLOUT;
+
+    /* Send the full buffer. This may require several calls to send */
+    size_t nWritten = 0;
+
+    do {
+        ssize_t n = 0;
+        do {
+            UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
+                         UA_LOGCATEGORY_NETWORK,
+                         "UDP %u\t| Attempting to send", (unsigned)connectionId);
+            size_t bytes_to_send = buf->length - nWritten;
+            n = UA_send((UA_FD)connectionId,
+                        (const char*)buf->data + nWritten,
+                        bytes_to_send, flags);
+            if(n < 0) {
+                /* An error we cannot recover from? */
+                if(UA_ERRNO != UA_INTERRUPTED &&
+                   UA_ERRNO != UA_WOULDBLOCK &&
+                   UA_ERRNO != UA_AGAIN) {
+                    UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+                       UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
+                                    UA_LOGCATEGORY_NETWORK,
+                                    "UDP %u\t| Send failed with error %s",
+                                    (unsigned)connectionId, errno_str));
+                    UDP_shutdownConnection(cm, connectionId);
+                    UA_ByteString_clear(buf);
+                    return UA_STATUSCODE_BADCONNECTIONCLOSED;
+                }
+
+                /* Poll for the socket resources to become available and retry
+                 * (blocking) */
+                int poll_ret;
+                do {
+                    poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
+                    if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED) {
+                        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+                           UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
+                                        UA_LOGCATEGORY_NETWORK,
+                                        "UDP %u\t| Send failed with error %s",
+                                        (unsigned)connectionId, errno_str));
+                        UDP_shutdownConnection(cm, connectionId);
+                        UA_ByteString_clear(buf);
+                        return UA_STATUSCODE_BADCONNECTIONCLOSED;
+                    }
+                } while(poll_ret <= 0);
+            }
+        } while(n < 0);
+        nWritten += (size_t)n;
+    } while(nWritten < buf->length);
+
+    /* Free the buffer */
+    UA_ByteString_clear(buf);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UDP_openConnection(UA_ConnectionManager *cm,
+                   size_t paramsSize, const UA_KeyValuePair *params,
+                   void *context) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
+    /* Get the connection parameters */
+    char hostname[256];
+    char portStr[16];
+
+    /* Prepare the port parameter as a string */
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(!port) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Open UDP Connection: No port defined, aborting");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_snprintf(portStr, 6, "%d", *port);
+
+    /* Prepare the hostname string */
+    const UA_String *host = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "hostname"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!host) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Open UDP Connection: No hostname defined, aborting");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    if(host->length >= 256) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| Open UDP Connection: Hostname too long, aborting");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    strncpy(hostname, (const char*)host->data, host->length);
+    hostname[host->length] = 0;
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "UDP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
+
+    /* Create the socket description from the connectString
+     * TODO: Make this non-blocking */
+    struct addrinfo hints, *info;
+    memset(&hints, 0, sizeof(struct addrinfo));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_DGRAM;
+    int error = getaddrinfo(hostname, portStr, &hints, &info);
+    if(error != 0) {
+        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP\t| Lookup of %s failed with error %d - %s",
+                       hostname, error, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Create a socket */
+    UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
+    if(newSock == UA_INVALID_FD) {
+        freeaddrinfo(info);
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                           "UDP\t| Could not create socket to connect to %s (%s)",
+                           hostname, errno_str));
+        return UA_STATUSCODE_BADDISCONNECT;
+    }
+
+    /* Set the socket options */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    res |= UDP_setNonBlocking(newSock);
+    res |= UDP_setNoSigPipe(newSock);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                           "UDP\t| Could not set socket options: %s", errno_str));
+        freeaddrinfo(info);
+        UA_close(newSock);
+        return res;
+    }
+
+    /* Non-blocking connect */
+    error = UA_connect(newSock, info->ai_addr, info->ai_addrlen);
+    freeaddrinfo(info);
+    if(error != 0 &&
+       UA_ERRNO != UA_INPROGRESS &&
+       UA_ERRNO != UA_WOULDBLOCK) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                           "UDP\t| Connecting the socket to %s failed (%s)",
+                           hostname, errno_str));
+        return UA_STATUSCODE_BADDISCONNECT;
+    }
+
+    /* Allocate the UA_RegisteredFD */
+    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
+        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
+    if(!newrfd) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| Error allocating memory for the socket, closing",
+                       (unsigned)newSock);
+        UA_close(newSock);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    newrfd->fd = newSock;
+    newrfd->es = &cm->eventSource;
+    newrfd->callback = (UA_FDCallback)UDP_connectionSocketCallback;
+    newrfd->context = context;
+    newrfd->listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
+                                            * connection is open */
+
+    /* Register the fd to trigger when output is possible (the connection is open) */
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    res = UDPConnectionManager_register(ucm, newrfd);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP\t| Registering the socket for %s failed", hostname);
+        UA_close(newSock);
+        UA_free(newrfd);
+        return res;
+    }
+
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                "UDP %u\t| New connection to \"%s\" on port %s",
+                (unsigned)newSock, hostname, portStr);
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Asynchronously register the listenSocket */
+static UA_StatusCode
+UDP_eventSourceStart(UA_ConnectionManager *cm) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
+    /* Check the state */
+    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "To start the UDP ConnectionManager, "
+                     "it has to be registered in an EventLoop and not started");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Initialize networking */
+#ifdef _WIN32
+    WSADATA wsaData;
+    WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
+
+    /* Listening on a socket? */
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(cm->eventSource.params,
+                                 cm->eventSource.paramsSize,
+                                 UA_QUALIFIEDNAME(0, "listen-port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(!port) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| No port configured, don't accept connections");
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Prepare the port parameter as a string */
+    char portno[6];
+    UA_snprintf(portno, 6, "%d", *port);
+
+    /* Get the hostnames configuration */
+    const UA_Variant *hostNames =
+        UA_KeyValueMap_get(cm->eventSource.params,
+                           cm->eventSource.paramsSize,
+                           UA_QUALIFIEDNAME(0, "listen-hostnames"));
+    if(!hostNames) {
+        /* No hostnames configured */
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "UDP\t| Listening on all interfaces");
+        UDP_registerListenSocketDomainName(cm, NULL, portno);
+    } else if(hostNames->type != &UA_TYPES[UA_TYPES_STRING]) {
+        /* Wrong datatype */
+           UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                        "UDP\t| The hostnames have to be strings");
+           return UA_STATUSCODE_BADINTERNALERROR;
+    } else {
+        size_t interfaces = hostNames->arrayLength;
+        if(UA_Variant_isScalar(hostNames))
+            interfaces = 1;
+        if(interfaces == 0) {
+            UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                         "UDP\t| Listening on all interfaces");
+            UDP_registerListenSocketDomainName(cm, NULL, portno);
+        } else {
+            /* Iterate over the configured hostnames */
+            UA_String *hostStrings = (UA_String*)hostNames->data;
+            for(size_t i = 0; i < hostNames->arrayLength; i++) {
+                char hostname[512];
+                if(hostStrings[i].length >= sizeof(hostname))
+                    continue;
+                memcpy(hostname, hostStrings[i].data, hostStrings->length);
+                hostname[hostStrings->length] = '\0';
+                UDP_registerListenSocketDomainName(cm, hostname, portno);
+            }
+        }
+    }
+
+    /* The receive buffersize was configured? */
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_UInt16 rxBufSize = 2u << 14; /* The default is 16kb */
+    const UA_UInt16 *configRxBufSize = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(cm->eventSource.params,
+                                 cm->eventSource.paramsSize,
+                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(configRxBufSize)
+        rxBufSize = *configRxBufSize;
+    UA_StatusCode res = UA_ByteString_allocBuffer(&ucm->rxBuffer, rxBufSize);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+    
+    /* Set the EventSource to the started state */
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+UDP_eventSourceStop(UA_ConnectionManager *cm) {
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
+                UA_LOGCATEGORY_NETWORK, "UDP\t| Shutting down the ConnectionManager");
+
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
+
+    /* Shut down all registered fd. The cm is set to "stopped" when the last fd
+     * is closed and deregistered in the callback from the EventLoop. */
+    UA_RegisteredFD *rfd, *rfd_tmp;
+    LIST_FOREACH_SAFE(rfd, &ucm->fds, es_pointers, rfd_tmp) {
+        UDP_close(ucm, rfd);
+        // UDP_shutdownConnection(cm, (uintptr_t)rfd->fd);
+    }
+
+    /* All sockets closed? Otherwise iterate some more. */
+    UDP_checkStopped(ucm);
+}
+
+static UA_StatusCode
+UDP_eventSourceDelete(UA_ConnectionManager *cm) {
+    if(cm->eventSource.state >= UA_EVENTSOURCESTATE_STARTING) {
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
+                     UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| The EventSource must be stopped before it can be deleted");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_deinitialize_architecture_network();
+
+    /* Delete the parameters */
+    UA_Array_delete(cm->eventSource.params,
+                    cm->eventSource.paramsSize,
+                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    cm->eventSource.params = NULL;
+    cm->eventSource.paramsSize = 0;
+
+    UA_String_clear(&cm->eventSource.name);
+    UA_free(cm);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_ConnectionManager *
+UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName) {
+    UDPConnectionManager *cm = (UDPConnectionManager*)
+        UA_calloc(1, sizeof(UDPConnectionManager));
+    if(!cm)
+        return NULL;
+
+    cm->cm.eventSource.eventSourceType = UA_EVENTSOURCETYPE_CONNECTIONMANAGER;
+    UA_String_copy(&eventSourceName, &cm->cm.eventSource.name);
+    cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *)) UDP_eventSourceStart;
+    cm->cm.eventSource.stop = (void (*)(UA_EventSource *))UDP_eventSourceStop;
+    cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))UDP_eventSourceDelete;
+    cm->cm.openConnection = UDP_openConnection;
+    cm->cm.allocNetworkBuffer = UDP_allocNetworkBuffer;
+    cm->cm.freeNetworkBuffer = UDP_freeNetworkBuffer;
+    cm->cm.sendWithConnection = UDP_sendWithConnection;
+    cm->cm.closeConnection = UDP_shutdownConnection;
+    return &cm->cm;
+}
+
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 1f2a921cfaf..61baf9d6c56 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -415,6 +415,38 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
 
+/**
+ * UDP Connection Manager
+ * ~~~~~~~~~~~~~~~~~~~~~~
+ * Listens on the network and manages UDP connections. This should be available
+ * for all architectures.
+ *
+ * The configuration parameters have to set before calling _start to take
+ * effect.
+ *
+ * Configuration Parameters:
+ * - 0:listen-port [uint16]: Port to listen for new connections (default: do not
+ *                           listen on any port).
+ * - 0:listen-hostnames [string | string array]: Hostnames of the devices to
+ *                                               listen on (default: listen on
+ *                                               all devices).
+ * - 0:recv-bufsize [uint16]: Size of the buffer that is allocated for receiving
+ *                            messages (default 16kB).
+ *
+ * Open Connection Parameters:
+ * - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
+ * - 0:port [uint16]: Port of the target host (required).
+ *
+ * Connection Callback Paramters:
+ * - 0:remote-hostname [string]: When a new connection is opened by listening on
+ *                               a port, the first callback contains the remote
+ *                               hostname parameter.
+ *
+ * Send Parameters:
+ * No additional parameters for sending over an established UDP socket defined. */
+UA_EXPORT UA_ConnectionManager *
+UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName);
+
 /**
  * Signal Interrupt Manager
  * ~~~~~~~~~~~~~~~~~~~~~~~~

From 598c57c68450156126b0eed7f034bcbd97f02a6a Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Mon, 14 Feb 2022 14:57:07 +0100
Subject: [PATCH 0063/1963] test(el): add udp connection manager test

---
 tests/CMakeLists.txt        |   5 +
 tests/check_eventloop_udp.c | 385 ++++++++++++++++++++++++++++++++++++
 2 files changed, 390 insertions(+)
 create mode 100644 tests/check_eventloop_udp.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6a3811a53bf..62d5eac5da7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -72,6 +72,7 @@ set(test_plugin_sources
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_udp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_clock.c
     ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
@@ -273,6 +274,10 @@ add_executable(check_eventloop_tcp check_eventloop_tcp.c $<TARGET_OBJECTS:open62
 target_link_libraries(check_eventloop_tcp ${LIBS})
 add_test_valgrind(eventloop_tcp ${TESTS_BINARY_DIR}/check_eventloop_tcp)
 
+add_executable(check_eventloop_udp check_eventloop_udp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+target_link_libraries(check_eventloop_udp ${LIBS})
+add_test_valgrind(eventloop_udp ${TESTS_BINARY_DIR}/check_eventloop_udp)
+
 add_executable(check_eventloop_interrupt check_eventloop_interrupt.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
 target_link_libraries(check_eventloop_interrupt ${LIBS})
 add_test_valgrind(eventloop_interrupt ${TESTS_BINARY_DIR}/check_eventloop_interrupt)
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
new file mode 100644
index 00000000000..a6982fe0207
--- /dev/null
+++ b/tests/check_eventloop_udp.c
@@ -0,0 +1,385 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/plugin/eventloop.h>
+#include <open62541/plugin/log_stdout.h>
+#include "open62541/types.h"
+#include "open62541/types_generated.h"
+
+#include "testing_clock.h"
+#include <time.h>
+#include <check.h>
+
+#define N_EVENTS 10000
+
+UA_EventLoop *el;
+
+static void noopCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                         void **connectionContext, UA_StatusCode status,
+                         size_t paramsSize, const UA_KeyValuePair *params,
+                         UA_ByteString msg) {}
+
+START_TEST(listenUDP) {
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+
+    UA_UInt16 port = 4840;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    cm->connectionCallback = noopCallback;
+    UA_KeyValueMap_set(&cm->eventSource.params,
+                       &cm->eventSource.paramsSize,
+                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    el->registerEventSource(el, &cm->eventSource);
+
+    el->start(el);
+
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
+    /* Stop the EventLoop */
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    el->free(el);
+    el = NULL;
+} END_TEST
+
+static unsigned connCount;
+static char *testMsg = "open62541";
+static uintptr_t clientId;
+static UA_Boolean received;
+static void
+connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                   void **connectionContext, UA_StatusCode status,
+                   size_t paramsSize, const UA_KeyValuePair *params,
+                   UA_ByteString msg) {
+    if(*connectionContext != NULL)
+        clientId = connectionId;
+    if(msg.length == 0 && status == UA_STATUSCODE_GOOD) {
+        connCount++;
+
+        /* The remote-hostname is set during the first callback */
+        if(paramsSize > 0) {
+            const void *hn =
+                UA_KeyValueMap_getScalar(params, paramsSize,
+                                         UA_QUALIFIEDNAME(0, "remote-hostname"),
+                                         &UA_TYPES[UA_TYPES_STRING]);
+            ck_assert(hn != NULL);
+        }
+    }
+    if(status != UA_STATUSCODE_GOOD) {
+        connCount--;
+    }
+
+    if(msg.length > 0) {
+        UA_ByteString rcv = UA_BYTESTRING(testMsg);
+        ck_assert(UA_String_equal(&msg, &rcv));
+        received = true;
+    }
+}
+
+static void
+illegalConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void **connectionContext, UA_StatusCode status,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          UA_ByteString msg) {
+    UA_StatusCode rv = el->run(el, 1);
+    ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);
+    if(*connectionContext != NULL)
+        clientId = connectionId;
+    if(msg.length == 0 && status == UA_STATUSCODE_GOOD)
+        connCount++;
+    if(status != UA_STATUSCODE_GOOD)
+        connCount--;
+    if(msg.length > 0) {
+        UA_ByteString rcv = UA_BYTESTRING(testMsg);
+        ck_assert(UA_String_equal(&msg, &rcv));
+        received = true;
+    }
+}
+
+START_TEST(runEventloopFailsIfCalledFromCallback) {
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+
+    UA_UInt16 port = 4840;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    cm->connectionCallback = illegalConnectionCallback;
+    UA_KeyValueMap_set(&cm->eventSource.params,
+                       &cm->eventSource.paramsSize,
+                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    el->registerEventSource(el, &cm->eventSource);
+
+    connCount = 0;
+    el->start(el);
+
+    /* Open a client connection */
+    clientId = 0;
+
+    UA_String targetHost = UA_STRING("localhost");
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    params[0].value = portVar;
+    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+    UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(clientId != 0);
+    ck_assert_uint_eq(connCount, 1);
+
+    /* Send a message from the client */
+    received = false;
+    UA_ByteString snd;
+    retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    memcpy(snd.data, testMsg, strlen(testMsg));
+    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(received);
+
+    /* Close the connection */
+    retval = cm->closeConnection(cm, clientId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(connCount, 1);
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_eq(connCount, 0);
+
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
+    /* Stop the EventLoop */
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    el->free(el);
+    el = NULL;
+} END_TEST
+
+START_TEST(connectUDP) {
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+
+    UA_UInt16 port = 30000;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    cm->connectionCallback = connectionCallback;
+    UA_KeyValueMap_set(&cm->eventSource.params,
+                       &cm->eventSource.paramsSize,
+                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    el->registerEventSource(el, &cm->eventSource);
+
+    connCount = 0;
+    el->start(el);
+
+    /* Open a client connection */
+    clientId = 0;
+
+    UA_String targetHost = UA_STRING("localhost");
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    params[0].value = portVar;
+    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+    UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(clientId != 0);
+    ck_assert_uint_eq(connCount, 1);
+
+    /* Send a message from the client */
+    received = false;
+    UA_ByteString snd;
+    retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    memcpy(snd.data, testMsg, strlen(testMsg));
+    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(received);
+
+    /* Close the connection */
+    retval = cm->closeConnection(cm, clientId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(connCount, 1);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_eq(connCount, 0);
+
+    /* Stop the EventLoop */
+    int max_stop_iteration_count = 10;
+    int iteration = 0;
+    /* Stop the EventLoop */
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    ck_assert(el->state == UA_EVENTLOOPSTATE_STOPPED);
+    el->free(el);
+    el = NULL;
+} END_TEST
+
+START_TEST(udpTalkerAndListener) {
+
+        /* create listener eventloop */
+        UA_EventLoop *elListener = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+
+        /* open a listener connection */
+        UA_UInt16 port = 30000;
+        UA_Variant portVar;
+        UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+        UA_ConnectionManager *cmListener = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+        cmListener->connectionCallback = connectionCallback;
+        UA_KeyValueMap_set(&cmListener->eventSource.params,
+                           &cmListener->eventSource.paramsSize,
+                           UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+        elListener->registerEventSource(elListener, &cmListener->eventSource);
+
+        connCount = 0;
+        elListener->start(elListener);
+
+        /* Open a talker connection */
+        /* create talker eventloop */
+        UA_EventLoop *elTalker = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+        clientId = 0;
+
+        UA_String targetHost = UA_STRING("localhost");
+        UA_KeyValuePair params[2];
+        params[0].key = UA_QUALIFIEDNAME(0, "port");
+        params[0].value = portVar;
+        params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+        UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+        UA_ConnectionManager *cmTalker = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+
+        /* the cm talker should not need a connection callback */
+        cmTalker->connectionCallback = connectionCallback;
+        elTalker->registerEventSource(elTalker, &cmTalker->eventSource);
+        elTalker->start(elTalker);
+        UA_StatusCode retval = cmTalker->openConnection(cmTalker, 2, params, (void*)0x01);
+
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+        for(size_t i = 0; i < 2; i++) {
+            UA_DateTime next = elListener->run(elListener, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        }
+        /* The listener el should not generate any connections */
+        ck_assert_uint_eq(connCount, 0);
+
+        /* The talker el should receive a signal "ready to be written on" */
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+        for(size_t i = 0; i < 2; i++) {
+            UA_DateTime next = elTalker->run(elTalker, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        }
+        ck_assert_uint_eq(connCount, 1);
+
+        /* Send a message from the talker */
+        received = false;
+        UA_ByteString snd;
+        retval = cmTalker->allocNetworkBuffer(cmTalker, clientId, &snd, strlen(testMsg));
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+        memcpy(snd.data, testMsg, strlen(testMsg));
+        retval = cmTalker->sendWithConnection(cmTalker, clientId, 0, NULL, &snd);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+        for(size_t i = 0; i < 2; i++) {
+            UA_DateTime next = elListener->run(elListener, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        }
+        ck_assert(received);
+
+        /* Close the connection */
+        retval = cmTalker->closeConnection(cmTalker, clientId);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+        ck_assert_uint_eq(connCount, 1);
+        for(size_t i = 0; i < 2; i++) {
+            UA_DateTime next = elTalker->run(elTalker, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        }
+        ck_assert_uint_eq(connCount, 0);
+
+        /* Stop the Talker EventLoop */
+        int max_stop_iteration_count = 10;
+        int iteration = 0;
+        /* Stop the EventLoop */
+        elTalker->stop(elTalker);
+        while(elTalker->state != UA_EVENTLOOPSTATE_STOPPED &&
+              iteration < max_stop_iteration_count) {
+            UA_DateTime next = elTalker->run(elTalker, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+            iteration++;
+        }
+        ck_assert(elTalker->state == UA_EVENTLOOPSTATE_STOPPED);
+        elTalker->free(elTalker);
+        elTalker = NULL;
+
+        /* Stop the Listener EventLoop */
+        max_stop_iteration_count = 10;
+        iteration = 0;
+        /* Stop the EventLoop */
+        elListener->stop(elListener);
+        while(elListener->state != UA_EVENTLOOPSTATE_STOPPED &&
+              iteration < max_stop_iteration_count) {
+            UA_DateTime next = elListener->run(elListener, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+            iteration++;
+        }
+        ck_assert(elListener->state == UA_EVENTLOOPSTATE_STOPPED);
+        elListener->free(elListener);
+        elListener = NULL;
+
+    } END_TEST
+
+int main(void) {
+    Suite *s  = suite_create("Test UDP EventLoop");
+    TCase *tc = tcase_create("test cases");
+    tcase_add_test(tc, listenUDP);
+    tcase_add_test(tc, connectUDP);
+    tcase_add_test(tc, runEventloopFailsIfCalledFromCallback);
+
+    tcase_add_test(tc, udpTalkerAndListener);
+    suite_add_tcase(s, tc);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all (sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 86c1b8d4a82f787ac6c2183e88be31377c8e5f47 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 25 Feb 2022 17:16:40 +0100
Subject: [PATCH 0064/1963] feat(server): Make UA_NodeReferenceKind_findTarget
 public

---
 include/open62541/plugin/nodestore.h | 6 ++++++
 src/server/ua_server_internal.h      | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/open62541/plugin/nodestore.h b/include/open62541/plugin/nodestore.h
index 81a033fa4c2..7cdf18554f9 100644
--- a/include/open62541/plugin/nodestore.h
+++ b/include/open62541/plugin/nodestore.h
@@ -380,6 +380,12 @@ UA_EXPORT const UA_ReferenceTarget *
 UA_NodeReferenceKind_iterate(const UA_NodeReferenceKind *rk,
                              const UA_ReferenceTarget *prev);
 
+/* Returns the entry for the targetId or NULL if not found. This can be much
+ * faster than _iterate if the references are in the tree-structure. */
+UA_EXPORT const UA_ReferenceTarget *
+UA_NodeReferenceKind_findTarget(const UA_NodeReferenceKind *rk,
+                                const UA_ExpandedNodeId *targetId);
+
 /* Switch between array and tree representation. Does nothing upon error (e.g.
  * out-of-memory). */
 UA_EXPORT UA_StatusCode
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index c8ad6bd2acb..cd22a3c9672 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -162,10 +162,6 @@ struct UA_Server {
 
 extern const struct aa_head refNameTree;
 
-const UA_ReferenceTarget *
-UA_NodeReferenceKind_findTarget(const UA_NodeReferenceKind *rk,
-                                const UA_ExpandedNodeId *targetId);
-
 /**************************/
 /* SecureChannel Handling */
 /**************************/

From e974d4afe1f38ade8975e0fcee2c3b59d82a4071 Mon Sep 17 00:00:00 2001
From: jackybek <jackybek@gmail.com>
Date: Mon, 28 Feb 2022 05:10:39 +0800
Subject: [PATCH 0065/1963] feat(plugin): Better logging in ua_pki_openssl.c

---
 plugins/crypto/openssl/ua_pki_openssl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index e74c96077bb..17f17c618c6 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -602,11 +602,13 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
 
     pData = certificate->data;
     if (pData == NULL) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Error Empty Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
     certificateX509 = UA_OpenSSL_LoadCertificate(certificate);
     if (certificateX509 == NULL) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Error loading X509 Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
@@ -614,6 +616,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
                                                 NULL, NULL);
     if (pNames == NULL) {
         X509_free (certificateX509);
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Error processing X509 Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
     for (i = 0; i < sk_GENERAL_NAME_num (pNames); i++) {
@@ -622,6 +625,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
              subjectURI.length = (size_t) (value->d.ia5->length);
              subjectURI.data = (UA_Byte *) UA_malloc (subjectURI.length);
              if (subjectURI.data == NULL) {
+                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Error Empty subjectURI");
                  X509_free (certificateX509);
                  sk_GENERAL_NAME_pop_free(pNames, GENERAL_NAME_free);
                  return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
@@ -635,6 +639,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
     ret = UA_STATUSCODE_GOOD;
     if (UA_Bstrstr (subjectURI.data, subjectURI.length,
                     applicationURI->data, applicationURI->length) == NULL) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Empty comparing subjectURI and applicationURI");
         ret = UA_STATUSCODE_BADCERTIFICATEURIINVALID;
     }
 

From 3994f6527665fb204556539879c83d3c295aa25f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Mar 2022 00:37:17 +0000
Subject: [PATCH 0066/1963] build(deps): bump deps/ua-nodeset from `f71b3f4` to
 `4ed94e1`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `f71b3f4` to `4ed94e1`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/f71b3f411d5cb16097c3ae0c744f67ad45535ffb...4ed94e1456ce0718e59c63c89161ca71648ad421)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index f71b3f411d5..4ed94e1456c 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit f71b3f411d5cb16097c3ae0c744f67ad45535ffb
+Subproject commit 4ed94e1456ce0718e59c63c89161ca71648ad421

From 406c5fa637aa254e901f08d1fd1d4953cbfa3c40 Mon Sep 17 00:00:00 2001
From: MarkJynx <69913089+MarkJynx@users.noreply.github.com>
Date: Mon, 14 Mar 2022 18:01:56 +0200
Subject: [PATCH 0067/1963] fix(core): do not encode false booleans as nulls

broken by c8fd22e37b8360eb6502bc1f5f12b0d3745acab4

Booleans in arrays of value "false" were incorrectly encoded as "null"
Previously: [true,null,true]
Currently: [true,false,true]
---
 src/ua_types_encoding_json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index eb77026c192..844ba87307f 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -233,7 +233,7 @@ writeJsonKey(CtxJson *ctx, const char* key) {
 
 static bool
 isNull(const void *p, const UA_DataType *type) {
-    if(UA_DataType_isNumeric(type))
+    if(UA_DataType_isNumeric(type) || type->typeKind == UA_DATATYPEKIND_BOOLEAN)
         return false;
     UA_STACKARRAY(char, buf, type->memSize);
     memset(buf, 0, type->memSize);

From 120831bc6efd63ded59cadde182a794dbebbb6d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 16 Mar 2022 08:50:35 +0100
Subject: [PATCH 0068/1963] core(deps): Bumps LibreSSL to 3.4.3

Relnotes: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.3-relnotes.txt
---
 .github/workflows/build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 60b60750d23..165d772f962 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -47,9 +47,9 @@ jobs:
           - build_name: "Encryption (LibreSSL) Build & Unit Tests (gcc)"
             cmd_deps: |
                 sudo apt-get install -y -qq curl
-                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.2.tar.gz --output libressl.tar.gz
+                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.3.tar.gz --output libressl.tar.gz
                 tar -xvz -f libressl.tar.gz
-                cd libressl-3.4.2
+                cd libressl-3.4.3
                 ./configure
                 sudo make install
             cmd_action: unit_tests_encryption LIBRESSL

From baa6827182a6b6b25027e42c284865bc1984acf4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Mar 2022 00:17:52 +0000
Subject: [PATCH 0069/1963] build(deps): bump deps/ua-nodeset from `4ed94e1` to
 `efd84b1`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `4ed94e1` to `efd84b1`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/4ed94e1456ce0718e59c63c89161ca71648ad421...efd84b1dfb6d247f4d027c7a5b5d52f39d9a1bfd)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 4ed94e1456c..efd84b1dfb6 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 4ed94e1456ce0718e59c63c89161ca71648ad421
+Subproject commit efd84b1dfb6d247f4d027c7a5b5d52f39d9a1bfd

From 7ed4cf3ce2aeb47069fd64611a5548dce857939b Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 21 Mar 2022 14:43:39 +0100
Subject: [PATCH 0070/1963] feat(ci) enable PubSub MQTT in CI

---
 tools/ci.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 64686538b5c..5543d10f8f7 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -141,6 +141,7 @@ function unit_tests {
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
+          -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
@@ -283,6 +284,7 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
+          -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
@@ -310,6 +312,7 @@ function unit_tests_valgrind {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
+          -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \

From 673bb1eaeeaa59eda6663e44dcb7888d473c203a Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 21 Mar 2022 15:05:01 +0100
Subject: [PATCH 0071/1963] fix(server) init mqtt server config

---
 tests/pubsub/check_pubsub_connection_mqtt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index a5da47fde04..7b7a6a0fcd8 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -24,6 +24,7 @@ UA_ServerConfig *config = NULL;
 static void setup(void) {
     server = UA_Server_new();
     config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
     UA_Server_run_startup(server);
 }

From 178fb9c391b9694751eaf53621e973eb4a36c86e Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 13 Apr 2022 11:42:05 +0200
Subject: [PATCH 0072/1963] refactor(pubsub): clean up logic in
 publish-callback

---
 src/pubsub/ua_pubsub_writergroup.c | 346 ++++++++++++++++-------------
 src/ua_util_internal.h             |   6 +
 2 files changed, 196 insertions(+), 156 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index cde8709181a..725105f3cba 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -934,10 +934,10 @@ generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
 }
 
 static UA_StatusCode
-sendNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
-                   UA_DataSetMessage *dsm, UA_UInt16 *writerIds, UA_Byte dsmCount,
-                   UA_ExtensionObject *messageSettings,
-                   UA_ExtensionObject *transportSettings) {
+sendNetworkMessageUADP(UA_PubSubConnection *connection, UA_WriterGroup *wg,
+                       UA_DataSetMessage *dsm, UA_UInt16 *writerIds, UA_Byte dsmCount,
+                       UA_ExtensionObject *messageSettings,
+                       UA_ExtensionObject *transportSettings) {
     UA_NetworkMessage nm;
     memset(&nm, 0, sizeof(UA_NetworkMessage));
 
@@ -995,203 +995,237 @@ sendBufferedNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
                                      transportSettings, buffer);
 }
 
-/* This callback triggers the collection and publish of NetworkMessages and the
- * contained DataSetMessages. */
-void
-UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
+static UA_INLINE void
+publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *connection) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "Publish Callback");
-
-    // TODO: review if its okay to force correct value from caller side instead
-    // UA_assert(writerGroup != NULL);
-    // UA_assert(server != NULL);
-
-    if(!writerGroup) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Publish failed. WriterGroup not found");
-        return;
-    }
-
-    /* Nothing to do? */
-    if(writerGroup->writersCount == 0)
-        return;
-
-    /* Binary or Json encoding?  */
-    if(writerGroup->config.encodingMimeType != UA_PUBSUB_ENCODING_UADP &&
-       writerGroup->config.encodingMimeType != UA_PUBSUB_ENCODING_JSON) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Publish failed: Unknown encoding type.");
-        UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writerGroup);
-        return;
-    }
-
-    /* Find the connection associated with the writer */
-    UA_PubSubConnection *connection = writerGroup->linkedConnection;
-    if(!connection) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Publish failed. PubSubConnection invalid.");
-        UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writerGroup);
-        return;
-    }
-
-    if(writerGroup->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
-        if(UA_NetworkMessage_updateBufferedMessage(&writerGroup->bufferedMessage) != UA_STATUSCODE_GOOD)
-            UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub sending. Unknown field type.");
+    if(UA_NetworkMessage_updateBufferedMessage(&writerGroup->bufferedMessage) != UA_STATUSCODE_GOOD)
+        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub sending. Unknown field type.");
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-        if (writerGroup->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
+    if (writerGroup->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
             size_t sigSize = writerGroup->config.securityPolicy->symmetricModule.cryptoModule.
                             signatureAlgorithm.getLocalSignatureSize(writerGroup->securityPolicyContext);
 
-            UA_Byte payloadOffset        = (UA_Byte)(writerGroup->bufferedMessage.payloadPosition - writerGroup->bufferedMessage.buffer.data);
+            UA_Byte payloadOffset = (UA_Byte)(writerGroup->bufferedMessage.payloadPosition - writerGroup->bufferedMessage.buffer.data);
             memcpy(writerGroup->bufferedMessage.encryptBuffer.data, writerGroup->bufferedMessage.buffer.data, writerGroup->bufferedMessage.buffer.length);
             res = encryptAndSign(writerGroup, writerGroup->bufferedMessage.nm,
                                               writerGroup->bufferedMessage.encryptBuffer.data,
                                               writerGroup->bufferedMessage.encryptBuffer.data + payloadOffset,
                                               writerGroup->bufferedMessage.encryptBuffer.data + writerGroup->bufferedMessage.encryptBuffer.length - sigSize);
 
-            if(res != UA_STATUSCODE_GOOD)
+            if(res != UA_STATUSCODE_GOOD) {
                 UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "PubSub Encryption failed");
+            }
             /* Send the encrypted buffered network message
              * if PubSub encryption is enabled */
             res = sendBufferedNetworkMessage(server, connection, &writerGroup->bufferedMessage.encryptBuffer,
                                              &writerGroup->config.transportSettings);
         }
 #endif
-        if (writerGroup->config.securityMode < UA_MESSAGESECURITYMODE_NONE)
-            res = sendBufferedNetworkMessage(server, connection, &writerGroup->bufferedMessage.buffer,
-                                             &writerGroup->config.transportSettings);
-
-        if(res == UA_STATUSCODE_GOOD) {
-            writerGroup->sequenceNumber++;
-        } else {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Publish failed. sendBufferedNetworkMessage failed. StatusCode %s", UA_StatusCode_name(res));
-            UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writerGroup);
-        }
-        return;
+    if (writerGroup->config.securityMode < UA_MESSAGESECURITYMODE_NONE) {
+        res = sendBufferedNetworkMessage(server, connection, &writerGroup->bufferedMessage.buffer,
+                                         &writerGroup->config.transportSettings);
+    }
+    if(res == UA_STATUSCODE_GOOD) {
+        writerGroup->sequenceNumber++;
+    } else {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Publish failed. sendBufferedNetworkMessage failed. StatusCode %s", UA_StatusCode_name(res));
+        UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writerGroup);
     }
+}
 
+static UA_INLINE UA_Byte
+retrieveMaxDSMCountForNetworkMessage(UA_WriterGroup *writerGroup) {
     /* How many DSM can be sent in one NM? */
     UA_Byte maxDSM = (UA_Byte)writerGroup->config.maxEncapsulatedDataSetMessageCount;
-    if(writerGroup->config.maxEncapsulatedDataSetMessageCount > UA_BYTE_MAX)
+    if(writerGroup->config.maxEncapsulatedDataSetMessageCount > UA_BYTE_MAX) {
         maxDSM = UA_BYTE_MAX;
+    }
     /* If the maxEncapsulatedDataSetMessageCount is set to 0->1 */
-    if(maxDSM == 0)
+    if(maxDSM == 0) {
         maxDSM = 1;
+    }
+    return maxDSM;
+}
 
-    /* It is possible to put several DataSetMessages into one NetworkMessage.
-     * But only if they do not contain promoted fields. NM with only DSM are
-     * sent out right away. The others are kept in a buffer for "batching". */
-    size_t dsmCount = 0;
-    UA_STACKARRAY(UA_UInt16, dsWriterIds, writerGroup->writersCount);
-    UA_STACKARRAY(UA_DataSetMessage, dsmStore, writerGroup->writersCount);
-    UA_DataSetWriter *dsw;
-    LIST_FOREACH(dsw, &writerGroup->writers, listEntry) {
-        if(dsw->state != UA_PUBSUBSTATE_OPERATIONAL)
-            continue;
-
-        /* Find the dataset */
-        UA_PublishedDataSet *pds =
-            UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
-        if(!pds) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Publish: PublishedDataSet not found");
-            UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsw);
-            continue;
-        }
-
-        /* Generate the DSM */
-        res = UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
-        if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Publish: DataSetMessage creation failed");
-            UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsw);
-            continue;
-        }
-
-        /* There is no promoted field and we can batch dsm. So do the batching. */
-        if(pds->promotedFieldsCount == 0 && maxDSM > 1) {
-            dsWriterIds[dsmCount] = dsw->config.dataSetWriterId;
-            dsmCount++;
-            continue;
-        }
-
-        /* Send right away */
-        if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_UADP){
-            res = sendNetworkMessage(connection, writerGroup, &dsmStore[dsmCount],
-                                     &dsw->config.dataSetWriterId, 1,
+static UA_StatusCode
+sendNetworkMessage(UA_WriterGroup *writerGroup, UA_PubSubConnection *connection, UA_DataSetMessage *dsm,
+                   UA_UInt16 *writerIds, UA_Byte dsmCount) {
+    UA_StatusCode res;
+    if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_UADP){
+        res = sendNetworkMessageUADP(connection, writerGroup, dsm,
+                                     writerIds, dsmCount,
                                      &writerGroup->config.messageSettings,
                                      &writerGroup->config.transportSettings);
-        } else { /* if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) */
+    } else { /* if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) */
 #ifdef UA_ENABLE_JSON_ENCODING
-            res = sendNetworkMessageJson(connection, &dsmStore[dsmCount],
-                                         &dsw->config.dataSetWriterId, 1,
-                                         &writerGroup->config.transportSettings);
+        res = sendNetworkMessageJson(connection, dsm,
+                                     writerIds, dsmCount,
+                                     &writerGroup->config.transportSettings);
 #else
-            res = UA_STATUSCODE_BADNOTSUPPORTED;
+        res = UA_STATUSCODE_BADNOTSUPPORTED;
 #endif
-        }
+    }
+    return res;
+}
 
-        if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Publish: Could not send a NetworkMessage");
-            UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsw);
-        }
+static UA_INLINE void
+setErrorStateForDataSetWritersWithIds(UA_Server *server, UA_WriterGroup *writerGroup, UA_UInt16 *dsWriterIds, size_t idCount) {
+    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                 "PubSub Publish: Sending a NetworkMessage failed");
 
-        /* Clean up */
-        if(writerGroup->config.rtLevel == UA_PUBSUB_RT_DIRECT_VALUE_ACCESS) {
-            for(size_t i = 0; i < dsmStore[dsmCount].data.keyFrameData.fieldCount; ++i) {
-                dsmStore[dsmCount].data.keyFrameData.dataSetFields[i].value.data = NULL;
+    UA_DataSetWriter *dsw;
+    LIST_FOREACH(dsw, &writerGroup->writers, listEntry) {
+        for(size_t i = 0; i < idCount; ++i) {
+            if (dsw->config.dataSetWriterId == dsWriterIds[i]) {
+                UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsw);
+                break;
             }
         }
-        UA_DataSetMessage_clear(&dsmStore[dsmCount]);
     }
+}
 
-    /* Send the NetworkMessages with batched DataSetMessages */
-    size_t i = 0;
-    while(i < dsmCount) {
-        /* How many dsm in this iteration? */
-        UA_Byte nmDsmCount = maxDSM;
-        if(i + nmDsmCount > dsmCount) {
-            nmDsmCount = (UA_Byte)(dsmCount - i);
-        }
+static UA_INLINE UA_Boolean
+allowsBatching(UA_PublishedDataSet *publishedDataSet, UA_Byte maxDSM) {
+    /* There is no promoted field and we can batch dsm. So do the batching. */
+    return publishedDataSet->promotedFieldsCount == 0 && maxDSM > 1;
+}
 
-        if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_UADP){
-            res = sendNetworkMessage(connection, writerGroup, &dsmStore[i],
-                                     &dsWriterIds[i], nmDsmCount,
-                                     &writerGroup->config.messageSettings,
-                                     &writerGroup->config.transportSettings);
-        } else { /* if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) */
-#ifdef UA_ENABLE_JSON_ENCODING
-            res = sendNetworkMessageJson(connection, &dsmStore[i],
-                                         &dsWriterIds[i], nmDsmCount,
-                                         &writerGroup->config.transportSettings);
-#else
-            res = UA_STATUSCODE_BADNOTSUPPORTED;
-#endif
+static UA_INLINE UA_StatusCode
+sendNetworkMessageAndCleanup(UA_WriterGroup *writerGroup, UA_PubSubConnection *connection,
+                             UA_DataSetMessage *dataSetMessage, UA_DataSetWriter *writer) {
+    UA_StatusCode res;/* Send right away */
+    res = sendNetworkMessage(
+        writerGroup, connection, dataSetMessage,
+        &writer->config.dataSetWriterId, 1);
+    UA_CHECK_STATUS(res, return res);
+    /* Clean up */
+    if(writerGroup->config.rtLevel == UA_PUBSUB_RT_DIRECT_VALUE_ACCESS) {
+        for(size_t i = 0; i < dataSetMessage->data.keyFrameData.fieldCount; ++i) {
+            dataSetMessage->data.keyFrameData.dataSetFields[i].value.data = NULL;
         }
+    }
+    UA_DataSetMessage_clear(dataSetMessage);
+    return UA_STATUSCODE_GOOD;
+}
 
-        if(res == UA_STATUSCODE_GOOD) {
-            writerGroup->sequenceNumber++; /* TODO: Why not in the direct-send case? */
-        } else {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Publish: Sending a NetworkMessage failed");
-            LIST_FOREACH(dsw, &writerGroup->writers, listEntry) {
-                if(dsWriterIds[i * maxDSM] != dsw->config.dataSetWriterId)
-                    continue;
-                UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsw);
-            }
+static UA_INLINE size_t
+sendOrCollectDataSetMessage(UA_Server *server, UA_WriterGroup *writerGroup, UA_DataSetWriter *writer,
+                            UA_PubSubConnection *connection, UA_Byte maxDSM, UA_UInt16 *dsWriterId,
+                            UA_DataSetMessage *dataSetMessage) {
+    if(writer->state != UA_PUBSUBSTATE_OPERATIONAL) {
+        return 0;
+    }
+    /* Generate the DSM */
+    UA_StatusCode res = UA_DataSetWriter_generateDataSetMessage(server, dataSetMessage, writer);
+    UA_CHECK_STATUS_ERROR(res, goto error, &server->config.logger, UA_LOGCATEGORY_SERVER,
+                          "PubSub Publish: DataSetMessage creation failed");
+
+    UA_PublishedDataSet *publishedDataSet =
+        UA_PublishedDataSet_findPDSbyId(server, writer->connectedDataSet);
+    UA_CHECK_MEM_ERROR(publishedDataSet, goto error, &server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "PubSub Publish: PublishedDataSet not found");
+
+    if (allowsBatching(publishedDataSet, maxDSM)) {
+        *dsWriterId = writer->config.dataSetWriterId;
+        return 1;
+    } else {
+        res = sendNetworkMessageAndCleanup(writerGroup, connection, dataSetMessage, writer);
+        UA_CHECK_STATUS_ERROR(res, goto error, &server->config.logger, UA_LOGCATEGORY_SERVER,
+                              "PubSub Publish: Could not send a NetworkMessage");
+        return 0;
+    }
+error:
+    UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writer);
+    return 0;
+}
+
+static UA_INLINE void
+sendCollectedDataSetMessagesInBatches(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *connection,
+                                      UA_UInt16 *dsWriterIds, UA_DataSetMessage *dataSetMessageBuffer,
+                                      size_t collectedDatasetMessageCount,
+                                      UA_Byte maxDSMCount) {/* Send the NetworkMessages with batched DataSetMessages */
+    size_t cursor, dsmCount;
+    FOR_EACH_CHUNK(cursor, dsmCount, maxDSMCount, collectedDatasetMessageCount) {
+        UA_StatusCode res = sendNetworkMessage(
+            writerGroup, connection, &dataSetMessageBuffer[cursor], &dsWriterIds[cursor], (UA_Byte) dsmCount);
+
+        if(res != UA_STATUSCODE_GOOD) {
+            setErrorStateForDataSetWritersWithIds(server, writerGroup, &dsWriterIds[cursor], dsmCount);
+            continue;
         }
+        writerGroup->sequenceNumber++; /* TODO: Why not in the direct-send case? */
+    }
+    /* Clean up DSM */
+    for(size_t i = 0; i < collectedDatasetMessageCount; i++) {
+        UA_DataSetMessage_clear(&dataSetMessageBuffer[i]);
+    }
+}
+
+static void
+publishRegular(UA_Server *server, UA_WriterGroup *writerGroup,
+               UA_PubSubConnection *connection) {
+    /* It is possible to put several DataSetMessages into one NetworkMessage.
+     * But only if they do not contain promoted fields. NM with only DSM are
+     * sent out right away. The others are kept in a buffer for "batching". */
 
-        /* Forward the position for the next iteration */
-        i += nmDsmCount;
+    UA_Byte maxDSMCount = retrieveMaxDSMCountForNetworkMessage(writerGroup);
+    size_t collectedDatasetMessageCount = 0;
+    UA_STACKARRAY(UA_UInt16, dsWriterIds, writerGroup->writersCount);
+    UA_STACKARRAY(UA_DataSetMessage, dataSetMessageBuffer, writerGroup->writersCount);
+
+    UA_DataSetWriter *writer;
+    LIST_FOREACH(writer, &writerGroup->writers, listEntry) {
+        collectedDatasetMessageCount += sendOrCollectDataSetMessage(server, writerGroup, writer, connection,
+                                                                    maxDSMCount,
+                                                                    &dsWriterIds[collectedDatasetMessageCount],
+                                                                    &dataSetMessageBuffer[collectedDatasetMessageCount]);
     }
+    sendCollectedDataSetMessagesInBatches(server, writerGroup, connection, dsWriterIds, dataSetMessageBuffer,
+                                          collectedDatasetMessageCount, maxDSMCount);
+}
 
-    /* Clean up DSM */
-    for(i = 0; i < dsmCount; i++)
-        UA_DataSetMessage_clear(&dsmStore[i]);
+/* This callback triggers the collection and publish of NetworkMessages and the
+ * contained DataSetMessages. */
+void
+UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
+    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "Publish Callback");
+
+    // TODO: review if its okay to force correct value from caller side instead
+    // UA_assert(writerGroup != NULL);
+    // UA_assert(server != NULL);
+    UA_CHECK_MEM_WARN(writerGroup, return,
+                      &server->config.logger, UA_LOGCATEGORY_SERVER,
+                      "Publish failed. WriterGroup not found");
+    /* Nothing to do? */
+    if(writerGroup->writersCount == 0) {
+        return;
+    }
+    /* Binary or Json encoding?  */
+    UA_CHECK_ERROR(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_UADP ||
+                   writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON,
+                   goto error,
+                   &server->config.logger, UA_LOGCATEGORY_SERVER,
+                   "Publish failed: Unknown encoding type.");
+
+    /* Find the connection associated with the writer */
+    UA_PubSubConnection *connection = writerGroup->linkedConnection;
+    UA_CHECK_MEM_ERROR(connection,
+                       goto error,
+                       &server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "Publish failed. PubSubConnection invalid.");
+
+    if(writerGroup->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
+        publishRT(server, writerGroup, connection);
+    } else {
+        publishRegular(server, writerGroup, connection);
+    }
+    return;
+
+error:
+    UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writerGroup);
 }
 
 /* Add new publishCallback. The first execution is triggered directly after
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 949bff6e510..2f5ea2a0703 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -220,6 +220,12 @@ void UA_EXPORT
 UA_dump_hex_pkg(UA_Byte* buffer, size_t bufferLen);
 #endif
 
+/* Chunked for loop */
+#define FOR_EACH_CHUNK(CURSOR, SIZE, chunkSize, arraySize) \
+        for((CURSOR) = 0, (SIZE) = (arraySize) <= (chunkSize) ? (arraySize) : (chunkSize); \
+            (CURSOR) < (arraySize); \
+            (CURSOR) = (CURSOR) + (chunkSize), (SIZE) = (arraySize) - (CURSOR) <= (chunkSize) ? (arraySize) - (CURSOR) : (chunkSize))
+
 /* Unions that represent any of the supported request or response message */
 typedef union {
     UA_RequestHeader requestHeader;

From 51b0941d676575466b01e7a2726537e37c72551b Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 13 Apr 2022 11:42:42 +0200
Subject: [PATCH 0073/1963] test: test chunked for-loop

---
 tests/check_utils.c | 60 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/tests/check_utils.c b/tests/check_utils.c
index f68bc8a4815..079437340db 100644
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -567,6 +567,59 @@ START_TEST(idOrderString) {
     ck_assert(UA_NodeId_order(&id_str_d, &id_str_c) == UA_ORDER_MORE);
 } END_TEST
 
+START_TEST(chunkForLoopFitting) {
+    size_t validator[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+    size_t start, size;
+    FOR_EACH_CHUNK(start, size, 2, 8) {
+        for(size_t i = start; i < start + size; i++) {
+            validator[i]++;
+        }
+    }
+    for(size_t i = 0; i < 8; i++) {
+        ck_assert_uint_eq(validator[i], 1);
+    }
+} END_TEST
+
+START_TEST(chunkForLoopUndersize) {
+    size_t validator[4] = {0, 0, 0, 0};
+    size_t start, size;
+
+    FOR_EACH_CHUNK(start, size, 6, 4) {
+        for(size_t i = start; i < start + size; i++) {
+            validator[i]++;
+        }
+    }
+    for(size_t i = 0; i < 4; i++) {
+        ck_assert_uint_eq(validator[i], 1);
+    }
+} END_TEST
+
+START_TEST(chunkForLoopWithRemainder) {
+    size_t validator[7] = {0, 0, 0, 0, 0, 0, 0};
+    size_t start, size;
+    FOR_EACH_CHUNK(start, size, 2, 7) {
+        for(size_t i = start; i < start + size; i++) {
+            validator[i]++;
+        }
+    }
+    for(size_t i = 0; i < 7; i++) {
+        ck_assert_uint_eq(validator[i], 1);
+    }
+} END_TEST
+
+START_TEST(chunkForLoopOneChunk) {
+    size_t validator[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+    size_t start, size;
+
+    FOR_EACH_CHUNK(start, size, 8, 8) {
+        for(size_t i = start; i < start + size; i++) {
+            validator[i]++;
+        }
+    }
+    for(size_t i = 0; i < 8; i++) {
+        ck_assert_uint_eq(validator[i], 1);
+    }
+} END_TEST
 
 static Suite* testSuite_Utils(void) {
     Suite *s = suite_create("Utils");
@@ -600,6 +653,13 @@ static Suite* testSuite_Utils(void) {
     tcase_add_test(tc1, idOrderString);
     suite_add_tcase(s, tc2);
 
+    TCase *tc3 = tcase_create("test chunk for loop");
+    tcase_add_test(tc3, chunkForLoopFitting);
+    tcase_add_test(tc3, chunkForLoopUndersize);
+    tcase_add_test(tc3, chunkForLoopWithRemainder);
+    tcase_add_test(tc3, chunkForLoopOneChunk);
+    suite_add_tcase(s, tc3);
+
     return s;
 }
 

From a0370684937949d5f44cbbc2cd05f5142c0ef64d Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 14 Apr 2022 15:55:20 +0200
Subject: [PATCH 0074/1963] refactor(pubsub): cleanup pubsub-udp channel-open

---
 plugins/ua_pubsub_udp.c | 601 ++++++++++++++++++++++++----------------
 1 file changed, 369 insertions(+), 232 deletions(-)

diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 5777becd2fc..fd130723aeb 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2020 Fraunhofer IOSB (Author: Julius Pfrommer)
  * Copyright (c) 2020 Kalycito Infotech Private Limited
  * Copyright (c) 2021 Linutronix GmbH (Author: Kurt Kanzenbach)
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Jan Hermes)
  */
 
 #include <open62541/server_pubsub.h>
@@ -16,8 +17,14 @@
 #include <open62541/plugin/pubsub_udp.h>
 
 #define RECEIVE_MSG_BUFFER_SIZE   4096
-static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[RECEIVE_MSG_BUFFER_SIZE];
 
+#define IPV4_PREFIX_MASK 0xF0000000
+#define IPV4_MULTICAST_PREFIX 0xE0000000
+#ifdef UA_IPV6
+#   define IPV6_MULTICAST_PREFIX 0xFF
+#endif
+
+static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[RECEIVE_MSG_BUFFER_SIZE];
 
 /* UDP multicast network layer specific internal data */
 typedef struct {
@@ -29,41 +36,103 @@ typedef struct {
     UA_Boolean enableLoopback;
     UA_Boolean enableReuse;
     UA_Boolean isMulticast;
+#ifdef __linux__
+    UA_UInt32* socketPriority;
+#endif
+    union {
+        struct ip_mreq ipv4;
+#if UA_IPV6
+        struct ipv6_mreq ipv6;
+#endif
+    } ipMulticastRequest;
 } UA_PubSubChannelDataUDPMC;
 
-/**
- * Open communication socket based on the connectionConfig. Protocol specific parameters are
- * provided within the connectionConfig as KeyValuePair.
- * Currently supported options: "ttl" , "loopback", "reuse"
- *
- * @return ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
-    UA_initialize_architecture_network();
+#define MAX_URL_LENGTH 512
+#define MAX_PORT_CHARACTER_COUNT 6
 
-    if(!UA_Variant_hasScalarType(&connectionConfig->address,
-                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
+static UA_INLINE UA_StatusCode
+getAddressAndPortValues(const UA_NetworkAddressUrlDataType *address, char *outAddress, char *outPort) {
+    UA_String hostname = UA_STRING_NULL;
+    UA_String path = UA_STRING_NULL;
+    UA_UInt16 networkPort = 0;
+    UA_StatusCode res = UA_parseEndpointUrl(&address->url, &hostname, &networkPort, &path);
+    if(res != UA_STATUSCODE_GOOD){
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid Address.");
-        return NULL;
+                     "PubSub Connection creation failed. Invalid URL.");
+        return res;
     }
 
-    UA_NetworkAddressUrlDataType *address =
-        (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
+    if(hostname.length >= MAX_URL_LENGTH) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. URL maximum length is 512.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
-    /* Allocate and init memory for the UDP multicast specific internal data */
-    UA_PubSubChannelDataUDPMC * channelDataUDPMC = (UA_PubSubChannelDataUDPMC *)
-        UA_calloc(1, (sizeof(UA_PubSubChannelDataUDPMC)));
-    if(!channelDataUDPMC){
+    memcpy(outAddress, hostname.data, hostname.length);
+    outAddress[hostname.length] = 0;
+
+    int printedCount = sprintf(outPort, "%u", networkPort);
+    if(printedCount < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection creation failed. Internal error: "
+                         "writing network outPort to string failed: %d (%s)",
+                         networkPort, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static struct addrinfo *
+getAddrInfoListForAddress(char *address, char *port) {
+
+    struct addrinfo hints;
+    memset(&hints, 0, sizeof hints);
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_flags = 0;
+    hints.ai_protocol = 0;
+
+    struct addrinfo *requestResult = NULL;
+    int error = UA_getaddrinfo(address, port, &hints, &requestResult);
+    if(error) {
+        errno = error;
+        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection creation failed. Internal error: "
+                         "getaddrinfo lookup of %s failed with error %s",
+                         address, errno_str));
+        return NULL;
+    }
+    return requestResult;
+}
+
+static struct addrinfo *
+chooseValidAddrInfoAndCreateSocket(UA_SOCKET *sockfd, struct addrinfo* addrInfoList) {
+    struct addrinfo *rp = NULL;
+    for(rp = addrInfoList; rp != NULL; rp = rp->ai_next){
+        *sockfd = UA_socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+        if(*sockfd != UA_INVALID_SOCKET) break; /*success*/
+    }
+    if(!rp) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
+                     "PubSub Connection creation failed. Internal error.");
         return NULL;
     }
+    return rp;
+}
 
+static void
+setConnectionConfigurationProperties(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
+                                     const UA_KeyValuePair *connectionProperties,
+                                     const size_t connectionPropertiesSize) {
     /* Set default values */
-    UA_PubSubChannelDataUDPMC defaultValues =
-        {0, {0}, 0, {0}, 255, true, true, true};
+    UA_PubSubChannelDataUDPMC defaultValues = {
+        .ai_family = 0, .ai_addr = {.ss_family = 0},
+        .ai_addrlen =0, .intf_addr = {.ss_family = 0},
+        .messageTTL = 255, .enableLoopback = true,
+        .enableReuse = true, .isMulticast = true
+    };
     memcpy(channelDataUDPMC, &defaultValues, sizeof(UA_PubSubChannelDataUDPMC));
     /* Iterate over the given KeyValuePair parameters */
     UA_String ttlParam = UA_STRING("ttl");
@@ -71,10 +140,9 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
     UA_String reuseParam = UA_STRING("reuse");
 #ifdef __linux__
     UA_String socketPriorityParam = UA_STRING("sockpriority");
-    UA_UInt32  *socketPriority = NULL;
 #endif
-    for(size_t i = 0; i < connectionConfig->connectionPropertiesSize; i++) {
-        UA_KeyValuePair *prop = &connectionConfig->connectionProperties[i];
+    for(size_t i = 0; i < connectionPropertiesSize; i++) {
+        const UA_KeyValuePair *prop = &connectionProperties[i];
         if(UA_String_equal(&prop->key.name, &ttlParam)) {
             if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
                 channelDataUDPMC->messageTTL = *(UA_UInt32*)prop->value.data;
@@ -90,8 +158,13 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
 #ifdef __linux__
         } else if(UA_String_equal(&prop->key.name, &socketPriorityParam)){
             if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
-                UA_UInt32_copy((UA_UInt32 *) prop->value.data, socketPriority);
+                channelDataUDPMC->socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
+                if(!channelDataUDPMC->socketPriority) {
+                    UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                                   "PubSub Connection creation. Could not set socket priority due to out of memory.");
+                    continue;
+                }
+                UA_UInt32_copy((UA_UInt32 *) prop->value.data, channelDataUDPMC->socketPriority);
             }
 #endif
         } else {
@@ -99,102 +172,169 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
                            "PubSub Connection creation. Unknown connection parameter.");
         }
     }
+}
 
-    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
-        UA_calloc(1, sizeof(UA_PubSubChannel));
-    if(!newChannel) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
-        UA_free(channelDataUDPMC);
-        return NULL;
-    }
-    struct addrinfo hints, *rp, *requestResult = NULL;
-    memset(&hints, 0, sizeof hints);
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_DGRAM;
-    hints.ai_flags = 0;
-    hints.ai_protocol = 0;
-
-    UA_String hostname = UA_STRING_NULL;
-    UA_String path = UA_STRING_NULL;
-    UA_UInt16 networkPort = 0;
-    UA_StatusCode res = UA_parseEndpointUrl(&address->url, &hostname, &networkPort, &path);
-    if(res != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid URL.");
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+static UA_StatusCode
+setupNetworkInterface(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
+                      UA_String *networkInterface) {/* Set configured interface */
+    UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (*networkInterface).length + 1);
+    memcpy(interfaceAsChar, (*networkInterface).data, (*networkInterface).length);
+    interfaceAsChar[(*networkInterface).length] = 0;
+
+    if(channelDataUDPMC->ai_family == AF_INET) {
+        if(UA_inet_pton(AF_INET, interfaceAsChar, &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface) <= 0) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "PubSub Connection creation problem. "
+                         "Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        memcpy(&channelDataUDPMC->intf_addr, &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface,
+               sizeof(channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface));
+#if UA_IPV6
+    } else if(channelDataUDPMC->ai_family == AF_INET6) {
+        channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
+        if(channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "PubSub Connection creation problem. "
+                         "Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+#endif
+    } else {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                     "PubSub Connection creation failed. Multicast setup failed: "
+                     "unknown address family");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
+    return UA_STATUSCODE_GOOD;
+}
 
-    if(hostname.length >= 512) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. URL maximum length is 512.");
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+static UA_StatusCode
+setMulticastInfo(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addressAsChar) {
+    int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET6, addressAsChar,
+                                                        &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr);
+    if(convertTextAddressToBinarySuccessful != 1) {
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
-
-    char addressAsChar[512];
-    memcpy(addressAsChar, hostname.data, hostname.length);
-    addressAsChar[hostname.length] = 0;
-
-    char port[6];
-    sprintf(port, "%u", networkPort);
-
-    int error = UA_getaddrinfo(addressAsChar, port, &hints, &requestResult);
-    if(error) {
-        errno = error;
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation failed. Internal error: "
-                         "getaddrinfo lookup of %s failed with error %s",
-                         addressAsChar, errno_str));
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+    if((channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr.s6_addr[0] != IPV6_MULTICAST_PREFIX)) {
+        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection is created for a unicast address (IPv6)");
+        channelDataUDPMC->isMulticast = false;
+    } else {
+        channelDataUDPMC->isMulticast = true;
+        channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface = 0; // default configuration
     }
+    return UA_STATUSCODE_GOOD;
+}
 
+static UA_StatusCode
+configureMulticast(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
+                   UA_String networkInterface,
+                   const char *addressAsChar) {
+    /* Prepare for following socket options:
+     * - Set the physical interface for in- and outgoing traffic (if configured)
+     * - Join multicast group */
+    memset(&channelDataUDPMC->ipMulticastRequest, 0, sizeof(channelDataUDPMC->ipMulticastRequest));
     /* Check if the ip address is a multicast address */
-    if(requestResult->ai_family == PF_INET) {
-        struct in_addr imr_interface;
-        memset(&imr_interface, 0, sizeof(imr_interface));
-        if(UA_inet_pton(AF_INET, addressAsChar, &imr_interface) == 1 &&
-           (UA_ntohl(imr_interface.s_addr) & 0xF0000000) != 0xE0000000) {
+    if(channelDataUDPMC->ai_family == AF_INET) {
+        int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET, addressAsChar,
+                                                                &channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr);
+        if(convertTextAddressToBinarySuccessful != 1) {
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        uint32_t masked = UA_ntohl(channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr.s_addr) & IPV4_PREFIX_MASK;
+        if(masked != IPV4_MULTICAST_PREFIX) {
             UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "PubSub Connection is created for a unicast address (IPv4)");
+                           "PubSub Connection is created for a unicast address (IPv4)");
             channelDataUDPMC->isMulticast = false;
+        } else {
+            channelDataUDPMC->isMulticast = true;
+            /* default configuration: multihomed hosts can join several groups on
+             * different IF, INADDR_ANY -> kernel decides */
+            channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
         }
+#ifdef UA_IPV6
+    } else if(channelDataUDPMC->ai_family == AF_INET6) {
+        setMulticastInfo(channelDataUDPMC, addressAsChar);
+#endif
     } else {
-        struct in6_addr imr_interface;
-        memset(&imr_interface, 0, sizeof(imr_interface));
-        if(UA_inet_pton(AF_INET6, addressAsChar, &imr_interface) == 1 &&
-           (imr_interface.s6_addr[0] != 0xFF)) {
-            UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "PubSub Connection is created for a unicast address (IPv6)");
-            channelDataUDPMC->isMulticast = false;
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                     "PubSub Connection creation failed. Multicast setup failed: "
+                     "unknown address family");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    if(networkInterface.length > 0) {
+        UA_StatusCode res = setupNetworkInterface(channelDataUDPMC, &networkInterface);
+        if(res != UA_STATUSCODE_GOOD) {
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
-
-    for(rp = requestResult; rp != NULL; rp = rp->ai_next){
-        newChannel->sockfd = UA_socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-        if(newChannel->sockfd != UA_INVALID_SOCKET)
-            break; /*success*/
+    return UA_STATUSCODE_GOOD;
+}
+static void
+UA_PubSubChannelDataUDPMC_free(UA_PubSubChannelDataUDPMC* channelData) {
+    if(channelData) {
+#ifdef __linux__
+        if(channelData->socketPriority) {
+            UA_free(channelData->socketPriority);
+        }
+#endif
+        UA_free(channelData);
     }
-    if(!rp) {
+}
+
+static UA_PubSubChannelDataUDPMC *
+UA_PubSubChannelDataUDPMC_new(UA_PubSubChannel *channel, const UA_PubSubConnectionConfig *connectionConfig) {
+
+    UA_PubSubChannelDataUDPMC *channelDataUDPMC = (UA_PubSubChannelDataUDPMC *)
+            UA_calloc(1, (sizeof(UA_PubSubChannelDataUDPMC)));
+    /* Allocate and init memory for the UDP multicast specific internal data */
+    if(!channelDataUDPMC){
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Internal error.");
-        UA_freeaddrinfo(requestResult);
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+                     "PubSub Connection creation failed. Out of memory.");
+        goto error;
+    }
+    setConnectionConfigurationProperties(channelDataUDPMC, connectionConfig->connectionProperties,
+                                         connectionConfig->connectionPropertiesSize);
+    UA_NetworkAddressUrlDataType *address =
+        (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
+
+    char addressAsChar[MAX_URL_LENGTH];
+    char portAsChar[MAX_PORT_CHARACTER_COUNT];
+    UA_StatusCode res = getAddressAndPortValues(address, addressAsChar, portAsChar);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+    struct addrinfo *addrInfoList = getAddrInfoListForAddress(addressAsChar, portAsChar);
+    if(addrInfoList == NULL) {
+        goto error;
+    }
+    struct addrinfo *addrInfo = chooseValidAddrInfoAndCreateSocket(&channel->sockfd, addrInfoList);
+    if(addrInfo == NULL) {
+        UA_freeaddrinfo(addrInfoList);
+        goto error;
     }
+    channelDataUDPMC->ai_family = addrInfo->ai_family;
+    channelDataUDPMC->ai_addrlen = (socklen_t)addrInfo->ai_addrlen;
+    memcpy(&channelDataUDPMC->ai_addr, addrInfo->ai_addr, addrInfo->ai_addrlen);
+    UA_freeaddrinfo(addrInfoList);
+
+    res = configureMulticast(channelDataUDPMC, address->networkInterface, addressAsChar);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto error_after_socket_creation;
+    }
+    return channelDataUDPMC;
 
-    channelDataUDPMC->ai_family = rp->ai_family;
-    channelDataUDPMC->ai_addrlen = (socklen_t)rp->ai_addrlen;
-    memcpy(&channelDataUDPMC->ai_addr, rp->ai_addr, rp->ai_addrlen);
-    newChannel->handle = channelDataUDPMC; /* Link channel and internal channel data */
+error_after_socket_creation:
+    UA_close(channel->sockfd);
+error:
+    UA_PubSubChannelDataUDPMC_free(channelDataUDPMC);
+    return NULL;
+}
 
+static UA_INLINE UA_StatusCode
+setLoopBackData(UA_SOCKET *sockfd,
+                UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
     /* Set loop back data to your host */
 #if UA_IPV6
     /* The Linux Kernel IPv6 socket code checks for optlen to be at least the
@@ -202,13 +342,13 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
      * boolean. In order for the code to work for IPv4 and IPv6 propagate it to
      * an temporary integer here. */
     UA_Int32 enable = channelDataUDPMC->enableLoopback;
-    if(UA_setsockopt(newChannel->sockfd,
-                     requestResult->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     requestResult->ai_family == PF_INET6 ? IPV6_MULTICAST_LOOP : IP_MULTICAST_LOOP,
+    if(UA_setsockopt(*sockfd,
+                     channelDataUDPMC->ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     channelDataUDPMC->ai_family == AF_INET6 ? IPV6_MULTICAST_LOOP : IP_MULTICAST_LOOP,
                      (const char *)&enable,
                      sizeof (enable)) < 0)
 #else
-    if(UA_setsockopt(newChannel->sockfd, IPPROTO_IP, IP_MULTICAST_LOOP,
+    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_LOOP,
                      (const char *)&channelDataUDPMC->enableLoopback,
                      sizeof (channelDataUDPMC->enableLoopback)) < 0)
 #endif
@@ -218,22 +358,22 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
                          "PubSub Connection creation failed. Loopback setup failed: "
                          "Cannot set socket option IP_MULTICAST_LOOP. Error: %s",
                          errno_str));
-        UA_close(newChannel->sockfd);
-        UA_freeaddrinfo(requestResult);
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
+    return UA_STATUSCODE_GOOD;
+}
 
-    /* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
+static UA_INLINE void
+setTimeToLive(UA_SOCKET *sockfd,
+              const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
 #if UA_IPV6
-    if(UA_setsockopt(newChannel->sockfd,
-                     requestResult->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     requestResult->ai_family == PF_INET6 ? IPV6_MULTICAST_HOPS : IP_MULTICAST_TTL,
+    if(UA_setsockopt(*sockfd,
+                     channelDataUDPMC->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     channelDataUDPMC->ai_family == PF_INET6 ? IPV6_MULTICAST_HOPS : IP_MULTICAST_TTL,
                      (const char *)&channelDataUDPMC->messageTTL,
                      sizeof(channelDataUDPMC->messageTTL)) < 0)
 #else
-    if(UA_setsockopt(newChannel->sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
+    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
                      (const char *)&channelDataUDPMC->messageTTL,
                      sizeof(channelDataUDPMC->messageTTL)) < 0)
 #endif
@@ -244,12 +384,14 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
                            "Cannot set socket option IP_MULTICAST_TTL. Error: %s",
                            errno_str));
     }
+}
 
-    /* Set reuse address -> enables sharing of the same listening address on
-     * different sockets */
+static UA_INLINE void
+setReuseAddress(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Set reuse address -> enables sharing of the same listening address on
+ * different sockets */
     if(channelDataUDPMC->enableReuse){
         int enableReuse = 1;
-        if(UA_setsockopt(newChannel->sockfd, SOL_SOCKET, SO_REUSEADDR,
+        if(UA_setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR,
                          (const char*)&enableReuse, sizeof(enableReuse)) < 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
@@ -258,147 +400,142 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
                                errno_str));
         }
     }
+}
 
-    /* Prepare for following socket options:
-     * - Set the physical interface for in- and outgoing traffic (if configured)
-     * - Join multicast group */
-    enum{
-        IPv4,
-#if UA_IPV6
-        IPv6,
-#endif
-    } ipVersion;
-    union {
-        struct ip_mreq ipv4;
-#if UA_IPV6
-        struct ipv6_mreq ipv6;
-#endif
-    } group;
-    memset(&group, 0, sizeof(group));
-
-    if(requestResult->ai_family == AF_INET &&
-       UA_inet_pton(AF_INET, addressAsChar, &group.ipv4.imr_multiaddr) > 0) {
-        ipVersion = IPv4;
-        /* default configuration: multihomed hosts can join several groups on
-         * different IF, INADDR_ANY -> kernel decides */
-        group.ipv4.imr_interface.s_addr = htonl(INADDR_ANY);
-#if UA_IPV6
-    } else if(requestResult->ai_family == AF_INET6 &&
-              UA_inet_pton(AF_INET6, addressAsChar, &group.ipv6.ipv6mr_multiaddr) > 0) {
-        ipVersion = IPv6;
-        group.ipv6.ipv6mr_interface = 0; // default configuration
-#endif
-    } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation problem."
-                     "Preparing the socket multicast configuration failed");
-        goto cleanup;
-    }
-
-    if(address->networkInterface.length > 0) {
-        /* Set configured interface */
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * address->networkInterface.length + 1);
-        memcpy(interfaceAsChar, address->networkInterface.data, address->networkInterface.length);
-        interfaceAsChar[address->networkInterface.length] = 0;
-
-        if(ipVersion == IPv4) {
-            if(UA_inet_pton(AF_INET, interfaceAsChar, &group.ipv4.imr_interface) <= 0) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub Connection creation problem. "
-                             "Interface configuration preparation failed.");
-                goto cleanup;
-            }
-            memcpy(&channelDataUDPMC->intf_addr, &group.ipv4.imr_interface, sizeof(group.ipv4.imr_interface));
-        }
-#if UA_IPV6
-        else {
-            group.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
-            if(group.ipv6.ipv6mr_interface == 0) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub Connection creation problem. "
-                             "Interface configuration preparation failed.");
-                goto cleanup;
-            }
+#ifdef __linux__
+static UA_StatusCode
+setSocketPriority(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Setting the socket priority to the socket */
+    if(channelDataUDPMC->socketPriority != NULL) {
+        if (UA_setsockopt(*sockfd, SOL_SOCKET, SO_PRIORITY,
+                          channelDataUDPMC->socketPriority, sizeof(int)) < 0) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                             "PubSub Connection creation problem. Priority setup failed: "
+                             "Cannot set socket option SO_PRIORITY. Error: %s", errno_str));
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
-#endif
     }
-
-#if UA_IPV6
-    if(UA_setsockopt(newChannel->sockfd,
-          requestResult->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-          requestResult->ai_family == PF_INET6 ? IPV6_MULTICAST_IF : IP_MULTICAST_IF,
-          ipVersion == IPv6 ? (const void *) &group.ipv6.ipv6mr_interface : &group.ipv4.imr_interface,
-          ipVersion == IPv6 ? sizeof(group.ipv6.ipv6mr_interface) : sizeof(struct in_addr)) < 0)
-#else
-    if(UA_setsockopt(newChannel->sockfd, IPPROTO_IP, IP_MULTICAST_IF,
-                     &group.ipv4.imr_interface, sizeof(struct in_addr)) < 0)
+    return UA_STATUSCODE_GOOD;
+}
 #endif
-    {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation problem. Interface selection failed: "
-                         "Cannot set socket option IP_MULTICAST_IF. Error: %s",
-                         errno_str));
-
-        goto cleanup;
-    }
 
-    if(requestResult->ai_family == PF_INET){//IPv4 handling
+static UA_StatusCode
+bindChannelSocket(UA_SOCKET *sockfd, struct sockaddr_storage *ai_addr, int ai_family) {
+    if(ai_family == AF_INET) { //IPv4 handling
         struct sockaddr_in addr;
         memset(&addr, 0, sizeof(addr));
         addr.sin_family = AF_INET;
-        memcpy(&addr, requestResult->ai_addr, sizeof(struct sockaddr_in));
+        memcpy(&addr, ai_addr, sizeof(struct sockaddr_in));
         addr.sin_addr.s_addr = INADDR_ANY;
-        if(UA_bind(newChannel->sockfd, (const struct sockaddr *)&addr,
-                    sizeof(struct sockaddr_in)) != 0){
+        if(UA_bind(*sockfd, (const struct sockaddr *)&addr,
+            sizeof(struct sockaddr_in)) != 0){
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
                              "PubSub connection creation failed (IPv4). Cannot bind socket: "
                              "Error: %s", errno_str));
-            goto cleanup;
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
 #if UA_IPV6
-    } else if(requestResult->ai_family == PF_INET6) {//IPv6 handling
+    } else if(ai_family == AF_INET6) {//IPv6 handling
         struct sockaddr_in6 addr;
         memset(&addr, 0, sizeof(addr));
         addr.sin6_family = AF_INET6;
-        memcpy(&addr, requestResult->ai_addr, sizeof(struct sockaddr_in6));
+        memcpy(&addr, ai_addr, sizeof(struct sockaddr_in6));
         addr.sin6_addr = in6addr_any;
-        if(UA_bind(newChannel->sockfd, (const struct sockaddr *)&addr,
-                   sizeof(struct sockaddr_in6)) != 0){
+        if(UA_bind(*sockfd, (const struct sockaddr *)&addr,
+            sizeof(struct sockaddr_in6)) != 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
                              "PubSub connection creation failed (IPv6). Cannot bind socket: "
                              "Error: %s", errno_str));
-            goto cleanup;
+
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
 #endif
     }
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+setMulticastOption(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
+#if UA_IPV6
+    if(UA_setsockopt(*sockfd,
+                     channelDataUDPMC->ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     channelDataUDPMC->ai_family == AF_INET6 ? IPV6_MULTICAST_IF : IP_MULTICAST_IF,
+                     channelDataUDPMC->ai_family == AF_INET6 ? (const void *) &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface : &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface,
+                     channelDataUDPMC->ai_family == AF_INET6 ? sizeof(channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface) : sizeof(struct in_addr)) < 0)
+#else
+    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_IF,
+                     &ipMulticastRequest.ipv4.imr_interface, sizeof(struct in_addr)) < 0)
+#endif
+    {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection creation problem. Interface selection failed: "
+                         "Cannot set socket option IP_MULTICAST_IF. Error: %s",
+                         errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
 
+/**
+ * Open communication socket based on the connectionConfig. Protocol specific parameters are
+ * provided within the connectionConfig as KeyValuePair.
+ * Currently supported options: "ttl" , "loopback", "reuse"
+ *
+ * @return ref to created channel, NULL on error
+ */
+static UA_PubSubChannel *
+UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
+    UA_initialize_architecture_network();
+
+    if(!UA_Variant_hasScalarType(&connectionConfig->address,
+                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Invalid Address.");
+        return NULL;
+    }
+    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
+        UA_calloc(1, sizeof(UA_PubSubChannel));
+    if(!newChannel) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Out of memory.");
+        return NULL;
+    }
+    UA_PubSubChannelDataUDPMC *channelDataUDPMC = UA_PubSubChannelDataUDPMC_new(newChannel, connectionConfig);
+    if(!channelDataUDPMC) {
+        goto cleanup;
+    }
+    newChannel->handle = channelDataUDPMC; /* Link channel and internal channel data */
+    UA_StatusCode res = setLoopBackData(&newChannel->sockfd, channelDataUDPMC);
+    if (res != UA_STATUSCODE_GOOD) {
+        goto cleanup_after_channel_data;
+    }
+    setTimeToLive(&newChannel->sockfd, channelDataUDPMC);
+    setReuseAddress(&newChannel->sockfd, channelDataUDPMC);
+
+    res = setMulticastOption(&newChannel->sockfd, channelDataUDPMC);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto cleanup_after_channel_data;
+    }
+    res = bindChannelSocket(&newChannel->sockfd, &channelDataUDPMC->ai_addr, channelDataUDPMC->ai_family);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto cleanup_after_channel_data;
+    }
 #ifdef __linux__
-    /* Setting the socket priority to the socket */
-    if(socketPriority != NULL) {
-        if (UA_setsockopt(newChannel->sockfd, SOL_SOCKET, SO_PRIORITY, socketPriority, sizeof(int))) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                             "PubSub Connection creation problem. Priority setup failed: "
-                             "Cannot set socket option SO_PRIORITY. Error: %s", errno_str));
-            UA_free(socketPriority);
-            goto cleanup;
-        }
-        else
-            UA_free(socketPriority);
+    res = setSocketPriority(&newChannel->sockfd, channelDataUDPMC);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto cleanup_after_channel_data;
     }
 #endif
-
-    UA_freeaddrinfo(requestResult);
     newChannel->state = UA_PUBSUB_CHANNEL_PUB;
     return newChannel;
 
- cleanup:
-    UA_freeaddrinfo(requestResult);
+cleanup_after_channel_data:
     UA_close(newChannel->sockfd);
-    UA_free(channelDataUDPMC);
+    UA_PubSubChannelDataUDPMC_free(channelDataUDPMC);
+cleanup:
     UA_free(newChannel);
     return NULL;
 }
@@ -658,7 +795,7 @@ UA_PubSubChannelUDPMC_close(UA_PubSubChannel *channel) {
     UA_deinitialize_architecture_network();
     //cleanup the internal NetworkLayer data
     UA_PubSubChannelDataUDPMC *networkLayerData = (UA_PubSubChannelDataUDPMC *) channel->handle;
-    UA_free(networkLayerData);
+    UA_PubSubChannelDataUDPMC_free(networkLayerData);
     UA_free(channel);
     return UA_STATUSCODE_GOOD;
 }

From 2e88fee22da8b7700a5773f991aade7e09a3d867 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 13 Apr 2022 09:48:09 +0200
Subject: [PATCH 0075/1963] fix(server) adjust regex for latest nodeset flag

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4c251579c3..c22d8fc8634 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1186,7 +1186,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL" OR UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05"
         # If the "LATEST_1_05" flag is set, it must be checked whether the nodeset NS0 is on the latest version.
         if(UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05")
             file(READ ${UA_FILE_NS0} ver LIMIT 5000)
-            string(REGEX MATCH ".*http:\\/\\/opcfoundation\\.org\\/UA\\/\" Version=\"1\\.05" match ${ver})
+            string(REGEX MATCH ".*http:\\/\\/opcfoundation\\.org\\/UA\\/\" .* Version=\"1\\.05" match ${ver})
             if(NOT match)
                 message(FATAL_ERROR "File ${UA_FILE_NS0} is set incorrectly. You probably need to checkout the git submodule for deps/ua-nodeset to version 1.05. Therefore execute the following command inside the deps/ua-nodeset directory \ngit checkout v1.05")
             endif()

From d21451b7dda7166bc63b3ae367a246b25422e133 Mon Sep 17 00:00:00 2001
From: Tobias Jung <102594442+tobiajung@users.noreply.github.com>
Date: Wed, 20 Apr 2022 08:54:48 +0200
Subject: [PATCH 0076/1963] fix(nc): fix the determinism of the generated
 sources of the nodeset compiler (#5041)

Currently, the nodeset compiler creates source file including the nodes of the information models
in a different order every time a rebuild is done. This is due to the use of sets which change the
order of there elements every time an element gets added. With this change the nodeset compiler
uses lists where order is relevant.
---
 tools/nodeset_compiler/backend_open62541.py | 10 +++++-----
 tools/nodeset_compiler/nodes.py             | 14 +++++++-------
 tools/nodeset_compiler/nodeset.py           | 14 +++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tools/nodeset_compiler/backend_open62541.py b/tools/nodeset_compiler/backend_open62541.py
index e295ab50af9..edefe1f9194 100644
--- a/tools/nodeset_compiler/backend_open62541.py
+++ b/tools/nodeset_compiler/backend_open62541.py
@@ -137,7 +137,7 @@ def writec(line):
 
     additionalHeaders = ""
     if len(typesArray) > 0:
-        for arr in set(typesArray):
+        for arr in typesArray:
             if arr == "UA_TYPES":
                 continue
             # remove ua_ prefix if exists
@@ -221,7 +221,7 @@ def writec(line):
     functionNumber = 0
 
     printed_ids = set()
-    reftypes_functionNumbers = set()
+    reftypes_functionNumbers = list()
     for node in sorted_nodes:
         printed_ids.add(node.id)
 
@@ -280,13 +280,13 @@ def writec(line):
         # of other nodes might depend on the subtyping information of the
         # referencetype to be complete.
         if isinstance(node, ReferenceTypeNode):
-            reftypes_functionNumbers.add(functionNumber)
+            reftypes_functionNumbers.append(functionNumber)
 
         functionNumber = functionNumber + 1
 
 
     # Load generated types
-    for arr in set(typesArray):
+    for arr in typesArray:
         if arr == "UA_TYPES":
             continue
         writec("\nstatic UA_DataTypeArray custom" + arr + " = {")
@@ -307,7 +307,7 @@ def writec(line):
 
     # Add generated types to the server
     writec("\n/* Load custom datatype definitions into the server */")
-    for arr in set(typesArray):
+    for arr in typesArray:
         if arr == "UA_TYPES":
             continue
         writec("if(" + arr + "_COUNT > 0) {")
diff --git a/tools/nodeset_compiler/nodes.py b/tools/nodeset_compiler/nodes.py
index ae88ccdcd04..81628e3186f 100644
--- a/tools/nodeset_compiler/nodes.py
+++ b/tools/nodeset_compiler/nodes.py
@@ -69,7 +69,7 @@ def __init__(self):
         self.symbolicName = None
         self.writeMask = None
         self.userWriteMask = None
-        self.references = set()
+        self.references = dict() # using dict because it retains insertion order
         self.hidden = False
         self.modelUri = None
         self.parent = None
@@ -137,7 +137,7 @@ def parseXMLReferences(self, xmlelement):
                     reftype = RefOrAlias(av)
                 elif at == "IsForward":
                     forward = not "false" in av.lower()
-            self.references.add(Reference(source, reftype, target, forward))
+            self.references[Reference(source, reftype, target, forward)] = None
 
     def getParentReference(self, parentreftypes):
         # HasSubtype has precedence
@@ -152,7 +152,7 @@ def getParentReference(self, parentreftypes):
     def popTypeDef(self):
         for ref in self.references:
             if ref.referenceType.i == 40 and ref.isForward:
-                self.references.remove(ref)
+                del self.references[ref]
                 return ref
         return Reference(NodeId(), NodeId(), NodeId(), False)
 
@@ -162,7 +162,7 @@ def replaceAliases(self, aliases):
         if isinstance(self, VariableNode) or isinstance(self, VariableTypeNode):
             if str(self.dataType) in aliases:
                 self.dataType = NodeId(aliases[self.dataType])
-        new_refs = set()
+        new_refs = dict()
         for ref in self.references:
             if str(ref.source) in aliases:
                 ref.source = NodeId(aliases[ref.source])
@@ -170,7 +170,7 @@ def replaceAliases(self, aliases):
                 ref.target = NodeId(aliases[ref.target])
             if str(ref.referenceType) in aliases:
                 ref.referenceType = NodeId(aliases[ref.referenceType])
-            new_refs.add(ref)
+            new_refs[ref] = None
         self.references = new_refs
 
     def replaceNamespaces(self, nsMapping):
@@ -178,12 +178,12 @@ def replaceNamespaces(self, nsMapping):
         self.browseName.ns = nsMapping[self.browseName.ns]
         if hasattr(self, 'dataType') and isinstance(self.dataType, NodeId):
             self.dataType.ns = nsMapping[self.dataType.ns]
-        new_refs = set()
+        new_refs = dict()
         for ref in self.references:
             ref.source.ns = nsMapping[ref.source.ns]
             ref.target.ns = nsMapping[ref.target.ns]
             ref.referenceType.ns = nsMapping[ref.referenceType.ns]
-            new_refs.add(ref)
+            new_refs[ref] = None
         self.references = new_refs
         self.namespaceMapping = nsMapping
 
diff --git a/tools/nodeset_compiler/nodeset.py b/tools/nodeset_compiler/nodeset.py
index b5e016cc9fc..fc1264d46f1 100644
--- a/tools/nodeset_compiler/nodeset.py
+++ b/tools/nodeset_compiler/nodeset.py
@@ -227,16 +227,16 @@ def filterRef(r, rt):
             if r.target == node.id:
                 if r.source not in self.nodes:
                     continue
-                self.nodes[r.source].references = set(filter(
-                    lambda rt: filterRef(r, rt),
-                    self.nodes[r.source].references
+                self.nodes[r.source].references = dict(filter(
+                    lambda rt: filterRef(r, rt[0]), # filter only on key of each dict item
+                    self.nodes[r.source].references.items()
                 ))
             elif r.source == node.id:
                 if r.target not in self.nodes:
                     continue
-                self.nodes[r.target].references = set(filter(
-                    lambda rt: filterRef(r, rt),
-                    self.nodes[r.target].references
+                self.nodes[r.target].references = dict(filter(
+                    lambda rt: filterRef(r, rt[0]), # filter only on key of each dict item
+                    self.nodes[r.target].references.items()
                 ))
         del self.nodes[node.id]
 
@@ -382,7 +382,7 @@ def addInverseReferences(self):
         for u in self.nodes.values():
             for ref in u.references.copy():
                 back = Reference(ref.target, ref.referenceType, ref.source, not ref.isForward)
-                self.nodes[ref.target].references.add(back) # ref set does not make a duplicate entry
+                self.nodes[ref.target].references[back] = None # dict key does not make a duplicate entry
 
     def setNodeParent(self):
         parentreftypes = getSubTypesOf(self, self.getNodeByBrowseName("HierarchicalReferences"))

From af11a5a37468bc509f6bd9a2e969f75df1fd3585 Mon Sep 17 00:00:00 2001
From: Hermes <jan.hermes@iosb.fraunhofer.de>
Date: Mon, 14 Mar 2022 10:14:13 +0100
Subject: [PATCH 0077/1963] fix(el): win32 shutdown takes 120 s

---
 arch/eventloop_posix_tcp.c | 69 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 3be99b4ec86..c5a8775d14b 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -490,6 +490,69 @@ TCP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostnam
     return UA_STATUSCODE_GOOD;
 }
 
+#ifdef _WIN32
+static UA_RegisteredFD *
+findRegisteredFD(TCPConnectionManager *cm, uintptr_t connectionId) {
+    UA_RegisteredFD *rfd;
+    LIST_FOREACH(rfd, &cm->fds, es_pointers) {
+        if(rfd->fd == connectionId) return rfd;
+    }
+    return NULL;
+}
+
+static UA_DelayedCallback
+*createExplicitlyDelayedShutdownCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, UA_Callback callback) {
+    UA_DelayedCallback *explicitlyDelayedShutdownCallback = (UA_DelayedCallback*) UA_malloc(sizeof(UA_DelayedCallback));
+    if(!explicitlyDelayedShutdownCallback) {
+        return NULL;
+    }
+    explicitlyDelayedShutdownCallback->callback = callback;
+    explicitlyDelayedShutdownCallback->application = cm;
+    explicitlyDelayedShutdownCallback->data = (void*) rfd->fd;
+
+    return explicitlyDelayedShutdownCallback;
+}
+
+static UA_INLINE void
+createAndAddDelayedShutdownCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, UA_Callback callback) {
+    UA_DelayedCallback *explicitlyDelayedShutdownCallback = createExplicitlyDelayedShutdownCallback(cm, rfd, callback);
+    if(!explicitlyDelayedShutdownCallback) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
+                           UA_LOGCATEGORY_NETWORK,
+                           "TCP %u\t| Warning: Out of memory for creating delayed shutdown callback (%s)",
+                           (unsigned)rfd->fd, errno_str));
+        return;
+    }
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+    el->addDelayedCallback(el, explicitlyDelayedShutdownCallback);
+}
+
+static void
+delayedShutdownCallback(void* application, void* data) {
+
+    UA_ConnectionManager *cm = (UA_ConnectionManager*) application;
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_FD fd = (UA_FD) data;
+
+    UA_RegisteredFD* rfd = findRegisteredFD(tcm, fd);
+    if(rfd == NULL) {
+        return;
+    }
+    UA_ByteString response = tcm->rxBuffer;
+    int ret = UA_recv(fd, (char *)response.data, response.length, MSG_DONTWAIT | MSG_PEEK);
+    if(ret == 0 || ret == -1) {
+        cm->connectionCallback(cm, (uintptr_t)fd, &rfd->context,
+                               UA_STATUSCODE_BADCONNECTIONCLOSED,
+                               0, NULL, UA_BYTESTRING_NULL);
+        TCP_close(tcm, rfd);
+    } else {
+        /* add the delayed shutdown callback again because the peeked data will be processed in the next el cycle */
+        createAndAddDelayedShutdownCallback(cm, rfd, delayedShutdownCallback);
+    }
+}
+#endif
+
 static UA_StatusCode
 TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
@@ -500,7 +563,11 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 #ifndef _WIN32
     int res = UA_shutdown((UA_FD)connectionId, SHUT_RDWR);
 #else
-    int res = UA_shutdown((UA_FD)connectionId, SD_BOTH);
+    int res = UA_shutdown((UA_FD)connectionId, SD_SEND);
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_RegisteredFD* rfd = findRegisteredFD(tcm, (UA_FD) connectionId);
+
+    createAndAddDelayedShutdownCallback(cm, rfd, delayedShutdownCallback);
 #endif
     if(res != 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(

From 8b16ccaa72b450ae5a6f33bc175bf65989283761 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 14 Apr 2022 15:55:20 +0200
Subject: [PATCH 0078/1963] refactor(pubsub): cleanup pubsub-udp channel-open

---
 plugins/ua_pubsub_udp.c | 602 ++++++++++++++++++++++++----------------
 1 file changed, 369 insertions(+), 233 deletions(-)

diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 5777becd2fc..96c770e437c 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2020 Fraunhofer IOSB (Author: Julius Pfrommer)
  * Copyright (c) 2020 Kalycito Infotech Private Limited
  * Copyright (c) 2021 Linutronix GmbH (Author: Kurt Kanzenbach)
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Jan Hermes)
  */
 
 #include <open62541/server_pubsub.h>
@@ -16,8 +17,14 @@
 #include <open62541/plugin/pubsub_udp.h>
 
 #define RECEIVE_MSG_BUFFER_SIZE   4096
-static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[RECEIVE_MSG_BUFFER_SIZE];
 
+#define IPV4_PREFIX_MASK 0xF0000000
+#define IPV4_MULTICAST_PREFIX 0xE0000000
+#ifdef UA_IPV6
+#   define IPV6_MULTICAST_PREFIX 0xFF
+#endif
+
+static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[RECEIVE_MSG_BUFFER_SIZE];
 
 /* UDP multicast network layer specific internal data */
 typedef struct {
@@ -29,52 +36,112 @@ typedef struct {
     UA_Boolean enableLoopback;
     UA_Boolean enableReuse;
     UA_Boolean isMulticast;
+#ifdef __linux__
+    UA_UInt32* socketPriority;
+#endif
+    union {
+        struct ip_mreq ipv4;
+#if UA_IPV6
+        struct ipv6_mreq ipv6;
+#endif
+    } ipMulticastRequest;
 } UA_PubSubChannelDataUDPMC;
 
-/**
- * Open communication socket based on the connectionConfig. Protocol specific parameters are
- * provided within the connectionConfig as KeyValuePair.
- * Currently supported options: "ttl" , "loopback", "reuse"
- *
- * @return ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
-    UA_initialize_architecture_network();
+#define MAX_URL_LENGTH 512
+#define MAX_PORT_CHARACTER_COUNT 6
 
-    if(!UA_Variant_hasScalarType(&connectionConfig->address,
-                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
+static UA_INLINE UA_StatusCode
+getAddressAndPortValues(const UA_NetworkAddressUrlDataType *address, char *outAddress, char *outPort) {
+    UA_String hostname = UA_STRING_NULL;
+    UA_String path = UA_STRING_NULL;
+    UA_UInt16 networkPort = 0;
+    UA_StatusCode res = UA_parseEndpointUrl(&address->url, &hostname, &networkPort, &path);
+    if(res != UA_STATUSCODE_GOOD){
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid Address.");
-        return NULL;
+                     "PubSub Connection creation failed. Invalid URL.");
+        return res;
     }
 
-    UA_NetworkAddressUrlDataType *address =
-        (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
+    if(hostname.length >= MAX_URL_LENGTH) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. URL maximum length is 512.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
-    /* Allocate and init memory for the UDP multicast specific internal data */
-    UA_PubSubChannelDataUDPMC * channelDataUDPMC = (UA_PubSubChannelDataUDPMC *)
-        UA_calloc(1, (sizeof(UA_PubSubChannelDataUDPMC)));
-    if(!channelDataUDPMC){
+    memcpy(outAddress, hostname.data, hostname.length);
+    outAddress[hostname.length] = 0;
+
+    int printedCount = sprintf(outPort, "%u", networkPort);
+    if(printedCount < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection creation failed. Internal error: "
+                         "writing network outPort to string failed: %d (%s)",
+                         networkPort, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static struct addrinfo *
+getAddrInfoListForAddress(char *address, char *port) {
+
+    struct addrinfo hints;
+    memset(&hints, 0, sizeof hints);
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_flags = 0;
+    hints.ai_protocol = 0;
+
+    struct addrinfo *requestResult = NULL;
+    int error = UA_getaddrinfo(address, port, &hints, &requestResult);
+    if(error) {
+        errno = error;
+        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection creation failed. Internal error: "
+                         "getaddrinfo lookup of %s failed with error %s",
+                         address, errno_str));
+        return NULL;
+    }
+    return requestResult;
+}
+
+static struct addrinfo *
+chooseValidAddrInfoAndCreateSocket(UA_SOCKET *sockfd, struct addrinfo* addrInfoList) {
+    struct addrinfo *rp = NULL;
+    for(rp = addrInfoList; rp != NULL; rp = rp->ai_next){
+        *sockfd = UA_socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+        if(*sockfd != UA_INVALID_SOCKET) break; /*success*/
+    }
+    if(!rp) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
+                     "PubSub Connection creation failed. Internal error.");
         return NULL;
     }
+    return rp;
+}
 
+static void
+setConnectionConfigurationProperties(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
+                                     const UA_KeyValuePair *connectionProperties,
+                                     const size_t connectionPropertiesSize) {
     /* Set default values */
-    UA_PubSubChannelDataUDPMC defaultValues =
-        {0, {0}, 0, {0}, 255, true, true, true};
-    memcpy(channelDataUDPMC, &defaultValues, sizeof(UA_PubSubChannelDataUDPMC));
+    memset(channelDataUDPMC, 0, sizeof(UA_PubSubChannelDataUDPMC));
+    channelDataUDPMC->messageTTL = 255;
+    channelDataUDPMC->enableLoopback = true;
+    channelDataUDPMC->enableReuse = true;
+    channelDataUDPMC->isMulticast = true;
+
     /* Iterate over the given KeyValuePair parameters */
     UA_String ttlParam = UA_STRING("ttl");
     UA_String loopbackParam = UA_STRING("loopback");
     UA_String reuseParam = UA_STRING("reuse");
 #ifdef __linux__
     UA_String socketPriorityParam = UA_STRING("sockpriority");
-    UA_UInt32  *socketPriority = NULL;
 #endif
-    for(size_t i = 0; i < connectionConfig->connectionPropertiesSize; i++) {
-        UA_KeyValuePair *prop = &connectionConfig->connectionProperties[i];
+    for(size_t i = 0; i < connectionPropertiesSize; i++) {
+        const UA_KeyValuePair *prop = &connectionProperties[i];
         if(UA_String_equal(&prop->key.name, &ttlParam)) {
             if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
                 channelDataUDPMC->messageTTL = *(UA_UInt32*)prop->value.data;
@@ -90,8 +157,13 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
 #ifdef __linux__
         } else if(UA_String_equal(&prop->key.name, &socketPriorityParam)){
             if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
-                UA_UInt32_copy((UA_UInt32 *) prop->value.data, socketPriority);
+                channelDataUDPMC->socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
+                if(!channelDataUDPMC->socketPriority) {
+                    UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                                   "PubSub Connection creation. Could not set socket priority due to out of memory.");
+                    continue;
+                }
+                UA_UInt32_copy((UA_UInt32 *) prop->value.data, channelDataUDPMC->socketPriority);
             }
 #endif
         } else {
@@ -99,102 +171,169 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
                            "PubSub Connection creation. Unknown connection parameter.");
         }
     }
+}
 
-    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
-        UA_calloc(1, sizeof(UA_PubSubChannel));
-    if(!newChannel) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
-        UA_free(channelDataUDPMC);
-        return NULL;
-    }
-    struct addrinfo hints, *rp, *requestResult = NULL;
-    memset(&hints, 0, sizeof hints);
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_DGRAM;
-    hints.ai_flags = 0;
-    hints.ai_protocol = 0;
-
-    UA_String hostname = UA_STRING_NULL;
-    UA_String path = UA_STRING_NULL;
-    UA_UInt16 networkPort = 0;
-    UA_StatusCode res = UA_parseEndpointUrl(&address->url, &hostname, &networkPort, &path);
-    if(res != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid URL.");
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+static UA_StatusCode
+setupNetworkInterface(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
+                      UA_String *networkInterface) {/* Set configured interface */
+    UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (*networkInterface).length + 1);
+    memcpy(interfaceAsChar, (*networkInterface).data, (*networkInterface).length);
+    interfaceAsChar[(*networkInterface).length] = 0;
+
+    if(channelDataUDPMC->ai_family == AF_INET) {
+        if(UA_inet_pton(AF_INET, interfaceAsChar, &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface) <= 0) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "PubSub Connection creation problem. "
+                         "Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        memcpy(&channelDataUDPMC->intf_addr, &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface,
+               sizeof(channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface));
+#if UA_IPV6
+    } else if(channelDataUDPMC->ai_family == AF_INET6) {
+        channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
+        if(channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "PubSub Connection creation problem. "
+                         "Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+#endif
+    } else {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                     "PubSub Connection creation failed. Multicast setup failed: "
+                     "unknown address family");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
+    return UA_STATUSCODE_GOOD;
+}
 
-    if(hostname.length >= 512) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. URL maximum length is 512.");
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+static UA_StatusCode
+setMulticastInfo(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addressAsChar) {
+    int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET6, addressAsChar,
+                                                        &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr);
+    if(convertTextAddressToBinarySuccessful != 1) {
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
-
-    char addressAsChar[512];
-    memcpy(addressAsChar, hostname.data, hostname.length);
-    addressAsChar[hostname.length] = 0;
-
-    char port[6];
-    sprintf(port, "%u", networkPort);
-
-    int error = UA_getaddrinfo(addressAsChar, port, &hints, &requestResult);
-    if(error) {
-        errno = error;
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation failed. Internal error: "
-                         "getaddrinfo lookup of %s failed with error %s",
-                         addressAsChar, errno_str));
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+    if((channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr.s6_addr[0] != IPV6_MULTICAST_PREFIX)) {
+        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection is created for a unicast address (IPv6)");
+        channelDataUDPMC->isMulticast = false;
+    } else {
+        channelDataUDPMC->isMulticast = true;
+        channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface = 0; // default configuration
     }
+    return UA_STATUSCODE_GOOD;
+}
 
+static UA_StatusCode
+configureMulticast(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
+                   UA_String networkInterface,
+                   const char *addressAsChar) {
+    /* Prepare for following socket options:
+     * - Set the physical interface for in- and outgoing traffic (if configured)
+     * - Join multicast group */
+    memset(&channelDataUDPMC->ipMulticastRequest, 0, sizeof(channelDataUDPMC->ipMulticastRequest));
     /* Check if the ip address is a multicast address */
-    if(requestResult->ai_family == PF_INET) {
-        struct in_addr imr_interface;
-        memset(&imr_interface, 0, sizeof(imr_interface));
-        if(UA_inet_pton(AF_INET, addressAsChar, &imr_interface) == 1 &&
-           (UA_ntohl(imr_interface.s_addr) & 0xF0000000) != 0xE0000000) {
+    if(channelDataUDPMC->ai_family == AF_INET) {
+        int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET, addressAsChar,
+                                                                &channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr);
+        if(convertTextAddressToBinarySuccessful != 1) {
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        uint32_t masked = UA_ntohl(channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr.s_addr) & IPV4_PREFIX_MASK;
+        if(masked != IPV4_MULTICAST_PREFIX) {
             UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "PubSub Connection is created for a unicast address (IPv4)");
+                           "PubSub Connection is created for a unicast address (IPv4)");
             channelDataUDPMC->isMulticast = false;
+        } else {
+            channelDataUDPMC->isMulticast = true;
+            /* default configuration: multihomed hosts can join several groups on
+             * different IF, INADDR_ANY -> kernel decides */
+            channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
         }
+#ifdef UA_IPV6
+    } else if(channelDataUDPMC->ai_family == AF_INET6) {
+        setMulticastInfo(channelDataUDPMC, addressAsChar);
+#endif
     } else {
-        struct in6_addr imr_interface;
-        memset(&imr_interface, 0, sizeof(imr_interface));
-        if(UA_inet_pton(AF_INET6, addressAsChar, &imr_interface) == 1 &&
-           (imr_interface.s6_addr[0] != 0xFF)) {
-            UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "PubSub Connection is created for a unicast address (IPv6)");
-            channelDataUDPMC->isMulticast = false;
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                     "PubSub Connection creation failed. Multicast setup failed: "
+                     "unknown address family");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    if(networkInterface.length > 0) {
+        UA_StatusCode res = setupNetworkInterface(channelDataUDPMC, &networkInterface);
+        if(res != UA_STATUSCODE_GOOD) {
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
-
-    for(rp = requestResult; rp != NULL; rp = rp->ai_next){
-        newChannel->sockfd = UA_socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-        if(newChannel->sockfd != UA_INVALID_SOCKET)
-            break; /*success*/
+    return UA_STATUSCODE_GOOD;
+}
+static void
+UA_PubSubChannelDataUDPMC_free(UA_PubSubChannelDataUDPMC* channelData) {
+    if(channelData) {
+#ifdef __linux__
+        if(channelData->socketPriority) {
+            UA_free(channelData->socketPriority);
+        }
+#endif
+        UA_free(channelData);
     }
-    if(!rp) {
+}
+
+static UA_PubSubChannelDataUDPMC *
+UA_PubSubChannelDataUDPMC_new(UA_PubSubChannel *channel, const UA_PubSubConnectionConfig *connectionConfig) {
+
+    UA_PubSubChannelDataUDPMC *channelDataUDPMC = (UA_PubSubChannelDataUDPMC *)
+            UA_calloc(1, (sizeof(UA_PubSubChannelDataUDPMC)));
+    /* Allocate and init memory for the UDP multicast specific internal data */
+    if(!channelDataUDPMC){
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Internal error.");
-        UA_freeaddrinfo(requestResult);
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+                     "PubSub Connection creation failed. Out of memory.");
+        goto error;
+    }
+    setConnectionConfigurationProperties(channelDataUDPMC, connectionConfig->connectionProperties,
+                                         connectionConfig->connectionPropertiesSize);
+    UA_NetworkAddressUrlDataType *address =
+        (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
+
+    char addressAsChar[MAX_URL_LENGTH];
+    char portAsChar[MAX_PORT_CHARACTER_COUNT];
+    UA_StatusCode res = getAddressAndPortValues(address, addressAsChar, portAsChar);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+    struct addrinfo *addrInfoList = getAddrInfoListForAddress(addressAsChar, portAsChar);
+    if(addrInfoList == NULL) {
+        goto error;
+    }
+    struct addrinfo *addrInfo = chooseValidAddrInfoAndCreateSocket(&channel->sockfd, addrInfoList);
+    if(addrInfo == NULL) {
+        UA_freeaddrinfo(addrInfoList);
+        goto error;
     }
+    channelDataUDPMC->ai_family = addrInfo->ai_family;
+    channelDataUDPMC->ai_addrlen = (socklen_t)addrInfo->ai_addrlen;
+    memcpy(&channelDataUDPMC->ai_addr, addrInfo->ai_addr, addrInfo->ai_addrlen);
+    UA_freeaddrinfo(addrInfoList);
+
+    res = configureMulticast(channelDataUDPMC, address->networkInterface, addressAsChar);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto error_after_socket_creation;
+    }
+    return channelDataUDPMC;
 
-    channelDataUDPMC->ai_family = rp->ai_family;
-    channelDataUDPMC->ai_addrlen = (socklen_t)rp->ai_addrlen;
-    memcpy(&channelDataUDPMC->ai_addr, rp->ai_addr, rp->ai_addrlen);
-    newChannel->handle = channelDataUDPMC; /* Link channel and internal channel data */
+error_after_socket_creation:
+    UA_close(channel->sockfd);
+error:
+    UA_PubSubChannelDataUDPMC_free(channelDataUDPMC);
+    return NULL;
+}
 
+static UA_INLINE UA_StatusCode
+setLoopBackData(UA_SOCKET *sockfd,
+                UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
     /* Set loop back data to your host */
 #if UA_IPV6
     /* The Linux Kernel IPv6 socket code checks for optlen to be at least the
@@ -202,13 +341,13 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
      * boolean. In order for the code to work for IPv4 and IPv6 propagate it to
      * an temporary integer here. */
     UA_Int32 enable = channelDataUDPMC->enableLoopback;
-    if(UA_setsockopt(newChannel->sockfd,
-                     requestResult->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     requestResult->ai_family == PF_INET6 ? IPV6_MULTICAST_LOOP : IP_MULTICAST_LOOP,
+    if(UA_setsockopt(*sockfd,
+                     channelDataUDPMC->ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     channelDataUDPMC->ai_family == AF_INET6 ? IPV6_MULTICAST_LOOP : IP_MULTICAST_LOOP,
                      (const char *)&enable,
                      sizeof (enable)) < 0)
 #else
-    if(UA_setsockopt(newChannel->sockfd, IPPROTO_IP, IP_MULTICAST_LOOP,
+    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_LOOP,
                      (const char *)&channelDataUDPMC->enableLoopback,
                      sizeof (channelDataUDPMC->enableLoopback)) < 0)
 #endif
@@ -218,22 +357,22 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
                          "PubSub Connection creation failed. Loopback setup failed: "
                          "Cannot set socket option IP_MULTICAST_LOOP. Error: %s",
                          errno_str));
-        UA_close(newChannel->sockfd);
-        UA_freeaddrinfo(requestResult);
-        UA_free(channelDataUDPMC);
-        UA_free(newChannel);
-        return NULL;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
+    return UA_STATUSCODE_GOOD;
+}
 
-    /* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
+static UA_INLINE void
+setTimeToLive(UA_SOCKET *sockfd,
+              const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
 #if UA_IPV6
-    if(UA_setsockopt(newChannel->sockfd,
-                     requestResult->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     requestResult->ai_family == PF_INET6 ? IPV6_MULTICAST_HOPS : IP_MULTICAST_TTL,
+    if(UA_setsockopt(*sockfd,
+                     channelDataUDPMC->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     channelDataUDPMC->ai_family == PF_INET6 ? IPV6_MULTICAST_HOPS : IP_MULTICAST_TTL,
                      (const char *)&channelDataUDPMC->messageTTL,
                      sizeof(channelDataUDPMC->messageTTL)) < 0)
 #else
-    if(UA_setsockopt(newChannel->sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
+    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
                      (const char *)&channelDataUDPMC->messageTTL,
                      sizeof(channelDataUDPMC->messageTTL)) < 0)
 #endif
@@ -244,12 +383,14 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
                            "Cannot set socket option IP_MULTICAST_TTL. Error: %s",
                            errno_str));
     }
+}
 
-    /* Set reuse address -> enables sharing of the same listening address on
-     * different sockets */
+static UA_INLINE void
+setReuseAddress(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Set reuse address -> enables sharing of the same listening address on
+ * different sockets */
     if(channelDataUDPMC->enableReuse){
         int enableReuse = 1;
-        if(UA_setsockopt(newChannel->sockfd, SOL_SOCKET, SO_REUSEADDR,
+        if(UA_setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR,
                          (const char*)&enableReuse, sizeof(enableReuse)) < 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
@@ -258,147 +399,142 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
                                errno_str));
         }
     }
+}
 
-    /* Prepare for following socket options:
-     * - Set the physical interface for in- and outgoing traffic (if configured)
-     * - Join multicast group */
-    enum{
-        IPv4,
-#if UA_IPV6
-        IPv6,
-#endif
-    } ipVersion;
-    union {
-        struct ip_mreq ipv4;
-#if UA_IPV6
-        struct ipv6_mreq ipv6;
-#endif
-    } group;
-    memset(&group, 0, sizeof(group));
-
-    if(requestResult->ai_family == AF_INET &&
-       UA_inet_pton(AF_INET, addressAsChar, &group.ipv4.imr_multiaddr) > 0) {
-        ipVersion = IPv4;
-        /* default configuration: multihomed hosts can join several groups on
-         * different IF, INADDR_ANY -> kernel decides */
-        group.ipv4.imr_interface.s_addr = htonl(INADDR_ANY);
-#if UA_IPV6
-    } else if(requestResult->ai_family == AF_INET6 &&
-              UA_inet_pton(AF_INET6, addressAsChar, &group.ipv6.ipv6mr_multiaddr) > 0) {
-        ipVersion = IPv6;
-        group.ipv6.ipv6mr_interface = 0; // default configuration
-#endif
-    } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation problem."
-                     "Preparing the socket multicast configuration failed");
-        goto cleanup;
-    }
-
-    if(address->networkInterface.length > 0) {
-        /* Set configured interface */
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * address->networkInterface.length + 1);
-        memcpy(interfaceAsChar, address->networkInterface.data, address->networkInterface.length);
-        interfaceAsChar[address->networkInterface.length] = 0;
-
-        if(ipVersion == IPv4) {
-            if(UA_inet_pton(AF_INET, interfaceAsChar, &group.ipv4.imr_interface) <= 0) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub Connection creation problem. "
-                             "Interface configuration preparation failed.");
-                goto cleanup;
-            }
-            memcpy(&channelDataUDPMC->intf_addr, &group.ipv4.imr_interface, sizeof(group.ipv4.imr_interface));
-        }
-#if UA_IPV6
-        else {
-            group.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
-            if(group.ipv6.ipv6mr_interface == 0) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub Connection creation problem. "
-                             "Interface configuration preparation failed.");
-                goto cleanup;
-            }
+#ifdef __linux__
+static UA_StatusCode
+setSocketPriority(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Setting the socket priority to the socket */
+    if(channelDataUDPMC->socketPriority != NULL) {
+        if (UA_setsockopt(*sockfd, SOL_SOCKET, SO_PRIORITY,
+                          channelDataUDPMC->socketPriority, sizeof(int)) < 0) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                             "PubSub Connection creation problem. Priority setup failed: "
+                             "Cannot set socket option SO_PRIORITY. Error: %s", errno_str));
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
-#endif
     }
-
-#if UA_IPV6
-    if(UA_setsockopt(newChannel->sockfd,
-          requestResult->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-          requestResult->ai_family == PF_INET6 ? IPV6_MULTICAST_IF : IP_MULTICAST_IF,
-          ipVersion == IPv6 ? (const void *) &group.ipv6.ipv6mr_interface : &group.ipv4.imr_interface,
-          ipVersion == IPv6 ? sizeof(group.ipv6.ipv6mr_interface) : sizeof(struct in_addr)) < 0)
-#else
-    if(UA_setsockopt(newChannel->sockfd, IPPROTO_IP, IP_MULTICAST_IF,
-                     &group.ipv4.imr_interface, sizeof(struct in_addr)) < 0)
+    return UA_STATUSCODE_GOOD;
+}
 #endif
-    {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation problem. Interface selection failed: "
-                         "Cannot set socket option IP_MULTICAST_IF. Error: %s",
-                         errno_str));
-
-        goto cleanup;
-    }
 
-    if(requestResult->ai_family == PF_INET){//IPv4 handling
+static UA_StatusCode
+bindChannelSocket(UA_SOCKET *sockfd, struct sockaddr_storage *ai_addr, int ai_family) {
+    if(ai_family == AF_INET) { //IPv4 handling
         struct sockaddr_in addr;
         memset(&addr, 0, sizeof(addr));
         addr.sin_family = AF_INET;
-        memcpy(&addr, requestResult->ai_addr, sizeof(struct sockaddr_in));
+        memcpy(&addr, ai_addr, sizeof(struct sockaddr_in));
         addr.sin_addr.s_addr = INADDR_ANY;
-        if(UA_bind(newChannel->sockfd, (const struct sockaddr *)&addr,
-                    sizeof(struct sockaddr_in)) != 0){
+        if(UA_bind(*sockfd, (const struct sockaddr *)&addr,
+            sizeof(struct sockaddr_in)) != 0){
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
                              "PubSub connection creation failed (IPv4). Cannot bind socket: "
                              "Error: %s", errno_str));
-            goto cleanup;
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
 #if UA_IPV6
-    } else if(requestResult->ai_family == PF_INET6) {//IPv6 handling
+    } else if(ai_family == AF_INET6) {//IPv6 handling
         struct sockaddr_in6 addr;
         memset(&addr, 0, sizeof(addr));
         addr.sin6_family = AF_INET6;
-        memcpy(&addr, requestResult->ai_addr, sizeof(struct sockaddr_in6));
+        memcpy(&addr, ai_addr, sizeof(struct sockaddr_in6));
         addr.sin6_addr = in6addr_any;
-        if(UA_bind(newChannel->sockfd, (const struct sockaddr *)&addr,
-                   sizeof(struct sockaddr_in6)) != 0){
+        if(UA_bind(*sockfd, (const struct sockaddr *)&addr,
+            sizeof(struct sockaddr_in6)) != 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
                              "PubSub connection creation failed (IPv6). Cannot bind socket: "
                              "Error: %s", errno_str));
-            goto cleanup;
+
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
 #endif
     }
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+setMulticastOption(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
+#if UA_IPV6
+    if(UA_setsockopt(*sockfd,
+                     channelDataUDPMC->ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     channelDataUDPMC->ai_family == AF_INET6 ? IPV6_MULTICAST_IF : IP_MULTICAST_IF,
+                     channelDataUDPMC->ai_family == AF_INET6 ? (const void *) &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface : &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface,
+                     channelDataUDPMC->ai_family == AF_INET6 ? sizeof(channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface) : sizeof(struct in_addr)) < 0)
+#else
+    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_IF,
+                     &ipMulticastRequest.ipv4.imr_interface, sizeof(struct in_addr)) < 0)
+#endif
+    {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection creation problem. Interface selection failed: "
+                         "Cannot set socket option IP_MULTICAST_IF. Error: %s",
+                         errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
 
+/**
+ * Open communication socket based on the connectionConfig. Protocol specific parameters are
+ * provided within the connectionConfig as KeyValuePair.
+ * Currently supported options: "ttl" , "loopback", "reuse"
+ *
+ * @return ref to created channel, NULL on error
+ */
+static UA_PubSubChannel *
+UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
+    UA_initialize_architecture_network();
+
+    if(!UA_Variant_hasScalarType(&connectionConfig->address,
+                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Invalid Address.");
+        return NULL;
+    }
+    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
+        UA_calloc(1, sizeof(UA_PubSubChannel));
+    if(!newChannel) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Out of memory.");
+        return NULL;
+    }
+    UA_PubSubChannelDataUDPMC *channelDataUDPMC = UA_PubSubChannelDataUDPMC_new(newChannel, connectionConfig);
+    if(!channelDataUDPMC) {
+        goto cleanup;
+    }
+    newChannel->handle = channelDataUDPMC; /* Link channel and internal channel data */
+    UA_StatusCode res = setLoopBackData(&newChannel->sockfd, channelDataUDPMC);
+    if (res != UA_STATUSCODE_GOOD) {
+        goto cleanup_after_channel_data;
+    }
+    setTimeToLive(&newChannel->sockfd, channelDataUDPMC);
+    setReuseAddress(&newChannel->sockfd, channelDataUDPMC);
+
+    res = setMulticastOption(&newChannel->sockfd, channelDataUDPMC);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto cleanup_after_channel_data;
+    }
+    res = bindChannelSocket(&newChannel->sockfd, &channelDataUDPMC->ai_addr, channelDataUDPMC->ai_family);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto cleanup_after_channel_data;
+    }
 #ifdef __linux__
-    /* Setting the socket priority to the socket */
-    if(socketPriority != NULL) {
-        if (UA_setsockopt(newChannel->sockfd, SOL_SOCKET, SO_PRIORITY, socketPriority, sizeof(int))) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                             "PubSub Connection creation problem. Priority setup failed: "
-                             "Cannot set socket option SO_PRIORITY. Error: %s", errno_str));
-            UA_free(socketPriority);
-            goto cleanup;
-        }
-        else
-            UA_free(socketPriority);
+    res = setSocketPriority(&newChannel->sockfd, channelDataUDPMC);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto cleanup_after_channel_data;
     }
 #endif
-
-    UA_freeaddrinfo(requestResult);
     newChannel->state = UA_PUBSUB_CHANNEL_PUB;
     return newChannel;
 
- cleanup:
-    UA_freeaddrinfo(requestResult);
+cleanup_after_channel_data:
     UA_close(newChannel->sockfd);
-    UA_free(channelDataUDPMC);
+    UA_PubSubChannelDataUDPMC_free(channelDataUDPMC);
+cleanup:
     UA_free(newChannel);
     return NULL;
 }
@@ -658,7 +794,7 @@ UA_PubSubChannelUDPMC_close(UA_PubSubChannel *channel) {
     UA_deinitialize_architecture_network();
     //cleanup the internal NetworkLayer data
     UA_PubSubChannelDataUDPMC *networkLayerData = (UA_PubSubChannelDataUDPMC *) channel->handle;
-    UA_free(networkLayerData);
+    UA_PubSubChannelDataUDPMC_free(networkLayerData);
     UA_free(channel);
     return UA_STATUSCODE_GOOD;
 }

From 9facadc4e1d9de653353a7c05272a591524d0579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Fri, 18 Mar 2022 07:23:36 +0000
Subject: [PATCH 0079/1963] build(deps): Switches branch for `deps/ua-nodeset`

* The latest branch is a merge between v1.05 base spec and all CS
---
 .gitmodules     | 2 +-
 deps/ua-nodeset | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 99bd061cc88..4b22b4fd192 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,4 +4,4 @@
 [submodule "deps/ua-nodeset"]
 	path = deps/ua-nodeset
 	url = https://github.com/OPCFoundation/UA-Nodeset
-	branch = v1.04
+	branch = latest
diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index efd84b1dfb6..4338a34ea3c 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit efd84b1dfb6d247f4d027c7a5b5d52f39d9a1bfd
+Subproject commit 4338a34ea3cff40de19b1afefb05ffbb4525fe78

From d94c596d49eb11e1a3e273f9c8afcdc1de6d5566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Tue, 22 Mar 2022 08:06:44 +0000
Subject: [PATCH 0080/1963] fix(test): Fixes `services_nodemanagement`

---
 tests/server/check_services_nodemanagement.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/server/check_services_nodemanagement.c b/tests/server/check_services_nodemanagement.c
index 4772ec4f903..1276b2233c9 100644
--- a/tests/server/check_services_nodemanagement.c
+++ b/tests/server/check_services_nodemanagement.c
@@ -591,7 +591,7 @@ START_TEST(InstantiateObjectType) {
 } END_TEST
 
 START_TEST(ObjectWithDynamicVariableChild) {
-    /* Add a ModellingRuleType object */
+    /* Add a ServerRedundancyType object */
     UA_ObjectAttributes attr = UA_ObjectAttributes_default;
     attr.displayName = UA_LOCALIZEDTEXT("en-US","my object with variable child");
 
@@ -601,7 +601,7 @@ START_TEST(ObjectWithDynamicVariableChild) {
     UA_StatusCode res = UA_Server_addObjectNode(server, UA_NODEID_NULL,
                                   UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                  UA_QUALIFIEDNAME(0, "MyObjectWithVariableChild"), UA_NODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULETYPE),
+                                  UA_QUALIFIEDNAME(0, "MyObjectWithVariableChild"), UA_NODEID_NUMERIC(0, UA_NS0ID_SERVERREDUNDANCYTYPE),
                                   attr, NULL, &newObjectId);
     ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
 
@@ -612,7 +612,7 @@ START_TEST(ObjectWithDynamicVariableChild) {
 
     UA_RelativePathElement bpe;
     UA_RelativePathElement_init(&bpe);
-    bpe.targetName = UA_QUALIFIEDNAME(0, "NamingRule");
+    bpe.targetName = UA_QUALIFIEDNAME(0, "RedundancySupport");
     bpe.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY);
     bp.relativePath.elements = &bpe;
 

From 418dd4b33489c46b0474d46e06308b3259c4470b Mon Sep 17 00:00:00 2001
From: arozhkov <arozhkov@amt.ru>
Date: Tue, 19 Apr 2022 14:22:14 +0300
Subject: [PATCH 0081/1963] fix(client): Big complexity in the
 "processDataChangeNotification" function

---
 src/client/ua_client_internal.h      |  21 +++++-
 src/client/ua_client_subscriptions.c | 106 ++++++++++++++++++---------
 2 files changed, 87 insertions(+), 40 deletions(-)

diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 5757f5134b9..18b5b534010 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -22,6 +22,7 @@
 #include "ua_securechannel.h"
 #include "common/ua_timer.h"
 #include "ua_util_internal.h"
+#include "ziptree.h"
 
 _UA_BEGIN_DECLS
 
@@ -36,8 +37,11 @@ typedef struct UA_Client_NotificationsAckNumber {
     UA_SubscriptionAcknowledgement subAck;
 } UA_Client_NotificationsAckNumber;
 
-typedef struct UA_Client_MonitoredItem {
-    LIST_ENTRY(UA_Client_MonitoredItem) listEntry;
+struct UA_Client_MonitoredItem;
+typedef struct UA_Client_MonitoredItem UA_Client_MonitoredItem;
+
+struct UA_Client_MonitoredItem {
+    ZIP_ENTRY(UA_Client_MonitoredItem) zipfields;
     UA_UInt32 monitoredItemId;
     UA_UInt32 clientHandle;
     void *context;
@@ -47,7 +51,10 @@ typedef struct UA_Client_MonitoredItem {
         UA_Client_EventNotificationCallback eventCallback;
     } handler;
     UA_Boolean isEventMonitoredItem; /* Otherwise a DataChange MoniitoredItem */
-} UA_Client_MonitoredItem;
+};
+
+ZIP_HEAD(MonitorItemsTree, UA_Client_MonitoredItem);
+typedef struct MonitorItemsTree MonitorItemsTree;
 
 typedef struct UA_Client_Subscription {
     LIST_ENTRY(UA_Client_Subscription) listEntry;
@@ -59,9 +66,15 @@ typedef struct UA_Client_Subscription {
     UA_Client_DeleteSubscriptionCallback deleteCallback;
     UA_UInt32 sequenceNumber;
     UA_DateTime lastActivity;
-    LIST_HEAD(, UA_Client_MonitoredItem) monitoredItems;
+    MonitorItemsTree monitoredItems;
 } UA_Client_Subscription;
 
+struct UA_Client_MonitoredItem_ForDelete {
+    UA_Client *client;
+    UA_Client_Subscription *sub;
+    UA_UInt32 *monitoredItemId;
+};
+
 void
 UA_Client_Subscriptions_clean(UA_Client *client);
 
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 8b017df6e80..8f1312fc9bf 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -22,6 +22,26 @@
 /* Subscriptions */
 /*****************/
 
+static enum ZIP_CMP
+/* For ZIP_TREE we use clientHandle comparison */
+UA_ClientHandle_cmp(const void *a, const void *b) {
+    const UA_Client_MonitoredItem *aa = (const UA_Client_MonitoredItem *)a;
+    const UA_Client_MonitoredItem *bb = (const UA_Client_MonitoredItem *)b;
+
+    /* Compare  clientHandle */
+    if(aa->clientHandle < bb->clientHandle) {
+        return ZIP_CMP_LESS;
+    }
+    if(aa->clientHandle > bb->clientHandle) {
+        return ZIP_CMP_MORE;
+    }
+
+    return ZIP_CMP_EQ;
+}
+
+ZIP_FUNCTIONS(MonitorItemsTree, UA_Client_MonitoredItem, zipfields,
+              UA_Client_MonitoredItem, zipfields, UA_ClientHandle_cmp)
+
 static void
 MonitoredItem_delete(UA_Client *client, UA_Client_Subscription *sub,
                      UA_Client_MonitoredItem *mon);
@@ -34,7 +54,7 @@ ua_Subscriptions_create(UA_Client *client, UA_Client_Subscription *newSub,
     newSub->lastActivity = UA_DateTime_nowMonotonic();
     newSub->publishingInterval = response->revisedPublishingInterval;
     newSub->maxKeepAliveCount = response->revisedMaxKeepAliveCount;
-    LIST_INIT(&newSub->monitoredItems);
+    ZIP_INIT(&newSub->monitoredItems);
     LIST_INSERT_HEAD(&client->subscriptions, newSub, listEntry);
 }
 
@@ -204,15 +224,27 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
         cc, requestId);
 }
 
+static void
+UA_MonitoredItem_delete_wrapper(UA_Client_MonitoredItem *mon, void *data) {
+    struct UA_Client_MonitoredItem_ForDelete *deleteMonitoredItem =
+        (struct UA_Client_MonitoredItem_ForDelete *)data;
+    if(deleteMonitoredItem != NULL) {
+        if(deleteMonitoredItem->monitoredItemId != NULL &&
+           (mon->monitoredItemId != *deleteMonitoredItem->monitoredItemId)) {
+            return;
+        }
+        MonitoredItem_delete(deleteMonitoredItem->client, deleteMonitoredItem->sub, mon);
+    }
+}
+
 static void
 UA_Client_Subscription_deleteInternal(UA_Client *client,
                                       UA_Client_Subscription *sub) {
     /* Remove the MonitoredItems */
-    UA_Client_MonitoredItem *mon;
-    UA_Client_MonitoredItem *mon_tmp;
-    LIST_FOREACH_SAFE(mon, &sub->monitoredItems, listEntry, mon_tmp)
-        MonitoredItem_delete(client, sub, mon);
-
+    struct UA_Client_MonitoredItem_ForDelete deleteMonitoredItem = {0};
+    deleteMonitoredItem.client = client;
+    deleteMonitoredItem.sub = sub;
+    ZIP_ITER(MonitorItemsTree,&sub->monitoredItems, UA_MonitoredItem_delete_wrapper, &deleteMonitoredItem);
     /* Call the delete callback */
     if(sub->deleteCallback)
         sub->deleteCallback(client, sub->subscriptionId, sub->context);
@@ -350,7 +382,7 @@ UA_Client_Subscriptions_deleteSingle(UA_Client *client, UA_UInt32 subscriptionId
 static void
 MonitoredItem_delete(UA_Client *client, UA_Client_Subscription *sub,
                      UA_Client_MonitoredItem *mon) {
-    LIST_REMOVE(mon, listEntry);
+    ZIP_REMOVE(MonitorItemsTree, &sub->monitoredItems, mon);
     if(mon->deleteCallback)
         mon->deleteCallback(client, sub->subscriptionId, sub->context,
                             mon->monitoredItemId, mon->context);
@@ -422,7 +454,7 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
         newMon->isEventMonitoredItem =
             (request->itemsToCreate[i].itemToMonitor.attributeId ==
              UA_ATTRIBUTEID_EVENTNOTIFIER);
-        LIST_INSERT_HEAD(&sub->monitoredItems, newMon, listEntry);
+        ZIP_INSERT(MonitorItemsTree, &sub->monitoredItems, newMon, UA_UInt32_random());
 
         UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                      "Subscription %" PRIu32
@@ -689,20 +721,19 @@ ua_MonitoredItems_delete(UA_Client *client, UA_Client_Subscription *sub,
 #endif
 
     /* Loop over deleted MonitoredItems */
+    struct UA_Client_MonitoredItem_ForDelete deleteMonitoredItem = {0};
+    deleteMonitoredItem.client = client;
+    deleteMonitoredItem.sub = sub;
+
     for(size_t i = 0; i < response->resultsSize; i++) {
         if(response->results[i] != UA_STATUSCODE_GOOD &&
            response->results[i] != UA_STATUSCODE_BADMONITOREDITEMIDINVALID) {
             continue;
         }
-
+        deleteMonitoredItem.monitoredItemId = &request->monitoredItemIds[i];
         /* Delete the internal representation */
-        UA_Client_MonitoredItem *mon;
-        LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
-            if(mon->monitoredItemId == request->monitoredItemIds[i]) {
-                MonitoredItem_delete(client, sub, mon);
-                break;
-            }
-        }
+
+        ZIP_ITER(MonitorItemsTree,&sub->monitoredItems, UA_MonitoredItem_delete_wrapper, &deleteMonitoredItem);
     }
 }
 
@@ -815,6 +846,17 @@ UA_Client_MonitoredItems_deleteSingle(UA_Client *client, UA_UInt32 subscriptionI
     return retval;
 }
 
+static void
+UA_MonitoredItem_change_clientHandle(UA_Client_MonitoredItem *mon, void *data) {
+    UA_MonitoredItemModifyRequest *monitoredItemModifyRequest =
+        (UA_MonitoredItemModifyRequest *)data;
+    if(monitoredItemModifyRequest != NULL) {
+        if(mon->monitoredItemId == monitoredItemModifyRequest->monitoredItemId) {
+            monitoredItemModifyRequest->requestedParameters.clientHandle = mon->clientHandle;
+        }
+    }
+}
+
 UA_ModifyMonitoredItemsResponse
 UA_Client_MonitoredItems_modify(UA_Client *client,
                                 const UA_ModifyMonitoredItemsRequest request) {
@@ -836,19 +878,13 @@ UA_Client_MonitoredItems_modify(UA_Client *client,
     UA_ModifyMonitoredItemsRequest_copy(&request, &modifiedRequest);
 
     for (size_t i = 0; i < modifiedRequest.itemsToModifySize; ++i) {
-        UA_Client_MonitoredItem *mon;
-        LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
-            if(mon->monitoredItemId == modifiedRequest.itemsToModify[i].monitoredItemId) {
-                modifiedRequest.itemsToModify[i].requestedParameters.clientHandle = mon->clientHandle;
-                break;
-            }
-        }
-    }
-
-    __UA_Client_Service(client,
-                        &modifiedRequest, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+        ZIP_ITER(MonitorItemsTree, &sub->monitoredItems,
+                 UA_MonitoredItem_change_clientHandle, &modifiedRequest.itemsToModify[i]);
 
+        __UA_Client_Service(client, &modifiedRequest,
+                            &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], &response,
+                            &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+    }
     UA_ModifyMonitoredItemsRequest_clear(&modifiedRequest);
     return response;
 }
@@ -904,10 +940,9 @@ processDataChangeNotification(UA_Client *client, UA_Client_Subscription *sub,
 
         /* Find the MonitoredItem */
         UA_Client_MonitoredItem *mon;
-        LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
-            if(mon->clientHandle == min->clientHandle)
-                break;
-        }
+        UA_Client_MonitoredItem dummy;
+        dummy.clientHandle = min->clientHandle;
+        mon = ZIP_FIND(MonitorItemsTree, &sub->monitoredItems, &dummy);
 
         if(!mon) {
             UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
@@ -937,10 +972,9 @@ processEventNotification(UA_Client *client, UA_Client_Subscription *sub,
 
         /* Find the MonitoredItem */
         UA_Client_MonitoredItem *mon;
-        LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
-            if(mon->clientHandle == eventFieldList->clientHandle)
-                break;
-        }
+        UA_Client_MonitoredItem dummy;
+        dummy.clientHandle = eventFieldList->clientHandle;
+        mon = ZIP_FIND(MonitorItemsTree, &sub->monitoredItems, &dummy);
 
         if(!mon) {
             UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,

From 841a325d686a6db76842161c20a0486c5f2b3d1d Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 20 Apr 2022 13:38:27 +0200
Subject: [PATCH 0082/1963] refactor(pubsub): set multicast info

---
 plugins/ua_pubsub_udp.c | 57 ++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index fd130723aeb..466874bf103 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -209,10 +209,11 @@ setupNetworkInterface(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode
-setMulticastInfo(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addressAsChar) {
+#ifdef UA_IPV6
+static UA_INLINE UA_StatusCode
+setMulticastInfoIPV6(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addressAsChar) {
     int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET6, addressAsChar,
-                                                        &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr);
+                                                            &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr);
     if(convertTextAddressToBinarySuccessful != 1) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -226,36 +227,45 @@ setMulticastInfo(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addres
     }
     return UA_STATUSCODE_GOOD;
 }
+#endif
+
+static UA_INLINE UA_StatusCode
+setMulticastInfoIPv4(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addressAsChar) {
+    int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET, addressAsChar,
+                                                        &channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr);
+    if(convertTextAddressToBinarySuccessful != 1) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    uint32_t masked = UA_ntohl(channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr.s_addr) & IPV4_PREFIX_MASK;
+    if(masked != IPV4_MULTICAST_PREFIX) {
+        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection is created for a unicast address (IPv4)");
+        channelDataUDPMC->isMulticast = false;
+    } else {
+        channelDataUDPMC->isMulticast = true;
+        /* default configuration: multihomed hosts can join several groups on
+         * different IF, INADDR_ANY -> kernel decides */
+        channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
+    }
+    return UA_STATUSCODE_GOOD;
+}
 
 static UA_StatusCode
 configureMulticast(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
                    UA_String networkInterface,
                    const char *addressAsChar) {
+
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     /* Prepare for following socket options:
      * - Set the physical interface for in- and outgoing traffic (if configured)
      * - Join multicast group */
     memset(&channelDataUDPMC->ipMulticastRequest, 0, sizeof(channelDataUDPMC->ipMulticastRequest));
     /* Check if the ip address is a multicast address */
     if(channelDataUDPMC->ai_family == AF_INET) {
-        int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET, addressAsChar,
-                                                                &channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr);
-        if(convertTextAddressToBinarySuccessful != 1) {
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        uint32_t masked = UA_ntohl(channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr.s_addr) & IPV4_PREFIX_MASK;
-        if(masked != IPV4_MULTICAST_PREFIX) {
-            UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                           "PubSub Connection is created for a unicast address (IPv4)");
-            channelDataUDPMC->isMulticast = false;
-        } else {
-            channelDataUDPMC->isMulticast = true;
-            /* default configuration: multihomed hosts can join several groups on
-             * different IF, INADDR_ANY -> kernel decides */
-            channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
-        }
+        res = setMulticastInfoIPv4(channelDataUDPMC, addressAsChar);
 #ifdef UA_IPV6
     } else if(channelDataUDPMC->ai_family == AF_INET6) {
-        setMulticastInfo(channelDataUDPMC, addressAsChar);
+        res = setMulticastInfoIPV6(channelDataUDPMC, addressAsChar);
 #endif
     } else {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
@@ -263,8 +273,13 @@ configureMulticast(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
                      "unknown address family");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
+                     "PubSub Connection creation failed. Multicast setup failed.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
     if(networkInterface.length > 0) {
-        UA_StatusCode res = setupNetworkInterface(channelDataUDPMC, &networkInterface);
+        res = setupNetworkInterface(channelDataUDPMC, &networkInterface);
         if(res != UA_STATUSCODE_GOOD) {
             return UA_STATUSCODE_BADINTERNALERROR;
         }

From 3ae72f6702cee2f039c6795679f36dcbbce29e91 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 20 Apr 2022 14:09:52 +0200
Subject: [PATCH 0083/1963] refactor(pubsub): clean up socket options

---
 plugins/ua_pubsub_udp.c | 113 ++++++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 51 deletions(-)

diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index a2cba83c715..ea6a2e8767b 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -26,6 +26,13 @@
 
 static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[RECEIVE_MSG_BUFFER_SIZE];
 
+typedef union {
+    struct ip_mreq ipv4;
+#if UA_IPV6
+    struct ipv6_mreq ipv6;
+#endif
+} IpMulticastRequest;
+
 /* UDP multicast network layer specific internal data */
 typedef struct {
     int ai_family;                   /* Protocol family for socket. IPv4/IPv6 */
@@ -39,12 +46,7 @@ typedef struct {
 #ifdef __linux__
     UA_UInt32* socketPriority;
 #endif
-    union {
-        struct ip_mreq ipv4;
-#if UA_IPV6
-        struct ipv6_mreq ipv6;
-#endif
-    } ipMulticastRequest;
+    IpMulticastRequest ipMulticastRequest;
 } UA_PubSubChannelDataUDPMC;
 
 #define MAX_URL_LENGTH 512
@@ -348,23 +350,24 @@ UA_PubSubChannelDataUDPMC_new(UA_PubSubChannel *channel, const UA_PubSubConnecti
 
 static UA_INLINE UA_StatusCode
 setLoopBackData(UA_SOCKET *sockfd,
-                UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
+                UA_Boolean enableLoopback,
+                int ai_family) {
     /* Set loop back data to your host */
 #if UA_IPV6
     /* The Linux Kernel IPv6 socket code checks for optlen to be at least the
      * size of an integer. However, channelDataUDPMC->enableLoopback is a
      * boolean. In order for the code to work for IPv4 and IPv6 propagate it to
-     * an temporary integer here. */
-    UA_Int32 enable = channelDataUDPMC->enableLoopback;
+     * a temporary integer here. */
+    UA_Int32 enable = enableLoopback;
     if(UA_setsockopt(*sockfd,
-                     channelDataUDPMC->ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     channelDataUDPMC->ai_family == AF_INET6 ? IPV6_MULTICAST_LOOP : IP_MULTICAST_LOOP,
+                     ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     ai_family == AF_INET6 ? IPV6_MULTICAST_LOOP : IP_MULTICAST_LOOP,
                      (const char *)&enable,
                      sizeof (enable)) < 0)
 #else
     if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_LOOP,
-                     (const char *)&channelDataUDPMC->enableLoopback,
-                     sizeof (channelDataUDPMC->enableLoopback)) < 0)
+                     (const char *)&enable,
+                     sizeof (enable)) < 0)
 #endif
     {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -379,17 +382,19 @@ setLoopBackData(UA_SOCKET *sockfd,
 
 static UA_INLINE void
 setTimeToLive(UA_SOCKET *sockfd,
-              const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
+              UA_UInt32 messageTTL,
+              int ai_family) {
+    /* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
 #if UA_IPV6
     if(UA_setsockopt(*sockfd,
-                     channelDataUDPMC->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     channelDataUDPMC->ai_family == PF_INET6 ? IPV6_MULTICAST_HOPS : IP_MULTICAST_TTL,
-                     (const char *)&channelDataUDPMC->messageTTL,
-                     sizeof(channelDataUDPMC->messageTTL)) < 0)
+                     ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     ai_family == PF_INET6 ? IPV6_MULTICAST_HOPS : IP_MULTICAST_TTL,
+                     (const char *)&messageTTL,
+                     sizeof(messageTTL)) < 0)
 #else
     if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
-                     (const char *)&channelDataUDPMC->messageTTL,
-                     sizeof(channelDataUDPMC->messageTTL)) < 0)
+                     (const char *)&messageTTL,
+                     sizeof(messageTTL)) < 0)
 #endif
     {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -401,12 +406,13 @@ setTimeToLive(UA_SOCKET *sockfd,
 }
 
 static UA_INLINE void
-setReuseAddress(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Set reuse address -> enables sharing of the same listening address on
- * different sockets */
-    if(channelDataUDPMC->enableReuse){
-        int enableReuse = 1;
+setReuseAddress(UA_SOCKET *sockfd, UA_Boolean enableReuse) {
+    /* Set reuse address -> enables sharing of the same listening address on
+    * different sockets */
+    if(enableReuse){
+        int enableReuseVal = 1;
         if(UA_setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR,
-                         (const char*)&enableReuse, sizeof(enableReuse)) < 0) {
+                         (const char*)&enableReuseVal, sizeof(enableReuseVal)) < 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
                                "PubSub Connection creation problem. Reuse address setup failed: "
@@ -418,10 +424,10 @@ setReuseAddress(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataU
 
 #ifdef __linux__
 static UA_StatusCode
-setSocketPriority(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {/* Setting the socket priority to the socket */
-    if(channelDataUDPMC->socketPriority != NULL) {
+setSocketPriority(UA_SOCKET *sockfd, UA_UInt32 *socketPriority) {/* Setting the socket priority to the socket */
+    if(socketPriority != NULL) {
         if (UA_setsockopt(*sockfd, SOL_SOCKET, SO_PRIORITY,
-                          channelDataUDPMC->socketPriority, sizeof(int)) < 0) {
+                          socketPriority, sizeof(*socketPriority)) < 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
                              "PubSub Connection creation problem. Priority setup failed: "
@@ -471,13 +477,13 @@ bindChannelSocket(UA_SOCKET *sockfd, struct sockaddr_storage *ai_addr, int ai_fa
 }
 
 static UA_StatusCode
-setMulticastOption(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
+setMulticastOption(UA_SOCKET *sockfd, IpMulticastRequest ipMulticastRequest, int ai_family) {
 #if UA_IPV6
     if(UA_setsockopt(*sockfd,
-                     channelDataUDPMC->ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     channelDataUDPMC->ai_family == AF_INET6 ? IPV6_MULTICAST_IF : IP_MULTICAST_IF,
-                     channelDataUDPMC->ai_family == AF_INET6 ? (const void *) &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface : &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface,
-                     channelDataUDPMC->ai_family == AF_INET6 ? sizeof(channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface) : sizeof(struct in_addr)) < 0)
+                     ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     ai_family == AF_INET6 ? IPV6_MULTICAST_IF : IP_MULTICAST_IF,
+                     ai_family == AF_INET6 ? (const void *) &ipMulticastRequest.ipv6.ipv6mr_interface : &ipMulticastRequest.ipv4.imr_interface,
+                     ai_family == AF_INET6 ? sizeof(ipMulticastRequest.ipv6.ipv6mr_interface) : sizeof(struct in_addr)) < 0)
 #else
     if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_IF,
                      &ipMulticastRequest.ipv4.imr_interface, sizeof(struct in_addr)) < 0)
@@ -493,6 +499,28 @@ setMulticastOption(UA_SOCKET *sockfd, const UA_PubSubChannelDataUDPMC *channelDa
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_StatusCode
+setSocketOptionsAndBind(UA_SOCKET *sockfd, UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
+    UA_StatusCode res = setLoopBackData(sockfd, channelDataUDPMC->enableLoopback, channelDataUDPMC->ai_family);
+    if (res != UA_STATUSCODE_GOOD) return res;
+
+    setTimeToLive(sockfd, channelDataUDPMC->messageTTL, channelDataUDPMC->ai_family);
+    setReuseAddress(sockfd, channelDataUDPMC->enableReuse);
+
+    res = setMulticastOption(sockfd, channelDataUDPMC->ipMulticastRequest, channelDataUDPMC->ai_family);
+    if(res != UA_STATUSCODE_GOOD) return res;
+
+    res = bindChannelSocket(sockfd, &channelDataUDPMC->ai_addr, channelDataUDPMC->ai_family);
+    if(res != UA_STATUSCODE_GOOD) return res;
+
+#ifdef __linux__
+    res = setSocketPriority(sockfd, channelDataUDPMC->socketPriority);
+    if(res != UA_STATUSCODE_GOOD) return res;
+#endif
+
+    return UA_STATUSCODE_GOOD;
+}
+
 /**
  * Open communication socket based on the connectionConfig. Protocol specific parameters are
  * provided within the connectionConfig as KeyValuePair.
@@ -522,27 +550,10 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
         goto cleanup;
     }
     newChannel->handle = channelDataUDPMC; /* Link channel and internal channel data */
-    UA_StatusCode res = setLoopBackData(&newChannel->sockfd, channelDataUDPMC);
-    if (res != UA_STATUSCODE_GOOD) {
-        goto cleanup_after_channel_data;
-    }
-    setTimeToLive(&newChannel->sockfd, channelDataUDPMC);
-    setReuseAddress(&newChannel->sockfd, channelDataUDPMC);
-
-    res = setMulticastOption(&newChannel->sockfd, channelDataUDPMC);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto cleanup_after_channel_data;
-    }
-    res = bindChannelSocket(&newChannel->sockfd, &channelDataUDPMC->ai_addr, channelDataUDPMC->ai_family);
+    UA_StatusCode res = setSocketOptionsAndBind(&newChannel->sockfd, channelDataUDPMC);
     if(res != UA_STATUSCODE_GOOD) {
         goto cleanup_after_channel_data;
     }
-#ifdef __linux__
-    res = setSocketPriority(&newChannel->sockfd, channelDataUDPMC);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto cleanup_after_channel_data;
-    }
-#endif
     newChannel->state = UA_PUBSUB_CHANNEL_PUB;
     return newChannel;
 

From fc50f74ebcd2053516d94c834570e94aa9da1407 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Apr 2022 09:27:06 +0200
Subject: [PATCH 0084/1963] refactor(core): Remove an unused member from
 UA_Connection

---
 arch/network_ws.c                  | 1 -
 include/open62541/plugin/network.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/arch/network_ws.c b/arch/network_ws.c
index b20842e704c..937f5410ef6 100644
--- a/arch/network_ws.c
+++ b/arch/network_ws.c
@@ -155,7 +155,6 @@ callback_opcua(struct lws *wsi, enum lws_callback_reasons reason, void *user, vo
             c->releaseRecvBuffer = connection_ws_releaserecvbuffer;
             // stack sets the connection to established
             c->state = UA_CONNECTIONSTATE_OPENING;
-            c->openingDate = UA_DateTime_nowMonotonic();
             pss->connection = c;
             break;
 
diff --git a/include/open62541/plugin/network.h b/include/open62541/plugin/network.h
index f41ebfbcd1a..a47bb9a7dbc 100644
--- a/include/open62541/plugin/network.h
+++ b/include/open62541/plugin/network.h
@@ -66,7 +66,6 @@ struct UA_Connection {
     UA_SOCKET sockfd;              /* Most connectivity solutions run on
                                     * sockets. Having the socket id here
                                     * simplifies the design. */
-    UA_DateTime openingDate;       /* The date the connection was created */
     void *handle;                  /* A pointer to internal data */
 
     /* Get a buffer for sending */

From 09cf7c295bbe95b63b9d8d45e16a559b82ef807f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Apr 2022 10:10:21 +0200
Subject: [PATCH 0085/1963] feat(core): Enable the EventLoop UDP support in the
 default build

---
 CMakeLists.txt            | 1 +
 tests/fuzz/CMakeLists.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c22d8fc8634..6ca27c7c103 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,6 +125,7 @@ set(ua_architecture_sources ${ua_architecture_sources}
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_udp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
 )
 
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 4a914101c0b..c0e3ab84c8c 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -66,6 +66,7 @@ set(fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_udp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_clock.c
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_networklayers.c

From 12b40a3ddeb1813c2f411e818518a73ee15306eb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Apr 2022 10:13:02 +0200
Subject: [PATCH 0086/1963] feat(core): Make the connection protocol visible in
 the ConnectionManager

---
 arch/eventloop_posix_tcp.c           | 3 +++
 arch/eventloop_posix_udp.c           | 3 +++
 include/open62541/plugin/eventloop.h | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index c5a8775d14b..00f8964f8e1 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -913,6 +913,8 @@ TCP_eventSourceDelete(UA_ConnectionManager *cm) {
     return UA_STATUSCODE_GOOD;
 }
 
+static const char *tcpName = "tcp";
+
 UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName) {
     TCPConnectionManager *cm = (TCPConnectionManager*)
@@ -925,6 +927,7 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName) {
     cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *)) TCP_eventSourceStart;
     cm->cm.eventSource.stop = (void (*)(UA_EventSource *))TCP_eventSourceStop;
     cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))TCP_eventSourceDelete;
+    cm->cm.protocol = UA_STRING((char*)(uintptr_t)tcpName);
     cm->cm.openConnection = TCP_openConnection;
     cm->cm.allocNetworkBuffer = TCP_allocNetworkBuffer;
     cm->cm.freeNetworkBuffer = TCP_freeNetworkBuffer;
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index d1c66f3b74c..024e328d2fc 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -772,6 +772,8 @@ UDP_eventSourceDelete(UA_ConnectionManager *cm) {
     return UA_STATUSCODE_GOOD;
 }
 
+static const char *udpName = "udp";
+
 UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName) {
     UDPConnectionManager *cm = (UDPConnectionManager*)
@@ -784,6 +786,7 @@ UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName) {
     cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *)) UDP_eventSourceStart;
     cm->cm.eventSource.stop = (void (*)(UA_EventSource *))UDP_eventSourceStop;
     cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))UDP_eventSourceDelete;
+    cm->cm.protocol = UA_STRING((char*)(uintptr_t)udpName);
     cm->cm.openConnection = UDP_openConnection;
     cm->cm.allocNetworkBuffer = UDP_allocNetworkBuffer;
     cm->cm.freeNetworkBuffer = UDP_freeNetworkBuffer;
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 61baf9d6c56..7c3927cbd03 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -226,6 +226,10 @@ struct UA_ConnectionManager {
      * perspective of the EventLoop. */
     UA_EventSource eventSource;
 
+    /* Name of the protocol supported by the ConnectionManager. For example
+     * "mqtt", "udp", "mqtt". */
+    UA_String protocol;
+
     /* The ConnectionCallback is the only interface from the connection back to
      * the application.
      *

From a50865eb79ae350c207115de7b416271bce2af67 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Apr 2022 10:42:01 +0200
Subject: [PATCH 0087/1963] feat(server): Select the first "tcp"
 ConnectionManager from the config

---
 src/server/ua_server.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index b22a7ba22a6..0e6808562cb 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -557,15 +557,30 @@ UA_Server_getStatistics(UA_Server *server) {
 static
 UA_StatusCode
 UA_Server_setupEventLoop(UA_Server *server) {
-    UA_Server_BasicConnectionContext *ctx = (UA_Server_BasicConnectionContext*) UA_malloc(sizeof(UA_Server_BasicConnectionContext));
+    UA_Server_BasicConnectionContext *ctx = (UA_Server_BasicConnectionContext*)
+        UA_malloc(sizeof(UA_Server_BasicConnectionContext));
     memset(ctx, 0, sizeof(UA_Server_BasicConnectionContext));
     UA_CHECK_MEM(ctx, return UA_STATUSCODE_BADOUTOFMEMORY);
 
     ctx->server = server;
     ctx->isInitial = true;
 
-    /* TODO: map the connection managers to their names instead of "0" for TCP */
-    UA_ConnectionManager *tcpCM = UA_Server_getConfig(server)->connectionManagers[0];
+    /* Choose the first "tcp" ConnectionManager from the config */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ConnectionManager *tcpCM = NULL;
+    UA_String tcpName = UA_STRING("tcp");
+    for(size_t i = 0; i < config->connectionManagersSize; i++) {
+        if(UA_String_equal(&config->connectionManagers[i]->protocol, &tcpName)) {
+            tcpCM = config->connectionManagers[i];
+            break;
+        }
+    }
+    if(!tcpCM) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "No TCP ConnectionManager found in the configuration");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     ctx->cm = tcpCM;
     tcpCM->connectionCallback = UA_Server_connectionCallback;
     tcpCM->initialConnectionContext = ctx;

From 854265529f3d9452c0b4659da7369c8f376166a2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Apr 2022 11:07:51 +0200
Subject: [PATCH 0088/1963] refactor(core): Harmonize the order in
 UA_EventLoopState

Make the order of states similar to the other state machines.
---
 include/open62541/plugin/eventloop.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 7c3927cbd03..e091697fac1 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -63,10 +63,10 @@ typedef struct UA_DelayedCallback {
 
 typedef enum {
     UA_EVENTLOOPSTATE_FRESH = 0,
+    UA_EVENTLOOPSTATE_STOPPED,
     UA_EVENTLOOPSTATE_STARTED,
-    UA_EVENTLOOPSTATE_STOPPING, /* stopping in progress, needs EventLoop
-                                 * cycles to finish */
-    UA_EVENTLOOPSTATE_STOPPED
+    UA_EVENTLOOPSTATE_STOPPING /* Stopping in progress, needs EventLoop
+                                * cycles to finish */
 } UA_EventLoopState;
 
 struct UA_EventLoop {

From c81a3e1d079eb35b498c3f9bd33945d0c86ecc53 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Apr 2022 12:50:06 +0200
Subject: [PATCH 0089/1963] refactor(server): Harmonize UA_ServerLifecycle with
 other state machines

---
 src/server/ua_server_internal.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 029bcb194a2..9c5fd771a1a 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -80,7 +80,9 @@ typedef struct session_list_entry {
 
 typedef enum {
     UA_SERVERLIFECYCLE_FRESH,
-    UA_SERVERLIFECYLE_RUNNING
+    UA_SERVERLIFECYCLE_STOPPED,
+    UA_SERVERLIFECYCLE_STARTED,
+    UA_SERVERLIFECYCLE_STOPPING
 } UA_ServerLifecycle;
 
 struct UA_Server {

From c6119b0e371d019cdcc3ec528a4b906d3a3c3bed Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 9 Apr 2022 22:06:18 +0200
Subject: [PATCH 0090/1963] style(arch): Cosmetic cleanup in
 eventloop_posix_tcp.c

---
 arch/eventloop_posix_tcp.c | 54 ++++++++++++++------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 00f8964f8e1..767674f4711 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -102,8 +102,7 @@ TCP_setNoNagle(UA_FD sockfd) {
 static void
 TCP_checkStopped(TCPConnectionManager *tcm) {
     if(tcm->fdsSize == 0 && tcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
-        UA_LOG_DEBUG(tcm->cm.eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_NETWORK,
+        UA_LOG_DEBUG(tcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                      "TCP\t| All sockets closed, the EventLoop has stopped");
 
         UA_ByteString_clear(&tcm->rxBuffer);
@@ -213,10 +212,10 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 
 /* Gets called when a new connection opens or if the listenSocket is closed */
 static void
-TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
-                         short event) {
+TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short event) {
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Callback on server socket", (unsigned)rfd->fd);
 
@@ -250,14 +249,12 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         if(get_res != 0) {
             hoststr[0] = 0;
             UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                               UA_LOGCATEGORY_NETWORK,
+                UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                                "TCP %u\t| getnameinfo(...) could not resolve the "
                                "hostname (%s)", (unsigned)rfd->fd, errno_str));
         }
     }
-    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
-                UA_LOGCATEGORY_NETWORK,
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| Connection opened from \"%s\" via the server socket %u",
                 (unsigned)newsockfd, hoststr, (unsigned)rfd->fd);
 
@@ -268,8 +265,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     res |= TCP_setNoNagle(newsockfd);     /* Disable Nagle's algorithm */
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                           UA_LOGCATEGORY_NETWORK,
+            UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                            "TCP %u\t| Error seeting the TCP options (%s), closing",
                            (unsigned)newsockfd, errno_str));
         /* Close the new socket */
@@ -337,8 +333,8 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
             portstr[0] = 0;
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                               "TCP\t| getnameinfo(...) could not resolve the hostname (%s)",
-                               errno_str));
+                               "TCP\t| getnameinfo(...) could not resolve the "
+                               "hostname (%s)", errno_str));
         }
     }
     
@@ -423,8 +419,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     }
 
     /* Allocate the UA_RegisteredFD */
-    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
-        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
+    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
     if(!newrfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error allocating memory for the socket, closing",
@@ -473,8 +468,7 @@ TCP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostnam
     int retcode = UA_getaddrinfo(hostname, port, &hints, &res);
     if(retcode != 0) {
         UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                          UA_LOGCATEGORY_NETWORK,
+           UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                           "TCP\t| getaddrinfo lookup for \"%s\" on port %s failed (%s)",
                           hostname, port, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -555,8 +549,7 @@ delayedShutdownCallback(void* application, void* data) {
 
 static UA_StatusCode
 TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK,
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Shutdown called", (unsigned)connectionId);
 
     /* Shutdown, will be picked up by the next iteration of the event loop */
@@ -571,8 +564,7 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 #endif
     if(res != 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                           UA_LOGCATEGORY_NETWORK,
+            UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                            "TCP %u\t| Error shutting down the socket (%s)",
                            (unsigned)connectionId, errno_str));
     }
@@ -595,8 +587,7 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     do {
         ssize_t n = 0;
         do {
-            UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                         UA_LOGCATEGORY_NETWORK,
+            UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                          "TCP %u\t| Attempting to send", (unsigned)connectionId);
             size_t bytes_to_send = buf->length - nWritten;
             n = UA_send((UA_FD)connectionId,
@@ -796,8 +787,7 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
 
     /* Listening on a socket? */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(cm->eventSource.params,
-                                 cm->eventSource.paramsSize,
+        UA_KeyValueMap_getScalar(cm->eventSource.params, cm->eventSource.paramsSize,
                                  UA_QUALIFIEDNAME(0, "listen-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
@@ -812,8 +802,7 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
 
     /* Get the hostnames configuration */
     const UA_Variant *hostNames =
-        UA_KeyValueMap_get(cm->eventSource.params,
-                           cm->eventSource.paramsSize,
+        UA_KeyValueMap_get(cm->eventSource.params, cm->eventSource.paramsSize,
                            UA_QUALIFIEDNAME(0, "listen-hostnames"));
     if(!hostNames) {
         /* No hostnames configured */
@@ -851,8 +840,7 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_UInt16 rxBufSize = 2u << 14; /* The default is 16kb */
     const UA_UInt16 *configRxBufSize = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(cm->eventSource.params,
-                                 cm->eventSource.paramsSize,
+        UA_KeyValueMap_getScalar(cm->eventSource.params, cm->eventSource.paramsSize,
                                  UA_QUALIFIEDNAME(0, "recv-bufsize"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(configRxBufSize)
@@ -869,8 +857,8 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
 static void
 TCP_eventSourceStop(UA_ConnectionManager *cm) {
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
-                UA_LOGCATEGORY_NETWORK, "TCP\t| Shutting down the ConnectionManager");
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                "TCP\t| Shutting down the ConnectionManager");
 
     cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
@@ -893,8 +881,7 @@ TCP_eventSourceStop(UA_ConnectionManager *cm) {
 static UA_StatusCode
 TCP_eventSourceDelete(UA_ConnectionManager *cm) {
     if(cm->eventSource.state >= UA_EVENTSOURCESTATE_STARTING) {
-        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| The EventSource must be stopped before it can be deleted");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -902,8 +889,7 @@ TCP_eventSourceDelete(UA_ConnectionManager *cm) {
     UA_deinitialize_architecture_network();
 
     /* Delete the parameters */
-    UA_Array_delete(cm->eventSource.params,
-                    cm->eventSource.paramsSize,
+    UA_Array_delete(cm->eventSource.params, cm->eventSource.paramsSize,
                     &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
     cm->eventSource.params = NULL;
     cm->eventSource.paramsSize = 0;

From 71cd5664872e197164f257eeb36c637a160941c9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 16:27:52 +0200
Subject: [PATCH 0091/1963] style(server): Small cosmetic improvements in
 ua_server.c

---
 src/server/ua_server.c             | 14 ++++++--------
 src/server/ua_services_discovery.c | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 0e6808562cb..61c2438bc5d 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -756,8 +756,7 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
     return timeout;
 }
 
-static
-bool
+static bool
 allEventSourcesStopped(UA_ConnectionManager** sources, size_t count) {
     UA_Boolean allStopped = true;
     for (size_t i = 0; i < count; ++i) {
@@ -776,9 +775,9 @@ UA_Server_run_shutdown(UA_Server *server) {
         nl->stop(nl, server);
     }
 
-    for (size_t i = 0; i < server->config.connectionManagersSize; ++i) {
+    for(size_t i = 0; i < server->config.connectionManagersSize; ++i) {
         UA_ConnectionManager *cm = server->config.connectionManagers[i];
-        if (cm->eventSource.eventLoop != NULL) {
+        if(cm->eventSource.eventLoop != NULL) {
             cm->eventSource.stop(&cm->eventSource);
         }
     }
@@ -788,10 +787,9 @@ UA_Server_run_shutdown(UA_Server *server) {
     UA_DateTime timeout = UA_UINT32_MAX / 2;
 
     UA_EventLoop *el = server->config.eventLoop;
-    while (!allEventSourcesStopped(server->config.connectionManagers,
-                                server->config.connectionManagersSize) &&
-                                elapsedTime < timeout)
-    {
+    while(!allEventSourcesStopped(server->config.connectionManagers,
+                                  server->config.connectionManagersSize) &&
+          elapsedTime < timeout) {
         el->run(el, 0);
         elapsedTime = UA_DateTime_nowMonotonic() - startTime;
     }
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index f6fddcd7fef..4b97b2c29d6 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -23,7 +23,8 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
                                               UA_ApplicationDescription *target,
                                               const UA_RegisteredServer *registeredServer) {
     UA_ApplicationDescription_init(target);
-    UA_StatusCode retval = UA_String_copy(&registeredServer->serverUri, &target->applicationUri);
+    UA_StatusCode retval =
+        UA_String_copy(&registeredServer->serverUri, &target->applicationUri);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -36,7 +37,8 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
         UA_Boolean appNameFound = false;
         for(size_t i =0; i<request->localeIdsSize && !appNameFound; i++) {
             for(size_t j =0; j<registeredServer->serverNamesSize; j++) {
-                if(UA_String_equal(&request->localeIds[i], &registeredServer->serverNames[j].locale)) {
+                if(UA_String_equal(&request->localeIds[i],
+                                   &registeredServer->serverNames[j].locale)) {
                     retval = UA_LocalizedText_copy(&registeredServer->serverNames[j],
                                                    &target->applicationName);
                     if(retval != UA_STATUSCODE_GOOD)
@@ -57,7 +59,8 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
         }
     } else if(registeredServer->serverNamesSize) {
         // just take the first name
-        retval = UA_LocalizedText_copy(&registeredServer->serverNames[0], &target->applicationName);
+        retval = UA_LocalizedText_copy(&registeredServer->serverNames[0],
+                                       &target->applicationName);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
     }
@@ -75,7 +78,8 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
         if(!target->discoveryUrls)
             return UA_STATUSCODE_BADOUTOFMEMORY;
         for(size_t i = 0; i < registeredServer->discoveryUrlsSize; i++) {
-            retval = UA_String_copy(&registeredServer->discoveryUrls[i], &target->discoveryUrls[i]);
+            retval = UA_String_copy(&registeredServer->discoveryUrls[i],
+                                    &target->discoveryUrls[i]);
             if(retval != UA_STATUSCODE_GOOD)
                 return retval;
         }
@@ -157,7 +161,8 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
 
     /* Allocate enough memory, including memory for the "self" response */
     size_t maxResults = server->discoveryManager.registeredServersSize + 1;
-    response->servers = (UA_ApplicationDescription*)UA_Array_new(maxResults, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+    response->servers = (UA_ApplicationDescription*)
+        UA_Array_new(maxResults, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
     if(!response->servers) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
         return;

From 6fcc8c5a7f1ce32ad5abc54dd143024c7e1a6e78 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 16:23:19 +0200
Subject: [PATCH 0092/1963] refactor(server): Replace realloc with
 UA_Array_resize

This fixes a potential problem with a 0x01 pointer in
setApplicationDescriptionFromServer.
---
 src/server/ua_services_discovery.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 4b97b2c29d6..c55a9aabbec 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -90,22 +90,26 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
 #endif
 
 static UA_StatusCode
-setApplicationDescriptionFromServer(UA_ApplicationDescription *target, const UA_Server *server) {
+setApplicationDescriptionFromServer(UA_ApplicationDescription *target,
+                                    const UA_Server *server) {
     /* Copy ApplicationDescription from the config */
-    UA_StatusCode result = UA_ApplicationDescription_copy(&server->config.applicationDescription, target);
+    UA_StatusCode result =
+        UA_ApplicationDescription_copy(&server->config.applicationDescription, target);
     if(result != UA_STATUSCODE_GOOD)
         return result;
 
     /* Add the discoveryUrls from the networklayers only if discoveryUrl
      * not already present and to avoid redundancy */
     if(!target->discoveryUrlsSize) {
-        size_t discSize = sizeof(UA_String) * (target->discoveryUrlsSize + server->config.networkLayersSize);
-        UA_String* disc = (UA_String *)UA_realloc(target->discoveryUrls, discSize);
-        if(!disc)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
         size_t existing = target->discoveryUrlsSize;
-        target->discoveryUrls = disc;
+        result =
+            UA_Array_resize((void**)&target->discoveryUrls,
+                            &target->discoveryUrlsSize,
+                            target->discoveryUrlsSize + server->config.networkLayersSize,
+                            &UA_TYPES[UA_TYPES_STRING]);
         target->discoveryUrlsSize += server->config.networkLayersSize;
+        if(result != UA_STATUSCODE_GOOD)
+            return result;
 
         for(size_t i = 0; i < server->config.networkLayersSize; i++) {
             UA_ServerNetworkLayer* nl = &server->config.networkLayers[i];

From 6ee4de3f737d0d9c7337d5b4d006137082681c86 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 10:50:49 +0200
Subject: [PATCH 0093/1963] fix(el): Don't log "stopped" when the el is still
 stopping

---
 arch/eventloop_posix.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 9dcbf98fa1e..d78e3275b05 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -188,9 +188,6 @@ UA_EventLoopPOSIX_stop(UA_EventLoopPOSIX *el) {
         es = es->next;
     }
 
-    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                 "All EventSources are stopped");
-
     *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
         UA_EVENTLOOPSTATE_STOPPING;
     checkClosed(el);

From 4e5d392fbd5bd0aa4b7711fa832be6ba39fcdadc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 18 Apr 2022 18:56:30 +0200
Subject: [PATCH 0094/1963] refactor(server): Improve the EventLoop config
 documentation

---
 include/open62541/server.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index e4e5e7558f3..172cc29d727 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -149,7 +149,10 @@ struct UA_ServerConfig {
 
     /**
      * EventLoop
-     * ^^^^^^^^^ */
+     * ^^^^^^^^^
+     * The sever can be plugged into an external EventLoop. Otherwise the
+     * EventLoop is considered to be attached to the server's lifecycle and will
+     * be destroyed when the config is cleaned up. */
     UA_EventLoop *eventLoop;
     UA_Boolean externalEventLoop; /* The EventLoop is not deleted with the config */
 

From 26b86edacc3cd638454bd7ed5edcaeb9c6be06d0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 10:56:05 +0200
Subject: [PATCH 0095/1963] refactor(el): A ConnectionManager can manage
 multiple server sockets

They are opened via the openConnection callback. The distinction between
client and server socket is made via the key-value parameters.

This generalizes the win32 fix from @jansurft to add a delayed callback
for closing network connections.
---
 arch/eventloop_posix.c                     |   2 +-
 arch/eventloop_posix.h                     |   6 +-
 arch/eventloop_posix_tcp.c                 | 483 +++++++++++----------
 arch/eventloop_posix_udp.c                 | 395 +++++++++--------
 include/open62541/plugin/eventloop.h       | 156 ++++---
 src/server/ua_server.c                     |   2 -
 src/server/ua_server_config.c              |   4 -
 src/server/ua_services_securechannel.c     |   2 +-
 src/server/ua_services_session.c           |   2 +-
 src/server/ua_subscription.c               |   2 +-
 src/server/ua_subscription_monitoreditem.c |   2 +-
 tests/check_eventloop_tcp.c                | 181 ++++----
 tests/check_eventloop_udp.c                | 397 +++++++++--------
 13 files changed, 867 insertions(+), 767 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index d78e3275b05..f2a9be72f57 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -92,7 +92,7 @@ processDelayed(UA_EventLoopPOSIX *el) {
          * we want to do is free the memory */
         if(dc->callback) {
             UA_UNLOCK(&el->elMutex);
-            dc->callback(dc->application, dc->data);
+            dc->callback(dc->application, dc->context);
             UA_LOCK(&el->elMutex);
         }
         UA_free(dc);
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 5ac83cddf7a..20d215ec41d 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -45,13 +45,17 @@ typedef struct UA_RegisteredFD UA_RegisteredFD;
 typedef void (*UA_FDCallback)(UA_EventSource *es, UA_RegisteredFD *rfd, short event);
 
 struct UA_RegisteredFD {
-    LIST_ENTRY(UA_RegisteredFD) es_pointers; /* Register FD in the EventSource */
+    UA_DelayedCallback dc; /* Used for async closing. Must be the first member
+                            * because the rfd is freed by the delayed callback
+                            * mechanism. */
 
+    LIST_ENTRY(UA_RegisteredFD) es_pointers; /* Register FD in the EventSource */
     UA_FD fd;
     short listenEvents; /* UA_FDEVENT_IN | UA_FDEVENT_OUT*/
 
     UA_EventSource *es; /* Backpointer to the EventSource */
     UA_FDCallback callback;
+    void *application;
     void *context;
 };
 
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 767674f4711..c96369a094c 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2021-2022 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
  */
 
@@ -18,6 +18,12 @@
 #define MSG_DONTWAIT 0
 #endif
 
+/* A registered file descriptor with an additional method pointer */
+typedef struct {
+    UA_RegisteredFD fd;
+    UA_ConnectionManager_connectionCallback connectionCallback;
+} TCP_FD;
+
 typedef struct {
     UA_ConnectionManager cm;
 
@@ -112,13 +118,21 @@ TCP_checkStopped(TCPConnectionManager *tcm) {
 
 static UA_StatusCode
 TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
+    TCP_FD *tcpfd = (TCP_FD*)rfd;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Closing connection", (unsigned)rfd->fd);
 
     /* Deregister from the EventLoop */
     TCPConnectionManager_deregister(tcm, rfd);
 
+    /* Signal closing to the application */
+    tcpfd->connectionCallback(&tcm->cm, (uintptr_t)rfd->fd,
+                              rfd->application, &rfd->context,
+                              UA_STATUSCODE_BADCONNECTIONCLOSED,
+                              0, NULL, UA_BYTESTRING_NULL);
+
     /* Close the socket */
     int ret = UA_close(rfd->fd);
     if(ret == 0) {
@@ -131,8 +145,9 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
                           (unsigned)rfd->fd, errno_str));
     }
 
-    /* Free the rfd */
-    UA_free(rfd);
+    /* Don't call free here. This might be done automatically via the delayed
+     * callback that calls TCP_close. */
+    /* UA_free(rfd); */
 
     /* Stop if the tcm is stopping and this was the last open socket */
     TCP_checkStopped(tcm);
@@ -140,11 +155,25 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     return UA_STATUSCODE_GOOD;
 }
 
+static void
+TCP_delayedClose(void *application, void *context) {
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)application;
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_RegisteredFD* rfd = (UA_RegisteredFD *)context;
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "TCP %u\t| Delayed closing of the connection", (unsigned)rfd->fd);
+    TCP_close(tcm, rfd);
+    /* Don't call free here. This is done automatically via the delayed callback
+     * mechanism. */
+}
+
 /* Gets called when a connection socket opens, receives data or closes */
 static void
 TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                              short event) {
+    TCP_FD *tcpfd = (TCP_FD*)rfd;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Activity on the socket", (unsigned)rfd->fd);
 
@@ -154,8 +183,10 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                      "TCP %u\t| Opening a new connection", (unsigned)rfd->fd);
 
         /* A new socket has opened. Signal it to the application. */
-        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
-                               UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
+        tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
+                                  rfd->application, &rfd->context,
+                                  UA_STATUSCODE_GOOD, 0, NULL,
+                                  UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
         rfd->listenEvents = UA_FDEVENT_IN;
@@ -184,19 +215,15 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
            UA_ERRNO == UA_AGAIN)
             return; /* Temporary error on an non-blocking socket */
 
-        /* Orderly shutdown of the socket. Signal to the application and then
-         * close the socket. We end up in this code-path after shutdown was
-         * called on the socket. Here, we then are in the next EventLoop
-         * iteration and the socket is known to be unused. */
-
-        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP %u\t| recv signaled the socket was shutdown",
-                     (unsigned)rfd->fd);
-
-        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
-                               UA_STATUSCODE_BADCONNECTIONCLOSED,
-                               0, NULL, UA_BYTESTRING_NULL);
+        /* Orderly shutdown of the socket. We can immediately close as no method
+         * "below" in the call stack will use the socket in this iteration of
+         * the EventLoop. */
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                        "TCP %u\t| recv signaled the socket was shutdown (%s)",
+                        (unsigned)rfd->fd, errno_str));
         TCP_close(tcm, rfd);
+        UA_free(rfd);
         return;
     }
 
@@ -206,13 +233,15 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 
     /* Callback to the application layer */
     response.length = (size_t)ret; /* Set the length of the received buffer */
-    cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
-                           UA_STATUSCODE_GOOD, 0, NULL, response);
+    tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
+                              rfd->application, &rfd->context,
+                              UA_STATUSCODE_GOOD, 0, NULL, response);
 }
 
 /* Gets called when a new connection opens or if the listenSocket is closed */
 static void
 TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short event) {
+    TCP_FD *tcpfd = (TCP_FD*)rfd;
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
@@ -235,7 +264,9 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
                                "TCP %u\t| Error %s, closing the server socket",
                                (unsigned)rfd->fd, errno_str));
         }
+
         TCP_close(tcm, rfd);
+        UA_free(rfd);
         return;
     }
 
@@ -274,29 +305,29 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     }
 
     /* Allocate the UA_RegisteredFD */
-    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
-        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
-    if(!newrfd) {
+    TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
+    if(!newtcpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error allocating memory for the socket, closing",
                        (unsigned)newsockfd);
         UA_close(newsockfd);
         return;
     }
-
-    newrfd->fd = newsockfd;
-    newrfd->es = &cm->eventSource;
-    newrfd->callback = (UA_FDCallback)TCP_connectionSocketCallback;
-    newrfd->context = cm->initialConnectionContext;
-    newrfd->listenEvents = UA_FDEVENT_IN;
+    newtcpfd->fd.fd = newsockfd;
+    newtcpfd->fd.es = &cm->eventSource;
+    newtcpfd->fd.callback = (UA_FDCallback)TCP_connectionSocketCallback;
+    newtcpfd->fd.application = rfd->application;
+    newtcpfd->fd.context = rfd->context;
+    newtcpfd->fd.listenEvents = UA_FDEVENT_IN;
+    newtcpfd->connectionCallback = tcpfd->connectionCallback;
 
     /* Register in the EventLoop. Signal to the user if registering failed. */
-    res = TCPConnectionManager_register(tcm, newrfd);
+    res = TCPConnectionManager_register(tcm, &newtcpfd->fd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error registering the socket, closing",
                        (unsigned)newsockfd);
-        UA_free(newrfd);
+        UA_free(newtcpfd);
         UA_close(newsockfd);
         return;
     }
@@ -308,12 +339,15 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     UA_Variant_setScalar(&kvp.value, &hostName, &UA_TYPES[UA_TYPES_STRING]);
 
     /* The socket has opened. Signal it to the application. */
-    cm->connectionCallback(cm, (uintptr_t)newsockfd, &newrfd->context,
-                           UA_STATUSCODE_GOOD, 1, &kvp, UA_BYTESTRING_NULL);
+    tcpfd->connectionCallback(cm, (uintptr_t)newsockfd,
+                              newtcpfd->fd.application, &newtcpfd->fd.context,
+                              UA_STATUSCODE_GOOD, 1, &kvp, UA_BYTESTRING_NULL);
 }
 
-static void
-TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
+static UA_StatusCode
+TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
+                         void *application, void *context,
+                         UA_ConnectionManager_connectionCallback connectionCallback) {
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
@@ -346,7 +380,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                           "TCP %u\t| Error opening the listen socket for "
                           "\"%s\" on port %s(%s)",
                           (unsigned)listenSocket, hoststr, portstr, errno_str));
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -365,7 +399,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                        "TCP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 #endif
 
@@ -376,7 +410,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                        "TCP %u\t| Could not make the socket reusable, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Set the socket non-blocking */
@@ -385,7 +419,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                        "TCP %u\t| Could not set the socket non-blocking, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Supress interrupts from the socket */
@@ -394,7 +428,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                        "TCP %u\t| Could not disable SIGPIPE, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Bind socket to address */
@@ -405,7 +439,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                           "TCP %u\t| Error binding the socket to the address (%s), closing",
                           (unsigned)listenSocket, errno_str));
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Start listening */
@@ -415,40 +449,49 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
                           "TCP %u\t| Error listening on the socket (%s), closing",
                           (unsigned)listenSocket, errno_str));
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Allocate the UA_RegisteredFD */
-    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
-    if(!newrfd) {
+    TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
+    if(!newtcpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error allocating memory for the socket, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    newrfd->fd = listenSocket;
-    newrfd->es = &cm->eventSource;
-    newrfd->callback = (UA_FDCallback)TCP_listenSocketCallback;
-    newrfd->context = cm->initialConnectionContext;
-    newrfd->listenEvents = UA_FDEVENT_IN;
+    newtcpfd->fd.fd = listenSocket;
+    newtcpfd->fd.es = &cm->eventSource;
+    newtcpfd->fd.callback = (UA_FDCallback)TCP_listenSocketCallback;
+    newtcpfd->fd.application = application;
+    newtcpfd->fd.context = context;
+    newtcpfd->fd.listenEvents = UA_FDEVENT_IN;
+    newtcpfd->connectionCallback = connectionCallback;
 
     /* Register in the EventLoop */
-    UA_StatusCode res = TCPConnectionManager_register(tcm, newrfd);
+    UA_StatusCode res = TCPConnectionManager_register(tcm, &newtcpfd->fd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error registering the socket, closing",
                        (unsigned)listenSocket);
-        UA_free(newrfd);
+        UA_free(newtcpfd);
         UA_close(listenSocket);
-        return;
+        return res;
     }
+
+    connectionCallback(cm, (uintptr_t)listenSocket,
+                       application, &newtcpfd->fd.context,
+                       UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
+
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-TCP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostname,
-                                   const char *port) {
+TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
+                          const char *port, void *application, void *context,
+                          UA_ConnectionManager_connectionCallback connectionCallback) {
     /* Get all the interface and IPv4/6 combinations for the configured hostname */
     struct addrinfo hints, *res;
     memset(&hints, 0, sizeof hints);
@@ -474,100 +517,72 @@ TCP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostnam
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* Add listen sockets */
+    /* Add listen sockets. Aggregate the results to see if at least one
+     * listen-socket was established. */
+    UA_StatusCode total_result = UA_INT32_MAX;
     struct addrinfo *ai = res;
     while(ai) {
-        TCP_registerListenSocket(cm, ai);
+        total_result &= TCP_registerListenSocket(cm, ai, application, context,
+                                                 connectionCallback);
         ai = ai->ai_next;
     }
     UA_freeaddrinfo(res);
-    return UA_STATUSCODE_GOOD;
-}
-
-#ifdef _WIN32
-static UA_RegisteredFD *
-findRegisteredFD(TCPConnectionManager *cm, uintptr_t connectionId) {
-    UA_RegisteredFD *rfd;
-    LIST_FOREACH(rfd, &cm->fds, es_pointers) {
-        if(rfd->fd == connectionId) return rfd;
-    }
-    return NULL;
-}
 
-static UA_DelayedCallback
-*createExplicitlyDelayedShutdownCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, UA_Callback callback) {
-    UA_DelayedCallback *explicitlyDelayedShutdownCallback = (UA_DelayedCallback*) UA_malloc(sizeof(UA_DelayedCallback));
-    if(!explicitlyDelayedShutdownCallback) {
-        return NULL;
+    if(total_result != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP\t| Could not create a listen socket for hostname \"%s\" "
+                       "on port %s", hostname, port);
     }
-    explicitlyDelayedShutdownCallback->callback = callback;
-    explicitlyDelayedShutdownCallback->application = cm;
-    explicitlyDelayedShutdownCallback->data = (void*) rfd->fd;
 
-    return explicitlyDelayedShutdownCallback;
+    return total_result;
 }
 
-static UA_INLINE void
-createAndAddDelayedShutdownCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, UA_Callback callback) {
-    UA_DelayedCallback *explicitlyDelayedShutdownCallback = createExplicitlyDelayedShutdownCallback(cm, rfd, callback);
-    if(!explicitlyDelayedShutdownCallback) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                           UA_LOGCATEGORY_NETWORK,
-                           "TCP %u\t| Warning: Out of memory for creating delayed shutdown callback (%s)",
-                           (unsigned)rfd->fd, errno_str));
-        return;
+static
+UA_RegisteredFD *
+TCP_findRegisteredFD(TCPConnectionManager *tcm, uintptr_t connectionId) {
+    UA_RegisteredFD *rfd;
+    LIST_FOREACH(rfd, &tcm->fds, es_pointers) {
+        if(rfd->fd == (UA_FD)connectionId)
+            return rfd;
     }
-    UA_EventLoop *el = cm->eventSource.eventLoop;
-    el->addDelayedCallback(el, explicitlyDelayedShutdownCallback);
+    return NULL;
 }
 
+/* Close the connection via a delayed callback */
 static void
-delayedShutdownCallback(void* application, void* data) {
-
-    UA_ConnectionManager *cm = (UA_ConnectionManager*) application;
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    UA_FD fd = (UA_FD) data;
-
-    UA_RegisteredFD* rfd = findRegisteredFD(tcm, fd);
-    if(rfd == NULL) {
+TCP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+    if(rfd->dc.callback) {
+        UA_LOG_INFO(el->logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP %u\t| Cannot close - already closing",
+                    (unsigned)rfd->fd);
         return;
     }
-    UA_ByteString response = tcm->rxBuffer;
-    int ret = UA_recv(fd, (char *)response.data, response.length, MSG_DONTWAIT | MSG_PEEK);
-    if(ret == 0 || ret == -1) {
-        cm->connectionCallback(cm, (uintptr_t)fd, &rfd->context,
-                               UA_STATUSCODE_BADCONNECTIONCLOSED,
-                               0, NULL, UA_BYTESTRING_NULL);
-        TCP_close(tcm, rfd);
-    } else {
-        /* add the delayed shutdown callback again because the peeked data will be processed in the next el cycle */
-        createAndAddDelayedShutdownCallback(cm, rfd, delayedShutdownCallback);
-    }
+
+    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+                 "TCP %u\t| Shutdown called", (unsigned)rfd->fd);
+
+    UA_DelayedCallback *dc = &rfd->dc;
+    dc->callback = TCP_delayedClose;
+    dc->application = cm;
+    dc->context = rfd;
+    el->addDelayedCallback(el, dc);
 }
-#endif
 
 static UA_StatusCode
 TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Shutdown called", (unsigned)connectionId);
-
-    /* Shutdown, will be picked up by the next iteration of the event loop */
-#ifndef _WIN32
-    int res = UA_shutdown((UA_FD)connectionId, SHUT_RDWR);
-#else
-    int res = UA_shutdown((UA_FD)connectionId, SD_SEND);
+    UA_EventLoop *el = cm->eventSource.eventLoop;
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    UA_RegisteredFD* rfd = findRegisteredFD(tcm, (UA_FD) connectionId);
-
-    createAndAddDelayedShutdownCallback(cm, rfd, delayedShutdownCallback);
-#endif
-    if(res != 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                           "TCP %u\t| Error shutting down the socket (%s)",
-                           (unsigned)connectionId, errno_str));
+    UA_RegisteredFD *rfd = TCP_findRegisteredFD(tcm, connectionId);
+    if(!rfd) {
+        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP\t| Cannot close UDP connection %u - not found",
+                       (unsigned)connectionId);
+        return UA_STATUSCODE_BADNOTFOUND;
     }
+
+    TCP_shutdown(cm, rfd);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -634,20 +649,92 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     return UA_STATUSCODE_GOOD;
 }
 
+/* Create a listen-socket that waits for incoming connections */
 static UA_StatusCode
-TCP_openConnection(UA_ConnectionManager *cm,
-                   size_t paramsSize, const UA_KeyValuePair *params,
-                   void *context) {
+TCP_openPassiveConnection(UA_ConnectionManager *cm,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          void *application, void *context,
+                          UA_ConnectionManager_connectionCallback connectionCallback) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
+    /* Get the port information */
+    char portno[6];
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "listen-port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(!port) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "TCP\t| The listen-port was not correctly configured");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_snprintf(portno, 6, "%d", *port);
+
+    /* Get the hostnames configuration */
+    const UA_Variant *hostNames =
+        UA_KeyValueMap_get(params, paramsSize, UA_QUALIFIEDNAME(0, "listen-hostnames"));
+    if(!hostNames) {
+        /* No listen-hostnames parameter -> listen on all interfaces */
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP\t| Listening on all interfaces");
+        return TCP_registerListenSockets(cm, NULL, portno,
+                                         application, context, connectionCallback);
+    }
+
+    /* Wrong datatype for the hostnames */
+    if(hostNames->type != &UA_TYPES[UA_TYPES_STRING] ||
+       UA_Variant_isScalar(hostNames)) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "TCP\t| The listen-hostnames have to be an array of strings");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Empty array -> listen on all interfaces */
+    size_t interfaces = hostNames->arrayLength;
+    if(interfaces == 0) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "TCP\t| Listening on all interfaces");
+        return TCP_registerListenSockets(cm, NULL, portno,
+                                         application, context, connectionCallback);
+    }
+
+    /* Iterate over the configured hostnames */
+    UA_String *hostStrings = (UA_String*)hostNames->data;
+    for(size_t i = 0; i < hostNames->arrayLength; i++) {
+        char hostname[512];
+        if(hostStrings[i].length >= sizeof(hostname))
+            continue;
+        memcpy(hostname, hostStrings[i].data, hostStrings->length);
+        hostname[hostStrings->length] = '\0';
+        TCP_registerListenSockets(cm, hostname, portno, application, context,
+                                  connectionCallback);
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Open a TCP connection to a remote host */
+static UA_StatusCode
+TCP_openActiveConnection(UA_ConnectionManager *cm,
+                         size_t paramsSize, const UA_KeyValuePair *params,
+                         void *application, void *context,
+                         UA_ConnectionManager_connectionCallback connectionCallback) {
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
+    if(paramsSize != 2) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "TCP\t| Port and hostname need to be defined for the connection");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     /* Get the connection parameters */
     char hostname[256];
     char portStr[16];
 
     /* Prepare the port parameter as a string */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "port"),
+        UA_KeyValueMap_getScalar(params, paramsSize, UA_QUALIFIEDNAME(0, "port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -658,8 +745,7 @@ TCP_openConnection(UA_ConnectionManager *cm,
 
     /* Prepare the hostname string */
     const UA_String *host = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "hostname"),
+        UA_KeyValueMap_getScalar(params, paramsSize, UA_QUALIFIEDNAME(0, "hostname"),
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!host) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -731,9 +817,8 @@ TCP_openConnection(UA_ConnectionManager *cm,
     }
 
     /* Allocate the UA_RegisteredFD */
-    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
-        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
-    if(!newrfd) {
+    TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
+    if(!newtcpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error allocating memory for the socket, closing",
                        (unsigned)newSock);
@@ -741,21 +826,22 @@ TCP_openConnection(UA_ConnectionManager *cm,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
-    newrfd->fd = newSock;
-    newrfd->es = &cm->eventSource;
-    newrfd->callback = (UA_FDCallback)TCP_connectionSocketCallback;
-    newrfd->context = context;
-    newrfd->listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
-                                            * connection is open */
+    newtcpfd->fd.fd = newSock;
+    newtcpfd->fd.es = &cm->eventSource;
+    newtcpfd->fd.callback = (UA_FDCallback)TCP_connectionSocketCallback;
+    newtcpfd->fd.application = application;
+    newtcpfd->fd.context = context;
+    newtcpfd->fd.listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
+                                                 * connection is open */
+    newtcpfd->connectionCallback = connectionCallback;
 
     /* Register the fd to trigger when output is possible (the connection is open) */
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    res = TCPConnectionManager_register(tcm, newrfd);
+    res = TCPConnectionManager_register(tcm, &newtcpfd->fd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Registering the socket to connect to %s failed", hostname);
         UA_close(newSock);
-        UA_free(newrfd);
+        UA_free(newtcpfd);
         return res;
     }
 
@@ -763,86 +849,49 @@ TCP_openConnection(UA_ConnectionManager *cm,
                 "TCP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
+    /* The callback to signal the new connection to the application is triggered
+     * asynchonously in the next iteration of the EventLoop */
+
     return UA_STATUSCODE_GOOD;
 }
 
-/* Asynchronously register the listenSocket */
+static UA_StatusCode
+TCP_openConnection(UA_ConnectionManager *cm,
+                   size_t paramsSize, const UA_KeyValuePair *params,
+                   void *application, void *context,
+                   UA_ConnectionManager_connectionCallback connectionCallback) {
+    /* If the "port"-parameter is defined, then try to open an active
+     * connection. Otherwise try to open a socket that listens for incoming TCP
+     * connections. */
+    const UA_Variant *val = UA_KeyValueMap_get(params, paramsSize,
+                                               UA_QUALIFIEDNAME(0, "port"));
+    if(val)
+        return TCP_openActiveConnection(cm, paramsSize, params,
+                                        application, context, connectionCallback);
+    else
+        return TCP_openPassiveConnection(cm, paramsSize, params,
+                                         application, context, connectionCallback);
+}
+
 static UA_StatusCode
 TCP_eventSourceStart(UA_ConnectionManager *cm) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
 
     /* Check the state */
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "To start the TCP ConnectionManager, "
-                     "it has to be registered in an EventLoop and not started");
+                     "To start the TCP ConnectionManager, it has to be "
+                     "registered in an EventLoop and not started yet");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* Initialize networking */
-#ifdef _WIN32
-    WSADATA wsaData;
-    WSAStartup(MAKEWORD(2, 2), &wsaData);
-#endif
-
-    /* Listening on a socket? */
-    const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(cm->eventSource.params, cm->eventSource.paramsSize,
-                                 UA_QUALIFIEDNAME(0, "listen-port"),
-                                 &UA_TYPES[UA_TYPES_UINT16]);
-    if(!port) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| No port configured, don't accept connections");
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* Prepare the port parameter as a string */
-    char portno[6];
-    UA_snprintf(portno, 6, "%d", *port);
-
-    /* Get the hostnames configuration */
-    const UA_Variant *hostNames =
-        UA_KeyValueMap_get(cm->eventSource.params, cm->eventSource.paramsSize,
-                           UA_QUALIFIEDNAME(0, "listen-hostnames"));
-    if(!hostNames) {
-        /* No hostnames configured */
-        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                    "TCP\t| Listening on all interfaces");
-        TCP_registerListenSocketDomainName(cm, NULL, portno);
-    } else if(hostNames->type != &UA_TYPES[UA_TYPES_STRING]) {
-        /* Wrong datatype */
-           UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                        "TCP\t| The hostnames have to be strings");
-           return UA_STATUSCODE_BADINTERNALERROR;
-    } else {
-        size_t interfaces = hostNames->arrayLength;
-        if(UA_Variant_isScalar(hostNames))
-            interfaces = 1;
-        if(interfaces == 0) {
-            UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                         "TCP\t| Listening on all interfaces");
-            TCP_registerListenSocketDomainName(cm, NULL, portno);
-        } else {
-            /* Iterate over the configured hostnames */
-            UA_String *hostStrings = (UA_String*)hostNames->data;
-            for(size_t i = 0; i < hostNames->arrayLength; i++) {
-                char hostname[512];
-                if(hostStrings[i].length >= sizeof(hostname))
-                    continue;
-                memcpy(hostname, hostStrings[i].data, hostStrings->length);
-                hostname[hostStrings->length] = '\0';
-                TCP_registerListenSocketDomainName(cm, hostname, portno);
-            }
-        }
-    }
-
-    /* The receive buffersize was configured? */
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    UA_UInt16 rxBufSize = 2u << 14; /* The default is 16kb */
-    const UA_UInt16 *configRxBufSize = (const UA_UInt16*)
+    /* Configure the receive buffer */
+    UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
+    const UA_UInt32 *configRxBufSize = (const UA_UInt32*)
         UA_KeyValueMap_getScalar(cm->eventSource.params, cm->eventSource.paramsSize,
                                  UA_QUALIFIEDNAME(0, "recv-bufsize"),
-                                 &UA_TYPES[UA_TYPES_UINT16]);
+                                 &UA_TYPES[UA_TYPES_UINT32]);
     if(configRxBufSize)
         rxBufSize = *configRxBufSize;
     UA_StatusCode res = UA_ByteString_allocBuffer(&tcm->rxBuffer, rxBufSize);
@@ -851,6 +900,7 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
     
     /* Set the EventSource to the started state */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -864,14 +914,9 @@ TCP_eventSourceStop(UA_ConnectionManager *cm) {
 
     /* Shut down all registered fd. The cm is set to "stopped" when the last fd
      * is closed and deregistered in the callback from the EventLoop. */
-    UA_RegisteredFD *rfd, *rfd_tmp;
-    LIST_FOREACH_SAFE(rfd, &tcm->fds, es_pointers, rfd_tmp) {
-        if(rfd->callback == (UA_FDCallback)TCP_listenSocketCallback) {
-            TCP_close(tcm, rfd); /* Listen sockets are immediately closed.
-                                  * shutdown is unsupported for them on win32 */
-        } else {
-            TCP_shutdownConnection(cm, (uintptr_t)rfd->fd);
-        }
+    UA_RegisteredFD *rfd;
+    LIST_FOREACH(rfd, &tcm->fds, es_pointers) {
+        TCP_shutdown(cm, rfd);
     }
 
     /* All sockets closed? Otherwise iterate some more. */
@@ -886,8 +931,6 @@ TCP_eventSourceDelete(UA_ConnectionManager *cm) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_deinitialize_architecture_network();
-
     /* Delete the parameters */
     UA_Array_delete(cm->eventSource.params, cm->eventSource.paramsSize,
                     &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 024e328d2fc..395f1883f51 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2021-2022 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
  */
 
@@ -18,6 +18,12 @@
 #define MSG_DONTWAIT 0
 #endif
 
+/* A registered file descriptor with an additional method pointer */
+typedef struct {
+    UA_RegisteredFD fd;
+    UA_ConnectionManager_connectionCallback connectionCallback;
+} UDP_FD;
+
 typedef struct {
     UA_ConnectionManager cm;
 
@@ -101,15 +107,26 @@ UDP_checkStopped(UDPConnectionManager *ucm) {
     }
 }
 
-static UA_StatusCode
+/* This method must not be called from the application directly, but from within
+ * the EventLoop. Otherwise we cannot be sure whether the file descriptor is
+ * still used after calling close. */
+static void
 UDP_close(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
+    UDP_FD *udpfd = (UDP_FD*)rfd;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ucm->cm.eventSource.eventLoop;
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP %u\t| Closing connection", (unsigned)rfd->fd);
 
     /* Deregister from the EventLoop */
     UDPConnectionManager_deregister(ucm, rfd);
 
+    /* Signal closing to the application */
+    udpfd->connectionCallback(&ucm->cm, (uintptr_t)rfd->fd,
+                              rfd->application, &rfd->context,
+                              UA_STATUSCODE_BADCONNECTIONCLOSED,
+                              0, NULL, UA_BYTESTRING_NULL);
+
     /* Close the socket */
     int ret = UA_close(rfd->fd);
     if(ret == 0) {
@@ -122,31 +139,46 @@ UDP_close(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
                           (unsigned)rfd->fd, errno_str));
     }
 
-    /* Free the rfd */
-    UA_free(rfd);
+    /* Don't call free here. This might be done automatically via the delayed
+     * callback that calls UDP_close. */
+    /* UA_free(rfd); */
 
     /* Stop if the ucm is stopping and this was the last open socket */
     UDP_checkStopped(ucm);
+}
 
-    return UA_STATUSCODE_GOOD;
+static void
+UDP_delayedClose(void *application, void *context) {
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)application;
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_RegisteredFD* rfd = (UA_RegisteredFD *)context;
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "UDP %u\t| Delayed closing of the connection", (unsigned)rfd->fd);
+    UDP_close(ucm, rfd);
+    /* Don't call free here. This is done automatically via the delayed callback
+     * mechanism. */
 }
 
 /* Gets called when a socket receives data or closes */
 static void
 UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                              short event) {
+    UDP_FD *udpfd = (UDP_FD*)rfd;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP %u\t| Activity on the socket", (unsigned)rfd->fd);
 
-    /* Write-Event, a new connection has opened.  */
+    /* Write-Event, a new connection for sending has opened.  */
     if(event == UA_FDEVENT_OUT) {
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP %u\t| Opening a new connection", (unsigned)rfd->fd);
 
         /* A new socket has opened. Signal it to the application. */
-        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
-                               UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
+        udpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
+                                  rfd->application, &rfd->context,
+                                  UA_STATUSCODE_GOOD, 0, NULL,
+                                  UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
         rfd->listenEvents = UA_FDEVENT_IN;
@@ -170,29 +202,18 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 
     /* Receive has failed */
     if(ret <= 0) {
-        if(UA_ERRNO == UA_INTERRUPTED) {
-            return; /* Temporary error on an non-blocking socket */
-        }
-
-        /* For UDP sockets UA_WOULDBLOCK for recv means that we actually do
-         * not receive anything although a signal for EPOLL was received
-         * The signal mus thus be EPOLLERR signaling for the write end of a pipe
-         * that the read end has been closed */
-        UA_assert(UA_ERRNO == UA_WOULDBLOCK || UA_ERRNO == UA_AGAIN);
+        if(UA_ERRNO == UA_INTERRUPTED)
+            return;
 
-        /* Orderly shutdown of the socket. Signal to the application and then
-         * close the socket. We end up in this code-path after shutdown was
-         * called on the socket. Here, we then are in the next EventLoop
-         * iteration and the socket is known to be unused. */
-
-        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP %u\t| recv signaled the socket was shutdown",
-                     (unsigned)rfd->fd);
-
-        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
-                               UA_STATUSCODE_BADCONNECTIONCLOSED,
-                               0, NULL, UA_BYTESTRING_NULL);
+        /* Orderly shutdown of the socket. We can immediately close as no method
+         * "below" in the call stack will use the socket in this iteration of
+         * the EventLoop. */
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                        "UDP %u\t| recv signaled the socket was shutdown (%s)",
+                        (unsigned)rfd->fd, errno_str));
         UDP_close(ucm, rfd);
+        UA_free(rfd);
         return;
     }
 
@@ -202,12 +223,15 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 
     /* Callback to the application layer */
     response.length = (size_t)ret; /* Set the length of the received buffer */
-    cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
-                           UA_STATUSCODE_GOOD, 0, NULL, response);
+    udpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
+                              rfd->application, &rfd->context,
+                              UA_STATUSCODE_GOOD, 0, NULL, response);
 }
 
 static void
-UDP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
+UDP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
+                         void *application, void *context,
+                         UA_ConnectionManager_connectionCallback connectionCallback) {
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
@@ -303,9 +327,8 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
     }
 
     /* Allocate the UA_RegisteredFD */
-    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
-        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
-    if(!newrfd) {
+    UDP_FD *newudpfd = (UDP_FD*)UA_calloc(1, sizeof(UDP_FD));
+    if(!newudpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP %u\t| Error allocating memory for the socket, closing",
                        (unsigned)listenSocket);
@@ -313,27 +336,34 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai) {
         return;
     }
 
-    newrfd->fd = listenSocket;
-    newrfd->es = &cm->eventSource;
-    newrfd->callback = (UA_FDCallback)UDP_connectionSocketCallback;
-    newrfd->context = cm->initialConnectionContext;
-    newrfd->listenEvents = UA_FDEVENT_IN;
+    newudpfd->fd.fd = listenSocket;
+    newudpfd->fd.es = &cm->eventSource;
+    newudpfd->fd.callback = (UA_FDCallback)UDP_connectionSocketCallback;
+    newudpfd->fd.application = application;
+    newudpfd->fd.context = context;
+    newudpfd->fd.listenEvents = UA_FDEVENT_IN;
+    newudpfd->connectionCallback = connectionCallback;
 
     /* Register in the EventLoop */
-    UA_StatusCode res = UDPConnectionManager_register(ucm, newrfd);
+    UA_StatusCode res = UDPConnectionManager_register(ucm, &newudpfd->fd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP %u\t| Error registering the socket, closing",
                        (unsigned)listenSocket);
-        UA_free(newrfd);
+        UA_free(newudpfd);
         UA_close(listenSocket);
         return;
     }
+
+    connectionCallback(cm, (uintptr_t)newudpfd->fd.fd,
+                       application, &newudpfd->fd.context,
+                       UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
 }
 
 static UA_StatusCode
-UDP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostname,
-                                   const char *port) {
+UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
+                          const char *port, void *application, void *context,
+                          UA_ConnectionManager_connectionCallback connectionCallback) {
     /* Get all the interface and IPv4/6 combinations for the configured hostname */
     struct addrinfo hints, *res;
     memset(&hints, 0, sizeof hints);
@@ -363,82 +393,58 @@ UDP_registerListenSocketDomainName(UA_ConnectionManager *cm, const char *hostnam
     /* Add listen sockets */
     struct addrinfo *ai = res;
     while(ai) {
-        UDP_registerListenSocket(cm, ai);
+        UDP_registerListenSocket(cm, ai, application, context, connectionCallback);
         ai = ai->ai_next;
     }
     UA_freeaddrinfo(res);
     return UA_STATUSCODE_GOOD;
 }
 
-#ifdef WIN32
 static
 UA_RegisteredFD *
-findRegisteredFD(UDPConnectionManager *cm, uintptr_t connectionId) {
-    UA_RegisteredFD *rfd, *rfd_tmp;
-    LIST_FOREACH_SAFE(rfd, &cm->fds, es_pointers, rfd_tmp) {
-
-        if (rfd->fd == connectionId) {
+UDP_findRegisteredFD(UDPConnectionManager *ucm, uintptr_t connectionId) {
+    UA_RegisteredFD *rfd;
+    LIST_FOREACH(rfd, &ucm->fds, es_pointers) {
+        if(rfd->fd == (UA_FD)connectionId)
             return rfd;
-        }
     }
     return NULL;
 }
-static
-void delayedShutdownCallback(void* application, void* data) {
-
-    UA_ConnectionManager *cm = (UA_ConnectionManager*) application;
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    UA_RegisteredFD* rfd = (UA_RegisteredFD *) data;
 
-    UA_ByteString response = ucm->rxBuffer;
-    int ret = UA_recv(rfd->fd, (char *)response.data, response.length, MSG_DONTWAIT);
-    if(ret == 0 || ret == -1) {
-        cm->connectionCallback(cm, (uintptr_t)rfd->fd, &rfd->context,
-                               UA_STATUSCODE_BADCONNECTIONCLOSED,
-                               0, NULL, UA_BYTESTRING_NULL);
-        UDP_close(ucm, rfd);
-    } else {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                         UA_LOGCATEGORY_NETWORK,
-                         "UDP %u\t| Error shutting down the socket , windows implementation for processing pending data is not implemented (%s)",
-                         (unsigned)rfd->fd, errno_str));
+/* Close the connection via a delayed callback */
+static void
+UDP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+    if(rfd->dc.callback) {
+        UA_LOG_INFO(el->logger, UA_LOGCATEGORY_NETWORK,
+                    "UDP %u\t| Cannot close - already closing",
+                    (unsigned)rfd->fd);
         return;
     }
+
+    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+                 "UDP %u\t| Shutdown called", (unsigned)rfd->fd);
+    UA_DelayedCallback *dc = &rfd->dc;
+    dc->callback = UDP_delayedClose;
+    dc->application = cm;
+    dc->context = rfd;
+    el->addDelayedCallback(el, dc);
 }
-#endif
 
 static UA_StatusCode
 UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                 UA_LOGCATEGORY_NETWORK,
-                 "UDP %u\t| Shutdown called", (unsigned)connectionId);
-
-   /* Shutdown, will be picked up by the next iteration of the event loop */
-#ifndef _WIN32
-    int res = UA_shutdown((UA_FD)connectionId, SHUT_RDWR);
-#else
-    /* In windows we must let the eventloop call shutdown explicitly as a delayed callback in the next cycle
-     * shutdown(...) will not cause an event for select(...) on the given file descriptor
-     * */
-    int res = UA_shutdown((UA_FD)connectionId, SD_SEND);
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    UA_RegisteredFD* rfd = findRegisteredFD(ucm, (UA_FD) connectionId);
     UA_EventLoop *el = cm->eventSource.eventLoop;
-
-    UA_DelayedCallback *explicitlyDelayedShutdownCallback = UA_malloc(sizeof(UA_DelayedCallback));
-    explicitlyDelayedShutdownCallback->callback = delayedShutdownCallback;
-    explicitlyDelayedShutdownCallback->application = cm;
-    explicitlyDelayedShutdownCallback->data = rfd;
-    el->addDelayedCallback(el, explicitlyDelayedShutdownCallback);
-#endif
-    if(res != 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
-                           UA_LOGCATEGORY_NETWORK,
-                           "UDP %u\t| Error shutting down the socket (%s)",
-                           (unsigned)connectionId, errno_str));
+    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_RegisteredFD *rfd = UDP_findRegisteredFD(ucm, connectionId);
+    if(!rfd) {
+        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP\t| Cannot close UDP connection %u - not found",
+                       (unsigned)connectionId);
+        return UA_STATUSCODE_BADNOTFOUND;
     }
+
+    UDP_shutdown(cm, rfd);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -508,9 +514,10 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 }
 
 static UA_StatusCode
-UDP_openConnection(UA_ConnectionManager *cm,
-                   size_t paramsSize, const UA_KeyValuePair *params,
-                   void *context) {
+UDP_openSendConnection(UA_ConnectionManager *cm,
+                       size_t paramsSize, const UA_KeyValuePair *params,
+                       void *application, void *context,
+                       UA_ConnectionManager_connectionCallback connectionCallback) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get the connection parameters */
@@ -603,9 +610,8 @@ UDP_openConnection(UA_ConnectionManager *cm,
     }
 
     /* Allocate the UA_RegisteredFD */
-    UA_RegisteredFD *newrfd = (UA_RegisteredFD*)
-        (UA_RegisteredFD*)UA_malloc(sizeof(UA_RegisteredFD));
-    if(!newrfd) {
+    UDP_FD *newudpfd = (UDP_FD*)UA_calloc(1, sizeof(UDP_FD));
+    if(!newudpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP %u\t| Error allocating memory for the socket, closing",
                        (unsigned)newSock);
@@ -613,21 +619,23 @@ UDP_openConnection(UA_ConnectionManager *cm,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
-    newrfd->fd = newSock;
-    newrfd->es = &cm->eventSource;
-    newrfd->callback = (UA_FDCallback)UDP_connectionSocketCallback;
-    newrfd->context = context;
-    newrfd->listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
-                                            * connection is open */
+    newudpfd->fd.fd = newSock;
+    newudpfd->fd.es = &cm->eventSource;
+    newudpfd->fd.callback = (UA_FDCallback)UDP_connectionSocketCallback;
+    newudpfd->fd.application = application;
+    newudpfd->fd.context = context;
+    newudpfd->fd.listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
+                                                 * connection is open */
+    newudpfd->connectionCallback = connectionCallback;
 
     /* Register the fd to trigger when output is possible (the connection is open) */
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    res = UDPConnectionManager_register(ucm, newrfd);
+    res = UDPConnectionManager_register(ucm, &newudpfd->fd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP\t| Registering the socket for %s failed", hostname);
         UA_close(newSock);
-        UA_free(newrfd);
+        UA_free(newudpfd);
         return res;
     }
 
@@ -635,89 +643,116 @@ UDP_openConnection(UA_ConnectionManager *cm,
                 "UDP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
+    /* Don't signal the application that the connection has opened. This will
+     * happen in the next iteration of the EventLoop. */
+    /* connectionCallback(cm, (uintptr_t)newSock, application, &newudpfd->fd.context,
+                          UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL); */
+
     return UA_STATUSCODE_GOOD;
 }
 
-/* Asynchronously register the listenSocket */
 static UA_StatusCode
-UDP_eventSourceStart(UA_ConnectionManager *cm) {
+UDP_openReceiveConnection(UA_ConnectionManager *cm,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          void *application, void *context,
+                          UA_ConnectionManager_connectionCallback connectionCallback) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
-    /* Check the state */
-    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "To start the UDP ConnectionManager, "
-                     "it has to be registered in an EventLoop and not started");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Initialize networking */
-#ifdef _WIN32
-    WSADATA wsaData;
-    WSAStartup(MAKEWORD(2, 2), &wsaData);
-#endif
-
-    /* Listening on a socket? */
+    /* Get the socket */
+    char portno[6];
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(cm->eventSource.params,
-                                 cm->eventSource.paramsSize,
+        UA_KeyValueMap_getScalar(params, paramsSize,
                                  UA_QUALIFIEDNAME(0, "listen-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| No port configured, don't accept connections");
-        return UA_STATUSCODE_GOOD;
+                     "UDP\t| Port information required for UDP listening");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
-
-    /* Prepare the port parameter as a string */
-    char portno[6];
     UA_snprintf(portno, 6, "%d", *port);
 
     /* Get the hostnames configuration */
     const UA_Variant *hostNames =
-        UA_KeyValueMap_get(cm->eventSource.params,
-                           cm->eventSource.paramsSize,
+        UA_KeyValueMap_get(params, paramsSize,
                            UA_QUALIFIEDNAME(0, "listen-hostnames"));
     if(!hostNames) {
-        /* No hostnames configured */
+        /* No hostnames configured -> listen on all interfaces*/
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP\t| Listening on all interfaces");
-        UDP_registerListenSocketDomainName(cm, NULL, portno);
-    } else if(hostNames->type != &UA_TYPES[UA_TYPES_STRING]) {
-        /* Wrong datatype */
-           UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                        "UDP\t| The hostnames have to be strings");
-           return UA_STATUSCODE_BADINTERNALERROR;
-    } else {
-        size_t interfaces = hostNames->arrayLength;
-        if(UA_Variant_isScalar(hostNames))
-            interfaces = 1;
-        if(interfaces == 0) {
-            UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                         "UDP\t| Listening on all interfaces");
-            UDP_registerListenSocketDomainName(cm, NULL, portno);
-        } else {
-            /* Iterate over the configured hostnames */
-            UA_String *hostStrings = (UA_String*)hostNames->data;
-            for(size_t i = 0; i < hostNames->arrayLength; i++) {
-                char hostname[512];
-                if(hostStrings[i].length >= sizeof(hostname))
-                    continue;
-                memcpy(hostname, hostStrings[i].data, hostStrings->length);
-                hostname[hostStrings->length] = '\0';
-                UDP_registerListenSocketDomainName(cm, hostname, portno);
-            }
-        }
+        return UDP_registerListenSockets(cm, NULL, portno, application,
+                                         context, connectionCallback);
+    }
+
+    /* Correct datatype for the hostnames? */
+    if(hostNames->type != &UA_TYPES[UA_TYPES_STRING] ||
+       UA_Variant_isScalar(hostNames)) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| The hostnames have to be an array of string");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    
+    size_t interfaces = hostNames->arrayLength;
+    if(interfaces == 0) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| Listening on all interfaces");
+        return UDP_registerListenSockets(cm, NULL, portno, application,
+                                         context, connectionCallback);
+    }
+    
+    /* Iterate over the configured hostnames */
+    UA_String *hostStrings = (UA_String*)hostNames->data;
+    for(size_t i = 0; i < hostNames->arrayLength; i++) {
+        char hostname[512];
+        if(hostStrings[i].length >= sizeof(hostname))
+            continue;
+        memcpy(hostname, hostStrings[i].data, hostStrings->length);
+        hostname[hostStrings->length] = '\0';
+        UDP_registerListenSockets(cm, hostname, portno, application,
+                                  context, connectionCallback);
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UDP_openConnection(UA_ConnectionManager *cm,
+                   size_t paramsSize, const UA_KeyValuePair *params,
+                   void *application, void *context,
+                   UA_ConnectionManager_connectionCallback connectionCallback) {
+    /* If the "port"-parameter is defined, then try to open a send connection.
+     * Otherwise try to open a socket that listens for incoming TCP
+     * connections. */
+    const UA_Variant *val = UA_KeyValueMap_get(params, paramsSize,
+                                               UA_QUALIFIEDNAME(0, "port"));
+    if(val)
+        return UDP_openSendConnection(cm, paramsSize, params,
+                                      application, context, connectionCallback);
+    else
+        return UDP_openReceiveConnection(cm, paramsSize, params,
+                                         application, context, connectionCallback);
+}
+
+/* Asynchronously register the listenSocket */
+static UA_StatusCode
+UDP_eventSourceStart(UA_ConnectionManager *cm) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
+    /* Check the state */
+    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "To start the UDP ConnectionManager, "
+                     "it has to be registered in an EventLoop and not started");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* The receive buffersize was configured? */
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    UA_UInt16 rxBufSize = 2u << 14; /* The default is 16kb */
-    const UA_UInt16 *configRxBufSize = (const UA_UInt16*)
+    UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
+    const UA_UInt32 *configRxBufSize = (const UA_UInt32*)
         UA_KeyValueMap_getScalar(cm->eventSource.params,
                                  cm->eventSource.paramsSize,
                                  UA_QUALIFIEDNAME(0, "recv-bufsize"),
-                                 &UA_TYPES[UA_TYPES_UINT16]);
+                                 &UA_TYPES[UA_TYPES_UINT32]);
     if(configRxBufSize)
         rxBufSize = *configRxBufSize;
     UA_StatusCode res = UA_ByteString_allocBuffer(&ucm->rxBuffer, rxBufSize);
@@ -726,40 +761,38 @@ UDP_eventSourceStart(UA_ConnectionManager *cm) {
     
     /* Set the EventSource to the started state */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
+
     return UA_STATUSCODE_GOOD;
 }
 
 static void
 UDP_eventSourceStop(UA_ConnectionManager *cm) {
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    UA_LOG_INFO(cm->eventSource.eventLoop->logger,
-                UA_LOGCATEGORY_NETWORK, "UDP\t| Shutting down the ConnectionManager");
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                "UDP\t| Shutting down the ConnectionManager");
 
     cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
     /* Shut down all registered fd. The cm is set to "stopped" when the last fd
-     * is closed and deregistered in the callback from the EventLoop. */
-    UA_RegisteredFD *rfd, *rfd_tmp;
-    LIST_FOREACH_SAFE(rfd, &ucm->fds, es_pointers, rfd_tmp) {
-        UDP_close(ucm, rfd);
-        // UDP_shutdownConnection(cm, (uintptr_t)rfd->fd);
+     * is closed (from within UDP_close). */
+    UA_RegisteredFD *rfd;
+    LIST_FOREACH(rfd, &ucm->fds, es_pointers) {
+        UDP_shutdown(cm, rfd);
     }
 
-    /* All sockets closed? Otherwise iterate some more. */
+    /* Check if stopped once more (also checking inside UDP_close, but there we
+     * don't check if there is no rfd at all) */
     UDP_checkStopped(ucm);
 }
 
 static UA_StatusCode
 UDP_eventSourceDelete(UA_ConnectionManager *cm) {
     if(cm->eventSource.state >= UA_EVENTSOURCESTATE_STARTING) {
-        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| The EventSource must be stopped before it can be deleted");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_deinitialize_architecture_network();
-
     /* Delete the parameters */
     UA_Array_delete(cm->eventSource.params,
                     cm->eventSource.paramsSize,
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index e091697fac1..6cf9531ea8d 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -58,7 +58,7 @@ typedef struct UA_DelayedCallback {
     struct UA_DelayedCallback *next; /* Singly-linked list */
     UA_Callback callback;
     void *application;
-    void *data;
+    void *context;
 } UA_DelayedCallback;
 
 typedef enum {
@@ -199,7 +199,6 @@ struct UA_EventSource {
      * ~~~~~~~~~~~~~ */
     UA_String name;                 /* Unique name of the ES */
     UA_EventLoop *eventLoop;        /* EventLoop where the ES is registered */
-    void *application;              /* Application to which the ES belongs */
     size_t paramsSize;              /* Configuration parameters */
     UA_KeyValuePair *params;
 
@@ -221,6 +220,33 @@ struct UA_EventSource {
  * it can keep a session to an MQTT broker open which is used by individual
  * connections that are each bound to an MQTT topic. */
 
+/* The ConnectionCallback is the only interface from the connection back to
+ * the application.
+ *
+ * - The connectionId is initially unknown to the target application and
+ *   "announced" to the application when first used first in this callback.
+ *
+ * - The context is attached to the connection. Initially a default context
+ *   is set. The context can be replaced within the callback (via the
+ *   double-pointer).
+ *
+ * - The status indicates whether the connection is closing down. If status
+ *   != GOOD, then the application should clean up the context, as this is
+ *   the last time the callback will be called for this connection.
+ *
+ * - The parameters are a key-value list with additional information. The
+ *   possible keys and their meaning are documented for the individual
+ *   ConnectionManager implementations.
+ *
+ * - The msg ByteString is the message (or packet) received on the
+ *   connection. Can be empty. */
+typedef void
+(*UA_ConnectionManager_connectionCallback)
+     (UA_ConnectionManager *cm, uintptr_t connectionId,
+      void *application, void **connectionContext, UA_StatusCode status,
+      size_t paramsSize, const UA_KeyValuePair *params,
+      UA_ByteString msg);
+
 struct UA_ConnectionManager {
     /* Every ConnectionManager is treated like an EventSource from the
      * perspective of the EventLoop. */
@@ -230,85 +256,40 @@ struct UA_ConnectionManager {
      * "mqtt", "udp", "mqtt". */
     UA_String protocol;
 
-    /* The ConnectionCallback is the only interface from the connection back to
-     * the application.
-     *
-     * - The connectionId is initially unknown to the target application and
-     *   "announced" to the application when first used first in this callback.
-     *
-     * - The context is attached to the connection. Initially a default context
-     *   is set. The context can be replaced within the callback (via the
-     *   double-pointer).
+    /* Open a Connection
+     * ~~~~~~~~~~~~~~~~~
+     * Connecting is asynchronous. The connection-callback is called when the
+     * connection is open (status=GOOD) or aborted (status!=GOOD) when
+     * connecting failed.
      *
-     * - The status indicates whether the connection is closing down. If status
-     *   != GOOD, then the application should clean up the context, as this is
-     *   the last time the callback will be called for this connection.
-     *
-     * - The parameters are a key-value list with additional information. The
-     *   possible keys and their meaning are documented for the individual
-     *   ConnectionManager implementations.
-     *
-     * - The msg ByteString is the message (or packet) received on the
-     *   connection. Can be empty. */
-    void
-    (*connectionCallback)(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void **connectionContext, UA_StatusCode status,
-                          size_t paramsSize, const UA_KeyValuePair *params,
-                          UA_ByteString msg);
-
-    /* Passively listen for new connections
-     * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-     * Some ConnectionManagers passively listen to open new Connections. The
-     * configuration parameters stored in the EventSource are used during
-     * 'start' of the EventSource to set this up. The 'connectionCallback'
-     * callback is used to indicate that a new connection has been are created
-     * (status==Good, msg=empty).
-     *
-     * The context an internally created new connection is initialized with.
-     * Before calling the 'connectionCallback' for it the first time. */
-    void *initialConnectionContext;
-
-    /* Actively Open a Connection
-     * ~~~~~~~~~~~~~~~~~~~~~~~~~~
-     * Some ConnectionManagers can actively open a new Connection. Connecting is
-     * asynchronous. cm->connectionCallback is called when the connection is
-     * open (status=GOOD) or aborted (status!=GOOD) when connecting failed.
+     * Some ConnectionManagers can also passively listen for new connections.
+     * Configuration parameters for this are passed via the key-value list. The
+     * `context` pointer of the listening connection is also set as the initial
+     * context of newly opened connections.
      *
      * The parameters describe the connection. For example hostname and port
      * (for TCP). Other protocols (e.g. MQTT, AMQP, etc.) may required
-     * additional arguments to open a connection.
+     * additional arguments to open a connection in the key-value list.
      *
      * The provided context is set as the initial context attached to this
      * connection. It is already set before the first call to
-     * cm->connectionCallback.
+     * connectionCallback.
      *
-     * The connection is opened asynchronously. The ConnectionCallback is
+     * The connection is opened asynchronously. The connection-callback is
      * triggered when the connection is fully opened (UA_STATUSCODE_GOOD) or has
      * failed (with an error code). */
     UA_StatusCode
     (*openConnection)(UA_ConnectionManager *cm,
                       size_t paramsSize, const UA_KeyValuePair *params,
-                      void *context);
-
-    /* Connection Activities
-     * ~~~~~~~~~~~~~~~~~~~~~
-     * The following are activities to be performed on an open connection.
-     *
-     * Each ConnectionManager allocates and frees his own memory for the network
-     * buffers. This enables, for example, zero-copy neworking mechanisms. The
-     * connectionId is part of the API to enable cases where memory is
-     * statically allocated for every connection */
-    UA_StatusCode
-    (*allocNetworkBuffer)(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          UA_ByteString *buf, size_t bufSize);
-    void
-    (*freeNetworkBuffer)(UA_ConnectionManager *cm, uintptr_t connectionId,
-                         UA_ByteString *buf);
-
-    /* Send a message. Sending is asynchronous. That is, the function returns
-     * before the message is ACKed from remote. The memory for the buffer is
-     * expected to be allocated with allocNetworkBuffer and is released
-     * internally (also if sending fails).
+                      void *application, void *context,
+                      UA_ConnectionManager_connectionCallback connectionCallback);
+
+    /* Send a message over a Connection
+     * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+     * Sending is asynchronous. That is, the function returns before the message
+     * is ACKed from remote. The memory for the buffer is expected to be
+     * allocated with allocNetworkBuffer and is released internally (also if
+     * sending fails).
      *
      * Some ConnectionManagers can accept additional parameters for sending. For
      * example a tx-time for sending in time-synchronized TSN settings. */
@@ -317,13 +298,28 @@ struct UA_ConnectionManager {
                           size_t paramsSize, const UA_KeyValuePair *params,
                           UA_ByteString *buf);
 
-    /* When a connection is closed, cm->connectionCallback is called with
+    /* Close a Connection
+     * ~~~~~~~~~~~~~~~~~~
+     * When a connection is closed its `connectionCallback` is called with
      * (status=BadConnectionClosed, msg=empty). Then the connection is cleared
      * up inside the ConnectionManager. This is the case both for connections
      * that are actively closed and those that are closed remotely. The return
      * code is non-good only if the connection is already closed. */
     UA_StatusCode
     (*closeConnection)(UA_ConnectionManager *cm, uintptr_t connectionId);
+
+    /* Buffer Management
+     * ~~~~~~~~~~~~~~~~~
+     * Each ConnectionManager allocates and frees his own memory for the network
+     * buffers. This enables, for example, zero-copy neworking mechanisms. The
+     * connectionId is part of the API to enable cases where memory is
+     * statically allocated for every connection */
+    UA_StatusCode
+    (*allocNetworkBuffer)(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          UA_ByteString *buf, size_t bufSize);
+    void
+    (*freeNetworkBuffer)(UA_ConnectionManager *cm, uintptr_t connectionId,
+                         UA_ByteString *buf);
 };
 
 /**
@@ -397,17 +393,17 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  * effect.
  *
  * Configuration Parameters:
- * - 0:listen-port [uint16]: Port to listen for new connections (default: do not
- *                           listen on any port).
- * - 0:listen-hostnames [string | string array]: Hostnames of the devices to
- *                                               listen on (default: listen on
- *                                               all devices).
- * - 0:recv-bufsize [uint16]: Size of the buffer that is allocated for receiving
- *                            messages (default 16kB).
+ * - 0:recv-bufsize [uint32]: Size of the buffer that is allocated for receiving
+ *                            messages (default 64kB).
  *
  * Open Connection Parameters:
- * - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
- * - 0:port [uint16]: Port of the target host (required).
+ * - Active Connection
+ *   - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
+ *   - 0:port [uint16]: Port of the target host (required).
+ * - Passive Connection (Listening on a port for incoming connections)
+ *   - 0:listen-port [uint16]: Port to listen for new connections (required).
+ *   - 0:listen-hostnames [string array]: Hostnames of the devices to listen on
+ *                                        (default: listen on all devices).
  *
  * Connection Callback Paramters:
  * - 0:remote-hostname [string]: When a new connection is opened by listening on
@@ -434,8 +430,8 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  * - 0:listen-hostnames [string | string array]: Hostnames of the devices to
  *                                               listen on (default: listen on
  *                                               all devices).
- * - 0:recv-bufsize [uint16]: Size of the buffer that is allocated for receiving
- *                            messages (default 16kB).
+ * - 0:recv-bufsize [uint32]: Size of the buffer that is allocated for receiving
+ *                            messages (default 64kB).
  *
  * Open Connection Parameters:
  * - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 61c2438bc5d..92cad4b2606 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -582,8 +582,6 @@ UA_Server_setupEventLoop(UA_Server *server) {
     }
 
     ctx->cm = tcpCM;
-    tcpCM->connectionCallback = UA_Server_connectionCallback;
-    tcpCM->initialConnectionContext = ctx;
 
     return UA_STATUSCODE_GOOD;
 }
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 49d204720a8..1fff38b76d0 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -28,10 +28,6 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 
     /* Custom DataTypes */
     /* nothing to do */
-    for (size_t i = 0; i < config->connectionManagersSize; i++) {
-        UA_ConnectionManager* cm = config->connectionManagers[i];
-        UA_free(cm->initialConnectionContext);
-    }
 
     /* Stop and delete the EventLoop */
     UA_EventLoop *el = config->eventLoop;
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index ec036621da0..4e6d2bfcab5 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -68,7 +68,7 @@ removeSecureChannel(UA_Server *server, channel_entry *entry,
      * scheduled jobs have completed */
     entry->cleanupCallback.callback = (UA_Callback)removeSecureChannelCallback;
     entry->cleanupCallback.application = NULL;
-    entry->cleanupCallback.data = entry;
+    entry->cleanupCallback.context = entry;
     server->config.eventLoop->
         addDelayedCallback(server->config.eventLoop, &entry->cleanupCallback);
 }
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 4617824091f..03b3590ddd0 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -92,7 +92,7 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
      * scheduled jobs have completed */
     sentry->cleanupCallback.callback = (UA_Callback)removeSessionCallback;
     sentry->cleanupCallback.application = server;
-    sentry->cleanupCallback.data = sentry;
+    sentry->cleanupCallback.context = sentry;
     server->config.eventLoop->
         addDelayedCallback(server->config.eventLoop, &sentry->cleanupCallback);
 }
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 1135a5bd1a9..2f797221a1f 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -116,7 +116,7 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
      * the call stack. */
     sub->delayedFreePointers.callback = NULL;
     sub->delayedFreePointers.application = server;
-    sub->delayedFreePointers.data = NULL;
+    sub->delayedFreePointers.context = NULL;
     server->config.eventLoop->
         addDelayedCallback(server->config.eventLoop, &sub->delayedFreePointers);
 }
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 2b8cacce186..faa6735056e 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -600,7 +600,7 @@ UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *mon) {
      * remove itself in the callback. */
     mon->delayedFreePointers.callback = NULL;
     mon->delayedFreePointers.application = server;
-    mon->delayedFreePointers.data = NULL;
+    mon->delayedFreePointers.context = NULL;
     server->config.eventLoop->
         addDelayedCallback(server->config.eventLoop, &mon->delayedFreePointers);
 }
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index f770531a9bc..e63a3b48f52 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -11,56 +11,31 @@
 #include <time.h>
 #include <check.h>
 
-#define N_EVENTS 10000
-
-UA_EventLoop *el;
-
-static void noopCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                         void **connectionContext, UA_StatusCode status,
-                         size_t paramsSize, const UA_KeyValuePair *params,
-                         UA_ByteString msg) {}
-
-START_TEST(listenTCP) {
-    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-
-    UA_UInt16 port = 4840;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
-    cm->connectionCallback = noopCallback;
-    UA_KeyValueMap_set(&cm->eventSource.params,
-                       &cm->eventSource.paramsSize,
-                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
-    el->registerEventSource(el, &cm->eventSource);
-
-    el->start(el);
-
-    for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-    }
-    int max_stop_iteration_count = 1000;
-    int iteration = 0;
-    /* Stop the EventLoop */
-    el->stop(el);
-    while(el->state != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        iteration++;
-    }
-    el->free(el);
-    el = NULL;
-} END_TEST
-
+static UA_EventLoop *el;
 static unsigned connCount;
 static char *testMsg = "open62541";
 static uintptr_t clientId;
 static UA_Boolean received;
+
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                   void **connectionContext, UA_StatusCode status,
+                   void *application, void **connectionContext,
+                   UA_StatusCode status,
                    size_t paramsSize, const UA_KeyValuePair *params,
                    UA_ByteString msg) {
+    if(status != UA_STATUSCODE_GOOD) {
+        UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                     "Closing connection %u", (unsigned)connectionId);
+    } else {
+        if(msg.length == 0) {
+            UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Opening connection %u", (unsigned)connectionId);
+        } else {
+            UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Received a message of length %u", (unsigned)msg.length);
+        }
+    }
+
     if(*connectionContext != NULL)
         clientId = connectionId;
     if(msg.length == 0 && status == UA_STATUSCODE_GOOD) {
@@ -75,9 +50,9 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             ck_assert(hn != NULL);
         }
     }
-    if(status != UA_STATUSCODE_GOOD) {
+
+    if(status != UA_STATUSCODE_GOOD)
         connCount--;
-    }
 
     if(msg.length > 0) {
         UA_ByteString rcv = UA_BYTESTRING(testMsg);
@@ -87,59 +62,98 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 }
 
 static void
-illegalConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void **connectionContext, UA_StatusCode status,
+reenterConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_StatusCode status,
                           size_t paramsSize, const UA_KeyValuePair *params,
                           UA_ByteString msg) {
+    /* Try to reenter the eventloop. Must fail. */
     UA_StatusCode rv = el->run(el, 1);
     ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);
-    if(*connectionContext != NULL)
-        clientId = connectionId;
-    if(msg.length == 0 && status == UA_STATUSCODE_GOOD)
-        connCount++;
-    if(status != UA_STATUSCODE_GOOD)
-        connCount--;
-    if(msg.length > 0) {
-        UA_ByteString rcv = UA_BYTESTRING(testMsg);
-        ck_assert(UA_String_equal(&msg, &rcv));
-        received = true;
-    }
+
+    connectionCallback(cm, connectionId, application, connectionContext,
+                       status, paramsSize, params, msg);
 }
 
-START_TEST(runEventloopFailsIfCalledFromCallback) {
+START_TEST(listenTCP) {
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
 
     UA_UInt16 port = 4840;
     UA_Variant portVar;
     UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    params[0].value = portVar;
+
+    ck_assert_uint_eq(connCount, 0);
+
+    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+
+    ck_assert(connCount > 0);
+
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+
+    /* Stop the EventLoop */
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    el->free(el);
+    el = NULL;
+
+    ck_assert_uint_eq(connCount, 0);
+} END_TEST
+
+START_TEST(runEventloopFailsIfCalledFromCallback) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
-    cm->connectionCallback = illegalConnectionCallback;
-    UA_KeyValueMap_set(&cm->eventSource.params,
-                       &cm->eventSource.paramsSize,
-                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
     el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
 
     connCount = 0;
-    el->start(el);
+
+    UA_UInt16 port = 4840;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    params[0].value = portVar;
+
+    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+
+    size_t listenSockets = connCount;
 
     /* Open a client connection */
     clientId = 0;
 
     UA_String targetHost = UA_STRING("localhost");
-    UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "port");
     params[0].value = portVar;
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
+    UA_StatusCode retval = cm->openConnection(cm, 2, params, NULL, (void*)0x01,
+                                              reenterConnectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 10; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(clientId != 0);
-    ck_assert_uint_eq(connCount, 2);
+    ck_assert_uint_eq(connCount, listenSockets + 2);
 
     /* Send a message from the client */
     received = false;
@@ -158,12 +172,12 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     /* Close the connection */
     retval = cm->closeConnection(cm, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(connCount, 2);
+    ck_assert_uint_eq(connCount, listenSockets + 2);
     for(size_t i = 0; i < 10; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
-    ck_assert_uint_eq(connCount, 0);
+    ck_assert_uint_eq(connCount, listenSockets);
 
     int max_stop_iteration_count = 1000;
     int iteration = 0;
@@ -177,42 +191,48 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     }
     el->free(el);
     el = NULL;
+    ck_assert_uint_eq(connCount, 0);
 } END_TEST
 
 START_TEST(connectTCP) {
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
 
     UA_UInt16 port = 4840;
     UA_Variant portVar;
     UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
-    cm->connectionCallback = connectionCallback;
-    UA_KeyValueMap_set(&cm->eventSource.params,
-                       &cm->eventSource.paramsSize,
-                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
-    el->registerEventSource(el, &cm->eventSource);
+
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    params[0].value = portVar;
 
     connCount = 0;
-    el->start(el);
+
+    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+
+    size_t listenSockets = connCount;
 
     /* Open a client connection */
     clientId = 0;
 
     UA_String targetHost = UA_STRING("localhost");
-    UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "port");
     params[0].value = portVar;
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
+    UA_StatusCode retval =
+        cm->openConnection(cm, 2, params, NULL, (void*)0x01, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(clientId != 0);
-    ck_assert_uint_eq(connCount, 2);
+
+    ck_assert_uint_eq(connCount, listenSockets + 2);
 
     /* Send a message from the client */
     received = false;
@@ -231,17 +251,16 @@ START_TEST(connectTCP) {
     /* Close the connection */
     retval = cm->closeConnection(cm, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(connCount, 2);
+    ck_assert_uint_eq(connCount, listenSockets + 2);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
-    ck_assert_uint_eq(connCount, 0);
+    ck_assert_uint_eq(connCount, listenSockets);
 
     /* Stop the EventLoop */
     int max_stop_iteration_count = 10;
     int iteration = 0;
-    /* Stop the EventLoop */
     el->stop(el);
     while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
           iteration < max_stop_iteration_count) {
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index a6982fe0207..3f08a97b797 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -11,60 +11,34 @@
 #include <time.h>
 #include <check.h>
 
-#define N_EVENTS 10000
-
-UA_EventLoop *el;
-
-static void noopCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                         void **connectionContext, UA_StatusCode status,
-                         size_t paramsSize, const UA_KeyValuePair *params,
-                         UA_ByteString msg) {}
-
-START_TEST(listenUDP) {
-    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-
-    UA_UInt16 port = 4840;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
-    cm->connectionCallback = noopCallback;
-    UA_KeyValueMap_set(&cm->eventSource.params,
-                       &cm->eventSource.paramsSize,
-                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
-    el->registerEventSource(el, &cm->eventSource);
-
-    el->start(el);
-
-    for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-    }
-    int max_stop_iteration_count = 1000;
-    int iteration = 0;
-    /* Stop the EventLoop */
-    el->stop(el);
-    while(el->state != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        iteration++;
-    }
-    el->free(el);
-    el = NULL;
-} END_TEST
-
+static UA_EventLoop *el;
 static unsigned connCount;
 static char *testMsg = "open62541";
 static uintptr_t clientId;
 static UA_Boolean received;
+
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                   void **connectionContext, UA_StatusCode status,
+                   void *application, void **connectionContext,
+                   UA_StatusCode status,
                    size_t paramsSize, const UA_KeyValuePair *params,
                    UA_ByteString msg) {
-    if(*connectionContext != NULL)
-        clientId = connectionId;
+    if(status != UA_STATUSCODE_GOOD) {
+        UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                     "Closing connection %u", (unsigned)connectionId);
+    } else {
+        if(msg.length == 0) {
+            UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Opening connection %u", (unsigned)connectionId);
+        } else {
+            UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Received a message of length %u", (unsigned)msg.length);
+        }
+    }
+
     if(msg.length == 0 && status == UA_STATUSCODE_GOOD) {
         connCount++;
+        clientId = connectionId;
 
         /* The remote-hostname is set during the first callback */
         if(paramsSize > 0) {
@@ -87,59 +61,96 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 }
 
 static void
-illegalConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void **connectionContext, UA_StatusCode status,
+reenterConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_StatusCode status,
                           size_t paramsSize, const UA_KeyValuePair *params,
                           UA_ByteString msg) {
+    /* Try to reenter the eventloop. Must fail. */
     UA_StatusCode rv = el->run(el, 1);
     ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);
-    if(*connectionContext != NULL)
-        clientId = connectionId;
-    if(msg.length == 0 && status == UA_STATUSCODE_GOOD)
-        connCount++;
-    if(status != UA_STATUSCODE_GOOD)
-        connCount--;
-    if(msg.length > 0) {
-        UA_ByteString rcv = UA_BYTESTRING(testMsg);
-        ck_assert(UA_String_equal(&msg, &rcv));
-        received = true;
-    }
+
+    connectionCallback(cm, connectionId, application, connectionContext,
+                       status, paramsSize, params, msg);
 }
 
-START_TEST(runEventloopFailsIfCalledFromCallback) {
+START_TEST(listenUDP) {
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
 
     UA_UInt16 port = 4840;
     UA_Variant portVar;
     UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_KeyValuePair params[1];
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    params[0].value = portVar;
+
+    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+
+    ck_assert(connCount > 0);
+
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+
+    /* Stop the EventLoop */
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    el->free(el);
+    el = NULL;
+
+    ck_assert_uint_eq(connCount, 0);
+} END_TEST
+
+START_TEST(runEventloopFailsIfCalledFromCallback) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
-    cm->connectionCallback = illegalConnectionCallback;
-    UA_KeyValueMap_set(&cm->eventSource.params,
-                       &cm->eventSource.paramsSize,
-                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
     el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
 
     connCount = 0;
-    el->start(el);
+
+    UA_UInt16 port = 4840;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    params[0].value = portVar;
+
+    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+
+    size_t listenSockets = connCount;
 
     /* Open a client connection */
     clientId = 0;
 
     UA_String targetHost = UA_STRING("localhost");
-    UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "port");
     params[0].value = portVar;
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
+    UA_StatusCode retval = cm->openConnection(cm, 2, params, NULL, (void*)0x01,
+                                              reenterConnectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 10; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(clientId != 0);
-    ck_assert_uint_eq(connCount, 1);
+    ck_assert_uint_eq(connCount, listenSockets + 1);
 
     /* Send a message from the client */
     received = false;
@@ -149,7 +160,7 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     memcpy(snd.data, testMsg, strlen(testMsg));
     retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    for(size_t i = 0; i < 10; i++) {
+    for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
@@ -158,17 +169,17 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     /* Close the connection */
     retval = cm->closeConnection(cm, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(connCount, 1);
-    for(size_t i = 0; i < 10; i++) {
+    ck_assert_uint_eq(connCount, listenSockets + 1);
+    for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
-    ck_assert_uint_eq(connCount, 0);
+    ck_assert_uint_eq(connCount, listenSockets);
 
-    int max_stop_iteration_count = 1000;
-    int iteration = 0;
     /* Stop the EventLoop */
     el->stop(el);
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
     while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
           iteration < max_stop_iteration_count) {
         UA_DateTime next = el->run(el, 1);
@@ -177,42 +188,48 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     }
     el->free(el);
     el = NULL;
+
+    ck_assert_uint_eq(connCount, 0);
 } END_TEST
 
 START_TEST(connectUDP) {
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
 
     UA_UInt16 port = 30000;
     UA_Variant portVar;
     UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
-    cm->connectionCallback = connectionCallback;
-    UA_KeyValueMap_set(&cm->eventSource.params,
-                       &cm->eventSource.paramsSize,
-                       UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
-    el->registerEventSource(el, &cm->eventSource);
+
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    params[0].value = portVar;
 
     connCount = 0;
-    el->start(el);
+
+    UA_StatusCode retval =
+        cm->openConnection(cm, 1, params, NULL, (void*)0x01, connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    size_t listenSockets = connCount;
 
     /* Open a client connection */
     clientId = 0;
-
     UA_String targetHost = UA_STRING("localhost");
-    UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "port");
     params[0].value = portVar;
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    UA_StatusCode retval = cm->openConnection(cm, 2, params, (void*)0x01);
+    retval = cm->openConnection(cm, 2, params, NULL, (void*)0x01, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(clientId != 0);
-    ck_assert_uint_eq(connCount, 1);
+    ck_assert_uint_eq(connCount, listenSockets + 1);
 
     /* Send a message from the client */
     received = false;
@@ -231,17 +248,16 @@ START_TEST(connectUDP) {
     /* Close the connection */
     retval = cm->closeConnection(cm, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(connCount, 1);
+    ck_assert_uint_eq(connCount, listenSockets + 1);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
-    ck_assert_uint_eq(connCount, 0);
+    ck_assert_uint_eq(connCount, listenSockets);
 
     /* Stop the EventLoop */
     int max_stop_iteration_count = 10;
     int iteration = 0;
-    /* Stop the EventLoop */
     el->stop(el);
     while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
           iteration < max_stop_iteration_count) {
@@ -255,115 +271,110 @@ START_TEST(connectUDP) {
 } END_TEST
 
 START_TEST(udpTalkerAndListener) {
+    /* create listener eventloop */
+    UA_EventLoop *elListener = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    UA_ConnectionManager *cmListener = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    elListener->registerEventSource(elListener, &cmListener->eventSource);
+    elListener->start(elListener);
+
+    UA_EventLoop *elTalker = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    UA_ConnectionManager *cmTalker = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    elTalker->registerEventSource(elTalker, &cmTalker->eventSource);
+    elTalker->start(elTalker);
+
+    /* Open a listener connection */
+    UA_UInt16 port = 30000;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    params[0].value = portVar;
+    
+    connCount = 0;
 
-        /* create listener eventloop */
-        UA_EventLoop *elListener = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-
-        /* open a listener connection */
-        UA_UInt16 port = 30000;
-        UA_Variant portVar;
-        UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-        UA_ConnectionManager *cmListener = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
-        cmListener->connectionCallback = connectionCallback;
-        UA_KeyValueMap_set(&cmListener->eventSource.params,
-                           &cmListener->eventSource.paramsSize,
-                           UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
-        elListener->registerEventSource(elListener, &cmListener->eventSource);
-
-        connCount = 0;
-        elListener->start(elListener);
-
-        /* Open a talker connection */
-        /* create talker eventloop */
-        UA_EventLoop *elTalker = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-        clientId = 0;
-
-        UA_String targetHost = UA_STRING("localhost");
-        UA_KeyValuePair params[2];
-        params[0].key = UA_QUALIFIEDNAME(0, "port");
-        params[0].value = portVar;
-        params[1].key = UA_QUALIFIEDNAME(0, "hostname");
-        UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
-
-        UA_ConnectionManager *cmTalker = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
-
-        /* the cm talker should not need a connection callback */
-        cmTalker->connectionCallback = connectionCallback;
-        elTalker->registerEventSource(elTalker, &cmTalker->eventSource);
-        elTalker->start(elTalker);
-        UA_StatusCode retval = cmTalker->openConnection(cmTalker, 2, params, (void*)0x01);
-
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        for(size_t i = 0; i < 2; i++) {
-            UA_DateTime next = elListener->run(elListener, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        }
-        /* The listener el should not generate any connections */
-        ck_assert_uint_eq(connCount, 0);
-
-        /* The talker el should receive a signal "ready to be written on" */
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        for(size_t i = 0; i < 2; i++) {
-            UA_DateTime next = elTalker->run(elTalker, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        }
-        ck_assert_uint_eq(connCount, 1);
-
-        /* Send a message from the talker */
-        received = false;
-        UA_ByteString snd;
-        retval = cmTalker->allocNetworkBuffer(cmTalker, clientId, &snd, strlen(testMsg));
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        memcpy(snd.data, testMsg, strlen(testMsg));
-        retval = cmTalker->sendWithConnection(cmTalker, clientId, 0, NULL, &snd);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        for(size_t i = 0; i < 2; i++) {
-            UA_DateTime next = elListener->run(elListener, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        }
-        ck_assert(received);
-
-        /* Close the connection */
-        retval = cmTalker->closeConnection(cmTalker, clientId);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        ck_assert_uint_eq(connCount, 1);
-        for(size_t i = 0; i < 2; i++) {
-            UA_DateTime next = elTalker->run(elTalker, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        }
-        ck_assert_uint_eq(connCount, 0);
-
-        /* Stop the Talker EventLoop */
-        int max_stop_iteration_count = 10;
-        int iteration = 0;
-        /* Stop the EventLoop */
-        elTalker->stop(elTalker);
-        while(elTalker->state != UA_EVENTLOOPSTATE_STOPPED &&
-              iteration < max_stop_iteration_count) {
-            UA_DateTime next = elTalker->run(elTalker, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-            iteration++;
-        }
-        ck_assert(elTalker->state == UA_EVENTLOOPSTATE_STOPPED);
-        elTalker->free(elTalker);
-        elTalker = NULL;
-
-        /* Stop the Listener EventLoop */
-        max_stop_iteration_count = 10;
-        iteration = 0;
-        /* Stop the EventLoop */
-        elListener->stop(elListener);
-        while(elListener->state != UA_EVENTLOOPSTATE_STOPPED &&
-              iteration < max_stop_iteration_count) {
-            UA_DateTime next = elListener->run(elListener, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-            iteration++;
-        }
-        ck_assert(elListener->state == UA_EVENTLOOPSTATE_STOPPED);
-        elListener->free(elListener);
-        elListener = NULL;
+    UA_StatusCode retval =
+        cmListener->openConnection(cmListener, 1, params, NULL, (void*)0x01,
+                                   connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    size_t listenSockets = connCount;
+    
+    /* Open a talker connection */
+    clientId = 0;
+    
+    UA_String targetHost = UA_STRING("localhost");
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    params[0].value = portVar;
+    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+    
+    retval = cmTalker->openConnection(cmTalker, 2, params, NULL, (void*)0x01,
+                                      connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    
+    /* The talker el should receive a signal "ready to be written on" */
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = elTalker->run(elTalker, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_ne(clientId, 0);
+    ck_assert_uint_eq(connCount, listenSockets + 1);
+    
+    /* Send a message from the talker */
+    received = false;
+    UA_ByteString snd;
+    retval = cmTalker->allocNetworkBuffer(cmTalker, clientId, &snd, strlen(testMsg));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    memcpy(snd.data, testMsg, strlen(testMsg));
+    retval = cmTalker->sendWithConnection(cmTalker, clientId, 0, NULL, &snd);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = elListener->run(elListener, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(received);
+    
+    /* Close the connection */
+    retval = cmTalker->closeConnection(cmTalker, clientId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(connCount, listenSockets + 1);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = elTalker->run(elTalker, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_eq(connCount, listenSockets);
+    
+    /* Stop the Talker EventLoop */
+    int max_stop_iteration_count = 10;
+    int iteration = 0;
+    elTalker->stop(elTalker);
+    while(elTalker->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = elTalker->run(elTalker, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    ck_assert_int_eq(elTalker->state, UA_EVENTLOOPSTATE_STOPPED);
+    elTalker->free(elTalker);
+    elTalker = NULL;
+    
+    /* Stop the Listener EventLoop */
+    max_stop_iteration_count = 10;
+    iteration = 0;
+    elListener->stop(elListener);
+    while(elListener->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = elListener->run(elListener, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    ck_assert(elListener->state == UA_EVENTLOOPSTATE_STOPPED);
+    elListener->free(elListener);
+    elListener = NULL;
 
-    } END_TEST
+    ck_assert_uint_eq(connCount, 0);
+} END_TEST
 
 int main(void) {
     Suite *s  = suite_create("Test UDP EventLoop");

From b772b3b5b9881ca90280e371917f4b352fe4331a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 14:11:30 +0200
Subject: [PATCH 0096/1963] refactor(plugin): Remove small indirection in
 ua_config_default.c

---
 plugins/ua_config_default.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 2b4d275ae63..7527ed0b700 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -277,12 +277,6 @@ UA_ServerConfig_setBasics(UA_ServerConfig* conf) {
     return res;
 }
 
-static UA_StatusCode
-addDefaultNetworkLayers(UA_ServerConfig *conf, UA_UInt16 portNumber,
-                        UA_UInt32 sendBufferSize, UA_UInt32 recvBufferSize) {
-    return UA_ServerConfig_addNetworkLayerTCP(conf, portNumber, sendBufferSize, recvBufferSize);
-}
-
 #ifdef UA_ENABLE_WEBSOCKET_SERVER
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_addNetworkLayerWS(UA_ServerConfig *conf, UA_UInt16 portNumber,
@@ -468,7 +462,8 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
         return retval;
     }
 
-    retval = addDefaultNetworkLayers(config, portNumber, sendBufferSize, recvBufferSize);
+    retval = UA_ServerConfig_addNetworkLayerTCP(config, portNumber,
+                                                sendBufferSize, recvBufferSize);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(config);
         return retval;
@@ -718,7 +713,7 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
     if (retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    retval = addDefaultNetworkLayers(conf, portNumber, 0, 0);
+    retval = UA_ServerConfig_addNetworkLayerTCP(conf, portNumber, 0, 0);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
         return retval;

From aa0f1f58469a569463441b3d86d89b28601c7463 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 23:51:32 +0200
Subject: [PATCH 0097/1963] fix(el): Process delayed callbacks before listening
 on the network

Thus connections that are being stopped are already removed before
dropping into "select". This is necessary and was uncovered by the unit
tests.
---
 arch/eventloop_posix.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index f2a9be72f57..7ddc784fbe2 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -84,6 +84,9 @@ UA_EventLoopPOSIX_addDelayedCallback(UA_EventLoop *public_el,
 /* Process and then free registered delayed callbacks */
 static void
 processDelayed(UA_EventLoopPOSIX *el) {
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Process delayed callbacks");
+
     UA_LOCK_ASSERT(&el->elMutex, 1);
     while(el->delayedCallbacks) {
         UA_DelayedCallback *dc = el->delayedCallbacks;
@@ -199,9 +202,6 @@ static UA_StatusCode
 UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
     UA_LOCK(&el->elMutex);
 
-    UA_LOG_TRACE(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                 "Iterate the EventLoop");
-
     if(el->executing) {
         UA_LOG_ERROR(el->eventLoop.logger,
                      UA_LOGCATEGORY_EVENTLOOP,
@@ -221,6 +221,9 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    UA_LOG_TRACE(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "Iterate the EventLoop");
+
     /* Process cyclic callbacks */
     UA_DateTime dateBefore =
         el->eventLoop.dateTime_nowMonotonic(&el->eventLoop);
@@ -231,6 +234,9 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
                          timerExecutionTrampoline, NULL);
     UA_LOCK(&el->elMutex);
 
+    processDelayed(el); /* Process delayed callbacks. Remove closed sockets
+                         * already here instead of calling select for them. */
+
     /* Compute the remaining time */
     UA_DateTime maxDate = dateBefore + (timeout * UA_DATETIME_MSEC);
     if(dateNext > maxDate)
@@ -244,8 +250,7 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
      * ConnectionManagers */
     UA_StatusCode rv = UA_EventLoopPOSIX_pollFDs(el, listenTimeout);
 
-    /* Process and then free registered delayed callbacks */
-    processDelayed(el);
+    processDelayed(el); /* Process delayed callbacks */
 
     /* Check if the last EventSource was successfully stopped */
     if(el->eventLoop.state == UA_EVENTLOOPSTATE_STOPPING)

From d0245dd385ba4d1dbebaa08b3eda5dc6c6a24bc5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Apr 2022 11:02:38 +0200
Subject: [PATCH 0098/1963] refactor(el): Remove redundant call to getnameinfo

---
 arch/eventloop_posix_tcp.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index c96369a094c..263d7a2cf0b 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -275,15 +275,10 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     int get_res = UA_getnameinfo((struct sockaddr *)&remote, sizeof(remote),
                                  hoststr, sizeof(hoststr), NULL, 0, 0);
     if(get_res != 0) {
-        get_res = UA_getnameinfo((struct sockaddr *)&remote, sizeof(remote),
-                                 hoststr, sizeof(hoststr), NULL, 0, NI_NUMERICHOST);
-        if(get_res != 0) {
-            hoststr[0] = 0;
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                               "TCP %u\t| getnameinfo(...) could not resolve the "
-                               "hostname (%s)", (unsigned)rfd->fd, errno_str));
-        }
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                          "TCP %u\t| getnameinfo(...) could not resolve the "
+                          "hostname (%s)", (unsigned)rfd->fd, errno_str));
     }
     UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| Connection opened from \"%s\" via the server socket %u",

From 37aa239bee4e0f923d68f5637115d11ce9b682e4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 16:24:29 +0200
Subject: [PATCH 0099/1963] feat(server): Add the TCP connection settings to
 the server config

---
 include/open62541/server.h             |  7 ++++++-
 src/server/ua_services_securechannel.c | 25 ++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 172cc29d727..d8c0c292318 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -162,11 +162,16 @@ struct UA_ServerConfig {
     /**
      * Networking
      * ^^^^^^^^^^ */
-
     size_t networkLayersSize;
     UA_ServerNetworkLayer *networkLayers;
     UA_String customHostname;
 
+    /* TCP server socket parameters*/
+    UA_UInt16 tcpListenPort; /* Port to listen for new connections (default: 4840) */
+    UA_UInt32 tcpBufSize;    /* Maximum size of sent and received chunks (default: 64kB) */
+    UA_UInt32 tcpMaxMsgSize; /* Maximum size of messages (default: 0 -> unbounded) */
+    UA_UInt32 tcpMaxChunks;  /* Maximum size of sent message (default: 0 -> unbounded) */
+
     /**
      * Security and Encryption
      * ^^^^^^^^^^^^^^^^^^^^^^^ */
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index 4e6d2bfcab5..ffe6d6f983f 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -154,11 +154,13 @@ UA_Server_createSecureChannel(UA_Server *server, UA_Connection *connection) {
     if(connection->channel != NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
 
+    UA_ServerConfig *config = &server->config;
+
     /* Check if there exists a free SC, otherwise try to purge one SC without a
      * session the purge has been introduced to pass CTT, it is not clear what
      * strategy is expected here */
     if((server->secureChannelStatistics.currentChannelCount >=
-        server->config.maxSecureChannels) &&
+        config->maxSecureChannels) &&
        !purgeFirstChannelWithoutSession(server))
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
@@ -166,11 +168,24 @@ UA_Server_createSecureChannel(UA_Server *server, UA_Connection *connection) {
     if(!entry)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
+    /* Set up the initial connection config */
+    UA_ConnectionConfig connConfig;
+    connConfig.protocolVersion = 0;
+    connConfig.recvBufferSize = config->tcpBufSize;
+    connConfig.sendBufferSize = config->tcpBufSize;
+    connConfig.localMaxMessageSize = config->tcpMaxMsgSize;
+    connConfig.remoteMaxMessageSize = config->tcpMaxMsgSize;
+    connConfig.localMaxChunkCount = config->tcpMaxChunks;
+    connConfig.remoteMaxChunkCount = config->tcpMaxChunks;
+
+    if(connConfig.recvBufferSize == 0)
+        connConfig.recvBufferSize = 1 << 16; /* 64kB */
+    if(connConfig.sendBufferSize == 0)
+        connConfig.sendBufferSize = 1 << 16; /* 64kB */
+
     /* Channel state is closed (0) */
-    /* TODO: Use the connection config from the correct network layer */
-    UA_SecureChannel_init(&entry->channel,
-                          &server->config.networkLayers[0].localConnectionConfig);
-    entry->channel.certificateVerification = &server->config.certificateVerification;
+    UA_SecureChannel_init(&entry->channel, &connConfig);
+    entry->channel.certificateVerification = &config->certificateVerification;
     entry->channel.processOPNHeader = UA_Server_configSecureChannel;
 
     TAILQ_INSERT_TAIL(&server->channels, entry, pointers);

From 41f0d7f71525ebc0e85ac31b43069ded55b3b1cb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 16:26:16 +0200
Subject: [PATCH 0100/1963] feat(el): EventSources from an EventLoop visible in
 the public API

---
 arch/eventloop_posix.c               | 33 +++++++---------------------
 arch/eventloop_posix.h               |  3 ---
 include/open62541/plugin/eventloop.h | 16 ++++++++------
 3 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 7ddc784fbe2..87e44e2be1e 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -130,7 +130,7 @@ UA_EventLoopPOSIX_start(UA_EventLoopPOSIX *el) {
 #endif
 
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    UA_EventSource *es = el->eventSources;
+    UA_EventSource *es = el->eventLoop.eventSources;
     while(es) {
         UA_UNLOCK(&el->elMutex);
         res |= es->start(es);
@@ -148,7 +148,7 @@ UA_EventLoopPOSIX_start(UA_EventLoopPOSIX *el) {
 
 static void
 checkClosed(UA_EventLoopPOSIX *el) {
-    UA_EventSource *es = el->eventSources;
+    UA_EventSource *es = el->eventLoop.eventSources;
     while(es) {
         if(es->state != UA_EVENTSOURCESTATE_STOPPED)
             return;
@@ -183,7 +183,7 @@ UA_EventLoopPOSIX_stop(UA_EventLoopPOSIX *el) {
                 "Stopping the EventLoop");
 
     /* Shutdown all event sources. This closes open connections. */
-    UA_EventSource *es = el->eventSources;
+    UA_EventSource *es = el->eventLoop.eventSources;
     while(es) {
         if(es->state == UA_EVENTSOURCESTATE_STARTING ||
            es->state == UA_EVENTSOURCESTATE_STARTED)
@@ -279,8 +279,8 @@ UA_EventLoopPOSIX_registerEventSource(UA_EventLoopPOSIX *el,
 
     /* Add to linked list */
     UA_LOCK(&el->elMutex);
-    es->next = el->eventSources;
-    el->eventSources = es;
+    es->next = el->eventLoop.eventSources;
+    el->eventLoop.eventSources = es;
     UA_UNLOCK(&el->elMutex);
 
     es->eventLoop = &el->eventLoop;
@@ -305,7 +305,7 @@ UA_EventLoopPOSIX_deregisterEventSource(UA_EventLoopPOSIX *el,
 
     /* Remove from the linked list */
     UA_LOCK(&el->elMutex);
-    UA_EventSource **s = &el->eventSources;
+    UA_EventSource **s = &el->eventLoop.eventSources;
     while(*s) {
         if(*s == es) {
             *s = es->next;
@@ -321,20 +321,6 @@ UA_EventLoopPOSIX_deregisterEventSource(UA_EventLoopPOSIX *el,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_EventSource *
-UA_EventLoopPOSIX_findEventSource(UA_EventLoopPOSIX *el,
-                                  const UA_String name) {
-    UA_LOCK(&el->elMutex);
-    UA_EventSource *s = el->eventSources;
-    while(s) {
-        if(UA_String_equal(&name, &s->name))
-            break;
-        s = s->next;
-    }
-    UA_UNLOCK(&el->elMutex);
-    return s;
-}
-
 /***************/
 /* Time Domain */
 /***************/
@@ -375,8 +361,8 @@ UA_EventLoopPOSIX_free(UA_EventLoopPOSIX *el) {
     }
 
     /* Deregister and delete all the EventSources */
-    while(el->eventSources) {
-        UA_EventSource *es = el->eventSources;
+    while(el->eventLoop.eventSources) {
+        UA_EventSource *es = el->eventLoop.eventSources;
         UA_UNLOCK(&el->elMutex);
         UA_EventLoopPOSIX_deregisterEventSource(el, es);
         UA_LOCK(&el->elMutex);
@@ -444,9 +430,6 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger) {
     el->eventLoop.deregisterEventSource =
         (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))
         UA_EventLoopPOSIX_deregisterEventSource;
-    el->eventLoop.findEventSource =
-        (UA_EventSource* (*)(UA_EventLoop*, const UA_String))
-        UA_EventLoopPOSIX_findEventSource;
 
     return &el->eventLoop;
 }
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 20d215ec41d..60b424e83fe 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -68,9 +68,6 @@ typedef struct {
     /* Linked List of Delayed Callbacks */
     UA_DelayedCallback *delayedCallbacks;
 
-    /* Pointers to registered EventSources */
-    UA_EventSource *eventSources;
-
     /* Flag determining whether the eventloop is currently within the
      * "run" method */
     UA_Boolean executing;
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 6cf9531ea8d..2d0f4d24bab 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -147,8 +147,15 @@ struct UA_EventLoop {
 
     void (*addDelayedCallback)(UA_EventLoop *el, UA_DelayedCallback *dc);
 
-    /* Manage EventSources
-     * ~~~~~~~~~~~~~~~~~~~ */
+    /* EventSources
+     * ~~~~~~~~~~~~
+     * EventSources are stored in a singly-linked list for direct access. But
+     * only the below methods shall be used for adding and removing - this
+     * impacts the lifecycle of the EventSource. For example it may be
+     * auto-started if the EventLoop is already running. */
+
+    /* Linked list of EventSources */
+    UA_EventSource *eventSources;
 
     /* Register the ES. Immediately starts the ES if the EventLoop is already
      * started. Otherwise the ES is started together with the EventLoop. */
@@ -158,11 +165,6 @@ struct UA_EventLoop {
     /* Stops the EventSource before deregistrering it */
     UA_StatusCode
     (*deregisterEventSource)(UA_EventLoop *el, UA_EventSource *es);
-
-    /* Look up the EventSource by name. Returns the first EventSource of that
-     * name (duplicates should be avoided). */
-    UA_EventSource *
-    (*findEventSource)(UA_EventLoop *el, const UA_String name);
 };
 
 /**

From 3881cf17f9398fb8ee982b828b5cb804eda3be9a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 16:31:32 +0200
Subject: [PATCH 0101/1963] refactor(server): Directly use the EventLoop for
 the server TCP sockets

---
 include/open62541/server.h         |  11 +-
 plugins/ua_config_default.c        |  31 +----
 src/server/ua_server.c             | 209 ++++++++++++++++++++---------
 src/server/ua_server_config.c      |  12 --
 src/server/ua_server_internal.h    |  24 ++++
 src/server/ua_services_discovery.c |  46 +++----
 src/ua_connection.c                |  85 +++---------
 src/ua_connection_internal.h       |  14 --
 tests/fuzz/corpus_generator.c      |   6 +-
 9 files changed, 221 insertions(+), 217 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index d8c0c292318..52c413c1aef 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -156,17 +156,14 @@ struct UA_ServerConfig {
     UA_EventLoop *eventLoop;
     UA_Boolean externalEventLoop; /* The EventLoop is not deleted with the config */
 
-    size_t connectionManagersSize;
-    UA_ConnectionManager *connectionManagers[10];
-
     /**
      * Networking
      * ^^^^^^^^^^ */
-    size_t networkLayersSize;
-    UA_ServerNetworkLayer *networkLayers;
-    UA_String customHostname;
+    size_t connectionManagersSize;
+    UA_ConnectionManager *connectionManagers[10];
 
-    /* TCP server socket parameters*/
+    /* TCP server socket parameters */
+    /* TODO: UA_String *tcpListenHostnames; */
     UA_UInt16 tcpListenPort; /* Port to listen for new connections (default: 4840) */
     UA_UInt32 tcpBufSize;    /* Maximum size of sent and received chunks (default: 64kB) */
     UA_UInt32 tcpMaxMsgSize; /* Maximum size of messages (default: 0 -> unbounded) */
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 7527ed0b700..c9c87b4d508 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -308,36 +308,15 @@ UA_ServerConfig_addNetworkLayerWS(UA_ServerConfig *conf, UA_UInt16 portNumber,
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_addNetworkLayerTCP(UA_ServerConfig *conf, UA_UInt16 portNumber,
                                    UA_UInt32 sendBufferSize, UA_UInt32 recvBufferSize) {
-    /* Add a network layer */
-    UA_ServerNetworkLayer *tmp = (UA_ServerNetworkLayer *)
-        UA_realloc(conf->networkLayers,
-                   sizeof(UA_ServerNetworkLayer) * (1 + conf->networkLayersSize));
-    if(!tmp)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    conf->networkLayers = tmp;
-
-    UA_ConnectionConfig config = UA_ConnectionConfig_default;
-    if (sendBufferSize > 0)
-        config.sendBufferSize = sendBufferSize;
-    if (recvBufferSize > 0)
-        config.recvBufferSize = recvBufferSize;
-
-    conf->networkLayers[conf->networkLayersSize] =
-        UA_ServerNetworkLayerTCP(config, portNumber, 0);
-    if (!conf->networkLayers[conf->networkLayersSize].handle)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    conf->networkLayersSize++;
-
-    /* TCP Eventsource */
-
+    /* Create the TCP Eventsource */
     UA_ConnectionManager *tcpCM = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
     conf->connectionManagers[conf->connectionManagersSize] = tcpCM;
-    UA_UInt16 port = portNumber;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_KeyValueMap_set(&tcpCM->eventSource.params, &tcpCM->eventSource.paramsSize, UA_QUALIFIEDNAME(0, "listen-port"), &portVar);
     conf->connectionManagersSize++;
 
+    conf->tcpBufSize = recvBufferSize;
+    conf->tcpListenPort = portNumber;
+
+    /* Register (and possibly start) the event source */
     conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *) tcpCM);
 
     return UA_STATUSCODE_GOOD;
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 92cad4b2606..d3426052174 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -550,40 +550,88 @@ UA_Server_getStatistics(UA_Server *server) {
     return stat;
 }
 
-/**************************/
-/* Setup Server EventLoop */
-/**************************/
-
-static
-UA_StatusCode
-UA_Server_setupEventLoop(UA_Server *server) {
-    UA_Server_BasicConnectionContext *ctx = (UA_Server_BasicConnectionContext*)
-        UA_malloc(sizeof(UA_Server_BasicConnectionContext));
-    memset(ctx, 0, sizeof(UA_Server_BasicConnectionContext));
-    UA_CHECK_MEM(ctx, return UA_STATUSCODE_BADOUTOFMEMORY);
-
-    ctx->server = server;
-    ctx->isInitial = true;
-
-    /* Choose the first "tcp" ConnectionManager from the config */
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ConnectionManager *tcpCM = NULL;
-    UA_String tcpName = UA_STRING("tcp");
-    for(size_t i = 0; i < config->connectionManagersSize; i++) {
-        if(UA_String_equal(&config->connectionManagers[i]->protocol, &tcpName)) {
-            tcpCM = config->connectionManagers[i];
-            break;
+/* Callback of a TCP socket (server socket or an active connection) */
+static void
+UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_StatusCode state,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          UA_ByteString msg) {
+    UA_Server *server = (UA_Server*)application;
+
+    /* A server socket that is not registered in the server */
+    if(*connectionContext == NULL) {
+        if(state != UA_STATUSCODE_GOOD)
+            return; /* Closing an unregistered server socket */
+
+        /* Cannot register */
+        if(server->serverConnectionsSize >= UA_MAXSERVERCONNECTIONS) {
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "Cannot register server socket - too many already open");
+            cm->closeConnection(cm, connectionId);
+            return;
         }
+
+        /* Find and use a free connection slot */
+        server->serverConnectionsSize++;
+        UA_ServerConnection *sc = server->serverConnections;
+        while(sc->connectionId != 0)
+            sc++;
+        sc->state = UA_SERVERCONNECTIONSTATE_STARTED;
+        sc->connectionId = connectionId;
+        sc->connectionManager = cm;
+        *connectionContext = (void*)sc; /* Set the context pointer in the connection */
+        return;
     }
-    if(!tcpCM) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "No TCP ConnectionManager found in the configuration");
-        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ServerConnection *sc = (UA_ServerConnection*)*connectionContext;
+    UA_Connection *conn = (UA_Connection*)*connectionContext;
+    UA_Boolean serverSocket = (sc >= server->serverConnections &&
+                               sc < &server->serverConnections[UA_MAXSERVERCONNECTIONS]);
+
+    if(state != UA_STATUSCODE_GOOD) {
+        if(serverSocket) {
+            /* A server socket is closing */
+            sc->state = UA_SERVERCONNECTIONSTATE_FRESH;
+            sc->connectionId = 0;
+            server->serverConnectionsSize--;
+        } else {
+            /* A normal connection is closing */
+            if(conn->channel)
+                UA_SecureChannel_close(conn->channel);
+            UA_free(conn);
+        }
+        return;
     }
 
-    ctx->cm = tcpCM;
+    /* A new connection is opening - still has the pointer to the serversocket */
+    if(serverSocket) {
+        conn = (UA_Connection*)UA_malloc(sizeof(UA_Connection));
+        if(!conn) {
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "Could not accept the connection - out of memory");
+            cm->closeConnection(cm, connectionId);
+            return;
+        }
 
-    return UA_STATUSCODE_GOOD;
+        conn->state = UA_CONNECTIONSTATE_OPENING;
+        conn->channel = NULL;
+        conn->sockfd = (UA_SOCKET)connectionId;
+        conn->handle = cm;
+        conn->getSendBuffer = UA_Server_Connection_getSendBuffer;
+        conn->releaseSendBuffer = UA_Server_Connection_releaseBuffer;
+        conn->send = UA_Server_Connection_send;
+        conn->recv = NULL;
+        conn->releaseRecvBuffer = UA_Server_Connection_releaseBuffer;
+        conn->close = UA_Server_Connection_close;
+        conn->free = NULL;
+
+        *connectionContext = (void*)conn;
+        return;
+    }
+
+    /* Received a message on a normal connection */
+    UA_Server_processBinaryMessage(server, conn, &msg);
 }
 
 /********************/
@@ -601,21 +649,63 @@ UA_Server_setupEventLoop(UA_Server *server) {
 
 UA_StatusCode
 UA_Server_run_startup(UA_Server *server) {
+    UA_ServerConfig *config = &server->config;
 
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-    /* Prominently warn user that fuzzing build is enabled. This will tamper with authentication tokens and other important variables
-     * E.g. if fuzzing is enabled, and two clients are connected, subscriptions do not work properly,
-     * since the tokens will be overridden to allow easier fuzzing. */
+    /* Prominently warn user that fuzzing build is enabled. This will tamper
+     * with authentication tokens and other important variables E.g. if fuzzing
+     * is enabled, and two clients are connected, subscriptions do not work
+     * properly, since the tokens will be overridden to allow easier fuzzing. */
     UA_LOG_FATAL(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "Server was built with unsafe fuzzing mode. "
                  "This should only be used for specific fuzzing builds.");
 #endif
 
-    UA_StatusCode retVal = UA_Server_setupEventLoop(server);
+    /* Start the EventLoop */
+    UA_StatusCode retVal = config->eventLoop->start(config->eventLoop);
     UA_CHECK_STATUS(retVal, return retVal);
 
-    retVal = server->config.eventLoop->start(server->config.eventLoop);
-    UA_CHECK_STATUS(retVal, return retVal);
+    /* Open a server connection. Try all "tcp" ConnectionManagers until the
+     * first one that works. */
+    UA_String tcpString = UA_STRING("tcp");
+    UA_Boolean haveServerSocket = false;
+    for(UA_EventSource *es = config->eventLoop->eventSources;
+        es != NULL; es = es->next) {
+        /* Is this a usable connection manager? */
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+        if(!UA_String_equal(&tcpString, &cm->protocol))
+            continue;
+
+        /* Set up the parameters */
+        UA_KeyValuePair params[2];
+
+        UA_UInt16 listenPort = config->tcpListenPort;
+        if(listenPort == 0)
+            listenPort = 4840;
+        params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+        UA_Variant_setScalar(&params[0].value, &listenPort, &UA_TYPES[UA_TYPES_UINT16]);
+
+        UA_UInt32 bufSize = config->tcpBufSize;
+        if(bufSize == 0)
+            bufSize = 1 << 16; /* 64kB */
+        params[1].key = UA_QUALIFIEDNAME(0, "recv-bufsize");
+        UA_Variant_setScalar(&params[1].value, &bufSize, &UA_TYPES[UA_TYPES_UINT32]);
+
+        /* Open the server connection */
+        retVal = cm->openConnection(cm, 2, params, server, NULL, UA_Server_networkCallback);
+        if(retVal == UA_STATUSCODE_GOOD) {
+            haveServerSocket = true;
+            break;
+        }
+    }
+
+    /* Warn if no socket available */
+    if(!haveServerSocket) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "The server has no server socket");
+    }
 
     /* ensure that the uri for ns1 is set up from the app description */
     setupNs1Uri(server);
@@ -655,15 +745,6 @@ UA_Server_run_startup(UA_Server *server) {
                          UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STARTTIME),
                          var);
 
-    /* Start the networklayers */
-    UA_StatusCode result = UA_STATUSCODE_GOOD;
-    for(size_t i = 0; i < server->config.networkLayersSize; ++i) {
-        UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
-        nl->statistics = &server->networkStatistics;
-        result |= nl->start(nl, &server->config.logger, &server->config.customHostname);
-    }
-    UA_CHECK_STATUS(result, return result);
-
     /* Update the application description to match the previously added
      * discovery urls. We can only do this after the network layer is started
      * since it inits the discovery url */
@@ -673,18 +754,19 @@ UA_Server_run_startup(UA_Server *server) {
                         &UA_TYPES[UA_TYPES_STRING]);
         server->config.applicationDescription.discoveryUrlsSize = 0;
     }
-    server->config.applicationDescription.discoveryUrls = (UA_String *)
-        UA_Array_new(server->config.networkLayersSize, &UA_TYPES[UA_TYPES_STRING]);
-    UA_CHECK_MEM(server->config.applicationDescription.discoveryUrls,
-             return UA_STATUSCODE_BADOUTOFMEMORY);
-
-    server->config.applicationDescription.discoveryUrlsSize =
-        server->config.networkLayersSize;
-    for(size_t i = 0; i < server->config.applicationDescription.discoveryUrlsSize; i++) {
-        UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
-        UA_String_copy(&nl->discoveryUrl,
-                       &server->config.applicationDescription.discoveryUrls[i]);
-    }
+
+    /* server->config.applicationDescription.discoveryUrls = (UA_String *) */
+    /*     UA_Array_new(server->config.networkLayersSize, &UA_TYPES[UA_TYPES_STRING]); */
+    /* UA_CHECK_MEM(server->config.applicationDescription.discoveryUrls, */
+    /*          return UA_STATUSCODE_BADOUTOFMEMORY); */
+
+    /* server->config.applicationDescription.discoveryUrlsSize = */
+    /*     server->config.networkLayersSize; */
+    /* for(size_t i = 0; i < server->config.applicationDescription.discoveryUrlsSize; i++) { */
+    /*     UA_ServerNetworkLayer *nl = &server->config.networkLayers[i]; */
+    /*     UA_String_copy(&nl->discoveryUrl, */
+    /*                    &server->config.applicationDescription.discoveryUrls[i]); */
+    /* } */
 
     /* Start the multicast discovery server */
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
@@ -701,7 +783,7 @@ UA_Server_run_startup(UA_Server *server) {
 
     server->state = UA_SERVERLIFECYCLE_FRESH;
 
-    return result;
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_UInt16
@@ -766,13 +848,18 @@ allEventSourcesStopped(UA_ConnectionManager** sources, size_t count) {
 
 UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server) {
+    /* Stop all SecureChannels */
+    UA_Server_deleteSecureChannels(server);
 
-    /* Stop the netowrk layer */
-    for(size_t i = 0; i < server->config.networkLayersSize; ++i) {
-        UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
-        nl->stop(nl, server);
+    /* Stop all server sockets */
+    for(size_t i = 0; i < UA_MAXSERVERCONNECTIONS; i++) {
+        UA_ServerConnection *sc = &server->serverConnections[i];
+        if(sc->connectionId > 0)
+            sc->connectionManager->
+                closeConnection(sc->connectionManager, sc->connectionId);
     }
 
+    /* Stop the eventsources associated with the server */
     for(size_t i = 0; i < server->config.connectionManagersSize; ++i) {
         UA_ConnectionManager *cm = server->config.connectionManagers[i];
         if(cm->eventSource.eventLoop != NULL) {
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 1fff38b76d0..0f830f507c6 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -26,9 +26,6 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 # endif
 #endif
 
-    /* Custom DataTypes */
-    /* nothing to do */
-
     /* Stop and delete the EventLoop */
     UA_EventLoop *el = config->eventLoop;
     if(el && !config->externalEventLoop) {
@@ -43,15 +40,6 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
         config->eventLoop = NULL;
     }
 
-    /* Networking */
-    for(size_t i = 0; i < config->networkLayersSize; ++i)
-        config->networkLayers[i].clear(&config->networkLayers[i]);
-    UA_free(config->networkLayers);
-    config->networkLayers = NULL;
-    config->networkLayersSize = 0;
-    UA_String_clear(&config->customHostname);
-    config->customHostname = UA_STRING_NULL;
-
     for(size_t i = 0; i < config->securityPoliciesSize; ++i) {
         UA_SecurityPolicy *policy = &config->securityPolicies[i];
         policy->clear(policy);
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 9c5fd771a1a..442ec699196 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -85,14 +85,38 @@ typedef enum {
     UA_SERVERLIFECYCLE_STOPPING
 } UA_ServerLifecycle;
 
+typedef enum {
+    UA_SERVERCONNECTIONSTATE_FRESH,
+    UA_SERVERCONNECTIONSTATE_STOPPED,
+    UA_SERVERCONNECTIONSTATE_STARTING,
+    UA_SERVERCONNECTIONSTATE_STARTED,
+    UA_SERVERCONNECTIONSTATE_STOPPING
+} UA_ServerConnectionState;
+
+/* Maximum numbers of sockets to listen on */
+#define UA_MAXSERVERCONNECTIONS 16
+
+typedef struct {
+    UA_ServerConnectionState state;
+    uintptr_t connectionId;
+    UA_ConnectionManager *connectionManager;
+} UA_ServerConnection;
+
 struct UA_Server {
     /* Config */
     UA_ServerConfig config;
+
+    /* Runtime state */
     UA_DateTime startTime;
     UA_DateTime endTime; /* Zeroed out. If a time is set, then the server shuts
                           * down once the time has been reached */
 
     UA_ServerLifecycle state;
+    UA_ServerConnection serverConnections[UA_MAXSERVERCONNECTIONS];
+    size_t serverConnectionsSize;
+
+    UA_ConnectionConfig tcpConnectionConfig; /* Extracted from the server config
+                                              * parameters */
 
     /* SecureChannels */
     TAILQ_HEAD(, channel_entry) channels;
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index c55a9aabbec..0f73e301a3f 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -100,22 +100,22 @@ setApplicationDescriptionFromServer(UA_ApplicationDescription *target,
 
     /* Add the discoveryUrls from the networklayers only if discoveryUrl
      * not already present and to avoid redundancy */
-    if(!target->discoveryUrlsSize) {
-        size_t existing = target->discoveryUrlsSize;
-        result =
-            UA_Array_resize((void**)&target->discoveryUrls,
-                            &target->discoveryUrlsSize,
-                            target->discoveryUrlsSize + server->config.networkLayersSize,
-                            &UA_TYPES[UA_TYPES_STRING]);
-        target->discoveryUrlsSize += server->config.networkLayersSize;
-        if(result != UA_STATUSCODE_GOOD)
-            return result;
-
-        for(size_t i = 0; i < server->config.networkLayersSize; i++) {
-            UA_ServerNetworkLayer* nl = &server->config.networkLayers[i];
-            UA_String_copy(&nl->discoveryUrl, &target->discoveryUrls[existing + i]);
-        }
-    }
+    /* if(!target->discoveryUrlsSize) { */
+    /*     size_t existing = target->discoveryUrlsSize; */
+    /*     result = */
+    /*         UA_Array_resize((void**)&target->discoveryUrls, */
+    /*                         &target->discoveryUrlsSize, */
+    /*                         target->discoveryUrlsSize + server->config.networkLayersSize, */
+    /*                         &UA_TYPES[UA_TYPES_STRING]); */
+    /*     target->discoveryUrlsSize += server->config.networkLayersSize; */
+    /*     if(result != UA_STATUSCODE_GOOD) */
+    /*         return result; */
+
+    /*     for(size_t i = 0; i < server->config.networkLayersSize; i++) { */
+    /*         UA_ServerNetworkLayer* nl = &server->config.networkLayers[i]; */
+    /*         UA_String_copy(&nl->discoveryUrl, &target->discoveryUrls[existing + i]); */
+    /*     } */
+    /* } */
 
     return UA_STATUSCODE_GOOD;
 }
@@ -225,11 +225,11 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
 
     /* Clone the endpoint for each networklayer? */
     size_t clone_times = 1;
-    UA_Boolean nl_endpointurl = false;
-    if(endpointUrl->length == 0) {
-        clone_times = server->config.networkLayersSize;
-        nl_endpointurl = true;
-    }
+    /* UA_Boolean nl_endpointurl = false; */
+    /* if(endpointUrl->length == 0) { */
+    /*     clone_times = server->config.networkLayersSize; */
+    /*     nl_endpointurl = true; */
+    /* } */
 
     /* Allocate enough memory */
     response->endpoints = (UA_EndpointDescription*)
@@ -267,8 +267,8 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
                             &UA_TYPES[UA_TYPES_STRING]);
             response->endpoints[pos].server.discoveryUrls = NULL;
             response->endpoints[pos].server.discoveryUrlsSize = 0;
-            if(nl_endpointurl)
-                endpointUrl = &server->config.networkLayers[i].discoveryUrl;
+            /* if(nl_endpointurl) */
+            /*     endpointUrl = &server->config.networkLayers[i].discoveryUrl; */
             retval |= UA_String_copy(endpointUrl, &response->endpoints[pos].endpointUrl);
             retval |= UA_Array_copy(endpointUrl, 1,
                                     (void**)&response->endpoints[pos].server.discoveryUrls,
diff --git a/src/ua_connection.c b/src/ua_connection.c
index 8ffbe87053a..0e1a759c98a 100644
--- a/src/ua_connection.c
+++ b/src/ua_connection.c
@@ -80,81 +80,26 @@ UA_Connection_attachSecureChannel(UA_Connection *connection, UA_SecureChannel *c
         UA_atomic_xchg((void**)&connection->channel, (void*)channel);
 }
 
-UA_StatusCode UA_Server_Connection_getSendBuffer(UA_Connection *connection, size_t length,
-                                                        UA_ByteString *buf) {
-    UA_Server_ConnectionContext *ctx = (UA_Server_ConnectionContext *) connection->handle;
-    UA_ConnectionManager *cm = ((UA_Server_BasicConnectionContext *)ctx)->cm;
-    return cm->allocNetworkBuffer(cm, ctx->connectionId, buf, length);
+UA_StatusCode
+UA_Server_Connection_getSendBuffer(UA_Connection *connection, size_t length,
+                                   UA_ByteString *buf) {
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
+    return cm->allocNetworkBuffer(cm, (uintptr_t)connection->sockfd, buf, length);
 }
 
-UA_StatusCode UA_Server_Connection_send(UA_Connection *connection, UA_ByteString *buf) {
-    UA_Server_ConnectionContext *ctx = (UA_Server_ConnectionContext *) connection->handle;
-    UA_ConnectionManager *cm = ((UA_Server_BasicConnectionContext *)ctx)->cm;
-
-    return cm->sendWithConnection(cm, ctx->connectionId, 0, NULL, buf);
+UA_StatusCode
+UA_Server_Connection_send(UA_Connection *connection, UA_ByteString *buf) {
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
+    return cm->sendWithConnection(cm, (uintptr_t)connection->sockfd, 0, NULL, buf);
 }
 
-void UA_Server_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf) {
-    UA_Server_ConnectionContext *ctx = (UA_Server_ConnectionContext *) connection->handle;
-    UA_ConnectionManager *cm = ((UA_Server_BasicConnectionContext *)ctx)->cm;
-    cm->freeNetworkBuffer(cm, ctx->connectionId, buf);
+void
+UA_Server_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf) {
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
+    cm->freeNetworkBuffer(cm, (uintptr_t)connection->sockfd, buf);
 }
 
 void UA_Server_Connection_close(UA_Connection *connection) {
-    UA_Server_ConnectionContext *ctx = (UA_Server_ConnectionContext *) connection->handle;
-    UA_ConnectionManager *cm = ((UA_Server_BasicConnectionContext *)ctx)->cm;
-    cm->closeConnection(cm, ctx->connectionId);
-}
-
-void
-UA_Server_connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                             void **connectionContext, UA_StatusCode stat,
-                             size_t paramsSize, const UA_KeyValuePair *params,
-                             UA_ByteString msg) {
-
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_SERVER,
-                 "connection callback for id: %lu", (unsigned long) connectionId);
-
-    UA_Server_BasicConnectionContext *ctx = (UA_Server_BasicConnectionContext *) *connectionContext;
-
-    if (stat != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_SERVER, "closing connection");
-
-        if (!ctx->isInitial) {
-
-            UA_Server_ConnectionContext *serverctx = (UA_Server_ConnectionContext *) ctx;
-            /* Instead of removing the complete connection just detach the secure channel */
-            /* TODO: check if UA_Server_removeConnection is public api */
-            /* UA_Server_removeConnection(ctx->server, &serverctx->connection); */
-            UA_Connection_detachSecureChannel(&serverctx->connection);
-            free(*connectionContext);
-        }
-        return;
-    }
-
-    if (ctx->isInitial) {
-        UA_Server_ConnectionContext *newCtx = (UA_Server_ConnectionContext*) calloc(1, sizeof(UA_Server_ConnectionContext));
-        newCtx->base.isInitial = false;
-        newCtx->base.cm = ctx->cm;
-        newCtx->base.server = ctx->server;
-        newCtx->connectionId = connectionId;
-        newCtx->connection.close = UA_Server_Connection_close;
-        newCtx->connection.free = NULL;
-        newCtx->connection.getSendBuffer = UA_Server_Connection_getSendBuffer;
-        newCtx->connection.recv = NULL;
-        newCtx->connection.releaseRecvBuffer = UA_Server_Connection_releaseBuffer;
-        newCtx->connection.releaseSendBuffer = UA_Server_Connection_releaseBuffer;
-        newCtx->connection.send = UA_Server_Connection_send;
-        newCtx->connection.state = UA_CONNECTIONSTATE_CLOSED;
-
-        newCtx->connection.handle = newCtx;
-
-        *connectionContext = newCtx;
-    }
-
-    UA_Server_ConnectionContext *conCtx = (UA_Server_ConnectionContext *) *connectionContext;
-
-    if (msg.length > 0) {
-        UA_Server_processBinaryMessage(ctx->server, &conCtx->connection, &msg);
-    }
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
+    cm->closeConnection(cm, (uintptr_t)connection->sockfd);
 }
diff --git a/src/ua_connection_internal.h b/src/ua_connection_internal.h
index 2f8eb63518a..bfb84b8f43c 100644
--- a/src/ua_connection_internal.h
+++ b/src/ua_connection_internal.h
@@ -40,25 +40,11 @@ void UA_Connection_attachSecureChannel(UA_Connection *connection,
 /* In this example, we integrate the server into an external "mainloop". This
    can be for example the event-loop used in GUI toolkits, such as Qt or GTK. */
 
-typedef struct {
-    UA_Boolean isInitial;
-    UA_ConnectionManager *cm;
-    UA_Server *server;
-} UA_Server_BasicConnectionContext;
-
-typedef struct {
-    UA_Server_BasicConnectionContext base;
-    uintptr_t connectionId;
-    UA_Connection connection;
-} UA_Server_ConnectionContext;
-
 UA_StatusCode UA_Server_Connection_getSendBuffer(UA_Connection *connection, size_t length,
                                                         UA_ByteString *buf);
 UA_StatusCode UA_Server_Connection_send(UA_Connection *connection, UA_ByteString *buf);
 void UA_Server_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf);
 void UA_Server_Connection_close(UA_Connection *connection);
-void UA_Server_connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId, void **connectionContext,
-                                  UA_StatusCode stat, size_t paramsSize, const UA_KeyValuePair *params, UA_ByteString msg);
 
 _UA_END_DECLS
 
diff --git a/tests/fuzz/corpus_generator.c b/tests/fuzz/corpus_generator.c
index 85148c1fa0e..7a04a5b803f 100644
--- a/tests/fuzz/corpus_generator.c
+++ b/tests/fuzz/corpus_generator.c
@@ -152,14 +152,12 @@ initUaRegisterServer(UA_RegisteredServer *requestServer) {
     requestServer->serverNames = &server->config.applicationDescription.applicationName;
     requestServer->serverNamesSize = 1;
 
-    size_t nl_discurls = server->config.networkLayersSize;
+    size_t nl_discurls = server->config.serverUrlsSize;
     requestServer->discoveryUrls = (UA_String*)UA_malloc(sizeof(UA_String) * nl_discurls);
     requestServer->discoveryUrlsSize = nl_discurls;
     for(size_t i = 0; i < nl_discurls; ++i) {
-        UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
-        requestServer->discoveryUrls[i] = nl->discoveryUrl;
+        requestServer->discoveryUrls[i] = server->config.serverUrls[i];
     }
-
 }
 
 static UA_StatusCode

From 45e297058dd4ffa0e142e7230032f7d84e0c3cdf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 16:59:34 +0200
Subject: [PATCH 0102/1963] refactor(server): Remove unused method
 UA_Server_removeConnection

---
 include/open62541/plugin/network.h | 5 -----
 src/server/ua_server_binary.c      | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/include/open62541/plugin/network.h b/include/open62541/plugin/network.h
index a47bb9a7dbc..49c385d145a 100644
--- a/include/open62541/plugin/network.h
+++ b/include/open62541/plugin/network.h
@@ -140,11 +140,6 @@ void UA_EXPORT
 UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection,
                                UA_ByteString *message);
 
-/* The server internally cleans up the connection and then calls
- * connection->free. */
-void UA_EXPORT
-UA_Server_removeConnection(UA_Server *server, UA_Connection *connection);
-
 struct UA_ServerNetworkLayer {
     void *handle; /* Internal data */
 
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 8bfe13f0ef8..ce09d192d58 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -928,9 +928,3 @@ UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection,
     UA_Connection_sendError(connection, &error);
     connection->close(connection);
 }
-
-void
-UA_Server_removeConnection(UA_Server *server, UA_Connection *connection) {
-    UA_Connection_detachSecureChannel(connection);
-    connection->free(connection);
-}

From d0b541bbf5e7e36cec575d0b877164c1b5a27d90 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 17:02:04 +0200
Subject: [PATCH 0103/1963] refactor(server): Make
 UA_Server_processBinaryMessage an internal API

---
 include/open62541/plugin/network.h | 8 --------
 src/ua_connection_internal.h       | 7 +++++++
 tests/fuzz/fuzz_binary_message.cc  | 1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/open62541/plugin/network.h b/include/open62541/plugin/network.h
index 49c385d145a..43d959d164f 100644
--- a/include/open62541/plugin/network.h
+++ b/include/open62541/plugin/network.h
@@ -132,14 +132,6 @@ struct UA_Connection {
  * positive duration for blocking listening, the server's main loop will block
  * until a message is received or the duration times out. */
 
-/* Process a binary message (TCP packet). The message can contain partial
- * chunks. (TCP is a streaming protocol and packets may be split/merge during
- * transport.) After processing, the message is freed with
- * connection->releaseRecvBuffer. */
-void UA_EXPORT
-UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection,
-                               UA_ByteString *message);
-
 struct UA_ServerNetworkLayer {
     void *handle; /* Internal data */
 
diff --git a/src/ua_connection_internal.h b/src/ua_connection_internal.h
index bfb84b8f43c..17aa7bf1ce4 100644
--- a/src/ua_connection_internal.h
+++ b/src/ua_connection_internal.h
@@ -46,6 +46,13 @@ UA_StatusCode UA_Server_Connection_send(UA_Connection *connection, UA_ByteString
 void UA_Server_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf);
 void UA_Server_Connection_close(UA_Connection *connection);
 
+/* Process a binary message (TCP packet). The message can contain partial
+ * chunks. (TCP is a streaming protocol and packets may be split/merge during
+ * transport.) After processing, the message is freed with
+ * connection->releaseRecvBuffer. */
+void UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection,
+                                    UA_ByteString *message);
+
 _UA_END_DECLS
 
 #endif /* UA_CONNECTION_INTERNAL_H_ */
diff --git a/tests/fuzz/fuzz_binary_message.cc b/tests/fuzz/fuzz_binary_message.cc
index 5815b4f3eaa..372becbfca0 100644
--- a/tests/fuzz/fuzz_binary_message.cc
+++ b/tests/fuzz/fuzz_binary_message.cc
@@ -13,6 +13,7 @@
 #include <open62541/types.h>
 
 #include "ua_server_internal.h"
+#include "ua_connection_internal.h"
 
 #include "testing_networklayers.h"
 

From de5d26a860bfa7e2223dce2e0fa608469907ac90 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Apr 2022 23:53:57 +0200
Subject: [PATCH 0104/1963] refactor(el): Remove the old server networking code
 (replaced with EventLoop)

---
 arch/network_tcp.c                            | 129 ------------------
 include/open62541/network_tcp.h               |  13 --
 include/open62541/plugin/network.h            |  65 ---------
 tests/client/check_client.c                   |   1 -
 tests/client/check_client_async_connect.c     |   2 -
 tests/client/check_client_highlevel.c         |   4 +-
 tests/client/check_client_subscriptions.c     |   1 -
 .../check_encryption_aes128sha256rsaoaep.c    |   1 -
 .../check_encryption_basic128rsa15.c          |   1 -
 tests/encryption/check_encryption_basic256.c  |   1 -
 .../check_encryption_basic256sha256.c         |   1 -
 tests/server/check_accesscontrol.c            |   1 -
 tests/server/check_server_callbacks.c         |   1 -
 tests/server/check_server_userspace.c         |  68 ++++-----
 tests/server/check_session.c                  |   1 -
 15 files changed, 35 insertions(+), 255 deletions(-)

diff --git a/arch/network_tcp.c b/arch/network_tcp.c
index d6558979a3c..e8366c246a0 100644
--- a/arch/network_tcp.c
+++ b/arch/network_tcp.c
@@ -25,134 +25,6 @@
 #define MSG_NOSIGNAL 0
 #endif
 
-typedef struct ConnectionEntry {
-    UA_Connection connection;
-    LIST_ENTRY(ConnectionEntry) pointers;
-} ConnectionEntry;
-
-typedef struct {
-    const UA_Logger *logger;
-    UA_UInt16 port;
-    UA_UInt16 maxConnections;
-    UA_SOCKET serverSockets[FD_SETSIZE];
-    UA_UInt16 serverSocketsSize;
-    LIST_HEAD(, ConnectionEntry) connections;
-    UA_UInt16 connectionsSize;
-} ServerNetworkLayerTCP;
-
-/***************************/
-/* Server NetworkLayer TCP */
-/***************************/
-
-#define MAXBACKLOG     100
-#define NOHELLOTIMEOUT 120000 /* timeout in ms before close the connection
-                               * if server does not receive Hello Message */
-
-static UA_StatusCode
-ServerNetworkLayerTCP_start(UA_ServerNetworkLayer *nl, const UA_Logger *logger,
-                            const UA_String *customHostname) {
-    UA_initialize_architecture_network();
-
-    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
-    layer->logger = logger;
-
-    /* Get addrinfo of the server and create server sockets */
-    char hostname[512];
-    if(customHostname->length) {
-        if(customHostname->length >= sizeof(hostname))
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        memcpy(hostname, customHostname->data, customHostname->length);
-        hostname[customHostname->length] = '\0';
-    }
-    char portno[6];
-    UA_snprintf(portno, 6, "%d", layer->port);
-    struct addrinfo hints;
-    memset(&hints, 0, sizeof hints);
-
-    /* Get the discovery url from the hostname */
-    UA_String du = UA_STRING_NULL;
-    char discoveryUrlBuffer[256];
-    if(customHostname->length) {
-        du.length = (size_t)UA_snprintf(discoveryUrlBuffer, 255, "opc.tcp://%.*s:%d/",
-                                        (int)customHostname->length, customHostname->data,
-                                        layer->port);
-        du.data = (UA_Byte*)discoveryUrlBuffer;
-    } else {
-        char hostnameBuffer[256];
-        if(UA_gethostname(hostnameBuffer, 255) == 0) {
-            du.length = (size_t)UA_snprintf(discoveryUrlBuffer, 255, "opc.tcp://%s:%d/",
-                                            hostnameBuffer, layer->port);
-            du.data = (UA_Byte*)discoveryUrlBuffer;
-        } else {
-            UA_LOG_ERROR(layer->logger, UA_LOGCATEGORY_NETWORK, "Could not get the hostname");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-    UA_String_copy(&du, &nl->discoveryUrl);
-
-    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                "TCP network layer listening on %.*s",
-                (int)nl->discoveryUrl.length, nl->discoveryUrl.data);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-ServerNetworkLayerTCP_listen(UA_ServerNetworkLayer *nl, UA_Server *server,
-                             UA_UInt16 timeout) {
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-ServerNetworkLayerTCP_stop(UA_ServerNetworkLayer *nl, UA_Server *server) {
-    UA_deinitialize_architecture_network();
-}
-
-/* run only when the server is stopped */
-static void
-ServerNetworkLayerTCP_clear(UA_ServerNetworkLayer *nl) {
-    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP *)nl->handle;
-    UA_String_clear(&nl->discoveryUrl);
-
-    /* Hard-close and remove remaining connections. The server is no longer
-     * running. So this is safe. */
-    ConnectionEntry *e, *e_tmp;
-    LIST_FOREACH_SAFE(e, &layer->connections, pointers, e_tmp) {
-        LIST_REMOVE(e, pointers);
-        layer->connectionsSize--;
-        UA_free(e);
-        if(nl->statistics) {
-            nl->statistics->currentConnectionCount--;
-        }
-    }
-
-    /* Free the layer */
-    UA_free(layer);
-}
-
-UA_ServerNetworkLayer
-UA_ServerNetworkLayerTCP(UA_ConnectionConfig config, UA_UInt16 port,
-                         UA_UInt16 maxConnections) {
-    UA_ServerNetworkLayer nl;
-    memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
-    nl.clear = ServerNetworkLayerTCP_clear;
-    nl.localConnectionConfig = config;
-    nl.start = ServerNetworkLayerTCP_start;
-    nl.listen = ServerNetworkLayerTCP_listen;
-    nl.stop = ServerNetworkLayerTCP_stop;
-    nl.handle = NULL;
-
-    ServerNetworkLayerTCP *layer = (ServerNetworkLayerTCP*)
-        UA_calloc(1,sizeof(ServerNetworkLayerTCP));
-    if(!layer)
-        return nl;
-    nl.handle = layer;
-
-    layer->port = port;
-    layer->maxConnections = maxConnections;
-
-    return nl;
-}
-
 typedef struct TCPClientConnection {
     struct addrinfo hints, *server;
     UA_DateTime connStart;
@@ -160,7 +32,6 @@ typedef struct TCPClientConnection {
     UA_UInt32 timeout;
 } TCPClientConnection;
 
-
 /****************************/
 /* Generic Socket Functions */
 /****************************/
diff --git a/include/open62541/network_tcp.h b/include/open62541/network_tcp.h
index 96b95dea40b..eaa79ffabab 100644
--- a/include/open62541/network_tcp.h
+++ b/include/open62541/network_tcp.h
@@ -14,19 +14,6 @@
 
 _UA_BEGIN_DECLS
 
-/* Initializes a TCP network layer.
- *
- * @param config The connection config.
- * @param port The TCP port to listen to.
- * @param maxConnections Maximum number of TCP connections this network layer
- *                       instance is allowed to allocate. Set to 0 for unlimited
- *                       number of connections.
- * @param logger Pointer to a logger
- * @return Returns the network layer instance */
-UA_ServerNetworkLayer UA_EXPORT
-UA_ServerNetworkLayerTCP(UA_ConnectionConfig config, UA_UInt16 port,
-                         UA_UInt16 maxConnections);
-
 /* Open a non-blocking client TCP socket. The connection might not be fully
  * opened yet. Drop into the _poll function withe a timeout to complete the
  * connection. */
diff --git a/include/open62541/plugin/network.h b/include/open62541/plugin/network.h
index 43d959d164f..49f42ee0b92 100644
--- a/include/open62541/plugin/network.h
+++ b/include/open62541/plugin/network.h
@@ -21,9 +21,6 @@ typedef struct UA_Connection UA_Connection;
 struct UA_SecureChannel;
 typedef struct UA_SecureChannel UA_SecureChannel;
 
-struct UA_ServerNetworkLayer;
-typedef struct UA_ServerNetworkLayer UA_ServerNetworkLayer;
-
 /**
  * .. _networking:
  *
@@ -114,68 +111,6 @@ struct UA_Connection {
     void (*free)(UA_Connection *connection);
 };
 
-/**
- * Server Network Layer
- * --------------------
- * The server exposes two functions to interact with remote clients:
- * `processBinaryMessage` and `removeConnection`. These functions are called by
- * the server network layer.
- *
- * It is the job of the server network layer to listen on a TCP socket, to
- * accept new connections, to call the server with received messages and to
- * signal closed connections to the server.
- *
- * The network layer is part of the server config. So users can provide a custom
- * implementation if the provided example does not fit their architecture. The
- * network layer is invoked only from the server's main loop. So the network
- * layer does not need to be thread-safe. If the network layer receives a
- * positive duration for blocking listening, the server's main loop will block
- * until a message is received or the duration times out. */
-
-struct UA_ServerNetworkLayer {
-    void *handle; /* Internal data */
-
-    /* Points to external memory, i.e. handled by server or client */
-    UA_NetworkStatistics *statistics;
-
-    UA_String discoveryUrl;
-
-    UA_ConnectionConfig localConnectionConfig;
-
-    /* Start listening on the network layer.
-     *
-     * @param nl The network layer
-     * @return Returns UA_STATUSCODE_GOOD or an error code. */
-    UA_StatusCode (*start)(UA_ServerNetworkLayer *nl, const UA_Logger *logger,
-                           const UA_String *customHostname);
-
-    /* Listen for new and closed connections and arriving packets. Calls
-     * UA_Server_processBinaryMessage for the arriving packets. Closed
-     * connections are picked up here and forwarded to
-     * UA_Server_removeConnection where they are cleaned up and freed.
-     *
-     * @param nl The network layer
-     * @param server The server for processing the incoming packets and for
-     *               closing connections.
-     * @param timeout The timeout during which an event must arrive in
-     *                milliseconds
-     * @return A statuscode for the status of the network layer. */
-    UA_StatusCode (*listen)(UA_ServerNetworkLayer *nl, UA_Server *server,
-                            UA_UInt16 timeout);
-
-    /* Close the network socket and all open connections. Afterwards, the
-     * network layer can be safely deleted.
-     *
-     * @param nl The network layer
-     * @param server The server that processes the incoming packets and for
-     *               closing connections before deleting them.
-     * @return A statuscode for the status of the closing operation. */
-    void (*stop)(UA_ServerNetworkLayer *nl, UA_Server *server);
-
-    /* Deletes the network layer context. Call only after stopping. */
-    void (*clear)(UA_ServerNetworkLayer *nl);
-};
-
 /**
  * Client Network Layer
  * --------------------
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 22b02cdc8d3..9db6296163d 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -17,7 +17,6 @@
 
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 
 static void
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index c5d5f946a44..6676730f5f5 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -19,8 +19,6 @@
 #include "thread_wrapper.h"
 
 UA_Server *server;
-UA_ServerNetworkLayer nl;
-
 UA_Boolean connected = false;
 
 static void
diff --git a/tests/client/check_client_highlevel.c b/tests/client/check_client_highlevel.c
index 22c0280bae8..8093cca778e 100644
--- a/tests/client/check_client_highlevel.c
+++ b/tests/client/check_client_highlevel.c
@@ -12,13 +12,11 @@
 
 #include "thread_wrapper.h"
 
+UA_Client *client;
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 
-UA_Client *client;
-
 #define CUSTOM_NS "http://open62541.org/ns/test"
 #define CUSTOM_NS_UPPER "http://open62541.org/ns/Test"
 
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index da004309dd7..c03468f8e66 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -21,7 +21,6 @@
 
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 static UA_Boolean noNewSubscription; /* Don't create a subscription when the
                                         session activates */
diff --git a/tests/encryption/check_encryption_aes128sha256rsaoaep.c b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
index e57f3ca0ebf..3dd406a84fe 100644
--- a/tests/encryption/check_encryption_aes128sha256rsaoaep.c
+++ b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
@@ -27,7 +27,6 @@
 
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {
diff --git a/tests/encryption/check_encryption_basic128rsa15.c b/tests/encryption/check_encryption_basic128rsa15.c
index 6891c76846e..bf5852f3dfd 100644
--- a/tests/encryption/check_encryption_basic128rsa15.c
+++ b/tests/encryption/check_encryption_basic128rsa15.c
@@ -24,7 +24,6 @@
 
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {
diff --git a/tests/encryption/check_encryption_basic256.c b/tests/encryption/check_encryption_basic256.c
index affa45ab725..d3a49f51205 100644
--- a/tests/encryption/check_encryption_basic256.c
+++ b/tests/encryption/check_encryption_basic256.c
@@ -27,7 +27,6 @@
 
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {
diff --git a/tests/encryption/check_encryption_basic256sha256.c b/tests/encryption/check_encryption_basic256sha256.c
index f45c04b80a7..d4d6dd9ff11 100644
--- a/tests/encryption/check_encryption_basic256sha256.c
+++ b/tests/encryption/check_encryption_basic256sha256.c
@@ -27,7 +27,6 @@
 
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {
diff --git a/tests/server/check_accesscontrol.c b/tests/server/check_accesscontrol.c
index 9706e8af2a4..9a3ec5f82fb 100644
--- a/tests/server/check_accesscontrol.c
+++ b/tests/server/check_accesscontrol.c
@@ -14,7 +14,6 @@
 
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {
diff --git a/tests/server/check_server_callbacks.c b/tests/server/check_server_callbacks.c
index 238794d5728..dee97b9cb93 100644
--- a/tests/server/check_server_callbacks.c
+++ b/tests/server/check_server_callbacks.c
@@ -14,7 +14,6 @@
 int counter  = 0;
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 UA_NodeId temperatureNodeId = {1, UA_NODEIDTYPE_NUMERIC, {1001}};
 UA_Int32 temperature;
 UA_NodeId pressureNodeId = {1, UA_NODEIDTYPE_NUMERIC, {1002}};
diff --git a/tests/server/check_server_userspace.c b/tests/server/check_server_userspace.c
index e84259cb512..8fe0e7c6670 100644
--- a/tests/server/check_server_userspace.c
+++ b/tests/server/check_server_userspace.c
@@ -144,39 +144,39 @@ START_TEST(Server_forEachChildNodeCall) {
 } END_TEST
 
 
-START_TEST(Server_set_customHostname) {
-    UA_String customHost = UA_STRING("localhost");
-    UA_UInt16 port = 10042;
-
-    UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setMinimal(config, port, NULL);
-    UA_String_clear(&config->customHostname);
-    UA_String_copy(&customHost, &config->customHostname);
-
-    UA_StatusCode retval = UA_Server_run_startup(server);
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-
-    // TODO when we have more network layers, extend this
-    ck_assert_uint_ge(config->networkLayersSize, 1);
-    ck_assert_uint_eq(config->applicationDescription.discoveryUrlsSize, config->networkLayersSize);
-
-
-    for (size_t i=0; i<config->networkLayersSize; i++) {
-        const UA_ServerNetworkLayer *nl = &config->networkLayers[i];
-        char discoveryUrl[256];
-        unsigned int len = (unsigned int)
-            snprintf(discoveryUrl, 255, "opc.tcp://%.*s:%d/",
-                     (int)customHost.length, customHost.data, port);
-        ck_assert_uint_eq(nl->discoveryUrl.length, len);
-        ck_assert_uint_eq(config->applicationDescription.discoveryUrls[i].length, len);
-        ck_assert(strncmp(discoveryUrl, (char*)nl->discoveryUrl.data, len)==0);
-        ck_assert(strncmp(discoveryUrl, (char*)config->applicationDescription.discoveryUrls[i].data, len)==0);
-    }
-    UA_Server_run_shutdown(server);
-    UA_Server_delete(server);
-}
-END_TEST
+/* START_TEST(Server_set_customHostname) { */
+/*     UA_String customHost = UA_STRING("localhost"); */
+/*     UA_UInt16 port = 10042; */
+
+/*     UA_Server *server = UA_Server_new(); */
+/*     UA_ServerConfig *config = UA_Server_getConfig(server); */
+/*     UA_ServerConfig_setMinimal(config, port, NULL); */
+/*     UA_String_clear(&config->customHostname); */
+/*     UA_String_copy(&customHost, &config->customHostname); */
+
+/*     UA_StatusCode retval = UA_Server_run_startup(server); */
+/*     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD); */
+
+/*     // TODO when we have more network layers, extend this */
+/*     ck_assert_uint_ge(config->networkLayersSize, 1); */
+/*     ck_assert_uint_eq(config->applicationDescription.discoveryUrlsSize, config->networkLayersSize); */
+
+
+/*     for (size_t i=0; i<config->networkLayersSize; i++) { */
+/*         const UA_ServerNetworkLayer *nl = &config->networkLayers[i]; */
+/*         char discoveryUrl[256]; */
+/*         unsigned int len = (unsigned int) */
+/*             snprintf(discoveryUrl, 255, "opc.tcp://%.*s:%d/", */
+/*                      (int)customHost.length, customHost.data, port); */
+/*         ck_assert_uint_eq(nl->discoveryUrl.length, len); */
+/*         ck_assert_uint_eq(config->applicationDescription.discoveryUrls[i].length, len); */
+/*         ck_assert(strncmp(discoveryUrl, (char*)nl->discoveryUrl.data, len)==0); */
+/*         ck_assert(strncmp(discoveryUrl, (char*)config->applicationDescription.discoveryUrls[i].data, len)==0); */
+/*     } */
+/*     UA_Server_run_shutdown(server); */
+/*     UA_Server_delete(server); */
+/* } */
+/* END_TEST */
 
 static Suite* testSuite_ServerUserspace(void) {
     Suite *s = suite_create("ServerUserspace");
@@ -184,7 +184,7 @@ static Suite* testSuite_ServerUserspace(void) {
     tcase_add_test(tc_core, Server_addNamespace_ShallWork);
     tcase_add_test(tc_core, Server_addNamespace_writeService);
     tcase_add_test(tc_core, Server_forEachChildNodeCall);
-    tcase_add_test(tc_core, Server_set_customHostname);
+    //tcase_add_test(tc_core, Server_set_customHostname);
 
     suite_add_tcase(s,tc_core);
     return s;
diff --git a/tests/server/check_session.c b/tests/server/check_session.c
index 0ecc4c23aa4..55b3fed14a0 100644
--- a/tests/server/check_session.c
+++ b/tests/server/check_session.c
@@ -17,7 +17,6 @@
 
 UA_Server *server;
 UA_Boolean running;
-UA_ServerNetworkLayer nl;
 THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {

From 86c20068e3ff92d9a1601bfbc5d9c5c4e530f517 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Apr 2022 00:34:42 +0200
Subject: [PATCH 0105/1963] refactor(server): The EventSources are added
 directly to the EventLoop

No need to manually track them. Their lifecycle is entirely managed by
the EventLoop.
---
 include/open62541/server.h                    |  2 -
 .../include/open62541/server_config_default.h | 13 -----
 plugins/ua_config_default.c                   | 47 ++++++-------------
 src/server/ua_server.c                        | 34 +++-----------
 4 files changed, 21 insertions(+), 75 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 52c413c1aef..4bb8a173f0e 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -159,8 +159,6 @@ struct UA_ServerConfig {
     /**
      * Networking
      * ^^^^^^^^^^ */
-    size_t connectionManagersSize;
-    UA_ConnectionManager *connectionManagers[10];
 
     /* TCP server socket parameters */
     /* TODO: UA_String *tcpListenHostnames; */
diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index 6191b0ef38a..84b5148e0d4 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -96,19 +96,6 @@ UA_ServerConfig_setDefault(UA_ServerConfig *config) {
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_setBasics(UA_ServerConfig *conf);
 
-/* Adds a TCP network layer with custom buffer sizes
- *
- * @param conf The configuration to manipulate
- * @param portNumber The port number for the tcp network layer
- * @param sendBufferSize The size in bytes for the network send buffer. Pass 0
- *        to use defaults.
- * @param recvBufferSize The size in bytes for the network receive buffer.
- *        Pass 0 to use defaults.
- */
-UA_EXPORT UA_StatusCode
-UA_ServerConfig_addNetworkLayerTCP(UA_ServerConfig *conf, UA_UInt16 portNumber,
-                                   UA_UInt32 sendBufferSize, UA_UInt32 recvBufferSize);
-
 #ifdef UA_ENABLE_WEBSOCKET_SERVER
 /* Adds a Websocket network layer with custom buffer sizes
  *
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index c9c87b4d508..d18f80249f8 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -139,13 +139,19 @@ setDefaultConfig(UA_ServerConfig *conf) {
     if(conf->eventLoop == NULL) {
         conf->eventLoop = UA_EventLoop_new_POSIX(&conf->logger);
         conf->externalEventLoop = false;
-    }
 
-    /* Eventsources */
-    conf->connectionManagersSize = 0;
-    /* conf->connectionManagers; */
+        /* Add the TCP connection manager */
+        UA_ConnectionManager *tcpCM =
+            UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcp connection manager"));
+        conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)tcpCM);
+
+        /* Add the UDP connection manager */
+        UA_ConnectionManager *udpCM =
+            UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp connection manager"));
+        conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)udpCM);
+    }
 
-   /* --> Start setting the default static config <-- */
+    /* --> Start setting the default static config <-- */
 
     conf->shutdownDelay = 0.0;
 
@@ -305,23 +311,6 @@ UA_ServerConfig_addNetworkLayerWS(UA_ServerConfig *conf, UA_UInt16 portNumber,
 }
 #endif
 
-UA_EXPORT UA_StatusCode
-UA_ServerConfig_addNetworkLayerTCP(UA_ServerConfig *conf, UA_UInt16 portNumber,
-                                   UA_UInt32 sendBufferSize, UA_UInt32 recvBufferSize) {
-    /* Create the TCP Eventsource */
-    UA_ConnectionManager *tcpCM = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
-    conf->connectionManagers[conf->connectionManagersSize] = tcpCM;
-    conf->connectionManagersSize++;
-
-    conf->tcpBufSize = recvBufferSize;
-    conf->tcpListenPort = portNumber;
-
-    /* Register (and possibly start) the event source */
-    conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *) tcpCM);
-
-    return UA_STATUSCODE_GOOD;
-}
-
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config, 
                                       const UA_ByteString *certificate) {
@@ -441,12 +430,8 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
         return retval;
     }
 
-    retval = UA_ServerConfig_addNetworkLayerTCP(config, portNumber,
-                                                sendBufferSize, recvBufferSize);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_ServerConfig_clean(config);
-        return retval;
-    }
+    config->tcpBufSize = recvBufferSize;
+    config->tcpListenPort = portNumber;
 
     /* Allocate the SecurityPolicies */
     retval = UA_ServerConfig_addSecurityPolicyNone(config, certificate);
@@ -692,11 +677,7 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
     if (retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    retval = UA_ServerConfig_addNetworkLayerTCP(conf, portNumber, 0, 0);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_ServerConfig_clean(conf);
-        return retval;
-    }
+    config->tcpListenPort = portNumber;
 
     retval = UA_ServerConfig_addAllSecurityPolicies(conf, certificate, privateKey);
     if(retval != UA_STATUSCODE_GOOD) {
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index d3426052174..731d0e91245 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -836,16 +836,6 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
     return timeout;
 }
 
-static bool
-allEventSourcesStopped(UA_ConnectionManager** sources, size_t count) {
-    UA_Boolean allStopped = true;
-    for (size_t i = 0; i < count; ++i) {
-        UA_ConnectionManager *source = sources[i];
-        allStopped = allStopped && source->eventSource.state == UA_EVENTSOURCESTATE_STOPPED;
-    }
-    return allStopped;
-}
-
 UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server) {
     /* Stop all SecureChannels */
@@ -859,24 +849,14 @@ UA_Server_run_shutdown(UA_Server *server) {
                 closeConnection(sc->connectionManager, sc->connectionId);
     }
 
-    /* Stop the eventsources associated with the server */
-    for(size_t i = 0; i < server->config.connectionManagersSize; ++i) {
-        UA_ConnectionManager *cm = server->config.connectionManagers[i];
-        if(cm->eventSource.eventLoop != NULL) {
-            cm->eventSource.stop(&cm->eventSource);
-        }
-    }
-
-    UA_DateTime elapsedTime = 0;
-    UA_DateTime startTime = UA_DateTime_nowMonotonic();
-    UA_DateTime timeout = UA_UINT32_MAX / 2;
-
     UA_EventLoop *el = server->config.eventLoop;
-    while(!allEventSourcesStopped(server->config.connectionManagers,
-                                  server->config.connectionManagersSize) &&
-          elapsedTime < timeout) {
-        el->run(el, 0);
-        elapsedTime = UA_DateTime_nowMonotonic() - startTime;
+    if(server->config.externalEventLoop) {
+        el->run(el, 0); /* Run one iteration of the eventloop with a zero
+                         * timeout. This closes the connections fully. */
+    } else {
+        el->stop(el);
+        while(el->state != UA_EVENTLOOPSTATE_STOPPED)
+            el->run(el, 100); /* Iterate until stopped */
     }
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST

From 1890ab6fe799f6f5107cbc9c54ad32c411fee96a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Apr 2022 00:37:35 +0200
Subject: [PATCH 0106/1963] refactor(plugin): The client's default EventLoop
 has support for UDP and TCP

---
 plugins/ua_config_default.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index d18f80249f8..c4f77e27461 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -737,6 +737,16 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     if(config->eventLoop == NULL) {
         config->eventLoop = UA_EventLoop_new_POSIX(&config->logger);
         config->externalEventLoop = false;
+
+        /* Add the TCP connection manager */
+        UA_ConnectionManager *tcpCM =
+            UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcp connection manager"));
+        config->eventLoop->registerEventSource(config->eventLoop, (UA_EventSource *)tcpCM);
+
+        /* Add the UDP connection manager */
+        UA_ConnectionManager *udpCM =
+            UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp connection manager"));
+        config->eventLoop->registerEventSource(config->eventLoop, (UA_EventSource *)udpCM);
     }
 
     if (config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {

From b989633e4816d5362d40f4ddfe2d34acb52bb1ea Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Apr 2022 10:56:48 +0200
Subject: [PATCH 0107/1963] refactor(el): Pass hostname and port with the first
 callback of a server socket

---
 arch/eventloop_posix_tcp.c           | 88 ++++++++++++++--------------
 include/open62541/plugin/eventloop.h | 28 ++++++---
 tests/check_eventloop_tcp.c          | 12 +---
 3 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 263d7a2cf0b..5981a1c58d9 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -341,30 +341,22 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
 
 static UA_StatusCode
 TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
-                         void *application, void *context,
+                         UA_UInt16 port, void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback) {
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
-    /* Get logging information */
+    /* Get the hostname information */
     char hoststr[256];
-    char portstr[16];
     int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
                                  hoststr, sizeof(hoststr),
-                                 portstr, sizeof(portstr), NI_NUMERICSERV);
+                                 NULL, 0, 0);
     if(get_res != 0) {
-        get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                                 hoststr, sizeof(hoststr),
-                                 portstr, sizeof(portstr),
-                                 NI_NUMERICHOST | NI_NUMERICSERV);
-        if(get_res != 0) {
-            hoststr[0] = 0;
-            portstr[0] = 0;
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                               "TCP\t| getnameinfo(...) could not resolve the "
-                               "hostname (%s)", errno_str));
-        }
+        hoststr[0] = 0;
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "TCP\t| getnameinfo(...) could not resolve the "
+                          "hostname (%s)", errno_str));
     }
     
     /* Create the server socket */
@@ -373,14 +365,14 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error opening the listen socket for "
-                          "\"%s\" on port %s(%s)",
-                          (unsigned)listenSocket, hoststr, portstr, errno_str));
+                          "\"%s\" on port %u (%s)",
+                          (unsigned)listenSocket, hoststr, port, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                "TCP %u\t| New server socket for \"%s\" on port %s",
-                (unsigned)listenSocket, hoststr, portstr);
+                "TCP %u\t| New server socket for \"%s\" on port %u",
+                (unsigned)listenSocket, hoststr, port);
 
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
@@ -476,17 +468,35 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
         return res;
     }
 
-    connectionCallback(cm, (uintptr_t)listenSocket,
-                       application, &newtcpfd->fd.context,
-                       UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
+    /* Set up the callback parameters */
+    UA_KeyValuePair params[2];
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-hostname");
+    params[1].key = UA_QUALIFIEDNAME(0, "listen-port");
+    UA_String hostname;
+    size_t paramsSize = 0;
+    if(hoststr[0] != 0) {
+        paramsSize = 2;
+        hostname = UA_STRING(hoststr);
+        UA_Variant_setScalar(&params[0].value, &hostname, &UA_TYPES[UA_TYPES_STRING]);
+        UA_Variant_setScalar(&params[1].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    }
+
+    /* Announce the listen-socket in the application */
+    connectionCallback(cm, (uintptr_t)listenSocket, application,
+                       &newtcpfd->fd.context, UA_STATUSCODE_GOOD,
+                       paramsSize, params, UA_BYTESTRING_NULL);
 
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
 TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
-                          const char *port, void *application, void *context,
+                          UA_UInt16 port, void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback) {
+    /* Create a string for the port */
+    char portstr[6];
+    UA_snprintf(portstr, sizeof(portstr), "%d", port);
+
     /* Get all the interface and IPv4/6 combinations for the configured hostname */
     struct addrinfo hints, *res;
     memset(&hints, 0, sizeof hints);
@@ -503,11 +513,11 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
                                       * such address is configured */
 #endif
 
-    int retcode = UA_getaddrinfo(hostname, port, &hints, &res);
+    int retcode = UA_getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
         UA_LOG_SOCKET_ERRNO_GAI_WRAP(
            UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                          "TCP\t| getaddrinfo lookup for \"%s\" on port %s failed (%s)",
+                          "TCP\t| getaddrinfo lookup for \"%s\" on port %u failed (%s)",
                           hostname, port, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -517,18 +527,12 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
     UA_StatusCode total_result = UA_INT32_MAX;
     struct addrinfo *ai = res;
     while(ai) {
-        total_result &= TCP_registerListenSocket(cm, ai, application, context,
+        total_result &= TCP_registerListenSocket(cm, ai, port, application, context,
                                                  connectionCallback);
         ai = ai->ai_next;
     }
     UA_freeaddrinfo(res);
 
-    if(total_result != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP\t| Could not create a listen socket for hostname \"%s\" "
-                       "on port %s", hostname, port);
-    }
-
     return total_result;
 }
 
@@ -652,8 +656,7 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm,
                           UA_ConnectionManager_connectionCallback connectionCallback) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
-    /* Get the port information */
-    char portno[6];
+    /* Get the port parameter */
     const UA_UInt16 *port = (const UA_UInt16*)
         UA_KeyValueMap_getScalar(params, paramsSize,
                                  UA_QUALIFIEDNAME(0, "listen-port"),
@@ -663,17 +666,16 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm,
                      "TCP\t| The listen-port was not correctly configured");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    UA_snprintf(portno, 6, "%d", *port);
 
-    /* Get the hostnames configuration */
+    /* Get the hostnames parameter */
     const UA_Variant *hostNames =
         UA_KeyValueMap_get(params, paramsSize, UA_QUALIFIEDNAME(0, "listen-hostnames"));
     if(!hostNames) {
         /* No listen-hostnames parameter -> listen on all interfaces */
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "TCP\t| Listening on all interfaces");
-        return TCP_registerListenSockets(cm, NULL, portno,
-                                         application, context, connectionCallback);
+        return TCP_registerListenSockets(cm, NULL, *port, application,
+                                         context, connectionCallback);
     }
 
     /* Wrong datatype for the hostnames */
@@ -689,8 +691,8 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm,
     if(interfaces == 0) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| Listening on all interfaces");
-        return TCP_registerListenSockets(cm, NULL, portno,
-                                         application, context, connectionCallback);
+        return TCP_registerListenSockets(cm, NULL, *port, application,
+                                         context, connectionCallback);
     }
 
     /* Iterate over the configured hostnames */
@@ -701,8 +703,8 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm,
             continue;
         memcpy(hostname, hostStrings[i].data, hostStrings->length);
         hostname[hostStrings->length] = '\0';
-        TCP_registerListenSockets(cm, hostname, portno, application, context,
-                                  connectionCallback);
+        TCP_registerListenSockets(cm, hostname, *port, application,
+                                  context, connectionCallback);
     }
 
     return UA_STATUSCODE_GOOD;
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 2d0f4d24bab..8058a590f66 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -391,10 +391,21 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  * Listens on the network and manages TCP connections. This should be available
  * for all architectures.
  *
- * The configuration parameters have to set before calling _start to take
- * effect.
+ * The `openConnection` callback is used to create both client and server
+ * sockets. A server socket listens and accepts incoming connections (creates an
+ * active connection). This is distinguished by the key-value parameters passed
+ * to `openConnection`. Note that a single call to `openConnection` for a server
+ * connection may actually create multiple connections (one per hostname /
+ * device).
  *
- * Configuration Parameters:
+ * The `connectionCallback` of the server socket and `context` of the server
+ * socket is reused for each new connection. But the key-value parameters for
+ * the first callback are different between server and client connections.
+ *
+ * The following list defines the parameters and their type. Note that some
+ * parameters are only set for the first callback when a new connection opens.
+ *
+ * Configuration parameters for the entire ConnectionManager:
  * - 0:recv-bufsize [uint32]: Size of the buffer that is allocated for receiving
  *                            messages (default 64kB).
  *
@@ -407,10 +418,13 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  *   - 0:listen-hostnames [string array]: Hostnames of the devices to listen on
  *                                        (default: listen on all devices).
  *
- * Connection Callback Paramters:
- * - 0:remote-hostname [string]: When a new connection is opened by listening on
- *                               a port, the first callback contains the remote
- *                               hostname parameter.
+ * Connection Callback Parameters (first callback only):
+ * - Active Connection
+ *   - 0:remote-hostname [string]: Hostname of the remote connection.
+ * - Passive Connection
+ *   - 0:listen-hostname [string]: Local hostname for that particular
+ *                                 listen-connection.
+ *   - 0:listen-port [uint16]: Port on which the connection listens.
  *
  * Send Parameters:
  * No additional parameters for sending over an established TCP socket defined. */
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index e63a3b48f52..edf6fc583f3 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -38,19 +38,9 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     if(*connectionContext != NULL)
         clientId = connectionId;
-    if(msg.length == 0 && status == UA_STATUSCODE_GOOD) {
+    if(msg.length == 0 && status == UA_STATUSCODE_GOOD)
         connCount++;
 
-        /* The remote-hostname is set during the first callback */
-        if(paramsSize > 0) {
-            const void *hn =
-                UA_KeyValueMap_getScalar(params, paramsSize,
-                                         UA_QUALIFIEDNAME(0, "remote-hostname"),
-                                         &UA_TYPES[UA_TYPES_STRING]);
-            ck_assert(hn != NULL);
-        }
-    }
-
     if(status != UA_STATUSCODE_GOOD)
         connCount--;
 

From 16467fb5a9d2f9458e55071a2ec07bc68e1b960e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Apr 2022 23:38:54 +0200
Subject: [PATCH 0108/1963] feat(server): Create server sockets based on
 configured server urls

---
 include/open62541/server.h                   |  28 ++--
 plugins/ua_config_default.c                  |   7 +-
 src/server/ua_server.c                       | 140 +++++++++++--------
 src/server/ua_server_config.c                |   7 +
 src/server/ua_server_discovery.c             |  25 +---
 src/server/ua_services_discovery.c           |  96 ++++---------
 src/server/ua_services_discovery_multicast.c |  23 ++-
 7 files changed, 162 insertions(+), 164 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 4bb8a173f0e..0f074234c09 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -158,14 +158,26 @@ struct UA_ServerConfig {
 
     /**
      * Networking
-     * ^^^^^^^^^^ */
-
-    /* TCP server socket parameters */
-    /* TODO: UA_String *tcpListenHostnames; */
-    UA_UInt16 tcpListenPort; /* Port to listen for new connections (default: 4840) */
-    UA_UInt32 tcpBufSize;    /* Maximum size of sent and received chunks (default: 64kB) */
-    UA_UInt32 tcpMaxMsgSize; /* Maximum size of messages (default: 0 -> unbounded) */
-    UA_UInt32 tcpMaxChunks;  /* Maximum size of sent message (default: 0 -> unbounded) */
+     * ^^^^^^^^^^
+     * The `severUrls` array contains the server URLs like
+     * `opc.tcp://my-server:4840` or `opc.wss://localhost:443`. The URLs are
+     * used both for discovery and to set up the server sockets based on the
+     * defined hostnames (and ports).
+     *
+     * - If the list is empty: Listen on all network interfaces with TCP port 4840.
+     * - If the hostname of a URL is empty: Use the define protocol and port and
+     *   listen on all interfaces. */
+    UA_String *serverUrls;
+    size_t serverUrlsSize;
+
+    /**
+     * The following settings are specific to OPC UA with TCP transport. */
+    UA_UInt32 tcpBufSize;    /* Max length of sent and received chunks (packets)
+                              * (default: 64kB) */
+    UA_UInt32 tcpMaxMsgSize; /* Max length of messages
+                              * (default: 0 -> unbounded) */
+    UA_UInt32 tcpMaxChunks;  /* Max number of chunks per message
+                              * (default: 0 -> unbounded) */
 
     /**
      * Security and Encryption
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index c4f77e27461..863cb1b1270 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -143,12 +143,14 @@ setDefaultConfig(UA_ServerConfig *conf) {
         /* Add the TCP connection manager */
         UA_ConnectionManager *tcpCM =
             UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcp connection manager"));
-        conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)tcpCM);
+        if(tcpCM)
+            conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)tcpCM);
 
         /* Add the UDP connection manager */
         UA_ConnectionManager *udpCM =
             UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp connection manager"));
-        conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)udpCM);
+        if(udpCM)
+            conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)udpCM);
     }
 
     /* --> Start setting the default static config <-- */
@@ -431,7 +433,6 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
     }
 
     config->tcpBufSize = recvBufferSize;
-    config->tcpListenPort = portNumber;
 
     /* Allocate the SecurityPolicies */
     retval = UA_ServerConfig_addSecurityPolicyNone(config, certificate);
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 731d0e91245..f52c007e19d 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -634,6 +634,58 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_Server_processBinaryMessage(server, conn, &msg);
 }
 
+static UA_StatusCode
+UA_Server_createServerConnection(UA_Server *server, const UA_String *serverUrl) {
+    UA_ServerConfig *config = &server->config;
+
+    /* Extract the protocol, hostname and port from the url */
+    UA_String hostname = UA_STRING_NULL;
+    UA_String path = UA_STRING_NULL;
+    UA_UInt16 port = 4840; /* default */
+    UA_StatusCode res = UA_parseEndpointUrl(serverUrl, &hostname, &port, &path);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    UA_String tcpString = UA_STRING("tcp");
+    for(UA_EventSource *es = config->eventLoop->eventSources;
+        es != NULL; es = es->next) {
+        /* Is this a usable connection manager? */
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+        if(!UA_String_equal(&tcpString, &cm->protocol))
+            continue;
+
+        /* Set up the parameters */
+        UA_KeyValuePair params[3];
+        size_t paramsSize = 2;
+
+        params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+        UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+
+        UA_UInt32 bufSize = config->tcpBufSize;
+        if(bufSize == 0)
+            bufSize = 1 << 16; /* 64kB */
+        params[1].key = UA_QUALIFIEDNAME(0, "recv-bufsize");
+        UA_Variant_setScalar(&params[1].value, &bufSize, &UA_TYPES[UA_TYPES_UINT32]);
+
+        /* If the hostname is non-empty */
+        if(hostname.length > 0) {
+            params[2].key = UA_QUALIFIEDNAME(0, "listen-hostnames");
+            UA_Variant_setArray(&params[2].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
+            paramsSize = 3;
+        }
+
+        /* Open the server connection */
+        res = cm->openConnection(cm, paramsSize, params, server, NULL,
+                                 UA_Server_networkCallback);
+        if(res == UA_STATUSCODE_GOOD)
+            return res;
+    }
+
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
 /********************/
 /* Main Server Loop */
 /********************/
@@ -665,39 +717,19 @@ UA_Server_run_startup(UA_Server *server) {
     UA_StatusCode retVal = config->eventLoop->start(config->eventLoop);
     UA_CHECK_STATUS(retVal, return retVal);
 
-    /* Open a server connection. Try all "tcp" ConnectionManagers until the
-     * first one that works. */
-    UA_String tcpString = UA_STRING("tcp");
+    /* Open server sockets */
     UA_Boolean haveServerSocket = false;
-    for(UA_EventSource *es = config->eventLoop->eventSources;
-        es != NULL; es = es->next) {
-        /* Is this a usable connection manager? */
-        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
-            continue;
-        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
-        if(!UA_String_equal(&tcpString, &cm->protocol))
-            continue;
-
-        /* Set up the parameters */
-        UA_KeyValuePair params[2];
-
-        UA_UInt16 listenPort = config->tcpListenPort;
-        if(listenPort == 0)
-            listenPort = 4840;
-        params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-        UA_Variant_setScalar(&params[0].value, &listenPort, &UA_TYPES[UA_TYPES_UINT16]);
-
-        UA_UInt32 bufSize = config->tcpBufSize;
-        if(bufSize == 0)
-            bufSize = 1 << 16; /* 64kB */
-        params[1].key = UA_QUALIFIEDNAME(0, "recv-bufsize");
-        UA_Variant_setScalar(&params[1].value, &bufSize, &UA_TYPES[UA_TYPES_UINT32]);
-
-        /* Open the server connection */
-        retVal = cm->openConnection(cm, 2, params, server, NULL, UA_Server_networkCallback);
-        if(retVal == UA_STATUSCODE_GOOD) {
+    if(config->serverUrlsSize == 0) {
+        /* Empty hostname -> listen on all devices */
+        UA_String defaultUrl = UA_STRING("opc.tcp://:4840");
+        retVal = UA_Server_createServerConnection(server, &defaultUrl);
+        if(retVal == UA_STATUSCODE_GOOD)
             haveServerSocket = true;
-            break;
+    } else {
+        for(size_t i = 0; i < config->serverUrlsSize; i++) {
+            retVal = UA_Server_createServerConnection(server, &config->serverUrls[i]);
+            if(retVal == UA_STATUSCODE_GOOD)
+                haveServerSocket = true;
         }
     }
 
@@ -745,29 +777,24 @@ UA_Server_run_startup(UA_Server *server) {
                          UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STARTTIME),
                          var);
 
-    /* Update the application description to match the previously added
-     * discovery urls. We can only do this after the network layer is started
-     * since it inits the discovery url */
-    if(server->config.applicationDescription.discoveryUrlsSize != 0) {
-        UA_Array_delete(server->config.applicationDescription.discoveryUrls,
-                        server->config.applicationDescription.discoveryUrlsSize,
-                        &UA_TYPES[UA_TYPES_STRING]);
-        server->config.applicationDescription.discoveryUrlsSize = 0;
+    /* Update the application description to include the server urls for
+     * discovery. Don't add the urls with an empty host (listening on all
+     * interfaces) */
+    for(size_t i = 0; i < server->config.serverUrlsSize; i++) {
+        UA_String hostname = UA_STRING_NULL;
+        UA_String path = UA_STRING_NULL;
+        UA_UInt16 port = 0;
+        retVal = UA_parseEndpointUrl(&server->config.serverUrls[i],
+                                     &hostname, &port, &path);
+        if(retVal != UA_STATUSCODE_GOOD || hostname.length == 0)
+            continue;
+        retVal =
+            UA_Array_appendCopy((void**)&server->config.applicationDescription.discoveryUrls,
+                                &server->config.applicationDescription.discoveryUrlsSize,
+                                &server->config.serverUrls[i], &UA_TYPES[UA_TYPES_STRING]);
+        UA_CHECK_STATUS(retVal, return retVal);
     }
 
-    /* server->config.applicationDescription.discoveryUrls = (UA_String *) */
-    /*     UA_Array_new(server->config.networkLayersSize, &UA_TYPES[UA_TYPES_STRING]); */
-    /* UA_CHECK_MEM(server->config.applicationDescription.discoveryUrls, */
-    /*          return UA_STATUSCODE_BADOUTOFMEMORY); */
-
-    /* server->config.applicationDescription.discoveryUrlsSize = */
-    /*     server->config.networkLayersSize; */
-    /* for(size_t i = 0; i < server->config.applicationDescription.discoveryUrlsSize; i++) { */
-    /*     UA_ServerNetworkLayer *nl = &server->config.networkLayers[i]; */
-    /*     UA_String_copy(&nl->discoveryUrl, */
-    /*                    &server->config.applicationDescription.discoveryUrls[i]); */
-    /* } */
-
     /* Start the multicast discovery server */
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     if(server->config.mdnsEnabled)
@@ -775,7 +802,7 @@ UA_Server_run_startup(UA_Server *server) {
 #endif
 
     /* Update Endpoint description */
-    for(size_t i = 0; i < server->config.endpointsSize; ++i){
+    for(size_t i = 0; i < server->config.endpointsSize; ++i) {
         UA_ApplicationDescription_clear(&server->config.endpoints[i].server);
         UA_ApplicationDescription_copy(&server->config.applicationDescription,
                                        &server->config.endpoints[i].server);
@@ -855,8 +882,11 @@ UA_Server_run_shutdown(UA_Server *server) {
                          * timeout. This closes the connections fully. */
     } else {
         el->stop(el);
-        while(el->state != UA_EVENTLOOPSTATE_STOPPED)
-            el->run(el, 100); /* Iterate until stopped */
+        UA_StatusCode res = UA_STATUSCODE_GOOD;
+        while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+              el->state != UA_EVENTLOOPSTATE_FRESH &&
+              res == UA_STATUSCODE_GOOD)
+            res = el->run(el, 100); /* Iterate until stopped */
     }
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 0f830f507c6..e5a6596cc27 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -40,6 +40,13 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
         config->eventLoop = NULL;
     }
 
+    /* Networking */
+    UA_Array_delete(config->serverUrls, config->serverUrlsSize,
+                    &UA_TYPES[UA_TYPES_STRING]);
+    config->serverUrls = NULL;
+    config->serverUrlsSize = 0;
+
+    /* Security Policies */
     for(size_t i = 0; i < config->securityPoliciesSize; ++i) {
         UA_SecurityPolicy *policy = &config->securityPolicies[i];
         policy->clear(policy);
diff --git a/src/server/ua_server_discovery.c b/src/server/ua_server_discovery.c
index 54990727013..092eeb1c4ba 100644
--- a/src/server/ua_server_discovery.c
+++ b/src/server/ua_server_discovery.c
@@ -47,23 +47,12 @@ register_server_with_discovery_server(UA_Server *server,
     request.server.serverNames = &server->config.applicationDescription.applicationName;
     request.server.serverNamesSize = 1;
 
-    /* Mirror the discovery urls from the server config and the network layers */
-    size_t config_discurls = server->config.applicationDescription.discoveryUrlsSize;
-    size_t nl_discurls = server->config.networkLayersSize;
-    size_t total_discurls = config_discurls + nl_discurls;
-    request.server.discoveryUrls = (UA_String*)
-        UA_Array_new(total_discurls, &UA_TYPES[UA_TYPES_STRING]);
-    if(!request.server.discoveryUrls)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
-    for(size_t i = 0; i < config_discurls; ++i)
-        request.server.discoveryUrls[i] = server->config.applicationDescription.discoveryUrls[i];
-    /* TODO: Add nl only if discoveryUrl not already present */
-    for(size_t i = 0; i < nl_discurls; ++i) {
-        UA_ServerNetworkLayer *nl = &server->config.networkLayers[i];
-        request.server.discoveryUrls[config_discurls + i] = nl->discoveryUrl;
-    }
-    request.server.discoveryUrlsSize = total_discurls;
+    /* Mirror the discovery urls from the server config (includes hostnames from
+     * the network layers) */
+    request.server.discoveryUrls =
+        server->config.applicationDescription.discoveryUrls;
+    request.server.discoveryUrlsSize =
+        server->config.applicationDescription.discoveryUrlsSize;
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     request.discoveryConfigurationSize = 1;
@@ -84,8 +73,6 @@ register_server_with_discovery_server(UA_Server *server,
     UA_Array_delete(request.discoveryConfiguration,
                     request.discoveryConfigurationSize,
                     &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
-    if(total_discurls > 0)
-        UA_free(request.server.discoveryUrls);
 
     if(serviceResult == UA_STATUSCODE_BADNOTIMPLEMENTED ||
        serviceResult == UA_STATUSCODE_BADSERVICEUNSUPPORTED) {
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 0f73e301a3f..4b79a75e356 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -89,37 +89,6 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
 }
 #endif
 
-static UA_StatusCode
-setApplicationDescriptionFromServer(UA_ApplicationDescription *target,
-                                    const UA_Server *server) {
-    /* Copy ApplicationDescription from the config */
-    UA_StatusCode result =
-        UA_ApplicationDescription_copy(&server->config.applicationDescription, target);
-    if(result != UA_STATUSCODE_GOOD)
-        return result;
-
-    /* Add the discoveryUrls from the networklayers only if discoveryUrl
-     * not already present and to avoid redundancy */
-    /* if(!target->discoveryUrlsSize) { */
-    /*     size_t existing = target->discoveryUrlsSize; */
-    /*     result = */
-    /*         UA_Array_resize((void**)&target->discoveryUrls, */
-    /*                         &target->discoveryUrlsSize, */
-    /*                         target->discoveryUrlsSize + server->config.networkLayersSize, */
-    /*                         &UA_TYPES[UA_TYPES_STRING]); */
-    /*     target->discoveryUrlsSize += server->config.networkLayersSize; */
-    /*     if(result != UA_STATUSCODE_GOOD) */
-    /*         return result; */
-
-    /*     for(size_t i = 0; i < server->config.networkLayersSize; i++) { */
-    /*         UA_ServerNetworkLayer* nl = &server->config.networkLayers[i]; */
-    /*         UA_String_copy(&nl->discoveryUrl, &target->discoveryUrls[existing + i]); */
-    /*     } */
-    /* } */
-
-    return UA_STATUSCODE_GOOD;
-}
-
 void Service_FindServers(UA_Server *server, UA_Session *session,
                          const UA_FindServersRequest *request,
                          UA_FindServersResponse *response) {
@@ -141,25 +110,18 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
     }
 
 #ifndef UA_ENABLE_DISCOVERY
-    if(!foundSelf)
-        return;
 
-    UA_ApplicationDescription *ad = UA_ApplicationDescription_new();
-    if(!ad) {
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+    if(!foundSelf)
         return;
-    }
 
-    UA_StatusCode retval = setApplicationDescriptionFromServer(ad, server);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_ApplicationDescription_delete(ad);
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+    response->responseHeader.serviceResult =
+        UA_Array_copy(&server->config.applicationDescription, 1,
+                      (void**)&response->servers,
+                      &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
         return;
-    }
 
-    response->servers = ad;
     response->serversSize = 1;
-    return;
 
 #else
 
@@ -175,7 +137,8 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
     /* Copy into the response. TODO: Evaluate return codes */
     size_t pos = 0;
     if(foundSelf)
-        setApplicationDescriptionFromServer(&response->servers[pos++], server);
+        UA_ApplicationDescription_copy(&server->config.applicationDescription,
+                                       &response->servers[pos++]);
 
     registeredServer_list_entry* current;
     LIST_FOREACH(current, &server->discoveryManager.registeredServers, pointers) {
@@ -183,7 +146,8 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
         if(!usable) {
             /* If client only requested a specific set of servers */
             for(size_t i = 0; i < request->serverUrisSize; i++) {
-                if(UA_String_equal(&current->registeredServer.serverUri, &request->serverUris[i])) {
+                if(UA_String_equal(&current->registeredServer.serverUri,
+                                   &request->serverUris[i])) {
                     usable = true;
                     break;
                 }
@@ -225,11 +189,11 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
 
     /* Clone the endpoint for each networklayer? */
     size_t clone_times = 1;
-    /* UA_Boolean nl_endpointurl = false; */
-    /* if(endpointUrl->length == 0) { */
-    /*     clone_times = server->config.networkLayersSize; */
-    /*     nl_endpointurl = true; */
-    /* } */
+    UA_Boolean use_discovery = false;
+    if(endpointUrl->length == 0) {
+        clone_times = server->config.applicationDescription.discoveryUrlsSize;
+        use_discovery = true;
+    }
 
     /* Allocate enough memory */
     response->endpoints = (UA_EndpointDescription*)
@@ -262,30 +226,28 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
             retval |= UA_EndpointDescription_copy(&server->config.endpoints[j],
                                                   &response->endpoints[pos]);
             UA_String_clear(&response->endpoints[pos].endpointUrl);
-            UA_Array_delete(response->endpoints[pos].server.discoveryUrls,
-                            response->endpoints[pos].server.discoveryUrlsSize,
-                            &UA_TYPES[UA_TYPES_STRING]);
-            response->endpoints[pos].server.discoveryUrls = NULL;
-            response->endpoints[pos].server.discoveryUrlsSize = 0;
-            /* if(nl_endpointurl) */
-            /*     endpointUrl = &server->config.networkLayers[i].discoveryUrl; */
-            retval |= UA_String_copy(endpointUrl, &response->endpoints[pos].endpointUrl);
-            retval |= UA_Array_copy(endpointUrl, 1,
-                                    (void**)&response->endpoints[pos].server.discoveryUrls,
-                                    &UA_TYPES[UA_TYPES_STRING]);
+            if(use_discovery) {
+                retval |=
+                    UA_String_copy(&server->config.applicationDescription.discoveryUrls[i],
+                                   &response->endpoints[pos].endpointUrl);
+            } else {
+                /* Mirror back the requested EndpointUrl and also add it to the
+                 * array of discovery urls */
+                retval |= UA_String_copy(endpointUrl, &response->endpoints[pos].endpointUrl);
+                retval |=
+                    UA_Array_appendCopy((void**)&response->endpoints[pos].server.discoveryUrls,
+                                        &response->endpoints[pos].server.discoveryUrlsSize,
+                                        endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
+            }
             if(retval != UA_STATUSCODE_GOOD)
                 goto error;
-            response->endpoints[pos].server.discoveryUrlsSize = 1;
             pos++;
         }
     }
 
     UA_assert(pos <= server->config.endpointsSize * clone_times);
     response->endpointsSize = pos;
-
-    /* Clean up the memory of there are no usable results */
-    if(pos > 0)
-        return;
+    return;
 
 error:
     response->responseHeader.serviceResult = retval;
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index ad461fb35ee..67b77ba51ce 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -76,16 +76,16 @@ multicastListenStop(UA_Server* server) {
 
 static UA_StatusCode
 addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
-                             const UA_ServerNetworkLayer* nl) {
+                             const UA_String *discoveryUrl) {
     UA_String hostname = UA_STRING_NULL;
     UA_UInt16 port = 4840;
     UA_String path = UA_STRING_NULL;
-    UA_StatusCode retval = UA_parseEndpointUrl(&nl->discoveryUrl, &hostname,
+    UA_StatusCode retval = UA_parseEndpointUrl(discoveryUrl, &hostname,
                                                &port, &path);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_NETWORK,
                        "Server url is invalid: %.*s",
-                       (int)nl->discoveryUrl.length, nl->discoveryUrl.data);
+                       (int)discoveryUrl->length, discoveryUrl->data);
         return retval;
     }
 
@@ -105,8 +105,8 @@ addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
 
 void startMulticastDiscoveryServer(UA_Server *server) {
     UA_String *appName = &server->config.mdnsConfig.mdnsServerName;
-    for(size_t i = 0; i < server->config.networkLayersSize; i++)
-        addMdnsRecordForNetworkLayer(server, appName, &server->config.networkLayers[i]);
+    for(size_t i = 0; i < server->config.serverUrlsSize; i++)
+        addMdnsRecordForNetworkLayer(server, appName, &server->config.serverUrls[i]);
 
     /* find any other server on the net */
     UA_Discovery_multicastQuery(server);
@@ -118,24 +118,23 @@ void startMulticastDiscoveryServer(UA_Server *server) {
 
 void
 stopMulticastDiscoveryServer(UA_Server *server) {
-    if (!server->discoveryManager.mdnsDaemon)
+    if(!server->discoveryManager.mdnsDaemon)
         return;
 
-    for (size_t i=0; i<server->config.networkLayersSize; i++) {
-
+    for(size_t i = 0; i < server->config.serverUrlsSize; i++) {
         UA_String hostname = UA_STRING_NULL;
         UA_String path = UA_STRING_NULL;
         UA_UInt16 port = 0;
 
-        UA_StatusCode retval = UA_parseEndpointUrl(&server->config.networkLayers[i].discoveryUrl, &hostname,
-                                                   &port, &path);
+        UA_StatusCode retval =
+            UA_parseEndpointUrl(&server->config.serverUrls[i],
+                                &hostname, &port, &path);
 
-        if (retval != UA_STATUSCODE_GOOD)
+        if(retval != UA_STATUSCODE_GOOD || hostname.length == 0)
             continue;
 
         UA_Discovery_removeRecord(server, &server->config.mdnsConfig.mdnsServerName,
                                   &hostname, port, true);
-
     }
 
 #if UA_MULTITHREADING >= 100

From 37b8ff8872dbde18c34c8c9a96ef349a1921bddc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 18 Apr 2022 18:58:14 +0200
Subject: [PATCH 0109/1963] refactor(plugin): Set default server urls in the
 config

---
 plugins/ua_config_default.c | 47 +++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 863cb1b1270..a1168ed118e 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -432,6 +432,51 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
         return retval;
     }
 
+    /* Set up the local ServerUrls. They are used during startup to initialize
+     * the server sockets. */
+    UA_String serverUrls[2];
+    size_t serverUrlsSize = 0;
+    char hostnamestr[256];
+    char serverUrlBuffer[2][512];
+
+    /* 1) Listen on all interfaces (also external). This must be the first entry
+     * if this is desired. Otherwise some interfaces may be blocked (already in
+     * use) with a hostname that is only locally reachable.*/
+    UA_snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
+                "opc.tcp://:%u", portNumber);
+    serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[0]);
+    serverUrlsSize++;
+
+    /* 2) Based on the local hostname. For that temporarily initialize the
+     * Winsock API on Win32. */
+
+#ifdef _WIN32
+    WSADATA wsaData;
+    WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
+    int err = UA_gethostname(hostnamestr, sizeof(hostnamestr));
+#ifdef _WIN32
+    WSACleanup();
+#endif
+
+    if(err == 0) {
+        UA_snprintf(serverUrlBuffer[1], sizeof(serverUrlBuffer[1]),
+                    "opc.tcp://%s:%u", hostnamestr, portNumber);
+        serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[1]);
+        serverUrlsSize++;
+    }
+
+    /* 3) Add to the config */
+    retval =
+        UA_Array_copy(serverUrls, serverUrlsSize,
+                      (void**)&config->serverUrls, &UA_TYPES[UA_TYPES_STRING]);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_ServerConfig_clean(config);
+        return retval;
+    }
+    config->serverUrlsSize = serverUrlsSize;
+
+    /* Set the TCP settings */
     config->tcpBufSize = recvBufferSize;
 
     /* Allocate the SecurityPolicies */
@@ -678,8 +723,6 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
     if (retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    config->tcpListenPort = portNumber;
-
     retval = UA_ServerConfig_addAllSecurityPolicies(conf, certificate, privateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);

From 300fea4f2128dda28591f40d18cb9b525844fb03 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 18 Apr 2022 19:45:28 +0200
Subject: [PATCH 0110/1963] refactor(el): Simplify use of getnameinfo in the
 UDP ConnectionManager

---
 arch/eventloop_posix_udp.c | 54 +++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 395f1883f51..7d85108496d 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -229,31 +229,22 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 }
 
 static void
-UDP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
-                         void *application, void *context,
+UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
+                         struct addrinfo *ai, void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback) {
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get logging information */
     char hoststr[256];
-    char portstr[16];
     int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                                 hoststr, sizeof(hoststr),
-                                 portstr, sizeof(portstr), NI_NUMERICSERV);
+                                 hoststr, sizeof(hoststr), NULL, 0, 0);
     if(get_res != 0) {
-        get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                                 hoststr, sizeof(hoststr),
-                                 portstr, sizeof(portstr),
-                                 NI_NUMERICHOST | NI_NUMERICSERV);
-        if(get_res != 0) {
-            hoststr[0] = 0;
-            portstr[0] = 0;
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                               "UDP\t| getnameinfo(...) could not resolve the hostname (%s)",
-                               errno_str));
-        }
+        hoststr[0] = 0;
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "UDP\t| getnameinfo(...) could not resolve the hostname (%s)",
+                          errno_str));
     }
     
     /* Create the server socket */
@@ -262,14 +253,14 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "UDP %u\t| Error opening the listen socket for "
-                          "\"%s\" on port %s(%s)",
-                          (unsigned)listenSocket, hoststr, portstr, errno_str));
+                          "\"%s\" on port %u (%s)",
+                          (unsigned)listenSocket, hoststr, port, errno_str));
         return;
     }
 
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                "UDP %u\t| New server socket for \"%s\" on port %s",
-                (unsigned)listenSocket, hoststr, portstr);
+                "UDP %u\t| New server socket for \"%s\" on port %u",
+                (unsigned)listenSocket, hoststr, port);
 
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
@@ -362,7 +353,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
 
 static UA_StatusCode
 UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
-                          const char *port, void *application, void *context,
+                          UA_UInt16 port, void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback) {
     /* Get all the interface and IPv4/6 combinations for the configured hostname */
     struct addrinfo hints, *res;
@@ -380,12 +371,16 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
                                       * such address is configured */
 #endif
 
-    int retcode = UA_getaddrinfo(hostname, port, &hints, &res);
+    /* Set up the port string */
+    char portstr[6];
+    UA_snprintf(portstr, 6, "%d", port);
+
+    int retcode = UA_getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
         UA_LOG_SOCKET_ERRNO_GAI_WRAP(
            UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
                           UA_LOGCATEGORY_NETWORK,
-                          "UDP\t| getaddrinfo lookup for \"%s\" on port %s failed (%s)",
+                          "UDP\t| getaddrinfo lookup for \"%s\" on port %u failed (%s)",
                           hostname, port, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -393,7 +388,7 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
     /* Add listen sockets */
     struct addrinfo *ai = res;
     while(ai) {
-        UDP_registerListenSocket(cm, ai, application, context, connectionCallback);
+        UDP_registerListenSocket(cm, port, ai, application, context, connectionCallback);
         ai = ai->ai_next;
     }
     UA_freeaddrinfo(res);
@@ -424,6 +419,7 @@ UDP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
 
     UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
                  "UDP %u\t| Shutdown called", (unsigned)rfd->fd);
+
     UA_DelayedCallback *dc = &rfd->dc;
     dc->callback = UDP_delayedClose;
     dc->application = cm;
@@ -659,7 +655,6 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get the socket */
-    char portno[6];
     const UA_UInt16 *port = (const UA_UInt16*)
         UA_KeyValueMap_getScalar(params, paramsSize,
                                  UA_QUALIFIEDNAME(0, "listen-port"),
@@ -669,7 +664,6 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
                      "UDP\t| Port information required for UDP listening");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    UA_snprintf(portno, 6, "%d", *port);
 
     /* Get the hostnames configuration */
     const UA_Variant *hostNames =
@@ -679,7 +673,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
         /* No hostnames configured -> listen on all interfaces*/
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, portno, application,
+        return UDP_registerListenSockets(cm, NULL, *port, application,
                                          context, connectionCallback);
     }
 
@@ -695,7 +689,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
     if(interfaces == 0) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, portno, application,
+        return UDP_registerListenSockets(cm, NULL, *port, application,
                                          context, connectionCallback);
     }
     
@@ -707,7 +701,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
             continue;
         memcpy(hostname, hostStrings[i].data, hostStrings->length);
         hostname[hostStrings->length] = '\0';
-        UDP_registerListenSockets(cm, hostname, portno, application,
+        UDP_registerListenSockets(cm, hostname, *port, application,
                                   context, connectionCallback);
     }
 

From 66e40037114274614559d41d3ec444b86aaf1967 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 19 Apr 2022 00:21:35 +0200
Subject: [PATCH 0111/1963] fix(el): Avoid lookup of remote hostnames, use IPs
 for logging

Looking up hostnames is blocking and can take enormeous time.
The c-ares library could be used to make it non-blocking - at the
expense of additional complexity.
---
 arch/eventloop_posix_tcp.c | 7 ++++---
 arch/eventloop_posix_udp.c | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 5981a1c58d9..76b3ff076fc 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -273,7 +273,8 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     /* Log the name of the remote host */
     char hoststr[256];
     int get_res = UA_getnameinfo((struct sockaddr *)&remote, sizeof(remote),
-                                 hoststr, sizeof(hoststr), NULL, 0, 0);
+                                 hoststr, sizeof(hoststr),
+                                 NULL, 0, NI_NUMERICHOST);
     if(get_res != 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
@@ -350,7 +351,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     char hoststr[256];
     int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
                                  hoststr, sizeof(hoststr),
-                                 NULL, 0, 0);
+                                 NULL, 0, NI_NUMERICHOST);
     if(get_res != 0) {
         hoststr[0] = 0;
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -506,8 +507,8 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
     hints.ai_family = AF_INET;   /* IPv4 only */
 #endif
     hints.ai_socktype = SOCK_STREAM;
-    hints.ai_flags = AI_PASSIVE;
     hints.ai_protocol = IPPROTO_TCP;
+    hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
 #ifdef AI_ADDRCONFIG
     hints.ai_flags |= AI_ADDRCONFIG; /* Only return IPv4/IPv6 if at least one
                                       * such address is configured */
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 7d85108496d..bf0e559a10b 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -238,7 +238,8 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
     /* Get logging information */
     char hoststr[256];
     int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                                 hoststr, sizeof(hoststr), NULL, 0, 0);
+                                 hoststr, sizeof(hoststr),
+                                 NULL, 0, NI_NUMERICHOST);
     if(get_res != 0) {
         hoststr[0] = 0;
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -364,8 +365,8 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
     hints.ai_family = AF_INET;   /* IPv4 only */
 #endif
     hints.ai_socktype = SOCK_DGRAM;
-    hints.ai_flags = AI_PASSIVE;
     hints.ai_protocol = IPPROTO_UDP;
+    hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
 #ifdef AI_ADDRCONFIG
     hints.ai_flags |= AI_ADDRCONFIG; /* Only return IPv4/IPv6 if at least one
                                       * such address is configured */

From ea3d7b31454f0514e6c67eab474ea8d4e5d9e7f1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 20 Apr 2022 17:35:18 +0200
Subject: [PATCH 0112/1963] fix(el): Release the EventLoop log before calling
 stop on the EventSources

---
 arch/eventloop_posix.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 87e44e2be1e..1d5ebdb5042 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -186,8 +186,11 @@ UA_EventLoopPOSIX_stop(UA_EventLoopPOSIX *el) {
     UA_EventSource *es = el->eventLoop.eventSources;
     while(es) {
         if(es->state == UA_EVENTSOURCESTATE_STARTING ||
-           es->state == UA_EVENTSOURCESTATE_STARTED)
+           es->state == UA_EVENTSOURCESTATE_STARTED) {
+            UA_UNLOCK(&el->elMutex);
             es->stop(es);
+            UA_LOCK(&el->elMutex);
+        }
         es = es->next;
     }
 

From 362cb04ebca06ebbddd93dd2eb0dea43d8e4c705 Mon Sep 17 00:00:00 2001
From: jackybek <jackybek@gmail.com>
Date: Tue, 26 Apr 2022 17:48:10 +0800
Subject: [PATCH 0113/1963] fix(plugin): Skip verifying ApplicationURI if
 securityPolicy=#None (#4986)

---
 src/client/ua_client_connect.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 7c1799859bf..22c250e90fd 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -998,6 +998,15 @@ verifyClientApplicationURI(const UA_Client *client) {
 #if defined(UA_ENABLE_ENCRYPTION) && (UA_LOGLEVEL <= 400)
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         UA_SecurityPolicy *sp = &client->config.securityPolicies[i];
+        
+        if(sp->localCertificate.data == NULL) 
+        {
+                UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                "skip verifying ApplicationURI for the SecurityPolicy %.*s",
+                (int)sp->policyUri.length, sp->policyUri.data);
+                continue;
+        }
+        
         UA_StatusCode retval =
             client->config.certificateVerification.
             verifyApplicationURI(client->config.certificateVerification.context,

From 76b81b94fb2b437b3c55a37725c06dc7743ba90c Mon Sep 17 00:00:00 2001
From: MichalTyndel <99327189+MichalTyndel@users.noreply.github.com>
Date: Tue, 26 Apr 2022 11:48:54 +0200
Subject: [PATCH 0114/1963] fix(client): Return method output arguments to the
 caller when result is not bad (#4956)

When method returns statuscode Uncertain it may pass detailed status
information in output arguments.
---
 src/client/ua_client_highlevel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index e025f06b574..f588c4be846 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -259,7 +259,7 @@ UA_Client_call(UA_Client *client, const UA_NodeId objectId,
         else
             retval = UA_STATUSCODE_BADUNEXPECTEDERROR;
     }
-    if(retval != UA_STATUSCODE_GOOD) {
+    if(UA_StatusCode_isBad(retval)) {
         UA_CallResponse_clear(&response);
         return retval;
     }

From f40bae6a1e52b5158181ed5f6dec0208ecc301c2 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Tue, 5 Apr 2022 23:21:37 +0200
Subject: [PATCH 0115/1963] feat(pubsub): Implement a heartbeat message

---
 src/pubsub/ua_pubsub.h                |   5 +
 src/pubsub/ua_pubsub_networkmessage.c |  13 +-
 src/pubsub/ua_pubsub_reader.c         |  18 ++
 src/pubsub/ua_pubsub_writer.c         | 254 ++++++++++++++++++++++----
 src/pubsub/ua_pubsub_writergroup.c    |  94 ++++++----
 5 files changed, 312 insertions(+), 72 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index c004fa9066f..ccd6c1895c7 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -154,6 +154,11 @@ UA_StatusCode
 UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
                         UA_DataSetWriter *dataSetWriter);
 
+UA_StatusCode
+UA_DataSetWriter_generateDataSetMessageHeartbeat(UA_Server *server,
+                                                 UA_DataSetMessage *dataSetMessage,
+                                                 UA_DataSetWriter *dataSetWriter);
+
 /**********************************************/
 /*               WriterGroup                  */
 /**********************************************/
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 9a308efe599..4b16347d349 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1430,6 +1430,11 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
     UA_StatusCode rv = UA_DataSetMessageHeader_encodeBinary(&src->header, bufPos, bufEnd);
     UA_CHECK_STATUS(rv, return rv);
 
+    if(src->data.keyFrameData.fieldCount == 0) {
+        /* That's a heartbeat - nothing more to encode */
+        return rv;
+    }
+
     if(src->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
         if(src->header.fieldEncoding != UA_FIELDENCODING_RAWDATA) {
             rv = UA_UInt16_encodeBinary(&(src->data.keyFrameData.fieldCount), bufPos, bufEnd);
@@ -1494,6 +1499,11 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
     UA_CHECK_STATUS(rv, return rv);
 
     if(dst->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
+        if(*offset == src->length) {
+            /* Message ends after the header, that's a heartbeat */
+            return rv;
+        }
+        
         switch(dst->header.fieldEncoding) {
             case UA_FIELDENCODING_VARIANT:
             {
@@ -1638,7 +1648,8 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
     if(p->header.configVersionMinorVersionEnabled)
         size += UA_UInt32_calcSizeBinary(&p->header.configVersionMinorVersion);
 
-    if(p->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
+    /* Keyframe with no fields is a heartbeat, stop counting then */
+    if(p->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME && p->data.keyFrameData.fieldCount != 0) {
         if(p->header.fieldEncoding != UA_FIELDENCODING_RAWDATA){
             size += UA_calcSizeBinary(&p->data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_UINT16]);
         }
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 52c4bf0c775..cfc335eedbd 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1002,6 +1002,24 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
     if(!dsr || !rg || !msg || !server)
         return;
 
+    /* Check the metadata, to see if this reader is configured for a heartbeat */
+    if(dsr->config.dataSetMetaData.fieldsSize == 0 &&
+       dsr->config.dataSetMetaData.configurationVersion.majorVersion == 0 &&
+       dsr->config.dataSetMetaData.configurationVersion.minorVersion == 0) {
+        /* Expecting a heartbeat, check the message */
+        if(msg->header.dataSetMessageType != UA_DATASETMESSAGE_DATAKEYFRAME ||
+            msg->header.configVersionMajorVersion != 0 ||
+            msg->header.configVersionMinorVersion != 0 ||
+            msg->data.keyFrameData.fieldCount != 0) {
+                UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                            "This DSR expects heartbeat, but the received message doesn't seem to be so.");
+        }
+#ifdef UA_ENABLE_PUBSUB_MONITORING
+        UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
+#endif
+        return;
+    }
+
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "DataSetReader '%.*s': received a network message",
                  (int) dsr->config.name.length, dsr->config.name.data);
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index ddb300e870c..a255143fc9f 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -719,17 +719,28 @@ UA_Server_addDataSetWriter(UA_Server *server,
     if(!dataSetWriterConfig)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_PublishedDataSet *currentDataSetContext =
-        UA_PublishedDataSet_findPDSbyId(server, dataSet);
-    if(!currentDataSetContext)
-        return UA_STATUSCODE_BADNOTFOUND;
-
-    if(currentDataSetContext->configurationFrozen){
+    /* Make checks for a heartbeat */ 
+    if(UA_NodeId_isNull(&dataSet) && dataSetWriterConfig->keyFrameCount != 1) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Adding DataSetWriter failed. PublishedDataSet is frozen.");
+                       "Adding DataSetWriter failed. DataSet can be null only for a heartbeat, "
+                       "in which case KeyFrameCount shall be 1.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
+    UA_PublishedDataSet *currentDataSetContext = NULL;
+
+    if(!UA_NodeId_isNull(&dataSet)) {
+        currentDataSetContext = UA_PublishedDataSet_findPDSbyId(server, dataSet);
+        if(!currentDataSetContext)
+            return UA_STATUSCODE_BADNOTFOUND;
+
+        if(currentDataSetContext->configurationFrozen){
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                        "Adding DataSetWriter failed. PublishedDataSet is frozen.");
+            return UA_STATUSCODE_BADCONFIGURATIONERROR;
+        }
+    }
+
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
@@ -740,14 +751,16 @@ UA_Server_addDataSetWriter(UA_Server *server,
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    if(wg->config.rtLevel != UA_PUBSUB_RT_NONE) {
-        UA_DataSetField *tmpDSF;
-        TAILQ_FOREACH(tmpDSF, &currentDataSetContext->fields, listEntry) {
-            if(!tmpDSF->config.field.variable.rtValueSource.rtFieldSourceEnabled &&
-               !tmpDSF->config.field.variable.rtValueSource.rtInformationModelNode) {
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                               "Adding DataSetWriter failed. Fields in PDS are not RT capable.");
-                return UA_STATUSCODE_BADCONFIGURATIONERROR;
+    if(!UA_NodeId_isNull(&dataSet)) {
+        if(wg->config.rtLevel != UA_PUBSUB_RT_NONE) {
+            UA_DataSetField *tmpDSF;
+            TAILQ_FOREACH(tmpDSF, &currentDataSetContext->fields, listEntry) {
+                if(!tmpDSF->config.field.variable.rtValueSource.rtFieldSourceEnabled &&
+                !tmpDSF->config.field.variable.rtValueSource.rtInformationModelNode) {
+                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                "Adding DataSetWriter failed. Fields in PDS are not RT capable.");
+                    return UA_STATUSCODE_BADCONFIGURATIONERROR;
+                }
             }
         }
     }
@@ -775,30 +788,38 @@ UA_Server_addDataSetWriter(UA_Server *server,
     res = UA_DataSetWriterConfig_copy(dataSetWriterConfig, &newDataSetWriter->config);
     UA_CHECK_STATUS(res, UA_free(newDataSetWriter); return res);
 
-    /* Save the current version of the connected PublishedDataSet */
-    newDataSetWriter->connectedDataSetVersion =
-        currentDataSetContext->dataSetMetaData.configurationVersion;
-
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
-    /* Initialize the queue for the last values */
-    if(currentDataSetContext->fieldSize > 0) {
-        newDataSetWriter->lastSamples = (UA_DataSetWriterSample*)
-            UA_calloc(currentDataSetContext->fieldSize, sizeof(UA_DataSetWriterSample));
-        if(!newDataSetWriter->lastSamples) {
-            UA_DataSetWriterConfig_clear(&newDataSetWriter->config);
-            UA_free(newDataSetWriter);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        newDataSetWriter->lastSamplesCount = currentDataSetContext->fieldSize;
-        for(size_t i = 0; i < newDataSetWriter->lastSamplesCount; i++) {
-            UA_DataValue_init(&newDataSetWriter->lastSamples[i].value);
-            newDataSetWriter->lastSamples[i].valueChanged = false;
+    if(!UA_NodeId_isNull(&dataSet)) {
+        /* Save the current version of the connected PublishedDataSet */
+        newDataSetWriter->connectedDataSetVersion =
+            currentDataSetContext->dataSetMetaData.configurationVersion;
+
+    #ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
+        /* Initialize the queue for the last values */
+        if(currentDataSetContext->fieldSize > 0) {
+            newDataSetWriter->lastSamples = (UA_DataSetWriterSample*)
+                UA_calloc(currentDataSetContext->fieldSize, sizeof(UA_DataSetWriterSample));
+            if(!newDataSetWriter->lastSamples) {
+                UA_DataSetWriterConfig_clear(&newDataSetWriter->config);
+                UA_free(newDataSetWriter);
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+            newDataSetWriter->lastSamplesCount = currentDataSetContext->fieldSize;
+            for(size_t i = 0; i < newDataSetWriter->lastSamplesCount; i++) {
+                UA_DataValue_init(&newDataSetWriter->lastSamples[i].value);
+                newDataSetWriter->lastSamples[i].valueChanged = false;
+            }
         }
+    #endif
+
+        /* Connect PublishedDataSet with DataSetWriter */
+        newDataSetWriter->connectedDataSet = currentDataSetContext->identifier;
+    } else {
+        /* If the dataSet is NULL, we are adding a heartbeat writer */
+        newDataSetWriter->connectedDataSetVersion.majorVersion = 0;
+        newDataSetWriter->connectedDataSetVersion.minorVersion = 0;
+        newDataSetWriter->connectedDataSet = UA_NODEID_NULL;
     }
-#endif
 
-    /* Connect PublishedDataSet with DataSetWriter */
-    newDataSetWriter->connectedDataSet = currentDataSetContext->identifier;
     newDataSetWriter->linkedWriterGroup = wg->identifier;
 
     /* Add the new writer to the group */
@@ -1355,4 +1376,165 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
                                                           dataSetWriter);
 }
 
+UA_StatusCode
+UA_DataSetWriter_generateDataSetMessageHeartbeat(UA_Server *server, UA_DataSetMessage *dataSetMessage,
+                                                 UA_DataSetWriter *dataSetWriter) {
+
+    if (!UA_NodeId_isNull(&dataSetWriter->connectedDataSet )){
+    	UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    	                       " Heartbeat message expected !");
+        return UA_STATUSCODE_BADCONFIGURATIONERROR;
+    }
+    /* Reset the message */
+    memset(dataSetMessage, 0, sizeof(UA_DataSetMessage));
+
+    /* store messageType to switch between json or uadp (default) */
+    UA_UInt16 messageType = UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE;
+    UA_JsonDataSetWriterMessageDataType *jsonDataSetWriterMessageDataType = NULL;
+
+    /* The configuration Flags are included
+     * inside the std. defined UA_UadpDataSetWriterMessageDataType */
+    UA_UadpDataSetWriterMessageDataType defaultUadpConfiguration;
+    UA_UadpDataSetWriterMessageDataType *dataSetWriterMessageDataType = NULL;
+    if((dataSetWriter->config.messageSettings.encoding == UA_EXTENSIONOBJECT_DECODED ||
+        dataSetWriter->config.messageSettings.encoding == UA_EXTENSIONOBJECT_DECODED_NODELETE) &&
+       (dataSetWriter->config.messageSettings.content.decoded.type ==
+        &UA_TYPES[UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE])) {
+        dataSetWriterMessageDataType = (UA_UadpDataSetWriterMessageDataType *)
+            dataSetWriter->config.messageSettings.content.decoded.data;
+
+        /* type is UADP */
+        messageType = UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE;
+    } else if((dataSetWriter->config.messageSettings.encoding == UA_EXTENSIONOBJECT_DECODED ||
+               dataSetWriter->config.messageSettings.encoding == UA_EXTENSIONOBJECT_DECODED_NODELETE) &&
+              (dataSetWriter->config.messageSettings.content.decoded.type ==
+               &UA_TYPES[UA_TYPES_JSONDATASETWRITERMESSAGEDATATYPE])) {
+        jsonDataSetWriterMessageDataType = (UA_JsonDataSetWriterMessageDataType *)
+            dataSetWriter->config.messageSettings.content.decoded.data;
+
+        /* type is JSON */
+        messageType = UA_TYPES_JSONDATASETWRITERMESSAGEDATATYPE;
+    } else {
+        /* create default flag configuration if no
+         * UadpDataSetWriterMessageDataType was passed in */
+        memset(&defaultUadpConfiguration, 0, sizeof(UA_UadpDataSetWriterMessageDataType));
+        defaultUadpConfiguration.dataSetMessageContentMask = (UA_UadpDataSetMessageContentMask)
+            ((u64)UA_UADPDATASETMESSAGECONTENTMASK_TIMESTAMP |
+             (u64)UA_UADPDATASETMESSAGECONTENTMASK_MAJORVERSION |
+             (u64)UA_UADPDATASETMESSAGECONTENTMASK_MINORVERSION);
+        dataSetWriterMessageDataType = &defaultUadpConfiguration;
+    }
+
+    /* Sanity-test the configuration */
+    if(dataSetWriterMessageDataType &&
+       (dataSetWriterMessageDataType->networkMessageNumber != 0 ||
+        dataSetWriterMessageDataType->dataSetOffset != 0 ||
+        dataSetWriterMessageDataType->configuredSize != 0)) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "Static DSM configuration not supported. Using defaults");
+        dataSetWriterMessageDataType->networkMessageNumber = 0;
+        dataSetWriterMessageDataType->dataSetOffset = 0;
+        dataSetWriterMessageDataType->configuredSize = 0;
+    }
+
+    /* The field encoding depends on the flags inside the writer config.
+     * TODO: This can be moved to the encoding layer. */
+    if(dataSetWriter->config.dataSetFieldContentMask &
+       (u64)UA_DATASETFIELDCONTENTMASK_RAWDATA) {
+        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_RAWDATA;
+    } else if((u64)dataSetWriter->config.dataSetFieldContentMask &
+              ((u64)UA_DATASETFIELDCONTENTMASK_SOURCETIMESTAMP |
+               (u64)UA_DATASETFIELDCONTENTMASK_SERVERPICOSECONDS |
+               (u64)UA_DATASETFIELDCONTENTMASK_SOURCEPICOSECONDS |
+               (u64)UA_DATASETFIELDCONTENTMASK_STATUSCODE)) {
+        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    } else {
+        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_VARIANT;
+    }
+
+    if(messageType == UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE) {
+        /* Std: 'The DataSetMessageContentMask defines the flags for the content
+         * of the DataSetMessage header.' */
+        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_UADPDATASETMESSAGECONTENTMASK_MAJORVERSION) {
+            dataSetMessage->header.configVersionMajorVersionEnabled = true;
+            dataSetMessage->header.configVersionMajorVersion = 0;
+              ;
+        }
+        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_UADPDATASETMESSAGECONTENTMASK_MINORVERSION) {
+            dataSetMessage->header.configVersionMinorVersionEnabled = true;
+            dataSetMessage->header.configVersionMinorVersion =
+                0;
+        }
+
+        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_UADPDATASETMESSAGECONTENTMASK_SEQUENCENUMBER) {
+            dataSetMessage->header.dataSetMessageSequenceNrEnabled = true;
+            dataSetMessage->header.dataSetMessageSequenceNr =
+                dataSetWriter->actualDataSetMessageSequenceCount;
+        }
+
+        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_UADPDATASETMESSAGECONTENTMASK_TIMESTAMP) {
+            dataSetMessage->header.timestampEnabled = true;
+            dataSetMessage->header.timestamp = UA_DateTime_now();
+        }
+        /* TODO: Picoseconds resolution not supported atm */
+        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_UADPDATASETMESSAGECONTENTMASK_PICOSECONDS) {
+            dataSetMessage->header.picoSecondsIncluded = false;
+        }
+
+        /* TODO: Statuscode not supported yet */
+        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_UADPDATASETMESSAGECONTENTMASK_STATUS) {
+            dataSetMessage->header.statusEnabled = true;
+            dataSetMessage->header.status = UA_STATUSCODE_GOOD;
+        }
+    } else if(messageType == UA_TYPES_JSONDATASETWRITERMESSAGEDATATYPE) {
+        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_JSONDATASETMESSAGECONTENTMASK_METADATAVERSION) {
+            dataSetMessage->header.configVersionMajorVersionEnabled = true;
+            dataSetMessage->header.configVersionMajorVersion = 0;
+
+        }
+        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_JSONDATASETMESSAGECONTENTMASK_METADATAVERSION) {
+            dataSetMessage->header.configVersionMinorVersionEnabled = true;
+            dataSetMessage->header.configVersionMinorVersion =
+               0;
+        }
+
+        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_JSONDATASETMESSAGECONTENTMASK_SEQUENCENUMBER) {
+            dataSetMessage->header.dataSetMessageSequenceNrEnabled = true;
+            dataSetMessage->header.dataSetMessageSequenceNr =
+                dataSetWriter->actualDataSetMessageSequenceCount;
+        }
+
+        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_JSONDATASETMESSAGECONTENTMASK_TIMESTAMP) {
+            dataSetMessage->header.timestampEnabled = true;
+            dataSetMessage->header.timestamp = UA_DateTime_now();
+        }
+
+        /* TODO: Statuscode not supported yet */
+        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
+           (u64)UA_JSONDATASETMESSAGECONTENTMASK_STATUS) {
+            dataSetMessage->header.statusEnabled = true;
+            dataSetMessage->header.status = UA_STATUSCODE_GOOD;
+        }
+    }
+
+    /* Set the sequence count. Automatically rolls over to zero */
+    dataSetWriter->actualDataSetMessageSequenceCount++;
+    /* Prepare DataSetMessageContent */
+    dataSetMessage->header.dataSetMessageValid = true;
+    dataSetMessage->header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dataSetMessage->data.keyFrameData.fieldCount = 0; // Heartbeat
+
+    return UA_STATUSCODE_GOOD;
+}
+
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 725105f3cba..2eddb491e42 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -188,12 +188,15 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
         /* PublishedDataSet freezeCounter++ */
         UA_PublishedDataSet *publishedDataSet =
             UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
-        publishedDataSet->configurationFreezeCounter++;
-        publishedDataSet->configurationFrozen = true;
-        /* DataSetFields freeze */
-        UA_DataSetField *dataSetField;
-        TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry) {
-            dataSetField->configurationFrozen = true;
+        /* Skip the below for heartbeat writers (without an associated PDS) */
+        if(publishedDataSet) {
+            publishedDataSet->configurationFreezeCounter++;
+            publishedDataSet->configurationFrozen = true;
+            /* DataSetFields freeze */
+            UA_DataSetField *dataSetField;
+            TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry) {
+                dataSetField->configurationFrozen = true;
+            }
         }
     }
 
@@ -221,47 +224,68 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
         UA_PublishedDataSet *pds =
             UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
         if(!pds) {
+            if (UA_NodeId_isNull(&dsw->connectedDataSet)) {
+                UA_StatusCode res1 =
+                        UA_DataSetWriter_generateDataSetMessageHeartbeat(server,
+                                &dsmStore[dsmCount], dsw);
+                if (res1 != UA_STATUSCODE_GOOD) {
+                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                            "PubSub Publish: Heartbeat DataSetMessage creation failed");
+                    continue;
+                }
+                dsWriterIds[dsmCount] = dsw->config.dataSetWriterId;
+                dsmCount++;
+                continue;
+            }
+
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "PubSub Publish: PublishedDataSet not found");
             continue;
         }
-        if(pds->promotedFieldsCount > 0) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "PubSub-RT configuration fail: PDS contains promoted fields.");
-            return UA_STATUSCODE_BADNOTSUPPORTED;
-        }
 
-        /* Test the DataSetFields */
-        UA_DataSetField *dsf;
-        TAILQ_FOREACH(dsf, &pds->fields, listEntry) {
-            const UA_VariableNode *rtNode = (const UA_VariableNode *)
-                UA_NODESTORE_GET(server, &dsf->config.field.variable.publishParameters.publishedVariable);
-            if(rtNode != NULL && rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
+        if(pds) {
+            if(pds->promotedFieldsCount > 0) {
                 UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                               "PubSub-RT configuration fail: PDS contains field without external data source.");
-                UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
+                            "PubSub-RT configuration fail: PDS contains promoted fields.");
                 return UA_STATUSCODE_BADNOTSUPPORTED;
             }
-            UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
-            if((UA_NodeId_equal(&dsf->fieldMetaData.dataType, &UA_TYPES[UA_TYPES_STRING].typeId) ||
-                UA_NodeId_equal(&dsf->fieldMetaData.dataType,
-                                &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
-               dsf->fieldMetaData.maxStringLength == 0) {
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                               "PubSub-RT configuration fail: "
-                               "PDS contains String/ByteString with dynamic length.");
-                return UA_STATUSCODE_BADNOTSUPPORTED;
-            } else if(!UA_DataType_isNumeric(UA_findDataType(&dsf->fieldMetaData.dataType)) &&
-                      !UA_NodeId_equal(&dsf->fieldMetaData.dataType, &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                               "PubSub-RT configuration fail: "
-                               "PDS contains variable with dynamic size.");
-                return UA_STATUSCODE_BADNOTSUPPORTED;
+
+            /* Test the DataSetFields */
+            UA_DataSetField *dsf;
+            TAILQ_FOREACH(dsf, &pds->fields, listEntry) {
+                const UA_VariableNode *rtNode = (const UA_VariableNode *)
+                    UA_NODESTORE_GET(server, &dsf->config.field.variable.publishParameters.publishedVariable);
+                if(rtNode != NULL && rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
+                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                "PubSub-RT configuration fail: PDS contains field without external data source.");
+                    UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
+                    return UA_STATUSCODE_BADNOTSUPPORTED;
+                }
+                UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
+                if((UA_NodeId_equal(&dsf->fieldMetaData.dataType, &UA_TYPES[UA_TYPES_STRING].typeId) ||
+                    UA_NodeId_equal(&dsf->fieldMetaData.dataType,
+                                    &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
+                dsf->fieldMetaData.maxStringLength == 0) {
+                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                "PubSub-RT configuration fail: "
+                                "PDS contains String/ByteString with dynamic length.");
+                    return UA_STATUSCODE_BADNOTSUPPORTED;
+                } else if(!UA_DataType_isNumeric(UA_findDataType(&dsf->fieldMetaData.dataType)) &&
+                        !UA_NodeId_equal(&dsf->fieldMetaData.dataType, &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
+                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                "PubSub-RT configuration fail: "
+                                "PDS contains variable with dynamic size.");
+                    return UA_STATUSCODE_BADNOTSUPPORTED;
+                }
             }
         }
 
         /* Generate the DSM */
-        res = UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
+        if(!pds) {
+            res = UA_DataSetWriter_generateDataSetMessageHeartbeat(server, &dsmStore[dsmCount], dsw);
+        } else {
+            res = UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
+        }
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "PubSub RT Offset calculation: DataSetMessage buffering failed");

From 5ed1f144658d5f00888d92c502d6a5ce8f935191 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Tue, 26 Apr 2022 23:47:46 +0200
Subject: [PATCH 0116/1963] feat(pubsub) simplify pubsub heartbeat
 implementation, move heartbeat message generation to default DSM generation
 path

---
 src/pubsub/ua_pubsub.h                |   5 -
 src/pubsub/ua_pubsub_networkmessage.c |   6 +-
 src/pubsub/ua_pubsub_writer.c         | 241 ++++++--------------------
 src/pubsub/ua_pubsub_writergroup.c    |   8 +-
 4 files changed, 60 insertions(+), 200 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index ccd6c1895c7..c004fa9066f 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -154,11 +154,6 @@ UA_StatusCode
 UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
                         UA_DataSetWriter *dataSetWriter);
 
-UA_StatusCode
-UA_DataSetWriter_generateDataSetMessageHeartbeat(UA_Server *server,
-                                                 UA_DataSetMessage *dataSetMessage,
-                                                 UA_DataSetWriter *dataSetWriter);
-
 /**********************************************/
 /*               WriterGroup                  */
 /**********************************************/
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 4b16347d349..15486ab7ba1 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1431,7 +1431,7 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
     UA_CHECK_STATUS(rv, return rv);
 
     if(src->data.keyFrameData.fieldCount == 0) {
-        /* That's a heartbeat - nothing more to encode */
+        /* Heartbeat: "DataSetMessage is a key frame that only contains header information" */
         return rv;
     }
 
@@ -1500,10 +1500,10 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
 
     if(dst->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
         if(*offset == src->length) {
-            /* Message ends after the header, that's a heartbeat */
+            /* Messages ends after the header --> Heartbeat */
             return rv;
         }
-        
+
         switch(dst->header.fieldEncoding) {
             case UA_FIELDENCODING_VARIANT:
             {
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index a255143fc9f..2b229b2b9f2 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -727,6 +727,16 @@ UA_Server_addDataSetWriter(UA_Server *server,
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
+    if(!wg)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    if(wg->configurationFrozen) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "Adding DataSetWriter failed. WriterGroup is frozen.");
+        return UA_STATUSCODE_BADCONFIGURATIONERROR;
+    }
+
     UA_PublishedDataSet *currentDataSetContext = NULL;
 
     if(!UA_NodeId_isNull(&dataSet)) {
@@ -739,19 +749,7 @@ UA_Server_addDataSetWriter(UA_Server *server,
                         "Adding DataSetWriter failed. PublishedDataSet is frozen.");
             return UA_STATUSCODE_BADCONFIGURATIONERROR;
         }
-    }
 
-    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(!wg)
-        return UA_STATUSCODE_BADNOTFOUND;
-
-    if(wg->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Adding DataSetWriter failed. WriterGroup is frozen.");
-        return UA_STATUSCODE_BADCONFIGURATIONERROR;
-    }
-
-    if(!UA_NodeId_isNull(&dataSet)) {
         if(wg->config.rtLevel != UA_PUBSUB_RT_NONE) {
             UA_DataSetField *tmpDSF;
             TAILQ_FOREACH(tmpDSF, &currentDataSetContext->fields, listEntry) {
@@ -788,7 +786,7 @@ UA_Server_addDataSetWriter(UA_Server *server,
     res = UA_DataSetWriterConfig_copy(dataSetWriterConfig, &newDataSetWriter->config);
     UA_CHECK_STATUS(res, UA_free(newDataSetWriter); return res);
 
-    if(!UA_NodeId_isNull(&dataSet)) {
+    if(!UA_NodeId_isNull(&dataSet) && currentDataSetContext != NULL) {
         /* Save the current version of the connected PublishedDataSet */
         newDataSetWriter->connectedDataSetVersion =
             currentDataSetContext->dataSetMetaData.configurationVersion;
@@ -1189,10 +1187,17 @@ UA_StatusCode
 UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
                                         UA_DataSetMessage *dataSetMessage,
                                         UA_DataSetWriter *dataSetWriter) {
-    UA_PublishedDataSet *currentDataSet =
-        UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
-    if(!currentDataSet)
-        return UA_STATUSCODE_BADNOTFOUND;
+    UA_Boolean heartbeat = false;
+    UA_PublishedDataSet *currentDataSet = NULL;
+    if(UA_NodeId_isNull(&dataSetWriter->connectedDataSet)){
+        heartbeat = true;
+    } else {
+        currentDataSet =
+            UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
+        if(!currentDataSet){
+            return UA_STATUSCODE_BADNOTFOUND;
+        }
+    }
 
     /* Reset the message */
     memset(dataSetMessage, 0, sizeof(UA_DataSetMessage));
@@ -1253,14 +1258,22 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
         if((u64)dsm->dataSetMessageContentMask &
            (u64)UA_UADPDATASETMESSAGECONTENTMASK_MAJORVERSION) {
             dataSetMessage->header.configVersionMajorVersionEnabled = true;
-            dataSetMessage->header.configVersionMajorVersion =
-                currentDataSet->dataSetMetaData.configurationVersion.majorVersion;
+            if(heartbeat){
+                dataSetMessage->header.configVersionMajorVersion = 0;
+            } else {
+                dataSetMessage->header.configVersionMajorVersion =
+                    currentDataSet->dataSetMetaData.configurationVersion.majorVersion;
+            }
         }
         if((u64)dsm->dataSetMessageContentMask &
            (u64)UA_UADPDATASETMESSAGECONTENTMASK_MINORVERSION) {
             dataSetMessage->header.configVersionMinorVersionEnabled = true;
-            dataSetMessage->header.configVersionMinorVersion =
-                currentDataSet->dataSetMetaData.configurationVersion.minorVersion;
+            if(heartbeat){
+                dataSetMessage->header.configVersionMinorVersion = 0;
+            } else {
+                dataSetMessage->header.configVersionMinorVersion =
+                    currentDataSet->dataSetMetaData.configurationVersion.minorVersion;
+            }
         }
 
         if((u64)dsm->dataSetMessageContentMask &
@@ -1291,15 +1304,23 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
         if((u64)jsonDsm->dataSetMessageContentMask &
            (u64)UA_JSONDATASETMESSAGECONTENTMASK_METADATAVERSION) {
             dataSetMessage->header.configVersionMajorVersionEnabled = true;
-            dataSetMessage->header.configVersionMajorVersion =
+            if(heartbeat){
+                dataSetMessage->header.configVersionMajorVersion = 0;
+            } else {
+                dataSetMessage->header.configVersionMajorVersion =
                 currentDataSet->dataSetMetaData.configurationVersion.majorVersion;
-        }
+            }
+       }
         if((u64)jsonDsm->dataSetMessageContentMask &
            (u64)UA_JSONDATASETMESSAGECONTENTMASK_METADATAVERSION) {
             dataSetMessage->header.configVersionMinorVersionEnabled = true;
-            dataSetMessage->header.configVersionMinorVersion =
+            if(heartbeat){
+                dataSetMessage->header.configVersionMinorVersion = 0;
+            } else {
+                dataSetMessage->header.configVersionMinorVersion =
                 currentDataSet->dataSetMetaData.configurationVersion.minorVersion;
-        }
+            }
+       }
 
         if((u64)jsonDsm->dataSetMessageContentMask &
            (u64)UA_JSONDATASETMESSAGECONTENTMASK_SEQUENCENUMBER) {
@@ -1324,6 +1345,15 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
     /* Set the sequence count. Automatically rolls over to zero */
     dataSetWriter->actualDataSetMessageSequenceCount++;
 
+    if(heartbeat){
+        /* Prepare DataSetMessageContent */
+        dataSetMessage->header.dataSetMessageValid = true;
+        dataSetMessage->header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+        dataSetMessage->data.keyFrameData.fieldCount = 0; // Heartbeat
+
+        return UA_STATUSCODE_GOOD;
+    }
+
     /* JSON does not differ between deltaframes and keyframes, only keyframes
      * are currently used. */
     if(dsm) {
@@ -1376,165 +1406,4 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
                                                           dataSetWriter);
 }
 
-UA_StatusCode
-UA_DataSetWriter_generateDataSetMessageHeartbeat(UA_Server *server, UA_DataSetMessage *dataSetMessage,
-                                                 UA_DataSetWriter *dataSetWriter) {
-
-    if (!UA_NodeId_isNull(&dataSetWriter->connectedDataSet )){
-    	UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-    	                       " Heartbeat message expected !");
-        return UA_STATUSCODE_BADCONFIGURATIONERROR;
-    }
-    /* Reset the message */
-    memset(dataSetMessage, 0, sizeof(UA_DataSetMessage));
-
-    /* store messageType to switch between json or uadp (default) */
-    UA_UInt16 messageType = UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE;
-    UA_JsonDataSetWriterMessageDataType *jsonDataSetWriterMessageDataType = NULL;
-
-    /* The configuration Flags are included
-     * inside the std. defined UA_UadpDataSetWriterMessageDataType */
-    UA_UadpDataSetWriterMessageDataType defaultUadpConfiguration;
-    UA_UadpDataSetWriterMessageDataType *dataSetWriterMessageDataType = NULL;
-    if((dataSetWriter->config.messageSettings.encoding == UA_EXTENSIONOBJECT_DECODED ||
-        dataSetWriter->config.messageSettings.encoding == UA_EXTENSIONOBJECT_DECODED_NODELETE) &&
-       (dataSetWriter->config.messageSettings.content.decoded.type ==
-        &UA_TYPES[UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE])) {
-        dataSetWriterMessageDataType = (UA_UadpDataSetWriterMessageDataType *)
-            dataSetWriter->config.messageSettings.content.decoded.data;
-
-        /* type is UADP */
-        messageType = UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE;
-    } else if((dataSetWriter->config.messageSettings.encoding == UA_EXTENSIONOBJECT_DECODED ||
-               dataSetWriter->config.messageSettings.encoding == UA_EXTENSIONOBJECT_DECODED_NODELETE) &&
-              (dataSetWriter->config.messageSettings.content.decoded.type ==
-               &UA_TYPES[UA_TYPES_JSONDATASETWRITERMESSAGEDATATYPE])) {
-        jsonDataSetWriterMessageDataType = (UA_JsonDataSetWriterMessageDataType *)
-            dataSetWriter->config.messageSettings.content.decoded.data;
-
-        /* type is JSON */
-        messageType = UA_TYPES_JSONDATASETWRITERMESSAGEDATATYPE;
-    } else {
-        /* create default flag configuration if no
-         * UadpDataSetWriterMessageDataType was passed in */
-        memset(&defaultUadpConfiguration, 0, sizeof(UA_UadpDataSetWriterMessageDataType));
-        defaultUadpConfiguration.dataSetMessageContentMask = (UA_UadpDataSetMessageContentMask)
-            ((u64)UA_UADPDATASETMESSAGECONTENTMASK_TIMESTAMP |
-             (u64)UA_UADPDATASETMESSAGECONTENTMASK_MAJORVERSION |
-             (u64)UA_UADPDATASETMESSAGECONTENTMASK_MINORVERSION);
-        dataSetWriterMessageDataType = &defaultUadpConfiguration;
-    }
-
-    /* Sanity-test the configuration */
-    if(dataSetWriterMessageDataType &&
-       (dataSetWriterMessageDataType->networkMessageNumber != 0 ||
-        dataSetWriterMessageDataType->dataSetOffset != 0 ||
-        dataSetWriterMessageDataType->configuredSize != 0)) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Static DSM configuration not supported. Using defaults");
-        dataSetWriterMessageDataType->networkMessageNumber = 0;
-        dataSetWriterMessageDataType->dataSetOffset = 0;
-        dataSetWriterMessageDataType->configuredSize = 0;
-    }
-
-    /* The field encoding depends on the flags inside the writer config.
-     * TODO: This can be moved to the encoding layer. */
-    if(dataSetWriter->config.dataSetFieldContentMask &
-       (u64)UA_DATASETFIELDCONTENTMASK_RAWDATA) {
-        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_RAWDATA;
-    } else if((u64)dataSetWriter->config.dataSetFieldContentMask &
-              ((u64)UA_DATASETFIELDCONTENTMASK_SOURCETIMESTAMP |
-               (u64)UA_DATASETFIELDCONTENTMASK_SERVERPICOSECONDS |
-               (u64)UA_DATASETFIELDCONTENTMASK_SOURCEPICOSECONDS |
-               (u64)UA_DATASETFIELDCONTENTMASK_STATUSCODE)) {
-        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
-    } else {
-        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_VARIANT;
-    }
-
-    if(messageType == UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE) {
-        /* Std: 'The DataSetMessageContentMask defines the flags for the content
-         * of the DataSetMessage header.' */
-        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_UADPDATASETMESSAGECONTENTMASK_MAJORVERSION) {
-            dataSetMessage->header.configVersionMajorVersionEnabled = true;
-            dataSetMessage->header.configVersionMajorVersion = 0;
-              ;
-        }
-        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_UADPDATASETMESSAGECONTENTMASK_MINORVERSION) {
-            dataSetMessage->header.configVersionMinorVersionEnabled = true;
-            dataSetMessage->header.configVersionMinorVersion =
-                0;
-        }
-
-        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_UADPDATASETMESSAGECONTENTMASK_SEQUENCENUMBER) {
-            dataSetMessage->header.dataSetMessageSequenceNrEnabled = true;
-            dataSetMessage->header.dataSetMessageSequenceNr =
-                dataSetWriter->actualDataSetMessageSequenceCount;
-        }
-
-        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_UADPDATASETMESSAGECONTENTMASK_TIMESTAMP) {
-            dataSetMessage->header.timestampEnabled = true;
-            dataSetMessage->header.timestamp = UA_DateTime_now();
-        }
-        /* TODO: Picoseconds resolution not supported atm */
-        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_UADPDATASETMESSAGECONTENTMASK_PICOSECONDS) {
-            dataSetMessage->header.picoSecondsIncluded = false;
-        }
-
-        /* TODO: Statuscode not supported yet */
-        if((u64)dataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_UADPDATASETMESSAGECONTENTMASK_STATUS) {
-            dataSetMessage->header.statusEnabled = true;
-            dataSetMessage->header.status = UA_STATUSCODE_GOOD;
-        }
-    } else if(messageType == UA_TYPES_JSONDATASETWRITERMESSAGEDATATYPE) {
-        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_JSONDATASETMESSAGECONTENTMASK_METADATAVERSION) {
-            dataSetMessage->header.configVersionMajorVersionEnabled = true;
-            dataSetMessage->header.configVersionMajorVersion = 0;
-
-        }
-        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_JSONDATASETMESSAGECONTENTMASK_METADATAVERSION) {
-            dataSetMessage->header.configVersionMinorVersionEnabled = true;
-            dataSetMessage->header.configVersionMinorVersion =
-               0;
-        }
-
-        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_JSONDATASETMESSAGECONTENTMASK_SEQUENCENUMBER) {
-            dataSetMessage->header.dataSetMessageSequenceNrEnabled = true;
-            dataSetMessage->header.dataSetMessageSequenceNr =
-                dataSetWriter->actualDataSetMessageSequenceCount;
-        }
-
-        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_JSONDATASETMESSAGECONTENTMASK_TIMESTAMP) {
-            dataSetMessage->header.timestampEnabled = true;
-            dataSetMessage->header.timestamp = UA_DateTime_now();
-        }
-
-        /* TODO: Statuscode not supported yet */
-        if((u64)jsonDataSetWriterMessageDataType->dataSetMessageContentMask &
-           (u64)UA_JSONDATASETMESSAGECONTENTMASK_STATUS) {
-            dataSetMessage->header.statusEnabled = true;
-            dataSetMessage->header.status = UA_STATUSCODE_GOOD;
-        }
-    }
-
-    /* Set the sequence count. Automatically rolls over to zero */
-    dataSetWriter->actualDataSetMessageSequenceCount++;
-    /* Prepare DataSetMessageContent */
-    dataSetMessage->header.dataSetMessageValid = true;
-    dataSetMessage->header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
-    dataSetMessage->data.keyFrameData.fieldCount = 0; // Heartbeat
-
-    return UA_STATUSCODE_GOOD;
-}
-
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 2eddb491e42..8eaf6d90312 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -226,7 +226,7 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
         if(!pds) {
             if (UA_NodeId_isNull(&dsw->connectedDataSet)) {
                 UA_StatusCode res1 =
-                        UA_DataSetWriter_generateDataSetMessageHeartbeat(server,
+                        UA_DataSetWriter_generateDataSetMessage(server,
                                 &dsmStore[dsmCount], dsw);
                 if (res1 != UA_STATUSCODE_GOOD) {
                     UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -281,11 +281,7 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
         }
 
         /* Generate the DSM */
-        if(!pds) {
-            res = UA_DataSetWriter_generateDataSetMessageHeartbeat(server, &dsmStore[dsmCount], dsw);
-        } else {
-            res = UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
-        }
+        res = UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "PubSub RT Offset calculation: DataSetMessage buffering failed");

From 81586f2d8ce257a341d14877307d88bb76580d5d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 22 Apr 2022 11:10:33 +0200
Subject: [PATCH 0117/1963] refactor(el): Process delayed callbacks only before
 listening for events

---
 arch/eventloop_posix.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 1d5ebdb5042..5199c79e0fa 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -253,8 +253,6 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
      * ConnectionManagers */
     UA_StatusCode rv = UA_EventLoopPOSIX_pollFDs(el, listenTimeout);
 
-    processDelayed(el); /* Process delayed callbacks */
-
     /* Check if the last EventSource was successfully stopped */
     if(el->eventLoop.state == UA_EVENTLOOPSTATE_STOPPING)
         checkClosed(el);

From d0f155c48ac9ffb364dd43f4d2c0cebd5371d4ec Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 22 Apr 2022 11:12:07 +0200
Subject: [PATCH 0118/1963] refactor(server): Simplify the
 UA_Server_run_iterate (EventLoop)

---
 src/server/ua_server.c | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index f52c007e19d..43cfb041223 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -815,52 +815,37 @@ UA_Server_run_startup(UA_Server *server) {
 
 UA_UInt16
 UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
-
-    UA_UInt16 timeout = 0;
-
+    /* Listen on the pubsublayer, but only if the yield function is set.
+     * TODO: Integrate into the EventLoop */
 #if defined(UA_ENABLE_PUBSUB_MQTT)
-    /* Listen on the pubsublayer, but only if the yield function is set */
     UA_PubSubConnection *connection;
     TAILQ_FOREACH(connection, &server->pubSubManager.connections, listEntry){
         UA_PubSubConnection *ps = connection;
         if(ps && ps->channel->yield){
-            ps->channel->yield(ps->channel, timeout);
+            ps->channel->yield(ps->channel, 0);
         }
     }
 #endif
-    /* Process repeated work */
-    UA_DateTime now = UA_DateTime_nowMonotonic();
-    UA_DateTime nextRepeated =
-        server->config.eventLoop->nextCyclicTime(server->config.eventLoop);
-    UA_DateTime latest = now + (UA_MAXTIMEOUT * UA_DATETIME_MSEC);
-    if(nextRepeated > latest)
-        nextRepeated = latest;
-    /* round always to upper value to avoid timeout to be set to 0
-    * if(nextRepeated - now) < (UA_DATETIME_MSEC/2) */
-    if(waitInternal)
-        timeout = (UA_UInt16)(((nextRepeated - now) + (UA_DATETIME_MSEC - 1)) / UA_DATETIME_MSEC);
-
-    server->config.eventLoop->run(server->config.eventLoop, timeout);
 
-#if defined(UA_ENABLE_DISCOVERY_MULTICAST) && (UA_MULTITHREADING < 200)
+    /* Process timed and network events in the EventLoop */
+    server->config.eventLoop->run(server->config.eventLoop, UA_MAXTIMEOUT);
 
+#if defined(UA_ENABLE_DISCOVERY_MULTICAST) && (UA_MULTITHREADING < 200)
     UA_LOCK(&server->serviceMutex);
     if(server->config.mdnsEnabled) {
-
         /* TODO multicastNextRepeat does not consider new input data (requests)
          * on the socket. It will be handled on the next call. if needed, we
          * need to use select with timeout on the multicast socket
          * server->mdnsSocket (see example in mdnsd library) on higher level. */
         UA_DateTime multicastNextRepeat = 0;
-        UA_StatusCode hasNext =
-            iterateMulticastDiscoveryServer(server, &multicastNextRepeat, true);
-        if(hasNext == UA_STATUSCODE_GOOD && multicastNextRepeat < nextRepeated)
-            nextRepeated = multicastNextRepeat;
+        iterateMulticastDiscoveryServer(server, &multicastNextRepeat, true);
     }
     UA_UNLOCK(&server->serviceMutex);
 #endif
 
-    return timeout;
+    /* Return the time until the next scheduled callback */
+    return (UA_UInt16)((server->config.eventLoop->nextCyclicTime(server->config.eventLoop)
+                        - UA_DateTime_nowMonotonic()) / UA_DATETIME_MSEC);
 }
 
 UA_StatusCode

From a58c4cc4b622b95b842f4c994b2653f882557b8e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 1 Apr 2022 21:38:40 +0200
Subject: [PATCH 0119/1963] style(test): Cosmetic cleanup in
 check_pubsub_connection_mqtt.c

---
 tests/pubsub/check_pubsub_connection_mqtt.c | 51 +++++++++++++--------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index 7b7a6a0fcd8..34325241364 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -16,7 +16,7 @@
 #include <check.h>
 
 //#define TEST_MQTT_SERVER "opc.mqtt://test.mosquitto.org:1883/"
-#define TEST_MQTT_SERVER "opc.mqtt://broker.hivemq.com:1883/"
+#define TEST_MQTT_SERVER "opc.mqtt://localhost:1883/"
 
 UA_Server *server = NULL;
 UA_ServerConfig *config = NULL;
@@ -189,32 +189,47 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     ck_assert(connectionConfig.connectionPropertiesSize == connectionConf.connectionPropertiesSize);
     ck_assert(UA_String_equal(&connectionConfig.name, &connectionConf.name) == UA_TRUE);
     ck_assert(UA_String_equal(&connectionConfig.transportProfileUri, &connectionConf.transportProfileUri) == UA_TRUE);
-    UA_NetworkAddressUrlDataType networkAddressUrlDataCopy = *((UA_NetworkAddressUrlDataType *)connectionConfig.address.data);
-    ck_assert(UA_calcSizeBinary(&networkAddressUrlDataCopy, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) ==
-              UA_calcSizeBinary(&networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]));
+    UA_NetworkAddressUrlDataType networkAddressUrlDataCopy =
+        *((UA_NetworkAddressUrlDataType *)connectionConfig.address.data);
+    ck_assert(UA_calcSizeBinary(&networkAddressUrlDataCopy,
+                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) ==
+              UA_calcSizeBinary(&networkAddressUrlData,
+                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]));
     for(size_t i = 0; i < connectionConfig.connectionPropertiesSize; i++){
-        ck_assert(UA_String_equal(&connectionConfig.connectionProperties[i].key.name, &connectionConf.connectionProperties[i].key.name) == UA_TRUE);
-        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties[i].value));
+        ck_assert(UA_String_equal(&connectionConfig.connectionProperties[i].key.name,
+                                  &connectionConf.connectionProperties[i].key.name) == UA_TRUE);
+        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties[i].value) ==
+                  UA_Variant_calcSizeBinary(&connectionConf.connectionProperties[i].value));
     }
     UA_PubSubConnectionConfig_clear(&connectionConfig);
-    } END_TEST
+} END_TEST
 
 int main(void) {
-    TCase *tc_add_pubsub_connections_minimal_config = tcase_create("Create PubSub Mqtt Connections with minimal valid config");
+    TCase *tc_add_pubsub_connections_minimal_config =
+        tcase_create("Create PubSub Mqtt Connections with minimal valid config");
     tcase_add_checked_fixture(tc_add_pubsub_connections_minimal_config, setup, teardown);
-    tcase_add_test(tc_add_pubsub_connections_minimal_config, AddConnectionsWithMinimalValidConfiguration);
-    tcase_add_test(tc_add_pubsub_connections_minimal_config, AddRemoveAddConnectionWithMinimalValidConfiguration);
+    tcase_add_test(tc_add_pubsub_connections_minimal_config,
+                   AddConnectionsWithMinimalValidConfiguration);
+    tcase_add_test(tc_add_pubsub_connections_minimal_config,
+                   AddRemoveAddConnectionWithMinimalValidConfiguration);
 
-    TCase *tc_add_pubsub_connections_invalid_config = tcase_create("Create PubSub Mqtt Connections with invalid configurations");
+    TCase *tc_add_pubsub_connections_invalid_config =
+        tcase_create("Create PubSub Mqtt Connections with invalid configurations");
     tcase_add_checked_fixture(tc_add_pubsub_connections_invalid_config, setup, teardown);
-    tcase_add_test(tc_add_pubsub_connections_invalid_config, AddConnectionWithInvalidAddress);
-    tcase_add_test(tc_add_pubsub_connections_invalid_config, AddConnectionWithUnknownTransportURL);
-    tcase_add_test(tc_add_pubsub_connections_invalid_config, AddConnectionWithNullConfig);
-
-    TCase *tc_add_pubsub_connections_maximal_config = tcase_create("Create PubSub Mqtt Connections with maximal valid config");
+    tcase_add_test(tc_add_pubsub_connections_invalid_config,
+                   AddConnectionWithInvalidAddress);
+    tcase_add_test(tc_add_pubsub_connections_invalid_config,
+                   AddConnectionWithUnknownTransportURL);
+    tcase_add_test(tc_add_pubsub_connections_invalid_config,
+                   AddConnectionWithNullConfig);
+
+    TCase *tc_add_pubsub_connections_maximal_config =
+        tcase_create("Create PubSub Mqtt Connections with maximal valid config");
     tcase_add_checked_fixture(tc_add_pubsub_connections_maximal_config, setup, teardown);
-    tcase_add_test(tc_add_pubsub_connections_maximal_config, AddSingleConnectionWithMaximalConfiguration);
-    tcase_add_test(tc_add_pubsub_connections_maximal_config, GetMaximalConnectionConfigurationAndCompareValues);
+    tcase_add_test(tc_add_pubsub_connections_maximal_config,
+                   AddSingleConnectionWithMaximalConfiguration);
+    tcase_add_test(tc_add_pubsub_connections_maximal_config,
+                   GetMaximalConnectionConfigurationAndCompareValues);
 
     Suite *s = suite_create("PubSub Mqtt connection creation");
     suite_add_tcase(s, tc_add_pubsub_connections_minimal_config);

From c414947dc5e8e3e23b67b389b262020faa6849cd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 1 Apr 2022 21:39:09 +0200
Subject: [PATCH 0120/1963] style(tests): Cosmetic cleanup in
 check_pubsub_publish_json.c

---
 tests/pubsub/check_pubsub_publish_json.c | 100 ++++++++++++-----------
 1 file changed, 54 insertions(+), 46 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publish_json.c b/tests/pubsub/check_pubsub_publish_json.c
index d3c427bd25a..f9488ddf64b 100644
--- a/tests/pubsub/check_pubsub_publish_json.c
+++ b/tests/pubsub/check_pubsub_publish_json.c
@@ -29,10 +29,12 @@ static void setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 }
 
@@ -42,50 +44,56 @@ static void teardown(void) {
 }
 
 START_TEST(SinglePublishDataSetField){
-        UA_WriterGroupConfig writerGroupConfig;
-        memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
-
-        writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
-        writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_JSONWRITERGROUPMESSAGEDATATYPE];
-        UA_JsonDataSetWriterMessageDataType d;
-        d.dataSetMessageContentMask = UA_JSONDATASETMESSAGECONTENTMASK_SEQUENCENUMBER;
-        writerGroupConfig.messageSettings.content.decoded.data = &d;
-
-        writerGroupConfig.name = UA_STRING("WriterGroup 1");
-        writerGroupConfig.publishingInterval = 10;
-        writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_JSON;
-        UA_StatusCode retVal = UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
-        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        retVal = UA_Server_setWriterGroupOperational(server, writerGroup1);
-        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-
-        UA_PublishedDataSetConfig pdsConfig;
-        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
-        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-        pdsConfig.name = UA_STRING("PublishedDataSet 1");
-        UA_AddPublishedDataSetResult result = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
-        ck_assert_int_eq(result.addResult, UA_STATUSCODE_GOOD);
-
-        UA_DataSetFieldConfig dataSetFieldConfig;
-        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-        dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
-        dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
-        dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_DataSetFieldResult dsFieldResult = UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
-        ck_assert_int_eq(dsFieldResult.result, UA_STATUSCODE_GOOD);
-
-        UA_DataSetWriterConfig dataSetWriterConfig;
-        memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
-        dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-        retVal = UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
-        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-
-        UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
-        ck_assert(wg != 0);
-        UA_WriterGroup_publishCallback(server, wg);
-    } END_TEST
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+
+    writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    writerGroupConfig.messageSettings.content.decoded.type =
+        &UA_TYPES[UA_TYPES_JSONWRITERGROUPMESSAGEDATATYPE];
+    UA_JsonDataSetWriterMessageDataType d;
+    d.dataSetMessageContentMask = UA_JSONDATASETMESSAGECONTENTMASK_SEQUENCENUMBER;
+    writerGroupConfig.messageSettings.content.decoded.data = &d;
+
+    writerGroupConfig.name = UA_STRING("WriterGroup 1");
+    writerGroupConfig.publishingInterval = 10;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_JSON;
+    UA_StatusCode retVal =
+        UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    retVal = UA_Server_setWriterGroupOperational(server, writerGroup1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    UA_PublishedDataSetConfig pdsConfig;
+    memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    pdsConfig.name = UA_STRING("PublishedDataSet 1");
+    UA_AddPublishedDataSetResult result =
+        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    ck_assert_int_eq(result.addResult, UA_STATUSCODE_GOOD);
+
+    UA_DataSetFieldConfig dataSetFieldConfig;
+    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
+    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    UA_DataSetFieldResult dsFieldResult =
+        UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+    ck_assert_int_eq(dsFieldResult.result, UA_STATUSCODE_GOOD);
+
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
+    retVal = UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1,
+                                        &dataSetWriterConfig, &dataSetWriter1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
+    ck_assert(wg != 0);
+    UA_WriterGroup_publishCallback(server, wg);
+} END_TEST
 
 int main(void) {
     TCase *tc_pubsub_publish = tcase_create("PubSub publish");

From 48078ff17ec1622a13900eac91848c71c7cbe085 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 1 Apr 2022 23:00:04 +0200
Subject: [PATCH 0121/1963] fix(tests): Deterministic timing behavior in
 check_pubsub_subscribe.c

---
 tests/pubsub/check_pubsub_subscribe.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 11b080bbe66..ba9a7e288c0 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -11,6 +11,7 @@
 #include <check.h>
 #include <time.h>
 
+#include "testing_clock.h"
 #include "open62541/types_generated_handling.h"
 #include "ua_pubsub.h"
 #include "ua_server_internal.h"
@@ -135,8 +136,10 @@ static void checkReceived(void) {
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     /* Check if data sent from Publisher is being received by Subscriber */
-    ck_assert_int_eq(*(UA_UInt32 *)publishedNodeData.data,
-                     *(UA_UInt32 *)subscribedNodeData.data);
+    ck_assert(publishedNodeData.type == subscribedNodeData.type);
+    ck_assert(UA_order(publishedNodeData.data,
+                       subscribedNodeData.data,
+                       subscribedNodeData.type) == UA_ORDER_EQ);
     UA_Variant_clear(&subscribedNodeData);
     UA_Variant_clear(&publishedNodeData);
 }
@@ -662,7 +665,9 @@ START_TEST(SinglePublishSubscribeDateTime) {
         UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
 
         /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
         UA_free(pMetaData->fields);
 }END_TEST
@@ -751,7 +756,9 @@ START_TEST(SinglePublishSubscribeDateTimeRaw) {
         UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
 
         /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
         UA_free(pMetaData->fields);
 }END_TEST
@@ -889,8 +896,11 @@ START_TEST(SinglePublishSubscribeInt32) {
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_FieldTargetDataType_clear(&targetVar.targetVariable);
         UA_free(pMetaData->fields);
+
         /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
 
         checkReceived();
@@ -1033,8 +1043,11 @@ START_TEST(SinglePublishSubscribeInt64) {
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_FieldTargetDataType_clear(&targetVar.targetVariable);
         UA_free(pMetaData->fields);
+
         /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
 
         checkReceived();
@@ -1177,8 +1190,11 @@ START_TEST(SinglePublishSubscribeBool) {
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_FieldTargetDataType_clear(&targetVar.targetVariable);
         UA_free(pMetaData->fields);
+
         /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
 
         checkReceived();
@@ -1322,8 +1338,11 @@ START_TEST(SinglePublishSubscribewithValidIdentifiers) {
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_FieldTargetDataType_clear(&targetVar.targetVariable);
         UA_free(pMetaData->fields);
+
         /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(server,true);
 
         checkReceived();
@@ -1486,10 +1505,12 @@ START_TEST(MultiPublishSubscribeInt32) {
 
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_FieldTargetDataType_clear(&targetVar.targetVariable);
+    UA_free(pMetaData->fields);
 
     /* run server - publisher and subscriber */
-    UA_free(pMetaData->fields);
+    UA_fakeSleep(PUBLISH_INTERVAL + 1);
     UA_Server_run_iterate(server, true);
+    UA_fakeSleep(PUBLISH_INTERVAL + 1);
     UA_Server_run_iterate(server, true);
 
     checkReceived();

From 4da2b7c3f4d742e306de108a80234fcf482883fa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 1 Apr 2022 23:43:45 +0200
Subject: [PATCH 0122/1963] fix(deps): Fix TLS use for MQTT

---
 deps/mqtt-c/mqtt.c | 17 +++++++----------
 deps/mqtt-c/mqtt.h | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/deps/mqtt-c/mqtt.c b/deps/mqtt-c/mqtt.c
index e2287d5ff86..5809aafdb2e 100644
--- a/deps/mqtt-c/mqtt.c
+++ b/deps/mqtt-c/mqtt.c
@@ -240,8 +240,7 @@ enum MQTTErrors mqtt_connect(struct mqtt_client *client,
 #ifdef UA_ENABLE_MQTT_TLS_OPENSSL
     /* try to pack the message */
     MQTT_CLIENT_TRY_PACK(rv, msg, client,
-                         mqtt_pack_connection_request(
-                                                      client->mq.curr, client->mq.curr_sz,
+                         mqtt_pack_connection_request(client->mq.curr, client->mq.curr_sz,
                                                       client_id, will_topic, will_message,
                                                       will_message_size,user_name, password,
                                                       caFilePath, caPath, clientCertPath, clientKeyPath,
@@ -252,14 +251,10 @@ enum MQTTErrors mqtt_connect(struct mqtt_client *client,
 #else
     /* try to pack the message */
     MQTT_CLIENT_TRY_PACK(rv, msg, client,
-                         mqtt_pack_connection_request(
-                                                      client->mq.curr, client->mq.curr_sz,
+                         mqtt_pack_connection_request(client->mq.curr, client->mq.curr_sz,
                                                       client_id, will_topic, will_message,
                                                       will_message_size,user_name, password,
-                                                      connect_flags, keep_alive
-                                                      ),
-                         1
-                         );
+                                                      connect_flags, keep_alive), 1);
 #endif
 
     /* save the control type of the message */
@@ -1176,9 +1171,10 @@ ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
     } else {
         connect_flags &= (uint8_t)~MQTT_CONNECT_PASSWORD;
     }
+
 #ifdef UA_ENABLE_MQTT_TLS_OPENSSL
     if (useTLS) {
-            if (caFilePath != NULL) {
+        if (caFilePath != NULL) {
             /* a caFilePath is present */
             connect_flags |= (uint8_t)MQTT_CONNECT_CAFILEPATH;
             remaining_length += (uint32_t)__mqtt_packed_cstrlen(caFilePath);
@@ -1221,12 +1217,13 @@ ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
             //strncpy(strTLS, "0", 1);
             strTLS[0] = '0';
             strTLS[1] = '\0';
-            
+
         }
         connect_flags |= (uint8_t)MQTT_CONNECT_USETLS;
         remaining_length += (uint32_t)__mqtt_packed_cstrlen(strTLS);
     }
 #endif
+
     /* fixed header length is now calculated*/
     fixed_header.remaining_length = (uint32_t)remaining_length;
 
diff --git a/deps/mqtt-c/mqtt.h b/deps/mqtt-c/mqtt.h
index 9544794f71b..377448c7f96 100644
--- a/deps/mqtt-c/mqtt.h
+++ b/deps/mqtt-c/mqtt.h
@@ -666,7 +666,12 @@ enum MQTTConnectFlags {
     MQTT_CONNECT_WILL_QOS_2 = (2u & 0x03) << 3,
     MQTT_CONNECT_WILL_RETAIN = 32u,
     MQTT_CONNECT_PASSWORD = 64u,
-    MQTT_CONNECT_USER_NAME = 128u
+    MQTT_CONNECT_USER_NAME = 128u,
+    MQTT_CONNECT_CAFILEPATH = 256u,
+    MQTT_CONNECT_CAPATH = 512u,
+    MQTT_CONNECT_CLIENTCERTPATH = 1024u,
+    MQTT_CONNECT_CLIENTKEYPATH = 2048u,
+    MQTT_CONNECT_USETLS = 4096u
 };
 
 /**
@@ -1436,6 +1441,13 @@ enum MQTTErrors mqtt_connect(struct mqtt_client *client,
                              size_t will_message_size,
                              const char* user_name,
                              const char* password,
+#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
+                             const char* caFilePath,
+                             const char* caPath,
+                             const char* clientCertPath,
+                             const char* clientKeyPath,
+                             bool useTLS,
+#endif
                              uint8_t connect_flags,
                              uint16_t keep_alive);
 

From f550925698dbcb181eb82ee8d2ba3fc36f1d2fad Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 4 Apr 2022 06:31:41 +0200
Subject: [PATCH 0123/1963] feat(ci): Enable MQTT for the CI build

---
 .github/workflows/build_linux.yml | 6 +++---
 tools/ci.sh                       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 165d772f962..67edeba652f 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         include: 
           - build_name: "Debug Build & Unit Tests (gcc)"
-            cmd_deps: ""
+            cmd_deps: sudo apt-get install -y -qq mosquitto
             cmd_action: unit_tests
           - build_name: "Debug Build & Unit Tests (gcc, 32bit)"
             cmd_deps: |
@@ -30,10 +30,10 @@ jobs:
             cmd_deps: ""
             cmd_action: unit_tests_alarms
           - build_name: "Debug Build & Unit Tests (clang)"
-            cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11
+            cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 mosquitto
             cmd_action: CC=clang-11 CXX=clang++-11 unit_tests
           - build_name: "Debug Build & Unit Tests (tcc)"
-            cmd_deps: sudo apt-get install -y -qq tcc
+            cmd_deps: sudo apt-get install -y -qq tcc mosquitto
             cmd_action: CC=tcc unit_tests
           - build_name: "Encryption (MbedTLS) Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
diff --git a/tools/ci.sh b/tools/ci.sh
index 5543d10f8f7..fafee93c980 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -145,6 +145,7 @@ function unit_tests {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_ENABLE_PUBSUB_MQTT=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities

From dc54a9b988ac5651f492b58d42417cf75a34c4ac Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 7 Apr 2022 19:08:41 +0200
Subject: [PATCH 0124/1963] fix(cmake): UA_ENABLE_MQTT_TLS_OPENSSL flag is
 automatically set if the UA_ENABLE_MQTT_TLS flag is set.

---
 CMakeLists.txt     | 5 +++--
 deps/mqtt-c/mqtt.c | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ca27c7c103..ecbae9cc66e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,6 +436,9 @@ if(UA_ENABLE_PUBSUB_MQTT)
     endif()
 endif()
 
+option(UA_ENABLE_MQTT_TLS_OPENSSL "Enable TLS support for publish/subscribe with mqtt (use OpenSSL)" OFF)
+mark_as_advanced(UA_ENABLE_MQTT_TLS_OPENSSL)
+
 option(UA_ENABLE_MQTT_TLS "Enable TLS support for publish/subscribe with mqtt" OFF)
 mark_as_advanced(UA_ENABLE_MQTT_TLS)
 if(UA_ENABLE_MQTT_TLS)
@@ -445,8 +448,6 @@ if(UA_ENABLE_MQTT_TLS)
         set(UA_ENABLE_MQTT_TLS_OPENSSL ON)
 endif()
 
-option(UA_ENABLE_MQTT_TLS_OPENSSL "Enable TLS support for publish/subscribe with mqtt (use OpenSSL)" OFF)
-mark_as_advanced(UA_ENABLE_MQTT_TLS_OPENSSL)
 if(UA_ENABLE_MQTT_TLS_OPENSSL)
     set(UA_ENABLE_MQTT_TLS ON)
 endif()
diff --git a/deps/mqtt-c/mqtt.c b/deps/mqtt-c/mqtt.c
index 5809aafdb2e..b92f123f261 100644
--- a/deps/mqtt-c/mqtt.c
+++ b/deps/mqtt-c/mqtt.c
@@ -1206,6 +1206,7 @@ ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
             connect_flags &= (uint8_t)~MQTT_CONNECT_CLIENTKEYPATH;
         }
 
+        /* Call the strncpy function with a size of two to zero-terminate the strTLS value */
         if (useTLS) /* useTLS = true */
         {
             //strncpy(strTLS, "1", 1);

From 51921f7b72ef9ddcc778c47e6943f7f0dd5f7209 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 20 Apr 2022 15:22:06 +0200
Subject: [PATCH 0125/1963] fix(sec) remove use of mbedtls internal headers

---
 plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c     | 1 -
 plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h     | 5 -----
 plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c   | 6 ++----
 plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c   | 6 ++----
 .../crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c | 7 ++-----
 plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c   | 7 ++-----
 plugins/crypto/mbedtls/ua_securitypolicy_basic256.c        | 7 ++-----
 plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c  | 7 ++-----
 tests/pubsub/check_pubsub_decryption.c                     | 1 -
 9 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
index 0e29e515845..589ff112045 100644
--- a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
+++ b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
@@ -9,7 +9,6 @@
 #include <mbedtls/aes.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
-#include <mbedtls/entropy_poll.h>
 #include <mbedtls/error.h>
 #include <mbedtls/md.h>
 #include <mbedtls/sha1.h>
diff --git a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
index 29fa816ba7d..298905a436c 100644
--- a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
+++ b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
@@ -15,12 +15,7 @@
 #include <mbedtls/x509_crt.h>
 #include <mbedtls/ctr_drbg.h>
 
-#if !defined(MBEDTLS_NO_PLATFORM_ENTROPY)
-#define MBEDTLS_ENTROPY_POLL_METHOD mbedtls_platform_entropy_poll
-#else
 // MBEDTLS_ENTROPY_HARDWARE_ALT should be defined if your hardware does not supportd platform entropy
-#define MBEDTLS_ENTROPY_POLL_METHOD mbedtls_hardware_poll
-#endif
 
 #define UA_SHA1_LENGTH 20
 
diff --git a/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c b/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
index 42187092252..13276fc9000 100644
--- a/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
+++ b/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
@@ -14,7 +14,6 @@
 #include <mbedtls/aes.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
-#include <mbedtls/entropy_poll.h>
 #include <mbedtls/error.h>
 #include <mbedtls/md.h>
 #include <mbedtls/sha1.h>
@@ -299,9 +298,8 @@ policyContext_newContext_sp_pubsub_aes128ctr(UA_PubSubSecurityPolicy *securityPo
         goto error;
     }
 
-    /* Add the system entropy source */
-    mbedErr = mbedtls_entropy_add_source(&pc->entropyContext, mbedtls_platform_entropy_poll,
-                                         NULL, 0, MBEDTLS_ENTROPY_SOURCE_STRONG);
+    mbedErr = mbedtls_entropy_self_test(0);
+
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c b/plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c
index 1ecc6ad3713..b93e26ff8e8 100644
--- a/plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c
+++ b/plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c
@@ -14,7 +14,6 @@
 #include <mbedtls/aes.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
-#include <mbedtls/entropy_poll.h>
 #include <mbedtls/error.h>
 #include <mbedtls/md.h>
 #include <mbedtls/sha1.h>
@@ -303,9 +302,8 @@ policyContext_newContext_sp_pubsub_aes256ctr(UA_PubSubSecurityPolicy *securityPo
         goto error;
     }
 
-    /* Add the system entropy source */
-    mbedErr = mbedtls_entropy_add_source(&pc->entropyContext, mbedtls_platform_entropy_poll,
-                                         NULL, 0, MBEDTLS_ENTROPY_SOURCE_STRONG);
+    mbedErr = mbedtls_entropy_self_test(0);
+
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
index 7b83a0dd84a..e7ef1ced5ab 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
@@ -18,7 +18,6 @@
 #include <mbedtls/aes.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
-#include <mbedtls/entropy_poll.h>
 #include <mbedtls/error.h>
 #include <mbedtls/md.h>
 #include <mbedtls/sha1.h>
@@ -638,10 +637,8 @@ policyContext_newContext_sp_aes128sha256rsaoaep(UA_SecurityPolicy *securityPolic
         goto error;
     }
 
-    /* Add the system entropy source */
-    mbedErr = mbedtls_entropy_add_source(&pc->entropyContext,
-                                         MBEDTLS_ENTROPY_POLL_METHOD, NULL, 0,
-                                         MBEDTLS_ENTROPY_SOURCE_STRONG);
+    mbedErr = mbedtls_entropy_self_test(0);
+
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
index a2b0167d939..fe697ef282a 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
@@ -20,7 +20,6 @@
 #include <mbedtls/aes.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
-#include <mbedtls/entropy_poll.h>
 #include <mbedtls/error.h>
 #include <mbedtls/md.h>
 #include <mbedtls/sha1.h>
@@ -642,10 +641,8 @@ policyContext_newContext_sp_basic128rsa15(UA_SecurityPolicy *securityPolicy,
         goto error;
     }
 
-    /* Add the system entropy source */
-    mbedErr = mbedtls_entropy_add_source(&pc->entropyContext,
-                                         MBEDTLS_ENTROPY_POLL_METHOD, NULL, 0,
-                                         MBEDTLS_ENTROPY_SOURCE_STRONG);
+    mbedErr = mbedtls_entropy_self_test(0);
+
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
index 82fe352a718..24806dc7c3b 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
@@ -22,7 +22,6 @@
 
 #include <mbedtls/aes.h>
 #include <mbedtls/entropy.h>
-#include <mbedtls/entropy_poll.h>
 #include <mbedtls/error.h>
 #include <mbedtls/sha1.h>
 #include <mbedtls/version.h>
@@ -593,10 +592,8 @@ policyContext_newContext_sp_basic256(UA_SecurityPolicy *securityPolicy,
         goto error;
     }
 
-    /* Add the system entropy source */
-    mbedErr = mbedtls_entropy_add_source(&pc->entropyContext,
-                                         MBEDTLS_ENTROPY_POLL_METHOD, NULL, 0,
-                                         MBEDTLS_ENTROPY_SOURCE_STRONG);
+    mbedErr = mbedtls_entropy_self_test(0);
+
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
index c27e2bbb79f..7f9c0128864 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
@@ -19,7 +19,6 @@
 #include <mbedtls/aes.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
-#include <mbedtls/entropy_poll.h>
 #include <mbedtls/error.h>
 #include <mbedtls/md.h>
 #include <mbedtls/sha1.h>
@@ -641,10 +640,8 @@ policyContext_newContext_sp_basic256sha256(UA_SecurityPolicy *securityPolicy,
         goto error;
     }
 
-    /* Add the system entropy source */
-    mbedErr = mbedtls_entropy_add_source(&pc->entropyContext,
-                                         MBEDTLS_ENTROPY_POLL_METHOD, NULL, 0,
-                                         MBEDTLS_ENTROPY_SOURCE_STRONG);
+    mbedErr = mbedtls_entropy_self_test(0);
+
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/tests/pubsub/check_pubsub_decryption.c b/tests/pubsub/check_pubsub_decryption.c
index 682e351c6d8..8825f1198c5 100644
--- a/tests/pubsub/check_pubsub_decryption.c
+++ b/tests/pubsub/check_pubsub_decryption.c
@@ -19,7 +19,6 @@
 #include <mbedtls/aes.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
-#include <mbedtls/entropy_poll.h>
 #include <mbedtls/error.h>
 #include <mbedtls/md.h>
 #include <mbedtls/sha1.h>

From 45781992fc3e898b865e2024f25f61fe111e1225 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 22 Apr 2022 11:46:00 +0200
Subject: [PATCH 0126/1963] refactor(plugin): Transition mbedTLS to the API for
 both v2 and v3

---
 .../mbedtls/securitypolicy_mbedtls_common.c   | 64 ++++++++++++++-----
 .../mbedtls/securitypolicy_mbedtls_common.h   |  2 +-
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       |  9 +++
 .../ua_securitypolicy_aes128sha256rsaoaep.c   | 38 +++++++----
 .../mbedtls/ua_securitypolicy_basic128rsa15.c | 44 +++++++------
 .../mbedtls/ua_securitypolicy_basic256.c      | 25 ++++----
 .../ua_securitypolicy_basic256sha256.c        | 34 +++++-----
 7 files changed, 141 insertions(+), 75 deletions(-)

diff --git a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
index 589ff112045..b8b814f88c5 100644
--- a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
+++ b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
@@ -34,7 +34,11 @@ UA_StatusCode
 mbedtls_generateKey(mbedtls_md_context_t *context,
                     const UA_ByteString *secret, const UA_ByteString *seed,
                     UA_ByteString *out) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     size_t hashLen = (size_t)mbedtls_md_get_size(context->md_info);
+#else
+    size_t hashLen = (size_t)mbedtls_md_get_size(context->private_md_info);
+#endif
 
     UA_ByteString A_and_seed;
     UA_ByteString_allocBuffer(&A_and_seed, hashLen + seed->length);
@@ -106,7 +110,7 @@ mbedtls_verifySig_sha1(mbedtls_x509_crt *certificate, const UA_ByteString *messa
                        const UA_ByteString *signature) {
     /* Compute the sha1 hash */
     unsigned char hash[UA_SHA1_LENGTH];
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     mbedtls_sha1_ret(message->data, message->length, hash);
 #else
     mbedtls_sha1(message->data, message->length, hash);
@@ -116,7 +120,7 @@ mbedtls_verifySig_sha1(mbedtls_x509_crt *certificate, const UA_ByteString *messa
     mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(certificate->pk);
     if(!rsaContext)
         return UA_STATUSCODE_BADINTERNALERROR;
-    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, 0);
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
 
     /* Verify */
     int mbedErr = mbedtls_pk_verify(&certificate->pk,
@@ -133,18 +137,22 @@ mbedtls_sign_sha1(mbedtls_pk_context *localPrivateKey,
                   const UA_ByteString *message,
                   UA_ByteString *signature) {
     unsigned char hash[UA_SHA1_LENGTH];
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     mbedtls_sha1_ret(message->data, message->length, hash);
 #else
     mbedtls_sha1(message->data, message->length, hash);
 #endif
 
     mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(*localPrivateKey);
-    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, 0);
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
 
     size_t sigLen = 0;
     int mbedErr = mbedtls_pk_sign(localPrivateKey, MBEDTLS_MD_SHA1, hash,
-                                  UA_SHA1_LENGTH, signature->data, &sigLen,
+                                  UA_SHA1_LENGTH, signature->data,
+#if MBEDTLS_VERSION_NUMBER >= 0x03000000
+                                  signature->length,
+#endif
+                                  &sigLen,
                                   mbedtls_ctr_drbg_random, drbgContext);
     if(mbedErr)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -161,7 +169,7 @@ mbedtls_thumbprint_sha1(const UA_ByteString *certificate,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     /* The certificate thumbprint is always a 20 bit sha1 hash, see Part 4 of the Specification. */
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     mbedtls_sha1_ret(certificate->data, certificate->length, thumbprint->data);
 #else
     mbedtls_sha1(certificate->data, certificate->length, thumbprint->data);
@@ -177,9 +185,10 @@ mbedtls_encrypt_rsaOaep(mbedtls_rsa_context *context,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     size_t max_blocks = data->length / plainTextBlockSize;
+    size_t keylen = mbedtls_rsa_get_len(context);
 
     UA_ByteString encrypted;
-    UA_StatusCode retval = UA_ByteString_allocBuffer(&encrypted, max_blocks * context->len);
+    UA_StatusCode retval = UA_ByteString_allocBuffer(&encrypted, max_blocks * keylen);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -188,17 +197,24 @@ mbedtls_encrypt_rsaOaep(mbedtls_rsa_context *context,
     size_t offset = 0;
     const unsigned char *label = NULL;
     while(lenDataToEncrypt >= plainTextBlockSize) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
         int mbedErr = mbedtls_rsa_rsaes_oaep_encrypt(context, mbedtls_ctr_drbg_random,
                                                      drbgContext, MBEDTLS_RSA_PUBLIC,
                                                      label, 0, plainTextBlockSize,
                                                      data->data + inOffset, encrypted.data + offset);
+#else
+        int mbedErr = mbedtls_rsa_rsaes_oaep_encrypt(context, mbedtls_ctr_drbg_random,
+                                                     drbgContext, label, 0, plainTextBlockSize,
+                                                     data->data + inOffset, encrypted.data + offset);
+#endif
+
         if(mbedErr) {
             UA_ByteString_clear(&encrypted);
             return UA_STATUSCODE_BADINTERNALERROR;
         }
 
         inOffset += plainTextBlockSize;
-        offset += context->len;
+        offset += keylen;
         lenDataToEncrypt -= plainTextBlockSize;
     }
 
@@ -213,8 +229,9 @@ mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
                         UA_ByteString *data) {
     mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(*localPrivateKey);
     mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA1);
+    size_t keylen = mbedtls_rsa_get_len(rsaContext);
 
-    if(data->length % rsaContext->len != 0)
+    if(data->length % keylen != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     size_t inOffset = 0;
@@ -223,16 +240,25 @@ mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
     unsigned char buf[512];
 
     while(inOffset < data->length) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
         int mbedErr = mbedtls_rsa_rsaes_oaep_decrypt(rsaContext, mbedtls_ctr_drbg_random,
                                                      drbgContext, MBEDTLS_RSA_PRIVATE,
                                                      NULL, 0, &outLength,
                                                      data->data + inOffset,
                                                      buf, 512);
+#else
+        int mbedErr = mbedtls_rsa_rsaes_oaep_decrypt(rsaContext, mbedtls_ctr_drbg_random,
+                                                     drbgContext,
+                                                     NULL, 0, &outLength,
+                                                     data->data + inOffset,
+                                                     buf, 512);
+#endif
+
         if(mbedErr)
             return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
         memcpy(data->data + outOffset, buf, outLength);
-        inOffset += rsaContext->len;
+        inOffset += keylen;
         outOffset += outLength;
     }
 
@@ -240,17 +266,21 @@ mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
     return UA_STATUSCODE_GOOD;
 }
 
-int UA_mbedTLS_LoadPrivateKey(const UA_ByteString *key, mbedtls_pk_context *target)
-{
+int
+UA_mbedTLS_LoadPrivateKey(const UA_ByteString *key, mbedtls_pk_context *target, void *p_rng) {
     UA_ByteString data = UA_mbedTLS_CopyDataFormatAware(key);
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     int mbedErr = mbedtls_pk_parse_key(target, data.data, data.length, NULL, 0);
+#else
+    int mbedErr = mbedtls_pk_parse_key(target, data.data, data.length, NULL, 0, mbedtls_entropy_func, p_rng);
+#endif
     UA_ByteString_clear(&data);
-
     return mbedErr;
 }
 
-UA_StatusCode UA_mbedTLS_LoadLocalCertificate(const UA_ByteString *certData, UA_ByteString *target)
-{
+UA_StatusCode
+UA_mbedTLS_LoadLocalCertificate(const UA_ByteString *certData,
+                                UA_ByteString *target) {
     UA_ByteString data = UA_mbedTLS_CopyDataFormatAware(certData);
 
     mbedtls_x509_crt cert;
@@ -277,8 +307,8 @@ UA_StatusCode UA_mbedTLS_LoadLocalCertificate(const UA_ByteString *certData, UA_
 
 // mbedTLS expects PEM data to be null terminated
 // The data length parameter must include the null terminator
-UA_ByteString UA_mbedTLS_CopyDataFormatAware(const UA_ByteString *data)
-{
+UA_ByteString
+UA_mbedTLS_CopyDataFormatAware(const UA_ByteString *data) {
     UA_ByteString result;
     UA_ByteString_init(&result);
 
diff --git a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
index 298905a436c..f5f727c4a26 100644
--- a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
+++ b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
@@ -59,7 +59,7 @@ mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
                         mbedtls_ctr_drbg_context *drbgContext,
                         UA_ByteString *data);
 
-int UA_mbedTLS_LoadPrivateKey(const UA_ByteString *key, mbedtls_pk_context *target);
+int UA_mbedTLS_LoadPrivateKey(const UA_ByteString *key, mbedtls_pk_context *target, void *p_rng);
 
 UA_StatusCode UA_mbedTLS_LoadLocalCertificate(const UA_ByteString *certData, UA_ByteString *target);
 
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 0e77fc998ad..5a4096c93af 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -15,6 +15,7 @@
 #include <mbedtls/x509.h>
 #include <mbedtls/x509_crt.h>
 #include <mbedtls/error.h>
+#include <mbedtls/version.h>
 
 #define REMOTECERTIFICATETRUSTED 1
 #define ISSUERKNOWN              2
@@ -438,10 +439,18 @@ certificateVerification_verify(void *verificationContext,
      * shall be condidered as CA Certificate and cannot be used to establish a
      * connection. Refer the test case CTT/Security/Security Certificate Validation/029.js
      * for more details */
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     if((remoteCertificate.key_usage & MBEDTLS_X509_KU_KEY_CERT_SIGN) &&
        (remoteCertificate.key_usage & MBEDTLS_X509_KU_CRL_SIGN)) {
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
     }
+#else
+    if((remoteCertificate.private_key_usage & MBEDTLS_X509_KU_KEY_CERT_SIGN) &&
+       (remoteCertificate.private_key_usage & MBEDTLS_X509_KU_CRL_SIGN)) {
+        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
+    }
+#endif
+
 
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(mbedErr) {
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
index e7ef1ced5ab..0226af44d5a 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
@@ -77,7 +77,7 @@ asym_verify_sp_aes128sha256rsaoaep(Aes128Sha256PsaOaep_ChannelContext *cc,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     unsigned char hash[UA_SHA256_LENGTH];
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     // TODO check return status
     mbedtls_sha256_ret(message->data, message->length, hash, 0);
 #else
@@ -112,7 +112,7 @@ asym_sign_sp_aes128sha256rsaoaep(Aes128Sha256PsaOaep_ChannelContext *cc,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     unsigned char hash[UA_SHA256_LENGTH];
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     // TODO check return status
     mbedtls_sha256_ret(message->data, message->length, hash, 0);
 #else
@@ -130,6 +130,9 @@ asym_sign_sp_aes128sha256rsaoaep(Aes128Sha256PsaOaep_ChannelContext *cc,
     int mbedErr = mbedtls_pk_sign(&pc->localPrivateKey,
                                   MBEDTLS_MD_SHA256, hash,
                                   UA_SHA256_LENGTH, signature->data,
+#if MBEDTLS_VERSION_NUMBER >= 0x03000000
+                                  signature->length,
+#endif
                                   &sigLen, mbedtls_ctr_drbg_random,
                                   &pc->drbgContext);
     if(mbedErr)
@@ -139,23 +142,31 @@ asym_sign_sp_aes128sha256rsaoaep(Aes128Sha256PsaOaep_ChannelContext *cc,
 
 static size_t
 asym_getLocalSignatureSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_ChannelContext *cc) {
-    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
 }
 
 static size_t
 asym_getRemoteSignatureSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_ChannelContext *cc) {
-    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
 }
 
 static size_t
 asym_getRemoteBlockSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_ChannelContext *cc) {
-    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
 }
 
 static size_t
 asym_getRemotePlainTextBlockSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_ChannelContext *cc) {
-    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    return rsaContext->len - UA_SECURITYPOLICY_AES128SHA256RSAOAEP_RSAPADDING_LEN;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
+        UA_SECURITYPOLICY_AES128SHA256RSAOAEP_RSAPADDING_LEN;
 }
 
 
@@ -384,9 +395,9 @@ parseRemoteCertificate_sp_aes128sha256rsaoaep(Aes128Sha256PsaOaep_ChannelContext
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     /* Check the key length */
-    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    if(rsaContext->len < UA_SECURITYPOLICY_AES128SHA256RSAOAEP_MINASYMKEYLENGTH ||
-       rsaContext->len > UA_SECURITYPOLICY_AES128SHA256RSAOAEP_MAXASYMKEYLENGTH)
+    size_t keylen = mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+    if(keylen < UA_SECURITYPOLICY_AES128SHA256RSAOAEP_MINASYMKEYLENGTH ||
+       keylen > UA_SECURITYPOLICY_AES128SHA256RSAOAEP_MAXASYMKEYLENGTH)
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
 
     return UA_STATUSCODE_GOOD;
@@ -578,8 +589,13 @@ updateCertificateAndPrivateKey_sp_aes128sha256rsaoaep(UA_SecurityPolicy *securit
     /* Set the new private key */
     mbedtls_pk_free(&pc->localPrivateKey);
     mbedtls_pk_init(&pc->localPrivateKey);
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
                                        newPrivateKey.length, NULL, 0);
+#else
+    int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
+                                       newPrivateKey.length, NULL, 0, mbedtls_entropy_func, &pc->drbgContext);
+#endif
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
@@ -655,7 +671,7 @@ policyContext_newContext_sp_aes128sha256rsaoaep(UA_SecurityPolicy *securityPolic
     }
 
     /* Set the private key */
-    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey);
+    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
index fe697ef282a..605c6d5aa49 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
@@ -93,16 +93,14 @@ static size_t
 asym_getLocalSignatureSize_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
-
-    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
 }
 
 static size_t
 asym_getRemoteSignatureSize_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
-
-    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
 }
 
 static UA_StatusCode
@@ -112,15 +110,17 @@ asym_encrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     mbedtls_rsa_context *remoteRsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    mbedtls_rsa_set_padding(remoteRsaContext, MBEDTLS_RSA_PKCS_V15, 0);
+    mbedtls_rsa_set_padding(remoteRsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
+    size_t keylen = mbedtls_rsa_get_len(remoteRsaContext);
 
-    size_t plainTextBlockSize = remoteRsaContext->len - UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
+    size_t plainTextBlockSize = mbedtls_rsa_get_len(remoteRsaContext) -
+        UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
     if(data->length % plainTextBlockSize != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     size_t blocks = data->length / plainTextBlockSize;
     UA_ByteString encrypted;
-    UA_StatusCode retval = UA_ByteString_allocBuffer(&encrypted, blocks * remoteRsaContext->len);
+    UA_StatusCode retval = UA_ByteString_allocBuffer(&encrypted, blocks * keylen);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -159,9 +159,10 @@ asym_decrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->policyContext->localPrivateKey);
-    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, 0);
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
+    size_t keylen = mbedtls_rsa_get_len(rsaContext);
 
-    if(data->length % rsaContext->len != 0)
+    if(data->length % keylen != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     size_t inOffset = 0;
@@ -171,13 +172,13 @@ asym_decrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
 
     while(inOffset < data->length) {
         int mbedErr = mbedtls_pk_decrypt(&cc->policyContext->localPrivateKey,
-                                         data->data + inOffset, rsaContext->len,
+                                         data->data + inOffset, keylen,
                                          buf, &outLength, 512, NULL, NULL);
         if(mbedErr)
             return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
         memcpy(data->data + outOffset, buf, outLength);
-        inOffset += rsaContext->len;
+        inOffset += keylen;
         outOffset += outLength;
     }
 
@@ -197,14 +198,17 @@ asym_getRemoteEncryptionKeyLength_sp_basic128rsa15(const Basic128Rsa15_ChannelCo
 
 static size_t
 asym_getRemoteBlockSize_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
-    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    return rsaContext->len;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
 }
 
 static size_t
 asym_getRemotePlainTextBlockSize_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
-    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    return rsaContext->len - UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
+        UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
 }
 
 static UA_StatusCode
@@ -396,9 +400,9 @@ parseRemoteCertificate_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     /* Check the key length */
-    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    if(rsaContext->len < UA_SECURITYPOLICY_BASIC128RSA15_MINASYMKEYLENGTH ||
-       rsaContext->len > UA_SECURITYPOLICY_BASIC128RSA15_MAXASYMKEYLENGTH)
+    size_t keylen = mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+    if(keylen < UA_SECURITYPOLICY_BASIC128RSA15_MINASYMKEYLENGTH ||
+       keylen > UA_SECURITYPOLICY_BASIC128RSA15_MAXASYMKEYLENGTH)
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
 
     return UA_STATUSCODE_GOOD;
@@ -583,7 +587,7 @@ updateCertificateAndPrivateKey_sp_basic128rsa15(UA_SecurityPolicy *securityPolic
     /* Set the new private key */
     mbedtls_pk_free(&pc->localPrivateKey);
     mbedtls_pk_init(&pc->localPrivateKey);
-    int mbedErr = UA_mbedTLS_LoadPrivateKey(&newPrivateKey, &pc->localPrivateKey);
+    int mbedErr = UA_mbedTLS_LoadPrivateKey(&newPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
@@ -659,7 +663,7 @@ policyContext_newContext_sp_basic128rsa15(UA_SecurityPolicy *securityPolicy,
     }
 
     /* Set the private key */
-    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey);
+    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
 
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
index 24806dc7c3b..4ad5f705484 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
@@ -96,20 +96,22 @@ static size_t
 asym_getLocalSignatureSize_sp_basic256(const Basic256_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
-    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
 }
 
 static size_t
 asym_getRemoteSignatureSize_sp_basic256(const Basic256_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
-    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
 }
 
 static size_t
 asym_getRemotePlainTextBlockSize_sp_basic256(const Basic256_ChannelContext *cc) {
-    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    return rsaContext->len - UA_SECURITYPOLICY_BASIC256SHA1_RSAPADDING_LEN;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
+        UA_SECURITYPOLICY_BASIC256SHA1_RSAPADDING_LEN;
 }
 
 /* AsymmetricEncryptionAlgorithm_RSA-OAEP-SHA1 */
@@ -150,8 +152,9 @@ asym_getRemoteEncryptionKeyLength_sp_basic256(const Basic256_ChannelContext *cc)
 
 static size_t
 asym_getRemoteBlockSize_sp_basic256(const Basic256_ChannelContext *cc) {
-    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    return rsaContext->len;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
 }
 
 static UA_StatusCode
@@ -341,9 +344,9 @@ parseRemoteCertificate_sp_basic256(Basic256_ChannelContext *cc,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     /* Check the key length */
-    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    if(rsaContext->len < UA_SECURITYPOLICY_BASIC256_MINASYMKEYLENGTH ||
-       rsaContext->len > UA_SECURITYPOLICY_BASIC256_MAXASYMKEYLENGTH)
+    size_t keylen = mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+    if(keylen < UA_SECURITYPOLICY_BASIC256_MINASYMKEYLENGTH ||
+       keylen > UA_SECURITYPOLICY_BASIC256_MAXASYMKEYLENGTH)
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
 
     return UA_STATUSCODE_GOOD;
@@ -533,7 +536,7 @@ updateCertificateAndPrivateKey_sp_basic256(UA_SecurityPolicy *securityPolicy,
     mbedtls_pk_free(&pc->localPrivateKey);
     mbedtls_pk_init(&pc->localPrivateKey);
 
-    int mbedErr = UA_mbedTLS_LoadPrivateKey(&newPrivateKey, &pc->localPrivateKey);
+    int mbedErr = UA_mbedTLS_LoadPrivateKey(&newPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
 
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
@@ -610,7 +613,7 @@ policyContext_newContext_sp_basic256(UA_SecurityPolicy *securityPolicy,
     }
 
     /* Set the private key */
-    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey);
+    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
index 7f9c0128864..1455326d5d8 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
@@ -78,7 +78,7 @@ asym_verify_sp_basic256sha256(Basic256Sha256_ChannelContext *cc,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     unsigned char hash[UA_SHA256_LENGTH];
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     // TODO check return status
     mbedtls_sha256_ret(message->data, message->length, hash, 0);
 #else
@@ -113,7 +113,7 @@ asym_sign_sp_basic256sha256(Basic256Sha256_ChannelContext *cc,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     unsigned char hash[UA_SHA256_LENGTH];
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     // TODO check return status
     mbedtls_sha256_ret(message->data, message->length, hash, 0);
 #else
@@ -131,6 +131,9 @@ asym_sign_sp_basic256sha256(Basic256Sha256_ChannelContext *cc,
     int mbedErr = mbedtls_pk_sign(&pc->localPrivateKey,
                                   MBEDTLS_MD_SHA256, hash,
                                   UA_SHA256_LENGTH, signature->data,
+#if MBEDTLS_VERSION_NUMBER >= 0x03000000
+                                  signature->length,
+#endif
                                   &sigLen, mbedtls_ctr_drbg_random,
                                   &pc->drbgContext);
     if(mbedErr)
@@ -142,28 +145,29 @@ static size_t
 asym_getLocalSignatureSize_sp_basic256sha256(const Basic256Sha256_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
-
-    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
 }
 
 static size_t
 asym_getRemoteSignatureSize_sp_basic256sha256(const Basic256Sha256_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
-
-    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
 }
 
 static size_t
 asym_getRemoteBlockSize_sp_basic256sha256(const Basic256Sha256_ChannelContext *cc) {
-    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    return rsaContext->len;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
 }
 
 static size_t
 asym_getRemotePlainTextBlockSize_sp_basic256sha256(const Basic256Sha256_ChannelContext *cc) {
-    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    return rsaContext->len - UA_SECURITYPOLICY_BASIC256SHA256_RSAPADDING_LEN;
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
+        UA_SECURITYPOLICY_BASIC256SHA256_RSAPADDING_LEN;
 }
 
 
@@ -391,9 +395,9 @@ parseRemoteCertificate_sp_basic256sha256(Basic256Sha256_ChannelContext *cc,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     /* Check the key length */
-    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
-    if(rsaContext->len < UA_SECURITYPOLICY_BASIC256SHA256_MINASYMKEYLENGTH ||
-       rsaContext->len > UA_SECURITYPOLICY_BASIC256SHA256_MAXASYMKEYLENGTH)
+    size_t keylen = mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+    if(keylen < UA_SECURITYPOLICY_BASIC256SHA256_MINASYMKEYLENGTH ||
+       keylen > UA_SECURITYPOLICY_BASIC256SHA256_MAXASYMKEYLENGTH)
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
 
     return UA_STATUSCODE_GOOD;
@@ -582,7 +586,7 @@ updateCertificateAndPrivateKey_sp_basic256sha256(UA_SecurityPolicy *securityPoli
     /* Set the new private key */
     mbedtls_pk_free(&pc->localPrivateKey);
     mbedtls_pk_init(&pc->localPrivateKey);
-    int mbedErr = UA_mbedTLS_LoadPrivateKey(&newPrivateKey, &pc->localPrivateKey);
+    int mbedErr = UA_mbedTLS_LoadPrivateKey(&newPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
@@ -658,7 +662,7 @@ policyContext_newContext_sp_basic256sha256(UA_SecurityPolicy *securityPolicy,
     }
 
     /* Set the private key */
-    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey);
+    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;

From e1ce62306ca63ae3a28fee203c642581b6e747c9 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Tue, 3 May 2022 11:24:33 +0200
Subject: [PATCH 0127/1963] fix(ci) add ci mosquitto dependency

---
 .github/workflows/build_linux.yml | 6 +++---
 .github/workflows/codeql.yml      | 2 +-
 .github/workflows/coverage.yml    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 67edeba652f..b1a92a54ff0 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -89,13 +89,13 @@ jobs:
             cmd_deps: ""
             cmd_action: build_amalgamation_mt
           - build_name: "Valgrind Build & Unit Tests with MbedTLS (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev
+            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev mosquitto
             cmd_action: unit_tests_valgrind MBEDTLS
           - build_name: "Valgrind Build & Unit Tests with OpenSSL (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind openssl
+            cmd_deps: sudo apt-get install -y -qq valgrind openssl mosquitto
             cmd_action: unit_tests_valgrind OPENSSL
           - build_name: "Clang Static Analyzer"
-            cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev
+            cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev mosquitto
             cmd_action: build_clang_analyzer
     name: ${{matrix.build_name}}
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 117924cf2bb..b9156a3feb0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -35,7 +35,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y -qq python3-sphinx graphviz check
-          sudo apt-get install -y -qq tcc clang-11 clang-tools-11 valgrind
+          sudo apt-get install -y -qq tcc clang-11 clang-tools-11 valgrind mosquitto
           sudo apt-get install -y -qq libmbedtls-dev openssl
 
       - name: Initialize CodeQL
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 5b5dce53134..9a4fd3ea155 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y -qq python3-sphinx graphviz check libmbedtls-dev
+          sudo apt-get install -y -qq python3-sphinx graphviz check libmbedtls-dev mosquitto
       - name: Fetch
         uses: actions/checkout@v2
         with:

From 3a159694573a0f61db8c212b1825eb6c79433b79 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Tue, 3 May 2022 12:54:42 +0200
Subject: [PATCH 0128/1963] fix(build) mbedtls version depended API-calls added

---
 .../mbedtls/securitypolicy_mbedtls_common.c   | 33 +++++++--
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       |  2 +-
 .../ua_securitypolicy_aes128sha256rsaoaep.c   | 26 ++++++-
 .../mbedtls/ua_securitypolicy_basic128rsa15.c | 69 +++++++++++++++++--
 .../mbedtls/ua_securitypolicy_basic256.c      | 25 +++++++
 .../ua_securitypolicy_basic256sha256.c        | 24 +++++++
 6 files changed, 165 insertions(+), 14 deletions(-)

diff --git a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
index b8b814f88c5..db6b0249731 100644
--- a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
+++ b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
@@ -34,7 +34,7 @@ UA_StatusCode
 mbedtls_generateKey(mbedtls_md_context_t *context,
                     const UA_ByteString *secret, const UA_ByteString *seed,
                     UA_ByteString *out) {
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     size_t hashLen = (size_t)mbedtls_md_get_size(context->md_info);
 #else
     size_t hashLen = (size_t)mbedtls_md_get_size(context->private_md_info);
@@ -185,10 +185,17 @@ mbedtls_encrypt_rsaOaep(mbedtls_rsa_context *context,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     size_t max_blocks = data->length / plainTextBlockSize;
-    size_t keylen = mbedtls_rsa_get_len(context);
+
 
     UA_ByteString encrypted;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    UA_StatusCode retval = UA_ByteString_allocBuffer(&encrypted, max_blocks * context->len);
+#else
+    size_t keylen = mbedtls_rsa_get_len(context);
     UA_StatusCode retval = UA_ByteString_allocBuffer(&encrypted, max_blocks * keylen);
+
+#endif
+
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -197,7 +204,7 @@ mbedtls_encrypt_rsaOaep(mbedtls_rsa_context *context,
     size_t offset = 0;
     const unsigned char *label = NULL;
     while(lenDataToEncrypt >= plainTextBlockSize) {
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
         int mbedErr = mbedtls_rsa_rsaes_oaep_encrypt(context, mbedtls_ctr_drbg_random,
                                                      drbgContext, MBEDTLS_RSA_PUBLIC,
                                                      label, 0, plainTextBlockSize,
@@ -214,7 +221,11 @@ mbedtls_encrypt_rsaOaep(mbedtls_rsa_context *context,
         }
 
         inOffset += plainTextBlockSize;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+        offset += context->len;
+#else
         offset += keylen;
+#endif
         lenDataToEncrypt -= plainTextBlockSize;
     }
 
@@ -229,10 +240,14 @@ mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
                         UA_ByteString *data) {
     mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(*localPrivateKey);
     mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA1);
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    if(data->length % rsaContext->len != 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#else
     size_t keylen = mbedtls_rsa_get_len(rsaContext);
-
-    if(data->length % keylen != 0)
+        if(data->length % keylen != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
+#endif
 
     size_t inOffset = 0;
     size_t outOffset = 0;
@@ -240,7 +255,7 @@ mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
     unsigned char buf[512];
 
     while(inOffset < data->length) {
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
         int mbedErr = mbedtls_rsa_rsaes_oaep_decrypt(rsaContext, mbedtls_ctr_drbg_random,
                                                      drbgContext, MBEDTLS_RSA_PRIVATE,
                                                      NULL, 0, &outLength,
@@ -258,7 +273,11 @@ mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
             return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
         memcpy(data->data + outOffset, buf, outLength);
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+        inOffset += rsaContext->len;
+#else
         inOffset += keylen;
+#endif
         outOffset += outLength;
     }
 
@@ -269,7 +288,7 @@ mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
 int
 UA_mbedTLS_LoadPrivateKey(const UA_ByteString *key, mbedtls_pk_context *target, void *p_rng) {
     UA_ByteString data = UA_mbedTLS_CopyDataFormatAware(key);
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     int mbedErr = mbedtls_pk_parse_key(target, data.data, data.length, NULL, 0);
 #else
     int mbedErr = mbedtls_pk_parse_key(target, data.data, data.length, NULL, 0, mbedtls_entropy_func, p_rng);
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 5a4096c93af..d21ce0eb7d4 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -439,7 +439,7 @@ certificateVerification_verify(void *verificationContext,
      * shall be condidered as CA Certificate and cannot be used to establish a
      * connection. Refer the test case CTT/Security/Security Certificate Validation/029.js
      * for more details */
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     if((remoteCertificate.key_usage & MBEDTLS_X509_KU_KEY_CERT_SIGN) &&
        (remoteCertificate.key_usage & MBEDTLS_X509_KU_CRL_SIGN)) {
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
index 0226af44d5a..bbfd3d8eb1e 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
@@ -142,31 +142,49 @@ asym_sign_sp_aes128sha256rsaoaep(Aes128Sha256PsaOaep_ChannelContext *cc,
 
 static size_t
 asym_getLocalSignatureSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
+#endif
+
 }
 
 static size_t
 asym_getRemoteSignatureSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
 }
 
 static size_t
 asym_getRemoteBlockSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
 }
 
 static size_t
 asym_getRemotePlainTextBlockSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len - UA_SECURITYPOLICY_AES128SHA256RSAOAEP_RSAPADDING_LEN;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
         UA_SECURITYPOLICY_AES128SHA256RSAOAEP_RSAPADDING_LEN;
+#endif
 }
 
 
@@ -395,9 +413,15 @@ parseRemoteCertificate_sp_aes128sha256rsaoaep(Aes128Sha256PsaOaep_ChannelContext
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     /* Check the key length */
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    if(rsaContext->len < UA_SECURITYPOLICY_AES128SHA256RSAOAEP_MINASYMKEYLENGTH ||
+       rsaContext->len > UA_SECURITYPOLICY_AES128SHA256RSAOAEP_MAXASYMKEYLENGTH)
+#else
     size_t keylen = mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
     if(keylen < UA_SECURITYPOLICY_AES128SHA256RSAOAEP_MINASYMKEYLENGTH ||
        keylen > UA_SECURITYPOLICY_AES128SHA256RSAOAEP_MAXASYMKEYLENGTH)
+#endif
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
 
     return UA_STATUSCODE_GOOD;
@@ -589,7 +613,7 @@ updateCertificateAndPrivateKey_sp_aes128sha256rsaoaep(UA_SecurityPolicy *securit
     /* Set the new private key */
     mbedtls_pk_free(&pc->localPrivateKey);
     mbedtls_pk_init(&pc->localPrivateKey);
-#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
                                        newPrivateKey.length, NULL, 0);
 #else
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
index 605c6d5aa49..8348d5bf049 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
@@ -93,14 +93,26 @@ static size_t
 asym_getLocalSignatureSize_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+#else
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
+#endif
+
+
 }
 
 static size_t
 asym_getRemoteSignatureSize_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
+
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
+
 }
 
 static UA_StatusCode
@@ -111,16 +123,25 @@ asym_encrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
 
     mbedtls_rsa_context *remoteRsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
     mbedtls_rsa_set_padding(remoteRsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
-    size_t keylen = mbedtls_rsa_get_len(remoteRsaContext);
 
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    size_t plainTextBlockSize = remoteRsaContext->len - UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
+#else
+    size_t keylen = mbedtls_rsa_get_len(remoteRsaContext);
     size_t plainTextBlockSize = mbedtls_rsa_get_len(remoteRsaContext) -
         UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
+#endif
+
     if(data->length % plainTextBlockSize != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     size_t blocks = data->length / plainTextBlockSize;
     UA_ByteString encrypted;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    UA_StatusCode retval = UA_ByteString_allocBuffer(&encrypted, blocks * remoteRsaContext->len);
+#else
     UA_StatusCode retval = UA_ByteString_allocBuffer(&encrypted, blocks * keylen);
+#endif
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -160,10 +181,14 @@ asym_decrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
 
     mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->policyContext->localPrivateKey);
     mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    if(data->length % rsaContext->len != 0)
+            return UA_STATUSCODE_BADINTERNALERROR;
+#else
     size_t keylen = mbedtls_rsa_get_len(rsaContext);
-
-    if(data->length % keylen != 0)
+        if(data->length % keylen != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
+#endif
 
     size_t inOffset = 0;
     size_t outOffset = 0;
@@ -171,14 +196,25 @@ asym_decrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
     unsigned char buf[512];
 
     while(inOffset < data->length) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+        int mbedErr = mbedtls_pk_decrypt(&cc->policyContext->localPrivateKey,
+                                         data->data + inOffset, rsaContext->len,
+                                         buf, &outLength, 512, NULL, NULL);
+#else
         int mbedErr = mbedtls_pk_decrypt(&cc->policyContext->localPrivateKey,
                                          data->data + inOffset, keylen,
                                          buf, &outLength, 512, NULL, NULL);
+#endif
+
         if(mbedErr)
             return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
         memcpy(data->data + outOffset, buf, outLength);
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+        inOffset += rsaContext->len;
+#else
         inOffset += keylen;
+#endif
         outOffset += outLength;
     }
 
@@ -188,7 +224,14 @@ asym_decrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
 
 static size_t
 asym_getLocalEncryptionKeyLength_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
-    return mbedtls_pk_get_len(&cc->policyContext->localPrivateKey) * 8;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len;
+#else
+    if(cc == NULL)
+        return 0;
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
 }
 
 static size_t
@@ -198,17 +241,27 @@ asym_getRemoteEncryptionKeyLength_sp_basic128rsa15(const Basic128Rsa15_ChannelCo
 
 static size_t
 asym_getRemoteBlockSize_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
 }
 
 static size_t
 asym_getRemotePlainTextBlockSize_sp_basic128rsa15(const Basic128Rsa15_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len - UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
         UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
+#endif
 }
 
 static UA_StatusCode
@@ -400,11 +453,17 @@ parseRemoteCertificate_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     /* Check the key length */
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    if(rsaContext->len < UA_SECURITYPOLICY_BASIC128RSA15_MINASYMKEYLENGTH ||
+       rsaContext->len > UA_SECURITYPOLICY_BASIC128RSA15_MAXASYMKEYLENGTH)
+        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
+#else
     size_t keylen = mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
     if(keylen < UA_SECURITYPOLICY_BASIC128RSA15_MINASYMKEYLENGTH ||
        keylen > UA_SECURITYPOLICY_BASIC128RSA15_MAXASYMKEYLENGTH)
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
-
+#endif
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
index 4ad5f705484..bf0196bb7f8 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
@@ -96,22 +96,36 @@ static size_t
 asym_getLocalSignatureSize_sp_basic256(const Basic256_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+#else
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
+
+#endif
 }
 
 static size_t
 asym_getRemoteSignatureSize_sp_basic256(const Basic256_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
 }
 
 static size_t
 asym_getRemotePlainTextBlockSize_sp_basic256(const Basic256_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len - UA_SECURITYPOLICY_BASIC256SHA1_RSAPADDING_LEN;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
         UA_SECURITYPOLICY_BASIC256SHA1_RSAPADDING_LEN;
+#endif
 }
 
 /* AsymmetricEncryptionAlgorithm_RSA-OAEP-SHA1 */
@@ -152,9 +166,14 @@ asym_getRemoteEncryptionKeyLength_sp_basic256(const Basic256_ChannelContext *cc)
 
 static size_t
 asym_getRemoteBlockSize_sp_basic256(const Basic256_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
 }
 
 static UA_StatusCode
@@ -344,9 +363,15 @@ parseRemoteCertificate_sp_basic256(Basic256_ChannelContext *cc,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     /* Check the key length */
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    if(rsaContext->len < UA_SECURITYPOLICY_BASIC256_MINASYMKEYLENGTH ||
+       rsaContext->len > UA_SECURITYPOLICY_BASIC256_MAXASYMKEYLENGTH)
+#else
     size_t keylen = mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
     if(keylen < UA_SECURITYPOLICY_BASIC256_MINASYMKEYLENGTH ||
        keylen > UA_SECURITYPOLICY_BASIC256_MAXASYMKEYLENGTH)
+#endif
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
 
     return UA_STATUSCODE_GOOD;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
index 1455326d5d8..1daf6534b02 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
@@ -145,29 +145,47 @@ static size_t
 asym_getLocalSignatureSize_sp_basic256sha256(const Basic256Sha256_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+#else
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
+#endif
 }
 
 static size_t
 asym_getRemoteSignatureSize_sp_basic256sha256(const Basic256Sha256_ChannelContext *cc) {
     if(cc == NULL)
         return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
 }
 
 static size_t
 asym_getRemoteBlockSize_sp_basic256sha256(const Basic256Sha256_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
 }
 
 static size_t
 asym_getRemotePlainTextBlockSize_sp_basic256sha256(const Basic256Sha256_ChannelContext *cc) {
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len - UA_SECURITYPOLICY_BASIC256SHA256_RSAPADDING_LEN;
+#else
     if(cc == NULL)
         return 0;
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
         UA_SECURITYPOLICY_BASIC256SHA256_RSAPADDING_LEN;
+#endif
 }
 
 
@@ -395,9 +413,15 @@ parseRemoteCertificate_sp_basic256sha256(Basic256Sha256_ChannelContext *cc,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     /* Check the key length */
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    if(rsaContext->len < UA_SECURITYPOLICY_BASIC256SHA256_MINASYMKEYLENGTH ||
+       rsaContext->len > UA_SECURITYPOLICY_BASIC256SHA256_MAXASYMKEYLENGTH)
+#else
     size_t keylen = mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
     if(keylen < UA_SECURITYPOLICY_BASIC256SHA256_MINASYMKEYLENGTH ||
        keylen > UA_SECURITYPOLICY_BASIC256SHA256_MAXASYMKEYLENGTH)
+#endif
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
 
     return UA_STATUSCODE_GOOD;

From 46c86236b4fef645245f756a00748bbc97adbcb6 Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Tue, 3 May 2022 21:46:38 +0200
Subject: [PATCH 0129/1963] fix(nc): check namespace when searching for
 HasTypeDefinition reference (#5091)

* fix(nc): check namespace when searching for HasTypeDefinition reference
---
 tools/nodeset_compiler/nodes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nodeset_compiler/nodes.py b/tools/nodeset_compiler/nodes.py
index 81628e3186f..bfcb957a213 100644
--- a/tools/nodeset_compiler/nodes.py
+++ b/tools/nodeset_compiler/nodes.py
@@ -151,7 +151,7 @@ def getParentReference(self, parentreftypes):
 
     def popTypeDef(self):
         for ref in self.references:
-            if ref.referenceType.i == 40 and ref.isForward:
+            if ref.referenceType == NodeId("ns=0;i=40") and ref.isForward:
                 del self.references[ref]
                 return ref
         return Reference(NodeId(), NodeId(), NodeId(), False)

From 739cc62a4130852807499e6cb1fe34d328999553 Mon Sep 17 00:00:00 2001
From: neojaw <68939028+neojaw@users.noreply.github.com>
Date: Tue, 3 May 2022 22:24:17 +0200
Subject: [PATCH 0130/1963] fix(plugin): correct typo for macro parameter
 (#5089)

---
 plugins/crypto/openssl/ua_openssl_version_abstraction.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/crypto/openssl/ua_openssl_version_abstraction.h b/plugins/crypto/openssl/ua_openssl_version_abstraction.h
index 5e2b6d6a783..a6fa45bdf70 100644
--- a/plugins/crypto/openssl/ua_openssl_version_abstraction.h
+++ b/plugins/crypto/openssl/ua_openssl_version_abstraction.h
@@ -22,7 +22,7 @@
 #endif
 
 #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
-#define X509_STORE_CTX_get_check_issued(STORE_CTX) storeCtx->check_issued
+#define X509_STORE_CTX_get_check_issued(STORE_CTX) STORE_CTX->check_issued
 #endif
 
 #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)

From 9db554512349710bea2592de110049d334f1f6d2 Mon Sep 17 00:00:00 2001
From: Ivan <ivan.ushakov@gmail.com>
Date: Wed, 4 May 2022 00:32:51 +0300
Subject: [PATCH 0131/1963] fix(pubsub) export pubsub mqtt transport layer
 function (#5088)

---
 plugins/ua_network_pubsub_mqtt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ua_network_pubsub_mqtt.h b/plugins/ua_network_pubsub_mqtt.h
index 4285faa51ca..78571831dac 100644
--- a/plugins/ua_network_pubsub_mqtt.h
+++ b/plugins/ua_network_pubsub_mqtt.h
@@ -49,7 +49,7 @@ typedef struct {
  */    
 
 
-UA_PubSubTransportLayer
+UA_PubSubTransportLayer UA_EXPORT
 UA_PubSubTransportLayerMQTT(void);
 
 

From c47249e858a323ea0c9edea430faefbe3db9de8a Mon Sep 17 00:00:00 2001
From: MichalTyndel <99327189+MichalTyndel@users.noreply.github.com>
Date: Wed, 4 May 2022 08:12:16 +0200
Subject: [PATCH 0132/1963] feat(server): Allow invoking ObjectType's method on
 its instance (#4955)

OPC UA specification allows situation, where objectType's method is
invoked on its instance. Added new checks to allow for such situation.

In this case the source of the hasComponent reference (or its subtype)
is the objectType of the target object, or the supertype of that
objectType.
---
 src/server/ua_services_method.c    | 59 ++++++++++++++++++++++++++++++
 tests/server/check_services_call.c | 31 ++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 96fd15fa1ec..312bcad85c3 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -125,6 +125,7 @@ static const UA_NodeId hasComponentNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID
 static const UA_NodeId organizedByNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_ORGANIZES}};
 static const UA_String namespaceDiModel = UA_STRING_STATIC("http://opcfoundation.org/UA/DI/");
 static const UA_NodeId hasTypeDefinitionNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_HASTYPEDEFINITION}};
+static const UA_NodeId hasSubTypeNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_HASSUBTYPE}};
 // ns=0 will be replace dynamically. DI-Spec. 1.01: <UAObjectType NodeId="ns=1;i=1005" BrowseName="1:FunctionalGroupType">
 static UA_NodeId functionGroupNodeId = {0, UA_NODEIDTYPE_NUMERIC, {1005}};
 
@@ -178,6 +179,64 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
             }
         }
     }
+    if(!found) {
+        /* If the object doesn't have a hasComponent reference to the method node,
+         * check its objectType (and its supertypes). Invoked method can be a component
+         * of objectType and be invoked on this objectType's instance (or on a instance
+         * of one of its subtypes). */
+
+        /* Get the ObjectType */
+        const UA_Node *objectType = NULL;
+        bool releaseType = true;
+        if(object->head.nodeClass == UA_NODECLASS_OBJECT) {
+            objectType = getNodeType(server, &object->head);
+            if(!objectType) {
+                result->statusCode = UA_STATUSCODE_BADMETHODINVALID;
+                return;
+            }
+        }
+        else {
+            /* If the method was invoked on objectType use the provided node and don't 
+             * release it later, it's done in calling function */
+            objectType = (const UA_Node *)object;
+            releaseType = false;
+        }
+
+        UA_ReferenceTypeSet hasSubTypeRefs;
+        result->statusCode = referenceTypeIndices(server, &hasSubTypeNodeId,
+                                                  &hasSubTypeRefs, true);
+        if(result->statusCode != UA_STATUSCODE_GOOD)
+            return;
+
+        UA_ExpandedNodeId methodExpId = UA_EXPANDEDNODEID_NODEID(request->methodId);
+        while(objectType && !found) {
+            /* Check if this objectType references the method node with hasComponent (or its subtype) */
+            for(size_t i = 0; i < objectType->head.referencesSize && !found; ++i) {
+                const UA_NodeReferenceKind *rk = &objectType->head.references[i];
+                if(rk->isInverse)
+                    continue;
+                if(!UA_ReferenceTypeSet_contains(&hasComponentRefs, rk->referenceTypeIndex))
+                    continue;
+                if(UA_NodeReferenceKind_findTarget(rk, &methodExpId)) {
+                    found = true;
+                    break;
+                }
+            }
+            if(found)
+                break;
+            
+            /* Reference was not found - next iteration check supertype */
+            const UA_Node *superType = getNodeType(server, &objectType->head);
+            if(objectType && releaseType) {
+                UA_NODESTORE_RELEASE(server, objectType);
+            }
+            objectType = superType;
+            releaseType = true;
+        }
+        if(objectType && releaseType) {
+            UA_NODESTORE_RELEASE(server, objectType);
+        }
+    }
 
     if(!found) {
         /* The following ParentObject evaluation is a workaround only to fulfill
diff --git a/tests/server/check_services_call.c b/tests/server/check_services_call.c
index fe2714bac71..ad0fd836e4f 100644
--- a/tests/server/check_services_call.c
+++ b/tests/server/check_services_call.c
@@ -58,6 +58,11 @@ static void setup(void) {
                             UA_QUALIFIEDNAME(1, "Not executable"),
                             nonExecAttr, &methodCallback,
                             0, NULL, 0, NULL, NULL, NULL);
+    
+    /* Add callback to ServerType's getMonitoredItems method */
+    UA_Server_setMethodNodeCallback(server, 
+                                    UA_NODEID_NUMERIC(0,UA_NS0ID_SERVERTYPE_GETMONITOREDITEMS), 
+                                    &methodCallback);
 }
 
 static void teardown(void) {
@@ -230,6 +235,31 @@ START_TEST(callMethodWithEmptyArgument) {
 #endif
 } END_TEST
 
+START_TEST(callObjectTypeMethodOnInstance) {
+/* Minimal nodeset does not add any method nodes we may call here */
+#if defined(UA_GENERATED_NAMESPACE_ZERO_FULL) && defined(UA_ENABLE_SUBSCRIPTIONS)
+    UA_Variant inputArgument;
+    UA_Variant_init(&inputArgument);
+    UA_UInt32 inputArgumentValue = 0;
+    UA_Variant_setScalar(&inputArgument, &inputArgumentValue, &UA_TYPES[UA_TYPES_UINT32]);
+
+    UA_CallMethodRequest callMethodRequest;
+    UA_CallMethodRequest_init(&callMethodRequest);
+    callMethodRequest.inputArgumentsSize = 1;
+    callMethodRequest.inputArguments = &inputArgument;
+    callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVERTYPE_GETMONITOREDITEMS);
+    callMethodRequest.objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER);
+
+    UA_CallMethodResult result;
+    UA_CallMethodResult_init(&result);
+    result = UA_Server_call(server, &callMethodRequest);
+
+    ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
+
+    UA_Array_delete(result.inputArgumentResults, result.inputArgumentResultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
+#endif
+} END_TEST
+
 int main(void) {
     Suite *s = suite_create("services_call");
 
@@ -245,6 +275,7 @@ int main(void) {
     tcase_add_test(tc_call, callMethodWithTooManyArguments);
     tcase_add_test(tc_call, callMethodWithWronglyTypedArguments);
     tcase_add_test(tc_call, callMethodWithEmptyArgument);
+    tcase_add_test(tc_call, callObjectTypeMethodOnInstance);
     suite_add_tcase(s, tc_call);
 
     SRunner *sr = srunner_create(s);

From 8e04876527df3e564aa1e3b23329eb397f82ed95 Mon Sep 17 00:00:00 2001
From: Thomas Gusenleitner <thomas.gusenleitner@gmail.com>
Date: Wed, 4 May 2022 09:02:40 +0200
Subject: [PATCH 0133/1963] fix(nc) set missing executeable flag on
 tools/generate_nodeid_header.py (#5090)

---
 tools/generate_nodeid_header.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tools/generate_nodeid_header.py

diff --git a/tools/generate_nodeid_header.py b/tools/generate_nodeid_header.py
old mode 100644
new mode 100755

From c0a5d36f9f726f513c26fcee5447f1c9e4745645 Mon Sep 17 00:00:00 2001
From: Kjeld Flarup <30384076+kjeldflarup@users.noreply.github.com>
Date: Wed, 4 May 2022 12:34:39 +0200
Subject: [PATCH 0134/1963] fix(server) remove PTHREAD_MUTEX_RECURSIVE in
 architectures

---
 arch/posix/ua_architecture.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 4d2cb1f8f1a..dfe139fb77d 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -145,7 +145,6 @@ typedef struct {
 static UA_INLINE void
 UA_LOCK_INIT(UA_Lock *lock) {
     pthread_mutexattr_init(&lock->mutexAttr);
-    pthread_mutexattr_settype(&lock->mutexAttr, PTHREAD_MUTEX_RECURSIVE);
     pthread_mutex_init(&lock->mutex, &lock->mutexAttr);
     lock->mutexCounter = 0;
 }

From b7614c88d59aa75a91d9bc5bc2a505b3d37aa644 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 4 May 2022 15:36:15 +0200
Subject: [PATCH 0135/1963] feat(server) remove namespace LATEST_1_05 flag
 (#5096)

---
 CMakeLists.txt | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecbae9cc66e..e4434f89928 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,8 +258,8 @@ if(UA_ENABLE_TPM2_KEYSTORE)
 endif()
 
 # Namespace Zero
-set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated namespace zero (minimal/reduced/full/latest_1_05)")
-SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED" "FULL" "LATEST_1_05")
+set(UA_NAMESPACE_ZERO "REDUCED" CACHE STRING "Completeness of the generated namespace zero (minimal/reduced/full)")
+SET_PROPERTY(CACHE UA_NAMESPACE_ZERO PROPERTY STRINGS "MINIMAL" "REDUCED" "FULL")
 if(UA_NAMESPACE_ZERO STREQUAL "MINIMAL")
     set(UA_GENERATED_NAMESPACE_ZERO OFF)
 else()
@@ -272,12 +272,6 @@ else()
     set(UA_GENERATED_NAMESPACE_ZERO_FULL OFF)
 endif()
 
-if(UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05")
-    set(UA_GENERATED_NAMESPACE_ZERO_LATEST_1_05 ON)
-else()
-    set(UA_GENERATED_NAMESPACE_ZERO_LATEST_1_05 OFF)
-endif()
-
 if(MSVC AND UA_NAMESPACE_ZERO STREQUAL "FULL")
     # For the full NS0 we need a stack size of 8MB (as it is default on linux)
     # See https://github.com/open62541/open62541/issues/1326
@@ -1176,7 +1170,7 @@ endif()
 # List of nodeset files combined into NS0 generated file
 set(UA_FILE_NODESETS)
 
-if(UA_NAMESPACE_ZERO STREQUAL "FULL" OR UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05")
+if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     if(NOT UA_FILE_NS0)
         set(UA_FILE_NS0 ${open62541_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
     endif()
@@ -1184,18 +1178,8 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL" OR UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05"
 
     if(NOT EXISTS "${UA_FILE_NS0}")
         message(FATAL_ERROR "File ${UA_FILE_NS0} not found. You probably need to initialize the git submodule for deps/ua-nodeset or set open62541_NODESET_DIR.")
-    else()
-        # If the "LATEST_1_05" flag is set, it must be checked whether the nodeset NS0 is on the latest version.
-        if(UA_NAMESPACE_ZERO STREQUAL "LATEST_1_05")
-            file(READ ${UA_FILE_NS0} ver LIMIT 5000)
-            string(REGEX MATCH ".*http:\\/\\/opcfoundation\\.org\\/UA\\/\" .* Version=\"1\\.05" match ${ver})
-            if(NOT match)
-                message(FATAL_ERROR "File ${UA_FILE_NS0} is set incorrectly. You probably need to checkout the git submodule for deps/ua-nodeset to version 1.05. Therefore execute the following command inside the deps/ua-nodeset directory \ngit checkout v1.05")
-            endif()
-        endif()
     endif()
 
-
     set(UA_FILE_NODEIDS ${open62541_NODESET_DIR}/Schema/NodeIds.csv)
     set(UA_FILE_STATUSCODES ${open62541_NODESET_DIR}/Schema/StatusCode.csv)
     set(UA_FILE_TYPES_BSD ${open62541_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)

From baae15eda74cc65b56c1c4293dbd6c71d6696f9f Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 4 May 2022 17:56:29 +0200
Subject: [PATCH 0136/1963] fix(test) add realsleep in subscription tests to
 release mutex  (#5098)

fix(test) add realsleep in subscription tests to release mutex
---
 tests/server/check_subscription_event_filter.c | 1 +
 tests/server/check_subscription_events.c       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index b391a617d0b..040503018a4 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -162,6 +162,7 @@ THREAD_CALLBACK(serverloop) {
         UA_Server_run_iterate(server, false);
         serverIterations++;
         serverMutexUnlock();
+        UA_realSleep(1);
     }
     return 0;
 }
diff --git a/tests/server/check_subscription_events.c b/tests/server/check_subscription_events.c
index 0e4ed44b1cb..17c209d9c6e 100644
--- a/tests/server/check_subscription_events.c
+++ b/tests/server/check_subscription_events.c
@@ -175,6 +175,7 @@ THREAD_CALLBACK(serverloop) {
         UA_Server_run_iterate(server, false);
         serverIterations++;
         serverMutexUnlock();
+        UA_realSleep(1);
     }
     return 0;
 }

From 047b05a1b8f9618d7668d05dfc92da45c08283c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 May 2022 00:47:42 +0000
Subject: [PATCH 0137/1963] build(deps): bump deps/ua-nodeset from `4338a34` to
 `71f8826`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `4338a34` to `71f8826`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/4338a34ea3cff40de19b1afefb05ffbb4525fe78...71f8826fd37cc899d941c271e66eac36abb40e44)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 4338a34ea3c..71f8826fd37 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 4338a34ea3cff40de19b1afefb05ffbb4525fe78
+Subproject commit 71f8826fd37cc899d941c271e66eac36abb40e44

From ebe1b5484c240bec897067b6f3b8c13b3ca24c37 Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Mon, 9 May 2022 13:00:45 +0200
Subject: [PATCH 0138/1963] fix(core) compilation bug due to missing void
 parameter (#5117)

---
 .idea/open625412.iml           | 2 ++
 plugins/ua_config_default.c    | 4 ++--
 plugins/ua_pubsub_ethernet.c   | 2 +-
 plugins/ua_pubsub_udp.c        | 2 +-
 src/pubsub/ua_pubsub_manager.c | 2 +-
 src/server/ua_subscription.c   | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 .idea/open625412.iml

diff --git a/.idea/open625412.iml b/.idea/open625412.iml
new file mode 100644
index 00000000000..f08604bb65b
--- /dev/null
+++ b/.idea/open625412.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />
\ No newline at end of file
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index a1168ed118e..e95538efe9f 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -45,7 +45,7 @@ static UA_StatusCode
 setDefaultConfig(UA_ServerConfig *conf);
 
 UA_Server *
-UA_Server_new() {
+UA_Server_new(void) {
     UA_ServerConfig config;
     memset(&config, 0, sizeof(UA_ServerConfig));
 
@@ -757,7 +757,7 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
 /* Default Client Settings */
 /***************************/
 
-UA_Client * UA_Client_new() {
+UA_Client * UA_Client_new(void) {
     UA_ClientConfig config;
     memset(&config, 0, sizeof(UA_ClientConfig));
     config.logger.log = UA_Log_Stdout_log;
diff --git a/plugins/ua_pubsub_ethernet.c b/plugins/ua_pubsub_ethernet.c
index 8032ca6a64c..b0f04b74617 100644
--- a/plugins/ua_pubsub_ethernet.c
+++ b/plugins/ua_pubsub_ethernet.c
@@ -1321,7 +1321,7 @@ TransportLayerEthernet_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
 }
 
 UA_PubSubTransportLayer
-UA_PubSubTransportLayerEthernet() {
+UA_PubSubTransportLayerEthernet(void) {
     UA_PubSubTransportLayer pubSubTransportLayer;
     pubSubTransportLayer.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index ea6a2e8767b..40279f17163 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -848,7 +848,7 @@ TransportLayerUDPMC_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
 
 //UDPMC channel factory
 UA_PubSubTransportLayer
-UA_PubSubTransportLayerUDPMP() {
+UA_PubSubTransportLayerUDPMP(void) {
     UA_PubSubTransportLayer pubSubTransportLayer;
     pubSubTransportLayer.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index f14100d6f27..f428a7d264d 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -300,7 +300,7 @@ UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
 /* Calculate the time difference between current time and UTC (00:00) on January
  * 1, 2000. */
 UA_UInt32
-UA_PubSubConfigurationVersionTimeDifference() {
+UA_PubSubConfigurationVersionTimeDifference(void) {
     UA_UInt32 timeDiffSince2000 = (UA_UInt32) (UA_DateTime_now() - UA_DATETIMESTAMP_2000);
     return timeDiffSince2000;
 }
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 2f797221a1f..86614a04157 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -25,7 +25,7 @@
 #define UA_MAX_RETRANSMISSIONQUEUESIZE 256
 
 UA_Subscription *
-UA_Subscription_new() {
+UA_Subscription_new(void) {
     /* Allocate the memory */
     UA_Subscription *newSub = (UA_Subscription*)UA_calloc(1, sizeof(UA_Subscription));
     if(!newSub)

From b65207000720c05e2ed17d46937623d7118e079a Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Fri, 6 May 2022 16:09:00 +0200
Subject: [PATCH 0139/1963] refactor: add tests via new function ua_add_test

---
 tests/CMakeLists.txt | 448 ++++++++++---------------------------------
 1 file changed, 106 insertions(+), 342 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 83a3f9e3c74..f3bc07c27bf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -212,397 +212,186 @@ add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
 # the unit test are built directly on the open62541 object files. so they can
 # access symbols that are hidden/not exported to the shared library
 
-add_executable(check_types_builtin check_types_builtin.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_types_builtin ${LIBS})
-add_test_valgrind(types_builtin ${TESTS_BINARY_DIR}/check_types_builtin)
+function(ua_add_test test_path_relative)
+    string(REPLACE "." ";" PARTS ${test_path_relative})
+    list(POP_FRONT PARTS PATH_WITHOUT_EXTENSION)
+    string(REPLACE "/" ";" QUALIFIED_PATHNAME ${PATH_WITHOUT_EXTENSION})
+    list(POP_BACK QUALIFIED_PATHNAME TEST_NAME)
+
+    add_executable(${TEST_NAME} ${test_path_relative} $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    target_link_libraries(${TEST_NAME} ${LIBS})
+    add_test_valgrind(${TEST_NAME} ${TESTS_BINARY_DIR}/${TEST_NAME})
+endfunction()
+
+ua_add_test(check_types_builtin.c)
 
 if(UA_ENABLE_JSON_ENCODING)
-    add_executable(check_types_builtin_json check_types_builtin_json.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_types_builtin_json ${LIBS})
-    add_test_valgrind(types_builtin_json ${TESTS_BINARY_DIR}/check_types_builtin_json)
+    ua_add_test(check_types_builtin_json.c)
 
     if(UA_ENABLE_PUBSUB)
-        add_executable(check_pubsub_encoding_json pubsub/check_pubsub_encoding_json.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_encoding_json ${LIBS})
-        add_test_valgrind(pubsub_encoding_json ${TESTS_BINARY_DIR}/check_pubsub_encoding_json)
-
-        add_executable(check_pubsub_publish_json pubsub/check_pubsub_publish_json.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_publish_json ${LIBS})
-        add_test_valgrind(pubsub_publish_json ${TESTS_BINARY_DIR}/check_pubsub_publish_json)
+        ua_add_test(pubsub/check_pubsub_encoding_json.c)
+        ua_add_test(pubsub/check_pubsub_publish_json.c)
     endif()
 endif()
 
-add_executable(check_types_memory check_types_memory.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_types_memory ${LIBS})
-add_test_valgrind(types_memory ${TESTS_BINARY_DIR}/check_types_memory)
-
-add_executable(check_types_range check_types_range.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_types_range ${LIBS})
-add_test_valgrind(types_range ${TESTS_BINARY_DIR}/check_types_range)
+ua_add_test(check_types_memory.c)
+ua_add_test(check_types_range.c)
 
 if(UA_ENABLE_PARSING)
-    add_executable(check_types_parse check_types_parse.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_types_parse ${LIBS})
-    add_test_valgrind(types_parse ${TESTS_BINARY_DIR}/check_types_parse)
+    ua_add_test(check_types_parse.c)
 endif()
 
-add_executable(check_types_custom check_types_custom.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_types_custom ${LIBS})
-add_test_valgrind(types_custom ${TESTS_BINARY_DIR}/check_types_custom)
-
-add_executable(check_chunking check_chunking.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_chunking ${LIBS})
-add_test_valgrind(chunking ${TESTS_BINARY_DIR}/check_chunking)
-
-add_executable(check_utils check_utils.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_utils ${LIBS})
-add_test_valgrind(utils ${TESTS_BINARY_DIR}/check_utils)
-
-add_executable(check_securechannel check_securechannel.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_securechannel ${LIBS})
-add_test_valgrind(securechannel ${TESTS_BINARY_DIR}/check_securechannel)
-
-add_executable(check_timer check_timer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_timer ${LIBS})
-add_test_valgrind(timer ${TESTS_BINARY_DIR}/check_timer)
-
-add_executable(check_eventloop check_eventloop.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_eventloop ${LIBS})
-add_test_valgrind(eventloop ${TESTS_BINARY_DIR}/check_eventloop)
-
-add_executable(check_eventloop_tcp check_eventloop_tcp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_eventloop_tcp ${LIBS})
-add_test_valgrind(eventloop_tcp ${TESTS_BINARY_DIR}/check_eventloop_tcp)
-
-add_executable(check_eventloop_udp check_eventloop_udp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_eventloop_udp ${LIBS})
-add_test_valgrind(eventloop_udp ${TESTS_BINARY_DIR}/check_eventloop_udp)
-
-add_executable(check_eventloop_interrupt check_eventloop_interrupt.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_eventloop_interrupt ${LIBS})
-add_test_valgrind(eventloop_interrupt ${TESTS_BINARY_DIR}/check_eventloop_interrupt)
+ua_add_test(check_types_custom.c)
+ua_add_test(check_chunking.c)
+ua_add_test(check_utils.c)
+ua_add_test(check_securechannel.c)
+ua_add_test(check_timer.c)
+ua_add_test(check_eventloop.c)
+ua_add_test(check_eventloop_tcp.c)
+ua_add_test(check_eventloop_udp.c)
+ua_add_test(check_eventloop_interrupt.c)
 
 # Test Server
 
-add_executable(check_accesscontrol server/check_accesscontrol.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_accesscontrol ${LIBS})
-add_test_valgrind(accesscontrol ${TESTS_BINARY_DIR}/check_accesscontrol)
-
-add_executable(check_services_view server/check_services_view.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_services_view ${LIBS})
-add_test_valgrind(services_view ${TESTS_BINARY_DIR}/check_services_view)
-
-add_executable(check_services_attributes server/check_services_attributes.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_services_attributes ${LIBS})
-add_test_valgrind(services_attributes ${TESTS_BINARY_DIR}/check_services_attributes)
-
-add_executable(check_services_nodemanagement server/check_services_nodemanagement.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_services_nodemanagement ${LIBS})
-add_test_valgrind(services_nodemanagement ${TESTS_BINARY_DIR}/check_services_nodemanagement)
-
-add_executable(check_server_callbacks server/check_server_callbacks.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_server_callbacks ${LIBS})
-add_test_valgrind(server_callbacks ${TESTS_BINARY_DIR}/check_server_callbacks)
+ua_add_test(server/check_accesscontrol.c)
+ua_add_test(server/check_services_view.c)
+ua_add_test(server/check_services_attributes.c)
+ua_add_test(server/check_services_nodemanagement.c)
+ua_add_test(server/check_server_callbacks.c)
 
 if (UA_MULTITHREADING GREATER_EQUAL 100)
-    add_executable(check_mt_addVariableNode multithreading/check_mt_addVariableNode.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_mt_addVariableNode ${LIBS})
-    add_test_valgrind(mt_addVariableNode ${TESTS_BINARY_DIR}/check_mt_addVariableNode)
-
-    add_executable(check_mt_addVariableTypeNode multithreading/check_mt_addVariableTypeNode.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_mt_addVariableTypeNode ${LIBS})
-    add_test_valgrind(mt_addVariableTypeNode ${TESTS_BINARY_DIR}/check_mt_addVariableTypeNode)
-
-    add_executable(check_mt_addObjectNode multithreading/check_mt_addObjectNode.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_mt_addObjectNode ${LIBS})
-    add_test_valgrind(mt_addObjectNode ${TESTS_BINARY_DIR}/check_mt_addObjectNode)
-
-    add_executable(check_mt_readValueAttribute multithreading/check_mt_readValueAttribute.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_mt_readValueAttribute ${LIBS})
-    add_test_valgrind(mt_readValueAttribute ${TESTS_BINARY_DIR}/check_mt_readValueAttribute)
-
-    add_executable(check_mt_writeValueAttribute multithreading/check_mt_writeValueAttribute.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_mt_writeValueAttribute ${LIBS})
-    add_test_valgrind(mt_writeValueAttribute ${TESTS_BINARY_DIR}/check_mt_readWriteDelete)
-
-    add_executable(check_mt_readWriteDelete multithreading/check_mt_readWriteDelete.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_mt_readWriteDelete ${LIBS})
-    add_test_valgrind(mt_readWriteDelete ${TESTS_BINARY_DIR}/check_mt_readWriteDelete)
-
-    add_executable(check_mt_readWriteDeleteCallback multithreading/check_mt_readWriteDeleteCallback.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_mt_readWriteDeleteCallback ${LIBS})
-    add_test_valgrind(mt_readWriteDeleteCallback ${TESTS_BINARY_DIR}/check_mt_readWriteDeleteCallback)
-
-    add_executable(check_mt_addDeleteObject multithreading/check_mt_addDeleteObject.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_mt_addDeleteObject ${LIBS})
-    add_test_valgrind(mt_addDeleteObject ${TESTS_BINARY_DIR}/check_mt_addDeleteObject)
-
-    add_executable(check_server_asyncop server/check_server_asyncop.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_server_asyncop ${LIBS})
-    add_test_valgrind(server_asyncop ${TESTS_BINARY_DIR}/check_server_asyncop)
+    ua_add_test(multithreading/check_mt_addVariableNode.c)
+    ua_add_test(multithreading/check_mt_addVariableTypeNode.c)
+    ua_add_test(multithreading/check_mt_addObjectNode.c)
+    ua_add_test(multithreading/check_mt_readValueAttribute.c)
+    ua_add_test(multithreading/check_mt_writeValueAttribute.c)
+    ua_add_test(multithreading/check_mt_readWriteDelete.c)
+    ua_add_test(multithreading/check_mt_readWriteDeleteCallback.c)
+    ua_add_test(multithreading/check_mt_addDeleteObject.c)
+    ua_add_test(server/check_server_asyncop.c)
 endif()
 
 if(UA_ENABLE_METHODCALLS)
-  add_executable(check_services_call server/check_services_call.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-  target_link_libraries(check_services_call ${LIBS})
-  add_test_valgrind(services_call ${TESTS_BINARY_DIR}/check_services_call)
+  ua_add_test(server/check_services_call.c)
 endif()
 
 if(UA_ENABLE_SUBSCRIPTIONS)
-  add_executable(check_services_subscriptions server/check_services_subscriptions.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-  target_link_libraries(check_services_subscriptions ${LIBS})
-  add_test_valgrind(services_subscriptions ${TESTS_BINARY_DIR}/check_services_subscriptions)
-
-  add_executable(check_monitoreditem_filter server/check_monitoreditem_filter.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-  target_link_libraries(check_monitoreditem_filter ${LIBS})
-  add_test_valgrind(monitoreditem_filter ${TESTS_BINARY_DIR}/check_monitoreditem_filter)
-
-  add_executable(check_subscription_events server/check_subscription_events.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-  target_link_libraries(check_subscription_events ${LIBS})
-  add_test_valgrind(subscription_events ${TESTS_BINARY_DIR}/check_subscription_events)
-
-  add_executable(check_subscription_event_filter server/check_subscription_event_filter.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-  target_link_libraries(check_subscription_event_filter ${LIBS})
-  add_test_valgrind(check_subscription_event_filter ${TESTS_BINARY_DIR}/check_subscription_event_filter)
+  ua_add_test(server/check_services_subscriptions.c)
+  ua_add_test(server/check_monitoreditem_filter.c)
+  ua_add_test(server/check_subscription_events.c)
+  ua_add_test(server/check_subscription_event_filter.c)
 endif()
 
-add_executable(check_nodestore server/check_nodestore.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_nodestore ${LIBS})
-add_test_valgrind(nodestore ${TESTS_BINARY_DIR}/check_nodestore)
+ua_add_test(server/check_nodestore.c)
 
 if(UA_ENABLE_HISTORIZING)
-    add_executable(check_server_historical_data server/check_server_historical_data.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_server_historical_data ${LIBS})
-    add_test_valgrind(server_historical_data ${TESTS_BINARY_DIR}/check_server_historical_data)
-
-    add_executable(check_server_historical_data_circular server/check_server_historical_data_circular.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_server_historical_data_circular ${LIBS})
-    add_test_valgrind(server_historical_data_circular ${TESTS_BINARY_DIR}/check_server_historical_data_circular)
+    ua_add_test(server/check_server_historical_data.c)
+    ua_add_test(server/check_server_historical_data_circular.c)
 endif()
 
-add_executable(check_session server/check_session.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_session ${LIBS})
-add_test_valgrind(session ${TESTS_BINARY_DIR}/check_session)
-
-add_executable(check_server server/check_server.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_server ${LIBS})
-add_test_valgrind(server ${TESTS_BINARY_DIR}/check_server)
-
-add_executable(check_server_jobs server/check_server_jobs.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_server_jobs ${LIBS})
-add_test_valgrind(server_jobs ${TESTS_BINARY_DIR}/check_server_jobs)
-
-add_executable(check_server_userspace server/check_server_userspace.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_server_userspace ${LIBS})
-add_test_valgrind(server_userspace ${TESTS_BINARY_DIR}/check_server_userspace)
-
-add_executable(check_node_inheritance server/check_node_inheritance.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_node_inheritance ${LIBS})
-add_test_valgrind(node_inheritance ${TESTS_BINARY_DIR}/check_node_inheritance)
+ua_add_test(server/check_session.c)
+ua_add_test(server/check_server.c)
+ua_add_test(server/check_server_jobs.c)
+ua_add_test(server/check_server_userspace.c)
+ua_add_test(server/check_node_inheritance.c)
 
 if(UA_ENABLE_SUBSCRIPTIONS)
-  add_executable(check_local_monitored_item server/check_local_monitored_item.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-  target_link_libraries(check_local_monitored_item ${LIBS})
-  add_test_valgrind(local_monitored_item ${TESTS_BINARY_DIR}/check_local_monitored_item)
+  ua_add_test(server/check_local_monitored_item.c)
 endif()
 
 if(UA_ENABLE_DISCOVERY)
-    add_executable(check_discovery server/check_discovery.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_discovery ${LIBS})
-    add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery)
+    ua_add_test(server/check_discovery.c)
 endif()
 
 if(UA_ENABLE_PUBSUB)
-    add_executable(check_pubsub_encoding pubsub/check_pubsub_encoding.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_encoding ${LIBS})
-    add_test_valgrind(pubsub_encoding ${TESTS_BINARY_DIR}/check_pubsub_encoding)
-    add_executable(check_pubsub_pds pubsub/check_pubsub_pds.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_pds ${LIBS})
-    add_test_valgrind(pubsub_pds ${TESTS_BINARY_DIR}/check_pubsub_pds)
-    add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_connection_udp ${LIBS})
-    add_test_valgrind(pubsub_connection_udp ${TESTS_BINARY_DIR}/check_pubsub_connection_udp)
-    add_executable(check_pubsub_publish pubsub/check_pubsub_publish.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_publish ${LIBS})
-    add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish)
-    add_executable(check_pubsub_publish_uadp pubsub/check_pubsub_publish_uadp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_publish_uadp ${LIBS})
-    add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish_uadp)
-    add_executable(check_pubsub_get_state pubsub/check_pubsub_get_state.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_get_state ${LIBS})
-    add_test_valgrind(check_pubsub_get_state ${TESTS_BINARY_DIR}/check_pubsub_get_state)
+    ua_add_test(pubsub/check_pubsub_encoding.c)
+    ua_add_test(pubsub/check_pubsub_pds.c)
+    ua_add_test(pubsub/check_pubsub_connection_udp.c)
+    ua_add_test(pubsub/check_pubsub_publish.c)
+    ua_add_test(pubsub/check_pubsub_publish_uadp.c)
+    ua_add_test(pubsub/check_pubsub_get_state.c)
 
     #Link libraries for executing subscriber unit test
-    add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_subscribe ${LIBS})
-    add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_publishspeed ${LIBS})
-    add_test_valgrind(pubsub_publishspeed ${TESTS_BINARY_DIR}/check_pubsub_publish)
-    add_executable(check_pubsub_config_freeze pubsub/check_pubsub_config_freeze.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_config_freeze ${LIBS})
-    add_test_valgrind(check_pubsub_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_config_freeze)
-    add_executable(check_pubsub_publish_rt_levels pubsub/check_pubsub_publish_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_publish_rt_levels ${LIBS})
-    add_test_valgrind(check_pubsub_publish_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_publish_rt_levels)
-    add_executable(check_pubsub_subscribe_config_freeze pubsub/check_pubsub_subscribe_config_freeze.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_subscribe_config_freeze ${LIBS})
-    add_test_valgrind(check_pubsub_subscribe_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_subscribe_config_freeze)
-    add_executable(check_pubsub_subscribe_rt_levels pubsub/check_pubsub_subscribe_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_subscribe_rt_levels ${LIBS})
-    add_test_valgrind(check_pubsub_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_subscribe_rt_levels)
-    add_executable(check_pubsub_multiple_subscribe_rt_levels pubsub/check_pubsub_multiple_subscribe_rt_levels.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_multiple_subscribe_rt_levels ${LIBS})
-    add_test_valgrind(check_pubsub_multiple_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_multiple_subscribe_rt_levels)
-
-    add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_pubsub_multiple_layer ${LIBS})
-    add_test_valgrind(pubsub_multiple_layer ${TESTS_BINARY_DIR}/check_pubsub_multiple_layer)
+    ua_add_test(pubsub/check_pubsub_subscribe.c)
+    ua_add_test(pubsub/check_pubsub_publishspeed.c)
+    ua_add_test(pubsub/check_pubsub_config_freeze.c)
+    ua_add_test(pubsub/check_pubsub_publish_rt_levels.c)
+    ua_add_test(pubsub/check_pubsub_subscribe_config_freeze.c)
+    ua_add_test(pubsub/check_pubsub_subscribe_rt_levels.c)
+    ua_add_test(pubsub/check_pubsub_multiple_subscribe_rt_levels.c)
+    ua_add_test(pubsub/check_pubsub_multiple_layer.c)
 
     if(UA_ENABLE_PUBSUB_ENCRYPTION)
-        add_executable(check_pubsub_encryption pubsub/check_pubsub_encryption.c
-            $<TARGET_OBJECTS:open62541-object>
-            $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_encryption ${LIBS})
-        add_test_valgrind(check_pubsub_encryption ${TESTS_BINARY_DIR}/check_pubsub_encryption)
-
-        add_executable(check_pubsub_encryption_aes256 pubsub/check_pubsub_encryption_aes256.c
-            $<TARGET_OBJECTS:open62541-object>
-            $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_encryption_aes256 ${LIBS})
-        add_test_valgrind(check_pubsub_encryption_aes256 ${TESTS_BINARY_DIR}/check_pubsub_encryption_aes256)
-    
-        add_executable(check_pubsub_decryption pubsub/check_pubsub_decryption.c
-                $<TARGET_OBJECTS:open62541-object>
-                $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_decryption ${LIBS})
-        add_test_valgrind(check_pubsub_decryption ${TESTS_BINARY_DIR}/check_pubsub_decryption)
-
-        add_executable(check_pubsub_subscribe_encrypted pubsub/check_pubsub_subscribe_encrypted.c
-                $<TARGET_OBJECTS:open62541-object>
-                $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_subscribe_encrypted ${LIBS})
-        add_test_valgrind(check_pubsub_subscribe_encrypted ${TESTS_BINARY_DIR}/check_pubsub_subscribe_encrypted)
-
-        add_executable(check_pubsub_encrypted_rt_levels pubsub/check_pubsub_encrypted_rt_levels.c
-                $<TARGET_OBJECTS:open62541-object>
-                $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_encrypted_rt_levels ${LIBS})
-        add_test_valgrind(check_pubsub_encrypted_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_encrypted_rt_levels)
+        ua_add_test(pubsub/check_pubsub_encryption.c)
+        ua_add_test(pubsub/check_pubsub_encryption_aes256.c)
+        ua_add_test(pubsub/check_pubsub_decryption.c)
+        ua_add_test(pubsub/check_pubsub_subscribe_encrypted.c)
+        ua_add_test(pubsub/check_pubsub_encrypted_rt_levels.c)
     endif()
 
     if (UA_ENABLE_PUBSUB_MONITORING)
         if(NOT UA_ENABLE_PUBSUB_ENCRYPTION) #ToDO: Multiple Receive handling for PubsubEncryption
-            add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c 
-                    $<TARGET_OBJECTS:open62541-object>
-                    $<TARGET_OBJECTS:open62541-testplugins>)
-            target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS})
-            add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout)
+            ua_add_test(pubsub/check_pubsub_subscribe_msgrcvtimeout.c)
         endif()
     endif()
 
     if(UA_ENABLE_PUBSUB_ETH_UADP)
-        add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_connection_ethernet ${LIBS})
-        add_test_valgrind(pubsub_connection_ethernet ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet)
-        add_executable(check_pubsub_publish_ethernet pubsub/check_pubsub_publish_ethernet.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_publish_ethernet ${LIBS})
-        add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet)
-        add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_connection_ethernet_etf ${LIBS})
-        add_test_valgrind(pubsub_connection_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet_etf)
-        add_executable(check_pubsub_publish_ethernet_etf pubsub/check_pubsub_publish_ethernet_etf.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS})
-        add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf)
+        ua_add_test(pubsub/check_pubsub_connection_ethernet.c)
+        ua_add_test(pubsub/check_pubsub_publish_ethernet.c)
+        ua_add_test(pubsub/check_pubsub_connection_ethernet_etf.c)
+        ua_add_test(pubsub/check_pubsub_publish_ethernet_etf.c)
         if(LIB_BPF)
-            add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-            target_link_libraries(check_pubsub_connection_xdp ${LIBS})
-            add_test_valgrind(pubsub_connection_xdp ${TESTS_BINARY_DIR}/check_pubsub_connection_xdp)
+            ua_add_test(pubsub/check_pubsub_connection_xdp.c)
         endif()
     endif()
 
     if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
-        add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_informationmodel ${LIBS})
-        add_test_valgrind(check_pubsub_informationmodel ${TESTS_BINARY_DIR}/check_pubsub_informationmodel)
+        ua_add_test(pubsub/check_pubsub_informationmodel.c)
         if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
-            add_executable(check_pubsub_informationmodel_methods pubsub/check_pubsub_informationmodel_methods.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-            target_link_libraries(check_pubsub_informationmodel_methods ${LIBS})
-            add_test_valgrind(check_pubsub_informationmodel_methods ${TESTS_BINARY_DIR}/check_pubsub_informationmodel_methods)
+            ua_add_test(pubsub/check_pubsub_informationmodel_methods.c)
 
         endif()
     endif()
     if(UA_ENABLE_PUBSUB_MQTT)
         if(NOT WIN32)
-            add_executable(check_pubsub_connection_mqtt pubsub/check_pubsub_connection_mqtt.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-            target_link_libraries(check_pubsub_connection_mqtt ${LIBS})
-            add_test_valgrind(pubsub_connection_mqtt ${TESTS_BINARY_DIR}/check_pubsub_connection_mqtt)
+            ua_add_test(pubsub/check_pubsub_connection_mqtt.c)
         endif()
     endif()
     if(UA_ENABLE_PUBSUB_FILE_CONFIG)
-        add_executable(check_pubsub_configuration pubsub/check_pubsub_configuration.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-        target_link_libraries(check_pubsub_configuration ${LIBS})
-        add_test_valgrind(pubsub_configuration ${TESTS_BINARY_DIR}/check_pubsub_configuration)
+        ua_add_test(pubsub/check_pubsub_configuration.c)
     endif()
 endif()
 
-add_executable(check_server_readspeed server/check_server_readspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_server_readspeed ${LIBS})
-add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed)
-
-add_executable(check_server_speed_addnodes server/check_server_speed_addnodes.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_server_speed_addnodes ${LIBS})
-add_test_no_valgrind(server_speed_addnodes ${TESTS_BINARY_DIR}/check_server_speed_addnodes)
+ua_add_test(server/check_server_readspeed.c)
+ua_add_test(server/check_server_speed_addnodes.c)
 
 if(UA_ENABLE_SUBSCRIPTIONS)
-    add_executable(check_server_monitoringspeed server/check_server_monitoringspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_server_monitoringspeed ${LIBS})
-    add_test_no_valgrind(server_monitoringspeed ${TESTS_BINARY_DIR}/check_server_monitoringspeed)
+    ua_add_test(server/check_server_monitoringspeed.c)
 endif()
 
 if(UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS)
-    add_executable(check_server_alarmsconditions server/check_server_alarmsconditions.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_server_alarmsconditions ${LIBS})
-    add_test_no_valgrind(check_server_alarmsconditions ${TESTS_BINARY_DIR}/check_server_alarmsconditions)
+    ua_add_test(server/check_server_alarmsconditions.c)
 endif()
 
 if(UA_ENABLE_ASYNCOPERATIONS)
-    add_executable(check_server_asyncop server/check_server_asyncop.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_server_asyncop ${LIBS})
-    add_test_valgrind(server_asyncop ${TESTS_BINARY_DIR}/check_server_asyncop)
+    ua_add_test(server/check_server_asyncop.c)
 endif()
 
 # Test Client
 
-add_executable(check_client client/check_client.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_client ${LIBS})
-add_test_valgrind(client ${TESTS_BINARY_DIR}/check_client)
-
-add_executable(check_client_securechannel client/check_client_securechannel.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_client_securechannel ${LIBS})
-add_test_valgrind(client_securechannel ${TESTS_BINARY_DIR}/check_client_securechannel)
-
-add_executable(check_client_async client/check_client_async.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_client_async ${LIBS})
-add_test_valgrind(client_async ${TESTS_BINARY_DIR}/check_client_async)
-
-add_executable(check_client_async_connect client/check_client_async_connect.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_client_async_connect ${LIBS})
-add_test_valgrind(client_async_connect ${TESTS_BINARY_DIR}/check_client_async_connect)
+ua_add_test(client/check_client.c)
+ua_add_test(client/check_client_securechannel.c)
+ua_add_test(client/check_client_async.c)
+ua_add_test(client/check_client_async_connect.c)
 
 if(UA_ENABLE_SUBSCRIPTIONS)
-  add_executable(check_client_subscriptions client/check_client_subscriptions.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-  target_link_libraries(check_client_subscriptions ${LIBS})
-  add_test_valgrind(client_subscriptions ${TESTS_BINARY_DIR}/check_client_subscriptions)
+  ua_add_test(client/check_client_subscriptions.c)
 endif()
 
-add_executable(check_client_highlevel client/check_client_highlevel.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-target_link_libraries(check_client_highlevel ${LIBS})
-add_test_valgrind(client_highlevel ${TESTS_BINARY_DIR}/check_client_highlevel)
+ua_add_test(client/check_client_highlevel.c)
 
 if(UA_ENABLE_HISTORIZING)
-    add_executable(check_client_historical_data client/check_client_historical_data.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_client_historical_data ${LIBS})
-    add_test_valgrind(client_historical_data ${TESTS_BINARY_DIR}/check_client_historical_data)
+    ua_add_test(client/check_client_historical_data.c)
 endif()
 
 # Test Encryption
@@ -614,43 +403,18 @@ if(UA_ENABLE_ENCRYPTION)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS)
-    add_executable(check_encryption_basic128rsa15 encryption/check_encryption_basic128rsa15.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_encryption_basic128rsa15 ${LIBS})
-    add_test_valgrind(encryption_basic128rsa15 ${TESTS_BINARY_DIR}/check_encryption_basic128rsa15)
-
-    add_executable(check_encryption_basic256 encryption/check_encryption_basic256.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_encryption_basic256 ${LIBS})
-    add_test_valgrind(encryption_basic256 ${TESTS_BINARY_DIR}/check_encryption_basic256)
-
-    add_executable(check_encryption_basic256sha256 encryption/check_encryption_basic256sha256.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_encryption_basic256sha256 ${LIBS})
-    add_test_valgrind(encryption_basic256sha256 ${TESTS_BINARY_DIR}/check_encryption_basic256sha256)
-
-    add_executable(check_encryption_aes128sha256rsaoaep encryption/check_encryption_aes128sha256rsaoaep.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_encryption_aes128sha256rsaoaep ${LIBS})
-    add_test_valgrind(encryption_aes128sha256rsaoaep ${TESTS_BINARY_DIR}/check_encryption_aes128sha256rsaoaep)
+    ua_add_test(encryption/check_encryption_basic128rsa15.c)
+    ua_add_test(encryption/check_encryption_basic256.c)
+    ua_add_test(encryption/check_encryption_basic256sha256.c)
+    ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
-    add_executable(check_encryption_basic128rsa15 encryption/check_encryption_basic128rsa15.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_encryption_basic128rsa15 ${LIBS})
-    add_test_valgrind(encryption_basic128rsa15 ${TESTS_BINARY_DIR}/check_encryption_basic128rsa15)
-
-    add_executable(check_encryption_basic256 encryption/check_encryption_basic256.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_encryption_basic256 ${LIBS})
-    add_test_valgrind(encryption_basic256 ${TESTS_BINARY_DIR}/check_encryption_basic256)
-
-    add_executable(check_encryption_basic256sha256 encryption/check_encryption_basic256sha256.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_encryption_basic256sha256 ${LIBS})
-    add_test_valgrind(encryption_basic256sha256 ${TESTS_BINARY_DIR}/check_encryption_basic256sha256)
-
-    add_executable(check_encryption_aes128sha256rsaoaep encryption/check_encryption_aes128sha256rsaoaep.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_encryption_aes128sha256rsaoaep ${LIBS})
-    add_test_valgrind(encryption_aes128sha256rsaoaep ${TESTS_BINARY_DIR}/check_encryption_aes128sha256rsaoaep)
-
-    add_executable(check_cert_generation encryption/check_cert_generation.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_cert_generation ${LIBS})
-    add_test_valgrind(check_cert_generation ${TESTS_BINARY_DIR}/check_cert_generation)
+    ua_add_test(encryption/check_encryption_basic128rsa15.c)
+    ua_add_test(encryption/check_encryption_basic256.c)
+    ua_add_test(encryption/check_encryption_basic256sha256.c)
+    ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
+    ua_add_test(encryption/check_cert_generation.c)
 endif()
 
 # Tests for Nodeset Compiler

From ffcc768142c79e1ad65ee377c984c2f6891688b4 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Fri, 6 May 2022 18:20:24 +0200
Subject: [PATCH 0140/1963] test(pubsub): fix missing set of name + memleak

---
 tests/pubsub/check_pubsub_subscribe.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index ba9a7e288c0..9cbc5d844e2 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -443,6 +443,7 @@ START_TEST(UpdateDataSetReaderConfigWithInvalidId) {
                                             &readerGroupConfig, &localreaderGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         memset(&dataSetreaderConfig, 0, sizeof(dataSetreaderConfig));
+        dataSetreaderConfig.name       = UA_STRING("DataSet Reader 1");
         retVal |= UA_Server_addDataSetReader(server, localreaderGroup,
                                              &dataSetreaderConfig, &localDataSetreader);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -463,10 +464,12 @@ START_TEST(GetDataSetReaderConfigWithValidConfiguration) {
         retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &localreaderGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         memset(&dataSetreaderConfig, 0, sizeof(dataSetreaderConfig));
+        dataSetreaderConfig.name       = UA_STRING("DataSet Reader 1");
         retVal |= UA_Server_addDataSetReader(server, localreaderGroup, &dataSetreaderConfig, &localDataSetreader);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal |= UA_Server_DataSetReader_getConfig(server, localDataSetreader, &dataSetreaderConfig);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_String_clear(&dataSetreaderConfig.name);
 } END_TEST
 
 START_TEST(GetDataSetReaderConfigWithInvalidConfiguration) {
@@ -481,6 +484,7 @@ START_TEST(GetDataSetReaderConfigWithInvalidConfiguration) {
         retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &localreaderGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         memset(&dataSetreaderConfig, 0, sizeof(dataSetreaderConfig));
+        dataSetreaderConfig.name       = UA_STRING("DataSet Reader 1");
         retVal |= UA_Server_addDataSetReader(server, localreaderGroup, &dataSetreaderConfig, &localDataSetreader);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal |= UA_Server_DataSetReader_getConfig(server, localDataSetreader, NULL);
@@ -499,6 +503,7 @@ START_TEST(GetDataSetReaderConfigWithInvalidIdentifier) {
         retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &localreaderGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         memset(&dataSetreaderConfig, 0, sizeof(dataSetreaderConfig));
+        dataSetreaderConfig.name       = UA_STRING("DataSet Reader 1");
         retVal |= UA_Server_addDataSetReader(server, localreaderGroup, &dataSetreaderConfig, &localDataSetreader);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal |= UA_Server_DataSetReader_getConfig(server, UA_NODEID_NUMERIC(0, UA_UINT32_MAX), &dataSetreaderConfig);
@@ -574,6 +579,7 @@ START_TEST(CreateTargetVariableWithInvalidConfiguration) {
         retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &localreaderGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         memset(&dataSetreaderConfig, 0, sizeof(dataSetreaderConfig));
+        dataSetreaderConfig.name       = UA_STRING("DataSet Reader 1");
         retVal |= UA_Server_addDataSetReader(server, localreaderGroup, &dataSetreaderConfig, &localDataSetreader);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal |= UA_Server_DataSetReader_createTargetVariables(server,

From 292bdec304b504f8cdf43f09e425481ab6ab55fa Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Mon, 9 May 2022 13:06:14 +0200
Subject: [PATCH 0141/1963] test(pubsub): fix publishspeed segfault

---
 tests/pubsub/check_pubsub_publishspeed.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publishspeed.c b/tests/pubsub/check_pubsub_publishspeed.c
index 144e023f7b5..ead5a3077ef 100644
--- a/tests/pubsub/check_pubsub_publishspeed.c
+++ b/tests/pubsub/check_pubsub_publishspeed.c
@@ -16,8 +16,7 @@
 #include <time.h>
 
 UA_Server *server = NULL;
-UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
-        publishedDataSet1, publishedDataSet2, dataSetWriter1, dataSetWriter2, dataSetWriter3;
+UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
 
 static void setup(void) {
     server = UA_Server_new();
@@ -67,7 +66,7 @@ START_TEST(PublishSpeedTest) {
     dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
     dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
     dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
     dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
     UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
 

From 2c12d1b325a8d705a9c7f4d0d961750bfda59657 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 5 May 2022 17:53:58 +0200
Subject: [PATCH 0142/1963] refactor(pubsub): cleanup add-connection call

---
 src/pubsub/ua_pubsub_manager.c | 151 +++++++++++++++++++++++----------
 1 file changed, 104 insertions(+), 47 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index f428a7d264d..fcd1392d381 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -16,76 +16,106 @@
 
 #define UA_DATETIMESTAMP_2000 125911584000000000
 
-UA_StatusCode
-UA_Server_addPubSubConnection(UA_Server *server,
-                              const UA_PubSubConnectionConfig *connectionConfig,
-                              UA_NodeId *connectionIdentifier) {
+static UA_PubSubTransportLayer *
+getTransportProtocolLayer(const UA_Server *server,
+                          const UA_String *transportProfileUri) {
     /* Find the matching UA_PubSubTransportLayers */
     UA_PubSubTransportLayer *tl = NULL;
     for(size_t i = 0; i < server->config.pubSubConfig.transportLayersSize; i++) {
-        if(connectionConfig &&
-           UA_String_equal(&server->config.pubSubConfig.transportLayers[i].transportProfileUri,
-                           &connectionConfig->transportProfileUri)) {
+        if(UA_String_equal(&server->config.pubSubConfig.transportLayers[i].transportProfileUri,
+                           transportProfileUri)) {
             tl = &server->config.pubSubConfig.transportLayers[i];
         }
     }
     if(!tl) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "PubSub Connection creation failed. Requested transport layer not found.");
-        return UA_STATUSCODE_BADNOTFOUND;
+        return NULL;
     }
+    return tl;
+}
 
+static void
+UA_PubSubConfig_delete(UA_PubSubConnectionConfig *tmpConnectionConfig) {
+    UA_PubSubConnectionConfig_clear(tmpConnectionConfig);
+    UA_free(tmpConnectionConfig);
+}
+
+static UA_StatusCode
+copyConnectionConfig(const UA_PubSubConnectionConfig *srcConfig, UA_PubSubConnectionConfig **dstConfig, UA_Logger *logger) {
     /* Create a copy of the connection config */
-    UA_PubSubConnectionConfig *tmpConnectionConfig = (UA_PubSubConnectionConfig *)
-        UA_calloc(1, sizeof(UA_PubSubConnectionConfig));
-    if(!tmpConnectionConfig){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of Memory.");
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
+    *dstConfig = (UA_PubSubConnectionConfig *) UA_calloc(1, sizeof(UA_PubSubConnectionConfig));
+    UA_CHECK_MEM_ERROR(dstConfig, return UA_STATUSCODE_BADOUTOFMEMORY,
+                       logger, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection creation failed. Out of Memory.");
 
-    UA_StatusCode retval = UA_PubSubConnectionConfig_copy(connectionConfig, tmpConnectionConfig);
-    if(retval != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Could not copy the config.");
-        return retval;
+    UA_StatusCode retval = UA_PubSubConnectionConfig_copy(srcConfig, *dstConfig);
+    UA_CHECK_STATUS_ERROR(retval, goto copy_error, logger, UA_LOGCATEGORY_SERVER,
+                          "PubSub Connection creation failed. Could not copy the config.");
+
+    return UA_STATUSCODE_GOOD;
+copy_error:
+    UA_free(*dstConfig);
+    return retval;
+}
+
+static void
+UA_PubSubManager_addConnection(UA_PubSubManager *pubSubManager, UA_PubSubConnection *connection) {
+    if (pubSubManager->connectionsSize != 0) {
+        TAILQ_INSERT_TAIL(&pubSubManager->connections, connection, listEntry);
+    } else {
+        TAILQ_INIT(&pubSubManager->connections);
+        TAILQ_INSERT_HEAD(&pubSubManager->connections, connection, listEntry);
     }
+    pubSubManager->connectionsSize++;
+}
 
-    /* Create new connection and add to UA_PubSubManager */
+static UA_PubSubConnection *
+UA_PubSubConnection_new(UA_PubSubConnectionConfig *connectionConfig,
+                        UA_Logger *logger) {/* Create new connection and add to UA_PubSubManager */
     UA_PubSubConnection *newConnectionsField = (UA_PubSubConnection *)
         UA_calloc(1, sizeof(UA_PubSubConnection));
     if(!newConnectionsField) {
-        UA_PubSubConnectionConfig_clear(tmpConnectionConfig);
-        UA_free(tmpConnectionConfig);
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
                      "PubSub Connection creation failed. Out of Memory.");
-        return UA_STATUSCODE_BADOUTOFMEMORY;
+        return NULL;
     }
     newConnectionsField->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
-    if (server->pubSubManager.connectionsSize != 0)
-        TAILQ_INSERT_TAIL(&server->pubSubManager.connections, newConnectionsField, listEntry);
-    else {
-        TAILQ_INIT(&server->pubSubManager.connections);
-        TAILQ_INSERT_HEAD(&server->pubSubManager.connections, newConnectionsField, listEntry);
-    }
+    LIST_INIT(&newConnectionsField->writerGroups);
+    newConnectionsField->config = connectionConfig;
+    return newConnectionsField;
+}
+
+static UA_StatusCode
+channelErrorHandling(UA_Server *server, UA_PubSubConnection *newConnectionsField) {
+    UA_PubSubConnection_clear(server, newConnectionsField);
+    TAILQ_REMOVE(&server->pubSubManager.connections, newConnectionsField, listEntry);
+    server->pubSubManager.connectionsSize--;
+    UA_free(newConnectionsField);
+    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                 "PubSub Connection creation failed. Transport layer creation problem.");
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
 
-    server->pubSubManager.connectionsSize++;
+static UA_StatusCode
+createAndAddConnection(UA_Server *server, const UA_PubSubConnectionConfig *connectionConfig,
+                       UA_PubSubConnection **connection) {
+    /* Create a copy of the connection config */
+    UA_PubSubConnectionConfig *tmpConnectionConfig = NULL;
+    UA_StatusCode retval = copyConnectionConfig(connectionConfig, &tmpConnectionConfig, &server->config.logger);
+    UA_CHECK_STATUS(retval, return retval);
 
-    LIST_INIT(&newConnectionsField->writerGroups);
-    newConnectionsField->config = tmpConnectionConfig;
+    *connection = UA_PubSubConnection_new(tmpConnectionConfig, &server->config.logger);
+    UA_CHECK_MEM(*connection, UA_PubSubConfig_delete(tmpConnectionConfig); return UA_STATUSCODE_BADOUTOFMEMORY;);
 
-    /* Open the channel */
-    newConnectionsField->channel = tl->createPubSubChannel(newConnectionsField->config);
-    if(!newConnectionsField->channel) {
-        UA_PubSubConnection_clear(server, newConnectionsField);
-        TAILQ_REMOVE(&server->pubSubManager.connections, newConnectionsField, listEntry);
-        server->pubSubManager.connectionsSize--;
-        UA_free(newConnectionsField);
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Transport layer creation problem.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
+    UA_PubSubManager *pubSubManager = &server->pubSubManager;
+    UA_PubSubManager_addConnection(pubSubManager, *connection);
+    return UA_STATUSCODE_GOOD;
+}
 
+static void
+assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnectionsField,
+                           UA_NodeId *connectionIdentifier) {
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     /* Internally createa a unique id */
     addPubSubConnectionRepresentation(server, newConnectionsField);
@@ -94,9 +124,36 @@ UA_Server_addPubSubConnection(UA_Server *server,
     UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
                                           &newConnectionsField->identifier);
 #endif
-
-    if(connectionIdentifier)
+    if(connectionIdentifier) {
         UA_NodeId_copy(&newConnectionsField->identifier, connectionIdentifier);
+    }
+}
+
+UA_StatusCode
+UA_Server_addPubSubConnection(UA_Server *server,
+                              const UA_PubSubConnectionConfig *connectionConfig,
+                              UA_NodeId *connectionIdentifier) {
+
+    /* validate preconditions */
+    UA_CHECK_MEM(server, return UA_STATUSCODE_BADINTERNALERROR);
+    UA_CHECK_MEM_ERROR(connectionConfig, return UA_STATUSCODE_BADINTERNALERROR, &server->config.logger,
+                       UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. No connection configuration supplied.");
+
+    /* Retrieve the transport layer for the given profile uri */
+    UA_PubSubTransportLayer *tl = getTransportProtocolLayer(server, &connectionConfig->transportProfileUri);
+    UA_CHECK_MEM_ERROR(tl, return UA_STATUSCODE_BADNOTFOUND, &server->config.logger,
+                       UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. Requested transport layer not found.");
+
+    /* create and add new connection from connection config */
+    UA_PubSubConnection *newConnectionsField = NULL;
+    UA_StatusCode retval = createAndAddConnection(server, connectionConfig, &newConnectionsField);
+    UA_CHECK_STATUS(retval, return retval);
+
+    /* Open the communication channel */
+    newConnectionsField->channel = tl->createPubSubChannel(newConnectionsField->config);
+    UA_CHECK_MEM(newConnectionsField->channel, return channelErrorHandling(server, newConnectionsField));
+
+    assignConnectionIdentifier(server, newConnectionsField, connectionIdentifier);
 
     return UA_STATUSCODE_GOOD;
 }

From 16111b6737e7909aa5ff7675be374b073c68ca9f Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Fri, 6 May 2022 12:52:30 +0200
Subject: [PATCH 0143/1963] docs(pubsub): document add-connection method

---
 include/open62541/server_pubsub.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 716ed53d71d..6bd5056221f 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -227,7 +227,15 @@ struct UA_PubSubConfiguration {
 UA_StatusCode UA_EXPORT
 UA_ServerConfig_addPubSubTransportLayer(UA_ServerConfig *config,
                                         UA_PubSubTransportLayer pubsubTransportLayer);
-
+/**
+ * Add a new PubSub connection to the given server and open it.
+ * @param[in] server the server to add the connection to
+ * @param[in] connectionConfig the configuration for the newly added connection
+ * @param[out] connectionIdentifier if not NULL will be set to the identifier of the
+ *                                  newly added connection
+ * @return UA_STATUSCODE_GOOD if connection was successfully added, otherwise an
+ *         error code.
+ */
 UA_StatusCode UA_EXPORT
 UA_Server_addPubSubConnection(UA_Server *server,
                               const UA_PubSubConnectionConfig *connectionConfig,

From 17949178e1fba9576fd71d0692df0528d87cdd1d Mon Sep 17 00:00:00 2001
From: MartinaFelberFEM <50486106+MartinaFelberFEM@users.noreply.github.com>
Date: Tue, 10 May 2022 22:26:12 +0200
Subject: [PATCH 0144/1963] docs(pubsub) add a warning for PubSub monitoring +
 bufmalloc + fast-path build

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4434f89928..c145a20fd09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -416,6 +416,11 @@ if(UA_ENABLE_PUBSUB_BUFMALLOC)
     if(NOT UA_ENABLE_MALLOC_SINGLETON)
         message(FATAL_ERROR "PubSub buffer allocation cannot be used without 'UA_ENABLE_MALLOC_SINGLETON' enabled")
     endif()
+    if(UA_ENABLE_PUBSUB_MONITORING)
+        message(WARNING "PubSub monitoring option 'UA_ENABLE_PUBSUB_MONITORING' can only be used with option 'UA_ENABLE_PUBSUB_BUFMALLOC' if "
+            "a custom monitoring interface is provided, which does not allocate/deallocate memory at start/stopMonitoring callback. "
+            "It can't be used with the built-in ua_timer implementation, because this leads to memory deallocation problems.")
+    endif()
 endif()
 
 option(UA_ENABLE_PUBSUB_MQTT "Enable publish/subscribe with mqtt (experimental)" OFF)

From fd855e8b193cc588716c5ab2f9bc5da060e8f017 Mon Sep 17 00:00:00 2001
From: JanSurft <jan@hermes-technology.de>
Date: Wed, 11 May 2022 08:56:15 +0200
Subject: [PATCH 0145/1963] test(el): improve testing structure

* test(el): improve testing structure

* refactor(el): cleanup and encapsulate
---
 arch/eventloop_posix_udp.c  | 149 +++++++++++++++++++----------
 tests/check_eventloop_udp.c | 186 ++++++++++++++++++++++++++++++------
 2 files changed, 254 insertions(+), 81 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index bf0e559a10b..39a02868e21 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -9,6 +9,8 @@
 #include "eventloop_posix.h"
 
 #define UA_MAXBACKLOG 100
+#define UA_MAXHOSTNAME_LENGTH 256
+#define UA_MAXPORTSTR_LENGTH 6
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
@@ -236,7 +238,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get logging information */
-    char hoststr[256];
+    char hoststr[UA_MAXHOSTNAME_LENGTH];
     int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
                                  hoststr, sizeof(hoststr),
                                  NULL, 0, NI_NUMERICHOST);
@@ -445,6 +447,83 @@ UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     return UA_STATUSCODE_GOOD;
 }
 
+/**
+ * Retrieves hostname and port from given key value parameters.
+ * @param[in] paramsSize the size of the parameter list
+ * @param[in] params the parameter list to retrieve from
+ * @param[out] hostname the retrieved hostname when present, NULL otherwise
+ * @param[out] portStr the retrieved port when present, NULL otherwise
+ * @param[in] logger the logger to log information
+ * @return -1 upon error, 0 if there was no host or port parameter, 1 if
+ *         host and port are present
+ */
+static int
+getHostAndPortFromParams(size_t paramsSize, const UA_KeyValuePair *params,
+                         char *hostname, char *portStr, const UA_Logger *logger) {
+    /* Prepare the port parameter as a string */
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(!port) {
+        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| No port found");
+        return 0;
+    }
+    UA_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
+
+    /* Prepare the hostname string */
+    const UA_String *host = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "hostname"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!host) {
+        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| No hostname found");
+        return 0;
+    }
+    if(host->length >= UA_MAXHOSTNAME_LENGTH) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| Open UDP Connection: Hostname too long, aborting");
+        return -1;
+    }
+    strncpy(hostname, (const char*)host->data, host->length);
+    hostname[host->length] = 0;
+    return 1;
+}
+
+static int
+getConnectionInfoFromParams(size_t paramsSize, const UA_KeyValuePair *params, char *hostname, char *portStr,
+                            struct addrinfo **info, const UA_Logger *logger) {
+
+    int foundParams = getHostAndPortFromParams(paramsSize, params, hostname, portStr, logger);
+    if (foundParams < 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| Failed retrieving host and port parameters");
+        return -1;
+    }
+    if(foundParams == 0) {
+        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| Hostname or Port not present");
+        return 0;
+    }
+    /* Create the socket description from the connectString
+    * TODO: Make this non-blocking */
+    struct addrinfo hints;
+    memset(&hints, 0, sizeof(struct addrinfo));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_DGRAM;
+    int error = getaddrinfo(hostname, portStr, &hints, info);
+    if(error != 0) {
+        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                           "UDP\t| Lookup of %s failed with error %d - %s",
+                           hostname, error, errno_str));
+        return -1;
+    }
+    return 1;
+}
+
 static UA_StatusCode
 UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                        size_t paramsSize, const UA_KeyValuePair *params,
@@ -510,6 +589,7 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     return UA_STATUSCODE_GOOD;
 }
 
+
 static UA_StatusCode
 UDP_openSendConnection(UA_ConnectionManager *cm,
                        size_t paramsSize, const UA_KeyValuePair *params,
@@ -518,57 +598,18 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get the connection parameters */
-    char hostname[256];
-    char portStr[16];
-
-    /* Prepare the port parameter as a string */
-    const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "port"),
-                                 &UA_TYPES[UA_TYPES_UINT16]);
-    if(!port) {
+    char hostname[UA_MAXHOSTNAME_LENGTH];
+    char portStr[UA_MAXPORTSTR_LENGTH];
+    struct addrinfo *info = NULL;
+    int error = getConnectionInfoFromParams(paramsSize, params, hostname, portStr, &info, el->eventLoop.logger);
+    if(error <= 0) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Open UDP Connection: No port defined, aborting");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    UA_snprintf(portStr, 6, "%d", *port);
-
-    /* Prepare the hostname string */
-    const UA_String *host = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "hostname"),
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(!host) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Open UDP Connection: No hostname defined, aborting");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    if(host->length >= 256) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| Open UDP Connection: Hostname too long, aborting");
+                     "UDP\t| Opening a connection failed");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    strncpy(hostname, (const char*)host->data, host->length);
-    hostname[host->length] = 0;
-
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
 
-    /* Create the socket description from the connectString
-     * TODO: Make this non-blocking */
-    struct addrinfo hints, *info;
-    memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_DGRAM;
-    int error = getaddrinfo(hostname, portStr, &hints, &info);
-    if(error != 0) {
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP\t| Lookup of %s failed with error %d - %s",
-                       hostname, error, errno_str));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
     /* Create a socket */
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     if(newSock == UA_INVALID_FD) {
@@ -580,7 +621,12 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
         return UA_STATUSCODE_BADDISCONNECT;
     }
 
-    /* Set the socket options */
+    /* Set the socket options
+     * also there might be external requirements for socket options
+     * how to handle and set those
+     * either via: passed in parameters
+     * or via: specific callback that gives access to the allocated socket
+     * */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     res |= UDP_setNonBlocking(newSock);
     res |= UDP_setNoSigPipe(newSock);
@@ -685,10 +731,10 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
                      "UDP\t| The hostnames have to be an array of string");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    
+
     size_t interfaces = hostNames->arrayLength;
     if(interfaces == 0) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| Listening on all interfaces");
         return UDP_registerListenSockets(cm, NULL, *port, application,
                                          context, connectionCallback);
@@ -719,12 +765,13 @@ UDP_openConnection(UA_ConnectionManager *cm,
      * connections. */
     const UA_Variant *val = UA_KeyValueMap_get(params, paramsSize,
                                                UA_QUALIFIEDNAME(0, "port"));
-    if(val)
+    if(val) {
         return UDP_openSendConnection(cm, paramsSize, params,
                                       application, context, connectionCallback);
-    else
+    } else {
         return UDP_openReceiveConnection(cm, paramsSize, params,
                                          application, context, connectionCallback);
+    }
 }
 
 /* Asynchronously register the listenSocket */
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index 3f08a97b797..78eda42baa2 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -12,17 +12,21 @@
 #include <check.h>
 
 static UA_EventLoop *el;
-static unsigned connCount;
 static char *testMsg = "open62541";
 static uintptr_t clientId;
 static UA_Boolean received;
 
+typedef struct TestContext {
+    unsigned connCount;
+} TestContext;
+
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void *application, void **connectionContext,
                    UA_StatusCode status,
                    size_t paramsSize, const UA_KeyValuePair *params,
                    UA_ByteString msg) {
+    TestContext *ctx = (TestContext*) *connectionContext;
     if(status != UA_STATUSCODE_GOOD) {
         UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                      "Closing connection %u", (unsigned)connectionId);
@@ -37,7 +41,7 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 
     if(msg.length == 0 && status == UA_STATUSCODE_GOOD) {
-        connCount++;
+        ctx->connCount++;
         clientId = connectionId;
 
         /* The remote-hostname is set during the first callback */
@@ -50,7 +54,7 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         }
     }
     if(status != UA_STATUSCODE_GOOD) {
-        connCount--;
+        ctx->connCount--;
     }
 
     if(msg.length > 0) {
@@ -80,6 +84,8 @@ START_TEST(listenUDP) {
     el->registerEventSource(el, &cm->eventSource);
     el->start(el);
 
+    TestContext testContext = {0};
+
     UA_UInt16 port = 4840;
     UA_Variant portVar;
     UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
@@ -88,9 +94,9 @@ START_TEST(listenUDP) {
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
 
-    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+    cm->openConnection(cm, 1, params, NULL, &testContext, connectionCallback);
 
-    ck_assert(connCount > 0);
+    ck_assert(testContext.connCount > 0);
 
     for(size_t i = 0; i < 10; i++) {
         UA_DateTime next = el->run(el, 1);
@@ -110,7 +116,7 @@ START_TEST(listenUDP) {
     el->free(el);
     el = NULL;
 
-    ck_assert_uint_eq(connCount, 0);
+    ck_assert_uint_eq(testContext.connCount, 0);
 } END_TEST
 
 START_TEST(runEventloopFailsIfCalledFromCallback) {
@@ -119,7 +125,8 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     el->registerEventSource(el, &cm->eventSource);
     el->start(el);
 
-    connCount = 0;
+    TestContext testContext;
+    testContext.connCount = 0;
 
     UA_UInt16 port = 4840;
     UA_Variant portVar;
@@ -129,9 +136,9 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
 
-    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+    cm->openConnection(cm, 1, params, NULL, &testContext, connectionCallback);
 
-    size_t listenSockets = connCount;
+    size_t listenSockets = testContext.connCount;
 
     /* Open a client connection */
     clientId = 0;
@@ -142,7 +149,7 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    UA_StatusCode retval = cm->openConnection(cm, 2, params, NULL, (void*)0x01,
+    UA_StatusCode retval = cm->openConnection(cm, 2, params, NULL, &testContext,
                                               reenterConnectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 10; i++) {
@@ -150,7 +157,7 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(clientId != 0);
-    ck_assert_uint_eq(connCount, listenSockets + 1);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
 
     /* Send a message from the client */
     received = false;
@@ -169,12 +176,12 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     /* Close the connection */
     retval = cm->closeConnection(cm, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(connCount, listenSockets + 1);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
-    ck_assert_uint_eq(connCount, listenSockets);
+    ck_assert_uint_eq(testContext.connCount, listenSockets);
 
     /* Stop the EventLoop */
     el->stop(el);
@@ -189,7 +196,7 @@ START_TEST(runEventloopFailsIfCalledFromCallback) {
     el->free(el);
     el = NULL;
 
-    ck_assert_uint_eq(connCount, 0);
+    ck_assert_uint_eq(testContext.connCount, 0);
 } END_TEST
 
 START_TEST(connectUDP) {
@@ -206,13 +213,14 @@ START_TEST(connectUDP) {
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
 
-    connCount = 0;
+    TestContext testContext;
+    testContext.connCount = 0;
 
     UA_StatusCode retval =
-        cm->openConnection(cm, 1, params, NULL, (void*)0x01, connectionCallback);
+        cm->openConnection(cm, 1, params, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    size_t listenSockets = connCount;
+    size_t listenSockets = testContext.connCount;
 
     /* Open a client connection */
     clientId = 0;
@@ -222,14 +230,14 @@ START_TEST(connectUDP) {
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    retval = cm->openConnection(cm, 2, params, NULL, (void*)0x01, connectionCallback);
+    retval = cm->openConnection(cm, 2, params, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(clientId != 0);
-    ck_assert_uint_eq(connCount, listenSockets + 1);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
 
     /* Send a message from the client */
     received = false;
@@ -248,12 +256,12 @@ START_TEST(connectUDP) {
     /* Close the connection */
     retval = cm->closeConnection(cm, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(connCount, listenSockets + 1);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
-    ck_assert_uint_eq(connCount, listenSockets);
+    ck_assert_uint_eq(testContext.connCount, listenSockets);
 
     /* Stop the EventLoop */
     int max_stop_iteration_count = 10;
@@ -289,15 +297,16 @@ START_TEST(udpTalkerAndListener) {
     UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
-    
-    connCount = 0;
+
+    TestContext testContext;
+    testContext.connCount = 0;
 
     UA_StatusCode retval =
-        cmListener->openConnection(cmListener, 1, params, NULL, (void*)0x01,
+        cmListener->openConnection(cmListener, 1, params, NULL, &testContext,
                                    connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    size_t listenSockets = connCount;
+    size_t listenSockets = testContext.connCount;
     
     /* Open a talker connection */
     clientId = 0;
@@ -308,7 +317,7 @@ START_TEST(udpTalkerAndListener) {
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
     
-    retval = cmTalker->openConnection(cmTalker, 2, params, NULL, (void*)0x01,
+    retval = cmTalker->openConnection(cmTalker, 2, params, NULL, &testContext,
                                       connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     
@@ -319,7 +328,7 @@ START_TEST(udpTalkerAndListener) {
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert_uint_ne(clientId, 0);
-    ck_assert_uint_eq(connCount, listenSockets + 1);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
     
     /* Send a message from the talker */
     received = false;
@@ -338,12 +347,12 @@ START_TEST(udpTalkerAndListener) {
     /* Close the connection */
     retval = cmTalker->closeConnection(cmTalker, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(connCount, listenSockets + 1);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = elTalker->run(elTalker, 1);
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
-    ck_assert_uint_eq(connCount, listenSockets);
+    ck_assert_uint_eq(testContext.connCount, listenSockets);
     
     /* Stop the Talker EventLoop */
     int max_stop_iteration_count = 10;
@@ -373,7 +382,123 @@ START_TEST(udpTalkerAndListener) {
     elListener->free(elListener);
     elListener = NULL;
 
-    ck_assert_uint_eq(connCount, 0);
+    ck_assert_uint_eq(testContext.connCount, 0);
+} END_TEST
+
+START_TEST(udpTalkerAndListenerDifferentDestination) {
+    /* create listener eventloop */
+    UA_EventLoop *elListener = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    UA_ConnectionManager *cmListener = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    elListener->registerEventSource(elListener, &cmListener->eventSource);
+    elListener->start(elListener);
+
+    UA_EventLoop *elTalker = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    UA_ConnectionManager *cmTalker = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    elTalker->registerEventSource(elTalker, &cmTalker->eventSource);
+    elTalker->start(elTalker);
+
+    /* Open a listener connection */
+    UA_UInt16 port = 30000;
+    UA_Variant portVar;
+    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_KeyValuePair listenParams[2];
+    listenParams[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    listenParams[0].value = portVar;
+
+    TestContext testContext;
+    testContext.connCount = 0;
+
+    UA_StatusCode retval =
+        cmListener->openConnection(cmListener, 1, listenParams, NULL, &testContext,
+                                   connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    size_t listenSockets = testContext.connCount;
+
+    /* Open a talker connection */
+    clientId = 0;
+
+    UA_KeyValuePair connectionParams[2];
+    UA_String connectionTargetHost = UA_STRING("localhost");
+    connectionParams[0].key = UA_QUALIFIEDNAME(0, "port");
+    connectionParams[0].value = portVar;
+    connectionParams[1].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setScalar(&connectionParams[1].value, &connectionTargetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+    retval = cmTalker->openConnection(cmTalker, 2, connectionParams, NULL, &testContext,
+                                      connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* The talker el should receive a signal "ready to be written on" */
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = elTalker->run(elTalker, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_ne(clientId, 0);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
+
+    /* Send a message from the talker */
+    received = false;
+    UA_ByteString snd;
+    retval = cmTalker->allocNetworkBuffer(cmTalker, clientId, &snd, strlen(testMsg));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    memcpy(snd.data, testMsg, strlen(testMsg));
+
+    UA_KeyValuePair sendParams[2];
+    UA_String sendTargetHost = UA_STRING("127.0.0.1");
+    sendParams[0].key = UA_QUALIFIEDNAME(0, "port");
+    sendParams[0].value = portVar;
+    sendParams[1].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setScalar(&sendParams[1].value, &sendTargetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+    retval = cmTalker->sendWithConnection(cmTalker, clientId, 2, sendParams, &snd);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = elListener->run(elListener, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(received);
+
+    /* Close the connection */
+    retval = cmTalker->closeConnection(cmTalker, clientId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = elTalker->run(elTalker, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_eq(testContext.connCount, listenSockets);
+
+    /* Stop the Talker EventLoop */
+    int max_stop_iteration_count = 10;
+    int iteration = 0;
+    elTalker->stop(elTalker);
+    while(elTalker->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = elTalker->run(elTalker, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    ck_assert_int_eq(elTalker->state, UA_EVENTLOOPSTATE_STOPPED);
+    elTalker->free(elTalker);
+    elTalker = NULL;
+
+    /* Stop the Listener EventLoop */
+    max_stop_iteration_count = 10;
+    iteration = 0;
+    elListener->stop(elListener);
+    while(elListener->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = elListener->run(elListener, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    ck_assert(elListener->state == UA_EVENTLOOPSTATE_STOPPED);
+    elListener->free(elListener);
+    elListener = NULL;
+
+    ck_assert_uint_eq(testContext.connCount, 0);
 } END_TEST
 
 int main(void) {
@@ -384,6 +509,7 @@ int main(void) {
     tcase_add_test(tc, runEventloopFailsIfCalledFromCallback);
 
     tcase_add_test(tc, udpTalkerAndListener);
+    tcase_add_test(tc, udpTalkerAndListenerDifferentDestination);
     suite_add_tcase(s, tc);
 
     SRunner *sr = srunner_create(s);

From e33ccf0f03f5cdf86478491fbda6a6119ffc4027 Mon Sep 17 00:00:00 2001
From: arozhkov <arozhkov@amt.ru>
Date: Thu, 5 May 2022 16:53:26 +0300
Subject: [PATCH 0146/1963] fix(cmake): Added the use of the UA_PACK_DEBIAN
 flag to disable the formation of packages through CPack so that there are no
 conflicts with another projects.

---
 CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c145a20fd09..67354d460eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1744,7 +1744,9 @@ else()
     install(FILES ${PROJECT_BINARY_DIR}/open62541.h DESTINATION include)
 endif()
 
-add_subdirectory(tools/packaging)
+if (UA_PACK_DEBIAN)
+    add_subdirectory(tools/packaging)
+endif()
 
 ##################################
 # Visual studio solution folders #

From 6e7b65739f9ad41165d552a538a4271f3d7faf74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 May 2022 14:46:13 +0200
Subject: [PATCH 0147/1963] build(deps): bump deps/ua-nodeset from `71f8826` to
 `2b43a75` (#5128)

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `71f8826` to `2b43a75`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/71f8826fd37cc899d941c271e66eac36abb40e44...2b43a75adf475d7bd9678a883874e028dda4ec78)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 71f8826fd37..2b43a75adf4 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 71f8826fd37cc899d941c271e66eac36abb40e44
+Subproject commit 2b43a75adf475d7bd9678a883874e028dda4ec78

From d952f76fa318346c414abbbf79f5c6d599210e45 Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Mon, 16 May 2022 16:03:34 +0200
Subject: [PATCH 0148/1963] refactor(core): remove needless x${VAR} tricks
 (#5129)

Co-authored-by: Rolf Eike Beer <eb@emlix.com>
---
 CMakeLists.txt            | 8 ++++----
 tests/CMakeLists.txt      | 2 +-
 tests/fuzz/CMakeLists.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67354d460eb..7914430fd65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0...3.12)
+cmake_minimum_required(VERSION 3.1...3.12)
 if(UA_BUILD_FUZZING OR UA_BUILD_OSS_FUZZ OR UA_BUILD_FUZZING_CORPUS)
     project(open62541) # We need to have C++ support configured for fuzzing
 else()
@@ -309,7 +309,7 @@ if(UA_ENABLE_COVERAGE)
 endif()
 
 if(UA_ENABLE_CLANG_COV)
-    if(NOT "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang")
+    if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
         message(FATAL_ERROR "Compiler must be clang when compiling for llvm-cov")
     endif()
     if(UA_ENABLE_COVERAGE)
@@ -650,7 +650,7 @@ function(check_add_cc_flag CC_FLAG)
     endif()
 endfunction()
 
-if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang"))
+if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang"))
     check_add_cc_flag("-std=c99")   # C99 mode
     check_add_cc_flag("-pipe")      # Avoid writing temporary files (for compiler speed)
     check_add_cc_flag("-Wall")      # Warnings
@@ -739,7 +739,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST
 
     # Debug
     if(BUILD_TYPE_LOWER_CASE STREQUAL "debug" AND UNIX AND NOT UA_BUILD_OSS_FUZZ AND
-       "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang" AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
+       CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
         # Add default sanitizer settings when using clang and Debug build.
         # This allows e.g. CLion to find memory locations for SegFaults
         message(STATUS "Sanitizer enabled")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f3bc07c27bf..9a958c2f248 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -169,7 +169,7 @@ if(UA_ENABLE_COVERAGE)
 endif()
 
 # Workaround some clang warnings in the uni tests
-if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang"))
+if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang"))
     add_definitions(-Wno-sign-conversion)
 endif()
 
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index c0e3ab84c8c..05f8a2e145a 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -30,7 +30,7 @@ remove_definitions(-std=c99 -Wmissing-prototypes -Wstrict-prototypes)
 set(CMAKE_CXX_STANDARD 11)
 
 if(NOT UA_BUILD_OSS_FUZZ)
-    if(NOT "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang")
+    if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
         MESSAGE(FATAL_ERROR "To build fuzzing, you need to use Clang as the compiler")
     endif()
 

From 1bb54d84a9f28153b9fdde16832cd0b043d529c2 Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Tue, 17 May 2022 11:50:32 +0200
Subject: [PATCH 0149/1963] fix(encoding): Check arrayLength against
 arrayDimensions (#4856)

Before the fix it was possible to have inconsistent arrayLength and arrayDimensions values resulting in a decoding error on the client side.
---
 src/ua_types_encoding_binary.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index 20686caae85..7a611c226e8 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -979,8 +979,13 @@ ENCODE_BINARY(Variant) {
     const UA_Boolean hasDimensions = isArray && src->arrayDimensionsSize > 0;
     if(isArray) {
         encoding |= (u8)UA_VARIANT_ENCODINGMASKTYPE_ARRAY;
-        if(hasDimensions)
+        if(hasDimensions) {
             encoding |= (u8)UA_VARIANT_ENCODINGMASKTYPE_DIMENSIONS;
+            size_t totalRequiredSize = 1;
+            for(size_t i = 0; i < src->arrayDimensionsSize; ++i)
+                totalRequiredSize *= src->arrayDimensions[i];
+            if(totalRequiredSize != src->arrayLength) return UA_STATUSCODE_BADENCODINGERROR;
+        }
     }
 
     /* Encode the encoding byte */

From 995ad7b31c35b24a570ff8bdf7ebff8a6e4b2f1b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 2 May 2022 16:29:57 +0200
Subject: [PATCH 0150/1963] feat(server): Improve logging if the server has no
 ServerUrl configured

---
 src/server/ua_server.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 43cfb041223..04a290f8bd6 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -721,6 +721,9 @@ UA_Server_run_startup(UA_Server *server) {
     UA_Boolean haveServerSocket = false;
     if(config->serverUrlsSize == 0) {
         /* Empty hostname -> listen on all devices */
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "No Server URL configured. Using \"opc.tcp://:4840\" "
+                       "to configure the listen socket.");
         UA_String defaultUrl = UA_STRING("opc.tcp://:4840");
         retVal = UA_Server_createServerConnection(server, &defaultUrl);
         if(retVal == UA_STATUSCODE_GOOD)

From 240aa6cb25cfcab6bfd2106e0a09c5dbd45ac405 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 5 May 2022 22:57:03 +0200
Subject: [PATCH 0151/1963] fix(plugin): Use the port number in
 UA_ServerConfig_setDefaultWithSecurityPolicies

---
 CHANGELOG                   |  14 +++++
 plugins/ua_config_default.c | 113 +++++++++++++++++++-----------------
 2 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 44c197ab01d..e0ef9ae9eef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,20 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2022-05-04 Julius Pfrommer <julius.pfrommer at iosb.fraunhofer.de>
+
+ * Server port and hostname configuration
+
+   Instead of configuring the port number in the server's
+   "NetworkLayer", the server configuration now takes a list of
+   ServerURLs like `opc.tcp://my-server:4840` or
+   `opc.wss://localhost:443`. The URLs are used both for discovery
+   and to set up the server sockets based on the defined hostnames
+   (and ports).
+
+   The default is to listen on all interfaces with port 4840 for
+   incoming TCP connections.
+
 2022-01-12 Mark Giraud <mark.giraud at iosb.fraunhofer.de>
 
  * Empty arrays always match the array dimensions
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index e95538efe9f..e1ea2b0c906 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -42,14 +42,14 @@ UA_DURATIONRANGE(UA_Duration min, UA_Duration max) {
 }
 
 static UA_StatusCode
-setDefaultConfig(UA_ServerConfig *conf);
+setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber);
 
 UA_Server *
 UA_Server_new(void) {
     UA_ServerConfig config;
     memset(&config, 0, sizeof(UA_ServerConfig));
 
-    UA_StatusCode res = setDefaultConfig(&config);
+    UA_StatusCode res = setDefaultConfig(&config, 4840);
     if(res != UA_STATUSCODE_GOOD)
         return NULL;
 
@@ -123,7 +123,7 @@ static UA_UsernamePasswordLogin usernamePasswords[2] = {
     {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1")}};
 
 static UA_StatusCode
-setDefaultConfig(UA_ServerConfig *conf) {
+setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     if(!conf)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
@@ -197,10 +197,61 @@ setDefaultConfig(UA_ServerConfig *conf) {
     /* conf->customDataTypes = NULL; */
 
     /* Networking */
-    /* conf->networkLayersSize = 0; */
-    /* conf->networkLayers = NULL; */
-    /* conf->customHostname = UA_STRING_NULL; */
+    /* Set up the local ServerUrls. They are used during startup to initialize
+     * the server sockets. */
+    UA_String serverUrls[2];
+    size_t serverUrlsSize = 0;
+    char hostnamestr[256];
+    char serverUrlBuffer[2][512];
+
+    if(portNumber == 0) {
+        UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
+                       "Cannot set the ServerUrl with a zero port");
+    } else {
+        if(conf->serverUrlsSize > 0) {
+            UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
+                           "ServerUrls already set. Overriding.");
+            UA_Array_delete(conf->serverUrls, serverUrlsSize,
+                            &UA_TYPES[UA_TYPES_STRING]);
+            conf->serverUrls = NULL;
+            conf->serverUrlsSize = 0;
+        }
+
+        /* 1) Listen on all interfaces (also external). This must be the first
+         * entry if this is desired. Otherwise some interfaces may be blocked
+         * (already in use) with a hostname that is only locally reachable.*/
+        UA_snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
+                    "opc.tcp://:%u", portNumber);
+        serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[0]);
+        serverUrlsSize++;
 
+        /* 2) Use gethostname to get the local hostname. For that temporarily
+         * initialize the Winsock API on Win32. */
+#ifdef _WIN32
+        WSADATA wsaData;
+        WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
+        int err = UA_gethostname(hostnamestr, sizeof(hostnamestr));
+#ifdef _WIN32
+        WSACleanup();
+#endif
+
+        if(err == 0) {
+            UA_snprintf(serverUrlBuffer[1], sizeof(serverUrlBuffer[1]),
+                        "opc.tcp://%s:%u", hostnamestr, portNumber);
+            serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[1]);
+            serverUrlsSize++;
+        }
+
+        /* 3) Add to the config */
+        UA_StatusCode retval =
+            UA_Array_copy(serverUrls, serverUrlsSize,
+                          (void**)&conf->serverUrls, &UA_TYPES[UA_TYPES_STRING]);
+        if(retval != UA_STATUSCODE_GOOD)
+            return retval;
+        conf->serverUrlsSize = serverUrlsSize;
+    }
+    
     /* Endpoints */
     /* conf->endpoints = {0, NULL}; */
 
@@ -278,7 +329,7 @@ setDefaultConfig(UA_ServerConfig *conf) {
 
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_setBasics(UA_ServerConfig* conf) {
-    UA_StatusCode res = setDefaultConfig(conf);
+    UA_StatusCode res = setDefaultConfig(conf, 4840);
     UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
                    "AcceptAll Certificate Verification. "
                    "Any remote certificate will be accepted.");
@@ -426,55 +477,11 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_StatusCode retval = setDefaultConfig(config);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_ServerConfig_clean(config);
-        return retval;
-    }
-
-    /* Set up the local ServerUrls. They are used during startup to initialize
-     * the server sockets. */
-    UA_String serverUrls[2];
-    size_t serverUrlsSize = 0;
-    char hostnamestr[256];
-    char serverUrlBuffer[2][512];
-
-    /* 1) Listen on all interfaces (also external). This must be the first entry
-     * if this is desired. Otherwise some interfaces may be blocked (already in
-     * use) with a hostname that is only locally reachable.*/
-    UA_snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
-                "opc.tcp://:%u", portNumber);
-    serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[0]);
-    serverUrlsSize++;
-
-    /* 2) Based on the local hostname. For that temporarily initialize the
-     * Winsock API on Win32. */
-
-#ifdef _WIN32
-    WSADATA wsaData;
-    WSAStartup(MAKEWORD(2, 2), &wsaData);
-#endif
-    int err = UA_gethostname(hostnamestr, sizeof(hostnamestr));
-#ifdef _WIN32
-    WSACleanup();
-#endif
-
-    if(err == 0) {
-        UA_snprintf(serverUrlBuffer[1], sizeof(serverUrlBuffer[1]),
-                    "opc.tcp://%s:%u", hostnamestr, portNumber);
-        serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[1]);
-        serverUrlsSize++;
-    }
-
-    /* 3) Add to the config */
-    retval =
-        UA_Array_copy(serverUrls, serverUrlsSize,
-                      (void**)&config->serverUrls, &UA_TYPES[UA_TYPES_STRING]);
+    UA_StatusCode retval = setDefaultConfig(config, portNumber);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(config);
         return retval;
     }
-    config->serverUrlsSize = serverUrlsSize;
 
     /* Set the TCP settings */
     config->tcpBufSize = recvBufferSize;
@@ -710,7 +717,7 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
                                                size_t issuerListSize,
                                                const UA_ByteString *revocationList,
                                                size_t revocationListSize) {
-    UA_StatusCode retval = setDefaultConfig(conf);
+    UA_StatusCode retval = setDefaultConfig(conf, portNumber);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
         return retval;

From 8b509afa35aa90249cdbdcf038f8b44500b4650e Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 27 Apr 2022 15:46:14 +0200
Subject: [PATCH 0152/1963] fix(test) add pubsub subscribe unit test to ci and
 adjust publish/subscribe trigger mechanism within test

---
 src/pubsub/ua_pubsub_writergroup.c    |  24 ++--
 tests/pubsub/check_pubsub_subscribe.c | 154 +++++++++++++++++++-------
 2 files changed, 128 insertions(+), 50 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 8eaf6d90312..77e997d705e 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -387,15 +387,17 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
         UA_PublishedDataSet *publishedDataSet =
             UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
         //PublishedDataSet freezeCounter--
-        publishedDataSet->configurationFreezeCounter--;
-        if(publishedDataSet->configurationFreezeCounter == 0){
-            publishedDataSet->configurationFrozen = UA_FALSE;
-            UA_DataSetField *dataSetField;
-            TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry){
-                dataSetField->configurationFrozen = UA_FALSE;
+        if(publishedDataSet != NULL){ /* This means the DSW is a heartbeat configuration */
+            publishedDataSet->configurationFreezeCounter--;
+            if(publishedDataSet->configurationFreezeCounter == 0){
+                publishedDataSet->configurationFrozen = UA_FALSE;
+                UA_DataSetField *dataSetField;
+                TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry){
+                    dataSetField->configurationFrozen = UA_FALSE;
+                }
             }
+            dataSetWriter->configurationFrozen = UA_FALSE;
         }
-        dataSetWriter->configurationFrozen = UA_FALSE;
     }
     if(wg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
         UA_ByteString_clear(&wg->bufferedMessage.buffer);
@@ -1143,6 +1145,14 @@ sendOrCollectDataSetMessage(UA_Server *server, UA_WriterGroup *writerGroup, UA_D
     UA_CHECK_STATUS_ERROR(res, goto error, &server->config.logger, UA_LOGCATEGORY_SERVER,
                           "PubSub Publish: DataSetMessage creation failed");
 
+    /* Check if the message is a Heartbeat */
+    if(UA_NodeId_isNull(&writer->connectedDataSet)){
+        res = sendNetworkMessageAndCleanup(writerGroup, connection, dataSetMessage, writer);
+        UA_CHECK_STATUS_ERROR(res, goto error, &server->config.logger, UA_LOGCATEGORY_SERVER,
+                              "PubSub Publish: Could not send a NetworkMessage");
+        return 0;
+    }
+
     UA_PublishedDataSet *publishedDataSet =
         UA_PublishedDataSet_findPDSbyId(server, writer->connectedDataSet);
     UA_CHECK_MEM_ERROR(publishedDataSet, goto error, &server->config.logger, UA_LOGCATEGORY_SERVER,
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 9cbc5d844e2..da2be041cdd 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * Copyright (c) 2019 Kalycito Infotech Private Limited
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
 #include <open62541/plugin/pubsub_udp.h>
@@ -620,7 +621,6 @@ START_TEST(SinglePublishSubscribeDateTime) {
         writerGroupConfig.writerGroupId = WRITER_GROUP_ID;
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
         retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
-        UA_Server_setWriterGroupOperational(server, writerGroup);
         /* DataSetWriter */
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
@@ -636,7 +636,6 @@ START_TEST(SinglePublishSubscribeDateTime) {
         readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
         retVal |=  UA_Server_addReaderGroup (server, connectionId, &readerGroupConfig, &readerGroupId);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        UA_Server_setReaderGroupOperational(server, readerGroupId);
         /* Data Set Reader */
         memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
         readerConfig.name = UA_STRING ("DataSetReader Test");
@@ -671,10 +670,10 @@ START_TEST(SinglePublishSubscribeDateTime) {
         UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
 
         /* run server - publisher and subscriber */
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_free(pMetaData->fields);
 }END_TEST
 
@@ -710,7 +709,6 @@ START_TEST(SinglePublishSubscribeDateTimeRaw) {
         writerGroupConfig.writerGroupId = WRITER_GROUP_ID;
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
         retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
-        UA_Server_setWriterGroupOperational(server, writerGroup);
         /* DataSetWriter */
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
@@ -727,7 +725,6 @@ START_TEST(SinglePublishSubscribeDateTimeRaw) {
         readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
         retVal |=  UA_Server_addReaderGroup (server, connectionId, &readerGroupConfig, &readerGroupId);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        UA_Server_setReaderGroupOperational(server, readerGroupId);
         /* Data Set Reader */
         memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
         readerConfig.name = UA_STRING ("DataSetReader Test");
@@ -762,10 +759,10 @@ START_TEST(SinglePublishSubscribeDateTimeRaw) {
         UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
 
         /* run server - publisher and subscriber */
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_free(pMetaData->fields);
 }END_TEST
 
@@ -831,7 +828,6 @@ START_TEST(SinglePublishSubscribeInt32) {
             (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
         writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
         retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
-        UA_Server_setWriterGroupOperational(server, writerGroup);
         UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
@@ -850,7 +846,6 @@ START_TEST(SinglePublishSubscribeInt32) {
         memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
         readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
         retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &readerGroupId);
-        UA_Server_setReaderGroupOperational(server, readerGroupId);
         /* Data Set Reader */
         /* Parameters to filter received NetworkMessage */
         memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
@@ -904,10 +899,10 @@ START_TEST(SinglePublishSubscribeInt32) {
         UA_free(pMetaData->fields);
 
         /* run server - publisher and subscriber */
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         checkReceived();
 } END_TEST
@@ -974,7 +969,6 @@ START_TEST(SinglePublishSubscribeInt64) {
             (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
         writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
         retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
-        UA_Server_setWriterGroupOperational(server, writerGroup);
         UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
@@ -994,7 +988,6 @@ START_TEST(SinglePublishSubscribeInt64) {
         readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
         retVal |=  UA_Server_addReaderGroup(server, connectionId,
                                             &readerGroupConfig, &readerGroupId);
-        UA_Server_setReaderGroupOperational(server, readerGroupId);
         /* Data Set Reader */
         /* Parameters to filter received NetworkMessage */
         memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
@@ -1051,10 +1044,10 @@ START_TEST(SinglePublishSubscribeInt64) {
         UA_free(pMetaData->fields);
 
         /* run server - publisher and subscriber */
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         checkReceived();
 } END_TEST
@@ -1122,7 +1115,6 @@ START_TEST(SinglePublishSubscribeBool) {
         writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
         retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
         UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
-        UA_Server_setWriterGroupOperational(server, writerGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* DataSetWriter */
@@ -1141,7 +1133,6 @@ START_TEST(SinglePublishSubscribeBool) {
         readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
         retVal |=  UA_Server_addReaderGroup(server, connectionId,
                                             &readerGroupConfig, &readerGroupId);
-        UA_Server_setReaderGroupOperational(server, readerGroupId);
         /* Data Set Reader */
         /* Parameters to filter received NetworkMessage */
         memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
@@ -1198,10 +1189,10 @@ START_TEST(SinglePublishSubscribeBool) {
         UA_free(pMetaData->fields);
 
         /* run server - publisher and subscriber */
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         checkReceived();
 } END_TEST
@@ -1270,7 +1261,7 @@ START_TEST(SinglePublishSubscribewithValidIdentifiers) {
             (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
         writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
         retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
-        UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
@@ -1289,7 +1280,6 @@ START_TEST(SinglePublishSubscribewithValidIdentifiers) {
         memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
         readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
         retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &readerGroupId);
-        UA_Server_setReaderGroupOperational(server, readerGroupId);
         /* Data Set Reader */
         /* Parameters to filter received NetworkMessage */
         memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
@@ -1327,6 +1317,7 @@ START_TEST(SinglePublishSubscribewithValidIdentifiers) {
         vAttr.displayName.locale    = UA_STRING ("en-US");
         vAttr.displayName.text      = UA_STRING ("Subscribed Integer");
         vAttr.valueRank             = -1;
+        vAttr.dataType    = UA_TYPES[UA_TYPES_UINT32].typeId;
         retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), folderId,
                                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                                            UA_QUALIFIEDNAME(1, "Subscribed Integer"),
@@ -1346,14 +1337,93 @@ START_TEST(SinglePublishSubscribewithValidIdentifiers) {
         UA_free(pMetaData->fields);
 
         /* run server - publisher and subscriber */
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
-        UA_fakeSleep(PUBLISH_INTERVAL + 1);
-        UA_Server_run_iterate(server,true);
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         checkReceived();
 } END_TEST
 
+START_TEST(SinglePublishSubscribeHeartbeat) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    UA_NodeId dataSetWriter;
+    UA_NodeId readerIdentifier;
+    UA_NodeId writerGroup;
+    UA_DataSetReaderConfig readerConfig;
+
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+    writerGroupConfig.name               = UA_STRING("WriterGroup Test");
+    writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
+    writerGroupConfig.enabled            = UA_FALSE;
+    writerGroupConfig.writerGroupId      = WRITER_GROUP_ID;
+    writerGroupConfig.encodingMimeType   = UA_PUBSUB_ENCODING_UADP;
+    writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+    writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+    writerGroupMessage->networkMessageContentMask =
+        (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+        (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+        (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+        (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
+    writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+    retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
+
+    UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+    dataSetWriterConfig.name            = UA_STRING("DataSetWriter Test");
+    dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
+    dataSetWriterConfig.keyFrameCount   = 1;
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup, UA_NODEID_NULL,
+                                         &dataSetWriterConfig, &dataSetWriter);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+    retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &readerGroupId);
+
+    memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+    readerConfig.name             = UA_STRING ("DataSetReader Test");
+    UA_UInt16 publisherIdentifier = PUBLISHER_ID;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId    = WRITER_GROUP_ID;
+    readerConfig.dataSetWriterId  = DATASET_WRITER_ID;
+    /* Setting up Meta data configuration in DataSetReader */
+    UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+    /* FilltestMetadata function in subscriber implementation */
+    UA_DataSetMetaDataType_init (pMetaData);
+    pMetaData->name       = UA_STRING ("DataSet Test 2");
+    /* Static definition of number of fields size to 1 to create one targetVariable */
+    pMetaData->fieldsSize = 0;
+    pMetaData->fields     = NULL;
+    retVal |= UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
+                                         &readerIdentifier);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_FieldTargetVariable targetVar;
+    memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
+    /* For creating Targetvariable */
+/*    UA_FieldTargetDataType_init(&targetVar.targetVariable);
+    targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+    targetVar.targetVariable.targetNodeId = newnodeId;
+    retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
+                                                            1, &targetVar);*/
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    //UA_FieldTargetDataType_clear(&targetVar.targetVariable);
+    UA_free(pMetaData->fields);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_Server_setReaderGroupOperational(server, readerGroupId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+} END_TEST
+
 /* Have two readers listening for the same writer */
 START_TEST(MultiPublishSubscribeInt32) {
     /* To check status after running both publisher and subscriber */
@@ -1416,7 +1486,6 @@ START_TEST(MultiPublishSubscribeInt32) {
         (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
     writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
     retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
-    UA_Server_setWriterGroupOperational(server, writerGroup);
     UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
@@ -1435,7 +1504,6 @@ START_TEST(MultiPublishSubscribeInt32) {
     memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
     readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
     retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &readerGroupId);
-    UA_Server_setReaderGroupOperational(server, readerGroupId);
 
     /* Data Set Reader */
     /* Parameters to filter received NetworkMessage */
@@ -1512,12 +1580,11 @@ START_TEST(MultiPublishSubscribeInt32) {
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_FieldTargetDataType_clear(&targetVar.targetVariable);
     UA_free(pMetaData->fields);
-
     /* run server - publisher and subscriber */
-    UA_fakeSleep(PUBLISH_INTERVAL + 1);
-    UA_Server_run_iterate(server, true);
-    UA_fakeSleep(PUBLISH_INTERVAL + 1);
-    UA_Server_run_iterate(server, true);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_Server_setReaderGroupOperational(server, readerGroupId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     checkReceived();
 
@@ -1578,6 +1645,7 @@ int main(void) {
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeInt64);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeBool);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribewithValidIdentifiers);
+    tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeHeartbeat);
 
     /* Test cases with several readers */
     tcase_add_test(tc_pubsub_publish_subscribe, MultiPublishSubscribeInt32);

From b8ab88ebfd1629071efe99970f12f9f8eec97ac1 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 11 May 2022 09:16:29 +0200
Subject: [PATCH 0153/1963] feat(pubsub) add timestamp to DSR for the
 lastHeartbeatReceived representation

---
 src/pubsub/ua_pubsub.h                |  1 +
 src/pubsub/ua_pubsub_ns0.c            | 12 +++++++-----
 src/pubsub/ua_pubsub_reader.c         |  1 +
 tests/pubsub/check_pubsub_subscribe.c | 15 +++++++++------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index c004fa9066f..96145c74e52 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -235,6 +235,7 @@ typedef struct UA_DataSetReader {
     UA_UInt64 msgRcvTimeoutTimerId;
     UA_Boolean msgRcvTimeoutTimerRunning;
 #endif
+    UA_DateTime lastHeartbeatReceived;
 } UA_DataSetReader;
 
 /* Process Network Message using DataSetReader */
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index b772b3bd834..772b1c2738a 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1350,11 +1350,13 @@ addDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWrite
                                    UA_QUALIFIEDNAME(0, dswName),
                                    UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETWRITERTYPE),
                                    object_attr, NULL, &dataSetWriter->identifier);
-
-    retVal |= UA_Server_addReference(server, dataSetWriter->connectedDataSet,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETTOWRITER),
-                                     UA_EXPANDEDNODEID_NODEID(dataSetWriter->identifier),
-                                     true);
+    //if connected dataset is null this means it's configured for heartbeats
+    if(!UA_NodeId_isNull(&dataSetWriter->connectedDataSet)){
+        retVal |= UA_Server_addReference(server, dataSetWriter->connectedDataSet,
+                                         UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETTOWRITER),
+                                         UA_EXPANDEDNODEID_NODEID(dataSetWriter->identifier),
+                                         true);
+    }
 
     UA_NodeId dataSetWriterIdNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetWriterId"),
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index cfc335eedbd..5fcf2d2fdd5 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1017,6 +1017,7 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
 #ifdef UA_ENABLE_PUBSUB_MONITORING
         UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
 #endif
+        dsr->lastHeartbeatReceived = UA_DateTime_nowMonotonic();
         return;
     }
 
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index da2be041cdd..b069058e263 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -1408,12 +1408,7 @@ START_TEST(SinglePublishSubscribeHeartbeat) {
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_FieldTargetVariable targetVar;
     memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
-    /* For creating Targetvariable */
-/*    UA_FieldTargetDataType_init(&targetVar.targetVariable);
-    targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
-    targetVar.targetVariable.targetNodeId = newnodeId;
-    retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
-                                                            1, &targetVar);*/
+
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     //UA_FieldTargetDataType_clear(&targetVar.targetVariable);
     UA_free(pMetaData->fields);
@@ -1422,6 +1417,14 @@ START_TEST(SinglePublishSubscribeHeartbeat) {
     UA_Server_setReaderGroupOperational(server, readerGroupId);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
+    UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
+    ck_assert_ptr_ne(dsr, NULL);
+    /* since the test cases are using a fake timer with a static timestamp,
+     * we compare the lastHeartbeatReceived with the static timestamp
+     * (given by UA_DateTime_nowMonotonic()). If the timestamps are equal,
+     * the code path was executed and the lastHeartbeatReceived set correctly */
+    ck_assert(UA_DateTime_nowMonotonic() == dsr->lastHeartbeatReceived);
+
 } END_TEST
 
 /* Have two readers listening for the same writer */

From e090cc5de4786809657be181a7b77eb69be152f9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 17 May 2022 23:28:26 +0200
Subject: [PATCH 0154/1963] fix(plugin): Fix a memleak in the server config
 creation

---
 plugins/ua_config_default.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index e1ea2b0c906..6958e6788d3 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -211,7 +211,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         if(conf->serverUrlsSize > 0) {
             UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
                            "ServerUrls already set. Overriding.");
-            UA_Array_delete(conf->serverUrls, serverUrlsSize,
+            UA_Array_delete(conf->serverUrls, conf->serverUrlsSize,
                             &UA_TYPES[UA_TYPES_STRING]);
             conf->serverUrls = NULL;
             conf->serverUrlsSize = 0;

From 4a0f9795165aa08aa4cad473bf5e066ab33d31fd Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Thu, 19 May 2022 17:55:00 +0200
Subject: [PATCH 0155/1963] test(core): fix compiler errors

OpenBSD clang version 13.0.0 complains about -Wsign-conversion
errors.  Use correct types to avoid sign conversion and bad comparison.
---
 tests/check_securechannel.c                             | 2 +-
 tests/check_types_builtin.c                             | 2 +-
 tests/encryption/check_encryption_aes128sha256rsaoaep.c | 8 ++++----
 tests/encryption/check_encryption_basic128rsa15.c       | 8 ++++----
 tests/encryption/check_encryption_basic256.c            | 8 ++++----
 tests/encryption/check_encryption_basic256sha256.c      | 8 ++++----
 tests/server/check_services_attributes.c                | 4 ++--
 tests/server/check_services_nodemanagement.c            | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/check_securechannel.c b/tests/check_securechannel.c
index dfc11875643..ca8cd75db21 100644
--- a/tests/check_securechannel.c
+++ b/tests/check_securechannel.c
@@ -364,7 +364,7 @@ START_TEST(Securechannel_sendAsymmetricOPNMessage_extraPaddingPresentWhenKeyLarg
     if(extraPadding) {
         extraPaddingByte = paddingByte;
         paddingByte = sentData.data[sentData.length - keySizes.asym_lcl_sig_size - 2];
-        paddingSize = (extraPaddingByte << 8u) + paddingByte;
+        paddingSize = ((size_t)extraPaddingByte << 8u) + paddingByte;
         paddingSize += 1;
     }
 
diff --git a/tests/check_types_builtin.c b/tests/check_types_builtin.c
index 50d0eb8cd2b..ef124812bb5 100644
--- a/tests/check_types_builtin.c
+++ b/tests/check_types_builtin.c
@@ -195,7 +195,7 @@ END_TEST
 START_TEST(UA_Int64_decodeShallRespectSign) {
     // given
     UA_ByteString rawMessage;
-    UA_UInt64 expectedVal = ((UA_UInt64)0xFF) << 56;
+    UA_Int64 expectedVal = ((UA_Int64)0xFF) << 56;
     UA_Byte  mem[8]      = { 00, 00, 00, 00, 0x00, 0x00, 0x00, 0xFF };
     rawMessage.data   = mem;
     rawMessage.length = 8;
diff --git a/tests/encryption/check_encryption_aes128sha256rsaoaep.c b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
index 3dd406a84fe..8c32989f4fe 100644
--- a/tests/encryption/check_encryption_aes128sha256rsaoaep.c
+++ b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
@@ -106,12 +106,12 @@ START_TEST(encryption_connect) {
     UA_ByteString certificate;
     certificate.length = CERT_DER_LENGTH;
     certificate.data = CERT_DER_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_DER_LENGTH;
     privateKey.data = KEY_DER_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* The Get endpoint (discovery service) is done with
      * security mode as none to see the server's capability
@@ -187,12 +187,12 @@ START_TEST(encryption_connect_pem) {
     UA_ByteString certificate;
     certificate.length = CERT_PEM_LENGTH;
     certificate.data = CERT_PEM_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_PEM_LENGTH;
     privateKey.data = KEY_PEM_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* The Get endpoint (discovery service) is done with
      * security mode as none to see the server's capability
diff --git a/tests/encryption/check_encryption_basic128rsa15.c b/tests/encryption/check_encryption_basic128rsa15.c
index bf5852f3dfd..0c938974856 100644
--- a/tests/encryption/check_encryption_basic128rsa15.c
+++ b/tests/encryption/check_encryption_basic128rsa15.c
@@ -103,12 +103,12 @@ START_TEST(encryption_connect) {
     UA_ByteString certificate;
     certificate.length = CERT_DER_LENGTH;
     certificate.data = CERT_DER_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_DER_LENGTH;
     privateKey.data = KEY_DER_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* The Get endpoint (discovery service) is done with
      * security mode as none to see the server's capability
@@ -184,12 +184,12 @@ START_TEST(encryption_connect_pem) {
     UA_ByteString certificate;
     certificate.length = CERT_PEM_LENGTH;
     certificate.data = CERT_PEM_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_PEM_LENGTH;
     privateKey.data = KEY_PEM_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* The Get endpoint (discovery service) is done with
      * security mode as none to see the server's capability
diff --git a/tests/encryption/check_encryption_basic256.c b/tests/encryption/check_encryption_basic256.c
index d3a49f51205..1f3cbf0187c 100644
--- a/tests/encryption/check_encryption_basic256.c
+++ b/tests/encryption/check_encryption_basic256.c
@@ -106,12 +106,12 @@ START_TEST(encryption_connect) {
     UA_ByteString certificate;
     certificate.length = CERT_DER_LENGTH;
     certificate.data = CERT_DER_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_DER_LENGTH;
     privateKey.data = KEY_DER_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* The Get endpoint (discovery service) is done with
      * security mode as none to see the server's capability
@@ -187,12 +187,12 @@ START_TEST(encryption_connect_pem) {
     UA_ByteString certificate;
     certificate.length = CERT_PEM_LENGTH;
     certificate.data = CERT_PEM_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_PEM_LENGTH;
     privateKey.data = KEY_PEM_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* The Get endpoint (discovery service) is done with
      * security mode as none to see the server's capability
diff --git a/tests/encryption/check_encryption_basic256sha256.c b/tests/encryption/check_encryption_basic256sha256.c
index d4d6dd9ff11..fc5d25bea08 100644
--- a/tests/encryption/check_encryption_basic256sha256.c
+++ b/tests/encryption/check_encryption_basic256sha256.c
@@ -106,12 +106,12 @@ START_TEST(encryption_connect) {
     UA_ByteString certificate;
     certificate.length = CERT_DER_LENGTH;
     certificate.data = CERT_DER_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_DER_LENGTH;
     privateKey.data = KEY_DER_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* The Get endpoint (discovery service) is done with
      * security mode as none to see the server's capability
@@ -187,12 +187,12 @@ START_TEST(encryption_connect_pem) {
     UA_ByteString certificate;
     certificate.length = CERT_PEM_LENGTH;
     certificate.data = CERT_PEM_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_PEM_LENGTH;
     privateKey.data = KEY_PEM_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* The Get endpoint (discovery service) is done with
      * security mode as none to see the server's capability
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index d99be5cc1e8..3792f705318 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -199,7 +199,7 @@ START_TEST(ReadSingleServerAttribute) {
     UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_BOTH);
 
     ck_assert_int_eq(resp.status, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(0, resp.value.arrayLength);
+    ck_assert_uint_eq(0, resp.value.arrayLength);
     ck_assert_int_eq(resp.serverTimestamp, UA_DateTime_now());
     ck_assert_int_eq(resp.sourceTimestamp, UA_DateTime_now());
     UA_DataValue_clear(&resp);
@@ -825,7 +825,7 @@ START_TEST(WriteSingleAttributeValueWithServerTimestamp) {
     ck_assert(resp.hasValue);
     ck_assert_int_eq(20, *(UA_Int32*)resp.value.data);
     ck_assert(resp.hasServerTimestamp);
-    ck_assert_uint_eq(resp.serverTimestamp, UA_DateTime_now());
+    ck_assert_int_eq(resp.serverTimestamp, UA_DateTime_now());
     UA_DataValue_clear(&resp);
 } END_TEST
 
diff --git a/tests/server/check_services_nodemanagement.c b/tests/server/check_services_nodemanagement.c
index 1276b2233c9..d0ee73f72fc 100644
--- a/tests/server/check_services_nodemanagement.c
+++ b/tests/server/check_services_nodemanagement.c
@@ -618,7 +618,7 @@ START_TEST(ObjectWithDynamicVariableChild) {
 
     UA_BrowsePathResult bpr = UA_Server_translateBrowsePathToNodeIds(server, &bp);
 
-    ck_assert_int_eq(bpr.targetsSize, 1);
+    ck_assert_uint_eq(bpr.targetsSize, 1);
 
     UA_WriteValue wv;
     UA_WriteValue_init(&wv);

From 6c15bbd18466afe6c61feb8c42515cad4b42daba Mon Sep 17 00:00:00 2001
From: JanSurft <jan@hermes-technology.de>
Date: Tue, 24 May 2022 19:13:42 +0200
Subject: [PATCH 0156/1963] feat(core): update types.bsd to v1.05 (#5144)

---
 tools/schema/Opc.Ua.Types.bsd | 303 +++++++++++++++++++++++++++++++++-
 1 file changed, 298 insertions(+), 5 deletions(-)

diff --git a/tools/schema/Opc.Ua.Types.bsd b/tools/schema/Opc.Ua.Types.bsd
index 0c461962aaa..be87cbf31a5 100644
--- a/tools/schema/Opc.Ua.Types.bsd
+++ b/tools/schema/Opc.Ua.Types.bsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -219,6 +219,9 @@
   </opc:EnumeratedType>
     
 
+  <opc:EnumeratedType Name="Enumeration" LengthInBits="32">
+  </opc:EnumeratedType>
+
   <opc:OpaqueType Name="ImageBMP">
   </opc:OpaqueType>
 
@@ -234,9 +237,18 @@
   <opc:OpaqueType Name="AudioDataType">
   </opc:OpaqueType>
 
+  <opc:StructuredType Name="Union" BaseType="ua:ExtensionObject">
+  </opc:StructuredType>
+
+  <opc:OpaqueType Name="UriString">
+  </opc:OpaqueType>
+
   <opc:OpaqueType Name="BitFieldMaskDataType">
   </opc:OpaqueType>
 
+  <opc:OpaqueType Name="SemanticVersionString">
+  </opc:OpaqueType>
+
   <opc:StructuredType Name="KeyValuePair" BaseType="ua:ExtensionObject">
     <opc:Field Name="Key" TypeName="ua:QualifiedName" />
     <opc:Field Name="Value" TypeName="ua:Variant" />
@@ -313,6 +325,8 @@
     <opc:EnumeratedValue Name="GroupId" Value="4" />
     <opc:EnumeratedValue Name="Anonymous" Value="5" />
     <opc:EnumeratedValue Name="AuthenticatedUser" Value="6" />
+    <opc:EnumeratedValue Name="Application" Value="7" />
+    <opc:EnumeratedValue Name="X509Subject" Value="8" />
   </opc:EnumeratedType>
 
   <opc:StructuredType Name="IdentityMappingRuleType" BaseType="ua:ExtensionObject">
@@ -404,11 +418,27 @@
     <opc:Field Name="Body" TypeName="ua:Variant" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="PortableQualifiedName" BaseType="ua:ExtensionObject">
+    <opc:Field Name="NamespaceUri" TypeName="opc:String" />
+    <opc:Field Name="Name" TypeName="opc:String" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="PortableNodeId" BaseType="ua:ExtensionObject">
+    <opc:Field Name="NamespaceUri" TypeName="opc:String" />
+    <opc:Field Name="Identifier" TypeName="ua:NodeId" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="UnsignedRationalNumber" BaseType="ua:ExtensionObject">
+    <opc:Field Name="Numerator" TypeName="opc:UInt32" />
+    <opc:Field Name="Denominator" TypeName="opc:UInt32" />
+  </opc:StructuredType>
+
   <opc:EnumeratedType Name="PubSubState" LengthInBits="32">
     <opc:EnumeratedValue Name="Disabled" Value="0" />
     <opc:EnumeratedValue Name="Paused" Value="1" />
     <opc:EnumeratedValue Name="Operational" Value="2" />
     <opc:EnumeratedValue Name="Error" Value="3" />
+    <opc:EnumeratedValue Name="PreOperational" Value="4" />
   </opc:EnumeratedType>
 
   <opc:StructuredType Name="DataSetMetaDataType" BaseType="tns:DataTypeSchemaHeader">
@@ -490,6 +520,10 @@
     <opc:Field Name="Filter" TypeName="tns:ContentFilter" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="PublishedDataSetCustomSourceDataType" BaseType="tns:PublishedDataSetSourceDataType">
+    <opc:Field Name="CyclicDataSet" TypeName="opc:Boolean" />
+  </opc:StructuredType>
+
   <opc:EnumeratedType Name="DataSetFieldContentMask" LengthInBits="32" IsOptionSet="true">
     <opc:EnumeratedValue Name="None" Value="0" />
     <opc:EnumeratedValue Name="StatusCode" Value="1" />
@@ -675,6 +709,69 @@
     <opc:Field Name="Enabled" TypeName="opc:Boolean" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="StandaloneSubscribedDataSetRefDataType" BaseType="tns:SubscribedDataSetDataType">
+    <opc:Field Name="DataSetName" TypeName="opc:String" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="StandaloneSubscribedDataSetDataType" BaseType="tns:SubscribedDataSetDataType">
+    <opc:Field Name="Name" TypeName="opc:String" />
+    <opc:Field Name="NoOfDataSetFolder" TypeName="opc:Int32" />
+    <opc:Field Name="DataSetFolder" TypeName="opc:String" LengthField="NoOfDataSetFolder" />
+    <opc:Field Name="DataSetMetaData" TypeName="tns:DataSetMetaDataType" />
+    <opc:Field Name="SubscribedDataSet" TypeName="ua:ExtensionObject" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="SecurityGroupDataType" BaseType="ua:ExtensionObject">
+    <opc:Field Name="Name" TypeName="opc:String" />
+    <opc:Field Name="NoOfSecurityGroupFolder" TypeName="opc:Int32" />
+    <opc:Field Name="SecurityGroupFolder" TypeName="opc:String" LengthField="NoOfSecurityGroupFolder" />
+    <opc:Field Name="KeyLifetime" TypeName="opc:Double" />
+    <opc:Field Name="SecurityPolicyUri" TypeName="opc:String" />
+    <opc:Field Name="MaxFutureKeyCount" TypeName="opc:UInt32" />
+    <opc:Field Name="MaxPastKeyCount" TypeName="opc:UInt32" />
+    <opc:Field Name="SecurityGroupId" TypeName="opc:String" />
+    <opc:Field Name="NoOfRolePermissions" TypeName="opc:Int32" />
+    <opc:Field Name="RolePermissions" TypeName="tns:RolePermissionType" LengthField="NoOfRolePermissions" />
+    <opc:Field Name="NoOfGroupProperties" TypeName="opc:Int32" />
+    <opc:Field Name="GroupProperties" TypeName="tns:KeyValuePair" LengthField="NoOfGroupProperties" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="PubSubKeyPushTargetDataType" BaseType="ua:ExtensionObject">
+    <opc:Field Name="ApplicationUri" TypeName="opc:String" />
+    <opc:Field Name="NoOfPushTargetFolder" TypeName="opc:Int32" />
+    <opc:Field Name="PushTargetFolder" TypeName="opc:String" LengthField="NoOfPushTargetFolder" />
+    <opc:Field Name="EndpointUrl" TypeName="opc:String" />
+    <opc:Field Name="SecurityPolicyUri" TypeName="opc:String" />
+    <opc:Field Name="UserTokenType" TypeName="tns:UserTokenPolicy" />
+    <opc:Field Name="RequestedKeyCount" TypeName="opc:UInt16" />
+    <opc:Field Name="RetryInterval" TypeName="opc:Double" />
+    <opc:Field Name="NoOfPushTargetProperties" TypeName="opc:Int32" />
+    <opc:Field Name="PushTargetProperties" TypeName="tns:KeyValuePair" LengthField="NoOfPushTargetProperties" />
+    <opc:Field Name="NoOfSecurityGroups" TypeName="opc:Int32" />
+    <opc:Field Name="SecurityGroups" TypeName="opc:String" LengthField="NoOfSecurityGroups" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="PubSubConfiguration2DataType" BaseType="tns:PubSubConfigurationDataType">
+    <opc:Field Name="NoOfPublishedDataSets" TypeName="opc:Int32" />
+    <opc:Field Name="PublishedDataSets" TypeName="tns:PublishedDataSetDataType" LengthField="NoOfPublishedDataSets" />
+    <opc:Field Name="NoOfConnections" TypeName="opc:Int32" />
+    <opc:Field Name="Connections" TypeName="tns:PubSubConnectionDataType" LengthField="NoOfConnections" />
+    <opc:Field Name="Enabled" TypeName="opc:Boolean" SourceType="tns:PubSubConfigurationDataType" />
+    <opc:Field Name="NoOfSubscribedDataSets" TypeName="opc:Int32" />
+    <opc:Field Name="SubscribedDataSets" TypeName="tns:StandaloneSubscribedDataSetDataType" LengthField="NoOfSubscribedDataSets" />
+    <opc:Field Name="NoOfDataSetClasses" TypeName="opc:Int32" />
+    <opc:Field Name="DataSetClasses" TypeName="tns:DataSetMetaDataType" LengthField="NoOfDataSetClasses" />
+    <opc:Field Name="NoOfDefaultSecurityKeyServices" TypeName="opc:Int32" />
+    <opc:Field Name="DefaultSecurityKeyServices" TypeName="tns:EndpointDescription" LengthField="NoOfDefaultSecurityKeyServices" />
+    <opc:Field Name="NoOfSecurityGroups" TypeName="opc:Int32" />
+    <opc:Field Name="SecurityGroups" TypeName="tns:SecurityGroupDataType" LengthField="NoOfSecurityGroups" />
+    <opc:Field Name="NoOfPubSubKeyPushTargets" TypeName="opc:Int32" />
+    <opc:Field Name="PubSubKeyPushTargets" TypeName="tns:PubSubKeyPushTargetDataType" LengthField="NoOfPubSubKeyPushTargets" />
+    <opc:Field Name="ConfigurationVersion" TypeName="opc:UInt32" />
+    <opc:Field Name="NoOfConfigurationProperties" TypeName="opc:Int32" />
+    <opc:Field Name="ConfigurationProperties" TypeName="tns:KeyValuePair" LengthField="NoOfConfigurationProperties" />
+  </opc:StructuredType>
+
   <opc:EnumeratedType Name="DataSetOrderingType" LengthInBits="32">
     <opc:EnumeratedValue Name="Undefined" Value="0" />
     <opc:EnumeratedValue Name="AscendingWriterId" Value="1" />
@@ -755,6 +852,9 @@
     <opc:EnumeratedValue Name="SequenceNumber" Value="4" />
     <opc:EnumeratedValue Name="Timestamp" Value="8" />
     <opc:EnumeratedValue Name="Status" Value="16" />
+    <opc:EnumeratedValue Name="MessageType" Value="32" />
+    <opc:EnumeratedValue Name="DataSetWriterName" Value="64" />
+    <opc:EnumeratedValue Name="ReversibleFieldEncoding" Value="128" />
   </opc:EnumeratedType>
 
   <opc:StructuredType Name="JsonDataSetWriterMessageDataType" BaseType="tns:DataSetWriterMessageDataType">
@@ -766,15 +866,60 @@
     <opc:Field Name="DataSetMessageContentMask" TypeName="tns:JsonDataSetMessageContentMask" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="QosDataType" BaseType="ua:ExtensionObject">
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="TransmitQosDataType" BaseType="tns:QosDataType">
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="TransmitQosPriorityDataType" BaseType="tns:TransmitQosDataType">
+    <opc:Field Name="PriorityLabel" TypeName="opc:String" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="ReceiveQosDataType" BaseType="tns:QosDataType">
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="ReceiveQosPriorityDataType" BaseType="tns:ReceiveQosDataType">
+    <opc:Field Name="PriorityLabel" TypeName="opc:String" />
+  </opc:StructuredType>
+
   <opc:StructuredType Name="DatagramConnectionTransportDataType" BaseType="tns:ConnectionTransportDataType">
     <opc:Field Name="DiscoveryAddress" TypeName="ua:ExtensionObject" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="DatagramConnectionTransport2DataType" BaseType="tns:DatagramConnectionTransportDataType">
+    <opc:Field Name="DiscoveryAddress" TypeName="ua:ExtensionObject" SourceType="tns:DatagramConnectionTransportDataType" />
+    <opc:Field Name="DiscoveryAnnounceRate" TypeName="opc:UInt32" />
+    <opc:Field Name="DiscoveryMaxMessageSize" TypeName="opc:UInt32" />
+    <opc:Field Name="QosCategory" TypeName="opc:String" />
+    <opc:Field Name="NoOfDatagramQos" TypeName="opc:Int32" />
+    <opc:Field Name="DatagramQos" TypeName="ua:ExtensionObject" LengthField="NoOfDatagramQos" />
+  </opc:StructuredType>
+
   <opc:StructuredType Name="DatagramWriterGroupTransportDataType" BaseType="tns:WriterGroupTransportDataType">
     <opc:Field Name="MessageRepeatCount" TypeName="opc:Byte" />
     <opc:Field Name="MessageRepeatDelay" TypeName="opc:Double" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="DatagramWriterGroupTransport2DataType" BaseType="tns:DatagramWriterGroupTransportDataType">
+    <opc:Field Name="MessageRepeatCount" TypeName="opc:Byte" SourceType="tns:DatagramWriterGroupTransportDataType" />
+    <opc:Field Name="MessageRepeatDelay" TypeName="opc:Double" SourceType="tns:DatagramWriterGroupTransportDataType" />
+    <opc:Field Name="Address" TypeName="ua:ExtensionObject" />
+    <opc:Field Name="QosCategory" TypeName="opc:String" />
+    <opc:Field Name="NoOfDatagramQos" TypeName="opc:Int32" />
+    <opc:Field Name="DatagramQos" TypeName="ua:ExtensionObject" LengthField="NoOfDatagramQos" />
+    <opc:Field Name="DiscoveryAnnounceRate" TypeName="opc:UInt32" />
+    <opc:Field Name="Topic" TypeName="opc:String" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="DatagramDataSetReaderTransportDataType" BaseType="tns:DataSetReaderTransportDataType">
+    <opc:Field Name="Address" TypeName="ua:ExtensionObject" />
+    <opc:Field Name="QosCategory" TypeName="opc:String" />
+    <opc:Field Name="NoOfDatagramQos" TypeName="opc:Int32" />
+    <opc:Field Name="DatagramQos" TypeName="ua:ExtensionObject" LengthField="NoOfDatagramQos" />
+    <opc:Field Name="Topic" TypeName="opc:String" />
+  </opc:StructuredType>
+
   <opc:StructuredType Name="BrokerConnectionTransportDataType" BaseType="tns:ConnectionTransportDataType">
     <opc:Field Name="ResourceUri" TypeName="opc:String" />
     <opc:Field Name="AuthenticationProfileUri" TypeName="opc:String" />
@@ -812,6 +957,36 @@
     <opc:Field Name="MetaDataQueueName" TypeName="opc:String" />
   </opc:StructuredType>
 
+  <opc:EnumeratedType Name="PubSubConfigurationRefMask" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
+    <opc:EnumeratedValue Name="ElementAdd" Value="1" />
+    <opc:EnumeratedValue Name="ElementMatch" Value="2" />
+    <opc:EnumeratedValue Name="ElementModify" Value="4" />
+    <opc:EnumeratedValue Name="ElementRemove" Value="8" />
+    <opc:EnumeratedValue Name="ReferenceWriter" Value="16" />
+    <opc:EnumeratedValue Name="ReferenceReader" Value="32" />
+    <opc:EnumeratedValue Name="ReferenceWriterGroup" Value="64" />
+    <opc:EnumeratedValue Name="ReferenceReaderGroup" Value="128" />
+    <opc:EnumeratedValue Name="ReferenceConnection" Value="256" />
+    <opc:EnumeratedValue Name="ReferencePubDataset" Value="512" />
+    <opc:EnumeratedValue Name="ReferenceSubDataset" Value="1024" />
+    <opc:EnumeratedValue Name="ReferenceSecurityGroup" Value="2048" />
+    <opc:EnumeratedValue Name="ReferencePushTarget" Value="4096" />
+  </opc:EnumeratedType>
+
+  <opc:StructuredType Name="PubSubConfigurationRefDataType" BaseType="ua:ExtensionObject">
+    <opc:Field Name="ConfigurationMask" TypeName="tns:PubSubConfigurationRefMask" />
+    <opc:Field Name="ElementIndex" TypeName="opc:UInt16" />
+    <opc:Field Name="ConnectionIndex" TypeName="opc:UInt16" />
+    <opc:Field Name="GroupIndex" TypeName="opc:UInt16" />
+  </opc:StructuredType>
+
+  <opc:StructuredType Name="PubSubConfigurationValueDataType" BaseType="ua:ExtensionObject">
+    <opc:Field Name="ConfigurationElement" TypeName="tns:PubSubConfigurationRefDataType" />
+    <opc:Field Name="Name" TypeName="opc:String" />
+    <opc:Field Name="Identifier" TypeName="ua:Variant" />
+  </opc:StructuredType>
+
   <opc:EnumeratedType Name="DiagnosticsLevel" LengthInBits="32">
     <opc:EnumeratedValue Name="Basic" Value="0" />
     <opc:EnumeratedValue Name="Advanced" Value="1" />
@@ -831,6 +1006,120 @@
     <opc:Field Name="ReferencedNodes" TypeName="ua:ExpandedNodeId" LengthField="NoOfReferencedNodes" />
   </opc:StructuredType>
 
+  <opc:EnumeratedType Name="PasswordOptionsMask" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
+    <opc:EnumeratedValue Name="SupportInitialPasswordChange" Value="1" />
+    <opc:EnumeratedValue Name="SupportDisableUser" Value="2" />
+    <opc:EnumeratedValue Name="SupportDisableDeleteForUser" Value="4" />
+    <opc:EnumeratedValue Name="SupportNoChangeForUser" Value="8" />
+    <opc:EnumeratedValue Name="SupportDescriptionForUser" Value="16" />
+    <opc:EnumeratedValue Name="RequiresUpperCaseCharacters" Value="32" />
+    <opc:EnumeratedValue Name="RequiresLowerCaseCharacters" Value="64" />
+    <opc:EnumeratedValue Name="RequiresDigitCharacters" Value="128" />
+    <opc:EnumeratedValue Name="RequiresSpecialCharacters" Value="256" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="UserConfigurationMask" LengthInBits="32" IsOptionSet="true">
+    <opc:EnumeratedValue Name="None" Value="0" />
+    <opc:EnumeratedValue Name="NoDelete" Value="1" />
+    <opc:EnumeratedValue Name="Disabled" Value="2" />
+    <opc:EnumeratedValue Name="NoChangeByUser" Value="4" />
+    <opc:EnumeratedValue Name="MustChangePassword" Value="8" />
+  </opc:EnumeratedType>
+
+  <opc:StructuredType Name="UserManagementDataType" BaseType="ua:ExtensionObject">
+    <opc:Field Name="UserName" TypeName="opc:String" />
+    <opc:Field Name="UserConfiguration" TypeName="tns:UserConfigurationMask" />
+    <opc:Field Name="Description" TypeName="opc:String" />
+  </opc:StructuredType>
+
+  <opc:EnumeratedType Name="Duplex" LengthInBits="32">
+    <opc:EnumeratedValue Name="Full" Value="0" />
+    <opc:EnumeratedValue Name="Half" Value="1" />
+    <opc:EnumeratedValue Name="Unknown" Value="2" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="InterfaceAdminStatus" LengthInBits="32">
+    <opc:EnumeratedValue Name="Up" Value="0" />
+    <opc:EnumeratedValue Name="Down" Value="1" />
+    <opc:EnumeratedValue Name="Testing" Value="2" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="InterfaceOperStatus" LengthInBits="32">
+    <opc:EnumeratedValue Name="Up" Value="0" />
+    <opc:EnumeratedValue Name="Down" Value="1" />
+    <opc:EnumeratedValue Name="Testing" Value="2" />
+    <opc:EnumeratedValue Name="Unknown" Value="3" />
+    <opc:EnumeratedValue Name="Dormant" Value="4" />
+    <opc:EnumeratedValue Name="NotPresent" Value="5" />
+    <opc:EnumeratedValue Name="LowerLayerDown" Value="6" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="NegotiationStatus" LengthInBits="32">
+    <opc:EnumeratedValue Name="InProgress" Value="0" />
+    <opc:EnumeratedValue Name="Complete" Value="1" />
+    <opc:EnumeratedValue Name="Failed" Value="2" />
+    <opc:EnumeratedValue Name="Unknown" Value="3" />
+    <opc:EnumeratedValue Name="NoNegotiation" Value="4" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="TsnFailureCode" LengthInBits="32">
+    <opc:EnumeratedValue Name="NoFailure" Value="0" />
+    <opc:EnumeratedValue Name="InsufficientBandwidth" Value="1" />
+    <opc:EnumeratedValue Name="InsufficientResources" Value="2" />
+    <opc:EnumeratedValue Name="InsufficientTrafficClassBandwidth" Value="3" />
+    <opc:EnumeratedValue Name="StreamIdInUse" Value="4" />
+    <opc:EnumeratedValue Name="StreamDestinationAddressInUse" Value="5" />
+    <opc:EnumeratedValue Name="StreamPreemptedByHigherRank" Value="6" />
+    <opc:EnumeratedValue Name="LatencyHasChanged" Value="7" />
+    <opc:EnumeratedValue Name="EgressPortNotAvbCapable" Value="8" />
+    <opc:EnumeratedValue Name="UseDifferentDestinationAddress" Value="9" />
+    <opc:EnumeratedValue Name="OutOfMsrpResources" Value="10" />
+    <opc:EnumeratedValue Name="OutOfMmrpResources" Value="11" />
+    <opc:EnumeratedValue Name="CannotStoreDestinationAddress" Value="12" />
+    <opc:EnumeratedValue Name="PriorityIsNotAnSrcClass" Value="13" />
+    <opc:EnumeratedValue Name="MaxFrameSizeTooLarge" Value="14" />
+    <opc:EnumeratedValue Name="MaxFanInPortsLimitReached" Value="15" />
+    <opc:EnumeratedValue Name="FirstValueChangedForStreamId" Value="16" />
+    <opc:EnumeratedValue Name="VlanBlockedOnEgress" Value="17" />
+    <opc:EnumeratedValue Name="VlanTaggingDisabledOnEgress" Value="18" />
+    <opc:EnumeratedValue Name="SrClassPriorityMismatch" Value="19" />
+    <opc:EnumeratedValue Name="FeatureNotPropagated" Value="20" />
+    <opc:EnumeratedValue Name="MaxLatencyExceeded" Value="21" />
+    <opc:EnumeratedValue Name="BridgeDoesNotProvideNetworkId" Value="22" />
+    <opc:EnumeratedValue Name="StreamTransformNotSupported" Value="23" />
+    <opc:EnumeratedValue Name="StreamIdTypeNotSupported" Value="24" />
+    <opc:EnumeratedValue Name="FeatureNotSupported" Value="25" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="TsnStreamState" LengthInBits="32">
+    <opc:EnumeratedValue Name="Disabled" Value="0" />
+    <opc:EnumeratedValue Name="Configuring" Value="1" />
+    <opc:EnumeratedValue Name="Ready" Value="2" />
+    <opc:EnumeratedValue Name="Operational" Value="3" />
+    <opc:EnumeratedValue Name="Error" Value="4" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="TsnTalkerStatus" LengthInBits="32">
+    <opc:EnumeratedValue Name="None" Value="0" />
+    <opc:EnumeratedValue Name="Ready" Value="1" />
+    <opc:EnumeratedValue Name="Failed" Value="2" />
+  </opc:EnumeratedType>
+
+  <opc:EnumeratedType Name="TsnListenerStatus" LengthInBits="32">
+    <opc:EnumeratedValue Name="None" Value="0" />
+    <opc:EnumeratedValue Name="Ready" Value="1" />
+    <opc:EnumeratedValue Name="PartialFailed" Value="2" />
+    <opc:EnumeratedValue Name="Failed" Value="3" />
+  </opc:EnumeratedType>
+
+  <opc:StructuredType Name="PriorityMappingEntryType" BaseType="ua:ExtensionObject">
+    <opc:Field Name="MappingUri" TypeName="opc:String" />
+    <opc:Field Name="PriorityLabel" TypeName="opc:String" />
+    <opc:Field Name="PriorityValue_PCP" TypeName="opc:Byte" />
+    <opc:Field Name="PriorityValue_DSCP" TypeName="opc:UInt32" />
+  </opc:StructuredType>
+
   <opc:EnumeratedType Name="IdType" LengthInBits="32">
     <opc:EnumeratedValue Name="Numeric" Value="0" />
     <opc:EnumeratedValue Name="String" Value="1" />
@@ -895,6 +1184,8 @@
     <opc:EnumeratedValue Name="NonatomicWrite" Value="512" />
     <opc:EnumeratedValue Name="WriteFullArrayOnly" Value="1024" />
     <opc:EnumeratedValue Name="NoSubDataTypes" Value="2048" />
+    <opc:EnumeratedValue Name="NonVolatile" Value="4096" />
+    <opc:EnumeratedValue Name="Constant" Value="8192" />
   </opc:EnumeratedType>
 
   <opc:EnumeratedType Name="EventNotifierType" LengthInBits="8" IsOptionSet="true">
@@ -917,10 +1208,15 @@
     <opc:Field Name="Permissions" TypeName="tns:PermissionType" />
   </opc:StructuredType>
 
+  <opc:StructuredType Name="DataTypeDefinition" BaseType="ua:ExtensionObject">
+  </opc:StructuredType>
+
   <opc:EnumeratedType Name="StructureType" LengthInBits="32">
     <opc:EnumeratedValue Name="Structure" Value="0" />
     <opc:EnumeratedValue Name="StructureWithOptionalFields" Value="1" />
     <opc:EnumeratedValue Name="Union" Value="2" />
+    <opc:EnumeratedValue Name="StructureWithSubtypedValues" Value="3" />
+    <opc:EnumeratedValue Name="UnionWithSubtypedValues" Value="4" />
   </opc:EnumeratedType>
 
   <opc:StructuredType Name="StructureField" BaseType="ua:ExtensionObject">
@@ -1194,9 +1490,6 @@
     <opc:Field Name="ValidBits" TypeName="opc:ByteString" />
   </opc:StructuredType>
 
-  <opc:StructuredType Name="Union" BaseType="ua:ExtensionObject">
-  </opc:StructuredType>
-
   <opc:OpaqueType Name="NormalizedString">
   </opc:OpaqueType>
 
@@ -3040,7 +3333,7 @@
     <opc:Field Name="NoOfLastMethodOutputValues" TypeName="opc:Int32" />
     <opc:Field Name="LastMethodOutputValues" TypeName="ua:Variant" LengthField="NoOfLastMethodOutputValues" />
     <opc:Field Name="LastMethodCallTime" TypeName="opc:DateTime" />
-    <opc:Field Name="LastMethodReturnStatus" TypeName="tns:StatusResult" />
+    <opc:Field Name="LastMethodReturnStatus" TypeName="ua:StatusCode" />
   </opc:StructuredType>
 
   <opc:StructuredType Name="Annotation" BaseType="ua:ExtensionObject">

From 381f1014b529850799a3cb598e56cc05246fe381 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 May 2022 00:04:49 +0200
Subject: [PATCH 0157/1963] feat(server): Make UA_Server_removePubSubConnection
 thread-safe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub.h            |  3 +++
 src/pubsub/ua_pubsub_manager.c    | 18 ++++++++++++++----
 src/pubsub/ua_pubsub_ns0.c        |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 6bd5056221f..c6dd9b5e67a 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -249,7 +249,7 @@ UA_Server_getPubSubConnectionConfig(UA_Server *server,
 
 /* Remove Connection, identified by the NodeId. Deletion of Connection
  * removes all contained WriterGroups and Writers. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection);
 
 /**
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 96145c74e52..7e09145aa0a 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -91,6 +91,9 @@ UA_PubSubConnection_findConnectionbyId(UA_Server *server,
 void
 UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig);
 
+UA_StatusCode
+removePubSubConnection(UA_Server *server, const UA_NodeId connection);
+
 void
 UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection);
 
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index fcd1392d381..cdb63db6323 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -159,9 +159,10 @@ UA_Server_addPubSubConnection(UA_Server *server,
 }
 
 UA_StatusCode
-UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
+removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
     //search the identified Connection and store the Connection index
-    UA_PubSubConnection *currentConnection = UA_PubSubConnection_findConnectionbyId(server, connection);
+    UA_PubSubConnection *currentConnection =
+        UA_PubSubConnection_findConnectionbyId(server, connection);
     if(!currentConnection)
         return UA_STATUSCODE_BADNOTFOUND;
 
@@ -176,6 +177,14 @@ UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection)
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = removePubSubConnection(server, connection);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier) {
     UA_PubSubConnection *connection =
@@ -406,8 +415,9 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
 
     //remove Connections and WriterGroups
     UA_PubSubConnection *tmpConnection1, *tmpConnection2;
-    TAILQ_FOREACH_SAFE(tmpConnection1, &server->pubSubManager.connections, listEntry, tmpConnection2){
-        UA_Server_removePubSubConnection(server, tmpConnection1->identifier);
+    TAILQ_FOREACH_SAFE(tmpConnection1, &server->pubSubManager.connections,
+                       listEntry, tmpConnection2) {
+        removePubSubConnection(server, tmpConnection1->identifier);
     }
     UA_PublishedDataSet *tmpPDS1, *tmpPDS2;
     TAILQ_FOREACH_SAFE(tmpPDS1, &server->pubSubManager.publishedDataSets, listEntry, tmpPDS2){
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 772b1c2738a..e60580d85e3 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -687,7 +687,7 @@ addPubSubConnectionAction(UA_Server *server,
 UA_StatusCode
 removePubSubConnectionRepresentation(UA_Server *server,
                                      UA_PubSubConnection *connection) {
-    return UA_Server_deleteNode(server, connection->identifier, true);
+    return deleteNode(server, connection->identifier, true);
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS

From 34f30b9e83d8d9bc61ea47346779b8704edd143f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 May 2022 00:12:01 +0200
Subject: [PATCH 0158/1963] feat(pubsub): Make UA_Server_removeWriterGroup
 thread-safe

---
 include/open62541/server_pubsub.h  |  2 +-
 src/pubsub/ua_pubsub.h             |  3 +++
 src/pubsub/ua_pubsub_ns0.c         |  5 ++---
 src/pubsub/ua_pubsub_writer.c      |  6 ++++--
 src/pubsub/ua_pubsub_writergroup.c | 10 +++++++++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index c6dd9b5e67a..ca4dc768d29 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -526,7 +526,7 @@ UA_StatusCode UA_EXPORT
 UA_Server_WriterGroup_getState(UA_Server *server, UA_NodeId writerGroupIdentifier,
                                UA_PubSubState *state);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup);
 
 UA_StatusCode UA_EXPORT
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 7e09145aa0a..bc9692b9eb2 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -183,6 +183,9 @@ struct UA_WriterGroup {
 #endif
 };
 
+UA_StatusCode
+removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup);
+
 UA_StatusCode
 UA_WriterGroupConfig_copy(const UA_WriterGroupConfig *src,
                           UA_WriterGroupConfig *dst);
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index e60580d85e3..a94cebd7612 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1244,7 +1244,7 @@ addWriterGroupAction(UA_Server *server,
 
 UA_StatusCode
 removeGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup) {
-    return UA_Server_deleteNode(server, writerGroup->identifier, true);
+    return deleteNode(server, writerGroup->identifier, true);
 }
 
 UA_StatusCode
@@ -1439,11 +1439,10 @@ addDataSetWriterAction(UA_Server *server,
 }
 #endif
 
-
 UA_StatusCode
 removeDataSetWriterRepresentation(UA_Server *server,
                                   UA_DataSetWriter *dataSetWriter) {
-    return UA_Server_deleteNode(server, dataSetWriter->identifier, true);
+    return deleteNode(server, dataSetWriter->identifier, true);
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 2b229b2b9f2..e0a9bbbc3b7 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -102,8 +102,10 @@ void
 UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection) {
     /* Remove WriterGroups */
     UA_WriterGroup *writerGroup, *tmpWriterGroup;
-    LIST_FOREACH_SAFE(writerGroup, &connection->writerGroups, listEntry, tmpWriterGroup)
-        UA_Server_removeWriterGroup(server, writerGroup->identifier);
+    LIST_FOREACH_SAFE(writerGroup, &connection->writerGroups,
+                      listEntry, tmpWriterGroup) {
+        removeWriterGroup(server, writerGroup->identifier);
+    }
 
     /* Remove ReaderGroups */
     UA_ReaderGroup *readerGroups, *tmpReaderGroup;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 77e997d705e..aa2ed08bb09 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -119,7 +119,7 @@ UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
 }
 
 UA_StatusCode
-UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
+removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
@@ -166,6 +166,14 @@ UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = removeWriterGroup(server, writerGroup);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
                                          const UA_NodeId writerGroup) {

From a5887fb3ca91be77d72a56fa5f74aa5a3b39b5f9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 May 2022 00:17:16 +0200
Subject: [PATCH 0159/1963] feat(pubsub): Make UA_Server_removeReaderGroup
 thread-safe

---
 include/open62541/server_pubsub.h  |  2 +-
 src/pubsub/ua_pubsub.h             |  3 +++
 src/pubsub/ua_pubsub_ns0.c         |  2 +-
 src/pubsub/ua_pubsub_readergroup.c | 10 +++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index ca4dc768d29..d0f92d78805 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -804,7 +804,7 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
                          UA_NodeId *readerGroupIdentifier);
 
 /* Remove ReaderGroup from connection */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier);
 
 UA_StatusCode UA_EXPORT
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index bc9692b9eb2..53fdd67df0f 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -322,6 +322,9 @@ struct UA_ReaderGroup {
 #endif
 };
 
+UA_StatusCode
+removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier);
+
 UA_StatusCode
 UA_ReaderGroupConfig_copy(const UA_ReaderGroupConfig *src,
                           UA_ReaderGroupConfig *dst);
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index a94cebd7612..bf5b744555f 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1249,7 +1249,7 @@ removeGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup) {
 
 UA_StatusCode
 removeReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup) {
-    return UA_Server_deleteNode(server, readerGroup->identifier, true);
+    return deleteNode(server, readerGroup->identifier, true);
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index e82549762e9..83527bf662a 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -163,7 +163,7 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
 }
 
 UA_StatusCode
-UA_Server_removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
+removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
     UA_ReaderGroup* readerGroup =
         UA_ReaderGroup_findRGbyId(server, groupIdentifier);
     if(readerGroup == NULL)
@@ -198,6 +198,14 @@ UA_Server_removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = removeReaderGroup(server, groupIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* TODO: Implement
 UA_StatusCode
 UA_Server_ReaderGroup_updateConfig(UA_Server *server, UA_NodeId readerGroupIdentifier,

From f12bca4b89fd6c0512392ea61b37b21f8512f493 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 May 2022 00:22:19 +0200
Subject: [PATCH 0160/1963] fix(pubsub): Ensure that shutdown does not take the
 mutex twice

---
 src/pubsub/ua_pubsub_ns0.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index bf5b744555f..12aa8abc5e3 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -804,7 +804,7 @@ addDataSetReaderAction(UA_Server *server,
 UA_StatusCode
 removeDataSetReaderRepresentation(UA_Server *server,
                                   UA_DataSetReader* dataSetReader) {
-    return UA_Server_deleteNode(server, dataSetReader->identifier, true);
+    return deleteNode(server, dataSetReader->identifier, true);
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
@@ -1048,7 +1048,7 @@ removeVariablesAction(UA_Server *server,
 UA_StatusCode
 removePublishedDataSetRepresentation(UA_Server *server,
                                      UA_PublishedDataSet *publishedDataSet) {
-    return UA_Server_deleteNode(server, publishedDataSet->identifier, true);
+    return deleteNode(server, publishedDataSet->identifier, true);
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS

From d1f4cfb48cadf94b2e977cc6ba87940076693d4e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 May 2022 15:25:50 +0200
Subject: [PATCH 0161/1963] fix(server): Copy the value backend as part of a
 mutable node copy

---
 src/server/ua_nodes.c                   |  4 +++-
 src/server/ua_services_nodemanagement.c | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index 79f33c4c77c..ab87aa5d0c1 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -453,13 +453,15 @@ UA_CommonVariableNode_copy(const UA_VariableNode *src, UA_VariableNode *dst) {
     dst->arrayDimensionsSize = src->arrayDimensionsSize;
     retval = UA_NodeId_copy(&src->dataType, &dst->dataType);
     dst->valueRank = src->valueRank;
+    dst->valueBackend = src->valueBackend;
     dst->valueSource = src->valueSource;
     if(src->valueSource == UA_VALUESOURCE_DATA) {
         retval |= UA_DataValue_copy(&src->value.data.value,
                                     &dst->value.data.value);
         dst->value.data.callback = src->value.data.callback;
-    } else
+    } else {
         dst->value.dataSource = src->value.dataSource;
+    }
     return retval;
 }
 
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 2e58ef013a0..b7bc3577861 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -648,6 +648,16 @@ copyChild(UA_Server *server, UA_Session *session,
         node->head.monitoredItems = NULL;
 #endif
 
+        /* The value backend is copied by default. But we don't want to keep it
+         * here. */
+        if(node->head.nodeClass == UA_NODECLASS_VARIABLE ||
+           node->head.nodeClass == UA_NODECLASS_VARIABLETYPE) {
+            if(node->variableNode.valueSource != UA_VALUESOURCE_DATA)
+                memset(&node->variableNode.value, 0, sizeof(node->variableNode.value));
+            node->variableNode.valueSource = UA_VALUESOURCE_DATA;
+            memset(&node->variableNode.valueBackend, 0, sizeof(UA_ValueBackend));
+        }
+
         /* Reset the NodeId (random numeric id will be assigned in the nodestore) */
         UA_NodeId_clear(&node->head.nodeId);
         node->head.nodeId.namespaceIndex = destinationNodeId->namespaceIndex;

From 456c265baa4cb93038a993beed3ba0c67af110d8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 May 2022 23:42:41 +0200
Subject: [PATCH 0162/1963] feat(core): Add additional overflow production for
 JSON decoding

---
 src/ua_types_encoding_json.c | 43 +++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index a886f3e9d9e..1e2876ca285 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2791,23 +2791,35 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
     CHECK_TOKEN_BOUNDS;
     CHECK_OBJECT;
 
+    if(ctx->depth >= UA_JSON_ENCODING_MAX_RECURSION - 1)
+        return UA_STATUSCODE_BADENCODINGERROR;
+    ctx->depth++;
+
     /* Empty object, nothing to decode */
     size_t objectCount = (size_t)(parseCtx->tokenArray[parseCtx->index].size);
     if(objectCount == 0) {
+        ctx->depth--;
         parseCtx->index++; /* Jump to the element after the empty object */
         return UA_STATUSCODE_GOOD;
     }
 
     parseCtx->index++; /* Go to first key */
-    CHECK_TOKEN_BOUNDS;
+
+    /* CHECK_TOKEN_BOUNDS */
+    if(parseCtx->index >= parseCtx->tokenCount) {
+        ctx->depth--;
+        return UA_STATUSCODE_BADDECODINGERROR;
+    }
 
     status ret = UA_STATUSCODE_GOOD;
     for(size_t currObj = 0; currObj < objectCount &&
             parseCtx->index < parseCtx->tokenCount; currObj++) {
 
         /* Key must be a string (TODO: Convert to assert when jsmn is replaced) */
-        if(getJsmnType(parseCtx) != JSMN_STRING)
-            return UA_STATUSCODE_BADDECODINGERROR;
+        if(getJsmnType(parseCtx) != JSMN_STRING) {
+            ret = UA_STATUSCODE_BADDECODINGERROR;
+            goto cleanup;
+        }
 
         /* Start searching at the index of currObj */
         for(size_t i = currObj; i < entryCount + currObj; i++) {
@@ -2815,19 +2827,31 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
              * if objectCount is in order! */
             size_t index = i % entryCount;
 
-            CHECK_TOKEN_BOUNDS;
+            /* CHECK_TOKEN_BOUNDS */
+            if(parseCtx->index >= parseCtx->tokenCount) {
+                ret = UA_STATUSCODE_BADDECODINGERROR;
+                goto cleanup;
+            }
+
             if(jsoneq((char*) ctx->pos, &parseCtx->tokenArray[parseCtx->index],
                       entries[index].fieldName) != 0)
                 continue;
 
             /* Duplicate key found, abort */
-            if(entries[index].found)
-                return UA_STATUSCODE_BADDECODINGERROR;
+            if(entries[index].found) {
+                ret = UA_STATUSCODE_BADDECODINGERROR;
+                goto cleanup;
+            }
 
             entries[index].found = true;
 
             parseCtx->index++; /* Go from key to value */
-            CHECK_TOKEN_BOUNDS;
+
+            /* CHECK_TOKEN_BOUNDS */
+            if(parseCtx->index >= parseCtx->tokenCount) {
+                ret = UA_STATUSCODE_BADDECODINGERROR;
+                goto cleanup;
+            }
 
             /* An entry that was expected, but shall not be decoded.
              * Jump over it. */
@@ -2851,10 +2875,13 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
                 ret = decodeJsonJumpTable[entries[index].type->typeKind]
                     (entries[index].fieldPointer, entries[index].type, ctx, parseCtx);
             if(ret != UA_STATUSCODE_GOOD)
-                return ret;
+                goto cleanup;
             break;
         }
     }
+
+ cleanup:
+    ctx->depth--;
     return ret;
 }
 

From e84b2d18039b01b2988f8a120f6670db395441e2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 May 2022 23:43:14 +0200
Subject: [PATCH 0163/1963] fix(test): Allow overflow protection errors in JSON
 fuzzing

---
 tests/fuzz/fuzz_json_decode_encode.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/fuzz/fuzz_json_decode_encode.cc b/tests/fuzz/fuzz_json_decode_encode.cc
index 26695b96e96..71b73d31337 100644
--- a/tests/fuzz/fuzz_json_decode_encode.cc
+++ b/tests/fuzz/fuzz_json_decode_encode.cc
@@ -23,8 +23,13 @@ LLVMFuzzerTestOneInput(uint8_t *data, size_t size) {
     if(retval != UA_STATUSCODE_GOOD)
         return 0;
 
+    /* This can fail for now. For example length limits are not always computed
+     * 100% identical between encoding and decoding. */
     size_t jsonSize = UA_calcSizeJson(&value, &UA_TYPES[UA_TYPES_VARIANT], NULL);
-    UA_assert(jsonSize > 0); /* 0 => fail */
+    if(jsonSize == 0) {
+        UA_Variant_clear(&value);
+        return 0;
+    }
 
     UA_ByteString buf2 = UA_BYTESTRING_NULL;
     retval = UA_ByteString_allocBuffer(&buf2, jsonSize);

From ec42e5c65f9211eba13a5346822ab017b617bfff Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Tue, 24 May 2022 22:15:59 +0200
Subject: [PATCH 0164/1963] test(core): fix more compiler errors

When compiling with UA_NAMESPACE_ZERO=FULL more -Wsign-conversion
errors show up.
---
 .../nodeset-compiler/check_nodeset_compiler_testnodeset.c | 8 ++++----
 tests/server/check_interfaces.c                           | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
index aa5033ccb70..c96b178ca37 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
@@ -113,26 +113,26 @@ START_TEST(readValueRank) {
     ck_assert_int_eq(rank, -2);
     UA_Variant_init(&dims);
     UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &dims);
-    ck_assert_int_eq(dims.arrayLength, 0);
+    ck_assert_uint_eq(dims.arrayLength, 0);
     UA_Variant_clear(&dims);
     // 1-dim
     UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10007), &rank);
     ck_assert_int_eq(rank, 1);
     UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10007), &dims);
-    ck_assert_int_eq(dims.arrayLength, 1);
+    ck_assert_uint_eq(dims.arrayLength, 1);
     ck_assert_int_eq(*((UA_UInt32 *)dims.data), 0);
     UA_Variant_clear(&dims);
     UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10004), &rank);
     ck_assert_int_eq(rank, 1);
     UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10004), &dims);
-    ck_assert_int_eq(dims.arrayLength, 1);
+    ck_assert_uint_eq(dims.arrayLength, 1);
     ck_assert_int_eq(*((UA_UInt32 *)dims.data), 4);
     UA_Variant_clear(&dims);
     // 2-dim
     UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10006), &rank);
     ck_assert_int_eq(rank, 2);
     UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10006), &dims);
-    ck_assert_int_eq(dims.arrayLength, 2);
+    ck_assert_uint_eq(dims.arrayLength, 2);
     UA_UInt32 *dimensions = (UA_UInt32 *)dims.data;
     ck_assert_int_eq(dimensions[0], 2);
     ck_assert_int_eq(dimensions[1], 2);
diff --git a/tests/server/check_interfaces.c b/tests/server/check_interfaces.c
index d08dcf2c589..c6dd48934e1 100644
--- a/tests/server/check_interfaces.c
+++ b/tests/server/check_interfaces.c
@@ -56,7 +56,7 @@ START_TEST(check_interface_instantiation) {
 
     UA_BrowsePathResult bpr = UA_Server_translateBrowsePathToNodeIds(server, &bp);
     ck_assert_int_eq(bpr.statusCode, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(bpr.targetsSize, 1);
+    ck_assert_uint_eq(bpr.targetsSize, 1);
 
     const UA_NodeId objectWithInterfacesId = bpr.targets->targetId.nodeId;
     UA_BrowsePathResult_clear(&bpr);
@@ -73,7 +73,7 @@ START_TEST(check_interface_instantiation) {
 
     UA_BrowseResult br = UA_Server_browse(server, 1000, &bd);
     ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
-    ck_assert_int_gt(br.referencesSize, 0);
+    ck_assert_uint_gt(br.referencesSize, 0);
 
     bool found = false;
     for (size_t i = 0; i < br.referencesSize; ++i) {
@@ -150,7 +150,7 @@ START_TEST(check_interface_instantiation) {
 
     bpr = UA_Server_translateBrowsePathToNodeIds(server, &bp);
     ck_assert_int_eq(bpr.statusCode, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(bpr.targetsSize, 1);
+    ck_assert_uint_eq(bpr.targetsSize, 1);
 
     const UA_NodeId baseObjectWithInterfaceId = bpr.targets->targetId.nodeId;
     UA_BrowsePathResult_clear(&bpr);
@@ -164,7 +164,7 @@ START_TEST(check_interface_instantiation) {
 
     br = UA_Server_browse(server, 1000, &bd);
     ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
-    ck_assert_int_gt(br.referencesSize, 0);
+    ck_assert_uint_gt(br.referencesSize, 0);
 
     found = false;
     for (size_t i = 0; i < br.referencesSize; ++i) {

From 023d4b6b8bdec987f8f3ffee6c09801bbee4fa2d Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Thu, 26 May 2022 16:17:48 +0200
Subject: [PATCH 0165/1963] build(pkgconfig): do not assume relative paths in
 open62541.pc

Paths in the pkg-config file are composed of `CMAKE_INSTALL_<dir>`
variables. However, it is allowed to specify them as absolute paths, see

https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html#result-variables

> It should typically be a path relative to the installation prefix so
> that it can be converted to an absolute path in a relocatable way (see
> `CMAKE_INSTALL_FULL_<dir>`). However, an absolute path is also
> allowed.

If they are absolute, compositions like
`@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@` yield a wrong path.
Use the `CMAKE_INSTALL_FULL_<dir>` variables instead, as the CMake
documentation suggests.
---
 tools/open62541.pc.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/open62541.pc.in b/tools/open62541.pc.in
index 242c588a697..6e4613ebb79 100644
--- a/tools/open62541.pc.in
+++ b/tools/open62541.pc.in
@@ -2,11 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 sharedlibdir=${libdir}
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
 Name: open62541
 Description: open62541 is an open source C (C99) implementation of OPC UA

From acaa87d1c7b9fb649fdf8f29b36536952b88b3b2 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 21 Apr 2022 12:56:39 +0200
Subject: [PATCH 0166/1963] fix(pubsub): Switching the MQTT library to
 upstream.

---
 .gitmodules                                   |    4 +
 CMakeLists.txt                                |   61 +-
 deps/mqtt-c                                   |    1 +
 deps/mqtt-c/mqtt.c                            | 1846 -----------------
 deps/mqtt-c/mqtt.h                            | 1590 --------------
 deps/mqtt-c/mqtt_pal.h                        |  115 -
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |   13 +-
 include/open62541/config.h.in                 |    1 +
 .../open62541/plugin/pubsub_mqtt.h}           |   16 +-
 plugins/mqtt/templates/mbedtls_sockets.h      |  159 ++
 plugins/mqtt/templates/openssl_sockets.h      |  102 +
 plugins/mqtt/templates/posix_sockets.h        |   86 +
 ...{ua_mqtt_adapter.c => ua_mqtt-c_adapter.c} |  438 ++--
 ...{ua_mqtt_adapter.h => ua_mqtt-c_adapter.h} |    2 +-
 plugins/mqtt/ua_mqtt_pal.c                    |  108 -
 ...network_pubsub_mqtt.c => ua_pubsub_mqtt.c} |   10 +-
 src/pubsub/ua_pubsub_networkmessage.c         |   14 +-
 tests/CMakeLists.txt                          |   16 +-
 tests/pubsub/check_pubsub_connection_mqtt.c   |    7 +-
 19 files changed, 566 insertions(+), 4023 deletions(-)
 create mode 160000 deps/mqtt-c
 delete mode 100644 deps/mqtt-c/mqtt.c
 delete mode 100644 deps/mqtt-c/mqtt.h
 delete mode 100644 deps/mqtt-c/mqtt_pal.h
 rename plugins/{ua_network_pubsub_mqtt.h => include/open62541/plugin/pubsub_mqtt.h} (79%)
 create mode 100644 plugins/mqtt/templates/mbedtls_sockets.h
 create mode 100644 plugins/mqtt/templates/openssl_sockets.h
 create mode 100644 plugins/mqtt/templates/posix_sockets.h
 rename plugins/mqtt/{ua_mqtt_adapter.c => ua_mqtt-c_adapter.c} (52%)
 rename plugins/mqtt/{ua_mqtt_adapter.h => ua_mqtt-c_adapter.h} (95%)
 delete mode 100644 plugins/mqtt/ua_mqtt_pal.c
 rename plugins/{ua_network_pubsub_mqtt.c => ua_pubsub_mqtt.c} (97%)

diff --git a/.gitmodules b/.gitmodules
index 4b22b4fd192..94f7cbce5ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,7 @@
 	path = deps/ua-nodeset
 	url = https://github.com/OPCFoundation/UA-Nodeset
 	branch = latest
+[submodule "deps/mqtt-c"]
+	path = deps/mqtt-c
+	url = https://github.com/LiamBindle/MQTT-C.git
+	branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7914430fd65..8b77c63ccb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ include(GNUInstallDirs)
 # Set when installed via make install
 set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
 set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
+set(open62541_MQTT_DIR ${PROJECT_SOURCE_DIR}/deps/mqtt-c)
 
 include(macros_internal)
 include(macros_public)
@@ -426,29 +427,49 @@ endif()
 option(UA_ENABLE_PUBSUB_MQTT "Enable publish/subscribe with mqtt (experimental)" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_MQTT)
 if(UA_ENABLE_PUBSUB_MQTT)
-    # Warn if run in Windows
-    if(WIN32)
-        MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL")
+    if(NOT UA_FILE_MQTT)
+        set(UA_FILE_MQTT ${open62541_MQTT_DIR}/src/mqtt.c)
     endif()
-    if(NOT UA_ENABLE_PUBSUB)
-    message(FATAL_ERROR "Mqtt cannot be used with disabled PubSub function.")
+    if(NOT EXISTS "${UA_FILE_MQTT}")
+        message(FATAL_ERROR "File ${UA_FILE_MQTT} not found.You probably need to initialize the git submodule for deps/mqtt-c.Therefore execute the following command \ngit submodule update --init --recursive")
+    else()
+        # Warn if run in Windows
+        if(WIN32)
+            MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL")
+        endif()
+        if(NOT UA_ENABLE_PUBSUB)
+        message(FATAL_ERROR "Mqtt cannot be used with disabled PubSub function.")
+        endif()
+        configure_file(${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h "${PROJECT_BINARY_DIR}/src_generated/mqtt.h" COPYONLY)
+        configure_file(${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt_pal.h "${PROJECT_BINARY_DIR}/src_generated/mqtt_pal.h" COPYONLY)
+        configure_file(${PROJECT_SOURCE_DIR}/plugins/mqtt/templates/posix_sockets.h "${PROJECT_BINARY_DIR}/src_generated/posix_sockets.h" COPYONLY)
     endif()
 endif()
 
 option(UA_ENABLE_MQTT_TLS_OPENSSL "Enable TLS support for publish/subscribe with mqtt (use OpenSSL)" OFF)
 mark_as_advanced(UA_ENABLE_MQTT_TLS_OPENSSL)
+option(UA_ENABLE_MQTT_TLS_MBEDTLS "Enable TLS support for publish/subscribe with mqtt (use MBEDTLS)" OFF)
+mark_as_advanced(UA_ENABLE_MQTT_TLS_MBEDTLS)
 
 option(UA_ENABLE_MQTT_TLS "Enable TLS support for publish/subscribe with mqtt" OFF)
 mark_as_advanced(UA_ENABLE_MQTT_TLS)
 if(UA_ENABLE_MQTT_TLS)
-        if(NOT UA_ENABLE_PUBSUB_MQTT)
-            message(FATAL_ERROR "Mqtt with TLS cannot be used without UA_ENABLE_PUBSUB_MQTT.")
-        endif()
+    if(NOT UA_ENABLE_PUBSUB_MQTT)
+        message(FATAL_ERROR "Mqtt with TLS cannot be used without UA_ENABLE_PUBSUB_MQTT.")
+    endif()
+    if(NOT UA_ENABLE_ENCRYPTION)
+        message(FATAL_ERROR "Mqtt with TLS cannot be used without UA_ENABLE_ENCRYPTION.")
+    elseif(UA_ENABLE_ENCRYPTION STREQUAL "OPENSSL")
         set(UA_ENABLE_MQTT_TLS_OPENSSL ON)
-endif()
-
-if(UA_ENABLE_MQTT_TLS_OPENSSL)
-    set(UA_ENABLE_MQTT_TLS ON)
+        add_definitions(-DMQTT_USE_BIO)
+        configure_file(${PROJECT_SOURCE_DIR}/plugins/mqtt/templates/openssl_sockets.h "${PROJECT_BINARY_DIR}/src_generated/openssl_sockets.h" COPYONLY)
+    elseif(UA_ENABLE_ENCRYPTION STREQUAL "MBEDTLS")
+        set(UA_ENABLE_MQTT_TLS_MBEDTLS ON)
+        add_definitions(-DMQTT_USE_MBEDTLS)
+        configure_file(${PROJECT_SOURCE_DIR}/plugins/mqtt/templates/mbedtls_sockets.h "${PROJECT_BINARY_DIR}/src_generated/mbedtls_sockets.h" COPYONLY)
+    else()
+        message(FATAL_ERROR "UA_ENABLE_ENCRYPTION is set to an undefined value")
+    endif()
 endif()
 
 option(UA_ENABLE_STATUSCODE_DESCRIPTIONS "Enable conversion of StatusCode to human-readable error message" ON)
@@ -1090,14 +1111,14 @@ if(UA_ENABLE_PUBSUB)
         if(WIN32)
             MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL")
         else()
-            list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/deps/mqtt-c/mqtt_pal.h
-                                               ${PROJECT_SOURCE_DIR}/deps/mqtt-c/mqtt.h
-                                               ${PROJECT_SOURCE_DIR}/plugins/ua_network_pubsub_mqtt.h
-                                               ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt_adapter.h)
-            list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt_pal.c
-                                               ${PROJECT_SOURCE_DIR}/deps/mqtt-c/mqtt.c
-                                               ${PROJECT_SOURCE_DIR}/plugins/ua_network_pubsub_mqtt.c
-                                               ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt_adapter.c)
+            list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt_pal.h
+                 ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h
+                 ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_mqtt.h
+                 ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.h)
+            list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt_pal.c
+                 ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt.c
+                 ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_mqtt.c
+                 ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.c)
         endif()
     endif()
     if(UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_PUBSUB_BUFMALLOC)
diff --git a/deps/mqtt-c b/deps/mqtt-c
new file mode 160000
index 00000000000..f69ce1e7fd5
--- /dev/null
+++ b/deps/mqtt-c
@@ -0,0 +1 @@
+Subproject commit f69ce1e7fd54f3b1834c9c9137ce0ec5d703cb4d
diff --git a/deps/mqtt-c/mqtt.c b/deps/mqtt-c/mqtt.c
deleted file mode 100644
index 62324d048d7..00000000000
--- a/deps/mqtt-c/mqtt.c
+++ /dev/null
@@ -1,1846 +0,0 @@
-/*
-MIT License
-
-Copyright(c) 2018 Liam Bindle
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "mqtt.h"
-
-/**
- * @file
- * @brief Implements the functionality of MQTT-C.
- * @note The only files that are included are mqtt.h and mqtt_pal.h.
- *
- * @cond Doxygen_Suppress
- */
-
-enum MQTTErrors mqtt_sync(struct mqtt_client *client) {
-    /* Recover from any errors */
-    enum MQTTErrors err;
-    MQTT_PAL_MUTEX_LOCK(&client->mutex);
-    if (client->error != MQTT_OK && client->reconnect_callback != NULL) {
-        client->reconnect_callback(client, &client->reconnect_state);
-        /* unlocked during CONNECT */
-    } else {
-        MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    }
-
-    /* Call inspector callback if necessary */
-
-    if (client->inspector_callback != NULL) {
-        MQTT_PAL_MUTEX_LOCK(&client->mutex);
-        err = client->inspector_callback(client);
-        MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-        if (err != MQTT_OK) return err;
-    }
-
-    /* Call receive */
-    err = (enum MQTTErrors)__mqtt_recv(client);
-    if (err != MQTT_OK) return err;
-
-    /* Call send */
-    err = (enum MQTTErrors)__mqtt_send(client);
-    return err;
-}
-
-uint16_t __mqtt_next_pid(struct mqtt_client *client) {
-    int pid_exists = 0;
-    if (client->pid_lfsr == 0) {
-        client->pid_lfsr = 163u;
-    }
-    /* LFSR taps taken from: https://en.wikipedia.org/wiki/Linear-feedback_shift_register */
-
-    do {
-        struct mqtt_queued_message *curr;
-        unsigned lsb = client->pid_lfsr & 1;
-        (client->pid_lfsr) >>= 1;
-        if (lsb) {
-            client->pid_lfsr ^= 0xB400u;
-        }
-
-
-        /* check that the PID is unique */
-        pid_exists = 0;
-        for(curr = mqtt_mq_get(&(client->mq), 0); curr >= client->mq.queue_tail; --curr) {
-            if (curr->packet_id == client->pid_lfsr) {
-                pid_exists = 1;
-                break;
-            }
-        }
-
-    } while(pid_exists);
-    return client->pid_lfsr;
-}
-
-enum MQTTErrors mqtt_init(struct mqtt_client *client,
-               mqtt_pal_socket_handle sockfd,
-               uint8_t *sendbuf, size_t sendbufsz,
-               uint8_t *recvbuf, size_t recvbufsz,
-               void (*publish_response_callback)(void** state,struct mqtt_response_publish *publish))
-{
-    if (client == NULL || sendbuf == NULL || recvbuf == NULL) {
-        return MQTT_ERROR_NULLPTR;
-    }
-
-    /* initialize mutex */
-    MQTT_PAL_MUTEX_INIT(&client->mutex);
-    MQTT_PAL_MUTEX_LOCK(&client->mutex); /* unlocked during CONNECT */
-
-    client->socketfd = sockfd;
-
-    mqtt_mq_init(&client->mq, sendbuf, sendbufsz);
-
-    client->recv_buffer.mem_start = recvbuf;
-    client->recv_buffer.mem_size = recvbufsz;
-    client->recv_buffer.curr = client->recv_buffer.mem_start;
-    client->recv_buffer.curr_sz = client->recv_buffer.mem_size;
-
-    client->error = MQTT_ERROR_CONNECT_NOT_CALLED;
-    client->response_timeout = 30;
-    client->number_of_timeouts = 0;
-    client->number_of_keep_alives = 0;
-    client->typical_response_time = -1.0;
-    client->publish_response_callback = publish_response_callback;
-    client->pid_lfsr = 0;
-    client->send_offset = 0;
-
-    client->inspector_callback = NULL;
-    client->reconnect_callback = NULL;
-    client->reconnect_state = NULL;
-
-    return MQTT_OK;
-}
-
-void mqtt_init_reconnect(struct mqtt_client *client,
-                         void (*reconnect)(struct mqtt_client *, void**),
-                         void *reconnect_state,
-                         void (*publish_response_callback)(void** state, struct mqtt_response_publish *publish))
-{
-    /* initialize mutex */
-    MQTT_PAL_MUTEX_INIT(&client->mutex);
-
-    client->socketfd = (mqtt_pal_socket_handle) -1;
-
-    mqtt_mq_init(&client->mq, NULL, 0);
-
-    client->recv_buffer.mem_start = NULL;
-    client->recv_buffer.mem_size = 0;
-    client->recv_buffer.curr = NULL;
-    client->recv_buffer.curr_sz = 0;
-
-    client->error = MQTT_ERROR_INITIAL_RECONNECT;
-    client->response_timeout = 30;
-    client->number_of_timeouts = 0;
-    client->number_of_keep_alives = 0;
-    client->typical_response_time = -1.0;
-    client->publish_response_callback = publish_response_callback;
-    client->send_offset = 0;
-
-    client->inspector_callback = NULL;
-    client->reconnect_callback = reconnect;
-    client->reconnect_state = reconnect_state;
-}
-
-void mqtt_reinit(struct mqtt_client* client,
-                 mqtt_pal_socket_handle socketfd,
-                 uint8_t *sendbuf, size_t sendbufsz,
-                 uint8_t *recvbuf, size_t recvbufsz)
-{
-    client->error = MQTT_ERROR_CONNECT_NOT_CALLED;
-    client->socketfd = socketfd;
-
-    mqtt_mq_init(&client->mq, sendbuf, sendbufsz);
-
-    client->recv_buffer.mem_start = recvbuf;
-    client->recv_buffer.mem_size = recvbufsz;
-    client->recv_buffer.curr = client->recv_buffer.mem_start;
-    client->recv_buffer.curr_sz = client->recv_buffer.mem_size;
-}
-
-/**
- * A macro function that:
- *      1) Checks that the client isn't in an error state.
- *      2) Attempts to pack to client's message queue.
- *          a) handles errors
- *          b) if mq buffer is too small, cleans it and tries again
- *      3) Upon successful pack, registers the new message.
- */
-#define MQTT_CLIENT_TRY_PACK(tmp, msg, client, pack_call, release)  \
-    if (client->error < 0) {                                        \
-        if (release) MQTT_PAL_MUTEX_UNLOCK(&client->mutex);         \
-        return client->error;                                       \
-    }                                                               \
-    tmp = pack_call;                                                \
-    if (tmp < 0) {                                                  \
-        client->error = (enum MQTTErrors)tmp;                                        \
-        if (release) MQTT_PAL_MUTEX_UNLOCK(&client->mutex);         \
-        return (enum MQTTErrors)tmp;                                                 \
-    } else if (tmp == 0) {                                          \
-        mqtt_mq_clean(&client->mq);                                 \
-        tmp = pack_call;                                            \
-        if (tmp < 0) {                                              \
-            client->error = (enum MQTTErrors)tmp;                                    \
-            if (release) MQTT_PAL_MUTEX_UNLOCK(&client->mutex);     \
-            return (enum MQTTErrors)tmp;                                             \
-        } else if(tmp == 0) {                                       \
-            client->error = MQTT_ERROR_SEND_BUFFER_IS_FULL;         \
-            if (release) MQTT_PAL_MUTEX_UNLOCK(&client->mutex);     \
-            return (enum MQTTErrors)MQTT_ERROR_SEND_BUFFER_IS_FULL;                  \
-        }                                                           \
-    }                                                               \
-    msg = mqtt_mq_register(&client->mq, (size_t)tmp);                       \
-
-
-enum MQTTErrors mqtt_connect(struct mqtt_client *client,
-                             const char* client_id,
-                             const char* will_topic,
-                             const void* will_message,
-                             size_t will_message_size,
-                             const char* user_name,
-                             const char* password,
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-                             const char* caFilePath,
-                             const char* caPath,
-                             const char* clientCertPath,
-                             const char* clientKeyPath,
-                             bool useTLS,
-#endif
-                             uint8_t connect_flags,
-                             uint16_t keep_alive)
-{
-    ssize_t rv;
-    struct mqtt_queued_message *msg;
-
-    /* Note: Current thread already has mutex locked. */
-
-    /* update the client's state */
-    client->keep_alive = keep_alive;
-    if (client->error == MQTT_ERROR_CONNECT_NOT_CALLED) {
-        client->error = MQTT_OK;
-    }
-
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(rv, msg, client,
-                         mqtt_pack_connection_request(client->mq.curr, client->mq.curr_sz,
-                                                      client_id, will_topic, will_message,
-                                                      will_message_size,user_name, password,
-                                                      caFilePath, caPath,
-                                                      clientCertPath, clientKeyPath,
-                                                      useTLS,
-                                                      connect_flags, keep_alive), 1);
-#else
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(rv, msg, client,
-                         mqtt_pack_connection_request(client->mq.curr, client->mq.curr_sz,
-                                                      client_id, will_topic, will_message,
-                                                      will_message_size,user_name, password,
-                                                      connect_flags, keep_alive), 1);
-#endif
-
-    /* save the control type of the message */
-    msg->control_type = MQTT_CONTROL_CONNECT;
-
-    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    return MQTT_OK;
-}
-
-enum MQTTErrors mqtt_publish(struct mqtt_client *client,
-                     const char* topic_name,
-                     void* application_message,
-                     size_t application_message_size,
-                     uint8_t publish_flags)
-{
-    struct mqtt_queued_message *msg;
-    ssize_t rv;
-    uint16_t packet_id;
-    MQTT_PAL_MUTEX_LOCK(&client->mutex);
-    packet_id = __mqtt_next_pid(client);
-
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_publish_request(
-            client->mq.curr, client->mq.curr_sz,
-            topic_name,
-            packet_id,
-            application_message,
-            application_message_size,
-            publish_flags
-        ),
-        1
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_PUBLISH;
-    msg->packet_id = packet_id;
-
-    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    return MQTT_OK;
-}
-
-ssize_t __mqtt_puback(struct mqtt_client *client, uint16_t packet_id) {
-    ssize_t rv;
-    struct mqtt_queued_message *msg;
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_pubxxx_request(
-            client->mq.curr, client->mq.curr_sz,
-            MQTT_CONTROL_PUBACK,
-            packet_id
-        ),
-        0
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_PUBACK;
-    msg->packet_id = packet_id;
-
-    return MQTT_OK;
-}
-
-ssize_t __mqtt_pubrec(struct mqtt_client *client, uint16_t packet_id) {
-    ssize_t rv;
-    struct mqtt_queued_message *msg;
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_pubxxx_request(
-            client->mq.curr, client->mq.curr_sz,
-            MQTT_CONTROL_PUBREC,
-            packet_id
-        ),
-        0
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_PUBREC;
-    msg->packet_id = packet_id;
-
-    return MQTT_OK;
-}
-
-ssize_t __mqtt_pubrel(struct mqtt_client *client, uint16_t packet_id) {
-    ssize_t rv;
-    struct mqtt_queued_message *msg;
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_pubxxx_request(
-            client->mq.curr, client->mq.curr_sz,
-            MQTT_CONTROL_PUBREL,
-            packet_id
-        ),
-        0
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_PUBREL;
-    msg->packet_id = packet_id;
-
-    return MQTT_OK;
-}
-
-ssize_t __mqtt_pubcomp(struct mqtt_client *client, uint16_t packet_id) {
-    ssize_t rv;
-    struct mqtt_queued_message *msg;
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_pubxxx_request(
-            client->mq.curr, client->mq.curr_sz,
-            MQTT_CONTROL_PUBCOMP,
-            packet_id
-        ),
-        0
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_PUBCOMP;
-    msg->packet_id = packet_id;
-
-    return MQTT_OK;
-}
-
-enum MQTTErrors mqtt_subscribe(struct mqtt_client *client,
-                       const char* topic_name,
-                       int max_qos_level)
-{
-    ssize_t rv;
-    uint16_t packet_id;
-    struct mqtt_queued_message *msg;
-    MQTT_PAL_MUTEX_LOCK(&client->mutex);
-    packet_id = __mqtt_next_pid(client);
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_subscribe_request(
-            client->mq.curr, client->mq.curr_sz,
-            packet_id,
-            topic_name,
-            max_qos_level,
-            (const char*)NULL
-        ),
-        1
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_SUBSCRIBE;
-    msg->packet_id = packet_id;
-
-    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    return MQTT_OK;
-}
-
-enum MQTTErrors mqtt_unsubscribe(struct mqtt_client *client,
-                         const char* topic_name)
-{
-    uint16_t packet_id = __mqtt_next_pid(client);
-    ssize_t rv;
-    struct mqtt_queued_message *msg;
-    MQTT_PAL_MUTEX_LOCK(&client->mutex);
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_unsubscribe_request(
-            client->mq.curr, client->mq.curr_sz,
-            packet_id,
-            topic_name,
-            (const char*)NULL
-        ),
-        1
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_UNSUBSCRIBE;
-    msg->packet_id = packet_id;
-
-    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    return MQTT_OK;
-}
-
-enum MQTTErrors mqtt_ping(struct mqtt_client *client) {
-    enum MQTTErrors rv;
-    MQTT_PAL_MUTEX_LOCK(&client->mutex);
-    rv = __mqtt_ping(client);
-    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    return rv;
-}
-
-enum MQTTErrors __mqtt_ping(struct mqtt_client *client)
-{
-    ssize_t rv;
-    struct mqtt_queued_message *msg;
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_ping_request(
-            client->mq.curr, client->mq.curr_sz
-        ),
-        0
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_PINGREQ;
-
-
-    return MQTT_OK;
-}
-
-enum MQTTErrors mqtt_disconnect(struct mqtt_client *client)
-{
-    ssize_t rv;
-    struct mqtt_queued_message *msg;
-    MQTT_PAL_MUTEX_LOCK(&client->mutex);
-
-    /* try to pack the message */
-    MQTT_CLIENT_TRY_PACK(
-        rv, msg, client,
-        mqtt_pack_disconnect(
-            client->mq.curr, client->mq.curr_sz
-        ),
-        1
-    );
-    /* save the control type and packet id of the message */
-    msg->control_type = MQTT_CONTROL_DISCONNECT;
-
-    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    return MQTT_OK;
-}
-
-ssize_t __mqtt_send(struct mqtt_client *client)
-{
-    uint8_t inspected;
-    ssize_t len;
-    int inflight_qos2 = 0;
-    int i = 0;
-
-    MQTT_PAL_MUTEX_LOCK(&client->mutex);
-
-    if (client->error < 0 && client->error != MQTT_ERROR_SEND_BUFFER_IS_FULL) {
-        MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-        return client->error;
-    }
-
-    /* loop through all messages in the queue */
-    len = mqtt_mq_length(&client->mq);
-    for(; i < len; ++i) {
-        struct mqtt_queued_message *msg = mqtt_mq_get(&client->mq, i);
-        int resend = 0;
-        if (msg->state == MQTT_QUEUED_UNSENT) {
-            /* message has not been sent to lets send it */
-            resend = 1;
-        } else if (msg->state == MQTT_QUEUED_AWAITING_ACK) {
-            /* check for timeout */
-            if (MQTT_PAL_TIME() > msg->time_sent + client->response_timeout) {
-                resend = 1;
-                client->number_of_timeouts += 1;
-                client->send_offset = 0;
-            }
-        }
-
-        /* only send QoS 2 message if there are no inflight QoS 2 PUBLISH messages */
-        if (msg->control_type == MQTT_CONTROL_PUBLISH
-            && (msg->state == MQTT_QUEUED_UNSENT || msg->state == MQTT_QUEUED_AWAITING_ACK))
-        {
-            inspected = 0x03 & ((msg->start[0]) >> 1); /* qos */
-            if (inspected == 2) {
-                if (inflight_qos2) {
-                    resend = 0;
-                }
-                inflight_qos2 = 1;
-            }
-        }
-
-        /* goto next message if we don't need to send */
-        if (!resend) {
-            continue;
-        }
-
-        /* we're sending the message */
-        {
-          ssize_t tmp = mqtt_pal_sendall(client->socketfd, msg->start + client->send_offset, msg->size - client->send_offset, 0);
-          if (tmp < 0) {
-            client->error = (enum MQTTErrors)tmp;
-            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-            return tmp;
-          } else {
-            client->send_offset += (unsigned long)tmp;
-            if(client->send_offset < msg->size) {
-              /* partial sent. Await additional calls */
-              break;
-            } else {
-              /* whole message has been sent */
-              client->send_offset = 0;
-            }
-
-          }
-
-        }
-
-        /* update timeout watcher */
-        client->time_of_last_send = MQTT_PAL_TIME();
-        msg->time_sent = client->time_of_last_send;
-
-        /*
-        Determine the state to put the message in.
-        Control Types:
-        MQTT_CONTROL_CONNECT     -> awaiting
-        MQTT_CONTROL_CONNACK     -> n/a
-        MQTT_CONTROL_PUBLISH     -> qos == 0 ? complete : awaiting
-        MQTT_CONTROL_PUBACK      -> complete
-        MQTT_CONTROL_PUBREC      -> awaiting
-        MQTT_CONTROL_PUBREL      -> awaiting
-        MQTT_CONTROL_PUBCOMP     -> complete
-        MQTT_CONTROL_SUBSCRIBE   -> awaiting
-        MQTT_CONTROL_SUBACK      -> n/a
-        MQTT_CONTROL_UNSUBSCRIBE -> awaiting
-        MQTT_CONTROL_UNSUBACK    -> n/a
-        MQTT_CONTROL_PINGREQ     -> awaiting
-        MQTT_CONTROL_PINGRESP    -> n/a
-        MQTT_CONTROL_DISCONNECT  -> complete
-        */
-        switch (msg->control_type) {
-        case MQTT_CONTROL_PUBACK:
-        case MQTT_CONTROL_PUBCOMP:
-        case MQTT_CONTROL_DISCONNECT:
-            msg->state = MQTT_QUEUED_COMPLETE;
-            break;
-        case MQTT_CONTROL_PUBLISH:
-            inspected = ( MQTT_PUBLISH_QOS_MASK & (msg->start[0]) ) >> 1; /* qos */
-            if (inspected == 0) {
-                msg->state = MQTT_QUEUED_COMPLETE;
-            } else if (inspected == 1) {
-                msg->state = MQTT_QUEUED_AWAITING_ACK;
-                /*set DUP flag for subsequent sends [Spec MQTT-3.3.1-1] */
-                msg->start[0] |= MQTT_PUBLISH_DUP;
-            } else {
-                msg->state = MQTT_QUEUED_AWAITING_ACK;
-            }
-            break;
-        case MQTT_CONTROL_CONNECT:
-        case MQTT_CONTROL_PUBREC:
-        case MQTT_CONTROL_PUBREL:
-        case MQTT_CONTROL_SUBSCRIBE:
-        case MQTT_CONTROL_UNSUBSCRIBE:
-        case MQTT_CONTROL_PINGREQ:
-            msg->state = MQTT_QUEUED_AWAITING_ACK;
-            break;
-        default:
-            client->error = MQTT_ERROR_MALFORMED_REQUEST;
-            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-            return MQTT_ERROR_MALFORMED_REQUEST;
-        }
-    }
-
-    /* check for keep-alive */
-    {
-        mqtt_pal_time_t keep_alive_timeout = client->time_of_last_send + (mqtt_pal_time_t)((float)(client->keep_alive) * 0.75);
-        if (MQTT_PAL_TIME() > keep_alive_timeout) {
-          ssize_t rv = mqtt_ping(client);
-          if (rv != MQTT_OK) {
-            client->error = (enum MQTTErrors)rv;
-            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-            return rv;
-          }
-        }
-    }
-
-    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    return MQTT_OK;
-}
-
-ssize_t __mqtt_recv(struct mqtt_client *client)
-{
-    struct mqtt_response response;
-    ssize_t mqtt_recv_ret = MQTT_OK;
-    MQTT_PAL_MUTEX_LOCK(&client->mutex);
-
-    /* read until there is nothing left to read, or there was an error */
-    while(mqtt_recv_ret == MQTT_OK) {
-        /* read in as many bytes as possible */
-        ssize_t rv, consumed;
-        struct mqtt_queued_message *msg = NULL;
-
-        rv = mqtt_pal_recvall(client->socketfd, client->recv_buffer.curr, client->recv_buffer.curr_sz, 0);
-        if (rv < 0) {
-            /* an error occurred */
-            client->error = (enum MQTTErrors)rv;
-            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-            return rv;
-        } else {
-            client->recv_buffer.curr += rv;
-            client->recv_buffer.curr_sz -= (unsigned long)rv;
-        }
-
-        /* attempt to parse */
-        consumed = mqtt_unpack_response(&response, client->recv_buffer.mem_start,
-            (size_t)(client->recv_buffer.curr - client->recv_buffer.mem_start));
-
-        if (consumed < 0) {
-            client->error = (enum MQTTErrors)consumed;
-            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-            return consumed;
-        } else if (consumed == 0) {
-            /* if curr_sz is 0 then the buffer is too small to ever fit the message */
-            if (client->recv_buffer.curr_sz == 0) {
-                client->error = MQTT_ERROR_RECV_BUFFER_TOO_SMALL;
-                MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-                return MQTT_ERROR_RECV_BUFFER_TOO_SMALL;
-            }
-
-            /* just need to wait for the rest of the data */
-            MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-            return MQTT_OK;
-        }
-
-        /* response was unpacked successfully */
-
-        /*
-        The switch statement below manages how the client responds to messages from the broker.
-
-        Control Types (that we expect to receive from the broker):
-        MQTT_CONTROL_CONNACK:
-            -> release associated CONNECT
-            -> handle response
-        MQTT_CONTROL_PUBLISH:
-            -> stage response, none if qos==0, PUBACK if qos==1, PUBREC if qos==2
-            -> call publish callback
-        MQTT_CONTROL_PUBACK:
-            -> release associated PUBLISH
-        MQTT_CONTROL_PUBREC:
-            -> release PUBLISH
-            -> stage PUBREL
-        MQTT_CONTROL_PUBREL:
-            -> release associated PUBREC
-            -> stage PUBCOMP
-        MQTT_CONTROL_PUBCOMP:
-            -> release PUBREL
-        MQTT_CONTROL_SUBACK:
-            -> release SUBSCRIBE
-            -> handle response
-        MQTT_CONTROL_UNSUBACK:
-            -> release UNSUBSCRIBE
-        MQTT_CONTROL_PINGRESP:
-            -> release PINGREQ
-        */
-        switch (response.fixed_header.control_type) {
-            case MQTT_CONTROL_CONNACK:
-                /* release associated CONNECT */
-                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_CONNECT, NULL);
-                if (msg == NULL) {
-                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    break;
-                }
-                msg->state = MQTT_QUEUED_COMPLETE;
-                /* initialize typical response time */
-                client->typical_response_time = (double) (MQTT_PAL_TIME() - msg->time_sent);
-                /* check that connection was successful */
-                if (response.decoded.connack.return_code != MQTT_CONNACK_ACCEPTED) {
-                    if (response.decoded.connack.return_code == MQTT_CONNACK_REFUSED_IDENTIFIER_REJECTED) {
-                        client->error = MQTT_ERROR_CONNECT_CLIENT_ID_REFUSED;
-                        mqtt_recv_ret = MQTT_ERROR_CONNECT_CLIENT_ID_REFUSED;
-                    } else {
-                        client->error = MQTT_ERROR_CONNECTION_REFUSED;
-                        mqtt_recv_ret = MQTT_ERROR_CONNECTION_REFUSED;
-                    }
-                    break;
-                }
-                break;
-            case MQTT_CONTROL_PUBLISH:
-                /* stage response, none if qos==0, PUBACK if qos==1, PUBREC if qos==2 */
-                if (response.decoded.publish.qos_level == 1) {
-                    rv = __mqtt_puback(client, response.decoded.publish.packet_id);
-                    if (rv != MQTT_OK) {
-                        client->error = (enum MQTTErrors)rv;
-                        mqtt_recv_ret = rv;
-                        break;
-                    }
-                } else if (response.decoded.publish.qos_level == 2) {
-                    /* check if this is a duplicate */
-                    if (mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBREC, &response.decoded.publish.packet_id) != NULL) {
-                        break;
-                    }
-
-                    rv = __mqtt_pubrec(client, response.decoded.publish.packet_id);
-                    if (rv != MQTT_OK) {
-                        client->error = (enum MQTTErrors)rv;
-                        mqtt_recv_ret = rv;
-                        break;
-                    }
-                }
-                /* call publish callback */
-                client->publish_response_callback(&client->publish_response_callback_state, &response.decoded.publish);
-                break;
-            case MQTT_CONTROL_PUBACK:
-                /* release associated PUBLISH */
-                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBLISH, &response.decoded.puback.packet_id);
-                if (msg == NULL) {
-                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    break;
-                }
-                msg->state = MQTT_QUEUED_COMPLETE;
-                /* update response time */
-                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
-                break;
-            case MQTT_CONTROL_PUBREC:
-                /* check if this is a duplicate */
-                if (mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBREL, &response.decoded.pubrec.packet_id) != NULL) {
-                    break;
-                }
-                /* release associated PUBLISH */
-                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBLISH, &response.decoded.pubrec.packet_id);
-                if (msg == NULL) {
-                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    break;
-                }
-                msg->state = MQTT_QUEUED_COMPLETE;
-                /* update response time */
-                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
-                /* stage PUBREL */
-                rv = __mqtt_pubrel(client, response.decoded.pubrec.packet_id);
-                if (rv != MQTT_OK) {
-                    client->error = (enum MQTTErrors)rv;
-                    mqtt_recv_ret = rv;
-                    break;
-                }
-                break;
-            case MQTT_CONTROL_PUBREL:
-                /* release associated PUBREC */
-                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBREC, &response.decoded.pubrel.packet_id);
-                if (msg == NULL) {
-                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    break;
-                }
-                msg->state = MQTT_QUEUED_COMPLETE;
-                /* update response time */
-                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
-                /* stage PUBCOMP */
-                rv = __mqtt_pubcomp(client, response.decoded.pubrec.packet_id);
-                if (rv != MQTT_OK) {
-                    client->error = (enum MQTTErrors)rv;
-                    mqtt_recv_ret = rv;
-                    break;
-                }
-                break;
-            case MQTT_CONTROL_PUBCOMP:
-                /* release associated PUBREL */
-                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PUBREL, &response.decoded.pubcomp.packet_id);
-                if (msg == NULL) {
-                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    break;
-                }
-                msg->state = MQTT_QUEUED_COMPLETE;
-                /* update response time */
-                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
-                break;
-            case MQTT_CONTROL_SUBACK:
-                /* release associated SUBSCRIBE */
-                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_SUBSCRIBE, &response.decoded.suback.packet_id);
-                if (msg == NULL) {
-                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    break;
-                }
-                msg->state = MQTT_QUEUED_COMPLETE;
-                /* update response time */
-                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
-                /* check that subscription was successful (not currently only one subscribe at a time) */
-                if (response.decoded.suback.return_codes[0] == MQTT_SUBACK_FAILURE) {
-                    client->error = MQTT_ERROR_SUBSCRIBE_FAILED;
-                    mqtt_recv_ret = MQTT_ERROR_SUBSCRIBE_FAILED;
-                    break;
-                }
-                break;
-            case MQTT_CONTROL_UNSUBACK:
-                /* release associated UNSUBSCRIBE */
-                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_UNSUBSCRIBE, &response.decoded.unsuback.packet_id);
-                if (msg == NULL) {
-                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    break;
-                }
-                msg->state = MQTT_QUEUED_COMPLETE;
-                /* update response time */
-                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
-                break;
-            case MQTT_CONTROL_PINGRESP:
-                /* release associated PINGREQ */
-                msg = mqtt_mq_find(&client->mq, MQTT_CONTROL_PINGREQ, NULL);
-                if (msg == NULL) {
-                    client->error = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    mqtt_recv_ret = MQTT_ERROR_ACK_OF_UNKNOWN;
-                    break;
-                }
-                msg->state = MQTT_QUEUED_COMPLETE;
-                /* update response time */
-                client->typical_response_time = 0.875 * (client->typical_response_time) + 0.125 * (double) (MQTT_PAL_TIME() - msg->time_sent);
-                break;
-            default:
-                client->error = MQTT_ERROR_MALFORMED_RESPONSE;
-                mqtt_recv_ret = MQTT_ERROR_MALFORMED_RESPONSE;
-                break;
-        }
-        {
-          /* we've handled the response, now clean the buffer */
-          void* dest = (unsigned char*)client->recv_buffer.mem_start;
-          void* src  = (unsigned char*)client->recv_buffer.mem_start + consumed;
-          size_t n = (size_t)(client->recv_buffer.curr - client->recv_buffer.mem_start -
-                              consumed);
-          memmove(dest, src, n);
-          client->recv_buffer.curr -= consumed;
-          client->recv_buffer.curr_sz += (unsigned long)consumed;
-        }
-    }
-
-    /* In case there was some error handling the (well formed) message, we end up here */
-    MQTT_PAL_MUTEX_UNLOCK(&client->mutex);
-    return mqtt_recv_ret;
-}
-
-/* FIXED HEADER */
-
-#define MQTT_BITFIELD_RULE_VIOLOATION(bitfield, rule_value, rule_mask) ((bitfield ^ rule_value) & rule_mask)
-
-struct mqtt_fixed_header_rules_s{
-    const uint8_t control_type_is_valid[16];
-    const uint8_t required_flags[16];
-    const uint8_t mask_required_flags[16];
-} ;
-
-struct mqtt_fixed_header_rules_s mqtt_fixed_header_rules =
-{
-    {   /* boolean value, true if type is valid */
-        0x00, /* MQTT_CONTROL_RESERVED */
-        0x01, /* MQTT_CONTROL_CONNECT */
-        0x01, /* MQTT_CONTROL_CONNACK */
-        0x01, /* MQTT_CONTROL_PUBLISH */
-        0x01, /* MQTT_CONTROL_PUBACK */
-        0x01, /* MQTT_CONTROL_PUBREC */
-        0x01, /* MQTT_CONTROL_PUBREL */
-        0x01, /* MQTT_CONTROL_PUBCOMP */
-        0x01, /* MQTT_CONTROL_SUBSCRIBE */
-        0x01, /* MQTT_CONTROL_SUBACK */
-        0x01, /* MQTT_CONTROL_UNSUBSCRIBE */
-        0x01, /* MQTT_CONTROL_UNSUBACK */
-        0x01, /* MQTT_CONTROL_PINGREQ */
-        0x01, /* MQTT_CONTROL_PINGRESP */
-        0x01, /* MQTT_CONTROL_DISCONNECT */
-        0x00  /* MQTT_CONTROL_RESERVED */
-    },
-    {   /* flags that must be set for the associated control type */
-        0x00, /* MQTT_CONTROL_RESERVED */
-        0x00, /* MQTT_CONTROL_CONNECT */
-        0x00, /* MQTT_CONTROL_CONNACK */
-        0x00, /* MQTT_CONTROL_PUBLISH */
-        0x00, /* MQTT_CONTROL_PUBACK */
-        0x00, /* MQTT_CONTROL_PUBREC */
-        0x02, /* MQTT_CONTROL_PUBREL */
-        0x00, /* MQTT_CONTROL_PUBCOMP */
-        0x02, /* MQTT_CONTROL_SUBSCRIBE */
-        0x00, /* MQTT_CONTROL_SUBACK */
-        0x02, /* MQTT_CONTROL_UNSUBSCRIBE */
-        0x00, /* MQTT_CONTROL_UNSUBACK */
-        0x00, /* MQTT_CONTROL_PINGREQ */
-        0x00, /* MQTT_CONTROL_PINGRESP */
-        0x00, /* MQTT_CONTROL_DISCONNECT */
-        0x00  /* MQTT_CONTROL_RESERVED */
-    },
-    {   /* mask of flags that must be specific values for the associated control type*/
-        0x00, /* MQTT_CONTROL_RESERVED */
-        0x0F, /* MQTT_CONTROL_CONNECT */
-        0x0F, /* MQTT_CONTROL_CONNACK */
-        0x00, /* MQTT_CONTROL_PUBLISH */
-        0x0F, /* MQTT_CONTROL_PUBACK */
-        0x0F, /* MQTT_CONTROL_PUBREC */
-        0x0F, /* MQTT_CONTROL_PUBREL */
-        0x0F, /* MQTT_CONTROL_PUBCOMP */
-        0x0F, /* MQTT_CONTROL_SUBSCRIBE */
-        0x0F, /* MQTT_CONTROL_SUBACK */
-        0x0F, /* MQTT_CONTROL_UNSUBSCRIBE */
-        0x0F, /* MQTT_CONTROL_UNSUBACK */
-        0x0F, /* MQTT_CONTROL_PINGREQ */
-        0x0F, /* MQTT_CONTROL_PINGRESP */
-        0x0F, /* MQTT_CONTROL_DISCONNECT */
-        0x00  /* MQTT_CONTROL_RESERVED */
-    }
-};
-
-static ssize_t mqtt_fixed_header_rule_violation(const struct mqtt_fixed_header *fixed_header) {
-    uint8_t control_type;
-    uint8_t control_flags;
-    uint8_t required_flags;
-    uint8_t mask_required_flags;
-
-    /* get value and rules */
-    control_type = (uint8_t)fixed_header->control_type;
-    control_flags = fixed_header->control_flags;
-    required_flags = mqtt_fixed_header_rules.required_flags[control_type];
-    mask_required_flags = mqtt_fixed_header_rules.mask_required_flags[control_type];
-
-    /* check for valid type */
-    if (!mqtt_fixed_header_rules.control_type_is_valid[control_type]) {
-        return MQTT_ERROR_CONTROL_FORBIDDEN_TYPE;
-    }
-
-    /* check that flags are appropriate */
-    if(MQTT_BITFIELD_RULE_VIOLOATION(control_flags, required_flags, mask_required_flags)) {
-        return MQTT_ERROR_CONTROL_INVALID_FLAGS;
-    }
-
-    return 0;
-}
-
-ssize_t mqtt_unpack_fixed_header(struct mqtt_response *response, const uint8_t *buf, size_t bufsz) {
-    struct mqtt_fixed_header *fixed_header;
-    const uint8_t *start = buf;
-    int lshift;
-    ssize_t errcode;
-
-    /* check for null pointers or empty buffer */
-    if (response == NULL || buf == NULL) {
-        return MQTT_ERROR_NULLPTR;
-    }
-    fixed_header = &(response->fixed_header);
-
-    /* check that bufsz is not zero */
-    if (bufsz == 0) return 0;
-
-    /* parse control type and flags */
-    fixed_header->control_type  = (enum MQTTControlPacketType)(*buf >> 4);
-    fixed_header->control_flags = (uint8_t)(*buf & 0x0F);
-
-    /* parse remaining size */
-    fixed_header->remaining_length = 0;
-
-    lshift = 0;
-    do {
-
-        /* MQTT spec (2.2.3) says the maximum length is 28 bits */
-        if(lshift == 28)
-            return MQTT_ERROR_INVALID_REMAINING_LENGTH;
-
-        /* consume byte and assert at least 1 byte left */
-        --bufsz;
-        ++buf;
-        if (bufsz == 0) return 0;
-
-        /* parse next byte*/
-        fixed_header->remaining_length += (uint32_t)((*buf & 0x7F) << lshift);
-        lshift += 7;
-    } while(*buf & 0x80); /* while continue bit is set */
-
-    /* consume last byte */
-    --bufsz;
-    ++buf;
-
-    /* check that the fixed header is valid */
-    errcode = mqtt_fixed_header_rule_violation(fixed_header);
-    if (errcode) {
-        return errcode;
-    }
-
-    /* check that the buffer size if GT remaining length */
-    if (bufsz < fixed_header->remaining_length) {
-        return 0;
-    }
-
-    /* return how many bytes were consumed */
-    return buf - start;
-}
-
-ssize_t mqtt_pack_fixed_header(uint8_t *buf, size_t bufsz, const struct mqtt_fixed_header *fixed_header) {
-    const uint8_t *start = buf;
-    ssize_t errcode;
-    uint32_t remaining_length;
-
-    /* check for null pointers or empty buffer */
-    if (fixed_header == NULL || buf == NULL) {
-        return MQTT_ERROR_NULLPTR;
-    }
-
-    /* check that the fixed header is valid */
-    errcode = mqtt_fixed_header_rule_violation(fixed_header);
-    if (errcode) {
-        return errcode;
-    }
-
-    /* check that bufsz is not zero */
-    if (bufsz == 0) return 0;
-
-    /* pack control type and flags */
-    *buf =  (uint8_t)((((uint8_t) fixed_header->control_type) << 4) & 0xF0);
-    *buf = (uint8_t)(*buf | (((uint8_t) fixed_header->control_flags)       & 0x0F));
-
-    remaining_length = fixed_header->remaining_length;
-
-    /* MQTT spec (2.2.3) says maximum remaining length is 2^28-1 */
-    if(remaining_length >= 256*1024*1024)
-        return MQTT_ERROR_INVALID_REMAINING_LENGTH;
-
-    do {
-        /* consume byte and assert at least 1 byte left */
-        --bufsz;
-        ++buf;
-        if (bufsz == 0) return 0;
-
-        /* pack next byte */
-        *buf  = remaining_length & 0x7F;
-        if(remaining_length > 127) *buf |= 0x80;
-        remaining_length = remaining_length >> 7;
-    } while(*buf & 0x80);
-
-    /* consume last byte */
-    --bufsz;
-    ++buf;
-
-    /* check that there's still enough space in buffer for packet */
-    if (bufsz < fixed_header->remaining_length) {
-        return 0;
-    }
-
-    /* return how many bytes were consumed */
-    return buf - start;
-}
-
-/* CONNECT */
-ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
-                                     const char* client_id,
-                                     const char* will_topic,
-                                     const void* will_message,
-                                     size_t will_message_size,
-                                     const char* user_name,
-                                     const char* password,
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-                                     const char* caFilePath,
-                                     const char* caPath,
-                                     const char* clientCertPath,
-                                     const char* clientKeyPath,
-                                     const bool useTLS,
-#endif
-                                     uint8_t connect_flags,
-                                     uint16_t keep_alive)
-{
-    struct mqtt_fixed_header fixed_header;
-    size_t remaining_length;
-    const uint8_t *const start = buf;
-    ssize_t rv;
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    char strTLS[2];
-#endif
-    /* pack the fixed headr */
-    fixed_header.control_type = MQTT_CONTROL_CONNECT;
-    fixed_header.control_flags = 0x00;
-
-    /* calculate remaining length and build connect_flags at the same time */
-    connect_flags = (uint8_t)(connect_flags & ~MQTT_CONNECT_RESERVED);
-    remaining_length = 10; /* size of variable header */
-
-    if (client_id == NULL) {
-        client_id = "";
-    }
-    /* For an empty client_id, a clean session is required */
-    if (client_id[0] == '\0' && !(connect_flags & MQTT_CONNECT_CLEAN_SESSION)) {
-        return MQTT_ERROR_CLEAN_SESSION_IS_REQUIRED;
-    }
-    /* mqtt_string length is strlen + 2 */
-    remaining_length += __mqtt_packed_cstrlen(client_id);
-
-    if (will_topic != NULL) {
-        uint8_t temp;
-        /* there is a will */
-        connect_flags |= MQTT_CONNECT_WILL_FLAG;
-        remaining_length += __mqtt_packed_cstrlen(will_topic);
-
-        if (will_message == NULL) {
-            /* if there's a will there MUST be a will message */
-            return MQTT_ERROR_CONNECT_NULL_WILL_MESSAGE;
-        }
-        remaining_length += 2 + will_message_size; /* size of will_message */
-
-        /* assert that the will QOS is valid (i.e. not 3) */
-        temp = connect_flags & 0x18; /* mask to QOS */
-        if (temp == 0x18) {
-            /* bitwise equality with QoS 3 (invalid)*/
-            return MQTT_ERROR_CONNECT_FORBIDDEN_WILL_QOS;
-        }
-    } else {
-        /* there is no will so set all will flags to zero */
-        connect_flags &= (uint8_t)~MQTT_CONNECT_WILL_FLAG;
-        connect_flags &= (uint8_t)~0x18;
-        connect_flags &= (uint8_t)~MQTT_CONNECT_WILL_RETAIN;
-    }
-
-    if (user_name != NULL) {
-        /* a user name is present */
-        connect_flags |= MQTT_CONNECT_USER_NAME;
-        remaining_length += (uint32_t)__mqtt_packed_cstrlen(user_name);
-    } else {
-        connect_flags &= (uint8_t)~MQTT_CONNECT_USER_NAME;
-    }
-
-    if (password != NULL) {
-        /* a password is present */
-        connect_flags |= MQTT_CONNECT_PASSWORD;
-        remaining_length += (uint32_t)__mqtt_packed_cstrlen(password);
-    } else {
-        connect_flags &= (uint8_t)~MQTT_CONNECT_PASSWORD;
-    }
-
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    if (useTLS) {
-        if (caFilePath != NULL) {
-            /* a caFilePath is present */
-            connect_flags |= (uint8_t)MQTT_CONNECT_CAFILEPATH;
-            remaining_length += (uint32_t)__mqtt_packed_cstrlen(caFilePath);
-        } else {
-            connect_flags &= (uint8_t)~MQTT_CONNECT_CAFILEPATH;
-        }
-
-        if (caPath != NULL) {
-            /* a caPath is present */
-            connect_flags |= (uint8_t)MQTT_CONNECT_CAPATH;
-            remaining_length += (uint32_t)__mqtt_packed_cstrlen(caPath);
-        } else {
-            connect_flags &= (uint8_t)~MQTT_CONNECT_CAPATH;
-        }
-
-        if (clientCertPath != NULL) {
-            /* a clientCertPath is present */
-            connect_flags |= (uint8_t)MQTT_CONNECT_CLIENTCERTPATH;
-            remaining_length += (uint32_t)__mqtt_packed_cstrlen(clientCertPath);
-        } else {
-            connect_flags &= (uint8_t)~MQTT_CONNECT_CLIENTCERTPATH;
-        }
-
-        if (clientKeyPath != NULL) {
-            /* a clientKeyPath is present */
-            connect_flags |= (uint8_t)MQTT_CONNECT_CLIENTKEYPATH;
-            remaining_length += (uint32_t)__mqtt_packed_cstrlen(clientKeyPath);
-        } else {
-            connect_flags &= (uint8_t)~MQTT_CONNECT_CLIENTKEYPATH;
-        }
-
-        /* Call the strncpy function with a size of two to zero-terminate the strTLS value */
-        if (useTLS) /* useTLS = true */
-            strncpy(strTLS, "1", 2);
-        else
-            strncpy(strTLS, "0", 2);
-        connect_flags |= (uint8_t)MQTT_CONNECT_USETLS;
-        remaining_length += (uint32_t)__mqtt_packed_cstrlen(strTLS);
-    }
-#endif
-
-    /* fixed header length is now calculated*/
-    fixed_header.remaining_length = (uint32_t)remaining_length;
-
-    /* pack fixed header and perform error checks */
-    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
-    if (rv <= 0) {
-        /* something went wrong */
-        return rv;
-    }
-    buf += rv;
-    bufsz -= (size_t)rv;
-
-    /* check that the buffer has enough space to fit the remaining length */
-    if (bufsz < fixed_header.remaining_length) {
-        return 0;
-    }
-
-    /* pack the variable header */
-    *buf++ = 0x00;
-    *buf++ = 0x04;
-    *buf++ = (uint8_t) 'M';
-    *buf++ = (uint8_t) 'Q';
-    *buf++ = (uint8_t) 'T';
-    *buf++ = (uint8_t) 'T';
-    *buf++ = MQTT_PROTOCOL_LEVEL;
-    *buf++ = connect_flags;
-    buf += __mqtt_pack_uint16(buf, keep_alive);
-
-    /* pack the payload */
-    buf += __mqtt_pack_str(buf, client_id);
-    if (connect_flags & MQTT_CONNECT_WILL_FLAG) {
-        buf += __mqtt_pack_str(buf, will_topic);
-        buf += __mqtt_pack_uint16(buf, (uint16_t)will_message_size);
-        memcpy(buf, will_message, will_message_size);
-        buf += will_message_size;
-    }
-    if (connect_flags & MQTT_CONNECT_USER_NAME) {
-        buf += __mqtt_pack_str(buf, user_name);
-    }
-    if (connect_flags & MQTT_CONNECT_PASSWORD) {
-        buf += __mqtt_pack_str(buf, password);
-    }
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    if (connect_flags & MQTT_CONNECT_CAFILEPATH) {
-        buf += __mqtt_pack_str(buf, caFilePath);
-    }
-    if (connect_flags & MQTT_CONNECT_CAPATH) {
-        buf += __mqtt_pack_str(buf, caPath);
-    }
-    if (useTLS) {
-        if (connect_flags & MQTT_CONNECT_CLIENTCERTPATH) {
-            buf += __mqtt_pack_str(buf, clientCertPath);
-        }
-        if (connect_flags & MQTT_CONNECT_CLIENTKEYPATH) {
-            buf += __mqtt_pack_str(buf, clientKeyPath);
-        }
-
-        if (connect_flags & MQTT_CONNECT_USETLS) {
-            buf += __mqtt_pack_str(buf, strTLS);
-        }
-    }
-#endif
-    /* return the number of bytes that were consumed */
-    return buf - start;
-}
-
-/* CONNACK */
-ssize_t mqtt_unpack_connack_response(struct mqtt_response *mqtt_response, const uint8_t *buf) {
-    const uint8_t *const start = buf;
-    struct mqtt_response_connack *response;
-
-    /* check that remaining length is 2 */
-    if (mqtt_response->fixed_header.remaining_length != 2) {
-        return MQTT_ERROR_MALFORMED_RESPONSE;
-    }
-
-    response = &(mqtt_response->decoded.connack);
-    /* unpack */
-    if (*buf & 0xFE) {
-        /* only bit 1 can be set */
-        return MQTT_ERROR_CONNACK_FORBIDDEN_FLAGS;
-    } else {
-        response->session_present_flag = *buf++;
-    }
-
-    if (*buf > 5u) {
-        /* only bit 1 can be set */
-        return MQTT_ERROR_CONNACK_FORBIDDEN_CODE;
-    } else {
-        response->return_code = (enum MQTTConnackReturnCode) *buf++;
-    }
-    return buf - start;
-}
-
-/* DISCONNECT */
-ssize_t mqtt_pack_disconnect(uint8_t *buf, size_t bufsz) {
-    struct mqtt_fixed_header fixed_header;
-    fixed_header.control_type = MQTT_CONTROL_DISCONNECT;
-    fixed_header.control_flags = 0;
-    fixed_header.remaining_length = 0;
-    return mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
-}
-
-/* PING */
-ssize_t mqtt_pack_ping_request(uint8_t *buf, size_t bufsz) {
-    struct mqtt_fixed_header fixed_header;
-    fixed_header.control_type = MQTT_CONTROL_PINGREQ;
-    fixed_header.control_flags = 0;
-    fixed_header.remaining_length = 0;
-    return mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
-}
-
-/* PUBLISH */
-ssize_t mqtt_pack_publish_request(uint8_t *buf, size_t bufsz,
-                                  const char* topic_name,
-                                  uint16_t packet_id,
-                                  void* application_message,
-                                  size_t application_message_size,
-                                  uint8_t publish_flags)
-{
-    const uint8_t *const start = buf;
-    ssize_t rv;
-    struct mqtt_fixed_header fixed_header;
-    uint32_t remaining_length;
-    uint8_t inspected_qos;
-
-    /* check for null pointers */
-    if(buf == NULL || topic_name == NULL) {
-        return MQTT_ERROR_NULLPTR;
-    }
-
-    /* inspect QoS level */
-    inspected_qos = (uint8_t)((publish_flags & MQTT_PUBLISH_QOS_MASK) >> 1); /* mask */
-
-    /* build the fixed header */
-    fixed_header.control_type = MQTT_CONTROL_PUBLISH;
-
-    /* calculate remaining length */
-    remaining_length = (uint16_t)__mqtt_packed_cstrlen(topic_name);
-    if (inspected_qos > 0) {
-        remaining_length += 2;
-    }
-    remaining_length += (uint16_t)application_message_size;
-    fixed_header.remaining_length = remaining_length;
-
-    /* force dup to 0 if qos is 0 [Spec MQTT-3.3.1-2] */
-    if (inspected_qos == 0) {
-        publish_flags &= (uint8_t)~MQTT_PUBLISH_DUP;
-    }
-
-    /* make sure that qos is not 3 [Spec MQTT-3.3.1-4] */
-    if (inspected_qos == 3) {
-        return MQTT_ERROR_PUBLISH_FORBIDDEN_QOS;
-    }
-    fixed_header.control_flags = publish_flags & 0x7; //@@@
-
-    /* pack fixed header */
-    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
-    if (rv <= 0) {
-        /* something went wrong */
-        return rv;
-    }
-    buf += rv;
-    bufsz -= (size_t)rv;
-
-    /* check that buffer is big enough */
-    if (bufsz < remaining_length) {
-        return 0;
-    }
-
-
-    /* pack variable header */
-    buf += __mqtt_pack_str(buf, topic_name);
-    if (inspected_qos > 0) {
-        buf += __mqtt_pack_uint16(buf, packet_id);
-    }
-
-    /* pack payload */
-    memcpy(buf, application_message, application_message_size);
-    buf += application_message_size;
-
-    return buf - start;
-}
-
-ssize_t mqtt_unpack_publish_response(struct mqtt_response *mqtt_response, const uint8_t *buf)
-{
-    const uint8_t *const start = buf;
-    struct mqtt_fixed_header *fixed_header;
-    struct mqtt_response_publish *response;
-
-    fixed_header = &(mqtt_response->fixed_header);
-    response = &(mqtt_response->decoded.publish);
-
-    /* get flags */
-    response->dup_flag = (uint8_t)((fixed_header->control_flags & MQTT_PUBLISH_DUP) >> 3);
-    response->qos_level = (uint8_t)((fixed_header->control_flags & MQTT_PUBLISH_QOS_MASK) >> 1);
-    response->retain_flag = fixed_header->control_flags & MQTT_PUBLISH_RETAIN;
-
-    /* make sure that remaining length is valid */
-    if (mqtt_response->fixed_header.remaining_length < 4) {
-        return MQTT_ERROR_MALFORMED_RESPONSE;
-    }
-
-    /* parse variable header */
-    response->topic_name_size = __mqtt_unpack_uint16(buf);
-    buf += 2;
-    response->topic_name = buf;
-    buf += response->topic_name_size;
-
-    if (response->qos_level > 0) {
-        response->packet_id = __mqtt_unpack_uint16(buf);
-        buf += 2;
-    }
-
-    /* get payload */
-    response->application_message = buf;
-    if (response->qos_level == 0) {
-        response->application_message_size = fixed_header->remaining_length - response->topic_name_size - 2;
-    } else {
-        response->application_message_size = fixed_header->remaining_length - response->topic_name_size - 4;
-    }
-    buf += response->application_message_size;
-
-    /* return number of bytes consumed */
-    return buf - start;
-}
-
-/* PUBXXX */
-ssize_t mqtt_pack_pubxxx_request(uint8_t *buf, size_t bufsz,
-                                 enum MQTTControlPacketType control_type,
-                                 uint16_t packet_id)
-{
-    const uint8_t *const start = buf;
-    struct mqtt_fixed_header fixed_header;
-    ssize_t rv;
-    if (buf == NULL) {
-        return MQTT_ERROR_NULLPTR;
-    }
-
-    /* pack fixed header */
-    fixed_header.control_type = control_type;
-    if (control_type == MQTT_CONTROL_PUBREL) {
-        fixed_header.control_flags = 0x02;
-    } else {
-        fixed_header.control_flags = 0;
-    }
-    fixed_header.remaining_length = 2;
-    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
-    if (rv <= 0) {
-        return rv;
-    }
-    buf += rv;
-    bufsz -= (size_t)rv;
-
-    if (bufsz < fixed_header.remaining_length) {
-        return 0;
-    }
-
-    buf += __mqtt_pack_uint16(buf, packet_id);
-
-    return buf - start;
-}
-
-ssize_t mqtt_unpack_pubxxx_response(struct mqtt_response *mqtt_response, const uint8_t *buf)
-{
-    const uint8_t *const start = buf;
-    uint16_t packet_id;
-
-    /* assert remaining length is correct */
-    if (mqtt_response->fixed_header.remaining_length != 2) {
-        return MQTT_ERROR_MALFORMED_RESPONSE;
-    }
-
-    /* parse packet_id */
-    packet_id = __mqtt_unpack_uint16(buf);
-    buf += 2;
-
-    if (mqtt_response->fixed_header.control_type == MQTT_CONTROL_PUBACK) {
-        mqtt_response->decoded.puback.packet_id = packet_id;
-    } else if (mqtt_response->fixed_header.control_type == MQTT_CONTROL_PUBREC) {
-        mqtt_response->decoded.pubrec.packet_id = packet_id;
-    } else if (mqtt_response->fixed_header.control_type == MQTT_CONTROL_PUBREL) {
-        mqtt_response->decoded.pubrel.packet_id = packet_id;
-    } else {
-        mqtt_response->decoded.pubcomp.packet_id = packet_id;
-    }
-
-    return buf - start;
-}
-
-/* SUBACK */
-ssize_t mqtt_unpack_suback_response (struct mqtt_response *mqtt_response, const uint8_t *buf) {
-    const uint8_t *const start = buf;
-    uint32_t remaining_length = mqtt_response->fixed_header.remaining_length;
-
-    /* assert remaining length is at least 3 (for packet id and at least 1 topic) */
-    if (remaining_length < 3) {
-        return MQTT_ERROR_MALFORMED_RESPONSE;
-    }
-
-    /* unpack packet_id */
-    mqtt_response->decoded.suback.packet_id = __mqtt_unpack_uint16(buf);
-    buf += 2;
-    remaining_length -= 2;
-
-    /* unpack return codes */
-    mqtt_response->decoded.suback.num_return_codes = (size_t) remaining_length;
-    mqtt_response->decoded.suback.return_codes = buf;
-    buf += remaining_length;
-
-    return buf - start;
-}
-
-/* SUBSCRIBE */
-ssize_t mqtt_pack_subscribe_request(uint8_t *buf, size_t bufsz, unsigned int packet_id, ...) {
-    va_list args;
-    const uint8_t *const start = buf;
-    ssize_t rv;
-    struct mqtt_fixed_header fixed_header;
-    unsigned int num_subs = 0;
-    unsigned int i;
-    const char *topic[MQTT_SUBSCRIBE_REQUEST_MAX_NUM_TOPICS];
-    uint8_t max_qos[MQTT_SUBSCRIBE_REQUEST_MAX_NUM_TOPICS];
-
-    /* parse all subscriptions */
-    va_start(args, packet_id);
-    while(1) {
-        topic[num_subs] = va_arg(args, const char*);
-        if (topic[num_subs] == NULL) {
-            /* end of list */
-            break;
-        }
-
-        max_qos[num_subs] = (uint8_t) va_arg(args, unsigned int);
-
-        ++num_subs;
-        if (num_subs >= MQTT_SUBSCRIBE_REQUEST_MAX_NUM_TOPICS) {
-            return MQTT_ERROR_SUBSCRIBE_TOO_MANY_TOPICS;
-        }
-    }
-    va_end(args);
-
-    /* build the fixed header */
-    fixed_header.control_type = MQTT_CONTROL_SUBSCRIBE;
-    fixed_header.control_flags = 2u;
-    fixed_header.remaining_length = 2u; /* size of variable header */
-    for(i = 0; i < num_subs; ++i) {
-        /* payload is topic name + max qos (1 byte) */
-        fixed_header.remaining_length += __mqtt_packed_cstrlen(topic[i]) + 1;
-    }
-
-    /* pack the fixed header */
-    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
-    if (rv <= 0) {
-        return rv;
-    }
-    buf += rv;
-    bufsz -= (unsigned long)rv;
-
-    /* check that the buffer has enough space */
-    if (bufsz < fixed_header.remaining_length) {
-        return 0;
-    }
-
-
-    /* pack variable header */
-    buf += __mqtt_pack_uint16(buf, (uint16_t)packet_id);
-
-
-    /* pack payload */
-    for(i = 0; i < num_subs; ++i) {
-        buf += __mqtt_pack_str(buf, topic[i]);
-        *buf++ = max_qos[i];
-    }
-
-    return buf - start;
-}
-
-/* UNSUBACK */
-ssize_t mqtt_unpack_unsuback_response(struct mqtt_response *mqtt_response, const uint8_t *buf)
-{
-    const uint8_t *const start = buf;
-
-    if (mqtt_response->fixed_header.remaining_length != 2) {
-        return MQTT_ERROR_MALFORMED_RESPONSE;
-    }
-
-    /* parse packet_id */
-    mqtt_response->decoded.unsuback.packet_id = __mqtt_unpack_uint16(buf);
-    buf += 2;
-
-    return buf - start;
-}
-
-/* UNSUBSCRIBE */
-ssize_t mqtt_pack_unsubscribe_request(uint8_t *buf, size_t bufsz, unsigned int packet_id, ...) {
-    va_list args;
-    const uint8_t *const start = buf;
-    ssize_t rv;
-    struct mqtt_fixed_header fixed_header;
-    unsigned int num_subs = 0;
-    unsigned int i;
-    const char *topic[MQTT_UNSUBSCRIBE_REQUEST_MAX_NUM_TOPICS];
-
-    /* parse all subscriptions */
-    va_start(args, packet_id);
-    while(1) {
-        topic[num_subs] = va_arg(args, const char*);
-        if (topic[num_subs] == NULL) {
-            /* end of list */
-            break;
-        }
-
-        ++num_subs;
-        if (num_subs >= MQTT_UNSUBSCRIBE_REQUEST_MAX_NUM_TOPICS) {
-            return MQTT_ERROR_UNSUBSCRIBE_TOO_MANY_TOPICS;
-        }
-    }
-    va_end(args);
-
-    /* build the fixed header */
-    fixed_header.control_type = MQTT_CONTROL_UNSUBSCRIBE;
-    fixed_header.control_flags = 2u;
-    fixed_header.remaining_length = 2u; /* size of variable header */
-    for(i = 0; i < num_subs; ++i) {
-        /* payload is topic name */
-        fixed_header.remaining_length += __mqtt_packed_cstrlen(topic[i]);
-    }
-
-    /* pack the fixed header */
-    rv = mqtt_pack_fixed_header(buf, bufsz, &fixed_header);
-    if (rv <= 0) {
-        return rv;
-    }
-    buf += rv;
-    bufsz -= (unsigned long)rv;
-
-    /* check that the buffer has enough space */
-    if (bufsz < fixed_header.remaining_length) {
-        return 0;
-    }
-
-    /* pack variable header */
-    buf += __mqtt_pack_uint16(buf, (uint16_t)packet_id);
-
-
-    /* pack payload */
-    for(i = 0; i < num_subs; ++i) {
-        buf += __mqtt_pack_str(buf, topic[i]);
-    }
-
-    return buf - start;
-}
-
-/* MESSAGE QUEUE */
-void mqtt_mq_init(struct mqtt_message_queue *mq, void *buf, size_t bufsz)
-{
-    mq->mem_start = buf;
-    mq->mem_end = (uint8_t *)buf + bufsz;
-    mq->curr = (uint8_t *)buf;
-    mq->queue_tail = (struct mqtt_queued_message *)mq->mem_end;
-    mq->curr_sz = (size_t)(mqtt_mq_currsz(mq));
-}
-
-struct mqtt_queued_message* mqtt_mq_register(struct mqtt_message_queue *mq, size_t nbytes)
-{
-    /* make queued message header */
-    --(mq->queue_tail);
-    mq->queue_tail->start = mq->curr;
-    mq->queue_tail->size = nbytes;
-    mq->queue_tail->state = MQTT_QUEUED_UNSENT;
-
-    /* move curr and recalculate curr_sz */
-    mq->curr += nbytes;
-    mq->curr_sz = (size_t)(mqtt_mq_currsz(mq));
-
-    return mq->queue_tail;
-}
-
-void mqtt_mq_clean(struct mqtt_message_queue *mq) {
-    struct mqtt_queued_message *new_head;
-
-    for(new_head = mqtt_mq_get(mq, 0); new_head >= mq->queue_tail; --new_head) {
-        if (new_head->state != MQTT_QUEUED_COMPLETE) break;
-    }
-
-    /* check if everything can be removed */
-    if (new_head < mq->queue_tail) {
-        mq->curr = (uint8_t *)mq->mem_start;
-        mq->queue_tail = (struct mqtt_queued_message *)mq->mem_end;
-        mq->curr_sz = (size_t)(mqtt_mq_currsz(mq));
-        return;
-    } else if (new_head == mqtt_mq_get(mq, 0)) {
-        /* do nothing */
-        return;
-    }
-
-    /* move buffered data */
-    {
-        size_t n = (size_t)(mq->curr - new_head->start);
-        size_t removing = (size_t)(new_head->start - (uint8_t*) mq->mem_start);
-        memmove(mq->mem_start, new_head->start, n);
-        mq->curr = (uint8_t *)((uint8_t *)mq->mem_start + n);
-
-
-        /* move queue */
-        {
-            ssize_t new_tail_idx = new_head - mq->queue_tail;
-            memmove(mqtt_mq_get(mq, new_tail_idx), mq->queue_tail, sizeof(struct mqtt_queued_message) * (size_t)((new_tail_idx + 1)));
-            mq->queue_tail = mqtt_mq_get(mq, new_tail_idx);
-
-            {
-                /* bump back start's */
-                for(ssize_t i = 0; i < new_tail_idx + 1; ++i) {
-                    mqtt_mq_get(mq, i)->start -= removing;
-                }
-            }
-        }
-    }
-
-    /* get curr_sz */
-    mq->curr_sz = (size_t)(mqtt_mq_currsz(mq));
-}
-
-struct mqtt_queued_message* mqtt_mq_find(struct mqtt_message_queue *mq, enum MQTTControlPacketType control_type, uint16_t *packet_id)
-{
-    struct mqtt_queued_message *curr;
-    for(curr = mqtt_mq_get(mq, 0); curr >= mq->queue_tail; --curr) {
-        if (curr->control_type == control_type) {
-            if ((packet_id == NULL && curr->state != MQTT_QUEUED_COMPLETE) ||
-                (packet_id != NULL && *packet_id == curr->packet_id)) {
-                return curr;
-            }
-        }
-    }
-    return NULL;
-}
-
-
-/* RESPONSE UNPACKING */
-ssize_t mqtt_unpack_response(struct mqtt_response* response, const uint8_t *buf, size_t bufsz) {
-    const uint8_t *const start = buf;
-    ssize_t rv = mqtt_unpack_fixed_header(response, buf, bufsz);
-    if (rv <= 0) return rv;
-    else buf += rv;
-    switch(response->fixed_header.control_type) {
-        case MQTT_CONTROL_CONNACK:
-            rv = mqtt_unpack_connack_response(response, buf);
-            break;
-        case MQTT_CONTROL_PUBLISH:
-            rv = mqtt_unpack_publish_response(response, buf);
-            break;
-        case MQTT_CONTROL_PUBACK:
-            rv = mqtt_unpack_pubxxx_response(response, buf);
-            break;
-        case MQTT_CONTROL_PUBREC:
-            rv = mqtt_unpack_pubxxx_response(response, buf);
-            break;
-        case MQTT_CONTROL_PUBREL:
-            rv = mqtt_unpack_pubxxx_response(response, buf);
-            break;
-        case MQTT_CONTROL_PUBCOMP:
-            rv = mqtt_unpack_pubxxx_response(response, buf);
-            break;
-        case MQTT_CONTROL_SUBACK:
-            rv = mqtt_unpack_suback_response(response, buf);
-            break;
-        case MQTT_CONTROL_UNSUBACK:
-            rv = mqtt_unpack_unsuback_response(response, buf);
-            break;
-        case MQTT_CONTROL_PINGRESP:
-            return rv;
-        default:
-            return MQTT_ERROR_RESPONSE_INVALID_CONTROL_TYPE;
-    }
-
-    if (rv < 0) return rv;
-    buf += rv;
-    return buf - start;
-}
-
-/* EXTRA DETAILS */
-ssize_t __mqtt_pack_uint16(uint8_t *buf, uint16_t integer)
-{
-  uint16_t integer_htons = MQTT_PAL_HTONS(integer);
-  memcpy(buf, &integer_htons, 2);
-  return 2;
-}
-
-uint16_t __mqtt_unpack_uint16(const uint8_t *buf)
-{
-  uint16_t integer_htons;
-  memcpy(&integer_htons, buf, 2);
-  return MQTT_PAL_NTOHS(integer_htons);
-}
-
-ssize_t __mqtt_pack_str(uint8_t *buf, const char* str) {
-    uint16_t length = (uint16_t)strlen(str);
-     /* pack string length */
-    buf += __mqtt_pack_uint16(buf, length);
-
-    /* pack string */
-    for(int i = 0; i < length; ++i) {
-        *(buf++) = (uint8_t)str[i];
-    }
-
-    /* return number of bytes consumed */
-    return length + 2;
-}
-
-static const char *MQTT_ERRORS_STR[] = {
-    "MQTT_UNKNOWN_ERROR",
-    __ALL_MQTT_ERRORS(GENERATE_STRING)
-};
-
-const char* mqtt_error_str(enum MQTTErrors error) {
-    int offset = error - MQTT_ERROR_UNKNOWN;
-    if (offset >= 0) {
-        return MQTT_ERRORS_STR[offset];
-    } else if (error == 0) {
-        return "MQTT_ERROR: Buffer too small.";
-    } else if (error > 0) {
-        return "MQTT_OK";
-    } else {
-        return MQTT_ERRORS_STR[0];
-    }
-}
-
-/** @endcond*/
diff --git a/deps/mqtt-c/mqtt.h b/deps/mqtt-c/mqtt.h
deleted file mode 100644
index 377448c7f96..00000000000
--- a/deps/mqtt-c/mqtt.h
+++ /dev/null
@@ -1,1590 +0,0 @@
-#ifndef __MQTT_H__
-#define __MQTT_H__
-
-/*
-MIT License
-
-Copyright(c) 2018 Liam Bindle
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files(the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions :
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "mqtt_pal.h"
-
-#ifdef __MINGW32__
-    #include <pthread.h>
-#endif
-/**
- * @file
- * @brief Declares all the MQTT-C functions and datastructures.
- *
- * @note You should <code>\#include <mqtt.h></code>.
- *
- * @example simple_publisher.c
- * A simple program to that publishes the current time whenever ENTER is pressed.
- *
- * Usage:
- * \code{.sh}
- * ./bin/simple_publisher [address [port [topic]]]
- * \endcode
- *
- * Where \c address is the address of the MQTT broker, \c port is the port number the
- * MQTT broker is running on, and \c topic is the name of the topic to publish with. Note
- * that all these arguments are optional and the defaults are \c address = \c "test.mosquitto.org",
- * \c port = \c "1883", and \c topic = "datetime".
- *
- * @example simple_subscriber.c
- * A simple program that subscribes to a single topic and prints all updates that are received.
- *
- * Usage:
- * \code{.sh}
- * ./bin/simple_subscriber [address [port [topic]]]
- * \endcode
- *
- * Where \c address is the address of the MQTT broker, \c port is the port number the
- * MQTT broker is running on, and \c topic is the name of the topic subscribe to. Note
- * that all these arguments are optional and the defaults are \c address = \c "test.mosquitto.org",
- * \c port = \c "1883", and \c topic = "datetime".
- *
- * @example reconnect_subscriber.c
- * Same program as \ref simple_subscriber.c, but using the automatic reconnect functionality.
- *
- * @example bio_publisher.c
- * Same program as \ref simple_publisher.c, but uses an unencrypted BIO socket.
- *
- * @example openssl_publisher.c
- * Same program as \ref simple_publisher.c, but over an encrypted connection using OpenSSL.
- *
- * Usage:
- * \code{.sh}
- * ./bin/openssl_publisher ca_file [address [port [topic]]]
- * \endcode
- *
- *
- * @defgroup api API
- * @brief Documentation of everything you need to know to use the MQTT-C client.
- *
- * This module contains everything you need to know to use MQTT-C in your application.
- * For usage examples see:
- *     - @ref simple_publisher.c
- *     - @ref simple_subscriber.c
- *     - @ref reconnect_subscriber.c
- *     - @ref bio_publisher.c
- *     - @ref openssl_publisher.c
- *
- * @note MQTT-C can be used in both single-threaded and multi-threaded applications. All
- *       the functions in \ref api are thread-safe.
- *
- * @defgroup packers Control Packet Serialization
- * @brief Developer documentation of the functions and datastructures used for serializing MQTT
- *        control packets.
- *
- * @defgroup unpackers Control Packet Deserialization
- * @brief Developer documentation of the functions and datastructures used for deserializing MQTT
- *        control packets.
- *
- * @defgroup details Utilities
- * @brief Developer documentation for the utilities used to implement the MQTT-C client.
- *
- * @note To deserialize a packet from a buffer use \ref mqtt_unpack_response (it's the only
- *       function you need).
- */
-
-
- /**
-  * @brief An enumeration of the MQTT control packet types.
-  * @ingroup unpackers
-  *
-  * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718021">
-  * MQTT v3.1.1: MQTT Control Packet Types
-  * </a>
-  */
-  enum MQTTControlPacketType {
-    MQTT_CONTROL_CONNECT=1u,
-    MQTT_CONTROL_CONNACK=2u,
-    MQTT_CONTROL_PUBLISH=3u,
-    MQTT_CONTROL_PUBACK=4u,
-    MQTT_CONTROL_PUBREC=5u,
-    MQTT_CONTROL_PUBREL=6u,
-    MQTT_CONTROL_PUBCOMP=7u,
-    MQTT_CONTROL_SUBSCRIBE=8u,
-    MQTT_CONTROL_SUBACK=9u,
-    MQTT_CONTROL_UNSUBSCRIBE=10u,
-    MQTT_CONTROL_UNSUBACK=11u,
-    MQTT_CONTROL_PINGREQ=12u,
-    MQTT_CONTROL_PINGRESP=13u,
-    MQTT_CONTROL_DISCONNECT=14u
-};
-
-/**
- * @brief The fixed header of an MQTT control packet.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718020">
- * MQTT v3.1.1: Fixed Header
- * </a>
- */
-struct mqtt_fixed_header {
-    /** The type of packet. */
-    enum MQTTControlPacketType control_type;
-
-    /** The packets control flags.*/
-    uint32_t  control_flags: 4;
-
-    /** The remaining size of the packet in bytes (i.e. the size of variable header and payload).*/
-    uint32_t remaining_length;
-};
-
-/**
- * @brief The protocol identifier for MQTT v3.1.1.
- * @ingroup packers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718030">
- * MQTT v3.1.1: CONNECT Variable Header.
- * </a>
- */
-#define MQTT_PROTOCOL_LEVEL 0x04
-
-/**
- * @brief A macro used to declare the enum MQTTErrors and associated
- *        error messages (the members of the num) at the same time.
- */
-#define __ALL_MQTT_ERRORS(MQTT_ERROR)                    \
-    MQTT_ERROR(MQTT_ERROR_NULLPTR)                       \
-    MQTT_ERROR(MQTT_ERROR_CONTROL_FORBIDDEN_TYPE)        \
-    MQTT_ERROR(MQTT_ERROR_CONTROL_INVALID_FLAGS)         \
-    MQTT_ERROR(MQTT_ERROR_CONTROL_WRONG_TYPE)            \
-    MQTT_ERROR(MQTT_ERROR_CONNECT_CLIENT_ID_REFUSED)     \
-    MQTT_ERROR(MQTT_ERROR_CONNECT_NULL_WILL_MESSAGE)     \
-    MQTT_ERROR(MQTT_ERROR_CONNECT_FORBIDDEN_WILL_QOS)    \
-    MQTT_ERROR(MQTT_ERROR_CONNACK_FORBIDDEN_FLAGS)       \
-    MQTT_ERROR(MQTT_ERROR_CONNACK_FORBIDDEN_CODE)        \
-    MQTT_ERROR(MQTT_ERROR_PUBLISH_FORBIDDEN_QOS)         \
-    MQTT_ERROR(MQTT_ERROR_SUBSCRIBE_TOO_MANY_TOPICS)     \
-    MQTT_ERROR(MQTT_ERROR_MALFORMED_RESPONSE)            \
-    MQTT_ERROR(MQTT_ERROR_UNSUBSCRIBE_TOO_MANY_TOPICS)   \
-    MQTT_ERROR(MQTT_ERROR_RESPONSE_INVALID_CONTROL_TYPE) \
-    MQTT_ERROR(MQTT_ERROR_CONNECT_NOT_CALLED)          \
-    MQTT_ERROR(MQTT_ERROR_SEND_BUFFER_IS_FULL)           \
-    MQTT_ERROR(MQTT_ERROR_SOCKET_ERROR)                  \
-    MQTT_ERROR(MQTT_ERROR_MALFORMED_REQUEST)             \
-    MQTT_ERROR(MQTT_ERROR_RECV_BUFFER_TOO_SMALL)         \
-    MQTT_ERROR(MQTT_ERROR_ACK_OF_UNKNOWN)                \
-    MQTT_ERROR(MQTT_ERROR_NOT_IMPLEMENTED)               \
-    MQTT_ERROR(MQTT_ERROR_CONNECTION_REFUSED)            \
-    MQTT_ERROR(MQTT_ERROR_SUBSCRIBE_FAILED)              \
-    MQTT_ERROR(MQTT_ERROR_CONNECTION_CLOSED)             \
-    MQTT_ERROR(MQTT_ERROR_INITIAL_RECONNECT)             \
-    MQTT_ERROR(MQTT_ERROR_INVALID_REMAINING_LENGTH)      \
-    MQTT_ERROR(MQTT_ERROR_CLEAN_SESSION_IS_REQUIRED)
-
-/* todo: add more connection refused errors */
-
-/**
- * @brief A macro used to generate the enum MQTTErrors from
- *        \ref __ALL_MQTT_ERRORS
- * @see __ALL_MQTT_ERRORS
-*/
-#define GENERATE_ENUM(ENUM) ENUM,
-
-/**
- * @brief A macro used to generate the error messages associated with
- *        MQTTErrors from \ref __ALL_MQTT_ERRORS
- * @see __ALL_MQTT_ERRORS
-*/
-#define GENERATE_STRING(STRING) #STRING,
-
-
-/**
- * @brief An enumeration of error codes. Error messages can be retrieved by calling \ref mqtt_error_str.
- * @ingroup api
- *
- * @see mqtt_error_str
- */
-enum MQTTErrors {
-    MQTT_ERROR_UNKNOWN=INT_MIN,
-    __ALL_MQTT_ERRORS(GENERATE_ENUM)
-    MQTT_OK = 1
-};
-
-/**
- * @brief Returns an error message for error code, \p error.
- * @ingroup api
- *
- * @param[in] error the error code.
- *
- * @returns The associated error message.
- */
-const char* mqtt_error_str(enum MQTTErrors error);
-
-/**
- * @brief Pack a MQTT 16 bit integer, given a native 16 bit integer .
- *
- * @param[out] buf the buffer that the MQTT integer will be written to.
- * @param[in] integer the native integer to be written to \p buf.
- *
- * @warning This function provides no error checking.
- *
- * @returns 2
-*/
-ssize_t __mqtt_pack_uint16(uint8_t *buf, uint16_t integer);
-
-/**
- * @brief Unpack a MQTT 16 bit integer to a native 16 bit integer.
- *
- * @param[in] buf the buffer that the MQTT integer will be read from.
- *
- * @warning This function provides no error checking and does not modify \p buf.
- *
- * @returns The native integer
-*/
-uint16_t __mqtt_unpack_uint16(const uint8_t *buf);
-
-/**
- * @brief Pack a MQTT string, given a c-string \p str.
- *
- * @param[out] buf the buffer that the MQTT string will be written to.
- * @param[in] str the c-string to be written to \p buf.
- *
- * @warning This function provides no error checking.
- *
- * @returns strlen(str) + 2
-*/
-ssize_t __mqtt_pack_str(uint8_t *buf, const char* str);
-
-/** @brief A macro to get the MQTT string length from a c-string. */
-#define __mqtt_packed_cstrlen(x) (2 + (unsigned int) strlen(x))
-
-/* RESPONSES */
-
-/**
- * @brief An enumeration of the return codes returned in a CONNACK packet.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Table_3.1_-">
- * MQTT v3.1.1: CONNACK return codes.
- * </a>
- */
-enum MQTTConnackReturnCode {
-    MQTT_CONNACK_ACCEPTED = 0u,
-    MQTT_CONNACK_REFUSED_PROTOCOL_VERSION = 1u,
-    MQTT_CONNACK_REFUSED_IDENTIFIER_REJECTED = 2u,
-    MQTT_CONNACK_REFUSED_SERVER_UNAVAILABLE = 3u,
-    MQTT_CONNACK_REFUSED_BAD_USER_NAME_OR_PASSWORD = 4u,
-    MQTT_CONNACK_REFUSED_NOT_AUTHORIZED = 5u
-};
-
-/**
- * @brief A connection response datastructure.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718033">
- * MQTT v3.1.1: CONNACK - Acknowledgement connection response.
- * </a>
- */
-struct mqtt_response_connack {
-    /**
-     * @brief Allows client and broker to check if they have a consistent view about whether there is
-     * already a stored session state.
-    */
-    uint8_t session_present_flag;
-
-    /**
-     * @brief The return code of the connection request.
-     *
-     * @see MQTTConnackReturnCode
-     */
-    enum MQTTConnackReturnCode return_code;
-};
-
- /**
-  * @brief A publish packet received from the broker.
-  * @ingroup unpackers
-  *
-  * A publish packet is received from the broker when a client publishes to a topic that the
-  * \em {local client} is subscribed to.
-  *
-  * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718037">
-  * MQTT v3.1.1: PUBLISH - Publish Message.
-  * </a>
-  */
-struct mqtt_response_publish {
-    /**
-     * @brief The DUP flag. DUP flag is 0 if its the first attempt to send this publish packet. A DUP flag
-     * of 1 means that this might be a re-delivery of the packet.
-     */
-    uint8_t dup_flag;
-
-    /**
-     * @brief The quality of service level.
-     *
-     * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Table_3.11_-">
-     * MQTT v3.1.1: QoS Definitions
-     * </a>
-     */
-    uint8_t qos_level;
-
-    /** @brief The retain flag of this publish message. */
-    uint8_t retain_flag;
-
-    /** @brief Size of the topic name (number of characters). */
-    uint16_t topic_name_size;
-
-    /**
-     * @brief The topic name.
-     * @note topic_name is not null terminated. Therefore topic_name_size must be used to get the
-     *       string length.
-     */
-    const void* topic_name;
-
-    /** @brief The publish message's packet ID. */
-    uint16_t packet_id;
-
-    /** @brief The publish message's application message.*/
-    const void* application_message;
-
-    /** @brief The size of the application message in bytes. */
-    size_t application_message_size;
-};
-
-/**
- * @brief A publish acknowledgement for messages that were published with QoS level 1.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718043">
- * MQTT v3.1.1: PUBACK - Publish Acknowledgement.
- * </a>
- *
- */
-struct mqtt_response_puback {
-    /** @brief The published messages packet ID. */
-    uint16_t packet_id;
-};
-
-/**
- * @brief The response packet to a PUBLISH packet with QoS level 2.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718048">
- * MQTT v3.1.1: PUBREC - Publish Received.
- * </a>
- *
- */
-struct mqtt_response_pubrec {
-    /** @brief The published messages packet ID. */
-    uint16_t packet_id;
-};
-
-/**
- * @brief The response to a PUBREC packet.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718053">
- * MQTT v3.1.1: PUBREL - Publish Release.
- * </a>
- *
- */
-struct mqtt_response_pubrel {
-    /** @brief The published messages packet ID. */
-    uint16_t packet_id;
-};
-
-/**
- * @brief The response to a PUBREL packet.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718058">
- * MQTT v3.1.1: PUBCOMP - Publish Complete.
- * </a>
- *
- */
-struct mqtt_response_pubcomp {
-    /** T@brief he published messages packet ID. */
-    uint16_t packet_id;
-};
-
-/**
- * @brief An enumeration of subscription acknowledgement return codes.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Figure_3.26_-">
- * MQTT v3.1.1: SUBACK Return Codes.
- * </a>
- */
-enum MQTTSubackReturnCodes {
-    MQTT_SUBACK_SUCCESS_MAX_QOS_0 = 0u,
-    MQTT_SUBACK_SUCCESS_MAX_QOS_1 = 1u,
-    MQTT_SUBACK_SUCCESS_MAX_QOS_2 = 2u,
-    MQTT_SUBACK_FAILURE           = 128u
-};
-
-/**
- * @brief The response to a subscription request.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718068">
- * MQTT v3.1.1: SUBACK - Subscription Acknowledgement.
- * </a>
- */
-struct mqtt_response_suback {
-    /** @brief The published messages packet ID. */
-    uint16_t packet_id;
-
-    /**
-     * Array of return codes corresponding to the requested subscribe topics.
-     *
-     * @see MQTTSubackReturnCodes
-     */
-    const uint8_t *return_codes;
-
-    /** The number of return codes. */
-    size_t num_return_codes;
-};
-
-/**
- * @brief The brokers response to a UNSUBSCRIBE request.
- * @ingroup unpackers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718077">
- * MQTT v3.1.1: UNSUBACK - Unsubscribe Acknowledgement.
- * </a>
- */
-struct mqtt_response_unsuback {
-    /** @brief The published messages packet ID. */
-    uint16_t packet_id;
-};
-
-/**
- * @brief The response to a ping request.
- * @ingroup unpackers
- *
- * @note This response contains no members.
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718086">
- * MQTT v3.1.1: PINGRESP - Ping Response.
- * </a>
- */
-struct mqtt_response_pingresp {
-  int dummy;
-};
-
-/**
- * @brief A struct used to deserialize/interpret an incoming packet from the broker.
- * @ingroup unpackers
- */
-struct mqtt_response {
-    /** @brief The mqtt_fixed_header of the deserialized packet. */
-    struct mqtt_fixed_header fixed_header;
-
-    /**
-     * @brief A union of the possible responses from the broker.
-     *
-     * @note The fixed_header contains the control type. This control type corresponds to the
-     *       member of this union that should be accessed. For example if
-     *       fixed_header#control_type == \c MQTT_CONTROL_PUBLISH then
-     *       decoded#publish should be accessed.
-     */
-    union {
-        struct mqtt_response_connack  connack;
-        struct mqtt_response_publish  publish;
-        struct mqtt_response_puback   puback;
-        struct mqtt_response_pubrec   pubrec;
-        struct mqtt_response_pubrel   pubrel;
-        struct mqtt_response_pubcomp  pubcomp;
-        struct mqtt_response_suback   suback;
-        struct mqtt_response_unsuback unsuback;
-        struct mqtt_response_pingresp pingresp;
-    } decoded;
-};
-
-/**
- * @brief Deserialize the contents of \p buf into an mqtt_fixed_header object.
- * @ingroup unpackers
- *
- * @note This function performs complete error checking and a positive return value
- *       means the entire mqtt_response can be deserialized from \p buf.
- *
- * @param[out] response the response who's \ref mqtt_response.fixed_header will be initialized.
- * @param[in] buf the buffer.
- * @param[in] bufsz the total number of bytes in the buffer.
- *
- * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough
- *          bytes to parse the packet, or a negative value if there was a protocol violation.
- */
-ssize_t mqtt_unpack_fixed_header(struct mqtt_response *response, const uint8_t *buf, size_t bufsz);
-
-/**
- * @brief Deserialize a CONNACK response from \p buf.
- * @ingroup unpackers
- *
- * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the control packet type
- *      must be \c MQTT_CONTROL_CONNACK.
- *
- * @param[out] mqtt_response the mqtt_response that will be initialized.
- * @param[in] buf the buffer that contains the variable header and payload of the packet. The
- *                first byte of \p buf should be the first byte of the variable header.
- *
- * @relates mqtt_response_connack
- *
- * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough
- *          bytes to parse the packet, or a negative value if there was a protocol violation.
- */
-ssize_t mqtt_unpack_connack_response (struct mqtt_response *mqtt_response, const uint8_t *buf);
-
-/**
- * @brief Deserialize a publish response from \p buf.
- * @ingroup unpackers
- *
- * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the mqtt_response must
- *      have a control type of \c MQTT_CONTROL_PUBLISH.
- *
- * @param[out] mqtt_response the response that is initialized from the contents of \p buf.
- * @param[in] buf the buffer with the incoming data.
- *
- * @relates mqtt_response_publish
- *
- * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough
- *          bytes to parse the packet, or a negative value if there was a protocol violation.
- */
-ssize_t mqtt_unpack_publish_response (struct mqtt_response *mqtt_response, const uint8_t *buf);
-
-/**
- * @brief Deserialize a PUBACK/PUBREC/PUBREL/PUBCOMP packet from \p buf.
- * @ingroup unpackers
- *
- * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the mqtt_response must
- *      have a control type of \c MQTT_CONTROL_PUBACK, \c MQTT_CONTROL_PUBREC, \c MQTT_CONTROL_PUBREL
- *      or \c MQTT_CONTROL_PUBCOMP.
- *
- * @param[out] mqtt_response the response that is initialized from the contents of \p buf.
- * @param[in] buf the buffer with the incoming data.
- *
- * @relates mqtt_response_puback mqtt_response_pubrec mqtt_response_pubrel mqtt_response_pubcomp
- *
- * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough
- *          bytes to parse the packet, or a negative value if there was a protocol violation.
- */
-ssize_t mqtt_unpack_pubxxx_response(struct mqtt_response *mqtt_response, const uint8_t *buf);
-
-/**
- * @brief Deserialize a SUBACK packet from \p buf.
- * @ingroup unpacker
- *
- * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the mqtt_response must
- *      have a control type of \c MQTT_CONTROL_SUBACK.
- *
- * @param[out] mqtt_response the response that is initialized from the contents of \p buf.
- * @param[in] buf the buffer with the incoming data.
- *
- * @relates mqtt_response_suback
- *
- * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough
- *          bytes to parse the packet, or a negative value if there was a protocol violation.
- */
-ssize_t mqtt_unpack_suback_response(struct mqtt_response *mqtt_response, const uint8_t *buf);
-
-/**
- * @brief Deserialize an UNSUBACK packet from \p buf.
- * @ingroup unpacker
- *
- * @pre \ref mqtt_unpack_fixed_header must have returned a positive value and the mqtt_response must
- *      have a control type of \c MQTT_CONTROL_UNSUBACK.
- *
- * @param[out] mqtt_response the response that is initialized from the contents of \p buf.
- * @param[in] buf the buffer with the incoming data.
- *
- * @relates mqtt_response_unsuback
- *
- * @returns The number of bytes that were consumed, or 0 if the buffer does not contain enough
- *          bytes to parse the packet, or a negative value if there was a protocol violation.
- */
-ssize_t mqtt_unpack_unsuback_response(struct mqtt_response *mqtt_response, const uint8_t *buf);
-
-/**
- * @brief Deserialize a packet from the broker.
- * @ingroup unpackers
- *
- * @param[out] response the mqtt_response that will be initialize from \p buf.
- * @param[in] buf the incoming data buffer.
- * @param[in] bufsz the number of bytes available in the buffer.
- *
- * @relates mqtt_response
- *
- * @returns The number of bytes consumed on success, zero \p buf does not contain enough bytes
- *          to deserialize the packet, a negative value if a protocol violation was encountered.
- */
-ssize_t mqtt_unpack_response(struct mqtt_response* response, const uint8_t *buf, size_t bufsz);
-
-/* REQUESTS */
-
- /**
- * @brief Serialize an mqtt_fixed_header and write it to \p buf.
- * @ingroup packers
- *
- * @note This function performs complete error checking and a positive return value
- *       guarantees the entire packet will fit into the given buffer.
- *
- * @param[out] buf the buffer to write to.
- * @param[in] bufsz the maximum number of bytes that can be put in to \p buf.
- * @param[in] fixed_header the fixed header that will be serialized.
- *
- * @returns The number of bytes written to \p buf, or 0 if \p buf is too small, or a
- *          negative value if there was a protocol violation.
- */
-ssize_t mqtt_pack_fixed_header(uint8_t *buf, size_t bufsz, const struct mqtt_fixed_header *fixed_header);
-
-/**
- * @brief An enumeration of CONNECT packet flags.
- * @ingroup packers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718030">
- * MQTT v3.1.1: CONNECT Variable Header.
- * </a>
- */
-enum MQTTConnectFlags {
-    MQTT_CONNECT_RESERVED = 1u,
-    MQTT_CONNECT_CLEAN_SESSION = 2u,
-    MQTT_CONNECT_WILL_FLAG = 4u,
-    MQTT_CONNECT_WILL_QOS_0 = (0u & 0x03) << 3,
-    MQTT_CONNECT_WILL_QOS_1 = (1u & 0x03) << 3,
-    MQTT_CONNECT_WILL_QOS_2 = (2u & 0x03) << 3,
-    MQTT_CONNECT_WILL_RETAIN = 32u,
-    MQTT_CONNECT_PASSWORD = 64u,
-    MQTT_CONNECT_USER_NAME = 128u,
-    MQTT_CONNECT_CAFILEPATH = 256u,
-    MQTT_CONNECT_CAPATH = 512u,
-    MQTT_CONNECT_CLIENTCERTPATH = 1024u,
-    MQTT_CONNECT_CLIENTKEYPATH = 2048u,
-    MQTT_CONNECT_USETLS = 4096u
-};
-
-/**
- * @brief Serialize a connection request into a buffer.
- * @ingroup packers
- *
- * @param[out] buf the buffer to pack the connection request packet into.
- * @param[in] bufsz the number of bytes left in \p buf.
- * @param[in] client_id the ID that identifies the local client. \p client_id can be NULL or an empty
- *                      string for Anonymous clients.
- * @param[in] will_topic the topic under which the local client's will message will be published.
- *                       Set to \c NULL for no will message. If \p will_topic is not \c NULL a
- *                       \p will_message must also be provided.
- * @param[in] will_message the will message to be published upon an unsuccessful disconnection of
- *                         the local client. Set to \c NULL if \p will_topic is \c NULL.
- *                         \p will_message must \em not be \c NULL if \p will_topic is not
- *                         \c NULL.
- * @param[in] will_message_size The size of \p will_message in bytes.
- * @param[in] user_name the username to be used to connect to the broker with. Set to \c NULL if
- *                      no username is required.
- * @param[in] password the password to be used to connect to the broker with. Set to \c NULL if
- *                     no password is required.
- * @param[in] connect_flags additional MQTTConnectFlags to be set. The only flags that need to be
- *                          set manually are \c MQTT_CONNECT_CLEAN_SESSION,
- *                          \c MQTT_CONNECT_WILL_QOS_X (for \c X &isin; {0, 1, 2}), and
- *                          \c MQTT_CONNECT_WILL_RETAIN. Set to 0 if no additional flags are
- *                          required.
- * @param[in] keep_alive the keep alive time in seconds. It is the responsibility of the clinet
- *                       to ensure packets are sent to the server \em {at least} this frequently.
- *
- * @note If there is a \p will_topic and no additional \p connect_flags are given, then by
- *       default \p will_message will be published at QoS level 0.
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718028">
- * MQTT v3.1.1: CONNECT - Client Requests a Connection to a Server.
- * </a>
- *
- * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the CONNECT
- *          packet, a negative value if there was a protocol violation.
- */
-ssize_t mqtt_pack_connection_request(uint8_t* buf, size_t bufsz,
-                                     const char* client_id,
-                                     const char* will_topic,
-                                     const void* will_message,
-                                     size_t will_message_size,
-                                     const char* user_name,
-                                     const char* password,
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-                                     const char* caFilePath,
-                                     const char* caPath,
-                                     const char* clientCertPath,
-                                     const char* clientKeyPath,
-                                     const bool useTLS,
-#endif
-                                     uint8_t connect_flags,
-                                     uint16_t keep_alive);
-
-/**
- * @brief An enumeration of the PUBLISH flags.
- * @ingroup packers
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718037">
- * MQTT v3.1.1: PUBLISH - Publish Message.
- * </a>
- */
-enum MQTTPublishFlags {
-    MQTT_PUBLISH_DUP = 8u,
-    MQTT_PUBLISH_QOS_0 = ((0u << 1) & 0x06),
-    MQTT_PUBLISH_QOS_1 = ((1u << 1) & 0x06),
-    MQTT_PUBLISH_QOS_2 = ((2u << 1) & 0x06),
-    MQTT_PUBLISH_QOS_MASK = ((3u << 1) & 0x06),
-    MQTT_PUBLISH_RETAIN = 0x01
-};
-
-/**
- * @brief Serialize a PUBLISH request and put it in \p buf.
- * @ingroup packers
- *
- * @param[out] buf the buffer to put the PUBLISH packet in.
- * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
- * @param[in] topic_name the topic to publish \p application_message under.
- * @param[in] packet_id this packets packet ID.
- * @param[in] application_message the application message to be published.
- * @param[in] application_message_size the size of \p application_message in bytes.
- * @param[in] publish_flags The flags to publish \p application_message with. These include
- *                          the \c MQTT_PUBLISH_DUP flag, \c MQTT_PUBLISH_QOS_X (\c X &isin;
- *                          {0, 1, 2}), and \c MQTT_PUBLISH_RETAIN flag.
- *
- * @note The default QoS is level 0.
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718037">
- * MQTT v3.1.1: PUBLISH - Publish Message.
- * </a>
- *
- * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the PUBLISH
- *          packet, a negative value if there was a protocol violation.
- */
-ssize_t mqtt_pack_publish_request(uint8_t *buf, size_t bufsz,
-                                  const char* topic_name,
-                                  uint16_t packet_id,
-                                  void* application_message,
-                                  size_t application_message_size,
-                                  uint8_t publish_flags);
-
-/**
- * @brief Serialize a PUBACK, PUBREC, PUBREL, or PUBCOMP packet and put it in \p buf.
- * @ingroup packers
- *
- * @param[out] buf the buffer to put the PUBXXX packet in.
- * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
- * @param[in] control_type the type of packet. Must be one of: \c MQTT_CONTROL_PUBACK,
- *                         \c MQTT_CONTROL_PUBREC, \c MQTT_CONTROL_PUBREL,
- *                         or \c MQTT_CONTROL_PUBCOMP.
- * @param[in] packet_id the packet ID of the packet being acknowledged.
- *
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718043">
- * MQTT v3.1.1: PUBACK - Publish Acknowledgement.
- * </a>
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718048">
- * MQTT v3.1.1: PUBREC - Publish Received.
- * </a>
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718053">
- * MQTT v3.1.1: PUBREL - Publish Released.
- * </a>
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718058">
- * MQTT v3.1.1: PUBCOMP - Publish Complete.
- * </a>
- *
- * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the PUBXXX
- *          packet, a negative value if there was a protocol violation.
- */
-ssize_t mqtt_pack_pubxxx_request(uint8_t *buf, size_t bufsz,
-                                 enum MQTTControlPacketType control_type,
-                                 uint16_t packet_id);
-
-/**
- * @brief The maximum number topics that can be subscribed to in a single call to
- *         mqtt_pack_subscribe_request.
- * @ingroup packers
- *
- * @see mqtt_pack_subscribe_request
- */
-#define MQTT_SUBSCRIBE_REQUEST_MAX_NUM_TOPICS 8
-
-/**
- * @brief Serialize a SUBSCRIBE packet and put it in \p buf.
- * @ingroup packers
- *
- * @param[out] buf the buffer to put the SUBSCRIBE packet in.
- * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
- * @param[in] packet_id the packet ID to be used.
- * @param[in] ... \c NULL terminated list of (\c {const char *topic_name}, \c {int max_qos_level})
- *                pairs.
- *
- * @note The variadic arguments, \p ..., \em must be followed by a \c NULL. For example:
- * @code
- * ssize_t n = mqtt_pack_subscribe_request(buf, bufsz, 1234, "topic_1", 0, "topic_2", 2, NULL);
- * @endcode
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718063">
- * MQTT v3.1.1: SUBSCRIBE - Subscribe to Topics.
- * </a>
- *
- * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the SUBSCRIBE
- *          packet, a negative value if there was a protocol violation.
- */
-ssize_t mqtt_pack_subscribe_request(uint8_t *buf, size_t bufsz,
-                                    unsigned int packet_id,
-                                    ...); /* null terminated */
-
-/**
- * @brief The maximum number topics that can be subscribed to in a single call to
- *         mqtt_pack_unsubscribe_request.
- * @ingroup packers
- *
- * @see mqtt_pack_unsubscribe_request
- */
-#define MQTT_UNSUBSCRIBE_REQUEST_MAX_NUM_TOPICS 8
-
-/**
- * @brief Serialize a UNSUBSCRIBE packet and put it in \p buf.
- * @ingroup packers
- *
- * @param[out] buf the buffer to put the UNSUBSCRIBE packet in.
- * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
- * @param[in] packet_id the packet ID to be used.
- * @param[in] ... \c NULL terminated list of \c {const char *topic_name}'s to unsubscribe from.
- *
- * @note The variadic arguments, \p ..., \em must be followed by a \c NULL. For example:
- * @code
- * ssize_t n = mqtt_pack_unsubscribe_request(buf, bufsz, 4321, "topic_1", "topic_2", NULL);
- * @endcode
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718072">
- * MQTT v3.1.1: UNSUBSCRIBE - Unsubscribe from Topics.
- * </a>
- *
- * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the UNSUBSCRIBE
- *          packet, a negative value if there was a protocol violation.
- */
-ssize_t mqtt_pack_unsubscribe_request(uint8_t *buf, size_t bufsz,
-                                      unsigned int packet_id,
-                                      ...); /* null terminated */
-
-/**
- * @brief Serialize a PINGREQ and put it into \p buf.
- * @ingroup packers
- *
- * @param[out] buf the buffer to put the PINGREQ packet in.
- * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718081">
- * MQTT v3.1.1: PINGREQ - Ping Request.
- * </a>
- *
- * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the PINGREQ
- *          packet, a negative value if there was a protocol violation.
- */
-ssize_t mqtt_pack_ping_request(uint8_t *buf, size_t bufsz);
-
-/**
- * @brief Serialize a DISCONNECT and put it into \p buf.
- * @ingroup packers
- *
- * @param[out] buf the buffer to put the DISCONNECT packet in.
- * @param[in] bufsz the maximum number of bytes that can be put into \p buf.
- *
- * @see <a href="http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718090">
- * MQTT v3.1.1: DISCONNECT - Disconnect Notification.
- * </a>
- *
- * @returns The number of bytes put into \p buf, 0 if \p buf is too small to fit the DISCONNECT
- *          packet, a negative value if there was a protocol violation.
- */
-ssize_t mqtt_pack_disconnect(uint8_t *buf, size_t bufsz);
-
-
-/**
- * @brief An enumeration of queued message states.
- * @ingroup details
- */
-enum MQTTQueuedMessageState {
-    MQTT_QUEUED_UNSENT,
-    MQTT_QUEUED_AWAITING_ACK,
-    MQTT_QUEUED_COMPLETE
-};
-
-/**
- * @brief A message in a mqtt_message_queue.
- * @ingroup details
- */
-struct mqtt_queued_message {
-    /** @brief A pointer to the start of the message. */
-    uint8_t *start;
-
-    /** @brief The number of bytes in the message. */
-    size_t size;
-
-
-    /** @brief The state of the message. */
-    enum MQTTQueuedMessageState state;
-
-    /**
-     * @brief The time at which the message was sent..
-     *
-     * @note A timeout will only occur if the message is in
-     *       the MQTT_QUEUED_AWAITING_ACK \c state.
-     */
-    mqtt_pal_time_t time_sent;
-
-    /**
-     * @brief The control type of the message.
-     */
-    enum MQTTControlPacketType control_type;
-
-    /**
-     * @brief The packet id of the message.
-     *
-     * @note This field is only used if the associate \c control_type has a
-     *       \c packet_id field.
-     */
-    uint16_t packet_id;
-};
-
-/**
- * @brief A message queue.
- * @ingroup details
- *
- * @note This struct is used internally to manage sending messages.
- * @note The only members the user should use are \c curr and \c curr_sz.
- */
-struct mqtt_message_queue {
-    /**
-     * @brief The start of the message queue's memory block.
-     *
-     * @warning This member should \em not be manually changed.
-     */
-    void *mem_start;
-
-    /** @brief The end of the message queue's memory block. */
-    void *mem_end;
-
-    /**
-     * @brief A pointer to the position in the buffer you can pack bytes at.
-     *
-     * @note Immediately after packing bytes at \c curr you \em must call
-     *       mqtt_mq_register.
-     */
-    uint8_t *curr;
-
-    /**
-     * @brief The number of bytes that can be written to \c curr.
-     *
-     * @note curr_sz will decrease by more than the number of bytes you write to
-     *       \c curr. This is because the mqtt_queued_message structs share the
-     *       same memory (and thus, a mqtt_queued_message must be allocated in
-     *       the message queue's memory whenever a new message is registered).
-     */
-    size_t curr_sz;
-
-    /**
-     * @brief The tail of the array of mqtt_queued_messages's.
-     *
-     * @note This member should not be used manually.
-     */
-    struct mqtt_queued_message *queue_tail;
-};
-
-/**
- * @brief Initialize a message queue.
- * @ingroup details
- *
- * @param[out] mq The message queue to initialize.
- * @param[in] buf The buffer for this message queue.
- * @param[in] bufsz The number of bytes in the buffer.
- *
- * @relates mqtt_message_queue
- */
-void mqtt_mq_init(struct mqtt_message_queue *mq, void *buf, size_t bufsz);
-
-/**
- * @brief Clear as many messages from the front of the queue as possible.
- * @ingroup details
- *
- * @note Calls to this function are the \em only way to remove messages from the queue.
- *
- * @param mq The message queue.
- *
- * @relates mqtt_message_queue
- */
-void mqtt_mq_clean(struct mqtt_message_queue *mq);
-
-/**
- * @brief Register a message that was just added to the buffer.
- * @ingroup details
- *
- * @note This function should be called immediately following a call to a packer function
- *       that returned a positive value. The positive value (number of bytes packed) should
- *       be passed to this function.
- *
- * @param mq The message queue.
- * @param[in] nbytes The number of bytes that were just packed.
- *
- * @note This function will step mqtt_message_queue::curr and update mqtt_message_queue::curr_sz.
- * @relates mqtt_message_queue
- *
- * @returns The newly added struct mqtt_queued_message.
- */
-struct mqtt_queued_message* mqtt_mq_register(struct mqtt_message_queue *mq, size_t nbytes);
-
-/**
- * @brief Find a message in the message queue.
- * @ingroup details
- *
- * @param mq The message queue.
- * @param[in] control_type The control type of the message you want to find.
- * @param[in] packet_id The packet ID of the message you want to find. Set to \c NULL if you
- *            don't want to specify a packet ID.
- *
- * @relates mqtt_message_queue
- * @returns The found message. \c NULL if the message was not found.
- */
-struct mqtt_queued_message* mqtt_mq_find(struct mqtt_message_queue *mq, enum MQTTControlPacketType control_type, uint16_t *packet_id);
-
-/**
- * @brief Returns the mqtt_queued_message at \p index.
- * @ingroup details
- *
- * @param mq_ptr A pointer to the message queue.
- * @param index The index of the message.
- *
- * @returns The mqtt_queued_message at \p index.
- */
-#define mqtt_mq_get(mq_ptr, index) (((struct mqtt_queued_message*) ((mq_ptr)->mem_end)) - 1 - index)
-
-/**
- * @brief Returns the number of messages in the message queue, \p mq_ptr.
- * @ingroup details
- */
-#define mqtt_mq_length(mq_ptr) (((struct mqtt_queued_message*) ((mq_ptr)->mem_end)) - (mq_ptr)->queue_tail)
-
-/**
- * @brief Used internally to recalculate the \c curr_sz.
- * @ingroup details
- */
-#define mqtt_mq_currsz(mq_ptr) (mq_ptr->curr >= (uint8_t*) ((mq_ptr)->queue_tail - 1)) ? 0 : ((uint8_t*) ((mq_ptr)->queue_tail - 1)) - (mq_ptr)->curr
-
-/* CLIENT */
-
-/**
- * @brief An MQTT client.
- * @ingroup details
- *
- * @note All members can be manipulated via the related functions.
- */
-struct mqtt_client {
-    /** @brief The socket connecting to the MQTT broker. */
-    mqtt_pal_socket_handle socketfd;
-
-    /** @brief The LFSR state used to generate packet ID's. */
-    uint16_t pid_lfsr;
-
-    /** @brief The keep-alive time in seconds. */
-    uint16_t keep_alive;
-
-    /**
-     * @brief A counter counting pings that have been sent to keep the connection alive.
-     * @see keep_alive
-     */
-    int number_of_keep_alives;
-
-    /**
-     * @brief The current sent offset.
-     *
-     * This is used to allow partial send commands.
-     */
-    size_t send_offset;
-
-    /**
-     * @brief The timestamp of the last message sent to the buffer.
-     *
-     * This is used to detect the need for keep-alive pings.
-     *
-     * @see keep_alive
-    */
-    mqtt_pal_time_t time_of_last_send;
-
-    /**
-     * @brief The error state of the client.
-     *
-     * error should be MQTT_OK for the entirety of the connection.
-     *
-     * @note The error state will be MQTT_ERROR_CONNECT_NOT_CALLED until
-     *       you call mqtt_connect.
-     */
-    enum MQTTErrors error;
-
-    /**
-     * @brief The timeout period in seconds.
-     *
-     * If the broker doesn't return an ACK within response_timeout seconds a timeout
-     * will occur and the message will be retransmitted.
-     *
-     * @note The default value is 30 [seconds] but you can change it at any time.
-     */
-    int response_timeout;
-
-    /** @brief A counter counting the number of timeouts that have occurred. */
-    int number_of_timeouts;
-
-    /**
-     * @brief Approximately much time it has typically taken to receive responses from the
-     *        broker.
-     *
-     * @note This is tracked using an exponential-averaging.
-     */
-    double typical_response_time;
-
-    /**
-     * @brief The callback that is called whenever a publish is received from the broker.
-     *
-     * Any topics that you have subscribed to will be returned from the broker as
-     * mqtt_response_publish messages. All the publishes received from the broker will
-     * be passed to this function.
-     *
-     * @note A pointer to publish_response_callback_state is always passed to the callback.
-     *       Use publish_response_callback_state to keep track of any state information you
-     *       need.
-     */
-    void (*publish_response_callback)(void** state, struct mqtt_response_publish *publish);
-
-    /**
-     * @brief A pointer to any publish_response_callback state information you need.
-     *
-     * @note A pointer to this pointer will always be publish_response_callback upon
-     *       receiving a publish message from the broker.
-     */
-    void* publish_response_callback_state;
-
-    /**
-     * @brief A user-specified callback, triggered on each \ref mqtt_sync, allowing
-     *        the user to perform state inspections (and custom socket error detection)
-     *        on the client.
-     *
-     * This callback is triggered on each call to \ref mqtt_sync. If it returns MQTT_OK
-     * then \ref mqtt_sync will continue normally (performing reads and writes). If it
-     * returns an error then \ref mqtt_sync will not call reads and writes.
-     *
-     * This callback can be used to perform custom error detection, namely platform
-     * specific socket error detection, and force the client into an error state.
-     *
-     * This member is always initialized to NULL but it can be manually set at any
-     * time.
-     */
-    enum MQTTErrors (*inspector_callback)(struct mqtt_client*);
-
-    /**
-     * @brief A callback that is called whenever the client is in an error state.
-     *
-     * This callback is responsible for: application level error handling, closing
-     * previous sockets, and reestabilishing the connection to the broker and
-     * session configurations (i.e. subscriptions).
-     */
-    void (*reconnect_callback)(struct mqtt_client*, void**);
-
-    /**
-     * @brief A pointer to some state. A pointer to this member is passed to
-     *        \ref mqtt_client.reconnect_callback.
-     */
-    void* reconnect_state;
-
-    /**
-     * @brief The buffer where ingress data is temporarily stored.
-     */
-    struct {
-        /** @brief The start of the receive buffer's memory. */
-        uint8_t *mem_start;
-
-        /** @brief The size of the receive buffer's memory. */
-        size_t mem_size;
-
-        /** @brief A pointer to the next writtable location in the receive buffer. */
-        uint8_t *curr;
-
-        /** @brief The number of bytes that are still writable at curr. */
-        size_t curr_sz;
-    } recv_buffer;
-
-    /**
-     * @brief A variable passed to support thread-safety.
-     *
-     * A pointer to this variable is passed to \c MQTT_PAL_MUTEX_LOCK, and
-     * \c MQTT_PAL_MUTEX_UNLOCK.
-     */
-    mqtt_pal_mutex_t mutex;
-
-    /** @brief The sending message queue. */
-    struct mqtt_message_queue mq;
-};
-
-/**
- * @brief Generate a new next packet ID.
- * @ingroup details
- *
- * Packet ID's are generated using a max-length LFSR.
- *
- * @param client The MQTT client.
- *
- * @returns The new packet ID that should be used.
- */
-uint16_t __mqtt_next_pid(struct mqtt_client *client);
-
-/**
- * @brief Handles egress client traffic.
- * @ingroup details
- *
- * @param client The MQTT client.
- *
- * @returns MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-ssize_t __mqtt_send(struct mqtt_client *client);
-
-/**
- * @brief Handles ingress client traffic.
- * @ingroup details
- *
- * @param client The MQTT client.
- *
- * @returns MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-ssize_t __mqtt_recv(struct mqtt_client *client);
-
-/**
- * @brief Function that does the actual sending and receiving of
- *        traffic from the network.
- * @ingroup api
- *
- * All the other functions in the @ref api simply stage messages for
- * being sent to the broker. This function does the actual sending of
- * those messages. Additionally this function receives traffic (responses and
- * acknowledgements) from the broker and responds to that traffic accordingly.
- * Lastly this function also calls the \c publish_response_callback when
- * any \c MQTT_CONTROL_PUBLISH messages are received.
- *
- * @pre mqtt_init must have been called.
- *
- * @param[in,out] client The MQTT client.
- *
- * @attention It is the responsibility of the application programmer to
- *            call this function periodically. All functions in the @ref api are
- *            thread-safe so it is perfectly reasonable to have a thread dedicated
- *            to calling this function every 200 ms or so. MQTT-C can be used in single
- *            threaded application though by simply calling this functino periodically
- *            inside your main thread. See @ref simple_publisher.c and @ref simple_subscriber.c
- *            for examples (specifically the \c client_refresher functions).
- *
- * @returns MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-enum MQTTErrors mqtt_sync(struct mqtt_client *client);
-
-/**
- * @brief Initializes an MQTT client.
- * @ingroup api
- *
- * This function \em must be called before any other API function calls.
- *
- * @pre None.
- *
- * @param[out] client The MQTT client.
- * @param[in] sockfd The socket file descriptor (or equivalent socket handle, e.g. BIO pointer
- *            for OpenSSL sockets) connected to the MQTT broker.
- * @param[in] sendbuf A buffer that will be used for sending messages to the broker.
- * @param[in] sendbufsz The size of \p sendbuf in bytes.
- * @param[in] recvbuf A buffer that will be used for receiving messages from the broker.
- * @param[in] recvbufsz The size of \p recvbuf in bytes.
- * @param[in] publish_response_callback The callback to call whenever application messages
- *            are received from the broker.
- *
- * @post mqtt_connect must be called.
- *
- * @note \p sockfd is a non-blocking TCP connection.
- * @note If \p sendbuf fills up completely during runtime a \c MQTT_ERROR_SEND_BUFFER_IS_FULL
- *       error will be set. Similarly if \p recvbuf is ever to small to receive a message from
- *       the broker an MQTT_ERROR_RECV_BUFFER_TOO_SMALL error will be set.
- * @note A pointer to \ref mqtt_client.publish_response_callback_state is always passed as the
- *       \c state argument to \p publish_response_callback. Note that the second argument is
- *       the mqtt_response_publish that was received from the broker.
- *
- * @attention Only initialize an MQTT client once (i.e. don't call \ref mqtt_init or
- *            \ref mqtt_init_reconnect more than once per client).
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-enum MQTTErrors mqtt_init(struct mqtt_client *client,
-                          mqtt_pal_socket_handle sockfd,
-                          uint8_t *sendbuf, size_t sendbufsz,
-                          uint8_t *recvbuf, size_t recvbufsz,
-                          void (*publish_response_callback)(void** state, struct mqtt_response_publish *publish));
-
-/**
- * @brief Initializes an MQTT client and enables automatic reconnections.
- * @ingroup api
- *
- * An alternative to \ref mqtt_init that allows the client to automatically reconnect to the
- * broker after an error occurs (e.g. socket error or internal buffer overflows).
- *
- * This is accomplished by calling the \p reconnect_callback whenever the client enters an error
- * state. The job of the \p reconnect_callback is to: (1) perform error handling/logging,
- * (2) clean up the old connection (i.e. close client->socketfd), (3) \ref mqtt_reinit the
- * client, and (4) reconfigure the MQTT session by calling \ref mqtt_connect followed by other
- * API calls such as \ref mqtt_subscribe.
- *
- * The first argument to the \p reconnect_callback is the client (which will be in an error
- * state) and the second argument is a pointer to a void pointer where you can store some state
- * information. Internally, MQTT-C calls the reconnect callback like so:
- *
- * \code
- *     client->reconnect_callback(client, &client->reconnect_state)
- * \endcode
- *
- * Note that the \p reconnect_callback is also called to setup the initial session. After
- * calling \ref mqtt_init_reconnect the client will be in the error state
- * \c MQTT_ERROR_INITIAL_RECONNECT.
- *
- * @pre None.
- *
- * @param[in,out] client The MQTT client that will be initialized.
- * @param[in] reconnect_callback The callback that will be called to connect/reconnect the
- *            client to the broker and perform application level error handling.
- * @param[in] reconnect_state A pointer to some state data for your \p reconnect_callback.
- *            If your \p reconnect_callback does not require any state information set this
- *            to NULL. A pointer to the memory address where the client stores a copy of this
- *            pointer is passed as the second argumnet to \p reconnect_callback.
- * @param[in] publish_response_callback The callback to call whenever application messages
- *            are received from the broker.
- *
- * @post Call \p reconnect_callback yourself, or call \ref mqtt_sync
- *       (which will trigger the call to \p reconnect_callback).
- *
- * @attention Only initialize an MQTT client once (i.e. don't call \ref mqtt_init or
- *            \ref mqtt_init_reconnect more than once per client).
- *
- */
-void mqtt_init_reconnect(struct mqtt_client *client,
-                         void (*reconnect_callback)(struct mqtt_client *client, void** state),
-                         void *reconnect_state,
-                         void (*publish_response_callback)(void** state, struct mqtt_response_publish *publish));
-
-/**
- * @brief Safely assign/reassign a socket and buffers to an new/existing client.
- * @ingroup api
- *
- * This function also clears the \p client error state. Upon exiting this function
- * \c client->error will be \c MQTT_ERROR_CONNECT_NOT_CALLED (which will be cleared)
- * as soon as \ref mqtt_connect is called.
- *
- * @pre This function must be called BEFORE \ref mqtt_connect.
- *
- * @param[in,out] client The MQTT client.
- * @param[in] socketfd The new socket connected to the broker.
- * @param[in] sendbuf The buffer that will be used to buffer egress traffic to the broker.
- * @param[in] sendbufsz The size of \p sendbuf in bytes.
- * @param[in] recvbuf The buffer that will be used to buffer ingress traffic from the broker.
- * @param[in] recvbufsz The size of \p recvbuf in bytes.
- *
- * @post Call \ref mqtt_connect.
- *
- * @attention This function should be used in conjunction with clients that have been
- *            initialzed with \ref mqtt_init_reconnect.
- */
-void mqtt_reinit(struct mqtt_client* client,
-                 mqtt_pal_socket_handle socketfd,
-                 uint8_t *sendbuf, size_t sendbufsz,
-                 uint8_t *recvbuf, size_t recvbufsz);
-
-/**
- * @brief Establishes a session with the MQTT broker.
- * @ingroup api
- *
- * @pre mqtt_init must have been called.
- *
- * @param[in,out] client The MQTT client.
- * @param[in] client_id The unique name identifying the client. (or NULL)
- * @param[in] will_topic The topic name of client's \p will_message. If no will message is
- *            desired set to \c NULL.
- * @param[in] will_message The application message (data) to be published in the event the
- *            client ungracefully disconnects. Set to \c NULL if \p will_topic is \c NULL.
- * @param[in] will_message_size The size of \p will_message in bytes.
- * @param[in] user_name The username to use when establishing the session with the MQTT broker.
- *            Set to \c NULL if a username is not required.
- * @param[in] password The password to use when establishing the session with the MQTT broker.
- *            Set to \c NULL if a password is not required.
- * @param[in] connect_flags Additional \ref MQTTConnectFlags to use when establishing the connection.
- *            These flags are for forcing the session to start clean,
- *            \c MQTT_CONNECT_CLEAN_SESSION, the QOS level to publish the \p will_message with
- *            (provided \c will_message != \c NULL), MQTT_CONNECT_WILL_QOS_[0,1,2], and whether
- *            or not the broker should retain the \c will_message, MQTT_CONNECT_WILL_RETAIN.
- * @param[in] keep_alive The keep-alive time in seconds. A reasonable value for this is 400 [seconds].
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-enum MQTTErrors mqtt_connect(struct mqtt_client *client,
-                             const char* client_id,
-                             const char* will_topic,
-                             const void* will_message,
-                             size_t will_message_size,
-                             const char* user_name,
-                             const char* password,
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-                             const char* caFilePath,
-                             const char* caPath,
-                             const char* clientCertPath,
-                             const char* clientKeyPath,
-                             bool useTLS,
-#endif
-                             uint8_t connect_flags,
-                             uint16_t keep_alive);
-
-/*
-    todo: will_message should be a void*
-*/
-
-/**
- * @brief Publish an application message.
- * @ingroup api
- *
- * Publishes an application message to the MQTT broker.
- *
- * @pre mqtt_connect must have been called.
- *
- * @param[in,out] client The MQTT client.
- * @param[in] topic_name The name of the topic.
- * @param[in] application_message The data to be published.
- * @param[in] application_message_size The size of \p application_message in bytes.
- * @param[in] publish_flags \ref MQTTPublishFlags to be used, namely the QOS level to
- *            publish at (MQTT_PUBLISH_QOS_[0,1,2]) or whether or not the broker should
- *            retain the publish (MQTT_PUBLISH_RETAIN).
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-enum MQTTErrors mqtt_publish(struct mqtt_client *client,
-                             const char* topic_name,
-                             void* application_message,
-                             size_t application_message_size,
-                             uint8_t publish_flags);
-
-/**
- * @brief Acknowledge an ingree publish with QOS==1.
- * @ingroup details
- *
- * @param[in,out] client The MQTT client.
- * @param[in] packet_id The packet ID of the ingress publish being acknowledged.
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-ssize_t __mqtt_puback(struct mqtt_client *client, uint16_t packet_id);
-
-/**
- * @brief Acknowledge an ingree publish with QOS==2.
- * @ingroup details
- *
- * @param[in,out] client The MQTT client.
- * @param[in] packet_id The packet ID of the ingress publish being acknowledged.
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-ssize_t __mqtt_pubrec(struct mqtt_client *client, uint16_t packet_id);
-
-/**
- * @brief Acknowledge an ingree PUBREC packet.
- * @ingroup details
- *
- * @param[in,out] client The MQTT client.
- * @param[in] packet_id The packet ID of the ingress PUBREC being acknowledged.
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-ssize_t __mqtt_pubrel(struct mqtt_client *client, uint16_t packet_id);
-
-/**
- * @brief Acknowledge an ingree PUBREL packet.
- * @ingroup details
- *
- * @param[in,out] client The MQTT client.
- * @param[in] packet_id The packet ID of the ingress PUBREL being acknowledged.
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-ssize_t __mqtt_pubcomp(struct mqtt_client *client, uint16_t packet_id);
-
-
-/**
- * @brief Subscribe to a topic.
- * @ingroup api
- *
- * @pre mqtt_connect must have been called.
- *
- * @param[in,out] client The MQTT client.
- * @param[in] topic_name The name of the topic to subscribe to.
- * @param[in] max_qos_level The maximum QOS level with which the broker can send application
- *            messages for this topic.
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-enum MQTTErrors mqtt_subscribe(struct mqtt_client *client,
-                               const char* topic_name,
-                               int max_qos_level);
-
-/**
- * @brief Unsubscribe from a topic.
- * @ingroup api
- *
- * @pre mqtt_connect must have been called.
- *
- * @param[in,out] client The MQTT client.
- * @param[in] topic_name The name of the topic to unsubscribe from.
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-enum MQTTErrors mqtt_unsubscribe(struct mqtt_client *client,
-                                 const char* topic_name);
-
-/**
- * @brief Ping the broker.
- * @ingroup api
- *
- * @pre mqtt_connect must have been called.
- *
- * @param[in,out] client The MQTT client.
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-enum MQTTErrors mqtt_ping(struct mqtt_client *client);
-
-/**
- * @brief Ping the broker without locking/unlocking the mutex.
- * @see mqtt_ping
- */
-enum MQTTErrors __mqtt_ping(struct mqtt_client *client);
-
-/**
- * @brief Terminate the session with the MQTT broker.
- * @ingroup api
- *
- * @pre mqtt_connect must have been called.
- *
- * @param[in,out] client The MQTT client.
- *
- * @note To re-establish the session, mqtt_connect must be called.
- *
- * @returns \c MQTT_OK upon success, an \ref MQTTErrors otherwise.
- */
-enum MQTTErrors mqtt_disconnect(struct mqtt_client *client);
-
-#endif
diff --git a/deps/mqtt-c/mqtt_pal.h b/deps/mqtt-c/mqtt_pal.h
deleted file mode 100644
index c8581c174e0..00000000000
--- a/deps/mqtt-c/mqtt_pal.h
+++ /dev/null
@@ -1,115 +0,0 @@
-#ifndef __MQTT_PAL_H__
-#define __MQTT_PAL_H__
-
-/**
- * Copyright (c) 2019 Kalycito Infotech Private Limited
- * @file
- * @brief Includes/supports the types/calls required by the MQTT-C client.
- * 
- * @note This is the \em only file included in mqtt.h, and mqtt.c. It is therefore 
- *       responsible for including/supporting all the required types and calls. 
- * 
- * @defgroup pal Platform abstraction layer
- * @brief Documentation of the types and calls required to port MQTT-C to a new platform.
- * 
- * mqtt_pal.h is the \em only header file included in mqtt.c. Therefore, to port MQTT-C to a 
- * new platform the following types, functions, constants, and macros must be defined in 
- * mqtt_pal.h:
- *  - Types:
- *      - \c size_t, \c ssize_t
- *      - \c uint8_t, \c uint16_t, \c uint32_t
- *      - \c va_list
- *      - \c mqtt_pal_time_t : return type of \c MQTT_PAL_TIME() 
- *      - \c mqtt_pal_mutex_t : type of the argument that is passed to \c MQTT_PAL_MUTEX_LOCK and 
- *        \c MQTT_PAL_MUTEX_RELEASE
- *  - Functions:
- *      - \c memcpy, \c strlen
- *      - \c va_start, \c va_arg, \c va_end
- *  - Constants:
- *      - \c INT_MIN
- * 
- * Additionally, three macro's are required:
- *  - \c MQTT_PAL_HTONS(s) : host-to-network endian conversion for uint16_t.
- *  - \c MQTT_PAL_NTOHS(s) : network-to-host endian conversion for uint16_t.
- *  - \c MQTT_PAL_TIME()   : returns [type: \c mqtt_pal_time_t] current time in seconds. 
- *  - \c MQTT_PAL_MUTEX_LOCK(mtx_pointer) : macro that locks the mutex pointed to by \c mtx_pointer.
- *  - \c MQTT_PAL_MUTEX_RELEASE(mtx_pointer) : macro that unlocks the mutex pointed to by 
- *    \c mtx_pointer.
- * 
- * Lastly, \ref mqtt_pal_sendall and \ref mqtt_pal_recvall, must be implemented in mqtt_pal.c 
- * for sending and receiving data using the platforms socket calls.
- */
-
-#include <open62541/types.h>
-
-/* UNIX-like platform support */
-#ifdef __unix__
-    #include <limits.h>
-    #include <string.h>
-    #include <stdarg.h>
-    #include <time.h>
-    #include <arpa/inet.h>
-    #include <pthread.h>
-
-    /*#ifdef MQTT_USE_BIO
-        #include <openssl/bio.h>
-        typedef BIO* mqtt_pal_socket_handle;
-    #else
-        typedef int mqtt_pal_socket_handle;
-    #endif*/
-#endif
-
-#ifdef __MINGW32__
-    #include <pthread.h>
-#endif
-
-
-    #define MQTT_PAL_HTONS(s) htons(s)
-    #define MQTT_PAL_NTOHS(s) ntohs(s)
-
-    #define MQTT_PAL_TIME() time(NULL)
-
-    typedef time_t mqtt_pal_time_t;
-    typedef pthread_mutex_t mqtt_pal_mutex_t;
-
-    #define MQTT_PAL_MUTEX_INIT(mtx_ptr) pthread_mutex_init(mtx_ptr, NULL)
-    #define MQTT_PAL_MUTEX_LOCK(mtx_ptr) pthread_mutex_lock(mtx_ptr)
-    #define MQTT_PAL_MUTEX_UNLOCK(mtx_ptr) pthread_mutex_unlock(mtx_ptr)
-
-    struct my_custom_socket_handle {
-        void* client;
-        void* connection;
-#ifdef UA_ENABLE_MQTT_TLS
-        void* tls;
-#endif
-        uint16_t timeout;
-    };
-    
-    typedef struct my_custom_socket_handle* mqtt_pal_socket_handle;
-/**
- * @brief Sends all the bytes in a buffer.
- * @ingroup pal
- * 
- * @param[in] fd The file-descriptor (or handle) of the socket.
- * @param[in] buf A pointer to the first byte in the buffer to send.
- * @param[in] len The number of bytes to send (starting at \p buf).
- * @param[in] flags Flags which are passed to the underlying socket.
- * 
- * @returns The number of bytes sent if successful, an \ref MQTTErrors otherwise.
- */
-ssize_t mqtt_pal_sendall(mqtt_pal_socket_handle fd, const void* buf, size_t len, int flags);
-
-/**
- * @brief Non-blocking receive all the byte available.
- * @ingroup pal
- * 
- * @param[in] fd The file-descriptor (or handle) of the socket.
- * @param[in] buf A pointer to the receive buffer.
- * @param[in] bufsz The max number of bytes that can be put into \p buf.
- * @param[in] flags Flags which are passed to the underlying socket.
- * 
- * @returns The number of bytes received if successful, an \ref MQTTErrors otherwise.
- */
-ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int flags);
-
-#endif /* __MQTT_PAL_H__ */
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index fbc9df31413..db39f2a5078 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -40,13 +40,16 @@
  * options is provided, the system's default certificate location will be used.
  */
 
-#include "open62541/server.h"
-#include "open62541/server_config_default.h"
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
 #include "ua_pubsub.h"
-#include "ua_network_pubsub_mqtt.h"
-#include "open62541/plugin/log_stdout.h"
+
 #include <signal.h>
 
+#include <open62541/plugin/pubsub_mqtt.h>
+
 #define CONNECTION_NAME              "MQTT Publisher Connection"
 #define TRANSPORT_PROFILE_URI        "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
 #define MQTT_CLIENT_ID               "TESTCLIENTPUBSUBMQTT"
@@ -68,7 +71,7 @@
 #endif
 
 // Uncomment the following line to enable MQTT via TLS for the example
-// #define EXAMPLE_USE_MQTT_TLS
+//#define EXAMPLE_USE_MQTT_TLS
 
 #ifdef EXAMPLE_USE_MQTT_TLS
 #define USE_TLS_OPTION_NAME             "mqttUseTLS"
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 28cb0b4e7e7..09375a80f6e 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -44,6 +44,7 @@
 #cmakedefine UA_ENABLE_PUBSUB_MQTT
 #cmakedefine UA_ENABLE_MQTT_TLS
 #cmakedefine UA_ENABLE_MQTT_TLS_OPENSSL
+#cmakedefine UA_ENABLE_MQTT_TLS_MBEDTLS
 #cmakedefine UA_ENABLE_ENCRYPTION_MBEDTLS
 #cmakedefine UA_ENABLE_TPM2_SECURITY
 #cmakedefine UA_ENABLE_ENCRYPTION_OPENSSL
diff --git a/plugins/ua_network_pubsub_mqtt.h b/plugins/include/open62541/plugin/pubsub_mqtt.h
similarity index 79%
rename from plugins/ua_network_pubsub_mqtt.h
rename to plugins/include/open62541/plugin/pubsub_mqtt.h
index 78571831dac..cb972734c82 100644
--- a/plugins/ua_network_pubsub_mqtt.h
+++ b/plugins/include/open62541/plugin/pubsub_mqtt.h
@@ -12,11 +12,13 @@
 extern "C" {
 #endif
 
-#include "open62541/plugin/pubsub.h"
-#include "open62541/network_tcp.h"
+#include <open62541/plugin/pubsub.h>
+#include <open62541/network_tcp.h>
 
-#ifdef UA_ENABLE_MQTT_TLS
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
 #include <openssl/ssl.h>
+#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+#include <mqtt_pal.h>
 #endif
 
 /* mqtt network layer specific internal data */
@@ -28,8 +30,12 @@ typedef struct {
     uint8_t *mqttRecvBuffer; 
     UA_String *mqttClientId;
     UA_Connection *connection;
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    SSL *ssl;
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
+    BIO *sockfd;
+#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+    mqtt_pal_socket_handle sockfd;
+#else
+    int sockfd;
 #endif
     void * mqttClient;
     void (*callback)(UA_ByteString *encodedBuffer, UA_ByteString *topic);
diff --git a/plugins/mqtt/templates/mbedtls_sockets.h b/plugins/mqtt/templates/mbedtls_sockets.h
new file mode 100644
index 00000000000..5d3935dba30
--- /dev/null
+++ b/plugins/mqtt/templates/mbedtls_sockets.h
@@ -0,0 +1,159 @@
+#if !defined(__MBEDTLS_SOCKET_TEMPLATE_H__)
+#define __MBEDTLS_SOCKET_TEMPLATE_H__
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <mbedtls/error.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/net_sockets.h>
+#include <mbedtls/ssl.h>
+
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/util.h>
+
+#if !defined(MBEDTLS_NET_POLL_READ)
+/* compat for older mbedtls */
+#define	MBEDTLS_NET_POLL_READ	1
+#define	MBEDTLS_NET_POLL_WRITE	1
+
+int
+mbedtls_net_poll(mbedtls_net_context * ctx, uint32_t rw, uint32_t timeout)
+{
+	/* XXX this is not ideal but good enough for an example */
+	usleep(300);
+	return 1;
+}
+#endif
+
+struct mbedtls_context {
+    mbedtls_net_context net_ctx;
+    mbedtls_ssl_context ssl_ctx;
+    mbedtls_ssl_config ssl_conf;
+    mbedtls_x509_crt ca_crt;
+    mbedtls_entropy_context entropy;
+    mbedtls_ctr_drbg_context ctr_drbg;
+};
+
+UA_StatusCode failed(const char *fn, int rv);
+UA_StatusCode cert_verify_failed(uint32_t rv);
+UA_StatusCode open_nb_socket(struct mbedtls_context *ctx,
+                    const char *hostname,
+                    const char *port,
+                    const char *ca_file);
+
+
+UA_StatusCode failed(const char *fn, int rv) {
+    char buf[100];
+    mbedtls_strerror(rv, buf, sizeof(buf));
+    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                 "MQTT PubSub: %s failed with %x %s", fn, -rv, buf);
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
+UA_StatusCode cert_verify_failed(uint32_t rv) {
+    char buf[512];
+    mbedtls_x509_crt_verify_info(buf, sizeof(buf), "\t", rv);
+    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                 "MQTT PubSub: Certificate verification failed (%x) %s", rv, buf);
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
+/*
+    A template for opening a non-blocking mbed TLS connection.
+*/
+UA_StatusCode open_nb_socket(struct mbedtls_context *ctx,
+                    const char *hostname,
+                    const char *port,
+                    const char *ca_file) {
+    const unsigned char *additional = (const unsigned char *)"MQTT-C";
+    size_t additional_len = 6;
+    int rv;
+
+    mbedtls_net_context *net_ctx = &ctx->net_ctx;
+    mbedtls_ssl_context *ssl_ctx = &ctx->ssl_ctx;
+    mbedtls_ssl_config *ssl_conf = &ctx->ssl_conf;
+    mbedtls_x509_crt *ca_crt = &ctx->ca_crt;
+    mbedtls_entropy_context *entropy = &ctx->entropy;
+    mbedtls_ctr_drbg_context *ctr_drbg = &ctx->ctr_drbg;
+
+    mbedtls_entropy_init(entropy);
+    mbedtls_ctr_drbg_init(ctr_drbg);
+    rv = mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func, entropy,
+                               additional, additional_len);
+    if (rv != 0) {
+        return failed("mbedtls_ctr_drbg_seed", rv);
+    }
+
+    mbedtls_x509_crt_init(ca_crt);
+    rv = mbedtls_x509_crt_parse_file(ca_crt, ca_file);
+    if (rv != 0) {
+        return failed("mbedtls_x509_crt_parse_file", rv);
+    }
+
+    mbedtls_ssl_config_init(ssl_conf);
+    rv = mbedtls_ssl_config_defaults(ssl_conf,  MBEDTLS_SSL_IS_CLIENT,
+                                     MBEDTLS_SSL_TRANSPORT_STREAM,
+                                     MBEDTLS_SSL_PRESET_DEFAULT);
+    if (rv != 0) {
+        return failed("mbedtls_ssl_config_defaults", rv);
+    }
+    mbedtls_ssl_conf_ca_chain(ssl_conf, ca_crt, NULL);
+    mbedtls_ssl_conf_authmode(ssl_conf, MBEDTLS_SSL_VERIFY_OPTIONAL);
+    mbedtls_ssl_conf_rng(ssl_conf, mbedtls_ctr_drbg_random, ctr_drbg);
+
+    mbedtls_net_init(net_ctx);
+    rv = mbedtls_net_connect(net_ctx, hostname, port, MBEDTLS_NET_PROTO_TCP);
+    if (rv != 0) {
+        return failed("mbedtls_net_connect", rv);
+    }
+    rv = mbedtls_net_set_nonblock(net_ctx);
+    if (rv != 0) {
+        return failed("mbedtls_net_set_nonblock", rv);
+    }
+
+    mbedtls_ssl_init(ssl_ctx);
+    rv = mbedtls_ssl_setup(ssl_ctx, ssl_conf);
+    if (rv != 0) {
+        return failed("mbedtls_ssl_setup", rv);
+    }
+    rv = mbedtls_ssl_set_hostname(ssl_ctx, hostname);
+    if (rv != 0) {
+        return failed("mbedtls_ssl_set_hostname", rv);
+    }
+    mbedtls_ssl_set_bio(ssl_ctx, net_ctx,
+                        mbedtls_net_send, mbedtls_net_recv, NULL);
+
+    for (;;) {
+        rv = mbedtls_ssl_handshake(ssl_ctx);
+        uint32_t want = 0;
+        if (rv == MBEDTLS_ERR_SSL_WANT_READ) {
+            want |= MBEDTLS_NET_POLL_READ;
+        } else if (rv == MBEDTLS_ERR_SSL_WANT_WRITE) {
+            want |= MBEDTLS_NET_POLL_WRITE;
+        } else {
+            break;
+        }
+        rv = mbedtls_net_poll(net_ctx, want, (uint32_t)-1);
+        if (rv < 0) {
+            return failed("mbedtls_net_poll", rv);
+        }
+    }
+    if (rv != 0) {
+        return failed("mbedtls_ssl_handshake", rv);
+    }
+    uint32_t result = mbedtls_ssl_get_verify_result(ssl_ctx);
+    if (result != 0) {
+        if (result == (uint32_t)-1) {
+            return failed("mbedtls_ssl_get_verify_result", (int)result);
+        } else {
+            cert_verify_failed(result);
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif
diff --git a/plugins/mqtt/templates/openssl_sockets.h b/plugins/mqtt/templates/openssl_sockets.h
new file mode 100644
index 00000000000..c15c9231a6e
--- /dev/null
+++ b/plugins/mqtt/templates/openssl_sockets.h
@@ -0,0 +1,102 @@
+#if !defined(__OPENSSL_SOCKET_TEMPLATE_H__)
+#define __OPENSSL_SOCKET_TEMPLATE_H__
+
+#include <openssl/bio.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+#include <string.h>
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/util.h>
+
+/*
+    A template for opening a non-blocking OpenSSL connection.
+*/
+UA_StatusCode open_nb_socket(BIO**       bio,
+                    SSL_CTX**   ssl_ctx,
+                    const char* addr,
+                    const char* port,
+                    const char* ca_file,
+                    const char* ca_path,
+                    const char* cert_file,
+                    const char* key_file);
+
+UA_StatusCode open_nb_socket(BIO**       bio,
+                    SSL_CTX**   ssl_ctx,
+                    const char* addr,
+                    const char* port,
+                    const char* ca_file,
+                    const char* ca_path,
+                    const char* cert_file,
+                    const char* key_file)
+{
+    *ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+    SSL* ssl;
+
+    /* load certificate */
+    if (!SSL_CTX_load_verify_locations(*ssl_ctx, ca_file, ca_path)) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "MQTT PubSub: Failed to load ca certificate");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    if (cert_file && key_file)
+    {
+        if (!SSL_CTX_use_certificate_file(*ssl_ctx, cert_file, SSL_FILETYPE_PEM))
+        {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "MQTT PubSub: Failed to load client certificate");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+
+        if (!SSL_CTX_use_PrivateKey_file(*ssl_ctx, key_file, SSL_FILETYPE_PEM))
+        {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "MQTT PubSub: Failed to load client key");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+
+    /* open BIO socket */
+    char * addr_copy = (char*)malloc(strlen(addr) + 1);
+    strcpy(addr_copy,addr);
+    char * port_copy = (char*)malloc(strlen(port) + 1);
+    strcpy(port_copy,port);
+
+    *bio = BIO_new_ssl_connect(*ssl_ctx);
+    BIO_get_ssl(*bio, &ssl);
+    SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
+    BIO_set_conn_hostname(*bio, addr_copy);
+    BIO_set_nbio(*bio, 1);
+    BIO_set_conn_port(*bio, port_copy);
+
+    free(addr_copy);
+    free(port_copy);
+
+    /* wait for connect with 10 second timeout */
+    int start_time = (int)time(NULL);
+    int do_connect_rv = (int)BIO_do_connect(*bio);
+    while(do_connect_rv <= 0 && BIO_should_retry(*bio) && (int)time(NULL) - start_time < 10) {
+        do_connect_rv = (int)BIO_do_connect(*bio);
+    }
+    if (do_connect_rv <= 0) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "MQTT PubSub: Failed to open socket: %s", ERR_reason_error_string(ERR_get_error()));
+        BIO_free_all(*bio);
+        SSL_CTX_free(*ssl_ctx);
+        *bio = NULL;
+        *ssl_ctx=NULL;
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* verify certificate */
+    if (SSL_get_verify_result(ssl) != X509_V_OK) {
+        /* Handle the failed verification */
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "MQTT PubSub: x509 certificate verification failed");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif
diff --git a/plugins/mqtt/templates/posix_sockets.h b/plugins/mqtt/templates/posix_sockets.h
new file mode 100644
index 00000000000..433e80e4d99
--- /dev/null
+++ b/plugins/mqtt/templates/posix_sockets.h
@@ -0,0 +1,86 @@
+#if !defined(__POSIX_SOCKET_TEMPLATE_H__)
+#define __POSIX_SOCKET_TEMPLATE_H__
+
+#include <stdio.h>
+#include <sys/types.h>
+#if !defined(WIN32)
+#include <sys/socket.h>
+#include <netdb.h>
+#else
+#include <ws2tcpip.h>
+#endif
+#if defined(__VMS)
+#include <ioctl.h>
+#endif
+#include <fcntl.h>
+
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/util.h>
+
+/*
+    A template for opening a non-blocking POSIX socket.
+*/
+UA_StatusCode open_nb_socket(int* sockfd, const char* addr, const char* port);
+
+UA_StatusCode open_nb_socket(int* sockfd, const char* addr, const char* port) {
+    struct addrinfo hints = {0};
+
+    hints.ai_family = AF_UNSPEC; /* IPv4 or IPv6 */
+    hints.ai_socktype = SOCK_STREAM; /* Must be TCP */
+    *sockfd = -1;
+    int rv;
+    struct addrinfo *p, *servinfo;
+
+    /* get address information */
+    rv = getaddrinfo(addr, port, &hints, &servinfo);
+    if(rv != 0) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "MQTT PubSub: Failed to open socket (getaddrinfo): %s", gai_strerror(rv));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* open the first possible socket */
+    for(p = servinfo; p != NULL; p = p->ai_next) {
+        *sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
+        if (*sockfd == -1) continue;
+
+        /* connect to server */
+        rv = connect(*sockfd, p->ai_addr, p->ai_addrlen);
+        if(rv == -1) {
+          close(*sockfd);
+          *sockfd = -1;
+          continue;
+        }
+        break;
+    }  
+
+    /* free servinfo */
+    freeaddrinfo(servinfo);
+
+    /* make non-blocking */
+#if !defined(WIN32)
+    if (*sockfd != -1) fcntl(*sockfd, F_SETFL, fcntl(*sockfd, F_GETFL) | O_NONBLOCK);
+#else
+    if (*sockfd != INVALID_SOCKET) {
+        int iMode = 1;
+        ioctlsocket(*sockfd, FIONBIO, &iMode);
+    }
+#endif
+#if defined(__VMS)
+    /* 
+        OpenVMS only partially implements fcntl. It works on file descriptors
+        but silently fails on socket descriptors. So we need to fall back on
+        to the older ioctl system to set non-blocking IO
+    */
+    int on = 1;                 
+    if (*sockfd != -1) ioctl(*sockfd, FIONBIO, &on);
+#endif
+
+    /* return the new socket fd */
+    if(*sockfd == -1)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    else
+        return UA_STATUSCODE_GOOD;
+}
+
+#endif
diff --git a/plugins/mqtt/ua_mqtt_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
similarity index 52%
rename from plugins/mqtt/ua_mqtt_adapter.c
rename to plugins/mqtt/ua_mqtt-c_adapter.c
index 8203a2f38ef..963ea8ff165 100644
--- a/plugins/mqtt/ua_mqtt_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -6,28 +6,39 @@
  * Copyright (c) 2020 basysKom GmbH
  */
 
-#include "ua_mqtt_adapter.h"
-#include "../../deps/mqtt-c/mqtt.h"
-#include "open62541/plugin/log_stdout.h"
-#include "open62541/util.h"
-
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-#include <openssl/ssl.h>
-#include <openssl/err.h>
+#include "ua_mqtt-c_adapter.h"
+#include <mqtt.h>
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/util.h>
+
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
+#include <openssl_sockets.h>
+#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+#include <mbedtls_sockets.h>
+#else
+#include <posix_sockets.h>
 #endif
+#include <time.h>
+
 
 /* forward decl for callback */
 void
 publish_callback(void**, struct mqtt_response_publish*);
 
 void freeTLS(UA_PubSubChannelDataMQTT *data) {
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    if (!data->ssl)
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
+    if (!data->sockfd)
+        return;
+    BIO_free_all(data->sockfd);
+    //SSL_CTX_free(SSL_get_SSL_CTX(data->ssl));
+    data->sockfd = NULL;
+#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+    if (!data->sockfd)
         return;
-    SSL_shutdown(data->ssl);
-    SSL_CTX_free(SSL_get_SSL_CTX(data->ssl));
-    SSL_free(data->ssl);
-    data->ssl = NULL;
+    mbedtls_ssl_free(data->sockfd);
+    data->sockfd = NULL;
+#else
+    close(data->sockfd);
 #endif
 }
 
@@ -37,7 +48,7 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Extend condition when mbedTLS support is added
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) || defined(UA_ENABLE_MQTT_TLS_MBEDTLS) // Extend condition when mbedTLS support is added
     if ((channelData->mqttClientCertPath.length && !channelData->mqttClientKeyPath.length) ||
             (channelData->mqttClientKeyPath.length && !channelData->mqttClientCertPath.length)) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -52,8 +63,7 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
     }
 #endif
 
-    /* Get address and replace mqtt with tcp
-     * because we use a tcp UA_ClientConnectionTCP for mqtt */
+    /* Get address and remove 'opc.mqtt://' from the address */
     UA_NetworkAddressUrlDataType address = channelData->address;
 
     UA_String hostname, path;
@@ -64,59 +74,30 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    /* Build the url, replace mqtt with tcp */
-    UA_STACKARRAY(UA_Byte, addressAsChar, 10 + (sizeof(char) * path.length));
-    memcpy((char*)addressAsChar, "opc.tcp://", 10);
-    memcpy((char*)&addressAsChar[10],(char*)path.data, path.length);
-    address.url.data = addressAsChar;
-    address.url.length = 10 + (sizeof(char) * path.length);
-
-    /* check if buffers are correct */
-    if(!(channelData->mqttRecvBufferSize > 0 && channelData->mqttRecvBuffer != NULL
-            && channelData->mqttSendBufferSize > 0 && channelData->mqttSendBuffer != NULL)){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "MQTT PubSub Connection creation failed. No Mqtt buffer allocated.");
-        return UA_STATUSCODE_BADARGUMENTSMISSING;
-    }
+    /* Build the url and port*/
+    char rest[512];
+    memcpy(rest, path.data, path.length);
+    rest[path.length] = '\0';
+    char *rest2 = rest;
+    const char *addr = strtok_r(rest2, ":", &rest2);
+    const char *port = strtok_r(rest2, ":", &rest2);
 
-    /* Config with default parameters */
-    UA_ConnectionConfig conf;
-    memset(&conf, 0, sizeof(UA_ConnectionConfig));
-    conf.protocolVersion = 0;
-    conf.sendBufferSize = channelData->mqttSendBufferSize;
-    conf.recvBufferSize = channelData->mqttRecvBufferSize;
-    conf.localMaxMessageSize = 1000;
-    conf.remoteMaxMessageSize = 1000;
-    conf.localMaxChunkCount = 1;
-    conf.remoteMaxChunkCount = 1;
-
-    /* Create TCP connection: open the blocking TCP socket (connecting to the broker) */
-    UA_Connection connection = UA_ClientConnectionTCP_init(conf, address.url,
-                                                           1000, UA_Log_Stdout);
-    UA_ClientConnectionTCP_poll(&connection, 1000, UA_Log_Stdout);
-    if(connection.state != UA_CONNECTIONSTATE_ESTABLISHED &&
-       connection.state != UA_CONNECTIONSTATE_OPENING){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                     "PubSub MQTT: Connection creation failed. Tcp connection failed!");
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-    /* save connection */
-    channelData->connection = (UA_Connection*)UA_calloc(1, sizeof(UA_Connection));
-    if(!channelData->connection){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory.");
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-
-    memcpy(channelData->connection, &connection, sizeof(UA_Connection));
-
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Extend condition when mbedTLS support is added
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) || defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
+    BIO *sockfd = NULL;
+    SSL_CTX *ctx;
+#else
+    struct mbedtls_context ctx;
+    mqtt_pal_socket_handle sockfd;
+#endif
     if (channelData->mqttUseTLS) {
         char *mqttCaFilePath = NULL;
-        if (channelData->mqttCaFilePath.length > 0) {
+        if(channelData->mqttCaFilePath.length > 0) {
             /* Convert tls certificate path UA_String to char* null terminated */
-            mqttCaFilePath = (char*)calloc(1,channelData->mqttCaFilePath.length + 1);
-            if(!mqttCaFilePath){
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory.");
+            mqttCaFilePath = (char *)calloc(1, channelData->mqttCaFilePath.length + 1);
+            if(!mqttCaFilePath) {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                             "PubSub MQTT: Connection creation failed. Out of memory.");
                 // TODO: There are several places in the existing code where channelData->connection is freed but not set to NULL
                 // The call to disconnectMqtt by the function calling this function in case of error causes heap-use-after-free
                 // Where should channelData->connection be cleaned up?
@@ -126,11 +107,12 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
         }
 
         char *mqttCaPath = NULL;
-        if (channelData->mqttCaPath.length > 0) {
+        if(channelData->mqttCaPath.length > 0) {
             /* Convert tls CA path UA_String to char* null terminated */
-            mqttCaPath = (char*)calloc(1,channelData->mqttCaPath.length + 1);
-            if(!mqttCaPath){
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (mqttCAPath).");
+            mqttCaPath = (char *)calloc(1, channelData->mqttCaPath.length + 1);
+            if(!mqttCaPath) {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                             "PubSub MQTT: Connection creation failed. Out of memory (mqttCAPath).");
                 UA_free(mqttCaFilePath);
                 return UA_STATUSCODE_BADOUTOFMEMORY;
             }
@@ -138,11 +120,12 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
         }
 
         char *mqttClientCertPath = NULL;
-        if (channelData->mqttClientCertPath.length > 0) {
+        if(channelData->mqttClientCertPath.length > 0) {
             /* Convert tls client cert path UA_String to char* null terminated */
-            mqttClientCertPath = (char*)calloc(1,channelData->mqttClientCertPath.length + 1);
-            if(!mqttClientCertPath){
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (mqttClientCertPath).");
+            mqttClientCertPath = (char *)calloc(1, channelData->mqttClientCertPath.length + 1);
+            if(!mqttClientCertPath) {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                             "PubSub MQTT: Connection creation failed. Out of memory (mqttClientCertPath).");
                 UA_free(mqttCaFilePath);
                 UA_free(mqttCaPath);
                 return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -151,11 +134,12 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
         }
 
         char *mqttClientKeyPath = NULL;
-        if (channelData->mqttClientKeyPath.length > 0) {
+        if(channelData->mqttClientKeyPath.length > 0) {
             /* Convert tls client key path UA_String to char* null terminated */
-            mqttClientKeyPath = (char*)calloc(1,channelData->mqttClientKeyPath.length + 1);
-            if(!mqttClientKeyPath){
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (mqttClientKeyPath).");
+            mqttClientKeyPath = (char *)calloc(1, channelData->mqttClientKeyPath.length + 1);
+            if(!mqttClientKeyPath) {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                             "PubSub MQTT: Connection creation failed. Out of memory (mqttClientKeyPath).");
                 UA_free(mqttCaFilePath);
                 UA_free(mqttCaPath);
                 UA_free(mqttClientCertPath);
@@ -164,122 +148,62 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
             memcpy(mqttClientKeyPath, channelData->mqttClientKeyPath.data, channelData->mqttClientKeyPath.length);
         }
 #endif
-
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-        SSL_library_init();
-        OpenSSL_add_all_algorithms();
-        SSL_load_error_strings();
-        ERR_load_crypto_strings();
-
-        // OpenSSL 1.0 doesn't have TLS_client_method(), use SSLv23 and forbid SSLv2 and SSLv3
-        SSL_CTX *ctx = SSL_CTX_new(SSLv23_client_method());
-        SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-
-        if (!ctx) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (SSL_CTX_new).");
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Extend condition when mbedTLS support is added
+        /* open the non-blocking TCP socket (connecting to the broker) */
+        UA_StatusCode rv = open_nb_socket(&sockfd, &ctx, addr, port, mqttCaFilePath, NULL, NULL, NULL);;
+        if(rv != UA_STATUSCODE_GOOD){
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
             UA_free(mqttCaFilePath);
             UA_free(mqttCaPath);
             UA_free(mqttClientCertPath);
             UA_free(mqttClientKeyPath);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
+            return rv;
         }
 
-        int result = 0;
-
-        if (mqttCaFilePath || mqttCaPath)
-            result = SSL_CTX_load_verify_locations(ctx, mqttCaFilePath, mqttCaPath);
-        else
-            result = SSL_CTX_set_default_verify_paths(ctx);
-
-        UA_free(mqttCaFilePath);
-        UA_free(mqttCaPath);
-
-        if (!result) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: TLS initialization failed.");
-            SSL_CTX_free(ctx);
+        if (!ctx) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
+            UA_free(mqttCaFilePath);
+            UA_free(mqttCaPath);
             UA_free(mqttClientCertPath);
             UA_free(mqttClientKeyPath);
-            return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
 
-        SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
-
-        if (mqttClientKeyPath && mqttClientCertPath) {
-            result = SSL_CTX_use_certificate_file(ctx, mqttClientCertPath, SSL_FILETYPE_PEM);
-
-            if (result != 1) {
-                result = SSL_CTX_use_certificate_file(ctx, mqttClientCertPath, SSL_FILETYPE_ASN1);
-            }
-
-            if (SSL_get_error(channelData->ssl, result) != SSL_ERROR_NONE) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Failed to load client certificate.");
-                SSL_CTX_free(ctx);
-                UA_free(mqttClientCertPath);
-                UA_free(mqttClientKeyPath);
-                return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-            }
-
-            result = SSL_CTX_use_PrivateKey_file(ctx, mqttClientKeyPath, SSL_FILETYPE_PEM);
-
-            if (result != 1) {
-                result = SSL_CTX_use_PrivateKey_file(ctx, mqttClientKeyPath, SSL_FILETYPE_ASN1);
-            }
-
-            if (SSL_get_error(channelData->ssl, result) != SSL_ERROR_NONE) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Failed to load client private key.");
-                SSL_CTX_free(ctx);
-                UA_free(mqttClientCertPath);
-                UA_free(mqttClientKeyPath);
-                return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-            }
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: TLS connection successfully opened.");
+    }
 
+#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+        /* open the non-blocking TCP socket (connecting to the broker) */
+        UA_StatusCode rv = open_nb_socket(&ctx,addr,port,mqttCaFilePath);
+        if(rv != UA_STATUSCODE_GOOD){
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
+            UA_free(mqttCaFilePath);
+            UA_free(mqttCaPath);
             UA_free(mqttClientCertPath);
             UA_free(mqttClientKeyPath);
+            return rv;
         }
+        sockfd = &ctx.ssl_ctx;
 
-        channelData->ssl = SSL_new(ctx);
-
-        if (!channelData->ssl) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (SSL_new).");
-            SSL_CTX_free(ctx);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-
-        SSL_set_fd(channelData->ssl, connection.sockfd);
-
-        int connectError = SSL_ERROR_NONE;
-
-        do {
-            result = SSL_connect(channelData->ssl);
-            connectError = SSL_get_error(channelData->ssl, result);
-        } while (connectError == SSL_ERROR_WANT_READ);
-
-        if (connectError != SSL_ERROR_NONE) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: TLS connect failed");
-            const unsigned long err = ERR_get_error();
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "SSL_connect error code: %lu %s", err, ERR_error_string(err, NULL));
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Error description: %s", ERR_reason_error_string(err));
-            return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-        }
-
-        long verifyResult = SSL_get_verify_result(channelData->ssl);
-
-        if (verifyResult != SSL_ERROR_NONE) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: TLS certificate verification failed with result %ld.", verifyResult);
-            freeTLS(channelData);
-            return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        if (sockfd == NULL) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
+            UA_free(mqttCaFilePath);
+            UA_free(mqttCaPath);
+            UA_free(mqttClientCertPath);
+            UA_free(mqttClientKeyPath);
+            return UA_STATUSCODE_BADINTERNALERROR;
         }
-
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: TLS connection successfully opened.");
-#endif
-
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Extend condition when mbedTLS support is added
+    }
+#else
+    int sockfd = -1;
+    /* open the non-blocking TCP socket (connecting to the broker) */
+    UA_StatusCode rv = open_nb_socket(&sockfd,addr, port);
+    if(rv != UA_STATUSCODE_GOOD){
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
+        return rv;
     }
 #endif
 
-    /* Set socket to nonblocking!*/
-    UA_socket_set_nonblocking(connection.sockfd);
-
     /* calloc mqtt_client */
     struct mqtt_client* client = (struct mqtt_client*)UA_calloc(1, sizeof(struct mqtt_client));
     if(!client){
@@ -294,25 +218,11 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
     /* save reference */
     channelData->mqttClient = client;
 
-    /* create custom sockethandle */
-    struct my_custom_socket_handle* handle =
-        (struct my_custom_socket_handle*)UA_calloc(1, sizeof(struct my_custom_socket_handle));
-    if(!handle){
-        freeTLS(channelData);
-        UA_free(channelData->connection);
-        UA_free(client);
-
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (client socket).");
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    handle->client = client;
-    handle->connection = channelData->connection;
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    handle->tls = channelData->ssl;
-#endif
+    /* save socket fd*/
+    channelData->sockfd = sockfd;
 
     /* init mqtt client struct with buffers and callback */
-    enum MQTTErrors mqttErr = mqtt_init(client, handle, channelData->mqttSendBuffer, channelData->mqttSendBufferSize,
+    enum MQTTErrors mqttErr = mqtt_init(client, sockfd, channelData->mqttSendBuffer, channelData->mqttSendBufferSize,
                 channelData->mqttRecvBuffer, channelData->mqttRecvBufferSize, publish_callback);
     if(mqttErr != MQTT_OK){
         freeTLS(channelData);
@@ -371,103 +281,12 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
         memcpy(password, channelData->mqttPassword.data, channelData->mqttPassword.length);
     }
 
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    char *caFilePath = NULL;
-    if (channelData->mqttCaFilePath.length > 0) {
-        /* Convert caFilePath UA_String to char* null terminated */
-        caFilePath = (char*)calloc(1, channelData->mqttCaFilePath.length + 1);
-        if(!caFilePath){
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "connectMqtt() : PubSub MQTT: Connection creation failed. Out of memory.");
-            freeTLS(channelData);
-            UA_free(channelData->connection);
-            UA_free(client);
-            UA_free(clientId);
-            UA_free(username);
-            UA_free(password);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        memcpy(caFilePath, channelData->mqttCaFilePath.data, channelData->mqttCaFilePath.length);
-    }
-
-    char *caPath = NULL;
-    if (channelData->mqttCaPath.length > 0) {
-        /* Convert caPath UA_String to char* null terminated */
-        caPath = (char*)calloc(1, channelData->mqttCaPath.length + 1);
-        if(!caPath){
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "connectMqtt() : PubSub MQTT: Connection creation failed. Out of memory.");
-            freeTLS(channelData);
-            UA_free(channelData->connection);
-            UA_free(client);
-            UA_free(clientId);
-            UA_free(username);
-            UA_free(password);
-            UA_free(caFilePath);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        memcpy(caPath, channelData->mqttCaPath.data, channelData->mqttCaPath.length);
-    }
-
-    char *clientCertPath = NULL;
-    if (channelData->mqttClientCertPath.length > 0) {
-        /* Convert ClientCertPath UA_String to char* null terminated */
-        clientCertPath = (char*)calloc(1, channelData->mqttClientCertPath.length + 1);
-        if (!clientCertPath){
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "connectMqtt() : PubSub MQTT: Connection creation failed. Out of memory.");
-            freeTLS(channelData);
-            UA_free(channelData->connection);
-            UA_free(client);
-            UA_free(clientId);
-            UA_free(username);
-            UA_free(password);
-            UA_free(caFilePath);
-            UA_free(caPath);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        memcpy(clientCertPath, channelData->mqttClientCertPath.data, channelData->mqttClientCertPath.length);
-    }
-
-    char *clientKeyPath = NULL;
-    if (channelData->mqttClientKeyPath.length > 0) {
-        /* Convert ClientKeyPath UA_String to char* null terminated */
-        clientKeyPath = (char*)calloc(1, channelData->mqttClientKeyPath.length + 1);
-        if (!clientKeyPath){
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "connectMqtt() : PubSub MQTT: Connection creation failed. Out of memory.");
-            freeTLS(channelData);
-            UA_free(channelData->connection);
-            UA_free(client);
-            UA_free(clientId);
-            UA_free(username);
-            UA_free(password);
-            UA_free(caFilePath);
-            UA_free(caPath);
-            UA_free(clientCertPath);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        memcpy(clientKeyPath, channelData->mqttClientKeyPath.data, channelData->mqttClientKeyPath.length);
-    }
-
-    UA_Boolean useTLS;
-    useTLS = channelData->mqttUseTLS;
-#endif
-
-    /* Connect mqtt with socket fd of networktcp  */
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-    mqttErr = mqtt_connect(client, clientId, NULL, NULL, 0, username, password,
-                            caFilePath, caPath, clientCertPath, clientKeyPath, useTLS, 0, client->keep_alive);
-    UA_free(clientId);
-    UA_free(username);
-    UA_free(password);
-    UA_free(caFilePath);
-    UA_free(caPath);
-    UA_free(clientCertPath);
-    UA_free(clientKeyPath);
-#else
+    /* Connect mqtt with socket */
     mqttErr = mqtt_connect(client, clientId, NULL, NULL, 0, username, password,
                            0, client->keep_alive);
     UA_free(clientId);
     UA_free(username);
     UA_free(password);
-#endif
 
     if(mqttErr != MQTT_OK){
         freeTLS(channelData);
@@ -492,18 +311,13 @@ disconnectMqtt(UA_PubSubChannelDataMQTT* channelData){
     if(client){
         mqtt_disconnect(client);
         yieldMqtt(channelData, 10);
-        UA_free(client->socketfd);
+#ifdef UA_ENABLE_MQTT_TLS_OPENSSL //mbedTLS condition is missing
+        BIO_free_all(client->socketfd);
+#endif
     }
 
     freeTLS(channelData);
 
-    if(channelData->connection != NULL){
-        channelData->connection->close(channelData->connection);
-        channelData->connection->free(channelData->connection);
-        UA_free(channelData->connection);
-        channelData->connection = NULL;
-    }
-
     UA_free(channelData->mqttRecvBuffer);
     channelData->mqttRecvBuffer = NULL;
     UA_free(channelData->mqttSendBuffer);
@@ -571,29 +385,28 @@ subscribeMqtt(UA_PubSubChannelDataMQTT* channelData, UA_String topic, UA_Byte qo
 
 UA_StatusCode
 unSubscribeMqtt(UA_PubSubChannelDataMQTT* channelData, UA_String topic){
-    return UA_STATUSCODE_BADNOTIMPLEMENTED;
-}
-
-UA_StatusCode
-yieldMqtt(UA_PubSubChannelDataMQTT* channelData, UA_UInt16 timeout){
-    if(channelData == NULL || timeout == 0){
+    if(channelData == NULL || topic.length == 0){
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
+    struct mqtt_client* client = (struct mqtt_client*)channelData->mqttClient;
 
-    UA_Connection *connection = channelData->connection;
-    if(!connection) {
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
+    UA_STACKARRAY(char, topicStr, sizeof(char) * topic.length +1);
+    memcpy(topicStr, topic.data, topic.length);
+    topicStr[topic.length] = '\0';
 
-    if(connection->state != UA_CONNECTIONSTATE_ESTABLISHED &&
-       connection->state != UA_CONNECTIONSTATE_OPENING) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                     "PubSub MQTT: yield: Tcp Connection not established!");
+    enum MQTTErrors mqttErr = mqtt_unsubscribe(client, topicStr);
+    if(mqttErr != MQTT_OK){
+        const char* errorStr = mqtt_error_str(mqttErr);
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: subscribe: %s", errorStr);
         return UA_STATUSCODE_BADCOMMUNICATIONERROR;
     }
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+yieldMqtt(UA_PubSubChannelDataMQTT* channelData, UA_UInt16 timeout){
 
     struct mqtt_client* client = (struct mqtt_client*)channelData->mqttClient;
-    client->socketfd->timeout = timeout;
 
     enum MQTTErrors error = mqtt_sync(client);
     if(error == MQTT_OK){
@@ -646,16 +459,17 @@ publishMqtt(UA_PubSubChannelDataMQTT* channelData, UA_String topic, const UA_Byt
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK, "PubSub MQTT: publish: Bad Qos Level.");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
-    mqtt_publish(client, topicChar, buf->data, buf->length, (uint8_t)flags);
-    if (client->error != MQTT_OK) {
-        if(client->error == MQTT_ERROR_SEND_BUFFER_IS_FULL){
+
+    enum MQTTErrors mqttErr = mqtt_publish(client, topicChar, buf->data, buf->length, (uint8_t)flags);
+    if(mqttErr != MQTT_OK){
+        if(mqttErr == MQTT_ERROR_SEND_BUFFER_IS_FULL) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: publish: Send buffer is full. "
                                                                "Possible reasons: send buffer is to small, "
                                                                "sending to fast, broker not responding.");
         }else{
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: publish: %s", mqtt_error_str(client->error));
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: publish: %s", mqtt_error_str(mqttErr));
         }
-        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
     }
     return UA_STATUSCODE_GOOD;
 }
diff --git a/plugins/mqtt/ua_mqtt_adapter.h b/plugins/mqtt/ua_mqtt-c_adapter.h
similarity index 95%
rename from plugins/mqtt/ua_mqtt_adapter.h
rename to plugins/mqtt/ua_mqtt-c_adapter.h
index 9e97f1ee23c..156a79c858c 100644
--- a/plugins/mqtt/ua_mqtt_adapter.h
+++ b/plugins/mqtt/ua_mqtt-c_adapter.h
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-#include "ua_network_pubsub_mqtt.h"
+#include <open62541/plugin/pubsub_mqtt.h>
 
 void freeTLS(UA_PubSubChannelDataMQTT *data);
 
diff --git a/plugins/mqtt/ua_mqtt_pal.c b/plugins/mqtt/ua_mqtt_pal.c
deleted file mode 100644
index 3d012e5ef78..00000000000
--- a/plugins/mqtt/ua_mqtt_pal.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2018 Fraunhofer IOSB (Author: Lukas Meling)
- * Copyright (c) 2019 Kalycito Infotech Private Limited
- * Copyright (c) 2020 basysKom GmbH
- */
-
-#include "../../deps/mqtt-c/mqtt.h"
-#include <open62541/network_tcp.h>
-
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-#include <openssl/ssl.h>
-#endif
-
-ssize_t
-mqtt_pal_sendall(mqtt_pal_socket_handle fd, const void* buf, size_t len, int flags) {
-#ifdef UA_ENABLE_MQTT_TLS
-    if (fd->tls) {
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-        SSL *ssl = (SSL*) fd->tls;
-        int written = 0;
-        const UA_Byte *buffer = (const UA_Byte *) buf;
-
-        while (written < (int) len) {
-            int rv = SSL_write(ssl, buffer + written, (int) len - written);
-            if (rv > 0) {
-                written += rv;
-            } else {
-                const int error = SSL_get_error(ssl, rv);
-                switch (error) {
-                case SSL_ERROR_WANT_READ:
-                case SSL_ERROR_WANT_WRITE:
-                case SSL_ERROR_WANT_ACCEPT:
-                case SSL_ERROR_WANT_CONNECT:
-                case SSL_ERROR_WANT_X509_LOOKUP:
-                    return written;
-                default:
-                    return MQTT_ERROR_SOCKET_ERROR;
-                }
-            }
-        }
-
-        return written;
-#endif
-    }
-#endif
-
-    UA_Connection *connection = (UA_Connection*) fd->connection;
-    UA_ByteString sendBuffer;
-    sendBuffer.data = (UA_Byte*)UA_malloc(len);
-    sendBuffer.length = len;
-    memcpy(sendBuffer.data, buf, len);
-    UA_StatusCode ret = connection->send(connection, &sendBuffer);
-    if(ret != UA_STATUSCODE_GOOD)
-        return -1;
-    return (ssize_t)len;
-}
-
-ssize_t
-mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int flags) {
-#ifdef UA_ENABLE_MQTT_TLS
-    if (fd->tls) {
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL
-        SSL *ssl = (SSL*) fd->tls;
-
-        int read = 0;
-
-        UA_Byte * buffer = (UA_Byte *) buf;
-
-        do {
-            int rv = SSL_read(ssl, buffer + read, (int) bufsz - read);
-            if (rv > 0) {
-                read += rv;
-            } else {
-                const int error = SSL_get_error(ssl, rv);
-                switch (error) {
-                case SSL_ERROR_WANT_READ:
-                case SSL_ERROR_WANT_WRITE:
-                case SSL_ERROR_WANT_ACCEPT:
-                case SSL_ERROR_WANT_CONNECT:
-                case SSL_ERROR_WANT_X509_LOOKUP:
-                    return read;
-                default:
-                    return MQTT_ERROR_SOCKET_ERROR;
-                }
-            }
-        } while (SSL_pending(ssl) && read < (int) bufsz);
-
-        return read;
-#endif
-    }
-#endif
-
-    UA_Connection *connection = (UA_Connection*)fd->connection;
-    UA_ByteString inBuffer;
-    inBuffer.data = (UA_Byte*)buf;
-    inBuffer.length = bufsz;
-    UA_StatusCode ret = connection->recv(connection, &inBuffer, fd->timeout);
-    if(ret == UA_STATUSCODE_GOOD ) {
-        return (ssize_t)inBuffer.length;
-    } else if(ret == UA_STATUSCODE_GOODNONCRITICALTIMEOUT) {
-        return 0;
-    } else {
-        return -1; //error case, no free necessary
-    }
-}
diff --git a/plugins/ua_network_pubsub_mqtt.c b/plugins/ua_pubsub_mqtt.c
similarity index 97%
rename from plugins/ua_network_pubsub_mqtt.c
rename to plugins/ua_pubsub_mqtt.c
index 0a51c758937..58b49eb5786 100644
--- a/plugins/ua_network_pubsub_mqtt.c
+++ b/plugins/ua_pubsub_mqtt.c
@@ -11,13 +11,13 @@
  * Currently only ua_mqtt_adapter.c implements this 
  * interface and maps them to the specific "MQTT-C" library functions. 
  * Another mqtt lib could be used.
- * "ua_mqtt_pal.c" forwards the network calls (send/recv) to UA_Connection (TCP).
+ * "mqtt_pal.c" forwards the network calls (send/recv) to UA_Connection (TCP).
  */
 
 #include <open62541/server_pubsub.h>
 #include <open62541/util.h>
 
-#include "mqtt/ua_mqtt_adapter.h"
+#include "mqtt/ua_mqtt-c_adapter.h"
 #include "open62541/plugin/log_stdout.h"
 
 static UA_StatusCode
@@ -67,8 +67,12 @@ UA_PubSubChannelMQTT_open(const UA_PubSubConnectionConfig *connectionConfig) {
     /* set default values */
     UA_String mqttClientId = UA_STRING("open62541_pub");
     memcpy(channelDataMQTT, &(UA_PubSubChannelDataMQTT){address, 2000, 2000, NULL, NULL, &mqttClientId, NULL,
-                                                    #ifdef UA_ENABLE_MQTT_TLS_OPENSSL // Initialize the "ssl" member
+                                                    #if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Initialize the "ssl" member
                                                         NULL,
+                                                    #elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+                                                        NULL,
+                                                    #else
+                                                        -1,
                                                     #endif
                                                         NULL, NULL,
                                                         UA_STRING_NULL, UA_STRING_NULL, UA_STRING_NULL, UA_STRING_NULL,
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 15486ab7ba1..9b0ee96dca0 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -845,18 +845,18 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
     UA_CHECK_MEM(dst->payload.dataSetPayload.dataSetMessages,
                  return UA_STATUSCODE_BADOUTOFMEMORY);
 
-    for(UA_Byte i = 0; i < count; i++) {
-        if(&dst->payload.dataSetPayload.sizes[i] == NULL){
-            rv = UA_DataSetMessage_decodeBinary(src, offset,
-                                                &(dst->payload.dataSetPayload.dataSetMessages[i]),
-                                                0);
-        } else {
+    if(count == 1)
+        rv = UA_DataSetMessage_decodeBinary(src, offset,
+                                            &(dst->payload.dataSetPayload.dataSetMessages[0]),
+                                            0);
+    else {
+        for(UA_Byte i = 0; i < count; i++) {
             rv = UA_DataSetMessage_decodeBinary(src, offset,
                                                 &(dst->payload.dataSetPayload.dataSetMessages[i]),
                                                 dst->payload.dataSetPayload.sizes[i]);
         }
-        UA_CHECK_STATUS(rv, return rv);
     }
+    UA_CHECK_STATUS(rv, return rv);
 
     return UA_STATUSCODE_GOOD;
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9a958c2f248..c291ae7fbe1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -138,14 +138,14 @@ if(UA_ENABLE_PUBSUB)
     endif()
 
     if(UA_ENABLE_PUBSUB_MQTT)
-      list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/deps/mqtt-c/mqtt_pal.h
-                                      ${PROJECT_SOURCE_DIR}/deps/mqtt-c/mqtt.h
-                                      ${PROJECT_SOURCE_DIR}/plugins/ua_network_pubsub_mqtt.h
-                                      ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt_adapter.h
-                                      ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt_pal.c
-                                      ${PROJECT_SOURCE_DIR}/deps/mqtt-c/mqtt.c
-                                      ${PROJECT_SOURCE_DIR}/plugins/ua_network_pubsub_mqtt.c
-                                      ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt_adapter.c)
+      list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt_pal.h
+           ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h
+           ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_mqtt.h
+           ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.h
+           ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt.c
+           ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt_pal.c
+           ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_mqtt.c
+           ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.c)
     endif()
 endif()
 
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index 34325241364..f59e15b317e 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -10,13 +10,14 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include "ua_network_pubsub_mqtt.h"
+#include <open62541/plugin/pubsub_mqtt.h>
+
 #include "ua_server_internal.h"
 
 #include <check.h>
 
-//#define TEST_MQTT_SERVER "opc.mqtt://test.mosquitto.org:1883/"
-#define TEST_MQTT_SERVER "opc.mqtt://localhost:1883/"
+//#define TEST_MQTT_SERVER "opc.mqtt://test.mosquitto.org:1883"
+#define TEST_MQTT_SERVER "opc.mqtt://localhost:1883"
 
 UA_Server *server = NULL;
 UA_ServerConfig *config = NULL;

From 982fbb5db5d736ef7280c94370a2cf9c0e5c42ba Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 May 2022 09:49:03 +0200
Subject: [PATCH 0167/1963] refactor(el): Improve logging of TCP connections

---
 arch/eventloop_posix_tcp.c | 54 +++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 76b3ff076fc..60f4c1d4aee 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -293,7 +293,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                           "TCP %u\t| Error seeting the TCP options (%s), closing",
+                           "TCP %u\t| Error seeting the TCP options (%s)",
                            (unsigned)newsockfd, errno_str));
         /* Close the new socket */
         UA_close(newsockfd);
@@ -304,7 +304,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
     if(!newtcpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Error allocating memory for the socket, closing",
+                       "TCP %u\t| Error allocating memory for the socket",
                        (unsigned)newsockfd);
         UA_close(newsockfd);
         return;
@@ -321,7 +321,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     res = TCPConnectionManager_register(tcm, &newtcpfd->fd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Error registering the socket, closing",
+                       "TCP %u\t| Error registering the socket",
                        (unsigned)newsockfd);
         UA_free(newtcpfd);
         UA_close(newsockfd);
@@ -372,7 +372,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     }
 
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                "TCP %u\t| New server socket for \"%s\" on port %u",
+                "TCP %u\t| Creating server socket for \"%s\" on port %u",
                 (unsigned)listenSocket, hoststr, port);
 
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
@@ -384,7 +384,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
        UA_setsockopt(listenSocket, IPPROTO_IPV6, IPV6_V6ONLY,
                      (const char*)&optval, sizeof(optval)) == -1) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
+                       "TCP %u\t| Could not set an IPv6 socket to IPv6 only",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -395,7 +395,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR,
                      (const char *)&optval, sizeof(optval)) == -1) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Could not make the socket reusable, closing",
+                       "TCP %u\t| Could not make the socket reusable",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -404,7 +404,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     /* Set the socket non-blocking */
     if(TCP_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Could not set the socket non-blocking, closing",
+                       "TCP %u\t| Could not set the socket non-blocking",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -413,7 +413,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     /* Supress interrupts from the socket */
     if(TCP_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Could not disable SIGPIPE, closing",
+                       "TCP %u\t| Could not disable SIGPIPE",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -424,8 +424,8 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                          "TCP %u\t| Error binding the socket to the address (%s), closing",
-                          (unsigned)listenSocket, errno_str));
+                          "TCP %u\t| Error binding the socket to the address %s (%s)",
+                          (unsigned)listenSocket, hoststr, errno_str));
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -434,7 +434,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     if(UA_listen(listenSocket, UA_MAXBACKLOG) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                          "TCP %u\t| Error listening on the socket (%s), closing",
+                          "TCP %u\t| Error listening on the socket (%s)",
                           (unsigned)listenSocket, errno_str));
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -444,7 +444,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
     if(!newtcpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Error allocating memory for the socket, closing",
+                       "TCP %u\t| Error allocating memory for the socket",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -462,7 +462,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     UA_StatusCode res = TCPConnectionManager_register(tcm, &newtcpfd->fd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Error registering the socket, closing",
+                       "TCP %u\t| Error registering the socket",
                        (unsigned)listenSocket);
         UA_free(newtcpfd);
         UA_close(listenSocket);
@@ -516,10 +516,16 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
 
     int retcode = UA_getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-           UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                          "TCP\t| getaddrinfo lookup for \"%s\" on port %u failed (%s)",
-                          hostname, port, errno_str));
+#ifdef _WIN32
+        UA_LOG_SOCKET_ERRNO_WRAP(
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                       "tcp\t| Lookup for \"%s\" on port %u failed (%s)",
+                       hostname, port, errno_str));
+#else
+        UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP\t| Lookup for \"%s\" on port %u failed (%s)",
+                       hostname, port, gai_strerror(retcode));
+#endif
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -769,10 +775,16 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
     hints.ai_socktype = SOCK_STREAM;
     int error = getaddrinfo(hostname, portStr, &hints, &info);
     if(error != 0) {
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+#ifdef _WIN32
+        UA_LOG_SOCKET_ERRNO_WRAP(
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP\t| Lookup of %s failed (%s)",
+                       hostname, errno_str));
+#else
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP\t| Lookup of %s failed with error %d - %s",
-                       hostname, error, errno_str));
+                       "TCP\t| Lookup of %s failed (%s)",
+                       hostname, gai_strerror(error));
+#endif
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -818,7 +830,7 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
     TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
     if(!newtcpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Error allocating memory for the socket, closing",
+                       "TCP %u\t| Error allocating memory for the socket",
                        (unsigned)newSock);
         UA_close(newSock);
         return UA_STATUSCODE_BADOUTOFMEMORY;

From fbc3977c069ca69083a3812be5a887056686b818 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 May 2022 09:49:32 +0200
Subject: [PATCH 0168/1963] fix(el): Allow non-numeric server hosts

---
 arch/eventloop_posix_tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 60f4c1d4aee..ba55463c453 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -508,7 +508,7 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
 #endif
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
-    hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
+    hints.ai_flags = AI_PASSIVE;
 #ifdef AI_ADDRCONFIG
     hints.ai_flags |= AI_ADDRCONFIG; /* Only return IPv4/IPv6 if at least one
                                       * such address is configured */

From 6e71c79c83381f2fcf72567c5e5cd3817343de57 Mon Sep 17 00:00:00 2001
From: Mark Giraud <mark.giraud@iosb.fraunhofer.de>
Date: Thu, 2 Jun 2022 13:05:09 +0200
Subject: [PATCH 0169/1963] fix(plugin): Use local key instead of remote key
 (#5168)

Fixed a potential security issue because of remote signature size being used instead of local signature size
---
 plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
index 440363d3179..26ba21262ec 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
@@ -145,7 +145,7 @@ asym_getLocalSignatureSize_sp_aes128sha256rsaoaep(const Aes128Sha256PsaOaep_Chan
     if(cc == NULL)
         return 0;
 #if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
-    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
 #else
     return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
 #endif

From 1d727e5b40681a1b287749e9acde5269607dc4db Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Wed, 1 Jun 2022 22:32:49 +0200
Subject: [PATCH 0170/1963] test(core): fix more sign-conversion compiler
 errors

---
 tests/client/check_client_encryption.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/client/check_client_encryption.c b/tests/client/check_client_encryption.c
index c63858086ec..cc4c989eb0e 100644
--- a/tests/client/check_client_encryption.c
+++ b/tests/client/check_client_encryption.c
@@ -89,12 +89,12 @@ START_TEST(encryption_reconnect_session) {
     UA_ByteString certificate;
     certificate.length = CERT_DER_LENGTH;
     certificate.data = CERT_DER_DATA;
-    ck_assert_int_ne(certificate.length, 0);
+    ck_assert_uint_ne(certificate.length, 0);
 
     UA_ByteString privateKey;
     privateKey.length = KEY_DER_LENGTH;
     privateKey.data = KEY_DER_DATA;
-    ck_assert_int_ne(privateKey.length, 0);
+    ck_assert_uint_ne(privateKey.length, 0);
 
     /* Secure client initialization */
     client = UA_Client_new();

From 979aae2c6da8d026dc5d0ed67974f9f4ca40e530 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 1 Feb 2022 22:40:15 +0100
Subject: [PATCH 0171/1963] feat(deps): Import deps/cj5.h for json5 parsing

---
 deps/cj5.h | 1249 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1249 insertions(+)
 create mode 100644 deps/cj5.h

diff --git a/deps/cj5.h b/deps/cj5.h
new file mode 100644
index 00000000000..7f1fbd82580
--- /dev/null
+++ b/deps/cj5.h
@@ -0,0 +1,1249 @@
+// cj5.h: Very minimal single header JSON5 parser in C99, dervied from jsmn
+//        This is the modified version of jsmn library
+//        Thus main parts of the code is taken from jsmn project (https://github.com/zserge/jsmn)
+//
+// MIT License
+//
+// Copyright (c) 2020 Sepehr Taghdisian
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// Compliance with JSON5:
+//  [x] Object keys may be an ECMAScript 5.1 IdentifierName.
+//  [x] Objects may have a single trailing comma.
+//  [x] Strings may be single quoted.
+//  [x] Strings may span multiple lines by escaping new line characters.
+//  [x] Strings may include character escapes.
+//  [x] Numbers may be hexadecimal.
+//  [x] Numbers may have a leading or trailing decimal point.
+//  [x] Numbers may be IEEE 754 positive infinity, negative infinity, and NaN.
+//  [x] Numbers may begin with an explicit plus sign.
+//  [x] Single and multi-line comments are allowed.
+//  [x] Additional white space characters are allowed.
+//  [x] Multiline comments
+//
+// Usage:
+//  The main function to parse json is `cj5_parse`. 
+//  like jsmn, you provide all tokens to be filled as an array and provide the maximum count
+//  The result will be return in `cj5_result` struct, and `num_tokens` will represent the actual
+//  token count that is parsed. 
+//  In case of errors, cj_result.error will be set to an error code
+//  Here's a quick example of the usage, first define CJ5_IMPLEMENT to include the implementation:
+//  
+//        #define CJ5_IMPLEMENT
+//        #include "cj5.h"
+//
+//        cj5_token tokens[32];
+//        cj5_result r = cj5_parse(g_json, (int)strlen(g_json), tokens, 32);
+//        
+//        if (r.error != CJ5_ERROR_NONE) {
+//          if (r.error == CJ5_ERROR_OVERFLOW) {
+//              // you can use r.num_tokens to determine the actual token count and reparse
+//              printf("Error: line: %d, col: %d\n", r.error_line, r.error_code);    
+//          }
+//        } else {
+//          // use token helper functions (see below) to access the values 
+//          float my_num = cj5_seekget_float(&r, 0, "my_num", 0 /* default value if not found*/ );
+//        } 
+// 
+// Customization:
+//  This library doesn't use any memory allocations so hooray for that !
+//  But in order to not use default stdc functions, you can override those by defining these macros:
+//      - CJ5_IMPLEMENT: include implementation for cj5
+//      - CJ5_ASSERT(e): replace stdc `assert` macro with your own version
+//      - CJ5_MEMSET(dst, value, size): replace 'memset' function with your own
+//      - CJ5_MEMCPY(dst, src, size): replace 'memcpy' function with your own
+//      - CJ5_TOKEN_HELPERS: add token helper functions (default=ON), you can skip these by definining:
+//                           #define CJ5_TOKEN_HELPERS 0, before including the header
+//      - CJ5_API: API decleration can be override by defining this macro. (default is extern)
+//                 example: #define CJ5_API static
+// 
+#pragma once
+
+#include <stdbool.h>    // bool
+#include <stdint.h>     // uint32_t, int64_t, etc.
+
+#ifndef CJ5_TOKEN_HELPERS
+#    define CJ5_TOKEN_HELPERS 1
+#endif
+
+#ifndef CJ5_API
+#    ifdef __cplusplus
+#        define CJ5_API extern "C"
+#    else
+#        define CJ5_API
+#    endif
+#endif
+
+typedef enum cj5_token_type {
+    CJ5_TOKEN_OBJECT = 0,
+    CJ5_TOKEN_ARRAY,
+    CJ5_TOKEN_NUMBER,
+    CJ5_TOKEN_STRING,
+    CJ5_TOKEN_BOOL,
+    CJ5_TOKEN_NULL
+} cj5_token_type;
+
+// sub-type for NUMBER token type
+// this is merely a hint for the user to see what type of number the token contains
+typedef enum cj5_token_number_type {
+    CJ5_TOKEN_NUMBER_UNKNOWN = 0,
+    CJ5_TOKEN_NUMBER_FLOAT,
+    CJ5_TOKEN_NUMBER_INT,
+    CJ5_TOKEN_NUMBER_HEX
+} cj5_token_number_type;
+
+typedef enum cj5_error_code {
+    CJ5_ERROR_NONE = 0,
+    CJ5_ERROR_INVALID,       // invalid character/syntax
+    CJ5_ERROR_INCOMPLETE,    // incomplete json string
+    CJ5_ERROR_OVERFLOW       // token buffer overflow, need more tokens (see cj5_result.num_tokens)
+} cj5_error_code;
+
+typedef struct cj5_token {
+    cj5_token_type type;
+    union {
+        cj5_token_number_type num_type;
+        uint32_t key_hash;
+    };
+    int start;
+    int end;
+    int size;
+    int parent_id;      // = -1 if there is no parent
+} cj5_token;
+
+typedef struct cj5_result {
+    cj5_error_code error;
+    int error_line;
+    int error_col;
+    int num_tokens;
+    const cj5_token* tokens;
+    const char* json5;
+} cj5_result;
+
+CJ5_API cj5_result cj5_parse(const char* json5, int len, cj5_token* tokens, int max_tokens);
+
+// token helpers
+#if CJ5_TOKEN_HELPERS
+CJ5_API int cj5_seek(cj5_result* r, int parent_id, const char* key);
+CJ5_API int cj5_seek_hash(cj5_result* r, int parent_id, const uint32_t key_hash);
+CJ5_API int cj5_seek_recursive(cj5_result* r, int parent_id, const char* key);
+CJ5_API const char* cj5_get_string(cj5_result* r, int id, char* str, int max_str);
+CJ5_API double cj5_get_double(cj5_result* r, int id);
+CJ5_API float cj5_get_float(cj5_result* r, int id);
+CJ5_API int cj5_get_int(cj5_result* r, int id);
+CJ5_API uint32_t cj5_get_uint(cj5_result* r, int id);
+CJ5_API uint64_t cj5_get_uint64(cj5_result* r, int id);
+CJ5_API int64_t cj5_get_int64(cj5_result* r, int id);
+CJ5_API bool cj5_get_bool(cj5_result* r, int id);
+CJ5_API double cj5_seekget_double(cj5_result* r, int parent_id, const char* key, double def_val);
+CJ5_API float cj5_seekget_float(cj5_result* r, int parent_id, const char* key, float def_val);
+CJ5_API int cj5_seekget_array_int16(cj5_result* r, int parent_id, const char* key, int16_t* values, int max_values);
+CJ5_API int cj5_seekget_array_uint16(cj5_result* r, int parent_id, const char* key, uint16_t* values, int max_values);
+CJ5_API int cj5_seekget_int(cj5_result* r, int parent_id, const char* key, int def_val);
+CJ5_API uint32_t cj5_seekget_uint(cj5_result* r, int parent_id, const char* key, uint32_t def_val);
+CJ5_API uint64_t cj5_seekget_uint64(cj5_result* r, int parent_id, const char* key, uint64_t def_val);
+CJ5_API int64_t cj5_seekget_int64(cj5_result* r, int parent_id, const char* key, int64_t def_val);
+CJ5_API bool cj5_seekget_bool(cj5_result* r, int parent_id, const char* key, bool def_val);
+CJ5_API const char* cj5_seekget_string(cj5_result* r, int parent_id, const char* key, char* str, int max_str, const char* def_val);
+CJ5_API int cj5_seekget_array_double(cj5_result* r, int parent_id, const char* key, double* values, int max_values);
+CJ5_API int cj5_seekget_array_float(cj5_result* r, int parent_id, const char* key, float* values, int max_values);
+CJ5_API int cj5_seekget_array_int(cj5_result* r, int parent_id, const char* key, int* values, int max_values);
+CJ5_API int cj5_seekget_array_uint(cj5_result* r, int parent_id, const char* key, uint32_t* values, int max_values);
+CJ5_API int cj5_seekget_array_uint64(cj5_result* r, int parent_id, const char* key, uint64_t* values, int max_values);
+CJ5_API int cj5_seekget_array_int64(cj5_result* r, int parent_id, const char* key, int64_t* values, int max_values);
+CJ5_API int cj5_seekget_array_bool(cj5_result* r, int parent_id, const char* key, bool* values, int max_values);
+CJ5_API int cj5_seekget_array_string(cj5_result* r, int parent_id, const char* key, char** strs, int max_str, int max_values);
+CJ5_API int cj5_get_array_elem(cj5_result* r, int id, int index);
+CJ5_API int cj5_get_array_elem_incremental(cj5_result* r, int id, int index, int prev_elem);
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// IMPLEMENTATION
+#if defined(CJ5_IMPLEMENT)
+
+// optional: override asset
+#    ifndef CJ5_ASSERT
+#        include <assert.h>
+#        define CJ5_ASSERT(_e) assert(_e)
+#    endif
+
+// optional: override memcpy
+#    ifndef CJ5_MEMCPY
+#        include <string.h>    // memcpy
+#        define CJ5_MEMCPY(_dst, _src, _n) memcpy((_dst), (_src), (_n))
+#    endif
+
+#    ifndef CJ5_MEMSET
+#        include <string.h>
+#        define CJ5_MEMSET(_dst, _val, _size) memset((_dst), (_val), (_size))
+#    endif
+
+#    define CJ5__ARCH_64BIT 0
+#    define CJ5__ARCH_32BIT 0
+#    if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(__64BIT__) || \
+        defined(__mips64) || defined(__powerpc64__) || defined(__ppc64__) || defined(__LP64__)
+#        undef CJ5__ARCH_64BIT
+#        define CJ5__ARCH_64BIT 64
+#    else
+#        undef CJ5__ARCH_32BIT
+#        define CJ5__ARCH_32BIT 32
+#    endif    //
+
+#    if defined(_MSC_VER)
+#        define CJ5__RESTRICT __restrict
+#    else
+#        define CJ5__RESTRICT __restrict__
+#    endif
+
+#    define CJ5__UNUSED(_a) (void)(_a)
+
+#    define CJ5__FOURCC(_a, _b, _c, _d) \
+        (((uint32_t)(_a) | ((uint32_t)(_b) << 8) | ((uint32_t)(_c) << 16) | ((uint32_t)(_d) << 24)))
+
+static const uint32_t CJ5__NULL_FOURCC = CJ5__FOURCC('n', 'u', 'l', 'l');
+static const uint32_t CJ5__TRUE_FOURCC = CJ5__FOURCC('t', 'r', 'u', 'e');
+static const uint32_t CJ5__FALSE_FOURCC = CJ5__FOURCC('f', 'a', 'l', 's');
+
+static const uint32_t CJ5__FNV1_32_INIT = 0x811c9dc5;
+static const uint32_t CJ5__FNV1_32_PRIME = 0x01000193;
+
+typedef struct cj5__parser {
+    int pos;
+    int next_id;
+    int super_id;
+    int line;
+} cj5__parser;
+
+static inline uint32_t cj5__hash_fnv32(const char* start, const char* end)
+{
+    const char* bp = start;
+    const char* be = end;    // start + len
+
+    uint32_t hval = CJ5__FNV1_32_INIT;
+    while (bp < be) {
+        hval ^= (uint32_t)*bp++;
+        hval *= CJ5__FNV1_32_PRIME;
+    }
+
+    return hval;
+}
+
+static inline bool cj5__isspace(char ch)
+{
+    return (uint32_t)(ch - 1) < 32 && ((0x80001F00 >> (uint32_t)(ch - 1)) & 1) == 1;
+}
+
+static inline bool cj5__isrange(char ch, char from, char to)
+{
+    return (uint8_t)(ch - from) <= (uint8_t)(to - from);
+}
+
+static inline bool cj5__isupperchar(char ch)
+{
+    return cj5__isrange(ch, 'A', 'Z');
+}
+
+static inline bool cj5__islowerchar(char ch)
+{
+    return cj5__isrange(ch, 'a', 'z');
+}
+
+static inline bool cj5__isnum(char ch)
+{
+    return cj5__isrange(ch, '0', '9');
+}
+
+static inline char* cj5__strcpy(char* CJ5__RESTRICT dst, int dst_sz, const char* CJ5__RESTRICT src,
+                                int num)
+{
+    const int _max = dst_sz - 1;
+    const int _num = (num < _max ? num : _max);
+    if (_num > 0) {
+        CJ5_MEMCPY(dst, src, _num);
+    }
+    dst[_num] = '\0';
+    return dst;
+}
+
+// https://github.com/lattera/glibc/blob/master/string/strlen.c
+static int cj5__strlen(const char* str)
+{
+    const char* char_ptr;
+    const uintptr_t* longword_ptr;
+    uintptr_t longword, himagic, lomagic;
+
+    for (char_ptr = str; ((uintptr_t)char_ptr & (sizeof(longword) - 1)) != 0; ++char_ptr) {
+        if (*char_ptr == '\0')
+            return (int)(intptr_t)(char_ptr - str);
+    }
+    longword_ptr = (uintptr_t*)char_ptr;
+    himagic = 0x80808080L;
+    lomagic = 0x01010101L;
+#    if CJ5__ARCH_64BIT
+    /* 64-bit version of the magic.  */
+    /* Do the shift in two steps to avoid a warning if long has 32 bits.  */
+    himagic = ((himagic << 16) << 16) | himagic;
+    lomagic = ((lomagic << 16) << 16) | lomagic;
+#    endif
+
+    for (;;) {
+        longword = *longword_ptr++;
+
+        if (((longword - lomagic) & ~longword & himagic) != 0) {
+            const char* cp = (const char*)(longword_ptr - 1);
+
+            if (cp[0] == 0)
+                return (int)(intptr_t)(cp - str);
+            if (cp[1] == 0)
+                return (int)(intptr_t)(cp - str + 1);
+            if (cp[2] == 0)
+                return (int)(intptr_t)(cp - str + 2);
+            if (cp[3] == 0)
+                return (int)(intptr_t)(cp - str + 3);
+#    if CJ5__ARCH_64BIT
+            if (cp[4] == 0)
+                return (int)(intptr_t)(cp - str + 4);
+            if (cp[5] == 0)
+                return (int)(intptr_t)(cp - str + 5);
+            if (cp[6] == 0)
+                return (int)(intptr_t)(cp - str + 6);
+            if (cp[7] == 0)
+                return (int)(intptr_t)(cp - str + 7);
+#    endif
+        }
+    }
+
+    #ifndef _MSC_VER
+    CJ5_ASSERT(0);
+    return -1;
+    #endif
+}
+
+static inline cj5_token* cj5__alloc_token(cj5__parser* parser, cj5_token* tokens, int max_tokens)
+{
+    if (!tokens || parser->next_id >= max_tokens) {
+        return NULL;
+    }
+
+    cj5_token* token = &tokens[parser->next_id++];
+    CJ5_MEMSET(token, 0x0, sizeof(cj5_token));
+    token->start = -1;
+    token->end = -1;
+    token->parent_id = -1;
+    return token;
+}
+
+static inline void cj5__set_error(cj5_result* r, cj5_error_code code, int line, int col)
+{
+    r->error = code;
+    r->error_line = line + 1;
+    r->error_col = col + 1;
+}
+
+static bool cj5__parse_primitive(cj5__parser* parser, cj5_result* r, const char* json5, int len,
+                                 cj5_token* tokens, int max_tokens)
+{
+    cj5_token* token;
+    int start = parser->pos;
+    int line_start = start;
+    bool keyname = false;
+    bool new_line = false;
+
+    for (; parser->pos < len; parser->pos++) {
+        switch (json5[parser->pos]) {
+        case '\n':
+            line_start = parser->pos;
+            new_line = true;
+            goto found;
+        case ':':
+            keyname = true;
+            goto found;
+        case '\t':
+        case '\r':
+        case ' ':
+        case ',':
+        case ']':
+        case '}':
+            goto found;
+        default:
+            break;
+        }
+
+        if (json5[parser->pos] < 32 || json5[parser->pos] >= 127) {
+            cj5__set_error(r, CJ5_ERROR_INVALID, parser->line, parser->pos - line_start);
+            parser->pos = start;
+            return false;
+        }
+    }
+
+    cj5__set_error(r, CJ5_ERROR_INCOMPLETE, parser->line, parser->pos - line_start);
+    parser->pos = start;
+    return false;
+
+found:
+    token = cj5__alloc_token(parser, tokens, max_tokens);
+    if (token == NULL) {
+        r->error = CJ5_ERROR_OVERFLOW;
+        --parser->pos;
+        return true;
+    }
+
+    cj5_token_type type;
+    cj5_token_number_type num_type = CJ5_TOKEN_NUMBER_UNKNOWN;
+    if (keyname) {
+        // JSON5: it is likely a key-name, validate and interpret as string
+        for (int i = start; i < parser->pos; i++) {
+            if (cj5__islowerchar(json5[i]) || cj5__isupperchar(json5[i]) || json5[i] == '_') {
+                continue;
+            }
+
+            if (cj5__isnum(json5[i])) {
+                if (i == start) {
+                    cj5__set_error(r, CJ5_ERROR_INVALID, parser->line, parser->pos - line_start);
+                    parser->pos = start;
+                    return false;
+                }
+                continue;
+            }
+
+            cj5__set_error(r, CJ5_ERROR_INVALID, parser->line, parser->pos - line_start);
+            parser->pos = start;
+            return false;
+        }
+
+        type = CJ5_TOKEN_STRING;
+    } else {
+        // detect other types, subtypes
+        // note that we have to use memcpy here or we will get unaligned access on some
+        uint32_t fourcc_;
+        CJ5_MEMCPY(&fourcc_, &json5[start], 4);
+        uint32_t* fourcc = &fourcc_;
+ 
+        if (*fourcc == CJ5__NULL_FOURCC) {
+            type = CJ5_TOKEN_NULL;
+        } else if (*fourcc == CJ5__TRUE_FOURCC) {
+            type = CJ5_TOKEN_BOOL;
+        } else if (*fourcc == CJ5__FALSE_FOURCC) {
+            type = CJ5_TOKEN_BOOL;
+        } else {
+            num_type = CJ5_TOKEN_NUMBER_INT;
+            // hex number
+            if (json5[start] == '0' && start < parser->pos + 1 && json5[start + 1] == 'x') {
+                start = start + 2;
+                for (int i = start; i < parser->pos; i++) {
+                    if (!(cj5__isrange(json5[i], '0', '9') || cj5__isrange(json5[i], 'A', 'F') ||
+                          cj5__isrange(json5[i], 'a', 'f'))) {
+                        cj5__set_error(r, CJ5_ERROR_INVALID, parser->line,
+                                       parser->pos - line_start);
+                        parser->pos = start;
+                        return false;
+                    }
+                }
+                num_type = CJ5_TOKEN_NUMBER_HEX;
+            } else {
+                int start_index = start;
+                if (json5[start] == '+') {
+                    ++start_index;
+                    ++start;
+                } else if (json5[start] == '-') {
+                    ++start_index;
+                }
+
+                for (int i = start_index; i < parser->pos; i++) {
+                    if (json5[i] == '.') {
+                        if (num_type == CJ5_TOKEN_NUMBER_FLOAT) {
+                            cj5__set_error(r, CJ5_ERROR_INVALID, parser->line,
+                                           parser->pos - line_start);
+                            parser->pos = start;
+                            return false;
+                        }
+                        num_type = CJ5_TOKEN_NUMBER_FLOAT;
+                        continue;
+                    }
+
+                    if (!cj5__isnum(json5[i])) {
+                        cj5__set_error(r, CJ5_ERROR_INVALID, parser->line,
+                                       parser->pos - line_start);
+                        parser->pos = start;
+                        return false;
+                    }
+                }
+            }
+
+            type = CJ5_TOKEN_NUMBER;
+        }
+    }
+
+    if (new_line) {
+        ++parser->line;
+    }
+
+    token->type = type;
+    if (type == CJ5_TOKEN_STRING) {
+        token->key_hash = cj5__hash_fnv32(&json5[start], &json5[parser->pos]);
+    } else {
+        token->num_type = num_type;
+    }
+    token->start = start;
+    token->end = parser->pos;
+    token->parent_id = parser->super_id;
+    --parser->pos;
+    return true;
+}
+
+static bool cj5__parse_string(cj5__parser* parser, cj5_result* r, const char* json5, int len,
+                              cj5_token* tokens, int max_tokens)
+{
+    cj5_token* token;
+    int start = parser->pos;
+    int line_start = start;
+    char str_open = json5[start];
+    ++parser->pos;
+
+    for (; parser->pos < len; parser->pos++) {
+        char c = json5[parser->pos];
+
+        // end of string
+        if (str_open == c) {
+            token = cj5__alloc_token(parser, tokens, max_tokens);
+            if (token == NULL) {
+                r->error = CJ5_ERROR_OVERFLOW;
+                return true;
+            }
+
+            token->type = CJ5_TOKEN_STRING;
+            token->start = start + 1;
+            token->end = parser->pos;
+            token->parent_id = parser->super_id;
+
+            return true;
+        }
+
+        if (c == '\\' && parser->pos + 1 < len) {
+            ++parser->pos;
+            switch (json5[parser->pos]) {
+            case '\"':
+            case '/':
+            case '\\':
+            case 'b':
+            case 'f':
+            case 'r':
+            case 'n':
+            case 't':
+                break;
+            case 'u':
+                ++parser->pos;
+                for (int i = 0; i < 4 && parser->pos < len; i++) {
+                    /* If it isn't a hex character we have an error */
+                    if (!((json5[parser->pos] >= 48 && json5[parser->pos] <= 57) ||   /* 0-9 */
+                          (json5[parser->pos] >= 65 && json5[parser->pos] <= 70) ||   /* A-F */
+                          (json5[parser->pos] >= 97 && json5[parser->pos] <= 102))) { /* a-f */
+                        cj5__set_error(r, CJ5_ERROR_INVALID, parser->line,
+                                       parser->pos - line_start);
+                        parser->pos = start;
+                        return false;
+                    }
+                    parser->pos++;
+                }
+
+                --parser->pos;
+                break;
+            case '\n':
+                line_start = parser->pos;
+                ++parser->line;
+                break;
+            default:
+                cj5__set_error(r, CJ5_ERROR_INVALID, parser->line, parser->pos - line_start);
+                parser->pos = start;
+                return false;
+            }
+        }
+    }
+
+    parser->pos = start;
+    return true;
+}
+
+static void cj5__skip_comment(cj5__parser* parser, const char* json5, int len)
+{
+    for (; parser->pos < len; parser->pos++) {
+        if (json5[parser->pos] == '\n' || json5[parser->pos] == '\r') {
+            return;
+        }
+    }
+}
+
+static void cj5__skip_multiline_comment(cj5__parser* parser, const char* json5, int len)
+{
+    for (; parser->pos < len; parser->pos++) {
+        if (json5[parser->pos] == '*' && parser->pos < (len - 1) && json5[parser->pos+1] == '/') {
+            return;
+        }
+    }
+}
+
+cj5_result cj5_parse(const char* json5, int len, cj5_token* tokens, int max_tokens)
+{
+    cj5__parser parser;
+    CJ5_MEMSET(&parser, 0x0, sizeof(parser));
+    parser.super_id = -1;
+
+    cj5_result r;
+    CJ5_MEMSET(&r, 0x0, sizeof(r));
+
+    cj5_token* token;
+    int count = parser.next_id;
+    bool can_comment = false;
+
+    for (; parser.pos < len; parser.pos++) {
+        char c;
+        cj5_token_type type;
+
+        c = json5[parser.pos];
+        switch (c) {
+        case '{':
+        case '[':
+            can_comment = false;
+            count++;
+            token = cj5__alloc_token(&parser, tokens, max_tokens);
+            if (token == NULL) {
+                r.error = CJ5_ERROR_OVERFLOW;
+                break;
+            }
+
+            if (parser.super_id != -1) {
+                cj5_token* super_token = &tokens[parser.super_id];
+                token->parent_id = parser.super_id;
+                if (++super_token->size == 1 && super_token->type == CJ5_TOKEN_STRING) {
+                    super_token->key_hash =
+                        cj5__hash_fnv32(&json5[super_token->start], &json5[super_token->end]);
+                }
+            }
+
+            token->type = (c == '{' ? CJ5_TOKEN_OBJECT : CJ5_TOKEN_ARRAY);
+            token->start = parser.pos;
+            parser.super_id = parser.next_id - 1;
+            break;
+
+        case '}':
+        case ']':
+            can_comment = false;
+            if (!tokens || r.error == CJ5_ERROR_OVERFLOW) {
+                break;
+            }
+            type = (c == '}' ? CJ5_TOKEN_OBJECT : CJ5_TOKEN_ARRAY);
+
+            if (parser.next_id < 1) {
+                cj5__set_error(&r, CJ5_ERROR_INVALID, parser.line, parser.pos - parser.line);
+                return r;
+            }
+
+            token = &tokens[parser.next_id - 1];
+            for (;;) {
+                if (token->start != -1 && token->end == -1) {
+                    if (token->type != type) {
+                        cj5__set_error(&r, CJ5_ERROR_INVALID, parser.line,
+                                       parser.pos - parser.line);
+                        return r;
+                    }
+                    token->end = parser.pos + 1;
+                    parser.super_id = token->parent_id;
+                    break;
+                }
+
+                if (token->parent_id == -1) {
+                    if (token->type != type || parser.super_id == -1) {
+                        cj5__set_error(&r, CJ5_ERROR_INVALID, parser.line,
+                                       parser.pos - parser.line);
+                        return r;
+                    }
+                    break;
+                }
+
+                token = &tokens[token->parent_id];
+            }
+            break;
+
+        case '\"':
+        case '\'':
+            can_comment = false;
+            // JSON5: strings can start with \" or \'
+            cj5__parse_string(&parser, &r, json5, len, tokens, max_tokens);
+            if (r.error && r.error != CJ5_ERROR_OVERFLOW) {
+                return r;
+            }
+            count++;
+            if (parser.super_id != -1 && tokens && r.error != CJ5_ERROR_OVERFLOW) {
+                if (++tokens[parser.super_id].size == 1 &&
+                    tokens[parser.super_id].type == CJ5_TOKEN_STRING) {
+                    // it's not a value, it's a key, so hash it
+                    tokens[parser.super_id].key_hash = cj5__hash_fnv32(
+                        &json5[tokens[parser.super_id].start], &json5[tokens[parser.super_id].end]);
+                }
+            }
+            break;
+
+        case '\r':
+            can_comment = true;
+            break;
+        case '\n':
+            ++parser.line;
+            can_comment = true;
+            break;
+        case '\t':
+        case ' ':
+            break;
+
+        case ':':
+            can_comment = false;
+            parser.super_id = parser.next_id - 1;
+            break;
+
+        case ',':
+            can_comment = false;
+            if (tokens != NULL && parser.super_id != -1 && r.error != CJ5_ERROR_OVERFLOW &&
+                tokens[parser.super_id].type != CJ5_TOKEN_ARRAY &&
+                tokens[parser.super_id].type != CJ5_TOKEN_OBJECT) {
+                parser.super_id = tokens[parser.super_id].parent_id;
+            }
+            break;
+        case '/':
+            if (can_comment && parser.pos < len - 1) {
+                if (json5[parser.pos + 1] == '/') {
+                    cj5__skip_comment(&parser, json5, len);
+                } else if (json5[parser.pos + 1] == '*') {
+                    cj5__skip_multiline_comment(&parser, json5, len);
+                }
+            } 
+            break;
+
+        default:
+            cj5__parse_primitive(&parser, &r, json5, len, tokens, max_tokens);
+            if (r.error && r.error != CJ5_ERROR_OVERFLOW) {
+                return r;
+            }
+            can_comment = false;
+            count++;
+            if (parser.super_id != -1 && tokens && r.error != CJ5_ERROR_OVERFLOW) {
+                if (++tokens[parser.super_id].size == 1 &&
+                    tokens[parser.super_id].type == CJ5_TOKEN_STRING) {
+                    tokens[parser.super_id].key_hash = cj5__hash_fnv32(
+                        &json5[tokens[parser.super_id].start], &json5[tokens[parser.super_id].end]);
+                }
+            }
+            break;
+        }
+    }
+
+    if (tokens && r.error != CJ5_ERROR_OVERFLOW) {
+        for (int i = parser.next_id - 1; i >= 0; i--) {
+            // unmatched object or array ?
+            if (tokens[i].start != -1 && tokens[i].end == -1) {
+                cj5__set_error(&r, CJ5_ERROR_INCOMPLETE, parser.line, parser.pos - parser.line);
+                return r;
+            }
+        }
+    }
+
+    r.num_tokens = count;
+    r.tokens = tokens;
+    r.json5 = json5;
+    return r;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Helper functions to work with tokens
+#    if CJ5_TOKEN_HELPERS
+#        include <stdlib.h>
+
+static int cj5__seek_recursive(cj5_result* r, int parent_id, uint32_t key_hash)
+{
+    const cj5_token* parent_tok = &r->tokens[parent_id];
+
+    for (int i = parent_id + 1, count = 0; i < r->num_tokens && count < parent_tok->size; i++) {
+        const cj5_token* tok = &r->tokens[i];
+
+        if (tok->size != 1 || tok->type != CJ5_TOKEN_STRING) {
+            continue;
+        }
+
+        if (parent_id == tok->parent_id) {
+            CJ5_ASSERT((i + 1) < r->num_tokens);
+            if (key_hash == tok->key_hash) {
+                return i + 1;    // return next "value" token (array/objects and primitive values)
+            } else if (r->tokens[i + 1].size) {
+                int found_id = cj5__seek_recursive(r, i + 1, key_hash);
+                if (found_id != -1) {
+                    return found_id;
+                }
+            }
+            count++;
+        }
+    }
+
+    return -1;
+}
+
+static bool cj5__tofloat(const char* str, double* ofloat)
+{
+    // skip leading whitespace
+    while (*str && cj5__isspace(*str)) {
+        str++;
+    }
+    int sign = 1;
+
+    const char* pC = str;
+    if (*pC == '-') {
+        sign = -1;
+        pC++;
+    }
+
+    // parse integer part
+    int64_t tmp = 0;
+    while (*pC >= '0' && *pC <= '9') {
+        tmp *= 10;
+        tmp += *pC - '0';
+        pC++;
+    }
+
+    if (*pC == 0) {
+        *ofloat = (double)(sign >= 0 ? tmp : -tmp);
+        return true;
+    }
+
+    // Parse fraction
+    if (*pC == '.') {
+        pC++;
+
+        int64_t divisor = sign;
+        while (*pC >= '0' && *pC <= '9') {
+            divisor *= 10;
+            tmp *= 10;
+            tmp += *pC - '0';
+            pC++;
+        }
+
+        // Skip tailing whitespace
+        while (*pC && cj5__isspace(*pC)) {
+            pC++;
+        }
+
+        if (*pC == 0) {
+            *ofloat = (double)tmp / (double)divisor;
+            return true;
+        }
+    }
+
+    *ofloat = strtod(str, NULL);
+    return true;
+}
+
+int cj5_seek_recursive(cj5_result* r, int parent_id, const char* key)
+{
+    CJ5_ASSERT(parent_id >= 0 && parent_id < r->num_tokens);
+
+    uint32_t key_hash = cj5__hash_fnv32(key, key + cj5__strlen(key));
+    return cj5__seek_recursive(r, parent_id, key_hash);
+}
+
+int cj5_seek_hash(cj5_result* r, int parent_id, const uint32_t key_hash)
+{
+    CJ5_ASSERT(parent_id >= 0 && parent_id < r->num_tokens);
+    const cj5_token* parent_tok = &r->tokens[parent_id];
+
+    for (int i = parent_id + 1, count = 0; i < r->num_tokens && count < parent_tok->size; i++) {
+        const cj5_token* tok = &r->tokens[i];
+
+        if (tok->size != 1 || tok->type != CJ5_TOKEN_STRING) {
+            continue;
+        }
+
+        if (parent_id == tok->parent_id) {
+            if (key_hash == tok->key_hash) {
+                CJ5_ASSERT((i + 1) < r->num_tokens);
+                return i + 1;    // return next "value" token (array/objects and primitive values)
+            }
+            count++;
+        }
+    }
+
+    return -1;
+}
+
+int cj5_seek(cj5_result* r, int parent_id, const char* key)
+{
+    CJ5_ASSERT(parent_id >= 0 && parent_id < r->num_tokens);
+
+    uint32_t key_hash = cj5__hash_fnv32(key, key + cj5__strlen(key));
+
+    return cj5_seek_hash(r, parent_id, key_hash);
+}
+
+const char* cj5_get_string(cj5_result* r, int id, char* str, int max_str)
+{
+    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_STRING);
+    return cj5__strcpy(str, max_str, &r->json5[tok->start], tok->end - tok->start);
+}
+
+double cj5_get_double(cj5_result* r, int id)
+{
+    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
+    char snum[32];
+    double num;
+    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
+    bool valid = cj5__tofloat(snum, &num);
+    CJ5__UNUSED(valid);
+    CJ5_ASSERT(valid);
+    return num;
+}
+
+float cj5_get_float(cj5_result* r, int id)
+{
+    return (float)cj5_get_double(r, id);
+}
+
+int cj5_get_int(cj5_result* r, int id)
+{
+    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
+    char snum[32];
+    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
+    return (int)strtol(snum, NULL, tok->num_type != CJ5_TOKEN_NUMBER_HEX ? 10 : 16);
+}
+
+uint32_t cj5_get_uint(cj5_result* r, int id)
+{
+    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
+    char snum[32];
+    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
+    return (uint32_t)strtoul(snum, NULL, tok->num_type != CJ5_TOKEN_NUMBER_HEX ? 10 : 16);
+}
+
+uint64_t cj5_get_uint64(cj5_result* r, int id)
+{
+    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
+    char snum[64];
+    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
+    return strtoull(snum, NULL, tok->num_type != CJ5_TOKEN_NUMBER_HEX ? 10 : 16);
+}
+
+int64_t cj5_get_int64(cj5_result* r, int id)
+{
+    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
+    char snum[64];
+    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
+    return strtoll(snum, NULL, tok->num_type != CJ5_TOKEN_NUMBER_HEX ? 10 : 16);
+}
+
+bool cj5_get_bool(cj5_result* r, int id)
+{
+    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_BOOL);
+    CJ5_ASSERT((tok->end - tok->start) >= 4);
+
+    uint32_t fourcc = *((const uint32_t*)&r->json5[tok->start]);
+    if (fourcc == CJ5__TRUE_FOURCC) {
+        return true;
+    } else if (fourcc == CJ5__FALSE_FOURCC) {
+        return false;
+    } else {
+        CJ5_ASSERT(0);
+        return false;
+    }
+}
+
+double cj5_seekget_double(cj5_result* r, int parent_id, const char* key, double def_val)
+{
+    int id = cj5_seek(r, parent_id, key);
+    return id > -1 ? cj5_get_double(r, id) : def_val;
+}
+
+float cj5_seekget_float(cj5_result* r, int parent_id, const char* key, float def_val)
+{
+    int id = cj5_seek(r, parent_id, key);
+    return id > -1 ? cj5_get_float(r, id) : def_val;
+}
+
+int cj5_seekget_int(cj5_result* r, int parent_id, const char* key, int def_val)
+{
+    int id = cj5_seek(r, parent_id, key);
+    return id > -1 ? cj5_get_int(r, id) : def_val;
+}
+
+uint32_t cj5_seekget_uint(cj5_result* r, int parent_id, const char* key, uint32_t def_val)
+{
+    int id = cj5_seek(r, parent_id, key);
+    return id > -1 ? cj5_get_uint(r, id) : def_val;
+}
+
+uint64_t cj5_seekget_uint64(cj5_result* r, int parent_id, const char* key, uint64_t def_val)
+{
+    int id = cj5_seek(r, parent_id, key);
+    return id > -1 ? cj5_get_uint64(r, id) : def_val;
+}
+
+int64_t cj5_seekget_int64(cj5_result* r, int parent_id, const char* key, int64_t def_val)
+{
+    int id = cj5_seek(r, parent_id, key);
+    return id > -1 ? cj5_get_int64(r, id) : def_val;
+}
+
+bool cj5_seekget_bool(cj5_result* r, int parent_id, const char* key, bool def_val)
+{
+    int id = cj5_seek(r, parent_id, key);
+    return id > -1 ? cj5_get_bool(r, id) : def_val;
+}
+
+const char* cj5_seekget_string(cj5_result* r, int parent_id, const char* key, char* str,
+                               int max_str, const char* def_val)
+{
+    int id = cj5_seek(r, parent_id, key);
+    return id > -1 ? cj5_get_string(r, id, str, max_str) : def_val;
+}
+
+int cj5_seekget_array_double(cj5_result* r, int parent_id, const char* key, double* values,
+                             int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = cj5_get_double(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_seekget_array_float(cj5_result* r, int parent_id, const char* key, float* values,
+                            int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = cj5_get_float(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_seekget_array_int16(cj5_result* r, int parent_id, const char* key, int16_t* values,
+                            int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = (int16_t)cj5_get_int(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_seekget_array_uint16(cj5_result* r, int parent_id, const char* key, uint16_t* values,
+                             int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = (uint16_t)cj5_get_int(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+
+int cj5_seekget_array_int(cj5_result* r, int parent_id, const char* key, int* values,
+                          int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = cj5_get_int(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_seekget_array_uint(cj5_result* r, int parent_id, const char* key, uint32_t* values,
+                           int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = cj5_get_uint(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_seekget_array_uint64(cj5_result* r, int parent_id, const char* key, uint64_t* values,
+                             int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = cj5_get_uint64(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_seekget_array_int64(cj5_result* r, int parent_id, const char* key, int64_t* values,
+                            int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = cj5_get_int64(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_seekget_array_bool(cj5_result* r, int parent_id, const char* key, bool* values,
+                           int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            values[count++] = cj5_get_bool(r, i);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_seekget_array_string(cj5_result* r, int parent_id, const char* key, char** strs,
+                             int max_str, int max_values)
+{
+    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
+    if (id != -1) {
+        const cj5_token* tok = &r->tokens[id];
+        CJ5__UNUSED(tok);
+        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+        int count = 0;
+        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
+            cj5_get_string(r, i, strs[count++], max_str);
+        }
+        return count;
+    } else {
+        return 0;
+    }
+}
+
+int cj5_get_array_elem(cj5_result* r, int id, int index)
+{
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+    CJ5_ASSERT(index < tok->size);
+    for (int i = id + 1, count = 0, ic = r->num_tokens; i < ic && count < tok->size; i++) {
+        if (r->tokens[i].parent_id == id) {
+            if (count == index) {
+                return i;
+            }
+            count++;
+        }
+    }
+    return -1;
+}
+
+int cj5_get_array_elem_incremental(cj5_result* r, int id, int index, int prev_elem)
+{
+    const cj5_token* tok = &r->tokens[id];
+    CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
+    CJ5_ASSERT(index < tok->size);
+	int start = prev_elem <= 0 ? (id + 1) : (prev_elem + 1);
+    for (int i = start, count = index, ic = r->num_tokens; i < ic && count < tok->size; i++) {
+        if (r->tokens[i].parent_id == id) {
+            if (count == index) {
+                return i;
+            }
+            count++;
+        }
+    }
+    return -1;
+}
+
+#    endif    // CJ5_TOKEN_HELPERS
+#endif        // CJ5_IMPLEMENT

From afe1d262e6c7167e2fd2054a8c501c7aa1c9f42e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 3 Jun 2022 16:01:42 +0200
Subject: [PATCH 0172/1963] refactor(deps): Make atoi a standalone library

---
 deps/atoi.c | 109 +++++++++++++++++++++++++++++++---------------------
 deps/atoi.h |  24 ++++++++++--
 2 files changed, 86 insertions(+), 47 deletions(-)

diff --git a/deps/atoi.c b/deps/atoi.c
index d16a57579d8..5e13a35c77b 100644
--- a/deps/atoi.c
+++ b/deps/atoi.c
@@ -1,62 +1,83 @@
 /* Originally released by the musl project (http://www.musl-libc.org/) under the
  * MIT license. Taken and adapted from the file src/stdlib/atoi.c 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include "atoi.h"
 
-size_t atoiUnsigned(const char *pos, size_t size, UA_UInt64 *result) {
+size_t atoiUnsigned(const char *pos, size_t size, uint64_t *result) {
     size_t i = 0;
-    UA_UInt64 n = 0;
-    while(i < size) {
-        if(pos[i] < '0' || pos[i] > '9')
-            break;
-        n *= 10;
-        n += (UA_UInt64)(pos[i] - '0');
-        i++;
+    uint64_t n = 0;
+    bool digit = false; /* At least one real digit */
+    if(size - i >= 2 && pos[i] == '0' && (pos[i+1] | 32) == 'x') {
+        /* Hex */
+        i += 2;
+        for(; i < size; i++) {
+            uint8_t c = (uint8_t)pos[i] | 32;
+            if(c >= '0' && c <= '9')
+                c = c - '0';
+            else if(c >= 'a' && c <='f')
+                c = c - 'a' + 10;
+            else if(c >= 'A' && c <='F')
+                c = c - 'A' + 10;
+            else
+                break;
+            digit = true;
+            n = (n << 4) | (n & 0xF);
+        }
+    } else {
+        /* Decimal */
+        for(; i < size; i++) {
+            if(pos[i] < '0' || pos[i] > '9')
+                break;
+            n *= 10;
+            digit = true;
+            n +=(uint8_t)(pos[i] - '0');
+        }
     }
-    
+
+    /* No digit was parsed */
+    if(!digit)
+        return 0;
+
     *result = n;
     return i;
 }
 
-size_t atoiSigned(const char *pos, size_t size, UA_Int64 *result) {
+size_t atoiSigned(const char *pos, size_t size, int64_t *result) {
+    /* Negative value? */
     size_t i = 0;
-    UA_Int64 n = 0;
-    UA_Boolean neg = false;
-    if(*pos == '-') {
-        neg = true;
-        pos++;
-    }
-
-    while(i < size) {
-        if(pos[i] < '0' || pos[i] > '9')
-            break;
-        n *= 10;
-        n += pos[i] - '0';
+    bool neg = false;
+    if(*pos == '-' || *pos == '+') {
+        if(*pos == '-')
+            neg = true;
         i++;
     }
 
-    if(neg)
-        n = -n;
+    /* Parse as unsigned */
+    uint64_t n = 0;
+    size_t len = atoiUnsigned(&pos[i], size - i, &n);
+    if(len == 0)
+        return 0;
 
-    *result = n;
-    return i;
+    /* Adjust and return */
+    *result = (!neg) ? (int64_t)n  : -(int64_t)n;
+    return len + i;
 }
diff --git a/deps/atoi.h b/deps/atoi.h
index 9e1fdc281df..099d7818dd6 100644
--- a/deps/atoi.h
+++ b/deps/atoi.h
@@ -5,10 +5,28 @@
 extern "C" {
 #endif
 
-#include <open62541/types.h>
+#if !defined(_MSC_VER) || _MSC_VER >= 1800
+# include <stddef.h>
+# include <stdint.h>
+# include <stdbool.h> /* C99 Boolean */
+#else
+# include "ms_stdint.h"
+# if !defined(__bool_true_false_are_defined)
+#  define bool unsigned char
+#  define true 1
+#  define false 0
+#  define __bool_true_false_are_defined
+# endif
+#endif
+
+/* Parse integer numbers. Returns the number of parsed digits until the first
+ * non-valid character. Returns 0 upon failure.
+ *
+ * Hex numbers start with 0x.
+ * Signed numbers may have a +/- prefix. */
 
-size_t atoiUnsigned(const char *pos, size_t size, UA_UInt64 *result);
-size_t atoiSigned(const char *pos, size_t size, UA_Int64 *result);
+size_t atoiUnsigned(const char *pos, size_t size, uint64_t *result);
+size_t atoiSigned(const char *pos, size_t size, int64_t *result);
     
 #ifdef __cplusplus
 }

From c90e2b4a0db73348d0ecb919416215a668616e1e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 1 Feb 2022 22:42:19 +0100
Subject: [PATCH 0173/1963] refactor(deps): Simplify and rework the cj5 library

---
 CMakeLists.txt       |    2 +
 deps/cj5.c           |  630 +++++++++++++++++++++
 deps/cj5.h           | 1252 +++---------------------------------------
 tests/CMakeLists.txt |    1 +
 tests/check_cj5.c    |  106 ++++
 5 files changed, 812 insertions(+), 1179 deletions(-)
 create mode 100644 deps/cj5.c
 create mode 100644 tests/check_cj5.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b77c63ccb2..b2024a00ebd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1135,11 +1135,13 @@ if(UA_ENABLE_JSON_ENCODING)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage_json.c)
     endif()
     list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/jsmn/jsmn.h
+                                 ${PROJECT_SOURCE_DIR}/deps/cj5.h
                                  ${PROJECT_SOURCE_DIR}/deps/string_escape.h
                                  ${PROJECT_SOURCE_DIR}/deps/itoa.h
                                  ${PROJECT_SOURCE_DIR}/deps/atoi.h
                                  ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.h)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/jsmn/jsmn.c
+                            ${PROJECT_SOURCE_DIR}/deps/cj5.c
                             ${PROJECT_SOURCE_DIR}/deps/string_escape.c
                             ${PROJECT_SOURCE_DIR}/deps/itoa.c
                             ${PROJECT_SOURCE_DIR}/deps/atoi.c
diff --git a/deps/cj5.c b/deps/cj5.c
new file mode 100644
index 00000000000..7cdb9aca478
--- /dev/null
+++ b/deps/cj5.c
@@ -0,0 +1,630 @@
+// MIT License
+//
+// Copyright (c) 2020 Sepehr Taghdisian
+// Copyright (c) 2022 Julius Pfrommer
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#include "cj5.h"
+#include "atoi.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#if defined(_DEBUG) || defined(NDEBUG)
+# include <assert.h>
+# define CJ5_ASSERT(_e) assert(_e)
+#else
+# define CJ5_ASSERT(_e)
+#endif
+
+#if defined(_MSC_VER)
+# define CJ5__RESTRICT __restrict
+# define CJ5_INLINE __inline
+#else
+# define CJ5__RESTRICT __restrict__
+# define CJ5_INLINE inline
+#endif
+
+// Max nesting depth of objects and arrays
+#define CJ5_MAX_NESTING 32
+
+#define CJ5__FOURCC(_a, _b, _c, _d)                         \
+    (((uint32_t)(_a) | ((uint32_t)(_b) << 8) |              \
+      ((uint32_t)(_c) << 16) | ((uint32_t)(_d) << 24)))
+
+static const uint32_t CJ5__NULL_FOURCC  = CJ5__FOURCC('n', 'u', 'l', 'l');
+static const uint32_t CJ5__TRUE_FOURCC  = CJ5__FOURCC('t', 'r', 'u', 'e');
+static const uint32_t CJ5__FALSE_FOURCC = CJ5__FOURCC('f', 'a', 'l', 's');
+
+typedef struct cj5__parser {
+    unsigned int pos;
+    unsigned int line_start;
+    unsigned int line;
+
+    unsigned int next_id;
+    unsigned int super_id; // the current parent
+
+    const char* json5;
+    unsigned int len;
+
+    cj5_token* tokens;
+    unsigned int max_tokens;
+
+    cj5_error_code error;
+} cj5__parser;
+
+static CJ5_INLINE bool
+cj5__isrange(char ch, char from, char to) {
+    return (uint8_t)(ch - from) <= (uint8_t)(to - from);
+}
+
+static CJ5_INLINE bool
+cj5__isupperchar(char ch) {
+    return cj5__isrange(ch, 'A', 'Z');
+}
+
+static CJ5_INLINE bool
+cj5__islowerchar(char ch) {
+    return cj5__isrange(ch, 'a', 'z');
+}
+
+static CJ5_INLINE bool
+cj5__isnum(char ch) {
+    return cj5__isrange(ch, '0', '9');
+}
+
+static CJ5_INLINE cj5_token *
+cj5__alloc_token(cj5__parser *parser) {
+    cj5_token* token = NULL;
+    if(parser->next_id < parser->max_tokens) {
+        token = &parser->tokens[parser->next_id];
+        memset(token, 0x0, sizeof(cj5_token));
+    } else {
+        parser->error = CJ5_ERROR_OVERFLOW;
+    }
+
+    // Always increase the index. So we know eventually how many token would be
+    // required (if there are not enough).
+    parser->next_id++; 
+    return token;
+}
+
+static void
+cj5__parse_string(cj5__parser *parser) {
+    const char *json5 = parser->json5;
+    unsigned int len = parser->len;
+    unsigned int start = parser->pos;
+    char str_open = json5[start];
+
+    parser->pos++;
+    for(; parser->pos < len; parser->pos++) {
+        char c = json5[parser->pos];
+
+        // End of string
+        if(str_open == c) {
+            cj5_token *token = cj5__alloc_token(parser);
+            if(token) {
+                token->type = CJ5_TOKEN_STRING;
+                token->start = start + 1;
+                token->end = parser->pos;
+                token->parent_id = parser->super_id;
+            } 
+            return;
+        }
+
+        // Unescaped newlines are forbidden
+        if(c == '\n') {
+            parser->error = CJ5_ERROR_INVALID;
+            return;
+        }
+
+        // Escape char
+        if(c == '\\') {
+            if(parser->pos + 1 >= len) {
+                parser->error = CJ5_ERROR_INCOMPLETE;
+                return;
+            }
+            parser->pos++;
+            switch(json5[parser->pos]) {
+            case '\"':
+            case '/':
+            case '\\':
+            case 'b':
+            case 'f':
+            case 'r':
+            case 'n':
+            case 't':
+                break;
+            case 'u': // The next four characters are an utf8 code
+                parser->pos++;
+                if(parser->pos + 4 >= len) {
+                    parser->error = CJ5_ERROR_INVALID;
+                    return;
+                }
+                for(unsigned int i = 0; i < 4; i++) {
+                    // If it isn't a hex character we have an error
+                    if(!(json5[parser->pos] >= 48 && json5[parser->pos] <= 57) && /* 0-9 */
+                       !(json5[parser->pos] >= 65 && json5[parser->pos] <= 70) && /* A-F */
+                       !(json5[parser->pos] >= 97 && json5[parser->pos] <= 102))  /* a-f */
+                        {
+                            parser->error = CJ5_ERROR_INVALID;
+                            return;
+                        }
+                    parser->pos++;
+                }
+                parser->pos--;
+                break;
+            case '\n': // Escape break line
+                parser->line++;
+                parser->line_start = parser->pos;
+                break;
+            default:
+                parser->error = CJ5_ERROR_INVALID;
+                return;
+            }
+        }
+    }
+
+    // The file has ended before the string terminates
+    parser->error = CJ5_ERROR_INCOMPLETE;
+}
+
+static void
+cj5__parse_primitive(cj5__parser* parser) {
+    const char* json5 = parser->json5;
+    unsigned int len = parser->len;
+    unsigned int start = parser->pos;
+
+    // String value
+    if(json5[start] == '\"' ||
+       json5[start] == '\'') {
+        cj5__parse_string(parser);
+        return;
+    }
+
+    // Fast comparison of bool, and null.
+    // We have to use memcpy here or we can get unaligned accesses
+    uint32_t fourcc = 0;
+    if(start + 4 < len)
+        memcpy(&fourcc, &json5[start], 4);
+    
+    cj5_token_type type;
+    if(fourcc == CJ5__NULL_FOURCC) {
+        type = CJ5_TOKEN_NULL;
+        parser->pos += 4;
+    } else if(fourcc == CJ5__TRUE_FOURCC) {
+        type = CJ5_TOKEN_BOOL;
+        parser->pos += 4;
+    } else if(fourcc == CJ5__FALSE_FOURCC) {
+        // "false" has five characters
+        type = CJ5_TOKEN_BOOL;
+        if(start + 5 >= len || json5[start+5] != 'e') {
+            parser->error = CJ5_ERROR_INVALID;
+            return;
+        }
+        parser->pos += 5;
+    } else {
+        // Numbers are checked for basic compatibility.
+        // But they are fully parsed only in the cj5_get_XXX functions.
+        type = CJ5_TOKEN_NUMBER;
+        for(; parser->pos < len; parser->pos++) {
+            if(!cj5__isnum(json5[parser->pos]) &&
+               !(json5[parser->pos] == '.') &&
+               !cj5__islowerchar(json5[parser->pos]) && 
+               !cj5__isupperchar(json5[parser->pos]) &&
+               !(json5[parser->pos] == '+') && !(json5[parser->pos] == '-')) {
+                parser->pos--; // Reparse this character for the next token
+                break;
+            }
+        }
+    }
+
+    cj5_token *token = cj5__alloc_token(parser);
+    if(token) {
+        token->type = type;
+        token->start = start;
+        token->end = parser->pos + 1;
+        token->parent_id = parser->super_id;
+    }
+}
+
+static void
+cj5__parse_key(cj5__parser* parser) {
+    const char* json5 = parser->json5;
+    unsigned int start = parser->pos;
+    cj5_token* token;
+
+    // A normal string
+    if(json5[start] == '\"' || json5[start] == '\'') {
+        cj5__parse_string(parser);
+        return;
+    }
+
+    // An unquoted key.
+    // Must start with a-ZA-Z_$.
+    // Can contain numbers later on.
+    unsigned int len = parser->len;
+    for(; parser->pos < len; parser->pos++) {
+        if(cj5__islowerchar(json5[parser->pos]) ||
+           cj5__isupperchar(json5[parser->pos]) ||
+           json5[parser->pos] == '_' || json5[parser->pos] == '$')
+            continue;
+        if(cj5__isnum(json5[parser->pos]) && parser->pos != start)
+            continue;
+        break;
+    }
+
+    // An empty key is not allowed
+    if(parser->pos == start) {
+        parser->error = CJ5_ERROR_INVALID;
+        return;
+    }
+
+    // Reparse the character that is beyond the string
+    parser->pos--;
+
+    token = cj5__alloc_token(parser);
+    if(token) {
+        token->type = CJ5_TOKEN_STRING;
+        token->start = start;
+        token->end = parser->pos + 1;
+        token->parent_id = parser->super_id;
+    }
+}
+
+static void
+cj5__skip_comment(cj5__parser* parser) {
+    const char* json5 = parser->json5;
+    for(; parser->pos < parser->len; parser->pos++) {
+        if(json5[parser->pos] == '\n' || json5[parser->pos] == '\r')
+            return;
+    }
+}
+
+static void
+cj5__skip_multiline_comment(cj5__parser *parser) {
+    const char* json5 = parser->json5;
+    unsigned int len = parser->len;
+    for(; parser->pos < len; parser->pos++) {
+        if(json5[parser->pos] == '*' && parser->pos + 1 < len &&
+           json5[parser->pos+1] == '/')
+            return;
+    }
+    parser->error = CJ5_ERROR_INCOMPLETE;
+}
+
+cj5_result
+cj5_parse(const char *json5, unsigned int len,
+          cj5_token *tokens, unsigned int max_tokens) {
+    cj5_result r;
+    cj5__parser parser;
+    memset(&parser, 0x0, sizeof(parser));
+    parser.super_id = 0;
+    parser.json5 = json5;
+    parser.len = len;
+    parser.tokens = tokens;
+    parser.max_tokens = max_tokens;
+
+    // The nesting depth zero means "outside the root object"
+    unsigned short depth = 0;
+    char nesting[CJ5_MAX_NESTING]; // Contains either '\0', '{' or '[' for the
+                                   // type of nesting at each depth. '\0'
+                                   // indicates we are out of the root object.
+    char slot[CJ5_MAX_NESTING];    // Next content to parse: 'k' (key), ':', 'v'
+                                   // (value) or ',' (komma).
+    nesting[0] = 0; // Becomes '{' if there is a virtual root object
+    slot[0] = 0;
+    bool before_root = true;
+    cj5_token *token;
+
+    for(; parser.pos < len; parser.pos++) {
+        char c = json5[parser.pos];
+        switch(c) {
+        case '\n': // Newline
+            parser.line++;
+            parser.line_start = parser.pos;
+            break;
+
+        case '\r': // Whitespace
+        case '\t':
+        case ' ':
+            break;
+
+        case '#': // Comment
+        case '/':
+            if(json5[parser.pos] == '#') {
+                cj5__skip_comment(&parser);
+            } else {
+                if(parser.pos + 1 >= parser.len) {
+                    parser.error = CJ5_ERROR_INVALID;
+                } else if(json5[parser.pos + 1] == '/') {
+                    cj5__skip_comment(&parser);
+                } else if(json5[parser.pos + 1] == '*') {
+                    cj5__skip_multiline_comment(&parser);
+                }
+            }
+            if(parser.error != CJ5_ERROR_NONE &&
+               parser.error != CJ5_ERROR_OVERFLOW)
+                goto finish;
+            break;
+
+        case '{': // Open an object or array
+        case '[':
+            // Check the nesting depth
+            if(depth + 1 >= CJ5_MAX_NESTING) {
+                parser.error = CJ5_ERROR_INVALID;
+                goto finish;
+            }
+
+            // Correct slot?
+            if(slot[depth] != 'v') {
+                // Start the root object
+                if(!before_root || c != '{') {
+                    parser.error = CJ5_ERROR_INVALID;
+                    goto finish;
+                }
+                before_root = false;
+            }
+
+            depth++; // Increase the nesting
+            nesting[depth] = c;
+            slot[depth] = (c == '{') ? 'k' : 'v';
+
+            // Create a token for the object or array
+            token = cj5__alloc_token(&parser);
+            if(token) {
+                token->parent_id = parser.super_id;
+                token->type = (c == '{') ? CJ5_TOKEN_OBJECT : CJ5_TOKEN_ARRAY;
+                token->start = parser.pos;
+                token->size = parser.next_id; // Adjusted when closed
+                parser.super_id = parser.next_id - 1; // The new super_id is for this token
+            }
+            break;
+
+        case '}': // Close an object or array
+        case ']':
+            // Check the nesting depth. Note that a "virtual root object" at
+            // depth zero must not be closed.
+            if(depth == 0) {
+                parser.error = CJ5_ERROR_INVALID;
+                goto finish;
+            }
+
+            // Check and adjust the nesting. Note that ']' - '[' == 2 and '}' -
+            // '{' == 2. Arrays can always be closed. Objects can only close
+            // when a key or a comma is expected.
+            if(c - nesting[depth] != 2 ||
+               (c == '}' && slot[depth] != 'k' && slot[depth] != ',')) {
+                parser.error = CJ5_ERROR_INVALID;
+                goto finish;
+            }
+
+            // Finish setting the super-token
+            if(parser.error != CJ5_ERROR_OVERFLOW) {
+                token = &tokens[parser.super_id];
+                token->end = parser.pos + 1;
+                token->size++; // End of the object -> count as one value for the parent
+                parser.super_id = token->parent_id; // Reset the super_id
+            }
+
+            // Step one level up
+            depth--;
+            slot[depth] = (depth > 0) ? ',' : 0; // zero if we step out the root object
+            break;
+
+        case ':': // Colon (between key and value)
+            if(slot[depth] != ':') {
+                parser.error = CJ5_ERROR_INVALID;
+                goto finish;
+            }
+            slot[depth] = 'v';
+            break;
+
+        case ',': // Comma
+            if(slot[depth] != ',') {
+                parser.error = CJ5_ERROR_INVALID;
+                goto finish;
+            }
+            slot[depth] = (nesting[depth] == '{') ? 'k' : 'v';
+            break;
+
+        default: // Value
+            if(slot[depth] == 'v') {
+                cj5__parse_primitive(&parser); // Parse primitive value
+                token->size++; // One more value for the parent
+                slot[depth] = ',';
+            } else if(slot[depth] == 'k') {
+                cj5__parse_key(&parser); // Parse key
+                token->size++; // Keys count towards the length
+                slot[depth] = ':';
+            } else {
+                if(before_root) {
+                    // Create a virtual root object
+                    CJ5_ASSERT(depth == 0);
+                    nesting[0] = '{';
+                    slot[0] = 'k';
+                    token = cj5__alloc_token(&parser);
+                    if(token) {
+                        token->parent_id = parser.super_id;
+                        token->type = CJ5_TOKEN_OBJECT;
+                        token->start = parser.pos;
+                        token->size = parser.next_id;
+                        parser.super_id = parser.next_id - 1;
+                    }
+                    parser.pos--; // Reparse the current character
+                } else {
+                    parser.error = CJ5_ERROR_INVALID;
+                }
+            }
+            if(parser.error && parser.error != CJ5_ERROR_OVERFLOW)
+                goto finish;
+            break;
+        }
+    }
+
+    // The initial object was not closed
+    if(depth != 0) {
+        parser.error = CJ5_ERROR_INCOMPLETE;
+        goto finish;
+    }
+
+    // Close the virtual root object if there is one
+    if(nesting[0] == '{' && parser.error != CJ5_ERROR_OVERFLOW) {
+        token = &tokens[parser.super_id];
+        token->end = parser.pos;
+        token->size = parser.next_id - token->size;
+        parser.super_id = token->parent_id; // Reset the super_id
+    }
+
+ finish:
+    memset(&r, 0x0, sizeof(r));
+    r.error = parser.error;
+    r.error_line = parser.line;
+    r.error_col = parser.pos - parser.line_start;
+    r.num_tokens = parser.next_id; // How many tokens (would) have been consumed
+                                   // by the parser?
+
+    // Set the tokens and original string only if successfully parsed
+    if(r.error == CJ5_ERROR_NONE) {
+        r.tokens = tokens;
+        r.json5 = json5;
+    }
+
+    return r;
+}
+
+cj5_error_code
+cj5_get_float(const char *json5, const cj5_token *token, double *out) {
+    char buf[128];
+    unsigned int len = token->end - token->start;
+    if(len >= 128)
+        return CJ5_ERROR_OVERFLOW;
+    memcpy(buf, &json5[token->start], len);
+    buf[len] = 0;
+    errno = 0;
+    char *endptr;
+    *out = strtod(&json5[token->start], &endptr);
+    if(errno != 0 || endptr != &json5[token->end])
+        return CJ5_ERROR_INVALID;
+    return CJ5_ERROR_NONE;
+}
+
+cj5_error_code
+cj5_get_int(const char *json5, const cj5_token *token, int64_t *out) {
+    size_t parsed = atoiSigned(&json5[token->start],
+                               token->end - token->start, out);
+    return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
+}
+
+cj5_error_code
+cj5_get_uint(const char *json5, const cj5_token *token, uint64_t *out) {
+    size_t parsed = atoiUnsigned(&json5[token->start],
+                                 token->end - token->start, out);
+    return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
+}
+
+cj5_error_code
+cj5_get_str(const char *json5, const cj5_token *token,
+            char *buf, unsigned *buflen) {
+    const char *pos = &json5[token->start];
+    const char *end = &json5[token->end];
+    unsigned int outpos = 0;
+    for(; pos < end; pos++) {
+        uint8_t c = (uint8_t)*pos;
+
+        // Process an escape character
+        if(c == '\\') {
+            if(pos + 1 >= end)
+                return CJ5_ERROR_INCOMPLETE;
+            pos++;
+            c = (uint8_t)*pos;
+            switch(c) {
+            case '\"': buf[outpos++] = '\"'; break;
+            case '\\': buf[outpos++] = '\\'; break;
+            case '\n': buf[outpos++] = '\n'; break; // escape newline
+            case '/':  buf[outpos++] = '/';  break;
+            case 'b':  buf[outpos++] = '\b'; break;
+            case 'f':  buf[outpos++] = '\f'; break;
+            case 'r':  buf[outpos++] = '\r'; break;
+            case 'n':  buf[outpos++] = '\n'; break;
+            case 't':  buf[outpos++] = '\t'; break;
+            case 'u': // The next four characters are an utf8 code
+                if(pos + 4 >= end)
+                    return CJ5_ERROR_INCOMPLETE;
+                
+                // Parse the unicode code point
+                uint32_t utf = 0;
+                for(unsigned int i = 0; i < 4; i++) {
+                    pos++;
+                    uint8_t byte = (uint8_t)*pos;
+                    if(byte >= '0' && byte <= '9') {
+                        byte = byte - (uint8_t)'0';
+                    } else if(byte >= 'a' && byte <='f') {
+                        byte = byte - (uint8_t)('a' - 10);
+                    } else if(byte >= 'A' && byte <='F') {
+                        byte = byte - (uint8_t)('A' - 10);
+                    } else {
+                        return CJ5_ERROR_INVALID;
+                    }
+                    utf = (utf << 4) | (byte & 0xF);
+                }
+                
+                // Print the utf8 bytes
+                if(utf <= 0x7F) { // Plain ASCII
+                    buf[outpos++] = (char)utf;
+                } else if(utf <= 0x07FF) { // 2-byte unicode
+                    buf[outpos++] = (char) (((utf >> 6) & 0x1F) | 0xC0);
+                    buf[outpos++] = (char) (((utf >> 0) & 0x3F) | 0x80);
+                } else if(utf <= 0xFFFF) { // 3-byte unicode
+                    buf[outpos++] = (char) (((utf >> 12) & 0x0F) | 0xE0);
+                    buf[outpos++] = (char) (((utf >>  6) & 0x3F) | 0x80);
+                    buf[outpos++] = (char) (((utf >>  0) & 0x3F) | 0x80);
+                } else if(utf <= 0x10FFFF) { // 4-byte unicode
+                    buf[outpos++] = (char) (((utf >> 18) & 0x07) | 0xF0);
+                    buf[outpos++] = (char) (((utf >> 12) & 0x3F) | 0x80);
+                    buf[outpos++] = (char) (((utf >>  6) & 0x3F) | 0x80);
+                    buf[outpos++] = (char) (((utf >>  0) & 0x3F) | 0x80);
+                } else {
+                    return CJ5_ERROR_INVALID; // Not a utf8 string
+                }
+                break;
+            default:
+                return CJ5_ERROR_INVALID;
+            }
+            continue;
+        }
+
+        // Unprintable ascii character
+        if(c < 32 || c == 127)
+            return CJ5_ERROR_INVALID;
+
+        // Ascii character or utf8 byte
+        buf[outpos++] = (char)c;
+    }
+
+    // Terminate with \0
+    buf[outpos] = 0;
+
+    // Set the output length
+    if(buflen)
+        *buflen = outpos;
+    return CJ5_ERROR_NONE;
+}
diff --git a/deps/cj5.h b/deps/cj5.h
index 7f1fbd82580..f98f5fc3b52 100644
--- a/deps/cj5.h
+++ b/deps/cj5.h
@@ -1,10 +1,7 @@
-// cj5.h: Very minimal single header JSON5 parser in C99, dervied from jsmn
-//        This is the modified version of jsmn library
-//        Thus main parts of the code is taken from jsmn project (https://github.com/zserge/jsmn)
-//
 // MIT License
 //
 // Copyright (c) 2020 Sepehr Taghdisian
+// Copyright (c) 2022 Julius Pfrommer
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +21,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 //
+// Very minimal single header JSON5 parser in C99, dervied from jsmn This is the
+// modified version of jsmn library Thus main parts of the code is taken from
+// jsmn project (https://github.com/zserge/jsmn).
+//
 // Compliance with JSON5:
 //  [x] Object keys may be an ECMAScript 5.1 IdentifierName.
 //  [x] Objects may have a single trailing comma.
@@ -36,59 +37,50 @@
 //  [x] Numbers may begin with an explicit plus sign.
 //  [x] Single and multi-line comments are allowed.
 //  [x] Additional white space characters are allowed.
-//  [x] Multiline comments
+//
+// Extensions to JSON5 (more permissive):
+//  [x] If no root object is defined, a "virtual root object" is assumed.
+//  [x] Hash ('#') comments out until the end of the line.
+//  [x] Strings may include unescaped utf8 bytes
 //
 // Usage:
-//  The main function to parse json is `cj5_parse`. 
-//  like jsmn, you provide all tokens to be filled as an array and provide the maximum count
-//  The result will be return in `cj5_result` struct, and `num_tokens` will represent the actual
-//  token count that is parsed. 
-//  In case of errors, cj_result.error will be set to an error code
-//  Here's a quick example of the usage, first define CJ5_IMPLEMENT to include the implementation:
+//  The main function to parse json is `cj5_parse`. Like in jsmn, you provide
+//  all tokens to be filled as an array and provide the maximum count The result
+//  will be return in `cj5_result` struct, and `num_tokens` will represent the
+//  actual token count that is parsed. In case of errors, cj_result.error will
+//  be set to an error code Here's a quick example of the usage.
 //  
-//        #define CJ5_IMPLEMENT
-//        #include "cj5.h"
+//  #include "cj5.h"
 //
-//        cj5_token tokens[32];
-//        cj5_result r = cj5_parse(g_json, (int)strlen(g_json), tokens, 32);
-//        
-//        if (r.error != CJ5_ERROR_NONE) {
-//          if (r.error == CJ5_ERROR_OVERFLOW) {
-//              // you can use r.num_tokens to determine the actual token count and reparse
-//              printf("Error: line: %d, col: %d\n", r.error_line, r.error_code);    
-//          }
-//        } else {
-//          // use token helper functions (see below) to access the values 
-//          float my_num = cj5_seekget_float(&r, 0, "my_num", 0 /* default value if not found*/ );
-//        } 
-// 
-// Customization:
-//  This library doesn't use any memory allocations so hooray for that !
-//  But in order to not use default stdc functions, you can override those by defining these macros:
-//      - CJ5_IMPLEMENT: include implementation for cj5
-//      - CJ5_ASSERT(e): replace stdc `assert` macro with your own version
-//      - CJ5_MEMSET(dst, value, size): replace 'memset' function with your own
-//      - CJ5_MEMCPY(dst, src, size): replace 'memcpy' function with your own
-//      - CJ5_TOKEN_HELPERS: add token helper functions (default=ON), you can skip these by definining:
-//                           #define CJ5_TOKEN_HELPERS 0, before including the header
-//      - CJ5_API: API decleration can be override by defining this macro. (default is extern)
-//                 example: #define CJ5_API static
-// 
-#pragma once
-
-#include <stdbool.h>    // bool
-#include <stdint.h>     // uint32_t, int64_t, etc.
-
-#ifndef CJ5_TOKEN_HELPERS
-#    define CJ5_TOKEN_HELPERS 1
+//  cj5_token tokens[32];
+//  cj5_result r = cj5_parse(g_json, (int)strlen(g_json), tokens, 32);
+//  if(r.error != CJ5_ERROR_NONE) {
+//      if(r.error == CJ5_ERROR_OVERFLOW) {
+//          // you can use r.num_tokens to determine the actual token count and reparse
+//          printf("Error: line: %d, col: %d\n", r.error_line, r.error_code);    
+//      }
+//  }
+
+#ifndef __CJ5_H_
+#define __CJ5_H_
+
+#ifdef __cplusplus
+# define CJ5_API extern "C"
+#else
+# define CJ5_API
 #endif
 
-#ifndef CJ5_API
-#    ifdef __cplusplus
-#        define CJ5_API extern "C"
-#    else
-#        define CJ5_API
-#    endif
+#if !defined(_MSC_VER) || _MSC_VER >= 1800
+# include <stdint.h>
+# include <stdbool.h>
+#else
+# include "ms_stdint.h"
+# if !defined(__bool_true_false_are_defined)
+#  define bool unsigned char
+#  define true 1
+#  define false 0
+#  define __bool_true_false_are_defined
+# endif
 #endif
 
 typedef enum cj5_token_type {
@@ -100,1150 +92,52 @@ typedef enum cj5_token_type {
     CJ5_TOKEN_NULL
 } cj5_token_type;
 
-// sub-type for NUMBER token type
-// this is merely a hint for the user to see what type of number the token contains
-typedef enum cj5_token_number_type {
-    CJ5_TOKEN_NUMBER_UNKNOWN = 0,
-    CJ5_TOKEN_NUMBER_FLOAT,
-    CJ5_TOKEN_NUMBER_INT,
-    CJ5_TOKEN_NUMBER_HEX
-} cj5_token_number_type;
-
 typedef enum cj5_error_code {
     CJ5_ERROR_NONE = 0,
-    CJ5_ERROR_INVALID,       // invalid character/syntax
-    CJ5_ERROR_INCOMPLETE,    // incomplete json string
-    CJ5_ERROR_OVERFLOW       // token buffer overflow, need more tokens (see cj5_result.num_tokens)
+    CJ5_ERROR_INVALID,       // Invalid character/syntax
+    CJ5_ERROR_INCOMPLETE,    // Incomplete JSON string
+    CJ5_ERROR_OVERFLOW       // Token buffer overflow (see cj5_result.num_tokens)
 } cj5_error_code;
 
 typedef struct cj5_token {
     cj5_token_type type;
-    union {
-        cj5_token_number_type num_type;
-        uint32_t key_hash;
-    };
-    int start;
-    int end;
-    int size;
-    int parent_id;      // = -1 if there is no parent
+    unsigned int start;     // Start position in the json5 string
+    unsigned int end;       // Position of the last character (included)
+    unsigned int size;      // Number of direct children. For objects, both key and value
+                            // are counted. Note that this is *not*
+                            // the number of overall (recursively nested) child tokens.
+    unsigned int parent_id; // The root object is at position zero. It is an
+                            // object that has itself as parent.
 } cj5_token;
 
 typedef struct cj5_result {
     cj5_error_code error;
-    int error_line;
-    int error_col;
-    int num_tokens;
+    unsigned int error_line;
+    unsigned int error_col;
+    unsigned int num_tokens;
     const cj5_token* tokens;
     const char* json5;
 } cj5_result;
 
-CJ5_API cj5_result cj5_parse(const char* json5, int len, cj5_token* tokens, int max_tokens);
-
-// token helpers
-#if CJ5_TOKEN_HELPERS
-CJ5_API int cj5_seek(cj5_result* r, int parent_id, const char* key);
-CJ5_API int cj5_seek_hash(cj5_result* r, int parent_id, const uint32_t key_hash);
-CJ5_API int cj5_seek_recursive(cj5_result* r, int parent_id, const char* key);
-CJ5_API const char* cj5_get_string(cj5_result* r, int id, char* str, int max_str);
-CJ5_API double cj5_get_double(cj5_result* r, int id);
-CJ5_API float cj5_get_float(cj5_result* r, int id);
-CJ5_API int cj5_get_int(cj5_result* r, int id);
-CJ5_API uint32_t cj5_get_uint(cj5_result* r, int id);
-CJ5_API uint64_t cj5_get_uint64(cj5_result* r, int id);
-CJ5_API int64_t cj5_get_int64(cj5_result* r, int id);
-CJ5_API bool cj5_get_bool(cj5_result* r, int id);
-CJ5_API double cj5_seekget_double(cj5_result* r, int parent_id, const char* key, double def_val);
-CJ5_API float cj5_seekget_float(cj5_result* r, int parent_id, const char* key, float def_val);
-CJ5_API int cj5_seekget_array_int16(cj5_result* r, int parent_id, const char* key, int16_t* values, int max_values);
-CJ5_API int cj5_seekget_array_uint16(cj5_result* r, int parent_id, const char* key, uint16_t* values, int max_values);
-CJ5_API int cj5_seekget_int(cj5_result* r, int parent_id, const char* key, int def_val);
-CJ5_API uint32_t cj5_seekget_uint(cj5_result* r, int parent_id, const char* key, uint32_t def_val);
-CJ5_API uint64_t cj5_seekget_uint64(cj5_result* r, int parent_id, const char* key, uint64_t def_val);
-CJ5_API int64_t cj5_seekget_int64(cj5_result* r, int parent_id, const char* key, int64_t def_val);
-CJ5_API bool cj5_seekget_bool(cj5_result* r, int parent_id, const char* key, bool def_val);
-CJ5_API const char* cj5_seekget_string(cj5_result* r, int parent_id, const char* key, char* str, int max_str, const char* def_val);
-CJ5_API int cj5_seekget_array_double(cj5_result* r, int parent_id, const char* key, double* values, int max_values);
-CJ5_API int cj5_seekget_array_float(cj5_result* r, int parent_id, const char* key, float* values, int max_values);
-CJ5_API int cj5_seekget_array_int(cj5_result* r, int parent_id, const char* key, int* values, int max_values);
-CJ5_API int cj5_seekget_array_uint(cj5_result* r, int parent_id, const char* key, uint32_t* values, int max_values);
-CJ5_API int cj5_seekget_array_uint64(cj5_result* r, int parent_id, const char* key, uint64_t* values, int max_values);
-CJ5_API int cj5_seekget_array_int64(cj5_result* r, int parent_id, const char* key, int64_t* values, int max_values);
-CJ5_API int cj5_seekget_array_bool(cj5_result* r, int parent_id, const char* key, bool* values, int max_values);
-CJ5_API int cj5_seekget_array_string(cj5_result* r, int parent_id, const char* key, char** strs, int max_str, int max_values);
-CJ5_API int cj5_get_array_elem(cj5_result* r, int id, int index);
-CJ5_API int cj5_get_array_elem_incremental(cj5_result* r, int id, int index, int prev_elem);
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// IMPLEMENTATION
-#if defined(CJ5_IMPLEMENT)
-
-// optional: override asset
-#    ifndef CJ5_ASSERT
-#        include <assert.h>
-#        define CJ5_ASSERT(_e) assert(_e)
-#    endif
-
-// optional: override memcpy
-#    ifndef CJ5_MEMCPY
-#        include <string.h>    // memcpy
-#        define CJ5_MEMCPY(_dst, _src, _n) memcpy((_dst), (_src), (_n))
-#    endif
-
-#    ifndef CJ5_MEMSET
-#        include <string.h>
-#        define CJ5_MEMSET(_dst, _val, _size) memset((_dst), (_val), (_size))
-#    endif
-
-#    define CJ5__ARCH_64BIT 0
-#    define CJ5__ARCH_32BIT 0
-#    if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(__64BIT__) || \
-        defined(__mips64) || defined(__powerpc64__) || defined(__ppc64__) || defined(__LP64__)
-#        undef CJ5__ARCH_64BIT
-#        define CJ5__ARCH_64BIT 64
-#    else
-#        undef CJ5__ARCH_32BIT
-#        define CJ5__ARCH_32BIT 32
-#    endif    //
-
-#    if defined(_MSC_VER)
-#        define CJ5__RESTRICT __restrict
-#    else
-#        define CJ5__RESTRICT __restrict__
-#    endif
-
-#    define CJ5__UNUSED(_a) (void)(_a)
-
-#    define CJ5__FOURCC(_a, _b, _c, _d) \
-        (((uint32_t)(_a) | ((uint32_t)(_b) << 8) | ((uint32_t)(_c) << 16) | ((uint32_t)(_d) << 24)))
-
-static const uint32_t CJ5__NULL_FOURCC = CJ5__FOURCC('n', 'u', 'l', 'l');
-static const uint32_t CJ5__TRUE_FOURCC = CJ5__FOURCC('t', 'r', 'u', 'e');
-static const uint32_t CJ5__FALSE_FOURCC = CJ5__FOURCC('f', 'a', 'l', 's');
-
-static const uint32_t CJ5__FNV1_32_INIT = 0x811c9dc5;
-static const uint32_t CJ5__FNV1_32_PRIME = 0x01000193;
-
-typedef struct cj5__parser {
-    int pos;
-    int next_id;
-    int super_id;
-    int line;
-} cj5__parser;
-
-static inline uint32_t cj5__hash_fnv32(const char* start, const char* end)
-{
-    const char* bp = start;
-    const char* be = end;    // start + len
-
-    uint32_t hval = CJ5__FNV1_32_INIT;
-    while (bp < be) {
-        hval ^= (uint32_t)*bp++;
-        hval *= CJ5__FNV1_32_PRIME;
-    }
-
-    return hval;
-}
-
-static inline bool cj5__isspace(char ch)
-{
-    return (uint32_t)(ch - 1) < 32 && ((0x80001F00 >> (uint32_t)(ch - 1)) & 1) == 1;
-}
-
-static inline bool cj5__isrange(char ch, char from, char to)
-{
-    return (uint8_t)(ch - from) <= (uint8_t)(to - from);
-}
-
-static inline bool cj5__isupperchar(char ch)
-{
-    return cj5__isrange(ch, 'A', 'Z');
-}
-
-static inline bool cj5__islowerchar(char ch)
-{
-    return cj5__isrange(ch, 'a', 'z');
-}
-
-static inline bool cj5__isnum(char ch)
-{
-    return cj5__isrange(ch, '0', '9');
-}
-
-static inline char* cj5__strcpy(char* CJ5__RESTRICT dst, int dst_sz, const char* CJ5__RESTRICT src,
-                                int num)
-{
-    const int _max = dst_sz - 1;
-    const int _num = (num < _max ? num : _max);
-    if (_num > 0) {
-        CJ5_MEMCPY(dst, src, _num);
-    }
-    dst[_num] = '\0';
-    return dst;
-}
-
-// https://github.com/lattera/glibc/blob/master/string/strlen.c
-static int cj5__strlen(const char* str)
-{
-    const char* char_ptr;
-    const uintptr_t* longword_ptr;
-    uintptr_t longword, himagic, lomagic;
-
-    for (char_ptr = str; ((uintptr_t)char_ptr & (sizeof(longword) - 1)) != 0; ++char_ptr) {
-        if (*char_ptr == '\0')
-            return (int)(intptr_t)(char_ptr - str);
-    }
-    longword_ptr = (uintptr_t*)char_ptr;
-    himagic = 0x80808080L;
-    lomagic = 0x01010101L;
-#    if CJ5__ARCH_64BIT
-    /* 64-bit version of the magic.  */
-    /* Do the shift in two steps to avoid a warning if long has 32 bits.  */
-    himagic = ((himagic << 16) << 16) | himagic;
-    lomagic = ((lomagic << 16) << 16) | lomagic;
-#    endif
-
-    for (;;) {
-        longword = *longword_ptr++;
-
-        if (((longword - lomagic) & ~longword & himagic) != 0) {
-            const char* cp = (const char*)(longword_ptr - 1);
-
-            if (cp[0] == 0)
-                return (int)(intptr_t)(cp - str);
-            if (cp[1] == 0)
-                return (int)(intptr_t)(cp - str + 1);
-            if (cp[2] == 0)
-                return (int)(intptr_t)(cp - str + 2);
-            if (cp[3] == 0)
-                return (int)(intptr_t)(cp - str + 3);
-#    if CJ5__ARCH_64BIT
-            if (cp[4] == 0)
-                return (int)(intptr_t)(cp - str + 4);
-            if (cp[5] == 0)
-                return (int)(intptr_t)(cp - str + 5);
-            if (cp[6] == 0)
-                return (int)(intptr_t)(cp - str + 6);
-            if (cp[7] == 0)
-                return (int)(intptr_t)(cp - str + 7);
-#    endif
-        }
-    }
-
-    #ifndef _MSC_VER
-    CJ5_ASSERT(0);
-    return -1;
-    #endif
-}
-
-static inline cj5_token* cj5__alloc_token(cj5__parser* parser, cj5_token* tokens, int max_tokens)
-{
-    if (!tokens || parser->next_id >= max_tokens) {
-        return NULL;
-    }
-
-    cj5_token* token = &tokens[parser->next_id++];
-    CJ5_MEMSET(token, 0x0, sizeof(cj5_token));
-    token->start = -1;
-    token->end = -1;
-    token->parent_id = -1;
-    return token;
-}
-
-static inline void cj5__set_error(cj5_result* r, cj5_error_code code, int line, int col)
-{
-    r->error = code;
-    r->error_line = line + 1;
-    r->error_col = col + 1;
-}
-
-static bool cj5__parse_primitive(cj5__parser* parser, cj5_result* r, const char* json5, int len,
-                                 cj5_token* tokens, int max_tokens)
-{
-    cj5_token* token;
-    int start = parser->pos;
-    int line_start = start;
-    bool keyname = false;
-    bool new_line = false;
-
-    for (; parser->pos < len; parser->pos++) {
-        switch (json5[parser->pos]) {
-        case '\n':
-            line_start = parser->pos;
-            new_line = true;
-            goto found;
-        case ':':
-            keyname = true;
-            goto found;
-        case '\t':
-        case '\r':
-        case ' ':
-        case ',':
-        case ']':
-        case '}':
-            goto found;
-        default:
-            break;
-        }
-
-        if (json5[parser->pos] < 32 || json5[parser->pos] >= 127) {
-            cj5__set_error(r, CJ5_ERROR_INVALID, parser->line, parser->pos - line_start);
-            parser->pos = start;
-            return false;
-        }
-    }
-
-    cj5__set_error(r, CJ5_ERROR_INCOMPLETE, parser->line, parser->pos - line_start);
-    parser->pos = start;
-    return false;
-
-found:
-    token = cj5__alloc_token(parser, tokens, max_tokens);
-    if (token == NULL) {
-        r->error = CJ5_ERROR_OVERFLOW;
-        --parser->pos;
-        return true;
-    }
-
-    cj5_token_type type;
-    cj5_token_number_type num_type = CJ5_TOKEN_NUMBER_UNKNOWN;
-    if (keyname) {
-        // JSON5: it is likely a key-name, validate and interpret as string
-        for (int i = start; i < parser->pos; i++) {
-            if (cj5__islowerchar(json5[i]) || cj5__isupperchar(json5[i]) || json5[i] == '_') {
-                continue;
-            }
-
-            if (cj5__isnum(json5[i])) {
-                if (i == start) {
-                    cj5__set_error(r, CJ5_ERROR_INVALID, parser->line, parser->pos - line_start);
-                    parser->pos = start;
-                    return false;
-                }
-                continue;
-            }
-
-            cj5__set_error(r, CJ5_ERROR_INVALID, parser->line, parser->pos - line_start);
-            parser->pos = start;
-            return false;
-        }
-
-        type = CJ5_TOKEN_STRING;
-    } else {
-        // detect other types, subtypes
-        // note that we have to use memcpy here or we will get unaligned access on some
-        uint32_t fourcc_;
-        CJ5_MEMCPY(&fourcc_, &json5[start], 4);
-        uint32_t* fourcc = &fourcc_;
- 
-        if (*fourcc == CJ5__NULL_FOURCC) {
-            type = CJ5_TOKEN_NULL;
-        } else if (*fourcc == CJ5__TRUE_FOURCC) {
-            type = CJ5_TOKEN_BOOL;
-        } else if (*fourcc == CJ5__FALSE_FOURCC) {
-            type = CJ5_TOKEN_BOOL;
-        } else {
-            num_type = CJ5_TOKEN_NUMBER_INT;
-            // hex number
-            if (json5[start] == '0' && start < parser->pos + 1 && json5[start + 1] == 'x') {
-                start = start + 2;
-                for (int i = start; i < parser->pos; i++) {
-                    if (!(cj5__isrange(json5[i], '0', '9') || cj5__isrange(json5[i], 'A', 'F') ||
-                          cj5__isrange(json5[i], 'a', 'f'))) {
-                        cj5__set_error(r, CJ5_ERROR_INVALID, parser->line,
-                                       parser->pos - line_start);
-                        parser->pos = start;
-                        return false;
-                    }
-                }
-                num_type = CJ5_TOKEN_NUMBER_HEX;
-            } else {
-                int start_index = start;
-                if (json5[start] == '+') {
-                    ++start_index;
-                    ++start;
-                } else if (json5[start] == '-') {
-                    ++start_index;
-                }
-
-                for (int i = start_index; i < parser->pos; i++) {
-                    if (json5[i] == '.') {
-                        if (num_type == CJ5_TOKEN_NUMBER_FLOAT) {
-                            cj5__set_error(r, CJ5_ERROR_INVALID, parser->line,
-                                           parser->pos - line_start);
-                            parser->pos = start;
-                            return false;
-                        }
-                        num_type = CJ5_TOKEN_NUMBER_FLOAT;
-                        continue;
-                    }
-
-                    if (!cj5__isnum(json5[i])) {
-                        cj5__set_error(r, CJ5_ERROR_INVALID, parser->line,
-                                       parser->pos - line_start);
-                        parser->pos = start;
-                        return false;
-                    }
-                }
-            }
-
-            type = CJ5_TOKEN_NUMBER;
-        }
-    }
-
-    if (new_line) {
-        ++parser->line;
-    }
-
-    token->type = type;
-    if (type == CJ5_TOKEN_STRING) {
-        token->key_hash = cj5__hash_fnv32(&json5[start], &json5[parser->pos]);
-    } else {
-        token->num_type = num_type;
-    }
-    token->start = start;
-    token->end = parser->pos;
-    token->parent_id = parser->super_id;
-    --parser->pos;
-    return true;
-}
-
-static bool cj5__parse_string(cj5__parser* parser, cj5_result* r, const char* json5, int len,
-                              cj5_token* tokens, int max_tokens)
-{
-    cj5_token* token;
-    int start = parser->pos;
-    int line_start = start;
-    char str_open = json5[start];
-    ++parser->pos;
-
-    for (; parser->pos < len; parser->pos++) {
-        char c = json5[parser->pos];
-
-        // end of string
-        if (str_open == c) {
-            token = cj5__alloc_token(parser, tokens, max_tokens);
-            if (token == NULL) {
-                r->error = CJ5_ERROR_OVERFLOW;
-                return true;
-            }
-
-            token->type = CJ5_TOKEN_STRING;
-            token->start = start + 1;
-            token->end = parser->pos;
-            token->parent_id = parser->super_id;
-
-            return true;
-        }
-
-        if (c == '\\' && parser->pos + 1 < len) {
-            ++parser->pos;
-            switch (json5[parser->pos]) {
-            case '\"':
-            case '/':
-            case '\\':
-            case 'b':
-            case 'f':
-            case 'r':
-            case 'n':
-            case 't':
-                break;
-            case 'u':
-                ++parser->pos;
-                for (int i = 0; i < 4 && parser->pos < len; i++) {
-                    /* If it isn't a hex character we have an error */
-                    if (!((json5[parser->pos] >= 48 && json5[parser->pos] <= 57) ||   /* 0-9 */
-                          (json5[parser->pos] >= 65 && json5[parser->pos] <= 70) ||   /* A-F */
-                          (json5[parser->pos] >= 97 && json5[parser->pos] <= 102))) { /* a-f */
-                        cj5__set_error(r, CJ5_ERROR_INVALID, parser->line,
-                                       parser->pos - line_start);
-                        parser->pos = start;
-                        return false;
-                    }
-                    parser->pos++;
-                }
-
-                --parser->pos;
-                break;
-            case '\n':
-                line_start = parser->pos;
-                ++parser->line;
-                break;
-            default:
-                cj5__set_error(r, CJ5_ERROR_INVALID, parser->line, parser->pos - line_start);
-                parser->pos = start;
-                return false;
-            }
-        }
-    }
-
-    parser->pos = start;
-    return true;
-}
-
-static void cj5__skip_comment(cj5__parser* parser, const char* json5, int len)
-{
-    for (; parser->pos < len; parser->pos++) {
-        if (json5[parser->pos] == '\n' || json5[parser->pos] == '\r') {
-            return;
-        }
-    }
-}
-
-static void cj5__skip_multiline_comment(cj5__parser* parser, const char* json5, int len)
-{
-    for (; parser->pos < len; parser->pos++) {
-        if (json5[parser->pos] == '*' && parser->pos < (len - 1) && json5[parser->pos+1] == '/') {
-            return;
-        }
-    }
-}
-
-cj5_result cj5_parse(const char* json5, int len, cj5_token* tokens, int max_tokens)
-{
-    cj5__parser parser;
-    CJ5_MEMSET(&parser, 0x0, sizeof(parser));
-    parser.super_id = -1;
-
-    cj5_result r;
-    CJ5_MEMSET(&r, 0x0, sizeof(r));
-
-    cj5_token* token;
-    int count = parser.next_id;
-    bool can_comment = false;
-
-    for (; parser.pos < len; parser.pos++) {
-        char c;
-        cj5_token_type type;
-
-        c = json5[parser.pos];
-        switch (c) {
-        case '{':
-        case '[':
-            can_comment = false;
-            count++;
-            token = cj5__alloc_token(&parser, tokens, max_tokens);
-            if (token == NULL) {
-                r.error = CJ5_ERROR_OVERFLOW;
-                break;
-            }
-
-            if (parser.super_id != -1) {
-                cj5_token* super_token = &tokens[parser.super_id];
-                token->parent_id = parser.super_id;
-                if (++super_token->size == 1 && super_token->type == CJ5_TOKEN_STRING) {
-                    super_token->key_hash =
-                        cj5__hash_fnv32(&json5[super_token->start], &json5[super_token->end]);
-                }
-            }
-
-            token->type = (c == '{' ? CJ5_TOKEN_OBJECT : CJ5_TOKEN_ARRAY);
-            token->start = parser.pos;
-            parser.super_id = parser.next_id - 1;
-            break;
-
-        case '}':
-        case ']':
-            can_comment = false;
-            if (!tokens || r.error == CJ5_ERROR_OVERFLOW) {
-                break;
-            }
-            type = (c == '}' ? CJ5_TOKEN_OBJECT : CJ5_TOKEN_ARRAY);
-
-            if (parser.next_id < 1) {
-                cj5__set_error(&r, CJ5_ERROR_INVALID, parser.line, parser.pos - parser.line);
-                return r;
-            }
-
-            token = &tokens[parser.next_id - 1];
-            for (;;) {
-                if (token->start != -1 && token->end == -1) {
-                    if (token->type != type) {
-                        cj5__set_error(&r, CJ5_ERROR_INVALID, parser.line,
-                                       parser.pos - parser.line);
-                        return r;
-                    }
-                    token->end = parser.pos + 1;
-                    parser.super_id = token->parent_id;
-                    break;
-                }
-
-                if (token->parent_id == -1) {
-                    if (token->type != type || parser.super_id == -1) {
-                        cj5__set_error(&r, CJ5_ERROR_INVALID, parser.line,
-                                       parser.pos - parser.line);
-                        return r;
-                    }
-                    break;
-                }
-
-                token = &tokens[token->parent_id];
-            }
-            break;
-
-        case '\"':
-        case '\'':
-            can_comment = false;
-            // JSON5: strings can start with \" or \'
-            cj5__parse_string(&parser, &r, json5, len, tokens, max_tokens);
-            if (r.error && r.error != CJ5_ERROR_OVERFLOW) {
-                return r;
-            }
-            count++;
-            if (parser.super_id != -1 && tokens && r.error != CJ5_ERROR_OVERFLOW) {
-                if (++tokens[parser.super_id].size == 1 &&
-                    tokens[parser.super_id].type == CJ5_TOKEN_STRING) {
-                    // it's not a value, it's a key, so hash it
-                    tokens[parser.super_id].key_hash = cj5__hash_fnv32(
-                        &json5[tokens[parser.super_id].start], &json5[tokens[parser.super_id].end]);
-                }
-            }
-            break;
-
-        case '\r':
-            can_comment = true;
-            break;
-        case '\n':
-            ++parser.line;
-            can_comment = true;
-            break;
-        case '\t':
-        case ' ':
-            break;
-
-        case ':':
-            can_comment = false;
-            parser.super_id = parser.next_id - 1;
-            break;
-
-        case ',':
-            can_comment = false;
-            if (tokens != NULL && parser.super_id != -1 && r.error != CJ5_ERROR_OVERFLOW &&
-                tokens[parser.super_id].type != CJ5_TOKEN_ARRAY &&
-                tokens[parser.super_id].type != CJ5_TOKEN_OBJECT) {
-                parser.super_id = tokens[parser.super_id].parent_id;
-            }
-            break;
-        case '/':
-            if (can_comment && parser.pos < len - 1) {
-                if (json5[parser.pos + 1] == '/') {
-                    cj5__skip_comment(&parser, json5, len);
-                } else if (json5[parser.pos + 1] == '*') {
-                    cj5__skip_multiline_comment(&parser, json5, len);
-                }
-            } 
-            break;
-
-        default:
-            cj5__parse_primitive(&parser, &r, json5, len, tokens, max_tokens);
-            if (r.error && r.error != CJ5_ERROR_OVERFLOW) {
-                return r;
-            }
-            can_comment = false;
-            count++;
-            if (parser.super_id != -1 && tokens && r.error != CJ5_ERROR_OVERFLOW) {
-                if (++tokens[parser.super_id].size == 1 &&
-                    tokens[parser.super_id].type == CJ5_TOKEN_STRING) {
-                    tokens[parser.super_id].key_hash = cj5__hash_fnv32(
-                        &json5[tokens[parser.super_id].start], &json5[tokens[parser.super_id].end]);
-                }
-            }
-            break;
-        }
-    }
-
-    if (tokens && r.error != CJ5_ERROR_OVERFLOW) {
-        for (int i = parser.next_id - 1; i >= 0; i--) {
-            // unmatched object or array ?
-            if (tokens[i].start != -1 && tokens[i].end == -1) {
-                cj5__set_error(&r, CJ5_ERROR_INCOMPLETE, parser.line, parser.pos - parser.line);
-                return r;
-            }
-        }
-    }
-
-    r.num_tokens = count;
-    r.tokens = tokens;
-    r.json5 = json5;
-    return r;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Helper functions to work with tokens
-#    if CJ5_TOKEN_HELPERS
-#        include <stdlib.h>
-
-static int cj5__seek_recursive(cj5_result* r, int parent_id, uint32_t key_hash)
-{
-    const cj5_token* parent_tok = &r->tokens[parent_id];
-
-    for (int i = parent_id + 1, count = 0; i < r->num_tokens && count < parent_tok->size; i++) {
-        const cj5_token* tok = &r->tokens[i];
-
-        if (tok->size != 1 || tok->type != CJ5_TOKEN_STRING) {
-            continue;
-        }
-
-        if (parent_id == tok->parent_id) {
-            CJ5_ASSERT((i + 1) < r->num_tokens);
-            if (key_hash == tok->key_hash) {
-                return i + 1;    // return next "value" token (array/objects and primitive values)
-            } else if (r->tokens[i + 1].size) {
-                int found_id = cj5__seek_recursive(r, i + 1, key_hash);
-                if (found_id != -1) {
-                    return found_id;
-                }
-            }
-            count++;
-        }
-    }
-
-    return -1;
-}
-
-static bool cj5__tofloat(const char* str, double* ofloat)
-{
-    // skip leading whitespace
-    while (*str && cj5__isspace(*str)) {
-        str++;
-    }
-    int sign = 1;
-
-    const char* pC = str;
-    if (*pC == '-') {
-        sign = -1;
-        pC++;
-    }
-
-    // parse integer part
-    int64_t tmp = 0;
-    while (*pC >= '0' && *pC <= '9') {
-        tmp *= 10;
-        tmp += *pC - '0';
-        pC++;
-    }
-
-    if (*pC == 0) {
-        *ofloat = (double)(sign >= 0 ? tmp : -tmp);
-        return true;
-    }
-
-    // Parse fraction
-    if (*pC == '.') {
-        pC++;
-
-        int64_t divisor = sign;
-        while (*pC >= '0' && *pC <= '9') {
-            divisor *= 10;
-            tmp *= 10;
-            tmp += *pC - '0';
-            pC++;
-        }
-
-        // Skip tailing whitespace
-        while (*pC && cj5__isspace(*pC)) {
-            pC++;
-        }
-
-        if (*pC == 0) {
-            *ofloat = (double)tmp / (double)divisor;
-            return true;
-        }
-    }
-
-    *ofloat = strtod(str, NULL);
-    return true;
-}
-
-int cj5_seek_recursive(cj5_result* r, int parent_id, const char* key)
-{
-    CJ5_ASSERT(parent_id >= 0 && parent_id < r->num_tokens);
-
-    uint32_t key_hash = cj5__hash_fnv32(key, key + cj5__strlen(key));
-    return cj5__seek_recursive(r, parent_id, key_hash);
-}
-
-int cj5_seek_hash(cj5_result* r, int parent_id, const uint32_t key_hash)
-{
-    CJ5_ASSERT(parent_id >= 0 && parent_id < r->num_tokens);
-    const cj5_token* parent_tok = &r->tokens[parent_id];
-
-    for (int i = parent_id + 1, count = 0; i < r->num_tokens && count < parent_tok->size; i++) {
-        const cj5_token* tok = &r->tokens[i];
-
-        if (tok->size != 1 || tok->type != CJ5_TOKEN_STRING) {
-            continue;
-        }
-
-        if (parent_id == tok->parent_id) {
-            if (key_hash == tok->key_hash) {
-                CJ5_ASSERT((i + 1) < r->num_tokens);
-                return i + 1;    // return next "value" token (array/objects and primitive values)
-            }
-            count++;
-        }
-    }
-
-    return -1;
-}
-
-int cj5_seek(cj5_result* r, int parent_id, const char* key)
-{
-    CJ5_ASSERT(parent_id >= 0 && parent_id < r->num_tokens);
-
-    uint32_t key_hash = cj5__hash_fnv32(key, key + cj5__strlen(key));
-
-    return cj5_seek_hash(r, parent_id, key_hash);
-}
-
-const char* cj5_get_string(cj5_result* r, int id, char* str, int max_str)
-{
-    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_STRING);
-    return cj5__strcpy(str, max_str, &r->json5[tok->start], tok->end - tok->start);
-}
-
-double cj5_get_double(cj5_result* r, int id)
-{
-    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
-    char snum[32];
-    double num;
-    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
-    bool valid = cj5__tofloat(snum, &num);
-    CJ5__UNUSED(valid);
-    CJ5_ASSERT(valid);
-    return num;
-}
-
-float cj5_get_float(cj5_result* r, int id)
-{
-    return (float)cj5_get_double(r, id);
-}
-
-int cj5_get_int(cj5_result* r, int id)
-{
-    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
-    char snum[32];
-    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
-    return (int)strtol(snum, NULL, tok->num_type != CJ5_TOKEN_NUMBER_HEX ? 10 : 16);
-}
-
-uint32_t cj5_get_uint(cj5_result* r, int id)
-{
-    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
-    char snum[32];
-    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
-    return (uint32_t)strtoul(snum, NULL, tok->num_type != CJ5_TOKEN_NUMBER_HEX ? 10 : 16);
-}
-
-uint64_t cj5_get_uint64(cj5_result* r, int id)
-{
-    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
-    char snum[64];
-    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
-    return strtoull(snum, NULL, tok->num_type != CJ5_TOKEN_NUMBER_HEX ? 10 : 16);
-}
-
-int64_t cj5_get_int64(cj5_result* r, int id)
-{
-    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_NUMBER);
-    char snum[64];
-    cj5__strcpy(snum, sizeof(snum), &r->json5[tok->start], tok->end - tok->start);
-    return strtoll(snum, NULL, tok->num_type != CJ5_TOKEN_NUMBER_HEX ? 10 : 16);
-}
-
-bool cj5_get_bool(cj5_result* r, int id)
-{
-    CJ5_ASSERT(id >= 0 && id < r->num_tokens);
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_BOOL);
-    CJ5_ASSERT((tok->end - tok->start) >= 4);
-
-    uint32_t fourcc = *((const uint32_t*)&r->json5[tok->start]);
-    if (fourcc == CJ5__TRUE_FOURCC) {
-        return true;
-    } else if (fourcc == CJ5__FALSE_FOURCC) {
-        return false;
-    } else {
-        CJ5_ASSERT(0);
-        return false;
-    }
-}
-
-double cj5_seekget_double(cj5_result* r, int parent_id, const char* key, double def_val)
-{
-    int id = cj5_seek(r, parent_id, key);
-    return id > -1 ? cj5_get_double(r, id) : def_val;
-}
-
-float cj5_seekget_float(cj5_result* r, int parent_id, const char* key, float def_val)
-{
-    int id = cj5_seek(r, parent_id, key);
-    return id > -1 ? cj5_get_float(r, id) : def_val;
-}
-
-int cj5_seekget_int(cj5_result* r, int parent_id, const char* key, int def_val)
-{
-    int id = cj5_seek(r, parent_id, key);
-    return id > -1 ? cj5_get_int(r, id) : def_val;
-}
-
-uint32_t cj5_seekget_uint(cj5_result* r, int parent_id, const char* key, uint32_t def_val)
-{
-    int id = cj5_seek(r, parent_id, key);
-    return id > -1 ? cj5_get_uint(r, id) : def_val;
-}
-
-uint64_t cj5_seekget_uint64(cj5_result* r, int parent_id, const char* key, uint64_t def_val)
-{
-    int id = cj5_seek(r, parent_id, key);
-    return id > -1 ? cj5_get_uint64(r, id) : def_val;
-}
-
-int64_t cj5_seekget_int64(cj5_result* r, int parent_id, const char* key, int64_t def_val)
-{
-    int id = cj5_seek(r, parent_id, key);
-    return id > -1 ? cj5_get_int64(r, id) : def_val;
-}
-
-bool cj5_seekget_bool(cj5_result* r, int parent_id, const char* key, bool def_val)
-{
-    int id = cj5_seek(r, parent_id, key);
-    return id > -1 ? cj5_get_bool(r, id) : def_val;
-}
-
-const char* cj5_seekget_string(cj5_result* r, int parent_id, const char* key, char* str,
-                               int max_str, const char* def_val)
-{
-    int id = cj5_seek(r, parent_id, key);
-    return id > -1 ? cj5_get_string(r, id, str, max_str) : def_val;
-}
-
-int cj5_seekget_array_double(cj5_result* r, int parent_id, const char* key, double* values,
-                             int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = cj5_get_double(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
-
-int cj5_seekget_array_float(cj5_result* r, int parent_id, const char* key, float* values,
-                            int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = cj5_get_float(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
-
-int cj5_seekget_array_int16(cj5_result* r, int parent_id, const char* key, int16_t* values,
-                            int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = (int16_t)cj5_get_int(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
-
-int cj5_seekget_array_uint16(cj5_result* r, int parent_id, const char* key, uint16_t* values,
-                             int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = (uint16_t)cj5_get_int(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
-
-
-int cj5_seekget_array_int(cj5_result* r, int parent_id, const char* key, int* values,
-                          int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = cj5_get_int(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
-
-int cj5_seekget_array_uint(cj5_result* r, int parent_id, const char* key, uint32_t* values,
-                           int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = cj5_get_uint(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
-
-int cj5_seekget_array_uint64(cj5_result* r, int parent_id, const char* key, uint64_t* values,
-                             int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = cj5_get_uint64(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
-
-int cj5_seekget_array_int64(cj5_result* r, int parent_id, const char* key, int64_t* values,
-                            int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = cj5_get_int64(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
+CJ5_API cj5_result
+cj5_parse(const char *json5, unsigned int len,
+          cj5_token *tokens, unsigned int max_tokens);
 
-int cj5_seekget_array_bool(cj5_result* r, int parent_id, const char* key, bool* values,
-                           int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            values[count++] = cj5_get_bool(r, i);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
+CJ5_API cj5_error_code
+cj5_get_float(const char *json5, const cj5_token *token, double *out);
 
-int cj5_seekget_array_string(cj5_result* r, int parent_id, const char* key, char** strs,
-                             int max_str, int max_values)
-{
-    int id = key != NULL ? cj5_seek(r, parent_id, key) : parent_id;
-    if (id != -1) {
-        const cj5_token* tok = &r->tokens[id];
-        CJ5__UNUSED(tok);
-        CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-        int count = 0;
-        for (int i = id + 1, ic = r->num_tokens; i < ic && r->tokens[i].parent_id == id && count < max_values; i++) {
-            cj5_get_string(r, i, strs[count++], max_str);
-        }
-        return count;
-    } else {
-        return 0;
-    }
-}
+CJ5_API cj5_error_code
+cj5_get_int(const char *json5, const cj5_token *token, int64_t *out);
 
-int cj5_get_array_elem(cj5_result* r, int id, int index)
-{
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-    CJ5_ASSERT(index < tok->size);
-    for (int i = id + 1, count = 0, ic = r->num_tokens; i < ic && count < tok->size; i++) {
-        if (r->tokens[i].parent_id == id) {
-            if (count == index) {
-                return i;
-            }
-            count++;
-        }
-    }
-    return -1;
-}
+CJ5_API cj5_error_code
+cj5_get_uint(const char *json5, const cj5_token *token, uint64_t *out);
 
-int cj5_get_array_elem_incremental(cj5_result* r, int id, int index, int prev_elem)
-{
-    const cj5_token* tok = &r->tokens[id];
-    CJ5_ASSERT(tok->type == CJ5_TOKEN_ARRAY);
-    CJ5_ASSERT(index < tok->size);
-	int start = prev_elem <= 0 ? (id + 1) : (prev_elem + 1);
-    for (int i = start, count = index, ic = r->num_tokens; i < ic && count < tok->size; i++) {
-        if (r->tokens[i].parent_id == id) {
-            if (count == index) {
-                return i;
-            }
-            count++;
-        }
-    }
-    return -1;
-}
+// Replaces escape characters, utf8 codepoints, etc.
+// The buffer shall have a length of at least token->end - token->start + 1.
+// Upon success, the length is written to buflen.
+// The output string is terminated with \0.
+CJ5_API cj5_error_code
+cj5_get_str(const char *json5, const cj5_token *token,
+            char *buf, unsigned int *buflen);
 
-#    endif    // CJ5_TOKEN_HELPERS
-#endif        // CJ5_IMPLEMENT
+#endif /* __CJ5_H_ */
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c291ae7fbe1..73dd4d31c7f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -226,6 +226,7 @@ endfunction()
 ua_add_test(check_types_builtin.c)
 
 if(UA_ENABLE_JSON_ENCODING)
+    ua_add_test(check_cj5.c)
     ua_add_test(check_types_builtin_json.c)
 
     if(UA_ENABLE_PUBSUB)
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
new file mode 100644
index 00000000000..5eb6e1bec0b
--- /dev/null
+++ b/tests/check_cj5.c
@@ -0,0 +1,106 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/types.h>
+#include <check.h>
+#include "cj5.h"
+
+START_TEST(parseObject) {
+    const char *json = "{'a':1.0, 'b':2}";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+    double d = 0.0;
+    cj5_error_code err = cj5_get_float(json, &tokens[2], &d);
+    ck_assert(err == CJ5_ERROR_NONE);
+    ck_assert(d == 1.0);
+} END_TEST
+
+START_TEST(parseUTF8) {
+    const char *json = "{'a':\"Lindestra\\u00dfe\"}";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+    char buf[32];
+    cj5_error_code err = cj5_get_str(json, &tokens[2], buf, NULL);
+    ck_assert(err == CJ5_ERROR_NONE);
+} END_TEST
+
+START_TEST(parseNestedObject) {
+    const char *json = "{'a':{}, 'b':{'c':3}}";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+} END_TEST
+
+START_TEST(parseObjectUnquoted) {
+    const char *json = "{'a':1, b:2}";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+} END_TEST
+
+START_TEST(parseObjectWrongBracket) {
+    const char *json = "{'a':1, 'b':2]";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_INVALID);
+} END_TEST
+
+START_TEST(parseObjectWrongBracket2) {
+    const char *json = "{{'a':1, 'b':2]}";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_INVALID);
+} END_TEST
+
+START_TEST(parseObjectIncomplete) {
+    const char *json = "{'a':1, 'b':2";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_INCOMPLETE);
+} END_TEST
+
+START_TEST(parseObjectNoRoot) {
+    const char *json = "'a':1, 'b':2";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+} END_TEST
+
+START_TEST(parseObjectCloseNoRoot) {
+    const char *json = "'a':1, 'b':2}";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_INVALID);
+} END_TEST
+
+static Suite *testSuite_builtin_json(void) {
+    TCase *tc_parse= tcase_create("cj5_parse");
+    tcase_add_test(tc_parse, parseObject);
+    tcase_add_test(tc_parse, parseUTF8);
+    tcase_add_test(tc_parse, parseNestedObject);
+    tcase_add_test(tc_parse, parseObjectUnquoted);
+    tcase_add_test(tc_parse, parseObjectWrongBracket);
+    tcase_add_test(tc_parse, parseObjectWrongBracket2);
+    tcase_add_test(tc_parse, parseObjectIncomplete);
+    tcase_add_test(tc_parse, parseObjectNoRoot);
+    tcase_add_test(tc_parse, parseObjectCloseNoRoot);
+
+    Suite *s = suite_create("Test JSON decoding with the cj5 library");
+    suite_add_tcase(s, tc_parse);
+    return s;
+}
+
+int main(void) {
+    int number_failed = 0;
+    Suite *s = testSuite_builtin_json();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed += srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+

From 495174535e0386053c7b1c2fd9858a409c1bfe9b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 9 Feb 2022 22:34:08 +0100
Subject: [PATCH 0174/1963] refactor(deps): Rename atoi -> parse_num

---
 CMakeLists.txt               | 4 ++--
 deps/cj5.c                   | 2 +-
 deps/{atoi.c => parse_num.c} | 5 ++---
 deps/{atoi.h => parse_num.h} | 0
 src/ua_types_encoding_json.c | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename deps/{atoi.c => parse_num.c} (97%)
 rename deps/{atoi.h => parse_num.h} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2024a00ebd..cf38b4e0000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1138,13 +1138,13 @@ if(UA_ENABLE_JSON_ENCODING)
                                  ${PROJECT_SOURCE_DIR}/deps/cj5.h
                                  ${PROJECT_SOURCE_DIR}/deps/string_escape.h
                                  ${PROJECT_SOURCE_DIR}/deps/itoa.h
-                                 ${PROJECT_SOURCE_DIR}/deps/atoi.h
+                                 ${PROJECT_SOURCE_DIR}/deps/parse_num.h
                                  ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.h)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/jsmn/jsmn.c
                             ${PROJECT_SOURCE_DIR}/deps/cj5.c
                             ${PROJECT_SOURCE_DIR}/deps/string_escape.c
                             ${PROJECT_SOURCE_DIR}/deps/itoa.c
-                            ${PROJECT_SOURCE_DIR}/deps/atoi.c
+                            ${PROJECT_SOURCE_DIR}/deps/parse_num.c
                             ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.c)
 endif()
 
diff --git a/deps/cj5.c b/deps/cj5.c
index 7cdb9aca478..1c5816cd42e 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -22,7 +22,7 @@
 // SOFTWARE.
 
 #include "cj5.h"
-#include "atoi.h"
+#include "parse_num.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/deps/atoi.c b/deps/parse_num.c
similarity index 97%
rename from deps/atoi.c
rename to deps/parse_num.c
index 5e13a35c77b..959d6778945 100644
--- a/deps/atoi.c
+++ b/deps/parse_num.c
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#include "atoi.h"
+#include "parse_num.h"
 
 size_t atoiUnsigned(const char *pos, size_t size, uint64_t *result) {
     size_t i = 0;
@@ -66,8 +66,7 @@ size_t atoiSigned(const char *pos, size_t size, int64_t *result) {
     size_t i = 0;
     bool neg = false;
     if(*pos == '-' || *pos == '+') {
-        if(*pos == '-')
-            neg = true;
+        neg = (*pos == '-');
         i++;
     }
 
diff --git a/deps/atoi.h b/deps/parse_num.h
similarity index 100%
rename from deps/atoi.h
rename to deps/parse_num.h
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 1e2876ca285..d194e4e398e 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -17,7 +17,7 @@
 #include <math.h>
 
 #include "../deps/itoa.h"
-#include "../deps/atoi.h"
+#include "../deps/parse_num.h"
 #include "../deps/string_escape.h"
 #include "../deps/base64.h"
 #include "../deps/libc_time.h"

From 24e1c4f17a275999e1e243a4a5b889595a4aed64 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 10 Feb 2022 00:00:23 +0100
Subject: [PATCH 0175/1963] refactor(deps): Replace __floatscan with
 parseDouble

---
 deps/cj5.c                   |  23 ++---
 deps/parse_num.c             |  36 ++++++--
 deps/parse_num.h             |   5 +-
 src/ua_types_encoding_json.c | 157 +++++------------------------------
 4 files changed, 57 insertions(+), 164 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 1c5816cd42e..b272d503978 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -25,8 +25,6 @@
 #include "parse_num.h"
 
 #include <string.h>
-#include <stdlib.h>
-#include <errno.h>
 
 #if defined(_DEBUG) || defined(NDEBUG)
 # include <assert.h>
@@ -513,31 +511,22 @@ cj5_parse(const char *json5, unsigned int len,
 
 cj5_error_code
 cj5_get_float(const char *json5, const cj5_token *token, double *out) {
-    char buf[128];
-    unsigned int len = token->end - token->start;
-    if(len >= 128)
-        return CJ5_ERROR_OVERFLOW;
-    memcpy(buf, &json5[token->start], len);
-    buf[len] = 0;
-    errno = 0;
-    char *endptr;
-    *out = strtod(&json5[token->start], &endptr);
-    if(errno != 0 || endptr != &json5[token->end])
-        return CJ5_ERROR_INVALID;
-    return CJ5_ERROR_NONE;
+    size_t parsed = parseDouble(&json5[token->start],
+                                token->end - token->start, out);
+    return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
 cj5_error_code
 cj5_get_int(const char *json5, const cj5_token *token, int64_t *out) {
-    size_t parsed = atoiSigned(&json5[token->start],
+    size_t parsed = parseInt64(&json5[token->start],
                                token->end - token->start, out);
     return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
 cj5_error_code
 cj5_get_uint(const char *json5, const cj5_token *token, uint64_t *out) {
-    size_t parsed = atoiUnsigned(&json5[token->start],
-                                 token->end - token->start, out);
+    size_t parsed = parseUInt64(&json5[token->start],
+                                token->end - token->start, out);
     return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
diff --git a/deps/parse_num.c b/deps/parse_num.c
index 959d6778945..8d98231b0db 100644
--- a/deps/parse_num.c
+++ b/deps/parse_num.c
@@ -22,15 +22,19 @@
 
 #include "parse_num.h"
 
-size_t atoiUnsigned(const char *pos, size_t size, uint64_t *result) {
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+size_t parseUInt64(const char *str, size_t size, uint64_t *result) {
     size_t i = 0;
     uint64_t n = 0;
     bool digit = false; /* At least one real digit */
-    if(size - i >= 2 && pos[i] == '0' && (pos[i+1] | 32) == 'x') {
+    if(size - i >= 2 && str[i] == '0' && (str[i+1] | 32) == 'x') {
         /* Hex */
         i += 2;
         for(; i < size; i++) {
-            uint8_t c = (uint8_t)pos[i] | 32;
+            uint8_t c = (uint8_t)str[i] | 32;
             if(c >= '0' && c <= '9')
                 c = c - '0';
             else if(c >= 'a' && c <='f')
@@ -45,11 +49,11 @@ size_t atoiUnsigned(const char *pos, size_t size, uint64_t *result) {
     } else {
         /* Decimal */
         for(; i < size; i++) {
-            if(pos[i] < '0' || pos[i] > '9')
+            if(str[i] < '0' || str[i] > '9')
                 break;
             n *= 10;
             digit = true;
-            n +=(uint8_t)(pos[i] - '0');
+            n +=(uint8_t)(str[i] - '0');
         }
     }
 
@@ -61,18 +65,18 @@ size_t atoiUnsigned(const char *pos, size_t size, uint64_t *result) {
     return i;
 }
 
-size_t atoiSigned(const char *pos, size_t size, int64_t *result) {
+size_t parseInt64(const char *str, size_t size, int64_t *result) {
     /* Negative value? */
     size_t i = 0;
     bool neg = false;
-    if(*pos == '-' || *pos == '+') {
-        neg = (*pos == '-');
+    if(*str == '-' || *str == '+') {
+        neg = (*str == '-');
         i++;
     }
 
     /* Parse as unsigned */
     uint64_t n = 0;
-    size_t len = atoiUnsigned(&pos[i], size - i, &n);
+    size_t len = parseUInt64(&str[i], size - i, &n);
     if(len == 0)
         return 0;
 
@@ -80,3 +84,17 @@ size_t atoiSigned(const char *pos, size_t size, int64_t *result) {
     *result = (!neg) ? (int64_t)n  : -(int64_t)n;
     return len + i;
 }
+
+size_t parseDouble(const char *str, size_t size, double *result) {
+    char buf[128];
+    if(size >= 128)
+        return 0;
+    memcpy(buf, str, size);
+    buf[size] = 0;
+    errno = 0;
+    char *endptr;
+    *result = strtod(str, &endptr);
+    if(errno != 0)
+        return 0;
+    return (uintptr_t)endptr - (uintptr_t)str;
+}
diff --git a/deps/parse_num.h b/deps/parse_num.h
index 099d7818dd6..4948dc2c30e 100644
--- a/deps/parse_num.h
+++ b/deps/parse_num.h
@@ -25,8 +25,9 @@ extern "C" {
  * Hex numbers start with 0x.
  * Signed numbers may have a +/- prefix. */
 
-size_t atoiUnsigned(const char *pos, size_t size, uint64_t *result);
-size_t atoiSigned(const char *pos, size_t size, int64_t *result);
+size_t parseUInt64(const char *str, size_t size, uint64_t *result);
+size_t parseInt64(const char *str, size_t size, int64_t *result);
+size_t parseDouble(const char *str, size_t size, double *result);
     
 #ifdef __cplusplus
 }
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index d194e4e398e..b939fa0e86c 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -22,11 +22,6 @@
 #include "../deps/base64.h"
 #include "../deps/libc_time.h"
 
-#if defined(_MSC_VER)
-# define strtoll _strtoi64
-# define strtoull _strtoui64
-#endif
-
 /* vs2008 does not have INFINITY and NAN defined */
 #ifndef INFINITY
 # define INFINITY ((UA_Double)(DBL_MAX+DBL_MAX))
@@ -1523,12 +1518,11 @@ DECODE_JSON(Boolean) {
     return UA_STATUSCODE_GOOD;
 }
 
-#ifdef UA_ENABLE_CUSTOM_LIBC
 static UA_StatusCode
 parseUnsignedInteger(char* inputBuffer, size_t sizeOfBuffer,
                      UA_UInt64 *destinationOfNumber) {
     UA_UInt64 d = 0;
-    atoiUnsigned(inputBuffer, sizeOfBuffer, &d);
+    parseUInt64(inputBuffer, sizeOfBuffer, &d);
     if(!destinationOfNumber)
         return UA_STATUSCODE_BADDECODINGERROR;
     *destinationOfNumber = d;
@@ -1539,88 +1533,12 @@ static UA_StatusCode
 parseSignedInteger(char* inputBuffer, size_t sizeOfBuffer,
                    UA_Int64 *destinationOfNumber) {
     UA_Int64 d = 0;
-    atoiSigned(inputBuffer, sizeOfBuffer, &d);
+    parseInt64(inputBuffer, sizeOfBuffer, &d);
     if(!destinationOfNumber)
         return UA_STATUSCODE_BADDECODINGERROR;
     *destinationOfNumber = d;
     return UA_STATUSCODE_GOOD;
 }
-#else
-/* Safe strtol variant of unsigned string conversion.
- * Returns UA_STATUSCODE_BADDECODINGERROR in case of overflows.
- * Buffer limit is 20 digits. */
-static UA_StatusCode
-parseUnsignedInteger(char* inputBuffer, size_t sizeOfBuffer,
-                     UA_UInt64 *destinationOfNumber) {
-    /* Check size to avoid huge malicious stack allocation.
-     * No UInt64 can have more digits than 20. */
-    if(sizeOfBuffer > 20) {
-        return UA_STATUSCODE_BADDECODINGERROR;
-    }
-
-    /* convert to null terminated string  */
-    char string[21];
-    memcpy(string, inputBuffer, sizeOfBuffer);
-    string[sizeOfBuffer] = 0;
-
-    /* Conversion */
-    char *endptr, *str;
-    str = string;
-    errno = 0;    /* To distinguish success/failure after call */
-    UA_UInt64 val = strtoull(str, &endptr, 10);
-
-    /* Check for various possible errors */
-    if((errno == ERANGE && (val == LLONG_MAX || val == 0))
-          || (errno != 0 )) {
-        return UA_STATUSCODE_BADDECODINGERROR;
-    }
-
-    /* Check if no digits were found */
-    if(endptr == str)
-        return UA_STATUSCODE_BADDECODINGERROR;
-
-    /* copy to destination */
-    *destinationOfNumber = val;
-    return UA_STATUSCODE_GOOD;
-}
-
-/* Safe strtol variant of unsigned string conversion.
- * Returns UA_STATUSCODE_BADDECODINGERROR in case of overflows.
- * Buffer limit is 20 digits. */
-static UA_StatusCode
-parseSignedInteger(char* inputBuffer, size_t sizeOfBuffer,
-                   UA_Int64 *destinationOfNumber) {
-    /* Check size to avoid huge malicious stack allocation.
-     * No UInt64 can have more digits than 20. */
-    if(sizeOfBuffer > 20)
-        return UA_STATUSCODE_BADDECODINGERROR;
-
-    /* convert to null terminated string  */
-    char string[21];
-    memcpy(string, inputBuffer, sizeOfBuffer);
-    string[sizeOfBuffer] = 0;
-
-    /* Conversion */
-    char *endptr, *str;
-    str = string;
-    errno = 0;    /* To distinguish success/failure after call */
-    UA_Int64 val = strtoll(str, &endptr, 10);
-
-    /* Check for various possible errors */
-    if((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
-          || (errno != 0 )) {
-        return UA_STATUSCODE_BADDECODINGERROR;
-    }
-
-    /* Check if no digits were found */
-    if(endptr == str)
-        return UA_STATUSCODE_BADDECODINGERROR;
-
-    /* copy to destination */
-    *destinationOfNumber = val;
-    return UA_STATUSCODE_GOOD;
-}
-#endif
 
 DECODE_JSON(Byte) {
     CHECK_TOKEN_BOUNDS;
@@ -1779,27 +1697,12 @@ DECODE_JSON(Float) {
     if(tokenType != JSMN_PRIMITIVE)
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    /* Null-Terminate for sscanf. */
-    char string[151];
-    memcpy(string, tokenData, tokenSize);
-    string[tokenSize] = 0;
-
-    UA_Float d = 0;
-#ifdef UA_ENABLE_CUSTOM_LIBC
-    d = (UA_Float)__floatscan(string, 1, 0);
-#else
-    char c = 0;
-    /* On success, the function returns the number of variables filled.
-     * In the case of an input failure before any data could be successfully read, EOF is returned. */
-    int ret = sscanf(string, "%f%c", &d, &c);
-
-    /* Exactly one var must be filled. %c acts as a guard for wrong input which is accepted by sscanf.
-    E.g. 1.23.45 is not accepted. */
-    if(ret == EOF || (ret != 1))
+    double val;
+    size_t len = parseDouble(tokenData, tokenSize, &val);
+    if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
-#endif
 
-    *dst = d;
+    *dst = (UA_Float)val;
 
     parseCtx->index++;
     return UA_STATUSCODE_GOOD;
@@ -1850,29 +1753,9 @@ DECODE_JSON(Double) {
     if(tokenType != JSMN_PRIMITIVE)
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    /* Null-Terminate for sscanf. Should this better be handled on heap? Max
-     * 1075 input chars allowed. Not using heap. */
-    char string[1076];
-    memcpy(string, tokenData, tokenSize);
-    string[tokenSize] = 0;
-
-    UA_Double d = 0;
-#ifdef UA_ENABLE_CUSTOM_LIBC
-    d = (UA_Double)__floatscan(string, 2, 0);
-#else
-    char c = 0;
-    /* On success, the function returns the number of variables filled. In the
-     * case of an input failure before any data could be successfully read, EOF
-     * is returned. */
-    int ret = sscanf(string, "%lf%c", &d, &c);
-
-    /* Exactly one var must be filled. %c acts as a guard for wrong input which
-    is accepted by sscanf. E.g. 1.23.45 is not accepted. */
-    if(ret == EOF || (ret != 1))
+    size_t len = parseDouble(tokenData, tokenSize, dst);
+    if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
-#endif
-
-    *dst = d;
 
     parseCtx->index++;
     return UA_STATUSCODE_GOOD;
@@ -2298,7 +2181,7 @@ DECODE_JSON(DateTime) {
     if(tokenData[0] == '-' || tokenData[0] == '+')
         pos++;
     UA_Int64 year = 0;
-    len = atoiSigned(&tokenData[pos], 5, &year);
+    len = parseInt64(&tokenData[pos], 5, &year);
     pos += len;
     if(len != 4 && tokenData[pos] != '-')
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -2310,7 +2193,7 @@ DECODE_JSON(DateTime) {
 
     /* Parse the month */
     UA_UInt64 month = 0;
-    len = atoiUnsigned(&tokenData[pos], 2, &month);
+    len = parseUInt64(&tokenData[pos], 2, &month);
     pos += len;
     UA_CHECK(len == 2, return UA_STATUSCODE_BADDECODINGERROR);
     dts.tm_mon = (UA_UInt16)month - 1;
@@ -2319,7 +2202,7 @@ DECODE_JSON(DateTime) {
 
     /* Parse the day and check the T between date and time */
     UA_UInt64 day = 0;
-    len = atoiUnsigned(&tokenData[pos], 2, &day);
+    len = parseUInt64(&tokenData[pos], 2, &day);
     pos += len;
     UA_CHECK(len == 2 || tokenData[pos] != 'T',
              return UA_STATUSCODE_BADDECODINGERROR);
@@ -2328,7 +2211,7 @@ DECODE_JSON(DateTime) {
 
     /* Parse the hour */
     UA_UInt64 hour = 0;
-    len = atoiUnsigned(&tokenData[pos], 2, &hour);
+    len = parseUInt64(&tokenData[pos], 2, &hour);
     pos += len;
     UA_CHECK(len == 2, return UA_STATUSCODE_BADDECODINGERROR);
     dts.tm_hour = (UA_UInt16)hour;
@@ -2337,7 +2220,7 @@ DECODE_JSON(DateTime) {
 
     /* Parse the minute */
     UA_UInt64 min = 0;
-    len = atoiUnsigned(&tokenData[pos], 2, &min);
+    len = parseUInt64(&tokenData[pos], 2, &min);
     pos += len;
     UA_CHECK(len == 2, return UA_STATUSCODE_BADDECODINGERROR);
     dts.tm_min = (UA_UInt16)min;
@@ -2346,7 +2229,7 @@ DECODE_JSON(DateTime) {
 
     /* Parse the second */
     UA_UInt64 sec = 0;
-    len = atoiUnsigned(&tokenData[pos], 2, &sec);
+    len = parseUInt64(&tokenData[pos], 2, &sec);
     pos += len;
     UA_CHECK(len == 2, return UA_STATUSCODE_BADDECODINGERROR);
     dts.tm_sec = (UA_UInt16)sec;
@@ -2447,7 +2330,7 @@ DECODE_JSON(Variant) {
         return UA_STATUSCODE_BADDECODINGERROR;
     UA_UInt64 idTypeDecoded = 0;
     char *idTypeEncoded = (char*)(ctx->pos + parseCtx->tokenArray[searchResultType].start);
-    size_t len = atoiUnsigned(idTypeEncoded, size, &idTypeDecoded);
+    size_t len = parseUInt64(idTypeEncoded, size, &idTypeDecoded);
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
 
@@ -2570,9 +2453,11 @@ DECODE_JSON(ExtensionObject) {
     if(ret == UA_STATUSCODE_GOOD) {
         /* Parse the encoding */
         UA_UInt64 encoding = 0;
-        char *extObjEncoding = (char*)(ctx->pos + parseCtx->tokenArray[encodingPos].start);
-        size_t size = (size_t)(parseCtx->tokenArray[encodingPos].end - parseCtx->tokenArray[encodingPos].start);
-        atoiUnsigned(extObjEncoding, size, &encoding);
+        char *extObjEncoding = (char*)(ctx->pos +
+                                       parseCtx->tokenArray[encodingPos].start);
+        size_t size = (size_t)(parseCtx->tokenArray[encodingPos].end -
+                               parseCtx->tokenArray[encodingPos].start);
+        parseUInt64(extObjEncoding, size, &encoding);
 
         if(encoding == 1) {
             dst->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING; /* ByteString in Json Body */
@@ -2709,7 +2594,7 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
         char *extObjEncoding = (char*)(ctx->pos + parseCtx->tokenArray[searchEncodingResult].start);
         size_t size = (size_t)(parseCtx->tokenArray[searchEncodingResult].end
                                - parseCtx->tokenArray[searchEncodingResult].start);
-        atoiUnsigned(extObjEncoding, size, &encoding);
+        parseUInt64(extObjEncoding, size, &encoding);
     }
 
     if(encoding == 0 && typeOfBody != NULL) {

From e5b636050cbfbea31800aa3b7f367aeb3fc867a2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 10 Feb 2022 00:03:18 +0100
Subject: [PATCH 0176/1963] refactor(core): Remove UA_ENABLE_CUSTOM_LIBC

---
 src/ua_types_encoding_json.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index b939fa0e86c..65a531303d8 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -396,11 +396,7 @@ ENCODE_JSON(Float) {
     } else if(*src == -INFINITY) {
         strcpy(buffer, "\"-Infinity\"");
     } else {
-#ifdef UA_ENABLE_CUSTOM_LIBC
-        fmt_fp(buffer, *src, 0, -1, 0, 'g');
-#else
         UA_snprintf(buffer, 200, "%.149g", (UA_Double)*src);
-#endif
     }
 
     size_t len = strlen(buffer);
@@ -426,11 +422,7 @@ ENCODE_JSON(Double) {
     } else if(*src == -INFINITY) {
         strcpy(buffer, "\"-Infinity\"");
     } else {
-#ifdef UA_ENABLE_CUSTOM_LIBC
-        fmt_fp(buffer, *src, 0, 17, 0, 'g');
-#else
         UA_snprintf(buffer, 2000, "%.1074g", *src);
-#endif
     }
 
     size_t len = strlen(buffer);

From 696514f1442d6511163e72993ca6c1fc3f81cb59 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 28 May 2022 09:52:31 +0200
Subject: [PATCH 0177/1963] feat(deps): More overflow protection in parse_num.c

---
 deps/parse_num.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/deps/parse_num.c b/deps/parse_num.c
index 8d98231b0db..9709e3fe53f 100644
--- a/deps/parse_num.c
+++ b/deps/parse_num.c
@@ -28,12 +28,13 @@
 
 size_t parseUInt64(const char *str, size_t size, uint64_t *result) {
     size_t i = 0;
-    uint64_t n = 0;
+    uint64_t n = 0, prev = 0;
     bool digit = false; /* At least one real digit */
     if(size - i >= 2 && str[i] == '0' && (str[i+1] | 32) == 'x') {
         /* Hex */
         i += 2;
         for(; i < size; i++) {
+            /* Get the byte value */
             uint8_t c = (uint8_t)str[i] | 32;
             if(c >= '0' && c <= '9')
                 c = c - '0';
@@ -43,17 +44,26 @@ size_t parseUInt64(const char *str, size_t size, uint64_t *result) {
                 c = c - 'A' + 10;
             else
                 break;
+            /* Update */
             digit = true;
-            n = (n << 4) | (n & 0xF);
+            n = (n << 4) | (c & 0xF);
+            if(n < prev)
+            /* Check for overflow */
+                return 0;
+            prev = n;
         }
     } else {
         /* Decimal */
         for(; i < size; i++) {
+            /* Update */
             if(str[i] < '0' || str[i] > '9')
                 break;
             n *= 10;
             digit = true;
             n +=(uint8_t)(str[i] - '0');
+            if(n < prev) /* Check for overflow */
+                return 0;
+            prev = n;
         }
     }
 
@@ -80,14 +90,22 @@ size_t parseInt64(const char *str, size_t size, int64_t *result) {
     if(len == 0)
         return 0;
 
-    /* Adjust and return */
-    *result = (!neg) ? (int64_t)n  : -(int64_t)n;
+    /* Check for overflow, adjust and return */
+    if(!neg) {
+        if(n > 9223372036854775807UL)
+            return 0;
+        *result = (int64_t)n;
+    } else {
+        if(n > 9223372036854775808UL)
+            return 0;
+        *result = -(int64_t)n;
+    }
     return len + i;
 }
 
 size_t parseDouble(const char *str, size_t size, double *result) {
-    char buf[128];
-    if(size >= 128)
+    char buf[2000];
+    if(size >= 2000)
         return 0;
     memcpy(buf, str, size);
     buf[size] = 0;

From bc995118151bdcc5b7ed944f012d3127e1c57caa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 28 May 2022 09:54:51 +0200
Subject: [PATCH 0178/1963] feat(core): Add overflow protection to JSON integer
 parsing

---
 src/ua_types_encoding_json.c | 82 +++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 65a531303d8..0aa670aae03 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1511,24 +1511,34 @@ DECODE_JSON(Boolean) {
 }
 
 static UA_StatusCode
-parseUnsignedInteger(char* inputBuffer, size_t sizeOfBuffer,
-                     UA_UInt64 *destinationOfNumber) {
-    UA_UInt64 d = 0;
-    parseUInt64(inputBuffer, sizeOfBuffer, &d);
-    if(!destinationOfNumber)
+parseUnsignedInteger(char *tokenData, size_t tokenSize, UA_UInt64 *dst) {
+    size_t len = parseUInt64(tokenData, tokenSize, dst);
+    if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
-    *destinationOfNumber = d;
+
+    /* There must only be whitespace between the end of the parsed number and
+     * the end of the token */
+    for(size_t i = len; i < tokenSize; i++) {
+        if(tokenData[i] != ' ' && tokenData[i] -'\t' >= 5)
+            return UA_STATUSCODE_BADDECODINGERROR;
+    }
+
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-parseSignedInteger(char* inputBuffer, size_t sizeOfBuffer,
-                   UA_Int64 *destinationOfNumber) {
-    UA_Int64 d = 0;
-    parseInt64(inputBuffer, sizeOfBuffer, &d);
-    if(!destinationOfNumber)
+parseSignedInteger(char *tokenData, size_t tokenSize, UA_Int64 *dst) {
+    size_t len = parseInt64(tokenData, tokenSize, dst);
+    if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
-    *destinationOfNumber = d;
+
+    /* There must only be whitespace between the end of the parsed number and
+     * the end of the token */
+    for(size_t i = len; i < tokenSize; i++) {
+        if(tokenData[i] != ' ' && tokenData[i] -'\t' >= 5)
+            return UA_STATUSCODE_BADDECODINGERROR;
+    }
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1539,10 +1549,11 @@ DECODE_JSON(Byte) {
 
     UA_UInt64 out = 0;
     UA_StatusCode s = parseUnsignedInteger(tokenData, tokenSize, &out);
+    if(s != UA_STATUSCODE_GOOD || out > UA_BYTE_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_Byte)out;
-
     parseCtx->index++;
-    return s;
+    return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(UInt16) {
@@ -1552,10 +1563,11 @@ DECODE_JSON(UInt16) {
 
     UA_UInt64 out = 0;
     UA_StatusCode s = parseUnsignedInteger(tokenData, tokenSize, &out);
+    if(s != UA_STATUSCODE_GOOD || out > UA_UINT16_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_UInt16)out;
-
     parseCtx->index++;
-    return s;
+    return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(UInt32) {
@@ -1565,10 +1577,11 @@ DECODE_JSON(UInt32) {
 
     UA_UInt64 out = 0;
     UA_StatusCode s = parseUnsignedInteger(tokenData, tokenSize, &out);
+    if(s != UA_STATUSCODE_GOOD || out > UA_UINT32_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_UInt32)out;
-
     parseCtx->index++;
-    return s;
+    return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(UInt64) {
@@ -1576,12 +1589,11 @@ DECODE_JSON(UInt64) {
     CHECK_STRING;
     GET_TOKEN;
 
-    UA_UInt64 out = 0;
-    UA_StatusCode s = parseUnsignedInteger(tokenData, tokenSize, &out);
-    *dst = (UA_UInt64)out;
-
+    UA_StatusCode s = parseUnsignedInteger(tokenData, tokenSize, dst);
+    if(s != UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BADDECODINGERROR;
     parseCtx->index++;
-    return s;
+    return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(SByte) {
@@ -1591,10 +1603,11 @@ DECODE_JSON(SByte) {
 
     UA_Int64 out = 0;
     UA_StatusCode s = parseSignedInteger(tokenData, tokenSize, &out);
+    if(s != UA_STATUSCODE_GOOD || out < UA_SBYTE_MIN || out > UA_SBYTE_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_SByte)out;
-
     parseCtx->index++;
-    return s;
+    return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(Int16) {
@@ -1604,10 +1617,11 @@ DECODE_JSON(Int16) {
 
     UA_Int64 out = 0;
     UA_StatusCode s = parseSignedInteger(tokenData, tokenSize, &out);
+    if(s != UA_STATUSCODE_GOOD || out < UA_INT16_MIN || out > UA_INT16_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_Int16)out;
-
     parseCtx->index++;
-    return s;
+    return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(Int32) {
@@ -1617,10 +1631,11 @@ DECODE_JSON(Int32) {
 
     UA_Int64 out = 0;
     UA_StatusCode s = parseSignedInteger(tokenData, tokenSize, &out);
+    if(s != UA_STATUSCODE_GOOD || out < UA_INT32_MIN || out > UA_INT32_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_Int32)out;
-
     parseCtx->index++;
-    return s;
+    return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(Int64) {
@@ -1628,12 +1643,11 @@ DECODE_JSON(Int64) {
     CHECK_STRING;
     GET_TOKEN;
 
-    UA_Int64 out = 0;
-    UA_StatusCode s = parseSignedInteger(tokenData, tokenSize, &out);
-    *dst = (UA_Int64)out;
-
+    UA_StatusCode s = parseSignedInteger(tokenData, tokenSize, dst);
+    if(s != UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BADDECODINGERROR;
     parseCtx->index++;
-    return s;
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_UInt32 hex2int(char ch) {

From 4502e65e10c693b3e1014ce8c82b2667b0efb4e5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 May 2022 13:16:12 +0200
Subject: [PATCH 0179/1963] refactor(core): Use cj5_result in the public cj5
 API

---
 deps/cj5.c        | 110 +++++++++++++++++++++++++++++++++++++++++-----
 deps/cj5.h        |  29 +++++++++---
 tests/check_cj5.c |   4 +-
 3 files changed, 125 insertions(+), 18 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index b272d503978..81cca7acd74 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -24,6 +24,7 @@
 #include "cj5.h"
 #include "parse_num.h"
 
+#include <math.h>
 #include <string.h>
 
 #if defined(_DEBUG) || defined(NDEBUG)
@@ -41,6 +42,14 @@
 # define CJ5_INLINE inline
 #endif
 
+/* vs2008 does not have INFINITY and NAN defined */
+#ifndef INFINITY
+# define INFINITY ((UA_Double)(DBL_MAX+DBL_MAX))
+#endif
+#ifndef NAN
+# define NAN ((UA_Double)(INFINITY-INFINITY))
+#endif
+
 // Max nesting depth of objects and arrays
 #define CJ5_MAX_NESTING 32
 
@@ -510,31 +519,69 @@ cj5_parse(const char *json5, unsigned int len,
 }
 
 cj5_error_code
-cj5_get_float(const char *json5, const cj5_token *token, double *out) {
-    size_t parsed = parseDouble(&json5[token->start],
-                                token->end - token->start, out);
+cj5_get_float(const cj5_result *parse_result, unsigned int tok_index, double *out) {
+    const cj5_token *token = &parse_result->tokens[tok_index];
+    const char *tokstr = &parse_result->json5[token->start];
+    size_t toksize = token->end - token->start;
+    if(toksize == 0)
+        return CJ5_ERROR_INVALID;
+
+    // Skip prefixed +/-
+    bool neg = false;
+    if(tokstr[0] == '+' || tokstr[0] == '-') {
+        neg = (tokstr[0] == '-');
+        tokstr++;
+        toksize--;
+    }
+
+    // Detect prefixed inf/nan
+    if(strncmp(tokstr, "Infinity", toksize) == 0) {
+        *out = neg ? -INFINITY : INFINITY;
+        return CJ5_ERROR_NONE;
+    } else if(strncmp(tokstr, "NaN", toksize) == 0) {
+        *out = NAN;
+        return CJ5_ERROR_NONE;
+    }
+
+    // reset the +/- detection and parse
+    tokstr = &parse_result->json5[token->start];
+    toksize = token->end - token->start;
+    size_t parsed = parseDouble(tokstr, toksize, out);
+
+    // There must only be whitespace between the end of the parsed number and
+    // the end of the token
+    for(size_t i = parsed; i < toksize; i++) {
+        if(tokstr[i] != ' ' && tokstr[i] -'\t' >= 5)
+            return CJ5_ERROR_INVALID;
+    }
+
     return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
 cj5_error_code
-cj5_get_int(const char *json5, const cj5_token *token, int64_t *out) {
-    size_t parsed = parseInt64(&json5[token->start],
+cj5_get_int(const cj5_result *parse_result, unsigned int tok_index,
+            int64_t *out) {
+    const cj5_token *token = &parse_result->tokens[tok_index];
+    size_t parsed = parseInt64(&parse_result->json5[token->start],
                                token->end - token->start, out);
     return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
 cj5_error_code
-cj5_get_uint(const char *json5, const cj5_token *token, uint64_t *out) {
-    size_t parsed = parseUInt64(&json5[token->start],
+cj5_get_uint(const cj5_result *parse_result, unsigned int tok_index,
+             uint64_t *out) {
+    const cj5_token *token = &parse_result->tokens[tok_index];
+    size_t parsed = parseUInt64(&parse_result->json5[token->start],
                                 token->end - token->start, out);
     return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
 cj5_error_code
-cj5_get_str(const char *json5, const cj5_token *token,
-            char *buf, unsigned *buflen) {
-    const char *pos = &json5[token->start];
-    const char *end = &json5[token->end];
+cj5_get_str(const cj5_result *parse_result, unsigned int tok_index,
+            char *buf, unsigned int *buflen) {
+    const cj5_token *token = &parse_result->tokens[tok_index];
+    const char *pos = &parse_result->json5[token->start];
+    const char *end = &parse_result->json5[token->end];
     unsigned int outpos = 0;
     for(; pos < end; pos++) {
         uint8_t c = (uint8_t)*pos;
@@ -617,3 +664,44 @@ cj5_get_str(const char *json5, const cj5_token *token,
         *buflen = outpos;
     return CJ5_ERROR_NONE;
 }
+
+void
+cj5_skip(const cj5_result *parse_result, unsigned int *tok_index) {
+    unsigned int idx = *tok_index;
+    unsigned int end = parse_result->tokens[idx].end;
+    do { idx++; } while(idx < parse_result->num_tokens &&
+                        parse_result->tokens[idx].start < end);
+    *tok_index = idx;
+}
+
+cj5_error_code
+cj5_find(const cj5_result *parse_result, unsigned int *tok_index,
+         const char *key) {
+    // It has to be an object
+    unsigned int idx = *tok_index;
+    if(parse_result->tokens[idx].type != CJ5_TOKEN_OBJECT)
+        return CJ5_ERROR_INVALID;
+    unsigned int size = parse_result->tokens[idx].size;
+
+    // Skip to the first key
+    idx++;
+
+    // Size is number of keys + number of values
+    for(unsigned int i = 0; i < size; i += 2) {
+        // Key has to be a string
+        if(parse_result->tokens[idx].type != CJ5_TOKEN_STRING)
+            return CJ5_ERROR_INVALID;
+
+        // Return the index to the value if the key matches
+        if(strncmp(key, &parse_result->json5[parse_result->tokens[idx].start],
+                   parse_result->tokens[idx].end - parse_result->tokens[idx].start)) {
+            *tok_index = idx + 1;
+            return CJ5_ERROR_NONE;
+        }
+
+        // Skip over the value
+        idx++;
+        cj5_skip(parse_result, &idx);
+    }
+    return CJ5_ERROR_NOTFOUND;
+}
diff --git a/deps/cj5.h b/deps/cj5.h
index f98f5fc3b52..1673e1242c4 100644
--- a/deps/cj5.h
+++ b/deps/cj5.h
@@ -96,7 +96,8 @@ typedef enum cj5_error_code {
     CJ5_ERROR_NONE = 0,
     CJ5_ERROR_INVALID,       // Invalid character/syntax
     CJ5_ERROR_INCOMPLETE,    // Incomplete JSON string
-    CJ5_ERROR_OVERFLOW       // Token buffer overflow (see cj5_result.num_tokens)
+    CJ5_ERROR_OVERFLOW,      // Token buffer overflow (see cj5_result.num_tokens)
+    CJ5_ERROR_NOTFOUND
 } cj5_error_code;
 
 typedef struct cj5_token {
@@ -124,20 +125,38 @@ cj5_parse(const char *json5, unsigned int len,
           cj5_token *tokens, unsigned int max_tokens);
 
 CJ5_API cj5_error_code
-cj5_get_float(const char *json5, const cj5_token *token, double *out);
+cj5_get_float(const cj5_result *parse_result, unsigned int tok_index, double *out);
 
 CJ5_API cj5_error_code
-cj5_get_int(const char *json5, const cj5_token *token, int64_t *out);
+cj5_get_int(const cj5_result *parse_result, unsigned int tok_index, int64_t *out);
 
 CJ5_API cj5_error_code
-cj5_get_uint(const char *json5, const cj5_token *token, uint64_t *out);
+cj5_get_uint(const cj5_result *parse_result, unsigned int tok_index, uint64_t *out);
 
 // Replaces escape characters, utf8 codepoints, etc.
 // The buffer shall have a length of at least token->end - token->start + 1.
 // Upon success, the length is written to buflen.
 // The output string is terminated with \0.
 CJ5_API cj5_error_code
-cj5_get_str(const char *json5, const cj5_token *token,
+cj5_get_str(const cj5_result *parse_result, unsigned int tok_index,
             char *buf, unsigned int *buflen);
 
+// Skips the (nested) structure that starts at the current index. The index is
+// updated accordingly. Afterwards it points to the beginning of the following
+// structure.
+//
+// Attention! The index can point to the first element after the token array if
+// the root object is skipped.
+//
+// Cannot fail as long as the token array is the result of cj5_parse.
+CJ5_API void
+cj5_skip(const cj5_result *parse_result, unsigned int *tok_index);
+
+// Lookup of a key within an object (linear search).
+// The current token (index) must point to an object.
+// The error code CJ5_ERROR_NOTFOUND is returned if the key is not present.
+// Otherwise the index is updated to point to the value associated with the key.
+CJ5_API cj5_error_code
+cj5_find(const cj5_result *parse_result, unsigned int *tok_index, const char *key);
+
 #endif /* __CJ5_H_ */
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index 5eb6e1bec0b..fd72a81b2c2 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -12,7 +12,7 @@ START_TEST(parseObject) {
     cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
     ck_assert(r.error == CJ5_ERROR_NONE);
     double d = 0.0;
-    cj5_error_code err = cj5_get_float(json, &tokens[2], &d);
+    cj5_error_code err = cj5_get_float(&r, 2, &d);
     ck_assert(err == CJ5_ERROR_NONE);
     ck_assert(d == 1.0);
 } END_TEST
@@ -23,7 +23,7 @@ START_TEST(parseUTF8) {
     cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
     ck_assert(r.error == CJ5_ERROR_NONE);
     char buf[32];
-    cj5_error_code err = cj5_get_str(json, &tokens[2], buf, NULL);
+    cj5_error_code err = cj5_get_str(&r, 2, buf, NULL);
     ck_assert(err == CJ5_ERROR_NONE);
 } END_TEST
 

From 57d6ded1b657c873da7843b61bb08b4fa94cc05a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 28 May 2022 09:55:22 +0200
Subject: [PATCH 0180/1963] refactor(core): Reuse JSON double parsing for float
 parsing

---
 src/ua_types_encoding_json.c | 68 ++++++++----------------------------
 1 file changed, 14 insertions(+), 54 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 0aa670aae03..921c4aa403c 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1660,60 +1660,6 @@ static UA_UInt32 hex2int(char ch) {
     return 0;
 }
 
-DECODE_JSON(Float) {
-    CHECK_TOKEN_BOUNDS;
-    GET_TOKEN;
-
-    /* https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
-     * Maximum digit counts for select IEEE floating-point formats: 149
-     * Sanity check. */
-    if(tokenSize > 150)
-        return UA_STATUSCODE_BADDECODINGERROR;
-
-    jsmntype_t tokenType = getJsmnType(parseCtx);
-
-    /* It could be a string with NaN, Infinity */
-    if(tokenType == JSMN_STRING) {
-        parseCtx->index++;
-
-        if(tokenSize == 8 && memcmp(tokenData, "Infinity", 8) == 0) {
-            *dst = (UA_Float)INFINITY;
-            return UA_STATUSCODE_GOOD;
-        }
-
-        if(tokenSize == 9 && memcmp(tokenData, "-Infinity", 9) == 0) {
-            /* workaround an MSVC 2013 issue */
-            *dst = (UA_Float)-INFINITY;
-            return UA_STATUSCODE_GOOD;
-        }
-
-        if(tokenSize == 3 && memcmp(tokenData, "NaN", 3) == 0) {
-            *dst = (UA_Float)NAN;
-            return UA_STATUSCODE_GOOD;
-        }
-
-        if(tokenSize == 4 && memcmp(tokenData, "-NaN", 4) == 0) {
-            *dst = (UA_Float)NAN;
-            return UA_STATUSCODE_GOOD;
-        }
-
-        return UA_STATUSCODE_BADDECODINGERROR;
-    }
-
-    if(tokenType != JSMN_PRIMITIVE)
-        return UA_STATUSCODE_BADDECODINGERROR;
-
-    double val;
-    size_t len = parseDouble(tokenData, tokenSize, &val);
-    if(len == 0)
-        return UA_STATUSCODE_BADDECODINGERROR;
-
-    *dst = (UA_Float)val;
-
-    parseCtx->index++;
-    return UA_STATUSCODE_GOOD;
-}
-
 /* Either a JSMN_STRING or JSMN_PRIMITIVE */
 DECODE_JSON(Double) {
     CHECK_TOKEN_BOUNDS;
@@ -1763,10 +1709,24 @@ DECODE_JSON(Double) {
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
 
+    /* There must only be whitespace between the end of the parsed number and
+     * the end of the token */
+    for(size_t i = len; i < tokenSize; i++) {
+        if(tokenData[i] != ' ' && tokenData[i] -'\t' >= 5)
+            return UA_STATUSCODE_BADDECODINGERROR;
+    }
+
     parseCtx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
+DECODE_JSON(Float) {
+    UA_Double v = 0.0;
+    UA_StatusCode res = Double_decodeJson(&v, NULL, ctx, parseCtx);
+    *dst = (UA_Float)v;
+    return res;
+}
+
 /*
   Expects 36 chars in format    00000003-0009-000A-0807-060504030201
                                 | data1| |d2| |d3| |d4| |  data4   |

From 2f05639c59e5496ea3e9090689307fd96cf92436 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Jun 2022 23:06:07 +0200
Subject: [PATCH 0181/1963] refactor(deps): Improve variable naming for cj5

---
 deps/cj5.c        | 54 +++++++++++++++++++++++------------------------
 tests/check_cj5.c | 14 ++++++++++++
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 81cca7acd74..d84179ddc65 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -66,13 +66,13 @@ typedef struct cj5__parser {
     unsigned int line_start;
     unsigned int line;
 
-    unsigned int next_id;
-    unsigned int super_id; // the current parent
-
     const char* json5;
     unsigned int len;
 
+    unsigned int curr_tok_idx;
+
     cj5_token* tokens;
+    unsigned int token_count;
     unsigned int max_tokens;
 
     cj5_error_code error;
@@ -101,8 +101,8 @@ cj5__isnum(char ch) {
 static CJ5_INLINE cj5_token *
 cj5__alloc_token(cj5__parser *parser) {
     cj5_token* token = NULL;
-    if(parser->next_id < parser->max_tokens) {
-        token = &parser->tokens[parser->next_id];
+    if(parser->token_count < parser->max_tokens) {
+        token = &parser->tokens[parser->token_count];
         memset(token, 0x0, sizeof(cj5_token));
     } else {
         parser->error = CJ5_ERROR_OVERFLOW;
@@ -110,7 +110,7 @@ cj5__alloc_token(cj5__parser *parser) {
 
     // Always increase the index. So we know eventually how many token would be
     // required (if there are not enough).
-    parser->next_id++; 
+    parser->token_count++;
     return token;
 }
 
@@ -132,7 +132,7 @@ cj5__parse_string(cj5__parser *parser) {
                 token->type = CJ5_TOKEN_STRING;
                 token->start = start + 1;
                 token->end = parser->pos;
-                token->parent_id = parser->super_id;
+                token->parent_id = parser->curr_tok_idx;
             } 
             return;
         }
@@ -249,7 +249,7 @@ cj5__parse_primitive(cj5__parser* parser) {
         token->type = type;
         token->start = start;
         token->end = parser->pos + 1;
-        token->parent_id = parser->super_id;
+        token->parent_id = parser->curr_tok_idx;
     }
 }
 
@@ -293,7 +293,7 @@ cj5__parse_key(cj5__parser* parser) {
         token->type = CJ5_TOKEN_STRING;
         token->start = start;
         token->end = parser->pos + 1;
-        token->parent_id = parser->super_id;
+        token->parent_id = parser->curr_tok_idx;
     }
 }
 
@@ -324,7 +324,7 @@ cj5_parse(const char *json5, unsigned int len,
     cj5_result r;
     cj5__parser parser;
     memset(&parser, 0x0, sizeof(parser));
-    parser.super_id = 0;
+    parser.curr_tok_idx = 0;
     parser.json5 = json5;
     parser.len = len;
     parser.tokens = tokens;
@@ -398,11 +398,12 @@ cj5_parse(const char *json5, unsigned int len,
             // Create a token for the object or array
             token = cj5__alloc_token(&parser);
             if(token) {
-                token->parent_id = parser.super_id;
+                token->parent_id = parser.curr_tok_idx;
                 token->type = (c == '{') ? CJ5_TOKEN_OBJECT : CJ5_TOKEN_ARRAY;
                 token->start = parser.pos;
-                token->size = parser.next_id; // Adjusted when closed
-                parser.super_id = parser.next_id - 1; // The new super_id is for this token
+                token->size = 0;
+                parser.curr_tok_idx = parser.token_count - 1; // The new curr_tok_idx
+                                                              // is for this token
             }
             break;
 
@@ -426,10 +427,11 @@ cj5_parse(const char *json5, unsigned int len,
 
             // Finish setting the super-token
             if(parser.error != CJ5_ERROR_OVERFLOW) {
-                token = &tokens[parser.super_id];
+                token = &tokens[parser.curr_tok_idx];
                 token->end = parser.pos + 1;
-                token->size++; // End of the object -> count as one value for the parent
-                parser.super_id = token->parent_id; // Reset the super_id
+                tokens[token->parent_id].size++; // End of the object -> count
+                                                 // as one value for the parent
+                parser.curr_tok_idx = token->parent_id; // Reset the curr_tok_idx
             }
 
             // Step one level up
@@ -470,11 +472,11 @@ cj5_parse(const char *json5, unsigned int len,
                     slot[0] = 'k';
                     token = cj5__alloc_token(&parser);
                     if(token) {
-                        token->parent_id = parser.super_id;
+                        token->parent_id = parser.curr_tok_idx;
                         token->type = CJ5_TOKEN_OBJECT;
                         token->start = parser.pos;
-                        token->size = parser.next_id;
-                        parser.super_id = parser.next_id - 1;
+                        token->size = 0;
+                        parser.curr_tok_idx = parser.token_count - 1;
                     }
                     parser.pos--; // Reparse the current character
                 } else {
@@ -494,20 +496,16 @@ cj5_parse(const char *json5, unsigned int len,
     }
 
     // Close the virtual root object if there is one
-    if(nesting[0] == '{' && parser.error != CJ5_ERROR_OVERFLOW) {
-        token = &tokens[parser.super_id];
-        token->end = parser.pos;
-        token->size = parser.next_id - token->size;
-        parser.super_id = token->parent_id; // Reset the super_id
-    }
+    if(nesting[0] == '{' && parser.error != CJ5_ERROR_OVERFLOW)
+        tokens[parser.curr_tok_idx].end = parser.pos;
 
  finish:
     memset(&r, 0x0, sizeof(r));
     r.error = parser.error;
     r.error_line = parser.line;
     r.error_col = parser.pos - parser.line_start;
-    r.num_tokens = parser.next_id; // How many tokens (would) have been consumed
-                                   // by the parser?
+    r.num_tokens = parser.token_count; // How many tokens (would) have been
+                                       // consumed by the parser?
 
     // Set the tokens and original string only if successfully parsed
     if(r.error == CJ5_ERROR_NONE) {
@@ -694,7 +692,7 @@ cj5_find(const cj5_result *parse_result, unsigned int *tok_index,
 
         // Return the index to the value if the key matches
         if(strncmp(key, &parse_result->json5[parse_result->tokens[idx].start],
-                   parse_result->tokens[idx].end - parse_result->tokens[idx].start)) {
+                   parse_result->tokens[idx].end - parse_result->tokens[idx].start) == 0) {
             *tok_index = idx + 1;
             return CJ5_ERROR_NONE;
         }
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index fd72a81b2c2..5e8b4a7d01c 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -32,6 +32,20 @@ START_TEST(parseNestedObject) {
     cj5_token tokens[32];
     cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
     ck_assert(r.error == CJ5_ERROR_NONE);
+
+    /* Test the cj5_find method for value lookup in objects */
+    unsigned int idx = 0;
+    cj5_error_code err = cj5_find(&r, &idx, "b");
+    ck_assert_int_eq(err, CJ5_ERROR_NONE);
+    ck_assert_uint_eq(idx, 4);
+
+    err = cj5_find(&r, &idx, "c");
+    ck_assert(err == CJ5_ERROR_NONE);
+    ck_assert(idx == 6);
+
+    idx = 4;
+    err = cj5_find(&r, &idx, "d");
+    ck_assert(err == CJ5_ERROR_NOTFOUND);
 } END_TEST
 
 START_TEST(parseObjectUnquoted) {

From 356ba1b621cc66a03de4c6f02b2d89a78308144d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 3 Jun 2022 15:51:23 +0200
Subject: [PATCH 0182/1963] refactor(deps): Set the token size for json5
 primitives

---
 deps/cj5.c        | 131 +++++++++++++++++++++++++++-------------------
 deps/cj5.h        |  23 ++++----
 tests/check_cj5.c |  34 ++++++++++--
 3 files changed, 123 insertions(+), 65 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index d84179ddc65..9d0f4ec15ef 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -131,7 +131,8 @@ cj5__parse_string(cj5__parser *parser) {
             if(token) {
                 token->type = CJ5_TOKEN_STRING;
                 token->start = start + 1;
-                token->end = parser->pos;
+                token->end = parser->pos - 1;
+                token->size = token->end - token->start + 1;
                 token->parent_id = parser->curr_tok_idx;
             } 
             return;
@@ -216,18 +217,18 @@ cj5__parse_primitive(cj5__parser* parser) {
     cj5_token_type type;
     if(fourcc == CJ5__NULL_FOURCC) {
         type = CJ5_TOKEN_NULL;
-        parser->pos += 4;
+        parser->pos += 3;
     } else if(fourcc == CJ5__TRUE_FOURCC) {
         type = CJ5_TOKEN_BOOL;
-        parser->pos += 4;
+        parser->pos += 3;
     } else if(fourcc == CJ5__FALSE_FOURCC) {
         // "false" has five characters
         type = CJ5_TOKEN_BOOL;
-        if(start + 5 >= len || json5[start+5] != 'e') {
+        if(start + 4 >= len || json5[start+4] != 'e') {
             parser->error = CJ5_ERROR_INVALID;
             return;
         }
-        parser->pos += 5;
+        parser->pos += 4;
     } else {
         // Numbers are checked for basic compatibility.
         // But they are fully parsed only in the cj5_get_XXX functions.
@@ -248,7 +249,8 @@ cj5__parse_primitive(cj5__parser* parser) {
     if(token) {
         token->type = type;
         token->start = start;
-        token->end = parser->pos + 1;
+        token->end = parser->pos;
+        token->size = parser->pos - start + 1;
         token->parent_id = parser->curr_tok_idx;
     }
 }
@@ -265,9 +267,7 @@ cj5__parse_key(cj5__parser* parser) {
         return;
     }
 
-    // An unquoted key.
-    // Must start with a-ZA-Z_$.
-    // Can contain numbers later on.
+    // An unquoted key. Must start with a-ZA-Z_$. Can contain numbers later on.
     unsigned int len = parser->len;
     for(; parser->pos < len; parser->pos++) {
         if(cj5__islowerchar(json5[parser->pos]) ||
@@ -280,19 +280,20 @@ cj5__parse_key(cj5__parser* parser) {
     }
 
     // An empty key is not allowed
-    if(parser->pos == start) {
+    if(parser->pos <= start) {
         parser->error = CJ5_ERROR_INVALID;
         return;
     }
 
-    // Reparse the character that is beyond the string
+    // Move pos to the last character within the key
     parser->pos--;
 
     token = cj5__alloc_token(parser);
     if(token) {
         token->type = CJ5_TOKEN_STRING;
         token->start = start;
-        token->end = parser->pos + 1;
+        token->end = parser->pos;
+        token->size = parser->pos - start + 1;
         token->parent_id = parser->curr_tok_idx;
     }
 }
@@ -340,9 +341,11 @@ cj5_parse(const char *json5, unsigned int len,
     nesting[0] = 0; // Becomes '{' if there is a virtual root object
     slot[0] = 0;
     bool before_root = true;
-    cj5_token *token;
+    cj5_token *token = NULL;
 
     for(; parser.pos < len; parser.pos++) {
+        CJ5_ASSERT(!token || token == &tokens[parser.curr_tok_idx]);
+
         char c = json5[parser.pos];
         switch(c) {
         case '\n': // Newline
@@ -425,18 +428,22 @@ cj5_parse(const char *json5, unsigned int len,
                 goto finish;
             }
 
-            // Finish setting the super-token
-            if(parser.error != CJ5_ERROR_OVERFLOW) {
-                token = &tokens[parser.curr_tok_idx];
-                token->end = parser.pos + 1;
-                tokens[token->parent_id].size++; // End of the object -> count
-                                                 // as one value for the parent
-                parser.curr_tok_idx = token->parent_id; // Reset the curr_tok_idx
-            }
+            // Finalize the current token
+            token->end = parser.pos;
+
+            // Move to the parent and increase the parent size
+            parser.curr_tok_idx = token->parent_id;
+            token = &tokens[token->parent_id];
 
             // Step one level up
             depth--;
-            slot[depth] = (depth > 0) ? ',' : 0; // zero if we step out the root object
+            bool close_root = (depth == 0);
+            slot[depth] = (close_root) ? 0 : ','; // zero if we step out the root object
+
+            // Closing and not inside the root object. Count the current object as
+            // one value for the parent.
+            if(!close_root)
+                token->size++;
             break;
 
         case ':': // Colon (between key and value)
@@ -466,7 +473,7 @@ cj5_parse(const char *json5, unsigned int len,
                 slot[depth] = ':';
             } else {
                 if(before_root) {
-                    // Create a virtual root object
+                    // Create a virtual root object and restart parsing
                     CJ5_ASSERT(depth == 0);
                     nesting[0] = '{';
                     slot[0] = 'k';
@@ -497,7 +504,7 @@ cj5_parse(const char *json5, unsigned int len,
 
     // Close the virtual root object if there is one
     if(nesting[0] == '{' && parser.error != CJ5_ERROR_OVERFLOW)
-        tokens[parser.curr_tok_idx].end = parser.pos;
+        tokens[parser.curr_tok_idx].end = parser.pos - 1;
 
  finish:
     memset(&r, 0x0, sizeof(r));
@@ -517,10 +524,22 @@ cj5_parse(const char *json5, unsigned int len,
 }
 
 cj5_error_code
-cj5_get_float(const cj5_result *parse_result, unsigned int tok_index, double *out) {
-    const cj5_token *token = &parse_result->tokens[tok_index];
-    const char *tokstr = &parse_result->json5[token->start];
-    size_t toksize = token->end - token->start;
+cj5_get_bool(const cj5_result *r, unsigned int tok_index, bool *out) {
+    const cj5_token *token = &r->tokens[tok_index];
+    if(token->type != CJ5_TOKEN_BOOL)
+        return CJ5_ERROR_INVALID;
+    *out = (r->json5[token->start] == 't');
+    return CJ5_ERROR_NONE;
+}
+
+cj5_error_code
+cj5_get_float(const cj5_result *r, unsigned int tok_index, double *out) {
+    const cj5_token *token = &r->tokens[tok_index];
+    if(token->type != CJ5_TOKEN_NUMBER)
+        return CJ5_ERROR_INVALID;
+
+    const char *tokstr = &r->json5[token->start];
+    size_t toksize = token->end - token->start + 1;
     if(toksize == 0)
         return CJ5_ERROR_INVALID;
 
@@ -542,8 +561,8 @@ cj5_get_float(const cj5_result *parse_result, unsigned int tok_index, double *ou
     }
 
     // reset the +/- detection and parse
-    tokstr = &parse_result->json5[token->start];
-    toksize = token->end - token->start;
+    tokstr = &r->json5[token->start];
+    toksize = token->end - token->start + 1;
     size_t parsed = parseDouble(tokstr, toksize, out);
 
     // There must only be whitespace between the end of the parsed number and
@@ -557,29 +576,34 @@ cj5_get_float(const cj5_result *parse_result, unsigned int tok_index, double *ou
 }
 
 cj5_error_code
-cj5_get_int(const cj5_result *parse_result, unsigned int tok_index,
+cj5_get_int(const cj5_result *r, unsigned int tok_index,
             int64_t *out) {
-    const cj5_token *token = &parse_result->tokens[tok_index];
-    size_t parsed = parseInt64(&parse_result->json5[token->start],
-                               token->end - token->start, out);
+    const cj5_token *token = &r->tokens[tok_index];
+    if(token->type != CJ5_TOKEN_NUMBER)
+        return CJ5_ERROR_INVALID;
+    size_t parsed = parseInt64(&r->json5[token->start], token->size, out);
     return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
 cj5_error_code
-cj5_get_uint(const cj5_result *parse_result, unsigned int tok_index,
+cj5_get_uint(const cj5_result *r, unsigned int tok_index,
              uint64_t *out) {
-    const cj5_token *token = &parse_result->tokens[tok_index];
-    size_t parsed = parseUInt64(&parse_result->json5[token->start],
-                                token->end - token->start, out);
+    const cj5_token *token = &r->tokens[tok_index];
+    if(token->type != CJ5_TOKEN_NUMBER)
+        return CJ5_ERROR_INVALID;
+    size_t parsed = parseUInt64(&r->json5[token->start], token->size, out);
     return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
 cj5_error_code
-cj5_get_str(const cj5_result *parse_result, unsigned int tok_index,
+cj5_get_str(const cj5_result *r, unsigned int tok_index,
             char *buf, unsigned int *buflen) {
-    const cj5_token *token = &parse_result->tokens[tok_index];
-    const char *pos = &parse_result->json5[token->start];
-    const char *end = &parse_result->json5[token->end];
+    const cj5_token *token = &r->tokens[tok_index];
+    if(token->type != CJ5_TOKEN_STRING)
+        return CJ5_ERROR_INVALID;
+
+    const char *pos = &r->json5[token->start];
+    const char *end = &r->json5[token->end + 1];
     unsigned int outpos = 0;
     for(; pos < end; pos++) {
         uint8_t c = (uint8_t)*pos;
@@ -664,22 +688,22 @@ cj5_get_str(const cj5_result *parse_result, unsigned int tok_index,
 }
 
 void
-cj5_skip(const cj5_result *parse_result, unsigned int *tok_index) {
+cj5_skip(const cj5_result *r, unsigned int *tok_index) {
     unsigned int idx = *tok_index;
-    unsigned int end = parse_result->tokens[idx].end;
-    do { idx++; } while(idx < parse_result->num_tokens &&
-                        parse_result->tokens[idx].start < end);
+    unsigned int end = r->tokens[idx].end;
+    do { idx++; } while(idx < r->num_tokens &&
+                        r->tokens[idx].start < end);
     *tok_index = idx;
 }
 
 cj5_error_code
-cj5_find(const cj5_result *parse_result, unsigned int *tok_index,
+cj5_find(const cj5_result *r, unsigned int *tok_index,
          const char *key) {
     // It has to be an object
     unsigned int idx = *tok_index;
-    if(parse_result->tokens[idx].type != CJ5_TOKEN_OBJECT)
+    if(r->tokens[idx].type != CJ5_TOKEN_OBJECT)
         return CJ5_ERROR_INVALID;
-    unsigned int size = parse_result->tokens[idx].size;
+    unsigned int size = r->tokens[idx].size;
 
     // Skip to the first key
     idx++;
@@ -687,19 +711,20 @@ cj5_find(const cj5_result *parse_result, unsigned int *tok_index,
     // Size is number of keys + number of values
     for(unsigned int i = 0; i < size; i += 2) {
         // Key has to be a string
-        if(parse_result->tokens[idx].type != CJ5_TOKEN_STRING)
+        if(r->tokens[idx].type != CJ5_TOKEN_STRING)
             return CJ5_ERROR_INVALID;
 
         // Return the index to the value if the key matches
-        if(strncmp(key, &parse_result->json5[parse_result->tokens[idx].start],
-                   parse_result->tokens[idx].end - parse_result->tokens[idx].start) == 0) {
+        const char *keystart = &r->json5[r->tokens[idx].start];
+        size_t keysize = r->tokens[idx].end - r->tokens[idx].start + 1;
+        if(strncmp(key, keystart, keysize) == 0) {
             *tok_index = idx + 1;
             return CJ5_ERROR_NONE;
         }
 
         // Skip over the value
         idx++;
-        cj5_skip(parse_result, &idx);
+        cj5_skip(r, &idx);
     }
     return CJ5_ERROR_NOTFOUND;
 }
diff --git a/deps/cj5.h b/deps/cj5.h
index 1673e1242c4..a75492c1e3c 100644
--- a/deps/cj5.h
+++ b/deps/cj5.h
@@ -104,9 +104,11 @@ typedef struct cj5_token {
     cj5_token_type type;
     unsigned int start;     // Start position in the json5 string
     unsigned int end;       // Position of the last character (included)
-    unsigned int size;      // Number of direct children. For objects, both key and value
-                            // are counted. Note that this is *not*
-                            // the number of overall (recursively nested) child tokens.
+    unsigned int size;      // For objects and arrays the number of direct
+                            // children. Note that this is *not* the number of
+                            // overall (recursively nested) child tokens. For
+                            // other tokens the length of token in the json
+                            // encoding.
     unsigned int parent_id; // The root object is at position zero. It is an
                             // object that has itself as parent.
 } cj5_token;
@@ -125,20 +127,23 @@ cj5_parse(const char *json5, unsigned int len,
           cj5_token *tokens, unsigned int max_tokens);
 
 CJ5_API cj5_error_code
-cj5_get_float(const cj5_result *parse_result, unsigned int tok_index, double *out);
+cj5_get_bool(const cj5_result *r, unsigned int tok_index, bool *out);
 
 CJ5_API cj5_error_code
-cj5_get_int(const cj5_result *parse_result, unsigned int tok_index, int64_t *out);
+cj5_get_float(const cj5_result *r, unsigned int tok_index, double *out);
 
 CJ5_API cj5_error_code
-cj5_get_uint(const cj5_result *parse_result, unsigned int tok_index, uint64_t *out);
+cj5_get_int(const cj5_result *r, unsigned int tok_index, int64_t *out);
+
+CJ5_API cj5_error_code
+cj5_get_uint(const cj5_result *r, unsigned int tok_index, uint64_t *out);
 
 // Replaces escape characters, utf8 codepoints, etc.
 // The buffer shall have a length of at least token->end - token->start + 1.
 // Upon success, the length is written to buflen.
 // The output string is terminated with \0.
 CJ5_API cj5_error_code
-cj5_get_str(const cj5_result *parse_result, unsigned int tok_index,
+cj5_get_str(const cj5_result *r, unsigned int tok_index,
             char *buf, unsigned int *buflen);
 
 // Skips the (nested) structure that starts at the current index. The index is
@@ -150,13 +155,13 @@ cj5_get_str(const cj5_result *parse_result, unsigned int tok_index,
 //
 // Cannot fail as long as the token array is the result of cj5_parse.
 CJ5_API void
-cj5_skip(const cj5_result *parse_result, unsigned int *tok_index);
+cj5_skip(const cj5_result *r, unsigned int *tok_index);
 
 // Lookup of a key within an object (linear search).
 // The current token (index) must point to an object.
 // The error code CJ5_ERROR_NOTFOUND is returned if the key is not present.
 // Otherwise the index is updated to point to the value associated with the key.
 CJ5_API cj5_error_code
-cj5_find(const cj5_result *parse_result, unsigned int *tok_index, const char *key);
+cj5_find(const cj5_result *r, unsigned int *tok_index, const char *key);
 
 #endif /* __CJ5_H_ */
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index 5e8b4a7d01c..25d57bd81d7 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -7,7 +7,7 @@
 #include "cj5.h"
 
 START_TEST(parseObject) {
-    const char *json = "{'a':1.0, 'b':2}";
+    const char *json = "{'a':1.0, 'b':2, 'c':'abcde'}";
     cj5_token tokens[32];
     cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
     ck_assert(r.error == CJ5_ERROR_NONE);
@@ -15,6 +15,8 @@ START_TEST(parseObject) {
     cj5_error_code err = cj5_get_float(&r, 2, &d);
     ck_assert(err == CJ5_ERROR_NONE);
     ck_assert(d == 1.0);
+
+    ck_assert_uint_eq(tokens[6].size, 5);
 } END_TEST
 
 START_TEST(parseUTF8) {
@@ -25,10 +27,12 @@ START_TEST(parseUTF8) {
     char buf[32];
     cj5_error_code err = cj5_get_str(&r, 2, buf, NULL);
     ck_assert(err == CJ5_ERROR_NONE);
+
+    ck_assert_uint_eq(tokens[2].size, 16);
 } END_TEST
 
 START_TEST(parseNestedObject) {
-    const char *json = "{'a':{}, 'b':{'c':3}}";
+    const char *json = "{'a':{}, 'b':{'c':3}, 'd':true, 'e':false, 'f':null, 'g':[]}";
     cj5_token tokens[32];
     cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
     ck_assert(r.error == CJ5_ERROR_NONE);
@@ -43,13 +47,37 @@ START_TEST(parseNestedObject) {
     ck_assert(err == CJ5_ERROR_NONE);
     ck_assert(idx == 6);
 
+    int64_t val = 0;
+    cj5_get_int(&r, idx, &val);
+    ck_assert(val == 3);
+
     idx = 4;
     err = cj5_find(&r, &idx, "d");
     ck_assert(err == CJ5_ERROR_NOTFOUND);
+
+    idx = 0;
+    err = cj5_find(&r, &idx, "d");
+    ck_assert_int_eq(err, CJ5_ERROR_NONE);
+
+    bool bval = 0;
+    cj5_get_bool(&r, idx, &bval);
+    ck_assert(bval == true);
+
+    idx = 0;
+    err = cj5_find(&r, &idx, "e");
+    ck_assert_int_eq(err, CJ5_ERROR_NONE);
+
+    cj5_get_bool(&r, idx, &bval);
+    ck_assert(bval == false);
+
+    idx = 0;
+    err = cj5_find(&r, &idx, "f");
+    ck_assert_int_eq(err, CJ5_ERROR_NONE);
+    ck_assert(tokens[idx].type == CJ5_TOKEN_NULL);
 } END_TEST
 
 START_TEST(parseObjectUnquoted) {
-    const char *json = "{'a':1, b:2}";
+    const char *json = "{'a':1, b:true}";
     cj5_token tokens[32];
     cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
     ck_assert(r.error == CJ5_ERROR_NONE);

From 501e5dd13353d7d9fd0610a2137bf401e008bec3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 01:06:04 +0200
Subject: [PATCH 0183/1963] feat(deps): Allows parsing of primitives and arrays
 as the JSON5 root

---
 deps/cj5.c        | 198 ++++++++++++++++++++++++++--------------------
 deps/cj5.h        |   3 +-
 tests/check_cj5.c |  24 ++++++
 3 files changed, 138 insertions(+), 87 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 9d0f4ec15ef..8cfcae67162 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -261,7 +261,7 @@ cj5__parse_key(cj5__parser* parser) {
     unsigned int start = parser->pos;
     cj5_token* token;
 
-    // A normal string
+    // Key is a a normal string
     if(json5[start] == '\"' || json5[start] == '\'') {
         cj5__parse_string(parser);
         return;
@@ -285,7 +285,7 @@ cj5__parse_key(cj5__parser* parser) {
         return;
     }
 
-    // Move pos to the last character within the key
+    // Move pos to the last character within the unquoted key
     parser->pos--;
 
     token = cj5__alloc_token(parser);
@@ -301,21 +301,48 @@ cj5__parse_key(cj5__parser* parser) {
 static void
 cj5__skip_comment(cj5__parser* parser) {
     const char* json5 = parser->json5;
-    for(; parser->pos < parser->len; parser->pos++) {
-        if(json5[parser->pos] == '\n' || json5[parser->pos] == '\r')
-            return;
+
+    // Single-line comment
+    if(json5[parser->pos] == '#') {
+    skip_line:
+        while(parser->pos < parser->len) {
+            if(json5[parser->pos] == '\n') {
+                parser->pos--; // Reparse the newline in the main parse loop
+                return;
+            }
+            parser->pos++;
+        }
+        return;
     }
-}
 
-static void
-cj5__skip_multiline_comment(cj5__parser *parser) {
-    const char* json5 = parser->json5;
-    unsigned int len = parser->len;
-    for(; parser->pos < len; parser->pos++) {
-        if(json5[parser->pos] == '*' && parser->pos + 1 < len &&
-           json5[parser->pos+1] == '/')
-            return;
+    // Comment begins with '/' but not enough space for another character
+    if(parser->pos + 1 >= parser->len) {
+        parser->error = CJ5_ERROR_INVALID;
+        return;
     }
+    parser->pos++;
+
+    // Comment begins with '//' -> single-line comment
+    if(json5[parser->pos] == '/')
+        goto skip_line;
+
+    // Multi-line comments begin with '/*' and end with '*/'
+    if(json5[parser->pos] == '*') {
+        parser->pos++;
+        for(; parser->pos + 1 <= parser->len; parser->pos++) {
+            if(json5[parser->pos] == '*' && json5[parser->pos + 1] == '/') {
+                parser->pos++;
+                return;
+            }
+            // Remember we passed a newline
+            if(json5[parser->pos] == '\n') {
+                parser->line++;
+                parser->line_start = parser->pos;
+            }
+        }
+    }
+
+    // Unknown comment type or the multi-line comment is not terminated
     parser->error = CJ5_ERROR_INCOMPLETE;
 }
 
@@ -331,46 +358,39 @@ cj5_parse(const char *json5, unsigned int len,
     parser.tokens = tokens;
     parser.max_tokens = max_tokens;
 
-    // The nesting depth zero means "outside the root object"
-    unsigned short depth = 0;
+    unsigned short depth = 0; // Nesting depth zero means "outside the root object"
     char nesting[CJ5_MAX_NESTING]; // Contains either '\0', '{' or '[' for the
                                    // type of nesting at each depth. '\0'
                                    // indicates we are out of the root object.
-    char slot[CJ5_MAX_NESTING];    // Next content to parse: 'k' (key), ':', 'v'
+    char next[CJ5_MAX_NESTING];    // Next content to parse: 'k' (key), ':', 'v'
                                    // (value) or ',' (komma).
+    next[0] = 'v';  // The root is a "value" (object, array or primitive). If we
+                    // detect a colon after the first value then everything is
+                    // wrapped into a "virtual root object" and the parsing is
+                    // restarted.
     nesting[0] = 0; // Becomes '{' if there is a virtual root object
-    slot[0] = 0;
-    bool before_root = true;
-    cj5_token *token = NULL;
 
+    cj5_token *token = NULL; // The current token
+
+ start_parsing:
     for(; parser.pos < len; parser.pos++) {
         CJ5_ASSERT(!token || token == &tokens[parser.curr_tok_idx]);
 
         char c = json5[parser.pos];
         switch(c) {
-        case '\n': // Newline
+        case '\n': // Skip newline
             parser.line++;
             parser.line_start = parser.pos;
             break;
 
-        case '\r': // Whitespace
+        case '\r': // Skip whitespace
         case '\t':
         case ' ':
             break;
 
-        case '#': // Comment
+        case '#': // Skip comment
         case '/':
-            if(json5[parser.pos] == '#') {
-                cj5__skip_comment(&parser);
-            } else {
-                if(parser.pos + 1 >= parser.len) {
-                    parser.error = CJ5_ERROR_INVALID;
-                } else if(json5[parser.pos + 1] == '/') {
-                    cj5__skip_comment(&parser);
-                } else if(json5[parser.pos + 1] == '*') {
-                    cj5__skip_multiline_comment(&parser);
-                }
-            }
+            cj5__skip_comment(&parser);
             if(parser.error != CJ5_ERROR_NONE &&
                parser.error != CJ5_ERROR_OVERFLOW)
                 goto finish;
@@ -384,19 +404,15 @@ cj5_parse(const char *json5, unsigned int len,
                 goto finish;
             }
 
-            // Correct slot?
-            if(slot[depth] != 'v') {
-                // Start the root object
-                if(!before_root || c != '{') {
-                    parser.error = CJ5_ERROR_INVALID;
-                    goto finish;
-                }
-                before_root = false;
+            // Correct next?
+            if(next[depth] != 'v') {
+                parser.error = CJ5_ERROR_INVALID;
+                goto finish;
             }
 
-            depth++; // Increase the nesting
-            nesting[depth] = c;
-            slot[depth] = (c == '{') ? 'k' : 'v';
+            depth++; // Increase the nesting depth
+            nesting[depth] = c; // Set the nesting type
+            next[depth] = (c == '{') ? 'k' : 'v'; // next is either a key or a value
 
             // Create a token for the object or array
             token = cj5__alloc_token(&parser);
@@ -423,7 +439,7 @@ cj5_parse(const char *json5, unsigned int len,
             // '{' == 2. Arrays can always be closed. Objects can only close
             // when a key or a comma is expected.
             if(c - nesting[depth] != 2 ||
-               (c == '}' && slot[depth] != 'k' && slot[depth] != ',')) {
+               (c == '}' && next[depth] != 'k' && next[depth] != ',')) {
                 parser.error = CJ5_ERROR_INVALID;
                 goto finish;
             }
@@ -434,69 +450,58 @@ cj5_parse(const char *json5, unsigned int len,
             // Move to the parent and increase the parent size
             parser.curr_tok_idx = token->parent_id;
             token = &tokens[token->parent_id];
+            token->size++;
 
             // Step one level up
             depth--;
-            bool close_root = (depth == 0);
-            slot[depth] = (close_root) ? 0 : ','; // zero if we step out the root object
-
-            // Closing and not inside the root object. Count the current object as
-            // one value for the parent.
-            if(!close_root)
-                token->size++;
+            next[depth] = (depth == 0) ? 0 : ','; // zero if we step out the root
+                                                  // object. then we do not look for
+                                                  // another element.
             break;
 
         case ':': // Colon (between key and value)
-            if(slot[depth] != ':') {
+            if(next[depth] != ':') {
                 parser.error = CJ5_ERROR_INVALID;
                 goto finish;
             }
-            slot[depth] = 'v';
+            next[depth] = 'v';
             break;
 
         case ',': // Comma
-            if(slot[depth] != ',') {
+            if(next[depth] != ',') {
                 parser.error = CJ5_ERROR_INVALID;
                 goto finish;
             }
-            slot[depth] = (nesting[depth] == '{') ? 'k' : 'v';
+            next[depth] = (nesting[depth] == '{') ? 'k' : 'v';
             break;
 
-        default: // Value
-            if(slot[depth] == 'v') {
+        default: // Value or key
+            if(next[depth] == 'v') {
                 cj5__parse_primitive(&parser); // Parse primitive value
-                token->size++; // One more value for the parent
-                slot[depth] = ',';
-            } else if(slot[depth] == 'k') {
-                cj5__parse_key(&parser); // Parse key
+                if(nesting[depth] != 0) { // Parent is object or array
+                    token->size++;
+                    next[depth] = ',';
+                } else { // The current value was the root element. Don't look for
+                         // any next element.
+                    next[depth] = 0;
+                }
+            } else if(next[depth] == 'k') {
+                CJ5_ASSERT(nesting[depth] == '{');
+                cj5__parse_key(&parser);
                 token->size++; // Keys count towards the length
-                slot[depth] = ':';
+                next[depth] = ':';
             } else {
-                if(before_root) {
-                    // Create a virtual root object and restart parsing
-                    CJ5_ASSERT(depth == 0);
-                    nesting[0] = '{';
-                    slot[0] = 'k';
-                    token = cj5__alloc_token(&parser);
-                    if(token) {
-                        token->parent_id = parser.curr_tok_idx;
-                        token->type = CJ5_TOKEN_OBJECT;
-                        token->start = parser.pos;
-                        token->size = 0;
-                        parser.curr_tok_idx = parser.token_count - 1;
-                    }
-                    parser.pos--; // Reparse the current character
-                } else {
-                    parser.error = CJ5_ERROR_INVALID;
-                }
+                parser.error = CJ5_ERROR_INVALID;
             }
+
             if(parser.error && parser.error != CJ5_ERROR_OVERFLOW)
                 goto finish;
+
             break;
         }
     }
 
-    // The initial object was not closed
+    // Are we back to the initial nesting depth?
     if(depth != 0) {
         parser.error = CJ5_ERROR_INCOMPLETE;
         goto finish;
@@ -504,9 +509,30 @@ cj5_parse(const char *json5, unsigned int len,
 
     // Close the virtual root object if there is one
     if(nesting[0] == '{' && parser.error != CJ5_ERROR_OVERFLOW)
-        tokens[parser.curr_tok_idx].end = parser.pos - 1;
+        tokens[0].end = parser.pos - 1;
 
  finish:
+    // If parsing failed at the initial nesting depth, create a virtual root object
+    // and restart parsing.
+    if(parser.error != CJ5_ERROR_NONE && depth == 0 && nesting[0] != '{') {
+        parser.token_count = 0;
+        token = cj5__alloc_token(&parser);
+        if(token) {
+            token->parent_id = 0;
+            token->type = CJ5_TOKEN_OBJECT;
+            token->start = 0;
+            token->size = 0;
+
+            nesting[0] = '{';
+            next[0] = 'k';
+
+            parser.curr_tok_idx = 0;
+            parser.pos = 0;
+            parser.error = CJ5_ERROR_NONE;
+            goto start_parsing;
+        }
+    }
+
     memset(&r, 0x0, sizeof(r));
     r.error = parser.error;
     r.error_line = parser.line;
@@ -634,11 +660,11 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
                     pos++;
                     uint8_t byte = (uint8_t)*pos;
                     if(byte >= '0' && byte <= '9') {
-                        byte = byte - (uint8_t)'0';
+                        byte = (uint8_t)(byte - (uint8_t)'0');
                     } else if(byte >= 'a' && byte <='f') {
-                        byte = byte - (uint8_t)('a' - 10);
+                        byte = (uint8_t)(byte - (uint8_t)('a' - 10));
                     } else if(byte >= 'A' && byte <='F') {
-                        byte = byte - (uint8_t)('A' - 10);
+                        byte = (uint8_t)(byte - (uint8_t)('A' - 10));
                     } else {
                         return CJ5_ERROR_INVALID;
                     }
diff --git a/deps/cj5.h b/deps/cj5.h
index a75492c1e3c..8d76f657cc4 100644
--- a/deps/cj5.h
+++ b/deps/cj5.h
@@ -39,7 +39,8 @@
 //  [x] Additional white space characters are allowed.
 //
 // Extensions to JSON5 (more permissive):
-//  [x] If no root object is defined, a "virtual root object" is assumed.
+//  [x] Root objects can be an array or a primitive value
+//  [x] The root object may omit the surrounding brackets
 //  [x] Hash ('#') comments out until the end of the line.
 //  [x] Strings may include unescaped utf8 bytes
 //
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index 25d57bd81d7..35173fea81d 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -111,6 +111,13 @@ START_TEST(parseObjectNoRoot) {
     ck_assert(r.error == CJ5_ERROR_NONE);
 } END_TEST
 
+START_TEST(parseObjectNoRootUnquoted) {
+    const char *json = "a:1, 'b':2";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+} END_TEST
+
 START_TEST(parseObjectCloseNoRoot) {
     const char *json = "'a':1, 'b':2}";
     cj5_token tokens[32];
@@ -118,6 +125,20 @@ START_TEST(parseObjectCloseNoRoot) {
     ck_assert(r.error == CJ5_ERROR_INVALID);
 } END_TEST
 
+START_TEST(parseArray) {
+    const char *json = "[1,2,3,null]";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+} END_TEST
+
+START_TEST(parseValue) {
+    const char *json = "null";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+} END_TEST
+
 static Suite *testSuite_builtin_json(void) {
     TCase *tc_parse= tcase_create("cj5_parse");
     tcase_add_test(tc_parse, parseObject);
@@ -128,7 +149,10 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_parse, parseObjectWrongBracket2);
     tcase_add_test(tc_parse, parseObjectIncomplete);
     tcase_add_test(tc_parse, parseObjectNoRoot);
+    tcase_add_test(tc_parse, parseObjectNoRootUnquoted);
     tcase_add_test(tc_parse, parseObjectCloseNoRoot);
+    tcase_add_test(tc_parse, parseArray);
+    tcase_add_test(tc_parse, parseValue);
 
     Suite *s = suite_create("Test JSON decoding with the cj5 library");
     suite_add_tcase(s, tc_parse);

From aa5fa2495b81d34ae53ee04bc133af2fe0d11018 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 01:53:15 +0200
Subject: [PATCH 0184/1963] fix(deps): Include float.h in cj5.c

---
 deps/cj5.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 8cfcae67162..11a92292d3f 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -25,6 +25,7 @@
 #include "parse_num.h"
 
 #include <math.h>
+#include <float.h>
 #include <string.h>
 
 #if defined(_DEBUG) || defined(NDEBUG)
@@ -44,10 +45,10 @@
 
 /* vs2008 does not have INFINITY and NAN defined */
 #ifndef INFINITY
-# define INFINITY ((UA_Double)(DBL_MAX+DBL_MAX))
+# define INFINITY ((double)(DBL_MAX+DBL_MAX))
 #endif
 #ifndef NAN
-# define NAN ((UA_Double)(INFINITY-INFINITY))
+# define NAN ((double)(INFINITY-INFINITY))
 #endif
 
 // Max nesting depth of objects and arrays

From 3340392909bce0835afddad41d746ac8f47ecba9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 02:01:11 +0200
Subject: [PATCH 0185/1963] feat(tests): Add float test for JSON5 parsing with
 cj5.c

---
 deps/parse_num.c  |  6 +++---
 tests/check_cj5.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/deps/parse_num.c b/deps/parse_num.c
index 9709e3fe53f..0ea7a7d6b09 100644
--- a/deps/parse_num.c
+++ b/deps/parse_num.c
@@ -37,11 +37,11 @@ size_t parseUInt64(const char *str, size_t size, uint64_t *result) {
             /* Get the byte value */
             uint8_t c = (uint8_t)str[i] | 32;
             if(c >= '0' && c <= '9')
-                c = c - '0';
+                c = (uint8_t)(c - '0');
             else if(c >= 'a' && c <='f')
-                c = c - 'a' + 10;
+                c = (uint8_t)(c - 'a' + 10);
             else if(c >= 'A' && c <='F')
-                c = c - 'A' + 10;
+                c = (uint8_t)(c - 'A' + 10);
             else
                 break;
             /* Update */
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index 35173fea81d..3cd4815deaa 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -6,6 +6,22 @@
 #include <check.h>
 #include "cj5.h"
 
+#include <math.h>
+#include <float.h>
+
+/* vs2008 does not have INFINITY and NAN defined */
+#ifndef INFINITY
+# define INFINITY ((double)(DBL_MAX+DBL_MAX))
+#endif
+#ifndef NAN
+# define NAN ((double)(INFINITY-INFINITY))
+#endif
+
+#if defined(_MSC_VER)
+# pragma warning(disable: 4056)
+# pragma warning(disable: 4756)
+#endif
+
 START_TEST(parseObject) {
     const char *json = "{'a':1.0, 'b':2, 'c':'abcde'}";
     cj5_token tokens[32];
@@ -126,10 +142,14 @@ START_TEST(parseObjectCloseNoRoot) {
 } END_TEST
 
 START_TEST(parseArray) {
-    const char *json = "[1,2,3,null]";
+    const char *json = "[1.23456,2,3,null]";
     cj5_token tokens[32];
     cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
     ck_assert(r.error == CJ5_ERROR_NONE);
+
+    double val = 0;
+    cj5_get_float(&r, 1, &val);
+    ck_assert(fabs(val - 1.23456) < 0.00001);
 } END_TEST
 
 START_TEST(parseValue) {
@@ -139,6 +159,28 @@ START_TEST(parseValue) {
     ck_assert(r.error == CJ5_ERROR_NONE);
 } END_TEST
 
+START_TEST(parseInf) {
+    const char *json = "Infinity";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+
+    double val = 0;
+    cj5_get_float(&r, 0, &val);
+    ck_assert_msg(val == INFINITY, "val: %f", val);
+} END_TEST
+
+START_TEST(parseNegInf) {
+    const char *json = "-Infinity";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+
+    double val = 0;
+    cj5_get_float(&r, 0, &val);
+    ck_assert_msg(val == -INFINITY, "val: %f", val);
+} END_TEST
+
 static Suite *testSuite_builtin_json(void) {
     TCase *tc_parse= tcase_create("cj5_parse");
     tcase_add_test(tc_parse, parseObject);
@@ -153,6 +195,8 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_parse, parseObjectCloseNoRoot);
     tcase_add_test(tc_parse, parseArray);
     tcase_add_test(tc_parse, parseValue);
+    tcase_add_test(tc_parse, parseInf);
+    tcase_add_test(tc_parse, parseNegInf);
 
     Suite *s = suite_create("Test JSON decoding with the cj5 library");
     suite_add_tcase(s, tc_parse);

From 0d3b38187558a87a4c11d6fc8fc1e2ac5f562a98 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 02:01:50 +0200
Subject: [PATCH 0186/1963] fix(deps): Fix a casting warning in cj5.c

---
 deps/cj5.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 11a92292d3f..79cac9500bb 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -651,7 +651,7 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
             case 'r':  buf[outpos++] = '\r'; break;
             case 'n':  buf[outpos++] = '\n'; break;
             case 't':  buf[outpos++] = '\t'; break;
-            case 'u': // The next four characters are an utf8 code
+            case 'u': { // The next four characters are an utf8 code
                 if(pos + 4 >= end)
                     return CJ5_ERROR_INCOMPLETE;
                 
@@ -676,21 +676,22 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
                 if(utf <= 0x7F) { // Plain ASCII
                     buf[outpos++] = (char)utf;
                 } else if(utf <= 0x07FF) { // 2-byte unicode
-                    buf[outpos++] = (char) (((utf >> 6) & 0x1F) | 0xC0);
-                    buf[outpos++] = (char) (((utf >> 0) & 0x3F) | 0x80);
+                    buf[outpos++] = (char)(((utf >> 6) & 0x1F) | 0xC0);
+                    buf[outpos++] = (char)(((utf >> 0) & 0x3F) | 0x80);
                 } else if(utf <= 0xFFFF) { // 3-byte unicode
-                    buf[outpos++] = (char) (((utf >> 12) & 0x0F) | 0xE0);
-                    buf[outpos++] = (char) (((utf >>  6) & 0x3F) | 0x80);
-                    buf[outpos++] = (char) (((utf >>  0) & 0x3F) | 0x80);
+                    buf[outpos++] = (char)(((utf >> 12) & 0x0F) | 0xE0);
+                    buf[outpos++] = (char)(((utf >>  6) & 0x3F) | 0x80);
+                    buf[outpos++] = (char)(((utf >>  0) & 0x3F) | 0x80);
                 } else if(utf <= 0x10FFFF) { // 4-byte unicode
-                    buf[outpos++] = (char) (((utf >> 18) & 0x07) | 0xF0);
-                    buf[outpos++] = (char) (((utf >> 12) & 0x3F) | 0x80);
-                    buf[outpos++] = (char) (((utf >>  6) & 0x3F) | 0x80);
-                    buf[outpos++] = (char) (((utf >>  0) & 0x3F) | 0x80);
+                    buf[outpos++] = (char)(((utf >> 18) & 0x07) | 0xF0);
+                    buf[outpos++] = (char)(((utf >> 12) & 0x3F) | 0x80);
+                    buf[outpos++] = (char)(((utf >>  6) & 0x3F) | 0x80);
+                    buf[outpos++] = (char)(((utf >>  0) & 0x3F) | 0x80);
                 } else {
                     return CJ5_ERROR_INVALID; // Not a utf8 string
                 }
                 break;
+            }
             default:
                 return CJ5_ERROR_INVALID;
             }

From f4344d0a096c7403aab86267c6393be486f71c76 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 08:41:39 +0200
Subject: [PATCH 0187/1963] fix(core): Old MSVC need LL in the definition of
 UA_INT32_MIN

---
 include/open62541/types.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 3f673097c8e..f5b92bb14f1 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -85,8 +85,8 @@ typedef uint16_t UA_UInt16;
  * ^^^^^
  * An integer value between -2 147 483 648 and 2 147 483 647. */
 typedef int32_t UA_Int32;
-#define UA_INT32_MIN (-2147483648)
-#define UA_INT32_MAX 2147483647
+#define UA_INT32_MIN ((int32_t)-2147483648LL)
+#define UA_INT32_MAX 2147483647L
 
 /**
  * UInt32
@@ -94,7 +94,7 @@ typedef int32_t UA_Int32;
  * An integer value between 0 and 4 294 967 295. */
 typedef uint32_t UA_UInt32;
 #define UA_UINT32_MIN 0
-#define UA_UINT32_MAX 4294967295
+#define UA_UINT32_MAX 4294967295UL
 
 /**
  * Int64

From 6e7c4e920354e196785074a48b2bee9c07aa1475 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 08:43:03 +0200
Subject: [PATCH 0188/1963] fix(deps): Handling of JSON5 infinity in old MSVC
 needs to disable a warning

---
 deps/cj5.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 79cac9500bb..2f4266bf709 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -51,7 +51,12 @@
 # define NAN ((double)(INFINITY-INFINITY))
 #endif
 
-// Max nesting depth of objects and arrays
+#if defined(_MSC_VER)
+# pragma warning(disable: 4056)
+# pragma warning(disable: 4756)
+#endif
+
+/* Max nesting depth of objects and arrays */
 #define CJ5_MAX_NESTING 32
 
 #define CJ5__FOURCC(_a, _b, _c, _d)                         \

From 9250d8000e40942fb2bef4e61fa69757c880fbdf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 08:44:08 +0200
Subject: [PATCH 0189/1963] refactor(deps): Cosmetic improvements in cj5.c

---
 deps/cj5.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 2f4266bf709..5859562bd1a 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -67,21 +67,20 @@ static const uint32_t CJ5__NULL_FOURCC  = CJ5__FOURCC('n', 'u', 'l', 'l');
 static const uint32_t CJ5__TRUE_FOURCC  = CJ5__FOURCC('t', 'r', 'u', 'e');
 static const uint32_t CJ5__FALSE_FOURCC = CJ5__FOURCC('f', 'a', 'l', 's');
 
-typedef struct cj5__parser {
+typedef struct {
     unsigned int pos;
     unsigned int line_start;
     unsigned int line;
+    cj5_error_code error;
 
-    const char* json5;
+    const char *json5;
     unsigned int len;
 
     unsigned int curr_tok_idx;
 
-    cj5_token* tokens;
+    cj5_token *tokens;
     unsigned int token_count;
     unsigned int max_tokens;
-
-    cj5_error_code error;
 } cj5__parser;
 
 static CJ5_INLINE bool
@@ -665,11 +664,11 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
                 for(unsigned int i = 0; i < 4; i++) {
                     pos++;
                     uint8_t byte = (uint8_t)*pos;
-                    if(byte >= '0' && byte <= '9') {
+                    if(cj5__isrange(*pos, '0', '9')) {
                         byte = (uint8_t)(byte - (uint8_t)'0');
-                    } else if(byte >= 'a' && byte <='f') {
+                    } else if(cj5__isrange(*pos, 'a', 'f')) {
                         byte = (uint8_t)(byte - (uint8_t)('a' - 10));
-                    } else if(byte >= 'A' && byte <='F') {
+                    } else if(cj5__isrange(*pos, 'A', 'F')) {
                         byte = (uint8_t)(byte - (uint8_t)('A' - 10));
                     } else {
                         return CJ5_ERROR_INVALID;

From e48dd4caed00656ab66c5fa2d04b1689e956586d Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 31 May 2022 14:28:12 +0200
Subject: [PATCH 0190/1963] fix(pubsub): Free memory for sequence number

Memory for sequence number variables has been allocated in
ua_pubsub_networkmessage.c with UA_Variant_setScalarCopy, but not
freed.
---
 src/pubsub/ua_pubsub_readergroup.c | 4 +++-
 src/pubsub/ua_pubsub_writergroup.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 83527bf662a..5e94a7d2d48 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -627,7 +627,9 @@ UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
         for(size_t i = 0; i < dataSetReader->bufferedMessage.offsetsSize; i++) {
             UA_NetworkMessageOffset *offset = &dataSetReader->bufferedMessage.offsets[i];
             if((offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT) ||
-                (offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW)) {
+                (offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW) ||
+                (offset->contentType == UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER) ||
+                (offset->contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER)) {
                 UA_DataValue_delete(offset->offsetData.value.value);
             } else if(offset->contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING) {
                 offset->offsetData.value.value->value.data = NULL;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index aa2ed08bb09..e258c94297a 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -613,7 +613,9 @@ UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
     if(writerGroup->bufferedMessage.offsetsSize > 0){
         for(size_t i = 0; i < writerGroup->bufferedMessage.offsetsSize; i++) {
             if((writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT) ||
-                (writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW)) {
+                (writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW) ||
+                (writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER) ||
+                (writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER)) {
                 UA_DataValue_delete(writerGroup->bufferedMessage.offsets[i].offsetData.value.value);
             } else if(writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING) {
                 writerGroup->bufferedMessage.offsets[i].offsetData.value.value->value.data = NULL;

From fa789aa5b6095aedff0501ebfa88c07decaad99c Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Fri, 3 Jun 2022 08:02:34 +0200
Subject: [PATCH 0191/1963] fix(pubsub): Init memory after creation of groups

Initialize memory after creation so that all fields can be checked
at unfreeze even if freeze failed.
---
 src/pubsub/ua_pubsub_readergroup.c | 1 +
 src/pubsub/ua_pubsub_writergroup.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 5e94a7d2d48..8285f0103d3 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -129,6 +129,7 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
     if(!newGroup)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
+    memset(newGroup, 0, sizeof(UA_ReaderGroup));
     newGroup->componentType = UA_PUBSUB_COMPONENT_READERGROUP;
     /* Generate nodeid for the readergroup identifier */
     newGroup->linkedConnection = currentConnectionContext->identifier;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index e258c94297a..89c1bbb087f 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -82,6 +82,7 @@ UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
     if(!newWriterGroup)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
+    memset(newWriterGroup, 0, sizeof(UA_WriterGroup));
     newWriterGroup->componentType = UA_PUBSUB_COMPONENT_WRITERGROUP;
     newWriterGroup->linkedConnection = currentConnectionContext;
 

From 1e10f8b57c55bb7e9399bb879e3f7b154a52de7b Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Fri, 3 Jun 2022 08:03:43 +0200
Subject: [PATCH 0192/1963] fix(pubsub): Check freeze state of writer group

Check freeze state of writer group in UA_PubSubManager_delete to
inhibit double call of UA_Server_unfreezeWriterGroupConfiguration.
---
 src/pubsub/ua_pubsub_writergroup.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 89c1bbb087f..d1dfc04ba1c 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -377,19 +377,24 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
+
+    /* Already unfrozen */
+    if(!wg->configurationFrozen)
+        return UA_STATUSCODE_GOOD;
+    
     //if(wg->config.rtLevel == UA_PUBSUB_RT_NONE){
     //    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
     //                   "PubSub configuration freeze without RT configuration has no effect.");
     //    return UA_STATUSCODE_BADCONFIGURATIONERROR;
     //}
     //PubSubConnection freezeCounter--
+
     UA_PubSubConnection *pubSubConnection =  wg->linkedConnection;
     pubSubConnection->configurationFreezeCounter--;
     if(pubSubConnection->configurationFreezeCounter == 0){
         pubSubConnection->configurationFrozen = UA_FALSE;
     }
-    //WriterGroup unfreeze
-    wg->configurationFrozen = UA_FALSE;
+
     //DataSetWriter unfreeze
     UA_DataSetWriter *dataSetWriter;
     LIST_FOREACH(dataSetWriter, &wg->writers, listEntry) {
@@ -421,6 +426,8 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
 #endif
     }
 
+    wg->configurationFrozen = false;
+
     return UA_STATUSCODE_GOOD;
 }
 

From 6a4035a2d0a1d1f840eabf254b7fad53258c703e Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 31 May 2022 14:29:04 +0200
Subject: [PATCH 0193/1963] fix(pubsub): Symmetric free of WG bufferedMessage

bufferedMessage is initialized in
UA_Server_freezeWriterGroupConfiguration, so it shall be cleared in
UA_Server_unfreezeWriterGroupConfiguration instead of
UA_WriterGroup_clear.
---
 src/pubsub/ua_pubsub_networkmessage.c | 40 +++++++++++++++++++++++++++
 src/pubsub/ua_pubsub_networkmessage.h |  9 ++++--
 src/pubsub/ua_pubsub_writergroup.c    | 34 ++++-------------------
 3 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 9b0ee96dca0..f70b66074ba 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1756,4 +1756,44 @@ UA_DataSetMessage_clear(const UA_DataSetMessage* p) {
         }
     }
 }
+
+void
+UA_NetworkMessageOffsetBuffer_clear(UA_NetworkMessageOffsetBuffer *nmob) {
+    UA_ByteString_clear(&nmob->buffer);
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    if(nmob->nm) {
+        UA_NetworkMessage_clear(&nmob->nm);
+        UA_free(nmob->nm);
+        nmob->nm = NULL;
+    }
+    UA_ByteString_clear(&nmob->encryptBuffer);
+#endif
+
+    if(nmob->offsetsSize == 0)
+        return;
+
+    for(size_t i = 0; i < nmob->offsetsSize; i++) {
+        UA_NetworkMessageOffset *offset = &nmob->offsets[i];
+        if(offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT ||
+           offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW ||
+           offset->contentType == UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER ||
+           offset->contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER) {
+            UA_DataValue_delete(offset->offsetData.value.value);
+            continue;
+        }
+
+        if(offset->contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING) {
+            offset->offsetData.value.value->value.data = NULL;
+            UA_DataValue_delete(offset->offsetData.value.value);
+        }
+    }
+
+    UA_free(nmob->offsets);
+    nmob->offsets = NULL;
+    nmob->offsetsSize = 0;
+}
+
+
 #endif /* UA_ENABLE_PUBSUB */
+
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 64369d1d6ff..875a0d2d06a 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -218,15 +218,20 @@ typedef struct {
     UA_ByteString buffer; /* The precomputed message buffer */
     UA_NetworkMessageOffset *offsets; /* Offsets for changes in the message buffer */
     size_t offsetsSize;
-    UA_Boolean RTsubscriberEnabled; /* Addtional offsets computation like publisherId, WGId if this bool enabled */
+    UA_Boolean RTsubscriberEnabled; /* Addtional offsets computation like
+                                     * publisherId, WGId if this bool enabled */
     UA_NetworkMessage *nm; /* The precomputed NetworkMessage for subscriber */
     size_t rawMessageLength;
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-    UA_ByteString encryptBuffer; /* The precomputed message buffer is copied into the encrypt buffer for encryption and signing*/
+    UA_ByteString encryptBuffer; /* The precomputed message buffer is copied
+                                  * into the encrypt buffer for encryption and
+                                  * signing*/
     UA_Byte *payloadPosition; /* Payload Position of the message to encrypt*/
 #endif
 } UA_NetworkMessageOffsetBuffer;
 
+void UA_NetworkMessageOffsetBuffer_clear(UA_NetworkMessageOffsetBuffer *nmob);
+
 /**
  * DataSetMessage
  * ^^^^^^^^^^^^^^ */
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index d1dfc04ba1c..a1108bfa10e 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -413,18 +413,8 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
             dataSetWriter->configurationFrozen = UA_FALSE;
         }
     }
-    if(wg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
-        UA_ByteString_clear(&wg->bufferedMessage.buffer);
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-        if (wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
-            if (wg->bufferedMessage.nm != NULL) {
-                UA_ByteString_clear(&wg->bufferedMessage.nm->securityHeader.messageNonce);
-                UA_free(wg->bufferedMessage.nm);
-            }
-            UA_ByteString_clear(&wg->bufferedMessage.encryptBuffer);
-        }
-#endif
-    }
+
+    UA_NetworkMessageOffsetBuffer_clear(&wg->bufferedMessage);
 
     wg->configurationFrozen = false;
 
@@ -597,7 +587,7 @@ UA_Server_setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writer
 #endif
 
 void
-UA_WriterGroupConfig_clear(UA_WriterGroupConfig *writerGroupConfig){
+UA_WriterGroupConfig_clear(UA_WriterGroupConfig *writerGroupConfig) {
     UA_String_clear(&writerGroupConfig->name);
     UA_ExtensionObject_clear(&writerGroupConfig->transportSettings);
     UA_ExtensionObject_clear(&writerGroupConfig->messageSettings);
@@ -618,28 +608,14 @@ UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
         UA_Server_removeDataSetWriter(server, dataSetWriter->identifier);
     }
 
-    if(writerGroup->bufferedMessage.offsetsSize > 0){
-        for(size_t i = 0; i < writerGroup->bufferedMessage.offsetsSize; i++) {
-            if((writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT) ||
-                (writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW) ||
-                (writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER) ||
-                (writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER)) {
-                UA_DataValue_delete(writerGroup->bufferedMessage.offsets[i].offsetData.value.value);
-            } else if(writerGroup->bufferedMessage.offsets[i].contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING) {
-                writerGroup->bufferedMessage.offsets[i].offsetData.value.value->value.data = NULL;
-                UA_DataValue_delete(writerGroup->bufferedMessage.offsets[i].offsetData.value.value);
-            }
-        }
-        UA_ByteString_clear(&writerGroup->bufferedMessage.buffer);
-        UA_free(writerGroup->bufferedMessage.offsets);
-    }
-
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     if(writerGroup->config.securityPolicy && writerGroup->securityPolicyContext) {
         writerGroup->config.securityPolicy->deleteContext(writerGroup->securityPolicyContext);
         writerGroup->securityPolicyContext = NULL;
     }
 #endif
+
+    UA_NetworkMessageOffsetBuffer_clear(&writerGroup->bufferedMessage);
 }
 
 UA_StatusCode

From 802f19d6e1c96ccd7ec69ba246d1e3c44d23bf11 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 31 May 2022 14:29:51 +0200
Subject: [PATCH 0194/1963] fix(pubsub): Free memory for dataSetPayloadHeader

dataSetWriterIds and dataSetPayload.sizes in payload header are set
irrespective of the variable payloadHeaderEnabled, thus the buffer
also has to be freed independently of this variable.
---
 src/pubsub/ua_pubsub_networkmessage.c | 66 +++++++++++++--------------
 src/pubsub/ua_pubsub_networkmessage.h |  2 +-
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index f70b66074ba..4afd213192c 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -736,8 +736,9 @@ UA_ExtendedNetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *o
     return UA_STATUSCODE_GOOD;
 
 error:
-    if (dst->promotedFields) {
+    if(dst->promotedFields) {
         UA_free(dst->promotedFields);
+        dst->promotedFields = NULL;
     }
     return rv;
 }
@@ -1105,43 +1106,38 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p, UA_NetworkMessageOffsetBu
 
 void
 UA_NetworkMessage_clear(UA_NetworkMessage* p) {
-    if(p->promotedFieldsEnabled)
-        UA_Array_delete(p->promotedFields, p->promotedFieldsSize, &UA_TYPES[UA_TYPES_VARIANT]);
+    if(p->promotedFieldsEnabled) {
+        UA_Array_delete(p->promotedFields, p->promotedFieldsSize,
+                        &UA_TYPES[UA_TYPES_VARIANT]);
+    }
 
     if(p->networkMessageType == UA_NETWORKMESSAGE_DATASET) {
-        if(p->payloadHeaderEnabled) {
-            if(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != NULL) {
-                UA_Array_delete(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds,
-                                p->payloadHeader.dataSetPayloadHeader.count, &UA_TYPES[UA_TYPES_UINT16]);
-            }
-            if(p->payload.dataSetPayload.sizes != NULL) { 
-                UA_Array_delete(p->payload.dataSetPayload.sizes,
-                                p->payloadHeader.dataSetPayloadHeader.count, &UA_TYPES[UA_TYPES_UINT16]);
-            }
-        }
+        if(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds)
+            UA_free(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds);
+
+        if(p->payload.dataSetPayload.sizes)
+            UA_free(p->payload.dataSetPayload.sizes);
 
         if(p->payload.dataSetPayload.dataSetMessages) {
             UA_Byte count = 1;
             if(p->payloadHeaderEnabled)
                 count = p->payloadHeader.dataSetPayloadHeader.count;
-            
             for(size_t i = 0; i < count; i++)
-                UA_DataSetMessage_clear(&(p->payload.dataSetPayload.dataSetMessages[i]));
-
+                UA_DataSetMessage_clear(&p->payload.dataSetPayload.dataSetMessages[i]);
             UA_free(p->payload.dataSetPayload.dataSetMessages);
         }
     }
 
-    if(p->securityHeader.securityFooterEnabled && (p->securityHeader.securityFooterSize > 0))
+    if(p->securityHeader.securityFooterEnabled &&
+       p->securityHeader.securityFooterSize > 0)
         UA_ByteString_clear(&p->securityFooter);
 
-    if(p->messageIdEnabled){
-           UA_String_clear(&p->messageId);
-    }
+    if(p->messageIdEnabled)
+        UA_String_clear(&p->messageId);
 
-    if(p->publisherIdEnabled && p->publisherIdType == UA_PUBLISHERDATATYPE_STRING){
+    if(p->publisherIdEnabled &&
+       p->publisherIdType == UA_PUBLISHERDATATYPE_STRING)
        UA_String_clear(&p->publisherId.publisherIdString);
-    }
 
     memset(p, 0, sizeof(UA_NetworkMessage));
 }
@@ -1729,44 +1725,48 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
 }
 
 void
-UA_DataSetMessage_clear(const UA_DataSetMessage* p) {
+UA_DataSetMessage_clear(UA_DataSetMessage* p) {
     if(p->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
-        if(p->data.keyFrameData.dataSetFields != NULL) {
+        if(p->data.keyFrameData.dataSetFields) {
             UA_Array_delete(p->data.keyFrameData.dataSetFields,
                             p->data.keyFrameData.fieldCount,
                             &UA_TYPES[UA_TYPES_DATAVALUE]);
         }
 
         /* Json keys */
-        if(p->data.keyFrameData.fieldNames != NULL){
+        if(p->data.keyFrameData.fieldNames){
             UA_Array_delete(p->data.keyFrameData.fieldNames,
                             p->data.keyFrameData.fieldCount,
                             &UA_TYPES[UA_TYPES_STRING]);
         }
     } else if(p->header.dataSetMessageType == UA_DATASETMESSAGE_DATADELTAFRAME) {
-        if(p->data.deltaFrameData.deltaFrameFields != NULL) {
+        if(p->data.deltaFrameData.deltaFrameFields) {
             for(UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
+                UA_DataSetMessage_DeltaFrameField *f =
+                    &p->data.deltaFrameData.deltaFrameFields[i];
                 if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-                    UA_DataValue_clear(&p->data.deltaFrameData.deltaFrameFields[i].fieldValue);
+                    UA_DataValue_clear(&f->fieldValue);
                 } else if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-                    UA_Variant_clear(&p->data.deltaFrameData.deltaFrameFields[i].fieldValue.value);
+                    UA_Variant_clear(&f->fieldValue.value);
                 }
             }
             UA_free(p->data.deltaFrameData.deltaFrameFields);
         }
     }
+
+    memset(p, 0, sizeof(UA_DataSetMessage));
 }
 
 void
 UA_NetworkMessageOffsetBuffer_clear(UA_NetworkMessageOffsetBuffer *nmob) {
     UA_ByteString_clear(&nmob->buffer);
 
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     if(nmob->nm) {
-        UA_NetworkMessage_clear(&nmob->nm);
+        UA_NetworkMessage_clear(nmob->nm);
         UA_free(nmob->nm);
-        nmob->nm = NULL;
     }
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_ByteString_clear(&nmob->encryptBuffer);
 #endif
 
@@ -1790,8 +1790,8 @@ UA_NetworkMessageOffsetBuffer_clear(UA_NetworkMessageOffsetBuffer *nmob) {
     }
 
     UA_free(nmob->offsets);
-    nmob->offsets = NULL;
-    nmob->offsetsSize = 0;
+
+    memset(nmob, 0, sizeof(UA_NetworkMessageOffsetBuffer));
 }
 
 
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 875a0d2d06a..c944632dc9b 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -259,7 +259,7 @@ size_t
 UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage *p, UA_NetworkMessageOffsetBuffer *offsetBuffer,
                                  size_t currentOffset);
 
-void UA_DataSetMessage_clear(const UA_DataSetMessage* p);
+void UA_DataSetMessage_clear(UA_DataSetMessage* p);
 
 /**
  * NetworkMessage

From 2c2241945f6842a2571de9b345b52cd117e07e80 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 16:12:42 +0200
Subject: [PATCH 0195/1963] refactor(pubsub): Simplify cleaning up ReaderGroups

---
 src/pubsub/ua_pubsub_readergroup.c | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 8285f0103d3..0b8f660cf39 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -618,32 +618,7 @@ UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
     UA_DataSetReader *dataSetReader;
     LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
         dataSetReader->configurationFrozen = UA_FALSE;
-    }
-
-    if(rg->config.rtLevel != UA_PUBSUB_RT_FIXED_SIZE)
-        return UA_STATUSCODE_GOOD;
-
-    dataSetReader = LIST_FIRST(&rg->readers);
-    if(dataSetReader->bufferedMessage.offsetsSize > 0) {
-        for(size_t i = 0; i < dataSetReader->bufferedMessage.offsetsSize; i++) {
-            UA_NetworkMessageOffset *offset = &dataSetReader->bufferedMessage.offsets[i];
-            if((offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT) ||
-                (offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW) ||
-                (offset->contentType == UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER) ||
-                (offset->contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER)) {
-                UA_DataValue_delete(offset->offsetData.value.value);
-            } else if(offset->contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING) {
-                offset->offsetData.value.value->value.data = NULL;
-                UA_DataValue_delete(offset->offsetData.value.value);
-            }
-        }
-        UA_free(dataSetReader->bufferedMessage.offsets);
-    }
-
-    if(dataSetReader->bufferedMessage.RTsubscriberEnabled &&
-       dataSetReader->bufferedMessage.nm) {
-        UA_NetworkMessage_delete(dataSetReader->bufferedMessage.nm);
-        UA_free(dataSetReader->bufferedMessage.nm);
+        UA_NetworkMessageOffsetBuffer_clear(&dataSetReader->bufferedMessage);
     }
 
     return UA_STATUSCODE_GOOD;

From dfcc0b0e2f06335009b86683a0c8eac711f7b50d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 16:13:10 +0200
Subject: [PATCH 0196/1963] refactor(pubsub): Remove unused
 UA_NetworkMessage_delete

---
 src/pubsub/ua_pubsub_networkmessage.c | 4 ----
 src/pubsub/ua_pubsub_networkmessage.h | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 4afd213192c..3424853e4ab 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1142,10 +1142,6 @@ UA_NetworkMessage_clear(UA_NetworkMessage* p) {
     memset(p, 0, sizeof(UA_NetworkMessage));
 }
 
-void UA_NetworkMessage_delete(UA_NetworkMessage* p) {
-    UA_NetworkMessage_clear(p);
-}
-
 UA_Boolean
 UA_NetworkMessage_ExtendedFlags1Enabled(const UA_NetworkMessage* src) {
     UA_Boolean retval = false;
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index c944632dc9b..3d14410e4f8 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -333,10 +333,6 @@ UA_NetworkMessage_signEncrypt(UA_NetworkMessage *nm, UA_MessageSecurityMode secu
 void
 UA_NetworkMessage_clear(UA_NetworkMessage* p);
 
-void
-UA_NetworkMessage_delete(UA_NetworkMessage* p);
-
-
 #ifdef UA_ENABLE_JSON_ENCODING
 UA_StatusCode
 UA_NetworkMessage_encodeJson(const UA_NetworkMessage *src,

From b4a1cea573a86681e6d240871f53fc7c6c365e5a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 17:49:08 +0200
Subject: [PATCH 0197/1963] refactor(pubsub): Improved thread-safety for PubSub

---
 .../pubsub/tutorial_pubsub_mqtt_publish.c     | 10 -----
 .../nodeset/pubsub_nodeset_rt_publisher.c     |  4 +-
 .../pubsub_realtime/pubsub_TSN_loopback.c     |  4 +-
 .../pubsub_TSN_loopback_single_thread.c       |  4 +-
 .../pubsub_realtime/pubsub_TSN_publisher.c    |  4 +-
 .../pubsub_TSN_publisher_multiple_thread.c    |  4 +-
 include/open62541/server_pubsub.h             |  4 +-
 src/pubsub/ua_pubsub.h                        | 11 +++++
 src/pubsub/ua_pubsub_config.c                 |  5 ++-
 src/pubsub/ua_pubsub_reader.c                 | 10 ++++-
 src/pubsub/ua_pubsub_readergroup.c            |  2 +-
 src/pubsub/ua_pubsub_writer.c                 | 43 ++++++++++++++-----
 12 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index db39f2a5078..eaeb52f6f63 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -44,8 +44,6 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include "ua_pubsub.h"
-
 #include <signal.h>
 
 #include <open62541/plugin/pubsub_mqtt.h>
@@ -471,14 +469,6 @@ int main(int argc, char **argv) {
         return EXIT_FAILURE;
     }
     addDataSetWriter(server, topic);
-    UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdent);
-
-    if(!connection) {
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                       "Could not create a PubSubConnection");
-        UA_Server_delete(server);
-        return -1;
-    }
 
     UA_Server_run(server, &running);
     UA_Server_delete(server);
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
index 5638d743838..19020dd6dc3 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
@@ -295,7 +295,7 @@ addPublishedDataSet(UA_Server *server) {
 /* This example only uses two addDataSetField which uses the custom nodes of the XML file
  * (pubDataModel.xml) */
 static void
-addDataSetField(UA_Server *server) {
+_addDataSetField(UA_Server *server) {
     UA_NodeId dataSetFieldIdent;
     UA_DataSetFieldConfig dsfConfig;
     memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -683,7 +683,7 @@ int main(int argc, char **argv) {
 
     addPubSubConnection(server, &networkAddressUrlPub);
     addPublishedDataSet(server);
-    addDataSetField(server);
+    _addDataSetField(server);
     addWriterGroup(server);
     addDataSetWriter(server);
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index cb6ece45db6..65b3ea19aea 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -766,7 +766,7 @@ addPublishedDataSet(UA_Server *server) {
 
 /* DataSetField handling */
 static void
-addDataSetField(UA_Server *server) {
+_addDataSetField(UA_Server *server) {
     /* Add a field to the previous created PublishedDataSet */
     UA_NodeId dataSetFieldIdent1;
     UA_DataSetFieldConfig dataSetFieldConfig;
@@ -1682,7 +1682,7 @@ if(enableCsvLog)
 #if defined(PUBLISHER)
     addPubSubConnection(server, &networkAddressUrlPub);
     addPublishedDataSet(server);
-    addDataSetField(server);
+    _addDataSetField(server);
     addWriterGroup(server);
     addDataSetWriter(server);
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index 23034a0b403..bbf5c21b614 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -620,7 +620,7 @@ addPublishedDataSet(UA_Server *server) {
 
 /* DataSetField handling */
 static void
-addDataSetField(UA_Server *server) {
+_addDataSetField(UA_Server *server) {
     /* Add a field to the previous created PublishedDataSet */
     UA_NodeId dataSetFieldIdent1;
     UA_DataSetFieldConfig dataSetFieldConfig;
@@ -1327,7 +1327,7 @@ int main(int argc, char **argv) {
 #ifdef TWO_WAY_COMMUNICATION
     addPubSubConnection(server, &transportProfile, &networkAddressUrlPub);
     addPublishedDataSet(server);
-    addDataSetField(server);
+    _addDataSetField(server);
     addWriterGroup(server);
     addDataSetWriter(server);
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index ad695c41d78..8d9dd410fc6 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -758,7 +758,7 @@ addPublishedDataSet(UA_Server *server) {
 
 /* DataSetField handling */
 static void
-addDataSetField(UA_Server *server) {
+_addDataSetField(UA_Server *server) {
     /* Add a field to the previous created PublishedDataSet */
     UA_NodeId dataSetFieldIdentRepeated;
     UA_DataSetFieldConfig dataSetFieldConfig;
@@ -1751,7 +1751,7 @@ int main(int argc, char **argv) {
 #if defined(PUBLISHER)
     addPubSubConnection(server, &networkAddressUrlPub);
     addPublishedDataSet(server);
-    addDataSetField(server);
+    _addDataSetField(server);
     addWriterGroup(server);
     addDataSetWriter(server);
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index 89f21ee7a98..7df245784ff 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -630,7 +630,7 @@ addPublishedDataSet(UA_Server *server) {
 
 /* DataSetField handling */
 static void
-addDataSetField(UA_Server *server) {
+_addDataSetField(UA_Server *server) {
     /* Add a field to the previous created PublishedDataSet */
     UA_NodeId dataSetFieldIdent1;
     UA_DataSetFieldConfig dataSetFieldConfig;
@@ -1416,7 +1416,7 @@ int main(int argc, char **argv) {
 
     addPubSubConnection(server, &transportProfile, &networkAddressUrlPub);
     addPublishedDataSet(server);
-    addDataSetField(server);
+    _addDataSetField(server);
     addWriterGroup(server);
     addDataSetWriter(server);
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index d0f92d78805..24dc0c3773c 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -384,7 +384,7 @@ typedef struct {
     UA_ConfigurationVersionDataType configurationVersion;
 } UA_DataSetFieldResult;
 
-UA_DataSetFieldResult UA_EXPORT
+UA_DataSetFieldResult UA_EXPORT UA_THREADSAFE
 UA_Server_addDataSetField(UA_Server *server,
                           const UA_NodeId publishedDataSet,
                           const UA_DataSetFieldConfig *fieldConfig,
@@ -395,7 +395,7 @@ UA_StatusCode UA_EXPORT
 UA_Server_getDataSetFieldConfig(UA_Server *server, const UA_NodeId dsf,
                                 UA_DataSetFieldConfig *config);
 
-UA_DataSetFieldResult UA_EXPORT
+UA_DataSetFieldResult UA_EXPORT UA_THREADSAFE
 UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf);
 
 /**
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 53fdd67df0f..0c804b6ea62 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -219,6 +219,14 @@ UA_DataSetFieldConfig_copy(const UA_DataSetFieldConfig *src,
 UA_DataSetField *
 UA_DataSetField_findDSFbyId(UA_Server *server, UA_NodeId identifier);
 
+UA_DataSetFieldResult
+addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
+                const UA_DataSetFieldConfig *fieldConfig,
+                UA_NodeId *fieldIdentifier);
+
+UA_DataSetFieldResult
+removeDataSetField(UA_Server *server, const UA_NodeId dsf);
+
 /**********************************************/
 /*               DataSetReader                */
 /**********************************************/
@@ -251,6 +259,9 @@ UA_DataSetReader_process(UA_Server *server,
                          UA_DataSetReader *dataSetReader,
                          UA_DataSetMessage *dataSetMsg);
 
+UA_StatusCode
+removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier);
+
 /* Copy the configuration of DataSetReader */
 UA_StatusCode UA_DataSetReaderConfig_copy(const UA_DataSetReaderConfig *src,
                                           UA_DataSetReaderConfig *dst);
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index bccc71b394b..2def24b5091 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -745,14 +745,15 @@ addDataSetFieldVariables(UA_Server *server, const UA_NodeId *pdsIdent,
         UA_DataSetFieldConfig fc;
         memset(&fc, 0, sizeof(UA_DataSetFieldConfig));
         fc.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-        fc.field.variable.configurationVersion = pdsParams->dataSetMetaData.configurationVersion;
+        fc.field.variable.configurationVersion =
+            pdsParams->dataSetMetaData.configurationVersion;
         fc.field.variable.fieldNameAlias = pdsParams->dataSetMetaData.fields[i].name;
         fc.field.variable.promotedField = pdsParams->dataSetMetaData.
             fields[i].fieldFlags & 0x0001;
         fc.field.variable.publishParameters = pdItems->publishedData[i];
 
         UA_NodeId fieldIdent;
-        UA_StatusCode res = UA_Server_addDataSetField(server, *pdsIdent, &fc, &fieldIdent).result;
+        UA_StatusCode res = addDataSetField(server, *pdsIdent, &fc, &fieldIdent).result;
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addDataSetFieldVariables] "
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 5fcf2d2fdd5..094b71fc27b 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -471,7 +471,7 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
 }
 
 UA_StatusCode
-UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
+removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     /* Remove datasetreader given by the identifier */
     UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
     if(!dsr)
@@ -518,6 +518,14 @@ UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     return res;
 }
 
+UA_StatusCode
+UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = removeDataSetReader(server, readerIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                      UA_NodeId readerGroupIdentifier,
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 0b8f660cf39..5e1e721aeec 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -240,7 +240,7 @@ UA_Server_ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup) {
     UA_DataSetReader *dataSetReader;
     UA_DataSetReader *tmpDataSetReader;
     LIST_FOREACH_SAFE(dataSetReader, &readerGroup->readers, listEntry, tmpDataSetReader) {
-        UA_Server_removeDataSetReader(server, dataSetReader->identifier);
+        removeDataSetReader(server, dataSetReader->identifier);
     }
     UA_PubSubConnection* pConn =
         UA_PubSubConnection_findConnectionbyId(server, readerGroup->linkedConnection);
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index e0a9bbbc3b7..7616ee6836d 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -110,7 +110,7 @@ UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection) {
     /* Remove ReaderGroups */
     UA_ReaderGroup *readerGroups, *tmpReaderGroup;
     LIST_FOREACH_SAFE(readerGroups, &connection->readerGroups, listEntry, tmpReaderGroup)
-        UA_Server_removeReaderGroup(server, readerGroups->identifier);
+        removeReaderGroup(server, readerGroups->identifier);
 
     UA_NodeId_clear(&connection->identifier);
     if(connection->channel)
@@ -235,7 +235,7 @@ void
 UA_PublishedDataSet_clear(UA_Server *server, UA_PublishedDataSet *publishedDataSet) {
     UA_DataSetField *field, *tmpField;
     TAILQ_FOREACH_SAFE(field, &publishedDataSet->fields, listEntry, tmpField) {
-        UA_Server_removeDataSetField(server, field->identifier);
+        removeDataSetField(server, field->identifier);
     }
     UA_PublishedDataSetConfig_clear(&publishedDataSet->config);
     UA_DataSetMetaDataType_clear(&publishedDataSet->dataSetMetaData);
@@ -289,7 +289,8 @@ generateFieldMetaData(UA_Server *server, UA_DataSetField *field,
     const UA_PublishedVariableDataType *pp = &var->publishParameters;
     UA_Variant value;
     UA_Variant_init(&value);
-    res = UA_Server_readArrayDimensions(server, pp->publishedVariable, &value);
+    res = readWithReadValue(server, &pp->publishedVariable,
+                            UA_ATTRIBUTEID_ARRAYDIMENSIONS, &value);
     UA_CHECK_STATUS_LOG(res, return res,
                         WARNING, &server->config.logger, UA_LOGCATEGORY_SERVER,
                         "PubSub meta data generation. Reading the array dimensions failed.");
@@ -305,8 +306,8 @@ generateFieldMetaData(UA_Server *server, UA_DataSetField *field,
     fieldMetaData->arrayDimensionsSize = value.arrayDimensionsSize;
 
     /* Set the DataType */
-    res = UA_Server_readDataType(server, pp->publishedVariable,
-                                 &fieldMetaData->dataType);
+    res = readWithReadValue(server, &pp->publishedVariable,
+                            UA_ATTRIBUTEID_DATATYPE, &fieldMetaData->dataType);
     UA_CHECK_STATUS_LOG(res, return res,
                         WARNING, &server->config.logger, UA_LOGCATEGORY_SERVER,
                         "PubSub meta data generation. Reading the datatype failed.");
@@ -330,7 +331,8 @@ generateFieldMetaData(UA_Server *server, UA_DataSetField *field,
 
     /* Set the ValueRank */
     UA_Int32 valueRank;
-    res = UA_Server_readValueRank(server, pp->publishedVariable, &valueRank);
+    res = readWithReadValue(server, &pp->publishedVariable,
+                            UA_ATTRIBUTEID_VALUERANK, &valueRank);
     UA_CHECK_STATUS_LOG(res, return res,
                         WARNING, &server->config.logger, UA_LOGCATEGORY_SERVER,
                         "PubSub meta data generation. Reading the value rank failed.");
@@ -354,9 +356,9 @@ generateFieldMetaData(UA_Server *server, UA_DataSetField *field,
 }
 
 UA_DataSetFieldResult
-UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
-                          const UA_DataSetFieldConfig *fieldConfig,
-                          UA_NodeId *fieldIdentifier) {
+addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
+                const UA_DataSetFieldConfig *fieldConfig,
+                UA_NodeId *fieldIdentifier) {
     UA_DataSetFieldResult result = {0};
     if(!fieldConfig) {
         result.result = UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -453,7 +455,18 @@ UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
 }
 
 UA_DataSetFieldResult
-UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
+UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
+                          const UA_DataSetFieldConfig *fieldConfig,
+                          UA_NodeId *fieldIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_DataSetFieldResult res =
+        addDataSetField(server, publishedDataSet, fieldConfig, fieldIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_DataSetFieldResult
+removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
     UA_DataSetFieldResult result = {0};
 
     UA_DataSetField *currentField = UA_DataSetField_findDSFbyId(server, dsf);
@@ -542,6 +555,14 @@ UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
     return result;
 }
 
+UA_DataSetFieldResult
+UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
+    UA_LOCK(&server->serviceMutex);
+    UA_DataSetFieldResult res = removeDataSetField(server, dsf);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /**********************************************/
 /*               DataSetWriter                */
 /**********************************************/
@@ -1019,7 +1040,7 @@ UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
         rvid.nodeId = params->publishedVariable;
         rvid.attributeId = params->attributeId;
         rvid.indexRange = params->indexRange;
-        *value = UA_Server_read(server, &rvid, UA_TIMESTAMPSTORETURN_BOTH);
+        *value = readAttribute(server, &rvid, UA_TIMESTAMPSTORETURN_BOTH);
     } else {
         *value = **field->config.field.variable.rtValueSource.staticValueSource;
         value->value.storageType = UA_VARIANT_DATA_NODELETE;

From faa86ab7767f459e56858ef8996bace321303e28 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 23:36:49 +0200
Subject: [PATCH 0198/1963] feat(pubsub): Don't freeze already frozen
 ReaderGroup and WriterGroup

---
 src/pubsub/ua_pubsub_readergroup.c | 3 +++
 src/pubsub/ua_pubsub_writergroup.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 5e1e721aeec..0b640286a78 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -456,6 +456,9 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
     if(!rg)
         return UA_STATUSCODE_BADNOTFOUND;
 
+    if(rg->configurationFrozen)
+        return UA_STATUSCODE_GOOD;
+
     /* PubSubConnection freezeCounter++ */
     UA_NodeId pubSubConnectionId =  rg->linkedConnection;
     UA_PubSubConnection *pubSubConnection =
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index a1108bfa10e..fa79b0c4854 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -182,6 +182,9 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
 
+    if(wg->configurationFrozen)
+        return UA_STATUSCODE_GOOD;
+
     /* PubSubConnection freezeCounter++ */
     UA_PubSubConnection *pubSubConnection =  wg->linkedConnection;
     pubSubConnection->configurationFreezeCounter++;

From 8448e1ab2d8f37aa8107228d02eead5c407e0b43 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 23:38:25 +0200
Subject: [PATCH 0199/1963] refactor(pubsub): Small cosmetic improvements

---
 src/pubsub/ua_pubsub_reader.c      | 11 +++++++----
 src/pubsub/ua_pubsub_readergroup.c |  7 +++++--
 src/pubsub/ua_pubsub_writergroup.c | 15 +++++++++------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 094b71fc27b..eb51581ba0e 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -212,13 +212,16 @@ UA_DataSetReader_generateDataSetMessage(UA_Server *server,
     }
 
     /* Not supported for Delta frames atm */
-    return UA_PubSubDataSetReader_generateKeyFrameMessage(server, dataSetMessage, dataSetReader);
+    return UA_PubSubDataSetReader_generateKeyFrameMessage(server, dataSetMessage,
+                                                          dataSetReader);
 }
 
 UA_StatusCode
-UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection, UA_ReaderGroup *readerGroup,
-                                        UA_DataSetReader *dataSetReader, UA_DataSetMessage *dsm, UA_UInt16 *writerId, UA_Byte dsmCount,
-                                        UA_NetworkMessage *nm) {
+UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
+                                        UA_ReaderGroup *readerGroup,
+                                        UA_DataSetReader *dataSetReader,
+                                        UA_DataSetMessage *dsm, UA_UInt16 *writerId,
+                                        UA_Byte dsmCount, UA_NetworkMessage *nm) {
     UA_ExtensionObject *settings = &dataSetReader->config.messageSettings;
     if(settings->content.decoded.type != &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE])
         return UA_STATUSCODE_BADNOTSUPPORTED;
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 0b640286a78..e46ef1548db 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -537,7 +537,8 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
         }
     }
 
-    UA_DataSetMessage *dsm = (UA_DataSetMessage *) UA_calloc(1, sizeof(UA_DataSetMessage));
+    UA_DataSetMessage *dsm = (UA_DataSetMessage*)
+        UA_calloc(1, sizeof(UA_DataSetMessage));
     if(!dsm) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "PubSub RT Offset calculation: DSM creation failed");
@@ -565,7 +566,8 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
     }
     *dsWriterIds = dataSetReader->config.dataSetWriterId;
 
-    UA_NetworkMessage *networkMessage = (UA_NetworkMessage *)UA_calloc(1, sizeof(UA_NetworkMessage));
+    UA_NetworkMessage *networkMessage = (UA_NetworkMessage *)
+        UA_calloc(1, sizeof(UA_NetworkMessage));
     if(!networkMessage) {
         UA_free(dsWriterIds);
         UA_DataSetMessage_clear(dsm);
@@ -575,6 +577,7 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
+    /* Move the dsm into the NetworkMessage */
     res = UA_DataSetReader_generateNetworkMessage(pubSubConnection, rg, dataSetReader, dsm,
                                                   dsWriterIds, 1, networkMessage);
     if(res != UA_STATUSCODE_GOOD) {
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index fa79b0c4854..eb6beb8e5ad 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -342,19 +342,22 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
     bufEnd = &wg->bufferedMessage.buffer.data[wg->bufferedMessage.buffer.length];
     bufPos = wg->bufferedMessage.buffer.data;
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-    if (wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE){
+    if(wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
         UA_Byte *payloadPosition;
         UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, &payloadPosition);
         wg->bufferedMessage.payloadPosition = payloadPosition;
-        wg->bufferedMessage.nm = (UA_NetworkMessage *)UA_malloc(sizeof(networkMessage));
-        wg->bufferedMessage.nm->securityHeader.networkMessageEncrypted = networkMessage.securityHeader.networkMessageEncrypted;
-        wg->bufferedMessage.nm->securityHeader.networkMessageSigned = networkMessage.securityHeader.networkMessageSigned;
-        UA_ByteString_copy(&networkMessage.securityHeader.messageNonce, &wg->bufferedMessage.nm->securityHeader.messageNonce);
+        wg->bufferedMessage.nm = (UA_NetworkMessage *)UA_calloc(1,sizeof(UA_NetworkMessage));
+        wg->bufferedMessage.nm->securityHeader.networkMessageEncrypted =
+            networkMessage.securityHeader.networkMessageEncrypted;
+        wg->bufferedMessage.nm->securityHeader.networkMessageSigned =
+            networkMessage.securityHeader.networkMessageSigned;
+        UA_ByteString_copy(&networkMessage.securityHeader.messageNonce,
+                           &wg->bufferedMessage.nm->securityHeader.messageNonce);
         UA_ByteString_allocBuffer(&wg->bufferedMessage.encryptBuffer, msgSize);
         UA_ByteString_clear(&networkMessage.securityHeader.messageNonce);
     }
 #endif
-    if (wg->config.securityMode <= UA_MESSAGESECURITYMODE_NONE)
+    if(wg->config.securityMode <= UA_MESSAGESECURITYMODE_NONE)
         UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, NULL);
 
  cleanup:

From 34de85316e5437083e0bab4a6e19a3303cc9d3c8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 5 Jun 2022 00:13:11 +0200
Subject: [PATCH 0200/1963] refactor(pubsub): Fixed size nonce buffer in the
 NetworkMessage header

---
 src/pubsub/ua_pubsub_networkmessage.c | 44 ++++++++++++---------------
 src/pubsub/ua_pubsub_networkmessage.h |  5 ++-
 src/pubsub/ua_pubsub_reader.c         | 17 +++--------
 src/pubsub/ua_pubsub_security.c       |  7 +++--
 src/pubsub/ua_pubsub_writergroup.c    | 37 ++++++++++------------
 5 files changed, 49 insertions(+), 61 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 3424853e4ab..fdac0eff0cc 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -49,10 +49,6 @@ const UA_Byte DS_MESSAGEHEADER_PICOSECONDS_INCLUDED_MASK = 32;
 const UA_Byte NM_SHIFT_LEN = 2;
 const UA_Byte DS_MH_SHIFT_LEN = 1;
 
-/* Static memory allocation for the message nonce */
-#define MESSAGE_NONCE_LENGTH      8
-static UA_Byte MessageNonceGenerated[MESSAGE_NONCE_LENGTH];
-
 static UA_Boolean UA_NetworkMessage_ExtendedFlags1Enabled(const UA_NetworkMessage* src);
 static UA_Boolean UA_NetworkMessage_ExtendedFlags2Enabled(const UA_NetworkMessage* src);
 static UA_Boolean UA_DataSetMessageHeader_DataSetFlags2Enabled(const UA_DataSetMessageHeader* src);
@@ -404,13 +400,15 @@ UA_SecurityHeader_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
     // SecurityTokenId
     rv = UA_UInt32_encodeBinary(&src->securityHeader.securityTokenId, bufPos, bufEnd);
     UA_CHECK_STATUS(rv, return rv);
+
     // NonceLength
-    UA_Byte nonceLength = (UA_Byte)src->securityHeader.messageNonce.length;
+    UA_Byte nonceLength = (UA_Byte)src->securityHeader.messageNonceSize;
     rv = UA_Byte_encodeBinary(&nonceLength, bufPos, bufEnd);
     UA_CHECK_STATUS(rv, return rv);
+
     // MessageNonce
-    for (size_t i = 0; i < src->securityHeader.messageNonce.length; i++) {
-        rv = UA_Byte_encodeBinary(&src->securityHeader.messageNonce.data[i],
+    for(size_t i = 0; i < src->securityHeader.messageNonceSize; i++) {
+        rv = UA_Byte_encodeBinary(&src->securityHeader.messageNonce[i],
                                   bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
@@ -768,23 +766,21 @@ UA_SecurityHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
     rv = UA_UInt32_decodeBinary(src, offset, &dst->securityHeader.securityTokenId);
     UA_CHECK_STATUS(rv, return rv);
 
-    // NonceLength
+    // MessageNonce
     UA_Byte nonceLength;
     rv = UA_Byte_decodeBinary(src, offset, &nonceLength);
     UA_CHECK_STATUS(rv, return rv);
-
-    // MessageNonce
+    if(nonceLength > UA_NETWORKMESSAGE_MAX_NONCE_LENGTH)
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     if(nonceLength > 0) {
-        //TODO: check for memory leaks
-        dst->securityHeader.messageNonce.length = MESSAGE_NONCE_LENGTH;
-        dst->securityHeader.messageNonce.data = MessageNonceGenerated;
-        UA_CHECK_STATUS(rv, return rv);
-        for (UA_Byte i = 0; i < nonceLength; i++) {
+        dst->securityHeader.messageNonceSize = nonceLength;
+        for(UA_Byte i = 0; i < nonceLength; i++) {
             rv = UA_Byte_decodeBinary(src, offset,
-                                      &dst->securityHeader.messageNonce.data[i]);
+                                      &dst->securityHeader.messageNonce[i]);
             UA_CHECK_STATUS(rv, return rv);
         }
     }
+
     // SecurityFooterSize
     if(dst->securityHeader.securityFooterEnabled) {
         rv = UA_UInt16_decodeBinary(src, offset, &dst->securityHeader.securityFooterSize);
@@ -1074,7 +1070,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p, UA_NetworkMessageOffsetBu
         size += UA_Byte_calcSizeBinary(&byte);
         size += UA_UInt32_calcSizeBinary(&p->securityHeader.securityTokenId);
         size += 1; /* UA_Byte_calcSizeBinary(&p->securityHeader.nonceLength); */
-        size += p->securityHeader.messageNonce.length;
+        size += p->securityHeader.messageNonceSize;
         if(p->securityHeader.securityFooterEnabled)
             size += UA_UInt16_calcSizeBinary(&p->securityHeader.securityFooterSize);
     }
@@ -1128,12 +1124,8 @@ UA_NetworkMessage_clear(UA_NetworkMessage* p) {
         }
     }
 
-    if(p->securityHeader.securityFooterEnabled &&
-       p->securityHeader.securityFooterSize > 0)
-        UA_ByteString_clear(&p->securityFooter);
-
-    if(p->messageIdEnabled)
-        UA_String_clear(&p->messageId);
+    UA_ByteString_clear(&p->securityFooter);
+    UA_String_clear(&p->messageId);
 
     if(p->publisherIdEnabled &&
        p->publisherIdType == UA_PUBLISHERDATATYPE_STRING)
@@ -1270,7 +1262,11 @@ UA_NetworkMessage_signEncrypt(UA_NetworkMessage *nm, UA_MessageSecurityMode secu
     /* Encrypt the payload */
     if(securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
         /* Set the temporary MessageNonce in the SecurityPolicy */
-        res = policy->setMessageNonce(policyContext, &nm->securityHeader.messageNonce);
+        const UA_ByteString nonce = {
+            (size_t)nm->securityHeader.messageNonceSize,
+            nm->securityHeader.messageNonce
+        };
+        res = policy->setMessageNonce(policyContext, &nonce);
         UA_CHECK_STATUS(res, return res);
 
         /* The encryption is done in-place, no need to encode again */
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 3d14410e4f8..1d705a49f38 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -15,6 +15,8 @@
 
 _UA_BEGIN_DECLS
 
+#define UA_NETWORKMESSAGE_MAX_NONCE_LENGTH 16
+
 /* DataSet Payload Header */
 typedef struct {
     UA_Byte count;
@@ -128,7 +130,8 @@ typedef struct {
     UA_Boolean securityFooterEnabled;
     UA_Boolean forceKeyReset;
     UA_UInt32 securityTokenId;      // spec: IntegerId
-    UA_ByteString messageNonce;
+    UA_Byte messageNonce[UA_NETWORKMESSAGE_MAX_NONCE_LENGTH];
+    UA_UInt16 messageNonceSize;
     UA_UInt16 securityFooterSize;
 } UA_NetworkMessageSecurityHeader;
 
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index eb51581ba0e..e302fd67428 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -32,12 +32,6 @@
 /* This functionality of this API will be used in future to create mirror Variables - TODO */
 /* #define UA_MAX_SIZENAME           64 */ /* Max size of Qualified Name of Subscribed Variable */
 
-/* Static memory allocation for the message nonce */
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-#define MESSAGE_NONCE_LENGTH      8
-static UA_Byte MessageNonceGenerated[MESSAGE_NONCE_LENGTH];
-#endif
-
 /* Clear DataSetReader */
 static void
 UA_DataSetReader_clear(UA_Server *server, UA_DataSetReader *dataSetReader);
@@ -259,17 +253,14 @@ UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
             nm->securityHeader.networkMessageEncrypted = true;
         nm->securityHeader.securityTokenId = readerGroup->securityTokenId;
 
-        /* Generate the MessageNonce */
-        nm->securityHeader.messageNonce.length = MESSAGE_NONCE_LENGTH;
-        nm->securityHeader.messageNonce.data = MessageNonceGenerated;
-
-        nm->securityHeader.messageNonce.length = 4; /* Generate 4 random bytes */
+        /* Generate the MessageNonce starting with four random bytes */
+        UA_ByteString nonce = {4, nm->securityHeader.messageNonce};
         UA_StatusCode rv = readerGroup->config.securityPolicy->symmetricModule.
             generateNonce(readerGroup->config.securityPolicy->policyContext,
-                          &nm->securityHeader.messageNonce);
+                          &nonce);
         if(rv != UA_STATUSCODE_GOOD)
             return rv;
-        nm->securityHeader.messageNonce.length = 8;
+        nm->securityHeader.messageNonceSize = 8;
     }
 #endif
     nm->version = 1;
diff --git a/src/pubsub/ua_pubsub_security.c b/src/pubsub/ua_pubsub_security.c
index 42690177e56..5cb2c424d27 100644
--- a/src/pubsub/ua_pubsub_security.c
+++ b/src/pubsub/ua_pubsub_security.c
@@ -98,8 +98,11 @@ verifyAndDecrypt(const UA_Logger *logger, UA_ByteString *buffer,
     }
 
     if(doDecrypt) {
-        rv = securityPolicy->setMessageNonce(channelContext,
-                                             &nm->securityHeader.messageNonce);
+        const UA_ByteString nonce = {
+            (size_t)nm->securityHeader.messageNonceSize,
+            (UA_Byte*)(uintptr_t)nm->securityHeader.messageNonce
+        };
+        rv = securityPolicy->setMessageNonce(channelContext, &nonce);
         UA_CHECK_STATUS_WARN(rv, return rv, logger, UA_LOGCATEGORY_SECURITYPOLICY,
                              "PubSub receive. Faulty Nonce set");
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index eb6beb8e5ad..1c8ba8f1a12 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -341,22 +341,19 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
     /* Encode the NetworkMessage */
     bufEnd = &wg->bufferedMessage.buffer.data[wg->bufferedMessage.buffer.length];
     bufPos = wg->bufferedMessage.buffer.data;
+
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     if(wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
         UA_Byte *payloadPosition;
         UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, &payloadPosition);
         wg->bufferedMessage.payloadPosition = payloadPosition;
+
         wg->bufferedMessage.nm = (UA_NetworkMessage *)UA_calloc(1,sizeof(UA_NetworkMessage));
-        wg->bufferedMessage.nm->securityHeader.networkMessageEncrypted =
-            networkMessage.securityHeader.networkMessageEncrypted;
-        wg->bufferedMessage.nm->securityHeader.networkMessageSigned =
-            networkMessage.securityHeader.networkMessageSigned;
-        UA_ByteString_copy(&networkMessage.securityHeader.messageNonce,
-                           &wg->bufferedMessage.nm->securityHeader.messageNonce);
+        wg->bufferedMessage.nm->securityHeader = networkMessage.securityHeader;
         UA_ByteString_allocBuffer(&wg->bufferedMessage.encryptBuffer, msgSize);
-        UA_ByteString_clear(&networkMessage.securityHeader.messageNonce);
     }
 #endif
+
     if(wg->config.securityMode <= UA_MESSAGESECURITYMODE_NONE)
         UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, NULL);
 
@@ -743,8 +740,11 @@ encryptAndSign(UA_WriterGroup *wg, const UA_NetworkMessage *nm,
 
     if(nm->securityHeader.networkMessageEncrypted) {
         /* Set the temporary MessageNonce in the SecurityPolicy */
-        rv = wg->config.securityPolicy->setMessageNonce(channelContext,
-                                                        &nm->securityHeader.messageNonce);
+        const UA_ByteString nonce = {
+            (size_t)nm->securityHeader.messageNonceSize,
+            (UA_Byte*)(uintptr_t)nm->securityHeader.messageNonce
+        };
+        rv = wg->config.securityPolicy->setMessageNonce(channelContext, &nonce);
         UA_CHECK_STATUS(rv, return rv);
 
         /* The encryption is done in-place, no need to encode again */
@@ -905,21 +905,17 @@ generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
             networkMessage->securityHeader.networkMessageEncrypted = true;
         networkMessage->securityHeader.securityTokenId = wg->securityTokenId;
 
-        /* Generate the MessageNonce */
-        UA_ByteString_allocBuffer(&networkMessage->securityHeader.messageNonce, 8);
-        if(networkMessage->securityHeader.messageNonce.length == 0)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-
-        networkMessage->securityHeader.messageNonce.length = 4; /* Generate 4 random bytes */
+        /* Generate the MessageNonce. Four random bytes followed by a four-byte
+         * sequence number */
+        UA_ByteString nonce = {4, networkMessage->securityHeader.messageNonce};
         UA_StatusCode rv = wg->config.securityPolicy->symmetricModule.
-            generateNonce(wg->config.securityPolicy->policyContext,
-                          &networkMessage->securityHeader.messageNonce);
+            generateNonce(wg->config.securityPolicy->policyContext, &nonce);
         if(rv != UA_STATUSCODE_GOOD)
             return rv;
-        networkMessage->securityHeader.messageNonce.length = 8;
-        UA_Byte *pos = &networkMessage->securityHeader.messageNonce.data[4];
-        const UA_Byte *end = &networkMessage->securityHeader.messageNonce.data[8];
+        UA_Byte *pos = &networkMessage->securityHeader.messageNonce[4];
+        const UA_Byte *end = &networkMessage->securityHeader.messageNonce[8];
         UA_UInt32_encodeBinary(&wg->nonceSequenceNumber, &pos, end);
+        networkMessage->securityHeader.messageNonceSize = 8;
     }
 #endif
 
@@ -1003,7 +999,6 @@ sendNetworkMessageUADP(UA_PubSubConnection *connection, UA_WriterGroup *wg,
         UA_ByteString_clear(&buf);
     }
 cleanup:
-    UA_ByteString_clear(&nm.securityHeader.messageNonce);
     UA_free(nm.payload.dataSetPayload.sizes);
     return rv;
 }

From 3fe84d976cc6a5482341d097e24a253eb23affc3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 5 Jun 2022 20:11:51 +0200
Subject: [PATCH 0201/1963] refactor(pubsub): Add clarifying comments in
 ua_pubsub_readergroup.c

---
 src/pubsub/ua_pubsub_readergroup.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index e46ef1548db..34e9bb2f7c3 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -591,10 +591,12 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* The offset buffer is already clear if the ReaderGroup was unfrozen
+     * UA_NetworkMessageOffsetBuffer_clear(&dataSetReader->bufferedMessage); */
     memset(&dataSetReader->bufferedMessage, 0, sizeof(UA_NetworkMessageOffsetBuffer));
     dataSetReader->bufferedMessage.RTsubscriberEnabled = true;
 
-    /* Fix the offsets necessary to decode */
+    /* Compute and store the offsets necessary to decode */
     UA_NetworkMessage_calcSizeBinary(networkMessage, &dataSetReader->bufferedMessage);
     dataSetReader->bufferedMessage.nm = networkMessage;
 

From 72f0b72e3d9c3c90fe22979cdbbdcd2f6a506381 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 5 Jun 2022 20:14:18 +0200
Subject: [PATCH 0202/1963] refactor(pubsub): Inline a small method to simplify
 ua_pubsub_reader.c

---
 src/pubsub/ua_pubsub_reader.c | 59 +++++++++++++++--------------------
 1 file changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index e302fd67428..e37d5677c99 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -32,10 +32,6 @@
 /* This functionality of this API will be used in future to create mirror Variables - TODO */
 /* #define UA_MAX_SIZENAME           64 */ /* Max size of Qualified Name of Subscribed Variable */
 
-/* Clear DataSetReader */
-static void
-UA_DataSetReader_clear(UA_Server *server, UA_DataSetReader *dataSetReader);
-
 static void
 UA_PubSubDSRDataSetField_sampleValue(UA_Server *server, UA_DataSetReader *dataSetReader,
                                      UA_DataValue *value, UA_FieldTargetVariable *ftv) {
@@ -482,9 +478,9 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     removeDataSetReaderRepresentation(server, dsr);
 #endif
 
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
 #ifdef UA_ENABLE_PUBSUB_MONITORING
     /* Stop and remove message receive timeout timer */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(dsr->msgRcvTimeoutTimerRunning) {
         res = server->config.pubSubConfig.monitoringInterface.
             stopMonitoring(server, dsr->identifier, UA_PUBSUB_COMPONENT_DATASETREADER,
@@ -508,8 +504,31 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     }
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
 
-    UA_DataSetReader_clear(server, dsr);
-    return res;
+    /* Delete DataSetReader config */
+    UA_DataSetReaderConfig_clear(&dsr->config);
+
+    /* Remove DataSetReader from group */
+    LIST_REMOVE(dsr, listEntry);
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, dsr->linkedReaderGroup);
+    if(rg)
+        rg->readersCount--;
+
+    /* THe offset buffer is only set when the dsr is frozen
+     * UA_NetworkMessageOffsetBuffer_clear(&dsr->bufferedMessage); */
+
+    UA_NodeId_clear(&dsr->identifier);
+    UA_NodeId_clear(&dsr->linkedReaderGroup);
+    if(dsr->config.subscribedDataSetType == UA_PUBSUB_SDS_TARGET) {
+        UA_TargetVariables_clear(&dsr->config.subscribedDataSet.subscribedDataSetTarget);
+    } else {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "UA_DataSetReader_delete(): unsupported subscribed dataset enum type");
+    }
+
+    /* Free memory allocated for DataSetReader */
+    UA_free(dsr);
+
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
@@ -1198,32 +1217,6 @@ UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server,
 }
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
 
-static void
-UA_DataSetReader_clear(UA_Server *server, UA_DataSetReader *dsr) {
-    /* Delete DataSetReader config */
-    UA_DataSetReaderConfig_clear(&dsr->config);
-
-    /* Delete DataSetReader */
-    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, dsr->linkedReaderGroup);
-    if(rg)
-        rg->readersCount--;
-
-    UA_NodeId_clear(&dsr->identifier);
-    UA_NodeId_clear(&dsr->linkedReaderGroup);
-    if(dsr->config.subscribedDataSetType == UA_PUBSUB_SDS_TARGET) {
-        UA_TargetVariables_clear(&dsr->config.subscribedDataSet.subscribedDataSetTarget);
-    } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "UA_DataSetReader_clear(): unsupported subscribed dataset enum type");
-    }
-
-    /* Remove DataSetReader from group */
-    LIST_REMOVE(dsr, listEntry);
-
-    /* Free memory allocated for DataSetReader */
-    UA_free(dsr);
-}
-
 static void
 processMessageWithReader(UA_Server *server, UA_ReaderGroup *readerGroup,
                          UA_DataSetReader *reader, UA_NetworkMessage *msg) {

From 7d829c75f28501b0bab01c5171384672e602109c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 5 Jun 2022 20:15:06 +0200
Subject: [PATCH 0203/1963] refactor(pubsub): Cosmetic newline improvements

---
 src/pubsub/ua_pubsub_networkmessage.c |  3 ++-
 src/pubsub/ua_pubsub_networkmessage.h | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index fdac0eff0cc..db64530a268 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -932,7 +932,8 @@ increaseOffsetArray(UA_NetworkMessageOffsetBuffer *offsetBuffer) {
 }
 
 size_t
-UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p, UA_NetworkMessageOffsetBuffer *offsetBuffer) {
+UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
+                                 UA_NetworkMessageOffsetBuffer *offsetBuffer) {
     size_t retval = 0;
     UA_Byte byte = 0;
     size_t size = UA_Byte_calcSizeBinary(&byte); // UADPVersion + UADPFlags
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 1d705a49f38..18cfe049605 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -259,7 +259,8 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
                                UA_DataSetMessage* dst, UA_UInt16 dsmSize);
 
 size_t
-UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage *p, UA_NetworkMessageOffsetBuffer *offsetBuffer,
+UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage *p,
+                                 UA_NetworkMessageOffsetBuffer *offsetBuffer,
                                  size_t currentOffset);
 
 void UA_DataSetMessage_clear(UA_DataSetMessage* p);
@@ -304,13 +305,16 @@ UA_NetworkMessage_encodeFooters(const UA_NetworkMessage* src,
  * ^^^^^^^^^^^^^^^^^^^^^^^ */
 
 UA_StatusCode
-UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst);
+UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset,
+                                UA_NetworkMessage *dst);
 
 UA_StatusCode
-UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst);
+UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset,
+                                UA_NetworkMessage *dst);
 
 UA_StatusCode
-UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst);
+UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset,
+                                UA_NetworkMessage *dst);
 
 UA_StatusCode
 UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
@@ -318,8 +322,10 @@ UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
 
 
 UA_StatusCode
-UA_NetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst);
+UA_NetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
+                                     UA_NetworkMessage *dst);
 
+/* Also stores the offset if offsetBuffer != NULL */
 size_t
 UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
                                  UA_NetworkMessageOffsetBuffer *offsetBuffer);

From 02f101df73b8d9a32b6882f41e1a2240f3c601b3 Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Tue, 7 Jun 2022 11:04:03 +0200
Subject: [PATCH 0204/1963] feat(server) allow UA_NODESET_DIR to be custom
 defined. (#5138)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes it easier for developers to keep all ua-nodesets XML
definitions in a common location.

Signed-off-by: Björn Esser <b.esser@pengutronix.de>

Co-authored-by: Björn Esser <b.esser@pengutronix.de>
---
 CMakeLists.txt                        | 15 ++++++++-------
 doc/nodeset_compiler.rst              | 23 +++++++++++------------
 examples/CMakeLists.txt               |  4 ----
 examples/nodeset/CMakeLists.txt       |  6 +++---
 tests/nodeset-compiler/CMakeLists.txt | 16 ++++++++--------
 tools/cmake/macros_public.cmake       |  8 ++++----
 tools/cmake/open62541Config.cmake.in  |  2 +-
 7 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf38b4e0000..250b4894a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ include(GNUInstallDirs)
 
 # Set when installed via make install
 set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
-set(open62541_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset)
+set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path to the nodetset directory.")
 set(open62541_MQTT_DIR ${PROJECT_SOURCE_DIR}/deps/mqtt-c)
 
 include(macros_internal)
@@ -1200,17 +1200,18 @@ set(UA_FILE_NODESETS)
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     if(NOT UA_FILE_NS0)
-        set(UA_FILE_NS0 ${open62541_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
+        set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
     endif()
     set(UA_FILE_NODESETS "${UA_FILE_NS0}")
 
     if(NOT EXISTS "${UA_FILE_NS0}")
-        message(FATAL_ERROR "File ${UA_FILE_NS0} not found. You probably need to initialize the git submodule for deps/ua-nodeset or set open62541_NODESET_DIR.")
+        message(FATAL_ERROR "File ${UA_FILE_NS0} not found. You probably need to initialize the git submodule for deps/ua-nodeset or set UA_NODESET_DIR.")
     endif()
 
-    set(UA_FILE_NODEIDS ${open62541_NODESET_DIR}/Schema/NodeIds.csv)
-    set(UA_FILE_STATUSCODES ${open62541_NODESET_DIR}/Schema/StatusCode.csv)
-    set(UA_FILE_TYPES_BSD ${open62541_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
+
+    set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
+    set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
+    set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
 else()
     if(NOT UA_FILE_NS0)
         set(UA_FILE_NS0 ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Reduced.xml)
@@ -1700,7 +1701,7 @@ endif()
 set(UA_install_tools_dirs "tools/certs"
     "tools/nodeset_compiler"
     "tools/schema"
-    ${open62541_NODESET_DIR})
+    ${UA_NODESET_DIR})
 
 set(UA_install_tools_files "tools/generate_datatypes.py"
     "tools/generate_nodeid_header.py"
diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
index 32d1b5d9f86..cc7b1721250 100644
--- a/doc/nodeset_compiler.rst
+++ b/doc/nodeset_compiler.rst
@@ -292,17 +292,17 @@ Here are some examples for the ``DI`` and ``PLCOpen`` nodesets::
     # Generate types and namespace for DI
     ua_generate_nodeset_and_datatypes(
         NAME "di"
-        FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv"
-        FILE_BSD "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd"
+        FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
+        FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
         NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
-        FILE_NS "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml"
+        FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
     )
 
     # generate PLCopen namespace which is using DI
     ua_generate_nodeset_and_datatypes(
         NAME "plc"
         # PLCopen does not define custom types. Only generate the nodeset
-        FILE_NS "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml"
+        FILE_NS "${UA_NODESET_DIR}/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml"
         # PLCopen depends on the di nodeset, which must be generated before
         DEPENDS "di"
     )
@@ -401,8 +401,8 @@ This DI nodeset makes use of some additional data types in ``deps/ua-nodeset/DI/
         NAME "ua_types_di"
         TARGET_SUFFIX "types-di"
         NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
-        FILE_CSV "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/OpcUaDiModel.csv"
-        FILES_BSD "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.Types.bsd"
+        FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
+        FILES_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
     )
 
 The ``NAMESPACE_MAP`` parameter is an array of strings which indicates the mapping of specific namespace uris to the resulting namespace index.
@@ -414,11 +414,11 @@ Now you can compile the DI nodeset XML using the following command::
 
     ua_generate_nodeset(
         NAME "di"
-        FILE "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml"
+        FILE "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
         TYPES_ARRAY "UA_TYPES_DI"
         INTERNAL
         DEPENDS_TYPES "UA_TYPES"
-        DEPENDS_NS    "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml"
+        DEPENDS_NS    "${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml"
         DEPENDS_TARGET "open62541-generator-types-di"
     )
 
@@ -429,16 +429,15 @@ Next we can generate the PLCopen nodeset. Since it doesn't require any additiona
 
     ua_generate_nodeset(
         NAME "plc"
-        FILE "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml"
+        FILE "${UA_NODESET_DIR}/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml"
         INTERNAL
         DEPENDS_TYPES
             "UA_TYPES" "UA_TYPES_DI"
         DEPENDS_NS
-            "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml"
-            "${PROJECT_SOURCE_DIR}/deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml"
+            "${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml"
+            "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
         DEPENDS_TARGET "open62541-generator-ns-di"
     )
-
 This call is quite similar to the compilation of the DI nodeset. As you can see, we do not define any specific types array for the PLCopen nodeset. Since the PLCopen nodeset depends on the NS0 and DI nodeset, we need to tell the nodeset compiler that these two nodesets should be seen as already existing. Make sure that the order is the same as in your XML file, e.g., in this case the order indicated in ``Opc.Ua.PLCopen.NodeSet2_V1.02.xml -> UANodeSet -> Models -> Model``.
 
 As a result of the previous scripts you will have multiple source files:
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 34f888fd3ab..083f039e6aa 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -26,10 +26,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
         set(UA_TOOLS_DIR ${open62541_TOOLS_DIR})
     endif()
 
-    if(NOT UA_NODESET_DIR)
-        set(UA_NODESET_DIR ${open62541_NODESET_DIR})
-    endif()
-
     function(assign_source_group)
         # define empty function. We don't need it in standalone
     endfunction(assign_source_group)
diff --git a/examples/nodeset/CMakeLists.txt b/examples/nodeset/CMakeLists.txt
index d404770005a..022549e3142 100644
--- a/examples/nodeset/CMakeLists.txt
+++ b/examples/nodeset/CMakeLists.txt
@@ -63,10 +63,10 @@ endif()
 ###################
 
 if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    set(FILE_CSV_DIRPREFIX ${open62541_NODESET_DIR})
-    set(FILE_BSD_PLCOPEN_DIRPREFIX ${open62541_NODESET_DIR})
+    set(FILE_CSV_DIRPREFIX ${UA_NODESET_DIR})
+    set(FILE_BSD_PLCOPEN_DIRPREFIX ${UA_NODESET_DIR})
     set(FILE_BSD_POWERLINK_DIRPREFIX ${PROJECT_SOURCE_DIR}/nodeset)
-    set(FILE_NS_DIRPREFIX ${open62541_NODESET_DIR})
+    set(FILE_NS_DIRPREFIX ${UA_NODESET_DIR})
 else()
     set(FILE_CSV_DIRPREFIX ${UA_NODESET_DIR})
     set(FILE_BSD_PLCOPEN_DIRPREFIX ${UA_NODESET_DIR})
diff --git a/tests/nodeset-compiler/CMakeLists.txt b/tests/nodeset-compiler/CMakeLists.txt
index 5720a2c2f19..0aa4eaca9b9 100644
--- a/tests/nodeset-compiler/CMakeLists.txt
+++ b/tests/nodeset-compiler/CMakeLists.txt
@@ -11,22 +11,22 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     # Generate types and namespace for DI
     ua_generate_nodeset_and_datatypes(
         NAME "tests-di"
-        FILE_CSV "${open62541_NODESET_DIR}/DI/OpcUaDiModel.csv"
-        FILE_BSD "${open62541_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
+        FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
+        FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
         NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
-        FILE_NS "${open62541_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
+        FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
         INTERNAL
     )
 
     # Generate types and namespace for ADI
     ua_generate_nodeset_and_datatypes(
         NAME "tests-adi"
-        FILE_CSV "${open62541_NODESET_DIR}/ADI/OpcUaAdiModel.csv"
-        FILE_BSD "${open62541_NODESET_DIR}/ADI/Opc.Ua.Adi.Types.bsd"
+        FILE_CSV "${UA_NODESET_DIR}/ADI/OpcUaAdiModel.csv"
+        FILE_BSD "${UA_NODESET_DIR}/ADI/Opc.Ua.Adi.Types.bsd"
         NAMESPACE_MAP "3:http://opcfoundation.org/UA/ADI/"
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
-        FILE_NS "${open62541_NODESET_DIR}/ADI/Opc.Ua.Adi.NodeSet2.xml"
+        FILE_NS "${UA_NODESET_DIR}/ADI/Opc.Ua.Adi.NodeSet2.xml"
         DEPENDS "tests-di"
         INTERNAL
     )
@@ -45,7 +45,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     ua_generate_nodeset_and_datatypes(
         NAME "tests-plc"
         # PLCopen does not define custom types. Only generate the nodeset
-        FILE_NS "${open62541_NODESET_DIR}/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml"
+        FILE_NS "${UA_NODESET_DIR}/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml"
         # PLCopen depends on the di nodeset, which must be generated before
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
         DEPENDS "tests-di"
@@ -69,7 +69,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
             FILE_BSD "${PROJECT_SOURCE_DIR}/tests/nodeset-compiler/Opc.Ua.AutoID.Types.bsd"
             NAMESPACE_MAP "3:http://opcfoundation.org/UA/AutoID/"
             OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
-            FILE_NS "${open62541_NODESET_DIR}/AutoID/Opc.Ua.AutoID.NodeSet2.xml"
+            FILE_NS "${UA_NODESET_DIR}/AutoID/Opc.Ua.AutoID.NodeSet2.xml"
             DEPENDS "tests-di"
             INTERNAL
     )
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index c507286bbde..94fb713ac26 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -96,7 +96,7 @@ endfunction()
 #                   passed which will all combined to one resulting code.
 #   IMPORT_BSD      Combination of types array and path to the .bsd file containing additional type definitions referenced by
 #                   the FILES_BSD files. The value is separated with a hash sign, i.e.
-#                   'UA_TYPES#${PROJECT_SOURCE_DIR}/deps/ua-nodeset/Schema/Opc.Ua.Types.bsd'
+#                   'UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd'
 #                   Multiple files can be passed which will all be imported.
 #   [FILES_SELECTED] Optional path to a simple text file which contains a list of types which should be included in the generation.
 #                   The file should contain one type per line. Multiple files can be passed to this argument.
@@ -473,8 +473,8 @@ function(ua_generate_nodeset_and_datatypes)
         message(FATAL_ERROR "open62541_TOOLS_DIR must point to the open62541 tools directory")
     endif()
 
-    if(NOT DEFINED open62541_NODESET_DIR)
-        message(FATAL_ERROR "open62541_NODESET_DIR must point to the open62541/deps/ua-nodeset directory")
+    if(NOT DEFINED UA_NODESET_DIR)
+        message(FATAL_ERROR "UA_NODESET_DIR must point to the open62541/deps/ua-nodeset directory")
     endif()
 
     # ------ Argument checking -----
@@ -584,7 +584,7 @@ function(ua_generate_nodeset_and_datatypes)
     # Create a list of nodesets on which this nodeset depends on
     if (NOT UA_GEN_DEPENDS OR "${UA_GEN_DEPENDS}" STREQUAL "" )
         if(NOT UA_FILE_NS0)
-            set(NODESET_DEPENDS "${open62541_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml")
+            set(NODESET_DEPENDS "${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml")
         else()
             set(NODESET_DEPENDS "${UA_FILE_NS0}")
         endif()
diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index 0c2544ccb9a..8dfcebd4b80 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -3,7 +3,7 @@
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
 
 set (open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
-set (open62541_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
+set (UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
 
 include(CMakeFindDependencyMacro)
 find_dependency(PythonInterp REQUIRED)

From ab18ac39602db10e4bae82700964b111ae0c70f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 14:56:42 +0200
Subject: [PATCH 0205/1963] build(deps): bump deps/ua-nodeset from `2b43a75` to
 `49ad397` (#5177)

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `2b43a75` to `49ad397`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/2b43a75adf475d7bd9678a883874e028dda4ec78...49ad39784fb83208ceb6b85a70db60f537f81d95)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 2b43a75adf4..49ad39784fb 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 2b43a75adf475d7bd9678a883874e028dda4ec78
+Subproject commit 49ad39784fb83208ceb6b85a70db60f537f81d95

From 2002baa6aec0e1b858bfc4803352429c9375c2e8 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 9 Jun 2022 12:27:50 +0200
Subject: [PATCH 0206/1963] fix(nc): Fixing LGTM errors and warnings

---
 include/open62541/architecture_definitions.h | 2 +-
 tools/nodeset_compiler/datatypes.py          | 2 +-
 tools/nodeset_compiler/nodeset_testing.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
index f22f401dd87..d71a85c91dc 100644
--- a/include/open62541/architecture_definitions.h
+++ b/include/open62541/architecture_definitions.h
@@ -159,7 +159,7 @@ extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
 # endif
 # define UA_STATIC_ASSERT(cond,msg)                             \
     typedef struct {                                            \
-        int UA_CTASTR(static_assertion_failed_,msg) : !!(cond); \
+        unsigned int UA_CTASTR(static_assertion_failed_,msg) : !!(cond); \
     } UA_CTASTR(static_assertion_failed_,__COUNTER__)
 #else /* Everybody else */
 # define UA_STATIC_ASSERT(cond,msg) typedef char static_assertion_##msg[(cond)?1:-1]
diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index d60508cfa04..c033a9d1302 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -531,7 +531,7 @@ class Float(Number):
     def __init__(self, xmlelement=None):
         Number.__init__(self)
         if xmlelement:
-            Float.parseXML(self, xmlelement)
+            self.parseXML(self, xmlelement)
 
     def parseXML(self, xmlvalue):
         # Expect <Float>value</Float> or
diff --git a/tools/nodeset_compiler/nodeset_testing.py b/tools/nodeset_compiler/nodeset_testing.py
index 5997f82e8bd..d9ff9224597 100644
--- a/tools/nodeset_compiler/nodeset_testing.py
+++ b/tools/nodeset_compiler/nodeset_testing.py
@@ -13,7 +13,7 @@
 
 class testing:
     def __init__(self):
-        self.ns = NodeSet("testing")
+        self.ns = NodeSet()
 
         logger.debug("Phase 1: Reading XML file nodessets")
         self.ns.parseXML("Opc.Ua.NodeSet2.xml")

From 1586482ff515a27f2df698d90b9b9fe2ee5bcc3e Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 9 Jun 2022 13:44:06 +0200
Subject: [PATCH 0207/1963] fix lgtm warning

---
 tools/nodeset_compiler/datatypes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index c033a9d1302..07b3805e81e 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -531,7 +531,7 @@ class Float(Number):
     def __init__(self, xmlelement=None):
         Number.__init__(self)
         if xmlelement:
-            self.parseXML(self, xmlelement)
+            self.parseXML(xmlelement)
 
     def parseXML(self, xmlvalue):
         # Expect <Float>value</Float> or

From b0af00581a5fc53527056815d11c7c6fb8b2a0d0 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 9 Jun 2022 08:13:53 +0200
Subject: [PATCH 0208/1963] fix (pubsub): Run server once per test cycle

---
 tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c | 2 +-
 tests/pubsub/check_pubsub_subscribe_rt_levels.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 044fc7ecdb9..566df224d11 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -333,8 +333,8 @@ static void ServerDoProcess(
     ck_assert(pMessage != 0);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ServerDoProcess() sleep : %s", pMessage);
+    UA_Server_run_iterate(server, true);
     for (UA_UInt32 i = 0; i < NoOfRunIterateCycles; i++) {
-        UA_Server_run_iterate(server, true);
         UA_fakeSleep(Sleep_ms);
         UA_Server_run_iterate(server, true);
     }
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index b4355991052..5e36b96bb02 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -30,8 +30,8 @@ static void ServerDoProcess(
     const UA_UInt32 sleep_ms,             /* use at least publishing interval */
     const UA_UInt32 noOfIterateCycles)
 {
+    UA_Server_run_iterate(server, true);
     for (UA_UInt32 i = 0; i < noOfIterateCycles; i++) {
-        UA_Server_run_iterate(server, true);
         UA_fakeSleep(sleep_ms);
         UA_Server_run_iterate(server, true);
     }

From 309f6cc99ef187bc2152ef86a45a230df07f1397 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 31 May 2022 14:44:34 +0200
Subject: [PATCH 0209/1963] feat(pubsub): Call state change callback

Call state change callbacks whenever a state changes successfully.
Extend functions *_setPubSubState with parameter for error cause.
Extend UNIT tests to check calls of state change callback.
---
 src/pubsub/ua_pubsub.h                        |  24 +-
 src/pubsub/ua_pubsub_manager.c                |   3 +-
 src/pubsub/ua_pubsub_reader.c                 |  54 ++-
 src/pubsub/ua_pubsub_readergroup.c            |  62 ++-
 src/pubsub/ua_pubsub_writer.c                 |  31 +-
 src/pubsub/ua_pubsub_writergroup.c            |  62 +--
 .../check_pubsub_subscribe_msgrcvtimeout.c    | 408 +++++++++++++++---
 7 files changed, 499 insertions(+), 145 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 0c804b6ea62..8dc4adb5c44 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -145,8 +145,10 @@ UA_DataSetWriter *
 UA_DataSetWriter_findDSWbyId(UA_Server *server, UA_NodeId identifier);
 
 UA_StatusCode
-UA_DataSetWriter_setPubSubState(UA_Server *server, UA_PubSubState state,
-                                UA_DataSetWriter *dataSetWriter);
+UA_DataSetWriter_setPubSubState(UA_Server *server,
+                                UA_DataSetWriter *dataSetWriter,
+                                UA_PubSubState state,
+                                UA_StatusCode cause);
 
 UA_StatusCode
 UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
@@ -194,8 +196,10 @@ UA_WriterGroup *
 UA_WriterGroup_findWGbyId(UA_Server *server, UA_NodeId identifier);
 
 UA_StatusCode
-UA_WriterGroup_setPubSubState(UA_Server *server, UA_PubSubState state,
-                              UA_WriterGroup *writerGroup);
+UA_WriterGroup_setPubSubState(UA_Server *server,
+                              UA_WriterGroup *writerGroup,
+                              UA_PubSubState state,
+                              UA_StatusCode cause);
 
 /**********************************************/
 /*               DataSetField                 */
@@ -281,8 +285,10 @@ UA_StatusCode UA_FieldTargetVariable_copy(const UA_FieldTargetVariable *src,
                                           UA_FieldTargetVariable *dst);
 
 UA_StatusCode
-UA_DataSetReader_setPubSubState(UA_Server *server, UA_PubSubState state,
-                                UA_DataSetReader *dataSetReader);
+UA_DataSetReader_setPubSubState(UA_Server *server,
+                                UA_DataSetReader *dataSetReader,
+                                UA_PubSubState state,
+                                UA_StatusCode cause);
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
 /* Check if DataSetReader has a message receive timeout */
@@ -349,8 +355,10 @@ UA_DataSetReader *
 UA_ReaderGroup_findDSRbyId(UA_Server *server, UA_NodeId identifier);
 
 UA_StatusCode
-UA_ReaderGroup_setPubSubState(UA_Server *server, UA_PubSubState state,
-                              UA_ReaderGroup *readerGroup);
+UA_ReaderGroup_setPubSubState(UA_Server *server,
+                              UA_ReaderGroup *readerGroup,
+                              UA_PubSubState state,
+                              UA_StatusCode cause);
 
 /*********************************************************/
 /*               PublishValues handling                  */
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index cdb63db6323..a5eee063af1 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -402,7 +402,8 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry){
         UA_WriterGroup *writerGroup;
         LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
-            UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_DISABLED, writerGroup);
+            UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
+                                          UA_STATUSCODE_BADSHUTDOWN);
             UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup->identifier);
         }
     }
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index e37d5677c99..2e6ce53066c 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -402,7 +402,8 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     newDataSetReader->componentType = UA_PUBSUB_COMPONENT_DATASETREADER;
     if(readerGroup->state == UA_PUBSUBSTATE_OPERATIONAL) {
-        retVal = UA_DataSetReader_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL, newDataSetReader);
+        retVal = UA_DataSetReader_setPubSubState(server, newDataSetReader, UA_PUBSUBSTATE_OPERATIONAL,
+                                                 UA_STATUSCODE_GOOD);
         if(retVal != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                             "Add DataSetReader failed. setPubSubState failed.");
@@ -741,13 +742,19 @@ UA_DataSetReader_setState_disabled(UA_Server *server, UA_DataSetReader *dsr) {
 
 /* State machine methods not part of the open62541 state machine API */
 UA_StatusCode
-UA_DataSetReader_setPubSubState(UA_Server *server, UA_PubSubState state,
-                                UA_DataSetReader *dataSetReader) {
+UA_DataSetReader_setPubSubState(UA_Server *server,
+                                UA_DataSetReader *dataSetReader,
+                                UA_PubSubState state,
+                                UA_StatusCode cause) {
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    UA_PubSubState oldState = dataSetReader->state;
     switch(state) {
         case UA_PUBSUBSTATE_DISABLED:
-            return UA_DataSetReader_setState_disabled(server, dataSetReader);
+            ret = UA_DataSetReader_setState_disabled(server, dataSetReader);
+            break;
         case UA_PUBSUBSTATE_PAUSED:
-            return UA_STATUSCODE_BADNOTSUPPORTED;
+            ret = UA_STATUSCODE_BADNOTSUPPORTED;
+            break;
         case UA_PUBSUBSTATE_OPERATIONAL:
             dataSetReader->state = UA_PUBSUBSTATE_OPERATIONAL;
             break;
@@ -757,9 +764,18 @@ UA_DataSetReader_setPubSubState(UA_Server *server, UA_PubSubState state,
         default:
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "Received unknown PubSub state!");
-            return UA_STATUSCODE_BADINVALIDARGUMENT;
+            ret = UA_STATUSCODE_BADINVALIDARGUMENT;
+            break;
     }
-    return UA_STATUSCODE_GOOD;
+    if (state != oldState) {
+        /* inform application about state change */
+        UA_ServerConfig *pConfig = UA_Server_getConfig(server);
+        if(pConfig->pubSubConfig.stateChangeCallback != 0) {
+            pConfig->pubSubConfig.
+                stateChangeCallback(&dataSetReader->identifier, state, cause);
+        }
+    }
+    return ret;
 }
 
 UA_StatusCode
@@ -1133,12 +1149,8 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
     /* If previous reader state was error (because we haven't received messages
      * and ran into timeout) we should set the state back to operational */
     if(dsr->state == UA_PUBSUBSTATE_ERROR) {
-        UA_DataSetReader_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL, dsr);
-        if(server->config.pubSubConfig.stateChangeCallback != 0) {
-            server->config.pubSubConfig.stateChangeCallback(&dsr->identifier,
-                                                            UA_PUBSUBSTATE_OPERATIONAL,
-                                                            UA_STATUSCODE_GOOD);
-        }
+        UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_OPERATIONAL,
+                                        UA_STATUSCODE_GOOD);
     }
 
     /* Stop message receive timeout timer */
@@ -1153,7 +1165,8 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "DataSetReader '%.*s': stop receive timeout timer failed",
                          (int)dsr->config.name.length, dsr->config.name.data);
-            UA_DataSetReader_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsr);
+            UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
+                                            UA_STATUSCODE_BADINTERNALERROR);
         }
     }
 
@@ -1169,7 +1182,8 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
     } else {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "Starting Message Receive Timeout timer failed.");
-        UA_DataSetReader_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsr);
+        UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
+                                        UA_STATUSCODE_BADINTERNALERROR);
     }
 }
 
@@ -1200,15 +1214,9 @@ UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server,
                  dsr->config.messageReceiveTimeout,
                  (UA_UInt32) dsr->msgRcvTimeoutTimerId);
 
-    UA_ServerConfig *pConfig = UA_Server_getConfig(server);
-    if(pConfig->pubSubConfig.stateChangeCallback != 0) {
-        pConfig->pubSubConfig.stateChangeCallback(&dsr->identifier,
-                                                  UA_PUBSUBSTATE_ERROR,
-                                                  UA_STATUSCODE_BADTIMEOUT);
-    }
-
     UA_StatusCode res =
-        UA_DataSetReader_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsr);
+        UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
+                                        UA_STATUSCODE_BADTIMEOUT);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "UA_DataSetReader_handleMessageReceiveTimeout(): "
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 34e9bb2f7c3..5ab7377187f 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -278,7 +278,8 @@ UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifie
 
 static UA_StatusCode
 UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
-                                      UA_ReaderGroup *rg) {
+                                      UA_ReaderGroup *rg,
+                                      UA_StatusCode cause) {
     UA_DataSetReader *dataSetReader;
     switch(rg->state) {
     case UA_PUBSUBSTATE_DISABLED:
@@ -288,8 +289,8 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
     case UA_PUBSUBSTATE_OPERATIONAL:
         UA_ReaderGroup_removeSubscribeCallback(server, rg);
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
-            UA_DataSetReader_setPubSubState(server, UA_PUBSUBSTATE_DISABLED,
-                                            dataSetReader);
+            UA_DataSetReader_setPubSubState(server, dataSetReader,
+                                            UA_PUBSUBSTATE_DISABLED, cause);
         }
         rg->state = UA_PUBSUBSTATE_DISABLED;
         break;
@@ -305,9 +306,11 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
 
 static UA_StatusCode
 UA_ReaderGroup_setPubSubState_paused(UA_Server *server,
-                                     UA_ReaderGroup *rg) {
+                                     UA_ReaderGroup *rg,
+                                     UA_StatusCode cause) {
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "PubSub state paused is unsupported at the moment!");
+    (void)cause;
     switch(rg->state) {
     case UA_PUBSUBSTATE_DISABLED:
         break;
@@ -327,12 +330,14 @@ UA_ReaderGroup_setPubSubState_paused(UA_Server *server,
 
 static UA_StatusCode
 UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
-                                          UA_ReaderGroup *rg) {
+                                          UA_ReaderGroup *rg,
+                                          UA_StatusCode cause) {
     UA_DataSetReader *dataSetReader;
     switch(rg->state) {
     case UA_PUBSUBSTATE_DISABLED:
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
-            UA_DataSetReader_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL, dataSetReader);
+            UA_DataSetReader_setPubSubState(server, dataSetReader, UA_PUBSUBSTATE_OPERATIONAL,
+                                            cause);
         }
         UA_ReaderGroup_addSubscribeCallback(server, rg);
         rg->state = UA_PUBSUBSTATE_OPERATIONAL;
@@ -353,7 +358,8 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
 
 static UA_StatusCode
 UA_ReaderGroup_setPubSubState_error(UA_Server *server,
-                                    UA_ReaderGroup *rg) {
+                                    UA_ReaderGroup *rg,
+                                    UA_StatusCode cause) {
     UA_DataSetReader *dataSetReader;
     switch(rg->state) {
     case UA_PUBSUBSTATE_DISABLED:
@@ -363,7 +369,8 @@ UA_ReaderGroup_setPubSubState_error(UA_Server *server,
     case UA_PUBSUBSTATE_OPERATIONAL:
         UA_ReaderGroup_removeSubscribeCallback(server, rg);
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry){
-            UA_DataSetReader_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dataSetReader);
+            UA_DataSetReader_setPubSubState(server, dataSetReader, UA_PUBSUBSTATE_ERROR,
+                                            cause);
         }
         break;
     case UA_PUBSUBSTATE_ERROR:
@@ -378,23 +385,39 @@ UA_ReaderGroup_setPubSubState_error(UA_Server *server,
 }
 
 UA_StatusCode
-UA_ReaderGroup_setPubSubState(UA_Server *server, UA_PubSubState state,
-                              UA_ReaderGroup *readerGroup) {
+UA_ReaderGroup_setPubSubState(UA_Server *server,
+                              UA_ReaderGroup *readerGroup,
+                              UA_PubSubState state,
+                              UA_StatusCode cause) {
+    UA_StatusCode ret = UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_PubSubState oldState = readerGroup->state;
     switch(state) {
         case UA_PUBSUBSTATE_DISABLED:
-            return UA_ReaderGroup_setPubSubState_disable(server, readerGroup);
+            ret = UA_ReaderGroup_setPubSubState_disable(server, readerGroup, cause);
+            break;
         case UA_PUBSUBSTATE_PAUSED:
-            return UA_ReaderGroup_setPubSubState_paused(server, readerGroup);
+            ret = UA_ReaderGroup_setPubSubState_paused(server, readerGroup, cause);
+            break;
         case UA_PUBSUBSTATE_OPERATIONAL:
-            return UA_ReaderGroup_setPubSubState_operational(server, readerGroup);
+            ret = UA_ReaderGroup_setPubSubState_operational(server, readerGroup, cause);
+            break;
         case UA_PUBSUBSTATE_ERROR:
-            return UA_ReaderGroup_setPubSubState_error(server, readerGroup);
+            ret = UA_ReaderGroup_setPubSubState_error(server, readerGroup, cause);
+            break;
         default:
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "Received unknown PubSub state!");
             break;
     }
-    return UA_STATUSCODE_BADINVALIDARGUMENT;
+    if (state != oldState) {
+        /* inform application about state change */
+        UA_ServerConfig *pConfig = UA_Server_getConfig(server);
+        if(pConfig->pubSubConfig.stateChangeCallback != 0) {
+            pConfig->pubSubConfig.
+                stateChangeCallback(&readerGroup->identifier, state, cause);
+        }
+    }
+    return ret;
 }
 
 UA_StatusCode
@@ -402,7 +425,8 @@ UA_Server_setReaderGroupOperational(UA_Server *server, const UA_NodeId readerGro
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
     if(!rg)
         return UA_STATUSCODE_BADNOTFOUND;
-    return UA_ReaderGroup_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL, rg);
+    return UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_OPERATIONAL,
+                                         UA_STATUSCODE_GOOD);
 }
 
 UA_StatusCode
@@ -410,7 +434,8 @@ UA_Server_setReaderGroupDisabled(UA_Server *server, const UA_NodeId readerGroupI
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
     if(!rg)
         return UA_STATUSCODE_BADNOTFOUND;
-    return UA_ReaderGroup_setPubSubState(server, UA_PUBSUBSTATE_DISABLED, rg);
+    return UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_DISABLED,
+                                         UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
 }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
@@ -649,7 +674,8 @@ UA_ReaderGroup_subscribeCallback(UA_Server *server,
     if(!connection) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "SubscribeCallback(): Find linked connection failed");
-        UA_ReaderGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, readerGroup);
+        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_ERROR,
+                                      UA_STATUSCODE_BADCONNECTIONCLOSED);
         return;
     }
 
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 7616ee6836d..41719b549c3 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -660,13 +660,17 @@ UA_DataSetWriter_clear(UA_Server *server, UA_DataSetWriter *dataSetWriter) {
 
 //state machine methods not part of the open62541 state machine API
 UA_StatusCode
-UA_DataSetWriter_setPubSubState(UA_Server *server, UA_PubSubState state,
-                                UA_DataSetWriter *dataSetWriter) {
+UA_DataSetWriter_setPubSubState(UA_Server *server,
+                                UA_DataSetWriter *dataSetWriter,
+                                UA_PubSubState state,
+                                UA_StatusCode cause) {
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    UA_PubSubState oldState = dataSetWriter->state;
     switch(state){
         case UA_PUBSUBSTATE_DISABLED:
             switch (dataSetWriter->state){
                 case UA_PUBSUBSTATE_DISABLED:
-                    return UA_STATUSCODE_GOOD;
+                    break;
                 case UA_PUBSUBSTATE_PAUSED:
                     dataSetWriter->state = UA_PUBSUBSTATE_DISABLED;
                     //no further action is required
@@ -686,7 +690,7 @@ UA_DataSetWriter_setPubSubState(UA_Server *server, UA_PubSubState state,
                 case UA_PUBSUBSTATE_DISABLED:
                     break;
                 case UA_PUBSUBSTATE_PAUSED:
-                    return UA_STATUSCODE_GOOD;
+                    break;
                 case UA_PUBSUBSTATE_OPERATIONAL:
                     break;
                 case UA_PUBSUBSTATE_ERROR:
@@ -704,7 +708,7 @@ UA_DataSetWriter_setPubSubState(UA_Server *server, UA_PubSubState state,
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
                 case UA_PUBSUBSTATE_OPERATIONAL:
-                    return UA_STATUSCODE_GOOD;
+                    break;
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
@@ -721,7 +725,7 @@ UA_DataSetWriter_setPubSubState(UA_Server *server, UA_PubSubState state,
                 case UA_PUBSUBSTATE_OPERATIONAL:
                     break;
                 case UA_PUBSUBSTATE_ERROR:
-                    return UA_STATUSCODE_GOOD;
+                    break;
                 default:
                     UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                                    "Received unknown PubSub state!");
@@ -731,7 +735,15 @@ UA_DataSetWriter_setPubSubState(UA_Server *server, UA_PubSubState state,
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                                            "Received unknown PubSub state!");
     }
-    return UA_STATUSCODE_GOOD;
+    if (state != oldState) {
+        /* inform application about state change */
+        UA_ServerConfig *pConfig = UA_Server_getConfig(server);
+        if(pConfig->pubSubConfig.stateChangeCallback != 0) {
+            pConfig->pubSubConfig.
+                stateChangeCallback(&dataSetWriter->identifier, state, cause);
+        }
+    }
+    return ret;
 }
 
 UA_StatusCode
@@ -795,8 +807,9 @@ UA_Server_addDataSetWriter(UA_Server *server,
 
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(wg->state == UA_PUBSUBSTATE_OPERATIONAL) {
-        res = UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL,
-                                              newDataSetWriter);
+        res = UA_DataSetWriter_setPubSubState(server, newDataSetWriter,
+                                              UA_PUBSUBSTATE_OPERATIONAL,
+                                              UA_STATUSCODE_GOOD);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "Add DataSetWriter failed. setPubSubState failed.");
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 1c8ba8f1a12..9b577f9dd31 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -430,7 +430,8 @@ UA_Server_setWriterGroupOperational(UA_Server *server,
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
-    return UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL, wg);
+    return UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL,
+                                         UA_STATUSCODE_GOOD);
 }
 
 UA_StatusCode
@@ -439,7 +440,8 @@ UA_Server_setWriterGroupDisabled(UA_Server *server,
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
-    return UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_DISABLED, wg);
+    return UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_DISABLED,
+                                         UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
 }
 
 UA_StatusCode
@@ -622,14 +624,18 @@ UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
 }
 
 UA_StatusCode
-UA_WriterGroup_setPubSubState(UA_Server *server, UA_PubSubState state,
-                              UA_WriterGroup *writerGroup) {
+UA_WriterGroup_setPubSubState(UA_Server *server,
+                              UA_WriterGroup *writerGroup,
+                              UA_PubSubState state,
+                              UA_StatusCode cause) {
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
     UA_DataSetWriter *dataSetWriter;
+    UA_PubSubState oldState = writerGroup->state;
     switch(state) {
         case UA_PUBSUBSTATE_DISABLED:
             switch (writerGroup->state){
                 case UA_PUBSUBSTATE_DISABLED:
-                    return UA_STATUSCODE_GOOD;
+                    break;
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
                 case UA_PUBSUBSTATE_OPERATIONAL:
@@ -640,7 +646,8 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_PubSubState state,
                         UA_PubSubManager_removeRepeatedPubSubCallback(server, writerGroup->publishCallbackId);
 
                     LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
-                        UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_DISABLED, dataSetWriter);
+                        UA_DataSetWriter_setPubSubState(server, dataSetWriter, UA_PUBSUBSTATE_DISABLED,
+                                                        UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
                     }
                     writerGroup->state = UA_PUBSUBSTATE_DISABLED;
                     break;
@@ -656,7 +663,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_PubSubState state,
                 case UA_PUBSUBSTATE_DISABLED:
                     break;
                 case UA_PUBSUBSTATE_PAUSED:
-                    return UA_STATUSCODE_GOOD;
+                    break;
                 case UA_PUBSUBSTATE_OPERATIONAL:
                     break;
                 case UA_PUBSUBSTATE_ERROR:
@@ -678,15 +685,15 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_PubSubState state,
                         UA_PubSubManager_removeRepeatedPubSubCallback(server, writerGroup->publishCallbackId);
 
                     LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
-                        UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_OPERATIONAL,
-                                                        dataSetWriter);
+                        UA_DataSetWriter_setPubSubState(server, dataSetWriter,
+                                                        UA_PUBSUBSTATE_OPERATIONAL, cause);
                     }
                     UA_WriterGroup_addPublishCallback(server, writerGroup);
                     break;
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
                 case UA_PUBSUBSTATE_OPERATIONAL:
-                    return UA_STATUSCODE_GOOD;
+                    break;
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
@@ -703,31 +710,32 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_PubSubState state,
                 case UA_PUBSUBSTATE_OPERATIONAL:
                     UA_PubSubManager_removeRepeatedPubSubCallback(server, writerGroup->publishCallbackId);
                     LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
-                        UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dataSetWriter);
+                        UA_DataSetWriter_setPubSubState(server, dataSetWriter, UA_PUBSUBSTATE_ERROR,
+                                                        UA_STATUSCODE_GOOD);
                     }
                     break;
                 case UA_PUBSUBSTATE_ERROR:
-                    return UA_STATUSCODE_GOOD;
+                    break;
                 default:
                     UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                                     "Received unknown PubSub state!");
             }
             writerGroup->state = UA_PUBSUBSTATE_ERROR;
-            /* TODO: WIP - example usage of pubsubStateChangeCallback -> inform
-             * application about error state, reason param necessary */
-            UA_ServerConfig *pConfig = UA_Server_getConfig(server);
-            if(pConfig->pubSubConfig.stateChangeCallback != 0) {
-                pConfig->pubSubConfig.
-                    stateChangeCallback(&writerGroup->identifier, UA_PUBSUBSTATE_ERROR,
-                                        UA_STATUSCODE_BADINTERNALERROR);
-            }
             break;
         }
         default:
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "Received unknown PubSub state!");
     }
-    return UA_STATUSCODE_GOOD;
+    if (state != oldState) {
+        /* inform application about state change */
+        UA_ServerConfig *pConfig = UA_Server_getConfig(server);
+        if(pConfig->pubSubConfig.stateChangeCallback != 0) {
+            pConfig->pubSubConfig.
+                stateChangeCallback(&writerGroup->identifier, state, cause);
+        }
+    }
+    return ret;
 }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
@@ -1049,7 +1057,8 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
     } else {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "Publish failed. sendBufferedNetworkMessage failed. StatusCode %s", UA_StatusCode_name(res));
-        UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writerGroup);
+        UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_ERROR,
+                                      UA_STATUSCODE_BADCOMMUNICATIONERROR);
     }
 }
 
@@ -1097,7 +1106,8 @@ setErrorStateForDataSetWritersWithIds(UA_Server *server, UA_WriterGroup *writerG
     LIST_FOREACH(dsw, &writerGroup->writers, listEntry) {
         for(size_t i = 0; i < idCount; ++i) {
             if (dsw->config.dataSetWriterId == dsWriterIds[i]) {
-                UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, dsw);
+                UA_DataSetWriter_setPubSubState(server, dsw, UA_PUBSUBSTATE_ERROR,
+                                                UA_STATUSCODE_GOOD);
                 break;
             }
         }
@@ -1163,7 +1173,8 @@ sendOrCollectDataSetMessage(UA_Server *server, UA_WriterGroup *writerGroup, UA_D
         return 0;
     }
 error:
-    UA_DataSetWriter_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writer);
+    UA_DataSetWriter_setPubSubState(server, writer, UA_PUBSUBSTATE_ERROR,
+                                    UA_STATUSCODE_BADCOMMUNICATIONERROR);
     return 0;
 }
 
@@ -1250,7 +1261,8 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     return;
 
 error:
-    UA_WriterGroup_setPubSubState(server, UA_PUBSUBSTATE_ERROR, writerGroup);
+    UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_ERROR,
+                                  UA_STATUSCODE_BADCONNECTIONCLOSED);
 }
 
 /* Add new publishCallback. The first execution is triggered directly after
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 566df224d11..8503f6f7c5d 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -411,11 +411,22 @@ static void PubSubStateChangeCallback_basic (UA_NodeId *pubsubComponentId,
         "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
     UA_String_clear(&strId);
 
-    if (UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) {
-        ck_assert(ExpectedCallbackStateChange == state);
-        ck_assert(ExpectedCallbackStatus == status);
-        CallbackCnt++;
-    }
+    ck_assert(ExpectedCallbackStateChange == state);
+    ck_assert(ExpectedCallbackStatus == status);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
+        "Callback Cnt = %u", CallbackCnt);
+
+    ck_assert(CallbackCnt < ExpectedCallbackCnt);
+    ck_assert(pExpectedComponentCallbackIds != 0);
+    UA_String_init(&strId);
+    UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
+        "Expected Id = %.*s", (UA_Int32) strId.length, strId.data);
+    UA_String_clear(&strId);
+
+    ck_assert(UA_NodeId_equal(pubsubComponentId, &(pExpectedComponentCallbackIds[CallbackCnt])) == UA_TRUE);
+    CallbackCnt++;
 }
 
 /***************************************************************************************************/
@@ -473,9 +484,23 @@ START_TEST(Test_basic) {
     ck_assert(UA_Server_DataSetWriter_getState(server, DsWId_Conn1_WG1_DS1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
 
+    /* state change to operational of WriterGroup */
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds = (UA_NodeId*) UA_calloc(ExpectedCallbackCnt, sizeof(UA_NodeId));
+    ck_assert(pExpectedComponentCallbackIds != 0);
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn1_WG1;
+
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+
     /* set WriterGroup operational */
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
 
+    /* check that callback has been called for writer group and dataset */
+    ck_assert_int_eq(2, CallbackCnt);
+    CallbackCnt = 0;
+
     ck_assert(UA_Server_WriterGroup_getState(server, WGId_Conn1_WG1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
     ck_assert(UA_Server_DataSetWriter_getState(server, DsWId_Conn1_WG1_DS1, &state) == UA_STATUSCODE_GOOD);
@@ -492,9 +517,21 @@ START_TEST(Test_basic) {
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
 
+    /* state change to operational of WriterGroup */
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
+    pExpectedComponentCallbackIds[1] = RGId_Conn2_RG1;
+
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+
     /* set ReaderGroup operational */
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
 
+    /* check that callback has been called for reader group and dataset */
+    ck_assert_int_eq(2, CallbackCnt);
+    CallbackCnt = 0;
+
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
@@ -514,9 +551,12 @@ START_TEST(Test_basic) {
     ck_assert(CallbackCnt == 0);
 
     /* now we disable the publisher WriterGroup and check if a MessageReceiveTimeout occurs at Subscriber */
-    UA_NodeId_copy(&DSRId_Conn2_RG1_DSR1, &ExpectedCallbackComponentNodeId);
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn1_WG1;
+    
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup");
     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
 
@@ -525,6 +565,16 @@ START_TEST(Test_basic) {
     ck_assert(UA_Server_DataSetWriter_getState(server, DsWId_Conn1_WG1_DS1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
 
+    /* check that callback has been called for writer group and dataset */
+    ck_assert_int_eq(2, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 1;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
+
+    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+
     ServerDoProcess("1", (UA_UInt32) (PublishingInterval_Conn1WG1), 3);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreader");
@@ -538,30 +588,56 @@ START_TEST(Test_basic) {
 
     /* check that PubSubStateChange callback has been called for the specific DataSetReader */
     ck_assert_int_eq(1, CallbackCnt);
-    
+    CallbackCnt = 0;
+
     /* enable the publisher WriterGroup again */
     /* DataSetReader state shall be back to operational after receiving a new message */
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn1_WG1;
     ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "enable writergroup");
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
 
+    /* check that callback has been called for writer group and dataset */
+    ck_assert_int_eq(2, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 1;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+
     ServerDoProcess("2", (UA_UInt32) (PublishingInterval_Conn1WG1), 4);
 
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-    ck_assert_int_eq(2, CallbackCnt);
+    ck_assert_int_eq(1, CallbackCnt);
 
     ServerDoProcess("3", (UA_UInt32) (PublishingInterval_Conn1WG1), 4);
 
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
     /* PubSubStateChange callback must not have been triggered again */
-    ck_assert_int_eq(2, CallbackCnt);
+    ck_assert_int_eq(1, CallbackCnt);
+    CallbackCnt = 0;
 
     /* now we disable the reader */
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable readergroup. writergroup is still working");
+
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
+    pExpectedComponentCallbackIds[1] = RGId_Conn2_RG1;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+
     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
+
+    /* check that callback has been called for reader group and dataset */
+    ck_assert_int_eq(2, CallbackCnt);
+    CallbackCnt = 0;
+
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
@@ -571,7 +647,19 @@ START_TEST(Test_basic) {
 
     /* then we disable the writer -> no timeout shall occur, because the reader is disabled */
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup");
+
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn1_WG1;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+
     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
+
+    /* check that callback has been called for writer group and dataset */
+    ck_assert_int_eq(2, CallbackCnt);
+    CallbackCnt = 0;
+
     ck_assert(UA_Server_WriterGroup_getState(server, WGId_Conn1_WG1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
     ck_assert(UA_Server_DataSetWriter_getState(server, DsWId_Conn1_WG1_DS1, &state) == UA_STATUSCODE_GOOD);
@@ -636,8 +724,8 @@ static void PubSubStateChangeCallback_different_timeouts (
         "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
     UA_String_clear(&strId);
 
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
-    ck_assert(status == UA_STATUSCODE_BADTIMEOUT);
+    ck_assert(ExpectedCallbackStateChange == state);
+    ck_assert(ExpectedCallbackStatus == status);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
         "Callback Cnt = %u", CallbackCnt);
@@ -752,12 +840,9 @@ START_TEST(Test_different_timeouts) {
     UA_String_clear(&strId);
 
     /* prepare expected order of pubsub component timeouts: */
-    ExpectedCallbackCnt = 2;
+    ExpectedCallbackCnt = 6;
     pExpectedComponentCallbackIds = (UA_NodeId*) UA_calloc(ExpectedCallbackCnt, sizeof(UA_NodeId));
     ck_assert(pExpectedComponentCallbackIds != 0);
-    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
-    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG1_DSR1;
-    /* TODO: 2nd datasetreader */
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check normal pubsub operation");
 
@@ -766,10 +851,26 @@ START_TEST(Test_different_timeouts) {
         message receive timeout.
         If we do some other checks before triggering the server_run_iterate function, this could 
         cause a timeout. */
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
+
+    ExpectedCallbackCnt = 6;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
+    pExpectedComponentCallbackIds[1] = RGId_Conn1_RG1;
+    pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG1_DSR1;
+    pExpectedComponentCallbackIds[3] = RGId_Conn2_RG1;
+    /* TODO: 2nd datasetreader */
+    pExpectedComponentCallbackIds[4] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[5] = WGId_Conn1_WG1;
+
     ck_assert(UA_STATUSCODE_GOOD == UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1));
     ck_assert(UA_STATUSCODE_GOOD == UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1));
     ck_assert(UA_STATUSCODE_GOOD == UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1));
 
+    /* check that callback has been called for writer and reader groups and datasets */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
     /* check that all dataset writers- and readers are operational */
     UA_PubSubState state = UA_PUBSUBSTATE_DISABLED;
     ck_assert(UA_Server_DataSetWriter_getState(server, DsWId_Conn1_WG1_DS1, &state) == UA_STATUSCODE_GOOD);
@@ -793,13 +894,29 @@ START_TEST(Test_different_timeouts) {
     ValidatePublishSubscribe(VarId_Conn1_WG1_DS1, VarId_Conn2_RG1_DSR1, 49, (UA_UInt32) (PublishingInterval_Conn1_WG1), 20);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup");
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn1_WG1;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+    
     ck_assert(UA_STATUSCODE_GOOD == UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1));
 
+    /* check that callback has been called for writer group and dataset */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check order and number of different message receive timeouts");
 
+    ExpectedCallbackCnt = 2;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
+    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG1_DSR1;
+    /* TODO: 2nd datasetreader */
+
     ServerDoProcess("1", (UA_UInt32) (PublishingInterval_Conn1_WG1), 20);
+    /* check that callback has been called for reader group and dataset */
     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "there should not be any additional timeouts");
@@ -830,8 +947,8 @@ static void PubSubStateChangeCallback_wrong_timeout (
     UA_String_clear(&strId);
 
     if ((UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) && 
-        (state == UA_PUBSUBSTATE_ERROR) &&
-        (status == UA_STATUSCODE_BADTIMEOUT)) {
+        (state == ExpectedCallbackStateChange) &&
+        (status == ExpectedCallbackStatus)) {
         
         CallbackCnt++;
     }
@@ -1135,8 +1252,26 @@ START_TEST(Test_many_components) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "set everything operational");
 
     /* check normal operation first -> there should not be any timeouts */
-    pExpectedComponentCallbackIds = 0;
-    ExpectedCallbackCnt = 0;
+    ExpectedCallbackCnt = 15;
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+    pExpectedComponentCallbackIds = (UA_NodeId*) UA_calloc(ExpectedCallbackCnt, sizeof(UA_NodeId));
+    ck_assert(pExpectedComponentCallbackIds != 0);
+    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
+    pExpectedComponentCallbackIds[1] = RGId_Conn1_RG1;
+    pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG1_DSR1;
+    pExpectedComponentCallbackIds[3] = RGId_Conn2_RG1;
+    pExpectedComponentCallbackIds[4] = DSRId_Conn2_RG2_DSR1;
+    pExpectedComponentCallbackIds[5] = RGId_Conn2_RG2;
+    pExpectedComponentCallbackIds[6] = DSRId_Conn3_RG1_DSR1;
+    pExpectedComponentCallbackIds[7] = RGId_Conn3_RG1;
+    pExpectedComponentCallbackIds[8] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[9] = DsWId_Conn1_WG1_DS2;
+    pExpectedComponentCallbackIds[10] = WGId_Conn1_WG1;
+    pExpectedComponentCallbackIds[11] = DsWId_Conn2_WG1_DS1;
+    pExpectedComponentCallbackIds[12] = WGId_Conn2_WG1;
+    pExpectedComponentCallbackIds[13] = DsWId_Conn2_WG2_DS1;
+    pExpectedComponentCallbackIds[14] = WGId_Conn2_WG2;
 
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
@@ -1147,6 +1282,10 @@ START_TEST(Test_many_components) {
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD);
 
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
     /* check that publish/subscribe works -> set some test values */
 
     /* use a low enough sleep value to ensure that publishing intervals and message receive timeouts 
@@ -1169,21 +1308,30 @@ START_TEST(Test_many_components) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST A");
 
     /* prepare expected pubsub components with message receive timeout */
-    ExpectedCallbackCnt = 2;
-    pExpectedComponentCallbackIds = (UA_NodeId*) UA_calloc(ExpectedCallbackCnt, sizeof(UA_NodeId));
-    ck_assert(pExpectedComponentCallbackIds != 0);
-    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
-    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG2_DSR1;
+    ExpectedCallbackCnt = 3;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
+    pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup: Conn 1 - WG 1");
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
 
     UA_PubSubState state = UA_PUBSUBSTATE_OPERATIONAL;
     ck_assert(UA_Server_WriterGroup_getState(server, WGId_Conn1_WG1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
 
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 2;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
+    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG2_DSR1;
+
     ServerDoProcess("A 1", SleepTime, NoOfRunIterateCycles);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders");
@@ -1213,15 +1361,30 @@ START_TEST(Test_many_components) {
 
     /* check number of timeouts */
     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    
+    CallbackCnt = 0;
+
     /* enable the publisher WriterGroup again */
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "enable writergroup Conn 1 - WG 1");
     CallbackCnt = 0;
-    ExpectedCallbackCnt = 2;
+    ExpectedCallbackCnt = 3;
     ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
+    pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
+    
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
 
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 2;
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG1_DSR1;
+    pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG2_DSR1;
+
     ServerDoProcess("A 2", SleepTime, NoOfRunIterateCycles);
 
     /* DataSetReader state shall be back to operational, after receiving a new message */
@@ -1231,21 +1394,31 @@ START_TEST(Test_many_components) {
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
     /* PubSubStateChange callback must not have been triggered again */
-    ck_assert(CallbackCnt == 2);
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
 
     /***************************************************************************************************/
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST B");
 
     /* prepare expected pubsub component timeouts */
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup: Conn 2 - WG 1");
+    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
+
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
     ExpectedCallbackCnt = 1;
     pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
-    CallbackCnt = 0;
     ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup: Conn 2 - WG 1");
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
-
     ServerDoProcess("B 1", (UA_UInt32) SleepTime, NoOfRunIterateCycles);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders");
@@ -1264,42 +1437,60 @@ START_TEST(Test_many_components) {
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn3_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
     ValidatePublishSubscribe(VarId_Conn2_WG2_DS1, VarId_Conn3_RG1_DSR1, 119, SleepTime, NoOfRunIterateCycles);
-    
+
     /* check number of timeouts */
     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    
+    CallbackCnt = 0;
+
     /* enable the publisher WriterGroup again */
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "enable writergroup");
-    CallbackCnt = 0;
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1;
+    
     ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
 
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 1;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
+
     ServerDoProcess("B 1", SleepTime, NoOfRunIterateCycles);
 
     /* DataSetReader state shall be back to operational, after receiving a new message */
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
+    /* check number of state changes */
     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
 
     /***************************************************************************************************/
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST C");
 
     /* prepare expected pubsub component timeouts */
-    UA_free(pExpectedComponentCallbackIds);
-
-    ExpectedCallbackCnt = 4;
-    pExpectedComponentCallbackIds = (UA_NodeId*) UA_calloc(ExpectedCallbackCnt, sizeof(UA_NodeId));
-    ck_assert(pExpectedComponentCallbackIds != 0);
-    pExpectedComponentCallbackIds[0] = DSRId_Conn3_RG1_DSR1;
-    pExpectedComponentCallbackIds[1] = DSRId_Conn1_RG1_DSR1;
-    pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG1_DSR1;
-    pExpectedComponentCallbackIds[3] = DSRId_Conn2_RG2_DSR1;
-
-    CallbackCnt = 0;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+    ExpectedCallbackCnt = 15;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
+    pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
+    pExpectedComponentCallbackIds[3] = DsWId_Conn2_WG1_DS1;
+    pExpectedComponentCallbackIds[4] = WGId_Conn2_WG1;
+    pExpectedComponentCallbackIds[5] = DsWId_Conn2_WG2_DS1;
+    pExpectedComponentCallbackIds[6] = WGId_Conn2_WG2;
+    pExpectedComponentCallbackIds[7] = DSRId_Conn1_RG1_DSR1;
+    pExpectedComponentCallbackIds[8] = RGId_Conn1_RG1;
+    pExpectedComponentCallbackIds[9] = DSRId_Conn2_RG1_DSR1;
+    pExpectedComponentCallbackIds[10] = RGId_Conn2_RG1;
+    pExpectedComponentCallbackIds[11] = DSRId_Conn2_RG2_DSR1;
+    pExpectedComponentCallbackIds[12] = RGId_Conn2_RG2;
+    pExpectedComponentCallbackIds[13] = DSRId_Conn3_RG1_DSR1;
+    pExpectedComponentCallbackIds[14] = RGId_Conn3_RG1;
 
     /* realign all publishers, so we can determine the order of timeouts */
     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
@@ -1310,6 +1501,13 @@ START_TEST(Test_many_components) {
     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn2_RG2) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn3_RG1) == UA_STATUSCODE_GOOD);
 
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG2) == UA_STATUSCODE_GOOD);
@@ -1317,19 +1515,86 @@ START_TEST(Test_many_components) {
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD);
-    
+
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
     ServerDoProcess("C 1", SleepTime, NoOfRunIterateCycles);
 
+    ExpectedCallbackCnt = 2;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG2_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn2_WG2;
+
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable all writers");
     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD);
-    ServerDoProcess("C 1", SleepTime, 2);
+
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 1;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn3_RG1_DSR1;
+
+    ServerDoProcess("C 1", SleepTime, 6);
+
+    /* check number of timeouts */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 2;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1;
 
     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
-    ServerDoProcess("C 1", SleepTime, 2);
+
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 1;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
+
+    ServerDoProcess("C 1", SleepTime, 6);
+
+    /* check number of timeouts */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 3;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
+    pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
+    pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
 
     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
+
+    /* check number of state changes */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
+    ExpectedCallbackCnt = 2;
+    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
+    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG2_DSR1;
+
+    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+
     ServerDoProcess("C 2", SleepTime, NoOfRunIterateCycles);
 
+    /* check number of timeouts */
+    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
+    CallbackCnt = 0;
+
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders");
 
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
@@ -1341,9 +1606,6 @@ START_TEST(Test_many_components) {
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn3_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_ERROR);
 
-    /* check number of timeouts */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_many_components\n\n");
 
 } END_TEST
@@ -1423,8 +1685,8 @@ START_TEST(Test_update_config) {
     AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", 1, 1, 1, MessageReceiveTimeout, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1);
 
     UA_NodeId_copy(&DSRId_Conn1_RG1_DSR1, &ExpectedCallbackComponentNodeId);
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
 
     const UA_UInt32 SleepTime = 50;
     const UA_UInt32 NoOfRunIterateCycles = 6;
@@ -1438,6 +1700,13 @@ START_TEST(Test_update_config) {
     /* set ReaderGroup operational */
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD);
 
+    /* check number of state changes */
+    ck_assert(CallbackCnt == 1);
+    CallbackCnt = 0;
+
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
+    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
+
     /* check that publish/subscribe works -> set some test values */
     ValidatePublishSubscribe(VarId_Conn1_WG1, VarId_Conn1_RG1_DSR1, 10, SleepTime, NoOfRunIterateCycles);
     ValidatePublishSubscribe(VarId_Conn1_WG1, VarId_Conn1_RG1_DSR1, 33, SleepTime, NoOfRunIterateCycles);
@@ -1453,6 +1722,7 @@ START_TEST(Test_update_config) {
 
     ServerDoProcess("2", SleepTime, NoOfRunIterateCycles);
 
+    /* check number of timeouts */
     ck_assert_int_eq(1, CallbackCnt);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "enable writer group");
@@ -1462,6 +1732,7 @@ START_TEST(Test_update_config) {
 
     ServerDoProcess("3", SleepTime, NoOfRunIterateCycles);
 
+    /* check number of state changes */
     ck_assert_int_eq(2, CallbackCnt);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "update reader config");
@@ -1624,9 +1895,17 @@ START_TEST(Test_fast_path) {
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
 
     /* freeze ReaderGroup and set it operational */
+    UA_NodeId_copy(&DSRId_Conn2_RG1_DSR1, &ExpectedCallbackComponentNodeId);
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+
     ck_assert(UA_Server_freezeReaderGroupConfiguration(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
 
+    /* check that PubSubStateChange callback has been called for the specific DataSetReader */
+    ck_assert_int_eq(1, CallbackCnt);
+    CallbackCnt = 0;
+
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
@@ -1693,7 +1972,14 @@ START_TEST(Test_fast_path) {
 
     /* now we disable the reader */
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable readergroup. writergroup is still working");
+    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
+    
     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
+
+    /* check number of state changes */
+    ck_assert_int_eq(3, CallbackCnt);
+
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);

From 62fd6b506f1cf25b32dae01241711da99ca56d26 Mon Sep 17 00:00:00 2001
From: Bin Lan <Bin.Lan@windriver.com>
Date: Thu, 9 Jun 2022 14:39:42 +0800
Subject: [PATCH 0210/1963] fix(arch): add poll support for VxWorks7

---
 arch/vxworks/ua_architecture.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
index de4e202b33a..5ddac1eb474 100644
--- a/arch/vxworks/ua_architecture.h
+++ b/arch/vxworks/ua_architecture.h
@@ -21,6 +21,7 @@
 
 #include <hostLib.h>
 #include <selectLib.h>
+#include <poll.h>
 
 #define UA_sleep_ms(X)                            \
  {                                                \
@@ -62,7 +63,10 @@
 #define UA_WOULDBLOCK EWOULDBLOCK
 
 #define UA_ENABLE_LOG_COLORS
+#define UA_POLLIN POLLIN
+#define UA_POLLOUT POLLOUT
 
+#define UA_poll poll
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
     getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 #define UA_send send

From 2d59c7d367fc5e47788e00bb01fab66c9dbdbad2 Mon Sep 17 00:00:00 2001
From: Kjeld Flarup <30384076+kjeldflarup@users.noreply.github.com>
Date: Fri, 10 Jun 2022 01:04:47 +0200
Subject: [PATCH 0211/1963] feat(examples): Example client_encryption: If one
 of the specified certificate files is in wrong format, the example ignored
 this and continued with policy #None (#3405)

Signed-off-by: Kjeld Flarup <kfa@deif.com>
---
 examples/encryption/client_encryption.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/examples/encryption/client_encryption.c b/examples/encryption/client_encryption.c
index 4b264fbb026..c756d5f3c2a 100644
--- a/examples/encryption/client_encryption.c
+++ b/examples/encryption/client_encryption.c
@@ -44,10 +44,16 @@ int main(int argc, char* argv[]) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig *cc = UA_Client_getConfig(client);
     cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
-    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+    UA_StatusCode retval = UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                    "Failed to set encryption." );
+        UA_Client_delete(client);
+        return EXIT_FAILURE;
+    }
+    
     UA_ByteString_clear(&certificate);
     UA_ByteString_clear(&privateKey);
     for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++) {
@@ -56,7 +62,7 @@ int main(int argc, char* argv[]) {
 
     /* Secure client connect */
     cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT; /* require encryption */
-    UA_StatusCode retval = UA_Client_connect(client, endpointUrl);
+    retval = UA_Client_connect(client, endpointUrl);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_Client_delete(client);
         return EXIT_FAILURE;

From 47223e8890fc35b83af5799a4deb3342e587082d Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Fri, 10 Jun 2022 10:13:22 +0200
Subject: [PATCH 0212/1963] fix(doc) set correct branch for documentation
 upload (#5186)

---
 .github/workflows/doc_upload.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/doc_upload.yml b/.github/workflows/doc_upload.yml
index 86bff64703a..5af89e55288 100644
--- a/.github/workflows/doc_upload.yml
+++ b/.github/workflows/doc_upload.yml
@@ -29,6 +29,7 @@ jobs:
         with:
           repository: open62541/open62541-www
           path: open62541-www
+          ref: main
           persist-credentials: false
       - name: Get the current branch name
         shell: bash

From 90ea2f6de390c30a97c9418fda4f42ecfc8c4c97 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Fri, 10 Jun 2022 12:33:40 +0200
Subject: [PATCH 0213/1963] refactor(doc): Remove coveralls badge from readme

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index bb51ed47b70..62f140b59b1 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,6 @@ Code Quality:
 
 [![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/open62541/open62541.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/open62541/open62541/context:cpp)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/open62541/open62541.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/open62541/open62541/alerts)
-[![Coverage Status](https://img.shields.io/coveralls/open62541/open62541/master.svg)](https://coveralls.io/r/open62541/open62541?branch=master)
 [![codecov](https://codecov.io/gh/open62541/open62541/branch/master/graph/badge.svg)](https://codecov.io/gh/open62541/open62541)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/open62541.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:open62541)
 

From 40808b0ddbf6111dcb27c0f2c83fdd9194baf663 Mon Sep 17 00:00:00 2001
From: Leo-Paul Geneau <leo-paul.geneau@nexedi.com>
Date: Fri, 10 Jun 2022 16:07:23 +0200
Subject: [PATCH 0214/1963] fix(cmake): check if CMAKE_CXX_COMPILER_VERSION is
 defined

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 250b4894a08..18f5d1eb4a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -765,7 +765,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL
         # This allows e.g. CLion to find memory locations for SegFaults
         message(STATUS "Sanitizer enabled")
         set(SANITIZER_FLAGS "-g -fno-omit-frame-pointer -gline-tables-only -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=leak -fsanitize=undefined")
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+        if(CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
             set(SANITIZER_FLAGS "${SANITIZER_FLAGS} -fsanitize-coverage=trace-pc-guard")
         endif()
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_FLAGS}")

From d40ce0724b82a22228b7e5c32b4bb401cb8e7a1c Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Fri, 10 Jun 2022 15:58:33 +0200
Subject: [PATCH 0215/1963] fix(tests): network is not instant

The client itereate call without timeout in the tests works only
if the TCP connect is instant.  That seems to be the case for github
Linux continuous integration.  But it may fail on other operating
systems or in real live.  Set the iterate timeout after conntect
to 1 second.  That should be enough for loopback interface.

Also sending an async browse request may not reach the server before
iterating it.  A sleep(0) to reschedule the process is enough for
my setup.  Then the server can read the request from its socket.
---
 tests/client/check_client.c               | 4 ++--
 tests/client/check_client_async_connect.c | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 9db6296163d..58f093bc10e 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -179,7 +179,7 @@ START_TEST(Client_renewSecureChannel) {
     UA_fakeSleep((UA_UInt32)((UA_Double)cc->secureChannelLifeTime * 0.8));
 
     /* Make the client renew the channel */
-    retval = UA_Client_run_iterate(client, 0);
+    retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     /* Now read */
@@ -223,7 +223,7 @@ START_TEST(Client_renewSecureChannelWithActiveSubscription) {
     for(int i = 0; i < 15; ++i) {
         UA_fakeSleep(1000);
         UA_Server_run_iterate(server, true);
-        retval = UA_Client_run_iterate(client, 0);
+        retval = UA_Client_run_iterate(client, 1);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     }
 
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index 6676730f5f5..4e64684c15f 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -75,6 +75,8 @@ START_TEST(Client_connect_async) {
             UA_Client_sendAsyncBrowseRequest(client, &bReq, asyncBrowseCallback,
                                              &asyncCounter, &reqId);
         }
+        /* Give network a chance to process packet */
+        sleep(0);
         /* Manual clock for unit tests */
         UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 0);
@@ -145,7 +147,7 @@ START_TEST(Client_no_connection) {
     //simulating unconnected server
     UA_Client_recvTesting_result = UA_STATUSCODE_BADCONNECTIONCLOSED;
     UA_Server_run_iterate(server, false);
-    retval = UA_Client_run_iterate(client, 0);  /* Open connection */
+    retval = UA_Client_run_iterate(client, 1);  /* Open connection */
     UA_Server_run_iterate(server, false);
     retval |= UA_Client_run_iterate(client, 0); /* Send HEL */
     UA_Server_run_iterate(server, false);

From 3706b2705f8305c3f648e30ed866a317b87a82e8 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Mon, 13 Jun 2022 18:40:06 +0200
Subject: [PATCH 0216/1963] test(core): fix 32 bit sign-conversion compiler
 errors

When compiled with clang on 32 bit platforms, -Wsign-conversion
prevents implicit conversion from UA_UInt32 to long.  Make sec and
ns UA_Int32 which is compatible with time_t and long in struct
timespec.
---
 tests/testing-plugins/testing_clock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/testing-plugins/testing_clock.c b/tests/testing-plugins/testing_clock.c
index 26397f52fb7..898adb09e0f 100644
--- a/tests/testing-plugins/testing_clock.c
+++ b/tests/testing-plugins/testing_clock.c
@@ -34,8 +34,8 @@ UA_realSleep(UA_UInt32 duration) {
 #ifdef _WIN32
     Sleep(duration);
 #else
-    UA_UInt32 sec = duration / 1000;
-    UA_UInt32 ns = (duration % 1000) * NANO_SECOND_MULTIPLIER;
+    UA_Int32 sec = duration / 1000;
+    UA_Int32 ns = (duration % 1000) * NANO_SECOND_MULTIPLIER;
     struct timespec sleepValue;
     sleepValue.tv_sec = sec;
     sleepValue.tv_nsec = ns;

From 7695a9dcf9cb3ca2accbfa6151e57fe8269a6dc8 Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Tue, 14 Jun 2022 08:42:28 +0200
Subject: [PATCH 0217/1963] fix(nc): reduce redundancy in the reference code
 generator and return the correct error code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For tehe case of an failed information model setup. Changes were made by @ursfassler (Urs Fässler). (#5197)
---
 .../backend_open62541_nodes.py                | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/nodeset_compiler/backend_open62541_nodes.py b/tools/nodeset_compiler/backend_open62541_nodes.py
index 7042261d03f..cf6b141cecc 100644
--- a/tools/nodeset_compiler/backend_open62541_nodes.py
+++ b/tools/nodeset_compiler/backend_open62541_nodes.py
@@ -44,16 +44,15 @@ def generateNodeValueInstanceName(node, parent, arrayIndex):
     return generateNodeIdPrintable(parent) + "_" + str(node.alias) + "_" + str(arrayIndex)
 
 def generateReferenceCode(reference):
-    if reference.isForward:
-        return "retVal |= UA_Server_addReference(server, %s, %s, %s, true);" % \
-               (generateNodeIdCode(reference.source),
-                generateNodeIdCode(reference.referenceType),
-                generateExpandedNodeIdCode(reference.target))
-    else:
-        return "retVal |= UA_Server_addReference(server, %s, %s, %s, false);" % \
-               (generateNodeIdCode(reference.source),
-                generateNodeIdCode(reference.referenceType),
-                generateExpandedNodeIdCode(reference.target))
+    code = []
+    forwardFlag = "true" if reference.isForward else "false"
+    code.append("retVal |= UA_Server_addReference(server, %s, %s, %s, %s);" %
+                (generateNodeIdCode(reference.source),
+                 generateNodeIdCode(reference.referenceType),
+                 generateExpandedNodeIdCode(reference.target),
+                 forwardFlag))
+    code.append("if (retVal != UA_STATUSCODE_GOOD) return retVal;")
+    return "\n".join(code)
 
 def generateReferenceTypeNodeCode(node):
     code = []
@@ -541,6 +540,7 @@ def generateNodeCode_begin(node, nodeset, code_global):
         code.append(" UA_NODEID_NULL,")
     code.append("(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_{}ATTRIBUTES],NULL, NULL);".
             format(makeCIdentifier(node.__class__.__name__.upper().replace("NODE" ,""))))
+    code.append("if (retVal != UA_STATUSCODE_GOOD) return retVal;")
     code.extend(codeCleanup)
 
     return "\n".join(code)

From 7db79624d09b7c1e2176d31d41e1232d3ba38a44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Jun 2022 09:14:22 +0200
Subject: [PATCH 0218/1963] build(deps): bump deps/ua-nodeset from `49ad397` to
 `b42e29c` (#5194)

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `49ad397` to `b42e29c`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/49ad39784fb83208ceb6b85a70db60f537f81d95...b42e29c2ed4157852b355ef054aaff30cc5f8642)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 49ad39784fb..b42e29c2ed4 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 49ad39784fb83208ceb6b85a70db60f537f81d95
+Subproject commit b42e29c2ed4157852b355ef054aaff30cc5f8642

From a820093aa97d08334147ecb85d8602f917d4f511 Mon Sep 17 00:00:00 2001
From: theirix <theirix@gmail.com>
Date: Sun, 19 Jun 2022 14:06:57 +0300
Subject: [PATCH 0219/1963] feat(build): add option UA_ENABLE_DEBUG_SANITIZER

---
 CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6c669866ee..8f516a110e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -353,6 +353,9 @@ endif()
 
 option(UA_FORCE_WERROR "Force compilation with -Werror (or /WX on MSVC)" ON)
 
+option(UA_ENABLE_DEBUG_SANITIZER "Use sanitizer in debug mode" ON)
+mark_as_advanced(UA_ENABLE_DEBUG_SANITIZER)
+
 #General PubSub setup
 option(UA_ENABLE_PUBSUB "Enable the PubSub protocol" OFF)
 
@@ -759,7 +762,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL
     set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # cmake sets -rdynamic by default
 
     # Debug
-    if(BUILD_TYPE_LOWER_CASE STREQUAL "debug" AND UNIX AND NOT UA_BUILD_OSS_FUZZ AND
+    if(UA_ENABLE_DEBUG_SANITIZER AND BUILD_TYPE_LOWER_CASE STREQUAL "debug" AND UNIX AND NOT UA_BUILD_OSS_FUZZ AND
        CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
         # Add default sanitizer settings when using clang and Debug build.
         # This allows e.g. CLion to find memory locations for SegFaults

From bafcd828bff83438db1c0e1e754de0b8ffae3d69 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 May 2022 10:13:05 +0200
Subject: [PATCH 0220/1963] refactor(build): Improve the doc string of the
 UA_LOGLEVEL option

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f516a110e6..33a524a35d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,7 @@ endforeach(arch_ ${architectures})
 
 # Options
 option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
-set(UA_LOGLEVEL 300 CACHE STRING "Level at which logs shall be reported")
+set(UA_LOGLEVEL 300 CACHE STRING "Minimal level at which logs shall be reported (100=TRACE, 200=DEBUG, 300=INFO, 400=WARNING, 500=ERROR, 600=FATAL)")
 set(UA_MULTITHREADING 0 CACHE STRING "Level of multithreading (0-99: No Multithreading, >=100: Thread-Safe API")
 option(UA_ENABLE_DIAGNOSTICS "Enable diagnostics information exposed by the server" OFF)
 option(UA_ENABLE_METHODCALLS "Enable the Method service set" ON)

From 108b8c537b2b7edb28038162ffe109c08715dabe Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 May 2022 10:54:52 +0200
Subject: [PATCH 0221/1963] refactor(core): Remove UA_atomic_ functions (not
 needed)

We currently protect against race conditions with mutexes instead of
atomic operations.
---
 include/open62541/architecture_definitions.h | 103 -------------------
 plugins/ua_nodestore_hashmap.c               |   4 -
 src/server/ua_server_discovery_mdns.c        |   2 +-
 src/server/ua_services_discovery.c           |   5 +-
 src/server/ua_services_securechannel.c       |  10 +-
 src/ua_connection.c                          |  14 +--
 src/ua_securechannel.c                       |   5 +-
 src/ua_securechannel_crypto.c                |   5 +-
 8 files changed, 25 insertions(+), 123 deletions(-)

diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
index d71a85c91dc..712c3b7ca81 100644
--- a/include/open62541/architecture_definitions.h
+++ b/include/open62541/architecture_definitions.h
@@ -400,107 +400,4 @@ UA_STATIC_ASSERT(sizeof(bool) == 1, cannot_overlay_integers_with_large_bool);
 # define UA_BINARY_OVERLAYABLE_FLOAT 0
 #endif
 
-/* Atomic Operations
- * -----------------
- * Atomic operations that synchronize across processor cores (for
- * multithreading). Only the inline-functions defined next are used. Replace
- * with architecture-specific operations if necessary. */
-#if UA_MULTITHREADING >= 100
-    #ifdef _MSC_VER /* Visual Studio */
-    #define UA_atomic_sync() _ReadWriteBarrier()
-    #else /* GCC/Clang */
-    #define UA_atomic_sync() __sync_synchronize()
-    #endif
-#else
-    #define UA_atomic_sync()
-#endif
-
-static UA_INLINE void *
-UA_atomic_xchg(void * volatile * addr, void *newptr) {
-#if UA_MULTITHREADING >= 100
-#ifdef _MSC_VER /* Visual Studio */
-    return _InterlockedExchangePointer(addr, newptr);
-#else /* GCC/Clang */
-    return __sync_lock_test_and_set(addr, newptr);
-#endif
-#else
-    void *old = *addr;
-    *addr = newptr;
-    return old;
-#endif
-}
-
-static UA_INLINE void *
-UA_atomic_cmpxchg(void * volatile * addr, void *expected, void *newptr) {
-#if UA_MULTITHREADING >= 100
-#ifdef _MSC_VER /* Visual Studio */
-    return _InterlockedCompareExchangePointer(addr, expected, newptr);
-#else /* GCC/Clang */
-    return __sync_val_compare_and_swap(addr, expected, newptr);
-#endif
-#else
-    void *old = *addr;
-    if(old == expected) {
-        *addr = newptr;
-    }
-    return old;
-#endif
-}
-
-static UA_INLINE uint32_t
-UA_atomic_addUInt32(volatile uint32_t *addr, uint32_t increase) {
-#if UA_MULTITHREADING >= 100
-#ifdef _MSC_VER /* Visual Studio */
-    return _InterlockedExchangeAdd(addr, increase) + increase;
-#else /* GCC/Clang */
-    return __sync_add_and_fetch(addr, increase);
-#endif
-#else
-    *addr += increase;
-    return *addr;
-#endif
-}
-
-static UA_INLINE size_t
-UA_atomic_addSize(volatile size_t *addr, size_t increase) {
-#if UA_MULTITHREADING >= 100
-#ifdef _MSC_VER /* Visual Studio */
-    return _InterlockedExchangeAdd(addr, increase) + increase;
-#else /* GCC/Clang */
-    return __sync_add_and_fetch(addr, increase);
-#endif
-#else
-    *addr += increase;
-    return *addr;
-#endif
-}
-
-static UA_INLINE uint32_t
-UA_atomic_subUInt32(volatile uint32_t *addr, uint32_t decrease) {
-#if UA_MULTITHREADING >= 100
-#ifdef _MSC_VER /* Visual Studio */
-    return _InterlockedExchangeSub(addr, decrease) - decrease;
-#else /* GCC/Clang */
-    return __sync_sub_and_fetch(addr, decrease);
-#endif
-#else
-    *addr -= decrease;
-    return *addr;
-#endif
-}
-
-static UA_INLINE size_t
-UA_atomic_subSize(volatile size_t *addr, size_t decrease) {
-#if UA_MULTITHREADING >= 100
-#ifdef _MSC_VER /* Visual Studio */
-    return _InterlockedExchangeSub(addr, decrease) - decrease;
-#else /* GCC/Clang */
-    return __sync_sub_and_fetch(addr, decrease);
-#endif
-#else
-    *addr -= decrease;
-    return *addr;
-#endif
-}
-
 #endif /* ARCH_UA_ARCHITECTURE_DEFINITIONS_H_ */
diff --git a/plugins/ua_nodestore_hashmap.c b/plugins/ua_nodestore_hashmap.c
index 002eda2dd6b..459beb9f12b 100644
--- a/plugins/ua_nodestore_hashmap.c
+++ b/plugins/ua_nodestore_hashmap.c
@@ -318,8 +318,6 @@ UA_NodeMap_removeNode(void *context, const UA_NodeId *nodeid) {
 
     UA_NodeMapEntry *entry = slot->entry;
     slot->entry = UA_NODEMAP_TOMBSTONE;
-    UA_atomic_sync(); /* Set the tombstone before cleaning up. E.g. if the
-                       * nodestore is accessed from an interrupt. */
     entry->deleted = true;
     cleanupNodeMapEntry(entry);
     --ns->count;
@@ -420,7 +418,6 @@ UA_NodeMap_insertNode(void *context, UA_Node *node,
     /* Insert the node */
     UA_NodeMapEntry *newEntry = container_of(node, UA_NodeMapEntry, node);
     slot->nodeIdHash = UA_NodeId_hash(&node->head.nodeId);
-    UA_atomic_sync(); /* Set the hash first */
     slot->entry = newEntry;
     ++ns->count;
     return retval;
@@ -447,7 +444,6 @@ UA_NodeMap_replaceNode(void *context, UA_Node *node) {
 
     /* Replace the entry */
     slot->entry = newEntry;
-    UA_atomic_sync();
     oldEntry->deleted = true;
     cleanupNodeMapEntry(oldEntry);
     return UA_STATUSCODE_GOOD;
diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_server_discovery_mdns.c
index fccb9c73145..1d580bde174 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_server_discovery_mdns.c
@@ -96,7 +96,7 @@ UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fq
     }
     listEntry->serverOnNetwork.serverName.length = serverNameLen;
     memcpy(listEntry->serverOnNetwork.serverName.data, serverName, serverNameLen);
-    UA_atomic_addUInt32(&server->discoveryManager.serverOnNetworkRecordIdCounter, 1);
+    server->discoveryManager.serverOnNetworkRecordIdCounter++;
     if(server->discoveryManager.serverOnNetworkRecordIdCounter == 0)
         server->discoveryManager.serverOnNetworkRecordIdLastReset = UA_DateTime_now();
     listEntry->lastSeen = UA_DateTime_nowMonotonic();
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 4b79a75e356..6b6c9d80106 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -401,8 +401,9 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
             return;
         }
 
-        LIST_INSERT_HEAD(&server->discoveryManager.registeredServers, registeredServer_entry, pointers);
-        UA_atomic_addSize(&server->discoveryManager.registeredServersSize, 1);
+        LIST_INSERT_HEAD(&server->discoveryManager.registeredServers,
+                         registeredServer_entry, pointers);
+        server->discoveryManager.registeredServersSize++;
     } else {
         UA_RegisteredServer_clear(&registeredServer_entry->registeredServer);
     }
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index ffe6d6f983f..9e268320b56 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -42,22 +42,22 @@ removeSecureChannel(UA_Server *server, channel_entry *entry,
 
     /* Update the statistics */
     UA_SecureChannelStatistics *scs = &server->secureChannelStatistics;
-    UA_atomic_subSize(&scs->currentChannelCount, 1);
+    scs->currentChannelCount--;
     switch(event) {
     case UA_DIAGNOSTICEVENT_CLOSE:
         break;
     case UA_DIAGNOSTICEVENT_TIMEOUT:
-        UA_atomic_addSize(&scs->channelTimeoutCount, 1);
+        scs->channelTimeoutCount++;
         break;
     case UA_DIAGNOSTICEVENT_PURGE:
-        UA_atomic_addSize(&scs->channelPurgeCount, 1);
+        scs->channelPurgeCount++;
         break;
     case UA_DIAGNOSTICEVENT_REJECT:
     case UA_DIAGNOSTICEVENT_SECURITYREJECT:
-        UA_atomic_addSize(&scs->rejectedChannelCount, 1);
+        scs->rejectedChannelCount++;
         break;
     case UA_DIAGNOSTICEVENT_ABORT:
-        UA_atomic_addSize(&scs->channelAbortCount, 1);
+        scs->channelAbortCount++;
         break;
     default:
         UA_assert(false);
diff --git a/src/ua_connection.c b/src/ua_connection.c
index 0e1a759c98a..719fb2518b2 100644
--- a/src/ua_connection.c
+++ b/src/ua_connection.c
@@ -67,17 +67,19 @@ UA_Connection_sendError(UA_Connection *connection, UA_TcpErrorMessage *error) {
 
 void UA_Connection_detachSecureChannel(UA_Connection *connection) {
     UA_SecureChannel *channel = connection->channel;
-    if(channel)
-        /* only replace when the channel points to this connection */
-        UA_atomic_cmpxchg((void**)&channel->connection, connection, NULL);
-    UA_atomic_xchg((void**)&connection->channel, NULL);
+    /* only replace when the channel points to this connection */
+    if(channel && channel->connection == connection)
+        channel->connection = NULL;
+    connection->channel = NULL;
 }
 
 // TODO: Return an error code
 void
 UA_Connection_attachSecureChannel(UA_Connection *connection, UA_SecureChannel *channel) {
-    if(UA_atomic_cmpxchg((void**)&channel->connection, NULL, connection) == NULL)
-        UA_atomic_xchg((void**)&connection->channel, (void*)channel);
+    if(channel->connection == NULL) {
+        channel->connection = connection;
+        connection->channel = channel;
+    }
 }
 
 UA_StatusCode
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 3619eb998d8..1160d443f2e 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -265,9 +265,12 @@ encodeHeadersSym(UA_MessageContext *mc, size_t totalLength) {
     else
         header.messageTypeAndChunkType += UA_CHUNKTYPE_INTERMEDIATE;
 
+    /* Increase the sequence number in the channel */
+    channel->sendSequenceNumber++;
+
     UA_SequenceHeader seqHeader;
     seqHeader.requestId = mc->requestId;
-    seqHeader.sequenceNumber = UA_atomic_addUInt32(&channel->sendSequenceNumber, 1);
+    seqHeader.sequenceNumber = channel->sendSequenceNumber;
 
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     res |= UA_encodeBinaryInternal(&header, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER],
diff --git a/src/ua_securechannel_crypto.c b/src/ua_securechannel_crypto.c
index f03b91fe990..5de819f1b4e 100644
--- a/src/ua_securechannel_crypto.c
+++ b/src/ua_securechannel_crypto.c
@@ -194,9 +194,12 @@ prependHeadersAsym(UA_SecureChannel *const channel, UA_Byte *header_pos,
                 &header_pos, &buf_end, NULL, NULL);
     UA_CHECK_STATUS(retval, return retval);
 
+    /* Increase the sequence number in the channel */
+    channel->sendSequenceNumber++;
+
     UA_SequenceHeader seqHeader;
     seqHeader.requestId = requestId;
-    seqHeader.sequenceNumber = UA_atomic_addUInt32(&channel->sendSequenceNumber, 1);
+    seqHeader.sequenceNumber = channel->sendSequenceNumber;
     retval = UA_encodeBinaryInternal(&seqHeader, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER],
                                      &header_pos, &buf_end, NULL, NULL);
     return retval;

From 3075db12b74873cdd9b846f410001277efa7cb26 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 May 2022 14:19:07 +0200
Subject: [PATCH 0222/1963] refactor(plugin): Use the architecture UA_Lock for
 stdout logging

---
 plugins/include/open62541/plugin/log_stdout.h | 14 +----
 plugins/ua_config_default.c                   | 10 +---
 plugins/ua_log_stdout.c                       | 60 ++++++++++---------
 3 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/plugins/include/open62541/plugin/log_stdout.h b/plugins/include/open62541/plugin/log_stdout.h
index 1d36da79da8..08ca5ceb148 100644
--- a/plugins/include/open62541/plugin/log_stdout.h
+++ b/plugins/include/open62541/plugin/log_stdout.h
@@ -14,18 +14,8 @@ _UA_BEGIN_DECLS
 extern UA_EXPORT const UA_Logger UA_Log_Stdout_; /* Logger structure */
 extern UA_EXPORT const UA_Logger *UA_Log_Stdout; /* Shorthand pointer */
 
-/* Don't use these definitions. They are only exported as long as the client
- * config is static and required compile-time  */
-UA_EXPORT void
-UA_Log_Stdout_log(void *_, UA_LogLevel level, UA_LogCategory category,
-                  const char *msg, va_list args);
-UA_EXPORT void
-UA_Log_Stdout_clear(void *logContext);
-
-/* By default the client and server is configured with UA_Log_Stdout
-   This constructs a logger with a configurable max log level */
-
-UA_EXPORT UA_Logger UA_Log_Stdout_withLevel(UA_LogLevel minlevel);
+UA_EXPORT UA_Logger
+UA_Log_Stdout_withLevel(UA_LogLevel minlevel);
 
 _UA_END_DECLS
 
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index fc86604f370..c8b340420e8 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -133,7 +133,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 
     /* Logging */
     if(!conf->logger.log)
-        conf->logger = UA_Log_Stdout_;
+        conf->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
 
     /* EventLoop */
     if(conf->eventLoop == NULL) {
@@ -767,9 +767,7 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
 UA_Client * UA_Client_new(void) {
     UA_ClientConfig config;
     memset(&config, 0, sizeof(UA_ClientConfig));
-    config.logger.log = UA_Log_Stdout_log;
-    config.logger.context = NULL;
-    config.logger.clear = UA_Log_Stdout_clear;
+    config.logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
     return UA_Client_newWithConfig(&config);
 }
 
@@ -779,9 +777,7 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     config->secureChannelLifeTime = 10 * 60 * 1000; /* 10 minutes */
 
     if(!config->logger.log) {
-       config->logger.log = UA_Log_Stdout_log;
-       config->logger.context = NULL;
-       config->logger.clear = UA_Log_Stdout_clear;
+        config->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
     }
 
     /* EventLoop */
diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index 109fa1e7a69..788cc399f99 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -10,11 +10,6 @@
 
 #include <stdio.h>
 
-#if UA_MULTITHREADING >= 100
-#include <pthread.h>
-static pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
 /* ANSI escape sequences for color output taken from here:
  * https://stackoverflow.com/questions/3219393/stdlib-and-colored-output-in-c*/
 
@@ -45,50 +40,61 @@ const char *logCategoryNames[UA_LOGCATEGORIES] =
     {"network", "channel", "session", "server",
      "client", "userland", "securitypolicy", "eventloop"};
 
+typedef struct {
+    UA_LogLevel minlevel;
+#if UA_MULTITHREADING >= 100
+    UA_Lock lock;
+#endif
+} LogContext;
+
 #ifdef __clang__
 __attribute__((__format__(__printf__, 4 , 0)))
 #endif
-void
+static void
 UA_Log_Stdout_log(void *context, UA_LogLevel level, UA_LogCategory category,
                   const char *msg, va_list args) {
-
-    /* Assume that context is casted to UA_LogLevel */
-    /* TODO we may later change this to a struct with bitfields to filter on category */
-    if ( context != NULL && (UA_LogLevel)(uintptr_t)context > level )
-        return;
+    LogContext *logContext = (LogContext*)context;
+    if(logContext) {
+        if(logContext->minlevel > level)
+            return;
+        UA_LOCK(&logContext->lock);
+    }
 
     UA_Int64 tOffset = UA_DateTime_localTimeUtcOffset();
     UA_DateTimeStruct dts = UA_DateTime_toStruct(UA_DateTime_now() + tOffset);
 
-#if UA_MULTITHREADING >= 100
-    pthread_mutex_lock(&printf_mutex);
-#endif
-
     printf("[%04u-%02u-%02u %02u:%02u:%02u.%03u (UTC%+05d)] %s/%s" ANSI_COLOR_RESET "\t",
            dts.year, dts.month, dts.day, dts.hour, dts.min, dts.sec, dts.milliSec,
-           (int)(tOffset / UA_DATETIME_SEC / 36), logLevelNames[level], logCategoryNames[category]);
+           (int)(tOffset / UA_DATETIME_SEC / 36), logLevelNames[level],
+           logCategoryNames[category]);
     vprintf(msg, args);
     printf("\n");
     fflush(stdout);
 
-#if UA_MULTITHREADING >= 100
-    pthread_mutex_unlock(&printf_mutex);
-#endif
+    if(logContext) {
+        UA_UNLOCK(&logContext->lock);
+    }
 }
 
-void
-UA_Log_Stdout_clear(void *logContext) {
-
+static void
+UA_Log_Stdout_clear(void *context) {
+    if(!context)
+        return;
+    UA_LOCK_DESTROY(&((LogContext*)context)->lock);
+    UA_free(context);
 }
 
 const UA_Logger UA_Log_Stdout_ = {UA_Log_Stdout_log, NULL, UA_Log_Stdout_clear};
 const UA_Logger *UA_Log_Stdout = &UA_Log_Stdout_;
 
-/* By default the client and server is configured with UA_Log_Stdout
-   This constructs a logger with a configurable max log level */
+UA_Logger
+UA_Log_Stdout_withLevel(UA_LogLevel minlevel) {
+    LogContext *context = (LogContext*)UA_calloc(1, sizeof(LogContext));
+    if(context) {
+        UA_LOCK_INIT(&context->lock);
+        context->minlevel = minlevel;
+    }
 
-UA_Logger UA_Log_Stdout_withLevel(UA_LogLevel minlevel)
-{
-    UA_Logger logger = {UA_Log_Stdout_log, (void*)minlevel, UA_Log_Stdout_clear};
+    UA_Logger logger = {UA_Log_Stdout_log, (void*)context, UA_Log_Stdout_clear};
     return logger;
 }

From 8fa9a18d873513a1cb4bf70194fbd7d53e2b9ea7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 May 2022 14:32:32 +0200
Subject: [PATCH 0223/1963] fix(examples): Use UA_sleep_ms instead of sleep

sleep is not available on win32.
---
 examples/tutorial_server_method_async.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/tutorial_server_method_async.c b/examples/tutorial_server_method_async.c
index 22603241092..691d6579933 100644
--- a/examples/tutorial_server_method_async.c
+++ b/examples/tutorial_server_method_async.c
@@ -190,7 +190,7 @@ THREAD_CALLBACK(ThreadWorker) {
             UA_CallMethodResult_clear(&response);
         } else {
             /* not a good style, but done for simplicity :-) */
-            sleep(5);
+            UA_sleep_ms(5000);
         }
     }
     return 0;

From 53de229ca1e27ccfa20b33fc0f8e68ad32a6044f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jun 2022 13:55:26 +0200
Subject: [PATCH 0224/1963] fix(server): Disallow "reverse subtyping" of
 abstract types

---
 src/server/ua_services_attribute.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index f2da083f499..0775b1ef855 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -814,8 +814,20 @@ compatibleValueDataType(UA_Server *server, const UA_DataType *dataType,
         return true;
 
     /* For actual values, the constraint DataType may be a subtype of the
-     * DataType of the value. E.g. UtcTime is subtype of DateTime. But it still
-     * is a DateTime value when transferred over the wire. */
+     * DataType of the value -- subtyping in the wrong direction. E.g. UtcTime
+     * is a subtype of DateTime. But we allow it to be encoded as a DateTime
+     * value when transferred over the wire.
+     *
+     * We do not allow "subtyping in the "wrong direction" if the received type
+     * is abstract. For example, ExtensionObjects (== "Structure" in the type
+     * hierarchy) is an abstract type. But ExtensionObject could still be
+     * transported over the network. */
+    UA_Boolean abstract = false;
+    UA_StatusCode res = readWithReadValue(server, &dataType->typeId,
+                                          UA_ATTRIBUTEID_ISABSTRACT, &abstract);
+    if(res != UA_STATUSCODE_GOOD || abstract)
+        return false;
+
     if(isNodeInTree_singleRef(server, constraintDataType, &dataType->typeId,
                               UA_REFERENCETYPEINDEX_HASSUBTYPE))
         return true;

From a5cb329e8d1f5e5203bdddcb2eadfb8611650095 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jun 2022 13:56:39 +0200
Subject: [PATCH 0225/1963] fix(server): Allow int32 instead of enum only when
 checking an actual value

---
 src/server/ua_services_attribute.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 0775b1ef855..d5324e5d436 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -813,6 +813,12 @@ compatibleValueDataType(UA_Server *server, const UA_DataType *dataType,
     if(compatibleDataTypes(server, &dataType->typeId, constraintDataType))
         return true;
 
+    /* The constraint is an enum -> allow writing Int32 */
+    if(UA_NodeId_equal(&dataType->typeId, &UA_TYPES[UA_TYPES_INT32].typeId) &&
+       isNodeInTree_singleRef(server, constraintDataType, &enumNodeId,
+                              UA_REFERENCETYPEINDEX_HASSUBTYPE))
+        return true;
+
     /* For actual values, the constraint DataType may be a subtype of the
      * DataType of the value -- subtyping in the wrong direction. E.g. UtcTime
      * is a subtype of DateTime. But we allow it to be encoded as a DateTime
@@ -856,12 +862,6 @@ compatibleDataTypes(UA_Server *server, const UA_NodeId *dataType,
                               UA_REFERENCETYPEINDEX_HASSUBTYPE))
         return true;
 
-    /* The constraint is an enum -> allow writing Int32 */
-    if(UA_NodeId_equal(dataType, &UA_TYPES[UA_TYPES_INT32].typeId) &&
-       isNodeInTree_singleRef(server, constraintDataType, &enumNodeId,
-                              UA_REFERENCETYPEINDEX_HASSUBTYPE))
-        return true;
-
     return false;
 }
 

From bba5bcd8f54467a5023f7f5039ba5c670d785de3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jun 2022 20:51:22 +0200
Subject: [PATCH 0226/1963] refactor(server): Simplfy method/object reference
 checking in ua_services_method.c

---
 src/server/ua_services_method.c    | 257 ++++++++++++++---------------
 tests/server/check_services_call.c |   7 +-
 2 files changed, 123 insertions(+), 141 deletions(-)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 312bcad85c3..f3efa241649 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -125,10 +125,114 @@ static const UA_NodeId hasComponentNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID
 static const UA_NodeId organizedByNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_ORGANIZES}};
 static const UA_String namespaceDiModel = UA_STRING_STATIC("http://opcfoundation.org/UA/DI/");
 static const UA_NodeId hasTypeDefinitionNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_HASTYPEDEFINITION}};
-static const UA_NodeId hasSubTypeNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_HASSUBTYPE}};
 // ns=0 will be replace dynamically. DI-Spec. 1.01: <UAObjectType NodeId="ns=1;i=1005" BrowseName="1:FunctionalGroupType">
 static UA_NodeId functionGroupNodeId = {0, UA_NODEIDTYPE_NUMERIC, {1005}};
 
+static UA_Boolean
+checkMethodReference(const UA_NodeHead *h, UA_ReferenceTypeSet refs,
+                     const UA_ExpandedNodeId *methodId) {
+    for(size_t i = 0; i < h->referencesSize; i++) {
+        const UA_NodeReferenceKind *rk = &h->references[i];
+        if(rk->isInverse)
+            continue;
+        if(!UA_ReferenceTypeSet_contains(&refs, rk->referenceTypeIndex))
+            continue;
+        if(UA_NodeReferenceKind_findTarget(rk, methodId))
+            return true;
+    }
+    return false;
+}
+
+static UA_StatusCode
+checkObjectTypeMethodReference(UA_Server *server, const UA_NodeHead *h,
+                               UA_ReferenceTypeSet refs, const UA_ExpandedNodeId *methodId,
+                               UA_Boolean *found) {
+    /* Get the list of types from which the method inherits. This considers
+     * multiple inheritance. */
+    UA_NodeId *typeHierarchy = NULL;
+    size_t typeHierarchySize = 0;
+    UA_StatusCode res =
+        getParentTypeAndInterfaceHierarchy(server, &h->nodeId,
+                                           &typeHierarchy, &typeHierarchySize);
+    UA_CHECK_STATUS(res, return res);
+
+    for(size_t i = 0; i < typeHierarchySize && !*found; i++) {
+        const UA_Node *objectType =
+            UA_NODESTORE_GET_SELECTIVE(server, &typeHierarchy[i], 0,
+                                       refs, UA_BROWSEDIRECTION_FORWARD);
+        if(!objectType)
+            continue;
+        *found = checkMethodReference(&objectType->head, refs, methodId);
+        UA_NODESTORE_RELEASE(server, objectType);
+    }
+
+    UA_Array_delete(typeHierarchy, typeHierarchySize, &UA_TYPES[UA_TYPES_NODEID]);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+checkFunctionalGroupMethodReference(UA_Server *server, const UA_NodeHead *h,
+                                    const UA_ExpandedNodeId *methodId,
+                                    UA_Boolean *found) {
+    /* Check whether the DI namespace is available */
+    size_t foundNamespace = 0;
+    UA_StatusCode res = getNamespaceByName(server, namespaceDiModel, &foundNamespace);
+    UA_CHECK_STATUS(res, return UA_STATUSCODE_BADMETHODINVALID);
+    functionGroupNodeId.namespaceIndex = (UA_UInt16)foundNamespace;
+
+    UA_ReferenceTypeSet hasTypeDefinitionRefs;
+    res = referenceTypeIndices(server, &hasTypeDefinitionNodeId,
+                               &hasTypeDefinitionRefs, true);
+    UA_CHECK_STATUS(res, return res);
+
+    /* Search for a HasTypeDefinition (or sub-) reference to the FunctionGroupType */
+    UA_Boolean isFunctionGroup = false;
+    for(size_t i = 0; i < h->referencesSize && !isFunctionGroup; ++i) {
+        const UA_NodeReferenceKind *rk = &h->references[i];
+        if(rk->isInverse)
+            continue;
+
+        /* Are these HasTypeDefinition references */
+        if(!UA_ReferenceTypeSet_contains(&hasTypeDefinitionRefs, rk->referenceTypeIndex))
+            continue;
+
+        /* Reference points to FunctionGroupType (or sub-type) from the DI
+         * model? */
+        const UA_ReferenceTarget *t = NULL;
+        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
+            if(!UA_NodePointer_isLocal(t->targetId))
+                continue;
+
+            UA_NodeId tmpId = UA_NodePointer_toNodeId(t->targetId);
+            if(!isNodeInTree_singleRef(server, &tmpId, &functionGroupNodeId,
+                                       UA_REFERENCETYPEINDEX_HASSUBTYPE))
+                continue;
+            isFunctionGroup = true;
+            break;
+        }
+    }
+    if(!isFunctionGroup)
+        return UA_STATUSCODE_GOOD;
+
+    /* Search for the called method with reference Organize (or sub-type) from
+     * the parent object */
+    UA_ReferenceTypeSet organizesRefs;
+    res = referenceTypeIndices(server, &organizedByNodeId, &organizesRefs, true);
+    UA_CHECK_STATUS(res, return res);
+    for(size_t k = 0; k < h->referencesSize; ++k) {
+        const UA_NodeReferenceKind *rk = &h->references[k];
+        if(rk->isInverse)
+            continue;
+        if(!UA_ReferenceTypeSet_contains(&organizesRefs, rk->referenceTypeIndex))
+            continue;
+        if(UA_NodeReferenceKind_findTarget(rk, methodId)) {
+            *found = true;
+            break;
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
 static void
 callWithMethodAndObject(UA_Server *server, UA_Session *session,
                         const UA_CallMethodRequest *request, UA_CallMethodResult *result,
@@ -152,90 +256,26 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
         return;
     }
 
-    UA_NodePointer methodP = UA_NodePointer_fromNodeId(&request->methodId);
-
     /* Verify method/object relations. Object must have a hasComponent or a
      * subtype of hasComponent reference to the method node. Therefore, check
      * every reference between the parent object and the method node if there is
      * a hasComponent (or subtype) reference */
+    UA_ExpandedNodeId methodId = UA_EXPANDEDNODEID_NODEID(request->methodId);
     UA_ReferenceTypeSet hasComponentRefs;
-    result->statusCode =
-        referenceTypeIndices(server, &hasComponentNodeId, &hasComponentRefs, true);
-    if(result->statusCode != UA_STATUSCODE_GOOD)
-        return;
+    result->statusCode = referenceTypeIndices(server, &hasComponentNodeId,
+                                              &hasComponentRefs, true);
+    UA_CHECK_STATUS(result->statusCode, return);
+    UA_Boolean found = checkMethodReference(&object->head, hasComponentRefs, &methodId);
 
-    UA_Boolean found = false;
-    for(size_t i = 0; i < object->head.referencesSize && !found; ++i) {
-        const UA_NodeReferenceKind *rk = &object->head.references[i];
-        if(rk->isInverse)
-            continue;
-        if(!UA_ReferenceTypeSet_contains(&hasComponentRefs, rk->referenceTypeIndex))
-            continue;
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-            if(UA_NodePointer_equal(t->targetId, methodP)) {
-                found = true;
-                break;
-            }
-        }
-    }
     if(!found) {
         /* If the object doesn't have a hasComponent reference to the method node,
          * check its objectType (and its supertypes). Invoked method can be a component
          * of objectType and be invoked on this objectType's instance (or on a instance
          * of one of its subtypes). */
-
-        /* Get the ObjectType */
-        const UA_Node *objectType = NULL;
-        bool releaseType = true;
-        if(object->head.nodeClass == UA_NODECLASS_OBJECT) {
-            objectType = getNodeType(server, &object->head);
-            if(!objectType) {
-                result->statusCode = UA_STATUSCODE_BADMETHODINVALID;
-                return;
-            }
-        }
-        else {
-            /* If the method was invoked on objectType use the provided node and don't 
-             * release it later, it's done in calling function */
-            objectType = (const UA_Node *)object;
-            releaseType = false;
-        }
-
-        UA_ReferenceTypeSet hasSubTypeRefs;
-        result->statusCode = referenceTypeIndices(server, &hasSubTypeNodeId,
-                                                  &hasSubTypeRefs, true);
-        if(result->statusCode != UA_STATUSCODE_GOOD)
-            return;
-
-        UA_ExpandedNodeId methodExpId = UA_EXPANDEDNODEID_NODEID(request->methodId);
-        while(objectType && !found) {
-            /* Check if this objectType references the method node with hasComponent (or its subtype) */
-            for(size_t i = 0; i < objectType->head.referencesSize && !found; ++i) {
-                const UA_NodeReferenceKind *rk = &objectType->head.references[i];
-                if(rk->isInverse)
-                    continue;
-                if(!UA_ReferenceTypeSet_contains(&hasComponentRefs, rk->referenceTypeIndex))
-                    continue;
-                if(UA_NodeReferenceKind_findTarget(rk, &methodExpId)) {
-                    found = true;
-                    break;
-                }
-            }
-            if(found)
-                break;
-            
-            /* Reference was not found - next iteration check supertype */
-            const UA_Node *superType = getNodeType(server, &objectType->head);
-            if(objectType && releaseType) {
-                UA_NODESTORE_RELEASE(server, objectType);
-            }
-            objectType = superType;
-            releaseType = true;
-        }
-        if(objectType && releaseType) {
-            UA_NODESTORE_RELEASE(server, objectType);
-        }
+        result->statusCode =
+            checkObjectTypeMethodReference(server, &object->head,
+                                           hasComponentRefs, &methodId, &found);
+        UA_CHECK_STATUS(result->statusCode, return);
     }
 
     if(!found) {
@@ -249,69 +289,11 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
          * ParameterSet and MethodSet) in (Functional) groups for instance
          * Configuration or Identification. The same Property, Parameter or
          * Method can be referenced from more than one FunctionalGroup. */
-
-        /* Check whether the DI namespace is available */
-        size_t foundNamespace = 0;
-        UA_StatusCode res = getNamespaceByName(server, namespaceDiModel, &foundNamespace);
-        if(res != UA_STATUSCODE_GOOD) {
-            result->statusCode = UA_STATUSCODE_BADMETHODINVALID;
-            return;
-        }
-        functionGroupNodeId.namespaceIndex = (UA_UInt16)foundNamespace;
-
-        UA_ReferenceTypeSet hasTypeDefinitionRefs;
         result->statusCode =
-            referenceTypeIndices(server, &hasTypeDefinitionNodeId,
-                                 &hasTypeDefinitionRefs, true);
-        if(result->statusCode != UA_STATUSCODE_GOOD)
-            return;
-
-        /* Search for a HasTypeDefinition (or sub-) reference in the parent object */
-        for(size_t i = 0; i < object->head.referencesSize && !found; ++i) {
-            const UA_NodeReferenceKind *rk = &object->head.references[i];
-            if(rk->isInverse)
-                continue;
-            if(!UA_ReferenceTypeSet_contains(&hasTypeDefinitionRefs, rk->referenceTypeIndex))
-                continue;
-            
-            /* Verify that the HasTypeDefinition is equal to FunctionGroupType
-             * (or sub-type) from the DI model */
-            const UA_ReferenceTarget *t = NULL;
-            while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-                if(!UA_NodePointer_isLocal(t->targetId))
-                    continue;
-                
-                UA_NodeId tmpId = UA_NodePointer_toNodeId(t->targetId);
-                if(!isNodeInTree_singleRef(server, &tmpId, &functionGroupNodeId,
-                                           UA_REFERENCETYPEINDEX_HASSUBTYPE))
-                    continue;
-
-                /* Search for the called method with reference Organize (or
-                 * sub-type) from the parent object */
-                for(size_t k = 0; k < object->head.referencesSize && !found; ++k) {
-                    const UA_NodeReferenceKind *rkInner = &object->head.references[k];
-                    if(rkInner->isInverse)
-                        continue;
-                    const UA_NodeId * refId = 
-                        UA_NODESTORE_GETREFERENCETYPEID(server, rkInner->referenceTypeIndex);
-                    if(!isNodeInTree_singleRef(server, refId, &organizedByNodeId,
-                                               UA_REFERENCETYPEINDEX_HASSUBTYPE))
-                        continue;
-                    
-                    const UA_ReferenceTarget *t2 = NULL;
-                    while((t2 = UA_NodeReferenceKind_iterate(rkInner, t2))) {
-                        if(UA_NodePointer_equal(t2->targetId, methodP)) {
-                            found = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        if(!found) {
+            checkFunctionalGroupMethodReference(server, &object->head, &methodId, &found);
+        if(!found && result->statusCode == UA_STATUSCODE_GOOD)
             result->statusCode = UA_STATUSCODE_BADMETHODINVALID;
-            return;
-        }
+        UA_CHECK_STATUS(result->statusCode, return);
     }
 
     /* Verify access rights */
@@ -319,8 +301,9 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
     if(session != &server->adminSession) {
         UA_UNLOCK(&server->serviceMutex);
         executable = executable && server->config.accessControl.
-            getUserExecutableOnObject(server, &server->config.accessControl, &session->sessionId,
-                                      session->sessionHandle, &request->methodId, method->head.context,
+            getUserExecutableOnObject(server, &server->config.accessControl,
+                                      &session->sessionId, session->sessionHandle,
+                                      &request->methodId, method->head.context,
                                       &request->objectId, object->head.context);
         UA_LOCK(&server->serviceMutex);
     }
diff --git a/tests/server/check_services_call.c b/tests/server/check_services_call.c
index ad0fd836e4f..e4959ad17d5 100644
--- a/tests/server/check_services_call.c
+++ b/tests/server/check_services_call.c
@@ -247,16 +247,15 @@ START_TEST(callObjectTypeMethodOnInstance) {
     UA_CallMethodRequest_init(&callMethodRequest);
     callMethodRequest.inputArgumentsSize = 1;
     callMethodRequest.inputArguments = &inputArgument;
-    callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVERTYPE_GETMONITOREDITEMS);
+    callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_GETMONITOREDITEMS);
     callMethodRequest.objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER);
 
     UA_CallMethodResult result;
     UA_CallMethodResult_init(&result);
     result = UA_Server_call(server, &callMethodRequest);
 
-    ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
-
-    UA_Array_delete(result.inputArgumentResults, result.inputArgumentResultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
+    /* ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD); // Fails because the subscription id is invalid */
+    UA_CallMethodResult_clear(&result);
 #endif
 } END_TEST
 

From 2eaf08baf2cced7e7c53d87faf57e602e39d3ff2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jun 2022 23:03:39 +0200
Subject: [PATCH 0227/1963] refactor(server): Simplify the type-checking of
 method arguments

---
 src/server/ua_services_method.c | 41 +++++++++++----------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index f3efa241649..a1ebbd13280 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -97,30 +97,6 @@ typeCheckArguments(UA_Server *server, UA_Session *session,
     return retval;
 }
 
-/* inputArgumentResults has the length request->inputArgumentsSize */
-static UA_StatusCode
-validMethodArguments(UA_Server *server, UA_Session *session, const UA_MethodNode *method,
-                     const UA_CallMethodRequest *request,
-                     UA_StatusCode *inputArgumentResults) {
-    /* Get the input arguments node */
-    const UA_VariableNode *inputArguments =
-        getArgumentsVariableNode(server, &method->head, UA_STRING("InputArguments"));
-    if(!inputArguments) {
-        if(request->inputArgumentsSize > 0)
-            return UA_STATUSCODE_BADTOOMANYARGUMENTS;
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* Verify the request */
-    UA_StatusCode retval =
-        typeCheckArguments(server, session, inputArguments, request->inputArgumentsSize,
-                           request->inputArguments, inputArgumentResults);
-
-    /* Release the input arguments node */
-    UA_NODESTORE_RELEASE(server, (const UA_Node*)inputArguments);
-    return retval;
-}
-
 static const UA_NodeId hasComponentNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_HASCOMPONENT}};
 static const UA_NodeId organizedByNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_ORGANIZES}};
 static const UA_String namespaceDiModel = UA_STRING_STATIC("http://opcfoundation.org/UA/DI/");
@@ -322,9 +298,20 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
     }
     result->inputArgumentResultsSize = request->inputArgumentsSize;
 
-    /* Verify Input Arguments */
-    result->statusCode = validMethodArguments(server, session, method, request,
-                                              result->inputArgumentResults);
+    /* Type-check the input arguments */
+    const UA_VariableNode *inputArguments =
+        getArgumentsVariableNode(server, &method->head, UA_STRING("InputArguments"));
+    if(inputArguments) {
+        result->statusCode =
+            typeCheckArguments(server, session, inputArguments, request->inputArgumentsSize,
+                               request->inputArguments, inputArgumentResults);
+        UA_NODESTORE_RELEASE(server, (const UA_Node*)inputArguments);
+    } else {
+        if(request->inputArgumentsSize > 0) {
+            result->statusCode = UA_STATUSCODE_BADTOOMANYARGUMENTS;
+            return;
+        }
+    }
 
     /* Return inputArgumentResults only for BADINVALIDARGUMENT */
     if(result->statusCode != UA_STATUSCODE_BADINVALIDARGUMENT) {

From eb454ad142b4763a4f0a4b0c55a70b40c342be54 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 11 Jun 2022 00:06:34 +0200
Subject: [PATCH 0228/1963] refactor(server): Move method arguments to a
 mutable array before type checking

---
 src/server/ua_services_method.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index a1ebbd13280..a46ec58af37 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -18,6 +18,8 @@
 
 #ifdef UA_ENABLE_METHODCALLS /* conditional compilation */
 
+#define UA_MAX_METHOD_ARGUMENTS 64
+
 static const UA_VariableNode *
 getArgumentsVariableNode(UA_Server *server, const UA_NodeHead *head,
                          UA_String withBrowseName) {
@@ -51,9 +53,9 @@ getArgumentsVariableNode(UA_Server *server, const UA_NodeHead *head,
 
 /* inputArgumentResults has the length request->inputArgumentsSize */
 static UA_StatusCode
-typeCheckArguments(UA_Server *server, UA_Session *session,
-                   const UA_VariableNode *argRequirements, size_t argsSize,
-                   UA_Variant *args, UA_StatusCode *inputArgumentResults) {
+checkAdjustArguments(UA_Server *server, UA_Session *session,
+                     const UA_VariableNode *argRequirements, size_t argsSize,
+                     UA_Variant *args, UA_StatusCode *inputArgumentResults) {
     /* Verify that we have a Variant containing UA_Argument (scalar or array) in
      * the "InputArguments" node */
     if(argRequirements->valueSource != UA_VALUESOURCE_DATA)
@@ -289,6 +291,19 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
         return;
     }
 
+    /* The input arguments are const and not changed. We move the input
+     * arguments to a secondary array that is mutable. This is used for small
+     * adjustments on the type level during the type checking. But it has to be
+     * ensured that the original array can still by _clear'ed after the methods
+     * call. */
+    if(request->inputArgumentsSize > UA_MAX_METHOD_ARGUMENTS) {
+        result->statusCode = UA_STATUSCODE_BADTOOMANYARGUMENTS;
+        return;
+    }
+    UA_Variant mutableInputArgs[UA_MAX_METHOD_ARGUMENTS];
+    memcpy(mutableInputArgs, request->inputArguments,
+           sizeof(UA_Variant) * request->inputArgumentsSize);
+
     /* Allocate the inputArgumentResults array */
     result->inputArgumentResults = (UA_StatusCode*)
         UA_Array_new(request->inputArgumentsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
@@ -303,8 +318,8 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
         getArgumentsVariableNode(server, &method->head, UA_STRING("InputArguments"));
     if(inputArguments) {
         result->statusCode =
-            typeCheckArguments(server, session, inputArguments, request->inputArgumentsSize,
-                               request->inputArguments, inputArgumentResults);
+            checkAdjustArguments(server, session, inputArguments, request->inputArgumentsSize,
+                                 mutableInputArgs, result->inputArgumentResults);
         UA_NODESTORE_RELEASE(server, (const UA_Node*)inputArguments);
     } else {
         if(request->inputArgumentsSize > 0) {
@@ -349,7 +364,7 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
     result->statusCode = method->method(server, &session->sessionId, session->sessionHandle,
                                         &method->head.nodeId, method->head.context,
                                         &object->head.nodeId, object->head.context,
-                                        request->inputArgumentsSize, request->inputArguments,
+                                        request->inputArgumentsSize, mutableInputArgs,
                                         result->outputArgumentsSize, result->outputArguments);
     UA_LOCK(&server->serviceMutex);
     /* TODO: Verify Output matches the argument definition */

From 4708d7a51bace48fde36bdb87de9f41527078bcf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 11 Jun 2022 00:08:52 +0200
Subject: [PATCH 0229/1963] feat(server): Unwrap ExtensionObject type checks /
 adjustments

---
 src/server/ua_services_attribute.c        | 69 ++++++++++++++++++-----
 tests/server/check_local_monitored_item.c |  3 +-
 2 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index d5324e5d436..9557384392f 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1087,6 +1087,51 @@ compatibleValue(UA_Server *server, UA_Session *session, const UA_NodeId *targetD
 /* Write Service */
 /*****************/
 
+static void
+unwrapEOArray(UA_Server *server, UA_Variant *value) {
+    /* Only works on arrays of ExtensionObjects */
+    if(!UA_Variant_hasArrayType(value, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) ||
+       value->arrayLength == 0)
+        return;
+
+    /* All eo need to be already decoded and have the same wrapped type */
+    UA_ExtensionObject *eo = (UA_ExtensionObject*)value->data;
+    const UA_DataType *innerType = eo[0].content.decoded.type;
+    for(size_t i = 0; i < value->arrayLength; i++) {
+        if(eo[i].encoding != UA_EXTENSIONOBJECT_DECODED &&
+           eo[i].encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE)
+            return;
+        if(eo[i].content.decoded.type != innerType)
+            return;
+    }
+
+    /* Allocate the array for the unwrapped data. Since the adjusted value is
+     * not cleaned up (only the original value), this memory is being cleaned up
+     * by a delayed callback in the server after the method call has
+     * finished. */
+    UA_DelayedCallback *dc = (UA_DelayedCallback*)
+        UA_malloc(sizeof(UA_DelayedCallback) + (value->arrayLength * innerType->memSize));
+    if(!dc)
+        return;
+    dc->callback = NULL; /* No callback, just free the memory */
+
+    /* Move the content */
+    uintptr_t pos = ((uintptr_t)dc) + sizeof(UA_DelayedCallback);
+    void *unwrappedArray = (void*)pos;
+    for(size_t i = 0; i < value->arrayLength; i++) {
+        memcpy((void*)pos, eo[i].content.decoded.data, innerType->memSize);
+        pos += innerType->memSize;
+    }
+
+    /* Adjust the value */
+    value->type = innerType;
+    value->data = unwrappedArray;
+
+    /* Add the delayed callback to free the memory of the unwrapped array */
+    server->config.eventLoop->
+        addDelayedCallback(server->config.eventLoop, dc);
+}
+
 void
 adjustValueType(UA_Server *server, UA_Variant *value,
                 const UA_NodeId *targetDataTypeId) {
@@ -1098,6 +1143,9 @@ adjustValueType(UA_Server *server, UA_Variant *value,
     if(!targetDataType)
         return;
 
+    /* Unwrap ExtensionObject arrays if they all contain the same DataType */
+    unwrapEOArray(server, value);
+
     /* A string is written to a byte array. the valuerank and array dimensions
      * are checked later */
     if(targetDataType == &UA_TYPES[UA_TYPES_BYTE] &&
@@ -1359,21 +1407,16 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
     UA_DataValue adjustedValue = *value;
 
     /* Type checking. May change the type of editableValue */
-    if(value->hasValue && value->value.type) {
+    const char *reason;
+    if(value->hasValue && value->value.type &&
+       !compatibleValue(server, session, &node->dataType, node->valueRank,
+                        node->arrayDimensionsSize, node->arrayDimensions,
+                        &adjustedValue.value, rangeptr, &reason)) {
+        /* Try to correct the type */
         adjustValueType(server, &adjustedValue.value, &node->dataType);
 
-        /* The value may be an extension object, especially the nodeset compiler
-         * uses extension objects to write variable values. If value is an
-         * extension object we check if the current node value is also an
-         * extension object. */
-        const UA_NodeId nodeDataType = UA_NODEID_NUMERIC(0, UA_NS0ID_STRUCTURE);
-        const UA_NodeId *nodeDataTypePtr = &node->dataType;
-        if(value->value.type->typeId.identifierType == UA_NODEIDTYPE_NUMERIC &&
-           value->value.type->typeId.identifier.numeric == UA_NS0ID_STRUCTURE)
-            nodeDataTypePtr = &nodeDataType;
-
-        const char *reason;
-        if(!compatibleValue(server, session, nodeDataTypePtr, node->valueRank,
+        /* Recheck the type */
+        if(!compatibleValue(server, session, &node->dataType, node->valueRank,
                             node->arrayDimensionsSize, node->arrayDimensions,
                             &adjustedValue.value, rangeptr, &reason)) {
             UA_LOG_NODEID_WARNING(&node->head.nodeId,
diff --git a/tests/server/check_local_monitored_item.c b/tests/server/check_local_monitored_item.c
index bce122bbeda..57cfa0c6829 100644
--- a/tests/server/check_local_monitored_item.c
+++ b/tests/server/check_local_monitored_item.c
@@ -182,7 +182,8 @@ START_TEST(Server_LocalMonitoredItem_CustomType) {
     for(size_t i = 0; i < 100; i++) {
         UA_ExtensionObject_setValueNoDelete(&arr[i], &p, &PointType);
     }
-    UA_Server_writeValue(server, outNodeId, val);
+    UA_StatusCode retval = UA_Server_writeValue(server, outNodeId, val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_fakeSleep(100);
     UA_Server_run_iterate(server, 1);

From 37bf2d19f49f7f8e18e21e4319c12700136fbc83 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 25 May 2022 14:32:34 +0200
Subject: [PATCH 0230/1963] feat(pubsub): Make UA_Server_removePublishedDataSet
 thread-safe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub_manager.c    | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 24dc0c3773c..42676efc79b 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -332,7 +332,7 @@ UA_Server_getPublishedDataSetMetaData(UA_Server *server, const UA_NodeId pds,
 /* Remove PublishedDataSet, identified by the NodeId. Deletion of PDS removes
  * all contained and linked PDS Fields. Connected WriterGroups will be also
  * removed. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds);
 
 /**
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index a5eee063af1..1960d2660f8 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -326,8 +326,8 @@ UA_Server_addPublishedDataSet(UA_Server *server,
     return result;
 }
 
-UA_StatusCode
-UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
+static UA_StatusCode
+removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
     //search the identified PublishedDataSet and store the PDS index
     UA_PublishedDataSet *publishedDataSet = UA_PublishedDataSet_findPDSbyId(server, pds);
     if(!publishedDataSet){
@@ -363,6 +363,14 @@ UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = removePublishedDataSet(server, pds);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* Calculate the time difference between current time and UTC (00:00) on January
  * 1, 2000. */
 UA_UInt32
@@ -395,7 +403,9 @@ UA_PubSubManager_generateUniqueGuid(UA_Server *server) {
  * action also delete the configured PubSub transport Layers. */
 void
 UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "PubSub cleanup was called.");
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                "PubSub cleanup was called.");
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Stop and unfreeze all WriterGroups */
     UA_PubSubConnection *tmpConnection;
@@ -421,8 +431,9 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
         removePubSubConnection(server, tmpConnection1->identifier);
     }
     UA_PublishedDataSet *tmpPDS1, *tmpPDS2;
-    TAILQ_FOREACH_SAFE(tmpPDS1, &server->pubSubManager.publishedDataSets, listEntry, tmpPDS2){
-        UA_Server_removePublishedDataSet(server, tmpPDS1->identifier);
+    TAILQ_FOREACH_SAFE(tmpPDS1, &server->pubSubManager.publishedDataSets,
+                       listEntry, tmpPDS2){
+        removePublishedDataSet(server, tmpPDS1->identifier);
     }
 }
 

From 0453e2af194621342df311cb2f0414080ef7c63e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 15:03:27 +0200
Subject: [PATCH 0231/1963] refactor(pubsub): Remove
 UA_Server_processNetworkMessage from internal header

---
 src/pubsub/ua_pubsub.h        |  7 -------
 src/pubsub/ua_pubsub_reader.c | 10 ++++++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 8dc4adb5c44..240e2c91efa 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -101,13 +101,6 @@ UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection);
 UA_StatusCode
 UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier);
 
-/* Process Network Message for a ReaderGroup. But we the ReaderGroup needs to be
- * identified first. */
-UA_StatusCode
-UA_Server_processNetworkMessage(UA_Server *server,
-                                UA_PubSubConnection *connection,
-                                UA_NetworkMessage *msg);
-
 /**********************************************/
 /*              DataSetWriter                 */
 /**********************************************/
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 2e6ce53066c..a3f4788afe3 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1239,9 +1239,11 @@ processMessageWithReader(UA_Server *server, UA_ReaderGroup *readerGroup,
     }
 }
 
-UA_StatusCode
-UA_Server_processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
-                                UA_NetworkMessage* msg) {
+/* Process Network Message for a ReaderGroup. But we the ReaderGroup needs to be
+ * identified first. */
+static UA_StatusCode
+processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
+                      UA_NetworkMessage* msg) {
     if(!msg || !connection)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
@@ -1384,7 +1386,7 @@ decodeAndProcessNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
     UA_CHECK_STATUS_WARN(rv, goto cleanup, &server->config.logger, UA_LOGCATEGORY_SERVER,
                          "Subscribe failed. verify, decrypt and decode network message failed.");
 
-    rv = UA_Server_processNetworkMessage(server, connection, &nm);
+    rv = processNetworkMessage(server, connection, &nm);
     // TODO: check what action to perform on error (nothing?)
     UA_CHECK_STATUS_WARN(rv, (void)0, &server->config.logger, UA_LOGCATEGORY_SERVER,
                          "Subscribe failed. process network message failed.");

From 47aaa12c7200052a37aab721feb00f501475ad9f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 4 Jun 2022 15:23:44 +0200
Subject: [PATCH 0232/1963] refactor(pubsub): Cosmetic cleanup in
 ua_pubsub_reader.c

---
 src/pubsub/ua_pubsub_reader.c | 57 +++++++++++++++--------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index a3f4788afe3..495f9d617a6 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1372,35 +1372,30 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
     return UA_STATUSCODE_GOOD;
 }
 
-static
-UA_StatusCode
-decodeAndProcessNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
-                               UA_PubSubConnection *connection,
-                               UA_ByteString *buffer) {
+static UA_StatusCode
+decodeAndProcessNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
+                               UA_ByteString *buf) {
     UA_NetworkMessage nm;
     memset(&nm, 0, sizeof(UA_NetworkMessage));
-    size_t currentPosition = 0;
 
-    UA_StatusCode rv = UA_STATUSCODE_GOOD;
-    rv = decodeNetworkMessage(server, buffer, &currentPosition, &nm, connection);
+    size_t currentPosition = 0;
+    UA_StatusCode rv = decodeNetworkMessage(server, buf, &currentPosition,
+                                            &nm, connection);
     UA_CHECK_STATUS_WARN(rv, goto cleanup, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Subscribe failed. verify, decrypt and decode network message failed.");
+                         "Verify, decrypt and decode network message failed.");
 
     rv = processNetworkMessage(server, connection, &nm);
-    // TODO: check what action to perform on error (nothing?)
     UA_CHECK_STATUS_WARN(rv, (void)0, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Subscribe failed. process network message failed.");
+                         "Processing the network message failed.");
 
 cleanup:
     UA_NetworkMessage_clear(&nm);
     return rv;
 }
 
-static
-UA_StatusCode
+static UA_StatusCode
 decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
-                                 UA_PubSubConnection *connection,
-                                 UA_ByteString *buffer) {
+                                 UA_PubSubConnection *connection, UA_ByteString *buf) {
 #ifdef UA_ENABLE_PUBSUB_BUFMALLOC
     useMembufAlloc();
 #endif
@@ -1414,18 +1409,15 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_NetworkMessage currentNetworkMessage;
     memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
-    UA_StatusCode rv;
-    size_t payLoadPosition = 0;
-    rv = UA_NetworkMessage_decodeHeaders(
-        buffer, &payLoadPosition, &currentNetworkMessage);
 
+    size_t payLoadPosition = 0;
+    UA_StatusCode rv =
+        UA_NetworkMessage_decodeHeaders(buf, &payLoadPosition, &currentNetworkMessage);
     UA_CHECK_STATUS_ERROR(rv, return rv, &server->config.logger, UA_LOGCATEGORY_SERVER,
                           "PubSub receive. decoding headers failed");
-    rv = verifyAndDecryptNetworkMessage(&server->config.logger,
-                                        buffer,
-                                        &payLoadPosition,
-                                        &currentNetworkMessage,
-                                        readerGroup);
+
+    rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &payLoadPosition,
+                                        &currentNetworkMessage, readerGroup);
     UA_CHECK_STATUS_WARN(rv, return rv, &server->config.logger, UA_LOGCATEGORY_SERVER,
                          "Subscribe failed. verify and decrypt network message failed.");
     UA_NetworkMessage_clear(&currentNetworkMessage);
@@ -1434,7 +1426,7 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
     /* Decode only the necessary offset and update the networkMessage */
     UA_StatusCode res =
         UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage,
-                                                  buffer, &currentPosition);
+                                                  buf, &currentPosition);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
                     "PubSub receive. Unknown field type.");
@@ -1471,18 +1463,17 @@ typedef struct {
 
 static UA_StatusCode
 decodeAndProcessFun(UA_PubSubChannel *channel, void *cbContext,
-                    const UA_ByteString *buffer) {
-    UA_ByteString mutableBuffer = {buffer->length, buffer->data};
-    UA_RGContext *ctx = (UA_RGContext*) cbContext;
-    return decodeAndProcessNetworkMessage(ctx->server, ctx->readerGroup,
-                                          ctx->connection, &mutableBuffer);
+                    const UA_ByteString *buf) {
+    UA_RGContext *ctx = (UA_RGContext*)cbContext;
+    UA_ByteString mutableBuffer = {buf->length, buf->data};
+    return decodeAndProcessNetworkMessage(ctx->server, ctx->connection, &mutableBuffer);
 }
 
 static UA_StatusCode
 decodeAndProcessFunRT(UA_PubSubChannel *channel, void *cbContext,
-                      const UA_ByteString *buffer) {
-    UA_ByteString mutableBuffer = {buffer->length, buffer->data};
-    UA_RGContext *ctx = (UA_RGContext*) cbContext;
+                      const UA_ByteString *buf) {
+    UA_RGContext *ctx = (UA_RGContext*)cbContext;
+    UA_ByteString mutableBuffer = {buf->length, buf->data};
     return decodeAndProcessNetworkMessageRT(ctx->server, ctx->readerGroup,
                                             ctx->connection, &mutableBuffer);
 }

From 3be75f8eccc87dd5a7e8f822dfdd432b26ad32fc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jun 2022 13:54:14 +0200
Subject: [PATCH 0233/1963] fix(pubsub): Expect to receive an unpacked
 ExtensionObject in addPublishedDataItemsAction

---
 src/pubsub/ua_pubsub_ns0.c | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 12aa8abc5e3..e1549649a11 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -970,9 +970,11 @@ addPublishedDataItemsAction(UA_Server *server,
     size_t fieldFlagsSize = input[2].arrayLength;
     UA_DataSetFieldFlags * fieldFlags = (UA_DataSetFieldFlags *) input[2].data;
     size_t variablesToAddSize = input[3].arrayLength;
-    UA_ExtensionObject *eoAddVar = (UA_ExtensionObject *)input[3].data;
+    UA_PublishedVariableDataType *eoAddVar =
+        (UA_PublishedVariableDataType *)input[3].data;
 
-    if(!(fieldNameAliasesSize == fieldFlagsSize || fieldFlagsSize == variablesToAddSize))
+    if(fieldNameAliasesSize != fieldFlagsSize ||
+       fieldFlagsSize != variablesToAddSize)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     UA_PublishedDataSetConfig publishedDataSetConfig;
@@ -994,27 +996,16 @@ addPublishedDataItemsAction(UA_Server *server,
         memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
         dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
         dataSetFieldConfig.field.variable.fieldNameAlias = fieldNameAliases[j];
+        dataSetFieldConfig.field.variable.publishParameters = eoAddVar[j];
         if(fieldFlags[j] == UA_DATASETFIELDFLAGS_PROMOTEDFIELD)
             dataSetFieldConfig.field.variable.promotedField = true;
-
-        UA_PublishedVariableDataType variablesToAddField;
-        UA_PublishedVariableDataType_init(&variablesToAddField);
-        if(eoAddVar[j].encoding == UA_EXTENSIONOBJECT_DECODED){
-            if(eoAddVar[j].content.decoded.type == &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]){
-                if(UA_PublishedVariableDataType_copy((UA_PublishedVariableDataType *) eoAddVar[j].content.decoded.data,
-                                                      &variablesToAddField) != UA_STATUSCODE_GOOD){
-                    return UA_STATUSCODE_BADOUTOFMEMORY;
-                }
-            }
-        }
-        dataSetFieldConfig.field.variable.publishParameters = variablesToAddField;
-        retVal |= UA_Server_addDataSetField(server, dataSetItemsNodeId, &dataSetFieldConfig, NULL).result;
+        retVal |= UA_Server_addDataSetField(server, dataSetItemsNodeId,
+                                            &dataSetFieldConfig, NULL).result;
         if(retVal != UA_STATUSCODE_GOOD) {
-           UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addDataSetField failed");
+           UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                        "addDataSetField failed");
            return retVal;
         }
-
-        UA_PublishedVariableDataType_clear(&variablesToAddField);
     }
 
     UA_Variant_setScalarCopy(output, &dataSetItemsNodeId, &UA_TYPES[UA_TYPES_NODEID]);

From 3b3c7a87fefe7fd424c585aea88a2647c394738b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 Jun 2022 20:35:36 +0200
Subject: [PATCH 0234/1963] feat(pubsub): Make additional WriterGroup methods
 thread-safe

---
 include/open62541/server_pubsub.h  |  4 ++--
 src/pubsub/ua_pubsub_writergroup.c | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 42676efc79b..5ebd4d3b0e5 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -535,10 +535,10 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server, const UA_NodeId writ
 UA_StatusCode UA_EXPORT
 UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server, const UA_NodeId writerGroup);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_setWriterGroupOperational(UA_Server *server, const UA_NodeId writerGroup);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_setWriterGroupDisabled(UA_Server *server, const UA_NodeId writerGroup);
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 9b577f9dd31..c261e5f1159 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -427,21 +427,27 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
 UA_StatusCode
 UA_Server_setWriterGroupOperational(UA_Server *server,
                                     const UA_NodeId writerGroup) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(!wg)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL,
-                                         UA_STATUSCODE_GOOD);
+    if(wg)
+        res = UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL,
+                                            UA_STATUSCODE_GOOD);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode
 UA_Server_setWriterGroupDisabled(UA_Server *server,
                                  const UA_NodeId writerGroup) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(!wg)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_DISABLED,
-                                         UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
+    if(wg)
+        res = UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_DISABLED,
+                                            UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode

From 5336835558ffbd7204363f1c4151748672c7c73e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 Jun 2022 20:44:56 +0200
Subject: [PATCH 0235/1963] feat(pubsub): Make
 UA_Server_updateWriterGroupConfig thread-safe

---
 include/open62541/server_pubsub.h  | 2 +-
 src/pubsub/ua_pubsub_writergroup.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 5ebd4d3b0e5..b0bc1fb9e5b 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -517,7 +517,7 @@ UA_StatusCode UA_EXPORT
 UA_Server_getWriterGroupConfig(UA_Server *server, const UA_NodeId writerGroup,
                                UA_WriterGroupConfig *config);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdentifier,
                                   const UA_WriterGroupConfig *config);
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index c261e5f1159..56791e794e3 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -489,14 +489,18 @@ UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdenti
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
+    UA_LOCK(&server->serviceMutex);
     UA_WriterGroup *currentWriterGroup =
         UA_WriterGroup_findWGbyId(server, writerGroupIdentifier);
-    if(!currentWriterGroup)
+    if(!currentWriterGroup) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
+    }
 
     if(currentWriterGroup->configurationFrozen){
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Modify WriterGroup failed. WriterGroup is frozen.");
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -532,6 +536,7 @@ UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdenti
                        "No or unsupported WriterGroup update.");
     }
 
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 

From 7f45607aabedbd668efe5d7cc74077897fad9f1f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 Jun 2022 20:45:40 +0200
Subject: [PATCH 0236/1963] feat(pubsub): The publish callback takes the server
 mutex

---
 src/pubsub/ua_pubsub_writergroup.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 56791e794e3..31d2333e692 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -1238,16 +1238,19 @@ publishRegular(UA_Server *server, UA_WriterGroup *writerGroup,
  * contained DataSetMessages. */
 void
 UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
+    UA_LOCK(&server->serviceMutex);
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "Publish Callback");
 
     // TODO: review if its okay to force correct value from caller side instead
     // UA_assert(writerGroup != NULL);
     // UA_assert(server != NULL);
-    UA_CHECK_MEM_WARN(writerGroup, return,
+    UA_CHECK_MEM_WARN(writerGroup,
+                      UA_UNLOCK(&server->serviceMutex); return,
                       &server->config.logger, UA_LOGCATEGORY_SERVER,
                       "Publish failed. WriterGroup not found");
     /* Nothing to do? */
     if(writerGroup->writersCount == 0) {
+        UA_UNLOCK(&server->serviceMutex);
         return;
     }
     /* Binary or Json encoding?  */
@@ -1269,11 +1272,13 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     } else {
         publishRegular(server, writerGroup, connection);
     }
+    UA_UNLOCK(&server->serviceMutex);
     return;
 
 error:
     UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_ERROR,
                                   UA_STATUSCODE_BADCONNECTIONCLOSED);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 /* Add new publishCallback. The first execution is triggered directly after
@@ -1300,8 +1305,11 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup
     if(retval == UA_STATUSCODE_GOOD)
         writerGroup->publishCallbackIsRegistered = true;
 
-    /* Run once after creation */
+    /* Run once after creation. The Publish callback itself takes the server
+     * mutex. So we release it first. */
+    UA_UNLOCK(&server->serviceMutex);
     UA_WriterGroup_publishCallback(server, writerGroup);
+    UA_LOCK(&server->serviceMutex);
     return retval;
 }
 

From f2f981837d34f316929485b3e3c7e5e63c9d0ced Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 Jun 2022 20:46:11 +0200
Subject: [PATCH 0237/1963] refactor(pubsub): Add mutex assertions in
 ua_pubsub_writergroup.c

---
 src/pubsub/ua_pubsub_writergroup.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 31d2333e692..d3f42cf2e50 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -639,6 +639,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
                               UA_WriterGroup *writerGroup,
                               UA_PubSubState state,
                               UA_StatusCode cause) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     UA_DataSetWriter *dataSetWriter;
     UA_PubSubState oldState = writerGroup->state;
@@ -1033,6 +1034,7 @@ sendBufferedNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
 
 static UA_INLINE void
 publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *connection) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(UA_NetworkMessage_updateBufferedMessage(&writerGroup->bufferedMessage) != UA_STATUSCODE_GOOD)
         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -1110,6 +1112,7 @@ sendNetworkMessage(UA_WriterGroup *writerGroup, UA_PubSubConnection *connection,
 
 static UA_INLINE void
 setErrorStateForDataSetWritersWithIds(UA_Server *server, UA_WriterGroup *writerGroup, UA_UInt16 *dsWriterIds, size_t idCount) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "PubSub Publish: Sending a NetworkMessage failed");
 
@@ -1153,6 +1156,7 @@ static UA_INLINE size_t
 sendOrCollectDataSetMessage(UA_Server *server, UA_WriterGroup *writerGroup, UA_DataSetWriter *writer,
                             UA_PubSubConnection *connection, UA_Byte maxDSM, UA_UInt16 *dsWriterId,
                             UA_DataSetMessage *dataSetMessage) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(writer->state != UA_PUBSUBSTATE_OPERATIONAL) {
         return 0;
     }
@@ -1193,7 +1197,10 @@ static UA_INLINE void
 sendCollectedDataSetMessagesInBatches(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *connection,
                                       UA_UInt16 *dsWriterIds, UA_DataSetMessage *dataSetMessageBuffer,
                                       size_t collectedDatasetMessageCount,
-                                      UA_Byte maxDSMCount) {/* Send the NetworkMessages with batched DataSetMessages */
+                                      UA_Byte maxDSMCount) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* Send the NetworkMessages with batched DataSetMessages */
     size_t cursor, dsmCount;
     FOR_EACH_CHUNK(cursor, dsmCount, maxDSMCount, collectedDatasetMessageCount) {
         UA_StatusCode res = sendNetworkMessage(
@@ -1214,6 +1221,8 @@ sendCollectedDataSetMessagesInBatches(UA_Server *server, UA_WriterGroup *writerG
 static void
 publishRegular(UA_Server *server, UA_WriterGroup *writerGroup,
                UA_PubSubConnection *connection) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* It is possible to put several DataSetMessages into one NetworkMessage.
      * But only if they do not contain promoted fields. NM with only DSM are
      * sent out right away. The others are kept in a buffer for "batching". */
@@ -1285,6 +1294,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
  * creation. */
 UA_StatusCode
 UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(writerGroup->config.pubsubManagerCallback.addCustomCallback)
         retval |= writerGroup->config.pubsubManagerCallback.

From 4a6d789b25527d10168f5ae0892e4b11ecb13e47 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 Jun 2022 20:51:40 +0200
Subject: [PATCH 0238/1963] feat(server): Make UA_Server_removeDataSetWriter
 thread-safe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub.h            |  3 +++
 src/pubsub/ua_pubsub_manager.c    |  2 +-
 src/pubsub/ua_pubsub_writer.c     | 14 +++++++++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index b0bc1fb9e5b..2d31a0f46fd 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -599,7 +599,7 @@ UA_StatusCode UA_EXPORT
 UA_Server_DataSetWriter_getState(UA_Server *server, UA_NodeId dataSetWriterIdentifier,
                                UA_PubSubState *state);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw);
 
 /**
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 240e2c91efa..fcbbe6399ca 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -152,6 +152,9 @@ UA_StatusCode
 UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
                         UA_DataSetWriter *dataSetWriter);
 
+UA_StatusCode
+removeDataSetWriter(UA_Server *server, const UA_NodeId dsw);
+
 /**********************************************/
 /*               WriterGroup                  */
 /**********************************************/
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 1960d2660f8..a9950d03c79 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -347,7 +347,7 @@ removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
             UA_DataSetWriter *currentWriter, *tmpWriterGroup;
             LIST_FOREACH_SAFE(currentWriter, &writerGroup->writers, listEntry, tmpWriterGroup){
                 if(UA_NodeId_equal(&currentWriter->connectedDataSet, &publishedDataSet->identifier)){
-                    UA_Server_removeDataSetWriter(server, currentWriter->identifier);
+                    removeDataSetWriter(server, currentWriter->identifier);
                 }
             }
         }
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 41719b549c3..6176e975c38 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -874,6 +874,8 @@ UA_Server_addDataSetWriter(UA_Server *server,
 UA_StatusCode
 UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
                         UA_DataSetWriter *dataSetWriter) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Frozen? */
     if(linkedWriterGroup->configurationFrozen) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -895,7 +897,9 @@ UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
 }
 
 UA_StatusCode
-UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
+removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_DataSetWriter *dataSetWriter = UA_DataSetWriter_findDSWbyId(server, dsw);
     if(!dataSetWriter)
         return UA_STATUSCODE_BADNOTFOUND;
@@ -914,6 +918,14 @@ UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
     return UA_DataSetWriter_remove(server, linkedWriterGroup, dataSetWriter);
 }
 
+UA_StatusCode
+UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = removeDataSetWriter(server, dsw);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /**********************************************/
 /*                DataSetField                */
 /**********************************************/

From 970ea27750054dc78f18c75a62827e9bb73ac27f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 Jun 2022 21:01:50 +0200
Subject: [PATCH 0239/1963] feat(pubsub): Make UA_Server_addDataSetWriter
 thread-safe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub_ns0.c        |  9 ++++++++-
 src/pubsub/ua_pubsub_writer.c     | 24 +++++++++++++++++++-----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 2d31a0f46fd..720d8583ab2 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -583,7 +583,7 @@ UA_DataSetWriterConfig_clear(UA_DataSetWriterConfig *pdsConfig);
  * Part 14, 7.1.5.2.1 defines: The link between the PublishedDataSet and
  * DataSetWriter shall be created when an instance of the DataSetWriterType is
  * created. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_addDataSetWriter(UA_Server *server,
                            const UA_NodeId writerGroup, const UA_NodeId dataSet,
                            const UA_DataSetWriterConfig *dataSetWriterConfig,
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index e1549649a11..fadf119ecbc 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1325,14 +1325,19 @@ addReaderGroupAction(UA_Server *server,
 /**********************************************/
 
 UA_StatusCode
-addDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWriter){
+addDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWriter) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     if(dataSetWriter->config.name.length > 512)
         return UA_STATUSCODE_BADOUTOFMEMORY;
+
     char dswName[513];
     memcpy(dswName, dataSetWriter->config.name.data, dataSetWriter->config.name.length);
     dswName[dataSetWriter->config.name.length] = '\0';
 
+    UA_UNLOCK(&server->serviceMutex);
+
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", dswName);
     retVal = UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* create an id */
@@ -1392,6 +1397,8 @@ addDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWrite
                                       UA_QUALIFIEDNAME(0, "MessageSettings"),
                                       UA_NODEID_NUMERIC(0, UA_NS0ID_UADPDATASETWRITERMESSAGETYPE),
                                       object_attr, NULL, NULL);
+
+    UA_LOCK(&server->serviceMutex);
     return retVal;
 }
 
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 6176e975c38..c087703c559 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -746,11 +746,12 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
     return ret;
 }
 
-UA_StatusCode
-UA_Server_addDataSetWriter(UA_Server *server,
-                           const UA_NodeId writerGroup, const UA_NodeId dataSet,
-                           const UA_DataSetWriterConfig *dataSetWriterConfig,
-                           UA_NodeId *writerIdentifier) {
+static UA_StatusCode
+addDataSetWriter(UA_Server *server,
+                 const UA_NodeId writerGroup, const UA_NodeId dataSet,
+                 const UA_DataSetWriterConfig *dataSetWriterConfig,
+                 UA_NodeId *writerIdentifier) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(!dataSetWriterConfig)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
@@ -871,6 +872,19 @@ UA_Server_addDataSetWriter(UA_Server *server,
     return res;
 }
 
+UA_StatusCode
+UA_Server_addDataSetWriter(UA_Server *server,
+                           const UA_NodeId writerGroup, const UA_NodeId dataSet,
+                           const UA_DataSetWriterConfig *dataSetWriterConfig,
+                           UA_NodeId *writerIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res =
+        addDataSetWriter(server, writerGroup, dataSet,
+                         dataSetWriterConfig, writerIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
                         UA_DataSetWriter *dataSetWriter) {

From 31b5d046b6540bf5826d644e01c9c1cecc137c9c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 Jun 2022 21:31:02 +0200
Subject: [PATCH 0240/1963] fix(pubsub): Make a deep copy of the
 PublishedDataSet NodeId in addDataSetField

---
 src/pubsub/ua_pubsub_writer.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index c087703c559..66394f4f00a 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -390,14 +390,18 @@ addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
         return result;
     }
 
-    UA_StatusCode retVal = UA_DataSetFieldConfig_copy(fieldConfig, &newField->config);
-    if(retVal != UA_STATUSCODE_GOOD) {
+    result.result = UA_DataSetFieldConfig_copy(fieldConfig, &newField->config);
+    if(result.result != UA_STATUSCODE_GOOD) {
         UA_free(newField);
-        result.result = retVal;
         return result;
     }
 
-    newField->publishedDataSet = currDS->identifier;
+    result.result = UA_NodeId_copy(&currDS->identifier, &newField->publishedDataSet);
+    if(result.result != UA_STATUSCODE_GOOD) {
+        UA_DataSetFieldConfig_clear(&newField->config);
+        UA_free(newField);
+        return result;
+    }
 
     /* Initialize the field metadata. Also generates a FieldId */
     UA_FieldMetaData fmd;
@@ -406,6 +410,7 @@ addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
     if(result.result != UA_STATUSCODE_GOOD) {
         UA_FieldMetaData_clear(&fmd);
         UA_DataSetFieldConfig_clear(&newField->config);
+        UA_NodeId_clear(&newField->publishedDataSet);
         UA_free(newField);
         return result;
     }
@@ -417,6 +422,7 @@ addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
     if(result.result != UA_STATUSCODE_GOOD) {
         UA_FieldMetaData_clear(&fmd);
         UA_DataSetFieldConfig_clear(&newField->config);
+        UA_NodeId_clear(&newField->publishedDataSet);
         UA_free(newField);
         return result;
     }

From b16ccb4f8241afcce28076e6ccf3a453b4e231dc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 Jun 2022 21:36:16 +0200
Subject: [PATCH 0241/1963] fix(test): Use only variables that exist in the
 reduced information model for pubsub tests

---
 tests/pubsub/check_pubsub_informationmodel_methods.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 66bc380c5e9..38ada672aa1 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -150,9 +150,9 @@ static void addPublishedDataSets(void){
     UA_Variant_setArray(&inputArguments[2], dataSetFieldFlags, 2, &UA_TYPES[UA_TYPES_DATASETFIELDFLAGS]);
 
     UA_PublishedVariableDataType *variablesToAdd = (UA_PublishedVariableDataType *) UA_calloc(2, sizeof(UA_PublishedVariableDataType));
-    variablesToAdd[0].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
+    variablesToAdd[0].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
     variablesToAdd[0].attributeId = UA_ATTRIBUTEID_VALUE;
-    variablesToAdd[1].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_CURRENTSERVERID);
+    variablesToAdd[1].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
     variablesToAdd[1].attributeId = UA_ATTRIBUTEID_VALUE;
     UA_Variant_setArray(&inputArguments[3], variablesToAdd, 2, &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]);
 
@@ -645,9 +645,9 @@ START_TEST(AddAndRemovePublishedDataSetItemsUsingServer){
         UA_Variant_setArray(&inputArguments[2], dataSetFieldFlags, 2, &UA_TYPES[UA_TYPES_DATASETFIELDFLAGS]);
 
         UA_PublishedVariableDataType *variablesToAdd = (UA_PublishedVariableDataType *) UA_calloc(2, sizeof(UA_PublishedVariableDataType));
-        variablesToAdd[0].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
+        variablesToAdd[0].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
         variablesToAdd[0].attributeId = UA_ATTRIBUTEID_VALUE;
-        variablesToAdd[1].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_CURRENTSERVERID);
+        variablesToAdd[1].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
         variablesToAdd[1].attributeId = UA_ATTRIBUTEID_VALUE;
         UA_Variant_setArray(&inputArguments[3], variablesToAdd, 2, &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]);
 
@@ -700,9 +700,9 @@ START_TEST(AddAndRemovePublishedDataSetItemsUsingClient){
         UA_Variant_setArray(&inputArguments[2], dataSetFieldFlags, 2, &UA_TYPES[UA_TYPES_DATASETFIELDFLAGS]);
 
         UA_PublishedVariableDataType *variablesToAdd = (UA_PublishedVariableDataType *) UA_calloc(2, sizeof(UA_PublishedVariableDataType));
-        variablesToAdd[0].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
+        variablesToAdd[0].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
         variablesToAdd[0].attributeId = UA_ATTRIBUTEID_VALUE;
-        variablesToAdd[1].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_CURRENTSERVERID);
+        variablesToAdd[1].publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
         variablesToAdd[1].attributeId = UA_ATTRIBUTEID_VALUE;
         UA_Variant_setArray(&inputArguments[3], variablesToAdd, 2, &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]);
 

From c4df2186fd8a40bf1ad2c4b5c607b54dab93624f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 14 Jun 2022 11:41:35 +0200
Subject: [PATCH 0242/1963] fix(pubsub): Remove all ReaderGroups and
 WriterGroups in UA_PubSubManager_delete

---
 src/pubsub/ua_pubsub_manager.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index a9950d03c79..1108feb9b21 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -407,14 +407,26 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
                 "PubSub cleanup was called.");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    /* Stop and unfreeze all WriterGroups */
+    /* Stop, unfreeze and delete all WriterGroups */
     UA_PubSubConnection *tmpConnection;
-    TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry){
-        UA_WriterGroup *writerGroup;
-        LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
+    TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry) {
+        UA_WriterGroup *writerGroup, *tmpWriterGroup;
+        LIST_FOREACH_SAFE(writerGroup, &tmpConnection->writerGroups, listEntry, tmpWriterGroup) {
             UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
                                           UA_STATUSCODE_BADSHUTDOWN);
             UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup->identifier);
+            removeWriterGroup(server, writerGroup->identifier);
+        }
+    }
+
+    /* Stop, unfreeze and delete all ReaderGroups */
+    TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry) {
+        UA_ReaderGroup *readerGroup, *tmpReaderGroup;
+        LIST_FOREACH_SAFE(readerGroup, &tmpConnection->readerGroups, listEntry, tmpReaderGroup) {
+            UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
+                                          UA_STATUSCODE_BADSHUTDOWN);
+            UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup->identifier);
+            removeReaderGroup(server, readerGroup->identifier);
         }
     }
 

From 161ff250c2758506b63143ac0de1e033774f1f39 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 14 Jun 2022 11:42:49 +0200
Subject: [PATCH 0243/1963] refactor(pusub): Simplify addPubSubConnectionConfig

---
 src/pubsub/ua_pubsub_ns0.c | 141 ++++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 71 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index fadf119ecbc..9b0ecae58bc 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -229,14 +229,15 @@ addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsub
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_NetworkAddressUrlDataType networkAddressUrlDataType;
     memset(&networkAddressUrlDataType, 0, sizeof(networkAddressUrlDataType));
-    UA_ExtensionObject eo = pubsubConnectionDataType->address;
-    if(eo.encoding == UA_EXTENSIONOBJECT_DECODED){
-        if(eo.content.decoded.type == &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]){
-            if(UA_NetworkAddressUrlDataType_copy((UA_NetworkAddressUrlDataType *) eo.content.decoded.data,
-                                                 &networkAddressUrlDataType) != UA_STATUSCODE_GOOD){
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-        }
+    UA_ExtensionObject *eo = &pubsubConnectionDataType->address;
+    if(eo->encoding == UA_EXTENSIONOBJECT_DECODED &&
+       eo->content.decoded.type == &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) {
+        void *data = eo->content.decoded.data;
+        retVal =
+            UA_NetworkAddressUrlDataType_copy((UA_NetworkAddressUrlDataType *)data,
+                                              &networkAddressUrlDataType);
+        if(retVal != UA_STATUSCODE_GOOD)
+            return retVal;
     }
 
     UA_PubSubConnectionConfig connectionConfig;
@@ -363,72 +364,70 @@ addSubscribedVariables(UA_Server *server, UA_NodeId dataSetReaderId,
                        UA_DataSetReaderDataType *dataSetReaderDataType,
                        UA_DataSetMetaDataType *pMetaData) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_TargetVariablesDataType targetVars;
     UA_ExtensionObject *eoTargetVar = &dataSetReaderDataType->subscribedDataSet;
-    if(eoTargetVar->encoding == UA_EXTENSIONOBJECT_DECODED){
-        if(eoTargetVar->content.decoded.type == &UA_TYPES[UA_TYPES_TARGETVARIABLESDATATYPE]){
-            if(UA_TargetVariablesDataType_copy((UA_TargetVariablesDataType *) eoTargetVar->content.decoded.data,
-                                                &targetVars) != UA_STATUSCODE_GOOD){
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-        }
-        UA_NodeId folderId;
-        UA_String folderName = pMetaData->name;
-        UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
-        UA_QualifiedName folderBrowseName;
-        if(folderName.length > 0) {
-            oAttr.displayName.locale = UA_STRING("");
-            oAttr.displayName.text = folderName;
-            folderBrowseName.namespaceIndex = 1;
-            folderBrowseName.name = folderName;
-        } else {
-            oAttr.displayName = UA_LOCALIZEDTEXT("", "Subscribed Variables");
-            folderBrowseName = UA_QUALIFIEDNAME(1, "Subscribed Variables");
-        }
-
-        UA_Server_addObjectNode(server, UA_NODEID_NULL,
-                                UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
-                                UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
-                                folderBrowseName, UA_NODEID_NUMERIC (0,
-                                UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
-        /**
-        * **TargetVariables**
-        *
-        * The SubscribedDataSet option TargetVariables defines a list of Variable mappings between
-        * received DataSet fields and target Variables in the Subscriber AddressSpace.
-        * The values subscribed from the Publisher are updated in the value field of these variables */
-        /* Create the TargetVariables with respect to DataSetMetaData fields */
-        UA_FieldTargetVariable *targetVarsData = (UA_FieldTargetVariable *)
-            UA_calloc(targetVars.targetVariablesSize, sizeof(UA_FieldTargetVariable));
-        for(size_t i = 0; i < targetVars.targetVariablesSize; i++) {
-            /* Variable to subscribe data */
-            UA_VariableAttributes vAttr = UA_VariableAttributes_default;
-            UA_LocalizedText_copy(&pMetaData->fields[i].description,
-                                &vAttr.description);
-            vAttr.displayName.locale = UA_STRING("");
-            vAttr.displayName.text = pMetaData->fields[i].name;
-            vAttr.dataType = pMetaData->fields[i].dataType;
-
-            UA_NodeId newNode;
-            retVal |= UA_Server_addVariableNode(server, targetVars.targetVariables[i].targetNodeId,
-                                                folderId,
-                                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                                UA_QUALIFIEDNAME(1, (char *)pMetaData->fields[i].name.data),
-                                                UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                                vAttr, NULL, &newNode);
-
-            /* For creating Targetvariables */
-            UA_FieldTargetDataType_init(&targetVarsData[i].targetVariable);
-            targetVarsData[i].targetVariable.attributeId  = targetVars.targetVariables[i].attributeId;
-            targetVarsData[i].targetVariable.targetNodeId = newNode;
-        }
-        retVal = UA_Server_DataSetReader_createTargetVariables(server, dataSetReaderId,
-                                                                targetVars.targetVariablesSize, targetVarsData);
-        for(size_t j = 0; j < targetVars.targetVariablesSize; j++)
-            UA_FieldTargetDataType_clear(&targetVarsData[j].targetVariable);
-        UA_free(targetVarsData);
+    if(eoTargetVar->encoding != UA_EXTENSIONOBJECT_DECODED ||
+       eoTargetVar->content.decoded.type != &UA_TYPES[UA_TYPES_TARGETVARIABLESDATATYPE])
+        return UA_STATUSCODE_BADUNEXPECTEDERROR;
+
+    const UA_TargetVariablesDataType *targetVars =
+        (UA_TargetVariablesDataType*)eoTargetVar->content.decoded.data;
+
+    UA_NodeId folderId;
+    UA_String folderName = pMetaData->name;
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName;
+    if(folderName.length > 0) {
+        oAttr.displayName.locale = UA_STRING("");
+        oAttr.displayName.text = folderName;
+        folderBrowseName.namespaceIndex = 1;
+        folderBrowseName.name = folderName;
+    } else {
+        oAttr.displayName = UA_LOCALIZEDTEXT("", "Subscribed Variables");
+        folderBrowseName = UA_QUALIFIEDNAME(1, "Subscribed Variables");
     }
 
+    UA_Server_addObjectNode(server, UA_NODEID_NULL,
+                            UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+                            UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+                            folderBrowseName,
+                            UA_NODEID_NUMERIC (0, UA_NS0ID_BASEOBJECTTYPE),
+                            oAttr, NULL, &folderId);
+
+    /* The SubscribedDataSet option TargetVariables defines a list of Variable
+     * mappings between received DataSet fields and target Variables in the
+     * Subscriber AddressSpace. The values subscribed from the Publisher are
+     * updated in the value field of these variables */
+
+    /* Create the TargetVariables with respect to DataSetMetaData fields */
+    UA_FieldTargetVariable *targetVarsData = (UA_FieldTargetVariable *)
+        UA_calloc(targetVars->targetVariablesSize, sizeof(UA_FieldTargetVariable));
+    for(size_t i = 0; i < targetVars->targetVariablesSize; i++) {
+        /* Prepare the output structure */
+        UA_FieldTargetDataType_init(&targetVarsData[i].targetVariable);
+        targetVarsData[i].targetVariable.attributeId  = targetVars->targetVariables[i].attributeId;
+
+        /* Add variable for the field */
+        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+        vAttr.description = pMetaData->fields[i].description;
+        vAttr.displayName.locale = UA_STRING("");
+        vAttr.displayName.text = pMetaData->fields[i].name;
+        vAttr.dataType = pMetaData->fields[i].dataType;
+        UA_QualifiedName varname = {1, pMetaData->fields[i].name};
+        retVal |= UA_Server_addVariableNode(server, targetVars->targetVariables[i].targetNodeId,
+                                            folderId,
+                                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                            varname,
+                                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                            vAttr, NULL,
+                                            &targetVarsData[i].targetVariable.targetNodeId);
+
+    }
+    retVal = UA_Server_DataSetReader_createTargetVariables(server, dataSetReaderId,
+                                                           targetVars->targetVariablesSize,
+                                                           targetVarsData);
+    for(size_t j = 0; j < targetVars->targetVariablesSize; j++)
+        UA_FieldTargetDataType_clear(&targetVarsData[j].targetVariable);
+    UA_free(targetVarsData);
     return retVal;
 }
 

From fcceb026826e6a2573eca6f5731e7a2d5a9dadb8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 14 Jun 2022 11:43:28 +0200
Subject: [PATCH 0244/1963] refactor(pubsub): Small simplifications in
 UA_Server_addReaderGroup

---
 src/pubsub/ua_pubsub_readergroup.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 5ab7377187f..77846f9a117 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -129,13 +129,12 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
     if(!newGroup)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    memset(newGroup, 0, sizeof(UA_ReaderGroup));
     newGroup->componentType = UA_PUBSUB_COMPONENT_READERGROUP;
-    /* Generate nodeid for the readergroup identifier */
-    newGroup->linkedConnection = currentConnectionContext->identifier;
 
     /* Deep copy of the config */
+    retval |= UA_NodeId_copy(&currentConnectionContext->identifier, &newGroup->linkedConnection);
     retval |= UA_ReaderGroupConfig_copy(readerGroupConfig, &newGroup->config);
+
     /* Check user configured params and define it accordingly */
     if(newGroup->config.subscribingInterval <= 0.0)
         newGroup->config.subscribingInterval = 5; // Set default to 5 ms

From ad34ddd8485946e209e2450def82ad02122fb3b2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 14 Jun 2022 11:43:56 +0200
Subject: [PATCH 0245/1963] fix(tests): Fix a memleak in
 check_pubsub_informationmodel_methods.c

---
 tests/pubsub/check_pubsub_informationmodel_methods.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 38ada672aa1..ebf1176194f 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -1005,9 +1005,9 @@ START_TEST(AddNewPubSubConnectionWithReaderGroupandDataSetReader){
         /* Static definition of number of fields size to 4 to create four different
         * targetVariables of distinct datatype
         * Currently the publisher sends only DateTime data type */
+        UA_FieldMetaData fields[4] = {0};
         pMetaData->fieldsSize = 4;
-        pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
-                            &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+        pMetaData->fields = fields;
 
         /* DateTime DataType */
         UA_FieldMetaData_init (&pMetaData->fields[0]);

From ae8cb5ea6e3667e59c0b74cec94b5030f6555359 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 17 Jun 2022 09:26:42 +0200
Subject: [PATCH 0246/1963] feat(ci): Enable pubsub informationmodel-methods in
 the ci

---
 tools/ci.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index fafee93c980..6cdd2d435ad 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -144,6 +144,7 @@ function unit_tests {
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           ..
@@ -201,6 +202,7 @@ function unit_tests_diag {
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           ..
     make ${MAKEOPTS}
@@ -288,6 +290,7 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           ..
@@ -316,6 +319,7 @@ function unit_tests_valgrind {
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           ..

From 911febc111b70e6bc4af6f6a23a0190ea4f28a5a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Jun 2022 11:52:19 +0200
Subject: [PATCH 0247/1963] fix(pubsub): Removing Connections always removes
 WriterGroups and ReaderGroups

WG and RG are only accessible via the linked list in the connection
---
 src/pubsub/ua_pubsub_manager.c                | 77 ++++++++++---------
 .../check_pubsub_subscribe_msgrcvtimeout.c    | 49 +++++++-----
 2 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 1108feb9b21..4854cd234d6 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -160,20 +160,43 @@ UA_Server_addPubSubConnection(UA_Server *server,
 
 UA_StatusCode
 removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
-    //search the identified Connection and store the Connection index
-    UA_PubSubConnection *currentConnection =
+    /* Find the connection */
+    UA_PubSubConnection *c =
         UA_PubSubConnection_findConnectionbyId(server, connection);
-    if(!currentConnection)
+    if(!c)
         return UA_STATUSCODE_BADNOTFOUND;
 
+    /* Stop, unfreeze and delete all WriterGroups attached to the Connection */
+    UA_WriterGroup *writerGroup, *tmpWriterGroup;
+    LIST_FOREACH_SAFE(writerGroup, &c->writerGroups, listEntry, tmpWriterGroup) {
+        UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
+                                      UA_STATUSCODE_BADSHUTDOWN);
+        UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup->identifier);
+        removeWriterGroup(server, writerGroup->identifier);
+    }
+
+    /* Stop, unfreeze and delete all ReaderGroups attached to the Connection */
+    UA_ReaderGroup *readerGroup, *tmpReaderGroup;
+    LIST_FOREACH_SAFE(readerGroup, &c->readerGroups, listEntry, tmpReaderGroup) {
+        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
+                                      UA_STATUSCODE_BADSHUTDOWN);
+        UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup->identifier);
+        removeReaderGroup(server, readerGroup->identifier);
+    }
+
+    /* Remove from the information model */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    removePubSubConnectionRepresentation(server, currentConnection);
+    removePubSubConnectionRepresentation(server, c);
 #endif
+
+    /* Unlink from the server */
+    TAILQ_REMOVE(&server->pubSubManager.connections, c, listEntry);
     server->pubSubManager.connectionsSize--;
 
-    UA_PubSubConnection_clear(server, currentConnection);
-    TAILQ_REMOVE(&server->pubSubManager.connections, currentConnection, listEntry);
-    UA_free(currentConnection);
+    /* Clean up the connection structure */
+    UA_PubSubConnection_clear(server, c);
+    UA_free(c);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -407,46 +430,26 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
                 "PubSub cleanup was called.");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    /* Stop, unfreeze and delete all WriterGroups */
-    UA_PubSubConnection *tmpConnection;
-    TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry) {
-        UA_WriterGroup *writerGroup, *tmpWriterGroup;
-        LIST_FOREACH_SAFE(writerGroup, &tmpConnection->writerGroups, listEntry, tmpWriterGroup) {
-            UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
-                                          UA_STATUSCODE_BADSHUTDOWN);
-            UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup->identifier);
-            removeWriterGroup(server, writerGroup->identifier);
-        }
-    }
-
-    /* Stop, unfreeze and delete all ReaderGroups */
-    TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry) {
-        UA_ReaderGroup *readerGroup, *tmpReaderGroup;
-        LIST_FOREACH_SAFE(readerGroup, &tmpConnection->readerGroups, listEntry, tmpReaderGroup) {
-            UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
-                                          UA_STATUSCODE_BADSHUTDOWN);
-            UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup->identifier);
-            removeReaderGroup(server, readerGroup->identifier);
-        }
-    }
-
-    //free the currently configured transport layers
-    if(server->config.pubSubConfig.transportLayersSize > 0) {
-        UA_free(server->config.pubSubConfig.transportLayers);
-        server->config.pubSubConfig.transportLayersSize = 0;
-    }
-
-    //remove Connections and WriterGroups
+    /* Remove Connections - this also remove WriterGroups and ReaderGroups */
     UA_PubSubConnection *tmpConnection1, *tmpConnection2;
     TAILQ_FOREACH_SAFE(tmpConnection1, &server->pubSubManager.connections,
                        listEntry, tmpConnection2) {
         removePubSubConnection(server, tmpConnection1->identifier);
     }
+
+    /* Remove the DataSets */
     UA_PublishedDataSet *tmpPDS1, *tmpPDS2;
     TAILQ_FOREACH_SAFE(tmpPDS1, &server->pubSubManager.publishedDataSets,
                        listEntry, tmpPDS2){
         removePublishedDataSet(server, tmpPDS1->identifier);
     }
+
+
+    /* Free the list of transport layers */
+    if(server->config.pubSubConfig.transportLayersSize > 0) {
+        UA_free(server->config.pubSubConfig.transportLayers);
+        server->config.pubSubConfig.transportLayersSize = 0;
+    }
 }
 
 /***********************************/
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 8503f6f7c5d..ea4991e30cd 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -24,10 +24,14 @@ static UA_Boolean UseFastPath = UA_FALSE;
 static UA_DataValue *pFastPathPublisherValue = 0;
 static UA_DataValue *pFastPathSubscriberValue = 0;
 
+static UA_Boolean runtime;
+
 /***************************************************************************************************/
 /***************************************************************************************************/
 static void setup(void) {
 
+    runtime = true;
+
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nsetup\n\n");
 
     UA_NodeId_init(&ExpectedCallbackComponentNodeId);
@@ -51,6 +55,8 @@ static void setup(void) {
 /***************************************************************************************************/
 static void teardown(void) {
 
+    runtime = false;
+
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nteardown\n\n");
 
     ck_assert(UA_STATUSCODE_GOOD == UA_Server_run_shutdown(server));
@@ -705,18 +711,15 @@ START_TEST(Test_basic) {
 
 } END_TEST
 
-
-
-/***************************************************************************************************/
-/***************************************************************************************************/
 /* Test different message receive timeouts */
 
-/***************************************************************************************************/
-static void PubSubStateChangeCallback_different_timeouts (
-    UA_NodeId *pubsubComponentId,
-    UA_PubSubState state,
-    UA_StatusCode status) {
-
+static void
+PubSubStateChangeCallback_different_timeouts(UA_NodeId *pubsubComponentId,
+                                             UA_PubSubState state, UA_StatusCode status) {
+    /* Disable some checks during shutdown */
+    if(!runtime)
+        return;
+    
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
@@ -1051,11 +1054,12 @@ START_TEST(Test_wrong_timeout) {
 /* Test a bigger configuration */
 
 /***************************************************************************************************/
-static void PubSubStateChangeCallback_many_components (
-    UA_NodeId *pubsubComponentId,
-    UA_PubSubState state,
-    UA_StatusCode status) {
-
+static void
+PubSubStateChangeCallback_many_components(UA_NodeId *pubsubComponentId,
+                                          UA_PubSubState state, UA_StatusCode status) {
+    if(!runtime)
+        return;
+    
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
@@ -1619,16 +1623,19 @@ START_TEST(Test_many_components) {
 /* Custom PubSub statechange callback:
     count no of message receive timeouts
 */
-static void PubSubStateChangeCallback_update_config (
-    UA_NodeId *pubsubComponentId,
-    UA_PubSubState state,
-    UA_StatusCode status) {
-
+static void
+PubSubStateChangeCallback_update_config(UA_NodeId *pubsubComponentId,
+                                        UA_PubSubState state, UA_StatusCode status) {
+    if(!runtime)
+        return;
+    
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
+                "Component Id = %.*s, state = %i, status = 0x%08x %s",
+                (UA_Int32) strId.length, strId.data, state, status,
+                UA_StatusCode_name(status));
     UA_String_clear(&strId);
 
     if (UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) {

From eade8f9cf5970f1bf56253b039c4f411286fe425 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Jun 2022 19:08:49 +0200
Subject: [PATCH 0248/1963] fix(pubsub): Fix a memory access issue in
 ua_pubsub_ns0.c

---
 src/pubsub/ua_pubsub_ns0.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 9b0ecae58bc..0104a191377 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -446,23 +446,11 @@ addDataSetReaderConfig(UA_Server *server, UA_NodeId readerGroupId,
                        UA_NodeId *dataSetReaderId) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_DataSetReaderConfig readerConfig;
-    memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
+    memset(&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
     readerConfig.name = dataSetReaderDataType->name;
-    /* Parameters to filter which DataSetMessage has to be processed
-     * by the DataSetReader */
-    if(dataSetReaderDataType->publisherId.type == &UA_TYPES[UA_TYPES_STRING]){
-        UA_String publisherIdentifier;
-        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_STRING];
-        UA_String_copy((UA_String *) dataSetReaderDataType->publisherId.data, &publisherIdentifier);
-        readerConfig.publisherId.data = &publisherIdentifier;
-    } else {
-        UA_UInt16 publisherIdentifier = *(UA_UInt16*)dataSetReaderDataType->publisherId.data;
-        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
-        readerConfig.publisherId.data = &publisherIdentifier;
-    }
-
-    readerConfig.writerGroupId    = dataSetReaderDataType->writerGroupId;
-    readerConfig.dataSetWriterId  = dataSetReaderDataType->dataSetWriterId;
+    readerConfig.publisherId = dataSetReaderDataType->publisherId;
+    readerConfig.writerGroupId = dataSetReaderDataType->writerGroupId;
+    readerConfig.dataSetWriterId = dataSetReaderDataType->dataSetWriterId;
 
     /* Setting up Meta data configuration in DataSetReader */
     UA_DataSetMetaDataType *pMetaData;

From 36a1436660494bb9d3fa12338c92b142a94b757e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Jun 2022 19:15:03 +0200
Subject: [PATCH 0249/1963] refactor(pubsub): Don't postfix variables with
 "DataType"

---
 src/pubsub/ua_pubsub_ns0.c | 179 ++++++++++++++++++++-----------------
 1 file changed, 96 insertions(+), 83 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 0104a191377..5f229b3f2a4 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -224,36 +224,36 @@ addVariableValueSource(UA_Server *server, UA_ValueCallback valueCallback,
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
-addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsubConnectionDataType,
+addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsubConnection,
                           UA_NodeId *connectionId){
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_NetworkAddressUrlDataType networkAddressUrlDataType;
-    memset(&networkAddressUrlDataType, 0, sizeof(networkAddressUrlDataType));
-    UA_ExtensionObject *eo = &pubsubConnectionDataType->address;
+    UA_NetworkAddressUrlDataType networkAddressUrl;
+    memset(&networkAddressUrl, 0, sizeof(networkAddressUrl));
+    UA_ExtensionObject *eo = &pubsubConnection->address;
     if(eo->encoding == UA_EXTENSIONOBJECT_DECODED &&
        eo->content.decoded.type == &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) {
         void *data = eo->content.decoded.data;
         retVal =
             UA_NetworkAddressUrlDataType_copy((UA_NetworkAddressUrlDataType *)data,
-                                              &networkAddressUrlDataType);
+                                              &networkAddressUrl);
         if(retVal != UA_STATUSCODE_GOOD)
             return retVal;
     }
 
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
-    connectionConfig.transportProfileUri = pubsubConnectionDataType->transportProfileUri;
-    connectionConfig.name = pubsubConnectionDataType->name;
+    connectionConfig.transportProfileUri = pubsubConnection->transportProfileUri;
+    connectionConfig.name = pubsubConnection->name;
     //TODO set real connection state
-    connectionConfig.enabled = pubsubConnectionDataType->enabled;
-    //connectionConfig.enabled = pubSubConnectionDataType.enabled;
-    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrlDataType,
+    connectionConfig.enabled = pubsubConnection->enabled;
+    //connectionConfig.enabled = pubSubConnection.enabled;
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    if(pubsubConnectionDataType->publisherId.type == &UA_TYPES[UA_TYPES_UINT32]){
-        connectionConfig.publisherId.numeric = * ((UA_UInt32 *) pubsubConnectionDataType->publisherId.data);
-    } else if(pubsubConnectionDataType->publisherId.type == &UA_TYPES[UA_TYPES_STRING]){
+    if(pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_UINT32]){
+        connectionConfig.publisherId.numeric = * ((UA_UInt32 *) pubsubConnection->publisherId.data);
+    } else if(pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_STRING]){
         connectionConfig.publisherIdType = UA_PUBSUB_PUBLISHERID_STRING;
-        UA_String_copy((UA_String *) pubsubConnectionDataType->publisherId.data, &connectionConfig.publisherId.string);
+        UA_String_copy((UA_String *) pubsubConnection->publisherId.data, &connectionConfig.publisherId.string);
     } else {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER, "Unsupported PublisherId Type used.");
         //TODO what's the best default behaviour here?
@@ -261,7 +261,7 @@ addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsub
     }
 
     retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, connectionId);
-    UA_NetworkAddressUrlDataType_clear(&networkAddressUrlDataType);
+    UA_NetworkAddressUrlDataType_clear(&networkAddressUrl);
     return retVal;
 }
 
@@ -272,21 +272,21 @@ addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsub
  * configuration parameters for the message creation. */
 static UA_StatusCode
 addWriterGroupConfig(UA_Server *server, UA_NodeId connectionId,
-                     UA_WriterGroupDataType *writerGroupDataType, UA_NodeId *writerGroupId){
+                     UA_WriterGroupDataType *writerGroup, UA_NodeId *writerGroupId){
     /* Now we create a new WriterGroupConfig and add the group to the existing
      * PubSubConnection. */
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
-    writerGroupConfig.name = writerGroupDataType->name;
-    writerGroupConfig.publishingInterval = writerGroupDataType->publishingInterval;
-    writerGroupConfig.enabled = writerGroupDataType->enabled;
-    writerGroupConfig.writerGroupId = writerGroupDataType->writerGroupId;
+    writerGroupConfig.name = writerGroup->name;
+    writerGroupConfig.publishingInterval = writerGroup->publishingInterval;
+    writerGroupConfig.enabled = writerGroup->enabled;
+    writerGroupConfig.writerGroupId = writerGroup->writerGroupId;
     //TODO remove hard coded UADP
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    writerGroupConfig.priority = writerGroupDataType->priority;
+    writerGroupConfig.priority = writerGroup->priority;
 
     UA_UadpWriterGroupMessageDataType writerGroupMessage;
-    UA_ExtensionObject *eoWG = &writerGroupDataType->messageSettings;
+    UA_ExtensionObject *eoWG = &writerGroup->messageSettings;
     if(eoWG->encoding == UA_EXTENSIONOBJECT_DECODED){
         writerGroupConfig.messageSettings.encoding  = UA_EXTENSIONOBJECT_DECODED;
         if(eoWG->content.decoded.type == &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE]){
@@ -310,12 +310,12 @@ addWriterGroupConfig(UA_Server *server, UA_NodeId connectionId,
  * message generation. */
 static UA_StatusCode
 addDataSetWriterConfig(UA_Server *server, const UA_NodeId *writerGroupId,
-                       UA_DataSetWriterDataType *dataSetWriterDataType,
+                       UA_DataSetWriterDataType *dataSetWriter,
                        UA_NodeId *dataSetWriterId) {
     UA_NodeId publishedDataSetId = UA_NODEID_NULL;
     UA_PublishedDataSet *tmpPDS;
     TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry){
-        if(UA_String_equal(&dataSetWriterDataType->dataSetName, &tmpPDS->config.name)) {
+        if(UA_String_equal(&dataSetWriter->dataSetName, &tmpPDS->config.name)) {
             publishedDataSetId = tmpPDS->identifier;
             break;
         }
@@ -328,10 +328,10 @@ addDataSetWriterConfig(UA_Server *server, const UA_NodeId *writerGroupId,
      * create a new DataSetWriterConfig and add call the addWriterGroup function. */
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
-    dataSetWriterConfig.name = dataSetWriterDataType->name;
-    dataSetWriterConfig.dataSetWriterId = dataSetWriterDataType->dataSetWriterId;
-    dataSetWriterConfig.keyFrameCount = dataSetWriterDataType->keyFrameCount;
-    dataSetWriterConfig.dataSetFieldContentMask =  dataSetWriterDataType->dataSetFieldContentMask;
+    dataSetWriterConfig.name = dataSetWriter->name;
+    dataSetWriterConfig.dataSetWriterId = dataSetWriter->dataSetWriterId;
+    dataSetWriterConfig.keyFrameCount = dataSetWriter->keyFrameCount;
+    dataSetWriterConfig.dataSetFieldContentMask =  dataSetWriter->dataSetFieldContentMask;
     return UA_Server_addDataSetWriter(server, *writerGroupId, publishedDataSetId,
                                       &dataSetWriterConfig, dataSetWriterId);
 }
@@ -345,11 +345,11 @@ addDataSetWriterConfig(UA_Server *server, const UA_NodeId *writerGroupId,
 /* Add ReaderGroup to the created connection */
 static UA_StatusCode
 addReaderGroupConfig(UA_Server *server, UA_NodeId connectionId,
-                     UA_ReaderGroupDataType *readerGroupDataType,
+                     UA_ReaderGroupDataType *readerGroup,
                      UA_NodeId *readerGroupId) {
     UA_ReaderGroupConfig readerGroupConfig;
     memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
-    readerGroupConfig.name = readerGroupDataType->name;
+    readerGroupConfig.name = readerGroup->name;
     return UA_Server_addReaderGroup(server, connectionId,
                                     &readerGroupConfig, readerGroupId);
 }
@@ -361,10 +361,10 @@ addReaderGroupConfig(UA_Server *server, UA_NodeId connectionId,
  * Add subscribedvariables to the DataSetReader */
 static UA_StatusCode
 addSubscribedVariables(UA_Server *server, UA_NodeId dataSetReaderId,
-                       UA_DataSetReaderDataType *dataSetReaderDataType,
+                       UA_DataSetReaderDataType *dataSetReader,
                        UA_DataSetMetaDataType *pMetaData) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_ExtensionObject *eoTargetVar = &dataSetReaderDataType->subscribedDataSet;
+    UA_ExtensionObject *eoTargetVar = &dataSetReader->subscribedDataSet;
     if(eoTargetVar->encoding != UA_EXTENSIONOBJECT_DECODED ||
        eoTargetVar->content.decoded.type != &UA_TYPES[UA_TYPES_TARGETVARIABLESDATATYPE])
         return UA_STATUSCODE_BADUNEXPECTEDERROR;
@@ -442,41 +442,41 @@ addSubscribedVariables(UA_Server *server, UA_NodeId dataSetReaderId,
 /* Add DataSetReader to the ReaderGroup */
 static UA_StatusCode
 addDataSetReaderConfig(UA_Server *server, UA_NodeId readerGroupId,
-                       UA_DataSetReaderDataType *dataSetReaderDataType,
+                       UA_DataSetReaderDataType *dataSetReader,
                        UA_NodeId *dataSetReaderId) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_DataSetReaderConfig readerConfig;
     memset(&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
-    readerConfig.name = dataSetReaderDataType->name;
-    readerConfig.publisherId = dataSetReaderDataType->publisherId;
-    readerConfig.writerGroupId = dataSetReaderDataType->writerGroupId;
-    readerConfig.dataSetWriterId = dataSetReaderDataType->dataSetWriterId;
+    readerConfig.name = dataSetReader->name;
+    readerConfig.publisherId = dataSetReader->publisherId;
+    readerConfig.writerGroupId = dataSetReader->writerGroupId;
+    readerConfig.dataSetWriterId = dataSetReader->dataSetWriterId;
 
     /* Setting up Meta data configuration in DataSetReader */
     UA_DataSetMetaDataType *pMetaData;
     pMetaData = &readerConfig.dataSetMetaData;
     UA_DataSetMetaDataType_init (pMetaData);
-    pMetaData->name =  dataSetReaderDataType->dataSetMetaData.name;
-    pMetaData->fieldsSize = dataSetReaderDataType->dataSetMetaData.fieldsSize;
+    pMetaData->name =  dataSetReader->dataSetMetaData.name;
+    pMetaData->fieldsSize = dataSetReader->dataSetMetaData.fieldsSize;
     pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
                         &UA_TYPES[UA_TYPES_FIELDMETADATA]);
     for(size_t i = 0; i < pMetaData->fieldsSize; i++){
         UA_FieldMetaData_init (&pMetaData->fields[i]);
-        UA_NodeId_copy (&dataSetReaderDataType->dataSetMetaData.fields[i].dataType,
+        UA_NodeId_copy (&dataSetReader->dataSetMetaData.fields[i].dataType,
                         &pMetaData->fields[i].dataType);
-        pMetaData->fields[i].builtInType = dataSetReaderDataType->dataSetMetaData.fields[i].builtInType;
-        pMetaData->fields[i].name = dataSetReaderDataType->dataSetMetaData.fields[i].name;
-        pMetaData->fields[i].valueRank = dataSetReaderDataType->dataSetMetaData.fields[i].valueRank;
+        pMetaData->fields[i].builtInType = dataSetReader->dataSetMetaData.fields[i].builtInType;
+        pMetaData->fields[i].name = dataSetReader->dataSetMetaData.fields[i].name;
+        pMetaData->fields[i].valueRank = dataSetReader->dataSetMetaData.fields[i].valueRank;
     }
 
-    retVal |= UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
-                                         dataSetReaderId);
+    retVal |= UA_Server_addDataSetReader(server, readerGroupId,
+                                         &readerConfig, dataSetReaderId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_free(pMetaData->fields);
         return retVal;
     }
 
-    retVal |= addSubscribedVariables(server, *dataSetReaderId, dataSetReaderDataType, pMetaData);
+    retVal |= addSubscribedVariables(server, *dataSetReaderId, dataSetReader, pMetaData);
     UA_free(pMetaData->fields);
     return retVal;
 }
@@ -551,14 +551,14 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
                                           connection->config->connectionPropertiesSize,
                                           &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
 
-    UA_NetworkAddressUrlDataType *networkAddressUrlDataType =
+    UA_NetworkAddressUrlDataType *networkAddressUrl=
         ((UA_NetworkAddressUrlDataType*)connection->config->address.data);
     UA_Variant value;
     UA_Variant_init(&value);
-    UA_Variant_setScalar(&value, &networkAddressUrlDataType->url,
+    UA_Variant_setScalar(&value, &networkAddressUrl->url,
                          &UA_TYPES[UA_TYPES_STRING]);
     UA_Server_writeValue(server, urlNode, value);
-    UA_Variant_setScalar(&value, &networkAddressUrlDataType->networkInterface,
+    UA_Variant_setScalar(&value, &networkAddressUrl->networkInterface,
                          &UA_TYPES[UA_TYPES_STRING]);
     UA_Server_writeValue(server, interfaceNode, value);
     UA_Variant_setScalar(&value, &connection->config->transportProfileUri,
@@ -601,71 +601,84 @@ addPubSubConnectionAction(UA_Server *server,
                           const UA_NodeId *methodId, void *methodContext,
                           const UA_NodeId *objectId, void *objectContext,
                           size_t inputSize, const UA_Variant *input,
-                          size_t outputSize, UA_Variant *output){
+                          size_t outputSize, UA_Variant *output) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_PubSubConnectionDataType pubSubConnectionDataType = *((UA_PubSubConnectionDataType *) input[0].data);
+    UA_PubSubConnectionDataType *pubSubConnection =
+        (UA_PubSubConnectionDataType *) input[0].data;
 
     //call API function and create the connection
     UA_NodeId connectionId;
-    retVal |= addPubSubConnectionConfig(server, &pubSubConnectionDataType, &connectionId);
+    retVal |= addPubSubConnectionConfig(server, pubSubConnection, &connectionId);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addPubSubConnection failed");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "addPubSubConnection failed");
         return retVal;
     }
 
-    for(size_t i = 0; i < pubSubConnectionDataType.writerGroupsSize; i++){
+    for(size_t i = 0; i < pubSubConnection->writerGroupsSize; i++) {
         UA_NodeId writerGroupId;
-        UA_WriterGroupDataType *writerGroupDataType = &pubSubConnectionDataType.writerGroups[i];
-        retVal |= addWriterGroupConfig(server, connectionId, writerGroupDataType, &writerGroupId);
+        UA_WriterGroupDataType *writerGroup = &pubSubConnection->writerGroups[i];
+        retVal |= addWriterGroupConfig(server, connectionId, writerGroup, &writerGroupId);
         if(retVal != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addWriterGroup failed");
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                         "addWriterGroup failed");
             return retVal;
         }
 
-        for (size_t j = 0; j < pubSubConnectionDataType.writerGroups[i].dataSetWritersSize; j++){
-            UA_DataSetWriterDataType *dataSetWriterDataType = &writerGroupDataType->dataSetWriters[j];
-            retVal |= addDataSetWriterConfig(server, &writerGroupId, dataSetWriterDataType, NULL);
+        for(size_t j = 0; j < writerGroup->dataSetWritersSize; j++) {
+            UA_DataSetWriterDataType *dataSetWriter = &writerGroup->dataSetWriters[j];
+            retVal |= addDataSetWriterConfig(server, &writerGroupId, dataSetWriter, NULL);
             if(retVal != UA_STATUSCODE_GOOD) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addDataSetWriter failed");
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                             "addDataSetWriter failed");
                 return retVal;
             }
         }
 
-        //TODO: Need to handle the UA_Server_setWriterGroupOperational based on the status variable in information model
-        if(pubSubConnectionDataType.enabled) {
+        /* TODO: Need to handle the UA_Server_setWriterGroupOperational based on
+         * the status variable in information model */
+        if(pubSubConnection->enabled) {
             UA_Server_freezeWriterGroupConfiguration(server, writerGroupId);
             UA_Server_setWriterGroupOperational(server, writerGroupId);
-        } else
+        } else {
             UA_Server_setWriterGroupDisabled(server, writerGroupId);
+        }
     }
 
-    for(size_t i = 0; i < pubSubConnectionDataType.readerGroupsSize; i++){
+    for(size_t i = 0; i < pubSubConnection->readerGroupsSize; i++){
         UA_NodeId readerGroupId;
-        UA_ReaderGroupDataType *readerGroupDataType = &pubSubConnectionDataType.readerGroups[i];
-        retVal |= addReaderGroupConfig(server, connectionId, readerGroupDataType, &readerGroupId);
+        UA_ReaderGroupDataType *readerGroup = &pubSubConnection->readerGroups[i];
+        retVal |= addReaderGroupConfig(server, connectionId, readerGroup, &readerGroupId);
         if(retVal != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addReaderGroup failed");
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                         "addReaderGroup failed");
             return retVal;
         }
 
-        for(size_t j = 0; j < pubSubConnectionDataType.readerGroups[i].dataSetReadersSize; j++){
+        for(size_t j = 0; j < readerGroup->dataSetReadersSize; j++) {
             UA_NodeId dataSetReaderId;
-            UA_DataSetReaderDataType *dataSetReaderDataType =  &readerGroupDataType->dataSetReaders[j];
-            retVal |= addDataSetReaderConfig(server, readerGroupId, dataSetReaderDataType, &dataSetReaderId);
+            UA_DataSetReaderDataType *dataSetReader = &readerGroup->dataSetReaders[j];
+            retVal |= addDataSetReaderConfig(server, readerGroupId,
+                                             dataSetReader, &dataSetReaderId);
             if(retVal != UA_STATUSCODE_GOOD) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addDataSetReader failed");
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                             "addDataSetReader failed");
                 return retVal;
             }
+
         }
-        //TODO: Need to handle the UA_Server_setReaderGroupOperational based on the status variable in information model
-        if(pubSubConnectionDataType.enabled) {
+
+        /* TODO: Need to handle the UA_Server_setReaderGroupOperational based on
+         * the status variable in information model */
+        if(pubSubConnection->enabled) {
             UA_Server_freezeReaderGroupConfiguration(server, readerGroupId);
             UA_Server_setReaderGroupOperational(server, readerGroupId);
-        }
-        else
+        } else {
             UA_Server_setReaderGroupDisabled(server, readerGroupId);
+        }
     }
-    //set ouput value
+
+    /* Set ouput value */
     UA_Variant_setScalarCopy(output, &connectionId, &UA_TYPES[UA_TYPES_NODEID]);
     return UA_STATUSCODE_GOOD;
 }
@@ -776,8 +789,8 @@ addDataSetReaderAction(UA_Server *server,
     }
 
     UA_NodeId dataSetReaderId;
-    UA_DataSetReaderDataType *dataSetReaderDataType = (UA_DataSetReaderDataType *) input[0].data;
-    retVal |= addDataSetReaderConfig(server, *objectId, dataSetReaderDataType, &dataSetReaderId);
+    UA_DataSetReaderDataType *dataSetReader= (UA_DataSetReaderDataType *) input[0].data;
+    retVal |= addDataSetReaderConfig(server, *objectId, dataSetReader, &dataSetReaderId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addDataSetReader failed");
         return retVal;
@@ -1206,9 +1219,9 @@ addWriterGroupAction(UA_Server *server,
                              size_t inputSize, const UA_Variant *input,
                              size_t outputSize, UA_Variant *output){
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_WriterGroupDataType *writerGroupDataType = ((UA_WriterGroupDataType *) input[0].data);
+    UA_WriterGroupDataType *writerGroup = ((UA_WriterGroupDataType *) input[0].data);
     UA_NodeId writerGroupId;
-    retVal |= addWriterGroupConfig(server, *objectId, writerGroupDataType, &writerGroupId);
+    retVal |= addWriterGroupConfig(server, *objectId, writerGroup, &writerGroupId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addWriterGroup failed");
         return retVal;
@@ -1293,9 +1306,9 @@ addReaderGroupAction(UA_Server *server,
                      size_t inputSize, const UA_Variant *input,
                      size_t outputSize, UA_Variant *output){
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_ReaderGroupDataType *readerGroupDataType = ((UA_ReaderGroupDataType *) input->data);
+    UA_ReaderGroupDataType *readerGroup = ((UA_ReaderGroupDataType *) input->data);
     UA_NodeId readerGroupId;
-    retVal |= addReaderGroupConfig(server, *objectId, readerGroupDataType, &readerGroupId);
+    retVal |= addReaderGroupConfig(server, *objectId, readerGroup, &readerGroupId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addReaderGroup failed");
         return retVal;

From d2c41a286d5ef11888171465464b122d9d3edd61 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Jun 2022 19:15:38 +0200
Subject: [PATCH 0250/1963] fix(test): Fix wrong variant types in
 check_pubsub_informationmodel_methods.c

---
 .../check_pubsub_informationmodel_methods.c      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index ebf1176194f..02bd94a6663 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -103,7 +103,7 @@ static UA_NodeId addPubSubConnection(void){
     UA_Variant_setScalar(&connectionOptions[0].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "loopback");
     UA_Boolean loopback = UA_FALSE;
-    UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
     pubSubConnection.connectionProperties = connectionOptions;
 
     UA_Variant inputArguments;
@@ -213,14 +213,14 @@ START_TEST(AddandRemoveNewPubSubConnectionWithWriterGroup){
         UA_Variant_setScalar(&connectionOptions[0].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
         connectionOptions[1].key = UA_QUALIFIEDNAME(0, "loopback");
         UA_Boolean loopback = UA_FALSE;
-        UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_UINT32]);
+        UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
         pubSubConnection.connectionProperties = connectionOptions;
 
         pubSubConnection.writerGroupsSize = 1;
         pubSubConnection.writerGroups = (UA_WriterGroupDataType *)UA_calloc(pubSubConnection.writerGroupsSize, sizeof(UA_WriterGroupDataType));
         UA_UadpWriterGroupMessageDataType *writerGroupMessage = \
             (UA_UadpWriterGroupMessageDataType *)UA_calloc(pubSubConnection.writerGroupsSize, sizeof(UA_UadpWriterGroupMessageDataType));
-        UA_ExtensionObject extensionObjectWG; 
+        UA_ExtensionObject extensionObjectWG;
         pubSubConnection.writerGroups->name = UA_STRING("WriterGroup 1");
         pubSubConnection.writerGroups->publishingInterval = 5;
         pubSubConnection.writerGroups->enabled = UA_FALSE;
@@ -234,7 +234,7 @@ START_TEST(AddandRemoveNewPubSubConnectionWithWriterGroup){
                                                         (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
         extensionObjectWG.encoding = UA_EXTENSIONOBJECT_DECODED;
         extensionObjectWG.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
-        extensionObjectWG.content.decoded.data = &writerGroupMessage;
+        extensionObjectWG.content.decoded.data = writerGroupMessage;
         pubSubConnection.writerGroups->messageSettings = extensionObjectWG;
 
         UA_Variant inputArguments;
@@ -326,7 +326,7 @@ START_TEST(AddNewPubSubConnectionWithWriterGroupAndDataSetWriter){
         UA_Variant_setScalar(&connectionOptions[0].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
         connectionOptions[1].key = UA_QUALIFIEDNAME(0, "loopback");
         UA_Boolean loopback = UA_FALSE;
-        UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_UINT32]);
+        UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
         pubSubConnection.connectionProperties = connectionOptions;
 
         pubSubConnection.writerGroupsSize = 1;
@@ -348,7 +348,7 @@ START_TEST(AddNewPubSubConnectionWithWriterGroupAndDataSetWriter){
                                                         (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
         extensionObjectWG.encoding = UA_EXTENSIONOBJECT_DECODED;
         extensionObjectWG.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
-        extensionObjectWG.content.decoded.data = &writerGroupMessage;
+        extensionObjectWG.content.decoded.data = writerGroupMessage;
         pubSubConnection.writerGroups->messageSettings = extensionObjectWG;
 
         pubSubConnection.writerGroups->dataSetWriters = \
@@ -910,7 +910,7 @@ START_TEST(AddNewPubSubConnectionWithReaderGroup){
         UA_Variant_setScalar(&connectionOptions[0].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
         connectionOptions[1].key = UA_QUALIFIEDNAME(0, "loopback");
         UA_Boolean loopback = UA_FALSE;
-        UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_UINT32]);
+        UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
         pubSubConnection.connectionProperties = connectionOptions;
         pubSubConnection.readerGroupsSize = 1;
         pubSubConnection.readerGroups = \
@@ -983,7 +983,7 @@ START_TEST(AddNewPubSubConnectionWithReaderGroupandDataSetReader){
         UA_Variant_setScalar(&connectionOptions[0].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
         connectionOptions[1].key = UA_QUALIFIEDNAME(0, "loopback");
         UA_Boolean loopback = UA_FALSE;
-        UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_UINT32]);
+        UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
         pubSubConnection.connectionProperties = connectionOptions;
         pubSubConnection.readerGroupsSize = 1;
         pubSubConnection.readerGroups = \

From eba9b3332bfd6f6c0b021f58d85a9c30d8439892 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 May 2022 10:22:57 +0200
Subject: [PATCH 0251/1963] refactor(build): Enable thread-safety by default on
 Win32 and Unix-like

---
 CMakeLists.txt | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33a524a35d0..bb395eb3619 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,7 +159,6 @@ endforeach(arch_ ${architectures})
 # Options
 option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
 set(UA_LOGLEVEL 300 CACHE STRING "Minimal level at which logs shall be reported (100=TRACE, 200=DEBUG, 300=INFO, 400=WARNING, 500=ERROR, 600=FATAL)")
-set(UA_MULTITHREADING 0 CACHE STRING "Level of multithreading (0-99: No Multithreading, >=100: Thread-Safe API")
 option(UA_ENABLE_DIAGNOSTICS "Enable diagnostics information exposed by the server" OFF)
 option(UA_ENABLE_METHODCALLS "Enable the Method service set" ON)
 option(UA_ENABLE_SUBSCRIPTIONS "Enable subscriptions support" ON)
@@ -169,6 +168,14 @@ option(UA_ENABLE_HISTORIZING "Enable basic support for historical access (client
 option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" OFF)
 option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" OFF)
 
+set(MULTITHREADING_DEFAULT 0)
+if(WIN32 OR UNIX)
+  # Enable multithreading by default on Windows and POSIX-like (Unix) systems
+  set(MULTITHREADING_DEFAULT 100)
+endif()
+set(UA_MULTITHREADING ${MULTITHREADING_DEFAULT} CACHE STRING
+    "Multithreading support (<100: No multithreading support, >=100: Thread-safety enabled (internal mutexes)")
+
 option(UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS "Enable the use of A&C. (EXPERIMENTAL)" OFF)
 mark_as_advanced(UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS)
 
@@ -681,7 +688,8 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL
     check_add_cc_flag("-Wextra")    # More warnings
     check_add_cc_flag("-Wpedantic") # Standard compliance
     if(UA_FORCE_WERROR)
-        check_add_cc_flag("-Werror")    # All warnings are errors
+        check_add_cc_flag("-Werror") # All warnings are errors
+        check_add_cc_flag("-Wunused-command-line-argument") # Warning for command line args instead of error
     endif()
 
     check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods
@@ -716,6 +724,10 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL
         check_add_cc_flag("-fPIC")
     endif()
 
+    if(UA_MULTITHREADING GREATER_EQUAL 100 AND NOT WIN32)
+        check_add_cc_flag("-pthread")
+    endif()
+
     # Force 32bit build
     if(UA_FORCE_32BIT)
       if(MSVC)

From a08668a333c7ca3d6452a78da01e9399b50fc84f Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Mon, 20 Jun 2022 07:28:57 +0200
Subject: [PATCH 0252/1963] docs(pubsub): document incompatible interface
 change of #5162

---
 CHANGELOG | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e0ef9ae9eef..984d20b7d68 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,20 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2022-06-09 Andreas Eckerstorfer <estr at keba.com>
+
+ * PubSub state change functions
+
+   The following functions in ua_pubsub.h have been extended with
+   an additional parameter for the cause of the state change.
+   Moreover the parameter order has been changed.
+   UA_DataSetWriter_setPubSubState
+   UA_WriterGroup_setPubSubState
+   UA_DataSetReader_setPubSubState
+   UA_ReaderGroup_setPubSubState
+
+   The change was done with pull request #5162.
+
 2022-05-04 Julius Pfrommer <julius.pfrommer at iosb.fraunhofer.de>
 
  * Server port and hostname configuration

From 639e2506aeeb74a10b21e6d996e9c73e1341eeb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jun 2022 00:20:16 +0000
Subject: [PATCH 0253/1963] build(deps): bump deps/mqtt-c from `f69ce1e` to
 `0f4c34c`

Bumps [deps/mqtt-c](https://github.com/LiamBindle/MQTT-C) from `f69ce1e` to `0f4c34c`.
- [Release notes](https://github.com/LiamBindle/MQTT-C/releases)
- [Commits](https://github.com/LiamBindle/MQTT-C/compare/f69ce1e7fd54f3b1834c9c9137ce0ec5d703cb4d...0f4c34c8cc00b16cfee094745d68b8cdbaecd8e0)

---
updated-dependencies:
- dependency-name: deps/mqtt-c
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/mqtt-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mqtt-c b/deps/mqtt-c
index f69ce1e7fd5..0f4c34c8cc0 160000
--- a/deps/mqtt-c
+++ b/deps/mqtt-c
@@ -1 +1 @@
-Subproject commit f69ce1e7fd54f3b1834c9c9137ce0ec5d703cb4d
+Subproject commit 0f4c34c8cc00b16cfee094745d68b8cdbaecd8e0

From f027087af07c80f28c5298c86a37674a8f033fc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jun 2022 00:20:12 +0000
Subject: [PATCH 0254/1963] build(deps): bump deps/ua-nodeset from `b42e29c` to
 `b3a5c02`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `b42e29c` to `b3a5c02`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/b42e29c2ed4157852b355ef054aaff30cc5f8642...b3a5c02e1417da0b3805da15bf3a5ba90d843098)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index b42e29c2ed4..b3a5c02e141 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit b42e29c2ed4157852b355ef054aaff30cc5f8642
+Subproject commit b3a5c02e1417da0b3805da15bf3a5ba90d843098

From c6f845d20e6c334ecde172c5d587334e6f28262a Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Mon, 20 Jun 2022 18:01:39 +0200
Subject: [PATCH 0255/1963] feat(nc): support new subtypes of String

---
 tools/nodeset_compiler/opaque_type_mapping.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/nodeset_compiler/opaque_type_mapping.py b/tools/nodeset_compiler/opaque_type_mapping.py
index 2906ed4a23f..556baa68637 100644
--- a/tools/nodeset_compiler/opaque_type_mapping.py
+++ b/tools/nodeset_compiler/opaque_type_mapping.py
@@ -76,6 +76,16 @@
         'id': 12,
         'name': 'String'
     },
+    'UriString': {
+        'ns': 0,
+        'id': 12,
+        'name': 'String'
+    },
+    'SemanticVersionString': {
+        'ns': 0,
+        'id': 12,
+        'name': 'String'
+    },
     'Duration': {
         'ns': 0,
         'id': 11,

From b5e16c46ce4b57a1e4943d159d940646cee1455b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Jun 2022 21:18:39 +0200
Subject: [PATCH 0256/1963] feat(server): Add a context-pointer to the server
 config

---
 include/open62541/server.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index af5baafe8a7..d14b85c50bc 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -87,6 +87,9 @@ typedef struct {
 
 struct UA_ServerConfig {
     UA_Logger logger;
+    void *context; /* Used to attach custom data to a server config. This can
+                    * then be retrieved e.g. in a callback that forwards a
+                    * pointer to the server. */
 
     /**
      * Server Description

From c6a198c972e04df302be25ba426ffc2728361a4a Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Tue, 21 Jun 2022 10:53:09 +0200
Subject: [PATCH 0257/1963] feat(pubsub): Pass the server pointer to the PubSub
 StateChangeCallback

---
 ...erver_pubsub_subscribe_custom_monitoring.c | 23 ++++++++++++++----
 include/open62541/server_pubsub.h             |  2 +-
 src/pubsub/ua_pubsub_reader.c                 |  2 +-
 src/pubsub/ua_pubsub_readergroup.c            |  2 +-
 src/pubsub/ua_pubsub_writer.c                 |  2 +-
 src/pubsub/ua_pubsub_writergroup.c            |  2 +-
 .../check_pubsub_subscribe_msgrcvtimeout.c    | 24 +++++++++++++++----
 7 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index e47a3985d05..3724a8dd21a 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -262,9 +262,15 @@ static void stopHandler(int sign) {
     Stop the tutorial_pubsub_publish example during operation to trigger the MessageReceiveTimeout and 
     check the callback invocation here */
 static void
-pubsubStateChangeCallback(UA_NodeId *pubsubComponentId,
-                                      UA_PubSubState state,
-                                      UA_StatusCode code) {
+pubsubStateChangeCallback(UA_Server *server,
+                                    UA_NodeId *pubsubComponentId,
+                                    UA_PubSubState state,
+                                    UA_StatusCode code) {
+    /* Use the application context kept by the server.
+       In this case, count up the number of times the state changed */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_UInt32 *stateChangeCnt = (UA_UInt32 *)config->context;
+    (*stateChangeCnt)++;
     
     if (pubsubComponentId == 0) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "pubsubStateChangeCallback(): Null pointer error. Internal error");
@@ -443,9 +449,14 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
 #endif
 
-    /* provide a callback to get notifications of specific PubSub state changes or timeouts (e.g. subscriber MessageReceiveTimeout) */
+    /* Provide a callback to get notifications of specific PubSub state changes or timeouts (e.g. subscriber MessageReceiveTimeout) */
     config->pubSubConfig.stateChangeCallback = pubsubStateChangeCallback;
 
+    /* Provide some application context that can be accessed from the above callback.
+       e.g. count the number of times the state changed. */
+    UA_UInt32 stateChangeCnt = 0;
+    config->context = &stateChangeCnt;
+
     if (*useCustomMonitoring == UA_TRUE) {
         /* provide own backend by setting the monitoring callbacks */
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Use custom monitoring callback implementation");
@@ -481,6 +492,10 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
 
     retval = UA_Server_run(server, &running);
     UA_Server_delete(server);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+        "PubSub state changed %d time(s).", stateChangeCnt);
+
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 720d8583ab2..2832e128658 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -198,7 +198,7 @@ struct UA_PubSubConfiguration {
      * change from operational to error in case of a DataSetReader
      * MessageReceiveTimeout. The status code provides additional
      * information. */
-    void (*stateChangeCallback)(UA_NodeId *Id, UA_PubSubState state,
+    void (*stateChangeCallback)(UA_Server *server, UA_NodeId *id, UA_PubSubState state,
                                 UA_StatusCode status);
     /* TODO: maybe status code provides not enough information about the state change */
 
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 495f9d617a6..fdd9e2afa37 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -772,7 +772,7 @@ UA_DataSetReader_setPubSubState(UA_Server *server,
         UA_ServerConfig *pConfig = UA_Server_getConfig(server);
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
             pConfig->pubSubConfig.
-                stateChangeCallback(&dataSetReader->identifier, state, cause);
+                stateChangeCallback(server, &dataSetReader->identifier, state, cause);
         }
     }
     return ret;
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 77846f9a117..248df80bba7 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -413,7 +413,7 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
         UA_ServerConfig *pConfig = UA_Server_getConfig(server);
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
             pConfig->pubSubConfig.
-                stateChangeCallback(&readerGroup->identifier, state, cause);
+                stateChangeCallback(server, &readerGroup->identifier, state, cause);
         }
     }
     return ret;
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 66394f4f00a..43222756451 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -746,7 +746,7 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
         UA_ServerConfig *pConfig = UA_Server_getConfig(server);
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
             pConfig->pubSubConfig.
-                stateChangeCallback(&dataSetWriter->identifier, state, cause);
+                stateChangeCallback(server, &dataSetWriter->identifier, state, cause);
         }
     }
     return ret;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index d3f42cf2e50..2254f06fe8f 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -744,7 +744,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
         UA_ServerConfig *pConfig = UA_Server_getConfig(server);
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
             pConfig->pubSubConfig.
-                stateChangeCallback(&writerGroup->identifier, state, cause);
+                stateChangeCallback(server, &writerGroup->identifier, state, cause);
         }
     }
     return ret;
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index ea4991e30cd..68899aeae6a 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -407,9 +407,12 @@ static void ValidatePublishSubscribe_fast_path(
 /***************************************************************************************************/
 
 /***************************************************************************************************/
-static void PubSubStateChangeCallback_basic (UA_NodeId *pubsubComponentId,
+static void PubSubStateChangeCallback_basic (UA_Server *hostServer,
+                                UA_NodeId *pubsubComponentId,
                                 UA_PubSubState state,
                                 UA_StatusCode status) {
+    ck_assert(hostServer == server);
+
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
@@ -714,8 +717,10 @@ START_TEST(Test_basic) {
 /* Test different message receive timeouts */
 
 static void
-PubSubStateChangeCallback_different_timeouts(UA_NodeId *pubsubComponentId,
+PubSubStateChangeCallback_different_timeouts(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                              UA_PubSubState state, UA_StatusCode status) {
+    ck_assert(hostServer == server);
+    
     /* Disable some checks during shutdown */
     if(!runtime)
         return;
@@ -938,9 +943,12 @@ START_TEST(Test_different_timeouts) {
 
 /***************************************************************************************************/
 static void PubSubStateChangeCallback_wrong_timeout (
+    UA_Server *hostServer,
     UA_NodeId *pubsubComponentId,
     UA_PubSubState state,
     UA_StatusCode status) {
+    
+    ck_assert(hostServer == server);
 
     UA_String strId;
     UA_String_init(&strId);
@@ -1055,8 +1063,10 @@ START_TEST(Test_wrong_timeout) {
 
 /***************************************************************************************************/
 static void
-PubSubStateChangeCallback_many_components(UA_NodeId *pubsubComponentId,
+PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                           UA_PubSubState state, UA_StatusCode status) {
+    ck_assert(hostServer == server);
+    
     if(!runtime)
         return;
     
@@ -1624,8 +1634,10 @@ START_TEST(Test_many_components) {
     count no of message receive timeouts
 */
 static void
-PubSubStateChangeCallback_update_config(UA_NodeId *pubsubComponentId,
+PubSubStateChangeCallback_update_config(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                         UA_PubSubState state, UA_StatusCode status) {
+    ck_assert(hostServer == server);
+    
     if(!runtime)
         return;
     
@@ -1807,9 +1819,11 @@ START_TEST(Test_add_remove) {
 
 
 /***************************************************************************************************/
-static void PubSubStateChangeCallback_fast_path (UA_NodeId *pubsubComponentId,
+static void PubSubStateChangeCallback_fast_path (UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                 UA_PubSubState state,
                                 UA_StatusCode status) {
+    ck_assert(hostServer == server);
+
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);

From e47a1045d281fb2c61a9ff66601f561bb2bdd1cb Mon Sep 17 00:00:00 2001
From: Ivan <ivan.ushakov@gmail.com>
Date: Thu, 23 Jun 2022 21:45:04 +0300
Subject: [PATCH 0258/1963] refactor(pubsub): Move internal structure out of
 pubsub_mqtt.h (#5218)

---
 .../include/open62541/plugin/pubsub_mqtt.h    | 48 ++-----------------
 plugins/mqtt/ua_mqtt-c_adapter.h              | 40 ++++++++++++++++
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/plugins/include/open62541/plugin/pubsub_mqtt.h b/plugins/include/open62541/plugin/pubsub_mqtt.h
index cb972734c82..bac7abb671b 100644
--- a/plugins/include/open62541/plugin/pubsub_mqtt.h
+++ b/plugins/include/open62541/plugin/pubsub_mqtt.h
@@ -5,62 +5,20 @@
  *    Copyright (c) 2020 basysKom GmbH
  */
 
-#ifndef UA_NETWORK_MQTT_H_
-#define UA_NETWORK_MQTT_H_
+#ifndef UA_PUBSUB_MQTT_H_
+#define UA_PUBSUB_MQTT_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include <open62541/plugin/pubsub.h>
-#include <open62541/network_tcp.h>
-
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
-#include <openssl/ssl.h>
-#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-#include <mqtt_pal.h>
-#endif
-
-/* mqtt network layer specific internal data */
-typedef struct {
-    UA_NetworkAddressUrlDataType address;
-    UA_UInt32 mqttRecvBufferSize;
-    UA_UInt32 mqttSendBufferSize;
-    uint8_t *mqttSendBuffer; 
-    uint8_t *mqttRecvBuffer; 
-    UA_String *mqttClientId;
-    UA_Connection *connection;
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
-    BIO *sockfd;
-#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-    mqtt_pal_socket_handle sockfd;
-#else
-    int sockfd;
-#endif
-    void * mqttClient;
-    void (*callback)(UA_ByteString *encodedBuffer, UA_ByteString *topic);
-    UA_String mqttUsername;
-    UA_String mqttPassword;
-    UA_String mqttCaFilePath;
-    UA_String mqttCaPath;
-    UA_String mqttClientCertPath;
-    UA_String mqttClientKeyPath;
-    UA_Boolean mqttUseTLS;
-} UA_PubSubChannelDataMQTT;
-/* TODO:
- * will topic,
- * will message,
- * keep alive
- * ssl: flag
- */    
-
 
 UA_PubSubTransportLayer UA_EXPORT
 UA_PubSubTransportLayerMQTT(void);
 
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif /* UA_NETWORK_MQTT_H_ */
+#endif /* UA_PUBSUB_MQTT_H_ */
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.h b/plugins/mqtt/ua_mqtt-c_adapter.h
index 156a79c858c..2989dae9247 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.h
+++ b/plugins/mqtt/ua_mqtt-c_adapter.h
@@ -14,6 +14,46 @@ extern "C" {
 #endif
 
 #include <open62541/plugin/pubsub_mqtt.h>
+#include <open62541/network_tcp.h>
+
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
+#include <openssl/ssl.h>
+#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+#include <mqtt_pal.h>
+#endif
+
+/* mqtt network layer specific internal data */
+typedef struct {
+    UA_NetworkAddressUrlDataType address;
+    UA_UInt32 mqttRecvBufferSize;
+    UA_UInt32 mqttSendBufferSize;
+    uint8_t *mqttSendBuffer; 
+    uint8_t *mqttRecvBuffer; 
+    UA_String *mqttClientId;
+    UA_Connection *connection;
+#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
+    BIO *sockfd;
+#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
+    mqtt_pal_socket_handle sockfd;
+#else
+    int sockfd;
+#endif
+    void * mqttClient;
+    void (*callback)(UA_ByteString *encodedBuffer, UA_ByteString *topic);
+    UA_String mqttUsername;
+    UA_String mqttPassword;
+    UA_String mqttCaFilePath;
+    UA_String mqttCaPath;
+    UA_String mqttClientCertPath;
+    UA_String mqttClientKeyPath;
+    UA_Boolean mqttUseTLS;
+} UA_PubSubChannelDataMQTT;
+/* TODO:
+ * will topic,
+ * will message,
+ * keep alive
+ * ssl: flag
+ */
 
 void freeTLS(UA_PubSubChannelDataMQTT *data);
 

From 13af9b8688d5135bd9ea026d51a1c40a787a9562 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Fri, 24 Jun 2022 11:03:25 +0200
Subject: [PATCH 0259/1963] refactor(core): Remove trailing spaces in code
 (#5221)

---
 arch/common/ua_timer.c                        |   2 +-
 arch/common/ua_timer.h                        |   2 +-
 arch/eCos/ua_clock.c                          |   2 +-
 arch/eventloop_posix.c                        |   2 +-
 arch/eventloop_posix_epoll.c                  |   6 +-
 arch/eventloop_posix_interrupt.c              |   4 +-
 arch/eventloop_posix_select.c                 |   4 +-
 arch/eventloop_posix_tcp.c                    |   4 +-
 arch/eventloop_posix_udp.c                    |   6 +-
 arch/freertosLWIP/ua_clock.c                  |   2 +-
 arch/network_ws.c                             |   4 +-
 arch/posix/ua_clock.c                         |   2 +-
 arch/vxworks/ua_clock.c                       |   2 +-
 arch/win32/ua_clock.c                         |   4 +-
 examples/client_method_async.c                |   2 +-
 examples/common.h                             |   2 +-
 .../custom_datatype/client_types_custom.c     |   6 +-
 examples/encryption/client_encryption.c       |   2 +-
 examples/nodeset/server_nodeset.c             |   2 +-
 ...erver_pubsub_subscribe_custom_monitoring.c |  32 +-
 examples/pubsub/pubsub_subscribe_standalone.c |   2 +-
 .../pubsub/server_pubsub_file_configuration.c |  10 +-
 examples/pubsub/server_pubsub_publisher_iop.c |  14 +-
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |   2 +-
 .../pubsub_TSN_loopback_single_thread.c       |   6 +-
 .../pubsub_realtime/pubsub_TSN_publisher.c    |  12 +-
 .../pubsub_TSN_publisher_multiple_thread.c    |   8 +-
 examples/server_inheritance.c                 |   2 +-
 examples/server_instantiation.c               |   6 +-
 examples/server_settimestamp.c                |   2 +-
 examples/tutorial_server_events.c             |   2 +-
 examples/tutorial_server_firststeps.c         |   2 +-
 include/open62541/network_tcp.h               |   2 +-
 include/open62541/network_ws.h                |   2 +-
 include/open62541/plugin/eventloop.h          |   2 +-
 include/open62541/server.h                    |   2 +-
 .../mbedtls/securitypolicy_mbedtls_common.h   |   2 +-
 .../mbedtls/securitypolicy_pubsub_aes128ctr.c |   2 +-
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       |   6 +-
 .../mbedtls/ua_securitypolicy_basic128rsa15.c |   2 +-
 .../mbedtls/ua_securitypolicy_basic256.c      |   2 +-
 .../openssl/securitypolicy_openssl_common.c   |   2 +-
 .../openssl/securitypolicy_openssl_common.h   |  34 +-
 .../openssl/ua_openssl_aes128sha256rsaoaep.c  |   2 +-
 .../crypto/openssl/ua_openssl_basic128rsa15.c | 154 ++--
 plugins/crypto/openssl/ua_openssl_basic256.c  | 154 ++--
 .../openssl/ua_openssl_basic256sha256.c       | 110 +--
 .../openssl/ua_openssl_create_certificate.c   |   2 +-
 plugins/crypto/openssl/ua_pki_openssl.c       | 108 +--
 .../include/open62541/plugin/pubsub_mqtt.h    |   2 +-
 .../include/open62541/server_config_default.h |  18 +-
 plugins/mqtt/templates/posix_sockets.h        |   6 +-
 plugins/mqtt/ua_mqtt-c_adapter.h              |   6 +-
 plugins/ua_accesscontrol_default.c            |   4 +-
 plugins/ua_config_default.c                   |  26 +-
 plugins/ua_debug_dump_pkgs.c                  |   2 +-
 plugins/ua_nodestore_hashmap.c                |   2 +-
 plugins/ua_nodestore_ziptree.c                |   4 +-
 plugins/ua_pubsub_ethernet.c                  |   4 +-
 plugins/ua_pubsub_mqtt.c                      |  22 +-
 src/client/ua_client.c                        |   2 +-
 src/client/ua_client_connect.c                |  12 +-
 src/client/ua_client_discovery.c              |   2 +-
 src/client/ua_client_highlevel.c              |   4 +-
 src/client/ua_client_internal.h               |   2 +-
 src/client/ua_client_subscriptions.c          |  18 +-
 src/pubsub/ua_pubsub_config.c                 |  32 +-
 src/pubsub/ua_pubsub_config.h                 |   6 +-
 src/pubsub/ua_pubsub_manager.c                |  36 +-
 src/pubsub/ua_pubsub_networkmessage.c         |  18 +-
 src/pubsub/ua_pubsub_networkmessage.h         |   6 +-
 src/pubsub/ua_pubsub_networkmessage_json.c    |   2 +-
 src/pubsub/ua_pubsub_ns0.c                    |   4 +-
 src/pubsub/ua_pubsub_writer.c                 |   2 +-
 src/pubsub/ua_pubsub_writergroup.c            |   2 +-
 src/server/ua_server.c                        |   4 +-
 src/server/ua_server_async.c                  |   2 +-
 src/server/ua_server_async.h                  |   2 +-
 src/server/ua_server_config.c                 |   2 +-
 src/server/ua_server_discovery.c              |   2 +-
 src/server/ua_server_discovery_mdns.c         |   2 +-
 src/server/ua_server_internal.h               |   2 +-
 src/server/ua_server_ns0_diagnostics.c        |   2 +-
 src/server/ua_server_utils.c                  |   2 +-
 src/server/ua_services.h                      |   2 +-
 src/server/ua_services_attribute.c            |   6 +-
 src/server/ua_services_discovery_multicast.c  |   4 +-
 src/server/ua_services_monitoreditem.c        |   6 +-
 src/server/ua_services_nodemanagement.c       |  18 +-
 src/server/ua_services_securechannel.c        |   2 +-
 src/server/ua_services_subscription.c         |   2 +-
 src/server/ua_services_view.c                 |  10 +-
 src/server/ua_session.c                       |   4 +-
 src/server/ua_session.h                       |   2 +-
 .../ua_subscription_alarms_conditions.c       |  98 +--
 src/server/ua_subscription_events_filter.c    |   2 +-
 src/server/ua_subscription_monitoreditem.c    |   4 +-
 src/ua_connection_internal.h                  |   2 +-
 src/ua_securechannel.c                        |   6 +-
 src/ua_securechannel.h                        |   2 +-
 src/ua_securechannel_crypto.c                 |   4 +-
 src/ua_types.c                                |   4 +-
 src/ua_types_encoding_binary.c                |   4 +-
 src/ua_types_encoding_binary.h                |   2 +-
 src/ua_types_encoding_json.c                  |  14 +-
 src/ua_types_encoding_json.h                  |   2 +-
 src/ua_types_print.c                          |   2 +-
 src/ua_util.c                                 |   2 +-
 src/ua_util_internal.h                        |   2 +-
 tests/check_eventloop_udp.c                   |  16 +-
 tests/check_timer.c                           |   4 +-
 tests/check_types_builtin_json.c              | 788 +++++++++---------
 tests/client/check_client_highlevel.c         |   2 +-
 tests/client/check_client_securechannel.c     |   2 +-
 tests/client/check_client_subscriptions.c     |   4 +-
 tests/encryption/certificates.h               | 272 +++---
 tests/fuzz/corpus_generator.c                 |   4 +-
 tests/fuzz/ua_debug_dump_pkgs_file.c          |   4 +-
 .../check_mt_addVariableTypeNode.c            |   2 +-
 .../check_nodeset_compiler_testnodeset.c      |   4 +-
 tests/pubsub/check_pubsub_config_freeze.c     |   4 +-
 tests/pubsub/check_pubsub_encoding.c          |  10 +-
 tests/pubsub/check_pubsub_get_state.c         |  24 +-
 .../check_pubsub_informationmodel_methods.c   |   2 +-
 tests/pubsub/check_pubsub_subscribe.c         |   2 +-
 .../check_pubsub_subscribe_msgrcvtimeout.c    | 114 +--
 tests/server/check_nodestore.c                |   4 +-
 tests/server/check_server_asyncop.c           |   4 +-
 tests/server/check_server_callbacks.c         |  30 +-
 tests/server/check_server_readspeed.c         |   6 +-
 tests/server/check_services_attributes.c      |  10 +-
 tests/server/check_services_call.c            |   6 +-
 tests/server/check_services_nodemanagement.c  |  12 +-
 tests/server/check_services_subscriptions.c   |  10 +-
 tests/server/check_subscription_events.c      |   2 +-
 tools/ua-tool/ua.c                            |   2 +-
 tools/ua2json/ua2json.c                       |   6 +-
 137 files changed, 1284 insertions(+), 1284 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index 51c0bf31a58..c29bde4afa3 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2017, 2018, 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
diff --git a/arch/common/ua_timer.h b/arch/common/ua_timer.h
index 00e406b1254..bdcbdd4adfa 100644
--- a/arch/common/ua_timer.h
+++ b/arch/common/ua_timer.h
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2017, 2018, 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
diff --git a/arch/eCos/ua_clock.c b/arch/eCos/ua_clock.c
index 6a2cb5c87ed..c5eab221743 100644
--- a/arch/eCos/ua_clock.c
+++ b/arch/eCos/ua_clock.c
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
  */
diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 5199c79e0fa..78211b4ff2e 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -424,7 +424,7 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger) {
     el->eventLoop.removeCyclicCallback = UA_EventLoopPOSIX_removeCyclicCallback;
     el->eventLoop.addTimedCallback = UA_EventLoopPOSIX_addTimedCallback;
     el->eventLoop.addDelayedCallback = UA_EventLoopPOSIX_addDelayedCallback;
-    
+
     el->eventLoop.registerEventSource =
         (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))
         UA_EventLoopPOSIX_registerEventSource;
diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
index 6b182f8ed5d..c58adc4663b 100644
--- a/arch/eventloop_posix_epoll.c
+++ b/arch/eventloop_posix_epoll.c
@@ -19,7 +19,7 @@ UA_EventLoopPOSIX_registerFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
         event.events |= EPOLLIN;
     if(rfd->listenEvents & UA_FDEVENT_OUT)
         event.events |= EPOLLOUT;
-            
+
     int err = epoll_ctl(el->epollfd, EPOLL_CTL_ADD, rfd->fd, &event);
     if(err != 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -40,7 +40,7 @@ UA_EventLoopPOSIX_modifyFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
         event.events |= EPOLLIN;
     if(rfd->listenEvents & UA_FDEVENT_OUT)
         event.events |= EPOLLOUT;
-            
+
     int err = epoll_ctl(el->epollfd, EPOLL_CTL_MOD, rfd->fd, &event);
     if(err != 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -107,7 +107,7 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
         } else {
             revent = UA_FDEVENT_ERR;
         }
-        
+
         UA_UNLOCK(&el->elMutex);
         rfd->callback(rfd->es, rfd, revent);
         UA_LOCK(&el->elMutex);
diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
index 1f19e3b2aef..6850bb3ba82 100644
--- a/arch/eventloop_posix_interrupt.c
+++ b/arch/eventloop_posix_interrupt.c
@@ -126,7 +126,7 @@ deactivateSignal(UA_RegisteredSignal *rs) {
     if(!rs->active)
         return;
     rs->active = false;
-    
+
     /* Stop receiving the signal on the FD */
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)rs->rfd.es->eventLoop;
     UA_EventLoopPOSIX_deregisterFD(el, &rs->rfd);
@@ -285,7 +285,7 @@ registerPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle,
     /* Activate if we are already running */
     if(pim->im.eventSource.state == UA_EVENTSOURCESTATE_STARTED)
         activateSignal(rs);
-    
+
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/arch/eventloop_posix_select.c b/arch/eventloop_posix_select.c
index fc08906fd53..aaf57b08f42 100644
--- a/arch/eventloop_posix_select.c
+++ b/arch/eventloop_posix_select.c
@@ -65,7 +65,7 @@ UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
         el->fds[i] = el->fds[el->fdsSize];
         UA_RegisteredFD **fds_tmp = (UA_RegisteredFD**)
             UA_realloc(el->fds, sizeof(UA_RegisteredFD*) * el->fdsSize);
-        /* if realloc fails the fds are still in a correct state with 
+        /* if realloc fails the fds are still in a correct state with
          * possibly lost memory, so failing silently here is ok */
         if(fds_tmp)
             el->fds = fds_tmp;
@@ -154,7 +154,7 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
         } else {
             continue;
         }
-        
+
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "Processing event %u on fd %u", (unsigned)event, (unsigned)fd);
 
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index ba55463c453..0da5ffa12bb 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -359,7 +359,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
                           "TCP\t| getnameinfo(...) could not resolve the "
                           "hostname (%s)", errno_str));
     }
-    
+
     /* Create the server socket */
     UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
@@ -907,7 +907,7 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
     UA_StatusCode res = UA_ByteString_allocBuffer(&tcm->rxBuffer, rxBufSize);
     if(res != UA_STATUSCODE_GOOD)
         return res;
-    
+
     /* Set the EventSource to the started state */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
 
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 39a02868e21..1695eaed084 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -249,7 +249,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
                           "UDP\t| getnameinfo(...) could not resolve the hostname (%s)",
                           errno_str));
     }
-    
+
     /* Create the server socket */
     UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
@@ -739,7 +739,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
         return UDP_registerListenSockets(cm, NULL, *port, application,
                                          context, connectionCallback);
     }
-    
+
     /* Iterate over the configured hostnames */
     UA_String *hostStrings = (UA_String*)hostNames->data;
     for(size_t i = 0; i < hostNames->arrayLength; i++) {
@@ -800,7 +800,7 @@ UDP_eventSourceStart(UA_ConnectionManager *cm) {
     UA_StatusCode res = UA_ByteString_allocBuffer(&ucm->rxBuffer, rxBufSize);
     if(res != UA_STATUSCODE_GOOD)
         return res;
-    
+
     /* Set the EventSource to the started state */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
 
diff --git a/arch/freertosLWIP/ua_clock.c b/arch/freertosLWIP/ua_clock.c
index b0de644f036..2fa16184aeb 100644
--- a/arch/freertosLWIP/ua_clock.c
+++ b/arch/freertosLWIP/ua_clock.c
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
diff --git a/arch/network_ws.c b/arch/network_ws.c
index 937f5410ef6..cd5083bdd62 100644
--- a/arch/network_ws.c
+++ b/arch/network_ws.c
@@ -123,7 +123,7 @@ static int
 callback_opcua(struct lws *wsi, enum lws_callback_reasons reason, void *user, void *in,
                size_t len) {
     struct SessionData *pss = (struct SessionData *)user;
-    struct VHostData *vhd = 
+    struct VHostData *vhd =
         (struct VHostData *)lws_protocol_vh_priv_get(lws_get_vhost(wsi),
                                                                    lws_get_protocol(wsi));
 
@@ -301,7 +301,7 @@ ServerNetworkLayerWS_start(UA_ServerNetworkLayer *nl, const UA_Logger *logger,
         info.server_ssl_cert_mem_len = (unsigned int)layer->certificate.length;
         info.server_ssl_private_key_mem = layer->privateKey.data;
         info.server_ssl_private_key_mem_len = (unsigned int)layer->privateKey.length;
-        
+
         info.options |= LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT;
           UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
                 "Websocket network layer listening using WSS");
diff --git a/arch/posix/ua_clock.c b/arch/posix/ua_clock.c
index ae7f53bf2c8..634d4493cf5 100644
--- a/arch/posix/ua_clock.c
+++ b/arch/posix/ua_clock.c
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
diff --git a/arch/vxworks/ua_clock.c b/arch/vxworks/ua_clock.c
index efb9fe81f1d..77be8eed56f 100644
--- a/arch/vxworks/ua_clock.c
+++ b/arch/vxworks/ua_clock.c
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
diff --git a/arch/win32/ua_clock.c b/arch/win32/ua_clock.c
index 2b82461edcd..6bf4f91c257 100644
--- a/arch/win32/ua_clock.c
+++ b/arch/win32/ua_clock.c
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
@@ -50,7 +50,7 @@ UA_Int64 UA_DateTime_localTimeUtcOffset(void) {
     gmtime_s(&rawtime, &ptm);
 #else
     gmtime_s(&ptm, &rawtime);
-#endif    
+#endif
     // Request that mktime() looksup dst in timezone database
     ptm.tm_isdst = -1;
     gmt = mktime(&ptm);
diff --git a/examples/client_method_async.c b/examples/client_method_async.c
index 7ef86a0b1b4..df15639002b 100644
--- a/examples/client_method_async.c
+++ b/examples/client_method_async.c
@@ -43,7 +43,7 @@ methodCalled(UA_Client *client, void *userdata, UA_UInt32 requestId,
                     "---Method call was successful, returned %lu values.\n",
                     (unsigned long)response->results[i].outputArgumentsSize);
     }
-    
+
     /* We initiate the MultiCall (2 methods within one CallRequest) */
     InitCallMulti(client);
 }
diff --git a/examples/common.h b/examples/common.h
index e51ac83fb4e..fd9e824a94d 100644
--- a/examples/common.h
+++ b/examples/common.h
@@ -41,7 +41,7 @@ writeFile(const char* const path, const UA_ByteString buffer) {
     FILE *fp = NULL;
 
     fp = fopen(path, "wb");
-    if(fp == NULL) 
+    if(fp == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     for(UA_UInt32 bufIndex = 0; bufIndex < buffer.length; bufIndex++) {
diff --git a/examples/custom_datatype/client_types_custom.c b/examples/custom_datatype/client_types_custom.c
index cf7422ae219..d30b7e296d5 100644
--- a/examples/custom_datatype/client_types_custom.c
+++ b/examples/custom_datatype/client_types_custom.c
@@ -32,15 +32,15 @@ int main(void) {
         UA_Client_delete(client);
         return (int)retval;
     }
-    
+
     UA_Variant value; /* Variants can hold scalar values and arrays of any type */
     UA_Variant_init(&value);
-    
+
      UA_NodeId nodeId =
         UA_NODEID_STRING(1, "3D.Point");
 
     retval = UA_Client_readValueAttribute(client, nodeId, &value);
-            
+
     if(retval == UA_STATUSCODE_GOOD) {
         Point *p = (Point *)value.data;
         printf("Point = %f, %f, %f \n", p->x, p->y, p->z);
diff --git a/examples/encryption/client_encryption.c b/examples/encryption/client_encryption.c
index c756d5f3c2a..eab3deee78b 100644
--- a/examples/encryption/client_encryption.c
+++ b/examples/encryption/client_encryption.c
@@ -53,7 +53,7 @@ int main(int argc, char* argv[]) {
         UA_Client_delete(client);
         return EXIT_FAILURE;
     }
-    
+
     UA_ByteString_clear(&certificate);
     UA_ByteString_clear(&privateKey);
     for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++) {
diff --git a/examples/nodeset/server_nodeset.c b/examples/nodeset/server_nodeset.c
index a85d4b7b13e..eb14f63ce11 100644
--- a/examples/nodeset/server_nodeset.c
+++ b/examples/nodeset/server_nodeset.c
@@ -23,7 +23,7 @@ static void stopHandler(int sign) {
 int main(int argc, char** argv) {
     signal(SIGINT, stopHandler);
     signal(SIGTERM, stopHandler);
-    
+
     UA_Server *server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index 3724a8dd21a..3e1189cf219 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -2,17 +2,17 @@
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
 /**
- * This example can be used to receive and display values that are published 
- * by tutorial_pubsub_publish example in the TargetVariables of Subscriber 
+ * This example can be used to receive and display values that are published
+ * by tutorial_pubsub_publish example in the TargetVariables of Subscriber
  * Information Model.
- * 
+ *
  * Additionally this example shows the usage of the PubSub monitoring implementation.
- * The application can provide the pubsubStateChangeCallback to get notifications 
- * about specific PubSub state changes or timeouts. Currently only the 
+ * The application can provide the pubsubStateChangeCallback to get notifications
+ * about specific PubSub state changes or timeouts. Currently only the
  * MessageReceiveTimeout handling of a DataSetReader is implemented.
- * Stop the tutorial_pubsub_publish example during operation to trigger the 
+ * Stop the tutorial_pubsub_publish example during operation to trigger the
  * MessageReceiveTimeout and check the callback invocation.
- * 
+ *
  * Per default the monitoring backend is provided by the open62541 sdk.
  * An application can provide it's own monitoring backend (e.g. linux timers),
  * by setting the monitoring callbacks. This option can be tested with
@@ -55,9 +55,9 @@ typedef struct MonitoringParams {
     UA_ServerCallback callback;
 } TMonitoringParams;
 
-/* In this example we only configure 1 DataSetReader and therefore only provide 1 
+/* In this example we only configure 1 DataSetReader and therefore only provide 1
 data structure for monitoring params. This example only works with 1 DataSetReader for simplicity's sake.
-If more DataSetReaders shall be configured one can create a new data structure at every pubSubComponent_createMonitoring() call and 
+If more DataSetReaders shall be configured one can create a new data structure at every pubSubComponent_createMonitoring() call and
 administer them with a list/map/vector ....  */
 TMonitoringParams monitoringParams;
 
@@ -259,7 +259,7 @@ static void stopHandler(int sign) {
 
 /* Provide a callback to get notifications about specific PubSub state changes or timeouts.
     Currently only the MessageReceiveTimeout of the subscriber is supported.
-    Stop the tutorial_pubsub_publish example during operation to trigger the MessageReceiveTimeout and 
+    Stop the tutorial_pubsub_publish example during operation to trigger the MessageReceiveTimeout and
     check the callback invocation here */
 static void
 pubsubStateChangeCallback(UA_Server *server,
@@ -271,7 +271,7 @@ pubsubStateChangeCallback(UA_Server *server,
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_UInt32 *stateChangeCnt = (UA_UInt32 *)config->context;
     (*stateChangeCnt)++;
-    
+
     if (pubsubComponentId == 0) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "pubsubStateChangeCallback(): Null pointer error. Internal error");
         return;
@@ -295,7 +295,7 @@ monitoringCallbackHandler(union sigval val)
 
 /* Custom monitoring backend implementation: only 1 DataSetReader is supported */
 static UA_StatusCode
-pubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+pubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data, UA_ServerCallback callback) {
     if ((!server) || (!data)) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -326,7 +326,7 @@ pubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCompo
 }
 
 static UA_StatusCode
-pubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+pubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data) {
     if ((!server) || (!data)) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -352,7 +352,7 @@ pubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCompon
 }
 
 static UA_StatusCode
-pubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+pubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data) {
     if ((!server) || (!data)) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -378,7 +378,7 @@ pubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCompone
 }
 
 static UA_StatusCode
-pubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+pubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                             UA_PubSubMonitoringType eMonitoringType, void *data)
 {
     if ((!server) || (!data)) {
@@ -413,7 +413,7 @@ pubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_Pub
 }
 
 static UA_StatusCode
-pubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+pubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data) {
     if ((!server) || (!data)) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
diff --git a/examples/pubsub/pubsub_subscribe_standalone.c b/examples/pubsub/pubsub_subscribe_standalone.c
index 32a85f263b7..835da0121d1 100644
--- a/examples/pubsub/pubsub_subscribe_standalone.c
+++ b/examples/pubsub/pubsub_subscribe_standalone.c
@@ -145,6 +145,6 @@ int main(int argc, char **argv) {
         retval = subscriberListen(psc);
 
     psc->close(psc);
-        
+
     return 0;
 }
diff --git a/examples/pubsub/server_pubsub_file_configuration.c b/examples/pubsub/server_pubsub_file_configuration.c
index 9bc53b0649d..449e2b357b9 100644
--- a/examples/pubsub/server_pubsub_file_configuration.c
+++ b/examples/pubsub/server_pubsub_file_configuration.c
@@ -46,7 +46,7 @@ int main(int argc, char** argv) {
             break;
 
         default:
-            usage_info(); 
+            usage_info();
     }
 
     /* 2. Initialize Server */
@@ -58,7 +58,7 @@ int main(int argc, char** argv) {
     UA_VariableAttributes attr;
     UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
     UA_NodeId pubSubVariableObjectId = UA_NODEID_STRING(1, "PubSubObject");
-    
+
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
     oAttr.displayName = UA_LOCALIZEDTEXT("en-US", "PubSubVariables");
     UA_Server_addObjectNode(server, pubSubVariableObjectId,
@@ -138,10 +138,10 @@ int main(int argc, char** argv) {
         statusCode = UA_PubSubManager_getEncodedPubSubConfiguration(server, &buffer);
         if(statusCode == UA_STATUSCODE_GOOD)
             statusCode = writeFile(argv[2], buffer);
-        
-        if(statusCode != UA_STATUSCODE_GOOD) 
+
+        if(statusCode != UA_STATUSCODE_GOOD)
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Saving PubSub configuration to file failed. StatusCode: 0x%x\n", statusCode);
-        
+
         UA_ByteString_clear(&buffer);
     }
 
diff --git a/examples/pubsub/server_pubsub_publisher_iop.c b/examples/pubsub/server_pubsub_publisher_iop.c
index e301f25efd7..3ed3fd6919d 100644
--- a/examples/pubsub/server_pubsub_publisher_iop.c
+++ b/examples/pubsub/server_pubsub_publisher_iop.c
@@ -672,7 +672,7 @@ timerCallback(UA_Server *server, void *data) {
     UA_Variant_setScalar(&tmpVari, &ds2DoubleVal, &UA_TYPES[UA_TYPES_DOUBLE]);
     UA_Server_writeValue(server, ds2DoubleId, tmpVari);
 
-    // String 
+    // String
     UA_Variant_init(&tmpVari);
     ds2StringIndex++;
     if(ds2StringIndex >= ds2StringArrayLen)
@@ -681,7 +681,7 @@ timerCallback(UA_Server *server, void *data) {
     UA_Variant_setScalar(&tmpVari, &ds2StringArray[ds2StringIndex], &UA_TYPES[UA_TYPES_STRING]);
     UA_Server_writeValue(server, ds2StringId, tmpVari);
 
-    // ByteString 
+    // ByteString
     UA_Variant_init(&tmpVari);
     UA_ByteString bs;
     UA_ByteString_init(&bs);
@@ -693,7 +693,7 @@ timerCallback(UA_Server *server, void *data) {
     UA_Server_writeValue(server, ds2ByteStringId, tmpVari);
     UA_ByteString_clear(&bs);
 
-    // Guid 
+    // Guid
     UA_Variant_init(&tmpVari);
     UA_Guid g = UA_Guid_random();
     UA_Variant_setScalar(&tmpVari, &g, &UA_TYPES[UA_TYPES_GUID]);
@@ -730,7 +730,7 @@ static int run(UA_String *transportProfile,
 #endif
 
     addPubSubConnection(server, transportProfile, networkAddressUrl);
-    
+
     /* Create a PublishedDataSet based on a PublishedDataSetConfig. */
     UA_PublishedDataSetConfig publishedDataSetConfig;
     publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
@@ -757,13 +757,13 @@ static int run(UA_String *transportProfile,
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
 
     /* Create a new Writer and connect it with an existing PublishedDataSet */
-    // DataSetWriter ID 1 with Variant Encoding 
+    // DataSetWriter ID 1 with Variant Encoding
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("DataSet 1 DataSetWriter");
     dataSetWriterConfig.dataSetWriterId = 1;
     //The creation of delta messages is configured in the following line. Value
-    // 0 -> no delta messages are created. 
+    // 0 -> no delta messages are created.
     dataSetWriterConfig.keyFrameCount = 10;
 
     UA_NodeId writerIdentifier;
@@ -788,7 +788,7 @@ static int run(UA_String *transportProfile,
     dataSetWriterConfig2.name = UA_STRING("DataSet 2 DataSetWriter");
     dataSetWriterConfig2.dataSetWriterId = 2;
     //The creation of delta messages is configured in the following line. Value
-    // 0 -> no delta messages are created. 
+    // 0 -> no delta messages are created.
     dataSetWriterConfig2.keyFrameCount = 10;
 
     UA_NodeId writerIdentifier2;
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index eaeb52f6f63..67c9a6178ff 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -206,7 +206,7 @@ addWriterGroup(UA_Server *server, char *topic, int interval) {
     /* decide whether to use JSON or UADP encoding*/
 #ifdef UA_ENABLE_JSON_ENCODING
     UA_JsonWriterGroupMessageDataType *Json_writerGroupMessage;
-    
+
     if(useJson) {
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_JSON;
         writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index bbf5c21b614..98ce7221f94 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -113,8 +113,8 @@
 #endif
 #define             CLOCKID                               CLOCK_MONOTONIC
 #define             ETH_TRANSPORT_PROFILE                 "http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp"
-#define             UDP_TRANSPORT_PROFILE                 "http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp"                               
-             
+#define             UDP_TRANSPORT_PROFILE                 "http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp"
+
 /* If the Hardcoded publisher/subscriber MAC addresses need to be changed,
  * change PUBLISHING_MAC_ADDRESS and SUBSCRIBING_MAC_ADDRESS
  */
@@ -870,7 +870,7 @@ void userApplication(UA_UInt64 monotonicOffsetValue) {
 #endif
     }
 
-    /* *runningPub variable made false and send to the publisher application which is running in another node 
+    /* *runningPub variable made false and send to the publisher application which is running in another node
        which will close the application during blocking socket condition */
     if (signalTerm == UA_TRUE) {
 #ifdef TWO_WAY_COMMUNICATION
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index 8d9dd410fc6..f08e33f6516 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -1726,28 +1726,28 @@ int main(int argc, char **argv) {
     networkAddressUrlSub.networkInterface = UA_STRING(interface);
     networkAddressUrlSub.url              = UA_STRING(subMacAddress);
 #endif
-    
+
     if(enableCsvLog) {
 #if defined(PUBLISHER)
         fpPublisher = fopen(filePublishedData, "w");
 #endif
-        
+
 #if defined(SUBSCRIBER)
         fpSubscriber = fopen(fileSubscribedData, "w");
 #endif
     }
-    
+
     /* It is possible to use multiple PubSubTransportLayers on runtime.
      * The correct factory is selected on runtime by the standard defined
      * PubSub TransportProfileUri's. */
-    
+
 #if defined (PUBLISHER)
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
 #endif
-    
+
     /* Create variable nodes for publisher and subscriber in address space */
     addServerNodes(server);
-    
+
 #if defined(PUBLISHER)
     addPubSubConnection(server, &networkAddressUrlPub);
     addPublishedDataSet(server);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index 7df245784ff..62f595d1662 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -584,7 +584,7 @@ addDataSetReader(UA_Server *server) {
  * Create connection, writergroup, datasetwriter and publisheddataset for Publisher thread.
  */
 static void
-addPubSubConnection(UA_Server *server, UA_String *transportProfile, 
+addPubSubConnection(UA_Server *server, UA_String *transportProfile,
                     UA_NetworkAddressUrlDataType *networkAddressUrlPub){
     /* Details about the connection configuration and handling are located
      * in the pubsub connection tutorial */
@@ -832,7 +832,7 @@ void userApplicationPublisher(UA_UInt64 monotonicOffsetValue) {
             updateMeasurementsPublisher(dataModificationTime, *pubCounterData, monotonicOffsetValue);
     }
 
-    /* *runningPub variable made false and send to the publisher application which is running in another node 
+    /* *runningPub variable made false and send to the publisher application which is running in another node
        which will close the application during blocking socket condition */
     if (signalTerm == UA_TRUE) {
         *runningPub = UA_FALSE;
@@ -866,7 +866,7 @@ updateMeasurementsSubscriber(struct timespec receive_time, UA_UInt64 counterValu
 }
 
 /**
- * userApplicationSubscriber function is used to read the data from Information Model for the Subscriber and 
+ * userApplicationSubscriber function is used to read the data from Information Model for the Subscriber and
  * writes the updated counterdata in distinct csv files
  **/
 void userApplicationSubscriber(UA_UInt64 monotonicOffsetValue) {
@@ -1484,7 +1484,7 @@ int main(int argc, char **argv) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"\nTotal Packet Loss Count of publisher application :%"PRIu64"\n", \
                 threadArgPubSub1->packetLossCount);
     UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier);
-#endif  
+#endif
     returnValue = pthread_join(pubAppThreadID, NULL);
     if (returnValue != 0)
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"\nPthread Join Failed for pubApp thread:%d\n", returnValue);
diff --git a/examples/server_inheritance.c b/examples/server_inheritance.c
index 97c97f600d1..600d1ee7ee4 100644
--- a/examples/server_inheritance.c
+++ b/examples/server_inheritance.c
@@ -198,7 +198,7 @@ static void createCustomInheritance(UA_Server *server) {
     UA_Server_addReference(server, UA_NODEID_NUMERIC(1, 30002),
                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE),
                            UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_MANDATORY), true);
-    
+
     /* Now we want to inherit all the mandatory children for LampGreen and don't care about the node ids.
      * These will be automatically generated. This will internally call the _begin and _finish methods */
 
diff --git a/examples/server_instantiation.c b/examples/server_instantiation.c
index e43ddbe79f4..5fd492ceb76 100644
--- a/examples/server_instantiation.c
+++ b/examples/server_instantiation.c
@@ -21,7 +21,7 @@ int main(void) {
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     /* Create a rudimentary objectType
-     * 
+     *
      * BaseObjectType
      * |
      * +- (OT) MamalType
@@ -29,7 +29,7 @@ int main(void) {
      *    + (OT) DogType
      *      |
      *      + (V) Name
-     */ 
+     */
     UA_StatusCode retval;
     UA_ObjectTypeAttributes otAttr = UA_ObjectTypeAttributes_default;
     otAttr.description = UA_LOCALIZEDTEXT("en-US", "A mamal");
@@ -67,7 +67,7 @@ int main(void) {
     /* Instatiate a dog named bello:
      * (O) Objects
      *   + O Bello <DogType>
-     *     + Age 
+     *     + Age
      *     + Name
      */
 
diff --git a/examples/server_settimestamp.c b/examples/server_settimestamp.c
index 6242672727d..442bbdfad3f 100644
--- a/examples/server_settimestamp.c
+++ b/examples/server_settimestamp.c
@@ -51,7 +51,7 @@ writeVariable(UA_Server *server, UA_Int32 myInteger ) {
     UA_VariableAttributes Attr;
     UA_Variant_init(&Attr.value);
     UA_Variant_setScalar(&Attr.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
-    
+
     // Use a more detailed write function than UA_Server_writeValue
     UA_WriteValue wv;
     UA_WriteValue_init(&wv);
diff --git a/examples/tutorial_server_events.c b/examples/tutorial_server_events.c
index bf26eaba012..9b1090e3055 100644
--- a/examples/tutorial_server_events.c
+++ b/examples/tutorial_server_events.c
@@ -108,7 +108,7 @@ generateEventMethodCallback(UA_Server *server,
                                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER),
                                     NULL, UA_TRUE);
     if(retval != UA_STATUSCODE_GOOD)
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, 
+        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                        "Triggering event failed. StatusCode %s", UA_StatusCode_name(retval));
 
     return retval;
diff --git a/examples/tutorial_server_firststeps.c b/examples/tutorial_server_firststeps.c
index bf26f25c048..fb2f07e3ee2 100644
--- a/examples/tutorial_server_firststeps.c
+++ b/examples/tutorial_server_firststeps.c
@@ -83,7 +83,7 @@ int main(void) {
  * as an exchangeable plugin. But don't worry. *open62541* provides plugin
  * implementations for most platforms and sensible default configurations
  * out-of-the-box.
- * 
+ *
  * In the above server code, we simply take the default server configuration and
  * add a single TCP network layer that is listerning on port 4840.
  *
diff --git a/include/open62541/network_tcp.h b/include/open62541/network_tcp.h
index eaa79ffabab..71d86dae0d1 100644
--- a/include/open62541/network_tcp.h
+++ b/include/open62541/network_tcp.h
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2016 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2020 (c) HMS Industrial Networks AB (Author: Jonas Green)
diff --git a/include/open62541/network_ws.h b/include/open62541/network_ws.h
index e2241112dd0..756cbb96a38 100644
--- a/include/open62541/network_ws.h
+++ b/include/open62541/network_ws.h
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2016 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  */
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 8058a590f66..083b8b4b401 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -173,7 +173,7 @@ struct UA_EventLoop {
  * Event Sources are attached to an EventLoop. Typically the event source and
  * the EventLoop are developed together and share a private API in the
  * background. */
- 
+
 typedef enum {
     UA_EVENTSOURCESTATE_FRESH = 0,
     UA_EVENTSOURCESTATE_STOPPED,      /* Registered but stopped */
diff --git a/include/open62541/server.h b/include/open62541/server.h
index d14b85c50bc..3b5270ffbb6 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -1661,7 +1661,7 @@ UA_Server_setConditionTwoStateVariableCallback(UA_Server *server,
                                                UA_TwoStateVariableCallbackType callbackType);
 
 /* Delete a condition from the address space and the internal lists.
- * 
+ *
  * @param server The server object
  * @param condition The NodeId of the node representation of the Condition Instance
  * @param conditionSource The NodeId of the node representation of the Condition Source
diff --git a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
index f5f727c4a26..f8976d54514 100644
--- a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
+++ b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2019 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  */
diff --git a/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c b/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
index 13276fc9000..757bdc3164f 100644
--- a/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
+++ b/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
@@ -203,7 +203,7 @@ channelContext_newContext_sp_pubsub_aes128ctr(void *policyContext,
        (encryptingKey && encryptingKey->length != UA_AES128CTR_KEY_LENGTH) ||
        (keyNonce && keyNonce->length != UA_AES128CTR_KEYNONCE_LENGTH))
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
-       
+
     /* Allocate the channel context */
     PUBSUB_AES128CTR_ChannelContext *cc = (PUBSUB_AES128CTR_ChannelContext *)
         UA_calloc(1, sizeof(PUBSUB_AES128CTR_ChannelContext));
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index d21ce0eb7d4..3931caab5aa 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -107,7 +107,7 @@ fileNamesFromFolder(const UA_String *folder, size_t *pathsSize, UA_String **path
 
     memcpy(buf, folder->data, folder->length);
     buf[folder->length] = 0;
-    
+
     DIR *dir = opendir(buf);
     if(!dir)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -222,7 +222,7 @@ reloadCertificates(CertInfo *ci) {
             char errBuff[300];
             mbedtls_strerror(err, errBuff, 300);
             UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                        "Failed to load certificate from %s, mbedTLS error: %s (error code: %d)", 
+                        "Failed to load certificate from %s, mbedTLS error: %s (error code: %d)",
                         f, errBuff, err);
             internalErrorFlag = 1;
         }
@@ -239,7 +239,7 @@ reloadCertificates(CertInfo *ci) {
 static UA_StatusCode
 certificateVerification_allow(void *verificationContext,
                               const UA_ByteString *certificate) {
-    return UA_STATUSCODE_GOOD;  
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
index d3af3a04d09..343bfea5137 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
@@ -7,7 +7,7 @@
  *    Copyright 2018 (c) HMS Industrial Networks AB (Author: Jonas Green)
  *    Copyright 2020 (c) Wind River Systems, Inc.
  *    Copyright 2020 (c) basysKom GmbH
- * 
+ *
  */
 
 #include <open62541/plugin/securitypolicy_default.h>
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
index 87ed74b188d..8475211e859 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
@@ -213,7 +213,7 @@ sym_verify_sp_basic256(Basic256_ChannelContext *cc,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
     Basic256_PolicyContext *pc = cc->policyContext;
-    
+
     unsigned char mac[UA_SHA1_LENGTH];
     mbedtls_hmac(&pc->sha1MdContext, &cc->remoteSymSigningKey, message, mac);
 
diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.c b/plugins/crypto/openssl/securitypolicy_openssl_common.c
index 3b8d57116d3..c6257949539 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.c
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.c
@@ -515,7 +515,7 @@ UA_OpenSSL_HMAC_SHA256_Verify (const UA_ByteString *     message,
     unsigned char buf[SHA256_DIGEST_LENGTH] = {0};
     UA_ByteString mac = {SHA256_DIGEST_LENGTH, buf};
 
-    if (HMAC (EVP_sha256(), key->data, (int) key->length, message->data, message->length, 
+    if (HMAC (EVP_sha256(), key->data, (int) key->length, message->data, message->length,
               mac.data, (unsigned int *) &mac.length) == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.h b/plugins/crypto/openssl/securitypolicy_openssl_common.h
index 352bb17bc87..78cff2d1b7e 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.h
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.h
@@ -38,20 +38,20 @@ UA_StatusCode
 UA_Openssl_RSA_Oaep_Decrypt(UA_ByteString *data,
                             EVP_PKEY *privateKey);
 UA_StatusCode
-UA_Openssl_RSA_OAEP_Encrypt(UA_ByteString *data, /* The data that is encrypted. 
-                                                    The encrypted data will overwrite 
+UA_Openssl_RSA_OAEP_Encrypt(UA_ByteString *data, /* The data that is encrypted.
+                                                    The encrypted data will overwrite
                                                     the data that was supplied.  */
                              size_t paddingSize, X509 *publicX509);
 
-UA_StatusCode 
+UA_StatusCode
 UA_Openssl_Random_Key_PSHA256_Derive(const UA_ByteString *secret,
-                                     const UA_ByteString *seed, 
+                                     const UA_ByteString *seed,
                                      UA_ByteString *out);
 
-UA_StatusCode 
+UA_StatusCode
 UA_Openssl_RSA_Public_GetKeyLength(X509 *publicKeyX509, UA_Int32 *keyLen);
 
-UA_StatusCode 
+UA_StatusCode
 UA_Openssl_RSA_PKCS1_V15_SHA256_Sign(const UA_ByteString *data,
                                      EVP_PKEY *privateKey,
                                      UA_ByteString *outSignature);
@@ -68,18 +68,18 @@ UA_OpenSSL_HMAC_SHA256_Sign(const UA_ByteString *message,
 
 UA_StatusCode
 UA_OpenSSL_AES_256_CBC_Decrypt(const UA_ByteString *iv,
-                               const UA_ByteString *key, 
+                               const UA_ByteString *key,
                                UA_ByteString *data  /* [in/out]*/);
 
 UA_StatusCode
 UA_OpenSSL_AES_256_CBC_Encrypt(const UA_ByteString *iv,
-                               const UA_ByteString *key, 
+                               const UA_ByteString *key,
                                UA_ByteString *data  /* [in/out]*/);
 
-UA_StatusCode 
+UA_StatusCode
 UA_OpenSSL_X509_compare(const UA_ByteString *cert, const X509 *b);
 
-UA_StatusCode 
+UA_StatusCode
 UA_Openssl_RSA_Private_GetKeyLength(EVP_PKEY *privateKey,
                                     UA_Int32 *keyLen) ;
 
@@ -88,13 +88,13 @@ UA_OpenSSL_RSA_PKCS1_V15_SHA1_Verify(const UA_ByteString *msg,
                                       X509 *publicKeyX509,
                                       const UA_ByteString *signature);
 
-UA_StatusCode 
+UA_StatusCode
 UA_Openssl_RSA_PKCS1_V15_SHA1_Sign(const UA_ByteString *message,
                                    EVP_PKEY *privateKey,
                                    UA_ByteString *outSignature);
-UA_StatusCode 
+UA_StatusCode
 UA_Openssl_Random_Key_PSHA1_Derive(const UA_ByteString *secret,
-                                   const UA_ByteString *seed, 
+                                   const UA_ByteString *seed,
                                    UA_ByteString *out);
 UA_StatusCode
 UA_OpenSSL_HMAC_SHA1_Verify(const UA_ByteString *message,
@@ -107,22 +107,22 @@ UA_OpenSSL_HMAC_SHA1_Sign(const UA_ByteString *message,
                           UA_ByteString *signature);
 
 UA_StatusCode
-UA_Openssl_RSA_PKCS1_V15_Decrypt(UA_ByteString *data, 
+UA_Openssl_RSA_PKCS1_V15_Decrypt(UA_ByteString *data,
                                  EVP_PKEY *privateKey);
 
 UA_StatusCode
-UA_Openssl_RSA_PKCS1_V15_Encrypt(UA_ByteString *data, 
+UA_Openssl_RSA_PKCS1_V15_Encrypt(UA_ByteString *data,
                                  size_t paddingSize,
                                  X509 *publicX509);
 
 UA_StatusCode
 UA_OpenSSL_AES_128_CBC_Decrypt(const UA_ByteString *iv,
-                               const UA_ByteString *key, 
+                               const UA_ByteString *key,
                                UA_ByteString *data  /* [in/out]*/);
 
 UA_StatusCode
 UA_OpenSSL_AES_128_CBC_Encrypt(const UA_ByteString *iv,
-                               const UA_ByteString *key, 
+                               const UA_ByteString *key,
                                UA_ByteString *data  /* [in/out]*/);
 
 EVP_PKEY *
diff --git a/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c b/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
index 70aab6dff6f..13797f8e767 100644
--- a/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
+++ b/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
@@ -94,7 +94,7 @@ UA_Policy_Aes128Sha256RsaOaep_Clear_Context(UA_SecurityPolicy *policy) {
     Policy_Context_Aes128Sha256RsaOaep *pc =
         (Policy_Context_Aes128Sha256RsaOaep *)policy->policyContext;
     if (pc == NULL) {
-        return; 
+        return;
     }
 
     EVP_PKEY_free(pc->localPrivateKey);
diff --git a/plugins/crypto/openssl/ua_openssl_basic128rsa15.c b/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
index 71affd31655..d7549319b4e 100644
--- a/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
+++ b/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
@@ -31,23 +31,23 @@ typedef struct {
 } Policy_Context_Basic128Rsa15;
 
 typedef struct {
-    UA_ByteString             localSymSigningKey;  
-    UA_ByteString             localSymEncryptingKey; 
-    UA_ByteString             localSymIv; 
+    UA_ByteString             localSymSigningKey;
+    UA_ByteString             localSymEncryptingKey;
+    UA_ByteString             localSymIv;
     UA_ByteString             remoteSymSigningKey;
     UA_ByteString             remoteSymEncryptingKey;
     UA_ByteString             remoteSymIv;
 
     Policy_Context_Basic128Rsa15 * policyContext;
     UA_ByteString             remoteCertificate;
-    X509 *                    remoteCertificateX509;   
+    X509 *                    remoteCertificateX509;
 } Channel_Context_Basic128Rsa15;
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_Policy_Basic128Rsa15_New_Context (UA_SecurityPolicy * securityPolicy,
                                      const UA_ByteString localPrivateKey,
                                      const UA_Logger *   logger) {
-    Policy_Context_Basic128Rsa15 * context = (Policy_Context_Basic128Rsa15 *) 
+    Policy_Context_Basic128Rsa15 * context = (Policy_Context_Basic128Rsa15 *)
                                     UA_malloc (sizeof (Policy_Context_Basic128Rsa15));
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -67,14 +67,14 @@ UA_Policy_Basic128Rsa15_New_Context (UA_SecurityPolicy * securityPolicy,
     if (retval != UA_STATUSCODE_GOOD) {
         EVP_PKEY_free(context->localPrivateKey);
         UA_free (context);
-        return retval; 
+        return retval;
     }
 
     context->logger = logger;
     securityPolicy->policyContext = context;
 
     return UA_STATUSCODE_GOOD;
-}                                    
+}
 
 static void
 UA_Policy_Basic128Rsa15_Clear_Context (UA_SecurityPolicy *policy) {
@@ -83,29 +83,29 @@ UA_Policy_Basic128Rsa15_Clear_Context (UA_SecurityPolicy *policy) {
     }
     UA_ByteString_clear(&policy->localCertificate);
 
-    Policy_Context_Basic128Rsa15 * ctx = (Policy_Context_Basic128Rsa15 *) policy->policyContext;    
+    Policy_Context_Basic128Rsa15 * ctx = (Policy_Context_Basic128Rsa15 *) policy->policyContext;
     if (ctx == NULL) {
-        return; 
+        return;
     }
 
     /* delete all allocated members in the context */
 
     EVP_PKEY_free(ctx->localPrivateKey);
     UA_ByteString_clear(&ctx->localCertThumbprint);
-    UA_free (ctx);   
+    UA_free (ctx);
 
     return;
 }
 
 /* create the channel context */
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_ChannelModule_Basic128Rsa15_New_Context (const UA_SecurityPolicy * securityPolicy,
                                             const UA_ByteString *     remoteCertificate,
                                             void **                   channelContext) {
-    if (securityPolicy == NULL || remoteCertificate == NULL || 
+    if (securityPolicy == NULL || remoteCertificate == NULL ||
         channelContext == NULL) {
-        return UA_STATUSCODE_BADINTERNALERROR;                                  
+        return UA_STATUSCODE_BADINTERNALERROR;
         }
     Channel_Context_Basic128Rsa15 * context = (Channel_Context_Basic128Rsa15 *)
             UA_malloc (sizeof (Channel_Context_Basic128Rsa15));
@@ -120,7 +120,7 @@ UA_ChannelModule_Basic128Rsa15_New_Context (const UA_SecurityPolicy * securityPo
     UA_ByteString_init(&context->remoteSymEncryptingKey);
     UA_ByteString_init(&context->remoteSymIv);
 
-    UA_StatusCode retval = UA_copyCertificate (&context->remoteCertificate, 
+    UA_StatusCode retval = UA_copyCertificate (&context->remoteCertificate,
                                                remoteCertificate);
     if (retval != UA_STATUSCODE_GOOD) {
         UA_free (context);
@@ -130,18 +130,18 @@ UA_ChannelModule_Basic128Rsa15_New_Context (const UA_SecurityPolicy * securityPo
     /* decode to X509 */
     context->remoteCertificateX509 = UA_OpenSSL_LoadCertificate(&context->remoteCertificate);
     if (context->remoteCertificateX509 == NULL) {
-        UA_ByteString_clear (&context->remoteCertificate); 
+        UA_ByteString_clear (&context->remoteCertificate);
         UA_free (context);
         return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
     }
 
-    context->policyContext = (Policy_Context_Basic128Rsa15 *) 
+    context->policyContext = (Policy_Context_Basic128Rsa15 *)
                              (securityPolicy->policyContext);
 
     *channelContext = context;
 
-    UA_LOG_INFO (securityPolicy->logger, 
-                 UA_LOGCATEGORY_SECURITYPOLICY, 
+    UA_LOG_INFO (securityPolicy->logger,
+                 UA_LOGCATEGORY_SECURITYPOLICY,
                  "The Basic128Rsa15 security policy channel with openssl is created.");
 
     return UA_STATUSCODE_GOOD;
@@ -149,24 +149,24 @@ UA_ChannelModule_Basic128Rsa15_New_Context (const UA_SecurityPolicy * securityPo
 
 /* delete the channel context */
 
-static void 
+static void
 UA_ChannelModule_Basic128Rsa15_Delete_Context (void * channelContext) {
     if (channelContext != NULL) {
         Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *)
                                               channelContext;
-        X509_free (cc->remoteCertificateX509);                                           
-        UA_ByteString_clear (&cc->remoteCertificate); 
+        X509_free (cc->remoteCertificateX509);
+        UA_ByteString_clear (&cc->remoteCertificate);
         UA_ByteString_clear (&cc->localSymSigningKey);
         UA_ByteString_clear (&cc->localSymEncryptingKey);
         UA_ByteString_clear (&cc->localSymIv);
         UA_ByteString_clear (&cc->remoteSymSigningKey);
         UA_ByteString_clear (&cc->remoteSymEncryptingKey);
         UA_ByteString_clear (&cc->remoteSymIv);
-        UA_LOG_INFO (cc->policyContext->logger, 
-                 UA_LOGCATEGORY_SECURITYPOLICY, 
-                 "The Basic128Rsa15 security policy channel with openssl is deleted.");   
+        UA_LOG_INFO (cc->policyContext->logger,
+                 UA_LOGCATEGORY_SECURITYPOLICY,
+                 "The Basic128Rsa15 security policy channel with openssl is deleted.");
 
-        UA_free (cc);                      
+        UA_free (cc);
     }
 }
 
@@ -249,7 +249,7 @@ UA_ChannelModule_Basic128Rsa15_compareCertificate (const void *          channel
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    const Channel_Context_Basic128Rsa15 * cc = 
+    const Channel_Context_Basic128Rsa15 * cc =
                      (const Channel_Context_Basic128Rsa15 *) channelContext;
     return UA_OpenSSL_X509_compare (certificate, cc->remoteCertificateX509);
 }
@@ -270,12 +270,12 @@ UA_Asy_Basic128Rsa15_compareCertificateThumbprint (const UA_SecurityPolicy * sec
 
 /* Generates a thumbprint for the specified certificate */
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_Asy_Basic128Rsa15_makeCertificateThumbprint (const UA_SecurityPolicy * securityPolicy,
                                   const UA_ByteString *     certificate,
                                   UA_ByteString *           thumbprint) {
-    return UA_Openssl_X509_GetCertificateThumbprint (certificate, 
-               thumbprint, false); 
+    return UA_Openssl_X509_GetCertificateThumbprint (certificate,
+               thumbprint, false);
 }
 
 static size_t
@@ -287,10 +287,10 @@ UA_AsySig_Basic128Rsa15_getRemoteSignatureSize (const void *              channe
     const Channel_Context_Basic128Rsa15 * cc = (const Channel_Context_Basic128Rsa15 *) channelContext;
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Public_GetKeyLength (cc->remoteCertificateX509, &keyLen);
-    return (size_t) keyLen; 
+    return (size_t) keyLen;
 }
 
-static size_t 
+static size_t
 UA_AsySig_Basic128Rsa15_getLocalSignatureSize (const void *              channelContext) {
     if (channelContext == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -301,31 +301,31 @@ UA_AsySig_Basic128Rsa15_getLocalSignatureSize (const void *              channel
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Private_GetKeyLength (pc->localPrivateKey, &keyLen);
 
-    return (size_t) keyLen; 
+    return (size_t) keyLen;
 }
 
-static UA_StatusCode 
-UA_AsySig_Basic128Rsa15_Verify (void *                    channelContext, 
+static UA_StatusCode
+UA_AsySig_Basic128Rsa15_Verify (void *                    channelContext,
                                 const UA_ByteString *     message,
                                 const UA_ByteString *     signature) {
-    if (message == NULL || signature == NULL || 
+    if (message == NULL || signature == NULL ||
         channelContext == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
     Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;
-    UA_StatusCode retval = UA_OpenSSL_RSA_PKCS1_V15_SHA1_Verify (message, 
+    UA_StatusCode retval = UA_OpenSSL_RSA_PKCS1_V15_SHA1_Verify (message,
                             cc->remoteCertificateX509, signature);
 
     return retval;
 }
 
 static UA_StatusCode
-UA_AsySig_Basic128Rsa15_Sign (void *                    channelContext, 
+UA_AsySig_Basic128Rsa15_Sign (void *                    channelContext,
                               const UA_ByteString *     message,
                               UA_ByteString *           signature) {
     if (channelContext == NULL || message == NULL || signature == NULL) {
-        return UA_STATUSCODE_BADINVALIDARGUMENT; 
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
     const Channel_Context_Basic128Rsa15 * cc = (const Channel_Context_Basic128Rsa15 *) channelContext;
@@ -345,7 +345,7 @@ UA_AsymEn_Basic128Rsa15_getRemotePlainTextBlockSize (const void *channelContext)
     return (size_t) keyLen - UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN;
 }
 
-static size_t 
+static size_t
 UA_AsymEn_Basic128Rsa15_getRemoteBlockSize (const void *channelContext) {
     if (channelContext == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -368,7 +368,7 @@ UA_AsymEn_Basic128Rsa15_getRemoteKeyLength (const void *channelContext) {
     return (size_t) keyLen * 8;
 }
 
-static size_t 
+static size_t
 UA_AsymEn_Basic128Rsa15_getLocalKeyLength (const void *channelContext) {
     if (channelContext == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -377,10 +377,10 @@ UA_AsymEn_Basic128Rsa15_getLocalKeyLength (const void *channelContext) {
     Policy_Context_Basic128Rsa15 *pc = cc->policyContext;
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Private_GetKeyLength (pc->localPrivateKey, &keyLen);
-    return (size_t) keyLen * 8; 
+    return (size_t) keyLen * 8;
 }
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_AsymEn_Basic128Rsa15_Decrypt (void *                    channelContext,
                                  UA_ByteString *           data) {
     if (channelContext == NULL || data == NULL) {
@@ -388,19 +388,19 @@ UA_AsymEn_Basic128Rsa15_Decrypt (void *                    channelContext,
     }
 
     Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;
-    UA_StatusCode ret = UA_Openssl_RSA_PKCS1_V15_Decrypt (data, 
+    UA_StatusCode ret = UA_Openssl_RSA_PKCS1_V15_Decrypt (data,
                         cc->policyContext->localPrivateKey);
-    return ret;                        
+    return ret;
 }
 
 static UA_StatusCode
 UA_AsymEn_Basic128Rsa15_Encrypt (void *                    channelContext,
                                  UA_ByteString *           data) {
     if (channelContext == NULL || data == NULL)
-        return UA_STATUSCODE_BADINVALIDARGUMENT; 
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;    
-    return UA_Openssl_RSA_PKCS1_V15_Encrypt (data, 
+    Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;
+    return UA_Openssl_RSA_PKCS1_V15_Encrypt (data,
                                              UA_SECURITYPOLICY_BASIC128RSA15_RSAPADDING_LEN,
                                              cc->remoteCertificateX509);
 }
@@ -423,20 +423,20 @@ UA_Sym_Basic128Rsa15_generateKey(void *policyContext,
     return UA_Openssl_Random_Key_PSHA1_Derive(secret, seed, out);
 }
 
-static size_t 
+static size_t
 UA_SymEn_Basic128Rsa15_getLocalKeyLength (const void *channelContext) {
     /* 16 bytes 128 bits */
-    return UA_SECURITYPOLICY_BASIC128RSA15_SYM_ENCRYPTION_KEY_LENGTH; 
+    return UA_SECURITYPOLICY_BASIC128RSA15_SYM_ENCRYPTION_KEY_LENGTH;
 }
 
-static size_t 
+static size_t
 UA_SymEn_Basic128Rsa15_getBlockSize (const void *channelContext) {
     return UA_SECURITYPOLICY_BASIC128RSA15_SYM_ENCRYPTION_BLOCK_SIZE;
 }
 
 static size_t
 UA_SymEn_Basic128Rsa15_getRemoteKeyLength (const void * channelContext) {
-    return UA_SECURITYPOLICY_BASIC128RSA15_SYM_ENCRYPTION_KEY_LENGTH; 
+    return UA_SECURITYPOLICY_BASIC128RSA15_SYM_ENCRYPTION_KEY_LENGTH;
 }
 
 static UA_StatusCode
@@ -444,7 +444,7 @@ UA_SymEn_Basic128Rsa15_Encrypt (void *channelContext,
                                 UA_ByteString *data) {
     if(channelContext == NULL || data == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    
+
     Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;
     return UA_OpenSSL_AES_128_CBC_Encrypt (&cc->localSymIv, &cc->localSymEncryptingKey, data);
 }
@@ -454,13 +454,13 @@ UA_SymEn_Basic128Rsa15_Decrypt (void *                    channelContext,
                                 UA_ByteString *           data) {
     if(channelContext == NULL || data == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;    
+    Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;
     return UA_OpenSSL_AES_128_CBC_Decrypt (&cc->remoteSymIv, &cc->remoteSymEncryptingKey, data);
 }
 
-static size_t 
+static size_t
 UA_SymSig_Basic128Rsa15_getKeyLength (const void *channelContext) {
-    return UA_SECURITYPOLICY_BASIC128RSA15_SYM_SIGNING_KEY_LENGTH; 
+    return UA_SECURITYPOLICY_BASIC128RSA15_SYM_SIGNING_KEY_LENGTH;
 }
 
 static size_t
@@ -469,25 +469,25 @@ UA_SymSig_Basic128Rsa15_getSignatureSize (const void *channelContext) {
 }
 
 static UA_StatusCode
-UA_SymSig_Basic128Rsa15_Verify (void *                    channelContext, 
+UA_SymSig_Basic128Rsa15_Verify (void *                    channelContext,
                                 const UA_ByteString *     message,
                                 const UA_ByteString *     signature) {
     if (channelContext == NULL || message == NULL || signature == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    
+
     Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;
-    return UA_OpenSSL_HMAC_SHA1_Verify (message, 
-                                        &cc->remoteSymSigningKey, 
-                                        signature);   
+    return UA_OpenSSL_HMAC_SHA1_Verify (message,
+                                        &cc->remoteSymSigningKey,
+                                        signature);
 }
 
-static UA_StatusCode 
-UA_SymSig_Basic128Rsa15_Sign (void *                    channelContext, 
+static UA_StatusCode
+UA_SymSig_Basic128Rsa15_Sign (void *                    channelContext,
                               const UA_ByteString *     message,
                               UA_ByteString *           signature) {
     if (channelContext == NULL || message == NULL || signature == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    
+
     Channel_Context_Basic128Rsa15 * cc = (Channel_Context_Basic128Rsa15 *) channelContext;
     return UA_OpenSSL_HMAC_SHA1_Sign (message, &cc->localSymSigningKey, signature);
 }
@@ -497,15 +497,15 @@ UA_SymSig_Basic128Rsa15_Sign (void *                    channelContext,
 UA_StatusCode
 UA_SecurityPolicy_Basic128Rsa15 (UA_SecurityPolicy * policy,
                                  const UA_ByteString localCertificate,
-                                 const UA_ByteString localPrivateKey, 
+                                 const UA_ByteString localPrivateKey,
                                  const UA_Logger *   logger) {
 
     UA_SecurityPolicyAsymmetricModule * const asymmetricModule = &policy->asymmetricModule;
-    UA_SecurityPolicySymmetricModule * const  symmetricModule = &policy->symmetricModule;  
-    UA_SecurityPolicyChannelModule * const    channelModule = &policy->channelModule;  
-    UA_StatusCode                             retval; 
+    UA_SecurityPolicySymmetricModule * const  symmetricModule = &policy->symmetricModule;
+    UA_SecurityPolicyChannelModule * const    channelModule = &policy->channelModule;
+    UA_StatusCode                             retval;
 
-    UA_LOG_INFO (logger, UA_LOGCATEGORY_SECURITYPOLICY, 
+    UA_LOG_INFO (logger, UA_LOGCATEGORY_SECURITYPOLICY,
                  "The Basic128Rsa15 security policy with openssl is added.");
 
     UA_Openssl_Init ();
@@ -524,7 +524,7 @@ UA_SecurityPolicy_Basic128Rsa15 (UA_SecurityPolicy * policy,
     channelModule->setRemoteSymSigningKey = UA_ChannelModule_Basic128Rsa15_setRemoteSymSigningKey;
     channelModule->setRemoteSymEncryptingKey = UA_ChannelModule_Basic128Rsa15_setRemoteSymEncryptingKey;
     channelModule->setRemoteSymIv = UA_ChannelModule_Basic128Rsa15_setRemoteSymIv;
-    channelModule->compareCertificate = UA_ChannelModule_Basic128Rsa15_compareCertificate;    
+    channelModule->compareCertificate = UA_ChannelModule_Basic128Rsa15_compareCertificate;
 
     retval = UA_OpenSSL_LoadLocalCertificate(&localCertificate, &policy->localCertificate);
 
@@ -538,14 +538,14 @@ UA_SecurityPolicy_Basic128Rsa15 (UA_SecurityPolicy * policy,
 
     /* AsymmetricModule - signature algorithm */
 
-    UA_SecurityPolicySignatureAlgorithm * asySigAlgorithm = 
+    UA_SecurityPolicySignatureAlgorithm * asySigAlgorithm =
                     &asymmetricModule->cryptoModule.signatureAlgorithm;
     asySigAlgorithm->uri = UA_STRING("http://www.w3.org/2000/09/xmldsig#rsa-sha1\0");
     asySigAlgorithm->getRemoteSignatureSize = UA_AsySig_Basic128Rsa15_getRemoteSignatureSize;
     asySigAlgorithm->getLocalSignatureSize = UA_AsySig_Basic128Rsa15_getLocalSignatureSize;
     asySigAlgorithm->getLocalKeyLength = NULL;
     asySigAlgorithm->getRemoteKeyLength = NULL;
-    asySigAlgorithm->verify = UA_AsySig_Basic128Rsa15_Verify;    
+    asySigAlgorithm->verify = UA_AsySig_Basic128Rsa15_Verify;
     asySigAlgorithm->sign = UA_AsySig_Basic128Rsa15_Sign;
 
     /*  AsymmetricModule encryption algorithm */
@@ -564,19 +564,19 @@ UA_SecurityPolicy_Basic128Rsa15 (UA_SecurityPolicy * policy,
 
     symmetricModule->secureChannelNonceLength = 16;  /* 128 bits*/
     symmetricModule->generateNonce = UA_Sym_Basic128Rsa15_generateNonce;
-    symmetricModule->generateKey = UA_Sym_Basic128Rsa15_generateKey; 
+    symmetricModule->generateKey = UA_Sym_Basic128Rsa15_generateKey;
 
     /* Symmetric encryption Algorithm */
 
     UA_SecurityPolicyEncryptionAlgorithm * symEncryptionAlgorithm =
         &symmetricModule->cryptoModule.encryptionAlgorithm;
-    symEncryptionAlgorithm->uri = UA_STRING("http://www.w3.org/2001/04/xmlenc#aes128-cbc\0");   
+    symEncryptionAlgorithm->uri = UA_STRING("http://www.w3.org/2001/04/xmlenc#aes128-cbc\0");
     symEncryptionAlgorithm->getLocalKeyLength = UA_SymEn_Basic128Rsa15_getLocalKeyLength;
     symEncryptionAlgorithm->getRemoteKeyLength = UA_SymEn_Basic128Rsa15_getRemoteKeyLength;
     symEncryptionAlgorithm->getRemoteBlockSize = UA_SymEn_Basic128Rsa15_getBlockSize;
     symEncryptionAlgorithm->getRemotePlainTextBlockSize = UA_SymEn_Basic128Rsa15_getBlockSize;
     symEncryptionAlgorithm->decrypt = UA_SymEn_Basic128Rsa15_Decrypt;
-    symEncryptionAlgorithm->encrypt = UA_SymEn_Basic128Rsa15_Encrypt;    
+    symEncryptionAlgorithm->encrypt = UA_SymEn_Basic128Rsa15_Encrypt;
 
     /* Symmetric signature Algorithm */
 
@@ -598,9 +598,9 @@ UA_SecurityPolicy_Basic128Rsa15 (UA_SecurityPolicy * policy,
         UA_ByteString_clear (&policy->localCertificate);
         return retval;
     }
-    policy->clear = UA_Policy_Basic128Rsa15_Clear_Context;    
+    policy->clear = UA_Policy_Basic128Rsa15_Clear_Context;
 
-    /* Use the same signature algorithm as the asymmetric component for 
+    /* Use the same signature algorithm as the asymmetric component for
        certificate signing (see standard) */
     policy->certificateSigningAlgorithm = policy->asymmetricModule.cryptoModule.signatureAlgorithm;
 
diff --git a/plugins/crypto/openssl/ua_openssl_basic256.c b/plugins/crypto/openssl/ua_openssl_basic256.c
index e54042a7a02..9ae0b6149c2 100644
--- a/plugins/crypto/openssl/ua_openssl_basic256.c
+++ b/plugins/crypto/openssl/ua_openssl_basic256.c
@@ -29,28 +29,28 @@ typedef struct {
 } Policy_Context_Basic256;
 
 typedef struct {
-    UA_ByteString             localSymSigningKey;  
-    UA_ByteString             localSymEncryptingKey; 
-    UA_ByteString             localSymIv; 
+    UA_ByteString             localSymSigningKey;
+    UA_ByteString             localSymEncryptingKey;
+    UA_ByteString             localSymIv;
     UA_ByteString             remoteSymSigningKey;
     UA_ByteString             remoteSymEncryptingKey;
     UA_ByteString             remoteSymIv;
 
     Policy_Context_Basic256 * policyContext;
     UA_ByteString             remoteCertificate;
-    X509 *                    remoteCertificateX509;   
+    X509 *                    remoteCertificateX509;
 } Channel_Context_Basic256;
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_Policy_Basic256_New_Context (UA_SecurityPolicy * securityPolicy,
                                 const UA_ByteString localPrivateKey,
                                 const UA_Logger *   logger) {
-    Policy_Context_Basic256 * context = (Policy_Context_Basic256 *) 
+    Policy_Context_Basic256 * context = (Policy_Context_Basic256 *)
                                     UA_malloc (sizeof (Policy_Context_Basic256));
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    
+
     context->localPrivateKey = UA_OpenSSL_LoadPrivateKey(&localPrivateKey);
 
     if (!context->localPrivateKey) {
@@ -65,14 +65,14 @@ UA_Policy_Basic256_New_Context (UA_SecurityPolicy * securityPolicy,
     if (retval != UA_STATUSCODE_GOOD) {
         EVP_PKEY_free(context->localPrivateKey);
         UA_free (context);
-        return retval; 
+        return retval;
     }
 
     context->logger = logger;
     securityPolicy->policyContext = context;
 
     return UA_STATUSCODE_GOOD;
-}                                    
+}
 
 static void
 UA_Policy_Basic256_Clear_Context (UA_SecurityPolicy *policy) {
@@ -81,29 +81,29 @@ UA_Policy_Basic256_Clear_Context (UA_SecurityPolicy *policy) {
     }
     UA_ByteString_clear(&policy->localCertificate);
 
-    Policy_Context_Basic256 * ctx = (Policy_Context_Basic256 *) policy->policyContext;    
+    Policy_Context_Basic256 * ctx = (Policy_Context_Basic256 *) policy->policyContext;
     if (ctx == NULL) {
-        return; 
+        return;
     }
 
     /* delete all allocated members in the context */
 
     EVP_PKEY_free(ctx->localPrivateKey);
     UA_ByteString_clear(&ctx->localCertThumbprint);
-    UA_free (ctx);   
+    UA_free (ctx);
 
-    return;         
+    return;
 }
 
 /* create the channel context */
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_ChannelModule_Basic256_New_Context (const UA_SecurityPolicy * securityPolicy,
                                        const UA_ByteString *     remoteCertificate,
                                        void **                   channelContext) {
-    if (securityPolicy == NULL || remoteCertificate == NULL || 
+    if (securityPolicy == NULL || remoteCertificate == NULL ||
         channelContext == NULL) {
-        return UA_STATUSCODE_BADINTERNALERROR;                                  
+        return UA_STATUSCODE_BADINTERNALERROR;
         }
     Channel_Context_Basic256 * context = (Channel_Context_Basic256 *)
             UA_malloc (sizeof (Channel_Context_Basic256));
@@ -118,7 +118,7 @@ UA_ChannelModule_Basic256_New_Context (const UA_SecurityPolicy * securityPolicy,
     UA_ByteString_init(&context->remoteSymEncryptingKey);
     UA_ByteString_init(&context->remoteSymIv);
 
-    UA_StatusCode retval = UA_copyCertificate (&context->remoteCertificate, 
+    UA_StatusCode retval = UA_copyCertificate (&context->remoteCertificate,
                                                remoteCertificate);
     if (retval != UA_STATUSCODE_GOOD) {
         UA_free (context);
@@ -128,18 +128,18 @@ UA_ChannelModule_Basic256_New_Context (const UA_SecurityPolicy * securityPolicy,
     /* decode to X509 */
     context->remoteCertificateX509 = UA_OpenSSL_LoadCertificate(&context->remoteCertificate);
     if (context->remoteCertificateX509 == NULL) {
-        UA_ByteString_clear (&context->remoteCertificate); 
+        UA_ByteString_clear (&context->remoteCertificate);
         UA_free (context);
         return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
     }
 
-    context->policyContext = (Policy_Context_Basic256 *) 
+    context->policyContext = (Policy_Context_Basic256 *)
                              (securityPolicy->policyContext);
 
     *channelContext = context;
 
-    UA_LOG_INFO (securityPolicy->logger, 
-                 UA_LOGCATEGORY_SECURITYPOLICY, 
+    UA_LOG_INFO (securityPolicy->logger,
+                 UA_LOGCATEGORY_SECURITYPOLICY,
                  "The basic256 security policy channel with openssl is created.");
 
     return UA_STATUSCODE_GOOD;
@@ -147,29 +147,29 @@ UA_ChannelModule_Basic256_New_Context (const UA_SecurityPolicy * securityPolicy,
 
 /* delete the channel context */
 
-static void 
+static void
 UA_ChannelModule_Basic256_Delete_Context (void * channelContext) {
     if (channelContext != NULL) {
         Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *)
                                            channelContext;
-        X509_free (cc->remoteCertificateX509);                                           
-        UA_ByteString_clear (&cc->remoteCertificate); 
+        X509_free (cc->remoteCertificateX509);
+        UA_ByteString_clear (&cc->remoteCertificate);
         UA_ByteString_clear (&cc->localSymSigningKey);
         UA_ByteString_clear (&cc->localSymEncryptingKey);
         UA_ByteString_clear (&cc->localSymIv);
         UA_ByteString_clear (&cc->remoteSymSigningKey);
         UA_ByteString_clear (&cc->remoteSymEncryptingKey);
         UA_ByteString_clear (&cc->remoteSymIv);
-        UA_LOG_INFO (cc->policyContext->logger, 
-                 UA_LOGCATEGORY_SECURITYPOLICY, 
-                 "The basic256 security policy channel with openssl is deleted.");   
+        UA_LOG_INFO (cc->policyContext->logger,
+                 UA_LOGCATEGORY_SECURITYPOLICY,
+                 "The basic256 security policy channel with openssl is deleted.");
 
-        UA_free (cc);                      
+        UA_free (cc);
     }
 }
 
-/* Compares the supplied certificate with the certificate 
- * in the endpoint context 
+/* Compares the supplied certificate with the certificate
+ * in the endpoint context
  */
 
 static UA_StatusCode
@@ -188,12 +188,12 @@ UA_Asy_Basic256_compareCertificateThumbprint (const UA_SecurityPolicy * security
 
 /* Generates a thumbprint for the specified certificate */
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_Asy_Basic256_makeCertificateThumbprint (const UA_SecurityPolicy * securityPolicy,
                                   const UA_ByteString *     certificate,
                                   UA_ByteString *           thumbprint) {
-    return UA_Openssl_X509_GetCertificateThumbprint (certificate, 
-               thumbprint, false); 
+    return UA_Openssl_X509_GetCertificateThumbprint (certificate,
+               thumbprint, false);
 }
 
 static UA_StatusCode
@@ -275,7 +275,7 @@ UA_ChannelModule_Basic256_compareCertificate (const void *          channelConte
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    const Channel_Context_Basic256 * cc = 
+    const Channel_Context_Basic256 * cc =
                      (const Channel_Context_Basic256 *) channelContext;
     return UA_OpenSSL_X509_compare (certificate, cc->remoteCertificateX509);
 }
@@ -289,10 +289,10 @@ UA_AsySig_Basic256_getRemoteSignatureSize (const void *channelContext) {
     const Channel_Context_Basic256 * cc = (const Channel_Context_Basic256 *) channelContext;
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Public_GetKeyLength (cc->remoteCertificateX509, &keyLen);
-    return (size_t) keyLen; 
+    return (size_t) keyLen;
 }
 
-static size_t 
+static size_t
 UA_AsySig_Basic256_getLocalSignatureSize (const void *channelContext) {
     if (channelContext == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -303,11 +303,11 @@ UA_AsySig_Basic256_getLocalSignatureSize (const void *channelContext) {
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Private_GetKeyLength (pc->localPrivateKey, &keyLen);
 
-    return (size_t) keyLen; 
+    return (size_t) keyLen;
 }
 
-static UA_StatusCode 
-UA_AsySig_Basic256_Verify (void *                    channelContext, 
+static UA_StatusCode
+UA_AsySig_Basic256_Verify (void *                    channelContext,
                            const UA_ByteString *     message,
                            const UA_ByteString *     signature) {
     if (message == NULL || signature == NULL || channelContext == NULL) {
@@ -315,17 +315,17 @@ UA_AsySig_Basic256_Verify (void *                    channelContext,
         }
 
     Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;
-    UA_StatusCode retval = UA_OpenSSL_RSA_PKCS1_V15_SHA1_Verify (message, 
+    UA_StatusCode retval = UA_OpenSSL_RSA_PKCS1_V15_SHA1_Verify (message,
                             cc->remoteCertificateX509, signature);
     return retval;
 }
 
 static UA_StatusCode
-UA_AsySig_Basic256_Sign (void *                    channelContext, 
+UA_AsySig_Basic256_Sign (void *                    channelContext,
                          const UA_ByteString *     message,
                          UA_ByteString *           signature) {
     if (channelContext == NULL || message == NULL || signature == NULL) {
-        return UA_STATUSCODE_BADINVALIDARGUMENT; 
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
     Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;
@@ -346,7 +346,7 @@ UA_AsymEn_Basic256_getRemotePlainTextBlockSize (const void *channelContext) {
     return (size_t) keyLen - UA_SECURITYPOLICY_BASIC256SHA1_RSAPADDING_LEN;
 }
 
-static size_t 
+static size_t
 UA_AsymEn_Basic256_getRemoteBlockSize (const void *channelContext) {
     if (channelContext == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -369,7 +369,7 @@ UA_AsymEn_Basic256_getRemoteKeyLength (const void *channelContext) {
     return (size_t) keyLen * 8;
 }
 
-static size_t 
+static size_t
 UA_AsymEn_Basic256_getLocalKeyLength (const void *channelContext) {
     if (channelContext == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -379,10 +379,10 @@ UA_AsymEn_Basic256_getLocalKeyLength (const void *channelContext) {
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Private_GetKeyLength (pc->localPrivateKey, &keyLen);
 
-    return (size_t) keyLen * 8; 
+    return (size_t) keyLen * 8;
 }
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_AsymEn_Basic256_Decrypt (void *                    channelContext,
                             UA_ByteString *           data) {
     if (channelContext == NULL || data == NULL) {
@@ -390,19 +390,19 @@ UA_AsymEn_Basic256_Decrypt (void *                    channelContext,
     }
 
     Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;
-    UA_StatusCode ret = UA_Openssl_RSA_Oaep_Decrypt (data, 
+    UA_StatusCode ret = UA_Openssl_RSA_Oaep_Decrypt (data,
                         cc->policyContext->localPrivateKey);
-    return ret;                        
+    return ret;
 }
 
 static UA_StatusCode
 UA_AsymEn_Basic256_Encrypt (void *                    channelContext,
                             UA_ByteString *           data) {
     if (channelContext == NULL || data == NULL) {
-        return UA_STATUSCODE_BADINVALIDARGUMENT; 
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;    
+    Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;
     return UA_Openssl_RSA_OAEP_Encrypt (data, UA_SECURITYPOLICY_BASIC256SHA1_RSAPADDING_LEN,
                                         cc->remoteCertificateX509);
 }
@@ -423,13 +423,13 @@ UA_Sym_Basic256_generateKey(void *policyContext, const UA_ByteString *secret,
     return UA_Openssl_Random_Key_PSHA1_Derive(secret, seed, out);
 }
 
-static size_t 
+static size_t
 UA_SymEn_Basic256_getLocalKeyLength (const void *              channelContext) {
     /* 32 bytes 256 bits */
-    return UA_SECURITYPOLICY_BASIC256_SYM_ENCRYPTION_KEY_LENGTH; 
+    return UA_SECURITYPOLICY_BASIC256_SYM_ENCRYPTION_KEY_LENGTH;
 }
 
-static size_t 
+static size_t
 UA_SymEn_Basic256_getBlockSize (const void *              channelContext) {
     return UA_SECURITYPOLICY_BASIC256_SYM_ENCRYPTION_BLOCK_SIZE;
 }
@@ -437,7 +437,7 @@ UA_SymEn_Basic256_getBlockSize (const void *              channelContext) {
 static size_t
 UA_SymEn_Basic256_getRemoteKeyLength (const void * channelContext) {
     /* 32 bytes 256 bits */
-    return UA_SECURITYPOLICY_BASIC256_SYM_ENCRYPTION_KEY_LENGTH; 
+    return UA_SECURITYPOLICY_BASIC256_SYM_ENCRYPTION_KEY_LENGTH;
 }
 
 static UA_StatusCode
@@ -445,7 +445,7 @@ UA_SymEn_Basic256_Encrypt (void *                    channelContext,
                            UA_ByteString *           data) {
     if(channelContext == NULL || data == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    
+
     Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;
     return UA_OpenSSL_AES_256_CBC_Encrypt (&cc->localSymIv, &cc->localSymEncryptingKey, data);
 }
@@ -455,13 +455,13 @@ UA_SymEn_Basic256_Decrypt (void *                    channelContext,
                            UA_ByteString *           data) {
     if(channelContext == NULL || data == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;    
+    Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;
     return UA_OpenSSL_AES_256_CBC_Decrypt (&cc->remoteSymIv, &cc->remoteSymEncryptingKey, data);
 }
 
-static size_t 
+static size_t
 UA_SymSig_Basic256_getKeyLength (const void *              channelContext) {
-    return UA_SECURITYPOLICY_BASIC256_SYM_SIGNING_KEY_LENGTH; 
+    return UA_SECURITYPOLICY_BASIC256_SYM_SIGNING_KEY_LENGTH;
 }
 
 static size_t
@@ -470,26 +470,26 @@ UA_SymSig_Basic256_getSignatureSize (const void *              channelContext) {
 }
 
 static UA_StatusCode
-UA_SymSig_Basic256_Verify (void *                    channelContext, 
+UA_SymSig_Basic256_Verify (void *                    channelContext,
                            const UA_ByteString *     message,
                            const UA_ByteString *     signature) {
-    if (channelContext == NULL || 
+    if (channelContext == NULL ||
        message == NULL || signature == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    
+
     Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;
-    return UA_OpenSSL_HMAC_SHA1_Verify (message, 
-                                        &cc->remoteSymSigningKey, 
-                                        signature);   
+    return UA_OpenSSL_HMAC_SHA1_Verify (message,
+                                        &cc->remoteSymSigningKey,
+                                        signature);
 }
 
-static UA_StatusCode 
-UA_SymSig_Basic256_Sign (void *                    channelContext, 
+static UA_StatusCode
+UA_SymSig_Basic256_Sign (void *                    channelContext,
                          const UA_ByteString *     message,
                          UA_ByteString *           signature) {
     if (channelContext == NULL || message == NULL || signature == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    
+
     Channel_Context_Basic256 * cc = (Channel_Context_Basic256 *) channelContext;
     return UA_OpenSSL_HMAC_SHA1_Sign (message, &cc->localSymSigningKey, signature);
 }
@@ -499,14 +499,14 @@ UA_SymSig_Basic256_Sign (void *                    channelContext,
 UA_StatusCode
 UA_SecurityPolicy_Basic256 (UA_SecurityPolicy * policy,
                             const UA_ByteString localCertificate,
-                            const UA_ByteString localPrivateKey, 
+                            const UA_ByteString localPrivateKey,
                             const UA_Logger *   logger) {
     UA_SecurityPolicyAsymmetricModule * const asymmetricModule = &policy->asymmetricModule;
-    UA_SecurityPolicySymmetricModule * const  symmetricModule = &policy->symmetricModule; 
-    UA_SecurityPolicyChannelModule * const    channelModule = &policy->channelModule;  
-    UA_StatusCode                             retval; 
+    UA_SecurityPolicySymmetricModule * const  symmetricModule = &policy->symmetricModule;
+    UA_SecurityPolicyChannelModule * const    channelModule = &policy->channelModule;
+    UA_StatusCode                             retval;
 
-    UA_LOG_INFO (logger, UA_LOGCATEGORY_SECURITYPOLICY, 
+    UA_LOG_INFO (logger, UA_LOGCATEGORY_SECURITYPOLICY,
                  "The basic256 security policy with openssl is added.");
 
     UA_Openssl_Init ();
@@ -544,7 +544,7 @@ UA_SecurityPolicy_Basic256 (UA_SecurityPolicy * policy,
     asySigAlgorithm->uri = UA_STRING("http://www.w3.org/2000/09/xmldsig#rsa-sha1\0");
     asySigAlgorithm->getRemoteSignatureSize = UA_AsySig_Basic256_getRemoteSignatureSize;
     asySigAlgorithm->getLocalSignatureSize = UA_AsySig_Basic256_getLocalSignatureSize;
-    asySigAlgorithm->verify = UA_AsySig_Basic256_Verify;    
+    asySigAlgorithm->verify = UA_AsySig_Basic256_Verify;
     asySigAlgorithm->sign = UA_AsySig_Basic256_Sign;
     asySigAlgorithm->getLocalKeyLength = NULL;
     asySigAlgorithm->getRemoteKeyLength = NULL;
@@ -565,13 +565,13 @@ UA_SecurityPolicy_Basic256 (UA_SecurityPolicy * policy,
 
     symmetricModule->secureChannelNonceLength = 32;
     symmetricModule->generateNonce = UA_Sym_Basic256_generateNonce;
-    symmetricModule->generateKey = UA_Sym_Basic256_generateKey; 
+    symmetricModule->generateKey = UA_Sym_Basic256_generateKey;
 
     /* Symmetric encryption Algorithm */
 
     UA_SecurityPolicyEncryptionAlgorithm * symEncryptionAlgorithm =
         &symmetricModule->cryptoModule.encryptionAlgorithm;
-    symEncryptionAlgorithm->uri = UA_STRING("http://www.w3.org/2001/04/xmlenc#aes256-cbc\0");   
+    symEncryptionAlgorithm->uri = UA_STRING("http://www.w3.org/2001/04/xmlenc#aes256-cbc\0");
     symEncryptionAlgorithm->getLocalKeyLength = UA_SymEn_Basic256_getLocalKeyLength;
     symEncryptionAlgorithm->getRemoteKeyLength = UA_SymEn_Basic256_getRemoteKeyLength;
     symEncryptionAlgorithm->getRemoteBlockSize = UA_SymEn_Basic256_getBlockSize;
@@ -598,9 +598,9 @@ UA_SecurityPolicy_Basic256 (UA_SecurityPolicy * policy,
         UA_ByteString_clear (&policy->localCertificate);
         return retval;
     }
-    policy->clear = UA_Policy_Basic256_Clear_Context;    
+    policy->clear = UA_Policy_Basic256_Clear_Context;
 
-    /* Use the same signature algorithm as the asymmetric component for 
+    /* Use the same signature algorithm as the asymmetric component for
        certificate signing (see standard) */
     policy->certificateSigningAlgorithm = policy->asymmetricModule.cryptoModule.signatureAlgorithm;
 
diff --git a/plugins/crypto/openssl/ua_openssl_basic256sha256.c b/plugins/crypto/openssl/ua_openssl_basic256sha256.c
index bf34ee80df4..af18f2fe754 100644
--- a/plugins/crypto/openssl/ua_openssl_basic256sha256.c
+++ b/plugins/crypto/openssl/ua_openssl_basic256sha256.c
@@ -32,25 +32,25 @@
 typedef struct {
     EVP_PKEY *localPrivateKey;
     UA_ByteString localCertThumbprint;
-    const UA_Logger *logger;    
+    const UA_Logger *logger;
 } Policy_Context_Basic256Sha256;
 
 typedef struct {
-    UA_ByteString localSymSigningKey;  
-    UA_ByteString localSymEncryptingKey; 
-    UA_ByteString localSymIv; 
+    UA_ByteString localSymSigningKey;
+    UA_ByteString localSymEncryptingKey;
+    UA_ByteString localSymIv;
     UA_ByteString remoteSymSigningKey;
     UA_ByteString remoteSymEncryptingKey;
     UA_ByteString remoteSymIv;
 
     Policy_Context_Basic256Sha256 *policyContext;
     UA_ByteString remoteCertificate;
-    X509 *remoteCertificateX509; /* X509 */      
+    X509 *remoteCertificateX509; /* X509 */
 } Channel_Context_Basic256Sha256;
 
 /* create the policy context */
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_Policy_New_Context(UA_SecurityPolicy * securityPolicy,
                        const UA_ByteString localPrivateKey,
                        const UA_Logger *logger) {
@@ -71,7 +71,7 @@ UA_Policy_New_Context(UA_SecurityPolicy * securityPolicy,
     if(retval != UA_STATUSCODE_GOOD) {
         EVP_PKEY_free(context->localPrivateKey);
         UA_free(context);
-        return retval; 
+        return retval;
     }
 
     context->logger = logger;
@@ -92,18 +92,18 @@ UA_Policy_Clear_Context(UA_SecurityPolicy *policy) {
         (Policy_Context_Basic256Sha256 *) policy->policyContext;
     EVP_PKEY_free(pc->localPrivateKey);
     UA_ByteString_clear(&pc->localCertThumbprint);
-    UA_free(pc);        
+    UA_free(pc);
     return;
 }
 
 /* create the channel context */
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_ChannelModule_New_Context(const UA_SecurityPolicy * securityPolicy,
                              const UA_ByteString * remoteCertificate,
                              void ** channelContext) {
     if(securityPolicy == NULL || remoteCertificate == NULL || channelContext == NULL)
-        return UA_STATUSCODE_BADINTERNALERROR;                                  
+        return UA_STATUSCODE_BADINTERNALERROR;
 
     Channel_Context_Basic256Sha256 *context = (Channel_Context_Basic256Sha256 *)
         UA_malloc(sizeof(Channel_Context_Basic256Sha256));
@@ -127,7 +127,7 @@ UA_ChannelModule_New_Context(const UA_SecurityPolicy * securityPolicy,
     /* decode to X509 */
     context->remoteCertificateX509 = UA_OpenSSL_LoadCertificate(&context->remoteCertificate);
     if(context->remoteCertificateX509 == NULL) {
-        UA_ByteString_clear(&context->remoteCertificate); 
+        UA_ByteString_clear(&context->remoteCertificate);
         UA_free(context);
     }
 
@@ -135,7 +135,7 @@ UA_ChannelModule_New_Context(const UA_SecurityPolicy * securityPolicy,
         (Policy_Context_Basic256Sha256 *)securityPolicy->policyContext;
     *channelContext = context;
 
-    UA_LOG_INFO(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY, 
+    UA_LOG_INFO(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
                 "The basic256sha256 security policy channel with openssl is created.");
 
     return UA_STATUSCODE_GOOD;
@@ -143,30 +143,30 @@ UA_ChannelModule_New_Context(const UA_SecurityPolicy * securityPolicy,
 
 /* delete the channel context */
 
-static void 
+static void
 UA_ChannelModule_Delete_Context(void * channelContext) {
     if(!channelContext)
         return;
-    
+
     Channel_Context_Basic256Sha256 * cc = (Channel_Context_Basic256Sha256 *)channelContext;
-    X509_free(cc->remoteCertificateX509);                                           
-    UA_ByteString_clear(&cc->remoteCertificate); 
+    X509_free(cc->remoteCertificateX509);
+    UA_ByteString_clear(&cc->remoteCertificate);
     UA_ByteString_clear(&cc->localSymSigningKey);
     UA_ByteString_clear(&cc->localSymEncryptingKey);
     UA_ByteString_clear(&cc->localSymIv);
     UA_ByteString_clear(&cc->remoteSymSigningKey);
     UA_ByteString_clear(&cc->remoteSymEncryptingKey);
     UA_ByteString_clear(&cc->remoteSymIv);
-    
-    UA_LOG_INFO(cc->policyContext->logger, UA_LOGCATEGORY_SECURITYPOLICY, 
-                "The basic256sha256 security policy channel with openssl is deleted.");   
+
+    UA_LOG_INFO(cc->policyContext->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                "The basic256sha256 security policy channel with openssl is deleted.");
     UA_free(cc);
 }
 
 /* Verifies the signature of the message using the provided keys in the context.
  * AsymmetricSignatureAlgorithm_RSA-PKCS15-SHA2-256 */
-static UA_StatusCode 
-UA_AsySig_Basic256Sha256_Verify(void *channelContext, 
+static UA_StatusCode
+UA_AsySig_Basic256Sha256_Verify(void *channelContext,
                                 const UA_ByteString *message,
                                 const UA_ByteString *signature) {
     if(message == NULL || signature == NULL || channelContext == NULL)
@@ -178,8 +178,8 @@ UA_AsySig_Basic256Sha256_Verify(void *channelContext,
                                                   signature);
 }
 
-/* Compares the supplied certificate with the certificate 
- * in the endpoint context 
+/* Compares the supplied certificate with the certificate
+ * in the endpoint context
  */
 
 static UA_StatusCode
@@ -196,14 +196,14 @@ UA_compareCertificateThumbprint(const UA_SecurityPolicy * securityPolicy,
 
 /* Generates a thumbprint for the specified certificate */
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_makeCertificateThumbprint(const UA_SecurityPolicy * securityPolicy,
                              const UA_ByteString * certificate,
                              UA_ByteString * thumbprint) {
-    return UA_Openssl_X509_GetCertificateThumbprint(certificate, thumbprint, false); 
+    return UA_Openssl_X509_GetCertificateThumbprint(certificate, thumbprint, false);
 }
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_Asym_Basic256Sha256_Decrypt(void * channelContext, UA_ByteString * data) {
     if(channelContext == NULL || data == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -222,10 +222,10 @@ UA_Asym_Basic256Sha256_getRemoteSignatureSize(const void *channelContext) {
         (const Channel_Context_Basic256Sha256 *) channelContext;
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Public_GetKeyLength(cc->remoteCertificateX509, &keyLen);
-    return (size_t) keyLen; 
+    return (size_t) keyLen;
 }
 
-static size_t 
+static size_t
 UA_AsySig_Basic256Sha256_getLocalSignatureSize(const void *channelContext) {
     if(channelContext == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -235,7 +235,7 @@ UA_AsySig_Basic256Sha256_getLocalSignatureSize(const void *channelContext) {
     Policy_Context_Basic256Sha256 * pc = cc->policyContext;
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Private_GetKeyLength(pc->localPrivateKey, &keyLen);
-    return (size_t) keyLen; 
+    return (size_t) keyLen;
 }
 
 static size_t
@@ -250,7 +250,7 @@ UA_AsymEn_Basic256Sha256_getRemotePlainTextBlockSize(const void *channelContext)
     return (size_t) keyLen - UA_SECURITYPOLICY_BASIC256SHA256_RSAPADDING_LEN;
 }
 
-static size_t 
+static size_t
 UA_AsymEn_Basic256Sha256_getRemoteBlockSize(const void *channelContext) {
     if(channelContext == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -280,19 +280,19 @@ UA_Sym_Basic256Sha256_generateNonce(void *policyContext,
     UA_Int32 rc = RAND_bytes(out->data, (int) out->length);
     if(rc != 1)
         return UA_STATUSCODE_BADUNEXPECTEDERROR;
-    return UA_STATUSCODE_GOOD;                                         
+    return UA_STATUSCODE_GOOD;
 }
 
-static size_t 
+static size_t
 UA_SymEn_Basic256Sha256_getLocalKeyLength(const void *channelContext) {
     /* 32 bytes 256 bits */
-    return UA_SECURITYPOLICY_BASIC256SHA256_SYM_ENCRYPTION_KEY_LENGTH; 
+    return UA_SECURITYPOLICY_BASIC256SHA256_SYM_ENCRYPTION_KEY_LENGTH;
 }
 
-static size_t 
+static size_t
 UA_SymSig_Basic256Sha256_getLocalKeyLength(const void *channelContext) {
-    /* 32 bytes 256 bits */                                                
-    return UA_SECURITYPOLICY_BASIC256SHA256_SYM_SIGNING_KEY_LENGTH; 
+    /* 32 bytes 256 bits */
+    return UA_SECURITYPOLICY_BASIC256SHA256_SYM_SIGNING_KEY_LENGTH;
 }
 
 static UA_StatusCode
@@ -336,7 +336,7 @@ UA_ChannelM_Basic256Sha256_setLocalSymIv(void * channelContext,
 static size_t
 UA_SymEn_Basic256Sha256_getRemoteKeyLength(const void * channelContext) {
     /* 32 bytes 256 bits */
-    return UA_SECURITYPOLICY_BASIC256SHA256_SYM_ENCRYPTION_KEY_LENGTH; 
+    return UA_SECURITYPOLICY_BASIC256SHA256_SYM_ENCRYPTION_KEY_LENGTH;
 }
 
 static size_t
@@ -346,7 +346,7 @@ UA_SymEn_Basic256Sha256_getBlockSize(const void *channelContext) {
 
 static size_t
 UA_SymSig_Basic256Sha256_getRemoteKeyLength(const void * channelContext) {
-    /* 32 bytes 256 bits */                                                
+    /* 32 bytes 256 bits */
     return UA_SECURITYPOLICY_BASIC256SHA256_SYM_SIGNING_KEY_LENGTH;
 }
 
@@ -384,7 +384,7 @@ static UA_StatusCode
 UA_AsySig_Basic256Sha256_sign(void *channelContext, const UA_ByteString * message,
                               UA_ByteString *signature) {
     if(channelContext == NULL || message == NULL || signature == NULL)
-        return UA_STATUSCODE_BADINTERNALERROR; 
+        return UA_STATUSCODE_BADINTERNALERROR;
     Channel_Context_Basic256Sha256 *cc = (Channel_Context_Basic256Sha256 *) channelContext;
     Policy_Context_Basic256Sha256 *pc = cc->policyContext;
     return UA_Openssl_RSA_PKCS1_V15_SHA256_Sign(message, pc->localPrivateKey, signature);
@@ -393,9 +393,9 @@ UA_AsySig_Basic256Sha256_sign(void *channelContext, const UA_ByteString * messag
 static UA_StatusCode
 UA_AsymEn_Basic256Sha256_encrypt(void *channelContext, UA_ByteString *data) {
     if(channelContext == NULL || data == NULL)
-        return UA_STATUSCODE_BADINTERNALERROR; 
+        return UA_STATUSCODE_BADINTERNALERROR;
     Channel_Context_Basic256Sha256 * cc =
-        (Channel_Context_Basic256Sha256 *) channelContext;    
+        (Channel_Context_Basic256Sha256 *) channelContext;
     return UA_Openssl_RSA_OAEP_Encrypt(data, UA_SECURITYPOLICY_BASIC256SHA256_RSAPADDING_LEN,
                                        cc->remoteCertificateX509);
 }
@@ -410,17 +410,17 @@ UA_SymSig_Basic256Sha256_verify(void *channelContext, const UA_ByteString *messa
                                 const UA_ByteString *signature) {
     if(channelContext == NULL || message == NULL || signature == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
-    
+
     Channel_Context_Basic256Sha256 * cc = (Channel_Context_Basic256Sha256 *) channelContext;
-    return UA_OpenSSL_HMAC_SHA256_Verify(message, &cc->remoteSymSigningKey, signature);   
+    return UA_OpenSSL_HMAC_SHA256_Verify(message, &cc->remoteSymSigningKey, signature);
 }
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_SymSig_Basic256Sha256_sign(void *channelContext, const UA_ByteString *message,
                               UA_ByteString *signature) {
     if(channelContext == NULL || message == NULL || signature == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
-    
+
     Channel_Context_Basic256Sha256 * cc = (Channel_Context_Basic256Sha256 *) channelContext;
     return UA_OpenSSL_HMAC_SHA256_Sign(message, &cc->localSymSigningKey, signature);
 }
@@ -443,7 +443,7 @@ static UA_StatusCode
 UA_SymEn_Basic256Sha256_encrypt(void *channelContext, UA_ByteString *data) {
     if(channelContext == NULL || data == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
-    
+
     Channel_Context_Basic256Sha256 * cc = (Channel_Context_Basic256Sha256 *) channelContext;
     return UA_OpenSSL_AES_256_CBC_Encrypt(&cc->localSymIv, &cc->localSymEncryptingKey, data);
 }
@@ -453,13 +453,13 @@ UA_ChannelM_Basic256Sha256_compareCertificate(const void *channelContext,
                                               const UA_ByteString *certificate) {
     if(channelContext == NULL || certificate == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
-    
+
     const Channel_Context_Basic256Sha256 * cc =
         (const Channel_Context_Basic256Sha256 *) channelContext;
     return UA_OpenSSL_X509_compare(certificate, cc->remoteCertificateX509);
 }
 
-static size_t 
+static size_t
 UA_AsymEn_Basic256Sha256_getLocalKeyLength(const void *channelContext) {
     if(channelContext == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -469,7 +469,7 @@ UA_AsymEn_Basic256Sha256_getLocalKeyLength(const void *channelContext) {
     Policy_Context_Basic256Sha256 *pc = cc->policyContext;
     UA_Int32 keyLen = 0;
     UA_Openssl_RSA_Private_GetKeyLength(pc->localPrivateKey, &keyLen);
-    return (size_t) keyLen * 8; 
+    return (size_t) keyLen * 8;
 }
 
 /* the main entry of Basic256Sha256 */
@@ -477,12 +477,12 @@ UA_AsymEn_Basic256Sha256_getLocalKeyLength(const void *channelContext) {
 UA_StatusCode
 UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
                                  const UA_ByteString localCertificate,
-                                 const UA_ByteString localPrivateKey, 
+                                 const UA_ByteString localPrivateKey,
                                  const UA_Logger *logger) {
     UA_SecurityPolicyAsymmetricModule *asymmetricModule = &policy->asymmetricModule;
     UA_SecurityPolicySymmetricModule *symmetricModule = &policy->symmetricModule;
-    UA_SecurityPolicyChannelModule *channelModule = &policy->channelModule; 
-    UA_LOG_INFO(logger, UA_LOGCATEGORY_SECURITYPOLICY, 
+    UA_SecurityPolicyChannelModule *channelModule = &policy->channelModule;
+    UA_LOG_INFO(logger, UA_LOGCATEGORY_SECURITYPOLICY,
                 "The basic256sha256 security policy with openssl is added.");
 
     UA_Openssl_Init();
@@ -530,7 +530,7 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
     asymEncryAlg->getLocalKeyLength = UA_AsymEn_Basic256Sha256_getLocalKeyLength;
     asymEncryAlg->getRemoteKeyLength = UA_AsymEn_Basic256Sha256_getRemoteKeyLength;
     asymEncryAlg->getRemoteBlockSize = UA_AsymEn_Basic256Sha256_getRemoteBlockSize;
-    asymEncryAlg->getRemotePlainTextBlockSize = 
+    asymEncryAlg->getRemotePlainTextBlockSize =
             UA_AsymEn_Basic256Sha256_getRemotePlainTextBlockSize;
 
     /* AsymmetricModule */
@@ -546,7 +546,7 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
     UA_SecurityPolicyEncryptionAlgorithm *symEncryptionAlgorithm =
         &symmetricModule->cryptoModule.encryptionAlgorithm;
     symEncryptionAlgorithm->uri =
-        UA_STRING("http://www.w3.org/2001/04/xmlenc#aes256-cbc\0");        
+        UA_STRING("http://www.w3.org/2001/04/xmlenc#aes256-cbc\0");
     symEncryptionAlgorithm->encrypt = UA_SymEn_Basic256Sha256_encrypt;
     symEncryptionAlgorithm->decrypt = UA_SymEn_Basic256Sha256_decrypt;
     symEncryptionAlgorithm->getLocalKeyLength = UA_SymEn_Basic256Sha256_getLocalKeyLength;
@@ -563,7 +563,7 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
     symSignatureAlgorithm->sign = UA_SymSig_Basic256Sha256_sign;
     symSignatureAlgorithm->getLocalSignatureSize =
         UA_SymSig_Basic256Sha256_getLocalSignatureSize;
-    symSignatureAlgorithm->getRemoteSignatureSize = 
+    symSignatureAlgorithm->getRemoteSignatureSize =
         UA_SymSig_Basic256Sha256_getRemoteSignatureSize;
     symSignatureAlgorithm->getLocalKeyLength =
         UA_SymSig_Basic256Sha256_getLocalKeyLength;
diff --git a/plugins/crypto/openssl/ua_openssl_create_certificate.c b/plugins/crypto/openssl/ua_openssl_create_certificate.c
index 815d57038c9..8664e38db2b 100644
--- a/plugins/crypto/openssl/ua_openssl_create_certificate.c
+++ b/plugins/crypto/openssl/ua_openssl_create_certificate.c
@@ -195,7 +195,7 @@ UA_CreateCertificate(const UA_Logger *logger,
     for(UA_UInt32 iSubject = 0; iSubject < subjectSize; ++iSubject) {
         UA_Int32 sep = UA_String_chr(&subject[iSubject], '=');
         char field[16];
-        if(sep == -1 || sep == 0 || 
+        if(sep == -1 || sep == 0 ||
             ((size_t) sep == (subject[iSubject].length - 1)) || sep >= 15) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                          "Create Certificate: Subject must contain one '=' with "
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 17f17c618c6..d77670ae6a4 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -60,40 +60,40 @@ UA_Bstrstr(const unsigned char *s1, size_t l1, const unsigned char *s2, size_t l
 }
 
 typedef struct {
-    /* 
+    /*
      * If the folders are defined, we use them to reload the certificates during
-     * runtime 
+     * runtime
      */
 
-    UA_String             trustListFolder;  
+    UA_String             trustListFolder;
     UA_String             issuerListFolder;
-    UA_String             revocationListFolder; 
+    UA_String             revocationListFolder;
 
     STACK_OF(X509) *      skIssue;
     STACK_OF(X509) *      skTrusted;
     STACK_OF(X509_CRL) *  skCrls; /* Revocation list*/
 } CertContext;
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_CertContext_sk_Init (CertContext * context) {
     context->skTrusted = sk_X509_new_null();
     context->skIssue = sk_X509_new_null();
-    context->skCrls = sk_X509_CRL_new_null();    
+    context->skCrls = sk_X509_CRL_new_null();
     if (context->skTrusted == NULL || context->skIssue == NULL ||
         context->skCrls == NULL) {
-        return UA_STATUSCODE_BADOUTOFMEMORY;    
+        return UA_STATUSCODE_BADOUTOFMEMORY;
     }
     return UA_STATUSCODE_GOOD;
 }
 
-static void 
+static void
 UA_CertContext_sk_free (CertContext * context) {
     sk_X509_pop_free (context->skTrusted, X509_free);
     sk_X509_pop_free (context->skIssue, X509_free);
     sk_X509_CRL_pop_free (context->skCrls, X509_CRL_free);
 }
 
-static UA_StatusCode 
+static UA_StatusCode
 UA_CertContext_Init (CertContext * context) {
     (void) memset (context, 0, sizeof (CertContext));
     UA_ByteString_init (&context->trustListFolder);
@@ -107,7 +107,7 @@ UA_CertificateVerification_clear (UA_CertificateVerification * cv) {
     if (cv == NULL) {
         return ;
     }
-    CertContext * context = (CertContext *) cv->context;    
+    CertContext * context = (CertContext *) cv->context;
     if (context == NULL) {
         return;
     }
@@ -127,7 +127,7 @@ static UA_StatusCode
 UA_skTrusted_Cert2X509 (const UA_ByteString *   certificateTrustList,
                         size_t                  certificateTrustListSize,
                         CertContext *           ctx) {
-    size_t                i;        
+    size_t                i;
 
     for (i = 0; i < certificateTrustListSize; i++) {
         X509 * x509 = UA_OpenSSL_LoadCertificate(&certificateTrustList[i]);
@@ -138,7 +138,7 @@ UA_skTrusted_Cert2X509 (const UA_ByteString *   certificateTrustList,
         sk_X509_push (ctx->skTrusted, x509);
     }
 
-    return UA_STATUSCODE_GOOD;                            
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
@@ -156,14 +156,14 @@ UA_skIssuer_Cert2X509 (const UA_ByteString *   certificateIssuerList,
         sk_X509_push (ctx->skIssue, x509);
     }
 
-    return UA_STATUSCODE_GOOD;                            
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
 UA_skCrls_Cert2X509 (const UA_ByteString *   certificateRevocationList,
                      size_t                  certificateRevocationListSize,
                      CertContext *           ctx) {
-    size_t                i;        
+    size_t                i;
     const unsigned char * pData;
 
     for (i = 0; i < certificateRevocationListSize; i++) {
@@ -186,10 +186,10 @@ UA_skCrls_Cert2X509 (const UA_ByteString *   certificateRevocationList,
         sk_X509_CRL_push (ctx->skCrls, crl);
     }
 
-    return UA_STATUSCODE_GOOD;                            
+    return UA_STATUSCODE_GOOD;
 }
 
-#ifdef __linux__ 
+#ifdef __linux__
 #include <dirent.h>
 
 static int UA_Certificate_Filter_der_pem (const struct dirent * entry) {
@@ -198,7 +198,7 @@ static int UA_Certificate_Filter_der_pem (const struct dirent * entry) {
 
     /* check file extension */
     const char *pszFind = strrchr(entry->d_name, '.');
-    if (pszFind == 0) 
+    if (pszFind == 0)
         return 0;
     pszFind++;
     if (strcmp (pszFind, "der") == 0 || strcmp (pszFind, "pem") == 0)
@@ -214,7 +214,7 @@ static int UA_Certificate_Filter_crl (const struct dirent * entry) {
 
     /* check file extension */
     const char *pszFind = strrchr(entry->d_name, '.');
-    if (pszFind == 0) 
+    if (pszFind == 0)
         return 0;
     pszFind++;
     if (strcmp (pszFind, "crl") == 0)
@@ -243,12 +243,12 @@ UA_BuildFullPath (const char * path,
 static UA_StatusCode
 UA_loadCertFromFile (const char *     fileName,
                      UA_ByteString *  cert) {
- 
-    FILE * fp = fopen(fileName, "rb"); 
+
+    FILE * fp = fopen(fileName, "rb");
 
     if (fp == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
-    
+
     fseek(fp, 0, SEEK_END);
     cert->length = (size_t)  ftell(fp);
     if (UA_ByteString_allocBuffer (cert, cert->length) != UA_STATUSCODE_GOOD) {
@@ -275,13 +275,13 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     int              i;
     int              numCertificates;
     char             certFile[PATH_MAX];
-    UA_ByteString    strCert; 
+    UA_ByteString    strCert;
     char             folderPath[PATH_MAX];
 
     UA_ByteString_init (&strCert);
 
     if (ctx->trustListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the trust-list"); 
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
 
         sk_X509_pop_free (ctx->skTrusted, X509_free);
         ctx->skTrusted = sk_X509_new_null();
@@ -289,21 +289,21 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             return UA_STATUSCODE_BADOUTOFMEMORY;
         }
 
-        (void) memcpy (folderPath, ctx->trustListFolder.data, 
+        (void) memcpy (folderPath, ctx->trustListFolder.data,
                        ctx->trustListFolder.length);
         folderPath[ctx->trustListFolder.length] = 0;
-        numCertificates = scandir(folderPath, &dirlist, 
+        numCertificates = scandir(folderPath, &dirlist,
                                   UA_Certificate_Filter_der_pem,
                                   alphasort);
         for (i = 0; i < numCertificates; i++) {
-            if (UA_BuildFullPath (folderPath, dirlist[i]->d_name, 
+            if (UA_BuildFullPath (folderPath, dirlist[i]->d_name,
                                   PATH_MAX, certFile) != UA_STATUSCODE_GOOD) {
-                continue; 
+                continue;
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
                 UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                            "Failed to load the certificate file %s", certFile); 
+                            "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skTrusted_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
@@ -317,7 +317,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->issuerListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");    
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
 
         sk_X509_pop_free (ctx->skIssue, X509_free);
         ctx->skIssue = sk_X509_new_null();
@@ -327,23 +327,23 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
 
         memcpy (folderPath, ctx->issuerListFolder.data, ctx->issuerListFolder.length);
         folderPath[ctx->issuerListFolder.length] = 0;
-        numCertificates = scandir(folderPath, &dirlist, 
+        numCertificates = scandir(folderPath, &dirlist,
                                   UA_Certificate_Filter_der_pem,
                                   alphasort);
         for (i = 0; i < numCertificates; i++) {
-            if (UA_BuildFullPath (folderPath, dirlist[i]->d_name, 
+            if (UA_BuildFullPath (folderPath, dirlist[i]->d_name,
                                   PATH_MAX, certFile) != UA_STATUSCODE_GOOD) {
-                continue; 
+                continue;
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
                 UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                            "Failed to load the certificate file %s", certFile); 
+                            "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skIssuer_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
                 UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                            "Failed to decode the certificate file %s", certFile);                 
+                            "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
             }
@@ -352,33 +352,33 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->revocationListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");   
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
 
         sk_X509_CRL_pop_free (ctx->skCrls, X509_CRL_free);
-        ctx->skCrls = sk_X509_CRL_new_null();    
+        ctx->skCrls = sk_X509_CRL_new_null();
         if (ctx->skCrls == NULL) {
             return UA_STATUSCODE_BADOUTOFMEMORY;
         }
 
         memcpy (folderPath, ctx->revocationListFolder.data, ctx->revocationListFolder.length);
         folderPath[ctx->revocationListFolder.length] = 0;
-        numCertificates = scandir(folderPath, &dirlist, 
-                                  UA_Certificate_Filter_crl, 
+        numCertificates = scandir(folderPath, &dirlist,
+                                  UA_Certificate_Filter_crl,
                                   alphasort);
         for (i = 0; i < numCertificates; i++) {
-            if (UA_BuildFullPath (folderPath, dirlist[i]->d_name, 
+            if (UA_BuildFullPath (folderPath, dirlist[i]->d_name,
                                   PATH_MAX, certFile) != UA_STATUSCODE_GOOD) {
-                continue; 
+                continue;
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
                 UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                            "Failed to load the revocation file %s", certFile);                 
+                            "Failed to load the revocation file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skCrls_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
                 UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                            "Failed to decode the revocation file %s", certFile);                                 
+                            "Failed to decode the revocation file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
             }
@@ -395,7 +395,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
 static UA_StatusCode
 UA_X509_Store_CTX_Error_To_UAError (int opensslErr) {
     UA_StatusCode ret;
-    
+
     switch (opensslErr) {
         case X509_V_ERR_CERT_HAS_EXPIRED:
         case X509_V_ERR_CERT_NOT_YET_VALID:
@@ -443,15 +443,15 @@ UA_CertificateVerification_Verify (void *                verificationContext,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     ctx = (CertContext *) verificationContext;
-  
+
     store = X509_STORE_new();
     storeCtx = X509_STORE_CTX_new();
-    
+
     if (store == NULL || storeCtx == NULL) {
         ret = UA_STATUSCODE_BADOUTOFMEMORY;
         goto cleanup;
     }
-#ifdef __linux__ 
+#ifdef __linux__
     ret = UA_ReloadCertFromFolder (ctx);
     if (ret != UA_STATUSCODE_GOOD) {
         goto cleanup;
@@ -462,10 +462,10 @@ UA_CertificateVerification_Verify (void *                verificationContext,
     if (certificateX509 == NULL) {
         ret = UA_STATUSCODE_BADCERTIFICATEINVALID;
         goto cleanup;
-    } 
+    }
 
     X509_STORE_set_flags(store, 0);
-    opensslRet = X509_STORE_CTX_init (storeCtx, store, certificateX509, 
+    opensslRet = X509_STORE_CTX_init (storeCtx, store, certificateX509,
                                       ctx->skIssue);
     if (opensslRet != 1) {
         ret = UA_STATUSCODE_BADINTERNALERROR;
@@ -612,7 +612,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
-    pNames = (GENERAL_NAMES *) X509_get_ext_d2i(certificateX509, NID_subject_alt_name, 
+    pNames = (GENERAL_NAMES *) X509_get_ext_d2i(certificateX509, NID_subject_alt_name,
                                                 NULL, NULL);
     if (pNames == NULL) {
         X509_free (certificateX509);
@@ -681,7 +681,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
         cv->verifyCertificate = UA_CertificateVerification_Verify;
     else
         cv->verifyCertificate = UA_VerifyCertificateAllowAll;
-    
+
     if (certificateTrustListSize > 0) {
         if (UA_skTrusted_Cert2X509 (certificateTrustList, certificateTrustListSize,
                                     context) != UA_STATUSCODE_GOOD) {
@@ -693,7 +693,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
     if (certificateIssuerListSize > 0) {
         if (UA_skIssuer_Cert2X509 (certificateIssuerList, certificateIssuerListSize,
                                   context) != UA_STATUSCODE_GOOD) {
-            ret = UA_STATUSCODE_BADINTERNALERROR;                                       
+            ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;
         }
     }
@@ -701,9 +701,9 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
     if (certificateRevocationListSize > 0) {
         if (UA_skCrls_Cert2X509 (certificateRevocationList, certificateRevocationListSize,
                                   context) != UA_STATUSCODE_GOOD) {
-            ret = UA_STATUSCODE_BADINTERNALERROR; 
+            ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;
-        }        
+        }
     }
 
     return UA_STATUSCODE_GOOD;
@@ -722,7 +722,7 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
     UA_StatusCode ret;
     if (cv == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
-    }   
+    }
 
     CertContext * context = (CertContext *) UA_malloc (sizeof (CertContext));
     if (context == NULL) {
diff --git a/plugins/include/open62541/plugin/pubsub_mqtt.h b/plugins/include/open62541/plugin/pubsub_mqtt.h
index bac7abb671b..695c44e8ad7 100644
--- a/plugins/include/open62541/plugin/pubsub_mqtt.h
+++ b/plugins/include/open62541/plugin/pubsub_mqtt.h
@@ -1,6 +1,6 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- * 
+ *
  *    Copyright 2018 (c) Fraunhofer IOSB (Author: Lukas Meling)
  *    Copyright (c) 2020 basysKom GmbH
  */
diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index 84b5148e0d4..58e0d3ed43a 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -90,7 +90,7 @@ UA_ServerConfig_setDefault(UA_ServerConfig *config) {
  * It initializes reasonable defaults for many things, but does not
  * add any network layer, security policies and endpoints.
  * Use the various UA_ServerConfig_addXxx functions to add them.
- * 
+ *
  * @param conf The configuration to manipulate
  */
 UA_EXPORT UA_StatusCode
@@ -121,14 +121,14 @@ UA_ServerConfig_addNetworkLayerWS(UA_ServerConfig *conf, UA_UInt16 portNumber,
  * @param certificate The optional server certificate.
  */
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config,
                                       const UA_ByteString *certificate);
 
 #ifdef UA_ENABLE_ENCRYPTION
 
 /* Adds the security policy ``SecurityPolicy#Basic128Rsa15`` to the server. A
  * server certificate may be supplied but is optional.
- * 
+ *
  * Certificate verification should be configured before calling this
  * function. See PKI plugin.
  *
@@ -137,7 +137,7 @@ UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config,
  * @param privateKey The private key that corresponds to the certificate.
  */
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyBasic128Rsa15(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyBasic128Rsa15(UA_ServerConfig *config,
                                                const UA_ByteString *certificate,
                                                const UA_ByteString *privateKey);
 
@@ -146,13 +146,13 @@ UA_ServerConfig_addSecurityPolicyBasic128Rsa15(UA_ServerConfig *config,
  *
  * Certificate verification should be configured before calling this
  * function. See PKI plugin.
- * 
+ *
  * @param config The configuration to manipulate
  * @param certificate The server certificate.
  * @param privateKey The private key that corresponds to the certificate.
  */
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyBasic256(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyBasic256(UA_ServerConfig *config,
                                           const UA_ByteString *certificate,
                                           const UA_ByteString *privateKey);
 
@@ -167,7 +167,7 @@ UA_ServerConfig_addSecurityPolicyBasic256(UA_ServerConfig *config,
  * @param privateKey The private key that corresponds to the certificate.
  */
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyBasic256Sha256(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyBasic256Sha256(UA_ServerConfig *config,
                                                 const UA_ByteString *certificate,
                                                 const UA_ByteString *privateKey);
 
@@ -191,7 +191,7 @@ UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(UA_ServerConfig *config,
  *
  * Certificate verification should be configured before calling this
  * function. See PKI plugin.
- * 
+ *
  * @param config The configuration to manipulate
  * @param certificate The server certificate.
  * @param privateKey The private key that corresponds to the certificate.
@@ -215,7 +215,7 @@ UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
  * @param securityMode The security mode for which to add the endpoint.
  */
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addEndpoint(UA_ServerConfig *config, const UA_String securityPolicyUri, 
+UA_ServerConfig_addEndpoint(UA_ServerConfig *config, const UA_String securityPolicyUri,
                             UA_MessageSecurityMode securityMode);
 
 /* Adds endpoints for all configured security policies in each mode.
diff --git a/plugins/mqtt/templates/posix_sockets.h b/plugins/mqtt/templates/posix_sockets.h
index 433e80e4d99..a12897850a7 100644
--- a/plugins/mqtt/templates/posix_sockets.h
+++ b/plugins/mqtt/templates/posix_sockets.h
@@ -52,7 +52,7 @@ UA_StatusCode open_nb_socket(int* sockfd, const char* addr, const char* port) {
           continue;
         }
         break;
-    }  
+    }
 
     /* free servinfo */
     freeaddrinfo(servinfo);
@@ -67,12 +67,12 @@ UA_StatusCode open_nb_socket(int* sockfd, const char* addr, const char* port) {
     }
 #endif
 #if defined(__VMS)
-    /* 
+    /*
         OpenVMS only partially implements fcntl. It works on file descriptors
         but silently fails on socket descriptors. So we need to fall back on
         to the older ioctl system to set non-blocking IO
     */
-    int on = 1;                 
+    int on = 1;
     if (*sockfd != -1) ioctl(*sockfd, FIONBIO, &on);
 #endif
 
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.h b/plugins/mqtt/ua_mqtt-c_adapter.h
index 2989dae9247..d7c7214798c 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.h
+++ b/plugins/mqtt/ua_mqtt-c_adapter.h
@@ -27,8 +27,8 @@ typedef struct {
     UA_NetworkAddressUrlDataType address;
     UA_UInt32 mqttRecvBufferSize;
     UA_UInt32 mqttSendBufferSize;
-    uint8_t *mqttSendBuffer; 
-    uint8_t *mqttRecvBuffer; 
+    uint8_t *mqttSendBuffer;
+    uint8_t *mqttRecvBuffer;
     UA_String *mqttClientId;
     UA_Connection *connection;
 #if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
@@ -74,7 +74,7 @@ subscribeMqtt(UA_PubSubChannelDataMQTT*, UA_String topic, UA_Byte qos);
 
 UA_StatusCode
 yieldMqtt(UA_PubSubChannelDataMQTT*, UA_UInt16 timeout);
-    
+
 #ifdef __cplusplus
 } // extern "C"
 #endif
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 846eb770f46..a80a65f6380 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
@@ -281,7 +281,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
 
     if(ac->clear)
         clear_default(ac);
-    
+
     ac->clear = clear_default;
     ac->activateSession = activateSession_default;
     ac->closeSession = closeSession_default;
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index c8b340420e8..27c6f71e505 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -251,7 +251,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
             return retval;
         conf->serverUrlsSize = serverUrlsSize;
     }
-    
+
     /* Endpoints */
     /* conf->endpoints = {0, NULL}; */
 
@@ -365,7 +365,7 @@ UA_ServerConfig_addNetworkLayerWS(UA_ServerConfig *conf, UA_UInt16 portNumber,
 #endif
 
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config,
                                       const UA_ByteString *certificate) {
     /* Allocate the SecurityPolicies */
     UA_SecurityPolicy *tmp = (UA_SecurityPolicy *)
@@ -374,7 +374,7 @@ UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config,
     if(!tmp)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = tmp;
-    
+
     /* Populate the SecurityPolicies */
     UA_ByteString localCertificate = UA_BYTESTRING_NULL;
     if(certificate)
@@ -395,7 +395,7 @@ UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config,
 }
 
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addEndpoint(UA_ServerConfig *config, const UA_String securityPolicyUri, 
+UA_ServerConfig_addEndpoint(UA_ServerConfig *config, const UA_String securityPolicyUri,
                             UA_MessageSecurityMode securityMode) {
     /* Allocate the endpoint */
     UA_EndpointDescription *tmp = (UA_EndpointDescription *)
@@ -520,7 +520,7 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
 #ifdef UA_ENABLE_ENCRYPTION
 
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyBasic128Rsa15(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyBasic128Rsa15(UA_ServerConfig *config,
                                                const UA_ByteString *certificate,
                                                const UA_ByteString *privateKey) {
     /* Allocate the SecurityPolicies */
@@ -530,7 +530,7 @@ UA_ServerConfig_addSecurityPolicyBasic128Rsa15(UA_ServerConfig *config,
     if(!tmp)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = tmp;
-    
+
     /* Populate the SecurityPolicies */
     UA_ByteString localCertificate = UA_BYTESTRING_NULL;
     UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
@@ -554,7 +554,7 @@ UA_ServerConfig_addSecurityPolicyBasic128Rsa15(UA_ServerConfig *config,
 }
 
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyBasic256(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyBasic256(UA_ServerConfig *config,
                                           const UA_ByteString *certificate,
                                           const UA_ByteString *privateKey) {
     /* Allocate the SecurityPolicies */
@@ -564,7 +564,7 @@ UA_ServerConfig_addSecurityPolicyBasic256(UA_ServerConfig *config,
     if(!tmp)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = tmp;
-    
+
     /* Populate the SecurityPolicies */
     UA_ByteString localCertificate = UA_BYTESTRING_NULL;
     UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
@@ -588,7 +588,7 @@ UA_ServerConfig_addSecurityPolicyBasic256(UA_ServerConfig *config,
 }
 
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyBasic256Sha256(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyBasic256Sha256(UA_ServerConfig *config,
                                                 const UA_ByteString *certificate,
                                                 const UA_ByteString *privateKey) {
     /* Allocate the SecurityPolicies */
@@ -598,7 +598,7 @@ UA_ServerConfig_addSecurityPolicyBasic256Sha256(UA_ServerConfig *config,
     if(!tmp)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = tmp;
-    
+
     /* Populate the SecurityPolicies */
     UA_ByteString localCertificate = UA_BYTESTRING_NULL;
     UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
@@ -622,7 +622,7 @@ UA_ServerConfig_addSecurityPolicyBasic256Sha256(UA_ServerConfig *config,
 }
 
 UA_EXPORT UA_StatusCode
-UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(UA_ServerConfig *config, 
+UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(UA_ServerConfig *config,
                                                 const UA_ByteString *certificate,
                                                 const UA_ByteString *privateKey) {
     /* Allocate the SecurityPolicies */
@@ -632,7 +632,7 @@ UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(UA_ServerConfig *config,
     if(!tmp)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = tmp;
-    
+
     /* Populate the SecurityPolicies */
     UA_ByteString localCertificate = UA_BYTESTRING_NULL;
     UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
@@ -877,7 +877,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     if(!sp)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = sp;
-                  
+
     retval = UA_SecurityPolicy_Basic128Rsa15(&config->securityPolicies[config->securityPoliciesSize],
                                              localCertificate, privateKey, &config->logger);
     if(retval == UA_STATUSCODE_GOOD) {
diff --git a/plugins/ua_debug_dump_pkgs.c b/plugins/ua_debug_dump_pkgs.c
index ee42deaf031..899b655c170 100644
--- a/plugins/ua_debug_dump_pkgs.c
+++ b/plugins/ua_debug_dump_pkgs.c
@@ -1,6 +1,6 @@
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  */
diff --git a/plugins/ua_nodestore_hashmap.c b/plugins/ua_nodestore_hashmap.c
index 459beb9f12b..273011b80ed 100644
--- a/plugins/ua_nodestore_hashmap.c
+++ b/plugins/ua_nodestore_hashmap.c
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2014-2019 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Julian Grothoff
diff --git a/plugins/ua_nodestore_ziptree.c b/plugins/ua_nodestore_ziptree.c
index 88fb811574e..a86df950b39 100644
--- a/plugins/ua_nodestore_ziptree.c
+++ b/plugins/ua_nodestore_ziptree.c
@@ -1,5 +1,5 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
  *
  *    Copyright 2014-2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Julian Grothoff
@@ -400,6 +400,6 @@ UA_Nodestore_ZipTree(UA_Nodestore *ns) {
     ns->removeNode = zipNsRemoveNode;
     ns->getReferenceTypeId = zipNsGetReferenceTypeId;
     ns->iterate = zipNsIterate;
-    
+
     return UA_STATUSCODE_GOOD;
 }
diff --git a/plugins/ua_pubsub_ethernet.c b/plugins/ua_pubsub_ethernet.c
index b0f04b74617..96ce8e929ab 100644
--- a/plugins/ua_pubsub_ethernet.c
+++ b/plugins/ua_pubsub_ethernet.c
@@ -830,7 +830,7 @@ UA_PubSubChannelEthernet_open(const UA_PubSubConnectionConfig *connectionConfig)
             UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "setsockopt SO_PRIORITY failed (%s)", errno_str));
             UA_close(sockFd);
-            
+
             UA_free(sockOptions.socketPriority);
             UA_free(channelDataEthernet);
             UA_free(newChannel);
@@ -945,7 +945,7 @@ UA_PubSubChannelEthernet_unregist(UA_PubSubChannel *channel,
     mreq.mr_alen = ETH_ALEN;
     memcpy(mreq.mr_address, channelDataEthernet->targetAddress, ETH_ALEN);
 
-    if(UA_setsockopt(channel->sockfd, SOL_PACKET, PACKET_DROP_MEMBERSHIP, (char*) &mreq, sizeof(mreq)) < 0) { 
+    if(UA_setsockopt(channel->sockfd, SOL_PACKET, PACKET_DROP_MEMBERSHIP, (char*) &mreq, sizeof(mreq)) < 0) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection regist failed.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
diff --git a/plugins/ua_pubsub_mqtt.c b/plugins/ua_pubsub_mqtt.c
index 58b49eb5786..db928cf0f33 100644
--- a/plugins/ua_pubsub_mqtt.c
+++ b/plugins/ua_pubsub_mqtt.c
@@ -8,8 +8,8 @@
 
 /**
  * This uses the mqtt/ua_mqtt_adapter.h to call mqtt functions.
- * Currently only ua_mqtt_adapter.c implements this 
- * interface and maps them to the specific "MQTT-C" library functions. 
+ * Currently only ua_mqtt_adapter.c implements this
+ * interface and maps them to the specific "MQTT-C" library functions.
  * Another mqtt lib could be used.
  * "mqtt_pal.c" forwards the network calls (send/recv) to UA_Connection (TCP).
  */
@@ -41,7 +41,7 @@ UA_uaQos_toMqttQos(UA_BrokerTransportQualityOfService uaQos, UA_Byte *qos){
 
 /**
  * Open mqtt connection based on the connectionConfig.
- * 
+ *
  *
  * @return ref to created channel, NULL on error
  */
@@ -55,7 +55,7 @@ UA_PubSubChannelMQTT_open(const UA_PubSubConnectionConfig *connectionConfig) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT Connection creation failed. Invalid Address.");
         return NULL;
     }
-    
+
     /* allocate and init memory for the Mqtt specific internal data */
     UA_PubSubChannelDataMQTT * channelDataMQTT =
             (UA_PubSubChannelDataMQTT *) UA_calloc(1, (sizeof(UA_PubSubChannelDataMQTT)));
@@ -128,7 +128,7 @@ UA_PubSubChannelMQTT_open(const UA_PubSubConnectionConfig *connectionConfig) {
             UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT Connection creation. Unknown connection parameter.");
         }
     }
-    
+
     /* Create a new channel */
     UA_PubSubChannel *newChannel = (UA_PubSubChannel *) UA_calloc(1, sizeof(UA_PubSubChannel));
     if(!newChannel){
@@ -158,7 +158,7 @@ UA_PubSubChannelMQTT_open(const UA_PubSubConnectionConfig *connectionConfig) {
             return NULL;
         }
     }
-    
+
     /* Allocate memory for mqtt send buffer */
     if(channelDataMQTT->mqttSendBufferSize > 0){
         channelDataMQTT->mqttSendBuffer = (uint8_t*)UA_calloc(channelDataMQTT->mqttSendBufferSize, sizeof(uint8_t));
@@ -177,13 +177,13 @@ UA_PubSubChannelMQTT_open(const UA_PubSubConnectionConfig *connectionConfig) {
             return NULL;
         }
     }
-    
+
     /*link channel and internal channel data*/
     newChannel->handle = channelDataMQTT;
-    
+
     /* MQTT Client connect call. */
     UA_StatusCode ret = connectMqtt(channelDataMQTT);
-    
+
     if(ret != UA_STATUSCODE_GOOD){
         /* try to disconnect tcp */
         disconnectMqtt(channelDataMQTT);
@@ -219,7 +219,7 @@ UA_PubSubChannelMQTT_regist(UA_PubSubChannel *channel, UA_ExtensionObject *trans
 
     UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *) channel->handle;
     channelDataMQTT->callback = callback;
-    
+
     if(transportSettings == NULL ||
        transportSettings->encoding != UA_EXTENSIONOBJECT_DECODED ||
        transportSettings->content.decoded.type != &UA_TYPES[UA_TYPES_BROKERDATASETREADERTRANSPORTDATATYPE]) {
@@ -365,7 +365,7 @@ TransportLayerMQTT_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
         pubSubChannel->send = UA_PubSubChannelMQTT_send;
         pubSubChannel->close = UA_PubSubChannelMQTT_close;
         pubSubChannel->yield = UA_PubSubChannelMQTT_yield;
-        
+
         pubSubChannel->connectionConfig = connectionConfig;
     }
     return pubSubChannel;
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 5db10fd9e02..716ef01972e 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2015-2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2015-2016 (c) Sten Grüner
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 52fb84bf371..e22729790d4 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -128,7 +128,7 @@ encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPo
                        "Could not instantiate the SecurityPolicy for the UserToken");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    
+
     /* Compute the encrypted length (at least one byte padding) */
     size_t plainTextBlockSize = sp->asymmetricModule.cryptoModule.
         encryptionAlgorithm.getRemotePlainTextBlockSize(channelContext);
@@ -657,7 +657,7 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
             const UA_DataType *tokenType = client->config.userIdentityToken.content.decoded.type;
 
             /* Usertokens also have a security policy... */
-            if(tokenPolicy->tokenType != UA_USERTOKENTYPE_ANONYMOUS && 
+            if(tokenPolicy->tokenType != UA_USERTOKENTYPE_ANONYMOUS &&
                tokenPolicy->securityPolicyUri.length > 0 &&
                !getSecurityPolicy(client, tokenPolicy->securityPolicyUri)) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
@@ -809,7 +809,7 @@ responseSessionCallback(UA_Client *client, void *userdata,
             goto cleanup;
     }
 #endif
-    
+
     /* Copy nonce and AuthenticationToken */
     UA_ByteString_clear(&client->remoteNonce);
     UA_NodeId_clear(&client->authenticationToken);
@@ -1003,15 +1003,15 @@ verifyClientApplicationURI(const UA_Client *client) {
 #if defined(UA_ENABLE_ENCRYPTION) && (UA_LOGLEVEL <= 400)
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         UA_SecurityPolicy *sp = &client->config.securityPolicies[i];
-        
-        if(sp->localCertificate.data == NULL) 
+
+        if(sp->localCertificate.data == NULL)
         {
                 UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                 "skip verifying ApplicationURI for the SecurityPolicy %.*s",
                 (int)sp->policyUri.length, sp->policyUri.data);
                 continue;
         }
-        
+
         UA_StatusCode retval =
             client->config.certificateVerification.
             verifyApplicationURI(client->config.certificateVerification.context,
diff --git a/src/client/ua_client_discovery.c b/src/client/ua_client_discovery.c
index 2afc23a1a8a..2d14d4adb28 100644
--- a/src/client/ua_client_discovery.c
+++ b/src/client/ua_client_discovery.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Mark Giraud, Fraunhofer IOSB
diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index f588c4be846..bdb98bf6e56 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2015-2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2015 (c) Oleksiy Vasylyev
@@ -1058,7 +1058,7 @@ UA_Client_readUserWriteMaskAttribute_async(UA_Client *client, const UA_NodeId no
                                      userdata, requestId);
 }
 
-UA_StatusCode 
+UA_StatusCode
 UA_Client_readIsAbstractAttribute_async(UA_Client *client, const UA_NodeId nodeId,
                                         UA_ClientAsyncReadIsAbstractAttributeCallback callback,
                                         void *userdata, UA_UInt32 *requestId) {
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 18b5b534010..22980ac6626 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2015-2016 (c) Sten Grüner
  *    Copyright 2015-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 8f1312fc9bf..1373788ea09 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2015-2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2015 (c) Oleksiy Vasylyev
@@ -189,7 +189,7 @@ UA_Client_Subscriptions_modify(UA_Client *client,
         response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return response;
     }
-    
+
     /* Call the service */
     __UA_Client_Service(client,
                         &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
@@ -355,7 +355,7 @@ UA_Client_Subscriptions_deleteSingle(UA_Client *client, UA_UInt32 subscriptionId
     UA_DeleteSubscriptionsRequest_init(&request);
     request.subscriptionIds = &subscriptionId;
     request.subscriptionIdsSize = 1;
-    
+
     UA_DeleteSubscriptionsResponse response =
         UA_Client_Subscriptions_delete(client, request);
 
@@ -640,7 +640,7 @@ UA_Client_MonitoredItems_createDataChange(UA_Client *client, UA_UInt32 subscript
     request.timestampsToReturn = timestampsToReturn;
     request.itemsToCreate = (UA_MonitoredItemCreateRequest*)(uintptr_t)&item;
     request.itemsToCreateSize = 1;
-    UA_CreateMonitoredItemsResponse response = 
+    UA_CreateMonitoredItemsResponse response =
        UA_Client_MonitoredItems_createDataChanges(client, request, &context,
                                                    &callback, &deleteCallback);
     UA_MonitoredItemCreateResult result;
@@ -651,7 +651,7 @@ UA_Client_MonitoredItems_createDataChange(UA_Client *client, UA_UInt32 subscript
     if(result.statusCode == UA_STATUSCODE_GOOD &&
        response.resultsSize != 1)
         result.statusCode = UA_STATUSCODE_BADINTERNALERROR;
-    
+
     if(result.statusCode == UA_STATUSCODE_GOOD)
        UA_MonitoredItemCreateResult_copy(&response.results[0] , &result);
     UA_CreateMonitoredItemsResponse_clear(&response);
@@ -696,7 +696,7 @@ UA_Client_MonitoredItems_createEvent(UA_Client *client, UA_UInt32 subscriptionId
     request.timestampsToReturn = timestampsToReturn;
     request.itemsToCreate = (UA_MonitoredItemCreateRequest*)(uintptr_t)&item;
     request.itemsToCreateSize = 1;
-    UA_CreateMonitoredItemsResponse response = 
+    UA_CreateMonitoredItemsResponse response =
        UA_Client_MonitoredItems_createEvents(client, request, &context,
                                              &callback, &deleteCallback);
     UA_StatusCode retval = response.responseHeader.serviceResult;
@@ -1145,12 +1145,12 @@ UA_Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishRequ
                            "Not enough memory to store the acknowledgement for a publish "
                            "message on subscription %" PRIu32, sub->subscriptionId);
             break;
-        }   
+        }
         tmpAck->subAck.sequenceNumber = msg->sequenceNumber;
         tmpAck->subAck.subscriptionId = sub->subscriptionId;
         LIST_INSERT_HEAD(&client->pendingNotificationsAcks, tmpAck, listEntry);
         break;
-    } 
+    }
 }
 
 static void
@@ -1233,7 +1233,7 @@ UA_Client_Subscriptions_backgroundPublish(UA_Client *client) {
             UA_PublishRequest_delete(request);
             return;
         }
-    
+
         UA_UInt32 requestId;
         client->currentlyOutStandingPublishRequests++;
 
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 2def24b5091..74034e7f7b4 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -51,7 +51,7 @@ createDataSetReader(UA_Server *server,
 
 static UA_StatusCode
 createPublishedDataSet(UA_Server *server,
-                       const UA_PublishedDataSetDataType *publishedDataSetParameters, 
+                       const UA_PublishedDataSetDataType *publishedDataSetParameters,
                        UA_NodeId *publishedDataSetIdent);
 
 static UA_StatusCode
@@ -116,7 +116,7 @@ updatePubSubConfig(UA_Server *server,
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     for(UA_UInt32 i = 0; i < pdsCount; i++) {
         res = createPublishedDataSet(server,
-                                     &configurationParameters->publishedDataSets[i], 
+                                     &configurationParameters->publishedDataSets[i],
                                      &publishedDataSetIdent[i]);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -210,7 +210,7 @@ createComponentsForConnection(UA_Server *server,
 }
 
 /* Checks if transportLayer for the specified transportProfileUri exists.
- * 
+ *
  * @param server Server object that shall be configured
  * @param transportProfileUri String that specifies the transport protocol */
 static UA_Boolean
@@ -276,13 +276,13 @@ createTransportLayer(UA_Server *server, const UA_String transportProfileUri) {
 }
 
 /* Creates PubSubConnection configuration from PubSubConnectionDataType object
- * 
+ *
  * @param server Server object that shall be configured
  * @param connParams PubSub connection configuration
  * @param pdsCount Number of published DataSets
  * @param pdsIdent Array of NodeIds of the published DataSets */
 static UA_StatusCode
-createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *connParams, 
+createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *connParams,
                        UA_UInt32 pdsCount, UA_NodeId *pdsIdent) {
     UA_PubSubConnectionConfig config;
     memset(&config, 0, sizeof(UA_PubSubConnectionConfig));
@@ -316,7 +316,7 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
 
     if(connParams->transportSettings.encoding == UA_EXTENSIONOBJECT_DECODED) {
         UA_Variant_setScalar(&(config.connectionTransportSettings),
-                             connParams->transportSettings.content.decoded.data, 
+                             connParams->transportSettings.content.decoded.data,
                              connParams->transportSettings.content.decoded.type);
     } else {
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -444,7 +444,7 @@ createWriterGroup(UA_Server *server,
 /* Function called by UA_PubSubManager_createDataSetWriter. It searches for a
  * PublishedDataSet that is referenced by the DataSetWriter. If a related PDS is found,
  * the DSWriter will be added to the server, otherwise, no DSWriter will be added.
- * 
+ *
  * @param server UA_Server object that shall be configured
  * @param writerGroupIdent NodeId of writerGroup, the DataSetWriter belongs to
  * @param dsWriterConfig WriterGroup configuration
@@ -471,10 +471,10 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
 
         if(dsWriterConfig->dataSetName.length == pdsConfig.name.length &&
            0 == strncmp((const char *)dsWriterConfig->dataSetName.data,
-                        (const char *)pdsConfig.name.data, 
+                        (const char *)pdsConfig.name.data,
                         dsWriterConfig->dataSetName.length)) {
             /* DSWriter will only be created, if a matching PDS is found: */
-            res = UA_Server_addDataSetWriter(server, writerGroupIdent, pdsIdent[pds], 
+            res = UA_Server_addDataSetWriter(server, writerGroupIdent, pdsIdent[pds],
                                              dsWriterConfig, &dataSetWriterIdent);
             if(res != UA_STATUSCODE_GOOD) {
                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -508,7 +508,7 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
  * @param pdsIdent Array of NodeIds of the published DataSets */
 static UA_StatusCode
 createDataSetWriter(UA_Server *server,
-                    const UA_DataSetWriterDataType *dataSetWriterParameters, 
+                    const UA_DataSetWriterDataType *dataSetWriterParameters,
                     UA_NodeId writerGroupIdent, UA_UInt32 pdsCount,
                     const UA_NodeId *pdsIdent) {
     UA_DataSetWriterConfig config;
@@ -541,7 +541,7 @@ createDataSetWriter(UA_Server *server,
  * @param connectionIdent NodeId of the PubSub connection, the ReaderGroup belongs to */
 static UA_StatusCode
 createReaderGroup(UA_Server *server,
-                  const UA_ReaderGroupDataType *readerGroupParameters, 
+                  const UA_ReaderGroupDataType *readerGroupParameters,
                   UA_NodeId connectionIdent) {
     UA_ReaderGroupConfig config;
     memset(&config, 0, sizeof(UA_ReaderGroupConfig));
@@ -583,7 +583,7 @@ createReaderGroup(UA_Server *server,
  * @param dsReaderIdent NodeId of the DataSetReader the SubscribedDataSet belongs to
  * @param dataSetReaderParameters Configuration Parameters of the DataSetReader */
 static UA_StatusCode
-addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent, 
+addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
                      const UA_ExtensionObject *subscribedDataSet) {
     if(subscribedDataSet->content.decoded.type ==
        &UA_TYPES[UA_TYPES_TARGETVARIABLESDATATYPE]) {
@@ -635,7 +635,7 @@ addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
  * @param dataSetReaderParameters DataSetReader configuration
  * @param writerGroupIdent NodeId of readerGroupParameters, the DataSetReader belongs to */
 static UA_StatusCode
-createDataSetReader(UA_Server *server, const UA_DataSetReaderDataType *dsrParams, 
+createDataSetReader(UA_Server *server, const UA_DataSetReaderDataType *dsrParams,
                     UA_NodeId readerGroupIdent) {
     UA_DataSetReaderConfig config;
     memset(&config, 0, sizeof(UA_DataSetReaderConfig));
@@ -698,7 +698,7 @@ setPublishedDataSetType(const UA_PublishedDataSetDataType *pdsParams,
  * @param pdsIdent NodeId of the publishedDataSet */
 static UA_StatusCode
 createPublishedDataSet(UA_Server *server,
-                       const UA_PublishedDataSetDataType *pdsParams, 
+                       const UA_PublishedDataSetDataType *pdsParams,
                        UA_NodeId *pdsIdent) {
     UA_PublishedDataSetConfig config;
     memset(&config, 0, sizeof(UA_PublishedDataSetConfig));
@@ -1082,7 +1082,7 @@ generatePubSubConnectionDataType(const UA_PubSubConnection *src,
         dst->transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
         dst->transportSettings.content.decoded.type =
             src->config->connectionTransportSettings.type;
-        res = UA_Array_copy(src->config->connectionTransportSettings.data, 1, 
+        res = UA_Array_copy(src->config->connectionTransportSettings.data, 1,
                             &dst->transportSettings.content.decoded.data,
                             src->config->connectionTransportSettings.type);
 
@@ -1170,7 +1170,7 @@ generatePubSubConfigurationDataType(const UA_Server* server,
                          "retrieving PubSubConnection configuration failed");
             return res;
         }
-        connectionIndex++;                                                         
+        connectionIndex++;
     }
 
     return UA_STATUSCODE_GOOD;
diff --git a/src/pubsub/ua_pubsub_config.h b/src/pubsub/ua_pubsub_config.h
index 7f9ffbd01f7..7a210dc299e 100644
--- a/src/pubsub/ua_pubsub_config.h
+++ b/src/pubsub/ua_pubsub_config.h
@@ -17,13 +17,13 @@
 /* Decodes the information from the ByteString. If the decoded content is a
  * PubSubConfiguration in a UABinaryFileDataType-object. It will overwrite the
  * current PubSub configuration from the server. */
-UA_StatusCode 
-UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server, 
+UA_StatusCode
+UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
                                                 const UA_ByteString buffer);
 
 /* Saves the current PubSub configuration of a server in a byteString. */
 UA_StatusCode
-UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server, 
+UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
                                                UA_ByteString *buffer);
 
 #endif /* UA_PUBSUB_CONFIG_H_ */
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 4854cd234d6..fab0ccfc871 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -485,9 +485,9 @@ UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callb
 #ifdef UA_ENABLE_PUBSUB_MONITORING
 
 static UA_StatusCode
-UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data, UA_ServerCallback callback) {
-    
+
     if ((!server) || (!data)) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Error UA_PubSubComponent_createMonitoring(): "
             "null pointer param");
@@ -505,7 +505,7 @@ UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
                     break;
                 default:
                     UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
+                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                         eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
@@ -522,7 +522,7 @@ UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
 }
 
 static UA_StatusCode
-UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                    UA_PubSubMonitoringType eMonitoringType, void *data) {
 
     if ((!server) || (!data)) {
@@ -537,7 +537,7 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCom
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
-                    /* use a timed callback, because one notification is enough, 
+                    /* use a timed callback, because one notification is enough,
                     we assume that MessageReceiveTimeout configuration is in [ms], we do not handle or check fractions */
                     UA_UInt64 interval = (UA_UInt64)(reader->config.messageReceiveTimeout * UA_DATETIME_MSEC);
                     ret = server->config.eventLoop->
@@ -547,18 +547,18 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCom
                     if (ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                             "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s'- MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
-                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
+                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                                 reader->config.messageReceiveTimeout, (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     } else {
                         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "Error UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: start timer failed", 
+                            "Error UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: start timer failed",
                                 (UA_Int32) reader->config.name.length, reader->config.name.data);
                     }
                     break;
                 }
                 default:
                     UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
+                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                             eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
@@ -575,7 +575,7 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCom
 }
 
 static UA_StatusCode
-UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                   UA_PubSubMonitoringType eMonitoringType, void *data) {
 
     if ((!server) || (!data)) {
@@ -593,13 +593,13 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComp
                     server->config.eventLoop->removeCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId);
                     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                         "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
-                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
+                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                                 reader->config.messageReceiveTimeout, (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     break;
                 }
                 default:
                     UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
+                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                         eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
@@ -616,7 +616,7 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComp
 }
 
 static UA_StatusCode
-UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                             UA_PubSubMonitoringType eMonitoringType, void *data)
 {
     if ((!server) || (!data)) {
@@ -637,18 +637,18 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_
                     if (ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                             "UA_PubSubComponent_updateMonitoringInterval(): DataSetReader '%.*s' - MessageReceiveTimeout: new MessageReceiveTimeout = '%f' "
-                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
+                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                                 reader->config.messageReceiveTimeout, (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     } else {
                         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "Error UA_PubSubComponent_updateMonitoringInterval(): DataSetReader '%.*s': update timer interval failed", 
+                            "Error UA_PubSubComponent_updateMonitoringInterval(): DataSetReader '%.*s': update timer interval failed",
                                 (UA_Int32) reader->config.name.length, reader->config.name.data);
                     }
                     break;
                 }
                 default:
                     UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
+                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                         eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
@@ -665,7 +665,7 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_
 }
 
 static UA_StatusCode
-UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType, 
+UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data) {
 
     if ((!server) || (!data)) {
@@ -680,12 +680,12 @@ UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT:
                     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: Timer Id = '%u'", 
+                        "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: Timer Id = '%u'",
                         (UA_Int32) reader->config.name.length, reader->config.name.data, (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     break;
                 default:
                     UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data, 
+                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                         eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index db64530a268..51fd0c3485c 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -225,7 +225,7 @@ UA_NetworkMessageHeader_encodeBinary(const UA_NetworkMessage *src, UA_Byte **buf
         UA_CHECK_STATUS(rv, return rv);
 
         // ExtendedFlags2
-        if(UA_NetworkMessage_ExtendedFlags2Enabled(src)) { 
+        if(UA_NetworkMessage_ExtendedFlags2Enabled(src)) {
             v = (UA_Byte)src->networkMessageType;
             // shift left 2 bit
             v = (UA_Byte) (v << NM_SHIFT_LEN);
@@ -462,7 +462,7 @@ UA_NetworkMessage_encodePayload(const UA_NetworkMessage* src, UA_Byte **bufPos,
     // Payload
     if(src->networkMessageType != UA_NETWORKMESSAGE_DATASET)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
-        
+
     UA_Byte count = 1;
 
     if(src->payloadHeaderEnabled) {
@@ -1139,10 +1139,10 @@ UA_Boolean
 UA_NetworkMessage_ExtendedFlags1Enabled(const UA_NetworkMessage* src) {
     UA_Boolean retval = false;
 
-    if((src->publisherIdType != UA_PUBLISHERDATATYPE_BYTE) 
-        || src->dataSetClassIdEnabled 
-        || src->securityEnabled 
-        || src->timestampEnabled 
+    if((src->publisherIdType != UA_PUBLISHERDATATYPE_BYTE)
+        || src->dataSetClassIdEnabled
+        || src->securityEnabled
+        || src->timestampEnabled
         || src->picosecondsEnabled
         || UA_NetworkMessage_ExtendedFlags2Enabled(src))
     {
@@ -1172,7 +1172,7 @@ UA_StatusCode
 UA_DataSetMessageHeader_encodeBinary(const UA_DataSetMessageHeader* src, UA_Byte **bufPos,
                                      const UA_Byte *bufEnd) {
     UA_Byte v;
-    // DataSetFlags1 
+    // DataSetFlags1
     v = (UA_Byte)src->fieldEncoding;
     // shift left 1 bit
     v = (UA_Byte)(v << DS_MH_SHIFT_LEN);
@@ -1213,7 +1213,7 @@ UA_DataSetMessageHeader_encodeBinary(const UA_DataSetMessageHeader* src, UA_Byte
     }
 
     // DataSetMessageSequenceNr
-    if(src->dataSetMessageSequenceNrEnabled) { 
+    if(src->dataSetMessageSequenceNrEnabled) {
         rv = UA_UInt16_encodeBinary(&src->dataSetMessageSequenceNr, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
@@ -1307,7 +1307,7 @@ UA_DataSetMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
     UA_Byte v2 = v & DS_MESSAGEHEADER_FIELD_ENCODING_MASK;
     v2 = (UA_Byte)(v2 >> DS_MH_SHIFT_LEN);
     dst->fieldEncoding = (UA_FieldEncoding)v2;
-    
+
     if((v & DS_MESSAGEHEADER_DS_MSG_VALID) != 0)
         dst->dataSetMessageValid = true;
 
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 18cfe049605..0bf4377be00 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -168,18 +168,18 @@ typedef struct {
     union {
         UA_DataSetPayloadHeader dataSetPayloadHeader;
     } payloadHeader;
-    
+
     UA_DateTime timestamp;
     UA_UInt16 picoseconds;
     UA_UInt16 promotedFieldsSize;
     UA_Variant* promotedFields; /* BaseDataType */
-    
+
     UA_NetworkMessageSecurityHeader securityHeader;
 
     union {
         UA_DataSetPayload dataSetPayload;
     } payload;
-    
+
     UA_ByteString securityFooter;
 } UA_NetworkMessage;
 
diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index e73af226c75..054c5346f9a 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -472,7 +472,7 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     //TODO: MetaData
     if(!isUaData)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
-        
+
     /* Network Message */
     UA_String messageType;
     DecodeEntry entries[5] = {
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 5f229b3f2a4..8177d9970ef 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1590,7 +1590,7 @@ UA_loadPubSubConfigMethodCallback(UA_Server *server,
 
 /* Adds method node to server. This method is used to load binary files for
  * PubSub configuration and delete / replace old PubSub configurations. */
-static UA_StatusCode 
+static UA_StatusCode
 UA_addLoadPubSubConfigMethod(UA_Server *server) {
     UA_Argument inputArgument;
     UA_Argument_init(&inputArgument);
@@ -1627,7 +1627,7 @@ UA_deletePubSubConfigMethodCallback(UA_Server *server,
 
 /* Adds method node to server. This method is used to delete the current PubSub
  * configuration. */
-static UA_StatusCode 
+static UA_StatusCode
 UA_addDeletePubSubConfigMethod(UA_Server *server) {
     UA_MethodAttributes configAttr = UA_MethodAttributes_default;
     configAttr.description = UA_LOCALIZEDTEXT("","Delete current PubSub configuration");
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 43222756451..6f1eea8e762 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -761,7 +761,7 @@ addDataSetWriter(UA_Server *server,
     if(!dataSetWriterConfig)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    /* Make checks for a heartbeat */ 
+    /* Make checks for a heartbeat */
     if(UA_NodeId_isNull(&dataSet) && dataSetWriterConfig->keyFrameCount != 1) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Adding DataSetWriter failed. DataSet can be null only for a heartbeat, "
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 2254f06fe8f..5542b36352d 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -384,7 +384,7 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
     /* Already unfrozen */
     if(!wg->configurationFrozen)
         return UA_STATUSCODE_GOOD;
-    
+
     //if(wg->config.rtLevel == UA_PUBSUB_RT_NONE){
     //    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
     //                   "PubSub configuration freeze without RT configuration has no effect.");
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index f2c15121266..68221e5b873 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2014-2017 (c) Florian Palm
@@ -567,7 +567,7 @@ UA_Server_getStatistics(UA_Server *server) {
         server->serverDiagnosticsSummary.sessionTimeoutCount;
     stat.ss.sessionAbortCount =
         server->serverDiagnosticsSummary.sessionAbortCount;
-    
+
     return stat;
 }
 
diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 34d87836ae1..13b91faf26a 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -259,7 +259,7 @@ UA_AsyncManager_createAsyncOp(UA_AsyncManager *am, UA_Server *server,
     UA_StatusCode result = UA_CallMethodRequest_copy(opRequest, &ao->request);
     if(result != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "UA_Server_SetAsyncMethodResult: UA_CallMethodRequest_copy failed.");                
+                     "UA_Server_SetAsyncMethodResult: UA_CallMethodRequest_copy failed.");
         UA_free(ao);
         return result;
     }
diff --git a/src/server/ua_server_async.h b/src/server/ua_server_async.h
index 2be5cafda9f..3c7c539486e 100644
--- a/src/server/ua_server_async.h
+++ b/src/server/ua_server_async.h
@@ -63,7 +63,7 @@ typedef struct {
     /* Operations for the workers. The queues are all FIFO: Put in at the tail,
      * take out at the head.*/
     UA_Lock queueLock;
-    UA_AsyncOperationQueue newQueue;        /* New operations for the workers */    
+    UA_AsyncOperationQueue newQueue;        /* New operations for the workers */
     UA_AsyncOperationQueue dispatchedQueue; /* Operations taken by a worker. When a result is
                                              * returned, we search for the op here to see if it
                                              * is still "alive" (not timed out). */
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index e5a6596cc27..ce8b347669d 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2019 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2019 (c) HMS Industrial Networks AB (Author: Jonas Green)
diff --git a/src/server/ua_server_discovery.c b/src/server/ua_server_discovery.c
index 092eeb1c4ba..861fa2ba6d0 100644
--- a/src/server/ua_server_discovery.c
+++ b/src/server/ua_server_discovery.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_server_discovery_mdns.c
index 1d580bde174..f78beaf86bd 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_server_discovery_mdns.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 9ed689430b1..ba06caf515b 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -310,7 +310,7 @@ UA_StatusCode
 referenceTypeIndices(UA_Server *server, const UA_NodeId *refType,
                      UA_ReferenceTypeSet *indices, UA_Boolean includeSubtypes);
 
-/* Returns the recursive type and interface hierarchy of the node */ 
+/* Returns the recursive type and interface hierarchy of the node */
 UA_StatusCode
 getParentTypeAndInterfaceHierarchy(UA_Server *server, const UA_NodeId *typeNode,
                                    UA_NodeId **typeHierarchy, size_t *typeHierarchySize);
diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 72ac9aecb77..6d7c5600bf8 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -332,7 +332,7 @@ readSessionDiagnostics(UA_Server *server,
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
     if(!session)
         return UA_STATUSCODE_BADINTERNALERROR;
-    
+
     /* Read the BrowseName */
     UA_QualifiedName bn;
     UA_StatusCode res = readWithReadValue(server, nodeId, UA_ATTRIBUTEID_BROWSENAME, &bn);
diff --git a/src/server/ua_server_utils.c b/src/server/ua_server_utils.c
index 7e8ed6b26f5..152b143a598 100644
--- a/src/server/ua_server_utils.c
+++ b/src/server/ua_server_utils.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2016 (c) Lorenz Haas
diff --git a/src/server/ua_services.h b/src/server/ua_services.h
index b55d4ebec98..bc1ffc986fe 100644
--- a/src/server/ua_services.h
+++ b/src/server/ua_services.h
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2014-2017 (c) Florian Palm
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 9557384392f..a6b40390542 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2015-2016 (c) Sten Grüner
@@ -552,7 +552,7 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
             UA_StructureDefinition def;
             retval = getStructureDefinition(type, &def);
             if(UA_STATUSCODE_GOOD!=retval)
-                break;            
+                break;
             retval = UA_Variant_setScalarCopy(&v->value, &def,
                                               &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
             UA_free(def.fields);
@@ -895,7 +895,7 @@ compatibleValueRankArrayDimensions(UA_Server *server, UA_Session *session,
         }
         return true;
     }
-    
+
     /* case >= 1, UA_VALUERANK_ONE_DIMENSION: the value is an array with the
        specified number of dimensions */
     if(arrayDimensionsSize != (size_t)valueRank) {
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index 67b77ba51ce..ccffa7a17e9 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
@@ -145,7 +145,7 @@ stopMulticastDiscoveryServer(UA_Server *server) {
 # endif
 }
 
-/* All filter criteria must be fulfilled in the list entry. The comparison is case 
+/* All filter criteria must be fulfilled in the list entry. The comparison is case
  * insensitive.
  * @returns true if the entry matches the filter. False if the filter does not match.
  * */
diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 5b62be80199..74fe37d8f21 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2016-2017 (c) Florian Palm
@@ -96,7 +96,7 @@ Service_SetTriggering(UA_Server *server, UA_Session *session,
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;
     }
-    
+
     /* Get the MonitoredItem */
     UA_MonitoredItem *mon = UA_Subscription_getMonitoredItem(sub, request->triggeringItemId);
     if(!mon) {
@@ -217,7 +217,7 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
             UA_NODESTORE_RELEASE(server, node);
         }
     }
-        
+
     /* Adjust to sampling interval to lie within the limits */
     if(params->samplingInterval <= 0.0) {
         /* A sampling interval of zero is possible and indicates that the
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index b7bc3577861..bbc12b1631a 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -681,10 +681,10 @@ copyChild(UA_Server *server, UA_Session *session,
          * manually added by the user during addnode_begin and addnode_finish. */
         /* For now we keep all the modelling rule references and delete all others */
         const UA_NodeId nodeId_typesFolder= UA_NODEID_NUMERIC(0, UA_NS0ID_TYPESFOLDER);
-        const UA_ReferenceTypeSet reftypes_aggregates = 
+        const UA_ReferenceTypeSet reftypes_aggregates =
             UA_REFTYPESET(UA_REFERENCETYPEINDEX_AGGREGATES);
         UA_ReferenceTypeSet reftypes_skipped;
-        /* Check if the hasModellingRule-reference is required (configured or node in an 
+        /* Check if the hasModellingRule-reference is required (configured or node in an
             instance declaration) */
         if(server->config.modellingRulesOnInstances ||
            isNodeInTree(server, destinationNodeId,
@@ -737,8 +737,8 @@ copyChild(UA_Server *server, UA_Session *session,
             deleteNode(server, newNodeId, true);
             return retval;
         }
-        
-        /* Clean up.  Because it can happen that a string is assigned as ID at 
+
+        /* Clean up.  Because it can happen that a string is assigned as ID at
          * generateChildNodeId. */
         UA_NodeId_clear(&newNodeId);
     }
@@ -921,7 +921,7 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
             UA_ReferenceTypeSet refTypes = UA_ReferenceTypeSet_union(refTypes1, refTypes2);
             if(retval != UA_STATUSCODE_GOOD)
                 goto cleanup;
-            
+
             /* Abstract variable is allowed if parent is a children of a
              * base data variable. An abstract variable may be part of an
              * object type which again is below BaseObjectType */
@@ -954,12 +954,12 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
             const UA_NodeId objectTypes = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE);
             UA_Boolean isInBaseObjectType =
                 isNodeInTree(server, parentNodeId, &objectTypes, &refTypes);
-            
+
             const UA_NodeId eventTypes = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
             UA_Boolean isInBaseEventType =
                 isNodeInTree_singleRef(server, &type->head.nodeId, &eventTypes,
                                        UA_REFERENCETYPEINDEX_HASSUBTYPE);
-            
+
             if(!isInBaseObjectType &&
                !(isInBaseEventType && UA_NodeId_isNull(parentNodeId))) {
                 logAddNode(&server->config.logger, session, nodeId,
@@ -1398,7 +1398,7 @@ checkSetIsDynamicVariable(UA_Server *server, UA_Session *session,
     /* Set the variable to "dynamic" */
     UA_Server_editNode(server, session, nodeId,
                        (UA_EditNodeCallback)setVariableNodeDynamic, NULL);
-    
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1750,7 +1750,7 @@ deconstructNodeSet(UA_Server *server, UA_Session *session,
                   lifecycle = &type->objectTypeNode.lifecycle;
                else
                   lifecycle = &type->variableTypeNode.lifecycle;
-               
+
                /* Call the destructor */
                if(lifecycle->destructor) {
                   UA_UNLOCK(&server->serviceMutex);
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index 9e268320b56..8c8cb7e699c 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2014, 2017 (c) Florian Palm
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 20bbdc13692..dd31e34ccc9 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2018, 2022 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2016-2017 (c) Florian Palm
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 126a988d68e..4a9c71cfec3 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2019 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2014-2017 (c) Florian Palm
@@ -184,7 +184,7 @@ isNodeInTree_singleRef(UA_Server *server, const UA_NodeId *leafNode,
     UA_ReferenceTypeSet reftypes = UA_REFTYPESET(relevantRefTypeIndex);
     return isNodeInTree(server, leafNode, nodeToFind, &reftypes);
 }
- 
+
 static enum ZIP_CMP
 cmpTarget(const void *a, const void *b) {
     const RefEntry *aa = (const RefEntry*)a;
@@ -525,7 +525,7 @@ addReferenceDescription(UA_Server *server, RefResult *rr,
     UA_ExpandedNodeId en = UA_NodePointer_toExpandedNodeId(nodeP);
     retval = UA_ExpandedNodeId_copy(&en, &descr->nodeId);
     if(mask & UA_BROWSERESULTMASK_REFERENCETYPEID) {
-        const UA_NodeId *refTypeId = 
+        const UA_NodeId *refTypeId =
             UA_NODESTORE_GETREFERENCETYPEID(server, ref->referenceTypeIndex);
         retval |= UA_NodeId_copy(refTypeId, &descr->referenceTypeId);
     }
@@ -537,7 +537,7 @@ addReferenceDescription(UA_Server *server, RefResult *rr,
         UA_ReferenceDescription_clear(descr);
         return retval;
     }
-    
+
     /* Fields that require the actual node */
     if(mask & UA_BROWSERESULTMASK_NODECLASS)
         descr->nodeClass = curr->head.nodeClass;
@@ -1093,7 +1093,7 @@ walkBrowsePathElement(UA_Server *server, UA_Session *session,
                     aa_find(&_refNameTree, &browseNameHash);
                 if(!rt)
                     continue;
-                
+
                 res = recursiveAddBrowseHashTarget(next, &_refNameTree, rt);
                 if(res != UA_STATUSCODE_GOOD)
                     break;
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index b8d9ee9b7b1..613025e6892 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2018 (c) Thomas Stalder, Blue Time Concept SA
@@ -158,7 +158,7 @@ UA_Session_detachSubscription(UA_Server *server, UA_Session *session,
 
     /* Reduce the number of outstanding retransmissions */
     session->totalRetransmissionQueueSize -= sub->retransmissionQueueSize;
-    
+
     /* Send remaining publish responses if the last subscription was removed */
     if(!releasePublishResponses || !TAILQ_EMPTY(&session->subscriptions))
         return;
diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index 0c24924936f..6aa22720408 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2019 (c) HMS Industrial Networks AB (Author: Jonas Green)
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index e2ebbf60c5c..ad289d3bd75 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -217,7 +217,7 @@ UA_Server_setConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeI
     UA_Condition *c = getCondition(server, &conditionSource, &condition);
     if(!c)
         return UA_STATUSCODE_BADNOTFOUND;
-        
+
     /* Set the callback */
     switch(callbackType) {
     case UA_ENTERING_ENABLEDSTATE:
@@ -653,16 +653,16 @@ enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
         UA_StatusCode retval = UA_Server_setConditionField(server, triggeredNode,
                                                            &value, fieldMessageQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition Message failed",);
-        
+
         UA_Variant_setScalar(&value, &enableText, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
         retval = UA_Server_setConditionField(server, triggeredNode, &value, fieldEnabledStateQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition EnabledState text failed",);
-        
+
         UA_Boolean retain = false;
         UA_Variant_setScalar(&value, &retain, &UA_TYPES[UA_TYPES_BOOLEAN]);
         retval = UA_Server_setConditionField(server, triggeredNode, &value, fieldRetainQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition Retain failed",);
-        
+
         /* Trigger event */
         UA_ByteString lastEventId = UA_BYTESTRING_NULL;
         /* Trigger the event for Condition or its Branch */
@@ -671,13 +671,13 @@ enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
         retval = UA_Server_triggerEvent(server, triggeredNode, *conditionSource, &lastEventId, false);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Triggering condition event failed",);
         setIsCallerAC(server, &triggeredNode, conditionSource, false);
-        
+
         /* Update list */
         retval = updateConditionLastEventId(server, &triggeredNode, conditionSource, &lastEventId);
         UA_ByteString_clear(&lastEventId);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "updating condition event failed",);
     }
-    
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -702,7 +702,7 @@ enteringEnabledState(UA_Server *server,
             triggeredNode = cond->conditionId;
         else //enable branches
             triggeredNode = branch->conditionBranchId;
-        
+
         UA_LocalizedText message = UA_LOCALIZEDTEXT(LOCALE, ENABLED_MESSAGE);
         UA_LocalizedText enableText = UA_LOCALIZEDTEXT(LOCALE, ENABLED_TEXT);
         UA_Variant value;
@@ -710,24 +710,24 @@ enteringEnabledState(UA_Server *server,
         UA_StatusCode retval = UA_Server_setConditionField(server, triggeredNode,
                                                            &value, fieldMessageQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "set Condition Message failed",);
-        
+
         UA_Variant_setScalar(&value, &enableText, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
         retval = UA_Server_setConditionField(server, triggeredNode, &value, fieldEnabledStateQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "set Condition EnabledState text failed",);
-        
+
         /* User callback TODO how should branches be evaluated? see p.19 (5.5.2) */
         UA_Boolean removeBranch = false;//not used
         retval = callConditionTwoStateVariableCallback(server, &triggeredNode,
                                                        conditionSource, &removeBranch,
                                                        UA_ENTERING_ENABLEDSTATE);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "calling condition callback failed",);
-        
+
         /* Trigger event */
         //Condition Nodes should not be deleted after triggering the event
         retval = UA_Server_triggerConditionEvent(server, triggeredNode, *conditionSource, NULL);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "triggering condition event failed",);
     }
-    
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -837,21 +837,21 @@ afterWriteCallbackAckedStateChange(UA_Server *server,
     retval = UA_Server_setConditionField(server, conditionNode, &value, fieldMessageQN);
     CONDITION_ASSERT_RETURN_VOID(retval, "Set Condition Message failed",
                                  UA_NodeId_clear(&conditionNode););
-    
+
     /* Set AckedState text */
     UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACKED_TEXT);
     UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     retval = UA_Server_setConditionField(server, conditionNode, &value, fieldAckedStateQN);
     CONDITION_ASSERT_RETURN_VOID(retval, "Set Condition AckedState failed",
                                  UA_NodeId_clear(&conditionNode););
-    
+
     /* Get conditionSource */
     UA_NodeId conditionSource;
     retval = getNodeIdValueOfConditionField(server, &conditionNode, fieldSourceQN,
                                             &conditionSource);
     CONDITION_ASSERT_RETURN_VOID(retval, "ConditionSource not found",
                                  UA_NodeId_clear(&conditionNode););
-    
+
     /* User callback*/
     UA_Boolean removeBranch = false;
     retval = callConditionTwoStateVariableCallback(server, &conditionNode, &conditionSource,
@@ -859,7 +859,7 @@ afterWriteCallbackAckedStateChange(UA_Server *server,
     CONDITION_ASSERT_RETURN_VOID(retval, "Calling condition callback failed",
                                  UA_NodeId_clear(&conditionNode);
                                  UA_NodeId_clear(&conditionSource););
-    
+
     /* Trigger event */
     //Condition Nodes should not be deleted after triggering the event
     retval = UA_Server_triggerConditionEvent(server, conditionNode, conditionSource, NULL);
@@ -895,7 +895,7 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
                                                       &UA_TYPES[UA_TYPES_DATETIME]);
         CONDITION_ASSERT_RETURN_VOID(retval, "Set deactivating Time failed",
                                      UA_NodeId_clear(&conditionNode););
-        
+
         /* Set ConfirmedState text to (Unconfirmed)*/
         UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, UNCONFIRMED_TEXT);
         UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
@@ -925,27 +925,27 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
                                                   &UA_TYPES[UA_TYPES_DATETIME]);
     CONDITION_ASSERT_RETURN_VOID(retval, "Set Confirming Time failed",
                                  UA_NodeId_clear(&conditionNode););
-    
+
     /* Set Message */
     UA_LocalizedText message = UA_LOCALIZEDTEXT(LOCALE, CONFIRMED_MESSAGE);
     UA_Variant_setScalar(&value, &message, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     retval = UA_Server_setConditionField(server, conditionNode, &value, fieldMessageQN);
     CONDITION_ASSERT_RETURN_VOID(retval, "Set Condition Message failed",
                                  UA_NodeId_clear(&conditionNode););
-    
+
     /* Set ConfirmedState text */
     UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, CONFIRMED_TEXT);
     UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     retval = UA_Server_setConditionField(server, conditionNode, &value, fieldConfirmedStateQN);
     CONDITION_ASSERT_RETURN_VOID(retval, "Set Condition ConfirmedState failed",
                                  UA_NodeId_clear(&conditionNode););
-    
+
     /* Get conditionSource */
     UA_NodeId conditionSource;
     retval = getNodeIdValueOfConditionField(server, &conditionNode, fieldSourceQN, &conditionSource);
     CONDITION_ASSERT_RETURN_VOID(retval, "ConditionSource not found",
                                  UA_NodeId_clear(&conditionNode););
-    
+
     /* User callback*/
     UA_Boolean removeBranch = false;
     retval = callConditionTwoStateVariableCallback(server, &conditionNode,
@@ -954,7 +954,7 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
     CONDITION_ASSERT_RETURN_VOID(retval, "Calling condition callback failed",
                                  UA_NodeId_clear(&conditionNode);
                                  UA_NodeId_clear(&conditionSource););
-    
+
     /* Trigger event */
     //Condition Nodes should not be deleted after triggering the event
     retval = UA_Server_triggerConditionEvent(server, conditionNode, conditionSource, NULL);
@@ -1080,7 +1080,7 @@ afterWriteCallbackActiveStateChange(UA_Server *server,
         CONDITION_ASSERT_RETURN_VOID(retval, "Set Condition ActiveState failed",
                                      UA_NodeId_clear(&conditionNode);
                                      UA_NodeId_clear(&conditionSource););
-        
+
         /* Set deactivating time */
         retval = UA_Server_writeObjectProperty_scalar(server, conditionNode, fieldTimeQN,
                                                       &data->sourceTimestamp,
@@ -1088,7 +1088,7 @@ afterWriteCallbackActiveStateChange(UA_Server *server,
         CONDITION_ASSERT_RETURN_VOID(retval, "Set deactivating Time failed",
                                      UA_NodeId_clear(&conditionNode);
                                      UA_NodeId_clear(&conditionSource););
-        
+
         retval = updateConditionActiveState(server, &conditionSource, &conditionNode,
                                             currentActiveState, UA_INACTIVE, isLimitalarm);
         UA_NodeId_clear(&conditionSource);
@@ -1239,7 +1239,7 @@ enableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     /* Check if disabled */
     if(isTwoStateVariableInTrueState(server, objectId, &fieldEnabledStateQN))
         return UA_STATUSCODE_BADCONDITIONALREADYENABLED;
-        
+
     /* Enable by writing true to EnabledStateId--> will cause a callback to
      * trigger the new events */
     UA_Variant value;
@@ -1295,21 +1295,21 @@ addCommentMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                                                          fieldComment, fieldSourceTimeStamp);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition EnabledState text failed",
                                    UA_NodeId_clear(&triggerEvent););
-    
+
     /* Set adding comment time (the same value of SourceTimestamp) */
     retval = UA_Server_writeObjectProperty_scalar(server, triggerEvent, fieldTimeQN,
                                                   &fieldSourceTimeStampValue,
                                                   &UA_TYPES[UA_TYPES_DATETIME]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set enabling/disabling Time failed",
                                    UA_NodeId_clear(&triggerEvent););
-    
+
     /* Set Message */
     message = UA_LOCALIZEDTEXT(LOCALE, COMMENT_MESSAGE);
     UA_Variant_setScalar(&value, &message, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     retval = UA_Server_setConditionField(server, triggerEvent, &value, fieldMessageQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition Message failed",
                                    UA_NodeId_clear(&triggerEvent););
-    
+
     /* Set Comment. Check whether comment is empty -> leave the last value as is*/
     UA_LocalizedText *inputComment = (UA_LocalizedText *)input[1].data;
     UA_String nullString = UA_STRING_NULL;
@@ -1320,13 +1320,13 @@ addCommentMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition Comment failed",
                                        UA_NodeId_clear(&triggerEvent););
     }
-    
+
     /* Get conditionSource */
     UA_NodeId conditionSource;
     retval = getNodeIdValueOfConditionField(server, &triggerEvent, fieldSourceQN, &conditionSource);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "ConditionSource not found",
                                    UA_NodeId_clear(&triggerEvent););
-    
+
     /* Trigger event */
     //Condition Nodes should not be deleted after triggering the event
     retval = UA_Server_triggerConditionEvent(server, triggerEvent, conditionSource, NULL);
@@ -1375,7 +1375,7 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                                             &eventType);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "EventType not found",
                                    UA_NodeId_clear(&conditionNode););
-    
+
     /* Check if ConditionType is subType of AcknowledgeableConditionType TODO Over Kill*/
     UA_NodeId AcknowledgeableConditionTypeId =
         UA_NODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE);
@@ -1387,9 +1387,9 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
         UA_NodeId_clear(&eventType);
         return UA_STATUSCODE_BADNODEIDINVALID;
     }
-    
+
     UA_NodeId_clear(&eventType);
-    
+
     /* Set Comment. Check whether comment is empty -> leave the last value as is*/
     UA_LocalizedText *inputComment = (UA_LocalizedText *)input[1].data;
     UA_String nullString = UA_STRING_NULL;
@@ -1451,7 +1451,7 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                                             &eventType);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "EventType not found",
                                    UA_NodeId_clear(&conditionNode););
-    
+
     /* Check if ConditionType is subType of AcknowledgeableConditionType. */
     UA_NodeId AcknowledgeableConditionTypeId =
         UA_NODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE);
@@ -1463,9 +1463,9 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
         UA_NodeId_clear(&eventType);
         return UA_STATUSCODE_BADNODEIDINVALID;
     }
-    
+
     UA_NodeId_clear(&eventType);
-    
+
     /* Set Comment. Check whether comment is empty -> leave the last value as is*/
     UA_LocalizedText *inputComment = (UA_LocalizedText *)input[1].data;
     UA_String nullString = UA_STRING_NULL;
@@ -1476,7 +1476,7 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition Comment failed",
                                        UA_NodeId_clear(&conditionNode););
     }
-    
+
     /* Set ConfirmedStateId */
     UA_Boolean idValue = true;
     UA_Variant_setScalar(&value, &idValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
@@ -1658,7 +1658,7 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                                                   &refreshEvents[REFRESHEVENT_START_IDX],
                                                   &refreshEvents[REFRESHEVENT_END_IDX]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",);
-    
+
     /* Trigger RefreshStartEvent and RefreshEndEvent for the each monitoredItem
      * in the subscription */
     UA_MonitoredItem *monitoredItem =
@@ -1693,7 +1693,7 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
         setRefreshMethodEvents(server, &refreshEvents[REFRESHEVENT_START_IDX],
                                &refreshEvents[REFRESHEVENT_END_IDX]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",);
-    
+
     /* Trigger RefreshStartEvent and RefreshEndEvent for the each monitoredItem
      * in the subscription */
     //TODO when there are a lot of monitoreditems (not only events)?
@@ -1946,18 +1946,18 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
     if(!isNodeInTree_singleRef(server, conditionType, &acknowledgeableConditionTypeId,
                                UA_REFERENCETYPEINDEX_HASSUBTYPE))
         return UA_STATUSCODE_GOOD;
-    
+
     /* Set AckedState (Id = false by default) */
     text = UA_LOCALIZEDTEXT(LOCALE, UNACKED_TEXT);
     UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     retval = UA_Server_setConditionField(server, *condition, &value, fieldAckedStateQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set AckedState Field failed",);
-    
+
     UA_Variant_setScalar(&value, &stateId, &UA_TYPES[UA_TYPES_BOOLEAN]);
     retval = UA_Server_setConditionVariableFieldProperty(server, *condition, &value,
                                                          fieldAckedStateQN, twoStateVariableIdQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set AckedState/Id Field failed",);
-    
+
 #ifdef CONDITIONOPTIONALFIELDS_SUPPORT
     /* add optional field ConfirmedState*/
     retval = UA_Server_addConditionOptionalField(server, *condition, acknowledgeableConditionTypeId,
@@ -1969,14 +1969,14 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
     UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     retval = UA_Server_setConditionField(server, *condition, &value, fieldConfirmedStateQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set ConfirmedState Field failed",);
-    
+
     UA_Variant_setScalar(&value, &stateId, &UA_TYPES[UA_TYPES_BOOLEAN]);
     retval = UA_Server_setConditionVariableFieldProperty(server, *condition, &value,
                                                          fieldConfirmedStateQN,
                                                          twoStateVariableIdQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set EnabledState/Id Field failed",);
 #endif//CONDITIONOPTIONALFIELDS_SUPPORT
-    
+
     /* 2. Check if ConditionType is subType of AlarmConditionType */
     UA_NodeId alarmConditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ALARMCONDITIONTYPE);
     if(isNodeInTree_singleRef(server, conditionType, &alarmConditionTypeId,
@@ -2146,7 +2146,7 @@ setStandardConditionCallbacks(UA_Server *server, const UA_NodeId* condition,
     if(LIST_EMPTY(&server->conditionSources)) {
         retval = setConditionMethodCallbacks(server, condition, conditionType);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Method Callback failed",);
-        
+
         // Create RefreshEvents
         if(UA_NodeId_isNull(&refreshEvents[REFRESHEVENT_START_IDX]) &&
            UA_NodeId_isNull(&refreshEvents[REFRESHEVENT_END_IDX])) {
@@ -2155,7 +2155,7 @@ setStandardConditionCallbacks(UA_Server *server, const UA_NodeId* condition,
             CONDITION_ASSERT_RETURN_RETVAL(retval, "Create RefreshEvents failed",);
         }
     }
-    
+
     return retval;
 }
 
@@ -2302,7 +2302,7 @@ addOptionalVariableField(UA_Server *server, const UA_NodeId *originCondition,
         referenceToParent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY);
     else
         referenceToParent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
-    
+
     /* Set a random unused NodeId with specified Namespace Index*/
     UA_NodeId optionalVariable = {originCondition->namespaceIndex, UA_NODEIDTYPE_NUMERIC, {0}};
     retval = UA_Server_addVariableNode(server, optionalVariable, *originCondition,
@@ -2340,7 +2340,7 @@ addOptionalObjectField(UA_Server *server, const UA_NodeId *originCondition,
         referenceToParent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY);
     else
         referenceToParent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
-    
+
     UA_NodeId optionalObject = {originCondition->namespaceIndex, UA_NODEIDTYPE_NUMERIC, {0}};
     retval = UA_Server_addObjectNode(server, optionalObject, *originCondition,
                                      referenceToParent, *fieldName, type->head.nodeId,
@@ -2505,9 +2505,9 @@ UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
     //Condition Nodes should not be deleted after triggering the event
     UA_StatusCode retval = UA_Server_triggerEvent(server, condition, conditionSource, &eventId, false);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Triggering condition event failed",);
-    
+
     setIsCallerAC(server, &condition, &conditionSource, false);
-    
+
     /* Update list */
     retval = updateConditionLastEventId(server, &condition, &conditionSource, &eventId);
     if(outEventId)
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 088ae5292ea..8a9bde08b17 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -233,7 +233,7 @@ orOperator(UA_FilterOperatorContext *ctx) {
     if(secondBoolean == UA_STATUSCODE_GOOD) {
         ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
         return UA_STATUSCODE_GOOD;
-    } 
+    }
     if((firstBoolean_or == UA_STATUSCODE_BADNOMATCH) &&
        (secondBoolean == UA_STATUSCODE_BADNOMATCH)) {
         ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index faa6735056e..9c5cb247517 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2017-2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
@@ -619,7 +619,7 @@ UA_MonitoredItem_ensureQueueSpace(UA_Server *server, UA_MonitoredItem *mon) {
     /* Nothing to do */
     if(mon->queueSize - mon->eventOverflows <= mon->parameters.queueSize)
         return;
-    
+
     /* Remove notifications until the required queue size is reached */
     UA_Boolean reporting = false;
     size_t remove = mon->queueSize - mon->eventOverflows - mon->parameters.queueSize;
diff --git a/src/ua_connection_internal.h b/src/ua_connection_internal.h
index 17aa7bf1ce4..3bc5fee6010 100644
--- a/src/ua_connection_internal.h
+++ b/src/ua_connection_internal.h
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2016-2017 (c) Stefan Profanter, fortiss GmbH
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 1160d443f2e..05e571c015c 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -660,7 +660,7 @@ assembleProcessMessage(UA_SecureChannel *channel, void *application,
     UA_ByteString payload;
     res = UA_ByteString_allocBuffer(&payload, messageSize);
     UA_CHECK_STATUS(res, return res);
-    
+
     /* Assemble the full message */
     size_t offset = 0;
     while(true) {
@@ -673,7 +673,7 @@ assembleProcessMessage(UA_SecureChannel *channel, void *application,
         if(ct == UA_CHUNKTYPE_FINAL)
             break;
     }
-    
+
     /* Process the assembled message */
     res = callback(application, channel, messageType, requestId, &payload);
     UA_ByteString_clear(&payload);
@@ -910,7 +910,7 @@ UA_SecureChannel_receive(UA_SecureChannel *channel, void *application,
                          UA_ProcessMessageCallback callback, UA_UInt32 timeout) {
     UA_Connection *connection = channel->connection;
     UA_CHECK_MEM(connection, return UA_STATUSCODE_BADINTERNALERROR);
-    
+
     /* Listen for messages to arrive */
     UA_ByteString buffer = UA_BYTESTRING_NULL;
     UA_StatusCode res = connection->recv(connection, &buffer, timeout);
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 718be82c334..d3052b031dd 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017 (c) Florian Palm
diff --git a/src/ua_securechannel_crypto.c b/src/ua_securechannel_crypto.c
index 5de819f1b4e..db1fb8097e3 100644
--- a/src/ua_securechannel_crypto.c
+++ b/src/ua_securechannel_crypto.c
@@ -338,10 +338,10 @@ signAndEncryptSym(UA_MessageContext *messageContext,
     /* Encrypt */
     UA_ByteString dataToEncrypt;
     dataToEncrypt.data = messageContext->messageBuffer.data +
-        UA_SECURECHANNEL_CHANNELHEADER_LENGTH + 
+        UA_SECURECHANNEL_CHANNELHEADER_LENGTH +
         UA_SECURECHANNEL_SYMMETRIC_SECURITYHEADER_LENGTH;
     dataToEncrypt.length = totalLength -
-        (UA_SECURECHANNEL_CHANNELHEADER_LENGTH + 
+        (UA_SECURECHANNEL_CHANNELHEADER_LENGTH +
          UA_SECURECHANNEL_SYMMETRIC_SECURITYHEADER_LENGTH);
     return sp->symmetricModule.cryptoModule.encryptionAlgorithm.
         encrypt(channel->channelContext, &dataToEncrypt);
diff --git a/src/ua_types.c b/src/ua_types.c
index 3efa31c2470..25b48476669 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2020 (c) Fraunhofer IOSB (Author: Andreas Ebner)
  *    Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
@@ -1392,7 +1392,7 @@ extensionObjectOrder(const UA_ExtensionObject *p1, const UA_ExtensionObject *p2,
                                 (const UA_String*)&p2->content.encoded.body, NULL);
             return o;
         }
-        
+
     case UA_EXTENSIONOBJECT_DECODED:
     default: {
             const UA_DataType *type1 = p1->content.decoded.type;
diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index 7a611c226e8..a9aa1a5bcbe 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2020 (c) Fraunhofer IOSB (Author: Andreas Ebner)
  *    Copyright 2020 (c) Grigory Friedman
@@ -1193,7 +1193,7 @@ ENCODE_BINARY(DiagnosticInfo) {
     encodingMask |= (u8)(src->hasAdditionalInfo << 4u);
     encodingMask |= (u8)(src->hasInnerStatusCode << 5u);
     encodingMask |= (u8)(src->hasInnerDiagnosticInfo << 6u);
-    
+
     /* Encode the numeric content */
     status ret = ENCODE_DIRECT(&encodingMask, Byte);
     if(src->hasSymbolicId)
diff --git a/src/ua_types_encoding_binary.h b/src/ua_types_encoding_binary.h
index 3727bf637b7..0d556a4b881 100644
--- a/src/ua_types_encoding_binary.h
+++ b/src/ua_types_encoding_binary.h
@@ -37,7 +37,7 @@ typedef UA_StatusCode (*UA_exchangeEncodeBuffer)(void *handle, UA_Byte **bufPos,
           Is ignored if NULL.
  * @param exchangeHandle Custom data passed into the exchangeCallback.
  * @return Returns a statuscode whether encoding succeeded. */
-UA_StatusCode 
+UA_StatusCode
 UA_encodeBinaryInternal(const void *src, const UA_DataType *type,
                         UA_Byte **bufPos, const UA_Byte **bufEnd,
                         UA_exchangeEncodeBuffer exchangeCallback,
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 921c4aa403c..ee4d792b103 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2018 (c) Fraunhofer IOSB (Author: Lukas Meling)
@@ -504,7 +504,7 @@ ENCODE_JSON(String) {
                 break;
 
             /* TODO: Why is this commented? */
-            /* slash 
+            /* slash
             if((flags & JSON_ESCAPE_SLASH) && codepoint == '/')
                 break;*/
 
@@ -1023,8 +1023,8 @@ Variant_encodeJsonWrapExtensionObject(const UA_Variant *src, const bool isArray,
 }
 
 static status
-addMultiArrayContentJSON(CtxJson *ctx, void* array, const UA_DataType *type, 
-                         size_t *index, UA_UInt32 *arrayDimensions, size_t dimensionIndex, 
+addMultiArrayContentJSON(CtxJson *ctx, void* array, const UA_DataType *type,
+                         size_t *index, UA_UInt32 *arrayDimensions, size_t dimensionIndex,
                          size_t dimensionSize) {
     /* Stop recursion: The inner Arrays are written */
     status ret;
@@ -1074,7 +1074,7 @@ ENCODE_JSON(Variant) {
             typeId = UA_TYPES[UA_TYPES_EXTENSIONOBJECT].typeId.identifier.numeric;
         ret |= writeJsonKey(ctx, UA_JSONKEY_TYPE);
         ret |= ENCODE_DIRECT_JSON(&typeId, UInt32);
-            
+
         /* Write the reversible form body */
         if(!isBuiltin) {
             /* Not builtin. Can it be encoded? Wrap in extension object. */
@@ -1093,7 +1093,7 @@ ENCODE_JSON(Variant) {
         /* Write the dimensions */
         if(hasDimensions) {
             ret |= writeJsonKey(ctx, UA_JSONKEY_DIMENSION);
-            ret |= encodeJsonArray(ctx, src->arrayDimensions, src->arrayDimensionsSize, 
+            ret |= encodeJsonArray(ctx, src->arrayDimensions, src->arrayDimensionsSize,
                                    &UA_TYPES[UA_TYPES_INT32]);
         }
     } else {
@@ -1958,7 +1958,7 @@ lookAheadForKey(const char *key, CtxJson *ctx,
 }
 
 static status
-prepareDecodeNodeIdJson(UA_NodeId *dst, CtxJson *ctx, ParseCtx *parseCtx, 
+prepareDecodeNodeIdJson(UA_NodeId *dst, CtxJson *ctx, ParseCtx *parseCtx,
                         u8 *fieldCount, DecodeEntry *entries) {
     /* possible keys: Id, IdType, NamespaceIndex */
     /* Id must always be present */
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 9d57141005a..99f67ecc0d8 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -66,7 +66,7 @@ typedef struct {
 
     size_t namespacesSize;
     const UA_String *namespaces;
-    
+
     size_t serverUrisSize;
     const UA_String *serverUris;
 } CtxJson;
diff --git a/src/ua_types_print.c b/src/ua_types_print.c
index ec4cbb779c1..92a0f87523c 100644
--- a/src/ua_types_print.c
+++ b/src/ua_types_print.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  */
diff --git a/src/ua_util.c b/src/ua_util.c
index 8b36f130c8b..f6e2d9a0d39 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014, 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2014 (c) Florian Palm
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 2f5ea2a0703..0e490dcd831 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2014, 2017 (c) Florian Palm
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index 78eda42baa2..b84e92f0961 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -307,20 +307,20 @@ START_TEST(udpTalkerAndListener) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     size_t listenSockets = testContext.connCount;
-    
+
     /* Open a talker connection */
     clientId = 0;
-    
+
     UA_String targetHost = UA_STRING("localhost");
     params[0].key = UA_QUALIFIEDNAME(0, "port");
     params[0].value = portVar;
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
-    
+
     retval = cmTalker->openConnection(cmTalker, 2, params, NULL, &testContext,
                                       connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    
+
     /* The talker el should receive a signal "ready to be written on" */
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
@@ -329,7 +329,7 @@ START_TEST(udpTalkerAndListener) {
     }
     ck_assert_uint_ne(clientId, 0);
     ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
-    
+
     /* Send a message from the talker */
     received = false;
     UA_ByteString snd;
@@ -343,7 +343,7 @@ START_TEST(udpTalkerAndListener) {
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert(received);
-    
+
     /* Close the connection */
     retval = cmTalker->closeConnection(cmTalker, clientId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
@@ -353,7 +353,7 @@ START_TEST(udpTalkerAndListener) {
         UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
     }
     ck_assert_uint_eq(testContext.connCount, listenSockets);
-    
+
     /* Stop the Talker EventLoop */
     int max_stop_iteration_count = 10;
     int iteration = 0;
@@ -367,7 +367,7 @@ START_TEST(udpTalkerAndListener) {
     ck_assert_int_eq(elTalker->state, UA_EVENTLOOPSTATE_STOPPED);
     elTalker->free(elTalker);
     elTalker = NULL;
-    
+
     /* Stop the Listener EventLoop */
     max_stop_iteration_count = 10;
     iteration = 0;
diff --git a/tests/check_timer.c b/tests/check_timer.c
index 6891bec1ed7..38dd1a2fde5 100644
--- a/tests/check_timer.c
+++ b/tests/check_timer.c
@@ -1,5 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public 
- * License, v. 2.0. If a copy of the MPL was not distributed with this 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ua_timer.h"
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index b3f4887f50f..48952cf1571 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -27,7 +27,7 @@ UA_decodeJsonInternal(const UA_ByteString *src, void *dst, const UA_DataType *ty
 
 /* Test Boolean */
 START_TEST(UA_Boolean_true_json_encode) {
-   
+
     UA_Boolean *src = UA_Boolean_new();
     UA_Boolean_init(src);
     *src = true;
@@ -43,19 +43,19 @@ START_TEST(UA_Boolean_true_json_encode) {
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "true";
     ck_assert_str_eq(result, (char*)buf.data);
-    
+
     UA_ByteString_clear(&buf);
     UA_Boolean_delete(src);
-    
+
 }
 END_TEST
 
 START_TEST(UA_Boolean_false_json_encode) {
-   
+
     UA_Boolean *src = UA_Boolean_new();
     UA_Boolean_init(src);
     *src = false;
@@ -65,16 +65,16 @@ START_TEST(UA_Boolean_false_json_encode) {
 
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
     ck_assert_int_eq(size, 5);
-    
+
     UA_ByteString_allocBuffer(&buf, size+1);
 
     UA_Byte *bufPos = &buf.data[0];
     const UA_Byte *bufEnd = &buf.data[size+1];
-        
+
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "false";
     ck_assert_str_eq(result, (char*)buf.data);
@@ -84,7 +84,7 @@ START_TEST(UA_Boolean_false_json_encode) {
 END_TEST
 
 START_TEST(UA_Boolean_true_bufferTooSmall_json_encode) {
-   
+
     UA_Boolean *src = UA_Boolean_new();
     UA_Boolean_init(src);
     *src = false;
@@ -99,7 +99,7 @@ START_TEST(UA_Boolean_true_bufferTooSmall_json_encode) {
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     char* result = "";
     ck_assert_str_eq(result, (char*)buf.data);
@@ -112,9 +112,9 @@ END_TEST
 START_TEST(UA_String_json_encode) {
     // given
     UA_String src = UA_STRING("hello");
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
-    
+
     UA_ByteString buf;
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
     UA_ByteString_allocBuffer(&buf, size+1);
@@ -137,7 +137,7 @@ START_TEST(UA_String_Empty_json_encode) {
     UA_String src = UA_STRING("");
     UA_ByteString buf;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
-    
+
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
     UA_ByteString_allocBuffer(&buf, size+1);
 
@@ -162,7 +162,7 @@ START_TEST(UA_String_Null_json_encode) {
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
     UA_ByteString_allocBuffer(&buf, size+1);
- 
+
     UA_Byte *bufPos = &buf.data[0];
     const UA_Byte *bufEnd = &buf.data[size+1];
     // when
@@ -287,7 +287,7 @@ START_TEST(UA_Byte_Min_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Byte_delete(src);
 }
 END_TEST
@@ -360,7 +360,7 @@ START_TEST(UA_SByte_Min_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "-128";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_SByte_delete(src);
 }
 END_TEST
@@ -385,7 +385,7 @@ START_TEST(UA_SByte_Zero_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_SByte_delete(src);
 }
 END_TEST
@@ -407,7 +407,7 @@ START_TEST(UA_SByte_smallbuf_Number_json_encode) {
     *bufPos = 0;
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_SByte_delete(src);
 }
 END_TEST
@@ -459,7 +459,7 @@ START_TEST(UA_UInt16_Min_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_UInt16_delete(src);
 }
 END_TEST
@@ -481,7 +481,7 @@ START_TEST(UA_UInt16_smallbuf_Number_json_encode) {
     *bufPos = 0;
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_UInt16_delete(src);
 }
 END_TEST
@@ -532,7 +532,7 @@ START_TEST(UA_Int16_Min_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "-32768";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Int16_delete(src);
 }
 END_TEST
@@ -607,7 +607,7 @@ START_TEST(UA_UInt32_Max_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "4294967295";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_UInt32_delete(src);
 }
 END_TEST
@@ -752,7 +752,7 @@ START_TEST(UA_Int32_smallbuf_Number_json_encode) {
     *bufPos = 0;
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Int32_delete(src);
 }
 END_TEST
@@ -844,7 +844,7 @@ START_TEST(UA_UInt64_smallbuf_Number_json_encode) {
     *bufPos = 0;
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_UInt64_delete(src);
 }
 END_TEST
@@ -862,7 +862,7 @@ START_TEST(UA_Int64_Max_Number_json_encode) {
     ((u8*)src)[5] = 0xFF;
     ((u8*)src)[6] = 0xFF;
     ((u8*)src)[7] = 0x7F;
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
     UA_ByteString buf;
@@ -879,7 +879,7 @@ START_TEST(UA_Int64_Max_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"9223372036854775807\"";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Int64_delete(src);
 }
 END_TEST
@@ -887,10 +887,10 @@ END_TEST
 START_TEST(UA_Int64_Min_Number_json_encode) {
 
     UA_Int64 *src = UA_Int64_new();
-    
+
     // TODO: compiler error: integer constant is so large that it is unsigned [-Werror]
     //*src = -9223372036854775808;
-  
+
     ((u8*)src)[0] = 0x00;
     ((u8*)src)[1] = 0x00;
     ((u8*)src)[2] = 0x00;
@@ -899,8 +899,8 @@ START_TEST(UA_Int64_Min_Number_json_encode) {
     ((u8*)src)[5] = 0x00;
     ((u8*)src)[6] = 0x00;
     ((u8*)src)[7] = 0x80;
-    
-    
+
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
     UA_ByteString buf;
@@ -917,7 +917,7 @@ START_TEST(UA_Int64_Min_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"-9223372036854775808\"";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Int64_delete(src);
 }
 END_TEST
@@ -942,7 +942,7 @@ START_TEST(UA_Int64_Zero_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"0\"";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Int64_delete(src);
 }
 END_TEST
@@ -965,7 +965,7 @@ START_TEST(UA_Int64_smallbuf_Number_json_encode) {
     *bufPos = 0;
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Int64_delete(src);
 }
 END_TEST
@@ -985,7 +985,7 @@ START_TEST(UA_Double_json_encode) {
     status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "1.1233999999999999541699935434735380113124847412109375";
@@ -1008,7 +1008,7 @@ START_TEST(UA_Double_pluszero_json_encode) {
     status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
@@ -1031,7 +1031,7 @@ START_TEST(UA_Double_minuszero_json_encode) {
     status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
@@ -1054,7 +1054,7 @@ START_TEST(UA_Double_plusInf_json_encode) {
     status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"Infinity\"";
@@ -1079,7 +1079,7 @@ START_TEST(UA_Double_minusInf_json_encode) {
     status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"-Infinity\"";
@@ -1102,7 +1102,7 @@ START_TEST(UA_Double_nan_json_encode) {
     status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"NaN\"";
@@ -1125,7 +1125,7 @@ START_TEST(UA_Double_onesmallest_json_encode) {
     status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "1.0000000000000002220446049250313080847263336181640625";
@@ -1148,7 +1148,7 @@ START_TEST(UA_Float_json_encode) {
     status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "1";
@@ -1182,7 +1182,7 @@ START_TEST(UA_LocText_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Locale\":\"theLocale\",\"Text\":\"theText\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_LocalizedText_delete(src);
 }
 END_TEST
@@ -1210,7 +1210,7 @@ START_TEST(UA_LocText_NonReversible_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"theText\"";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_LocalizedText_delete(src);
 }
 END_TEST
@@ -1302,7 +1302,7 @@ START_TEST(UA_DateTime_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"1970-01-15T06:56:07Z\"";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_DateTime_delete(src);
 }
 END_TEST
@@ -1325,7 +1325,7 @@ START_TEST(UA_DateTime_json_encode_null) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"1601-01-01T00:00:00Z\"";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
 }
 END_TEST
 
@@ -1369,7 +1369,7 @@ START_TEST(UA_StatusCode_json_encode) {
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
      *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "2161770496";
@@ -1394,12 +1394,12 @@ START_TEST(UA_StatusCode_nonReversible_json_encode) {
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
 
      *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Code\":2161770496,\"Symbol\":\"BadAggregateConfigurationRejected\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_StatusCode_delete(src);
 }
 END_TEST
@@ -1419,12 +1419,12 @@ START_TEST(UA_StatusCode_nonReversible_good_json_encode) {
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
 
      *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Code\":0,\"Symbol\":\"Good\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_StatusCode_delete(src);
 }
 END_TEST
@@ -1444,7 +1444,7 @@ START_TEST(UA_StatusCode_smallbuf_json_encode) {
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_StatusCode_delete(src);
 }
 END_TEST
@@ -1496,7 +1496,7 @@ START_TEST(UA_NodeId_Numeric_Namespace_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Id\":5555,\"Namespace\":4}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
 }
 END_TEST
@@ -1521,7 +1521,7 @@ START_TEST(UA_NodeId_String_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"foobar\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
 }
 END_TEST
@@ -1545,7 +1545,7 @@ START_TEST(UA_NodeId_String_Namespace_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"foobar\",\"Namespace\":5}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
 }
 END_TEST
@@ -1572,7 +1572,7 @@ START_TEST(UA_NodeId_Guid_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":2,\"Id\":\"00000003-0009-000A-0807-060504030201\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
 }
 END_TEST
@@ -1587,7 +1587,7 @@ START_TEST(UA_NodeId_Guid_Namespace_json_encode) {
 
     // {"IdType":2,"Id":"00000003-0009-000A-0807-060504030201","Namespace":5}
     ck_assert_int_eq(size, 70);
-    
+
     UA_ByteString_allocBuffer(&buf, size+1);
 
     UA_Byte *bufPos = &buf.data[0];
@@ -1600,7 +1600,7 @@ START_TEST(UA_NodeId_Guid_Namespace_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":2,\"Id\":\"00000003-0009-000A-0807-060504030201\",\"Namespace\":5}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
 }
 END_TEST
@@ -1620,7 +1620,7 @@ START_TEST(UA_NodeId_ByteString_json_encode) {
 
     //{"IdType":3,"Id":"YXNkZmFzZGY="}
     ck_assert_int_eq(size, 32);
-    
+
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
@@ -1628,7 +1628,7 @@ START_TEST(UA_NodeId_ByteString_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":3,\"Id\":\"YXNkZmFzZGY=\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
 }
 END_TEST
@@ -1652,7 +1652,7 @@ START_TEST(UA_NodeId_ByteString_Namespace_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":3,\"Id\":\"YXNkZmFzZGY=\",\"Namespace\":5}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
 }
 END_TEST
@@ -1662,7 +1662,7 @@ START_TEST(UA_NodeId_NonReversible_Numeric_Namespace_json_encode) {
     UA_NodeId *src = UA_NodeId_new();
     *src = UA_NODEID_NUMERIC(2, 5555);
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    
+
     UA_String namespaces[3] = {UA_STRING("ns0"),UA_STRING("ns1"),UA_STRING("ns2")};
     size_t size = UA_calcSizeJsonInternal((void *) src, type, namespaces, 3, NULL, 0, false);
     ck_assert_int_ne(size, 0);
@@ -1681,7 +1681,7 @@ START_TEST(UA_NodeId_NonReversible_Numeric_Namespace_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Id\":5555,\"Namespace\":\"ns2\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
 }
 END_TEST
@@ -1772,7 +1772,7 @@ START_TEST(UA_DiagInfo_withInner_json_encode) {
 
     //{"SymbolicId":13,"LocalizedText":14,"Locale":12,"AdditionalInfo":"additionalInfo","InnerStatusCode":2155216896,"InnerDiagnosticInfo":{"AdditionalInfo":"INNER ADDITION INFO"}}
     ck_assert_int_eq(size, 174);
-    
+
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
@@ -1780,13 +1780,13 @@ START_TEST(UA_DiagInfo_withInner_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896,\"InnerDiagnosticInfo\":{\"AdditionalInfo\":\"INNER ADDITION INFO\"}}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
 }
 END_TEST
 
 START_TEST(UA_DiagInfo_withTwoInner_json_encode) {
-    
+
     UA_DiagnosticInfo *innerDiag2 = UA_DiagnosticInfo_new();
     UA_DiagnosticInfo_init(innerDiag2);
     innerDiag2->hasAdditionalInfo = true;
@@ -1797,7 +1797,7 @@ START_TEST(UA_DiagInfo_withTwoInner_json_encode) {
     innerDiag2->hasSymbolicId = false;
     innerDiag2->hasLocalizedText = false;
     innerDiag2->hasNamespaceUri = false;
-    
+
     UA_DiagnosticInfo *innerDiag = UA_DiagnosticInfo_new();
     UA_DiagnosticInfo_init(innerDiag);
     innerDiag->hasAdditionalInfo = true;
@@ -1812,7 +1812,7 @@ START_TEST(UA_DiagInfo_withTwoInner_json_encode) {
 
     UA_DiagnosticInfo *src = UA_DiagnosticInfo_new();
     UA_DiagnosticInfo_init(src);
-    
+
     src->hasAdditionalInfo = true;
     src->hasInnerDiagnosticInfo = true;
     src->hasInnerStatusCode = true;
@@ -1846,7 +1846,7 @@ START_TEST(UA_DiagInfo_withTwoInner_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896,\"InnerDiagnosticInfo\":{\"AdditionalInfo\":\"INNER ADDITION INFO\",\"InnerDiagnosticInfo\":{\"AdditionalInfo\":\"INNER ADDITION INFO2\"}}}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
 }
 END_TEST
@@ -1870,7 +1870,7 @@ START_TEST(UA_DiagInfo_noFields_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
 }
 END_TEST
@@ -1895,7 +1895,7 @@ START_TEST(UA_DiagInfo_smallBuffer_json_encode) {
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DIAGNOSTICINFO];
 
-    
+
     UA_ByteString buf;
 
     UA_ByteString_allocBuffer(&buf, 2);
@@ -1907,7 +1907,7 @@ START_TEST(UA_DiagInfo_smallBuffer_json_encode) {
 
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
 }
 END_TEST
@@ -1953,14 +1953,14 @@ START_TEST(UA_ByteString2_json_encode) {
 
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
-    
+
     //s = UA_decodeJsonInternal()
     *bufPos = 0;
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4=\"";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_ByteString_delete(src);
 }
 END_TEST
@@ -2023,7 +2023,7 @@ START_TEST(UA_QualName_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Name\":\"derName\",\"Uri\":1}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_QualifiedName_delete(src);
 }
 END_TEST
@@ -2051,7 +2051,7 @@ START_TEST(UA_QualName_NonReversible_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Name\":\"derName\",\"Uri\":1}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_QualifiedName_delete(src);
 }
 END_TEST
@@ -2079,7 +2079,7 @@ START_TEST(UA_QualName_NonReversible_Namespace_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Name\":\"derName\",\"Uri\":\"ns2\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_QualifiedName_delete(src);
 }
 END_TEST
@@ -2105,7 +2105,7 @@ START_TEST(UA_QualName_NonReversible_NoNamespaceAsNumber_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Name\":\"derName\",\"Uri\":6789}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_QualifiedName_delete(src);
 }
 END_TEST
@@ -2116,7 +2116,7 @@ END_TEST
 START_TEST(UA_Variant_Bool_json_encode) {
     UA_Variant *src = UA_Variant_new();
     UA_Variant_init(src);
-    
+
     UA_Boolean *variantContent = UA_Boolean_new();
     *variantContent = true;
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_BOOLEAN]);
@@ -2137,7 +2137,7 @@ START_TEST(UA_Variant_Bool_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":1,\"Body\":true}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
 }
 END_TEST
@@ -2165,7 +2165,7 @@ START_TEST(UA_Variant_Number_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":9,\"Body\":\"345634563456\"}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
 }
 END_TEST
@@ -2417,7 +2417,7 @@ START_TEST(UA_Variant_NodeId_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":17,\"Body\":{\"IdType\":1,\"Id\":\"theID\",\"Namespace\":1}}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
 }
 END_TEST
@@ -2458,7 +2458,7 @@ START_TEST(UA_Variant_QualName_json_encode) {
     UA_QualifiedName_init(&variantContent);
     variantContent.name = UA_STRING("derName");
     variantContent.namespaceIndex = 1;
-    
+
     UA_Variant_setScalarCopy(src, &variantContent, &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
@@ -2473,12 +2473,12 @@ START_TEST(UA_Variant_QualName_json_encode) {
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":20,\"Body\":{\"Name\":\"derName\",\"Uri\":1}}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
 }
 END_TEST
@@ -2490,7 +2490,7 @@ START_TEST(UA_Variant_Array_UInt16_json_encode) {
     UA_Variant_init(src);
     UA_UInt16 zero[2] = {42,43};
     UA_Variant_setArrayCopy(src, zero, 2, &UA_TYPES[UA_TYPES_UINT16]);
-   
+
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
@@ -2502,7 +2502,7 @@ START_TEST(UA_Variant_Array_UInt16_json_encode) {
     const UA_Byte *bufEnd = &buf.data[size+1];
 
     ck_assert_int_eq(size, 25);
-    
+
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
@@ -2548,7 +2548,7 @@ START_TEST(UA_Variant_Array_Byte_json_encode) {
     UA_Variant_init(src);
     UA_Byte zero[2] = {42,43};
     UA_Variant_setArrayCopy(src, zero, 2, &UA_TYPES[UA_TYPES_BYTE]);
-   
+
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
@@ -2576,7 +2576,7 @@ START_TEST(UA_Variant_Array_String_json_encode) {
     UA_Variant_init(src);
     UA_String zero[2] = {UA_STRING("eins"),UA_STRING("zwei")};
     UA_Variant_setArrayCopy(src, zero, 2, &UA_TYPES[UA_TYPES_STRING]);
-   
+
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
@@ -2590,7 +2590,7 @@ START_TEST(UA_Variant_Array_String_json_encode) {
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
-    
+
     // then
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":12,\"Body\":[\"eins\",\"zwei\"]}";
@@ -2615,7 +2615,7 @@ START_TEST(UA_Variant_Matrix_UInt16_json_encode) {
     src.arrayDimensionsSize = 2;
     src.arrayDimensions[0] = 3;
     src.arrayDimensions[1] = 3;
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
     UA_ByteString buf;
@@ -2628,7 +2628,7 @@ START_TEST(UA_Variant_Matrix_UInt16_json_encode) {
     //{"Type":5,"Body":[1,2,3,4,5,6,7,8,9],"Dimension":[3,3]}
     size_t sizeOfBytes = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
     ck_assert_int_eq(sizeOfBytes, 55);
-    
+
     status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
     *bufPos = 0;
@@ -2665,7 +2665,7 @@ START_TEST(UA_Variant_StatusCode_NonReversible_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Body\":{\"Code\":2161770496,\"Symbol\":\"BadAggregateConfigurationRejected\"}}";
     ck_assert_str_eq(result, (char*)buf.data);
-    UA_ByteString_clear(&buf); 
+    UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
 }
 END_TEST
@@ -2683,7 +2683,7 @@ START_TEST(UA_Variant_Array_String_NonReversible_json_encode) {
     src.arrayDimensions = (UA_UInt32 *)UA_Array_new(4, &UA_TYPES[UA_TYPES_UINT32]);
     src.arrayDimensionsSize = 1;
     src.arrayDimensions[0] = 8;
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
     UA_ByteString buf;
@@ -2720,7 +2720,7 @@ START_TEST(UA_Variant_Matrix_String_NonReversible_json_encode) {
     src.arrayDimensions[1] = 2;
     src.arrayDimensions[2] = 2;
     src.arrayDimensions[3] = 1;
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
     UA_ByteString buf;
@@ -2733,7 +2733,7 @@ START_TEST(UA_Variant_Matrix_String_NonReversible_json_encode) {
     //{"Body":[[[["1"],["2"]],[["3"],["4"]]],[[["5"],["6"]],[["7"],["8"]]]]}
     size_t sizeOfBytes = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
     ck_assert_int_eq(sizeOfBytes, 70);
-    
+
     status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
 
     *bufPos = 0;
@@ -2758,7 +2758,7 @@ START_TEST(UA_Variant_Matrix_NodeId_NonReversible_json_encode) {
     src.arrayDimensions[1] = 2;
     src.arrayDimensions[2] = 2;
     src.arrayDimensions[3] = 1;
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
     UA_ByteString buf;
@@ -2790,7 +2790,7 @@ START_TEST(UA_Variant_Wrap_json_encode) {
     variantContent.timestamp = srvts;
     variantContent.viewVersion = 1236;
     variantContent.viewId = UA_NODEID_NUMERIC(0,99999);
-    
+
     UA_Variant_setScalarCopy(src, &variantContent, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
@@ -2820,20 +2820,20 @@ START_TEST(UA_Variant_Wrap_Array_json_encode) {
     //src.arrayDimensions = (UA_UInt32 *)UA_Array_new(1, &UA_TYPES[UA_TYPES_UINT32]);
     //src.arrayDimensionsSize = 1;
     //src.arrayDimensions[0] = 2;
-    
+
     UA_ViewDescription variantContent1;
     UA_DateTime srvts1 = UA_DateTime_fromUnixTime(1234567);
     variantContent1.timestamp = srvts1;
     variantContent1.viewVersion = 1;
     variantContent1.viewId = UA_NODEID_NUMERIC(0,1);
-    
+
     UA_ViewDescription variantContent2;
     UA_DateTime srvts2 = UA_DateTime_fromUnixTime(1234567);
     variantContent2.timestamp = srvts2;
     variantContent2.viewVersion = 2;
     variantContent2.viewId = UA_NODEID_NUMERIC(0,2);
-    
-    
+
+
     UA_ViewDescription d[2] = {variantContent1, variantContent2};
     UA_Variant_setArrayCopy(&src, d, 2, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 
@@ -2865,20 +2865,20 @@ START_TEST(UA_Variant_Wrap_Array_NonReversible_json_encode) {
     //src.arrayDimensions = (UA_UInt32 *)UA_Array_new(1, &UA_TYPES[UA_TYPES_UINT32]);
     //src.arrayDimensionsSize = 1;
     //src.arrayDimensions[0] = 2;
-    
+
     UA_ViewDescription variantContent1;
     UA_DateTime srvts1 = UA_DateTime_fromUnixTime(1234567);
     variantContent1.timestamp = srvts1;
     variantContent1.viewVersion = 1;
     variantContent1.viewId = UA_NODEID_NUMERIC(1,1);
-    
+
     UA_ViewDescription variantContent2;
     UA_DateTime srvts2 = UA_DateTime_fromUnixTime(1234567);
     variantContent2.timestamp = srvts2;
     variantContent2.viewVersion = 2;
     variantContent2.viewId = UA_NODEID_NUMERIC(1,2);
-    
-    
+
+
     UA_ViewDescription d[2] = {variantContent1, variantContent2};
     UA_Variant_setArrayCopy(&src, d, 2, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 
@@ -3092,7 +3092,7 @@ START_TEST(UA_ExpandedNodeId_NonReversible_Ns1_json_encode) {
     src->namespaceUri = UA_STRING_NULL;
     src->serverIndex = 1;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
-    
+
     UA_String serverUris[3] = {UA_STRING("uri0"),UA_STRING("uri1"),UA_STRING("uri2")};
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, serverUris, 3, false);
     UA_ByteString buf;
@@ -3102,7 +3102,7 @@ START_TEST(UA_ExpandedNodeId_NonReversible_Ns1_json_encode) {
     UA_Byte *bufPos = &buf.data[0];
     const UA_Byte *bufEnd = &buf.data[size+1];
 
-    
+
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, serverUris, 3, false);
 
     *bufPos = 0;
@@ -3122,10 +3122,10 @@ START_TEST(UA_ExpandedNodeId_NonReversible_Namespace_json_encode) {
     src->namespaceUri = UA_STRING_NULL;
     src->serverIndex = 1;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
-    
+
     UA_String namespaces[3] = {UA_STRING("ns0"),UA_STRING("ns1"),UA_STRING("ns2")};
     UA_String serverUris[3] = {UA_STRING("uri0"),UA_STRING("uri1"),UA_STRING("uri2")};
-    
+
     size_t size = UA_calcSizeJsonInternal((void *) src, type, namespaces, 3, serverUris, 3, false);
     UA_ByteString buf;
 
@@ -3153,11 +3153,11 @@ START_TEST(UA_ExpandedNodeId_NonReversible_NamespaceUriGiven_json_encode) {
     *src = UA_EXPANDEDNODEID_STRING_ALLOC(2, "testtestTest");
     src->namespaceUri = UA_STRING_ALLOC("NamespaceUri");
     src->serverIndex = 1;
-    
+
     UA_String namespaces[3] = {UA_STRING("ns0"),UA_STRING("ns1"),UA_STRING("ns2")};
     UA_String serverUris[3] = {UA_STRING("uri0"),UA_STRING("uri1"),UA_STRING("uri2")};
-    
-    
+
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
     size_t size = UA_calcSizeJsonInternal((void *) src, type, namespaces, 3, serverUris, 3, false);
     UA_ByteString buf;
@@ -3197,7 +3197,7 @@ START_TEST(UA_DataValue_json_encode) {
     src->serverTimestamp = srvts;
     src->sourcePicoseconds = 5678;
     src->serverPicoseconds = 6789;
-    
+
     UA_Variant variant;
     UA_Variant_init(&variant);
     UA_Boolean variantContent = true;
@@ -3229,7 +3229,7 @@ END_TEST
 START_TEST(UA_DataValue_null_json_encode) {
     UA_DataValue *src = UA_DataValue_new();
     UA_DataValue_init(src);
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DATAVALUE];
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
     UA_ByteString buf;
@@ -3263,12 +3263,12 @@ START_TEST(UA_MessageReadResponse_json_encode) {
     innerDiag.hasSymbolicId = false;
     innerDiag.hasLocalizedText = false;
     innerDiag.hasNamespaceUri = false;
-    
+
     UA_DiagnosticInfo *info = (UA_DiagnosticInfo*)UA_calloc(1, sizeof(UA_DiagnosticInfo));
     info[0] = innerDiag;
     src.diagnosticInfos = info;
     src.diagnosticInfosSize = 1;
-    
+
     UA_DataValue dv;
     UA_DataValue_init(&dv);
     dv.hasServerTimestamp = true;
@@ -3283,8 +3283,8 @@ START_TEST(UA_MessageReadResponse_json_encode) {
     dv.serverTimestamp = srvts;
     dv.sourcePicoseconds = 0;
     dv.serverPicoseconds = 0;
-    
-    
+
+
     UA_Variant variant;
     UA_Variant_init(&variant);
     UA_Boolean variantContent = true;
@@ -3292,21 +3292,21 @@ START_TEST(UA_MessageReadResponse_json_encode) {
     dv.value = variant;
 
     dv.status = UA_STATUSCODE_BADAPPLICATIONSIGNATUREINVALID;
-    
+
     UA_DataValue *values = (UA_DataValue*)UA_calloc(1, sizeof(UA_DataValue));
     values[0] = dv;
     src.results = values;
     src.resultsSize = 1;
-    
-    
+
+
     UA_ResponseHeader rh;
     UA_ResponseHeader_init(&rh);
     rh.stringTableSize = 0;
     rh.requestHandle = 123123;
     rh.serviceResult = UA_STATUSCODE_GOOD;
     rh.timestamp = UA_DateTime_fromUnixTime(1234567);
-    
-    
+
+
     UA_DiagnosticInfo serverDiag;
     UA_DiagnosticInfo_init(&serverDiag);
     serverDiag.hasAdditionalInfo = true;
@@ -3318,8 +3318,8 @@ START_TEST(UA_MessageReadResponse_json_encode) {
     serverDiag.hasLocalizedText = false;
     serverDiag.hasNamespaceUri = false;
     rh.serviceDiagnostics = serverDiag;
-    
-    
+
+
     UA_ExtensionObject e;
     UA_ExtensionObject_init(&e);
     e.encoding = UA_EXTENSIONOBJECT_DECODED_NODELETE;
@@ -3327,11 +3327,11 @@ START_TEST(UA_MessageReadResponse_json_encode) {
 
     UA_Boolean b = false;
     e.content.decoded.data = &b;
-    
+
     rh.additionalHeader = e;
-            
+
     src.responseHeader = rh;
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_READRESPONSE];
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
     UA_ByteString buf;
@@ -3360,7 +3360,7 @@ START_TEST(UA_ViewDescription_json_encode) {
     src.timestamp = srvts;
     src.viewVersion = 1236;
     src.viewId = UA_NODEID_NUMERIC(0,99999);
-    
+
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VIEWDESCRIPTION];
     size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
     UA_ByteString buf;
@@ -3385,7 +3385,7 @@ END_TEST
 START_TEST(UA_WriteRequest_json_encode) {
     UA_WriteRequest src;
     UA_WriteRequest_init(&src);
-    
+
     UA_RequestHeader rh;
     rh.returnDiagnostics = 1;
     rh.auditEntryId = UA_STRING_ALLOC("Auditentryid");
@@ -3393,7 +3393,7 @@ START_TEST(UA_WriteRequest_json_encode) {
     rh.authenticationToken = UA_NODEID_STRING_ALLOC(0,"authToken");
     rh.timestamp = UA_DateTime_fromUnixTime(1234567);
     rh.timeoutHint = 120;
-    
+
     UA_ExtensionObject e;
     UA_ExtensionObject_init(&e);
     e.encoding = UA_EXTENSIONOBJECT_DECODED_NODELETE;
@@ -3401,11 +3401,11 @@ START_TEST(UA_WriteRequest_json_encode) {
 
     UA_Boolean b = false;
     e.content.decoded.data = &b;
-    
+
     rh.additionalHeader = e;
-   
-    
-    
+
+
+
     UA_DataValue dv;
     UA_DataValue_init(&dv);
     dv.hasServerTimestamp = true;
@@ -3418,7 +3418,7 @@ START_TEST(UA_WriteRequest_json_encode) {
 
     dv.sourceTimestamp = srcts;
     dv.serverTimestamp = srvts;
-    
+
     UA_Variant variant;
     UA_Variant_init(&variant);
     UA_Boolean variantContent = true;
@@ -3426,7 +3426,7 @@ START_TEST(UA_WriteRequest_json_encode) {
     dv.value = variant;
 
     dv.status = UA_STATUSCODE_BADAPPLICATIONSIGNATUREINVALID;
-    
+
     UA_DataValue dv2;
     UA_DataValue_init(&dv2);
     dv2.hasServerTimestamp = true;
@@ -3441,7 +3441,7 @@ START_TEST(UA_WriteRequest_json_encode) {
     dv2.serverTimestamp = srvts2;
     dv2.sourcePicoseconds = 0;
     dv2.serverPicoseconds = 0;
-    
+
     UA_Variant variant2;
     UA_Variant_init(&variant2);
     UA_Boolean variantContent2 = true;
@@ -3449,25 +3449,25 @@ START_TEST(UA_WriteRequest_json_encode) {
     dv2.value = variant2;
 
     dv2.status = UA_STATUSCODE_BADAPPLICATIONSIGNATUREINVALID;
-    
+
     UA_WriteValue value;
     UA_WriteValue_init(&value);
     value.value = dv;
     value.attributeId = 12;
     value.indexRange = UA_STRING_ALLOC("BLOAB");
     value.nodeId = UA_NODEID_STRING_ALLOC(0, "a1111");
-    
+
     UA_WriteValue value2;
     UA_WriteValue_init(&value2);
     value2.value = dv2;
     value2.attributeId = 12;
     value2.indexRange = UA_STRING_ALLOC("BLOAB");
     value2.nodeId = UA_NODEID_STRING_ALLOC(0, "a2222");
-    
+
     UA_WriteValue *values = (UA_WriteValue*)UA_calloc(2,sizeof(UA_WriteValue));
     values[0] = value;
     values[1] = value2;
-    
+
     src.nodesToWrite = values;
     src.nodesToWriteSize = 2;
     src.requestHeader = rh;
@@ -3549,13 +3549,13 @@ START_TEST(UA_Byte_Min_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":3,\"Body\":0}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BYTE);
     ck_assert_uint_eq(*((UA_Byte*)out.data), 0);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3565,13 +3565,13 @@ START_TEST(UA_Byte_Max_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":3,\"Body\":255}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BYTE);
     ck_assert_uint_eq(*((UA_Byte*)out.data), 255);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3583,13 +3583,13 @@ START_TEST(UA_UInt16_Min_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":5,\"Body\":0}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT16);
     ck_assert_uint_eq(*((UA_UInt16*)out.data), 0);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3599,13 +3599,13 @@ START_TEST(UA_UInt16_Max_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":5,\"Body\":65535}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT16);
     ck_assert_uint_eq(*((UA_UInt16*)out.data), 65535);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3616,13 +3616,13 @@ START_TEST(UA_UInt32_Min_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":7,\"Body\":0}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT32);
     ck_assert_uint_eq(*((UA_UInt32*)out.data), 0);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3632,13 +3632,13 @@ START_TEST(UA_UInt32_Max_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":7,\"Body\":4294967295}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT32);
     ck_assert_uint_eq(*((UA_UInt32*)out.data), 4294967295);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3649,11 +3649,11 @@ START_TEST(UA_UInt64_Min_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":9,\"Body\":\"0\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT64);    
+    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT64);
     ck_assert_int_eq(((u8*)(out.data))[0], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x00);
@@ -3662,7 +3662,7 @@ START_TEST(UA_UInt64_Min_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[6], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x00);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3672,7 +3672,7 @@ START_TEST(UA_UInt64_Max_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":9,\"Body\":\"18446744073709551615\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -3685,7 +3685,7 @@ START_TEST(UA_UInt64_Max_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0xFF);
     ck_assert_int_eq(((u8*)(out.data))[6], 0xFF);
     ck_assert_int_eq(((u8*)(out.data))[7], 0xFF);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3709,13 +3709,13 @@ START_TEST(UA_SByte_Min_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":2,\"Body\":-128}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_SBYTE);
     ck_assert_int_eq(*((UA_SByte*)out.data), -128);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3725,13 +3725,13 @@ START_TEST(UA_SByte_Max_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":2,\"Body\":127}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_SBYTE);
     ck_assert_int_eq(*((UA_SByte*)out.data), 127);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3742,13 +3742,13 @@ START_TEST(UA_Int16_Min_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":4,\"Body\":-32768}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT16);
     ck_assert_int_eq(*((UA_Int16*)out.data), -32768);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3758,13 +3758,13 @@ START_TEST(UA_Int16_Max_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":4,\"Body\":32767}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT16);
     ck_assert_int_eq(*((UA_Int16*)out.data), 32767);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3775,13 +3775,13 @@ START_TEST(UA_Int32_Min_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":6,\"Body\":-2147483648}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT32);
     ck_assert(*(UA_Int32*)out.data == -2147483648);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3791,13 +3791,13 @@ START_TEST(UA_Int32_Max_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":6,\"Body\":2147483647}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT32);
     ck_assert_int_eq(*((UA_Int32*)out.data), 2147483647);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3808,11 +3808,11 @@ START_TEST(UA_Int64_Min_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":8,\"Body\":\"-9223372036854775808\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT64);    
+    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT64);
     ck_assert_int_eq(((u8*)(out.data))[0], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x00);
@@ -3821,7 +3821,7 @@ START_TEST(UA_Int64_Min_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[6], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x80);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3832,11 +3832,11 @@ START_TEST(UA_Int64_Max_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":8,\"Body\":\"9223372036854775807\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT64);    
+    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT64);
     ck_assert_int_eq(((u8*)(out.data))[0], 0xFF);
     ck_assert_int_eq(((u8*)(out.data))[1], 0xFF);
     ck_assert_int_eq(((u8*)(out.data))[2], 0xFF);
@@ -3845,7 +3845,7 @@ START_TEST(UA_Int64_Max_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0xFF);
     ck_assert_int_eq(((u8*)(out.data))[6], 0xFF);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x7F);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -3898,7 +3898,7 @@ START_TEST(UA_Float_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":10,\"Body\":3.1415927410}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     //0 10000000 10010010000111111011011 = 40 49 0f db
@@ -3916,7 +3916,7 @@ START_TEST(UA_Float_json_one_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":10,\"Body\":1}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     //0 01111111 00000000000000000000000 = 3f80 0000
@@ -3925,7 +3925,7 @@ START_TEST(UA_Float_json_one_decode) {
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x80);
     ck_assert_int_eq(((u8*)(out.data))[3], 0x3f);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4017,10 +4017,10 @@ START_TEST(UA_Double_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":1.1234}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);   
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)(out.data))[0], 0xef);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x38);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x45);
@@ -4029,7 +4029,7 @@ START_TEST(UA_Double_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0xf9);
     ck_assert_int_eq(((u8*)(out.data))[6], 0xf1);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x3f);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4054,12 +4054,12 @@ START_TEST(UA_Double_one_json_decode) {
     //UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":1}");
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":1}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     // 0 01111111111 0000000000000000000000000000000000000000000000000000
     // 3FF0000000000000
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);       
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)(out.data))[0], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x00);
@@ -4068,7 +4068,7 @@ START_TEST(UA_Double_one_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[6], 0xF0);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x3F);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4079,12 +4079,12 @@ START_TEST(UA_Double_onepointsmallest_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":1.0000000000000002}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     // 0 01111111111 0000000000000000000000000000000000000000000000000001
     // 3FF0000000000001
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);       
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)(out.data))[0], 0x01);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x00);
@@ -4093,7 +4093,7 @@ START_TEST(UA_Double_onepointsmallest_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[6], 0xF0);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x3F);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4103,7 +4103,7 @@ START_TEST(UA_Double_nan_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":\"NaN\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4133,11 +4133,11 @@ START_TEST(UA_Double_inf_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":\"Infinity\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     // 0 111 1111 1111 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);       
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)(out.data))[0], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x00);
@@ -4146,7 +4146,7 @@ START_TEST(UA_Double_inf_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[6], 0xF0);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x7F);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4156,11 +4156,11 @@ START_TEST(UA_Double_neginf_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":\"-Infinity\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     // 1 111 1111 1111 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);       
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)(out.data))[0], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x00);
@@ -4169,7 +4169,7 @@ START_TEST(UA_Double_neginf_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[6], 0xF0);
     ck_assert_int_eq(((u8*)(out.data))[7], 0xFF);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4179,11 +4179,11 @@ START_TEST(UA_Double_zero_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":0}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     // 0 000 0000 0000 0000 0000 0000 00000000 00000000 00000000 00000000 00000000
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);       
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)(out.data))[0], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x00);
@@ -4192,7 +4192,7 @@ START_TEST(UA_Double_zero_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[6], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x00);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4202,11 +4202,11 @@ START_TEST(UA_Double_negzero_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":-0}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     // 1 000 0000 0000 0000 00000000 00000000 00000000 00000000 00000000 00000000
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);       
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)(out.data))[0], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[1], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[2], 0x00);
@@ -4215,17 +4215,17 @@ START_TEST(UA_Double_negzero_json_decode) {
     ck_assert_int_eq(((u8*)(out.data))[5], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[6], 0x00);
     ck_assert_int_eq(((u8*)(out.data))[7], 0x80);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
 
-START_TEST(UA_String_json_decode) { 
+START_TEST(UA_String_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"abcdef\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4237,7 +4237,7 @@ START_TEST(UA_String_json_decode) {
     ck_assert_int_eq(((UA_String*)out.data)->data[3], 'd');
     ck_assert_int_eq(((UA_String*)out.data)->data[4], 'e');
     ck_assert_int_eq(((UA_String*)out.data)->data[5], 'f');
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4259,12 +4259,12 @@ START_TEST(UA_String_empty_json_decode) {
 }
 END_TEST
 
-START_TEST(UA_String_unescapeBS_json_decode) { 
+START_TEST(UA_String_unescapeBS_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"ab\\tcdef\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4277,35 +4277,35 @@ START_TEST(UA_String_unescapeBS_json_decode) {
     ck_assert_int_eq(((UA_String*)out.data)->data[4], 'd');
     ck_assert_int_eq(((UA_String*)out.data)->data[5], 'e');
     ck_assert_int_eq(((UA_String*)out.data)->data[6], 'f');
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
 
-START_TEST(UA_String_escape_unicode_json_decode) { 
+START_TEST(UA_String_escape_unicode_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\\u002c\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
     ck_assert_int_eq(  ((UA_String*)out.data)->length, 1);
     ck_assert_int_eq( ((UA_String*)out.data)->data[0], ',');
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
 
 
-START_TEST(UA_String_escape2_json_decode) { 
+START_TEST(UA_String_escape2_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\\b\\th\\\"e\\fl\\nl\\\\o\\r\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4323,18 +4323,18 @@ START_TEST(UA_String_escape2_json_decode) {
     ck_assert_int_eq( ((UA_String*)out.data)->data[9], '\\');
     ck_assert_int_eq( ((UA_String*)out.data)->data[10], 'o');
     ck_assert_int_eq( ((UA_String*)out.data)->data[11], '\r');
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
 
 
-START_TEST(UA_String_surrogatePair_json_decode) { 
+START_TEST(UA_String_surrogatePair_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\\uD800\\uDC00\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4344,7 +4344,7 @@ START_TEST(UA_String_surrogatePair_json_decode) {
     ck_assert_uint_eq( ((UA_String*)out.data)->data[1], 0x90);
     ck_assert_uint_eq( ((UA_String*)out.data)->data[2], 0x80);
     ck_assert_uint_eq( ((UA_String*)out.data)->data[3], 0x80);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4355,7 +4355,7 @@ START_TEST(UA_ByteString_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":15,\"Body\":\"YXNkZmFzZGY=\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4369,7 +4369,7 @@ START_TEST(UA_ByteString_json_decode) {
     ck_assert_int_eq(((UA_ByteString*)out.data)->data[5], 's');
     ck_assert_int_eq(((UA_ByteString*)out.data)->data[6], 'd');
     ck_assert_int_eq(((UA_ByteString*)out.data)->data[7], 'f');
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4381,7 +4381,7 @@ START_TEST(UA_ByteString_bad_json_decode) {
     UA_ByteString_init(&out);
     UA_ByteString buf = UA_STRING("\"\x90!\xc5 c{\"");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_BYTESTRING]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4407,7 +4407,7 @@ START_TEST(UA_Guid_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000001-0002-0003-0405-060708090A0B\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4423,7 +4423,7 @@ START_TEST(UA_Guid_json_decode) {
     ck_assert_int_eq(((UA_Guid*)out.data)->data4[5], 9);
     ck_assert_int_eq(((UA_Guid*)out.data)->data4[6], 10);
     ck_assert_int_eq(((UA_Guid*)out.data)->data4[7], 11);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4460,7 +4460,7 @@ START_TEST(UA_Guid_tooShort_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000001-00\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
@@ -4474,7 +4474,7 @@ START_TEST(UA_Guid_tooLong_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000001-0002-0003-0405-060708090A0B00000001\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
@@ -4488,7 +4488,7 @@ START_TEST(UA_Guid_wrong_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000=01-0002-0003-0405-060708090A0B\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
@@ -4503,13 +4503,13 @@ START_TEST(UA_StatusCode_2_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":19,\"Body\":2}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STATUSCODE);
     ck_assert_uint_eq(*((UA_StatusCode*)out.data), 2);
-    
+
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -4534,7 +4534,7 @@ START_TEST(UA_StatusCode_0_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":19,\"Body\":0}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4552,7 +4552,7 @@ START_TEST(UA_DateTime_json_decode) {
     UA_DateTime_init(&out);
     UA_ByteString buf = UA_STRING("\"1970-01-02T01:02:03.005Z\"");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4566,7 +4566,7 @@ START_TEST(UA_DateTime_json_decode) {
     ck_assert_int_eq(dts.milliSec, 5);
     ck_assert_int_eq(dts.microSec, 0);
     ck_assert_int_eq(dts.nanoSec, 0);
-    
+
     UA_DateTime_clear(&out);
 }
 END_TEST
@@ -4600,7 +4600,7 @@ START_TEST(UA_DateTime_json_decode_negative) {
     UA_DateTime_init(&out);
     UA_ByteString buf = UA_STRING("\"-0050-01-02T01:02:03.005Z\"");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4614,7 +4614,7 @@ START_TEST(UA_DateTime_json_decode_negative) {
     ck_assert_int_eq(dts.milliSec, 5);
     ck_assert_int_eq(dts.microSec, 0);
     ck_assert_int_eq(dts.nanoSec, 0);
-    
+
     UA_DateTime_clear(&out);
 }
 END_TEST
@@ -4699,7 +4699,7 @@ START_TEST(UA_DateTime_micro_json_decode) {
     UA_DateTime_init(&out);
     UA_ByteString buf = UA_STRING("\"1970-01-02T01:02:03.042Z\"");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4713,7 +4713,7 @@ START_TEST(UA_DateTime_micro_json_decode) {
     ck_assert_int_eq(dts.milliSec, 42);
     ck_assert_int_eq(dts.microSec, 0);
     ck_assert_int_eq(dts.nanoSec, 0);
-    
+
     UA_DateTime_clear(&out);
 }
 END_TEST
@@ -4726,7 +4726,7 @@ START_TEST(UA_QualifiedName_json_decode) {
     UA_QualifiedName_init(&out);
     UA_ByteString buf = UA_STRING("{\"Name\":\"derName\",\"Uri\":1}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4734,7 +4734,7 @@ START_TEST(UA_QualifiedName_json_decode) {
     ck_assert_int_eq(out.name.data[1], 'e');
     ck_assert_int_eq(out.name.data[6], 'e');
     ck_assert_int_eq(out.namespaceIndex, 1);
-    
+
     UA_QualifiedName_clear(&out);
 }
 END_TEST
@@ -4756,7 +4756,7 @@ START_TEST(UA_LocalizedText_json_decode) {
     UA_LocalizedText_init(&out);
     UA_ByteString buf = UA_STRING("{\"Locale\":\"t1\",\"Text\":\"t2\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4764,7 +4764,7 @@ START_TEST(UA_LocalizedText_json_decode) {
     ck_assert_int_eq(out.text.data[0], 't');
     ck_assert_int_eq(out.locale.data[1], '1');
     ck_assert_int_eq(out.text.data[1], '2');
-    
+
     UA_LocalizedText_clear(&out);
 }
 END_TEST
@@ -4775,7 +4775,7 @@ START_TEST(UA_LocalizedText_missing_json_decode) {
     UA_LocalizedText_init(&out);
     UA_ByteString buf = UA_STRING("{\"Locale\":\"t1\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4784,7 +4784,7 @@ START_TEST(UA_LocalizedText_missing_json_decode) {
     ck_assert_int_eq(out.locale.data[1], '1');
     ck_assert_ptr_eq(out.text.data, NULL);
     ck_assert_int_eq(out.text.length, 0);
-    
+
     UA_LocalizedText_clear(&out);
 }
 END_TEST
@@ -4807,7 +4807,7 @@ START_TEST(UA_ViewDescription_json_decode) {
     UA_ViewDescription_init(&out);
     UA_ByteString buf = UA_STRING("{\"Timestamp\":\"1970-01-15T06:56:07Z\",\"ViewVersion\":1236,\"ViewId\":{\"Id\":\"00000009-0002-027C-F3BF-BB7BEEFEEFBE\",\"IdType\":2}}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4825,7 +4825,7 @@ START_TEST(UA_ViewDescription_json_decode) {
     ck_assert_int_eq(dts.nanoSec, 0);
     ck_assert_int_eq(out.viewId.identifier.guid.data1, 9);
     ck_assert_int_eq(out.viewId.identifier.guid.data2, 2);
-    
+
     UA_ViewDescription_clear(&out);
 }
 END_TEST
@@ -4839,14 +4839,14 @@ START_TEST(UA_NodeId_Nummeric_json_decode) {
     UA_NodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"Id\":42}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.identifier.numeric, 42);
     ck_assert_int_eq(out.namespaceIndex, 0);
     ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_NUMERIC);
-    
+
     UA_NodeId_clear(&out);
 }
 END_TEST
@@ -4857,14 +4857,14 @@ START_TEST(UA_NodeId_Nummeric_Namespace_json_decode) {
     UA_NodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"Id\":42,\"Namespace\":123}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.identifier.numeric, 42);
     ck_assert_int_eq(out.namespaceIndex, 123);
     ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_NUMERIC);
-    
+
     UA_NodeId_clear(&out);
 }
 END_TEST
@@ -4876,7 +4876,7 @@ START_TEST(UA_NodeId_String_json_decode) {
     UA_NodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test123\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4890,7 +4890,7 @@ START_TEST(UA_NodeId_String_json_decode) {
     ck_assert_int_eq(out.identifier.string.data[6], '3');
     ck_assert_int_eq(out.namespaceIndex, 0);
     ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_STRING);
-    
+
     UA_NodeId_clear(&out);
 }
 END_TEST
@@ -4902,7 +4902,7 @@ START_TEST(UA_NodeId_Guid_json_decode) {
     UA_NodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"IdType\":2,\"Id\":\"00000001-0002-0003-0405-060708090A0B\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4920,7 +4920,7 @@ START_TEST(UA_NodeId_Guid_json_decode) {
     ck_assert_int_eq(out.identifier.guid.data4[5], 9);
     ck_assert_int_eq(out.identifier.guid.data4[6], 10);
     ck_assert_int_eq(out.identifier.guid.data4[7], 11);
-    
+
     UA_NodeId_clear(&out);
 }
 END_TEST
@@ -4931,7 +4931,7 @@ START_TEST(UA_NodeId_ByteString_json_decode) {
     UA_NodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"IdType\":3,\"Id\":\"YXNkZmFzZGY=\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4947,7 +4947,7 @@ START_TEST(UA_NodeId_ByteString_json_decode) {
     ck_assert_int_eq(out.identifier.byteString.data[5], 's');
     ck_assert_int_eq(out.identifier.byteString.data[6], 'd');
     ck_assert_int_eq(out.identifier.byteString.data[7], 'f');
-    
+
     UA_NodeId_clear(&out);
 }
 END_TEST
@@ -4960,7 +4960,7 @@ START_TEST(UA_ExpandedNodeId_Nummeric_json_decode) {
     UA_ExpandedNodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"Id\":42}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4969,7 +4969,7 @@ START_TEST(UA_ExpandedNodeId_Nummeric_json_decode) {
     ck_assert_ptr_eq(out.namespaceUri.data, NULL);
     ck_assert_int_eq(out.namespaceUri.length, 0);
     ck_assert_int_eq(out.serverIndex, 0);
-    
+
     UA_ExpandedNodeId_clear(&out);
 }
 END_TEST
@@ -4980,7 +4980,7 @@ START_TEST(UA_ExpandedNodeId_String_json_decode) {
     UA_ExpandedNodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4990,7 +4990,7 @@ START_TEST(UA_ExpandedNodeId_String_json_decode) {
     ck_assert_ptr_eq(out.namespaceUri.data, NULL);
     ck_assert_int_eq(out.namespaceUri.length, 0);
     ck_assert_int_eq(out.serverIndex, 0);
-    
+
     UA_ExpandedNodeId_clear(&out);
 }
 END_TEST
@@ -5001,7 +5001,7 @@ START_TEST(UA_ExpandedNodeId_String_Namespace_json_decode) {
     UA_ExpandedNodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test\",\"Namespace\":\"abcdef\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5019,7 +5019,7 @@ START_TEST(UA_ExpandedNodeId_String_Namespace_json_decode) {
     ck_assert_int_eq(out.namespaceUri.data[4], 'e');
     ck_assert_int_eq(out.namespaceUri.data[5], 'f');
     ck_assert_int_eq(out.serverIndex, 0);
-    
+
     UA_ExpandedNodeId_clear(&out);
 }
 END_TEST
@@ -5030,7 +5030,7 @@ START_TEST(UA_ExpandedNodeId_String_NamespaceAsIndex_json_decode) {
     UA_ExpandedNodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test\",\"Namespace\":42}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5044,7 +5044,7 @@ START_TEST(UA_ExpandedNodeId_String_NamespaceAsIndex_json_decode) {
     ck_assert_ptr_eq(out.namespaceUri.data, NULL);
     ck_assert_int_eq(out.nodeId.namespaceIndex, 42);
     ck_assert_int_eq(out.serverIndex, 0);
-    
+
     UA_ExpandedNodeId_clear(&out);
 }
 END_TEST
@@ -5055,7 +5055,7 @@ START_TEST(UA_ExpandedNodeId_String_Namespace_ServerUri_json_decode) {
     UA_ExpandedNodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test\",\"Namespace\":\"test\",\"ServerUri\":13}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5070,7 +5070,7 @@ START_TEST(UA_ExpandedNodeId_String_Namespace_ServerUri_json_decode) {
     ck_assert_int_eq(out.namespaceUri.data[1], 'e');
     ck_assert_int_eq(out.namespaceUri.data[2], 's');
     ck_assert_int_eq(out.namespaceUri.data[3], 't');
-    
+
     UA_ExpandedNodeId_clear(&out);
 }
 END_TEST
@@ -5081,7 +5081,7 @@ START_TEST(UA_ExpandedNodeId_ByteString_json_decode) {
     UA_ExpandedNodeId_init(&out);
     UA_ByteString buf = UA_STRING("{\"IdType\":3,\"Id\":\"YXNkZmFzZGY=\",\"Namespace\":\"test\",\"ServerUri\":13}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5100,7 +5100,7 @@ START_TEST(UA_ExpandedNodeId_ByteString_json_decode) {
     ck_assert_int_eq(out.namespaceUri.data[1], 'e');
     ck_assert_int_eq(out.namespaceUri.data[2], 's');
     ck_assert_int_eq(out.namespaceUri.data[3], 't');
-    
+
     UA_ExpandedNodeId_clear(&out);
 }
 END_TEST
@@ -5108,7 +5108,7 @@ END_TEST
 
 START_TEST(UA_DiagnosticInfo_json_decode) {
     // given
-    
+
     UA_DiagnosticInfo out;
     UA_DiagnosticInfo_init(&out);
     out.innerDiagnosticInfo = NULL;
@@ -5119,7 +5119,7 @@ START_TEST(UA_DiagnosticInfo_json_decode) {
             "\"InnerStatusCode\":2155216896,"
             "\"InnerDiagnosticInfo\":{\"AdditionalInfo\":\"INNER ADDITION INFO\"}}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DIAGNOSTICINFO]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5148,13 +5148,13 @@ END_TEST
 /* --------------------DataValue--------------------------- */
 START_TEST(UA_DataValue_json_decode) {
     // given
-    
+
     UA_DataValue out;
     UA_DataValue_init(&out);
     UA_ByteString buf = UA_STRING("{\"Value\":{\"Type\":1,\"Body\":true},\"Status\":2153250816,\"SourceTimestamp\":\"1970-01-15T06:56:07Z\",\"SourcePicoseconds\":0,\"ServerTimestamp\":\"1970-01-15T06:56:07Z\",\"ServerPicoseconds\":0}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATAVALUE]);
     //UA_DiagnosticInfo inner = *out.innerDiagnosticInfo;
 
@@ -5175,13 +5175,13 @@ END_TEST
 
 START_TEST(UA_DataValueMissingFields_json_decode) {
     // given
-    
+
     UA_DataValue out;
     UA_DataValue_init(&out);
     UA_ByteString buf = UA_STRING("{\"Value\":{\"Type\":1,\"Body\":true}}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATAVALUE]);
     //UA_DiagnosticInfo inner = *out.innerDiagnosticInfo;
 
@@ -5211,13 +5211,13 @@ END_TEST
 /*----------------------ExtensionObject------------------------*/
 START_TEST(UA_ExtensionObject_json_decode) {
     // given
-    
+
     UA_ExtensionObject out;
     UA_ExtensionObject_init(&out);
     UA_ByteString buf = UA_STRING("{\"TypeId\":{\"Id\":1},\"Body\":true}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5230,13 +5230,13 @@ END_TEST
 
 START_TEST(UA_ExtensionObject_EncodedByteString_json_decode) {
     // given
-    
+
     UA_ExtensionObject out;
     UA_ExtensionObject_init(&out);
     UA_ByteString buf = UA_STRING("{\"Encoding\":1,\"TypeId\":{\"Id\":42},\"Body\":\"YXNkZmFzZGY=\"}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5251,7 +5251,7 @@ START_TEST(UA_ExtensionObject_EncodedByteString_json_decode) {
     ck_assert_int_eq(out.content.encoded.body.data[5], 'm');
     ck_assert_int_eq(out.content.encoded.body.data[6], 'F');
     ck_assert_int_eq(out.content.encoded.typeId.identifier.numeric, 42);
-    
+
     UA_ExtensionObject_clear(&out);
 }
 END_TEST
@@ -5259,13 +5259,13 @@ END_TEST
 
 START_TEST(UA_ExtensionObject_EncodedXml_json_decode) {
     // given
-    
+
     UA_ExtensionObject out;
     UA_ExtensionObject_init(&out);
     UA_ByteString buf = UA_STRING("{\"Encoding\":2,\"TypeId\":{\"Id\":42},\"Body\":\"<Element></Element>\"}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5282,19 +5282,19 @@ END_TEST
 
 START_TEST(UA_ExtensionObject_Unkown_json_decode) {
     // given
-    
+
     UA_ExtensionObject out;
     UA_ExtensionObject_init(&out);
     UA_ByteString buf = UA_STRING("{\"TypeId\":{\"Id\":4711},\"Body\":{\"unknown\":\"body\",\"saveas\":\"Bytestring\"}}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.encoding, UA_EXTENSIONOBJECT_ENCODED_BYTESTRING);
     ck_assert_int_eq(out.content.encoded.typeId.identifier.numeric, 4711);
-    
+
     //{"unknown":"body","saveas":"Bytestring"}Q
     ck_assert_int_eq(out.content.encoded.body.length, 40);
     ck_assert_int_eq(out.content.encoded.body.data[2], 'u');
@@ -5314,7 +5314,7 @@ START_TEST(UA_VariantBool_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1,\"Body\":false}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5349,14 +5349,14 @@ END_TEST
 
 START_TEST(UA_VariantStringArray_json_decode) {
     // given
-    
+
     UA_Variant *out = UA_Variant_new();
     UA_Variant_init(out);
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":[\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\"],\"Dimension\":[2,4]}");
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     UA_String *testArray;
@@ -5382,14 +5382,14 @@ END_TEST
 
 START_TEST(UA_VariantStringArrayNull_json_decode) {
     // given
-    
+
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":[null, null, null, null, null, null, null, null],\"Dimension\":[2,4]}");
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     UA_String *testArray;
@@ -5416,14 +5416,14 @@ END_TEST
 
 START_TEST(UA_VariantLocalizedTextArrayNull_json_decode) {
     // given
-    
+
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":21,\"Body\":[null, null, null, null, null, null, null, null],\"Dimension\":[2,4]}");
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     UA_LocalizedText *testArray;
@@ -5450,14 +5450,14 @@ END_TEST
 
 START_TEST(UA_VariantVariantArrayNull_json_decode) {
     // given
-    
+
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":22,\"Body\":[null, null, null, null, null, null, null, null],\"Dimension\":[2,4]}");
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     UA_Variant *testArray;
@@ -5501,7 +5501,7 @@ START_TEST(UA_VariantStringArray_WithoutDimension_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":[\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\"]}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     UA_String *testArray;
@@ -5530,7 +5530,7 @@ START_TEST(UA_Variant_BooleanArray_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1,\"Body\":[true, false, true]}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     UA_Boolean *testArray;
@@ -5554,7 +5554,7 @@ START_TEST(UA_Variant_bad1_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1,\"Body\":\"\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     UA_Variant_clear(&out);
@@ -5564,16 +5564,16 @@ END_TEST
 
 START_TEST(UA_Variant_ExtensionObjectWrap_json_decode) {
     // given
-    
+
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":22,\"Body\":{\"TypeId\":{\"Id\":511},\"Body\":{\"ViewId\":{\"Id\":99999},\"Timestamp\":\"1970-01-15T06:56:07.000Z\",\"ViewVersion\":1236}}}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
-    
+
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert(out.type == &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
     UA_ViewDescription *vd = (UA_ViewDescription*)out.data;
@@ -5589,7 +5589,7 @@ START_TEST(UA_duplicate_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1, \"Body\":false, \"Type\":1}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
@@ -5603,7 +5603,7 @@ START_TEST(UA_wrongBoolean_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1, \"Body\":\"asdfaaaaaaaaaaaaaaaaaaaa\"}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
@@ -5624,7 +5624,7 @@ START_TEST(UA_DataTypeAttributes_json_decode) {
             "\"UserWriteMask\":63,"
             "\"IsAbstract\":false}");
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5643,14 +5643,14 @@ END_TEST
 //-------------------MISC heap free test cases--------------------------
 START_TEST(UA_VariantStringArrayBad_shouldFreeArray_json_decode) {
     // given
-    
+
     UA_Variant out;
     UA_Variant_init(&out);                         //not a string     V
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":[\"1\",\"2\",true,\"4\",\"5\",\"6\",\"7\",\"8\"],\"Dimension\":[2,4]}");
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     // then
@@ -5662,14 +5662,14 @@ END_TEST
 
 START_TEST(UA_VariantFuzzer1_json_decode) {
     // given
-    
+
     UA_Variant out;
-    UA_Variant_init(&out);         
+    UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("\\x0a{\"Type\",\"Bode\",\"Body\":{\"se\":}}");
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     // then
@@ -5684,14 +5684,14 @@ END_TEST
 // TODO: Verify against the spec
 START_TEST(UA_VariantFuzzer2_json_decode) {
     // given
-    
+
     UA_Variant out;
-    UA_Variant_init(&out);         
+    UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":2E+}");
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-    
+
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
 
     // then
@@ -5763,7 +5763,7 @@ END_TEST
 
 START_TEST(UA_JsonHelper) {
     // given
-    
+
     CtxJson ctx;
     memset(&ctx, 0, sizeof(ctx));
     ck_assert_int_eq(writeJsonArrStart(&ctx), UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
@@ -5778,7 +5778,7 @@ START_TEST(UA_JsonHelper) {
     ck_assert_int_eq(calcJsonObjStart(&ctx), UA_STATUSCODE_GOOD);
     ck_assert_int_eq(calcJsonObjEnd(&ctx), UA_STATUSCODE_GOOD);
     ck_assert_int_eq(calcJsonArrEnd(&ctx), UA_STATUSCODE_GOOD);
-}   
+}
 END_TEST
 
 /* ----------------- Public API ---------------------*/
@@ -5815,12 +5815,12 @@ END_TEST
 
 static Suite *testSuite_builtin_json(void) {
     Suite *s = suite_create("Built-in Data Types 62541-6 Json");
-    
+
     TCase *tc_json_encode = tcase_create("json_encode");
     tcase_add_test(tc_json_encode, UA_Boolean_true_json_encode);
     tcase_add_test(tc_json_encode, UA_Boolean_false_json_encode);
     tcase_add_test(tc_json_encode, UA_Boolean_true_bufferTooSmall_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_String_json_encode);
     tcase_add_test(tc_json_encode, UA_String_Empty_json_encode);
     tcase_add_test(tc_json_encode, UA_String_Null_json_encode);
@@ -5828,46 +5828,46 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_encode, UA_String_escapeutf_json_encode);
     tcase_add_test(tc_json_encode, UA_String_special_json_encode);
 
-    
+
     tcase_add_test(tc_json_encode, UA_Byte_Max_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Byte_Min_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Byte_smallbuf_Number_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_SByte_Max_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_SByte_Min_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_SByte_Zero_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_SByte_smallbuf_Number_json_encode);
-    
- 
+
+
     tcase_add_test(tc_json_encode, UA_UInt16_Max_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_UInt16_Min_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_UInt16_smallbuf_Number_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_Int16_Max_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int16_Min_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int16_Zero_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int16_smallbuf_Number_json_encode);
-    
-    
+
+
     tcase_add_test(tc_json_encode, UA_UInt32_Max_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_UInt32_Min_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_UInt32_smallbuf_Number_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_Int32_Max_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int32_Min_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int32_Zero_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int32_smallbuf_Number_json_encode);
-    
-    
+
+
     tcase_add_test(tc_json_encode, UA_UInt64_Max_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_UInt64_Min_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_UInt64_smallbuf_Number_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_Int64_Max_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int64_Min_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int64_Zero_Number_json_encode);
     tcase_add_test(tc_json_encode, UA_Int64_smallbuf_Number_json_encode);
-    
+
     //Double Float
     tcase_add_test(tc_json_encode, UA_Double_json_encode);
     tcase_add_test(tc_json_encode, UA_Double_onesmallest_json_encode);
@@ -5882,71 +5882,71 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_encode, UA_Variant_DoubleNan_json_encode);
 
 
-    
+
     //LocalizedText
     tcase_add_test(tc_json_encode, UA_LocText_json_encode);
     tcase_add_test(tc_json_encode, UA_LocText_NonReversible_json_encode);
     tcase_add_test(tc_json_encode, UA_LocText_smallBuffer_json_encode);
-    
+
     //Guid
     tcase_add_test(tc_json_encode, UA_Guid_json_encode);
     tcase_add_test(tc_json_encode, UA_Guid_smallbuf_json_encode);
-    
+
     //DateTime
     tcase_add_test(tc_json_encode, UA_DateTime_json_encode);
     tcase_add_test(tc_json_encode, UA_DateTime_json_encode_null);
     tcase_add_test(tc_json_encode, UA_DateTime_with_nanoseconds_json_encode);
-    
-    
+
+
     //StatusCode
     tcase_add_test(tc_json_encode, UA_StatusCode_json_encode);
     tcase_add_test(tc_json_encode, UA_StatusCode_nonReversible_json_encode);
     tcase_add_test(tc_json_encode, UA_StatusCode_nonReversible_good_json_encode);
     tcase_add_test(tc_json_encode, UA_StatusCode_smallbuf_json_encode);
-    
-    
+
+
     //NodeId
     tcase_add_test(tc_json_encode, UA_NodeId_Numeric_json_encode);
     tcase_add_test(tc_json_encode, UA_NodeId_Numeric_Namespace_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_NodeId_String_json_encode);
     tcase_add_test(tc_json_encode, UA_NodeId_String_Namespace_json_encode);
     tcase_add_test(tc_json_encode, UA_NodeId_Guid_json_encode);
     tcase_add_test(tc_json_encode, UA_NodeId_Guid_Namespace_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_NodeId_ByteString_json_encode);
     tcase_add_test(tc_json_encode, UA_NodeId_ByteString_Namespace_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_NodeId_NonReversible_Numeric_Namespace_json_encode);
-    
+
     //ExpandedNodeId
     tcase_add_test(tc_json_encode, UA_ExpandedNodeId_json_encode);
     tcase_add_test(tc_json_encode, UA_ExpandedNodeId_MissingNamespaceUri_json_encode);
     tcase_add_test(tc_json_encode, UA_ExpandedNodeId_NonReversible_Ns1_json_encode);
     tcase_add_test(tc_json_encode, UA_ExpandedNodeId_NonReversible_Namespace_json_encode);
     tcase_add_test(tc_json_encode, UA_ExpandedNodeId_NonReversible_NamespaceUriGiven_json_encode);
-    
-    
+
+
     //DiagnosticInfo
     tcase_add_test(tc_json_encode, UA_DiagInfo_json_encode);
     tcase_add_test(tc_json_encode, UA_DiagInfo_withInner_json_encode);
     tcase_add_test(tc_json_encode, UA_DiagInfo_withTwoInner_json_encode);
     tcase_add_test(tc_json_encode, UA_DiagInfo_noFields_json_encode);
     tcase_add_test(tc_json_encode, UA_DiagInfo_smallBuffer_json_encode);
-    
-    
+
+
     //ByteString
     tcase_add_test(tc_json_encode, UA_ByteString_json_encode);
     tcase_add_test(tc_json_encode, UA_ByteString2_json_encode);
     tcase_add_test(tc_json_encode, UA_ByteString3_json_encode);
 
-    
+
     //QualifiedName
     tcase_add_test(tc_json_encode, UA_QualName_json_encode);
     tcase_add_test(tc_json_encode, UA_QualName_NonReversible_json_encode);
     tcase_add_test(tc_json_encode, UA_QualName_NonReversible_Namespace_json_encode);
     tcase_add_test(tc_json_encode, UA_QualName_NonReversible_NoNamespaceAsNumber_json_encode);
-           
+
     //Variant -REVERSIBLE-
     tcase_add_test(tc_json_encode, UA_Variant_Bool_json_encode);
     tcase_add_test(tc_json_encode, UA_Variant_Number_json_encode);
@@ -5957,41 +5957,41 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_encode, UA_Variant_NodeId_json_encode);
     tcase_add_test(tc_json_encode, UA_Variant_LocText_json_encode);
     tcase_add_test(tc_json_encode, UA_Variant_QualName_json_encode);
-    
+
     //Array
     tcase_add_test(tc_json_encode, UA_Variant_Array_UInt16_json_encode);
     tcase_add_test(tc_json_encode, UA_Variant_Array_UInt16_Null_json_encode);
     tcase_add_test(tc_json_encode, UA_Variant_Array_Byte_json_encode);
     tcase_add_test(tc_json_encode, UA_Variant_Array_String_json_encode);
-    
+
     //Matrix
     tcase_add_test(tc_json_encode, UA_Variant_Matrix_UInt16_json_encode);
-    
+
     //Wrap
     tcase_add_test(tc_json_encode, UA_Variant_Wrap_json_encode);
     tcase_add_test(tc_json_encode, UA_Variant_Wrap_Array_json_encode);
-    
+
     //Variant -NON-REVERSIBLE-
     tcase_add_test(tc_json_encode, UA_Variant_StatusCode_NonReversible_json_encode);
-    
+
     //Array
     tcase_add_test(tc_json_encode, UA_Variant_Array_String_NonReversible_json_encode);
-    
+
     //Matrix
     tcase_add_test(tc_json_encode, UA_Variant_Matrix_String_NonReversible_json_encode);
     tcase_add_test(tc_json_encode, UA_Variant_Matrix_NodeId_NonReversible_json_encode);
-    
+
     //Wrap non reversible
     tcase_add_test(tc_json_encode, UA_Variant_Wrap_Array_NonReversible_json_encode);
-    
-    
+
+
     //ExtensionObject
     tcase_add_test(tc_json_encode, UA_ExtensionObject_json_encode);
     tcase_add_test(tc_json_encode, UA_ExtensionObject_xml_json_encode);
     tcase_add_test(tc_json_encode, UA_ExtensionObject_byteString_json_encode);
-    
+
     tcase_add_test(tc_json_encode, UA_ExtensionObject_NonReversible_StatusCode_json_encode);
-    
+
     //DataValue
     tcase_add_test(tc_json_encode, UA_DataValue_json_encode);
     tcase_add_test(tc_json_encode, UA_DataValue_null_json_encode);
@@ -6002,40 +6002,40 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_encode, UA_VariableAttributes_json_encode);
 
     suite_add_tcase(s, tc_json_encode);
-    
+
     TCase *tc_json_decode = tcase_create("json_decode");
-    
-    
+
+
     tcase_add_test(tc_json_decode, UA_SByte_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_SByte_Max_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_Byte_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_Byte_Max_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_Int16_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_Int16_Max_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_UInt16_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_UInt16_Max_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_UInt32_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_UInt32_Max_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_Int32_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_Int32_Max_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_Int64_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_Int64_Max_json_decode);
     tcase_add_test(tc_json_decode, UA_Int64_Overflow_json_decode);
     tcase_add_test(tc_json_decode, UA_Int64_TooBig_json_decode);
     tcase_add_test(tc_json_decode, UA_Int64_NoDigit_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_UInt64_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_UInt64_Max_json_decode);
     tcase_add_test(tc_json_decode, UA_UInt64_Overflow_json_decode);
 
-    
-    
+
+
     tcase_add_test(tc_json_decode, UA_Float_json_decode);
     tcase_add_test(tc_json_decode, UA_Float_json_one_decode);
 
@@ -6044,7 +6044,7 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_decode, UA_Float_json_nan_decode);
     tcase_add_test(tc_json_decode, UA_Float_json_negnan_decode);
 
-    
+
     tcase_add_test(tc_json_decode, UA_Double_json_decode);
     tcase_add_test(tc_json_decode, UA_Double_one_json_decode);
     tcase_add_test(tc_json_decode, UA_Double_corrupt_json_decode);
@@ -6056,24 +6056,24 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_decode, UA_Double_zero_json_decode);
     tcase_add_test(tc_json_decode, UA_Double_inf_json_decode);
     tcase_add_test(tc_json_decode, UA_Double_neginf_json_decode);
-    
-    
+
+
     //String
     tcase_add_test(tc_json_decode, UA_String_json_decode);
     tcase_add_test(tc_json_decode, UA_String_empty_json_decode);
     tcase_add_test(tc_json_decode, UA_String_unescapeBS_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_String_escape_unicode_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_String_escape2_json_decode);
     tcase_add_test(tc_json_decode, UA_String_surrogatePair_json_decode);
-    
+
     //ByteString
     tcase_add_test(tc_json_decode, UA_ByteString_json_decode);
     tcase_add_test(tc_json_decode, UA_ByteString_bad_json_decode);
     tcase_add_test(tc_json_decode, UA_ByteString_null_json_decode);
-    
-    
+
+
     //DateTime
     tcase_add_test(tc_json_decode, UA_DateTime_json_decode);
     tcase_add_test(tc_json_decode, UA_DateTime_json_decode_large);
@@ -6081,44 +6081,44 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_decode, UA_DateTime_json_decode_min);
     tcase_add_test(tc_json_decode, UA_DateTime_json_decode_max);
     tcase_add_test(tc_json_decode, UA_DateTime_micro_json_decode);
-    
-    
+
+
     //Guid
     tcase_add_test(tc_json_decode, UA_Guid_json_decode);
     tcase_add_test(tc_json_decode, UA_Guid_lower_json_decode);
     tcase_add_test(tc_json_decode, UA_Guid_tooShort_json_decode);
     tcase_add_test(tc_json_decode, UA_Guid_tooLong_json_decode);
     tcase_add_test(tc_json_decode, UA_Guid_wrong_json_decode);
-    
-    
+
+
     //StatusCode
     tcase_add_test(tc_json_decode, UA_StatusCode_2_json_decode);
     tcase_add_test(tc_json_decode, UA_StatusCode_3_json_decode);
     tcase_add_test(tc_json_decode, UA_StatusCode_0_json_decode);
-    
-    
+
+
     //QualName
     tcase_add_test(tc_json_decode, UA_QualifiedName_json_decode);
     tcase_add_test(tc_json_decode, UA_QualifiedName_null_json_decode);
-    
-    
+
+
     //LocalizedText
     tcase_add_test(tc_json_decode, UA_LocalizedText_json_decode);
     tcase_add_test(tc_json_decode, UA_LocalizedText_missing_json_decode);
     tcase_add_test(tc_json_decode, UA_LocalizedText_null_json_decode);
-    
+
 
     //-NodeId-
     tcase_add_test(tc_json_decode, UA_NodeId_Nummeric_json_decode);
     tcase_add_test(tc_json_decode, UA_NodeId_Nummeric_Namespace_json_decode);
 
     tcase_add_test(tc_json_decode, UA_NodeId_String_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_NodeId_Guid_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_NodeId_ByteString_json_decode);
-    
-    
+
+
     //expandednodeid
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_Nummeric_json_decode);
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_String_json_decode);
@@ -6126,12 +6126,12 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_String_NamespaceAsIndex_json_decode);
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_String_Namespace_ServerUri_json_decode);
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_ByteString_json_decode);
-    
+
     //Diaginfo
     tcase_add_test(tc_json_decode, UA_DiagnosticInfo_json_decode);
     tcase_add_test(tc_json_decode, UA_DiagnosticInfo_null_json_decode);
-    
-    
+
+
     //Variant
     tcase_add_test(tc_json_decode, UA_VariantBool_json_decode);
     tcase_add_test(tc_json_decode, UA_VariantBoolNull_json_decode);
@@ -6145,27 +6145,27 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_decode, UA_Variant_BooleanArray_json_decode);
     tcase_add_test(tc_json_decode, UA_Variant_bad1_json_decode);
     tcase_add_test(tc_json_decode, UA_Variant_ExtensionObjectWrap_json_decode);
-    
+
     //DataValue
     tcase_add_test(tc_json_decode, UA_DataValue_json_decode);
     tcase_add_test(tc_json_decode, UA_DataValueMissingFields_json_decode);
     tcase_add_test(tc_json_decode, UA_DataValue_null_json_decode);
-            
+
     //extensionobject
     tcase_add_test(tc_json_decode, UA_ExtensionObject_json_decode);
     tcase_add_test(tc_json_decode, UA_ExtensionObject_EncodedByteString_json_decode);
     tcase_add_test(tc_json_decode, UA_ExtensionObject_EncodedXml_json_decode);
     tcase_add_test(tc_json_decode, UA_ExtensionObject_Unkown_json_decode);
-    
-    
+
+
     //Others
     tcase_add_test(tc_json_decode, UA_duplicate_json_decode);
     tcase_add_test(tc_json_decode, UA_wrongBoolean_json_decode);
-    
+
     tcase_add_test(tc_json_decode, UA_ViewDescription_json_decode);
     tcase_add_test(tc_json_decode, UA_DataTypeAttributes_json_decode);
-    
-    
+
+
     tcase_add_test(tc_json_decode, UA_VariantStringArrayBad_shouldFreeArray_json_decode);
     tcase_add_test(tc_json_decode, UA_VariantFuzzer1_json_decode);
     tcase_add_test(tc_json_decode, UA_VariantFuzzer2_json_decode);
@@ -6181,7 +6181,7 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_decode, UA_Boolean_true_public_json_encode);
 
     suite_add_tcase(s, tc_json_decode);
-    
+
     TCase *tc_json_helper = tcase_create("json_helper");
     tcase_add_test(tc_json_decode, UA_JsonHelper);
     suite_add_tcase(s, tc_json_helper);
diff --git a/tests/client/check_client_highlevel.c b/tests/client/check_client_highlevel.c
index 8093cca778e..1b75dc802aa 100644
--- a/tests/client/check_client_highlevel.c
+++ b/tests/client/check_client_highlevel.c
@@ -503,7 +503,7 @@ START_TEST(Node_AddReadWriteNodes) {
                                        attr, &nodeReadWriteView);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     }
-        
+
     // iterate over children
     retval = UA_Client_forEachChildNodeCall(client, nodeReadWriteUnitTest, nodeIter, NULL);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index a536912f507..97ed1ac9cb0 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -173,7 +173,7 @@ START_TEST(SecureChannel_reconnect) {
 
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    
+
     UA_Client_disconnectSecureChannel(client);
 
     UA_ClientConfig *cconfig = UA_Client_getConfig(client);
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index c03468f8e66..0e6a567a3fb 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -1125,7 +1125,7 @@ START_TEST(Client_subscription_detach) {
     UA_CloseSessionRequest_init(&closeRequest);
     closeRequest.deleteSubscriptions = false;
     UA_CloseSessionResponse closeResponse;
-    
+
     __UA_Client_Service(client,
                         &closeRequest, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
                         &closeResponse, &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE]);
@@ -1241,7 +1241,7 @@ stateCallback(UA_Client *client, UA_SecureChannelState channelState,
             UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
         UA_MonitoredItemCreateRequest monRequest =
             UA_MonitoredItemCreateRequest_default(currentTime);
-    
+
         UA_MonitoredItemCreateResult monResponse =
             UA_Client_MonitoredItems_createDataChange(client, response.subscriptionId,
                                                       UA_TIMESTAMPSTORETURN_BOTH,
diff --git a/tests/encryption/certificates.h b/tests/encryption/certificates.h
index a3810e9deb8..0347e87e521 100644
--- a/tests/encryption/certificates.h
+++ b/tests/encryption/certificates.h
@@ -7,146 +7,146 @@ _UA_BEGIN_DECLS
 
 #define KEY_DER_LENGTH 1193
 UA_Byte KEY_DER_DATA[1193] = {
-    0x30, 0x82, 0x04, 0xa5, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe0, 0xc9, 0x91, 0x62, 
-    0xcd, 0x91, 0x68, 0x75, 0x2c, 0x32, 0x7a, 0xdd, 0xf1, 0xd6, 0x64, 0x77, 0x8b, 0x72, 0x9e, 0x14, 
-    0x2a, 0x62, 0x08, 0xd1, 0x89, 0x7d, 0xe2, 0x17, 0xdc, 0xb3, 0xda, 0xbc, 0x3a, 0x9f, 0x84, 0x03, 
-    0xd3, 0x2e, 0x68, 0xbe, 0xc1, 0x57, 0xcb, 0x2a, 0xe2, 0xd6, 0xcf, 0xc4, 0x7f, 0xbd, 0x53, 0x3f, 
-    0xeb, 0x39, 0x98, 0x69, 0xb0, 0x40, 0x14, 0xbf, 0xf5, 0x5a, 0x23, 0x23, 0xf4, 0x4c, 0xf8, 0xf1, 
-    0x03, 0x56, 0x6d, 0x7d, 0x1b, 0x93, 0xd7, 0x0f, 0xc1, 0x8c, 0x70, 0xe0, 0x2c, 0x55, 0x7e, 0xa1, 
-    0xfc, 0x05, 0xe9, 0xd7, 0xea, 0xb1, 0x5c, 0x0f, 0x9b, 0xac, 0x6a, 0x2e, 0xb4, 0xc5, 0xbf, 0x41, 
-    0x8f, 0xda, 0xfc, 0x85, 0xc6, 0xaa, 0x25, 0xe4, 0xb9, 0x9a, 0xc6, 0xd8, 0x9a, 0x31, 0x8a, 0x17, 
-    0x8b, 0x8c, 0x4e, 0x20, 0xd9, 0x71, 0xfc, 0x66, 0x3a, 0xfd, 0x49, 0x95, 0x54, 0xa8, 0xaf, 0x42, 
-    0x5e, 0xba, 0x26, 0xe6, 0xd3, 0xa0, 0xd2, 0x02, 0x3b, 0x51, 0x8b, 0x39, 0xd3, 0x97, 0xd2, 0xe4, 
-    0xd1, 0x01, 0x65, 0xab, 0x8e, 0xa2, 0x80, 0x5b, 0x5e, 0xbb, 0x11, 0x7f, 0x50, 0x1b, 0x2b, 0x0d, 
-    0x20, 0x40, 0xb5, 0xbf, 0xd1, 0x32, 0xfa, 0x25, 0xe1, 0x0d, 0x75, 0xfc, 0x11, 0xcf, 0x21, 0xdd, 
-    0x45, 0x16, 0xe4, 0x56, 0x58, 0x49, 0x33, 0xca, 0xaf, 0xe3, 0x17, 0x7b, 0x7a, 0x8f, 0xb1, 0xec, 
-    0x1c, 0x4d, 0xa2, 0xc2, 0xce, 0x8b, 0x19, 0x4b, 0xc0, 0xc4, 0x36, 0x6a, 0x7c, 0x5b, 0x89, 0x14, 
-    0x98, 0xcb, 0xa9, 0xca, 0x66, 0xf2, 0xaa, 0xf9, 0x12, 0x40, 0x0e, 0x6a, 0x78, 0x4d, 0x1f, 0x54, 
-    0x3c, 0x03, 0x7a, 0x91, 0xf5, 0xb7, 0x3d, 0xe2, 0xfc, 0x65, 0xb7, 0xaa, 0xa9, 0x39, 0x68, 0xa7, 
-    0xdb, 0x29, 0xc1, 0x40, 0x0b, 0x4e, 0xfb, 0xce, 0x74, 0xa5, 0x46, 0xb9, 0x02, 0x03, 0x01, 0x00, 
-    0x01, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb4, 0xc8, 0x07, 0x60, 0x01, 0xd9, 0xb6, 0xbb, 0xbd, 0x8e, 
-    0xdf, 0x97, 0xcd, 0xde, 0x51, 0xb0, 0x7e, 0xfa, 0xf0, 0x3d, 0x61, 0x94, 0xb4, 0x68, 0xe8, 0x7d, 
-    0xd0, 0x2e, 0xc6, 0xb5, 0xf2, 0xed, 0xbc, 0xeb, 0xfb, 0x3d, 0x24, 0x43, 0x47, 0xc4, 0x5a, 0x34, 
-    0x64, 0x56, 0x1a, 0x57, 0x0e, 0x83, 0x87, 0x04, 0x59, 0x86, 0xa7, 0x84, 0x0b, 0x9a, 0xbc, 0x3f, 
-    0xdd, 0x30, 0x40, 0x7f, 0x7c, 0x91, 0x76, 0xf1, 0xcc, 0xa7, 0xf0, 0xba, 0x3a, 0x96, 0x0a, 0x6e, 
-    0xcc, 0xe0, 0x84, 0x15, 0x91, 0xd6, 0x08, 0x71, 0xbd, 0xc5, 0x42, 0xad, 0xf2, 0xd2, 0x4e, 0x92, 
-    0xd3, 0x6a, 0x4e, 0x15, 0xcc, 0xd3, 0xc1, 0x58, 0xe4, 0x27, 0x33, 0x2d, 0xb8, 0x37, 0x52, 0x7e, 
-    0x16, 0xb9, 0xab, 0xb7, 0xd9, 0xc1, 0xeb, 0xc8, 0x79, 0xb9, 0xd3, 0xe6, 0x44, 0x13, 0x51, 0x2d, 
-    0xc6, 0x02, 0xe5, 0xe0, 0x3c, 0xa3, 0x15, 0x9b, 0x49, 0xae, 0x85, 0xbe, 0x8c, 0x84, 0xf9, 0x87, 
-    0x5d, 0x91, 0x9e, 0xf4, 0xf9, 0xf2, 0x8d, 0x81, 0x77, 0x7c, 0xfc, 0x60, 0x09, 0x48, 0x43, 0x2e, 
-    0xbb, 0xaf, 0xc9, 0xd6, 0x90, 0x2d, 0x40, 0x80, 0x59, 0xbd, 0x3b, 0x04, 0xda, 0x50, 0x2a, 0x53, 
-    0xf5, 0xc0, 0x97, 0x54, 0x04, 0x14, 0xb1, 0x8e, 0xd1, 0x6b, 0x53, 0x9e, 0xa4, 0xaa, 0x5e, 0x6e, 
-    0x1c, 0x11, 0x6b, 0x0a, 0xc4, 0xec, 0x5b, 0x77, 0xa8, 0x00, 0x83, 0x77, 0xdb, 0xf4, 0xfb, 0x00, 
-    0xf4, 0x06, 0x57, 0x25, 0x8e, 0x1c, 0x87, 0xb4, 0xbe, 0xb8, 0x04, 0x35, 0x93, 0x67, 0xaa, 0x36, 
-    0xa5, 0x62, 0xe4, 0xf6, 0xcb, 0xc8, 0xa6, 0x58, 0x77, 0x96, 0xc4, 0x6c, 0x0b, 0xc8, 0x41, 0xe2, 
-    0x36, 0x01, 0x94, 0xa5, 0xe9, 0x46, 0x17, 0xd3, 0x0b, 0x18, 0x7e, 0x06, 0x88, 0x9b, 0x7e, 0xdd, 
-    0x92, 0x20, 0xc6, 0xe3, 0x7e, 0xb1, 0x02, 0x81, 0x81, 0x00, 0xf5, 0xa6, 0xda, 0x32, 0xb9, 0x37, 
-    0x61, 0xe9, 0x7c, 0x99, 0xf7, 0x4a, 0x37, 0xee, 0x52, 0x30, 0x4f, 0xbf, 0x57, 0x6f, 0xfe, 0x20, 
-    0xdc, 0xa3, 0xfe, 0x51, 0xbf, 0x72, 0x13, 0x8a, 0xb1, 0xd7, 0x99, 0x7d, 0x67, 0xa8, 0xd4, 0xb0, 
-    0x35, 0x40, 0x7c, 0xc8, 0xdc, 0x03, 0x6b, 0x90, 0xb5, 0x65, 0x04, 0x7f, 0x97, 0x8b, 0xa8, 0x69, 
-    0x20, 0x04, 0xcb, 0x48, 0x39, 0xb7, 0x57, 0xe0, 0xd9, 0xbb, 0x15, 0xe1, 0x59, 0x16, 0xf3, 0xe1, 
-    0xab, 0x91, 0xea, 0x8a, 0x88, 0xad, 0x8d, 0xa3, 0x24, 0x4a, 0x35, 0xa5, 0xd2, 0x32, 0x19, 0x66, 
-    0xa8, 0xbb, 0x32, 0x9d, 0xf4, 0x94, 0x99, 0xc1, 0x2e, 0x2b, 0xf8, 0x98, 0x6a, 0x6e, 0x72, 0x77, 
-    0xd0, 0xc9, 0xfc, 0x5f, 0xd7, 0x69, 0xd1, 0x08, 0x12, 0xbf, 0x81, 0xc1, 0xa1, 0x1b, 0x3b, 0x41, 
-    0xb0, 0x24, 0x11, 0x0a, 0x65, 0xab, 0x81, 0x39, 0xb3, 0xd5, 0x02, 0x81, 0x81, 0x00, 0xea, 0x41, 
-    0xb5, 0xed, 0xac, 0xa0, 0x43, 0xd7, 0xde, 0x1e, 0x6b, 0x95, 0xbe, 0x88, 0x02, 0xaf, 0x2f, 0xbb, 
-    0x37, 0xf7, 0x2f, 0xf6, 0x4f, 0xa0, 0xaa, 0x43, 0x03, 0x7d, 0x33, 0xdd, 0x1e, 0x7a, 0xba, 0xa0, 
-    0x10, 0x77, 0x1f, 0x4a, 0xc9, 0x88, 0x58, 0x9d, 0x81, 0x3a, 0xe8, 0xac, 0x86, 0x2f, 0x80, 0x6c, 
-    0xc7, 0xa0, 0xe5, 0xed, 0x8d, 0x90, 0xa9, 0xa7, 0x36, 0x23, 0xd7, 0xb5, 0x89, 0xfc, 0xad, 0x4d, 
-    0xae, 0x0e, 0xec, 0xdc, 0xe7, 0x7e, 0x69, 0xfe, 0x62, 0x4b, 0x81, 0xfe, 0x52, 0x81, 0x77, 0x6a, 
-    0x35, 0xab, 0x52, 0x6f, 0x56, 0x41, 0x6c, 0x57, 0x3d, 0x75, 0x92, 0x14, 0x42, 0xa2, 0xc9, 0x50, 
-    0x52, 0x57, 0x9f, 0x26, 0x3c, 0xcd, 0x61, 0xa9, 0xda, 0x9b, 0x2c, 0xda, 0xc1, 0xd0, 0x26, 0x07, 
-    0x90, 0x15, 0x8c, 0x81, 0xe2, 0xde, 0xc0, 0x98, 0x58, 0x9d, 0x96, 0x0f, 0xcd, 0x55, 0x02, 0x81, 
-    0x81, 0x00, 0x87, 0xfb, 0xf8, 0x77, 0xf1, 0xcd, 0xf5, 0xb6, 0xa1, 0xd2, 0x3d, 0x71, 0x69, 0x6a, 
-    0xd5, 0x36, 0x87, 0x3e, 0xdd, 0xb1, 0x52, 0x55, 0x70, 0xae, 0x9b, 0x9f, 0x37, 0x42, 0x78, 0x0c, 
-    0xe4, 0x0b, 0xfc, 0x9c, 0xce, 0x20, 0x48, 0xb4, 0xce, 0x95, 0xc7, 0x3e, 0x0d, 0x85, 0x1b, 0x2b, 
-    0x7d, 0x2e, 0xd1, 0x81, 0xac, 0x2b, 0x94, 0x6b, 0xb5, 0x5c, 0xd2, 0x07, 0x46, 0x63, 0xf7, 0x12, 
-    0xb2, 0x94, 0xfd, 0x34, 0xc4, 0xf3, 0x8e, 0xc8, 0x13, 0x08, 0xf0, 0x74, 0x05, 0xdb, 0x45, 0x37, 
-    0xd5, 0x63, 0xfb, 0x34, 0xb3, 0x1a, 0x26, 0xb3, 0x8c, 0x9e, 0x2c, 0x14, 0x02, 0x8b, 0xac, 0x5d, 
-    0xa3, 0x28, 0x96, 0x32, 0x11, 0x60, 0xd8, 0x9e, 0xf9, 0x06, 0x87, 0x5d, 0xaa, 0xca, 0x99, 0xfb, 
-    0x45, 0x1d, 0x9c, 0x3f, 0xca, 0xe6, 0x5f, 0x34, 0x2a, 0xc4, 0x9c, 0x66, 0x4c, 0x07, 0xd7, 0xbe, 
-    0x50, 0x8d, 0x02, 0x81, 0x80, 0x51, 0xdb, 0x96, 0x6c, 0x30, 0x37, 0x6c, 0x9d, 0xa1, 0x43, 0x76, 
-    0x0a, 0xc4, 0xa2, 0x98, 0x75, 0x89, 0x33, 0x5d, 0xd2, 0x25, 0xd3, 0x67, 0x6d, 0xd8, 0x31, 0x44, 
-    0xa5, 0xda, 0x9a, 0xb9, 0x0c, 0xdf, 0xec, 0x10, 0xf4, 0xdf, 0x5d, 0x6d, 0xe1, 0x14, 0x3e, 0x2d, 
-    0xab, 0x5d, 0x24, 0xf4, 0x5a, 0xe3, 0x00, 0xa0, 0x1d, 0x8c, 0x5b, 0x1f, 0x6d, 0xde, 0xaa, 0xcc, 
-    0x93, 0x67, 0xcc, 0x4b, 0x24, 0x9d, 0x96, 0x98, 0x6d, 0x24, 0xbd, 0xe8, 0xb2, 0xd6, 0xed, 0x0a, 
-    0x82, 0x22, 0x31, 0xb1, 0xb9, 0x05, 0xf6, 0x7a, 0x3c, 0x9c, 0xb8, 0xc5, 0x26, 0x65, 0x6a, 0x72, 
-    0xd2, 0x83, 0xb2, 0x4a, 0xba, 0xc1, 0xa8, 0x2c, 0xad, 0xeb, 0xb2, 0x1b, 0xeb, 0x14, 0xe6, 0x9a, 
-    0xba, 0x40, 0xc9, 0x4c, 0x92, 0xa4, 0xc7, 0x5d, 0xc4, 0xf9, 0xed, 0x65, 0x4e, 0xbb, 0x74, 0x40, 
-    0xfb, 0x08, 0x36, 0x0b, 0x65, 0x02, 0x81, 0x81, 0x00, 0xeb, 0x60, 0x01, 0x21, 0x22, 0xa1, 0xde, 
-    0x89, 0x62, 0xfa, 0x68, 0x03, 0x09, 0xf1, 0xa6, 0x14, 0xf0, 0xbe, 0xf7, 0x71, 0x3a, 0x01, 0x85, 
-    0x1f, 0x2c, 0x86, 0xde, 0x4a, 0xfb, 0x35, 0x16, 0xc4, 0x84, 0x22, 0x83, 0x49, 0xeb, 0x0d, 0xf7, 
-    0x33, 0x47, 0x8f, 0x96, 0x37, 0x32, 0xd3, 0xd2, 0xec, 0xea, 0x0f, 0xd0, 0xde, 0x0d, 0x27, 0x9e, 
-    0xc1, 0xf1, 0xe0, 0x39, 0xa6, 0x3e, 0x6c, 0xd4, 0x39, 0xdf, 0xde, 0xbd, 0x4c, 0xb8, 0xe7, 0xb7, 
-    0x4e, 0x2a, 0x32, 0x92, 0x83, 0xd3, 0x12, 0xb9, 0xa1, 0x91, 0x52, 0x46, 0x24, 0x58, 0x05, 0x35, 
-    0x22, 0x5f, 0x10, 0x3c, 0x13, 0x5b, 0xbe, 0x47, 0x5e, 0xbf, 0x85, 0xd6, 0xac, 0xfc, 0xbb, 0xd9, 
-    0x91, 0xf9, 0x50, 0x8f, 0xfc, 0xc2, 0x2c, 0x81, 0x5c, 0xa5, 0xc3, 0xc2, 0x15, 0xbe, 0xf4, 0x72, 
-    0xfd, 0x4d, 0xf0, 0x10, 0x6f, 0xe5, 0xbf, 0x8c, 0xb1  
+    0x30, 0x82, 0x04, 0xa5, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe0, 0xc9, 0x91, 0x62,
+    0xcd, 0x91, 0x68, 0x75, 0x2c, 0x32, 0x7a, 0xdd, 0xf1, 0xd6, 0x64, 0x77, 0x8b, 0x72, 0x9e, 0x14,
+    0x2a, 0x62, 0x08, 0xd1, 0x89, 0x7d, 0xe2, 0x17, 0xdc, 0xb3, 0xda, 0xbc, 0x3a, 0x9f, 0x84, 0x03,
+    0xd3, 0x2e, 0x68, 0xbe, 0xc1, 0x57, 0xcb, 0x2a, 0xe2, 0xd6, 0xcf, 0xc4, 0x7f, 0xbd, 0x53, 0x3f,
+    0xeb, 0x39, 0x98, 0x69, 0xb0, 0x40, 0x14, 0xbf, 0xf5, 0x5a, 0x23, 0x23, 0xf4, 0x4c, 0xf8, 0xf1,
+    0x03, 0x56, 0x6d, 0x7d, 0x1b, 0x93, 0xd7, 0x0f, 0xc1, 0x8c, 0x70, 0xe0, 0x2c, 0x55, 0x7e, 0xa1,
+    0xfc, 0x05, 0xe9, 0xd7, 0xea, 0xb1, 0x5c, 0x0f, 0x9b, 0xac, 0x6a, 0x2e, 0xb4, 0xc5, 0xbf, 0x41,
+    0x8f, 0xda, 0xfc, 0x85, 0xc6, 0xaa, 0x25, 0xe4, 0xb9, 0x9a, 0xc6, 0xd8, 0x9a, 0x31, 0x8a, 0x17,
+    0x8b, 0x8c, 0x4e, 0x20, 0xd9, 0x71, 0xfc, 0x66, 0x3a, 0xfd, 0x49, 0x95, 0x54, 0xa8, 0xaf, 0x42,
+    0x5e, 0xba, 0x26, 0xe6, 0xd3, 0xa0, 0xd2, 0x02, 0x3b, 0x51, 0x8b, 0x39, 0xd3, 0x97, 0xd2, 0xe4,
+    0xd1, 0x01, 0x65, 0xab, 0x8e, 0xa2, 0x80, 0x5b, 0x5e, 0xbb, 0x11, 0x7f, 0x50, 0x1b, 0x2b, 0x0d,
+    0x20, 0x40, 0xb5, 0xbf, 0xd1, 0x32, 0xfa, 0x25, 0xe1, 0x0d, 0x75, 0xfc, 0x11, 0xcf, 0x21, 0xdd,
+    0x45, 0x16, 0xe4, 0x56, 0x58, 0x49, 0x33, 0xca, 0xaf, 0xe3, 0x17, 0x7b, 0x7a, 0x8f, 0xb1, 0xec,
+    0x1c, 0x4d, 0xa2, 0xc2, 0xce, 0x8b, 0x19, 0x4b, 0xc0, 0xc4, 0x36, 0x6a, 0x7c, 0x5b, 0x89, 0x14,
+    0x98, 0xcb, 0xa9, 0xca, 0x66, 0xf2, 0xaa, 0xf9, 0x12, 0x40, 0x0e, 0x6a, 0x78, 0x4d, 0x1f, 0x54,
+    0x3c, 0x03, 0x7a, 0x91, 0xf5, 0xb7, 0x3d, 0xe2, 0xfc, 0x65, 0xb7, 0xaa, 0xa9, 0x39, 0x68, 0xa7,
+    0xdb, 0x29, 0xc1, 0x40, 0x0b, 0x4e, 0xfb, 0xce, 0x74, 0xa5, 0x46, 0xb9, 0x02, 0x03, 0x01, 0x00,
+    0x01, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb4, 0xc8, 0x07, 0x60, 0x01, 0xd9, 0xb6, 0xbb, 0xbd, 0x8e,
+    0xdf, 0x97, 0xcd, 0xde, 0x51, 0xb0, 0x7e, 0xfa, 0xf0, 0x3d, 0x61, 0x94, 0xb4, 0x68, 0xe8, 0x7d,
+    0xd0, 0x2e, 0xc6, 0xb5, 0xf2, 0xed, 0xbc, 0xeb, 0xfb, 0x3d, 0x24, 0x43, 0x47, 0xc4, 0x5a, 0x34,
+    0x64, 0x56, 0x1a, 0x57, 0x0e, 0x83, 0x87, 0x04, 0x59, 0x86, 0xa7, 0x84, 0x0b, 0x9a, 0xbc, 0x3f,
+    0xdd, 0x30, 0x40, 0x7f, 0x7c, 0x91, 0x76, 0xf1, 0xcc, 0xa7, 0xf0, 0xba, 0x3a, 0x96, 0x0a, 0x6e,
+    0xcc, 0xe0, 0x84, 0x15, 0x91, 0xd6, 0x08, 0x71, 0xbd, 0xc5, 0x42, 0xad, 0xf2, 0xd2, 0x4e, 0x92,
+    0xd3, 0x6a, 0x4e, 0x15, 0xcc, 0xd3, 0xc1, 0x58, 0xe4, 0x27, 0x33, 0x2d, 0xb8, 0x37, 0x52, 0x7e,
+    0x16, 0xb9, 0xab, 0xb7, 0xd9, 0xc1, 0xeb, 0xc8, 0x79, 0xb9, 0xd3, 0xe6, 0x44, 0x13, 0x51, 0x2d,
+    0xc6, 0x02, 0xe5, 0xe0, 0x3c, 0xa3, 0x15, 0x9b, 0x49, 0xae, 0x85, 0xbe, 0x8c, 0x84, 0xf9, 0x87,
+    0x5d, 0x91, 0x9e, 0xf4, 0xf9, 0xf2, 0x8d, 0x81, 0x77, 0x7c, 0xfc, 0x60, 0x09, 0x48, 0x43, 0x2e,
+    0xbb, 0xaf, 0xc9, 0xd6, 0x90, 0x2d, 0x40, 0x80, 0x59, 0xbd, 0x3b, 0x04, 0xda, 0x50, 0x2a, 0x53,
+    0xf5, 0xc0, 0x97, 0x54, 0x04, 0x14, 0xb1, 0x8e, 0xd1, 0x6b, 0x53, 0x9e, 0xa4, 0xaa, 0x5e, 0x6e,
+    0x1c, 0x11, 0x6b, 0x0a, 0xc4, 0xec, 0x5b, 0x77, 0xa8, 0x00, 0x83, 0x77, 0xdb, 0xf4, 0xfb, 0x00,
+    0xf4, 0x06, 0x57, 0x25, 0x8e, 0x1c, 0x87, 0xb4, 0xbe, 0xb8, 0x04, 0x35, 0x93, 0x67, 0xaa, 0x36,
+    0xa5, 0x62, 0xe4, 0xf6, 0xcb, 0xc8, 0xa6, 0x58, 0x77, 0x96, 0xc4, 0x6c, 0x0b, 0xc8, 0x41, 0xe2,
+    0x36, 0x01, 0x94, 0xa5, 0xe9, 0x46, 0x17, 0xd3, 0x0b, 0x18, 0x7e, 0x06, 0x88, 0x9b, 0x7e, 0xdd,
+    0x92, 0x20, 0xc6, 0xe3, 0x7e, 0xb1, 0x02, 0x81, 0x81, 0x00, 0xf5, 0xa6, 0xda, 0x32, 0xb9, 0x37,
+    0x61, 0xe9, 0x7c, 0x99, 0xf7, 0x4a, 0x37, 0xee, 0x52, 0x30, 0x4f, 0xbf, 0x57, 0x6f, 0xfe, 0x20,
+    0xdc, 0xa3, 0xfe, 0x51, 0xbf, 0x72, 0x13, 0x8a, 0xb1, 0xd7, 0x99, 0x7d, 0x67, 0xa8, 0xd4, 0xb0,
+    0x35, 0x40, 0x7c, 0xc8, 0xdc, 0x03, 0x6b, 0x90, 0xb5, 0x65, 0x04, 0x7f, 0x97, 0x8b, 0xa8, 0x69,
+    0x20, 0x04, 0xcb, 0x48, 0x39, 0xb7, 0x57, 0xe0, 0xd9, 0xbb, 0x15, 0xe1, 0x59, 0x16, 0xf3, 0xe1,
+    0xab, 0x91, 0xea, 0x8a, 0x88, 0xad, 0x8d, 0xa3, 0x24, 0x4a, 0x35, 0xa5, 0xd2, 0x32, 0x19, 0x66,
+    0xa8, 0xbb, 0x32, 0x9d, 0xf4, 0x94, 0x99, 0xc1, 0x2e, 0x2b, 0xf8, 0x98, 0x6a, 0x6e, 0x72, 0x77,
+    0xd0, 0xc9, 0xfc, 0x5f, 0xd7, 0x69, 0xd1, 0x08, 0x12, 0xbf, 0x81, 0xc1, 0xa1, 0x1b, 0x3b, 0x41,
+    0xb0, 0x24, 0x11, 0x0a, 0x65, 0xab, 0x81, 0x39, 0xb3, 0xd5, 0x02, 0x81, 0x81, 0x00, 0xea, 0x41,
+    0xb5, 0xed, 0xac, 0xa0, 0x43, 0xd7, 0xde, 0x1e, 0x6b, 0x95, 0xbe, 0x88, 0x02, 0xaf, 0x2f, 0xbb,
+    0x37, 0xf7, 0x2f, 0xf6, 0x4f, 0xa0, 0xaa, 0x43, 0x03, 0x7d, 0x33, 0xdd, 0x1e, 0x7a, 0xba, 0xa0,
+    0x10, 0x77, 0x1f, 0x4a, 0xc9, 0x88, 0x58, 0x9d, 0x81, 0x3a, 0xe8, 0xac, 0x86, 0x2f, 0x80, 0x6c,
+    0xc7, 0xa0, 0xe5, 0xed, 0x8d, 0x90, 0xa9, 0xa7, 0x36, 0x23, 0xd7, 0xb5, 0x89, 0xfc, 0xad, 0x4d,
+    0xae, 0x0e, 0xec, 0xdc, 0xe7, 0x7e, 0x69, 0xfe, 0x62, 0x4b, 0x81, 0xfe, 0x52, 0x81, 0x77, 0x6a,
+    0x35, 0xab, 0x52, 0x6f, 0x56, 0x41, 0x6c, 0x57, 0x3d, 0x75, 0x92, 0x14, 0x42, 0xa2, 0xc9, 0x50,
+    0x52, 0x57, 0x9f, 0x26, 0x3c, 0xcd, 0x61, 0xa9, 0xda, 0x9b, 0x2c, 0xda, 0xc1, 0xd0, 0x26, 0x07,
+    0x90, 0x15, 0x8c, 0x81, 0xe2, 0xde, 0xc0, 0x98, 0x58, 0x9d, 0x96, 0x0f, 0xcd, 0x55, 0x02, 0x81,
+    0x81, 0x00, 0x87, 0xfb, 0xf8, 0x77, 0xf1, 0xcd, 0xf5, 0xb6, 0xa1, 0xd2, 0x3d, 0x71, 0x69, 0x6a,
+    0xd5, 0x36, 0x87, 0x3e, 0xdd, 0xb1, 0x52, 0x55, 0x70, 0xae, 0x9b, 0x9f, 0x37, 0x42, 0x78, 0x0c,
+    0xe4, 0x0b, 0xfc, 0x9c, 0xce, 0x20, 0x48, 0xb4, 0xce, 0x95, 0xc7, 0x3e, 0x0d, 0x85, 0x1b, 0x2b,
+    0x7d, 0x2e, 0xd1, 0x81, 0xac, 0x2b, 0x94, 0x6b, 0xb5, 0x5c, 0xd2, 0x07, 0x46, 0x63, 0xf7, 0x12,
+    0xb2, 0x94, 0xfd, 0x34, 0xc4, 0xf3, 0x8e, 0xc8, 0x13, 0x08, 0xf0, 0x74, 0x05, 0xdb, 0x45, 0x37,
+    0xd5, 0x63, 0xfb, 0x34, 0xb3, 0x1a, 0x26, 0xb3, 0x8c, 0x9e, 0x2c, 0x14, 0x02, 0x8b, 0xac, 0x5d,
+    0xa3, 0x28, 0x96, 0x32, 0x11, 0x60, 0xd8, 0x9e, 0xf9, 0x06, 0x87, 0x5d, 0xaa, 0xca, 0x99, 0xfb,
+    0x45, 0x1d, 0x9c, 0x3f, 0xca, 0xe6, 0x5f, 0x34, 0x2a, 0xc4, 0x9c, 0x66, 0x4c, 0x07, 0xd7, 0xbe,
+    0x50, 0x8d, 0x02, 0x81, 0x80, 0x51, 0xdb, 0x96, 0x6c, 0x30, 0x37, 0x6c, 0x9d, 0xa1, 0x43, 0x76,
+    0x0a, 0xc4, 0xa2, 0x98, 0x75, 0x89, 0x33, 0x5d, 0xd2, 0x25, 0xd3, 0x67, 0x6d, 0xd8, 0x31, 0x44,
+    0xa5, 0xda, 0x9a, 0xb9, 0x0c, 0xdf, 0xec, 0x10, 0xf4, 0xdf, 0x5d, 0x6d, 0xe1, 0x14, 0x3e, 0x2d,
+    0xab, 0x5d, 0x24, 0xf4, 0x5a, 0xe3, 0x00, 0xa0, 0x1d, 0x8c, 0x5b, 0x1f, 0x6d, 0xde, 0xaa, 0xcc,
+    0x93, 0x67, 0xcc, 0x4b, 0x24, 0x9d, 0x96, 0x98, 0x6d, 0x24, 0xbd, 0xe8, 0xb2, 0xd6, 0xed, 0x0a,
+    0x82, 0x22, 0x31, 0xb1, 0xb9, 0x05, 0xf6, 0x7a, 0x3c, 0x9c, 0xb8, 0xc5, 0x26, 0x65, 0x6a, 0x72,
+    0xd2, 0x83, 0xb2, 0x4a, 0xba, 0xc1, 0xa8, 0x2c, 0xad, 0xeb, 0xb2, 0x1b, 0xeb, 0x14, 0xe6, 0x9a,
+    0xba, 0x40, 0xc9, 0x4c, 0x92, 0xa4, 0xc7, 0x5d, 0xc4, 0xf9, 0xed, 0x65, 0x4e, 0xbb, 0x74, 0x40,
+    0xfb, 0x08, 0x36, 0x0b, 0x65, 0x02, 0x81, 0x81, 0x00, 0xeb, 0x60, 0x01, 0x21, 0x22, 0xa1, 0xde,
+    0x89, 0x62, 0xfa, 0x68, 0x03, 0x09, 0xf1, 0xa6, 0x14, 0xf0, 0xbe, 0xf7, 0x71, 0x3a, 0x01, 0x85,
+    0x1f, 0x2c, 0x86, 0xde, 0x4a, 0xfb, 0x35, 0x16, 0xc4, 0x84, 0x22, 0x83, 0x49, 0xeb, 0x0d, 0xf7,
+    0x33, 0x47, 0x8f, 0x96, 0x37, 0x32, 0xd3, 0xd2, 0xec, 0xea, 0x0f, 0xd0, 0xde, 0x0d, 0x27, 0x9e,
+    0xc1, 0xf1, 0xe0, 0x39, 0xa6, 0x3e, 0x6c, 0xd4, 0x39, 0xdf, 0xde, 0xbd, 0x4c, 0xb8, 0xe7, 0xb7,
+    0x4e, 0x2a, 0x32, 0x92, 0x83, 0xd3, 0x12, 0xb9, 0xa1, 0x91, 0x52, 0x46, 0x24, 0x58, 0x05, 0x35,
+    0x22, 0x5f, 0x10, 0x3c, 0x13, 0x5b, 0xbe, 0x47, 0x5e, 0xbf, 0x85, 0xd6, 0xac, 0xfc, 0xbb, 0xd9,
+    0x91, 0xf9, 0x50, 0x8f, 0xfc, 0xc2, 0x2c, 0x81, 0x5c, 0xa5, 0xc3, 0xc2, 0x15, 0xbe, 0xf4, 0x72,
+    0xfd, 0x4d, 0xf0, 0x10, 0x6f, 0xe5, 0xbf, 0x8c, 0xb1
     };
 
 #define CERT_DER_LENGTH 968
 UA_Byte CERT_DER_DATA[968] = {
-    0x30, 0x82, 0x03, 0xc4, 0x30, 0x82, 0x02, 0xac, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00, 
-    0xa7, 0x17, 0x44, 0x2f, 0x8e, 0x6b, 0x74, 0xba, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 
-    0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x39, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 
-    0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 
-    0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 
-    0x55, 0x04, 0x03, 0x0c, 0x0d, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x6f, 
-    0x72, 0x67, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x33, 0x32, 0x38, 0x30, 0x38, 0x33, 0x33, 
-    0x35, 0x37, 0x5a, 0x17, 0x0d, 0x32, 0x38, 0x30, 0x33, 0x32, 0x35, 0x30, 0x38, 0x33, 0x33, 0x35, 
-    0x37, 0x5a, 0x30, 0x45, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 
-    0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 
-    0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 
-    0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 
-    0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 
-    0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 
-    0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe0, 0xc9, 0x91, 0x62, 0xcd, 0x91, 
-    0x68, 0x75, 0x2c, 0x32, 0x7a, 0xdd, 0xf1, 0xd6, 0x64, 0x77, 0x8b, 0x72, 0x9e, 0x14, 0x2a, 0x62, 
-    0x08, 0xd1, 0x89, 0x7d, 0xe2, 0x17, 0xdc, 0xb3, 0xda, 0xbc, 0x3a, 0x9f, 0x84, 0x03, 0xd3, 0x2e, 
-    0x68, 0xbe, 0xc1, 0x57, 0xcb, 0x2a, 0xe2, 0xd6, 0xcf, 0xc4, 0x7f, 0xbd, 0x53, 0x3f, 0xeb, 0x39, 
-    0x98, 0x69, 0xb0, 0x40, 0x14, 0xbf, 0xf5, 0x5a, 0x23, 0x23, 0xf4, 0x4c, 0xf8, 0xf1, 0x03, 0x56, 
-    0x6d, 0x7d, 0x1b, 0x93, 0xd7, 0x0f, 0xc1, 0x8c, 0x70, 0xe0, 0x2c, 0x55, 0x7e, 0xa1, 0xfc, 0x05, 
-    0xe9, 0xd7, 0xea, 0xb1, 0x5c, 0x0f, 0x9b, 0xac, 0x6a, 0x2e, 0xb4, 0xc5, 0xbf, 0x41, 0x8f, 0xda, 
-    0xfc, 0x85, 0xc6, 0xaa, 0x25, 0xe4, 0xb9, 0x9a, 0xc6, 0xd8, 0x9a, 0x31, 0x8a, 0x17, 0x8b, 0x8c, 
-    0x4e, 0x20, 0xd9, 0x71, 0xfc, 0x66, 0x3a, 0xfd, 0x49, 0x95, 0x54, 0xa8, 0xaf, 0x42, 0x5e, 0xba, 
-    0x26, 0xe6, 0xd3, 0xa0, 0xd2, 0x02, 0x3b, 0x51, 0x8b, 0x39, 0xd3, 0x97, 0xd2, 0xe4, 0xd1, 0x01, 
-    0x65, 0xab, 0x8e, 0xa2, 0x80, 0x5b, 0x5e, 0xbb, 0x11, 0x7f, 0x50, 0x1b, 0x2b, 0x0d, 0x20, 0x40, 
-    0xb5, 0xbf, 0xd1, 0x32, 0xfa, 0x25, 0xe1, 0x0d, 0x75, 0xfc, 0x11, 0xcf, 0x21, 0xdd, 0x45, 0x16, 
-    0xe4, 0x56, 0x58, 0x49, 0x33, 0xca, 0xaf, 0xe3, 0x17, 0x7b, 0x7a, 0x8f, 0xb1, 0xec, 0x1c, 0x4d, 
-    0xa2, 0xc2, 0xce, 0x8b, 0x19, 0x4b, 0xc0, 0xc4, 0x36, 0x6a, 0x7c, 0x5b, 0x89, 0x14, 0x98, 0xcb, 
-    0xa9, 0xca, 0x66, 0xf2, 0xaa, 0xf9, 0x12, 0x40, 0x0e, 0x6a, 0x78, 0x4d, 0x1f, 0x54, 0x3c, 0x03, 
-    0x7a, 0x91, 0xf5, 0xb7, 0x3d, 0xe2, 0xfc, 0x65, 0xb7, 0xaa, 0xa9, 0x39, 0x68, 0xa7, 0xdb, 0x29, 
-    0xc1, 0x40, 0x0b, 0x4e, 0xfb, 0xce, 0x74, 0xa5, 0x46, 0xb9, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 
-    0x81, 0xc2, 0x30, 0x81, 0xbf, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 
-    0x60, 0x6e, 0x44, 0x94, 0xa8, 0xa2, 0x4e, 0x7a, 0x3e, 0xe2, 0x4b, 0x84, 0x5e, 0xec, 0x01, 0xc9, 
-    0xa3, 0xf9, 0x69, 0xaf, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 
-    0x14, 0x53, 0x77, 0xe0, 0xa2, 0xf2, 0x49, 0x38, 0xcf, 0x71, 0x58, 0x0a, 0x67, 0xa6, 0xc0, 0x17, 
-    0xd7, 0xb5, 0xdc, 0x52, 0x4b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x02, 0x30, 0x00, 
-    0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x05, 0xe0, 0x30, 0x1d, 0x06, 
-    0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 
-    0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x46, 0x06, 0x03, 
-    0x55, 0x1d, 0x11, 0x04, 0x3f, 0x30, 0x3d, 0x82, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 
-    0x73, 0x74, 0x82, 0x06, 0x64, 0x65, 0x62, 0x69, 0x61, 0x6e, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 
-    0x87, 0x04, 0x00, 0x00, 0x00, 0x00, 0x86, 0x1c, 0x75, 0x72, 0x6e, 0x3a, 0x75, 0x6e, 0x63, 0x6f, 
-    0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x3a, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 
-    0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 
-    0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0xa4, 0xc1, 0x4f, 0x0e, 0xfe, 0xce, 0x2d, 0x91, 
-    0x8a, 0x51, 0x25, 0xd2, 0x6c, 0x07, 0x86, 0x95, 0xba, 0xc5, 0xe0, 0xad, 0x9b, 0x09, 0x3e, 0x7f, 
-    0x36, 0xc4, 0xa8, 0x10, 0x5b, 0x33, 0x77, 0xe5, 0xb5, 0x3b, 0xd8, 0x98, 0x7c, 0x42, 0x05, 0xcb, 
-    0xb7, 0x91, 0x07, 0x3f, 0x47, 0xff, 0x13, 0x15, 0x45, 0xff, 0x05, 0x03, 0x3d, 0xed, 0x63, 0x96, 
-    0x3a, 0x5c, 0xf8, 0x59, 0xd0, 0xbc, 0x68, 0x8c, 0xfb, 0xf8, 0x29, 0x07, 0x76, 0x63, 0xa7, 0x39, 
-    0xc1, 0x82, 0xc1, 0x10, 0x8b, 0x17, 0xf2, 0x1d, 0x14, 0xdd, 0x88, 0xe7, 0xdc, 0x2f, 0xa7, 0x9d, 
-    0xa3, 0xaa, 0xfd, 0x1a, 0x70, 0xce, 0x57, 0xb5, 0x9f, 0xc3, 0x7b, 0xd0, 0xc0, 0x6f, 0x73, 0x81, 
-    0x74, 0x41, 0x93, 0x0d, 0x0d, 0x1a, 0x95, 0xf6, 0xe4, 0x1c, 0x04, 0x2b, 0x37, 0x4f, 0xf9, 0x99, 
-    0x82, 0x57, 0xf0, 0x4f, 0x14, 0xcb, 0x0f, 0x3d, 0x1a, 0x52, 0x69, 0x18, 0x3f, 0xbe, 0x1c, 0x1c, 
-    0x1b, 0xca, 0xbd, 0xe7, 0xe0, 0x81, 0x44, 0x6d, 0x4a, 0x08, 0x8a, 0xe2, 0x7e, 0x59, 0x9f, 0x89, 
-    0x44, 0x7e, 0x4d, 0xaf, 0x5a, 0x8e, 0xe8, 0xd2, 0x2e, 0x98, 0x72, 0x86, 0xef, 0x7b, 0xcf, 0x88, 
-    0xd0, 0xe2, 0xd5, 0xd9, 0xd5, 0x19, 0xa2, 0x8c, 0xf4, 0x40, 0x98, 0x86, 0x32, 0x9f, 0x3e, 0x25, 
-    0x05, 0xd0, 0xdc, 0xf8, 0x1a, 0x0f, 0xdf, 0xc0, 0x54, 0x46, 0x20, 0xbd, 0xd4, 0xf6, 0xf5, 0xdd, 
-    0x10, 0x2e, 0xa7, 0x1a, 0xf4, 0xbb, 0xed, 0x5d, 0xf3, 0x1c, 0x96, 0x44, 0x81, 0x69, 0xd4, 0x0b, 
-    0xbe, 0x59, 0x07, 0x1b, 0x7f, 0x93, 0xc3, 0x4e, 0x7b, 0x32, 0x51, 0xd0, 0x13, 0x47, 0x57, 0x52, 
-    0xf0, 0x5c, 0x54, 0x36, 0x22, 0xb6, 0xf5, 0x67, 0xbb, 0xd3, 0xa6, 0x43, 0xf0, 0xca, 0x98, 0x91, 
-    0xda, 0x31, 0x3e, 0xd2, 0x8c, 0xfe, 0xd7, 0x51  
+    0x30, 0x82, 0x03, 0xc4, 0x30, 0x82, 0x02, 0xac, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00,
+    0xa7, 0x17, 0x44, 0x2f, 0x8e, 0x6b, 0x74, 0xba, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
+    0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x39, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55,
+    0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
+    0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03,
+    0x55, 0x04, 0x03, 0x0c, 0x0d, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x6f,
+    0x72, 0x67, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x33, 0x32, 0x38, 0x30, 0x38, 0x33, 0x33,
+    0x35, 0x37, 0x5a, 0x17, 0x0d, 0x32, 0x38, 0x30, 0x33, 0x32, 0x35, 0x30, 0x38, 0x33, 0x33, 0x35,
+    0x37, 0x5a, 0x30, 0x45, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
+    0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e,
+    0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19,
+    0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40,
+    0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06,
+    0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f,
+    0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe0, 0xc9, 0x91, 0x62, 0xcd, 0x91,
+    0x68, 0x75, 0x2c, 0x32, 0x7a, 0xdd, 0xf1, 0xd6, 0x64, 0x77, 0x8b, 0x72, 0x9e, 0x14, 0x2a, 0x62,
+    0x08, 0xd1, 0x89, 0x7d, 0xe2, 0x17, 0xdc, 0xb3, 0xda, 0xbc, 0x3a, 0x9f, 0x84, 0x03, 0xd3, 0x2e,
+    0x68, 0xbe, 0xc1, 0x57, 0xcb, 0x2a, 0xe2, 0xd6, 0xcf, 0xc4, 0x7f, 0xbd, 0x53, 0x3f, 0xeb, 0x39,
+    0x98, 0x69, 0xb0, 0x40, 0x14, 0xbf, 0xf5, 0x5a, 0x23, 0x23, 0xf4, 0x4c, 0xf8, 0xf1, 0x03, 0x56,
+    0x6d, 0x7d, 0x1b, 0x93, 0xd7, 0x0f, 0xc1, 0x8c, 0x70, 0xe0, 0x2c, 0x55, 0x7e, 0xa1, 0xfc, 0x05,
+    0xe9, 0xd7, 0xea, 0xb1, 0x5c, 0x0f, 0x9b, 0xac, 0x6a, 0x2e, 0xb4, 0xc5, 0xbf, 0x41, 0x8f, 0xda,
+    0xfc, 0x85, 0xc6, 0xaa, 0x25, 0xe4, 0xb9, 0x9a, 0xc6, 0xd8, 0x9a, 0x31, 0x8a, 0x17, 0x8b, 0x8c,
+    0x4e, 0x20, 0xd9, 0x71, 0xfc, 0x66, 0x3a, 0xfd, 0x49, 0x95, 0x54, 0xa8, 0xaf, 0x42, 0x5e, 0xba,
+    0x26, 0xe6, 0xd3, 0xa0, 0xd2, 0x02, 0x3b, 0x51, 0x8b, 0x39, 0xd3, 0x97, 0xd2, 0xe4, 0xd1, 0x01,
+    0x65, 0xab, 0x8e, 0xa2, 0x80, 0x5b, 0x5e, 0xbb, 0x11, 0x7f, 0x50, 0x1b, 0x2b, 0x0d, 0x20, 0x40,
+    0xb5, 0xbf, 0xd1, 0x32, 0xfa, 0x25, 0xe1, 0x0d, 0x75, 0xfc, 0x11, 0xcf, 0x21, 0xdd, 0x45, 0x16,
+    0xe4, 0x56, 0x58, 0x49, 0x33, 0xca, 0xaf, 0xe3, 0x17, 0x7b, 0x7a, 0x8f, 0xb1, 0xec, 0x1c, 0x4d,
+    0xa2, 0xc2, 0xce, 0x8b, 0x19, 0x4b, 0xc0, 0xc4, 0x36, 0x6a, 0x7c, 0x5b, 0x89, 0x14, 0x98, 0xcb,
+    0xa9, 0xca, 0x66, 0xf2, 0xaa, 0xf9, 0x12, 0x40, 0x0e, 0x6a, 0x78, 0x4d, 0x1f, 0x54, 0x3c, 0x03,
+    0x7a, 0x91, 0xf5, 0xb7, 0x3d, 0xe2, 0xfc, 0x65, 0xb7, 0xaa, 0xa9, 0x39, 0x68, 0xa7, 0xdb, 0x29,
+    0xc1, 0x40, 0x0b, 0x4e, 0xfb, 0xce, 0x74, 0xa5, 0x46, 0xb9, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3,
+    0x81, 0xc2, 0x30, 0x81, 0xbf, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14,
+    0x60, 0x6e, 0x44, 0x94, 0xa8, 0xa2, 0x4e, 0x7a, 0x3e, 0xe2, 0x4b, 0x84, 0x5e, 0xec, 0x01, 0xc9,
+    0xa3, 0xf9, 0x69, 0xaf, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80,
+    0x14, 0x53, 0x77, 0xe0, 0xa2, 0xf2, 0x49, 0x38, 0xcf, 0x71, 0x58, 0x0a, 0x67, 0xa6, 0xc0, 0x17,
+    0xd7, 0xb5, 0xdc, 0x52, 0x4b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x02, 0x30, 0x00,
+    0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x05, 0xe0, 0x30, 0x1d, 0x06,
+    0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07,
+    0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x46, 0x06, 0x03,
+    0x55, 0x1d, 0x11, 0x04, 0x3f, 0x30, 0x3d, 0x82, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f,
+    0x73, 0x74, 0x82, 0x06, 0x64, 0x65, 0x62, 0x69, 0x61, 0x6e, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01,
+    0x87, 0x04, 0x00, 0x00, 0x00, 0x00, 0x86, 0x1c, 0x75, 0x72, 0x6e, 0x3a, 0x75, 0x6e, 0x63, 0x6f,
+    0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x3a, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61,
+    0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+    0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0xa4, 0xc1, 0x4f, 0x0e, 0xfe, 0xce, 0x2d, 0x91,
+    0x8a, 0x51, 0x25, 0xd2, 0x6c, 0x07, 0x86, 0x95, 0xba, 0xc5, 0xe0, 0xad, 0x9b, 0x09, 0x3e, 0x7f,
+    0x36, 0xc4, 0xa8, 0x10, 0x5b, 0x33, 0x77, 0xe5, 0xb5, 0x3b, 0xd8, 0x98, 0x7c, 0x42, 0x05, 0xcb,
+    0xb7, 0x91, 0x07, 0x3f, 0x47, 0xff, 0x13, 0x15, 0x45, 0xff, 0x05, 0x03, 0x3d, 0xed, 0x63, 0x96,
+    0x3a, 0x5c, 0xf8, 0x59, 0xd0, 0xbc, 0x68, 0x8c, 0xfb, 0xf8, 0x29, 0x07, 0x76, 0x63, 0xa7, 0x39,
+    0xc1, 0x82, 0xc1, 0x10, 0x8b, 0x17, 0xf2, 0x1d, 0x14, 0xdd, 0x88, 0xe7, 0xdc, 0x2f, 0xa7, 0x9d,
+    0xa3, 0xaa, 0xfd, 0x1a, 0x70, 0xce, 0x57, 0xb5, 0x9f, 0xc3, 0x7b, 0xd0, 0xc0, 0x6f, 0x73, 0x81,
+    0x74, 0x41, 0x93, 0x0d, 0x0d, 0x1a, 0x95, 0xf6, 0xe4, 0x1c, 0x04, 0x2b, 0x37, 0x4f, 0xf9, 0x99,
+    0x82, 0x57, 0xf0, 0x4f, 0x14, 0xcb, 0x0f, 0x3d, 0x1a, 0x52, 0x69, 0x18, 0x3f, 0xbe, 0x1c, 0x1c,
+    0x1b, 0xca, 0xbd, 0xe7, 0xe0, 0x81, 0x44, 0x6d, 0x4a, 0x08, 0x8a, 0xe2, 0x7e, 0x59, 0x9f, 0x89,
+    0x44, 0x7e, 0x4d, 0xaf, 0x5a, 0x8e, 0xe8, 0xd2, 0x2e, 0x98, 0x72, 0x86, 0xef, 0x7b, 0xcf, 0x88,
+    0xd0, 0xe2, 0xd5, 0xd9, 0xd5, 0x19, 0xa2, 0x8c, 0xf4, 0x40, 0x98, 0x86, 0x32, 0x9f, 0x3e, 0x25,
+    0x05, 0xd0, 0xdc, 0xf8, 0x1a, 0x0f, 0xdf, 0xc0, 0x54, 0x46, 0x20, 0xbd, 0xd4, 0xf6, 0xf5, 0xdd,
+    0x10, 0x2e, 0xa7, 0x1a, 0xf4, 0xbb, 0xed, 0x5d, 0xf3, 0x1c, 0x96, 0x44, 0x81, 0x69, 0xd4, 0x0b,
+    0xbe, 0x59, 0x07, 0x1b, 0x7f, 0x93, 0xc3, 0x4e, 0x7b, 0x32, 0x51, 0xd0, 0x13, 0x47, 0x57, 0x52,
+    0xf0, 0x5c, 0x54, 0x36, 0x22, 0xb6, 0xf5, 0x67, 0xbb, 0xd3, 0xa6, 0x43, 0xf0, 0xca, 0x98, 0x91,
+    0xda, 0x31, 0x3e, 0xd2, 0x8c, 0xfe, 0xd7, 0x51
     };
 
 #define KEY_PEM_LENGTH 1679
diff --git a/tests/fuzz/corpus_generator.c b/tests/fuzz/corpus_generator.c
index 7a04a5b803f..bc13aa1f6fe 100644
--- a/tests/fuzz/corpus_generator.c
+++ b/tests/fuzz/corpus_generator.c
@@ -408,7 +408,7 @@ subscriptionRequests(UA_Client *client) {
     ASSERT_GOOD(setPublishingModeResponse.responseHeader.serviceResult);
     UA_SetPublishingModeRequest_clear(&setPublishingModeRequest);
     UA_SetPublishingModeResponse_clear(&setPublishingModeResponse);
-    
+
 
     // createMonitoredItemsRequest
     UA_UInt32 monId;
@@ -461,7 +461,7 @@ subscriptionRequests(UA_Client *client) {
     ASSERT_GOOD(modifyMonitoredItemsResponse.responseHeader.serviceResult);
     UA_ModifyMonitoredItemsRequest_clear(&modifyMonitoredItemsRequest);
     UA_ModifyMonitoredItemsResponse_clear(&modifyMonitoredItemsResponse);
-    
+
     // setMonitoringMode
     UA_SetMonitoringModeRequest setMonitoringModeRequest;
     UA_SetMonitoringModeRequest_init(&setMonitoringModeRequest);
diff --git a/tests/fuzz/ua_debug_dump_pkgs_file.c b/tests/fuzz/ua_debug_dump_pkgs_file.c
index 36133c44822..12b4b7e45a8 100644
--- a/tests/fuzz/ua_debug_dump_pkgs_file.c
+++ b/tests/fuzz/ua_debug_dump_pkgs_file.c
@@ -134,7 +134,7 @@ UA_debug_dumpCompleteChunk(UA_Server *const server, UA_Connection *const connect
     struct UA_dump_filename dump_filename;
     dump_filename.messageType = NULL;
     dump_filename.serviceName[0] = 0;
-    
+
     UA_Connection c = createDummyConnection(RECEIVE_BUFFER_SIZE, NULL);
     UA_SecureChannel dummy;
     UA_SecureChannel_init(&dummy, &connection->channel->config);
@@ -155,7 +155,7 @@ UA_debug_dumpCompleteChunk(UA_Server *const server, UA_Connection *const connect
     dummy.securityPolicy = NULL;
     UA_SecureChannel_deleteBuffered(&dummy);
     c.close(&c);
-    
+
     char fileName[250];
     snprintf(fileName, sizeof(fileName), "%s/%05u_%s%s", UA_CORPUS_OUTPUT_DIR, ++UA_dump_chunkCount,
              dump_filename.messageType ? dump_filename.messageType : "", dump_filename.serviceName);
diff --git a/tests/multithreading/check_mt_addVariableTypeNode.c b/tests/multithreading/check_mt_addVariableTypeNode.c
index 0c74429e8c2..80a16bdf6c9 100644
--- a/tests/multithreading/check_mt_addVariableTypeNode.c
+++ b/tests/multithreading/check_mt_addVariableTypeNode.c
@@ -110,7 +110,7 @@ void client_addVariableType(void* value){
 static
 void initTest(void) {
     initThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
-    
+
     for (size_t i = 0; i < tc.numberOfWorkers; i++) {
         setThreadContext(&tc.workerContext[i], i, ITERATIONS_PER_WORKER, server_addVariableType);
     }
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
index c96b178ca37..c3ca52680a9 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
@@ -190,8 +190,8 @@ START_TEST(checkGuid) {
     ck_assert(out.type == &UA_TYPES[UA_TYPES_GUID]);
     ck_assert(out.arrayLength == 3);
     UA_Guid *ArrayData = (UA_Guid *)out.data;
-    UA_Guid ArrayGuidVal[3] = {UA_GUID("7822a391-1111-4a59-b08d-b70bc63fecec"), 
-                               UA_GUID("7822a391-2222-4a59-b08d-b70bc63fecec"), 
+    UA_Guid ArrayGuidVal[3] = {UA_GUID("7822a391-1111-4a59-b08d-b70bc63fecec"),
+                               UA_GUID("7822a391-2222-4a59-b08d-b70bc63fecec"),
                                UA_GUID("7822a391-3333-4a59-b08d-b70bc63fecec")};
     ck_assert(UA_Guid_equal(&ArrayData[0], &ArrayGuidVal[0]));
     ck_assert(UA_Guid_equal(&ArrayData[1], &ArrayGuidVal[1]));
diff --git a/tests/pubsub/check_pubsub_config_freeze.c b/tests/pubsub/check_pubsub_config_freeze.c
index 3038f12a426..51cd017669e 100644
--- a/tests/pubsub/check_pubsub_config_freeze.c
+++ b/tests/pubsub/check_pubsub_config_freeze.c
@@ -71,7 +71,7 @@ START_TEST(CreateAndLockConfiguration) {
     UA_WriterGroup *writerGroup = UA_WriterGroup_findWGbyId(server, writerGroup1);
     ck_assert(writerGroup->state == UA_PUBSUBSTATE_DISABLED);
 
-    UA_DataSetMetaDataType dataSetMetaDataType; 
+    UA_DataSetMetaDataType dataSetMetaDataType;
     UA_DataSetMetaDataType_init(&dataSetMetaDataType);
     ck_assert(UA_Server_getPublishedDataSetMetaData(server, publishedDataSet1, &dataSetMetaDataType) == UA_STATUSCODE_GOOD);
     UA_DataSetMetaDataType_clear(&dataSetMetaDataType);
@@ -79,7 +79,7 @@ START_TEST(CreateAndLockConfiguration) {
     UA_PublishedDataSetConfig publishedDataSetConfig;
     memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
     publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE;
-    UA_DataSetMetaDataType metaDataType; 
+    UA_DataSetMetaDataType metaDataType;
     UA_DataSetMetaDataType_init(&metaDataType);
     publishedDataSetConfig.config.itemsTemplate.metaData = metaDataType;
     publishedDataSetConfig.config.itemsTemplate.variablesToAddSize = 1;
diff --git a/tests/pubsub/check_pubsub_encoding.c b/tests/pubsub/check_pubsub_encoding.c
index c4d0601771a..659cbe53cf6 100644
--- a/tests/pubsub/check_pubsub_encoding.c
+++ b/tests/pubsub/check_pubsub_encoding.c
@@ -44,7 +44,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueVariantKeyFrame) {
     memset(bufPos, 0, msgSize);
     const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
     rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
-    
+
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
 
     UA_NetworkMessage m2;
@@ -1023,7 +1023,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantKeyFrameTSProm) {
     m.promotedFieldsEnabled = true;
     m.promotedFieldsSize = 1;
     m.promotedFields = (UA_Variant*)UA_Array_new(m.promotedFieldsSize, &UA_TYPES[UA_TYPES_VARIANT]);
-    
+
     UA_DataSetMessage dmkf;
     memset(&dmkf, 0, sizeof(UA_DataSetMessage));
     dmkf.header.dataSetMessageValid = true;
@@ -1364,13 +1364,13 @@ int main(void) {
 
     TCase *tc_ende2 = tcase_create("encode_decode2DS");
     tcase_add_test(tc_ende2, UA_PubSub_EnDecode_ShallWorkOn2DSVariant);
-    
-    Suite *s = suite_create("PubSub NetworkMessage");   
+
+    Suite *s = suite_create("PubSub NetworkMessage");
     suite_add_tcase(s, tc_encode);
     suite_add_tcase(s, tc_decode);
     suite_add_tcase(s, tc_ende1);
     suite_add_tcase(s, tc_ende2);
-    
+
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
     srunner_run_all(sr,CK_NORMAL);
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 7894d83912a..a724fce8d4d 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -37,7 +37,7 @@ static void teardown(void) {
 
 /***************************************************************************************************/
 static void AddConnection(
-    char *pName, 
+    char *pName,
     UA_UInt32 PublisherId,
     UA_NodeId *opConnectionId) {
 
@@ -63,7 +63,7 @@ static void AddConnection(
 /***************************************************************************************************/
 static void AddWriterGroup(
     UA_NodeId *pConnectionId,
-    char *pName, 
+    char *pName,
     UA_UInt32 WriterGroupId,
     UA_Duration PublishingInterval,
     UA_NodeId *opWriterGroupId) {
@@ -94,10 +94,10 @@ static void AddWriterGroup(
 /***************************************************************************************************/
 static void AddPublishedDataSet(
     UA_NodeId *pWriterGroupId,
-    char *pPublishedDataSetName, 
+    char *pPublishedDataSetName,
     char *pDataSetWriterName,
     UA_UInt32 DataSetWriterId,
-    UA_NodeId *opPublishedDataSetId, 
+    UA_NodeId *opPublishedDataSetId,
     UA_NodeId *opPublishedVarId,
     UA_NodeId *opDataSetWriterId) {
 
@@ -152,7 +152,7 @@ static void AddPublishedDataSet(
 /***************************************************************************************************/
 static void AddReaderGroup(
     UA_NodeId *pConnectionId,
-    char *pName, 
+    char *pName,
     UA_NodeId *opReaderGroupId) {
 
     assert(pConnectionId != 0);
@@ -169,7 +169,7 @@ static void AddReaderGroup(
 /***************************************************************************************************/
 static void AddDataSetReader(
     UA_NodeId *pReaderGroupId,
-    char *pName, 
+    char *pName,
     UA_UInt32 PublisherId,
     UA_UInt32 WriterGroupId,
     UA_UInt32 DataSetWriterId,
@@ -221,7 +221,7 @@ static void AddDataSetReader(
     UA_FieldTargetVariable *pTargetVariables =  (UA_FieldTargetVariable *)
         UA_calloc(readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
     assert(pTargetVariables != 0);
-    
+
     UA_FieldTargetDataType_init(&pTargetVariables[0].targetVariable);
 
     pTargetVariables[0].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
@@ -229,7 +229,7 @@ static void AddDataSetReader(
 
     ck_assert(UA_Server_DataSetReader_createTargetVariables(server, *opDataSetReaderId,
         readerConfig.dataSetMetaData.fieldsSize, pTargetVariables) == UA_STATUSCODE_GOOD);
-    
+
     UA_FieldTargetDataType_clear(&pTargetVariables[0].targetVariable);
     UA_free(pTargetVariables);
     pTargetVariables = 0;
@@ -264,7 +264,7 @@ START_TEST(Test_normal_operation) {
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
     UA_UInt32 DSWNo_Conn1_WG1_DS1 = 1;
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1_DS1, &PDSId_Conn1_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1_DS1, &PDSId_Conn1_WG1_PDS1,
         &VarId_Conn1_WG1_DS1, &DsWId_Conn1_WG1_DS1);
 
     /* setup Connection 1: reader */
@@ -277,7 +277,7 @@ START_TEST(Test_normal_operation) {
     UA_NodeId VarId_Conn1_RG1_DSR1;
     UA_NodeId_init(&VarId_Conn1_RG1_DSR1);
     UA_Duration MessageReceiveTimeout_Conn1_RG1_DSR1 = 350.0;
-    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS1, 
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS1,
         MessageReceiveTimeout_Conn1_RG1_DSR1, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1);
 
 
@@ -362,7 +362,7 @@ START_TEST(Test_corner_cases) {
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
     UA_UInt32 DSWNo_Conn1_WG1_DS1 = 1;
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1_DS1, &PDSId_Conn1_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1_DS1, &PDSId_Conn1_WG1_PDS1,
         &VarId_Conn1_WG1_DS1, &DsWId_Conn1_WG1_DS1);
 
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_WriterGroup_getState(server, WGId_Conn1_WG1, &state));
@@ -383,7 +383,7 @@ START_TEST(Test_corner_cases) {
     UA_NodeId VarId_Conn1_RG1_DSR1;
     UA_NodeId_init(&VarId_Conn1_RG1_DSR1);
     UA_Duration MessageReceiveTimeout_Conn1_RG1_DSR1 = 350.0;
-    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS1, 
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS1,
         MessageReceiveTimeout_Conn1_RG1_DSR1, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1);
 
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_ReaderGroup_getState(server, RGId_Conn1_RG1, &state));
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 02bd94a6663..e611c2c9a62 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -1043,7 +1043,7 @@ START_TEST(AddNewPubSubConnectionWithReaderGroupandDataSetReader){
         targetVars.targetVariablesSize = 4;
         targetVars.targetVariables = (UA_FieldTargetDataType *)
             UA_calloc(targetVars.targetVariablesSize, sizeof(UA_FieldTargetDataType));
-        UA_ExtensionObject extensionObjectTargetVars; 
+        UA_ExtensionObject extensionObjectTargetVars;
         for(size_t i = 0; i < targetVars.targetVariablesSize; i++) {
             /* For creating Targetvariables */
             UA_FieldTargetDataType_init(&targetVars.targetVariables[i]);
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index b069058e263..9decb134454 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -1435,7 +1435,7 @@ START_TEST(MultiPublishSubscribeInt32) {
     UA_NodeId dataSetWriter;
     UA_NodeId readerIdentifier;
     UA_NodeId writerGroup;
-    
+
     /* Published DataSet */
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 68899aeae6a..4897b0403e3 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -79,7 +79,7 @@ static void teardown(void) {
 
 /***************************************************************************************************/
 static void AddConnection(
-    char *pName, 
+    char *pName,
     UA_UInt32 PublisherId,
     UA_NodeId *opConnectionId) {
 
@@ -105,7 +105,7 @@ static void AddConnection(
 /***************************************************************************************************/
 static void AddWriterGroup(
     UA_NodeId *pConnectionId,
-    char *pName, 
+    char *pName,
     UA_UInt32 WriterGroupId,
     UA_Duration PublishingInterval,
     UA_NodeId *opWriterGroupId) {
@@ -139,10 +139,10 @@ static void AddWriterGroup(
 /***************************************************************************************************/
 static void AddPublishedDataSet(
     UA_NodeId *pWriterGroupId,
-    char *pPublishedDataSetName, 
+    char *pPublishedDataSetName,
     char *pDataSetWriterName,
     UA_UInt32 DataSetWriterId,
-    UA_NodeId *opPublishedDataSetId, 
+    UA_NodeId *opPublishedDataSetId,
     UA_NodeId *opPublishedVarId,
     UA_NodeId *opDataSetWriterId) {
 
@@ -212,7 +212,7 @@ static void AddPublishedDataSet(
 /***************************************************************************************************/
 static void AddReaderGroup(
     UA_NodeId *pConnectionId,
-    char *pName, 
+    char *pName,
     UA_NodeId *opReaderGroupId) {
 
     ck_assert(pConnectionId != 0);
@@ -232,7 +232,7 @@ static void AddReaderGroup(
 /***************************************************************************************************/
 static void AddDataSetReader(
     UA_NodeId *pReaderGroupId,
-    char *pName, 
+    char *pName,
     UA_UInt32 PublisherId,
     UA_UInt32 WriterGroupId,
     UA_UInt32 DataSetWriterId,
@@ -309,7 +309,7 @@ static void AddDataSetReader(
     UA_FieldTargetVariable *pTargetVariables =  (UA_FieldTargetVariable *)
         UA_calloc(readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
     ck_assert(pTargetVariables != 0);
-    
+
     UA_FieldTargetDataType_init(&pTargetVariables[0].targetVariable);
 
     pTargetVariables[0].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
@@ -317,7 +317,7 @@ static void AddDataSetReader(
 
     ck_assert(UA_Server_DataSetReader_createTargetVariables(server, *opDataSetReaderId,
         readerConfig.dataSetMetaData.fieldsSize, pTargetVariables) == UA_STATUSCODE_GOOD);
-    
+
     UA_FieldTargetDataType_clear(&pTargetVariables[0].targetVariable);
     UA_free(pTargetVariables);
     pTargetVariables = 0;
@@ -334,7 +334,7 @@ static void AddDataSetReader(
 static void ServerDoProcess(
     const char *pMessage,
     const UA_UInt32 Sleep_ms,             /* use at least publishing interval */
-    const UA_UInt32 NoOfRunIterateCycles) 
+    const UA_UInt32 NoOfRunIterateCycles)
 {
     ck_assert(pMessage != 0);
 
@@ -355,7 +355,7 @@ static void ValidatePublishSubscribe(
     UA_NodeId SubscribedVarId,
     UA_Int32 TestValue,
     UA_UInt32 Sleep_ms, /* use at least publishing interval */
-    UA_UInt32 NoOfRunIterateCycles) 
+    UA_UInt32 NoOfRunIterateCycles)
 {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): set variable to publish");
 
@@ -373,7 +373,7 @@ static void ValidatePublishSubscribe(
     retVal = UA_Server_readValue(server, SubscribedVarId, &SubscribedNodeData);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(SubscribedNodeData.data != 0);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): check value: %i vs. %i", 
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): check value: %i vs. %i",
         TestValue, *(UA_Int32 *)SubscribedNodeData.data);
     ck_assert_int_eq(TestValue, *(UA_Int32 *)SubscribedNodeData.data);
     UA_Variant_clear(&SubscribedNodeData);
@@ -385,7 +385,7 @@ static void ValidatePublishSubscribe(
 static void ValidatePublishSubscribe_fast_path(
     UA_Int32 TestValue,
     UA_UInt32 Sleep_ms, /* use at least publishing interval */
-    UA_UInt32 NoOfRunIterateCycles) 
+    UA_UInt32 NoOfRunIterateCycles)
 {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe_fast_path(): set variable to publish");
 
@@ -467,7 +467,7 @@ START_TEST(Test_basic) {
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
 
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", 1, &PDSId_Conn1_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", 1, &PDSId_Conn1_WG1_PDS1,
         &VarId_Conn1_WG1, &DsWId_Conn1_WG1_DS1);
 
     /* setup Connection 2: corresponding readergroup and reader for Connection 1 */
@@ -563,7 +563,7 @@ START_TEST(Test_basic) {
     ExpectedCallbackCnt = 2;
     pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
     pExpectedComponentCallbackIds[1] = WGId_Conn1_WG1;
-    
+
     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup");
@@ -720,11 +720,11 @@ static void
 PubSubStateChangeCallback_different_timeouts(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                              UA_PubSubState state, UA_StatusCode status) {
     ck_assert(hostServer == server);
-    
+
     /* Disable some checks during shutdown */
     if(!runtime)
         return;
-    
+
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
@@ -753,14 +753,14 @@ PubSubStateChangeCallback_different_timeouts(UA_Server *hostServer, UA_NodeId *p
 
 /* TODO: test does not work if we add the same reader on the same connection ...
     maybe only 1 reader per connection receives the data ... ??
-    or the second reader overwrites the first? 
+    or the second reader overwrites the first?
     issue: https://github.com/open62541/open62541/issues/3901 */
 
 START_TEST(Test_different_timeouts) {
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_different_timeouts");
 
-    /* 
+    /*
         Connection 1: WG1 : DSW1 (pub interval = 20)    --> Connection 1: RG1 : DSR1 (msgrcvtimeout = 100)
                                                         --> Connection 1: RG1 : DSR2 (msgrcvtimeout = 200)
                                                         --> Connection 2: RG1 : DSR1 (msgrcvtimeout = 300)
@@ -791,7 +791,7 @@ START_TEST(Test_different_timeouts) {
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
     UA_UInt32 DSWNo_Conn1_WG1 = 1;
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1, &PDSId_Conn1_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1, &PDSId_Conn1_WG1_PDS1,
         &VarId_Conn1_WG1_DS1, &DsWId_Conn1_WG1_DS1);
 
     UA_NodeId RGId_Conn1_RG1;
@@ -803,7 +803,7 @@ START_TEST(Test_different_timeouts) {
     UA_NodeId VarId_Conn1_RG1_DSR1;
     UA_NodeId_init(&VarId_Conn1_RG1_DSR1);
     UA_Duration MessageReceiveTimeout_Conn1_RG1_DSR1 = 100.0;
-    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1, 
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1,
         MessageReceiveTimeout_Conn1_RG1_DSR1, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1);
 
     UA_String strId;
@@ -818,7 +818,7 @@ START_TEST(Test_different_timeouts) {
     // UA_NodeId VarId_Conn1_RG1_DSR2;
     // UA_NodeId_init(&VarId_Conn1_RG1_DSR2);
     // UA_Duration MessageReceiveTimeout_Conn1_RG1_DSR2 = 200.0;
-    // AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR2", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1, 
+    // AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR2", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1,
     //     MessageReceiveTimeout_Conn1_RG1_DSR2, &VarId_Conn1_RG1_DSR2, &DSRId_Conn1_RG1_DSR2);
     // UA_String_init(&strId);
     // UA_NodeId_print(&DSRId_Conn1_RG1_DSR2, &strId);
@@ -840,7 +840,7 @@ START_TEST(Test_different_timeouts) {
     UA_NodeId VarId_Conn2_RG1_DSR1;
     UA_NodeId_init(&VarId_Conn2_RG1_DSR1);
     UA_Duration MessageReceiveTimeout_Conn2_RG1_DSR1 = 300.0;
-    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1, MessageReceiveTimeout_Conn2_RG1_DSR1, 
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1, MessageReceiveTimeout_Conn2_RG1_DSR1,
         &VarId_Conn2_RG1_DSR1, &DSRId_Conn2_RG1_DSR1);
     UA_String_init(&strId);
     UA_NodeId_print(&DSRId_Conn2_RG1_DSR1, &strId);
@@ -855,9 +855,9 @@ START_TEST(Test_different_timeouts) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check normal pubsub operation");
 
     /* set all writer- and readergroups to operational (this triggers the publish and subscribe callback)
-        enable the readers first, because otherwise we receive something immediately and start the 
+        enable the readers first, because otherwise we receive something immediately and start the
         message receive timeout.
-        If we do some other checks before triggering the server_run_iterate function, this could 
+        If we do some other checks before triggering the server_run_iterate function, this could
         cause a timeout. */
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
     ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
@@ -889,7 +889,7 @@ START_TEST(Test_different_timeouts) {
     // ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR2, &state) == UA_STATUSCODE_GOOD);
     // ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); 
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
     /* check that publish/subscribe works (for all readers) -> set some test values */
     ValidatePublishSubscribe(VarId_Conn1_WG1_DS1, VarId_Conn1_RG1_DSR1, 10, (UA_UInt32) (PublishingInterval_Conn1_WG1), 20);
@@ -907,7 +907,7 @@ START_TEST(Test_different_timeouts) {
     pExpectedComponentCallbackIds[1] = WGId_Conn1_WG1;
     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
-    
+
     ck_assert(UA_STATUSCODE_GOOD == UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1));
 
     /* check that callback has been called for writer group and dataset */
@@ -947,7 +947,7 @@ static void PubSubStateChangeCallback_wrong_timeout (
     UA_NodeId *pubsubComponentId,
     UA_PubSubState state,
     UA_StatusCode status) {
-    
+
     ck_assert(hostServer == server);
 
     UA_String strId;
@@ -957,10 +957,10 @@ static void PubSubStateChangeCallback_wrong_timeout (
         "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
     UA_String_clear(&strId);
 
-    if ((UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) && 
+    if ((UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) &&
         (state == ExpectedCallbackStateChange) &&
         (status == ExpectedCallbackStatus)) {
-        
+
         CallbackCnt++;
     }
 }
@@ -970,7 +970,7 @@ START_TEST(Test_wrong_timeout) {
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_wrong_timeout");
 
-    /* 
+    /*
         Connection 1: WG1 : DSW1    --> Connection 1: RG1 : DSR1
     */
 
@@ -999,7 +999,7 @@ START_TEST(Test_wrong_timeout) {
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
     UA_UInt32 DSWNo_Conn1_WG1 = 1;
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1, &PDSId_Conn1_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1, &PDSId_Conn1_WG1_PDS1,
         &VarId_Conn1_WG1_DS1, &DsWId_Conn1_WG1_DS1);
 
     UA_NodeId RGId_Conn1_RG1;
@@ -1011,7 +1011,7 @@ START_TEST(Test_wrong_timeout) {
     UA_NodeId VarId_Conn1_RG1_DSR1;
     UA_NodeId_init(&VarId_Conn1_RG1_DSR1);
     UA_Duration MessageReceiveTimeout_Conn1_RG1_DSR1 = 200.0;
-    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1, 
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1,
         MessageReceiveTimeout_Conn1_RG1_DSR1, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1);
 
     /* expected order of pubsub component timeouts: */
@@ -1066,10 +1066,10 @@ static void
 PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                           UA_PubSubState state, UA_StatusCode status) {
     ck_assert(hostServer == server);
-    
+
     if(!runtime)
         return;
-    
+
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
@@ -1091,7 +1091,7 @@ PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubs
     if (ExpectedCallbackStateChange == UA_PUBSUBSTATE_ERROR) {
         /*  On error we want to verify the order of DataSetReader timeouts */
         ck_assert(UA_NodeId_equal(pubsubComponentId, &pExpectedComponentCallbackIds[CallbackCnt]) == UA_TRUE);
-    } /* when the state is set back to operational we cannot verify the order of StateChanges, because we 
+    } /* when the state is set back to operational we cannot verify the order of StateChanges, because we
             cannot know which DataSetReader will be operational first */
     CallbackCnt++;
 }
@@ -1134,7 +1134,7 @@ START_TEST(Test_many_components) {
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
     UA_UInt32 DSWNo_Conn1_WG1_DS1 = 1;
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1_DS1, &PDSId_Conn1_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1_DS1, &PDSId_Conn1_WG1_PDS1,
         &VarId_Conn1_WG1_DS1, &DsWId_Conn1_WG1_DS1);
 
     UA_NodeId DsWId_Conn1_WG1_DS2;
@@ -1144,7 +1144,7 @@ START_TEST(Test_many_components) {
     UA_NodeId PDSId_Conn1_WG1_PDS2;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS2);
     UA_UInt32 DSWNo_Conn1_WG1_DS2 = 2;
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS2", "Conn1_WG1_DS2", DSWNo_Conn1_WG1_DS2, &PDSId_Conn1_WG1_PDS2, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS2", "Conn1_WG1_DS2", DSWNo_Conn1_WG1_DS2, &PDSId_Conn1_WG1_PDS2,
         &VarId_Conn1_WG1_DS2, &DsWId_Conn1_WG1_DS2);
 
 
@@ -1167,7 +1167,7 @@ START_TEST(Test_many_components) {
     UA_NodeId PDSId_Conn2_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn2_WG1_PDS1);
     UA_UInt32 DSWNo_Conn2_WG1_DS1 = 1;
-    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", DSWNo_Conn2_WG1_DS1, &PDSId_Conn2_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", DSWNo_Conn2_WG1_DS1, &PDSId_Conn2_WG1_PDS1,
         &VarId_Conn2_WG1_DS1, &DsWId_Conn2_WG1_DS1);
 
 
@@ -1184,7 +1184,7 @@ START_TEST(Test_many_components) {
     UA_NodeId PDSId_Conn2_WG2_PDS1;
     UA_NodeId_init(&PDSId_Conn2_WG2_PDS1);
     UA_UInt32 DSWNo_Conn2_WG2_DS1 = 1;
-    AddPublishedDataSet(&WGId_Conn2_WG2, "Conn2_WG2_PDS1", "Conn2_WG2_DS1", DSWNo_Conn2_WG2_DS1, &PDSId_Conn2_WG2_PDS1, 
+    AddPublishedDataSet(&WGId_Conn2_WG2, "Conn2_WG2_PDS1", "Conn2_WG2_DS1", DSWNo_Conn2_WG2_DS1, &PDSId_Conn2_WG2_PDS1,
         &VarId_Conn2_WG2_DS1, &DsWId_Conn2_WG2_DS1);
 
     /* setup Connection 1: readers */
@@ -1197,7 +1197,7 @@ START_TEST(Test_many_components) {
     UA_NodeId VarId_Conn1_RG1_DSR1;
     UA_NodeId_init(&VarId_Conn1_RG1_DSR1);
     UA_Duration MessageReceiveTimeout_Conn1_RG1_DSR1 = 25.0;
-    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn2, WGNo_Conn2_WG1, DSWNo_Conn2_WG1_DS1, 
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn2, WGNo_Conn2_WG1, DSWNo_Conn2_WG1_DS1,
         MessageReceiveTimeout_Conn1_RG1_DSR1, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1);
     UA_String strId;
     UA_String_init(&strId);
@@ -1215,7 +1215,7 @@ START_TEST(Test_many_components) {
     UA_NodeId VarId_Conn2_RG1_DSR1;
     UA_NodeId_init(&VarId_Conn2_RG1_DSR1);
     UA_Duration MessageReceiveTimeout_Conn2_RG1_DSR1 = 40.0;
-    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS1, 
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS1,
         MessageReceiveTimeout_Conn2_RG1_DSR1, &VarId_Conn2_RG1_DSR1, &DSRId_Conn2_RG1_DSR1);
     UA_String_init(&strId);
     UA_NodeId_print(&DSRId_Conn2_RG1_DSR1, &strId);
@@ -1231,7 +1231,7 @@ START_TEST(Test_many_components) {
     UA_NodeId VarId_Conn2_RG2_DSR1;
     UA_NodeId_init(&VarId_Conn2_RG2_DSR1);
     UA_Duration MessageReceiveTimeout_Conn2_RG2_DSR1 = 45.0;
-    AddDataSetReader(&RGId_Conn2_RG2, "Conn2_RG2_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS2, 
+    AddDataSetReader(&RGId_Conn2_RG2, "Conn2_RG2_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS2,
         MessageReceiveTimeout_Conn2_RG2_DSR1, &VarId_Conn2_RG2_DSR1, &DSRId_Conn2_RG2_DSR1);
     UA_String_init(&strId);
     UA_NodeId_print(&DSRId_Conn2_RG2_DSR1, &strId);
@@ -1253,7 +1253,7 @@ START_TEST(Test_many_components) {
     UA_NodeId VarId_Conn3_RG1_DSR1;
     UA_NodeId_init(&VarId_Conn3_RG1_DSR1);
     UA_Duration MessageReceiveTimeout_Conn3_RG1_DSR1 = 25.0;
-    AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", PublisherNo_Conn2, WGNo_Conn2_WG2, DSWNo_Conn2_WG2_DS1, 
+    AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", PublisherNo_Conn2, WGNo_Conn2_WG2, DSWNo_Conn2_WG2_DS1,
         MessageReceiveTimeout_Conn3_RG1_DSR1, &VarId_Conn3_RG1_DSR1, &DSRId_Conn3_RG1_DSR1);
     UA_String_init(&strId);
     UA_NodeId_print(&DSRId_Conn3_RG1_DSR1, &strId);
@@ -1302,7 +1302,7 @@ START_TEST(Test_many_components) {
 
     /* check that publish/subscribe works -> set some test values */
 
-    /* use a low enough sleep value to ensure that publishing intervals and message receive timeouts 
+    /* use a low enough sleep value to ensure that publishing intervals and message receive timeouts
         are handled */
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn2_RG1_DSR1");
     ValidatePublishSubscribe(VarId_Conn1_WG1_DS1, VarId_Conn2_RG1_DSR1, 10, SleepTime, NoOfRunIterateCycles);
@@ -1386,7 +1386,7 @@ START_TEST(Test_many_components) {
     pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
     pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
     pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
-    
+
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
 
     /* check number of state changes */
@@ -1461,7 +1461,7 @@ START_TEST(Test_many_components) {
     ExpectedCallbackCnt = 2;
     pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1;
     pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1;
-    
+
     ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
@@ -1637,10 +1637,10 @@ static void
 PubSubStateChangeCallback_update_config(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                         UA_PubSubState state, UA_StatusCode status) {
     ck_assert(hostServer == server);
-    
+
     if(!runtime)
         return;
-    
+
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
@@ -1688,7 +1688,7 @@ START_TEST(Test_update_config) {
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
 
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", 1, &PDSId_Conn1_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", 1, &PDSId_Conn1_WG1_PDS1,
         &VarId_Conn1_WG1, &DsWId_Conn1_WG1_DS1);
 
     /* setup corresponding readergroup and reader for Connection 1 */
@@ -1729,7 +1729,7 @@ START_TEST(Test_update_config) {
     /* check that publish/subscribe works -> set some test values */
     ValidatePublishSubscribe(VarId_Conn1_WG1, VarId_Conn1_RG1_DSR1, 10, SleepTime, NoOfRunIterateCycles);
     ValidatePublishSubscribe(VarId_Conn1_WG1, VarId_Conn1_RG1_DSR1, 33, SleepTime, NoOfRunIterateCycles);
-    
+
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
@@ -1869,7 +1869,7 @@ START_TEST(Test_fast_path) {
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
 
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", 1, &PDSId_Conn1_WG1_PDS1, 
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", 1, &PDSId_Conn1_WG1_PDS1,
         &VarId_Conn1_WG1, &DsWId_Conn1_WG1_DS1);
 
     /* setup Connection 2: corresponding readergroup and reader for Connection 1 */
@@ -1970,7 +1970,7 @@ START_TEST(Test_fast_path) {
 
     /* check that PubSubStateChange callback has been called for the specific DataSetReader */
     ck_assert_int_eq(1, CallbackCnt);
-    
+
     /* enable the publisher WriterGroup again */
     /* DataSetReader state shall be back to operational after receiving a new message */
     ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
@@ -1995,7 +1995,7 @@ START_TEST(Test_fast_path) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable readergroup. writergroup is still working");
     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
-    
+
     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
 
     /* check number of state changes */
@@ -2039,7 +2039,7 @@ int main(void) {
     TCase *tc_basic = tcase_create("Message Receive Timeout");
     tcase_add_checked_fixture(tc_basic, setup, teardown);
 
-    /* test case description: 
+    /* test case description:
         - check normal pubsub operation (2 connections)
         - 1 Connection with 1 DataSetWriter, 1 Connection with counterpart DataSetReader
         - enable/disable writer- and readergroup multiple times
@@ -2047,14 +2047,14 @@ int main(void) {
     */
     tcase_add_test(tc_basic, Test_basic);
 
-    /* test case description: 
+    /* test case description:
         - 1 DataSetWriter
         - multiple DataSetReaders with different timeout settings
         - check order and no of message receive timeouts for the different DataSetReaders
     */
     tcase_add_test(tc_basic, Test_different_timeouts);
 
-    /* test case description: 
+    /* test case description:
         - 1 Connection, 1 DataSetWriter, 1 DataSetReader
         - reader with wrong timeout setting (timeout is smaller than publishing interval)
     */
@@ -2062,7 +2062,7 @@ int main(void) {
 
     /* test case description:
         - configure multiple connections with multiple readers and writers
-        - disable/enable and check for correct timeouts 
+        - disable/enable and check for correct timeouts
     */
     tcase_add_test(tc_basic, Test_many_components);
 
diff --git a/tests/server/check_nodestore.c b/tests/server/check_nodestore.c
index 04de9158915..3a16ee009be 100644
--- a/tests/server/check_nodestore.c
+++ b/tests/server/check_nodestore.c
@@ -280,7 +280,7 @@ static Suite * namespace_suite (void) {
     tcase_add_test (tc_iterate, iterateOverUA_NodeStoreShallNotVisitEmptyNodes);
     tcase_add_test (tc_iterate, iterateOverExpandedNamespaceShallNotVisitEmptyNodes);
     suite_add_tcase (s, tc_iterate);
-    
+
     TCase* tc_profile = tcase_create ("Profile-ZipTree");
     tcase_add_checked_fixture(tc_profile, setupZipTree, teardown);
     tcase_add_test (tc_profile, profileGetDelete);
@@ -306,7 +306,7 @@ static Suite * namespace_suite (void) {
     tcase_add_test (tc_iterate_hm, iterateOverUA_NodeStoreShallNotVisitEmptyNodes);
     tcase_add_test (tc_iterate_hm, iterateOverExpandedNamespaceShallNotVisitEmptyNodes);
     suite_add_tcase (s, tc_iterate_hm);
-    
+
     TCase* tc_profile_hm = tcase_create ("Profile-HashMap");
     tcase_add_checked_fixture(tc_profile_hm, setupHashMap, teardown);
     tcase_add_test (tc_profile_hm, profileGetDelete);
diff --git a/tests/server/check_server_asyncop.c b/tests/server/check_server_asyncop.c
index 6d23420d473..520bc8fe6bd 100644
--- a/tests/server/check_server_asyncop.c
+++ b/tests/server/check_server_asyncop.c
@@ -80,7 +80,7 @@ static void setup(void) {
     THREAD_CREATE(server_thread, serverloop);
 }
 
-static void teardown(void) {    
+static void teardown(void) {
     running = false;
     THREAD_JOIN(server_thread);
     UA_Server_run_shutdown(server);
@@ -256,7 +256,7 @@ static Suite* method_async_suite(void) {
     tcase_add_test(tc_manager, Async_timeout);
     tcase_add_test(tc_manager, Async_timeout_worker);
     suite_add_tcase(s, tc_manager);
-    
+
     return s;
 }
 
diff --git a/tests/server/check_server_callbacks.c b/tests/server/check_server_callbacks.c
index dee97b9cb93..4322386b268 100644
--- a/tests/server/check_server_callbacks.c
+++ b/tests/server/check_server_callbacks.c
@@ -128,7 +128,7 @@ writePressure(
       return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode 
+static UA_StatusCode
 readPressureNoAccess(
    UA_Server *tmpServer,
    const UA_NodeId *sessionId,
@@ -139,7 +139,7 @@ readPressureNoAccess(
       return UA_STATUSCODE_BADUSERACCESSDENIED;
 }
 
-static UA_StatusCode 
+static UA_StatusCode
 readPressure(
    UA_Server *tmpServer,
    const UA_NodeId *sessionId,
@@ -179,13 +179,13 @@ addValueBackendVariable(void) {
     pressureValueBackend.backend.external.value = &pPressure;
     pressureValueBackend.backend.external.callback.userWrite = writePressure ;
     pressureValueBackend.backend.external.callback.notificationRead = readPressure;
-    
+
     UA_StatusCode retval = UA_Server_addVariableNode(server, pressureNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
                                         UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Pressure"),
                                         UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr,
                                         NULL, NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    
+
     retval = UA_Server_setVariableNode_valueBackend(server, pressureNodeId, pressureValueBackend);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 }
@@ -202,14 +202,14 @@ addValueBackendVariableNoAccess(void) {
     pressureValueBackend.backend.external.value = &pPressure;
     pressureValueBackend.backend.external.callback.userWrite = writePressureNoAccess ;
     pressureValueBackend.backend.external.callback.notificationRead = readPressureNoAccess;
-    
+
     UA_StatusCode retval = UA_Server_addVariableNode(server, pressureNodeIdNoAccess, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
                                         UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Pressure_noAccess"),
                                         UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr,
                                         NULL, NULL);
 
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    
+
     retval = UA_Server_setVariableNode_valueBackend(server, pressureNodeIdNoAccess, pressureValueBackend);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 }
@@ -367,21 +367,21 @@ START_TEST(client_writePressureNoAccess) {
         UA_ClientConfig_setDefault(UA_Client_getConfig(client));
         UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        
+
         UA_Variant value;
         UA_Variant_init(&value);
-        
+
         UA_UInt32 pressureVal = 1000;
         UA_Variant_setScalarCopy(&value, &pressureVal, &UA_TYPES[UA_TYPES_UINT32]);
-        
+
         retval = UA_Client_writeValueAttribute(client, pressureNodeId, &value);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        
+
         retval = UA_Client_writeValueAttribute(client, pressureNodeIdNoAccess, &value);
         ck_assert_uint_eq(retval, UA_STATUSCODE_BADUSERACCESSDENIED);
 
         UA_Variant_clear(&value);
-        
+
         UA_Client_disconnect(client);
         UA_Client_delete(client);
     }
@@ -392,18 +392,18 @@ START_TEST(client_readPressureNoAccess) {
         UA_ClientConfig_setDefault(UA_Client_getConfig(client));
         UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        
+
         UA_Variant value;
         UA_Variant_init(&value);
-        
+
         retval = UA_Client_readValueAttribute(client, pressureNodeId, &value);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        
+
         retval = UA_Client_readValueAttribute(client, pressureNodeIdNoAccess, &value);
         ck_assert_uint_eq(retval, UA_STATUSCODE_BADUSERACCESSDENIED);
 
         UA_Variant_clear(&value);
-        
+
         UA_Client_disconnect(client);
         UA_Client_delete(client);
     }
diff --git a/tests/server/check_server_readspeed.c b/tests/server/check_server_readspeed.c
index b75b8aff977..137e3f5ce9c 100644
--- a/tests/server/check_server_readspeed.c
+++ b/tests/server/check_server_readspeed.c
@@ -33,7 +33,7 @@ static void teardown(void) {
 
 START_TEST(readSpeed) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    
+
     /* Add variable nodes to the address space */
     UA_VariableAttributes attr = UA_VariableAttributes_default;
     UA_Int32 myInteger = 42;
@@ -70,7 +70,7 @@ START_TEST(readSpeed) {
 
     UA_ReadResponse res;
     UA_ReadResponse_init(&res);
-    
+
     clock_t begin, finish;
     begin = clock();
 
@@ -102,7 +102,7 @@ END_TEST
 
 START_TEST(readSpeedWithEncoding) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    
+
     /* Add variable nodes to the address space */
     UA_VariableAttributes attr = UA_VariableAttributes_default;
     UA_Int32 myInteger = 42;
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index 3792f705318..b5f750d3258 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -280,7 +280,7 @@ START_TEST(ReadSingleAttributeBrowseNameWithoutTimestamp) {
     rvi.attributeId = UA_ATTRIBUTEID_BROWSENAME;
 
     UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-    
+
     UA_QualifiedName* respval = (UA_QualifiedName*) resp.value.data;
     const UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "the answer");
     ck_assert_uint_eq(0, resp.value.arrayLength);
@@ -316,7 +316,7 @@ START_TEST(ReadSingleAttributeDescriptionWithoutTimestamp) {
     rvi.attributeId = UA_ATTRIBUTEID_DESCRIPTION;
 
     UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-    
+
     UA_LocalizedText* respval = (UA_LocalizedText*) resp.value.data;
     UA_VariableNode* compNode = makeCompareSequence();
     ck_assert_uint_eq(0, resp.value.arrayLength);
@@ -334,7 +334,7 @@ START_TEST(ReadSingleAttributeWriteMaskWithoutTimestamp) {
     rvi.attributeId = UA_ATTRIBUTEID_WRITEMASK;
 
     UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-    
+
     UA_UInt32* respval = (UA_UInt32*) resp.value.data;
     ck_assert_uint_eq(0, resp.value.arrayLength);
     ck_assert(&UA_TYPES[UA_TYPES_UINT32] == resp.value.type);
@@ -516,7 +516,7 @@ START_TEST(ReadSingleAttributeMinimumSamplingIntervalWithoutTimestamp) {
     rvi.attributeId = UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL;
 
     UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-    
+
     UA_Double* respval = (UA_Double*) resp.value.data;
     UA_VariableNode *compNode = makeCompareSequence();
     UA_Double comp = (UA_Double) compNode->minimumSamplingInterval;
@@ -607,7 +607,7 @@ START_TEST(ReadSingleDataSourceAttributeArrayDimensionsWithoutTimestamp) {
     rvi.attributeId = UA_ATTRIBUTEID_ARRAYDIMENSIONS;
 
     UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-    
+
     ck_assert_int_eq(UA_STATUSCODE_GOOD, resp.status);
     UA_DataValue_clear(&resp);
 } END_TEST
diff --git a/tests/server/check_services_call.c b/tests/server/check_services_call.c
index e4959ad17d5..6e7d88cb144 100644
--- a/tests/server/check_services_call.c
+++ b/tests/server/check_services_call.c
@@ -58,10 +58,10 @@ static void setup(void) {
                             UA_QUALIFIEDNAME(1, "Not executable"),
                             nonExecAttr, &methodCallback,
                             0, NULL, 0, NULL, NULL, NULL);
-    
+
     /* Add callback to ServerType's getMonitoredItems method */
-    UA_Server_setMethodNodeCallback(server, 
-                                    UA_NODEID_NUMERIC(0,UA_NS0ID_SERVERTYPE_GETMONITOREDITEMS), 
+    UA_Server_setMethodNodeCallback(server,
+                                    UA_NODEID_NUMERIC(0,UA_NS0ID_SERVERTYPE_GETMONITOREDITEMS),
                                     &methodCallback);
 }
 
diff --git a/tests/server/check_services_nodemanagement.c b/tests/server/check_services_nodemanagement.c
index d0ee73f72fc..c66da660831 100644
--- a/tests/server/check_services_nodemanagement.c
+++ b/tests/server/check_services_nodemanagement.c
@@ -200,7 +200,7 @@ addVariableTypeNode(void) {
 
 START_TEST(InstantiateVariableTypeNode) {
     addVariableTypeNode();
-    
+
     /* Prepare the node attributes */
     UA_UInt32 arrayDims[1] = {2};
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
@@ -232,7 +232,7 @@ START_TEST(InstantiateVariableTypeNode) {
 
 START_TEST(InstantiateVariableTypeNodeWrongDims) {
     addVariableTypeNode();
-    
+
     /* Prepare the node attributes */
     UA_UInt32 arrayDims[1] = {3}; /* This will fail as the dimensions are too big */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
@@ -256,7 +256,7 @@ START_TEST(InstantiateVariableTypeNodeWrongDims) {
 
 START_TEST(InstantiateVariableTypeNodeLessDims) {
     addVariableTypeNode();
-    
+
     /* Prepare the node attributes */
     UA_UInt32 arrayDims[1] = {1}; /* This will match as the dimension
                                    * constraints are an upper bound */
@@ -291,7 +291,7 @@ START_TEST(AddComplexTypeWithInheritance) {
     UA_ObjectAttributes attr = UA_ObjectAttributes_default;
     attr.description = UA_LOCALIZEDTEXT("en-US","fakeServerStruct");
     attr.displayName = UA_LOCALIZEDTEXT("en-US","fakeServerStruct");
-  
+
     UA_NodeId myObjectNodeId = UA_NODEID_STRING(1, "the.fake.Server.Struct");
     UA_QualifiedName myObjectName = UA_QUALIFIEDNAME(1, "the.fake.Server.Struct");
     UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
@@ -442,7 +442,7 @@ START_TEST(DeleteObjectAndReferences) {
     bd.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
     bd.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
     bd.browseDirection = UA_BROWSEDIRECTION_FORWARD;
-    
+
     UA_BrowseResult br = UA_Server_browse(server, 0, &bd);
     ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
     size_t refCount = 0;
@@ -693,7 +693,7 @@ addObjInstance(const UA_NodeId parentNodeId, char *dispName) {
 	oAttr.displayName = UA_LOCALIZEDTEXT(NULL, dispName);
 	UA_QualifiedName browseName = UA_QUALIFIEDNAME(1, dispName);
 	UA_StatusCode st =
-        UA_Server_addObjectNode(server, UA_NODEID_NULL, 
+        UA_Server_addObjectNode(server, UA_NODEID_NULL,
                                 parentNodeId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                                 browseName, UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
                                 oAttr, NULL, &outNodeId);
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index de0779b5037..1a264e2f7ab 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -162,7 +162,7 @@ END_TEST
 
 START_TEST(Server_setPublishingMode) {
     createSubscription();
-    
+
     UA_SetPublishingModeRequest request;
     UA_SetPublishingModeRequest_init(&request);
     request.publishingEnabled = UA_TRUE;
@@ -186,7 +186,7 @@ END_TEST
 
 START_TEST(Server_republish) {
     createSubscription();
-    
+
     UA_RepublishRequest request;
     UA_RepublishRequest_init(&request);
     request.subscriptionId = subscriptionId;
@@ -225,7 +225,7 @@ END_TEST
 
 START_TEST(Server_deleteSubscription) {
     createSubscription();
-    
+
     /* Remove the subscription */
     UA_DeleteSubscriptionsRequest del_request;
     UA_DeleteSubscriptionsRequest_init(&del_request);
@@ -576,7 +576,7 @@ END_TEST
 START_TEST(Server_setMonitoringMode) {
     createSubscription();
     createMonitoredItem();
-    
+
     UA_SetMonitoringModeRequest request;
     UA_SetMonitoringModeRequest_init(&request);
     request.subscriptionId = subscriptionId;
@@ -601,7 +601,7 @@ END_TEST
 START_TEST(Server_deleteMonitoredItems) {
     createSubscription();
     createMonitoredItem();
-    
+
     UA_DeleteMonitoredItemsRequest request;
     UA_DeleteMonitoredItemsRequest_init(&request);
     request.subscriptionId = subscriptionId;
diff --git a/tests/server/check_subscription_events.c b/tests/server/check_subscription_events.c
index 17c209d9c6e..8d68de5c9f4 100644
--- a/tests/server/check_subscription_events.c
+++ b/tests/server/check_subscription_events.c
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- * 
+ *
  *    Copyright 2020-2021 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
  */
diff --git a/tools/ua-tool/ua.c b/tools/ua-tool/ua.c
index 7d86322c2cc..48bcc79ca49 100644
--- a/tools/ua-tool/ua.c
+++ b/tools/ua-tool/ua.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  */
diff --git a/tools/ua2json/ua2json.c b/tools/ua2json/ua2json.c
index f7c2bf3f45b..af2e9ccb14d 100644
--- a/tools/ua2json/ua2json.c
+++ b/tools/ua2json/ua2json.c
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  */
@@ -173,7 +173,7 @@ int main(int argc, char **argv) {
         fprintf(stderr, "Error: The first argument must be \"encode\" or \"decode\"\n");
         return -1;
     }
-        
+
     for(int argpos = 2; argpos < argc; argpos++) {
         if(strcmp(argv[argpos], "--help") == 0) {
             usage();
@@ -291,7 +291,7 @@ int main(int argc, char **argv) {
     } else {
         result = decode(&buf, &outbuf, type);
     }
-    
+
     if(result != UA_STATUSCODE_GOOD) {
         fprintf(stderr, "Error: Parsing failed with code %s\n",
                 UA_StatusCode_name(result));

From aacf1e6cb609748299ebf01a150b19d523faf98a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Jun 2022 20:41:20 +0200
Subject: [PATCH 0260/1963] fix(ci): Disable MQTT for the amalgamation build --
 not compatible with upstream repo

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2557dc46514..7cd4d6e8607 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -437,6 +437,11 @@ endif()
 option(UA_ENABLE_PUBSUB_MQTT "Enable publish/subscribe with mqtt (experimental)" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_MQTT)
 if(UA_ENABLE_PUBSUB_MQTT)
+    if(UA_ENABLE_AMALGAMATION)
+        # MQTT Support currently not compatible with the amalgamation
+        message(FATAL_ERROR "Amalgamation cannot be generated with MQTT enabled")
+    endif()
+
     if(NOT UA_FILE_MQTT)
         set(UA_FILE_MQTT ${open62541_MQTT_DIR}/src/mqtt.c)
     endif()

From 671a7f456a32e5131a71ac18ef34744ef81e6f38 Mon Sep 17 00:00:00 2001
From: gstvg <28798827+gstvg@users.noreply.github.com>
Date: Tue, 28 Jun 2022 20:08:12 -0300
Subject: [PATCH 0261/1963] fix(doc): docker README link to /tools (#5228)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 62f140b59b1..4361ff31fc0 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,7 @@ Jointly with the overall open62541 community, the core maintainers steer the lon
 
 Official docker container builds are available on [Docker Cloud](https://cloud.docker.com/u/open62541/repository/registry-1.docker.io/open62541/open62541)
 
-More information can be found in the [Docker README](docker/README.md)
+More information can be found in the [Docker README](tools/docker/README.md)
 
 ## Support & Development
 

From 0f65d100fef6f6df8307a5969a8bc552185ec80e Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Tue, 5 Jul 2022 23:57:19 +0200
Subject: [PATCH 0262/1963] test(core): fix more sign-conversion compiler
 errors

---
 tests/multithreading/check_mt_addVariableNode.c    | 4 ++--
 tests/multithreading/check_mt_readValueAttribute.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/multithreading/check_mt_addVariableNode.c b/tests/multithreading/check_mt_addVariableNode.c
index 8e02ecbc7d8..c51780c08b2 100644
--- a/tests/multithreading/check_mt_addVariableNode.c
+++ b/tests/multithreading/check_mt_addVariableNode.c
@@ -35,7 +35,7 @@ void checkServer(void) {
         UA_DataValue resp = UA_Server_read(tc.server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
 
         ck_assert_int_eq(resp.status, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(0, resp.value.arrayLength);
+        ck_assert_uint_eq(0, resp.value.arrayLength);
         ck_assert(&UA_TYPES[UA_TYPES_INT32] == resp.value.type);
         ck_assert_int_eq(42, *(UA_Int32* )resp.value.data);
         UA_DataValue_clear(&resp);
@@ -52,7 +52,7 @@ void checkServer(void) {
         UA_DataValue resp = UA_Server_read(tc.server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
 
         ck_assert_int_eq(resp.status, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(2, resp.value.arrayLength);
+        ck_assert_uint_eq(2, resp.value.arrayLength);
         ck_assert(&UA_TYPES[UA_TYPES_INT32] == resp.value.type);
         ck_assert_int_eq(10, *(UA_Int32 *)resp.value.data);
         ck_assert_int_eq(20, *((UA_Int32 *)resp.value.data + 1));
diff --git a/tests/multithreading/check_mt_readValueAttribute.c b/tests/multithreading/check_mt_readValueAttribute.c
index 85edb783741..67b7299abf1 100644
--- a/tests/multithreading/check_mt_readValueAttribute.c
+++ b/tests/multithreading/check_mt_readValueAttribute.c
@@ -55,7 +55,7 @@ void server_readValueAttribute(void * value) {
     UA_DataValue resp = UA_Server_read(tc.server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, resp.status);
     ck_assert_int_eq(true, resp.hasValue);
-    ck_assert_int_eq(0, resp.value.arrayLength);
+    ck_assert_uint_eq(0, resp.value.arrayLength);
     ck_assert(&UA_TYPES[UA_TYPES_INT32] == resp.value.type);
     ck_assert_int_eq(42, *(UA_Int32* )resp.value.data);
     UA_DataValue_clear(&resp);

From ec96224c65ee85e6b16f311b8fd163f9fa6ac79b Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 7 Jul 2022 08:22:25 +0200
Subject: [PATCH 0263/1963] fix(pubsub): correct errors in file config

Correct usage of server mutex in ua_pubsub_config.c.

Fix wrong path to test .bin files.

Add a length check after loadFile(), so it's
easier to identify an error (e.g. test failed because
file path is wrong or decoding/applying pubsub configuration
does not work)
---
 src/pubsub/ua_pubsub_config.c             | 8 ++++++--
 tests/pubsub/check_pubsub_configuration.c | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 74034e7f7b4..a0c631808c2 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -105,7 +105,9 @@ updatePubSubConfig(UA_Server *server,
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
+    UA_LOCK(&server->serviceMutex);
     UA_PubSubManager_delete(server, &server->pubSubManager);
+    UA_UNLOCK(&server->serviceMutex);
 
     /* Configuration of Published DataSets: */
     UA_UInt32 pdsCount = (UA_UInt32)configurationParameters->publishedDataSetsSize;
@@ -114,6 +116,7 @@ updatePubSubConfig(UA_Server *server,
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     UA_StatusCode res = UA_STATUSCODE_GOOD;
+
     for(UA_UInt32 i = 0; i < pdsCount; i++) {
         res = createPublishedDataSet(server,
                                      &configurationParameters->publishedDataSets[i],
@@ -144,6 +147,7 @@ updatePubSubConfig(UA_Server *server,
     }
 
     UA_free(publishedDataSetIdent);
+
     return res;
 }
 
@@ -547,7 +551,7 @@ createReaderGroup(UA_Server *server,
     memset(&config, 0, sizeof(UA_ReaderGroupConfig));
 
     config.name = readerGroupParameters->name;
-    config.securityParameters.securityMode = readerGroupParameters->securityMode;
+    config.securityMode = readerGroupParameters->securityMode;
 
     UA_NodeId readerGroupIdent;
     UA_StatusCode res =
@@ -753,7 +757,7 @@ addDataSetFieldVariables(UA_Server *server, const UA_NodeId *pdsIdent,
         fc.field.variable.publishParameters = pdItems->publishedData[i];
 
         UA_NodeId fieldIdent;
-        UA_StatusCode res = addDataSetField(server, *pdsIdent, &fc, &fieldIdent).result;
+        UA_StatusCode res = UA_Server_addDataSetField(server, *pdsIdent, &fc, &fieldIdent).result;
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addDataSetFieldVariables] "
diff --git a/tests/pubsub/check_pubsub_configuration.c b/tests/pubsub/check_pubsub_configuration.c
index 7df56b275ac..99cc8146fdf 100644
--- a/tests/pubsub/check_pubsub_configuration.c
+++ b/tests/pubsub/check_pubsub_configuration.c
@@ -32,7 +32,8 @@ static void teardown(void) {
 }
 
 START_TEST(AddPublisherUsingBinaryFile) {
-    UA_ByteString publisherConfiguration = loadFile("../tests/pubsub/check_publisher_configuration.bin");
+    UA_ByteString publisherConfiguration = loadFile("../../tests/pubsub/check_publisher_configuration.bin");
+    ck_assert(publisherConfiguration.length > 0);
     UA_StatusCode retVal = UA_PubSubManager_loadPubSubConfigFromByteString(server, publisherConfiguration);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_PubSubConnection *connection;
@@ -64,7 +65,8 @@ START_TEST(AddPublisherUsingBinaryFile) {
 } END_TEST
 
 START_TEST(AddSubscriberUsingBinaryFile) {
-    UA_ByteString subscriberConfiguration = loadFile("../tests/pubsub/check_subscriber_configuration.bin");
+    UA_ByteString subscriberConfiguration = loadFile("../../tests/pubsub/check_subscriber_configuration.bin");
+    ck_assert(subscriberConfiguration.length > 0);
     UA_StatusCode retVal = UA_PubSubManager_loadPubSubConfigFromByteString(server, subscriberConfiguration);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_PubSubConnection *connection;

From ee2c98df1c7c58ad98cfc7da4f09b86611454612 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 7 Jul 2022 07:50:04 +0200
Subject: [PATCH 0264/1963] fix(server): check for valid channel before access

Unit test check_pubsub_informationmodel_methods failed
sporadically because of a nullptr access (see issue #5239).
---
 src/server/ua_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 68221e5b873..389a88e587a 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -845,7 +845,7 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
     UA_PubSubConnection *connection;
     TAILQ_FOREACH(connection, &server->pubSubManager.connections, listEntry){
         UA_PubSubConnection *ps = connection;
-        if(ps && ps->channel->yield){
+        if(ps && ps->channel && ps->channel->yield){
             ps->channel->yield(ps->channel, 0);
         }
     }

From fd76d7faaea38843eb74f578f6b82bf8252b98b7 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Fri, 24 Jun 2022 11:46:15 +0200
Subject: [PATCH 0265/1963] feat(pubsub): Support all publisherId types

Previously only UINT16 publisherId was fully supported.
Now all PublisherId types are supported except for
string PublisherIds in combination with fast-path.
---
 CHANGELOG                                     | 10 +++
 ...erver_pubsub_subscribe_custom_monitoring.c |  3 +-
 examples/pubsub/pubsub_publish_encrypted.c    |  3 +-
 .../pubsub/pubsub_publish_encrypted_tpm.c     |  3 +-
 .../pubsub_publish_encrypted_tpm_keystore.c   |  3 +-
 examples/pubsub/pubsub_subscribe_encrypted.c  |  3 +-
 .../pubsub/pubsub_subscribe_encrypted_tpm.c   |  3 +-
 .../pubsub_subscribe_encrypted_tpm_keystore.c |  3 +-
 examples/pubsub/server_pubsub_publisher_iop.c |  3 +-
 .../pubsub/server_pubsub_publisher_rt_level.c |  3 +-
 .../server_pubsub_publisher_rt_level_raw.c    |  3 +-
 ...server_pubsub_rt_field_information_model.c |  3 +-
 .../server_pubsub_subscriber_rt_level.c       |  3 +-
 examples/pubsub/tutorial_pubsub_connection.c  |  3 +-
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |  3 +-
 examples/pubsub/tutorial_pubsub_publish.c     |  3 +-
 examples/pubsub/tutorial_pubsub_publish_raw.c |  3 +-
 examples/pubsub/tutorial_pubsub_subscribe.c   |  3 +-
 .../pubsub/tutorial_pubsub_subscribe_raw.c    |  3 +-
 .../nodeset/pubsub_nodeset_rt_publisher.c     |  3 +-
 .../nodeset/pubsub_nodeset_rt_subscriber.c    |  3 +-
 .../pubsub_realtime/pubsub_TSN_loopback.c     |  6 +-
 .../pubsub_TSN_loopback_single_thread.c       |  6 +-
 .../pubsub_realtime/pubsub_TSN_publisher.c    |  7 +-
 .../pubsub_TSN_publisher_multiple_thread.c    |  6 +-
 include/open62541/server_pubsub.h             | 30 +++++--
 src/pubsub/ua_pubsub_config.c                 | 55 ++++++++----
 src/pubsub/ua_pubsub_networkmessage.c         | 85 ++++++++++---------
 src/pubsub/ua_pubsub_networkmessage.h         | 24 ++----
 src/pubsub/ua_pubsub_networkmessage_json.c    | 52 ++++++------
 src/pubsub/ua_pubsub_ns0.c                    | 56 +++++++++---
 src/pubsub/ua_pubsub_reader.c                 | 73 ++++++++--------
 src/pubsub/ua_pubsub_writer.c                 |  6 ++
 src/pubsub/ua_pubsub_writergroup.c            | 14 ++-
 .../pubsub/check_pubsub_connection_ethernet.c |  6 +-
 .../check_pubsub_connection_ethernet_etf.c    |  6 +-
 tests/pubsub/check_pubsub_connection_mqtt.c   |  6 +-
 tests/pubsub/check_pubsub_connection_udp.c    |  6 +-
 tests/pubsub/check_pubsub_connection_xdp.c    |  6 +-
 tests/pubsub/check_pubsub_decryption.c        |  3 +-
 tests/pubsub/check_pubsub_encoding.c          |  6 +-
 tests/pubsub/check_pubsub_encoding_json.c     |  4 +-
 .../pubsub/check_pubsub_encrypted_rt_levels.c |  3 +-
 tests/pubsub/check_pubsub_get_state.c         |  4 +-
 ...heck_pubsub_multiple_subscribe_rt_levels.c |  3 +-
 tests/pubsub/check_pubsub_publish_ethernet.c  |  6 +-
 .../check_pubsub_publish_ethernet_etf.c       |  6 +-
 tests/pubsub/check_pubsub_publish_rt_levels.c |  3 +-
 tests/pubsub/check_pubsub_publish_uadp.c      |  7 +-
 tests/pubsub/check_pubsub_subscribe.c         |  3 +-
 .../pubsub/check_pubsub_subscribe_encrypted.c |  3 +-
 .../check_pubsub_subscribe_msgrcvtimeout.c    |  6 +-
 .../pubsub/check_pubsub_subscribe_rt_levels.c |  3 +-
 53 files changed, 345 insertions(+), 235 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 984d20b7d68..c58ea7b6eed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,16 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2022-07-07 Andreas Eckerstorfer <estr at keba.com>
+
+ * PubSub publisher id types
+
+   The union for the PubSub publisher id 'UA_PublisherId' and
+   the enumeration for the PubSub publisher type 'UA_PublisherIdType'
+   have been changed to support all specified publisher id types.
+
+   The change was done with pull request #5223.
+
 2022-06-09 Andreas Eckerstorfer <estr at keba.com>
 
  * PubSub state change functions
diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index 3e1189cf219..1086fb3adad 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -81,7 +81,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random ();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
diff --git a/examples/pubsub/pubsub_publish_encrypted.c b/examples/pubsub/pubsub_publish_encrypted.c
index 26c6d8c37af..0992c1536d5 100644
--- a/examples/pubsub/pubsub_publish_encrypted.c
+++ b/examples/pubsub/pubsub_publish_encrypted.c
@@ -30,7 +30,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
diff --git a/examples/pubsub/pubsub_publish_encrypted_tpm.c b/examples/pubsub/pubsub_publish_encrypted_tpm.c
index 8f2e6dbb1d6..1c10f94047b 100644
--- a/examples/pubsub/pubsub_publish_encrypted_tpm.c
+++ b/examples/pubsub/pubsub_publish_encrypted_tpm.c
@@ -39,7 +39,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
diff --git a/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c b/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
index e0d9126aa72..4f0d5ff888f 100644
--- a/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
+++ b/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
@@ -41,7 +41,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
diff --git a/examples/pubsub/pubsub_subscribe_encrypted.c b/examples/pubsub/pubsub_subscribe_encrypted.c
index 451540ad13a..053f26992a9 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted.c
@@ -57,7 +57,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random ();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
diff --git a/examples/pubsub/pubsub_subscribe_encrypted_tpm.c b/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
index e3dc84cc4d0..873fe5a58c7 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
@@ -62,7 +62,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random ();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
diff --git a/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c b/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
index 91dd618a2bc..faac10af8b1 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
@@ -64,7 +64,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random ();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
diff --git a/examples/pubsub/server_pubsub_publisher_iop.c b/examples/pubsub/server_pubsub_publisher_iop.c
index 3ed3fd6919d..5bab7f023c3 100644
--- a/examples/pubsub/server_pubsub_publisher_iop.c
+++ b/examples/pubsub/server_pubsub_publisher_iop.c
@@ -75,7 +75,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = Publisher_ID;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = Publisher_ID;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
diff --git a/examples/pubsub/server_pubsub_publisher_rt_level.c b/examples/pubsub/server_pubsub_publisher_rt_level.c
index 101df4d396d..3d67e7dc42a 100644
--- a/examples/pubsub/server_pubsub_publisher_rt_level.c
+++ b/examples/pubsub/server_pubsub_publisher_rt_level.c
@@ -52,7 +52,8 @@ addMinimalPubSubConfiguration(UA_Server * server){
     connectionConfig.enabled = UA_TRUE;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     /* Add one PublishedDataSet */
     UA_PublishedDataSetConfig publishedDataSetConfig;
diff --git a/examples/pubsub/server_pubsub_publisher_rt_level_raw.c b/examples/pubsub/server_pubsub_publisher_rt_level_raw.c
index 1bb7bc90164..1b87badae33 100644
--- a/examples/pubsub/server_pubsub_publisher_rt_level_raw.c
+++ b/examples/pubsub/server_pubsub_publisher_rt_level_raw.c
@@ -54,7 +54,8 @@ addMinimalPubSubConfiguration(UA_Server * server){
     connectionConfig.enabled = UA_TRUE;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     /* Add one PublishedDataSet */
     UA_PublishedDataSetConfig publishedDataSetConfig;
diff --git a/examples/pubsub/server_pubsub_rt_field_information_model.c b/examples/pubsub/server_pubsub_rt_field_information_model.c
index 59f659de54a..9e57dedae98 100644
--- a/examples/pubsub/server_pubsub_rt_field_information_model.c
+++ b/examples/pubsub/server_pubsub_rt_field_information_model.c
@@ -34,7 +34,8 @@ addMinimalPubSubConfiguration(UA_Server * server){
     connectionConfig.enabled = UA_TRUE;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     /* Add one PublishedDataSet */
     UA_PublishedDataSetConfig publishedDataSetConfig;
diff --git a/examples/pubsub/server_pubsub_subscriber_rt_level.c b/examples/pubsub/server_pubsub_subscriber_rt_level.c
index 043f929461d..fbc5fffe239 100644
--- a/examples/pubsub/server_pubsub_subscriber_rt_level.c
+++ b/examples/pubsub/server_pubsub_subscriber_rt_level.c
@@ -180,7 +180,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random ();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
     if (retval != UA_STATUSCODE_GOOD)
         return retval;
diff --git a/examples/pubsub/tutorial_pubsub_connection.c b/examples/pubsub/tutorial_pubsub_connection.c
index bb411b83fb1..05c32b9f253 100644
--- a/examples/pubsub/tutorial_pubsub_connection.c
+++ b/examples/pubsub/tutorial_pubsub_connection.c
@@ -50,7 +50,8 @@ int main(void) {
      * defined UA_NetworkAddressUrlDataType. */
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     /* Connection options are given as Key/Value Pairs. The available options are
      * maybe standard or vendor defined. */
     UA_KeyValuePair connectionOptions[3];
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 67c9a6178ff..0eccf7f4f99 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -103,7 +103,8 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     /* Changed to static publisherId from random generation to identify
      * the publisher on Subscriber side */
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
 
     /* configure options, set mqtt client id */
     const int connectionOptionsCount = 1
diff --git a/examples/pubsub/tutorial_pubsub_publish.c b/examples/pubsub/tutorial_pubsub_publish.c
index 81e425db136..b13ed8ace23 100644
--- a/examples/pubsub/tutorial_pubsub_publish.c
+++ b/examples/pubsub/tutorial_pubsub_publish.c
@@ -48,7 +48,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     /* Changed to static publisherId from random generation to identify
      * the publisher on Subscriber side */
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
diff --git a/examples/pubsub/tutorial_pubsub_publish_raw.c b/examples/pubsub/tutorial_pubsub_publish_raw.c
index c783cd2d853..5b5fefdbed7 100644
--- a/examples/pubsub/tutorial_pubsub_publish_raw.c
+++ b/examples/pubsub/tutorial_pubsub_publish_raw.c
@@ -92,7 +92,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     /* Changed to static publisherId from random generation to identify
      * the publisher on Subscriber side */
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
diff --git a/examples/pubsub/tutorial_pubsub_subscribe.c b/examples/pubsub/tutorial_pubsub_subscribe.c
index 96fdd41a4f8..b489da872de 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe.c
@@ -72,7 +72,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random ();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
diff --git a/examples/pubsub/tutorial_pubsub_subscribe_raw.c b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
index 6156b87d1a5..66bb5965df2 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe_raw.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
@@ -62,7 +62,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.enabled = UA_TRUE;
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random ();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
index 19020dd6dc3..7e6a1bb5ffb 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
@@ -257,7 +257,8 @@ addPubSubConnection(UA_Server *server, UA_NetworkAddressUrlDataType *networkAddr
     connectionConfig.transportProfileUri                    = UA_STRING(ETH_TRANSPORT_PROFILE);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric                    = PUBLISHER_ID;
+    connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16                     = PUBLISHER_ID;
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
     UA_KeyValuePair connectionOptions[2];
     connectionOptions[0].key = UA_QUALIFIEDNAME(0, "sockpriority");
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
index f37b4051253..8d1e4385483 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
@@ -245,7 +245,8 @@ addPubSubConnectionSubscriber(UA_Server *server, UA_NetworkAddressUrlDataType *n
     UA_NetworkAddressUrlDataType networkAddressUrlsubscribe = *networkAddressUrlSubscriber;
     connectionConfig.transportProfileUri                    = UA_STRING(ETH_TRANSPORT_PROFILE);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrlsubscribe, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric                    = UA_UInt32_random();
+    connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32                     = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentSubscriber);
     if (retval == UA_STATUSCODE_GOOD)
          UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,"The PubSub Connection was created successfully!");
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index 65b3ea19aea..39e5999bfff 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -474,7 +474,8 @@ addPubSubConnectionSubscriber(UA_Server *server,
     connectionConfig.transportProfileUri = UA_STRING(ETH_TRANSPORT_PROFILE);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrlsubscribe,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection(server, &connectionConfig,
                                             &connectionIdentSubscriber);
     if(retval == UA_STATUSCODE_GOOD)
@@ -739,7 +740,8 @@ addPubSubConnection(UA_Server *server, UA_NetworkAddressUrlDataType *networkAddr
     connectionConfig.transportProfileUri = UA_STRING(ETH_TRANSPORT_PROFILE);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = PUBLISHER_ID;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
     UA_KeyValuePair connectionOptions[2];
     connectionOptions[0].key = UA_QUALIFIEDNAME(0, "sockpriority");
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index 98ce7221f94..25901be7ea3 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -349,7 +349,8 @@ addPubSubConnectionSubscriber(UA_Server *server, UA_String *transportProfile,
     UA_NetworkAddressUrlDataType networkAddressUrlsubscribe = *networkAddressUrlSubscriber;
     connectionConfig.transportProfileUri                    = *transportProfile;
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrlsubscribe, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric                    = UA_UInt32_random();
+    connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32                     = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentSubscriber);
     if (retval == UA_STATUSCODE_GOOD)
          UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,"The PubSub Connection was created successfully!");
@@ -584,7 +585,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.transportProfileUri                    = *transportProfile;
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric                    = PUBLISHER_ID;
+    connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16                     = PUBLISHER_ID;
 
 #ifdef UA_ENABLE_PUBSUB_ETH_UADP
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index f08e33f6516..2c2820c0a65 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -86,6 +86,7 @@
 
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/log.h>
 #include <open62541/types_generated.h>
@@ -471,7 +472,8 @@ addPubSubConnectionSubscriber(UA_Server *server,
     UA_NetworkAddressUrlDataType networkAddressUrlsubscribe = *networkAddressUrlSubscriber;
     connectionConfig.transportProfileUri = UA_STRING(ETH_TRANSPORT_PROFILE);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrlsubscribe, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentSubscriber);
     if(retval == UA_STATUSCODE_GOOD)
          UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -733,7 +735,8 @@ addPubSubConnection(UA_Server *server, UA_NetworkAddressUrlDataType *networkAddr
     connectionConfig.transportProfileUri                    = UA_STRING(ETH_TRANSPORT_PROFILE);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric                    = PUBLISHER_ID;
+    connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16                     = PUBLISHER_ID;
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
     UA_KeyValuePair connectionOptions[2];
     connectionOptions[0].key                  = UA_QUALIFIEDNAME(0, "sockpriority");
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index 62f595d1662..7d1918f837f 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -361,7 +361,8 @@ addPubSubConnectionSubscriber(UA_Server *server, UA_String *transportProfile,
 
     connectionConfig.transportProfileUri                    = *transportProfile;
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrlsubscribe, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric                    = UA_UInt32_random();
+    connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16                     = (UA_UInt16) UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentSubscriber);
     if (retval == UA_STATUSCODE_GOOD)
          UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,"The PubSub Connection was created successfully!");
@@ -596,7 +597,8 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.transportProfileUri                    = *transportProfile;
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric                    = PUBLISHER_ID;
+    connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16                     = PUBLISHER_ID;
 #ifdef UA_ENABLE_PUBSUB_ETH_UADP
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
     UA_KeyValuePair connectionOptions[2];
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 2832e128658..fd55b10f693 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -138,18 +138,36 @@ typedef enum  {
 } UA_PubSubComponentEnumType;
 
 typedef enum {
-    UA_PUBSUB_PUBLISHERID_NUMERIC,
-    UA_PUBSUB_PUBLISHERID_STRING
+    UA_PUBLISHERIDTYPE_BYTE = 0,
+    UA_PUBLISHERIDTYPE_UINT16 = 1,
+    UA_PUBLISHERIDTYPE_UINT32 = 2,
+    UA_PUBLISHERIDTYPE_UINT64 = 3,
+    UA_PUBLISHERIDTYPE_STRING = 4
 } UA_PublisherIdType;
 
+/* Publisher Id
+    Valid types are defined in Part 14, 7.2.2.2.2 NetworkMessage Layout:
+
+    Bit range 0-2: PublisherId Type
+    000 The PublisherId is of DataType Byte This is the default value if ExtendedFlags1 is omitted
+    001 The PublisherId is of DataType UInt16
+    010 The PublisherId is of DataType UInt32
+    011 The PublisherId is of DataType UInt64
+    100 The PublisherId is of DataType String
+*/
+typedef union {
+    UA_Byte byte;
+    UA_UInt16 uint16;
+    UA_UInt32 uint32;
+    UA_UInt64 uint64;
+    UA_String string;
+} UA_PublisherId;
+
 struct UA_PubSubConnectionConfig {
     UA_String name;
     UA_Boolean enabled;
     UA_PublisherIdType publisherIdType;
-    union { /* std: valid types UInt or String */
-        UA_UInt32 numeric;
-        UA_String string;
-    } publisherId;
+    UA_PublisherId publisherId;
     UA_String transportProfileUri;
     UA_Variant address;
     size_t connectionPropertiesSize;
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index a0c631808c2..9faf0a3bf7f 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -157,18 +157,20 @@ static UA_StatusCode
 setConnectionPublisherId(const UA_PubSubConnectionDataType *src,
                          UA_PubSubConnectionConfig *dst) {
     if(src->publisherId.type == &UA_TYPES[UA_TYPES_STRING]) {
-        dst->publisherIdType = UA_PUBSUB_PUBLISHERID_STRING;
+        dst->publisherIdType = UA_PUBLISHERIDTYPE_STRING;
         dst->publisherId.string = *(UA_String*)src->publisherId.data;
-    } else if(src->publisherId.type == &UA_TYPES[UA_TYPES_BYTE] ||
-              src->publisherId.type == &UA_TYPES[UA_TYPES_UINT16] ||
-              src->publisherId.type == &UA_TYPES[UA_TYPES_UINT32]) {
-        dst->publisherIdType = UA_PUBSUB_PUBLISHERID_NUMERIC;
-        dst->publisherId.numeric =  *(UA_UInt32*)src->publisherId.data;
+    } else if(src->publisherId.type == &UA_TYPES[UA_TYPES_BYTE]) {
+        dst->publisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+        dst->publisherId.byte = *((UA_Byte*)src->publisherId.data);
+    } else if(src->publisherId.type == &UA_TYPES[UA_TYPES_UINT16]) {
+        dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+        dst->publisherId.uint16 = *((UA_UInt16*)src->publisherId.data);
+    } else if(src->publisherId.type == &UA_TYPES[UA_TYPES_UINT32]) {
+        dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+        dst->publisherId.uint32 = *(UA_UInt32*)src->publisherId.data;
     } else if(src->publisherId.type == &UA_TYPES[UA_TYPES_UINT64]) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "[UA_PubSubManager_setConnectionPublisherId] PublisherId is UInt64 "
-                     "(not implemented); Recommended dataType for PublisherId: UInt32");
-        return UA_STATUSCODE_BADNOTIMPLEMENTED;
+        dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+        dst->publisherId.uint64 = *(UA_UInt64*)src->publisherId.data;
     } else {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setConnectionPublisherId] PublisherId is not valid.");
@@ -1050,6 +1052,8 @@ generateReaderGroupDataType(const UA_ReaderGroup *src,
 static UA_StatusCode
 generatePubSubConnectionDataType(const UA_PubSubConnection *src,
                                  UA_PubSubConnectionDataType *dst) {
+
+    const UA_DataType *publisherIdType;
     memset(dst, 0, sizeof(UA_PubSubConnectionDataType));
 
     UA_String_copy(&src->config->name, &dst->name);
@@ -1062,15 +1066,30 @@ generatePubSubConnectionDataType(const UA_PubSubConnection *src,
                              &dst->connectionProperties[i]);
     }
 
-    if(src->config->publisherIdType == UA_PUBSUB_PUBLISHERID_NUMERIC) {
-        UA_Variant_setScalarCopy(&dst->publisherId,
-                                 &src->config->publisherId.numeric,
-                                 &UA_TYPES[UA_TYPES_UINT32]);
-    } else if(src->config->publisherIdType == UA_PUBSUB_PUBLISHERID_STRING) {
-        UA_Variant_setScalarCopy(&dst->publisherId,
-                                 &src->config->publisherId.string,
-                                 &UA_TYPES[UA_TYPES_STRING]);
+    switch (src->config->publisherIdType) {
+        case UA_PUBLISHERIDTYPE_BYTE:
+            publisherIdType = &UA_TYPES[UA_TYPES_BYTE];
+            break;
+        case UA_PUBLISHERIDTYPE_UINT16:
+            publisherIdType = &UA_TYPES[UA_TYPES_UINT16];
+            break;
+        case UA_PUBLISHERIDTYPE_UINT32:
+            publisherIdType = &UA_TYPES[UA_TYPES_UINT32];
+            break;
+        case UA_PUBLISHERIDTYPE_UINT64:
+            publisherIdType = &UA_TYPES[UA_TYPES_UINT64];
+            break;
+        case UA_PUBLISHERIDTYPE_STRING:
+            publisherIdType = &UA_TYPES[UA_TYPES_STRING];
+            break;
+        default:
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "generatePubSubConnectionDataType(): publisher Id type is not supported");
+            return UA_STATUSCODE_BADINTERNALERROR;
+            break;
     }
+    UA_Variant_setScalarCopy(&dst->publisherId,
+                             &src->config->publisherId,
+                             publisherIdType);
 
     /* Possibly, array size and dimensions of src->config->address and
      * src->config->connectionTransportSettings should be checked beforehand. */
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 51fd0c3485c..13f0b6e97a9 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -112,19 +112,20 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
             break;
         case UA_PUBSUB_OFFSETTYPE_PUBLISHERID:
             switch (buffer->nm->publisherIdType) {
-            case UA_PUBLISHERDATATYPE_BYTE:
-                rv = UA_Byte_decodeBinary(src, &offset, &(buffer->nm->publisherId.publisherIdByte));
+            case UA_PUBLISHERIDTYPE_BYTE:
+                rv = UA_Byte_decodeBinary(src, &offset, &(buffer->nm->publisherId.byte));
                 break;
-            case UA_PUBLISHERDATATYPE_UINT16:
-                rv = UA_UInt16_decodeBinary(src, &offset, &(buffer->nm->publisherId.publisherIdUInt16));
+            case UA_PUBLISHERIDTYPE_UINT16:
+                rv = UA_UInt16_decodeBinary(src, &offset, &(buffer->nm->publisherId.uint16));
                 break;
-            case UA_PUBLISHERDATATYPE_UINT32:
-                rv = UA_UInt32_decodeBinary(src, &offset, &(buffer->nm->publisherId.publisherIdUInt32));
+            case UA_PUBLISHERIDTYPE_UINT32:
+                rv = UA_UInt32_decodeBinary(src, &offset, &(buffer->nm->publisherId.uint32));
                 break;
-            case UA_PUBLISHERDATATYPE_UINT64:
-                rv = UA_UInt64_decodeBinary(src, &offset, &(buffer->nm->publisherId.publisherIdUInt64));
+            case UA_PUBLISHERIDTYPE_UINT64:
+                rv = UA_UInt64_decodeBinary(src, &offset, &(buffer->nm->publisherId.uint64));
                 break;
             default:
+                // UA_PUBLISHERIDTYPE_STRING is not supported because of UA_PUBSUB_RT_FIXED_SIZE
                 return UA_STATUSCODE_BADNOTSUPPORTED;
             }
             break;
@@ -244,24 +245,24 @@ UA_NetworkMessageHeader_encodeBinary(const UA_NetworkMessage *src, UA_Byte **buf
     // PublisherId
     if(src->publisherIdEnabled) {
         switch (src->publisherIdType) {
-        case UA_PUBLISHERDATATYPE_BYTE:
-            rv = UA_Byte_encodeBinary(&(src->publisherId.publisherIdByte), bufPos, bufEnd);
+        case UA_PUBLISHERIDTYPE_BYTE:
+            rv = UA_Byte_encodeBinary(&(src->publisherId.byte), bufPos, bufEnd);
             break;
 
-        case UA_PUBLISHERDATATYPE_UINT16:
-            rv = UA_UInt16_encodeBinary(&(src->publisherId.publisherIdUInt16), bufPos, bufEnd);
+        case UA_PUBLISHERIDTYPE_UINT16:
+            rv = UA_UInt16_encodeBinary(&(src->publisherId.uint16), bufPos, bufEnd);
             break;
 
-        case UA_PUBLISHERDATATYPE_UINT32:
-            rv = UA_UInt32_encodeBinary(&(src->publisherId.publisherIdUInt32), bufPos, bufEnd);
+        case UA_PUBLISHERIDTYPE_UINT32:
+            rv = UA_UInt32_encodeBinary(&(src->publisherId.uint32), bufPos, bufEnd);
             break;
 
-        case UA_PUBLISHERDATATYPE_UINT64:
-            rv = UA_UInt64_encodeBinary(&(src->publisherId.publisherIdUInt64), bufPos, bufEnd);
+        case UA_PUBLISHERIDTYPE_UINT64:
+            rv = UA_UInt64_encodeBinary(&(src->publisherId.uint64), bufPos, bufEnd);
             break;
 
-        case UA_PUBLISHERDATATYPE_STRING:
-            rv = UA_String_encodeBinary(&(src->publisherId.publisherIdString), bufPos, bufEnd);
+        case UA_PUBLISHERIDTYPE_STRING:
+            rv = UA_String_encodeBinary(&(src->publisherId.string), bufPos, bufEnd);
             break;
 
         default:
@@ -551,7 +552,7 @@ UA_NetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset, U
         rv = UA_Byte_decodeBinary(src, offset, &decoded);
         UA_CHECK_STATUS(rv, return rv);
 
-        dst->publisherIdType = (UA_PublisherIdDatatype)(decoded & NM_PUBLISHER_ID_MASK);
+        dst->publisherIdType = (UA_PublisherIdType)(decoded & NM_PUBLISHER_ID_MASK);
         if((decoded & NM_DATASET_CLASSID_ENABLED_MASK) != 0)
             dst->dataSetClassIdEnabled = true;
 
@@ -583,24 +584,24 @@ UA_NetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset, U
 
     if(dst->publisherIdEnabled) {
         switch (dst->publisherIdType) {
-            case UA_PUBLISHERDATATYPE_BYTE:
-                rv = UA_Byte_decodeBinary(src, offset, &(dst->publisherId.publisherIdByte));
+            case UA_PUBLISHERIDTYPE_BYTE:
+                rv = UA_Byte_decodeBinary(src, offset, &(dst->publisherId.byte));
                 break;
 
-            case UA_PUBLISHERDATATYPE_UINT16:
-                rv = UA_UInt16_decodeBinary(src, offset, &(dst->publisherId.publisherIdUInt16));
+            case UA_PUBLISHERIDTYPE_UINT16:
+                rv = UA_UInt16_decodeBinary(src, offset, &(dst->publisherId.uint16));
                 break;
 
-            case UA_PUBLISHERDATATYPE_UINT32:
-                rv = UA_UInt32_decodeBinary(src, offset, &(dst->publisherId.publisherIdUInt32));
+            case UA_PUBLISHERIDTYPE_UINT32:
+                rv = UA_UInt32_decodeBinary(src, offset, &(dst->publisherId.uint32));
                 break;
 
-            case UA_PUBLISHERDATATYPE_UINT64:
-                rv = UA_UInt64_decodeBinary(src, offset, &(dst->publisherId.publisherIdUInt64));
+            case UA_PUBLISHERIDTYPE_UINT64:
+                rv = UA_UInt64_decodeBinary(src, offset, &(dst->publisherId.uint64));
                 break;
 
-            case UA_PUBLISHERDATATYPE_STRING:
-                rv = UA_String_decodeBinary(src, offset, &(dst->publisherId.publisherIdString));
+            case UA_PUBLISHERIDTYPE_STRING:
+                rv = UA_String_decodeBinary(src, offset, &(dst->publisherId.string));
                 break;
 
             default:
@@ -953,24 +954,24 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
             offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_PUBLISHERID;
         }
         switch (p->publisherIdType) {
-            case UA_PUBLISHERDATATYPE_BYTE:
-                size += UA_Byte_calcSizeBinary(&p->publisherId.publisherIdByte);
+            case UA_PUBLISHERIDTYPE_BYTE:
+                size += UA_Byte_calcSizeBinary(&p->publisherId.byte);
                 break;
 
-            case UA_PUBLISHERDATATYPE_UINT16:
-                size += UA_UInt16_calcSizeBinary(&p->publisherId.publisherIdUInt16);
+            case UA_PUBLISHERIDTYPE_UINT16:
+                size += UA_UInt16_calcSizeBinary(&p->publisherId.uint16);
                 break;
 
-            case UA_PUBLISHERDATATYPE_UINT32:
-                size += UA_UInt32_calcSizeBinary(&p->publisherId.publisherIdUInt32);
+            case UA_PUBLISHERIDTYPE_UINT32:
+                size += UA_UInt32_calcSizeBinary(&p->publisherId.uint32);
                 break;
 
-            case UA_PUBLISHERDATATYPE_UINT64:
-                size += UA_UInt64_calcSizeBinary(&p->publisherId.publisherIdUInt64);
+            case UA_PUBLISHERIDTYPE_UINT64:
+                size += UA_UInt64_calcSizeBinary(&p->publisherId.uint64);
                 break;
 
-            case UA_PUBLISHERDATATYPE_STRING:
-                size += UA_String_calcSizeBinary(&p->publisherId.publisherIdString);
+            case UA_PUBLISHERIDTYPE_STRING:
+                size += UA_String_calcSizeBinary(&p->publisherId.string);
                 break;
         }
     }
@@ -1129,8 +1130,8 @@ UA_NetworkMessage_clear(UA_NetworkMessage* p) {
     UA_String_clear(&p->messageId);
 
     if(p->publisherIdEnabled &&
-       p->publisherIdType == UA_PUBLISHERDATATYPE_STRING)
-       UA_String_clear(&p->publisherId.publisherIdString);
+       p->publisherIdType == UA_PUBLISHERIDTYPE_STRING)
+       UA_String_clear(&p->publisherId.string);
 
     memset(p, 0, sizeof(UA_NetworkMessage));
 }
@@ -1139,7 +1140,7 @@ UA_Boolean
 UA_NetworkMessage_ExtendedFlags1Enabled(const UA_NetworkMessage* src) {
     UA_Boolean retval = false;
 
-    if((src->publisherIdType != UA_PUBLISHERDATATYPE_BYTE)
+    if((src->publisherIdType != UA_PUBLISHERIDTYPE_BYTE)
         || src->dataSetClassIdEnabled
         || src->securityEnabled
         || src->timestampEnabled
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 0bf4377be00..be1b6c07ae0 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -12,6 +12,9 @@
 #include <open62541/types.h>
 #include <open62541/types_generated.h>
 #include <open62541/plugin/securitypolicy.h>
+#include <open62541/server_pubsub.h>
+
+#ifdef UA_ENABLE_PUBSUB
 
 _UA_BEGIN_DECLS
 
@@ -93,14 +96,6 @@ typedef struct {
     UA_DataSetMessage* dataSetMessages;
 } UA_DataSetPayload;
 
-typedef enum {
-    UA_PUBLISHERDATATYPE_BYTE = 0,
-    UA_PUBLISHERDATATYPE_UINT16 = 1,
-    UA_PUBLISHERDATATYPE_UINT32 = 2,
-    UA_PUBLISHERDATATYPE_UINT64 = 3,
-    UA_PUBLISHERDATATYPE_STRING = 4
-} UA_PublisherIdDatatype;
-
 typedef enum {
     UA_NETWORKMESSAGE_DATASET = 0,
     UA_NETWORKMESSAGE_DISCOVERY_REQUEST = 1,
@@ -145,7 +140,6 @@ typedef struct {
     UA_Boolean publisherIdEnabled;
     UA_Boolean groupHeaderEnabled;
     UA_Boolean payloadHeaderEnabled;
-    UA_PublisherIdDatatype publisherIdType;
     UA_Boolean dataSetClassIdEnabled;
     UA_Boolean securityEnabled;
     UA_Boolean timestampEnabled;
@@ -153,14 +147,8 @@ typedef struct {
     UA_Boolean chunkMessage;
     UA_Boolean promotedFieldsEnabled;
     UA_NetworkMessageType networkMessageType;
-    union {
-        UA_Byte publisherIdByte;
-        UA_UInt16 publisherIdUInt16;
-        UA_UInt32 publisherIdUInt32;
-        UA_UInt64 publisherIdUInt64;
-        UA_Guid publisherIdGuid;
-        UA_String publisherIdString;
-    } publisherId;
+    UA_PublisherIdType publisherIdType;
+    UA_PublisherId publisherId;
     UA_Guid dataSetClassId;
 
     UA_NetworkMessageGroupHeader groupHeader;
@@ -360,4 +348,6 @@ UA_StatusCode UA_NetworkMessage_decodeJson(UA_NetworkMessage *dst, const UA_Byte
 
 _UA_END_DECLS
 
+#endif /* UA_ENABLE_PUBSUB */
+
 #endif /* UA_PUBSUB_NETWORKMESSAGE_H_ */
diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index 054c5346f9a..1011e2e5b27 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -7,6 +7,7 @@
 
 #include <open62541/types.h>
 #include <open62541/types_generated_handling.h>
+#include <open62541/server_pubsub.h>
 
 #include "ua_pubsub_networkmessage.h"
 #include "ua_types_encoding_json.h"
@@ -129,6 +130,7 @@ UA_DataSetMessage_encodeJson_internal(const UA_DataSetMessage* src,
 static UA_StatusCode
 UA_NetworkMessage_encodeJson_internal(const UA_NetworkMessage* src, CtxJson *ctx) {
     status rv = UA_STATUSCODE_GOOD;
+    const UA_DataType *publisherIdType;
     /* currently only ua-data is supported, no discovery message implemented */
     if(src->networkMessageType != UA_NETWORKMESSAGE_DATASET)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
@@ -151,31 +153,24 @@ UA_NetworkMessage_encodeJson_internal(const UA_NetworkMessage* src, CtxJson *ctx
     if(src->publisherIdEnabled) {
         rv = writeJsonKey(ctx, UA_DECODEKEY_PUBLISHERID);
         switch (src->publisherIdType) {
-        case UA_PUBLISHERDATATYPE_BYTE:
-            rv |= encodeJsonInternal(&src->publisherId.publisherIdByte,
-                                     &UA_TYPES[UA_TYPES_BYTE], ctx);
+        case UA_PUBLISHERIDTYPE_BYTE:
+            publisherIdType = &UA_TYPES[UA_TYPES_BYTE];
             break;
-
-        case UA_PUBLISHERDATATYPE_UINT16:
-            rv |= encodeJsonInternal(&src->publisherId.publisherIdUInt16,
-                                     &UA_TYPES[UA_TYPES_UINT16], ctx);
+        case UA_PUBLISHERIDTYPE_UINT16:
+            publisherIdType = &UA_TYPES[UA_TYPES_UINT16];
             break;
-
-        case UA_PUBLISHERDATATYPE_UINT32:
-            rv |= encodeJsonInternal(&src->publisherId.publisherIdUInt32,
-                                     &UA_TYPES[UA_TYPES_UINT32], ctx);
+        case UA_PUBLISHERIDTYPE_UINT32:
+            publisherIdType = &UA_TYPES[UA_TYPES_UINT32];
             break;
-
-        case UA_PUBLISHERDATATYPE_UINT64:
-            rv |= encodeJsonInternal(&src->publisherId.publisherIdUInt64,
-                                     &UA_TYPES[UA_TYPES_UINT64], ctx);
+        case UA_PUBLISHERIDTYPE_UINT64:
+            publisherIdType = &UA_TYPES[UA_TYPES_UINT64];
             break;
-
-        case UA_PUBLISHERDATATYPE_STRING:
-            rv |= encodeJsonInternal(&src->publisherId.publisherIdString,
-                                     &UA_TYPES[UA_TYPES_STRING], ctx);
+        case UA_PUBLISHERIDTYPE_STRING:
+            publisherIdType = &UA_TYPES[UA_TYPES_STRING];
             break;
         }
+        rv |= encodeJsonInternal(&src->publisherId,
+                                 publisherIdType, ctx);
     }
     if(rv != UA_STATUSCODE_GOOD)
         return rv;
@@ -425,9 +420,9 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
         jsmntok_t publishIdToken = parseCtx->tokenArray[searchResultPublishIdType];
         if(publishIdToken.type == JSMN_PRIMITIVE) {
             pubIdType = &UA_TYPES[UA_TYPES_UINT64];
-            dst->publisherIdType = UA_PUBLISHERDATATYPE_UINT64; //store in biggest possible
+            dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT64; //store in biggest possible
         } else if(publishIdToken.type == JSMN_STRING) {
-            dst->publisherIdType = UA_PUBLISHERDATATYPE_STRING;
+            dst->publisherIdType = UA_PUBLISHERIDTYPE_STRING;
         } else {
             return UA_STATUSCODE_BADDECODINGERROR;
         }
@@ -478,23 +473,24 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     DecodeEntry entries[5] = {
         {UA_DECODEKEY_MESSAGEID, &dst->messageId, NULL, false, &UA_TYPES[UA_TYPES_STRING]},
         {UA_DECODEKEY_MESSAGETYPE, &messageType, NULL, false, NULL},
-        {UA_DECODEKEY_PUBLISHERID, &dst->publisherId.publisherIdString, NULL, false, pubIdType},
+        {UA_DECODEKEY_PUBLISHERID, &dst->publisherId, NULL, false, pubIdType},
         {UA_DECODEKEY_DATASETCLASSID, &dst->dataSetClassId, NULL, false, &UA_TYPES[UA_TYPES_GUID]},
         {UA_DECODEKEY_MESSAGES, &dst->payload.dataSetPayload.dataSetMessages, &DatasetMessage_Array_decodeJsonInternal, false, NULL}
     };
 
-    //Store publisherId in correct union
-    if(pubIdType == &UA_TYPES[UA_TYPES_UINT64])
-        entries[2].fieldPointer = &dst->publisherId.publisherIdUInt64;
-
     status ret = decodeFields(ctx, parseCtx, entries, 5);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
 
     dst->messageIdEnabled = entries[0].found;
     dst->publisherIdEnabled = entries[2].found;
-    if(dst->publisherIdEnabled)
-        dst->publisherIdType = UA_PUBLISHERDATATYPE_STRING;
+    if(dst->publisherIdEnabled) {
+        if(pubIdType == &UA_TYPES[UA_TYPES_UINT64]) {
+            dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+        } else {
+            dst->publisherIdType = UA_PUBLISHERIDTYPE_STRING;
+        }
+    }
     dst->dataSetClassIdEnabled = entries[3].found;
     dst->payloadHeaderEnabled = true;
     dst->payloadHeader.dataSetPayloadHeader.count = (UA_Byte)messageCount;
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 8177d9970ef..547708d5e25 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -75,13 +75,31 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
             UA_PubSubConnection_findConnectionbyId(server, *myNodeId);
         switch(nodeContext->elementClassiefier) {
         case UA_NS0ID_PUBSUBCONNECTIONTYPE_PUBLISHERID:
-            if(pubSubConnection->config->publisherIdType == UA_PUBSUB_PUBLISHERID_STRING) {
-                UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.numeric,
-                                     &UA_TYPES[UA_TYPES_STRING]);
-            } else {
-                UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.numeric,
-                                     &UA_TYPES[UA_TYPES_UINT32]);
-            }
+            switch (pubSubConnection->config->publisherIdType) {
+                case UA_PUBLISHERIDTYPE_BYTE:
+                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.byte,
+                                         &UA_TYPES[UA_TYPES_BYTE]);
+                    break;
+                case UA_PUBLISHERIDTYPE_UINT16:
+                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.uint16,
+                                         &UA_TYPES[UA_TYPES_UINT16]);
+                    break;
+                case UA_PUBLISHERIDTYPE_UINT32:
+                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.uint32,
+                                         &UA_TYPES[UA_TYPES_UINT32]);
+                    break;
+                case UA_PUBLISHERIDTYPE_UINT64:
+                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.uint64,
+                                         &UA_TYPES[UA_TYPES_UINT64]);
+                    break;
+                case UA_PUBLISHERIDTYPE_STRING:
+                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.string,
+                                         &UA_TYPES[UA_TYPES_STRING]);
+                    break;
+                default:
+                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "Read error! Unknown PublisherId type.");
+                }
             break;
         default:
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -249,15 +267,25 @@ addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsub
     //connectionConfig.enabled = pubSubConnection.enabled;
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    if(pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_UINT32]){
-        connectionConfig.publisherId.numeric = * ((UA_UInt32 *) pubsubConnection->publisherId.data);
-    } else if(pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_STRING]){
-        connectionConfig.publisherIdType = UA_PUBSUB_PUBLISHERID_STRING;
+
+    if (pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_BYTE]) {
+        connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+        connectionConfig.publisherId.byte = *((UA_Byte*)pubsubConnection->publisherId.data);
+    } else if (pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_UINT16]) {
+        connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+        connectionConfig.publisherId.uint16 = *((UA_UInt16*)pubsubConnection->publisherId.data);
+    } else if (pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_UINT32]) {
+        connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+        connectionConfig.publisherId.uint32 = *((UA_UInt32*)pubsubConnection->publisherId.data);
+    } else if (pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_UINT64]) {
+        connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+        connectionConfig.publisherId.uint64 = *((UA_UInt64*)pubsubConnection->publisherId.data);
+    } else if (pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_STRING]) {
+        connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_STRING;
         UA_String_copy((UA_String *) pubsubConnection->publisherId.data, &connectionConfig.publisherId.string);
     } else {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER, "Unsupported PublisherId Type used.");
-        //TODO what's the best default behaviour here?
-        connectionConfig.publisherId.numeric = 0;
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Unsupported PublisherId Type used.");
+        return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
     retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, connectionId);
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index fdd9e2afa37..942c9d3dc55 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -265,25 +265,28 @@ UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
     if(!UA_DataType_isNumeric(dataSetReader->config.publisherId.type))
         return UA_STATUSCODE_BADNOTSUPPORTED;
 
-    switch(dataSetReader->config.publisherId.type->typeKind) {
-    case UA_DATATYPEKIND_BYTE:
-        nm->publisherIdType = UA_PUBLISHERDATATYPE_BYTE;
-        nm->publisherId.publisherIdByte = *(UA_Byte *) dataSetReader->config.publisherId.data;
-        break;
-    case UA_DATATYPEKIND_UINT16:
-        nm->publisherIdType = UA_PUBLISHERDATATYPE_UINT16;
-        nm->publisherId.publisherIdUInt16 = *(UA_UInt16 *) dataSetReader->config.publisherId.data;
-        break;
-    case UA_DATATYPEKIND_UINT32:
-        nm->publisherIdType = UA_PUBLISHERDATATYPE_UINT32;
-        nm->publisherId.publisherIdUInt32 = *(UA_UInt32 *) dataSetReader->config.publisherId.data;
-        break;
-    case UA_DATATYPEKIND_UINT64:
-        nm->publisherIdType = UA_PUBLISHERDATATYPE_UINT64;
-        nm->publisherId.publisherIdUInt64 = *(UA_UInt64 *) dataSetReader->config.publisherId.data;
-        break;
-    default:
-        return UA_STATUSCODE_BADNOTSUPPORTED;
+    if (nm->publisherIdEnabled) {
+        switch(dataSetReader->config.publisherId.type->typeKind) {
+        case UA_DATATYPEKIND_BYTE:
+            nm->publisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+            nm->publisherId.byte = *(UA_Byte *) dataSetReader->config.publisherId.data;
+            break;
+        case UA_DATATYPEKIND_UINT16:
+            nm->publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+            nm->publisherId.uint16 = *(UA_UInt16 *) dataSetReader->config.publisherId.data;
+            break;
+        case UA_DATATYPEKIND_UINT32:
+            nm->publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+            nm->publisherId.uint32 = *(UA_UInt32 *) dataSetReader->config.publisherId.data;
+            break;
+        case UA_DATATYPEKIND_UINT64:
+            nm->publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+            nm->publisherId.uint64 = *(UA_UInt64 *) dataSetReader->config.publisherId.data;
+            break;
+        default:
+            // UA_PUBLISHERIDTYPE_STRING is not supported because of UA_PUBSUB_RT_FIXED_SIZE
+            return UA_STATUSCODE_BADNOTSUPPORTED;
+        }
     }
 
     if(nm->groupHeader.sequenceNumberEnabled)
@@ -330,35 +333,29 @@ checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
     }
 
     switch(msg->publisherIdType) {
-    case UA_PUBLISHERDATATYPE_BYTE:
+    case UA_PUBLISHERIDTYPE_BYTE:
         if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_BYTE] &&
-           msg->publisherIdType == UA_PUBLISHERDATATYPE_BYTE &&
-           msg->publisherId.publisherIdByte == *(UA_Byte*)reader->config.publisherId.data)
+           msg->publisherId.byte == *(UA_Byte*)reader->config.publisherId.data)
             break;
         return UA_STATUSCODE_BADNOTFOUND;
-    case UA_PUBLISHERDATATYPE_UINT16:
+    case UA_PUBLISHERIDTYPE_UINT16:
         if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT16] &&
-           msg->publisherIdType == UA_PUBLISHERDATATYPE_UINT16 &&
-           msg->publisherId.publisherIdUInt16 == *(UA_UInt16*)reader->config.publisherId.data)
+           msg->publisherId.uint16 == *(UA_UInt16*)reader->config.publisherId.data)
             break;
         return UA_STATUSCODE_BADNOTFOUND;
-    case UA_PUBLISHERDATATYPE_UINT32:
+    case UA_PUBLISHERIDTYPE_UINT32:
         if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT32] &&
-           msg->publisherIdType == UA_PUBLISHERDATATYPE_UINT32 &&
-           msg->publisherId.publisherIdUInt32 == *(UA_UInt32*)reader->config.publisherId.data)
+           msg->publisherId.uint32 == *(UA_UInt32*)reader->config.publisherId.data)
             break;
         return UA_STATUSCODE_BADNOTFOUND;
-    case UA_PUBLISHERDATATYPE_UINT64:
+    case UA_PUBLISHERIDTYPE_UINT64:
         if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT64] &&
-           msg->publisherIdType == UA_PUBLISHERDATATYPE_UINT64 &&
-           msg->publisherId.publisherIdUInt64 == *(UA_UInt64*)reader->config.publisherId.data)
+           msg->publisherId.uint64 == *(UA_UInt64*)reader->config.publisherId.data)
             break;
         return UA_STATUSCODE_BADNOTFOUND;
-    case UA_PUBLISHERDATATYPE_STRING:
+    case UA_PUBLISHERIDTYPE_STRING:
         if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_STRING] &&
-           msg->publisherIdType == UA_PUBLISHERDATATYPE_STRING &&
-           UA_String_equal(&msg->publisherId.publisherIdString,
-                           (UA_String*)reader->config.publisherId.data))
+           UA_String_equal(&msg->publisherId.string, (UA_String*)reader->config.publisherId.data))
             break;
         return UA_STATUSCODE_BADNOTFOUND;
     default:
@@ -1434,10 +1431,8 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
         goto cleanup;
     }
 
-    /* Check the decoded message is the expected one
-     * TODO: PublisherID check after modification in NM to support all datatypes */
-    if(nm->groupHeader.writerGroupId != dataSetReader->config.writerGroupId ||
-       *nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != dataSetReader->config.dataSetWriterId) {
+    /* Check the decoded message is the expected one */
+    if (checkReaderIdentifier(server, nm, dataSetReader) != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
                     "PubSub receive. Unknown message received. Will not be processed.");
         res = UA_STATUSCODE_UNCERTAIN;
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 6f1eea8e762..c81b8782521 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -39,6 +39,9 @@ UA_PubSubConnectionConfig_copy(const UA_PubSubConnectionConfig *src,
                                UA_PubSubConnectionConfig *dst) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     memcpy(dst, src, sizeof(UA_PubSubConnectionConfig));
+    if (src->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
+        res |= UA_String_copy(&src->publisherId.string, &dst->publisherId.string);
+    }
     res |= UA_String_copy(&src->name, &dst->name);
     res |= UA_Variant_copy(&src->address, &dst->address);
     res |= UA_String_copy(&src->transportProfileUri, &dst->transportProfileUri);
@@ -87,6 +90,9 @@ UA_PubSubConnection_findConnectionbyId(UA_Server *server, UA_NodeId connectionId
 
 void
 UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig) {
+    if (connectionConfig->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
+        UA_String_clear(&connectionConfig->publisherId.string);
+    }
     UA_String_clear(&connectionConfig->name);
     UA_String_clear(&connectionConfig->transportProfileUri);
     UA_Variant_clear(&connectionConfig->connectionTransportSettings);
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 5542b36352d..f0a42a802ca 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -941,15 +941,11 @@ generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
 
     networkMessage->version = 1;
     networkMessage->networkMessageType = UA_NETWORKMESSAGE_DATASET;
-    if(connection->config->publisherIdType == UA_PUBSUB_PUBLISHERID_NUMERIC) {
-        networkMessage->publisherIdType = UA_PUBLISHERDATATYPE_UINT16;
-        networkMessage->publisherId.publisherIdUInt32 =
-            connection->config->publisherId.numeric;
-    } else if(connection->config->publisherIdType == UA_PUBSUB_PUBLISHERID_STRING) {
-        networkMessage->publisherIdType = UA_PUBLISHERDATATYPE_STRING;
-        networkMessage->publisherId.publisherIdString =
-            connection->config->publisherId.string;
-    }
+    networkMessage->publisherIdType = connection->config->publisherIdType;
+    /* shallow copy of the PublisherId from connection configuration
+        -> the configuration needs to be stable during publishing process
+        -> it must not be cleaned after network message has been sent */
+    networkMessage->publisherId = connection->config->publisherId;
 
     if(networkMessage->groupHeader.sequenceNumberEnabled)
         networkMessage->groupHeader.sequenceNumber = wg->sequenceNumber;
diff --git a/tests/pubsub/check_pubsub_connection_ethernet.c b/tests/pubsub/check_pubsub_connection_ethernet.c
index f084153f6a6..94998c7cfd2 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet.c
@@ -161,7 +161,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.name = UA_STRING("Ethernet Connection");
     connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConf.publisherId.uint32 = 223344;
     connectionConf.connectionPropertiesSize = 3;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
@@ -192,7 +193,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.name = UA_STRING("Ethernet Connection");
     connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConf.publisherId.uint32 = 223344;
     connectionConf.connectionPropertiesSize = 3;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
diff --git a/tests/pubsub/check_pubsub_connection_ethernet_etf.c b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
index a07b509da52..ffddeafdc3b 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
@@ -201,7 +201,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.name = UA_STRING("Ethernet ETF Connection");
     connectionConf.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConf.publisherId.uint32 = 223344;
     connectionConf.connectionPropertiesSize = 5;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
@@ -239,7 +240,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.name = UA_STRING("Ethernet ETF Connection");
     connectionConf.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConf.publisherId.uint32 = 223344;
     connectionConf.connectionPropertiesSize = 5;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index f59e15b317e..77f6c022432 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -144,7 +144,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.name = UA_STRING("MQTT Connection");
     connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConf.publisherId.uint32 = 223344;
     connectionConf.connectionPropertiesSize = 3;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
@@ -176,7 +177,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.name = UA_STRING("MQTT Connection");
     connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConf.publisherId.uint32 = 223344;
     connectionConf.connectionPropertiesSize = 3;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
diff --git a/tests/pubsub/check_pubsub_connection_udp.c b/tests/pubsub/check_pubsub_connection_udp.c
index f9cd3b1b380..921ef19b522 100644
--- a/tests/pubsub/check_pubsub_connection_udp.c
+++ b/tests/pubsub/check_pubsub_connection_udp.c
@@ -189,7 +189,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.name = UA_STRING("UADP Connection");
     connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+    connectionConf.publisherId.uint64 = 223344;
     connectionConf.connectionPropertiesSize = 3;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
@@ -220,7 +221,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.name = UA_STRING("UADP Connection");
     connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+    connectionConf.publisherId.uint64 = 223344;
     connectionConf.connectionPropertiesSize = 3;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
diff --git a/tests/pubsub/check_pubsub_connection_xdp.c b/tests/pubsub/check_pubsub_connection_xdp.c
index 6e3961f60c3..0a7e56a58b5 100644
--- a/tests/pubsub/check_pubsub_connection_xdp.c
+++ b/tests/pubsub/check_pubsub_connection_xdp.c
@@ -222,7 +222,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.name = UA_STRING("XDP Connection");
     connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConf.publisherId.uint32 = 223344;
     connectionConf.connectionPropertiesSize = 4;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
@@ -259,7 +260,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.name = UA_STRING("XDP Connection");
     connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     connectionConf.enabled = true;
-    connectionConf.publisherId.numeric = 223344;
+    connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConf.publisherId.uint32 = 223344;
     connectionConf.connectionPropertiesSize = 5;
     connectionConf.connectionProperties = connectionOptions;
     connectionConf.address = address;
diff --git a/tests/pubsub/check_pubsub_decryption.c b/tests/pubsub/check_pubsub_decryption.c
index 8825f1198c5..ea480604706 100644
--- a/tests/pubsub/check_pubsub_decryption.c
+++ b/tests/pubsub/check_pubsub_decryption.c
@@ -73,7 +73,8 @@ setup(void) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionId);
 
     logger = &server->config.logger;
diff --git a/tests/pubsub/check_pubsub_encoding.c b/tests/pubsub/check_pubsub_encoding.c
index 659cbe53cf6..d5df3e54d3f 100644
--- a/tests/pubsub/check_pubsub_encoding.c
+++ b/tests/pubsub/check_pubsub_encoding.c
@@ -826,9 +826,9 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantDeltaFramePublDSCID) {
     m.version = 1;
     m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
     m.publisherIdEnabled = true;
-    m.publisherIdType = UA_PUBLISHERDATATYPE_UINT32;
+    m.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     UA_UInt32 publisherId = 1469;
-    m.publisherId.publisherIdUInt32 = publisherId;
+    m.publisherId.uint32 = publisherId;
     m.dataSetClassIdEnabled = true;
     UA_Guid dataSetClassId = UA_Guid_random();
     m.dataSetClassId = dataSetClassId;
@@ -892,7 +892,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantDeltaFramePublDSCID) {
     ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
     ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
     ck_assert_int_eq(m2.publisherIdType, m.publisherIdType);
-    ck_assert_uint_eq(m2.publisherId.publisherIdUInt32, publisherId);
+    ck_assert_uint_eq(m2.publisherId.uint32, publisherId);
     ck_assert(m.securityEnabled == m2.securityEnabled);
     ck_assert(m.chunkMessage == m2.chunkMessage);
 
diff --git a/tests/pubsub/check_pubsub_encoding_json.c b/tests/pubsub/check_pubsub_encoding_json.c
index d0fb7e57bf4..f9bd3a02a98 100644
--- a/tests/pubsub/check_pubsub_encoding_json.c
+++ b/tests/pubsub/check_pubsub_encoding_json.c
@@ -34,8 +34,8 @@ START_TEST(UA_PubSub_EncodeAllOptionalFields) {
 
     /* enable publisherId */
     m.publisherIdEnabled = true;
-    m.publisherIdType = UA_PUBLISHERDATATYPE_UINT16;
-    m.publisherId.publisherIdUInt16 = 65535;
+    m.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    m.publisherId.uint16 = 65535;
 
     /* enable dataSetClassId */
     m.dataSetClassIdEnabled = true;
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index e3fb968e578..b97991de613 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -51,7 +51,8 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.enabled = UA_TRUE;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     if(retVal != UA_STATUSCODE_GOOD)
         return retVal;
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index a724fce8d4d..412d8e9e92d 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -53,8 +53,8 @@ static void AddConnection(
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
 
-    connectionConfig.publisherIdType = UA_PUBSUB_PUBLISHERID_NUMERIC;
-    connectionConfig.publisherId.numeric = PublisherId;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = PublisherId;
 
     ck_assert(UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId) == UA_STATUSCODE_GOOD);
     ck_assert(UA_PubSubConnection_regist(server, opConnectionId) == UA_STATUSCODE_GOOD);
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index ce3f565faee..04270f951c7 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -33,7 +33,8 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.enabled = UA_TRUE;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     if(retVal != UA_STATUSCODE_GOOD)
         return retVal;
diff --git a/tests/pubsub/check_pubsub_publish_ethernet.c b/tests/pubsub/check_pubsub_publish_ethernet.c
index cf026b05904..41f4991b478 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet.c
@@ -58,7 +58,8 @@ START_TEST(EthernetSendWithoutVLANTag) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
-    connectionConfig.publisherId.numeric = PUBLISHER_ID;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     /* Remove the connection if invalid*/
@@ -86,7 +87,8 @@ START_TEST(EthernetSendWithVLANTag) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
-    connectionConfig.publisherId.numeric = PUBLISHER_ID;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     /* Remove the connection if invalid*/
diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index 739a6dd2094..9a3a35cbdc7 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -71,7 +71,8 @@ START_TEST(EthernetSendWithoutVLANTag) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
-    connectionConfig.publisherId.numeric = PUBLISHER_ID;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
     UA_KeyValuePair connectionOptions[2];
     connectionOptions[0].key = UA_QUALIFIEDNAME(0, "sockpriority");
@@ -123,7 +124,8 @@ START_TEST(EthernetSendWithVLANTag) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
-    connectionConfig.publisherId.numeric = PUBLISHER_ID;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
     UA_KeyValuePair connectionOptions[2];
     connectionOptions[0].key = UA_QUALIFIEDNAME(0, "sockpriority");
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index 2d73e0eadaa..a2a10ff6f6f 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -30,7 +30,8 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.enabled = UA_TRUE;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     if(retVal != UA_STATUSCODE_GOOD)
         return retVal;
diff --git a/tests/pubsub/check_pubsub_publish_uadp.c b/tests/pubsub/check_pubsub_publish_uadp.c
index 4c6205f33da..e6867efbc2e 100644
--- a/tests/pubsub/check_pubsub_publish_uadp.c
+++ b/tests/pubsub/check_pubsub_publish_uadp.c
@@ -31,7 +31,8 @@ static void setup(void) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.publisherId.numeric = 62541;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 62541;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     UA_PublishedDataSetConfig publishedDataSetConfig;
@@ -180,7 +181,7 @@ START_TEST(CheckNMandDSMcalculation){
     UA_ByteString buffer = UA_BYTESTRING("");
     UA_NetworkMessage networkMessage;
     receiveAvailableMessages(buffer, connection, &networkMessage);
-    //ck_assert_int_eq(networkMessage.publisherId.publisherIdUInt32 , 62541);
+    //ck_assert_int_eq(networkMessage.publisherId.uint32 , 62541);
     ck_assert_int_eq(networkMessage.payloadHeader.dataSetPayloadHeader.count, 10);
     for(size_t i = 10; i > 0; i--){
         ck_assert_int_eq(*(networkMessage.payloadHeader.dataSetPayloadHeader.dataSetWriterIds+(i-1)), 21-i);
@@ -346,7 +347,7 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
     UA_ByteString buffer = UA_BYTESTRING("");
     UA_NetworkMessage networkMessage;
     receiveAvailableMessages(buffer, connection, &networkMessage);
-    //ck_assert_int_eq(networkMessage.publisherId.publisherIdUInt32 , 62541);
+    //ck_assert_int_eq(networkMessage.publisherId.uint32 , 62541);
     ck_assert_int_eq(networkMessage.payloadHeader.dataSetPayloadHeader.count, 10);
     for(size_t i = 10; i > 0; i--){
         ck_assert_int_eq(*(networkMessage.payloadHeader.dataSetPayloadHeader.dataSetWriterIds+(i-1)), 21-i);
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 9decb134454..23c415d1074 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -109,7 +109,8 @@ static void setup(void) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.publisherId.numeric = PUBLISHER_ID;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionId);
 }
 
diff --git a/tests/pubsub/check_pubsub_subscribe_encrypted.c b/tests/pubsub/check_pubsub_subscribe_encrypted.c
index ee177898f69..c1c10b9b4d5 100644
--- a/tests/pubsub/check_pubsub_subscribe_encrypted.c
+++ b/tests/pubsub/check_pubsub_subscribe_encrypted.c
@@ -70,7 +70,8 @@ static void setup(void) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.publisherId.numeric = PUBLISHER_ID;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
 }
 
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 4897b0403e3..d2b6f95bdee 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -95,8 +95,8 @@ static void AddConnection(
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
 
-    connectionConfig.publisherIdType = UA_PUBSUB_PUBLISHERID_NUMERIC;
-    connectionConfig.publisherId.numeric = PublisherId;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = PublisherId;
 
     ck_assert(UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId) == UA_STATUSCODE_GOOD);
     ck_assert(UA_PubSubConnection_regist(server, opConnectionId) == UA_STATUSCODE_GOOD);
@@ -248,7 +248,7 @@ static void AddDataSetReader(
     UA_DataSetReaderConfig readerConfig;
     memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
     readerConfig.name = UA_STRING(pName);
-    UA_Variant_setScalar(&readerConfig.publisherId, (UA_UInt16*) &PublisherId, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_Variant_setScalar(&readerConfig.publisherId, (UA_UInt32*) &PublisherId, &UA_TYPES[UA_TYPES_UINT32]);
     readerConfig.writerGroupId    = (UA_UInt16) WriterGroupId;
     readerConfig.dataSetWriterId  = (UA_UInt16) DataSetWriterId;
     readerConfig.messageReceiveTimeout = MessageReceiveTimeout;
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 5e36b96bb02..428b0a054be 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -48,7 +48,8 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.enabled = UA_TRUE;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = 2234;
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     if(retVal != UA_STATUSCODE_GOOD)
         return retVal;

From 370b5f77bd018466efedf60758810e33e0011751 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Fri, 24 Jun 2022 11:47:11 +0200
Subject: [PATCH 0266/1963] test(pubsub): Test publisherId support

Tested all publisherId types with different PubSub configurations.
Tested with fast-path and raw-encoding.

Note: fast-path does not work with multiple groups or
datasets. Therefore it wasn't tested and should be added
in the future.
---
 tests/CMakeLists.txt                    |    1 +
 tests/pubsub/check_pubsub_publisherid.c | 2285 +++++++++++++++++++++++
 2 files changed, 2286 insertions(+)
 create mode 100644 tests/pubsub/check_pubsub_publisherid.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 73dd4d31c7f..ea1d2fd2831 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -311,6 +311,7 @@ if(UA_ENABLE_PUBSUB)
     ua_add_test(pubsub/check_pubsub_publish.c)
     ua_add_test(pubsub/check_pubsub_publish_uadp.c)
     ua_add_test(pubsub/check_pubsub_get_state.c)
+    ua_add_test(pubsub/check_pubsub_publisherid.c)
 
     #Link libraries for executing subscriber unit test
     ua_add_test(pubsub/check_pubsub_subscribe.c)
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
new file mode 100644
index 00000000000..238ad21a6b7
--- /dev/null
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -0,0 +1,2285 @@
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/server_config_default.h>
+#include <open62541/server_pubsub.h>
+#include <open62541/plugin/log_stdout.h>
+
+#include "testing_clock.h"
+#include "ua_pubsub.h"
+
+#ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
+#include "ua_util_internal.h"
+#include "ua_pubsub_config.h"
+#endif /* UA_ENABLE_PUBSUB_FILE_CONFIG */
+
+#include <check.h>
+
+static UA_Server *server = NULL;
+
+/* global variables for test configuration */
+static UA_Boolean UseFastPath = UA_FALSE;
+static UA_Boolean UseRawEncoding = UA_FALSE;
+
+/***************************************************************************************************/
+/***************************************************************************************************/
+static void setup(void) {
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nsetup\n\n");
+
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    ck_assert(config != 0);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_ServerConfig_setDefault(config));
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP()));
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_run_startup(server));
+}
+
+/***************************************************************************************************/
+static void teardown(void) {
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nteardown\n\n");
+
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_run_shutdown(server));
+    UA_Server_delete(server);
+}
+/***************************************************************************************************/
+/***************************************************************************************************/
+
+
+/***************************************************************************************************/
+/***************************************************************************************************/
+/* utility functions to setup the PubSub configuration */
+
+/***************************************************************************************************/
+static void AddConnection(
+    char *pName,
+    UA_PublisherIdType publisherIdType,
+    UA_PublisherId publisherId,
+    UA_NodeId *opConnectionId) {
+
+    ck_assert(pName != 0);
+    ck_assert(opConnectionId != 0);
+
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING(pName);
+    connectionConfig.enabled = UA_TRUE;
+    connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.publisherIdType = publisherIdType;
+    /* deep copy is not needed (not even for string) because UA_Server_addPubSubConnection performs deep copy */
+    connectionConfig.publisherId = publisherId;
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId));
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_PubSubConnection_regist(server, opConnectionId));
+}
+
+/***************************************************************************************************/
+static void AddWriterGroup(
+    UA_NodeId *pConnectionId,
+    char *pName,
+    UA_UInt32 WriterGroupId,
+    UA_NodeId *opWriterGroupId) {
+
+    ck_assert(pConnectionId != 0);
+    ck_assert(pName != 0);
+    ck_assert(opWriterGroupId != 0);
+
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+    writerGroupConfig.name = UA_STRING(pName);
+    writerGroupConfig.publishingInterval = 50.0;
+    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.writerGroupId = (UA_UInt16) WriterGroupId;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+    writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+    writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+    writerGroupMessage->networkMessageContentMask          = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+    if (UseFastPath) {
+        writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    }
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addWriterGroup(server, *pConnectionId, &writerGroupConfig, opWriterGroupId));
+    UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+}
+
+/***************************************************************************************************/
+static void AddPublishedDataSet(
+    UA_NodeId *pWriterGroupId,
+    char *pPublishedDataSetName,
+    char *pDataSetWriterName,
+    UA_UInt32 DataSetWriterId,
+    UA_NodeId *opPublishedDataSetId,
+    UA_NodeId *opPublishedVarId,
+    UA_DataValue **oppFastPathPublisherDataValue,
+    UA_NodeId *opDataSetWriterId) {
+
+    ck_assert(pWriterGroupId != 0);
+    ck_assert(pPublishedDataSetName != 0);
+    ck_assert(pDataSetWriterName != 0);
+    ck_assert(opPublishedDataSetId != 0);
+    ck_assert(opPublishedVarId != 0);
+    ck_assert(oppFastPathPublisherDataValue != 0);
+    ck_assert(opDataSetWriterId != 0);
+
+    UA_PublishedDataSetConfig pdsConfig;
+    memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    pdsConfig.name = UA_STRING(pPublishedDataSetName);
+    UA_AddPublishedDataSetResult result = UA_Server_addPublishedDataSet(server, &pdsConfig, opPublishedDataSetId);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, result.addResult);
+
+    /* Create variable to publish integer data */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    attr.description           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+    attr.displayName           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+    attr.dataType              = UA_TYPES[UA_TYPES_INT32].typeId;
+    UA_Int32 publisherData     = 42;
+    UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addVariableNode(server, UA_NODEID_NULL,
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                        UA_QUALIFIEDNAME(1, "Published Int32"),
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                        attr, NULL, opPublishedVarId));
+
+    UA_NodeId dataSetFieldId;
+    UA_DataSetFieldConfig dataSetFieldConfig;
+    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Int32 Publish var");
+    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = *opPublishedVarId;
+    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    if (UseFastPath) {
+        dataSetFieldConfig.field.variable.rtValueSource.rtInformationModelNode = UA_TRUE;
+        *oppFastPathPublisherDataValue = UA_DataValue_new();
+        ck_assert(*oppFastPathPublisherDataValue != 0);
+        UA_Int32 *pPublisherData  = UA_Int32_new();
+        ck_assert(pPublisherData != 0);
+        *pPublisherData = 42;
+        UA_Variant_setScalar(&((**oppFastPathPublisherDataValue).value), pPublisherData, &UA_TYPES[UA_TYPES_INT32]);
+        /* add external value backend for fast-path */
+        UA_ValueBackend valueBackend;
+        memset(&valueBackend, 0, sizeof(valueBackend));
+        valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+        valueBackend.backend.external.value = oppFastPathPublisherDataValue;
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setVariableNode_valueBackend(server, *opPublishedVarId, valueBackend));
+    }
+    UA_DataSetFieldResult PdsFieldResult = UA_Server_addDataSetField(server, *opPublishedDataSetId,
+                              &dataSetFieldConfig, &dataSetFieldId);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, PdsFieldResult.result);
+
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING(pDataSetWriterName);
+    dataSetWriterConfig.dataSetWriterId = (UA_UInt16) DataSetWriterId;
+    dataSetWriterConfig.keyFrameCount = 10;
+    if (UseRawEncoding) {
+        dataSetWriterConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
+    } else {
+        dataSetWriterConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_NONE;
+    }
+    ck_assert_int_eq(UA_STATUSCODE_GOOD,
+        UA_Server_addDataSetWriter(server, *pWriterGroupId, *opPublishedDataSetId, &dataSetWriterConfig, opDataSetWriterId));
+}
+
+/***************************************************************************************************/
+static void AddReaderGroup(
+    UA_NodeId *pConnectionId,
+    char *pName,
+    UA_NodeId *opReaderGroupId) {
+
+    ck_assert(pConnectionId != 0);
+    ck_assert(pName != 0);
+    ck_assert(opReaderGroupId != 0);
+
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING(pName);
+    if (UseFastPath) {
+        readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    }
+    ck_assert_int_eq(UA_STATUSCODE_GOOD,
+        UA_Server_addReaderGroup(server, *pConnectionId, &readerGroupConfig, opReaderGroupId));
+}
+
+/***************************************************************************************************/
+static void AddDataSetReader(
+    UA_NodeId *pReaderGroupId,
+    char *pName,
+    UA_PublisherIdType publisherIdType,
+    UA_PublisherId publisherId,
+    UA_UInt32 WriterGroupId,
+    UA_UInt32 DataSetWriterId,
+    UA_NodeId *opSubscriberVarId,
+    UA_DataValue **oppFastPathSubscriberDataValue,
+    UA_NodeId *opDataSetReaderId) {
+
+    ck_assert(pReaderGroupId != 0);
+    ck_assert(pName != 0);
+    ck_assert(opSubscriberVarId != 0);
+    ck_assert(oppFastPathSubscriberDataValue != 0);
+    ck_assert(opDataSetReaderId != 0);
+
+    UA_DataSetReaderConfig readerConfig;
+    memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
+    readerConfig.name = UA_STRING(pName);
+    switch (publisherIdType) {
+        case UA_PUBLISHERIDTYPE_BYTE:
+            UA_Variant_setScalar(&readerConfig.publisherId, &publisherId.byte, &UA_TYPES[UA_TYPES_BYTE]);
+            break;
+        case UA_PUBLISHERIDTYPE_UINT16:
+            UA_Variant_setScalar(&readerConfig.publisherId, &publisherId.uint16, &UA_TYPES[UA_TYPES_UINT16]);
+            break;
+        case UA_PUBLISHERIDTYPE_UINT32:
+            UA_Variant_setScalar(&readerConfig.publisherId, &publisherId.uint32, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        case UA_PUBLISHERIDTYPE_UINT64:
+            UA_Variant_setScalar(&readerConfig.publisherId, &publisherId.uint64, &UA_TYPES[UA_TYPES_UINT64]);
+            break;
+        case UA_PUBLISHERIDTYPE_STRING:
+            UA_Variant_setScalar(&readerConfig.publisherId, &publisherId.string, &UA_TYPES[UA_TYPES_STRING]);
+            break;
+        default:
+            ck_assert(UA_FALSE);
+            break;
+    }
+    readerConfig.writerGroupId    = (UA_UInt16) WriterGroupId;
+    readerConfig.dataSetWriterId  = (UA_UInt16) DataSetWriterId;
+    readerConfig.messageReceiveTimeout = 200.0;
+    readerConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    readerConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE];
+    UA_UadpDataSetReaderMessageDataType *dsReaderMessage = UA_UadpDataSetReaderMessageDataType_new();
+    dsReaderMessage->networkMessageContentMask = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                                    (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                                    (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                                    (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    readerConfig.messageSettings.content.decoded.data = dsReaderMessage;
+    if (UseRawEncoding) {
+        readerConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
+        readerConfig.expectedEncoding = UA_PUBSUB_RT_RAW;
+    } else {
+        readerConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_NONE;
+    }
+
+    UA_DataSetMetaDataType_init(&readerConfig.dataSetMetaData);
+    UA_DataSetMetaDataType *pDataSetMetaData = &readerConfig.dataSetMetaData;
+    pDataSetMetaData->name = UA_STRING (pName);
+    pDataSetMetaData->fieldsSize = 1;
+    pDataSetMetaData->fields = (UA_FieldMetaData*) UA_Array_new (pDataSetMetaData->fieldsSize,
+                         &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+
+    UA_FieldMetaData_init (&pDataSetMetaData->fields[0]);
+    UA_NodeId_copy (&UA_TYPES[UA_TYPES_INT32].typeId,
+                    &pDataSetMetaData->fields[0].dataType);
+    pDataSetMetaData->fields[0].builtInType = UA_NS0ID_INT32;
+    pDataSetMetaData->fields[0].name =  UA_STRING ("Int32 Var");
+    pDataSetMetaData->fields[0].valueRank = -1;
+    ck_assert(UA_Server_addDataSetReader(server, *pReaderGroupId, &readerConfig,
+                                         opDataSetReaderId) == UA_STATUSCODE_GOOD);
+    UA_UadpDataSetReaderMessageDataType_delete(dsReaderMessage);
+    dsReaderMessage = 0;
+
+    /* Variable to subscribe data */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    attr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+    attr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+    attr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
+    UA_Int32 subscriberData = 0;
+    UA_Variant_setScalar(&attr.value, &subscriberData, &UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addVariableNode(server, UA_NODEID_NULL,
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, opSubscriberVarId));
+
+    if (UseFastPath) {
+        *oppFastPathSubscriberDataValue = UA_DataValue_new();
+        ck_assert(*oppFastPathSubscriberDataValue != 0);
+        UA_Int32 *pSubscriberData  = UA_Int32_new();
+        ck_assert(pSubscriberData != 0);
+        *pSubscriberData = 0;
+        UA_Variant_setScalar(&((**oppFastPathSubscriberDataValue).value), pSubscriberData, &UA_TYPES[UA_TYPES_INT32]);
+        /* add external value backend for fast-path */
+        UA_ValueBackend valueBackend;
+        memset(&valueBackend, 0, sizeof(valueBackend));
+        valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+        valueBackend.backend.external.value = oppFastPathSubscriberDataValue;
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setVariableNode_valueBackend(server, *opSubscriberVarId, valueBackend));
+    }
+
+    UA_FieldTargetVariable *pTargetVariables =  (UA_FieldTargetVariable *)
+        UA_calloc(readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
+    ck_assert(pTargetVariables != 0);
+
+    UA_FieldTargetDataType_init(&pTargetVariables[0].targetVariable);
+
+    pTargetVariables[0].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+    pTargetVariables[0].targetVariable.targetNodeId = *opSubscriberVarId;
+
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_DataSetReader_createTargetVariables(server, *opDataSetReaderId,
+        readerConfig.dataSetMetaData.fieldsSize, pTargetVariables));
+
+    UA_FieldTargetDataType_clear(&pTargetVariables[0].targetVariable);
+    UA_free(pTargetVariables);
+    pTargetVariables = 0;
+
+    UA_free(pDataSetMetaData->fields);
+    pDataSetMetaData->fields = 0;
+}
+
+/***************************************************************************************************/
+/***************************************************************************************************/
+
+/***************************************************************************************************/
+/* utility function to trigger server process loop and wait until callbacks are executed */
+static void ServerDoProcess(
+    const char *pMessage,
+    const UA_UInt32 Sleep_ms,             /* use at least publishing interval */
+    const UA_UInt32 NoOfRunIterateCycles)
+{
+    ck_assert(pMessage != 0);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ServerDoProcess() sleep : %s", pMessage);
+    for (UA_UInt32 i = 0; i < NoOfRunIterateCycles; i++) {
+        UA_Server_run_iterate(server, true);
+        UA_fakeSleep(Sleep_ms);
+        UA_Server_run_iterate(server, true);
+    }
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ServerDoProcess() wakeup : %s", pMessage);
+}
+
+/***************************************************************************************************/
+/* utility function to check working pubsub operation */
+static void ValidatePublishSubscribe(
+    const UA_UInt32 NoOfTestVars,
+    UA_NodeId *publisherVarIds,
+    UA_NodeId *subscriberVarIds,
+    UA_DataValue **fastPathPublisherValues,     /* fast-path publisher DataValue */
+    UA_DataValue **fastPathSubscriberValues,    /* fast-path subscriber DataValue */
+    const UA_Int32 TestValue,
+    const UA_UInt32 Sleep_ms, /* use at least publishing interval */
+    const UA_UInt32 NoOfRunIterateCycles)
+{
+    ck_assert(publisherVarIds != 0);
+    ck_assert(subscriberVarIds != 0);
+    ck_assert(fastPathPublisherValues != 0);
+    ck_assert(fastPathSubscriberValues != 0);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): set variable to publish");
+
+    /* set variable value to publish */
+    UA_Int32 tmpValue = TestValue;
+    for (UA_UInt32 i = 0; i < NoOfTestVars; i++) {
+        tmpValue = TestValue + (UA_Int32) i;
+        if (UseFastPath) {
+            ck_assert((fastPathPublisherValues != 0) && (fastPathPublisherValues[i] != 0));
+            *((UA_Int32 *) (fastPathPublisherValues[i]->value.data)) = tmpValue;
+        } else {
+            UA_Variant writeValue;
+            UA_Variant_init(&writeValue);
+            UA_Variant_setScalarCopy(&writeValue, &tmpValue, &UA_TYPES[UA_TYPES_INT32]);
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_writeValue(server, publisherVarIds[i], writeValue));
+            UA_Variant_clear(&writeValue);
+        }
+    }
+
+    ServerDoProcess("ValidatePublishSubscribe()", Sleep_ms, NoOfRunIterateCycles);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): read subscribed variable");
+    for (UA_UInt32 i = 0; i < NoOfTestVars; i++) {
+        tmpValue = TestValue + (UA_Int32) i;
+        if (UseFastPath) {
+            ck_assert(fastPathSubscriberValues[i] != 0);
+            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): expected value: '%i' vs. actual value: '%i'",
+                tmpValue, *(UA_Int32 *) fastPathSubscriberValues[i]->value.data);
+            ck_assert_int_eq(tmpValue, *(UA_Int32 *) fastPathSubscriberValues[i]->value.data);
+        } else {
+            UA_Variant SubscribedNodeData;
+            UA_Variant_init(&SubscribedNodeData);
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_readValue(server, subscriberVarIds[i], &SubscribedNodeData));
+            ck_assert(SubscribedNodeData.data != 0);
+            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): expected value: '%i' vs. actual value: '%i'",
+                tmpValue, *(UA_Int32 *)SubscribedNodeData.data);
+            ck_assert_int_eq(tmpValue, *(UA_Int32 *)SubscribedNodeData.data);
+            UA_Variant_clear(&SubscribedNodeData);
+        }
+    }
+}
+
+/***************************************************************************************************/
+static void DoTest_1_Connection(
+    UA_PublisherIdType publisherIdType,
+    UA_PublisherId publisherId) {
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_1_Connection() begin");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "fast-path     = %s", (UseFastPath) ? "enabled" : "disabled");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "raw encoding  = %s", (UseRawEncoding) ? "enabled" : "disabled");
+
+#define DOTEST_1_CONNECTION_MAX_VARS 1
+    UA_NodeId publisherVarIds[DOTEST_1_CONNECTION_MAX_VARS];
+    UA_NodeId subscriberVarIds[DOTEST_1_CONNECTION_MAX_VARS];
+
+    /* Attention: Publisher and corresponding Subscriber DataValue must have the same index */
+    UA_DataValue *fastPathPublisherDataValues[DOTEST_1_CONNECTION_MAX_VARS];
+    UA_DataValue *fastPathSubscriberDataValues[DOTEST_1_CONNECTION_MAX_VARS];
+    for (UA_UInt32 i = 0; i < DOTEST_1_CONNECTION_MAX_VARS; i++) {
+        fastPathPublisherDataValues[i] = 0;
+        fastPathSubscriberDataValues[i] = 0;
+    }
+
+    /* setup Connection 1: */
+    UA_NodeId ConnId_1;
+    UA_NodeId_init(&ConnId_1);
+    AddConnection("Conn1", publisherIdType, publisherId, &ConnId_1);
+
+    UA_NodeId WGId_Conn1_WG1;
+    UA_NodeId_init(&WGId_Conn1_WG1);
+    AddWriterGroup(&ConnId_1, "Conn1_WG1", 1, &WGId_Conn1_WG1);
+
+    UA_NodeId DsWId_Conn1_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn1_WG1_DS1);
+    UA_NodeId PDSId_Conn1_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
+
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", 1, &PDSId_Conn1_WG1_PDS1,
+        &publisherVarIds[0], &fastPathPublisherDataValues[0], &DsWId_Conn1_WG1_DS1);
+
+    UA_NodeId RGId_Conn1_RG1;
+    UA_NodeId_init(&RGId_Conn1_RG1);
+    AddReaderGroup(&ConnId_1, "Conn1_RG1", &RGId_Conn1_RG1);
+    UA_NodeId DSRId_Conn1_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn1_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", publisherIdType, publisherId, 1, 1,
+        &subscriberVarIds[0], &fastPathSubscriberDataValues[0], &DSRId_Conn1_RG1_DSR1);
+
+    /* freeze groups if fast-path is enabled */
+    if (UseFastPath) {
+        if (publisherIdType != UA_PUBLISHERIDTYPE_STRING) {
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeWriterGroupConfiguration(server, WGId_Conn1_WG1));
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeReaderGroupConfiguration(server, RGId_Conn1_RG1));
+        } else {
+            /* string PublisherId is not supported with fast-path */
+            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "test case: STRING publisherId with fast-path");
+            /* TODO: UA_Server_freezeWriterGroupConfiguration() accepts publisherId of type STRING, but
+                UA_Server_freezeReaderGroupConfiguration() returns an error -> what is correct? */
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeWriterGroupConfiguration(server, WGId_Conn1_WG1));
+            ck_assert_int_eq(UA_STATUSCODE_BADINTERNALERROR, UA_Server_freezeReaderGroupConfiguration(server, RGId_Conn1_RG1));
+
+            /* cleanup and continue with other tests */
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeWriterGroupConfiguration(server, WGId_Conn1_WG1));
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeReaderGroupConfiguration(server, RGId_Conn1_RG1));
+
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, PDSId_Conn1_WG1_PDS1));
+            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePubSubConnection(server, ConnId_1));
+            for (UA_UInt32 i = 0; i < DOTEST_1_CONNECTION_MAX_VARS; i++) {
+                UA_DataValue_clear(fastPathPublisherDataValues[i]);
+                UA_DataValue_delete(fastPathPublisherDataValues[i]);
+                UA_DataValue_clear(fastPathSubscriberDataValues[i]);
+                UA_DataValue_delete(fastPathSubscriberDataValues[i]);
+            }
+            return;
+        }
+    }
+
+    /* set groups operational */
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1));
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1));
+
+    /* check that publish/subscribe works -> set some test values */
+    ValidatePublishSubscribe(DOTEST_1_CONNECTION_MAX_VARS, &publisherVarIds[0], &subscriberVarIds[0],
+        &fastPathPublisherDataValues[0], &fastPathSubscriberDataValues[0], 10, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_1_CONNECTION_MAX_VARS, &publisherVarIds[0], &subscriberVarIds[0],
+        &fastPathPublisherDataValues[0], &fastPathSubscriberDataValues[0], 33, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_1_CONNECTION_MAX_VARS, &publisherVarIds[0], &subscriberVarIds[0],
+        &fastPathPublisherDataValues[0], &fastPathSubscriberDataValues[0], 44, (UA_UInt32) 100, 3);
+
+    /* set groups to disabled */
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable groups");
+
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1));
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupDisabled(server, RGId_Conn1_RG1));
+
+    /* unfreeze groups if fast-path is enabled */
+    if (UseFastPath) {
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "unfreeze groups");
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeWriterGroupConfiguration(server, WGId_Conn1_WG1));
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeReaderGroupConfiguration(server, RGId_Conn1_RG1));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove PDS");
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, PDSId_Conn1_WG1_PDS1));
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove Connection");
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePubSubConnection(server, ConnId_1));
+
+    if (UseFastPath) {
+        for (UA_UInt32 i = 0; i < DOTEST_1_CONNECTION_MAX_VARS; i++) {
+            UA_DataValue_clear(fastPathPublisherDataValues[i]);
+            UA_DataValue_delete(fastPathPublisherDataValues[i]);
+            UA_DataValue_clear(fastPathSubscriberDataValues[i]);
+            UA_DataValue_delete(fastPathSubscriberDataValues[i]);
+        }
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_1_Connection() end");
+}
+
+/***************************************************************************************************/
+/* simple test with 1 connection */
+START_TEST(Test_1_connection) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_1_connection");
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId BYTE with all combinations");
+
+    UA_PublisherIdType publisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+    UA_PublisherId publisherId;
+    publisherId.byte = 2;
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId UINT16 with all combinations");
+
+    publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    publisherId.uint16 = 3;
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId UINT32 with all combinations");
+
+    publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    publisherId.uint32 = 5;
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId UINT64 with all combinations");
+
+    publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+    publisherId.uint64 = 6;
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId STRING with all combinations");
+
+    publisherIdType = UA_PUBLISHERIDTYPE_STRING;
+    publisherId.string = UA_STRING("My PublisherId");
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    /* Note: STRING publisherId is not supported with fast-path */
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_1_Connection(publisherIdType, publisherId);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_1_connection\n\n");
+} END_TEST
+
+
+/***************************************************************************************************/
+static void DoTest_multiple_Connections(void) {
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_multiple_Connections() begin");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "fast-path     = %s", (UseFastPath) ? "enabled" : "disabled");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "raw encoding  = %s", (UseRawEncoding) ? "enabled" : "disabled");
+
+    /*  Writers                             -> Readers
+        ----------------------------------------------------------------------------------
+        Conn1 BYTE   Id, WG 1, DSW 1        -> Conn2, RG 1, DSR 1
+        Conn2 BYTE   Id, WG 1, DSW 1        -> Conn1, RG 1, DSR 1
+        Conn3 UINT16 Id, WG 1, DSW 1        -> Conn4, RG 1, DSR 1
+        Conn4 UINT32 Id, WG 1, DSW 1        -> Conn3, RG 1, DSR 1
+        Conn5 UINT64 Id, WG 1, DSW 1        -> Conn6, RG 1, DSR 1
+        Conn6 UINT16 Id, WG 1, DSW 1        -> Conn5, RG 1, DSR 1
+    */
+
+    /* note: PublisherId BYTE 1 is different than UINT16 1 */
+
+    /* every connection has exactly 1 Writer- and ReaderGroup, 1 DataSetWriter and -reader, and 1 publish/subscribe variable */
+#define DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS 6
+
+    UA_NodeId ConnectionIds[DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS];
+    UA_NodeId WriterGroupIds[DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS];
+    UA_NodeId PublishedDataSetIds[DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS];
+    UA_NodeId ReaderGroupIds[DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS];
+
+    /* Attention: Publisher and corresponding Subscriber NodeId and DataValue must have the same index
+        e.g. publisherVarIds[0] value is set and subscriberVarIds[0] value is checked at ValidatePublishSubscribe() function */
+    UA_NodeId publisherVarIds[DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS];
+    UA_NodeId subscriberVarIds[DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS];
+
+    UA_DataValue *fastPathPublisherDataValues[DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS];
+    UA_DataValue *fastPathSubscriberDataValues[DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS];
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        fastPathPublisherDataValues[i] = 0;
+        fastPathSubscriberDataValues[i] = 0;
+    }
+
+    const UA_UInt32 WG_Id = 1;
+    const UA_UInt32 DSW_Id = 1;
+
+    /* setup all Publishers */
+
+    /* setup Connection 1: */
+    UA_NodeId ConnId_1;
+    UA_NodeId_init(&ConnId_1);
+    UA_PublisherIdType Conn1_PublisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+    UA_PublisherId Conn1_PublisherId;
+    Conn1_PublisherId.byte = 1;
+    AddConnection("Conn1", Conn1_PublisherIdType, Conn1_PublisherId, &ConnId_1);
+    ConnectionIds[0] = ConnId_1;
+
+    UA_NodeId WGId_Conn1_WG1;
+    UA_NodeId_init(&WGId_Conn1_WG1);
+    AddWriterGroup(&ConnId_1, "Conn1_WG1", WG_Id, &WGId_Conn1_WG1);
+    WriterGroupIds[0] = WGId_Conn1_WG1;
+
+    UA_NodeId DsWId_Conn1_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn1_WG1_DS1);
+    UA_NodeId PDSId_Conn1_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSW_Id, &PDSId_Conn1_WG1_PDS1,
+        &publisherVarIds[0], &fastPathPublisherDataValues[0], &DsWId_Conn1_WG1_DS1);
+    PublishedDataSetIds[0] = PDSId_Conn1_WG1_PDS1;
+
+    /* setup Connection 2: */
+    UA_NodeId ConnId_2;
+    UA_NodeId_init(&ConnId_2);
+    UA_PublisherIdType Conn2_PublisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+    UA_PublisherId Conn2_PublisherId;
+    Conn2_PublisherId.byte = 2;
+    AddConnection("Conn2", Conn2_PublisherIdType, Conn2_PublisherId, &ConnId_2);
+    ConnectionIds[1] = ConnId_2;
+
+    UA_NodeId WGId_Conn2_WG1;
+    UA_NodeId_init(&WGId_Conn2_WG1);
+    AddWriterGroup(&ConnId_2, "Conn2_WG1", WG_Id, &WGId_Conn2_WG1);
+    WriterGroupIds[1] = WGId_Conn2_WG1;
+
+    UA_NodeId DsWId_Conn2_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn2_WG1_DS1);
+    UA_NodeId PDSId_Conn2_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn2_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", DSW_Id, &PDSId_Conn2_WG1_PDS1,
+        &publisherVarIds[1], &fastPathPublisherDataValues[1], &DsWId_Conn2_WG1_DS1);
+    PublishedDataSetIds[1] = PDSId_Conn2_WG1_PDS1;
+
+    /* setup Connection 3: */
+    UA_NodeId ConnId_3;
+    UA_NodeId_init(&ConnId_3);
+    UA_PublisherIdType Conn3_PublisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    UA_PublisherId Conn3_PublisherId;
+    Conn3_PublisherId.uint16 = 1;
+    AddConnection("Conn3", Conn3_PublisherIdType, Conn3_PublisherId, &ConnId_3);
+    ConnectionIds[2] = ConnId_3;
+
+    UA_NodeId WGId_Conn3_WG1;
+    UA_NodeId_init(&WGId_Conn3_WG1);
+    AddWriterGroup(&ConnId_3, "Conn3_WG1", WG_Id, &WGId_Conn3_WG1);
+    WriterGroupIds[2] = WGId_Conn3_WG1;
+
+    UA_NodeId DsWId_Conn3_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn3_WG1_DS1);
+    UA_NodeId PDSId_Conn3_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn3_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn3_WG1, "Conn3_WG1_PDS1", "Conn3_WG1_DS1", DSW_Id, &PDSId_Conn3_WG1_PDS1,
+        &publisherVarIds[2], &fastPathPublisherDataValues[2], &DsWId_Conn3_WG1_DS1);
+    PublishedDataSetIds[2] = PDSId_Conn3_WG1_PDS1;
+
+    /* setup Connection 4 */
+    UA_NodeId ConnId_4;
+    UA_NodeId_init(&ConnId_4);
+    UA_PublisherIdType Conn4_PublisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    UA_PublisherId Conn4_PublisherId;
+    Conn4_PublisherId.uint32 = 15;
+    AddConnection("Conn4", Conn4_PublisherIdType, Conn4_PublisherId, &ConnId_4);
+    ConnectionIds[3] = ConnId_4;
+
+    UA_NodeId WGId_Conn4_WG1;
+    UA_NodeId_init(&WGId_Conn4_WG1);
+    AddWriterGroup(&ConnId_4, "Conn4_WG1", WG_Id, &WGId_Conn4_WG1);
+    WriterGroupIds[3] = WGId_Conn4_WG1;
+
+    UA_NodeId DsWId_Conn4_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn4_WG1_DS1);
+    UA_NodeId PDSId_Conn4_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn4_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn4_WG1, "Conn4_WG1_PDS1", "Conn4_WG1_DS1", DSW_Id, &PDSId_Conn4_WG1_PDS1,
+        &publisherVarIds[3], &fastPathPublisherDataValues[3], &DsWId_Conn4_WG1_DS1);
+    PublishedDataSetIds[3] = PDSId_Conn4_WG1_PDS1;
+
+    /* setup Connection 5 */
+    UA_NodeId ConnId_5;
+    UA_NodeId_init(&ConnId_5);
+    UA_PublisherIdType Conn5_PublisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+    UA_PublisherId Conn5_PublisherId;
+    Conn5_PublisherId.uint64 = 33;
+    AddConnection("Conn5", Conn5_PublisherIdType, Conn5_PublisherId, &ConnId_5);
+    ConnectionIds[4] = ConnId_5;
+
+    UA_NodeId WGId_Conn5_WG1;
+    UA_NodeId_init(&WGId_Conn5_WG1);
+    AddWriterGroup(&ConnId_5, "Conn5_WG1", WG_Id, &WGId_Conn5_WG1);
+    WriterGroupIds[4] = WGId_Conn5_WG1;
+
+    UA_NodeId DsWId_Conn5_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn5_WG1_DS1);
+    UA_NodeId PDSId_Conn5_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn5_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn5_WG1, "Conn5_WG1_PDS1", "Conn5_WG1_DS1", DSW_Id, &PDSId_Conn5_WG1_PDS1,
+        &publisherVarIds[4], &fastPathPublisherDataValues[4], &DsWId_Conn5_WG1_DS1);
+    PublishedDataSetIds[4] = PDSId_Conn5_WG1_PDS1;
+
+    /* setup Connection 6: */
+    UA_NodeId ConnId_6;
+    UA_NodeId_init(&ConnId_6);
+    UA_PublisherIdType Conn6_PublisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    UA_PublisherId Conn6_PublisherId;
+    Conn6_PublisherId.uint16 = 2;
+    AddConnection("Conn6", Conn6_PublisherIdType, Conn6_PublisherId, &ConnId_6);
+    ConnectionIds[5] = ConnId_6;
+
+    UA_NodeId WGId_Conn6_WG1;
+    UA_NodeId_init(&WGId_Conn6_WG1);
+    AddWriterGroup(&ConnId_6, "Conn6_WG1", WG_Id, &WGId_Conn6_WG1);
+    WriterGroupIds[5] = WGId_Conn6_WG1;
+
+    UA_NodeId DsWId_Conn6_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn6_WG1_DS1);
+    UA_NodeId PDSId_Conn6_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn6_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn6_WG1, "Conn6_WG1_PDS1", "Conn6_WG1_DS1", DSW_Id, &PDSId_Conn6_WG1_PDS1,
+        &publisherVarIds[5], &fastPathPublisherDataValues[5], &DsWId_Conn6_WG1_DS1);
+    PublishedDataSetIds[5] = PDSId_Conn6_WG1_PDS1;
+
+    /* setup all Subscribers */
+
+    /* setup Connection 1: */
+    UA_NodeId RGId_Conn1_RG1;
+    UA_NodeId_init(&RGId_Conn1_RG1);
+    AddReaderGroup(&ConnId_1, "Conn1_RG1", &RGId_Conn1_RG1);
+    UA_NodeId DSRId_Conn1_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn1_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", Conn2_PublisherIdType, Conn2_PublisherId, WG_Id, DSW_Id,
+        &subscriberVarIds[1], &fastPathSubscriberDataValues[1], &DSRId_Conn1_RG1_DSR1);
+    ReaderGroupIds[0] = RGId_Conn1_RG1;
+
+    /* setup Connection 2: */
+    UA_NodeId RGId_Conn2_RG1;
+    UA_NodeId_init(&RGId_Conn2_RG1);
+    AddReaderGroup(&ConnId_2, "Conn2_RG1", &RGId_Conn2_RG1);
+    UA_NodeId DSRId_Conn2_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn2_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, WG_Id, DSW_Id,
+        &subscriberVarIds[0], &fastPathSubscriberDataValues[0], &DSRId_Conn2_RG1_DSR1);
+    ReaderGroupIds[1] = RGId_Conn2_RG1;
+
+    /* setup Connection 3: */
+    UA_NodeId RGId_Conn3_RG1;
+    UA_NodeId_init(&RGId_Conn3_RG1);
+    AddReaderGroup(&ConnId_3, "Conn3_RG1", &RGId_Conn3_RG1);
+    UA_NodeId DSRId_Conn3_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn3_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", Conn4_PublisherIdType, Conn4_PublisherId, WG_Id, DSW_Id,
+        &subscriberVarIds[3], &fastPathSubscriberDataValues[3], &DSRId_Conn3_RG1_DSR1);
+    ReaderGroupIds[2] = RGId_Conn3_RG1;
+
+    /* setup Connection 4: */
+    UA_NodeId RGId_Conn4_RG1;
+    UA_NodeId_init(&RGId_Conn4_RG1);
+    AddReaderGroup(&ConnId_4, "Conn4_RG1", &RGId_Conn4_RG1);
+    UA_NodeId DSRId_Conn4_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn4_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn4_RG1, "Conn4_RG1_DSR1", Conn3_PublisherIdType, Conn3_PublisherId, WG_Id, DSW_Id,
+        &subscriberVarIds[2], &fastPathSubscriberDataValues[2], &DSRId_Conn4_RG1_DSR1);
+    ReaderGroupIds[3] = RGId_Conn4_RG1;
+
+    /* setup Connection 5: */
+    UA_NodeId RGId_Conn5_RG1;
+    UA_NodeId_init(&RGId_Conn5_RG1);
+    AddReaderGroup(&ConnId_5, "Conn5_RG1", &RGId_Conn5_RG1);
+    UA_NodeId DSRId_Conn5_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn5_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn5_RG1, "Conn5_RG1_DSR1", Conn6_PublisherIdType, Conn6_PublisherId, WG_Id, DSW_Id,
+        &subscriberVarIds[5], &fastPathSubscriberDataValues[5], &DSRId_Conn5_RG1_DSR1);
+    ReaderGroupIds[4] = RGId_Conn5_RG1;
+
+    /* setup Connection 6: */
+    UA_NodeId RGId_Conn6_RG1;
+    UA_NodeId_init(&RGId_Conn6_RG1);
+    AddReaderGroup(&ConnId_6, "Conn6_RG1", &RGId_Conn6_RG1);
+    UA_NodeId DSRId_Conn6_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn6_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn6_RG1, "Conn6_RG1_DSR1", Conn5_PublisherIdType, Conn5_PublisherId, WG_Id, DSW_Id,
+        &subscriberVarIds[4], &fastPathSubscriberDataValues[4], &DSRId_Conn6_RG1_DSR1);
+    ReaderGroupIds[5] = RGId_Conn6_RG1;
+
+
+    /* freeze all Groups */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+    }
+    /* set groups operational */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupOperational(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, ReaderGroupIds[i]));
+    }
+
+    /* check that publish/subscribe works -> set some test values */
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds, subscriberVarIds,
+        fastPathPublisherDataValues, fastPathSubscriberDataValues, 10, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
+        fastPathSubscriberDataValues, 50, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
+        fastPathSubscriberDataValues, 100, (UA_UInt32) 100, 3);
+
+    /* set groups to disabled */
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable groups");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupDisabled(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupDisabled(server, ReaderGroupIds[i]));
+    }
+    /* unfreeze groups */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove PublishedDataSets");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, PublishedDataSetIds[i]));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove Connection");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePubSubConnection(server, ConnectionIds[i]));
+    }
+
+    if (UseFastPath) {
+        for (size_t i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
+            UA_DataValue_clear(fastPathPublisherDataValues[i]);
+            UA_DataValue_delete(fastPathPublisherDataValues[i]);
+
+            UA_DataValue_clear(fastPathSubscriberDataValues[i]);
+            UA_DataValue_delete(fastPathSubscriberDataValues[i]);
+        }
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_multiple_Connections() end");
+}
+
+/***************************************************************************************************/
+/* test with multiple connections */
+START_TEST(Test_multiple_connections) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_multiple_connections");
+
+    /* note: fast-path does not support
+        - multiple groups and/or DataSets yet, therefore we only test multiple connections
+        - STRING publisherIds */
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_multiple_Connections();
+
+    UseFastPath = UA_FALSE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_multiple_Connections();
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_FALSE;
+    DoTest_multiple_Connections();
+
+    UseFastPath = UA_TRUE;
+    UseRawEncoding = UA_TRUE;
+    DoTest_multiple_Connections();
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_connections\n\n");
+} END_TEST
+
+/***************************************************************************************************/
+static void Test_string_PublisherId_InformationModel(
+    const UA_NodeId connectionId,
+    const UA_String expectedStringIdValue) {
+
+    /* read PublisherId value of PubSub information model -> check that string read works correctly */
+
+    /* get PublisherId node */
+    UA_RelativePathElement rpe;
+    UA_RelativePathElement_init(&rpe);
+    rpe.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES);;
+    rpe.isInverse = false;
+    rpe.includeSubtypes = true;
+    rpe.targetName = UA_QUALIFIEDNAME(0, "PublisherId");
+
+    UA_BrowsePath bp;
+    UA_BrowsePath_init(&bp);
+    bp.startingNode = connectionId;
+    bp.relativePath.elementsSize = 1;
+    bp.relativePath.elements = &rpe;
+    UA_BrowsePathResult bpr;
+    UA_BrowsePathResult_init(&bpr);
+    bpr = UA_Server_translateBrowsePathToNodeIds(server, &bp);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, bpr.statusCode);
+    ck_assert_int_eq(1, bpr.targetsSize);
+    UA_NodeId PublisherIdNode = bpr.targets[0].targetId.nodeId;
+
+    /* read value */
+    UA_Variant PublisherIdValue;
+    UA_Variant_init(&PublisherIdValue);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_readValue(server, PublisherIdNode, &PublisherIdValue));
+    ck_assert(true == UA_Variant_hasScalarType(&PublisherIdValue, &UA_TYPES[UA_TYPES_STRING]));
+    ck_assert(true == UA_String_equal(&expectedStringIdValue, (UA_String*) PublisherIdValue.data));
+    UA_Variant_clear(&PublisherIdValue);
+
+    UA_BrowsePathResult_clear(&bpr);
+}
+
+/***************************************************************************************************/
+static void DoTest_string_PublisherId(void) {
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_string_PublisherId() begin");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "fast-path     = %s", (UseFastPath) ? "enabled" : "disabled");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "raw encoding  = %s", (UseRawEncoding) ? "enabled" : "disabled");
+
+    /*  Writers                                     -> Readers
+        ----------------------------------------------------------------------------------
+        Conn1 STRING Id "H"       WG 1 DSW 1        -> Conn2, RG 1, DSR 1
+        Conn2 STRING Id "h"       WG 1 DSW 1        -> Conn1, RG 1, DSR 1
+        Conn3 STRING Id "hallo"   WG 1 DSW 1        -> Conn5, RG 1, DSR 1
+        Conn4 STRING Id "hallo1"  WG 1 DSW 1        -> Conn3, RG 1, DSR 1
+        Conn5 STRING Id "Hallo"   WG 1 DSW 1        -> Conn4, RG 1, DSR 1
+    */
+
+    /* every connection has exactly 1 Writer- and ReaderGroup, 1 DataSetWriter and -reader, and 1 publish/subscribe variable */
+#define DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS 5
+    UA_NodeId ConnectionIds[DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS];
+    UA_NodeId WriterGroupIds[DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS];
+    UA_NodeId PublishedDataSetIds[DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS];
+    UA_NodeId ReaderGroupIds[DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS];
+
+    /* Attention: Publisher and corresponding Subscriber NodeId and DataValue must have the same index
+        e.g. publisherVarIds[0] value is set and subscriberVarIds[0] value is checked at ValidatePublishSubscribe() function */
+    UA_NodeId publisherVarIds[DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS];
+    UA_NodeId subscriberVarIds[DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS];
+
+    UA_DataValue *fastPathPublisherDataValues[DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS];
+    UA_DataValue *fastPathSubscriberDataValues[DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS];
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        fastPathPublisherDataValues[i] = 0;
+        fastPathSubscriberDataValues[i] = 0;
+    }
+
+    const UA_UInt32 WG_Id = 1;
+    const UA_UInt32 DSW_Id = 1;
+
+    /* setup all Publishers */
+
+{   /* create a local scope and allocate string PublisherIds on stack to check that
+        there are no memory issues with strings (deep copy of strings is done etc.) */
+
+        /* setup Connection 1: */
+        UA_NodeId ConnId_1;
+        UA_NodeId_init(&ConnId_1);
+        UA_PublisherIdType Conn1_PublisherIdType = UA_PUBLISHERIDTYPE_STRING;
+        UA_PublisherId Conn1_PublisherId;
+        Conn1_PublisherId.string = UA_STRING("H");  // allocate string on stack
+        AddConnection("Conn1", Conn1_PublisherIdType, Conn1_PublisherId, &ConnId_1);
+        ConnectionIds[0] = ConnId_1;
+
+        UA_NodeId WGId_Conn1_WG1;
+        UA_NodeId_init(&WGId_Conn1_WG1);
+        AddWriterGroup(&ConnId_1, "Conn1_WG1", WG_Id, &WGId_Conn1_WG1);
+        WriterGroupIds[0] = WGId_Conn1_WG1;
+
+        UA_NodeId DsWId_Conn1_WG1_DS1;
+        UA_NodeId_init(&DsWId_Conn1_WG1_DS1);
+        UA_NodeId PDSId_Conn1_WG1_PDS1;
+        UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
+        AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSW_Id, &PDSId_Conn1_WG1_PDS1,
+            &publisherVarIds[0], &fastPathPublisherDataValues[0], &DsWId_Conn1_WG1_DS1);
+        PublishedDataSetIds[0] = PDSId_Conn1_WG1_PDS1;
+
+        /* setup Connection 2: */
+        UA_NodeId ConnId_2;
+        UA_NodeId_init(&ConnId_2);
+        UA_PublisherIdType Conn2_PublisherIdType = UA_PUBLISHERIDTYPE_STRING;
+        UA_PublisherId Conn2_PublisherId;
+        Conn2_PublisherId.string = UA_STRING("h");
+        AddConnection("Conn2", Conn2_PublisherIdType, Conn2_PublisherId, &ConnId_2);
+        ConnectionIds[1] = ConnId_2;
+
+        UA_NodeId WGId_Conn2_WG1;
+        UA_NodeId_init(&WGId_Conn2_WG1);
+        AddWriterGroup(&ConnId_2, "Conn2_WG1", WG_Id, &WGId_Conn2_WG1);
+        WriterGroupIds[1] = WGId_Conn2_WG1;
+
+        UA_NodeId DsWId_Conn2_WG1_DS1;
+        UA_NodeId_init(&DsWId_Conn2_WG1_DS1);
+        UA_NodeId PDSId_Conn2_WG1_PDS1;
+        UA_NodeId_init(&PDSId_Conn2_WG1_PDS1);
+        AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", DSW_Id, &PDSId_Conn2_WG1_PDS1,
+            &publisherVarIds[1], &fastPathPublisherDataValues[1], &DsWId_Conn2_WG1_DS1);
+        PublishedDataSetIds[1] = PDSId_Conn2_WG1_PDS1;
+
+        /* setup Connection 3: */
+        UA_NodeId ConnId_3;
+        UA_NodeId_init(&ConnId_3);
+        UA_PublisherIdType Conn3_PublisherIdType = UA_PUBLISHERIDTYPE_STRING;
+        UA_PublisherId Conn3_PublisherId;
+        Conn3_PublisherId.string = UA_STRING("hallo");
+        AddConnection("Conn3", Conn3_PublisherIdType, Conn3_PublisherId, &ConnId_3);
+        ConnectionIds[2] = ConnId_3;
+
+        UA_NodeId WGId_Conn3_WG1;
+        UA_NodeId_init(&WGId_Conn3_WG1);
+        AddWriterGroup(&ConnId_3, "Conn3_WG1", WG_Id, &WGId_Conn3_WG1);
+        WriterGroupIds[2] = WGId_Conn3_WG1;
+
+        UA_NodeId DsWId_Conn3_WG1_DS1;
+        UA_NodeId_init(&DsWId_Conn3_WG1_DS1);
+        UA_NodeId PDSId_Conn3_WG1_PDS1;
+        UA_NodeId_init(&PDSId_Conn3_WG1_PDS1);
+        AddPublishedDataSet(&WGId_Conn3_WG1, "Conn3_WG1_PDS1", "Conn3_WG1_DS1", DSW_Id, &PDSId_Conn3_WG1_PDS1,
+            &publisherVarIds[2], &fastPathPublisherDataValues[2], &DsWId_Conn3_WG1_DS1);
+        PublishedDataSetIds[2] = PDSId_Conn3_WG1_PDS1;
+
+        /* setup Connection 4 */
+        UA_NodeId ConnId_4;
+        UA_NodeId_init(&ConnId_4);
+        UA_PublisherIdType Conn4_PublisherIdType = UA_PUBLISHERIDTYPE_STRING;
+        UA_PublisherId Conn4_PublisherId;
+        Conn4_PublisherId.string = UA_STRING("hallo1");
+        AddConnection("Conn4", Conn4_PublisherIdType, Conn4_PublisherId, &ConnId_4);
+        ConnectionIds[3] = ConnId_4;
+
+        UA_NodeId WGId_Conn4_WG1;
+        UA_NodeId_init(&WGId_Conn4_WG1);
+        AddWriterGroup(&ConnId_4, "Conn4_WG1", WG_Id, &WGId_Conn4_WG1);
+        WriterGroupIds[3] = WGId_Conn4_WG1;
+
+        UA_NodeId DsWId_Conn4_WG1_DS1;
+        UA_NodeId_init(&DsWId_Conn4_WG1_DS1);
+        UA_NodeId PDSId_Conn4_WG1_PDS1;
+        UA_NodeId_init(&PDSId_Conn4_WG1_PDS1);
+        AddPublishedDataSet(&WGId_Conn4_WG1, "Conn4_WG1_PDS1", "Conn4_WG1_DS1", DSW_Id, &PDSId_Conn4_WG1_PDS1,
+            &publisherVarIds[3], &fastPathPublisherDataValues[3], &DsWId_Conn4_WG1_DS1);
+        PublishedDataSetIds[3] = PDSId_Conn4_WG1_PDS1;
+
+        /* setup Connection 5 */
+        UA_NodeId ConnId_5;
+        UA_NodeId_init(&ConnId_5);
+        UA_PublisherIdType Conn5_PublisherIdType = UA_PUBLISHERIDTYPE_STRING;
+        UA_PublisherId Conn5_PublisherId;
+        Conn5_PublisherId.string = UA_STRING("Hallo");
+        AddConnection("Conn5", Conn5_PublisherIdType, Conn5_PublisherId, &ConnId_5);
+        ConnectionIds[4] = ConnId_5;
+
+        UA_NodeId WGId_Conn5_WG1;
+        UA_NodeId_init(&WGId_Conn5_WG1);
+        AddWriterGroup(&ConnId_5, "Conn5_WG1", WG_Id, &WGId_Conn5_WG1);
+        WriterGroupIds[4] = WGId_Conn5_WG1;
+
+        UA_NodeId DsWId_Conn5_WG1_DS1;
+        UA_NodeId_init(&DsWId_Conn5_WG1_DS1);
+        UA_NodeId PDSId_Conn5_WG1_PDS1;
+        UA_NodeId_init(&PDSId_Conn5_WG1_PDS1);
+        AddPublishedDataSet(&WGId_Conn5_WG1, "Conn5_WG1_PDS1", "Conn5_WG1_DS1", DSW_Id, &PDSId_Conn5_WG1_PDS1,
+            &publisherVarIds[4], &fastPathPublisherDataValues[4], &DsWId_Conn5_WG1_DS1);
+        PublishedDataSetIds[4] = PDSId_Conn5_WG1_PDS1;
+
+        /* setup all Subscribers */
+
+        /* setup Connection 1: */
+        UA_NodeId RGId_Conn1_RG1;
+        UA_NodeId_init(&RGId_Conn1_RG1);
+        AddReaderGroup(&ConnId_1, "Conn1_RG1", &RGId_Conn1_RG1);
+        UA_NodeId DSRId_Conn1_RG1_DSR1;
+        UA_NodeId_init(&DSRId_Conn1_RG1_DSR1);
+        AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", Conn2_PublisherIdType, Conn2_PublisherId, WG_Id, DSW_Id,
+            &subscriberVarIds[1], &fastPathSubscriberDataValues[1], &DSRId_Conn1_RG1_DSR1);
+        ReaderGroupIds[0] = RGId_Conn1_RG1;
+
+        /* setup Connection 2: */
+        UA_NodeId RGId_Conn2_RG1;
+        UA_NodeId_init(&RGId_Conn2_RG1);
+        AddReaderGroup(&ConnId_2, "Conn2_RG1", &RGId_Conn2_RG1);
+        UA_NodeId DSRId_Conn2_RG1_DSR1;
+        UA_NodeId_init(&DSRId_Conn2_RG1_DSR1);
+        AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, WG_Id, DSW_Id,
+            &subscriberVarIds[0], &fastPathSubscriberDataValues[0], &DSRId_Conn2_RG1_DSR1);
+        ReaderGroupIds[1] = RGId_Conn2_RG1;
+
+        /* setup Connection 3: */
+        UA_NodeId RGId_Conn3_RG1;
+        UA_NodeId_init(&RGId_Conn3_RG1);
+        AddReaderGroup(&ConnId_3, "Conn3_RG1", &RGId_Conn3_RG1);
+        UA_NodeId DSRId_Conn3_RG1_DSR1;
+        UA_NodeId_init(&DSRId_Conn3_RG1_DSR1);
+        AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", Conn5_PublisherIdType, Conn5_PublisherId, WG_Id, DSW_Id,
+            &subscriberVarIds[4], &fastPathSubscriberDataValues[4], &DSRId_Conn3_RG1_DSR1);
+        ReaderGroupIds[2] = RGId_Conn3_RG1;
+
+        /* setup Connection 4: */
+        UA_NodeId RGId_Conn4_RG1;
+        UA_NodeId_init(&RGId_Conn4_RG1);
+        AddReaderGroup(&ConnId_4, "Conn4_RG1", &RGId_Conn4_RG1);
+        UA_NodeId DSRId_Conn4_RG1_DSR1;
+        UA_NodeId_init(&DSRId_Conn4_RG1_DSR1);
+        AddDataSetReader(&RGId_Conn4_RG1, "Conn4_RG1_DSR1", Conn3_PublisherIdType, Conn3_PublisherId, WG_Id, DSW_Id,
+            &subscriberVarIds[2], &fastPathSubscriberDataValues[2], &DSRId_Conn4_RG1_DSR1);
+        ReaderGroupIds[3] = RGId_Conn4_RG1;
+
+        /* setup Connection 5: */
+        UA_NodeId RGId_Conn5_RG1;
+        UA_NodeId_init(&RGId_Conn5_RG1);
+        AddReaderGroup(&ConnId_5, "Conn5_RG1", &RGId_Conn5_RG1);
+        UA_NodeId DSRId_Conn5_RG1_DSR1;
+        UA_NodeId_init(&DSRId_Conn5_RG1_DSR1);
+        AddDataSetReader(&RGId_Conn5_RG1, "Conn5_RG1_DSR1", Conn4_PublisherIdType, Conn4_PublisherId, WG_Id, DSW_Id,
+            &subscriberVarIds[3], &fastPathSubscriberDataValues[3], &DSRId_Conn5_RG1_DSR1);
+        ReaderGroupIds[4] = RGId_Conn5_RG1;
+
+    }   /* end of configuration scope -> string PublisherIds are deallocated from stack
+            deep copy of string PublisherId is done by UA_Server_addPubSubConnection() */
+
+    /* freeze all Groups */
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+    }
+    /* set groups operational */
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupOperational(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, ReaderGroupIds[i]));
+    }
+
+    /* check that publish/subscribe works -> set some test values */
+    ValidatePublishSubscribe(DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS, publisherVarIds, subscriberVarIds,
+        fastPathPublisherDataValues, fastPathSubscriberDataValues, 10, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
+        fastPathSubscriberDataValues, 50, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
+        fastPathSubscriberDataValues, 100, (UA_UInt32) 100, 3);
+
+    /* check PubSub information model - string Ids */
+    char *expectedPublisherIds[] = {
+        "H",
+        "h",
+        "hallo",
+        "hallo1",
+        "Hallo"
+    };
+
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        Test_string_PublisherId_InformationModel(ConnectionIds[i], UA_STRING(expectedPublisherIds[i]));
+    }
+
+    /* set groups to disabled */
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable groups");
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupDisabled(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupDisabled(server, ReaderGroupIds[i]));
+    }
+    /* unfreeze groups */
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove PublishedDataSets");
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, PublishedDataSetIds[i]));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove Connection");
+    for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePubSubConnection(server, ConnectionIds[i]));
+    }
+
+    if (UseFastPath) {
+        for (size_t i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
+            UA_DataValue_clear(fastPathPublisherDataValues[i]);
+            UA_DataValue_delete(fastPathPublisherDataValues[i]);
+
+            UA_DataValue_clear(fastPathSubscriberDataValues[i]);
+            UA_DataValue_delete(fastPathSubscriberDataValues[i]);
+        }
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_string_PublisherId() end");
+}
+
+
+/***************************************************************************************************/
+/* test string PublisherId */
+START_TEST(Test_string_publisherId) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_string_publisherId");
+
+    /* note: fast-path does not support STRING publisherIds */
+    UseFastPath = UA_FALSE;
+
+    UseRawEncoding = UA_FALSE;
+    DoTest_string_PublisherId();
+
+    UseRawEncoding = UA_TRUE;
+    DoTest_string_PublisherId();
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_string_publisherId\n\n");
+} END_TEST
+
+#ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
+
+/***************************************************************************************************/
+START_TEST(Test_string_publisherId_file_config) {
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_string_publisherId_file_config");
+
+    UseRawEncoding = UA_FALSE;
+    UseFastPath = UA_FALSE;
+
+#define STRING_PUBLISHERID_FILE_MAX_COMPONENTS 1
+    /* Attention: Publisher and corresponding Subscriber NodeId and DataValue must have the same index
+        e.g. publisherVarIds[0] value is set and subscriberVarIds[0] value is checked at ValidatePublishSubscribe() function */
+    UA_NodeId publisherVarIds[STRING_PUBLISHERID_FILE_MAX_COMPONENTS];
+    UA_NodeId subscriberVarIds[STRING_PUBLISHERID_FILE_MAX_COMPONENTS];
+
+    UA_DataValue *fastPathPublisherDataValues[STRING_PUBLISHERID_FILE_MAX_COMPONENTS];
+    UA_DataValue *fastPathSubscriberDataValues[STRING_PUBLISHERID_FILE_MAX_COMPONENTS];
+    for (UA_UInt32 i = 0; i < STRING_PUBLISHERID_FILE_MAX_COMPONENTS; i++) {
+        fastPathPublisherDataValues[i] = 0;
+        fastPathSubscriberDataValues[i] = 0;
+    }
+
+    /* we do not use a file, but setup PubSubConfigurationDataType structure and encode it to a bytestring
+        to simulate file read */
+    UA_ByteString encodedConfigDataBuffer;
+    UA_ByteString_init(&encodedConfigDataBuffer);
+
+    /* constants for configuration */
+#define DS_MESSAGECONTENT_MASK (UA_UADPDATASETMESSAGECONTENTMASK_STATUS | \
+                                UA_UADPDATASETMESSAGECONTENTMASK_TIMESTAMP)
+#define MAX_NETWORKMESSAGE_SIZE 1400
+#define UADP_NETWORKMESSAGE_CONTENT_MASK \
+    (UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID | UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER | \
+    UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID | UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER)
+
+{   /* we use a local scope to make sure that string PublisherId configuration works correctly
+        -> e.g. deep copy of Id */
+    UA_PubSubConfigurationDataType config;
+    UA_PubSubConfigurationDataType_init(&config);
+
+    config.enabled = UA_TRUE;
+
+    /* PublishedDataSet config */
+    config.publishedDataSetsSize = 1;
+    config.publishedDataSets = UA_PublishedDataSetDataType_new();
+    ck_assert(config.publishedDataSets != 0);
+    UA_PublishedDataSetDataType *pds = config.publishedDataSets;
+    UA_PublishedDataSetDataType_init(pds);
+    pds->name = UA_STRING_ALLOC("PublishedDataSet 1");
+    UA_DataSetMetaDataType dataSetMetaData;
+    UA_DataSetMetaDataType_init(&dataSetMetaData);
+    dataSetMetaData.name = UA_STRING_ALLOC("PublishedDataSet 1");
+    dataSetMetaData.fieldsSize = 1;
+    dataSetMetaData.fields = UA_FieldMetaData_new();
+    ck_assert(dataSetMetaData.fields != 0);
+    UA_FieldMetaData_init(dataSetMetaData.fields);
+    dataSetMetaData.fields->name = UA_STRING_ALLOC("Field 0");
+    dataSetMetaData.fields->fieldFlags = UA_DATASETFIELDFLAGS_NONE;
+    dataSetMetaData.fields->builtInType = UA_TYPES_INT32;
+    dataSetMetaData.fields->dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_INT32);
+    dataSetMetaData.fields->valueRank = UA_VALUERANK_SCALAR;
+    pds->dataSetMetaData = dataSetMetaData;
+    UA_PublishedDataItemsDataType *pdsDataItems = UA_PublishedDataItemsDataType_new();
+    ck_assert(pdsDataItems != 0);
+    UA_PublishedDataItemsDataType_init(pdsDataItems);
+    pdsDataItems->publishedDataSize = 1;
+    pdsDataItems->publishedData = UA_PublishedVariableDataType_new();
+    ck_assert(pdsDataItems->publishedData != 0);
+    UA_PublishedVariableDataType_init(pdsDataItems->publishedData);
+    pdsDataItems->publishedData->attributeId = UA_ATTRIBUTEID_VALUE;
+    /* Create variable to publish integer data */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    attr.description           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+    attr.displayName           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+    attr.dataType              = UA_TYPES[UA_TYPES_INT32].typeId;
+    UA_Int32 publisherData     = 42;
+    UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addVariableNode(server, UA_NODEID_NULL,
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                        UA_QUALIFIEDNAME(1, "Published Int32"),
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                        attr, NULL, &(publisherVarIds[0])));
+    UA_NodeId_copy(&(publisherVarIds[0]), &(pdsDataItems->publishedData->publishedVariable));
+    pds->dataSetSource.encoding = UA_EXTENSIONOBJECT_DECODED;
+    pds->dataSetSource.content.decoded.type = &UA_TYPES[UA_TYPES_PUBLISHEDDATAITEMSDATATYPE];
+    pds->dataSetSource.content.decoded.data = pdsDataItems;
+
+    /* connection config */
+    config.connectionsSize = 1;
+    config.connections = UA_PubSubConnectionDataType_new();
+    ck_assert(config.connections != 0);
+    UA_PubSubConnectionDataType *connection = config.connections;
+    UA_PubSubConnectionDataType_init(connection);
+    connection->name = UA_STRING_ALLOC("My Connection");
+    connection->enabled = true;
+    UA_String publisherIdString = UA_STRING("Publisher 1");
+    UA_Variant_setScalarCopy(&connection->publisherId, &publisherIdString, &UA_TYPES[UA_TYPES_STRING]); // TODO?
+    connection->transportProfileUri = UA_STRING_ALLOC("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_NetworkAddressUrlDataType *addr = UA_NetworkAddressUrlDataType_new();
+    ck_assert(addr != 0);
+    UA_NetworkAddressUrlDataType_init(addr);
+    addr->url = UA_STRING_ALLOC("opc.udp://224.0.0.22:4840/");
+    connection->address.encoding = UA_EXTENSIONOBJECT_DECODED;
+    connection->address.content.decoded.type = &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE];
+    connection->address.content.decoded.data = addr;
+
+    /* WriterGroup config */
+    connection->writerGroupsSize = 1;
+    connection->writerGroups = UA_WriterGroupDataType_new();
+    ck_assert(connection->writerGroups != 0);
+    UA_WriterGroupDataType *wg = connection->writerGroups;
+    UA_WriterGroupDataType_init(wg);
+    wg->enabled = true;
+    wg->name = UA_STRING_ALLOC("WriterGroup 1");
+    wg->maxNetworkMessageSize = MAX_NETWORKMESSAGE_SIZE;
+    wg->writerGroupId = 1;
+    wg->publishingInterval = 50;
+    wg->keepAliveTime = 1000.00;
+    UA_UadpWriterGroupMessageDataType *wgMessageSettings = UA_UadpWriterGroupMessageDataType_new();
+    ck_assert(wgMessageSettings != 0);
+    UA_UadpWriterGroupMessageDataType_init(wgMessageSettings);
+    wgMessageSettings->networkMessageContentMask = UADP_NETWORKMESSAGE_CONTENT_MASK;
+    wg->messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    wg->messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    wg->messageSettings.content.decoded.data = wgMessageSettings;
+
+    /* DataSetWriter config */
+    wg->dataSetWritersSize = 1;
+    wg->dataSetWriters = UA_DataSetWriterDataType_new();
+    ck_assert(wg->dataSetWriters != 0);
+    UA_DataSetWriterDataType *dsw = &wg->dataSetWriters[0];
+    dsw->enabled = UA_TRUE;
+    dsw->name = UA_STRING_ALLOC("DataSetWriter 1");
+    dsw->dataSetWriterId = 1;
+    dsw->dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_NONE;
+    dsw->keyFrameCount = 1;
+    dsw->dataSetName = UA_STRING_ALLOC("PublishedDataSet 1");
+    UA_UadpDataSetWriterMessageDataType *dswMessageSettings = UA_UadpDataSetWriterMessageDataType_new();
+    ck_assert(dswMessageSettings != 0);
+    UA_UadpDataSetWriterMessageDataType_init(dswMessageSettings);
+    dswMessageSettings->dataSetMessageContentMask = DS_MESSAGECONTENT_MASK;
+    dsw->messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    dsw->messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE];
+    dsw->messageSettings.content.decoded.data = dswMessageSettings;
+
+    // ReaderGroup
+    connection->readerGroupsSize = 1;
+    connection->readerGroups = UA_ReaderGroupDataType_new();
+    ck_assert(connection->readerGroups != 0);
+    UA_ReaderGroupDataType *rg = &connection->readerGroups[0];
+    UA_ReaderGroupDataType_init(rg);
+    rg->enabled = UA_TRUE;
+    rg->name = UA_STRING_ALLOC("ReaderGroup 1");
+    rg->maxNetworkMessageSize = MAX_NETWORKMESSAGE_SIZE;
+
+    // DataSetReader
+    rg->dataSetReadersSize = 1;
+    rg->dataSetReaders = UA_DataSetReaderDataType_new();
+    ck_assert(rg->dataSetReaders != 0);
+    UA_DataSetReaderDataType *dsr = &rg->dataSetReaders[0];
+    UA_DataSetReaderDataType_init(dsr);
+    dsr->name = UA_STRING_ALLOC("DataSetReader 1");
+    dsr->enabled = true;
+    UA_Variant_setScalarCopy(&dsr->publisherId, &publisherIdString, &UA_TYPES[UA_TYPES_STRING]);
+    dsr->writerGroupId = 1;
+    dsr->dataSetWriterId = 1;
+
+    UA_DataSetMetaDataType dsrDataSetMetaData;
+    UA_DataSetMetaDataType_init(&dsrDataSetMetaData);
+    dsrDataSetMetaData.name = UA_STRING_ALLOC("PublishedDataSet 1");
+    dsrDataSetMetaData.fieldsSize = 1;
+    dsrDataSetMetaData.fields = UA_FieldMetaData_new();
+    ck_assert(dsrDataSetMetaData.fields != 0);
+    dsrDataSetMetaData.fields->name = UA_STRING_ALLOC("Field_0");
+    dsrDataSetMetaData.fields->builtInType = UA_TYPES_INT32;
+    dsrDataSetMetaData.fields->dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_INT32);
+    dsrDataSetMetaData.fields->valueRank = UA_VALUERANK_SCALAR;
+    dsr->dataSetMetaData = dsrDataSetMetaData;
+
+    UA_TargetVariablesDataType *targetVars = UA_TargetVariablesDataType_new();
+    ck_assert(targetVars != 0);
+    UA_TargetVariablesDataType_init(targetVars);
+    targetVars->targetVariablesSize = 1;
+    targetVars->targetVariables = UA_FieldTargetDataType_new();
+    ck_assert(targetVars->targetVariables != 0);
+    targetVars->targetVariables->attributeId = UA_ATTRIBUTEID_VALUE;
+    /* Variable to subscribe data */
+    attr = UA_VariableAttributes_default;
+    attr.description = UA_LOCALIZEDTEXT("en-US", "Subscribed Int32");
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "Subscribed Int32");
+    attr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
+    UA_Int32 subscriberData = 0;
+    UA_Variant_setScalar(&attr.value, &subscriberData, &UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addVariableNode(server, UA_NODEID_NULL,
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
+                                        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, &(subscriberVarIds[0])));
+    UA_NodeId_copy(&(subscriberVarIds[0]), &(targetVars->targetVariables->targetNodeId));
+    dsr->subscribedDataSet.encoding = UA_EXTENSIONOBJECT_DECODED;
+    dsr->subscribedDataSet.content.decoded.type = &UA_TYPES[UA_TYPES_TARGETVARIABLESDATATYPE];
+    dsr->subscribedDataSet.content.decoded.data = targetVars;
+    dsr->dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_NONE;
+    dsr->messageReceiveTimeout = 400.0;
+    dsr->keyFrameCount = 1;
+    UA_UadpDataSetReaderMessageDataType *dsrMessageSettings = UA_UadpDataSetReaderMessageDataType_new();
+    ck_assert(dsrMessageSettings != 0);
+    UA_UadpDataSetReaderMessageDataType_init(dsrMessageSettings);
+    dsrMessageSettings->dataSetMessageContentMask = DS_MESSAGECONTENT_MASK;
+    dsrMessageSettings->networkMessageContentMask = UADP_NETWORKMESSAGE_CONTENT_MASK;
+    dsrMessageSettings->publishingInterval = 50;
+    dsr->messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    dsr->messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE];
+    dsr->messageSettings.content.decoded.data = dsrMessageSettings;
+
+    /* encode to bytestring to simulate PubSub file config read */
+    UA_UABinaryFileDataType BinaryFileData;
+    UA_UABinaryFileDataType_init(&BinaryFileData);
+    UA_Variant_setScalar(&BinaryFileData.body, (void*) &config, &UA_TYPES[UA_TYPES_PUBSUBCONFIGURATIONDATATYPE]);
+    UA_ExtensionObject extObj;
+    UA_ExtensionObject_init(&extObj);
+    extObj.encoding = UA_EXTENSIONOBJECT_DECODED;
+    extObj.content.decoded.type = &UA_TYPES[UA_TYPES_UABINARYFILEDATATYPE];
+    extObj.content.decoded.data = &BinaryFileData;
+    size_t fileSize = UA_ExtensionObject_calcSizeBinary(&extObj);
+    encodedConfigDataBuffer.data = (UA_Byte*)UA_calloc(fileSize, sizeof(UA_Byte));
+    ck_assert(encodedConfigDataBuffer.data != 0);
+    encodedConfigDataBuffer.length = fileSize;
+    UA_Byte *bufferPos = encodedConfigDataBuffer.data;
+    ck_assert_int_eq(UA_STATUSCODE_GOOD,
+        UA_ExtensionObject_encodeBinary(&extObj, &bufferPos, bufferPos + fileSize));
+    UA_PubSubConfigurationDataType_clear(&config);
+}
+    /* load and apply config from ByteString buffer */
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_PubSubManager_loadPubSubConfigFromByteString(server, encodedConfigDataBuffer));
+
+    /* groups are already operational */
+    /* check that publish/subscribe works -> set some test values */
+    ValidatePublishSubscribe(STRING_PUBLISHERID_FILE_MAX_COMPONENTS, &publisherVarIds[0], &subscriberVarIds[0],
+        &fastPathPublisherDataValues[0], &fastPathSubscriberDataValues[0], 10, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(STRING_PUBLISHERID_FILE_MAX_COMPONENTS, &publisherVarIds[0], &subscriberVarIds[0],
+        &fastPathPublisherDataValues[0], &fastPathSubscriberDataValues[0], 33, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(STRING_PUBLISHERID_FILE_MAX_COMPONENTS, &publisherVarIds[0], &subscriberVarIds[0],
+        &fastPathPublisherDataValues[0], &fastPathSubscriberDataValues[0], 44, (UA_UInt32) 100, 3);
+
+    UA_ByteString_clear(&encodedConfigDataBuffer);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_string_publisherId_file_config\n\n");
+} END_TEST
+
+#endif /* UA_ENABLE_PUBSUB_FILE_CONFIG */
+
+/***************************************************************************************************/
+static void DoTest_multiple_Groups(void) {
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_multiple_Groups() begin");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "fast-path     = %s", (UseFastPath) ? "enabled" : "disabled");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "raw encoding  = %s", (UseRawEncoding) ? "enabled" : "disabled");
+
+    /*  Writers                             -> Readers              -> Var Index
+        ----------------------------------------------------------------------------------
+        Conn1 BYTE   Id  WG 1, DSW 1        -> Conn2, RG 2, DSR 1      0
+                         WG 2, DSW 1        -> Conn2, RG 1, DSR 1      1
+                         WG 3, DSW 1        -> Conn3, RG 1, DSR 1      2
+                         WG 4, DSW 1        -> Conn1, RG 1, DSR 1      3
+        Conn2 BYTE   Id  WG 1, DSW 1        -> Conn1, RG 3, DSR 1      4
+                         WG 2, DSW 1        -> Conn3, RG 2, DSR 1      5
+        Conn3 UINT16 Id  WG 1, DSW 1        -> Conn1, RG 2, DSR 1      6
+                         WG 2, DSW 1        -> Conn1, RG 4, DSR 1      7
+    */
+
+#define DOTEST_MULTIPLE_GROUPS_MAX_CONNECTIONS 3
+    UA_NodeId ConnectionIds[DOTEST_MULTIPLE_GROUPS_MAX_CONNECTIONS];
+
+#define DOTEST_MULTIPLE_GROUPS_MAX_WRITERGROUPS 8
+    UA_NodeId WriterGroupIds[DOTEST_MULTIPLE_GROUPS_MAX_WRITERGROUPS];
+
+#define DOTEST_MULTIPLE_GROUPS_MAX_PDS 8
+    UA_NodeId PublishedDataSetIds[DOTEST_MULTIPLE_GROUPS_MAX_PDS];
+
+#define DOTEST_MULTIPLE_GROUPS_MAX_READERGROUPS 8
+    UA_NodeId ReaderGroupIds[DOTEST_MULTIPLE_GROUPS_MAX_READERGROUPS];
+
+    /* Attention: Publisher and corresponding Subscriber NodeId and DataValue must have the same index
+       e.g. publisherVarIds[0] value is set and subscriberVarIds[0] value is checked at ValidatePublishSubscribe() function
+       see table "Var Index" entry above */
+#define DOTEST_MULTIPLE_GROUPS_MAX_VARS 8
+    UA_NodeId publisherVarIds[DOTEST_MULTIPLE_GROUPS_MAX_VARS];
+    UA_NodeId subscriberVarIds[DOTEST_MULTIPLE_GROUPS_MAX_VARS];
+
+    UA_DataValue *fastPathPublisherDataValues[DOTEST_MULTIPLE_GROUPS_MAX_VARS];
+    UA_DataValue *fastPathSubscriberDataValues[DOTEST_MULTIPLE_GROUPS_MAX_VARS];
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_VARS; i++) {
+        fastPathPublisherDataValues[i] = 0;
+        fastPathSubscriberDataValues[i] = 0;
+    }
+
+    const UA_UInt32 DSW_Id = 1;
+
+    /* setup all Publishers */
+
+    /* setup Connection 1: */
+    UA_NodeId ConnId_1;
+    UA_NodeId_init(&ConnId_1);
+    UA_PublisherIdType Conn1_PublisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+    UA_PublisherId Conn1_PublisherId;
+    Conn1_PublisherId.byte = 1;
+    AddConnection("Conn1", Conn1_PublisherIdType, Conn1_PublisherId, &ConnId_1);
+    ConnectionIds[0] = ConnId_1;
+
+    /* WriterGroup 1 */
+    UA_NodeId WGId_Conn1_WG1;
+    UA_NodeId_init(&WGId_Conn1_WG1);
+    const UA_UInt32 Conn1_WG1_Id = 1;
+    AddWriterGroup(&ConnId_1, "Conn1_WG1", Conn1_WG1_Id, &WGId_Conn1_WG1);
+    WriterGroupIds[0] = WGId_Conn1_WG1;
+
+    UA_NodeId DsWId_Conn1_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn1_WG1_DS1);
+    UA_NodeId PDSId_Conn1_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSW_Id, &PDSId_Conn1_WG1_PDS1,
+        &publisherVarIds[0], &fastPathPublisherDataValues[0], &DsWId_Conn1_WG1_DS1);
+    PublishedDataSetIds[0] = PDSId_Conn1_WG1_PDS1;
+
+    /* WriterGroup 2 */
+    UA_NodeId WGId_Conn1_WG2;
+    UA_NodeId_init(&WGId_Conn1_WG2);
+    const UA_UInt32 Conn1_WG2_Id = 2;
+    AddWriterGroup(&ConnId_1, "Conn1_WG2", Conn1_WG2_Id, &WGId_Conn1_WG2);
+    WriterGroupIds[1] = WGId_Conn1_WG2;
+
+    UA_NodeId DsWId_Conn1_WG2_DS1;
+    UA_NodeId_init(&DsWId_Conn1_WG2_DS1);
+    UA_NodeId PDSId_Conn1_WG2_PDS1;
+    UA_NodeId_init(&PDSId_Conn1_WG2_PDS1);
+    AddPublishedDataSet(&WGId_Conn1_WG2, "Conn1_WG2_PDS1", "Conn1_WG2_DS1", DSW_Id, &PDSId_Conn1_WG2_PDS1,
+        &publisherVarIds[1], &fastPathPublisherDataValues[1], &DsWId_Conn1_WG2_DS1);
+    PublishedDataSetIds[1] = PDSId_Conn1_WG2_PDS1;
+
+    /* WriterGroup 3 */
+    UA_NodeId WGId_Conn1_WG3;
+    UA_NodeId_init(&WGId_Conn1_WG3);
+    const UA_UInt32 Conn1_WG3_Id = 3;
+    AddWriterGroup(&ConnId_1, "Conn1_WG3", Conn1_WG3_Id, &WGId_Conn1_WG3);
+    WriterGroupIds[2] = WGId_Conn1_WG3;
+
+    UA_NodeId DsWId_Conn1_WG3_DS1;
+    UA_NodeId_init(&DsWId_Conn1_WG3_DS1);
+    UA_NodeId PDSId_Conn1_WG3_PDS1;
+    UA_NodeId_init(&PDSId_Conn1_WG3_PDS1);
+    AddPublishedDataSet(&WGId_Conn1_WG3, "Conn1_WG3_PDS1", "Conn1_WG3_DS1", DSW_Id, &PDSId_Conn1_WG3_PDS1,
+        &publisherVarIds[2], &fastPathPublisherDataValues[2], &DsWId_Conn1_WG3_DS1);
+    PublishedDataSetIds[2] = PDSId_Conn1_WG3_PDS1;
+
+    /* WriterGroup 4 */
+    UA_NodeId WGId_Conn1_WG4;
+    UA_NodeId_init(&WGId_Conn1_WG4);
+    const UA_UInt32 Conn1_WG4_Id = 4;
+    AddWriterGroup(&ConnId_1, "Conn1_WG4", Conn1_WG4_Id, &WGId_Conn1_WG4);
+    WriterGroupIds[3] = WGId_Conn1_WG4;
+
+    UA_NodeId DsWId_Conn1_WG4_DS1;
+    UA_NodeId_init(&DsWId_Conn1_WG4_DS1);
+    UA_NodeId PDSId_Conn1_WG4_PDS1;
+    UA_NodeId_init(&PDSId_Conn1_WG4_PDS1);
+    AddPublishedDataSet(&WGId_Conn1_WG4, "Conn1_WG4_PDS1", "Conn1_WG4_DS1", DSW_Id, &PDSId_Conn1_WG4_PDS1,
+        &publisherVarIds[3], &fastPathPublisherDataValues[3], &DsWId_Conn1_WG4_DS1);
+    PublishedDataSetIds[3] = PDSId_Conn1_WG4_PDS1;
+
+    /* setup Connection 2: */
+    UA_NodeId ConnId_2;
+    UA_NodeId_init(&ConnId_2);
+    UA_PublisherIdType Conn2_PublisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+    UA_PublisherId Conn2_PublisherId;
+    Conn2_PublisherId.byte = 2;
+    AddConnection("Conn2", Conn2_PublisherIdType, Conn2_PublisherId, &ConnId_2);
+    ConnectionIds[1] = ConnId_2;
+
+    /* WriterGroup 1 */
+    UA_NodeId WGId_Conn2_WG1;
+    UA_NodeId_init(&WGId_Conn2_WG1);
+    const UA_UInt32 Conn2_WG1_Id = 1;
+    AddWriterGroup(&ConnId_2, "Conn2_WG1", Conn2_WG1_Id, &WGId_Conn2_WG1);
+    WriterGroupIds[4] = WGId_Conn2_WG1;
+
+    UA_NodeId DsWId_Conn2_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn2_WG1_DS1);
+    UA_NodeId PDSId_Conn2_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn2_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", DSW_Id, &PDSId_Conn2_WG1_PDS1,
+        &publisherVarIds[4], &fastPathPublisherDataValues[4], &DsWId_Conn2_WG1_DS1);
+    PublishedDataSetIds[4] = PDSId_Conn2_WG1_PDS1;
+
+    /* WriterGroup 2 */
+    UA_NodeId WGId_Conn2_WG2;
+    UA_NodeId_init(&WGId_Conn2_WG2);
+    const UA_UInt32 Conn2_WG2_Id = 2;
+    AddWriterGroup(&ConnId_2, "Conn2_WG2", Conn2_WG2_Id, &WGId_Conn2_WG2);
+    WriterGroupIds[5] = WGId_Conn2_WG2;
+
+    UA_NodeId DsWId_Conn2_WG2_DS1;
+    UA_NodeId_init(&DsWId_Conn2_WG2_DS1);
+    UA_NodeId PDSId_Conn2_WG2_PDS1;
+    UA_NodeId_init(&PDSId_Conn2_WG2_PDS1);
+    AddPublishedDataSet(&WGId_Conn2_WG2, "Conn2_WG2_PDS1", "Conn2_WG2_DS1", DSW_Id, &PDSId_Conn2_WG2_PDS1,
+        &publisherVarIds[5], &fastPathPublisherDataValues[5], &DsWId_Conn2_WG2_DS1);
+    PublishedDataSetIds[5] = PDSId_Conn2_WG2_PDS1;
+
+    /* setup Connection 3: */
+    UA_NodeId ConnId_3;
+    UA_NodeId_init(&ConnId_3);
+    UA_PublisherIdType Conn3_PublisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    UA_PublisherId Conn3_PublisherId;
+    Conn3_PublisherId.uint16 = 1;
+    AddConnection("Conn3", Conn3_PublisherIdType, Conn3_PublisherId, &ConnId_3);
+    ConnectionIds[2] = ConnId_3;
+
+    /* WriterGroup 1 */
+    UA_NodeId WGId_Conn3_WG1;
+    UA_NodeId_init(&WGId_Conn3_WG1);
+    const UA_UInt32 Conn3_WG1_Id = 1;
+    AddWriterGroup(&ConnId_3, "Conn3_WG1", Conn3_WG1_Id, &WGId_Conn3_WG1);
+    WriterGroupIds[6] = WGId_Conn3_WG1;
+
+    UA_NodeId DsWId_Conn3_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn3_WG1_DS1);
+    UA_NodeId PDSId_Conn3_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn3_WG1_PDS1);
+    AddPublishedDataSet(&WGId_Conn3_WG1, "Conn3_WG1_PDS1", "Conn3_WG1_DS1", DSW_Id, &PDSId_Conn3_WG1_PDS1,
+        &publisherVarIds[6], &fastPathPublisherDataValues[6], &DsWId_Conn3_WG1_DS1);
+    PublishedDataSetIds[6] = PDSId_Conn3_WG1_PDS1;
+
+    /* WriterGroup 2 */
+    UA_NodeId WGId_Conn3_WG2;
+    UA_NodeId_init(&WGId_Conn3_WG2);
+    const UA_UInt32 Conn3_WG2_Id = 2;
+    AddWriterGroup(&ConnId_3, "Conn3_WG2", Conn3_WG2_Id, &WGId_Conn3_WG2);
+    WriterGroupIds[7] = WGId_Conn3_WG2;
+
+    UA_NodeId DsWId_Conn3_WG2_DS1;
+    UA_NodeId_init(&DsWId_Conn3_WG2_DS1);
+    UA_NodeId PDSId_Conn3_WG2_PDS1;
+    UA_NodeId_init(&PDSId_Conn3_WG2_PDS1);
+    AddPublishedDataSet(&WGId_Conn3_WG2, "Conn3_WG2_PDS1", "Conn3_WG2_DS1", DSW_Id, &PDSId_Conn3_WG2_PDS1,
+        &publisherVarIds[7], &fastPathPublisherDataValues[7], &DsWId_Conn3_WG2_DS1);
+    PublishedDataSetIds[7] = PDSId_Conn3_WG2_PDS1;
+
+    /* setup all Subscribers */
+
+    /* setup Connection 1: */
+
+    /* ReaderGroup 1 */
+    UA_NodeId RGId_Conn1_RG1;
+    UA_NodeId_init(&RGId_Conn1_RG1);
+    AddReaderGroup(&ConnId_1, "Conn1_RG1", &RGId_Conn1_RG1);
+    UA_NodeId DSRId_Conn1_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn1_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, Conn1_WG4_Id, DSW_Id,
+        &subscriberVarIds[3], &fastPathSubscriberDataValues[3], &DSRId_Conn1_RG1_DSR1);
+    ReaderGroupIds[0] = RGId_Conn1_RG1;
+
+    /* ReaderGroup 2 */
+    UA_NodeId RGId_Conn1_RG2;
+    UA_NodeId_init(&RGId_Conn1_RG2);
+    AddReaderGroup(&ConnId_1, "Conn1_RG2", &RGId_Conn1_RG2);
+    UA_NodeId DSRId_Conn1_RG2_DSR1;
+    UA_NodeId_init(&DSRId_Conn1_RG2_DSR1);
+    AddDataSetReader(&RGId_Conn1_RG2, "Conn1_RG2_DSR1", Conn3_PublisherIdType, Conn3_PublisherId, Conn3_WG1_Id, DSW_Id,
+        &subscriberVarIds[6], &fastPathSubscriberDataValues[6], &DSRId_Conn1_RG2_DSR1);
+    ReaderGroupIds[1] = RGId_Conn1_RG2;
+
+    /* ReaderGroup 3 */
+    UA_NodeId RGId_Conn1_RG3;
+    UA_NodeId_init(&RGId_Conn1_RG3);
+    AddReaderGroup(&ConnId_1, "Conn1_RG3", &RGId_Conn1_RG3);
+    UA_NodeId DSRId_Conn1_RG3_DSR1;
+    UA_NodeId_init(&DSRId_Conn1_RG3_DSR1);
+    AddDataSetReader(&RGId_Conn1_RG3, "Conn1_RG3_DSR1", Conn2_PublisherIdType, Conn2_PublisherId, Conn2_WG1_Id, DSW_Id,
+        &subscriberVarIds[4], &fastPathSubscriberDataValues[4], &DSRId_Conn1_RG3_DSR1);
+    ReaderGroupIds[2] = RGId_Conn1_RG3;
+
+    /* ReaderGroup 4 */
+    UA_NodeId RGId_Conn1_RG4;
+    UA_NodeId_init(&RGId_Conn1_RG4);
+    AddReaderGroup(&ConnId_1, "Conn1_RG4", &RGId_Conn1_RG4);
+    UA_NodeId DSRId_Conn1_RG4_DSR1;
+    UA_NodeId_init(&DSRId_Conn1_RG4_DSR1);
+    AddDataSetReader(&RGId_Conn1_RG4, "Conn1_RG4_DSR1", Conn3_PublisherIdType, Conn3_PublisherId, Conn3_WG2_Id, DSW_Id,
+        &subscriberVarIds[7], &fastPathSubscriberDataValues[7], &DSRId_Conn1_RG4_DSR1);
+    ReaderGroupIds[3] = RGId_Conn1_RG4;
+
+    /* setup Connection 2: */
+
+    /* ReaderGroup 1 */
+    UA_NodeId RGId_Conn2_RG1;
+    UA_NodeId_init(&RGId_Conn2_RG1);
+    AddReaderGroup(&ConnId_2, "Conn2_RG1", &RGId_Conn2_RG1);
+    UA_NodeId DSRId_Conn2_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn2_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, Conn1_WG2_Id, DSW_Id,
+        &subscriberVarIds[1], &fastPathSubscriberDataValues[1], &DSRId_Conn2_RG1_DSR1);
+    ReaderGroupIds[4] = RGId_Conn2_RG1;
+
+    /* ReaderGroup 2 */
+    UA_NodeId RGId_Conn2_RG2;
+    UA_NodeId_init(&RGId_Conn2_RG2);
+    AddReaderGroup(&ConnId_2, "Conn2_RG2", &RGId_Conn2_RG2);
+    UA_NodeId DSRId_Conn2_RG2_DSR1;
+    UA_NodeId_init(&DSRId_Conn2_RG2_DSR1);
+    AddDataSetReader(&RGId_Conn2_RG2, "Conn2_RG2_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, Conn1_WG1_Id, DSW_Id,
+        &subscriberVarIds[0], &fastPathSubscriberDataValues[0], &DSRId_Conn2_RG2_DSR1);
+    ReaderGroupIds[5] = RGId_Conn2_RG2;
+
+    /* setup Connection 3: */
+
+    /* ReaderGroup 1 */
+    UA_NodeId RGId_Conn3_RG1;
+    UA_NodeId_init(&RGId_Conn3_RG1);
+    AddReaderGroup(&ConnId_3, "Conn3_RG1", &RGId_Conn3_RG1);
+    UA_NodeId DSRId_Conn3_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn3_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, Conn1_WG3_Id, DSW_Id,
+        &subscriberVarIds[2], &fastPathSubscriberDataValues[2], &DSRId_Conn3_RG1_DSR1);
+    ReaderGroupIds[6] = RGId_Conn3_RG1;
+
+    /* ReaderGroup 2 */
+    UA_NodeId RGId_Conn3_RG2;
+    UA_NodeId_init(&RGId_Conn3_RG2);
+    AddReaderGroup(&ConnId_3, "Conn3_RG2", &RGId_Conn3_RG2);
+    UA_NodeId DSRId_Conn3_RG2_DSR1;
+    UA_NodeId_init(&DSRId_Conn3_RG2_DSR1);
+    AddDataSetReader(&RGId_Conn3_RG2, "Conn3_RG2_DSR1", Conn2_PublisherIdType, Conn2_PublisherId, Conn2_WG2_Id, DSW_Id,
+        &subscriberVarIds[5], &fastPathSubscriberDataValues[5], &DSRId_Conn3_RG2_DSR1);
+    ReaderGroupIds[7] = RGId_Conn3_RG2;
+
+    /* freeze all Groups */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_WRITERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_READERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+    }
+    /* set groups operational */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_WRITERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupOperational(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_READERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, ReaderGroupIds[i]));
+    }
+
+    /* check that publish/subscribe works -> set some test values */
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_GROUPS_MAX_VARS, publisherVarIds, subscriberVarIds,
+        fastPathPublisherDataValues, fastPathSubscriberDataValues, 10, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_GROUPS_MAX_VARS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
+        fastPathSubscriberDataValues, 50, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_GROUPS_MAX_VARS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
+        fastPathSubscriberDataValues, 100, (UA_UInt32) 100, 3);
+
+    /* set groups to disabled */
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable groups");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_WRITERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupDisabled(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_READERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupDisabled(server, ReaderGroupIds[i]));
+    }
+    /* unfreeze groups */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_WRITERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_READERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove PublishedDataSets");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_PDS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, PublishedDataSetIds[i]));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove Connections");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_CONNECTIONS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePubSubConnection(server, ConnectionIds[i]));
+    }
+
+    if (UseFastPath) {
+        for (size_t i = 0; i < DOTEST_MULTIPLE_GROUPS_MAX_VARS; i++) {
+            UA_DataValue_clear(fastPathPublisherDataValues[i]);
+            UA_DataValue_delete(fastPathPublisherDataValues[i]);
+
+            UA_DataValue_clear(fastPathSubscriberDataValues[i]);
+            UA_DataValue_delete(fastPathSubscriberDataValues[i]);
+        }
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_multiple_Groups() end");
+}
+
+/***************************************************************************************************/
+START_TEST(Test_multiple_groups) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_multiple_groups");
+
+    /* note: fast-path does not multiple groups/datasets/string publisher Ids
+        therefore fast-path is not enabled at this test */
+    UseFastPath = UA_FALSE;
+
+    UseRawEncoding = UA_FALSE;
+    DoTest_multiple_Groups();
+
+    UseRawEncoding = UA_TRUE;
+    DoTest_multiple_Groups();
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_groups\n\n");
+} END_TEST
+
+
+/***************************************************************************************************/
+static void DoTest_multiple_DataSets(void) {
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_multiple_DataSets() begin");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "fast-path     = %s", (UseFastPath) ? "enabled" : "disabled");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "raw encoding  = %s", (UseRawEncoding) ? "enabled" : "disabled");
+
+    /*  Writers                             -> Readers              -> Var Index
+        ----------------------------------------------------------------------------------
+        Conn1 BYTE   Id  WG 1, DSW 1        -> Conn2, RG 1, DSR 1      0
+                         WG 1, DSW 2        -> Conn2, RG 1, DSR 3      1
+                         WG 1, DSW 3        -> Conn2, RG 1, DSR 2      2
+                         WG 1, DSW 4        -> Conn1, RG 1, DSR 1      3
+        Conn2 UINT16 Id  WG 1, DSW 1        -> Conn1, RG 1, DSR 2      4
+                         WG 1, DSW 2        -> Conn2, RG 1, DSR 4      5
+    */
+
+#define DOTEST_MULTIPLE_DATASETS_MAX_CONNECTIONS 2
+    UA_NodeId ConnectionIds[DOTEST_MULTIPLE_DATASETS_MAX_CONNECTIONS];
+
+#define DOTEST_MULTIPLE_DATASETS_MAX_WRITERGROUPS 2
+    UA_NodeId WriterGroupIds[DOTEST_MULTIPLE_DATASETS_MAX_WRITERGROUPS];
+
+#define DOTEST_MULTIPLE_DATASETS_MAX_PDS 6
+    UA_NodeId PublishedDataSetIds[DOTEST_MULTIPLE_DATASETS_MAX_PDS];
+
+#define DOTEST_MULTIPLE_DATASETS_MAX_READERGROUPS 2
+    UA_NodeId ReaderGroupIds[DOTEST_MULTIPLE_DATASETS_MAX_READERGROUPS];
+
+    /* Attention: Publisher and corresponding Subscriber NodeId and DataValue must have the same index
+       e.g. publisherVarIds[0] value is set and subscriberVarIds[0] value is checked at ValidatePublishSubscribe() function
+       see table "Var Index" entry above */
+#define DOTEST_MULTIPLE_DATASETS_MAX_VARS 6
+    UA_NodeId publisherVarIds[DOTEST_MULTIPLE_DATASETS_MAX_VARS];
+    UA_NodeId subscriberVarIds[DOTEST_MULTIPLE_DATASETS_MAX_VARS];
+
+    UA_DataValue *fastPathPublisherDataValues[DOTEST_MULTIPLE_DATASETS_MAX_VARS];
+    UA_DataValue *fastPathSubscriberDataValues[DOTEST_MULTIPLE_DATASETS_MAX_VARS];
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_VARS; i++) {
+        fastPathPublisherDataValues[i] = 0;
+        fastPathSubscriberDataValues[i] = 0;
+    }
+
+    const UA_UInt32 WG_Id = 1;
+
+    /* setup all Publishers */
+
+    /* setup Connection 1: */
+    UA_NodeId ConnId_1;
+    UA_NodeId_init(&ConnId_1);
+    UA_PublisherIdType Conn1_PublisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+    UA_PublisherId Conn1_PublisherId;
+    Conn1_PublisherId.byte = 1;
+    AddConnection("Conn1", Conn1_PublisherIdType, Conn1_PublisherId, &ConnId_1);
+    ConnectionIds[0] = ConnId_1;
+
+    /* WriterGroup 1 */
+    UA_NodeId WGId_Conn1_WG1;
+    UA_NodeId_init(&WGId_Conn1_WG1);
+    AddWriterGroup(&ConnId_1, "Conn1_WG1", WG_Id, &WGId_Conn1_WG1);
+    WriterGroupIds[0] = WGId_Conn1_WG1;
+
+    /* DataSetWriter 1 */
+    UA_NodeId DsWId_Conn1_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn1_WG1_DS1);
+    UA_NodeId PDSId_Conn1_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
+    const UA_UInt32 Conn1_WG1_DSW1_Id = 1;
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", Conn1_WG1_DSW1_Id, &PDSId_Conn1_WG1_PDS1,
+        &publisherVarIds[0], &fastPathPublisherDataValues[0], &DsWId_Conn1_WG1_DS1);
+    PublishedDataSetIds[0] = PDSId_Conn1_WG1_PDS1;
+
+    /* DataSetWriter 2 */
+    UA_NodeId DsWId_Conn1_WG1_DS2;
+    UA_NodeId_init(&DsWId_Conn1_WG1_DS2);
+    UA_NodeId PDSId_Conn1_WG1_PDS2;
+    UA_NodeId_init(&PDSId_Conn1_WG1_PDS2);
+    const UA_UInt32 Conn1_WG1_DSW2_Id = 2;
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG2_PDS1", "Conn1_WG2_DS1", Conn1_WG1_DSW2_Id, &PDSId_Conn1_WG1_PDS2,
+        &publisherVarIds[1], &fastPathPublisherDataValues[1], &DsWId_Conn1_WG1_DS2);
+    PublishedDataSetIds[1] = PDSId_Conn1_WG1_PDS2;
+
+    /* DataSetWriter 3 */
+    UA_NodeId DsWId_Conn1_WG1_DS3;
+    UA_NodeId_init(&DsWId_Conn1_WG1_DS3);
+    UA_NodeId PDSId_Conn1_WG1_PDS3;
+    UA_NodeId_init(&PDSId_Conn1_WG1_PDS3);
+    const UA_UInt32 Conn1_WG1_DSW3_Id = 3;
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG2_PDS3", "Conn1_WG2_DS3", Conn1_WG1_DSW3_Id, &PDSId_Conn1_WG1_PDS3,
+        &publisherVarIds[2], &fastPathPublisherDataValues[2], &DsWId_Conn1_WG1_DS3);
+    PublishedDataSetIds[2] = PDSId_Conn1_WG1_PDS3;
+
+    /* DataSetWriter 4 */
+    UA_NodeId DsWId_Conn1_WG1_DS4;
+    UA_NodeId_init(&DsWId_Conn1_WG1_DS4);
+    UA_NodeId PDSId_Conn1_WG1_PDS4;
+    UA_NodeId_init(&PDSId_Conn1_WG1_PDS4);
+    const UA_UInt32 Conn1_WG1_DSW4_Id = 4;
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG2_PDS4", "Conn1_WG2_DS4", Conn1_WG1_DSW4_Id, &PDSId_Conn1_WG1_PDS4,
+        &publisherVarIds[3], &fastPathPublisherDataValues[3], &DsWId_Conn1_WG1_DS4);
+    PublishedDataSetIds[3] = PDSId_Conn1_WG1_PDS4;
+
+    /* setup Connection 2: */
+    UA_NodeId ConnId_2;
+    UA_NodeId_init(&ConnId_2);
+    UA_PublisherIdType Conn2_PublisherIdType = UA_PUBLISHERIDTYPE_BYTE;
+    UA_PublisherId Conn2_PublisherId;
+    Conn2_PublisherId.byte = 2;
+    AddConnection("Conn2", Conn2_PublisherIdType, Conn2_PublisherId, &ConnId_2);
+    ConnectionIds[1] = ConnId_2;
+
+    /* WriterGroup 1 */
+    UA_NodeId WGId_Conn2_WG1;
+    UA_NodeId_init(&WGId_Conn2_WG1);
+    AddWriterGroup(&ConnId_2, "Conn2_WG1", WG_Id, &WGId_Conn2_WG1);
+    WriterGroupIds[1] = WGId_Conn2_WG1;
+
+    /* DataSetWriter 1 */
+    UA_NodeId DsWId_Conn2_WG1_DS1;
+    UA_NodeId_init(&DsWId_Conn2_WG1_DS1);
+    UA_NodeId PDSId_Conn2_WG1_PDS1;
+    UA_NodeId_init(&PDSId_Conn2_WG1_PDS1);
+    const UA_UInt32 Conn2_WG1_DSW1_Id = 1;
+    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", Conn2_WG1_DSW1_Id, &PDSId_Conn2_WG1_PDS1,
+        &publisherVarIds[4], &fastPathPublisherDataValues[4], &DsWId_Conn2_WG1_DS1);
+    PublishedDataSetIds[4] = PDSId_Conn2_WG1_PDS1;
+
+    /* DataSetWriter 2 */
+    UA_NodeId DsWId_Conn2_WG1_DS2;
+    UA_NodeId_init(&DsWId_Conn2_WG1_DS2);
+    UA_NodeId PDSId_Conn2_WG1_PDS2;
+    UA_NodeId_init(&PDSId_Conn2_WG1_PDS2);
+    const UA_UInt32 Conn2_WG1_DSW2_Id = 2;
+    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS2", "Conn2_WG1_DS2", Conn2_WG1_DSW2_Id, &PDSId_Conn2_WG1_PDS2,
+        &publisherVarIds[5], &fastPathPublisherDataValues[5], &DsWId_Conn2_WG1_DS2);
+    PublishedDataSetIds[5] = PDSId_Conn2_WG1_PDS2;
+
+
+    /* setup all Subscribers */
+
+    /* setup Connection 1: */
+
+    /* ReaderGroup 1 */
+    UA_NodeId RGId_Conn1_RG1;
+    UA_NodeId_init(&RGId_Conn1_RG1);
+    AddReaderGroup(&ConnId_1, "Conn1_RG1", &RGId_Conn1_RG1);
+    ReaderGroupIds[0] = RGId_Conn1_RG1;
+
+    /* DataSetReader 1 */
+    UA_NodeId DSRId_Conn1_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn1_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, WG_Id, Conn1_WG1_DSW4_Id,
+        &subscriberVarIds[3], &fastPathSubscriberDataValues[3], &DSRId_Conn1_RG1_DSR1);
+
+    /* DataSetReader 2 */
+    UA_NodeId DSRId_Conn1_RG1_DSR2;
+    UA_NodeId_init(&DSRId_Conn1_RG1_DSR2);
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR2", Conn2_PublisherIdType, Conn2_PublisherId, WG_Id, Conn1_WG1_DSW1_Id,
+        &subscriberVarIds[4], &fastPathSubscriberDataValues[4], &DSRId_Conn1_RG1_DSR2);
+
+    /* setup Connection 2: */
+
+    /* ReaderGroup 1 */
+    UA_NodeId RGId_Conn2_RG1;
+    UA_NodeId_init(&RGId_Conn2_RG1);
+    AddReaderGroup(&ConnId_2, "Conn2_RG1", &RGId_Conn2_RG1);
+    ReaderGroupIds[1] = RGId_Conn2_RG1;
+
+    /* DataSetReader 1 */
+    UA_NodeId DSRId_Conn2_RG1_DSR1;
+    UA_NodeId_init(&DSRId_Conn2_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, WG_Id, Conn1_WG1_DSW1_Id,
+        &subscriberVarIds[0], &fastPathSubscriberDataValues[0], &DSRId_Conn2_RG1_DSR1);
+
+    /* DataSetReader 2 */
+    UA_NodeId DSRId_Conn2_RG1_DSR2;
+    UA_NodeId_init(&DSRId_Conn2_RG1_DSR2);
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR2", Conn1_PublisherIdType, Conn1_PublisherId, WG_Id, Conn1_WG1_DSW3_Id,
+        &subscriberVarIds[2], &fastPathSubscriberDataValues[2], &DSRId_Conn2_RG1_DSR2);
+
+    /* DataSetReader 3 */
+    UA_NodeId DSRId_Conn2_RG1_DSR3;
+    UA_NodeId_init(&DSRId_Conn2_RG1_DSR3);
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR3", Conn1_PublisherIdType, Conn1_PublisherId, WG_Id, Conn1_WG1_DSW2_Id,
+        &subscriberVarIds[1], &fastPathSubscriberDataValues[1], &DSRId_Conn2_RG1_DSR3);
+
+    /* DataSetReader 4 */
+    UA_NodeId DSRId_Conn2_RG1_DSR4;
+    UA_NodeId_init(&DSRId_Conn2_RG1_DSR4);
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR4", Conn2_PublisherIdType, Conn2_PublisherId, WG_Id, Conn1_WG1_DSW2_Id,
+        &subscriberVarIds[5], &fastPathSubscriberDataValues[5], &DSRId_Conn2_RG1_DSR4);
+
+    /* freeze all Groups */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_WRITERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_READERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+    }
+    /* set groups operational */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_WRITERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupOperational(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_READERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, ReaderGroupIds[i]));
+    }
+
+    /* check that publish/subscribe works -> set some test values */
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_DATASETS_MAX_VARS, publisherVarIds, subscriberVarIds,
+        fastPathPublisherDataValues, fastPathSubscriberDataValues, 10, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_DATASETS_MAX_VARS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
+        fastPathSubscriberDataValues, 50, (UA_UInt32) 100, 3);
+
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_DATASETS_MAX_VARS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
+        fastPathSubscriberDataValues, 100, (UA_UInt32) 100, 3);
+
+    /* set groups to disabled */
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable groups");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_WRITERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupDisabled(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_READERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupDisabled(server, ReaderGroupIds[i]));
+    }
+    /* unfreeze groups */
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_WRITERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+    }
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_READERGROUPS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove PublishedDataSets");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_PDS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, PublishedDataSetIds[i]));
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove Connections");
+    for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_CONNECTIONS; i++) {
+        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePubSubConnection(server, ConnectionIds[i]));
+    }
+
+    if (UseFastPath) {
+        for (size_t i = 0; i < DOTEST_MULTIPLE_DATASETS_MAX_VARS; i++) {
+            UA_DataValue_clear(fastPathPublisherDataValues[i]);
+            UA_DataValue_delete(fastPathPublisherDataValues[i]);
+
+            UA_DataValue_clear(fastPathSubscriberDataValues[i]);
+            UA_DataValue_delete(fastPathSubscriberDataValues[i]);
+        }
+    }
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "DoTest_multiple_DataSets() end");
+}
+
+/***************************************************************************************************/
+START_TEST(Test_multiple_datasets) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_multiple_datasets");
+
+    /* note: fast-path does not multiple groups/datasets/string publisher Ids
+        therefore fast-path is not enabled at this test */
+    UseFastPath = UA_FALSE;
+
+    UseRawEncoding = UA_FALSE;
+    DoTest_multiple_DataSets();
+
+    UseRawEncoding = UA_TRUE;
+    DoTest_multiple_DataSets();
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_datasets\n\n");
+} END_TEST
+
+
+/***************************************************************************************************/
+int main(void) {
+
+    TCase *tc_basic = tcase_create("PublisherId");
+    tcase_add_checked_fixture(tc_basic, setup, teardown);
+
+    /* test case description:
+        - test 1 connection with 1 WriterGroup, 1 DatasetWriter, 1 ReaderGroup and 1 DataSetReader
+        - test all possible publisherId types
+        - test with all combinations of fast-path and raw-encoding
+    */
+    tcase_add_test(tc_basic, Test_1_connection);
+
+    /* test case description:
+        - setup a PubSub configuration with multiple Connections
+        - all WriterGroup Ids and DataSetWriter Ids are equal, because we want to test the publisherId check
+        - use the same publishing interval for all groups to ensure that the Readers receive multiple messages at the same time
+        - set different publishing values to ensure that PublisherId check works and every DataSetReader receives the correct message
+        - test all different publisherId types
+        - test with all combinations of fast-path and raw-encoding
+        - TODO: fast-path does not support multiple groups and datasets, therefore we only test multiple connections with fast-path here
+        - TODO: fast-path does not support STRING publisherIds
+    */
+    tcase_add_test(tc_basic, Test_multiple_connections);
+
+    /* test case description:
+        - setup a PubSub configuration with multiple Connections
+        - all connections have a STRING PublisherId
+        - all WriterGroup Ids and DataSetWriter Ids are equal, because we want to test the publisherId check
+        - use the same publishing interval for all groups to ensure that the Readers receive multiple messages at the same time
+        - set different publishing values to ensure that PublisherId check works and every DataSetReader receives the correct message
+        - test with and without raw-encoding
+        - TODO: fast-path does not support string PublisherIds at the moment
+    */
+    tcase_add_test(tc_basic, Test_string_publisherId);
+
+#ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
+    /* test case description:
+        - test pubsub file config with string PublisherId
+    */
+    tcase_add_test(tc_basic, Test_string_publisherId_file_config);
+#endif /* UA_ENABLE_PUBSUB_FILE_CONFIG */
+
+    /* test case description:
+        - setup a PubSub configuration with multiple Groups
+        - use the same publishing interval for all groups to ensure that the Readers receive multiple messages at the same time
+        - set different publishing values to ensure that PublisherId check works and every DataSetReader receives the correct message
+        - test with with and without raw-encoding
+    */
+    tcase_add_test(tc_basic, Test_multiple_groups);
+
+    /* test case description:
+        - setup a PubSub configuration with multiple DataSets
+        - use the same publishing interval for all groups to ensure that the Readers receive multiple messages at the same time
+        - set different publishing values to ensure that PublisherId check works and every DataSetReader receives the correct message
+        - test with with and without raw-encoding
+    */
+    tcase_add_test(tc_basic, Test_multiple_datasets);
+
+    Suite *s = suite_create("PubSub publisherId tests");
+    suite_add_tcase(s, tc_basic);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From c1f605a672ab5edefe3876275bdc908dda490bf4 Mon Sep 17 00:00:00 2001
From: Stefan Roesch <stefan.roesch.ext@zeiss.com>
Date: Thu, 9 Jun 2022 11:40:22 +0200
Subject: [PATCH 0267/1963] feat(server): add a split version of
 UA_Server_createCondition

Similiar to UA_Server_addNode_begin / _finish
UA_Server_addCondition_begin / _finish allows the modification of the
condition node before finish the instantiation. For example adding
children with specific NodeIds.
This could be useful for creating a server with predefined condition
instances.
---
 include/open62541/server.h                    |  51 ++++++
 .../ua_subscription_alarms_conditions.c       | 150 +++++++++++++-----
 tests/server/check_server_alarmsconditions.c  |  72 ++++++++-
 3 files changed, 230 insertions(+), 43 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 3b5270ffbb6..116fc8de272 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -1579,6 +1579,57 @@ UA_Server_createCondition(UA_Server *server,
                           const UA_NodeId hierarchialReferenceType,
                           UA_NodeId *outConditionId);
 
+/**
+ * The method pair UA_Server_addCondition_begin and _finish splits the
+ * UA_Server_createCondtion in two parts similiar to the
+ * UA_Server_addNode_begin / _finish pair. This is useful if the node shall be
+ * modified before finish the instantiation. For example to add children with
+ * specific NodeIds.
+ * For details refer to the UA_Server_addNode_begin / _finish methods.
+ *
+ * Additionally to UA_Server_addNode_begin UA_Server_addCondition_begin checks
+ * if the passed condition type is a subtype of the OPC UA ConditionType.
+ *
+ * @param server The server object
+ * @param conditionId The NodeId of the requested Condition Object. When passing
+ *        UA_NODEID_NUMERIC(X,0) an unused nodeid in namespace X will be used.
+ *        E.g. passing UA_NODEID_NULL will result in a NodeId in namespace 0.
+ * @param conditionType The NodeId of the node representation of the ConditionType
+ * @param conditionName The name of the condition to be added
+ * @param outConditionId The NodeId of the added Condition
+ * @return The StatusCode of the UA_Server_addCondition_begin method */
+UA_StatusCode UA_EXPORT
+UA_Server_addCondition_begin(UA_Server *server,
+                             const UA_NodeId conditionId,
+                             const UA_NodeId conditionType,
+                             const UA_QualifiedName conditionName,
+                             UA_NodeId *outConditionId);
+
+/**
+ * Second call of the UA_Server_addCondition_begin and _finish pair.
+ *
+ * Additionally to UA_Server_addNode_finish UA_Server_addCondition_finish:
+ *  - checks whether the condition source has HasEventSource reference to its
+ *    parent. If not, a HasEventSource reference will be created between
+ *    condition source and server object
+ *  - exposes the condition in the address space if hierarchialReferenceType is
+ *    not UA_NODEID_NULL by adding a reference of this type from the condition
+ *    source to the condition instance
+ *  - initializes the standard condition fields and callbacks
+ *
+ * @param server The server object
+ * @param conditionId The NodeId of the unfinished Condition Object
+ * @param conditionSource The NodeId of the Condition Source (Parent of the Condition)
+ * @param hierarchialReferenceType The NodeId of Hierarchical ReferenceType
+ *                                 between Condition and its source
+ * @return The StatusCode of the UA_Server_addCondition_finish method */
+
+UA_StatusCode UA_EXPORT
+UA_Server_addCondition_finish(UA_Server *server,
+                              const UA_NodeId conditionId,
+                              const UA_NodeId conditionSource,
+                              const UA_NodeId hierarchialReferenceType);
+
 /* Set the value of condition field.
  *
  * @param server The server object
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index ad289d3bd75..db2948aa0ef 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -2159,36 +2159,18 @@ setStandardConditionCallbacks(UA_Server *server, const UA_NodeId* condition,
     return retval;
 }
 
-/* Create condition instance. The function checks first whether the passed
- * conditionType is a subType of ConditionType. Then checks whether the
- * condition source has HasEventSource reference to its parent. If not, a
- * HasEventSource reference will be created between condition source and server
- * object. To expose the condition in address space, a hierarchical
- * ReferenceType should be passed to create the reference to condition source.
- * Otherwise, UA_NODEID_NULL should be passed to make the condition unexposed. */
-UA_StatusCode
-UA_Server_createCondition(UA_Server *server,
-                          const UA_NodeId conditionId, const UA_NodeId conditionType,
-                          const UA_QualifiedName conditionName,
-                          const UA_NodeId conditionSource,
-                          const UA_NodeId hierarchialReferenceType,
-                          UA_NodeId *outNodeId) {
-    if(!outNodeId) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND, "outNodeId cannot be NULL!");
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
+static UA_StatusCode
+addCondition_finish(UA_Server *server,
+                    const UA_NodeId conditionId,
+                    const UA_NodeId conditionType,
+                    const UA_QualifiedName conditionName,
+                    const UA_NodeId conditionSource,
+                    const UA_NodeId hierarchialReferenceType) {
 
-    /* Make sure the conditionType is a Subtype of ConditionType */
-    UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
-    if(!isNodeInTree_singleRef(server, &conditionType, &conditionTypeId,
-                               UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
-                     "Condition Type must be a subtype of ConditionType!");
-        return UA_STATUSCODE_BADNOMATCH;
-    }
+    UA_StatusCode retval = UA_Server_addNode_finish(server, conditionId);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Finish node failed",);
 
     /* Make sure the ConditionSource has HasEventSource or one of its SubTypes ReferenceType */
-    UA_StatusCode retval;
     UA_NodeId serverObject = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER);
     if(!doesHasEventSourceReferenceExist(server, conditionSource) &&
        !UA_NodeId_equal(&serverObject, &conditionSource)) {
@@ -2201,15 +2183,6 @@ UA_Server_createCondition(UA_Server *server,
                                          "to the Server Object failed",);
     }
 
-    /* Create an ObjectNode which represents the condition */
-    UA_NodeId newNodeId = UA_NODEID_NULL;
-    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
-    oAttr.displayName.locale = UA_STRING("en");
-    oAttr.displayName.text = conditionName.name;
-    retval = UA_Server_addObjectNode(server, conditionId, UA_NODEID_NULL, UA_NODEID_NULL,
-                                     conditionName, conditionType, oAttr, NULL, &newNodeId);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding Condition failed",);
-
     /* create HasCondition Reference (HasCondition should be forward from the
      * ConditionSourceNode to the Condition. else, HasCondition should be
      * forward from the ConditionSourceNode to the ConditionType Node) */
@@ -2218,7 +2191,7 @@ UA_Server_createCondition(UA_Server *server,
          * ConditionNode in Address Space */
         // only Check hierarchialReferenceType
         UA_ExpandedNodeId expandedNewNodeId = UA_EXPANDEDNODEID_NULL;
-        expandedNewNodeId.nodeId = newNodeId;
+        expandedNewNodeId.nodeId = conditionId;
         retval = UA_Server_addReference(server, conditionSource, hierarchialReferenceType,
                                         expandedNewNodeId, true);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating hierarchical Reference to "
@@ -2239,14 +2212,12 @@ UA_Server_createCondition(UA_Server *server,
     }
 
     /* Set standard fields */
-    retval = setStandardConditionFields(server, &newNodeId, &conditionType,
+    retval = setStandardConditionFields(server, &conditionId, &conditionType,
                                         &conditionSource, &conditionName);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set standard Condition Fields failed",);
 
-    *outNodeId = newNodeId;
-
     /* Set Method Callbacks */
-    retval = setStandardConditionCallbacks(server, &newNodeId, &conditionType);
+    retval = setStandardConditionCallbacks(server, &conditionId, &conditionType);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition callbacks failed",);
 
     /* change Refresh Events IsAbstract = false
@@ -2266,7 +2237,102 @@ UA_Server_createCondition(UA_Server *server,
     }
 
     /* append Condition to list */
-    return appendConditionEntry(server, &newNodeId, &conditionSource);
+    return appendConditionEntry(server, &conditionId, &conditionSource);
+}
+
+/* Create condition instance. The function checks first whether the passed
+ * conditionType is a subType of ConditionType. Then checks whether the
+ * condition source has HasEventSource reference to its parent. If not, a
+ * HasEventSource reference will be created between condition source and server
+ * object. To expose the condition in address space, a hierarchical
+ * ReferenceType should be passed to create the reference to condition source.
+ * Otherwise, UA_NODEID_NULL should be passed to make the condition unexposed. */
+UA_StatusCode
+UA_Server_createCondition(UA_Server *server,
+                          const UA_NodeId conditionId, const UA_NodeId conditionType,
+                          const UA_QualifiedName conditionName,
+                          const UA_NodeId conditionSource,
+                          const UA_NodeId hierarchialReferenceType,
+                          UA_NodeId *outNodeId) {
+    if(!outNodeId) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+                     "outNodeId cannot be NULL!");
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    UA_StatusCode retval = UA_Server_addCondition_begin(server, conditionId, conditionType,
+                                                        conditionName, outNodeId);
+    if(retval != UA_STATUSCODE_GOOD) {
+        return retval;
+    }
+    return addCondition_finish(server, *outNodeId, conditionType, conditionName,
+                               conditionSource, hierarchialReferenceType);
+}
+
+UA_StatusCode
+UA_Server_addCondition_begin(UA_Server *server, const UA_NodeId conditionId,
+                             const UA_NodeId conditionType,
+                             const UA_QualifiedName conditionName, UA_NodeId *outNodeId) {
+    if(!outNodeId) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+                     "outNodeId cannot be NULL!");
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    /* Make sure the conditionType is a Subtype of ConditionType */
+    UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
+    if(!isNodeInTree_singleRef(server, &conditionType, &conditionTypeId,
+                               UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+                     "Condition Type must be a subtype of ConditionType!");
+        return UA_STATUSCODE_BADNOMATCH;
+    }
+
+    /* Create an ObjectNode which represents the condition */
+    UA_StatusCode retval;
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    oAttr.displayName.locale = UA_STRING("en");
+    oAttr.displayName.text = conditionName.name;
+    retval = UA_Server_addNode_begin(server,
+                                     UA_NODECLASS_OBJECT,
+                                     conditionId,
+                                     UA_NODEID_NULL,
+                                     UA_NODEID_NULL,
+                                     conditionName,
+                                     conditionType,
+                                     (const UA_NodeAttributes *)&oAttr,
+                                     &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                                     NULL,
+                                     outNodeId);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding Condition failed", );
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Server_addCondition_finish(UA_Server *server,
+                              const UA_NodeId conditionId,
+                              const UA_NodeId conditionSource,
+                              const UA_NodeId hierarchialReferenceType) {
+
+    const UA_Node *node = UA_NODESTORE_GET(server, &conditionId);
+
+    if(!node)
+        return UA_STATUSCODE_BADNODEIDUNKNOWN;
+
+    const UA_Node *type = getNodeType(server, &node->head);
+    if(!type) {
+        UA_NODESTORE_RELEASE(server, node);
+        return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
+    }
+
+    UA_StatusCode retval;
+    retval = addCondition_finish(server, conditionId, type->head.nodeId, node->head.browseName,
+                                conditionSource, hierarchialReferenceType);
+
+    UA_NODESTORE_RELEASE(server, type);
+    UA_NODESTORE_RELEASE(server, node);
+
+    return retval;
 }
 
 #ifdef CONDITIONOPTIONALFIELDS_SUPPORT
diff --git a/tests/server/check_server_alarmsconditions.c b/tests/server/check_server_alarmsconditions.c
index 38d306e2ed1..07ce82be3ea 100644
--- a/tests/server/check_server_alarmsconditions.c
+++ b/tests/server/check_server_alarmsconditions.c
@@ -42,7 +42,7 @@ START_TEST(createDelete) {
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         ck_assert_msg(!UA_NodeId_isNull(&conditionInstance), "ConditionId is null");
 
-        UA_Server_deleteCondition(
+        retval = UA_Server_deleteCondition(
             server_ac,
             conditionInstance,
             UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER)
@@ -50,6 +50,75 @@ START_TEST(createDelete) {
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     }
 } END_TEST
+
+START_TEST(splitCreation) {
+
+    UA_UInt16 nsIdx = UA_Server_addNamespace(server_ac, "http://yourorganisation.org/test/");
+
+    UA_StatusCode retval;
+    const UA_NodeId requestedId = UA_NODEID_NUMERIC(nsIdx, 1000);
+    UA_NodeId actualId = UA_NODEID_NULL;
+
+    retval = UA_Server_addCondition_begin(
+        server_ac,
+        requestedId,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_OFFNORMALALARMTYPE),
+        UA_QUALIFIEDNAME(0, "Condition split creation"),
+        &actualId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_msg(UA_NodeId_equal(&requestedId, &actualId),
+                                  "Actual node Id differs from requested Id");
+
+    // explicit add member EnabledState
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    attr.minimumSamplingInterval = 0.000000;
+    attr.userAccessLevel = 1;
+    attr.accessLevel = 1;
+    /* Value rank inherited */
+    attr.valueRank = -1;
+    attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_LOCALIZEDTEXT);
+    attr.displayName = UA_LOCALIZEDTEXT("", "EnabledState");
+
+    UA_NodeId var;
+    retval = UA_Server_addVariableNode(
+        server_ac,
+        UA_NODEID_NULL,
+        actualId,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+        UA_QUALIFIEDNAME(0, "EnabledState"),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_TWOSTATEVARIABLETYPE),
+        attr,
+        NULL,
+        &var);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    retval = UA_Server_addCondition_finish(
+        server_ac,
+        actualId,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER),
+        UA_NODEID_NULL);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    // Check if EnabledState is linked - correctly set to "Disabled"
+    UA_Variant enabledStateVariant;
+    UA_Variant_init(&enabledStateVariant);
+    retval = UA_Server_readValue(server_ac, var, &enabledStateVariant);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_msg(UA_Variant_hasScalarType(
+        &enabledStateVariant,
+        &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]),
+        "Unexpected Data Type of EnabledState");
+    const UA_LocalizedText* enabledState = (UA_LocalizedText*)enabledStateVariant.data;
+    ck_assert_str_eq((const char*)enabledState->text.data, "Disabled");
+
+    retval = UA_Server_deleteCondition(
+        server_ac,
+        actualId,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+}
+END_TEST
+
 #endif
 
 int main(void) {
@@ -58,6 +127,7 @@ int main(void) {
     TCase *tc_call = tcase_create("Alarms and Conditions");
 #ifdef UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS
     tcase_add_test(tc_call, createDelete);
+    tcase_add_test(tc_call, splitCreation);
 #endif
     tcase_add_checked_fixture(tc_call, setup, teardown);
 

From a7a981bb2856d009afd2e19ef3271b48ba59b646 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 23:37:21 +0200
Subject: [PATCH 0268/1963] fix(arch): Fix a wrong log string in
 eventloop_posix_tcp.c

---
 arch/eventloop_posix_tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 0da5ffa12bb..459c070c592 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -582,7 +582,7 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     UA_RegisteredFD *rfd = TCP_findRegisteredFD(tcm, connectionId);
     if(!rfd) {
         UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP\t| Cannot close UDP connection %u - not found",
+                       "TCP\t| Cannot close TCP connection %u - not found",
                        (unsigned)connectionId);
         return UA_STATUSCODE_BADNOTFOUND;
     }

From a29045471c8cb8e7540143494b5d1f3988f16d9b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 8 May 2022 11:41:29 +0200
Subject: [PATCH 0269/1963] refactor(core): Generalize connection functions for
 client and server

---
 src/server/ua_server.c       | 10 +++++-----
 src/ua_connection.c          | 13 +++++++------
 src/ua_connection_internal.h | 10 +++++-----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 389a88e587a..89dfb1c3b8d 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -639,12 +639,12 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         conn->channel = NULL;
         conn->sockfd = (UA_SOCKET)connectionId;
         conn->handle = cm;
-        conn->getSendBuffer = UA_Server_Connection_getSendBuffer;
-        conn->releaseSendBuffer = UA_Server_Connection_releaseBuffer;
-        conn->send = UA_Server_Connection_send;
+        conn->getSendBuffer = UA_Connection_getSendBuffer;
+        conn->releaseSendBuffer = UA_Connection_releaseBuffer;
+        conn->send = UA_Connection_send;
         conn->recv = NULL;
-        conn->releaseRecvBuffer = UA_Server_Connection_releaseBuffer;
-        conn->close = UA_Server_Connection_close;
+        conn->releaseRecvBuffer = UA_Connection_releaseBuffer;
+        conn->close = UA_Connection_close;
         conn->free = NULL;
 
         *connectionContext = (void*)conn;
diff --git a/src/ua_connection.c b/src/ua_connection.c
index 719fb2518b2..456b0b4e8e6 100644
--- a/src/ua_connection.c
+++ b/src/ua_connection.c
@@ -65,7 +65,8 @@ UA_Connection_sendError(UA_Connection *connection, UA_TcpErrorMessage *error) {
     connection->send(connection, &msg);
 }
 
-void UA_Connection_detachSecureChannel(UA_Connection *connection) {
+void
+UA_Connection_detachSecureChannel(UA_Connection *connection) {
     UA_SecureChannel *channel = connection->channel;
     /* only replace when the channel points to this connection */
     if(channel && channel->connection == connection)
@@ -73,7 +74,6 @@ void UA_Connection_detachSecureChannel(UA_Connection *connection) {
     connection->channel = NULL;
 }
 
-// TODO: Return an error code
 void
 UA_Connection_attachSecureChannel(UA_Connection *connection, UA_SecureChannel *channel) {
     if(channel->connection == NULL) {
@@ -83,25 +83,26 @@ UA_Connection_attachSecureChannel(UA_Connection *connection, UA_SecureChannel *c
 }
 
 UA_StatusCode
-UA_Server_Connection_getSendBuffer(UA_Connection *connection, size_t length,
+UA_Connection_getSendBuffer(UA_Connection *connection, size_t length,
                                    UA_ByteString *buf) {
     UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
     return cm->allocNetworkBuffer(cm, (uintptr_t)connection->sockfd, buf, length);
 }
 
 UA_StatusCode
-UA_Server_Connection_send(UA_Connection *connection, UA_ByteString *buf) {
+UA_Connection_send(UA_Connection *connection, UA_ByteString *buf) {
     UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
     return cm->sendWithConnection(cm, (uintptr_t)connection->sockfd, 0, NULL, buf);
 }
 
 void
-UA_Server_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf) {
+UA_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf) {
     UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
     cm->freeNetworkBuffer(cm, (uintptr_t)connection->sockfd, buf);
 }
 
-void UA_Server_Connection_close(UA_Connection *connection) {
+void
+UA_Connection_close(UA_Connection *connection) {
     UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
     cm->closeConnection(cm, (uintptr_t)connection->sockfd);
 }
diff --git a/src/ua_connection_internal.h b/src/ua_connection_internal.h
index 3bc5fee6010..ffefd77618a 100644
--- a/src/ua_connection_internal.h
+++ b/src/ua_connection_internal.h
@@ -40,11 +40,11 @@ void UA_Connection_attachSecureChannel(UA_Connection *connection,
 /* In this example, we integrate the server into an external "mainloop". This
    can be for example the event-loop used in GUI toolkits, such as Qt or GTK. */
 
-UA_StatusCode UA_Server_Connection_getSendBuffer(UA_Connection *connection, size_t length,
-                                                        UA_ByteString *buf);
-UA_StatusCode UA_Server_Connection_send(UA_Connection *connection, UA_ByteString *buf);
-void UA_Server_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf);
-void UA_Server_Connection_close(UA_Connection *connection);
+UA_StatusCode UA_Connection_getSendBuffer(UA_Connection *connection, size_t length,
+                                          UA_ByteString *buf);
+UA_StatusCode UA_Connection_send(UA_Connection *connection, UA_ByteString *buf);
+void UA_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf);
+void UA_Connection_close(UA_Connection *connection);
 
 /* Process a binary message (TCP packet). The message can contain partial
  * chunks. (TCP is a streaming protocol and packets may be split/merge during

From becaabacc05906b1d43ed53bac6ff9848dd7652c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 May 2022 17:51:23 +0200
Subject: [PATCH 0270/1963] refactor(server): Start internal housekeeping only
 during startup

This enables us eventually to run multiple servers independently in
the same EventLoop.
---
 src/server/ua_server.c          | 25 +++++++++++++++----------
 src/server/ua_server_internal.h |  2 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 89dfb1c3b8d..8917d742f38 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -253,9 +253,10 @@ void UA_Server_delete(UA_Server *server) {
     UA_free(server);
 }
 
-/* Recurring cleanup. Removing unused and timed-out channels and sessions */
+/* Regular house-keeping tasks. Removing unused and timed-out channels and
+ * sessions. */
 static void
-UA_Server_cleanup(UA_Server *server, void *_) {
+serverHouseKeeping(UA_Server *server, void *_) {
     UA_LOCK(&server->serviceMutex);
     UA_DateTime nowMonotonic = UA_DateTime_nowMonotonic();
     UA_Server_cleanupSessions(server, nowMonotonic);
@@ -278,12 +279,10 @@ UA_Boolean UA_Server_NodestoreIsConfigured(UA_Server *server) {
 
 static UA_Server *
 UA_Server_init(UA_Server *server) {
-
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_CHECK_FATAL(UA_Server_NodestoreIsConfigured(server), goto cleanup,
-                    &server->config.logger, UA_LOGCATEGORY_SERVER,
-                    "No Nodestore configured in the server"
-                   );
+                   &server->config.logger, UA_LOGCATEGORY_SERVER,
+                   "No Nodestore configured in the server");
 
     /* Init start time to zero, the actual start time will be sampled in
      * UA_Server_run_startup() */
@@ -329,10 +328,6 @@ UA_Server_init(UA_Server *server) {
     UA_AsyncManager_init(&server->asyncManager, server);
 #endif
 
-    /* Add a regular callback for cleanup and maintenance. With a 10s interval. */
-    UA_Server_addRepeatedCallback(server, (UA_ServerCallback)UA_Server_cleanup, NULL,
-                                  10000.0, NULL);
-
     /* Initialize namespace 0*/
     res = UA_Server_initNS0(server);
     UA_CHECK_STATUS(res, goto cleanup);
@@ -734,6 +729,12 @@ UA_Server_run_startup(UA_Server *server) {
                  "This should only be used for specific fuzzing builds.");
 #endif
 
+    /* Add a regular callback for housekeeping tasks. With a 1s interval. */
+    if(server->houseKeepingCallbackId == 0) {
+        UA_Server_addRepeatedCallback(server, (UA_ServerCallback)serverHouseKeeping,
+                                      NULL, 1000.0, &server->houseKeepingCallbackId);
+    }
+
     /* Start the EventLoop */
     UA_StatusCode retVal = config->eventLoop->start(config->eventLoop);
     UA_CHECK_STATUS(retVal, return retVal);
@@ -874,6 +875,10 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
 
 UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server) {
+    /* Stop the regular housekeeping tasks */
+    UA_Server_removeCallback(server, server->houseKeepingCallbackId);
+    server->houseKeepingCallbackId = 0;
+
     /* Stop all SecureChannels */
     UA_Server_deleteSecureChannels(server);
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index ba06caf515b..a4988c529b1 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -112,6 +112,8 @@ struct UA_Server {
                           * down once the time has been reached */
 
     UA_ServerLifecycle state;
+    UA_UInt64 houseKeepingCallbackId;
+
     UA_ServerConnection serverConnections[UA_MAXSERVERCONNECTIONS];
     size_t serverConnectionsSize;
 

From f98dec7fcc7dca009a086f0cf5f6c938bd574851 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 8 May 2022 22:36:43 +0200
Subject: [PATCH 0271/1963] refactor(core): Remove unused
 UA_SecureChannel_receive

---
 src/ua_securechannel.c | 17 -----------------
 src/ua_securechannel.h | 14 --------------
 2 files changed, 31 deletions(-)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 62bca13c3ec..d6db9ffecf6 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -909,20 +909,3 @@ UA_SecureChannel_processBuffer(UA_SecureChannel *channel, void *application,
     UA_ByteString_clear(&appended);
     return res;
 }
-
-UA_StatusCode
-UA_SecureChannel_receive(UA_SecureChannel *channel, void *application,
-                         UA_ProcessMessageCallback callback, UA_UInt32 timeout) {
-    UA_Connection *connection = channel->connection;
-    UA_CHECK_MEM(connection, return UA_STATUSCODE_BADINTERNALERROR);
-
-    /* Listen for messages to arrive */
-    UA_ByteString buffer = UA_BYTESTRING_NULL;
-    UA_StatusCode res = connection->recv(connection, &buffer, timeout);
-    UA_CHECK_STATUS(res, return res);
-
-    /* Try to process one complete chunk */
-    res = UA_SecureChannel_processBuffer(channel, application, callback, &buffer);
-    connection->releaseRecvBuffer(connection, &buffer);
-    return res;
-}
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index dfd3f24c275..bac2908986f 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -267,20 +267,6 @@ UA_SecureChannel_processBuffer(UA_SecureChannel *channel, void *application,
                                UA_ProcessMessageCallback callback,
                                const UA_ByteString *buffer);
 
-/* Try to receive at least one complete chunk on the connection. This blocks the
- * current thread up to the given timeout. It will return once the first buffer
- * has been received (and possibly processed when the message is complete).
- *
- * @param channel The SecureChannel
- * @param application The client or server application
- * @param callback The function pointer for processing complete messages
- * @param timeout The timeout (in milliseconds) the method will block at most.
- * @return Returns UA_STATUSCODE_GOOD or an error code. A timeout does not
- *         create an error. */
-UA_StatusCode
-UA_SecureChannel_receive(UA_SecureChannel *channel, void *application,
-                         UA_ProcessMessageCallback callback, UA_UInt32 timeout);
-
 /* Internal methods in ua_securechannel_crypto.h */
 
 void

From 73242e6da28fb6a1898f8b41e5a01beef8e612df Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 10 May 2022 21:04:36 +0200
Subject: [PATCH 0272/1963] refactor(client): Check EventLoop for repeated
 callbacks

---
 src/client/ua_client.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 716ef01972e..764d2b4ef83 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -601,9 +601,11 @@ UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
                                     responseType, userdata, requestId);
 }
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
+    if(!client->config.eventLoop)
+        return UA_STATUSCODE_BADINTERNALERROR;
     return client->config.eventLoop->
         addTimedCallback(client->config.eventLoop, (UA_Callback)callback,
                          client, data, date, callbackId);
@@ -612,7 +614,8 @@ UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
 UA_StatusCode
 UA_Client_addRepeatedCallback(UA_Client *client, UA_ClientCallback callback,
                               void *data, UA_Double interval_ms, UA_UInt64 *callbackId) {
-
+    if(!client->config.eventLoop)
+        return UA_STATUSCODE_BADINTERNALERROR;
     return client->config.eventLoop->
         addCyclicCallback(client->config.eventLoop, (UA_Callback)callback,
                           client, data, interval_ms, NULL,
@@ -622,6 +625,8 @@ UA_Client_addRepeatedCallback(UA_Client *client, UA_ClientCallback callback,
 UA_StatusCode
 UA_Client_changeRepeatedCallbackInterval(UA_Client *client, UA_UInt64 callbackId,
                                          UA_Double interval_ms) {
+    if(!client->config.eventLoop)
+        return UA_STATUSCODE_BADINTERNALERROR;
     return client->config.eventLoop->
         modifyCyclicCallback(client->config.eventLoop, callbackId, interval_ms,
                              NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
@@ -629,6 +634,8 @@ UA_Client_changeRepeatedCallbackInterval(UA_Client *client, UA_UInt64 callbackId
 
 void
 UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId) {
+    if(!client->config.eventLoop)
+        return;
     client->config.eventLoop->
         removeCyclicCallback(client->config.eventLoop, callbackId);
 }

From 692b50a360600e27508324afe7bec5856d6f3eac Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 10 May 2022 21:10:35 +0200
Subject: [PATCH 0273/1963] refactor(plugin): Set the EventLoop early in the
 client config

---
 plugins/ua_config_default.c | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 27c6f71e505..1a7ce17ac27 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -133,7 +133,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 
     /* Logging */
     if(!conf->logger.log)
-        conf->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
+        conf->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_TRACE);
 
     /* EventLoop */
     if(conf->eventLoop == NULL) {
@@ -768,7 +768,33 @@ UA_Client * UA_Client_new(void) {
     UA_ClientConfig config;
     memset(&config, 0, sizeof(UA_ClientConfig));
     config.logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
-    return UA_Client_newWithConfig(&config);
+
+    /* EventLoop */
+    if(config.eventLoop == NULL) {
+        config.eventLoop = UA_EventLoop_new_POSIX(&config.logger);
+        config.externalEventLoop = false;
+
+        /* Add the TCP connection manager */
+        UA_ConnectionManager *tcpCM =
+            UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcp connection manager"));
+        config.eventLoop->registerEventSource(config.eventLoop, (UA_EventSource *)tcpCM);
+
+        /* Add the UDP connection manager */
+        UA_ConnectionManager *udpCM =
+            UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp connection manager"));
+        config.eventLoop->registerEventSource(config.eventLoop, (UA_EventSource *)udpCM);
+    }
+
+    UA_Client *c = UA_Client_newWithConfig(&config);
+
+    if(c) {
+        /* Update the EventLoop to the logger in the new location inside the
+         * client */
+        UA_ClientConfig *cc = UA_Client_getConfig(c);
+        cc->eventLoop->logger = &cc->logger;
+    }
+
+    return c;
 }
 
 UA_StatusCode
@@ -796,8 +822,9 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
         config->eventLoop->registerEventSource(config->eventLoop, (UA_EventSource *)udpCM);
     }
 
-    if (config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
-        UA_Array_delete(config->sessionLocaleIds, config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
+    if(config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
+        UA_Array_delete(config->sessionLocaleIds,
+                        config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
     }
     config->sessionLocaleIds = NULL;
     config->sessionLocaleIds = 0;

From 9e2a96e9a6055c89b34b4bb75ffbc3c676b22813 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:15:47 +0200
Subject: [PATCH 0274/1963] refactor(client): Remove a redundant UA_EXPORT
 annotation

---
 src/client/ua_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 764d2b4ef83..8297ebf37c7 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -36,7 +36,7 @@ UA_Client_init(UA_Client* client) {
     notifyClientState(client);
 }
 
-UA_Client UA_EXPORT *
+UA_Client *
 UA_Client_newWithConfig(const UA_ClientConfig *config) {
     if(!config)
         return NULL;

From c433b9abdb305784374fba486c723c90c8eaeddc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:18:30 +0200
Subject: [PATCH 0275/1963] style(client): Whitespace cleanup in ua_client.c

---
 src/client/ua_client.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 8297ebf37c7..df23d159fd9 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -90,8 +90,9 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
     config->logger.log = NULL;
     config->logger.clear = NULL;
 
-    if (config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
-        UA_Array_delete(config->sessionLocaleIds, config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
+    if(config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
+        UA_Array_delete(config->sessionLocaleIds,
+                        config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
     }
     config->sessionLocaleIds = NULL;
     config->sessionLocaleIdsSize = 0;

From 95e330d8009fa3723a10996d0adc6c31fe13273f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:24:39 +0200
Subject: [PATCH 0276/1963] refactor(client): Expose processServiceResponse
 internally

---
 src/client/ua_client.c          | 5 +----
 src/client/ua_client_internal.h | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index df23d159fd9..cd002bb42ff 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -315,10 +315,7 @@ processAsyncResponse(UA_Client *client, UA_UInt32 requestId, const UA_NodeId *re
     return retval;
 }
 
-/* Processes the received service response. Either with an async callback or by
- * decoding the message and returning it "upwards" in the
- * SyncResponseDescription. */
-static UA_StatusCode
+UA_StatusCode
 processServiceResponse(void *application, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message) {
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 22980ac6626..4849b931fee 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -167,6 +167,11 @@ struct UA_Client {
 #endif
 };
 
+UA_StatusCode
+processServiceResponse(void *application, UA_SecureChannel *channel,
+                       UA_MessageType messageType, UA_UInt32 requestId,
+                       UA_ByteString *message);
+
 void notifyClientState(UA_Client *client);
 void processERRResponse(UA_Client *client, const UA_ByteString *chunk);
 void processACKResponse(UA_Client *client, const UA_ByteString *chunk);

From 6aab2ffec05a8f51664405825fe183110d2f9d51 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:31:48 +0200
Subject: [PATCH 0277/1963] style(client): Cosmetic improvement in
 ua_client_connect.c

---
 src/client/ua_client_connect.c | 90 +++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 95cb91cddea..c3cfc4df457 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -94,10 +94,11 @@ encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPo
     UA_IssuedIdentityToken *iit = NULL;
     UA_UserNameIdentityToken *unit = NULL;
     UA_ByteString *tokenData;
-    if(userIdentityToken->content.decoded.type == &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]) {
+    const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
+    if(tokenType == &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]) {
         iit = (UA_IssuedIdentityToken*)userIdentityToken->content.decoded.data;
         tokenData = &iit->tokenData;
-    } else if(userIdentityToken->content.decoded.type == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
+    } else if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
         unit = (UA_UserNameIdentityToken*)userIdentityToken->content.decoded.data;
         tokenData = &unit->password;
     } else {
@@ -236,15 +237,16 @@ processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
                                 &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE], NULL);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_CHANNEL(&client->config.logger, &client->channel,
-                             "Received an ERR response that could not be decoded with StatusCode %s",
-                             UA_StatusCode_name(res));
+                             "Received an ERR response that could not be decoded "
+                             "with StatusCode %s", UA_StatusCode_name(res));
         client->connectStatus = res;
         return;
     }
 
     UA_LOG_ERROR_CHANNEL(&client->config.logger, &client->channel,
-                         "Received an ERR response with StatusCode %s and the following reason: %.*s",
-                         UA_StatusCode_name(errMessage.error), (int)errMessage.reason.length, errMessage.reason.data);
+                         "Received an ERR response with StatusCode %s and the following "
+                         "reason: %.*s", UA_StatusCode_name(errMessage.error),
+                         (int)errMessage.reason.length, errMessage.reason.data);
     client->connectStatus = errMessage.error;
     UA_TcpErrorMessage_clear(&errMessage);
 }
@@ -488,22 +490,21 @@ UA_Client_renewSecureChannel(UA_Client *client) {
 static void
 responseActivateSession(UA_Client *client, void *userdata, UA_UInt32 requestId,
                         void *response) {
-    UA_ActivateSessionResponse *activateResponse =
-            (UA_ActivateSessionResponse *)response;
-    if(activateResponse->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+    UA_ActivateSessionResponse *ar = (UA_ActivateSessionResponse*)response;
+    if(ar->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                      "ActivateSession failed with error code %s",
-                     UA_StatusCode_name(activateResponse->responseHeader.serviceResult));
-        if(activateResponse->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
-           activateResponse->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
-            /* The session is lost. Create a new one. */
+                     UA_StatusCode_name(ar->responseHeader.serviceResult));
+        if(ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
+           ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
+            /* The session is no longer usable. Create a new one. */
             closeSession(client);
             createSessionAsync(client);
             UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                          "Session cannot be activated. Create a new Session.");
         } else {
             /* Something else is wrong. Give up. */
-            client->connectStatus = activateResponse->responseHeader.serviceResult;
+            client->connectStatus = ar->responseHeader.serviceResult;
         }
         return;
     }
@@ -525,12 +526,14 @@ activateSessionAsync(UA_Client *client) {
     request.requestHeader.timestamp = UA_DateTime_now ();
     request.requestHeader.timeoutHint = 600000;
     UA_StatusCode retval =
-        UA_ExtensionObject_copy(&client->config.userIdentityToken, &request.userIdentityToken);
+        UA_ExtensionObject_copy(&client->config.userIdentityToken,
+                                &request.userIdentityToken);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
     if (client->config.sessionLocaleIdsSize && client->config.sessionLocaleIds) {
-        retval = UA_Array_copy(client->config.sessionLocaleIds, client->config.sessionLocaleIdsSize,
+        retval = UA_Array_copy(client->config.sessionLocaleIds,
+                               client->config.sessionLocaleIdsSize,
                                (void **)&request.localeIds, &UA_TYPES[UA_TYPES_LOCALEID]);
         if (retval != UA_STATUSCODE_GOOD)
             return retval;
@@ -546,7 +549,8 @@ activateSessionAsync(UA_Client *client) {
             return UA_STATUSCODE_BADOUTOFMEMORY;
         }
         request.userIdentityToken.content.decoded.data = t;
-        request.userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN];
+        request.userIdentityToken.content.decoded.type =
+            &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN];
         request.userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
     }
 
@@ -567,16 +571,17 @@ activateSessionAsync(UA_Client *client) {
     if(retval == UA_STATUSCODE_GOOD)
         retval = UA_Client_sendAsyncRequest(client, &request,
                                             &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST],
-                                            (UA_ClientAsyncServiceCallback) responseActivateSession,
-                                            &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE], NULL, NULL);
+                                            (UA_ClientAsyncServiceCallback)responseActivateSession,
+                                            &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE],
+                                            NULL, NULL);
 
     UA_ActivateSessionRequest_clear(&request);
     if(retval == UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_ACTIVATE_REQUESTED;
     else
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                           "ActivateSession failed when sending the request with error code %s",
-                           UA_StatusCode_name(retval));
+                     "ActivateSession failed when sending the request with error code %s",
+                     UA_StatusCode_name(retval));
 
     return retval;
 }
@@ -654,7 +659,8 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
         /* Look for a user token policy with an anonymous token */
         for(size_t j = 0; j < endpoint->userIdentityTokensSize; ++j) {
             UA_UserTokenPolicy* tokenPolicy = &endpoint->userIdentityTokens[j];
-            const UA_DataType *tokenType = client->config.userIdentityToken.content.decoded.type;
+            const UA_DataType *tokenType =
+                client->config.userIdentityToken.content.decoded.type;
 
             /* Usertokens also have a security policy... */
             if(tokenPolicy->tokenType != UA_USERTOKENTYPE_ANONYMOUS &&
@@ -662,7 +668,8 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
                !getSecurityPolicy(client, tokenPolicy->securityPolicyUri)) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu in endpoint %lu: "
-                            "security policy '%.*s' not available", (long unsigned)j, (long unsigned)i,
+                            "security policy '%.*s' not available",
+                            (long unsigned)j, (long unsigned)i,
                             (int)tokenPolicy->securityPolicyUri.length,
                             tokenPolicy->securityPolicyUri.data);
                 continue;
@@ -670,7 +677,8 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
 
             if(tokenPolicy->tokenType > 3) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                            "Rejecting UserTokenPolicy %lu in endpoint %lu: invalid token type",
+                            "Rejecting UserTokenPolicy %lu in endpoint %lu: "
+                            "invalid token type",
                             (long unsigned)j, (long unsigned)i);
                 continue;
             }
@@ -680,28 +688,32 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
                tokenType != NULL) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu (anonymous) in endpoint %lu: "
-                            "configuration doesn't match", (long unsigned)j, (long unsigned)i);
+                            "configuration doesn't match",
+                            (long unsigned)j, (long unsigned)i);
                 continue;
             }
             if(tokenPolicy->tokenType == UA_USERTOKENTYPE_USERNAME &&
                tokenType != &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu (username) in endpoint %lu: "
-                            "configuration doesn't match", (long unsigned)j, (long unsigned)i);
+                            "configuration doesn't match",
+                            (long unsigned)j, (long unsigned)i);
                 continue;
             }
             if(tokenPolicy->tokenType == UA_USERTOKENTYPE_CERTIFICATE &&
                tokenType != &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu (certificate) in endpoint %lu: "
-                            "configuration doesn't match", (long unsigned)j, (long unsigned)i);
+                            "configuration doesn't match",
+                            (long unsigned)j, (long unsigned)i);
                 continue;
             }
             if(tokenPolicy->tokenType == UA_USERTOKENTYPE_ISSUEDTOKEN &&
                tokenType != &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu (token) in endpoint %lu: "
-                            "configuration doesn't match", (long unsigned)j, (long unsigned)i);
+                            "configuration doesn't match",
+                            (long unsigned)j, (long unsigned)i);
                 continue;
             }
 
@@ -717,15 +729,17 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
 
             /* Log the selected endpoint */
             UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                        "Selected endpoint %lu in URL %.*s with SecurityMode %s and SecurityPolicy %.*s",
-                        (long unsigned)i, (int)endpoint->endpointUrl.length, endpoint->endpointUrl.data,
+                        "Selected endpoint %lu in URL %.*s with SecurityMode "
+                        "%s and SecurityPolicy %.*s", (long unsigned)i,
+                        (int)endpoint->endpointUrl.length, endpoint->endpointUrl.data,
                         securityModeNames[endpoint->securityMode - 1],
                         (int)endpoint->securityPolicyUri.length,
                         endpoint->securityPolicyUri.data);
 
             /* Log the selected UserTokenPolicy */
             UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                        "Selected UserTokenPolicy %.*s with UserTokenType %s and SecurityPolicy %.*s",
+                        "Selected UserTokenPolicy %.*s with UserTokenType %s "
+                        "and SecurityPolicy %.*s",
                         (int)tokenPolicy->policyId.length, tokenPolicy->policyId.data,
                         userTokenTypeNames[tokenPolicy->tokenType],
                         (int)securityPolicyUri->length, securityPolicyUri->data);
@@ -779,8 +793,8 @@ requestGetEndpoints(UA_Client *client) {
         client->endpointsHandshake = true;
     else
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                           "RequestGetEndpoints failed when sending the request with error code %s",
-                           UA_StatusCode_name(retval));
+                     "RequestGetEndpoints failed when sending the request with error code %s",
+                     UA_StatusCode_name(retval));
     return retval;
 }
 
@@ -814,7 +828,8 @@ responseSessionCallback(UA_Client *client, void *userdata,
     UA_ByteString_clear(&client->remoteNonce);
     UA_NodeId_clear(&client->authenticationToken);
     res |= UA_ByteString_copy(&sessionResponse->serverNonce, &client->remoteNonce);
-    res |= UA_NodeId_copy(&sessionResponse->authenticationToken, &client->authenticationToken);
+    res |= UA_NodeId_copy(&sessionResponse->authenticationToken,
+                          &client->authenticationToken);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 
@@ -1003,9 +1018,7 @@ verifyClientApplicationURI(const UA_Client *client) {
 #if defined(UA_ENABLE_ENCRYPTION) && (UA_LOGLEVEL <= 400)
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         UA_SecurityPolicy *sp = &client->config.securityPolicies[i];
-
-        if(sp->localCertificate.data == NULL)
-        {
+        if(!sp->localCertificate.data) {
                 UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                 "skip verifying ApplicationURI for the SecurityPolicy %.*s",
                 (int)sp->policyUri.length, sp->policyUri.data);
@@ -1242,7 +1255,7 @@ closeSessionCallback(UA_Client *client, void *userdata,
     notifyClientState(client);
 }
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Client_disconnectAsync(UA_Client *client) {
     /* Set before sending the message to prevent recursion */
     client->sessionState = UA_SESSIONSTATE_CLOSING;
@@ -1274,4 +1287,3 @@ UA_Client_disconnect(UA_Client *client) {
     notifyClientState(client);
     return UA_STATUSCODE_GOOD;
 }
-

From b1edee0e181424e9fb8863383df4f90356eee886 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:42:26 +0200
Subject: [PATCH 0278/1963] refactor(client): Simplify createSessionAsync

---
 src/client/ua_client_connect.c | 45 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index c3cfc4df457..ae69a1e73f1 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -844,54 +844,53 @@ responseSessionCallback(UA_Client *client, void *userdata,
 
 static UA_StatusCode
 createSessionAsync(UA_Client *client) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    /* Generate the local nonce for the session */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
         if(client->localNonce.length != UA_SESSION_LOCALNONCELENGTH) {
            UA_ByteString_clear(&client->localNonce);
-            retval = UA_ByteString_allocBuffer(&client->localNonce,
-                                               UA_SESSION_LOCALNONCELENGTH);
-            if(retval != UA_STATUSCODE_GOOD)
-                return retval;
+            res = UA_ByteString_allocBuffer(&client->localNonce,
+                                            UA_SESSION_LOCALNONCELENGTH);
+            if(res != UA_STATUSCODE_GOOD)
+                return res;
         }
-        retval = client->channel.securityPolicy->symmetricModule.
+        res = client->channel.securityPolicy->symmetricModule.
                  generateNonce(client->channel.securityPolicy->policyContext,
                                &client->localNonce);
-        if(retval != UA_STATUSCODE_GOOD)
-            return retval;
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
     }
 
+    /* Prepare and send the request */
     UA_CreateSessionRequest request;
     UA_CreateSessionRequest_init(&request);
     request.requestHeader.requestHandle = ++client->requestHandle;
     request.requestHeader.timestamp = UA_DateTime_now();
     request.requestHeader.timeoutHint = 10000;
-    UA_ByteString_copy(&client->localNonce, &request.clientNonce);
+    request.clientNonce = client->localNonce;
     request.requestedSessionTimeout = client->config.requestedSessionTimeout;
     request.maxResponseMessageSize = UA_INT32_MAX;
-    UA_String_copy(&client->config.endpoint.endpointUrl, &request.endpointUrl);
-    UA_ApplicationDescription_copy(&client->config.clientDescription,
-                                   &request.clientDescription);
-
+    request.endpointUrl = client->config.endpoint.endpointUrl;
+    request.clientDescription = client->config.clientDescription;
     if(client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
-        UA_ByteString_copy(&client->channel.securityPolicy->localCertificate,
-                           &request.clientCertificate);
+        request.clientCertificate = client->channel.securityPolicy->localCertificate;
     }
 
-    retval = UA_Client_sendAsyncRequest(client, &request, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST],
-                                        (UA_ClientAsyncServiceCallback)responseSessionCallback,
-                                        &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL, NULL);
-    UA_CreateSessionRequest_clear(&request);
+    res = UA_Client_sendAsyncRequest(client, &request,
+                                     &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST],
+                                     (UA_ClientAsyncServiceCallback)responseSessionCallback,
+                                     &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL, NULL);
 
-    if(retval == UA_STATUSCODE_GOOD)
+    if(res == UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_CREATE_REQUESTED;
     else
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                           "CreateSession failed when sending the request with error code %s",
-                           UA_StatusCode_name(retval));
+                     "CreateSession failed when sending the request with "
+                     "error code %s", UA_StatusCode_name(res));
 
-    return retval;
+    return res;
 }
 
 static UA_StatusCode

From f9905825ba49089f527f2d9f8db5d39471610abb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:45:12 +0200
Subject: [PATCH 0279/1963] refactor(client): Use EventLoop for housekeeping
 tasks

---
 src/client/ua_client.c          | 105 +++++++++++++++-----------------
 src/client/ua_client_internal.h |   3 +
 2 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index cd002bb42ff..d3c6328081f 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -25,17 +25,13 @@
 #include "ua_connection_internal.h"
 #include "ua_types_encoding_binary.h"
 
+static void
+clientHouseKeeping(UA_Client *client, void *_);
+
 /********************/
 /* Client Lifecycle */
 /********************/
 
-static void
-UA_Client_init(UA_Client* client) {
-    UA_SecureChannel_init(&client->channel, &client->config.localConnectionConfig);
-    client->connectStatus = UA_STATUSCODE_GOOD;
-    notifyClientState(client);
-}
-
 UA_Client *
 UA_Client_newWithConfig(const UA_ClientConfig *config) {
     if(!config)
@@ -45,7 +41,19 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
         return NULL;
     memset(client, 0, sizeof(UA_Client));
     client->config = *config;
-    UA_Client_init(client);
+
+    UA_SecureChannel_init(&client->channel, &client->config.localConnectionConfig);
+    client->connectStatus = UA_STATUSCODE_GOOD;
+
+    /* Set up the regular callback for checking the internal state */
+    UA_StatusCode res =
+        UA_Client_addRepeatedCallback(client,
+                                      (UA_ClientCallback)clientHouseKeeping,
+                                      NULL, 1000.0, &client->houseKeepingCallbackId);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(client);
+        return NULL;
+    }
     return client;
 }
 
@@ -114,6 +122,9 @@ UA_Client_clear(UA_Client *client) {
     UA_Client_Subscriptions_clean(client);
 #endif
 
+    /* Remove the internal regular callback */
+    UA_Client_removeCallback(client, client->houseKeepingCallbackId);
+    client->houseKeepingCallbackId = 0;
 }
 
 void
@@ -695,62 +706,24 @@ UA_Client_backgroundConnectivity(UA_Client *client) {
         client->pendingConnectivityCheck = true;
 }
 
-UA_StatusCode
-UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
-    UA_ClientConfig *cc = UA_Client_getConfig(client);
-    UA_EventLoop *el = cc->eventLoop;
-    UA_CHECK_ERROR(el->state != UA_EVENTLOOPSTATE_STOPPED,
-                   return UA_STATUSCODE_BAD,
-                   &client->config.logger, UA_LOGCATEGORY_CLIENT,
-                   "Eventloop was explicitly stopped.");
-
-    UA_StatusCode rv = UA_STATUSCODE_GOOD;
-    if(el->state == UA_EVENTLOOPSTATE_FRESH) {
-        rv = el->start(el);
-        UA_CHECK_STATUS(rv, return rv);
-    }
-
-    /* Process timed (repeated) jobs */
-    UA_DateTime now = UA_DateTime_nowMonotonic();
-    el->run(el, 0);
-    UA_DateTime maxDate = el->nextCyclicTime(el);
-    if(maxDate > now + ((UA_DateTime)timeout * UA_DATETIME_MSEC))
-        maxDate = now + ((UA_DateTime)timeout * UA_DATETIME_MSEC);
-
-    /* Make sure we have an open channel */
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if((client->noSession && client->channel.state != UA_SECURECHANNELSTATE_OPEN) ||
-       client->sessionState < UA_SESSIONSTATE_ACTIVATED) {
-        retval = connectIterate(client, timeout);
-        notifyClientState(client);
-        return retval;
-    }
+/* Regular housekeeping activities in the client -- called via a cyclic callback */
+static void
+clientHouseKeeping(UA_Client *client, void *_) {
+    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                 "Internally check the the client state and "
+                 "required activities");
 
     /* Renew Secure Channel */
     UA_Client_renewSecureChannel(client);
-    if(client->connectStatus != UA_STATUSCODE_GOOD)
-        return client->connectStatus;
-
-    /* Feed the server PublishRequests for the Subscriptions */
-#ifdef UA_ENABLE_SUBSCRIPTIONS
-    UA_Client_Subscriptions_backgroundPublish(client);
-#endif
 
     /* Send read requests from time to time to test the connectivity */
     UA_Client_backgroundConnectivity(client);
 
-    /* Listen on the network for the given timeout */
-    retval = receiveResponse(client, NULL, NULL, maxDate, NULL);
-    if(retval == UA_STATUSCODE_GOODNONCRITICALTIMEOUT)
-        retval = UA_STATUSCODE_GOOD;
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CHANNEL(&client->config.logger, &client->channel,
-                               "Could not receive with StatusCode %s",
-                               UA_StatusCode_name(retval));
-    }
-
 #ifdef UA_ENABLE_SUBSCRIPTIONS
-    /* The inactivity check must be done after receiveServiceResponse*/
+    /* Feed the server PublishRequests for the Subscriptions */
+    UA_Client_Subscriptions_backgroundPublish(client);
+
+    /* Check for inactive Subscriptions */
     UA_Client_Subscriptions_backgroundPublishInactivityCheck(client);
 #endif
 
@@ -759,6 +732,26 @@ UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
 
     /* Log and notify user if the client state has changed */
     notifyClientState(client);
+}
+
+UA_StatusCode
+UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_EventLoop *el = cc->eventLoop;
+    UA_CHECK_ERROR(el != NULL, return UA_STATUSCODE_BADINTERNALERROR,
+                   &client->config.logger, UA_LOGCATEGORY_CLIENT,
+                   "No EventLoop configured");
+
+    /* Start the EventLoop? */
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
+    if(el->state == UA_EVENTLOOPSTATE_FRESH) {
+        rv = el->start(el);
+        UA_CHECK_STATUS(rv, return rv);
+    }
+
+    /* Process timed and network events in the EventLoop */
+    rv = el->run(el, timeout);
+    UA_CHECK_STATUS(rv, return rv);
 
     return client->connectStatus;
 }
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 4849b931fee..dde8783a45f 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -124,6 +124,9 @@ typedef struct CustomCallback {
 struct UA_Client {
     UA_ClientConfig config;
 
+    /* Callback ID to remove it from the EventLoop */
+    UA_UInt64 houseKeepingCallbackId;
+
     /* Overall connection status */
     UA_StatusCode connectStatus;
 

From 93b43e46fa6354d0a090469f481309c3666a61f8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:47:36 +0200
Subject: [PATCH 0280/1963] style(client): Cosmetic improvements in ua_client.c

---
 src/client/ua_client.c         | 13 +++++++++++--
 src/client/ua_client_connect.c |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d3c6328081f..6960b8278c0 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -534,8 +534,9 @@ void UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCod
     }
 }
 
-UA_StatusCode UA_Client_modifyAsyncCallback(UA_Client *client, UA_UInt32 requestId,
-        void *userdata, UA_ClientAsyncServiceCallback callback) {
+UA_StatusCode
+UA_Client_modifyAsyncCallback(UA_Client *client, UA_UInt32 requestId,
+                              void *userdata, UA_ClientAsyncServiceCallback callback) {
     AsyncServiceCall *ac;
     LIST_FOREACH(ac, &client->asyncServiceCalls, pointers) {
         if(ac->requestId == requestId) {
@@ -610,6 +611,10 @@ UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
                                     responseType, userdata, requestId);
 }
 
+/*******************/
+/* Timed Callbacks */
+/*******************/
+
 UA_StatusCode
 UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
@@ -649,6 +654,10 @@ UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId) {
         removeCyclicCallback(client->config.eventLoop, callbackId);
 }
 
+/**********************/
+/* Housekeeping Tasks */
+/**********************/
+
 static void
 asyncServiceTimeoutCheck(UA_Client *client) {
     AsyncServiceCall *ac, *ac_tmp;
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index ae69a1e73f1..ec29d082802 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -511,8 +511,8 @@ responseActivateSession(UA_Client *client, void *userdata, UA_UInt32 requestId,
 
     /* Replace the nonce */
     UA_ByteString_clear(&client->remoteNonce);
-    client->remoteNonce = activateResponse->serverNonce;
-    UA_ByteString_init(&activateResponse->serverNonce);
+    client->remoteNonce = ar->serverNonce;
+    UA_ByteString_init(&ar->serverNonce);
 
     client->sessionState = UA_SESSIONSTATE_ACTIVATED;
     notifyClientState(client);

From 82f54b15b265a654554d127eafa50f0530e869dc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:50:14 +0200
Subject: [PATCH 0281/1963] refactor(client): Simplify the handling of async
 responses

---
 src/client/ua_client.c          | 331 +++++++++++++-------------------
 src/client/ua_client_internal.h |  16 +-
 2 files changed, 141 insertions(+), 206 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 6960b8278c0..9d8389c6d1d 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -205,21 +205,10 @@ notifyClientState(UA_Client *client) {
 /* Raw Services */
 /****************/
 
-/* For synchronous service calls. Execute async responses with a callback. When
- * the response with the correct requestId turns up, return it via the
- * SyncResponseDescription pointer. */
-typedef struct {
-    UA_Client *client;
-    UA_Boolean received;
-    UA_UInt32 requestId;
-    void *response;
-    const UA_DataType *responseType;
-} SyncResponseDescription;
-
 /* For both synchronous and asynchronous service calls */
 static UA_StatusCode
-sendSymmetricServiceRequest(UA_Client *client, const void *request,
-                            const UA_DataType *requestType, UA_UInt32 *requestId) {
+sendRequest(UA_Client *client, const void *request,
+            const UA_DataType *requestType, UA_UInt32 *requestId) {
     /* Renew SecureChannel if necessary */
     UA_Client_renewSecureChannel(client);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
@@ -259,8 +248,8 @@ serviceFaultId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_SERVICEFAULT_ENCODING_DEFA
 
 /* Look for the async callback in the linked list, execute and delete it */
 static UA_StatusCode
-processAsyncResponse(UA_Client *client, UA_UInt32 requestId, const UA_NodeId *responseTypeId,
-                     const UA_ByteString *responseMessage, size_t *offset) {
+processMSGResponse(UA_Client *client, UA_UInt32 requestId,
+                   const UA_ByteString *msg) {
     /* Find the callback */
     AsyncServiceCall *ac;
     LIST_FOREACH(ac, &client->asyncServiceCalls, pointers) {
@@ -276,53 +265,72 @@ processAsyncResponse(UA_Client *client, UA_UInt32 requestId, const UA_NodeId *re
     if(!ac)
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
-    /* Dequeue ac. We might disconnect (remove all ac) in the callback. */
+    UA_Response asyncResponse;
+    UA_Response *response = (ac->syncResponse) ? ac->syncResponse : &asyncResponse;
+    const UA_DataType *responseType = ac->responseType;
+
+    /* Dequeue ac. We might disconnect the client (remove all ac) in the callback. */
     LIST_REMOVE(ac, pointers);
 
+    /* Decode the response type */
+    size_t offset = 0;
+    UA_NodeId responseTypeId;
+    UA_StatusCode retval = UA_NodeId_decodeBinary(msg, &offset, &responseTypeId);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto process;
+
     /* Verify the type of the response */
-    UA_Response response;
-    const UA_DataType *responseType = ac->responseType;
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(!UA_NodeId_equal(responseTypeId, &ac->responseType->binaryEncodingId)) {
-        UA_init(&response, ac->responseType);
-        if(UA_NodeId_equal(responseTypeId, &serviceFaultId)) {
+    if(!UA_NodeId_equal(&responseTypeId, &ac->responseType->binaryEncodingId)) {
+        /* Initialize before switching the responseType to ServiceFault.
+         * Otherwise the decoding will leave fields from the original response
+         * type uninitialized. */
+        UA_init(response, ac->responseType);
+        if(UA_NodeId_equal(&responseTypeId, &serviceFaultId)) {
             /* Decode as a ServiceFault, i.e. only the response header */
             UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                         "Received a ServiceFault response");
             responseType = &UA_TYPES[UA_TYPES_SERVICEFAULT];
         } else {
-            /* Close the connection */
             UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                         "Reply contains the wrong service response");
+                         "Service response type does not match");
             retval = UA_STATUSCODE_BADCOMMUNICATIONERROR;
-            goto process;
+            goto process; /* Do not decode */
         }
     }
 
     /* Decode the response */
-    retval = UA_decodeBinaryInternal(responseMessage, offset, &response, responseType,
+#ifdef UA_ENABLE_TYPEDESCRIPTION
+    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                 "Decode a message of type %s", responseType->typeName);
+#else
+    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                 "Decode a message of type %" PRIu32,
+                 responseTypeId.identifier.numeric);
+#endif
+    retval = UA_decodeBinaryInternal(msg, &offset, response, responseType,
                                      client->config.customDataTypes);
 
  process:
+    /* Process the received MSG response */
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                    "Could not decode the response with id %u due to %s",
-                    (unsigned)requestId, UA_StatusCode_name(retval));
-        response.responseHeader.serviceResult = retval;
-    } else if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        /* Decode as a ServiceFault, i.e. only the response header */
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                    "The ServiceResult has the StatusCode %s",
-                    UA_StatusCode_name(response.responseHeader.serviceResult));
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Could not decode the response with RequestId %u with status %s",
+                       (unsigned)requestId, UA_StatusCode_name(retval));
+        response->responseHeader.serviceResult = retval;
     }
 
-    /* Call the callback */
+    /* Call the async callback */
     if(ac->callback)
-        ac->callback(client, ac->userdata, requestId, &response);
-    UA_clear(&response, ac->responseType);
+        ac->callback(client, ac->userdata, requestId, response);
 
-    /* Remove the callback */
-    UA_free(ac);
+    /* Clean up */
+    UA_NodeId_clear(&responseTypeId);
+    if(!ac->syncResponse) {
+        UA_clear(response, ac->responseType);
+        UA_free(ac);
+    } else {
+        ac->syncResponse = NULL; /* Indicate that response was received */
+    }
     return retval;
 }
 
@@ -330,140 +338,26 @@ UA_StatusCode
 processServiceResponse(void *application, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message) {
-    SyncResponseDescription *rd = (SyncResponseDescription*)application;
+    UA_Client *client = (UA_Client*)application;
 
-    /* Process ACK response */
     switch(messageType) {
     case UA_MESSAGETYPE_ACK:
-        processACKResponse(rd->client, message);
+        processACKResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_OPN:
-        processOPNResponse(rd->client, message);
+        processOPNResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_ERR:
-        processERRResponse(rd->client, message);
+        processERRResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_MSG:
-        /* Continue below */
-        break;
+        return processMSGResponse(client, requestId, message);
     default:
-        UA_LOG_TRACE_CHANNEL(&rd->client->config.logger, channel, "Invalid message type");
+        UA_LOG_TRACE_CHANNEL(&client->config.logger, channel,
+                             "Invalid message type");
         channel->state = UA_SECURECHANNELSTATE_CLOSING;
         return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
     }
-
-    /* Decode the data type identifier of the response */
-    size_t offset = 0;
-    UA_NodeId responseId;
-    UA_StatusCode retval = UA_NodeId_decodeBinary(message, &offset, &responseId);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto finish;
-
-    /* Got an asynchronous response. Don't expected a synchronous response
-     * (responseType NULL) or the id does not match. */
-    if(!rd->responseType || requestId != rd->requestId) {
-        retval = processAsyncResponse(rd->client, requestId, &responseId, message, &offset);
-        goto finish;
-    }
-
-    /* Got the synchronous response */
-    rd->received = true;
-
-    /* Check that the response type matches */
-    if(!UA_NodeId_equal(&responseId, &rd->responseType->binaryEncodingId)) {
-        if(UA_NodeId_equal(&responseId, &serviceFaultId)) {
-            UA_init(rd->response, rd->responseType);
-            retval = UA_decodeBinaryInternal(message, &offset, rd->response,
-                                             &UA_TYPES[UA_TYPES_SERVICEFAULT],
-                                             rd->client->config.customDataTypes);
-            if(retval != UA_STATUSCODE_GOOD)
-                ((UA_ResponseHeader*)rd->response)->serviceResult = retval;
-            UA_LOG_INFO(&rd->client->config.logger, UA_LOGCATEGORY_CLIENT,
-                        "Received a ServiceFault response with StatusCode %s",
-                        UA_StatusCode_name(((UA_ResponseHeader*)rd->response)->serviceResult));
-        } else {
-            /* Close the connection */
-            UA_LOG_ERROR(&rd->client->config.logger, UA_LOGCATEGORY_CLIENT,
-                         "Reply contains the wrong service response");
-            retval = UA_STATUSCODE_BADCOMMUNICATIONERROR;
-        }
-        goto finish;
-    }
-
-#ifdef UA_ENABLE_TYPEDESCRIPTION
-    UA_LOG_DEBUG(&rd->client->config.logger, UA_LOGCATEGORY_CLIENT,
-                 "Decode a message of type %s", rd->responseType->typeName);
-#else
-    UA_LOG_DEBUG(&rd->client->config.logger, UA_LOGCATEGORY_CLIENT,
-                 "Decode a message of type %" PRIu32, responseId.identifier.numeric);
-#endif
-
-    /* Decode the response */
-    retval = UA_decodeBinaryInternal(message, &offset, rd->response, rd->responseType,
-                                     rd->client->config.customDataTypes);
-
-finish:
-    UA_NodeId_clear(&responseId);
-    if(retval != UA_STATUSCODE_GOOD) {
-        if(retval == UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED)
-            retval = UA_STATUSCODE_BADRESPONSETOOLARGE;
-        UA_LOG_INFO(&rd->client->config.logger, UA_LOGCATEGORY_CLIENT,
-                    "Error receiving the response with status code %s",
-                    UA_StatusCode_name(retval));
-
-        if(rd->response) {
-            UA_ResponseHeader *respHeader = (UA_ResponseHeader*)rd->response;
-            respHeader->serviceResult = retval;
-        }
-    }
-
-    return retval;
-}
-
-/* Receive and process messages until a synchronous message arrives or the
- * timout finishes */
-static UA_StatusCode
-receiveResponse(UA_Client *client, void *response, const UA_DataType *responseType,
-                UA_DateTime maxDate, const UA_UInt32 *synchronousRequestId) {
-    /* Prepare the response and the structure we give into processServiceResponse */
-    SyncResponseDescription rd = { client, false, 0, response, responseType };
-
-    /* Return upon receiving the synchronized response. All other responses are
-     * processed with a callback "in the background". */
-    if(synchronousRequestId)
-        rd.requestId = *synchronousRequestId;
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_DateTime now = UA_DateTime_nowMonotonic();
-    do {
-        UA_UInt32 timeout2 = (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC);
-        if(maxDate < now)
-            timeout2 = 0;
-        retval = UA_SecureChannel_receive(&client->channel, &rd, processServiceResponse, timeout2);
-        if(retval == UA_STATUSCODE_GOODNONCRITICALTIMEOUT)
-            break;
-        if(retval != UA_STATUSCODE_GOOD ||
-           client->channel.state == UA_SECURECHANNELSTATE_CLOSING) {
-            UA_LOG_WARNING_CHANNEL(&client->config.logger, &client->channel,
-                                   "Receiving the response failed with StatusCode %s",
-                                   UA_StatusCode_name(retval));
-            closeSecureChannel(client);
-            retval = UA_STATUSCODE_BADCONNECTIONCLOSED;
-            break;
-        }
-        now = UA_DateTime_nowMonotonic();
-        if(maxDate < now)
-            break;
-    } while(!rd.received && responseType); /* Return if we don't wait for an async response */
-
-    return retval;
-}
-
-UA_StatusCode
-receiveResponseAsync(UA_Client *client, UA_UInt32 timeout) {
-    UA_DateTime maxDate = UA_DateTime_nowMonotonic() + ((UA_DateTime)timeout * UA_DATETIME_MSEC);
-    UA_StatusCode res = receiveResponse(client, NULL, NULL, maxDate, NULL);
-    return (res != UA_STATUSCODE_GOODNONCRITICALTIMEOUT) ? res : UA_STATUSCODE_GOOD;
 }
 
 void
@@ -473,64 +367,113 @@ __UA_Client_Service(UA_Client *client, const void *request,
     /* Initialize. Response is valied in case of aborting. */
     UA_init(response, responseType);
 
+    UA_ResponseHeader *respHeader = (UA_ResponseHeader*)response;
+
+    /* Verify that the EventLoop is running */
+    UA_EventLoop *el = client->config.eventLoop;
+    if(!el || el->state != UA_EVENTLOOPSTATE_STARTED) {
+        respHeader->serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+		return;
+    }
+
+    /* Check that the SecureChannel is open */
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                     "SecureChannel must be connected before sending requests");
-        UA_ResponseHeader *respHeader = (UA_ResponseHeader*)response;
         respHeader->serviceResult = UA_STATUSCODE_BADCONNECTIONCLOSED;
 		return;
     }
 
-    /* Send the request */
-    UA_UInt32 requestId;
-    UA_StatusCode retval = sendSymmetricServiceRequest(client, request, requestType, &requestId);
+    AsyncServiceCall ac;
+    ac.callback = NULL;
+    ac.userdata = NULL;
+    ac.responseType = responseType;
+    ac.timeout = client->config.timeout;
+    ac.syncResponse = (UA_Response*)response;
 
-    UA_ResponseHeader *respHeader = (UA_ResponseHeader*)response;
-    if(retval == UA_STATUSCODE_GOOD) {
-        /* Retrieve the response */
-        UA_DateTime maxDate = UA_DateTime_nowMonotonic() + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
-        retval = receiveResponse(client, response, responseType, maxDate, &requestId);
-    } else if(retval == UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED) {
-        respHeader->serviceResult = UA_STATUSCODE_BADREQUESTTOOLARGE;
+    /* Call the service and set the requestId */
+    UA_StatusCode retval = sendRequest(client, request, requestType, &ac.requestId);
+    if(retval != UA_STATUSCODE_GOOD) {
+        closeSecureChannel(client);
+        notifyClientState(client);
         return;
     }
 
-    /* In synchronous service, if we have don't have a reply we need to close
-     * the connection. For all other error cases, receiveResponse has already
-     * closed the channel. */
-    if(retval == UA_STATUSCODE_GOODNONCRITICALTIMEOUT ||
-       client->channel.state == UA_SECURECHANNELSTATE_CLOSING) {
-        closeSecureChannel(client);
-        retval = UA_STATUSCODE_BADCONNECTIONCLOSED;
+    /* Begin counting for the timeout after sending */
+    ac.start = UA_DateTime_nowMonotonic();
+
+    /* Temporarily insert to the async service list */
+    LIST_INSERT_HEAD(&client->asyncServiceCalls, &ac, pointers);
+
+    /* Run the EventLoop until the request was processed, the request has timed
+     * out or the client connection fails */
+    UA_DateTime maxDate = UA_DateTime_nowMonotonic() +
+        ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
+    while(true) {
+        /* Compute the remaining timeout and run the EventLoop */
+        UA_DateTime now = UA_DateTime_nowMonotonic();
+        if(now > maxDate) {
+            retval = UA_STATUSCODE_BADTIMEOUT;
+            break;
+        }
+        retval = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
+
+        /* Was the response received? In that case we can directly return. The
+         * ac was already removed from the internal linked list. */
+        if(ac.syncResponse == NULL)
+            return;
+
+        /* Check the status */
+        if(retval != UA_STATUSCODE_GOOD)
+            break;
+        retval = client->connectStatus;
+        if(retval != UA_STATUSCODE_GOOD)
+            break;
     }
 
-    if(retval != UA_STATUSCODE_GOOD)
-        respHeader->serviceResult = retval;
+    /* Detach from the internal async service list */
+    LIST_REMOVE(&ac, pointers);
 
-    notifyClientState(client);
+    /* Return the status code */
+    respHeader->serviceResult = retval;
+    return;
 }
 
-void
+/***********************************/
+/* Handling of Async Service Calls */
+/***********************************/
+
+static void
 UA_Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
                               UA_StatusCode statusCode) {
-    /* Create an empty response with the statuscode */
-    UA_Response response;
-    UA_init(&response, ac->responseType);
-    response.responseHeader.serviceResult = statusCode;
+    /* Set the status for the synchronous service call. Don't free the ac. */
+    if(ac->syncResponse) {
+        ac->syncResponse->responseHeader.serviceResult = statusCode;
+        ac->syncResponse = NULL; /* Indicate the async service call was processed */
+        return;
+    }
 
-    if(ac->callback)
+    if(ac->callback) {
+        /* Create an empty response with the statuscode and call the callback */
+        UA_Response response;
+        UA_init(&response, ac->responseType);
+        response.responseHeader.serviceResult = statusCode;
         ac->callback(client, ac->userdata, ac->requestId, &response);
 
-    /* Clean up the response. Users might move data into it. For whatever reasons. */
-    UA_clear(&response, ac->responseType);
+        /* Clean up the response. The user callback might move data into it. For
+         * whatever reasons. */
+        UA_clear(&response, ac->responseType);
+    }
+
+    UA_free(ac);
 }
 
-void UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode) {
+void
+UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode) {
     AsyncServiceCall *ac, *ac_tmp;
     LIST_FOREACH_SAFE(ac, &client->asyncServiceCalls, pointers, ac_tmp) {
         LIST_REMOVE(ac, pointers);
         UA_Client_AsyncService_cancel(client, ac, statusCode);
-        UA_free(ac);
     }
 }
 
@@ -570,9 +513,10 @@ __UA_Client_AsyncServiceEx(UA_Client *client, const void *request,
     ac->responseType = responseType;
     ac->userdata = userdata;
     ac->timeout = timeout;
+    ac->syncResponse = NULL;
 
     /* Call the service and set the requestId */
-    UA_StatusCode retval = sendSymmetricServiceRequest(client, request, requestType, &ac->requestId);
+    UA_StatusCode retval = sendRequest(client, request, requestType, &ac->requestId);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_free(ac);
         closeSecureChannel(client);
@@ -668,7 +612,6 @@ asyncServiceTimeoutCheck(UA_Client *client) {
         if(ac->start + (UA_DateTime)(ac->timeout * UA_DATETIME_MSEC) <= now) {
             LIST_REMOVE(ac, pointers);
             UA_Client_AsyncService_cancel(client, ac, UA_STATUSCODE_BADTIMEOUT);
-            UA_free(ac);
         }
     }
 }
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index dde8783a45f..c25a1287b20 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -102,13 +102,11 @@ typedef struct AsyncServiceCall {
     void *userdata;
     UA_DateTime start;
     UA_UInt32 timeout;
-    void *responsedata;
+    UA_Response *syncResponse; /* If non-null, then this is the synchronous
+                                * response to be filled. Set back to null to
+                                * indicate that the response was filled. */
 } AsyncServiceCall;
 
-void
-UA_Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
-                              UA_StatusCode statusCode);
-
 void
 UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode);
 
@@ -140,7 +138,7 @@ struct UA_Client {
 
     /* Connection */
     UA_Connection connection;
-    UA_String endpointUrl; /* Only for the async connect */
+    UA_String endpointUrl;
 
     /* SecureChannel */
     UA_SecureChannel channel;
@@ -181,12 +179,6 @@ void processACKResponse(UA_Client *client, const UA_ByteString *chunk);
 void processOPNResponse(UA_Client *client, const UA_ByteString *message);
 void closeSecureChannel(UA_Client *client);
 
-UA_StatusCode
-connectIterate(UA_Client *client, UA_UInt32 timeout);
-
-UA_StatusCode
-receiveResponseAsync(UA_Client *client, UA_UInt32 timeout);
-
 _UA_END_DECLS
 
 #endif /* UA_CLIENT_INTERNAL_H_ */

From f6d119806f380725c6ae524daea385954d84d55f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 22:53:53 +0200
Subject: [PATCH 0282/1963] refactor(client): Return connectStatus in public
 functions

---
 src/client/ua_client_connect.c | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index ec29d082802..b7e03c6d3bb 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1102,7 +1102,9 @@ UA_Client_connectAsync(UA_Client *client, const char *endpointUrl) {
     client->noSession = false;
 
     /* Connect Async */
-    return initConnect(client);
+    initConnect(client);
+    notifyClientState(client);
+    return client->connectStatus;
 }
 
 UA_StatusCode
@@ -1115,7 +1117,9 @@ UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl)
     client->noSession = true;
 
     /* Connect Async */
-    return initConnect(client);
+    initConnect(client);
+    notifyClientState(client);
+    return client->connectStatus;
 }
 
 static UA_StatusCode
@@ -1123,11 +1127,16 @@ connectSync(UA_Client *client) {
     UA_DateTime now = UA_DateTime_nowMonotonic();
     UA_DateTime maxDate = now + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
 
-    UA_StatusCode retval = initConnect(client);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    /* Initialize the connection */
+    initConnect(client);
+    notifyClientState(client);
+    if(client->connectStatus != UA_STATUSCODE_GOOD)
+        return client->connectStatus;
 
-    while(retval == UA_STATUSCODE_GOOD) {
+    /* Run the EventLoop until connected, connect fail or timeout. Write the
+     * iterate result to the connectStatus. So we do not attempt to restore a
+     * failed connection during the sync connect. */
+    while(client->connectStatus == UA_STATUSCODE_GOOD) {
         if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
             break;
         if(client->noSession && client->channel.state == UA_SECURECHANNELSTATE_OPEN)
@@ -1135,11 +1144,12 @@ connectSync(UA_Client *client) {
         now = UA_DateTime_nowMonotonic();
         if(maxDate < now)
             return UA_STATUSCODE_BADTIMEOUT;
-        retval = UA_Client_run_iterate(client,
-                                       (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
+        client->connectStatus =
+            UA_Client_run_iterate(client,
+                                  (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
     }
 
-    return retval;
+    return client->connectStatus;
 }
 
 UA_StatusCode

From b2b8b52e532bde40c0bc8d9ad38717097600e3e6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 23:02:32 +0200
Subject: [PATCH 0283/1963] refactor(client): Use EventLoop based networking

---
 src/client/ua_client_connect.c | 343 +++++++++++++++++++++++----------
 1 file changed, 238 insertions(+), 105 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index b7e03c6d3bb..746bb35f564 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -16,6 +16,7 @@
 #define UA_SESSION_LOCALNONCELENGTH 32
 #define MAX_DATA_SIZE 4096
 
+static void initConnect(UA_Client *client);
 static void closeSession(UA_Client *client);
 static UA_StatusCode createSessionAsync(UA_Client *client);
 
@@ -893,121 +894,133 @@ createSessionAsync(UA_Client *client) {
     return res;
 }
 
-static UA_StatusCode
-initConnect(UA_Client *client);
-
-UA_StatusCode
-connectIterate(UA_Client *client, UA_UInt32 timeout) {
-    UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                 "Client connect iterate");
-
-    /* Already connected */
-    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
-        return UA_STATUSCODE_GOOD;
+static void
+initSecurityPolicy(UA_Client *client) {
+    /* Already initialized */
+    if(client->channel.securityPolicy)
+        return;
 
-    /* Could not connect */
-    if(client->connectStatus != UA_STATUSCODE_GOOD)
-        return client->connectStatus;
+    client->channel.securityMode = client->config.endpoint.securityMode;
 
-    /* The connection was already closed */
-    if(client->channel.state == UA_SECURECHANNELSTATE_CLOSING) {
-        client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
+    if(client->channel.securityMode == UA_MESSAGESECURITYMODE_INVALID)
+        client->channel.securityMode = UA_MESSAGESECURITYMODE_NONE;
+    UA_SecurityPolicy *sp = NULL;
+    if(client->config.endpoint.securityPolicyUri.length == 0) {
+        sp = getSecurityPolicy(client,
+                               UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None"));
+    } else {
+        sp = getSecurityPolicy(client, client->config.endpoint.securityPolicyUri);
     }
 
-    /* The connection is closed. Reset the SecureChannel and open a new TCP
-     * connection */
-    if(client->connection.state == UA_CONNECTIONSTATE_CLOSED)
-        return initConnect(client);
-
-    /* Poll the connection status */
-    if(client->connection.state == UA_CONNECTIONSTATE_OPENING) {
+    client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+    if(sp) {
         client->connectStatus =
-            client->config.pollConnectionFunc(&client->connection, timeout,
-                                              &client->config.logger);
-        return client->connectStatus;
+            UA_SecureChannel_setSecurityPolicy(&client->channel, sp,
+                                               &client->config.endpoint.serverCertificate);
     }
+}
 
-    /* Attach the connection to the SecureChannel */
-    if(!client->channel.connection)
-        UA_Connection_attachSecureChannel(&client->connection, &client->channel);
-
-    /* Set the SecurityPolicy */
-    if(!client->channel.securityPolicy) {
-        client->channel.securityMode = client->config.endpoint.securityMode;
-        if(client->channel.securityMode == UA_MESSAGESECURITYMODE_INVALID)
-            client->channel.securityMode = UA_MESSAGESECURITYMODE_NONE;
+static void
+iterateConnect(UA_Client *client) {
+    UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                 "Client connect iterate");
 
-        UA_SecurityPolicy *sp = NULL;
-        if(client->config.endpoint.securityPolicyUri.length == 0) {
-            sp = getSecurityPolicy(client,
-                                   UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None"));
-        } else {
-            sp = getSecurityPolicy(client, client->config.endpoint.securityPolicyUri);
-        }
-        if(!sp) {
-            client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
-            return client->connectStatus;
-        }
+    /* Could not connect with an error that canot be recovered from */
+    if(client->connectStatus != UA_STATUSCODE_GOOD)
+        return;
 
-        client->connectStatus =
-            UA_SecureChannel_setSecurityPolicy(&client->channel, sp,
-                                               &client->config.endpoint.serverCertificate);
-        if(client->connectStatus != UA_STATUSCODE_GOOD)
-            return client->connectStatus;
-    }
+    /* Already connected */
+    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
+        return;
 
-    /* Open the SecureChannel */
+    /* Switch on the SecureChannel state */
     switch(client->channel.state) {
+
+        /* Send HEL */
     case UA_SECURECHANNELSTATE_FRESH:
         client->connectStatus = sendHELMessage(client);
-        if(client->connectStatus == UA_STATUSCODE_GOOD) {
-            client->channel.state = UA_SECURECHANNELSTATE_HEL_SENT;
-        } else {
-            client->connection.close(&client->connection);
-            client->connection.free(&client->connection);
-        }
-        return client->connectStatus;
+        return;
+
+        /* ACK receieved. Send OPN. */
     case UA_SECURECHANNELSTATE_ACK_RECEIVED:
-        client->connectStatus = sendOPNAsync(client, false);
-        return client->connectStatus;
+        if(!client->channel.connection) /* Attach the connection to the SecureChannel */
+            UA_Connection_attachSecureChannel(&client->connection, &client->channel);
+        initSecurityPolicy(client); /* Initialize the SecurityPolicy */
+        if(client->connectStatus == UA_STATUSCODE_GOOD)
+            client->connectStatus = sendOPNAsync(client, false); /* Send OPN */
+        return;
+
+        /* Nothing to do */
     case UA_SECURECHANNELSTATE_HEL_SENT:
     case UA_SECURECHANNELSTATE_OPN_SENT:
-        client->connectStatus = receiveResponseAsync(client, timeout);
-        return client->connectStatus;
-    default:
+    case UA_SECURECHANNELSTATE_CLOSING:
+        return;
+
+        /* The channel is open -> continue with the Session handling */
+    case UA_SECURECHANNELSTATE_OPEN:
         break;
+
+        /* The connection is closed. Reset the SecureChannel and open a new TCP
+         * connection */
+    case UA_SECURECHANNELSTATE_CLOSED:
+        initConnect(client);
+        return;
+
+        /* These states should never occur for the client */
+    case UA_SECURECHANNELSTATE_HEL_RECEIVED:
+    case UA_SECURECHANNELSTATE_ACK_SENT:
+    default:
+        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        return;
     }
 
-    /* Have a SecureChannel but no session */
+    /* <-- The SecureChannel is open --> */
+
+    /* Ongoing endpoints handshake? */
+    if(client->endpointsHandshake)
+        return;
+
+    /* Get the endpoints in order to reset the SecureChannel with encryption */
+    if(endpointUnconfigured(client)) {
+        client->connectStatus = requestGetEndpoints(client);
+        return;
+    }
+
+    /* Do we want to open a session? */
     if(client->noSession)
-        return client->connectStatus;
+        return;
 
     /* Create and Activate the Session */
     switch(client->sessionState) {
+        /* Send a CreateSessionRequest */
     case UA_SESSIONSTATE_CLOSED:
-        if(!endpointUnconfigured(client)) {
-            client->connectStatus = createSessionAsync(client);
-            return client->connectStatus;
-        }
-        if(!client->endpointsHandshake) {
-            client->connectStatus = requestGetEndpoints(client);
-            return client->connectStatus;
-        }
-        receiveResponseAsync(client, timeout);
-        return client->connectStatus;
-    case UA_SESSIONSTATE_CREATE_REQUESTED:
-    case UA_SESSIONSTATE_ACTIVATE_REQUESTED:
-        receiveResponseAsync(client, timeout);
-        return client->connectStatus;
+        client->connectStatus = createSessionAsync(client);
+        return;
+
+        /* Activate the Session */
     case UA_SESSIONSTATE_CREATED:
         client->connectStatus = activateSessionAsync(client);
-        return client->connectStatus;
+        return;
+
+    case UA_SESSIONSTATE_CREATE_REQUESTED:
+    case UA_SESSIONSTATE_ACTIVATE_REQUESTED:
+    case UA_SESSIONSTATE_ACTIVATED:
+    case UA_SESSIONSTATE_CLOSING:
+        return; /* Nothing to do */
+
+        /* These states should never occur for the client */
     default:
+        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
         break;
     }
+}
 
-    return client->connectStatus;
+static UA_StatusCode
+verifyClientSecurechannelHeader(void *application, UA_SecureChannel *channel,
+                                const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
+    /* TODO: Verify if certificate is the same as configured in the client
+     * endpoint config */
+    return UA_STATUSCODE_GOOD;
 }
 
 /* The local ApplicationURI has to match the certificates of the
@@ -1039,25 +1052,107 @@ verifyClientApplicationURI(const UA_Client *client) {
 #endif
 }
 
-static UA_StatusCode
-client_configure_securechannel(void *application, UA_SecureChannel *channel,
-                               const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
-    // TODO: Verify if certificate is the same as configured in the client endpoint config
-    return UA_STATUSCODE_GOOD;
+static void
+UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_StatusCode state,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          UA_ByteString msg) {
+    UA_Client *client = (UA_Client*)application;
+
+    UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                 "Client network callback");
+
+    /* A new connection is opening */
+    if(!*connectionContext) {
+        /* Opening the TCP connection failed. Cannot recover from this. */
+        if(state != UA_STATUSCODE_GOOD) {
+            client->connectStatus = state;
+            notifyClientState(client);
+            return;
+        }
+
+        /* Initialize the client connection */
+        UA_Connection *conn = &client->connection;
+        conn->state = UA_CONNECTIONSTATE_OPENING;
+        conn->channel = NULL;
+        conn->sockfd = (UA_SOCKET)connectionId;
+        conn->handle = cm;
+        conn->getSendBuffer = UA_Connection_getSendBuffer;
+        conn->releaseSendBuffer = UA_Connection_releaseBuffer;
+        conn->send = UA_Connection_send;
+        conn->recv = NULL;
+        conn->releaseRecvBuffer = UA_Connection_releaseBuffer;
+        conn->close = UA_Connection_close;
+        conn->free = NULL;
+
+        /* Link the connection into the SecureChannel */
+        UA_Connection_attachSecureChannel(conn, &client->channel);
+
+        *connectionContext = conn; /* Set the connection context */
+        goto continue_connect;
+    }
+
+    /* Received a message. Process the message with the SecureChannel. */
+    if(UA_LIKELY(state == UA_STATUSCODE_GOOD)) {
+        state = UA_SecureChannel_processBuffer(&client->channel, client,
+                                               processServiceResponse, &msg);
+        if(state != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                           "Processing the message return the error code %s",
+                           UA_StatusCode_name(state));
+        }
+    }
+
+    /* Connection closed or error during the processing of the message */
+    if(state != UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                    "Closing the SecureChannel with state %s",
+                    UA_StatusCode_name(state));
+
+        /* Close the SecureChannel */
+        UA_SecureChannel_close(&client->channel);
+        closeSecureChannel(client);
+
+        /* Detach the connection and set to closed */
+        UA_Connection_detachSecureChannel(&client->connection);
+        client->connection.state = UA_CONNECTIONSTATE_CLOSED;
+
+        /* Do not return here. We might want to reconnect. */
+    }
+
+    /* Trigger the next action from our end to fully open up the connection */
+ continue_connect:
+    if((client->noSession && client->channel.state != UA_SECURECHANNELSTATE_OPEN) ||
+       client->sessionState < UA_SESSIONSTATE_ACTIVATED) {
+        iterateConnect(client);
+    }
+
+    /* Notify the application if the client state has changed */
+    notifyClientState(client);
 }
 
-static UA_StatusCode
+/* Initialize a TCP connection. Writes the result to client->connectStatus. */
+static void
 initConnect(UA_Client *client) {
     if(client->connection.state > UA_CONNECTIONSTATE_CLOSED) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "Client already connected");
-        return UA_STATUSCODE_GOOD;
+                       "Client connection already initiated");
+        return;
     }
 
-    if(client->config.initConnectionFunc == NULL) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                     "Client connection not configured");
-        return UA_STATUSCODE_BADINTERNALERROR;
+    /* Start the EventLoop if not already started */
+    UA_EventLoop *el = client->config.eventLoop;
+    if(!el) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "No EventLoop configured");
+        return;
+    }
+
+    if(el->state != UA_EVENTLOOPSTATE_STARTED) {
+        client->connectStatus = el->start(el);
+        if(client->connectStatus != UA_STATUSCODE_GOOD)
+            return;
     }
 
     /* Consistency check the client's own ApplicationURI */
@@ -1071,25 +1166,63 @@ initConnect(UA_Client *client) {
     /* Initialize the SecureChannel */
     UA_SecureChannel_init(&client->channel, &client->config.localConnectionConfig);
     client->channel.certificateVerification = &client->config.certificateVerification;
-    client->channel.processOPNHeader = client_configure_securechannel;
+    client->channel.processOPNHeader = verifyClientSecurechannelHeader;
 
     if(client->connection.free)
         client->connection.free(&client->connection);
 
+    /* Extract hostname and port from the URL */
+    UA_String hostname = UA_STRING_NULL;
+    UA_String path = UA_STRING_NULL;
+    UA_UInt16 port = 4840;
+
+    client->connectStatus =
+        UA_parseEndpointUrl(&client->endpointUrl, &hostname, &port, &path);
+    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_NETWORK,
+                       "OPC UA URL is invalid: %.*s",
+                       (int)client->endpointUrl.length, client->endpointUrl.data);
+        return;
+    }
+
     /* Initialize the TCP connection */
-    client->connection =
-        client->config.initConnectionFunc(client->config.localConnectionConfig,
-                                          client->endpointUrl, client->config.timeout,
-                                          &client->config.logger);
-    if(client->connection.state != UA_CONNECTIONSTATE_OPENING) {
+    UA_String tcpString = UA_STRING("tcp");
+    client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+    for(UA_EventSource *es = client->config.eventLoop->eventSources;
+        es != NULL; es = es->next) {
+        /* Is this a usable connection manager? */
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+        if(!UA_String_equal(&tcpString, &cm->protocol))
+            continue;
+
+        /* Set up the parameters */
+        UA_KeyValuePair params[2];
+        params[0].key = UA_QUALIFIEDNAME(0, "port");
+        UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+        params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+        UA_Variant_setScalar(&params[1].value, &hostname, &UA_TYPES[UA_TYPES_STRING]);
+
+        /* Open the client TCP connection */
+        client->connectStatus =
+            cm->openConnection(cm, 2, params, client, NULL, UA_Client_networkCallback);
+        if(client->connectStatus == UA_STATUSCODE_GOOD)
+            break;
+    }
+
+    /* Opening the TCP connection failed */
+    if(client->connectStatus != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Could not open a TCP connection to %.*s",
                        (int)client->endpointUrl.length, client->endpointUrl.data);
         client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
-        closeSecureChannel(client);
+        return;
     }
 
-    return client->connectStatus;
+    /* The TCP connection has started. All future interactions will be handled
+     * through the network callback. */
+    client->connection.state = UA_CONNECTIONSTATE_OPENING;
 }
 
 UA_StatusCode

From c12b047ae38abfe7f1e0c06b5867561f17bb1ebe Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 May 2022 23:38:02 +0200
Subject: [PATCH 0284/1963] refactor(client): Expose connectSync internally

---
 src/client/ua_client_connect.c  | 19 +++++++++++--------
 src/client/ua_client_internal.h |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 746bb35f564..189d53f0fb8 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1255,7 +1255,7 @@ UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl)
     return client->connectStatus;
 }
 
-static UA_StatusCode
+void
 connectSync(UA_Client *client) {
     UA_DateTime now = UA_DateTime_nowMonotonic();
     UA_DateTime maxDate = now + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
@@ -1264,7 +1264,7 @@ connectSync(UA_Client *client) {
     initConnect(client);
     notifyClientState(client);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
-        return client->connectStatus;
+        return;
 
     /* Run the EventLoop until connected, connect fail or timeout. Write the
      * iterate result to the connectStatus. So we do not attempt to restore a
@@ -1275,14 +1275,15 @@ connectSync(UA_Client *client) {
         if(client->noSession && client->channel.state == UA_SECURECHANNELSTATE_OPEN)
             break;
         now = UA_DateTime_nowMonotonic();
-        if(maxDate < now)
-            return UA_STATUSCODE_BADTIMEOUT;
+        if(maxDate < now) {
+            /* TODO: Close the SecureChannel properly */
+            client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
+            return;
+        }
         client->connectStatus =
             UA_Client_run_iterate(client,
                                   (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
     }
-
-    return client->connectStatus;
 }
 
 UA_StatusCode
@@ -1295,7 +1296,8 @@ UA_Client_connect(UA_Client *client, const char *endpointUrl) {
     client->noSession = false;
 
     /* Connect Synchronous */
-    return connectSync(client);
+    connectSync(client);
+    return client->connectStatus;
 }
 
 UA_StatusCode
@@ -1308,7 +1310,8 @@ UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl) {
     client->noSession = true;
 
     /* Connect Synchronous */
-    return connectSync(client);
+    connectSync(client);
+    return client->connectStatus;
 }
 
 /************************/
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index c25a1287b20..b0101a3fd6c 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -173,6 +173,7 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message);
 
+void connectSync(UA_Client *client);
 void notifyClientState(UA_Client *client);
 void processERRResponse(UA_Client *client, const UA_ByteString *chunk);
 void processACKResponse(UA_Client *client, const UA_ByteString *chunk);

From 1bfe02bfa7ae9a02360025b1e81718452f04267a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 12 May 2022 09:29:37 +0200
Subject: [PATCH 0285/1963] refactor(client): Set the client to _closing only
 after sending CloseSession

Required for the new EventLoop logic. Otherwise a new Session is created
immediately.
---
 src/client/ua_client_connect.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 189d53f0fb8..9e7f602c994 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1351,9 +1351,6 @@ closeSecureChannel(UA_Client *client) {
 
 static void
 sendCloseSession(UA_Client *client) {
-    /* Set before sending the message to prevent recursion */
-    client->sessionState = UA_SESSIONSTATE_CLOSING;
-
     UA_CloseSessionRequest request;
     UA_CloseSessionRequest_init(&request);
     request.requestHeader.timestamp = UA_DateTime_now();
@@ -1364,6 +1361,11 @@ sendCloseSession(UA_Client *client) {
                         &response, &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE]);
     UA_CloseSessionRequest_clear(&request);
     UA_CloseSessionResponse_clear(&response);
+
+    /* Set after sending the message to prevent immediate reoping during the
+     * service call */
+    client->sessionState = UA_SESSIONSTATE_CLOSING;
+
 }
 
 static void

From eb05386c8e60d742e454f4f103538c0a27bdff97 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 12 May 2022 09:32:00 +0200
Subject: [PATCH 0286/1963] feat(client): Auto-reestablish a broken connection
 before synchronous requests

---
 src/client/ua_client.c                    | 26 ++++++++++++++++-------
 tests/client/check_client_securechannel.c | 13 ++++++------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 9d8389c6d1d..9440edb2c2a 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -376,12 +376,20 @@ __UA_Client_Service(UA_Client *client, const void *request,
 		return;
     }
 
-    /* Check that the SecureChannel is open */
-    if(client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
+    /* Store the time until which the request has to be answered */
+    UA_DateTime maxDate = UA_DateTime_nowMonotonic() +
+        ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
+
+    /* Check that the SecureChannel is open. Otherwise reopen. */
+    if((client->sessionState != UA_SESSIONSTATE_ACTIVATED && !client->noSession) ||
+       client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                    "SecureChannel must be connected before sending requests");
-        respHeader->serviceResult = UA_STATUSCODE_BADCONNECTIONCLOSED;
-		return;
+                    "Re-establish the connction for the synchronous service call");
+        connectSync(client);
+        if(client->connectStatus != UA_STATUSCODE_GOOD) {
+            respHeader->serviceResult = client->connectStatus;
+            return;
+        }
     }
 
     AsyncServiceCall ac;
@@ -396,6 +404,7 @@ __UA_Client_Service(UA_Client *client, const void *request,
     if(retval != UA_STATUSCODE_GOOD) {
         closeSecureChannel(client);
         notifyClientState(client);
+        respHeader->serviceResult = retval;
         return;
     }
 
@@ -407,8 +416,6 @@ __UA_Client_Service(UA_Client *client, const void *request,
 
     /* Run the EventLoop until the request was processed, the request has timed
      * out or the client connection fails */
-    UA_DateTime maxDate = UA_DateTime_nowMonotonic() +
-        ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
     while(true) {
         /* Compute the remaining timeout and run the EventLoop */
         UA_DateTime now = UA_DateTime_nowMonotonic();
@@ -423,7 +430,10 @@ __UA_Client_Service(UA_Client *client, const void *request,
         if(ac.syncResponse == NULL)
             return;
 
-        /* Check the status */
+        /* Check the status. Do not try to resend if the connection breaks.
+         * Leave this to the application-level user. For example, we do not want
+         * to call a method twice is the connection broke after sending the
+         * request. */
         if(retval != UA_STATUSCODE_GOOD)
             break;
         retval = client->connectStatus;
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index 97ed1ac9cb0..4e17becbca1 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -150,17 +150,18 @@ START_TEST(SecureChannel_networkfail) {
     rq.nodesToRead = &rvi;
     rq.nodesToReadSize = 1;
 
-    /* Forward the clock after recv in the client */
-    UA_ClientConfig *cconfig = UA_Client_getConfig(client);
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-    UA_Client_recvSleepDuration = cconfig->secureChannelLifeTime + 1;
+    /* Manually close the TCP connection */
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
+    cm->closeConnection(cm, (uintptr_t)client->connection.sockfd);
+    UA_EventLoop *el = client->config.eventLoop;
+    el->run(el, 0);
 
+    /* The connection is re-established automatically */
     UA_Variant val;
     UA_Variant_init(&val);
     UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert(retval == UA_STATUSCODE_BADCONNECTIONCLOSED);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);

From 12e3fe08ffe68cdb31b5bf47f62592c01b5534b6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 7 Jun 2022 16:16:10 +0200
Subject: [PATCH 0287/1963] feat(client): Don't repeat the handshake during
 automatic reconnect

---
 src/client/ua_client_connect.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 9e7f602c994..ef02c0b8473 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1161,7 +1161,6 @@ initConnect(UA_Client *client) {
     /* Reset the connect status */
     client->connectStatus = UA_STATUSCODE_GOOD;
     client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
-    client->endpointsHandshake = false;
 
     /* Initialize the SecureChannel */
     UA_SecureChannel_init(&client->channel, &client->config.localConnectionConfig);

From b9d0eeb48bd75da5ce645617d9f71448894e7466 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 7 Jun 2022 16:17:35 +0200
Subject: [PATCH 0288/1963] feat(client): Abort outstanding requests when the
 SecureChannel closes

---
 src/client/ua_client_connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index ef02c0b8473..d758a9f8d11 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1342,7 +1342,7 @@ closeSecureChannel(UA_Client *client) {
     if(client->sessionState > UA_SESSIONSTATE_CREATED)
         client->sessionState = UA_SESSIONSTATE_CREATED;
 
-    /* Delete outstanding async services - the RequestId is no longr valid. Do
+    /* Delete outstanding async services - the RequestId is no longer valid. Do
      * this after setting the Session state. Otherwise we send out new Publish
      * Requests immediately. */
     UA_Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSECURECHANNELCLOSED);

From 899324ca0326bcefa326afc1da23ad6bb1277a9b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Jun 2022 22:40:58 +0200
Subject: [PATCH 0289/1963] fix(client): Immediately try to send Publish
 requests when the Session activates

---
 src/client/ua_client_connect.c            | 6 ++++++
 src/client/ua_client_subscriptions.c      | 4 ++++
 tests/client/check_client_subscriptions.c | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index d758a9f8d11..50582de4992 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -517,6 +517,12 @@ responseActivateSession(UA_Client *client, void *userdata, UA_UInt32 requestId,
 
     client->sessionState = UA_SESSIONSTATE_ACTIVATED;
     notifyClientState(client);
+
+    /* Immediately check if publish requests are outstanding - for example when
+     * an existing Session has been reattached / activated. */
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+    UA_Client_Subscriptions_backgroundPublish(client);
+#endif
 }
 
 static UA_StatusCode
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 5a5182dd155..3b38cd5391e 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -56,6 +56,10 @@ ua_Subscriptions_create(UA_Client *client, UA_Client_Subscription *newSub,
     newSub->maxKeepAliveCount = response->revisedMaxKeepAliveCount;
     ZIP_INIT(&newSub->monitoredItems);
     LIST_INSERT_HEAD(&client->subscriptions, newSub, listEntry);
+
+    /* Immediately send the first publish requests if there are none
+     * outstanding */
+    UA_Client_Subscriptions_backgroundPublish(client);
 }
 
 static void
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 1f817bece3a..6dc7d73ae2f 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -902,6 +902,9 @@ START_TEST(Client_subscription_connectionClose) {
     running = false;
     THREAD_JOIN(server_thread);
 
+    retval = UA_Client_run_iterate(client, 1);
+    UA_Server_run_iterate(server, true);
+
     /* Send Publish requests */
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);

From 747e4cbd73371418e5882c38cb5615d2270c73ce Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jun 2022 12:22:11 +0200
Subject: [PATCH 0290/1963] fix(client): Update tests to work with the
 EventLoop-based client

---
 tests/client/check_client.c               | 13 +++++++------
 tests/client/check_client_async.c         | 14 +++++++++-----
 tests/client/check_client_securechannel.c | 18 +++++++-----------
 tests/client/check_client_subscriptions.c | 17 ++++++++++++++---
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 58f093bc10e..77ac7e11970 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -348,15 +348,16 @@ START_TEST(Client_activateSessionTimeout) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Variant_clear(&val);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
-    /* Simulate network cable unplugged (no response from server) */
-    UA_Client_recvTesting_result = UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
+    /* Manually close the connection. The connection is internally closed at the
+     * next iteration of the EventLoop. Hence the next request is sent out. But
+     * the connection "actually closes" before receiving the response. */
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
+    uintptr_t connId = client->connection.sockfd;
+    cm->closeConnection(cm, connId);
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSESSIONCLOSED);
 
     UA_Client_recvTesting_result = UA_STATUSCODE_GOOD;
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
diff --git a/tests/client/check_client_async.c b/tests/client/check_client_async.c
index 9dcfe8aadc1..12d28a50558 100644
--- a/tests/client/check_client_async.c
+++ b/tests/client/check_client_async.c
@@ -48,7 +48,7 @@ static void
 asyncReadCallback(UA_Client *client, void *userdata,
                   UA_UInt32 requestId, const UA_ReadResponse *response) {
     UA_UInt16 *asyncCounter = (UA_UInt16*) userdata;
-    if (response->responseHeader.serviceResult == UA_STATUSCODE_BADTIMEOUT) {
+    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         (*asyncCounter) = 9999;
         UA_fakeSleep(10);
     } else {
@@ -141,7 +141,7 @@ START_TEST(Client_read_async) {
 
         UA_Client_disconnect(client);
         UA_Client_delete(client);
-    }END_TEST
+} END_TEST
 
 START_TEST(Client_read_async_timed) {
         UA_Client *client = UA_Client_new();
@@ -182,8 +182,12 @@ START_TEST(Client_read_async_timed) {
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         ck_assert_uint_eq(asyncCounter, 1);
 
-        /* Simulate network cable unplugged (no response from server) */
-        UA_Client_recvTesting_result = UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
+        /* Manually close the connection. The connection is internally closed at the
+         * next iteration of the EventLoop. Hence the next request is sent out. But
+         * the connection "actually closes" before receiving the response. */
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
+        uintptr_t connId = client->connection.sockfd;
+        cm->closeConnection(cm, connId);
 
         retval = __UA_Client_AsyncServiceEx(client, &rr,
                 &UA_TYPES[UA_TYPES_READREQUEST],
@@ -196,7 +200,7 @@ START_TEST(Client_read_async_timed) {
 
         UA_Client_disconnect(client);
         UA_Client_delete(client);
-    }END_TEST
+} END_TEST
 
 static UA_Boolean inactivityCallbackTriggered = false;
 
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index 4e17becbca1..5d505b20f3b 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -202,21 +202,17 @@ START_TEST(SecureChannel_cableunplugged) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Variant_clear(&val);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
-    /* Simulate network cable unplugged (no response from server) */
-    UA_Client_recvTesting_result = UA_STATUSCODE_BADINTERNALERROR;
+    /* Manually close the connection. The connection is internally closed at the
+     * next iteration of the EventLoop. Hence the next request is sent out. But
+     * the connection "actually closes" before receiving the response. */
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
+    uintptr_t connId = client->connection.sockfd;
+    cm->closeConnection(cm, connId);
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
-
-    UA_SecureChannelState scs;
-    UA_Client_getState(client, &scs, NULL, NULL);
-    ck_assert_int_eq(scs, UA_SECURECHANNELSTATE_CLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSESSIONCLOSED);
 
-    UA_Client_recvTesting_result = UA_STATUSCODE_GOOD;
     UA_Client_delete(client);
 }
 END_TEST
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 6dc7d73ae2f..3206a0ce88b 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -732,6 +732,9 @@ START_TEST(Client_subscription_keepAlive) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
+    /* For the keepalive tests disable automatically sending publish requests */
+    UA_Client_getConfig(client)->outStandingPublishRequests = 0;
+
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     request.requestedMaxKeepAliveCount = 1;
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
@@ -796,6 +799,9 @@ START_TEST(Client_subscription_priority) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
+    /* For the test disable automatically sending publish requests */
+    UA_Client_getConfig(client)->outStandingPublishRequests = 0;
+
     // prio = 0
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     request.requestedMaxKeepAliveCount = 1;
@@ -884,8 +890,14 @@ START_TEST(Client_subscription_connectionClose) {
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    /* Simulate BADCONNECTIONCLOSE */
-    UA_Client_recvTesting_result = UA_STATUSCODE_BADCONNECTIONCLOSED;
+    /* Manually close the connection. The connection is internally closed at the
+     * next iteration of the EventLoop. Hence the next request is sent out. But
+     * the connection "actually closes" before receiving the response. */
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
+    uintptr_t connId = client->connection.sockfd;
+    cm->closeConnection(cm, connId);
+
+    notificationReceived = false;
 
     /* Reconnect a new SecureChannel and recover the Session */
     retval = UA_Client_run_iterate(client, 1);
@@ -912,7 +924,6 @@ START_TEST(Client_subscription_connectionClose) {
     /* Still receiving on the MonitoredItem */
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
     UA_Server_run_iterate(server, true);
-    notificationReceived = false;
     countNotificationReceived = 0;
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);

From 6c817e7d9b9e049fc7c30c236000912c4edcc3c2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 Jun 2022 16:52:52 +0200
Subject: [PATCH 0291/1963] fix(test): Align check_client_securechannel.c to
 EventLoop client

---
 tests/client/check_client_securechannel.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index 5d505b20f3b..e56856cf96c 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -162,6 +162,7 @@ START_TEST(SecureChannel_networkfail) {
     UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
     ck_assert(retval == UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);
@@ -211,7 +212,7 @@ START_TEST(SecureChannel_cableunplugged) {
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSESSIONCLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURECHANNELCLOSED);
 
     UA_Client_delete(client);
 }

From 77aece80d73816a6716a57ff57ece5265aa84520 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 Jun 2022 23:49:16 +0200
Subject: [PATCH 0292/1963] feat(client): Add logging when the RequestId is
 unknown

---
 src/client/ua_client.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 9440edb2c2a..053f0dc9038 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -262,8 +262,14 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
      * Bad_SecurityChecksFailed error is reported. The RequestId only needs to
      * be verified by the Client since only the Client knows if it is valid or
      * not.*/
-    if(!ac)
+    if(!ac) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Request with unknown RequestId %u", requestId);
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    }
+
+    UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                   "Processing request with RequestId %u", requestId);
 
     UA_Response asyncResponse;
     UA_Response *response = (ac->syncResponse) ? ac->syncResponse : &asyncResponse;

From 88048b5d0c9b428c474a558ae3f8419752e8e5bf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 Jun 2022 23:49:50 +0200
Subject: [PATCH 0293/1963] fix(client): Fix a grammar error in
 ua_client_connect.c

---
 src/client/ua_client_connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 50582de4992..23b3ce89c76 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1105,7 +1105,7 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                                                processServiceResponse, &msg);
         if(state != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                           "Processing the message return the error code %s",
+                           "Processing the message returned the error code %s",
                            UA_StatusCode_name(state));
         }
     }

From 776218ff87071714ec9ef906a8d4e781d2c9e2fc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 Jun 2022 23:51:58 +0200
Subject: [PATCH 0294/1963] feat(server): Log the RequestId when receiving a
 Publish request

---
 src/server/ua_services_subscription.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index dd31e34ccc9..a6c56d54f28 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -230,7 +230,8 @@ Service_SetPublishingMode(UA_Server *server, UA_Session *session,
 UA_StatusCode
 Service_Publish(UA_Server *server, UA_Session *session,
                 const UA_PublishRequest *request, UA_UInt32 requestId) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Processing PublishRequest");
+    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                         "Processing PublishRequest with RequestId %u", requestId);
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Return an error if the session has no subscription */

From d448cc9040306e62062e2dff4b9d0e8c40e5fb6d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 29 Jun 2022 08:39:34 +0200
Subject: [PATCH 0295/1963] refactor(test): Simplify the discovery unit tests

---
 tests/server/check_discovery.c | 332 ++++++++++++++++++---------------
 1 file changed, 185 insertions(+), 147 deletions(-)

diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 616a82c11e6..67ff3054bec 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -22,10 +22,18 @@
 #endif
 
 // set register timeout to 1 second so we are able to test it.
-#define registerTimeout 1
+#define registerTimeout 4
 // cleanup is only triggered every 10 seconds, thus wait a bit longer to check
 #define checkWait registerTimeout + 11
 
+#ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
+# ifndef WIN32
+#  define SEMAPHORE_PATH "/tmp/open62541-unit-test-semaphore"
+# else
+#  define SEMAPHORE_PATH ".\\open62541-unit-test-semaphore"
+# endif
+#endif
+
 UA_Server *server_lds;
 UA_Boolean *running_lds;
 THREAD_HANDLE server_thread_lds;
@@ -37,18 +45,19 @@ THREAD_CALLBACK(serverloop_lds) {
     return 0;
 }
 
-static void configure_lds_server(UA_Server *pServer)
-{
+static void
+configure_lds_server(UA_Server *pServer) {
     UA_ServerConfig *config_lds = UA_Server_getConfig(pServer);
     UA_ServerConfig_setDefault(config_lds);
 
-    config_lds->applicationDescription.applicationType = UA_APPLICATIONTYPE_DISCOVERYSERVER;
+    config_lds->applicationDescription.applicationType =
+        UA_APPLICATIONTYPE_DISCOVERYSERVER;
     UA_String_clear(&config_lds->applicationDescription.applicationUri);
     config_lds->applicationDescription.applicationUri =
         UA_STRING_ALLOC("urn:open62541.test.local_discovery_server");
     UA_LocalizedText_clear(&config_lds->applicationDescription.applicationName);
-    config_lds->applicationDescription.applicationName
-        = UA_LOCALIZEDTEXT_ALLOC("en", "LDS Server");
+    config_lds->applicationDescription.applicationName =
+        UA_LOCALIZEDTEXT_ALLOC("en", "LDS Server");
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     config_lds->mdnsEnabled = true;
     config_lds->mdnsConfig.mdnsServerName = UA_String_fromChars("LDS_test");
@@ -61,11 +70,13 @@ static void configure_lds_server(UA_Server *pServer)
     config_lds->discoveryCleanupTimeout = registerTimeout;
 }
 
-static void setup_lds(void) {
+static void
+setup_lds(void) {
     // start LDS server
     running_lds = UA_Boolean_new();
     *running_lds = true;
 
+    UA_assert(server_lds == NULL);
     server_lds = UA_Server_new();
     configure_lds_server(server_lds);
 
@@ -77,18 +88,19 @@ static void setup_lds(void) {
     UA_realSleep(1000);
 }
 
-static void teardown_lds(void) {
+static void
+teardown_lds(void) {
     *running_lds = false;
     THREAD_JOIN(server_thread_lds);
     UA_Server_run_shutdown(server_lds);
     UA_Boolean_delete(running_lds);
     UA_Server_delete(server_lds);
+    server_lds = NULL;
 }
 
 UA_Server *server_register;
 UA_Boolean *running_register;
 THREAD_HANDLE server_thread_register;
-
 UA_UInt64 periodicRegisterCallbackId;
 
 THREAD_CALLBACK(serverloop_register) {
@@ -97,7 +109,8 @@ THREAD_CALLBACK(serverloop_register) {
     return 0;
 }
 
-static void setup_register(void) {
+static void
+setup_register(void) {
     // start register server
     running_register = UA_Boolean_new();
     *running_register = true;
@@ -120,7 +133,8 @@ static void setup_register(void) {
     THREAD_CREATE(server_thread_register, serverloop_register);
 }
 
-static void teardown_register(void) {
+static void
+teardown_register(void) {
     *running_register = false;
     THREAD_JOIN(server_thread_register);
     UA_Server_run_shutdown(server_register);
@@ -128,57 +142,38 @@ static void teardown_register(void) {
     UA_Server_delete(server_register);
 }
 
-START_TEST(Server_new_delete) {
-    UA_Server *pServer = UA_Server_new();
-    configure_lds_server(pServer);
-    UA_Server_delete(pServer);
-}
-END_TEST
-
-START_TEST(Server_new_shutdown_delete) {
-        UA_Server *pServer = UA_Server_new();
-        configure_lds_server(pServer);
-        UA_StatusCode retval = UA_Server_run_shutdown(pServer);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        UA_Server_delete(pServer);
-}
-END_TEST
-
-START_TEST(Server_register) {
+static void
+registerServer(void) {
     UA_Client *clientRegister = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegister));
 
-    UA_StatusCode retval = UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
+    UA_StatusCode retval =
+        UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    retval = UA_Server_register_discovery(server_register, clientRegister , NULL);
+    retval = UA_Server_register_discovery(server_register, clientRegister, NULL);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Client_disconnect(clientRegister);
     UA_Client_delete(clientRegister);
 }
-END_TEST
 
-START_TEST(Server_unregister) {
+static void
+unregisterServer(void) {
     UA_Client *clientRegister = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegister));
 
-    UA_StatusCode retval = UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
+    UA_StatusCode retval =
+        UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     retval = UA_Server_unregister_discovery(server_register, clientRegister);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Client_disconnect(clientRegister);
     UA_Client_delete(clientRegister);
 }
-END_TEST
 
 #ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
 
-#ifndef WIN32
-#define SEMAPHORE_PATH "/tmp/open62541-unit-test-semaphore"
-#else
-#define SEMAPHORE_PATH ".\\open62541-unit-test-semaphore"
-#endif
-
-START_TEST(Server_register_semaphore) {
+static void
+Server_register_semaphore(void) {
     // create the semaphore
 #ifndef WIN32
     int fd = open(SEMAPHORE_PATH, O_RDWR|O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
@@ -194,49 +189,48 @@ START_TEST(Server_register_semaphore) {
     UA_Client *clientRegister = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegister));
 
-    UA_StatusCode retval = UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
+    UA_StatusCode retval =
+        UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     retval = UA_Server_register_discovery(server_register, clientRegister, SEMAPHORE_PATH);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Client_disconnect(clientRegister);
     UA_Client_delete(clientRegister);
 }
-END_TEST
 
-START_TEST(Server_unregister_semaphore) {
+static void
+Server_unregister_semaphore(void) {
     // delete the semaphore, this should remove the registration automatically on next check
     ck_assert_int_eq(remove(SEMAPHORE_PATH), 0);
 }
-END_TEST
 
 #endif /* UA_ENABLE_DISCOVERY_SEMAPHORE */
 
-START_TEST(Server_register_periodic) {
+static void
+Server_register_periodic(void) {
     ck_assert(clientRegisterRepeated == NULL);
-
     clientRegisterRepeated = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegisterRepeated));
-
     ck_assert(clientRegisterRepeated != NULL);
+
     // periodic register every minute, first register immediately
-    UA_StatusCode retval = UA_Server_addPeriodicServerRegisterCallback(server_register, clientRegisterRepeated, "opc.tcp://localhost:4840",
-                                                    60*1000, 100, &periodicRegisterCallbackId);
+    UA_StatusCode retval =
+        UA_Server_addPeriodicServerRegisterCallback(server_register, clientRegisterRepeated,
+                                                    "opc.tcp://localhost:4840", 60*1000, 100,
+                                                    &periodicRegisterCallbackId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 }
-END_TEST
 
-START_TEST(Server_unregister_periodic) {
-    // wait for first register delay
-    UA_fakeSleep(1000);
-    UA_realSleep(1000);
+static void
+Server_unregister_periodic(void) {
     UA_Server_removeRepeatedCallback(server_register, periodicRegisterCallbackId);
-    UA_StatusCode retval = UA_Server_unregister_discovery(server_register, clientRegisterRepeated);
+    UA_StatusCode retval =
+        UA_Server_unregister_discovery(server_register, clientRegisterRepeated);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Client_disconnect(clientRegisterRepeated);
     UA_Client_delete(clientRegisterRepeated);
     clientRegisterRepeated=NULL;
 }
-END_TEST
 
 static void
 FindAndCheck(const UA_String expectedUris[], size_t expectedUrisSize,
@@ -293,7 +287,7 @@ FindAndCheck(const UA_String expectedUris[], size_t expectedUrisSize,
             ck_assert(UA_String_equal(&applicationDescriptionArray[i].applicationName.text,
                                       &expectedNames[i]));
 
-        if (expectedLocales)
+        if(expectedLocales)
             ck_assert(UA_String_equal(&applicationDescriptionArray[i].applicationName.locale,
                                       &expectedLocales[i]));
     }
@@ -322,12 +316,12 @@ FindOnNetworkAndCheck(UA_String expectedServerNames[], size_t expectedServerName
 
     if(filterCapabilitiesSize) {
         serverCapabilityFilterSize = filterCapabilitiesSize;
-        serverCapabilityFilter = (UA_String*)UA_malloc(sizeof(UA_String) * filterCapabilitiesSize);
+        serverCapabilityFilter =
+            (UA_String*)UA_malloc(sizeof(UA_String) * filterCapabilitiesSize);
         for(size_t i = 0; i < filterCapabilitiesSize; i++)
             serverCapabilityFilter[i] = UA_String_fromChars(filterCapabilities[i]);
     }
 
-
     UA_StatusCode retval =
         UA_Client_findServersOnNetwork(client, "opc.tcp://localhost:4840", 0, 0,
                                        serverCapabilityFilterSize, serverCapabilityFilter,
@@ -348,16 +342,20 @@ FindOnNetworkAndCheck(UA_String expectedServerNames[], size_t expectedServerName
     if(serverOnNetwork != NULL) {
         for(size_t i = 0; i < expectedServerNamesSize; i++) {
             UA_Boolean expectedServerNameInServerOnNetwork = false;
-            for(size_t j = 0; j < expectedServerNamesSize && !expectedServerNameInServerOnNetwork; j++) {
-                expectedServerNameInServerOnNetwork = UA_String_equal(&serverOnNetwork[j].serverName,
-                                        &expectedServerNames[i]);
+            for(size_t j = 0;
+                j < expectedServerNamesSize && !expectedServerNameInServerOnNetwork; j++) {
+                expectedServerNameInServerOnNetwork =
+                    UA_String_equal(&serverOnNetwork[j].serverName,
+                                    &expectedServerNames[i]);
             }
-            ck_assert_msg(expectedServerNameInServerOnNetwork, "Expected %.*s in serverOnNetwork list, but not found",
+            ck_assert_msg(expectedServerNameInServerOnNetwork,
+                          "Expected %.*s in serverOnNetwork list, but not found",
                           (int)expectedServerNames[i].length, expectedServerNames[i].data);
         }
     }
 
-    UA_Array_delete(serverOnNetwork, serverOnNetworkSize, &UA_TYPES[UA_TYPES_SERVERONNETWORK]);
+    UA_Array_delete(serverOnNetwork, serverOnNetworkSize,
+                    &UA_TYPES[UA_TYPES_SERVERONNETWORK]);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);
@@ -386,7 +384,8 @@ GetEndpoints(UA_Client *client, const UA_String* endpointUrl,
                         &response, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
 
     if (filterTransportProfileUri) {
-        UA_Array_delete(request.profileUris, request.profileUrisSize, &UA_TYPES[UA_TYPES_STRING]);
+        UA_Array_delete(request.profileUris, request.profileUrisSize,
+                        &UA_TYPES[UA_TYPES_STRING]);
     }
 
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
@@ -405,7 +404,8 @@ GetEndpoints(UA_Client *client, const UA_String* endpointUrl,
 
 static void
 GetEndpointsAndCheck(const char* discoveryUrl, const char* filterTransportProfileUri,
-                     const UA_String expectedEndpointUrls[], size_t expectedEndpointUrlsSize) {
+                     const UA_String *expectedEndpointUrls,
+                     size_t expectedEndpointUrlsSize) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
 
@@ -426,20 +426,23 @@ GetEndpointsAndCheck(const char* discoveryUrl, const char* filterTransportProfil
         ck_assert(UA_String_equal(&endpoint->endpointUrl, &expectedEndpointUrls[j]));
     }
 
-    UA_Array_delete(endpointArray, endpointArraySize, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+    UA_Array_delete(endpointArray, endpointArraySize,
+                    &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
     UA_Client_delete(client);
 }
 
 // Test if discovery server lists himself as registered server if it is filtered by his uri
-START_TEST(Client_filter_discovery) {
+static void
+Client_filter_discovery(void) {
     UA_String expectedUris[1];
     expectedUris[0] = UA_STRING("urn:open62541.test.local_discovery_server");
-    FindAndCheck(expectedUris, 1, NULL, NULL, "urn:open62541.test.local_discovery_server", NULL);
+    FindAndCheck(expectedUris, 1, NULL, NULL,
+                 "urn:open62541.test.local_discovery_server", NULL);
 }
-END_TEST
 
 // Test if server filters locale
-START_TEST(Client_filter_locale) {
+static void
+Client_filter_locale(void) {
     UA_String expectedUris[2];
     expectedUris[0] = UA_STRING("urn:open62541.test.local_discovery_server"),
     expectedUris[1] = UA_STRING("urn:open62541.test.server_register");
@@ -451,20 +454,20 @@ START_TEST(Client_filter_locale) {
     expectedLocales[1] = UA_STRING("de");
     // even if we request en-US, the server will return de-DE because it only has that name.
     FindAndCheck(expectedUris, 2, expectedLocales, expectedNames, NULL, "en");
-
 }
-END_TEST
 
 // Test if registered server is returned from LDS using FindServersOnNetwork
-START_TEST(Client_find_on_network_registered) {
+static void
+Client_find_on_network_registered(void) {
     char urls[2][64];
     UA_String expectedUris[2];
     char hostname[256];
 
     ck_assert_uint_eq(gethostname(hostname, 255), 0);
 
-    //DNS limits name to max 63 chars (+ \0)
-    //We need this ugly casting, otherwise gcc >7.2 will complain about format-truncation, but we want it here
+    // DNS limits name to max 63 chars (+ \0). We need this ugly casting,
+    // otherwise gcc >7.2 will complain about format-truncation, but we want it
+    // here
     void *hostnameVoid = (void*)hostname;
     snprintf(urls[0], 64, "LDS_test-%s", (char*)hostnameVoid);
     snprintf(urls[1], 64, "Register_test-%s", (char*)hostnameVoid);
@@ -479,7 +482,6 @@ START_TEST(Client_find_on_network_registered) {
     const char* capsMultipleCustom[] = {"LDS", "MyFancyCap"};
     const char* capsMultipleCustomIgnoreCase[] = {"LDS", "myfancycap"};
 
-
     // only LDS expected
     FindOnNetworkAndCheck(expectedUris, 1, NULL, NULL, capsLDS, 1);
     // only register server expected
@@ -491,17 +493,17 @@ START_TEST(Client_find_on_network_registered) {
     // only LDS expected
     FindOnNetworkAndCheck(expectedUris, 1, NULL, NULL, capsMultipleCustomIgnoreCase, 2);
 }
-END_TEST
 
 // Test if filtering with uris works
-START_TEST(Client_find_filter) {
+static void
+Client_find_filter(void) {
     UA_String expectedUris[1];
     expectedUris[0] = UA_STRING("urn:open62541.test.server_register");
     FindAndCheck(expectedUris, 1, NULL, NULL, "urn:open62541.test.server_register", NULL);
 }
-END_TEST
 
-START_TEST(Client_get_endpoints) {
+static void
+Client_get_endpoints(void) {
     UA_String  expectedEndpoints[1];
     expectedEndpoints[0] = UA_STRING("opc.tcp://localhost:4840");
 
@@ -515,66 +517,138 @@ START_TEST(Client_get_endpoints) {
 
     // filter transport profily by HTTPS, which should return no endpoint
     GetEndpointsAndCheck("opc.tcp://localhost:4840",
-                         "http://opcfoundation.org/UA-Profile/Transport/https-uabinary", NULL, 0);
+                         "http://opcfoundation.org/UA-Profile/Transport/https-uabinary",
+                         NULL, 0);
 }
-END_TEST
 
 #endif
 
 // Test if discovery server lists himself as registered server, before any other registration.
-START_TEST(Client_find_discovery) {
+static void
+Client_find_discovery(void) {
     UA_String expectedUris[1];
     expectedUris[0] = UA_STRING("urn:open62541.test.local_discovery_server");
     FindAndCheck(expectedUris, 1, NULL, NULL, NULL, NULL);
 }
-END_TEST
 
 // Test if registered server is returned from LDS
-START_TEST(Client_find_registered) {
+static void
+Client_find_registered(void) {
     UA_String expectedUris[2];
     expectedUris[0] = UA_STRING("urn:open62541.test.local_discovery_server");
     expectedUris[1] = UA_STRING("urn:open62541.test.server_register");
     FindAndCheck(expectedUris, 2, NULL, NULL, NULL, NULL);
 }
+
+START_TEST(Server_new_delete) {
+    UA_Server *pServer = UA_Server_new();
+    configure_lds_server(pServer);
+    UA_Server_delete(pServer);
+}
 END_TEST
 
-START_TEST(Util_start_lds) {
-    setup_lds();
+START_TEST(Server_new_shutdown_delete) {
+    UA_Server *pServer = UA_Server_new();
+    configure_lds_server(pServer);
+    UA_StatusCode retval = UA_Server_run_shutdown(pServer);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Server_delete(pServer);
 }
 END_TEST
 
-START_TEST(Util_stop_lds) {
-    teardown_lds();
+START_TEST(Server_registerUnregister) {
+    registerServer();
+    registerServer(); // register twice just for fun
+    unregisterServer();
 }
 END_TEST
 
-START_TEST(Util_wait_timeout) {
-    // wait until server is removed by timeout. Additionally wait a few seconds more to be sure.
-    UA_fakeSleep(100000 * checkWait);
+START_TEST(Server_registerRetry) {
+    Server_register_periodic();
+
+    // wait a bit to let first try run through
+    UA_fakeSleep(1000);
     UA_realSleep(1000);
+
+    // now start LDS
+    setup_lds();
+    // first retry is after 2 seconds, then 4, so it should be enough to wait 3 seconds
+    UA_fakeSleep(3000);
+    UA_realSleep(3000);
+
+    // check if there
+    Client_find_registered();
+    Server_unregister_periodic();
+    Client_find_discovery();
+    teardown_lds();
 }
 END_TEST
 
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-START_TEST(Util_wait_mdns) {
-    UA_fakeSleep(5000);
-    UA_realSleep(5000);
+START_TEST(Server_registerUnregister_periodic) {
+    Server_register_periodic();
+
+    // wait for first register delay
+    UA_fakeSleep(1000);
+    UA_realSleep(1000);
+
+    Server_unregister_periodic();
 }
 END_TEST
-#endif
 
-START_TEST(Util_wait_startup) {
-    UA_fakeSleep(1000);
+START_TEST(Server_registerTimeout) {
+    registerServer();
+    Client_find_registered();
+
+    // wait until server is removed by timeout. Additionally wait a few seconds
+    // more to be sure.
+    UA_fakeSleep(100000 * checkWait);
+    UA_realSleep(1000);
+
+    Client_find_discovery();
+
+#ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
+    // now check if semaphore file works
+    Server_register_semaphore();
+    Client_find_registered();
+    Server_unregister_semaphore();
+
+    // wait until server is removed by timeout. Additionally wait a few seconds
+    // more to be sure.
+    UA_fakeSleep(100000 * checkWait);
     UA_realSleep(1000);
+
+    Client_find_discovery();
+#endif
 }
 END_TEST
 
-START_TEST(Util_wait_retry) {
-    // first retry is after 2 seconds, then 4, so it should be enough to wait 3 seconds
-    UA_fakeSleep(3000);
-    UA_realSleep(3000);
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+START_TEST(Server_registerFindServers) {
+    Client_find_discovery();
+
+    registerServer();
+
+    Client_find_registered();
+
+    UA_fakeSleep(4000);
+    UA_realSleep(4000);
+
+    Client_find_on_network_registered();
+
+    Client_find_filter();
+
+    Client_get_endpoints();
+
+    Client_filter_locale();
+
+    unregisterServer();
+
+    Client_find_discovery();
+
+    Client_filter_discovery();
 }
 END_TEST
+#endif
 
 static Suite* testSuite_Client(void) {
     Suite *s = suite_create("Register Server and Client");
@@ -587,45 +661,20 @@ static Suite* testSuite_Client(void) {
     TCase *tc_register = tcase_create("RegisterServer");
     tcase_add_unchecked_fixture(tc_register, setup_lds, teardown_lds);
     tcase_add_unchecked_fixture(tc_register, setup_register, teardown_register);
-    tcase_add_test(tc_register, Server_register);
-    // register two times, just for fun
-    tcase_add_test(tc_register, Server_register);
-    tcase_add_test(tc_register, Server_unregister);
-    tcase_add_test(tc_register, Server_register_periodic);
-    tcase_add_test(tc_register, Server_unregister_periodic);
+    tcase_add_test(tc_register, Server_registerUnregister);
+    tcase_add_test(tc_register, Server_registerUnregister_periodic);
     suite_add_tcase(s,tc_register);
 
     TCase *tc_register_retry = tcase_create("RegisterServer Retry");
-    //tcase_add_unchecked_fixture(tc_register, setup_lds, teardown_lds);
     tcase_add_unchecked_fixture(tc_register_retry, setup_register, teardown_register);
-    tcase_add_test(tc_register_retry, Server_register_periodic);
-    tcase_add_test(tc_register_retry, Util_wait_startup); // wait a bit to let first try run through
-    // now start LDS
-    tcase_add_test(tc_register_retry, Util_start_lds);
-    tcase_add_test(tc_register_retry, Util_wait_retry);
-    // check if there
-    tcase_add_test(tc_register_retry, Client_find_registered);
-    tcase_add_test(tc_register_retry, Server_unregister_periodic);
-    tcase_add_test(tc_register_retry, Client_find_discovery);
-    tcase_add_test(tc_register_retry, Util_stop_lds);
-
+    tcase_add_test(tc_register_retry, Server_registerRetry);
     suite_add_tcase(s,tc_register_retry);
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     TCase *tc_register_find = tcase_create("RegisterServer and FindServers");
     tcase_add_unchecked_fixture(tc_register_find, setup_lds, teardown_lds);
     tcase_add_unchecked_fixture(tc_register_find, setup_register, teardown_register);
-    tcase_add_test(tc_register_find, Client_find_discovery);
-    tcase_add_test(tc_register_find, Server_register);
-    tcase_add_test(tc_register_find, Client_find_registered);
-    tcase_add_test(tc_register_find, Util_wait_mdns);
-    tcase_add_test(tc_register_find, Client_find_on_network_registered);
-    tcase_add_test(tc_register_find, Client_find_filter);
-    tcase_add_test(tc_register_find, Client_get_endpoints);
-    tcase_add_test(tc_register_find, Client_filter_locale);
-    tcase_add_test(tc_register_find, Server_unregister);
-    tcase_add_test(tc_register_find, Client_find_discovery);
-    tcase_add_test(tc_register_find, Client_filter_discovery);
+    tcase_add_test(tc_register_find, Server_registerFindServers);
     suite_add_tcase(s,tc_register_find);
 #endif
 
@@ -634,18 +683,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_unchecked_fixture(tc_register_timeout, setup_lds, teardown_lds);
     tcase_add_unchecked_fixture(tc_register_timeout, setup_register, teardown_register);
     tcase_set_timeout(tc_register_timeout, checkWait+2);
-    tcase_add_test(tc_register_timeout, Server_register);
-    tcase_add_test(tc_register_timeout, Client_find_registered);
-    tcase_add_test(tc_register_timeout, Util_wait_timeout);
-    tcase_add_test(tc_register_timeout, Client_find_discovery);
-#ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
-    // now check if semaphore file works
-    tcase_add_test(tc_register_timeout, Server_register_semaphore);
-    tcase_add_test(tc_register_timeout, Client_find_registered);
-    tcase_add_test(tc_register_timeout, Server_unregister_semaphore);
-    tcase_add_test(tc_register_timeout, Util_wait_timeout);
-    tcase_add_test(tc_register_timeout, Client_find_discovery);
-#endif
+    tcase_add_test(tc_register_timeout, Server_registerTimeout);
     suite_add_tcase(s,tc_register_timeout);
     return s;
 }
@@ -654,7 +692,7 @@ int main(void) {
     Suite *s = testSuite_Client();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
-    srunner_run_all(sr,CK_NORMAL);
+    srunner_run_all(sr, CK_NORMAL);
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;

From 4b0b70abc691d66e7681d31f003179810a00c971 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 3 Jul 2022 23:26:03 +0200
Subject: [PATCH 0296/1963] fix(el): Always use delayed socket shutdown; better
 error checking

---
 arch/eventloop_posix_tcp.c | 50 ++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 459c070c592..f831483a996 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -34,6 +34,9 @@ typedef struct {
                              * via the recv-bufsize parameter.*/
 } TCPConnectionManager;
 
+static void
+TCP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd);
+
 static UA_StatusCode
 TCPConnectionManager_register(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
@@ -167,6 +170,20 @@ TCP_delayedClose(void *application, void *context) {
      * mechanism. */
 }
 
+static int
+getSockError(UA_RegisteredFD *rfd) {
+    int error = 0;
+#ifndef _WIN32
+    socklen_t errlen = sizeof(int);
+    int err = getsockopt(rfd->fd, SOL_SOCKET, SO_ERROR, &error, &errlen);
+#else
+    int errlen = (int)sizeof(int);
+    int err = getsockopt((SOCKET)rfd->fd, SOL_SOCKET, SO_ERROR,
+                         (char*)&error, &errlen);
+#endif
+    return (err == 0) ? error : err;
+}
+
 /* Gets called when a connection socket opens, receives data or closes */
 static void
 TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
@@ -177,8 +194,29 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Activity on the socket", (unsigned)rfd->fd);
 
-    /* Write-Event, a new connection has opened.  */
+    /* Error. The connection has closed. */
+    if(event == UA_FDEVENT_ERR) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP %u\t| The connection closes with error %i",
+                    (unsigned)rfd->fd, getSockError(rfd));
+        TCP_shutdown(cm, rfd);
+        return;
+    }
+
+    /* Write-Event, a new connection has opened. But some errors come as an
+     * out-event. For example if the remote side could not be reached to
+     * initiate the connection. So we check manually for error conditions on
+     * the socket. */
     if(event == UA_FDEVENT_OUT) {
+        int error = getSockError(rfd);
+        if(error != 0) {
+            UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                        "TCP %u\t| The connection closes with error %i",
+                        (unsigned)rfd->fd, error);
+            TCP_shutdown(cm, rfd);
+            return;
+        }
+
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| Opening a new connection", (unsigned)rfd->fd);
 
@@ -215,15 +253,12 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
            UA_ERRNO == UA_AGAIN)
             return; /* Temporary error on an non-blocking socket */
 
-        /* Orderly shutdown of the socket. We can immediately close as no method
-         * "below" in the call stack will use the socket in this iteration of
-         * the EventLoop. */
+        /* Orderly shutdown of the socket */
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                         "TCP %u\t| recv signaled the socket was shutdown (%s)",
                         (unsigned)rfd->fd, errno_str));
-        TCP_close(tcm, rfd);
-        UA_free(rfd);
+        TCP_shutdown(cm, rfd);
         return;
     }
 
@@ -265,8 +300,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
                                (unsigned)rfd->fd, errno_str));
         }
 
-        TCP_close(tcm, rfd);
-        UA_free(rfd);
+        TCP_shutdown(cm, rfd);
         return;
     }
 

From afe24310288dddf726623f3b14cd645431428417 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 3 Jul 2022 23:28:10 +0200
Subject: [PATCH 0297/1963] fix(client): Abort the connection if sending HEL
 fails

---
 src/client/ua_client_connect.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 23b3ce89c76..6bd7c466de4 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *    Copyright 2017-2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2017-2022 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2017-2019 (c) Fraunhofer IOSB (Author: Mark Giraud)
  */
 
@@ -331,10 +331,11 @@ sendHELMessage(UA_Client *client) {
     message.length = messageHeader.messageSize;
     retval = conn->send(conn, &message);
     if(retval == UA_STATUSCODE_GOOD) {
+        UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT, "Sent HEL message");
         client->channel.state = UA_SECURECHANNELSTATE_HEL_SENT;
-        UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_NETWORK, "Sent HEL message");
     } else {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_NETWORK, "Sending HEL failed");
+        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT, "Sending HEL failed");
+        closeSecureChannel(client);
     }
     return retval;
 }

From 5a1a1f4e716dae7314f485bd00c2a4c4c32e10e9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 3 Jul 2022 23:29:49 +0200
Subject: [PATCH 0298/1963] refactor(client): Remove redundant logic during
 SecureChannel close

---
 src/client/ua_client_connect.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 6bd7c466de4..b7ecc7e881c 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1075,6 +1075,8 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         /* Opening the TCP connection failed. Cannot recover from this. */
         if(state != UA_STATUSCODE_GOOD) {
             client->connectStatus = state;
+            client->connection.state = UA_CONNECTIONSTATE_CLOSED;
+            closeSecureChannel(client);
             notifyClientState(client);
             return;
         }
@@ -1118,13 +1120,8 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                     UA_StatusCode_name(state));
 
         /* Close the SecureChannel */
-        UA_SecureChannel_close(&client->channel);
         closeSecureChannel(client);
 
-        /* Detach the connection and set to closed */
-        UA_Connection_detachSecureChannel(&client->connection);
-        client->connection.state = UA_CONNECTIONSTATE_CLOSED;
-
         /* Do not return here. We might want to reconnect. */
     }
 
@@ -1341,10 +1338,12 @@ closeSecureChannel(UA_Client *client) {
 
     /* Clean up */
     client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
-    UA_SecureChannel_close(&client->channel);
     if(client->connection.free)
         client->connection.free(&client->connection);
 
+    UA_SecureChannel_close(&client->channel);
+    client->connection.state = UA_CONNECTIONSTATE_CLOSED;
+
     /* Set the Session to "Created" if it was "Activated" */
     if(client->sessionState > UA_SESSIONSTATE_CREATED)
         client->sessionState = UA_SESSIONSTATE_CREATED;

From 6a17d179e686f8c1c46b25eff98ec955ac5b2efc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 21:10:30 +0200
Subject: [PATCH 0299/1963] feat(doc): Clarify that activateSession can be
 called multiple times

---
 include/open62541/plugin/accesscontrol.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/open62541/plugin/accesscontrol.h b/include/open62541/plugin/accesscontrol.h
index 455cd4fe4f6..0ddb0d4b956 100644
--- a/include/open62541/plugin/accesscontrol.h
+++ b/include/open62541/plugin/accesscontrol.h
@@ -39,7 +39,11 @@ struct UA_AccessControl {
     /* Authenticate a session. The session context is attached to the session
      * and later passed into the node-based access control callbacks. The new
      * session is rejected if a StatusCode other than UA_STATUSCODE_GOOD is
-     * returned. */
+     * returned.
+     *
+     * Note that this callback can be called several times for a Session. For
+     * example when a Session is recovered (activated) on a new
+     * SecureChannel. */
     UA_StatusCode (*activateSession)(UA_Server *server, UA_AccessControl *ac,
                                      const UA_EndpointDescription *endpointDescription,
                                      const UA_ByteString *secureChannelRemoteCertificate,

From 3f36bb903b9e367489722ef9e3b36be284d901ba Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 21:12:59 +0200
Subject: [PATCH 0300/1963] feat(doc): Add a TODO for the openConnection
 callback

---
 include/open62541/plugin/eventloop.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 083b8b4b401..8307528d836 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -280,6 +280,9 @@ struct UA_ConnectionManager {
      * The connection is opened asynchronously. The connection-callback is
      * triggered when the connection is fully opened (UA_STATUSCODE_GOOD) or has
      * failed (with an error code). */
+
+    /* TODO: Return the connection id right away. So an opening connection can
+     * be aborted before the first callback. */
     UA_StatusCode
     (*openConnection)(UA_ConnectionManager *cm,
                       size_t paramsSize, const UA_KeyValuePair *params,

From 4d63fd75b88ed193af0c53dce06c7174154fcd63 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 22:38:13 +0200
Subject: [PATCH 0301/1963] fix(el): Only allow sockets to be opened if the
 ConnectionManager is running

---
 arch/eventloop_posix_tcp.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index f831483a996..3ad4118d8aa 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -904,17 +904,26 @@ TCP_openConnection(UA_ConnectionManager *cm,
                    size_t paramsSize, const UA_KeyValuePair *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STARTED) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "TCP\t| Cannot open a connection for a "
+                     "ConnectionManager that is not started");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     /* If the "port"-parameter is defined, then try to open an active
      * connection. Otherwise try to open a socket that listens for incoming TCP
      * connections. */
-    const UA_Variant *val = UA_KeyValueMap_get(params, paramsSize,
-                                               UA_QUALIFIEDNAME(0, "port"));
-    if(val)
+    const UA_Variant *val =
+        UA_KeyValueMap_get(params, paramsSize, UA_QUALIFIEDNAME(0, "port"));
+    if(val) {
         return TCP_openActiveConnection(cm, paramsSize, params,
                                         application, context, connectionCallback);
-    else
+    } else {
         return TCP_openPassiveConnection(cm, paramsSize, params,
                                          application, context, connectionCallback);
+    }
 }
 
 static UA_StatusCode

From 4ddc7e34219140062f0cf73b346d9a349abdc329 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 22:39:44 +0200
Subject: [PATCH 0302/1963] feat(client): Orderly disconnect before deleting
 the client

---
 src/client/ua_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 053f0dc9038..91c0e79434f 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -129,6 +129,7 @@ UA_Client_clear(UA_Client *client) {
 
 void
 UA_Client_delete(UA_Client* client) {
+    UA_Client_disconnect(client);
     UA_Client_clear(client);
     UA_ClientConfig_clear(&client->config);
     UA_free(client);
@@ -452,7 +453,6 @@ __UA_Client_Service(UA_Client *client, const void *request,
 
     /* Return the status code */
     respHeader->serviceResult = retval;
-    return;
 }
 
 /***********************************/

From b9d7239322f3f708c7590dd33bb28f004ab4826b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 22:42:49 +0200
Subject: [PATCH 0303/1963] fix(client): Don't make reentrant use of the
 EventLoop

---
 src/client/ua_client_subscriptions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 3b38cd5391e..b35f8ac388f 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -1088,7 +1088,7 @@ UA_Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishRequ
     }
 
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID) {
-        UA_Client_disconnect(client); /* TODO: This should be handled before the process callback */
+        UA_Client_disconnectAsync(client); /* TODO: This should be handled before the process callback */
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Received BadSessionIdInvalid");
         return;

From b336d9bd0721dd69da89feef5df2d19317a63d8d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 22:43:52 +0200
Subject: [PATCH 0304/1963] fix(core): Fix an edge case for cleaning up a
 not-yet-initialized SecureChannel

---
 src/ua_securechannel.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index d6db9ffecf6..7fe461387a1 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -105,8 +105,12 @@ UA_SecureChannel_close(UA_SecureChannel *channel) {
 
     /* Detach from the connection and close the connection */
     if(channel->connection) {
-        if(channel->connection->state != UA_CONNECTIONSTATE_CLOSED)
-            channel->connection->close(channel->connection);
+        if(channel->connection->state != UA_CONNECTIONSTATE_CLOSED) {
+            if(channel->connection->close)
+                channel->connection->close(channel->connection);
+            else
+                channel->connection->state = UA_CONNECTIONSTATE_CLOSED;
+        }
         UA_Connection_detachSecureChannel(channel->connection);
     }
 

From 49d3b1a3abdc9980096540eb78b67d6923907ea2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 22:45:20 +0200
Subject: [PATCH 0305/1963] refactor(client): Attach the connection early to
 the SecureChannel

---
 src/client/ua_client_connect.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index b7ecc7e881c..9fe995c6299 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -950,9 +950,6 @@ iterateConnect(UA_Client *client) {
 
         /* ACK receieved. Send OPN. */
     case UA_SECURECHANNELSTATE_ACK_RECEIVED:
-        if(!client->channel.connection) /* Attach the connection to the SecureChannel */
-            UA_Connection_attachSecureChannel(&client->connection, &client->channel);
-        initSecurityPolicy(client); /* Initialize the SecurityPolicy */
         if(client->connectStatus == UA_STATUSCODE_GOOD)
             client->connectStatus = sendOPNAsync(client, false); /* Send OPN */
         return;
@@ -1171,6 +1168,10 @@ initConnect(UA_Client *client) {
     client->channel.certificateVerification = &client->config.certificateVerification;
     client->channel.processOPNHeader = verifyClientSecurechannelHeader;
 
+    /* Initialize the SecurityPolicy */
+    initSecurityPolicy(client);
+
+    /* Clean up if there is an old connection */
     if(client->connection.free)
         client->connection.free(&client->connection);
 
@@ -1226,6 +1227,9 @@ initConnect(UA_Client *client) {
     /* The TCP connection has started. All future interactions will be handled
      * through the network callback. */
     client->connection.state = UA_CONNECTIONSTATE_OPENING;
+
+    /* Attach the connection to the SecureChannel */
+    UA_Connection_attachSecureChannel(&client->connection, &client->channel);
 }
 
 UA_StatusCode

From 4bd6f4023ab59fa8ba1f17f5d82dd89636fc9995 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 22:46:15 +0200
Subject: [PATCH 0306/1963] fix(client): Prevent recursion of the client
 shutdown

---
 src/client/ua_client_connect.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 9fe995c6299..4192d842e3f 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1327,6 +1327,12 @@ UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl) {
 
 void
 closeSecureChannel(UA_Client *client) {
+    /* Prevent recursion */
+    if(client->channel.state == UA_SECURECHANNELSTATE_CLOSING ||
+       client->channel.state == UA_SECURECHANNELSTATE_CLOSED)
+        return;
+    client->channel.state = UA_SECURECHANNELSTATE_CLOSING;
+
     /* Send CLO if the SecureChannel is open */
     if(client->channel.state == UA_SECURECHANNELSTATE_OPEN) {
         UA_CloseSecureChannelRequest request;
@@ -1346,10 +1352,16 @@ closeSecureChannel(UA_Client *client) {
         client->connection.free(&client->connection);
 
     UA_SecureChannel_close(&client->channel);
-    client->connection.state = UA_CONNECTIONSTATE_CLOSED;
+
+    /* The connection is eventually closed in the next callback from the
+     * ConnectionManager with the appropriate status code. Don't set the
+     * connection closed right away!
+     *
+     * client->connection.state = UA_CONNECTIONSTATE_CLOSED;
+     */
 
     /* Set the Session to "Created" if it was "Activated" */
-    if(client->sessionState > UA_SESSIONSTATE_CREATED)
+    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
         client->sessionState = UA_SESSIONSTATE_CREATED;
 
     /* Delete outstanding async services - the RequestId is no longer valid. Do
@@ -1374,18 +1386,20 @@ sendCloseSession(UA_Client *client) {
     /* Set after sending the message to prevent immediate reoping during the
      * service call */
     client->sessionState = UA_SESSIONSTATE_CLOSING;
-
 }
 
 static void
 closeSession(UA_Client *client) {
+    if(client->sessionState == UA_SESSIONSTATE_CLOSED ||
+       client->sessionState == UA_SESSIONSTATE_CLOSING)
+        return;
+
     /* Is a session established? */
     if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
         sendCloseSession(client);
 
     UA_NodeId_clear(&client->authenticationToken);
     client->requestHandle = 0;
-    client->sessionState = UA_SESSIONSTATE_CLOSED;
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     /* We need to clean up the subscriptions */
@@ -1401,6 +1415,8 @@ closeSession(UA_Client *client) {
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     client->currentlyOutStandingPublishRequests = 0;
 #endif
+
+    client->sessionState = UA_SESSIONSTATE_CLOSED;
 }
 
 static void

From d0eea50b28ac399ca65460ff8ee8f072c494137b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 22:46:55 +0200
Subject: [PATCH 0307/1963] fix(client): Continue shutdown if sending
 CloseSession fails

---
 src/client/ua_client_connect.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 4192d842e3f..ac42cc45242 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1441,6 +1441,11 @@ UA_Client_disconnectAsync(UA_Client *client) {
         UA_Client_sendAsyncRequest(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
                                    (UA_ClientAsyncServiceCallback)closeSessionCallback,
                                    &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE], NULL, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        /* Sending the close request failed. Continue to close the connection anyway. */
+        closeSession(client);
+        closeSecureChannel(client);
+    }
     notifyClientState(client);
     return res;
 }

From 22e9ca3212a5aafeaa6bce403064f844383f6aad Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 22:47:38 +0200
Subject: [PATCH 0308/1963] fix(client): Loop the EventLoop for the synchronous
 client disconnect

---
 src/client/ua_client_connect.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index ac42cc45242..934c83c92be 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1453,6 +1453,20 @@ UA_Client_disconnectAsync(UA_Client *client) {
 UA_StatusCode
 UA_Client_disconnectSecureChannel(UA_Client *client) {
     closeSecureChannel(client);
+
+    /* Manually set the status to closed to prevent an automatic reconnection */
+    client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
+
+    /* Closing is async. Loop until the client has actually closed. */
+    UA_EventLoop *el = client->config.eventLoop;
+    if(el &&
+       el->state != UA_EVENTLOOPSTATE_FRESH &&
+       el->state != UA_EVENTLOOPSTATE_STOPPED) {
+        while(client->connection.state != UA_CONNECTIONSTATE_CLOSED) {
+            el->run(el, 100);
+        }
+    }
+
     notifyClientState(client);
     return UA_STATUSCODE_GOOD;
 }
@@ -1460,7 +1474,5 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
 UA_StatusCode
 UA_Client_disconnect(UA_Client *client) {
     closeSession(client);
-    closeSecureChannel(client);
-    notifyClientState(client);
-    return UA_STATUSCODE_GOOD;
+    return UA_Client_disconnectSecureChannel(client);
 }

From de9d691906547c9fc99e0a77198a80fe5bba54b1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Jul 2022 23:25:15 +0200
Subject: [PATCH 0309/1963] refactor(client): Refactor NetworkCallback to make
 the unit tests work

---
 src/client/ua_client.c                    |  12 +-
 src/client/ua_client_connect.c            |  45 ++---
 src/client/ua_client_internal.h           |   4 +-
 tests/client/check_client.c               |   2 +-
 tests/client/check_client_async_connect.c |  21 ++-
 tests/client/check_client_subscriptions.c | 191 +++++++++++++---------
 tests/server/check_discovery.c            |   1 -
 7 files changed, 169 insertions(+), 107 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 91c0e79434f..01cb3c3d311 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -486,8 +486,17 @@ UA_Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
 
 void
 UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode) {
+    /* Make this function reentrant. One of the async callbacks could indirectly
+     * operate on the list. Moving all elements to a local list before iterating
+     * that. */
+    UA_AsyncServiceList asyncServiceCalls = client->asyncServiceCalls;
+    LIST_INIT(&client->asyncServiceCalls);
+    if(asyncServiceCalls.lh_first)
+        asyncServiceCalls.lh_first->pointers.le_prev = &asyncServiceCalls.lh_first;
+
+    /* Cancel and remove the elements from the local list */
     AsyncServiceCall *ac, *ac_tmp;
-    LIST_FOREACH_SAFE(ac, &client->asyncServiceCalls, pointers, ac_tmp) {
+    LIST_FOREACH_SAFE(ac, &asyncServiceCalls, pointers, ac_tmp) {
         LIST_REMOVE(ac, pointers);
         UA_Client_AsyncService_cancel(client, ac, statusCode);
     }
@@ -504,7 +513,6 @@ UA_Client_modifyAsyncCallback(UA_Client *client, UA_UInt32 requestId,
             return UA_STATUSCODE_GOOD;
         }
     }
-
     return UA_STATUSCODE_BADNOTFOUND;
 }
 
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 934c83c92be..88cd979eb87 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1069,9 +1069,9 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     /* A new connection is opening */
     if(!*connectionContext) {
-        /* Opening the TCP connection failed. Cannot recover from this. */
+        /* Opening the connection failed */
         if(state != UA_STATUSCODE_GOOD) {
-            client->connectStatus = state;
+            client->connectStatus = state; /* The client cannot recover from this */
             client->connection.state = UA_CONNECTIONSTATE_CLOSED;
             closeSecureChannel(client);
             notifyClientState(client);
@@ -1092,34 +1092,37 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         conn->close = UA_Connection_close;
         conn->free = NULL;
 
-        /* Link the connection into the SecureChannel */
-        UA_Connection_attachSecureChannel(conn, &client->channel);
-
         *connectionContext = conn; /* Set the connection context */
         goto continue_connect;
     }
 
-    /* Received a message. Process the message with the SecureChannel. */
-    if(UA_LIKELY(state == UA_STATUSCODE_GOOD)) {
-        state = UA_SecureChannel_processBuffer(&client->channel, client,
-                                               processServiceResponse, &msg);
-        if(state != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                           "Processing the message returned the error code %s",
-                           UA_StatusCode_name(state));
-        }
-    }
-
-    /* Connection closed or error during the processing of the message */
+    /* A bad status code was sent from an open connection. The connection will
+     * be deleted now in the ConnectionManager. Clean up in the client. */
     if(state != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                    "Closing the SecureChannel with state %s",
+                    "The TCP connection closed with state %s",
                     UA_StatusCode_name(state));
+        client->connection.state = UA_CONNECTIONSTATE_CLOSED; /* Do this before
+                                                               * closeSecureChannel */
+        closeSecureChannel(client); /* The channel might be already closed. This
+                                     * is checked within closeSecureChannel. */
+        goto continue_connect; /* We may immediately reconnect */
+    }
 
-        /* Close the SecureChannel */
-        closeSecureChannel(client);
+    /* Received a message. Process the message with the SecureChannel. */
+    state = UA_SecureChannel_processBuffer(&client->channel, client,
+                                           processServiceResponse, &msg);
+    if(state != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Processing the message returned the error code %s",
+                       UA_StatusCode_name(state));
 
-        /* Do not return here. We might want to reconnect. */
+        /* Close the SecureChannel, but don't notify the client right away.
+         * Return immediately. notifyClientState will be called in the next
+         * callback from the ConnectionManager when the connection closes with a
+         * StatusCode. */
+        closeSecureChannel(client);
+        return;
     }
 
     /* Trigger the next action from our end to fully open up the connection */
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index b0101a3fd6c..0820642fdd9 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -107,6 +107,8 @@ typedef struct AsyncServiceCall {
                                 * indicate that the response was filled. */
 } AsyncServiceCall;
 
+typedef LIST_HEAD(UA_AsyncServiceList, AsyncServiceCall) UA_AsyncServiceList;
+
 void
 UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode);
 
@@ -157,7 +159,7 @@ struct UA_Client {
     UA_Boolean pendingConnectivityCheck;
 
     /* Async Service */
-    LIST_HEAD(, AsyncServiceCall) asyncServiceCalls;
+    UA_AsyncServiceList asyncServiceCalls;
 
     /* Subscriptions */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 77ac7e11970..c5b54578ecf 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -357,7 +357,7 @@ START_TEST(Client_activateSessionTimeout) {
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSESSIONCLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURECHANNELCLOSED);
 
     UA_Client_recvTesting_result = UA_STATUSCODE_GOOD;
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index 4e64684c15f..5bc38397873 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -104,7 +104,7 @@ static void
 abortSecureChannelConnect(UA_Client *client, UA_SecureChannelState channelState,
                           UA_SessionState sessionState, UA_StatusCode recoveryStatus) {
     if(channelState >= abortState)
-        UA_Client_disconnect(client);
+        UA_Client_disconnectAsync(client);
 }
 
 /* Abort the connection by calling disconnect */
@@ -125,7 +125,8 @@ START_TEST(Client_connect_async_abort) {
             UA_Server_run_iterate(server, false);
             UA_Client_run_iterate(client, 5);
             UA_Client_getState(client, &currentState, NULL, &retval);
-        } while(currentState != UA_SECURECHANNELSTATE_CLOSED);
+        } while(currentState != UA_SECURECHANNELSTATE_CLOSED &&
+                currentState != UA_SECURECHANNELSTATE_FRESH);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     }
 
@@ -142,17 +143,23 @@ START_TEST(Client_no_connection) {
     UA_StatusCode retval = UA_Client_connectAsync(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-    //simulating unconnected server
-    UA_Client_recvTesting_result = UA_STATUSCODE_BADCONNECTIONCLOSED;
+    /* Wait for the initial socket */
+    UA_EventLoop *el = client->config.eventLoop;
+    while(!client->connection.handle) {
+        el->run(el, 0);
+    }
+
+    /* Manually close the TCP connection */
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
+    cm->closeConnection(cm, (uintptr_t)client->connection.sockfd);
+
     UA_Server_run_iterate(server, false);
     retval = UA_Client_run_iterate(client, 1);  /* Open connection */
     UA_Server_run_iterate(server, false);
     retval |= UA_Client_run_iterate(client, 0); /* Send HEL */
     UA_Server_run_iterate(server, false);
     retval |= UA_Client_run_iterate(client, 0); /* Receive ACK */
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Client_disconnect(client);
     UA_Client_delete(client);
 }
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 3206a0ce88b..e6455a16e4c 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -43,10 +43,8 @@ static void setup(void) {
 }
 
 static void teardown(void) {
-    if (running) {
-        running = false;
-        THREAD_JOIN(server_thread);
-    }
+    running = false;
+    THREAD_JOIN(server_thread);
     UA_Server_run_shutdown(server);
     UA_Server_delete(server);
 }
@@ -203,10 +201,13 @@ START_TEST(Client_subscription_async) {
 
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Server_run_iterate(server, true);
-    UA_Client_run_iterate(client, 0);
+    response.responseHeader.serviceResult = 1;
+    do {
+        UA_Server_run_iterate(server, true);
+        retval = UA_Client_run_iterate(client, 1);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    } while(response.responseHeader.serviceResult == 1);
 
-    ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     UA_UInt32 subId = response.subscriptionId;
 
     UA_ModifySubscriptionRequest modifySubscriptionRequest;
@@ -217,19 +218,19 @@ START_TEST(Client_subscription_async) {
     modifySubscriptionRequest.requestedLifetimeCount = response.revisedLifetimeCount;
     modifySubscriptionRequest.requestedMaxKeepAliveCount =
         response.revisedMaxKeepAliveCount;
-    UA_ModifySubscriptionResponse modifySubscriptionResponse;
 
-    retval = UA_Client_Subscriptions_modify_async(
-        client, modifySubscriptionRequest, modifySubscriptionCallback,
-        &modifySubscriptionResponse, &requestId);
+    UA_ModifySubscriptionResponse modifySubscriptionResponse;
+    retval = UA_Client_Subscriptions_modify_async(client, modifySubscriptionRequest,
+                                                  modifySubscriptionCallback,
+                                                  &modifySubscriptionResponse, &requestId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     modifySubscriptionResponse.responseHeader.serviceResult = 1;
-    UA_Server_run_iterate(server, true);
-    retval = UA_Client_run_iterate(client, 1);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(modifySubscriptionResponse.responseHeader.serviceResult,
-                     UA_STATUSCODE_GOOD);
+    do {
+        UA_Server_run_iterate(server, true);
+        retval = UA_Client_run_iterate(client, 1);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    } while(modifySubscriptionResponse.responseHeader.serviceResult == 1);
 
     /* monitor the server state */
     UA_MonitoredItemCreateRequest singleMonRequest =
@@ -246,15 +247,17 @@ START_TEST(Client_subscription_async) {
     monRequest.itemsToCreateSize = 1;
     UA_CreateMonitoredItemsResponse monResponse;
     UA_CreateMonitoredItemsResponse_init(&monResponse);
-    retval = UA_Client_MonitoredItems_createDataChanges_async(
-        client, monRequest, &contexts, &notifications, &deleteCallbacks,
-        createDataChangesCallback, &monResponse, &requestId);
+    retval = UA_Client_MonitoredItems_createDataChanges_async(client, monRequest,
+                                                              &contexts, &notifications, &deleteCallbacks,
+                                                              createDataChangesCallback, &monResponse, &requestId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Server_run_iterate(server, true);
-    UA_Server_run_iterate(server, true);
-    retval = UA_Client_run_iterate(client, 0);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    monResponse.responseHeader.serviceResult = 1;
+    do {
+        UA_Server_run_iterate(server, true);
+        retval = UA_Client_run_iterate(client, 1);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    } while(monResponse.responseHeader.serviceResult == 1);
 
     ck_assert_uint_eq(monResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(monResponse.resultsSize, 1);
@@ -281,12 +284,13 @@ START_TEST(Client_subscription_async) {
                                                    deleteMonitoredItemsCallback,
                                                    &monDeleteResponse, &requestId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_Server_run_iterate(server, true);
-    retval = UA_Client_run_iterate(client, 1);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_Server_run_iterate(server, true);
-    retval = UA_Client_run_iterate(client, 1);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    monDeleteResponse.responseHeader.serviceResult = 1;
+    do {
+        UA_Server_run_iterate(server, true);
+        retval = UA_Client_run_iterate(client, 1);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    } while(monDeleteResponse.responseHeader.serviceResult == 1);
 
     ck_assert_uint_eq(monDeleteResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(monDeleteResponse.resultsSize, 1);
@@ -303,9 +307,12 @@ START_TEST(Client_subscription_async) {
                                                   &subDeleteResponse, &requestId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Server_run_iterate(server, true);
-    retval = UA_Client_run_iterate(client, 0);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    subDeleteResponse.responseHeader.serviceResult = 1;
+    do {
+        UA_Server_run_iterate(server, true);
+        retval = UA_Client_run_iterate(client, 1);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    } while(subDeleteResponse.responseHeader.serviceResult == 1);
 
     ck_assert_uint_eq(subDeleteResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(subDeleteResponse.resultsSize, 1);
@@ -654,11 +661,14 @@ START_TEST(Client_subscription_createDataChanges_async) {
                                                               createDataChangesCallback,
                                                               &createResponse, &reqId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_Server_run_iterate(server, true);
-    retval = UA_Client_run_iterate(client, 0);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    ck_assert_uint_eq(createResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    createResponse.responseHeader.serviceResult = 1;
+    do {
+        UA_Server_run_iterate(server, true);
+        retval = UA_Client_run_iterate(client, 1);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    } while(createResponse.responseHeader.serviceResult == 1);
+
     ck_assert_uint_eq(createResponse.resultsSize, 3);
     ck_assert_uint_eq(createResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
     newMonitoredItemIds[0] = createResponse.results[0].monitoredItemId;
@@ -701,8 +711,8 @@ START_TEST(Client_subscription_createDataChanges_async) {
     deleteRequest.monitoredItemIdsSize = 3;
 
     UA_DeleteMonitoredItemsResponse deleteResponse;
-    retval = UA_Client_MonitoredItems_delete_async(
-        client, deleteRequest, deleteMonitoredItemsCallback, &deleteResponse, &reqId);
+    retval = UA_Client_MonitoredItems_delete_async(client, deleteRequest,
+                                                   deleteMonitoredItemsCallback, &deleteResponse, &reqId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_realSleep(500);  // need to wait until response is at the client
     retval = UA_Client_run_iterate(client, 0);
@@ -915,6 +925,7 @@ START_TEST(Client_subscription_connectionClose) {
     THREAD_JOIN(server_thread);
 
     retval = UA_Client_run_iterate(client, 1);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Server_run_iterate(server, true);
 
     /* Send Publish requests */
@@ -923,6 +934,7 @@ START_TEST(Client_subscription_connectionClose) {
 
     /* Still receiving on the MonitoredItem */
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+
     UA_Server_run_iterate(server, true);
     countNotificationReceived = 0;
     retval = UA_Client_run_iterate(client, 1);
@@ -993,6 +1005,9 @@ START_TEST(Client_subscription_statusChange) {
     UA_Server_run_shutdown(server);
     UA_Client_disconnect(client);
     UA_Client_delete(client);
+
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
 }
 END_TEST
 
@@ -1234,6 +1249,39 @@ END_TEST
 
 static UA_SecureChannelState chanState;
 static UA_SessionState sessState;
+static UA_Boolean hasMon;
+
+static void
+monCallback(UA_Client *client, void *userdata,
+            UA_UInt32 requestId, void *r) {
+    hasMon = true;
+}
+
+static void
+createSubscriptionCallback2(UA_Client *client, void *userdata,
+                            UA_UInt32 requestId, void *r) {
+    UA_CreateSubscriptionResponse *rr = (UA_CreateSubscriptionResponse*)r;
+
+    ck_assert_uint_ne(rr->subscriptionId, 0);
+
+    /* Add a MonitoredItem */
+    UA_NodeId currentTime =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    UA_CreateMonitoredItemsRequest req;;
+    UA_CreateMonitoredItemsRequest_init(&req);
+    UA_MonitoredItemCreateRequest monRequest =
+        UA_MonitoredItemCreateRequest_default(currentTime);
+    req.itemsToCreate = &monRequest;
+    req.itemsToCreateSize = 1;
+    req.subscriptionId = rr->subscriptionId;
+    
+    UA_Client_DataChangeNotificationCallback callbacks[1] = {dataChangeHandler};
+    UA_StatusCode res =
+        UA_Client_MonitoredItems_createDataChanges_async(client, req,
+                                                         NULL, callbacks, NULL,
+                                                         monCallback, NULL, NULL);
+    ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+}
 
 static void
 stateCallback(UA_Client *client, UA_SecureChannelState channelState,
@@ -1248,26 +1296,11 @@ stateCallback(UA_Client *client, UA_SecureChannelState channelState,
         /* A new session was created. We need to create the subscription. */
         UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
         request.requestedMaxKeepAliveCount = 1;
-        UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
-                                                                                NULL, NULL, NULL);
-        ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
-        UA_UInt32 subId = response.subscriptionId;
-        ck_assert_uint_ne(subId, 0);
-
-        /* Add a MonitoredItem */
-        UA_NodeId currentTime =
-            UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
-        UA_MonitoredItemCreateRequest monRequest =
-            UA_MonitoredItemCreateRequest_default(currentTime);
-
-        UA_MonitoredItemCreateResult monResponse =
-            UA_Client_MonitoredItems_createDataChange(client, response.subscriptionId,
-                                                      UA_TIMESTAMPSTORETURN_BOTH,
-                                                      monRequest, NULL, dataChangeHandler, NULL);
-        ck_assert_uint_eq(monResponse.statusCode, UA_STATUSCODE_GOOD);
-        UA_UInt32 monId = monResponse.monitoredItemId;
-
-        ck_assert_uint_ne(monId, 0);
+        UA_StatusCode res =
+            UA_Client_Subscriptions_create_async(client, request, NULL, NULL, NULL,
+                                                 createSubscriptionCallback2, NULL, NULL);
+
+        ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
     }
 }
 
@@ -1293,6 +1326,7 @@ START_TEST(Client_subscription_async_sub) {
 
     ck_assert_uint_eq(chanState, UA_SECURECHANNELSTATE_FRESH);
 
+    hasMon = false;
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(sessState, UA_SESSIONSTATE_ACTIVATED);
@@ -1306,13 +1340,21 @@ START_TEST(Client_subscription_async_sub) {
     running = false;
     THREAD_JOIN(server_thread);
 
+    countNotificationReceived = 0;
+    notificationReceived = false;
+
+    while(!hasMon) {
+        UA_Client_run_iterate(client, 1);
+        UA_Server_run_iterate(server, true);
+    }
+
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
     UA_Server_run_iterate(server, true);
+    UA_Client_run_iterate(client, 1);
 
-    countNotificationReceived = 0;
-
-    notificationReceived = false;
+    UA_Server_run_iterate(server, true);
     UA_Client_run_iterate(client, 1);
+
     ck_assert_uint_eq(notificationReceived, true);
     ck_assert_uint_eq(countNotificationReceived, 1);
 
@@ -1348,16 +1390,10 @@ START_TEST(Client_subscription_async_sub) {
     ck_assert_uint_eq(notificationReceived, true);
     ck_assert_uint_eq(countNotificationReceived, 5);
 
-    ck_assert_uint_lt(client->config.outStandingPublishRequests, 10);
-
-    notificationReceived = false;
     /* Simulate network cable unplugged (no response from server) */
-    UA_Client_recvTesting_result = UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
-    UA_Client_run_iterate(client, (UA_UInt16)(publishingInterval + 1));
-    ck_assert_uint_eq(notificationReceived, false);
-    ck_assert_uint_eq(sessState, UA_SESSIONSTATE_ACTIVATED);
+    UA_fakeSleep((UA_UInt32)publishingInterval * 100);
 
-    /* Simulate network cable unplugged (no response from server) */
+    ck_assert_uint_lt(client->config.outStandingPublishRequests, 10);
     ck_assert_uint_eq(inactivityCallbackCalled, false);
     UA_Client_recvTesting_result = UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
     UA_Client_run_iterate(client, (UA_UInt16)cc->timeout);
@@ -1385,6 +1421,7 @@ START_TEST(Client_subscription_reconnect) {
     /* Activate background publish request */
     cc->outStandingPublishRequests = 10;
 
+    hasMon = false;
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(sessState, UA_SESSIONSTATE_ACTIVATED);
@@ -1398,6 +1435,11 @@ START_TEST(Client_subscription_reconnect) {
     running = false;
     THREAD_JOIN(server_thread);
 
+    while(!hasMon) {
+        UA_Server_run_iterate(server, true);
+        UA_Client_run_iterate(client, 1);
+    }
+
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
     UA_Server_run_iterate(server, true);
 
@@ -1422,13 +1464,14 @@ START_TEST(Client_subscription_reconnect) {
     running = false;
     THREAD_JOIN(server_thread);
 
-    UA_Client_run_iterate(client, 1);
+    notificationReceived = false;
 
-    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    while(!notificationReceived) {
+        UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+        UA_Client_run_iterate(client, 1);
+        UA_Server_run_iterate(server, true);
+    }
 
-    notificationReceived = false;
-    UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(notificationReceived, true);
     ck_assert_uint_eq(countNotificationReceived, 2);
 
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 67ff3054bec..a97cc0f1696 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -368,7 +368,6 @@ GetEndpoints(UA_Client *client, const UA_String* endpointUrl,
              const char* filterTransportProfileUri) {
     UA_GetEndpointsRequest request;
     UA_GetEndpointsRequest_init(&request);
-    //request.requestHeader.authenticationToken = client->authenticationToken;
     request.requestHeader.timestamp = UA_DateTime_now();
     request.requestHeader.timeoutHint = 10000;
     request.endpointUrl = *endpointUrl; // assume the endpointurl outlives the service call

From f0b7e0f69ce13225ae7b185ad7e26c0898c5a8de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Jul 2022 11:22:49 +0000
Subject: [PATCH 0310/1963] build(deps): bump deps/ua-nodeset from `b3a5c02` to
 `286f0f4`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `b3a5c02` to `286f0f4`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/b3a5c02e1417da0b3805da15bf3a5ba90d843098...286f0f44ab6b71c6cea18c6228c716c9fdd84375)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index b3a5c02e141..286f0f44ab6 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit b3a5c02e1417da0b3805da15bf3a5ba90d843098
+Subproject commit 286f0f44ab6b71c6cea18c6228c716c9fdd84375

From 609edd5442582358a4cb9a050f3861657a719662 Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Tue, 5 Jul 2022 12:49:30 +0200
Subject: [PATCH 0311/1963] fix(server): Multithreading fixes in refresh and
 refresh2

---
 .../ua_subscription_alarms_conditions.c       | 38 +++++++++++++++----
 src/server/ua_subscription_events_filter.c    |  5 ++-
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index db2948aa0ef..9f868251547 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -1491,6 +1491,7 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
 static UA_StatusCode
 setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_QualifiedName fieldSeverity = UA_QUALIFIEDNAME(0, CONDITION_FIELD_SEVERITY);
     UA_QualifiedName fieldSourceName = UA_QUALIFIEDNAME(0, CONDITION_FIELD_SOURCENAME);
     UA_QualifiedName fieldReceiveTime = UA_QUALIFIEDNAME(0, CONDITION_FIELD_RECEIVETIME);
@@ -1502,19 +1503,25 @@ setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodI
 
     /* Set Severity */
     UA_Variant_setScalar(&value, &severityValue, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_UNLOCK(&server->serviceMutex);
     UA_StatusCode retval = UA_Server_setConditionField(server, *refreshEventNodId, &value,
                                                        fieldSeverity);
+    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent Severity failed",);
 
     /* Set SourceName */
     UA_Variant_setScalar(&value, &sourceNameString, &UA_TYPES[UA_TYPES_STRING]);
+    UA_UNLOCK(&server->serviceMutex);
     retval = UA_Server_setConditionField(server, *refreshEventNodId, &value, fieldSourceName);
+    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent Source failed",);
 
     /* Set ReceiveTime */
     UA_DateTime fieldReceiveTimeValue = UA_DateTime_now();
     UA_Variant_setScalar(&value, &fieldReceiveTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
+    UA_UNLOCK(&server->serviceMutex);
     retval = UA_Server_setConditionField(server, *refreshEventNodId, &value, fieldReceiveTime);
+    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent ReceiveTime failed",);
 
     /* Set EventId */
@@ -1522,7 +1529,9 @@ setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodI
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Generating EventId failed",);
 
     UA_Variant_setScalar(&value, &eventId, &UA_TYPES[UA_TYPES_BYTESTRING]);
+    UA_UNLOCK(&server->serviceMutex);
     retval = UA_Server_setConditionField(server, *refreshEventNodId, &value, fieldEventId);
+    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent EventId failed",);
 
     UA_ByteString_clear(&eventId);
@@ -1576,13 +1585,16 @@ isConditionSourceInMonitoredItem(UA_Server *server, const UA_MonitoredItem *moni
 static UA_StatusCode
 refreshLogic(UA_Server *server, const UA_NodeId *refreshStartNodId,
              const UA_NodeId *refreshEndNodId, UA_MonitoredItem *monitoredItem) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_assert(monitoredItem != NULL);
 
     /* 1. Trigger RefreshStartEvent */
     UA_DateTime fieldTimeValue = UA_DateTime_now();
+    UA_UNLOCK(&server->serviceMutex);
     UA_StatusCode retval =
         UA_Server_writeObjectProperty_scalar(server, *refreshStartNodId, fieldTimeQN,
                                              &fieldTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
+    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Write Object Property scalar failed",);
 
     retval = UA_Event_addEventToMonitoredItem(server, refreshStartNodId, monitoredItem);
@@ -1632,8 +1644,10 @@ refreshLogic(UA_Server *server, const UA_NodeId *refreshStartNodId,
 
     /* 3. Trigger RefreshEndEvent */
     fieldTimeValue = UA_DateTime_now();
+    UA_UNLOCK(&server->serviceMutex);
     retval = UA_Server_writeObjectProperty_scalar(server, *refreshEndNodId, fieldTimeQN,
                                                   &fieldTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
+    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Write Object Property scalar failed",);
     return UA_Event_addEventToMonitoredItem(server, refreshEndNodId, monitoredItem);
 }
@@ -1645,31 +1659,37 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
+    UA_LOCK(&server->serviceMutex);
     //TODO implement logic for subscription array
     /* Check if valid subscriptionId */
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
     UA_Subscription *subscription =
         UA_Session_getSubscriptionById(session, *((UA_UInt32 *)input[0].data));
-    if(!subscription)
+    if(!subscription) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
+    }
 
     /* set RefreshStartEvent and RefreshEndEvent */
     UA_StatusCode retval = setRefreshMethodEvents(server,
                                                   &refreshEvents[REFRESHEVENT_START_IDX],
                                                   &refreshEvents[REFRESHEVENT_END_IDX]);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",UA_UNLOCK(&server->serviceMutex););
 
     /* Trigger RefreshStartEvent and RefreshEndEvent for the each monitoredItem
      * in the subscription */
     UA_MonitoredItem *monitoredItem =
         UA_Subscription_getMonitoredItem(subscription, *((UA_UInt32 *)input[1].data));
-    if(!monitoredItem)
+    if(!monitoredItem) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADMONITOREDITEMIDINVALID;
+    }
 
     //TODO when there are a lot of monitoreditems (not only events)?
     retval = refreshLogic(server, &refreshEvents[REFRESHEVENT_START_IDX],
                           &refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",UA_UNLOCK(&server->serviceMutex););
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1680,19 +1700,22 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
+    UA_LOCK(&server->serviceMutex);
     //TODO implement logic for subscription array
     /* Check if valid subscriptionId */
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
     UA_Subscription *subscription =
         UA_Session_getSubscriptionById(session, *((UA_UInt32 *)input[0].data));
-    if(!subscription)
+    if(!subscription) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
+    }
 
     /* set RefreshStartEvent and RefreshEndEvent */
     UA_StatusCode retval =
         setRefreshMethodEvents(server, &refreshEvents[REFRESHEVENT_START_IDX],
                                &refreshEvents[REFRESHEVENT_END_IDX]);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",UA_UNLOCK(&server->serviceMutex););
 
     /* Trigger RefreshStartEvent and RefreshEndEvent for the each monitoredItem
      * in the subscription */
@@ -1701,8 +1724,9 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     LIST_FOREACH(monitoredItem, &subscription->monitoredItems, listEntry) {
         retval = refreshLogic(server, &refreshEvents[REFRESHEVENT_START_IDX],
                               &refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
-        CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",);
+        CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",UA_UNLOCK(&server->serviceMutex););
     }
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 8a9bde08b17..8cd31627516 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -881,6 +881,7 @@ UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *sessio
                                            const UA_NodeId *eventNode,
                                            const UA_ContentFilter *contentFilter,
                                            UA_ContentFilterResult *contentFilterResult) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(contentFilter->elementsSize == 0)
         return UA_STATUSCODE_GOOD;
     /* TODO add maximum lenth size to the server config */
@@ -899,7 +900,6 @@ UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *sessio
     ctx.contentFilterResult = contentFilterResult;
     ctx.valueResult = valueResult;
     ctx.index = 0;
-
     UA_StatusCode res = evaluateWhereClauseContentFilter(&ctx);
     for(size_t i = 0; i < ctx.contentFilter->elementsSize; i++) {
         if(!UA_Variant_isEmpty(&ctx.valueResult[i]))
@@ -911,6 +911,7 @@ UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *sessio
 static UA_Boolean
 isValidEvent(UA_Server *server, const UA_NodeId *validEventParent,
              const UA_NodeId *eventId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     /* find the eventType variableNode */
     UA_QualifiedName findName = UA_QUALIFIEDNAME(0, "EventType");
     UA_BrowsePathResult bpr = browseSimplifiedBrowsePath(server, *eventId, 1, &findName);
@@ -922,7 +923,6 @@ isValidEvent(UA_Server *server, const UA_NodeId *validEventParent,
     /* Get the EventType Property Node */
     UA_Variant tOutVariant;
     UA_Variant_init(&tOutVariant);
-
     /* Read the Value of EventType Property Node (the Value should be a NodeId) */
     UA_StatusCode retval = readWithReadValue(server, &bpr.targets[0].targetId.nodeId,
                                              UA_ATTRIBUTEID_VALUE, &tOutVariant);
@@ -962,6 +962,7 @@ UA_StatusCode
 filterEvent(UA_Server *server, UA_Session *session,
             const UA_NodeId *eventNode, UA_EventFilter *filter,
             UA_EventFieldList *efl, UA_EventFilterResult *result) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(filter->selectClausesSize == 0)
         return UA_STATUSCODE_BADEVENTFILTERINVALID;
 

From cacab28fec7d7d143619e8fcc044d5d1866b9026 Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Thu, 7 Jul 2022 10:43:40 +0200
Subject: [PATCH 0312/1963] feat(server): Add writeObjectProperty and
 setConditionField

---
 include/open62541/server.h                    |  4 +-
 src/server/ua_server_internal.h               |  6 +++
 src/server/ua_services_attribute.c            | 14 ++++--
 .../ua_subscription_alarms_conditions.c       | 50 ++++++++++---------
 4 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 116fc8de272..dec5fa2a476 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -11,7 +11,7 @@
  *    Copyright 2017 (c) Henrik Norrman
  *    Copyright 2018 (c) Fabian Arndt, Root-Core
  *    Copyright 2017-2020 (c) HMS Industrial Networks AB (Author: Jonas Green)
- *    Copyright 2020-2021 (c) Christian von Arnim, ISW University of Stuttgart  (for VDW and umati)
+ *    Copyright 2020-2022 (c) Christian von Arnim, ISW University of Stuttgart  (for VDW and umati)
  */
 
 #ifndef UA_SERVER_H_
@@ -1637,7 +1637,7 @@ UA_Server_addCondition_finish(UA_Server *server,
  * @param value Variant Value to be written to the Field
  * @param fieldName Name of the Field in which the value should be written
  * @return The StatusCode of the UA_Server_setConditionField method*/
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_setConditionField(UA_Server *server,
                             const UA_NodeId condition,
                             const UA_Variant *value,
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index a4988c529b1..811e74a8983 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -13,6 +13,7 @@
  *    Copyright 2019 (c) Kalycito Infotech Private Limited
  *    Copyright 2019 (c) HMS Industrial Networks AB (Author: Jonas Green)
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
+ *    Copyright 2022 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
  */
 
 #ifndef UA_SERVER_INTERNAL_H_
@@ -447,6 +448,11 @@ UA_StatusCode
 writeObjectProperty(UA_Server *server, const UA_NodeId objectId,
                     const UA_QualifiedName propertyName, const UA_Variant value);
 
+UA_StatusCode
+writeObjectProperty_scalar(UA_Server *server, const UA_NodeId objectId,
+                                     const UA_QualifiedName propertyName,
+                                     const void *value, const UA_DataType *type);
+
 UA_StatusCode
 getNodeContext(UA_Server *server, UA_NodeId nodeId, void **nodeContext);
 
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 81e7a831206..38f7fc824ea 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -2098,15 +2098,23 @@ writeObjectProperty(UA_Server *server, const UA_NodeId objectId,
     return retval;
 }
 
-UA_StatusCode UA_EXPORT
-UA_Server_writeObjectProperty_scalar(UA_Server *server, const UA_NodeId objectId,
+UA_StatusCode
+writeObjectProperty_scalar(UA_Server *server, const UA_NodeId objectId,
                                      const UA_QualifiedName propertyName,
                                      const void *value, const UA_DataType *type) {
     UA_Variant var;
     UA_Variant_init(&var);
     UA_Variant_setScalar(&var, (void*)(uintptr_t)value, type);
+    return writeObjectProperty(server, objectId, propertyName, var);
+}
+
+UA_StatusCode UA_EXPORT
+UA_Server_writeObjectProperty_scalar(UA_Server *server, const UA_NodeId objectId,
+                                     const UA_QualifiedName propertyName,
+                                     const void *value, const UA_DataType *type) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode retval = writeObjectProperty(server, objectId, propertyName, var);
+    UA_StatusCode retval = 
+        writeObjectProperty_scalar(server, objectId, propertyName, value, type);
     UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 9f868251547..670fd74b013 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2018 (c) Hilscher Gesellschaft für Systemautomation mbH (Author: Sameer AL-Qadasi)
- *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
+ *    Copyright 2020-2022 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
  */
 
 #include "ua_server_internal.h"
@@ -170,6 +170,10 @@ static const UA_QualifiedName fieldSourceQN = STATIC_QN(CONDITION_FIELD_SOURCENO
         }                                                                                 \
     }
 
+static UA_StatusCode
+setConditionField(UA_Server *server, const UA_NodeId condition,
+                            const UA_Variant* value, const UA_QualifiedName fieldName);
+
 /*****************************************************************************/
 /* Global Variables                                                          */
 /*****************************************************************************/
@@ -1503,25 +1507,19 @@ setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodI
 
     /* Set Severity */
     UA_Variant_setScalar(&value, &severityValue, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_UNLOCK(&server->serviceMutex);
-    UA_StatusCode retval = UA_Server_setConditionField(server, *refreshEventNodId, &value,
+    UA_StatusCode retval = setConditionField(server, *refreshEventNodId, &value,
                                                        fieldSeverity);
-    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent Severity failed",);
 
     /* Set SourceName */
     UA_Variant_setScalar(&value, &sourceNameString, &UA_TYPES[UA_TYPES_STRING]);
-    UA_UNLOCK(&server->serviceMutex);
-    retval = UA_Server_setConditionField(server, *refreshEventNodId, &value, fieldSourceName);
-    UA_LOCK(&server->serviceMutex);
+    retval = setConditionField(server, *refreshEventNodId, &value, fieldSourceName);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent Source failed",);
 
     /* Set ReceiveTime */
     UA_DateTime fieldReceiveTimeValue = UA_DateTime_now();
     UA_Variant_setScalar(&value, &fieldReceiveTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
-    UA_UNLOCK(&server->serviceMutex);
-    retval = UA_Server_setConditionField(server, *refreshEventNodId, &value, fieldReceiveTime);
-    UA_LOCK(&server->serviceMutex);
+    retval = setConditionField(server, *refreshEventNodId, &value, fieldReceiveTime);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent ReceiveTime failed",);
 
     /* Set EventId */
@@ -1529,9 +1527,7 @@ setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodI
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Generating EventId failed",);
 
     UA_Variant_setScalar(&value, &eventId, &UA_TYPES[UA_TYPES_BYTESTRING]);
-    UA_UNLOCK(&server->serviceMutex);
-    retval = UA_Server_setConditionField(server, *refreshEventNodId, &value, fieldEventId);
-    UA_LOCK(&server->serviceMutex);
+    retval = setConditionField(server, *refreshEventNodId, &value, fieldEventId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent EventId failed",);
 
     UA_ByteString_clear(&eventId);
@@ -1590,11 +1586,9 @@ refreshLogic(UA_Server *server, const UA_NodeId *refreshStartNodId,
 
     /* 1. Trigger RefreshStartEvent */
     UA_DateTime fieldTimeValue = UA_DateTime_now();
-    UA_UNLOCK(&server->serviceMutex);
     UA_StatusCode retval =
-        UA_Server_writeObjectProperty_scalar(server, *refreshStartNodId, fieldTimeQN,
+        writeObjectProperty_scalar(server, *refreshStartNodId, fieldTimeQN,
                                              &fieldTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
-    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Write Object Property scalar failed",);
 
     retval = UA_Event_addEventToMonitoredItem(server, refreshStartNodId, monitoredItem);
@@ -1644,10 +1638,8 @@ refreshLogic(UA_Server *server, const UA_NodeId *refreshStartNodId,
 
     /* 3. Trigger RefreshEndEvent */
     fieldTimeValue = UA_DateTime_now();
-    UA_UNLOCK(&server->serviceMutex);
-    retval = UA_Server_writeObjectProperty_scalar(server, *refreshEndNodId, fieldTimeQN,
+    retval = writeObjectProperty_scalar(server, *refreshEndNodId, fieldTimeQN,
                                                   &fieldTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
-    UA_LOCK(&server->serviceMutex);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Write Object Property scalar failed",);
     return UA_Event_addEventToMonitoredItem(server, refreshEndNodId, monitoredItem);
 }
@@ -2518,25 +2510,37 @@ UA_Server_addConditionOptionalField(UA_Server *server, const UA_NodeId condition
 }
 
 /* Set the value of condition field (only scalar). */
-UA_StatusCode
-UA_Server_setConditionField(UA_Server *server, const UA_NodeId condition,
+static UA_StatusCode
+setConditionField(UA_Server *server, const UA_NodeId condition,
                             const UA_Variant* value, const UA_QualifiedName fieldName) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(value->arrayLength != 0 || value->data <= UA_EMPTY_ARRAY_SENTINEL) {
       //TODO implement logic for array variants!
       CONDITION_ASSERT_RETURN_RETVAL(UA_STATUSCODE_BADNOTIMPLEMENTED,
                                      "Set Condition Field with Array value not implemented",);
     }
 
-    UA_BrowsePathResult bpr = UA_Server_browseSimplifiedBrowsePath(server, condition, 1, &fieldName);
+    UA_BrowsePathResult bpr = browseSimplifiedBrowsePath(server, condition, 1, &fieldName);
     if(bpr.statusCode != UA_STATUSCODE_GOOD)
         return bpr.statusCode;
 
-    UA_StatusCode retval = UA_Server_writeValue(server, bpr.targets[0].targetId.nodeId, *value);
+    UA_StatusCode retval = writeValueAttribute(server, &server->adminSession, &bpr.targets[0].targetId.nodeId, value);
     UA_BrowsePathResult_clear(&bpr);
 
     return retval;
 }
 
+/* Set the value of condition field (only scalar). */
+UA_StatusCode
+UA_Server_setConditionField(UA_Server *server, const UA_NodeId condition,
+                            const UA_Variant* value, const UA_QualifiedName fieldName) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode retval = setConditionField(server, condition, value, fieldName);
+    UA_UNLOCK(&server->serviceMutex);
+    return retval;
+}
+
+
 /* Set the value of property of condition field. */
 UA_StatusCode
 UA_Server_setConditionVariableFieldProperty(UA_Server *server, const UA_NodeId condition,

From dfa88dc70d65eed3a613b3d15e3e191cec9a72d4 Mon Sep 17 00:00:00 2001
From: Jan Mikolic <mikolicjan@gmail.com>
Date: Tue, 12 Jul 2022 19:38:09 +0200
Subject: [PATCH 0313/1963] fix(buildAdd architecture compile flags to
 open62541-plugins and open62541-object (#5250)

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af36586b9de..aec9cf80294 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1546,6 +1546,11 @@ GET_PROPERTY(ua_architecture_append_to_library GLOBAL PROPERTY UA_ARCHITECTURE_A
 list(APPEND open62541_LIBRARIES ${ua_architecture_append_to_library})
 
 target_compile_definitions(open62541 PUBLIC UA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
+target_compile_definitions(open62541-object PUBLIC UA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
+
+if(NOT UA_ENABLE_AMALGAMATION)
+    target_compile_definitions(open62541-plugins PUBLIC UA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
+endif()
 
 # DLL requires linking to dependencies
 target_link_libraries(open62541 ${open62541_LIBRARIES})

From cfeeeedf423e7d4cbab00162f34561b7a2c54cb0 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas_fischer@siemens.com>
Date: Tue, 12 Jul 2022 22:48:14 +0200
Subject: [PATCH 0314/1963] feat(pubsub): add StandaloneSubscribedDataSet
 implementation

Co-authored-by: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
---
 examples/CMakeLists.txt                       |   1 +
 .../pubsub_subscribe_standalone_dataset.c     | 237 +++++++++
 include/open62541/server_pubsub.h             |  27 +-
 src/pubsub/ua_pubsub.h                        |  18 +
 src/pubsub/ua_pubsub_manager.c                |  89 +++-
 src/pubsub/ua_pubsub_manager.h                |   3 +
 src/pubsub/ua_pubsub_ns0.c                    | 206 +++++++-
 src/pubsub/ua_pubsub_ns0.h                    |  10 +
 src/pubsub/ua_pubsub_reader.c                 | 125 ++++-
 tests/pubsub/check_pubsub_subscribe.c         |  85 ++-
 tools/schema/NodeIds.csv                      |  33 ++
 .../schema/Opc.Ua.NodeSet2.PubSubMinimal.xml  | 497 ++++++++++++++++++
 12 files changed, 1321 insertions(+), 10 deletions(-)
 create mode 100644 examples/pubsub/pubsub_subscribe_standalone_dataset.c

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 083f039e6aa..141d0a3c1cb 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -213,6 +213,7 @@ if(UA_ENABLE_PUBSUB)
     add_example(server_pubsub_publish_rt_level pubsub/server_pubsub_publisher_rt_level.c)
     add_example(server_pubsub_publish_rt_level_raw pubsub/server_pubsub_publisher_rt_level_raw.c)
     add_example(server_pubsub_rt_information_model pubsub/server_pubsub_rt_field_information_model.c)
+    add_example(pubsub_subscribe_standalone_dataset pubsub/pubsub_subscribe_standalone_dataset.c)
     if(CMAKE_SYSTEM MATCHES "Linux")
         if(UA_ENABLE_PUBSUB_ETH_UADP AND UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_IMMUTABLE_NODES)
             add_example(rt_publisher pubsub_realtime/pubsub_interrupt_publish.c)
diff --git a/examples/pubsub/pubsub_subscribe_standalone_dataset.c b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
new file mode 100644
index 00000000000..6a9e021b89c
--- /dev/null
+++ b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
@@ -0,0 +1,237 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
+
+/**
+ * With the OPC UA Part 14 1.0.5, the concept of StandaloneSubscribedDataSet (SSDS) was
+ * introduced. The SSDS is the counterpart to the PublishedDataSet and has its own
+ * lifecycle. The SSDS can be connected to exactly one DataSetReader. In general,
+ * the SSDS is optional and DSR's can still be defined without referencing a SSDS.
+ * This example shows, how to configure a SSDS.
+ */
+
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include "ua_pubsub.h"
+
+#ifdef UA_ENABLE_PUBSUB_ETH_UADP
+#include <open62541/plugin/pubsub_ethernet.h>
+#endif
+
+
+#include <signal.h>
+
+UA_NodeId connectionIdentifier;
+UA_NodeId readerGroupIdentifier;
+UA_NodeId readerIdentifier;
+
+UA_DataSetReaderConfig readerConfig;
+
+static void
+addTargetVariable(UA_Server *server) {
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    UA_Int32 myInteger = 42;
+    UA_Variant_setScalar(&attr.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
+    attr.description = UA_LOCALIZEDTEXT("en-US", "subscribedTargetVar");
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "subscribedTargetVar");
+    attr.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
+
+    /* Add the variable node to the information model */
+    UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "demoVar");
+    UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "subscribedTargetVar");
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_Server_addVariableNode(
+        server, myIntegerNodeId, parentNodeId, parentReferenceNodeId, myIntegerName,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, NULL);
+}
+
+static void
+addStandaloneSubscribedDataSet(UA_Server *server) {
+    UA_StandaloneSubscribedDataSetConfig cfg;
+    UA_NodeId ret;
+    memset(&cfg, 0, sizeof(UA_StandaloneSubscribedDataSetConfig));
+
+    /* Fill the SSDS MetaData */
+    UA_DataSetMetaDataType_init(&cfg.dataSetMetaData);
+    cfg.dataSetMetaData.name = UA_STRING("DemoStandaloneSDS");
+    cfg.dataSetMetaData.fieldsSize = 1;
+    UA_FieldMetaData fieldMetaData;
+    cfg.dataSetMetaData.fields = &fieldMetaData;
+
+    /* DateTime DataType */
+    UA_FieldMetaData_init(&cfg.dataSetMetaData.fields[0]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT32].typeId, &cfg.dataSetMetaData.fields[0].dataType);
+    cfg.dataSetMetaData.fields[0].builtInType = UA_NS0ID_INT32;
+    cfg.dataSetMetaData.fields[0].name = UA_STRING("subscribedTargetVar");
+    cfg.dataSetMetaData.fields[0].valueRank = -1; /* scalar */
+
+    cfg.name = UA_STRING("DemoStandaloneSDS");
+    cfg.isConnected = UA_FALSE;
+    cfg.subscribedDataSet.target.targetVariablesSize = 1;
+    UA_FieldTargetDataType fieldTargetDataType;
+    cfg.subscribedDataSet.target.targetVariables = &fieldTargetDataType;
+
+    UA_FieldTargetDataType_init(&cfg.subscribedDataSet.target.targetVariables[0]);
+    cfg.subscribedDataSet.target.targetVariables[0].attributeId = UA_ATTRIBUTEID_VALUE;
+    cfg.subscribedDataSet.target.targetVariables[0].targetNodeId =
+        UA_NODEID_STRING(1, "demoVar");
+
+    UA_Server_addStandaloneSubscribedDataSet(server, &cfg, &ret);
+}
+
+/* Add new connection to the server */
+static UA_StatusCode
+addPubSubConnection(UA_Server *server, UA_String *transportProfile,
+                    UA_NetworkAddressUrlDataType *networkAddressUrl) {
+    if((server == NULL) || (transportProfile == NULL) || (networkAddressUrl == NULL)) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    /* Configuration creation for the connection */
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("UDPMC Connection 1");
+    connectionConfig.transportProfileUri = *transportProfile;
+    connectionConfig.enabled = UA_TRUE;
+    UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
+    retval |=
+        UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
+    if(retval != UA_STATUSCODE_GOOD) {
+        return retval;
+    }
+    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier);
+    return retval;
+}
+
+/* Add ReaderGroup to the created connection */
+static UA_StatusCode
+addReaderGroup(UA_Server *server) {
+    if(server == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING("ReaderGroup1");
+    retval |= UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
+                                       &readerGroupIdentifier);
+    UA_Server_setReaderGroupOperational(server, readerGroupIdentifier);
+    return retval;
+}
+
+/* Add DataSetReader to the ReaderGroup */
+static UA_StatusCode
+addDataSetReader(UA_Server *server) {
+    if(server == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    memset(&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
+    readerConfig.name = UA_STRING("DataSet Reader 1");
+    /* Parameters to filter which DataSetMessage has to be processed
+     * by the DataSetReader */
+    /* The following parameters are used to show that the data published by
+     * tutorial_pubsub_publish.c is being subscribed and is being updated in
+     * the information model */
+    UA_UInt16 publisherIdentifier = 2234;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId = 100;
+    readerConfig.dataSetWriterId = 62541;
+    readerConfig.linkedStandaloneSubscribedDataSetName = UA_STRING("DemoStandaloneSDS");
+
+    /* DataSetMetaData already contained in Standalone SDS no need to set up */
+    retval |= UA_Server_addDataSetReader(server, readerGroupIdentifier, &readerConfig,
+                                         &readerIdentifier);
+
+    readerConfig.publisherId.data = NULL;
+
+    return retval;
+}
+
+UA_Boolean running = true;
+static void
+stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+static int
+run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+    /* Return value initialized to Status Good */
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+
+    /* Details about the connection configuration and handling are located in
+     * the pubsub connection tutorial */
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    #ifdef UA_ENABLE_PUBSUB_ETH_UADP
+        UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
+    #endif
+
+    addTargetVariable(server);
+    addStandaloneSubscribedDataSet(server);
+
+    /* Add PubSub configuration */
+    addPubSubConnection(server, transportProfile, networkAddressUrl);
+
+    /* Add ReaderGroup to the created PubSubConnection */
+    retval |= addReaderGroup(server);
+
+    /* Add DataSetReader to the created ReaderGroup */
+    retval |= addDataSetReader(server);
+
+    retval |= UA_Server_run(server, &running);
+
+    UA_Server_delete(server);
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+static void
+usage(char *progname) {
+    printf("usage: %s <uri> [device]\n", progname);
+}
+
+int
+main(int argc, char **argv) {
+    UA_String transportProfile =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {
+        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    if(argc > 1) {
+        if(strcmp(argv[1], "-h") == 0) {
+            usage(argv[0]);
+            return EXIT_SUCCESS;
+        } else if(strncmp(argv[1], "opc.udp://", 10) == 0) {
+            networkAddressUrl.url = UA_STRING(argv[1]);
+        } else if(strncmp(argv[1], "opc.eth://", 10) == 0) {
+            transportProfile = UA_STRING(
+                "http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
+            if(argc < 3) {
+                printf("Error: UADP/ETH needs an interface name\n");
+                return EXIT_FAILURE;
+            }
+
+            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+            networkAddressUrl.url = UA_STRING(argv[1]);
+        } else {
+            printf("Error: unknown URI\n");
+            return EXIT_FAILURE;
+        }
+    }
+
+    return run(&transportProfile, &networkAddressUrl);
+}
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index fd55b10f693..75c8efb78f7 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -2,9 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright (c) 2017-2022 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
+ * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  */
 
 #ifndef UA_SERVER_PUBSUB_H
@@ -726,6 +727,7 @@ typedef struct {
         // UA_SubscribedDataSetMirrorDataType subscribedDataSetMirror;
     } subscribedDataSet;
     /* non std. fields */
+    UA_String linkedStandaloneSubscribedDataSetName;
     UA_PubSubRtEncoding expectedEncoding;
 } UA_DataSetReaderConfig;
 
@@ -745,6 +747,29 @@ UA_StatusCode UA_EXPORT
 UA_Server_DataSetReader_getState(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                  UA_PubSubState *state);
 
+typedef struct {
+    UA_String name;
+    UA_SubscribedDataSetEnumType subscribedDataSetType;
+    union {
+        /* datasetmirror is currently not implemented */
+        UA_TargetVariablesDataType target;
+    } subscribedDataSet;
+    UA_DataSetMetaDataType dataSetMetaData;
+    UA_Boolean isConnected;
+} UA_StandaloneSubscribedDataSetConfig;
+
+void
+UA_StandaloneSubscribedDataSetConfig_clear(UA_StandaloneSubscribedDataSetConfig *sdsConfig);
+
+UA_StatusCode UA_EXPORT
+UA_Server_addStandaloneSubscribedDataSet(UA_Server *server,
+                               const UA_StandaloneSubscribedDataSetConfig *subscribedDataSetConfig,
+                               UA_NodeId *sdsIdentifier);
+
+/* Remove StandaloneSubscribedDataSet, identified by the NodeId. */
+UA_StatusCode UA_EXPORT
+UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds);
+
 /**
  * ReaderGroup
  * -----------
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index fcbbe6399ca..aea75d19fd0 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -7,6 +7,7 @@
  * Copyright (c) 2020 Yannick Wallerer, Siemens AG
  * Copyright (c) 2020 Thomas Fischer, Siemens AG
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
+ * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  */
 
 #ifndef UA_PUBSUB_H_
@@ -61,6 +62,23 @@ void
 UA_PublishedDataSet_clear(UA_Server *server,
                           UA_PublishedDataSet *publishedDataSet);
 
+typedef struct UA_StandaloneSubscribedDataSet{
+    UA_StandaloneSubscribedDataSetConfig config;
+    UA_NodeId identifier;
+    TAILQ_ENTRY(UA_StandaloneSubscribedDataSet) listEntry;
+    UA_NodeId connectedReader;
+} UA_StandaloneSubscribedDataSet;
+
+UA_StatusCode
+UA_StandaloneSubscribedDataSetConfig_copy(const UA_StandaloneSubscribedDataSetConfig *src, UA_StandaloneSubscribedDataSetConfig *dst);
+UA_StandaloneSubscribedDataSet *
+UA_StandaloneSubscribedDataSet_findSDSbyId(UA_Server *server, UA_NodeId identifier);
+UA_StandaloneSubscribedDataSet *
+UA_StandaloneSubscribedDataSet_findSDSbyName(UA_Server *server, UA_String identifier);
+void
+UA_StandaloneSubscribedDataSet_clear(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet); 
+
+
 /**********************************************/
 /*               Connection                   */
 /**********************************************/
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index fab0ccfc871..90806b2d748 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -2,9 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright (c) 2017-2019 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright (c) 2017-2022 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2018 Fraunhofer IOSB (Author: Julius Pfrommer)
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
+ * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  */
 
 #include <open62541/server_pubsub.h>
@@ -401,6 +402,87 @@ UA_PubSubConfigurationVersionTimeDifference(void) {
     UA_UInt32 timeDiffSince2000 = (UA_UInt32) (UA_DateTime_now() - UA_DATETIMESTAMP_2000);
     return timeDiffSince2000;
 }
+UA_StatusCode
+UA_Server_addStandaloneSubscribedDataSet(UA_Server *server, const UA_StandaloneSubscribedDataSetConfig *subscribedDataSetConfig,
+                              UA_NodeId *sdsIdentifier) {
+    if(!subscribedDataSetConfig){
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "SubscribedDataSet creation failed. No config passed in.");
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    UA_StandaloneSubscribedDataSetConfig tmpSubscribedDataSetConfig;
+    memset(&tmpSubscribedDataSetConfig, 0, sizeof(UA_StandaloneSubscribedDataSetConfig));
+    if(UA_StandaloneSubscribedDataSetConfig_copy(subscribedDataSetConfig, &tmpSubscribedDataSetConfig) != UA_STATUSCODE_GOOD){
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "SubscribedDataSet creation failed. Configuration copy failed.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    //create new PDS and add to UA_PubSubManager
+    UA_StandaloneSubscribedDataSet *newSubscribedDataSet = (UA_StandaloneSubscribedDataSet *)
+            UA_calloc(1, sizeof(UA_StandaloneSubscribedDataSet));
+    if(!newSubscribedDataSet) {
+        UA_StandaloneSubscribedDataSetConfig_clear(&tmpSubscribedDataSetConfig);
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "SubscribedDataSet creation failed. Out of Memory.");
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    newSubscribedDataSet->config = tmpSubscribedDataSetConfig;
+    newSubscribedDataSet->connectedReader = UA_NODEID_NULL;
+    
+    if (server->pubSubManager.subscribedDataSetsSize != 0)
+        TAILQ_INSERT_TAIL(&server->pubSubManager.subscribedDataSets, newSubscribedDataSet, listEntry);
+    else {
+        TAILQ_INIT(&server->pubSubManager.subscribedDataSets);
+        TAILQ_INSERT_HEAD(&server->pubSubManager.subscribedDataSets, newSubscribedDataSet, listEntry);
+    }
+
+    server->pubSubManager.subscribedDataSetsSize++;
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    addStandaloneSubscribedDataSetRepresentation(server, newSubscribedDataSet);
+#else
+    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager, &newSubscribedDataSet->identifier);
+#endif
+
+    if(sdsIdentifier){
+        UA_NodeId_copy(&newSubscribedDataSet->identifier, sdsIdentifier);
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
+    UA_StandaloneSubscribedDataSet *subscribedDataSet = UA_StandaloneSubscribedDataSet_findSDSbyId(server, sds);
+    if(!subscribedDataSet){
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+
+    //search for referenced readers. 
+    UA_PubSubConnection *tmpConnectoin;
+    TAILQ_FOREACH(tmpConnectoin, &server->pubSubManager.connections, listEntry){
+        UA_ReaderGroup *readerGroup;
+        LIST_FOREACH(readerGroup, &tmpConnectoin->readerGroups, listEntry){
+            UA_DataSetReader *currentReader, *tmpReader;
+            LIST_FOREACH_SAFE(currentReader, &readerGroup->readers, listEntry, tmpReader){
+                if(UA_NodeId_equal(&currentReader->identifier, &subscribedDataSet->connectedReader)){
+                    UA_Server_removeDataSetReader(server, currentReader->identifier);
+                    // todo -> break out of loop
+                }
+            }
+        }
+    }
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    removeStandaloneSubscribedDataSetRepresentation(server, subscribedDataSet);
+#endif
+    UA_StandaloneSubscribedDataSet_clear(server, subscribedDataSet);
+    server->pubSubManager.subscribedDataSetsSize--;
+
+    TAILQ_REMOVE(&server->pubSubManager.subscribedDataSets, subscribedDataSet, listEntry);
+    UA_free(subscribedDataSet);
+    return UA_STATUSCODE_GOOD;
+}
 
 /* Generate a new unique NodeId. This NodeId will be used for the information
  * model representation of PubSub entities. */
@@ -450,6 +532,11 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
         UA_free(server->config.pubSubConfig.transportLayers);
         server->config.pubSubConfig.transportLayersSize = 0;
     }
+    /* delete subscribed datasets */
+    UA_StandaloneSubscribedDataSet *tmpSDS1, *tmpSDS2;
+    TAILQ_FOREACH_SAFE(tmpSDS1, &server->pubSubManager.subscribedDataSets, listEntry, tmpSDS2){
+        UA_Server_removeStandaloneSubscribedDataSet(server, tmpSDS1->identifier);
+    }
 }
 
 /***********************************/
diff --git a/src/pubsub/ua_pubsub_manager.h b/src/pubsub/ua_pubsub_manager.h
index 4cbbc0f7737..236294aea4f 100644
--- a/src/pubsub/ua_pubsub_manager.h
+++ b/src/pubsub/ua_pubsub_manager.h
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * Copyright (c) 2017-2019 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  */
 
 #ifndef UA_PUBSUB_MANAGER_H_
@@ -24,6 +25,8 @@ typedef struct UA_PubSubManager {
 
     size_t publishedDataSetsSize;
     TAILQ_HEAD(UA_ListOfPublishedDataSet, UA_PublishedDataSet) publishedDataSets;
+    size_t subscribedDataSetsSize;
+    TAILQ_HEAD(UA_ListOfStandaloneSubscribedDataSet, UA_StandaloneSubscribedDataSet) subscribedDataSets;
 
 #ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     UA_UInt32 uniqueIdCount;
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 547708d5e25..25fa7e2f080 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright (c) 2017-2022 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2019-2021 Kalycito Infotech Private Limited
  * Copyright (c) 2020 Yannick Wallerer, Siemens AG
- * Copyright (c) 2020 Thomas Fischer, Siemens AG
+ * Copyright (c) 2020-2022 Thomas Fischer, Siemens AG
  */
 
 #include <open62541/types.h>
@@ -183,6 +183,23 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
                                      &UA_TYPES[UA_TYPES_CONFIGURATIONVERSIONDATATYPE]);
             break;
         }
+        case UA_NS0ID_STANDALONESUBSCRIBEDDATASETREFDATATYPE: {
+            UA_StandaloneSubscribedDataSet *sds = UA_StandaloneSubscribedDataSet_findSDSbyId(server, *myNodeId);
+            switch(nodeContext->elementClassiefier) {
+                case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_ISCONNECTED: {
+                    UA_Variant_setScalar(&value, &sds->config.isConnected, &UA_TYPES[UA_TYPES_BOOLEAN]);
+                    break;
+                }
+                case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_DATASETMETADATA: {
+                    UA_Variant_setScalarCopy(&value, &sds->config.dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
+                    break;
+                }
+                default:
+                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                "Read error! Unknown property.");
+            }
+            break;
+        }
         default:
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown property.");
@@ -830,9 +847,42 @@ addDataSetReaderAction(UA_Server *server,
 #endif
 
 UA_StatusCode
-removeDataSetReaderRepresentation(UA_Server *server,
-                                  UA_DataSetReader* dataSetReader) {
-    return deleteNode(server, dataSetReader->identifier, true);
+removeDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader* dataSetReader) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    if(!UA_String_equal(&dataSetReader->config.linkedStandaloneSubscribedDataSetName, &UA_STRING_NULL)) {
+        UA_NodeId dataSetMetaDataOnDsrId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
+                                    UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), dataSetReader->identifier);
+        UA_NodeId subscribedDataSetOnDsrId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
+                                    UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), dataSetReader->identifier);
+
+        if(UA_NodeId_isNull(&dataSetMetaDataOnDsrId) || UA_NodeId_isNull(&subscribedDataSetOnDsrId)) {
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "removeDataSetReaderRepresentation failed."
+                                                                        "SubscribedDataSet or DataSetMetaData not found!");
+            return UA_STATUSCODE_BADNOTFOUND;
+        }
+
+        retVal |= UA_Server_deleteReference(server, dataSetReader->identifier,
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                                  UA_TRUE,
+                                  UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnDsrId.namespaceIndex, dataSetMetaDataOnDsrId.identifier.numeric),
+                                  UA_TRUE);
+        if(retVal != UA_STATUSCODE_GOOD) {
+            /* todo error handling */
+        }
+
+        retVal |= UA_Server_deleteReference(server, dataSetReader->identifier,
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                  UA_TRUE,
+                                  UA_EXPANDEDNODEID_NUMERIC(subscribedDataSetOnDsrId.namespaceIndex, subscribedDataSetOnDsrId.identifier.numeric),
+                                  UA_TRUE);
+        if(retVal != UA_STATUSCODE_GOOD) {
+            /* todo error handling */
+        }
+    }
+    
+    retVal |= deleteNode(server, dataSetReader->identifier, true);
+
+    return retVal;
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
@@ -1083,6 +1133,89 @@ removePublishedDataSetAction(UA_Server *server,
 }
 #endif
 
+/**********************************************/
+/*       StandaloneSubscribedDataSet          */
+/**********************************************/
+
+UA_StatusCode
+addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet) {
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    if(subscribedDataSet->config.name.length > 512)
+        return UA_STATUSCODE_BADCONFIGURATIONERROR;
+
+    UA_STACKARRAY(char, sdsName, sizeof(char) * subscribedDataSet->config.name.length +1);
+    memcpy(sdsName, subscribedDataSet->config.name.data, subscribedDataSet->config.name.length);
+    sdsName[subscribedDataSet->config.name.length] = '\0';
+
+    UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
+    object_attr.displayName = UA_LOCALIZEDTEXT("", sdsName);
+    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* Create a new id */
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS), 
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                   UA_QUALIFIEDNAME(0, sdsName),
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE),
+                                   object_attr, NULL, &subscribedDataSet->identifier);
+    UA_NodeId sdsObjectNode = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
+                                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                      subscribedDataSet->identifier);
+    UA_NodeId metaDataId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
+                                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                                      subscribedDataSet->identifier);
+    UA_NodeId connectedId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "IsConnected"),
+                                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                                      subscribedDataSet->identifier);
+
+    if(UA_NodeId_equal(&sdsObjectNode, &UA_NODEID_NULL) ||
+       UA_NodeId_equal(&metaDataId, &UA_NODEID_NULL) ||
+       UA_NodeId_equal(&connectedId, &UA_NODEID_NULL)) {
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    if(subscribedDataSet->config.subscribedDataSetType == UA_PUBSUB_SDS_TARGET){
+        UA_VariableAttributes attr = UA_VariableAttributes_default;
+        UA_NodeId targetVarsId;
+        attr.displayName = UA_LOCALIZEDTEXT("", "TargetVariables");
+        attr.dataType = UA_TYPES[UA_TYPES_FIELDTARGETDATATYPE].typeId;
+        attr.valueRank = UA_VALUERANK_ONE_DIMENSION;
+        attr.arrayDimensionsSize = 1;
+        UA_UInt32 arrayDimensions[1];
+        arrayDimensions[0] = (UA_UInt32) subscribedDataSet->config.subscribedDataSet.target.targetVariablesSize;
+        attr.arrayDimensions = arrayDimensions;
+        attr.accessLevel = UA_ACCESSLEVELMASK_READ;
+        UA_Variant_setArray(&attr.value, subscribedDataSet->config.subscribedDataSet.target.targetVariables, 
+                            subscribedDataSet->config.subscribedDataSet.target.targetVariablesSize, 
+                            &UA_TYPES[UA_TYPES_FIELDTARGETDATATYPE]);
+        ret |= UA_Server_addVariableNode(server, UA_NODEID_NULL, sdsObjectNode, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                                         UA_QUALIFIEDNAME(0, "TargetVariables"), UA_NODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE),
+                                         attr, NULL, &targetVarsId);
+    }
+                                
+    UA_NodePropertyContext *isConnectedNodeContext = (UA_NodePropertyContext *) UA_malloc(sizeof(UA_NodePropertyContext));
+    isConnectedNodeContext->parentNodeId = subscribedDataSet->identifier;
+    isConnectedNodeContext->parentClassifier = UA_NS0ID_STANDALONESUBSCRIBEDDATASETREFDATATYPE;
+    isConnectedNodeContext->elementClassiefier = UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_ISCONNECTED;
+
+    UA_ValueCallback valueCallback;
+    valueCallback.onRead = onRead; 
+    valueCallback.onWrite = NULL;
+    ret |= addVariableValueSource(server, valueCallback, connectedId, isConnectedNodeContext);
+    
+    UA_NodePropertyContext *metaDataContext = (UA_NodePropertyContext *)
+        UA_malloc(sizeof(UA_NodePropertyContext));
+    metaDataContext->parentNodeId = subscribedDataSet->identifier;
+    metaDataContext->parentClassifier = UA_NS0ID_STANDALONESUBSCRIBEDDATASETREFDATATYPE;
+    metaDataContext->elementClassiefier = UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_DATASETMETADATA;
+    ret |= addVariableValueSource(server, valueCallback, metaDataId, metaDataContext);
+
+    return ret;
+}
+
+UA_StatusCode
+removeStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    retVal |= UA_Server_deleteNode(server, subscribedDataSet->identifier, true);
+    return retVal;
+}
+
 /**********************************************/
 /*               WriterGroup                  */
 /**********************************************/
@@ -1591,6 +1724,30 @@ publishedDataItemsTypeDestructor(UA_Server *server,
         UA_free(childContext);
 }
 
+static void
+standaloneSubscribedDataSetTypeDestructor(UA_Server *server,
+                            const UA_NodeId *sessionId, void *sessionContext,
+                            const UA_NodeId *typeId, void *typeContext,
+                            const UA_NodeId *nodeId, void **nodeContext) {
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+                "Standalone SubscribedDataSet destructor called!");
+    void *childContext;
+
+    UA_NodeId node =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
+    UA_Server_getNodeContext(server, node, (void**)&childContext);
+    if(!UA_NodeId_equal(&UA_NODEID_NULL , &node))
+        UA_free(childContext);
+
+    node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "IsConnected"),
+                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                               *nodeId);
+    UA_Server_getNodeContext(server, node, (void**)&childContext);
+    if(!UA_NodeId_equal(&UA_NODEID_NULL , &node))
+        UA_free(childContext);
+}
+
 /*************************************/
 /*         PubSub configurator       */
 /*************************************/
@@ -1681,6 +1838,12 @@ UA_Server_initPubSubNS0(UA_Server *server) {
     retVal |= writePubSubNs0VariableArray(server, UA_NS0ID_PUBLISHSUBSCRIBE_SUPPORTEDTRANSPORTPROFILES,
                                     profileArray, 1, &UA_TYPES[UA_TYPES_STRING]);
 
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    oAttr.displayName = UA_LOCALIZEDTEXT("", "SubscribedDataSets");
+    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS), 
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE), UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                            UA_QUALIFIEDNAME(0, "SubscribedDataSets"), UA_NODEID_NUMERIC(0, UA_NS0ID_SUBSCRIBEDDATASETFOLDERTYPE),
+                            oAttr, NULL, NULL);
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
     /* Add missing references */
     retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
@@ -1752,6 +1915,39 @@ UA_Server_initPubSubNS0(UA_Server *server) {
     lifeCycle.destructor = dataSetReaderTypeDestructor;
     retVal |= UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETREADERTYPE), lifeCycle);
 
+    lifeCycle.destructor = standaloneSubscribedDataSetTypeDestructor;
+    UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE),lifeCycle);
+
+    return retVal;
+}
+
+UA_StatusCode
+connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId standaloneSdsId) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+
+    UA_NodeId dataSetMetaDataOnDsrId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
+                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), dsrId);
+    UA_NodeId subscribedDataSetOnDsrId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
+                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), dsrId);
+    UA_NodeId dataSetMetaDataOnSdsId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
+                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), standaloneSdsId);
+    UA_NodeId subscribedDataSetOnSdsId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
+                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), standaloneSdsId);
+
+    if (UA_NodeId_isNull(&dataSetMetaDataOnDsrId) || UA_NodeId_isNull(&subscribedDataSetOnDsrId)
+        || UA_NodeId_isNull(&dataSetMetaDataOnSdsId) || UA_NodeId_isNull(&subscribedDataSetOnSdsId))
+    {
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+
+    UA_NODESTORE_REMOVE(server, &dataSetMetaDataOnDsrId);
+    UA_NODESTORE_REMOVE(server, &subscribedDataSetOnDsrId);
+
+    retVal |= UA_Server_addReference(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+        UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex, dataSetMetaDataOnSdsId.identifier.numeric), UA_TRUE);
+    retVal |= UA_Server_addReference(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+        UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex, subscribedDataSetOnSdsId.identifier.numeric), UA_TRUE);
+
     return retVal;
 }
 
diff --git a/src/pubsub/ua_pubsub_ns0.h b/src/pubsub/ua_pubsub_ns0.h
index 934d630fbb7..1ff29cbb200 100644
--- a/src/pubsub/ua_pubsub_ns0.h
+++ b/src/pubsub/ua_pubsub_ns0.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2019 Kalycito Infotech Private Limited
+ * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  */
 
 #ifndef UA_PUBSUB_NS0_H_
@@ -43,9 +44,15 @@ removeDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWr
 UA_StatusCode
 addPublishedDataItemsRepresentation(UA_Server *server, UA_PublishedDataSet *publishedDataSet);
 
+UA_StatusCode
+addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet);
+
 UA_StatusCode
 removePublishedDataSetRepresentation(UA_Server *server, UA_PublishedDataSet *publishedDataSet);
 
+UA_StatusCode
+removeStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet);
+
 UA_StatusCode
 addDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader *dataSetReader);
 
@@ -55,6 +62,9 @@ removeDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader *dataSetRe
 UA_StatusCode
 removeReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup);
 
+UA_StatusCode
+connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId standaloneSdsId);
+
 #endif /* UA_ENABLE_PUBSUB_INFORMATIONMODEL */
 
 _UA_END_DECLS
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 942c9d3dc55..a25925e1519 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -2,10 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright (c) 2017-2022 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2019 Fraunhofer IOSB (Author: Julius Pfrommer)
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
+ * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  */
 
 #include <open62541/server_pubsub.h>
@@ -452,6 +453,66 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
     LIST_INSERT_HEAD(&readerGroup->readers, newDataSetReader, listEntry);
     readerGroup->readersCount++;
 
+    if(newDataSetReader->config.linkedStandaloneSubscribedDataSetName.length != 0) {
+        // find sds by name
+        UA_StandaloneSubscribedDataSet *subscribedDataSet =
+            UA_StandaloneSubscribedDataSet_findSDSbyName(
+                server, newDataSetReader->config.linkedStandaloneSubscribedDataSetName);
+        if(subscribedDataSet != NULL) {
+            if(subscribedDataSet->config.subscribedDataSetType != UA_PUBSUB_SDS_TARGET) {
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                             "Not implemented! Currently only SubscribedDataSet as "
+                             "TargetVariables is implemented");
+            } else {
+                if(subscribedDataSet->config.isConnected) {
+                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                 "SubscribedDataSet is already connected");
+                } else {
+                    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+                                "Found SubscribedDataSet");
+                    subscribedDataSet->config.isConnected = true;
+                    UA_DataSetMetaDataType_copy(
+                        &subscribedDataSet->config.dataSetMetaData,
+                        &newDataSetReader->config.dataSetMetaData);
+                    UA_FieldTargetVariable *targetVars =
+                        (UA_FieldTargetVariable *)UA_calloc(
+                            subscribedDataSet->config.subscribedDataSet.target
+                                .targetVariablesSize,
+                            sizeof(UA_FieldTargetVariable));
+                    for(size_t index = 0;
+                        index < subscribedDataSet->config.subscribedDataSet.target
+                                    .targetVariablesSize;
+                        index++) {
+                        UA_FieldTargetDataType_copy(
+                            &subscribedDataSet->config.subscribedDataSet.target
+                                 .targetVariables[index],
+                            &targetVars[index].targetVariable);
+                    }
+                    UA_Server_DataSetReader_createTargetVariables(
+                        server, newDataSetReader->identifier,
+                        subscribedDataSet->config.subscribedDataSet.target
+                            .targetVariablesSize,
+                        targetVars);
+                    subscribedDataSet->connectedReader = newDataSetReader->identifier;
+
+                    for(size_t index = 0;
+                        index < subscribedDataSet->config.subscribedDataSet.target
+                                    .targetVariablesSize;
+                        index++) {
+                        UA_FieldTargetDataType_clear(&targetVars[index].targetVariable);
+                    }
+
+                    UA_free(targetVars);
+
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+                    retVal |= connectDataSetReaderToDataSet(server, newDataSetReader->identifier,
+                                                            subscribedDataSet->identifier);
+#endif
+                }
+            }
+        }
+    }
+
     if(readerIdentifier)
         UA_NodeId_copy(&newDataSetReader->identifier, readerIdentifier);
 
@@ -668,13 +729,20 @@ UA_DataSetReaderConfig_copy(const UA_DataSetReaderConfig *src,
     if(src->subscribedDataSetType == UA_PUBSUB_SDS_TARGET) {
         retVal = UA_TargetVariables_copy(&src->subscribedDataSet.subscribedDataSetTarget,
                                          &dst->subscribedDataSet.subscribedDataSetTarget);
+        if(retVal != UA_STATUSCODE_GOOD) {
+            return retVal;
+        }
     }
+
+    retVal = UA_String_copy(&src->linkedStandaloneSubscribedDataSetName, &dst->linkedStandaloneSubscribedDataSetName);
+
     return retVal;
 }
 
 void
 UA_DataSetReaderConfig_clear(UA_DataSetReaderConfig *cfg) {
     UA_String_clear(&cfg->name);
+    UA_String_clear(&cfg->linkedStandaloneSubscribedDataSetName);
     UA_Variant_clear(&cfg->publisherId);
     UA_DataSetMetaDataType_clear(&cfg->dataSetMetaData);
     UA_ExtensionObject_clear(&cfg->messageSettings);
@@ -1498,4 +1566,59 @@ receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StandaloneSubscribedDataSet *
+UA_StandaloneSubscribedDataSet_findSDSbyId(UA_Server *server, UA_NodeId identifier) {
+    UA_StandaloneSubscribedDataSet *subscribedDataSet;
+    TAILQ_FOREACH(subscribedDataSet, &server->pubSubManager.subscribedDataSets,
+                  listEntry) {
+        if(UA_NodeId_equal(&identifier, &subscribedDataSet->identifier))
+            return subscribedDataSet;
+    }
+    return NULL;
+}
+
+UA_StandaloneSubscribedDataSet *
+UA_StandaloneSubscribedDataSet_findSDSbyName(UA_Server *server, UA_String identifier) {
+    UA_StandaloneSubscribedDataSet *subscribedDataSet;
+    TAILQ_FOREACH(subscribedDataSet, &server->pubSubManager.subscribedDataSets,
+                  listEntry) {
+        if(UA_String_equal(&identifier, &subscribedDataSet->config.name))
+            return subscribedDataSet;
+    }
+    return NULL;
+}
+
+UA_StatusCode
+UA_StandaloneSubscribedDataSetConfig_copy(const UA_StandaloneSubscribedDataSetConfig *src,
+                                          UA_StandaloneSubscribedDataSetConfig *dst) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    memcpy(dst, src, sizeof(UA_StandaloneSubscribedDataSetConfig));
+    res = UA_DataSetMetaDataType_copy(&src->dataSetMetaData, &dst->dataSetMetaData);
+    res |= UA_String_copy(&src->name, &dst->name);
+    res |= UA_Boolean_copy(&src->isConnected, &dst->isConnected);
+    res |= UA_TargetVariablesDataType_copy(&src->subscribedDataSet.target,
+                                           &dst->subscribedDataSet.target);
+
+    if(res != UA_STATUSCODE_GOOD)
+        UA_StandaloneSubscribedDataSetConfig_clear(dst);
+    return res;
+}
+
+void
+UA_StandaloneSubscribedDataSetConfig_clear(
+    UA_StandaloneSubscribedDataSetConfig *sdsConfig) {
+    // delete sds config
+    UA_String_clear(&sdsConfig->name);
+    UA_DataSetMetaDataType_clear(&sdsConfig->dataSetMetaData);
+    UA_TargetVariablesDataType_clear(&sdsConfig->subscribedDataSet.target);
+}
+
+void
+UA_StandaloneSubscribedDataSet_clear(UA_Server *server,
+                                     UA_StandaloneSubscribedDataSet *subscribedDataSet) {
+    UA_StandaloneSubscribedDataSetConfig_clear(&subscribedDataSet->config);
+    UA_NodeId_clear(&subscribedDataSet->identifier);
+    UA_NodeId_clear(&subscribedDataSet->connectedReader);
+}
+
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 23c415d1074..39c34f12c16 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -1612,6 +1612,82 @@ START_TEST(MultiPublishSubscribeInt32) {
     UA_Variant_clear(&publishedNodeData);
 } END_TEST
 
+static void
+addTargetVariable(void) {
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    UA_DateTime dateTime = 0;
+    UA_Variant_setScalar(&attr.value, &dateTime, &UA_TYPES[UA_TYPES_DATETIME]);
+    attr.description = UA_LOCALIZEDTEXT("en-US", "subscribedTargetVar");
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "subscribedTargetVar");
+    attr.dataType = UA_TYPES[UA_TYPES_DATETIME].typeId;
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
+
+    /* Add the variable node to the information model */
+    UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "demoVar");
+    UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "subscribedTargetVar");
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_Server_addVariableNode(
+        server, myIntegerNodeId, parentNodeId, parentReferenceNodeId, myIntegerName,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, NULL);
+}
+
+START_TEST(ValidStandaloneDataSetConfigurationAddAndRemove) {
+    addTargetVariable();
+    UA_StandaloneSubscribedDataSetConfig cfg;
+    UA_NodeId ret;
+    memset(&cfg, 0, sizeof(UA_StandaloneSubscribedDataSetConfig));
+
+    /* Fill the SSDS MetaData */
+    UA_DataSetMetaDataType_init(&cfg.dataSetMetaData);
+    cfg.dataSetMetaData.name = UA_STRING("DemoStandaloneSDS");
+    cfg.dataSetMetaData.fieldsSize = 1;
+    UA_FieldMetaData fieldMetaData;
+    cfg.dataSetMetaData.fields = &fieldMetaData;
+
+    /* DateTime DataType */
+    UA_FieldMetaData_init(&cfg.dataSetMetaData.fields[0]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_DATETIME].typeId, &cfg.dataSetMetaData.fields[0].dataType);
+    cfg.dataSetMetaData.fields[0].builtInType = UA_NS0ID_DATETIME;
+    cfg.dataSetMetaData.fields[0].name = UA_STRING("subscribedTargetVar");
+    cfg.dataSetMetaData.fields[0].valueRank = -1; /* scalar */
+
+    cfg.name = UA_STRING("DemoStandaloneSDS");
+    cfg.isConnected = UA_FALSE;
+    cfg.subscribedDataSet.target.targetVariablesSize = 1;
+    UA_FieldTargetDataType fieldTargetDataType;
+    cfg.subscribedDataSet.target.targetVariables = &fieldTargetDataType;
+
+    UA_FieldTargetDataType_init(&cfg.subscribedDataSet.target.targetVariables[0]);
+    cfg.subscribedDataSet.target.targetVariables[0].attributeId = UA_ATTRIBUTEID_VALUE;
+    cfg.subscribedDataSet.target.targetVariables[0].targetNodeId =
+    UA_NODEID_STRING(1, "demoVar");
+    UA_StatusCode retVal = UA_Server_addStandaloneSubscribedDataSet(server, &cfg, &ret);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_StandaloneSubscribedDataSet *ssds = NULL;
+    ssds = UA_StandaloneSubscribedDataSet_findSDSbyId(server, ret);
+    ck_assert_ptr_ne(ssds, NULL);
+    ssds = NULL;
+    ssds = UA_StandaloneSubscribedDataSet_findSDSbyName(server, UA_STRING("DemoStandaloneSDS"));
+    ck_assert_ptr_ne(ssds, NULL);
+    UA_StandaloneSubscribedDataSetConfig ssds_config;
+    memset(&ssds_config, 0, sizeof(UA_StandaloneSubscribedDataSetConfig));
+    retVal = UA_StandaloneSubscribedDataSetConfig_copy(&ssds->config, &ssds_config);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_StandaloneSubscribedDataSetConfig_clear(&ssds_config);
+    retVal = UA_Server_removeStandaloneSubscribedDataSet(server, ret);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    ssds = UA_StandaloneSubscribedDataSet_findSDSbyName(server, UA_STRING("DemoStandaloneSDS"));
+    ck_assert_ptr_eq(ssds, NULL);
+    ssds = UA_StandaloneSubscribedDataSet_findSDSbyId(server, ret);
+    ck_assert_ptr_eq(ssds, NULL);
+
+} END_TEST
+
+START_TEST(ReceiveStandaloneDataSetFrame) {
+
+} END_TEST
+
 int main(void) {
     TCase *tc_add_pubsub_readergroup = tcase_create("PubSub readerGroup items handling");
     tcase_add_checked_fixture(tc_add_pubsub_readergroup, setup, teardown);
@@ -1650,13 +1726,18 @@ int main(void) {
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeBool);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribewithValidIdentifiers);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeHeartbeat);
-
-    /* Test cases with several readers */
     tcase_add_test(tc_pubsub_publish_subscribe, MultiPublishSubscribeInt32);
 
+    /*Test cases for the standalone datasets */
+    TCase *tc_pubsub_standalone_datasets = tcase_create("Subscriber using standalone datasets");
+    tcase_add_test(tc_pubsub_publish_subscribe, ValidStandaloneDataSetConfigurationAddAndRemove);
+    tcase_add_test(tc_pubsub_publish_subscribe, ReceiveStandaloneDataSetFrame);
+
+
     Suite *suite = suite_create("PubSub readerGroups/reader/Fields handling and publishing");
     suite_add_tcase(suite, tc_add_pubsub_readergroup);
     suite_add_tcase(suite, tc_pubsub_publish_subscribe);
+    suite_add_tcase(suite, tc_pubsub_standalone_datasets);
 
     SRunner *suiteRunner = srunner_create(suite);
     srunner_set_fork_status(suiteRunner, CK_NOFORK);
diff --git a/tools/schema/NodeIds.csv b/tools/schema/NodeIds.csv
index 168dd272beb..7cf06874926 100644
--- a/tools/schema/NodeIds.csv
+++ b/tools/schema/NodeIds.csv
@@ -11142,3 +11142,36 @@ AuthorizationServicesConfigurationFolderType_ServiceName_Placeholder,23557,Objec
 AuthorizationServicesConfigurationFolderType_ServiceName_Placeholder_ServiceUri,23558,Variable
 AuthorizationServicesConfigurationFolderType_ServiceName_Placeholder_ServiceCertificate,23559,Variable
 AuthorizationServicesConfigurationFolderType_ServiceName_Placeholder_IssuerEndpointUrl,23560,Variable
+StandaloneSubscribedDataSetRefDataType,23599,DataType
+PublishSubscribeType_SubscribedDataSets,23622,Object
+PublishSubscribe_SubscribedDataSets,23658,Object
+SubscribedDataSetFolderType,23795,ObjectType
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder,23796,Object
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_AddSubscribedDataSet,23797,Method
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_AddSubscribedDataSet_InputArguments,23798,Variable
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_AddSubscribedDataSet_OutputArguments,23799,Variable
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_RemoveSubscribedDataSet,23800,Method
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_RemoveSubscribedDataSet_InputArguments,23801,Variable
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_AddDataSetFolder,23802,Method
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_AddDataSetFolder_InputArguments,23803,Variable
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_AddDataSetFolder_OutputArguments,23804,Variable
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_RemoveDataSetFolder,23805,Method
+SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_RemoveDataSetFolder_InputArguments,23806,Variable
+SubscribedDataSetFolderType_StandaloneSubscribedDataSetName_Placeholder,23807,Object
+SubscribedDataSetFolderType_StandaloneSubscribedDataSetName_Placeholder_SubscribedDataSet,23808,Object
+SubscribedDataSetFolderType_StandaloneSubscribedDataSetName_Placeholder_DataSetMetaData,23809,Variable
+SubscribedDataSetFolderType_StandaloneSubscribedDataSetName_Placeholder_IsConnected,23810,Variable
+SubscribedDataSetFolderType_AddSubscribedDataSet,23811,Method
+SubscribedDataSetFolderType_AddSubscribedDataSet_InputArguments,23812,Variable
+SubscribedDataSetFolderType_AddSubscribedDataSet_OutputArguments,23813,Variable
+SubscribedDataSetFolderType_RemoveSubscribedDataSet,23814,Method
+SubscribedDataSetFolderType_RemoveSubscribedDataSet_InputArguments,23815,Variable
+SubscribedDataSetFolderType_AddDataSetFolder,23816,Method
+SubscribedDataSetFolderType_AddDataSetFolder_InputArguments,23817,Variable
+SubscribedDataSetFolderType_AddDataSetFolder_OutputArguments,23818,Variable
+SubscribedDataSetFolderType_RemoveDataSetFolder,23819,Method
+SubscribedDataSetFolderType_RemoveDataSetFolder_InputArguments,23820,Variable
+StandaloneSubscribedDataSetType,23828,ObjectType
+StandaloneSubscribedDataSetType_SubscribedDataSet,23829,Object
+StandaloneSubscribedDataSetType_DataSetMetaData,23830,Variable
+StandaloneSubscribedDataSetType_IsConnected,23831,Variable
\ No newline at end of file
diff --git a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
index 9fdf96692eb..76729bd87a5 100644
--- a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
+++ b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
@@ -51,6 +51,7 @@
       <Reference ReferenceType="i=14476">i=14417</Reference>
       <Reference ReferenceType="HasProperty">i=17479</Reference>
       <Reference ReferenceType="HasComponent">i=14434</Reference>
+      <Reference ReferenceType="HasComponent">i=23622</Reference>
       <Reference ReferenceType="HasComponent">i=16598</Reference>
       <Reference ReferenceType="HasComponent">i=14432</Reference>
       <Reference ReferenceType="HasSubtype" IsForward="false">i=15906</Reference>
@@ -385,6 +386,14 @@
       <Reference ReferenceType="HasComponent" IsForward="false">i=14416</Reference>
     </References>
   </UAObject>
+  <UAObject NodeId="i=23622" BrowseName="SubscribedDataSets" ParentNodeId="i=14416">
+    <DisplayName>SubscribedDataSets</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=23795</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=14416</Reference>
+    </References>
+  </UAObject>
   <UAObject NodeId="i=15844" BrowseName="Status" ParentNodeId="i=14416">
     <DisplayName>Status</DisplayName>
     <References>
@@ -1477,6 +1486,494 @@
       <Reference ReferenceType="HasComponent" IsForward="false">i=15298</Reference>
     </References>
   </UAObject>
+  <UAObjectType NodeId="i=23795" BrowseName="SubscribedDataSetFolderType">
+    <DisplayName>SubscribedDataSetFolderType</DisplayName>
+    <Category>PubSub Model SubscribedDataSet Standalone</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part14/9.1.9/#9.1.9.4.1</Documentation>
+    <References>
+      <Reference ReferenceType="Organizes">i=23796</Reference>
+      <Reference ReferenceType="HasComponent">i=23807</Reference>
+      <Reference ReferenceType="HasComponent">i=23811</Reference>
+      <Reference ReferenceType="HasComponent">i=23814</Reference>
+      <Reference ReferenceType="HasComponent">i=23816</Reference>
+      <Reference ReferenceType="HasComponent">i=23819</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=61</Reference>
+    </References>
+  </UAObjectType>
+  <UAObject NodeId="i=23796" BrowseName="&lt;SubscribedDataSetFolderName&gt;" SymbolicName="SubscribedDataSetFolderName_Placeholder" ParentNodeId="i=23795">
+    <DisplayName>&lt;SubscribedDataSetFolderName&gt;</DisplayName>
+    <References>
+      <Reference ReferenceType="HasComponent">i=23797</Reference>
+      <Reference ReferenceType="HasComponent">i=23800</Reference>
+      <Reference ReferenceType="HasComponent">i=23802</Reference>
+      <Reference ReferenceType="HasComponent">i=23805</Reference>
+      <Reference ReferenceType="HasTypeDefinition">i=23795</Reference>
+      <Reference ReferenceType="HasModellingRule">i=11508</Reference>
+      <Reference ReferenceType="Organizes" IsForward="false">i=23795</Reference>
+    </References>
+  </UAObject>
+  <UAMethod NodeId="i=23797" BrowseName="AddSubscribedDataSet" ParentNodeId="i=23796" MethodDeclarationId="i=23811">
+    <DisplayName>AddSubscribedDataSet</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=23798</Reference>
+      <Reference ReferenceType="HasProperty">i=23799</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23796</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=23798" BrowseName="InputArguments" ParentNodeId="i=23797" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23797</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscribedDataSet</Name>
+              <DataType>
+                <Identifier>i=23600</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAVariable NodeId="i=23799" BrowseName="OutputArguments" ParentNodeId="i=23797" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>OutputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23797</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscribedDataSetNodeId</Name>
+              <DataType>
+                <Identifier>i=17</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAMethod NodeId="i=23800" BrowseName="RemoveSubscribedDataSet" ParentNodeId="i=23796" MethodDeclarationId="i=23814">
+    <DisplayName>RemoveSubscribedDataSet</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=23801</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23796</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=23801" BrowseName="InputArguments" ParentNodeId="i=23800" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23800</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscribedDataSetNodeId</Name>
+              <DataType>
+                <Identifier>i=17</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAMethod NodeId="i=23802" BrowseName="AddDataSetFolder" ParentNodeId="i=23796" MethodDeclarationId="i=23816">
+    <DisplayName>AddDataSetFolder</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=23803</Reference>
+      <Reference ReferenceType="HasProperty">i=23804</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23796</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=23803" BrowseName="InputArguments" ParentNodeId="i=23802" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23802</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>Name</Name>
+              <DataType>
+                <Identifier>i=12</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAVariable NodeId="i=23804" BrowseName="OutputArguments" ParentNodeId="i=23802" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>OutputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23802</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>DataSetFolderNodeId</Name>
+              <DataType>
+                <Identifier>i=17</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAMethod NodeId="i=23805" BrowseName="RemoveDataSetFolder" ParentNodeId="i=23796" MethodDeclarationId="i=23819">
+    <DisplayName>RemoveDataSetFolder</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=23806</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23796</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=23806" BrowseName="InputArguments" ParentNodeId="i=23805" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23805</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>DataSetFolderNodeId</Name>
+              <DataType>
+                <Identifier>i=17</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAObject NodeId="i=23807" BrowseName="&lt;StandaloneSubscribedDataSetName&gt;" SymbolicName="StandaloneSubscribedDataSetName_Placeholder" ParentNodeId="i=23795">
+    <DisplayName>&lt;StandaloneSubscribedDataSetName&gt;</DisplayName>
+    <References>
+      <Reference ReferenceType="HasComponent">i=23808</Reference>
+      <Reference ReferenceType="HasProperty">i=23809</Reference>
+      <Reference ReferenceType="HasProperty">i=23810</Reference>
+      <Reference ReferenceType="HasTypeDefinition">i=23828</Reference>
+      <Reference ReferenceType="HasModellingRule">i=11508</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23795</Reference>
+    </References>
+  </UAObject>
+  <UAObject NodeId="i=23808" BrowseName="SubscribedDataSet" ParentNodeId="i=23807">
+    <DisplayName>SubscribedDataSet</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=15108</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23807</Reference>
+    </References>
+  </UAObject>
+  <UAVariable NodeId="i=23809" BrowseName="DataSetMetaData" ParentNodeId="i=23807" DataType="i=14523">
+    <DisplayName>DataSetMetaData</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23807</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=23810" BrowseName="IsConnected" ParentNodeId="i=23807" DataType="Boolean">
+    <DisplayName>IsConnected</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23807</Reference>
+    </References>
+  </UAVariable>
+  <UAMethod NodeId="i=23811" BrowseName="AddSubscribedDataSet" ParentNodeId="i=23795">
+    <DisplayName>AddSubscribedDataSet</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=23812</Reference>
+      <Reference ReferenceType="HasProperty">i=23813</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23795</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=23812" BrowseName="InputArguments" ParentNodeId="i=23811" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23811</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscribedDataSet</Name>
+              <DataType>
+                <Identifier>i=23600</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAVariable NodeId="i=23813" BrowseName="OutputArguments" ParentNodeId="i=23811" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>OutputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23811</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscribedDataSetNodeId</Name>
+              <DataType>
+                <Identifier>i=17</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAMethod NodeId="i=23814" BrowseName="RemoveSubscribedDataSet" ParentNodeId="i=23795">
+    <DisplayName>RemoveSubscribedDataSet</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=23815</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23795</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=23815" BrowseName="InputArguments" ParentNodeId="i=23814" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23814</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscribedDataSetNodeId</Name>
+              <DataType>
+                <Identifier>i=17</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAMethod NodeId="i=23816" BrowseName="AddDataSetFolder" ParentNodeId="i=23795">
+    <DisplayName>AddDataSetFolder</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=23817</Reference>
+      <Reference ReferenceType="HasProperty">i=23818</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23795</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=23817" BrowseName="InputArguments" ParentNodeId="i=23816" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23816</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>Name</Name>
+              <DataType>
+                <Identifier>i=12</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAVariable NodeId="i=23818" BrowseName="OutputArguments" ParentNodeId="i=23816" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>OutputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23816</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>DataSetFolderNodeId</Name>
+              <DataType>
+                <Identifier>i=17</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAMethod NodeId="i=23819" BrowseName="RemoveDataSetFolder" ParentNodeId="i=23795">
+    <DisplayName>RemoveDataSetFolder</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=23820</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23795</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=23820" BrowseName="InputArguments" ParentNodeId="i=23819" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23819</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>DataSetFolderNodeId</Name>
+              <DataType>
+                <Identifier>i=17</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAObjectType NodeId="i=23828" BrowseName="StandaloneSubscribedDataSetType">
+    <DisplayName>StandaloneSubscribedDataSetType</DisplayName>
+    <Category>PubSub Model SubscribedDataSet Standalone</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part14/9.1.9/#9.1.9.5</Documentation>
+    <References>
+      <Reference ReferenceType="HasComponent">i=23829</Reference>
+      <Reference ReferenceType="HasProperty">i=23830</Reference>
+      <Reference ReferenceType="HasProperty">i=23831</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
+    </References>
+  </UAObjectType>
+  <UAObject NodeId="i=23829" BrowseName="SubscribedDataSet" ParentNodeId="i=23828">
+    <DisplayName>SubscribedDataSet</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=15108</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=23828</Reference>
+    </References>
+  </UAObject>
+  <UAVariable NodeId="i=23830" BrowseName="DataSetMetaData" ParentNodeId="i=23828" DataType="i=14523">
+    <DisplayName>DataSetMetaData</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23828</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=23831" BrowseName="IsConnected" ParentNodeId="i=23828" DataType="Boolean">
+    <DisplayName>IsConnected</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=23828</Reference>
+    </References>
+  </UAVariable>
   <UAObjectType NodeId="i=14643" BrowseName="PubSubStatusType">
     <DisplayName>PubSubStatusType</DisplayName>
     <References>

From dc674031150e2594915ef8b73e153bc81ad63113 Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Thu, 14 Jul 2022 15:05:03 +0200
Subject: [PATCH 0315/1963] feat(server): Enable nodes to have localized
 Description and DisplayName

---
 include/open62541/plugin/nodestore.h          |  10 +-
 src/server/ua_nodes.c                         | 128 ++++++++++++++++--
 src/server/ua_server_internal.h               |  19 +++
 src/server/ua_services_attribute.c            |  87 ++++++++++--
 src/server/ua_services_view.c                 |  15 +-
 .../ua_subscription_alarms_conditions.c       |  31 ++---
 6 files changed, 246 insertions(+), 44 deletions(-)

diff --git a/include/open62541/plugin/nodestore.h b/include/open62541/plugin/nodestore.h
index 7cdf18554f9..ff9a71c3e5e 100644
--- a/include/open62541/plugin/nodestore.h
+++ b/include/open62541/plugin/nodestore.h
@@ -391,13 +391,19 @@ UA_NodeReferenceKind_findTarget(const UA_NodeReferenceKind *rk,
 UA_EXPORT UA_StatusCode
 UA_NodeReferenceKind_switch(UA_NodeReferenceKind *rk);
 
+/* Singly-linked LocalizedText list */
+typedef struct UA_LocalizedTextListEntry {
+    struct UA_LocalizedTextListEntry *next;
+    UA_LocalizedText localizedText;
+} UA_LocalizedTextListEntry;
+
 /* Every Node starts with these attributes */
 struct UA_NodeHead {
     UA_NodeId nodeId;
     UA_NodeClass nodeClass;
     UA_QualifiedName browseName;
-    UA_LocalizedText displayName;
-    UA_LocalizedText description;
+    UA_LocalizedTextListEntry *displayName;
+    UA_LocalizedTextListEntry *description;
     UA_UInt32 writeMask;
     size_t referencesSize;
     UA_NodeReferenceKind *references;
diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index ab87aa5d0c1..b23d3a1c8bd 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -400,8 +400,20 @@ void UA_Node_clear(UA_Node *node) {
     UA_NodeHead *head = &node->head;
     UA_NodeId_clear(&head->nodeId);
     UA_QualifiedName_clear(&head->browseName);
-    UA_LocalizedText_clear(&head->displayName);
-    UA_LocalizedText_clear(&head->description);
+
+    UA_LocalizedTextListEntry *lt;
+
+    while((lt = head->displayName)) {
+        head->displayName = lt->next;
+        UA_LocalizedText_clear(&lt->localizedText);
+        UA_free(lt);
+    }
+
+    while((lt = head->description)) {
+        head->description = lt->next;
+        UA_LocalizedText_clear(&lt->localizedText);
+        UA_free(lt);
+    }
 
     /* Delete unique content of the nodeclass */
     switch(head->nodeClass) {
@@ -531,8 +543,37 @@ UA_Node_copy(const UA_Node *src, UA_Node *dst) {
     /* Copy standard content */
     UA_StatusCode retval = UA_NodeId_copy(&srchead->nodeId, &dsthead->nodeId);
     retval |= UA_QualifiedName_copy(&srchead->browseName, &dsthead->browseName);
-    retval |= UA_LocalizedText_copy(&srchead->displayName, &dsthead->displayName);
-    retval |= UA_LocalizedText_copy(&srchead->description, &dsthead->description);
+
+    /* Copy the display name in several languages */
+    for(UA_LocalizedTextListEntry *lt = srchead->displayName; lt != NULL; lt = lt->next) {
+        UA_LocalizedTextListEntry *newEntry = (UA_LocalizedTextListEntry *)
+            UA_calloc(1, sizeof(UA_LocalizedTextListEntry));
+        if(!newEntry) {
+            retval |= UA_STATUSCODE_BADOUTOFMEMORY;
+            break;
+        }
+        retval |= UA_LocalizedText_copy(&lt->localizedText, &newEntry->localizedText);
+
+        /* Add to the linked list possibly in reverse order */
+        newEntry->next = dsthead->displayName;
+        dsthead->displayName = newEntry;
+    }
+
+    /* Copy the description in several languages */
+    for(UA_LocalizedTextListEntry *lt = srchead->description; lt != NULL; lt = lt->next) {
+        UA_LocalizedTextListEntry *newEntry = (UA_LocalizedTextListEntry *)
+            UA_calloc(1, sizeof(UA_LocalizedTextListEntry));
+        if(!newEntry) {
+            retval |= UA_STATUSCODE_BADOUTOFMEMORY;
+            break;
+        }
+        retval |= UA_LocalizedText_copy(&lt->localizedText, &newEntry->localizedText);
+
+        /* Add to the linked list possibly in reverse order */
+        newEntry->next = dsthead->description;
+        dsthead->description= newEntry;
+    }
+
     dsthead->writeMask = srchead->writeMask;
     dsthead->context = srchead->context;
     dsthead->constructed = srchead->constructed;
@@ -665,14 +706,17 @@ copyStandardAttributes(UA_NodeHead *head, const UA_NodeAttributes *attr) {
     /* UA_QualifiedName_copy(&item->browseName, &node->browseName); */
 
     head->writeMask = attr->writeMask;
-    UA_StatusCode retval = UA_LocalizedText_copy(&attr->description, &head->description);
+    UA_StatusCode retval = UA_Node_insertOrUpdateDescription(head, &attr->description);
     /* The new nodeset format has optional display names:
      * https://github.com/open62541/open62541/issues/2627. If the display name
      * is NULL, take the name part of the browse name */
-    if(attr->displayName.text.length == 0)
-        retval |= UA_String_copy(&head->browseName.name, &head->displayName.text);
-    else
-        retval |= UA_LocalizedText_copy(&attr->displayName, &head->displayName);
+    if(attr->displayName.text.length == 0) {
+        UA_LocalizedText lt;
+        UA_LocalizedText_init(&lt);
+        lt.text = head->browseName.name;
+        retval |= UA_Node_insertOrUpdateDisplayName(head, &lt);
+    } else
+        retval |= UA_Node_insertOrUpdateDisplayName(head, &attr->displayName);
     return retval;
 }
 
@@ -1087,3 +1131,69 @@ void UA_Node_deleteReferences(UA_Node *node) {
     UA_ReferenceTypeSet_init(&noRefs);
     UA_Node_deleteReferencesSubset(node, &noRefs);
 }
+
+static UA_StatusCode
+UA_Node_insertOrUpdateLocale(UA_LocalizedTextListEntry **root,
+                             const UA_LocalizedText *value) {
+    UA_StatusCode res;
+    UA_LocalizedTextListEntry *lt, *prev = NULL;
+    for(lt = *root; lt != NULL; prev = lt, lt = lt->next) {
+        if(!UA_String_equal(&value->locale, &lt->localizedText.locale))
+            continue;
+
+        /* No text -> remove the entry for this locale */
+        if(value->text.length == 0) {
+            if(prev == NULL)
+                *root = lt->next;
+            else
+                prev->next = lt->next;
+            UA_LocalizedText_clear(&lt->localizedText);
+            UA_free(lt);
+            return UA_STATUSCODE_GOOD;
+        }
+
+        /* First make a copy of the text, if this succeeds replace the old
+         * version */
+        UA_String tmp;
+        res = UA_String_copy(&value->text, &tmp);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+
+        UA_String_clear(&lt->localizedText.text);
+        lt->localizedText.text = tmp;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* The locale does not exist so far */
+
+    /* Do nothing if a non-existing locale should be removed */
+    if(value->text.length == 0)
+        return UA_STATUSCODE_GOOD;
+
+    /* Add a new localized text */
+    lt = (UA_LocalizedTextListEntry *)UA_malloc(sizeof(UA_LocalizedTextListEntry));
+    if(!lt)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    res = UA_LocalizedText_copy(value, &lt->localizedText);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_free(lt);
+        return res;
+    }
+
+    lt->next = *root;
+    *root = lt;
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Node_insertOrUpdateDisplayName(UA_NodeHead *head,
+                                  const UA_LocalizedText *value) {
+    return UA_Node_insertOrUpdateLocale(&head->displayName, value);
+}
+
+UA_StatusCode
+UA_Node_insertOrUpdateDescription(UA_NodeHead *head,
+                                  const UA_LocalizedText *value) {
+    return UA_Node_insertOrUpdateLocale(&head->description, value);
+}
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 811e74a8983..ee08a689fc0 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -720,6 +720,25 @@ UA_NODESTORE_GETFROMREF(UA_Server *server, UA_NodePointer target) {
     server->config.nodestore.getReferenceTypeId(server->config.nodestore.context, \
                                                 index)
 
+/* Handling of Locales */
+
+/* Returns a shallow copy */
+UA_LocalizedText
+UA_Session_getNodeDisplayName(const UA_Session *session,
+                              const UA_NodeHead *head);
+
+UA_LocalizedText
+UA_Session_getNodeDescription(const UA_Session *session,
+                              const UA_NodeHead *head);
+
+UA_StatusCode
+UA_Node_insertOrUpdateDisplayName(UA_NodeHead *head,
+                                  const UA_LocalizedText *value);
+
+UA_StatusCode
+UA_Node_insertOrUpdateDescription(UA_NodeHead *head,
+                                  const UA_LocalizedText *value);
+
 _UA_END_DECLS
 
 #endif /* UA_SERVER_INTERNAL_H_ */
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 38f7fc824ea..7117e9c72cf 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -418,14 +418,18 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
         retval = UA_Variant_setScalarCopy(&v->value, &node->head.browseName,
                                           &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
         break;
-    case UA_ATTRIBUTEID_DISPLAYNAME:
-        retval = UA_Variant_setScalarCopy(&v->value, &node->head.displayName,
+    case UA_ATTRIBUTEID_DISPLAYNAME: {
+        UA_LocalizedText lt = UA_Session_getNodeDisplayName(session, &node->head);
+        retval = UA_Variant_setScalarCopy(&v->value, &lt,
                                           &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
         break;
-    case UA_ATTRIBUTEID_DESCRIPTION:
-        retval = UA_Variant_setScalarCopy(&v->value, &node->head.description,
+    }
+    case UA_ATTRIBUTEID_DESCRIPTION: {
+        UA_LocalizedText lt = UA_Session_getNodeDescription(session, &node->head);
+        retval = UA_Variant_setScalarCopy(&v->value, &lt,
                                           &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
         break;
+    }
     case UA_ATTRIBUTEID_WRITEMASK:
         retval = UA_Variant_setScalarCopy(&v->value, &node->head.writeMask,
                                           &UA_TYPES[UA_TYPES_UINT32]);
@@ -1652,14 +1656,14 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
     case UA_ATTRIBUTEID_DISPLAYNAME:
         CHECK_USERWRITEMASK(UA_WRITEMASK_DISPLAYNAME);
         CHECK_DATATYPE_SCALAR(LOCALIZEDTEXT);
-        retval = updateLocalizedText((const UA_LocalizedText *)value,
-                                     &node->head.displayName);
+        retval = UA_Node_insertOrUpdateDisplayName(&node->head,
+                                                   (const UA_LocalizedText *)value);
         break;
     case UA_ATTRIBUTEID_DESCRIPTION:
         CHECK_USERWRITEMASK(UA_WRITEMASK_DESCRIPTION);
         CHECK_DATATYPE_SCALAR(LOCALIZEDTEXT);
-        retval = updateLocalizedText((const UA_LocalizedText *)value,
-                                     &node->head.description);
+        retval = UA_Node_insertOrUpdateDescription(&node->head,
+                                                   (const UA_LocalizedText *)value);
         break;
     case UA_ATTRIBUTEID_WRITEMASK:
         CHECK_USERWRITEMASK(UA_WRITEMASK_WRITEMASK);
@@ -2118,3 +2122,70 @@ UA_Server_writeObjectProperty_scalar(UA_Server *server, const UA_NodeId objectId
     UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
+
+static UA_LocalizedText
+getLocalizedForSession(const UA_Session *session,
+                       const UA_LocalizedTextListEntry *root) {
+    const UA_LocalizedTextListEntry *lt;
+    UA_LocalizedText result;
+    UA_LocalizedText_init(&result);
+
+    /* No session. Return the first  */
+    if(!session)
+        goto not_found;
+
+    /* Exact match? */
+    for(size_t i = 0; i < session->localeIdsSize; ++i) {
+        for(lt = root; lt != NULL; lt = lt->next) {
+            if(UA_String_equal(&session->localeIds[i], &lt->localizedText.locale))
+                return lt->localizedText;
+        }
+    }
+
+    /* Partial match, e.g. de-DE instead of de-CH */
+    for(size_t i = 0; i < session->localeIdsSize; ++i) {
+        if(session->localeIds[i].length < 2 ||
+           (session->localeIdsSize > 2 &&
+            session->localeIds[i].data[2] != '-'))
+            continue;
+
+        UA_String requestedPrefix;
+        requestedPrefix.data = session->localeIds[i].data;
+        requestedPrefix.length = 2;
+
+        for(lt = root; lt != NULL; lt = lt->next) {
+            if(lt->localizedText.locale.length < 2 ||
+               (lt->localizedText.locale.length > 2 &&
+                lt->localizedText.locale.data[2] != '-'))
+                continue;
+
+            UA_String currentPrefix;
+            currentPrefix.data = lt->localizedText.locale.data;
+            currentPrefix.length = 2;
+
+            if(UA_String_equal(&requestedPrefix, &currentPrefix))
+                return lt->localizedText;
+        }
+    }
+
+    /* Not found. Return the first localized text that was added (last in the
+     * linked list). Return an empty result if the list is empty. */
+ not_found:
+    if(!root)
+        return result;
+    while(root->next)
+        root = root->next;
+    return root->localizedText;
+}
+
+UA_LocalizedText
+UA_Session_getNodeDisplayName(const UA_Session *session,
+                              const UA_NodeHead *head) {
+    return getLocalizedForSession(session, head->displayName);
+}
+
+UA_LocalizedText
+UA_Session_getNodeDescription(const UA_Session *session,
+                              const UA_NodeHead *head) {
+    return getLocalizedForSession(session, head->description);
+}
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 4a9c71cfec3..ea6189a7a2e 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -508,7 +508,7 @@ ContinuationPoint_clear(ContinuationPoint *cp) {
 
 /* Target node on top of the stack */
 static UA_StatusCode UA_FUNC_ATTR_WARN_UNUSED_RESULT
-addReferenceDescription(UA_Server *server, RefResult *rr,
+addReferenceDescription(UA_Server *server, const UA_Session *session, RefResult *rr,
                         const UA_NodeReferenceKind *ref, UA_UInt32 mask,
                         UA_NodePointer nodeP, const UA_Node *curr) {
     /* Ensure capacity is left */
@@ -543,8 +543,11 @@ addReferenceDescription(UA_Server *server, RefResult *rr,
         descr->nodeClass = curr->head.nodeClass;
     if(mask & UA_BROWSERESULTMASK_BROWSENAME)
         retval |= UA_QualifiedName_copy(&curr->head.browseName, &descr->browseName);
-    if(mask & UA_BROWSERESULTMASK_DISPLAYNAME)
-        retval |= UA_LocalizedText_copy(&curr->head.displayName, &descr->displayName);
+    if(mask & UA_BROWSERESULTMASK_DISPLAYNAME) {
+        UA_LocalizedText displayname =
+            UA_Session_getNodeDisplayName(session, &curr->head);
+        retval |= UA_LocalizedText_copy(&displayname, &descr->displayName);
+    }
     if(mask & UA_BROWSERESULTMASK_TYPEDEFINITION) {
         if(curr->head.nodeClass == UA_NODECLASS_OBJECT ||
            curr->head.nodeClass == UA_NODECLASS_VARIABLE) {
@@ -565,7 +568,7 @@ addReferenceDescription(UA_Server *server, RefResult *rr,
 
 /* Returns whether the node / continuationpoint is done */
 static UA_StatusCode
-browseReferences(UA_Server *server, const UA_NodeHead *head,
+browseReferences(UA_Server *server, const UA_Session *session, const UA_NodeHead *head,
                  ContinuationPoint *cp, RefResult *rr, UA_Boolean *done) {
     UA_assert(cp);
     const UA_BrowseDescription *bd = &cp->browseDescription;
@@ -666,7 +669,7 @@ browseReferences(UA_Server *server, const UA_NodeHead *head,
             }
 
             /* Copy the node description. Target is on top of the stack */
-            retval = addReferenceDescription(server, rr, rk, bd->resultMask,
+            retval = addReferenceDescription(server, session, rr, rk, bd->resultMask,
                                              ref->targetId, target);
             if(target)
                 UA_NODESTORE_RELEASE(server, target);
@@ -748,7 +751,7 @@ browseWithContinuation(UA_Server *server, UA_Session *session,
 
     /* Browse the references */
     UA_Boolean done = false;
-    result->statusCode = browseReferences(server, &node->head, cp, &rr, &done);
+    result->statusCode = browseReferences(server, session, &node->head, cp, &rr, &done);
     UA_NODESTORE_RELEASE(server, node);
     if(result->statusCode != UA_STATUSCODE_GOOD) {
         RefResult_clear(&rr);
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 670fd74b013..917dfca29c8 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -2360,12 +2360,9 @@ addOptionalVariableField(UA_Server *server, const UA_NodeId *originCondition,
                          UA_NodeId *outOptionalVariable) {
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.valueRank = optionalVariableFieldNode->valueRank;
-    UA_StatusCode retval = UA_LocalizedText_copy(&optionalVariableFieldNode->head.displayName,
-                                                 &vAttr.displayName);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Copying LocalizedText failed",);
-
-    retval = UA_NodeId_copy(&optionalVariableFieldNode->dataType, &vAttr.dataType);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Copying NodeId failed",);
+    vAttr.displayName = UA_Session_getNodeDisplayName(&server->adminSession,
+                                                      &optionalVariableFieldNode->head);
+    vAttr.dataType = optionalVariableFieldNode->dataType;
 
     /* Get typedefintion */
     const UA_Node *type = getNodeType(server, &optionalVariableFieldNode->head);
@@ -2373,7 +2370,6 @@ addOptionalVariableField(UA_Server *server, const UA_NodeId *originCondition,
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                        "Invalid VariableType. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADTYPEDEFINITIONINVALID));
-        UA_VariableAttributes_clear(&vAttr);
         return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
     }
 
@@ -2387,11 +2383,11 @@ addOptionalVariableField(UA_Server *server, const UA_NodeId *originCondition,
 
     /* Set a random unused NodeId with specified Namespace Index*/
     UA_NodeId optionalVariable = {originCondition->namespaceIndex, UA_NODEIDTYPE_NUMERIC, {0}};
-    retval = UA_Server_addVariableNode(server, optionalVariable, *originCondition,
-                                       referenceToParent, *fieldName, type->head.nodeId,
-                                       vAttr, NULL, outOptionalVariable);
+    UA_StatusCode retval =
+        UA_Server_addVariableNode(server, optionalVariable, *originCondition,
+                                  referenceToParent, *fieldName, type->head.nodeId,
+                                  vAttr, NULL, outOptionalVariable);
     UA_NODESTORE_RELEASE(server, type);
-    UA_VariableAttributes_clear(&vAttr);
     return retval;
 }
 
@@ -2401,9 +2397,8 @@ addOptionalObjectField(UA_Server *server, const UA_NodeId *originCondition,
                        const UA_ObjectNode *optionalObjectFieldNode,
                        UA_NodeId *outOptionalObject) {
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
-    UA_StatusCode retval = UA_LocalizedText_copy(&optionalObjectFieldNode->head.displayName,
-                                                 &oAttr.displayName);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Copying LocalizedText failed",);
+    oAttr.displayName = UA_Session_getNodeDisplayName(&server->adminSession,
+                                                      &optionalObjectFieldNode->head);
 
     /* Get typedefintion */
     const UA_Node *type = getNodeType(server, &optionalObjectFieldNode->head);
@@ -2411,7 +2406,6 @@ addOptionalObjectField(UA_Server *server, const UA_NodeId *originCondition,
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                        "Invalid ObjectType. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADTYPEDEFINITIONINVALID));
-        UA_ObjectAttributes_clear(&oAttr);
         return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
     }
 
@@ -2424,15 +2418,14 @@ addOptionalObjectField(UA_Server *server, const UA_NodeId *originCondition,
         referenceToParent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
 
     UA_NodeId optionalObject = {originCondition->namespaceIndex, UA_NODEIDTYPE_NUMERIC, {0}};
-    retval = UA_Server_addObjectNode(server, optionalObject, *originCondition,
+    UA_StatusCode retval = UA_Server_addObjectNode(server, optionalObject, *originCondition,
                                      referenceToParent, *fieldName, type->head.nodeId,
                                      oAttr, NULL, outOptionalObject);
-
     UA_NODESTORE_RELEASE(server, type);
-    UA_ObjectAttributes_clear(&oAttr);
     return retval;
 }
-#endif//CONDITIONOPTIONALFIELDS_SUPPORT
+
+#endif /* CONDITIONOPTIONALFIELDS_SUPPORT */
 
 /**
  * add an optional condition field using its name. (Adding optional methods

From a150b1e3b4d1c831eb1ce1e6f1072cf9ce684072 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 14 Jul 2022 15:05:56 +0200
Subject: [PATCH 0316/1963] feat(server): UA_Server_getSessionById can return
 the admin session

---
 src/server/ua_services_session.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 03b3590ddd0..43c3dd279bd 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -171,6 +171,9 @@ UA_Server_getSessionById(UA_Server *server, const UA_NodeId *sessionId) {
         return &current->session;
     }
 
+    if(UA_NodeId_equal(sessionId, &server->adminSession.sessionId))
+        return &server->adminSession;
+
     return NULL;
 }
 

From fb35ba4245bb5ac561cddc82785904b2386823a1 Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Thu, 14 Jul 2022 15:06:17 +0200
Subject: [PATCH 0317/1963] feat(server): Don't overwrite session locales if a
 second "Activate" does not specify any

---
 src/server/ua_services_session.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 43c3dd279bd..37223c3b3c3 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -834,19 +834,26 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     }
 
     /* Set the locale */
-    response->responseHeader.serviceResult |=
-        UA_Array_copy(request->localeIds, request->localeIdsSize,
-                      (void**)&tmpLocaleIds, &UA_TYPES[UA_TYPES_STRING]);
-    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_Session_detachFromSecureChannel(session);
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
-                               "ActivateSession: Could not store the Session LocaleIds");
-        goto rejected;
+
+    /* Part 4, §5.6.3.2: This parameter only needs to be specified during the first call to
+     * ActivateSession during a single application Session. If it is not specified the
+     * Server shall keep using the current localeIds for the Session.
+    */
+    if(request->localeIdsSize > 0) {
+        response->responseHeader.serviceResult |=
+            UA_Array_copy(request->localeIds, request->localeIdsSize,
+                          (void**)&tmpLocaleIds, &UA_TYPES[UA_TYPES_STRING]);
+        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+            UA_Session_detachFromSecureChannel(session);
+            UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                                   "ActivateSession: Could not store the Session LocaleIds");
+            goto rejected;
+        }
+        UA_Array_delete(session->localeIds, session->localeIdsSize,
+                        &UA_TYPES[UA_TYPES_STRING]);
+        session->localeIds = tmpLocaleIds;
+        session->localeIdsSize = request->localeIdsSize;
     }
-    UA_Array_delete(session->localeIds, session->localeIdsSize,
-                    &UA_TYPES[UA_TYPES_STRING]);
-    session->localeIds = tmpLocaleIds;
-    session->localeIdsSize = request->localeIdsSize;
 
     UA_Session_updateLifetime(session);
 

From d5938538a0adc163a07d8e8580592db2175287de Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 14 Jul 2022 15:07:25 +0200
Subject: [PATCH 0318/1963] refactor(core): UA_KeyValueMap_delete returns a
 status

For example whether an entry was not found.
---
 include/open62541/util.h | 2 +-
 src/ua_util.c            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/open62541/util.h b/include/open62541/util.h
index ee4489b548e..49f1ed39e6e 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -64,7 +64,7 @@ UA_KeyValueMap_getScalar(const UA_KeyValuePair *map, size_t mapSize,
                          const UA_DataType *type);
 
 /* Remove a single entry. To delete the entire map, use UA_Array_delete. */
-UA_EXPORT void
+UA_EXPORT UA_StatusCode
 UA_KeyValueMap_delete(UA_KeyValuePair **map, size_t *mapSize,
                       const UA_QualifiedName key);
 
diff --git a/src/ua_util.c b/src/ua_util.c
index f6e2d9a0d39..88d522db394 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -275,7 +275,7 @@ UA_KeyValueMap_getScalar(const UA_KeyValuePair *map, size_t mapSize,
     return v->data;
 }
 
-void
+UA_StatusCode
 UA_KeyValueMap_delete(UA_KeyValuePair **map, size_t *mapSize,
                       const UA_QualifiedName key) {
     UA_KeyValuePair *m = *map;
@@ -301,6 +301,7 @@ UA_KeyValueMap_delete(UA_KeyValuePair **map, size_t *mapSize,
                            * array around. Resize never fails when reducing
                            * the size to zero. Reduce the size integer in
                            * any case. */
-        break;
+        return UA_STATUSCODE_GOOD;
     }
+    return UA_STATUSCODE_BADNOTFOUND;
 }

From 7ce3520f42ca03fdfe440a91b8a8f87d69f8db3a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 14 Jul 2022 15:09:41 +0200
Subject: [PATCH 0319/1963] feat(server): Make the session attributes
 accessible from the userland

---
 include/open62541/server.h                   |  58 +++++---
 src/server/ua_session.c                      | 134 +++++++++++++------
 src/server/ua_session.h                      |   4 +-
 tests/client/check_client.c                  |  15 ++-
 tests/server/check_server_alarmsconditions.c |  10 +-
 tests/server/check_services_attributes.c     | 128 +++++++++++++++++-
 tests/server/check_services_view.c           |  66 +++++++++
 7 files changed, 341 insertions(+), 74 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index dec5fa2a476..8accba6ab47 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -488,37 +488,53 @@ UA_Server_removeCallback(UA_Server *server, UA_UInt64 callbackId);
 UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId);
 
-/* Session Parameters: Besides the user-definable session context pointer,
- * so-called session parameters are a way to attach key-value parameters to a
- * session. This enables "plugins" to attach data to a session without impacting
- * the user-definedable session context pointer. */
-
-UA_EXPORT UA_StatusCode UA_THREADSAFE
-UA_Server_setSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                              const UA_QualifiedName key,
-                              const UA_Variant *value);
+/**
+ * Session attributes: Besides the user-definable session context pointer (set
+ * by the AccessControl plugin when the Session is created), a session carries
+ * attributes in a key-value list. Some attributes are present in every session
+ * and shown in the list below. Additional attributes can be manually set as
+ * meta-data.
+ *
+ * Always present as session attributes are:
+ *
+ * - 0:localeIds [UA_String]: List of preferred languages (read-only)
+ * - 0:clientDescription [UA_ApplicationDescription]: Client description (read-only)
+ * - 0:sessionName [String] Client-defined name of the session (read-only)
+ */
 
-UA_EXPORT void UA_THREADSAFE
-UA_Server_deleteSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                                 const UA_QualifiedName key);
+/* Returns a shallow copy of the attribute. Don't _clear or _delete the value
+ * variant. Don't use the value once the Session could be already closed in the
+ * background or the attribute of the session replaced. Hence don't use this in a
+ * multi-threaded application. */
+UA_EXPORT UA_StatusCode
+UA_Server_getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
+                              const UA_QualifiedName key, UA_Variant *outValue);
 
-/* Returns NULL if the session or the parameter are not defined. Returns a deep
- * copy otherwise */
+/* Return a deep copy of the attribute */
 UA_EXPORT UA_StatusCode UA_THREADSAFE
-UA_Server_getSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                              const UA_QualifiedName key,
-                              UA_Variant *outValue);
+UA_Server_getSessionAttributeCopy(UA_Server *server, const UA_NodeId *sessionId,
+                                  const UA_QualifiedName key, UA_Variant *outValue);
 
 /* Returns NULL if the parameter is not defined or not a scalar or not of the
- * right datatype. Otherwise a deep copy of the scalar value is filled at the
- * target location of the void pointer. */
-UA_EXPORT UA_StatusCode UA_THREADSAFE
-UA_Server_getSessionParameter_scalar(UA_Server *server,
+ * right datatype. Otherwise a shallow copy of the scalar value is created at
+ * the target location of the void pointer. Hence don't use this in a
+ * multi-threaded application. */
+UA_EXPORT UA_StatusCode
+UA_Server_getSessionAttribute_scalar(UA_Server *server,
                                      const UA_NodeId *sessionId,
                                      const UA_QualifiedName key,
                                      const UA_DataType *type,
                                      void *outValue);
 
+UA_EXPORT UA_StatusCode UA_THREADSAFE
+UA_Server_setSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
+                              const UA_QualifiedName key,
+                              const UA_Variant *value);
+
+UA_EXPORT UA_StatusCode UA_THREADSAFE
+UA_Server_deleteSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
+                                 const UA_QualifiedName key);
+
 /**
  * Reading and Writing Node Attributes
  * -----------------------------------
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index 0c1d3f5f0ec..ad53f4a6401 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -55,10 +55,10 @@ void UA_Session_clear(UA_Session *session, UA_Server* server) {
     session->continuationPoints = NULL;
     session->availableContinuationPoints = UA_MAXCONTINUATIONPOINTS;
 
-    UA_Array_delete(session->params, session->paramsSize,
+    UA_Array_delete(session->attributes, session->attributesSize,
                     &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    session->params = NULL;
-    session->paramsSize = 0;
+    session->attributes = NULL;
+    session->attributesSize = 0;
 
     UA_Array_delete(session->localeIds, session->localeIdsSize,
                     &UA_TYPES[UA_TYPES_STRING]);
@@ -251,82 +251,136 @@ UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId) {
     return res;
 }
 
+/* Session Attributes */
+
+#define UA_PROTECTEDATTRIBUTESSIZE 3
+static const UA_QualifiedName protectedAttributes[UA_PROTECTEDATTRIBUTESSIZE] = {
+    {0, UA_STRING_STATIC("localeIds")},
+    {0, UA_STRING_STATIC("clientDescription")},
+    {0, UA_STRING_STATIC("sessionName")}
+};
+
+static UA_Boolean
+protectedAttribute(const UA_QualifiedName key) {
+    for(size_t i = 0; i < UA_PROTECTEDATTRIBUTESSIZE; i++) {
+        if(UA_QualifiedName_equal(&key, &protectedAttributes[i]))
+            return true;
+    }
+    return false;
+}
+
 UA_StatusCode
-UA_Server_setSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
+UA_Server_setSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
                               const UA_QualifiedName key, const UA_Variant *value) {
+    if(protectedAttribute(key))
+        return UA_STATUSCODE_BADNOTWRITABLE;
     UA_LOCK(&server->serviceMutex);
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
     UA_StatusCode res = UA_STATUSCODE_BADSESSIONIDINVALID;
     if(session)
-        res = UA_KeyValueMap_set(&session->params, &session->paramsSize,
+        res = UA_KeyValueMap_set(&session->attributes, &session->attributesSize,
                                  key, value);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
 
-void
-UA_Server_deleteSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
+UA_StatusCode
+UA_Server_deleteSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
                                  const UA_QualifiedName key) {
+    if(protectedAttribute(key))
+        return UA_STATUSCODE_BADNOTWRITABLE;
     UA_LOCK(&server->serviceMutex);
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
-    if(session)
-        UA_KeyValueMap_delete(&session->params, &session->paramsSize, key);
+    if(!session)
+        return UA_STATUSCODE_BADSESSIONIDINVALID;
+    UA_StatusCode res =
+        UA_KeyValueMap_delete(&session->attributes, &session->attributesSize, key);
     UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
-UA_StatusCode
-UA_Server_getSessionParameter(UA_Server *server, const UA_NodeId *sessionId,
-                              const UA_QualifiedName key,
-                              UA_Variant *outParameter) {
-    UA_LOCK(&server->serviceMutex);
-    if(!outParameter) {
-        UA_UNLOCK(&server->serviceMutex);
+static UA_StatusCode
+getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
+                    const UA_QualifiedName key, UA_Variant *outValue,
+                    UA_Boolean copy) {
+    if(!outValue)
         return UA_STATUSCODE_BADINTERNALERROR;
-    }
 
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
-    if(!session) {
-        UA_UNLOCK(&server->serviceMutex);
+    if(!session)
         return UA_STATUSCODE_BADSESSIONIDINVALID;
-    }
 
-    const UA_Variant *param =
-        UA_KeyValueMap_get(session->params, session->paramsSize, key);
-    if(!param) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADNOTFOUND;
+    const UA_Variant *attr;
+    UA_Variant localAttr;
+
+    if(UA_QualifiedName_equal(&key, &protectedAttributes[0])) {
+        /* Return LocaleIds */
+        UA_Variant_setArray(&localAttr, session->localeIds,
+                            session->localeIdsSize, &UA_TYPES[UA_TYPES_STRING]);
+        attr = &localAttr;
+    } else if(UA_QualifiedName_equal(&key, &protectedAttributes[1])) {
+        /* Return client description */
+        UA_Variant_setScalar(&localAttr, &session->clientDescription,
+                             &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+        attr = &localAttr;
+    } else if(UA_QualifiedName_equal(&key, &protectedAttributes[2])) {
+        /* Return session name */
+        UA_Variant_setScalar(&localAttr, &session->sessionName,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        attr = &localAttr;
+    } else {
+        /* Get from the actual key-value list */
+        attr = UA_KeyValueMap_get(session->attributes, session->attributesSize, key);
+        if(!attr)
+            return UA_STATUSCODE_BADNOTFOUND;
     }
 
-    UA_StatusCode res = UA_Variant_copy(param, outParameter);
+    if(copy)
+        return UA_Variant_copy(attr, outValue);
+    *outValue = *attr;
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Server_getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
+                              const UA_QualifiedName key, UA_Variant *outValue) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = getSessionAttribute(server, sessionId, key, outValue, false);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
 
 UA_StatusCode
-UA_Server_getSessionParameter_scalar(UA_Server *server, const UA_NodeId *sessionId,
+UA_Server_getSessionAttributeCopy(UA_Server *server, const UA_NodeId *sessionId,
+                                  const UA_QualifiedName key, UA_Variant *outValue) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = getSessionAttribute(server, sessionId, key, outValue, true);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_Server_getSessionAttribute_scalar(UA_Server *server,
+                                     const UA_NodeId *sessionId,
                                      const UA_QualifiedName key,
                                      const UA_DataType *type,
-                                     void *outParameter) {
+                                     void *outValue) {
     UA_LOCK(&server->serviceMutex);
-    if(!outParameter) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
 
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
-    if(!session) {
+    UA_Variant attr;
+    UA_StatusCode res = getSessionAttribute(server, sessionId, key, &attr, false);
+    if(res != UA_STATUSCODE_GOOD) {
         UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADSESSIONIDINVALID;
+        return res;
     }
 
-    const UA_Variant *param =
-        UA_KeyValueMap_get(session->params, session->paramsSize, key);
-    if(!param || !UA_Variant_hasScalarType(param, type)) {
+    if(!UA_Variant_hasScalarType(&attr, type)) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
-    UA_StatusCode res = UA_copy(param->data, outParameter, type);
+    memcpy(outValue, attr.data, type->memSize);
+
     UA_UNLOCK(&server->serviceMutex);
-    return res;
+    return UA_STATUSCODE_GOOD;
 }
diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index 6aa22720408..fc549a444a8 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -51,8 +51,8 @@ typedef struct {
     UA_UInt16         availableContinuationPoints;
     ContinuationPoint *continuationPoints;
 
-    size_t paramsSize;
-    UA_KeyValuePair *params;
+    size_t attributesSize;
+    UA_KeyValuePair *attributes;
 
     /* Localization information */
     size_t localeIdsSize;
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index c5b54578ecf..675a868b392 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -384,15 +384,26 @@ START_TEST(Client_activateSessionLocaleIds) {
     UA_ClientConfig *config = UA_Client_getConfig(client);
     UA_ClientConfig_setDefault(config);
 
-    config->sessionLocaleIdsSize = 1;
-    config->sessionLocaleIds = (UA_LocaleId*)UA_Array_new(1, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId*)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
     config->sessionLocaleIds[0] = UA_STRING_ALLOC("en");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("fr");
 
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     ck_assert_uint_eq(server->sessionCount, 1);
 
+    UA_QualifiedName key = {0, UA_STRING_STATIC("localeIds")};
+    UA_Variant locales;
+    UA_Server_getSessionAttribute(server, &server->sessions.lh_first->session.sessionId,
+                                  key, &locales);
+
+    ck_assert_uint_eq(locales.arrayLength, 2);
+    UA_String *localeIds = (UA_String*)locales.data;
+    ck_assert(UA_String_equal(&localeIds[0], &config->sessionLocaleIds[0]));
+    ck_assert(UA_String_equal(&localeIds[1], &config->sessionLocaleIds[1]));
+
     UA_Client_delete(client);
 
     ck_assert_uint_eq(server->sessionCount, 0);
diff --git a/tests/server/check_server_alarmsconditions.c b/tests/server/check_server_alarmsconditions.c
index 07ce82be3ea..061b85fbb1d 100644
--- a/tests/server/check_server_alarmsconditions.c
+++ b/tests/server/check_server_alarmsconditions.c
@@ -104,12 +104,14 @@ START_TEST(splitCreation) {
     UA_Variant_init(&enabledStateVariant);
     retval = UA_Server_readValue(server_ac, var, &enabledStateVariant);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_msg(UA_Variant_hasScalarType(
-        &enabledStateVariant,
-        &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]),
+    ck_assert_msg(UA_Variant_hasScalarType(&enabledStateVariant, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]),
         "Unexpected Data Type of EnabledState");
+
     const UA_LocalizedText* enabledState = (UA_LocalizedText*)enabledStateVariant.data;
-    ck_assert_str_eq((const char*)enabledState->text.data, "Disabled");
+    UA_String disabledStr = UA_STRING("Disabled");
+    ck_assert(UA_String_equal(&enabledState->text, &disabledStr));
+
+    UA_Variant_clear(&enabledStateVariant);
 
     retval = UA_Server_deleteCondition(
         server_ac,
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index b5f750d3258..a30d0b6ee71 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -149,6 +149,20 @@ static void setup(void) {
                                      NULL, 0, NULL, 0, NULL, NULL, NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 #endif
+
+    /* Variable node with localized DisplayName and Description */
+    UA_VariableAttributes lvattr = UA_VariableAttributes_default;
+    UA_Variant_setScalar(&vattr.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
+    lvattr.description = UA_LOCALIZEDTEXT("en-US","MyDescription");
+    lvattr.displayName = UA_LOCALIZEDTEXT("en-US","MyDisplayName");
+    lvattr.valueRank = UA_VALUERANK_ANY;
+    UA_QualifiedName myLocalizedVarName = UA_QUALIFIEDNAME(1, "LocalizedAttributes");
+    UA_NodeId myLocalizedVarNodeId = UA_NODEID_STRING(1, "localized.attrs");
+    retval = UA_Server_addVariableNode(server, myLocalizedVarNodeId, parentNodeId,
+                                       parentReferenceNodeId, myLocalizedVarName,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                       lvattr, NULL, NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 }
 
 static UA_VariableNode* makeCompareSequence(void) {
@@ -163,8 +177,8 @@ static UA_VariableNode* makeCompareSequence(void) {
     UA_QualifiedName_copy(&myIntegerName, &node->head.browseName);
 
     const UA_LocalizedText myIntegerDisplName = UA_LOCALIZEDTEXT("locale", "the answer");
-    UA_LocalizedText_copy(&myIntegerDisplName, &node->head.displayName);
-    UA_LocalizedText_copy(&myIntegerDisplName, &node->head.description);
+    UA_Node_insertOrUpdateDescription(&node->head, &myIntegerDisplName);
+    UA_Node_insertOrUpdateDisplayName(&node->head, &myIntegerDisplName);
 
     const UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "the.answer");
     UA_NodeId_copy(&myIntegerNodeId, &node->head.nodeId);
@@ -304,7 +318,9 @@ START_TEST(ReadSingleAttributeDisplayNameWithoutTimestamp) {
     ck_assert_uint_eq(0, resp.value.arrayLength);
     ck_assert(&UA_TYPES[UA_TYPES_LOCALIZEDTEXT] == resp.value.type);
     ck_assert(UA_String_equal(&comp.text, &respval->text));
-    ck_assert(UA_String_equal(&compNode->head.displayName.locale, &respval->locale));
+    UA_LocalizedText displayName =
+        UA_Session_getNodeDisplayName(NULL, &compNode->head);
+    ck_assert(UA_String_equal(&displayName.locale, &respval->locale));
     UA_DataValue_clear(&resp);
     UA_NODESTORE_DELETE(server, (UA_Node*)compNode);
 } END_TEST
@@ -321,8 +337,10 @@ START_TEST(ReadSingleAttributeDescriptionWithoutTimestamp) {
     UA_VariableNode* compNode = makeCompareSequence();
     ck_assert_uint_eq(0, resp.value.arrayLength);
     ck_assert(&UA_TYPES[UA_TYPES_LOCALIZEDTEXT] == resp.value.type);
-    ck_assert(UA_String_equal(&compNode->head.description.locale, &respval->locale));
-    ck_assert(UA_String_equal(&compNode->head.description.text, &respval->text));
+    UA_LocalizedText description =
+        UA_Session_getNodeDescription(NULL, &compNode->head);
+    ck_assert(UA_String_equal(&description.locale, &respval->locale));
+    ck_assert(UA_String_equal(&description.text, &respval->text));
     UA_DataValue_clear(&resp);
     UA_NODESTORE_DELETE(server, (UA_Node*)compNode);
 } END_TEST
@@ -977,6 +995,100 @@ START_TEST(WriteSingleDataSourceAttributeValue) {
     ck_assert_int_eq(retval, UA_STATUSCODE_BADWRITENOTSUPPORTED);
 } END_TEST
 
+START_TEST(CheckDisplayNameLocalization) {
+    /* Add a german localization for the DisplayName attribute */
+    UA_WriteValue wValue;
+    UA_WriteValue_init(&wValue);
+    UA_LocalizedText germanDisplayName = UA_LOCALIZEDTEXT("de-DE", "MeinAnzeigeName");
+    UA_Variant_setScalar(&wValue.value.value, &germanDisplayName, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+    wValue.nodeId = UA_NODEID_STRING(1, "localized.attrs");
+    wValue.attributeId = UA_ATTRIBUTEID_DISPLAYNAME;
+    wValue.value.hasValue = true;
+    UA_StatusCode retval = UA_Server_write(server, &wValue);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Check the original english value fallback */
+    UA_LocalizedText lt;
+    UA_LocalizedText_init(&lt);
+    retval = UA_Server_readDisplayName(server, wValue.nodeId, &lt);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_LocalizedText expectedEnglishValue = UA_LOCALIZEDTEXT("en-US", "MyDisplayName");
+    ck_assert(UA_String_equal(&lt.locale, &expectedEnglishValue.locale));
+    ck_assert(UA_String_equal(&lt.text, &expectedEnglishValue.text));
+    UA_LocalizedText_clear(&lt);
+
+    /* Check the new german value */
+    server->adminSession.localeIdsSize = 1;
+    server->adminSession.localeIds = UA_LocaleId_new();
+    *server->adminSession.localeIds = UA_STRING_ALLOC("de-DE");
+
+    retval = UA_Server_readDisplayName(server, wValue.nodeId, &lt);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    ck_assert(UA_String_equal(&lt.locale, &germanDisplayName.locale));
+    ck_assert(UA_String_equal(&lt.text, &germanDisplayName.text));
+    UA_LocalizedText_clear(&lt);
+
+    /* Requesting de-CH should return de-DE if only de-DE is available */
+    UA_LocaleId_clear(server->adminSession.localeIds);
+    *server->adminSession.localeIds = UA_STRING_ALLOC("de-CH");
+
+    retval = UA_Server_readDisplayName(server, wValue.nodeId, &lt);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    ck_assert(UA_String_equal(&lt.locale, &germanDisplayName.locale));
+    ck_assert(UA_String_equal(&lt.text, &germanDisplayName.text));
+    UA_LocalizedText_clear(&lt);
+} END_TEST
+
+START_TEST(CheckDescriptionLocalization) {
+    /* Add a german localization for the Description attribute */
+    UA_WriteValue wValue;
+    UA_WriteValue_init(&wValue);
+    UA_LocalizedText germanDescription = UA_LOCALIZEDTEXT("de-DE", "MeineBeschreibung");
+    UA_Variant_setScalar(&wValue.value.value, &germanDescription, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+    wValue.nodeId = UA_NODEID_STRING(1, "localized.attrs");
+    wValue.attributeId = UA_ATTRIBUTEID_DESCRIPTION;
+    wValue.value.hasValue = true;
+    UA_StatusCode retval = UA_Server_write(server, &wValue);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Check the original english value */
+    UA_LocalizedText lt;
+    UA_LocalizedText_init(&lt);
+    retval = UA_Server_readDescription(server, wValue.nodeId, &lt);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_LocalizedText expectedEnglishValue = UA_LOCALIZEDTEXT("en-US", "MyDescription");
+    ck_assert(UA_String_equal(&lt.locale, &expectedEnglishValue.locale));
+    ck_assert(UA_String_equal(&lt.text, &expectedEnglishValue.text));
+    UA_LocalizedText_clear(&lt);
+
+    /* Check the new german value */
+    server->adminSession.localeIdsSize = 1;
+    server->adminSession.localeIds = UA_LocaleId_new();
+    *server->adminSession.localeIds = UA_STRING_ALLOC("de-DE");
+
+    retval = UA_Server_readDescription(server, wValue.nodeId, &lt);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    ck_assert(UA_String_equal(&lt.locale, &germanDescription.locale));
+    ck_assert(UA_String_equal(&lt.text, &germanDescription.text));
+    UA_LocalizedText_clear(&lt);
+
+    /* Requesting de-CH should return de-DE if only de-DE is available */
+    UA_LocaleId_clear(server->adminSession.localeIds);
+    *server->adminSession.localeIds = UA_STRING_ALLOC("de-CH");
+
+    retval = UA_Server_readDescription(server, wValue.nodeId, &lt);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    ck_assert(UA_String_equal(&lt.locale, &germanDescription.locale));
+    ck_assert(UA_String_equal(&lt.text, &germanDescription.text));
+    UA_LocalizedText_clear(&lt);
+} END_TEST
+
 static Suite * testSuite_services_attributes(void) {
     Suite *s = suite_create("services_attributes_read");
 
@@ -1043,6 +1155,12 @@ static Suite * testSuite_services_attributes(void) {
 
     suite_add_tcase(s, tc_writeSingleAttributes);
 
+    TCase *tc_localization = tcase_create("localization");
+    tcase_add_checked_fixture(tc_localization, setup, teardown);
+    tcase_add_test(tc_localization, CheckDisplayNameLocalization);
+    tcase_add_test(tc_localization, CheckDescriptionLocalization);
+    suite_add_tcase(s, tc_localization);
+
     return s;
 }
 
diff --git a/tests/server/check_services_view.c b/tests/server/check_services_view.c
index 02cf95d9934..0ef6e6a3c89 100644
--- a/tests/server/check_services_view.c
+++ b/tests/server/check_services_view.c
@@ -303,6 +303,70 @@ START_TEST(Service_Browse_Recursive) {
 }
 END_TEST
 
+START_TEST(Service_Browse_Localization) {
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+
+    UA_NodeId outerObjectId = UA_NODEID_STRING(1, "EntryPoint");
+
+    {
+        UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+        attr.displayName = UA_LOCALIZEDTEXT("en-US", "EntryPoint");
+        UA_QualifiedName browseName = UA_QUALIFIEDNAME(0, "EntryPoint");
+        UA_StatusCode result = UA_Server_addObjectNode(server, outerObjectId, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                                       UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), browseName,
+                                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE), attr, NULL, NULL);
+        ck_assert_int_eq(result, UA_STATUSCODE_GOOD);
+    }
+
+    UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "MyDisplayName");
+    UA_NodeId objectId = UA_NODEID_STRING(1, "LocalizedObject");
+    UA_QualifiedName browseName = UA_QUALIFIEDNAME(0, "LocalizedObject");
+    UA_StatusCode result = UA_Server_addObjectNode(server, objectId, outerObjectId,
+                                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), browseName,
+                                                   UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE), attr, NULL, NULL);
+    ck_assert_int_eq(result, UA_STATUSCODE_GOOD);
+
+    UA_LocalizedText germanDisplayName = UA_LOCALIZEDTEXT("de-DE", "MeinAnzeigeName");
+    result = UA_Server_writeDisplayName(server, objectId, germanDisplayName);
+    ck_assert_int_eq(result, UA_STATUSCODE_GOOD);
+
+    UA_BrowseDescription bd;
+    UA_BrowseDescription_init(&bd);
+    bd.nodeId = outerObjectId;
+    bd.resultMask = UA_BROWSERESULTMASK_ALL;
+    bd.nodeClassMask = UA_NODECLASS_OBJECT;
+    bd.browseDirection = UA_BROWSEDIRECTION_FORWARD;
+    bd.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
+
+    /* Expect the english display name */
+    server->adminSession.localeIdsSize = 1;
+    server->adminSession.localeIds = UA_LocaleId_new();
+    *server->adminSession.localeIds = UA_STRING_ALLOC("en-US");
+
+    UA_BrowseResult br = UA_Server_browse(server, 100, &bd);
+    ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(br.referencesSize, 1);
+    ck_assert(UA_String_equal(&br.references->displayName.locale, &attr.displayName.locale));
+    ck_assert(UA_String_equal(&br.references->displayName.text, &attr.displayName.text));
+    UA_BrowseResult_clear(&br);
+
+    /* Expect the german display name */
+    UA_LocaleId_clear(server->adminSession.localeIds);
+    *server->adminSession.localeIds = UA_STRING_ALLOC("de-DE");
+
+    br = UA_Server_browse(server, 100, &bd);
+    ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(br.referencesSize, 1);
+    ck_assert(UA_String_equal(&br.references->displayName.locale, &germanDisplayName.locale));
+    ck_assert(UA_String_equal(&br.references->displayName.text, &germanDisplayName.text));
+    UA_BrowseResult_clear(&br);
+
+    UA_Server_delete(server);
+}
+END_TEST
+
 START_TEST(Service_TranslateBrowsePathsToNodeIds) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
@@ -440,6 +504,7 @@ static Suite *testSuite_Service_TranslateBrowsePathsToNodeIds(void) {
     tcase_add_test(tc_browse, Service_Browse_ReferenceTypes);
     tcase_add_test(tc_browse, Service_Browse_WithMaxResults);
     tcase_add_test(tc_browse, Service_Browse_Recursive);
+    tcase_add_test(tc_browse, Service_Browse_Localization);
     suite_add_tcase(s, tc_browse);
 
     TCase *tc_translate = tcase_create("TranslateBrowsePathsToNodeIds");
@@ -450,6 +515,7 @@ static Suite *testSuite_Service_TranslateBrowsePathsToNodeIds(void) {
     tcase_add_test(tc_translate, BrowseSimplifiedBrowsePath);
 
     suite_add_tcase(s, tc_translate);
+
     return s;
 }
 

From 752ffc573ba89c6ca1b4265f9f58e9f19c2d76f9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 14 Jul 2022 15:18:13 +0200
Subject: [PATCH 0320/1963] feat(doc): Add documentation for the server locale
 support

---
 CHANGELOG                            | 16 ++++++++++++++++
 include/open62541/plugin/nodestore.h |  9 +++++++++
 2 files changed, 25 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c58ea7b6eed..48dfe89b599 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,22 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2022-07-14 Jannis Voelker <jannis.voelker at basyskom.com>
+
+ * LocaleId support in the server
+
+   The server now supports that descriptions and display names for
+   different locales are written to a node. The server selects a
+   suitable localization depending on the locale ids that are set for
+   the current session.
+
+   Locales are added simply by writing a LocalizedText value with a
+   different locale. A locale can be removed by writing a
+   LocalizedText value of the corresponding locale and with an empty
+   text.
+
+   The change was done with pull request #4165.
+
 2022-07-07 Andreas Eckerstorfer <estr at keba.com>
 
  * PubSub publisher id types
diff --git a/include/open62541/plugin/nodestore.h b/include/open62541/plugin/nodestore.h
index ff9a71c3e5e..88dd9ef8244 100644
--- a/include/open62541/plugin/nodestore.h
+++ b/include/open62541/plugin/nodestore.h
@@ -402,8 +402,17 @@ struct UA_NodeHead {
     UA_NodeId nodeId;
     UA_NodeClass nodeClass;
     UA_QualifiedName browseName;
+
+    /* A node can have different localizations for displayName and description.
+     * The server selects a suitable localization depending on the locale ids
+     * that are set for the current session.
+     *
+     * Locales are added simply by writing a LocalizedText value with a new
+     * locale. A locale can be removed by writing a LocalizedText value of the
+     * corresponding locale with an empty text field. */
     UA_LocalizedTextListEntry *displayName;
     UA_LocalizedTextListEntry *description;
+
     UA_UInt32 writeMask;
     size_t referencesSize;
     UA_NodeReferenceKind *references;

From 961ac08b0272da8ee9fa0c176c5e99e645d2e2c1 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 25 May 2022 08:55:03 +0200
Subject: [PATCH 0321/1963] feat(el): process advanced parameters udp

---
 arch/eventloop_posix_udp.c   | 792 ++++++++++++++++++++++++++++-------
 plugins/ua_pubsub_ethernet.c |   8 +-
 plugins/ua_pubsub_udp.c      |  60 +--
 3 files changed, 667 insertions(+), 193 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 1695eaed084..b904e57843f 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -8,6 +8,13 @@
 
 #include "eventloop_posix.h"
 
+#define IPV4_PREFIX_MASK 0xF0
+#define IPV4_MULTICAST_PREFIX 0xE0
+#ifdef UA_IPV6
+#   define IPV6_PREFIX_MASK 0xFF
+#   define IPV6_MULTICAST_PREFIX 0xFF
+#endif
+
 #define UA_MAXBACKLOG 100
 #define UA_MAXHOSTNAME_LENGTH 256
 #define UA_MAXPORTSTR_LENGTH 6
@@ -36,6 +43,496 @@ typedef struct {
                              * via the recv-bufsize parameter.*/
 } UDPConnectionManager;
 
+typedef union {
+    struct ip_mreq ipv4;
+#if UA_IPV6
+    struct ipv6_mreq ipv6;
+#endif
+} IpMulticastRequest;
+/* Set the socket non-blocking. If the listen-socket is nonblocking, incoming
+ * connections inherit this state. */
+static UA_StatusCode
+UDP_setNonBlocking(UA_FD sockfd) {
+#ifndef _WIN32
+    int opts = fcntl(sockfd, F_GETFL);
+    if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#else
+    u_long iMode = 1;
+    if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Don't have the socket create interrupt signals */
+static UA_StatusCode
+UDP_setNoSigPipe(UA_FD sockfd) {
+#ifdef SO_NOSIGPIPE
+    int val = 1;
+    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
+    if(res < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+/**
+ * Retrieves hostname and port from given key value parameters.
+ * @param[in] paramsSize the size of the parameter list
+ * @param[in] params the parameter list to retrieve from
+ * @param[out] hostname the retrieved hostname when present, NULL otherwise
+ * @param[out] portStr the retrieved port when present, NULL otherwise
+ * @param[in] logger the logger to log information
+ * @return -1 upon error, 0 if there was no host or port parameter, 1 if
+ *         host and port are present
+ */
+static int
+getHostAndPortFromParams(size_t paramsSize, const UA_KeyValuePair *params,
+                         char *hostname, char *portStr, const UA_Logger *logger) {
+    /* Prepare the port parameter as a string */
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(!port) {
+        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| No port found");
+        return 0;
+    }
+    UA_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
+
+    /* Prepare the hostname string */
+    const UA_String *host = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "hostname"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!host) {
+        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| No hostname found");
+        return 0;
+    }
+    if(host->length >= UA_MAXHOSTNAME_LENGTH) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| Open UDP Connection: Hostname too long, aborting");
+        return -1;
+    }
+    strncpy(hostname, (const char*)host->data, host->length);
+    hostname[host->length] = 0;
+    return 1;
+}
+
+static int
+getNetworkInterfaceFromParams(size_t paramsSize, const UA_KeyValuePair *params,
+                              UA_String *outNetworkInterface, const UA_Logger *logger) {
+    /* Prepare the networkinterface string */
+    const UA_String *networkInterface = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 UA_QUALIFIEDNAME(0, "networkInterface"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!networkInterface) {
+        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| No network interface found");
+        return 0;
+    }
+    UA_String_copy(networkInterface, outNetworkInterface);
+    return 1;
+}
+
+static int
+getConnectionInfoFromParams(size_t paramsSize, const UA_KeyValuePair *params, char *hostname, char *portStr,
+                            struct addrinfo **info, const UA_Logger *logger) {
+
+    int foundParams = getHostAndPortFromParams(paramsSize, params, hostname, portStr, logger);
+    if (foundParams < 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| Failed retrieving host and port parameters");
+        return -1;
+    }
+    if(foundParams == 0) {
+        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "UDP\t| Hostname or Port not present");
+        return 0;
+    }
+    /* Create the socket description from the connectString
+    * TODO: Make this non-blocking */
+    struct addrinfo hints;
+    memset(&hints, 0, sizeof(struct addrinfo));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_DGRAM;
+    int error = getaddrinfo(hostname, portStr, &hints, info);
+    if(error != 0) {
+        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                           "UDP\t| Lookup of %s failed with error %d - %s",
+                           hostname, error, errno_str));
+        return -1;
+    }
+    return 1;
+}
+static UA_INLINE UA_StatusCode
+setLoopBackData(UA_SOCKET sockfd,
+                UA_Boolean enableLoopback,
+                int ai_family,
+                const UA_Logger *logger) {
+    /* Set loop back data to your host */
+    /* The Linux Kernel IPv6 socket code checks for optlen to be at least the
+     * size of an integer. However, channelDataUDPMC->enableLoopback is a
+     * boolean. In order for the code to work for IPv4 and IPv6 propagate it to
+     * a temporary integer here. */
+    UA_Int32 enable = enableLoopback;
+#if UA_IPV6
+    if(UA_setsockopt(sockfd,
+                     ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     ai_family == AF_INET6 ? IPV6_MULTICAST_LOOP : IP_MULTICAST_LOOP,
+                     (const char *)&enable,
+                     sizeof (enable)) < 0)
+#else
+        if(UA_setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_LOOP,
+                     (const char *)&enable,
+                     sizeof (enable)) < 0)
+#endif
+    {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection creation failed. Loopback setup failed: "
+                         "Cannot set socket option IP_MULTICAST_LOOP. Error: %s",
+                         errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_INLINE void
+setTimeToLive(UA_SOCKET sockfd,
+              UA_UInt32 messageTTL,
+              int ai_family,
+              const UA_Logger *logger) {
+    /* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
+#if UA_IPV6
+    if(UA_setsockopt(sockfd,
+                     ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+                     ai_family == PF_INET6 ? IPV6_MULTICAST_HOPS : IP_MULTICAST_TTL,
+                     (const char *)&messageTTL,
+                     sizeof(messageTTL)) < 0)
+#else
+        if(UA_setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
+                     (const char *)&messageTTL,
+                     sizeof(messageTTL)) < 0)
+#endif
+    {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                           "PubSub Connection creation problem. Time to live setup failed: "
+                           "Cannot set socket option IP_MULTICAST_TTL. Error: %s",
+                           errno_str));
+    }
+}
+
+static UA_INLINE void
+setReuseAddress(UA_SOCKET sockfd, UA_Boolean enableReuse, const UA_Logger *logger) {
+    /* Set reuse address -> enables sharing of the same listening address on
+    * different sockets */
+    int enableReuseVal = 1;
+    if (!enableReuse) {
+        enableReuseVal = 0;
+    }
+    if(UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
+                     (const char*)&enableReuseVal, sizeof(enableReuseVal)) < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                           "PubSub Connection creation problem. Reuse address setup failed: "
+                           "Cannot set socket option SO_REUSEADDR. Error: %s",
+                           errno_str));
+    }
+}
+
+#ifdef __linux__
+static UA_StatusCode
+setSocketPriority(UA_SOCKET sockfd, UA_UInt32 *socketPriority, const UA_Logger *logger) {/* Setting the socket priority to the socket */
+    // assert (socketPriority != NULL)
+    if (UA_setsockopt(sockfd, SOL_SOCKET, SO_PRIORITY,
+                      socketPriority, sizeof(*socketPriority)) < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection creation problem. Priority setup failed: "
+                         "Cannot set socket option SO_PRIORITY. Error: %s", errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+#endif
+
+static UA_Boolean
+isMulticastAddress(const UA_Byte *address, UA_Byte mask, UA_Byte prefix) {
+    return (address[0] & mask) == prefix;
+}
+
+static UA_Boolean
+isIPv4MulticastAddress(const UA_Byte *address) {
+    return isMulticastAddress(address, IPV4_PREFIX_MASK, IPV4_MULTICAST_PREFIX);
+}
+
+static UA_Boolean
+isIPv6MulticastAddress(const UA_Byte *address) {
+    return isMulticastAddress(address, IPV6_PREFIX_MASK, IPV6_MULTICAST_PREFIX);
+}
+
+static UA_StatusCode
+setConnectionConfigurationProperties(UA_FD socket,
+                                     const UA_KeyValuePair *connectionProperties,
+                                     const size_t connectionPropertiesSize,
+                                     int ai_family,
+                                     const UA_Logger *logger) {
+    /* Iterate over the given KeyValuePair parameters */
+    UA_String ttlParam = UA_STRING("ttl");
+    UA_String loopbackParam = UA_STRING("loopback");
+    UA_String reuseParam = UA_STRING("reuse");
+
+    UA_String hostnameParam = UA_STRING("hostname");
+    UA_String portParam = UA_STRING("port");
+    UA_String listenHostnamesParam = UA_STRING("listen-hostnames");
+    UA_String listenPortParam= UA_STRING("listen-port");
+
+#ifdef __linux__
+    UA_String socketPriorityParam = UA_STRING("sockpriority");
+#endif
+    for(size_t i = 0; i < connectionPropertiesSize; i++) {
+        const UA_KeyValuePair *prop = &connectionProperties[i];
+        if(UA_String_equal(&prop->key.name, &ttlParam)) {
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
+                UA_UInt32 messageTTL = *(UA_UInt32*)prop->value.data;
+                setTimeToLive(socket, messageTTL, ai_family, logger);
+            }
+        } else if(UA_String_equal(&prop->key.name, &loopbackParam)) {
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
+                UA_Boolean enableLoopback = *(UA_Boolean*)prop->value.data;
+                UA_StatusCode res = setLoopBackData(socket, enableLoopback, ai_family, logger);
+                if (res != UA_STATUSCODE_GOOD) return res;
+            }
+        } else if(UA_String_equal(&prop->key.name, &reuseParam)) {
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
+                UA_Boolean enableReuse = *(UA_Boolean *)prop->value.data;
+                setReuseAddress(socket, enableReuse, logger);
+            }
+#ifdef __linux__
+        } else if(UA_String_equal(&prop->key.name, &socketPriorityParam)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
+                UA_UInt32 *socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
+                if(!socketPriority) {
+                    UA_LOG_WARNING(logger, UA_LOGCATEGORY_SERVER,
+                                   "PubSub Connection creation. Could not set socket priority due to out of memory.");
+                    continue;
+                }
+                UA_UInt32_copy((UA_UInt32 *) prop->value.data, socketPriority);
+                setSocketPriority(socket, socketPriority, logger);
+                UA_free(socketPriority);
+            }
+#endif
+        } else if (UA_String_equal(&prop->key.name, &hostnameParam) ||
+                   UA_String_equal(&prop->key.name, &portParam) ||
+                   UA_String_equal(&prop->key.name, &listenHostnamesParam) ||
+                   UA_String_equal(&prop->key.name, &listenPortParam)) {
+            /* ignore, required args are handled elsewhere explicitly */
+        } else {
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_SERVER,
+                           "PubSub Connection creation. Unknown connection parameter: '%.*s'.",
+                           (int)prop->key.name.length, (char*)prop->key.name.data);
+        }
+    }
+    /* Set the socket options
+    * also there might be external requirements for socket options
+    * how to handle and set those
+    * either via: passed in parameters
+    * or via: specific callback that gives access to the allocated socket
+    * */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    res |= UDP_setNonBlocking(socket);
+    res |= UDP_setNoSigPipe(socket);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                           "UDP\t| Could not set socket options: %s", errno_str));
+        return res;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+static UA_StatusCode
+setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, size_t paramsSize, const UA_KeyValuePair *params,
+                       const UA_Logger *logger) {
+    struct in_addr address = addr->sin_addr;
+
+    IpMulticastRequest ipMulticastRequest;
+    ipMulticastRequest.ipv4.imr_multiaddr = address;
+    /* default outgoing interface ANY */
+    ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
+
+    UA_String netif = UA_STRING_NULL;
+    int foundInterface = getNetworkInterfaceFromParams(paramsSize, params, &netif, logger);
+    if(foundInterface < 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Opening a connection failed");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    if(netif.length > 0) {
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
+        memcpy(interfaceAsChar, netif.data, netif.length);
+        interfaceAsChar[netif.length] = 0;
+
+        if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                         "PubSub Connection creation problem. "
+                         "Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+    setsockopt(socket, IPPROTO_IP, IP_MULTICAST_IF,
+#ifdef _WIN32
+               (const char *)&ipMulticastRequest.ipv4.imr_interface, sizeof(struct in_addr));
+#else
+               &ipMulticastRequest.ipv4.imr_interface, sizeof(struct in_addr));
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+setupListenMulticastIPv4(UA_FD socket, size_t paramsSize, const UA_KeyValuePair *params, struct sockaddr_in *addr,
+                         const UA_Logger *logger) {
+    struct in_addr address = addr->sin_addr;
+
+    IpMulticastRequest ipMulticastRequest;
+    ipMulticastRequest.ipv4.imr_multiaddr = address;
+    /* default outgoing interface ANY */
+    ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
+
+    UA_String netif = UA_STRING_NULL;
+    int foundInterface = getNetworkInterfaceFromParams(paramsSize, params, &netif, logger);
+    if(foundInterface < 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Opening a connection failed");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    if(netif.length > 0) {
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
+        memcpy(interfaceAsChar, netif.data, netif.length);
+        interfaceAsChar[netif.length] = 0;
+
+        if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                         "PubSub Connection creation problem. "
+                         "Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+    if(UA_setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                     &ipMulticastRequest.ipv4, sizeof(ipMulticastRequest.ipv4)) < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection regist failed. IP membership setup failed: "
+                         "Cannot set socket option IP_ADD_MEMBERSHIP. Error: %s",
+                         errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+#ifdef UA_IPV6
+static UA_StatusCode
+setupListenMulticastIPv6(UA_FD socket, size_t paramsSize, const UA_KeyValuePair *params, struct sockaddr_in6 *addr,
+                         const UA_Logger *logger) {
+
+    struct in6_addr address = addr->sin6_addr;
+
+    IpMulticastRequest ipMulticastRequest;
+    ipMulticastRequest.ipv6.ipv6mr_multiaddr = address;
+    /* default outgoing interface ANY */
+    ipMulticastRequest.ipv6.ipv6mr_interface = 0;
+
+    UA_String netif = UA_STRING_NULL;
+    int foundInterface = getNetworkInterfaceFromParams(paramsSize, params, &netif, logger);
+    if(foundInterface < 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Opening a connection failed");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    if(netif.length > 0) {
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
+        memcpy(interfaceAsChar, netif.data, netif.length);
+        interfaceAsChar[netif.length] = 0;
+
+        ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
+        if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                         "PubSub Connection creation problem. "
+                         "Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+    if(UA_setsockopt(socket, IPPROTO_IPV6,IPV6_ADD_MEMBERSHIP,
+                     &ipMulticastRequest.ipv6,sizeof(ipMulticastRequest.ipv6)) < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                         "PubSub Connection regist failed. IP membership setup failed: "
+                         "Cannot set socket option IP_ADD_MEMBERSHIP. Error: %s",
+                         errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, size_t paramsSize, const UA_KeyValuePair *params,
+                       const UA_Logger *logger) {
+    struct in6_addr address = addr->sin6_addr;
+
+    IpMulticastRequest ipMulticastRequest;
+    ipMulticastRequest.ipv6.ipv6mr_multiaddr = address;
+    /* default outgoing interface ANY */
+    ipMulticastRequest.ipv6.ipv6mr_interface = 0;
+
+    UA_String netif = UA_STRING_NULL;
+    int foundInterface = getNetworkInterfaceFromParams(paramsSize, params, &netif, logger);
+    if(foundInterface < 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Opening a connection failed");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    if(netif.length > 0) {
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
+        memcpy(interfaceAsChar, netif.data, netif.length);
+        interfaceAsChar[netif.length] = 0;
+
+        ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
+        if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                         "PubSub Connection creation problem. "
+                         "Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+
+    if(setsockopt(socket, IPPROTO_IPV6, IPV6_MULTICAST_IF,
+#ifdef _WIN32
+        (const char *)&ipMulticastRequest.ipv6.ipv6mr_interface, sizeof(ipMulticastRequest.ipv6.ipv6mr_interface)) < 0) {
+#else
+        &ipMulticastRequest.ipv6.ipv6mr_interface, sizeof(ipMulticastRequest.ipv6.ipv6mr_interface)) < 0) {
+#endif
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                         "Opening UDP connection failed: "
+                         "Cannot set socket option IPV6_MULTICAST_IF. Error: %s",
+                         errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+#endif
+
 static UA_StatusCode
 UDPConnectionManager_register(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ucm->cm.eventSource.eventLoop;
@@ -68,33 +565,6 @@ UDP_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_ByteString_clear(buf);
 }
 
-/* Set the socket non-blocking. If the listen-socket is nonblocking, incoming
- * connections inherit this state. */
-static UA_StatusCode
-UDP_setNonBlocking(UA_FD sockfd) {
-#ifndef _WIN32
-    int opts = fcntl(sockfd, F_GETFL);
-    if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#else
-    u_long iMode = 1;
-    if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#endif
-    return UA_STATUSCODE_GOOD;
-}
-
-/* Don't have the socket create interrupt signals */
-static UA_StatusCode
-UDP_setNoSigPipe(UA_FD sockfd) {
-#ifdef SO_NOSIGPIPE
-    int val = 1;
-    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
-    if(res < 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#endif
-    return UA_STATUSCODE_GOOD;
-}
 
 /* Test if the ConnectionManager can be stopped */
 static void
@@ -230,16 +700,44 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                               UA_STATUSCODE_GOOD, 0, NULL, response);
 }
 
+static UA_StatusCode
+checkForListenMulticastAndConfigure(struct addrinfo *info, size_t paramsSize, const UA_KeyValuePair *params,
+                                    UA_FD listenSocket, const UA_Logger *logger) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(info->ai_family == AF_INET) {
+        UA_Byte *addressVal = (UA_Byte *) &((struct sockaddr_in *)info->ai_addr)->sin_addr;
+        if(isIPv4MulticastAddress(addressVal)) {
+            res = setupListenMulticastIPv4(listenSocket,
+                                           paramsSize, params, (struct sockaddr_in *)info->ai_addr,
+                                           logger);
+        }
+#ifdef UA_IPV6
+    } else if(info->ai_family == AF_INET6) {
+        UA_Byte *addressVal = (UA_Byte *) &((struct sockaddr_in6 *)info->ai_addr)->sin6_addr;
+        if(isIPv6MulticastAddress(addressVal)) {
+            res = setupListenMulticastIPv6(listenSocket,
+                                           paramsSize, params, (struct sockaddr_in6 *)info->ai_addr, logger);
+        }
+#endif
+    } else {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Opening a connection failed");
+        res = UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
+    return res;
+}
+
 static void
-UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
-                         struct addrinfo *ai, void *application, void *context,
+UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrinfo *info,
+                         size_t paramsSize, const UA_KeyValuePair *params,
+                         void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback) {
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get logging information */
     char hoststr[UA_MAXHOSTNAME_LENGTH];
-    int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
+    int get_res = UA_getnameinfo(info->ai_addr, info->ai_addrlen,
                                  hoststr, sizeof(hoststr),
                                  NULL, 0, NI_NUMERICHOST);
     if(get_res != 0) {
@@ -250,8 +748,8 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
                           errno_str));
     }
 
-    /* Create the server socket */
-    UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+    /* Create the listen socket */
+    UA_FD listenSocket = UA_socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -262,15 +760,22 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
     }
 
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                "UDP %u\t| New server socket for \"%s\" on port %u",
+                "UDP %u\t| New listen socket for \"%s\" on port %u",
                 (unsigned)listenSocket, hoststr, port);
 
+    UA_StatusCode res = checkForListenMulticastAndConfigure(info, paramsSize, params, listenSocket, el->eventLoop.logger);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Configuring listen multicast failed");
+        UA_close(listenSocket);
+        return;
+    }
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
      * AF_INET6 sockets only for IPv6. */
     int optval = 1;
 #if UA_IPV6
-    if(ai->ai_family == AF_INET6 &&
+    if(info->ai_family == AF_INET6 &&
        UA_setsockopt(listenSocket, IPPROTO_IPV6, IPV6_V6ONLY,
                      (const char*)&optval, sizeof(optval)) == -1) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -310,7 +815,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
     }
 
     /* Bind socket to address */
-    int ret = UA_bind(listenSocket, ai->ai_addr, (socklen_t)ai->ai_addrlen);
+    int ret = UA_bind(listenSocket, info->ai_addr, (socklen_t)info->ai_addrlen);
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -339,7 +844,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
     newudpfd->connectionCallback = connectionCallback;
 
     /* Register in the EventLoop */
-    UA_StatusCode res = UDPConnectionManager_register(ucm, &newudpfd->fd);
+    res = UDPConnectionManager_register(ucm, &newudpfd->fd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP %u\t| Error registering the socket, closing",
@@ -348,15 +853,15 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port,
         UA_close(listenSocket);
         return;
     }
-
     connectionCallback(cm, (uintptr_t)newudpfd->fd.fd,
                        application, &newudpfd->fd.context,
                        UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
 }
 
 static UA_StatusCode
-UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
-                          UA_UInt16 port, void *application, void *context,
+UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UInt16 port,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback) {
     /* Get all the interface and IPv4/6 combinations for the configured hostname */
     struct addrinfo hints, *res;
@@ -368,7 +873,7 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
 #endif
     hints.ai_socktype = SOCK_DGRAM;
     hints.ai_protocol = IPPROTO_UDP;
-    hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
+    hints.ai_flags = AI_PASSIVE;
 #ifdef AI_ADDRCONFIG
     hints.ai_flags |= AI_ADDRCONFIG; /* Only return IPv4/IPv6 if at least one
                                       * such address is configured */
@@ -391,7 +896,7 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
     /* Add listen sockets */
     struct addrinfo *ai = res;
     while(ai) {
-        UDP_registerListenSocket(cm, port, ai, application, context, connectionCallback);
+        UDP_registerListenSocket(cm, port, ai, paramsSize, params, application, context, connectionCallback);
         ai = ai->ai_next;
     }
     UA_freeaddrinfo(res);
@@ -447,82 +952,6 @@ UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     return UA_STATUSCODE_GOOD;
 }
 
-/**
- * Retrieves hostname and port from given key value parameters.
- * @param[in] paramsSize the size of the parameter list
- * @param[in] params the parameter list to retrieve from
- * @param[out] hostname the retrieved hostname when present, NULL otherwise
- * @param[out] portStr the retrieved port when present, NULL otherwise
- * @param[in] logger the logger to log information
- * @return -1 upon error, 0 if there was no host or port parameter, 1 if
- *         host and port are present
- */
-static int
-getHostAndPortFromParams(size_t paramsSize, const UA_KeyValuePair *params,
-                         char *hostname, char *portStr, const UA_Logger *logger) {
-    /* Prepare the port parameter as a string */
-    const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "port"),
-                                 &UA_TYPES[UA_TYPES_UINT16]);
-    if(!port) {
-        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| No port found");
-        return 0;
-    }
-    UA_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
-
-    /* Prepare the hostname string */
-    const UA_String *host = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "hostname"),
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(!host) {
-        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| No hostname found");
-        return 0;
-    }
-    if(host->length >= UA_MAXHOSTNAME_LENGTH) {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| Open UDP Connection: Hostname too long, aborting");
-        return -1;
-    }
-    strncpy(hostname, (const char*)host->data, host->length);
-    hostname[host->length] = 0;
-    return 1;
-}
-
-static int
-getConnectionInfoFromParams(size_t paramsSize, const UA_KeyValuePair *params, char *hostname, char *portStr,
-                            struct addrinfo **info, const UA_Logger *logger) {
-
-    int foundParams = getHostAndPortFromParams(paramsSize, params, hostname, portStr, logger);
-    if (foundParams < 0) {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| Failed retrieving host and port parameters");
-        return -1;
-    }
-    if(foundParams == 0) {
-        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| Hostname or Port not present");
-        return 0;
-    }
-    /* Create the socket description from the connectString
-    * TODO: Make this non-blocking */
-    struct addrinfo hints;
-    memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_DGRAM;
-    int error = getaddrinfo(hostname, portStr, &hints, info);
-    if(error != 0) {
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                           "UDP\t| Lookup of %s failed with error %d - %s",
-                           hostname, error, errno_str));
-        return -1;
-    }
-    return 1;
-}
 
 static UA_StatusCode
 UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
@@ -553,7 +982,7 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                 if(UA_ERRNO != UA_INTERRUPTED &&
                    UA_ERRNO != UA_WOULDBLOCK &&
                    UA_ERRNO != UA_AGAIN) {
-                    UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+                    UA_LOG_SOCKET_ERRNO_WRAP(
                        UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                                     UA_LOGCATEGORY_NETWORK,
                                     "UDP %u\t| Send failed with error %s",
@@ -569,7 +998,7 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                 do {
                     poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
                     if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED) {
-                        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+                        UA_LOG_SOCKET_ERRNO_WRAP(
                            UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
                                         UA_LOGCATEGORY_NETWORK,
                                         "UDP %u\t| Send failed with error %s",
@@ -591,67 +1020,106 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 
 static UA_StatusCode
-UDP_openSendConnection(UA_ConnectionManager *cm,
-                       size_t paramsSize, const UA_KeyValuePair *params,
-                       void *application, void *context,
-                       UA_ConnectionManager_connectionCallback connectionCallback) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
-
-    /* Get the connection parameters */
-    char hostname[UA_MAXHOSTNAME_LENGTH];
-    char portStr[UA_MAXPORTSTR_LENGTH];
-    struct addrinfo *info = NULL;
-    int error = getConnectionInfoFromParams(paramsSize, params, hostname, portStr, &info, el->eventLoop.logger);
-    if(error <= 0) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+checkForSendMulticastAndConfigure(size_t paramsSize, const UA_KeyValuePair *params, struct addrinfo *info, UA_FD newSock,
+                                  const UA_Logger *logger) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(info->ai_family == AF_INET) {
+        struct sockaddr_in* addr = (struct sockaddr_in *)info->ai_addr;
+        UA_Byte *addressVal = (UA_Byte *) &addr->sin_addr;
+
+        if(isIPv4MulticastAddress(addressVal)) {
+            res = setupSendMulticastIPv4(newSock, (struct sockaddr_in *)info->ai_addr,
+                                         paramsSize,
+                                         params, logger);
+        }
+#ifdef UA_IPV6
+    } else if(info->ai_family == AF_INET6) {
+        struct sockaddr_in6* addr = (struct sockaddr_in6 *)info->ai_addr;
+        UA_Byte *addressVal = (UA_Byte *) &addr->sin6_addr;
+        if(isIPv6MulticastAddress(addressVal)) {
+            res = setupSendMulticastIPv6(newSock, (struct sockaddr_in6 *)info->ai_addr,
+                                         paramsSize,
+                                         params, logger);
+        }
+#endif
+    } else {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Opening a connection failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
+        res = UA_STATUSCODE_BADINTERNALERROR;
     }
-    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "UDP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
+    return res;
+}
 
-    /* Create a socket */
+static UA_StatusCode
+registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *params, const char *hostname,
+                                    struct addrinfo *info, int error, UA_FD *sock, const UA_Logger *logger) {
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
+    *sock = newSock;
     if(newSock == UA_INVALID_FD) {
-        freeaddrinfo(info);
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
                            "UDP\t| Could not create socket to connect to %s (%s)",
                            hostname, errno_str));
         return UA_STATUSCODE_BADDISCONNECT;
     }
-
-    /* Set the socket options
-     * also there might be external requirements for socket options
-     * how to handle and set those
-     * either via: passed in parameters
-     * or via: specific callback that gives access to the allocated socket
-     * */
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    res |= UDP_setNonBlocking(newSock);
-    res |= UDP_setNoSigPipe(newSock);
+    UA_StatusCode res = setConnectionConfigurationProperties(newSock, params, paramsSize, info->ai_family, logger);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                           "UDP\t| Could not set socket options: %s", errno_str));
-        freeaddrinfo(info);
         UA_close(newSock);
         return res;
     }
 
+    res = checkForSendMulticastAndConfigure(paramsSize, params, info, newSock, logger);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_close(newSock);
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Configuring send multicast failed");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
     /* Non-blocking connect */
     error = UA_connect(newSock, info->ai_addr, info->ai_addrlen);
-    freeaddrinfo(info);
     if(error != 0 &&
        UA_ERRNO != UA_INPROGRESS &&
        UA_ERRNO != UA_WOULDBLOCK) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
                            "UDP\t| Connecting the socket to %s failed (%s)",
                            hostname, errno_str));
+        UA_close(newSock);
         return UA_STATUSCODE_BADDISCONNECT;
     }
+    return res;
+}
+
+static UA_StatusCode
+UDP_openSendConnection(UA_ConnectionManager *cm,
+                       size_t paramsSize, const UA_KeyValuePair *params,
+                       void *application, void *context,
+                       UA_ConnectionManager_connectionCallback connectionCallback) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)cm->eventSource.eventLoop;
 
+    /* Get the connection parameters */
+    char hostname[UA_MAXHOSTNAME_LENGTH];
+    char portStr[UA_MAXPORTSTR_LENGTH];
+    struct addrinfo *info = NULL;
+
+    int error = getConnectionInfoFromParams(paramsSize, params, hostname, portStr, &info, el->eventLoop.logger);
+    if(error < 0 || info == NULL) {
+        if(info != NULL) {
+            UA_freeaddrinfo(info);
+        }
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Opening a connection failed");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "UDP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
+    /* Create a socket and register the destination address from the provided parameters */
+    UA_FD newSock = UA_INVALID_FD;
+    UA_StatusCode res = registerSocketAndDestinationForSend(paramsSize, params, hostname, info, error, &newSock, el->eventLoop.logger);
+    UA_freeaddrinfo(info);
+    if (res != UA_STATUSCODE_GOOD) {
+        return res;
+    }
     /* Allocate the UA_RegisteredFD */
     UDP_FD *newudpfd = (UDP_FD*)UA_calloc(1, sizeof(UDP_FD));
     if(!newudpfd) {
@@ -707,7 +1175,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
                                  UA_QUALIFIEDNAME(0, "listen-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Port information required for UDP listening");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -720,7 +1188,9 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
         /* No hostnames configured -> listen on all interfaces*/
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, *port, application,
+        return UDP_registerListenSockets(cm, NULL, *port,
+                                         paramsSize, params,
+                                         application,
                                          context, connectionCallback);
     }
 
@@ -736,7 +1206,9 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
     if(interfaces == 0) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, *port, application,
+        return UDP_registerListenSockets(cm, NULL, *port,
+                                         paramsSize, params,
+                                         application,
                                          context, connectionCallback);
     }
 
@@ -748,13 +1220,16 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
             continue;
         memcpy(hostname, hostStrings[i].data, hostStrings->length);
         hostname[hostStrings->length] = '\0';
-        UDP_registerListenSockets(cm, hostname, *port, application,
+        UDP_registerListenSockets(cm, hostname, *port,
+                                  paramsSize, params,
+                                  application,
                                   context, connectionCallback);
     }
 
     return UA_STATUSCODE_GOOD;
 }
 
+
 static UA_StatusCode
 UDP_openConnection(UA_ConnectionManager *cm,
                    size_t paramsSize, const UA_KeyValuePair *params,
@@ -869,4 +1344,3 @@ UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName) {
     cm->cm.closeConnection = UDP_shutdownConnection;
     return &cm->cm;
 }
-
diff --git a/plugins/ua_pubsub_ethernet.c b/plugins/ua_pubsub_ethernet.c
index 96ce8e929ab..c069683d919 100644
--- a/plugins/ua_pubsub_ethernet.c
+++ b/plugins/ua_pubsub_ethernet.c
@@ -14,8 +14,8 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/pubsub_ethernet.h>
 
-#define RECEIVE_MSG_BUFFER_SIZE   4096
-static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferETH[RECEIVE_MSG_BUFFER_SIZE];
+#define UA_RECEIVE_MSG_BUFFER_SIZE   4096
+static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferETH[UA_RECEIVE_MSG_BUFFER_SIZE];
 
 #if !defined(UA_ARCHITECTURE_POSIX) && !defined(UA_ARCHITECTURE_VXWORKS)
 /* For anything else than Linux or VxWorks which are specifically handled below,
@@ -1173,7 +1173,7 @@ UA_PubSubChannelEthernet_receive(UA_PubSubChannel *channel,
         }
 
         UA_ByteString buffer;
-        buffer.length = RECEIVE_MSG_BUFFER_SIZE;
+        buffer.length = UA_RECEIVE_MSG_BUFFER_SIZE;
         buffer.data = ReceiveMsgBufferETH;
 
 #if defined LIBBPF_EBPF
@@ -1197,7 +1197,7 @@ UA_PubSubChannelEthernet_receive(UA_PubSubChannel *channel,
         iov[0].iov_base = &eth_hdr;
         iov[0].iov_len  = sizeof(eth_hdr);
         iov[1].iov_base = buffer.data;
-        iov[1].iov_len  = RECEIVE_MSG_BUFFER_SIZE;
+        iov[1].iov_len  = UA_RECEIVE_MSG_BUFFER_SIZE;
         msg.msg_iov     = iov;
         msg.msg_iovlen  = 2;
 
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 40279f17163..8d92027a5ff 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -16,22 +16,22 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/pubsub_udp.h>
 
-#define RECEIVE_MSG_BUFFER_SIZE   4096
+#define UA_RECEIVE_MSG_BUFFER_SIZE   4096
 
-#define IPV4_PREFIX_MASK 0xF0000000
-#define IPV4_MULTICAST_PREFIX 0xE0000000
+#define UA_IPV4_PREFIX_MASK 0xF0000000
+#define UA_IPV4_MULTICAST_PREFIX 0xE0000000
 #ifdef UA_IPV6
-#   define IPV6_MULTICAST_PREFIX 0xFF
+#   define UA_IPV6_MULTICAST_PREFIX 0xFF
 #endif
 
-static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[RECEIVE_MSG_BUFFER_SIZE];
+static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[UA_RECEIVE_MSG_BUFFER_SIZE];
 
 typedef union {
     struct ip_mreq ipv4;
 #if UA_IPV6
     struct ipv6_mreq ipv6;
 #endif
-} IpMulticastRequest;
+} UA_IpMulticastRequest;
 
 /* UDP multicast network layer specific internal data */
 typedef struct {
@@ -46,7 +46,7 @@ typedef struct {
 #ifdef __linux__
     UA_UInt32* socketPriority;
 #endif
-    IpMulticastRequest ipMulticastRequest;
+    UA_IpMulticastRequest ipMulticastRequest;
 } UA_PubSubChannelDataUDPMC;
 
 #define MAX_URL_LENGTH 512
@@ -125,9 +125,9 @@ chooseValidAddrInfoAndCreateSocket(UA_SOCKET *sockfd, struct addrinfo* addrInfoL
 }
 
 static void
-setConnectionConfigurationProperties(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
-                                     const UA_KeyValuePair *connectionProperties,
-                                     const size_t connectionPropertiesSize) {
+UA_setConnectionConfigurationProperties(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
+                                        const UA_KeyValuePair *connectionProperties,
+                                        const size_t connectionPropertiesSize) {
     /* Set default values */
     memset(channelDataUDPMC, 0, sizeof(UA_PubSubChannelDataUDPMC));
     channelDataUDPMC->messageTTL = 255;
@@ -218,7 +218,7 @@ setMulticastInfoIPV6(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *ad
     if(convertTextAddressToBinarySuccessful != 1) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    if((channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr.s6_addr[0] != IPV6_MULTICAST_PREFIX)) {
+    if((channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr.s6_addr[0] != UA_IPV6_MULTICAST_PREFIX)) {
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                        "PubSub Connection is created for a unicast address (IPv6)");
         channelDataUDPMC->isMulticast = false;
@@ -237,8 +237,8 @@ setMulticastInfoIPv4(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *ad
     if(convertTextAddressToBinarySuccessful != 1) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    uint32_t masked = UA_ntohl(channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr.s_addr) & IPV4_PREFIX_MASK;
-    if(masked != IPV4_MULTICAST_PREFIX) {
+    uint32_t masked = UA_ntohl(channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr.s_addr) & UA_IPV4_PREFIX_MASK;
+    if(masked != UA_IPV4_MULTICAST_PREFIX) {
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                        "PubSub Connection is created for a unicast address (IPv4)");
         channelDataUDPMC->isMulticast = false;
@@ -310,8 +310,8 @@ UA_PubSubChannelDataUDPMC_new(UA_PubSubChannel *channel, const UA_PubSubConnecti
                      "PubSub Connection creation failed. Out of memory.");
         goto error;
     }
-    setConnectionConfigurationProperties(channelDataUDPMC, connectionConfig->connectionProperties,
-                                         connectionConfig->connectionPropertiesSize);
+    UA_setConnectionConfigurationProperties(channelDataUDPMC, connectionConfig->connectionProperties,
+                                            connectionConfig->connectionPropertiesSize);
     UA_NetworkAddressUrlDataType *address =
         (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
 
@@ -349,9 +349,9 @@ UA_PubSubChannelDataUDPMC_new(UA_PubSubChannel *channel, const UA_PubSubConnecti
 }
 
 static UA_INLINE UA_StatusCode
-setLoopBackData(UA_SOCKET *sockfd,
-                UA_Boolean enableLoopback,
-                int ai_family) {
+UA_setLoopBackData(UA_SOCKET *sockfd,
+                   UA_Boolean enableLoopback,
+                   int ai_family) {
     /* Set loop back data to your host */
 #if UA_IPV6
     /* The Linux Kernel IPv6 socket code checks for optlen to be at least the
@@ -381,9 +381,9 @@ setLoopBackData(UA_SOCKET *sockfd,
 }
 
 static UA_INLINE void
-setTimeToLive(UA_SOCKET *sockfd,
-              UA_UInt32 messageTTL,
-              int ai_family) {
+UA_setTimeToLive(UA_SOCKET *sockfd,
+                 UA_UInt32 messageTTL,
+                 int ai_family) {
     /* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
 #if UA_IPV6
     if(UA_setsockopt(*sockfd,
@@ -406,7 +406,7 @@ setTimeToLive(UA_SOCKET *sockfd,
 }
 
 static UA_INLINE void
-setReuseAddress(UA_SOCKET *sockfd, UA_Boolean enableReuse) {
+UA_setReuseAddress(UA_SOCKET *sockfd, UA_Boolean enableReuse) {
     /* Set reuse address -> enables sharing of the same listening address on
     * different sockets */
     if(enableReuse){
@@ -424,7 +424,7 @@ setReuseAddress(UA_SOCKET *sockfd, UA_Boolean enableReuse) {
 
 #ifdef __linux__
 static UA_StatusCode
-setSocketPriority(UA_SOCKET *sockfd, UA_UInt32 *socketPriority) {/* Setting the socket priority to the socket */
+UA_setSocketPriority(UA_SOCKET *sockfd, UA_UInt32 *socketPriority) {/* Setting the socket priority to the socket */
     if(socketPriority != NULL) {
         if (UA_setsockopt(*sockfd, SOL_SOCKET, SO_PRIORITY,
                           socketPriority, sizeof(*socketPriority)) < 0) {
@@ -477,7 +477,7 @@ bindChannelSocket(UA_SOCKET *sockfd, struct sockaddr_storage *ai_addr, int ai_fa
 }
 
 static UA_StatusCode
-setMulticastOption(UA_SOCKET *sockfd, IpMulticastRequest ipMulticastRequest, int ai_family) {
+setMulticastOption(UA_SOCKET *sockfd, UA_IpMulticastRequest ipMulticastRequest, int ai_family) {
 #if UA_IPV6
     if(UA_setsockopt(*sockfd,
                      ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
@@ -501,11 +501,11 @@ setMulticastOption(UA_SOCKET *sockfd, IpMulticastRequest ipMulticastRequest, int
 
 static UA_StatusCode
 setSocketOptionsAndBind(UA_SOCKET *sockfd, UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
-    UA_StatusCode res = setLoopBackData(sockfd, channelDataUDPMC->enableLoopback, channelDataUDPMC->ai_family);
+    UA_StatusCode res = UA_setLoopBackData(sockfd, channelDataUDPMC->enableLoopback, channelDataUDPMC->ai_family);
     if (res != UA_STATUSCODE_GOOD) return res;
 
-    setTimeToLive(sockfd, channelDataUDPMC->messageTTL, channelDataUDPMC->ai_family);
-    setReuseAddress(sockfd, channelDataUDPMC->enableReuse);
+    UA_setTimeToLive(sockfd, channelDataUDPMC->messageTTL, channelDataUDPMC->ai_family);
+    UA_setReuseAddress(sockfd, channelDataUDPMC->enableReuse);
 
     res = setMulticastOption(sockfd, channelDataUDPMC->ipMulticastRequest, channelDataUDPMC->ai_family);
     if(res != UA_STATUSCODE_GOOD) return res;
@@ -514,7 +514,7 @@ setSocketOptionsAndBind(UA_SOCKET *sockfd, UA_PubSubChannelDataUDPMC *channelDat
     if(res != UA_STATUSCODE_GOOD) return res;
 
 #ifdef __linux__
-    res = setSocketPriority(sockfd, channelDataUDPMC->socketPriority);
+    res = UA_setSocketPriority(sockfd, channelDataUDPMC->socketPriority);
     if(res != UA_STATUSCODE_GOOD) return res;
 #endif
 
@@ -761,12 +761,12 @@ UA_PubSubChannelUDPMC_receive(UA_PubSubChannel *channel,
             }
         }
         UA_ByteString buffer;
-        buffer.length = RECEIVE_MSG_BUFFER_SIZE;
+        buffer.length = UA_RECEIVE_MSG_BUFFER_SIZE;
         buffer.data = ReceiveMsgBufferUDP;
 
         UA_DateTime beforeRecvTime = UA_DateTime_nowMonotonic();
         ssize_t messageLength = UA_recvfrom(channel->sockfd, buffer.data,
-                                            RECEIVE_MSG_BUFFER_SIZE, 0, NULL, NULL);
+                                            UA_RECEIVE_MSG_BUFFER_SIZE, 0, NULL, NULL);
         if(messageLength > 0){
             buffer.length = (size_t) messageLength;
             retval = receiveCallback(channel, receiveCallbackContext, &buffer);

From 7de8311283a864793fa28baeca2091595b618aa6 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 14 Jul 2022 14:48:04 +0200
Subject: [PATCH 0322/1963] docs(el): add parameter documentation

---
 include/open62541/plugin/eventloop.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 8307528d836..b8740a8872f 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -455,6 +455,18 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  * Open Connection Parameters:
  * - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
  * - 0:port [uint16]: Port of the target host (required).
+ * - 0:ttl [uint32]: Multicast time to live, (optional, default: 1 - meaning multicast is
+ *                   available only to the local subnet).
+ * - 0:loopback [boolean]: Whether or not to use multicast loopback, enabling
+ *                         local interfaces belonging to the multicast group
+ *                         to receive packages. (optional, default: enabled).
+ * - 0:reuse [boolean]: Set reuse address -> enables sharing of the same
+ *                      listening address on different sockets (optional, default: disabled).
+ * - 0:sockpriority [uint32]: The socket priority (optional) - only available on linux.
+ *                            packets with a higher priority may be
+ *                            processed first depending on the selected device queueing
+ *                            discipline.  Setting a priority outside the range 0 to 6
+ *                            requires the CAP_NET_ADMIN capability.
  *
  * Connection Callback Paramters:
  * - 0:remote-hostname [string]: When a new connection is opened by listening on

From 70b9170d54b1168dfbbcb1bcfce2d475f8a95f5e Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 14 Jul 2022 14:50:44 +0200
Subject: [PATCH 0323/1963] ci: print amalgamation on build error

---
 tools/azure-devops/win/build.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 8986d409101..18448978764 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -95,6 +95,7 @@ try {
     & cmake --build . --config RelWithDebInfo
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
+        get-content D:\a\1\s\build\open62541.c
         exit $LASTEXITCODE
     }
     cd ..

From d53356d598c581ab663f13c83b9e866f89a58d8b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 15 Jul 2022 10:08:48 +0200
Subject: [PATCH 0324/1963] refactor(el): Cosmetic improvements in
 eventloop_posix_udp.c

---
 arch/eventloop_posix_udp.c | 95 ++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 50 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index b904e57843f..ff558729059 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -77,16 +77,15 @@ UDP_setNoSigPipe(UA_FD sockfd) {
     return UA_STATUSCODE_GOOD;
 }
 
-/**
- * Retrieves hostname and port from given key value parameters.
+/* Retrieves hostname and port from given key value parameters.
+ *
  * @param[in] paramsSize the size of the parameter list
  * @param[in] params the parameter list to retrieve from
  * @param[out] hostname the retrieved hostname when present, NULL otherwise
  * @param[out] portStr the retrieved port when present, NULL otherwise
  * @param[in] logger the logger to log information
  * @return -1 upon error, 0 if there was no host or port parameter, 1 if
- *         host and port are present
- */
+ *         host and port are present */
 static int
 getHostAndPortFromParams(size_t paramsSize, const UA_KeyValuePair *params,
                          char *hostname, char *portStr, const UA_Logger *logger) {
@@ -140,10 +139,12 @@ getNetworkInterfaceFromParams(size_t paramsSize, const UA_KeyValuePair *params,
 }
 
 static int
-getConnectionInfoFromParams(size_t paramsSize, const UA_KeyValuePair *params, char *hostname, char *portStr,
+getConnectionInfoFromParams(size_t paramsSize, const UA_KeyValuePair *params,
+                            char *hostname, char *portStr,
                             struct addrinfo **info, const UA_Logger *logger) {
 
-    int foundParams = getHostAndPortFromParams(paramsSize, params, hostname, portStr, logger);
+    int foundParams = getHostAndPortFromParams(paramsSize, params,
+                                               hostname, portStr, logger);
     if (foundParams < 0) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| Failed retrieving host and port parameters");
@@ -155,7 +156,7 @@ getConnectionInfoFromParams(size_t paramsSize, const UA_KeyValuePair *params, ch
         return 0;
     }
     /* Create the socket description from the connectString
-    * TODO: Make this non-blocking */
+     * TODO: Make this non-blocking */
     struct addrinfo hints;
     memset(&hints, 0, sizeof(struct addrinfo));
     hints.ai_family = AF_UNSPEC;
@@ -170,12 +171,11 @@ getConnectionInfoFromParams(size_t paramsSize, const UA_KeyValuePair *params, ch
     }
     return 1;
 }
-static UA_INLINE UA_StatusCode
-setLoopBackData(UA_SOCKET sockfd,
-                UA_Boolean enableLoopback,
-                int ai_family,
-                const UA_Logger *logger) {
-    /* Set loop back data to your host */
+
+/* Set loop back data to your host */
+static UA_StatusCode
+setLoopBackData(UA_SOCKET sockfd, UA_Boolean enableLoopback,
+                int ai_family, const UA_Logger *logger) {
     /* The Linux Kernel IPv6 socket code checks for optlen to be at least the
      * size of an integer. However, channelDataUDPMC->enableLoopback is a
      * boolean. In order for the code to work for IPv4 and IPv6 propagate it to
@@ -203,11 +203,9 @@ setLoopBackData(UA_SOCKET sockfd,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_INLINE void
-setTimeToLive(UA_SOCKET sockfd,
-              UA_UInt32 messageTTL,
-              int ai_family,
-              const UA_Logger *logger) {
+static void
+setTimeToLive(UA_SOCKET sockfd, UA_UInt32 messageTTL,
+              int ai_family, const UA_Logger *logger) {
     /* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
 #if UA_IPV6
     if(UA_setsockopt(sockfd,
@@ -229,14 +227,13 @@ setTimeToLive(UA_SOCKET sockfd,
     }
 }
 
-static UA_INLINE void
+static void
 setReuseAddress(UA_SOCKET sockfd, UA_Boolean enableReuse, const UA_Logger *logger) {
     /* Set reuse address -> enables sharing of the same listening address on
-    * different sockets */
+     * different sockets */
     int enableReuseVal = 1;
-    if (!enableReuse) {
+    if(!enableReuse)
         enableReuseVal = 0;
-    }
     if(UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
                      (const char*)&enableReuseVal, sizeof(enableReuseVal)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -249,8 +246,9 @@ setReuseAddress(UA_SOCKET sockfd, UA_Boolean enableReuse, const UA_Logger *logge
 
 #ifdef __linux__
 static UA_StatusCode
-setSocketPriority(UA_SOCKET sockfd, UA_UInt32 *socketPriority, const UA_Logger *logger) {/* Setting the socket priority to the socket */
-    // assert (socketPriority != NULL)
+setSocketPriority(UA_SOCKET sockfd, UA_UInt32 *socketPriority,
+                  const UA_Logger *logger) {
+    /* Setting the socket priority to the socket */
     if (UA_setsockopt(sockfd, SOL_SOCKET, SO_PRIORITY,
                       socketPriority, sizeof(*socketPriority)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -279,11 +277,9 @@ isIPv6MulticastAddress(const UA_Byte *address) {
 }
 
 static UA_StatusCode
-setConnectionConfigurationProperties(UA_FD socket,
-                                     const UA_KeyValuePair *connectionProperties,
-                                     const size_t connectionPropertiesSize,
-                                     int ai_family,
-                                     const UA_Logger *logger) {
+setConnectionConfig(UA_FD socket, const UA_KeyValuePair *connectionProperties,
+                    const size_t connectionPropertiesSize,
+                    int ai_family, const UA_Logger *logger) {
     /* Iterate over the given KeyValuePair parameters */
     UA_String ttlParam = UA_STRING("ttl");
     UA_String loopbackParam = UA_STRING("loopback");
@@ -340,12 +336,10 @@ setConnectionConfigurationProperties(UA_FD socket,
                            (int)prop->key.name.length, (char*)prop->key.name.data);
         }
     }
-    /* Set the socket options
-    * also there might be external requirements for socket options
-    * how to handle and set those
-    * either via: passed in parameters
-    * or via: specific callback that gives access to the allocated socket
-    * */
+    /* Set the socket options also there might be external requirements for
+     * socket options how to handle and set those either
+     * - passed in parameters
+     * - specific callback that gives access to the allocated socket */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     res |= UDP_setNonBlocking(socket);
     res |= UDP_setNoSigPipe(socket);
@@ -1051,8 +1045,9 @@ checkForSendMulticastAndConfigure(size_t paramsSize, const UA_KeyValuePair *para
 }
 
 static UA_StatusCode
-registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *params, const char *hostname,
-                                    struct addrinfo *info, int error, UA_FD *sock, const UA_Logger *logger) {
+registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *params,
+                                    const char *hostname, struct addrinfo *info,
+                                    int error, UA_FD *sock, const UA_Logger *logger) {
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     *sock = newSock;
     if(newSock == UA_INVALID_FD) {
@@ -1062,7 +1057,8 @@ registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *pa
                            hostname, errno_str));
         return UA_STATUSCODE_BADDISCONNECT;
     }
-    UA_StatusCode res = setConnectionConfigurationProperties(newSock, params, paramsSize, info->ai_family, logger);
+    UA_StatusCode res = setConnectionConfig(newSock, params, paramsSize,
+                                            info->ai_family, logger);
     if(res != UA_STATUSCODE_GOOD) {
         UA_close(newSock);
         return res;
@@ -1102,7 +1098,8 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
     char portStr[UA_MAXPORTSTR_LENGTH];
     struct addrinfo *info = NULL;
 
-    int error = getConnectionInfoFromParams(paramsSize, params, hostname, portStr, &info, el->eventLoop.logger);
+    int error = getConnectionInfoFromParams(paramsSize, params, hostname,
+                                            portStr, &info, el->eventLoop.logger);
     if(error < 0 || info == NULL) {
         if(info != NULL) {
             UA_freeaddrinfo(info);
@@ -1115,11 +1112,13 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
                  "UDP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
     /* Create a socket and register the destination address from the provided parameters */
     UA_FD newSock = UA_INVALID_FD;
-    UA_StatusCode res = registerSocketAndDestinationForSend(paramsSize, params, hostname, info, error, &newSock, el->eventLoop.logger);
+    UA_StatusCode res =
+        registerSocketAndDestinationForSend(paramsSize, params, hostname, info,
+                                            error, &newSock, el->eventLoop.logger);
     UA_freeaddrinfo(info);
-    if (res != UA_STATUSCODE_GOOD) {
+    if(res != UA_STATUSCODE_GOOD)
         return res;
-    }
+
     /* Allocate the UA_RegisteredFD */
     UDP_FD *newudpfd = (UDP_FD*)UA_calloc(1, sizeof(UDP_FD));
     if(!newudpfd) {
@@ -1188,10 +1187,8 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
         /* No hostnames configured -> listen on all interfaces*/
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, *port,
-                                         paramsSize, params,
-                                         application,
-                                         context, connectionCallback);
+        return UDP_registerListenSockets(cm, NULL, *port, paramsSize, params,
+                                         application, context, connectionCallback);
     }
 
     /* Correct datatype for the hostnames? */
@@ -1206,10 +1203,8 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
     if(interfaces == 0) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, *port,
-                                         paramsSize, params,
-                                         application,
-                                         context, connectionCallback);
+        return UDP_registerListenSockets(cm, NULL, *port, paramsSize, params,
+                                         application, context, connectionCallback);
     }
 
     /* Iterate over the configured hostnames */

From 43af4dffe08b0e9f8e8965bf4d61e1f10205e1ff Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 15 Jul 2022 10:53:16 +0200
Subject: [PATCH 0325/1963] feat(el): Forward an explicit connection state for
 EventLoop connections

That way we can call the connection callback for connections in the
"opening" state. That is required so that connections that are opening
(but not yet fully opened) can be closed when the application shuts
down.
---
 arch/eventloop_posix_tcp.c           |  23 +++---
 arch/eventloop_posix_udp.c           |  21 +++---
 include/open62541/plugin/eventloop.h |  35 ++++++---
 include/open62541/plugin/network.h   |   3 +-
 src/client/ua_client_connect.c       |  25 ++++---
 src/server/ua_server.c               |  16 ++--
 src/server/ua_server_internal.h      |  10 +--
 tests/check_eventloop_tcp.c          | 101 +------------------------
 tests/check_eventloop_udp.c          | 106 ++-------------------------
 9 files changed, 86 insertions(+), 254 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 3ad4118d8aa..98b0bf71274 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -133,7 +133,7 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     /* Signal closing to the application */
     tcpfd->connectionCallback(&tcm->cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
-                              UA_STATUSCODE_BADCONNECTIONCLOSED,
+                              UA_CONNECTIONSTATE_CLOSING,
                               0, NULL, UA_BYTESTRING_NULL);
 
     /* Close the socket */
@@ -148,9 +148,8 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
                           (unsigned)rfd->fd, errno_str));
     }
 
-    /* Don't call free here. This might be done automatically via the delayed
+    /* Don't call UA_free(rfd). This might be done automatically via the delayed
      * callback that calls TCP_close. */
-    /* UA_free(rfd); */
 
     /* Stop if the tcm is stopping and this was the last open socket */
     TCP_checkStopped(tcm);
@@ -223,7 +222,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         /* A new socket has opened. Signal it to the application. */
         tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                                   rfd->application, &rfd->context,
-                                  UA_STATUSCODE_GOOD, 0, NULL,
+                                  UA_CONNECTIONSTATE_ESTABLISHED, 0, NULL,
                                   UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
@@ -270,7 +269,8 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     response.length = (size_t)ret; /* Set the length of the received buffer */
     tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
-                              UA_STATUSCODE_GOOD, 0, NULL, response);
+                              UA_CONNECTIONSTATE_ESTABLISHED,
+                              0, NULL, response);
 }
 
 /* Gets called when a new connection opens or if the listenSocket is closed */
@@ -371,7 +371,8 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     /* The socket has opened. Signal it to the application. */
     tcpfd->connectionCallback(cm, (uintptr_t)newsockfd,
                               newtcpfd->fd.application, &newtcpfd->fd.context,
-                              UA_STATUSCODE_GOOD, 1, &kvp, UA_BYTESTRING_NULL);
+                              UA_CONNECTIONSTATE_ESTABLISHED,
+                              1, &kvp, UA_BYTESTRING_NULL);
 }
 
 static UA_StatusCode
@@ -518,7 +519,8 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
 
     /* Announce the listen-socket in the application */
     connectionCallback(cm, (uintptr_t)listenSocket, application,
-                       &newtcpfd->fd.context, UA_STATUSCODE_GOOD,
+                       &newtcpfd->fd.context,
+                       UA_CONNECTIONSTATE_ESTABLISHED,
                        paramsSize, params, UA_BYTESTRING_NULL);
 
     return UA_STATUSCODE_GOOD;
@@ -893,8 +895,11 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
                 "TCP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
-    /* The callback to signal the new connection to the application is triggered
-     * asynchonously in the next iteration of the EventLoop */
+    /* Signal the new connection to the application as asynchonously opening */
+    connectionCallback(cm, (uintptr_t)newSock,
+                       application, &newtcpfd->fd.context,
+                       UA_CONNECTIONSTATE_OPENING, 0, NULL,
+                       UA_BYTESTRING_NULL);
 
     return UA_STATUSCODE_GOOD;
 }
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index ff558729059..c3c896bcaa5 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -590,7 +590,7 @@ UDP_close(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
     /* Signal closing to the application */
     udpfd->connectionCallback(&ucm->cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
-                              UA_STATUSCODE_BADCONNECTIONCLOSED,
+                              UA_CONNECTIONSTATE_CLOSING,
                               0, NULL, UA_BYTESTRING_NULL);
 
     /* Close the socket */
@@ -643,8 +643,8 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         /* A new socket has opened. Signal it to the application. */
         udpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                                   rfd->application, &rfd->context,
-                                  UA_STATUSCODE_GOOD, 0, NULL,
-                                  UA_BYTESTRING_NULL);
+                                  UA_CONNECTIONSTATE_ESTABLISHED,
+                                  0, NULL, UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
         rfd->listenEvents = UA_FDEVENT_IN;
@@ -691,7 +691,7 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     response.length = (size_t)ret; /* Set the length of the received buffer */
     udpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
-                              UA_STATUSCODE_GOOD, 0, NULL, response);
+                              UA_CONNECTIONSTATE_ESTABLISHED, 0, NULL, response);
 }
 
 static UA_StatusCode
@@ -847,9 +847,12 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
         UA_close(listenSocket);
         return;
     }
+
+    /* Register the listen socket in the application */
     connectionCallback(cm, (uintptr_t)newudpfd->fd.fd,
                        application, &newudpfd->fd.context,
-                       UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL);
+                       UA_CONNECTIONSTATE_ESTABLISHED,
+                       0, NULL, UA_BYTESTRING_NULL);
 }
 
 static UA_StatusCode
@@ -1153,10 +1156,10 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
                 "UDP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
-    /* Don't signal the application that the connection has opened. This will
-     * happen in the next iteration of the EventLoop. */
-    /* connectionCallback(cm, (uintptr_t)newSock, application, &newudpfd->fd.context,
-                          UA_STATUSCODE_GOOD, 0, NULL, UA_BYTESTRING_NULL); */
+    /* Signal the connection as opening. The connection fully opens in the next
+     * iteration of the EventLoop */
+    connectionCallback(cm, (uintptr_t)newSock, application, &newudpfd->fd.context,
+                       UA_CONNECTIONSTATE_OPENING, 0, NULL, UA_BYTESTRING_NULL);
 
     return UA_STATUSCODE_GOOD;
 }
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index b8740a8872f..4b60d2db406 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -13,6 +13,7 @@
 #include <open62541/types_generated.h>
 #include <open62541/util.h>
 #include <open62541/plugin/log.h>
+#include <open62541/plugin/network.h>
 
 _UA_BEGIN_DECLS
 
@@ -232,9 +233,10 @@ struct UA_EventSource {
  *   is set. The context can be replaced within the callback (via the
  *   double-pointer).
  *
- * - The status indicates whether the connection is closing down. If status
- *   != GOOD, then the application should clean up the context, as this is
- *   the last time the callback will be called for this connection.
+ * - The state argument indicates the lifecycle of the connection. Every
+ *   connection calls the callback a last time with UA_CONNECTIONSTATE_CLOSING.
+ *   Protocols individually can forward diagnostic information relevant to the
+ *   state as part of the key-value parameters.
  *
  * - The parameters are a key-value list with additional information. The
  *   possible keys and their meaning are documented for the individual
@@ -245,9 +247,8 @@ struct UA_EventSource {
 typedef void
 (*UA_ConnectionManager_connectionCallback)
      (UA_ConnectionManager *cm, uintptr_t connectionId,
-      void *application, void **connectionContext, UA_StatusCode status,
-      size_t paramsSize, const UA_KeyValuePair *params,
-      UA_ByteString msg);
+      void *application, void **connectionContext, UA_ConnectionState state,
+      size_t paramsSize, const UA_KeyValuePair *params, UA_ByteString msg);
 
 struct UA_ConnectionManager {
     /* Every ConnectionManager is treated like an EventSource from the
@@ -277,12 +278,22 @@ struct UA_ConnectionManager {
      * connection. It is already set before the first call to
      * connectionCallback.
      *
-     * The connection is opened asynchronously. The connection-callback is
-     * triggered when the connection is fully opened (UA_STATUSCODE_GOOD) or has
-     * failed (with an error code). */
-
-    /* TODO: Return the connection id right away. So an opening connection can
-     * be aborted before the first callback. */
+     * The connection can be opened synchronously or asynchronously.
+     *
+     * - For synchronous connection, the connectionCallback is called with the
+     *   status UA_CONNECTIONSTATE_ESTABLISHED immediately from within the
+     *   openConnection operation.
+     *
+     * - In the asynchronous case the connectionCallback is called immediately
+     *   from within the openConnection operation with the status
+     *   UA_CONNECTIONSTATE_OPENING. The connectionCallback is called with the
+     *   status UA_CONNECTIONSTATE_ESTABLISHED once the connection has fully
+     *   opened.
+     *
+     * Note that a single call to openConnection might open multiple
+     * connections. For example listening on IPv4 and IPv6 for a single
+     * hostname. Each protocol implementation documents whether multiple
+     * connections might be opened at once. */
     UA_StatusCode
     (*openConnection)(UA_ConnectionManager *cm,
                       size_t paramsSize, const UA_KeyValuePair *params,
diff --git a/include/open62541/plugin/network.h b/include/open62541/plugin/network.h
index 49f42ee0b92..9d617f61248 100644
--- a/include/open62541/plugin/network.h
+++ b/include/open62541/plugin/network.h
@@ -52,8 +52,9 @@ typedef enum {
                                     * will be deleted */
     UA_CONNECTIONSTATE_OPENING,    /* The socket is open, but the HEL/ACK handshake
                                     * is not done */
-    UA_CONNECTIONSTATE_ESTABLISHED /* The socket is open and the connection
+    UA_CONNECTIONSTATE_ESTABLISHED,/* The socket is open and the connection
                                     * configured */
+    UA_CONNECTIONSTATE_CLOSING     /* The socket is closing down */
 } UA_ConnectionState;
 
 struct UA_Connection {
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 88cd979eb87..80c099019f1 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1059,7 +1059,7 @@ verifyClientApplicationURI(const UA_Client *client) {
 static void
 UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                           void *application, void **connectionContext,
-                          UA_StatusCode state,
+                          UA_ConnectionState state,
                           size_t paramsSize, const UA_KeyValuePair *params,
                           UA_ByteString msg) {
     UA_Client *client = (UA_Client*)application;
@@ -1067,11 +1067,17 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                  "Client network callback");
 
-    /* A new connection is opening */
+    /* The connection is still opening */
+    if(state == UA_CONNECTIONSTATE_OPENING) {
+        return;
+    }
+
+    /* A new connection is not yet registered */
     if(!*connectionContext) {
         /* Opening the connection failed */
-        if(state != UA_STATUSCODE_GOOD) {
-            client->connectStatus = state; /* The client cannot recover from this */
+        if(state != UA_CONNECTIONSTATE_ESTABLISHED) {
+            /* The client cannot recover from this */
+            client->connectStatus = UA_STATUSCODE_BADCONNECTIONREJECTED;
             client->connection.state = UA_CONNECTIONSTATE_CLOSED;
             closeSecureChannel(client);
             notifyClientState(client);
@@ -1098,7 +1104,7 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     /* A bad status code was sent from an open connection. The connection will
      * be deleted now in the ConnectionManager. Clean up in the client. */
-    if(state != UA_STATUSCODE_GOOD) {
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                     "The TCP connection closed with state %s",
                     UA_StatusCode_name(state));
@@ -1110,12 +1116,13 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 
     /* Received a message. Process the message with the SecureChannel. */
-    state = UA_SecureChannel_processBuffer(&client->channel, client,
-                                           processServiceResponse, &msg);
-    if(state != UA_STATUSCODE_GOOD) {
+    UA_StatusCode res
+        = UA_SecureChannel_processBuffer(&client->channel, client,
+                                         processServiceResponse, &msg);
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Processing the message returned the error code %s",
-                       UA_StatusCode_name(state));
+                       UA_StatusCode_name(res));
 
         /* Close the SecureChannel, but don't notify the client right away.
          * Return immediately. notifyClientState will be called in the next
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 8917d742f38..ad78d8ffc57 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -570,15 +570,17 @@ UA_Server_getStatistics(UA_Server *server) {
 static void
 UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                           void *application, void **connectionContext,
-                          UA_StatusCode state,
+                          UA_ConnectionState state,
                           size_t paramsSize, const UA_KeyValuePair *params,
                           UA_ByteString msg) {
     UA_Server *server = (UA_Server*)application;
 
     /* A server socket that is not registered in the server */
     if(*connectionContext == NULL) {
-        if(state != UA_STATUSCODE_GOOD)
-            return; /* Closing an unregistered server socket */
+        /* The socket is no fully open -> ignore */
+        if(state == UA_CONNECTIONSTATE_CLOSED ||
+           state == UA_CONNECTIONSTATE_CLOSING)
+            return;
 
         /* Cannot register */
         if(server->serverConnectionsSize >= UA_MAXSERVERCONNECTIONS) {
@@ -593,7 +595,7 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         UA_ServerConnection *sc = server->serverConnections;
         while(sc->connectionId != 0)
             sc++;
-        sc->state = UA_SERVERCONNECTIONSTATE_STARTED;
+        sc->state = state;
         sc->connectionId = connectionId;
         sc->connectionManager = cm;
         *connectionContext = (void*)sc; /* Set the context pointer in the connection */
@@ -605,10 +607,10 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_Boolean serverSocket = (sc >= server->serverConnections &&
                                sc < &server->serverConnections[UA_MAXSERVERCONNECTIONS]);
 
-    if(state != UA_STATUSCODE_GOOD) {
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
         if(serverSocket) {
-            /* A server socket is closing */
-            sc->state = UA_SERVERCONNECTIONSTATE_FRESH;
+            /* Server socket is closed */
+            sc->state = UA_CONNECTIONSTATE_CLOSED;
             sc->connectionId = 0;
             server->serverConnectionsSize--;
         } else {
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index ee08a689fc0..f851611825e 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -86,19 +86,11 @@ typedef enum {
     UA_SERVERLIFECYCLE_STOPPING
 } UA_ServerLifecycle;
 
-typedef enum {
-    UA_SERVERCONNECTIONSTATE_FRESH,
-    UA_SERVERCONNECTIONSTATE_STOPPED,
-    UA_SERVERCONNECTIONSTATE_STARTING,
-    UA_SERVERCONNECTIONSTATE_STARTED,
-    UA_SERVERCONNECTIONSTATE_STOPPING
-} UA_ServerConnectionState;
-
 /* Maximum numbers of sockets to listen on */
 #define UA_MAXSERVERCONNECTIONS 16
 
 typedef struct {
-    UA_ServerConnectionState state;
+    UA_ConnectionState state;
     uintptr_t connectionId;
     UA_ConnectionManager *connectionManager;
 } UA_ServerConnection;
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index edf6fc583f3..145c27db5f0 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -20,10 +20,10 @@ static UA_Boolean received;
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void *application, void **connectionContext,
-                   UA_StatusCode status,
+                   UA_ConnectionState status,
                    size_t paramsSize, const UA_KeyValuePair *params,
                    UA_ByteString msg) {
-    if(status != UA_STATUSCODE_GOOD) {
+    if(status == UA_CONNECTIONSTATE_CLOSING) {
         UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                      "Closing connection %u", (unsigned)connectionId);
     } else {
@@ -38,10 +38,10 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     if(*connectionContext != NULL)
         clientId = connectionId;
-    if(msg.length == 0 && status == UA_STATUSCODE_GOOD)
+    if(msg.length == 0 && status == UA_CONNECTIONSTATE_ESTABLISHED)
         connCount++;
 
-    if(status != UA_STATUSCODE_GOOD)
+    if(status == UA_CONNECTIONSTATE_CLOSING)
         connCount--;
 
     if(msg.length > 0) {
@@ -51,20 +51,6 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 }
 
-static void
-reenterConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void *application, void **connectionContext,
-                          UA_StatusCode status,
-                          size_t paramsSize, const UA_KeyValuePair *params,
-                          UA_ByteString msg) {
-    /* Try to reenter the eventloop. Must fail. */
-    UA_StatusCode rv = el->run(el, 1);
-    ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);
-
-    connectionCallback(cm, connectionId, application, connectionContext,
-                       status, paramsSize, params, msg);
-}
-
 START_TEST(listenTCP) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
@@ -106,84 +92,6 @@ START_TEST(listenTCP) {
     ck_assert_uint_eq(connCount, 0);
 } END_TEST
 
-START_TEST(runEventloopFailsIfCalledFromCallback) {
-    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
-    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-    el->registerEventSource(el, &cm->eventSource);
-    el->start(el);
-
-    connCount = 0;
-
-    UA_UInt16 port = 4840;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-
-    UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    params[0].value = portVar;
-
-    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
-
-    size_t listenSockets = connCount;
-
-    /* Open a client connection */
-    clientId = 0;
-
-    UA_String targetHost = UA_STRING("localhost");
-    params[0].key = UA_QUALIFIEDNAME(0, "port");
-    params[0].value = portVar;
-    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
-    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
-
-    UA_StatusCode retval = cm->openConnection(cm, 2, params, NULL, (void*)0x01,
-                                              reenterConnectionCallback);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-    }
-    ck_assert(clientId != 0);
-    ck_assert_uint_eq(connCount, listenSockets + 2);
-
-    /* Send a message from the client */
-    received = false;
-    UA_ByteString snd;
-    retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    memcpy(snd.data, testMsg, strlen(testMsg));
-    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-    }
-    ck_assert(received);
-
-    /* Close the connection */
-    retval = cm->closeConnection(cm, clientId);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(connCount, listenSockets + 2);
-    for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-    }
-    ck_assert_uint_eq(connCount, listenSockets);
-
-    int max_stop_iteration_count = 1000;
-    int iteration = 0;
-    /* Stop the EventLoop */
-    el->stop(el);
-    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
-          iteration < max_stop_iteration_count) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        iteration++;
-    }
-    el->free(el);
-    el = NULL;
-    ck_assert_uint_eq(connCount, 0);
-} END_TEST
-
 START_TEST(connectTCP) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
@@ -268,7 +176,6 @@ int main(void) {
     TCase *tc = tcase_create("test cases");
     tcase_add_test(tc, listenTCP);
     tcase_add_test(tc, connectTCP);
-    tcase_add_test(tc, runEventloopFailsIfCalledFromCallback);
     suite_add_tcase(s, tc);
 
     SRunner *sr = srunner_create(s);
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index b84e92f0961..649126dfc98 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -23,11 +23,11 @@ typedef struct TestContext {
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void *application, void **connectionContext,
-                   UA_StatusCode status,
+                   UA_ConnectionState status,
                    size_t paramsSize, const UA_KeyValuePair *params,
                    UA_ByteString msg) {
     TestContext *ctx = (TestContext*) *connectionContext;
-    if(status != UA_STATUSCODE_GOOD) {
+    if(status == UA_CONNECTIONSTATE_CLOSING) {
         UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                      "Closing connection %u", (unsigned)connectionId);
     } else {
@@ -40,7 +40,7 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         }
     }
 
-    if(msg.length == 0 && status == UA_STATUSCODE_GOOD) {
+    if(msg.length == 0 && status == UA_CONNECTIONSTATE_ESTABLISHED) {
         ctx->connCount++;
         clientId = connectionId;
 
@@ -53,9 +53,9 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             ck_assert(hn != NULL);
         }
     }
-    if(status != UA_STATUSCODE_GOOD) {
+
+    if(status == UA_CONNECTIONSTATE_CLOSING)
         ctx->connCount--;
-    }
 
     if(msg.length > 0) {
         UA_ByteString rcv = UA_BYTESTRING(testMsg);
@@ -64,20 +64,6 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 }
 
-static void
-reenterConnectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void *application, void **connectionContext,
-                          UA_StatusCode status,
-                          size_t paramsSize, const UA_KeyValuePair *params,
-                          UA_ByteString msg) {
-    /* Try to reenter the eventloop. Must fail. */
-    UA_StatusCode rv = el->run(el, 1);
-    ck_assert_uint_eq(rv, UA_STATUSCODE_BADINTERNALERROR);
-
-    connectionCallback(cm, connectionId, application, connectionContext,
-                       status, paramsSize, params, msg);
-}
-
 START_TEST(listenUDP) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
@@ -119,86 +105,6 @@ START_TEST(listenUDP) {
     ck_assert_uint_eq(testContext.connCount, 0);
 } END_TEST
 
-START_TEST(runEventloopFailsIfCalledFromCallback) {
-    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
-    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-    el->registerEventSource(el, &cm->eventSource);
-    el->start(el);
-
-    TestContext testContext;
-    testContext.connCount = 0;
-
-    UA_UInt16 port = 4840;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-
-    UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    params[0].value = portVar;
-
-    cm->openConnection(cm, 1, params, NULL, &testContext, connectionCallback);
-
-    size_t listenSockets = testContext.connCount;
-
-    /* Open a client connection */
-    clientId = 0;
-
-    UA_String targetHost = UA_STRING("localhost");
-    params[0].key = UA_QUALIFIEDNAME(0, "port");
-    params[0].value = portVar;
-    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
-    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
-
-    UA_StatusCode retval = cm->openConnection(cm, 2, params, NULL, &testContext,
-                                              reenterConnectionCallback);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    for(size_t i = 0; i < 10; i++) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-    }
-    ck_assert(clientId != 0);
-    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
-
-    /* Send a message from the client */
-    received = false;
-    UA_ByteString snd;
-    retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    memcpy(snd.data, testMsg, strlen(testMsg));
-    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    for(size_t i = 0; i < 2; i++) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-    }
-    ck_assert(received);
-
-    /* Close the connection */
-    retval = cm->closeConnection(cm, clientId);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
-    for(size_t i = 0; i < 2; i++) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-    }
-    ck_assert_uint_eq(testContext.connCount, listenSockets);
-
-    /* Stop the EventLoop */
-    el->stop(el);
-    int max_stop_iteration_count = 1000;
-    int iteration = 0;
-    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
-          iteration < max_stop_iteration_count) {
-        UA_DateTime next = el->run(el, 1);
-        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        iteration++;
-    }
-    el->free(el);
-    el = NULL;
-
-    ck_assert_uint_eq(testContext.connCount, 0);
-} END_TEST
-
 START_TEST(connectUDP) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
@@ -506,8 +412,6 @@ int main(void) {
     TCase *tc = tcase_create("test cases");
     tcase_add_test(tc, listenUDP);
     tcase_add_test(tc, connectUDP);
-    tcase_add_test(tc, runEventloopFailsIfCalledFromCallback);
-
     tcase_add_test(tc, udpTalkerAndListener);
     tcase_add_test(tc, udpTalkerAndListenerDifferentDestination);
     suite_add_tcase(s, tc);

From 0c95c1d3b85e34e3d0160e1e5f1e3146829fea49 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 20 Jul 2022 00:48:31 +0200
Subject: [PATCH 0326/1963] refactor(tests): Check status code in
 callObjectTypeMethodOnInstance

---
 tests/server/check_services_call.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/server/check_services_call.c b/tests/server/check_services_call.c
index 6e7d88cb144..672161c3b31 100644
--- a/tests/server/check_services_call.c
+++ b/tests/server/check_services_call.c
@@ -254,7 +254,10 @@ START_TEST(callObjectTypeMethodOnInstance) {
     UA_CallMethodResult_init(&result);
     result = UA_Server_call(server, &callMethodRequest);
 
-    /* ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD); // Fails because the subscription id is invalid */
+    /* Fails because the "local" session has not subscriptions.
+     * Notifications are directly forwarded to a callback method.
+     * However all the type-checking before calling the method has to work. */
+    ck_assert_int_eq(result.statusCode, UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID); 
     UA_CallMethodResult_clear(&result);
 #endif
 } END_TEST

From 0f70982cfb1043ec60f789d19eadf256b37e1ac2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 20 Jul 2022 01:22:15 +0200
Subject: [PATCH 0327/1963] fix(server): Fix check if a node is contained in
 the object type

The old code mistakenly used getParentTypeAndInterfaceHierarchy (which
expects a type-node as the starting point and not an instance) where it
should have used getNodeType.
---
 src/server/ua_services_method.c    | 36 +++-------------
 tests/server/check_services_call.c | 66 ++++++++++++++++++++++++++++--
 2 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index a46ec58af37..6cd5324a43f 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -121,33 +121,6 @@ checkMethodReference(const UA_NodeHead *h, UA_ReferenceTypeSet refs,
     return false;
 }
 
-static UA_StatusCode
-checkObjectTypeMethodReference(UA_Server *server, const UA_NodeHead *h,
-                               UA_ReferenceTypeSet refs, const UA_ExpandedNodeId *methodId,
-                               UA_Boolean *found) {
-    /* Get the list of types from which the method inherits. This considers
-     * multiple inheritance. */
-    UA_NodeId *typeHierarchy = NULL;
-    size_t typeHierarchySize = 0;
-    UA_StatusCode res =
-        getParentTypeAndInterfaceHierarchy(server, &h->nodeId,
-                                           &typeHierarchy, &typeHierarchySize);
-    UA_CHECK_STATUS(res, return res);
-
-    for(size_t i = 0; i < typeHierarchySize && !*found; i++) {
-        const UA_Node *objectType =
-            UA_NODESTORE_GET_SELECTIVE(server, &typeHierarchy[i], 0,
-                                       refs, UA_BROWSEDIRECTION_FORWARD);
-        if(!objectType)
-            continue;
-        *found = checkMethodReference(&objectType->head, refs, methodId);
-        UA_NODESTORE_RELEASE(server, objectType);
-    }
-
-    UA_Array_delete(typeHierarchy, typeHierarchySize, &UA_TYPES[UA_TYPES_NODEID]);
-    return UA_STATUSCODE_GOOD;
-}
-
 static UA_StatusCode
 checkFunctionalGroupMethodReference(UA_Server *server, const UA_NodeHead *h,
                                     const UA_ExpandedNodeId *methodId,
@@ -250,10 +223,11 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
          * check its objectType (and its supertypes). Invoked method can be a component
          * of objectType and be invoked on this objectType's instance (or on a instance
          * of one of its subtypes). */
-        result->statusCode =
-            checkObjectTypeMethodReference(server, &object->head,
-                                           hasComponentRefs, &methodId, &found);
-        UA_CHECK_STATUS(result->statusCode, return);
+        const UA_Node *objectType = getNodeType(server, &object->head);
+        if(objectType) {
+            found = checkMethodReference(&objectType->head, hasComponentRefs, &methodId);
+            UA_NODESTORE_RELEASE(server, objectType);
+        }
     }
 
     if(!found) {
diff --git a/tests/server/check_services_call.c b/tests/server/check_services_call.c
index 672161c3b31..c887ee7759f 100644
--- a/tests/server/check_services_call.c
+++ b/tests/server/check_services_call.c
@@ -206,7 +206,8 @@ START_TEST(callMethodWithWronglyTypedArguments) {
     ck_assert_int_eq(result.inputArgumentResults[0], UA_STATUSCODE_BADTYPEMISMATCH);
     ck_assert_int_eq(result.statusCode, UA_STATUSCODE_BADINVALIDARGUMENT);
 
-    UA_Array_delete(result.inputArgumentResults, result.inputArgumentResultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
+    UA_Array_delete(result.inputArgumentResults, result.inputArgumentResultsSize,
+                    &UA_TYPES[UA_TYPES_STATUSCODE]);
 #endif
 } END_TEST
 
@@ -231,13 +232,14 @@ START_TEST(callMethodWithEmptyArgument) {
     ck_assert_int_eq(result.inputArgumentResults[0], UA_STATUSCODE_BADTYPEMISMATCH);
     ck_assert_int_eq(result.statusCode, UA_STATUSCODE_BADINVALIDARGUMENT);
 
-    UA_Array_delete(result.inputArgumentResults, result.inputArgumentResultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
+    UA_Array_delete(result.inputArgumentResults, result.inputArgumentResultsSize,
+                    &UA_TYPES[UA_TYPES_STATUSCODE]);
 #endif
 } END_TEST
 
 START_TEST(callObjectTypeMethodOnInstance) {
 /* Minimal nodeset does not add any method nodes we may call here */
-#if defined(UA_GENERATED_NAMESPACE_ZERO_FULL) && defined(UA_ENABLE_SUBSCRIPTIONS)
+#if defined(UA_GENERATED_NAMESPACE_ZERO) && defined(UA_ENABLE_SUBSCRIPTIONS)
     UA_Variant inputArgument;
     UA_Variant_init(&inputArgument);
     UA_UInt32 inputArgumentValue = 0;
@@ -262,6 +264,63 @@ START_TEST(callObjectTypeMethodOnInstance) {
 #endif
 } END_TEST
 
+START_TEST(callObjectTypeMethodOnInstance2) {
+/* Minimal nodeset does not add any method nodes we may call here */
+#if defined(UA_GENERATED_NAMESPACE_ZERO) && defined(UA_ENABLE_SUBSCRIPTIONS)
+    /* Add an object type */
+    UA_NodeId objecttypeid = UA_NODEID_NUMERIC(0, 13371337);
+    UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+    attr.displayName = UA_LOCALIZEDTEXT("en-US","my objecttype");
+    UA_StatusCode res =
+        UA_Server_addObjectTypeNode(server, objecttypeid,
+                                    UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
+                                    UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
+                                    UA_QUALIFIEDNAME(0, "myobjecttype"), attr,
+                                    NULL, NULL);
+    ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
+
+    /* Add a method to the object type. But don't make the method a mandatory child. */
+    UA_NodeId methodid = UA_NODEID_NUMERIC(0, 4711);
+    UA_MethodAttributes methodAttr = UA_MethodAttributes_default;
+    methodAttr.description = UA_LOCALIZEDTEXT("en-US","my method");
+    methodAttr.displayName = UA_LOCALIZEDTEXT("en-US","my method");
+    methodAttr.executable = true;
+    methodAttr.userExecutable = true;
+    UA_Server_addMethodNode(server, methodid,
+                            objecttypeid,
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                            UA_QUALIFIEDNAME(1, "Not executable"),
+                            methodAttr, &methodCallback,
+                            0, NULL, 0, NULL, NULL, NULL);
+
+    /* Instantiate the object type. This does not create a copy of the method. */
+    UA_NodeId objId;
+    UA_ObjectAttributes attr2 = UA_ObjectAttributes_default;
+    attr2.displayName = UA_LOCALIZEDTEXT("en-US","my object");
+    res = UA_Server_addObjectNode(server, UA_NODEID_NULL,
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                  UA_QUALIFIEDNAME(0, "MyObjectNode"), objecttypeid,
+                                  attr2, NULL, &objId);
+    ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
+    
+    UA_CallMethodRequest callMethodRequest;
+    UA_CallMethodRequest_init(&callMethodRequest);
+    callMethodRequest.methodId = methodid;
+    callMethodRequest.objectId = objId;
+
+    UA_CallMethodResult result;
+    UA_CallMethodResult_init(&result);
+    result = UA_Server_call(server, &callMethodRequest);
+
+    /* Has to succeed even though the method is not directly referenced from the
+     * object. We look up that the method is defined in its ObjectType and then
+     * allow it to be called. */
+    ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
+    UA_CallMethodResult_clear(&result);
+#endif
+} END_TEST
+
 int main(void) {
     Suite *s = suite_create("services_call");
 
@@ -278,6 +337,7 @@ int main(void) {
     tcase_add_test(tc_call, callMethodWithWronglyTypedArguments);
     tcase_add_test(tc_call, callMethodWithEmptyArgument);
     tcase_add_test(tc_call, callObjectTypeMethodOnInstance);
+    tcase_add_test(tc_call, callObjectTypeMethodOnInstance2);
     suite_add_tcase(s, tc_call);
 
     SRunner *sr = srunner_create(s);

From 6b5233ef2f93e91866fee0f16dd8774eb96f58b9 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Wed, 20 Jul 2022 14:04:14 +0200
Subject: [PATCH 0328/1963] fix(arch): obsolete ipv6 define

According to Linux /usr/include/bits/in.h IPV6_ADD_MEMBERSHIP is
obsolete.  It does not exist on OpenBSD.  Use IPV6_JOIN_GROUP
instead.
---
 arch/eventloop_posix_udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index c3c896bcaa5..5ff95cb7a10 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -466,7 +466,7 @@ setupListenMulticastIPv6(UA_FD socket, size_t paramsSize, const UA_KeyValuePair
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
-    if(UA_setsockopt(socket, IPPROTO_IPV6,IPV6_ADD_MEMBERSHIP,
+    if(UA_setsockopt(socket, IPPROTO_IPV6,IPV6_JOIN_GROUP,
                      &ipMulticastRequest.ipv6,sizeof(ipMulticastRequest.ipv6)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,

From 713cdb419f0f844517afc549c7c1ef48d8498cfb Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Wed, 20 Jul 2022 13:07:38 +0200
Subject: [PATCH 0329/1963] fix(client): use after free in
 asyncServiceTimeoutCheck

Commit de9d691906547c9fc99e0a77198a80fe5bba54b1 fixed a use after
free in UA_Client_AsyncService_cancel().  The same bug is present
in asyncServiceTimeoutCheck(), so use the same fix.  After timeout,
remove the async service calls from the global list and store them
in a local one.  Call UA_Client_AsyncService_cancel() and with it
the UA_free() while traversing this local list.  Otherwise the
callback could free a global list element that asyncServiceTimeoutCheck()
is referencing.
---
 src/client/ua_client.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 01cb3c3d311..77e5e318984 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -628,16 +628,27 @@ UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId) {
 
 static void
 asyncServiceTimeoutCheck(UA_Client *client) {
+    /* Make this function reentrant. One of the async callbacks could indirectly
+     * operate on the list. Moving all elements to a local list before iterating
+     * that. */
+    UA_AsyncServiceList asyncServiceCalls;
     AsyncServiceCall *ac, *ac_tmp;
     UA_DateTime now = UA_DateTime_nowMonotonic();
+    LIST_INIT(&asyncServiceCalls);
     LIST_FOREACH_SAFE(ac, &client->asyncServiceCalls, pointers, ac_tmp) {
         if(!ac->timeout)
            continue;
         if(ac->start + (UA_DateTime)(ac->timeout * UA_DATETIME_MSEC) <= now) {
             LIST_REMOVE(ac, pointers);
-            UA_Client_AsyncService_cancel(client, ac, UA_STATUSCODE_BADTIMEOUT);
+            LIST_INSERT_HEAD(&asyncServiceCalls, ac, pointers);
         }
     }
+
+    /* Cancel and remove the elements from the local list */
+    LIST_FOREACH_SAFE(ac, &asyncServiceCalls, pointers, ac_tmp) {
+        LIST_REMOVE(ac, pointers);
+        UA_Client_AsyncService_cancel(client, ac, UA_STATUSCODE_BADTIMEOUT);
+    }
 }
 
 static void

From 12e677df144b6d76e0d6a2a81a4a742df5d95ce6 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Wed, 20 Jul 2022 14:17:45 +0200
Subject: [PATCH 0330/1963] test(core): fix more sign-conversion compiler
 errors

---
 tests/client/check_client.c               | 2 +-
 tests/client/check_client_async.c         | 2 +-
 tests/client/check_client_securechannel.c | 2 +-
 tests/client/check_client_subscriptions.c | 2 +-
 tests/server/check_services_view.c        | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 675a868b392..2ea61017224 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -352,7 +352,7 @@ START_TEST(Client_activateSessionTimeout) {
      * next iteration of the EventLoop. Hence the next request is sent out. But
      * the connection "actually closes" before receiving the response. */
     UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-    uintptr_t connId = client->connection.sockfd;
+    uintptr_t connId = (unsigned)client->connection.sockfd;
     cm->closeConnection(cm, connId);
 
     UA_Variant_init(&val);
diff --git a/tests/client/check_client_async.c b/tests/client/check_client_async.c
index 12d28a50558..ba90dbfe2e9 100644
--- a/tests/client/check_client_async.c
+++ b/tests/client/check_client_async.c
@@ -186,7 +186,7 @@ START_TEST(Client_read_async_timed) {
          * next iteration of the EventLoop. Hence the next request is sent out. But
          * the connection "actually closes" before receiving the response. */
         UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-        uintptr_t connId = client->connection.sockfd;
+        uintptr_t connId = (unsigned)client->connection.sockfd;
         cm->closeConnection(cm, connId);
 
         retval = __UA_Client_AsyncServiceEx(client, &rr,
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index e56856cf96c..e98e8fb9719 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -207,7 +207,7 @@ START_TEST(SecureChannel_cableunplugged) {
      * next iteration of the EventLoop. Hence the next request is sent out. But
      * the connection "actually closes" before receiving the response. */
     UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-    uintptr_t connId = client->connection.sockfd;
+    uintptr_t connId = (unsigned)client->connection.sockfd;
     cm->closeConnection(cm, connId);
 
     UA_Variant_init(&val);
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index e6455a16e4c..25d1b3b0901 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -904,7 +904,7 @@ START_TEST(Client_subscription_connectionClose) {
      * next iteration of the EventLoop. Hence the next request is sent out. But
      * the connection "actually closes" before receiving the response. */
     UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-    uintptr_t connId = client->connection.sockfd;
+    uintptr_t connId = (unsigned)client->connection.sockfd;
     cm->closeConnection(cm, connId);
 
     notificationReceived = false;
diff --git a/tests/server/check_services_view.c b/tests/server/check_services_view.c
index 0ef6e6a3c89..bd8f77e7fbc 100644
--- a/tests/server/check_services_view.c
+++ b/tests/server/check_services_view.c
@@ -347,7 +347,7 @@ START_TEST(Service_Browse_Localization) {
 
     UA_BrowseResult br = UA_Server_browse(server, 100, &bd);
     ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(br.referencesSize, 1);
+    ck_assert_uint_eq(br.referencesSize, 1);
     ck_assert(UA_String_equal(&br.references->displayName.locale, &attr.displayName.locale));
     ck_assert(UA_String_equal(&br.references->displayName.text, &attr.displayName.text));
     UA_BrowseResult_clear(&br);
@@ -358,7 +358,7 @@ START_TEST(Service_Browse_Localization) {
 
     br = UA_Server_browse(server, 100, &bd);
     ck_assert_int_eq(br.statusCode, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(br.referencesSize, 1);
+    ck_assert_uint_eq(br.referencesSize, 1);
     ck_assert(UA_String_equal(&br.references->displayName.locale, &germanDisplayName.locale));
     ck_assert(UA_String_equal(&br.references->displayName.text, &germanDisplayName.text));
     UA_BrowseResult_clear(&br);

From 58e591b16ed51cd53c0227fdb97a31f92628450f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 21 Jul 2022 09:27:26 +0200
Subject: [PATCH 0331/1963] fix(test): Remove a sign conversion error in
 testing_clock.c

---
 tests/testing-plugins/testing_clock.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/testing-plugins/testing_clock.c b/tests/testing-plugins/testing_clock.c
index 898adb09e0f..31faf4ffd39 100644
--- a/tests/testing-plugins/testing_clock.c
+++ b/tests/testing-plugins/testing_clock.c
@@ -34,11 +34,11 @@ UA_realSleep(UA_UInt32 duration) {
 #ifdef _WIN32
     Sleep(duration);
 #else
-    UA_Int32 sec = duration / 1000;
-    UA_Int32 ns = (duration % 1000) * NANO_SECOND_MULTIPLIER;
+    UA_UInt32 sec = duration / 1000;
+    UA_UInt32 ns = (duration % 1000) * NANO_SECOND_MULTIPLIER;
     struct timespec sleepValue;
-    sleepValue.tv_sec = sec;
-    sleepValue.tv_nsec = ns;
+    sleepValue.tv_sec = (int)sec;
+    sleepValue.tv_nsec = (int)ns;
     nanosleep(&sleepValue, NULL);
 #endif
 }

From 4f40f62d954a7b251c1aac9515475f13179f68ba Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 21 Jul 2022 09:28:17 +0200
Subject: [PATCH 0332/1963] refactor(test): Don't remove compiler warnings for
 sign conversion

---
 tests/CMakeLists.txt           | 12 ------------
 tests/server/check_nodestore.c |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ea1d2fd2831..bbd470a0271 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,13 +11,6 @@ if(NOT MSVC AND UA_ENABLE_UNIT_TESTS_MEMCHECK)
     find_package(Valgrind REQUIRED)
 endif()
 
-if(APPLE)
-    # CLang on Apple complains about many cases like this:
-    # /Users/travis/build/open62541/open62541/tests/check_chunking.c:148:22: warning: implicit conversion changes signedness: 'size_t' (aka 'unsigned long') to 'intmax_t' (aka 'long') [-Wsign-conversion]
-    #    ck_assert_int_eq(counter,9); //10 chunks allocated - callback called 4 times
-    add_definitions(-Wno-sign-conversion)
-endif()
-
 get_property(open62541_BUILD_INCLUDE_DIRS TARGET open62541 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 include_directories(${open62541_BUILD_INCLUDE_DIRS})
 # ua_server_internal.h
@@ -168,11 +161,6 @@ if(UA_ENABLE_COVERAGE)
     add_coverage(open62541-testplugins)
 endif()
 
-# Workaround some clang warnings in the uni tests
-if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang"))
-    add_definitions(-Wno-sign-conversion)
-endif()
-
 # Unit Test Definition Macro
 # For now we need to disable the libc freeres. See https://github.com/open62541/open62541/pull/1003#issuecomment-315045143
 # This also requires to disable the phtread cache with no-nptl-pthread-stackcache
diff --git a/tests/server/check_nodestore.c b/tests/server/check_nodestore.c
index 3a16ee009be..11a73efa093 100644
--- a/tests/server/check_nodestore.c
+++ b/tests/server/check_nodestore.c
@@ -209,7 +209,7 @@ static void *profileGetThread(void *arg) {
     UA_Int32 max_val = test->max_val;
     for(UA_Int32 x = 0; x<test->rounds; x++) {
         for(UA_Int32 i=test->min_val; i<max_val; i++) {
-            id.identifier.numeric = i+1;
+            id.identifier.numeric = (UA_UInt32)(i+1);
             const UA_Node* n = ns.getNode(ns.context, &id, ~(UA_UInt32)0,
                                           UA_REFERENCETYPESET_ALL, UA_BROWSEDIRECTION_BOTH);
             ns.releaseNode(ns.context, n);

From 56cf03f81012635e00c902c7cbafde24c903f253 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 21 Jul 2022 09:41:18 +0200
Subject: [PATCH 0333/1963] fix(test): Fix sign-conversion errors in
 check_types_builtin_json.c

---
 tests/check_types_builtin_json.c | 126 +++++++++++++++----------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index 48952cf1571..693b908c5db 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -64,7 +64,7 @@ START_TEST(UA_Boolean_false_json_encode) {
     UA_ByteString buf;
 
     size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    ck_assert_int_eq(size, 5);
+    ck_assert_uint_eq(size, 5);
 
     UA_ByteString_allocBuffer(&buf, size+1);
 
@@ -1586,7 +1586,7 @@ START_TEST(UA_NodeId_Guid_Namespace_json_encode) {
     UA_ByteString buf;
 
     // {"IdType":2,"Id":"00000003-0009-000A-0807-060504030201","Namespace":5}
-    ck_assert_int_eq(size, 70);
+    ck_assert_uint_eq(size, 70);
 
     UA_ByteString_allocBuffer(&buf, size+1);
 
@@ -1619,7 +1619,7 @@ START_TEST(UA_NodeId_ByteString_json_encode) {
     const UA_Byte *bufEnd = &buf.data[size+1];
 
     //{"IdType":3,"Id":"YXNkZmFzZGY="}
-    ck_assert_int_eq(size, 32);
+    ck_assert_uint_eq(size, 32);
 
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
@@ -1665,7 +1665,7 @@ START_TEST(UA_NodeId_NonReversible_Numeric_Namespace_json_encode) {
 
     UA_String namespaces[3] = {UA_STRING("ns0"),UA_STRING("ns1"),UA_STRING("ns2")};
     size_t size = UA_calcSizeJsonInternal((void *) src, type, namespaces, 3, NULL, 0, false);
-    ck_assert_int_ne(size, 0);
+    ck_assert_uint_ne(size, 0);
     UA_ByteString buf;
 
     UA_ByteString_allocBuffer(&buf, size+1);
@@ -1771,7 +1771,7 @@ START_TEST(UA_DiagInfo_withInner_json_encode) {
     const UA_Byte *bufEnd = &buf.data[size+1];
 
     //{"SymbolicId":13,"LocalizedText":14,"Locale":12,"AdditionalInfo":"additionalInfo","InnerStatusCode":2155216896,"InnerDiagnosticInfo":{"AdditionalInfo":"INNER ADDITION INFO"}}
-    ck_assert_int_eq(size, 174);
+    ck_assert_uint_eq(size, 174);
 
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
@@ -2501,7 +2501,7 @@ START_TEST(UA_Variant_Array_UInt16_json_encode) {
     UA_Byte *bufPos = &buf.data[0];
     const UA_Byte *bufEnd = &buf.data[size+1];
 
-    ck_assert_int_eq(size, 25);
+    ck_assert_uint_eq(size, 25);
 
     status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
@@ -2627,7 +2627,7 @@ START_TEST(UA_Variant_Matrix_UInt16_json_encode) {
 
     //{"Type":5,"Body":[1,2,3,4,5,6,7,8,9],"Dimension":[3,3]}
     size_t sizeOfBytes = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    ck_assert_int_eq(sizeOfBytes, 55);
+    ck_assert_uint_eq(sizeOfBytes, 55);
 
     status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
 
@@ -2732,7 +2732,7 @@ START_TEST(UA_Variant_Matrix_String_NonReversible_json_encode) {
 
     //{"Body":[[[["1"],["2"]],[["3"],["4"]]],[[["5"],["6"]],[["7"],["8"]]]]}
     size_t sizeOfBytes = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
-    ck_assert_int_eq(sizeOfBytes, 70);
+    ck_assert_uint_eq(sizeOfBytes, 70);
 
     status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
 
@@ -4230,7 +4230,7 @@ START_TEST(UA_String_json_decode) {
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
-    ck_assert_int_eq(  ((UA_String*)out.data)->length, 6);
+    ck_assert_uint_eq(  ((UA_String*)out.data)->length, 6);
     ck_assert_int_eq( ((UA_String*)out.data)->data[0], 'a');
     ck_assert_int_eq(((UA_String*)out.data)->data[1], 'b');
     ck_assert_int_eq(((UA_String*)out.data)->data[2], 'c');
@@ -4252,7 +4252,7 @@ START_TEST(UA_String_empty_json_decode) {
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
-    ck_assert_int_eq(  ((UA_String*)out.data)->length, 0);
+    ck_assert_uint_eq(  ((UA_String*)out.data)->length, 0);
     ck_assert_ptr_eq(  ((UA_String*)out.data)->data, UA_EMPTY_ARRAY_SENTINEL);
 
     UA_Variant_clear(&out);
@@ -4269,7 +4269,7 @@ START_TEST(UA_String_unescapeBS_json_decode) {
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
-    ck_assert_int_eq(  ((UA_String*)out.data)->length, 7);
+    ck_assert_uint_eq(  ((UA_String*)out.data)->length, 7);
     ck_assert_int_eq( ((UA_String*)out.data)->data[0], 'a');
     ck_assert_int_eq(((UA_String*)out.data)->data[1], 'b');
     ck_assert_int_eq(((UA_String*)out.data)->data[2], '\t');
@@ -4292,7 +4292,7 @@ START_TEST(UA_String_escape_unicode_json_decode) {
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
-    ck_assert_int_eq(  ((UA_String*)out.data)->length, 1);
+    ck_assert_uint_eq(  ((UA_String*)out.data)->length, 1);
     ck_assert_int_eq( ((UA_String*)out.data)->data[0], ',');
 
     UA_Variant_clear(&out);
@@ -4310,7 +4310,7 @@ START_TEST(UA_String_escape2_json_decode) {
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
-    ck_assert_int_eq(  ((UA_String*)out.data)->length, 12);//  \b\th\"e\fl\nl\\o\r
+    ck_assert_uint_eq(  ((UA_String*)out.data)->length, 12);//  \b\th\"e\fl\nl\\o\r
     ck_assert_int_eq( ((UA_String*)out.data)->data[0], '\b');
     ck_assert_int_eq( ((UA_String*)out.data)->data[1], '\t');
     ck_assert_int_eq( ((UA_String*)out.data)->data[2], 'h');
@@ -4339,7 +4339,7 @@ START_TEST(UA_String_surrogatePair_json_decode) {
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
-    ck_assert_int_eq(  ((UA_String*)out.data)->length, 4);//U+10000  => 0xF0 0x90 0x80 0x80
+    ck_assert_uint_eq(  ((UA_String*)out.data)->length, 4);//U+10000  => 0xF0 0x90 0x80 0x80
     ck_assert_uint_eq( ((UA_String*)out.data)->data[0], 0xF0);
     ck_assert_uint_eq( ((UA_String*)out.data)->data[1], 0x90);
     ck_assert_uint_eq( ((UA_String*)out.data)->data[2], 0x80);
@@ -4360,7 +4360,7 @@ START_TEST(UA_ByteString_json_decode) {
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BYTESTRING);
-    ck_assert_int_eq(((UA_ByteString*)out.data)->length, 8);
+    ck_assert_uint_eq(((UA_ByteString*)out.data)->length, 8);
     ck_assert_int_eq(((UA_ByteString*)out.data)->data[0], 'a');
     ck_assert_int_eq(((UA_ByteString*)out.data)->data[1], 's');
     ck_assert_int_eq(((UA_ByteString*)out.data)->data[2], 'd');
@@ -4634,7 +4634,7 @@ START_TEST(UA_DateTime_json_decode_min) {
     status s = UA_encodeJsonInternal((void *)&dt_min, type,
                                      &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
-    buf.length = bufPos - buf.data;
+    buf.length = (size_t)(bufPos - buf.data);
 
     UA_DateTime out;
     s = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
@@ -4671,7 +4671,7 @@ START_TEST(UA_DateTime_json_decode_max) {
     status s = UA_encodeJsonInternal((void *)&dt_max, type,
                                      &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
-    buf.length = bufPos - buf.data;
+    buf.length = (size_t)(bufPos - buf.data);
 
     UA_DateTime out;
     s = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
@@ -4730,7 +4730,7 @@ START_TEST(UA_QualifiedName_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.name.length, 7);
+    ck_assert_uint_eq(out.name.length, 7);
     ck_assert_int_eq(out.name.data[1], 'e');
     ck_assert_int_eq(out.name.data[6], 'e');
     ck_assert_int_eq(out.namespaceIndex, 1);
@@ -4779,11 +4779,11 @@ START_TEST(UA_LocalizedText_missing_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.locale.length, 2);
+    ck_assert_uint_eq(out.locale.length, 2);
     ck_assert_int_eq(out.locale.data[0], 't');
     ck_assert_int_eq(out.locale.data[1], '1');
     ck_assert_ptr_eq(out.text.data, NULL);
-    ck_assert_int_eq(out.text.length, 0);
+    ck_assert_uint_eq(out.text.length, 0);
 
     UA_LocalizedText_clear(&out);
 }
@@ -4843,8 +4843,8 @@ START_TEST(UA_NodeId_Nummeric_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.identifier.numeric, 42);
-    ck_assert_int_eq(out.namespaceIndex, 0);
+    ck_assert_uint_eq(out.identifier.numeric, 42);
+    ck_assert_uint_eq(out.namespaceIndex, 0);
     ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_NUMERIC);
 
     UA_NodeId_clear(&out);
@@ -4861,8 +4861,8 @@ START_TEST(UA_NodeId_Nummeric_Namespace_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.identifier.numeric, 42);
-    ck_assert_int_eq(out.namespaceIndex, 123);
+    ck_assert_uint_eq(out.identifier.numeric, 42);
+    ck_assert_uint_eq(out.namespaceIndex, 123);
     ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_NUMERIC);
 
     UA_NodeId_clear(&out);
@@ -4880,7 +4880,7 @@ START_TEST(UA_NodeId_String_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.identifier.string.length, 7);
+    ck_assert_uint_eq(out.identifier.string.length, 7);
     ck_assert_int_eq(out.identifier.string.data[0], 't');
     ck_assert_int_eq(out.identifier.string.data[1], 'e');
     ck_assert_int_eq(out.identifier.string.data[2], 's');
@@ -4938,7 +4938,7 @@ START_TEST(UA_NodeId_ByteString_json_decode) {
 
     ck_assert_int_eq(out.namespaceIndex, 0);
     ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_BYTESTRING);
-    ck_assert_int_eq(out.identifier.byteString.length, 8);
+    ck_assert_uint_eq(out.identifier.byteString.length, 8);
     ck_assert_int_eq(out.identifier.byteString.data[0], 'a');
     ck_assert_int_eq(out.identifier.byteString.data[1], 's');
     ck_assert_int_eq(out.identifier.byteString.data[2], 'd');
@@ -4967,7 +4967,7 @@ START_TEST(UA_ExpandedNodeId_Nummeric_json_decode) {
     ck_assert_int_eq(out.nodeId.identifier.numeric, 42);
     ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_NUMERIC);
     ck_assert_ptr_eq(out.namespaceUri.data, NULL);
-    ck_assert_int_eq(out.namespaceUri.length, 0);
+    ck_assert_uint_eq(out.namespaceUri.length, 0);
     ck_assert_int_eq(out.serverIndex, 0);
 
     UA_ExpandedNodeId_clear(&out);
@@ -4984,11 +4984,11 @@ START_TEST(UA_ExpandedNodeId_String_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.nodeId.identifier.string.length, 4);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
     ck_assert_int_eq(out.nodeId.identifier.string.data[0], 't');
     ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_STRING);
     ck_assert_ptr_eq(out.namespaceUri.data, NULL);
-    ck_assert_int_eq(out.namespaceUri.length, 0);
+    ck_assert_uint_eq(out.namespaceUri.length, 0);
     ck_assert_int_eq(out.serverIndex, 0);
 
     UA_ExpandedNodeId_clear(&out);
@@ -5005,13 +5005,13 @@ START_TEST(UA_ExpandedNodeId_String_Namespace_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.nodeId.identifier.string.length, 4);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
     ck_assert_int_eq(out.nodeId.identifier.string.data[0], 't');
     ck_assert_int_eq(out.nodeId.identifier.string.data[1], 'e');
     ck_assert_int_eq(out.nodeId.identifier.string.data[2], 's');
     ck_assert_int_eq(out.nodeId.identifier.string.data[3], 't');
     ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_STRING);
-    ck_assert_int_eq(out.namespaceUri.length, 6);
+    ck_assert_uint_eq(out.namespaceUri.length, 6);
     ck_assert_int_eq(out.namespaceUri.data[0], 'a');
     ck_assert_int_eq(out.namespaceUri.data[1], 'b');
     ck_assert_int_eq(out.namespaceUri.data[2], 'c');
@@ -5034,16 +5034,16 @@ START_TEST(UA_ExpandedNodeId_String_NamespaceAsIndex_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.nodeId.identifier.string.length, 4);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
     ck_assert_int_eq(out.nodeId.identifier.string.data[0], 't');
     ck_assert_int_eq(out.nodeId.identifier.string.data[1], 'e');
     ck_assert_int_eq(out.nodeId.identifier.string.data[2], 's');
     ck_assert_int_eq(out.nodeId.identifier.string.data[3], 't');
     ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_STRING);
-    ck_assert_int_eq(out.namespaceUri.length, 0);
+    ck_assert_uint_eq(out.namespaceUri.length, 0);
     ck_assert_ptr_eq(out.namespaceUri.data, NULL);
-    ck_assert_int_eq(out.nodeId.namespaceIndex, 42);
-    ck_assert_int_eq(out.serverIndex, 0);
+    ck_assert_uint_eq(out.nodeId.namespaceIndex, 42);
+    ck_assert_uint_eq(out.serverIndex, 0);
 
     UA_ExpandedNodeId_clear(&out);
 }
@@ -5059,13 +5059,13 @@ START_TEST(UA_ExpandedNodeId_String_Namespace_ServerUri_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.nodeId.identifier.string.length, 4);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
     ck_assert_int_eq(out.nodeId.identifier.string.data[0], 't');
     ck_assert_int_eq(out.nodeId.identifier.string.data[1], 'e');
     ck_assert_int_eq(out.nodeId.identifier.string.data[2], 's');
     ck_assert_int_eq(out.nodeId.identifier.string.data[3], 't');
     ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_STRING);
-    ck_assert_int_eq(out.serverIndex, 13);
+    ck_assert_uint_eq(out.serverIndex, 13);
     ck_assert_int_eq(out.namespaceUri.data[0], 't');
     ck_assert_int_eq(out.namespaceUri.data[1], 'e');
     ck_assert_int_eq(out.namespaceUri.data[2], 's');
@@ -5085,7 +5085,7 @@ START_TEST(UA_ExpandedNodeId_ByteString_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.nodeId.identifier.string.length, 8);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 8);
     ck_assert_int_eq(out.nodeId.identifier.string.data[0], 'a');
     ck_assert_int_eq(out.nodeId.identifier.string.data[1], 's');
     ck_assert_int_eq(out.nodeId.identifier.string.data[2], 'd');
@@ -5095,7 +5095,7 @@ START_TEST(UA_ExpandedNodeId_ByteString_json_decode) {
     ck_assert_int_eq(out.nodeId.identifier.string.data[6], 'd');
     ck_assert_int_eq(out.nodeId.identifier.string.data[7], 'f');
     ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_BYTESTRING);
-    ck_assert_int_eq(out.serverIndex, 13);
+    ck_assert_uint_eq(out.serverIndex, 13);
     ck_assert_int_eq(out.namespaceUri.data[0], 't');
     ck_assert_int_eq(out.namespaceUri.data[1], 'e');
     ck_assert_int_eq(out.namespaceUri.data[2], 's');
@@ -5127,8 +5127,8 @@ START_TEST(UA_DiagnosticInfo_json_decode) {
     ck_assert_int_eq(out.symbolicId, 13);
     ck_assert_int_eq(out.localizedText, 14);
     ck_assert_int_eq(out.innerStatusCode, 2155216896);
-    ck_assert_int_eq(out.additionalInfo.length, 14);
-    ck_assert_int_eq(out.innerDiagnosticInfo->additionalInfo.length, 19);
+    ck_assert_uint_eq(out.additionalInfo.length, 14);
+    ck_assert_uint_eq(out.innerDiagnosticInfo->additionalInfo.length, 19);
     UA_DiagnosticInfo_clear(&out);
 }
 END_TEST
@@ -5296,7 +5296,7 @@ START_TEST(UA_ExtensionObject_Unkown_json_decode) {
     ck_assert_int_eq(out.content.encoded.typeId.identifier.numeric, 4711);
 
     //{"unknown":"body","saveas":"Bytestring"}Q
-    ck_assert_int_eq(out.content.encoded.body.length, 40);
+    ck_assert_uint_eq(out.content.encoded.body.length, 40);
     ck_assert_int_eq(out.content.encoded.body.data[2], 'u');
     ck_assert_int_eq(out.content.encoded.body.data[3], 'n');
     ck_assert_int_eq(out.content.encoded.body.data[4], 'k');
@@ -5371,10 +5371,10 @@ START_TEST(UA_VariantStringArray_json_decode) {
     ck_assert_int_eq((char)testArray[5].data[0], '6');
     ck_assert_int_eq((char)testArray[6].data[0], '7');
     ck_assert_int_eq((char)testArray[7].data[0], '8');
-    ck_assert_int_eq(out->arrayDimensionsSize, 2);
-    ck_assert_int_eq(out->arrayDimensions[0], 2);
-    ck_assert_int_eq(out->arrayDimensions[1], 4);
-    ck_assert_int_eq(out->arrayLength, 8);
+    ck_assert_uint_eq(out->arrayDimensionsSize, 2);
+    ck_assert_uint_eq(out->arrayDimensions[0], 2);
+    ck_assert_uint_eq(out->arrayDimensions[1], 4);
+    ck_assert_uint_eq(out->arrayLength, 8);
     ck_assert_int_eq(out->type->typeKind, UA_DATATYPEKIND_STRING);
     UA_Variant_delete(out);
 }
@@ -5404,10 +5404,10 @@ START_TEST(UA_VariantStringArrayNull_json_decode) {
     ck_assert_ptr_eq(testArray[5].data, NULL);
     ck_assert_ptr_eq(testArray[6].data, NULL);
     ck_assert_ptr_eq(testArray[7].data, NULL);
-    ck_assert_int_eq(out.arrayDimensionsSize, 2);
-    ck_assert_int_eq(out.arrayDimensions[0], 2);
-    ck_assert_int_eq(out.arrayDimensions[1], 4);
-    ck_assert_int_eq(out.arrayLength, 8);
+    ck_assert_uint_eq(out.arrayDimensionsSize, 2);
+    ck_assert_uint_eq(out.arrayDimensions[0], 2);
+    ck_assert_uint_eq(out.arrayDimensions[1], 4);
+    ck_assert_uint_eq(out.arrayLength, 8);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
     UA_Variant_clear(&out);
 }
@@ -5438,10 +5438,10 @@ START_TEST(UA_VariantLocalizedTextArrayNull_json_decode) {
     ck_assert_ptr_eq(testArray[5].locale.data, NULL);
     ck_assert_ptr_eq(testArray[6].locale.data, NULL);
     ck_assert_ptr_eq(testArray[7].locale.data, NULL);
-    ck_assert_int_eq(out.arrayDimensionsSize, 2);
-    ck_assert_int_eq(out.arrayDimensions[0], 2);
-    ck_assert_int_eq(out.arrayDimensions[1], 4);
-    ck_assert_int_eq(out.arrayLength, 8);
+    ck_assert_uint_eq(out.arrayDimensionsSize, 2);
+    ck_assert_uint_eq(out.arrayDimensions[0], 2);
+    ck_assert_uint_eq(out.arrayDimensions[1], 4);
+    ck_assert_uint_eq(out.arrayLength, 8);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_LOCALIZEDTEXT);
     UA_Variant_clear(&out);
 }
@@ -5465,10 +5465,10 @@ START_TEST(UA_VariantVariantArrayNull_json_decode) {
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert(!testArray[0].type);
-    ck_assert_int_eq(out.arrayDimensionsSize, 2);
-    ck_assert_int_eq(out.arrayDimensions[0], 2);
-    ck_assert_int_eq(out.arrayDimensions[1], 4);
-    ck_assert_int_eq(out.arrayLength, 8);
+    ck_assert_uint_eq(out.arrayDimensionsSize, 2);
+    ck_assert_uint_eq(out.arrayDimensions[0], 2);
+    ck_assert_uint_eq(out.arrayDimensions[1], 4);
+    ck_assert_uint_eq(out.arrayLength, 8);
     ck_assert_int_eq(out.type->typeKind, 21);
     UA_Variant_clear(&out);
 }
@@ -5489,7 +5489,7 @@ START_TEST(UA_VariantVariantArrayEmpty_json_decode) {
     UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(out.arrayLength, 0);
+    ck_assert_uint_eq(out.arrayLength, 0);
     ck_assert_ptr_eq(out.data, UA_EMPTY_ARRAY_SENTINEL);
     UA_Variant_clear(&out);
 }
@@ -5516,8 +5516,8 @@ START_TEST(UA_VariantStringArray_WithoutDimension_json_decode) {
     ck_assert_int_eq((char)testArray[5].data[0], '6');
     ck_assert_int_eq((char)testArray[6].data[0], '7');
     ck_assert_int_eq((char)testArray[7].data[0], '8');
-    ck_assert_int_eq(out.arrayDimensionsSize, 0);
-    ck_assert_int_eq(out.arrayLength, 8);
+    ck_assert_uint_eq(out.arrayDimensionsSize, 0);
+    ck_assert_uint_eq(out.arrayLength, 8);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
     UA_Variant_clear(&out);
 }
@@ -5541,8 +5541,8 @@ START_TEST(UA_Variant_BooleanArray_json_decode) {
     ck_assert_int_eq(testArray[0], 1);
     ck_assert_int_eq(testArray[1], 0);
     ck_assert_int_eq(testArray[2], 1);
-    ck_assert_int_eq(out.arrayDimensionsSize, 0);
-    ck_assert_int_eq(out.arrayLength, 3);
+    ck_assert_uint_eq(out.arrayDimensionsSize, 0);
+    ck_assert_uint_eq(out.arrayLength, 3);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BOOLEAN);
     UA_Variant_clear(&out);
 }

From 31a11d068c0c0b492eda11703936b40c72c6d3f2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 21 Jul 2022 10:11:56 +0200
Subject: [PATCH 0334/1963] fix(test): Remove sign-conversion errors in PubSub
 tests

---
 .../pubsub/check_pubsub_connection_ethernet.c | 24 ++++-----
 .../check_pubsub_connection_ethernet_etf.c    | 24 ++++-----
 tests/pubsub/check_pubsub_connection_mqtt.c   | 20 +++----
 tests/pubsub/check_pubsub_connection_udp.c    | 34 ++++++------
 tests/pubsub/check_pubsub_encoding.c          | 40 +++++++-------
 tests/pubsub/check_pubsub_encoding_json.c     |  2 +-
 .../check_pubsub_informationmodel_methods.c   | 38 +++++++-------
 tests/pubsub/check_pubsub_multiple_layer.c    |  6 +--
 tests/pubsub/check_pubsub_pds.c               | 20 +++----
 tests/pubsub/check_pubsub_publish.c           | 52 +++++++++----------
 tests/pubsub/check_pubsub_publish_uadp.c      | 20 +++----
 tests/pubsub/check_pubsub_publisherid.c       |  2 +-
 tests/pubsub/check_pubsub_subscribe.c         | 14 ++---
 13 files changed, 148 insertions(+), 148 deletions(-)

diff --git a/tests/pubsub/check_pubsub_connection_ethernet.c b/tests/pubsub/check_pubsub_connection_ethernet.c
index 94998c7cfd2..24d1f7b5bfa 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet.c
@@ -52,13 +52,13 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
 
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
 
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 2);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 2);
 } END_TEST
 
 
@@ -73,14 +73,14 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
         UA_NodeId connectionIdent;
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
         retVal |= UA_Server_removePubSubConnection(server, connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
         ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
@@ -95,11 +95,11 @@ START_TEST(AddConnectionWithInvalidAddress){
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithInvalidInterface){
@@ -112,11 +112,11 @@ START_TEST(AddConnectionWithInvalidInterface){
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithUnknownTransportURL){
@@ -130,14 +130,14 @@ START_TEST(AddConnectionWithUnknownTransportURL){
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/unknown-eth-uadp");
         UA_NodeId connectionIdent;
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(AddConnectionWithNullConfig){
         UA_StatusCode retVal;
         retVal = UA_Server_addPubSubConnection(server, NULL, NULL);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
@@ -168,7 +168,7 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_connection_ethernet_etf.c b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
index ffddeafdc3b..315ad4c6c51 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
@@ -56,13 +56,13 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
     connectionConfig.connectionProperties     = connectionOptions;
     connectionConfig.connectionPropertiesSize = 2;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 2);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 2);
 } END_TEST
 
 START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
@@ -86,14 +86,14 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
     connectionConfig.connectionPropertiesSize = 2;
     UA_NodeId connectionIdent;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     retVal |= UA_Server_removePubSubConnection(server, connectionIdent);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
@@ -118,11 +118,11 @@ START_TEST(AddConnectionWithInvalidAddress){
     connectionConfig.connectionProperties     = connectionOptions;
     connectionConfig.connectionPropertiesSize = 2;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithInvalidInterface){
@@ -145,11 +145,11 @@ START_TEST(AddConnectionWithInvalidInterface){
     connectionConfig.connectionProperties     = connectionOptions;
     connectionConfig.connectionPropertiesSize = 2;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithUnknownTransportURL){
@@ -163,14 +163,14 @@ START_TEST(AddConnectionWithUnknownTransportURL){
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/unknown-eth-uadp");
     UA_NodeId connectionIdent;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(AddConnectionWithNullConfig){
         UA_StatusCode retVal;
         retVal = UA_Server_addPubSubConnection(server, NULL, NULL);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
@@ -208,7 +208,7 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index 77f6c022432..7e744346aae 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -47,13 +47,13 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
     UA_StatusCode retVal =
         UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 2);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 2);
 } END_TEST
 
 START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
@@ -69,14 +69,14 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
     UA_NodeId connectionIdent;
     UA_StatusCode retVal =
         UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     retVal |= UA_Server_removePubSubConnection(server, connectionIdent);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
@@ -93,11 +93,11 @@ START_TEST(AddConnectionWithInvalidAddress){
     connectionConfig.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-invalid");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithUnknownTransportURL){
@@ -113,13 +113,13 @@ START_TEST(AddConnectionWithUnknownTransportURL){
     UA_NodeId connectionIdent;
     UA_StatusCode retVal =
         UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(AddConnectionWithNullConfig){
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, NULL, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
@@ -151,7 +151,7 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_connection_udp.c b/tests/pubsub/check_pubsub_connection_udp.c
index 921ef19b522..7c3617aefc0 100644
--- a/tests/pubsub/check_pubsub_connection_udp.c
+++ b/tests/pubsub/check_pubsub_connection_udp.c
@@ -39,13 +39,13 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 2);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 2);
 } END_TEST
 
 START_TEST(AddConnectionsWithMinimalValidIPv6Configuration){
@@ -58,13 +58,13 @@ START_TEST(AddConnectionsWithMinimalValidIPv6Configuration){
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 2);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 2);
 } END_TEST
 
 START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
@@ -78,14 +78,14 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
         UA_NodeId connectionIdent;
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
         retVal |= UA_Server_removePubSubConnection(server, connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
         ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
@@ -101,14 +101,14 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidIPv6Configuration){
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
         UA_NodeId connectionIdent;
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
         retVal |= UA_Server_removePubSubConnection(server, connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
         ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
@@ -123,11 +123,11 @@ START_TEST(AddConnectionWithInvalidAddress){
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithInvalidIPv6Address){
@@ -140,11 +140,11 @@ START_TEST(AddConnectionWithInvalidIPv6Address){
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithUnknownTransportURL){
@@ -158,14 +158,14 @@ START_TEST(AddConnectionWithUnknownTransportURL){
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/unknown-udp-uadp");
         UA_NodeId connectionIdent;
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(AddConnectionWithNullConfig){
         UA_StatusCode retVal;
         retVal = UA_Server_addPubSubConnection(server, NULL, NULL);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
@@ -196,7 +196,7 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_encoding.c b/tests/pubsub/check_pubsub_encoding.c
index d5df3e54d3f..12da4a79cd5 100644
--- a/tests/pubsub/check_pubsub_encoding.c
+++ b/tests/pubsub/check_pubsub_encoding.c
@@ -67,7 +67,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueVariantKeyFrame) {
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &UA_TYPES[UA_TYPES_INT32]);
     ck_assert_int_eq(*(UA_Int32 *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data, iv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
 
@@ -128,7 +128,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueDataValueKeyFrame) {
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &UA_TYPES[UA_TYPES_INT32]);
     ck_assert_int_eq(*(UA_Int32 *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data, iv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
     ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
@@ -201,10 +201,10 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantKeyFrame) {
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, anzFields);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_DOUBLE]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &UA_TYPES[UA_TYPES_DOUBLE]);
     ck_assert(*(UA_Double*)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data == dv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_UINT64]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.type, &UA_TYPES[UA_TYPES_UINT64]);
     ck_assert_uint_eq(*(UA_UInt64 *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.data, uiv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
@@ -277,10 +277,10 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueKeyFrame) {
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, anzFields);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_DOUBLE]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &UA_TYPES[UA_TYPES_DOUBLE]);
     ck_assert(*(UA_Double*)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data == dv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_UINT64]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.type, &UA_TYPES[UA_TYPES_UINT64]);
     ck_assert_uint_eq(*(UA_UInt64 *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.data, uiv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
@@ -351,7 +351,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueVariantDeltaFrame) {
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
     ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, (uintptr_t)&UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &UA_TYPES[UA_TYPES_INT32]);
     ck_assert_int_eq(*(UA_Int32 *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data, iv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
     ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
@@ -420,7 +420,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueDataValueDeltaFrame) {
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
     ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, (uintptr_t)&UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &UA_TYPES[UA_TYPES_INT32]);
     ck_assert_int_eq(*(UA_Int32 *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data, iv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
     ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
@@ -601,7 +601,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantDeltaFrame) {
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 2);
     ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex1);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, (uintptr_t)&UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &UA_TYPES[UA_TYPES_INT32]);
     ck_assert_int_eq(*(UA_Int32 *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data, iv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
 
@@ -613,7 +613,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantDeltaFrame) {
     {
         ck_assert_int_eq(decodedString.data[i], testString.data[i]);
     }
-    ck_assert_int_eq(decodedString.length, testString.length);
+    ck_assert_uint_eq(decodedString.length, testString.length);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[1].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[1].fieldValue.hasSourceTimestamp);
 
     ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
@@ -697,7 +697,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueDeltaFrame) {
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 2);
     ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex1);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, (uintptr_t)&UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &UA_TYPES[UA_TYPES_INT32]);
     ck_assert_int_eq(*(UA_Int32 *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data, iv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
 
@@ -709,7 +709,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueDeltaFrame) {
     {
         ck_assert_int_eq(decodedString.data[i], testString.data[i]);
     }
-    ck_assert_int_eq(decodedString.length, testString.length);
+    ck_assert_uint_eq(decodedString.length, testString.length);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[1].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[1].fieldValue.hasSourceTimestamp);
 
     ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
@@ -902,7 +902,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantDeltaFramePublDSCID) {
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 2);
     ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex1);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, (uintptr_t)&UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &UA_TYPES[UA_TYPES_INT32]);
     ck_assert_int_eq(*(UA_Int32 *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data, iv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
 
@@ -914,7 +914,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantDeltaFramePublDSCID) {
     {
         ck_assert_int_eq(decodedString.data[i], testString.data[i]);
     }
-    ck_assert_int_eq(decodedString.length, testString.length);
+    ck_assert_uint_eq(decodedString.length, testString.length);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[1].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[1].fieldValue.hasSourceTimestamp);
 
     ((UA_String*)value.data)->data = NULL; // the string is statically allocated. do not free it.
@@ -988,10 +988,10 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueKeyFramePH) {
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, anzFields);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_DOUBLE]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &UA_TYPES[UA_TYPES_DOUBLE]);
     ck_assert(*(UA_Double*)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data == dv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_UINT64]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.type, &UA_TYPES[UA_TYPES_UINT64]);
     ck_assert_uint_eq(*(UA_UInt64 *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.data, uiv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
@@ -1083,10 +1083,10 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantKeyFrameTSProm) {
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, anzFields);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_DOUBLE]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &UA_TYPES[UA_TYPES_DOUBLE]);
     ck_assert(*(UA_Double*)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data == dv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.type, (uintptr_t)&UA_TYPES[UA_TYPES_UINT64]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.type, &UA_TYPES[UA_TYPES_UINT64]);
     ck_assert_uint_eq(*(UA_UInt64 *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].value.data, uiv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[1].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
@@ -1196,7 +1196,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueDeltaFrameGHProm2) {
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 2);
     ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex1);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
-    ck_assert_int_eq((uintptr_t)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, (uintptr_t)&UA_TYPES[UA_TYPES_INT32]);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &UA_TYPES[UA_TYPES_INT32]);
     ck_assert_int_eq(*(UA_Int32 *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data, iv);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
 
@@ -1208,7 +1208,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueDeltaFrameGHProm2) {
     {
         ck_assert_int_eq(decodedString.data[i], testString.data[i]);
     }
-    ck_assert_int_eq(decodedString.length, testString.length);
+    ck_assert_uint_eq(decodedString.length, testString.length);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[1].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[1].fieldValue.hasSourceTimestamp);
 
     UA_Array_delete(m.promotedFields, m.promotedFieldsSize, &UA_TYPES[UA_TYPES_VARIANT]);
diff --git a/tests/pubsub/check_pubsub_encoding_json.c b/tests/pubsub/check_pubsub_encoding_json.c
index f9bd3a02a98..f41bd5f2be9 100644
--- a/tests/pubsub/check_pubsub_encoding_json.c
+++ b/tests/pubsub/check_pubsub_encoding_json.c
@@ -81,7 +81,7 @@ START_TEST(UA_PubSub_EncodeAllOptionalFields) {
     m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue = true;
 
     size_t size = UA_NetworkMessage_calcSizeJson(&m, NULL, 0, NULL, 0, true);
-    ck_assert_int_eq(size, 340);
+    ck_assert_uint_eq(size, 340);
 
     UA_ByteString buffer;
     UA_StatusCode rv = UA_ByteString_allocBuffer(&buffer, size+1);
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index e611c2c9a62..c1261efd2dc 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -121,7 +121,7 @@ static UA_NodeId addPubSubConnection(void){
     UA_CallMethodResult result;
     UA_CallMethodResult_init(&result);
     result = UA_Server_call(server, &callMethodRequest);
-    ck_assert_int_eq(1, result.outputArgumentsSize);
+    ck_assert_uint_eq(1, result.outputArgumentsSize);
     ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
     if(result.outputArguments->type == &UA_TYPES[UA_TYPES_NODEID])
         connectionId =  *((UA_NodeId *) result.outputArguments->data);
@@ -166,7 +166,7 @@ static void addPublishedDataSets(void){
     UA_CallMethodResult result;
     UA_CallMethodResult_init(&result);
     result = UA_Server_call(server, &callMethodRequest);
-    ck_assert_int_eq(3, result.outputArgumentsSize);
+    ck_assert_uint_eq(3, result.outputArgumentsSize);
     ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
     UA_CallMethodResult_clear(&result);
     UA_free(inputArguments);
@@ -257,7 +257,7 @@ START_TEST(AddandRemoveNewPubSubConnectionWithWriterGroup){
         UA_NodeId connectionId = UA_NODEID_NULL;
         UA_CallResponse response;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(1, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(1, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
         if(response.results->outputArguments->type == &UA_TYPES[UA_TYPES_NODEID])
             connectionId =  *((UA_NodeId *) response.results->outputArguments->data);
@@ -276,7 +276,7 @@ START_TEST(AddandRemoveNewPubSubConnectionWithWriterGroup){
         item.inputArgumentsSize = 1;
 
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(0, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(0, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
 
         UA_ExtensionObject_clear(&eo);
@@ -378,7 +378,7 @@ START_TEST(AddNewPubSubConnectionWithWriterGroupAndDataSetWriter){
 
         UA_CallResponse response;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(1, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(1, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
         UA_ExtensionObject_clear(&eo);
         UA_free(pubSubConnection.writerGroups->dataSetWriters);
@@ -448,7 +448,7 @@ START_TEST(AddAndRemovePublishedDataSetFoldersUsingServer){
         UA_CallMethodResult result;
         UA_CallMethodResult_init(&result);
         result = UA_Server_call(server, &callMethodRequest);
-        ck_assert_int_eq(1, result.outputArgumentsSize);
+        ck_assert_uint_eq(1, result.outputArgumentsSize);
         ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
 
         UA_NodeId createdFolder = UA_NODEID_NULL;
@@ -476,7 +476,7 @@ START_TEST(AddAndRemovePublishedDataSetFoldersUsingServer){
         callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER);
         UA_CallMethodResult_init(&result);
         result = UA_Server_call(server, &callMethodRequest);
-        ck_assert_int_eq(1, result.outputArgumentsSize);
+        ck_assert_uint_eq(1, result.outputArgumentsSize);
         ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
         UA_NodeId createdFolder2 = UA_NODEID_NULL;
         if(result.outputArguments->type == &UA_TYPES[UA_TYPES_NODEID])
@@ -500,7 +500,7 @@ START_TEST(AddAndRemovePublishedDataSetFoldersUsingServer){
         callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER);
 
         result = UA_Server_call(server, &callMethodRequest);
-        ck_assert_int_eq(0, result.outputArgumentsSize);
+        ck_assert_uint_eq(0, result.outputArgumentsSize);
         ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
         //check if the node is deleted
         retVal = UA_Server_readNodeId(server, createdFolder, NULL);
@@ -542,7 +542,7 @@ START_TEST(AddAndRemovePublishedDataSetFoldersUsingClient){
 
         UA_CallResponse response;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(1, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(1, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
 
         UA_NodeId createdFolder = UA_NODEID_NULL;
@@ -575,7 +575,7 @@ START_TEST(AddAndRemovePublishedDataSetFoldersUsingClient){
         item.inputArgumentsSize = 1;
 
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(1, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(1, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
 
         UA_NodeId createdFolder2 = UA_NODEID_NULL;
@@ -606,7 +606,7 @@ START_TEST(AddAndRemovePublishedDataSetFoldersUsingClient){
         item.inputArgumentsSize = 1;
 
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(0, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(0, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
 
         //check if the node is deleted
@@ -661,7 +661,7 @@ START_TEST(AddAndRemovePublishedDataSetItemsUsingServer){
         UA_CallMethodResult result;
         UA_CallMethodResult_init(&result);
         result = UA_Server_call(server, &callMethodRequest);
-        ck_assert_int_eq(3, result.outputArgumentsSize);
+        ck_assert_uint_eq(3, result.outputArgumentsSize);
         ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
 
         //TODO checked correctness of created items
@@ -722,7 +722,7 @@ START_TEST(AddAndRemovePublishedDataSetItemsUsingClient){
         UA_NodeId dataSetItemsNodeId;
         UA_CallResponse response;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(3, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(3, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
         if(response.results->outputArguments->type == &UA_TYPES[UA_TYPES_NODEID])
             dataSetItemsNodeId = *((UA_NodeId *) response.results->outputArguments->data);
@@ -741,7 +741,7 @@ START_TEST(AddAndRemovePublishedDataSetItemsUsingClient){
         item.inputArguments = (UA_Variant*)&inputArgument;
         item.inputArgumentsSize = 1;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(0, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(0, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
 
         UA_CallResponse_clear(&response);
@@ -784,7 +784,7 @@ START_TEST(AddAndRemoveWriterGroupsUsingServer){
         UA_CallMethodResult_init(&result);
         result = UA_Server_call(server, &callMethodRequest);
         ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(1, result.outputArgumentsSize);
+        ck_assert_uint_eq(1, result.outputArgumentsSize);
 
         UA_NodeId createdWriterGroup = UA_NODEID_NULL;
         if(result.outputArguments->type == &UA_TYPES[UA_TYPES_NODEID])
@@ -837,7 +837,7 @@ START_TEST(AddAndRemoveWriterGroupsUsingClient){
 
         UA_CallResponse response;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(1, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(1, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
 
         UA_NodeId createdWriterGroup = UA_NODEID_NULL;
@@ -936,7 +936,7 @@ START_TEST(AddNewPubSubConnectionWithReaderGroup){
 
         UA_CallResponse response;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(1, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(1, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
         UA_ExtensionObject_clear(&eo);
         UA_free(pubSubConnection.readerGroups);
@@ -1073,7 +1073,7 @@ START_TEST(AddNewPubSubConnectionWithReaderGroupandDataSetReader){
 
         UA_CallResponse response;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(1, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(1, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
         UA_ExtensionObject_clear(&eo);
         UA_free(targetVars.targetVariables);
@@ -1116,7 +1116,7 @@ START_TEST(AddandRemoveReaderGroup){
 
         UA_CallResponse response;
         response = UA_Client_Service_call(client, callMethodRequestFromClient);
-        ck_assert_int_eq(1, response.results->outputArgumentsSize);
+        ck_assert_uint_eq(1, response.results->outputArgumentsSize);
         ck_assert_int_eq(response.results->statusCode, UA_STATUSCODE_GOOD);
 
         UA_NodeId createdReaderGroup = UA_NODEID_NULL;
diff --git a/tests/pubsub/check_pubsub_multiple_layer.c b/tests/pubsub/check_pubsub_multiple_layer.c
index 41ab29d39af..d0aa7c97344 100644
--- a/tests/pubsub/check_pubsub_multiple_layer.c
+++ b/tests/pubsub/check_pubsub_multiple_layer.c
@@ -28,13 +28,13 @@ START_TEST(AddMultipleTransportLayers){
     UA_ServerConfig_setDefault(config);
 
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-    ck_assert_int_eq(config->pubSubConfig.transportLayersSize, 1);
+    ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 1);
 
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-    ck_assert_int_eq(config->pubSubConfig.transportLayersSize, 2);
+    ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 2);
 
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-    ck_assert_int_eq(config->pubSubConfig.transportLayersSize, 3);
+    ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 3);
 
     UA_Server_delete(server);
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_pds.c b/tests/pubsub/check_pubsub_pds.c
index e89203f3b8d..518c6458396 100644
--- a/tests/pubsub/check_pubsub_pds.c
+++ b/tests/pubsub/check_pubsub_pds.c
@@ -35,12 +35,12 @@ START_TEST(AddPDSWithMinimalValidConfiguration){
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("TEST PDS 1");
     retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, NULL).addResult;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_NodeId newPDSNodeID;
     pdsConfig.name = UA_STRING("TEST PDS 2");
     retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &newPDSNodeID).addResult;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 2);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 2);
     ck_assert_int_eq(newPDSNodeID.identifierType, UA_NODEIDTYPE_NUMERIC);
     ck_assert_int_ne(newPDSNodeID.identifier.numeric, 0);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -54,20 +54,20 @@ START_TEST(AddRemoveAddPDSWithMinimalValidConfiguration){
     pdsConfig.name = UA_STRING("TEST PDS 1");
     UA_NodeId newPDSNodeID;
     retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &newPDSNodeID).addResult;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     retVal |= UA_Server_removePublishedDataSet(server, newPDSNodeID);
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 0);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &newPDSNodeID).addResult;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(AddPDSWithNullConfig){
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     retVal |= UA_Server_addPublishedDataSet(server, NULL, NULL).addResult;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
@@ -78,13 +78,13 @@ START_TEST(AddPDSWithUnsupportedType){
     pdsConfig.name = UA_STRING("TEST PDS 1");
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE;
     retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, NULL).addResult;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDEVENTS;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDEVENTS_TEMPLATE;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
@@ -96,7 +96,7 @@ START_TEST(GetPDSConfigurationAndCompareValues){
     pdsConfig.name = UA_STRING("TEST PDS 1");
     UA_NodeId pdsIdentifier;
     retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &pdsIdentifier).addResult;
-    ck_assert_int_eq(server->pubSubManager.publishedDataSetsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.publishedDataSetsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_PublishedDataSetConfig pdsConfigCopy;
     memset(&pdsConfigCopy, 0, sizeof(UA_PublishedDataSetConfig));
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index bca84a755aa..d7848096fcf 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -59,7 +59,7 @@ START_TEST(AddWriterGroupWithValidConfiguration){
         LIST_FOREACH(writerGroup, &UA_PubSubConnection_findConnectionbyId(server, connection1)->writerGroups, listEntry){
             writerGroupCount++;
         }
-        ck_assert_int_eq(writerGroupCount, 1);
+        ck_assert_uint_eq(writerGroupCount, 1);
         UA_Server_setWriterGroupDisabled(server, localWriterGroup);
     } END_TEST
 
@@ -80,7 +80,7 @@ START_TEST(AddRemoveAddWriterGroupWithMinimalValidConfiguration){
         LIST_FOREACH(writerGroup, &UA_PubSubConnection_findConnectionbyId(server, connection1)->writerGroups, listEntry){
             writerGroupCount++;
         }
-        ck_assert_int_eq(writerGroupCount, 0);
+        ck_assert_uint_eq(writerGroupCount, 0);
         retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &localWriterGroup);
         UA_Server_setWriterGroupOperational(server, localWriterGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -88,7 +88,7 @@ START_TEST(AddRemoveAddWriterGroupWithMinimalValidConfiguration){
         LIST_FOREACH(writerGroup, &UA_PubSubConnection_findConnectionbyId(server, connection1)->writerGroups, listEntry){
             writerGroupCount++;
         }
-        ck_assert_int_eq(writerGroupCount, 1);
+        ck_assert_uint_eq(writerGroupCount, 1);
         retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &localWriterGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_Server_setWriterGroupOperational(server, localWriterGroup);
@@ -96,7 +96,7 @@ START_TEST(AddRemoveAddWriterGroupWithMinimalValidConfiguration){
         LIST_FOREACH(writerGroup, &UA_PubSubConnection_findConnectionbyId(server, connection1)->writerGroups, listEntry){
             writerGroupCount++;
         }
-        ck_assert_int_eq(writerGroupCount, 2);
+        ck_assert_uint_eq(writerGroupCount, 2);
     } END_TEST
 
 START_TEST(AddWriterGroupWithNullConfig){
@@ -107,7 +107,7 @@ START_TEST(AddWriterGroupWithNullConfig){
         LIST_FOREACH(writerGroup, &UA_PubSubConnection_findConnectionbyId(server, connection1)->writerGroups, listEntry){
             writerGroupCount++;
         }
-        ck_assert_int_eq(writerGroupCount, 0);
+        ck_assert_uint_eq(writerGroupCount, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
@@ -123,7 +123,7 @@ START_TEST(AddWriterGroupWithInvalidConnectionId){
         LIST_FOREACH(writerGroup, &UA_PubSubConnection_findConnectionbyId(server, connection1)->writerGroups, listEntry){
             writerGroupCount++;
         }
-        ck_assert_int_eq(writerGroupCount, 0);
+        ck_assert_uint_eq(writerGroupCount, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
@@ -185,7 +185,7 @@ START_TEST(AddDataSetWriterWithValidConfiguration){
         ck_assert_ptr_ne(dsw1, NULL);
         UA_WriterGroup *wg1 = UA_WriterGroup_findWGbyId(server, writerGroup1);
         ck_assert_ptr_ne(wg1, NULL);
-        ck_assert_int_eq(wg1->writersCount, 1);
+        ck_assert_uint_eq(wg1->writersCount, 1);
     } END_TEST
 
 START_TEST(AddRemoveAddDataSetWriterWithValidConfiguration){
@@ -197,25 +197,25 @@ START_TEST(AddRemoveAddDataSetWriterWithValidConfiguration){
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
         dataSetWriterConfig.name = UA_STRING("DataSetWriter 1 ");
         UA_NodeId dataSetWriter;
-        ck_assert_int_eq(wg1->writersCount, 0);
+        ck_assert_uint_eq(wg1->writersCount, 0);
         retVal = UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(wg1->writersCount, 1);
+        ck_assert_uint_eq(wg1->writersCount, 1);
         retVal = UA_Server_removeDataSetWriter(server, dataSetWriter);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(wg1->writersCount, 0);
+        ck_assert_uint_eq(wg1->writersCount, 0);
         retVal = UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(wg1->writersCount, 1);
+        ck_assert_uint_eq(wg1->writersCount, 1);
         retVal = UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(wg1->writersCount, 2);
+        ck_assert_uint_eq(wg1->writersCount, 2);
 
         UA_WriterGroup *wg2 = UA_WriterGroup_findWGbyId(server, writerGroup2);
         ck_assert_ptr_ne(wg2, NULL);
         retVal = UA_Server_addDataSetWriter(server, writerGroup2, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(wg2->writersCount, 1);
+        ck_assert_uint_eq(wg2->writersCount, 1);
     } END_TEST
 
 START_TEST(AddDataSetWriterWithNullConfig){
@@ -224,7 +224,7 @@ START_TEST(AddDataSetWriterWithNullConfig){
         retVal = UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, NULL, NULL);
         UA_WriterGroup *wg1 = UA_WriterGroup_findWGbyId(server, writerGroup1);
         ck_assert_ptr_ne(wg1, NULL);
-        ck_assert_int_eq(wg1->writersCount, 0);
+        ck_assert_uint_eq(wg1->writersCount, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
@@ -237,7 +237,7 @@ START_TEST(AddDataSetWriterWithInvalidPDSId){
         retVal = UA_Server_addDataSetWriter(server, writerGroup1, UA_NODEID_NUMERIC(0, UA_UINT32_MAX), &dataSetWriterConfig, NULL);
         UA_WriterGroup *wg1 = UA_WriterGroup_findWGbyId(server, writerGroup1);
         ck_assert_ptr_ne(wg1, NULL);
-        ck_assert_int_eq(wg1->writersCount, 0);
+        ck_assert_uint_eq(wg1->writersCount, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
@@ -317,10 +317,10 @@ START_TEST(AddDataSetFieldWithValidConfiguration){
         UA_NodeId localDataSetField;
         UA_PublishedDataSet *pds = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds, NULL);
-        ck_assert_int_eq(pds->fieldSize, 0);
+        ck_assert_uint_eq(pds->fieldSize, 0);
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(pds->fieldSize, 1);
+        ck_assert_uint_eq(pds->fieldSize, 1);
     } END_TEST
 
 START_TEST(AddRemoveAddDataSetFieldWithValidConfiguration){
@@ -335,24 +335,24 @@ START_TEST(AddRemoveAddDataSetFieldWithValidConfiguration){
         UA_NodeId localDataSetField;
         UA_PublishedDataSet *pds1 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds1, NULL);
-        ck_assert_int_eq(pds1->fieldSize, 0);
+        ck_assert_uint_eq(pds1->fieldSize, 0);
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(pds1->fieldSize, 1);
+        ck_assert_uint_eq(pds1->fieldSize, 1);
         retVal = UA_Server_removeDataSetField(server, localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(pds1->fieldSize, 0);
+        ck_assert_uint_eq(pds1->fieldSize, 0);
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(pds1->fieldSize, 1);
+        ck_assert_uint_eq(pds1->fieldSize, 1);
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(pds1->fieldSize, 2);
+        ck_assert_uint_eq(pds1->fieldSize, 2);
         UA_PublishedDataSet *pds2 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet2);
         ck_assert_ptr_ne(pds2, NULL);
         retVal = UA_Server_addDataSetField(server, publishedDataSet2, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(pds2->fieldSize, 1);
+        ck_assert_uint_eq(pds2->fieldSize, 1);
     } END_TEST
 
 START_TEST(AddDataSetFieldWithNullConfig){
@@ -362,7 +362,7 @@ START_TEST(AddDataSetFieldWithNullConfig){
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
         UA_PublishedDataSet *pds1 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds1, NULL);
-        ck_assert_int_eq(pds1->fieldSize, 0);
+        ck_assert_uint_eq(pds1->fieldSize, 0);
     } END_TEST
 
 START_TEST(AddDataSetFieldWithInvalidPDSId){
@@ -378,7 +378,7 @@ START_TEST(AddDataSetFieldWithInvalidPDSId){
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
         UA_PublishedDataSet *pds1 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds1, NULL);
-        ck_assert_int_eq(pds1->fieldSize, 0);
+        ck_assert_uint_eq(pds1->fieldSize, 0);
     } END_TEST
 
 START_TEST(GetDataSetFieldConfigurationAndCompareValues){
@@ -396,7 +396,7 @@ START_TEST(GetDataSetFieldConfigurationAndCompareValues){
         UA_DataSetFieldConfig fieldConfigCopy;
         retVal |= UA_Server_getDataSetFieldConfig(server, dataSetFieldId, &fieldConfigCopy);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(fieldConfig.dataSetFieldType, fieldConfigCopy.dataSetFieldType);
+        ck_assert_uint_eq(fieldConfig.dataSetFieldType, fieldConfigCopy.dataSetFieldType);
         ck_assert_int_eq(UA_String_equal(&fieldConfig.field.variable.fieldNameAlias, &fieldConfigCopy.field.variable.fieldNameAlias), UA_TRUE);
         UA_DataSetFieldConfig_clear(&fieldConfigCopy);
     } END_TEST
diff --git a/tests/pubsub/check_pubsub_publish_uadp.c b/tests/pubsub/check_pubsub_publish_uadp.c
index e6867efbc2e..a9c5751f0f0 100644
--- a/tests/pubsub/check_pubsub_publish_uadp.c
+++ b/tests/pubsub/check_pubsub_publish_uadp.c
@@ -184,7 +184,7 @@ START_TEST(CheckNMandDSMcalculation){
     //ck_assert_int_eq(networkMessage.publisherId.uint32 , 62541);
     ck_assert_int_eq(networkMessage.payloadHeader.dataSetPayloadHeader.count, 10);
     for(size_t i = 10; i > 0; i--){
-        ck_assert_int_eq(*(networkMessage.payloadHeader.dataSetPayloadHeader.dataSetWriterIds+(i-1)), 21-i);
+        ck_assert_uint_eq(*(networkMessage.payloadHeader.dataSetPayloadHeader.dataSetWriterIds+(i-1)), 21-i);
     }
     for(int i = 0; i < networkMessage.payloadHeader.dataSetPayloadHeader.count; ++i) {
         UA_Byte_delete(networkMessage.payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
@@ -199,8 +199,8 @@ START_TEST(CheckNMandDSMcalculation){
     // UA_NetworkMessage networkMessage1, networkMessage2;
     UA_NetworkMessage networkMessages[2];
     receiveAvailableMessages(buffer, connection, networkMessages);
-    ck_assert_int_eq(networkMessages[0].payloadHeader.dataSetPayloadHeader.count, 5);
-    ck_assert_int_eq(networkMessages[1].payloadHeader.dataSetPayloadHeader.count, 5);
+    ck_assert_uint_eq(networkMessages[0].payloadHeader.dataSetPayloadHeader.count, 5);
+    ck_assert_uint_eq(networkMessages[1].payloadHeader.dataSetPayloadHeader.count, 5);
     for(int i = 0; i < networkMessages[0].payloadHeader.dataSetPayloadHeader.count; ++i) {
         UA_Byte_delete(networkMessages[0].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
     }
@@ -217,7 +217,7 @@ START_TEST(CheckNMandDSMcalculation){
     UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
     UA_NetworkMessage networkMessage3;
     receiveAvailableMessages(buffer, connection, &networkMessage3);
-    ck_assert_int_eq(networkMessage3.payloadHeader.dataSetPayloadHeader.count, 10);
+    ck_assert_uint_eq(networkMessage3.payloadHeader.dataSetPayloadHeader.count, 10);
 
     for(int i = 0; i < networkMessage3.payloadHeader.dataSetPayloadHeader.count; ++i) {
         UA_Byte_delete(networkMessage3.payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
@@ -232,7 +232,7 @@ START_TEST(CheckNMandDSMcalculation){
     UA_NetworkMessage messageArray[10];
     receiveAvailableMessages(buffer, connection, messageArray);
     for (int j = 0; j < 10; ++j) {
-        ck_assert_int_eq(messageArray[j].payloadHeader.dataSetPayloadHeader.count, 1);
+        ck_assert_uint_eq(messageArray[j].payloadHeader.dataSetPayloadHeader.count, 1);
         for(int i = 0; i < messageArray[j].payloadHeader.dataSetPayloadHeader.count; ++i) {
             UA_Byte_delete(messageArray[j].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
         }
@@ -248,7 +248,7 @@ START_TEST(CheckNMandDSMcalculation){
 
     receiveAvailableMessages(buffer, connection, messageArray);
     for (int j = 0; j < 10; ++j) {
-        ck_assert_int_eq(messageArray[j].payloadHeader.dataSetPayloadHeader.count, 1);
+        ck_assert_uint_eq(messageArray[j].payloadHeader.dataSetPayloadHeader.count, 1);
         for(int i = 0; i < messageArray[j].payloadHeader.dataSetPayloadHeader.count; ++i) {
             UA_Byte_delete(messageArray[j].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
         }
@@ -350,7 +350,7 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
     //ck_assert_int_eq(networkMessage.publisherId.uint32 , 62541);
     ck_assert_int_eq(networkMessage.payloadHeader.dataSetPayloadHeader.count, 10);
     for(size_t i = 10; i > 0; i--){
-        ck_assert_int_eq(*(networkMessage.payloadHeader.dataSetPayloadHeader.dataSetWriterIds+(i-1)), 21-i);
+        ck_assert_uint_eq(*(networkMessage.payloadHeader.dataSetPayloadHeader.dataSetWriterIds+(i-1)), 21-i);
     }
     for(int i = 0; i < networkMessage.payloadHeader.dataSetPayloadHeader.count; ++i) {
         UA_Byte_delete(networkMessage.payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
@@ -376,7 +376,7 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
     dateTime = 0;
     ck_assert(UA_DateTime_decodeBinary(&networkMessages[0].payload.dataSetPayload.dataSetMessages->data.keyFrameData.rawFields, &offset, &dateTime) ==
               UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(UA_DateTime_now(), dateTime);
+    ck_assert_int_eq(UA_DateTime_now(), dateTime);
     offset  = 0;
     dateTime = 0;
     ck_assert(UA_DateTime_decodeBinary(&networkMessages[1].payload.dataSetPayload.dataSetMessages->data.keyFrameData.rawFields, &offset, &dateTime) ==
@@ -384,13 +384,13 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
     //TODO check if the length can be set right using the metadata
     //ck_assert_uint_eq(UA_DateTime_calcSizeBinary(&dateTime),
     //                  networkMessages[1].payload.dataSetPayload.dataSetMessages->data.keyFrameData.rawFields.length);
-    ck_assert_uint_eq(UA_DateTime_now(), dateTime);
+    ck_assert_int_eq(UA_DateTime_now(), dateTime);
     //Decode raw message of second DSM included in the NM
     offset  = 0;
     dateTime = 0;
     ck_assert(UA_DateTime_decodeBinary(&networkMessages[1].payload.dataSetPayload.dataSetMessages[1].data.keyFrameData.rawFields, &offset, &dateTime) ==
           UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(UA_DateTime_now(), dateTime);
+    ck_assert_int_eq(UA_DateTime_now(), dateTime);
 
     /* add a second field to the dataset writer */
     for(int i = 0; i < networkMessages[0].payloadHeader.dataSetPayloadHeader.count; ++i) {
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 238ad21a6b7..657492eba49 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -1002,7 +1002,7 @@ static void Test_string_PublisherId_InformationModel(
     UA_BrowsePathResult_init(&bpr);
     bpr = UA_Server_translateBrowsePathToNodeIds(server, &bp);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, bpr.statusCode);
-    ck_assert_int_eq(1, bpr.targetsSize);
+    ck_assert_uint_eq(1, bpr.targetsSize);
     UA_NodeId PublisherIdNode = bpr.targets[0].targetId.nodeId;
 
     /* read value */
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 39c34f12c16..271552d4a9a 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -163,7 +163,7 @@ START_TEST(AddReaderGroupWithValidConfiguration) {
             readerGroupCount++;
         }
         /* Check readerGroup count */
-        ck_assert_int_eq(readerGroupCount, 1);
+        ck_assert_uint_eq(readerGroupCount, 1);
         /* To Do: RemoveReaderGroup operation should be carried out when UA_Server_delete has been called */
         UA_Server_removeReaderGroup(server, localreaderGroup);
     } END_TEST
@@ -180,7 +180,7 @@ START_TEST(AddReaderGroupWithNullConfig) {
             readerGroupCount++;
         }
         /* Check readerGroup count */
-        ck_assert_int_eq(readerGroupCount, 0);
+        ck_assert_uint_eq(readerGroupCount, 0);
     } END_TEST
 
 START_TEST(AddReaderGroupWithInvalidConnectionId) {
@@ -198,7 +198,7 @@ START_TEST(AddReaderGroupWithInvalidConnectionId) {
             readerGroupCount++;
         }
         /* Check readerGroup count */
-        ck_assert_int_eq(readerGroupCount, 0);
+        ck_assert_uint_eq(readerGroupCount, 0);
     } END_TEST
 
 START_TEST(RemoveReaderGroupWithInvalidIdentifier) {
@@ -220,7 +220,7 @@ START_TEST(RemoveReaderGroupWithInvalidIdentifier) {
             readerGroupCount++;
         }
         /* Check readerGroup count */
-        ck_assert_int_eq(readerGroupCount, 1);
+        ck_assert_uint_eq(readerGroupCount, 1);
         UA_Server_removeReaderGroup(server, localreaderGroup);
     } END_TEST
 
@@ -244,7 +244,7 @@ START_TEST(AddRemoveMultipleAddReaderGroupWithValidConfiguration) {
         }
 
         /* Check ReaderGroup Count */
-        ck_assert_int_eq(readerGroupCount, 0);
+        ck_assert_uint_eq(readerGroupCount, 0);
         /* Add Multiple ReaderGroups */
         for (int iterator = 0; iterator <= READERGROUP_COUNT; iterator++) {
             retVal |= UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &localReaderGroup);
@@ -257,7 +257,7 @@ START_TEST(AddRemoveMultipleAddReaderGroupWithValidConfiguration) {
             readerGroupCount++;
         }
         /* Check ReaderGroup Count */
-        ck_assert_int_eq(readerGroupCount, CHECK_READERGROUP_COUNT);
+        ck_assert_uint_eq(readerGroupCount, CHECK_READERGROUP_COUNT);
     } END_TEST
 
       /* Check status of updating ReaderGroup with invalid identifier */
@@ -565,7 +565,7 @@ START_TEST(UpdateDataSetReaderConfigWithValidConfiguration){
 
         retVal |=  UA_Server_DataSetReader_updateConfig(server, localDataSetReaderId, localreaderGroup, &dataSetreaderConfig);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_int_eq(2, localDataSetReader->config.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize);
+        ck_assert_uint_eq(2, localDataSetReader->config.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize);
         UA_free(dataSetreaderConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
 } END_TEST
 

From 3949afe0388d8e4d9fdf6cecd3ef7033381ad922 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 21 Jul 2022 10:59:04 +0200
Subject: [PATCH 0335/1963] fix(test): Remove sign conversion warnings in
 check_server_historical_data.c

---
 tests/server/check_server_historical_data.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c
index fb45f726093..0310346f4e5 100644
--- a/tests/server/check_server_historical_data.c
+++ b/tests/server/check_server_historical_data.c
@@ -608,7 +608,7 @@ testResult(UA_DateTime *resultData, UA_HistoryData * historyData) {
     for (size_t j = 0; j < data->dataValuesSize; ++j) {
         ck_assert(resultData[j] != 0);
         ck_assert_uint_eq(data->dataValues[j].hasSourceTimestamp, true);
-        ck_assert_uint_eq(data->dataValues[j].sourceTimestamp, resultData[j]);
+        ck_assert_int_eq(data->dataValues[j].sourceTimestamp, resultData[j]);
     }
     UA_HistoryReadResponse_clear(&localResponse);
 }
@@ -662,7 +662,7 @@ START_TEST(Server_HistorizingUpdateInsert)
     for (size_t i = 0; i < data.dataValuesSize; ++i) {
         ck_assert_uint_eq(data.dataValues[i].hasValue, true);
         ck_assert(data.dataValues[i].value.type == &UA_TYPES[UA_TYPES_INT64]);
-        ck_assert_uint_eq(*((UA_Int64*)data.dataValues[i].value.data), UA_PERFORMUPDATETYPE_INSERT);
+        ck_assert_int_eq(*((UA_Int64*)data.dataValues[i].value.data), UA_PERFORMUPDATETYPE_INSERT);
     }
 
     UA_HistoryData_clear(&data);
@@ -698,7 +698,7 @@ START_TEST(Server_HistorizingUpdateReplace)
     for (size_t i = 0; i < data.dataValuesSize; ++i) {
         ck_assert_uint_eq(data.dataValues[i].hasValue, true);
         ck_assert(data.dataValues[i].value.type == &UA_TYPES[UA_TYPES_INT64]);
-        ck_assert_uint_eq(*((UA_Int64*)data.dataValues[i].value.data), UA_PERFORMUPDATETYPE_REPLACE);
+        ck_assert_int_eq(*((UA_Int64*)data.dataValues[i].value.data), UA_PERFORMUPDATETYPE_REPLACE);
     }
 
     UA_HistoryData_clear(&data);
@@ -749,7 +749,7 @@ START_TEST(Server_HistorizingUpdateUpdate)
     for (size_t i = 0; i < data.dataValuesSize; ++i) {
         ck_assert_uint_eq(data.dataValues[i].hasValue, true);
         ck_assert(data.dataValues[i].value.type == &UA_TYPES[UA_TYPES_INT64]);
-        ck_assert_uint_eq(*((UA_Int64*)data.dataValues[i].value.data), UA_PERFORMUPDATETYPE_UPDATE);
+        ck_assert_int_eq(*((UA_Int64*)data.dataValues[i].value.data), UA_PERFORMUPDATETYPE_UPDATE);
     }
 
     UA_HistoryData_clear(&data);
@@ -808,7 +808,8 @@ START_TEST(Server_HistorizingStrategyUser)
         ck_assert_uint_eq(data->dataValuesSize, 10);
         for (size_t j = 0; j < data->dataValuesSize; ++j) {
             ck_assert_uint_eq(data->dataValues[j].hasSourceTimestamp, true);
-            ck_assert_uint_eq(data->dataValues[j].sourceTimestamp, start + (j * UA_DATETIME_SEC));
+            ck_assert_int_eq(data->dataValues[j].sourceTimestamp,
+                             start + (UA_DateTime)(j * UA_DATETIME_SEC));
             ck_assert_uint_eq(data->dataValues[j].hasStatus, true);
             ck_assert_str_eq(UA_StatusCode_name(data->dataValues[j].status), UA_StatusCode_name(UA_STATUSCODE_GOOD));
             ck_assert_uint_eq(data->dataValues[j].hasValue, true);

From 96f2d1649e618fe463e3ba1412d48b3507dd6ab3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 21 Jul 2022 11:08:17 +0200
Subject: [PATCH 0336/1963] fix(test): Fix sign conversion warning in
 check_discovery.c

---
 tests/server/check_discovery.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index a97cc0f1696..65bb5d3e4ae 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -462,7 +462,7 @@ Client_find_on_network_registered(void) {
     UA_String expectedUris[2];
     char hostname[256];
 
-    ck_assert_uint_eq(gethostname(hostname, 255), 0);
+    ck_assert_int_eq(gethostname(hostname, 255), 0);
 
     // DNS limits name to max 63 chars (+ \0). We need this ugly casting,
     // otherwise gcc >7.2 will complain about format-truncation, but we want it

From 8583caa29e891e51e131f15f24a5769ec9d4df16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Jul 2022 00:26:50 +0000
Subject: [PATCH 0337/1963] build(deps): bump deps/ua-nodeset from `286f0f4` to
 `584835f`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `286f0f4` to `584835f`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/286f0f44ab6b71c6cea18c6228c716c9fdd84375...584835f02f7896b57f46969a1d78b26daca10d08)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 286f0f44ab6..584835f02f7 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 286f0f44ab6b71c6cea18c6228c716c9fdd84375
+Subproject commit 584835f02f7896b57f46969a1d78b26daca10d08

From cb381c3ba9b32be666d822aa3aed487a05558411 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Jul 2022 00:12:02 +0000
Subject: [PATCH 0338/1963] build(deps): bump deps/ua-nodeset from `584835f` to
 `397bd99`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `584835f` to `397bd99`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/584835f02f7896b57f46969a1d78b26daca10d08...397bd996e951225cf83df52affad6aed742d415d)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 584835f02f7..397bd996e95 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 584835f02f7896b57f46969a1d78b26daca10d08
+Subproject commit 397bd996e951225cf83df52affad6aed742d415d

From ec19796db871669170df6d679fa67aff4fcab978 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Jul 2022 22:58:18 +0200
Subject: [PATCH 0339/1963] refactor(test): Remove use of comboSleep from
 check_client_subscriptions.c

---
 tests/client/check_client_subscriptions.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 25d1b3b0901..8803290b2a1 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -1053,22 +1053,31 @@ START_TEST(Client_subscription_writeBurst) {
                                                   monRequest, NULL, dataChangeHandler, NULL);
     ck_assert_uint_eq(monResponse.statusCode, UA_STATUSCODE_GOOD);
 
+    running = false;
+    THREAD_JOIN(server_thread);
+
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
 
+    UA_Server_run_iterate(server, true);
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_DateTime origTime = UA_DateTime_nowMonotonic();
     do {
         myInteger++;
-        retval = UA_Client_writeValueAttribute_async(client, myIntegerNodeId, &attr.value, NULL, NULL, NULL);
+        retval = UA_Client_writeValueAttribute_async(client, myIntegerNodeId, &attr.value,
+                                                     NULL, NULL, NULL);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+        UA_Server_run_iterate(server, true);
         UA_Client_run_iterate(client, 1);
-        UA_comboSleep(2);
+        UA_fakeSleep(2);
     } while(UA_DateTime_nowMonotonic() - origTime < 1 * UA_DATETIME_SEC);
 
     printf("done\n");
 
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
     UA_Client_disconnect(client);
     UA_Client_delete(client);
 }

From d70f80d1e16cb9c7a78f2adb466e532f88a339c6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Jul 2022 23:06:29 +0200
Subject: [PATCH 0340/1963] refactor(test): Remove unused UA_comboSleep

---
 tests/CMakeLists.txt                  | 2 --
 tests/fuzz/CMakeLists.txt             | 2 --
 tests/testing-plugins/testing_clock.c | 6 ------
 tests/testing-plugins/testing_clock.h | 2 +-
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bbd470a0271..0caa128ca7c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,8 +44,6 @@ if(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
     add_definitions(-Wno-gnu-zero-variadic-macro-arguments)
 endif()
 
-add_definitions(-DUA_sleep_ms=UA_comboSleep)
-
 #############################
 # Compiled binaries folders #
 #############################
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 05f8a2e145a..048a962ea9d 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -4,8 +4,6 @@ include_directories("${PROJECT_SOURCE_DIR}/src")
 include_directories("${PROJECT_SOURCE_DIR}/src/server")
 include_directories("${PROJECT_SOURCE_DIR}/tests/testing-plugins")
 
-add_definitions(-DUA_sleep_ms=UA_comboSleep)
-
 if(NOT MSVC)
     add_definitions(-Wno-deprecated-declarations)
 endif()
diff --git a/tests/testing-plugins/testing_clock.c b/tests/testing-plugins/testing_clock.c
index 31faf4ffd39..5a23452a6b6 100644
--- a/tests/testing-plugins/testing_clock.c
+++ b/tests/testing-plugins/testing_clock.c
@@ -42,9 +42,3 @@ UA_realSleep(UA_UInt32 duration) {
     nanosleep(&sleepValue, NULL);
 #endif
 }
-
-void
-UA_comboSleep(unsigned long duration) {
-    UA_fakeSleep((UA_UInt32)duration);
-    UA_realSleep((UA_UInt32)duration);
-}
diff --git a/tests/testing-plugins/testing_clock.h b/tests/testing-plugins/testing_clock.h
index e0c542481b6..dede4329ea6 100644
--- a/tests/testing-plugins/testing_clock.h
+++ b/tests/testing-plugins/testing_clock.h
@@ -9,7 +9,7 @@
 
 /* The testing clock is used for reproducible unit tests that require precise
  * timings. It implements the following functions from ua_types.h. They return a
- * deterministic time that can be advanced manually with UA_sleep.
+ * deterministic time that can be advanced manually with UA_fakeSleep.
  *
  * UA_DateTime UA_EXPORT UA_DateTime_now(void);
  * UA_DateTime UA_EXPORT UA_DateTime_nowMonotonic(void); */

From e351a917980f42d555e409a045d176f133960dde Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 25 Jul 2022 23:34:47 +0200
Subject: [PATCH 0341/1963] fix(test): Remove hang in
 check_client_async_connect.c

The server does not have its own thread in here.
---
 tests/client/check_client_async_connect.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index ae74d1a876e..0dc6b019985 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -191,6 +191,12 @@ START_TEST(Client_run_iterate) {
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         sleep(0);
     }
+
+    UA_Client_disconnectAsync(client);
+    while(client->connection.state != UA_CONNECTIONSTATE_CLOSED) {
+        UA_Server_run_iterate(server, false);
+        UA_Client_run_iterate(client, 0);
+    }
     UA_Client_delete(client);
 }
 END_TEST

From e2a531ac7bed4a96f63bf3eee30defcc01af543b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 25 Jul 2022 23:35:37 +0200
Subject: [PATCH 0342/1963] fix(test): Fix check_pubsub_publisherid if
 pubsub-informationmodel is disabled

---
 tests/pubsub/check_pubsub_publisherid.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 657492eba49..e8bd79da008 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -979,13 +979,14 @@ START_TEST(Test_multiple_connections) {
 } END_TEST
 
 /***************************************************************************************************/
-static void Test_string_PublisherId_InformationModel(
-    const UA_NodeId connectionId,
-    const UA_String expectedStringIdValue) {
 
-    /* read PublisherId value of PubSub information model -> check that string read works correctly */
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
 
-    /* get PublisherId node */
+ /* Read PublisherId value of PubSub information model -> check that string read works correctly */
+static void
+Test_string_PublisherId_InformationModel(const UA_NodeId connectionId,
+                                         const UA_String expectedStringIdValue) {
+    /* Get PublisherId node */
     UA_RelativePathElement rpe;
     UA_RelativePathElement_init(&rpe);
     rpe.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES);;
@@ -1005,10 +1006,11 @@ static void Test_string_PublisherId_InformationModel(
     ck_assert_uint_eq(1, bpr.targetsSize);
     UA_NodeId PublisherIdNode = bpr.targets[0].targetId.nodeId;
 
-    /* read value */
+    /* Read value */
     UA_Variant PublisherIdValue;
     UA_Variant_init(&PublisherIdValue);
-    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_readValue(server, PublisherIdNode, &PublisherIdValue));
+    UA_StatusCode res = UA_Server_readValue(server, PublisherIdNode, &PublisherIdValue);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, res);
     ck_assert(true == UA_Variant_hasScalarType(&PublisherIdValue, &UA_TYPES[UA_TYPES_STRING]));
     ck_assert(true == UA_String_equal(&expectedStringIdValue, (UA_String*) PublisherIdValue.data));
     UA_Variant_clear(&PublisherIdValue);
@@ -1016,6 +1018,8 @@ static void Test_string_PublisherId_InformationModel(
     UA_BrowsePathResult_clear(&bpr);
 }
 
+#endif
+
 /***************************************************************************************************/
 static void DoTest_string_PublisherId(void) {
 
@@ -1250,6 +1254,7 @@ static void DoTest_string_PublisherId(void) {
         fastPathSubscriberDataValues, 100, (UA_UInt32) 100, 3);
 
     /* check PubSub information model - string Ids */
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     char *expectedPublisherIds[] = {
         "H",
         "h",
@@ -1261,6 +1266,7 @@ static void DoTest_string_PublisherId(void) {
     for (UA_UInt32 i = 0; i < DOTEST_STRING_PUBLISHERID_MAX_COMPONENTS; i++) {
         Test_string_PublisherId_InformationModel(ConnectionIds[i], UA_STRING(expectedPublisherIds[i]));
     }
+#endif
 
     /* set groups to disabled */
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable groups");

From 0971b7b79409d3842d13bcc7cdab218567498e2a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Jul 2022 23:54:37 +0200
Subject: [PATCH 0343/1963] refactor(core): Align UA_LogLevel definitions with
 the cmake definition

---
 include/open62541/plugin/log.h | 12 ++++++------
 plugins/ua_log_stdout.c        |  6 +++++-
 plugins/ua_log_syslog.c        |  7 ++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/include/open62541/plugin/log.h b/include/open62541/plugin/log.h
index aa09ecc3bf8..aa08fad8821 100644
--- a/include/open62541/plugin/log.h
+++ b/include/open62541/plugin/log.h
@@ -29,12 +29,12 @@ _UA_BEGIN_DECLS
  * logger. */
 
 typedef enum {
-    UA_LOGLEVEL_TRACE = 0,
-    UA_LOGLEVEL_DEBUG,
-    UA_LOGLEVEL_INFO,
-    UA_LOGLEVEL_WARNING,
-    UA_LOGLEVEL_ERROR,
-    UA_LOGLEVEL_FATAL
+    UA_LOGLEVEL_TRACE   = 100,
+    UA_LOGLEVEL_DEBUG   = 200,
+    UA_LOGLEVEL_INFO    = 300,
+    UA_LOGLEVEL_WARNING = 400,
+    UA_LOGLEVEL_ERROR   = 500,
+    UA_LOGLEVEL_FATAL   = 600
 } UA_LogLevel;
 
 #define UA_LOGCATEGORIES 8
diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index 788cc399f99..6e6834d6a8d 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -63,9 +63,13 @@ UA_Log_Stdout_log(void *context, UA_LogLevel level, UA_LogCategory category,
     UA_Int64 tOffset = UA_DateTime_localTimeUtcOffset();
     UA_DateTimeStruct dts = UA_DateTime_toStruct(UA_DateTime_now() + tOffset);
 
+    int logLevelSlot = ((int)level / 100) - 1;
+    if(logLevelSlot < 0 || logLevelSlot > 5)
+        logLevelSlot = 5; /* Set to fatal if the level is outside the range */
+
     printf("[%04u-%02u-%02u %02u:%02u:%02u.%03u (UTC%+05d)] %s/%s" ANSI_COLOR_RESET "\t",
            dts.year, dts.month, dts.day, dts.hour, dts.min, dts.sec, dts.milliSec,
-           (int)(tOffset / UA_DATETIME_SEC / 36), logLevelNames[level],
+           (int)(tOffset / UA_DATETIME_SEC / 36), logLevelNames[logLevelSlot],
            logCategoryNames[category]);
     vprintf(msg, args);
     printf("\n");
diff --git a/plugins/ua_log_syslog.c b/plugins/ua_log_syslog.c
index dcbae585840..8dbf2d0ac79 100644
--- a/plugins/ua_log_syslog.c
+++ b/plugins/ua_log_syslog.c
@@ -49,10 +49,15 @@ UA_Log_Syslog_log(void *context, UA_LogLevel level, UA_LogCategory category,
         return;
     }
 
+    int logLevelSlot = ((int)level / 100) - 1;
+    if(logLevelSlot < 0 || logLevelSlot > 5)
+        logLevelSlot = 5; /* Set to fatal if the level is outside the range */
+
 #define LOGBUFSIZE 512
     char logbuf[LOGBUFSIZE];
     int pos = snprintf(logbuf, LOGBUFSIZE, "[%s/%s] ",
-                       syslogLevelNames[level], syslogCategoryNames[category]);
+                       syslogLevelNames[logLevelSlot],
+                       syslogCategoryNames[category]);
     if(pos < 0) {
         syslog(LOG_WARNING, "Log message too long for syslog");
         return;

From d084d593773ad16d9e7ae65edd3d71c36b0355db Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Jul 2022 23:55:37 +0200
Subject: [PATCH 0344/1963] feat(pubsub): Add log categories for PubSub

---
 include/open62541/plugin/log.h |   5 +-
 plugins/ua_log_stdout.c        |   2 +-
 plugins/ua_log_syslog.c        |   2 +-
 src/pubsub/ua_pubsub.h         | 156 +++++++++++++++++++++++++++++++++
 4 files changed, 161 insertions(+), 4 deletions(-)

diff --git a/include/open62541/plugin/log.h b/include/open62541/plugin/log.h
index aa08fad8821..4a4c9e07a43 100644
--- a/include/open62541/plugin/log.h
+++ b/include/open62541/plugin/log.h
@@ -37,7 +37,7 @@ typedef enum {
     UA_LOGLEVEL_FATAL   = 600
 } UA_LogLevel;
 
-#define UA_LOGCATEGORIES 8
+#define UA_LOGCATEGORIES 9
 
 typedef enum {
     UA_LOGCATEGORY_NETWORK = 0,
@@ -47,7 +47,8 @@ typedef enum {
     UA_LOGCATEGORY_CLIENT,
     UA_LOGCATEGORY_USERLAND,
     UA_LOGCATEGORY_SECURITYPOLICY,
-    UA_LOGCATEGORY_EVENTLOOP
+    UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOGCATEGORY_PUBSUB
 } UA_LogCategory;
 
 typedef struct {
diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index 6e6834d6a8d..3aad54a5400 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -38,7 +38,7 @@ const char *logLevelNames[6] = {"trace", "debug",
                                 ANSI_COLOR_MAGENTA "fatal"};
 const char *logCategoryNames[UA_LOGCATEGORIES] =
     {"network", "channel", "session", "server",
-     "client", "userland", "securitypolicy", "eventloop"};
+     "client", "userland", "securitypolicy", "eventloop", "pubsub"};
 
 typedef struct {
     UA_LogLevel minlevel;
diff --git a/plugins/ua_log_syslog.c b/plugins/ua_log_syslog.c
index 8dbf2d0ac79..3f1dcdbc3d6 100644
--- a/plugins/ua_log_syslog.c
+++ b/plugins/ua_log_syslog.c
@@ -15,7 +15,7 @@ const char *syslogLevelNames[6] = {"trace", "debug", "info",
                                    "warn", "error", "fatal"};
 const char *syslogCategoryNames[UA_LOGCATEGORIES] =
     {"network", "channel", "session", "server",
-     "client", "userland", "securitypolicy", "eventloop"};
+     "client", "userland", "securitypolicy", "eventloop", "pubsub"};
 
 #ifdef __clang__
 __attribute__((__format__(__printf__, 4 , 0)))
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index aea75d19fd0..f010002e357 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -78,6 +78,29 @@ UA_StandaloneSubscribedDataSet_findSDSbyName(UA_Server *server, UA_String identi
 void
 UA_StandaloneSubscribedDataSet_clear(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet); 
 
+#define UA_LOG_PDS_INTERNAL(LOGGER, LEVEL, PDS, MSG, ...)               \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
+        UA_String idStr = UA_STRING_NULL;                               \
+        if(PDS)                                                         \
+            UA_NodeId_print(&(PDS)->identifier, &idStr);                \
+        UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_PUBSUB,                   \
+                       "DataSet %.*s\t| " MSG "%.0s", (int)idStr.length, \
+                       (char*)idStr.data, __VA_ARGS__);                 \
+        UA_String_clear(&idStr);                                        \
+    }
+
+#define UA_LOG_TRACE_DATASET(LOGGER, PDS, ...)                          \
+    UA_MACRO_EXPAND(UA_LOG_PDS_INTERNAL(LOGGER, TRACE, PDS, __VA_ARGS__, ""))
+#define UA_LOG_DEBUG_DATASET(LOGGER, PDS, ...)                          \
+    UA_MACRO_EXPAND(UA_LOG_PDS_INTERNAL(LOGGER, DEBUG, PDS, __VA_ARGS__, ""))
+#define UA_LOG_INFO_DATASET(LOGGER, PDS, ...)                           \
+    UA_MACRO_EXPAND(UA_LOG_PDS_INTERNAL(LOGGER, INFO, PDS, __VA_ARGS__, ""))
+#define UA_LOG_WARNING_DATASET(LOGGER, PDS, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_PDS_INTERNAL(LOGGER, WARNING, PDS, __VA_ARGS__, ""))
+#define UA_LOG_ERROR_DATASET(LOGGER, PDS, ...)                          \
+    UA_MACRO_EXPAND(UA_LOG_PDS_INTERNAL(LOGGER, ERROR, PDS, __VA_ARGS__, ""))
+#define UA_LOG_FATAL_DATASET(LOGGER, PDS, ...)                          \
+    UA_MACRO_EXPAND(UA_LOG_PDS_INTERNAL(LOGGER, FATAL, PDS, __VA_ARGS__, ""))
 
 /**********************************************/
 /*               Connection                   */
@@ -119,6 +142,30 @@ UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection);
 UA_StatusCode
 UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier);
 
+#define UA_LOG_CONNECTION_INTERNAL(LOGGER, LEVEL, CONNECTION, MSG, ...) \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
+        UA_String idStr = UA_STRING_NULL;                               \
+        if(CONNECTION)                                                  \
+            UA_NodeId_print(&(CONNECTION)->identifier, &idStr);         \
+        UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_PUBSUB,                   \
+                       "Connection %.*s\t| " MSG "%.0s", (int)idStr.length, \
+                       (char*)idStr.data, __VA_ARGS__);                 \
+        UA_String_clear(&idStr);                                        \
+    }
+
+#define UA_LOG_TRACE_CONNECTION(LOGGER, CONNECTION, ...)                \
+    UA_MACRO_EXPAND(UA_LOG_CONNECTION_INTERNAL(LOGGER, TRACE, CONNECTION, __VA_ARGS__, ""))
+#define UA_LOG_DEBUG_CONNECTION(LOGGER, CONNECTION, ...)                \
+    UA_MACRO_EXPAND(UA_LOG_CONNECTION_INTERNAL(LOGGER, DEBUG, CONNECTION, __VA_ARGS__, ""))
+#define UA_LOG_INFO_CONNECTION(LOGGER, CONNECTION, ...)                 \
+    UA_MACRO_EXPAND(UA_LOG_CONNECTION_INTERNAL(LOGGER, INFO, CONNECTION, __VA_ARGS__, ""))
+#define UA_LOG_WARNING_CONNECTION(LOGGER, CONNECTION, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_CONNECTION_INTERNAL(LOGGER, WARNING, CONNECTION, __VA_ARGS__, ""))
+#define UA_LOG_ERROR_CONNECTION(LOGGER, CONNECTION, ...)                \
+    UA_MACRO_EXPAND(UA_LOG_CONNECTION_INTERNAL(LOGGER, ERROR, CONNECTION, __VA_ARGS__, ""))
+#define UA_LOG_FATAL_CONNECTION(LOGGER, CONNECTION, ...)                \
+    UA_MACRO_EXPAND(UA_LOG_CONNECTION_INTERNAL(LOGGER, FATAL, CONNECTION, __VA_ARGS__, ""))
+
 /**********************************************/
 /*              DataSetWriter                 */
 /**********************************************/
@@ -173,6 +220,36 @@ UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
 UA_StatusCode
 removeDataSetWriter(UA_Server *server, const UA_NodeId dsw);
 
+#define UA_LOG_WRITER_INTERNAL(LOGGER, LEVEL, WRITER, MSG, ...)         \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
+        UA_String idStr = UA_STRING_NULL;                               \
+        UA_String groupIdStr = UA_STRING_NULL;                          \
+        if(WRITER) {                                                    \
+            UA_NodeId_print(&(WRITER)->identifier, &idStr);             \
+            UA_NodeId_print(&(WRITER)->linkedWriterGroup, &groupIdStr); \
+        }                                                               \
+        UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_PUBSUB,                   \
+                       "WriterGroup %.*s\t| Writer %.*s\t| " MSG "%.0s", \
+                       (int)groupIdStr.length, (char*)groupIdStr.data,  \
+                       (int)idStr.length, (char*)idStr.data,            \
+                       __VA_ARGS__);                                    \
+        UA_String_clear(&idStr);                                        \
+        UA_String_clear(&groupIdStr);                                   \
+    }
+
+#define UA_LOG_TRACE_WRITER(LOGGER, WRITER, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_WRITER_INTERNAL(LOGGER, TRACE, WRITER, __VA_ARGS__, ""))
+#define UA_LOG_DEBUG_WRITER(LOGGER, WRITER, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_WRITER_INTERNAL(LOGGER, DEBUG, WRITER, __VA_ARGS__, ""))
+#define UA_LOG_INFO_WRITER(LOGGER, WRITER, ...)                         \
+    UA_MACRO_EXPAND(UA_LOG_WRITER_INTERNAL(LOGGER, INFO, WRITER, __VA_ARGS__, ""))
+#define UA_LOG_WARNING_WRITER(LOGGER, WRITER, ...)                      \
+    UA_MACRO_EXPAND(UA_LOG_WRITER_INTERNAL(LOGGER, WARNING, WRITER, __VA_ARGS__, ""))
+#define UA_LOG_ERROR_WRITER(LOGGER, WRITER, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_WRITER_INTERNAL(LOGGER, ERROR, WRITER, __VA_ARGS__, ""))
+#define UA_LOG_FATAL_WRITER(LOGGER, WRITER, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_WRITER_INTERNAL(LOGGER, FATAL, WRITER, __VA_ARGS__, ""))
+
 /**********************************************/
 /*               WriterGroup                  */
 /**********************************************/
@@ -215,6 +292,31 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
                               UA_PubSubState state,
                               UA_StatusCode cause);
 
+#define UA_LOG_WRITERGROUP_INTERNAL(LOGGER, LEVEL, WRITERGROUP, MSG, ...) \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
+        UA_String idStr = UA_STRING_NULL;                               \
+        if(WRITERGROUP)                                                 \
+            UA_NodeId_print(&(WRITERGROUP)->identifier, &idStr);        \
+        UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_PUBSUB,                   \
+                       "WriterGroup %.*s\t| " MSG "%.0s",               \
+                       (int)idStr.length, (char*)idStr.data,            \
+                       __VA_ARGS__);                                    \
+        UA_String_clear(&idStr);                                        \
+    }
+
+#define UA_LOG_TRACE_WRITERGROUP(LOGGER, WRITERGROUP, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_WRITERGROUP_INTERNAL(LOGGER, TRACE, WRITERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_DEBUG_WRITERGROUP(LOGGER, WRITERGROUP, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_WRITERGROUP_INTERNAL(LOGGER, DEBUG, WRITERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_INFO_WRITERGROUP(LOGGER, WRITERGROUP, ...)               \
+    UA_MACRO_EXPAND(UA_LOG_WRITERGROUP_INTERNAL(LOGGER, INFO, WRITERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_WARNING_WRITERGROUP(LOGGER, WRITERGROUP, ...)            \
+    UA_MACRO_EXPAND(UA_LOG_WRITERGROUP_INTERNAL(LOGGER, WARNING, WRITERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_ERROR_WRITERGROUP(LOGGER, WRITERGROUP, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_WRITERGROUP_INTERNAL(LOGGER, ERROR, WRITERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_FATAL_WRITERGROUP(LOGGER, WRITERGROUP, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_WRITERGROUP_INTERNAL(LOGGER, FATAL, WRITERGROUP, __VA_ARGS__, ""))
+
 /**********************************************/
 /*               DataSetField                 */
 /**********************************************/
@@ -329,6 +431,36 @@ UA_DataSetReader_generateDataSetMessage(UA_Server *server,
                                         UA_DataSetMessage *dataSetMessage,
                                         UA_DataSetReader *dataSetReader);
 
+#define UA_LOG_READER_INTERNAL(LOGGER, LEVEL, READER, MSG, ...)         \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
+        UA_String idStr = UA_STRING_NULL;                               \
+        UA_String groupIdStr = UA_STRING_NULL;                          \
+        if(READER) {                                                    \
+            UA_NodeId_print(&(READER)->identifier, &idStr);             \
+            UA_NodeId_print(&(READER)->linkedReaderGroup, &groupIdStr); \
+        }                                                               \
+        UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_PUBSUB,                   \
+                       "ReaderGroup %.*s\t| Reader %.*s\t| " MSG "%.0s", \
+                       (int)groupIdStr.length, (char*)groupIdStr.data,  \
+                       (int)idStr.length, (char*)idStr.data,            \
+                       __VA_ARGS__);                                    \
+        UA_String_clear(&idStr);                                        \
+        UA_String_clear(&groupIdStr);                                   \
+    }
+
+#define UA_LOG_TRACE_READER(LOGGER, READER, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_READER_INTERNAL(LOGGER, TRACE, READER, __VA_ARGS__, ""))
+#define UA_LOG_DEBUG_READER(LOGGER, READER, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_READER_INTERNAL(LOGGER, DEBUG, READER, __VA_ARGS__, ""))
+#define UA_LOG_INFO_READER(LOGGER, READER, ...)                         \
+    UA_MACRO_EXPAND(UA_LOG_READER_INTERNAL(LOGGER, INFO, READER, __VA_ARGS__, ""))
+#define UA_LOG_WARNING_READER(LOGGER, READER, ...)                      \
+    UA_MACRO_EXPAND(UA_LOG_READER_INTERNAL(LOGGER, WARNING, READER, __VA_ARGS__, ""))
+#define UA_LOG_ERROR_READER(LOGGER, READER, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_READER_INTERNAL(LOGGER, ERROR, READER, __VA_ARGS__, ""))
+#define UA_LOG_FATAL_READER(LOGGER, READER, ...)                        \
+    UA_MACRO_EXPAND(UA_LOG_READER_INTERNAL(LOGGER, FATAL, READER, __VA_ARGS__, ""))
+
 /**********************************************/
 /*                ReaderGroup                 */
 /**********************************************/
@@ -397,6 +529,30 @@ UA_ReaderGroup_removeSubscribeCallback(UA_Server *server, UA_ReaderGroup *reader
 void
 UA_ReaderGroup_subscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup);
 
+#define UA_LOG_READERGROUP_INTERNAL(LOGGER, LEVEL, RG, MSG, ...)        \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
+        UA_String idStr = UA_STRING_NULL;                               \
+        if(RG)                                                          \
+            UA_NodeId_print(&(RGi)->identifier, &idStr);                \
+        UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_PUBSUB,                   \
+                       "ReaderGroup %.*s\t| " MSG "%.0s", (int)idStr.length, \
+                       (char*)idStr.data, __VA_ARGS__);                 \
+        UA_String_clear(&idStr);                                        \
+    }
+
+#define UA_LOG_TRACE_READERGROUP(LOGGER, READERGROUP, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_READERGROUP_INTERNAL(LOGGER, TRACE, READERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_DEBUG_READERGROUP(LOGGER, READERGROUP, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_READERGROUP_INTERNAL(LOGGER, DEBUG, READERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_INFO_READERGROUP(LOGGER, READERGROUP, ...)               \
+    UA_MACRO_EXPAND(UA_LOG_READERGROUP_INTERNAL(LOGGER, INFO, READERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_WARNING_READERGROUP(LOGGER, READERGROUP, ...)            \
+    UA_MACRO_EXPAND(UA_LOG_READERGROUP_INTERNAL(LOGGER, WARNING, READERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_ERROR_READERGROUP(LOGGER, READERGROUP, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_READERGROUP_INTERNAL(LOGGER, ERROR, READERGROUP, __VA_ARGS__, ""))
+#define UA_LOG_FATAL_READERGROUP(LOGGER, READERGROUP, ...)              \
+    UA_MACRO_EXPAND(UA_LOG_READERGROUP_INTERNAL(LOGGER, FATAL, READERGROUP, __VA_ARGS__, ""))
+
 /*********************************************************/
 /*               Reading Message handling                */
 /*********************************************************/

From 2ec1a14a3415453e769d8642bc2387493901617a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Jul 2022 00:01:37 +0200
Subject: [PATCH 0345/1963] refactor(server): Simplify Session logging
 definitions

---
 src/server/ua_session.h | 45 ++++++++---------------------------------
 1 file changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index fc549a444a8..c79a4e568a4 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -131,7 +131,7 @@ UA_Session_dequeuePublishReq(UA_Session *session);
  * string of length zero). */
 
 #define UA_LOG_SESSION_INTERNAL(LOGGER, LEVEL, SESSION, MSG, ...)       \
-    do {                                                                \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                           \
         int nameLen = (SESSION) ? (int)(SESSION)->sessionName.length : 0; \
         const char *nameStr = (SESSION) ?                               \
             (const char*)(SESSION)->sessionName.data : NULL;            \
@@ -140,49 +140,20 @@ UA_Session_dequeuePublishReq(UA_Session *session);
         UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_SESSION,                  \
                        "SecureChannel %" PRIu32 " | Session \"%.*s\" | " MSG "%.0s", \
                        chanId, nameLen, nameStr, __VA_ARGS__);          \
-    } while(0)
+    }
 
-#if UA_LOGLEVEL <= 100
-# define UA_LOG_TRACE_SESSION(LOGGER, SESSION, ...)                     \
+#define UA_LOG_TRACE_SESSION(LOGGER, SESSION, ...)                      \
     UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, TRACE, SESSION, __VA_ARGS__, ""))
-#else
-# define UA_LOG_TRACE_SESSION(LOGGER, SESSION, ...)
-#endif
-
-#if UA_LOGLEVEL <= 200
-# define UA_LOG_DEBUG_SESSION(LOGGER, SESSION, ...)                     \
+#define UA_LOG_DEBUG_SESSION(LOGGER, SESSION, ...)                      \
     UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, DEBUG, SESSION, __VA_ARGS__, ""))
-#else
-# define UA_LOG_DEBUG_SESSION(LOGGER, SESSION, ...)
-#endif
-
-#if UA_LOGLEVEL <= 300
-# define UA_LOG_INFO_SESSION(LOGGER, SESSION, ...)                      \
+#define UA_LOG_INFO_SESSION(LOGGER, SESSION, ...)                       \
     UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, INFO, SESSION, __VA_ARGS__, ""))
-#else
-# define UA_LOG_INFO_SESSION(LOGGER, SESSION, ...)
-#endif
-
-#if UA_LOGLEVEL <= 400
-# define UA_LOG_WARNING_SESSION(LOGGER, SESSION, ...)                    \
+#define UA_LOG_WARNING_SESSION(LOGGER, SESSION, ...)                    \
     UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, WARNING, SESSION, __VA_ARGS__, ""))
-#else
-# define UA_LOG_WARNING_SESSION(LOGGER, SESSION, ...)
-#endif
-
-#if UA_LOGLEVEL <= 500
-# define UA_LOG_ERROR_SESSION(LOGGER, SESSION, ...)                      \
+#define UA_LOG_ERROR_SESSION(LOGGER, SESSION, ...)                      \
     UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, ERROR, SESSION, __VA_ARGS__, ""))
-#else
-# define UA_LOG_ERROR_SESSION(LOGGER, SESSION, ...)
-#endif
-
-#if UA_LOGLEVEL <= 600
-# define UA_LOG_FATAL_SESSION(LOGGER, SESSION, ...)                      \
+#define UA_LOG_FATAL_SESSION(LOGGER, SESSION, ...)                      \
     UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, FATAL, SESSION, __VA_ARGS__, ""))
-#else
-# define UA_LOG_FATAL_SESSION(LOGGER, SESSION, ...)
-#endif
 
 _UA_END_DECLS
 

From dcbde1072c32bc9a3709b39ef5999d891a7bad14 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Jul 2022 00:08:51 +0200
Subject: [PATCH 0346/1963] refactor(core): Simplify logging helpers

---
 src/ua_util_internal.h | 61 +++++++++---------------------------------
 1 file changed, 13 insertions(+), 48 deletions(-)

diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 0e490dcd831..dbf06f6530f 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -28,55 +28,20 @@ _UA_BEGIN_DECLS
 #define UA_MACRO_EXPAND(x) x
 
 /* Print a NodeId in logs */
-#define UA_LOG_NODEID_INTERNAL(NODEID, LOG)          \
-    do {                                             \
-    UA_String nodeIdStr = UA_STRING_NULL;            \
-    UA_NodeId_print(NODEID, &nodeIdStr);             \
-    LOG;                                             \
-    UA_String_clear(&nodeIdStr);                     \
-    } while(0)
-
-#if UA_LOGLEVEL <= 100
-# define UA_LOG_NODEID_TRACE(NODEID, LOG)       \
-    UA_LOG_NODEID_INTERNAL(NODEID, LOG)
-#else
-# define UA_LOG_NODEID_TRACE(NODEID, LOG)
-#endif
-
-#if UA_LOGLEVEL <= 200
-# define UA_LOG_NODEID_DEBUG(NODEID, LOG)       \
-    UA_LOG_NODEID_INTERNAL(NODEID, LOG)
-#else
-# define UA_LOG_NODEID_DEBUG(NODEID, LOG)
-#endif
-
-#if UA_LOGLEVEL <= 300
-# define UA_LOG_NODEID_INFO(NODEID, LOG)       \
-    UA_LOG_NODEID_INTERNAL(NODEID, LOG)
-#else
-# define UA_LOG_NODEID_INFO(NODEID, LOG)
-#endif
-
-#if UA_LOGLEVEL <= 400
-# define UA_LOG_NODEID_WARNING(NODEID, LOG)     \
-    UA_LOG_NODEID_INTERNAL(NODEID, LOG)
-#else
-# define UA_LOG_NODEID_WARNING(NODEID, LOG)
-#endif
-
-#if UA_LOGLEVEL <= 500
-# define UA_LOG_NODEID_ERROR(NODEID, LOG)       \
-    UA_LOG_NODEID_INTERNAL(NODEID, LOG)
-#else
-# define UA_LOG_NODEID_ERROR(NODEID, LOG)
-#endif
+#define UA_LOG_NODEID_INTERNAL(NODEID, LEVEL, LOG)   \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {         \
+        UA_String nodeIdStr = UA_STRING_NULL;        \
+        UA_NodeId_print(NODEID, &nodeIdStr);         \
+        LOG;                                         \
+        UA_String_clear(&nodeIdStr);                 \
+    }
 
-#if UA_LOGLEVEL <= 600
-# define UA_LOG_NODEID_FATAL(NODEID, LOG)       \
-    UA_LOG_NODEID_INTERNAL(NODEID, LOG)
-#else
-# define UA_LOG_NODEID_FATAL(NODEID, LOG)
-#endif
+#define UA_LOG_NODEID_TRACE(NODEID, LOG) UA_LOG_NODEID_INTERNAL(NODEID, TRACE, LOG)
+#define UA_LOG_NODEID_DEBUG(NODEID, LOG) UA_LOG_NODEID_INTERNAL(NODEID, DEBUG, LOG)
+#define UA_LOG_NODEID_INFO(NODEID, LOG) UA_LOG_NODEID_INTERNAL(NODEID, INFO, LOG)
+#define UA_LOG_NODEID_WARNING(NODEID, LOG) UA_LOG_NODEID_INTERNAL(NODEID, WARNING, LOG)
+#define UA_LOG_NODEID_ERROR(NODEID, LOG) UA_LOG_NODEID_INTERNAL(NODEID, ERROR, LOG)
+#define UA_LOG_NODEID_FATAL(NODEID, LOG) UA_LOG_NODEID_INTERNAL(NODEID, FATAL, LOG)
 
 /* Short names for integer. These are not exposed on the public API, since many
  * user-applications make the same definitions in their headers. */

From 826a25c291767c300b0c27251d4bfe0f4e1961dc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Jul 2022 00:35:04 +0200
Subject: [PATCH 0347/1963] feat(pubsub): Use PubSub logging macros for the
 WriterGroup

---
 src/pubsub/ua_pubsub_writergroup.c | 132 +++++++++++++++--------------
 1 file changed, 70 insertions(+), 62 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 705a5c7e092..90533639fa3 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -126,8 +126,9 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(wg->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Delete WriterGroup failed. WriterGroup is frozen.");
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                   "Deleting the WriterGroup failed. "
+                                   "WriterGroup is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -136,8 +137,9 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(connection->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Delete WriterGroup failed. PubSubConnection is frozen.");
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                   "Deleting the WriterGroup failed. "
+                                   "PubSubConnection is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -218,8 +220,8 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
     /* Freeze the RT writer configuration */
     size_t dsmCount = 0;
     if(wg->config.encodingMimeType != UA_PUBSUB_ENCODING_UADP) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub-RT configuration fail: Non-RT capable encoding.");
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                   "PubSub-RT configuration fail: Non-RT capable encoding.");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
@@ -236,13 +238,14 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
         UA_PublishedDataSet *pds =
             UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
         if(!pds) {
-            if (UA_NodeId_isNull(&dsw->connectedDataSet)) {
+            if(UA_NodeId_isNull(&dsw->connectedDataSet)) {
                 UA_StatusCode res1 =
                         UA_DataSetWriter_generateDataSetMessage(server,
                                 &dsmStore[dsmCount], dsw);
-                if (res1 != UA_STATUSCODE_GOOD) {
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "PubSub Publish: Heartbeat DataSetMessage creation failed");
+                if(res1 != UA_STATUSCODE_GOOD) {
+                    UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                          "PubSub-RT configuration fail: "
+                                          "Heartbeat DataSetMessage creation failed");
                     continue;
                 }
                 dsWriterIds[dsmCount] = dsw->config.dataSetWriterId;
@@ -250,15 +253,17 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
                 continue;
             }
 
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "PubSub Publish: PublishedDataSet not found");
+            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                  "PubSub-RT configuration fail: "
+                                  "PublishedDataSet not found");
             continue;
         }
 
         if(pds) {
             if(pds->promotedFieldsCount > 0) {
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "PubSub-RT configuration fail: PDS contains promoted fields.");
+                UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                      "PubSub-RT configuration fail: "
+                                      "PDS contains promoted fields");
                 return UA_STATUSCODE_BADNOTSUPPORTED;
             }
 
@@ -268,8 +273,9 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
                 const UA_VariableNode *rtNode = (const UA_VariableNode *)
                     UA_NODESTORE_GET(server, &dsf->config.field.variable.publishParameters.publishedVariable);
                 if(rtNode != NULL && rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                "PubSub-RT configuration fail: PDS contains field without external data source.");
+                    UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                          "PubSub-RT configuration fail: "
+                                          "PDS contains field without external data source");
                     UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
                     return UA_STATUSCODE_BADNOTSUPPORTED;
                 }
@@ -278,15 +284,16 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
                     UA_NodeId_equal(&dsf->fieldMetaData.dataType,
                                     &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
                 dsf->fieldMetaData.maxStringLength == 0) {
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                "PubSub-RT configuration fail: "
-                                "PDS contains String/ByteString with dynamic length.");
+                    UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                          "PubSub-RT configuration fail: "
+                                          "PDS contains String/ByteString with dynamic length");
                     return UA_STATUSCODE_BADNOTSUPPORTED;
                 } else if(!UA_DataType_isNumeric(UA_findDataType(&dsf->fieldMetaData.dataType)) &&
-                        !UA_NodeId_equal(&dsf->fieldMetaData.dataType, &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                "PubSub-RT configuration fail: "
-                                "PDS contains variable with dynamic size.");
+                          !UA_NodeId_equal(&dsf->fieldMetaData.dataType,
+                                           &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
+                    UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                          "PubSub-RT configuration fail: "
+                                          "PDS contains variable with dynamic size");
                     return UA_STATUSCODE_BADNOTSUPPORTED;
                 }
             }
@@ -295,8 +302,9 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
         /* Generate the DSM */
         res = UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "PubSub RT Offset calculation: DataSetMessage buffering failed");
+            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                  "PubSub-RT configuration fail: "
+                                  "DataSetMessage buffering failed");
             continue;
         }
 
@@ -498,8 +506,8 @@ UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdenti
     }
 
     if(currentWriterGroup->configurationFrozen){
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Modify WriterGroup failed. WriterGroup is frozen.");
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, currentWriterGroup,
+                                   "Modify WriterGroup failed. WriterGroup is frozen.");
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
@@ -509,8 +517,9 @@ UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdenti
     if(currentWriterGroup->config.maxEncapsulatedDataSetMessageCount != config->maxEncapsulatedDataSetMessageCount) {
         currentWriterGroup->config.maxEncapsulatedDataSetMessageCount = config->maxEncapsulatedDataSetMessageCount;
         if(currentWriterGroup->config.messageSettings.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "MaxEncapsulatedDataSetMessag need enabled 'PayloadHeader' within the message settings.");
+            UA_LOG_WARNING_WRITERGROUP(&server->config.logger, currentWriterGroup,
+                                       "MaxEncapsulatedDataSetMessag need enabled "
+                                       "'PayloadHeader' within the message settings.");
         }
     }
 
@@ -532,8 +541,8 @@ UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdenti
     }
 
     if(currentWriterGroup->config.priority != config->priority) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "No or unsupported WriterGroup update.");
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, currentWriterGroup,
+                                   "No or unsupported WriterGroup update.");
     }
 
     UA_UNLOCK(&server->serviceMutex);
@@ -578,8 +587,8 @@ UA_Server_setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writer
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(!wg->config.securityPolicy) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "No SecurityPolicy configured for the WriterGroup");
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                   "No SecurityPolicy configured for the WriterGroup");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -635,10 +644,8 @@ UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
 }
 
 UA_StatusCode
-UA_WriterGroup_setPubSubState(UA_Server *server,
-                              UA_WriterGroup *writerGroup,
-                              UA_PubSubState state,
-                              UA_StatusCode cause) {
+UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
+                              UA_PubSubState state, UA_StatusCode cause) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     UA_DataSetWriter *dataSetWriter;
@@ -666,8 +673,8 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                   "Received unknown PubSub state!");
+                    UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                                               "Received unknown PubSub state!");
             }
             break;
         case UA_PUBSUBSTATE_PAUSED:
@@ -681,8 +688,8 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                   "Received unknown PubSub state!");
+                    UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                                               "Received unknown PubSub state!");
             }
             break;
         case UA_PUBSUBSTATE_OPERATIONAL:
@@ -709,8 +716,8 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                   "Received unknown PubSub state!");
+                    UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                                               "Received unknown PubSub state!");
             }
             break;
         case UA_PUBSUBSTATE_ERROR: {
@@ -729,17 +736,18 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
                                     "Received unknown PubSub state!");
             }
             writerGroup->state = UA_PUBSUBSTATE_ERROR;
             break;
         }
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "Received unknown PubSub state!");
+            UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                                       "Received unknown PubSub state!");
     }
-    if (state != oldState) {
+
+    if(state != oldState) {
         /* inform application about state change */
         UA_ServerConfig *pConfig = UA_Server_getConfig(server);
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
@@ -830,8 +838,8 @@ sendNetworkMessageBuffer(UA_Server *server, UA_WriterGroup *wg,
                                   &wg->config.transportSettings, buffer);
     /* Failure, set the WriterGroup into an error mode */
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Sending NetworkMessage failed");
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Sending NetworkMessage failed");
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR, res);
         return;
     }
@@ -1044,8 +1052,8 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
         UA_NetworkMessage_updateBufferedMessage(&writerGroup->bufferedMessage);
 
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub sending. Unknown field type.");
+        UA_LOG_DEBUG_WRITERGROUP(&server->config.logger, writerGroup,
+                                 "PubSub sending. Unknown field type.");
         return;
     }
 
@@ -1066,8 +1074,8 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
                                  writerGroup->bufferedMessage.encryptBuffer.length - sigSize);
 
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Encryption failed");
+            UA_LOG_ERROR_WRITERGROUP(&server->config.logger, writerGroup,
+                                     "PubSub Encryption failed");
             return;
         }
 
@@ -1102,9 +1110,9 @@ sendNetworkMessage(UA_Server *server, UA_WriterGroup *wg, UA_PubSubConnection *c
 
     /* If sending failed, disable all writer of the writergroup */
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub Publish: Could not send a NetworkMessage "
-                     "with status code %s", UA_StatusCode_name(res));
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "PubSub Publish: Could not send a NetworkMessage "
+                                 "with status code %s", UA_StatusCode_name(res));
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR, res);
     }
 }
@@ -1118,7 +1126,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
 
     UA_LOCK(&server->serviceMutex);
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "Publish Callback");
+    UA_LOG_DEBUG_WRITERGROUP(&server->config.logger, writerGroup, "Publish Callback");
 
     /* Nothing to do? */
     if(writerGroup->writersCount == 0) {
@@ -1129,8 +1137,8 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     /* Find the connection associated with the writer */
     UA_PubSubConnection *connection = writerGroup->linkedConnection;
     if(!connection) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Publish failed. PubSubConnection invalid");
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, writerGroup,
+                                 "Publish failed. PubSubConnection invalid");
         UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_ERROR,
                                       UA_STATUSCODE_BADNOTCONNECTED);
         UA_UNLOCK(&server->serviceMutex);
@@ -1169,8 +1177,8 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
         UA_PublishedDataSet *pds = (heartbeat) ? NULL :
             UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
         if(!heartbeat && !pds) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Publish: PublishedDataSet not found");
+            UA_LOG_ERROR_WRITER(&server->config.logger, dsw,
+                                "PubSub Publish: PublishedDataSet not found");
             UA_DataSetWriter_setPubSubState(server, dsw, UA_PUBSUBSTATE_ERROR,
                                             UA_STATUSCODE_BADINTERNALERROR);
             continue;
@@ -1181,7 +1189,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
         UA_StatusCode res =
             UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR_WRITER(&server->config.logger, dsw,
                          "PubSub Publish: DataSetMessage creation failed");
             UA_DataSetWriter_setPubSubState(server, dsw, UA_PUBSUBSTATE_ERROR, res);
             continue;

From a6fd832db2e27f308d0e9300cf17442770141206 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Jul 2022 09:38:10 +0200
Subject: [PATCH 0348/1963] refactor(pubsub): Make addDataSetField internal
 (static)

---
 src/pubsub/ua_pubsub.h        | 5 -----
 src/pubsub/ua_pubsub_writer.c | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index f010002e357..14177f0fcd0 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -339,11 +339,6 @@ UA_DataSetFieldConfig_copy(const UA_DataSetFieldConfig *src,
 UA_DataSetField *
 UA_DataSetField_findDSFbyId(UA_Server *server, UA_NodeId identifier);
 
-UA_DataSetFieldResult
-addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
-                const UA_DataSetFieldConfig *fieldConfig,
-                UA_NodeId *fieldIdentifier);
-
 UA_DataSetFieldResult
 removeDataSetField(UA_Server *server, const UA_NodeId dsf);
 
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index e9ab1774d1c..3271998de62 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -361,7 +361,7 @@ generateFieldMetaData(UA_Server *server, UA_DataSetField *field,
     return UA_STATUSCODE_GOOD;
 }
 
-UA_DataSetFieldResult
+static UA_DataSetFieldResult
 addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
                 const UA_DataSetFieldConfig *fieldConfig,
                 UA_NodeId *fieldIdentifier) {

From 466b28dae418150810bd86979bbbdc9f1efa9a00 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Jul 2022 09:38:52 +0200
Subject: [PATCH 0349/1963] feat(pubsub): Use PubSub logging macros in
 ua_pubsub_writer.c

---
 src/pubsub/ua_pubsub_writer.c | 147 ++++++++++++++++++----------------
 1 file changed, 77 insertions(+), 70 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 3271998de62..cf054e933cf 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -250,8 +250,8 @@ UA_PublishedDataSet_clear(UA_Server *server, UA_PublishedDataSet *publishedDataS
 
 /* The fieldMetaData variable has to be cleaned up external in case of an error */
 static UA_StatusCode
-generateFieldMetaData(UA_Server *server, UA_DataSetField *field,
-                      UA_FieldMetaData *fieldMetaData) {
+generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
+                      UA_DataSetField *field, UA_FieldMetaData *fieldMetaData) {
     if(field->config.dataSetFieldType != UA_PUBSUB_DATASETFIELD_VARIABLE)
         return UA_STATUSCODE_BADNOTSUPPORTED;
 
@@ -297,9 +297,11 @@ generateFieldMetaData(UA_Server *server, UA_DataSetField *field,
     UA_Variant_init(&value);
     res = readWithReadValue(server, &pp->publishedVariable,
                             UA_ATTRIBUTEID_ARRAYDIMENSIONS, &value);
-    UA_CHECK_STATUS_LOG(res, return res,
-                        WARNING, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "PubSub meta data generation. Reading the array dimensions failed.");
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "PubSub meta data generation: Reading the array dimensions failed");
+        return res;
+    }
 
     if(value.arrayDimensionsSize > 0) {
         fieldMetaData->arrayDimensions = (UA_UInt32 *)
@@ -314,34 +316,39 @@ generateFieldMetaData(UA_Server *server, UA_DataSetField *field,
     /* Set the DataType */
     res = readWithReadValue(server, &pp->publishedVariable,
                             UA_ATTRIBUTEID_DATATYPE, &fieldMetaData->dataType);
-    UA_CHECK_STATUS_LOG(res, return res,
-                        WARNING, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "PubSub meta data generation. Reading the datatype failed.");
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "PubSub meta data generation: Reading the datatype failed");
+        return res;
+    }
 
     if(!UA_NodeId_isNull(&fieldMetaData->dataType)) {
         const UA_DataType *currentDataType =
             UA_findDataTypeWithCustom(&fieldMetaData->dataType,
                                       server->config.customDataTypes);
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "MetaData creation. Found DataType %s.", currentDataType->typeName);
+        UA_LOG_DEBUG_DATASET(&server->config.logger, pds,
+                             "MetaData creation: Found DataType %s",
+                             currentDataType->typeName);
 #endif
         /* Check if the datatype is a builtInType, if yes set the builtinType.
          * TODO: Remove the magic number */
         if(currentDataType->typeKind <= UA_DATATYPEKIND_ENUM)
             fieldMetaData->builtInType = (UA_Byte)currentDataType->typeKind;
     } else {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub meta data generation. DataType is UA_NODEID_NULL.");
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "PubSub meta data generation: DataType is UA_NODEID_NULL");
     }
 
     /* Set the ValueRank */
     UA_Int32 valueRank;
     res = readWithReadValue(server, &pp->publishedVariable,
                             UA_ATTRIBUTEID_VALUERANK, &valueRank);
-    UA_CHECK_STATUS_LOG(res, return res,
-                        WARNING, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "PubSub meta data generation. Reading the value rank failed.");
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "PubSub meta data generation: Reading the value rank failed");
+        return res;
+    }
     fieldMetaData->valueRank = valueRank;
 
     /* PromotedField? */
@@ -379,8 +386,8 @@ addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
     }
 
     if(currDS->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Adding DataSetField failed. PublishedDataSet is frozen.");
+        UA_LOG_WARNING_DATASET(&server->config.logger, currDS,
+                               "Adding DataSetField failed: PublishedDataSet is frozen");
         result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
         return result;
     }
@@ -412,7 +419,7 @@ addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
     /* Initialize the field metadata. Also generates a FieldId */
     UA_FieldMetaData fmd;
     UA_FieldMetaData_init(&fmd);
-    result.result = generateFieldMetaData(server, newField, &fmd);
+    result.result = generateFieldMetaData(server, currDS, newField, &fmd);
     if(result.result != UA_STATUSCODE_GOOD) {
         UA_FieldMetaData_clear(&fmd);
         UA_DataSetFieldConfig_clear(&newField->config);
@@ -487,13 +494,6 @@ removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
         return result;
     }
 
-    if(currentField->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Remove DataSetField failed. DataSetField is frozen.");
-        result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
-        return result;
-    }
-
     UA_PublishedDataSet *pds =
         UA_PublishedDataSet_findPDSbyId(server, currentField->publishedDataSet);
     if(!pds) {
@@ -501,9 +501,16 @@ removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
         return result;
     }
 
+    if(currentField->configurationFrozen) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "Remove DataSetField failed: DataSetField is frozen");
+        result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
+        return result;
+    }
+
     if(pds->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Remove DataSetField failed. PublishedDataSet is frozen.");
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "Remove DataSetField failed: PublishedDataSet is frozen");
         result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
         return result;
     }
@@ -544,12 +551,13 @@ removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
         }
         UA_DataSetField *tmpDSF;
         size_t counter = 0;
-        TAILQ_FOREACH(tmpDSF, &pds->fields, listEntry){
-            result.result = generateFieldMetaData(server, tmpDSF, &fieldMetaData[counter]);
+        TAILQ_FOREACH(tmpDSF, &pds->fields, listEntry) {
+            result.result = generateFieldMetaData(server, pds, tmpDSF, &fieldMetaData[counter]);
             if(result.result != UA_STATUSCODE_GOOD) {
                 UA_FieldMetaData_clear(&fieldMetaData[counter]);
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                               "PubSub MetaData generation failed!");
+                UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                                       "PubSub MetaData regeneration failed "
+                                       "after removing a field!");
                 break;
             }
             counter++;
@@ -693,8 +701,8 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                   "Received unknown PubSub state!");
+                    UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                                          "Received unknown PubSub state!");
             }
             break;
         case UA_PUBSUBSTATE_PAUSED:
@@ -708,8 +716,8 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                   "Received unknown PubSub state!");
+                    UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                                          "Received unknown PubSub state!");
             }
             break;
         case UA_PUBSUBSTATE_OPERATIONAL:
@@ -724,8 +732,8 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                   "Received unknown PubSub state!");
+                    UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                                          "Received unknown PubSub state!");
             }
             break;
         case UA_PUBSUBSTATE_ERROR:
@@ -739,13 +747,13 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                   "Received unknown PubSub state!");
+                    UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                                          "Received unknown PubSub state!");
             }
             break;
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                           "Received unknown PubSub state!");
+            UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                                  "Received unknown PubSub state!");
     }
     if (state != oldState) {
         /* inform application about state change */
@@ -767,21 +775,21 @@ addDataSetWriter(UA_Server *server,
     if(!dataSetWriterConfig)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
+    if(!wg)
+        return UA_STATUSCODE_BADNOTFOUND;
+
     /* Make checks for a heartbeat */
     if(UA_NodeId_isNull(&dataSet) && dataSetWriterConfig->keyFrameCount != 1) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Adding DataSetWriter failed. DataSet can be null only for a heartbeat, "
-                       "in which case KeyFrameCount shall be 1.");
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                   "Adding DataSetWriter failed: DataSet can be null only for "
+                                   "a heartbeat in which case KeyFrameCount shall be 1");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(!wg)
-        return UA_STATUSCODE_BADNOTFOUND;
-
     if(wg->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Adding DataSetWriter failed. WriterGroup is frozen.");
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                   "Adding DataSetWriter failed: WriterGroup is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -792,9 +800,9 @@ addDataSetWriter(UA_Server *server,
         if(!currentDataSetContext)
             return UA_STATUSCODE_BADNOTFOUND;
 
-        if(currentDataSetContext->configurationFrozen){
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "Adding DataSetWriter failed. PublishedDataSet is frozen.");
+        if(currentDataSetContext->configurationFrozen) {
+            UA_LOG_WARNING_DATASET(&server->config.logger, currentDataSetContext,
+                                   "Adding DataSetWriter failed: PublishedDataSet is frozen");
             return UA_STATUSCODE_BADCONFIGURATIONERROR;
         }
 
@@ -802,9 +810,10 @@ addDataSetWriter(UA_Server *server,
             UA_DataSetField *tmpDSF;
             TAILQ_FOREACH(tmpDSF, &currentDataSetContext->fields, listEntry) {
                 if(!tmpDSF->config.field.variable.rtValueSource.rtFieldSourceEnabled &&
-                !tmpDSF->config.field.variable.rtValueSource.rtInformationModelNode) {
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                "Adding DataSetWriter failed. Fields in PDS are not RT capable.");
+                   !tmpDSF->config.field.variable.rtValueSource.rtInformationModelNode) {
+                    UA_LOG_WARNING_DATASET(&server->config.logger, currentDataSetContext,
+                                           "Adding DataSetWriter failed: "
+                                           "Fields in PDS are not RT capable");
                     return UA_STATUSCODE_BADCONFIGURATIONERROR;
                 }
             }
@@ -824,8 +833,8 @@ addDataSetWriter(UA_Server *server,
                                               UA_PUBSUBSTATE_OPERATIONAL,
                                               UA_STATUSCODE_GOOD);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Add DataSetWriter failed. setPubSubState failed.");
+            UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                     "Add DataSetWriter failed: setPubSubState failed");
             UA_free(newDataSetWriter);
             return res;
         }
@@ -890,9 +899,8 @@ UA_Server_addDataSetWriter(UA_Server *server,
                            const UA_DataSetWriterConfig *dataSetWriterConfig,
                            UA_NodeId *writerIdentifier) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res =
-        addDataSetWriter(server, writerGroup, dataSet,
-                         dataSetWriterConfig, writerIdentifier);
+    UA_StatusCode res = addDataSetWriter(server, writerGroup, dataSet,
+                                         dataSetWriterConfig, writerIdentifier);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -904,8 +912,8 @@ UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
 
     /* Frozen? */
     if(linkedWriterGroup->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Remove DataSetWriter failed. WriterGroup is frozen.");
+        UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                              "Remove DataSetWriter failed: WriterGroup is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -931,8 +939,8 @@ removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(dataSetWriter->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Remove DataSetWriter failed. DataSetWriter is frozen.");
+        UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                              "Remove DataSetWriter failed: DataSetWriter is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -1320,8 +1328,8 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
         if(dsm->networkMessageNumber != 0 ||
            dsm->dataSetOffset != 0 ||
            dsm->configuredSize != 0) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "Static DSM configuration not supported. Using defaults");
+            UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                                  "Static DSM configuration not supported, using defaults");
             dsm->networkMessageNumber = 0;
             dsm->dataSetOffset = 0;
             dsm->configuredSize = 0;
@@ -1419,12 +1427,11 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
     /* Set the sequence count. Automatically rolls over to zero */
     dataSetWriter->actualDataSetMessageSequenceCount++;
 
-    if(heartbeat){
+    if(heartbeat) {
         /* Prepare DataSetMessageContent */
         dataSetMessage->header.dataSetMessageValid = true;
         dataSetMessage->header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
-        dataSetMessage->data.keyFrameData.fieldCount = 0; // Heartbeat
-
+        dataSetMessage->data.keyFrameData.fieldCount = 0;
         return UA_STATUSCODE_GOOD;
     }
 

From 3b81e556d90b84b60d6f4614de2852fd9224db25 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 27 Jul 2022 21:16:53 +0200
Subject: [PATCH 0350/1963] fix(pubsub): Fix a typo in the ReaderGroup log
 macro

---
 src/pubsub/ua_pubsub.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 14177f0fcd0..54ae1b8849d 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -528,7 +528,7 @@ UA_ReaderGroup_subscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup)
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
         UA_String idStr = UA_STRING_NULL;                               \
         if(RG)                                                          \
-            UA_NodeId_print(&(RGi)->identifier, &idStr);                \
+            UA_NodeId_print(&(RG)->identifier, &idStr);                 \
         UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_PUBSUB,                   \
                        "ReaderGroup %.*s\t| " MSG "%.0s", (int)idStr.length, \
                        (char*)idStr.data, __VA_ARGS__);                 \

From 05201e8e6ac10df3bac99bf77b7f07e6271c58c9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 27 Jul 2022 21:17:34 +0200
Subject: [PATCH 0351/1963] refactor(pubsub): Use the PubSub logging macros in
 ua_pubsub_reader.c

---
 src/pubsub/ua_pubsub_reader.c | 311 ++++++++++++++++++----------------
 1 file changed, 165 insertions(+), 146 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index a84e8a88cf1..41ef33d8e30 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -115,8 +115,8 @@ UA_DataSetReader_generateDataSetMessage(UA_Server *server,
 
     UA_ExtensionObject *settings = &dataSetReader->config.messageSettings;
     if(settings->content.decoded.type != &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE]) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Only UADP encoding is supported.");
+        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                              "Only UADP encoding is supported");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
@@ -142,8 +142,8 @@ UA_DataSetReader_generateDataSetMessage(UA_Server *server,
     if(dataSetReaderMessageDataType &&
        (dataSetReaderMessageDataType->networkMessageNumber != 0 ||
         dataSetReaderMessageDataType->dataSetOffset != 0)) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Static DSM configuration not supported. Using defaults");
+        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                              "Static DSM configuration not supported, using defaults");
         dataSetReaderMessageDataType->networkMessageNumber = 0;
         dataSetReaderMessageDataType->dataSetOffset = 0;
     }
@@ -330,9 +330,9 @@ checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
                       UA_DataSetReader *reader) {
     if(!msg->groupHeaderEnabled || !msg->groupHeader.writerGroupIdEnabled ||
        !msg->payloadHeaderEnabled) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                    "Cannot process DataSetReader without WriterGroup"
-                    "and DataSetWriter identifiers");
+        UA_LOG_INFO_READER(&server->config.logger, reader,
+                           "Cannot process DataSetReader without WriterGroup"
+                           "and DataSetWriter identifiers");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
@@ -368,8 +368,8 @@ checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
 
     if(reader->config.writerGroupId == msg->groupHeader.writerGroupId &&
        reader->config.dataSetWriterId == *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "DataSetReader found. Process NetworkMessage");
+        UA_LOG_DEBUG_READER(&server->config.logger, reader,
+                            "DataSetReader found, process NetworkMessage");
         return UA_STATUSCODE_GOOD;
     }
 
@@ -388,9 +388,9 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
     if(!dataSetReaderConfig)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    if(readerGroup->configurationFrozen){
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Add DataSetReader failed. Subscriber configuration is frozen.");
+    if(readerGroup->configurationFrozen) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                                   "Add DataSetReader failed, Subscriber configuration is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -406,8 +406,8 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
         retVal = UA_DataSetReader_setPubSubState(server, newDataSetReader, UA_PUBSUBSTATE_OPERATIONAL,
                                                  UA_STATUSCODE_GOOD);
         if(retVal != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "Add DataSetReader failed. setPubSubState failed.");
+            UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
+                                     "Add DataSetReader failed, setPubSubState failed");
             UA_free(newDataSetReader);
             newDataSetReader = 0;
             return retVal;
@@ -421,8 +421,8 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     retVal = addDataSetReaderRepresentation(server, newDataSetReader);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "Add DataSetReader failed. addDataSetReaderRepresentation failed.");
+        UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
+                                 "Add DataSetReader failed, addDataSetReaderRepresentation failed");
         UA_DataSetReaderConfig_clear(&newDataSetReader->config);
         UA_free(newDataSetReader);
         newDataSetReader = 0;
@@ -443,8 +443,9 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
         newDataSetReader,
         UA_DataSetReader_handleMessageReceiveTimeout);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-            "Add DataSetReader failed. Create message receive timeout timer failed.");
+        UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
+                                 "Add DataSetReader failed, create message "
+                                 "receive timeout timer failed");
         UA_DataSetReaderConfig_clear(&newDataSetReader->config);
         UA_free(newDataSetReader);
         newDataSetReader = 0;
@@ -463,16 +464,16 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
                 server, newDataSetReader->config.linkedStandaloneSubscribedDataSetName);
         if(subscribedDataSet != NULL) {
             if(subscribedDataSet->config.subscribedDataSetType != UA_PUBSUB_SDS_TARGET) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                             "Not implemented! Currently only SubscribedDataSet as "
-                             "TargetVariables is implemented");
+                UA_LOG_ERROR_READER(&server->config.logger, newDataSetReader,
+                                    "Not implemented! Currently only SubscribedDataSet as "
+                                    "TargetVariables is implemented");
             } else {
                 if(subscribedDataSet->config.isConnected) {
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                 "SubscribedDataSet is already connected");
+                    UA_LOG_ERROR_READER(&server->config.logger, newDataSetReader,
+                                        "SubscribedDataSet is already connected");
                 } else {
-                    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
-                                "Found SubscribedDataSet");
+                    UA_LOG_DEBUG_READER(&server->config.logger, newDataSetReader,
+                                        "Found SubscribedDataSet");
                     subscribedDataSet->config.isConnected = true;
                     UA_DataSetMetaDataType_copy(
                         &subscribedDataSet->config.dataSetMetaData,
@@ -530,9 +531,9 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(dsr->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Remove DataSetReader failed. "
-                       "Subscriber configuration is frozen.");
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+                              "Remove DataSetReader failed, "
+                              "Subscriber configuration is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -548,10 +549,10 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
             stopMonitoring(server, dsr->identifier, UA_PUBSUB_COMPONENT_DATASETREADER,
                            UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT, dsr);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Remove DataSetReader failed. Stop message "
-                         "receive timeout timer of DataSetReader '%.*s' failed.",
-                         (int) dsr->config.name.length, dsr->config.name.data);
+            UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                                "Remove DataSetReader failed. Stop message "
+                                "receive timeout timer of DataSetReader '%.*s' failed.",
+                                (int) dsr->config.name.length, dsr->config.name.data);
         }
     }
 
@@ -559,10 +560,10 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
         deleteMonitoring(server, dsr->identifier, UA_PUBSUB_COMPONENT_DATASETREADER,
                          UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT, dsr);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Remove DataSetReader failed. Delete message receive "
-                     "timeout timer of DataSetReader '%.*s' failed.",
-                     (int) dsr->config.name.length, dsr->config.name.data);
+        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                            "Remove DataSetReader failed. Delete message receive "
+                            "timeout timer of DataSetReader '%.*s' failed.",
+                            (int) dsr->config.name.length, dsr->config.name.data);
     }
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
 
@@ -583,7 +584,7 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     if(dsr->config.subscribedDataSetType == UA_PUBSUB_SDS_TARGET) {
         UA_TargetVariables_clear(&dsr->config.subscribedDataSet.subscribedDataSetTarget);
     } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR_READER(&server->config.logger, dsr,
                      "UA_DataSetReader_delete(): unsupported subscribed dataset enum type");
     }
 
@@ -613,19 +614,19 @@ UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderI
     if(!currentDataSetReader)
        return UA_STATUSCODE_BADNOTFOUND;
 
-    if(currentDataSetReader->configurationFrozen){
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Update DataSetReader config failed. "
-                       "Subscriber configuration is frozen.");
+    if(currentDataSetReader->configurationFrozen) {
+        UA_LOG_WARNING_READER(&server->config.logger, currentDataSetReader,
+                              "Update DataSetReader config failed. "
+                              "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
     UA_ReaderGroup *currentReaderGroup =
         UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
     if(currentReaderGroup->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Update DataSetReader config failed. "
-                       "Subscriber configuration is frozen.");
+        UA_LOG_WARNING_READER(&server->config.logger, currentDataSetReader,
+                              "Update DataSetReader config failed. "
+                              "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -638,8 +639,8 @@ UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderI
         currentDataSetReader->config.dataSetWriterId = config->dataSetWriterId;
 
     if(currentDataSetReader->config.subscribedDataSetType != UA_PUBSUB_SDS_TARGET) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Unsupported SubscribedDataSetType.");
+        UA_LOG_WARNING_READER(&server->config.logger, currentDataSetReader,
+                              "Unsupported SubscribedDataSetType.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -671,8 +672,8 @@ UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderI
                                      UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT,
                                      currentDataSetReader);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Update DataSetReader message receive timeout timer failed.");
+            UA_LOG_ERROR_READER(&server->config.logger, currentDataSetReader,
+                                "Update DataSetReader message receive timeout timer failed.");
         }
     }
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
@@ -789,10 +790,10 @@ UA_DataSetReader_setState_disabled(UA_Server *server, UA_DataSetReader *dsr) {
             if(ret == UA_STATUSCODE_GOOD) {
                 dsr->msgRcvTimeoutTimerRunning = UA_FALSE;
             } else {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                             "Disable ReaderGroup failed. Stop message receive "
-                             "timeout timer of DataSetReader '%.*s' failed.",
-                             (int) dsr->config.name.length, dsr->config.name.data);
+                UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                                    "Disable ReaderGroup failed. Stop message receive "
+                                    "timeout timer of DataSetReader '%.*s' failed.",
+                                    (int) dsr->config.name.length, dsr->config.name.data);
             }
         }
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
@@ -802,8 +803,8 @@ UA_DataSetReader_setState_disabled(UA_Server *server, UA_DataSetReader *dsr) {
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Received unknown PubSub state!");
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+                              "Received unknown PubSub state!");
     }
     return UA_STATUSCODE_BADINVALIDARGUMENT;
 }
@@ -830,8 +831,8 @@ UA_DataSetReader_setPubSubState(UA_Server *server,
             dataSetReader->state = UA_PUBSUBSTATE_ERROR;
             break;
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "Received unknown PubSub state!");
+            UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                                  "Received unknown PubSub state!");
             ret = UA_STATUSCODE_BADINVALIDARGUMENT;
             break;
     }
@@ -891,8 +892,9 @@ UA_Server_DataSetReader_createTargetVariables(UA_Server *server,
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     if(dataSetReader->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Create Target Variables failed. Subscriber configuration is frozen.");
+        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                              "Create Target Variables failed. "
+                              "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -1004,8 +1006,7 @@ UA_Server_DataSetReader_createDataSetMirror(UA_Server *server, UA_String *parent
 static void
 DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
                          UA_DataSetReader *dsr, UA_DataSetMessage* msg) {
-    UA_LOG_TRACE(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "Received RAW Frame");
+    UA_LOG_TRACE_READER(&server->config.logger, dsr, "Received RAW Frame");
     msg->data.keyFrameData.fieldCount = (UA_UInt16)
         dsr->config.dataSetMetaData.fieldsSize;
 
@@ -1022,9 +1023,9 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
             UA_decodeBinaryInternal(&msg->data.keyFrameData.rawFields,
                                     &offset, value, type, NULL);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "Error during Raw-decode KeyFrame field %u: %s",
-                        (unsigned)i, UA_StatusCode_name(res));
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "Error during Raw-decode KeyFrame field %u: %s",
+                               (unsigned)i, UA_StatusCode_name(res));
             return;
         }
 
@@ -1063,9 +1064,9 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
         res = UA_Server_write(server, &writeVal);
         UA_clear(value, type);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "Error writing KeyFrame field %u: %s",
-                        (unsigned)i, UA_StatusCode_name(res));
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "Error writing KeyFrame field %u: %s",
+                               (unsigned)i, UA_StatusCode_name(res));
         }
     }
 }
@@ -1116,8 +1117,9 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
             msg->header.configVersionMajorVersion != 0 ||
             msg->header.configVersionMinorVersion != 0 ||
             msg->data.keyFrameData.fieldCount != 0) {
-                UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "This DSR expects heartbeat, but the received message doesn't seem to be so.");
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "This DSR expects heartbeat, but the received "
+                               "message doesn't seem to be so.");
         }
 #ifdef UA_ENABLE_PUBSUB_MONITORING
         UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
@@ -1126,13 +1128,13 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
         return;
     }
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "DataSetReader '%.*s': received a network message",
-                 (int) dsr->config.name.length, dsr->config.name.data);
+    UA_LOG_DEBUG_READER(&server->config.logger, dsr,
+                        "DataSetReader '%.*s': received a network message",
+                        (int)dsr->config.name.length, dsr->config.name.data);
 
     if(!msg->header.dataSetMessageValid) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                    "DataSetMessage is discarded: message is not valid");
+        UA_LOG_INFO_READER(&server->config.logger, dsr,
+                           "DataSetMessage is discarded: message is not valid");
         /* To Do check ConfigurationVersion */
         /* if(msg->header.configVersionMajorVersionEnabled) {
          *     if(msg->header.configVersionMajorVersion !=
@@ -1147,7 +1149,7 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
     }
 
     if(msg->header.dataSetMessageType != UA_DATASETMESSAGE_DATAKEYFRAME) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
                        "DataSetMessage is discarded: Only keyframes are supported");
         return;
     }
@@ -1196,9 +1198,9 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
         writeVal.value = msg->data.keyFrameData.dataSetFields[i];
         res = UA_Server_write(server, &writeVal);
         if(res != UA_STATUSCODE_GOOD)
-            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "Error writing KeyFrame field %u: %s",
-                        (unsigned)i, UA_StatusCode_name(res));
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "Error writing KeyFrame field %u: %s",
+                               (unsigned)i, UA_StatusCode_name(res));
     }
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
@@ -1230,9 +1232,9 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
         if(res == UA_STATUSCODE_GOOD) {
             dsr->msgRcvTimeoutTimerRunning = false;
         } else {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "DataSetReader '%.*s': stop receive timeout timer failed",
-                         (int)dsr->config.name.length, dsr->config.name.data);
+            UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                                "DataSetReader '%.*s': stop receive timeout timer failed",
+                                (int)dsr->config.name.length, dsr->config.name.data);
             UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
                                             UA_STATUSCODE_BADINTERNALERROR);
         }
@@ -1243,13 +1245,13 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
         startMonitoring(server, dsr->identifier, UA_PUBSUB_COMPONENT_DATASETREADER,
                         UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT, dsr);
     if(res == UA_STATUSCODE_GOOD) {
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Info: DataSetReader '%.*s': start receive timeout timer",
-                     (int)dsr->config.name.length, dsr->config.name.data);
+        UA_LOG_DEBUG_READER(&server->config.logger, dsr,
+                            "Info: DataSetReader '%.*s': start receive timeout timer",
+                            (int)dsr->config.name.length, dsr->config.name.data);
         dsr->msgRcvTimeoutTimerRunning = true;
     } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Starting Message Receive Timeout timer failed.");
+        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                            "Starting Message Receive Timeout timer failed.");
         UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
                                         UA_STATUSCODE_BADINTERNALERROR);
     }
@@ -1258,37 +1260,36 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
 /* Timeout callback for DataSetReader MessageReceiveTimeout handling */
 void
 UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server,
-                                             void *dataSetReader) {
-    if(!server || !dataSetReader) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "UA_DataSetReader_handleMessageReceiveTimeout(): "
-                     "null pointer param");
+                                             void *dsr) {
+    if(!server || !dsr) {
+        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                            "UA_DataSetReader_handleMessageReceiveTimeout(): "
+                            "null pointer param");
         return;
     }
 
-    UA_DataSetReader *dsr = (UA_DataSetReader*) dataSetReader;
     if(dsr->componentType != UA_PUBSUB_COMPONENT_DATASETREADER) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "UA_DataSetReader_handleMessageReceiveTimeout(): "
-                     "input param is not of type DataSetReader");
+        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                            "UA_DataSetReader_handleMessageReceiveTimeout(): "
+                            "input param is not of type DataSetReader");
         return;
     }
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "UA_DataSetReader_handleMessageReceiveTimeout(): "
-                 "MessageReceiveTimeout occurred at DataSetReader "
-                 "'%.*s': MessageReceiveTimeout = %f Timer Id = %u ",
-                 (int)dsr->config.name.length, dsr->config.name.data,
-                 dsr->config.messageReceiveTimeout,
-                 (UA_UInt32) dsr->msgRcvTimeoutTimerId);
-
+    UA_LOG_DEBUG_READER(&server->config.logger, dsr,
+                        "UA_DataSetReader_handleMessageReceiveTimeout(): "
+                        "MessageReceiveTimeout occurred at DataSetReader "
+                        "'%.*s': MessageReceiveTimeout = %f Timer Id = %u ",
+                        (int)dsr->config.name.length, dsr->config.name.data,
+                        dsr->config.messageReceiveTimeout,
+                        (UA_UInt32) dsr->msgRcvTimeoutTimerId);
+    
     UA_StatusCode res =
         UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
                                         UA_STATUSCODE_BADTIMEOUT);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "UA_DataSetReader_handleMessageReceiveTimeout(): "
-                     "setting pubsub state failed");
+        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                            "UA_DataSetReader_handleMessageReceiveTimeout(): "
+                            "setting pubsub state failed");
     }
 }
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
@@ -1300,8 +1301,8 @@ processMessageWithReader(UA_Server *server, UA_ReaderGroup *readerGroup,
     if(msg->payloadHeaderEnabled)
         totalDataSets = msg->payloadHeader.dataSetPayloadHeader.count;
     for(UA_Byte i = 0; i < totalDataSets; i++) {
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Process Msg with DataSetReader!");
+        UA_LOG_DEBUG_READER(&server->config.logger, reader,
+                            "Process Msg with DataSetReader!");
         UA_DataSetReader_process(server, readerGroup, reader,
                                  &msg->payload.dataSetPayload.dataSetMessages[i]);
     }
@@ -1319,8 +1320,8 @@ processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
      * Here some filtering is possible */
 
     if(!msg->publisherIdEnabled) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                    "Cannot process DataSetReader without PublisherId");
+        UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
+                               "Cannot process DataSetReader without PublisherId");
         return UA_STATUSCODE_BADNOTIMPLEMENTED; /* TODO: Handle DSR without PublisherId */
     }
 
@@ -1339,9 +1340,9 @@ processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
     }
 
     if(!processed) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                    "Dataset reader not found. Check PublisherID, WriterGroupID "
-                    "and DatasetWriterID");
+        UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
+                               "Dataset reader not found. Check PublisherID, "
+                               "WriterGroupID and DatasetWriterID");
     }
 
     return UA_STATUSCODE_GOOD;
@@ -1384,9 +1385,11 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
 #endif
 
     UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buffer, pos, nm);
-    UA_CHECK_STATUS_ERROR(rv, return rv,
-                          &server->config.logger, UA_LOGCATEGORY_SERVER,
-                          "PubSub receive. decoding headers failed");
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                                  "PubSub receive. decoding headers failed");
+        return rv;
+    }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_Boolean processed = false;
@@ -1402,9 +1405,12 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
                 processed = true;
                 rv = verifyAndDecryptNetworkMessage(&server->config.logger, buffer, pos,
                                                     nm, readerGroup);
-                UA_CHECK_STATUS_WARN(rv, return rv,
-                                     &server->config.logger, UA_LOGCATEGORY_SERVER,
-                                     "Subscribe failed. verify and decrypt network message failed.");
+                if(rv != UA_STATUSCODE_GOOD) {
+                    UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                                              "Subscribe failed, verify and decrypt "
+                                              "network message failed.");
+                    return rv;
+                }
 
 #ifdef UA_DEBUG_DUMP_PKGS
                 UA_dump_hex_pkg(buffer->data, buffer->length);
@@ -1417,9 +1423,9 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
 
 loops_exit:
     if(!processed) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                    "Dataset reader not found. Check PublisherId, "
-                    "WriterGroupId and DatasetWriterId");
+        UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
+                               "Dataset reader not found. Check PublisherId, "
+                               "WriterGroupId and DatasetWriterId");
         /* Possible multicast scenario: there are multiple connections (with one
          * or more ReaderGroups) within a multicast group every connection
          * receives all network messages, even if some of them are not meant for
@@ -1449,12 +1455,17 @@ decodeAndProcessNetworkMessage(UA_Server *server, UA_PubSubConnection *connectio
     size_t currentPosition = 0;
     UA_StatusCode rv = decodeNetworkMessage(server, buf, &currentPosition,
                                             &nm, connection);
-    UA_CHECK_STATUS_WARN(rv, goto cleanup, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Verify, decrypt and decode network message failed.");
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                                  "Verify, decrypt and decode network message failed.");
+        goto cleanup;
+    }
 
     rv = processNetworkMessage(server, connection, &nm);
-    UA_CHECK_STATUS_WARN(rv, (void)0, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Processing the network message failed.");
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                                  "Processing the network message failed.");
+    }
 
 cleanup:
     UA_NetworkMessage_clear(&nm);
@@ -1470,6 +1481,7 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
 
     /* Considering max DSM as 1
     * TODO: Process with the static value source */
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
     size_t currentPosition = 0;
     UA_DataSetReader *dataSetReader = LIST_FIRST(&readerGroup->readers);
     UA_NetworkMessage *nm = dataSetReader->bufferedMessage.nm;
@@ -1479,34 +1491,39 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
     memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
 
     size_t payLoadPosition = 0;
-    UA_StatusCode rv =
-        UA_NetworkMessage_decodeHeaders(buf, &payLoadPosition, &currentNetworkMessage);
-    UA_CHECK_STATUS_ERROR(rv, return rv, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                          "PubSub receive. decoding headers failed");
+    rv = UA_NetworkMessage_decodeHeaders(buf, &payLoadPosition, &currentNetworkMessage);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                           "PubSub receive. decoding headers failed");
+        return rv;
+    }
 
     rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &payLoadPosition,
                                         &currentNetworkMessage, readerGroup);
-    UA_CHECK_STATUS_WARN(rv, return rv, &server->config.logger, UA_LOGCATEGORY_SERVER,
-                         "Subscribe failed. verify and decrypt network message failed.");
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                              "Subscribe failed. verify and decrypt network message failed.");
+        return rv;
+    }
     UA_NetworkMessage_clear(&currentNetworkMessage);
 #endif
 
     /* Decode only the necessary offset and update the networkMessage */
-    UA_StatusCode res =
-        UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage,
-                                                  buf, &currentPosition);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                    "PubSub receive. Unknown field type.");
-        res = UA_STATUSCODE_UNCERTAIN;
+    rv = UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage,
+                                                   buf, &currentPosition);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO_READER(&server->config.logger, dataSetReader,
+                           "PubSub receive. Unknown field type.");
+        rv = UA_STATUSCODE_UNCERTAIN;
         goto cleanup;
     }
 
     /* Check the decoded message is the expected one */
-    if (checkReaderIdentifier(server, nm, dataSetReader) != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                    "PubSub receive. Unknown message received. Will not be processed.");
-        res = UA_STATUSCODE_UNCERTAIN;
+    rv = checkReaderIdentifier(server, nm, dataSetReader);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO_READER(&server->config.logger, dataSetReader,
+                           "PubSub receive. Unknown message received. Will not be processed.");
+        rv = UA_STATUSCODE_UNCERTAIN;
         goto cleanup;
     }
 
@@ -1518,7 +1535,7 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
 #ifdef UA_ENABLE_PUBSUB_BUFMALLOC
     useNormalAlloc();
 #endif
-    return res;
+    return rv;
 }
 
 typedef struct {
@@ -1562,9 +1579,11 @@ receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
                                      readerGroup->config.timeout);
 
     // TODO attention: here rv is ok if UA_STATUSCODE_GOOD != rv
-    UA_CHECK_WARN(!UA_StatusCode_isBad(rv), return rv,
-                  &server->config.logger, UA_LOGCATEGORY_SERVER,
-                  "SubscribeCallback(): Connection receive failed!");
+    if(!UA_StatusCode_isBad(rv)) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                              "SubscribeCallback(): Connection receive failed!");
+        return rv;
+    }
 
     return UA_STATUSCODE_GOOD;
 }

From 2bac7fc59b4523673c41484dbc185841d934be85 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 27 Jul 2022 22:22:25 +0200
Subject: [PATCH 0352/1963] refactor(pubsub): Make monitoring callbacks static
 functions

---
 src/pubsub/ua_pubsub.h        | 13 -------------
 src/pubsub/ua_pubsub_reader.c | 24 ++++++++++++++----------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 54ae1b8849d..7b8539e8a97 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -401,19 +401,6 @@ UA_DataSetReader_setPubSubState(UA_Server *server,
                                 UA_PubSubState state,
                                 UA_StatusCode cause);
 
-#ifdef UA_ENABLE_PUBSUB_MONITORING
-/* Check if DataSetReader has a message receive timeout */
-void
-UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
-                                            UA_DataSetReader *dataSetReader);
-
-/* DataSetReader MessageReceiveTimeout callback for generic PubSub component
- * timeout handling */
-void
-UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server,
-                                             void *dataSetReader);
-#endif /* UA_ENABLE_PUBSUB_MONITORING */
-
 UA_StatusCode
 UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
                                         UA_ReaderGroup *readerGroup,
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 41ef33d8e30..73c10931795 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -30,6 +30,14 @@
 #include "ua_pubsub_bufmalloc.h"
 #endif
 
+#ifdef UA_ENABLE_PUBSUB_MONITORING
+static void
+UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server, UA_DataSetReader *dsr);
+
+static void
+UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader *dsr);
+#endif
+
 /* This functionality of this API will be used in future to create mirror Variables - TODO */
 /* #define UA_MAX_SIZENAME           64 */ /* Max size of Qualified Name of Subscribed Variable */
 
@@ -441,6 +449,7 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
         UA_PUBSUB_COMPONENT_DATASETREADER,
         UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT,
         newDataSetReader,
+        (void (*)(UA_Server *, void *))
         UA_DataSetReader_handleMessageReceiveTimeout);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
@@ -1210,7 +1219,7 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
 
-void
+static void
 UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
                                             UA_DataSetReader *dsr) {
     UA_assert(server != 0);
@@ -1258,15 +1267,10 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
 }
 
 /* Timeout callback for DataSetReader MessageReceiveTimeout handling */
-void
-UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server,
-                                             void *dsr) {
-    if(!server || !dsr) {
-        UA_LOG_ERROR_READER(&server->config.logger, dsr,
-                            "UA_DataSetReader_handleMessageReceiveTimeout(): "
-                            "null pointer param");
-        return;
-    }
+static void
+UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader *dsr) {
+    UA_assert(server);
+    UA_assert(dsr);
 
     if(dsr->componentType != UA_PUBSUB_COMPONENT_DATASETREADER) {
         UA_LOG_ERROR_READER(&server->config.logger, dsr,

From 5acad05b241b3b81fecce6fd99a8bece437a64f8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 28 Jul 2022 12:49:51 +0200
Subject: [PATCH 0353/1963] refactor(pubsub): Use the PubSub logging macros in
 ua_pubsub_readergroup.c

---
 src/pubsub/ua_pubsub_readergroup.c | 115 ++++++++++++++---------------
 1 file changed, 55 insertions(+), 60 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 248df80bba7..8b4770fe106 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -97,23 +97,24 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
     if(!readerGroupConfig)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    if(!readerGroupConfig->pubsubManagerCallback.addCustomCallback &&
-       readerGroupConfig->enableBlockingSocket) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Adding ReaderGroup failed, blocking socket functionality "
-                       "only supported in customcallback");
-        return UA_STATUSCODE_BADNOTSUPPORTED;
-    }
-
     /* Search the connection by the given connectionIdentifier */
     UA_PubSubConnection *currentConnectionContext =
         UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
     if(!currentConnectionContext)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    if(currentConnectionContext->configurationFrozen){
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Adding ReaderGroup failed. Subscriber configuration is frozen.");
+    if(!readerGroupConfig->pubsubManagerCallback.addCustomCallback &&
+       readerGroupConfig->enableBlockingSocket) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, currentConnectionContext,
+                                  "Adding ReaderGroup failed, blocking socket functionality "
+                                  "only supported in customcallback");
+        return UA_STATUSCODE_BADNOTSUPPORTED;
+    }
+
+    if(currentConnectionContext->configurationFrozen) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, currentConnectionContext,
+                                  "Adding ReaderGroup failed. "
+                                  "Connection configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -170,8 +171,9 @@ removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(readerGroup->configurationFrozen){
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Remove ReaderGroup failed. Subscriber configuration is frozen.");
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                                   "Remove ReaderGroup failed. "
+                                   "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
@@ -296,8 +298,8 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Unknown PubSub state!");
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+                                   "Unknown PubSub state!");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_GOOD;
@@ -307,8 +309,8 @@ static UA_StatusCode
 UA_ReaderGroup_setPubSubState_paused(UA_Server *server,
                                      UA_ReaderGroup *rg,
                                      UA_StatusCode cause) {
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "PubSub state paused is unsupported at the moment!");
+    UA_LOG_DEBUG_READERGROUP(&server->config.logger, rg,
+                             "PubSub state paused is unsupported at the moment!");
     (void)cause;
     switch(rg->state) {
     case UA_PUBSUBSTATE_DISABLED:
@@ -320,8 +322,7 @@ UA_ReaderGroup_setPubSubState_paused(UA_Server *server,
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Unknown PubSub state!");
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg, "Unknown PubSub state!");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -348,8 +349,7 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Unknown PubSub state!");
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg, "Unknown PubSub state!");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -375,8 +375,7 @@ UA_ReaderGroup_setPubSubState_error(UA_Server *server,
     case UA_PUBSUBSTATE_ERROR:
         return UA_STATUSCODE_GOOD;
     default:
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Unknown PubSub state!");
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg, "Unknown PubSub state!");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     rg->state = UA_PUBSUBSTATE_ERROR;
@@ -404,8 +403,8 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
             ret = UA_ReaderGroup_setPubSubState_error(server, readerGroup, cause);
             break;
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "Received unknown PubSub state!");
+            UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                                       "Received unknown PubSub state!");
             break;
     }
     if (state != oldState) {
@@ -447,9 +446,11 @@ UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId reader
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
     UA_CHECK_MEM(rg, return UA_STATUSCODE_BADNOTFOUND);
 
-    UA_CHECK_MEM_WARN(rg->config.securityPolicy, return UA_STATUSCODE_BADINTERNALERROR,
-                      &server->config.logger, UA_LOGCATEGORY_SERVER,
-                      "No SecurityPolicy configured for the ReaderGroup");
+    if(!rg->config.securityPolicy) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+                                   "No SecurityPolicy configured for the ReaderGroup");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     if(securityTokenId != rg->securityTokenId) {
         rg->securityTokenId = securityTokenId;
@@ -511,9 +512,9 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
         return UA_STATUSCODE_GOOD;
 
     if(dsrCount > 1) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Mutiple DSR in a readerGroup not supported in RT "
-                       "fixed size configuration");
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+                                   "Mutiple DSR in a readerGroup not supported in RT "
+                                   "fixed size configuration");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
@@ -522,8 +523,8 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
     /* Support only to UADP encoding */
     if(dataSetReader->config.messageSettings.content.decoded.type !=
        &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE]) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub-RT configuration fail: Non-RT capable encoding.");
+        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                              "PubSub-RT configuration fail: Non-RT capable encoding.");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
@@ -535,9 +536,9 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
             UA_NODESTORE_GET(server, &tv->targetVariable.targetNodeId);
         if(rtNode != NULL &&
            rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "PubSub-RT configuration fail: PDS contains field "
-                           "without external data source.");
+            UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                                  "PubSub-RT configuration fail: PDS contains field "
+                                  "without external data source.");
             UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
             return UA_STATUSCODE_BADNOTSUPPORTED;
         }
@@ -548,32 +549,29 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
         if((UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_STRING].typeId) ||
             UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
            field->maxStringLength == 0) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "PubSub-RT configuration fail: "
-                           "PDS contains String/ByteString with dynamic length.");
+            UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                                  "PubSub-RT configuration fail: "
+                                  "PDS contains String/ByteString with dynamic length.");
             return UA_STATUSCODE_BADNOTSUPPORTED;
         } else if(!UA_DataType_isNumeric(UA_findDataType(&field->dataType)) &&
                   !UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "PubSub-RT configuration fail: "
-                           "PDS contains variable with dynamic size.");
+            UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                                  "PubSub-RT configuration fail: "
+                                  "PDS contains variable with dynamic size.");
             return UA_STATUSCODE_BADNOTSUPPORTED;
         }
     }
 
     UA_DataSetMessage *dsm = (UA_DataSetMessage*)
         UA_calloc(1, sizeof(UA_DataSetMessage));
-    if(!dsm) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub RT Offset calculation: DSM creation failed");
+    if(!dsm)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
 
     /* Generate the DSM */
     UA_StatusCode res = UA_DataSetReader_generateDataSetMessage(server, dsm, dataSetReader);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub RT Offset calculation: DataSetMessage generation failed");
+        UA_LOG_ERROR_READER(&server->config.logger, dataSetReader,
+                            "PubSub RT Offset calculation: DataSetMessage generation failed");
         UA_DataSetMessage_clear(dsm);
         UA_free(dsm);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -582,8 +580,6 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
     /* Generate data set messages - Considering 1 DSM as max */
     UA_UInt16 *dsWriterIds = (UA_UInt16 *)UA_calloc(1, sizeof(UA_UInt16));
     if(!dsWriterIds) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub RT Offset calculation: DataSetWriterId creation failed");
         UA_DataSetMessage_clear(dsm);
         UA_free(dsm);
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -596,8 +592,6 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
         UA_free(dsWriterIds);
         UA_DataSetMessage_clear(dsm);
         UA_free(dsm);
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub RT Offset calculation: Network message creation failed");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -610,8 +604,9 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
         UA_free(dsWriterIds);
         UA_DataSetMessage_clear(dsm);
         UA_free(dsm);
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub RT Offset calculation: NetworkMessage generation failed");
+        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                              "PubSub RT Offset calculation: "
+                              "NetworkMessage generation failed");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -665,13 +660,13 @@ UA_ReaderGroup_subscribeCallback(UA_Server *server,
     UA_assert(server);
     UA_assert(readerGroup);
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "PubSub subscribe callback");
+    UA_LOG_DEBUG_READERGROUP(&server->config.logger, readerGroup,
+                             "PubSub subscribe callback");
 
     UA_PubSubConnection *connection =
         UA_PubSubConnection_findConnectionbyId(server, readerGroup->linkedConnection);
     if(!connection) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
                      "SubscribeCallback(): Find linked connection failed");
         UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_ERROR,
                                       UA_STATUSCODE_BADCONNECTIONCLOSED);
@@ -697,9 +692,9 @@ UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGro
                &readerGroup->subscribeCallbackId);
     else {
         if(readerGroup->config.enableBlockingSocket == UA_TRUE) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "addSubscribeCallback() failed, blocking socket "
-                           "functionality only supported in customcallback");
+            UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                                       "addSubscribeCallback() failed, blocking socket "
+                                       "functionality only supported in customcallback");
             return UA_STATUSCODE_BADNOTSUPPORTED;
         }
 

From fc1f7e7953ec1f048b0ad4d3597f87bee0c1ecbb Mon Sep 17 00:00:00 2001
From: Sebastien Schutz <s.schutz@vega.com>
Date: Thu, 28 Jul 2022 09:26:24 +0200
Subject: [PATCH 0354/1963] fix(server): fix to compile server without pubsub
 sources when pubsub is disabled

---
 src/server/ua_server.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index ad78d8ffc57..cf14a1cdaf5 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -25,7 +25,9 @@
 #include "ua_pubsub_ns0.h"
 #endif
 
+#ifdef UA_ENABLE_PUBSUB
 #include "ua_pubsub_manager.h"
+#endif
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
 #include "ua_subscription.h"

From 86c56fd5ecdd1fb788e8bf18b03f308764a6917f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 30 Jul 2022 17:14:48 +0200
Subject: [PATCH 0355/1963] refactor(server): Cosmetic improvements in
 ua_discovery_manager.h

---
 src/server/ua_discovery_manager.h | 52 +++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index e0f48c0f1c8..620815b201c 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -85,7 +85,8 @@ typedef struct {
     UA_SOCKET mdnsSocket;
     UA_Boolean mdnsMainSrvAdded;
 
-    /* Full Domain Name of server itself. Used to detect if received mDNS message was from itself */
+    /* Full Domain Name of server itself. Used to detect if received mDNS
+     * message was from itself */
     UA_String selfFqdnMdnsRecord;
 
     LIST_HEAD(, serverOnNetwork_list_entry) serverOnNetwork;
@@ -97,7 +98,7 @@ typedef struct {
     struct serverOnNetwork_hash_entry* serverOnNetworkHash[SERVER_ON_NETWORK_HASH_SIZE];
 
     UA_Server_serverOnNetworkCallback serverOnNetworkCallback;
-    void* serverOnNetworkCallbackData;
+    void *serverOnNetworkCallbackData;
 
 #if UA_MULTITHREADING >= 100
     pthread_t mdnsThread;
@@ -115,14 +116,14 @@ void UA_Discovery_cleanupTimedOut(UA_Server *server, UA_DateTime nowMonotonic);
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
 
-/**
- * Sends out a new mDNS package for the given server data.
- * This Method is normally called when another server calls the RegisterServer Service on this server.
- * Then this server is responsible to send out a new mDNS package to announce it.
+/* Sends out a new mDNS package for the given server data. This Method is
+ * normally called when another server calls the RegisterServer Service on this
+ * server. Then this server is responsible to send out a new mDNS package to
+ * announce it.
  *
- * Additionally this method also adds the given server to the internal serversOnNetwork list so that
- * a client finds it when calling FindServersOnNetwork.
- */
+ * Additionally this method also adds the given server to the internal
+ * serversOnNetwork list so that a client finds it when calling
+ * FindServersOnNetwork. */
 void
 UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverName,
                                     const UA_MdnsDiscoveryConfiguration *mdnsConfig,
@@ -153,7 +154,7 @@ iterateMulticastDiscoveryServer(UA_Server* server, UA_DateTime *nextRepeat,
                                 UA_Boolean processIn);
 
 typedef enum {
-    UA_DISCOVERY_TCP,     /* OPC UA TCP mapping */
+    UA_DISCOVERY_TCP,    /* OPC UA TCP mapping */
     UA_DISCOVERY_TLS     /* OPC UA HTTPS mapping */
 } UA_DiscoveryProtocol;
 
@@ -161,12 +162,12 @@ typedef enum {
 UA_StatusCode
 UA_Discovery_multicastQuery(UA_Server* server);
 
-/**
- * Create a mDNS Record for the given server info and adds it to the mDNS output queue.
+/* Create a mDNS Record for the given server info and adds it to the mDNS output
+ * queue.
  *
- * Additionally this method also adds the given server to the internal serversOnNetwork list so that
- * a client finds it when calling FindServersOnNetwork.
- */
+ * Additionally this method also adds the given server to the internal
+ * serversOnNetwork list so that a client finds it when calling
+ * FindServersOnNetwork. */
 UA_StatusCode
 UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
                        const UA_String *hostname, UA_UInt16 port,
@@ -177,25 +178,24 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
 
 
 UA_StatusCode
-UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord, const char *serverName,
-                                               size_t serverNameLen, struct serverOnNetwork_list_entry **addedEntry);
+UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord,
+                                               const char *serverName, size_t serverNameLen,
+                                               struct serverOnNetwork_list_entry **addedEntry);
 
-/**
- * Create a mDNS Record for the given server info with TTL=0 and adds it to the mDNS output queue.
+/* Create a mDNS Record for the given server info with TTL=0 and adds it to the
+ * mDNS output queue.
  *
- * Additionally this method also removes the given server from the internal serversOnNetwork list so that
- * a client gets the updated data when calling FindServersOnNetwork.
- */
+ * Additionally this method also removes the given server from the internal
+ * serversOnNetwork list so that a client gets the updated data when calling
+ * FindServersOnNetwork. */
 UA_StatusCode
 UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
                           const UA_String *hostname, UA_UInt16 port,
                           UA_Boolean removeTxt);
 
-
 UA_StatusCode
-UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord, const char *serverName,
-                                                    size_t serverNameLen);
-
+UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord,
+                                                    const char *serverName, size_t serverNameLen);
 
 #endif /* UA_ENABLE_DISCOVERY_MULTICAST */
 

From 8817a1474f2a61569724174a0a7cd71d902b7e7c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 30 Jul 2022 17:43:08 +0200
Subject: [PATCH 0356/1963] feat(core): Add log category for discovery

---
 include/open62541/plugin/log.h | 5 +++--
 plugins/ua_log_stdout.c        | 4 ++--
 plugins/ua_log_syslog.c        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/open62541/plugin/log.h b/include/open62541/plugin/log.h
index 4a4c9e07a43..b21a59ef010 100644
--- a/include/open62541/plugin/log.h
+++ b/include/open62541/plugin/log.h
@@ -37,7 +37,7 @@ typedef enum {
     UA_LOGLEVEL_FATAL   = 600
 } UA_LogLevel;
 
-#define UA_LOGCATEGORIES 9
+#define UA_LOGCATEGORIES 10
 
 typedef enum {
     UA_LOGCATEGORY_NETWORK = 0,
@@ -48,7 +48,8 @@ typedef enum {
     UA_LOGCATEGORY_USERLAND,
     UA_LOGCATEGORY_SECURITYPOLICY,
     UA_LOGCATEGORY_EVENTLOOP,
-    UA_LOGCATEGORY_PUBSUB
+    UA_LOGCATEGORY_PUBSUB,
+    UA_LOGCATEGORY_DISCOVERY
 } UA_LogCategory;
 
 typedef struct {
diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index 3aad54a5400..176a51d3664 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -37,8 +37,8 @@ const char *logLevelNames[6] = {"trace", "debug",
                                 ANSI_COLOR_RED "error",
                                 ANSI_COLOR_MAGENTA "fatal"};
 const char *logCategoryNames[UA_LOGCATEGORIES] =
-    {"network", "channel", "session", "server",
-     "client", "userland", "securitypolicy", "eventloop", "pubsub"};
+    {"network", "channel", "session", "server", "client",
+     "userland", "securitypolicy", "eventloop", "pubsub", "discovery"};
 
 typedef struct {
     UA_LogLevel minlevel;
diff --git a/plugins/ua_log_syslog.c b/plugins/ua_log_syslog.c
index 3f1dcdbc3d6..a3d2391ec3c 100644
--- a/plugins/ua_log_syslog.c
+++ b/plugins/ua_log_syslog.c
@@ -14,8 +14,8 @@
 const char *syslogLevelNames[6] = {"trace", "debug", "info",
                                    "warn", "error", "fatal"};
 const char *syslogCategoryNames[UA_LOGCATEGORIES] =
-    {"network", "channel", "session", "server",
-     "client", "userland", "securitypolicy", "eventloop", "pubsub"};
+    {"network", "channel", "session", "server", "client",
+     "userland", "securitypolicy", "eventloop", "pubsub", "discovery"};
 
 #ifdef __clang__
 __attribute__((__format__(__printf__, 4 , 0)))

From 432a22c8b42c81a26f8e8bff61a106c14041978d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 30 Jul 2022 17:43:48 +0200
Subject: [PATCH 0357/1963] refactor(server): Use the new discovery log
 category

---
 src/server/ua_discovery_manager.c            | 42 ++++++++++++-------
 src/server/ua_services_discovery_multicast.c | 44 ++++++++++----------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index 89393d8ddfe..332a6315c57 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -24,7 +24,6 @@
 /* Create multicast 224.0.0.251:5353 socket */
 static UA_SOCKET
 discovery_createMulticastSocket(UA_Server* server) {
-    UA_SOCKET s;
     int flag = 1, ittl = 255;
     struct sockaddr_in in;
     struct ip_mreq mc;
@@ -36,7 +35,8 @@ discovery_createMulticastSocket(UA_Server* server) {
     in.sin_port = htons(5353);
     in.sin_addr.s_addr = 0;
 
-    if((s = UA_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == UA_INVALID_SOCKET)
+    UA_SOCKET s = UA_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if(s == UA_INVALID_SOCKET)
         return UA_INVALID_SOCKET;
 
 #ifdef SO_REUSEPORT
@@ -52,8 +52,9 @@ discovery_createMulticastSocket(UA_Server* server) {
     size_t length = server->config.mdnsInterfaceIP.length;
     if(length > 0){
         char* interfaceName = (char*)UA_malloc(length+1);
-        if (!interfaceName) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_NETWORK, "Multicast DNS: cannot alloc memory for iface name");
+        if(!interfaceName) {
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                         "Multicast DNS: cannot alloc memory for iface name");
             return 0;
         }
         struct in_addr ina;
@@ -63,23 +64,30 @@ discovery_createMulticastSocket(UA_Server* server) {
         inet_pton(AF_INET, interfaceName, &ina);
         UA_free(interfaceName);
         /* Set interface for outbound multicast */
-        if (setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&ina, sizeof(ina)) < 0)
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Multicast DNS: failed setting IP_MULTICAST_IF to %s: %s", inet_ntoa(ina), strerror(errno));
+        if(setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&ina, sizeof(ina)) < 0)
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                         "Multicast DNS: failed setting IP_MULTICAST_IF to %s: %s",
+                         inet_ntoa(ina), strerror(errno));
     }
 
     /* Check outbound multicast interface parameters */
     struct in_addr interface_addr;
     socklen_t addr_size = sizeof(struct in_addr);
-    if (getsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&interface_addr, &addr_size) <  0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_NETWORK, "Multicast DNS: getsockopt(IP_MULTICAST_IF) failed");
+    if(getsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&interface_addr, &addr_size) <  0) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                     "Multicast DNS: getsockopt(IP_MULTICAST_IF) failed");
     }
 
     if(IN_ZERONET(ntohl(interface_addr.s_addr))){
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_NETWORK, "Multicast DNS: outbound interface 0.0.0.0, it means that the first OS interface is used (you can explicitly set the interface by using 'discovery.mdnsInterfaceIP' config parameter)");
-    }else{
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                       "Multicast DNS: outbound interface 0.0.0.0, it means that "
+                       "the first OS interface is used (you can explicitly set the "
+                       "interface by using 'discovery.mdnsInterfaceIP' config parameter)");
+    } else {
         char buf[16];
         inet_ntop(AF_INET, &interface_addr, buf, 16);
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_NETWORK, "Multicast DNS: outbound interface is %s", buf);
+        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                    "Multicast DNS: outbound interface is %s", buf);
     }
 
     mc.imr_multiaddr.s_addr = inet_addr("224.0.0.251");
@@ -97,10 +105,12 @@ initMulticastDiscoveryServer(UA_DiscoveryManager *dm, UA_Server* server) {
     server->discoveryManager.mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
     UA_initialize_architecture_network();
 
-    if((server->discoveryManager.mdnsSocket = discovery_createMulticastSocket(server)) == UA_INVALID_SOCKET) {
+    server->discoveryManager.mdnsSocket = discovery_createMulticastSocket(server);
+    if(server->discoveryManager.mdnsSocket == UA_INVALID_SOCKET) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Could not create multicast socket. Error: %d - %s", errno, errno_str));
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                             "Could not create multicast socket. Error: %d - %s",
+                             errno, errno_str));
         return UA_STATUSCODE_BADUNEXPECTEDERROR;
     }
     mdnsd_register_receive_callback(server->discoveryManager.mdnsDaemon,
@@ -110,7 +120,7 @@ initMulticastDiscoveryServer(UA_DiscoveryManager *dm, UA_Server* server) {
 
 static void
 destroyMulticastDiscoveryServer(UA_DiscoveryManager *dm) {
-    if (!dm->mdnsDaemon)
+    if(!dm->mdnsDaemon)
         return;
 
     mdnsd_shutdown(dm->mdnsDaemon);
@@ -163,7 +173,7 @@ UA_DiscoveryManager_clear(UA_DiscoveryManager *dm, UA_Server *server) {
     periodicServerRegisterCallback_entry *ps, *ps_tmp;
     LIST_FOREACH_SAFE(ps, &dm->periodicServerRegisterCallbacks, pointers, ps_tmp) {
         LIST_REMOVE(ps, pointers);
-        if (ps->callback->discovery_server_url)
+        if(ps->callback->discovery_server_url)
             UA_free(ps->callback->discovery_server_url);
         UA_free(ps->callback);
         UA_free(ps);
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index ccffa7a17e9..a5c291b96e6 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -33,12 +33,12 @@ multicastWorkerLoop(UA_Server *server) {
                        FD_ISSET(server->discoveryManager.mdnsSocket, &fds), true, &next_sleep);
         if(retVal == 1) {
             UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                           "Multicast error: Can not read from socket. %s", errno_str));
             break;
         } else if (retVal == 2) {
             UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                          "Multicast error: Can not write to socket. %s", errno_str));
             break;
         }
@@ -51,7 +51,7 @@ multicastListenStart(UA_Server* server) {
     int err = pthread_create(&server->discoveryManager.mdnsThread, NULL,
                              (void* (*)(void*))multicastWorkerLoop, server);
     if(err != 0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                      "Multicast error: Can not create multicast thread.");
         return UA_STATUSCODE_BADUNEXPECTEDERROR;
     }
@@ -66,7 +66,8 @@ multicastListenStop(UA_Server* server) {
         // TODO: if makes no sense here?
     }  // TODO: move to arch?
     if (pthread_join(server->discoveryManager.mdnsThread, NULL)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Multicast error: Can not stop thread.");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                     "Multicast error: Can not stop thread.");
         return UA_STATUSCODE_BADUNEXPECTEDERROR;
     }
     return UA_STATUSCODE_BADNOTIMPLEMENTED;
@@ -83,7 +84,7 @@ addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
     UA_StatusCode retval = UA_parseEndpointUrl(discoveryUrl, &hostname,
                                                &port, &path);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Server url is invalid: %.*s",
                        (int)discoveryUrl->length, discoveryUrl->data);
         return retval;
@@ -95,9 +96,8 @@ addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
                                     server->config.mdnsConfig.serverCapabilitiesSize,
                                     true);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_NETWORK,
-                       "Cannot add mDNS Record: %s",
-                       UA_StatusCode_name(retval));
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                       "Cannot add mDNS Record: %s", UA_StatusCode_name(retval));
         return retval;
     }
     return UA_STATUSCODE_GOOD;
@@ -238,7 +238,7 @@ UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverNa
     UA_String path = UA_STRING_NULL;
     UA_StatusCode retval = UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Server url invalid: %.*s",
                        (int)discoveryUrl->length, discoveryUrl->data);
         return;
@@ -249,7 +249,7 @@ UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverNa
                 UA_Discovery_removeRecord(server, serverName, &hostname,
                                           port, updateTxt);
         if(removeRetval != UA_STATUSCODE_GOOD)
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                            "Could not remove mDNS record for hostname %.*s.",
                            (int)serverName->length, serverName->data);
         return;
@@ -268,7 +268,7 @@ UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverNa
                                capabilities, capabilitiesSize,
                                false);
     if(addRetval != UA_STATUSCODE_GOOD)
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Could not add mDNS record for hostname %.*s.",
                        (int)serverName->length, serverName->data);
 }
@@ -287,7 +287,7 @@ static void
 UA_Discovery_multicastConflict(char *name, int type, void *arg) {
     // cppcheck-suppress unreadVariable
     UA_Server *server = (UA_Server*) arg;
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                  "Multicast DNS name conflict detected: "
                  "'%s' for type %d", name, type);
 }
@@ -365,7 +365,7 @@ discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
     if(mdnsd_has_query(server->discoveryManager.mdnsDaemon, a->rdname))
         return 0;
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                  "mDNS send query for: %s SRV&TXT %s", a->name, a->rdname);
 
     mdnsd_query(server->discoveryManager.mdnsDaemon, a->rdname, QTYPE_SRV,
@@ -404,11 +404,11 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     // use a limit for the hostname length to make sure full string fits into 63
     // chars (limited by DNS spec)
     if(hostnameLen+servernameLen + 1 > 63) { // include dash between servername-hostname
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: Combination of hostname+servername exceeds "
                        "maximum of 62 chars. It will be truncated.");
     } else if(hostnameLen > 63) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: Hostname length exceeds maximum of 63 chars. "
                        "It will be truncated.");
     }
@@ -429,7 +429,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     if(exists == true)
         return UA_STATUSCODE_GOOD;
 
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                 "Multicast DNS: add record for domain: %s", fullServiceDomain);
 
 
@@ -529,7 +529,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
         return UA_STATUSCODE_BADOUTOFRANGE;
 
     if(hostnameLen+servernameLen+1 > 63) { // include dash between servername-hostname
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: Combination of hostname+servername exceeds "
                        "maximum of 62 chars. It will be truncated.");
     }
@@ -538,7 +538,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
     char fullServiceDomain[63 + 24];
     createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
 
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                 "Multicast DNS: remove record for domain: %s", fullServiceDomain);
 
     UA_StatusCode retval = UA_DiscoveryManager_removeEntryFromServersOnNetwork(
@@ -550,7 +550,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
     mdns_record_t *r = mdns_find_record(server->discoveryManager.mdnsDaemon, QTYPE_PTR,
                                         "_opcua-tcp._tcp.local.", fullServiceDomain);
     if(!r) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: could not remove record. "
                        "PTR Record not found for domain: %s", fullServiceDomain);
         return UA_STATUSCODE_BADNOTHINGTODO;
@@ -562,7 +562,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
     // and A record: [servername]-[hostname]._opcua-tcp._tcp.local. A [ip]
     mdns_record_t *r2 = mdnsd_get_published(server->discoveryManager.mdnsDaemon, fullServiceDomain);
     if(!r2) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: could not remove record. Record not "
                        "found for domain: %s", fullServiceDomain);
         return UA_STATUSCODE_BADNOTHINGTODO;
@@ -591,12 +591,12 @@ iterateMulticastDiscoveryServer(UA_Server* server, UA_DateTime *nextRepeat,
                                        processIn, true, &next_sleep);
     if(retval == 1) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-               UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+               UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                      "Multicast error: Can not read from socket. %s", errno_str));
         return UA_STATUSCODE_BADNOCOMMUNICATION;
     } else if(retval == 2) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                      "Multicast error: Can not write to socket. %s", errno_str));
         return UA_STATUSCODE_BADNOCOMMUNICATION;
     }

From 90685add685be6a38495128294bab0be4a81c442 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 00:17:22 +0000
Subject: [PATCH 0358/1963] build(deps): bump deps/ua-nodeset from `397bd99` to
 `19595fa`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `397bd99` to `19595fa`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/397bd996e951225cf83df52affad6aed742d415d...19595facade9b21490a554937461a081f1ac1530)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 397bd996e95..19595facade 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 397bd996e951225cf83df52affad6aed742d415d
+Subproject commit 19595facade9b21490a554937461a081f1ac1530

From e4d49d133921c6459d4d598c8202d3f4b9e50a8b Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas_fischer@siemens.com>
Date: Thu, 4 Aug 2022 10:09:29 +0200
Subject: [PATCH 0359/1963] fix(pubsub): Remove deadlock on
 StandaloneSubscribedDataSet cleanup (#5289)

---
 src/pubsub/ua_pubsub_ns0.c | 42 +++-----------------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 25fa7e2f080..77455767c85 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -848,41 +848,7 @@ addDataSetReaderAction(UA_Server *server,
 
 UA_StatusCode
 removeDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader* dataSetReader) {
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    if(!UA_String_equal(&dataSetReader->config.linkedStandaloneSubscribedDataSetName, &UA_STRING_NULL)) {
-        UA_NodeId dataSetMetaDataOnDsrId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
-                                    UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), dataSetReader->identifier);
-        UA_NodeId subscribedDataSetOnDsrId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
-                                    UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), dataSetReader->identifier);
-
-        if(UA_NodeId_isNull(&dataSetMetaDataOnDsrId) || UA_NodeId_isNull(&subscribedDataSetOnDsrId)) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "removeDataSetReaderRepresentation failed."
-                                                                        "SubscribedDataSet or DataSetMetaData not found!");
-            return UA_STATUSCODE_BADNOTFOUND;
-        }
-
-        retVal |= UA_Server_deleteReference(server, dataSetReader->identifier,
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                                  UA_TRUE,
-                                  UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnDsrId.namespaceIndex, dataSetMetaDataOnDsrId.identifier.numeric),
-                                  UA_TRUE);
-        if(retVal != UA_STATUSCODE_GOOD) {
-            /* todo error handling */
-        }
-
-        retVal |= UA_Server_deleteReference(server, dataSetReader->identifier,
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                  UA_TRUE,
-                                  UA_EXPANDEDNODEID_NUMERIC(subscribedDataSetOnDsrId.namespaceIndex, subscribedDataSetOnDsrId.identifier.numeric),
-                                  UA_TRUE);
-        if(retVal != UA_STATUSCODE_GOOD) {
-            /* todo error handling */
-        }
-    }
-    
-    retVal |= deleteNode(server, dataSetReader->identifier, true);
-
-    return retVal;
+    return deleteNode(server, dataSetReader->identifier, true);
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
@@ -1211,9 +1177,7 @@ addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSub
 
 UA_StatusCode
 removeStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet) {
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    retVal |= UA_Server_deleteNode(server, subscribedDataSet->identifier, true);
-    return retVal;
+    return UA_Server_deleteNode(server, subscribedDataSet->identifier, true);
 }
 
 /**********************************************/
@@ -1946,7 +1910,7 @@ connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId stan
     retVal |= UA_Server_addReference(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
         UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex, dataSetMetaDataOnSdsId.identifier.numeric), UA_TRUE);
     retVal |= UA_Server_addReference(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-        UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex, subscribedDataSetOnSdsId.identifier.numeric), UA_TRUE);
+        UA_EXPANDEDNODEID_NUMERIC(subscribedDataSetOnSdsId.namespaceIndex, subscribedDataSetOnSdsId.identifier.numeric), UA_TRUE);
 
     return retVal;
 }

From 20ebb44140e1bc77f40949a763dd73748ba33163 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas_fischer@siemens.com>
Date: Thu, 4 Aug 2022 15:48:22 +0200
Subject: [PATCH 0360/1963] fix(pubsub) memleak when reading PDS/SDS children
 (#5291)

* read value from pds children

* fix memleak when reading pds children
---
 src/pubsub/ua_pubsub_ns0.c                   | 15 +++++---
 tests/pubsub/check_pubsub_informationmodel.c | 40 ++++++++++++++++++++
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 77455767c85..8b38257a942 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -68,6 +68,8 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
     UA_Variant_init(&value);
     const UA_NodePropertyContext *nodeContext = (const UA_NodePropertyContext*)context;
     const UA_NodeId *myNodeId = &nodeContext->parentNodeId;
+    UA_PublishedVariableDataType *pvd = NULL;
+    UA_PublishedDataSet *publishedDataSet = NULL;
 
     switch(nodeContext->parentClassifier){
     case UA_NS0ID_PUBSUBCONNECTIONTYPE: {
@@ -155,12 +157,12 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
         break;
     }
     case UA_NS0ID_PUBLISHEDDATAITEMSTYPE: {
-        UA_PublishedDataSet *publishedDataSet = UA_PublishedDataSet_findPDSbyId(server, *myNodeId);
+        publishedDataSet = UA_PublishedDataSet_findPDSbyId(server, *myNodeId);
         if(!publishedDataSet)
             return;
         switch(nodeContext->elementClassiefier) {
         case UA_NS0ID_PUBLISHEDDATAITEMSTYPE_PUBLISHEDDATA: {
-            UA_PublishedVariableDataType *pvd = (UA_PublishedVariableDataType *)
+            pvd = (UA_PublishedVariableDataType *)
                 UA_calloc(publishedDataSet->fieldSize, sizeof(UA_PublishedVariableDataType));
             size_t counter = 0;
             UA_DataSetField *field;
@@ -175,11 +177,11 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
             break;
         }
         case UA_NS0ID_PUBLISHEDDATAITEMSTYPE_DATASETMETADATA: {
-            UA_Variant_setScalarCopy(&value, &publishedDataSet->dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
+            UA_Variant_setScalar(&value, &publishedDataSet->dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
             break;
         }
         case UA_NS0ID_PUBLISHEDDATAITEMSTYPE_CONFIGURATIONVERSION: {
-            UA_Variant_setScalarCopy(&value, &publishedDataSet->dataSetMetaData.configurationVersion,
+            UA_Variant_setScalar(&value, &publishedDataSet->dataSetMetaData.configurationVersion,
                                      &UA_TYPES[UA_TYPES_CONFIGURATIONVERSIONDATATYPE]);
             break;
         }
@@ -191,7 +193,7 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
                     break;
                 }
                 case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_DATASETMETADATA: {
-                    UA_Variant_setScalarCopy(&value, &sds->config.dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
+                    UA_Variant_setScalar(&value, &sds->config.dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
                     break;
                 }
                 default:
@@ -211,6 +213,9 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
                        "Read error! Unknown parent element.");
     }
     UA_Server_writeValue(server, *nodeid, value);
+    if(pvd && publishedDataSet) {
+        UA_Array_delete(pvd, publishedDataSet->fieldSize, &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]);
+    }
 }
 
 static void
diff --git a/tests/pubsub/check_pubsub_informationmodel.c b/tests/pubsub/check_pubsub_informationmodel.c
index 521f2ac06e1..b316096be70 100644
--- a/tests/pubsub/check_pubsub_informationmodel.c
+++ b/tests/pubsub/check_pubsub_informationmodel.c
@@ -47,6 +47,21 @@ static void addPublishedDataSet(UA_String pdsName, UA_NodeId *assignedId){
     UA_Server_addPublishedDataSet(server, &pdsConfig, assignedId);
 }
 
+static void addDataSetField(UA_NodeId publishedDataSetIdent) {
+    /* Add a field to the previous created PublishedDataSet */
+    UA_NodeId dataSetFieldIdent;
+    UA_DataSetFieldConfig dataSetFieldConfig;
+    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
+    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
+    UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    UA_Server_addDataSetField(server, publishedDataSetIdent,
+                              &dataSetFieldConfig, &dataSetFieldIdent);
+}
+
 static void addPubSubConnection(UA_String connectionName, UA_String addressUrl, UA_NodeId *assignedId){
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -170,7 +185,32 @@ START_TEST(AddRemoveAddSignlePubSubConnectionAndCheckInformationModelRepresentat
 START_TEST(AddSinglePublishedDataSetAndCheckInformationModelRepresentation){
     UA_String pdsName = UA_STRING("PDS 1");
     addPublishedDataSet(pdsName, &publishedDataSet1);
+    addDataSetField(publishedDataSet1);
     UA_QualifiedName browseName;
+    UA_NodeId publishedDataNodeId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublishedData"),
+                                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), publishedDataSet1);
+    UA_NodeId dataSetMetaDataNodeId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
+                                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), publishedDataSet1);
+    UA_NodeId configurationVersionNodeId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "ConfigurationVersion"),
+                                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), publishedDataSet1);
+    UA_Variant value;
+    UA_Variant_init(&value);
+    ck_assert_int_eq(UA_Server_readValue(server, publishedDataNodeId, &value), UA_STATUSCODE_GOOD);
+    ck_assert(UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]));
+    UA_NodeId dsf1 = ((UA_PublishedVariableDataType *)value.data)[0].publishedVariable;
+    UA_NodeId serverCurrentTimeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    ck_assert(UA_NodeId_equal(&dsf1, &serverCurrentTimeId));
+    ck_assert_uint_eq(value.arrayLength, 1);
+    UA_Variant_clear(&value);
+    UA_Variant_init(&value);
+    ck_assert_int_eq(UA_Server_readValue(server, dataSetMetaDataNodeId, &value), UA_STATUSCODE_GOOD);
+    ck_assert(UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]));
+    ck_assert_uint_eq(((UA_DataSetMetaDataType *)value.data)->fieldsSize, 1);
+    UA_Variant_clear(&value);
+    UA_Variant_init(&value);
+    ck_assert_int_eq(UA_Server_readValue(server, configurationVersionNodeId, &value), UA_STATUSCODE_GOOD);
+    ck_assert(UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_CONFIGURATIONVERSIONDATATYPE]));
+    UA_Variant_clear(&value);
     ck_assert_int_eq(UA_Server_readBrowseName(server, publishedDataSet1, &browseName), UA_STATUSCODE_GOOD);
     ck_assert_int_eq(UA_String_equal(&browseName.name, &pdsName), UA_TRUE);
     UA_QualifiedName_clear(&browseName);

From 0355c8b864afbbecc95381d701866479c257a823 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Jul 2022 14:17:45 +0200
Subject: [PATCH 0361/1963] refactor(server): Remove unneeded include of
 ua_timer.h

---
 src/server/ua_server_internal.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index f851611825e..954fe5e336e 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -25,7 +25,6 @@
 #include "ua_connection_internal.h"
 #include "ua_session.h"
 #include "ua_server_async.h"
-#include "common/ua_timer.h" /* arch-folder, TODO: Remove after the EventLoop is integrated */
 #include "ua_util_internal.h"
 #include "ziptree.h"
 

From 2e34ee2ec2af901cc4265ff44a94dc59c7192d58 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 20 Jul 2022 00:11:16 +0200
Subject: [PATCH 0362/1963] refactor(el): Deregister TCP socket at shutdown
 (not only at close)

---
 arch/eventloop_posix_tcp.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 98b0bf71274..649ddb46ea2 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -48,15 +48,6 @@ TCPConnectionManager_register(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     return UA_STATUSCODE_GOOD;
 }
 
-static void
-TCPConnectionManager_deregister(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
-    UA_EventLoopPOSIX_deregisterFD(el, rfd);
-    LIST_REMOVE(rfd, es_pointers);
-    UA_assert(tcm->fdsSize > 0);
-    tcm->fdsSize--;
-}
-
 static UA_StatusCode
 TCP_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
                        UA_ByteString *buf, size_t bufSize) {
@@ -127,9 +118,6 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Closing connection", (unsigned)rfd->fd);
 
-    /* Deregister from the EventLoop */
-    TCPConnectionManager_deregister(tcm, rfd);
-
     /* Signal closing to the application */
     tcpfd->connectionCallback(&tcm->cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
@@ -148,12 +136,15 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
                           (unsigned)rfd->fd, errno_str));
     }
 
+    /* Decrease the number of open sockets. Then check if the tcm is stopping
+     * and this was the last open socket */
+    UA_assert(tcm->fdsSize > 0);
+    tcm->fdsSize--;
+    TCP_checkStopped(tcm);
+
     /* Don't call UA_free(rfd). This might be done automatically via the delayed
      * callback that calls TCP_close. */
 
-    /* Stop if the tcm is stopping and this was the last open socket */
-    TCP_checkStopped(tcm);
-
     return UA_STATUSCODE_GOOD;
 }
 
@@ -604,6 +595,14 @@ TCP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
     UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Shutdown called", (unsigned)rfd->fd);
 
+    /* Deregister from the EventLoop. Don't decrease the tcm->fdsSize counter
+     * right now. Do this in the delayed callback where the rfd is freed.
+     * Otherwise the ConnectionManager may be freed too early. */
+    UA_EventLoopPOSIX_deregisterFD((UA_EventLoopPOSIX*)el, rfd);
+    LIST_REMOVE(rfd, es_pointers);
+
+    /* Add to the delayed callback list. Will be cleaned up in the next
+     * iteration. */
     UA_DelayedCallback *dc = &rfd->dc;
     dc->callback = TCP_delayedClose;
     dc->application = cm;

From 200223f384158de8781114f1e54a5fd409e3fecf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:17:42 +0200
Subject: [PATCH 0363/1963] refactor(el): Only listen for TCP read-events
 before calling the userland

So we can already send messages from within the callback.
---
 arch/eventloop_posix_tcp.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 649ddb46ea2..4a7cac4e8be 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -210,15 +210,16 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| Opening a new connection", (unsigned)rfd->fd);
 
+        /* Now we are interested in read-events. */
+        rfd->listenEvents = UA_FDEVENT_IN;
+        UA_EventLoopPOSIX_modifyFD(el, rfd);
+
         /* A new socket has opened. Signal it to the application. */
         tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                                   rfd->application, &rfd->context,
                                   UA_CONNECTIONSTATE_ESTABLISHED, 0, NULL,
                                   UA_BYTESTRING_NULL);
 
-        /* Now we are interested in read-events. */
-        rfd->listenEvents = UA_FDEVENT_IN;
-        UA_EventLoopPOSIX_modifyFD(el, rfd);
         return;
     }
 

From 0ec4ec521a29c44f70f4f609d1e5caa81089df08 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:19:08 +0200
Subject: [PATCH 0364/1963] refactor(el): Improve logging and simplify
 eventloop_posix_tcp.c

---
 arch/eventloop_posix_tcp.c | 46 +++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 4a7cac4e8be..ee09f62dbd6 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -586,15 +586,17 @@ TCP_findRegisteredFD(TCPConnectionManager *tcm, uintptr_t connectionId) {
 static void
 TCP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
     UA_EventLoop *el = cm->eventSource.eventLoop;
+
+    /* Already closing - nothing to do */
     if(rfd->dc.callback) {
-        UA_LOG_INFO(el->logger, UA_LOGCATEGORY_NETWORK,
-                    "TCP %u\t| Cannot close - already closing",
-                    (unsigned)rfd->fd);
+        UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+                     "TCP %u\t| Cannot shutdown - already triggered",
+                     (unsigned)rfd->fd);
         return;
     }
 
     UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Shutdown called", (unsigned)rfd->fd);
+                 "TCP %u\t| Shutdown triggered", (unsigned)rfd->fd);
 
     /* Deregister from the EventLoop. Don't decrease the tcm->fdsSize counter
      * right now. Do this in the delayed callback where the rfd is freed.
@@ -652,34 +654,17 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                         bytes_to_send, flags);
             if(n < 0) {
                 /* An error we cannot recover from? */
-                if(UA_ERRNO != UA_INTERRUPTED &&
-                   UA_ERRNO != UA_WOULDBLOCK &&
-                   UA_ERRNO != UA_AGAIN) {
-                    UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-                       UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                                    UA_LOGCATEGORY_NETWORK,
-                                    "TCP %u\t| Send failed with error %s",
-                                    (unsigned)connectionId, errno_str));
-                    TCP_shutdownConnection(cm, connectionId);
-                    UA_ByteString_clear(buf);
-                    return UA_STATUSCODE_BADCONNECTIONCLOSED;
-                }
+                if(UA_ERRNO != UA_INTERRUPTED && UA_ERRNO != UA_WOULDBLOCK &&
+                   UA_ERRNO != UA_AGAIN)
+                    goto shutdown;
 
                 /* Poll for the socket resources to become available and retry
                  * (blocking) */
                 int poll_ret;
                 do {
                     poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
-                    if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED) {
-                        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-                           UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                                        UA_LOGCATEGORY_NETWORK,
-                                        "TCP %u\t| Send failed with error %s",
-                                        (unsigned)connectionId, errno_str));
-                        TCP_shutdownConnection(cm, connectionId);
-                        UA_ByteString_clear(buf);
-                        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-                    }
+                    if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED)
+                        goto shutdown;
                 } while(poll_ret <= 0);
             }
         } while(n < 0);
@@ -689,6 +674,15 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     /* Free the buffer */
     UA_ByteString_clear(buf);
     return UA_STATUSCODE_GOOD;
+
+ shutdown:
+    UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+       UA_LOG_ERROR(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP %u\t| Send failed with error %s",
+                    (unsigned)connectionId, errno_str));
+    TCP_shutdownConnection(cm, connectionId);
+    UA_ByteString_clear(buf);
+    return UA_STATUSCODE_BADCONNECTIONCLOSED;
 }
 
 /* Create a listen-socket that waits for incoming connections */

From c91c37773f77082b73374f29740ccf2471d2a958 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:22:17 +0200
Subject: [PATCH 0365/1963] refactor(core): Improve logging of the
 SecureChannel

---
 src/ua_securechannel.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index bac2908986f..81d12996dc0 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -331,8 +331,8 @@ signAndEncryptSym(UA_MessageContext *messageContext,
 
 #define UA_LOG_TRACE_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)              \
     UA_LOG_TRACE(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                        \
-                 "Connection %i | SecureChannel %" PRIu32 " | " MSG "%.0s",     \
-                 ((CHANNEL)->connection ? (int)((CHANNEL)->connection->sockfd) : 0), \
+                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
+                 (long unsigned)(CHANNEL)->connectionId,                      \
                  (CHANNEL)->securityToken.channelId, __VA_ARGS__)
 
 #define UA_LOG_TRACE_CHANNEL(LOGGER, CHANNEL, ...)        \
@@ -340,8 +340,8 @@ signAndEncryptSym(UA_MessageContext *messageContext,
 
 #define UA_LOG_DEBUG_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)              \
     UA_LOG_DEBUG(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                        \
-                 "Connection %i | SecureChannel %" PRIu32 " | " MSG "%.0s",     \
-                 ((CHANNEL)->connection ? (int)((CHANNEL)->connection->sockfd) : 0), \
+                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
+                 (long unsigned)(CHANNEL)->connectionId,                      \
                  (CHANNEL)->securityToken.channelId, __VA_ARGS__)
 
 #define UA_LOG_DEBUG_CHANNEL(LOGGER, CHANNEL, ...)        \
@@ -349,8 +349,8 @@ signAndEncryptSym(UA_MessageContext *messageContext,
 
 #define UA_LOG_INFO_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)               \
     UA_LOG_INFO(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                         \
-                 "Connection %i | SecureChannel %" PRIu32 " | " MSG "%.0s",     \
-                 ((CHANNEL)->connection ? (int)((CHANNEL)->connection->sockfd) : 0), \
+                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
+                 (long unsigned)(CHANNEL)->connectionId,                      \
                  (CHANNEL)->securityToken.channelId, __VA_ARGS__)
 
 #define UA_LOG_INFO_CHANNEL(LOGGER, CHANNEL, ...)        \
@@ -358,8 +358,8 @@ signAndEncryptSym(UA_MessageContext *messageContext,
 
 #define UA_LOG_WARNING_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)            \
     UA_LOG_WARNING(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                      \
-                 "Connection %i | SecureChannel %" PRIu32 " | " MSG "%.0s",     \
-                 ((CHANNEL)->connection ? (int)((CHANNEL)->connection->sockfd) : 0), \
+                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
+                 (long unsigned)(CHANNEL)->connectionId,                      \
                  (CHANNEL)->securityToken.channelId, __VA_ARGS__)
 
 #define UA_LOG_WARNING_CHANNEL(LOGGER, CHANNEL, ...)        \
@@ -367,8 +367,8 @@ signAndEncryptSym(UA_MessageContext *messageContext,
 
 #define UA_LOG_ERROR_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)              \
     UA_LOG_ERROR(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                        \
-                 "Connection %i | SecureChannel %" PRIu32 " | " MSG "%.0s",     \
-                 ((CHANNEL)->connection ? (int)((CHANNEL)->connection->sockfd) : 0), \
+                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
+                 (long unsigned)(CHANNEL)->connectionId,                      \
                  (CHANNEL)->securityToken.channelId, __VA_ARGS__)
 
 #define UA_LOG_ERROR_CHANNEL(LOGGER, CHANNEL, ...)        \
@@ -376,8 +376,8 @@ signAndEncryptSym(UA_MessageContext *messageContext,
 
 #define UA_LOG_FATAL_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)              \
     UA_LOG_FATAL(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                        \
-                 "Connection %i | SecureChannel %" PRIu32 " | " MSG "%.0s",     \
-                 ((CHANNEL)->connection ? (CHANNEL)->connection->sockfd : 0), \
+                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
+                 (long unsigned)(CHANNEL)->connectionId,                      \
                  (CHANNEL)->securityToken.channelId, __VA_ARGS__)
 
 #define UA_LOG_FATAL_CHANNEL(LOGGER, CHANNEL, ...)        \

From 610b55ed29a27eda735adee5e1a22e349751ba99 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:23:03 +0200
Subject: [PATCH 0366/1963] refactor(core): Add enum states
 UA_SECURECHANNELSTATE_CONNECTING, UA_SECURECHANNELSTATE_CONNECTED

---
 include/open62541/common.h | 2 ++
 src/client/ua_client.c     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/open62541/common.h b/include/open62541/common.h
index f6781fb1343..08b4e09df45 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -166,6 +166,8 @@ typedef enum {
 
 typedef enum {
     UA_SECURECHANNELSTATE_FRESH = 0,
+    UA_SECURECHANNELSTATE_CONNECTING,
+    UA_SECURECHANNELSTATE_CONNECTED,
     UA_SECURECHANNELSTATE_HEL_SENT,
     UA_SECURECHANNELSTATE_HEL_RECEIVED,
     UA_SECURECHANNELSTATE_ACK_SENT,
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 77e5e318984..d5279adc9e9 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -154,8 +154,8 @@ UA_Client_getConfig(UA_Client *client) {
 }
 
 #if UA_LOGLEVEL <= 300
-static const char *channelStateTexts[9] = {
-    "Fresh", "HELSent", "HELReceived", "ACKSent",
+static const char *channelStateTexts[11] = {
+    "Fresh", "Connecting", "Connected", "HELSent", "HELReceived", "ACKSent",
     "AckReceived", "OPNSent", "Open", "Closing", "Closed"};
 static const char *sessionStateTexts[6] =
     {"Closed", "CreateRequested", "Created",

From 5f45712239de8c5ea86860e8c79a5b90570f8d9a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:26:10 +0200
Subject: [PATCH 0367/1963] refactor(core): Remove
 UA_ENABLE_UNIT_TEST_FAILURE_HOOKS

The hooks are better implemented via the test-plugins.
---
 CMakeLists.txt                |  4 ----
 include/open62541/config.h.in |  1 -
 src/ua_securechannel.c        | 18 +++---------------
 src/ua_securechannel.h        |  7 -------
 src/ua_securechannel_crypto.c |  3 ---
 5 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aec9cf80294..7930c0f4104 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -527,10 +527,6 @@ mark_as_advanced(UA_ENABLE_DISCOVERY_SEMAPHORE)
 option(UA_ENABLE_UNIT_TESTS_MEMCHECK "Use Valgrind (Linux) or DrMemory (Windows) to detect memory leaks when running the unit tests" OFF)
 mark_as_advanced(UA_ENABLE_UNIT_TESTS_MEMCHECK)
 
-option(UA_ENABLE_UNIT_TEST_FAILURE_HOOKS
-       "Add hooks to force failure modes for additional unit tests. Not for production use!" OFF)
-mark_as_advanced(UA_ENABLE_UNIT_TEST_FAILURE_HOOKS)
-
 set(UA_VALGRIND_INTERACTIVE_INTERVAL 1000 CACHE STRING "The number of iterations to wait before creating the next dump")
 mark_as_advanced(UA_VALGRIND_INTERACTIVE_INTERVAL)
 
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 09375a80f6e..7f7166fca72 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -69,7 +69,6 @@
 #cmakedefine UA_ENABLE_QUERY
 #cmakedefine UA_ENABLE_MALLOC_SINGLETON
 #cmakedefine UA_ENABLE_DISCOVERY_SEMAPHORE
-#cmakedefine UA_ENABLE_UNIT_TEST_FAILURE_HOOKS
 #cmakedefine UA_ENABLE_VALGRIND_INTERACTIVE
 #define UA_VALGRIND_INTERACTIVE_INTERVAL ${UA_VALGRIND_INTERACTIVE_INTERVAL}
 #cmakedefine UA_GENERATED_NAMESPACE_ZERO
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 7fe461387a1..6312e3b6bb6 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -26,15 +26,9 @@
 const UA_String UA_SECURITY_POLICY_NONE_URI =
     {47, (UA_Byte *)"http://opcfoundation.org/UA/SecurityPolicy#None"};
 
-#ifdef UA_ENABLE_UNIT_TEST_FAILURE_HOOKS
-UA_StatusCode decrypt_verifySignatureFailure;
-UA_StatusCode sendAsym_sendFailure;
-UA_StatusCode processSym_seqNumberFailure;
-#endif
-
-void UA_SecureChannel_init(UA_SecureChannel *channel,
-                           const UA_ConnectionConfig *config) {
-    /* Linked lists are also initialized by zeroing out */
+void
+UA_SecureChannel_init(UA_SecureChannel *channel) {
+    /* Normal linked lists are initialized by zeroing out */
     memset(channel, 0, sizeof(UA_SecureChannel));
     channel->state = UA_SECURECHANNELSTATE_FRESH;
     SIMPLEQ_INIT(&channel->completeChunks);
@@ -488,12 +482,6 @@ UA_SecureChannel_sendSymmetricMessage(UA_SecureChannel *channel, UA_UInt32 reque
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 static UA_StatusCode
 processSequenceNumberSym(UA_SecureChannel *channel, UA_UInt32 sequenceNumber) {
-#ifdef UA_ENABLE_UNIT_TEST_FAILURE_HOOKS
-    /* Failure mode hook for unit tests */
-    if(processSym_seqNumberFailure != UA_STATUSCODE_GOOD)
-        return processSym_seqNumberFailure;
-#endif
-
     if(sequenceNumber != channel->receiveSequenceNumber + 1) {
         if(channel->receiveSequenceNumber + 1 <= UA_SEQUENCENUMBER_ROLLOVER ||
            sequenceNumber >= 1024)
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 81d12996dc0..46bded087c1 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -52,13 +52,6 @@ _UA_BEGIN_DECLS
 /* Minimum length of a valid message (ERR message with an empty reason) */
 #define UA_SECURECHANNEL_MESSAGE_MIN_LENGTH 16
 
-/* Thread-local variables to force failure modes during testing */
-#ifdef UA_ENABLE_UNIT_TEST_FAILURE_HOOKS
-extern UA_StatusCode decrypt_verifySignatureFailure;
-extern UA_StatusCode sendAsym_sendFailure;
-extern UA_StatusCode processSym_seqNumberFailure;
-#endif
-
 /* The Session implementation differs between client and server. Still, it is
  * expected that the Session structure begins with the SessionHeader. This is
  * the interface that will be used by the SecureChannel. The lifecycle of
diff --git a/src/ua_securechannel_crypto.c b/src/ua_securechannel_crypto.c
index db1fb8097e3..4c461f81574 100644
--- a/src/ua_securechannel_crypto.c
+++ b/src/ua_securechannel_crypto.c
@@ -429,9 +429,6 @@ verifySignature(const UA_SecureChannel *channel,
     const UA_ByteString sig = {sigsize, chunk->data + chunk->length - sigsize};
     UA_StatusCode retval = cryptoModule->signatureAlgorithm.
         verify(channel->channelContext, &content, &sig);
-#ifdef UA_ENABLE_UNIT_TEST_FAILURE_HOOKS
-    retval |= decrypt_verifySignatureFailure;
-#endif
     return retval;
 }
 

From f75a8e58a4b03f175f4de56f7c980b0500f4a21a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:28:22 +0200
Subject: [PATCH 0368/1963] feat(core): Implement UA_SecureChannel_isConnected,
 UA_SecureChannel_sendError

---
 src/ua_securechannel.c | 56 ++++++++++++++++++++++++++++++++++++++++++
 src/ua_securechannel.h | 11 +++++++++
 2 files changed, 67 insertions(+)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 6312e3b6bb6..87095cdfd8f 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -69,6 +69,62 @@ UA_SecureChannel_setSecurityPolicy(UA_SecureChannel *channel,
     return UA_STATUSCODE_GOOD;
 }
 
+/* Hides some errors before sending them to a client according to the
+ * standard. */
+static void
+hideErrors(UA_TcpErrorMessage *const error) {
+    switch(error->error) {
+    case UA_STATUSCODE_BADCERTIFICATEUNTRUSTED:
+    case UA_STATUSCODE_BADCERTIFICATEREVOKED:
+        error->error = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        error->reason = UA_STRING_NULL;
+        break;
+        // TODO: Check if these are all cases that need to be covered.
+    default:
+        break;
+    }
+}
+
+UA_Boolean
+UA_SecureChannel_isConnected(UA_SecureChannel *channel) {
+    return (channel->state >= UA_SECURECHANNELSTATE_CONNECTING &&
+            channel->state < UA_SECURECHANNELSTATE_CLOSING);
+}
+
+void
+UA_SecureChannel_sendError(UA_SecureChannel *channel, UA_TcpErrorMessage *error) {
+    if(!UA_SecureChannel_isConnected(channel))
+        return;
+
+    hideErrors(error);
+
+    UA_TcpMessageHeader header;
+    header.messageTypeAndChunkType = UA_MESSAGETYPE_ERR + UA_CHUNKTYPE_FINAL;
+    /* Header + ErrorMessage (error + reasonLength_field + length) */
+    header.messageSize = 8 + (4 + 4 + (UA_UInt32)error->reason.length);
+
+    /* Get the send buffer from the network layer */
+    UA_ConnectionManager *cm = channel->connectionManager;
+    UA_ByteString msg = UA_BYTESTRING_NULL;
+    UA_StatusCode retval = cm->allocNetworkBuffer(cm, channel->connectionId,
+                                                  &msg, header.messageSize);
+    if(retval != UA_STATUSCODE_GOOD)
+        return;
+
+    /* Encode and send the response */
+    UA_Byte *bufPos = msg.data;
+    const UA_Byte *bufEnd = &msg.data[msg.length];
+    retval |= UA_encodeBinaryInternal(&header,
+                                      &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER],
+                                      &bufPos, &bufEnd, NULL, NULL);
+    retval |= UA_encodeBinaryInternal(error,
+                                      &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE],
+                                      &bufPos, &bufEnd, NULL, NULL);
+    (void)retval; /* Encoding of these cannot fail */
+    msg.length = header.messageSize;
+    cm->sendWithConnection(cm, channel->connectionId, 0, NULL, &msg);
+}
+
 static void
 UA_Chunk_delete(UA_Chunk *chunk) {
     if(chunk->copied)
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 46bded087c1..72d192f57ee 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -170,6 +170,17 @@ UA_SecureChannel_setSecurityPolicy(UA_SecureChannel *channel,
                                    const UA_SecurityPolicy *securityPolicy,
                                    const UA_ByteString *remoteCertificate);
 
+UA_Boolean
+UA_SecureChannel_isConnected(UA_SecureChannel *channel);
+
+/* When a fatal error occurs the Server shall send an Error Message to the
+ * Client and close the socket. When a Client encounters one of these errors, it
+ * shall also close the socket but does not send an Error Message. After the
+ * socket is closed a Client shall try to reconnect automatically using the
+ * mechanisms described in [...]. */
+void
+UA_SecureChannel_sendError(UA_SecureChannel *channel, UA_TcpErrorMessage *error);
+
 /* Remove (partially) received unprocessed chunks */
 void
 UA_SecureChannel_deleteBuffered(UA_SecureChannel *channel);

From f96bce08fc7be472a5d02281be0c93a3da183266 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:41:45 +0200
Subject: [PATCH 0369/1963] refactor(server): Improve SecureChannel and Session
 logging

---
 src/server/ua_server_binary.c          |  5 ++---
 src/server/ua_services_discovery.c     |  1 +
 src/server/ua_services_securechannel.c | 22 ++++++++--------------
 src/server/ua_session.h                |  6 ++++--
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index ce09d192d58..85a7e99766b 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -340,9 +340,8 @@ processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *ms
     retval = UA_SecureChannel_processHELACK(channel,
                                             (UA_TcpAcknowledgeMessage*)&helloMessage);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_NETWORK,
-                    "Connection %i | Error during the HEL/ACK handshake",
-                    (int)(channel->connection->sockfd));
+        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+                            "Error during the HEL/ACK handshake");
         return retval;
     }
 
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 6b6c9d80106..548b552b039 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -590,6 +590,7 @@ UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
                                             UA_Double delayFirstRegisterMs,
                                             UA_UInt64 *periodicCallbackId) {
     UA_LOCK(&server->serviceMutex);
+
     /* No valid server URL */
     if(!discoveryServerUrl) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index 8c8cb7e699c..4faf4cdcbce 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -340,30 +340,24 @@ UA_SecureChannelManager_renew(UA_Server *server, UA_SecureChannel *channel,
     return UA_STATUSCODE_GOOD;
 }
 
-void
-UA_Server_closeSecureChannel(UA_Server *server, UA_SecureChannel *channel,
-                             UA_DiagnosticEvent event) {
-    removeSecureChannel(server, container_of(channel, channel_entry, channel), event);
-}
-
 void
 Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
                           const UA_OpenSecureChannelRequest *request,
                           UA_OpenSecureChannelResponse *response) {
+    /* Renew the channel */
     if(request->requestType == UA_SECURITYTOKENREQUESTTYPE_RENEW) {
-        /* Renew the channel */
         response->responseHeader.serviceResult =
             UA_SecureChannelManager_renew(server, channel, request, response);
-
-        /* Logging */
-        if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
-            UA_Float lifetime = (UA_Float)response->securityToken.revisedLifetime / 1000;
-            UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel renewed "
-                                "with a revised lifetime of %.2fs", lifetime);
-        } else {
+        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_LOG_DEBUG_CHANNEL(&server->config.logger, channel,
                                  "Renewing SecureChannel failed");
+            return;
         }
+
+        /* Log the renewal and the lifetime */
+        UA_Float lifetime = (UA_Float)response->securityToken.revisedLifetime / 1000;
+        UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel renewed "
+                            "with a revised lifetime of %.2fs", lifetime);
         return;
     }
 
diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index c79a4e568a4..e4e4c411323 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -135,11 +135,13 @@ UA_Session_dequeuePublishReq(UA_Session *session);
         int nameLen = (SESSION) ? (int)(SESSION)->sessionName.length : 0; \
         const char *nameStr = (SESSION) ?                               \
             (const char*)(SESSION)->sessionName.data : NULL;            \
+        unsigned long sockId = ((SESSION) && (SESSION)->header.channel) ? \
+            (unsigned long)(SESSION)->header.channel->connectionId : 0; \
         UA_UInt32 chanId = ((SESSION) && (SESSION)->header.channel) ?   \
             (SESSION)->header.channel->securityToken.channelId : 0;     \
         UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_SESSION,                  \
-                       "SecureChannel %" PRIu32 " | Session \"%.*s\" | " MSG "%.0s", \
-                       chanId, nameLen, nameStr, __VA_ARGS__);          \
+                       "TCP %lu\t| SecureChannel %" PRIu32 "\t| Session \"%.*s\"\t| " MSG "%.0s", \
+                       sockId, chanId, nameLen, nameStr, __VA_ARGS__);   \
     }
 
 #define UA_LOG_TRACE_SESSION(LOGGER, SESSION, ...)                      \

From 08a7da70ace8eb06ca39353af5ce01e6a5dfdf6f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:47:46 +0200
Subject: [PATCH 0370/1963] refactor(core): Simplify UA_SecureChannel_init

---
 src/client/ua_client.c                 | 3 ++-
 src/server/ua_services_securechannel.c | 5 +++--
 src/ua_securechannel.c                 | 2 --
 src/ua_securechannel.h                 | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d5279adc9e9..d624c703c54 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -42,7 +42,8 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
     memset(client, 0, sizeof(UA_Client));
     client->config = *config;
 
-    UA_SecureChannel_init(&client->channel, &client->config.localConnectionConfig);
+    UA_SecureChannel_init(&client->channel);
+    client->channel.config = client->config.localConnectionConfig;
     client->connectStatus = UA_STATUSCODE_GOOD;
 
     /* Set up the regular callback for checking the internal state */
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index 4faf4cdcbce..5b4deafb166 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -183,8 +183,9 @@ UA_Server_createSecureChannel(UA_Server *server, UA_Connection *connection) {
     if(connConfig.sendBufferSize == 0)
         connConfig.sendBufferSize = 1 << 16; /* 64kB */
 
-    /* Channel state is closed (0) */
-    UA_SecureChannel_init(&entry->channel, &connConfig);
+    /* Set up the new SecureChannel */
+    UA_SecureChannel_init(&entry->channel);
+    entry->channel.config = connConfig;
     entry->channel.certificateVerification = &config->certificateVerification;
     entry->channel.processOPNHeader = UA_Server_configSecureChannel;
 
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 87095cdfd8f..0212f20136b 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -33,8 +33,6 @@ UA_SecureChannel_init(UA_SecureChannel *channel) {
     channel->state = UA_SECURECHANNELSTATE_FRESH;
     SIMPLEQ_INIT(&channel->completeChunks);
     SIMPLEQ_INIT(&channel->decryptedChunks);
-    SLIST_INIT(&channel->sessions);
-    channel->config = *config;
 }
 
 UA_StatusCode
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 72d192f57ee..b10c9dce920 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -154,8 +154,7 @@ struct UA_SecureChannel {
                                       const UA_AsymmetricAlgorithmSecurityHeader *asymHeader);
 };
 
-void UA_SecureChannel_init(UA_SecureChannel *channel,
-                           const UA_ConnectionConfig *config);
+void UA_SecureChannel_init(UA_SecureChannel *channel);
 
 void UA_SecureChannel_close(UA_SecureChannel *channel);
 

From 142fd283d798a07016b6145683aa9490eb8e1f06 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:50:34 +0200
Subject: [PATCH 0371/1963] refactor(client): Improve logging in the client

---
 src/client/ua_client.c               | 24 +++++++++++++++++++-----
 src/client/ua_client_connect.c       |  4 ++--
 src/client/ua_client_subscriptions.c |  8 ++++----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d624c703c54..7d0eb987104 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -270,9 +270,6 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
-    UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                   "Processing request with RequestId %u", requestId);
-
     UA_Response asyncResponse;
     UA_Response *response = (ac->syncResponse) ? ac->syncResponse : &asyncResponse;
     const UA_DataType *responseType = ac->responseType;
@@ -348,17 +345,34 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
                        UA_ByteString *message) {
     UA_Client *client = (UA_Client*)application;
 
+    if(!UA_SecureChannel_isConnected(channel)) {
+        if(messageType == UA_MESSAGETYPE_MSG) {
+            UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Discard MSG message "
+                                 "with RequestId %u as the SecureChannel is not connected",
+                                 requestId);
+        } else {
+            UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Discard message "
+                                 "as the SecureChannel is not connected");
+        }
+        return UA_STATUSCODE_BADCONNECTIONCLOSED;
+    }
+
     switch(messageType) {
     case UA_MESSAGETYPE_ACK:
+        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process ACK message");
         processACKResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_OPN:
+        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process OPN message");
         processOPNResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_ERR:
+        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process ERR message");
         processERRResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_MSG:
+        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process MSG message "
+                             "with RequestId %u", requestId);
         return processMSGResponse(client, requestId, message);
     default:
         UA_LOG_TRACE_CHANNEL(&client->config.logger, channel,
@@ -525,8 +539,8 @@ __UA_Client_AsyncServiceEx(UA_Client *client, const void *request,
                            void *userdata, UA_UInt32 *requestId,
                            UA_UInt32 timeout) {
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                    "SecureChannel must be connected before sending requests");
+        UA_LOG_WARNING_CHANNEL(&client->config.logger, &client->channel,
+                               "SecureChannel must be connected before sending requests");
         return UA_STATUSCODE_BADSERVERNOTCONNECTED;
     }
 
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 80c099019f1..135b7a91230 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -262,8 +262,6 @@ processACKResponse(UA_Client *client, const UA_ByteString *chunk) {
         return;
     }
 
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_NETWORK, "Received ACK message");
-
     /* Decode the message */
     size_t offset = 0;
     UA_TcpAcknowledgeMessage ackMessage;
@@ -1345,6 +1343,8 @@ closeSecureChannel(UA_Client *client) {
 
     /* Send CLO if the SecureChannel is open */
     if(client->channel.state == UA_SECURECHANNELSTATE_OPEN) {
+        UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
+                             "Sending the CLO message");
         UA_CloseSecureChannelRequest request;
         UA_CloseSecureChannelRequest_init(&request);
         request.requestHeader.requestHandle = ++client->requestHandle;
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index b35f8ac388f..0b572fc2d60 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -1060,8 +1060,8 @@ UA_Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishRequ
                            "Too many publishrequest, reduce outStandingPublishRequests "
                            "to %" PRId16, client->config.outStandingPublishRequests);
         } else {
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                         "Too many publishrequest when outStandingPublishRequests = 1");
+            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                           "Too many publishrequest when outStandingPublishRequests = 1");
             UA_Client_Subscriptions_deleteSingle(client, response->subscriptionId);
         }
         return;
@@ -1216,8 +1216,8 @@ UA_Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client) {
             if(client->config.subscriptionInactivityCallback)
                 client->config.subscriptionInactivityCallback(client, sub->subscriptionId,
                                                               sub->context);
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                         "Inactivity for Subscription %" PRIu32 ".", sub->subscriptionId);
+            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                           "Inactivity for Subscription %" PRIu32 ".", sub->subscriptionId);
         }
     }
 }

From 3536776c7357c4018c0a8da957da3f61459a4004 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:52:51 +0200
Subject: [PATCH 0372/1963] refactor(server): Cosmetic and logging improvements

---
 src/server/ua_server_internal.h        |  9 +++---
 src/server/ua_services_discovery.c     |  3 +-
 src/server/ua_services_securechannel.c | 40 +++++++++++---------------
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 954fe5e336e..bd88013845b 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -365,7 +365,8 @@ deleteNode(UA_Server *server, const UA_NodeId nodeId,
            UA_Boolean deleteReferences);
 
 UA_StatusCode
-addNode(UA_Server *server, const UA_NodeClass nodeClass, const UA_NodeId *requestedNewNodeId,
+addNode(UA_Server *server, const UA_NodeClass nodeClass,
+        const UA_NodeId *requestedNewNodeId,
         const UA_NodeId *parentNodeId, const UA_NodeId *referenceTypeId,
         const UA_QualifiedName browseName, const UA_NodeId *typeDefinition,
         const UA_NodeAttributes *attr, const UA_DataType *attributeType,
@@ -454,7 +455,8 @@ void
 removeCallback(UA_Server *server, UA_UInt64 callbackId);
 
 UA_StatusCode
-changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId, UA_Double interval_ms);
+changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId,
+                               UA_Double interval_ms);
 
 UA_StatusCode
 addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
@@ -462,8 +464,7 @@ addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
 
 #ifdef UA_ENABLE_DISCOVERY
 UA_StatusCode
-register_server_with_discovery_server(UA_Server *server,
-                                      void *client,
+register_server_with_discovery_server(UA_Server *server, void *client,
                                       const UA_Boolean isUnregister,
                                       const char* semaphoreFilePath);
 #endif
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 548b552b039..c297191de00 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -599,8 +599,7 @@ UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-
-    if (client->connection.state != UA_CONNECTIONSTATE_CLOSED) {
+    if(UA_SecureChannel_isConnected(&client->channel)) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINVALIDSTATE;
     }
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index 5b4deafb166..cb39188b226 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -207,9 +207,9 @@ UA_Server_configSecureChannel(void *application, UA_SecureChannel *channel,
         if(!UA_ByteString_equal(&asymHeader->securityPolicyUri, &policy->policyUri))
             continue;
 
-        UA_StatusCode retval = policy->asymmetricModule.
+        UA_StatusCode res = policy->asymmetricModule.
             compareCertificateThumbprint(policy, &asymHeader->receiverCertificateThumbprint);
-        if(retval != UA_STATUSCODE_GOOD)
+        if(res != UA_STATUSCODE_GOOD)
             continue;
 
         /* We found the correct policy (except for security mode). The endpoint
@@ -222,16 +222,10 @@ UA_Server_configSecureChannel(void *application, UA_SecureChannel *channel,
     if(!securityPolicy)
         return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
 
-    /* Create the channel context and parse the sender (remote) certificate used for the
-     * secureChannel. */
-    UA_StatusCode retval =
-        UA_SecureChannel_setSecurityPolicy(channel, securityPolicy,
-                                           &asymHeader->senderCertificate);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-
-    channel->securityToken.tokenId = server->lastTokenId++;
-    return UA_STATUSCODE_GOOD;
+    /* Create the channel context and parse the sender (remote) certificate used
+     * for the secureChannel. */
+    return UA_SecureChannel_setSecurityPolicy(channel, securityPolicy,
+                                              &asymHeader->senderCertificate);
 }
 
 static UA_StatusCode
@@ -309,7 +303,7 @@ UA_SecureChannelManager_renew(UA_Server *server, UA_SecureChannel *channel,
     }
 
     /* Create a new SecurityToken. Will be switched over when the first message
-     * is received. */
+     * is received. The ChannelId is left unchanged. */
     channel->altSecurityToken = channel->securityToken;
     channel->altSecurityToken.tokenId = server->lastTokenId++;
     channel->altSecurityToken.createdAt = UA_DateTime_nowMonotonic();
@@ -371,19 +365,19 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
     /* Open the channel */
     response->responseHeader.serviceResult =
         UA_SecureChannelManager_open(server, channel, request, response);
-
-    /* Logging */
-    if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
-        UA_Float lifetime = (UA_Float)response->securityToken.revisedLifetime / 1000;
-        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
-                            "SecureChannel opened with SecurityPolicy %.*s "
-                            "and a revised lifetime of %.2fs",
-                            (int)channel->securityPolicy->policyUri.length,
-                            channel->securityPolicy->policyUri.data, lifetime);
-    } else {
+    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
                             "Opening a SecureChannel failed");
+        return;
     }
+
+    /* Log the lifetime */
+    UA_Float lifetime = (UA_Float)response->securityToken.revisedLifetime / 1000;
+    UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+                        "SecureChannel opened with SecurityPolicy %.*s "
+                        "and a revised lifetime of %.2fs",
+                        (int)channel->securityPolicy->policyUri.length,
+                        channel->securityPolicy->policyUri.data, lifetime);
 }
 
 /* The server does not send a CloseSecureChannel response */

From 38ff117bcedb5eb2a81e7f4871d026b7c1d92a25 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:55:26 +0200
Subject: [PATCH 0373/1963] refactor(core): The SecureChannel directly uses the
 EventLoop connection

---
 src/ua_securechannel.c                        | 142 +++++++++++-------
 src/ua_securechannel.h                        |  14 +-
 src/ua_securechannel_crypto.c                 |   2 +-
 tests/check_securechannel.c                   |  38 ++---
 tests/testing-plugins/testing_networklayers.c | 110 +++++---------
 tests/testing-plugins/testing_networklayers.h |  27 +---
 6 files changed, 145 insertions(+), 188 deletions(-)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 0212f20136b..5469953acb8 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -147,25 +147,23 @@ UA_SecureChannel_deleteBuffered(UA_SecureChannel *channel) {
 }
 
 void
-UA_SecureChannel_close(UA_SecureChannel *channel) {
-    /* Set the status to closed */
-    channel->state = UA_SECURECHANNELSTATE_CLOSED;
+UA_SecureChannel_shutdown(UA_SecureChannel *channel) {
+    /* No open socket or already closing -> nothing to do */
+    if(!UA_SecureChannel_isConnected(channel))
+        return;
 
-    /* Detach from the connection and close the connection */
-    if(channel->connection) {
-        if(channel->connection->state != UA_CONNECTIONSTATE_CLOSED) {
-            if(channel->connection->close)
-                channel->connection->close(channel->connection);
-            else
-                channel->connection->state = UA_CONNECTIONSTATE_CLOSED;
-        }
-        UA_Connection_detachSecureChannel(channel->connection);
-    }
+    /* Trigger the async closing of the connection */
+    UA_ConnectionManager *cm = channel->connectionManager;
+    cm->closeConnection(cm, channel->connectionId);
+    channel->state = UA_SECURECHANNELSTATE_CLOSING;
+}
 
+void
+UA_SecureChannel_clear(UA_SecureChannel *channel) {
     /* Detach Sessions from the SecureChannel. This also removes outstanding
      * Publish requests whose RequestId is valid only for the SecureChannel. */
-    UA_SessionHeader *sh;
-    while((sh = SLIST_FIRST(&channel->sessions))) {
+    UA_SessionHeader *sh, *sh_tmp;
+    SLIST_FOREACH_SAFE(sh, &channel->sessions, next, sh_tmp) {
         if(sh->serverSession) {
             UA_Session_detachFromSecureChannel((UA_Session *)sh);
         } else {
@@ -188,6 +186,13 @@ UA_SecureChannel_close(UA_SecureChannel *channel) {
     UA_ChannelSecurityToken_clear(&channel->securityToken);
     UA_ChannelSecurityToken_clear(&channel->altSecurityToken);
     UA_SecureChannel_deleteBuffered(channel);
+
+    /* The EventLoop connection is no longer valid */
+    channel->connectionId = 0;
+    channel->connectionManager = NULL;
+
+    /* Set the state to closed */
+    channel->state = UA_SECURECHANNELSTATE_CLOSED;
 }
 
 UA_StatusCode
@@ -216,7 +221,6 @@ UA_SecureChannel_processHELACK(UA_SecureChannel *channel,
         channel->config.remoteMaxMessageSize < 8192))
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    channel->connection->state = UA_CONNECTIONSTATE_ESTABLISHED;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -228,14 +232,18 @@ UA_SecureChannel_sendAsymmetricOPNMessage(UA_SecureChannel *channel,
     UA_CHECK(channel->securityMode != UA_MESSAGESECURITYMODE_INVALID,
              return UA_STATUSCODE_BADSECURITYMODEREJECTED);
 
+    /* Can we use the connection manager? */
+    UA_ConnectionManager *cm = channel->connectionManager;
+    if(!UA_SecureChannel_isConnected(channel))
+        return UA_STATUSCODE_BADCONNECTIONCLOSED;
+
     const UA_SecurityPolicy *sp = channel->securityPolicy;
-    UA_Connection *conn = channel->connection;
     UA_CHECK_MEM(sp, return UA_STATUSCODE_BADINTERNALERROR);
-    UA_CHECK_MEM(conn, return UA_STATUSCODE_BADINTERNALERROR);
 
     /* Allocate the message buffer */
     UA_ByteString buf = UA_BYTESTRING_NULL;
-    UA_StatusCode res = conn->getSendBuffer(conn, channel->config.sendBufferSize, &buf);
+    UA_StatusCode res = cm->allocNetworkBuffer(cm, channel->connectionId, &buf,
+                                               channel->config.sendBufferSize);
     UA_CHECK_STATUS(res, return res);
 
     /* Restrict buffer to the available space for the payload */
@@ -243,18 +251,21 @@ UA_SecureChannel_sendAsymmetricOPNMessage(UA_SecureChannel *channel,
     const UA_Byte *buf_end = &buf.data[buf.length];
     hideBytesAsym(channel, &buf_pos, &buf_end);
 
+    /* Define variables here to pacify some compilers wrt goto */
+    size_t securityHeaderLength, pre_sig_length, total_length, encryptedLength;
+
     /* Encode the message type and content */
     res |= UA_NodeId_encodeBinary(&contentType->binaryEncodingId, &buf_pos, buf_end);
-    res |= UA_encodeBinaryInternal(content, contentType,
-                                   &buf_pos, &buf_end, NULL, NULL);
-    UA_CHECK_STATUS(res, conn->releaseSendBuffer(conn, &buf); return res);
+    res |= UA_encodeBinaryInternal(content, contentType, &buf_pos, &buf_end, NULL, NULL);
+    UA_CHECK_STATUS(res, goto error);
 
-    const size_t securityHeaderLength = calculateAsymAlgSecurityHeaderLength(channel);
+    /* Compute the header length */
+    securityHeaderLength = calculateAsymAlgSecurityHeaderLength(channel);
 
-#ifdef UA_ENABLE_ENCRYPTION
     /* Add padding to the chunk. Also pad if the securityMode is SIGN_ONLY,
      * since we are using asymmetric communication to exchange keys and thus
      * need to encrypt. */
+#ifdef UA_ENABLE_ENCRYPTION
     if(channel->securityMode != UA_MESSAGESECURITYMODE_NONE)
         padChunk(channel, &channel->securityPolicy->asymmetricModule.cryptoModule,
                  &buf.data[UA_SECURECHANNEL_CHANNELHEADER_LENGTH + securityHeaderLength],
@@ -262,8 +273,8 @@ UA_SecureChannel_sendAsymmetricOPNMessage(UA_SecureChannel *channel,
 #endif
 
     /* The total message length */
-    size_t pre_sig_length = (uintptr_t)buf_pos - (uintptr_t)buf.data;
-    size_t total_length = pre_sig_length;
+    pre_sig_length = (uintptr_t)buf_pos - (uintptr_t)buf.data;
+    total_length = pre_sig_length;
     if(channel->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        channel->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
         total_length += sp->asymmetricModule.cryptoModule.signatureAlgorithm.
@@ -271,23 +282,22 @@ UA_SecureChannel_sendAsymmetricOPNMessage(UA_SecureChannel *channel,
 
     /* The total message length is known here which is why we encode the headers
      * at this step and not earlier. */
-    size_t encryptedLength = 0;
     res = prependHeadersAsym(channel, buf.data, buf_end, total_length,
                              securityHeaderLength, requestId, &encryptedLength);
-    UA_CHECK_STATUS(res, conn->releaseSendBuffer(conn, &buf); return res);
+    UA_CHECK_STATUS(res, goto error);
 
 #ifdef UA_ENABLE_ENCRYPTION
     res = signAndEncryptAsym(channel, pre_sig_length, &buf,
                              securityHeaderLength, total_length);
-    UA_CHECK_STATUS(res, conn->releaseSendBuffer(conn, &buf); return res);
+    UA_CHECK_STATUS(res, goto error);
 #endif
 
     /* Send the message, the buffer is freed in the network layer */
     buf.length = encryptedLength;
-    res = conn->send(conn, &buf);
-#ifdef UA_ENABLE_UNIT_TEST_FAILURE_HOOKS
-    res |= sendAsym_sendFailure;
-#endif
+    return cm->sendWithConnection(cm, channel->connectionId, 0, NULL, &buf);
+
+ error:
+    cm->freeNetworkBuffer(cm, channel->connectionId, &buf);
     return res;
 }
 
@@ -345,8 +355,9 @@ static UA_StatusCode
 sendSymmetricChunk(UA_MessageContext *mc) {
     UA_SecureChannel *channel = mc->channel;
     const UA_SecurityPolicy *sp = channel->securityPolicy;
-    UA_Connection *connection = channel->connection;
-    UA_CHECK_MEM(connection, return UA_STATUSCODE_BADINTERNALERROR);
+    UA_ConnectionManager *cm = channel->connectionManager;
+    if(!UA_SecureChannel_isConnected(channel))
+        return UA_STATUSCODE_BADCONNECTIONCLOSED;
 
     /* The size of the message payload */
     size_t bodyLength = (uintptr_t)mc->buf_pos -
@@ -405,12 +416,17 @@ sendSymmetricChunk(UA_MessageContext *mc) {
     UA_CHECK_STATUS(res, goto error);
 #endif
 
-    /* Send the chunk, the buffer is freed in the network layer */
-    return connection->send(channel->connection, &mc->messageBuffer);
+    /* Send the chunk. The buffer is freed in the network layer. If sending goes
+     * wrong, the connection is removed in the next iteration of the
+     * SecureChannel. Set the SecureChannel to closing already. */
+    res = cm->sendWithConnection(cm, channel->connectionId,
+                                 0, NULL, &mc->messageBuffer);
+    if(res != UA_STATUSCODE_GOOD && UA_SecureChannel_isConnected(channel))
+        channel->state = UA_SECURECHANNELSTATE_CLOSING;
 
  error:
     /* Free the unused message buffer */
-    connection->releaseSendBuffer(channel->connection, &mc->messageBuffer);
+    cm->freeNetworkBuffer(cm, channel->connectionId, &mc->messageBuffer);
     return res;
 }
 
@@ -428,11 +444,13 @@ sendSymmetricEncodingCallback(void *data, UA_Byte **buf_pos,
     UA_CHECK_STATUS(res, return res);
 
     /* Set a new buffer for the next chunk */
-    UA_Connection *c = mc->channel->connection;
-    UA_CHECK_MEM(c, return UA_STATUSCODE_BADINTERNALERROR);
+    UA_ConnectionManager *cm = mc->channel->connectionManager;
+    if(!UA_SecureChannel_isConnected(mc->channel))
+        return UA_STATUSCODE_BADCONNECTIONCLOSED;
 
-    res = c->getSendBuffer(c, mc->channel->config.sendBufferSize,
-                           &mc->messageBuffer);
+    res = cm->allocNetworkBuffer(cm, mc->channel->connectionId,
+                                 &mc->messageBuffer,
+                                 mc->channel->config.sendBufferSize);
     UA_CHECK_STATUS(res, return res);
 
     /* Hide bytes for header, padding and signature */
@@ -448,8 +466,9 @@ UA_MessageContext_begin(UA_MessageContext *mc, UA_SecureChannel *channel,
     UA_CHECK(messageType == UA_MESSAGETYPE_MSG || messageType == UA_MESSAGETYPE_CLO,
              return UA_STATUSCODE_BADINTERNALERROR);
 
-    UA_Connection *c = channel->connection;
-    UA_CHECK_MEM(c, return UA_STATUSCODE_BADINTERNALERROR);
+    UA_ConnectionManager *cm = channel->connectionManager;
+    if(!UA_SecureChannel_isConnected(channel))
+        return UA_STATUSCODE_BADCONNECTIONCLOSED;
 
     /* Create the chunking info structure */
     mc->channel = channel;
@@ -461,8 +480,10 @@ UA_MessageContext_begin(UA_MessageContext *mc, UA_SecureChannel *channel,
     mc->messageType = messageType;
 
     /* Allocate the message buffer */
-    UA_StatusCode res = c->getSendBuffer(c, channel->config.sendBufferSize,
-                                         &mc->messageBuffer);
+    UA_StatusCode res =
+        cm->allocNetworkBuffer(cm, channel->connectionId,
+                               &mc->messageBuffer,
+                               channel->config.sendBufferSize);
     UA_CHECK_STATUS(res, return res);
 
     /* Hide bytes for header, padding and signature */
@@ -489,23 +510,22 @@ UA_MessageContext_finish(UA_MessageContext *mc) {
 
 void
 UA_MessageContext_abort(UA_MessageContext *mc) {
-    UA_Connection *connection = mc->channel->connection;
-    connection->releaseSendBuffer(connection, &mc->messageBuffer);
+    UA_ConnectionManager *cm = mc->channel->connectionManager;
+    if(!UA_SecureChannel_isConnected(mc->channel))
+        return;
+    cm->freeNetworkBuffer(cm, mc->channel->connectionId, &mc->messageBuffer);
 }
 
 UA_StatusCode
 UA_SecureChannel_sendSymmetricMessage(UA_SecureChannel *channel, UA_UInt32 requestId,
                                       UA_MessageType messageType, void *payload,
                                       const UA_DataType *payloadType) {
-    if(!channel || !channel->connection || !payload || !payloadType)
+    if(!channel || !payload || !payloadType)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     if(channel->state != UA_SECURECHANNELSTATE_OPEN)
         return UA_STATUSCODE_BADCONNECTIONCLOSED;
 
-    if(channel->connection->state != UA_CONNECTIONSTATE_ESTABLISHED)
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-
     UA_MessageContext mc;
     UA_StatusCode res = UA_MessageContext_begin(&mc, channel, requestId, messageType);
     UA_CHECK_STATUS(res, return res);
@@ -583,15 +603,21 @@ unpackPayloadOPN(UA_SecureChannel *channel, UA_Chunk *chunk, void *application)
     if(secureChannelId != 0 && channel->securityToken.channelId == 0)
         channel->securityToken.channelId = secureChannelId;
 
+    /* Check the ChannelId */
 #if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
-    /* Check the ChannelId. Non-opened channels have the id zero. */
     if(secureChannelId != channel->securityToken.channelId) {
-        res = UA_STATUSCODE_BADSECURECHANNELIDINVALID;
-        goto error;
+        /* Allow the channel id to be different if the sent channel id is zero
+         * and the SecurityToken is not initialized. This only happens on the
+         * server side before we had a chance to tell the client which ChannelId
+         * to use. */
+        if(secureChannelId != 0 || channel->securityToken.tokenId != 0) {
+            res = UA_STATUSCODE_BADSECURECHANNELIDINVALID;
+            goto error;
+        }
     }
 #endif
 
-    /* Check the header */
+    /* Check the header for the channel's security policy */
     res = checkAsymHeader(channel, &asymHeader);
     UA_AsymmetricAlgorithmSecurityHeader_clear(&asymHeader);
     UA_CHECK_STATUS(res, return res);
@@ -638,8 +664,8 @@ unpackPayloadMSG(UA_SecureChannel *channel, UA_Chunk *chunk) {
 
 #if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
     /* Check the ChannelId. Non-opened channels have the id zero. */
-    UA_CHECK(secureChannelId == channel->securityToken.channelId,
-             return UA_STATUSCODE_BADSECURECHANNELIDINVALID);
+    if(secureChannelId != channel->securityToken.channelId)
+        return UA_STATUSCODE_BADSECURECHANNELIDINVALID;
 #endif
 
     /* Check (and revolve) the SecurityToken */
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index b10c9dce920..295e99e3179 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -15,11 +15,11 @@
 #include <open62541/types.h>
 #include <open62541/plugin/log.h>
 #include <open62541/plugin/securitypolicy.h>
+#include <open62541/plugin/eventloop.h>
 #include <open62541/transport_generated.h>
 
 #include "open62541_queue.h"
 #include "ua_util_internal.h"
-#include "ua_connection_internal.h"
 
 _UA_BEGIN_DECLS
 
@@ -101,6 +101,10 @@ struct UA_SecureChannel {
     UA_MessageSecurityMode securityMode;
     UA_ConnectionConfig config;
 
+    /* Connection handling in the EventLoop */
+    UA_ConnectionManager *connectionManager;
+    uintptr_t connectionId;
+
     /* Rules for revolving the token with a renew OPN request: The client is
      * allowed to accept messages with the old token until the OPN response has
      * arrived. The server accepts the old token until one message secured with
@@ -115,7 +119,6 @@ struct UA_SecureChannel {
     /* The endpoint and context of the channel */
     const UA_SecurityPolicy *securityPolicy;
     void *channelContext; /* For interaction with the security policy */
-    UA_Connection *connection;
 
     /* Asymmetric encryption info */
     UA_ByteString remoteCertificate;
@@ -156,7 +159,12 @@ struct UA_SecureChannel {
 
 void UA_SecureChannel_init(UA_SecureChannel *channel);
 
-void UA_SecureChannel_close(UA_SecureChannel *channel);
+/* Trigger the shutdown */
+void UA_SecureChannel_shutdown(UA_SecureChannel *channel);
+
+/* Eventual cleanup after the channel has closed. It is possible to call _init
+ * on the channel afterwards to reset it to the fresh status. */
+void UA_SecureChannel_clear(UA_SecureChannel *channel);
 
 /* Process the remote configuration in the HEL/ACK handshake. The connection
  * config is initialized with the local settings. */
diff --git a/src/ua_securechannel_crypto.c b/src/ua_securechannel_crypto.c
index 4c461f81574..f6cf330d299 100644
--- a/src/ua_securechannel_crypto.c
+++ b/src/ua_securechannel_crypto.c
@@ -561,7 +561,7 @@ checkSymHeader(UA_SecureChannel *channel, const UA_UInt32 tokenId) {
        timeout < UA_DateTime_nowMonotonic()) {
         UA_LOG_WARNING_CHANNEL(channel->securityPolicy->logger, channel,
                                "SecurityToken timed out");
-        UA_SecureChannel_close(channel);
+        UA_SecureChannel_shutdown(channel);
         return UA_STATUSCODE_BADSECURECHANNELCLOSED;
     }
 
diff --git a/tests/check_securechannel.c b/tests/check_securechannel.c
index 166b368f7e5..852605735db 100644
--- a/tests/check_securechannel.c
+++ b/tests/check_securechannel.c
@@ -31,32 +31,28 @@ UA_SecureChannel testChannel;
 UA_ByteString dummyCertificate =
     UA_BYTESTRING_STATIC("DUMMY CERTIFICATE DUMMY CERTIFICATE DUMMY CERTIFICATE");
 UA_SecurityPolicy dummyPolicy;
-UA_Connection testingConnection;
 UA_ByteString sentData;
 
-
 static funcs_called fCalled;
 static key_sizes keySizes;
 
 static void
 setup_secureChannel(void) {
     TestingPolicy(&dummyPolicy, dummyCertificate, &fCalled, &keySizes);
-    UA_SecureChannel_init(&testChannel, &UA_ConnectionConfig_default);
+    UA_SecureChannel_init(&testChannel);
+    testChannel.config = UA_ConnectionConfig_default;
     UA_SecureChannel_setSecurityPolicy(&testChannel, &dummyPolicy, &dummyCertificate);
 
-    testingConnection =
-        createDummyConnection(UA_ConnectionConfig_default.sendBufferSize, &sentData);
-    UA_Connection_attachSecureChannel(&testingConnection, &testChannel);
-    testChannel.connection = &testingConnection;
-
+    testChannel.connectionManager = &testConnectionManagerTCP;
     testChannel.state = UA_SECURECHANNELSTATE_OPEN;
+    testConnectionLastSentBuf = &sentData;
 }
 
 static void
 teardown_secureChannel(void) {
-    UA_SecureChannel_close(&testChannel);
+    UA_SecureChannel_clear(&testChannel);
     dummyPolicy.clear(&dummyPolicy);
-    testingConnection.close(&testingConnection);
+    UA_ByteString_clear(&sentData);
 }
 
 static void
@@ -97,7 +93,8 @@ START_TEST(SecureChannel_initAndDelete) {
     UA_StatusCode retval;
 
     UA_SecureChannel channel;
-    UA_SecureChannel_init(&channel, &UA_ConnectionConfig_default);
+    UA_SecureChannel_init(&channel);
+    channel.config = UA_ConnectionConfig_default;
     retval = UA_SecureChannel_setSecurityPolicy(&channel, &dummyPolicy, &dummyCertificate);
 
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode to be good");
@@ -107,7 +104,7 @@ START_TEST(SecureChannel_initAndDelete) {
                   "Expected makeCertificateThumbprint to have been called");
     ck_assert_msg(channel.securityPolicy == &dummyPolicy, "SecurityPolicy not set correctly");
 
-    UA_SecureChannel_close(&channel);
+    UA_SecureChannel_clear(&channel);
     ck_assert_msg(fCalled.deleteContext, "Expected deleteContext to have been called");
 
     dummyPolicy.clear(&dummyPolicy);
@@ -119,22 +116,6 @@ createDummyResponse(UA_OpenSecureChannelResponse *response) {
     memset(response, 0, sizeof(UA_OpenSecureChannelResponse));
 }
 
-START_TEST(SecureChannel_sendAsymmetricOPNMessage_withoutConnection) {
-    UA_OpenSecureChannelResponse dummyResponse;
-    createDummyResponse(&dummyResponse);
-    testChannel.securityMode = UA_MESSAGESECURITYMODE_NONE;
-
-    // Remove connection to provoke error
-    UA_Connection_detachSecureChannel(testChannel.connection);
-    testChannel.connection = NULL;
-
-    UA_StatusCode retval =
-        UA_SecureChannel_sendAsymmetricOPNMessage(&testChannel, 42, &dummyResponse,
-                                                  &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
-
-    ck_assert_msg(retval != UA_STATUSCODE_GOOD, "Expected failure without a connection");
-}END_TEST
-
 START_TEST(SecureChannel_sendAsymmetricOPNMessage_invalidParameters) {
     UA_OpenSecureChannelResponse dummyResponse;
     createDummyResponse(&dummyResponse);
@@ -568,7 +549,6 @@ testSuite_SecureChannel(void) {
     tcase_add_checked_fixture(tc_sendAsymmetricOPNMessage, setup_funcs_called, teardown_funcs_called);
     tcase_add_checked_fixture(tc_sendAsymmetricOPNMessage, setup_key_sizes, teardown_key_sizes);
     tcase_add_checked_fixture(tc_sendAsymmetricOPNMessage, setup_secureChannel, teardown_secureChannel);
-    tcase_add_test(tc_sendAsymmetricOPNMessage, SecureChannel_sendAsymmetricOPNMessage_withoutConnection);
     tcase_add_test(tc_sendAsymmetricOPNMessage, SecureChannel_sendAsymmetricOPNMessage_invalidParameters);
     tcase_add_test(tc_sendAsymmetricOPNMessage, SecureChannel_sendAsymmetricOPNMessage_SecurityModeInvalid);
     tcase_add_test(tc_sendAsymmetricOPNMessage, SecureChannel_sendAsymmetricOPNMessage_SecurityModeNone);
diff --git a/tests/testing-plugins/testing_networklayers.c b/tests/testing-plugins/testing_networklayers.c
index 3a9a89be29d..20e589c5518 100644
--- a/tests/testing-plugins/testing_networklayers.c
+++ b/tests/testing-plugins/testing_networklayers.c
@@ -4,93 +4,53 @@
 
 #include "testing_networklayers.h"
 
-#include <open62541/server_config_default.h>
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "testing_clock.h"
-
-static UA_ByteString *vBuffer;
-static UA_ByteString sendBuffer;
-
-UA_StatusCode UA_Client_recvTesting_result = UA_STATUSCODE_GOOD;
+UA_ByteString *testConnectionLastSentBuf;
 
 static UA_StatusCode
-dummyGetSendBuffer(UA_Connection *connection, size_t length, UA_ByteString *buf) {
-    if(length > sendBuffer.length)
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    *buf = sendBuffer;
-    buf->length = length;
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-dummyReleaseSendBuffer(UA_Connection *connection, UA_ByteString *buf) {
+testOpenConnection(UA_ConnectionManager *cm,
+                    size_t paramsSize, const UA_KeyValuePair *params,
+                    void *application, void *context,
+                    UA_ConnectionManager_connectionCallback connectionCallback) {
+    return UA_STATUSCODE_BADNOTCONNECTED;
 }
 
 static UA_StatusCode
-dummySend(UA_Connection *connection, UA_ByteString *buf) {
-    assert(connection != NULL);
-    assert(buf != NULL);
-
-    if(vBuffer) {
-        UA_ByteString_clear(vBuffer);
-        UA_ByteString_copy(buf, vBuffer);
+testSendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
+                       size_t paramsSize, const UA_KeyValuePair *params,
+                       UA_ByteString *buf) {
+    if(testConnectionLastSentBuf) {
+        UA_ByteString_clear(testConnectionLastSentBuf);
+        *testConnectionLastSentBuf = *buf;
+        UA_ByteString_init(buf);
+    } else {
+        UA_ByteString_clear(buf);
     }
     return UA_STATUSCODE_GOOD;
 }
 
-static void
-dummyReleaseRecvBuffer(UA_Connection *connection, UA_ByteString *buf) {
+static UA_StatusCode
+testCloseConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
+    return UA_STATUSCODE_GOOD;
 }
 
-static void
-dummyClose(UA_Connection *connection) {
-    if(vBuffer)
-        UA_ByteString_clear(vBuffer);
-    UA_ByteString_clear(&sendBuffer);
+static UA_StatusCode
+testAllocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                        UA_ByteString *buf, size_t bufSize) {
+    return UA_ByteString_allocBuffer(buf, bufSize);
 }
 
-UA_Connection createDummyConnection(size_t sendBufferSize,
-                                    UA_ByteString *verificationBuffer) {
-    vBuffer = verificationBuffer;
-    UA_ByteString_allocBuffer(&sendBuffer, sendBufferSize);
-
-    UA_Connection c;
-    c.state = UA_CONNECTIONSTATE_ESTABLISHED;
-    c.channel = NULL;
-    c.sockfd = UA_INVALID_SOCKET;
-    c.handle = NULL;
-    c.getSendBuffer = dummyGetSendBuffer;
-    c.releaseSendBuffer = dummyReleaseSendBuffer;
-    c.send = dummySend;
-    c.recv = NULL;
-    c.releaseRecvBuffer = dummyReleaseRecvBuffer;
-    c.close = dummyClose;
-    return c;
+static void
+testFreeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                      UA_ByteString *buf) {
+    UA_ByteString_clear(buf);
 }
 
-UA_UInt32 UA_Client_recvSleepDuration;
-UA_StatusCode (*UA_Client_recv)(UA_Connection *connection, UA_ByteString *response,
-                                UA_UInt32 timeout);
-
-UA_StatusCode
-UA_Client_recvTesting(UA_Connection *connection, UA_ByteString *response,
-                    UA_UInt32 timeout) {
-
-    if(UA_Client_recvTesting_result != UA_STATUSCODE_GOOD) {
-        UA_StatusCode temp = UA_Client_recvTesting_result;
-        UA_Client_recvTesting_result = UA_STATUSCODE_GOOD;
-        UA_fakeSleep(timeout);
-        return temp;
-    }
-
-    UA_StatusCode res = UA_Client_recv(connection, response, timeout);
-    if(res == UA_STATUSCODE_GOODNONCRITICALTIMEOUT)
-        UA_fakeSleep(timeout);
-    else
-        UA_fakeSleep(UA_Client_recvSleepDuration);
-    UA_Client_recvSleepDuration = 0;
-    return res;
-}
+UA_ConnectionManager testConnectionManagerTCP = {
+    {0}, /* eventSource */
+    UA_STRING_STATIC("tcp"),
+    testOpenConnection,
+    testSendWithConnection,
+    testCloseConnection,
+    testAllocNetworkBuffer,
+    testFreeNetworkBuffer
+};
diff --git a/tests/testing-plugins/testing_networklayers.h b/tests/testing-plugins/testing_networklayers.h
index 1dcabab2730..cb2b7624686 100644
--- a/tests/testing-plugins/testing_networklayers.h
+++ b/tests/testing-plugins/testing_networklayers.h
@@ -5,32 +5,15 @@
 #ifndef TESTING_NETWORKLAYERS_H_
 #define TESTING_NETWORKLAYERS_H_
 
-#include <open62541/server.h>
+#include <open62541/plugin/eventloop.h>
 
 _UA_BEGIN_DECLS
 
-/**
- * Create the TCP networklayer and listen to the specified port
- *
- * @param sendBufferSize The send buffer is reused. This is the max chunk size
- * @param verificationBuffer the send function will copy the data that is sent
- *        to this buffer, so that it is possible to check what the send function
- *        received. */
-UA_Connection createDummyConnection(size_t sendBufferSize,
-                                    UA_ByteString *verificationBuffer);
+/* If the pointer is non-null, every message sent via the test-ConnectionManager
+ * is copied to the variable */
+extern UA_ByteString *testConnectionLastSentBuf;
 
-extern UA_UInt32 UA_Client_recvSleepDuration;
-extern UA_StatusCode (*UA_Client_recv)(UA_Connection *connection, UA_ByteString *response,
-                                       UA_UInt32 timeout);
-
-extern UA_StatusCode UA_Client_recvTesting_result;
-
-/* Override the client recv method to increase the simulated clock after the first recv.
- * UA_Client_recvSleepDuration is set to zero after the first recv.
- * UA_Client_recvTesting_result can be used to simulate an error */
-UA_StatusCode
-UA_Client_recvTesting(UA_Connection *connection, UA_ByteString *response,
-                    UA_UInt32 timeout);
+extern UA_ConnectionManager testConnectionManagerTCP;
 
 _UA_END_DECLS
 

From 2cdafc1bb96c2ff62ba6d5c1df033de4c791d931 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:56:51 +0200
Subject: [PATCH 0374/1963] refactor(client): The client directly uses the new
 SecureChannel API

---
 src/client/ua_client.c                    |  29 ++-
 src/client/ua_client_connect.c            | 295 ++++++++++++----------
 src/client/ua_client_internal.h           |   2 +-
 tests/client/check_client.c               |   6 +-
 tests/client/check_client_async.c         |  22 +-
 tests/client/check_client_async_connect.c |  32 ++-
 tests/client/check_client_securechannel.c |   9 +-
 tests/client/check_client_subscriptions.c |  65 +----
 8 files changed, 232 insertions(+), 228 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 7d0eb987104..aee6d1d691d 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -22,7 +22,6 @@
 #include <open62541/transport_generated.h>
 
 #include "ua_client_internal.h"
-#include "ua_connection_internal.h"
 #include "ua_types_encoding_binary.h"
 
 static void
@@ -414,6 +413,12 @@ __UA_Client_Service(UA_Client *client, const void *request,
         }
     }
 
+    /* Store the channelId to detect if the channel was changed by a
+     * reconnection within the EventLoop run method. */
+    UA_UInt32 channelId = client->channel.securityToken.channelId;
+
+    /* Send the request. This adds the ac variable to the async call linked list
+     * even though it is stack-allocated. */
     AsyncServiceCall ac;
     ac.callback = NULL;
     ac.userdata = NULL;
@@ -421,10 +426,15 @@ __UA_Client_Service(UA_Client *client, const void *request,
     ac.timeout = client->config.timeout;
     ac.syncResponse = (UA_Response*)response;
 
-    /* Call the service and set the requestId */
     UA_StatusCode retval = sendRequest(client, request, requestType, &ac.requestId);
     if(retval != UA_STATUSCODE_GOOD) {
-        closeSecureChannel(client);
+        /* If sending failed, the status is set to closing. The SecureChannel is
+         * the actually closed in the next iteration of the EventLoop. */
+        UA_assert(client->channel.state == UA_SECURECHANNELSTATE_CLOSING ||
+                  client->channel.state == UA_SECURECHANNELSTATE_CLOSED);
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Sending the request failed with status %s",
+                       UA_StatusCode_name(retval));
         notifyClientState(client);
         respHeader->serviceResult = retval;
         return;
@@ -458,9 +468,17 @@ __UA_Client_Service(UA_Client *client, const void *request,
          * request. */
         if(retval != UA_STATUSCODE_GOOD)
             break;
+
+        /* The connection was lost */
         retval = client->connectStatus;
         if(retval != UA_STATUSCODE_GOOD)
             break;
+
+        /* The channel is no longer the same or was closed */
+        if(channelId != client->channel.securityToken.channelId) {
+            retval = UA_STATUSCODE_BADSECURECHANNELCLOSED;
+            break;
+        }
     }
 
     /* Detach from the internal async service list */
@@ -557,8 +575,11 @@ __UA_Client_AsyncServiceEx(UA_Client *client, const void *request,
     /* Call the service and set the requestId */
     UA_StatusCode retval = sendRequest(client, request, requestType, &ac->requestId);
     if(retval != UA_STATUSCODE_GOOD) {
+        /* If sending failed, the status is set to closing. The SecureChannel is
+         * the actually closed in the next iteration of the EventLoop. */
+        UA_assert(client->channel.state == UA_SECURECHANNELSTATE_CLOSING ||
+                  client->channel.state == UA_SECURECHANNELSTATE_CLOSED);
         UA_free(ac);
-        closeSecureChannel(client);
         notifyClientState(client);
         return retval;
     }
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 135b7a91230..ec43433f0ee 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -16,7 +16,7 @@
 #define UA_SESSION_LOCALNONCELENGTH 32
 #define MAX_DATA_SIZE 4096
 
-static void initConnect(UA_Client *client);
+static UA_StatusCode initConnect(UA_Client *client);
 static void closeSession(UA_Client *client);
 static UA_StatusCode createSessionAsync(UA_Client *client);
 
@@ -257,8 +257,9 @@ processACKResponse(UA_Client *client, const UA_ByteString *chunk) {
     UA_SecureChannel *channel = &client->channel;
     if(channel->state != UA_SECURECHANNELSTATE_HEL_SENT) {
         UA_LOG_ERROR_CHANNEL(&client->config.logger, channel,
-                             "Expected an ACK response");
-        channel->state = UA_SECURECHANNELSTATE_CLOSING;
+                             "SecureChannel not in the HEL-sent state");
+        closeSecureChannel(client);
+        client->connectStatus = UA_STATUSCODE_BADSECURECHANNELCLOSED;
         return;
     }
 
@@ -290,10 +291,14 @@ processACKResponse(UA_Client *client, const UA_ByteString *chunk) {
 
 static UA_StatusCode
 sendHELMessage(UA_Client *client) {
+    UA_ConnectionManager *cm = client->channel.connectionManager;
+    if(!UA_SecureChannel_isConnected(&client->channel))
+        return UA_STATUSCODE_BADNOTCONNECTED;
+
     /* Get a buffer */
     UA_ByteString message;
-    UA_Connection *conn = &client->connection;
-    UA_StatusCode retval = conn->getSendBuffer(conn, UA_MINMESSAGESIZE, &message);
+    UA_StatusCode retval = cm->allocNetworkBuffer(cm, client->channel.connectionId,
+                                                  &message, UA_MINMESSAGESIZE);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -321,21 +326,23 @@ sendHELMessage(UA_Client *client) {
                                      &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER],
                                      &bufPos, &bufEnd, NULL, NULL);
     if(retval != UA_STATUSCODE_GOOD) {
-        conn->releaseSendBuffer(conn, &message);
+        cm->freeNetworkBuffer(cm, client->channel.connectionId, &message);
         return retval;
     }
 
     /* Send the HEL message */
     message.length = messageHeader.messageSize;
-    retval = conn->send(conn, &message);
-    if(retval == UA_STATUSCODE_GOOD) {
-        UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT, "Sent HEL message");
-        client->channel.state = UA_SECURECHANNELSTATE_HEL_SENT;
-    } else {
+    retval = cm->sendWithConnection(cm, client->channel.connectionId,
+                                    0, NULL, &message);
+    if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT, "Sending HEL failed");
         closeSecureChannel(client);
+        return retval;
     }
-    return retval;
+
+    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT, "Sent HEL message");
+    client->channel.state = UA_SECURECHANNELSTATE_HEL_SENT;
+    return UA_STATUSCODE_GOOD;
 }
 
 void
@@ -423,11 +430,8 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
 /* OPN messges to renew the channel are sent asynchronous */
 static UA_StatusCode
 sendOPNAsync(UA_Client *client, UA_Boolean renew) {
-    UA_Connection *conn = &client->connection;
-    if(conn->state != UA_CONNECTIONSTATE_ESTABLISHED) {
-        closeSecureChannel(client);
-        return UA_STATUSCODE_BADNOTCONNECTED;
-    }
+    if(!UA_SecureChannel_isConnected(&client->channel))
+        return UA_STATUSCODE_BADINTERNALERROR;
 
     UA_StatusCode retval = UA_SecureChannel_generateLocalNonce(&client->channel);
     if(retval != UA_STATUSCODE_GOOD)
@@ -497,9 +501,9 @@ responseActivateSession(UA_Client *client, void *userdata, UA_UInt32 requestId,
                      UA_StatusCode_name(ar->responseHeader.serviceResult));
         if(ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
            ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
-            /* The session is no longer usable. Create a new one. */
+            /* The session is no longer usable. Create a brand new one. */
             closeSession(client);
-            createSessionAsync(client);
+            client->connectStatus = createSessionAsync(client);
             UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                          "Session cannot be activated. Create a new Session.");
         } else {
@@ -599,12 +603,19 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
     client->endpointsHandshake = false;
 
     UA_GetEndpointsResponse *resp = (UA_GetEndpointsResponse*)response;
+
     /* GetEndpoints not possible. Fail the connection */
     if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        client->connectStatus = resp->responseHeader.serviceResult;
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                     "GetEndpointRequest failed with error code %s",
-                     UA_StatusCode_name(client->connectStatus));
+        /* Fail the connection attempt if the SecureChannel is still connected.
+         * If the SecureChannel is (intentionally or unintentionally) closed,
+         * the connectStatus should come from there. */
+        if(UA_SecureChannel_isConnected(&client->channel)) {
+           client->connectStatus = resp->responseHeader.serviceResult;
+           UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                        "GetEndpointRequest failed with error code %s",
+                        UA_StatusCode_name(client->connectStatus));
+        }
+
         UA_GetEndpointsResponse_clear(resp);
         return;
     }
@@ -926,7 +937,7 @@ initSecurityPolicy(UA_Client *client) {
 }
 
 static void
-iterateConnect(UA_Client *client) {
+connectActivity(UA_Client *client) {
     UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                  "Client connect iterate");
 
@@ -940,9 +951,13 @@ iterateConnect(UA_Client *client) {
 
     /* Switch on the SecureChannel state */
     switch(client->channel.state) {
+        /* Nothing to do if the connection has not opened fully */
+    case UA_SECURECHANNELSTATE_CONNECTING:
+    case UA_SECURECHANNELSTATE_CLOSING:
+        return;
 
         /* Send HEL */
-    case UA_SECURECHANNELSTATE_FRESH:
+    case UA_SECURECHANNELSTATE_CONNECTED:
         client->connectStatus = sendHELMessage(client);
         return;
 
@@ -952,12 +967,6 @@ iterateConnect(UA_Client *client) {
             client->connectStatus = sendOPNAsync(client, false); /* Send OPN */
         return;
 
-        /* Nothing to do */
-    case UA_SECURECHANNELSTATE_HEL_SENT:
-    case UA_SECURECHANNELSTATE_OPN_SENT:
-    case UA_SECURECHANNELSTATE_CLOSING:
-        return;
-
         /* The channel is open -> continue with the Session handling */
     case UA_SECURECHANNELSTATE_OPEN:
         break;
@@ -965,12 +974,10 @@ iterateConnect(UA_Client *client) {
         /* The connection is closed. Reset the SecureChannel and open a new TCP
          * connection */
     case UA_SECURECHANNELSTATE_CLOSED:
-        initConnect(client);
+        client->connectStatus = initConnect(client);
         return;
 
         /* These states should never occur for the client */
-    case UA_SECURECHANNELSTATE_HEL_RECEIVED:
-    case UA_SECURECHANNELSTATE_ACK_SENT:
     default:
         client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
         return;
@@ -1065,58 +1072,85 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                  "Client network callback");
 
-    /* The connection is still opening */
-    if(state == UA_CONNECTIONSTATE_OPENING) {
-        return;
-    }
-
     /* A new connection is not yet registered */
     if(!*connectionContext) {
-        /* Opening the connection failed */
-        if(state != UA_CONNECTIONSTATE_ESTABLISHED) {
-            /* The client cannot recover from this */
-            client->connectStatus = UA_STATUSCODE_BADCONNECTIONREJECTED;
-            client->connection.state = UA_CONNECTIONSTATE_CLOSED;
-            closeSecureChannel(client);
-            notifyClientState(client);
-            return;
+        /* Opening the connection failed. The client cannot recover from this. */
+        if(state != UA_CONNECTIONSTATE_OPENING &&
+           state != UA_CONNECTIONSTATE_ESTABLISHED) {
+            goto refuse_connection;
         }
 
-        /* Initialize the client connection */
-        UA_Connection *conn = &client->connection;
-        conn->state = UA_CONNECTIONSTATE_OPENING;
-        conn->channel = NULL;
-        conn->sockfd = (UA_SOCKET)connectionId;
-        conn->handle = cm;
-        conn->getSendBuffer = UA_Connection_getSendBuffer;
-        conn->releaseSendBuffer = UA_Connection_releaseBuffer;
-        conn->send = UA_Connection_send;
-        conn->recv = NULL;
-        conn->releaseRecvBuffer = UA_Connection_releaseBuffer;
-        conn->close = UA_Connection_close;
-        conn->free = NULL;
-
-        *connectionContext = conn; /* Set the connection context */
+        /* Inconsistent SecureChannel state. Has to be fresh for a new
+         * connection. */
+        if(client->channel.state != UA_SECURECHANNELSTATE_FRESH) {
+            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                         "Cannot open a connection for SecureChannel that is already used");
+            client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+            goto refuse_connection;
+        }
+
+        /* Initialize the client connection and attach to the EventLoop connection */
+        client->channel.connectionManager = cm;
+        client->channel.connectionId = connectionId;
+        *connectionContext = &client->channel;
+
+        /* If the connection is not fully established we still save the
+         * connectionId in the client now so that the connection can be closed
+         * before it fully opens. Wait for the connection to be established
+         * before sending the HEL message. */
+        if(state == UA_CONNECTIONSTATE_OPENING)
+            client->channel.state = UA_SECURECHANNELSTATE_CONNECTING;
+        else /* state == UA_CONNECTIONSTATE_ESTABLISHED */
+            client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
+        
         goto continue_connect;
     }
 
-    /* A bad status code was sent from an open connection. The connection will
-     * be deleted now in the ConnectionManager. Clean up in the client. */
+    /* The connection is closing in the EventLoop. This is the last callback
+     * from that connection. Clean up the SecureChannel in the client. */
     if(state == UA_CONNECTIONSTATE_CLOSING) {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                    "The TCP connection closed with state %s",
-                    UA_StatusCode_name(state));
-        client->connection.state = UA_CONNECTIONSTATE_CLOSED; /* Do this before
-                                                               * closeSecureChannel */
-        closeSecureChannel(client); /* The channel might be already closed. This
-                                     * is checked within closeSecureChannel. */
-        goto continue_connect; /* We may immediately reconnect */
+        /* Set to closing (could be done already in UA_SecureChannel_shutdown).
+         * This impacts the handling of cancelled requests below. */
+        UA_SecureChannelState oldState = client->channel.state;
+        client->channel.state = UA_SECURECHANNELSTATE_CLOSING;
+
+        /* Set the Session to CREATED if it was ACTIVATED */
+        if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
+            client->sessionState = UA_SESSIONSTATE_CREATED;
+
+        /* Delete outstanding async services - the RequestId is no longer valid. Do
+         * this after setting the Session state. Otherwise we send out new Publish
+         * Requests immediately. */
+        UA_Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSECURECHANNELCLOSED);
+
+        /* Clean up the channel and set the status to CLOSED */
+        UA_SecureChannel_clear(&client->channel);
+
+        /* The connection closed before it actually opened. Since we are
+         * connecting asynchronously, this happens when the server does not
+         * exist or is unresponsive. */
+        if(oldState == UA_SECURECHANNELSTATE_CONNECTING) {
+            UA_LOG_INFO_CHANNEL(&client->config.logger, &client->channel,
+                                "Could not open the connection");
+            goto refuse_connection; /* The client cannot recover from this */
+        }
+
+        UA_LOG_INFO_CHANNEL(&client->config.logger, &client->channel,
+                            "Closed the SecureChannel");
+
+        /* Try to reconnect */
+        goto continue_connect;
     }
 
+    /* The connection has oepened, set the SecureChannel state to reflect this.
+     * Otherwise later consistency checks for the received messages fail. */
+    if(client->channel.state < UA_SECURECHANNELSTATE_CONNECTED)
+        client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
+
     /* Received a message. Process the message with the SecureChannel. */
-    UA_StatusCode res
-        = UA_SecureChannel_processBuffer(&client->channel, client,
-                                         processServiceResponse, &msg);
+    UA_StatusCode res =
+        UA_SecureChannel_processBuffer(&client->channel, client,
+                                       processServiceResponse, &msg);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Processing the message returned the error code %s",
@@ -1134,20 +1168,29 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
  continue_connect:
     if((client->noSession && client->channel.state != UA_SECURECHANNELSTATE_OPEN) ||
        client->sessionState < UA_SESSIONSTATE_ACTIVATED) {
-        iterateConnect(client);
+        connectActivity(client);
     }
 
     /* Notify the application if the client state has changed */
     notifyClientState(client);
+    return;
+
+ refuse_connection:
+    client->connectStatus = UA_STATUSCODE_BADCONNECTIONREJECTED;
+    notifyClientState(client);
 }
 
 /* Initialize a TCP connection. Writes the result to client->connectStatus. */
-static void
+static UA_StatusCode
 initConnect(UA_Client *client) {
-    if(client->connection.state > UA_CONNECTIONSTATE_CLOSED) {
+    if(client->noReconnect)
+        return UA_STATUSCODE_BADNOTCONNECTED;
+
+    if(client->channel.state != UA_SECURECHANNELSTATE_FRESH &&
+       client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Client connection already initiated");
-        return;
+        return UA_STATUSCODE_GOOD;
     }
 
     /* Start the EventLoop if not already started */
@@ -1155,13 +1198,13 @@ initConnect(UA_Client *client) {
     if(!el) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "No EventLoop configured");
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    UA_StatusCode res =  UA_STATUSCODE_GOOD;
     if(el->state != UA_EVENTLOOPSTATE_STARTED) {
-        client->connectStatus = el->start(el);
-        if(client->connectStatus != UA_STATUSCODE_GOOD)
-            return;
+        res = el->start(el);
+        UA_CHECK_STATUS(res, return res);
     }
 
     /* Consistency check the client's own ApplicationURI */
@@ -1172,34 +1215,30 @@ initConnect(UA_Client *client) {
     client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
 
     /* Initialize the SecureChannel */
-    UA_SecureChannel_init(&client->channel, &client->config.localConnectionConfig);
+    UA_SecureChannel_init(&client->channel);
+    client->channel.config = client->config.localConnectionConfig;
     client->channel.certificateVerification = &client->config.certificateVerification;
     client->channel.processOPNHeader = verifyClientSecurechannelHeader;
 
     /* Initialize the SecurityPolicy */
     initSecurityPolicy(client);
 
-    /* Clean up if there is an old connection */
-    if(client->connection.free)
-        client->connection.free(&client->connection);
-
     /* Extract hostname and port from the URL */
     UA_String hostname = UA_STRING_NULL;
     UA_String path = UA_STRING_NULL;
     UA_UInt16 port = 4840;
 
-    client->connectStatus =
-        UA_parseEndpointUrl(&client->endpointUrl, &hostname, &port, &path);
-    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+    res = UA_parseEndpointUrl(&client->endpointUrl, &hostname, &port, &path);
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_NETWORK,
                        "OPC UA URL is invalid: %.*s",
                        (int)client->endpointUrl.length, client->endpointUrl.data);
-        return;
+        return res;
     }
 
     /* Initialize the TCP connection */
     UA_String tcpString = UA_STRING("tcp");
-    client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+    res = UA_STATUSCODE_BADINTERNALERROR;
     for(UA_EventSource *es = client->config.eventLoop->eventSources;
         es != NULL; es = es->next) {
         /* Is this a usable connection manager? */
@@ -1217,31 +1256,25 @@ initConnect(UA_Client *client) {
         UA_Variant_setScalar(&params[1].value, &hostname, &UA_TYPES[UA_TYPES_STRING]);
 
         /* Open the client TCP connection */
-        client->connectStatus =
-            cm->openConnection(cm, 2, params, client, NULL, UA_Client_networkCallback);
-        if(client->connectStatus == UA_STATUSCODE_GOOD)
+        res = cm->openConnection(cm, 2, params, client, NULL, UA_Client_networkCallback);
+        if(res == UA_STATUSCODE_GOOD)
             break;
     }
 
     /* Opening the TCP connection failed */
-    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Could not open a TCP connection to %.*s",
                        (int)client->endpointUrl.length, client->endpointUrl.data);
-        client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
-        return;
+        res = UA_STATUSCODE_BADCONNECTIONCLOSED;
     }
-
-    /* The TCP connection has started. All future interactions will be handled
-     * through the network callback. */
-    client->connection.state = UA_CONNECTIONSTATE_OPENING;
-
-    /* Attach the connection to the SecureChannel */
-    UA_Connection_attachSecureChannel(&client->connection, &client->channel);
+    return res;
 }
 
 UA_StatusCode
 UA_Client_connectAsync(UA_Client *client, const char *endpointUrl) {
+    client->noReconnect = false;
+
     /* Set the endpoint URL the client connects to */
     UA_String_clear(&client->endpointUrl);
     client->endpointUrl = UA_STRING_ALLOC(endpointUrl);
@@ -1250,13 +1283,15 @@ UA_Client_connectAsync(UA_Client *client, const char *endpointUrl) {
     client->noSession = false;
 
     /* Connect Async */
-    initConnect(client);
+    client->connectStatus = initConnect(client);
     notifyClientState(client);
     return client->connectStatus;
 }
 
 UA_StatusCode
 UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl) {
+    client->noReconnect = false;
+
     /* Set the endpoint URL the client connects to */
     UA_String_clear(&client->endpointUrl);
     client->endpointUrl = UA_STRING_ALLOC(endpointUrl);
@@ -1265,7 +1300,7 @@ UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl)
     client->noSession = true;
 
     /* Connect Async */
-    initConnect(client);
+    client->connectStatus = initConnect(client);
     notifyClientState(client);
     return client->connectStatus;
 }
@@ -1276,7 +1311,7 @@ connectSync(UA_Client *client) {
     UA_DateTime maxDate = now + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
 
     /* Initialize the connection */
-    initConnect(client);
+    client->connectStatus = initConnect(client);
     notifyClientState(client);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return;
@@ -1303,6 +1338,8 @@ connectSync(UA_Client *client) {
 
 UA_StatusCode
 UA_Client_connect(UA_Client *client, const char *endpointUrl) {
+    client->noReconnect = false;
+
     /* Set the endpoint URL the client connects to */
     UA_String_clear(&client->endpointUrl);
     client->endpointUrl = UA_STRING_ALLOC(endpointUrl);
@@ -1317,6 +1354,8 @@ UA_Client_connect(UA_Client *client, const char *endpointUrl) {
 
 UA_StatusCode
 UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl) {
+    client->noReconnect = false;
+
     /* Set the endpoint URL the client connects to */
     UA_String_clear(&client->endpointUrl);
     client->endpointUrl = UA_STRING_ALLOC(endpointUrl);
@@ -1339,7 +1378,9 @@ closeSecureChannel(UA_Client *client) {
     if(client->channel.state == UA_SECURECHANNELSTATE_CLOSING ||
        client->channel.state == UA_SECURECHANNELSTATE_CLOSED)
         return;
-    client->channel.state = UA_SECURECHANNELSTATE_CLOSING;
+
+    UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
+                         "Closing the channel");
 
     /* Send CLO if the SecureChannel is open */
     if(client->channel.state == UA_SECURECHANNELSTATE_OPEN) {
@@ -1356,28 +1397,10 @@ closeSecureChannel(UA_Client *client) {
                                               &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
     }
 
-    /* Clean up */
-    client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
-    if(client->connection.free)
-        client->connection.free(&client->connection);
-
-    UA_SecureChannel_close(&client->channel);
-
     /* The connection is eventually closed in the next callback from the
      * ConnectionManager with the appropriate status code. Don't set the
-     * connection closed right away!
-     *
-     * client->connection.state = UA_CONNECTIONSTATE_CLOSED;
-     */
-
-    /* Set the Session to "Created" if it was "Activated" */
-    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
-        client->sessionState = UA_SESSIONSTATE_CREATED;
-
-    /* Delete outstanding async services - the RequestId is no longer valid. Do
-     * this after setting the Session state. Otherwise we send out new Publish
-     * Requests immediately. */
-    UA_Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSECURECHANNELCLOSED);
+     * connection closed right away! */
+    UA_SecureChannel_shutdown(&client->channel);
 }
 
 static void
@@ -1439,6 +1462,14 @@ closeSessionCallback(UA_Client *client, void *userdata,
 
 UA_StatusCode
 UA_Client_disconnectAsync(UA_Client *client) {
+    client->noReconnect = true;
+
+    if(client->sessionState == UA_SESSIONSTATE_CLOSED ||
+       client->sessionState == UA_SESSIONSTATE_CLOSING) {
+        closeSecureChannel(client);
+        return UA_STATUSCODE_GOOD;
+    }
+
     /* Set before sending the message to prevent recursion */
     client->sessionState = UA_SESSIONSTATE_CLOSING;
 
@@ -1462,6 +1493,7 @@ UA_Client_disconnectAsync(UA_Client *client) {
 
 UA_StatusCode
 UA_Client_disconnectSecureChannel(UA_Client *client) {
+    client->noReconnect = true;
     closeSecureChannel(client);
 
     /* Manually set the status to closed to prevent an automatic reconnection */
@@ -1472,7 +1504,7 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
     if(el &&
        el->state != UA_EVENTLOOPSTATE_FRESH &&
        el->state != UA_EVENTLOOPSTATE_STOPPED) {
-        while(client->connection.state != UA_CONNECTIONSTATE_CLOSED) {
+        while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
             el->run(el, 100);
         }
     }
@@ -1483,6 +1515,7 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
 
 UA_StatusCode
 UA_Client_disconnect(UA_Client *client) {
+    client->noReconnect = true;
     closeSession(client);
     return UA_Client_disconnectSecureChannel(client);
 }
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 0820642fdd9..c5e7bae2e83 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -137,9 +137,9 @@ struct UA_Client {
 
     UA_Boolean endpointsHandshake;     /* Ongoing GetEndpoints */
     UA_Boolean noSession;              /* Don't open a session */
+    UA_Boolean noReconnect;            /* Don't reconnect when the connection closes */
 
     /* Connection */
-    UA_Connection connection;
     UA_String endpointUrl;
 
     /* SecureChannel */
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 2ea61017224..2efa023e9ce 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -12,7 +12,6 @@
 #include <stdlib.h>
 
 #include "testing_clock.h"
-#include "testing_networklayers.h"
 #include "thread_wrapper.h"
 
 UA_Server *server;
@@ -351,15 +350,14 @@ START_TEST(Client_activateSessionTimeout) {
     /* Manually close the connection. The connection is internally closed at the
      * next iteration of the EventLoop. Hence the next request is sent out. But
      * the connection "actually closes" before receiving the response. */
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-    uintptr_t connId = (unsigned)client->connection.sockfd;
+    UA_ConnectionManager *cm = client->channel.connectionManager;
+    uintptr_t connId = client->channel.connectionId;
     cm->closeConnection(cm, connId);
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURECHANNELCLOSED);
 
-    UA_Client_recvTesting_result = UA_STATUSCODE_GOOD;
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(server->sessionCount, 1);
diff --git a/tests/client/check_client_async.c b/tests/client/check_client_async.c
index ba90dbfe2e9..9fc66991516 100644
--- a/tests/client/check_client_async.c
+++ b/tests/client/check_client_async.c
@@ -15,7 +15,6 @@
 #include <stdlib.h>
 
 #include "testing_clock.h"
-#include "testing_networklayers.h"
 #include "thread_wrapper.h"
 
 UA_Server *server;
@@ -77,11 +76,7 @@ START_TEST(Client_highlevel_async_readValue) {
         UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-        UA_Client_recv = client->connection.recv;
-        client->connection.recv = UA_Client_recvTesting;
-
         UA_UInt16 asyncCounter = 0;
-
         UA_UInt32 reqId = 0;
         retval = UA_Client_readValueAttribute_async(client,
                 UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME),
@@ -96,8 +91,11 @@ START_TEST(Client_highlevel_async_readValue) {
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         ck_assert_uint_eq(asyncCounter, 1);
 
-        /* Simulate network cable unplugged (no response from server) */
-        UA_Client_recvTesting_result = UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
+        /* Simulate network cable unplugged */
+        UA_ConnectionManager *cm = client->channel.connectionManager;
+        cm->closeConnection(cm, client->channel.connectionId);
+        UA_EventLoop *el = client->config.eventLoop;
+        el->run(el, 0);
 
         UA_Client_disconnect(client);
         UA_Client_delete(client);
@@ -154,9 +152,6 @@ START_TEST(Client_read_async_timed) {
         UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-        UA_Client_recv = client->connection.recv;
-        client->connection.recv = UA_Client_recvTesting;
-
         UA_UInt16 asyncCounter = 0;
 
         UA_ReadRequest rr;
@@ -185,8 +180,8 @@ START_TEST(Client_read_async_timed) {
         /* Manually close the connection. The connection is internally closed at the
          * next iteration of the EventLoop. Hence the next request is sent out. But
          * the connection "actually closes" before receiving the response. */
-        UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-        uintptr_t connId = (unsigned)client->connection.sockfd;
+        UA_ConnectionManager *cm = client->channel.connectionManager;
+        uintptr_t connId = client->channel.connectionId;
         cm->closeConnection(cm, connId);
 
         retval = __UA_Client_AsyncServiceEx(client, &rr,
@@ -221,9 +216,6 @@ START_TEST(Client_connectivity_check) {
         UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-        UA_Client_recv = client->connection.recv;
-        client->connection.recv = UA_Client_recvTesting;
-
         inactivityCallbackTriggered = false;
 
         retval = UA_Client_run_iterate(client, 1000 + 1);
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index 0dc6b019985..df819e311ab 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -15,7 +15,6 @@
 #include <stdlib.h>
 
 #include "testing_clock.h"
-#include "testing_networklayers.h"
 #include "thread_wrapper.h"
 
 UA_Server *server;
@@ -114,8 +113,7 @@ START_TEST(Client_connect_async_abort) {
     UA_ClientConfig_setDefault(cc);
     cc->stateCallback = abortSecureChannelConnect;
 
-    for(int i = UA_SECURECHANNELSTATE_HEL_SENT;
-        i < UA_SECURECHANNELSTATE_CLOSING; i++) {
+    for(int i = 0; i < UA_SECURECHANNELSTATE_CLOSING; i++) {
         abortState = (UA_SecureChannelState)i;
         UA_StatusCode retval = UA_Client_connectAsync(client, "opc.tcp://localhost:4840");
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
@@ -127,7 +125,6 @@ START_TEST(Client_connect_async_abort) {
             UA_Client_getState(client, &currentState, NULL, &retval);
         } while(currentState != UA_SECURECHANNELSTATE_CLOSED &&
                 currentState != UA_SECURECHANNELSTATE_FRESH);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     }
 
     UA_Client_delete(client);
@@ -144,22 +141,23 @@ START_TEST(Client_no_connection) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     /* Wait for the initial socket */
-    UA_EventLoop *el = client->config.eventLoop;
-    while(!client->connection.handle) {
-        el->run(el, 0);
+    //UA_EventLoop *el = client->config.eventLoop;
+    while(client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
+        //el->run(el, 0);
+        UA_Server_run_iterate(server, true);
+        UA_Client_run_iterate(client, 1);
     }
 
     /* Manually close the TCP connection */
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-    cm->closeConnection(cm, (uintptr_t)client->connection.sockfd);
+    UA_ConnectionManager *cm = client->channel.connectionManager;
+    cm->closeConnection(cm, client->channel.connectionId);
+
+    do {
+        UA_Server_run_iterate(server, false);
+        retval |= UA_Client_run_iterate(client, 0);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    } while(client->channel.state != UA_SECURECHANNELSTATE_OPEN);
 
-    UA_Server_run_iterate(server, false);
-    retval = UA_Client_run_iterate(client, 1);  /* Open connection */
-    UA_Server_run_iterate(server, false);
-    retval |= UA_Client_run_iterate(client, 0); /* Send HEL */
-    UA_Server_run_iterate(server, false);
-    retval |= UA_Client_run_iterate(client, 0); /* Receive ACK */
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_Client_disconnect(client);
     UA_Client_delete(client);
 }
@@ -193,7 +191,7 @@ START_TEST(Client_run_iterate) {
     }
 
     UA_Client_disconnectAsync(client);
-    while(client->connection.state != UA_CONNECTIONSTATE_CLOSED) {
+    while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
         UA_Server_run_iterate(server, false);
         UA_Client_run_iterate(client, 0);
     }
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index e98e8fb9719..314f59e6533 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -12,7 +12,6 @@
 
 #include "check.h"
 #include "testing_clock.h"
-#include "testing_networklayers.h"
 #include "thread_wrapper.h"
 
 UA_Server *server;
@@ -151,8 +150,8 @@ START_TEST(SecureChannel_networkfail) {
     rq.nodesToReadSize = 1;
 
     /* Manually close the TCP connection */
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-    cm->closeConnection(cm, (uintptr_t)client->connection.sockfd);
+    UA_ConnectionManager *cm = client->channel.connectionManager;
+    cm->closeConnection(cm, client->channel.connectionId);
     UA_EventLoop *el = client->config.eventLoop;
     el->run(el, 0);
 
@@ -206,8 +205,8 @@ START_TEST(SecureChannel_cableunplugged) {
     /* Manually close the connection. The connection is internally closed at the
      * next iteration of the EventLoop. Hence the next request is sent out. But
      * the connection "actually closes" before receiving the response. */
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-    uintptr_t connId = (unsigned)client->connection.sockfd;
+    UA_ConnectionManager *cm = client->channel.connectionManager;
+    uintptr_t connId = client->channel.connectionId;
     cm->closeConnection(cm, connId);
 
     UA_Variant_init(&val);
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 8803290b2a1..8f27f9df835 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -16,7 +16,6 @@
 
 #include "check.h"
 #include "testing_clock.h"
-#include "testing_networklayers.h"
 #include "thread_wrapper.h"
 
 UA_Server *server;
@@ -109,9 +108,6 @@ START_TEST(Client_subscription) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
                                                                             NULL, NULL, NULL);
@@ -184,9 +180,6 @@ START_TEST(Client_subscription_async) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
 
     /* manually control the server thread */
@@ -339,9 +332,6 @@ START_TEST(Client_subscription_createDataChanges) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
                                                                             NULL, NULL, NULL);
@@ -456,9 +446,6 @@ START_TEST(Client_subscription_modifyMonitoredItem) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
                                                                             NULL, NULL, NULL);
@@ -607,9 +594,6 @@ START_TEST(Client_subscription_createDataChanges_async) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     // Async subscription creation is tested in Client_subscription_async
     // simplify test case using synchronous here
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
@@ -877,9 +861,6 @@ START_TEST(Client_subscription_connectionClose) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
                                                                             NULL, NULL, NULL);
@@ -903,8 +884,8 @@ START_TEST(Client_subscription_connectionClose) {
     /* Manually close the connection. The connection is internally closed at the
      * next iteration of the EventLoop. Hence the next request is sent out. But
      * the connection "actually closes" before receiving the response. */
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)client->connection.handle;
-    uintptr_t connId = (unsigned)client->connection.sockfd;
+    UA_ConnectionManager *cm = client->channel.connectionManager;
+    uintptr_t connId = client->channel.connectionId;
     cm->closeConnection(cm, connId);
 
     notificationReceived = false;
@@ -958,9 +939,6 @@ START_TEST(Client_subscription_statusChange) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     request.requestedLifetimeCount = 5;
     UA_CreateSubscriptionResponse response =
@@ -1035,9 +1013,6 @@ START_TEST(Client_subscription_writeBurst) {
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
                                                                             NULL, NULL, NULL);
@@ -1090,9 +1065,6 @@ START_TEST(Client_subscription_timeout) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
                                                                             NULL, NULL, NULL);
@@ -1121,18 +1093,22 @@ START_TEST(Client_subscription_timeout) {
     running = false;
     THREAD_JOIN(server_thread);
 
+    /* Shut down the server */
     UA_Server_run_shutdown(server);
 
+    /* The client tries to reconnect, but has to fail eventually as the server
+     * is down */
     do {
         UA_Client_run_iterate(client, 1);
     } while(client->connectStatus == UA_STATUSCODE_GOOD);
 
-    /* run the server in an independent thread again */
-    running = true;
-    THREAD_CREATE(server_thread, serverloop);
-
     UA_Client_disconnect(client);
     UA_Client_delete(client);
+
+    /* Run the server in an independent thread again for the shutdown after the
+     * unit test */
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
 }
 END_TEST
 
@@ -1143,9 +1119,6 @@ START_TEST(Client_subscription_detach) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
                                                                             NULL, NULL, NULL);
@@ -1197,9 +1170,6 @@ START_TEST(Client_subscription_without_notification) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     request.requestedMaxKeepAliveCount = 1;
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
@@ -1340,9 +1310,6 @@ START_TEST(Client_subscription_async_sub) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(sessState, UA_SESSIONSTATE_ACTIVATED);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_Client_run_iterate(client, 1);
 
     /* manually control the server thread */
@@ -1400,14 +1367,16 @@ START_TEST(Client_subscription_async_sub) {
     ck_assert_uint_eq(countNotificationReceived, 5);
 
     /* Simulate network cable unplugged (no response from server) */
+    UA_ConnectionManager *cm = client->channel.connectionManager;
+    cm->closeConnection(cm, client->channel.connectionId);
     UA_fakeSleep((UA_UInt32)publishingInterval * 100);
 
     ck_assert_uint_lt(client->config.outStandingPublishRequests, 10);
     ck_assert_uint_eq(inactivityCallbackCalled, false);
-    UA_Client_recvTesting_result = UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
+
     UA_Client_run_iterate(client, (UA_UInt16)cc->timeout);
     ck_assert_uint_eq(inactivityCallbackCalled, true);
-    ck_assert_uint_eq(sessState, UA_SESSIONSTATE_ACTIVATED);
+    ck_assert_uint_eq(sessState, UA_SESSIONSTATE_CREATED);
 
     /* Get the server back up */
     running = true;
@@ -1435,9 +1404,6 @@ START_TEST(Client_subscription_reconnect) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(sessState, UA_SESSIONSTATE_ACTIVATED);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_Client_run_iterate(client, 1);
 
     /* manually control the server thread */
@@ -1499,9 +1465,6 @@ START_TEST(Client_subscription_transfer) {
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     request.requestedLifetimeCount = 5;
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,

From 1f6ad33948eb1d1bc3cd4a8dca8229b4dc813796 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:57:42 +0200
Subject: [PATCH 0375/1963] refactor(server): The server uses the new
 SecureChannel API

---
 src/server/ua_server.c                      |  91 +--------
 src/server/ua_server_binary.c               | 151 ++++++++++-----
 src/server/ua_server_internal.h             |  33 +++-
 src/server/ua_services_securechannel.c      | 193 ++++++++++----------
 tests/server/check_monitoreditem_filter.c   |  15 +-
 tests/server/check_server_monitoringspeed.c |  20 --
 tests/server/check_server_speed_addnodes.c  |  27 +--
 7 files changed, 242 insertions(+), 288 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index cf14a1cdaf5..862046259c1 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -484,8 +484,9 @@ UA_Server_updateCertificate(UA_Server *server,
     if(closeSecureChannels) {
         channel_entry *entry;
         TAILQ_FOREACH(entry, &server->channels, pointers) {
-            if(UA_ByteString_equal(&entry->channel.securityPolicy->localCertificate, oldCertificate))
-                UA_Server_closeSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_CLOSE);
+            if(UA_ByteString_equal(&entry->channel.securityPolicy->localCertificate,
+                                   oldCertificate))
+                shutdownServerSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_CLOSE);
         }
     }
 
@@ -568,92 +569,6 @@ UA_Server_getStatistics(UA_Server *server) {
     return stat;
 }
 
-/* Callback of a TCP socket (server socket or an active connection) */
-static void
-UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void *application, void **connectionContext,
-                          UA_ConnectionState state,
-                          size_t paramsSize, const UA_KeyValuePair *params,
-                          UA_ByteString msg) {
-    UA_Server *server = (UA_Server*)application;
-
-    /* A server socket that is not registered in the server */
-    if(*connectionContext == NULL) {
-        /* The socket is no fully open -> ignore */
-        if(state == UA_CONNECTIONSTATE_CLOSED ||
-           state == UA_CONNECTIONSTATE_CLOSING)
-            return;
-
-        /* Cannot register */
-        if(server->serverConnectionsSize >= UA_MAXSERVERCONNECTIONS) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "Cannot register server socket - too many already open");
-            cm->closeConnection(cm, connectionId);
-            return;
-        }
-
-        /* Find and use a free connection slot */
-        server->serverConnectionsSize++;
-        UA_ServerConnection *sc = server->serverConnections;
-        while(sc->connectionId != 0)
-            sc++;
-        sc->state = state;
-        sc->connectionId = connectionId;
-        sc->connectionManager = cm;
-        *connectionContext = (void*)sc; /* Set the context pointer in the connection */
-        return;
-    }
-
-    UA_ServerConnection *sc = (UA_ServerConnection*)*connectionContext;
-    UA_Connection *conn = (UA_Connection*)*connectionContext;
-    UA_Boolean serverSocket = (sc >= server->serverConnections &&
-                               sc < &server->serverConnections[UA_MAXSERVERCONNECTIONS]);
-
-    if(state == UA_CONNECTIONSTATE_CLOSING) {
-        if(serverSocket) {
-            /* Server socket is closed */
-            sc->state = UA_CONNECTIONSTATE_CLOSED;
-            sc->connectionId = 0;
-            server->serverConnectionsSize--;
-        } else {
-            /* A normal connection is closing */
-            if(conn->channel)
-                UA_SecureChannel_close(conn->channel);
-            UA_free(conn);
-        }
-        return;
-    }
-
-    /* A new connection is opening - still has the pointer to the serversocket */
-    if(serverSocket) {
-        conn = (UA_Connection*)UA_malloc(sizeof(UA_Connection));
-        if(!conn) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "Could not accept the connection - out of memory");
-            cm->closeConnection(cm, connectionId);
-            return;
-        }
-
-        conn->state = UA_CONNECTIONSTATE_OPENING;
-        conn->channel = NULL;
-        conn->sockfd = (UA_SOCKET)connectionId;
-        conn->handle = cm;
-        conn->getSendBuffer = UA_Connection_getSendBuffer;
-        conn->releaseSendBuffer = UA_Connection_releaseBuffer;
-        conn->send = UA_Connection_send;
-        conn->recv = NULL;
-        conn->releaseRecvBuffer = UA_Connection_releaseBuffer;
-        conn->close = UA_Connection_close;
-        conn->free = NULL;
-
-        *connectionContext = (void*)conn;
-        return;
-    }
-
-    /* Received a message on a normal connection */
-    UA_Server_processBinaryMessage(server, conn, &msg);
-}
-
 static UA_StatusCode
 UA_Server_createServerConnection(UA_Server *server, const UA_String *serverUrl) {
     UA_ServerConfig *config = &server->config;
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 85a7e99766b..9fee4a028ad 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -322,8 +322,10 @@ getServicePointers(UA_UInt32 requestTypeId, const UA_DataType **requestType,
 /* HEL -> Open up the connection */
 static UA_StatusCode
 processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *msg) {
-    if(channel->state != UA_SECURECHANNELSTATE_FRESH)
+    UA_ConnectionManager *cm = channel->connectionManager;
+    if(!cm || channel->state != UA_SECURECHANNELSTATE_CONNECTED)
         return UA_STATUSCODE_BADINTERNALERROR;
+
     size_t offset = 0; /* Go to the beginning of the TcpHelloMessage */
     UA_TcpHelloMessage helloMessage;
     UA_StatusCode retval =
@@ -346,10 +348,10 @@ processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *ms
     }
 
     /* Get the send buffer from the network layer */
-    UA_Connection *connection = channel->connection;
     UA_ByteString ack_msg;
     UA_ByteString_init(&ack_msg);
-    retval = connection->getSendBuffer(connection, channel->config.sendBufferSize, &ack_msg);
+    retval = cm->allocNetworkBuffer(cm, channel->connectionId,
+                                    &ack_msg, channel->config.sendBufferSize);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -375,12 +377,12 @@ processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *ms
                                       &UA_TRANSPORT[UA_TRANSPORT_TCPACKNOWLEDGEMESSAGE],
                                       &bufPos, &bufEnd, NULL, NULL);
     if(retval != UA_STATUSCODE_GOOD) {
-        connection->releaseSendBuffer(connection, &ack_msg);
+        cm->freeNetworkBuffer(cm, channel->connectionId, &ack_msg);
         return retval;
     }
 
     ack_msg.length = ackHeader.messageSize;
-    retval = connection->send(connection, &ack_msg);
+    retval = cm->sendWithConnection(cm, channel->connectionId, 0, NULL, &ack_msg);
     if(retval == UA_STATUSCODE_GOOD)
         channel->state = UA_SECURECHANNELSTATE_ACK_SENT;
     return retval;
@@ -402,7 +404,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
         UA_NodeId_clear(&requestType);
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
                                "Could not decode the NodeId. Closing the connection");
-        UA_Server_closeSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
+        shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
         return retval;
     }
     retval = UA_decodeBinaryInternal(msg, &offset, &openSecureChannelRequest,
@@ -415,7 +417,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
         UA_OpenSecureChannelRequest_clear(&openSecureChannelRequest);
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
                                "Could not decode the OPN message. Closing the connection.");
-        UA_Server_closeSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
+        shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
         return retval;
     }
     UA_NodeId_clear(&requestType);
@@ -428,7 +430,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
     if(openScResponse.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel, "Could not open a SecureChannel. "
                                "Closing the connection.");
-        UA_Server_closeSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
+        shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
         return openScResponse.responseHeader.serviceResult;
     }
 
@@ -440,7 +442,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
                                "Could not send the OPN answer with error code %s",
                                UA_StatusCode_name(retval));
-        UA_Server_closeSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
+        shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
     }
 
     return retval;
@@ -852,7 +854,7 @@ processSecureChannelMessage(void *application, UA_SecureChannel *channel,
         break;
     }
     if(retval != UA_STATUSCODE_GOOD) {
-        if(!channel->connection) {
+        if(!UA_SecureChannel_isConnected(channel)) {
             UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
                                 "Processing the message failed. Channel already closed "
                                 "with StatusCode %s. ", UA_StatusCode_name(retval));
@@ -865,7 +867,8 @@ processSecureChannelMessage(void *application, UA_SecureChannel *channel,
         UA_TcpErrorMessage errMsg;
         UA_TcpErrorMessage_init(&errMsg);
         errMsg.error = retval;
-        UA_Connection_sendError(channel->connection, &errMsg);
+        UA_SecureChannel_sendError(channel, &errMsg);
+        UA_DiagnosticEvent closeEvent;
         switch(retval) {
         case UA_STATUSCODE_BADSECURITYMODEREJECTED:
         case UA_STATUSCODE_BADSECURITYCHECKSFAILED:
@@ -873,36 +876,104 @@ processSecureChannelMessage(void *application, UA_SecureChannel *channel,
         case UA_STATUSCODE_BADSECURECHANNELTOKENUNKNOWN:
         case UA_STATUSCODE_BADSECURITYPOLICYREJECTED:
         case UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED:
-            UA_Server_closeSecureChannel(server, channel, UA_DIAGNOSTICEVENT_SECURITYREJECT);
+            closeEvent = UA_DIAGNOSTICEVENT_SECURITYREJECT;
             break;
         default:
-            UA_Server_closeSecureChannel(server, channel, UA_DIAGNOSTICEVENT_CLOSE);
+            closeEvent = UA_DIAGNOSTICEVENT_CLOSE;
             break;
         }
+        shutdownServerSecureChannel(server, channel, closeEvent);
     }
 
     return retval;
 }
 
+/* Callback of a TCP socket (server socket or an active connection) */
 void
-UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection,
-                               UA_ByteString *message) {
-    UA_LOG_TRACE(&server->config.logger, UA_LOGCATEGORY_NETWORK,
-                 "Connection %i | Received a packet.", (int)(connection->sockfd));
+UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_ConnectionState state,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          UA_ByteString msg) {
+    UA_Server *server = (UA_Server*)application;
+
+    /* A server socket that is not yet registered in the server. Register it and
+     * set the connection context to the pointer in the
+     * server->serverConnections list. New connections on that server socket
+     * inherit the context (and on the first callback we set the context of
+     * client-connections to a SecureChannel). */
+    if(*connectionContext == NULL) {
+        /* The socket is closing without being previously registered -> ignore */
+        if(state == UA_CONNECTIONSTATE_CLOSED ||
+           state == UA_CONNECTIONSTATE_CLOSING)
+            return;
+
+        /* Cannot register */
+        if(server->serverConnectionsSize >= UA_MAXSERVERCONNECTIONS) {
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "Cannot register server socket - too many already open");
+            cm->closeConnection(cm, connectionId);
+            return;
+        }
+
+        /* Find and use a free connection slot */
+        server->serverConnectionsSize++;
+        UA_ServerConnection *sc = server->serverConnections;
+        while(sc->connectionId != 0)
+            sc++;
+        sc->state = state;
+        sc->connectionId = connectionId;
+        sc->connectionManager = cm;
+        *connectionContext = (void*)sc; /* Set the context pointer in the connection */
+        return;
+    }
+
+    UA_ServerConnection *sc = (UA_ServerConnection*)*connectionContext;
+    UA_SecureChannel *channel = (UA_SecureChannel*)*connectionContext;
+    UA_Boolean serverSocket = (sc >= server->serverConnections &&
+                               sc < &server->serverConnections[UA_MAXSERVERCONNECTIONS]);
+
+    /* The connection is closing. This is the last callback for it. */
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
+        if(serverSocket) {
+            /* Server socket is closed */
+            sc->state = UA_CONNECTIONSTATE_CLOSED;
+            sc->connectionId = 0;
+            server->serverConnectionsSize--;
+        } else {
+            /* A connection attached to a SecureChannel is closing. This is the
+             * only place where deleteSecureChannel must be used. */
+            deleteServerSecureChannel(server, channel);
+        }
+        return;
+    }
 
-    UA_TcpErrorMessage error;
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_SecureChannel *channel = connection->channel;
-
-    /* Add a SecureChannel to a new connection */
-    if(!channel) {
-        retval = UA_Server_createSecureChannel(server, connection);
-        if(retval != UA_STATUSCODE_GOOD)
-            goto error;
-        channel = connection->channel;
-        UA_assert(channel);
+    if(serverSocket) {
+        /* A new connection is opening. This is the only place where
+         * createSecureChannel is used. */
+        retval = createServerSecureChannel(server, cm, connectionId, &channel);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "TCP %lu\t| Could not accept the connection with status %s",
+                           (unsigned long)sc->connectionId, UA_StatusCode_name(retval));
+            *connectionContext = NULL;
+            cm->closeConnection(cm, connectionId);
+            return;
+        }
+
+        UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel created");
+
+        /* Set the new channel as the new context for the connection */
+        *connectionContext = (void*)channel;
+        return;
     }
 
+    /* The connection has fully opened */
+    if(channel->state < UA_SECURECHANNELSTATE_CONNECTED)
+        channel->state = UA_SECURECHANNELSTATE_CONNECTED;
+
+    /* Received a message on a normal connection */
 #ifdef UA_DEBUG_DUMP_PKGS
     UA_dump_hex_pkg(message->data, message->length);
 #endif
@@ -910,20 +981,18 @@ UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection,
     UA_debug_dumpCompleteChunk(server, channel->connection, message);
 #endif
 
-    retval = UA_SecureChannel_processBuffer(channel, server, processSecureChannelMessage, message);
+    retval = UA_SecureChannel_processBuffer(channel, server,
+                                            processSecureChannelMessage, &msg);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_NETWORK,
-                    "Connection %i | Processing the message failed with error %s",
-                    (int)(connection->sockfd), UA_StatusCode_name(retval));
-        goto error;
-    }
-
-    return;
+        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+                               "Processing the message failed with error %s",
+                               UA_StatusCode_name(retval));
 
- error:
-    /* Send an ERR message and close the connection */
-    error.error = retval;
-    error.reason = UA_STRING_NULL;
-    UA_Connection_sendError(connection, &error);
-    connection->close(connection);
+        /* Send an ERR message and close the connection */
+        UA_TcpErrorMessage error;
+        error.error = retval;
+        error.reason = UA_STRING_NULL;
+        UA_SecureChannel_sendError(channel, &error);
+        UA_SecureChannel_shutdown(channel);
+    }
 }
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index bd88013845b..db2addb07bd 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -22,7 +22,6 @@
 #include <open62541/server.h>
 #include <open62541/plugin/nodestore.h>
 
-#include "ua_connection_internal.h"
 #include "ua_session.h"
 #include "ua_server_async.h"
 #include "ua_util_internal.h"
@@ -67,9 +66,9 @@ typedef enum {
 } UA_DiagnosticEvent;
 
 typedef struct channel_entry {
-    UA_DelayedCallback cleanupCallback;
     TAILQ_ENTRY(channel_entry) pointers;
     UA_SecureChannel channel;
+    UA_DiagnosticEvent closeEvent;
 } channel_entry;
 
 typedef struct session_list_entry {
@@ -196,20 +195,28 @@ UA_Server_deleteSecureChannels(UA_Server *server);
 void
 UA_Server_cleanupTimedOutSecureChannels(UA_Server *server, UA_DateTime nowMonotonic);
 
+
 UA_StatusCode
-UA_Server_createSecureChannel(UA_Server *server, UA_Connection *connection);
+sendServiceFault(UA_SecureChannel *channel, UA_UInt32 requestId,
+                 UA_UInt32 requestHandle, UA_StatusCode statusCode);
 
+/* Called only from within the network callback */
 UA_StatusCode
-UA_Server_configSecureChannel(void *application, UA_SecureChannel *channel,
-                              const UA_AsymmetricAlgorithmSecurityHeader *asymHeader);
+createServerSecureChannel(UA_Server *server, UA_ConnectionManager *cm,
+                          uintptr_t connectionId, UA_SecureChannel **outChannel);
 
 UA_StatusCode
-sendServiceFault(UA_SecureChannel *channel, UA_UInt32 requestId,
-                 UA_UInt32 requestHandle, UA_StatusCode statusCode);
+configServerSecureChannel(void *application, UA_SecureChannel *channel,
+                          const UA_AsymmetricAlgorithmSecurityHeader *asymHeader);
+
+/* Can be called at any time */
+void
+shutdownServerSecureChannel(UA_Server *server, UA_SecureChannel *channel,
+                            UA_DiagnosticEvent event);
 
+/* Called only from within the network callback */
 void
-UA_Server_closeSecureChannel(UA_Server *server, UA_SecureChannel *channel,
-                             UA_DiagnosticEvent event);
+deleteServerSecureChannel(UA_Server *server, UA_SecureChannel *channel);
 
 /* Gets the a pointer to the context of a security policy supported by the
  * server matched by the security policy uri. */
@@ -357,6 +364,14 @@ UA_Server_processServiceOperations(UA_Server *server, UA_Session *session,
                                    const UA_DataType *responseOperationsType)
     UA_FUNC_ATTR_WARN_UNUSED_RESULT;
 
+/* Processing for the binary protocol (SecureChannel) */
+void
+UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_ConnectionState state,
+                          size_t paramsSize, const UA_KeyValuePair *params,
+                          UA_ByteString msg);
+
 /******************************************/
 /* Internal function calls, without locks */
 /******************************************/
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index cb39188b226..713d4a8b8fc 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -17,33 +17,22 @@
     (type *)((uintptr_t)ptr - offsetof(type,member))
 #endif
 
-static void
-removeSecureChannelCallback(void *_, channel_entry *entry) {
-    UA_SecureChannel_close(&entry->channel);
-}
-
-/* Half-closes the channel. Will be completely closed / deleted in a deferred
- * callback. Deferring is necessary so we don't remove lists that are still
- * processed upwards the call stack. */
-static void
-removeSecureChannel(UA_Server *server, channel_entry *entry,
-                    UA_DiagnosticEvent event) {
-    if(entry->channel.state == UA_SECURECHANNELSTATE_CLOSING)
-        return;
-    entry->channel.state = UA_SECURECHANNELSTATE_CLOSING;
+void
+deleteServerSecureChannel(UA_Server *server, UA_SecureChannel *channel) {
+    UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel closed");
 
-    /* Detach from the connection and close the connection */
-    if(entry->channel.connection) {
-        UA_Connection_detachSecureChannel(entry->channel.connection);
-    }
+    /* Clean up the SecureChannel. This is the only place where
+     * UA_SecureChannel_clear must be called within the server code-base. */
+    UA_SecureChannel_clear(channel);
 
-    /* Detach the channel */
+    /* Detach the channel from the server list */
+    struct channel_entry *entry = container_of(channel, channel_entry, channel);
     TAILQ_REMOVE(&server->channels, entry, pointers);
 
     /* Update the statistics */
     UA_SecureChannelStatistics *scs = &server->secureChannelStatistics;
     scs->currentChannelCount--;
-    switch(event) {
+    switch(entry->closeEvent) {
     case UA_DIAGNOSTICEVENT_CLOSE:
         break;
     case UA_DIAGNOSTICEVENT_TIMEOUT:
@@ -64,55 +53,59 @@ removeSecureChannel(UA_Server *server, channel_entry *entry,
         break;
     }
 
-    /* Add a delayed callback to remove the channel when the currently
-     * scheduled jobs have completed */
-    entry->cleanupCallback.callback = (UA_Callback)removeSecureChannelCallback;
-    entry->cleanupCallback.application = NULL;
-    entry->cleanupCallback.context = entry;
-    server->config.eventLoop->
-        addDelayedCallback(server->config.eventLoop, &entry->cleanupCallback);
+    UA_free(entry);
+}
+
+/* Trigger the closing of the SecureChannel. This needs one iteration of the
+ * eventloop to take effect. */
+void
+shutdownServerSecureChannel(UA_Server *server, UA_SecureChannel *channel,
+                            UA_DiagnosticEvent event) {
+    /* Does the channel have an open socket? */
+    if(!UA_SecureChannel_isConnected(channel))
+        return;
+
+    UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "Closing the channel");
+
+    /* Set the event for diagnostics. The shutdown event is used in the
+     * deleteServerSecureChannel callback. */
+    struct channel_entry *entry = container_of(channel, channel_entry, channel);
+    entry->closeEvent = event;
+
+    /* Close the connection in the event-loop, which in the next iteration of
+     * the eventloop triggers the final deletion. This also sets the state to
+     * "closing". */
+    UA_SecureChannel_shutdown(channel);
 }
 
 void
 UA_Server_deleteSecureChannels(UA_Server *server) {
-    channel_entry *entry, *temp;
-    TAILQ_FOREACH_SAFE(entry, &server->channels, pointers, temp)
-        removeSecureChannel(server, entry, UA_DIAGNOSTICEVENT_CLOSE);
+    channel_entry *entry;
+    TAILQ_FOREACH(entry, &server->channels, pointers) {
+        shutdownServerSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_CLOSE);
+    }
 }
 
-/* remove channels that were not renewed or who have no connection attached */
+/* Remove channels that were not renewed in time */
 void
 UA_Server_cleanupTimedOutSecureChannels(UA_Server *server,
                                         UA_DateTime nowMonotonic) {
-    channel_entry *entry, *temp;
-    TAILQ_FOREACH_SAFE(entry, &server->channels, pointers, temp) {
-        /* The channel was closed internally */
-        if(entry->channel.state == UA_SECURECHANNELSTATE_CLOSED ||
-           !entry->channel.connection) {
-            removeSecureChannel(server, entry, UA_DIAGNOSTICEVENT_CLOSE);
-            continue;
-        }
-
-        /* Is the SecurityToken already created? */
-        if(entry->channel.securityToken.createdAt == 0) {
-        	/* No -> channel is still in progress of being opened, do not remove */
-        	continue;
-        }
-
-        /* Has the SecurityToken timed out? */
+    channel_entry *entry;
+    TAILQ_FOREACH(entry, &server->channels, pointers) {
+        /* Compute the timeout date of the SecurityToken */
         UA_DateTime timeout =
             entry->channel.securityToken.createdAt +
             (UA_DateTime)(entry->channel.securityToken.revisedLifetime * UA_DATETIME_MSEC);
 
-        /* There is a new token. But it has not been used by the client so far.
-         * Do the rollover now instead of shutting the channel down.
+        /* The token has timed out. Try to do the token revolving now instead of
+         * shutting the channel down.
          *
          * Part 4, 5.5.2 says: Servers shall use the existing SecurityToken to
          * secure outgoing Messages until the SecurityToken expires or the
          * Server receives a Message secured with a new SecurityToken.*/
         if(timeout < nowMonotonic &&
            entry->channel.renewState == UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER) {
-            /* Compare with the rollover in checkSymHeader */
+            /* Revolve the token manually. This is otherwise done in checkSymHeader. */
             entry->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
             entry->channel.securityToken = entry->channel.altSecurityToken;
             UA_ChannelSecurityToken_init(&entry->channel.altSecurityToken);
@@ -127,7 +120,7 @@ UA_Server_cleanupTimedOutSecureChannels(UA_Server *server,
         if(timeout < nowMonotonic) {
             UA_LOG_INFO_CHANNEL(&server->config.logger, &entry->channel,
                                 "SecureChannel has timed out");
-            removeSecureChannel(server, entry, UA_DIAGNOSTICEVENT_TIMEOUT);
+            shutdownServerSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_TIMEOUT);
         }
     }
 }
@@ -142,28 +135,25 @@ purgeFirstChannelWithoutSession(UA_Server *server) {
         UA_LOG_INFO_CHANNEL(&server->config.logger, &entry->channel,
                             "Channel was purged since maxSecureChannels was "
                             "reached and channel had no session attached");
-        removeSecureChannel(server, entry, UA_DIAGNOSTICEVENT_PURGE);
+        shutdownServerSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_PURGE);
         return true;
     }
     return false;
 }
 
 UA_StatusCode
-UA_Server_createSecureChannel(UA_Server *server, UA_Connection *connection) {
-    /* connection already has a channel attached. */
-    if(connection->channel != NULL)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
+createServerSecureChannel(UA_Server *server, UA_ConnectionManager *cm,
+                          uintptr_t connectionId, UA_SecureChannel **outChannel) {
     UA_ServerConfig *config = &server->config;
 
-    /* Check if there exists a free SC, otherwise try to purge one SC without a
-     * session the purge has been introduced to pass CTT, it is not clear what
-     * strategy is expected here */
-    if((server->secureChannelStatistics.currentChannelCount >=
-        config->maxSecureChannels) &&
+    /* Check if we have space for another SC, otherwise try to find an SC
+     * without a session and purge it */
+    UA_SecureChannelStatistics *scs = &server->secureChannelStatistics;
+    if(scs->currentChannelCount >= config->maxSecureChannels &&
        !purgeFirstChannelWithoutSession(server))
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
+    /* Allocate memory for the SecureChannel */
     channel_entry *entry = (channel_entry *)UA_malloc(sizeof(channel_entry));
     if(!entry)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -187,18 +177,41 @@ UA_Server_createSecureChannel(UA_Server *server, UA_Connection *connection) {
     UA_SecureChannel_init(&entry->channel);
     entry->channel.config = connConfig;
     entry->channel.certificateVerification = &config->certificateVerification;
-    entry->channel.processOPNHeader = UA_Server_configSecureChannel;
-
+    entry->channel.processOPNHeader = configServerSecureChannel;
+    entry->channel.connectionManager = cm;
+    entry->channel.connectionId = connectionId;
+    entry->closeEvent = UA_DIAGNOSTICEVENT_CLOSE; /* Used if the eventloop closes */
+
+    /* Set the SecureChannel identifier already here. So we get the right
+     * identifier for logging right away. The rest of the SecurityToken is set
+     * in UA_SecureChannelManager_open. Set the ChannelId also in the
+     * alternative security token, we don't touch this value during the token
+     * rollover. */
+    entry->channel.securityToken.channelId = server->lastChannelId++;
+    entry->channel.altSecurityToken.channelId = entry->channel.securityToken.channelId;
+
+    /* Set an initial timeout before the negotiation handshake. So the channel
+     * is caught in UA_Server_cleanupTimedOutSecureChannels if the client is
+     * unresponsive.
+     *
+     * TODO: Make this a configuration option */
+    entry->channel.securityToken.createdAt = UA_DateTime_nowMonotonic();
+    entry->channel.securityToken.revisedLifetime = 10000; /* 10s should be enough */
+
+    /* Add to the server's list */
     TAILQ_INSERT_TAIL(&server->channels, entry, pointers);
-    UA_Connection_attachSecureChannel(connection, &entry->channel);
+
+    /* Update the statistics */
     server->secureChannelStatistics.currentChannelCount++;
     server->secureChannelStatistics.cumulatedChannelCount++;
+
+    *outChannel = &entry->channel;
     return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
-UA_Server_configSecureChannel(void *application, UA_SecureChannel *channel,
-                              const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
+configServerSecureChannel(void *application, UA_SecureChannel *channel,
+                          const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
     /* Iterate over available endpoints and choose the correct one */
     UA_SecurityPolicy *securityPolicy = NULL;
     UA_Server *const server = (UA_Server *const) application;
@@ -238,49 +251,45 @@ UA_SecureChannelManager_open(UA_Server *server, UA_SecureChannel *channel,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Set the SecurityMode */
+    const UA_SecurityPolicy *sp = channel->securityPolicy;
     if(request->securityMode != UA_MESSAGESECURITYMODE_NONE &&
-       UA_ByteString_equal(&channel->securityPolicy->policyUri, &UA_SECURITY_POLICY_NONE_URI)) {
+       UA_ByteString_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI))
         return UA_STATUSCODE_BADSECURITYMODEREJECTED;
-    }
-
     channel->securityMode = request->securityMode;
-    channel->securityToken.channelId = server->lastChannelId++;
-    channel->securityToken.createdAt = UA_DateTime_nowMonotonic();
 
-    /* Set the lifetime. Lifetime 0 -> set the maximum possible */
-    channel->securityToken.revisedLifetime =
+    /* Set the initial SecurityToken. Set the alternative token that is moved to
+     * the primary token when the first symmetric message triggers a token
+     * revolve. Lifetime 0 -> set the maximum possible lifetime */
+    channel->renewState = UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER;
+    channel->altSecurityToken.tokenId = server->lastTokenId++;
+    channel->altSecurityToken.createdAt = UA_DateTime_nowMonotonic();
+    channel->altSecurityToken.revisedLifetime =
         (request->requestedLifetime > server->config.maxSecurityTokenLifetime) ?
         server->config.maxSecurityTokenLifetime : request->requestedLifetime;
-    if(channel->securityToken.revisedLifetime == 0)
-        channel->securityToken.revisedLifetime = server->config.maxSecurityTokenLifetime;
+    if(channel->altSecurityToken.revisedLifetime == 0)
+        channel->altSecurityToken.revisedLifetime = server->config.maxSecurityTokenLifetime;
 
+    /* Store the received client nonce and generate the server nonce. The
+     * syymmetric encryption keys are generated from the nonces when the first
+     * symmetric message is received that triggers revolving of the token. */
     UA_StatusCode retval = UA_ByteString_copy(&request->clientNonce, &channel->remoteNonce);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    UA_CHECK_STATUS(retval, return retval);
 
-    /* Generate the nonce. The syymmetric encryption keys are generated when the
-     * first symmetric message is received */
     retval = UA_SecureChannel_generateLocalNonce(channel);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    UA_CHECK_STATUS(retval, return retval);
 
     /* Set the response. The token will be revolved to the new token when the
      * first symmetric messages is received. */
-    response->securityToken = channel->securityToken;
+    response->securityToken = channel->altSecurityToken;
     response->securityToken.createdAt = UA_DateTime_now(); /* Only for sending */
     response->responseHeader.timestamp = response->securityToken.createdAt;
     response->responseHeader.requestHandle = request->requestHeader.requestHandle;
     retval = UA_ByteString_copy(&channel->localNonce, &response->serverNonce);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    UA_CHECK_STATUS(retval, return retval);
 
     /* The channel is open */
     channel->state = UA_SECURECHANNELSTATE_OPEN;
-
-    /* For the first revolve */
-    channel->renewState = UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER;
-    channel->altSecurityToken = channel->securityToken;
-    channel->securityToken.tokenId = 0;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -383,7 +392,5 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
 /* The server does not send a CloseSecureChannel response */
 void
 Service_CloseSecureChannel(UA_Server *server, UA_SecureChannel *channel) {
-    UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "CloseSecureChannel");
-    removeSecureChannel(server, container_of(channel, channel_entry, channel),
-                        UA_DIAGNOSTICEVENT_CLOSE);
+    shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_CLOSE);
 }
diff --git a/tests/server/check_monitoreditem_filter.c b/tests/server/check_monitoreditem_filter.c
index 3176a74c13a..7b3d898ad93 100644
--- a/tests/server/check_monitoreditem_filter.c
+++ b/tests/server/check_monitoreditem_filter.c
@@ -16,7 +16,6 @@
 #include <check.h>
 
 #include "testing_clock.h"
-#include "testing_networklayers.h"
 #include "thread_wrapper.h"
 
 UA_Server *server;
@@ -123,9 +122,6 @@ static void setup(void) {
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
-
     UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
     request.requestedMaxKeepAliveCount = 100;
     UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
@@ -192,12 +188,11 @@ waitForNotification(UA_UInt32 notifications, UA_UInt32 maxTries) {
 static UA_Boolean
 fuzzyLastValueIsEqualTo(UA_Double value) {
     double offset = 0.001;
-    if(lastValue.hasValue
-            && lastValue.value.type == &UA_TYPES[UA_TYPES_DOUBLE]) {
+    if(lastValue.hasValue &&
+       lastValue.value.type == &UA_TYPES[UA_TYPES_DOUBLE]) {
         double lastDouble = *((UA_Double*)(lastValue.value.data));
-        if (lastDouble > value - offset && lastDouble < value + offset) {
+        if(lastDouble > value - offset && lastDouble < value + offset)
             return true;
-        }
     }
     return false;
 }
@@ -345,7 +340,6 @@ START_TEST(Server_MonitoredItemsAbsoluteFilterSetLater) {
     ck_assert_uint_eq(deleteResponse.results[0], UA_STATUSCODE_GOOD);
 
     UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
-
 }
 END_TEST
 
@@ -498,7 +492,6 @@ START_TEST(Server_MonitoredItemsAbsoluteFilterSetOnCreateRemoveLater) {
     ck_assert_uint_eq(deleteResponse.results[0], UA_STATUSCODE_GOOD);
 
     UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
-
 }
 END_TEST
 
@@ -644,7 +637,6 @@ START_TEST(Server_MonitoredItemsPercentFilterSetLaterMissingEURange) {
     ck_assert_uint_eq(deleteResponse.results[0], UA_STATUSCODE_GOOD);
 
     UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
-
 }
 END_TEST
 
@@ -911,7 +903,6 @@ START_TEST(Server_MonitoredItemsAbsoluteFilterSetOnCreate) {
     ck_assert_uint_eq(deleteResponse.results[0], UA_STATUSCODE_GOOD);
 
     UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
-
 }
 END_TEST
 
diff --git a/tests/server/check_server_monitoringspeed.c b/tests/server/check_server_monitoringspeed.c
index f8893844aac..d5ca04bfd72 100644
--- a/tests/server/check_server_monitoringspeed.c
+++ b/tests/server/check_server_monitoringspeed.c
@@ -13,34 +13,14 @@
 #include <stdio.h>
 #include <time.h>
 
-#include "testing_networklayers.h"
-#include "testing_policy.h"
-
-static UA_SecureChannel testChannel;
-static UA_SecurityPolicy dummyPolicy;
-static UA_Connection testingConnection;
-static funcs_called funcsCalled;
-static key_sizes keySizes;
 static UA_Server *server;
 
 static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
-
-    TestingPolicy(&dummyPolicy, UA_BYTESTRING_NULL, &funcsCalled, &keySizes);
-    UA_SecureChannel_init(&testChannel, &UA_ConnectionConfig_default);
-    UA_SecureChannel_setSecurityPolicy(&testChannel, &dummyPolicy, &UA_BYTESTRING_NULL);
-
-    testingConnection = createDummyConnection(65535, NULL);
-    UA_Connection_attachSecureChannel(&testingConnection, &testChannel);
-    testChannel.connection = &testingConnection;
 }
 
 static void teardown(void) {
-    UA_SecureChannel_close(&testChannel);
-    dummyPolicy.clear(&dummyPolicy);
-    testingConnection.close(&testingConnection);
-
     UA_Server_delete(server);
 }
 
diff --git a/tests/server/check_server_speed_addnodes.c b/tests/server/check_server_speed_addnodes.c
index 3b4ddb28c87..c282013cbe5 100644
--- a/tests/server/check_server_speed_addnodes.c
+++ b/tests/server/check_server_speed_addnodes.c
@@ -1,46 +1,23 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
-/* This example is just to see how fast we can add nodes. The server does not
- * open a TCP port. */
-
+#include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include "server/ua_services.h"
-#include "ua_server_internal.h"
-#include "ua_types_encoding_binary.h"
-
 #include <check.h>
 #include <time.h>
 
-#include "testing_networklayers.h"
-#include "testing_policy.h"
-
-static UA_SecureChannel testChannel;
-static UA_SecurityPolicy dummyPolicy;
-static UA_Connection testingConnection;
-static funcs_called funcsCalled;
-static key_sizes keySizes;
 static UA_Server *server;
 
 static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
-    TestingPolicy(&dummyPolicy, UA_BYTESTRING_NULL, &funcsCalled, &keySizes);
-    UA_SecureChannel_init(&testChannel, &UA_ConnectionConfig_default);
-    UA_SecureChannel_setSecurityPolicy(&testChannel, &dummyPolicy, &UA_BYTESTRING_NULL);
-    testingConnection = createDummyConnection(65535, NULL);
-    UA_Connection_attachSecureChannel(&testingConnection, &testChannel);
-    testChannel.connection = &testingConnection;
-
+    /* Disable logging */
     UA_ServerConfig *config = UA_Server_getConfig(server);
     config->logger.log = NULL;
 }
 
 static void teardown(void) {
-    UA_SecureChannel_close(&testChannel);
-    dummyPolicy.clear(&dummyPolicy);
-    testingConnection.close(&testingConnection);
     UA_Server_delete(server);
 }
 

From 5ef11b11ff964b2f8abdb67efbf53b0e2a0eb24d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 17:59:37 +0200
Subject: [PATCH 0376/1963] refactor(core): Remove the old connection code

---
 CMakeLists.txt                    |   2 -
 src/ua_connection.c               | 108 ------------------------------
 src/ua_connection_internal.h      |  58 ----------------
 tests/fuzz/fuzz_binary_message.cc |  11 ++-
 4 files changed, 5 insertions(+), 174 deletions(-)
 delete mode 100644 src/ua_connection.c
 delete mode 100644 src/ua_connection_internal.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7930c0f4104..4afbf8baec6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -935,7 +935,6 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_SOURCE_DIR}/src/ua_util_internal.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated_handling.h
-                     ${PROJECT_SOURCE_DIR}/src/ua_connection_internal.h
                      ${PROJECT_SOURCE_DIR}/src/ua_securechannel.h
                      ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_session.h
@@ -959,7 +958,6 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c
                 ${PROJECT_SOURCE_DIR}/src/ua_util.c
                 ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.c
-                ${PROJECT_SOURCE_DIR}/src/ua_connection.c
                 ${PROJECT_SOURCE_DIR}/src/ua_securechannel.c
                 ${PROJECT_SOURCE_DIR}/src/ua_securechannel_crypto.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_session.c
diff --git a/src/ua_connection.c b/src/ua_connection.c
deleted file mode 100644
index 456b0b4e8e6..00000000000
--- a/src/ua_connection.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *    Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- *    Copyright 2014, 2016-2017 (c) Florian Palm
- *    Copyright 2015-2016 (c) Sten Grüner
- *    Copyright 2015 (c) Oleksiy Vasylyev
- *    Copyright 2016-2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2017 (c) Mark Giraud, Fraunhofer IOSB
- *    Copyright 2019 (c) Kalycito Infotech Private Limited
- */
-
-#include <open62541/types_generated_handling.h>
-
-#include "ua_connection_internal.h"
-#include "ua_securechannel.h"
-#include "ua_types_encoding_binary.h"
-#include "ua_util_internal.h"
-
-#include <open62541/plugin/eventloop.h>
-
-/* Hides some errors before sending them to a client according to the
- * standard. */
-static void
-hideErrors(UA_TcpErrorMessage *const error) {
-    switch(error->error) {
-    case UA_STATUSCODE_BADCERTIFICATEUNTRUSTED:
-    case UA_STATUSCODE_BADCERTIFICATEREVOKED:
-        error->error = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
-        error->reason = UA_STRING_NULL;
-        break;
-        // TODO: Check if these are all cases that need to be covered.
-    default:
-        break;
-    }
-}
-
-void
-UA_Connection_sendError(UA_Connection *connection, UA_TcpErrorMessage *error) {
-    hideErrors(error);
-
-    UA_TcpMessageHeader header;
-    header.messageTypeAndChunkType = UA_MESSAGETYPE_ERR + UA_CHUNKTYPE_FINAL;
-    // Header + ErrorMessage (error + reasonLength_field + length)
-    header.messageSize = 8 + (4 + 4 + (UA_UInt32)error->reason.length);
-
-    /* Get the send buffer from the network layer */
-    UA_ByteString msg = UA_BYTESTRING_NULL;
-    UA_StatusCode retval = connection->getSendBuffer(connection, header.messageSize, &msg);
-    if(retval != UA_STATUSCODE_GOOD)
-        return;
-
-    /* Encode and send the response */
-    UA_Byte *bufPos = msg.data;
-    const UA_Byte *bufEnd = &msg.data[msg.length];
-    retval |= UA_encodeBinaryInternal(&header,
-                                      &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER],
-                                      &bufPos, &bufEnd, NULL, NULL);
-    retval |= UA_encodeBinaryInternal(error,
-                                      &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE],
-                                      &bufPos, &bufEnd, NULL, NULL);
-    (void)retval; /* Encoding of these cannot fail */
-    msg.length = header.messageSize;
-    connection->send(connection, &msg);
-}
-
-void
-UA_Connection_detachSecureChannel(UA_Connection *connection) {
-    UA_SecureChannel *channel = connection->channel;
-    /* only replace when the channel points to this connection */
-    if(channel && channel->connection == connection)
-        channel->connection = NULL;
-    connection->channel = NULL;
-}
-
-void
-UA_Connection_attachSecureChannel(UA_Connection *connection, UA_SecureChannel *channel) {
-    if(channel->connection == NULL) {
-        channel->connection = connection;
-        connection->channel = channel;
-    }
-}
-
-UA_StatusCode
-UA_Connection_getSendBuffer(UA_Connection *connection, size_t length,
-                                   UA_ByteString *buf) {
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
-    return cm->allocNetworkBuffer(cm, (uintptr_t)connection->sockfd, buf, length);
-}
-
-UA_StatusCode
-UA_Connection_send(UA_Connection *connection, UA_ByteString *buf) {
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
-    return cm->sendWithConnection(cm, (uintptr_t)connection->sockfd, 0, NULL, buf);
-}
-
-void
-UA_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf) {
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
-    cm->freeNetworkBuffer(cm, (uintptr_t)connection->sockfd, buf);
-}
-
-void
-UA_Connection_close(UA_Connection *connection) {
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)connection->handle;
-    cm->closeConnection(cm, (uintptr_t)connection->sockfd);
-}
diff --git a/src/ua_connection_internal.h b/src/ua_connection_internal.h
deleted file mode 100644
index ffefd77618a..00000000000
--- a/src/ua_connection_internal.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *    Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- *    Copyright 2016-2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2017 (c) Florian Palm
- *    Copyright 2017 (c) Mark Giraud, Fraunhofer IOSB
- */
-
-#ifndef UA_CONNECTION_INTERNAL_H_
-#define UA_CONNECTION_INTERNAL_H_
-
-#include <open62541/plugin/network.h>
-#include <open62541/plugin/eventloop.h>
-#include <open62541/transport_generated.h>
-
-_UA_BEGIN_DECLS
-
-
-
-/* When a fatal error occurs the Server shall send an Error Message to the
- * Client and close the socket. When a Client encounters one of these errors, it
- * shall also close the socket but does not send an Error Message. After the
- * socket is closed a Client shall try to reconnect automatically using the
- * mechanisms described in [...]. */
-void
-UA_Connection_sendError(UA_Connection *connection,
-                        UA_TcpErrorMessage *error);
-
-void UA_Connection_detachSecureChannel(UA_Connection *connection);
-void UA_Connection_attachSecureChannel(UA_Connection *connection,
-                                       UA_SecureChannel *channel);
-
-/********************************/
-/* Server Eventloop integration */
-/********************************/
-
-
-/* In this example, we integrate the server into an external "mainloop". This
-   can be for example the event-loop used in GUI toolkits, such as Qt or GTK. */
-
-UA_StatusCode UA_Connection_getSendBuffer(UA_Connection *connection, size_t length,
-                                          UA_ByteString *buf);
-UA_StatusCode UA_Connection_send(UA_Connection *connection, UA_ByteString *buf);
-void UA_Connection_releaseBuffer (UA_Connection *connection, UA_ByteString *buf);
-void UA_Connection_close(UA_Connection *connection);
-
-/* Process a binary message (TCP packet). The message can contain partial
- * chunks. (TCP is a streaming protocol and packets may be split/merge during
- * transport.) After processing, the message is freed with
- * connection->releaseRecvBuffer. */
-void UA_Server_processBinaryMessage(UA_Server *server, UA_Connection *connection,
-                                    UA_ByteString *message);
-
-_UA_END_DECLS
-
-#endif /* UA_CONNECTION_INTERNAL_H_ */
diff --git a/tests/fuzz/fuzz_binary_message.cc b/tests/fuzz/fuzz_binary_message.cc
index 372becbfca0..164fd1ffb23 100644
--- a/tests/fuzz/fuzz_binary_message.cc
+++ b/tests/fuzz/fuzz_binary_message.cc
@@ -13,8 +13,6 @@
 #include <open62541/types.h>
 
 #include "ua_server_internal.h"
-#include "ua_connection_internal.h"
-
 #include "testing_networklayers.h"
 
 #define RECEIVE_BUFFER_SIZE 65535
@@ -32,8 +30,6 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         return 0;
     size -= 4;
 
-    UA_Connection c = createDummyConnection(RECEIVE_BUFFER_SIZE, NULL);
-
     /* less debug output */
     UA_ServerConfig initialConfig;
     memset(&initialConfig, 0, sizeof(UA_ServerConfig));
@@ -64,11 +60,14 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     }
     memcpy(msg.data, data, size);
 
-    UA_Server_processBinaryMessage(server, &c, &msg);
+    void *ctx;
+    UA_Server_networkCallback(&testConnectionManagerTCP, 0, server,
+                              &ctx, UA_CONNECTIONSTATE_ESTABLISHED,
+                              0, NULL, msg);
+
     // if we got an invalid chunk, the message is not deleted, so delete it here
     UA_ByteString_clear(&msg);
     UA_Server_run_shutdown(server);
     UA_Server_delete(server);
-    c.close(&c);
     return 0;
 }

From 38e6bcae75835953703823b17c71de4fea26a237 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Aug 2022 18:07:33 +0200
Subject: [PATCH 0377/1963] refactor(core): Simplify logging for the
 SecureChannel

---
 src/ua_securechannel.h | 73 ++++++++++++------------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 295e99e3179..53da9399919 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -340,59 +340,26 @@ signAndEncryptSym(UA_MessageContext *messageContext,
  * zero arguments. So we add a dummy argument that is not printed (%.0s is
  * string of length zero). */
 
-#define UA_LOG_TRACE_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)              \
-    UA_LOG_TRACE(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                        \
-                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
-                 (long unsigned)(CHANNEL)->connectionId,                      \
-                 (CHANNEL)->securityToken.channelId, __VA_ARGS__)
-
-#define UA_LOG_TRACE_CHANNEL(LOGGER, CHANNEL, ...)        \
-    UA_MACRO_EXPAND(UA_LOG_TRACE_CHANNEL_INTERNAL(LOGGER, CHANNEL, __VA_ARGS__, ""))
-
-#define UA_LOG_DEBUG_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)              \
-    UA_LOG_DEBUG(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                        \
-                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
-                 (long unsigned)(CHANNEL)->connectionId,                      \
-                 (CHANNEL)->securityToken.channelId, __VA_ARGS__)
-
-#define UA_LOG_DEBUG_CHANNEL(LOGGER, CHANNEL, ...)        \
-    UA_MACRO_EXPAND(UA_LOG_DEBUG_CHANNEL_INTERNAL(LOGGER, CHANNEL, __VA_ARGS__, ""))
-
-#define UA_LOG_INFO_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)               \
-    UA_LOG_INFO(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                         \
-                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
-                 (long unsigned)(CHANNEL)->connectionId,                      \
-                 (CHANNEL)->securityToken.channelId, __VA_ARGS__)
-
-#define UA_LOG_INFO_CHANNEL(LOGGER, CHANNEL, ...)        \
-    UA_MACRO_EXPAND(UA_LOG_INFO_CHANNEL_INTERNAL(LOGGER, CHANNEL, __VA_ARGS__, ""))
-
-#define UA_LOG_WARNING_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)            \
-    UA_LOG_WARNING(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                      \
-                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
-                 (long unsigned)(CHANNEL)->connectionId,                      \
-                 (CHANNEL)->securityToken.channelId, __VA_ARGS__)
-
-#define UA_LOG_WARNING_CHANNEL(LOGGER, CHANNEL, ...)        \
-    UA_MACRO_EXPAND(UA_LOG_WARNING_CHANNEL_INTERNAL(LOGGER, CHANNEL, __VA_ARGS__, ""))
-
-#define UA_LOG_ERROR_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)              \
-    UA_LOG_ERROR(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                        \
-                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
-                 (long unsigned)(CHANNEL)->connectionId,                      \
-                 (CHANNEL)->securityToken.channelId, __VA_ARGS__)
-
-#define UA_LOG_ERROR_CHANNEL(LOGGER, CHANNEL, ...)        \
-    UA_MACRO_EXPAND(UA_LOG_ERROR_CHANNEL_INTERNAL(LOGGER, CHANNEL, __VA_ARGS__, ""))
-
-#define UA_LOG_FATAL_CHANNEL_INTERNAL(LOGGER, CHANNEL, MSG, ...)              \
-    UA_LOG_FATAL(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,                        \
-                 "TCP %lu\t| SecureChannel %" PRIu32 " | " MSG "%.0s",        \
-                 (long unsigned)(CHANNEL)->connectionId,                      \
-                 (CHANNEL)->securityToken.channelId, __VA_ARGS__)
-
-#define UA_LOG_FATAL_CHANNEL(LOGGER, CHANNEL, ...)        \
-    UA_MACRO_EXPAND(UA_LOG_FATAL_CHANNEL_INTERNAL(LOGGER, CHANNEL, __VA_ARGS__, ""))
+#define UA_LOG_CHANNEL_INTERNAL(LOGGER, LEVEL, CHANNEL, MSG, ...)       \
+    if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
+        UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,            \
+                       "TCP %lu\t| SecureChannel %" PRIu32 "\t| " MSG "%.0s", \
+                       (long unsigned)(CHANNEL)->connectionId,          \
+                       (CHANNEL)->securityToken.channelId, __VA_ARGS__); \
+    }
+
+#define UA_LOG_TRACE_CHANNEL(LOGGER, CHANNEL, ...)                      \
+    UA_MACRO_EXPAND(UA_LOG_CHANNEL_INTERNAL(LOGGER, TRACE, CHANNEL, __VA_ARGS__, ""))
+#define UA_LOG_DEBUG_CHANNEL(LOGGER, CHANNEL, ...)                      \
+    UA_MACRO_EXPAND(UA_LOG_CHANNEL_INTERNAL(LOGGER, DEBUG, CHANNEL, __VA_ARGS__, ""))
+#define UA_LOG_INFO_CHANNEL(LOGGER, CHANNEL, ...)                       \
+    UA_MACRO_EXPAND(UA_LOG_CHANNEL_INTERNAL(LOGGER, INFO, CHANNEL, __VA_ARGS__, ""))
+#define UA_LOG_WARNING_CHANNEL(LOGGER, CHANNEL, ...)                    \
+    UA_MACRO_EXPAND(UA_LOG_CHANNEL_INTERNAL(LOGGER, WARNING, CHANNEL, __VA_ARGS__, ""))
+#define UA_LOG_ERROR_CHANNEL(LOGGER, CHANNEL, ...)                      \
+    UA_MACRO_EXPAND(UA_LOG_CHANNEL_INTERNAL(LOGGER, ERROR, CHANNEL, __VA_ARGS__, ""))
+#define UA_LOG_FATAL_CHANNEL(LOGGER, CHANNEL, ...)                      \
+    UA_MACRO_EXPAND(UA_LOG_CHANNEL_INTERNAL(LOGGER, FATAL, CHANNEL, __VA_ARGS__, ""))
 
 _UA_END_DECLS
 

From f385bcd0dc209a26f8d788713dbe19e9ca12ee35 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 4 Aug 2022 10:56:04 +0200
Subject: [PATCH 0378/1963] refactor(test): Simplify the historizing unit tests

---
 tests/client/check_client_historical_data.c   | 58 +++---------
 tests/server/check_server_historical_data.c   | 88 ++----------------
 .../check_server_historical_data_circular.c   | 92 +++++--------------
 3 files changed, 45 insertions(+), 193 deletions(-)

diff --git a/tests/client/check_client_historical_data.c b/tests/client/check_client_historical_data.c
index 42469f0fe48..78b3b4308fe 100644
--- a/tests/client/check_client_historical_data.c
+++ b/tests/client/check_client_historical_data.c
@@ -22,15 +22,11 @@
 #include "testing_clock.h"
 #include "testing_networklayers.h"
 #include "thread_wrapper.h"
-#ifdef UA_ENABLE_HISTORIZING
 #include "historical_read_test_data.h"
-#endif
 #include <stddef.h>
 
 static UA_Server *server;
-#ifdef UA_ENABLE_HISTORIZING
 static UA_HistoryDataGathering *gathering;
-#endif
 static UA_Boolean running;
 static THREAD_HANDLE server_thread;
 
@@ -38,7 +34,6 @@ static UA_Client *client;
 static UA_NodeId parentNodeId;
 static UA_NodeId parentReferenceNodeId;
 static UA_NodeId outNodeId;
-#ifdef UA_ENABLE_HISTORIZING
 static UA_HistoryDataBackend serverBackend;
 
 // to receive data after we inserted data, we need in datavalue more space
@@ -50,7 +45,6 @@ struct ReceiveTupel {
 static const size_t receivedDataSize = (sizeof(testData) / sizeof(testData[0])) + 10;
 static struct ReceiveTupel receivedTestData[(sizeof(testData) / sizeof(testData[0])) + 10];
 static size_t receivedTestDataPos;
-#endif
 
 THREAD_CALLBACK(serverloop) {
     while(running)
@@ -58,7 +52,6 @@ THREAD_CALLBACK(serverloop) {
     return 0;
 }
 
-#ifdef UA_ENABLE_HISTORIZING
 static UA_Boolean
 fillHistoricalDataBackend(UA_HistoryDataBackend backend);
 static void resetReceiveBuffer(void) {
@@ -79,7 +72,6 @@ static void fillInt64DataValue(UA_DateTime timestamp, UA_Int64 value,
     dataValue->hasStatus = true;
     dataValue->status = UA_STATUSCODE_GOOD;
 }
-#endif
 
 static void setup(void) {
     running = true;
@@ -124,7 +116,6 @@ static void setup(void) {
                                                 &outNodeId)
                       , UA_STATUSCODE_GOOD);
 
-#ifdef UA_ENABLE_HISTORIZING
     UA_HistorizingNodeIdSettings setting;
     serverBackend = UA_HistoryDataBackend_Memory(1, 100);
     setting.historizingBackend = serverBackend;
@@ -132,26 +123,18 @@ static void setup(void) {
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
     retval = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
-
     ck_assert(fillHistoricalDataBackend(setting.historizingBackend));
-#endif
 
     client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
-
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
 }
 
 static void
-teardown(void)
-{
+teardown(void) {
     /* cleanup */
-#ifdef UA_ENABLE_HISTORIZING
     UA_HistoryDataBackend_Memory_clear(&serverBackend);
-#endif
     UA_Client_disconnect(client);
     UA_Client_delete(client);
     UA_NodeId_clear(&parentNodeId);
@@ -161,25 +144,18 @@ teardown(void)
     THREAD_JOIN(server_thread);
     UA_Server_run_shutdown(server);
     UA_Server_delete(server);
-#ifdef UA_ENABLE_HISTORIZING
     UA_free(gathering);
-#endif
 }
 
-#ifdef UA_ENABLE_HISTORIZING
-
-#include <stdio.h>
-#include "ua_session.h"
-
 static UA_Boolean
-fillHistoricalDataBackend(UA_HistoryDataBackend backend)
-{
+fillHistoricalDataBackend(UA_HistoryDataBackend backend) {
     fprintf(stderr, "Adding to historical data backend: ");
     for (size_t i = 0; i < testDataSize; ++i) {
         fprintf(stderr, "%lld, ", (long long)testData[i]);
         UA_DataValue value;
         fillInt64DataValue(testData[i], testData[i], &value);
-        if (backend.serverSetHistoryData(server, backend.context, NULL, NULL, &outNodeId, UA_FALSE, &value) != UA_STATUSCODE_GOOD) {
+        if (backend.serverSetHistoryData(server, backend.context, NULL, NULL,
+                                         &outNodeId, UA_FALSE, &value) != UA_STATUSCODE_GOOD) {
             fprintf(stderr, "\n");
             UA_DataValue_clear(&value);
             return false;
@@ -190,7 +166,9 @@ fillHistoricalDataBackend(UA_HistoryDataBackend backend)
     return true;
 }
 
-static UA_Boolean checkTestData(UA_Boolean inverse, UA_DateTime *dataA, struct ReceiveTupel *dataB, size_t dataSize) {
+static UA_Boolean
+checkTestData(UA_Boolean inverse, UA_DateTime *dataA,
+              struct ReceiveTupel *dataB, size_t dataSize) {
     for (size_t i = 0; i < dataSize; ++i) {
         if (!inverse && dataA[i] != dataB[i].timestamp)
             return false;
@@ -200,7 +178,9 @@ static UA_Boolean checkTestData(UA_Boolean inverse, UA_DateTime *dataA, struct R
     return true;
 }
 
-static UA_Boolean checkModifiedData(UA_DateTime *dataA, size_t dataASize, struct ReceiveTupel *dataB, size_t dataBSize) {
+static UA_Boolean
+checkModifiedData(UA_DateTime *dataA, size_t dataASize,
+                  struct ReceiveTupel *dataB, size_t dataBSize) {
     for (size_t i = 0; i < dataBSize; ++i) {
         UA_Boolean found = UA_FALSE;
         for (size_t j = 0; j < dataASize; ++j) {
@@ -239,8 +219,7 @@ receiveCallback(UA_Client *clt,
     return true;
 }
 
-START_TEST(Client_HistorizingReadRawAll)
-{
+START_TEST(Client_HistorizingReadRawAll) {
     UA_StatusCode ret = UA_Client_HistoryRead_raw(client,
                                                   &outNodeId,
                                                   receiveCallback,
@@ -258,8 +237,7 @@ START_TEST(Client_HistorizingReadRawAll)
 }
 END_TEST
 
-START_TEST(Client_HistorizingReadRawOne)
-{
+START_TEST(Client_HistorizingReadRawOne) {
     UA_StatusCode ret = UA_Client_HistoryRead_raw(client,
                                                   &outNodeId,
                                                   receiveCallback,
@@ -634,14 +612,11 @@ START_TEST(Client_HistorizingReplaceRawFail)
 }
 END_TEST
 
-#endif /*UA_ENABLE_HISTORIZING*/
-
-static Suite* testSuite_Client(void)
-{
+static Suite *
+testSuite_Client(void) {
     Suite *s = suite_create("Client Historical Data");
     TCase *tc_client = tcase_create("Client Historical Data read_raw");
     tcase_add_checked_fixture(tc_client, setup, teardown);
-#ifdef UA_ENABLE_HISTORIZING
     tcase_add_test(tc_client, Client_HistorizingReadRawAll);
     tcase_add_test(tc_client, Client_HistorizingReadRawOne);
     tcase_add_test(tc_client, Client_HistorizingReadRawTwo);
@@ -654,14 +629,11 @@ static Suite* testSuite_Client(void)
     tcase_add_test(tc_client, Client_HistorizingDeleteRaw);
     tcase_add_test(tc_client, Client_HistorizingInsertRawFail);
     tcase_add_test(tc_client, Client_HistorizingReplaceRawFail);
-#endif /* UA_ENABLE_HISTORIZING */
     suite_add_tcase(s, tc_client);
-
     return s;
 }
 
-int main(void)
-{
+int main(void) {
     Suite *s = testSuite_Client();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c
index 0310346f4e5..52de8bbd083 100644
--- a/tests/server/check_server_historical_data.c
+++ b/tests/server/check_server_historical_data.c
@@ -16,27 +16,19 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include "client/ua_client_internal.h"
 #include "server/ua_server_internal.h"
 
 #include <check.h>
 
 #include "testing_clock.h"
-#include "testing_networklayers.h"
 #include "thread_wrapper.h"
-#ifdef UA_ENABLE_HISTORIZING
 #include "historical_read_test_data.h"
 #include "randomindextest_backend.h"
-#endif
-#include <stddef.h>
 
 static UA_Server *server;
-#ifdef UA_ENABLE_HISTORIZING
 static UA_HistoryDataGathering *gathering;
-#endif
 static UA_Boolean running;
 static THREAD_HANDLE server_thread;
-static MUTEX_HANDLE serverMutex;
 
 static UA_Client *client;
 static UA_NodeId parentNodeId;
@@ -45,49 +37,28 @@ static UA_NodeId outNodeId;
 
 static UA_DateTime *testDataSorted;
 
-static void serverMutexLock(void) {
-    if (!(MUTEX_LOCK(serverMutex))) {
-        fprintf(stderr, "Mutex cannot be locked.\n");
-        exit(1);
-    }
-}
-
-static void serverMutexUnlock(void) {
-    if (!(MUTEX_UNLOCK(serverMutex))) {
-        fprintf(stderr, "Mutex cannot be unlocked.\n");
-        exit(1);
-    }
-}
-
 THREAD_CALLBACK(serverloop) {
     while(running) {
-        serverMutexLock();
         UA_Server_run_iterate(server, false);
-        serverMutexUnlock();
     }
     return 0;
 }
 
 static void setup(void) {
-    if (!(MUTEX_INIT(serverMutex))) {
-        fprintf(stderr, "Server mutex was not created correctly.\n");
-        exit(1);
-    }
     running = true;
 
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
-#ifdef UA_ENABLE_HISTORIZING
     gathering = (UA_HistoryDataGathering*)UA_calloc(1, sizeof(UA_HistoryDataGathering));
     *gathering = UA_HistoryDataGathering_Default(1);
     config->historyDatabase = UA_HistoryDatabase_default(*gathering);
-#endif
 
     UA_StatusCode retval = UA_Server_run_startup(server);
     if(retval != UA_STATUSCODE_GOOD) {
-        fprintf(stderr, "Error while calling Server_run_startup. %s\n", UA_StatusCode_name(retval));
+        fprintf(stderr, "Error while calling Server_run_startup. %s\n",
+                UA_StatusCode_name(retval));
         UA_Server_delete(server);
         exit(1);
     }
@@ -123,14 +94,12 @@ static void setup(void) {
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     if (retval != UA_STATUSCODE_GOOD) {
-        fprintf(stderr, "Client can not connect to opc.tcp://localhost:4840. %s\n", UA_StatusCode_name(retval));
+        fprintf(stderr, "Client can not connect to opc.tcp://localhost:4840. %s\n",
+                UA_StatusCode_name(retval));
         UA_Client_delete(client);
         UA_Server_delete(server);
         exit(1);
     }
-
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
 }
 
 static void teardown(void) {
@@ -144,23 +113,11 @@ static void teardown(void) {
     UA_NodeId_clear(&outNodeId);
     UA_Server_run_shutdown(server);
     UA_Server_delete(server);
-#ifdef UA_ENABLE_HISTORIZING
     UA_free(gathering);
-#endif
-    if (!MUTEX_DESTROY(serverMutex)) {
-        fprintf(stderr, "Server mutex was not destroyed correctly.\n");
-        exit(1);
-    }
 }
 
-#ifdef UA_ENABLE_HISTORIZING
-
-#include <stdio.h>
-#include "ua_session.h"
-
 static UA_StatusCode
-setUInt32(UA_Client *thisClient, UA_NodeId node, UA_UInt32 value)
-{
+setUInt32(UA_Client *thisClient, UA_NodeId node, UA_UInt32 value) {
     UA_Variant variant;
     UA_Variant_setScalar(&variant, &value, &UA_TYPES[UA_TYPES_UINT32]);
     return UA_Client_writeValueAttribute(thisClient, node, &variant);
@@ -620,9 +577,7 @@ START_TEST(Server_HistorizingUpdateDelete)
     setting.historizingBackend = backend;
     setting.maxHistoryDataResponseSize = 1000;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
-    serverMutexLock();
     UA_StatusCode ret = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(ret), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // fill backend
@@ -645,9 +600,7 @@ START_TEST(Server_HistorizingUpdateInsert)
     setting.historizingBackend = backend;
     setting.maxHistoryDataResponseSize = 1000;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
-    serverMutexLock();
     UA_StatusCode ret = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(ret), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // fill backend with insert
@@ -677,9 +630,7 @@ START_TEST(Server_HistorizingUpdateReplace)
     setting.historizingBackend = backend;
     setting.maxHistoryDataResponseSize = 1000;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
-    serverMutexLock();
     UA_StatusCode ret = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(ret), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // fill backend with insert
@@ -713,9 +664,7 @@ START_TEST(Server_HistorizingUpdateUpdate)
     setting.historizingBackend = backend;
     setting.maxHistoryDataResponseSize = 1000;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
-    serverMutexLock();
     UA_StatusCode ret = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(ret), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // fill backend with insert
@@ -835,16 +784,12 @@ START_TEST(Server_HistorizingStrategyPoll)
     setting.maxHistoryDataResponseSize = 100;
     setting.pollingInterval = 100;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_POLL;
-    serverMutexLock();
     retval = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // fill the data
     UA_DateTime start = UA_DateTime_now();
-    serverMutexLock();
     retval = gathering->startPoll(server, gathering->context, &outNodeId);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
@@ -852,9 +797,7 @@ START_TEST(Server_HistorizingStrategyPoll)
         UA_fakeSleep(50);
         UA_realSleep(50);
         if (k == 5) {
-            serverMutexLock();
             gathering->stopPoll(server, gathering->context, &outNodeId);
-            serverMutexUnlock();
         }
         setUInt32(client, outNodeId, (unsigned int)k);
     }
@@ -907,9 +850,7 @@ START_TEST(Server_HistorizingStrategyValueSet)
     setting.historizingBackend = UA_HistoryDataBackend_Memory(3, 100);
     setting.maxHistoryDataResponseSize = 100;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_VALUESET;
-    serverMutexLock();
     retval = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // fill the data
@@ -959,9 +900,7 @@ START_TEST(Server_HistorizingBackendMemory)
     setting.historizingBackend = backend;
     setting.maxHistoryDataResponseSize = 1000;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
-    serverMutexLock();
     UA_StatusCode ret = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(ret), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // empty backend should not crash
@@ -996,9 +935,7 @@ START_TEST(Server_HistorizingRandomIndexBackend)
     setting.historizingBackend = backend;
     setting.maxHistoryDataResponseSize = 1000;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
-    serverMutexLock();
     UA_StatusCode ret = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
     ck_assert_str_eq(UA_StatusCode_name(ret), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // read all in one
@@ -1019,14 +956,11 @@ START_TEST(Server_HistorizingRandomIndexBackend)
 }
 END_TEST
 
-#endif /*UA_ENABLE_HISTORIZING*/
-
-static Suite* testSuite_Client(void)
-{
+static Suite *
+testSuite_Client(void) {
     Suite *s = suite_create("Server Historical Data");
     TCase *tc_server = tcase_create("Server Historical Data Basic");
     tcase_add_checked_fixture(tc_server, setup, teardown);
-#ifdef UA_ENABLE_HISTORIZING
     tcase_add_test(tc_server, Server_HistorizingStrategyPoll);
     tcase_add_test(tc_server, Server_HistorizingStrategyUser);
     tcase_add_test(tc_server, Server_HistorizingStrategyValueSet);
@@ -1036,25 +970,19 @@ static Suite* testSuite_Client(void)
     tcase_add_test(tc_server, Server_HistorizingUpdateInsert);
     tcase_add_test(tc_server, Server_HistorizingUpdateReplace);
     tcase_add_test(tc_server, Server_HistorizingUpdateUpdate);
-#endif /* UA_ENABLE_HISTORIZING */
     suite_add_tcase(s, tc_server);
 
     return s;
 }
 
-int main(void)
-{
-#ifdef UA_ENABLE_HISTORIZING
+int main(void) {
     testDataSorted = sortDateTimes(testData);
-#endif /* UA_ENABLE_HISTORIZING */
     Suite *s = testSuite_Client();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
     srunner_run_all(sr,CK_NORMAL);
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
-#ifdef UA_ENABLE_HISTORIZING
     UA_free(testDataSorted);
-#endif /* UA_ENABLE_HISTORIZING */
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/tests/server/check_server_historical_data_circular.c b/tests/server/check_server_historical_data_circular.c
index 5a40e232d97..6bb7df63599 100644
--- a/tests/server/check_server_historical_data_circular.c
+++ b/tests/server/check_server_historical_data_circular.c
@@ -16,68 +16,39 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include "client/ua_client_internal.h"
-#include "server/ua_server_internal.h"
-
 #include <check.h>
 
+#include "server/ua_server_internal.h"
 #include "testing_clock.h"
-#include "testing_networklayers.h"
 #include "thread_wrapper.h"
-#include <stddef.h>
 
 static UA_Server *server;
-#ifdef UA_ENABLE_HISTORIZING
 static UA_HistoryDataGathering *gathering;
-#endif
 static UA_Boolean running;
 static THREAD_HANDLE server_thread;
-static MUTEX_HANDLE serverMutex;
 
 static UA_Client *client;
 static UA_NodeId parentNodeId;
 static UA_NodeId parentReferenceNodeId;
 static UA_NodeId outNodeId;
 
-static void serverMutexLock(void) {
-    if (!(MUTEX_LOCK(serverMutex))) {
-        fprintf(stderr, "Mutex cannot be locked.\n");
-        exit(1);
-    }
-}
-
-static void serverMutexUnlock(void) {
-    if (!(MUTEX_UNLOCK(serverMutex))) {
-        fprintf(stderr, "Mutex cannot be unlocked.\n");
-        exit(1);
-    }
-}
-
 THREAD_CALLBACK(serverloop) {
     while(running) {
-        serverMutexLock();
         UA_Server_run_iterate(server, false);
-        serverMutexUnlock();
     }
     return 0;
 }
 
 static void setup(void) {
-    if (!(MUTEX_INIT(serverMutex))) {
-        fprintf(stderr, "Server mutex was not created correctly.\n");
-        exit(1);
-    }
     running = true;
 
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
-#ifdef UA_ENABLE_HISTORIZING
     gathering = (UA_HistoryDataGathering*)UA_calloc(1, sizeof(UA_HistoryDataGathering));
     *gathering = UA_HistoryDataGathering_Circular(1);
     config->historyDatabase = UA_HistoryDatabase_default(*gathering);
-#endif
 
     UA_StatusCode retval = UA_Server_run_startup(server);
     if(retval != UA_STATUSCODE_GOOD) {
@@ -94,7 +65,8 @@ static void setup(void) {
     attr.description = UA_LOCALIZEDTEXT("en-US","the answer");
     attr.displayName = UA_LOCALIZEDTEXT("en-US","the answer");
     attr.dataType = UA_TYPES[UA_TYPES_UINT32].typeId;
-    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD | UA_ACCESSLEVELMASK_HISTORYWRITE;
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE |
+        UA_ACCESSLEVELMASK_HISTORYREAD | UA_ACCESSLEVELMASK_HISTORYWRITE;
     attr.historizing = true;
 
     /* Add the variable node to the information model */
@@ -107,7 +79,7 @@ static void setup(void) {
                                        parentReferenceNodeId, uint32Name,
                                        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                                        attr, NULL, &outNodeId);
-    if (retval != UA_STATUSCODE_GOOD) {
+    if(retval != UA_STATUSCODE_GOOD) {
         fprintf(stderr, "Error adding variable node. %s\n", UA_StatusCode_name(retval));
         UA_Server_delete(server);
         exit(1);
@@ -116,15 +88,13 @@ static void setup(void) {
     client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
-    if (retval != UA_STATUSCODE_GOOD) {
-        fprintf(stderr, "Client can not connect to opc.tcp://localhost:4840. %s\n", UA_StatusCode_name(retval));
+    if(retval != UA_STATUSCODE_GOOD) {
+        fprintf(stderr, "Client can not connect to opc.tcp://localhost:4840. %s\n",
+                UA_StatusCode_name(retval));
         UA_Client_delete(client);
         UA_Server_delete(server);
         exit(1);
     }
-
-    UA_Client_recv = client->connection.recv;
-    client->connection.recv = UA_Client_recvTesting;
 }
 
 static void teardown(void) {
@@ -138,29 +108,16 @@ static void teardown(void) {
     UA_NodeId_clear(&outNodeId);
     UA_Server_run_shutdown(server);
     UA_Server_delete(server);
-#ifdef UA_ENABLE_HISTORIZING
     UA_free(gathering);
-#endif
-    if (!MUTEX_DESTROY(serverMutex)) {
-        fprintf(stderr, "Server mutex was not destroyed correctly.\n");
-        exit(1);
-    }
 }
 
-#ifdef UA_ENABLE_HISTORIZING
-
-#include <stdio.h>
-#include "ua_session.h"
-
 static UA_StatusCode
-setUInt32(UA_Client *thisClient, UA_NodeId node, UA_UInt32 value)
-{
+setUInt32(UA_Client *thisClient, UA_NodeId node, UA_UInt32 value) {
     UA_Variant variant;
     UA_Variant_setScalar(&variant, &value, &UA_TYPES[UA_TYPES_UINT32]);
     return UA_Client_writeValueAttribute(thisClient, node, &variant);
 }
 
-
 void
 Service_HistoryRead(UA_Server *server, UA_Session *session,
                     const UA_HistoryReadRequest *request,
@@ -172,8 +129,7 @@ requestHistory(UA_DateTime start,
                UA_HistoryReadResponse * response,
                UA_UInt32 numValuesPerNode,
                UA_Boolean returnBounds,
-               UA_ByteString *continuationPoint)
-{
+               UA_ByteString *continuationPoint) {
     UA_ReadRawModifiedDetails *details = UA_ReadRawModifiedDetails_new();
     details->startTime = start;
     details->endTime = end;
@@ -183,7 +139,7 @@ requestHistory(UA_DateTime start,
 
     UA_HistoryReadValueId *valueId = UA_HistoryReadValueId_new();
     UA_NodeId_copy(&outNodeId, &valueId->nodeId);
-    if (continuationPoint)
+    if(continuationPoint)
         UA_ByteString_copy(continuationPoint, &valueId->continuationPoint);
 
     UA_HistoryReadRequest request;
@@ -203,9 +159,7 @@ requestHistory(UA_DateTime start,
     UA_HistoryReadRequest_clear(&request);
 }
 
-
-START_TEST(Server_HistorizingStrategyValueSet)
-{
+START_TEST(Server_HistorizingStrategyValueSet) {
     // init to a defined value
     UA_StatusCode retval = setUInt32(client, outNodeId, 43);
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
@@ -215,9 +169,9 @@ START_TEST(Server_HistorizingStrategyValueSet)
     setting.historizingBackend = UA_HistoryDataBackend_Memory_Circular(3, 10);
     setting.maxHistoryDataResponseSize = 10;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_VALUESET;
-    serverMutexLock();
+    UA_LOCK(&server->serviceMutex);
     retval = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    serverMutexUnlock();
+    UA_UNLOCK(&server->serviceMutex);
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // Fill the data overcoming the buffer size and starting to write new values replacing the old ones.
@@ -241,10 +195,12 @@ START_TEST(Server_HistorizingStrategyValueSet)
     requestHistory(start, end, &response, 0, false, NULL);
 
     // test the response
-    ck_assert_str_eq(UA_StatusCode_name(response.responseHeader.serviceResult), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+    ck_assert_str_eq(UA_StatusCode_name(response.responseHeader.serviceResult),
+                     UA_StatusCode_name(UA_STATUSCODE_GOOD));
     ck_assert_uint_eq(response.resultsSize, 1);
     for (size_t i = 0; i < response.resultsSize; ++i) {
-        ck_assert_str_eq(UA_StatusCode_name(response.results[i].statusCode), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+        ck_assert_str_eq(UA_StatusCode_name(response.results[i].statusCode),
+                         UA_StatusCode_name(UA_STATUSCODE_GOOD));
         ck_assert_uint_eq(response.results[i].historyData.encoding, UA_EXTENSIONOBJECT_DECODED);
         ck_assert(response.results[i].historyData.content.decoded.type == &UA_TYPES[UA_TYPES_HISTORYDATA]);
         UA_HistoryData * data = (UA_HistoryData *)response.results[i].historyData.content.decoded.data;
@@ -252,7 +208,8 @@ START_TEST(Server_HistorizingStrategyValueSet)
         for (size_t j = 0; j < data->dataValuesSize; ++j) {
             ck_assert(data->dataValues[j].sourceTimestamp >= start && data->dataValues[j].sourceTimestamp < end);
             ck_assert_uint_eq(data->dataValues[j].hasSourceTimestamp, true);
-            ck_assert_str_eq(UA_StatusCode_name(data->dataValues[j].status), UA_StatusCode_name(UA_STATUSCODE_GOOD));
+            ck_assert_str_eq(UA_StatusCode_name(data->dataValues[j].status),
+                             UA_StatusCode_name(UA_STATUSCODE_GOOD));
             ck_assert_uint_eq(data->dataValues[j].hasValue, true);
             ck_assert(data->dataValues[j].value.type == &UA_TYPES[UA_TYPES_UINT32]);
             UA_UInt32 * value = (UA_UInt32 *)data->dataValues[j].value.data;
@@ -267,23 +224,18 @@ START_TEST(Server_HistorizingStrategyValueSet)
 }
 END_TEST
 
-#endif /*UA_ENABLE_HISTORIZING*/
-
-static Suite* testSuite_Client(void)
-{
+static Suite *
+testSuite_Client(void) {
     Suite *s = suite_create("Server Historical Data");
     TCase *tc_server = tcase_create("Server Historical Data Circular");
     tcase_add_checked_fixture(tc_server, setup, teardown);
-#ifdef UA_ENABLE_HISTORIZING
     tcase_add_test(tc_server, Server_HistorizingStrategyValueSet);
-#endif /* UA_ENABLE_HISTORIZING */
     suite_add_tcase(s, tc_server);
 
     return s;
 }
 
-int main(void)
-{
+int main(void) {
     Suite *s = testSuite_Client();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);

From d4b4116907dad5d13cc3d7e517b09de8256bfbc0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 4 Aug 2022 12:02:03 +0200
Subject: [PATCH 0379/1963] refactor(test): Simplify the multithreaded unit
 test logic

---
 .../multithreading/check_mt_addDeleteObject.c |  8 ++--
 tests/multithreading/check_mt_addObjectNode.c |  8 ++--
 .../multithreading/check_mt_addVariableNode.c | 37 ++++++++++---------
 .../check_mt_addVariableTypeNode.c            |  8 ++--
 .../check_mt_readValueAttribute.c             |  8 ++--
 .../multithreading/check_mt_readWriteDelete.c |  9 +++--
 .../check_mt_readWriteDeleteCallback.c        |  9 +++--
 tests/multithreading/mt_testing.h             | 35 ++++++++++++------
 8 files changed, 76 insertions(+), 46 deletions(-)

diff --git a/tests/multithreading/check_mt_addDeleteObject.c b/tests/multithreading/check_mt_addDeleteObject.c
index 03d0c874e26..673d905a4c5 100644
--- a/tests/multithreading/check_mt_addDeleteObject.c
+++ b/tests/multithreading/check_mt_addDeleteObject.c
@@ -76,8 +76,6 @@ void server_deleteObject(void* value){
 
 static
 void initTest(void) {
-    initThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
-
     for (size_t i = 0; i < tc.numberOfWorkers; i++) {
         setThreadContext(&tc.workerContext[i], i, ITERATIONS_PER_WORKER, server_addObject);
     }
@@ -95,7 +93,6 @@ END_TEST
 static Suite* testSuite_immutableNodes(void) {
     Suite *s = suite_create("Multithreading");
     TCase *valueCallback = tcase_create("Add-Delete nodes");
-    initTest();
     tcase_add_checked_fixture(valueCallback, setup, teardown);
     tcase_add_test(valueCallback, addDeleteObjectTypeNodes);
     suite_add_tcase(s,valueCallback);
@@ -106,7 +103,12 @@ int main(void) {
     Suite *s = testSuite_immutableNodes();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
+
+    createThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
+    initTest();
     srunner_run_all(sr, CK_NORMAL);
+    deleteThreadContext();
+
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/multithreading/check_mt_addObjectNode.c b/tests/multithreading/check_mt_addObjectNode.c
index 36651eece67..0f5b9895279 100644
--- a/tests/multithreading/check_mt_addObjectNode.c
+++ b/tests/multithreading/check_mt_addObjectNode.c
@@ -91,8 +91,6 @@ void client_addObject(void* value){
 
 static
 void initTest(void) {
-    initThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
-
     for (size_t i = 0; i < tc.numberOfWorkers; i++) {
         setThreadContext(&tc.workerContext[i], i, ITERATIONS_PER_WORKER, server_addObject);
     }
@@ -111,7 +109,6 @@ END_TEST
 static Suite* testSuite_immutableNodes(void) {
     Suite *s = suite_create("Multithreading");
     TCase *valueCallback = tcase_create("Add object nodes");
-    initTest();
     tcase_add_checked_fixture(valueCallback, setup, teardown);
     tcase_add_test(valueCallback, addObjectTypeNodes);
     suite_add_tcase(s,valueCallback);
@@ -122,7 +119,12 @@ int main(void) {
     Suite *s = testSuite_immutableNodes();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
+
+    createThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
+    initTest();
     srunner_run_all(sr, CK_NORMAL);
+    deleteThreadContext();
+
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/multithreading/check_mt_addVariableNode.c b/tests/multithreading/check_mt_addVariableNode.c
index c51780c08b2..31b0ab4e98e 100644
--- a/tests/multithreading/check_mt_addVariableNode.c
+++ b/tests/multithreading/check_mt_addVariableNode.c
@@ -14,7 +14,8 @@
 #define NUMBER_OF_CLIENTS 10
 #define ITERATIONS_PER_CLIENT 10
 
-static void setup(void) {
+static void
+setup(void) {
     tc.running = true;
     tc.server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(tc.server));
@@ -22,8 +23,8 @@ static void setup(void) {
     THREAD_CREATE(server_thread, serverloop);
 }
 
-static
-void checkServer(void) {
+static void
+checkServer(void) {
     for (size_t i = 0; i < NUMBER_OF_WORKERS * ITERATIONS_PER_WORKER; i++) {
         UA_ReadValueId rvi;
         UA_ReadValueId_init(&rvi);
@@ -60,8 +61,8 @@ void checkServer(void) {
     }
 }
 
-static
-void server_addVariable(void* value) {
+static void
+server_addVariable(void* value) {
         ThreadContext tmp = (*(ThreadContext *) value);
         size_t offset = tmp.index * tmp.upperBound;
         size_t number = offset + tmp.counter;
@@ -85,8 +86,8 @@ void server_addVariable(void* value) {
         ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 }
 
-static
-void client_addVariable(void* value){
+static void
+client_addVariable(void* value){
     ThreadContext tmp = (*(ThreadContext *) value);
     size_t offset = tmp.index * tmp.upperBound;
     size_t number = offset + tmp.counter;
@@ -107,16 +108,13 @@ void client_addVariable(void* value){
     UA_StatusCode retval = UA_Client_addVariableNode(tc.clients[tmp.index], nodeId,
                                                UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
                                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                                               integerName,
-                                               UA_NODEID_NULL, attr, NULL);
+                                               integerName, UA_NODEID_NULL, attr, NULL);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
 }
 
-static
-void initTest(void) {
-    initThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
-
+static void
+initTest(void) {
     for (size_t i = 0; i < tc.numberOfWorkers; i++) {
         setThreadContext(&tc.workerContext[i], i, ITERATIONS_PER_WORKER, server_addVariable);
     }
@@ -127,14 +125,14 @@ void initTest(void) {
 }
 
 START_TEST(addVariableNodes) {
-        startMultithreading();
-    }
+    startMultithreading();
+}
 END_TEST
 
-static Suite* testSuite_immutableNodes(void) {
+static Suite *
+testSuite_immutableNodes(void) {
     Suite *s = suite_create("Multithreading");
     TCase *valueCallback = tcase_create("Add variable nodes");
-    initTest();
     tcase_add_checked_fixture(valueCallback, setup, teardown);
     tcase_add_test(valueCallback, addVariableNodes);
     suite_add_tcase(s,valueCallback);
@@ -145,7 +143,12 @@ int main(void) {
     Suite *s = testSuite_immutableNodes();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
+
+    createThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
+    initTest();
     srunner_run_all(sr, CK_NORMAL);
+    deleteThreadContext();
+
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/multithreading/check_mt_addVariableTypeNode.c b/tests/multithreading/check_mt_addVariableTypeNode.c
index 80a16bdf6c9..b2290552404 100644
--- a/tests/multithreading/check_mt_addVariableTypeNode.c
+++ b/tests/multithreading/check_mt_addVariableTypeNode.c
@@ -109,8 +109,6 @@ void client_addVariableType(void* value){
 
 static
 void initTest(void) {
-    initThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
-
     for (size_t i = 0; i < tc.numberOfWorkers; i++) {
         setThreadContext(&tc.workerContext[i], i, ITERATIONS_PER_WORKER, server_addVariableType);
     }
@@ -128,7 +126,6 @@ END_TEST
 static Suite* testSuite_immutableNodes(void) {
     Suite *s = suite_create("Multithreading");
     TCase *valueCallback = tcase_create("Add variable type nodes");
-    initTest();
     tcase_add_checked_fixture(valueCallback, setup, teardown);
     tcase_add_test(valueCallback, addVariableTypeNodes);
     suite_add_tcase(s,valueCallback);
@@ -139,7 +136,12 @@ int main(void) {
     Suite *s = testSuite_immutableNodes();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
+
+    createThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, checkServer);
+    initTest();
     srunner_run_all(sr, CK_NORMAL);
+    deleteThreadContext();
+
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/multithreading/check_mt_readValueAttribute.c b/tests/multithreading/check_mt_readValueAttribute.c
index 67b7299abf1..472814c2dc7 100644
--- a/tests/multithreading/check_mt_readValueAttribute.c
+++ b/tests/multithreading/check_mt_readValueAttribute.c
@@ -84,8 +84,6 @@ void client_readValueAttribute(void * value) {
 
 static
 void initTest(void) {
-    initThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, NULL);
-
     for (size_t i = 0; i < tc.numberOfWorkers; i++) {
         setThreadContext(&tc.workerContext[i], i, ITERATIONS_PER_WORKER, server_readValueAttribute);
     }
@@ -103,7 +101,6 @@ END_TEST
 static Suite* testSuite_immutableNodes(void) {
     Suite *s = suite_create("Multithreading");
     TCase *valueCallback = tcase_create("Read Write attribute");
-    initTest();
     tcase_add_checked_fixture(valueCallback, setup, teardown);
     tcase_add_test(valueCallback, readValueAttribute);
     suite_add_tcase(s,valueCallback);
@@ -114,7 +111,12 @@ int main(void) {
     Suite *s = testSuite_immutableNodes();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
+
+    createThreadContext(NUMBER_OF_WORKERS, NUMBER_OF_CLIENTS, NULL);
+    initTest();
     srunner_run_all(sr, CK_NORMAL);
+    deleteThreadContext();
+
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/multithreading/check_mt_readWriteDelete.c b/tests/multithreading/check_mt_readWriteDelete.c
index 5e842d2966d..cb89b43bff8 100644
--- a/tests/multithreading/check_mt_readWriteDelete.c
+++ b/tests/multithreading/check_mt_readWriteDelete.c
@@ -117,8 +117,6 @@ void client_readValue(void *value) {
 
 static
 void initTest(void) {
-    initThreadContext(NUMBER_OF_READ_WORKERS + NUMBER_OF_WRITE_WORKERS + 1, NUMBER_OF_READ_CLIENTS + NUMBER_OF_WRITE_CLIENTS, NULL);
-
     size_t i = 0;
     for (; i < NUMBER_OF_READ_WORKERS; i++) {
         setThreadContext(&tc.workerContext[i], i, ITERATIONS_PER_WORKER, server_readValue);
@@ -147,7 +145,6 @@ END_TEST
 static Suite* testSuite_immutableNodes(void) {
     Suite *s = suite_create("Multithreading");
     TCase *valueCallback = tcase_create("Read-Write-Delete attribute");
-    initTest();
     tcase_add_checked_fixture(valueCallback, setup, teardown);
     tcase_add_test(valueCallback, readWriteDelete);
     suite_add_tcase(s,valueCallback);
@@ -158,7 +155,13 @@ int main(void) {
     Suite *s = testSuite_immutableNodes();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
+
+    createThreadContext(NUMBER_OF_READ_WORKERS + NUMBER_OF_WRITE_WORKERS + 1,
+                        NUMBER_OF_READ_CLIENTS + NUMBER_OF_WRITE_CLIENTS, NULL);
+    initTest();
     srunner_run_all(sr, CK_NORMAL);
+    deleteThreadContext();
+
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/multithreading/check_mt_readWriteDeleteCallback.c b/tests/multithreading/check_mt_readWriteDeleteCallback.c
index 4d13e241261..5f3fa12c42d 100644
--- a/tests/multithreading/check_mt_readWriteDeleteCallback.c
+++ b/tests/multithreading/check_mt_readWriteDeleteCallback.c
@@ -143,8 +143,6 @@ static
 void initTest(void) {
     UA_LOCK_INIT(&mu);
 
-    initThreadContext(NUMBER_OF_READ_WORKERS + NUMBER_OF_WRITE_WORKERS + 1, NUMBER_OF_READ_CLIENTS + NUMBER_OF_WRITE_CLIENTS, NULL);
-
     size_t i = 0;
     for (; i < NUMBER_OF_READ_WORKERS; i++) {
         setThreadContext(&tc.workerContext[i], i, ITERATIONS_PER_WORKER, server_readValue);
@@ -173,7 +171,6 @@ END_TEST
 static Suite* testSuite_immutableNodes(void) {
     Suite *s = suite_create("Multithreading");
     TCase *valueCallback = tcase_create("Read-Write-Delete-Callback");
-    initTest();
     tcase_add_checked_fixture(valueCallback, setup, teardown);
     tcase_add_test(valueCallback, readWriteDeleteCallback);
     suite_add_tcase(s,valueCallback);
@@ -184,7 +181,13 @@ int main(void) {
     Suite *s = testSuite_immutableNodes();
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
+
+    createThreadContext(NUMBER_OF_READ_WORKERS + NUMBER_OF_WRITE_WORKERS + 1,
+                        NUMBER_OF_READ_CLIENTS + NUMBER_OF_WRITE_CLIENTS, NULL);
+    initTest();
     srunner_run_all(sr, CK_NORMAL);
+    deleteThreadContext();
+
     int number_failed = srunner_ntests_failed(sr);
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/tests/multithreading/mt_testing.h b/tests/multithreading/mt_testing.h
index f7846bd82a4..e37e359420d 100644
--- a/tests/multithreading/mt_testing.h
+++ b/tests/multithreading/mt_testing.h
@@ -33,15 +33,15 @@ THREAD_CALLBACK(serverloop) {
 
 static
 void teardown(void) {
-    for (size_t i = 0; i < tc.numberOfWorkers; i++)
+    for(size_t i = 0; i < tc.numberOfWorkers; i++)
         THREAD_JOIN(tc.workerContext[i].handle);
 
-    for (size_t i = 0; i < tc.numberofClients; i++)
+    for(size_t i = 0; i < tc.numberofClients; i++)
         THREAD_JOIN(tc.clientContext[i].handle);
 
     tc.running = false;
     THREAD_JOIN(server_thread);
-    if (tc.checkServerNodes)
+    if(tc.checkServerNodes)
         tc.checkServerNodes();
     UA_Server_run_shutdown(tc.server);
     UA_Server_delete(tc.server);
@@ -49,7 +49,7 @@ void teardown(void) {
 
 THREAD_CALLBACK_PARAM(workerLoop, val) {
     ThreadContext tmp = (*(ThreadContext *) val);
-    for (size_t i = 0; i < tmp.upperBound; i++) {
+    for(size_t i = 0; i < tmp.upperBound; i++) {
         tmp.counter = i;
         tmp.func(&tmp);
     }
@@ -73,7 +73,8 @@ THREAD_CALLBACK_PARAM(clientLoop, val) {
 }
 
 static UA_INLINE void
-initThreadContext(size_t numberOfWorkers, size_t numberOfClients, void (*checkServerNodes)(void)) {
+createThreadContext(size_t numberOfWorkers, size_t numberOfClients,
+                  void (*checkServerNodes)(void)) {
     tc.numberOfWorkers = numberOfWorkers;
     tc.numberofClients = numberOfClients;
     tc.checkServerNodes = checkServerNodes;
@@ -83,7 +84,19 @@ initThreadContext(size_t numberOfWorkers, size_t numberOfClients, void (*checkSe
 }
 
 static UA_INLINE void
-setThreadContext(ThreadContext *workerContext, size_t index, size_t upperBound, void (*func)(void *param)) {
+deleteThreadContext(void) {
+    if(tc.workerContext)
+        UA_free(tc.workerContext);
+    if(tc.clients)
+        UA_free(tc.clients);
+    if(tc.clientContext)
+        UA_free(tc.clientContext);
+    memset(&tc, 0, sizeof(tc));
+}
+
+static UA_INLINE void
+setThreadContext(ThreadContext *workerContext, size_t index, size_t upperBound,
+                 void (*func)(void *param)) {
     workerContext->index = index;
     workerContext->upperBound = upperBound;
     workerContext->func = func;
@@ -91,11 +104,11 @@ setThreadContext(ThreadContext *workerContext, size_t index, size_t upperBound,
 
 static UA_INLINE void
 startMultithreading(void) {
-        for (size_t i = 0; i < tc.numberOfWorkers; i++)
-            THREAD_CREATE_PARAM(tc.workerContext[i].handle, workerLoop, tc.workerContext[i]);
+    for(size_t i = 0; i < tc.numberOfWorkers; i++)
+        THREAD_CREATE_PARAM(tc.workerContext[i].handle, workerLoop, tc.workerContext[i]);
 
-        for (size_t i = 0; i < tc.numberofClients; i++)
-            THREAD_CREATE_PARAM(tc.clientContext[i].handle, clientLoop, tc.clientContext[i]);
+    for(size_t i = 0; i < tc.numberofClients; i++)
+        THREAD_CREATE_PARAM(tc.clientContext[i].handle, clientLoop, tc.clientContext[i]);
 }
 
-#endif //OPEN62541_MT_TESTING_H
+#endif /* OPEN62541_MT_TESTING_H */

From 4d71b3ce82fc00f152e52e3fed3c4da2fcfa25df Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 4 Aug 2022 12:30:28 +0200
Subject: [PATCH 0380/1963] feat(cmake): Automatic initialization of the Git
 submodules via cmake

---
 CMakeLists.txt | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4afbf8baec6..d290a326131 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -446,7 +446,12 @@ if(UA_ENABLE_PUBSUB_MQTT)
         set(UA_FILE_MQTT ${open62541_MQTT_DIR}/src/mqtt.c)
     endif()
     if(NOT EXISTS "${UA_FILE_MQTT}")
-        message(FATAL_ERROR "File ${UA_FILE_MQTT} not found.You probably need to initialize the git submodule for deps/mqtt-c.Therefore execute the following command \ngit submodule update --init --recursive")
+        message(STATUS "Submodule update")
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
+        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+            message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}")
+        endif()
     else()
         # Warn if run in Windows
         if(WIN32)
@@ -1219,7 +1224,12 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     set(UA_FILE_NODESETS "${UA_FILE_NS0}")
 
     if(NOT EXISTS "${UA_FILE_NS0}")
-        message(FATAL_ERROR "File ${UA_FILE_NS0} not found. You probably need to initialize the git submodule for deps/ua-nodeset or set UA_NODESET_DIR.")
+        message(STATUS "Submodule update")
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
+        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+            message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}")
+        endif()
     endif()
 
 

From e5dceef49fdd5b82170803e001d5ff85abd283d8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 5 Aug 2022 10:22:33 +0200
Subject: [PATCH 0381/1963] refactor(server): Internalize some methods from
 ua_discovery_manager.h

---
 src/server/ua_discovery_manager.h            | 45 ++----------------
 src/server/ua_services_discovery_multicast.c | 50 +++++++++++++++-----
 2 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index 620815b201c..2a1e36576be 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -127,8 +127,8 @@ void UA_Discovery_cleanupTimedOut(UA_Server *server, UA_DateTime nowMonotonic);
 void
 UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverName,
                                     const UA_MdnsDiscoveryConfiguration *mdnsConfig,
-                                    const UA_String *discoveryUrl,
-                                    UA_Boolean isOnline, UA_Boolean updateTxt);
+                                    const UA_String *discoveryUrl, UA_Boolean isOnline,
+                                    UA_Boolean updateTxt);
 
 void mdns_record_received(const struct resource *r, void *data);
 
@@ -137,8 +137,7 @@ void mdns_create_txt(UA_Server *server, const char *fullServiceDomain,
                      const size_t capabilitiesSize,
                      void (*conflict)(char *host, int type, void *arg));
 
-void mdns_set_address_record(UA_Server *server,
-                             const char *fullServiceDomain,
+void mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
                              const char *localDomain);
 
 mdns_record_t *
@@ -146,53 +145,17 @@ mdns_find_record(mdns_daemon_t *mdnsDaemon, unsigned short type,
                  const char *host, const char *rdname);
 
 void startMulticastDiscoveryServer(UA_Server *server);
-
 void stopMulticastDiscoveryServer(UA_Server *server);
 
 UA_StatusCode
-iterateMulticastDiscoveryServer(UA_Server* server, UA_DateTime *nextRepeat,
+iterateMulticastDiscoveryServer(UA_Server *server, UA_DateTime *nextRepeat,
                                 UA_Boolean processIn);
 
-typedef enum {
-    UA_DISCOVERY_TCP,    /* OPC UA TCP mapping */
-    UA_DISCOVERY_TLS     /* OPC UA HTTPS mapping */
-} UA_DiscoveryProtocol;
-
-/* Send a multicast probe to find any other OPC UA server on the network through mDNS. */
-UA_StatusCode
-UA_Discovery_multicastQuery(UA_Server* server);
-
-/* Create a mDNS Record for the given server info and adds it to the mDNS output
- * queue.
- *
- * Additionally this method also adds the given server to the internal
- * serversOnNetwork list so that a client finds it when calling
- * FindServersOnNetwork. */
-UA_StatusCode
-UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
-                       const UA_String *hostname, UA_UInt16 port,
-                       const UA_String *path, const UA_DiscoveryProtocol protocol,
-                       UA_Boolean createTxt, const UA_String* capabilites,
-                       const size_t capabilitiesSize,
-                       UA_Boolean isSelf);
-
-
 UA_StatusCode
 UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord,
                                                const char *serverName, size_t serverNameLen,
                                                struct serverOnNetwork_list_entry **addedEntry);
 
-/* Create a mDNS Record for the given server info with TTL=0 and adds it to the
- * mDNS output queue.
- *
- * Additionally this method also removes the given server from the internal
- * serversOnNetwork list so that a client gets the updated data when calling
- * FindServersOnNetwork. */
-UA_StatusCode
-UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
-                          const UA_String *hostname, UA_UInt16 port,
-                          UA_Boolean removeTxt);
-
 UA_StatusCode
 UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord,
                                                     const char *serverName, size_t serverNameLen);
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index a5c291b96e6..4da7eefbb5f 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -12,6 +12,39 @@
 
 #if defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST)
 
+typedef enum {
+    UA_DISCOVERY_TCP,    /* OPC UA TCP mapping */
+    UA_DISCOVERY_TLS     /* OPC UA HTTPS mapping */
+} UA_DiscoveryProtocol;
+
+/* Create a mDNS Record for the given server info and adds it to the mDNS output
+ * queue.
+ *
+ * Additionally this method also adds the given server to the internal
+ * serversOnNetwork list so that a client finds it when calling
+ * FindServersOnNetwork. */
+static UA_StatusCode
+UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
+                       const UA_String *hostname, UA_UInt16 port,
+                       const UA_String *path, const UA_DiscoveryProtocol protocol,
+                       UA_Boolean createTxt, const UA_String* capabilites,
+                       const size_t capabilitiesSize,
+                       UA_Boolean isSelf);
+
+/* Create a mDNS Record for the given server info with TTL=0 and adds it to the
+ * mDNS output queue.
+ *
+ * Additionally this method also removes the given server from the internal
+ * serversOnNetwork list so that a client gets the updated data when calling
+ * FindServersOnNetwork. */
+static UA_StatusCode
+UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
+                          const UA_String *hostname, UA_UInt16 port,
+                          UA_Boolean removeTxt);
+
+static int
+discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg);
+
 #if UA_MULTITHREADING >= 100
 
 static void *
@@ -108,8 +141,10 @@ void startMulticastDiscoveryServer(UA_Server *server) {
     for(size_t i = 0; i < server->config.serverUrlsSize; i++)
         addMdnsRecordForNetworkLayer(server, appName, &server->config.serverUrls[i]);
 
-    /* find any other server on the net */
-    UA_Discovery_multicastQuery(server);
+    /* Send a multicast probe to find any other OPC UA server on the network
+     * through mDNS */
+    mdnsd_query(server->discoveryManager.mdnsDaemon, "_opcua-tcp._tcp.local.",
+                QTYPE_PTR,discovery_multicastQueryAnswer, server);
 
 #if UA_MULTITHREADING >= 100
     multicastListenStart(server);
@@ -375,14 +410,7 @@ discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
     return 0;
 }
 
-UA_StatusCode
-UA_Discovery_multicastQuery(UA_Server* server) {
-    mdnsd_query(server->discoveryManager.mdnsDaemon, "_opcua-tcp._tcp.local.",
-                QTYPE_PTR,discovery_multicastQueryAnswer, server);
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
+static UA_StatusCode
 UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
                        const UA_String *hostname, UA_UInt16 port,
                        const UA_String *path, const UA_DiscoveryProtocol protocol,
@@ -517,7 +545,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
+static UA_StatusCode
 UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
                           const UA_String *hostname, UA_UInt16 port,
                           UA_Boolean removeTxt) {

From bfc3c0751f0ceadf0c8cf32215577dee97badd0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 00:14:18 +0000
Subject: [PATCH 0382/1963] build(deps): bump deps/ua-nodeset from `19595fa` to
 `a2208e8`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `19595fa` to `a2208e8`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/19595facade9b21490a554937461a081f1ac1530...a2208e8960453aabbfeacee94aee287292398f3a)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 19595facade..a2208e89604 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 19595facade9b21490a554937461a081f1ac1530
+Subproject commit a2208e8960453aabbfeacee94aee287292398f3a

From 47a4806670df3a4c4b60475d0c588de7382144e0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 7 Aug 2022 00:10:33 +0200
Subject: [PATCH 0383/1963] fix(deps): Fix member counting for the root JSON
 object

---
 deps/cj5.c        | 11 +++++++----
 tests/check_cj5.c |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 5859562bd1a..60ceef7d034 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -452,10 +452,13 @@ cj5_parse(const char *json5, unsigned int len,
             // Finalize the current token
             token->end = parser.pos;
 
-            // Move to the parent and increase the parent size
-            parser.curr_tok_idx = token->parent_id;
-            token = &tokens[token->parent_id];
-            token->size++;
+            // Move to the parent and increase the parent size.
+            // Omit when we leave the root
+            if(parser.curr_tok_idx != token->parent_id) {
+                parser.curr_tok_idx = token->parent_id;
+                token = &tokens[token->parent_id];
+                token->size++;
+            }
 
             // Step one level up
             depth--;
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index 3cd4815deaa..03175c04354 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -53,6 +53,9 @@ START_TEST(parseNestedObject) {
     cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
     ck_assert(r.error == CJ5_ERROR_NONE);
 
+    /* 12 elements directly under the root object */
+    ck_assert_uint_eq(tokens[0].size, 12);
+
     /* Test the cj5_find method for value lookup in objects */
     unsigned int idx = 0;
     cj5_error_code err = cj5_find(&r, &idx, "b");

From 6d9a21f3eea26c7382164875608b2c8aa8dfe945 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 8 Aug 2022 15:48:06 +0200
Subject: [PATCH 0384/1963] fix(deps): Fix fuzzing issues uncovered in cj5.c

---
 deps/cj5.c | 46 +++++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 60ceef7d034..eff1168599d 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -200,6 +200,10 @@ cj5__parse_string(cj5__parser *parser) {
     parser->error = CJ5_ERROR_INCOMPLETE;
 }
 
+// parser->pos is advanced a last time in the next iteration of the main
+// parse-loop. So we leave parse-primitive in a state where parse->pos points to
+// the last character of the primitive value (or the quote-character of the
+// string).
 static void
 cj5__parse_primitive(cj5__parser* parser) {
     const char* json5 = parser->json5;
@@ -244,10 +248,11 @@ cj5__parse_primitive(cj5__parser* parser) {
                !cj5__islowerchar(json5[parser->pos]) && 
                !cj5__isupperchar(json5[parser->pos]) &&
                !(json5[parser->pos] == '+') && !(json5[parser->pos] == '-')) {
-                parser->pos--; // Reparse this character for the next token
                 break;
             }
         }
+        parser->pos--; // Point to the last character that is still inside the
+                       // primitive value
     }
 
     cj5_token *token = cj5__alloc_token(parser);
@@ -334,7 +339,7 @@ cj5__skip_comment(cj5__parser* parser) {
     // Multi-line comments begin with '/*' and end with '*/'
     if(json5[parser->pos] == '*') {
         parser->pos++;
-        for(; parser->pos + 1 <= parser->len; parser->pos++) {
+        for(; parser->pos + 1 < parser->len; parser->pos++) {
             if(json5[parser->pos] == '*' && json5[parser->pos + 1] == '/') {
                 parser->pos++;
                 return;
@@ -449,15 +454,18 @@ cj5_parse(const char *json5, unsigned int len,
                 goto finish;
             }
 
-            // Finalize the current token
-            token->end = parser.pos;
-
-            // Move to the parent and increase the parent size.
-            // Omit when we leave the root
-            if(parser.curr_tok_idx != token->parent_id) {
-                parser.curr_tok_idx = token->parent_id;
-                token = &tokens[token->parent_id];
-                token->size++;
+            if(token) {
+                // Finalize the current token
+                token->end = parser.pos;
+
+                // Move to the parent and increase the parent size. Omit this
+                // when we leave the root (parent the same as the current
+                // token).
+                if(parser.curr_tok_idx != token->parent_id) {
+                    parser.curr_tok_idx = token->parent_id;
+                    token = &tokens[token->parent_id];
+                    token->size++;
+                }
             }
 
             // Step one level up
@@ -487,7 +495,8 @@ cj5_parse(const char *json5, unsigned int len,
             if(next[depth] == 'v') {
                 cj5__parse_primitive(&parser); // Parse primitive value
                 if(nesting[depth] != 0) { // Parent is object or array
-                    token->size++;
+                    if(token)
+                        token->size++;
                     next[depth] = ',';
                 } else { // The current value was the root element. Don't look for
                          // any next element.
@@ -496,7 +505,8 @@ cj5_parse(const char *json5, unsigned int len,
             } else if(next[depth] == 'k') {
                 CJ5_ASSERT(nesting[depth] == '{');
                 cj5__parse_key(&parser);
-                token->size++; // Keys count towards the length
+                if(token)
+                    token->size++; // Keys count towards the length
                 next[depth] = ':';
             } else {
                 parser.error = CJ5_ERROR_INVALID;
@@ -516,13 +526,19 @@ cj5_parse(const char *json5, unsigned int len,
     }
 
     // Close the virtual root object if there is one
-    if(nesting[0] == '{' && parser.error != CJ5_ERROR_OVERFLOW)
+    if(nesting[0] == '{' && parser.error != CJ5_ERROR_OVERFLOW) {
+        // Check the we end after a complete key-value pair (or dangling comma)
+        if(next[0] != 'k' && next[0] != ',')
+            parser.error = CJ5_ERROR_INVALID;
         tokens[0].end = parser.pos - 1;
+    }
 
  finish:
     // If parsing failed at the initial nesting depth, create a virtual root object
     // and restart parsing.
-    if(parser.error != CJ5_ERROR_NONE && depth == 0 && nesting[0] != '{') {
+    if(parser.error != CJ5_ERROR_NONE &&
+       parser.error != CJ5_ERROR_OVERFLOW &&
+       depth == 0 && nesting[0] != '{') {
         parser.token_count = 0;
         token = cj5__alloc_token(&parser);
         if(token) {

From c47b938422480ec26126805dca64475047e34203 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 9 Aug 2022 00:16:15 +0200
Subject: [PATCH 0385/1963] refactor(deps): Remove unneeded macros from
 /deps/cj5.c

---
 deps/cj5.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index eff1168599d..95b0b312871 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -28,18 +28,9 @@
 #include <float.h>
 #include <string.h>
 
-#if defined(_DEBUG) || defined(NDEBUG)
-# include <assert.h>
-# define CJ5_ASSERT(_e) assert(_e)
-#else
-# define CJ5_ASSERT(_e)
-#endif
-
 #if defined(_MSC_VER)
-# define CJ5__RESTRICT __restrict
 # define CJ5_INLINE __inline
 #else
-# define CJ5__RESTRICT __restrict__
 # define CJ5_INLINE inline
 #endif
 
@@ -103,7 +94,7 @@ cj5__isnum(char ch) {
     return cj5__isrange(ch, '0', '9');
 }
 
-static CJ5_INLINE cj5_token *
+static cj5_token *
 cj5__alloc_token(cj5__parser *parser) {
     cj5_token* token = NULL;
     if(parser->token_count < parser->max_tokens) {
@@ -384,8 +375,6 @@ cj5_parse(const char *json5, unsigned int len,
 
  start_parsing:
     for(; parser.pos < len; parser.pos++) {
-        CJ5_ASSERT(!token || token == &tokens[parser.curr_tok_idx]);
-
         char c = json5[parser.pos];
         switch(c) {
         case '\n': // Skip newline
@@ -503,7 +492,6 @@ cj5_parse(const char *json5, unsigned int len,
                     next[depth] = 0;
                 }
             } else if(next[depth] == 'k') {
-                CJ5_ASSERT(nesting[depth] == '{');
                 cj5__parse_key(&parser);
                 if(token)
                     token->size++; // Keys count towards the length

From 7e1b0600f5e7a1af120228353784e9e12d82f69b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 8 Aug 2022 22:00:49 +0200
Subject: [PATCH 0386/1963] fix(core): Fix index forwarding in the JSON
 decoding

Parsing an empty ExtensionObject did not increase the index.
---
 src/ua_types_encoding_json.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index ee4d792b103..652fb83ca04 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2408,8 +2408,10 @@ DECODE_JSON(ExtensionObject) {
     CHECK_OBJECT;
 
     /* Empty object -> Null ExtensionObject */
-    if(parseCtx->tokenArray[parseCtx->index].size == 0)
+    if(parseCtx->tokenArray[parseCtx->index].size == 0) {
+        parseCtx->index++; /* Skip the empty ExtensionObject */
         return UA_STATUSCODE_GOOD;
+    }
 
     /* Search for Encoding */
     size_t encodingPos = 0;
@@ -2747,11 +2749,13 @@ Array_decodeJson(void **dst, const UA_DataType *type,
 
     size_t length = (size_t)parseCtx->tokenArray[parseCtx->index].size;
 
+    parseCtx->index++; /* Go to first array member or to the first element after
+                        * the array (if empty) */
+
     /* Return early for empty arrays */
     if(length == 0) {
         *size_ptr = length;
         *dst = UA_EMPTY_ARRAY_SENTINEL;
-        parseCtx->index++; /* Jump over the array token */
         return UA_STATUSCODE_GOOD;
     }
 
@@ -2760,8 +2764,6 @@ Array_decodeJson(void **dst, const UA_DataType *type,
     if(*dst == NULL)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    parseCtx->index++; /* Go to first array member */
-
     /* Decode array members */
     uintptr_t ptr = (uintptr_t)*dst;
     for(size_t i = 0; i < length; ++i) {

From a2b6411238c384c33a778010274391c7047457ab Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 6 Aug 2022 00:27:36 +0200
Subject: [PATCH 0387/1963] refactor(core): Remove unneeded internal JSON
 definitions

---
 src/ua_types_encoding_json.c     |    4 +-
 src/ua_types_encoding_json.h     |   74 +-
 tests/check_types_builtin_json.c | 1872 ++++++++++++------------------
 3 files changed, 717 insertions(+), 1233 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 652fb83ca04..00e186a89f1 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1293,7 +1293,7 @@ encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx) {
     return encodeJsonJumpTable[type->typeKind](src, type, ctx);
 }
 
-status UA_FUNC_ATTR_WARN_UNUSED_RESULT
+static status
 UA_encodeJsonInternal(const void *src, const UA_DataType *type,
               u8 **bufPos, const u8 **bufEnd, const UA_String *namespaces,
               size_t namespaceSize, const UA_String *serverUris,
@@ -1360,7 +1360,7 @@ UA_encodeJson(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
 /* CalcSize */
 /************/
 
-size_t
+static size_t
 UA_calcSizeJsonInternal(const void *src, const UA_DataType *type,
                 const UA_String *namespaces, size_t namespaceSize,
                 const UA_String *serverUris, size_t serverUriSize,
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 99f67ecc0d8..35f2a20214f 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -20,41 +20,8 @@
 _UA_BEGIN_DECLS
 
 #define UA_JSON_MAXTOKENCOUNT 2048
-
-/* Returns the number of bytes the value src takes in json encoding. Returns
- * zero if an error occurs. */
-size_t
-UA_calcSizeJsonInternal(const void *src, const UA_DataType *type,
-                        const UA_String *namespaces, size_t namespaceSize,
-                        const UA_String *serverUris, size_t serverUriSize,
-                        UA_Boolean useReversible) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
-
-/* Encodes the scalar value described by type to json encoding.
- *
- * @param src The value. Must not be NULL.
- * @param type The value type. Must not be NULL.
- * @param bufPos Points to a pointer to the current position in the encoding
- *        buffer. Must not be NULL.
- * @param bufEnd Points to a pointer to the end of the encoding buffer (encoding
- *        always stops before *buf_end). Must not be NULL.
- * @param namespaces An array of namespaces
- * @param namespaceSize The size of the namespaces array
- * @param serverUris An array of serverUris
- * @param serverUriSize The size of the serverUris array
- * @param useReversible preserve datatypes in json encoding
- * @return Returns a statuscode whether encoding succeeded. */
-UA_StatusCode
-UA_encodeJsonInternal(const void *src, const UA_DataType *type, uint8_t **bufPos,
-                      const uint8_t **bufEnd, const UA_String *namespaces,
-                      size_t namespaceSize, const UA_String *serverUris,
-                      size_t serverUriSize,
-                      UA_Boolean useReversible) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
-
-/* Interal Definitions
- *
- * For future by the PubSub encoding */
-
 #define UA_JSON_ENCODING_MAX_RECURSION 100
+
 typedef struct {
     uint8_t *pos;
     const uint8_t *end;
@@ -85,45 +52,6 @@ UA_StatusCode writeJsonKey(CtxJson *ctx, const char* key);
 UA_StatusCode writeJsonCommaIfNeeded(CtxJson *ctx);
 UA_StatusCode writeJsonNull(CtxJson *ctx);
 
-/* The encoding length is returned in ctx->pos */
-static UA_INLINE UA_StatusCode
-calcJsonObjStart(CtxJson *ctx) {
-    UA_assert(ctx->calcOnly);
-    return writeJsonObjStart(ctx);
-}
-
-static UA_INLINE UA_StatusCode
-calcJsonObjElm(CtxJson *ctx, const char *key,
-               const void *value, const UA_DataType *type) {
-    UA_assert(ctx->calcOnly);
-    return writeJsonObjElm(ctx, key, value, type);
-}
-
-static UA_INLINE UA_StatusCode
-calcJsonObjEnd(CtxJson *ctx) {
-    UA_assert(ctx->calcOnly);
-    return writeJsonObjEnd(ctx);
-}
-
-static UA_INLINE UA_StatusCode
-calcJsonArrStart(CtxJson *ctx) {
-    UA_assert(ctx->calcOnly);
-    return writeJsonArrStart(ctx);
-}
-
-static UA_INLINE UA_StatusCode
-calcJsonArrElm(CtxJson *ctx, const void *value,
-               const UA_DataType *type) {
-    UA_assert(ctx->calcOnly);
-    return writeJsonArrElm(ctx, value, type);
-}
-
-static UA_INLINE UA_StatusCode
-calcJsonArrEnd(CtxJson *ctx) {
-    UA_assert(ctx->calcOnly);
-    return writeJsonArrEnd(ctx);
-}
-
 status
 encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx);
 
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index 693b908c5db..e06c264d924 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -20,42 +20,30 @@
 # pragma warning(disable: 4146)
 #endif
 
-static UA_INLINE UA_StatusCode
-UA_decodeJsonInternal(const UA_ByteString *src, void *dst, const UA_DataType *type) {
-    return UA_decodeJson(src, dst, type, NULL);
-}
-
 /* Test Boolean */
 START_TEST(UA_Boolean_true_json_encode) {
-
     UA_Boolean *src = UA_Boolean_new();
     UA_Boolean_init(src);
     *src = true;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
     UA_ByteString buf;
 
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
-
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
     char* result = "true";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
 
     UA_ByteString_clear(&buf);
     UA_Boolean_delete(src);
-
 }
 END_TEST
 
 START_TEST(UA_Boolean_false_json_encode) {
-
     UA_Boolean *src = UA_Boolean_new();
     UA_Boolean_init(src);
     *src = false;
@@ -63,20 +51,16 @@ START_TEST(UA_Boolean_false_json_encode) {
 
     UA_ByteString buf;
 
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
     ck_assert_uint_eq(size, 5);
 
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
-
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
     char* result = "false";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Boolean_delete(src);
@@ -84,7 +68,6 @@ START_TEST(UA_Boolean_false_json_encode) {
 END_TEST
 
 START_TEST(UA_Boolean_true_bufferTooSmall_json_encode) {
-
     UA_Boolean *src = UA_Boolean_new();
     UA_Boolean_init(src);
     *src = false;
@@ -93,16 +76,9 @@ START_TEST(UA_Boolean_true_bufferTooSmall_json_encode) {
     UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
-
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    char* result = "";
-    ck_assert_str_eq(result, (char*)buf.data);
+
     UA_ByteString_clear(&buf);
     UA_Boolean_delete(src);
 }
@@ -116,17 +92,16 @@ START_TEST(UA_String_json_encode) {
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
 
     UA_ByteString buf;
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
     // when
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    *bufPos = 0;
-    // then
+    status s = UA_encodeJson(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    // then
     char* result = "\"hello\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -138,17 +113,16 @@ START_TEST(UA_String_Empty_json_encode) {
     UA_ByteString buf;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
 
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
     // when
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    *bufPos = 0;
-    // then
+    status s = UA_encodeJson(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    // then
     char* result = "\"\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -160,17 +134,16 @@ START_TEST(UA_String_Null_json_encode) {
     UA_ByteString buf;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
     // when
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    *bufPos = 0;
-    // then
+    status s = UA_encodeJson(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    // then
     char* result = "null";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -181,17 +154,16 @@ START_TEST(UA_String_escapesimple_json_encode) {
     UA_String src = UA_STRING("\b\th\"e\fl\nl\\o\r");
     UA_ByteString buf;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
     // when
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    *bufPos = 0;
-    // then
+    status s = UA_encodeJson(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    // then
     char* result = "\"\\b\\th\\\"e\\fl\\nl\\\\o\\r\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -200,20 +172,20 @@ END_TEST
 START_TEST(UA_String_escapeutf_json_encode) {
     // given
     UA_String src = UA_STRING("he\\zsdl\alo€ \x26\x3A asdasd");
-    UA_ByteString buf;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
+
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
     // when
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    *bufPos = 0;
-    // then
+    status s = UA_encodeJson(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    // then
     char* result = "\"he\\\\zsdl\\u0007lo€ &: asdasd\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -222,20 +194,20 @@ END_TEST
 START_TEST(UA_String_special_json_encode) {
     // given
     UA_String src = UA_STRING("𝄞𠂊𝕥🔍");
-    UA_ByteString buf;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
+
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
     // when
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    *bufPos = 0;
-    // then
+    status s = UA_encodeJson(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    // then
     char* result = "\"𝄞𠂊𝕥🔍\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -248,19 +220,17 @@ START_TEST(UA_Byte_Max_Number_json_encode) {
     *src = 255;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_BYTE];
 
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
+
     UA_ByteString buf;
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "255";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Byte_delete(src);
@@ -268,122 +238,94 @@ START_TEST(UA_Byte_Max_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_Byte_Min_Number_json_encode) {
-
-    UA_Byte *src = UA_Byte_new();
-    *src = 0;
+    UA_Byte src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_BYTE];
 
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
+
     UA_ByteString buf;
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
-    UA_Byte_delete(src);
 }
 END_TEST
 
 START_TEST(UA_Byte_smallbuf_Number_json_encode) {
-
-    UA_Byte *src = UA_Byte_new();
-    *src = 255;
+    UA_Byte src = 255;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_BYTE];
-    UA_ByteString buf;
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
-    UA_Byte_delete(src);
 }
 END_TEST
 
 /* sByte */
 START_TEST(UA_SByte_Max_Number_json_encode) {
-
-    UA_SByte *src = UA_SByte_new();
-    *src = 127;
+    UA_SByte src = 127;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_SBYTE];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "127";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
-    UA_SByte_delete(src);
 }
 END_TEST
 
 START_TEST(UA_SByte_Min_Number_json_encode) {
-
-    UA_SByte *src = UA_SByte_new();
-    *src = -128;
+    UA_SByte src = -128;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_SBYTE];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "-128";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
-    UA_SByte_delete(src);
 }
 END_TEST
 
 START_TEST(UA_SByte_Zero_Number_json_encode) {
-
     UA_SByte *src = UA_SByte_new();
     *src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_SBYTE];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
     UA_ByteString buf;
 
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_SByte_delete(src);
@@ -391,7 +333,6 @@ START_TEST(UA_SByte_Zero_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_SByte_smallbuf_Number_json_encode) {
-
     UA_SByte *src = UA_SByte_new();
     *src = 127;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_SBYTE];
@@ -399,14 +340,10 @@ START_TEST(UA_SByte_smallbuf_Number_json_encode) {
 
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_SByte_delete(src);
 }
@@ -415,24 +352,20 @@ END_TEST
 
 /* UInt16 */
 START_TEST(UA_UInt16_Max_Number_json_encode) {
-
     UA_UInt16 *src = UA_UInt16_new();
     *src = 65535;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT16];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
     UA_ByteString buf;
 
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "65535";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_UInt16_delete(src);
@@ -440,24 +373,20 @@ START_TEST(UA_UInt16_Max_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_UInt16_Min_Number_json_encode) {
-
     UA_UInt16 *src = UA_UInt16_new();
     *src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT16];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_UInt16_delete(src);
@@ -465,7 +394,6 @@ START_TEST(UA_UInt16_Min_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_UInt16_smallbuf_Number_json_encode) {
-
     UA_UInt16 *src = UA_UInt16_new();
     *src = 255;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT16];
@@ -473,14 +401,10 @@ START_TEST(UA_UInt16_smallbuf_Number_json_encode) {
 
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_UInt16_delete(src);
 }
@@ -488,24 +412,20 @@ END_TEST
 
 /* Int16 */
 START_TEST(UA_Int16_Max_Number_json_encode) {
-
     UA_Int16 *src = UA_Int16_new();
     *src = 32767;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT16];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "32767";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Int16_delete(src);
@@ -513,24 +433,20 @@ START_TEST(UA_Int16_Max_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_Int16_Min_Number_json_encode) {
-
     UA_Int16 *src = UA_Int16_new();
     *src = -32768;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT16];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "-32768";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Int16_delete(src);
@@ -538,24 +454,20 @@ START_TEST(UA_Int16_Min_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_Int16_Zero_Number_json_encode) {
-
     UA_Int16 *src = UA_Int16_new();
     *src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT16];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Int16_delete(src);
@@ -563,7 +475,6 @@ START_TEST(UA_Int16_Zero_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_Int16_smallbuf_Number_json_encode) {
-
     UA_Int16 *src = UA_Int16_new();
     *src = 127;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT16];
@@ -571,41 +482,31 @@ START_TEST(UA_Int16_smallbuf_Number_json_encode) {
 
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_Int16_delete(src);
 }
 END_TEST
 
-
-
 /* UInt32 */
 START_TEST(UA_UInt32_Max_Number_json_encode) {
-
     UA_UInt32 *src = UA_UInt32_new();
     *src = 4294967295;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT32];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "4294967295";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_UInt32_delete(src);
@@ -613,24 +514,20 @@ START_TEST(UA_UInt32_Max_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_UInt32_Min_Number_json_encode) {
-
     UA_UInt32 *src = UA_UInt32_new();
     *src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT32];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_UInt32_delete(src);
@@ -638,7 +535,6 @@ START_TEST(UA_UInt32_Min_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_UInt32_smallbuf_Number_json_encode) {
-
     UA_UInt32 *src = UA_UInt32_new();
     *src = 255;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT32];
@@ -646,41 +542,31 @@ START_TEST(UA_UInt32_smallbuf_Number_json_encode) {
 
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_UInt32_delete(src);
 }
 END_TEST
 
-
-
 /* Int32 */
 START_TEST(UA_Int32_Max_Number_json_encode) {
-
     UA_Int32 *src = UA_Int32_new();
     *src = 2147483647;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT32];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "2147483647";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Int32_delete(src);
@@ -690,44 +576,37 @@ END_TEST
 START_TEST(UA_Int32_Min_Number_json_encode) {
     UA_Int32 src = -2147483648;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT32];
-    size_t size = UA_calcSizeJsonInternal((void *)&src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *)&src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *)&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "-2147483648";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
 END_TEST
 
 START_TEST(UA_Int32_Zero_Number_json_encode) {
-
     UA_Int32 *src = UA_Int32_new();
     *src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT32];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Int32_delete(src);
@@ -735,33 +614,24 @@ START_TEST(UA_Int32_Zero_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_Int32_smallbuf_Number_json_encode) {
-
     UA_Int32 *src = UA_Int32_new();
     *src = 127;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT32];
 
     UA_ByteString buf;
-
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_Int32_delete(src);
 }
 END_TEST
 
-
-
 /* UINT64*/
 START_TEST(UA_UInt64_Max_Number_json_encode) {
-
     UA_UInt64 *src = UA_UInt64_new();
     //*src = 18446744073709551615;
     ((u8*)src)[0] = 0xFF;
@@ -773,20 +643,17 @@ START_TEST(UA_UInt64_Max_Number_json_encode) {
     ((u8*)src)[6] = 0xFF;
     ((u8*)src)[7] = 0xFF;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT64];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"18446744073709551615\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_UInt64_delete(src);
@@ -794,24 +661,20 @@ START_TEST(UA_UInt64_Max_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_UInt64_Min_Number_json_encode) {
-
     UA_UInt64 *src = UA_UInt64_new();
     *src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT64];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"0\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_UInt64_delete(src);
@@ -819,7 +682,6 @@ START_TEST(UA_UInt64_Min_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_UInt64_smallbuf_Number_json_encode) {
-
     UA_UInt64 *src = UA_UInt64_new();
     //*src = -9223372036854775808;
     ((u8*)src)[0] = 0x00;
@@ -836,14 +698,10 @@ START_TEST(UA_UInt64_smallbuf_Number_json_encode) {
 
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_UInt64_delete(src);
 }
@@ -851,7 +709,6 @@ END_TEST
 
 /* Int64 */
 START_TEST(UA_Int64_Max_Number_json_encode) {
-
     UA_Int64 *src = UA_Int64_new();
     //*src = 9223372036854775808;
     ((u8*)src)[0] = 0xFF;
@@ -864,20 +721,17 @@ START_TEST(UA_Int64_Max_Number_json_encode) {
     ((u8*)src)[7] = 0x7F;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"9223372036854775807\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Int64_delete(src);
@@ -885,7 +739,6 @@ START_TEST(UA_Int64_Max_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_Int64_Min_Number_json_encode) {
-
     UA_Int64 *src = UA_Int64_new();
 
     // TODO: compiler error: integer constant is so large that it is unsigned [-Werror]
@@ -900,22 +753,18 @@ START_TEST(UA_Int64_Min_Number_json_encode) {
     ((u8*)src)[6] = 0x00;
     ((u8*)src)[7] = 0x80;
 
-
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"-9223372036854775808\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Int64_delete(src);
@@ -923,24 +772,20 @@ START_TEST(UA_Int64_Min_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_Int64_Zero_Number_json_encode) {
-
     UA_Int64 *src = UA_Int64_new();
     *src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"0\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Int64_delete(src);
@@ -948,23 +793,17 @@ START_TEST(UA_Int64_Zero_Number_json_encode) {
 END_TEST
 
 START_TEST(UA_Int64_smallbuf_Number_json_encode) {
-
     UA_Int64 *src = UA_Int64_new();
     *src = 127;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
 
     UA_ByteString buf;
-
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_Int64_delete(src);
 }
@@ -974,21 +813,17 @@ END_TEST
 START_TEST(UA_Double_json_encode) {
     UA_Double src = 1.1234;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "1.1233999999999999541699935434735380113124847412109375";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -997,21 +832,17 @@ END_TEST
 START_TEST(UA_Double_pluszero_json_encode) {
     UA_Double src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -1020,21 +851,17 @@ END_TEST
 START_TEST(UA_Double_minuszero_json_encode) {
     UA_Double src = -0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -1043,46 +870,36 @@ END_TEST
 START_TEST(UA_Double_plusInf_json_encode) {
     UA_Double src = INFINITY;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"Infinity\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
 END_TEST
 
-
-
 START_TEST(UA_Double_minusInf_json_encode) {
     UA_Double src = -INFINITY;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"-Infinity\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -1091,21 +908,17 @@ END_TEST
 START_TEST(UA_Double_nan_json_encode) {
     UA_Double src = NAN;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"NaN\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -1114,21 +927,17 @@ END_TEST
 START_TEST(UA_Double_onesmallest_json_encode) {
     UA_Double src = 1.0000000000000002220446049250313080847263336181640625;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "1.0000000000000002220446049250313080847263336181640625";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -1137,85 +946,72 @@ END_TEST
 START_TEST(UA_Float_json_encode) {
     UA_Float src = 1.0000000000F;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_FLOAT];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "1";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
 END_TEST
 
-
-
 /* -------------------------LocalizedText------------------------- */
 START_TEST(UA_LocText_json_encode) {
-
     UA_LocalizedText *src = UA_LocalizedText_new();
     UA_LocalizedText_init(src);
     src->locale = UA_STRING_ALLOC("theLocale");
     src->text = UA_STRING_ALLOC("theText");
     const UA_DataType *type = &UA_TYPES[UA_TYPES_LOCALIZEDTEXT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Locale\":\"theLocale\",\"Text\":\"theText\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_LocalizedText_delete(src);
 }
 END_TEST
 
-
 START_TEST(UA_LocText_NonReversible_json_encode) {
-
     UA_LocalizedText *src = UA_LocalizedText_new();
     UA_LocalizedText_init(src);
     src->locale = UA_STRING_ALLOC("theLocale");
     src->text = UA_STRING_ALLOC("theText");
     const UA_DataType *type = &UA_TYPES[UA_TYPES_LOCALIZEDTEXT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
 
-    UA_ByteString_allocBuffer(&buf, size+1);
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
+
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"theText\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_LocalizedText_delete(src);
 }
 END_TEST
 
-
 START_TEST(UA_LocText_smallBuffer_json_encode) {
     UA_LocalizedText *src = UA_LocalizedText_new();
     UA_LocalizedText_init(src);
@@ -1226,13 +1022,10 @@ START_TEST(UA_LocText_smallBuffer_json_encode) {
     UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, 4);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[4];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_LocalizedText_delete(src);
 }
@@ -1242,19 +1035,17 @@ END_TEST
 START_TEST(UA_Guid_json_encode) {
     UA_Guid src = {3, 9, 10, {8, 7, 6, 5, 4, 3, 2, 1}};
     const UA_DataType *type = &UA_TYPES[UA_TYPES_GUID];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"00000003-0009-000A-0807-060504030201\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -1264,43 +1055,35 @@ START_TEST(UA_Guid_smallbuf_json_encode) {
     UA_Guid *src = UA_Guid_new();
     *src = UA_Guid_random();
     const UA_DataType *type = &UA_TYPES[UA_TYPES_GUID];
-    UA_ByteString buf;
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, 1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[1];
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_Guid_delete(src);
 }
 END_TEST
 
-
-
 /* -------------------------DateTime--------------------------------------*/
 START_TEST(UA_DateTime_json_encode) {
     UA_DateTime *src = UA_DateTime_new();
     *src = UA_DateTime_fromUnixTime(1234567);
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DATETIME];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"1970-01-15T06:56:07Z\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_DateTime_delete(src);
@@ -1310,20 +1093,17 @@ END_TEST
 START_TEST(UA_DateTime_json_encode_null) {
     UA_DateTime src = 0;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DATETIME];
-    size_t size = UA_calcSizeJsonInternal((void *)&src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *)&src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-    status s = UA_encodeJsonInternal((void *)&src, type, &bufPos, &bufEnd,
-                                     NULL, 0, NULL, 0, true);
-    *bufPos = 0;
+    status s = UA_encodeJson((void *)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"1601-01-01T00:00:00Z\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -1333,20 +1113,17 @@ START_TEST(UA_DateTime_with_nanoseconds_json_encode) {
     UA_DateTime *src = UA_DateTime_new();
     *src = UA_DateTime_fromUnixTime(1234567) + 8901234;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DATETIME];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"1970-01-15T06:56:07.8901234Z\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_DateTime_delete(src);
@@ -1358,21 +1135,17 @@ START_TEST(UA_StatusCode_json_encode) {
     UA_StatusCode *src = UA_StatusCode_new();
     *src = UA_STATUSCODE_BADAGGREGATECONFIGURATIONREJECTED;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STATUSCODE];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-     *bufPos = 0;
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "2161770496";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_StatusCode_delete(src);
@@ -1383,21 +1156,20 @@ START_TEST(UA_StatusCode_nonReversible_json_encode) {
     UA_StatusCode *src = UA_StatusCode_new();
     *src = UA_STATUSCODE_BADAGGREGATECONFIGURATIONREJECTED;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STATUSCODE];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
 
-    UA_ByteString_allocBuffer(&buf, size+1);
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-     *bufPos = 0;
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Code\":2161770496,\"Symbol\":\"BadAggregateConfigurationRejected\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_StatusCode_delete(src);
@@ -1408,21 +1180,20 @@ START_TEST(UA_StatusCode_nonReversible_good_json_encode) {
     UA_StatusCode *src = UA_StatusCode_new();
     *src = UA_STATUSCODE_GOOD;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STATUSCODE];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
 
-    UA_ByteString_allocBuffer(&buf, size+1);
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-     *bufPos = 0;
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Code\":0,\"Symbol\":\"Good\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_StatusCode_delete(src);
@@ -1434,16 +1205,14 @@ START_TEST(UA_StatusCode_smallbuf_json_encode) {
     UA_StatusCode *src = UA_StatusCode_new();
     *src = UA_STATUSCODE_BADAGGREGATECONFIGURATIONREJECTED;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_STATUSCODE];
-    UA_ByteString buf;
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, 1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[1];
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_StatusCode_delete(src);
 }
@@ -1457,20 +1226,17 @@ START_TEST(UA_NodeId_Numeric_json_encode) {
     UA_NodeId *src = UA_NodeId_new();
     *src = UA_NODEID_NUMERIC(0, 5555);
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Id\":5555}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1481,20 +1247,17 @@ START_TEST(UA_NodeId_Numeric_Namespace_json_encode) {
     UA_NodeId *src = UA_NodeId_new();
     *src = UA_NODEID_NUMERIC(4, 5555);
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Id\":5555,\"Namespace\":4}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1506,20 +1269,17 @@ START_TEST(UA_NodeId_String_json_encode) {
     UA_NodeId *src = UA_NodeId_new();
     *src = UA_NODEID_STRING_ALLOC(0, "foobar");
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"foobar\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1530,20 +1290,17 @@ START_TEST(UA_NodeId_String_Namespace_json_encode) {
     UA_NodeId *src = UA_NodeId_new();
     *src = UA_NODEID_STRING_ALLOC(5, "foobar");
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"foobar\",\"Namespace\":5}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1557,20 +1314,17 @@ START_TEST(UA_NodeId_Guid_json_encode) {
     UA_Guid g = {3, 9, 10, {8, 7, 6, 5, 4, 3, 2, 1}};
     *src = UA_NODEID_GUID(0, g);
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":2,\"Id\":\"00000003-0009-000A-0807-060504030201\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1582,23 +1336,19 @@ START_TEST(UA_NodeId_Guid_Namespace_json_encode) {
     UA_Guid g = {3, 9, 10, {8, 7, 6, 5, 4, 3, 2, 1}};
     *src = UA_NODEID_GUID(5, g);
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
-
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
     // {"IdType":2,"Id":"00000003-0009-000A-0807-060504030201","Namespace":5}
     ck_assert_uint_eq(size, 70);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":2,\"Id\":\"00000003-0009-000A-0807-060504030201\",\"Namespace\":5}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1610,23 +1360,19 @@ START_TEST(UA_NodeId_ByteString_json_encode) {
     UA_NodeId *src = UA_NodeId_new();
     *src = UA_NODEID_BYTESTRING_ALLOC(0, "asdfasdf");
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
-
-    UA_ByteString_allocBuffer(&buf, size+1);
-
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
     //{"IdType":3,"Id":"YXNkZmFzZGY="}
     ck_assert_uint_eq(size, 32);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
+
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":3,\"Id\":\"YXNkZmFzZGY=\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1637,20 +1383,17 @@ START_TEST(UA_NodeId_ByteString_Namespace_json_encode) {
     UA_NodeId *src = UA_NodeId_new();
     *src = UA_NODEID_BYTESTRING_ALLOC(5, "asdfasdf");
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":3,\"Id\":\"YXNkZmFzZGY=\",\"Namespace\":5}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1663,23 +1406,23 @@ START_TEST(UA_NodeId_NonReversible_Numeric_Namespace_json_encode) {
     *src = UA_NODEID_NUMERIC(2, 5555);
     const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
 
-    UA_String namespaces[3] = {UA_STRING("ns0"),UA_STRING("ns1"),UA_STRING("ns2")};
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, namespaces, 3, NULL, 0, false);
+    UA_String namespaces[3] = {UA_STRING("ns0"), UA_STRING("ns1"), UA_STRING("ns2")};
+    UA_EncodeJsonOptions options = {0};
+    options.namespaces = namespaces;
+    options.namespacesSize = 3;
+
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
     ck_assert_uint_ne(size, 0);
-    UA_ByteString buf;
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, namespaces, 3, NULL, 0, false);
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Id\":5555,\"Namespace\":\"ns2\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_NodeId_delete(src);
@@ -1708,28 +1451,23 @@ START_TEST(UA_DiagInfo_json_encode) {
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DIAGNOSTICINFO];
 
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"SymbolicId\":13,\"NamespaceUri\":15,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
 }
 END_TEST
 
-
-
 START_TEST(UA_DiagInfo_withInner_json_encode) {
     UA_DiagnosticInfo *innerDiag = UA_DiagnosticInfo_new();
     UA_DiagnosticInfo_init(innerDiag);
@@ -1762,23 +1500,20 @@ START_TEST(UA_DiagInfo_withInner_json_encode) {
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DIAGNOSTICINFO];
 
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
     UA_ByteString buf;
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
     //{"SymbolicId":13,"LocalizedText":14,"Locale":12,"AdditionalInfo":"additionalInfo","InnerStatusCode":2155216896,"InnerDiagnosticInfo":{"AdditionalInfo":"INNER ADDITION INFO"}}
     ck_assert_uint_eq(size, 174);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896,\"InnerDiagnosticInfo\":{\"AdditionalInfo\":\"INNER ADDITION INFO\"}}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
@@ -1786,7 +1521,6 @@ START_TEST(UA_DiagInfo_withInner_json_encode) {
 END_TEST
 
 START_TEST(UA_DiagInfo_withTwoInner_json_encode) {
-
     UA_DiagnosticInfo *innerDiag2 = UA_DiagnosticInfo_new();
     UA_DiagnosticInfo_init(innerDiag2);
     innerDiag2->hasAdditionalInfo = true;
@@ -1831,20 +1565,17 @@ START_TEST(UA_DiagInfo_withTwoInner_json_encode) {
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DIAGNOSTICINFO];
 
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896,\"InnerDiagnosticInfo\":{\"AdditionalInfo\":\"INNER ADDITION INFO\",\"InnerDiagnosticInfo\":{\"AdditionalInfo\":\"INNER ADDITION INFO2\"}}}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
@@ -1855,20 +1586,17 @@ START_TEST(UA_DiagInfo_noFields_json_encode) {
     UA_DiagnosticInfo *src = UA_DiagnosticInfo_new();
     UA_DiagnosticInfo_init(src);
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DIAGNOSTICINFO];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
@@ -1895,18 +1623,13 @@ START_TEST(UA_DiagInfo_smallBuffer_json_encode) {
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DIAGNOSTICINFO];
 
-
     UA_ByteString buf;
-
     UA_ByteString_allocBuffer(&buf, 2);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[2];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     UA_ByteString_clear(&buf);
     UA_DiagnosticInfo_delete(src);
 }
@@ -1918,20 +1641,17 @@ START_TEST(UA_ByteString_json_encode) {
     UA_ByteString_init(src);
     *src = UA_BYTESTRING_ALLOC("asdfasdf");
     const UA_DataType *type = &UA_TYPES[UA_TYPES_BYTESTRING];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"YXNkZmFzZGY=\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ByteString_delete(src);
@@ -1943,22 +1663,17 @@ START_TEST(UA_ByteString2_json_encode) {
     UA_ByteString_init(src);
     *src = UA_BYTESTRING_ALLOC("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
     const UA_DataType *type = &UA_TYPES[UA_TYPES_BYTESTRING];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    //s = UA_decodeJsonInternal()
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "\"TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4=\"";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ByteString_delete(src);
@@ -1973,22 +1688,16 @@ START_TEST(UA_ByteString3_json_encode) {
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_BYTESTRING]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status retval = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
-    //printf("%s\n\n", (char*)buf.data);
+    status retval = UA_encodeJson((void *) src, type, &buf, NULL);
 
     UA_Variant out;
     UA_Variant_init(&out);
-    retval |= UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    retval |= UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_ByteString *srcData = ((UA_ByteString*)src->data);
@@ -2008,20 +1717,17 @@ START_TEST(UA_QualName_json_encode) {
     src->name = UA_STRING_ALLOC("derName");
     src->namespaceIndex = 1;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_QUALIFIEDNAME];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Name\":\"derName\",\"Uri\":1}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_QualifiedName_delete(src);
@@ -2036,20 +1742,17 @@ START_TEST(UA_QualName_NonReversible_json_encode) {
     src->name = UA_STRING_ALLOC("derName");
     src->namespaceIndex = 1;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_QUALIFIEDNAME];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Name\":\"derName\",\"Uri\":1}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_QualifiedName_delete(src);
@@ -2063,21 +1766,21 @@ START_TEST(UA_QualName_NonReversible_Namespace_json_encode) {
     src->namespaceIndex = 2;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_QUALIFIEDNAME];
     UA_String namespaces[3] = {UA_STRING("ns0"),UA_STRING("ns1"),UA_STRING("ns2")};
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, namespaces, 3, NULL, 0, false);
-    UA_ByteString buf;
+    UA_EncodeJsonOptions options = {0};
+    options.namespaces = namespaces;
+    options.namespacesSize = 3;
 
-    UA_ByteString_allocBuffer(&buf, size+1);
-
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, namespaces, 3, NULL, 0, false);
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Name\":\"derName\",\"Uri\":\"ns2\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_QualifiedName_delete(src);
@@ -2090,20 +1793,17 @@ START_TEST(UA_QualName_NonReversible_NoNamespaceAsNumber_json_encode) {
     src->name = UA_STRING_ALLOC("derName");
     src->namespaceIndex = 6789;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_QUALIFIEDNAME];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Name\":\"derName\",\"Uri\":6789}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_QualifiedName_delete(src);
@@ -2122,20 +1822,17 @@ START_TEST(UA_Variant_Bool_json_encode) {
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":1,\"Body\":true}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2150,20 +1847,17 @@ START_TEST(UA_Variant_Number_json_encode) {
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_UINT64]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":9,\"Body\":\"345634563456\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2184,22 +1878,16 @@ START_TEST(UA_Variant_Double_json_encode) {
         UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_DOUBLE]);
 
         const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-        size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-        UA_ByteString buf;
+        size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+        UA_ByteString buf;
         UA_ByteString_allocBuffer(&buf, size+1);
 
-        UA_Byte *bufPos = &buf.data[0];
-        const UA_Byte *bufEnd = &buf.data[size+1];
-
-        status retval = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-        *bufPos = 0;
-        //printf("%s\n\n", (char*)buf.data);
+        status retval = UA_encodeJson((void *) src, type, &buf, NULL);
 
         UA_Variant out;
         UA_Variant_init(&out);
-        retval |= UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+        retval |= UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
         ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
         UA_Double srcData = *((UA_Double*)src->data);
@@ -2221,24 +1909,18 @@ START_TEST(UA_Variant_Double2_json_encode) {
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_DOUBLE]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status retval = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status retval = UA_encodeJson((void *) src, type, &buf, NULL);
 
-    *bufPos = 0;
-
-    //printf("%s\n\n", (char*)buf.data);
     /*{"Type":11,"Body":4.4501477170144022721148195934182639518696390927032912960468522194496444440421538910330590478162701758282983178260792422137401728773891892910553144148156412434867599762821265346585071045737627442980259622449029037796981144446145705102663115100318287949527959668236039986479250965780342141637013812613333119898765515451440315261253813266652951306000184917766328660755595837392240989947807556594098101021612198814605258742579179000071675999344145086087205681577915435923018910334964869420614052182892431445797605163650903606514140377217442262561590244668525767372446430075513332450079650686719491377688478005309963967709758965844137894433796621993967316936280457084866613206797017728916080020698679408551343728867675409720757232455434770912461317493580281734466552734375e-308}*/
 
     UA_Variant out;
     UA_Variant_init(&out);
-    retval |= UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    retval |= UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_Double srcData = *((UA_Double*)src->data);
@@ -2251,7 +1933,6 @@ START_TEST(UA_Variant_Double2_json_encode) {
 }
 END_TEST
 
-
 START_TEST(UA_Variant_Double3_json_encode) {
     UA_Variant *src = UA_Variant_new();
     UA_Variant_init(src);
@@ -2260,21 +1941,16 @@ START_TEST(UA_Variant_Double3_json_encode) {
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_DOUBLE]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status retval = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status retval = UA_encodeJson((void *) src, type, &buf, NULL);
 
     UA_Variant out;
     UA_Variant_init(&out);
-    retval |= UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    retval |= UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_Double srcData = *((UA_Double*)src->data);
@@ -2295,22 +1971,16 @@ START_TEST(UA_Variant_DoubleInf_json_encode) {
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_DOUBLE]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status retval = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
-    //printf("%s\n\n", (char*)buf.data);
+    status retval = UA_encodeJson((void *) src, type, &buf, NULL);
 
     UA_Variant out;
     UA_Variant_init(&out);
-    retval |= UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    retval |= UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_Double srcData = *((UA_Double*)src->data);
@@ -2331,22 +2001,16 @@ START_TEST(UA_Variant_DoubleNan_json_encode) {
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_DOUBLE]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status retval = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
-    //printf("%s\n\n", (char*)buf.data);
+    status retval = UA_encodeJson((void *) src, type, &buf, NULL);
 
     UA_Variant out;
     UA_Variant_init(&out);
-    retval |= UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    retval |= UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_Double srcData = *((UA_Double*)src->data);
@@ -2367,21 +2031,16 @@ START_TEST(UA_Variant_Float_json_encode) {
     UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_FLOAT]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status retval = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status retval = UA_encodeJson((void *) src, type, &buf, NULL);
 
     UA_Variant out;
     UA_Variant_init(&out);
-    retval |= UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    retval |= UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_Float srcData = *((UA_Float*)src->data);
@@ -2402,20 +2061,17 @@ START_TEST(UA_Variant_NodeId_json_encode) {
     UA_Variant_setScalarCopy(src, &variantContent, &UA_TYPES[UA_TYPES_NODEID]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":17,\"Body\":{\"IdType\":1,\"Id\":\"theID\",\"Namespace\":1}}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2431,20 +2087,17 @@ START_TEST(UA_Variant_LocText_json_encode) {
     UA_Variant_setScalarCopy(src, &variantContent, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":21,\"Body\":{\"Locale\":\"localeString\",\"Text\":\"textString\"}}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2462,28 +2115,23 @@ START_TEST(UA_Variant_QualName_json_encode) {
     UA_Variant_setScalarCopy(src, &variantContent, &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":20,\"Body\":{\"Name\":\"derName\",\"Uri\":1}}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
 }
 END_TEST
 
-
 /* ---Reversible Variant Array---- */
 START_TEST(UA_Variant_Array_UInt16_json_encode) {
     UA_Variant *src = UA_Variant_new();
@@ -2491,24 +2139,19 @@ START_TEST(UA_Variant_Array_UInt16_json_encode) {
     UA_UInt16 zero[2] = {42,43};
     UA_Variant_setArrayCopy(src, zero, 2, &UA_TYPES[UA_TYPES_UINT16]);
 
-
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
+    ck_assert_uint_eq(size, 25);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    ck_assert_uint_eq(size, 25);
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":5,\"Body\":[42,43]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2521,21 +2164,17 @@ START_TEST(UA_Variant_Array_UInt16_Null_json_encode) {
     UA_Variant_setArray(src, NULL, 0, &UA_TYPES[UA_TYPES_UINT16]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":5,\"Body\":[]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
 
     UA_ByteString_clear(&buf);
@@ -2549,22 +2188,18 @@ START_TEST(UA_Variant_Array_Byte_json_encode) {
     UA_Byte zero[2] = {42,43};
     UA_Variant_setArrayCopy(src, zero, 2, &UA_TYPES[UA_TYPES_BYTE]);
 
-
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":3,\"Body\":[42,43]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2577,23 +2212,18 @@ START_TEST(UA_Variant_Array_String_json_encode) {
     UA_String zero[2] = {UA_STRING("eins"),UA_STRING("zwei")};
     UA_Variant_setArrayCopy(src, zero, 2, &UA_TYPES[UA_TYPES_STRING]);
 
-
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-
-    *bufPos = 0;
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":12,\"Body\":[\"eins\",\"zwei\"]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2601,8 +2231,7 @@ START_TEST(UA_Variant_Array_String_json_encode) {
 END_TEST
 
 START_TEST(UA_Variant_Matrix_UInt16_json_encode) {
-
-     // Set an array value
+    // Set an array value
     UA_Variant src;
     UA_Variant_init(&src);
     UA_UInt16 d[9] = {1, 2, 3,
@@ -2617,31 +2246,27 @@ START_TEST(UA_Variant_Matrix_UInt16_json_encode) {
     src.arrayDimensions[1] = 3;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
     //{"Type":5,"Body":[1,2,3,4,5,6,7,8,9],"Dimension":[3,3]}
-    size_t sizeOfBytes = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
+    size_t sizeOfBytes = UA_calcSizeJson((void *) &src, type, NULL);
     ck_assert_uint_eq(sizeOfBytes, 55);
 
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":5,\"Body\":[1,2,3,4,5,6,7,8,9],\"Dimension\":[3,3]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_clear(&src);
 }
 END_TEST
 
-
 /* NON-Reversible builtin simple */
 START_TEST(UA_Variant_StatusCode_NonReversible_json_encode) {
     UA_Variant *src = UA_Variant_new();
@@ -2650,20 +2275,18 @@ START_TEST(UA_Variant_StatusCode_NonReversible_json_encode) {
     UA_Variant_setScalarCopy(src, &variantContent, &UA_TYPES[UA_TYPES_STATUSCODE]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Body\":{\"Code\":2161770496,\"Symbol\":\"BadAggregateConfigurationRejected\"}}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2685,20 +2308,19 @@ START_TEST(UA_Variant_Array_String_NonReversible_json_encode) {
     src.arrayDimensions[0] = 8;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
 
-    UA_ByteString_allocBuffer(&buf, size+1);
+    size_t size = UA_calcSizeJson((void *) &src, type, &options);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    status s = UA_encodeJson((void *) &src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Body\":[\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\"]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_clear(&src);
@@ -2722,24 +2344,21 @@ START_TEST(UA_Variant_Matrix_String_NonReversible_json_encode) {
     src.arrayDimensions[3] = 1;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
-
-    UA_ByteString_allocBuffer(&buf, size+1);
-
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
 
+    size_t size = UA_calcSizeJson((void *) &src, type, &options);
     //{"Body":[[[["1"],["2"]],[["3"],["4"]]],[[["5"],["6"]],[["7"],["8"]]]]}
-    size_t sizeOfBytes = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
-    ck_assert_uint_eq(sizeOfBytes, 70);
+    ck_assert_uint_eq(size, 70);
 
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-    *bufPos = 0;
-    // then
+    status s = UA_encodeJson((void *) &src, type, &buf, &options);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    // then
     char* result = "{\"Body\":[[[[\"1\"],[\"2\"]],[[\"3\"],[\"4\"]]],[[[\"5\"],[\"6\"]],[[\"7\"],[\"8\"]]]]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_clear(&src);
@@ -2760,20 +2379,19 @@ START_TEST(UA_Variant_Matrix_NodeId_NonReversible_json_encode) {
     src.arrayDimensions[3] = 1;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
 
-    UA_ByteString_allocBuffer(&buf, size+1);
+    size_t size = UA_calcSizeJson((void *) &src, type, &options);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    status s = UA_encodeJson((void *) &src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Body\":[[[[{\"Id\":1,\"Namespace\":1}],[{\"Id\":2,\"Namespace\":1}]],[[{\"Id\":3,\"Namespace\":1}],[{\"Id\":4,\"Namespace\":1}]]],[[[{\"Id\":5,\"Namespace\":1}],[{\"Id\":6,\"Namespace\":1}]],[[{\"Id\":7,\"Namespace\":1}],[{\"Id\":8,\"Namespace\":1}]]]]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_clear(&src);
@@ -2794,20 +2412,17 @@ START_TEST(UA_Variant_Wrap_json_encode) {
     UA_Variant_setScalarCopy(src, &variantContent, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":22,\"Body\":{\"TypeId\":{\"Id\":511},\"Body\":{\"ViewId\":{\"Id\":99999},\"Timestamp\":\"1970-01-15T06:56:07Z\",\"ViewVersion\":1236}}}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_delete(src);
@@ -2839,20 +2454,17 @@ START_TEST(UA_Variant_Wrap_Array_json_encode) {
 
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Type\":22,\"Body\":[{\"TypeId\":{\"Id\":511},\"Body\":{\"ViewId\":{\"Id\":1},\"Timestamp\":\"1970-01-15T06:56:07Z\",\"ViewVersion\":1}},{\"TypeId\":{\"Id\":511},\"Body\":{\"ViewId\":{\"Id\":2},\"Timestamp\":\"1970-01-15T06:56:07Z\",\"ViewVersion\":2}}]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_clear(&src);
@@ -2878,26 +2490,23 @@ START_TEST(UA_Variant_Wrap_Array_NonReversible_json_encode) {
     variantContent2.viewVersion = 2;
     variantContent2.viewId = UA_NODEID_NUMERIC(1,2);
 
-
     UA_ViewDescription d[2] = {variantContent1, variantContent2};
     UA_Variant_setArrayCopy(&src, d, 2, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 
-
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
 
-    UA_ByteString_allocBuffer(&buf, size+1);
+    size_t size = UA_calcSizeJson((void *) &src, type, &options);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-    status s = UA_encodeJsonInternal(&src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    status s = UA_encodeJson(&src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Body\":[{\"Body\":{\"ViewId\":{\"Id\":1,\"Namespace\":1},\"Timestamp\":\"1970-01-15T06:56:07Z\",\"ViewVersion\":1}},{\"Body\":{\"ViewId\":{\"Id\":2,\"Namespace\":1},\"Timestamp\":\"1970-01-15T06:56:07Z\",\"ViewVersion\":2}}]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_Variant_clear(&src);
@@ -2915,20 +2524,17 @@ START_TEST(UA_ExtensionObject_json_encode) {
     src->content.decoded.data = &b;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"TypeId\":{\"Id\":1},\"Body\":false}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExtensionObject_delete(src);
@@ -2945,20 +2551,17 @@ START_TEST(UA_ExtensionObject_xml_json_encode) {
     src->content.encoded.body = b;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"TypeId\":{\"Id\":1234,\"Namespace\":2},\"Encoding\":2,\"Body\":\"<Elemement></Element>\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExtensionObject_delete(src);
@@ -2976,27 +2579,23 @@ START_TEST(UA_ExtensionObject_byteString_json_encode) {
     src->content.encoded.body = b;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"TypeId\":{\"Id\":1234,\"Namespace\":2},\"Encoding\":1,\"Body\":\"123456789012345678901234567890\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExtensionObject_delete(src);
 }
 END_TEST
 
-
 START_TEST(UA_ExtensionObject_NonReversible_StatusCode_json_encode) {
     UA_ExtensionObject *src = UA_ExtensionObject_new();
     UA_ExtensionObject_init(src);
@@ -3007,28 +2606,25 @@ START_TEST(UA_ExtensionObject_NonReversible_StatusCode_json_encode) {
     src->content.decoded.data = &b;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, false);
-    UA_ByteString buf;
+    UA_EncodeJsonOptions options = {0}; /* non reversible */
 
-    UA_ByteString_allocBuffer(&buf, size+1);
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, false);
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Body\":{\"Code\":2147876864,\"Symbol\":\"BadEncodingError\"}}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExtensionObject_delete(src);
 }
 END_TEST
 
-
-
 /* --------------ExpandedNodeId-------------------------- */
 START_TEST(UA_ExpandedNodeId_json_encode) {
     UA_ExpandedNodeId *src = UA_ExpandedNodeId_new();
@@ -3037,20 +2633,17 @@ START_TEST(UA_ExpandedNodeId_json_encode) {
     src->namespaceUri = UA_STRING_ALLOC("asdf");
     src->serverIndex = 1345;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"testtestTest\",\"Namespace\":\"asdf\",\"ServerUri\":1345}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExpandedNodeId_delete(src);
@@ -3065,20 +2658,17 @@ START_TEST(UA_ExpandedNodeId_MissingNamespaceUri_json_encode) {
     src->namespaceUri = UA_STRING_NULL;
     src->serverIndex = 1345;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"testtestTest\",\"Namespace\":23,\"ServerUri\":1345}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExpandedNodeId_delete(src);
@@ -3094,21 +2684,20 @@ START_TEST(UA_ExpandedNodeId_NonReversible_Ns1_json_encode) {
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
 
     UA_String serverUris[3] = {UA_STRING("uri0"),UA_STRING("uri1"),UA_STRING("uri2")};
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, serverUris, 3, false);
-    UA_ByteString buf;
+    UA_EncodeJsonOptions options = {0};
+    options.serverUris = serverUris;
+    options.serverUrisSize = 3;
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, serverUris, 3, false);
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"testtestTest\",\"Namespace\":1,\"ServerUri\":\"uri1\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExpandedNodeId_delete(src);
@@ -3126,21 +2715,23 @@ START_TEST(UA_ExpandedNodeId_NonReversible_Namespace_json_encode) {
     UA_String namespaces[3] = {UA_STRING("ns0"),UA_STRING("ns1"),UA_STRING("ns2")};
     UA_String serverUris[3] = {UA_STRING("uri0"),UA_STRING("uri1"),UA_STRING("uri2")};
 
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, namespaces, 3, serverUris, 3, false);
-    UA_ByteString buf;
-
-    UA_ByteString_allocBuffer(&buf, size+1);
+    UA_EncodeJsonOptions options = {0};
+    options.namespaces = namespaces;
+    options.namespacesSize = 3;
+    options.serverUris = serverUris;
+    options.serverUrisSize = 3;
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size+1);
 
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, namespaces, 3, serverUris, 3, false);
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"testtestTest\",\"Namespace\":\"ns2\",\"ServerUri\":\"uri1\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExpandedNodeId_delete(src);
@@ -3157,22 +2748,24 @@ START_TEST(UA_ExpandedNodeId_NonReversible_NamespaceUriGiven_json_encode) {
     UA_String namespaces[3] = {UA_STRING("ns0"),UA_STRING("ns1"),UA_STRING("ns2")};
     UA_String serverUris[3] = {UA_STRING("uri0"),UA_STRING("uri1"),UA_STRING("uri2")};
 
+    UA_EncodeJsonOptions options = {0};
+    options.namespaces = namespaces;
+    options.namespacesSize = 3;
+    options.serverUris = serverUris;
+    options.serverUrisSize = 3;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, namespaces, 3, serverUris, 3, false);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, &options);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, namespaces, 3, serverUris, 3, false);
+    status s = UA_encodeJson((void *) src, type, &buf, &options);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"IdType\":1,\"Id\":\"testtestTest\",\"Namespace\":\"NamespaceUri\",\"ServerUri\":\"uri1\"}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ExpandedNodeId_delete(src);
@@ -3206,20 +2799,17 @@ START_TEST(UA_DataValue_json_encode) {
 
     src->status = UA_STATUSCODE_BADAPPLICATIONSIGNATUREINVALID;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DATAVALUE];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"Value\":{\"Type\":1,\"Body\":true},\"Status\":2153250816,\"SourceTimestamp\":\"1970-01-15T06:56:07.8901234Z\",\"SourcePicoseconds\":5678,\"ServerTimestamp\":\"1970-01-28T03:34:38.9012345Z\",\"ServerPicoseconds\":6789}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_DataValue_delete(src);
@@ -3231,20 +2821,17 @@ START_TEST(UA_DataValue_null_json_encode) {
     UA_DataValue_init(src);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DATAVALUE];
-    size_t size = UA_calcSizeJsonInternal((void *) src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_DataValue_delete(src);
@@ -3333,20 +2920,17 @@ START_TEST(UA_MessageReadResponse_json_encode) {
     src.responseHeader = rh;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_READRESPONSE];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"ResponseHeader\":{\"Timestamp\":\"1970-01-15T06:56:07Z\",\"RequestHandle\":123123,\"ServiceResult\":0,\"ServiceDiagnostics\":{\"AdditionalInfo\":\"serverDiag\"},\"StringTable\":[],\"AdditionalHeader\":{\"TypeId\":{\"Id\":1},\"Body\":false}},\"Results\":[{\"Value\":{\"Type\":1,\"Body\":true},\"Status\":2153250816,\"SourceTimestamp\":\"1970-01-15T06:56:07Z\",\"ServerTimestamp\":\"1970-01-15T06:56:07Z\"}],\"DiagnosticInfos\":[{\"AdditionalInfo\":\"INNER ADDITION INFO\"}]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ReadResponse_clear(&src); //TODO
@@ -3362,20 +2946,17 @@ START_TEST(UA_ViewDescription_json_encode) {
     src.viewId = UA_NODEID_NUMERIC(0,99999);
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VIEWDESCRIPTION];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"ViewId\":{\"Id\":99999},\"Timestamp\":\"1970-01-15T06:56:07Z\",\"ViewVersion\":1236}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_ViewDescription_clear(&src);
@@ -3473,20 +3054,17 @@ START_TEST(UA_WriteRequest_json_encode) {
     src.requestHeader = rh;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_WRITEREQUEST];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"RequestHeader\":{\"AuthenticationToken\":{\"IdType\":1,\"Id\":\"authToken\"},\"Timestamp\":\"1970-01-15T06:56:07Z\",\"RequestHandle\":123123,\"ReturnDiagnostics\":1,\"AuditEntryId\":\"Auditentryid\",\"TimeoutHint\":120,\"AdditionalHeader\":{\"TypeId\":{\"Id\":1},\"Body\":false}},\"NodesToWrite\":[{\"NodeId\":{\"IdType\":1,\"Id\":\"a1111\"},\"AttributeId\":12,\"IndexRange\":\"BLOAB\",\"Value\":{\"Value\":{\"Type\":1,\"Body\":true},\"Status\":2153250816,\"SourceTimestamp\":\"1970-01-15T06:56:07Z\",\"ServerTimestamp\":\"1970-01-15T06:56:07Z\"}},{\"NodeId\":{\"IdType\":1,\"Id\":\"a2222\"},\"AttributeId\":12,\"IndexRange\":\"BLOAB\",\"Value\":{\"Value\":{\"Type\":1,\"Body\":true},\"Status\":2153250816,\"SourceTimestamp\":\"1970-01-15T06:56:07Z\",\"ServerTimestamp\":\"1970-01-15T06:56:07Z\"}}]}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
     UA_WriteRequest_clear(&src);
@@ -3516,19 +3094,15 @@ START_TEST(UA_VariableAttributes_json_encode) {
     src.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
 
     const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES];
-    size_t size = UA_calcSizeJsonInternal((void *) &src, type, NULL, 0, NULL, 0, true);
-    UA_ByteString buf;
+    size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
+    UA_ByteString buf;
     UA_ByteString_allocBuffer(&buf, size+1);
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[size+1];
-
-    status s = UA_encodeJsonInternal((void *) &src, type, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *) &src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    *bufPos = 0;
     // then
-    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
     char* result = "{\"SpecifiedAttributes\":0,"
                    "\"DisplayName\":{\"Locale\":\"en-US\",\"Text\":\"the answer\"},"
                    "\"Description\":{\"Locale\":\"en-US\",\"Text\":\"the answer\"},"
@@ -3537,6 +3111,7 @@ START_TEST(UA_VariableAttributes_json_encode) {
                    "\"DataType\":{\"Id\":6},\"ValueRank\":-2,"
                    "\"ArrayDimensions\":[],"
                    "\"IsAbstract\":true}";
+    buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
 }
@@ -3550,7 +3125,7 @@ START_TEST(UA_Byte_Min_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":3,\"Body\":0}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BYTE);
@@ -3566,7 +3141,7 @@ START_TEST(UA_Byte_Max_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":3,\"Body\":255}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BYTE);
@@ -3584,7 +3159,7 @@ START_TEST(UA_UInt16_Min_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":5,\"Body\":0}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT16);
@@ -3600,7 +3175,7 @@ START_TEST(UA_UInt16_Max_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":5,\"Body\":65535}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT16);
@@ -3617,7 +3192,7 @@ START_TEST(UA_UInt32_Min_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":7,\"Body\":0}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT32);
@@ -3633,7 +3208,7 @@ START_TEST(UA_UInt32_Max_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":7,\"Body\":4294967295}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT32);
@@ -3650,7 +3225,7 @@ START_TEST(UA_UInt64_Min_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":9,\"Body\":\"0\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT64);
@@ -3673,7 +3248,7 @@ START_TEST(UA_UInt64_Max_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":9,\"Body\":\"18446744073709551615\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_UINT64);
@@ -3696,7 +3271,7 @@ START_TEST(UA_UInt64_Overflow_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":9,\"Body\":\"18446744073709551616\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -3710,7 +3285,7 @@ START_TEST(UA_SByte_Min_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":2,\"Body\":-128}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_SBYTE);
@@ -3726,7 +3301,7 @@ START_TEST(UA_SByte_Max_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":2,\"Body\":127}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_SBYTE);
@@ -3743,7 +3318,7 @@ START_TEST(UA_Int16_Min_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":4,\"Body\":-32768}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT16);
@@ -3759,7 +3334,7 @@ START_TEST(UA_Int16_Max_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":4,\"Body\":32767}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT16);
@@ -3776,7 +3351,7 @@ START_TEST(UA_Int32_Min_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":6,\"Body\":-2147483648}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT32);
@@ -3792,7 +3367,7 @@ START_TEST(UA_Int32_Max_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":6,\"Body\":2147483647}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT32);
@@ -3809,7 +3384,7 @@ START_TEST(UA_Int64_Min_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":8,\"Body\":\"-9223372036854775808\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT64);
@@ -3833,7 +3408,7 @@ START_TEST(UA_Int64_Max_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":8,\"Body\":\"9223372036854775807\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_INT64);
@@ -3857,7 +3432,7 @@ START_TEST(UA_Int64_Overflow_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":8,\"Body\":\"9223372036854775808\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -3871,7 +3446,7 @@ START_TEST(UA_Int64_TooBig_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":8,\"Body\":\"111111111111111111111111111111\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -3885,7 +3460,7 @@ START_TEST(UA_Int64_NoDigit_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":8,\"Body\":\"a\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -3899,7 +3474,7 @@ START_TEST(UA_Float_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":10,\"Body\":3.1415927410}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     //0 10000000 10010010000111111011011 = 40 49 0f db
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -3917,7 +3492,7 @@ START_TEST(UA_Float_json_one_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":10,\"Body\":1}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     //0 01111111 00000000000000000000000 = 3f80 0000
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -3937,7 +3512,7 @@ START_TEST(UA_Float_json_inf_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":10,\"Body\":\"Infinity\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
 
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -3957,7 +3532,7 @@ START_TEST(UA_Float_json_neginf_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":10,\"Body\":\"-Infinity\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     //0 01111111 00000000000000000000000 = 3f80 0000
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -3976,7 +3551,7 @@ START_TEST(UA_Float_json_nan_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":10,\"Body\":\"NaN\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     //0 01111111 00000000000000000000000 = 3f80 0000
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -3997,7 +3572,7 @@ START_TEST(UA_Float_json_negnan_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":10,\"Body\":\"-NaN\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     //0 01111111 00000000000000000000000 = 3f80 0000
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4018,7 +3593,7 @@ START_TEST(UA_Double_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":1.1234}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)(out.data))[0], 0xef);
@@ -4040,7 +3615,7 @@ START_TEST(UA_Double_corrupt_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":1.12.34}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -4055,7 +3630,7 @@ START_TEST(UA_Double_one_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":1}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     // 0 01111111111 0000000000000000000000000000000000000000000000000000
     // 3FF0000000000000
@@ -4080,7 +3655,7 @@ START_TEST(UA_Double_onepointsmallest_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":1.0000000000000002}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     // 0 01111111111 0000000000000000000000000000000000000000000000000001
     // 3FF0000000000001
@@ -4104,7 +3679,7 @@ START_TEST(UA_Double_nan_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":\"NaN\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Double val = *((UA_Double*)out.data);
@@ -4118,7 +3693,7 @@ START_TEST(UA_Double_negnan_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":\"-NaN\"}");
     // when
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Double val = *((UA_Double*)out.data);
@@ -4134,7 +3709,7 @@ START_TEST(UA_Double_inf_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":\"Infinity\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     // 0 111 1111 1111 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4157,7 +3732,7 @@ START_TEST(UA_Double_neginf_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":\"-Infinity\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     // 1 111 1111 1111 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4180,7 +3755,7 @@ START_TEST(UA_Double_zero_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":0}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     // 0 000 0000 0000 0000 0000 0000 00000000 00000000 00000000 00000000 00000000
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4203,7 +3778,7 @@ START_TEST(UA_Double_negzero_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":11,\"Body\":-0}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     // 1 000 0000 0000 0000 00000000 00000000 00000000 00000000 00000000 00000000
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -4226,7 +3801,7 @@ START_TEST(UA_String_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"abcdef\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
@@ -4248,7 +3823,7 @@ START_TEST(UA_String_empty_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
@@ -4265,7 +3840,7 @@ START_TEST(UA_String_unescapeBS_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"ab\\tcdef\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
@@ -4288,7 +3863,7 @@ START_TEST(UA_String_escape_unicode_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\\u002c\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
@@ -4306,7 +3881,7 @@ START_TEST(UA_String_escape2_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\\b\\th\\\"e\\fl\\nl\\\\o\\r\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
@@ -4335,7 +3910,7 @@ START_TEST(UA_String_surrogatePair_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\\uD800\\uDC00\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
@@ -4356,7 +3931,7 @@ START_TEST(UA_ByteString_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":15,\"Body\":\"YXNkZmFzZGY=\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BYTESTRING);
@@ -4382,7 +3957,7 @@ START_TEST(UA_ByteString_bad_json_decode) {
     UA_ByteString buf = UA_STRING("\"\x90!\xc5 c{\"");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_BYTESTRING]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_BYTESTRING], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_ByteString_clear(&out);
@@ -4393,7 +3968,7 @@ START_TEST(UA_ByteString_null_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":15,\"Body\":null}");
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BYTESTRING);
     UA_Variant_clear(&out);
@@ -4408,7 +3983,7 @@ START_TEST(UA_Guid_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000001-0002-0003-0405-060708090A0B\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_GUID);
@@ -4434,7 +4009,7 @@ START_TEST(UA_Guid_lower_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000001-0002-0003-0405-060708090a0b\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_GUID);
@@ -4461,7 +4036,7 @@ START_TEST(UA_Guid_tooShort_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000001-00\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -4475,7 +4050,7 @@ START_TEST(UA_Guid_tooLong_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000001-0002-0003-0405-060708090A0B00000001\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -4489,7 +4064,7 @@ START_TEST(UA_Guid_wrong_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":14,\"Body\":\"00000=01-0002-0003-0405-060708090A0B\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -4504,7 +4079,7 @@ START_TEST(UA_StatusCode_2_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":19,\"Body\":2}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STATUSCODE);
@@ -4521,7 +4096,7 @@ START_TEST(UA_StatusCode_3_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":19,\"Body\":222222222222222222222222222222222222}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
@@ -4535,7 +4110,7 @@ START_TEST(UA_StatusCode_0_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":19,\"Body\":0}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STATUSCODE);
@@ -4553,7 +4128,7 @@ START_TEST(UA_DateTime_json_decode) {
     UA_ByteString buf = UA_STRING("\"1970-01-02T01:02:03.005Z\"");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
@@ -4577,7 +4152,7 @@ START_TEST(UA_DateTime_json_decode_large) {
     UA_DateTime_init(&out);
     UA_ByteString buf = UA_STRING("\"10970-01-02T01:02:03.005Z\"");
     // when
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
@@ -4601,7 +4176,7 @@ START_TEST(UA_DateTime_json_decode_negative) {
     UA_ByteString buf = UA_STRING("\"-0050-01-02T01:02:03.005Z\"");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
@@ -4628,16 +4203,11 @@ START_TEST(UA_DateTime_json_decode_min) {
     buf.data = data;
     buf.length = 128;
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[128];
-
-    status s = UA_encodeJsonInternal((void *)&dt_min, type,
-                                     &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *)&dt_min, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
-    buf.length = (size_t)(bufPos - buf.data);
 
     UA_DateTime out;
-    s = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
+    s = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     ck_assert_int_eq(dt_min, out);
@@ -4665,18 +4235,12 @@ START_TEST(UA_DateTime_json_decode_max) {
     buf.data = data;
     buf.length = 128;
 
-    UA_Byte *bufPos = &buf.data[0];
-    const UA_Byte *bufEnd = &buf.data[128];
-
-    status s = UA_encodeJsonInternal((void *)&dt_max, type,
-                                     &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
+    status s = UA_encodeJson((void *)&dt_max, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
-    buf.length = (size_t)(bufPos - buf.data);
 
     UA_DateTime out;
-    s = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
+    s = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
-
     ck_assert_int_eq(dt_max, out);
 
     // then
@@ -4700,7 +4264,7 @@ START_TEST(UA_DateTime_micro_json_decode) {
     UA_ByteString buf = UA_STRING("\"1970-01-02T01:02:03.042Z\"");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
@@ -4727,7 +4291,7 @@ START_TEST(UA_QualifiedName_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Name\":\"derName\",\"Uri\":1}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_QUALIFIEDNAME]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_QUALIFIEDNAME], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.name.length, 7);
@@ -4743,7 +4307,7 @@ START_TEST(UA_QualifiedName_null_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":20,\"Body\":null}");
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_QUALIFIEDNAME);
     UA_Variant_clear(&out);
@@ -4757,7 +4321,7 @@ START_TEST(UA_LocalizedText_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Locale\":\"t1\",\"Text\":\"t2\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.locale.data[0], 't');
@@ -4776,7 +4340,7 @@ START_TEST(UA_LocalizedText_missing_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Locale\":\"t1\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.locale.length, 2);
@@ -4793,7 +4357,7 @@ START_TEST(UA_LocalizedText_null_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":21,\"Body\":null}");
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_LOCALIZEDTEXT);
     UA_Variant_clear(&out);
@@ -4808,7 +4372,7 @@ START_TEST(UA_ViewDescription_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Timestamp\":\"1970-01-15T06:56:07Z\",\"ViewVersion\":1236,\"ViewId\":{\"Id\":\"00000009-0002-027C-F3BF-BB7BEEFEEFBE\",\"IdType\":2}}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.viewVersion, 1236);
@@ -4840,7 +4404,7 @@ START_TEST(UA_NodeId_Nummeric_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Id\":42}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.identifier.numeric, 42);
@@ -4858,7 +4422,7 @@ START_TEST(UA_NodeId_Nummeric_Namespace_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Id\":42,\"Namespace\":123}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.identifier.numeric, 42);
@@ -4877,7 +4441,7 @@ START_TEST(UA_NodeId_String_json_decode) {
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test123\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.identifier.string.length, 7);
@@ -4903,7 +4467,7 @@ START_TEST(UA_NodeId_Guid_json_decode) {
     UA_ByteString buf = UA_STRING("{\"IdType\":2,\"Id\":\"00000001-0002-0003-0405-060708090A0B\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -4932,7 +4496,7 @@ START_TEST(UA_NodeId_ByteString_json_decode) {
     UA_ByteString buf = UA_STRING("{\"IdType\":3,\"Id\":\"YXNkZmFzZGY=\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_NODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -4952,7 +4516,6 @@ START_TEST(UA_NodeId_ByteString_json_decode) {
 }
 END_TEST
 
-
 /* -----------------------ExpandedNodeId---------------------------*/
 START_TEST(UA_ExpandedNodeId_Nummeric_json_decode) {
     // given
@@ -4961,7 +4524,7 @@ START_TEST(UA_ExpandedNodeId_Nummeric_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Id\":42}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.nodeId.identifier.numeric, 42);
@@ -4981,7 +4544,7 @@ START_TEST(UA_ExpandedNodeId_String_json_decode) {
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
@@ -5002,7 +4565,7 @@ START_TEST(UA_ExpandedNodeId_String_Namespace_json_decode) {
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test\",\"Namespace\":\"abcdef\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
@@ -5031,7 +4594,7 @@ START_TEST(UA_ExpandedNodeId_String_NamespaceAsIndex_json_decode) {
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test\",\"Namespace\":42}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
@@ -5056,7 +4619,7 @@ START_TEST(UA_ExpandedNodeId_String_Namespace_ServerUri_json_decode) {
     UA_ByteString buf = UA_STRING("{\"IdType\":1,\"Id\":\"test\",\"Namespace\":\"test\",\"ServerUri\":13}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
@@ -5082,7 +4645,7 @@ START_TEST(UA_ExpandedNodeId_ByteString_json_decode) {
     UA_ByteString buf = UA_STRING("{\"IdType\":3,\"Id\":\"YXNkZmFzZGY=\",\"Namespace\":\"test\",\"ServerUri\":13}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.nodeId.identifier.string.length, 8);
@@ -5105,7 +4668,6 @@ START_TEST(UA_ExpandedNodeId_ByteString_json_decode) {
 }
 END_TEST
 
-
 START_TEST(UA_DiagnosticInfo_json_decode) {
     // given
 
@@ -5120,7 +4682,7 @@ START_TEST(UA_DiagnosticInfo_json_decode) {
             "\"InnerDiagnosticInfo\":{\"AdditionalInfo\":\"INNER ADDITION INFO\"}}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DIAGNOSTICINFO]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DIAGNOSTICINFO], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.locale, 12);
@@ -5137,14 +4699,13 @@ START_TEST(UA_DiagnosticInfo_null_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":25,\"Body\":null}");
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_DIAGNOSTICINFO);
     UA_Variant_clear(&out);
 }
 END_TEST
 
-
 /* --------------------DataValue--------------------------- */
 START_TEST(UA_DataValue_json_decode) {
     // given
@@ -5155,7 +4716,7 @@ START_TEST(UA_DataValue_json_decode) {
 
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATAVALUE], NULL);
     //UA_DiagnosticInfo inner = *out.innerDiagnosticInfo;
 
     // then
@@ -5182,7 +4743,7 @@ START_TEST(UA_DataValueMissingFields_json_decode) {
 
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATAVALUE], NULL);
     //UA_DiagnosticInfo inner = *out.innerDiagnosticInfo;
 
     // then
@@ -5201,13 +4762,12 @@ START_TEST(UA_DataValue_null_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":23,\"Body\":null}");
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Variant_clear(&out);
 }
 END_TEST
 
-
 /*----------------------ExtensionObject------------------------*/
 START_TEST(UA_ExtensionObject_json_decode) {
     // given
@@ -5218,7 +4778,7 @@ START_TEST(UA_ExtensionObject_json_decode) {
 
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.encoding, UA_EXTENSIONOBJECT_DECODED);
@@ -5237,7 +4797,7 @@ START_TEST(UA_ExtensionObject_EncodedByteString_json_decode) {
 
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.encoding, UA_EXTENSIONOBJECT_ENCODED_BYTESTRING);
@@ -5256,7 +4816,6 @@ START_TEST(UA_ExtensionObject_EncodedByteString_json_decode) {
 }
 END_TEST
 
-
 START_TEST(UA_ExtensionObject_EncodedXml_json_decode) {
     // given
 
@@ -5266,7 +4825,7 @@ START_TEST(UA_ExtensionObject_EncodedXml_json_decode) {
 
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.encoding, UA_EXTENSIONOBJECT_ENCODED_XML);
@@ -5279,7 +4838,6 @@ START_TEST(UA_ExtensionObject_EncodedXml_json_decode) {
 }
 END_TEST
 
-
 START_TEST(UA_ExtensionObject_Unkown_json_decode) {
     // given
 
@@ -5288,10 +4846,10 @@ START_TEST(UA_ExtensionObject_Unkown_json_decode) {
     UA_ByteString buf = UA_STRING("{\"TypeId\":{\"Id\":4711},\"Body\":{\"unknown\":\"body\",\"saveas\":\"Bytestring\"}}");
 
     // when
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT], NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
     // then
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.encoding, UA_EXTENSIONOBJECT_ENCODED_BYTESTRING);
     ck_assert_int_eq(out.content.encoded.typeId.identifier.numeric, 4711);
 
@@ -5313,11 +4871,12 @@ START_TEST(UA_VariantBool_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1,\"Body\":false}");
+
     // when
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BOOLEAN);
     ck_assert_uint_eq(*((UA_Boolean*)out.data), 0);
     UA_Variant_clear(&out);
@@ -5329,11 +4888,12 @@ START_TEST(UA_VariantBoolNull_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1,\"Body\":null}");
+
     // when
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -5342,7 +4902,7 @@ START_TEST(UA_VariantNull_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":0}");
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 }
 END_TEST
@@ -5356,8 +4916,7 @@ START_TEST(UA_VariantStringArray_json_decode) {
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
 
     UA_String *testArray;
     testArray = (UA_String*)(out->data);
@@ -5390,7 +4949,7 @@ START_TEST(UA_VariantStringArrayNull_json_decode) {
 
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
 
     UA_String *testArray;
     testArray = (UA_String*)(out.data);
@@ -5423,8 +4982,7 @@ START_TEST(UA_VariantLocalizedTextArrayNull_json_decode) {
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
 
     UA_LocalizedText *testArray;
     testArray = (UA_LocalizedText*)(out.data);
@@ -5457,8 +5015,7 @@ START_TEST(UA_VariantVariantArrayNull_json_decode) {
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
 
     UA_Variant *testArray;
     testArray = (UA_Variant*)(out.data);
@@ -5486,7 +5043,7 @@ START_TEST(UA_VariantVariantArrayEmpty_json_decode) {
 
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(out.arrayLength, 0);
@@ -5502,7 +5059,7 @@ START_TEST(UA_VariantStringArray_WithoutDimension_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":[\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\"]}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
 
     UA_String *testArray;
     testArray = (UA_String*)(out.data);
@@ -5531,7 +5088,7 @@ START_TEST(UA_Variant_BooleanArray_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":1,\"Body\":[true, false, true]}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
 
     UA_Boolean *testArray;
     testArray = (UA_Boolean*)(out.data);
@@ -5555,7 +5112,7 @@ START_TEST(UA_Variant_bad1_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":1,\"Body\":\"\"}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     UA_Variant_clear(&out);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
@@ -5571,7 +5128,7 @@ START_TEST(UA_Variant_ExtensionObjectWrap_json_decode) {
 
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
 
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
@@ -5590,7 +5147,7 @@ START_TEST(UA_duplicate_json_decode) {
     UA_ByteString buf = UA_STRING("{\"Type\":1, \"Body\":false, \"Type\":1}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
     UA_Variant_clear(&out);
@@ -5603,10 +5160,10 @@ START_TEST(UA_wrongBoolean_json_decode) {
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1, \"Body\":\"asdfaaaaaaaaaaaaaaaaaaaa\"}");
     // when
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
     // then
-    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -5625,7 +5182,7 @@ START_TEST(UA_DataTypeAttributes_json_decode) {
             "\"IsAbstract\":false}");
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.isAbstract, 0);
@@ -5650,11 +5207,10 @@ START_TEST(UA_VariantStringArrayBad_shouldFreeArray_json_decode) {
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
     // then
-    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -5669,11 +5225,10 @@ START_TEST(UA_VariantFuzzer1_json_decode) {
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
     // then
-    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -5691,11 +5246,10 @@ START_TEST(UA_VariantFuzzer2_json_decode) {
     //UA_ByteString buf = UA_STRING("{\"SymbolicId\":13,\"LocalizedText\":14,\"Locale\":12,\"AdditionalInfo\":\"additionalInfo\",\"InnerStatusCode\":2155216896}");
 
     // when
-
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+    ck_assert(retval == UA_STATUSCODE_GOOD || retval == UA_STATUSCODE_BADDECODINGERROR);
 
     // then
-    ck_assert(retval == UA_STATUSCODE_GOOD || retval == UA_STATUSCODE_BADDECODINGERROR);
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -5704,12 +5258,12 @@ START_TEST(UA_Variant_Bad_Type_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
     UA_ByteString buf = UA_STRING("{\"Type\":1000,\"Body\":0}");
-    // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
-    // then
+    // when
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
 
+    // then
     UA_Variant_clear(&out);
 }
 END_TEST
@@ -5721,11 +5275,12 @@ START_TEST(UA_Variant_Bad_Type2_decode) {
         char str[80];
         sprintf(str, "{\"Type\":%d}", i);
         UA_ByteString buf = UA_STRING(str);
+
         // when
+        UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+        ck_assert_int_eq(retval, retval);
 
-        UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
         // then
-        ck_assert_int_eq(retval, retval);
         UA_Variant_clear(&out);
     }
 }
@@ -5738,7 +5293,7 @@ START_TEST(UA_Variant_Malformed_decode) {
         char str[80];
         sprintf(str, "{\"Type\":%d, \"Body:\"}", i);
         UA_ByteString buf = UA_STRING(str);
-        UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+        UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
         ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
         UA_Variant_clear(&out);
     }
@@ -5753,7 +5308,7 @@ START_TEST(UA_Variant_Malformed2_decode) {
     UA_ByteString buf = UA_STRING(str);
     // when
 
-    UA_StatusCode retval = UA_decodeJsonInternal(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT]);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
     UA_Variant_clear(&out);
@@ -5774,10 +5329,11 @@ START_TEST(UA_JsonHelper) {
 
     ctx.calcOnly = true;
     ctx.end = (const UA_Byte*)(uintptr_t)SIZE_MAX;
-    ck_assert_int_eq(calcJsonArrStart(&ctx), UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(calcJsonObjStart(&ctx), UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(calcJsonObjEnd(&ctx), UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(calcJsonArrEnd(&ctx), UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(writeJsonArrStart(&ctx), UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(writeJsonObjStart(&ctx), UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(writeJsonObjEnd(&ctx), UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(writeJsonArrEnd(&ctx), UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(writeJsonNull(&ctx), UA_STATUSCODE_GOOD);
 }
 END_TEST
 

From c0d9c069eca2575e42af8a2a0e96337941493876 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 7 Aug 2022 00:12:51 +0200
Subject: [PATCH 0388/1963] refactor(core): Switch JSON decoding to CJ5

---
 src/pubsub/ua_pubsub_networkmessage_json.c |  46 ++++---
 src/ua_types_encoding_json.c               | 153 +++++++++------------
 src/ua_types_encoding_json.h               |  13 +-
 3 files changed, 105 insertions(+), 107 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index 1011e2e5b27..ff8aeea23f7 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -280,28 +280,39 @@ DataSetPayload_decodeJsonInternal(void* dsmP, const UA_DataType *type,
         return UA_STATUSCODE_GOOD;
     }
 
-    size_t length = (size_t)parseCtx->tokenArray[parseCtx->index].size;
+    if(currentTokenType(parseCtx) != CJ5_TOKEN_OBJECT)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    /* The number of key-value pairs */
+    UA_assert(parseCtx->tokenArray[parseCtx->index].size % 2 == 0);
+    size_t length = (size_t)(parseCtx->tokenArray[parseCtx->index].size) / 2;
+
     UA_String *fieldNames = (UA_String*)UA_calloc(length, sizeof(UA_String));
+    if(!fieldNames)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
     dsm->data.keyFrameData.fieldNames = fieldNames;
     dsm->data.keyFrameData.fieldCount = (UA_UInt16)length;
+
     dsm->data.keyFrameData.dataSetFields = (UA_DataValue *)
         UA_Array_new(dsm->data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    if(!dsm->data.keyFrameData.dataSetFields)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    status ret = UA_STATUSCODE_GOOD;
-
-    parseCtx->index++; // We go to first Object key!
+    parseCtx->index++; /* Go to the first key */
 
-    /* iterate over the key/value pairs in the object. Keys are stored in fieldnames. */
+    /* Iterate over the key/value pairs in the object. Keys are stored in fieldnames. */
+    status ret = UA_STATUSCODE_GOOD;
     for(size_t i = 0; i < length; ++i) {
+        UA_assert(currentTokenType(parseCtx) == CJ5_TOKEN_STRING);
         ret = decodeJsonJumpTable[UA_DATATYPEKIND_STRING](&fieldNames[i], type, ctx, parseCtx);
         if(ret != UA_STATUSCODE_GOOD)
             return ret;
 
-        //TODO: Is field value a variant or datavalue? Current check if type and body present.
+        /* TODO: Is field value a variant or datavalue? Current check if type and body present. */
         size_t searchResult = 0;
         status foundType = lookAheadForKey("Type", ctx, parseCtx, &searchResult);
         status foundBody = lookAheadForKey("Body", ctx, parseCtx, &searchResult);
-        if(foundType == UA_STATUSCODE_GOOD && foundBody == UA_STATUSCODE_GOOD){
+        if(foundType == UA_STATUSCODE_GOOD && foundBody == UA_STATUSCODE_GOOD) {
             dsm->header.fieldEncoding = UA_FIELDENCODING_VARIANT;
             ret = decodeJsonJumpTable[UA_DATATYPEKIND_VARIANT]
                 (&dsm->data.keyFrameData.dataSetFields[i].value, type, ctx, parseCtx);
@@ -370,7 +381,7 @@ static status
 DatasetMessage_Array_decodeJsonInternal(void *UA_RESTRICT dst, const UA_DataType *type,
                                         CtxJson *ctx, ParseCtx *parseCtx) {
     /* Array! */
-    if(getJsmnType(parseCtx) != JSMN_ARRAY)
+    if(currentTokenType(parseCtx) != CJ5_TOKEN_ARRAY)
         return UA_STATUSCODE_BADDECODINGERROR;
     size_t length = (size_t)parseCtx->tokenArray[parseCtx->index].size;
 
@@ -417,11 +428,11 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     status found = lookAheadForKey(UA_DECODEKEY_PUBLISHERID, ctx,
                                    parseCtx, &searchResultPublishIdType);
     if(found == UA_STATUSCODE_GOOD) {
-        jsmntok_t publishIdToken = parseCtx->tokenArray[searchResultPublishIdType];
-        if(publishIdToken.type == JSMN_PRIMITIVE) {
+        cj5_token *publishIdToken = &parseCtx->tokenArray[searchResultPublishIdType];
+        if(publishIdToken->type == CJ5_TOKEN_NUMBER) {
             pubIdType = &UA_TYPES[UA_TYPES_UINT64];
             dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT64; //store in biggest possible
-        } else if(publishIdToken.type == JSMN_STRING) {
+        } else if(publishIdToken->type == CJ5_TOKEN_STRING) {
             dst->publisherIdType = UA_PUBLISHERIDTYPE_STRING;
         } else {
             return UA_STATUSCODE_BADDECODINGERROR;
@@ -433,8 +444,8 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     found = lookAheadForKey(UA_DECODEKEY_MESSAGES, ctx, parseCtx, &searchResultMessages);
     if(found != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
-    jsmntok_t bodyToken = parseCtx->tokenArray[searchResultMessages];
-    if(bodyToken.type != JSMN_ARRAY)
+    cj5_token *bodyToken = &parseCtx->tokenArray[searchResultMessages];
+    if(bodyToken->type != CJ5_TOKEN_ARRAY)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     size_t messageCount = (size_t)parseCtx->tokenArray[searchResultMessages].size;
 
@@ -449,8 +460,7 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     found = lookAheadForKey(UA_DECODEKEY_MESSAGETYPE, ctx, parseCtx, &searchResultMessageType);
     if(found != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;
-    size_t size = (size_t)(parseCtx->tokenArray[searchResultMessageType].end -
-                           parseCtx->tokenArray[searchResultMessageType].start);
+    size_t size = getTokenLength(&parseCtx->tokenArray[searchResultMessageType]);
     char* msgType = (char*)(ctx->pos + parseCtx->tokenArray[searchResultMessageType].start);
     if(size == 7) { //ua-data
         if(strncmp(msgType, "ua-data", size) != 0)
@@ -507,11 +517,11 @@ UA_NetworkMessage_decodeJson(UA_NetworkMessage *dst, const UA_ByteString *src) {
     memset(&ctx, 0, sizeof(CtxJson));
     ParseCtx parseCtx;
     memset(&parseCtx, 0, sizeof(ParseCtx));
-    parseCtx.tokenArray = (jsmntok_t*)
-        UA_malloc(sizeof(jsmntok_t) * UA_JSON_MAXTOKENCOUNT);
+    parseCtx.tokenArray = (cj5_token*)
+        UA_malloc(sizeof(cj5_token) * UA_JSON_MAXTOKENCOUNT);
     if(!parseCtx.tokenArray)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    memset(parseCtx.tokenArray, 0, sizeof(jsmntok_t) * UA_JSON_MAXTOKENCOUNT);
+    memset(parseCtx.tokenArray, 0, sizeof(cj5_token) * UA_JSON_MAXTOKENCOUNT);
     status ret = tokenize(&parseCtx, &ctx, src, UA_JSON_MAXTOKENCOUNT);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 00e186a89f1..b91551100c4 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1406,9 +1406,8 @@ UA_calcSizeJson(const void *src, const UA_DataType *type,
 
 /* Macro which gets current size and char pointer of current Token. Needs
  * ParseCtx (parseCtx) and CtxJson (ctx). Does NOT increment index of Token. */
-#define GET_TOKEN                                                             \
-    size_t tokenSize = (size_t)(parseCtx->tokenArray[parseCtx->index].end -   \
-                                parseCtx->tokenArray[parseCtx->index].start); \
+#define GET_TOKEN                                                       \
+    size_t tokenSize = getTokenLength(&parseCtx->tokenArray[parseCtx->index]); \
     char* tokenData = (char*)(ctx->pos + parseCtx->tokenArray[parseCtx->index].start); \
     do {} while(0)
 
@@ -1417,19 +1416,24 @@ UA_calcSizeJson(const void *src, const UA_DataType *type,
         return UA_STATUSCODE_BADDECODINGERROR;    \
     } while(0)
 
-#define CHECK_PRIMITIVE do {                      \
-    if(getJsmnType(parseCtx) != JSMN_PRIMITIVE) { \
-        return UA_STATUSCODE_BADDECODINGERROR;    \
+#define CHECK_NUMBER do {                                \
+    if(currentTokenType(parseCtx) != CJ5_TOKEN_NUMBER) { \
+        return UA_STATUSCODE_BADDECODINGERROR;           \
+    }} while(0)
+
+#define CHECK_BOOL do {                                \
+    if(currentTokenType(parseCtx) != CJ5_TOKEN_BOOL) { \
+        return UA_STATUSCODE_BADDECODINGERROR;         \
     }} while(0)
 
-#define CHECK_STRING do {                      \
-    if(getJsmnType(parseCtx) != JSMN_STRING) { \
-        return UA_STATUSCODE_BADDECODINGERROR; \
+#define CHECK_STRING do {                                \
+    if(currentTokenType(parseCtx) != CJ5_TOKEN_STRING) { \
+        return UA_STATUSCODE_BADDECODINGERROR;           \
     }} while(0)
 
-#define CHECK_OBJECT do {                      \
-    if(getJsmnType(parseCtx) != JSMN_OBJECT) { \
-        return UA_STATUSCODE_BADDECODINGERROR; \
+#define CHECK_OBJECT do {                                \
+    if(currentTokenType(parseCtx) != CJ5_TOKEN_OBJECT) { \
+        return UA_STATUSCODE_BADDECODINGERROR;           \
     }} while(0)
 
 /* Forward declarations*/
@@ -1442,7 +1446,7 @@ UA_calcSizeJson(const void *src, const UA_DataType *type,
  * last parsed token. So the array length has to be checked afterwards. */
 static void
 skipObject(ParseCtx *parseCtx) {
-    int end = parseCtx->tokenArray[parseCtx->index].end;
+    unsigned int end = parseCtx->tokenArray[parseCtx->index].end;
     do {
         parseCtx->index++;
     } while(parseCtx->index < parseCtx->tokenCount &&
@@ -1459,17 +1463,11 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
 
 UA_Boolean
 isJsonNull(const CtxJson *ctx, const ParseCtx *parseCtx) {
-    if(parseCtx->index >= parseCtx->tokenCount)
-        return false;
-
-    if(parseCtx->tokenArray[parseCtx->index].type != JSMN_PRIMITIVE) {
-        return false;
-    }
-    char* elem = (char*)(ctx->pos + parseCtx->tokenArray[parseCtx->index].start);
-    return (elem[0] == 'n' && elem[1] == 'u' && elem[2] == 'l' && elem[3] == 'l');
+    return (currentTokenType(parseCtx) == CJ5_TOKEN_NULL);
 }
 
-static UA_SByte jsoneq(const char *json, jsmntok_t *tok, const char *searchKey) {
+static UA_SByte
+jsoneq(const char *json, cj5_token *tok, const char *searchKey) {
     /* TODO: necessary?
        if(json == NULL
             || tok == NULL
@@ -1477,20 +1475,18 @@ static UA_SByte jsoneq(const char *json, jsmntok_t *tok, const char *searchKey)
         return -1;
     } */
 
-    if(tok->type == JSMN_STRING) {
-         if(strlen(searchKey) == (size_t)(tok->end - tok->start) ) {
-             if(strncmp(json + tok->start,
-                        (const char*)searchKey, (size_t)(tok->end - tok->start)) == 0) {
-                 return 0;
-             }
-         }
-    }
+    size_t len = getTokenLength(tok);
+    if(tok->type == CJ5_TOKEN_STRING &&
+       strlen(searchKey) ==  len &&
+       strncmp(json + tok->start, (const char*)searchKey, len) == 0)
+        return 0;
+
     return -1;
 }
 
 DECODE_JSON(Boolean) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_PRIMITIVE;
+    CHECK_BOOL;
     GET_TOKEN;
 
     if(tokenSize == 4 &&
@@ -1544,7 +1540,7 @@ parseSignedInteger(char *tokenData, size_t tokenSize, UA_Int64 *dst) {
 
 DECODE_JSON(Byte) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_PRIMITIVE;
+    CHECK_NUMBER;
     GET_TOKEN;
 
     UA_UInt64 out = 0;
@@ -1558,7 +1554,7 @@ DECODE_JSON(Byte) {
 
 DECODE_JSON(UInt16) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_PRIMITIVE;
+    CHECK_NUMBER;
     GET_TOKEN;
 
     UA_UInt64 out = 0;
@@ -1572,7 +1568,7 @@ DECODE_JSON(UInt16) {
 
 DECODE_JSON(UInt32) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_PRIMITIVE;
+    CHECK_NUMBER;
     GET_TOKEN;
 
     UA_UInt64 out = 0;
@@ -1598,7 +1594,7 @@ DECODE_JSON(UInt64) {
 
 DECODE_JSON(SByte) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_PRIMITIVE;
+    CHECK_NUMBER;
     GET_TOKEN;
 
     UA_Int64 out = 0;
@@ -1612,7 +1608,7 @@ DECODE_JSON(SByte) {
 
 DECODE_JSON(Int16) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_PRIMITIVE;
+    CHECK_NUMBER;
     GET_TOKEN;
 
     UA_Int64 out = 0;
@@ -1626,7 +1622,7 @@ DECODE_JSON(Int16) {
 
 DECODE_JSON(Int32) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_PRIMITIVE;
+    CHECK_NUMBER;
     GET_TOKEN;
 
     UA_Int64 out = 0;
@@ -1660,7 +1656,7 @@ static UA_UInt32 hex2int(char ch) {
     return 0;
 }
 
-/* Either a JSMN_STRING or JSMN_PRIMITIVE */
+/* Either a STRING or NUMBER token */
 DECODE_JSON(Double) {
     CHECK_TOKEN_BOUNDS;
     GET_TOKEN;
@@ -1672,10 +1668,10 @@ DECODE_JSON(Double) {
     if(tokenSize > 1075)
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    jsmntype_t tokenType = getJsmnType(parseCtx);
+    cj5_token_type tokenType = currentTokenType(parseCtx);
 
     /* It could be a String with Nan, Infinity */
-    if(tokenType == JSMN_STRING) {
+    if(tokenType == CJ5_TOKEN_STRING) {
         parseCtx->index++;
 
         if(tokenSize == 8 && memcmp(tokenData, "Infinity", 8) == 0) {
@@ -1702,7 +1698,7 @@ DECODE_JSON(Double) {
         return UA_STATUSCODE_BADDECODINGERROR;
     }
 
-    if(tokenType != JSMN_PRIMITIVE)
+    if(tokenType != CJ5_TOKEN_NUMBER)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     size_t len = parseDouble(tokenData, tokenSize, dst);
@@ -1929,20 +1925,18 @@ lookAheadForKey(const char *key, CtxJson *ctx,
                 ParseCtx *parseCtx, size_t *resultIndex) {
     status ret = UA_STATUSCODE_BADNOTFOUND;
     UA_UInt16 oldIndex = parseCtx->index; /* Save index for later restore */
-    int end = parseCtx->tokenArray[parseCtx->index].end;
+    unsigned int end = parseCtx->tokenArray[parseCtx->index].end;
     parseCtx->index++; /* Move to the first key */
     while(parseCtx->index < parseCtx->tokenCount &&
           parseCtx->tokenArray[parseCtx->index].start < end) {
-        /* Key must be a string (TODO: Make this an assert after replacing jsmn) */
-        if(getJsmnType(parseCtx) != JSMN_STRING)
-            return UA_STATUSCODE_BADDECODINGERROR;
+        /* Key must be a string */
+        UA_assert(currentTokenType(parseCtx) == CJ5_TOKEN_STRING);
 
         /* Move index to the value */
         parseCtx->index++;
 
-        /* Value for the key must exist (TODO: Make this an assert after replacing jsmn) */
-        if(parseCtx->index >= parseCtx->tokenCount)
-            return UA_STATUSCODE_BADDECODINGERROR;
+        /* Value for the key must exist */
+        UA_assert(parseCtx->index < parseCtx->tokenCount);
 
         /* Compare the key (previous index) */
         if(jsoneq((char*)ctx->pos, &parseCtx->tokenArray[parseCtx->index-1], key) == 0) {
@@ -1971,8 +1965,7 @@ prepareDecodeNodeIdJson(UA_NodeId *dst, CtxJson *ctx, ParseCtx *parseCtx,
     size_t searchResult = 0;
     status ret = lookAheadForKey(UA_JSONKEY_IDTYPE, ctx, parseCtx, &searchResult);
     if(ret == UA_STATUSCODE_GOOD) {
-        size_t size = (size_t)(parseCtx->tokenArray[searchResult].end -
-                               parseCtx->tokenArray[searchResult].start);
+        size_t size = getTokenLength(&parseCtx->tokenArray[searchResult]);
         if(size < 1)
             return UA_STATUSCODE_BADDECODINGERROR;
 
@@ -2270,12 +2263,8 @@ VariantDimension_decodeJson(void *dst, const UA_DataType *type,
 
 static UA_Boolean
 tokenIsNull(CtxJson *ctx, ParseCtx *parseCtx, size_t tokenIndex) {
-    jsmntok_t *tok = &parseCtx->tokenArray[tokenIndex];
-    if(tok->type != JSMN_PRIMITIVE)
-        return false;
-    if(tok->end - tok->start != 4)
-        return false;
-    return (strncmp((const char*)ctx->pos + tok->start, "null", 4) == 0);
+    cj5_token *tok = &parseCtx->tokenArray[tokenIndex];
+    return (tok->type == CJ5_TOKEN_NULL);
 }
 
 DECODE_JSON(Variant) {
@@ -2290,9 +2279,8 @@ DECODE_JSON(Variant) {
     }
 
     /* Parse the type */
-    size_t size = ((size_t)parseCtx->tokenArray[searchResultType].end -
-                   (size_t)parseCtx->tokenArray[searchResultType].start);
-    if(size == 0 || parseCtx->tokenArray[searchResultType].type != JSMN_PRIMITIVE)
+    size_t size = getTokenLength(&parseCtx->tokenArray[searchResultType]);
+    if(size == 0 || parseCtx->tokenArray[searchResultType].type != CJ5_TOKEN_NUMBER)
         return UA_STATUSCODE_BADDECODINGERROR;
     UA_UInt64 idTypeDecoded = 0;
     char *idTypeEncoded = (char*)(ctx->pos + parseCtx->tokenArray[searchResultType].start);
@@ -2319,7 +2307,7 @@ DECODE_JSON(Variant) {
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* Value is an array? */
-    UA_Boolean isArray = (parseCtx->tokenArray[searchResultBody].type == JSMN_ARRAY);
+    UA_Boolean isArray = (parseCtx->tokenArray[searchResultBody].type == CJ5_TOKEN_ARRAY);
 
     /* TODO: Handling of null-arrays (length -1) needs to be clarified
      *
@@ -2423,8 +2411,7 @@ DECODE_JSON(ExtensionObject) {
         UA_UInt64 encoding = 0;
         char *extObjEncoding = (char*)(ctx->pos +
                                        parseCtx->tokenArray[encodingPos].start);
-        size_t size = (size_t)(parseCtx->tokenArray[encodingPos].end -
-                               parseCtx->tokenArray[encodingPos].start);
+        size_t size = getTokenLength(&parseCtx->tokenArray[encodingPos]);
         parseUInt64(extObjEncoding, size, &encoding);
 
         if(encoding == 1) {
@@ -2470,7 +2457,7 @@ DECODE_JSON(ExtensionObject) {
         dst->content.encoded.typeId = typeId; /* Move the type NodeId */
 
         /* Check if an object */
-        if(getJsmnType(parseCtx) != JSMN_OBJECT)
+        if(currentTokenType(parseCtx) != CJ5_TOKEN_OBJECT)
             return UA_STATUSCODE_BADDECODINGERROR;
 
         /* Search for body to save */
@@ -2480,9 +2467,7 @@ DECODE_JSON(ExtensionObject) {
             return UA_STATUSCODE_BADDECODINGERROR;
 
         /* Get the size of the Object as a string, not the Object key count! */
-        size_t sizeOfJsonString = (size_t)
-            (parseCtx->tokenArray[bodyIndex].end -
-             parseCtx->tokenArray[bodyIndex].start);
+        size_t sizeOfJsonString = getTokenLength(&parseCtx->tokenArray[bodyIndex]);
         if(sizeOfJsonString == 0)
             return UA_STATUSCODE_BADDECODINGERROR;
 
@@ -2560,8 +2545,7 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
     ret = lookAheadForKey(UA_JSONKEY_ENCODING, ctx, parseCtx, &searchEncodingResult);
     if(ret == UA_STATUSCODE_GOOD) {
         char *extObjEncoding = (char*)(ctx->pos + parseCtx->tokenArray[searchEncodingResult].start);
-        size_t size = (size_t)(parseCtx->tokenArray[searchEncodingResult].end
-                               - parseCtx->tokenArray[searchEncodingResult].start);
+        size_t size = getTokenLength(&parseCtx->tokenArray[searchEncodingResult]);
         parseUInt64(extObjEncoding, size, &encoding);
     }
 
@@ -2648,8 +2632,11 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
         return UA_STATUSCODE_BADENCODINGERROR;
     ctx->depth++;
 
+    /* Keys and values are counted separately */
+    UA_assert(parseCtx->tokenArray[parseCtx->index].size % 2 == 0);
+    size_t objectCount = (size_t)(parseCtx->tokenArray[parseCtx->index].size) / 2;
+
     /* Empty object, nothing to decode */
-    size_t objectCount = (size_t)(parseCtx->tokenArray[parseCtx->index].size);
     if(objectCount == 0) {
         ctx->depth--;
         parseCtx->index++; /* Jump to the element after the empty object */
@@ -2668,11 +2655,8 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
     for(size_t currObj = 0; currObj < objectCount &&
             parseCtx->index < parseCtx->tokenCount; currObj++) {
 
-        /* Key must be a string (TODO: Convert to assert when jsmn is replaced) */
-        if(getJsmnType(parseCtx) != JSMN_STRING) {
-            ret = UA_STATUSCODE_BADDECODINGERROR;
-            goto cleanup;
-        }
+        /* Key must be a string */
+        UA_assert(currentTokenType(parseCtx) == CJ5_TOKEN_STRING);
 
         /* Start searching at the index of currObj */
         for(size_t i = currObj; i < entryCount + currObj; i++) {
@@ -2744,7 +2728,7 @@ Array_decodeJson(void **dst, const UA_DataType *type,
     /* Save the length of the array */
     size_t *size_ptr = (size_t*) dst - 1;
 
-    if(parseCtx->tokenArray[parseCtx->index].type != JSMN_ARRAY)
+    if(currentTokenType(parseCtx) != CJ5_TOKEN_ARRAY)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     size_t length = (size_t)parseCtx->tokenArray[parseCtx->index].size;
@@ -2876,15 +2860,14 @@ tokenize(ParseCtx *parseCtx, CtxJson *ctx, const UA_ByteString *src, size_t toke
     parseCtx->index = 0;
 
     /* Tokenize */
-    jsmn_parser p;
-    jsmn_init(&p);
-    parseCtx->tokenCount = (UA_Int32)
-        jsmn_parse(&p, (char*)src->data, src->length,
-                   parseCtx->tokenArray, (unsigned int)tokensSize);
-    if(parseCtx->tokenCount == JSMN_ERROR_NOMEM)
+    cj5_result r = cj5_parse((char*)src->data, (unsigned int)src->length,
+                             parseCtx->tokenArray, (unsigned int)tokensSize);
+    if(r.error == CJ5_ERROR_OVERFLOW)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    if(parseCtx->tokenCount < 0)
+    if(r.error != CJ5_ERROR_NONE)
         return UA_STATUSCODE_BADDECODINGERROR;
+
+    parseCtx->tokenCount = r.num_tokens;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -2899,7 +2882,7 @@ UA_decodeJson(const UA_ByteString *src, void *dst, const UA_DataType *type,
         return UA_STATUSCODE_BADARGUMENTSMISSING;
 
     /* Set up the context */
-    jsmntok_t tokens[UA_JSON_MAXTOKENCOUNT / 8];
+    cj5_token tokens[UA_JSON_MAXTOKENCOUNT / 8];
     CtxJson ctx;
     memset(&ctx, 0, sizeof(ctx));
     ParseCtx parseCtx;
@@ -2919,8 +2902,8 @@ UA_decodeJson(const UA_ByteString *src, void *dst, const UA_DataType *type,
 
     /* Allocate larger token array on the heap and try again */
     if(ret == UA_STATUSCODE_BADOUTOFMEMORY) {
-        parseCtx.tokenArray = (jsmntok_t*)
-            UA_malloc(sizeof(jsmntok_t) * UA_JSON_MAXTOKENCOUNT);
+        parseCtx.tokenArray = (cj5_token*)
+            UA_malloc(sizeof(cj5_token) * UA_JSON_MAXTOKENCOUNT);
         if(!parseCtx.tokenArray)
             return UA_STATUSCODE_BADOUTOFMEMORY;
         ret = tokenize(&parseCtx, &ctx, src, UA_JSON_MAXTOKENCOUNT);
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 35f2a20214f..48afabf430a 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -15,7 +15,7 @@
 #include "ua_types_encoding_json.h"
 #include "ua_util_internal.h"
 
-#include "../deps/jsmn/jsmn.h"
+#include "../deps/cj5.h"
 
 _UA_BEGIN_DECLS
 
@@ -56,8 +56,8 @@ status
 encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx);
 
 typedef struct {
-    jsmntok_t *tokenArray;
-    UA_Int32 tokenCount;
+    cj5_token *tokenArray;
+    size_t tokenCount;
     UA_UInt16 index;
 
     /* Additonal data for special cases such as networkmessage/datasetmessage
@@ -105,10 +105,15 @@ UA_StatusCode tokenize(ParseCtx *parseCtx, CtxJson *ctx,
 UA_Boolean isJsonNull(const CtxJson *ctx, const ParseCtx *parseCtx);
 
 static UA_INLINE
-jsmntype_t getJsmnType(const ParseCtx *parseCtx) {
+cj5_token_type currentTokenType(const ParseCtx *parseCtx) {
     return parseCtx->tokenArray[parseCtx->index].type;
 }
 
+static UA_INLINE
+size_t getTokenLength(cj5_token *t) {
+    return (size_t)(1u + t->end - t->start);
+}
+
 _UA_END_DECLS
 
 #endif /* UA_TYPES_ENCODING_JSON_H_ */

From 09c5d40d8c29990b46ee052e8bfd0d47d59e21c1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 7 Aug 2022 01:18:08 +0200
Subject: [PATCH 0389/1963] refactor(core): Return BadDecodingFailed from
 parsing methods

---
 src/ua_types_lex.c  | 937 ++++++++++++++++++++++----------------------
 src/ua_types_lex.re |  39 +-
 2 files changed, 484 insertions(+), 492 deletions(-)

diff --git a/src/ua_types_lex.c b/src/ua_types_lex.c
index 648035683e7..c26cee7536c 100644
--- a/src/ua_types_lex.c
+++ b/src/ua_types_lex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 */
+/* Generated by re2c 3.0 */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -34,10 +34,11 @@
 #define YYRESTORE() YYCURSOR = YYMARKER
 #define YYSTAGP(t) t = YYCURSOR
 #define YYSTAGN(t) t = NULL
+#define YYSHIFTSTAG(t, shift) t += shift
 
 typedef struct {
     const char *marker;
-    const char *yyt1;const char *yyt2;const char *yyt3;const char *yyt4;const char *yyt5;
+    const char *yyt1;const char *yyt2;const char *yyt3;const char *yyt4;
 } LexContext;
 
 
@@ -46,32 +47,32 @@ static UA_StatusCode
 parse_guid(UA_Guid *guid, const UA_Byte *s, const UA_Byte *e) {
     size_t len = (size_t)(e - s);
     if(len != 36 || s[8] != '-' || s[13] != '-' || s[23] != '-')
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
 
     UA_UInt32 tmp;
     if(UA_readNumberWithBase(s, 8, &tmp, 16) != 8)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data1 = tmp;
 
     if(UA_readNumberWithBase(&s[9], 4, &tmp, 16) != 4)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data2 = (UA_UInt16)tmp;
 
     if(UA_readNumberWithBase(&s[14], 4, &tmp, 16) != 4)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data3 = (UA_UInt16)tmp;
 
     if(UA_readNumberWithBase(&s[19], 2, &tmp, 16) != 2)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data4[0] = (UA_Byte)tmp;
 
     if(UA_readNumberWithBase(&s[21], 2, &tmp, 16) != 2)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data4[1] = (UA_Byte)tmp;
 
     for(size_t pos = 2, spos = 24; pos < 8; pos++, spos += 2) {
         if(UA_readNumberWithBase(&s[spos], 2, &tmp, 16) != 2)
-            return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_BADDECODINGERROR;
         guid->data4[pos] = (UA_Byte)tmp;
     }
 
@@ -93,7 +94,7 @@ parse_nodeid_body(UA_NodeId *id, const char *body, const char *end) {
     switch(*body) {
     case 'i': {
         if(UA_readNumber((const UA_Byte*)body+2, len, &id->identifier.numeric) != len)
-            return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_BADDECODINGERROR;
         id->identifierType = UA_NODEIDTYPE_NUMERIC;
         break;
     }
@@ -117,11 +118,11 @@ parse_nodeid_body(UA_NodeId *id, const char *body, const char *end) {
             UA_unbase64((const unsigned char*)body+2, len,
                         &id->identifier.byteString.length);
         if(!id->identifier.byteString.data && len > 0)
-            return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_BADDECODINGERROR;
         id->identifierType = UA_NODEIDTYPE_BYTESTRING;
         break;
     default:
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     }
     return res;
 }
@@ -133,42 +134,42 @@ parse_nodeid(UA_NodeId *id, const char *pos, const char *end) {
     memset(&context, 0, sizeof(LexContext));
     const char *ns = NULL, *nse= NULL;
 
-
+    
 {
 	char yych;
-	yych = YYPEEK ();
-	switch (yych) {
-	case 'b':
-	case 'g':
-	case 'i':
-	case 's':
-		YYSTAGN (context.yyt1);
-		YYSTAGN (context.yyt2);
-		goto yy4;
-	case 'n':	goto yy5;
-	default:	goto yy2;
-	}
+	yych = YYPEEK();
+	switch (yych) {
+		case 'b':
+		case 'g':
+		case 'i':
+		case 's':
+			YYSTAGN(context.yyt1);
+			YYSTAGN(context.yyt2);
+			goto yy3;
+		case 'n': goto yy4;
+		default: goto yy1;
+	}
+yy1:
+	YYSKIP();
 yy2:
-	YYSKIP ();
+	{ (void)pos; return UA_STATUSCODE_BADDECODINGERROR; }
 yy3:
-	{ (void)pos; return UA_STATUSCODE_BADINTERNALERROR; }
-yy4:
-	YYSKIP ();
-	yych = YYPEEK ();
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '=':	goto yy6;
-	default:	goto yy3;
+		case '=': goto yy5;
+		default: goto yy2;
 	}
-yy5:
-	YYSKIP ();
-	YYBACKUP ();
-	yych = YYPEEK ();
+yy4:
+	YYSKIP();
+	YYBACKUP();
+	yych = YYPEEK();
 	switch (yych) {
-	case 's':	goto yy8;
-	default:	goto yy3;
+		case 's': goto yy6;
+		default: goto yy2;
 	}
-yy6:
-	YYSKIP ();
+yy5:
+	YYSKIP();
 	ns = context.yyt1;
 	nse = context.yyt2;
 	{
@@ -177,76 +178,76 @@ parse_nodeid(UA_NodeId *id, const char *pos, const char *end) {
             UA_UInt32 tmp;
             size_t len = (size_t)(nse - ns);
             if(UA_readNumber((const UA_Byte*)ns, len, &tmp) != len)
-                return UA_STATUSCODE_BADINTERNALERROR;
+                return UA_STATUSCODE_BADDECODINGERROR;
             id->namespaceIndex = (UA_UInt16)tmp;
         }
 
         // From the current position until the end
         return parse_nodeid_body(id, &pos[-2], end);
     }
-yy8:
-	YYSKIP ();
-	yych = YYPEEK ();
+yy6:
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '=':	goto yy10;
-	default:	goto yy9;
+		case '=': goto yy8;
+		default: goto yy7;
 	}
-yy9:
-	YYRESTORE ();
-	goto yy3;
-yy10:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-		YYSTAGP (context.yyt1);
-		goto yy11;
-	default:	goto yy9;
+yy7:
+	YYRESTORE();
+	goto yy2;
+yy8:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			YYSTAGP(context.yyt1);
+			goto yy9;
+		default: goto yy7;
 	}
-yy11:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy11;
-	case ';':
-		YYSTAGP (context.yyt2);
-		goto yy13;
-	default:	goto yy9;
+yy9:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9': goto yy9;
+		case ';':
+			YYSTAGP(context.yyt2);
+			goto yy10;
+		default: goto yy7;
 	}
-yy13:
-	YYSKIP ();
-	yych = YYPEEK ();
+yy10:
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case 'b':
-	case 'g':
-	case 'i':
-	case 's':	goto yy14;
-	default:	goto yy9;
+		case 'b':
+		case 'g':
+		case 'i':
+		case 's': goto yy11;
+		default: goto yy7;
 	}
-yy14:
-	YYSKIP ();
-	yych = YYPEEK ();
+yy11:
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '=':	goto yy6;
-	default:	goto yy9;
+		case '=': goto yy5;
+		default: goto yy7;
 	}
 }
 
@@ -268,74 +269,73 @@ parse_expandednodeid(UA_ExpandedNodeId *id, const char *pos, const char *end) {
     memset(&context, 0, sizeof(LexContext));
     const char *svr = NULL, *svre = NULL, *nsu = NULL, *ns = NULL, *body = NULL;
 
-
+    
 {
 	char yych;
-	yych = YYPEEK ();
-	switch (yych) {
-	case 'b':
-	case 'g':
-	case 'i':
-		YYSTAGN (context.yyt1);
-		YYSTAGN (context.yyt2);
-		YYSTAGN (context.yyt3);
-		YYSTAGP (context.yyt4);
-		YYSTAGN (context.yyt5);
-		goto yy19;
-	case 'n':
-		YYSTAGN (context.yyt1);
-		YYSTAGN (context.yyt2);
-		goto yy20;
-	case 's':
-		YYSTAGN (context.yyt1);
-		YYSTAGN (context.yyt2);
-		YYSTAGN (context.yyt3);
-		YYSTAGP (context.yyt4);
-		YYSTAGN (context.yyt5);
-		goto yy21;
-	default:	goto yy17;
+	yych = YYPEEK();
+	switch (yych) {
+		case 'b':
+		case 'g':
+		case 'i':
+			YYSTAGN(context.yyt1);
+			YYSTAGN(context.yyt2);
+			YYSTAGN(context.yyt3);
+			YYSTAGN(context.yyt4);
+			goto yy15;
+		case 'n':
+			YYSTAGN(context.yyt1);
+			YYSTAGN(context.yyt2);
+			goto yy16;
+		case 's':
+			YYSTAGN(context.yyt1);
+			YYSTAGN(context.yyt2);
+			YYSTAGN(context.yyt3);
+			YYSTAGN(context.yyt4);
+			goto yy17;
+		default: goto yy13;
 	}
-yy17:
-	YYSKIP ();
-yy18:
-	{ (void)pos; return UA_STATUSCODE_BADINTERNALERROR; }
-yy19:
-	YYSKIP ();
-	yych = YYPEEK ();
+yy13:
+	YYSKIP();
+yy14:
+	{ (void)pos; return UA_STATUSCODE_BADDECODINGERROR; }
+yy15:
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '=':	goto yy22;
-	default:	goto yy18;
+		case '=': goto yy18;
+		default: goto yy14;
 	}
-yy20:
-	YYSKIP ();
-	YYBACKUP ();
-	yych = YYPEEK ();
+yy16:
+	YYSKIP();
+	YYBACKUP();
+	yych = YYPEEK();
 	switch (yych) {
-	case 's':	goto yy24;
-	default:	goto yy18;
+		case 's': goto yy19;
+		default: goto yy14;
 	}
-yy21:
-	YYSKIP ();
-	YYBACKUP ();
-	yych = YYPEEK ();
+yy17:
+	YYSKIP();
+	YYBACKUP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '=':	goto yy22;
-	case 'v':	goto yy26;
-	default:	goto yy18;
+		case '=': goto yy18;
+		case 'v': goto yy21;
+		default: goto yy14;
 	}
-yy22:
-	YYSKIP ();
+yy18:
+	YYSKIP();
 	svr = context.yyt1;
 	svre = context.yyt2;
 	ns = context.yyt3;
-	nsu = context.yyt5;
-	body = context.yyt4;
+	nsu = context.yyt4;
+	YYSTAGP(body);
+	YYSHIFTSTAG(body, -2);
 	{
         (void)pos; // Get rid of a dead store clang-analyzer warning
         if(svr) {
             size_t len = (size_t)((svre) - svr);
             if(UA_readNumber((const UA_Byte*)svr, len, &id->serverIndex) != len)
-                return UA_STATUSCODE_BADINTERNALERROR;
+                return UA_STATUSCODE_BADDECODINGERROR;
         }
 
         if(nsu) {
@@ -350,191 +350,188 @@ parse_expandednodeid(UA_ExpandedNodeId *id, const char *pos, const char *end) {
             UA_UInt32 tmp;
             size_t len = (size_t)((body-1) - ns);
             if(UA_readNumber((const UA_Byte*)ns, len, &tmp) != len)
-                return UA_STATUSCODE_BADINTERNALERROR;
+                return UA_STATUSCODE_BADDECODINGERROR;
             id->nodeId.namespaceIndex = (UA_UInt16)tmp;
         }
 
         // From the current position until the end
         return parse_nodeid_body(&id->nodeId, &pos[-2], end);
     }
+yy19:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '=': goto yy22;
+		case 'u': goto yy23;
+		default: goto yy20;
+	}
+yy20:
+	YYRESTORE();
+	goto yy14;
+yy21:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case 'r': goto yy24;
+		default: goto yy20;
+	}
+yy22:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			YYSTAGP(context.yyt3);
+			goto yy25;
+		default: goto yy20;
+	}
+yy23:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '=': goto yy26;
+		default: goto yy20;
+	}
 yy24:
-	YYSKIP ();
-	yych = YYPEEK ();
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '=':	goto yy27;
-	case 'u':	goto yy28;
-	default:	goto yy25;
+		case '=': goto yy27;
+		default: goto yy20;
 	}
 yy25:
-	YYRESTORE ();
-	goto yy18;
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9': goto yy25;
+		case ';': goto yy28;
+		default: goto yy20;
+	}
 yy26:
-	YYSKIP ();
-	yych = YYPEEK ();
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case 'r':	goto yy29;
-	default:	goto yy25;
+		case '\n': goto yy20;
+		case ';':
+			YYSTAGP(context.yyt4);
+			goto yy30;
+		default:
+			YYSTAGP(context.yyt4);
+			goto yy29;
 	}
 yy27:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-		YYSTAGP (context.yyt3);
-		goto yy30;
-	default:	goto yy25;
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			YYSTAGP(context.yyt1);
+			goto yy31;
+		default: goto yy20;
 	}
 yy28:
-	YYSKIP ();
-	yych = YYPEEK ();
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '=':	goto yy32;
-	default:	goto yy25;
+		case 'b':
+		case 'g':
+		case 'i':
+		case 's':
+			YYSTAGN(context.yyt4);
+			goto yy32;
+		default: goto yy20;
 	}
 yy29:
-	YYSKIP ();
-	yych = YYPEEK ();
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '=':	goto yy33;
-	default:	goto yy25;
+		case '\n': goto yy20;
+		case ';': goto yy30;
+		default: goto yy29;
 	}
 yy30:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy30;
-	case ';':	goto yy34;
-	default:	goto yy25;
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case 'b':
+		case 'g':
+		case 'i':
+		case 's':
+			YYSTAGN(context.yyt3);
+			goto yy32;
+		default: goto yy20;
+	}
+yy31:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9': goto yy31;
+		case ';':
+			YYSTAGP(context.yyt2);
+			goto yy33;
+		default: goto yy20;
 	}
 yy32:
-	YYSKIP ();
-	yych = YYPEEK ();
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case '\n':	goto yy25;
-	case ';':
-		YYSTAGP (context.yyt5);
-		goto yy37;
-	default:
-		YYSTAGP (context.yyt5);
-		goto yy35;
+		case '=': goto yy18;
+		default: goto yy20;
 	}
 yy33:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-		YYSTAGP (context.yyt1);
-		goto yy38;
-	default:	goto yy25;
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case 'b':
+		case 'g':
+		case 'i':
+		case 's':
+			YYSTAGN(context.yyt3);
+			YYSTAGN(context.yyt4);
+			goto yy32;
+		case 'n': goto yy34;
+		default: goto yy20;
 	}
 yy34:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case 'b':
-	case 'g':
-	case 'i':
-	case 's':
-		YYSTAGP (context.yyt4);
-		YYSTAGN (context.yyt5);
-		goto yy40;
-	default:	goto yy25;
-	}
-yy35:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '\n':	goto yy25;
-	case ';':	goto yy37;
-	default:	goto yy35;
-	}
-yy37:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case 'b':
-	case 'g':
-	case 'i':
-	case 's':
-		YYSTAGN (context.yyt3);
-		YYSTAGP (context.yyt4);
-		goto yy40;
-	default:	goto yy25;
-	}
-yy38:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy38;
-	case ';':
-		YYSTAGP (context.yyt2);
-		goto yy41;
-	default:	goto yy25;
-	}
-yy40:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '=':	goto yy22;
-	default:	goto yy25;
-	}
-yy41:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case 'b':
-	case 'g':
-	case 'i':
-	case 's':
-		YYSTAGN (context.yyt3);
-		YYSTAGP (context.yyt4);
-		YYSTAGN (context.yyt5);
-		goto yy40;
-	case 'n':	goto yy42;
-	default:	goto yy25;
-	}
-yy42:
-	YYSKIP ();
-	yych = YYPEEK ();
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case 's':	goto yy24;
-	default:	goto yy25;
+		case 's': goto yy19;
+		default: goto yy20;
 	}
 }
 
@@ -592,7 +589,7 @@ parse_refpath_qn_name(UA_QualifiedName *qn, const char **pos, const char *end) {
                (**pos != '/' && **pos != '.' && **pos != '<' && **pos != '>' &&
                 **pos != ':' && **pos != '#' && **pos != '!' && **pos != '&')) {
                 UA_free(name);
-                return UA_STATUSCODE_BADINTERNALERROR;
+                return UA_STATUSCODE_BADDECODINGERROR;
             }
             c = **pos;
         }
@@ -619,79 +616,78 @@ parse_refpath_qn(UA_QualifiedName *qn, const char *pos, const char *end) {
     const char *ns = NULL, *nse = NULL;
     UA_QualifiedName_init(qn);
 
-
+    
 {
 	char yych;
-	yych = YYPEEK ();
-	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-		YYSTAGP (context.yyt1);
-		goto yy47;
-	default:	goto yy45;
-	}
-yy45:
-	YYSKIP ();
-yy46:
+	yych = YYPEEK();
+	switch (yych) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			YYSTAGP(context.yyt1);
+			goto yy38;
+		default: goto yy36;
+	}
+yy36:
+	YYSKIP();
+yy37:
 	{ pos--; goto parse_qn_name; }
-yy47:
-	YYSKIP ();
-	YYBACKUP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	case ':':	goto yy49;
-	default:	goto yy46;
-	}
-yy48:
-	YYSKIP ();
-	yych = YYPEEK ();
-yy49:
+yy38:
+	YYSKIP();
+	YYBACKUP();
+	yych = YYPEEK();
+	switch (yych) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+		case ':': goto yy40;
+		default: goto yy37;
+	}
+yy39:
+	YYSKIP();
+	yych = YYPEEK();
+yy40:
 	switch (yych) {
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy48;
-	case ':':
-		YYSTAGP (context.yyt2);
-		goto yy51;
-	default:	goto yy50;
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9': goto yy39;
+		case ':': goto yy42;
+		default: goto yy41;
 	}
-yy50:
-	YYRESTORE ();
-	goto yy46;
-yy51:
-	YYSKIP ();
+yy41:
+	YYRESTORE();
+	goto yy37;
+yy42:
+	YYSKIP();
 	ns = context.yyt1;
-	nse = context.yyt2;
+	YYSTAGP(nse);
+	YYSHIFTSTAG(nse, -1);
 	{
         UA_UInt32 tmp;
         size_t len = (size_t)(nse - ns);
         if(UA_readNumber((const UA_Byte*)ns, len, &tmp) != len)
-            return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_BADDECODINGERROR;
         qn->namespaceIndex = (UA_UInt16)tmp;
         goto parse_qn_name;
     }
@@ -761,86 +757,83 @@ parse_relativepath(UA_RelativePath *rp, const char *pos, const char *end) {
     current.includeSubtypes = true; /* Follow subtypes by default */
 
     /* Get the ReferenceType and its modifiers */
-
+    
 {
 	char yych;
 	unsigned int yyaccept = 0;
-	yych = YYPEEK ();
+	yych = YYPEEK();
 	switch (yych) {
-	case 0x00:	goto yy55;
-	case '.':	goto yy59;
-	case '/':	goto yy61;
-	case '<':	goto yy63;
-	default:	goto yy57;
+		case 0x00: goto yy44;
+		case '.': goto yy47;
+		case '/': goto yy48;
+		case '<': goto yy49;
+		default: goto yy45;
 	}
-yy55:
-	YYSKIP ();
+yy44:
+	YYSKIP();
 	{ (void)pos; return UA_STATUSCODE_GOOD; }
-yy57:
-	YYSKIP ();
-yy58:
-	{ (void)pos; return UA_STATUSCODE_BADINTERNALERROR; }
-yy59:
-	YYSKIP ();
+yy45:
+	YYSKIP();
+yy46:
+	{ (void)pos; return UA_STATUSCODE_BADDECODINGERROR; }
+yy47:
+	YYSKIP();
 	{
         current.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_AGGREGATES);
         goto reftype_target;
     }
-yy61:
-	YYSKIP ();
+yy48:
+	YYSKIP();
 	{
         current.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES);
         goto reftype_target;
     }
-yy63:
+yy49:
 	yyaccept = 0;
-	YYSKIP ();
-	YYBACKUP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case 0x00:
-	case '>':	goto yy58;
-	case '&':
-		YYSTAGP (context.yyt1);
-		goto yy67;
-	default:
-		YYSTAGP (context.yyt1);
-		goto yy64;
-	}
-yy64:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case 0x00:	goto yy66;
-	case '&':	goto yy67;
-	case '>':
-		YYSTAGP (context.yyt2);
-		goto yy69;
-	default:	goto yy64;
-	}
-yy66:
-	YYRESTORE ();
+	YYSKIP();
+	YYBACKUP();
+	yych = YYPEEK();
+	switch (yych) {
+		case 0x00:
+		case '>': goto yy46;
+		case '&':
+			YYSTAGP(context.yyt1);
+			goto yy52;
+		default:
+			YYSTAGP(context.yyt1);
+			goto yy50;
+	}
+yy50:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case 0x00: goto yy51;
+		case '&': goto yy52;
+		case '>': goto yy53;
+		default: goto yy50;
+	}
+yy51:
+	YYRESTORE();
 	if (yyaccept == 0) {
-		goto yy58;
+		goto yy46;
 	} else {
-		goto yy70;
-	}
-yy67:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case 0x00:	goto yy66;
-	case '&':	goto yy67;
-	case '>':
-		YYSTAGP (context.yyt2);
-		goto yy71;
-	default:	goto yy64;
-	}
-yy69:
-	YYSKIP ();
-yy70:
+		goto yy54;
+	}
+yy52:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case 0x00: goto yy51;
+		case '&': goto yy52;
+		case '>': goto yy55;
+		default: goto yy50;
+	}
+yy53:
+	YYSKIP();
+yy54:
 	begin = context.yyt1;
-	finish = context.yyt2;
+	YYSTAGP(finish);
+	YYSHIFTSTAG(finish, -1);
 	{
         for(; begin < finish; begin++) {
             if(*begin== '#')
@@ -856,18 +849,16 @@ parse_relativepath(UA_RelativePath *rp, const char *pos, const char *end) {
         UA_QualifiedName_clear(&refqn);
         goto reftype_target;
     }
-yy71:
+yy55:
 	yyaccept = 1;
-	YYSKIP ();
-	YYBACKUP ();
-	yych = YYPEEK ();
+	YYSKIP();
+	YYBACKUP();
+	yych = YYPEEK();
 	switch (yych) {
-	case 0x00:	goto yy70;
-	case '&':	goto yy67;
-	case '>':
-		YYSTAGP (context.yyt2);
-		goto yy69;
-	default:	goto yy64;
+		case 0x00: goto yy54;
+		case '&': goto yy52;
+		case '>': goto yy53;
+		default: goto yy50;
 	}
 }
 
@@ -877,49 +868,49 @@ parse_relativepath(UA_RelativePath *rp, const char *pos, const char *end) {
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
-
+    
 {
 	char yych;
-	yych = YYPEEK ();
-	switch (yych) {
-	case 0x00:
-	case '.':
-	case '/':
-	case '<':	goto yy74;
-	case '&':
-		YYSTAGP (context.yyt1);
-		goto yy79;
-	default:
-		YYSTAGP (context.yyt1);
-		goto yy76;
-	}
-yy74:
-	YYSKIP ();
+	yych = YYPEEK();
+	switch (yych) {
+		case 0x00:
+		case '.':
+		case '/':
+		case '<': goto yy57;
+		case '&':
+			YYSTAGP(context.yyt1);
+			goto yy60;
+		default:
+			YYSTAGP(context.yyt1);
+			goto yy58;
+	}
+yy57:
+	YYSKIP();
 	{ pos--; goto add_element; }
-yy76:
-	YYSKIP ();
-	yych = YYPEEK ();
-	switch (yych) {
-	case 0x00:
-	case '.':
-	case '/':
-	case '<':	goto yy78;
-	case '&':	goto yy79;
-	default:	goto yy76;
-	}
-yy78:
+yy58:
+	YYSKIP();
+	yych = YYPEEK();
+	switch (yych) {
+		case 0x00:
+		case '.':
+		case '/':
+		case '<': goto yy59;
+		case '&': goto yy60;
+		default: goto yy58;
+	}
+yy59:
 	begin = context.yyt1;
 	{
         res = parse_refpath_qn(&current.targetName, begin, pos);
         goto add_element;
     }
-yy79:
-	YYSKIP ();
-	yych = YYPEEK ();
+yy60:
+	YYSKIP();
+	yych = YYPEEK();
 	switch (yych) {
-	case 0x00:	goto yy78;
-	case '&':	goto yy79;
-	default:	goto yy76;
+		case 0x00: goto yy59;
+		case '&': goto yy60;
+		default: goto yy58;
 	}
 }
 
diff --git a/src/ua_types_lex.re b/src/ua_types_lex.re
index 20d70f996a2..e087087c390 100644
--- a/src/ua_types_lex.re
+++ b/src/ua_types_lex.re
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *
@@ -33,6 +33,7 @@
 #define YYRESTORE() YYCURSOR = YYMARKER
 #define YYSTAGP(t) t = YYCURSOR
 #define YYSTAGN(t) t = NULL
+#define YYSHIFTSTAG(t, shift) t += shift
 
 typedef struct {
     const char *marker;
@@ -53,32 +54,32 @@ static UA_StatusCode
 parse_guid(UA_Guid *guid, const UA_Byte *s, const UA_Byte *e) {
     size_t len = (size_t)(e - s);
     if(len != 36 || s[8] != '-' || s[13] != '-' || s[23] != '-')
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
 
     UA_UInt32 tmp;
     if(UA_readNumberWithBase(s, 8, &tmp, 16) != 8)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data1 = tmp;
 
     if(UA_readNumberWithBase(&s[9], 4, &tmp, 16) != 4)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data2 = (UA_UInt16)tmp;
 
     if(UA_readNumberWithBase(&s[14], 4, &tmp, 16) != 4)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data3 = (UA_UInt16)tmp;
 
     if(UA_readNumberWithBase(&s[19], 2, &tmp, 16) != 2)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data4[0] = (UA_Byte)tmp;
 
     if(UA_readNumberWithBase(&s[21], 2, &tmp, 16) != 2)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     guid->data4[1] = (UA_Byte)tmp;
 
     for(size_t pos = 2, spos = 24; pos < 8; pos++, spos += 2) {
         if(UA_readNumberWithBase(&s[spos], 2, &tmp, 16) != 2)
-            return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_BADDECODINGERROR;
         guid->data4[pos] = (UA_Byte)tmp;
     }
 
@@ -100,7 +101,7 @@ parse_nodeid_body(UA_NodeId *id, const char *body, const char *end) {
     switch(*body) {
     case 'i': {
         if(UA_readNumber((const UA_Byte*)body+2, len, &id->identifier.numeric) != len)
-            return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_BADDECODINGERROR;
         id->identifierType = UA_NODEIDTYPE_NUMERIC;
         break;
     }
@@ -124,11 +125,11 @@ parse_nodeid_body(UA_NodeId *id, const char *body, const char *end) {
             UA_unbase64((const unsigned char*)body+2, len,
                         &id->identifier.byteString.length);
         if(!id->identifier.byteString.data && len > 0)
-            return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_BADDECODINGERROR;
         id->identifierType = UA_NODEIDTYPE_BYTESTRING;
         break;
     default:
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADDECODINGERROR;
     }
     return res;
 }
@@ -147,7 +148,7 @@ parse_nodeid(UA_NodeId *id, const char *pos, const char *end) {
             UA_UInt32 tmp;
             size_t len = (size_t)(nse - ns);
             if(UA_readNumber((const UA_Byte*)ns, len, &tmp) != len)
-                return UA_STATUSCODE_BADINTERNALERROR;
+                return UA_STATUSCODE_BADDECODINGERROR;
             id->namespaceIndex = (UA_UInt16)tmp;
         }
 
@@ -155,7 +156,7 @@ parse_nodeid(UA_NodeId *id, const char *pos, const char *end) {
         return parse_nodeid_body(id, &pos[-2], end);
     }
 
-    * { (void)pos; return UA_STATUSCODE_BADINTERNALERROR; } */
+    * { (void)pos; return UA_STATUSCODE_BADDECODINGERROR; } */
 }
 
 UA_StatusCode
@@ -182,7 +183,7 @@ parse_expandednodeid(UA_ExpandedNodeId *id, const char *pos, const char *end) {
         if(svr) {
             size_t len = (size_t)((svre) - svr);
             if(UA_readNumber((const UA_Byte*)svr, len, &id->serverIndex) != len)
-                return UA_STATUSCODE_BADINTERNALERROR;
+                return UA_STATUSCODE_BADDECODINGERROR;
         }
 
         if(nsu) {
@@ -197,7 +198,7 @@ parse_expandednodeid(UA_ExpandedNodeId *id, const char *pos, const char *end) {
             UA_UInt32 tmp;
             size_t len = (size_t)((body-1) - ns);
             if(UA_readNumber((const UA_Byte*)ns, len, &tmp) != len)
-                return UA_STATUSCODE_BADINTERNALERROR;
+                return UA_STATUSCODE_BADDECODINGERROR;
             id->nodeId.namespaceIndex = (UA_UInt16)tmp;
         }
 
@@ -205,7 +206,7 @@ parse_expandednodeid(UA_ExpandedNodeId *id, const char *pos, const char *end) {
         return parse_nodeid_body(&id->nodeId, &pos[-2], end);
     }
 
-    * { (void)pos; return UA_STATUSCODE_BADINTERNALERROR; } */
+    * { (void)pos; return UA_STATUSCODE_BADDECODINGERROR; } */
 }
 
 UA_StatusCode
@@ -260,7 +261,7 @@ parse_refpath_qn_name(UA_QualifiedName *qn, const char **pos, const char *end) {
                (**pos != '/' && **pos != '.' && **pos != '<' && **pos != '>' &&
                 **pos != ':' && **pos != '#' && **pos != '!' && **pos != '&')) {
                 UA_free(name);
-                return UA_STATUSCODE_BADINTERNALERROR;
+                return UA_STATUSCODE_BADDECODINGERROR;
             }
             c = **pos;
         }
@@ -292,7 +293,7 @@ parse_refpath_qn(UA_QualifiedName *qn, const char *pos, const char *end) {
         UA_UInt32 tmp;
         size_t len = (size_t)(nse - ns);
         if(UA_readNumber((const UA_Byte*)ns, len, &tmp) != len)
-            return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_BADDECODINGERROR;
         qn->namespaceIndex = (UA_UInt16)tmp;
         goto parse_qn_name;
     }
@@ -395,7 +396,7 @@ parse_relativepath(UA_RelativePath *rp, const char *pos, const char *end) {
     "\000" { (void)pos; return UA_STATUSCODE_GOOD; }
 
     // Unexpected input
-    * { (void)pos; return UA_STATUSCODE_BADINTERNALERROR; } */
+    * { (void)pos; return UA_STATUSCODE_BADDECODINGERROR; } */
 
     /* Get the TargetName component */
  reftype_target:

From 2b938e48b1ba14ee4e6de8d1ebbf7def56aa6188 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 7 Aug 2022 01:19:06 +0200
Subject: [PATCH 0390/1963] refactor(core): Reuse UA_Guid_parse in JSON
 decoding if available

---
 src/ua_types_encoding_json.c | 38 ++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index b91551100c4..c8c4e6403e5 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1646,16 +1646,6 @@ DECODE_JSON(Int64) {
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_UInt32 hex2int(char ch) {
-    if(ch >= '0' && ch <= '9')
-        return (UA_UInt32)(ch - '0');
-    if(ch >= 'A' && ch <= 'F')
-        return (UA_UInt32)(ch - 'A' + 10);
-    if(ch >= 'a' && ch <= 'f')
-        return (UA_UInt32)(ch - 'a' + 10);
-    return 0;
-}
-
 /* Either a STRING or NUMBER token */
 DECODE_JSON(Double) {
     CHECK_TOKEN_BOUNDS;
@@ -1723,11 +1713,25 @@ DECODE_JSON(Float) {
     return res;
 }
 
+#ifndef UA_ENABLE_PARSING
+
+static UA_UInt32
+hex2int(char ch) {
+    if(ch >= '0' && ch <= '9')
+        return (UA_UInt32)(ch - '0');
+    if(ch >= 'A' && ch <= 'F')
+        return (UA_UInt32)(ch - 'A' + 10);
+    if(ch >= 'a' && ch <= 'f')
+        return (UA_UInt32)(ch - 'a' + 10);
+    return 0;
+}
+
 /*
   Expects 36 chars in format    00000003-0009-000A-0807-060504030201
                                 | data1| |d2| |d3| |d4| |  data4   |
 */
-static UA_Guid UA_Guid_fromChars(const char* chars) {
+static UA_Guid
+UA_Guid_fromChars(const char* chars) {
     UA_Guid dst;
     UA_Guid_init(&dst);
     for(size_t i = 0; i < 8; i++)
@@ -1746,16 +1750,21 @@ static UA_Guid UA_Guid_fromChars(const char* chars) {
     }
     return dst;
 }
+#endif
 
 DECODE_JSON(Guid) {
     CHECK_TOKEN_BOUNDS;
     CHECK_STRING;
     GET_TOKEN;
 
+#ifdef UA_ENABLE_PARSING
+    /* Use the existing parsing routine if available */
+    UA_String str = {tokenSize, (UA_Byte*)tokenData};
+    parseCtx->index++;
+    return UA_Guid_parse(dst, str);
+#else
     if(tokenSize != 36)
         return UA_STATUSCODE_BADDECODINGERROR;
-
-    /* check if incorrect chars are present */
     for(size_t i = 0; i < tokenSize; i++) {
         if(!(tokenData[i] == '-' ||
              (tokenData[i] >= '0' && tokenData[i] <= '9') ||
@@ -1764,11 +1773,10 @@ DECODE_JSON(Guid) {
             return UA_STATUSCODE_BADDECODINGERROR;
         }
     }
-
     *dst = UA_Guid_fromChars(tokenData);
-
     parseCtx->index++;
     return UA_STATUSCODE_GOOD;
+#endif
 }
 
 DECODE_JSON(String) {

From 0da4358b9ee0af00e1b30fab95f2840dfb3c89a1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 7 Aug 2022 01:39:01 +0200
Subject: [PATCH 0391/1963] feat(core): Allow string-encoded NodeId and
 ExpandedNodeId within JSON

These are non-standard extensions to allow more convenient configuration
files.
---
 CHANGELOG                        | 19 +++++++++++++
 include/open62541/types.h        | 23 +++++++++++++++
 src/ua_types_encoding_json.c     | 22 +++++++++++++++
 tests/check_types_builtin_json.c | 48 ++++++++++++++++++++++++++++++++
 4 files changed, 112 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 48dfe89b599..14a808d06e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,25 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2022-08-07 Julius Pfrommer <julius.pfrommer at iosb.fraunhofer.de>
+
+ * JSON decoding based on JSON5
+
+   The JSON decoding can parse the official encoding from the OPC UA
+   specification. It now further allows the following extensions:
+
+   - The strict JSON format is relaxed to also allow the JSON5 extensions
+     (https://json5.org/). This allows for more human-readable encoding
+     and adds convenience features such as trailing commas in arrays and
+     comments within JSON documents.
+   - If `UA_ENABLE_PARSING` is set, NodeIds and ExpandedNodeIds can be given in
+     the string encoding (see `UA_NodeId_parse`). The standard encoding is to
+     express NodeIds as JSON objects.
+
+   These extensions are not intended to be used for the OPC UA protocol on the
+   network. They were rather added to allow more convenient configuration file
+   formats that also include data in the OPC UA type system.
+
 2022-07-14 Jannis Voelker <jannis.voelker at basyskom.com>
 
  * LocaleId support in the server
diff --git a/include/open62541/types.h b/include/open62541/types.h
index 0ee90efa5ba..6e5db51e680 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1208,6 +1208,29 @@ UA_decodeBinary(const UA_ByteString *inBuf,
                 void *p, const UA_DataType *type,
                 const UA_DecodeBinaryOptions *options);
 
+/**
+ * JSON En/Decoding
+ * ----------------
+ *
+ * The JSON encoding always produces an encoding that is compatible with the OPC
+ * UA specification.
+ *
+ * The JSON decoding can parse the official encoding from the OPC UA
+ * specification. It further allows the following extensions:
+ *
+ * - The strict JSON format is relaxed to also allow the JSON5 extensions
+ *   (https://json5.org/). This allows for more human-readable encoding and adds
+ *   convenience features such as trailing commas in arrays and comments within
+ *   JSON documents.
+ * - If `UA_ENABLE_PARSING` is set, NodeIds and ExpandedNodeIds can be given in
+ *   the string encoding (see `UA_NodeId_parse`). The standard encoding is to
+ *   express NodeIds as JSON objects.
+ *
+ * These extensions are not intended to be used for the OPC UA protocol on the
+ * network. They were rather added to allow more convenient configuration file
+ * formats that also include data in the OPC UA type system.
+ */
+
 #ifdef UA_ENABLE_JSON_ENCODING
 
 typedef struct {
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index c8c4e6403e5..70da1b07f35 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2028,6 +2028,17 @@ prepareDecodeNodeIdJson(UA_NodeId *dst, CtxJson *ctx, ParseCtx *parseCtx,
 }
 
 DECODE_JSON(NodeId) {
+    /* Non-standard decoding of NodeIds from the string representation */
+#ifdef UA_ENABLE_PARSING
+    if(currentTokenType(parseCtx) == CJ5_TOKEN_STRING) {
+        GET_TOKEN;
+        UA_String str = {tokenSize, (UA_Byte*)tokenData};
+        parseCtx->index++;
+        return UA_NodeId_parse(dst, str);
+    }
+#endif
+
+    /* Object representation */
     CHECK_OBJECT;
 
     u8 fieldCount = 0;
@@ -2098,6 +2109,17 @@ decodeExpandedNodeIdServerUri(void *dst, const UA_DataType *type,
 }
 
 DECODE_JSON(ExpandedNodeId) {
+    /* Non-standard decoding of ExpandedNodeIds from the string representation */
+#ifdef UA_ENABLE_PARSING
+    if(currentTokenType(parseCtx) == CJ5_TOKEN_STRING) {
+        GET_TOKEN;
+        UA_String str = {tokenSize, (UA_Byte*)tokenData};
+        parseCtx->index++;
+        return UA_ExpandedNodeId_parse(dst, str);
+    }
+#endif
+
+    /* Object representation */
     CHECK_OBJECT;
 
     u8 fieldCount = 0;
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index e06c264d924..187004b63f4 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -4415,6 +4415,26 @@ START_TEST(UA_NodeId_Nummeric_json_decode) {
 }
 END_TEST
 
+#ifdef UA_ENABLE_PARSING
+START_TEST(UA_NodeId_Nummeric_json_decode_string) {
+    // given
+    UA_NodeId out;
+    UA_NodeId_init(&out);
+    UA_ByteString buf = UA_STRING("\"i=42\"");
+    // when
+
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.identifier.numeric, 42);
+    ck_assert_uint_eq(out.namespaceIndex, 0);
+    ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_NUMERIC);
+
+    UA_NodeId_clear(&out);
+}
+END_TEST
+#endif
+
 START_TEST(UA_NodeId_Nummeric_Namespace_json_decode) {
     // given
     UA_NodeId out;
@@ -4537,6 +4557,28 @@ START_TEST(UA_ExpandedNodeId_Nummeric_json_decode) {
 }
 END_TEST
 
+#ifdef UA_ENABLE_PARSING
+START_TEST(UA_ExpandedNodeId_Nummeric_json_decode_string) {
+    // given
+    UA_ExpandedNodeId out;
+    UA_ExpandedNodeId_init(&out);
+    UA_ByteString buf = UA_STRING("\"svr=5;i=42\"");
+    // when
+
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out.nodeId.identifier.numeric, 42);
+    ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_NUMERIC);
+    ck_assert_ptr_eq(out.namespaceUri.data, NULL);
+    ck_assert_uint_eq(out.namespaceUri.length, 0);
+    ck_assert_int_eq(out.serverIndex, 5);
+
+    UA_ExpandedNodeId_clear(&out);
+}
+END_TEST
+#endif
+
 START_TEST(UA_ExpandedNodeId_String_json_decode) {
     // given
     UA_ExpandedNodeId out;
@@ -5666,6 +5708,9 @@ static Suite *testSuite_builtin_json(void) {
 
     //-NodeId-
     tcase_add_test(tc_json_decode, UA_NodeId_Nummeric_json_decode);
+#ifdef UA_ENABLE_PARSING
+    tcase_add_test(tc_json_decode, UA_NodeId_Nummeric_json_decode_string);
+#endif
     tcase_add_test(tc_json_decode, UA_NodeId_Nummeric_Namespace_json_decode);
 
     tcase_add_test(tc_json_decode, UA_NodeId_String_json_decode);
@@ -5677,6 +5722,9 @@ static Suite *testSuite_builtin_json(void) {
 
     //expandednodeid
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_Nummeric_json_decode);
+#ifdef UA_ENABLE_PARSING
+    tcase_add_test(tc_json_decode, UA_ExpandedNodeId_Nummeric_json_decode_string);
+#endif
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_String_json_decode);
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_String_Namespace_json_decode);
     tcase_add_test(tc_json_decode, UA_ExpandedNodeId_String_NamespaceAsIndex_json_decode);

From 2629ca9a700e5f20bc5655cfd978fd79a01b5593 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 7 Aug 2022 01:40:47 +0200
Subject: [PATCH 0392/1963] refactor(core): Remove unused jsmn library from
 dependencies

---
 CMakeLists.txt    |   6 +-
 deps/jsmn/LICENSE |  20 ---
 deps/jsmn/jsmn.c  | 345 ----------------------------------------------
 deps/jsmn/jsmn.h  |  77 -----------
 4 files changed, 2 insertions(+), 446 deletions(-)
 delete mode 100644 deps/jsmn/LICENSE
 delete mode 100644 deps/jsmn/jsmn.c
 delete mode 100644 deps/jsmn/jsmn.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d290a326131..581170d0cf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1153,14 +1153,12 @@ if(UA_ENABLE_JSON_ENCODING)
     if(UA_ENABLE_PUBSUB)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage_json.c)
     endif()
-    list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/jsmn/jsmn.h
-                                 ${PROJECT_SOURCE_DIR}/deps/cj5.h
+    list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/cj5.h
                                  ${PROJECT_SOURCE_DIR}/deps/string_escape.h
                                  ${PROJECT_SOURCE_DIR}/deps/itoa.h
                                  ${PROJECT_SOURCE_DIR}/deps/parse_num.h
                                  ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.h)
-    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/jsmn/jsmn.c
-                            ${PROJECT_SOURCE_DIR}/deps/cj5.c
+    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/cj5.c
                             ${PROJECT_SOURCE_DIR}/deps/string_escape.c
                             ${PROJECT_SOURCE_DIR}/deps/itoa.c
                             ${PROJECT_SOURCE_DIR}/deps/parse_num.c
diff --git a/deps/jsmn/LICENSE b/deps/jsmn/LICENSE
deleted file mode 100644
index c84fb2e973d..00000000000
--- a/deps/jsmn/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Serge A. Zaitsev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/deps/jsmn/jsmn.c b/deps/jsmn/jsmn.c
deleted file mode 100644
index 7304f39ed92..00000000000
--- a/deps/jsmn/jsmn.c
+++ /dev/null
@@ -1,345 +0,0 @@
-#include "jsmn.h"
-
-#define JSMN_STRICT
-
-/* what is the next expected element? */
-enum JSMN_NEXT {
-    JSMN_KEY = 0,
-    JSMN_COLON,
-    JSMN_VALUE,
-    JSMN_COMMA
-};
-
-/**
- * Allocates a fresh unused token from the token pull.
- */
-static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
-		jsmntok_t *tokens, size_t num_tokens) {
-	jsmntok_t *tok;
-	if (parser->toknext >= num_tokens) {
-		return NULL;
-	}
-	tok = &tokens[parser->toknext++];
-	tok->start = tok->end = -1;
-	tok->size = 0;
-#ifdef JSMN_PARENT_LINKS
-	tok->parent = -1;
-#endif
-	return tok;
-}
-
-/**
- * Fills token type and boundaries.
- */
-static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
-                            int start, int end) {
-	token->type = type;
-	token->start = start;
-	token->end = end;
-	token->size = 0;
-}
-
-/**
- * Fills next available token with JSON primitive.
- */
-static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
-		size_t len, jsmntok_t *tokens, size_t num_tokens) {
-	jsmntok_t *token;
-	int start;
-
-	start = (int)parser->pos;
-
-	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-		switch (js[parser->pos]) {
-#ifndef JSMN_STRICT
-			/* In strict mode primitive must be followed by "," or "}" or "]" */
-			case ':':
-#endif
-			case '\t' : case '\r' : case '\n' : case ' ' :
-			case ','  : case ']'  : case '}' :
-				goto found;
-		}
-		if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
-			parser->pos = (unsigned int)start;
-			return JSMN_ERROR_INVAL;
-		}
-	}
-#ifdef JSMN_STRICT
-	/* In strict mode primitive must be followed by a comma/object/array */
-	parser->pos = (unsigned int)start;
-	return JSMN_ERROR_PART;
-#endif
-
-found:
-	if (tokens == NULL) {
-		parser->pos--;
-		return 0;
-	}
-	token = jsmn_alloc_token(parser, tokens, num_tokens);
-	if (token == NULL) {
-		parser->pos = (unsigned int)start;
-		return JSMN_ERROR_NOMEM;
-	}
-	jsmn_fill_token(token, JSMN_PRIMITIVE, start, (int)parser->pos);
-#ifdef JSMN_PARENT_LINKS
-	token->parent = parser->toksuper;
-#endif
-	parser->pos--;
-	return 0;
-}
-
-/**
- * Fills next token with JSON string.
- */
-static int jsmn_parse_string(jsmn_parser *parser, const char *js,
-		size_t len, jsmntok_t *tokens, size_t num_tokens) {
-	jsmntok_t *token;
-
-	unsigned int start = parser->pos;
-
-	parser->pos++;
-
-	/* Skip starting quote */
-	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-		char c = js[parser->pos];
-
-		/* Quote: end of string */
-		if (c == '\"') {
-			if (tokens == NULL) {
-				return 0;
-			}
-			token = jsmn_alloc_token(parser, tokens, num_tokens);
-			if (token == NULL) {
-				parser->pos = start;
-				return JSMN_ERROR_NOMEM;
-			}
-			jsmn_fill_token(token, JSMN_STRING, (int)(start+1), (int)parser->pos);
-#ifdef JSMN_PARENT_LINKS
-			token->parent = parser->toksuper;
-#endif
-			return 0;
-		}
-
-		/* Backslash: Quoted symbol expected */
-		if (c == '\\' && parser->pos + 1 < len) {
-			int i;
-			parser->pos++;
-			switch (js[parser->pos]) {
-				/* Allowed escaped symbols */
-				case '\"': case '/' : case '\\' : case 'b' :
-				case 'f' : case 'r' : case 'n'  : case 't' :
-					break;
-				/* Allows escaped symbol \uXXXX */
-				case 'u':
-					parser->pos++;
-					for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
-						/* If it isn't a hex character we have an error */
-						if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
-									(js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
-									(js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
-							parser->pos = start;
-							return JSMN_ERROR_INVAL;
-						}
-						parser->pos++;
-					}
-					parser->pos--;
-					break;
-				/* Unexpected symbol */
-				default:
-					parser->pos = start;
-					return JSMN_ERROR_INVAL;
-			}
-		}
-	}
-	parser->pos = start;
-	return JSMN_ERROR_PART;
-}
-
-/**
- * Parse JSON string and fill tokens.
- */
-int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
-               jsmntok_t *tokens, unsigned int num_tokens) {
-	int r;
-	int i;
-	jsmntok_t *token;
-	unsigned int count = parser->toknext;
-    enum JSMN_NEXT next = JSMN_VALUE;
-
-	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-		char c;
-		jsmntype_t type;
-
-		c = js[parser->pos];
-		switch (c) {
-			case '{': case '[':
-				count++;
-				if (tokens == NULL) {
-					break;
-				}
-                if(next != JSMN_VALUE)
-                    return JSMN_ERROR_INVAL;
-				token = jsmn_alloc_token(parser, tokens, num_tokens);
-				if (token == NULL)
-					return JSMN_ERROR_NOMEM;
-				if (parser->toksuper != -1) {
-					tokens[parser->toksuper].size++;
-#ifdef JSMN_PARENT_LINKS
-					token->parent = parser->toksuper;
-#endif
-				}
-				token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
-				token->start = (int)parser->pos;
-				parser->toksuper = (int)parser->toknext - 1;
-                if(c == '{')
-                    next = JSMN_KEY;
-                else
-                    next = JSMN_VALUE;
-				break;
-			case '}': case ']':
-				if (tokens == NULL)
-					break;
-				type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
-                if(type == JSMN_OBJECT && next != JSMN_KEY && next != JSMN_COMMA)
-                    return JSMN_ERROR_INVAL;
-                else if (type == JSMN_ARRAY && next != JSMN_VALUE && next != JSMN_COMMA)
-                    return JSMN_ERROR_INVAL;
-#ifdef JSMN_PARENT_LINKS
-				if (parser->toknext < 1) {
-					return JSMN_ERROR_INVAL;
-				}
-				token = &tokens[parser->toknext - 1];
-				for (;;) {
-					if (token->start != -1 && token->end == -1) {
-						if (token->type != type) {
-							return JSMN_ERROR_INVAL;
-					}
-						token->end = (int)parser->pos + 1;
-						parser->toksuper = token->parent;
-						break;
-					}
-					if (token->parent == -1) {
-						if(token->type != type || parser->toksuper == -1) {
-							return JSMN_ERROR_INVAL;
-						}
-						break;
-					}
-					token = &tokens[token->parent];
-				}
-#else
-                /* Find the surrounding token and close it */
-				for (i = (int)parser->toknext - 1; i >= 0; i--) {
-					token = &tokens[i];
-					if (token->start != -1 && token->end == -1) {
-						if (token->type != type)
-							return JSMN_ERROR_INVAL;
-						parser->toksuper = -1;
-						token->end = (int)parser->pos + 1;
-						break;
-					}
-				}
-				/* Error if unmatched closing bracket */
-				if (i == -1)
-                    return JSMN_ERROR_INVAL;
-                /* Find the new super token (first not closed) */
-				for (; i >= 0; i--) {
-					token = &tokens[i];
-					if (token->start != -1 && token->end == -1) {
-						parser->toksuper = i;
-						break;
-					}
-				}
-#endif
-                next = JSMN_COMMA;
-				break;
-			case '\"':
-                if(next == JSMN_KEY) {
-                    next = JSMN_COLON;
-                } else if(next == JSMN_VALUE) {
-                    next = JSMN_COMMA;
-                    if (parser->toksuper != -1 && tokens != NULL)
-                        tokens[parser->toksuper].size++;
-                } else {
-                    return JSMN_ERROR_INVAL;
-                }
-				r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
-				if (r < 0) return r;
-				count++;
-				break;
-			case '\t' : case '\r' : case '\n' : case ' ':
-				break;
-			case ':':
-                if(next != JSMN_COLON) /* Must expect a colon */
-                    return JSMN_ERROR_INVAL;
-                /* The current toksuper must be an object */
-                if(parser->toknext == 0 ||
-                   tokens[parser->toksuper].type != JSMN_OBJECT)
-                    return JSMN_ERROR_INVAL;
-                /* Previous token must be a string */
-                if(tokens[parser->toknext - 1].type != JSMN_STRING)
-                    return JSMN_ERROR_INVAL;
-                next = JSMN_VALUE;
-				break;
-			case ',':
-                if(next != JSMN_COMMA) /* Must expect a comma */
-                    return JSMN_ERROR_INVAL;
-				if(parser->toksuper == -1)
-                    return JSMN_ERROR_INVAL;
-                if(tokens &&
-                   tokens[parser->toksuper].type != JSMN_ARRAY &&
-                   tokens[parser->toksuper].type != JSMN_OBJECT)
-                    return JSMN_ERROR_INVAL;
-                if(tokens && tokens[parser->toksuper].type == JSMN_OBJECT)
-                    next = JSMN_KEY;
-                else
-                    next = JSMN_VALUE;
-				break;
-#ifdef JSMN_STRICT
-			/* In strict mode primitives are: numbers and booleans */
-			case '-': case '0': case '1' : case '2': case '3' : case '4':
-			case '5': case '6': case '7' : case '8': case '9':
-			case 't': case 'f': case 'n' :
-#else
-			/* In non-strict mode every unquoted value is a primitive */
-			default:
-#endif
-                if(next != JSMN_VALUE)
-                    return JSMN_ERROR_INVAL;
-				r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
-				if (r < 0) return r;
-				count++;
-				if (parser->toksuper != -1 && tokens != NULL)
-					tokens[parser->toksuper].size++;
-                next = JSMN_COMMA;
-				break;
-
-#ifdef JSMN_STRICT
-			/* Unexpected char in strict mode */
-			default:
-				return JSMN_ERROR_INVAL;
-#endif
-		}
-	}
-
-	if (tokens != NULL) {
-		for (i = (int)parser->toknext - 1; i >= 0; i--) {
-			/* Unmatched opened object or array */
-			if (tokens[i].start != -1 && tokens[i].end == -1) {
-				return JSMN_ERROR_PART;
-			}
-		}
-	}
-
-	return (int)count;
-}
-
-/**
- * Creates a new parser based over a given  buffer with an array of tokens
- * available.
- */
-void jsmn_init(jsmn_parser *parser) {
-	parser->pos = 0;
-	parser->toknext = 0;
-	parser->toksuper = -1;
-}
-
diff --git a/deps/jsmn/jsmn.h b/deps/jsmn/jsmn.h
deleted file mode 100644
index 055687fd3fc..00000000000
--- a/deps/jsmn/jsmn.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef __JSMN_H_
-#define __JSMN_H_
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * JSON type identifier. Basic types are:
- * 	o Object
- * 	o Array
- * 	o String
- * 	o Other primitive: number, boolean (true/false) or null
- */
-typedef enum {
-	JSMN_UNDEFINED = 0,
-	JSMN_OBJECT = 1,
-	JSMN_ARRAY = 2,
-	JSMN_STRING = 3,
-	JSMN_PRIMITIVE = 4,
-        JSMN_PROCESSED = 5
-} jsmntype_t;
-
-enum jsmnerr {
-	/* Not enough tokens were provided */
-	JSMN_ERROR_NOMEM = -1,
-	/* Invalid character inside JSON string */
-	JSMN_ERROR_INVAL = -2,
-	/* The string is not a full JSON packet, more bytes expected */
-	JSMN_ERROR_PART = -3
-};
-
-/**
- * JSON token description.
- * type		type (object, array, string etc.)
- * start	start position in JSON data string
- * end		end position in JSON data string
- */
-typedef struct {
-	jsmntype_t type;
-	int start;
-	int end;
-	int size;
-#ifdef JSMN_PARENT_LINKS
-	int parent;
-#endif
-} jsmntok_t;
-
-/**
- * JSON parser. Contains an array of token blocks available. Also stores
- * the string being parsed now and current position in that string
- */
-typedef struct {
-	unsigned int pos; /* offset in the JSON string */
-	unsigned int toknext; /* next token to allocate */
-	int toksuper; /* superior token node, e.g parent object or array */
-} jsmn_parser;
-
-/**
- * Create JSON parser over an array of tokens
- */
-void jsmn_init(jsmn_parser *parser);
-
-/**
- * Run JSON parser. It parses a JSON data string into and array of tokens, each describing
- * a single JSON object.
- */
-int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
-		jsmntok_t *tokens, unsigned int num_tokens);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __JSMN_H_ */

From a48485c745cfea163258b028bf5592ae2addbc0c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 9 Aug 2022 00:31:10 +0200
Subject: [PATCH 0393/1963] refactor(core): Reduce the required
 stack-allocation for JSON parsing

---
 src/ua_types_encoding_json.c | 50 ++++++++++++++++++++----------------
 src/ua_types_encoding_json.h |  2 +-
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 70da1b07f35..b4729310a26 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2881,7 +2881,8 @@ const decodeJsonSignature decodeJsonJumpTable[UA_DATATYPEKINDS] = {
 };
 
 status
-tokenize(ParseCtx *parseCtx, CtxJson *ctx, const UA_ByteString *src, size_t tokensSize) {
+tokenize(ParseCtx *parseCtx, CtxJson *ctx,
+         const UA_ByteString *src, size_t tokensSize) {
     /* Set up the context */
     ctx->pos = &src->data[0];
     ctx->end = &src->data[src->length];
@@ -2892,11 +2893,23 @@ tokenize(ParseCtx *parseCtx, CtxJson *ctx, const UA_ByteString *src, size_t toke
     /* Tokenize */
     cj5_result r = cj5_parse((char*)src->data, (unsigned int)src->length,
                              parseCtx->tokenArray, (unsigned int)tokensSize);
-    if(r.error == CJ5_ERROR_OVERFLOW)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    /* Handle overflow error by allocating the number of tokens the parser would
+     * have needed */
+    if(r.error == CJ5_ERROR_OVERFLOW &&
+       tokensSize != r.num_tokens) {
+        parseCtx->tokenArray = (cj5_token*)
+            UA_malloc(sizeof(cj5_token) * r.num_tokens);
+        if(!parseCtx->tokenArray)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        return tokenize(parseCtx, ctx, src, r.num_tokens);
+    }
+
+    /* Cannot recover from other errors */
     if(r.error != CJ5_ERROR_NONE)
         return UA_STATUSCODE_BADDECODINGERROR;
 
+    /* Set the parsed number of tokens and return */
     parseCtx->tokenCount = r.num_tokens;
     return UA_STATUSCODE_GOOD;
 }
@@ -2912,7 +2925,7 @@ UA_decodeJson(const UA_ByteString *src, void *dst, const UA_DataType *type,
         return UA_STATUSCODE_BADARGUMENTSMISSING;
 
     /* Set up the context */
-    cj5_token tokens[UA_JSON_MAXTOKENCOUNT / 8];
+    cj5_token tokens[UA_JSON_MAXTOKENCOUNT];
     CtxJson ctx;
     memset(&ctx, 0, sizeof(ctx));
     ParseCtx parseCtx;
@@ -2928,32 +2941,25 @@ UA_decodeJson(const UA_ByteString *src, void *dst, const UA_DataType *type,
     }
 
     /* Decode */
-    status ret = tokenize(&parseCtx, &ctx, src, UA_JSON_MAXTOKENCOUNT / 8);
+    status ret = tokenize(&parseCtx, &ctx, src, UA_JSON_MAXTOKENCOUNT);
+    if(ret != UA_STATUSCODE_GOOD)
+        goto cleanup;
 
-    /* Allocate larger token array on the heap and try again */
-    if(ret == UA_STATUSCODE_BADOUTOFMEMORY) {
-        parseCtx.tokenArray = (cj5_token*)
-            UA_malloc(sizeof(cj5_token) * UA_JSON_MAXTOKENCOUNT);
-        if(!parseCtx.tokenArray)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        ret = tokenize(&parseCtx, &ctx, src, UA_JSON_MAXTOKENCOUNT);
-    }
+    memset(dst, 0, type->memSize); /* Initialize the value */
+    ret = decodeJsonJumpTable[type->typeKind](dst, type, &ctx, &parseCtx);
 
-    if(ret == UA_STATUSCODE_GOOD) {
-        memset(dst, 0, type->memSize); /* Initialize the value */
-        ret = decodeJsonJumpTable[type->typeKind](dst, type, &ctx, &parseCtx);
+    /* Sanity check if all tokens were processed */
+    if(parseCtx.index != parseCtx.tokenCount &&
+       parseCtx.index != parseCtx.tokenCount - 1)
+        ret = UA_STATUSCODE_BADDECODINGERROR;
 
-        /* Sanity check if all Tokens were processed */
-        if(parseCtx.index != parseCtx.tokenCount &&
-           parseCtx.index != parseCtx.tokenCount - 1)
-            ret = UA_STATUSCODE_BADDECODINGERROR;
-    }
+ cleanup:
 
     /* Free token array on the heap */
     if(parseCtx.tokenArray != tokens)
         UA_free(parseCtx.tokenArray);
 
     if(ret != UA_STATUSCODE_GOOD)
-        UA_clear(dst, type); /* Clean up */
+        UA_clear(dst, type);
     return ret;
 }
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 48afabf430a..0c2d75e403d 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -19,7 +19,7 @@
 
 _UA_BEGIN_DECLS
 
-#define UA_JSON_MAXTOKENCOUNT 2048
+#define UA_JSON_MAXTOKENCOUNT 256
 #define UA_JSON_ENCODING_MAX_RECURSION 100
 
 typedef struct {

From 41128e97dcc812ec414c988ad8045e571e6a270f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 10 Aug 2022 14:41:39 +0200
Subject: [PATCH 0394/1963] fix(core): Variants must not contain Variants in
 the JSON ExtensionObject unwrapping

---
 src/ua_types_encoding_json.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index b4729310a26..20e2a4e6168 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1065,18 +1065,24 @@ ENCODE_JSON(Variant) {
     const bool isArray = src->arrayLength > 0 || src->data <= UA_EMPTY_ARRAY_SENTINEL;
     const bool hasDimensions = isArray && src->arrayDimensionsSize > 0;
 
+    /* We cannot directly encode a variant inside a variant (but arrays of
+     * variant are possible) */
+    UA_Boolean wrapEO = !isBuiltin;
+    if(src->type == &UA_TYPES[UA_TYPES_VARIANT] && !isArray)
+        wrapEO = true;
+
     status ret = writeJsonObjStart(ctx);
 
     if(ctx->useReversible) {
         /* Write the NodeId */
         UA_UInt32 typeId = src->type->typeId.identifier.numeric;
-        if(!isBuiltin)
+        if(wrapEO)
             typeId = UA_TYPES[UA_TYPES_EXTENSIONOBJECT].typeId.identifier.numeric;
         ret |= writeJsonKey(ctx, UA_JSONKEY_TYPE);
         ret |= ENCODE_DIRECT_JSON(&typeId, UInt32);
 
         /* Write the reversible form body */
-        if(!isBuiltin) {
+        if(wrapEO) {
             /* Not builtin. Can it be encoded? Wrap in extension object. */
             if(src->arrayDimensionsSize > 1)
                 return UA_STATUSCODE_BADNOTIMPLEMENTED;
@@ -1101,7 +1107,7 @@ ENCODE_JSON(Variant) {
          * containing only the value of the Body field. The Type and Dimensions
          * fields are dropped. Multi-dimensional arrays are encoded as a multi
          * dimensional JSON array as described in 5.4.5. */
-        if(!isBuiltin) {
+        if(wrapEO) {
             /* Not builtin. Can it be encoded? Wrap in extension object. */
             if(src->arrayDimensionsSize > 1)
                 return UA_STATUSCODE_BADNOTIMPLEMENTED;
@@ -2579,8 +2585,10 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
         parseUInt64(extObjEncoding, size, &encoding);
     }
 
-    if(encoding == 0 && typeOfBody != NULL) {
-        /* Found a valid type and it is structure encoded so it can be unwrapped */
+    /* If we have the content in JSON encoding and the type is known -> Unwrap
+     * the ExtensionObject */
+    if(encoding == 0 && typeOfBody != NULL &&
+       typeOfBody != &UA_TYPES[UA_TYPES_VARIANT]) {
         dst->data = UA_new(typeOfBody);
         if(!dst->data)
             return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -2604,6 +2612,7 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
                                                   * of the ExtensionObject */
         ret = ExtensionObject_decodeJson((UA_ExtensionObject*)dst->data, NULL, ctx, parseCtx);
     }
+
     if(ret != UA_STATUSCODE_GOOD) {
         UA_delete(dst->data, dst->type);
         dst->data = NULL;

From 442de258039850b0fb489f4165e8284b3b1ac509 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 10 Aug 2022 14:55:34 +0200
Subject: [PATCH 0395/1963] refactor(core): Simplify the JSON Variant encoding

---
 src/ua_types_encoding_json.c | 65 ++++++++++++++----------------------
 1 file changed, 25 insertions(+), 40 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 20e2a4e6168..83dcd590d5e 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1074,59 +1074,44 @@ ENCODE_JSON(Variant) {
     status ret = writeJsonObjStart(ctx);
 
     if(ctx->useReversible) {
-        /* Write the NodeId */
+        /* Write the NodeId for the reversible form */
         UA_UInt32 typeId = src->type->typeId.identifier.numeric;
         if(wrapEO)
             typeId = UA_TYPES[UA_TYPES_EXTENSIONOBJECT].typeId.identifier.numeric;
         ret |= writeJsonKey(ctx, UA_JSONKEY_TYPE);
         ret |= ENCODE_DIRECT_JSON(&typeId, UInt32);
+    }
 
-        /* Write the reversible form body */
-        if(wrapEO) {
-            /* Not builtin. Can it be encoded? Wrap in extension object. */
-            if(src->arrayDimensionsSize > 1)
-                return UA_STATUSCODE_BADNOTIMPLEMENTED;
-            ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-            ret |= Variant_encodeJsonWrapExtensionObject(src, isArray, ctx);
-        } else if(!isArray) {
-            ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-            ret |= encodeJsonInternal(src->data, src->type, ctx);
-        } else {
-            ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-            ret |= encodeJsonArray(ctx, src->data, src->arrayLength, src->type);
-        }
-
-        /* Write the dimensions */
+    if(wrapEO) {
+        /* Not builtin. Can it be encoded? Wrap in extension object. */
+        if(src->arrayDimensionsSize > 1)
+            return UA_STATUSCODE_BADNOTIMPLEMENTED;
+        ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
+        ret |= Variant_encodeJsonWrapExtensionObject(src, isArray, ctx);
+    } else if(!isArray) {
+        /* Unwrapped scalar */
+        ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
+        ret |= encodeJsonInternal(src->data, src->type, ctx);
+    } else if(ctx->useReversible) {
+        /* Reversible array */
+        ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
+        ret |= encodeJsonArray(ctx, src->data, src->arrayLength, src->type);
         if(hasDimensions) {
             ret |= writeJsonKey(ctx, UA_JSONKEY_DIMENSION);
             ret |= encodeJsonArray(ctx, src->arrayDimensions, src->arrayDimensionsSize,
                                    &UA_TYPES[UA_TYPES_INT32]);
         }
     } else {
-        /* Non-Reversible form. Variant values encoded as a JSON object
-         * containing only the value of the Body field. The Type and Dimensions
-         * fields are dropped. Multi-dimensional arrays are encoded as a multi
-         * dimensional JSON array as described in 5.4.5. */
-        if(wrapEO) {
-            /* Not builtin. Can it be encoded? Wrap in extension object. */
-            if(src->arrayDimensionsSize > 1)
-                return UA_STATUSCODE_BADNOTIMPLEMENTED;
-            ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-            ret |= Variant_encodeJsonWrapExtensionObject(src, isArray, ctx);
-        } else if(!isArray) {
-            ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-            ret |= encodeJsonInternal(src->data, src->type, ctx);
+        /* Non-Reversible array */
+        ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
+        if(src->arrayDimensionsSize > 1) {
+            size_t index = 0;
+            size_t dimensionIndex = 0;
+            ret |= addMultiArrayContentJSON(ctx, src->data, src->type, &index,
+                                            src->arrayDimensions, dimensionIndex,
+                                            src->arrayDimensionsSize);
         } else {
-            ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-            if(src->arrayDimensionsSize > 1) {
-                size_t index = 0;
-                size_t dimensionIndex = 0;
-                ret |= addMultiArrayContentJSON(ctx, src->data, src->type, &index,
-                                                src->arrayDimensions, dimensionIndex,
-                                                src->arrayDimensionsSize);
-            } else {
-                ret |= encodeJsonArray(ctx, src->data, src->arrayLength, src->type);
-            }
+            ret |= encodeJsonArray(ctx, src->data, src->arrayLength, src->type);
         }
     }
 

From bf166b5fa2d6f1119724d1bcacef8a7f08c39778 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 10 Aug 2022 15:01:34 +0200
Subject: [PATCH 0396/1963] refactor(core): Small doc improvements in
 open62541/types.h

---
 include/open62541/types.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 6e5db51e680..b49a9bc6d05 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1174,10 +1174,11 @@ UA_Order UA_EXPORT
 UA_order(const void *p1, const void *p2, const UA_DataType *type);
 
 /**
- * Encoding/Decoding
- * ^^^^^^^^^^^^^^^^^^
- * Encoding and decoding routines for the available formats. For all formats
- * the _calcSize, _encode and _decode methods are provided. */
+ * Binary Encoding/Decoding
+ * ------------------------
+ *
+ * Encoding and decoding routines for the binary format. For the binary decoding
+ * additional data types can be forwarded. */
 
 /* Returns the number of bytes the value p takes in binary encoding. Returns
  * zero if an error occurs. */

From f39c262234faf2081beec28b3724363925ec6881 Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Mon, 15 Aug 2022 15:20:35 +0200
Subject: [PATCH 0397/1963] feat(pubsub): Integrate MQTT Subscriber
 functionality and add an MQTT Subscriber example. (#5234)

---
 CMakeLists.txt                                |  24 +-
 arch/win32/ua_architecture.h                  |   3 +-
 examples/CMakeLists.txt                       |   1 +
 ...erver_pubsub_subscribe_custom_monitoring.c |   2 +-
 .../pubsub_subscribe_standalone_dataset.c     |   2 +-
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |   6 +-
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   | 390 ++++++++++++++++++
 .../pubsub/tutorial_pubsub_subscribe_raw.c    |   2 +-
 include/open62541/plugin/pubsub.h             |   1 +
 include/open62541/server_pubsub.h             |   8 +-
 plugins/mqtt/ua_mqtt-c_adapter.c              |  92 +++--
 plugins/mqtt/ua_mqtt-c_adapter.h              |   1 +
 plugins/ua_pubsub_mqtt.c                      |  19 +-
 src/pubsub/ua_pubsub.h                        |  13 +-
 src/pubsub/ua_pubsub_config.c                 |   2 +-
 src/pubsub/ua_pubsub_manager.c                |  68 ++-
 src/pubsub/ua_pubsub_manager.h                |  13 +
 src/pubsub/ua_pubsub_networkmessage_json.c    |  10 +-
 src/pubsub/ua_pubsub_reader.c                 |  64 ++-
 src/pubsub/ua_pubsub_readergroup.c            |   8 +-
 src/pubsub/ua_pubsub_writergroup.c            |   3 +
 tests/CMakeLists.txt                          |   1 +
 tests/pubsub/check_pubsub_get_state.c         |   2 +-
 tests/pubsub/check_pubsub_mqtt.c              | 337 +++++++++++++++
 tests/pubsub/check_pubsub_publisherid.c       |   2 +-
 .../check_pubsub_subscribe_msgrcvtimeout.c    |   2 +-
 26 files changed, 997 insertions(+), 79 deletions(-)
 create mode 100644 examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
 create mode 100644 tests/pubsub/check_pubsub_mqtt.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 581170d0cf5..5a9f8f4ec96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -452,18 +452,22 @@ if(UA_ENABLE_PUBSUB_MQTT)
         if(NOT GIT_SUBMOD_RESULT EQUAL "0")
             message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}")
         endif()
-    else()
-        # Warn if run in Windows
-        if(WIN32)
-            MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL")
-        endif()
-        if(NOT UA_ENABLE_PUBSUB)
+    endif()
+    # Warn if run in Windows
+    if(WIN32)
+        MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL")
+    endif()
+    # Warn if run in Windows and the MSVC Version is lower than VS 12.0
+    if(WIN32 AND MSVC_VERSION LESS 1800)
+        message(WARNING "The MSVC version does not support the C99 standard. Therefore the file stdint.h will be included.")
+        configure_file(${PROJECT_SOURCE_DIR}/deps/ms_stdint.h "${PROJECT_BINARY_DIR}/src_generated/stdint.h" COPYONLY)
+    endif()
+    if(NOT UA_ENABLE_PUBSUB)
         message(FATAL_ERROR "Mqtt cannot be used with disabled PubSub function.")
-        endif()
-        configure_file(${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h "${PROJECT_BINARY_DIR}/src_generated/mqtt.h" COPYONLY)
-        configure_file(${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt_pal.h "${PROJECT_BINARY_DIR}/src_generated/mqtt_pal.h" COPYONLY)
-        configure_file(${PROJECT_SOURCE_DIR}/plugins/mqtt/templates/posix_sockets.h "${PROJECT_BINARY_DIR}/src_generated/posix_sockets.h" COPYONLY)
     endif()
+    configure_file(${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h "${PROJECT_BINARY_DIR}/src_generated/mqtt.h" COPYONLY)
+    configure_file(${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt_pal.h "${PROJECT_BINARY_DIR}/src_generated/mqtt_pal.h" COPYONLY)
+    configure_file(${PROJECT_SOURCE_DIR}/plugins/mqtt/templates/posix_sockets.h "${PROJECT_BINARY_DIR}/src_generated/posix_sockets.h" COPYONLY)
 endif()
 
 option(UA_ENABLE_MQTT_TLS_OPENSSL "Enable TLS support for publish/subscribe with mqtt (use OpenSSL)" OFF)
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index d39896f6135..5f9a17098c8 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -38,6 +38,7 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <ws2tcpip.h>
+#include <BaseTsd.h>
 
 #if defined (_MSC_VER) || defined(__clang__)
 # ifndef UNDER_CE
@@ -50,7 +51,7 @@
 #endif
 
 #ifndef _SSIZE_T_DEFINED
-# define ssize_t int
+typedef SSIZE_T ssize_t;
 #endif
 
 #define OPTVAL_TYPE int
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 141d0a3c1cb..2bb3b2cec4e 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -260,6 +260,7 @@ if(UA_ENABLE_PUBSUB)
         if(NOT WIN32)
             include_directories(${PROJECT_SOURCE_DIR}/../plugins)
             add_example(tutorial_pubsub_mqtt_publish pubsub/tutorial_pubsub_mqtt_publish.c)
+            add_example(tutorial_pubsub_mqtt_subscribe pubsub/tutorial_pubsub_mqtt_subscribe.c)
         endif()
     endif()
     if(UA_ENABLE_PUBSUB_FILE_CONFIG)
diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index 1086fb3adad..61be47db067 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -87,7 +87,7 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
     }
-    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier);
+    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
     return retval;
 }
 
diff --git a/examples/pubsub/pubsub_subscribe_standalone_dataset.c b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
index 6a9e021b89c..e1ba8ec9214 100644
--- a/examples/pubsub/pubsub_subscribe_standalone_dataset.c
+++ b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
@@ -106,7 +106,7 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     if(retval != UA_STATUSCODE_GOOD) {
         return retval;
     }
-    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier);
+    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
     return retval;
 }
 
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 0eccf7f4f99..2aa94a6eefb 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -62,6 +62,7 @@
 // #define EXAMPLE_USE_MQTT_LOGIN
 
 #ifdef EXAMPLE_USE_MQTT_LOGIN
+#define LOGIN_OPTION_COUNT           2
 #define USERNAME_OPTION_NAME         "mqttUsername"
 #define PASSWORD_OPTION_NAME         "mqttPassword"
 #define MQTT_USERNAME                "open62541user"
@@ -72,6 +73,7 @@
 //#define EXAMPLE_USE_MQTT_TLS
 
 #ifdef EXAMPLE_USE_MQTT_TLS
+#define TLS_OPTION_COUNT                2
 #define USE_TLS_OPTION_NAME             "mqttUseTLS"
 #define MQTT_CA_FILE_PATH_OPTION_NAME   "mqttCaFilePath"
 #define CA_FILE_PATH                    "/path/to/server.cert"
@@ -109,10 +111,10 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
     /* configure options, set mqtt client id */
     const int connectionOptionsCount = 1
 #ifdef EXAMPLE_USE_MQTT_LOGIN
-    + 2
+    + LOGIN_OPTION_COUNT
 #endif
 #ifdef EXAMPLE_USE_MQTT_TLS
-    + 2
+    + TLS_OPTION_COUNT
 #endif
     ;
 
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
new file mode 100644
index 00000000000..eae41a4946f
--- /dev/null
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -0,0 +1,390 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ *
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
+ */
+
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <signal.h>
+
+#include <open62541/plugin/pubsub_mqtt.h>
+#include "ua_pubsub_manager.h"
+
+#define CONNECTION_NAME               "MQTT Subscriber Connection"
+#define TRANSPORT_PROFILE_URI         "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
+#define MQTT_CLIENT_ID                "TESTCLIENTPUBSUBMQTTSUBSCRIBE"
+#define CONNECTIONOPTION_NAME         "mqttClientId"
+#define SUBSCRIBER_TOPIC              "customTopic"
+#define SUBSCRIBER_METADATAQUEUENAME  "MetaDataTopic"
+#define SUBSCRIBER_METADATAUPDATETIME 0
+#define BROKER_ADDRESS_URL            "opc.mqtt://127.0.0.1:1883"
+#define SUBSCRIBE_INTERVAL            500
+
+// Uncomment the following line to enable MQTT login for the example
+// #define EXAMPLE_USE_MQTT_LOGIN
+
+#ifdef EXAMPLE_USE_MQTT_LOGIN
+#define LOGIN_OPTION_COUNT           2
+#define USERNAME_OPTION_NAME         "mqttUsername"
+#define PASSWORD_OPTION_NAME         "mqttPassword"
+#define MQTT_USERNAME                "open62541user"
+#define MQTT_PASSWORD                "open62541"
+#endif
+
+// Uncomment the following line to enable MQTT via TLS for the example
+//#define EXAMPLE_USE_MQTT_TLS
+
+#ifdef EXAMPLE_USE_MQTT_TLS
+#define TLS_OPTION_COUNT                2
+#define USE_TLS_OPTION_NAME             "mqttUseTLS"
+#define MQTT_CA_FILE_PATH_OPTION_NAME   "mqttCaFilePath"
+#define CA_FILE_PATH                    "/path/to/server.cert"
+#endif
+
+#ifdef UA_ENABLE_JSON_ENCODING
+static UA_Boolean useJson = true;
+#else
+static UA_Boolean useJson = false;
+#endif
+
+UA_NodeId connectionIdent;
+UA_NodeId subscribedDataSetIdent;
+UA_NodeId readerGroupIdent;
+
+UA_DataSetReaderConfig readerConfig;
+
+static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData);
+
+static UA_StatusCode
+addPubSubConnection(UA_Server *server, char *addressUrl) {
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    /* Details about the connection configuration and handling are located
+     * in the pubsub connection tutorial */
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(connectionConfig));
+    connectionConfig.name = UA_STRING(CONNECTION_NAME);
+    connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
+    connectionConfig.enabled = UA_TRUE;
+
+    /* configure address of the mqtt broker (local on default port) */
+    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING(addressUrl)};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    /* Changed to static publisherId from random generation to identify
+     * the publisher on Subscriber side */
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
+
+    /* configure options, set mqtt client id */
+    const int connectionOptionsCount = 1
+#ifdef EXAMPLE_USE_MQTT_LOGIN
+    + LOGIN_OPTION_COUNT
+#endif
+#ifdef EXAMPLE_USE_MQTT_TLS
+    + TLS_OPTION_COUNT
+#endif
+    ;
+
+    UA_KeyValuePair connectionOptions[connectionOptionsCount];
+
+    size_t connectionOptionIndex = 0;
+    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, CONNECTIONOPTION_NAME);
+    UA_String mqttClientId = UA_STRING(MQTT_CLIENT_ID);
+    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttClientId, &UA_TYPES[UA_TYPES_STRING]);
+
+#ifdef EXAMPLE_USE_MQTT_LOGIN
+    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USERNAME_OPTION_NAME);
+    UA_String mqttUsername = UA_STRING(MQTT_USERNAME);
+    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUsername, &UA_TYPES[UA_TYPES_STRING]);
+
+    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, PASSWORD_OPTION_NAME);
+    UA_String mqttPassword = UA_STRING(MQTT_PASSWORD);
+    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttPassword, &UA_TYPES[UA_TYPES_STRING]);
+#endif
+
+#ifdef EXAMPLE_USE_MQTT_TLS
+    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USE_TLS_OPTION_NAME);
+    UA_Boolean mqttUseTLS = true;
+    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUseTLS, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
+    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, MQTT_CA_FILE_PATH_OPTION_NAME);
+    UA_String mqttCaFile = UA_STRING(CA_FILE_PATH);
+    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttCaFile, &UA_TYPES[UA_TYPES_STRING]);
+#endif
+
+    connectionConfig.connectionProperties = connectionOptions;
+    connectionConfig.connectionPropertiesSize = connectionOptionIndex;
+
+    retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
+
+    return retval;
+}
+
+/**
+ * **ReaderGroup**
+ *
+ * ReaderGroup is used to group a list of DataSetReaders. All ReaderGroups are
+ * created within a PubSubConnection and automatically deleted if the connection
+ * is removed. All network message related filters are only available in the DataSetReader. */
+/* Add ReaderGroup to the created connection */
+static UA_StatusCode
+addReaderGroup(UA_Server *server,  int interval) {
+    if(server == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING("ReaderGroup1");
+    readerGroupConfig.subscribingInterval = interval;
+    if(useJson)
+        readerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_JSON;
+
+    /* configure the mqtt publish topic */
+    UA_BrokerWriterGroupTransportDataType brokerTransportSettings;
+    memset(&brokerTransportSettings, 0, sizeof(UA_BrokerWriterGroupTransportDataType));
+    /* Assign the Topic at which MQTT publish should happen */
+    /*ToDo: Pass the topic as argument from the reader group */
+    brokerTransportSettings.queueName = UA_STRING(SUBSCRIBER_TOPIC);
+    brokerTransportSettings.resourceUri = UA_STRING_NULL;
+    brokerTransportSettings.authenticationProfileUri = UA_STRING_NULL;
+
+    /* Choose the QOS Level for MQTT */
+    brokerTransportSettings.requestedDeliveryGuarantee = UA_BROKERTRANSPORTQUALITYOFSERVICE_BESTEFFORT;
+
+    /* Encapsulate config in transportSettings */
+    UA_ExtensionObject transportSettings;
+    memset(&transportSettings, 0, sizeof(UA_ExtensionObject));
+    transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    transportSettings.content.decoded.type = &UA_TYPES[UA_TYPES_BROKERDATASETREADERTRANSPORTDATATYPE];
+    transportSettings.content.decoded.data = &brokerTransportSettings;
+
+    readerGroupConfig.transportSettings = transportSettings;
+
+    retval |= UA_Server_addReaderGroup(server, connectionIdent, &readerGroupConfig,
+                                       &readerGroupIdent);
+    retval |= UA_Server_setReaderGroupOperational(server, readerGroupIdent);
+
+    return retval;
+}
+
+/**
+ * **DataSetReader**
+ *
+ * DataSetReader can receive NetworkMessages with the DataSetMessage
+ * of interest sent by the Publisher. DataSetReader provides
+ * the configuration necessary to receive and process DataSetMessages
+ * on the Subscriber side. DataSetReader must be linked with a
+ * SubscribedDataSet and be contained within a ReaderGroup. */
+/* Add DataSetReader to the ReaderGroup */
+static UA_StatusCode
+addDataSetReader(UA_Server *server) {
+    if(server == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
+    readerConfig.name = UA_STRING("DataSet Reader 1");
+    /* Parameters to filter which DataSetMessage has to be processed
+     * by the DataSetReader */
+    /* The following parameters are used to show that the data published by
+     * tutorial_pubsub_mqtt_publish.c is being subscribed and is being updated in
+     * the information model */
+    UA_UInt16 publisherIdentifier = 2234;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId    = 100;
+    readerConfig.dataSetWriterId  = 62541;
+
+    /* Setting up Meta data configuration in DataSetReader */
+    fillTestDataSetMetaData(&readerConfig.dataSetMetaData);
+
+    retval |= UA_Server_addDataSetReader(server, readerGroupIdent, &readerConfig,
+                                         &subscribedDataSetIdent);
+    return retval;
+}
+
+/**
+ * **SubscribedDataSet**
+ *
+ * Set SubscribedDataSet type to TargetVariables data type.
+ * Add subscribedvariables to the DataSetReader */
+static UA_StatusCode
+addSubscribedVariables (UA_Server *server, UA_NodeId dataSetReaderId) {
+    if(server == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_NodeId folderId;
+    UA_String folderName = readerConfig.dataSetMetaData.name;
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName;
+    if(folderName.length > 0) {
+        oAttr.displayName.locale = UA_STRING ("en-US");
+        oAttr.displayName.text = folderName;
+        folderBrowseName.namespaceIndex = 1;
+        folderBrowseName.name = folderName;
+    }
+    else {
+        oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
+        folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
+    }
+
+    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+                             UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+                             folderBrowseName, UA_NODEID_NUMERIC (0,
+                                                                  UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+
+/**
+ * **TargetVariables**
+ *
+ * The SubscribedDataSet option TargetVariables defines a list of Variable mappings between
+ * received DataSet fields and target Variables in the Subscriber AddressSpace.
+ * The values subscribed from the Publisher are updated in the value field of these variables */
+    /* Create the TargetVariables with respect to DataSetMetaData fields */
+    UA_FieldTargetVariable *targetVars = (UA_FieldTargetVariable *)
+        UA_calloc(readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
+    for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++) {
+        /* Variable to subscribe data */
+        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+        UA_LocalizedText_copy(&readerConfig.dataSetMetaData.fields[i].description,
+                              &vAttr.description);
+        vAttr.displayName.locale = UA_STRING("en-US");
+        vAttr.displayName.text = readerConfig.dataSetMetaData.fields[i].name;
+        vAttr.dataType = readerConfig.dataSetMetaData.fields[i].dataType;
+
+        UA_NodeId newNode;
+        retval |= UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, (UA_UInt32)i + 50000),
+                                            folderId,
+                                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                            UA_QUALIFIEDNAME(1, (char *)readerConfig.dataSetMetaData.fields[i].name.data),
+                                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                            vAttr, NULL, &newNode);
+
+        /* For creating Targetvariables */
+        UA_FieldTargetDataType_init(&targetVars[i].targetVariable);
+        targetVars[i].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+        targetVars[i].targetVariable.targetNodeId = newNode;
+    }
+
+    retval = UA_Server_DataSetReader_createTargetVariables(server, dataSetReaderId,
+                                                           readerConfig.dataSetMetaData.fieldsSize, targetVars);
+    for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++)
+        UA_FieldTargetDataType_clear(&targetVars[i].targetVariable);
+
+    UA_free(targetVars);
+    UA_free(readerConfig.dataSetMetaData.fields);
+    return retval;
+}
+
+/**
+ * **DataSetMetaData**
+ *
+ * The DataSetMetaData describes the content of a DataSet. It provides the information necessary to decode
+ * DataSetMessages on the Subscriber side. DataSetMessages received from the Publisher are decoded into
+ * DataSet and each field is updated in the Subscriber based on datatype match of TargetVariable fields of Subscriber
+ * and PublishedDataSetFields of Publisher */
+/* Define MetaData for TargetVariables */
+static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
+    if(pMetaData == NULL) {
+        return;
+    }
+
+    UA_DataSetMetaDataType_init (pMetaData);
+    pMetaData->name = UA_STRING ("DataSet 1");
+
+    /* Static definition of number of fields size to 4 to create four different
+     * targetVariables of distinct datatype
+     * Currently the publisher sends only DateTime data type */
+    pMetaData->fieldsSize = 4;
+    pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
+                                                         &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+
+    /* DateTime DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[0]);
+    UA_NodeId_copy (&UA_TYPES[UA_TYPES_DATETIME].typeId,
+                    &pMetaData->fields[0].dataType);
+    pMetaData->fields[0].builtInType = UA_NS0ID_DATETIME;
+    pMetaData->fields[0].name =  UA_STRING ("DateTime");
+    pMetaData->fields[0].valueRank = -1; /* scalar */
+
+    /* Int32 DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[1]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT32].typeId,
+                   &pMetaData->fields[1].dataType);
+    pMetaData->fields[1].builtInType = UA_NS0ID_INT32;
+    pMetaData->fields[1].name =  UA_STRING ("Int32");
+    pMetaData->fields[1].valueRank = -1; /* scalar */
+
+    /* Int64 DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[2]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT64].typeId,
+                   &pMetaData->fields[2].dataType);
+    pMetaData->fields[2].builtInType = UA_NS0ID_INT64;
+    pMetaData->fields[2].name =  UA_STRING ("Int64");
+    pMetaData->fields[2].valueRank = -1; /* scalar */
+
+    /* Boolean DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[3]);
+    UA_NodeId_copy (&UA_TYPES[UA_TYPES_BOOLEAN].typeId,
+                    &pMetaData->fields[3].dataType);
+    pMetaData->fields[3].builtInType = UA_NS0ID_BOOLEAN;
+    pMetaData->fields[3].name =  UA_STRING ("BoolToggle");
+    pMetaData->fields[3].valueRank = -1; /* scalar */
+}
+
+/**
+ * Followed by the main server code, making use of the above definitions */
+UA_Boolean running = true;
+static void stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+
+int main(int argc, char **argv) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    char *addressUrl = BROKER_ADDRESS_URL;
+    //char *topic = SUBSCRIBER_TOPIC;
+    int interval = SUBSCRIBE_INTERVAL;
+
+    /* Return value initialized to Status Good */
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
+
+    /* API calls */
+    /* Add PubSubConnection */
+    retval |= addPubSubConnection(server, addressUrl);
+    if (retval != UA_STATUSCODE_GOOD)
+        return EXIT_FAILURE;
+
+    /* Add ReaderGroup to the created PubSubConnection */
+    retval |= addReaderGroup(server, interval);
+    if (retval != UA_STATUSCODE_GOOD)
+        return EXIT_FAILURE;
+
+    /* Add DataSetReader to the created ReaderGroup */
+    retval |= addDataSetReader(server);
+    if (retval != UA_STATUSCODE_GOOD)
+        return EXIT_FAILURE;
+
+    /* Add SubscribedVariables to the created DataSetReader */
+    retval |= addSubscribedVariables(server, subscribedDataSetIdent);
+    if (retval != UA_STATUSCODE_GOOD)
+        return EXIT_FAILURE;
+
+    retval = UA_Server_run(server, &running);
+    UA_Server_delete(server);
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/examples/pubsub/tutorial_pubsub_subscribe_raw.c b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
index 66bb5965df2..9757643b487 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe_raw.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
@@ -68,7 +68,7 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
     }
-    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier);
+    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
     return retval;
 }
 
diff --git a/include/open62541/plugin/pubsub.h b/include/open62541/plugin/pubsub.h
index 2a829e96ef7..1328b13722d 100644
--- a/include/open62541/plugin/pubsub.h
+++ b/include/open62541/plugin/pubsub.h
@@ -10,6 +10,7 @@
 
 #include <open62541/types.h>
 #include <open62541/types_generated.h>
+#include <open62541/util.h>
 
 _UA_BEGIN_DECLS
 
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 75c8efb78f7..2ea38a3a9d7 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -453,9 +453,9 @@ typedef struct {
  * contained in the WriterGroup. */
 
 typedef enum {
-    UA_PUBSUB_ENCODING_BINARY,
-    UA_PUBSUB_ENCODING_JSON,
-    UA_PUBSUB_ENCODING_UADP
+    UA_PUBSUB_ENCODING_UADP = 0,
+    UA_PUBSUB_ENCODING_JSON = 1,
+    UA_PUBSUB_ENCODING_BINARY = 2
 } UA_PubSubEncodingType;
 
 /**
@@ -801,6 +801,8 @@ typedef struct {
     UA_PubSubRTLevel rtLevel;
     size_t groupPropertiesSize;
     UA_KeyValuePair *groupProperties;
+    UA_PubSubEncodingType encodingMimeType;
+    UA_ExtensionObject transportSettings;
 
     /* Messages are decrypted if a SecurityPolicy is configured and the
      * securityMode set accordingly. The symmetric key is a runtime information
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index 963ea8ff165..f16912dbdf3 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -4,9 +4,12 @@
  *
  * Copyright (c) 2018 Fraunhofer IOSB (Author: Lukas Meling)
  * Copyright (c) 2020 basysKom GmbH
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
  */
 
 #include "ua_mqtt-c_adapter.h"
+#include "ua_pubsub_manager.h"
+#include "server/ua_server_internal.h"
 #include <mqtt.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/util.h>
@@ -21,7 +24,7 @@
 #include <time.h>
 
 
-/* forward decl for callback */
+/* The function that would be called whenever a PUBLISH is received. */
 void
 publish_callback(void**, struct mqtt_response_publish*);
 
@@ -234,11 +237,6 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
         return UA_STATUSCODE_BADCOMMUNICATIONERROR;
     }
 
-    /* Init custom data for subscribe callback function:
-     * A reference to the channeldata will be available in the callback.
-     * This is used to call the user callback channelData.callback */
-    client->publish_response_callback_state = channelData;
-
     /* Convert clientId UA_String to char* null terminated */
     char* clientId = (char*)calloc(1,channelData->mqttClientId->length + 1);
     if(!clientId){
@@ -328,37 +326,59 @@ disconnectMqtt(UA_PubSubChannelDataMQTT* channelData){
 }
 
 void
-publish_callback(void** channelDataPtr, struct mqtt_response_publish *published)
+publish_callback(void** ptrServer, struct mqtt_response_publish *published)
 {
-    if(channelDataPtr != NULL){
-        UA_PubSubChannelDataMQTT *channelData = (UA_PubSubChannelDataMQTT*)*channelDataPtr;
-        if(channelData != NULL){
-            if(channelData->callback != NULL){
-                //Setup topic
-                UA_ByteString *topic = UA_ByteString_new();
-                if(!topic) return;
-                UA_ByteString *msg = UA_ByteString_new();
-                if(!msg) return;
-
-                /* memory for topic */
-                UA_StatusCode ret = UA_ByteString_allocBuffer(topic, published->topic_name_size);
-                if(ret){
-                    UA_free(topic);
-                    UA_free(msg);
-                    return;
-                }
-                /* memory for message */
-                ret = UA_ByteString_allocBuffer(msg, published->application_message_size);
-                if(ret){
-                    UA_ByteString_delete(topic);
-                    UA_free(msg);
-                    return;
-                }
-                /* copy topic and msg, call the cb */
-                memcpy(topic->data, published->topic_name, published->topic_name_size);
-                memcpy(msg->data, published->application_message, published->application_message_size);
-                channelData->callback(msg, topic);
-            }
+    UA_Server *server = (UA_Server*)*ptrServer;
+    UA_PubSubManager pubSubManager = server->pubSubManager;
+    UA_Boolean is_reader_configured = false;
+    const UA_String transport_uri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+
+    UA_PubSubConnection *pubSubConnection;
+    TAILQ_FOREACH(pubSubConnection, &server->pubSubManager.connections, listEntry){
+        if(!UA_String_equal(&pubSubConnection->config->transportProfileUri, &transport_uri))
+            break;
+        UA_ReaderGroup* readerGroup = NULL;
+        LIST_FOREACH(readerGroup, &pubSubConnection->readerGroups, listEntry) {
+            if(readerGroup->state != UA_PUBSUBSTATE_OPERATIONAL)
+                break;
+            if(!LIST_EMPTY(&readerGroup->readers))
+                is_reader_configured = true;
+        }
+    }
+    if(!is_reader_configured)
+        return;
+
+    UA_LOG_TRACE(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Receive");
+    //Setup topic
+    UA_ByteString *topic = UA_ByteString_new();
+    if(!topic) return;
+    UA_ByteString *msg = UA_ByteString_new();
+    if(!msg) return;
+
+    /* memory for topic */
+    UA_StatusCode ret = UA_ByteString_allocBuffer(topic, published->topic_name_size);
+    if(ret){
+        UA_free(topic);
+        UA_free(msg);
+        return;
+    }
+    /* memory for message */
+    ret = UA_ByteString_allocBuffer(msg, published->application_message_size);
+    if(ret){
+        UA_ByteString_delete(topic);
+        UA_free(msg);
+        return;
+    }
+    /* copy topic and msg, call the cb */
+    memcpy(topic->data, published->topic_name, published->topic_name_size);
+    memcpy(msg->data, published->application_message, published->application_message_size);
+
+    UA_TopicAssign *topicAssign1;
+    TAILQ_FOREACH(topicAssign1, &pubSubManager.topicAssign, listEntry){
+        if(UA_String_equal(&topicAssign1->topic, topic)){
+            UA_PubSubConnection* pConn =
+                UA_PubSubConnection_findConnectionbyId(server, topicAssign1->rgIdentifier->linkedConnection);
+            processMqttSubscriberCallback(server, topicAssign1->rgIdentifier,pConn, msg, topic);
         }
     }
 }
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.h b/plugins/mqtt/ua_mqtt-c_adapter.h
index d7c7214798c..96c1aa2b7b5 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.h
+++ b/plugins/mqtt/ua_mqtt-c_adapter.h
@@ -15,6 +15,7 @@ extern "C" {
 
 #include <open62541/plugin/pubsub_mqtt.h>
 #include <open62541/network_tcp.h>
+#include "ua_pubsub.h"
 
 #if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
 #include <openssl/ssl.h>
diff --git a/plugins/ua_pubsub_mqtt.c b/plugins/ua_pubsub_mqtt.c
index db928cf0f33..b85bd27e0bc 100644
--- a/plugins/ua_pubsub_mqtt.c
+++ b/plugins/ua_pubsub_mqtt.c
@@ -295,7 +295,7 @@ UA_PubSubChannelMQTT_send(UA_PubSubChannel *channel, UA_ExtensionObject *transpo
         return ret;
     }
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Publish");
+    UA_LOG_TRACE(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Publish");
     return ret;
 }
 
@@ -349,6 +349,22 @@ UA_PubSubChannelMQTT_yield(UA_PubSubChannel *channel, UA_UInt16 timeout){
     return ret;
 }
 
+/**
+ * Receive a message. The regist function should be called before.
+ *
+ * @param timeout in msec
+ * @param Buffer to recieve messages
+ *
+ * @return UA_STATUSCODE_GOOD if success
+ */
+static UA_StatusCode
+UA_PubSubChannelMQTT_receive(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings, UA_PubSubReceiveCallback receiveCallback,
+                              void *receiveCallbackContext, UA_UInt32 timeout){
+
+    /* Nothing to do */
+    return UA_STATUSCODE_GOOD;
+}
+
 /**
  * Generate a new MQTT channel. Based on the given configuration. Uses yield and no recv call.
  *
@@ -365,6 +381,7 @@ TransportLayerMQTT_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
         pubSubChannel->send = UA_PubSubChannelMQTT_send;
         pubSubChannel->close = UA_PubSubChannelMQTT_close;
         pubSubChannel->yield = UA_PubSubChannelMQTT_yield;
+        pubSubChannel->receive = UA_PubSubChannelMQTT_receive;
 
         pubSubChannel->connectionConfig = connectionConfig;
     }
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 7b8539e8a97..3be1c1741f2 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -8,6 +8,7 @@
  * Copyright (c) 2020 Thomas Fischer, Siemens AG
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
  */
 
 #ifndef UA_PUBSUB_H_
@@ -140,7 +141,7 @@ UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection);
 
 /* Register channel for given connectionIdentifier */
 UA_StatusCode
-UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier);
+UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier, const UA_ReaderGroupConfig *readerGroupConfig);
 
 #define UA_LOG_CONNECTION_INTERNAL(LOGGER, LEVEL, CONNECTION, MSG, ...) \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
@@ -562,6 +563,16 @@ UA_StatusCode
 receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
                               UA_PubSubConnection *connection);
 
+/* It serves as the entry point into reader processing and is called when
+ * a publish is received, and the topic matches with one or more readers. */
+void processMqttSubscriberCallback(UA_Server *server, UA_ReaderGroup *readerGroup,
+                      UA_PubSubConnection *connection, UA_ByteString *msg,
+                      UA_ByteString *topic);
+
+UA_StatusCode
+decodeNetworkMessageJson(UA_Server *server, UA_ByteString *buffer, size_t *pos,
+                         UA_NetworkMessage *nm, UA_PubSubConnection *connection);
+
 #endif /* UA_ENABLE_PUBSUB */
 
 _UA_END_DECLS
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 9faf0a3bf7f..ff1ac6b40e7 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -203,7 +203,7 @@ createComponentsForConnection(UA_Server *server,
     for(size_t j = 0; j < connParams->readerGroupsSize; j++) {
         res = createReaderGroup(server, &connParams->readerGroups[j], connectionIdent);
         if(res == UA_STATUSCODE_GOOD)
-            res |= UA_PubSubConnection_regist(server, &connectionIdent);
+            res |= UA_PubSubConnection_regist(server, &connectionIdent, NULL);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createComponentsForConnection] "
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 90806b2d748..8433df71496 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -6,6 +6,7 @@
  * Copyright (c) 2018 Fraunhofer IOSB (Author: Julius Pfrommer)
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
  */
 
 #include <open62541/server_pubsub.h>
@@ -15,6 +16,11 @@
 #include "server/ua_server_internal.h"
 #include "ua_pubsub_ns0.h"
 
+#ifdef UA_ENABLE_PUBSUB_MQTT
+#include "../../plugins/mqtt/ua_mqtt-c_adapter.h"
+#include "mqtt.h"
+#endif
+
 #define UA_DATETIMESTAMP_2000 125911584000000000
 
 static UA_PubSubTransportLayer *
@@ -71,6 +77,39 @@ UA_PubSubManager_addConnection(UA_PubSubManager *pubSubManager, UA_PubSubConnect
     pubSubManager->connectionsSize++;
 }
 
+static void
+UA_PubSubManager_addTopic(UA_PubSubManager *pubSubManager, UA_TopicAssign *topicAssign) {
+    if (pubSubManager->topicAssignSize != 0) {
+        TAILQ_INSERT_TAIL(&pubSubManager->topicAssign, topicAssign, listEntry);
+    } else {
+        TAILQ_INIT(&pubSubManager->topicAssign);
+        TAILQ_INSERT_HEAD(&pubSubManager->topicAssign, topicAssign, listEntry);
+    }
+    pubSubManager->topicAssignSize++;
+}
+
+static UA_TopicAssign *
+UA_TopicAssign_new(UA_ReaderGroup *readerGroup,
+                   UA_String topic, UA_Logger *logger) {
+    UA_TopicAssign *topicAssign = (UA_TopicAssign *) calloc(1, sizeof(UA_TopicAssign));
+    if(!topicAssign) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub TopicAssign creation failed. Out of Memory.");
+        return NULL;
+    }
+    topicAssign->rgIdentifier = readerGroup;
+    topicAssign->topic = topic;
+    return topicAssign;
+}
+
+UA_StatusCode
+UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerGroup, UA_String topic) {
+    UA_PubSubManager *pubSubManager = &server->pubSubManager;
+    UA_TopicAssign *topicAssign = UA_TopicAssign_new(readerGroup, topic, &server->config.logger);
+    UA_PubSubManager_addTopic(pubSubManager, topicAssign);
+    return UA_STATUSCODE_GOOD;
+}
+
 static UA_PubSubConnection *
 UA_PubSubConnection_new(UA_PubSubConnectionConfig *connectionConfig,
                         UA_Logger *logger) {/* Create new connection and add to UA_PubSubManager */
@@ -154,6 +193,17 @@ UA_Server_addPubSubConnection(UA_Server *server,
     newConnectionsField->channel = tl->createPubSubChannel(newConnectionsField->config);
     UA_CHECK_MEM(newConnectionsField->channel, return channelErrorHandling(server, newConnectionsField));
 
+#ifdef UA_ENABLE_PUBSUB_MQTT
+    /* If the transport layer is MQTT, attach the server pointer to the callback function
+     * that is called when a PUBLISH is received. */
+    const UA_String transport_uri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+    if(UA_String_equal(&newConnectionsField->config->transportProfileUri, &transport_uri)) {
+        UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *)newConnectionsField->channel->handle;
+        struct mqtt_client* client = (struct mqtt_client*)channelDataMQTT->mqttClient;
+        client->publish_response_callback_state = server;
+    }
+#endif
+
     assignConnectionIdentifier(server, newConnectionsField, connectionIdentifier);
 
     return UA_STATUSCODE_GOOD;
@@ -210,7 +260,7 @@ UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection)
 }
 
 UA_StatusCode
-UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier) {
+UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier, const UA_ReaderGroupConfig *readerGroupConfig) {
     UA_PubSubConnection *connection =
         UA_PubSubConnection_findConnectionbyId(server, *connectionIdentifier);
     if(!connection)
@@ -220,8 +270,13 @@ UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier) {
         UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Connection already registered");
         return UA_STATUSCODE_GOOD;
     }
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    if(readerGroupConfig != NULL) {
+        UA_ExtensionObject transportSettings = readerGroupConfig->transportSettings;
+        retval = connection->channel->regist(connection->channel, &transportSettings, NULL);
+    }else
+        retval = connection->channel->regist(connection->channel, NULL, NULL);
 
-    UA_StatusCode retval = connection->channel->regist(connection->channel, NULL, NULL);
     if(retval != UA_STATUSCODE_GOOD)
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "register channel failed: 0x%" PRIx32 "!", retval);
@@ -526,7 +581,16 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
         removePublishedDataSet(server, tmpPDS1->identifier);
     }
 
+    /* Remove the TopicAssigns */
+    UA_TopicAssign *tmpTopicAssign1, *tmpTopicAssign2;
+    TAILQ_FOREACH_SAFE(tmpTopicAssign1, &server->pubSubManager.topicAssign,
+                       listEntry, tmpTopicAssign2){
 
+        server->pubSubManager.topicAssignSize--;
+        TAILQ_REMOVE(&server->pubSubManager.topicAssign, tmpTopicAssign1, listEntry);
+        UA_free(tmpTopicAssign1);
+    }
+    
     /* Free the list of transport layers */
     if(server->config.pubSubConfig.transportLayersSize > 0) {
         UA_free(server->config.pubSubConfig.transportLayers);
diff --git a/src/pubsub/ua_pubsub_manager.h b/src/pubsub/ua_pubsub_manager.h
index 236294aea4f..00cc7785c6e 100644
--- a/src/pubsub/ua_pubsub_manager.h
+++ b/src/pubsub/ua_pubsub_manager.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2017-2019 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
  */
 
 #ifndef UA_PUBSUB_MANAGER_H_
@@ -17,6 +18,12 @@ _UA_BEGIN_DECLS
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
+typedef struct UA_TopicAssign {
+    UA_ReaderGroup *rgIdentifier;
+    UA_String topic;
+    TAILQ_ENTRY(UA_TopicAssign) listEntry;
+} UA_TopicAssign;
+
 typedef struct UA_PubSubManager {
     /* Connections and PublishedDataSets can exist alone (own lifecycle) -> top
      * level components */
@@ -28,11 +35,17 @@ typedef struct UA_PubSubManager {
     size_t subscribedDataSetsSize;
     TAILQ_HEAD(UA_ListOfStandaloneSubscribedDataSet, UA_StandaloneSubscribedDataSet) subscribedDataSets;
 
+    size_t topicAssignSize;
+    TAILQ_HEAD(UA_ListOfTopicAssign, UA_TopicAssign) topicAssign;
+
 #ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     UA_UInt32 uniqueIdCount;
 #endif
 } UA_PubSubManager;
 
+UA_StatusCode
+UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerGroup, UA_String topic);
+
 void
 UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager);
 
diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index ff8aeea23f7..3a4a15ab5ef 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -430,8 +430,10 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     if(found == UA_STATUSCODE_GOOD) {
         cj5_token *publishIdToken = &parseCtx->tokenArray[searchResultPublishIdType];
         if(publishIdToken->type == CJ5_TOKEN_NUMBER) {
-            pubIdType = &UA_TYPES[UA_TYPES_UINT64];
-            dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT64; //store in biggest possible
+            // store in biggest possible. The problem is that with a UInt64 a string is expected in the json.
+            // Therefore, the maximum value is set to UInt32.
+            pubIdType = &UA_TYPES[UA_TYPES_UINT32];
+            dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
         } else if(publishIdToken->type == CJ5_TOKEN_STRING) {
             dst->publisherIdType = UA_PUBLISHERIDTYPE_STRING;
         } else {
@@ -495,8 +497,8 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     dst->messageIdEnabled = entries[0].found;
     dst->publisherIdEnabled = entries[2].found;
     if(dst->publisherIdEnabled) {
-        if(pubIdType == &UA_TYPES[UA_TYPES_UINT64]) {
-            dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
+        if(pubIdType == &UA_TYPES[UA_TYPES_UINT32]) {
+            dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
         } else {
             dst->publisherIdType = UA_PUBLISHERIDTYPE_STRING;
         }
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 73c10931795..200724caefd 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
  */
 
 #include <open62541/server_pubsub.h>
@@ -335,7 +336,8 @@ UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
 
 static UA_StatusCode
 checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
-                      UA_DataSetReader *reader) {
+                      UA_DataSetReader *reader, UA_ReaderGroupConfig readerGroupConfig) {
+if(readerGroupConfig.encodingMimeType != UA_PUBSUB_ENCODING_JSON){
     if(!msg->groupHeaderEnabled || !msg->groupHeader.writerGroupIdEnabled ||
        !msg->payloadHeaderEnabled) {
         UA_LOG_INFO_READER(&server->config.logger, reader,
@@ -381,6 +383,17 @@ checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
         return UA_STATUSCODE_GOOD;
     }
 
+}else{
+    if(reader->config.publisherId.type != &UA_TYPES[UA_TYPES_UINT32] &&
+       msg->publisherId.uint32 != *(UA_UInt32*)reader->config.publisherId.data)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    if(reader->config.dataSetWriterId == *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {
+        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "DataSetReader found. Process NetworkMessage");
+        return UA_STATUSCODE_GOOD;
+    }
+}
     return UA_STATUSCODE_BADNOTFOUND;
 }
 
@@ -1286,7 +1299,7 @@ UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader
                         (int)dsr->config.name.length, dsr->config.name.data,
                         dsr->config.messageReceiveTimeout,
                         (UA_UInt32) dsr->msgRcvTimeoutTimerId);
-    
+
     UA_StatusCode res =
         UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
                                         UA_STATUSCODE_BADTIMEOUT);
@@ -1335,7 +1348,7 @@ processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
     UA_DataSetReader *reader;
     LIST_FOREACH(readerGroup, &connection->readerGroups, listEntry) {
         LIST_FOREACH(reader, &readerGroup->readers, listEntry) {
-            UA_StatusCode retval = checkReaderIdentifier(server, msg, reader);
+            UA_StatusCode retval = checkReaderIdentifier(server, msg, reader, readerGroup->config);
             if(retval == UA_STATUSCODE_GOOD) {
                 processed = true;
                 processMessageWithReader(server, readerGroup, reader, msg);
@@ -1404,7 +1417,7 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
      * (there could be multiple) */
     LIST_FOREACH(readerGroup, &connection->readerGroups, listEntry) {
         LIST_FOREACH(reader, &readerGroup->readers, listEntry) {
-            UA_StatusCode retval = checkReaderIdentifier(server, nm, reader);
+            UA_StatusCode retval = checkReaderIdentifier(server, nm, reader, readerGroup->config);
             if(retval == UA_STATUSCODE_GOOD) {
                 processed = true;
                 rv = verifyAndDecryptNetworkMessage(&server->config.logger, buffer, pos,
@@ -1450,15 +1463,37 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
     return UA_STATUSCODE_GOOD;
 }
 
+#ifdef UA_ENABLE_JSON_ENCODING
+UA_StatusCode
+decodeNetworkMessageJson(UA_Server *server, UA_ByteString *buffer, size_t *pos,
+                     UA_NetworkMessage *nm, UA_PubSubConnection *connection) {
+
+    UA_StatusCode rv = UA_NetworkMessage_decodeJson(nm, buffer);
+    UA_CHECK_STATUS(rv, return rv);
+
+    return UA_STATUSCODE_GOOD;
+}
+#endif
+
 static UA_StatusCode
 decodeAndProcessNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
-                               UA_ByteString *buf) {
+                               UA_ReaderGroup *readerGroup, UA_ByteString *buf) {
     UA_NetworkMessage nm;
     memset(&nm, 0, sizeof(UA_NetworkMessage));
 
     size_t currentPosition = 0;
-    UA_StatusCode rv = decodeNetworkMessage(server, buf, &currentPosition,
-                                            &nm, connection);
+    UA_StatusCode rv;
+    if(readerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_UADP){
+        rv = decodeNetworkMessage(server, buf, &currentPosition,
+                                  &nm, connection);
+    } else { /* if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) */
+#ifdef UA_ENABLE_JSON_ENCODING
+        rv = decodeNetworkMessageJson(server, buf, &currentPosition,
+                                  &nm, connection);
+#else
+        rv = UA_STATUSCODE_BADNOTSUPPORTED;
+#endif
+    }
     if(rv != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
                                   "Verify, decrypt and decode network message failed.");
@@ -1523,7 +1558,7 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
     }
 
     /* Check the decoded message is the expected one */
-    rv = checkReaderIdentifier(server, nm, dataSetReader);
+    rv = checkReaderIdentifier(server, nm, dataSetReader, readerGroup->config);
     if(rv != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO_READER(&server->config.logger, dataSetReader,
                            "PubSub receive. Unknown message received. Will not be processed.");
@@ -1553,7 +1588,7 @@ decodeAndProcessFun(UA_PubSubChannel *channel, void *cbContext,
                     const UA_ByteString *buf) {
     UA_RGContext *ctx = (UA_RGContext*)cbContext;
     UA_ByteString mutableBuffer = {buf->length, buf->data};
-    return decodeAndProcessNetworkMessage(ctx->server, ctx->connection, &mutableBuffer);
+    return decodeAndProcessNetworkMessage(ctx->server, ctx->connection, ctx->readerGroup, &mutableBuffer);
 }
 
 static UA_StatusCode
@@ -1565,6 +1600,13 @@ decodeAndProcessFunRT(UA_PubSubChannel *channel, void *cbContext,
                                             ctx->connection, &mutableBuffer);
 }
 
+void processMqttSubscriberCallback(UA_Server *server, UA_ReaderGroup *readerGroup,
+                      UA_PubSubConnection *connection, UA_ByteString *msg,
+                      UA_ByteString *topic) {
+    UA_RGContext ctx = {server, connection, readerGroup};
+    decodeAndProcessFun(connection->channel, &ctx, msg);
+}
+
 UA_StatusCode
 receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
                               UA_PubSubConnection *connection) {
@@ -1578,12 +1620,12 @@ receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
     /* TODO: Move the TransportSettings to to the readerGroupConfig. So we can
      * use it here instead of a NULL pointer. */
     UA_StatusCode rv =
-        connection->channel->receive(connection->channel, NULL,
+        connection->channel->receive(connection->channel, &readerGroup->config.transportSettings,
                                      receiveCB, &ctx,
                                      readerGroup->config.timeout);
 
     // TODO attention: here rv is ok if UA_STATUSCODE_GOOD != rv
-    if(!UA_StatusCode_isBad(rv)) {
+    if(UA_StatusCode_isBad(rv)) {
         UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
                               "SubscribeCallback(): Connection receive failed!");
         return rv;
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 8b4770fe106..c27b1e026fb 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -120,7 +120,7 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
 
     /* Regist (bind) the connection channel if it is not already registered */
     if(!currentConnectionContext->isRegistered) {
-        retval |= UA_PubSubConnection_regist(server, &connectionIdentifier);
+        retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, readerGroupConfig);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
     }
@@ -160,6 +160,12 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
     if(readerGroupIdentifier)
         UA_NodeId_copy(&newGroup->identifier, readerGroupIdentifier);
 
+    /* Set the assigment between ReaderGroup and Topic if the transport layer is MQTT. */
+    const UA_String transport_uri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+    if(UA_String_equal(&currentConnectionContext->config->transportProfileUri, &transport_uri)) {
+        UA_String topic = ((UA_BrokerWriterGroupTransportDataType *)readerGroupConfig->transportSettings.content.decoded.data)->queueName;
+        retval |= UA_PubSubManager_addPubSubTopicAssign(server, newGroup, topic);
+    }
     return retval;
 }
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 90533639fa3..c9c874f79a8 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -861,6 +861,9 @@ sendNetworkMessageJson(UA_Server *server, UA_PubSubConnection *connection, UA_Wr
     nm.payloadHeader.dataSetPayloadHeader.count = dsmCount;
     nm.payloadHeader.dataSetPayloadHeader.dataSetWriterIds = writerIds;
     nm.payload.dataSetPayload.dataSetMessages = dsm;
+    nm.publisherIdEnabled = true;
+    nm.publisherIdType = connection->config->publisherIdType;
+    nm.publisherId = connection->config->publisherId;
 
     /* Compute the message length */
     size_t msgSize = UA_NetworkMessage_calcSizeJson(&nm, NULL, 0, NULL, 0, true);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0caa128ca7c..7fc64d18445 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -343,6 +343,7 @@ if(UA_ENABLE_PUBSUB)
     if(UA_ENABLE_PUBSUB_MQTT)
         if(NOT WIN32)
             ua_add_test(pubsub/check_pubsub_connection_mqtt.c)
+            ua_add_test(pubsub/check_pubsub_mqtt.c)
         endif()
     endif()
     if(UA_ENABLE_PUBSUB_FILE_CONFIG)
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 412d8e9e92d..389986ea2a4 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -57,7 +57,7 @@ static void AddConnection(
     connectionConfig.publisherId.uint32 = PublisherId;
 
     ck_assert(UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_PubSubConnection_regist(server, opConnectionId) == UA_STATUSCODE_GOOD);
+    ck_assert(UA_PubSubConnection_regist(server, opConnectionId, NULL) == UA_STATUSCODE_GOOD);
 }
 
 /***************************************************************************************************/
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
new file mode 100644
index 00000000000..a9a9bdd77cd
--- /dev/null
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -0,0 +1,337 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
+ */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <open62541/plugin/pubsub_mqtt.h>
+
+#include "ua_server_internal.h"
+
+#include <check.h>
+
+#define TEST_MQTT_SERVER "opc.mqtt://localhost:1883"
+#define MQTT_CLIENT_ID               "TESTCLIENTPUBSUBMQTT"
+#define CONNECTIONOPTION_NAME        "mqttClientId"
+#define SUBSCRIBE_TOPIC              "customTopic"
+#define SUBSCRIBE_INTERVAL             500
+
+UA_Server *server = NULL;
+UA_ServerConfig *config = NULL;
+
+UA_NodeId connectionIdent;
+UA_NodeId subscribedDataSetIdent;
+UA_NodeId readerGroupIdent;
+
+UA_NodeId publishedDataSetIdent;
+UA_NodeId writerGroupIdent;
+
+UA_DataSetReaderConfig readerConfig;
+
+static void setup(void) {
+    server = UA_Server_new();
+    config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
+    UA_Server_run_startup(server);
+
+    //add connection
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("Mqtt Connection");
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+    connectionConfig.enabled = UA_TRUE;
+
+
+    /* configure address of the mqtt broker (local on default port) */
+    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING(TEST_MQTT_SERVER)};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    /* Changed to static publisherId from random generation to identify
+     * the publisher on Subscriber side */
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
+
+    /* configure options, set mqtt client id */
+    const int connectionOptionsCount = 1;
+
+    UA_KeyValuePair connectionOptions[connectionOptionsCount];
+
+    size_t connectionOptionIndex = 0;
+    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, CONNECTIONOPTION_NAME);
+    UA_String mqttClientId = UA_STRING(MQTT_CLIENT_ID);
+    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttClientId, &UA_TYPES[UA_TYPES_STRING]);
+
+    connectionConfig.connectionProperties = connectionOptions;
+    connectionConfig.connectionPropertiesSize = connectionOptionIndex;
+
+    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
+    if(pMetaData == NULL) {
+        return;
+    }
+
+    UA_DataSetMetaDataType_init (pMetaData);
+    pMetaData->name = UA_STRING ("DataSet 1");
+
+    /* Static definition of number of fields size to 4 to create four different
+     * targetVariables of distinct datatype
+     * Currently the publisher sends only DateTime data type */
+    pMetaData->fieldsSize = 4;
+    pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
+                                                         &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+
+    /* DateTime DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[0]);
+    UA_NodeId_copy (&UA_TYPES[UA_TYPES_DATETIME].typeId,
+                    &pMetaData->fields[0].dataType);
+    pMetaData->fields[0].builtInType = UA_NS0ID_DATETIME;
+    pMetaData->fields[0].name =  UA_STRING ("DateTime");
+    pMetaData->fields[0].valueRank = -1; /* scalar */
+
+    /* Int32 DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[1]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT32].typeId,
+                   &pMetaData->fields[1].dataType);
+    pMetaData->fields[1].builtInType = UA_NS0ID_INT32;
+    pMetaData->fields[1].name =  UA_STRING ("Int32");
+    pMetaData->fields[1].valueRank = -1; /* scalar */
+
+    /* Int64 DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[2]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT64].typeId,
+                   &pMetaData->fields[2].dataType);
+    pMetaData->fields[2].builtInType = UA_NS0ID_INT64;
+    pMetaData->fields[2].name =  UA_STRING ("Int64");
+    pMetaData->fields[2].valueRank = -1; /* scalar */
+
+    /* Boolean DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[3]);
+    UA_NodeId_copy (&UA_TYPES[UA_TYPES_BOOLEAN].typeId,
+                    &pMetaData->fields[3].dataType);
+    pMetaData->fields[3].builtInType = UA_NS0ID_BOOLEAN;
+    pMetaData->fields[3].name =  UA_STRING ("BoolToggle");
+    pMetaData->fields[3].valueRank = -1; /* scalar */
+}
+
+START_TEST(SinglePublishSubscribeDateTime){
+        UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
+        // add PublishedDataSet
+        UA_PublishedDataSetConfig pdsConfig;
+        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+        pdsConfig.name = UA_STRING("PublishedDataSet 1");
+        UA_AddPublishedDataSetResult result =
+            UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetIdent);
+        ck_assert_int_eq(result.addResult, UA_STATUSCODE_GOOD);
+
+        /* Add a field to the previous created PublishedDataSet */
+        UA_DataSetFieldConfig dataSetFieldConfig;
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
+        dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
+            UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+        dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+        UA_DataSetFieldResult dsFieldResult =
+            UA_Server_addDataSetField(server, publishedDataSetIdent, &dataSetFieldConfig, NULL);
+        ck_assert_int_eq(dsFieldResult.result, UA_STATUSCODE_GOOD);
+
+        // add writer group
+        UA_WriterGroupConfig writerGroupConfig;
+        memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+        writerGroupConfig.name = UA_STRING("Demo WriterGroup");
+        writerGroupConfig.publishingInterval = SUBSCRIBE_INTERVAL;
+        writerGroupConfig.enabled = UA_FALSE;
+        writerGroupConfig.writerGroupId = 100;
+        UA_UadpWriterGroupMessageDataType *writerGroupMessage;
+
+        writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+        writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+        writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+        writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+        writerGroupMessage->networkMessageContentMask =
+            (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                               (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                               (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                               (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+        writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+
+        /* configure the mqtt publish topic */
+        UA_BrokerWriterGroupTransportDataType brokerTransportSettings;
+        memset(&brokerTransportSettings, 0, sizeof(UA_BrokerWriterGroupTransportDataType));
+        brokerTransportSettings.queueName = UA_STRING(SUBSCRIBE_TOPIC);
+        brokerTransportSettings.resourceUri = UA_STRING_NULL;
+        brokerTransportSettings.authenticationProfileUri = UA_STRING_NULL;
+
+        brokerTransportSettings.requestedDeliveryGuarantee = UA_BROKERTRANSPORTQUALITYOFSERVICE_BESTEFFORT;
+
+        UA_ExtensionObject transportSettings;
+        memset(&transportSettings, 0, sizeof(UA_ExtensionObject));
+        transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+        transportSettings.content.decoded.type = &UA_TYPES[UA_TYPES_BROKERWRITERGROUPTRANSPORTDATATYPE];
+        transportSettings.content.decoded.data = &brokerTransportSettings;
+
+        writerGroupConfig.transportSettings = transportSettings;
+        retval = UA_Server_addWriterGroup(server, connectionIdent, &writerGroupConfig, &writerGroupIdent);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+        retval = UA_Server_setWriterGroupOperational(server, writerGroupIdent);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+        UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+
+        // add DataSetWriter
+        UA_NodeId dataSetWriterIdent;
+        UA_DataSetWriterConfig dataSetWriterConfig;
+        memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+        dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
+        dataSetWriterConfig.dataSetWriterId = 62541;
+        dataSetWriterConfig.keyFrameCount = 10;
+        dataSetWriterConfig.transportSettings = transportSettings;
+
+        retval = UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
+                                            &dataSetWriterConfig, &dataSetWriterIdent);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+        UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroupIdent);
+        ck_assert(wg != 0);
+        UA_WriterGroup_publishCallback(server, wg);
+
+        /*---------------------------------------------------------------------*/
+
+        // add reader group
+        UA_ReaderGroupConfig readerGroupConfig;
+        memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
+        readerGroupConfig.name = UA_STRING("ReaderGroup1");
+        readerGroupConfig.subscribingInterval = SUBSCRIBE_INTERVAL;
+
+        /* configure the mqtt publish topic */
+        UA_BrokerWriterGroupTransportDataType brokerTransportSettingsSubscriber;
+        memset(&brokerTransportSettingsSubscriber, 0, sizeof(UA_BrokerWriterGroupTransportDataType));
+
+        brokerTransportSettingsSubscriber.queueName = UA_STRING(SUBSCRIBE_TOPIC);
+        brokerTransportSettingsSubscriber.resourceUri = UA_STRING_NULL;
+        brokerTransportSettingsSubscriber.authenticationProfileUri = UA_STRING_NULL;
+
+        brokerTransportSettingsSubscriber.requestedDeliveryGuarantee = UA_BROKERTRANSPORTQUALITYOFSERVICE_BESTEFFORT;
+
+        UA_ExtensionObject transportSettingsSubscriber;
+        memset(&transportSettingsSubscriber, 0, sizeof(UA_ExtensionObject));
+        transportSettingsSubscriber.encoding = UA_EXTENSIONOBJECT_DECODED;
+        transportSettingsSubscriber.content.decoded.type = &UA_TYPES[UA_TYPES_BROKERDATASETREADERTRANSPORTDATATYPE];
+        transportSettingsSubscriber.content.decoded.data = &brokerTransportSettingsSubscriber;
+
+        readerGroupConfig.transportSettings = transportSettingsSubscriber;
+
+        retval = UA_Server_addReaderGroup(server, connectionIdent, &readerGroupConfig,
+                                          &readerGroupIdent);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+        retval = UA_Server_setReaderGroupOperational(server, readerGroupIdent);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+        // add DataSetReader
+        memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
+        readerConfig.name = UA_STRING("DataSet Reader 1");
+        UA_UInt32 publisherIdentifier = 2234;
+        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT32];
+        readerConfig.publisherId.data = &publisherIdentifier;
+        readerConfig.writerGroupId    = 100;
+        readerConfig.dataSetWriterId  = 62541;
+
+        fillTestDataSetMetaData(&readerConfig.dataSetMetaData);
+
+        retval = UA_Server_addDataSetReader(server, readerGroupIdent, &readerConfig,
+                                            &subscribedDataSetIdent);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+
+        // add SubscribedVariables
+        UA_NodeId folderId;
+        UA_String folderName = readerConfig.dataSetMetaData.name;
+        UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+        UA_QualifiedName folderBrowseName;
+        if(folderName.length > 0) {
+            oAttr.displayName.locale = UA_STRING ("en-US");
+            oAttr.displayName.text = folderName;
+            folderBrowseName.namespaceIndex = 1;
+            folderBrowseName.name = folderName;
+        }
+        else {
+            oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
+            folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
+        }
+
+        retval = UA_Server_addObjectNode (server, UA_NODEID_NULL,
+                                          UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+                                          UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+                                          folderBrowseName, UA_NODEID_NUMERIC (0,
+                                                                               UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+        /* Create the TargetVariables with respect to DataSetMetaData fields */
+        UA_FieldTargetVariable *targetVars = (UA_FieldTargetVariable *)
+            UA_calloc(readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
+        for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++) {
+            /* Variable to subscribe data */
+            UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+            UA_LocalizedText_copy(&readerConfig.dataSetMetaData.fields[i].description,
+                                  &vAttr.description);
+            vAttr.displayName.locale = UA_STRING("en-US");
+            vAttr.displayName.text = readerConfig.dataSetMetaData.fields[i].name;
+            vAttr.dataType = readerConfig.dataSetMetaData.fields[i].dataType;
+
+            UA_NodeId newNode;
+            retval |= UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, (UA_UInt32)i + 50000),
+                                                folderId,
+                                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                                UA_QUALIFIEDNAME(1, (char *)readerConfig.dataSetMetaData.fields[i].name.data),
+                                                UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                                vAttr, NULL, &newNode);
+            ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+            /* For creating Targetvariables */
+            UA_FieldTargetDataType_init(&targetVars[i].targetVariable);
+            targetVars[i].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+            targetVars[i].targetVariable.targetNodeId = newNode;
+        }
+
+        retval = UA_Server_DataSetReader_createTargetVariables(server, subscribedDataSetIdent,
+                                                               readerConfig.dataSetMetaData.fieldsSize, targetVars);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+        for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++)
+            UA_FieldTargetDataType_clear(&targetVars[i].targetVariable);
+
+        UA_free(targetVars);
+        UA_free(readerConfig.dataSetMetaData.fields);
+
+    } END_TEST
+
+int main(void) {
+    TCase *tc_pubsub_subscribe_mqtt = tcase_create("PubSub subscribe mqtt");
+    tcase_add_checked_fixture(tc_pubsub_subscribe_mqtt, setup, teardown);
+    tcase_add_test(tc_pubsub_subscribe_mqtt, SinglePublishSubscribeDateTime);
+
+    Suite *s = suite_create("PubSub subscribe via mqtt");
+    suite_add_tcase(s, tc_pubsub_subscribe_mqtt);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index e8bd79da008..337d5ff2239 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -71,7 +71,7 @@ static void AddConnection(
     /* deep copy is not needed (not even for string) because UA_Server_addPubSubConnection performs deep copy */
     connectionConfig.publisherId = publisherId;
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId));
-    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_PubSubConnection_regist(server, opConnectionId));
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_PubSubConnection_regist(server, opConnectionId, NULL));
 }
 
 /***************************************************************************************************/
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index d2b6f95bdee..d130cb36bb0 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -99,7 +99,7 @@ static void AddConnection(
     connectionConfig.publisherId.uint32 = PublisherId;
 
     ck_assert(UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_PubSubConnection_regist(server, opConnectionId) == UA_STATUSCODE_GOOD);
+    ck_assert(UA_PubSubConnection_regist(server, opConnectionId, NULL) == UA_STATUSCODE_GOOD);
 }
 
 /***************************************************************************************************/

From 95c5799bfb71aa1778a1e6a2aae7cf5ffb4b0dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o-Paul=20G=C3=A9neau?= <leo-paul.geneau@nexedi.com>
Date: Tue, 16 Aug 2022 10:33:17 +0200
Subject: [PATCH 0398/1963] fix(pubsub): UA_PubSubChannelUDPMC_regist supports
 different interface in IPv6 (#5163)

Co-authored-by: Thomas Gambier <thomas.gambier@nexedi.com>
Co-authored-by: andreasebner <andreas.ebner@iosb.fraunhofer.de>
---
 plugins/ua_pubsub_udp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 8d92027a5ff..4229172168c 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -200,6 +200,8 @@ setupNetworkInterface(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
                          "Interface configuration preparation failed.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
+        memcpy(&channelDataUDPMC->intf_addr, &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface,
+               sizeof(channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface));
 #endif
     } else {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
@@ -594,6 +596,7 @@ UA_PubSubChannelUDPMC_regist(UA_PubSubChannel *channel, UA_ExtensionObject *tran
         memcpy(&groupV6.ipv6mr_multiaddr,
                &((const struct sockaddr_in6 *) &connectionConfig->ai_addr)->sin6_addr,
                sizeof(struct in6_addr));
+        memcpy(&groupV6.ipv6mr_interface, &connectionConfig->intf_addr, sizeof(int));
 
         if(UA_setsockopt(channel->sockfd,
             connectionConfig->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,

From 8e7fcf72ee76030c13f20b6ff394a01b14fbf366 Mon Sep 17 00:00:00 2001
From: ozlb <ozlb@users.noreply.github.com>
Date: Tue, 16 Aug 2022 16:43:27 +0200
Subject: [PATCH 0399/1963]  fix(arch): Replace #ifdef UA_IPV6 with #if UA_IPV6

Co-authored-by: andreasebner <andreas.ebner@iosb.fraunhofer.de>
---
 arch/eventloop_posix_udp.c | 10 ++++++----
 plugins/ua_pubsub_udp.c    |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 5ff95cb7a10..9551c26d386 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -10,7 +10,7 @@
 
 #define IPV4_PREFIX_MASK 0xF0
 #define IPV4_MULTICAST_PREFIX 0xE0
-#ifdef UA_IPV6
+#if UA_IPV6
 #   define IPV6_PREFIX_MASK 0xFF
 #   define IPV6_MULTICAST_PREFIX 0xFF
 #endif
@@ -271,10 +271,12 @@ isIPv4MulticastAddress(const UA_Byte *address) {
     return isMulticastAddress(address, IPV4_PREFIX_MASK, IPV4_MULTICAST_PREFIX);
 }
 
+#if UA_IPV6
 static UA_Boolean
 isIPv6MulticastAddress(const UA_Byte *address) {
     return isMulticastAddress(address, IPV6_PREFIX_MASK, IPV6_MULTICAST_PREFIX);
 }
+#endif
 
 static UA_StatusCode
 setConnectionConfig(UA_FD socket, const UA_KeyValuePair *connectionProperties,
@@ -433,7 +435,7 @@ setupListenMulticastIPv4(UA_FD socket, size_t paramsSize, const UA_KeyValuePair
     return UA_STATUSCODE_GOOD;
 }
 
-#ifdef UA_IPV6
+#if UA_IPV6
 static UA_StatusCode
 setupListenMulticastIPv6(UA_FD socket, size_t paramsSize, const UA_KeyValuePair *params, struct sockaddr_in6 *addr,
                          const UA_Logger *logger) {
@@ -705,7 +707,7 @@ checkForListenMulticastAndConfigure(struct addrinfo *info, size_t paramsSize, co
                                            paramsSize, params, (struct sockaddr_in *)info->ai_addr,
                                            logger);
         }
-#ifdef UA_IPV6
+#if UA_IPV6
     } else if(info->ai_family == AF_INET6) {
         UA_Byte *addressVal = (UA_Byte *) &((struct sockaddr_in6 *)info->ai_addr)->sin6_addr;
         if(isIPv6MulticastAddress(addressVal)) {
@@ -1029,7 +1031,7 @@ checkForSendMulticastAndConfigure(size_t paramsSize, const UA_KeyValuePair *para
                                          paramsSize,
                                          params, logger);
         }
-#ifdef UA_IPV6
+#if UA_IPV6
     } else if(info->ai_family == AF_INET6) {
         struct sockaddr_in6* addr = (struct sockaddr_in6 *)info->ai_addr;
         UA_Byte *addressVal = (UA_Byte *) &addr->sin6_addr;
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 4229172168c..1a9ab1219d9 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -20,7 +20,7 @@
 
 #define UA_IPV4_PREFIX_MASK 0xF0000000
 #define UA_IPV4_MULTICAST_PREFIX 0xE0000000
-#ifdef UA_IPV6
+#if UA_IPV6
 #   define UA_IPV6_MULTICAST_PREFIX 0xFF
 #endif
 
@@ -212,7 +212,7 @@ setupNetworkInterface(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
     return UA_STATUSCODE_GOOD;
 }
 
-#ifdef UA_IPV6
+#if UA_IPV6
 static UA_INLINE UA_StatusCode
 setMulticastInfoIPV6(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addressAsChar) {
     int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET6, addressAsChar,
@@ -266,7 +266,7 @@ configureMulticast(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
     /* Check if the ip address is a multicast address */
     if(channelDataUDPMC->ai_family == AF_INET) {
         res = setMulticastInfoIPv4(channelDataUDPMC, addressAsChar);
-#ifdef UA_IPV6
+#if UA_IPV6
     } else if(channelDataUDPMC->ai_family == AF_INET6) {
         res = setMulticastInfoIPV6(channelDataUDPMC, addressAsChar);
 #endif

From d499becd7d0be40b99b7864ef6c31784c16a7908 Mon Sep 17 00:00:00 2001
From: David Linder <19273958+linderd@users.noreply.github.com>
Date: Wed, 17 Aug 2022 09:11:13 +0200
Subject: [PATCH 0400/1963] fix(doc): Fix command in the examples-section of
 the README (#5303)

fix the gcc linking argument in the examples-section of the README, see https://github.com/open62541/open62541/issues/3248#issuecomment-568370301
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4361ff31fc0..1549ca08ff9 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ To build the examples, we recommend to install the open62541 project as mentione
 
 The following simple server example can be built using gcc, after you installed open62541 on your system.
 
-Using the GCC compiler, just run ```gcc -std=c99 -lopen62541 -DUA_ARCHITECTURE_POSIX <server.c> -o server``` (under Windows you may need to add ``` -lws2_32``` 
+Using the GCC compiler, just run ```gcc -std=c99 -DUA_ARCHITECTURE_POSIX <server.c> -lopen62541 -o server``` (under Windows you may need to add ``` -lws2_32``` 
 and change `-DUA_ARCHITECTURE_POSIX` to `-DUA_ARCHITECTURE_WIN32`).
 ```c
 #include <signal.h>

From 339cc37b738b899d00459cf4901bc639020c3868 Mon Sep 17 00:00:00 2001
From: along <alongL@users.noreply.github.com>
Date: Thu, 18 Aug 2022 15:42:14 +0800
Subject: [PATCH 0401/1963] fix(examples): usage() mistake (#5299)

In the usage() , the PCP should be 3 to meet the semantic.
```
 -pubUri     [name]   Publisher Mac address (default opc.eth://01-00-5E-00-00-01:8.7 - where 8 is the VLAN ID and 3 is the PCP)
 -subUri     [name]   Subscriber Mac address (default opc.eth://01-00-5E-7F-00-01:8.7 - where 8 is the VLAN ID and 3 is the PCP)
```
---
 examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index 25901be7ea3..c981e070118 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -84,12 +84,12 @@
 #define             PUBLISHER_ID                          2235
 #define             WRITER_GROUP_ID                       100
 #define             DATA_SET_WRITER_ID                    62541
-#define             DEFAULT_PUBLISHING_MAC_ADDRESS        "opc.eth://01-00-5E-00-00-01:8.7"
+#define             DEFAULT_PUBLISHING_MAC_ADDRESS        "opc.eth://01-00-5E-00-00-01:8.3"
 #define             DEFAULT_PUBLISHER_MULTICAST_ADDRESS   "opc.udp://224.0.0.32:4840/"
 #define             PUBLISHER_ID_SUB                      2234
 #define             WRITER_GROUP_ID_SUB                   101
 #define             DATA_SET_WRITER_ID_SUB                62541
-#define             DEFAULT_SUBSCRIBING_MAC_ADDRESS       "opc.eth://01-00-5E-7F-00-01:8.7"
+#define             DEFAULT_SUBSCRIBING_MAC_ADDRESS       "opc.eth://01-00-5E-7F-00-01:8.3"
 #define             DEFAULT_SUBSCRIBER_MULTICAST_ADDRESS  "opc.udp://224.0.0.22:4840/"
 #define             REPEATED_NODECOUNTS                   2   // Default to publish 64 bytes
 #define             PORT_NUMBER                           62541

From 18d91c794dd365a2c69c0bc85e1d63de8b1725b3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 11 Aug 2022 03:33:22 +0200
Subject: [PATCH 0402/1963] refactor(client): Remove old client network
 interface

---
 include/open62541/client.h  | 6 ------
 plugins/ua_config_default.c | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index ca43a55773b..379989b0595 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -147,12 +147,6 @@ typedef struct {
     /* Certificate Verification Plugin */
     UA_CertificateVerification certificateVerification;
 
-    /* Callbacks for async connection handshakes */
-    UA_ConnectClientConnection initConnectionFunc;
-    UA_StatusCode (*pollConnectionFunc)(UA_Connection *connection,
-                                        UA_UInt32 timeout,
-                                        const UA_Logger *logger);
-
     /* Callback for state changes. The client state is differentated into the
      * SecureChannel state and the Session state. The connectStatus is set if
      * the client connection (including reconnects) has failed and the client
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 1a7ce17ac27..c26091a6fb7 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -15,7 +15,6 @@
 
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
-#include <open62541/network_tcp.h>
 #ifdef UA_ENABLE_WEBSOCKET_SERVER
 #include <open62541/network_ws.h>
 #endif
@@ -861,9 +860,6 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     }
     config->securityPoliciesSize = 1;
 
-    config->initConnectionFunc = UA_ClientConnectionTCP_init; /* for async client */
-    config->pollConnectionFunc = UA_ClientConnectionTCP_poll; /* for async connection */
-
     config->customDataTypes = NULL;
     config->stateCallback = NULL;
     config->connectivityCheckInterval = 0;

From 8a1d7580c552bfe451e368bdef880e30710d4f89 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 11 Aug 2022 03:39:09 +0200
Subject: [PATCH 0403/1963] refactor(core): Remove the old network layer code

---
 CMakeLists.txt                   |   2 -
 arch/network_tcp.c               | 444 -------------------------------
 include/open62541/network_tcp.h  |  33 ---
 plugins/mqtt/ua_mqtt-c_adapter.h |   2 +-
 tests/CMakeLists.txt             |   1 -
 tests/fuzz/CMakeLists.txt        |   2 +-
 6 files changed, 2 insertions(+), 482 deletions(-)
 delete mode 100644 arch/network_tcp.c
 delete mode 100644 include/open62541/network_tcp.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a9f8f4ec96..33b521576f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,6 @@ GET_PROPERTY(ua_architecture_headers_beginning GLOBAL PROPERTY UA_ARCHITECTURE_H
 GET_PROPERTY(ua_architecture_sources GLOBAL PROPERTY UA_ARCHITECTURE_SOURCES)
 
 set(ua_architecture_sources ${ua_architecture_sources}
-    ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
@@ -131,7 +130,6 @@ set(ua_architecture_sources ${ua_architecture_sources}
 )
 
 set(ua_architecture_headers ${ua_architecture_headers}
-    ${PROJECT_SOURCE_DIR}/include/open62541/network_tcp.h
     ${PROJECT_SOURCE_DIR}/include/open62541/architecture_functions.h
 )
 
diff --git a/arch/network_tcp.c b/arch/network_tcp.c
deleted file mode 100644
index b46a66be6e7..00000000000
--- a/arch/network_tcp.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2016-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- *    Copyright 2016-2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2017 (c) frax2222
- *    Copyright 2017 (c) Jose Cabral
- *    Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
- *    Copyright 2020 (c) HMS Industrial Networks AB (Author: Jonas Green)
- */
-
-#define UA_INTERNAL
-
-#include <open62541/config.h>
-#include <open62541/network_tcp.h>
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/util.h>
-
-#include "open62541_queue.h"
-#include "ua_securechannel.h"
-
-#include <string.h>  // memset
-
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-typedef struct TCPClientConnection {
-    struct addrinfo hints, *server;
-    UA_DateTime connStart;
-    UA_String endpointUrl;
-    UA_UInt32 timeout;
-} TCPClientConnection;
-
-/****************************/
-/* Generic Socket Functions */
-/****************************/
-
-static UA_StatusCode
-connection_getsendbuffer(UA_Connection *connection,
-                         size_t length, UA_ByteString *buf) {
-    UA_SecureChannel *channel = connection->channel;
-    if(channel && channel->config.sendBufferSize < length)
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    return UA_ByteString_allocBuffer(buf, length);
-}
-
-static void
-connection_releasesendbuffer(UA_Connection *connection,
-                             UA_ByteString *buf) {
-    UA_ByteString_clear(buf);
-}
-
-static void
-connection_releaserecvbuffer(UA_Connection *connection,
-                             UA_ByteString *buf) {
-    UA_ByteString_clear(buf);
-}
-
-static UA_StatusCode
-connection_write(UA_Connection *connection, UA_ByteString *buf) {
-    if(connection->state == UA_CONNECTIONSTATE_CLOSED) {
-        UA_ByteString_clear(buf);
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-    }
-
-    /* Prevent OS signals when sending to a closed socket */
-    int flags = 0;
-    flags |= MSG_NOSIGNAL;
-
-    struct pollfd poll_fd[1];
-    poll_fd[0].fd = connection->sockfd;
-    poll_fd[0].events = UA_POLLOUT;
-
-    /* Send the full buffer. This may require several calls to send */
-    size_t nWritten = 0;
-    do {
-        ssize_t n = 0;
-        do {
-            size_t bytes_to_send = buf->length - nWritten;
-            n = UA_send(connection->sockfd,
-                        (const char*)buf->data + nWritten,
-                        bytes_to_send, flags);
-            if(n<0) {
-                if(UA_ERRNO != UA_INTERRUPTED && UA_ERRNO != UA_AGAIN) {
-                    connection->close(connection);
-                    UA_ByteString_clear(buf);
-                    return UA_STATUSCODE_BADCONNECTIONCLOSED;
-                }
-                int poll_ret;
-                do {
-                    poll_ret = UA_poll (poll_fd, 1, 1000);
-                } while (poll_ret == 0 || (poll_ret < 0 && UA_ERRNO == UA_INTERRUPTED));
-            }
-        } while(n < 0);
-
-        nWritten += (size_t)n;
-    } while(nWritten < buf->length);
-
-    /* Free the buffer */
-    UA_ByteString_clear(buf);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-connection_recv(UA_Connection *connection, UA_ByteString *response,
-                UA_UInt32 timeout) {
-    if(connection->state == UA_CONNECTIONSTATE_CLOSED)
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-
-    /* Listen on the socket for the given timeout until a message arrives */
-    fd_set fdset;
-    FD_ZERO(&fdset);
-    UA_fd_set(connection->sockfd, &fdset);
-    UA_UInt32 timeout_usec = timeout * 1000;
-    struct timeval tmptv = {(long int)(timeout_usec / 1000000),
-                            (int)(timeout_usec % 1000000)};
-    int resultsize = UA_select(connection->sockfd+1, &fdset, NULL, NULL, &tmptv);
-
-    /* No result */
-    if(resultsize == 0)
-        return UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
-
-    if(resultsize == -1) {
-        /* The call to select was interrupted. Act as if it timed out. */
-        if(UA_ERRNO == UA_INTERRUPTED)
-            return UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
-
-        /* The error cannot be recovered. Close the connection. */
-        connection->close(connection);
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-    }
-
-    UA_Boolean internallyAllocated = !response->length;
-
-    /* Allocate the buffer  */
-    if(internallyAllocated) {
-        size_t bufferSize = 16384; /* Use as default for a new SecureChannel */
-        UA_SecureChannel *channel = connection->channel;
-        if(channel && channel->config.recvBufferSize > 0)
-            bufferSize = channel->config.recvBufferSize;
-        UA_StatusCode res = UA_ByteString_allocBuffer(response, bufferSize);
-        if(res != UA_STATUSCODE_GOOD)
-            return res;
-    }
-
-    /* Get the received packet(s) */
-    ssize_t ret = UA_recv(connection->sockfd, (char*)response->data, response->length, 0);
-
-    /* The remote side closed the connection */
-    if(ret == 0) {
-        if(internallyAllocated)
-            UA_ByteString_clear(response);
-        connection->close(connection);
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-    }
-
-    /* Error case */
-    if(ret < 0) {
-        if(internallyAllocated)
-            UA_ByteString_clear(response);
-        if(UA_ERRNO == UA_INTERRUPTED || (timeout > 0) ?
-           false : (UA_ERRNO == UA_AGAIN || UA_ERRNO == UA_WOULDBLOCK))
-            return UA_STATUSCODE_GOOD; /* statuscode_good but no data -> retry */
-        connection->close(connection);
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-    }
-
-    /* Set the length of the received buffer */
-    response->length = (size_t)ret;
-    return UA_STATUSCODE_GOOD;
-}
-
-
-/***************************/
-/* Client NetworkLayer TCP */
-/***************************/
-
-static void
-ClientNetworkLayerTCP_close(UA_Connection *connection) {
-    if(connection->state == UA_CONNECTIONSTATE_CLOSED)
-        return;
-
-    if(connection->sockfd != UA_INVALID_SOCKET) {
-        UA_shutdown(connection->sockfd, 2);
-        UA_close(connection->sockfd);
-    }
-    connection->state = UA_CONNECTIONSTATE_CLOSED;
-}
-
-static void
-ClientNetworkLayerTCP_free(UA_Connection *connection) {
-    if(!connection->handle)
-        return;
-
-    TCPClientConnection *tcpConnection = (TCPClientConnection *)connection->handle;
-    if(tcpConnection->server)
-        UA_freeaddrinfo(tcpConnection->server);
-    UA_String_clear(&tcpConnection->endpointUrl);
-    UA_free(tcpConnection);
-    connection->handle = NULL;
-}
-
-UA_StatusCode
-UA_ClientConnectionTCP_poll(UA_Connection *connection, UA_UInt32 timeout,
-                            const UA_Logger *logger) {
-    if(connection->state == UA_CONNECTIONSTATE_CLOSED)
-        return UA_STATUSCODE_BADDISCONNECT;
-    if(connection->state == UA_CONNECTIONSTATE_ESTABLISHED)
-        return UA_STATUSCODE_GOOD;
-
-    /* Connection timeout? */
-    TCPClientConnection *tcpConnection = (TCPClientConnection*) connection->handle;
-    if((UA_Double) (UA_DateTime_nowMonotonic() - tcpConnection->connStart)
-       > (UA_Double) tcpConnection->timeout * UA_DATETIME_MSEC ) {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK, "Timed out");
-        ClientNetworkLayerTCP_close(connection);
-        return UA_STATUSCODE_BADDISCONNECT;
-    }
-
-    /* Get a socket and connect (only once) if not already done in a previous
-     * call. On win32, calling connect multiple times is not recommended on
-     * non-blocking sockets
-     * (https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-connect).
-     * On posix it is also not necessary to call connect multiple times.
-     *
-     * Identification of successfull connection is done using select (writeable/errorfd)
-     * and getsockopt using SO_ERROR on win32 and posix.
-     */
-    if(connection->sockfd == UA_INVALID_SOCKET) {
-        connection->sockfd = UA_socket(tcpConnection->server->ai_family,
-                                       tcpConnection->server->ai_socktype,
-                                       tcpConnection->server->ai_protocol);
-        if(connection->sockfd == UA_INVALID_SOCKET) {
-            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                           "Could not create client socket: %s", strerror(UA_ERRNO));
-            ClientNetworkLayerTCP_close(connection);
-            return UA_STATUSCODE_BADDISCONNECT;
-        }
-
-        /* Non blocking connect to be able to timeout */
-        if(UA_socket_set_nonblocking(connection->sockfd) != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                           "Could not set the client socket to nonblocking");
-            ClientNetworkLayerTCP_close(connection);
-            return UA_STATUSCODE_BADDISCONNECT;
-        }
-
-        /* Don't have the socket create interrupt signals */
-#ifdef SO_NOSIGPIPE
-        int val = 1;
-        int sso_result = setsockopt(connection->sockfd, SOL_SOCKET, SO_NOSIGPIPE,
-                                    (void *)&val, sizeof(val));
-        if(sso_result < 0)
-            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK, "Couldn't set SO_NOSIGPIPE");
-#endif
-        int error = UA_connect(connection->sockfd, tcpConnection->server->ai_addr,
-                               tcpConnection->server->ai_addrlen);
-
-        /* Connection successful */
-        if(error == 0) {
-            connection->state = UA_CONNECTIONSTATE_ESTABLISHED;
-            return UA_STATUSCODE_GOOD;
-        }
-
-        /* The connection failed */
-        if(UA_ERRNO != UA_WOULDBLOCK && UA_ERRNO != UA_INPROGRESS) {
-            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                           "Connection to %.*s failed with error: %s",
-                           (int)tcpConnection->endpointUrl.length,
-                           tcpConnection->endpointUrl.data, strerror(UA_ERRNO));
-            ClientNetworkLayerTCP_close(connection);
-            return UA_STATUSCODE_BADDISCONNECT;
-        }
-    }
-
-    /* Use select to wait until connected. Return with a half-opened connection
-     * after a timeout. */
-    UA_UInt32 timeout_usec = timeout * 1000;
-
-#ifdef _OS9000
-    /* OS-9 cannot use select for checking write sockets. Therefore, we need to
-     * use connect until success or failed */
-    int resultsize = 0;
-    do {
-        u_int32 time = 0x80000001;
-        signal_code sig;
-
-        timeout_usec -= 1000000/256;    // Sleep 1/256 second
-        if(timeout_usec < 0)
-            break;
-
-        _os_sleep(&time, &sig);
-        error = connect(connection->sockfd, tcpConnection->server->ai_addr,
-                        tcpConnection->server->ai_addrlen);
-        if((error == -1 && UA_ERRNO == EISCONN) || (error == 0))
-            resultsize = 1;
-        if(error == -1 && UA_ERRNO != UA_ALREADY && UA_ERRNO != UA_INPROGRESS)
-            break;
-    } while(resultsize == 0);
-#else
-    /* Wait in a select-call until the connection fully opens or the timeout
-     * happens */
-
-    /* On windows select both writing and error fdset */
-    fd_set writing_fdset;
-    FD_ZERO(&writing_fdset);
-    UA_fd_set(connection->sockfd, &writing_fdset);
-    fd_set error_fdset;
-    FD_ZERO(&error_fdset);
-#ifdef _WIN32
-    UA_fd_set(connection->sockfd, &error_fdset);
-#endif
-    struct timeval tmptv = {(long int)(timeout_usec / 1000000),
-                            (int)(timeout_usec % 1000000)};
-
-    int ret = UA_select((UA_Int32)(connection->sockfd + 1), NULL, &writing_fdset,
-                        &error_fdset, &tmptv);
-
-    // When select fails abort connection
-    if(ret == -1) {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "Connection to %.*s failed with error: %s",
-                       (int)tcpConnection->endpointUrl.length,
-                       tcpConnection->endpointUrl.data, strerror(UA_ERRNO));
-        ClientNetworkLayerTCP_close(connection);
-        return UA_STATUSCODE_BADDISCONNECT;
-    } else if (timeout && ret == 0) {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "Connection to %.*s timed out",
-                       (int)tcpConnection->endpointUrl.length,
-                       tcpConnection->endpointUrl.data);
-        ClientNetworkLayerTCP_close(connection);
-        return UA_STATUSCODE_BADTIMEOUT;
-    }
-
-    int resultsize = UA_fd_isset(connection->sockfd, &writing_fdset);
-#endif
-
-    /* Any errors on the socket reported? */
-    OPTVAL_TYPE so_error = 0;
-    socklen_t len = sizeof(so_error);
-    ret = UA_getsockopt(connection->sockfd, SOL_SOCKET, SO_ERROR, &so_error, &len);
-    if(ret != 0 || so_error != 0) {
-        // UA_LOG_SOCKET_ERRNO_GAI_WRAP because of so_error
-#ifndef _WIN32
-        char *errno_str = strerror(ret == 0 ? so_error : UA_ERRNO);
-#else
-        char *errno_str = NULL;
-        FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
-                           FORMAT_MESSAGE_IGNORE_INSERTS,
-                       NULL, ret == 0 ? so_error : WSAGetLastError(),
-                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&errno_str, 0,
-                       NULL);
-#endif
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "Connection to %.*s failed with error: %s",
-                       (int)tcpConnection->endpointUrl.length,
-                       tcpConnection->endpointUrl.data, errno_str);
-#ifdef _WIN32
-        LocalFree(errno_str);
-#endif
-        ClientNetworkLayerTCP_close(connection);
-        return UA_STATUSCODE_BADDISCONNECT;
-    }
-
-    /* The connection is fully opened. Otherwise, select has timed out. But we
-     * can retry. */
-    if(resultsize > 0)
-        connection->state = UA_CONNECTIONSTATE_ESTABLISHED;
-
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_Connection
-UA_ClientConnectionTCP_init(UA_ConnectionConfig config, const UA_String endpointUrl,
-                            UA_UInt32 timeout, const UA_Logger *logger) {
-    UA_initialize_architecture_network();
-
-    UA_Connection connection;
-    memset(&connection, 0, sizeof(UA_Connection));
-
-    connection.state = UA_CONNECTIONSTATE_OPENING;
-    connection.sockfd = UA_INVALID_SOCKET;
-    connection.send = connection_write;
-    connection.recv = connection_recv;
-    connection.close = ClientNetworkLayerTCP_close;
-    connection.free = ClientNetworkLayerTCP_free;
-    connection.getSendBuffer = connection_getsendbuffer;
-    connection.releaseSendBuffer = connection_releasesendbuffer;
-    connection.releaseRecvBuffer = connection_releaserecvbuffer;
-
-    TCPClientConnection *tcpClientConnection = (TCPClientConnection*)
-        UA_malloc(sizeof(TCPClientConnection));
-    if(!tcpClientConnection) {
-        connection.state = UA_CONNECTIONSTATE_CLOSED;
-        return connection;
-    }
-    memset(tcpClientConnection, 0, sizeof(TCPClientConnection));
-    connection.handle = (void*) tcpClientConnection;
-    tcpClientConnection->timeout = timeout;
-    UA_String hostnameString = UA_STRING_NULL;
-    UA_String pathString = UA_STRING_NULL;
-    UA_UInt16 port = 0;
-    char hostname[512];
-    tcpClientConnection->connStart = UA_DateTime_nowMonotonic();
-    UA_String_copy(&endpointUrl, &tcpClientConnection->endpointUrl);
-
-    UA_StatusCode parse_retval =
-        UA_parseEndpointUrl(&endpointUrl, &hostnameString, &port, &pathString);
-    if(parse_retval != UA_STATUSCODE_GOOD || hostnameString.length > 511) {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "Server url is invalid: %.*s",
-                       (int)endpointUrl.length, endpointUrl.data);
-        connection.state = UA_CONNECTIONSTATE_CLOSED;
-        return connection;
-    }
-    memcpy(hostname, hostnameString.data, hostnameString.length);
-    hostname[hostnameString.length] = 0;
-
-    if(port == 0) {
-        port = 4840;
-        UA_LOG_INFO(logger, UA_LOGCATEGORY_NETWORK,
-                    "No port defined, using default port %" PRIu16, port);
-    }
-
-    memset(&tcpClientConnection->hints, 0, sizeof(tcpClientConnection->hints));
-    tcpClientConnection->hints.ai_family = AF_UNSPEC;
-    tcpClientConnection->hints.ai_socktype = SOCK_STREAM;
-    char portStr[6];
-    UA_snprintf(portStr, 6, "%d", port);
-    int error = UA_getaddrinfo(hostname, portStr, &tcpClientConnection->hints,
-                               &tcpClientConnection->server);
-    if(error != 0 || !tcpClientConnection->server) {
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                                                    "DNS lookup of %s failed with error %d - %s",
-                                                    hostname, error, errno_str));
-        connection.state = UA_CONNECTIONSTATE_CLOSED;
-        return connection;
-    }
-
-    /* Return connection with state UA_CONNECTIONSTATE_OPENING */
-    return connection;
-}
diff --git a/include/open62541/network_tcp.h b/include/open62541/network_tcp.h
deleted file mode 100644
index 71d86dae0d1..00000000000
--- a/include/open62541/network_tcp.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2016 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- *    Copyright 2020 (c) HMS Industrial Networks AB (Author: Jonas Green)
- */
-
-#ifndef UA_NETWORK_TCP_H_
-#define UA_NETWORK_TCP_H_
-
-#include <open62541/client.h>
-#include <open62541/plugin/log.h>
-#include <open62541/server.h>
-
-_UA_BEGIN_DECLS
-
-/* Open a non-blocking client TCP socket. The connection might not be fully
- * opened yet. Drop into the _poll function withe a timeout to complete the
- * connection. */
-UA_Connection UA_EXPORT
-UA_ClientConnectionTCP_init(UA_ConnectionConfig config, const UA_String endpointUrl,
-                            UA_UInt32 timeout, const UA_Logger *logger);
-
-/* Wait for a half-opened connection to fully open. Returns UA_STATUSCODE_GOOD
- * even if the timeout was hit. Returns UA_STATUSCODE_BADDISCONNECT if the
- * connection is lost. */
-UA_StatusCode UA_EXPORT
-UA_ClientConnectionTCP_poll(UA_Connection *connection, UA_UInt32 timeout,
-                            const UA_Logger *logger);
-
-_UA_END_DECLS
-
-#endif /* UA_NETWORK_TCP_H_ */
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.h b/plugins/mqtt/ua_mqtt-c_adapter.h
index 96c1aa2b7b5..07f940f0b13 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.h
+++ b/plugins/mqtt/ua_mqtt-c_adapter.h
@@ -14,7 +14,7 @@ extern "C" {
 #endif
 
 #include <open62541/plugin/pubsub_mqtt.h>
-#include <open62541/network_tcp.h>
+#include <open62541/plugin/network.h>
 #include "ua_pubsub.h"
 
 #if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7fc64d18445..266a1587691 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -58,7 +58,6 @@ endif()
 
 # Use different plugins for testing
 set(test_plugin_sources
-    ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 048a962ea9d..94cedf10b08 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -59,7 +59,7 @@ list(APPEND LIBS "${open62541_LIBRARIES}")
 link_libraries("-fsanitize=fuzzer")
 
 # Use different plugins for testing
-set(fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/network_tcp.c
+set(fuzzing_plugin_sources
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c

From 2f0e9d6b2da40fd6cf2ff765940e9979ba199e3f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 16 Aug 2022 09:13:31 +0200
Subject: [PATCH 0404/1963] refactor(core): Better documentation for the JSON
 utf8 encoding

---
 src/ua_types_encoding_json.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 83dcd590d5e..1fa6a8ae18d 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -489,6 +489,8 @@ ENCODE_JSON(String) {
         u8 seq[13];
         size_t length;
 
+        /* Iterate over codepoints in the utf8 encoding. Until the first
+         * character that needs to be escaped. */
         while(end < lim) {
             end = utf8_iterate(pos, (size_t)(lim - pos), (int32_t *)&codepoint);
             if(!end)  {
@@ -499,22 +501,14 @@ ENCODE_JSON(String) {
                 continue;
             }
 
-            /* mandatory escape or control char */
+            /* Mandatory escape or control char */
             if(codepoint == '\\' || codepoint == '"' || codepoint < 0x20)
                 break;
 
-            /* TODO: Why is this commented? */
-            /* slash
-            if((flags & JSON_ESCAPE_SLASH) && codepoint == '/')
-                break;*/
-
-            /* non-ASCII
-            if((flags & JSON_ENSURE_ASCII) && codepoint > 0x7F)
-                break;*/
-
             pos = end;
         }
 
+        /* Write out the characters that don't need escaping */
         if(pos != str) {
             if(ctx->pos + (pos - str) > ctx->end)
                 return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
@@ -523,10 +517,11 @@ ENCODE_JSON(String) {
             ctx->pos += pos - str;
         }
 
+        /* Reached the end of the utf8 encoding */
         if(end == pos)
             break;
 
-        /* handle \, /, ", and control codes */
+        /* Handle an escaped character */
         length = 2;
         switch(codepoint) {
         case '\\': text = "\\\\"; break;

From ba63a0750999465b2b8a41d9b4c81ef10b7cc7d4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 16 Aug 2022 09:08:52 +0200
Subject: [PATCH 0405/1963] feat(client): Run event-loop at least once for
 synchronous service calls

This simplifies debugging where it is more common to get timeouts.
---
 src/client/ua_client.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index aee6d1d691d..e711753456a 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -446,16 +446,17 @@ __UA_Client_Service(UA_Client *client, const void *request,
     /* Temporarily insert to the async service list */
     LIST_INSERT_HEAD(&client->asyncServiceCalls, &ac, pointers);
 
+    /* Update the first timeout. Call the event-loop at least once with a
+     * timeout of zero. This is also important to have for debugging. */
+    UA_UInt32 timeout = 0;
+    UA_DateTime now = UA_DateTime_nowMonotonic();
+    if(now > maxDate)
+        timeout = (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC);
+
     /* Run the EventLoop until the request was processed, the request has timed
      * out or the client connection fails */
     while(true) {
-        /* Compute the remaining timeout and run the EventLoop */
-        UA_DateTime now = UA_DateTime_nowMonotonic();
-        if(now > maxDate) {
-            retval = UA_STATUSCODE_BADTIMEOUT;
-            break;
-        }
-        retval = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
+        retval = el->run(el, timeout);
 
         /* Was the response received? In that case we can directly return. The
          * ac was already removed from the internal linked list. */
@@ -479,6 +480,14 @@ __UA_Client_Service(UA_Client *client, const void *request,
             retval = UA_STATUSCODE_BADSECURECHANNELCLOSED;
             break;
         }
+
+        /* Compute the remaining timeout and run the EventLoop */
+        now = UA_DateTime_nowMonotonic();
+        if(now > maxDate) {
+            retval = UA_STATUSCODE_BADTIMEOUT;
+            break;
+        }
+        timeout = (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC);
     }
 
     /* Detach from the internal async service list */

From 9a5bd456544638b32e7e274a6d4f49f4dc14682d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 16 Aug 2022 11:48:11 +0200
Subject: [PATCH 0406/1963] feat(deps): Parse utf surrogate pairs in cj5.c

---
 deps/cj5.c                       | 64 +++++++++++++++++++++++---------
 tests/check_types_builtin_json.c |  5 ++-
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 95b0b312871..621036db599 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -633,6 +633,28 @@ cj5_get_uint(const cj5_result *r, unsigned int tok_index,
     return (parsed != 0) ? CJ5_ERROR_NONE : CJ5_ERROR_INVALID;
 }
 
+static const uint32_t SURROGATE_OFFSET = 0x10000u - (0xD800u << 10) - 0xDC00;
+
+static cj5_error_code
+parse_codepoint(const char *pos, uint32_t *out_utf) {
+    uint32_t utf = 0;
+    for(unsigned int i = 0; i < 4; i++) {
+        char byte = pos[i];
+        if(cj5__isnum(byte)) {
+            byte = (char)(byte - '0');
+        } else if(cj5__isrange(byte, 'a', 'f')) {
+            byte = (char)(byte - ('a' - 10));
+        } else if(cj5__isrange(byte, 'A', 'F')) {
+            byte = (char)(byte - ('A' - 10));
+        } else {
+            return CJ5_ERROR_INVALID;
+        }
+        utf = (utf << 4) | ((uint8_t)byte & 0xF);
+    }
+    *out_utf = utf;
+    return CJ5_ERROR_NONE;
+}
+
 cj5_error_code
 cj5_get_str(const cj5_result *r, unsigned int tok_index,
             char *buf, unsigned int *buflen) {
@@ -662,28 +684,36 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
             case 'r':  buf[outpos++] = '\r'; break;
             case 'n':  buf[outpos++] = '\n'; break;
             case 't':  buf[outpos++] = '\t'; break;
-            case 'u': { // The next four characters are an utf8 code
+            case 'u': {
+                // Parse the unicode code point
                 if(pos + 4 >= end)
                     return CJ5_ERROR_INCOMPLETE;
-                
-                // Parse the unicode code point
-                uint32_t utf = 0;
-                for(unsigned int i = 0; i < 4; i++) {
-                    pos++;
-                    uint8_t byte = (uint8_t)*pos;
-                    if(cj5__isrange(*pos, '0', '9')) {
-                        byte = (uint8_t)(byte - (uint8_t)'0');
-                    } else if(cj5__isrange(*pos, 'a', 'f')) {
-                        byte = (uint8_t)(byte - (uint8_t)('a' - 10));
-                    } else if(cj5__isrange(*pos, 'A', 'F')) {
-                        byte = (uint8_t)(byte - (uint8_t)('A' - 10));
-                    } else {
+                pos++;
+                uint32_t utf;
+                cj5_error_code err = parse_codepoint(pos, &utf);
+                if(err != CJ5_ERROR_NONE)
+                    return err;
+                pos += 3;
+
+                if(0xD800 <= utf && utf <= 0xDBFF) {
+                    // Parse a surrogate pair
+                    if(pos + 6 >= end)
+                        return CJ5_ERROR_INVALID;
+                    if(pos[1] != '\\' && pos[3] != 'u')
                         return CJ5_ERROR_INVALID;
-                    }
-                    utf = (utf << 4) | (byte & 0xF);
+                    pos += 3;
+                    uint32_t trail;
+                    err = parse_codepoint(pos, &trail);
+                    if(err != CJ5_ERROR_NONE)
+                        return err;
+                    pos += 3;
+                    utf = (utf << 10) + trail + SURROGATE_OFFSET;
+                } else if(0xDC00 <= utf && utf <= 0xDFFF) {
+                    // Invalid Unicode '\\u%04X'
+                    return CJ5_ERROR_INVALID;
                 }
                 
-                // Print the utf8 bytes
+                // Write the utf8 bytes of the code point
                 if(utf <= 0x7F) { // Plain ASCII
                     buf[outpos++] = (char)utf;
                 } else if(utf <= 0x07FF) { // 2-byte unicode
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index 187004b63f4..6dcb2873631 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -3860,15 +3860,16 @@ END_TEST
 START_TEST(UA_String_escape_unicode_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
-    UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\\u002c\"}");
+    UA_ByteString buf = UA_STRING("{\"Type\":12,\"Body\":\"\\u002c#\"}");
     // when
 
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
     // then
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_STRING);
-    ck_assert_uint_eq(  ((UA_String*)out.data)->length, 1);
+    ck_assert_uint_eq(  ((UA_String*)out.data)->length, 2);
     ck_assert_int_eq( ((UA_String*)out.data)->data[0], ',');
+    ck_assert_int_eq( ((UA_String*)out.data)->data[1], '#');
 
     UA_Variant_clear(&out);
 }

From cbef43e49f6eb790ef5386181a81b6900c2101eb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 18:54:33 +0200
Subject: [PATCH 0407/1963] fix(deps): Fix a comment wrt buffer size in cj5.h

---
 deps/cj5.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/cj5.h b/deps/cj5.h
index 8d76f657cc4..393e49c83b4 100644
--- a/deps/cj5.h
+++ b/deps/cj5.h
@@ -140,7 +140,7 @@ CJ5_API cj5_error_code
 cj5_get_uint(const cj5_result *r, unsigned int tok_index, uint64_t *out);
 
 // Replaces escape characters, utf8 codepoints, etc.
-// The buffer shall have a length of at least token->end - token->start + 1.
+// The buffer shall have a length of at least token->size + 1.
 // Upon success, the length is written to buflen.
 // The output string is terminated with \0.
 CJ5_API cj5_error_code

From 39e430368ce86320e84dbadbfd92c988166a2cd2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 11:33:21 +0200
Subject: [PATCH 0408/1963] feat(core): Add pretty-printing for JSON

---
 include/open62541/types.h                  |  11 +-
 src/pubsub/ua_pubsub_networkmessage_json.c |   2 +-
 src/ua_types_encoding_json.c               | 147 +++++++++++----------
 src/ua_types_encoding_json.h               |   8 +-
 tests/check_types_memory.c                 |   2 +-
 5 files changed, 97 insertions(+), 73 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index b49a9bc6d05..26824555adf 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1213,9 +1213,6 @@ UA_decodeBinary(const UA_ByteString *inBuf,
  * JSON En/Decoding
  * ----------------
  *
- * The JSON encoding always produces an encoding that is compatible with the OPC
- * UA specification.
- *
  * The JSON decoding can parse the official encoding from the OPC UA
  * specification. It further allows the following extensions:
  *
@@ -1240,6 +1237,14 @@ typedef struct {
     const UA_String *serverUris;
     size_t serverUrisSize;
     UA_Boolean useReversible;
+
+    UA_Boolean prettyPrint; /* Add newlines and spaces for legibility */
+
+    /* Enabling the following options leads to non-standard compatible JSON5
+     * encoding! Use it for pretty-printing, but not for sending messages over
+     * the network. (Our own decoding can still parse it.) */
+
+    UA_Boolean unquotedKeys; /* Don't print quotes around object element keys */
 } UA_EncodeJsonOptions;
 
 /* Returns the number of bytes the value src takes in json encoding. Returns
diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index 3a4a15ab5ef..0d7fb26107a 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -197,7 +197,7 @@ UA_NetworkMessage_encodeJson_internal(const UA_NetworkMessage* src, CtxJson *ctx
         const UA_DataSetMessage *dataSetMessages =
             src->payload.dataSetPayload.dataSetMessages;
         for(UA_UInt16 i = 0; i < count; i++) {
-            writeJsonCommaIfNeeded(ctx);
+            rv |= writeJsonBeforeElement(ctx, true);
             rv |= UA_DataSetMessage_encodeJson_internal(&dataSetMessages[i],
                                                         dataSetWriterIds[i], ctx);
             if(rv != UA_STATUSCODE_GOOD)
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 1fa6a8ae18d..ec16001c3d3 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -86,6 +86,28 @@ static WRITE_JSON_ELEMENT(Quote) {
     return writeChar(ctx, '\"');
 }
 
+UA_StatusCode
+writeJsonBeforeElement(CtxJson *ctx, UA_Boolean distinct) {
+    /* Comma if needed */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(ctx->commaNeeded[ctx->depth])
+        res |= writeChar(ctx, ',');
+
+    if(ctx->prettyPrint) {
+        if(distinct) {
+            /* Newline and indent if needed */
+            res |= writeChar(ctx, '\n');
+            for(size_t i = 0; i < ctx->depth; i++)
+                res |= writeChar(ctx, '\t');
+        } else if(ctx->commaNeeded[ctx->depth]) {
+            /* Space after the comma if no newline */
+            res |= writeChar(ctx, ' ');
+        }
+    }
+
+    return res;
+}
+
 WRITE_JSON_ELEMENT(ObjStart) {
     /* increase depth, save: before first key-value no comma needed. */
     if(ctx->depth >= UA_JSON_ENCODING_MAX_RECURSION - 1)
@@ -98,9 +120,19 @@ WRITE_JSON_ELEMENT(ObjStart) {
 WRITE_JSON_ELEMENT(ObjEnd) {
     if(ctx->depth == 0)
         return UA_STATUSCODE_BADENCODINGERROR;
+
+    UA_Boolean have_elem = ctx->commaNeeded[ctx->depth];
     ctx->depth--;
     ctx->commaNeeded[ctx->depth] = true;
-    return writeChar(ctx, '}');
+
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(ctx->prettyPrint && have_elem) {
+        res |= writeChar(ctx, '\n');
+        for(size_t i = 0; i < ctx->depth; i++)
+            res |= writeChar(ctx, '\t');
+    }
+    res |= writeChar(ctx, '}');
+    return res;
 }
 
 WRITE_JSON_ELEMENT(ArrStart) {
@@ -115,21 +147,24 @@ WRITE_JSON_ELEMENT(ArrStart) {
 WRITE_JSON_ELEMENT(ArrEnd) {
     if(ctx->depth == 0)
         return UA_STATUSCODE_BADENCODINGERROR;
+    UA_Boolean have_elem = ctx->commaNeeded[ctx->depth];
     ctx->depth--;
     ctx->commaNeeded[ctx->depth] = true;
-    return writeChar(ctx, ']');
-}
-
-WRITE_JSON_ELEMENT(CommaIfNeeded) {
-    if(ctx->commaNeeded[ctx->depth])
-        return writeChar(ctx, ',');
-    return UA_STATUSCODE_GOOD;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(ctx->prettyPrint && have_elem) {
+        res |= writeChar(ctx, '\n');
+        for(size_t i = 0; i < ctx->depth; i++)
+            res |= writeChar(ctx, '\t');
+    }
+    res |= writeChar(ctx, ']');
+    return res;
 }
 
 status
 writeJsonArrElm(CtxJson *ctx, const void *value,
                 const UA_DataType *type) {
-    status ret = writeJsonCommaIfNeeded(ctx);
+    UA_Boolean distinct = (type->typeKind > UA_DATATYPEKIND_DOUBLE);
+    status ret = writeJsonBeforeElement(ctx, distinct);
     ctx->commaNeeded[ctx->depth] = true;
     ret |= encodeJsonInternal(value, type, ctx);
     return ret;
@@ -207,23 +242,17 @@ static const char* UA_JSONKEY_INNERDIAGNOSTICINFO = "InnerDiagnosticInfo";
  * comma in front of key if needed. Encapsulates key in quotes. */
 status UA_FUNC_ATTR_WARN_UNUSED_RESULT
 writeJsonKey(CtxJson *ctx, const char* key) {
-    size_t size = strlen(key);
-    if(ctx->pos + size + 4 > ctx->end) /* +4 because of " " : and , */
-        return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
-    status ret = writeJsonCommaIfNeeded(ctx);
+    status ret = writeJsonBeforeElement(ctx, true);
     ctx->commaNeeded[ctx->depth] = true;
-    if(ctx->calcOnly) {
-        ctx->pos += 3;
-        ctx->pos += size;
-        return ret;
-    }
-
-    ret |= writeChar(ctx, '\"');
-    for(size_t i = 0; i < size; i++) {
-        *(ctx->pos++) = (u8)key[i];
-    }
-    ret |= writeChar(ctx, '\"');
-    ret |= writeChar(ctx, ':');
+    if(!ctx->unquotedKeys)
+        ret |= writeChar(ctx, '\"');
+    ret |= writeChars(ctx, key, strlen(key));
+    if(!ctx->unquotedKeys)
+        ret |= writeChar(ctx, '\"');
+    if(!ctx->unquotedKeys)
+        ret |= writeChar(ctx, ':');
+    if(ctx->prettyPrint)
+        ret |= writeChar(ctx, ' ');
     return ret;
 }
 
@@ -450,8 +479,9 @@ encodeJsonArray(CtxJson *ctx, const void *ptr, size_t length,
 
     uintptr_t uptr = (uintptr_t)ptr;
     encodeJsonSignature encodeType = encodeJsonJumpTable[type->typeKind];
+    UA_Boolean distinct = (type->typeKind > UA_DATATYPEKIND_DOUBLE);
     for(size_t i = 0; i < length && ret == UA_STATUSCODE_GOOD; ++i) {
-        ret |= writeJsonCommaIfNeeded(ctx);
+        ret |= writeJsonBeforeElement(ctx, distinct);
         if(isNull((const void*)uptr, type))
             ret |= writeJsonNull(ctx); /* null values are written as "null" */
         else
@@ -665,9 +695,8 @@ ENCODE_JSON(Guid) {
     if(ctx->pos + 38 > ctx->end) /* 36 + 2 (") */
         return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
     status ret = writeJsonQuote(ctx);
-    u8 *buf = ctx->pos;
     if(!ctx->calcOnly)
-        UA_Guid_to_hex(src, buf);
+        UA_Guid_to_hex(src, ctx->pos, false);
     ctx->pos += 36;
     ret |= writeJsonQuote(ctx);
     return ret;
@@ -1035,7 +1064,7 @@ addMultiArrayContentJSON(CtxJson *ctx, void* array, const UA_DataType *type,
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
     for(size_t i = 0; i < arrayDimensions[dimensionIndex]; i++) {
-        ret |= writeJsonCommaIfNeeded(ctx);
+        ret |= writeJsonBeforeElement(ctx, true);
         ret |= addMultiArrayContentJSON(ctx, array, type, index, arrayDimensions,
                                         dimensionIndex + 1, dimensionSize);
         ctx->commaNeeded[ctx->depth] = true;
@@ -1279,38 +1308,12 @@ encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx) {
     return encodeJsonJumpTable[type->typeKind](src, type, ctx);
 }
 
-static status
-UA_encodeJsonInternal(const void *src, const UA_DataType *type,
-              u8 **bufPos, const u8 **bufEnd, const UA_String *namespaces,
-              size_t namespaceSize, const UA_String *serverUris,
-              size_t serverUriSize, UA_Boolean useReversible) {
-    if(!src || !type)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    /* Set up the context */
-    CtxJson ctx;
-    memset(&ctx, 0, sizeof(ctx));
-    ctx.pos = *bufPos;
-    ctx.end = *bufEnd;
-    ctx.depth = 0;
-    ctx.namespaces = namespaces;
-    ctx.namespacesSize = namespaceSize;
-    ctx.serverUris = serverUris;
-    ctx.serverUrisSize = serverUriSize;
-    ctx.useReversible = useReversible;
-    ctx.calcOnly = false;
-
-    /* Encode */
-    status ret = encodeJsonJumpTable[type->typeKind](src, type, &ctx);
-
-    *bufPos = ctx.pos;
-    *bufEnd = ctx.end;
-    return ret;
-}
-
 UA_StatusCode
 UA_encodeJson(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
               const UA_EncodeJsonOptions *options) {
+    if(!src || !type)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
     /* Allocate buffer */
     UA_Boolean allocated = false;
     status res = UA_STATUSCODE_GOOD;
@@ -1322,20 +1325,30 @@ UA_encodeJson(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
         allocated = true;
     }
 
-    /* Encode */
-    u8 *pos = outBuf->data;
-    const u8 *posEnd = &outBuf->data[outBuf->length];
+    /* Set up the context */
+    CtxJson ctx;
+    memset(&ctx, 0, sizeof(ctx));
+    ctx.pos = outBuf->data;
+    ctx.end = &outBuf->data[outBuf->length];
+    ctx.depth = 0;
+    ctx.calcOnly = false;
+    ctx.useReversible = true; /* default */
     if(options) {
-        res = UA_encodeJsonInternal(src, type, &pos, &posEnd, options->namespaces,
-                                    options->namespacesSize, options->serverUris,
-                                    options->serverUrisSize, options->useReversible);
-    } else {
-        res = UA_encodeJsonInternal(src, type, &pos, &posEnd, NULL, 0u, NULL, 0u, true);
+        ctx.namespaces = options->namespaces;
+        ctx.namespacesSize = options->namespacesSize;
+        ctx.serverUris = options->serverUris;
+        ctx.serverUrisSize = options->serverUrisSize;
+        ctx.useReversible = options->useReversible;
+        ctx.prettyPrint = options->prettyPrint;
+        ctx.unquotedKeys = options->unquotedKeys;
     }
 
+    /* Encode */
+    res = encodeJsonJumpTable[type->typeKind](src, type, &ctx);
+
     /* Clean up */
     if(res == UA_STATUSCODE_GOOD) {
-        outBuf->length = (size_t)((uintptr_t)pos - (uintptr_t)outBuf->data);
+        outBuf->length = (size_t)((uintptr_t)ctx.pos - (uintptr_t)outBuf->data);
     } else if(allocated) {
         UA_ByteString_clear(outBuf);
     }
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 0c2d75e403d..3b17c6e048d 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -36,6 +36,9 @@ typedef struct {
 
     size_t serverUrisSize;
     const UA_String *serverUris;
+
+    UA_Boolean prettyPrint;
+    UA_Boolean unquotedKeys;
 } CtxJson;
 
 UA_StatusCode writeJsonObjStart(CtxJson *ctx);
@@ -49,9 +52,12 @@ UA_StatusCode writeJsonArrElm(CtxJson *ctx, const void *value,
 UA_StatusCode writeJsonArrEnd(CtxJson *ctx);
 
 UA_StatusCode writeJsonKey(CtxJson *ctx, const char* key);
-UA_StatusCode writeJsonCommaIfNeeded(CtxJson *ctx);
 UA_StatusCode writeJsonNull(CtxJson *ctx);
 
+/* Adds a comma if needed. Distinct elements go on a new line if pretty-printing
+ * is enabled. */
+UA_StatusCode writeJsonBeforeElement(CtxJson *ctx, UA_Boolean distinct);
+
 status
 encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx);
 
diff --git a/tests/check_types_memory.c b/tests/check_types_memory.c
index 34b594810b9..8e311c4f56a 100644
--- a/tests/check_types_memory.c
+++ b/tests/check_types_memory.c
@@ -92,7 +92,7 @@ START_TEST(encodeShallYieldDecode) {
     ck_assert(UA_order(obj1, obj2, &UA_TYPES[_i]) == UA_ORDER_EQ);
 
     // pretty-print the value
-#ifdef UA_ENABLE_TYPEDESCRIPTION
+#ifdef UA_ENABLE_JSON_ENCODING
     UA_Byte staticBuf[4096];
     UA_String buf;
     buf.data = staticBuf;

From 81e379f0cf6cb2618ff781fc5bf6479aac6fc888 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 15:39:17 +0200
Subject: [PATCH 0409/1963] feat(core): Optional non-standard encoding of
 string NodeIds in JSON

---
 include/open62541/types.h    |  5 +++--
 src/ua_types_encoding_json.c | 33 ++++++++++++++++++++++++++++++---
 src/ua_types_encoding_json.h |  1 +
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 26824555adf..935b051c135 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1238,13 +1238,14 @@ typedef struct {
     size_t serverUrisSize;
     UA_Boolean useReversible;
 
-    UA_Boolean prettyPrint; /* Add newlines and spaces for legibility */
+    UA_Boolean prettyPrint;   /* Add newlines and spaces for legibility */
 
     /* Enabling the following options leads to non-standard compatible JSON5
      * encoding! Use it for pretty-printing, but not for sending messages over
      * the network. (Our own decoding can still parse it.) */
 
-    UA_Boolean unquotedKeys; /* Don't print quotes around object element keys */
+    UA_Boolean unquotedKeys;  /* Don't print quotes around object element keys */
+    UA_Boolean stringNodeIds; /* String encoding for NodeIds, like "ns=1;i=42" */
 } UA_EncodeJsonOptions;
 
 /* Returns the number of bytes the value src takes in json encoding. Returns
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index ec16001c3d3..f8ff16c1f60 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -796,7 +796,20 @@ NodeId_encodeJsonInternal(UA_NodeId const *src, CtxJson *ctx) {
 }
 
 ENCODE_JSON(NodeId) {
-    UA_StatusCode ret = writeJsonObjStart(ctx);
+    /* Encode as string (non-standard) */
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    if(ctx->stringNodeIds) {
+        UA_String out = {(size_t)(ctx->end - ctx->pos), ctx->pos};
+        ret |= writeChar(ctx, '\"');
+        ret |= UA_NodeId_print(src, &out);
+        if(ret == UA_STATUSCODE_GOOD)
+            ctx->pos += out.length;
+        ret |= writeChar(ctx, '\"');
+        return ret;
+    }
+
+    /* Encode as object */
+    ret |= writeJsonObjStart(ctx);
     ret |= NodeId_encodeJsonInternal(src, ctx);
     if(ctx->useReversible) {
         if(src->namespaceIndex > 0) {
@@ -829,9 +842,22 @@ ENCODE_JSON(NodeId) {
 
 /* ExpandedNodeId */
 ENCODE_JSON(ExpandedNodeId) {
-    status ret = writeJsonObjStart(ctx);
+    /* Encode as string (non-standard) */
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    if(ctx->stringNodeIds) {
+        UA_String out = {(size_t)(ctx->end - ctx->pos), ctx->pos};
+        ret |= writeChar(ctx, '\"');
+        ret |= UA_ExpandedNodeId_print(src, &out);
+        if(ret == UA_STATUSCODE_GOOD)
+            ctx->pos += out.length;
+        ret |= writeChar(ctx, '\"');
+        return ret;
+    }
+
+    /* Encode as object */
+    ret |= writeJsonObjStart(ctx);
 
-    /* Encode the NodeId */
+    /* Encode the identifier portion */
     ret |= NodeId_encodeJsonInternal(&src->nodeId, ctx);
 
     if(ctx->useReversible) {
@@ -1341,6 +1367,7 @@ UA_encodeJson(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
         ctx.useReversible = options->useReversible;
         ctx.prettyPrint = options->prettyPrint;
         ctx.unquotedKeys = options->unquotedKeys;
+        ctx.stringNodeIds = options->stringNodeIds;
     }
 
     /* Encode */
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 3b17c6e048d..2894a85a553 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -39,6 +39,7 @@ typedef struct {
 
     UA_Boolean prettyPrint;
     UA_Boolean unquotedKeys;
+    UA_Boolean stringNodeIds;
 } CtxJson;
 
 UA_StatusCode writeJsonObjStart(CtxJson *ctx);

From ed8ebc5c1e5d4c6bb20bf9f3b363daa58cee9bc7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 15:46:08 +0200
Subject: [PATCH 0410/1963] refactor(core): Used unsigned int for the JSON
 decode index

Same type as in the cj5 API -> less casting
---
 src/ua_types_encoding_json.c | 10 +++++-----
 src/ua_types_encoding_json.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index f8ff16c1f60..507d2637438 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1958,7 +1958,7 @@ UA_FUNC_ATTR_WARN_UNUSED_RESULT status
 lookAheadForKey(const char *key, CtxJson *ctx,
                 ParseCtx *parseCtx, size_t *resultIndex) {
     status ret = UA_STATUSCODE_BADNOTFOUND;
-    UA_UInt16 oldIndex = parseCtx->index; /* Save index for later restore */
+    unsigned int oldIndex = parseCtx->index; /* Save index for later restore */
     unsigned int end = parseCtx->tokenArray[parseCtx->index].end;
     parseCtx->index++; /* Move to the first key */
     while(parseCtx->index < parseCtx->tokenCount &&
@@ -2081,7 +2081,7 @@ decodeExpandedNodeIdNamespace(void *dst, const UA_DataType *type,
     UA_ExpandedNodeId *en = (UA_ExpandedNodeId*)dst;
 
     /* Parse as a number */
-    UA_UInt16 oldIndex = parseCtx->index;
+    unsigned int oldIndex = parseCtx->index;
     status ret = UInt16_decodeJson(&en->nodeId.namespaceIndex, NULL, ctx, parseCtx);
     if(ret == UA_STATUSCODE_GOOD)
         return ret;
@@ -2109,7 +2109,7 @@ decodeExpandedNodeIdServerUri(void *dst, const UA_DataType *type,
     UA_ExpandedNodeId *en = (UA_ExpandedNodeId*)dst;
 
     /* Parse as a number */
-    UA_UInt16 oldIndex = parseCtx->index;
+    unsigned int oldIndex = parseCtx->index;
     status ret = UInt32_decodeJson(&en->serverIndex, NULL, ctx, parseCtx);
     if(ret == UA_STATUSCODE_GOOD)
         return ret;
@@ -2495,7 +2495,7 @@ DECODE_JSON(ExtensionObject) {
     if(ret != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADENCODINGERROR;
 
-    UA_UInt16 index = parseCtx->index; /* to restore later */
+    unsigned int index = parseCtx->index; /* to restore later */
     parseCtx->index = (UA_UInt16)searchTypeIdResult;
     ret = NodeId_decodeJson(&typeId, &UA_TYPES[UA_TYPES_NODEID], ctx, parseCtx);
     if(ret != UA_STATUSCODE_GOOD)
@@ -2573,7 +2573,7 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
         return UA_STATUSCODE_GOOD;
     }
 
-    UA_UInt16 old_index = parseCtx->index; /* Store the start index of the ExtensionObject */
+    unsigned int old_index = parseCtx->index; /* Store the start index of the ExtensionObject */
 
     /* Decode the DataType */
     UA_NodeId typeId;
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 2894a85a553..efc2fd97d61 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -65,7 +65,7 @@ encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx);
 typedef struct {
     cj5_token *tokenArray;
     size_t tokenCount;
-    UA_UInt16 index;
+    unsigned int index;
 
     /* Additonal data for special cases such as networkmessage/datasetmessage
      * Currently only used for dataSetWriterIds */

From a42846cbf6e7d33b728ca0ae8f85a21bc8d2b3db Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 18:32:42 +0200
Subject: [PATCH 0411/1963] refactor(core): Simplify JSON decoding by using
 only one context structure

---
 src/pubsub/ua_pubsub_networkmessage_json.c | 114 +++---
 src/ua_types_encoding_json.c               | 418 ++++++++++-----------
 src/ua_types_encoding_json.h               |  35 +-
 3 files changed, 263 insertions(+), 304 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index 0d7fb26107a..e8aaebefb55 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -264,28 +264,26 @@ UA_NetworkMessage_calcSizeJson(const UA_NetworkMessage *src,
 
 /* decode json */
 static status
-MetaDataVersion_decodeJsonInternal(void* cvd, const UA_DataType *type,
-                                   CtxJson *ctx, ParseCtx *parseCtx) {
+MetaDataVersion_decodeJsonInternal(ParseCtx *ctx, void* cvd, const UA_DataType *type) {
     return decodeJsonJumpTable[UA_DATATYPEKIND_STRUCTURE]
-        (cvd, &UA_TYPES[UA_TYPES_CONFIGURATIONVERSIONDATATYPE], ctx, parseCtx);
+        (ctx, cvd, &UA_TYPES[UA_TYPES_CONFIGURATIONVERSIONDATATYPE]);
 }
 
 static status
-DataSetPayload_decodeJsonInternal(void* dsmP, const UA_DataType *type,
-                                  CtxJson *ctx, ParseCtx *parseCtx) {
+DataSetPayload_decodeJsonInternal(ParseCtx *ctx, void* dsmP, const UA_DataType *type) {
     UA_DataSetMessage* dsm = (UA_DataSetMessage*)dsmP;
     dsm->header.dataSetMessageValid = true;
-    if(isJsonNull(ctx, parseCtx)) {
-        parseCtx->index++;
+    if(currentTokenType(ctx) == CJ5_TOKEN_NULL) {
+        ctx->index++;
         return UA_STATUSCODE_GOOD;
     }
 
-    if(currentTokenType(parseCtx) != CJ5_TOKEN_OBJECT)
+    if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* The number of key-value pairs */
-    UA_assert(parseCtx->tokenArray[parseCtx->index].size % 2 == 0);
-    size_t length = (size_t)(parseCtx->tokenArray[parseCtx->index].size) / 2;
+    UA_assert(ctx->tokens[ctx->index].size % 2 == 0);
+    size_t length = (size_t)(ctx->tokens[ctx->index].size) / 2;
 
     UA_String *fieldNames = (UA_String*)UA_calloc(length, sizeof(UA_String));
     if(!fieldNames)
@@ -298,29 +296,29 @@ DataSetPayload_decodeJsonInternal(void* dsmP, const UA_DataType *type,
     if(!dsm->data.keyFrameData.dataSetFields)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    parseCtx->index++; /* Go to the first key */
+    ctx->index++; /* Go to the first key */
 
     /* Iterate over the key/value pairs in the object. Keys are stored in fieldnames. */
     status ret = UA_STATUSCODE_GOOD;
     for(size_t i = 0; i < length; ++i) {
-        UA_assert(currentTokenType(parseCtx) == CJ5_TOKEN_STRING);
-        ret = decodeJsonJumpTable[UA_DATATYPEKIND_STRING](&fieldNames[i], type, ctx, parseCtx);
+        UA_assert(currentTokenType(ctx) == CJ5_TOKEN_STRING);
+        ret = decodeJsonJumpTable[UA_DATATYPEKIND_STRING](ctx, &fieldNames[i], type);
         if(ret != UA_STATUSCODE_GOOD)
             return ret;
 
         /* TODO: Is field value a variant or datavalue? Current check if type and body present. */
         size_t searchResult = 0;
-        status foundType = lookAheadForKey("Type", ctx, parseCtx, &searchResult);
-        status foundBody = lookAheadForKey("Body", ctx, parseCtx, &searchResult);
+        status foundType = lookAheadForKey(ctx, "Type", &searchResult);
+        status foundBody = lookAheadForKey(ctx, "Body", &searchResult);
         if(foundType == UA_STATUSCODE_GOOD && foundBody == UA_STATUSCODE_GOOD) {
             dsm->header.fieldEncoding = UA_FIELDENCODING_VARIANT;
             ret = decodeJsonJumpTable[UA_DATATYPEKIND_VARIANT]
-                (&dsm->data.keyFrameData.dataSetFields[i].value, type, ctx, parseCtx);
+                (ctx, &dsm->data.keyFrameData.dataSetFields[i].value, type);
             dsm->data.keyFrameData.dataSetFields[i].hasValue = true;
         } else {
             dsm->header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
             ret = decodeJsonJumpTable[UA_DATATYPEKIND_DATAVALUE]
-                (&dsm->data.keyFrameData.dataSetFields[i], type, ctx, parseCtx);
+                (ctx, &dsm->data.keyFrameData.dataSetFields[i], type);
             dsm->data.keyFrameData.dataSetFields[i].hasValue = true;
         }
 
@@ -332,8 +330,8 @@ DataSetPayload_decodeJsonInternal(void* dsmP, const UA_DataType *type,
 }
 
 static status
-DatasetMessage_Payload_decodeJsonInternal(UA_DataSetMessage* dsm, const UA_DataType *type,
-                                          CtxJson *ctx, ParseCtx *parseCtx) {
+DatasetMessage_Payload_decodeJsonInternal(ParseCtx *ctx, UA_DataSetMessage* dsm,
+                                          const UA_DataType *type) {
     UA_ConfigurationVersionDataType cvd;
     UA_UInt16 dataSetWriterId;
 
@@ -347,20 +345,20 @@ DatasetMessage_Payload_decodeJsonInternal(UA_DataSetMessage* dsm, const UA_DataT
         {UA_DECODEKEY_DSM_STATUS, &dsm->header.status, NULL, false, &UA_TYPES[UA_TYPES_UINT16]},
         {UA_DECODEKEY_PAYLOAD, dsm, &DataSetPayload_decodeJsonInternal, false, NULL}
     };
-    status ret = decodeFields(ctx, parseCtx, entries, 6);
+    status ret = decodeFields(ctx, entries, 6);
 
     /* Error or no DatasetWriterId found or no payload found */
     if(ret != UA_STATUSCODE_GOOD || !entries[0].found || !entries[5].found)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* Set the DatasetWriterId in the context */
-    if(!parseCtx->custom)
+    if(!ctx->custom)
         return UA_STATUSCODE_BADDECODINGERROR;
-    if(parseCtx->currentCustomIndex >= parseCtx->numCustom)
+    if(ctx->currentCustomIndex >= ctx->numCustom)
         return UA_STATUSCODE_BADDECODINGERROR;
-    UA_UInt16* dataSetWriterIdsArray = (UA_UInt16*)parseCtx->custom;
-    dataSetWriterIdsArray[parseCtx->currentCustomIndex] = dataSetWriterId;
-    parseCtx->currentCustomIndex++;
+    UA_UInt16* dataSetWriterIdsArray = (UA_UInt16*)ctx->custom;
+    dataSetWriterIdsArray[ctx->currentCustomIndex] = dataSetWriterId;
+    ctx->currentCustomIndex++;
 
     dsm->header.dataSetMessageSequenceNrEnabled = entries[1].found;
     dsm->header.configVersionMajorVersion = cvd.majorVersion;
@@ -378,12 +376,12 @@ DatasetMessage_Payload_decodeJsonInternal(UA_DataSetMessage* dsm, const UA_DataT
 }
 
 static status
-DatasetMessage_Array_decodeJsonInternal(void *UA_RESTRICT dst, const UA_DataType *type,
-                                        CtxJson *ctx, ParseCtx *parseCtx) {
+DatasetMessage_Array_decodeJsonInternal(ParseCtx *ctx, void *UA_RESTRICT dst,
+                                        const UA_DataType *type) {
     /* Array! */
-    if(currentTokenType(parseCtx) != CJ5_TOKEN_ARRAY)
+    if(currentTokenType(ctx) != CJ5_TOKEN_ARRAY)
         return UA_STATUSCODE_BADDECODINGERROR;
-    size_t length = (size_t)parseCtx->tokenArray[parseCtx->index].size;
+    size_t length = (size_t)ctx->tokens[ctx->index].size;
 
     /* Return early for empty arrays */
     if(length == 0)
@@ -399,12 +397,12 @@ DatasetMessage_Array_decodeJsonInternal(void *UA_RESTRICT dst, const UA_DataType
     memcpy(dst, &dsm, sizeof(void*));
 
     /* We go to first Array member! */
-    parseCtx->index++;
+    ctx->index++;
 
     status ret = UA_STATUSCODE_BADDECODINGERROR;
     /* Decode array members */
     for(size_t i = 0; i < length; ++i) {
-        ret = DatasetMessage_Payload_decodeJsonInternal(&dsm[i], NULL, ctx, parseCtx);
+        ret = DatasetMessage_Payload_decodeJsonInternal(ctx, &dsm[i], NULL);
         if(ret != UA_STATUSCODE_GOOD)
             return ret;
     }
@@ -413,8 +411,7 @@ DatasetMessage_Array_decodeJsonInternal(void *UA_RESTRICT dst, const UA_DataType
 }
 
 static status
-NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
-                                  ParseCtx *parseCtx) {
+NetworkMessage_decodeJsonInternal(ParseCtx *ctx, UA_NetworkMessage *dst) {
     memset(dst, 0, sizeof(UA_NetworkMessage));
     dst->chunkMessage = false;
     dst->groupHeaderEnabled = false;
@@ -425,13 +422,13 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     /* Look forward for publisheId, if present check if type if primitve (Number) or String. */
     const UA_DataType *pubIdType = &UA_TYPES[UA_TYPES_STRING];
     size_t searchResultPublishIdType = 0;
-    status found = lookAheadForKey(UA_DECODEKEY_PUBLISHERID, ctx,
-                                   parseCtx, &searchResultPublishIdType);
+    status found = lookAheadForKey(ctx, UA_DECODEKEY_PUBLISHERID, &searchResultPublishIdType);
     if(found == UA_STATUSCODE_GOOD) {
-        cj5_token *publishIdToken = &parseCtx->tokenArray[searchResultPublishIdType];
+        cj5_token *publishIdToken = &ctx->tokens[searchResultPublishIdType];
         if(publishIdToken->type == CJ5_TOKEN_NUMBER) {
-            // store in biggest possible. The problem is that with a UInt64 a string is expected in the json.
-            // Therefore, the maximum value is set to UInt32.
+            // store in biggest possible. The problem is that with a UInt64 a
+            // string is expected in the json. Therefore, the maximum value is
+            // set to UInt32.
             pubIdType = &UA_TYPES[UA_TYPES_UINT32];
             dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
         } else if(publishIdToken->type == CJ5_TOKEN_STRING) {
@@ -443,27 +440,27 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
 
     /* Is Messages an Array? How big? */
     size_t searchResultMessages = 0;
-    found = lookAheadForKey(UA_DECODEKEY_MESSAGES, ctx, parseCtx, &searchResultMessages);
+    found = lookAheadForKey(ctx, UA_DECODEKEY_MESSAGES, &searchResultMessages);
     if(found != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
-    cj5_token *bodyToken = &parseCtx->tokenArray[searchResultMessages];
+    const cj5_token *bodyToken = &ctx->tokens[searchResultMessages];
     if(bodyToken->type != CJ5_TOKEN_ARRAY)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
-    size_t messageCount = (size_t)parseCtx->tokenArray[searchResultMessages].size;
+    size_t messageCount = (size_t)ctx->tokens[searchResultMessages].size;
 
     /* Set up custom context for the dataSetwriterId */
-    parseCtx->custom = (void*)UA_calloc(messageCount, sizeof(UA_UInt16));
-    parseCtx->currentCustomIndex = 0;
-    parseCtx->numCustom = messageCount;
+    ctx->custom = (void*)UA_calloc(messageCount, sizeof(UA_UInt16));
+    ctx->currentCustomIndex = 0;
+    ctx->numCustom = messageCount;
 
     /* MessageType */
     UA_Boolean isUaData = true;
     size_t searchResultMessageType = 0;
-    found = lookAheadForKey(UA_DECODEKEY_MESSAGETYPE, ctx, parseCtx, &searchResultMessageType);
+    found = lookAheadForKey(ctx, UA_DECODEKEY_MESSAGETYPE, &searchResultMessageType);
     if(found != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;
-    size_t size = getTokenLength(&parseCtx->tokenArray[searchResultMessageType]);
-    char* msgType = (char*)(ctx->pos + parseCtx->tokenArray[searchResultMessageType].start);
+    size_t size = getTokenLength(&ctx->tokens[searchResultMessageType]);
+    const char* msgType = &ctx->json5[ctx->tokens[searchResultMessageType].start];
     if(size == 7) { //ua-data
         if(strncmp(msgType, "ua-data", size) != 0)
             return UA_STATUSCODE_BADDECODINGERROR;
@@ -490,7 +487,7 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
         {UA_DECODEKEY_MESSAGES, &dst->payload.dataSetPayload.dataSetMessages, &DatasetMessage_Array_decodeJsonInternal, false, NULL}
     };
 
-    status ret = decodeFields(ctx, parseCtx, entries, 5);
+    status ret = decodeFields(ctx, entries, 5);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
 
@@ -508,26 +505,23 @@ NetworkMessage_decodeJsonInternal(UA_NetworkMessage *dst, CtxJson *ctx,
     dst->payloadHeader.dataSetPayloadHeader.count = (UA_Byte)messageCount;
 
     /* Set the dataSetWriterIds. They are filled in the dataSet decoding. */
-    dst->payloadHeader.dataSetPayloadHeader.dataSetWriterIds = (UA_UInt16*)parseCtx->custom;
+    dst->payloadHeader.dataSetPayloadHeader.dataSetWriterIds = (UA_UInt16*)ctx->custom;
     return ret;
 }
 
 status
 UA_NetworkMessage_decodeJson(UA_NetworkMessage *dst, const UA_ByteString *src) {
     /* Set up the context */
-    CtxJson ctx;
-    memset(&ctx, 0, sizeof(CtxJson));
-    ParseCtx parseCtx;
-    memset(&parseCtx, 0, sizeof(ParseCtx));
-    parseCtx.tokenArray = (cj5_token*)
-        UA_malloc(sizeof(cj5_token) * UA_JSON_MAXTOKENCOUNT);
-    if(!parseCtx.tokenArray)
+    ParseCtx ctx;
+    memset(&ctx, 0, sizeof(ParseCtx));
+    ctx.tokens = (cj5_token*)
+        UA_calloc(UA_JSON_MAXTOKENCOUNT, sizeof(cj5_token));
+    if(!ctx.tokens)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    memset(parseCtx.tokenArray, 0, sizeof(cj5_token) * UA_JSON_MAXTOKENCOUNT);
-    status ret = tokenize(&parseCtx, &ctx, src, UA_JSON_MAXTOKENCOUNT);
+    status ret = tokenize(&ctx, src, UA_JSON_MAXTOKENCOUNT);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
-    ret = NetworkMessage_decodeJsonInternal(dst, &ctx, &parseCtx);
-    UA_free(parseCtx.tokenArray);
+    ret = NetworkMessage_decodeJsonInternal(&ctx, dst);
+    UA_free((void*)(uintptr_t)ctx.tokens);
     return ret;
 }
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 507d2637438..db6bcb200ff 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1430,70 +1430,61 @@ UA_calcSizeJson(const void *src, const UA_DataType *type,
 /* Decode */
 /**********/
 
-/* Macro which gets current size and char pointer of current Token. Needs
- * ParseCtx (parseCtx) and CtxJson (ctx). Does NOT increment index of Token. */
 #define GET_TOKEN                                                       \
-    size_t tokenSize = getTokenLength(&parseCtx->tokenArray[parseCtx->index]); \
-    char* tokenData = (char*)(ctx->pos + parseCtx->tokenArray[parseCtx->index].start); \
+    size_t tokenSize = getTokenLength(&ctx->tokens[ctx->index]);        \
+    const char* tokenData = &ctx->json5[ctx->tokens[ctx->index].start]; \
     do {} while(0)
 
 #define CHECK_TOKEN_BOUNDS do {                   \
-    if(parseCtx->index >= parseCtx->tokenCount)   \
+    if(ctx->index >= ctx->tokensSize)             \
         return UA_STATUSCODE_BADDECODINGERROR;    \
     } while(0)
 
 #define CHECK_NUMBER do {                                \
-    if(currentTokenType(parseCtx) != CJ5_TOKEN_NUMBER) { \
+    if(currentTokenType(ctx) != CJ5_TOKEN_NUMBER) {      \
         return UA_STATUSCODE_BADDECODINGERROR;           \
     }} while(0)
 
 #define CHECK_BOOL do {                                \
-    if(currentTokenType(parseCtx) != CJ5_TOKEN_BOOL) { \
+    if(currentTokenType(ctx) != CJ5_TOKEN_BOOL) {      \
         return UA_STATUSCODE_BADDECODINGERROR;         \
     }} while(0)
 
 #define CHECK_STRING do {                                \
-    if(currentTokenType(parseCtx) != CJ5_TOKEN_STRING) { \
+    if(currentTokenType(ctx) != CJ5_TOKEN_STRING) {      \
         return UA_STATUSCODE_BADDECODINGERROR;           \
     }} while(0)
 
 #define CHECK_OBJECT do {                                \
-    if(currentTokenType(parseCtx) != CJ5_TOKEN_OBJECT) { \
+    if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT) {      \
         return UA_STATUSCODE_BADDECODINGERROR;           \
     }} while(0)
 
 /* Forward declarations*/
-#define DECODE_JSON(TYPE) static status                        \
-    TYPE##_decodeJson(UA_##TYPE *dst, const UA_DataType *type, \
-                      CtxJson *ctx, ParseCtx *parseCtx)
+#define DECODE_JSON(TYPE) static status                   \
+    TYPE##_decodeJson(ParseCtx *ctx, UA_##TYPE *dst,      \
+                      const UA_DataType *type)
 
-/* If parseCtx->index points to the beginning of an object, move the index to
- * the next token after this object. Attention! The index can be moved after the
+/* If ctx->index points to the beginning of an object, move the index to the
+ * next token after this object. Attention! The index can be moved after the
  * last parsed token. So the array length has to be checked afterwards. */
 static void
-skipObject(ParseCtx *parseCtx) {
-    unsigned int end = parseCtx->tokenArray[parseCtx->index].end;
+skipObject(ParseCtx *ctx) {
+    unsigned int end = ctx->tokens[ctx->index].end;
     do {
-        parseCtx->index++;
-    } while(parseCtx->index < parseCtx->tokenCount &&
-            parseCtx->tokenArray[parseCtx->index].start < end);
+        ctx->index++;
+    } while(ctx->index < ctx->tokensSize &&
+            ctx->tokens[ctx->index].start < end);
 }
 
 static status
-Array_decodeJson(void **dst, const UA_DataType *type,
-                 CtxJson *ctx, ParseCtx *parseCtx);
+Array_decodeJson(ParseCtx *ctx, void **dst, const UA_DataType *type);
 
 static status
-Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
-                                        CtxJson *ctx, ParseCtx *parseCtx);
-
-UA_Boolean
-isJsonNull(const CtxJson *ctx, const ParseCtx *parseCtx) {
-    return (currentTokenType(parseCtx) == CJ5_TOKEN_NULL);
-}
+Variant_decodeJsonUnwrapExtensionObject(ParseCtx *ctx, void *p, const UA_DataType *type);
 
 static UA_SByte
-jsoneq(const char *json, cj5_token *tok, const char *searchKey) {
+jsoneq(const char *json, const cj5_token *tok, const char *searchKey) {
     /* TODO: necessary?
        if(json == NULL
             || tok == NULL
@@ -1528,12 +1519,12 @@ DECODE_JSON(Boolean) {
         return UA_STATUSCODE_BADDECODINGERROR;
     }
 
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-parseUnsignedInteger(char *tokenData, size_t tokenSize, UA_UInt64 *dst) {
+parseUnsignedInteger(const char *tokenData, size_t tokenSize, UA_UInt64 *dst) {
     size_t len = parseUInt64(tokenData, tokenSize, dst);
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -1549,7 +1540,7 @@ parseUnsignedInteger(char *tokenData, size_t tokenSize, UA_UInt64 *dst) {
 }
 
 static UA_StatusCode
-parseSignedInteger(char *tokenData, size_t tokenSize, UA_Int64 *dst) {
+parseSignedInteger(const char *tokenData, size_t tokenSize, UA_Int64 *dst) {
     size_t len = parseInt64(tokenData, tokenSize, dst);
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -1574,7 +1565,7 @@ DECODE_JSON(Byte) {
     if(s != UA_STATUSCODE_GOOD || out > UA_BYTE_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_Byte)out;
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1588,7 +1579,7 @@ DECODE_JSON(UInt16) {
     if(s != UA_STATUSCODE_GOOD || out > UA_UINT16_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_UInt16)out;
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1602,7 +1593,7 @@ DECODE_JSON(UInt32) {
     if(s != UA_STATUSCODE_GOOD || out > UA_UINT32_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_UInt32)out;
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1614,7 +1605,7 @@ DECODE_JSON(UInt64) {
     UA_StatusCode s = parseUnsignedInteger(tokenData, tokenSize, dst);
     if(s != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1628,7 +1619,7 @@ DECODE_JSON(SByte) {
     if(s != UA_STATUSCODE_GOOD || out < UA_SBYTE_MIN || out > UA_SBYTE_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_SByte)out;
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1642,7 +1633,7 @@ DECODE_JSON(Int16) {
     if(s != UA_STATUSCODE_GOOD || out < UA_INT16_MIN || out > UA_INT16_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_Int16)out;
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1656,7 +1647,7 @@ DECODE_JSON(Int32) {
     if(s != UA_STATUSCODE_GOOD || out < UA_INT32_MIN || out > UA_INT32_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
     *dst = (UA_Int32)out;
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1668,7 +1659,7 @@ DECODE_JSON(Int64) {
     UA_StatusCode s = parseSignedInteger(tokenData, tokenSize, dst);
     if(s != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1684,11 +1675,11 @@ DECODE_JSON(Double) {
     if(tokenSize > 1075)
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    cj5_token_type tokenType = currentTokenType(parseCtx);
+    cj5_token_type tokenType = currentTokenType(ctx);
 
     /* It could be a String with Nan, Infinity */
     if(tokenType == CJ5_TOKEN_STRING) {
-        parseCtx->index++;
+        ctx->index++;
 
         if(tokenSize == 8 && memcmp(tokenData, "Infinity", 8) == 0) {
             *dst = INFINITY;
@@ -1728,13 +1719,13 @@ DECODE_JSON(Double) {
             return UA_STATUSCODE_BADDECODINGERROR;
     }
 
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(Float) {
     UA_Double v = 0.0;
-    UA_StatusCode res = Double_decodeJson(&v, NULL, ctx, parseCtx);
+    UA_StatusCode res = Double_decodeJson(ctx, &v, NULL);
     *dst = (UA_Float)v;
     return res;
 }
@@ -1785,8 +1776,8 @@ DECODE_JSON(Guid) {
 
 #ifdef UA_ENABLE_PARSING
     /* Use the existing parsing routine if available */
-    UA_String str = {tokenSize, (UA_Byte*)tokenData};
-    parseCtx->index++;
+    UA_String str = {tokenSize, (UA_Byte*)(uintptr_t)tokenData};
+    ctx->index++;
     return UA_Guid_parse(dst, str);
 #else
     if(tokenSize != 36)
@@ -1800,7 +1791,7 @@ DECODE_JSON(Guid) {
         }
     }
     *dst = UA_Guid_fromChars(tokenData);
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 #endif
 }
@@ -1814,7 +1805,7 @@ DECODE_JSON(String) {
     if(tokenSize == 0) {
         dst->data = (UA_Byte*)UA_EMPTY_ARRAY_SENTINEL;
         dst->length = 0;
-        parseCtx->index++;
+        ctx->index++;
         return UA_STATUSCODE_GOOD;
     }
 
@@ -1827,8 +1818,8 @@ DECODE_JSON(String) {
     if(!outputBuffer)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    const uint8_t *p = (uint8_t*)tokenData;
-    const uint8_t *end = (uint8_t*)&tokenData[tokenSize];
+    const uint8_t *p = (const uint8_t*)tokenData;
+    const uint8_t *end = (const uint8_t*)&tokenData[tokenSize];
     uint8_t *pos = outputBuffer;
     while(p < end) {
         /* No escaping */
@@ -1901,7 +1892,7 @@ DECODE_JSON(String) {
         UA_free(outputBuffer);
     }
 
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 
 cleanup:
@@ -1921,14 +1912,14 @@ DECODE_JSON(ByteString) {
     } else {
         size_t flen = 0;
         unsigned char* unB64 =
-            UA_unbase64((unsigned char*)tokenData, tokenSize, &flen);
+            UA_unbase64((const unsigned char*)tokenData, tokenSize, &flen);
         if(unB64 == 0)
             return UA_STATUSCODE_BADDECODINGERROR;
         dst->data = (u8*)unB64;
         dst->length = flen;
     }
 
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1940,7 +1931,7 @@ DECODE_JSON(LocalizedText) {
         {UA_JSONKEY_TEXT, &dst->text, NULL, false, &UA_TYPES[UA_TYPES_STRING]}
     };
 
-    return decodeFields(ctx, parseCtx, entries, 2);
+    return decodeFields(ctx, entries, 2);
 }
 
 DECODE_JSON(QualifiedName) {
@@ -1951,42 +1942,41 @@ DECODE_JSON(QualifiedName) {
         {UA_JSONKEY_URI, &dst->namespaceIndex, NULL, false, &UA_TYPES[UA_TYPES_UINT16]}
     };
 
-    return decodeFields(ctx, parseCtx, entries, 2);
+    return decodeFields(ctx, entries, 2);
 }
 
 UA_FUNC_ATTR_WARN_UNUSED_RESULT status
-lookAheadForKey(const char *key, CtxJson *ctx,
-                ParseCtx *parseCtx, size_t *resultIndex) {
+lookAheadForKey(ParseCtx *ctx, const char *key, size_t *resultIndex) {
     status ret = UA_STATUSCODE_BADNOTFOUND;
-    unsigned int oldIndex = parseCtx->index; /* Save index for later restore */
-    unsigned int end = parseCtx->tokenArray[parseCtx->index].end;
-    parseCtx->index++; /* Move to the first key */
-    while(parseCtx->index < parseCtx->tokenCount &&
-          parseCtx->tokenArray[parseCtx->index].start < end) {
+    unsigned int oldIndex = ctx->index; /* Save index for later restore */
+    unsigned int end = ctx->tokens[ctx->index].end;
+    ctx->index++; /* Move to the first key */
+    while(ctx->index < ctx->tokensSize &&
+          ctx->tokens[ctx->index].start < end) {
         /* Key must be a string */
-        UA_assert(currentTokenType(parseCtx) == CJ5_TOKEN_STRING);
+        UA_assert(currentTokenType(ctx) == CJ5_TOKEN_STRING);
 
         /* Move index to the value */
-        parseCtx->index++;
+        ctx->index++;
 
         /* Value for the key must exist */
-        UA_assert(parseCtx->index < parseCtx->tokenCount);
+        UA_assert(ctx->index < ctx->tokensSize);
 
         /* Compare the key (previous index) */
-        if(jsoneq((char*)ctx->pos, &parseCtx->tokenArray[parseCtx->index-1], key) == 0) {
-            *resultIndex = parseCtx->index; /* Point result to the current index */
+        if(jsoneq(ctx->json5, &ctx->tokens[ctx->index-1], key) == 0) {
+            *resultIndex = ctx->index; /* Point result to the current index */
             ret = UA_STATUSCODE_GOOD;
             break;
         }
 
-        skipObject(parseCtx); /* Jump over the value (can also be an array or object) */
+        skipObject(ctx); /* Jump over the value (can also be an array or object) */
     }
-    parseCtx->index = oldIndex; /* Restore the old index */
+    ctx->index = oldIndex; /* Restore the old index */
     return ret;
 }
 
 static status
-prepareDecodeNodeIdJson(UA_NodeId *dst, CtxJson *ctx, ParseCtx *parseCtx,
+prepareDecodeNodeIdJson(ParseCtx *ctx, UA_NodeId *dst,
                         u8 *fieldCount, DecodeEntry *entries) {
     /* possible keys: Id, IdType, NamespaceIndex */
     /* Id must always be present */
@@ -1997,13 +1987,13 @@ prepareDecodeNodeIdJson(UA_NodeId *dst, CtxJson *ctx, ParseCtx *parseCtx,
 
     /* IdType */
     size_t searchResult = 0;
-    status ret = lookAheadForKey(UA_JSONKEY_IDTYPE, ctx, parseCtx, &searchResult);
+    status ret = lookAheadForKey(ctx, UA_JSONKEY_IDTYPE, &searchResult);
     if(ret == UA_STATUSCODE_GOOD) {
-        size_t size = getTokenLength(&parseCtx->tokenArray[searchResult]);
+        size_t size = getTokenLength(&ctx->tokens[searchResult]);
         if(size < 1)
             return UA_STATUSCODE_BADDECODINGERROR;
 
-        char *idType = (char*)(ctx->pos + parseCtx->tokenArray[searchResult].start);
+        const char *idType = &ctx->json5[ctx->tokens[searchResult].start];
 
         if(idType[0] == '2') {
             dst->identifierType = UA_NODEIDTYPE_GUID;
@@ -2056,10 +2046,10 @@ prepareDecodeNodeIdJson(UA_NodeId *dst, CtxJson *ctx, ParseCtx *parseCtx,
 DECODE_JSON(NodeId) {
     /* Non-standard decoding of NodeIds from the string representation */
 #ifdef UA_ENABLE_PARSING
-    if(currentTokenType(parseCtx) == CJ5_TOKEN_STRING) {
+    if(currentTokenType(ctx) == CJ5_TOKEN_STRING) {
         GET_TOKEN;
-        UA_String str = {tokenSize, (UA_Byte*)tokenData};
-        parseCtx->index++;
+        UA_String str = {tokenSize, (UA_Byte*)(uintptr_t)tokenData};
+        ctx->index++;
         return UA_NodeId_parse(dst, str);
     }
 #endif
@@ -2069,26 +2059,25 @@ DECODE_JSON(NodeId) {
 
     u8 fieldCount = 0;
     DecodeEntry entries[3];
-    status ret = prepareDecodeNodeIdJson(dst, ctx, parseCtx, &fieldCount, entries);
+    status ret = prepareDecodeNodeIdJson(ctx, dst, &fieldCount, entries);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
-    return decodeFields(ctx, parseCtx, entries, fieldCount);
+    return decodeFields(ctx, entries, fieldCount);
 }
 
 static status
-decodeExpandedNodeIdNamespace(void *dst, const UA_DataType *type,
-                              CtxJson *ctx, ParseCtx *parseCtx) {
+decodeExpandedNodeIdNamespace(ParseCtx *ctx, void *dst, const UA_DataType *type) {
     UA_ExpandedNodeId *en = (UA_ExpandedNodeId*)dst;
 
     /* Parse as a number */
-    unsigned int oldIndex = parseCtx->index;
-    status ret = UInt16_decodeJson(&en->nodeId.namespaceIndex, NULL, ctx, parseCtx);
+    unsigned int oldIndex = ctx->index;
+    status ret = UInt16_decodeJson(ctx, &en->nodeId.namespaceIndex, NULL);
     if(ret == UA_STATUSCODE_GOOD)
         return ret;
 
     /* Parse as a string */
-    parseCtx->index = oldIndex; /* Reset the index */
-    ret = String_decodeJson(&en->namespaceUri, NULL, ctx, parseCtx);
+    ctx->index = oldIndex; /* Reset the index */
+    ret = String_decodeJson(ctx, &en->namespaceUri, NULL);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
 
@@ -2104,20 +2093,19 @@ decodeExpandedNodeIdNamespace(void *dst, const UA_DataType *type,
 }
 
 static status
-decodeExpandedNodeIdServerUri(void *dst, const UA_DataType *type,
-                              CtxJson *ctx, ParseCtx *parseCtx) {
+decodeExpandedNodeIdServerUri(ParseCtx *ctx, void *dst, const UA_DataType *type) {
     UA_ExpandedNodeId *en = (UA_ExpandedNodeId*)dst;
 
     /* Parse as a number */
-    unsigned int oldIndex = parseCtx->index;
-    status ret = UInt32_decodeJson(&en->serverIndex, NULL, ctx, parseCtx);
+    unsigned int oldIndex = ctx->index;
+    status ret = UInt32_decodeJson(ctx, &en->serverIndex, NULL);
     if(ret == UA_STATUSCODE_GOOD)
         return ret;
 
     /* Parse as a string */
     UA_String uri = UA_STRING_NULL;
-    parseCtx->index = oldIndex; /* Reset the index */
-    ret = String_decodeJson(&uri, NULL, ctx, parseCtx);
+    ctx->index = oldIndex; /* Reset the index */
+    ret = String_decodeJson(ctx, &uri, NULL);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
 
@@ -2137,10 +2125,10 @@ decodeExpandedNodeIdServerUri(void *dst, const UA_DataType *type,
 DECODE_JSON(ExpandedNodeId) {
     /* Non-standard decoding of ExpandedNodeIds from the string representation */
 #ifdef UA_ENABLE_PARSING
-    if(currentTokenType(parseCtx) == CJ5_TOKEN_STRING) {
+    if(currentTokenType(ctx) == CJ5_TOKEN_STRING) {
         GET_TOKEN;
-        UA_String str = {tokenSize, (UA_Byte*)tokenData};
-        parseCtx->index++;
+        UA_String str = {tokenSize, (UA_Byte*)(uintptr_t)tokenData};
+        ctx->index++;
         return UA_ExpandedNodeId_parse(dst, str);
     }
 #endif
@@ -2150,8 +2138,7 @@ DECODE_JSON(ExpandedNodeId) {
 
     u8 fieldCount = 0;
     DecodeEntry entries[4];
-    status ret = prepareDecodeNodeIdJson(&dst->nodeId, ctx, parseCtx,
-                                         &fieldCount, entries);
+    status ret = prepareDecodeNodeIdJson(ctx, &dst->nodeId, &fieldCount, entries);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
 
@@ -2169,7 +2156,7 @@ DECODE_JSON(ExpandedNodeId) {
     entries[fieldCount].type = NULL;
     fieldCount++;
 
-    return decodeFields(ctx, parseCtx, entries, fieldCount);
+    return decodeFields(ctx, entries, fieldCount);
 }
 
 DECODE_JSON(DateTime) {
@@ -2301,26 +2288,19 @@ DECODE_JSON(DateTime) {
 
     *dst = dt;
 
-    parseCtx->index++;
+    ctx->index++;
     return UA_STATUSCODE_GOOD;
 }
 
 DECODE_JSON(StatusCode) {
-    return UInt32_decodeJson(dst, NULL, ctx, parseCtx);
+    return UInt32_decodeJson(ctx, dst, NULL);
 }
 
 static status
-VariantDimension_decodeJson(void *dst, const UA_DataType *type,
-                            CtxJson *ctx, ParseCtx *parseCtx) {
+VariantDimension_decodeJson(ParseCtx *ctx, void *dst, const UA_DataType *type) {
     (void) type;
     const UA_DataType *dimType = &UA_TYPES[UA_TYPES_UINT32];
-    return Array_decodeJson((void**)dst, dimType, ctx, parseCtx);
-}
-
-static UA_Boolean
-tokenIsNull(CtxJson *ctx, ParseCtx *parseCtx, size_t tokenIndex) {
-    cj5_token *tok = &parseCtx->tokenArray[tokenIndex];
-    return (tok->type == CJ5_TOKEN_NULL);
+    return Array_decodeJson(ctx, (void**)dst, dimType);
 }
 
 DECODE_JSON(Variant) {
@@ -2328,46 +2308,46 @@ DECODE_JSON(Variant) {
 
     /* First search for the variant type in the json object. */
     size_t searchResultType = 0;
-    status ret = lookAheadForKey(UA_JSONKEY_TYPE, ctx, parseCtx, &searchResultType);
+    status ret = lookAheadForKey(ctx, UA_JSONKEY_TYPE, &searchResultType);
     if(ret != UA_STATUSCODE_GOOD) {
-        skipObject(parseCtx);
+        skipObject(ctx);
         return UA_STATUSCODE_GOOD;
     }
 
     /* Parse the type */
-    size_t size = getTokenLength(&parseCtx->tokenArray[searchResultType]);
-    if(size == 0 || parseCtx->tokenArray[searchResultType].type != CJ5_TOKEN_NUMBER)
+    size_t size = getTokenLength(&ctx->tokens[searchResultType]);
+    if(size == 0 || ctx->tokens[searchResultType].type != CJ5_TOKEN_NUMBER)
         return UA_STATUSCODE_BADDECODINGERROR;
     UA_UInt64 idTypeDecoded = 0;
-    char *idTypeEncoded = (char*)(ctx->pos + parseCtx->tokenArray[searchResultType].start);
+    const char *idTypeEncoded = &ctx->json5[ctx->tokens[searchResultType].start];
     size_t len = parseUInt64(idTypeEncoded, size, &idTypeDecoded);
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* A NULL Variant */
     if(idTypeDecoded == 0) {
-        skipObject(parseCtx);
+        skipObject(ctx);
         return UA_STATUSCODE_GOOD;
     }
 
     /* Set the type */
     UA_NodeId typeNodeId = UA_NODEID_NUMERIC(0, (UA_UInt32)idTypeDecoded);
-    dst->type = UA_findDataTypeWithCustom(&typeNodeId, parseCtx->customTypes);
+    dst->type = UA_findDataTypeWithCustom(&typeNodeId, ctx->customTypes);
     if(!dst->type)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* Search for body */
     size_t searchResultBody = 0;
-    ret = lookAheadForKey(UA_JSONKEY_BODY, ctx, parseCtx, &searchResultBody);
+    ret = lookAheadForKey(ctx, UA_JSONKEY_BODY, &searchResultBody);
     if(ret != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* Value is an array? */
-    UA_Boolean isArray = (parseCtx->tokenArray[searchResultBody].type == CJ5_TOKEN_ARRAY);
+    UA_Boolean isArray = (ctx->tokens[searchResultBody].type == CJ5_TOKEN_ARRAY);
 
     /* TODO: Handling of null-arrays (length -1) needs to be clarified
      *
-     * if(tokenIsNull(ctx, parseCtx, searchResultBody)) {
+     * if(tokenIsNull(ctx, searchResultBody)) {
      *     isArray = true;
      *     dst->arrayLength = 0;
      * } */
@@ -2375,9 +2355,9 @@ DECODE_JSON(Variant) {
     /* Has the variant dimension? */
     UA_Boolean hasDimension = false;
     size_t searchResultDim = 0;
-    ret = lookAheadForKey(UA_JSONKEY_DIMENSION, ctx, parseCtx, &searchResultDim);
+    ret = lookAheadForKey(ctx, UA_JSONKEY_DIMENSION, &searchResultDim);
     if(ret == UA_STATUSCODE_GOOD)
-        hasDimension = (parseCtx->tokenArray[searchResultDim].size > 0);
+        hasDimension = (ctx->tokens[searchResultDim].size > 0);
 
     /* No array but has dimension -> error */
     if(!isArray && hasDimension)
@@ -2403,7 +2383,7 @@ DECODE_JSON(Variant) {
         size_t entriesCount = 3;
         if(!hasDimension)
             entriesCount = 2; /* Use the first 2 fields only */
-        return decodeFields(ctx, parseCtx, entries, entriesCount);
+        return decodeFields(ctx, entries, entriesCount);
     }
 
     /* Decode a value wrapped in an ExtensionObject */
@@ -2412,7 +2392,7 @@ DECODE_JSON(Variant) {
             {UA_JSONKEY_TYPE, NULL, NULL, false, NULL},
             {UA_JSONKEY_BODY, dst, Variant_decodeJsonUnwrapExtensionObject, false, NULL}
         };
-        return decodeFields(ctx, parseCtx, entries, 2);
+        return decodeFields(ctx, entries, 2);
     }
 
     /* Allocate Memory for Body */
@@ -2423,7 +2403,7 @@ DECODE_JSON(Variant) {
         {UA_JSONKEY_TYPE, NULL, NULL, false, NULL},
         {UA_JSONKEY_BODY, dst->data, NULL, false, dst->type}
     };
-    return decodeFields(ctx, parseCtx, entries, 2);
+    return decodeFields(ctx, entries, 2);
 }
 
 DECODE_JSON(DataValue) {
@@ -2438,7 +2418,7 @@ DECODE_JSON(DataValue) {
         {UA_JSONKEY_SERVERPICOSECONDS, &dst->serverPicoseconds, NULL, false, &UA_TYPES[UA_TYPES_UINT16]}
     };
 
-    status ret = decodeFields(ctx, parseCtx, entries, 6);
+    status ret = decodeFields(ctx, entries, 6);
     dst->hasValue = entries[0].found;
     dst->hasStatus = entries[1].found;
     dst->hasSourceTimestamp = entries[2].found;
@@ -2452,22 +2432,21 @@ DECODE_JSON(ExtensionObject) {
     CHECK_OBJECT;
 
     /* Empty object -> Null ExtensionObject */
-    if(parseCtx->tokenArray[parseCtx->index].size == 0) {
-        parseCtx->index++; /* Skip the empty ExtensionObject */
+    if(ctx->tokens[ctx->index].size == 0) {
+        ctx->index++; /* Skip the empty ExtensionObject */
         return UA_STATUSCODE_GOOD;
     }
 
     /* Search for Encoding */
     size_t encodingPos = 0;
-    status ret = lookAheadForKey(UA_JSONKEY_ENCODING, ctx, parseCtx, &encodingPos);
+    status ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encodingPos);
 
     /* UA_JSONKEY_ENCODING found */
     if(ret == UA_STATUSCODE_GOOD) {
         /* Parse the encoding */
         UA_UInt64 encoding = 0;
-        char *extObjEncoding = (char*)(ctx->pos +
-                                       parseCtx->tokenArray[encodingPos].start);
-        size_t size = getTokenLength(&parseCtx->tokenArray[encodingPos]);
+        const char *extObjEncoding = &ctx->json5[ctx->tokens[encodingPos].start];
+        size_t size = getTokenLength(&ctx->tokens[encodingPos]);
         parseUInt64(extObjEncoding, size, &encoding);
 
         if(encoding == 1) {
@@ -2483,7 +2462,7 @@ DECODE_JSON(ExtensionObject) {
             {UA_JSONKEY_BODY, &dst->content.encoded.body, NULL, false, &UA_TYPES[UA_TYPES_STRING]},
             {UA_JSONKEY_TYPEID, &dst->content.encoded.typeId, NULL, false, &UA_TYPES[UA_TYPES_NODEID]}
         };
-        return decodeFields(ctx, parseCtx, entries, 3);
+        return decodeFields(ctx, entries, 3);
     }
 
     /* Decode the type NodeId */
@@ -2491,52 +2470,50 @@ DECODE_JSON(ExtensionObject) {
     UA_NodeId_init(&typeId);
 
     size_t searchTypeIdResult = 0;
-    ret = lookAheadForKey(UA_JSONKEY_TYPEID, ctx, parseCtx, &searchTypeIdResult);
+    ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
     if(ret != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADENCODINGERROR;
 
-    unsigned int index = parseCtx->index; /* to restore later */
-    parseCtx->index = (UA_UInt16)searchTypeIdResult;
-    ret = NodeId_decodeJson(&typeId, &UA_TYPES[UA_TYPES_NODEID], ctx, parseCtx);
+    unsigned int oldIndex = ctx->index; /* to restore later */
+    ctx->index = (UA_UInt16)searchTypeIdResult;
+    ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
 
     /* Restore the index to the beginning of the object  */
-    parseCtx->index = index;
+    ctx->index = oldIndex;
 
     /* If the type is not known, decode the body as an opaque JSON decoding */
-    const UA_DataType *typeOfBody =
-        UA_findDataTypeWithCustom(&typeId, parseCtx->customTypes);
+    const UA_DataType *typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
     if(!typeOfBody) {
         /* Dont decode body: 1. save as bytestring, 2. jump over */
         dst->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING;
         dst->content.encoded.typeId = typeId; /* Move the type NodeId */
 
         /* Check if an object */
-        if(currentTokenType(parseCtx) != CJ5_TOKEN_OBJECT)
+        if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT)
             return UA_STATUSCODE_BADDECODINGERROR;
 
         /* Search for body to save */
         size_t bodyIndex = 0;
-        ret = lookAheadForKey(UA_JSONKEY_BODY, ctx, parseCtx, &bodyIndex);
-        if(ret != UA_STATUSCODE_GOOD || bodyIndex >= (size_t)parseCtx->tokenCount)
+        ret = lookAheadForKey(ctx, UA_JSONKEY_BODY, &bodyIndex);
+        if(ret != UA_STATUSCODE_GOOD || bodyIndex >= (size_t)ctx->tokensSize)
             return UA_STATUSCODE_BADDECODINGERROR;
 
         /* Get the size of the Object as a string, not the Object key count! */
-        size_t sizeOfJsonString = getTokenLength(&parseCtx->tokenArray[bodyIndex]);
+        size_t sizeOfJsonString = getTokenLength(&ctx->tokens[bodyIndex]);
         if(sizeOfJsonString == 0)
             return UA_STATUSCODE_BADDECODINGERROR;
 
         /* Copy body as bytestring. */
-        char* bodyJsonString = (char*)(ctx->pos + parseCtx->tokenArray[bodyIndex].start);
+        const char *bodyJsonString = &ctx->json5[ctx->tokens[bodyIndex].start];
         ret = UA_ByteString_allocBuffer(&dst->content.encoded.body, sizeOfJsonString);
         if(ret != UA_STATUSCODE_GOOD)
             return ret;
 
         memcpy(dst->content.encoded.body.data, bodyJsonString, sizeOfJsonString);
 
-        skipObject(parseCtx); /* parseCtx->index is still at the object
-                               * beginning. Skip. */
+        skipObject(ctx); /* ctx->index still at the object beginning. Skip. */
         return UA_STATUSCODE_GOOD;
     }
 
@@ -2557,39 +2534,38 @@ DECODE_JSON(ExtensionObject) {
         {UA_JSONKEY_TYPEID, NULL, NULL, false, NULL},
         {UA_JSONKEY_BODY, dst->content.decoded.data, NULL, false, typeOfBody}
     };
-    return decodeFields(ctx, parseCtx, entries, 2);
+    return decodeFields(ctx, entries, 2);
 }
 
 static status
-Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
-                                        CtxJson *ctx, ParseCtx *parseCtx) {
+Variant_decodeJsonUnwrapExtensionObject(ParseCtx *ctx,void *p, const UA_DataType *type) {
     (void) type;
 
     UA_Variant *dst = (UA_Variant*)p;
-    if(isJsonNull(ctx, parseCtx)) {
+    if(currentTokenType(ctx) == CJ5_TOKEN_NULL) {
         dst->data = UA_ExtensionObject_new();
         dst->type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
-        parseCtx->index++;
+        ctx->index++;
         return UA_STATUSCODE_GOOD;
     }
 
-    unsigned int old_index = parseCtx->index; /* Store the start index of the ExtensionObject */
+    unsigned int old_index = ctx->index; /* Store the start index of the ExtensionObject */
 
     /* Decode the DataType */
     UA_NodeId typeId;
     UA_NodeId_init(&typeId);
     size_t searchTypeIdResult = 0;
-    status ret = lookAheadForKey(UA_JSONKEY_TYPEID, ctx, parseCtx, &searchTypeIdResult);
+    status ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
     if(ret != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;
-    parseCtx->index = (UA_UInt16)searchTypeIdResult;
-    ret = NodeId_decodeJson(&typeId, &UA_TYPES[UA_TYPES_NODEID], ctx, parseCtx);
+    ctx->index = (UA_UInt16)searchTypeIdResult;
+    ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
     if(ret != UA_STATUSCODE_GOOD) {
         UA_NodeId_clear(&typeId);
         return ret;
     }
 
-    parseCtx->index = old_index; /* restore the index */
+    ctx->index = old_index; /* restore the index */
 
     /* Find the DataType from the NodeId */
     const UA_DataType *typeOfBody = UA_findDataType(&typeId);
@@ -2598,10 +2574,10 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
     /* Search for encoding (without advancing the index) */
     UA_UInt64 encoding = 0; /* If no encoding found it is structure encoding */
     size_t searchEncodingResult = 0;
-    ret = lookAheadForKey(UA_JSONKEY_ENCODING, ctx, parseCtx, &searchEncodingResult);
+    ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &searchEncodingResult);
     if(ret == UA_STATUSCODE_GOOD) {
-        char *extObjEncoding = (char*)(ctx->pos + parseCtx->tokenArray[searchEncodingResult].start);
-        size_t size = getTokenLength(&parseCtx->tokenArray[searchEncodingResult]);
+        const char *extObjEncoding = &ctx->json5[ctx->tokens[searchEncodingResult].start];
+        size_t size = getTokenLength(&ctx->tokens[searchEncodingResult]);
         parseUInt64(extObjEncoding, size, &encoding);
     }
 
@@ -2620,7 +2596,7 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
             {UA_JSONKEY_BODY, dst->data, NULL, false, typeOfBody},
             {UA_JSONKEY_ENCODING, NULL, NULL, false, NULL}
         };
-        ret = decodeFields(ctx, parseCtx, entries, 3);
+        ret = decodeFields(ctx, entries, 3);
     } else {
         /* Decode as ExtensionObject */
         dst->data = UA_new(&UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
@@ -2628,9 +2604,9 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
             return UA_STATUSCODE_BADOUTOFMEMORY;
         dst->type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
 
-        UA_assert(parseCtx->index == old_index); /* The index points to the start
-                                                  * of the ExtensionObject */
-        ret = ExtensionObject_decodeJson((UA_ExtensionObject*)dst->data, NULL, ctx, parseCtx);
+        UA_assert(ctx->index == old_index); /* The index points to the start of
+                                             * the ExtensionObject */
+        ret = ExtensionObject_decodeJson(ctx, (UA_ExtensionObject*)dst->data, NULL);
     }
 
     if(ret != UA_STATUSCODE_GOOD) {
@@ -2642,8 +2618,7 @@ Variant_decodeJsonUnwrapExtensionObject(void *p, const UA_DataType *type,
 }
 
 status
-DiagnosticInfoInner_decodeJson(void* dst, const UA_DataType* type,
-                               CtxJson* ctx, ParseCtx* parseCtx);
+DiagnosticInfoInner_decodeJson(ParseCtx* ctx, void* dst, const UA_DataType* type);
 
 DECODE_JSON(DiagnosticInfo) {
     CHECK_OBJECT;
@@ -2657,7 +2632,7 @@ DECODE_JSON(DiagnosticInfo) {
         {UA_JSONKEY_INNERSTATUSCODE, &dst->innerStatusCode, NULL, false, &UA_TYPES[UA_TYPES_STATUSCODE]},
         {UA_JSONKEY_INNERDIAGNOSTICINFO, &dst->innerDiagnosticInfo, DiagnosticInfoInner_decodeJson, false, NULL}
     };
-    status ret = decodeFields(ctx, parseCtx, entries, 7);
+    status ret = decodeFields(ctx, entries, 7);
 
     dst->hasSymbolicId = entries[0].found;
     dst->hasNamespaceUri = entries[1].found;
@@ -2670,20 +2645,18 @@ DECODE_JSON(DiagnosticInfo) {
 }
 
 status
-DiagnosticInfoInner_decodeJson(void* dst, const UA_DataType* type,
-                               CtxJson* ctx, ParseCtx* parseCtx) {
+DiagnosticInfoInner_decodeJson(ParseCtx* ctx, void* dst, const UA_DataType* type) {
     UA_DiagnosticInfo *inner = (UA_DiagnosticInfo*)
         UA_calloc(1, sizeof(UA_DiagnosticInfo));
     if(!inner)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     UA_DiagnosticInfo **dst2 = (UA_DiagnosticInfo**)dst;
     *dst2 = inner;  /* Copy new Pointer do dest */
-    return DiagnosticInfo_decodeJson(inner, type, ctx, parseCtx);
+    return DiagnosticInfo_decodeJson(ctx, inner, type);
 }
 
 status
-decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
-             DecodeEntry *entries, size_t entryCount) {
+decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
     CHECK_TOKEN_BOUNDS;
     CHECK_OBJECT;
 
@@ -2692,30 +2665,30 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
     ctx->depth++;
 
     /* Keys and values are counted separately */
-    UA_assert(parseCtx->tokenArray[parseCtx->index].size % 2 == 0);
-    size_t objectCount = (size_t)(parseCtx->tokenArray[parseCtx->index].size) / 2;
+    UA_assert(ctx->tokens[ctx->index].size % 2 == 0);
+    size_t objectCount = (size_t)(ctx->tokens[ctx->index].size) / 2;
 
     /* Empty object, nothing to decode */
     if(objectCount == 0) {
         ctx->depth--;
-        parseCtx->index++; /* Jump to the element after the empty object */
+        ctx->index++; /* Jump to the element after the empty object */
         return UA_STATUSCODE_GOOD;
     }
 
-    parseCtx->index++; /* Go to first key */
+    ctx->index++; /* Go to first key */
 
     /* CHECK_TOKEN_BOUNDS */
-    if(parseCtx->index >= parseCtx->tokenCount) {
+    if(ctx->index >= ctx->tokensSize) {
         ctx->depth--;
         return UA_STATUSCODE_BADDECODINGERROR;
     }
 
     status ret = UA_STATUSCODE_GOOD;
     for(size_t currObj = 0; currObj < objectCount &&
-            parseCtx->index < parseCtx->tokenCount; currObj++) {
+            ctx->index < ctx->tokensSize; currObj++) {
 
         /* Key must be a string */
-        UA_assert(currentTokenType(parseCtx) == CJ5_TOKEN_STRING);
+        UA_assert(currentTokenType(ctx) == CJ5_TOKEN_STRING);
 
         /* Start searching at the index of currObj */
         for(size_t i = currObj; i < entryCount + currObj; i++) {
@@ -2724,12 +2697,12 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
             size_t index = i % entryCount;
 
             /* CHECK_TOKEN_BOUNDS */
-            if(parseCtx->index >= parseCtx->tokenCount) {
+            if(ctx->index >= ctx->tokensSize) {
                 ret = UA_STATUSCODE_BADDECODINGERROR;
                 goto cleanup;
             }
 
-            if(jsoneq((char*) ctx->pos, &parseCtx->tokenArray[parseCtx->index],
+            if(jsoneq(ctx->json5, &ctx->tokens[ctx->index],
                       entries[index].fieldName) != 0)
                 continue;
 
@@ -2741,10 +2714,10 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
 
             entries[index].found = true;
 
-            parseCtx->index++; /* Go from key to value */
+            ctx->index++; /* Go from key to value */
 
             /* CHECK_TOKEN_BOUNDS */
-            if(parseCtx->index >= parseCtx->tokenCount) {
+            if(ctx->index >= ctx->tokensSize) {
                 ret = UA_STATUSCODE_BADDECODINGERROR;
                 goto cleanup;
             }
@@ -2752,24 +2725,24 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
             /* An entry that was expected, but shall not be decoded.
              * Jump over it. */
             if(!entries[index].function && !entries[index].type) {
-                skipObject(parseCtx);
+                skipObject(ctx);
                 break;
             }
 
             /* A null-value -> skip the decoding (as a convention, if we know
              * the type here, the value must be already initialized) */
-            if(isJsonNull(ctx, parseCtx) && entries[index].type) {
-                parseCtx->index++;
+            if(currentTokenType(ctx) == CJ5_TOKEN_NULL && entries[index].type) {
+                ctx->index++;
                 break;
             }
 
             /* Decode */
             if(entries[index].function) /* Specialized decoding function */
-                ret = entries[index].function(entries[index].fieldPointer,
-                                              entries[index].type, ctx, parseCtx);
+                ret = entries[index].function(ctx, entries[index].fieldPointer,
+                                              entries[index].type);
             else /* Decode by type-kind */
                 ret = decodeJsonJumpTable[entries[index].type->typeKind]
-                    (entries[index].fieldPointer, entries[index].type, ctx, parseCtx);
+                    (ctx, entries[index].fieldPointer, entries[index].type);
             if(ret != UA_STATUSCODE_GOOD)
                 goto cleanup;
             break;
@@ -2782,17 +2755,16 @@ decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
 }
 
 static status
-Array_decodeJson(void **dst, const UA_DataType *type,
-                 CtxJson *ctx, ParseCtx *parseCtx) {
+Array_decodeJson(ParseCtx *ctx, void **dst, const UA_DataType *type) {
     /* Save the length of the array */
     size_t *size_ptr = (size_t*) dst - 1;
 
-    if(currentTokenType(parseCtx) != CJ5_TOKEN_ARRAY)
+    if(currentTokenType(ctx) != CJ5_TOKEN_ARRAY)
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    size_t length = (size_t)parseCtx->tokenArray[parseCtx->index].size;
+    size_t length = (size_t)ctx->tokens[ctx->index].size;
 
-    parseCtx->index++; /* Go to first array member or to the first element after
+    ctx->index++; /* Go to first array member or to the first element after
                         * the array (if empty) */
 
     /* Return early for empty arrays */
@@ -2810,16 +2782,15 @@ Array_decodeJson(void **dst, const UA_DataType *type,
     /* Decode array members */
     uintptr_t ptr = (uintptr_t)*dst;
     for(size_t i = 0; i < length; ++i) {
-        if(!tokenIsNull(ctx, parseCtx, parseCtx->index)) {
-            status ret =
-                decodeJsonJumpTable[type->typeKind]((void*)ptr, type, ctx, parseCtx);
+        if(ctx->tokens[ctx->index].type != CJ5_TOKEN_NULL) {
+            status ret = decodeJsonJumpTable[type->typeKind](ctx, (void*)ptr, type);
             if(ret != UA_STATUSCODE_GOOD) {
                 UA_Array_delete(*dst, i+1, type);
                 *dst = NULL;
                 return ret;
             }
         } else {
-            parseCtx->index++;
+            ctx->index++;
         }
         ptr += type->memSize;
     }
@@ -2829,8 +2800,7 @@ Array_decodeJson(void **dst, const UA_DataType *type,
 }
 
 static status
-decodeJsonStructure(void *dst, const UA_DataType *type,
-                    CtxJson *ctx, ParseCtx *parseCtx) {
+decodeJsonStructure(ParseCtx *ctx, void *dst, const UA_DataType *type) {
     /* Check the recursion limit */
     if(ctx->depth >= UA_JSON_ENCODING_MAX_RECURSION - 1)
         return UA_STATUSCODE_BADENCODINGERROR;
@@ -2860,7 +2830,7 @@ decodeJsonStructure(void *dst, const UA_DataType *type,
         }
     }
 
-    ret = decodeFields(ctx, parseCtx, entries, membersSize);
+    ret = decodeFields(ctx, entries, membersSize);
 
     if(ctx->depth == 0)
         return UA_STATUSCODE_BADENCODINGERROR;
@@ -2869,9 +2839,8 @@ decodeJsonStructure(void *dst, const UA_DataType *type,
 }
 
 static status
-decodeJsonNotImplemented(void *dst, const UA_DataType *type, CtxJson *ctx,
-                         ParseCtx *parseCtx) {
-    (void)dst, (void)type, (void)ctx, (void)parseCtx;
+decodeJsonNotImplemented(ParseCtx *ctx, void *dst, const UA_DataType *type) {
+    (void)dst, (void)type, (void)ctx;
     return UA_STATUSCODE_BADNOTIMPLEMENTED;
 }
 
@@ -2910,36 +2879,31 @@ const decodeJsonSignature decodeJsonJumpTable[UA_DATATYPEKINDS] = {
 };
 
 status
-tokenize(ParseCtx *parseCtx, CtxJson *ctx,
-         const UA_ByteString *src, size_t tokensSize) {
-    /* Set up the context */
-    ctx->pos = &src->data[0];
-    ctx->end = &src->data[src->length];
-    ctx->depth = 0;
-    parseCtx->tokenCount = 0;
-    parseCtx->index = 0;
-
+tokenize(ParseCtx *ctx, const UA_ByteString *src, size_t tokensSize) {
     /* Tokenize */
     cj5_result r = cj5_parse((char*)src->data, (unsigned int)src->length,
-                             parseCtx->tokenArray, (unsigned int)tokensSize);
+                             ctx->tokens, (unsigned int)tokensSize);
 
     /* Handle overflow error by allocating the number of tokens the parser would
      * have needed */
     if(r.error == CJ5_ERROR_OVERFLOW &&
        tokensSize != r.num_tokens) {
-        parseCtx->tokenArray = (cj5_token*)
+        ctx->tokens = (cj5_token*)
             UA_malloc(sizeof(cj5_token) * r.num_tokens);
-        if(!parseCtx->tokenArray)
+        if(!ctx->tokens)
             return UA_STATUSCODE_BADOUTOFMEMORY;
-        return tokenize(parseCtx, ctx, src, r.num_tokens);
+        return tokenize(ctx, src, r.num_tokens);
     }
 
     /* Cannot recover from other errors */
     if(r.error != CJ5_ERROR_NONE)
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    /* Set the parsed number of tokens and return */
-    parseCtx->tokenCount = r.num_tokens;
+    /* Set up the context */
+    ctx->json5 = (char*)src->data;
+    ctx->depth = 0;
+    ctx->tokensSize = r.num_tokens;
+    ctx->index = 0;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -2955,38 +2919,36 @@ UA_decodeJson(const UA_ByteString *src, void *dst, const UA_DataType *type,
 
     /* Set up the context */
     cj5_token tokens[UA_JSON_MAXTOKENCOUNT];
-    CtxJson ctx;
-    memset(&ctx, 0, sizeof(ctx));
-    ParseCtx parseCtx;
-    memset(&parseCtx, 0, sizeof(ParseCtx));
-    parseCtx.tokenArray = tokens;
+    ParseCtx ctx;
+    memset(&ctx, 0, sizeof(ParseCtx));
+    ctx.tokens = tokens;
 
     if(options) {
         ctx.namespaces = options->namespaces;
         ctx.namespacesSize = options->namespacesSize;
         ctx.serverUris = options->serverUris;
         ctx.serverUrisSize = options->serverUrisSize;
-        parseCtx.customTypes = options->customTypes;
+        ctx.customTypes = options->customTypes;
     }
 
     /* Decode */
-    status ret = tokenize(&parseCtx, &ctx, src, UA_JSON_MAXTOKENCOUNT);
+    status ret = tokenize(&ctx, src, UA_JSON_MAXTOKENCOUNT);
     if(ret != UA_STATUSCODE_GOOD)
         goto cleanup;
 
     memset(dst, 0, type->memSize); /* Initialize the value */
-    ret = decodeJsonJumpTable[type->typeKind](dst, type, &ctx, &parseCtx);
+    ret = decodeJsonJumpTable[type->typeKind](&ctx, dst, type);
 
     /* Sanity check if all tokens were processed */
-    if(parseCtx.index != parseCtx.tokenCount &&
-       parseCtx.index != parseCtx.tokenCount - 1)
+    if(ctx.index != ctx.tokensSize &&
+       ctx.index != ctx.tokensSize - 1)
         ret = UA_STATUSCODE_BADDECODINGERROR;
 
  cleanup:
 
     /* Free token array on the heap */
-    if(parseCtx.tokenArray != tokens)
-        UA_free(parseCtx.tokenArray);
+    if(ctx.tokens != tokens)
+        UA_free((void*)(uintptr_t)ctx.tokens);
 
     if(ret != UA_STATUSCODE_GOOD)
         UA_clear(dst, type);
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index efc2fd97d61..c80b735b316 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -63,25 +63,32 @@ status
 encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx);
 
 typedef struct {
-    cj5_token *tokenArray;
-    size_t tokenCount;
+    const char *json5;
+    cj5_token *tokens;
+    unsigned int tokensSize;
     unsigned int index;
+    UA_Byte depth;
+
+    size_t namespacesSize;
+    const UA_String *namespaces;
+
+    size_t serverUrisSize;
+    const UA_String *serverUris;
+
+    const UA_DataTypeArray *customTypes;
 
     /* Additonal data for special cases such as networkmessage/datasetmessage
      * Currently only used for dataSetWriterIds */
     size_t numCustom;
     void * custom;
     size_t currentCustomIndex;
-
-    const UA_DataTypeArray *customTypes;
 } ParseCtx;
 
 typedef UA_StatusCode
 (*encodeJsonSignature)(const void *src, const UA_DataType *type, CtxJson *ctx);
 
 typedef UA_StatusCode
-(*decodeJsonSignature)(void *dst, const UA_DataType *type,
-                       CtxJson *ctx, ParseCtx *parseCtx);
+(*decodeJsonSignature)(ParseCtx *ctx, void *dst, const UA_DataType *type);
 
 /* Map for decoding a Json Object. An array of this is passed to the
  * decodeFields function. If the key "fieldName" is found in the json object
@@ -98,26 +105,22 @@ typedef struct {
 } DecodeEntry;
 
 UA_StatusCode
-decodeFields(CtxJson *ctx, ParseCtx *parseCtx,
-             DecodeEntry *entries, size_t entryCount);
+decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount);
 
 /* Expose the jump tables and some methods for PubSub JSON decoding */
 extern const encodeJsonSignature encodeJsonJumpTable[UA_DATATYPEKINDS];
 extern const decodeJsonSignature decodeJsonJumpTable[UA_DATATYPEKINDS];
 
-UA_StatusCode lookAheadForKey(const char* search, CtxJson *ctx,
-                              ParseCtx *parseCtx, size_t *resultIndex);
-UA_StatusCode tokenize(ParseCtx *parseCtx, CtxJson *ctx,
-                       const UA_ByteString *src, size_t tokensSize);
-UA_Boolean isJsonNull(const CtxJson *ctx, const ParseCtx *parseCtx);
+UA_StatusCode lookAheadForKey(ParseCtx *ctx, const char *search, size_t *resultIndex);
+UA_StatusCode tokenize(ParseCtx *ctx, const UA_ByteString *src, size_t tokensSize);
 
 static UA_INLINE
-cj5_token_type currentTokenType(const ParseCtx *parseCtx) {
-    return parseCtx->tokenArray[parseCtx->index].type;
+cj5_token_type currentTokenType(const ParseCtx *ctx) {
+    return ctx->tokens[ctx->index].type;
 }
 
 static UA_INLINE
-size_t getTokenLength(cj5_token *t) {
+size_t getTokenLength(const cj5_token *t) {
     return (size_t)(1u + t->end - t->start);
 }
 

From cb48ecca547f4c3f49c92df7f5fb31a9d9d24338 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 18:56:06 +0200
Subject: [PATCH 0412/1963] refactor(core): Use cj5 utf8 decoder for strings in
 JSON

---
 src/ua_types_encoding_json.c | 96 +++++++-----------------------------
 1 file changed, 17 insertions(+), 79 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index db6bcb200ff..dc47fcebbcf 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1800,6 +1800,7 @@ DECODE_JSON(String) {
     CHECK_TOKEN_BOUNDS;
     CHECK_STRING;
     GET_TOKEN;
+    (void)tokenData;
 
     /* Empty string? */
     if(tokenSize == 0) {
@@ -1809,95 +1810,32 @@ DECODE_JSON(String) {
         return UA_STATUSCODE_GOOD;
     }
 
-    /* The actual value is at most of the same length as the source string:
-     * - Shortcut escapes (e.g. "\t") (length 2) are converted to 1 byte
-     * - A single \uXXXX escape (length 6) is converted to at most 3 bytes
-     * - Two \uXXXX escapes (length 12) forming an UTF-16 surrogate pair are
-     *   converted to 4 bytes */
-    uint8_t *outputBuffer = (uint8_t*)UA_malloc(tokenSize);
-    if(!outputBuffer)
+    /* The decoded utf8 is at most of the same length as the source string */
+    char *outBuf = (char*)UA_malloc(tokenSize+1);
+    if(!outBuf)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    const uint8_t *p = (const uint8_t*)tokenData;
-    const uint8_t *end = (const uint8_t*)&tokenData[tokenSize];
-    uint8_t *pos = outputBuffer;
-    while(p < end) {
-        /* No escaping */
-        if(*p != '\\') {
-            /* In the ASCII range, but not a printable character */
-            /* if(*p < 32 || *p == 127) */
-            /*     goto cleanup; */
-
-            *(pos++) = *(p++);
-            continue;
-        }
-
-        /* Escape character */
-        p++;
-        if(p == end)
-            goto cleanup;
-
-        if(*p != 'u') {
-            switch(*p) {
-            case '"': case '\\': case '/': *pos = *p; break;
-            case 'b': *pos = '\b'; break;
-            case 'f': *pos = '\f'; break;
-            case 'n': *pos = '\n'; break;
-            case 'r': *pos = '\r'; break;
-            case 't': *pos = '\t'; break;
-            default: goto cleanup;
-            }
-            pos++;
-            p++;
-            continue;
-        }
-
-        /* Unicode */
-        if(p + 4 >= end)
-            goto cleanup;
-        int32_t value_signed = decode_unicode_escape((const char*)p);
-        if(value_signed < 0)
-            goto cleanup;
-        uint32_t value = (uint32_t)value_signed;
-        p += 5;
-
-        if(0xD800 <= value && value <= 0xDBFF) {
-            /* Surrogate pair */
-            if(p + 5 >= end)
-                goto cleanup;
-            if(*p != '\\' || *(p + 1) != 'u')
-                goto cleanup;
-            int32_t value2 = decode_unicode_escape((const char*)p + 1);
-            if(value2 < 0xDC00 || value2 > 0xDFFF)
-                goto cleanup;
-            value = ((value - 0xD800u) << 10u) + (uint32_t)((value2 - 0xDC00) + 0x10000);
-            p += 6;
-        } else if(0xDC00 <= value && value <= 0xDFFF) {
-            /* Invalid Unicode '\\u%04X' */
-            goto cleanup;
-        }
-
-        size_t length;
-        if(utf8_encode((int32_t)value, (char*)pos, &length))
-            goto cleanup;
-
-        pos += length;
-    }
+    /* Decode the string */
+    unsigned int len = 0;
+    cj5_result r;
+    r.tokens = ctx->tokens;
+    r.num_tokens = ctx->tokensSize;
+    r.json5 = ctx->json5;
+    cj5_error_code err = cj5_get_str(&r, ctx->index, outBuf, &len);
+    if(err != CJ5_ERROR_NONE)
+        return UA_STATUSCODE_BADDECODINGERROR;
 
-    dst->length = (size_t)(pos - outputBuffer);
+    /* Set the output */
+    dst->length = len;
     if(dst->length > 0) {
-        dst->data = (UA_Byte*)outputBuffer;
+        dst->data = (UA_Byte*)outBuf;
     } else {
         dst->data = (UA_Byte*)UA_EMPTY_ARRAY_SENTINEL;
-        UA_free(outputBuffer);
+        UA_free(outBuf);
     }
 
     ctx->index++;
     return UA_STATUSCODE_GOOD;
-
-cleanup:
-    UA_free(outputBuffer);
-    return UA_STATUSCODE_BADDECODINGERROR;
 }
 
 DECODE_JSON(ByteString) {

From b4d2b36b0c921eeca379cf52a6b66d4f3d2d9fac Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 18:59:29 +0200
Subject: [PATCH 0413/1963] refactor(core): Require UA_ENABLE_PARSING and
 UA_ENABLE_TYPEDESCRIPTION for JSON decoding

This lets us reuse the Guid parsing.
---
 examples/tutorial_datatypes.c |  4 +-
 src/ua_types_encoding_json.c  | 76 ++++++-----------------------------
 2 files changed, 14 insertions(+), 66 deletions(-)

diff --git a/examples/tutorial_datatypes.c b/examples/tutorial_datatypes.c
index 1b5084944fd..8a8199fbee4 100644
--- a/examples/tutorial_datatypes.c
+++ b/examples/tutorial_datatypes.c
@@ -130,7 +130,7 @@ variables_variants(void) {
     UA_Variant_clear(&v3);
 }
 
-#ifdef UA_ENABLE_TYPEDESCRIPTION
+#ifdef UA_ENABLE_JSON_ENCODING
 static void
 prettyprint(void) {
     UA_ReadRequest rr;
@@ -183,7 +183,7 @@ int main(void) {
     variables_basic();
     variables_nodeids();
     variables_variants();
-#ifdef UA_ENABLE_TYPEDESCRIPTION
+#ifdef UA_ENABLE_JSON_ENCODING
     prettyprint();
 #endif
 
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index dc47fcebbcf..2ff4ce5ae67 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -10,8 +10,9 @@
 #include <open62541/types_generated.h>
 #include <open62541/types_generated_handling.h>
 
+#ifdef UA_ENABLE_JSON_ENCODING
+
 #include "ua_types_encoding_json.h"
-#include "ua_types_encoding_binary.h"
 
 #include <float.h>
 #include <math.h>
@@ -22,6 +23,14 @@
 #include "../deps/base64.h"
 #include "../deps/libc_time.h"
 
+#ifndef UA_ENABLE_PARSING
+#error UA_ENABLE_PARSING required for JSON encoding
+#endif
+
+#ifndef UA_ENABLE_TYPEDESCRIPTION
+#error UA_ENABLE_TYPEDESCRIPTION required for JSON encoding
+#endif
+
 /* vs2008 does not have INFINITY and NAN defined */
 #ifndef INFINITY
 # define INFINITY ((UA_Double)(DBL_MAX+DBL_MAX))
@@ -1730,70 +1739,15 @@ DECODE_JSON(Float) {
     return res;
 }
 
-#ifndef UA_ENABLE_PARSING
-
-static UA_UInt32
-hex2int(char ch) {
-    if(ch >= '0' && ch <= '9')
-        return (UA_UInt32)(ch - '0');
-    if(ch >= 'A' && ch <= 'F')
-        return (UA_UInt32)(ch - 'A' + 10);
-    if(ch >= 'a' && ch <= 'f')
-        return (UA_UInt32)(ch - 'a' + 10);
-    return 0;
-}
-
-/*
-  Expects 36 chars in format    00000003-0009-000A-0807-060504030201
-                                | data1| |d2| |d3| |d4| |  data4   |
-*/
-static UA_Guid
-UA_Guid_fromChars(const char* chars) {
-    UA_Guid dst;
-    UA_Guid_init(&dst);
-    for(size_t i = 0; i < 8; i++)
-        dst.data1 |= (UA_UInt32)(hex2int(chars[i]) << (28 - (i*4)));
-    for(size_t i = 0; i < 4; i++) {
-        dst.data2 |= (UA_UInt16)(hex2int(chars[9+i]) << (12 - (i*4)));
-        dst.data3 |= (UA_UInt16)(hex2int(chars[14+i]) << (12 - (i*4)));
-    }
-    dst.data4[0] |= (UA_Byte)(hex2int(chars[19]) << 4u);
-    dst.data4[0] |= (UA_Byte)(hex2int(chars[20]) << 0u);
-    dst.data4[1] |= (UA_Byte)(hex2int(chars[21]) << 4u);
-    dst.data4[1] |= (UA_Byte)(hex2int(chars[22]) << 0u);
-    for(size_t i = 0; i < 6; i++) {
-        dst.data4[2+i] |= (UA_Byte)(hex2int(chars[24 + i*2]) << 4u);
-        dst.data4[2+i] |= (UA_Byte)(hex2int(chars[25 + i*2]) << 0u);
-    }
-    return dst;
-}
-#endif
-
 DECODE_JSON(Guid) {
     CHECK_TOKEN_BOUNDS;
     CHECK_STRING;
     GET_TOKEN;
 
-#ifdef UA_ENABLE_PARSING
     /* Use the existing parsing routine if available */
     UA_String str = {tokenSize, (UA_Byte*)(uintptr_t)tokenData};
     ctx->index++;
     return UA_Guid_parse(dst, str);
-#else
-    if(tokenSize != 36)
-        return UA_STATUSCODE_BADDECODINGERROR;
-    for(size_t i = 0; i < tokenSize; i++) {
-        if(!(tokenData[i] == '-' ||
-             (tokenData[i] >= '0' && tokenData[i] <= '9') ||
-             (tokenData[i] >= 'A' && tokenData[i] <= 'F') ||
-             (tokenData[i] >= 'a' && tokenData[i] <= 'f'))) {
-            return UA_STATUSCODE_BADDECODINGERROR;
-        }
-    }
-    *dst = UA_Guid_fromChars(tokenData);
-    ctx->index++;
-    return UA_STATUSCODE_GOOD;
-#endif
 }
 
 DECODE_JSON(String) {
@@ -1983,14 +1937,12 @@ prepareDecodeNodeIdJson(ParseCtx *ctx, UA_NodeId *dst,
 
 DECODE_JSON(NodeId) {
     /* Non-standard decoding of NodeIds from the string representation */
-#ifdef UA_ENABLE_PARSING
     if(currentTokenType(ctx) == CJ5_TOKEN_STRING) {
         GET_TOKEN;
         UA_String str = {tokenSize, (UA_Byte*)(uintptr_t)tokenData};
         ctx->index++;
         return UA_NodeId_parse(dst, str);
     }
-#endif
 
     /* Object representation */
     CHECK_OBJECT;
@@ -2062,14 +2014,12 @@ decodeExpandedNodeIdServerUri(ParseCtx *ctx, void *dst, const UA_DataType *type)
 
 DECODE_JSON(ExpandedNodeId) {
     /* Non-standard decoding of ExpandedNodeIds from the string representation */
-#ifdef UA_ENABLE_PARSING
     if(currentTokenType(ctx) == CJ5_TOKEN_STRING) {
         GET_TOKEN;
         UA_String str = {tokenSize, (UA_Byte*)(uintptr_t)tokenData};
         ctx->index++;
         return UA_ExpandedNodeId_parse(dst, str);
     }
-#endif
 
     /* Object representation */
     CHECK_OBJECT;
@@ -2848,10 +2798,6 @@ tokenize(ParseCtx *ctx, const UA_ByteString *src, size_t tokensSize) {
 UA_StatusCode
 UA_decodeJson(const UA_ByteString *src, void *dst, const UA_DataType *type,
               const UA_DecodeJsonOptions *options) {
-#ifndef UA_ENABLE_TYPEDESCRIPTION
-    return UA_STATUSCODE_BADNOTSUPPORTED;
-#endif
-
     if(!dst || !src || !type)
         return UA_STATUSCODE_BADARGUMENTSMISSING;
 
@@ -2892,3 +2838,5 @@ UA_decodeJson(const UA_ByteString *src, void *dst, const UA_DataType *type,
         UA_clear(dst, type);
     return ret;
 }
+
+#endif /* UA_ENABLE_JSON_ENCODING */

From 514e04c5648d72dde0581fd4a9c121c65cef89fa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 19:43:10 +0200
Subject: [PATCH 0414/1963] refactor(core): JSON ctx always the first argument

This reduces the shuffling of values on the stack during encoding.
---
 src/pubsub/ua_pubsub_networkmessage_json.c | 12 +++---
 src/ua_types_encoding_json.c               | 47 ++++++++++------------
 src/ua_types_encoding_json.h               | 10 +----
 3 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index e8aaebefb55..3f56d22968a 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -101,8 +101,8 @@ UA_DataSetMessage_encodeJson_internal(const UA_DataSetMessage* src,
                 rv |= writeJsonKey_UA_String(ctx, &src->data.keyFrameData.fieldNames[i]);
             else
                 rv |= writeJsonKey(ctx, "");
-            rv |= encodeJsonInternal(&(src->data.keyFrameData.dataSetFields[i].value),
-                                     &UA_TYPES[UA_TYPES_VARIANT], ctx);
+            rv |= encodeJsonJumpTable[UA_DATATYPEKIND_VARIANT]
+                (ctx, &src->data.keyFrameData.dataSetFields[i].value, NULL);
             if(rv != UA_STATUSCODE_GOOD)
                 return rv;
         }
@@ -113,8 +113,8 @@ UA_DataSetMessage_encodeJson_internal(const UA_DataSetMessage* src,
                 rv |= writeJsonKey_UA_String(ctx, &src->data.keyFrameData.fieldNames[i]);
             else
                 rv |= writeJsonKey(ctx, "");
-            rv |= encodeJsonInternal(&src->data.keyFrameData.dataSetFields[i],
-                                     &UA_TYPES[UA_TYPES_DATAVALUE], ctx);
+            rv |= encodeJsonJumpTable[UA_DATATYPEKIND_DATAVALUE]
+                (ctx, &src->data.keyFrameData.dataSetFields[i], NULL);
             if(rv != UA_STATUSCODE_GOOD)
                 return rv;
         }
@@ -169,8 +169,8 @@ UA_NetworkMessage_encodeJson_internal(const UA_NetworkMessage* src, CtxJson *ctx
             publisherIdType = &UA_TYPES[UA_TYPES_STRING];
             break;
         }
-        rv |= encodeJsonInternal(&src->publisherId,
-                                 publisherIdType, ctx);
+        rv |= encodeJsonJumpTable[publisherIdType->typeKind]
+            (ctx, &src->publisherId, publisherIdType);
     }
     if(rv != UA_STATUSCODE_GOOD)
         return rv;
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 2ff4ce5ae67..582a916a7ec 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -68,10 +68,10 @@
 /************/
 
 #define ENCODE_JSON(TYPE) static status \
-    TYPE##_encodeJson(const UA_##TYPE *src, const UA_DataType *type, CtxJson *ctx)
+    TYPE##_encodeJson(CtxJson *ctx, const UA_##TYPE *src, const UA_DataType *type)
 
 #define ENCODE_DIRECT_JSON(SRC, TYPE) \
-    TYPE##_encodeJson((const UA_##TYPE*)SRC, NULL, ctx)
+    TYPE##_encodeJson(ctx, (const UA_##TYPE*)SRC, NULL)
 
 /* Forward declarations */
 UA_String UA_DateTime_toJSON(UA_DateTime t);
@@ -175,14 +175,14 @@ writeJsonArrElm(CtxJson *ctx, const void *value,
     UA_Boolean distinct = (type->typeKind > UA_DATATYPEKIND_DOUBLE);
     status ret = writeJsonBeforeElement(ctx, distinct);
     ctx->commaNeeded[ctx->depth] = true;
-    ret |= encodeJsonInternal(value, type, ctx);
+    ret |= encodeJsonJumpTable[type->typeKind](ctx, value, type);
     return ret;
 }
 
 status
 writeJsonObjElm(CtxJson *ctx, const char *key,
                 const void *value, const UA_DataType *type) {
-    return writeJsonKey(ctx, key) | encodeJsonInternal(value, type, ctx);
+    return writeJsonKey(ctx, key) | encodeJsonJumpTable[type->typeKind](ctx, value, type);
 }
 
 status
@@ -494,7 +494,7 @@ encodeJsonArray(CtxJson *ctx, const void *ptr, size_t length,
         if(isNull((const void*)uptr, type))
             ret |= writeJsonNull(ctx); /* null values are written as "null" */
         else
-            ret |= encodeType((const void*)uptr, type, ctx);
+            ret |= encodeType(ctx, (const void*)uptr, type);
         ctx->commaNeeded[ctx->depth] = true;
         uptr += type->memSize;
     }
@@ -773,7 +773,7 @@ ENCODE_JSON(DateTime) {
 
 /* NodeId */
 static status
-NodeId_encodeJsonInternal(UA_NodeId const *src, CtxJson *ctx) {
+NodeId_encodeJsonInternal(CtxJson *ctx, UA_NodeId const *src) {
     status ret = UA_STATUSCODE_GOOD;
     switch(src->identifierType) {
     case UA_NODEIDTYPE_NUMERIC:
@@ -819,7 +819,7 @@ ENCODE_JSON(NodeId) {
 
     /* Encode as object */
     ret |= writeJsonObjStart(ctx);
-    ret |= NodeId_encodeJsonInternal(src, ctx);
+    ret |= NodeId_encodeJsonInternal(ctx, src);
     if(ctx->useReversible) {
         if(src->namespaceIndex > 0) {
             ret |= writeJsonKey(ctx, UA_JSONKEY_NAMESPACE);
@@ -867,7 +867,7 @@ ENCODE_JSON(ExpandedNodeId) {
     ret |= writeJsonObjStart(ctx);
 
     /* Encode the identifier portion */
-    ret |= NodeId_encodeJsonInternal(&src->nodeId, ctx);
+    ret |= NodeId_encodeJsonInternal(ctx, &src->nodeId);
 
     if(ctx->useReversible) {
         /* Reversible Case */
@@ -1038,11 +1038,13 @@ ENCODE_JSON(ExtensionObject) {
     /* Write the body */
     ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
     if(src->encoding == UA_EXTENSIONOBJECT_ENCODED_BYTESTRING ||
-       src->encoding == UA_EXTENSIONOBJECT_ENCODED_XML)
+       src->encoding == UA_EXTENSIONOBJECT_ENCODED_XML) {
         ret |= ENCODE_DIRECT_JSON(&src->content.encoded.body, String);
-    else
-        ret |= encodeJsonInternal(src->content.decoded.data,
-                                  src->content.decoded.type, ctx);
+    } else {
+        const UA_DataType *t = src->content.decoded.type;
+        ret |= encodeJsonJumpTable[t->typeKind]
+            (ctx, src->content.decoded.data, t);
+    }
 
     ret |= writeJsonObjEnd(ctx);
     return ret;
@@ -1078,7 +1080,7 @@ Variant_encodeJsonWrapExtensionObject(const UA_Variant *src, const bool isArray,
     }
 
     eo.content.decoded.data = src->data;
-    return ExtensionObject_encodeJson(&eo, NULL, ctx);
+    return ExtensionObject_encodeJson(ctx, &eo, NULL);
 }
 
 static status
@@ -1150,7 +1152,7 @@ ENCODE_JSON(Variant) {
     } else if(!isArray) {
         /* Unwrapped scalar */
         ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-        ret |= encodeJsonInternal(src->data, src->type, ctx);
+        ret |= encodeJsonJumpTable[src->type->typeKind](ctx, src->data, src->type);
     } else if(ctx->useReversible) {
         /* Reversible array */
         ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
@@ -1258,15 +1260,15 @@ ENCODE_JSON(DiagnosticInfo) {
 
     if(src->hasInnerDiagnosticInfo && src->innerDiagnosticInfo) {
         ret |= writeJsonKey(ctx, UA_JSONKEY_INNERDIAGNOSTICINFO);
-        ret |= encodeJsonInternal(src->innerDiagnosticInfo,
-                                  &UA_TYPES[UA_TYPES_DIAGNOSTICINFO], ctx);
+        ret |= encodeJsonJumpTable[UA_DATATYPEKIND_DIAGNOSTICINFO]
+            (ctx, src->innerDiagnosticInfo, NULL);
     }
 
     return ret | writeJsonObjEnd(ctx);
 }
 
 static status
-encodeJsonStructure(const void *src, const UA_DataType *type, CtxJson *ctx) {
+encodeJsonStructure(CtxJson *ctx, const void *src, const UA_DataType *type) {
     status ret = writeJsonObjStart(ctx);
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
@@ -1283,7 +1285,7 @@ encodeJsonStructure(const void *src, const UA_DataType *type, CtxJson *ctx) {
         if(!m->isArray) {
             ptr += m->padding;
             size_t memSize = mt->memSize;
-            ret |= encodeJsonJumpTable[mt->typeKind]((const void*) ptr, mt, ctx);
+            ret |= encodeJsonJumpTable[mt->typeKind](ctx, (const void*) ptr, mt);
             ptr += memSize;
         } else {
             ptr += m->padding;
@@ -1338,11 +1340,6 @@ const encodeJsonSignature encodeJsonJumpTable[UA_DATATYPEKINDS] = {
     (encodeJsonSignature)encodeJsonNotImplemented /* BitfieldCluster */
 };
 
-status
-encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx) {
-    return encodeJsonJumpTable[type->typeKind](src, type, ctx);
-}
-
 UA_StatusCode
 UA_encodeJson(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
               const UA_EncodeJsonOptions *options) {
@@ -1380,7 +1377,7 @@ UA_encodeJson(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
     }
 
     /* Encode */
-    res = encodeJsonJumpTable[type->typeKind](src, type, &ctx);
+    res = encodeJsonJumpTable[type->typeKind](&ctx, src, type);
 
     /* Clean up */
     if(res == UA_STATUSCODE_GOOD) {
@@ -1417,7 +1414,7 @@ UA_calcSizeJsonInternal(const void *src, const UA_DataType *type,
     ctx.calcOnly = true;
 
     /* Encode */
-    status ret = encodeJsonJumpTable[type->typeKind](src, type, &ctx);
+    status ret = encodeJsonJumpTable[type->typeKind](&ctx, src, type);
     if(ret != UA_STATUSCODE_GOOD)
         return 0;
     return (size_t)ctx.pos;
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index c80b735b316..4ddf5f5bef5 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -11,8 +11,6 @@
 
 #include <open62541/types.h>
 
-#include "ua_types_encoding_binary.h"
-#include "ua_types_encoding_json.h"
 #include "ua_util_internal.h"
 
 #include "../deps/cj5.h"
@@ -59,9 +57,6 @@ UA_StatusCode writeJsonNull(CtxJson *ctx);
  * is enabled. */
 UA_StatusCode writeJsonBeforeElement(CtxJson *ctx, UA_Boolean distinct);
 
-status
-encodeJsonInternal(const void *src, const UA_DataType *type, CtxJson *ctx);
-
 typedef struct {
     const char *json5;
     cj5_token *tokens;
@@ -85,7 +80,7 @@ typedef struct {
 } ParseCtx;
 
 typedef UA_StatusCode
-(*encodeJsonSignature)(const void *src, const UA_DataType *type, CtxJson *ctx);
+(*encodeJsonSignature)(CtxJson *ctx, const void *src, const UA_DataType *type);
 
 typedef UA_StatusCode
 (*decodeJsonSignature)(ParseCtx *ctx, void *dst, const UA_DataType *type);
@@ -104,8 +99,7 @@ typedef struct {
                               * type->typeKind. */
 } DecodeEntry;
 
-UA_StatusCode
-decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount);
+UA_StatusCode decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount);
 
 /* Expose the jump tables and some methods for PubSub JSON decoding */
 extern const encodeJsonSignature encodeJsonJumpTable[UA_DATATYPEKINDS];

From b4fb245880ba0b5b8efdc042d2cecb90e0543f5b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 19:52:08 +0200
Subject: [PATCH 0415/1963] refactor(core): Remove the old pretty-printing in
 favor of pretty-printed JSON

---
 include/open62541/types.h |   8 +-
 src/ua_types_print.c      | 682 ++------------------------------------
 2 files changed, 25 insertions(+), 665 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 935b051c135..e4fbdf4f7ba 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1136,7 +1136,9 @@ void UA_EXPORT UA_clear(void *p, const UA_DataType *type);
  * @param type The datatype description of the variable */
 void UA_EXPORT UA_delete(void *p, const UA_DataType *type);
 
-/* Pretty-print the value from the datatype.
+/* Pretty-print the value from the datatype. The output is pretty-printed JSON5.
+ * Note that this format is non-standard and should not be sent over the
+ * network. It can however be read by our own JSON decoding.
  *
  * @param p The memory location of the variable
  * @param type The datatype description of the variable
@@ -1144,8 +1146,8 @@ void UA_EXPORT UA_delete(void *p, const UA_DataType *type);
  *        memory for string is already allocated, we try to use the existing
  *        string (the length is adjusted). If the string is empty, memory
  *        is allocated for it.
- * @return Indicates whether the operation succeeded*/
-#ifdef UA_ENABLE_TYPEDESCRIPTION
+ * @return Indicates whether the operation succeeded */
+#ifdef UA_ENABLE_JSON_ENCODING
 UA_StatusCode UA_EXPORT
 UA_print(const void *p, const UA_DataType *type, UA_String *output);
 #endif
diff --git a/src/ua_types_print.c b/src/ua_types_print.c
index 92a0f87523c..936183ad32e 100644
--- a/src/ua_types_print.c
+++ b/src/ua_types_print.c
@@ -8,7 +8,6 @@
 #include <open62541/types_generated.h>
 #include <open62541/types_generated_handling.h>
 
-#include "open62541_queue.h"
 #include "ua_util_internal.h"
 
 /* Printing of NodeIds is always enabled. We need it for logging. */
@@ -147,674 +146,33 @@ UA_ExpandedNodeId_print(const UA_ExpandedNodeId *id, UA_String *output) {
     return res;
 }
 
-#ifdef UA_ENABLE_TYPEDESCRIPTION
-
-/***********************/
-/* Jumptable Signature */
-/***********************/
-
-typedef struct UA_PrintElement {
-    TAILQ_ENTRY(UA_PrintElement) next;
-    size_t length;
-    UA_Byte data[];
-} UA_PrintOutput;
-
-typedef struct {
-    size_t depth;
-    TAILQ_HEAD(, UA_PrintElement) outputs;
-} UA_PrintContext;
-
-typedef UA_StatusCode
-(*UA_printSignature)(UA_PrintContext *ctx, const void *p,
-                     const UA_DataType *type);
-
-extern const UA_printSignature printJumpTable[UA_DATATYPEKINDS];
-
-/********************/
-/* Helper Functions */
-/********************/
-
-static UA_PrintOutput *
-UA_PrintContext_addOutput(UA_PrintContext *ctx, size_t length) {
-    /* Protect against overlong output in pretty-printing */
-    if(length > 2<<16)
-        return NULL;
-    UA_PrintOutput *output = (UA_PrintOutput*)UA_malloc(sizeof(UA_PrintOutput) + length + 1);
-    if(!output)
-        return NULL;
-    output->length = length;
-    TAILQ_INSERT_TAIL(&ctx->outputs, output, next);
-    return output;
-}
-
-static UA_StatusCode
-UA_PrintContext_addNewlineTabs(UA_PrintContext *ctx, size_t tabs) {
-    UA_PrintOutput *out = UA_PrintContext_addOutput(ctx, tabs+1);
-    if(!out)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    out->data[0] = '\n';
-    for(size_t i = 1; i <= tabs; i++)
-        out->data[i] = '\t';
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_PrintContext_addName(UA_PrintContext *ctx, const char *name) {
-    size_t nameLen = strlen(name);
-    UA_PrintOutput *out = UA_PrintContext_addOutput(ctx, nameLen+2);
-    if(!out)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    memcpy(&out->data, name, nameLen);
-    out->data[nameLen] = ':';
-    out->data[nameLen+1] = ' ';
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_PrintContext_addString(UA_PrintContext *ctx, const char *str) {
-    size_t len = strlen(str);
-    UA_PrintOutput *out = UA_PrintContext_addOutput(ctx, len);
-    if(!out)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    memcpy(&out->data, str, len);
-    return UA_STATUSCODE_GOOD;
-}
-
-/*********************/
-/* Printing Routines */
-/*********************/
-
-static UA_StatusCode
-printArray(UA_PrintContext *ctx, const void *p, const size_t length,
-           const UA_DataType *type);
-
-static UA_StatusCode
-printBoolean(UA_PrintContext *ctx, const UA_Boolean *p, const UA_DataType *_) {
-    if(*p)
-        return UA_PrintContext_addString(ctx, "true");
-    return UA_PrintContext_addString(ctx, "false");
-}
-
-static UA_StatusCode
-printSByte(UA_PrintContext *ctx, const UA_SByte *p, const UA_DataType *_) {
-    char out[32];
-    UA_snprintf(out, 32, "%"PRIi8, *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printByte(UA_PrintContext *ctx, const UA_Byte *p, const UA_DataType *_) {
-    char out[32];
-    UA_snprintf(out, 32, "%"PRIu8, *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printInt16(UA_PrintContext *ctx, const UA_Int16 *p, const UA_DataType *_) {
-    char out[32];
-    UA_snprintf(out, 32, "%"PRIi16, *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printUInt16(UA_PrintContext *ctx, const UA_UInt16 *p, const UA_DataType *_) {
-    char out[32];
-    UA_snprintf(out, 32, "%"PRIu16, *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printInt32(UA_PrintContext *ctx, const UA_Int32 *p, const UA_DataType *_) {
-    char out[32];
-    UA_snprintf(out, 32, "%"PRIi32, *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printUInt32(UA_PrintContext *ctx, const UA_UInt32 *p, const UA_DataType *_) {
-    char out[32];
-    UA_snprintf(out, 32, "%"PRIu32, *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printInt64(UA_PrintContext *ctx, const UA_Int64 *p, const UA_DataType *_) {
-    char out[64];
-    UA_snprintf(out, 64, "%"PRIi64, *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printUInt64(UA_PrintContext *ctx, const UA_UInt64 *p, const UA_DataType *_) {
-    char out[64];
-    UA_snprintf(out, 64, "%"PRIu64, *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printFloat(UA_PrintContext *ctx, const UA_Float *p, const UA_DataType *_) {
-    char out[64];
-    UA_snprintf(out, 32, "%f", *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printDouble(UA_PrintContext *ctx, const UA_Double *p, const UA_DataType *_) {
-    char out[64];
-    UA_snprintf(out, 64, "%lf", *p);
-    return UA_PrintContext_addString(ctx, out);
-}
-
-static UA_StatusCode
-printStatusCode(UA_PrintContext *ctx, const UA_StatusCode *p, const UA_DataType *_) {
-    return UA_PrintContext_addString(ctx, UA_StatusCode_name(*p));
-}
-
-static UA_StatusCode
-printNodeId(UA_PrintContext *ctx, const UA_NodeId *p, const UA_DataType *_) {
-    UA_String out;
-    UA_String_init(&out);
-    UA_StatusCode res = UA_NodeId_print(p, &out);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-    UA_PrintOutput *po = UA_PrintContext_addOutput(ctx, out.length);
-    if(po)
-        memcpy(po->data, out.data, out.length);
-    else
-        res = UA_STATUSCODE_BADOUTOFMEMORY;
-    UA_String_clear(&out);
-    return res;
-}
-
-static UA_StatusCode
-printExpandedNodeId(UA_PrintContext *ctx, const UA_ExpandedNodeId *p, const UA_DataType *_) {
-    UA_String out;
-    UA_String_init(&out);
-    UA_StatusCode res = UA_ExpandedNodeId_print(p, &out);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-    UA_PrintOutput *po = UA_PrintContext_addOutput(ctx, out.length);
-    if(!po)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    memcpy(po->data, out.data, out.length);
-    UA_String_clear(&out);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-printDateTime(UA_PrintContext *ctx, const UA_DateTime *p, const UA_DataType *_) {
-    UA_Int64 tOffset = UA_DateTime_localTimeUtcOffset();
-    UA_DateTimeStruct dts = UA_DateTime_toStruct(*p);
-    char dateString[100];
-    UA_snprintf((char*)dateString, 100,
-                "%04u-%02u-%02u %02u:%02u:%02u.%03u (UTC%+05d)",
-                dts.year, dts.month, dts.day, dts.hour, dts.min,
-                dts.sec, dts.milliSec,
-            (int)(tOffset / UA_DATETIME_SEC / 36));
-    return UA_PrintContext_addString(ctx, dateString);
-}
-
-static UA_StatusCode
-printGuid(UA_PrintContext *ctx, const UA_Guid *p, const UA_DataType *_) {
-    char tmp[100];
-    UA_snprintf(tmp, 100, UA_PRINTF_GUID_FORMAT, UA_PRINTF_GUID_DATA(*p));
-    return UA_PrintContext_addString(ctx, tmp);
-}
-
-static UA_StatusCode
-printString(UA_PrintContext *ctx, const UA_String *p, const UA_DataType *_) {
-    if(!p->data)
-        return UA_PrintContext_addString(ctx, "NullString");
-    UA_PrintOutput *out = UA_PrintContext_addOutput(ctx, p->length+2);
-    if(!out)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    UA_snprintf((char*)out->data, p->length+3, "\"%.*s\"", (int)p->length, p->data);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-printByteString(UA_PrintContext *ctx, const UA_ByteString *p, const UA_DataType *_) {
-    if(!p->data)
-        return UA_PrintContext_addString(ctx, "NullByteString");
-    UA_String str = UA_BYTESTRING_NULL;
-    UA_StatusCode res = UA_ByteString_toBase64(p, &str);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-    res = printString(ctx, &str, NULL);
-    UA_String_clear(&str);
-    return res;
-}
-
-static UA_StatusCode
-printQualifiedName(UA_PrintContext *ctx, const UA_QualifiedName *p, const UA_DataType *_) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_PrintContext_addString(ctx, "{");
-    ctx->depth++;
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addName(ctx, "NamespaceIndex");
-    retval |= printUInt16(ctx, &p->namespaceIndex, NULL);
-    retval |= UA_PrintContext_addString(ctx, ",");
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addName(ctx, "Name");
-    retval |= printString(ctx, &p->name, NULL);
-    ctx->depth--;
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addString(ctx, "}");
-    return retval;
-}
-
-static UA_StatusCode
-printLocalizedText(UA_PrintContext *ctx, const UA_LocalizedText *p, const UA_DataType *_) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_PrintContext_addString(ctx, "{");
-    ctx->depth++;
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addName(ctx, "Locale");
-    retval |= printString(ctx, &p->locale, NULL);
-    retval |= UA_PrintContext_addString(ctx, ",");
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addName(ctx, "Text");
-    retval |= printString(ctx, &p->text, NULL);
-    ctx->depth--;
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addString(ctx, "}");
-    return retval;
-}
-
-static UA_StatusCode
-printVariant(UA_PrintContext *ctx, const UA_Variant *p, const UA_DataType *_) {
-    if(!p->type)
-        return UA_PrintContext_addString(ctx, "NullVariant");
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_PrintContext_addString(ctx, "{");
-    ctx->depth++;
-
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addName(ctx, "DataType");
-    retval |= UA_PrintContext_addString(ctx, p->type->typeName);
-    retval |= UA_PrintContext_addString(ctx, ",");
-
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addName(ctx, "Value");
-    if(UA_Variant_isScalar(p))
-        retval |= printJumpTable[p->type->typeKind](ctx, p->data, p->type);
-    else
-        retval |= printArray(ctx, p->data, p->arrayLength, p->type);
-
-    if(p->arrayDimensionsSize > 0) {
-        retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "ArrayDimensions");
-        retval |= printArray(ctx, p->arrayDimensions, p->arrayDimensionsSize,
-                             &UA_TYPES[UA_TYPES_UINT32]);
-    }
-
-    ctx->depth--;
-    retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addString(ctx, "}");
-    return retval;
-}
-
-static UA_StatusCode
-printExtensionObject(UA_PrintContext *ctx, const UA_ExtensionObject*p,
-                     const UA_DataType *_) {
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    switch(p->encoding) {
-    case UA_EXTENSIONOBJECT_ENCODED_NOBODY:
-        return UA_PrintContext_addString(ctx, "ExtensionObject(No Body)");
-    case UA_EXTENSIONOBJECT_ENCODED_BYTESTRING:
-        res |= UA_PrintContext_addString(ctx, "ExtensionObject(Binary Encoded) {");
-        ctx->depth++;
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "DataType");
-        res |= printNodeId(ctx, &p->content.encoded.typeId, NULL);
-        res |= UA_PrintContext_addString(ctx, ",");
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "Body");
-        res |= printByteString(ctx, &p->content.encoded.body, NULL);
-        ctx->depth--;
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "}");
-        break;
-    case UA_EXTENSIONOBJECT_ENCODED_XML:
-        res |= UA_PrintContext_addString(ctx, "ExtensionObject(XML Encoded) {");
-        ctx->depth++;
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "DataType");
-        res |= printNodeId(ctx, &p->content.encoded.typeId, NULL);
-        res |= UA_PrintContext_addString(ctx, ",");
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "Body");
-        res |= printString(ctx, (const UA_String*)&p->content.encoded.body, NULL);
-        ctx->depth--;
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "}");
-        break;
-    case UA_EXTENSIONOBJECT_DECODED:
-    case UA_EXTENSIONOBJECT_DECODED_NODELETE:
-        res |= UA_PrintContext_addString(ctx, "ExtensionObject {");
-        ctx->depth++;
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "DataType");
-        res |= UA_PrintContext_addString(ctx, p->content.decoded.type->typeName);
-        res |= UA_PrintContext_addString(ctx, ",");
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "Body");
-        res |= printJumpTable[p->content.decoded.type->typeKind](ctx,
-                                                                 p->content.decoded.data,
-                                                                 p->content.decoded.type);
-        ctx->depth--;
-        res |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        res |= UA_PrintContext_addName(ctx, "}");
-        break;
-    default:
-        res = UA_STATUSCODE_BADINTERNALERROR;
-        break;
-    }
-    return res;
-}
-
-static UA_StatusCode
-printDataValue(UA_PrintContext *ctx, const UA_DataValue *p, const UA_DataType *_) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_PrintContext_addString(ctx, "{");
-    ctx->depth++;
-    UA_Boolean comma = false;
-
-    if(p->hasValue) {
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "Value");
-        retval |= printVariant(ctx, &p->value, NULL);
-        comma = true;
-    }
-
-    if(p->hasStatus) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "Status");
-        retval |= printStatusCode(ctx, &p->status, NULL);
-        comma = true;
-    }
-
-    if(p->hasSourceTimestamp) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "SourceTimestamp");
-        retval |= printDateTime(ctx, &p->sourceTimestamp, NULL);
-        comma = true;
-    }
-
-    if(p->hasSourcePicoseconds) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "SourcePicoseconds");
-        retval |= printUInt16(ctx, &p->sourcePicoseconds, NULL);
-        comma = true;
-    }
-
-    if(p->hasServerTimestamp) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "ServerTimestamp");
-        retval |= printDateTime(ctx, &p->serverTimestamp, NULL);
-        comma = true;
-    }
-
-    if(p->hasServerPicoseconds) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "ServerPicoseconds");
-        retval |= printUInt16(ctx, &p->serverPicoseconds, NULL);
-        comma = true;
-    }
-
-    ctx->depth--;
-    if(comma) {
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addString(ctx, "}");
-    } else {
-        retval |= UA_PrintContext_addString(ctx, " }");
-    }
-    return retval;
-}
-
-static UA_StatusCode
-printDiagnosticInfo(UA_PrintContext *ctx, const UA_DiagnosticInfo *p, const UA_DataType *_) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_PrintContext_addString(ctx, "{");
-    ctx->depth++;
-    UA_Boolean comma = false;
-
-    if(p->hasSymbolicId) {
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "SymbolicId");
-        retval |= printInt32(ctx, &p->symbolicId, NULL);
-        comma = true;
-    }
-
-    if(p->hasNamespaceUri) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "NamespaceUri");
-        retval |= printInt32(ctx, &p->namespaceUri, NULL);
-        comma = true;
-    }
-
-    if(p->hasLocalizedText) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "LocalizedText");
-        retval |= printInt32(ctx, &p->localizedText, NULL);
-        comma = true;
-    }
-
-    if(p->hasLocale) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "Locale");
-        retval |= printInt32(ctx, &p->locale, NULL);
-        comma = true;
-    }
-
-    if(p->hasAdditionalInfo) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "AdditionalInfo");
-        retval |= printString(ctx, &p->additionalInfo, NULL);
-        comma = true;
-    }
-
-    if(p->hasInnerStatusCode) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "InnerStatusCode");
-        retval |= printStatusCode(ctx, &p->innerStatusCode, NULL);
-        comma = true;
-    }
-
-    if(p->hasInnerDiagnosticInfo) {
-        if(comma)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addName(ctx, "InnerDiagnosticInfo");
-        retval |= printDiagnosticInfo(ctx, p->innerDiagnosticInfo, NULL);
-        comma = true;
-    }
-
-    ctx->depth--;
-    if(comma) {
-        retval |= UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        retval |= UA_PrintContext_addString(ctx, "}");
-    } else {
-        retval |= UA_PrintContext_addString(ctx, " }");
-    }
-    return retval;
-}
-
-static UA_StatusCode
-printArray(UA_PrintContext *ctx, const void *p, const size_t length,
-           const UA_DataType *type) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(!p) {
-        retval |= UA_PrintContext_addString(ctx, "Array(-1, ");
-        retval |= UA_PrintContext_addString(ctx, type->typeName);
-        retval |= UA_PrintContext_addString(ctx, ")");
-        return retval;
-    }
-
-    UA_UInt32 length32 = (UA_UInt32)length;
-    retval |= UA_PrintContext_addString(ctx, "Array(");
-    retval |= printUInt32(ctx, &length32, NULL);
-    retval |= UA_PrintContext_addString(ctx, ", ");
-    retval |= UA_PrintContext_addString(ctx, type->typeName);
-    retval |= UA_PrintContext_addString(ctx, ") {");
-    ctx->depth++;
-    uintptr_t target = (uintptr_t)p;
-    for(UA_UInt32 i = 0; i < length; i++) {
-        UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        printUInt32(ctx, &i, NULL);
-        retval |= UA_PrintContext_addString(ctx, ": ");
-        printJumpTable[type->typeKind](ctx, (const void*)target, type);
-        if(i < length - 1)
-            retval |= UA_PrintContext_addString(ctx, ",");
-        target += type->memSize;
-    }
-    ctx->depth--;
-    UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addString(ctx, "}");
-    return retval;
-}
-
-static UA_StatusCode
-printStructure(UA_PrintContext *ctx, const void *p, const UA_DataType *type) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    uintptr_t ptrs = (uintptr_t)p;
-    retval |= UA_PrintContext_addString(ctx, "{");
-    ctx->depth++;
-    for(size_t i = 0; i < type->membersSize; ++i) {
-        UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-        const UA_DataTypeMember *m = &type->members[i];
-        const UA_DataType *mt = m->memberType;
-        ptrs += m->padding;
-        retval |= UA_PrintContext_addName(ctx, m->memberName);
-        if(!m->isArray) {
-            retval |= printJumpTable[mt->typeKind](ctx, (const void *)ptrs, mt);
-            ptrs += mt->memSize;
-        } else {
-            const size_t size = *((const size_t*)ptrs);
-            ptrs += sizeof(size_t);
-            retval |= printArray(ctx, *(void* const*)ptrs, size, mt);
-            ptrs += sizeof(void*);
-        }
-        if(i < (size_t)(type->membersSize - 1))
-            retval |= UA_PrintContext_addString(ctx, ",");
-    }
-    ctx->depth--;
-    UA_PrintContext_addNewlineTabs(ctx, ctx->depth);
-    retval |= UA_PrintContext_addString(ctx, "}");
-    return retval;
-}
-
-static UA_StatusCode
-printNotImplemented(UA_PrintContext *ctx, const void *p, const UA_DataType *type) {
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    res |= UA_PrintContext_addString(ctx, type->typeName);
-    res |= UA_PrintContext_addString(ctx, " (Printing Not Implemented)");
-    return res;
-}
-
-const UA_printSignature printJumpTable[UA_DATATYPEKINDS] = {
-    (UA_printSignature)printBoolean,
-    (UA_printSignature)printSByte,
-    (UA_printSignature)printByte,
-    (UA_printSignature)printInt16,
-    (UA_printSignature)printUInt16,
-    (UA_printSignature)printInt32,
-    (UA_printSignature)printUInt32,
-    (UA_printSignature)printInt64,
-    (UA_printSignature)printUInt64,
-    (UA_printSignature)printFloat,
-    (UA_printSignature)printDouble,
-    (UA_printSignature)printString,
-    (UA_printSignature)printDateTime,
-    (UA_printSignature)printGuid,
-    (UA_printSignature)printByteString,
-    (UA_printSignature)printString,         /* XmlElement */
-    (UA_printSignature)printNodeId,
-    (UA_printSignature)printExpandedNodeId,
-    (UA_printSignature)printStatusCode,
-    (UA_printSignature)printQualifiedName,
-    (UA_printSignature)printLocalizedText,
-    (UA_printSignature)printExtensionObject,
-    (UA_printSignature)printDataValue,
-    (UA_printSignature)printVariant,
-    (UA_printSignature)printDiagnosticInfo,
-    (UA_printSignature)printNotImplemented, /* Decimal */
-    (UA_printSignature)printUInt32,         /* Enumeration */
-    (UA_printSignature)printStructure,
-    (UA_printSignature)printNotImplemented, /* Structure with Optional Fields */
-    (UA_printSignature)printNotImplemented, /* Union */
-    (UA_printSignature)printNotImplemented  /* BitfieldCluster*/
-};
+#ifdef UA_ENABLE_JSON_ENCODING
 
 UA_StatusCode
 UA_print(const void *p, const UA_DataType *type, UA_String *output) {
-    UA_PrintContext ctx;
-    ctx.depth = 0;
-    TAILQ_INIT(&ctx.outputs);
-
-    /* Allocate before the goto */
-    size_t total = 0;
-    size_t pos = 0;
-    UA_PrintOutput *out, *out_tmp;
-
-    /* Encode */
-    UA_StatusCode retval = printJumpTable[type->typeKind](&ctx, p, type);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto cleanup;
+    if(!p || !type || !output)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
-    /* If printing succeeded the output cannot be empty*/
-    TAILQ_FOREACH(out, &ctx.outputs, next)
-        total += out->length;
-    UA_assert(total > 0);
+    /* Set up the encoding options */
+    UA_EncodeJsonOptions options = {0};
+    options.useReversible = true;
+    options.prettyPrint = true;
+    options.unquotedKeys = true;
+    options.stringNodeIds = true;
 
+    /* If no buffer is provided, compute the output length and allocate */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(output->length == 0) {
-        /* Allocate memory for the output */
-        retval = UA_ByteString_allocBuffer((UA_String*)output, total);
-    } else {
-        /* Check if the buffer is large enough */
-        if(output->length >= total)
-            output->length = total;
-        else
-            retval = UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    if(retval != UA_STATUSCODE_GOOD)
-        goto cleanup;
-
-    /* Write to the output buffer */
-    TAILQ_FOREACH(out, &ctx.outputs, next) {
-        memcpy(&output->data[pos], out->data, out->length);
-        pos += out->length;
+        size_t len = UA_calcSizeJson(p, type, &options);
+        if(len == 0)
+            return UA_STATUSCODE_BADENCODINGERROR;
+        res = UA_ByteString_allocBuffer(output, len);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
     }
 
- cleanup:
-    /* Free the context */
-    TAILQ_FOREACH_SAFE(out, &ctx.outputs, next, out_tmp) {
-        TAILQ_REMOVE(&ctx.outputs, out, next);
-        UA_free(out);
-    }
-    return retval;
+    /* Encode and return */
+    return UA_encodeJson(p, type, output, &options);
 }
 
-#endif /* UA_ENABLE_TYPEDESCRIPTION */
+#endif

From 5a25092fe0d3511b0802b621ec1a144b5cc93031 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 20:12:15 +0200
Subject: [PATCH 0416/1963] refactor(core): Distribute content from
 ua_types_print.c to other files

---
 CMakeLists.txt               |   1 -
 src/ua_types.c               | 134 ++++++++++++++++++++++++++
 src/ua_types_encoding_json.c |  77 ++++++++-------
 src/ua_types_print.c         | 178 -----------------------------------
 4 files changed, 172 insertions(+), 218 deletions(-)
 delete mode 100644 src/ua_types_print.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33b521576f5..e8e28d0ed47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -959,7 +959,6 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
 # TODO: make client optional
 set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.c
-                ${PROJECT_SOURCE_DIR}/src/ua_types_print.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/types_generated.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c
diff --git a/src/ua_types.c b/src/ua_types.c
index 58507340752..bddd7ef4996 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -397,6 +397,99 @@ UA_NodeId_hash(const UA_NodeId *n) {
     }
 }
 
+UA_StatusCode
+UA_NodeId_print(const UA_NodeId *id, UA_String *output) {
+    UA_String_clear(output);
+    if(!id)
+        return UA_STATUSCODE_GOOD;
+
+    char *nsStr = NULL;
+    long snprintfLen = 0;
+    size_t nsLen = 0;
+    if(id->namespaceIndex != 0) {
+        nsStr = (char*)UA_malloc(9+1); // strlen("ns=XXXXX;") = 9 + Nullbyte
+        if(!nsStr)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        snprintfLen = UA_snprintf(nsStr, 10, "ns=%d;", id->namespaceIndex);
+        if(snprintfLen < 0 || snprintfLen >= 10) {
+            UA_free(nsStr);
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        nsLen = (size_t)(snprintfLen);
+    }
+
+    UA_ByteString byteStr = UA_BYTESTRING_NULL;
+    switch (id->identifierType) {
+        case UA_NODEIDTYPE_NUMERIC:
+            /* ns (2 byte, 65535) = 5 chars, numeric (4 byte, 4294967295) = 10
+             * chars, delim = 1 , nullbyte = 1-> 17 chars */
+            output->length = nsLen + 2 + 10 + 1;
+            output->data = (UA_Byte*)UA_malloc(output->length);
+            if(output->data == NULL) {
+                output->length = 0;
+                UA_free(nsStr);
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+            snprintfLen = UA_snprintf((char*)output->data, output->length, "%si=%lu",
+                                      nsLen > 0 ? nsStr : "",
+                                      (unsigned long )id->identifier.numeric);
+            break;
+        case UA_NODEIDTYPE_STRING:
+            /* ns (16bit) = 5 chars, strlen + nullbyte */
+            output->length = nsLen + 2 + id->identifier.string.length + 1;
+            output->data = (UA_Byte*)UA_malloc(output->length);
+            if(output->data == NULL) {
+                output->length = 0;
+                UA_free(nsStr);
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+            snprintfLen = UA_snprintf((char*)output->data, output->length, "%ss=%.*s",
+                                      nsLen > 0 ? nsStr : "", (int)id->identifier.string.length,
+                                      id->identifier.string.data);
+            break;
+        case UA_NODEIDTYPE_GUID:
+            /* ns (16bit) = 5 chars + strlen(A123456C-0ABC-1A2B-815F-687212AAEE1B)=36 + nullbyte */
+            output->length = nsLen + 2 + 36 + 1;
+            output->data = (UA_Byte*)UA_malloc(output->length);
+            if(output->data == NULL) {
+                output->length = 0;
+                UA_free(nsStr);
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+            snprintfLen = UA_snprintf((char*)output->data, output->length,
+                                      "%sg=" UA_PRINTF_GUID_FORMAT, nsLen > 0 ? nsStr : "",
+                                      UA_PRINTF_GUID_DATA(id->identifier.guid));
+            break;
+        case UA_NODEIDTYPE_BYTESTRING:
+            UA_ByteString_toBase64(&id->identifier.byteString, &byteStr);
+            /* ns (16bit) = 5 chars + LEN + nullbyte */
+            output->length = nsLen + 2 + byteStr.length + 1;
+            output->data = (UA_Byte*)UA_malloc(output->length);
+            if(output->data == NULL) {
+                output->length = 0;
+                UA_String_clear(&byteStr);
+                UA_free(nsStr);
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+            snprintfLen = UA_snprintf((char*)output->data, output->length, "%sb=%.*s",
+                                      nsLen > 0 ? nsStr : "",
+                                      (int)byteStr.length, byteStr.data);
+            UA_String_clear(&byteStr);
+            break;
+    }
+    UA_free(nsStr);
+
+    if(snprintfLen < 0 || snprintfLen >= (long) output->length) {
+        UA_free(output->data);
+        output->data = NULL;
+        output->length = 0;
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    output->length = (size_t)snprintfLen;
+
+    return UA_STATUSCODE_GOOD;
+}
+
 /* ExpandedNodeId */
 static void
 ExpandedNodeId_clear(UA_ExpandedNodeId *p, const UA_DataType *_) {
@@ -439,6 +532,47 @@ UA_ExpandedNodeId_hash(const UA_ExpandedNodeId *n) {
     return h;
 }
 
+UA_StatusCode
+UA_ExpandedNodeId_print(const UA_ExpandedNodeId *id, UA_String *output) {
+    /* Don't print the namespace-index if a NamespaceUri is set */
+    UA_NodeId nid = id->nodeId;
+    if(id->namespaceUri.data != NULL)
+        nid.namespaceIndex = 0;
+
+    /* Encode the NodeId */
+    UA_String outNid = UA_STRING_NULL;
+    UA_StatusCode res = UA_NodeId_print(&nid, &outNid);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    /* Encode the ServerIndex */
+    char svr[100];
+    if(id->serverIndex == 0)
+        svr[0] = 0;
+    else
+        UA_snprintf(svr, 100, "svr=%"PRIu32";", id->serverIndex);
+    size_t svrlen = strlen(svr);
+
+    /* Encode the NamespaceUri */
+    char nsu[100];
+    if(id->namespaceUri.data == NULL)
+        nsu[0] = 0;
+    else
+        UA_snprintf(nsu, 100, "nsu=%.*s;", (int)id->namespaceUri.length, id->namespaceUri.data);
+    size_t nsulen = strlen(nsu);
+
+    /* Combine everything */
+    res = UA_ByteString_allocBuffer((UA_String*)output, outNid.length + svrlen + nsulen);
+    if(res == UA_STATUSCODE_GOOD) {
+        memcpy(output->data, svr, svrlen);
+        memcpy(&output->data[svrlen], nsu, nsulen);
+        memcpy(&output->data[svrlen+nsulen], outNid.data, outNid.length);
+    }
+
+    UA_String_clear(&outNid);
+    return res;
+}
+
 /* ExtensionObject */
 static void
 ExtensionObject_clear(UA_ExtensionObject *p, const UA_DataType *_) {
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 582a916a7ec..a427d2e23db 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -502,7 +502,7 @@ encodeJsonArray(CtxJson *ctx, const void *ptr, size_t length,
     return ret;
 }
 
-static const u8 hexmapLower[16] =
+static const u8 hexmap[16] =
     {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 static const u8 hexmapUpper[16] =
     {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
@@ -578,10 +578,10 @@ ENCODE_JSON(String) {
                 seq[1] = 'u';
                 UA_Byte b1 = (UA_Byte)(codepoint >> 8u);
                 UA_Byte b2 = (UA_Byte)(codepoint >> 0u);
-                seq[2] = hexmapLower[(b1 & 0xF0u) >> 4u];
-                seq[3] = hexmapLower[b1 & 0x0Fu];
-                seq[4] = hexmapLower[(b2 & 0xF0u) >> 4u];
-                seq[5] = hexmapLower[b2 & 0x0Fu];
+                seq[2] = hexmap[(b1 & 0xF0u) >> 4u];
+                seq[3] = hexmap[b1 & 0x0Fu];
+                seq[4] = hexmap[(b2 & 0xF0u) >> 4u];
+                seq[5] = hexmap[b2 & 0x0Fu];
                 length = 6;
             } else {
                 /* not in BMP -> construct a UTF-16 surrogate pair */
@@ -597,17 +597,17 @@ ENCODE_JSON(String) {
 
                 seq[0] = '\\';
                 seq[1] = 'u';
-                seq[2] = hexmapLower[(fb1 & 0xF0u) >> 4u];
-                seq[3] = hexmapLower[fb1 & 0x0Fu];
-                seq[4] = hexmapLower[(fb2 & 0xF0u) >> 4u];
-                seq[5] = hexmapLower[fb2 & 0x0Fu];
+                seq[2] = hexmap[(fb1 & 0xF0u) >> 4u];
+                seq[3] = hexmap[fb1 & 0x0Fu];
+                seq[4] = hexmap[(fb2 & 0xF0u) >> 4u];
+                seq[5] = hexmap[fb2 & 0x0Fu];
 
                 seq[6] = '\\';
                 seq[7] = 'u';
-                seq[8] = hexmapLower[(lb1 & 0xF0u) >> 4u];
-                seq[9] = hexmapLower[lb1 & 0x0Fu];
-                seq[10] = hexmapLower[(lb2 & 0xF0u) >> 4u];
-                seq[11] = hexmapLower[lb2 & 0x0Fu];
+                seq[8] = hexmap[(lb1 & 0xF0u) >> 4u];
+                seq[9] = hexmap[lb1 & 0x0Fu];
+                seq[10] = hexmap[(lb2 & 0xF0u) >> 4u];
+                seq[11] = hexmap[lb2 & 0x0Fu];
                 length = 12;
             }
             text = (char*)seq;
@@ -661,41 +661,26 @@ ENCODE_JSON(ByteString) {
     return ret;
 }
 
-/* Converts Guid to a hexadecimal represenation */
-static void UA_Guid_to_hex(const UA_Guid *guid, u8* out) {
-    /*
-                          16 byte
-       +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
-       |   data1   |data2|data3|          data4        |
-       +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
-       |aa aa aa aa-bb bb-cc cc-dd dd-ee ee ee ee ee ee|
-       +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
-                          36 character
-    */
-
-#ifdef hexCharlowerCase
-    const u8 *hexmap = hexmapLower;
-#else
-    const u8 *hexmap = hexmapUpper;
-#endif
+void
+UA_Guid_to_hex(const UA_Guid *guid, u8* out) {
     size_t i = 0, j = 28;
     for(; i<8;i++,j-=4)         /* pos 0-7, 4byte, (a) */
-        out[i] = hexmap[(guid->data1 >> j) & 0x0Fu];
+        out[i] = hexmapUpper[(guid->data1 >> j) & 0x0Fu];
     out[i++] = '-';             /* pos 8 */
     for(j=12; i<13;i++,j-=4)    /* pos 9-12, 2byte, (b) */
-        out[i] = hexmap[(uint16_t)(guid->data2 >> j) & 0x0Fu];
+        out[i] = hexmapUpper[(uint16_t)(guid->data2 >> j) & 0x0Fu];
     out[i++] = '-';             /* pos 13 */
     for(j=12; i<18;i++,j-=4)    /* pos 14-17, 2byte (c) */
-        out[i] = hexmap[(uint16_t)(guid->data3 >> j) & 0x0Fu];
-    out[i++] = '-';             /* pos 18 */
+        out[i] = hexmapUpper[(uint16_t)(guid->data3 >> j) & 0x0Fu];
+    out[i++] = '-';              /* pos 18 */
     for(j=0;i<23;i+=2,j++) {     /* pos 19-22, 2byte (d) */
-        out[i] = hexmap[(guid->data4[j] & 0xF0u) >> 4u];
-        out[i+1] = hexmap[guid->data4[j] & 0x0Fu];
+        out[i] = hexmapUpper[(guid->data4[j] & 0xF0u) >> 4u];
+        out[i+1] = hexmapUpper[guid->data4[j] & 0x0Fu];
     }
-    out[i++] = '-';             /* pos 23 */
+    out[i++] = '-';              /* pos 23 */
     for(j=2; i<36;i+=2,j++) {    /* pos 24-35, 6byte (e) */
-        out[i] = hexmap[(guid->data4[j] & 0xF0u) >> 4u];
-        out[i+1] = hexmap[guid->data4[j] & 0x0Fu];
+        out[i] = hexmapUpper[(guid->data4[j] & 0xF0u) >> 4u];
+        out[i+1] = hexmapUpper[guid->data4[j] & 0x0Fu];
     }
 }
 
@@ -1388,6 +1373,20 @@ UA_encodeJson(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
     return res;
 }
 
+UA_StatusCode
+UA_print(const void *p, const UA_DataType *type, UA_String *output) {
+    if(!p || !type || !output)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_EncodeJsonOptions options = {0};
+    options.useReversible = true;
+    options.prettyPrint = true;
+    options.unquotedKeys = true;
+    options.stringNodeIds = true;
+
+    return UA_encodeJson(p, type, output, &options);
+}
+
 /************/
 /* CalcSize */
 /************/
diff --git a/src/ua_types_print.c b/src/ua_types_print.c
deleted file mode 100644
index 936183ad32e..00000000000
--- a/src/ua_types_print.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *    Copyright 2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- */
-
-#include <open62541/types_generated.h>
-#include <open62541/types_generated_handling.h>
-
-#include "ua_util_internal.h"
-
-/* Printing of NodeIds is always enabled. We need it for logging. */
-
-UA_StatusCode
-UA_NodeId_print(const UA_NodeId *id, UA_String *output) {
-    UA_String_clear(output);
-    if(!id)
-        return UA_STATUSCODE_GOOD;
-
-    char *nsStr = NULL;
-    long snprintfLen = 0;
-    size_t nsLen = 0;
-    if(id->namespaceIndex != 0) {
-        nsStr = (char*)UA_malloc(9+1); // strlen("ns=XXXXX;") = 9 + Nullbyte
-        if(!nsStr)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        snprintfLen = UA_snprintf(nsStr, 10, "ns=%d;", id->namespaceIndex);
-        if(snprintfLen < 0 || snprintfLen >= 10) {
-            UA_free(nsStr);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        nsLen = (size_t)(snprintfLen);
-    }
-
-    UA_ByteString byteStr = UA_BYTESTRING_NULL;
-    switch (id->identifierType) {
-        case UA_NODEIDTYPE_NUMERIC:
-            /* ns (2 byte, 65535) = 5 chars, numeric (4 byte, 4294967295) = 10
-             * chars, delim = 1 , nullbyte = 1-> 17 chars */
-            output->length = nsLen + 2 + 10 + 1;
-            output->data = (UA_Byte*)UA_malloc(output->length);
-            if(output->data == NULL) {
-                output->length = 0;
-                UA_free(nsStr);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            snprintfLen = UA_snprintf((char*)output->data, output->length, "%si=%lu",
-                                      nsLen > 0 ? nsStr : "",
-                                      (unsigned long )id->identifier.numeric);
-            break;
-        case UA_NODEIDTYPE_STRING:
-            /* ns (16bit) = 5 chars, strlen + nullbyte */
-            output->length = nsLen + 2 + id->identifier.string.length + 1;
-            output->data = (UA_Byte*)UA_malloc(output->length);
-            if(output->data == NULL) {
-                output->length = 0;
-                UA_free(nsStr);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            snprintfLen = UA_snprintf((char*)output->data, output->length, "%ss=%.*s",
-                                      nsLen > 0 ? nsStr : "", (int)id->identifier.string.length,
-                                      id->identifier.string.data);
-            break;
-        case UA_NODEIDTYPE_GUID:
-            /* ns (16bit) = 5 chars + strlen(A123456C-0ABC-1A2B-815F-687212AAEE1B)=36 + nullbyte */
-            output->length = nsLen + 2 + 36 + 1;
-            output->data = (UA_Byte*)UA_malloc(output->length);
-            if(output->data == NULL) {
-                output->length = 0;
-                UA_free(nsStr);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            snprintfLen = UA_snprintf((char*)output->data, output->length,
-                                      "%sg=" UA_PRINTF_GUID_FORMAT, nsLen > 0 ? nsStr : "",
-                                      UA_PRINTF_GUID_DATA(id->identifier.guid));
-            break;
-        case UA_NODEIDTYPE_BYTESTRING:
-            UA_ByteString_toBase64(&id->identifier.byteString, &byteStr);
-            /* ns (16bit) = 5 chars + LEN + nullbyte */
-            output->length = nsLen + 2 + byteStr.length + 1;
-            output->data = (UA_Byte*)UA_malloc(output->length);
-            if(output->data == NULL) {
-                output->length = 0;
-                UA_String_clear(&byteStr);
-                UA_free(nsStr);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            snprintfLen = UA_snprintf((char*)output->data, output->length, "%sb=%.*s",
-                                      nsLen > 0 ? nsStr : "",
-                                      (int)byteStr.length, byteStr.data);
-            UA_String_clear(&byteStr);
-            break;
-    }
-    UA_free(nsStr);
-
-    if(snprintfLen < 0 || snprintfLen >= (long) output->length) {
-        UA_free(output->data);
-        output->data = NULL;
-        output->length = 0;
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    output->length = (size_t)snprintfLen;
-
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-UA_ExpandedNodeId_print(const UA_ExpandedNodeId *id, UA_String *output) {
-    /* Don't print the namespace-index if a NamespaceUri is set */
-    UA_NodeId nid = id->nodeId;
-    if(id->namespaceUri.data != NULL)
-        nid.namespaceIndex = 0;
-
-    /* Encode the NodeId */
-    UA_String outNid = UA_STRING_NULL;
-    UA_StatusCode res = UA_NodeId_print(&nid, &outNid);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-
-    /* Encode the ServerIndex */
-    char svr[100];
-    if(id->serverIndex == 0)
-        svr[0] = 0;
-    else
-        UA_snprintf(svr, 100, "svr=%"PRIu32";", id->serverIndex);
-    size_t svrlen = strlen(svr);
-
-    /* Encode the NamespaceUri */
-    char nsu[100];
-    if(id->namespaceUri.data == NULL)
-        nsu[0] = 0;
-    else
-        UA_snprintf(nsu, 100, "nsu=%.*s;", (int)id->namespaceUri.length, id->namespaceUri.data);
-    size_t nsulen = strlen(nsu);
-
-    /* Combine everything */
-    res = UA_ByteString_allocBuffer((UA_String*)output, outNid.length + svrlen + nsulen);
-    if(res == UA_STATUSCODE_GOOD) {
-        memcpy(output->data, svr, svrlen);
-        memcpy(&output->data[svrlen], nsu, nsulen);
-        memcpy(&output->data[svrlen+nsulen], outNid.data, outNid.length);
-    }
-
-    UA_String_clear(&outNid);
-    return res;
-}
-
-#ifdef UA_ENABLE_JSON_ENCODING
-
-UA_StatusCode
-UA_print(const void *p, const UA_DataType *type, UA_String *output) {
-    if(!p || !type || !output)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    /* Set up the encoding options */
-    UA_EncodeJsonOptions options = {0};
-    options.useReversible = true;
-    options.prettyPrint = true;
-    options.unquotedKeys = true;
-    options.stringNodeIds = true;
-
-    /* If no buffer is provided, compute the output length and allocate */
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    if(output->length == 0) {
-        size_t len = UA_calcSizeJson(p, type, &options);
-        if(len == 0)
-            return UA_STATUSCODE_BADENCODINGERROR;
-        res = UA_ByteString_allocBuffer(output, len);
-        if(res != UA_STATUSCODE_GOOD)
-            return res;
-    }
-
-    /* Encode and return */
-    return UA_encodeJson(p, type, output, &options);
-}
-
-#endif

From 8716d24f746f0cb49cf8bec568e2f360f5cb1b2b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 13 Aug 2022 21:38:43 +0200
Subject: [PATCH 0417/1963] fix(core): Properly escape utf8 for
 stringly-encoded NodeIds within JSON

---
 src/ua_types_encoding_json.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index a427d2e23db..b62106a276e 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -790,15 +790,14 @@ NodeId_encodeJsonInternal(CtxJson *ctx, UA_NodeId const *src) {
 }
 
 ENCODE_JSON(NodeId) {
-    /* Encode as string (non-standard) */
+    /* Encode as string (non-standard). Encode with the standard utf8 escaping.
+     * As the NodeId can contain quote characters, etc. */
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     if(ctx->stringNodeIds) {
-        UA_String out = {(size_t)(ctx->end - ctx->pos), ctx->pos};
-        ret |= writeChar(ctx, '\"');
+        UA_String out = UA_STRING_NULL;
         ret |= UA_NodeId_print(src, &out);
-        if(ret == UA_STATUSCODE_GOOD)
-            ctx->pos += out.length;
-        ret |= writeChar(ctx, '\"');
+        ret |= encodeJsonJumpTable[UA_DATATYPEKIND_STRING](ctx, &out, NULL);
+        UA_String_clear(&out);
         return ret;
     }
 
@@ -836,15 +835,14 @@ ENCODE_JSON(NodeId) {
 
 /* ExpandedNodeId */
 ENCODE_JSON(ExpandedNodeId) {
-    /* Encode as string (non-standard) */
+    /* Encode as string (non-standard). Encode with utf8 escaping as the NodeId
+     * can contain quote characters, etc. */
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     if(ctx->stringNodeIds) {
-        UA_String out = {(size_t)(ctx->end - ctx->pos), ctx->pos};
-        ret |= writeChar(ctx, '\"');
+        UA_String out = UA_STRING_NULL;
         ret |= UA_ExpandedNodeId_print(src, &out);
-        if(ret == UA_STATUSCODE_GOOD)
-            ctx->pos += out.length;
-        ret |= writeChar(ctx, '\"');
+        ret |= encodeJsonJumpTable[UA_DATATYPEKIND_STRING](ctx, &out, NULL);
+        UA_String_clear(&out);
         return ret;
     }
 

From 88adf5c673e2981b9dbc46449713756c2c295928 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 14 Aug 2022 21:32:13 +0200
Subject: [PATCH 0418/1963] feat(deps): UA_base64_buf encodes into an existing
 buffer

---
 deps/base64.c | 9 +++++++--
 deps/base64.h | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/deps/base64.c b/deps/base64.c
index ce60b663e1c..64cbabc0b20 100644
--- a/deps/base64.c
+++ b/deps/base64.c
@@ -28,6 +28,12 @@ UA_base64(const unsigned char *src, size_t len, size_t *out_len) {
 	if(!out)
 		return NULL;
 
+    *out_len = UA_base64_buf(src, len, out);
+    return out;
+}
+
+size_t
+UA_base64_buf(const unsigned char *src, size_t len, unsigned char *out) {
 	const unsigned char *end = src + len;
 	const unsigned char *in = src;
 	unsigned char *pos = out;
@@ -51,8 +57,7 @@ UA_base64(const unsigned char *src, size_t len, size_t *out_len) {
 		*pos++ = '=';
 	}
 
-    *out_len = (size_t)(pos - out);
-	return out;
+    return (size_t)(pos - out);
 }
 
 static const uint32_t from_b64[256] = {
diff --git a/deps/base64.h b/deps/base64.h
index 33de7b4dd32..d23daed47f8 100644
--- a/deps/base64.h
+++ b/deps/base64.h
@@ -17,6 +17,11 @@ _UA_BEGIN_DECLS
 unsigned char *
 UA_base64(const unsigned char *src, size_t len, size_t *out_len);
 
+/* Requires as input a buffer of length at least 4*((len + 2) / 3).
+ * Returns the actual size */
+size_t
+UA_base64_buf(const unsigned char *src, size_t len, unsigned char *out);
+
 /**
  * base64_decode - Base64 decode
  * @src: Data to be decoded

From 13ab91a697d5fda70d55b224ff18d6f36cb42fa7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 15 Aug 2022 18:31:44 +0200
Subject: [PATCH 0419/1963] fix(test): NodeId print tests allocate memory each

---
 tests/check_utils.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/check_utils.c b/tests/check_utils.c
index 079437340db..6dafaf3d43c 100644
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -312,15 +312,16 @@ START_TEST(idToStringNumeric) {
     n = UA_NODEID_NUMERIC(0,0);
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "i=0");
+    UA_String_clear(&str);
 
     n = UA_NODEID_NUMERIC(12345,1234567890);
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "ns=12345;i=1234567890");
+    UA_String_clear(&str);
 
     n = UA_NODEID_NUMERIC(0xFFFF,0xFFFFFFFF);
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "ns=65535;i=4294967295");
-
     UA_String_clear(&str);
 } END_TEST
 
@@ -331,15 +332,16 @@ START_TEST(idToStringString) {
     n = UA_NODEID_STRING(0,"");
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "s=");
+    UA_String_clear(&str);
 
     n = UA_NODEID_STRING(54321,"Some String");
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "ns=54321;s=Some String");
+    UA_String_clear(&str);
 
     n = UA_NODEID_STRING(0,"Some String");
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "s=Some String");
-
     UA_String_clear(&str);
 } END_TEST
 
@@ -352,6 +354,7 @@ START_TEST(idToStringGuid) {
     n = UA_NODEID_GUID(0,UA_GUID_NULL);
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "g=00000000-0000-0000-0000-000000000000");
+    UA_String_clear(&str);
 
     g.data1 = 0xA123456C;
     g.data2 = 0x0ABC;
@@ -368,6 +371,7 @@ START_TEST(idToStringGuid) {
     n = UA_NODEID_GUID(65535,g);
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "ns=65535;g=a123456c-0abc-1a2b-815f-687212aaee1b");
+    UA_String_clear(&str);
 
     g.data1 = 0xFFFFFFFF;
     g.data2 = 0xFFFF;
@@ -384,7 +388,6 @@ START_TEST(idToStringGuid) {
     n = UA_NODEID_GUID(65535,g);
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "ns=65535;g=ffffffff-ffff-ffff-ffff-ffffffffffff");
-
     UA_String_clear(&str);
 } END_TEST
 
@@ -398,6 +401,7 @@ START_TEST(idToStringByte) {
     n.identifier.byteString.length = 0;
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "b=");
+    UA_String_clear(&str);
 
     UA_ByteString bs = UA_BYTESTRING_NULL;
 
@@ -409,6 +413,7 @@ START_TEST(idToStringByte) {
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "ns=123;b=AA==");
     UA_free(bs.data);
+    UA_String_clear(&str);
 
     bs.length = 1;
     bs.data = (UA_Byte*)UA_malloc(bs.length);
@@ -418,6 +423,7 @@ START_TEST(idToStringByte) {
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "ns=123;b=LA==");
     UA_free(bs.data);
+    UA_String_clear(&str);
 
     bs.length = 5;
     bs.data = (UA_Byte*)UA_malloc(bs.length);
@@ -431,7 +437,6 @@ START_TEST(idToStringByte) {
     UA_NodeId_print(&n, &str);
     assertNodeIdString(&str, "ns=599;b=IYPgVHg=");
     UA_free(bs.data);
-
     UA_String_clear(&str);
 } END_TEST
 

From 046b7ba702fe148538f57bc4b917542590b24fac Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 15 Aug 2022 18:32:36 +0200
Subject: [PATCH 0420/1963] refactor(core): Make UA_Guid_to_hex reusable

---
 src/ua_types_encoding_json.c | 43 ++++++++++++++++++------------------
 src/ua_util_internal.h       |  3 +++
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index b62106a276e..0ebd137fd32 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -502,7 +502,7 @@ encodeJsonArray(CtxJson *ctx, const void *ptr, size_t length,
     return ret;
 }
 
-static const u8 hexmap[16] =
+static const u8 hexmapLower[16] =
     {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 static const u8 hexmapUpper[16] =
     {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
@@ -578,10 +578,10 @@ ENCODE_JSON(String) {
                 seq[1] = 'u';
                 UA_Byte b1 = (UA_Byte)(codepoint >> 8u);
                 UA_Byte b2 = (UA_Byte)(codepoint >> 0u);
-                seq[2] = hexmap[(b1 & 0xF0u) >> 4u];
-                seq[3] = hexmap[b1 & 0x0Fu];
-                seq[4] = hexmap[(b2 & 0xF0u) >> 4u];
-                seq[5] = hexmap[b2 & 0x0Fu];
+                seq[2] = hexmapLower[(b1 & 0xF0u) >> 4u];
+                seq[3] = hexmapLower[b1 & 0x0Fu];
+                seq[4] = hexmapLower[(b2 & 0xF0u) >> 4u];
+                seq[5] = hexmapLower[b2 & 0x0Fu];
                 length = 6;
             } else {
                 /* not in BMP -> construct a UTF-16 surrogate pair */
@@ -597,17 +597,17 @@ ENCODE_JSON(String) {
 
                 seq[0] = '\\';
                 seq[1] = 'u';
-                seq[2] = hexmap[(fb1 & 0xF0u) >> 4u];
-                seq[3] = hexmap[fb1 & 0x0Fu];
-                seq[4] = hexmap[(fb2 & 0xF0u) >> 4u];
-                seq[5] = hexmap[fb2 & 0x0Fu];
+                seq[2] = hexmapLower[(fb1 & 0xF0u) >> 4u];
+                seq[3] = hexmapLower[fb1 & 0x0Fu];
+                seq[4] = hexmapLower[(fb2 & 0xF0u) >> 4u];
+                seq[5] = hexmapLower[fb2 & 0x0Fu];
 
                 seq[6] = '\\';
                 seq[7] = 'u';
-                seq[8] = hexmap[(lb1 & 0xF0u) >> 4u];
-                seq[9] = hexmap[lb1 & 0x0Fu];
-                seq[10] = hexmap[(lb2 & 0xF0u) >> 4u];
-                seq[11] = hexmap[lb2 & 0x0Fu];
+                seq[8] = hexmapLower[(lb1 & 0xF0u) >> 4u];
+                seq[9] = hexmapLower[lb1 & 0x0Fu];
+                seq[10] = hexmapLower[(lb2 & 0xF0u) >> 4u];
+                seq[11] = hexmapLower[lb2 & 0x0Fu];
                 length = 12;
             }
             text = (char*)seq;
@@ -662,25 +662,26 @@ ENCODE_JSON(ByteString) {
 }
 
 void
-UA_Guid_to_hex(const UA_Guid *guid, u8* out) {
+UA_Guid_to_hex(const UA_Guid *guid, u8* out, UA_Boolean lower) {
+    const u8 *hexmap = (lower) ? hexmapLower : hexmapUpper;
     size_t i = 0, j = 28;
     for(; i<8;i++,j-=4)         /* pos 0-7, 4byte, (a) */
-        out[i] = hexmapUpper[(guid->data1 >> j) & 0x0Fu];
+        out[i] = hexmap[(guid->data1 >> j) & 0x0Fu];
     out[i++] = '-';             /* pos 8 */
     for(j=12; i<13;i++,j-=4)    /* pos 9-12, 2byte, (b) */
-        out[i] = hexmapUpper[(uint16_t)(guid->data2 >> j) & 0x0Fu];
+        out[i] = hexmap[(uint16_t)(guid->data2 >> j) & 0x0Fu];
     out[i++] = '-';             /* pos 13 */
     for(j=12; i<18;i++,j-=4)    /* pos 14-17, 2byte (c) */
-        out[i] = hexmapUpper[(uint16_t)(guid->data3 >> j) & 0x0Fu];
+        out[i] = hexmap[(uint16_t)(guid->data3 >> j) & 0x0Fu];
     out[i++] = '-';              /* pos 18 */
     for(j=0;i<23;i+=2,j++) {     /* pos 19-22, 2byte (d) */
-        out[i] = hexmapUpper[(guid->data4[j] & 0xF0u) >> 4u];
-        out[i+1] = hexmapUpper[guid->data4[j] & 0x0Fu];
+        out[i] = hexmap[(guid->data4[j] & 0xF0u) >> 4u];
+        out[i+1] = hexmap[guid->data4[j] & 0x0Fu];
     }
     out[i++] = '-';              /* pos 23 */
     for(j=2; i<36;i+=2,j++) {    /* pos 24-35, 6byte (e) */
-        out[i] = hexmapUpper[(guid->data4[j] & 0xF0u) >> 4u];
-        out[i+1] = hexmapUpper[guid->data4[j] & 0x0Fu];
+        out[i] = hexmap[(guid->data4[j] & 0xF0u) >> 4u];
+        out[i+1] = hexmap[guid->data4[j] & 0x0Fu];
     }
 }
 
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index dbf06f6530f..195b3c45f9a 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -295,6 +295,9 @@ UA_String_equal_ignorecase(const UA_String *s1, const UA_String *s2);
 /* Encoding Helpers */
 /********************/
 
+/* out must be a buffer with at least 36 elements, the length of every guid */
+void UA_Guid_to_hex(const UA_Guid *guid, u8* out, UA_Boolean lower);
+
 #define UA_ENCODING_HELPERS(TYPE, UPCASE_TYPE)                          \
     static UA_INLINE size_t                                             \
     UA_##TYPE##_calcSizeBinary(const UA_##TYPE *src) {                    \

From ebc3d9824691a8807cd803616e61491cdc0c888a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 15 Aug 2022 18:33:16 +0200
Subject: [PATCH 0421/1963] refactor(core): NodeId printing can use an existing
 buffer; don't use printf internally

---
 include/open62541/types.h |  26 ++--
 src/ua_types.c            | 262 ++++++++++++++++++++++----------------
 2 files changed, 168 insertions(+), 120 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index e4fbdf4f7ba..13d99dc5180 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -401,14 +401,16 @@ UA_Boolean UA_EXPORT UA_NodeId_isNull(const UA_NodeId *p);
  *   UA_NODEID("ns=10;s=Hello:World")
  *   UA_NODEID("g=09087e75-8e5e-499b-954f-f2a9603db28a")
  *   UA_NODEID("ns=1;b=b3BlbjYyNTQxIQ==") // base64
- * */
+ *
+ * The method can either use a pre-allocated string buffer or allocates memory
+ * internally if called with an empty output string. */
 UA_StatusCode UA_EXPORT
 UA_NodeId_print(const UA_NodeId *id, UA_String *output);
 
-#ifdef UA_ENABLE_PARSING
 /* Parse the human-readable NodeId format. Attention! String and
  * ByteString NodeIds have their identifier malloc'ed and need to be
  * cleaned up. */
+#ifdef UA_ENABLE_PARSING
 UA_StatusCode UA_EXPORT
 UA_NodeId_parse(UA_NodeId *id, const UA_String str);
 
@@ -488,18 +490,24 @@ typedef struct {
 
 UA_EXPORT extern const UA_ExpandedNodeId UA_EXPANDEDNODEID_NULL;
 
-UA_StatusCode UA_EXPORT
-UA_ExpandedNodeId_print(const UA_ExpandedNodeId *id, UA_String *output);
-
-#ifdef UA_ENABLE_PARSING
-/* Parse the ExpandedNodeId format defined in Part 6, 5.3.1.11:
+/* Print the ExpandedNodeId in the humand-readable format defined in Part 6,
+ * 5.3.1.11:
  *
  *   svr=<serverindex>;ns=<namespaceindex>;<type>=<value>
  *     or
  *   svr=<serverindex>;nsu=<uri>;<type>=<value>
  *
- * The definitions for svr, ns and nsu can be omitted and will be set to zero /
- * the empty string.*/
+ * The definitions for svr, ns and nsu is omitted if zero / the empty string.
+ *
+ * The method can either use a pre-allocated string buffer or allocates memory
+ * internally if called with an empty output string. */
+UA_StatusCode UA_EXPORT
+UA_ExpandedNodeId_print(const UA_ExpandedNodeId *id, UA_String *output);
+
+/* Parse the human-readable NodeId format. Attention! String and
+ * ByteString NodeIds have their identifier malloc'ed and need to be
+ * cleaned up. */
+#ifdef UA_ENABLE_PARSING
 UA_StatusCode UA_EXPORT
 UA_ExpandedNodeId_parse(UA_ExpandedNodeId *id, const UA_String str);
 
diff --git a/src/ua_types.c b/src/ua_types.c
index bddd7ef4996..90484812252 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -20,6 +20,8 @@
 #include <open62541/types_generated_handling.h>
 
 #include "ua_util_internal.h"
+#include "../deps/itoa.h"
+#include "../deps/base64.h"
 #include "libc_time.h"
 #include "pcg_basic.h"
 
@@ -397,96 +399,108 @@ UA_NodeId_hash(const UA_NodeId *n) {
     }
 }
 
-UA_StatusCode
-UA_NodeId_print(const UA_NodeId *id, UA_String *output) {
-    UA_String_clear(output);
-    if(!id)
-        return UA_STATUSCODE_GOOD;
-
-    char *nsStr = NULL;
-    long snprintfLen = 0;
-    size_t nsLen = 0;
+/* Computes length for the encoding size and pre-encodes the numeric values */
+static size_t
+nodeIdSize(const UA_NodeId *id,
+           char *nsStr, size_t *nsStrSize,
+           char *numIdStr, size_t *numIdStrSize) {
+    /* Namespace length */
+    size_t len = 0;
     if(id->namespaceIndex != 0) {
-        nsStr = (char*)UA_malloc(9+1); // strlen("ns=XXXXX;") = 9 + Nullbyte
-        if(!nsStr)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        snprintfLen = UA_snprintf(nsStr, 10, "ns=%d;", id->namespaceIndex);
-        if(snprintfLen < 0 || snprintfLen >= 10) {
-            UA_free(nsStr);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        nsLen = (size_t)(snprintfLen);
+        len += 4; /* ns=; */
+        *nsStrSize = itoaUnsigned(id->namespaceIndex, nsStr, 10);
+        len += *nsStrSize;
     }
 
-    UA_ByteString byteStr = UA_BYTESTRING_NULL;
     switch (id->identifierType) {
-        case UA_NODEIDTYPE_NUMERIC:
-            /* ns (2 byte, 65535) = 5 chars, numeric (4 byte, 4294967295) = 10
-             * chars, delim = 1 , nullbyte = 1-> 17 chars */
-            output->length = nsLen + 2 + 10 + 1;
-            output->data = (UA_Byte*)UA_malloc(output->length);
-            if(output->data == NULL) {
-                output->length = 0;
-                UA_free(nsStr);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            snprintfLen = UA_snprintf((char*)output->data, output->length, "%si=%lu",
-                                      nsLen > 0 ? nsStr : "",
-                                      (unsigned long )id->identifier.numeric);
-            break;
-        case UA_NODEIDTYPE_STRING:
-            /* ns (16bit) = 5 chars, strlen + nullbyte */
-            output->length = nsLen + 2 + id->identifier.string.length + 1;
-            output->data = (UA_Byte*)UA_malloc(output->length);
-            if(output->data == NULL) {
-                output->length = 0;
-                UA_free(nsStr);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            snprintfLen = UA_snprintf((char*)output->data, output->length, "%ss=%.*s",
-                                      nsLen > 0 ? nsStr : "", (int)id->identifier.string.length,
-                                      id->identifier.string.data);
-            break;
-        case UA_NODEIDTYPE_GUID:
-            /* ns (16bit) = 5 chars + strlen(A123456C-0ABC-1A2B-815F-687212AAEE1B)=36 + nullbyte */
-            output->length = nsLen + 2 + 36 + 1;
-            output->data = (UA_Byte*)UA_malloc(output->length);
-            if(output->data == NULL) {
-                output->length = 0;
-                UA_free(nsStr);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            snprintfLen = UA_snprintf((char*)output->data, output->length,
-                                      "%sg=" UA_PRINTF_GUID_FORMAT, nsLen > 0 ? nsStr : "",
-                                      UA_PRINTF_GUID_DATA(id->identifier.guid));
-            break;
-        case UA_NODEIDTYPE_BYTESTRING:
-            UA_ByteString_toBase64(&id->identifier.byteString, &byteStr);
-            /* ns (16bit) = 5 chars + LEN + nullbyte */
-            output->length = nsLen + 2 + byteStr.length + 1;
-            output->data = (UA_Byte*)UA_malloc(output->length);
-            if(output->data == NULL) {
-                output->length = 0;
-                UA_String_clear(&byteStr);
-                UA_free(nsStr);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            snprintfLen = UA_snprintf((char*)output->data, output->length, "%sb=%.*s",
-                                      nsLen > 0 ? nsStr : "",
-                                      (int)byteStr.length, byteStr.data);
-            UA_String_clear(&byteStr);
-            break;
+    case UA_NODEIDTYPE_NUMERIC:
+        *numIdStrSize = itoaUnsigned(id->identifier.numeric, numIdStr, 10);
+        len += 2 + *numIdStrSize;
+        break;
+    case UA_NODEIDTYPE_STRING:
+        len += 2 + id->identifier.string.length;
+        break;
+    case UA_NODEIDTYPE_GUID:
+        len += 2 + 36;
+        break;
+    case UA_NODEIDTYPE_BYTESTRING:
+        len += 2 + (4*((id->identifier.byteString.length + 2) / 3));
+        break;
+    default:
+        len = 0;
     }
-    UA_free(nsStr);
+    return len;
+}
+
+#define PRINT_NODEID                                           \
+    /* Encode the namespace */                                 \
+    if(id->namespaceIndex != 0) {                              \
+        memcpy(pos, "ns=", 3);                                 \
+        pos += 3;                                              \
+        memcpy(pos, nsStr, nsStrSize);                         \
+        pos += nsStrSize;                                      \
+        *pos++ = ';';                                          \
+    }                                                          \
+                                                               \
+    /* Encode the identifier */                                \
+    switch(id->identifierType) {                               \
+    case UA_NODEIDTYPE_NUMERIC:                                \
+        memcpy(pos, "i=", 2);                                  \
+        pos += 2;                                              \
+        memcpy(pos, numIdStr, numIdStrSize);                   \
+        pos += numIdStrSize;                                   \
+        break;                                                 \
+    case UA_NODEIDTYPE_STRING:                                 \
+        memcpy(pos, "s=", 2);                                  \
+        pos += 2;                                              \
+        memcpy(pos, id->identifier.string.data,                \
+               id->identifier.string.length);                  \
+        pos += id->identifier.string.length;                   \
+        break;                                                 \
+    case UA_NODEIDTYPE_GUID:                                   \
+        memcpy(pos, "g=", 2);                                  \
+        pos += 2;                                              \
+        UA_Guid_to_hex(&id->identifier.guid,                   \
+                       (unsigned char*)pos, true);             \
+        pos += 36;                                             \
+        break;                                                 \
+    case UA_NODEIDTYPE_BYTESTRING:                             \
+        memcpy(pos, "b=", 2);                                  \
+        pos += 2;                                              \
+        pos += UA_base64_buf(id->identifier.byteString.data,   \
+                             id->identifier.byteString.length, \
+                             (unsigned char*)pos);             \
+        break;                                                 \
+    }                                                          \
+    do { } while(false)
 
-    if(snprintfLen < 0 || snprintfLen >= (long) output->length) {
-        UA_free(output->data);
-        output->data = NULL;
-        output->length = 0;
+UA_StatusCode
+UA_NodeId_print(const UA_NodeId *id, UA_String *output) {
+    /* Compute the string length */
+    char nsStr[6];
+    size_t nsStrSize = 0;
+    char numIdStr[11];
+    size_t numIdStrSize = 0;
+    size_t idLen = nodeIdSize(id, nsStr, &nsStrSize, numIdStr, &numIdStrSize);
+    if(idLen == 0)
         return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Allocate memory if required */
+    if(output->length == 0) {
+        UA_StatusCode res = UA_ByteString_allocBuffer((UA_ByteString*)output, idLen);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+    } else {
+        if(output->length < idLen)
+            return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
+        output->length = idLen;
     }
-    output->length = (size_t)snprintfLen;
 
+    /* Print the NodeId */
+    char *pos = (char*)output->data;
+    PRINT_NODEID;
+
+    UA_assert(output->length == (size_t)((UA_Byte*)pos - output->data));
     return UA_STATUSCODE_GOOD;
 }
 
@@ -533,44 +547,70 @@ UA_ExpandedNodeId_hash(const UA_ExpandedNodeId *n) {
 }
 
 UA_StatusCode
-UA_ExpandedNodeId_print(const UA_ExpandedNodeId *id, UA_String *output) {
+UA_ExpandedNodeId_print(const UA_ExpandedNodeId *eid, UA_String *output) {
     /* Don't print the namespace-index if a NamespaceUri is set */
-    UA_NodeId nid = id->nodeId;
-    if(id->namespaceUri.data != NULL)
-        nid.namespaceIndex = 0;
+    UA_NodeId stackid = eid->nodeId;
+    UA_NodeId *id = &stackid; /* for the print-macro below */
+    if(eid->namespaceUri.data != NULL)
+        id->namespaceIndex = 0;
+
+    /* Compute the string length */
+    char nsStr[6];
+    size_t nsStrSize = 0;
+    char numIdStr[11];
+    size_t numIdStrSize = 0;
+    size_t idLen = nodeIdSize(id, nsStr, &nsStrSize, numIdStr, &numIdStrSize);
+    if(idLen == 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
-    /* Encode the NodeId */
-    UA_String outNid = UA_STRING_NULL;
-    UA_StatusCode res = UA_NodeId_print(&nid, &outNid);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
+    char srvIdxStr[11];
+    size_t srvIdxSize = 0;
+    if(eid->serverIndex != 0) {
+        idLen += 5; /* svr=; */
+        srvIdxSize = itoaUnsigned(eid->serverIndex, srvIdxStr, 10);
+        idLen += srvIdxSize;
+    }
+
+    if(eid->namespaceUri.data != NULL) {
+        idLen += 5; /* nsu=; */
+        idLen += eid->namespaceUri.length;
+    }
+
+    /* Allocate memory if required */
+    if(output->length == 0) {
+        UA_StatusCode res = UA_ByteString_allocBuffer((UA_ByteString*)output, idLen);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+    } else {
+        if(output->length < idLen)
+            return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
+        output->length = idLen;
+    }
 
     /* Encode the ServerIndex */
-    char svr[100];
-    if(id->serverIndex == 0)
-        svr[0] = 0;
-    else
-        UA_snprintf(svr, 100, "svr=%"PRIu32";", id->serverIndex);
-    size_t svrlen = strlen(svr);
+    char *pos = (char*)output->data;
+    if(eid->serverIndex != 0) {
+        memcpy(pos, "svr=", 4);
+        pos += 4;
+        memcpy(pos, srvIdxStr, srvIdxSize);
+        pos += srvIdxSize;
+        *pos++ = ';';
+    }
 
     /* Encode the NamespaceUri */
-    char nsu[100];
-    if(id->namespaceUri.data == NULL)
-        nsu[0] = 0;
-    else
-        UA_snprintf(nsu, 100, "nsu=%.*s;", (int)id->namespaceUri.length, id->namespaceUri.data);
-    size_t nsulen = strlen(nsu);
-
-    /* Combine everything */
-    res = UA_ByteString_allocBuffer((UA_String*)output, outNid.length + svrlen + nsulen);
-    if(res == UA_STATUSCODE_GOOD) {
-        memcpy(output->data, svr, svrlen);
-        memcpy(&output->data[svrlen], nsu, nsulen);
-        memcpy(&output->data[svrlen+nsulen], outNid.data, outNid.length);
+    if(eid->namespaceUri.data != NULL) {
+        memcpy(pos, "nsu=", 4);
+        pos += 4;
+        memcpy(pos, eid->namespaceUri.data, eid->namespaceUri.length);
+        pos += eid->namespaceUri.length;
+        *pos++ = ';';
     }
 
-    UA_String_clear(&outNid);
-    return res;
+    /* Print the NodeId */
+    PRINT_NODEID;
+
+    UA_assert(output->length == (size_t)((UA_Byte*)pos - output->data));
+    return UA_STATUSCODE_GOOD;
 }
 
 /* ExtensionObject */

From b313a324505a62743e68ddff2373287f1ed9afed Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 15 Aug 2022 18:36:13 +0200
Subject: [PATCH 0422/1963] refactor(core): Remove test where NodeId pointer is
 NULL

---
 tests/check_utils.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/check_utils.c b/tests/check_utils.c
index 6dafaf3d43c..67e7ec495db 100644
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -300,11 +300,6 @@ static void assertNodeIdString(const UA_String *gotStr, const char* expectedStr)
     UA_free(gotChars);
 }
 
-START_TEST(idToStringNull) {
-    UA_String str = UA_STRING_NULL;
-    ck_assert_int_eq(UA_NodeId_print(NULL, &str), UA_STATUSCODE_GOOD);
-} END_TEST
-
 START_TEST(idToStringNumeric) {
     UA_NodeId n;
     UA_String str = UA_STRING_NULL;
@@ -643,7 +638,6 @@ static Suite* testSuite_Utils(void) {
 
 
     TCase *tc1 = tcase_create("test nodeid string");
-    tcase_add_test(tc1, idToStringNull);
     tcase_add_test(tc1, idToStringNumeric);
     tcase_add_test(tc1, idToStringString);
     tcase_add_test(tc1, idToStringGuid);

From 102df360be20e07da73122b3314c17eb21afd80a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 15 Aug 2022 18:47:25 +0200
Subject: [PATCH 0423/1963] feat(core): Add UA_Guid_print

---
 CMakeLists.txt               |  4 +--
 include/open62541/types.h    | 17 +++++++++---
 src/ua_types.c               | 45 +++++++++++++++++++++++++++++++
 src/ua_types_encoding_json.c | 52 +++++++++---------------------------
 tests/check_types_parse.c    | 10 +++++++
 5 files changed, 83 insertions(+), 45 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8e28d0ed47..30687d8482d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -938,6 +938,7 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
                      ${PROJECT_SOURCE_DIR}/deps/libc_time.h
                      ${PROJECT_SOURCE_DIR}/deps/base64.h
+                     ${PROJECT_SOURCE_DIR}/deps/itoa.h
                      ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.h
                      ${PROJECT_SOURCE_DIR}/src/ua_util_internal.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated.h
@@ -1005,6 +1006,7 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/deps/libc_time.c
                 ${PROJECT_SOURCE_DIR}/deps/pcg_basic.c
                 ${PROJECT_SOURCE_DIR}/deps/base64.c
+                ${PROJECT_SOURCE_DIR}/deps/itoa.c
                 ${PROJECT_SOURCE_DIR}/deps/aa_tree.c
                 ${PROJECT_SOURCE_DIR}/deps/ziptree.c
 
@@ -1156,12 +1158,10 @@ if(UA_ENABLE_JSON_ENCODING)
     endif()
     list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/cj5.h
                                  ${PROJECT_SOURCE_DIR}/deps/string_escape.h
-                                 ${PROJECT_SOURCE_DIR}/deps/itoa.h
                                  ${PROJECT_SOURCE_DIR}/deps/parse_num.h
                                  ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.h)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/cj5.c
                             ${PROJECT_SOURCE_DIR}/deps/string_escape.c
-                            ${PROJECT_SOURCE_DIR}/deps/itoa.c
                             ${PROJECT_SOURCE_DIR}/deps/parse_num.c
                             ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.c)
 endif()
diff --git a/include/open62541/types.h b/include/open62541/types.h
index 13d99dc5180..482ff0da36c 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -288,13 +288,22 @@ typedef struct {
 
 UA_EXPORT extern const UA_Guid UA_GUID_NULL;
 
-UA_Boolean UA_EXPORT UA_Guid_equal(const UA_Guid *g1, const UA_Guid *g2);
+UA_Boolean UA_EXPORT
+UA_Guid_equal(const UA_Guid *g1, const UA_Guid *g2);
 
-#ifdef UA_ENABLE_PARSING
-/* Parse the Guid format defined in Part 6, 5.1.3.
+/* Print a Guid in the human-readable format defined in Part 6, 5.1.3
+ *
  * Format: C496578A-0DFE-4B8F-870A-745238C6AEAE
  *         |       |    |    |    |            |
- *         0       8    13   18   23           36 */
+ *         0       8    13   18   23           36
+ *
+ * This allocates memory if the output argument is an empty string. Tries to use
+ * the given buffer otherwise. */
+UA_StatusCode UA_EXPORT
+UA_Guid_print(const UA_Guid *guid, UA_String *output);
+
+/* Parse the humand-readable Guid format */
+#ifdef UA_ENABLE_PARSING
 UA_StatusCode UA_EXPORT
 UA_Guid_parse(UA_Guid *guid, const UA_String str);
 
diff --git a/src/ua_types.c b/src/ua_types.c
index 90484812252..9a11765bfee 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -276,6 +276,51 @@ UA_Guid_random(void) {
     return result;
 }
 
+static const u8 hexmapLower[16] =
+    {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+static const u8 hexmapUpper[16] =
+    {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+void
+UA_Guid_to_hex(const UA_Guid *guid, u8* out, UA_Boolean lower) {
+    const u8 *hexmap = (lower) ? hexmapLower : hexmapUpper;
+    size_t i = 0, j = 28;
+    for(; i<8;i++,j-=4)         /* pos 0-7, 4byte, (a) */
+        out[i] = hexmap[(guid->data1 >> j) & 0x0Fu];
+    out[i++] = '-';             /* pos 8 */
+    for(j=12; i<13;i++,j-=4)    /* pos 9-12, 2byte, (b) */
+        out[i] = hexmap[(uint16_t)(guid->data2 >> j) & 0x0Fu];
+    out[i++] = '-';             /* pos 13 */
+    for(j=12; i<18;i++,j-=4)    /* pos 14-17, 2byte (c) */
+        out[i] = hexmap[(uint16_t)(guid->data3 >> j) & 0x0Fu];
+    out[i++] = '-';              /* pos 18 */
+    for(j=0;i<23;i+=2,j++) {     /* pos 19-22, 2byte (d) */
+        out[i] = hexmap[(guid->data4[j] & 0xF0u) >> 4u];
+        out[i+1] = hexmap[guid->data4[j] & 0x0Fu];
+    }
+    out[i++] = '-';              /* pos 23 */
+    for(j=2; i<36;i+=2,j++) {    /* pos 24-35, 6byte (e) */
+        out[i] = hexmap[(guid->data4[j] & 0xF0u) >> 4u];
+        out[i+1] = hexmap[guid->data4[j] & 0x0Fu];
+    }
+}
+
+UA_StatusCode
+UA_Guid_print(const UA_Guid *guid, UA_String *output) {
+    if(output->length == 0) {
+        UA_StatusCode res =
+            UA_ByteString_allocBuffer((UA_ByteString*)output, 36);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+    } else {
+        if(output->length < 36)
+            return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
+        output->length = 36;
+    }
+    UA_Guid_to_hex(guid, output->data, true);
+    return UA_STATUSCODE_GOOD;
+}
+
 /* ByteString */
 UA_StatusCode
 UA_ByteString_allocBuffer(UA_ByteString *bs, size_t length) {
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 0ebd137fd32..e450d0d4b86 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -502,10 +502,8 @@ encodeJsonArray(CtxJson *ctx, const void *ptr, size_t length,
     return ret;
 }
 
-static const u8 hexmapLower[16] =
+static const u8 hexmap[16] =
     {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-static const u8 hexmapUpper[16] =
-    {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
 ENCODE_JSON(String) {
     if(!src->data)
@@ -578,10 +576,10 @@ ENCODE_JSON(String) {
                 seq[1] = 'u';
                 UA_Byte b1 = (UA_Byte)(codepoint >> 8u);
                 UA_Byte b2 = (UA_Byte)(codepoint >> 0u);
-                seq[2] = hexmapLower[(b1 & 0xF0u) >> 4u];
-                seq[3] = hexmapLower[b1 & 0x0Fu];
-                seq[4] = hexmapLower[(b2 & 0xF0u) >> 4u];
-                seq[5] = hexmapLower[b2 & 0x0Fu];
+                seq[2] = hexmap[(b1 & 0xF0u) >> 4u];
+                seq[3] = hexmap[b1 & 0x0Fu];
+                seq[4] = hexmap[(b2 & 0xF0u) >> 4u];
+                seq[5] = hexmap[b2 & 0x0Fu];
                 length = 6;
             } else {
                 /* not in BMP -> construct a UTF-16 surrogate pair */
@@ -597,17 +595,17 @@ ENCODE_JSON(String) {
 
                 seq[0] = '\\';
                 seq[1] = 'u';
-                seq[2] = hexmapLower[(fb1 & 0xF0u) >> 4u];
-                seq[3] = hexmapLower[fb1 & 0x0Fu];
-                seq[4] = hexmapLower[(fb2 & 0xF0u) >> 4u];
-                seq[5] = hexmapLower[fb2 & 0x0Fu];
+                seq[2] = hexmap[(fb1 & 0xF0u) >> 4u];
+                seq[3] = hexmap[fb1 & 0x0Fu];
+                seq[4] = hexmap[(fb2 & 0xF0u) >> 4u];
+                seq[5] = hexmap[fb2 & 0x0Fu];
 
                 seq[6] = '\\';
                 seq[7] = 'u';
-                seq[8] = hexmapLower[(lb1 & 0xF0u) >> 4u];
-                seq[9] = hexmapLower[lb1 & 0x0Fu];
-                seq[10] = hexmapLower[(lb2 & 0xF0u) >> 4u];
-                seq[11] = hexmapLower[lb2 & 0x0Fu];
+                seq[8] = hexmap[(lb1 & 0xF0u) >> 4u];
+                seq[9] = hexmap[lb1 & 0x0Fu];
+                seq[10] = hexmap[(lb2 & 0xF0u) >> 4u];
+                seq[11] = hexmap[lb2 & 0x0Fu];
                 length = 12;
             }
             text = (char*)seq;
@@ -661,30 +659,6 @@ ENCODE_JSON(ByteString) {
     return ret;
 }
 
-void
-UA_Guid_to_hex(const UA_Guid *guid, u8* out, UA_Boolean lower) {
-    const u8 *hexmap = (lower) ? hexmapLower : hexmapUpper;
-    size_t i = 0, j = 28;
-    for(; i<8;i++,j-=4)         /* pos 0-7, 4byte, (a) */
-        out[i] = hexmap[(guid->data1 >> j) & 0x0Fu];
-    out[i++] = '-';             /* pos 8 */
-    for(j=12; i<13;i++,j-=4)    /* pos 9-12, 2byte, (b) */
-        out[i] = hexmap[(uint16_t)(guid->data2 >> j) & 0x0Fu];
-    out[i++] = '-';             /* pos 13 */
-    for(j=12; i<18;i++,j-=4)    /* pos 14-17, 2byte (c) */
-        out[i] = hexmap[(uint16_t)(guid->data3 >> j) & 0x0Fu];
-    out[i++] = '-';              /* pos 18 */
-    for(j=0;i<23;i+=2,j++) {     /* pos 19-22, 2byte (d) */
-        out[i] = hexmap[(guid->data4[j] & 0xF0u) >> 4u];
-        out[i+1] = hexmap[guid->data4[j] & 0x0Fu];
-    }
-    out[i++] = '-';              /* pos 23 */
-    for(j=2; i<36;i+=2,j++) {    /* pos 24-35, 6byte (e) */
-        out[i] = hexmap[(guid->data4[j] & 0xF0u) >> 4u];
-        out[i+1] = hexmap[guid->data4[j] & 0x0Fu];
-    }
-}
-
 /* Guid */
 ENCODE_JSON(Guid) {
     if(ctx->pos + 38 > ctx->end) /* 36 + 2 (") */
diff --git a/tests/check_types_parse.c b/tests/check_types_parse.c
index cfeaa1087a6..49c2aaeee67 100644
--- a/tests/check_types_parse.c
+++ b/tests/check_types_parse.c
@@ -56,6 +56,16 @@ START_TEST(parseGuid) {
     ck_assert_int_eq(guid.data4[5], 0x7d);
     ck_assert_int_eq(guid.data4[6], 0xaf);
     ck_assert_int_eq(guid.data4[7], 0x63);
+
+#ifdef UA_ENABLE_PARSING
+    /* Encoding decoding roundtrip */
+    UA_String encoded = UA_STRING_NULL;
+    UA_Guid_print(&guid, &encoded);
+    UA_Guid guid2;
+    UA_Guid_parse(&guid2, encoded);
+    ck_assert(UA_Guid_equal(&guid, &guid2));
+    UA_String_clear(&encoded);
+#endif
 } END_TEST
 
 START_TEST(parseNodeIdNumeric) {

From ef567a89c70276ecdcab4fa24ba3bcab669b693d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 16 Aug 2022 09:11:42 +0200
Subject: [PATCH 0424/1963] refactor(core): Simplify JSON encoding with
 reusable writeChars method

---
 src/ua_types_encoding_json.c     | 67 ++++++++------------------------
 src/ua_types_encoding_json.h     |  1 -
 tests/check_types_builtin_json.c |  2 -
 3 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index e450d0d4b86..b4622f475f6 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -87,6 +87,16 @@ writeChar(CtxJson *ctx, char c) {
     return UA_STATUSCODE_GOOD;
 }
 
+static status UA_FUNC_ATTR_WARN_UNUSED_RESULT
+writeChars(CtxJson *ctx, const char *c, size_t len) {
+    if(ctx->pos + len > ctx->end)
+        return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
+    if(!ctx->calcOnly)
+        memcpy(ctx->pos, c, len);
+    ctx->pos += len;
+    return UA_STATUSCODE_GOOD;
+}
+
 #define WRITE_JSON_ELEMENT(ELEM)                            \
     UA_FUNC_ATTR_WARN_UNUSED_RESULT status                  \
     writeJson##ELEM(CtxJson *ctx)
@@ -185,21 +195,6 @@ writeJsonObjElm(CtxJson *ctx, const char *key,
     return writeJsonKey(ctx, key) | encodeJsonJumpTable[type->typeKind](ctx, value, type);
 }
 
-status
-writeJsonNull(CtxJson *ctx) {
-    if(ctx->pos + 4 > ctx->end)
-        return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
-    if(ctx->calcOnly) {
-        ctx->pos += 4;
-    } else {
-        *(ctx->pos++) = 'n';
-        *(ctx->pos++) = 'u';
-        *(ctx->pos++) = 'l';
-        *(ctx->pos++) = 'l';
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
 /* Keys for JSON */
 
 /* LocalizedText */
@@ -276,34 +271,9 @@ isNull(const void *p, const UA_DataType *type) {
 
 /* Boolean */
 ENCODE_JSON(Boolean) {
-    size_t sizeOfJSONBool;
-    if(*src == true) {
-        sizeOfJSONBool = 4; /* true */
-    } else {
-        sizeOfJSONBool = 5; /* false */
-    }
-
-    if(ctx->calcOnly) {
-        ctx->pos += sizeOfJSONBool;
-        return UA_STATUSCODE_GOOD;
-    }
-
-    if(ctx->pos + sizeOfJSONBool > ctx->end)
-        return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
-
-    if(*src) {
-        *(ctx->pos++) = 't';
-        *(ctx->pos++) = 'r';
-        *(ctx->pos++) = 'u';
-        *(ctx->pos++) = 'e';
-    } else {
-        *(ctx->pos++) = 'f';
-        *(ctx->pos++) = 'a';
-        *(ctx->pos++) = 'l';
-        *(ctx->pos++) = 's';
-        *(ctx->pos++) = 'e';
-    }
-    return UA_STATUSCODE_GOOD;
+    if(*src == true)
+        return writeChars(ctx, "true", 4);
+    return writeChars(ctx, "false", 5);
 }
 
 /* Byte */
@@ -403,7 +373,6 @@ ENCODE_JSON(UInt64) {
 
     if(!ctx->calcOnly)
         memcpy(ctx->pos, buf, length);
-
     ctx->pos += length;
     return UA_STATUSCODE_GOOD;
 }
@@ -446,7 +415,6 @@ ENCODE_JSON(Float) {
 
     if(!ctx->calcOnly)
         memcpy(ctx->pos, buffer, len);
-
     ctx->pos += len;
     return UA_STATUSCODE_GOOD;
 }
@@ -472,7 +440,6 @@ ENCODE_JSON(Double) {
 
     if(!ctx->calcOnly)
         memcpy(ctx->pos, buffer, len);
-
     ctx->pos += len;
     return UA_STATUSCODE_GOOD;
 }
@@ -492,7 +459,7 @@ encodeJsonArray(CtxJson *ctx, const void *ptr, size_t length,
     for(size_t i = 0; i < length && ret == UA_STATUSCODE_GOOD; ++i) {
         ret |= writeJsonBeforeElement(ctx, distinct);
         if(isNull((const void*)uptr, type))
-            ret |= writeJsonNull(ctx); /* null values are written as "null" */
+            ret |= writeChars(ctx, "null", 4);
         else
             ret |= encodeType(ctx, (const void*)uptr, type);
         ctx->commaNeeded[ctx->depth] = true;
@@ -507,7 +474,7 @@ static const u8 hexmap[16] =
 
 ENCODE_JSON(String) {
     if(!src->data)
-        return writeJsonNull(ctx);
+        return writeChars(ctx, "null", 4);
 
     if(src->length == 0)
         return writeJsonQuote(ctx) | writeJsonQuote(ctx);
@@ -626,7 +593,7 @@ ENCODE_JSON(String) {
 
 ENCODE_JSON(ByteString) {
     if(!src->data)
-        return writeJsonNull(ctx);
+        return writeChars(ctx, "null", 4);
 
     if(src->length == 0) {
         status retval = writeJsonQuote(ctx);
@@ -963,7 +930,7 @@ ENCODE_JSON(StatusCode) {
 /* ExtensionObject */
 ENCODE_JSON(ExtensionObject) {
     if(src->encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY)
-        return writeJsonNull(ctx);
+        return writeChars(ctx, "null", 4);
 
     /* Must have a type set if data is decoded */
     if(src->encoding != UA_EXTENSIONOBJECT_ENCODED_BYTESTRING &&
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 4ddf5f5bef5..2d34913f128 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -51,7 +51,6 @@ UA_StatusCode writeJsonArrElm(CtxJson *ctx, const void *value,
 UA_StatusCode writeJsonArrEnd(CtxJson *ctx);
 
 UA_StatusCode writeJsonKey(CtxJson *ctx, const char* key);
-UA_StatusCode writeJsonNull(CtxJson *ctx);
 
 /* Adds a comma if needed. Distinct elements go on a new line if pretty-printing
  * is enabled. */
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index 6dcb2873631..a189bbe1701 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -5368,7 +5368,6 @@ START_TEST(UA_JsonHelper) {
     ck_assert_int_eq(writeJsonObjStart(&ctx), UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     ck_assert_int_eq(writeJsonObjEnd(&ctx), UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
     ck_assert_int_eq(writeJsonArrEnd(&ctx), UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
-    ck_assert_int_eq(writeJsonNull(&ctx), UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
 
     ctx.calcOnly = true;
     ctx.end = (const UA_Byte*)(uintptr_t)SIZE_MAX;
@@ -5376,7 +5375,6 @@ START_TEST(UA_JsonHelper) {
     ck_assert_int_eq(writeJsonObjStart(&ctx), UA_STATUSCODE_GOOD);
     ck_assert_int_eq(writeJsonObjEnd(&ctx), UA_STATUSCODE_GOOD);
     ck_assert_int_eq(writeJsonArrEnd(&ctx), UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(writeJsonNull(&ctx), UA_STATUSCODE_GOOD);
 }
 END_TEST
 

From 5bde1c0f96726c71eb7bfd9dc28b6be897e98031 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 16 Aug 2022 09:16:28 +0200
Subject: [PATCH 0425/1963] refactor(core): Simplify UA_calcSizeJson

---
 src/ua_types_encoding_json.c | 39 +++++++++++++++---------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index b4622f475f6..3de6c360a1a 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1331,25 +1331,30 @@ UA_print(const void *p, const UA_DataType *type, UA_String *output) {
 /* CalcSize */
 /************/
 
-static size_t
-UA_calcSizeJsonInternal(const void *src, const UA_DataType *type,
-                const UA_String *namespaces, size_t namespaceSize,
-                const UA_String *serverUris, size_t serverUriSize,
-                UA_Boolean useReversible) {
+size_t
+UA_calcSizeJson(const void *src, const UA_DataType *type,
+                const UA_EncodeJsonOptions *options) {
     if(!src || !type)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     /* Set up the context */
     CtxJson ctx;
     memset(&ctx, 0, sizeof(ctx));
-    ctx.pos = 0;
+    ctx.pos = NULL;
     ctx.end = (const UA_Byte*)(uintptr_t)SIZE_MAX;
     ctx.depth = 0;
-    ctx.namespaces = namespaces;
-    ctx.namespacesSize = namespaceSize;
-    ctx.serverUris = serverUris;
-    ctx.serverUrisSize = serverUriSize;
-    ctx.useReversible = useReversible;
+    ctx.useReversible = true; /* default */
+    if(options) {
+        ctx.namespaces = options->namespaces;
+        ctx.namespacesSize = options->namespacesSize;
+        ctx.serverUris = options->serverUris;
+        ctx.serverUrisSize = options->serverUrisSize;
+        ctx.useReversible = options->useReversible;
+        ctx.prettyPrint = options->prettyPrint;
+        ctx.unquotedKeys = options->unquotedKeys;
+        ctx.stringNodeIds = options->stringNodeIds;
+    }
+
     ctx.calcOnly = true;
 
     /* Encode */
@@ -1359,18 +1364,6 @@ UA_calcSizeJsonInternal(const void *src, const UA_DataType *type,
     return (size_t)ctx.pos;
 }
 
-size_t
-UA_calcSizeJson(const void *src, const UA_DataType *type,
-                const UA_EncodeJsonOptions *options) {
-    if(options) {
-        return UA_calcSizeJsonInternal(src, type, options->namespaces,
-                                       options->namespacesSize, options->serverUris,
-                                       options->serverUrisSize, options->useReversible);
-    }
-    return UA_calcSizeJsonInternal(src, type, &UA_STRING_NULL, 0u, &UA_STRING_NULL, 0u,
-                                   true);
-}
-
 /**********/
 /* Decode */
 /**********/

From f4779fa6b62ca837d0e5a9b952aa28bcef548078 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 16 Aug 2022 16:48:08 +0200
Subject: [PATCH 0426/1963] feat(core): Enable JSON encoding by default

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30687d8482d..6b1ee5d7d84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,7 @@ option(UA_ENABLE_SUBSCRIPTIONS_EVENTS "Enable event monitoring" ON)
 option(UA_ENABLE_DA "Enable OPC UA DataAccess (Part 8) definitions" ON)
 option(UA_ENABLE_HISTORIZING "Enable basic support for historical access (client and server)" OFF)
 option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" OFF)
-option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" OFF)
+option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" ON)
 
 set(MULTITHREADING_DEFAULT 0)
 if(WIN32 OR UNIX)

From 30740179a6f367ab409390dbc2bc6b0d39a88543 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 17 Aug 2022 20:22:27 +0200
Subject: [PATCH 0427/1963] fix(core): Fix a memleak in JSON string parsing

---
 src/ua_types_encoding_json.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 3de6c360a1a..68ea8caef77 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1705,8 +1705,10 @@ DECODE_JSON(String) {
     r.num_tokens = ctx->tokensSize;
     r.json5 = ctx->json5;
     cj5_error_code err = cj5_get_str(&r, ctx->index, outBuf, &len);
-    if(err != CJ5_ERROR_NONE)
+    if(err != CJ5_ERROR_NONE) {
+        UA_free(outBuf);
         return UA_STATUSCODE_BADDECODINGERROR;
+    }
 
     /* Set the output */
     dst->length = len;

From fcda4b9aa8debcd47e7945362fff990aac41c621 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 19 Aug 2022 21:46:35 +0200
Subject: [PATCH 0428/1963] fix(core): Correctly select the esacped string
 characters for JSON

---
 src/ua_types_encoding_json.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 68ea8caef77..ea03a2ae6e8 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -505,8 +505,10 @@ ENCODE_JSON(String) {
                 continue;
             }
 
-            /* Mandatory escape or control char */
-            if(codepoint == '\\' || codepoint == '"' || codepoint < 0x20)
+            /* Escape unprintable ASCII, escaped characters and outside the
+             * ASCII range */
+            if(codepoint < ' '   || codepoint > '~'  ||
+               codepoint == '\\' || codepoint == '/' || codepoint == '\"')
                 break;
 
             pos = end;

From a6565707b28eecd0542637269f600bd05ec162ac Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 19 Aug 2022 21:47:12 +0200
Subject: [PATCH 0429/1963] refactor(core): Small cleanup in JSON string
 encoding

---
 src/ua_types_encoding_json.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index ea03a2ae6e8..cb50af460f5 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -489,10 +489,6 @@ ENCODE_JSON(String) {
     const char *lim = str + src->length;
     UA_UInt32 codepoint = 0;
     while(1) {
-        const char *text;
-        u8 seq[13];
-        size_t length;
-
         /* Iterate over codepoints in the utf8 encoding. Until the first
          * character that needs to be escaped. */
         while(end < lim) {
@@ -505,10 +501,12 @@ ENCODE_JSON(String) {
                 continue;
             }
 
-            /* Escape unprintable ASCII, escaped characters and outside the
-             * ASCII range */
-            if(codepoint < ' '   || codepoint > '~'  ||
-               codepoint == '\\' || codepoint == '/' || codepoint == '\"')
+            /* Escape unprintable ASCII and escape characters */
+            if(codepoint < ' '   || codepoint == 127  ||
+               codepoint == '\\' || codepoint == '\"' ||
+               codepoint == '\b' || codepoint == '\f' ||
+               codepoint == '\n' || codepoint == '\r' ||
+               codepoint == '\t')
                 break;
 
             pos = end;
@@ -528,7 +526,10 @@ ENCODE_JSON(String) {
             break;
 
         /* Handle an escaped character */
-        length = 2;
+        size_t length = 2;
+        u8 seq[13];
+        const char *text;
+
         switch(codepoint) {
         case '\\': text = "\\\\"; break;
         case '\"': text = "\\\""; break;
@@ -537,8 +538,8 @@ ENCODE_JSON(String) {
         case '\n': text = "\\n"; break;
         case '\r': text = "\\r"; break;
         case '\t': text = "\\t"; break;
-        case '/':  text = "\\/"; break;
         default:
+            text = (char*)seq;
             if(codepoint < 0x10000) {
                 /* codepoint is in BMP */
                 seq[0] = '\\';
@@ -555,20 +556,16 @@ ENCODE_JSON(String) {
                 codepoint -= 0x10000;
                 UA_UInt32 first = 0xD800u | ((codepoint & 0xffc00u) >> 10u);
                 UA_UInt32 last = 0xDC00u | (codepoint & 0x003ffu);
-
                 UA_Byte fb1 = (UA_Byte)(first >> 8u);
                 UA_Byte fb2 = (UA_Byte)(first >> 0u);
-
                 UA_Byte lb1 = (UA_Byte)(last >> 8u);
                 UA_Byte lb2 = (UA_Byte)(last >> 0u);
-
                 seq[0] = '\\';
                 seq[1] = 'u';
                 seq[2] = hexmap[(fb1 & 0xF0u) >> 4u];
                 seq[3] = hexmap[fb1 & 0x0Fu];
                 seq[4] = hexmap[(fb2 & 0xF0u) >> 4u];
                 seq[5] = hexmap[fb2 & 0x0Fu];
-
                 seq[6] = '\\';
                 seq[7] = 'u';
                 seq[8] = hexmap[(lb1 & 0xF0u) >> 4u];
@@ -577,10 +574,8 @@ ENCODE_JSON(String) {
                 seq[11] = hexmap[lb2 & 0x0Fu];
                 length = 12;
             }
-            text = (char*)seq;
             break;
         }
-
         if(ctx->pos + length > ctx->end)
             return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
         if(!ctx->calcOnly)

From f34061422d9c3671842ebc00107f7b5936915a92 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 19 Aug 2022 21:57:12 +0200
Subject: [PATCH 0430/1963] refactor(deps): Improve string character escaping
 logic in cj5.c

---
 deps/cj5.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 621036db599..6f751779907 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -739,8 +739,11 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
             continue;
         }
 
-        // Unprintable ascii character
-        if(c < 32 || c == 127)
+        // Unprintable ascii characters must be escaped. JSON5 allows nested
+        // quotes if the quote character is not the same as the surrounding
+        // quote character, e.g. 'this is my "quote"'. This logic is in the
+        // token parsing code and not in this "string extraction" method.
+        if(c < ' '   || c == 127)
             return CJ5_ERROR_INVALID;
 
         // Ascii character or utf8 byte

From 24a184f92400a41a8537c63f3c9e56e683fff5d3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 19 Aug 2022 22:01:00 +0200
Subject: [PATCH 0431/1963] refactor(deps): Simplify char range comparison in
 cj5.c

---
 deps/cj5.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 6f751779907..f2f9962a583 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -79,20 +79,9 @@ cj5__isrange(char ch, char from, char to) {
     return (uint8_t)(ch - from) <= (uint8_t)(to - from);
 }
 
-static CJ5_INLINE bool
-cj5__isupperchar(char ch) {
-    return cj5__isrange(ch, 'A', 'Z');
-}
-
-static CJ5_INLINE bool
-cj5__islowerchar(char ch) {
-    return cj5__isrange(ch, 'a', 'z');
-}
-
-static CJ5_INLINE bool
-cj5__isnum(char ch) {
-    return cj5__isrange(ch, '0', '9');
-}
+#define cj5__isupperchar(ch) cj5__isrange(ch, 'A', 'Z')
+#define cj5__islowerchar(ch) cj5__isrange(ch, 'a', 'z')
+#define cj5__isnum(ch)       cj5__isrange(ch, '0', '9')
 
 static cj5_token *
 cj5__alloc_token(cj5__parser *parser) {

From 73307876f78306370b812475352eae1b1eda77c7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 20 Aug 2022 19:35:28 +0200
Subject: [PATCH 0432/1963] fix(core): Remove duplicate cases in JSON string
 encoding

---
 src/ua_types_encoding_json.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index cb50af460f5..0c4747b17ac 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -503,10 +503,7 @@ ENCODE_JSON(String) {
 
             /* Escape unprintable ASCII and escape characters */
             if(codepoint < ' '   || codepoint == 127  ||
-               codepoint == '\\' || codepoint == '\"' ||
-               codepoint == '\b' || codepoint == '\f' ||
-               codepoint == '\n' || codepoint == '\r' ||
-               codepoint == '\t')
+               codepoint == '\\' || codepoint == '\"')
                 break;
 
             pos = end;

From 50fed11d4364817afcc68e971734fad73b67fada Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 20 Aug 2022 20:34:34 +0200
Subject: [PATCH 0433/1963] refactor(core): Inline the utf8 codepoint
 extraction

---
 src/ua_types_encoding_json.c | 59 +++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 0c4747b17ac..3a4333a42c7 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -469,9 +469,54 @@ encodeJsonArray(CtxJson *ctx, const void *ptr, size_t length,
     return ret;
 }
 
+static const uint32_t min_codepoints[5] = {0x00, 0x00, 0x80, 0x800, 0x10000};
 static const u8 hexmap[16] =
     {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 
+/* Extract the next utf8 codepoint from the buffer. Return the next position in
+ * the buffer or NULL upon an error. */
+static const unsigned char *
+extract_codepoint(const unsigned char *pos, size_t len, uint32_t *codepoint) {
+    UA_assert(len > 0);
+
+    *codepoint = pos[0];
+    if(UA_LIKELY(*codepoint < 0x80))
+        return pos + 1; /* Normal ASCII */
+
+    if(UA_UNLIKELY(*codepoint <= 0xC1))
+        return NULL; /* Continuation byte not allowed here */
+
+    unsigned char count;
+    if(*codepoint <= 0xDF) {
+        count = 2; /* 2-byte sequence */
+        *codepoint &= 0x1F;
+    } else if(*codepoint <= 0xEF) {
+        count = 3; /* 3-byte sequence */
+        *codepoint &= 0xF;
+    } else if(*codepoint <= 0xF4) {
+        count = 4; /* 4-byte sequence */
+        *codepoint &= 0x7;
+    } else {
+        return NULL; /* invalid utf8 */
+    }
+
+    if(UA_UNLIKELY(count > len))
+        return NULL; /* Not enough bytes left */
+
+    for(unsigned char i = 1; i < count; i++) {
+        unsigned char byte = pos[i];
+        if(UA_UNLIKELY(byte < 0x80 || byte > 0xBF))
+            return NULL; /* Not a continuation byte */
+        *codepoint = (*codepoint << 6) + (byte & 0x3F);
+    }
+
+    /* Not in Unicode range or too small for the encoding length */
+    if(UA_UNLIKELY(*codepoint > 0x10FFFF || *codepoint < min_codepoints[count]))
+        return NULL;
+
+    return pos + count; /* Return the new position in the pos */
+}
+
 ENCODE_JSON(String) {
     if(!src->data)
         return writeChars(ctx, "null", 4);
@@ -481,18 +526,16 @@ ENCODE_JSON(String) {
 
     UA_StatusCode ret = writeJsonQuote(ctx);
 
-    /* Escaping adapted from https://github.com/akheron/jansson dump.c */
-
-    const char *str = (char*)src->data;
-    const char *pos = str;
-    const char *end = str;
-    const char *lim = str + src->length;
-    UA_UInt32 codepoint = 0;
+    const unsigned char *str = src->data;
+    const unsigned char *pos = str;
+    const unsigned char *end = str;
+    const unsigned char *lim = str + src->length;
+    uint32_t codepoint = 0;
     while(1) {
         /* Iterate over codepoints in the utf8 encoding. Until the first
          * character that needs to be escaped. */
         while(end < lim) {
-            end = utf8_iterate(pos, (size_t)(lim - pos), (int32_t *)&codepoint);
+            end = extract_codepoint(pos, (size_t)(lim - pos), &codepoint);
             if(!end)  {
                 /* A malformed utf8 character. Print anyway and let the
                  * receiving side choose how to handle it. */

From bbc83f4387db695886db0fd57a07423d4c94ecf9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 20 Aug 2022 20:35:23 +0200
Subject: [PATCH 0434/1963] refactor(core): Remove unused dependency
 /deps/string_escape.c

---
 CMakeLists.txt               |   2 -
 deps/string_escape.c         | 206 -----------------------------------
 deps/string_escape.h         |  37 -------
 src/ua_types_encoding_json.c |   1 -
 4 files changed, 246 deletions(-)
 delete mode 100644 deps/string_escape.c
 delete mode 100644 deps/string_escape.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b1ee5d7d84..8e4da7bccb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1157,11 +1157,9 @@ if(UA_ENABLE_JSON_ENCODING)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage_json.c)
     endif()
     list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/cj5.h
-                                 ${PROJECT_SOURCE_DIR}/deps/string_escape.h
                                  ${PROJECT_SOURCE_DIR}/deps/parse_num.h
                                  ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.h)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/cj5.c
-                            ${PROJECT_SOURCE_DIR}/deps/string_escape.c
                             ${PROJECT_SOURCE_DIR}/deps/parse_num.c
                             ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.c)
 endif()
diff --git a/deps/string_escape.c b/deps/string_escape.c
deleted file mode 100644
index 51d320c8778..00000000000
--- a/deps/string_escape.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
- */
-
-/*escaping from https://github.com/akheron/jansson dump.c */
-
-#include "string_escape.h"
-
-
-
-size_t utf8_check_first(char byte)
-{
-    unsigned char u = (unsigned char)byte;
-
-    if(u < 0x80)
-        return 1;
-
-    if(0x80 <= u && u <= 0xBF) {
-        /* second, third or fourth byte of a multi-byte
-           sequence, i.e. a "continuation byte" */
-        return 0;
-    }
-    else if(u == 0xC0 || u == 0xC1) {
-        /* overlong encoding of an ASCII byte */
-        return 0;
-    }
-    else if(0xC2 <= u && u <= 0xDF) {
-        /* 2-byte sequence */
-        return 2;
-    }
-
-    else if(0xE0 <= u && u <= 0xEF) {
-        /* 3-byte sequence */
-        return 3;
-    }
-    else if(0xF0 <= u && u <= 0xF4) {
-        /* 4-byte sequence */
-        return 4;
-    }
-    else { /* u >= 0xF5 */
-        /* Restricted (start of 4-, 5- or 6-byte sequence) or invalid
-           UTF-8 */
-        return 0;
-    }
-}
-
-size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint)
-{
-    size_t i;
-    int32_t value = 0;
-    unsigned char u = (unsigned char)buffer[0];
-
-    if(size == 2)
-    {
-        value = u & 0x1F;
-    }
-    else if(size == 3)
-    {
-        value = u & 0xF;
-    }
-    else if(size == 4)
-    {
-        value = u & 0x7;
-    }
-    else
-        return 0;
-
-    for(i = 1; i < size; i++)
-    {
-        u = (unsigned char)buffer[i];
-
-        if(u < 0x80 || u > 0xBF) {
-            /* not a continuation byte */
-            return 0;
-        }
-
-        value = (value << 6) + (u & 0x3F);
-    }
-
-    if(value > 0x10FFFF) {
-        /* not in Unicode range */
-        return 0;
-    }
-
-    else if(0xD800 <= value && value <= 0xDFFF) {
-        /* invalid code point (UTF-16 surrogate halves) */
-        return 0;
-    }
-
-    else if((size == 2 && value < 0x80) ||
-            (size == 3 && value < 0x800) ||
-            (size == 4 && value < 0x10000)) {
-        /* overlong encoding */
-        return 0;
-    }
-
-    if(codepoint)
-        *codepoint = value;
-
-    return 1;
-}
-
-const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint)
-{
-    size_t count;
-    int32_t value;
-
-    if(!bufsize)
-        return buffer;
-
-    count = utf8_check_first(buffer[0]);
-    if(count <= 0)
-        return NULL;
-
-    if(count == 1)
-        value = (unsigned char)buffer[0];
-    else
-    {
-        if(count > bufsize || !utf8_check_full(buffer, count, &value))
-            return NULL;
-    }
-
-    if(codepoint)
-        *codepoint = value;
-
-    return buffer + count;
-}
-
-/* String unescape functions */
-int utf8_encode(int32_t codepoint, char *buffer, size_t *size)
-{
-    if(codepoint < 0)
-        return -1;
-    else if(codepoint < 0x80)
-    {
-        buffer[0] = (char)codepoint;
-        *size = 1;
-    }
-    else if(codepoint < 0x800)
-    {
-        buffer[0] = (char)(0xC0 + ((codepoint & 0x7C0) >> 6));
-        buffer[1] = (char)(0x80 + ((codepoint & 0x03F)));
-        *size = 2;
-    }
-    else if(codepoint < 0x10000)
-    {
-        buffer[0] = (char)(0xE0 + ((codepoint & 0xF000) >> 12));
-        buffer[1] = (char)(0x80 + ((codepoint & 0x0FC0) >> 6));
-        buffer[2] = (char)(0x80 + ((codepoint & 0x003F)));
-        *size = 3;
-    }
-    else if(codepoint <= 0x10FFFF)
-    {
-        buffer[0] = (char)(0xF0 + ((codepoint & 0x1C0000) >> 18));
-        buffer[1] = (char)(0x80 + ((codepoint & 0x03F000) >> 12));
-        buffer[2] = (char)(0x80 + ((codepoint & 0x000FC0) >> 6));
-        buffer[3] = (char)(0x80 + ((codepoint & 0x00003F)));
-        *size = 4;
-    }
-    else
-        return -1;
-
-    return 0;
-}
-
-/* assumes that str points to 'u' plus at least 4 valid hex digits */
-int32_t decode_unicode_escape(const char *str) {
-    int i;
-    int32_t value = 0;
-
-    for(i = 1; i <= 4; i++) {
-        char c = str[i];
-        value <<= 4;
-        if(l_isdigit(c))
-            value += c - '0';
-        else if(l_islower(c))
-            value += c - 'a' + 10;
-        else if(l_isupper(c))
-            value += c - 'A' + 10;
-        else
-            return -1;
-    }
-
-    return value;
-}
diff --git a/deps/string_escape.h b/deps/string_escape.h
deleted file mode 100644
index 23d427d4fae..00000000000
--- a/deps/string_escape.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license.
- */
-
-#ifndef STRING_ESCAPE_H
-#define STRING_ESCAPE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <open62541/config.h>
-#include <string.h>
-    
-/* Locale independent versions of isxxx() functions */
-#define l_isupper(c)  ('A' <= (c) && (c) <= 'Z')
-#define l_islower(c)  ('a' <= (c) && (c) <= 'z')
-#define l_isalpha(c)  (l_isupper(c) || l_islower(c))
-#define l_isdigit(c)  ('0' <= (c) && (c) <= '9')
-#define l_isxdigit(c) (l_isdigit(c) || ('A' <= (c) && (c) <= 'F') || ('a' <= (c) && (c) <= 'f'))
-
-int utf8_encode(int32_t codepoint, char *buffer, size_t *size);
-size_t utf8_check_first(char byte);
-size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint);
-const char *utf8_iterate(const char *buffer, size_t size, int32_t *codepoint);
-int utf8_check_string(const char *string, size_t length);
-int32_t decode_unicode_escape(const char *str);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STRING_ESCAPE_H */
-
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 3a4333a42c7..4f86addcb15 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -19,7 +19,6 @@
 
 #include "../deps/itoa.h"
 #include "../deps/parse_num.h"
-#include "../deps/string_escape.h"
 #include "../deps/base64.h"
 #include "../deps/libc_time.h"
 

From 4d08612120eadea386af1e45a78a6d458b7f2331 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 20 Aug 2022 20:50:53 +0200
Subject: [PATCH 0435/1963] refactor(core): Update /deps/README.md

---
 deps/README.md | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/deps/README.md b/deps/README.md
index f267e6f2783..6e1aa463c24 100644
--- a/deps/README.md
+++ b/deps/README.md
@@ -4,21 +4,19 @@ Specific optional features are dependent on third-party libraries.
 Any third-party library which may be used is inside this `/deps` folder.
 
 Up to now all these libraries have a less strict License compared to MPL 2.0.
-Anyways you should make sure that the corresponding third-party license matches your needs.
+Still you should make sure that the corresponding third-party license matches your needs.
 
 Here's a list of third party libraries:
 
-| Library         | License          | Description                                   |
-|-----------------|------------------|-----------------------------------------------|
-| jsmn            | MIT              | json parser                                   |
-| mdnsd           | BSD-3-Clause     | mDNS library                                  |
-| ua-nodeset      | MIT              | Official OPC UA Nodeset files by the OPCF     |
-| atoi            | MIT              | Char to int conversion, from musl             |
-| base64          | BSD              | Base64 encoding and decoding                  |
-| itoa            | MIT              | Int to char conversion                        |
-| ms_stdint       | BSD-3-Clause     | Replacement for stdint on older Visual Studio |
-| open62541_queue | BSD-3-Clause     | FIFO and LIFO queue implementation            |
-| pcg_basic       | Apache License 2 | Random Number Generation                      |
-| string_escape   | MIT              | utf8 encoding and decoding                    |
-| ziptree         | MPL 2.0          | Reusable zip tree implementation              |
-| mqtt-c          | MIT              | a portable MQTT client, written in C          |
+| Library         | License          | Description                                     |
+|-----------------|------------------|-------------------------------------------------|
+| mdnsd           | BSD-3-Clause     | mDNS library                                    |
+| ua-nodeset      | MIT              | Official OPC UA Nodeset files by the OPCF       |
+| parse_num       | MIT              | Char to int conversion, from musl               |
+| base64          | BSD              | Base64 encoding and decoding                    |
+| itoa            | MIT              | Int to char conversion                          |
+| ms_stdint       | BSD-3-Clause     | Replacement for stdint.h on older Visual Studio |
+| open62541_queue | BSD-3-Clause     | FIFO and LIFO queue implementation              |
+| pcg_basic       | Apache License 2 | Random Number Generation                        |
+| ziptree         | MPL 2.0          | Reusable zip tree implementation                |
+| mqtt-c          | MIT              | a portable MQTT client in C                     |

From 5a782208f9d9574a4790daf5855631809fd6dac9 Mon Sep 17 00:00:00 2001
From: akoww <42697142+akoww@users.noreply.github.com>
Date: Tue, 30 Aug 2022 14:04:11 +0200
Subject: [PATCH 0436/1963] refactor(build): Update open62541Config.cmake.in
 (#5312)

forced cmake to use python3 for the node compiler
---
 tools/cmake/open62541Config.cmake.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index 8dfcebd4b80..664ada54fea 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -6,7 +6,7 @@ set (open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path
 set (UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
 
 include(CMakeFindDependencyMacro)
-find_dependency(PythonInterp REQUIRED)
+find_dependency(PythonInterp 3 REQUIRED)
 
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Macros.cmake")
 

From e03be588a2a55fcfa0c1f2a00ef0b305c3d0de96 Mon Sep 17 00:00:00 2001
From: Rowesca1 <53050626+Rowesca1@users.noreply.github.com>
Date: Tue, 30 Aug 2022 14:04:41 +0200
Subject: [PATCH 0437/1963] fix(server): zero timestamp in response header for
 renew secure channel requests (#5309)

---
 src/server/ua_services_securechannel.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index 713d4a8b8fc..bef6fbdfcfc 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -335,6 +335,7 @@ UA_SecureChannelManager_renew(UA_Server *server, UA_SecureChannel *channel,
     /* Set the response */
     response->securityToken = channel->altSecurityToken;
     response->securityToken.createdAt = UA_DateTime_now(); /* Only for sending */
+    response->responseHeader.timestamp = response->securityToken.createdAt;
     response->responseHeader.requestHandle = request->requestHeader.requestHandle;
     retval = UA_ByteString_copy(&channel->localNonce, &response->serverNonce);
     if(retval != UA_STATUSCODE_GOOD)

From e20d57c678bead5d070ebfa6fb822f652e3f4301 Mon Sep 17 00:00:00 2001
From: Tobias Zimmermann <Tobias.Zimmermann@tq-group.com>
Date: Mon, 5 Sep 2022 10:33:58 +0200
Subject: [PATCH 0438/1963] fix(examples): parsing argument frequency in
 tutorial_pubsub_mqtt_publish

argpos needs to be incremented before reading the value of the interval.

Signed-off-by: Tobias Zimmermann <Tobias.Zimmermann@tq-group.com>
---
 examples/pubsub/tutorial_pubsub_mqtt_publish.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 2aa94a6eefb..c629ce5b115 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -437,6 +437,7 @@ int main(int argc, char **argv) {
                 usage();
                 return -1;
             }
+            argpos++;
             if(sscanf(argv[argpos], "%d", &interval) != 1) {
                 usage();
                 return -1;

From c0c9e424985a835bef582d3afd89f3c06a9debd7 Mon Sep 17 00:00:00 2001
From: Tobias Zimmermann <Tobias.Zimmermann@tq-group.com>
Date: Mon, 5 Sep 2022 10:09:57 +0200
Subject: [PATCH 0439/1963] fix(pubsub): fix double free in openssl secured
 mqtt connection

(for UA_ENABLE_MQTT_TLS_OPENSSL=ON) client->socketfd is the same pointer as
channeldata->sockfd. client->sockfd is freed in disconnectMqtt() and again
afterwards in freeTLS(). Therefore set it to NULL in disconnectMqtt and free
it in freeTLS only.

Signed-off-by: Tobias Zimmermann <Tobias.Zimmermann@tq-group.com>
---
 plugins/mqtt/ua_mqtt-c_adapter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index f16912dbdf3..9a59fe0a723 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -310,7 +310,7 @@ disconnectMqtt(UA_PubSubChannelDataMQTT* channelData){
         mqtt_disconnect(client);
         yieldMqtt(channelData, 10);
 #ifdef UA_ENABLE_MQTT_TLS_OPENSSL //mbedTLS condition is missing
-        BIO_free_all(client->socketfd);
+        client->socketfd = NULL;
 #endif
     }
 

From 381b2d08c8b0886ee441697c7e5668a525b02fef Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 21:30:10 +0200
Subject: [PATCH 0440/1963] refactor(el): Document the reasoning for when
 delayed callbacks are run

---
 arch/eventloop_posix.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 78211b4ff2e..b1973702187 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -237,8 +237,12 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
                          timerExecutionTrampoline, NULL);
     UA_LOCK(&el->elMutex);
 
-    processDelayed(el); /* Process delayed callbacks. Remove closed sockets
-                         * already here instead of calling select for them. */
+    /* Process delayed callbacks here:
+     * - Removes closed sockets already here instead of polling them again.
+     * - The timeout for polling is selected to be ready in time for the next
+     *   cyclic callback. So we want to do little work between the timeout
+     *   running out and executing the due cyclic callbacks. */
+    processDelayed(el);
 
     /* Compute the remaining time */
     UA_DateTime maxDate = dateBefore + (timeout * UA_DATETIME_MSEC);

From ea4077fd4c0fa713ac45d021ce3d7d9a76a8d1de Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 21:44:46 +0200
Subject: [PATCH 0441/1963] refactor(el): Remove unused UA_Timer_addTimerEntry

---
 arch/common/ua_timer.c | 11 -----------
 arch/common/ua_timer.h |  6 ------
 2 files changed, 17 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index c29bde4afa3..8234c0bdd76 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -66,17 +66,6 @@ UA_Timer_init(UA_Timer *t) {
     UA_LOCK_INIT(&t->timerMutex);
 }
 
-void
-UA_Timer_addTimerEntry(UA_Timer *t, UA_TimerEntry *te, UA_UInt64 *callbackId) {
-    UA_LOCK(&t->timerMutex);
-    te->id = ++t->idCounter;
-    if(callbackId)
-        *callbackId = te->id;
-    aa_insert(&t->root, te);
-    aa_insert(&t->idRoot, te);
-    UA_UNLOCK(&t->timerMutex);
-}
-
 static UA_StatusCode
 addCallback(UA_Timer *t, UA_ApplicationCallback callback, void *application,
             void *data, UA_DateTime nextTime, UA_UInt64 interval,
diff --git a/arch/common/ua_timer.h b/arch/common/ua_timer.h
index bdcbdd4adfa..acc2775ef6b 100644
--- a/arch/common/ua_timer.h
+++ b/arch/common/ua_timer.h
@@ -64,12 +64,6 @@ UA_Timer_addTimedCallback(UA_Timer *t, UA_ApplicationCallback callback,
                           void *application, void *data, UA_DateTime date,
                           UA_UInt64 *callbackId);
 
-/* Add a pre-allocated and pre-filled UA_TimerEntry. This cannot fail. It is
- * used, for example, for delayed memory reclamation where the data structure
- * begins with a UA_TimerEntry. */
-void
-UA_Timer_addTimerEntry(UA_Timer *t, UA_TimerEntry *te, UA_UInt64 *callbackId);
-
 UA_StatusCode
 UA_Timer_addRepeatedCallback(UA_Timer *t, UA_ApplicationCallback callback,
                              void *application, void *data, UA_Double interval_ms,

From 5cf711e8050bce36d819c2d211ffa16e3946ea48 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 22:45:37 +0200
Subject: [PATCH 0442/1963] refactor(pubsub): Don't use addTimedCallback

---
 src/pubsub/ua_pubsub_manager.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 8433df71496..3f4c90e6693 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -672,13 +672,22 @@ UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
     return ret;
 }
 
+static void
+monitoringReceiveTimeoutOnce(UA_Server *server, void *data) {
+    UA_DataSetReader *reader = (UA_DataSetReader*)data;
+    reader->msgRcvTimeoutTimerCallback(server, reader);
+    UA_PubSubManager_removeRepeatedPubSubCallback(server, reader->msgRcvTimeoutTimerId);
+    reader->msgRcvTimeoutTimerId = 0;
+}
+
 static UA_StatusCode
-UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
+UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
+                                   UA_PubSubComponentEnumType eComponentType,
                                    UA_PubSubMonitoringType eMonitoringType, void *data) {
-
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Error UA_PubSubComponent_startMonitoring(): "
-            "null pointer param");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Error UA_PubSubComponent_startMonitoring(): "
+                     "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
@@ -689,12 +698,13 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCom
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
                     /* use a timed callback, because one notification is enough,
-                    we assume that MessageReceiveTimeout configuration is in [ms], we do not handle or check fractions */
-                    UA_UInt64 interval = (UA_UInt64)(reader->config.messageReceiveTimeout * UA_DATETIME_MSEC);
-                    ret = server->config.eventLoop->
-                        addTimedCallback(server->config.eventLoop, (UA_Callback) reader->msgRcvTimeoutTimerCallback,
-                                         server, reader, UA_DateTime_nowMonotonic() + (UA_DateTime) interval,
-                                         &(reader->msgRcvTimeoutTimerId));
+                     * we assume that MessageReceiveTimeout configuration is in
+                     * [ms], we do not handle or check fractions */
+                    ret = UA_PubSubManager_addRepeatedCallback(server, monitoringReceiveTimeoutOnce,
+                                                               reader, reader->config.messageReceiveTimeout,
+                                                               NULL,
+                                                               UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                                               &reader->msgRcvTimeoutTimerId);
                     if (ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                             "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s'- MessageReceiveTimeout: MessageReceiveTimeout = '%f' "

From 9268d0f87458ac683519e65e851bd4662d5015f4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 22:50:14 +0200
Subject: [PATCH 0443/1963] feat(client): Add UA_Client_removeRepeatedCallback
 alias

---
 include/open62541/client.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 379989b0595..0b9ff625d85 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -715,6 +715,9 @@ UA_Client_changeRepeatedCallbackInterval(UA_Client *client,
 void UA_EXPORT
 UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId);
 
+#define UA_Client_removeRepeatedCallback(server, callbackId)    \
+    UA_Client_removeCallback(server, callbackId);
+
 /**
  * Client Utility Functions
  * ------------------------ */

From 26bb365a29c8bb2ce42a8c9b1dbbfb6b81a03a53 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 22:52:03 +0200
Subject: [PATCH 0444/1963] refactor(server): Small cosmetic improvements in
 ua_server.c

---
 src/server/ua_server.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 862046259c1..5b7fe27d451 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -419,10 +419,9 @@ UA_Server_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
                               void *data, UA_Double interval_ms,
                               UA_UInt64 *callbackId) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode retval =
-        addRepeatedCallback(server, callback, data, interval_ms, callbackId);
+    UA_StatusCode res = addRepeatedCallback(server, callback, data, interval_ms, callbackId);
     UA_UNLOCK(&server->serviceMutex);
-    return retval;
+    return res;
 }
 
 UA_StatusCode
@@ -445,8 +444,8 @@ UA_Server_changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId
 
 void
 removeCallback(UA_Server *server, UA_UInt64 callbackId) {
-    server->config.eventLoop->removeCyclicCallback(server->config.eventLoop,
-                                                   callbackId);
+    UA_EventLoop *el = server->config.eventLoop;
+    el->removeCyclicCallback(el, callbackId);
 }
 
 void

From 27b379c49a26150f3819ed1a80ab6d8db0e8efa2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 23:19:56 +0200
Subject: [PATCH 0445/1963] refactor(el): Improve handling of delayed callbacks
 re-adding themselves

---
 arch/eventloop_posix.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index b1973702187..61063f04974 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -244,6 +244,13 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
      *   running out and executing the due cyclic callbacks. */
     processDelayed(el);
 
+    /* A delayed callback could create another delayed callback (or re-add
+     * itself). In that case we don't want to wait (indefinitely) for an event
+     * to happen. Process queued events but don't sleep. Then process the
+     * delayed callbacks in the next iteration. */
+    if(el->delayedCallbacks != NULL)
+        timeout = 0;
+
     /* Compute the remaining time */
     UA_DateTime maxDate = dateBefore + (timeout * UA_DATETIME_MSEC);
     if(dateNext > maxDate)

From 737965cc5df2664205b1b415901639c3881db4d6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 23:28:14 +0200
Subject: [PATCH 0446/1963] feat(el): Add removeDelayedCallback

---
 arch/eventloop_posix.c               | 17 +++++++++++++++++
 include/open62541/plugin/eventloop.h | 21 ++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 61063f04974..cbc07fb6737 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -81,6 +81,22 @@ UA_EventLoopPOSIX_addDelayedCallback(UA_EventLoop *public_el,
     UA_UNLOCK(&el->elMutex);
 }
 
+static void
+UA_EventLoopPOSIX_removeDelayedCallback(UA_EventLoop *public_el,
+                                     UA_DelayedCallback *dc) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
+    UA_LOCK(&el->elMutex);
+    UA_DelayedCallback **prev = &el->delayedCallbacks;
+    while(*prev) {
+        if(*prev == dc) {
+            *prev = (*prev)->next;
+            return;
+        }
+        prev = &(*prev)->next;
+    }
+    UA_UNLOCK(&el->elMutex);
+}
+
 /* Process and then free registered delayed callbacks */
 static void
 processDelayed(UA_EventLoopPOSIX *el) {
@@ -435,6 +451,7 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger) {
     el->eventLoop.removeCyclicCallback = UA_EventLoopPOSIX_removeCyclicCallback;
     el->eventLoop.addTimedCallback = UA_EventLoopPOSIX_addTimedCallback;
     el->eventLoop.addDelayedCallback = UA_EventLoopPOSIX_addDelayedCallback;
+    el->eventLoop.removeDelayedCallback = UA_EventLoopPOSIX_removeDelayedCallback;
 
     el->eventLoop.registerEventSource =
         (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 4b60d2db406..37c511306da 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -117,11 +117,10 @@ struct UA_EventLoop {
     UA_DateTime (*dateTime_nowMonotonic)(UA_EventLoop *el);
     UA_Int64    (*dateTime_localTimeUtcOffset)(UA_EventLoop *el);
 
-    /* Cyclic and Delayed Callbacks
-     * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-     * Cyclic callbacks are executed regularly with an interval. A delayed
-     * callback is executed in the next cycle of the EventLoop. The memory for
-     * the delayed callback is freed after the execution. */
+    /* Timed Callbacks
+     * ~~~~~~~~~~~~~~~
+     * Cyclic callbacks are executed regularly with an interval.
+     * A timed callback is executed only once. */
 
     /* Time of the next cyclic callback. Returns the max DateTime if no cyclic
      * callback is registered. */
@@ -146,7 +145,19 @@ struct UA_EventLoop {
     (*addTimedCallback)(UA_EventLoop *el, UA_Callback cb, void *application,
                         void *data, UA_DateTime date, UA_UInt64 *callbackId);
 
+    /* Delayed Callbacks
+     * ~~~~~~~~~~~~~~~~~
+     * Delayed callbacks are executed once in the next iteration of the
+     * EventLoop and then deregistered automatically. A typical use case is to
+     * delay a resource cleanup to a point where it is known that the resource
+     * has no remaining users.
+     *
+     * The delayed callbacks are processed in each of the cycle of the EventLoop
+     * between the handling of timed cyclic callbacks and polling for (network)
+     * events. The memory for the delayed callback is automatically freed after
+     * the execution. */
     void (*addDelayedCallback)(UA_EventLoop *el, UA_DelayedCallback *dc);
+    void (*removeDelayedCallback)(UA_EventLoop *el, UA_DelayedCallback *dc);
 
     /* EventSources
      * ~~~~~~~~~~~~

From 90ab13006ae847bd5fa8d4bfe2f1261727d7d809 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 12:20:32 +0200
Subject: [PATCH 0447/1963] refactor(el): Use the fact that a timer callback
 must be set in ua_timer.c

---
 arch/common/ua_timer.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index 8234c0bdd76..80a19193594 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -201,20 +201,16 @@ UA_Timer_process(UA_Timer *t, UA_DateTime nowMonotonic,
     UA_TimerEntry *first;
     while((first = (UA_TimerEntry*)aa_min(&t->root)) &&
           first->nextTime <= nowMonotonic) {
+        /* Remove before modifying the nextTime timestamp.
+         * aa_remove gets confused if we remove later. */
         aa_remove(&t->root, first);
 
-        /* Reinsert / remove to their new position first. Because the callback
-         * can interact with the zip tree and expects the same entries in the
-         * root and idRoot trees. */
-
         if(first->interval == 0) {
             aa_remove(&t->idRoot, first);
-            if(first->callback) {
-                UA_UNLOCK(&t->timerMutex);
-                executionCallback(executionApplication, first->callback,
-                                  first->application, first->data);
-                UA_LOCK(&t->timerMutex);
-            }
+            UA_UNLOCK(&t->timerMutex);
+            executionCallback(executionApplication, first->callback,
+                              first->application, first->data);
+            UA_LOCK(&t->timerMutex);
             UA_free(first);
             continue;
         }
@@ -236,14 +232,13 @@ UA_Timer_process(UA_Timer *t, UA_DateTime nowMonotonic,
                 first->nextTime = nowMonotonic + (UA_DateTime)first->interval;
         }
 
+        /* Insert before running the callback. The entry can be removed from the
+         * callback itself. */
         aa_insert(&t->root, first);
 
-        if(!first->callback)
-            continue;
-
-        /* Unlock the mutes before dropping into the callback. So that the timer
-         * itself can be edited within the callback. When we return, only the
-         * pointer to t must still exist. */
+        /* Unlock the mutex before dropping into the callback. So that the timer
+         * itself can be removed / edited within the callback. When we return,
+         * only the pointer to t must still exist. */
         UA_ApplicationCallback cb = first->callback;
         void *app = first->application;
         void *data = first->data;

From dd80ce71149fbc81fe8e1b66a7c3ab380ca6bcbf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 12:37:01 +0200
Subject: [PATCH 0448/1963] refactor(el): Delayed Callbacks no longer
 automatically free their memory

We have a use case where delayed callbacks are "reused".
Freeing from inside the callback is easier than malloc from inside the
callback.
---
 arch/eventloop_posix.c                     | 15 +++++++--------
 arch/eventloop_posix_tcp.c                 | 11 +++--------
 arch/eventloop_posix_udp.c                 |  7 +++----
 include/open62541/plugin/eventloop.h       |  4 ++--
 src/server/ua_services_attribute.c         | 13 ++++++++++---
 src/server/ua_services_session.c           |  5 +++--
 src/server/ua_subscription.c               | 21 +++++++++++++--------
 src/server/ua_subscription_monitoreditem.c | 15 ++++++++++-----
 8 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index cbc07fb6737..71dbe553c9b 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -107,14 +107,13 @@ processDelayed(UA_EventLoopPOSIX *el) {
     while(el->delayedCallbacks) {
         UA_DelayedCallback *dc = el->delayedCallbacks;
         el->delayedCallbacks = dc->next;
-        /* Delayed Callbacks might have no cb pointer if all
-         * we want to do is free the memory */
-        if(dc->callback) {
-            UA_UNLOCK(&el->elMutex);
-            dc->callback(dc->application, dc->context);
-            UA_LOCK(&el->elMutex);
-        }
-        UA_free(dc);
+        /* Delayed Callbacks might have no callback set. We don't return a
+         * StatusCode during "add" and don't validate. So test here. */
+        if(!dc->callback)
+            continue;
+        UA_UNLOCK(&el->elMutex);
+        dc->callback(dc->application, dc->context);
+        UA_LOCK(&el->elMutex);
     }
 }
 
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index ee09f62dbd6..f301df72612 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -141,23 +141,18 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     UA_assert(tcm->fdsSize > 0);
     tcm->fdsSize--;
     TCP_checkStopped(tcm);
-
-    /* Don't call UA_free(rfd). This might be done automatically via the delayed
-     * callback that calls TCP_close. */
-
     return UA_STATUSCODE_GOOD;
 }
 
 static void
 TCP_delayedClose(void *application, void *context) {
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)application;
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    TCPConnectionManager *tcm = (TCPConnectionManager*)application;
+    UA_ConnectionManager *cm = &tcm->cm;
     UA_RegisteredFD* rfd = (UA_RegisteredFD *)context;
     UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                  "TCP %u\t| Delayed closing of the connection", (unsigned)rfd->fd);
     TCP_close(tcm, rfd);
-    /* Don't call free here. This is done automatically via the delayed callback
-     * mechanism. */
+    UA_free(rfd);
 }
 
 static int
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 9551c26d386..045572e03e2 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -617,14 +617,13 @@ UDP_close(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
 
 static void
 UDP_delayedClose(void *application, void *context) {
-    UA_ConnectionManager *cm = (UA_ConnectionManager*)application;
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UDPConnectionManager *ucm = (UDPConnectionManager*)application;
+    UA_ConnectionManager *cm = &ucm->cm;
     UA_RegisteredFD* rfd = (UA_RegisteredFD *)context;
     UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                  "UDP %u\t| Delayed closing of the connection", (unsigned)rfd->fd);
     UDP_close(ucm, rfd);
-    /* Don't call free here. This is done automatically via the delayed callback
-     * mechanism. */
+    UA_free(rfd);
 }
 
 /* Gets called when a socket receives data or closes */
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 37c511306da..c058a6959c8 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -154,8 +154,8 @@ struct UA_EventLoop {
      *
      * The delayed callbacks are processed in each of the cycle of the EventLoop
      * between the handling of timed cyclic callbacks and polling for (network)
-     * events. The memory for the delayed callback is automatically freed after
-     * the execution. */
+     * events. The memory for the delayed callback is *NOT* automatically freed
+     * after the execution. */
     void (*addDelayedCallback)(UA_EventLoop *el, UA_DelayedCallback *dc);
     void (*removeDelayedCallback)(UA_EventLoop *el, UA_DelayedCallback *dc);
 
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 7117e9c72cf..3ecf7086a7b 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1091,6 +1091,11 @@ compatibleValue(UA_Server *server, UA_Session *session, const UA_NodeId *targetD
 /* Write Service */
 /*****************/
 
+static void
+freeWrapperArray(void *app, void *context) {
+    UA_free(context);
+}
+
 static void
 unwrapEOArray(UA_Server *server, UA_Variant *value) {
     /* Only works on arrays of ExtensionObjects */
@@ -1117,7 +1122,6 @@ unwrapEOArray(UA_Server *server, UA_Variant *value) {
         UA_malloc(sizeof(UA_DelayedCallback) + (value->arrayLength * innerType->memSize));
     if(!dc)
         return;
-    dc->callback = NULL; /* No callback, just free the memory */
 
     /* Move the content */
     uintptr_t pos = ((uintptr_t)dc) + sizeof(UA_DelayedCallback);
@@ -1132,8 +1136,11 @@ unwrapEOArray(UA_Server *server, UA_Variant *value) {
     value->data = unwrappedArray;
 
     /* Add the delayed callback to free the memory of the unwrapped array */
-    server->config.eventLoop->
-        addDelayedCallback(server->config.eventLoop, dc);
+    dc->callback = freeWrapperArray;
+    dc->application = NULL;
+    dc->context = dc;
+    UA_EventLoop *el = server->config.eventLoop;
+    el->addDelayedCallback(el, dc);
 }
 
 void
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 37223c3b3c3..f37e9091c85 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -22,6 +22,7 @@ removeSessionCallback(UA_Server *server, session_list_entry *entry) {
     UA_LOCK(&server->serviceMutex);
     UA_Session_clear(&entry->session, server);
     UA_UNLOCK(&server->serviceMutex);
+    UA_free(entry);
 }
 
 void
@@ -93,8 +94,8 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
     sentry->cleanupCallback.callback = (UA_Callback)removeSessionCallback;
     sentry->cleanupCallback.application = server;
     sentry->cleanupCallback.context = sentry;
-    server->config.eventLoop->
-        addDelayedCallback(server->config.eventLoop, &sentry->cleanupCallback);
+    UA_EventLoop *el = server->config.eventLoop;
+    el->addDelayedCallback(el, &sentry->cleanupCallback);
 }
 
 UA_StatusCode
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 86614a04157..b1766b588de 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -43,6 +43,11 @@ UA_Subscription_new(void) {
     return newSub;
 }
 
+static void
+delayedFreeSubscription(void *app, void *context) {
+    UA_free(context);
+}
+
 void
 UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
@@ -111,14 +116,14 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     }
     UA_assert(sub->retransmissionQueueSize == 0);
 
-    /* Add a delayed callback to remove the Subscription when the current jobs
-     * have completed. Pointers to the subscription may still exist upwards in
-     * the call stack. */
-    sub->delayedFreePointers.callback = NULL;
-    sub->delayedFreePointers.application = server;
-    sub->delayedFreePointers.context = NULL;
-    server->config.eventLoop->
-        addDelayedCallback(server->config.eventLoop, &sub->delayedFreePointers);
+    /* Pointers to the subscription may still exist upwards in the call stack.
+     * Add a delayed callback to remove the Subscription when the current jobs
+     * have completed. */
+    sub->delayedFreePointers.callback = delayedFreeSubscription;
+    sub->delayedFreePointers.application = NULL;
+    sub->delayedFreePointers.context = sub;
+    UA_EventLoop *el = server->config.eventLoop;
+    el->addDelayedCallback(el, &sub->delayedFreePointers);
 }
 
 UA_MonitoredItem *
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 9c5cb247517..dc356e418b0 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -562,6 +562,11 @@ UA_MonitoredItem_setMonitoringMode(UA_Server *server, UA_MonitoredItem *mon,
     return UA_STATUSCODE_GOOD;
 }
 
+static void
+delayedFreeMonitoredItem(void *app, void *context) {
+    UA_free(context);
+}
+
 void
 UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *mon) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
@@ -598,11 +603,11 @@ UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *mon) {
     /* Add a delayed callback to remove the MonitoredItem when the current jobs
      * have completed. This is needed to allow that a local MonitoredItem can
      * remove itself in the callback. */
-    mon->delayedFreePointers.callback = NULL;
-    mon->delayedFreePointers.application = server;
-    mon->delayedFreePointers.context = NULL;
-    server->config.eventLoop->
-        addDelayedCallback(server->config.eventLoop, &mon->delayedFreePointers);
+    mon->delayedFreePointers.callback = delayedFreeMonitoredItem;
+    mon->delayedFreePointers.application = NULL;
+    mon->delayedFreePointers.context = mon;
+    UA_EventLoop *el = server->config.eventLoop;
+    el->addDelayedCallback(el, &mon->delayedFreePointers);
 }
 
 void

From 781562ad9c8f056f6a4148e1eb684fd6e921c4f2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 13:03:34 +0200
Subject: [PATCH 0449/1963] feat(el): Delayed Callbacks can add (themselves)
 during processing

---
 arch/eventloop_posix.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 71dbe553c9b..0ea1bd876bf 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -104,9 +104,15 @@ processDelayed(UA_EventLoopPOSIX *el) {
                  "Process delayed callbacks");
 
     UA_LOCK_ASSERT(&el->elMutex, 1);
-    while(el->delayedCallbacks) {
-        UA_DelayedCallback *dc = el->delayedCallbacks;
-        el->delayedCallbacks = dc->next;
+
+    /* First empty the linked list in the el. So a delayed callback can add
+     * (itself) to the list. New entries are then processed during the next
+     * iteration. */
+    UA_DelayedCallback *dc = el->delayedCallbacks, *next = NULL;
+    el->delayedCallbacks = NULL;
+
+    for(; dc; dc = next) {
+        next = dc->next;
         /* Delayed Callbacks might have no callback set. We don't return a
          * StatusCode during "add" and don't validate. So test here. */
         if(!dc->callback)

From 4a2de90fd3928309b04e9a983651a55343ea0c1f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 21:11:29 +0200
Subject: [PATCH 0450/1963] feat(core): Define _MIN and _MAX for floating point
 types

---
 include/open62541/architecture_definitions.h | 1 +
 include/open62541/types.h                    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
index 712c3b7ca81..531ac29782f 100644
--- a/include/open62541/architecture_definitions.h
+++ b/include/open62541/architecture_definitions.h
@@ -17,6 +17,7 @@
  * --------------- */
 #include <string.h>
 #include <stddef.h>
+#include <float.h>
 
 /* Include stdint.h and stdbool.h or workaround for older Visual Studios */
 #ifdef UNDER_CE
diff --git a/include/open62541/types.h b/include/open62541/types.h
index 482ff0da36c..2778d73f4b7 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -118,12 +118,16 @@ typedef uint64_t UA_UInt64;
  * ^^^^^
  * An IEEE single precision (32 bit) floating point value. */
 typedef float UA_Float;
+#define UA_FLOAT_MIN FLT_MIN;
+#define UA_FLOAT_MAX FLT_MAX;
 
 /**
  * Double
  * ^^^^^^
  * An IEEE double precision (64 bit) floating point value. */
 typedef double UA_Double;
+#define UA_DOUBLE_MIN DBL_MIN;
+#define UA_DOUBLE_MAX DBL_MAX;
 
 /**
  * .. _statuscode:

From a21fff31196cfda4746e96245180950597e96892 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 21:12:35 +0200
Subject: [PATCH 0451/1963] feat(core): JSON Int64/UInt64 can be unwrapped (not
 as a string)

A non-standard addition to work around a common error.
---
 include/open62541/types.h        |  5 +++--
 src/ua_types_encoding_json.c     |  2 --
 tests/check_types_builtin_json.c | 27 ++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 2778d73f4b7..c6682025cf2 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1243,9 +1243,10 @@ UA_decodeBinary(const UA_ByteString *inBuf,
  *   (https://json5.org/). This allows for more human-readable encoding and adds
  *   convenience features such as trailing commas in arrays and comments within
  *   JSON documents.
+ * - Int64/UInt64 don't necessarily have to be wrapped into a string.
  * - If `UA_ENABLE_PARSING` is set, NodeIds and ExpandedNodeIds can be given in
- *   the string encoding (see `UA_NodeId_parse`). The standard encoding is to
- *   express NodeIds as JSON objects.
+ *   the string encoding (e.g. "ns=1;i=42", see `UA_NodeId_parse`). The standard
+ *   encoding is to express NodeIds as JSON objects.
  *
  * These extensions are not intended to be used for the OPC UA protocol on the
  * network. They were rather added to allow more convenient configuration file
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 4f86addcb15..cee11418ca7 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1573,7 +1573,6 @@ DECODE_JSON(UInt32) {
 
 DECODE_JSON(UInt64) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_STRING;
     GET_TOKEN;
 
     UA_StatusCode s = parseUnsignedInteger(tokenData, tokenSize, dst);
@@ -1627,7 +1626,6 @@ DECODE_JSON(Int32) {
 
 DECODE_JSON(Int64) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_STRING;
     GET_TOKEN;
 
     UA_StatusCode s = parseSignedInteger(tokenData, tokenSize, dst);
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index a189bbe1701..8430eedc335 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -809,7 +809,6 @@ START_TEST(UA_Int64_smallbuf_Number_json_encode) {
 }
 END_TEST
 
-
 START_TEST(UA_Double_json_encode) {
     UA_Double src = 1.1234;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
@@ -3242,6 +3241,30 @@ START_TEST(UA_UInt64_Min_json_decode) {
 }
 END_TEST
 
+START_TEST(UA_UInt64_json_decode_wrapped) {
+    UA_ByteString buf = UA_STRING("\"184467440737095516\"");
+    // when
+
+    UA_UInt64 out;
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_UINT64], NULL);
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out, 184467440737095516);
+}
+END_TEST
+
+START_TEST(UA_UInt64_json_decode_unwrapped) {
+    UA_ByteString buf = UA_STRING("184467440737095516");
+    // when
+
+    UA_UInt64 out;
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_UINT64], NULL);
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out, 184467440737095516);
+}
+END_TEST
+
 START_TEST(UA_UInt64_Max_json_decode) {
     UA_Variant out;
     UA_Variant_init(&out);
@@ -5627,6 +5650,8 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_decode, UA_Int64_TooBig_json_decode);
     tcase_add_test(tc_json_decode, UA_Int64_NoDigit_json_decode);
 
+    tcase_add_test(tc_json_decode, UA_UInt64_json_decode_wrapped);
+    tcase_add_test(tc_json_decode, UA_UInt64_json_decode_unwrapped);
     tcase_add_test(tc_json_decode, UA_UInt64_Min_json_decode);
     tcase_add_test(tc_json_decode, UA_UInt64_Max_json_decode);
     tcase_add_test(tc_json_decode, UA_UInt64_Overflow_json_decode);

From ed89350876ec225272bc0d61024cabf92e56dc83 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Sep 2022 21:14:34 +0200
Subject: [PATCH 0452/1963] refactor(core): Small simplification in integer
 _MIN definition

Harmonizes across the different integers.
Solves a casting warning in a macro comparing numerical with _MIN (for
event filters).
---
 include/open62541/types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index c6682025cf2..2332dbd4023 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -110,7 +110,7 @@ typedef int64_t UA_Int64;
  * ^^^^^^
  * An integer value between 0 and 18 446 744 073 709 551 615. */
 typedef uint64_t UA_UInt64;
-#define UA_UINT64_MIN (uint64_t)0
+#define UA_UINT64_MIN 0
 #define UA_UINT64_MAX (uint64_t)18446744073709551615ULL
 
 /**

From 764a0c00d2b737d76141f9fad32f1748791f2463 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 10:38:28 +0200
Subject: [PATCH 0453/1963] feat(server): Explicit handling of ternary logic in
 event filters

---
 src/server/ua_subscription_events_filter.c | 65 ++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 8cd31627516..e6d6451bc76 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -5,6 +5,7 @@
  *    Copyright 2018 (c) Ari Breitkreuz, fortiss GmbH
  *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  */
 
 #include "ua_server_internal.h"
@@ -12,6 +13,70 @@
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
 
+/* Ternary Logic
+ * -------------
+ * Similar to SQL, OPC UA Queries use the K3 - Strong Kleene Logic that
+ * considers ternary values true/false/null (unknown). Most operators resolve to
+ * a ternary value. Some operators can resolve to a literal value (e.g. CAST). */
+
+typedef enum {
+    UA_TERNARY_FALSE = -1,
+    UA_TERNARY_NULL = 0,
+    UA_TERNARY_TRUE = 1
+} UA_Ternary;
+
+static UA_Ternary
+UA_Ternary_and(UA_Ternary first, UA_Ternary second) {
+    if(first == UA_TERNARY_FALSE || second == UA_TERNARY_FALSE)
+        return UA_TERNARY_FALSE;
+    if(first == UA_TERNARY_TRUE && second == UA_TERNARY_TRUE)
+        return UA_TERNARY_TRUE;
+    return UA_TERNARY_NULL;
+}
+
+static UA_Ternary
+UA_Ternary_or(UA_Ternary first, UA_Ternary second) {
+    if(first == UA_TERNARY_TRUE || second == UA_TERNARY_TRUE)
+        return UA_TERNARY_TRUE;
+    if(first == UA_TERNARY_NULL || second == UA_TERNARY_NULL)
+        return UA_TERNARY_TRUE;
+    return UA_TERNARY_FALSE;
+}
+
+/* Part 4: The NOT operator always evaluates to NULL if applied to a NULL
+ * operand. We simply swap true/false. */
+static UA_Ternary
+UA_Ternary_not(UA_Ternary v) {
+    return (UA_Ternary)((int)v * -1);
+}
+
+static UA_Ternary v2t(const UA_Variant *v) {
+    if(UA_Variant_isEmpty(v) || !UA_Variant_hasScalarType(v, &UA_TYPES[UA_TYPES_BOOLEAN]))
+        return UA_TERNARY_NULL;
+    UA_Boolean b = *(UA_Boolean*)v->data;
+    return (b) ? UA_TERNARY_TRUE : UA_TERNARY_FALSE;
+}
+
+static const UA_Boolean bFalse = false;
+static const UA_Boolean bTrue  = true;
+
+static UA_Variant t2v(UA_Ternary t) {
+    UA_Variant v;
+    UA_Variant_init(&v);
+    switch(t) {
+    case UA_TERNARY_FALSE:
+        UA_Variant_setScalar(&v, (void*)(uintptr_t)&bFalse, &UA_TYPES[UA_TYPES_BOOLEAN]);
+        break;
+    case UA_TERNARY_TRUE:
+        UA_Variant_setScalar(&v, (void*)(uintptr_t)&bTrue, &UA_TYPES[UA_TYPES_BOOLEAN]);
+        break;
+    default:
+        return v;
+    }
+    v.storageType = UA_VARIANT_DATA_NODELETE;
+    return v;
+}
+
 typedef struct {
     UA_Server *server;
     UA_Session *session;

From 5e919a1096f855a2f5a592e9ccba863c08428c91 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 11:18:01 +0200
Subject: [PATCH 0454/1963] refactor(server): Internalize the type precedence
 rules rework event filter casting rules

---
 include/open62541/types.h                  |  5 --
 src/server/ua_subscription_events_filter.c | 76 ++++++++++++++++++++++
 src/ua_types.c                             | 45 -------------
 3 files changed, 76 insertions(+), 50 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 2332dbd4023..6297f34e29d 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1096,11 +1096,6 @@ UA_DataType_getStructMember(const UA_DataType *type,
 UA_Boolean
 UA_DataType_isNumeric(const UA_DataType *type);
 
-/* Return the Data Type Precedence-Rank defined in Part 4.
- * If there is no Precedence-Rank assigned with the type -1 is returned.*/
-UA_Int16
-UA_DataType_getPrecedence(const UA_DataType *type);
-
 /**
  * Builtin data types can be accessed as UA_TYPES[UA_TYPES_XXX], where XXX is
  * the name of the data type. If only the NodeId of a type is known, use the
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index e6d6451bc76..62d753c5db1 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -77,6 +77,82 @@ static UA_Variant t2v(UA_Ternary t) {
     return v;
 }
 
+/* Type Casting Rules
+ * ------------------
+ * For comparison operations values from different datatypes can be implicitly
+ * or explicitly cast. The standard defines rules to selected the target type
+ * for casting and when implicit casts are possible. */
+
+/* Defined in Part 4 Table 123 "Data Precedence Rules". Implicit casting is
+ * always to the type of lower precedence value. */
+static UA_Byte typePrecedence[UA_DATATYPEKINDS] = {
+    12, 10, 11, 8, 9, 5, 6, 3, 4, 2, 1, 14, 255, 13, 255, 255, 16,
+    15, 7, 18, 17, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255
+};
+
+/* Type conversion table from the standard.
+ * 0 -> Same Type, 1 -> Implicit Cast, 2 -> Only explicit Cast, -1 -> cast invalid */
+static UA_SByte convertLookup[21][21] = {
+    { 0, 1,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
+    { 2, 0,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
+    {-1,-1, 0,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
+    {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 0,-1, 2,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1, 2,-1,-1, 1,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 0,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1, 2,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 0, 1, 1,-1, 2,-1, 2,-1,-1, 2, 1, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 0, 1,-1, 2, 2, 2,-1,-1, 2, 2, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 0,-1, 2, 2, 2,-1,-1, 2, 2, 2,-1},
+    {-1,-1,-1,-1,-1, 1,-1,-1,-1,-1,-1, 0,-1,-1, 1,-1,-1,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 0,-1, 2,-1,-1, 1, 1, 1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1,-1,-1, 0,-1,-1,-1, 2, 1, 1,-1},
+    { 1, 1,-1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1,-1, 0, 2, 2, 1, 1, 1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 0,-1,-1,-1,-1,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1, 0,-1,-1,-1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 2, 1, 2,-1,-1, 0, 1, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 1, 1,-1, 2, 2, 2,-1,-1, 2, 0, 1,-1},
+    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 1,-1, 2, 2, 2,-1,-1, 2, 2, 0,-1},
+    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0}
+};
+
+/* This array maps the index of the DataType-Kind to the index of the type
+ * conversion matrix (255 -> not contained in the matrix) */
+static UA_Byte convertLookupIndex[UA_DATATYPEKINDS] = {
+    0,  12,  1,  8, 17,  9, 18, 10, 19,  6, 4,  14,  3,  7,  2,
+    20, 11,  5, 13, 16, 15,255,255,255,255,255,255,255,255,255,255
+};
+
+/* Returns the target type for implicit cassting or NULL if no implicit casting
+ * is possible */
+static const UA_DataType *
+implicitCastTargetType(const UA_DataType *t1, const UA_DataType *t2) {
+    if(!t1 || t1 == t2)
+        return t1;
+
+    /* Get the type precedence. Return if no implicit casting is possible. */
+    UA_Byte p1 = typePrecedence[t1->typeKind];
+    UA_Byte p2 = typePrecedence[t2->typeKind];
+    if(p1 == UA_BYTE_MAX || p2 == UA_BYTE_MAX)
+        return NULL;
+
+    /* Which is the target type based on the precedence rules? */
+    const UA_DataType *targetType = (p1 < p2) ? t1 : t2;
+    const UA_DataType *sourceType = (p1 < p2) ? t2 : t1;
+
+    /* Lookup the casting rule */
+    UA_Byte sourceIndex = convertLookupIndex[sourceType->typeKind];
+    UA_Byte targetIndex = convertLookupIndex[targetType->typeKind];
+    if(sourceIndex == UA_BYTE_MAX || targetIndex == UA_BYTE_MAX)
+        return NULL;
+    UA_SByte castingRule = convertLookup[sourceIndex][targetIndex];
+
+    /* Is implicit casting allowed? */
+    if(castingRule != 0 && castingRule != 1)
+        return NULL;
+    return targetType;
+}
+
 typedef struct {
     UA_Server *server;
     UA_Session *session;
diff --git a/src/ua_types.c b/src/ua_types.c
index 9a11765bfee..76841669540 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -2168,51 +2168,6 @@ UA_DataType_isNumeric(const UA_DataType *type) {
     }
 }
 
-UA_Int16
-UA_DataType_getPrecedence(const UA_DataType *type){
-    //Defined in Part 4 Table 123 "Data Precedence Rules"
-    switch(type->typeKind) {
-        case UA_DATATYPEKIND_DOUBLE:
-            return 1;
-        case UA_DATATYPEKIND_FLOAT:
-            return 2;
-        case UA_DATATYPEKIND_INT64:
-            return 3;
-        case UA_DATATYPEKIND_UINT64:
-            return 4;
-        case UA_DATATYPEKIND_INT32:
-            return 5;
-        case UA_DATATYPEKIND_UINT32:
-            return 6;
-        case UA_DATATYPEKIND_STATUSCODE:
-            return 7;
-        case UA_DATATYPEKIND_INT16:
-            return 8;
-        case UA_DATATYPEKIND_UINT16:
-            return 9;
-        case UA_DATATYPEKIND_SBYTE:
-            return 10;
-        case UA_DATATYPEKIND_BYTE:
-            return 11;
-        case UA_DATATYPEKIND_BOOLEAN:
-            return 12;
-        case UA_DATATYPEKIND_GUID:
-            return 13;
-        case UA_DATATYPEKIND_STRING:
-            return 14;
-        case UA_DATATYPEKIND_EXPANDEDNODEID:
-            return 15;
-        case UA_DATATYPEKIND_NODEID:
-            return 16;
-        case UA_DATATYPEKIND_LOCALIZEDTEXT:
-            return 17;
-        case UA_DATATYPEKIND_QUALIFIEDNAME:
-            return 18;
-        default:
-            return -1;
-    }
-}
-
 /**********************/
 /* Parse NumericRange */
 /**********************/

From bedf988180d63368f05661233d65384ce8db569a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 11:23:56 +0200
Subject: [PATCH 0455/1963] refactor(server): Rename
 UA_Server_evaluateWhereClauseContentFilter, fix event filter tests

The filter evaluation is not part of the public server API.
---
 src/server/ua_subscription.h                  | 18 +++----
 src/server/ua_subscription_events.c           |  3 +-
 src/server/ua_subscription_events_filter.c    | 47 ++++++++++---------
 .../server/check_subscription_event_filter.c  |  1 -
 tests/server/check_subscription_events.c      | 46 +++++++-----------
 5 files changed, 51 insertions(+), 64 deletions(-)

diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 5e2294e1ba7..c46b965644c 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -337,19 +337,19 @@ UA_Session_reachedPublishReqLimit(UA_Server *server, UA_Session *session);
 struct UA_ConditionSource;
 typedef struct UA_ConditionSource UA_ConditionSource;
 
-/***********/
-/* Helpers */
-/***********/
-
-/* Evaluate content filter, Only for unit testing */
+/* Evaluate content filter, exported only for unit testing */
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
 UA_StatusCode
-UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
-                                           const UA_NodeId *eventNode,
-                                           const UA_ContentFilter *contentFilter,
-                                           UA_ContentFilterResult *contentFilterResult);
+evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
+                                 const UA_NodeId *eventNode,
+                                 const UA_ContentFilter *contentFilter,
+                                 UA_ContentFilterResult *contentFilterResult);
 #endif
 
+/***********/
+/* Helpers */
+/***********/
+
 /* Setting an integer value within bounds */
 #define UA_BOUNDEDVALUE_SETWBOUNDS(BOUNDS, SRC, DST) { \
         if(SRC > BOUNDS.max) DST = BOUNDS.max;         \
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 6cf65516abe..27ae73f5c9d 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -248,8 +248,7 @@ setHistoricalEvent(UA_Server *server, const UA_NodeId *origin,
     UA_EventFilter *filter = (UA_EventFilter*) historicalEventFilterValue.data;
     UA_EventFieldList efl;
     UA_EventFilterResult result;
-    retval = filterEvent(server, &server->adminSession,
-                         eventNodeId, filter, &efl, &result);
+    retval = filterEvent(server, &server->adminSession, eventNodeId, filter, &efl, &result);
     if(retval == UA_STATUSCODE_GOOD)
         server->config.historyDatabase.setEvent(server, server->config.historyDatabase.context,
                                                 origin, emitNodeId, filter, &efl);
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 62d753c5db1..2ec98096f18 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -1018,10 +1018,10 @@ evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx) {
 
 /* Exposes the filters For unit tests */
 UA_StatusCode
-UA_Server_evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
-                                           const UA_NodeId *eventNode,
-                                           const UA_ContentFilter *contentFilter,
-                                           UA_ContentFilterResult *contentFilterResult) {
+evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
+                                 const UA_NodeId *eventNode,
+                                 const UA_ContentFilter *contentFilter,
+                                 UA_ContentFilterResult *contentFilterResult) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(contentFilter->elementsSize == 0)
         return UA_STATUSCODE_GOOD;
@@ -1053,7 +1053,8 @@ static UA_Boolean
 isValidEvent(UA_Server *server, const UA_NodeId *validEventParent,
              const UA_NodeId *eventId) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    /* find the eventType variableNode */
+
+    /* Find the eventType variableNode */
     UA_QualifiedName findName = UA_QUALIFIEDNAME(0, "EventType");
     UA_BrowsePathResult bpr = browseSimplifiedBrowsePath(server, *eventId, 1, &findName);
     if(bpr.statusCode != UA_STATUSCODE_GOOD || bpr.targetsSize < 1) {
@@ -1075,8 +1076,8 @@ isValidEvent(UA_Server *server, const UA_NodeId *validEventParent,
 
     const UA_NodeId *tEventType = (UA_NodeId*)tOutVariant.data;
 
-    /* check whether the EventType is a Subtype of CondtionType
-     * (Part 9 first implementation) */
+    /* Check whether the EventType is a Subtype of CondtionType (Part 9 first
+     * implementation) */
     UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(validEventParent, &conditionTypeId) &&
        isNodeInTree_singleRef(server, tEventType, &conditionTypeId,
@@ -1086,9 +1087,9 @@ isValidEvent(UA_Server *server, const UA_NodeId *validEventParent,
         return true;
     }
 
-    /*EventType is not a Subtype of CondtionType
-     *(ConditionId Clause won't be present in Events, which are not Conditions)*/
-    /* check whether Valid Event other than Conditions */
+    /* EventType is not a Subtype of CondtionType (ConditionId Clause won't be
+     * present in Events, which are not Conditions) */
+    /* Check whether Valid Event other than Conditions */
     UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
     UA_Boolean isSubtypeOfBaseEvent =
         isNodeInTree_singleRef(server, tEventType, &baseEventTypeId,
@@ -1104,6 +1105,7 @@ filterEvent(UA_Server *server, UA_Session *session,
             const UA_NodeId *eventNode, UA_EventFilter *filter,
             UA_EventFieldList *efl, UA_EventFilterResult *result) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(filter->selectClausesSize == 0)
         return UA_STATUSCODE_BADEVENTFILTERINVALID;
 
@@ -1114,7 +1116,7 @@ filterEvent(UA_Server *server, UA_Session *session,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     efl->eventFieldsSize = filter->selectClausesSize;
 
-    /* empty event filter result */
+    /* Empty event filter result */
     UA_EventFilterResult_init(result);
     result->selectClauseResultsSize = filter->selectClausesSize;
     result->selectClauseResults = (UA_StatusCode *)
@@ -1124,7 +1126,8 @@ filterEvent(UA_Server *server, UA_Session *session,
         UA_EventFilterResult_clear(result);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    /* prepare content filter result structure */
+
+    /* Prepare content filter result structure */
     if(filter->whereClause.elementsSize != 0) {
         result->whereClauseResult.elementResultsSize = filter->whereClause.elementsSize;
         result->whereClauseResult.elementResults = (UA_ContentFilterElementResult *)
@@ -1138,10 +1141,9 @@ filterEvent(UA_Server *server, UA_Session *session,
         for(size_t i = 0; i < result->whereClauseResult.elementResultsSize; ++i) {
             result->whereClauseResult.elementResults[i].operandStatusCodesSize =
             filter->whereClause.elements->filterOperandsSize;
-            result->whereClauseResult.elementResults[i].operandStatusCodes =
-                (UA_StatusCode *)UA_Array_new(
-                    filter->whereClause.elements->filterOperandsSize,
-                    &UA_TYPES[UA_TYPES_STATUSCODE]);
+            result->whereClauseResult.elementResults[i].operandStatusCodes = (UA_StatusCode *)
+                UA_Array_new(filter->whereClause.elements->filterOperandsSize,
+                             &UA_TYPES[UA_TYPES_STATUSCODE]);
             if(!result->whereClauseResult.elementResults[i].operandStatusCodes) {
                 UA_EventFieldList_clear(efl);
                 UA_EventFilterResult_clear(result);
@@ -1150,10 +1152,10 @@ filterEvent(UA_Server *server, UA_Session *session,
         }
     }
 
-    /* Apply the content (where) filter */
+    /* Evaluate the where filter. Do we event need to consider the event? */
     UA_StatusCode res =
-        UA_Server_evaluateWhereClauseContentFilter(server, session, eventNode,
-                                                   &filter->whereClause, &result->whereClauseResult);
+        evaluateWhereClauseContentFilter(server, session, eventNode,
+                                         &filter->whereClause, &result->whereClauseResult);
     if(res != UA_STATUSCODE_GOOD){
         UA_EventFieldList_clear(efl);
         UA_EventFilterResult_clear(result);
@@ -1161,10 +1163,10 @@ filterEvent(UA_Server *server, UA_Session *session,
     }
 
     /* Apply the select filter */
-    /* Check if the browsePath is BaseEventType, in which case nothing more
-     * needs to be checked */
     UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
     for(size_t i = 0; i < filter->selectClausesSize; i++) {
+        /* Check if the browsePath is BaseEventType, in which case nothing more
+         * needs to be checked */
         if(!UA_NodeId_equal(&filter->selectClauses[i].typeDefinitionId, &baseEventTypeId) &&
            !isValidEvent(server, &filter->selectClauses[i].typeDefinitionId, eventNode)) {
             UA_Variant_init(&efl->eventFields[i]);
@@ -1278,7 +1280,8 @@ UA_Event_staticSelectClauseValidation(UA_Server *server,
 
         if(result[i] != UA_STATUSCODE_GOOD)
             continue;
-        /*indexRange is defined ? */
+
+        /* indexRange is defined ? */
         if(!UA_String_equal(&eventFilter->selectClauses[i].indexRange,
                             &UA_STRING_NULL)) {
             /* indexRange is parsable ? */
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index 040503018a4..b3c3bc7e8a7 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -818,7 +818,6 @@ static Suite *testSuite_Client(void) {
     tcase_add_test(tc_server, orderedCompareOperatorValidation);
     tcase_add_test(tc_server, betweenOperatorValidation);
     tcase_add_test(tc_server, inListOperatorValidation);
-
     suite_add_tcase(s, tc_server);
     return s;
 }
diff --git a/tests/server/check_subscription_events.c b/tests/server/check_subscription_events.c
index 8d68de5c9f4..87237304b76 100644
--- a/tests/server/check_subscription_events.c
+++ b/tests/server/check_subscription_events.c
@@ -733,8 +733,8 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = UA_Server_evaluateWhereClauseContentFilter(server, &server->adminSession,
-                                                        &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
+                                              &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -744,7 +744,6 @@ START_TEST(evaluateWhereClause) {
     UA_ContentFilterElement_init(&contentFilterElement);
     contentFilter.elements = &contentFilterElement;
     contentFilter.elementsSize = 1;
-    contentFilter.elements->filterOperandsSize = 6;
     contentFilterElement.filterOperator = UA_FILTEROPERATOR_RELATEDTO;
 
     UA_ContentFilterResult_init(&contentFilterResult);
@@ -768,9 +767,10 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = UA_Server_evaluateWhereClauseContentFilter(server, &server->adminSession, &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
+                                              &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADEVENTFILTERINVALID);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED);
     UA_ContentFilterResult_clear(&contentFilterResult);
 
     contentFilterElement.filterOperator = UA_FILTEROPERATOR_INVIEW;
@@ -794,34 +794,17 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = UA_Server_evaluateWhereClauseContentFilter(server, &server->adminSession, &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
+                                              &eventNodeId, &contentFilter,
+                                              &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADEVENTFILTERINVALID);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED);
     UA_ContentFilterResult_clear(&contentFilterResult);
 
     /* No operand provided */
     contentFilterElement.filterOperator = UA_FILTEROPERATOR_OFTYPE;
-    UA_ContentFilterResult_init(&contentFilterResult);
-    contentFilterResult.elementResultsSize = contentFilter.elementsSize;
-    contentFilterResult.elementResults = (UA_ContentFilterElementResult *)
-        UA_Array_new(contentFilter.elementsSize,
-                     &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
-    if(!contentFilterResult.elementResults) {
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    }
-    for(size_t i = 0; i < contentFilterResult.elementResultsSize; ++i) {
-        contentFilterResult.elementResults[i].operandStatusCodesSize =
-            contentFilter.elements->filterOperandsSize;
-        contentFilterResult.elementResults[i].operandStatusCodes =
-            (UA_StatusCode *)UA_Array_new(
-                contentFilter.elements->filterOperandsSize,
-                &UA_TYPES[UA_TYPES_STATUSCODE]);
-        if(!contentFilterResult.elementResults[i].operandStatusCodes) {
-            ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        }
-    }
     UA_LOCK(&server->serviceMutex);
-    retval = UA_Server_evaluateWhereClauseContentFilter(server, &server->adminSession, &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = UA_Event_staticWhereClauseValidation(server, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -857,7 +840,8 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = UA_Server_evaluateWhereClauseContentFilter(server, &server->adminSession, &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
+                                              &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -886,7 +870,8 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = UA_Server_evaluateWhereClauseContentFilter(server, &server->adminSession, &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
+                                              &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -914,7 +899,8 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = UA_Server_evaluateWhereClauseContentFilter(server, &server->adminSession, &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
+                                              &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADNOMATCH);
     UA_ContentFilterResult_clear(&contentFilterResult);

From fc22a83d44089c3223d1af023ac05c2644c03763 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 11:26:46 +0200
Subject: [PATCH 0456/1963] fix(server): Return statuscode of event filter
 select field lookup

---
 src/server/ua_subscription_events_filter.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 2ec98096f18..a61396e7548 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -1175,9 +1175,11 @@ filterEvent(UA_Server *server, UA_Session *session,
             continue;
         }
 
-        /* TODO: Put the result into the selectClausResults */
-        resolveSimpleAttributeOperand(server, session, eventNode,
-                                      &filter->selectClauses[i], &efl->eventFields[i]);
+        /* Lookup the field. The overall filter can succeed even if a single
+         * select-field cannot be resolved. */
+        result->selectClauseResults[i] =
+            resolveSimpleAttributeOperand(server, session, eventNode,
+                                          &filter->selectClauses[i], &efl->eventFields[i]);
     }
 
     return UA_STATUSCODE_GOOD;

From 92c5e271e4766dbb1e7a3d29c5b55d2b6b082478 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 11:27:34 +0200
Subject: [PATCH 0457/1963] refactor(server): Implement casting between all
 numerical types for filtering

---
 src/server/ua_subscription_events_filter.c | 126 +++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index a61396e7548..87c2528015f 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -153,6 +153,132 @@ implicitCastTargetType(const UA_DataType *t1, const UA_DataType *t2) {
     return targetType;
 }
 
+/* Cast Numerical
+ * --------------
+ * To reduce the number of cases we first "normalize" to either of
+ * Int64/UInt64/Double. Then cast from there to the target type. This works for
+ * all numericals (not only the implicit conversion).
+ *
+ * Numerical conversion rules from the standard:
+ *
+ * - If the conversion fails the result is a null value.
+ * - Floating point values are rounded by adding 0.5 and truncating when they
+ *   are converted to integer values.
+ * - Converting a value that is outside the range of the target type causes a
+ *   conversion error. */
+
+#define UA_CAST_SIGNED(t, T)                                         \
+    if(i < T##_MIN || (i > 0 && (t)i > T##_MAX))                     \
+        return;                                                      \
+    *(t*)data = (t)i;                                                \
+    do { } while(0)
+
+#define UA_CAST_UNSIGNED(t, T)                                       \
+    if(u > T##_MAX)                                                  \
+        return;                                                      \
+    *(t*)data = (t)u;                                                \
+    do { } while(0)
+
+#define UA_CAST_FLOAT(t, T)                                          \
+    if(f + 0.5 < (UA_Double)T##_MIN || f + 0.5 > (UA_Double)T##_MAX) \
+        return;                                                      \
+    *(t*)data = (t)(f + 0.5);                                        \
+    do { } while(0)
+
+/* We can cast between any numerical type. So this can be reused for explicit casting. */
+static void
+castNumerical(const UA_Variant *in, const UA_DataType *type, UA_Variant *out) {
+    UA_assert(UA_Variant_isScalar(in));
+    UA_Variant_init(out); /* Set to null value */
+
+    UA_Int64  i = 0;
+    UA_UInt64 u = 0;
+    UA_Double f = 0.0;
+
+    const UA_DataTypeKind ink = (UA_DataTypeKind)in->type->typeKind;
+    switch(ink) {
+    case UA_DATATYPEKIND_SBYTE:  i = *(UA_SByte*)in->data; break;
+    case UA_DATATYPEKIND_INT16:  i = *(UA_Int16*)in->data; break;
+    case UA_DATATYPEKIND_INT32:  i = *(UA_Int32*)in->data; break;
+    case UA_DATATYPEKIND_INT64:  i = *(UA_Int64*)in->data; break;
+    case UA_DATATYPEKIND_BYTE: /* or */
+    case UA_DATATYPEKIND_BOOLEAN: u = *(UA_Byte*)in->data; break;
+    case UA_DATATYPEKIND_UINT16:  u = *(UA_UInt16*)in->data; break;
+    case UA_DATATYPEKIND_UINT32: /* or */
+    case UA_DATATYPEKIND_STATUSCODE: u = *(UA_UInt32*)in->data; break;
+    case UA_DATATYPEKIND_UINT64: u = *(UA_UInt64*)in->data; break;
+    case UA_DATATYPEKIND_FLOAT:  f = *(UA_Float*)in->data; break;
+    case UA_DATATYPEKIND_DOUBLE: f = *(UA_Double*)in->data; break;
+    default: return;
+    }
+
+    void *data = UA_new(type);
+    if(!data)
+        return;
+
+    if(ink == UA_DATATYPEKIND_SBYTE || ink == UA_DATATYPEKIND_INT16 ||
+       ink == UA_DATATYPEKIND_INT32 || ink == UA_DATATYPEKIND_INT64) {
+        /* Cast from signed */
+        switch(type->typeKind) {
+        case UA_DATATYPEKIND_SBYTE:  UA_CAST_SIGNED(UA_SByte, UA_SBYTE); break;
+        case UA_DATATYPEKIND_INT16:  UA_CAST_SIGNED(UA_Int16, UA_INT16); break;
+        case UA_DATATYPEKIND_INT32:  UA_CAST_SIGNED(UA_Int32, UA_INT32); break;
+        case UA_DATATYPEKIND_INT64:  *(UA_Int64*)data = i; break;
+        case UA_DATATYPEKIND_BYTE:   UA_CAST_SIGNED(UA_Byte, UA_BYTE); break;
+        case UA_DATATYPEKIND_UINT16: UA_CAST_SIGNED(UA_UInt16, UA_UINT16); break;
+        case UA_DATATYPEKIND_UINT32: UA_CAST_SIGNED(UA_UInt32, UA_UINT32); break;
+        case UA_DATATYPEKIND_UINT64: UA_CAST_SIGNED(UA_UInt64, UA_UINT64); break;
+        case UA_DATATYPEKIND_FLOAT:  *(UA_Float*)data = (UA_Float)i; break;
+        case UA_DATATYPEKIND_DOUBLE: *(UA_Double*)data = (UA_Double)i; break;
+        default:
+            UA_free(data);
+            return;
+        }
+    } else if(ink == UA_DATATYPEKIND_BYTE   || ink == UA_DATATYPEKIND_UINT16 ||
+              ink == UA_DATATYPEKIND_UINT32 || ink == UA_DATATYPEKIND_UINT64) {
+        /* Cast from unsigned */
+        switch(type->typeKind) {
+        case UA_DATATYPEKIND_SBYTE:  UA_CAST_UNSIGNED(UA_SByte, UA_SBYTE); break;
+        case UA_DATATYPEKIND_INT16:  UA_CAST_UNSIGNED(UA_Int16, UA_INT16); break;
+        case UA_DATATYPEKIND_INT32:  UA_CAST_UNSIGNED(UA_Int32, UA_INT32); break;
+        case UA_DATATYPEKIND_INT64:  UA_CAST_UNSIGNED(UA_Int64, UA_INT64); break;
+        case UA_DATATYPEKIND_BYTE:   UA_CAST_UNSIGNED(UA_Byte, UA_BYTE); break;
+        case UA_DATATYPEKIND_UINT16: UA_CAST_UNSIGNED(UA_UInt16, UA_UINT16); break;
+        case UA_DATATYPEKIND_UINT32: UA_CAST_UNSIGNED(UA_UInt32, UA_UINT32); break;
+        case UA_DATATYPEKIND_UINT64: *(UA_UInt64*)data = u; break;
+        case UA_DATATYPEKIND_FLOAT:  *(UA_Float*)data = (UA_Float)u; break;
+        case UA_DATATYPEKIND_DOUBLE: *(UA_Double*)data = (UA_Double)u; break;
+        default:
+            UA_free(data);
+            return;
+        }
+    } else {
+        /* Cast from float */
+        if(f != f) {
+            /* NaN cannot be cast */
+            UA_free(data);
+            return;
+        }
+        switch(type->typeKind) {
+        case UA_DATATYPEKIND_SBYTE:  UA_CAST_FLOAT(UA_SByte, UA_SBYTE); break;
+        case UA_DATATYPEKIND_INT16:  UA_CAST_FLOAT(UA_Int16, UA_INT16); break;
+        case UA_DATATYPEKIND_INT32:  UA_CAST_FLOAT(UA_Int32, UA_INT32); break;
+        case UA_DATATYPEKIND_INT64:  UA_CAST_FLOAT(UA_Int64, UA_INT64); break;
+        case UA_DATATYPEKIND_BYTE:   UA_CAST_FLOAT(UA_Byte, UA_BYTE); break;
+        case UA_DATATYPEKIND_UINT16: UA_CAST_FLOAT(UA_UInt16, UA_UINT16); break;
+        case UA_DATATYPEKIND_UINT32: UA_CAST_FLOAT(UA_UInt32, UA_UINT32); break;
+        case UA_DATATYPEKIND_UINT64: UA_CAST_FLOAT(UA_UInt64, UA_UINT64); break;
+        case UA_DATATYPEKIND_FLOAT:  *(UA_Float*)data = (UA_Float)f; break;
+        case UA_DATATYPEKIND_DOUBLE: *(UA_Double*)data = (UA_Double)f; break;
+        default:
+            UA_free(data);
+            return;
+        }
+    }
+
+    UA_Variant_setScalar(out, data, type);
+}
+
 typedef struct {
     UA_Server *server;
     UA_Session *session;

From 37f544768ebc3ad8c9cc76539d35cbc1a095dff1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 11:28:25 +0200
Subject: [PATCH 0458/1963] refactor(server): Rework implicit casting to
 include string casting, etc.

---
 src/server/ua_subscription_events_filter.c | 167 +++++++++++++++++++++
 1 file changed, 167 insertions(+)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 87c2528015f..5998182c5ac 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -279,6 +279,173 @@ castNumerical(const UA_Variant *in, const UA_DataType *type, UA_Variant *out) {
     UA_Variant_setScalar(out, data, type);
 }
 
+/* Implicit Casting
+ * ---------------- */
+
+static UA_INLINE UA_Byte uppercase(UA_Byte in) { return in | 32; }
+
+static UA_StatusCode
+castImplicitFromString(const UA_Variant *in, const UA_DataType *outType, UA_Variant *out) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(outType == &UA_TYPES[UA_TYPES_BOOLEAN]) {
+        /* String -> Boolean
+         *
+         * Part 4 says: String values containing "true", "false", "1" or "0"
+         * can be converted to Boolean values. Other string values cause a
+         * conversion error. In this case Strings are case-insensitive. */
+        UA_Boolean b;
+        const UA_String *inStr = (const UA_String*)in->data;
+        if(inStr->length == 1 && inStr->data[0] == '0') {
+            b = false;
+        } else if(inStr->length == 1 && inStr->data[0] == '1') {
+            b = true;
+        } else if(inStr->length == 4 &&
+                  uppercase(inStr->data[0])== 'T' && uppercase(inStr->data[1])== 'R' &&
+                  uppercase(inStr->data[2])== 'U' && uppercase(inStr->data[3])== 'E') {
+            b = true;
+        } else if(inStr->length == 5              && uppercase(inStr->data[0])== 'F' &&
+                  uppercase(inStr->data[1])== 'A' && uppercase(inStr->data[2])== 'L' &&
+                  uppercase(inStr->data[3])== 'S' && uppercase(inStr->data[4])== 'E') {
+            b = false;
+        } else {
+            return UA_STATUSCODE_BADTYPEMISMATCH;
+        }
+        return UA_Variant_setScalarCopy(out, &b, outType);
+    }
+
+#ifdef UA_ENABLE_PARSING
+    else if(outType == &UA_TYPES[UA_TYPES_GUID]) {
+        /* String -> Guid */
+        UA_Guid guid;
+        res = UA_Guid_parse(&guid, *(UA_String*)in->data);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+        return UA_Variant_setScalarCopy(out, &guid, outType);
+    }
+#endif
+
+#ifdef UA_ENABLE_JSON_ENCODING
+    /* String -> Numerical, uses the JSON decoding */
+    else if(UA_DataType_isNumeric(outType)) {
+        void *outData = UA_new(outType);
+        if(!outData)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        res = UA_decodeJson((const UA_ByteString*)in->data, outData, outType, NULL);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_free(outData);
+            return res;
+        }
+        UA_Variant_setScalar(out, outData, outType);
+        return UA_STATUSCODE_GOOD;
+    }
+#endif
+
+    /* No implicit casting possible */
+    return UA_STATUSCODE_BADTYPEMISMATCH;
+}
+
+static UA_StatusCode
+castImplicit(const UA_Variant *in, const UA_DataType *outType, UA_Variant *out) {
+    /* Of the input is empty, casting results in a NULL value */
+    if(UA_Variant_isEmpty(in)) {
+        UA_Variant_init(out);
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* TODO: We only support scalar values for now */
+    if(!UA_Variant_isScalar(in))
+        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+
+    /* No casting necessary */
+    if(in->type == outType) {
+        *out = *in;
+        out->storageType = UA_VARIANT_DATA_NODELETE;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    switch(in->type->typeKind) {
+    case UA_DATATYPEKIND_EXPANDEDNODEID: {
+        /* ExpandedNodeId -> String */
+        if(outType != &UA_TYPES[UA_TYPES_STRING])
+            break;
+        UA_String *outStr = UA_String_new();
+        if(!outStr)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        res = UA_ExpandedNodeId_print((const UA_ExpandedNodeId*)in->data, outStr);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_free(outStr);
+            break;
+        }
+        UA_Variant_setScalar(out, outStr, outType);
+        break;
+    }
+
+    case UA_DATATYPEKIND_NODEID: {
+        if(outType == &UA_TYPES[UA_TYPES_STRING]) {
+            /* NodeId -> String */
+            UA_String *outStr = UA_String_new();
+            if(!outStr)
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            res = UA_NodeId_print((const UA_NodeId*)in->data, outStr);
+            if(res != UA_STATUSCODE_GOOD) {
+                UA_free(outStr);
+                break;
+            }
+            UA_Variant_setScalar(out, outStr, outType);
+        } else if(outType == &UA_TYPES[UA_TYPES_EXPANDEDNODEID]) {
+            /* NodeId -> ExpandedNodeId */
+            UA_ExpandedNodeId *eid = UA_ExpandedNodeId_new();
+            if(!eid)
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            res = UA_NodeId_copy((const UA_NodeId*)in->data, &eid->nodeId);
+            if(res != UA_STATUSCODE_GOOD) {
+                UA_free(eid);
+                break;
+            }
+            UA_Variant_setScalar(out, eid, outType);
+        }
+        break;
+    }
+
+    case UA_DATATYPEKIND_STRING:
+        res = castImplicitFromString(in, outType, out);
+        break;
+
+    case UA_DATATYPEKIND_LOCALIZEDTEXT: {
+        if(outType != &UA_TYPES[UA_TYPES_STRING])
+            break;
+        /* LocalizedText -> String */
+        UA_LocalizedText *inLT = (UA_LocalizedText*)in->data;
+        res = UA_Variant_setScalarCopy(out, &inLT->text, outType);
+        break;
+    }
+
+    case UA_DATATYPEKIND_QUALIFIEDNAME: {
+        UA_QualifiedName *inQN = (UA_QualifiedName*)in->data;
+        if(outType == &UA_TYPES[UA_TYPES_STRING]) {
+            /* QualifiedName -> String */
+            res = UA_Variant_setScalarCopy(out, &inQN->name, outType);
+        } else if(outType == &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]) {
+            /* QualifiedName -> LocalizedText */
+            UA_LocalizedText lt;
+            lt.text = inQN->name;
+            lt.locale = UA_STRING_NULL;
+            res = UA_Variant_setScalarCopy(out, &lt, outType);
+        }
+        break;
+    }
+
+    default:
+        /* Try casting between numericals (also works for Boolean and StatusCode
+         * input). The conversion can fail if the limits of the output type are
+         * exceeded and then results in a NULL value. */
+        castNumerical(in, outType, out);
+    }
+
+    return res;
+}
+
 typedef struct {
     UA_Server *server;
     UA_Session *session;

From 63e97990355536bfac28dc6ac02d8f260b4f33f1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Sep 2022 11:29:39 +0200
Subject: [PATCH 0459/1963] refactor(server): Small rework in
 resolveSimpleAttributeOperand

---
 src/server/ua_subscription_events_filter.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 5998182c5ac..d3bf761207f 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -539,12 +539,17 @@ resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session,
         UA_BrowsePathResult_clear(&bpr);
     }
 
-    /* Move the result to the output */
-    if(v.status == UA_STATUSCODE_GOOD && v.hasValue)
-        *value = v.value;
-    else
+    /* Validate the result */
+    if(v.status != UA_STATUSCODE_GOOD) {
         UA_Variant_clear(&v.value);
-    return v.status;
+        return v.status;
+    }
+    if(!v.hasValue)
+        return UA_STATUSCODE_BADNODATAAVAILABLE;
+
+    /* Move the result to the output */
+    *value = v.value;
+    return UA_STATUSCODE_GOOD;
 }
 
 /* Resolve operands to variants according to the operand type.

From 64e21f7303c548da9e7bf1f95c2ee0a41107925e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 12 Sep 2022 13:04:16 +0200
Subject: [PATCH 0460/1963] refactor(server): Simplify the event filter
 validation; adjust internal API

---
 src/server/ua_services_monitoreditem.c        |  71 ++-
 src/server/ua_subscription.h                  |  51 +-
 .../ua_subscription_alarms_conditions.c       |  27 +-
 src/server/ua_subscription_events.c           |  10 +-
 src/server/ua_subscription_events_filter.c    | 449 +++++++++---------
 tests/server/check_subscription_events.c      |  42 +-
 6 files changed, 317 insertions(+), 333 deletions(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 74fe37d8f21..e7ca5759f18 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -259,49 +259,46 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
 static UA_StatusCode
 checkEventFilterParam(UA_Server *server, UA_Session *session,
                       const UA_MonitoredItem *mon,
-                      UA_MonitoringParameters *params){
+                      UA_MonitoringParameters *params) {
+    /* Is an Event MonitoredItem? */
     if(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER)
         return UA_STATUSCODE_GOOD;
 
-    UA_EventFilter *eventFilter =
-        (UA_EventFilter *) params->filter.content.decoded.data;
+    /* Correct data type? */
+    if(params->filter.encoding != UA_EXTENSIONOBJECT_DECODED &&
+       params->filter.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE)
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+    if(params->filter.content.decoded.type != &UA_TYPES[UA_TYPES_EVENTFILTER])
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    UA_EventFilter *eventFilter = (UA_EventFilter *)params->filter.content.decoded.data;
 
-    if(eventFilter == NULL)
+    /* Correct number of elements? */
+    if(eventFilter->selectClausesSize == 0 ||
+       eventFilter->selectClausesSize > UA_EVENTFILTER_MAXELEMENTS)
         return UA_STATUSCODE_BADEVENTFILTERINVALID;
 
-    //TODO make the maximum select clause size param an server-config parameter
-    if(eventFilter->selectClausesSize > 128)
-        return UA_STATUSCODE_BADCONFIGURATIONERROR;
-
-    //check the where clause for logical consistency
-    if(eventFilter->whereClause.elementsSize != 0) {
-        UA_ContentFilterResult contentFilterResult;
-        UA_Event_staticWhereClauseValidation(server, &eventFilter->whereClause,
-                                             &contentFilterResult);
-        for(size_t i = 0; i < contentFilterResult.elementResultsSize; ++i) {
-            if(contentFilterResult.elementResults[i].statusCode != UA_STATUSCODE_GOOD){
-                //ToDo currently we return the first non good status code, check if
-                //we can use the detailed contentFilterResult later
-                UA_StatusCode whereResult =
-                    contentFilterResult.elementResults[i].statusCode;
-                UA_ContentFilterResult_clear(&contentFilterResult);
-                return whereResult;
-            }
-        }
-        UA_ContentFilterResult_clear(&contentFilterResult);
-    }
-    //check the select clause for logical consistency
-    UA_StatusCode selectClauseValidationResult[128];
-    UA_Event_staticSelectClauseValidation(server,eventFilter,
-                                          selectClauseValidationResult);
-    for(size_t i = 0; i < eventFilter->selectClausesSize; ++i){
-        //ToDo currently we return the first non good status code, check if
-        //we can use the detailed status code list later
-        if(selectClauseValidationResult[i] != UA_STATUSCODE_GOOD){
-            return selectClauseValidationResult[i];
-        }
-    }
+    /* Allow empty where clauses --> select every event */
+    if(eventFilter->whereClause.elementsSize > UA_EVENTFILTER_MAXELEMENTS)
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    /* Check the where clause for logical consistency */
+    UA_ContentFilterResult cfr;
+    UA_StatusCode res = UA_ContentFilterValidation(server, &eventFilter->whereClause, &cfr);
+    UA_ContentFilterResult_clear(&cfr);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
 
+    /* Acceptable number of select clauses */
+    if(eventFilter->selectClausesSize > UA_EVENTFILTER_MAXSELECT)
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    /* Check the select clause for consistency */
+    for(size_t i = 0; i < eventFilter->selectClausesSize; i++) {
+        res = UA_SimpleAttributeOperandValidation(server, &eventFilter->selectClauses[i]);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+    }
     return UA_STATUSCODE_GOOD;
 }
 #endif
@@ -448,7 +445,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
                                                          valueType, &newMon->parameters);
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
     result->statusCode |= checkEventFilterParam(server, session, newMon,
-                                                         &newMon->parameters);
+                                                &newMon->parameters);
 #endif
     if(result->statusCode != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, cmc->sub,
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index c46b965644c..e184d7572db 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -200,23 +200,6 @@ UA_MonitoredItem_createDataChangeNotification(UA_Server *server,
                                               UA_MonitoredItem *mon,
                                               const UA_DataValue *value);
 
-UA_StatusCode
-UA_Event_addEventToMonitoredItem(UA_Server *server, const UA_NodeId *event,
-                                 UA_MonitoredItem *mon);
-
-UA_StatusCode
-UA_Event_generateEventId(UA_ByteString *generatedId);
-
-void
-UA_Event_staticSelectClauseValidation(UA_Server *server,
-                                      const UA_EventFilter *eventFilter,
-                                      UA_StatusCode *result);
-
-UA_StatusCode
-UA_Event_staticWhereClauseValidation(UA_Server *server,
-                                     const UA_ContentFilter *filter,
-                                     UA_ContentFilterResult *);
-
 /* Remove entries until mon->maxQueueSize is reached. Sets infobits for lost
  * data if required. */
 void
@@ -337,13 +320,37 @@ UA_Session_reachedPublishReqLimit(UA_Server *server, UA_Session *session);
 struct UA_ConditionSource;
 typedef struct UA_ConditionSource UA_ConditionSource;
 
-/* Evaluate content filter, exported only for unit testing */
+/* Event Handling */
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
+
+#define UA_EVENTFILTER_MAXELEMENTS 64 /* Max operator elements */
+#define UA_EVENTFILTER_MAXOPERANDS 64 /* Max operands per operator */
+#define UA_EVENTFILTER_MAXSELECT   64 /* Max select clauses */
+
 UA_StatusCode
-evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
-                                 const UA_NodeId *eventNode,
-                                 const UA_ContentFilter *contentFilter,
-                                 UA_ContentFilterResult *contentFilterResult);
+UA_MonitoredItem_addEvent(UA_Server *server, UA_MonitoredItem *mon,
+                          const UA_NodeId *event);
+
+UA_StatusCode
+generateEventId(UA_ByteString *generatedId);
+
+/* Static validation when the filter is registered */
+UA_StatusCode
+UA_SimpleAttributeOperandValidation(UA_Server *server,
+                                    UA_SimpleAttributeOperand *sao);
+
+/* Static validation when the filter is registered */
+UA_StatusCode
+UA_ContentFilterValidation(UA_Server *server,
+                           const UA_ContentFilter *filter,
+                           UA_ContentFilterResult *result);
+
+/* Evaluate content filter, exported only for unit testing */
+UA_StatusCode
+evaluateWhereClause(UA_Server *server, UA_Session *session, const UA_NodeId *eventNode,
+                    const UA_ContentFilter *contentFilter,
+                    UA_ContentFilterResult *contentFilterResult);
+
 #endif
 
 /***********/
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 917dfca29c8..899060ce01c 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -1523,7 +1523,7 @@ setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodI
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent ReceiveTime failed",);
 
     /* Set EventId */
-    retval = UA_Event_generateEventId(&eventId);
+    retval = generateEventId(&eventId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Generating EventId failed",);
 
     UA_Variant_setScalar(&value, &eventId, &UA_TYPES[UA_TYPES_BYTESTRING]);
@@ -1574,8 +1574,7 @@ isConditionSourceInMonitoredItem(UA_Server *server, const UA_MonitoredItem *moni
     refs = UA_ReferenceTypeSet_union(refs, UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASCOMPONENT));
     refs = UA_ReferenceTypeSet_union(refs, UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASEVENTSOURCE));
     refs = UA_ReferenceTypeSet_union(refs, UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASNOTIFIER));
-    return isNodeInTree(server, conditionSource,
-                        &monitoredItem->itemToMonitor.nodeId, &refs);
+    return isNodeInTree(server, conditionSource, &monitoredItem->itemToMonitor.nodeId, &refs);
 }
 
 static UA_StatusCode
@@ -1588,10 +1587,10 @@ refreshLogic(UA_Server *server, const UA_NodeId *refreshStartNodId,
     UA_DateTime fieldTimeValue = UA_DateTime_now();
     UA_StatusCode retval =
         writeObjectProperty_scalar(server, *refreshStartNodId, fieldTimeQN,
-                                             &fieldTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
+                                   &fieldTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Write Object Property scalar failed",);
 
-    retval = UA_Event_addEventToMonitoredItem(server, refreshStartNodId, monitoredItem);
+    retval = UA_MonitoredItem_addEvent(server, monitoredItem, refreshStartNodId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Events: Could not add the event to a listening node",);
 
     /* 2. Refresh (see 5.5.7) */
@@ -1630,7 +1629,7 @@ refreshLogic(UA_Server *server, const UA_NodeId *refreshStartNodId,
                     continue;
 
                 /* Add the event */
-                retval = UA_Event_addEventToMonitoredItem(server, &triggeredNode, monitoredItem);
+                retval = UA_MonitoredItem_addEvent(server, monitoredItem, &triggeredNode);
                 CONDITION_ASSERT_RETURN_RETVAL(retval, "Events: Could not add the event to a listening node",);
             }
         }
@@ -1639,9 +1638,9 @@ refreshLogic(UA_Server *server, const UA_NodeId *refreshStartNodId,
     /* 3. Trigger RefreshEndEvent */
     fieldTimeValue = UA_DateTime_now();
     retval = writeObjectProperty_scalar(server, *refreshEndNodId, fieldTimeQN,
-                                                  &fieldTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
+                                        &fieldTimeValue, &UA_TYPES[UA_TYPES_DATETIME]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Write Object Property scalar failed",);
-    return UA_Event_addEventToMonitoredItem(server, refreshEndNodId, monitoredItem);
+    return UA_MonitoredItem_addEvent(server, monitoredItem, refreshEndNodId);
 }
 
 static UA_StatusCode
@@ -1666,7 +1665,8 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     UA_StatusCode retval = setRefreshMethodEvents(server,
                                                   &refreshEvents[REFRESHEVENT_START_IDX],
                                                   &refreshEvents[REFRESHEVENT_END_IDX]);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",UA_UNLOCK(&server->serviceMutex););
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",
+                                   UA_UNLOCK(&server->serviceMutex););
 
     /* Trigger RefreshStartEvent and RefreshEndEvent for the each monitoredItem
      * in the subscription */
@@ -1680,7 +1680,8 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     //TODO when there are a lot of monitoreditems (not only events)?
     retval = refreshLogic(server, &refreshEvents[REFRESHEVENT_START_IDX],
                           &refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",UA_UNLOCK(&server->serviceMutex););
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",
+                                   UA_UNLOCK(&server->serviceMutex););
     UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
@@ -1707,7 +1708,8 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     UA_StatusCode retval =
         setRefreshMethodEvents(server, &refreshEvents[REFRESHEVENT_START_IDX],
                                &refreshEvents[REFRESHEVENT_END_IDX]);
-    CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",UA_UNLOCK(&server->serviceMutex););
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",
+                                   UA_UNLOCK(&server->serviceMutex););
 
     /* Trigger RefreshStartEvent and RefreshEndEvent for the each monitoredItem
      * in the subscription */
@@ -1716,7 +1718,8 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     LIST_FOREACH(monitoredItem, &subscription->monitoredItems, listEntry) {
         retval = refreshLogic(server, &refreshEvents[REFRESHEVENT_START_IDX],
                               &refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
-        CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",UA_UNLOCK(&server->serviceMutex););
+        CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",
+                                       UA_UNLOCK(&server->serviceMutex););
     }
     UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 27ae73f5c9d..774c63f46af 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -14,7 +14,7 @@
 
 /* We use a 16-Byte ByteString as an identifier */
 UA_StatusCode
-UA_Event_generateEventId(UA_ByteString *generatedId) {
+generateEventId(UA_ByteString *generatedId) {
     /* EventId is a ByteString, which is basically just a string
      * We will use a 16-Byte ByteString as an identifier */
     UA_StatusCode res = UA_ByteString_allocBuffer(generatedId, 16 * sizeof(UA_Byte));
@@ -144,7 +144,7 @@ eventSetStandardFields(UA_Server *server, const UA_NodeId *event,
 
     /* Set the EventId */
     UA_ByteString eventId = UA_BYTESTRING_NULL;
-    retval = UA_Event_generateEventId(&eventId);
+    retval = generateEventId(&eventId);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
     name = UA_QUALIFIEDNAME(0, "EventId");
@@ -177,8 +177,8 @@ eventSetStandardFields(UA_Server *server, const UA_NodeId *event,
 /* Filters an event according to the filter specified by mon and then adds it to
  * mons notification queue */
 UA_StatusCode
-UA_Event_addEventToMonitoredItem(UA_Server *server, const UA_NodeId *event,
-                                 UA_MonitoredItem *mon) {
+UA_MonitoredItem_addEvent(UA_Server *server, UA_MonitoredItem *mon,
+                          const UA_NodeId *event) {
     UA_Notification *notification = UA_Notification_new();
     if(!notification)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -393,7 +393,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
             /* Is this an Event-MonitoredItem? */
             if(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER)
                 continue;
-            retval = UA_Event_addEventToMonitoredItem(server, &eventNodeId, mon);
+            retval = UA_MonitoredItem_addEvent(server, mon, &eventNodeId);
             if(retval != UA_STATUSCODE_GOOD) {
                 UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                                "Events: Could not add the event to a listening "
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index d3bf761207f..e414a3d57cf 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -1316,10 +1316,9 @@ evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx) {
 
 /* Exposes the filters For unit tests */
 UA_StatusCode
-evaluateWhereClauseContentFilter(UA_Server *server, UA_Session *session,
-                                 const UA_NodeId *eventNode,
-                                 const UA_ContentFilter *contentFilter,
-                                 UA_ContentFilterResult *contentFilterResult) {
+evaluateWhereClause(UA_Server *server, UA_Session *session, const UA_NodeId *eventNode,
+                    const UA_ContentFilter *contentFilter,
+                    UA_ContentFilterResult *contentFilterResult) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(contentFilter->elementsSize == 0)
         return UA_STATUSCODE_GOOD;
@@ -1451,9 +1450,8 @@ filterEvent(UA_Server *server, UA_Session *session,
     }
 
     /* Evaluate the where filter. Do we event need to consider the event? */
-    UA_StatusCode res =
-        evaluateWhereClauseContentFilter(server, session, eventNode,
-                                         &filter->whereClause, &result->whereClauseResult);
+    UA_StatusCode res = evaluateWhereClause(server, session, eventNode, &filter->whereClause,
+                                            &result->whereClauseResult);
     if(res != UA_STATUSCODE_GOOD){
         UA_EventFieldList_clear(efl);
         UA_EventFilterResult_clear(result);
@@ -1494,256 +1492,235 @@ filterEvent(UA_Server *server, UA_Session *session,
  * - Check if browsePath contains null
  * - Check if indexRange is defined and if it is parsable
  * - Check if attributeId is value */
-void
-UA_Event_staticSelectClauseValidation(UA_Server *server,
-                                      const UA_EventFilter *eventFilter,
-                                      UA_StatusCode *result) {
-    /* The selectClause only has to be checked, if the size is not zero */
-    if(eventFilter->selectClausesSize == 0)
-        return;
-    for(size_t i = 0; i < eventFilter->selectClausesSize; ++i) {
-        result[i] = UA_STATUSCODE_GOOD;
-        /* /typedefenitionid or browsepath of any clause is not NULL ? */
-        if(UA_NodeId_isNull(&eventFilter->selectClauses[i].typeDefinitionId)) {
-            result[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
-            continue;
-        }
-        /*ToDo: Check the following workaround. In UaExpert Event View the selection
-        * of the Server Object set up 7 select filter entries by default. The last
-        * element ist  from node 2782 (A&C ConditionType). Since the reduced
-        * information model dos not contain this type, the result has a brows path of
-        * "null" which results in an error. */
-        UA_NodeId ac_conditionType = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
-        if(UA_NodeId_equal(&eventFilter->selectClauses[i].typeDefinitionId, &ac_conditionType)) {
-            continue;
-        }
-        if(&eventFilter->selectClauses[i].browsePath[0] == NULL) {
-            result[i] = UA_STATUSCODE_BADBROWSENAMEINVALID;
-            continue;
-        }
-        /* eventType is a subtype of BaseEventType ? */
-        UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
-        if(!isNodeInTree_singleRef(
-            server, &eventFilter->selectClauses[i].typeDefinitionId,
-            &baseEventTypeId, UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-            result[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
-            continue;
-        }
-        /* attributeId is valid ? */
-        if(!((0 < eventFilter->selectClauses[i].attributeId) &&
-             (eventFilter->selectClauses[i].attributeId < 28))) {
-            result[i] = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
-            continue;
-        }
-        /* browsePath contains null ? */
-        for(size_t j = 0; j < eventFilter->selectClauses[i].browsePathSize; ++j) {
-            if(UA_QualifiedName_isNull(
-                &eventFilter->selectClauses[i].browsePath[j])) {
-                result[i] = UA_STATUSCODE_BADBROWSENAMEINVALID;
-                break;
-            }
-        }
+UA_StatusCode
+UA_SimpleAttributeOperandValidation(UA_Server *server,
+                                    UA_SimpleAttributeOperand *sao) {
+    /* TypeDefinition is not NULL? */
+    if(UA_NodeId_isNull(&sao->typeDefinitionId))
+        return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
 
-        /* Get the list of Subtypes from current node */
-        UA_ReferenceTypeSet reftypes_interface =
-                UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASSUBTYPE);
-        UA_ExpandedNodeId *chilTypeNodes = NULL;
-        size_t chilTypeNodesSize = 0;
-        UA_StatusCode res;
-        res = browseRecursive(server, 1, &eventFilter->selectClauses[i].typeDefinitionId,
-                        UA_BROWSEDIRECTION_FORWARD, &reftypes_interface, UA_NODECLASS_OBJECTTYPE,
-                        true, &chilTypeNodesSize, &chilTypeNodes);
-        if(res!=UA_STATUSCODE_GOOD){
-            result[i] = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
-            continue;
+    /* EventType is a subtype of BaseEventType? */
+    UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
+    if(!isNodeInTree_singleRef(server, &sao->typeDefinitionId,
+                               &baseEventTypeId, UA_REFERENCETYPEINDEX_HASSUBTYPE))
+        return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
+
+    /* AttributeId is valid ? */
+    if(sao->attributeId == 0 || sao->attributeId >= 28)
+        return UA_STATUSCODE_BADATTRIBUTEIDINVALID;
+
+    /* BrowsePath not empty?
+     *
+     * TODO: Check the following workaround. In UaExpert Event View the
+     * selection of the Server Object set up 7 select filter entries by default.
+     * The last element ist from node 2782 (A&C ConditionType). Since the
+     * reduced information model dos not contain this type, the result has a
+     * browse path of "null" which results in an error. */
+    UA_NodeId ac_conditionType = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
+    if(!UA_NodeId_equal(&sao->typeDefinitionId, &ac_conditionType) &&
+       sao->browsePathSize == 0)
+        return UA_STATUSCODE_BADBROWSENAMEINVALID;
+
+    /* browsePath contains empty browsenames? */
+    for(size_t j = 0; j < sao->browsePathSize; ++j) {
+        if(UA_QualifiedName_isNull(&sao->browsePath[j]))
+            return UA_STATUSCODE_BADBROWSENAMEINVALID;
+    }
+
+    /* Get the list of subtypes from event type (including the event type) */
+    UA_ReferenceTypeSet reftypes_interface =
+        UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASSUBTYPE);
+    UA_ExpandedNodeId *childTypeNodes = NULL;
+    size_t childTypeNodesSize = 0;
+    UA_StatusCode res = browseRecursive(server, 1, &sao->typeDefinitionId,
+                                        UA_BROWSEDIRECTION_FORWARD, &reftypes_interface,
+                                        UA_NODECLASS_OBJECTTYPE, true, &childTypeNodesSize,
+                                        &childTypeNodes);
+    if(res != UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BADATTRIBUTEIDINVALID;
+
+    /* Is the browse path valid for one of them? */
+    UA_Boolean subTypeContainField = false;
+    for(size_t j = 0; j < childTypeNodesSize && !subTypeContainField; j++) {
+        UA_BrowsePathResult bpr =
+            browseSimplifiedBrowsePath(server, childTypeNodes[j].nodeId,
+                                       sao->browsePathSize, sao->browsePath);
+
+        if(bpr.statusCode == UA_STATUSCODE_GOOD && bpr.targetsSize > 0)
+            subTypeContainField = true;
+        UA_BrowsePathResult_clear(&bpr);
+    }
+
+    UA_Array_delete(childTypeNodes, childTypeNodesSize, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
+
+    if(!subTypeContainField)
+        return UA_STATUSCODE_BADNODEIDUNKNOWN;
+
+    /* IndexRange is defined ? */
+    if(!UA_String_isEmpty(&sao->indexRange)) {
+        UA_NumericRange numericRange = UA_NUMERICRANGE("");
+        if(UA_NumericRange_parse(&numericRange, sao->indexRange) != UA_STATUSCODE_GOOD)
+            return UA_STATUSCODE_BADINDEXRANGEINVALID;
+        UA_free(numericRange.dimensions);
+
+        /* AttributeId is value? */
+        if(sao->attributeId != UA_ATTRIBUTEID_VALUE)
+            return UA_STATUSCODE_BADTYPEMISMATCH;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_ContentFilterElementResult
+UA_ContentFilterElementValidation(UA_Server *server, size_t operatorIndex,
+                                  size_t operatorsCount, UA_ContentFilterElement *ef) {
+    /* Initialize the result structure */
+    UA_ContentFilterElementResult er;
+    UA_ContentFilterElementResult_init(&er);
+    er.operandStatusCodes = (UA_StatusCode *)
+        UA_Array_new(ef->filterOperandsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
+    if(!er.operandStatusCodes) {
+        er.statusCode = UA_STATUSCODE_BADOUTOFMEMORY;
+        return er;
+    }
+    er.operandStatusCodesSize = ef->filterOperandsSize;
+
+    /* Is the operator in the defined range? Test this before the following
+     * jumptable lookup. */
+    if(ef->filterOperator < 0 || ef->filterOperator > UA_FILTEROPERATOR_BITWISEOR) {
+        er.statusCode = UA_STATUSCODE_BADEVENTFILTERINVALID;
+        return er;
+    }
+
+    /* Number of operands supported for the operator? */
+    if(ef->filterOperandsSize < operatorJumptable[ef->filterOperator].minOperatorCount ||
+       ef->filterOperandsSize > operatorJumptable[ef->filterOperator].maxOperatorCount) {
+        er.statusCode = UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
+        return er;
+    }
+
+    /* Generic validation of the operands */
+    for(size_t i = 0; i < ef->filterOperandsSize; i++) {
+        /* Must be a decoded ExtensionObject */
+        UA_ExtensionObject *op = &ef->filterOperands[i];
+        if(op->encoding != UA_EXTENSIONOBJECT_DECODED &&
+           op->encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) {
+            er.operandStatusCodes[i] = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+            er.statusCode = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+            return er;
         }
 
-        UA_Boolean subTypeContainField = false;
-        for (size_t j = 0; j < chilTypeNodesSize; ++j) {
-            /* browsPath element is defined in path */
-            UA_BrowsePathResult bpr =
-                    browseSimplifiedBrowsePath(server, chilTypeNodes[j].nodeId,
-                                               eventFilter->selectClauses[i].browsePathSize,
-                                               eventFilter->selectClauses[i].browsePath);
-
-            if(bpr.statusCode != UA_STATUSCODE_GOOD){
-                UA_BrowsePathResult_clear(&bpr);
-                continue;
+        /* Supported type and conforming to the rules? */
+        if(op->content.decoded.type == &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
+            /* Part 4, 7.4.4.2 defines conditions for Element Operands: An index
+             * is considered valid if its value is greater than the element
+             * index it is part of and it does not Reference a non-existent
+             * element. Clients shall construct filters in this way to avoid
+             * circular and invalid References. */
+            UA_ElementOperand *eo = (UA_ElementOperand *)op->content.decoded.data;
+            if(eo->index <= operatorIndex || eo->index >= operatorsCount) {
+                er.operandStatusCodes[i] = UA_STATUSCODE_BADINDEXRANGEINVALID;
+                er.statusCode = UA_STATUSCODE_BADINDEXRANGEINVALID;
+                return er;
             }
-            subTypeContainField = true;
-            UA_BrowsePathResult_clear(&bpr);
+        } else if(op->content.decoded.type == &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]) {
+            er.operandStatusCodes[i] = UA_STATUSCODE_BADNOTSUPPORTED;
+            er.statusCode = UA_STATUSCODE_BADFILTERNOTALLOWED;
+            return er;
+        } else if(op->content.decoded.type != &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND] &&
+                  op->content.decoded.type != &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
+            er.operandStatusCodes[i] = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+            er.statusCode = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+            return er;
         }
-        if(!subTypeContainField)
-            result[i] = UA_STATUSCODE_BADNODEIDUNKNOWN;
+    }
 
-        UA_Array_delete(chilTypeNodes, chilTypeNodesSize, &UA_TYPES[UA_TYPES_EXPANDEDNODEID]);
+    /* Specific validations for different operators */
+    switch(ef->filterOperator) {
+        case UA_FILTEROPERATOR_INVIEW:
+        case UA_FILTEROPERATOR_RELATEDTO:
+            /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
+            er.statusCode = UA_STATUSCODE_BADEVENTFILTERINVALID;
+            break;
 
-        if(result[i] != UA_STATUSCODE_GOOD)
-            continue;
+        case UA_FILTEROPERATOR_EQUALS:
+        case UA_FILTEROPERATOR_GREATERTHAN:
+        case UA_FILTEROPERATOR_LESSTHAN:
+        case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
+        case UA_FILTEROPERATOR_LESSTHANOREQUAL:
+        case UA_FILTEROPERATOR_BITWISEAND:
+        case UA_FILTEROPERATOR_BITWISEOR:
+        case UA_FILTEROPERATOR_BETWEEN:
+        case UA_FILTEROPERATOR_INLIST:
+        case UA_FILTEROPERATOR_AND:
+        case UA_FILTEROPERATOR_OR:
+        case UA_FILTEROPERATOR_ISNULL:
+        case UA_FILTEROPERATOR_NOT:
+            break;
 
-        /* indexRange is defined ? */
-        if(!UA_String_equal(&eventFilter->selectClauses[i].indexRange,
-                            &UA_STRING_NULL)) {
-            /* indexRange is parsable ? */
-            UA_NumericRange numericRange = UA_NUMERICRANGE("");
-            if(UA_NumericRange_parse(&numericRange,
-                                     eventFilter->selectClauses[i].indexRange) !=
-               UA_STATUSCODE_GOOD) {
-                result[i] = UA_STATUSCODE_BADINDEXRANGEINVALID;
-                continue;
+        case UA_FILTEROPERATOR_OFTYPE: {
+            /* Make sure the operand is a NodeId literal */
+            UA_ExtensionObject *o = &ef->filterOperands[0];
+            UA_LiteralOperand *lo = (UA_LiteralOperand *)o->content.decoded.data;
+            if(o->content.decoded.type != &UA_TYPES[UA_TYPES_LITERALOPERAND] ||
+               !UA_Variant_hasScalarType(&lo->value, &UA_TYPES[UA_TYPES_NODEID])) {
+                er.operandStatusCodes[0] = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+                er.statusCode = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+                break;
             }
-            UA_free(numericRange.dimensions);
-            /* attributeId is value ? */
-            if(eventFilter->selectClauses[i].attributeId != UA_ATTRIBUTEID_VALUE) {
-                result[i] = UA_STATUSCODE_BADTYPEMISMATCH;
-                continue;
+
+            /* Make sure the operand is a subtype of BaseEventType */
+            UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
+            if(!isNodeInTree_singleRef(server, (UA_NodeId *)lo->value.data, &baseEventTypeId,
+                                       UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+                er.operandStatusCodes[0] = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+                er.statusCode = UA_STATUSCODE_BADFILTEROPERANDINVALID;
+                break;
             }
+            break;
         }
+
+        case UA_FILTEROPERATOR_LIKE:
+        case UA_FILTEROPERATOR_CAST:
+            er.statusCode = UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
+            break;
+
+        default:
+            er.statusCode = UA_STATUSCODE_BADFILTEROPERATORINVALID;
+            break;
     }
+    return er;
 }
 
 /* Initial content filter (where clause) check. Current checks:
- * - Number of operands for each (supported) operator */
+ * - Number of operands for each (supported) operator
+ * - ElementOperands point forward only */
 UA_StatusCode
-UA_Event_staticWhereClauseValidation(UA_Server *server,
-                                     const UA_ContentFilter *filter,
-                                     UA_ContentFilterResult *result) {
+UA_ContentFilterValidation(UA_Server *server, const UA_ContentFilter *filter,
+                           UA_ContentFilterResult *result) {
     UA_ContentFilterResult_init(result);
-    result->elementResultsSize = filter->elementsSize;
-    if(result->elementResultsSize == 0)
+    if(filter->elementsSize == 0)
         return UA_STATUSCODE_GOOD;
-    result->elementResults =
-        (UA_ContentFilterElementResult *)UA_Array_new(
-            result->elementResultsSize,
-            &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+
+    if(filter->elementsSize > UA_EVENTFILTER_MAXELEMENTS)
+        return UA_STATUSCODE_BADEVENTFILTERINVALID;
+
+    /* Allocate memory for the results */
+    result->elementResults = (UA_ContentFilterElementResult *)
+        UA_Array_new(filter->elementsSize, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
     if(!result->elementResults)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    for(size_t i = 0; i < result->elementResultsSize; ++i) {
-        UA_ContentFilterElementResult *er = &result->elementResults[i];
-        UA_ContentFilterElement ef = filter->elements[i];
-        UA_ContentFilterElementResult_init(er);
-        er->operandStatusCodes =
-            (UA_StatusCode *)UA_Array_new(
-                ef.filterOperandsSize,
-                &UA_TYPES[UA_TYPES_STATUSCODE]);
-        er->operandStatusCodesSize = ef.filterOperandsSize;
-
-        switch(ef.filterOperator) {
-            case UA_FILTEROPERATOR_INVIEW:
-            case UA_FILTEROPERATOR_RELATEDTO: {
-                /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
-                er->statusCode =
-                    UA_STATUSCODE_BADEVENTFILTERINVALID;
-                break;
-            }
-            case UA_FILTEROPERATOR_EQUALS:
-            case UA_FILTEROPERATOR_GREATERTHAN:
-            case UA_FILTEROPERATOR_LESSTHAN:
-            case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
-            case UA_FILTEROPERATOR_LESSTHANOREQUAL:
-            case UA_FILTEROPERATOR_LIKE:
-            case UA_FILTEROPERATOR_CAST:
-            case UA_FILTEROPERATOR_BITWISEAND:
-            case UA_FILTEROPERATOR_BITWISEOR: {
-                if(ef.filterOperandsSize != 2) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_AND:
-            case UA_FILTEROPERATOR_OR: {
-                if(ef.filterOperandsSize != 2) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                for(size_t j = 0; j < 2; ++j) {
-                    if(ef.filterOperands[j].content.decoded.type !=
-                       &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
-                        er->operandStatusCodes[j] =
-                            UA_STATUSCODE_BADFILTEROPERANDINVALID;
-                        er->statusCode =
-                            UA_STATUSCODE_BADFILTEROPERANDINVALID;
-                        break;
-                    }
-                    if(((UA_ElementOperand *)ef.filterOperands[j]
-                        .content.decoded.data)->index > filter->elementsSize - 1) {
-                        er->operandStatusCodes[j] =
-                            UA_STATUSCODE_BADINDEXRANGEINVALID;
-                        er->statusCode =
-                            UA_STATUSCODE_BADINDEXRANGEINVALID;
-                        break;
-                    }
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_ISNULL:
-            case UA_FILTEROPERATOR_NOT: {
-                if(ef.filterOperandsSize != 1) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_INLIST: {
-                if(ef.filterOperandsSize <= 2) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_BETWEEN: {
-                if(ef.filterOperandsSize != 3) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            case UA_FILTEROPERATOR_OFTYPE: {
-                if(ef.filterOperandsSize != 1) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-                    break;
-                }
-                er->operandStatusCodesSize = ef.filterOperandsSize;
-                if(ef.filterOperands[0].content.decoded.type !=
-                   &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADFILTEROPERANDINVALID;
-                    break;
-                }
-                UA_LiteralOperand *literalOperand =
-                    (UA_LiteralOperand *)ef.filterOperands[0]
-                        .content.decoded.data;
-
-                /* Make sure the &pOperand->nodeId is a subtype of BaseEventType */
-                UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
-                if(!isNodeInTree_singleRef(
-                    server, (UA_NodeId *)literalOperand->value.data, &baseEventTypeId,
-                    UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-                    er->statusCode =
-                        UA_STATUSCODE_BADNODEIDINVALID;
-                    break;
-                }
-                er->statusCode = UA_STATUSCODE_GOOD;
-                break;
-            }
-            default:
-                er->statusCode =
-                    UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-                break;
-        }
+    result->elementResultsSize = filter->elementsSize;
+
+    /* Validate the filter elements individually */
+    for(size_t i = 0; i < filter->elementsSize; ++i) {
+        UA_ContentFilterElement *ef = &filter->elements[i];
+        result->elementResults[i] =
+            UA_ContentFilterElementValidation(server, i, filter->elementsSize, ef);
+        if(result->elementResults[i].statusCode != UA_STATUSCODE_GOOD)
+            return result->elementResults[i].statusCode;
     }
+
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/tests/server/check_subscription_events.c b/tests/server/check_subscription_events.c
index 87237304b76..52cda494e82 100644
--- a/tests/server/check_subscription_events.c
+++ b/tests/server/check_subscription_events.c
@@ -704,7 +704,7 @@ START_TEST(eventStressing) {
     UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
 } END_TEST
 
-START_TEST(evaluateWhereClause) {
+START_TEST(evaluateFilterWhereClause) {
     /* Everything is on the stack, so no memory cleaning required.*/
     UA_NodeId eventNodeId;
     UA_StatusCode retval = eventSetup(&eventNodeId);
@@ -733,8 +733,8 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
-                                              &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClause(server, &server->adminSession,
+                                 &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -767,8 +767,8 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
-                                              &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClause(server, &server->adminSession,
+                                 &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -794,9 +794,9 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
-                                              &eventNodeId, &contentFilter,
-                                              &contentFilterResult);
+    retval = evaluateWhereClause(server, &server->adminSession,
+                                 &eventNodeId, &contentFilter,
+                                 &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -804,7 +804,7 @@ START_TEST(evaluateWhereClause) {
     /* No operand provided */
     contentFilterElement.filterOperator = UA_FILTEROPERATOR_OFTYPE;
     UA_LOCK(&server->serviceMutex);
-    retval = UA_Event_staticWhereClauseValidation(server, &contentFilter, &contentFilterResult);
+    retval = UA_ContentFilterValidation(server, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -813,10 +813,11 @@ START_TEST(evaluateWhereClause) {
     UA_ExtensionObject_init(&filterOperandExObj);
     contentFilterElement.filterOperandsSize = 1;
     contentFilterElement.filterOperands = &filterOperandExObj;
-    filterOperandExObj.content.decoded.type = &UA_TYPES[UA_TYPES_LITERALOPERAND];
     UA_LiteralOperand literalOperand;
     UA_LiteralOperand_init(&literalOperand);
     filterOperandExObj.content.decoded.data = &literalOperand;
+    filterOperandExObj.content.decoded.type = &UA_TYPES[UA_TYPES_LITERALOPERAND];
+    filterOperandExObj.encoding = UA_EXTENSIONOBJECT_DECODED_NODELETE;
 
     /* Same type*/
     UA_Variant_setScalar(&literalOperand.value, &eventType, &UA_TYPES[UA_TYPES_NODEID]);
@@ -831,17 +832,16 @@ START_TEST(evaluateWhereClause) {
     for(size_t i = 0; i < contentFilterResult.elementResultsSize; ++i) {
         contentFilterResult.elementResults[i].operandStatusCodesSize =
             contentFilter.elements->filterOperandsSize;
-        contentFilterResult.elementResults[i].operandStatusCodes =
-            (UA_StatusCode *)UA_Array_new(
-                contentFilter.elements->filterOperandsSize,
-                &UA_TYPES[UA_TYPES_STATUSCODE]);
+        contentFilterResult.elementResults[i].operandStatusCodes = (UA_StatusCode *)
+            UA_Array_new(contentFilter.elements->filterOperandsSize,
+                         &UA_TYPES[UA_TYPES_STATUSCODE]);
         if(!contentFilterResult.elementResults[i].operandStatusCodes) {
             ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
-                                              &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClause(server, &server->adminSession,
+                                 &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -870,8 +870,8 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
-                                              &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClause(server, &server->adminSession,
+                                 &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -899,8 +899,8 @@ START_TEST(evaluateWhereClause) {
         }
     }
     UA_LOCK(&server->serviceMutex);
-    retval = evaluateWhereClauseContentFilter(server, &server->adminSession,
-                                              &eventNodeId, &contentFilter, &contentFilterResult);
+    retval = evaluateWhereClause(server, &server->adminSession,
+                                 &eventNodeId, &contentFilter, &contentFilterResult);
     UA_UNLOCK(&server->serviceMutex);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADNOMATCH);
     UA_ContentFilterResult_clear(&contentFilterResult);
@@ -925,7 +925,7 @@ static Suite *testSuite_Client(void) {
     tcase_add_test(tc_server, multipleMonitoredItemsOneNode);
     tcase_add_test(tc_server, discardNewestOverflow);
     tcase_add_test(tc_server, eventStressing);
-    tcase_add_test(tc_server, evaluateWhereClause);
+    tcase_add_test(tc_server, evaluateFilterWhereClause);
 #endif /* UA_ENABLE_SUBSCRIPTIONS_EVENTS */
     suite_add_tcase(s, tc_server);
 

From 665c070ecedd1eba110381c20f3e676916637aee Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 12 Sep 2022 13:16:51 +0200
Subject: [PATCH 0461/1963] refactor(server): Simplify the evaluation of event
 filters

---
 src/server/ua_subscription_events_filter.c    | 1109 ++++++-----------
 .../server/check_subscription_event_filter.c  |    2 +-
 2 files changed, 368 insertions(+), 743 deletions(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index e414a3d57cf..439b9280bfb 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -446,45 +446,29 @@ castImplicit(const UA_Variant *in, const UA_DataType *outType, UA_Variant *out)
     return res;
 }
 
+/* Filter Evaluation
+ * ----------------- */
+
 typedef struct {
     UA_Server *server;
     UA_Session *session;
     const UA_NodeId *eventNode;
-    const UA_ContentFilter *contentFilter;
-    UA_ContentFilterResult *contentFilterResult;
-    UA_Variant *valueResult;
-    UA_UInt16 index;
-} UA_FilterOperatorContext;
-
-static UA_StatusCode
-evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx);
-
-/* Resolves a variant of type string or boolean into a corresponding status code */
-static UA_StatusCode
-resolveBoolean(UA_Variant operand) {
-    UA_String value;
-    value = UA_STRING("True");
-    if(((operand.type == &UA_TYPES[UA_TYPES_STRING]) &&
-        (UA_String_equal((UA_String *)operand.data, &value))) ||
-       ((operand.type == &UA_TYPES[UA_TYPES_BOOLEAN]) &&
-        (*(UA_Boolean *)operand.data == UA_TRUE))) {
-        return UA_STATUSCODE_GOOD;
-    }
-    value = UA_STRING("False");
-    if(((operand.type == &UA_TYPES[UA_TYPES_STRING]) &&
-        (UA_String_equal((UA_String *)operand.data, &value))) ||
-       ((operand.type == &UA_TYPES[UA_TYPES_BOOLEAN]) &&
-        (*(UA_Boolean *)operand.data == UA_FALSE))) {
-        return UA_STATUSCODE_BADNOMATCH;
-    }
-
-    /* If the operand can't be resolved, an error is returned */
-    return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-}
-
-/* Part 4: 7.4.4.5 SimpleAttributeOperand
- * The clause can point to any attribute of nodes. Either a child of the event
- * node and also the event type. */
+    const UA_ContentFilter *filter;
+    UA_ContentFilterResult *filterResult;
+    UA_Variant results[UA_EVENTFILTER_MAXELEMENTS];
+
+    /* The stack contains temporary variants. Cleaned up after the evaluation of
+     * each operator. */
+    size_t top;
+    UA_Variant stack[UA_EVENTFILTER_MAXOPERANDS];
+} UA_FilterEvalContext;
+
+/* Operand Resolving
+ * ~~~~~~~~~~~~~~~~~
+ * Methods that all resolve an operator operand to a Variant. */
+
+/* Part 4, 7.4.4.5 SimpleAttributeOperand: The clause can point to any attribute
+ * of nodes. Either a child of the event node and also the event type. */
 static UA_StatusCode
 resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session,
                               const UA_NodeId *origin,
@@ -496,8 +480,8 @@ resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session,
     rvi.indexRange = sao->indexRange;
     rvi.attributeId = sao->attributeId;
 
+    /* Read the value */
     UA_DataValue v;
-
     if(sao->browsePathSize == 0) {
         /* If this list (browsePath) is empty, the Node is the instance of the
          * TypeDefinition. (Part 4, 7.4.4.5) */
@@ -509,8 +493,7 @@ resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session,
         if(UA_NodeId_equal(&sao->typeDefinitionId, &conditionTypeId)) {
 #ifdef UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS
             UA_StatusCode res = UA_getConditionId(server, origin, &rvi.nodeId);
-            if(res != UA_STATUSCODE_GOOD)
-                return res;
+            UA_CHECK_STATUS(res, return res);
 #else
             return UA_STATUSCODE_BADNOTSUPPORTED;
 #endif
@@ -552,797 +535,439 @@ resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session,
     return UA_STATUSCODE_GOOD;
 }
 
-/* Resolve operands to variants according to the operand type.
- * Part 4: 7.17.3 Table 142 specifies the allowed types. */
-static UA_Variant
-resolveOperand(UA_FilterOperatorContext *ctx, UA_UInt16 nr) {
-    UA_StatusCode res;
-    UA_Variant variant;
-    UA_Variant_init(&variant);
-    UA_ExtensionObject *op = &ctx->contentFilter->elements[ctx->index].filterOperands[nr];
-    if(op->content.decoded.type == &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]) {
-        /* SimpleAttributeOperand */
-        res = resolveSimpleAttributeOperand(ctx->server, ctx->session, ctx->eventNode,
-                                (UA_SimpleAttributeOperand *)op->content.decoded.data,
-                                            &variant);
-    } else if(op->content.decoded.type == &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
-        /* LiteralOperand */
-        variant = ((UA_LiteralOperand *)op->content.decoded.data)->value;
-        res = UA_STATUSCODE_GOOD;
-    } else if(op->content.decoded.type == &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
-        /* ElementOperand */
-        UA_UInt16 oldIndex = ctx->index;
-        ctx->index = (UA_UInt16)((UA_ElementOperand *)op->content.decoded.data)->index;
-        res = evaluateWhereClauseContentFilter(ctx);
-        variant = ctx->valueResult[ctx->index];
-        ctx->index = oldIndex; /* restore the old index */
-    } else {
-        res = UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-
-    if(res != UA_STATUSCODE_GOOD && res != UA_STATUSCODE_BADNOMATCH) {
-        variant.type = NULL;
-        ctx->contentFilterResult->elementResults[ctx->index].operandStatusCodes[nr] = res;
-    }
-
-    return variant;
-}
-
 static UA_StatusCode
-ofTypeOperator(UA_FilterOperatorContext *ctx) {
-    UA_ContentFilterElement *pElement = &ctx->contentFilter->elements[ctx->index];
-    UA_Boolean result = false;
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    if(pElement->filterOperandsSize != 1)
-        return UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH;
-    if(pElement->filterOperands[0].content.decoded.type !=
-       &UA_TYPES[UA_TYPES_LITERALOPERAND])
+resolveOperand(UA_FilterEvalContext *ctx, UA_ExtensionObject *op, UA_Variant *out) {
+    if(op->encoding != UA_EXTENSIONOBJECT_DECODED &&
+       op->encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE)
         return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
 
-    UA_LiteralOperand *literalOperand =
-        (UA_LiteralOperand *) pElement->filterOperands[0].content.decoded.data;
-    if(!UA_Variant_isScalar(&literalOperand->value))
-        return UA_STATUSCODE_BADEVENTFILTERINVALID;
-
-    if(literalOperand->value.type != &UA_TYPES[UA_TYPES_NODEID] || literalOperand->value.data == NULL)
-        return UA_STATUSCODE_BADEVENTFILTERINVALID;
-
-    UA_NodeId *literalOperandNodeId = (UA_NodeId *) literalOperand->value.data;
-    UA_Variant typeNodeIdVariant;
-    UA_Variant_init(&typeNodeIdVariant);
-    UA_StatusCode readStatusCode =
-        readObjectProperty(ctx->server, *ctx->eventNode,
-                           UA_QUALIFIEDNAME(0, "EventType"), &typeNodeIdVariant);
-    if(readStatusCode != UA_STATUSCODE_GOOD)
-        return readStatusCode;
-
-    if(!UA_Variant_isScalar(&typeNodeIdVariant) ||
-       typeNodeIdVariant.type != &UA_TYPES[UA_TYPES_NODEID] ||
-       typeNodeIdVariant.data == NULL) {
-        UA_LOG_ERROR(&ctx->server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "EventType has an invalid type.");
-        UA_Variant_clear(&typeNodeIdVariant);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    /* check if the eventtype-nodeid is equal to the given oftype argument */
-    result = UA_NodeId_equal((UA_NodeId*) typeNodeIdVariant.data, literalOperandNodeId);
-    /* check if the eventtype-nodeid is a subtype of the given oftype argument */
-    if(!result)
-        result = isNodeInTree_singleRef(ctx->server,
-                                        (UA_NodeId*) typeNodeIdVariant.data,
-                                        literalOperandNodeId,
-                                        UA_REFERENCETYPEINDEX_HASSUBTYPE);
-    UA_Variant_clear(&typeNodeIdVariant);
-    if(!result)
-        return UA_STATUSCODE_BADNOMATCH;
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-andOperator(UA_FilterOperatorContext *ctx) {
-    UA_StatusCode firstBoolean_and = resolveBoolean(resolveOperand(ctx, 0));
-    if(firstBoolean_and == UA_STATUSCODE_BADNOMATCH) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_BADNOMATCH;
-    }
-    /* Evaluation of second operand */
-    UA_StatusCode secondBoolean = resolveBoolean(resolveOperand(ctx, 1));
-    /* Filteroperator AND */
-    if(secondBoolean == UA_STATUSCODE_BADNOMATCH) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_BADNOMATCH;
-    }
-    if((firstBoolean_and == UA_STATUSCODE_GOOD) &&
-       (secondBoolean == UA_STATUSCODE_GOOD)) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    /* Result of an operator that was evaluated prior */
+    if(op->content.decoded.type == &UA_TYPES[UA_TYPES_ELEMENTOPERAND]) {
+        UA_ElementOperand *eo = (UA_ElementOperand*)op->content.decoded.data;
+        *out = ctx->results[eo->index];
+        out->storageType = UA_VARIANT_DATA_NODELETE;
         return UA_STATUSCODE_GOOD;
     }
-    return UA_STATUSCODE_BADFILTERELEMENTINVALID;
-}
 
-static UA_StatusCode
-orOperator(UA_FilterOperatorContext *ctx) {
-    UA_StatusCode firstBoolean_or = resolveBoolean(resolveOperand(ctx, 0));
-    if(firstBoolean_or == UA_STATUSCODE_GOOD) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_GOOD;
-    }
-    /* Evaluation of second operand */
-    UA_StatusCode secondBoolean = resolveBoolean(resolveOperand(ctx, 1));
-    if(secondBoolean == UA_STATUSCODE_GOOD) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    /* Literal value */
+    if(op->content.decoded.type == &UA_TYPES[UA_TYPES_LITERALOPERAND]) {
+        UA_LiteralOperand *lo = (UA_LiteralOperand*)op->content.decoded.data;
+        *out = lo->value;
+        out->storageType = UA_VARIANT_DATA_NODELETE;
         return UA_STATUSCODE_GOOD;
     }
-    if((firstBoolean_or == UA_STATUSCODE_BADNOMATCH) &&
-       (secondBoolean == UA_STATUSCODE_BADNOMATCH)) {
-        ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-        return UA_STATUSCODE_BADNOMATCH;
-    }
-    return UA_STATUSCODE_BADFILTERELEMENTINVALID;
-}
 
-static UA_Boolean
-isNumericUnsigned(UA_UInt32 dataTypeKind){
-    if(dataTypeKind == UA_DATATYPEKIND_UINT64 ||
-       dataTypeKind == UA_DATATYPEKIND_UINT32 ||
-       dataTypeKind == UA_DATATYPEKIND_UINT16 ||
-       dataTypeKind == UA_DATATYPEKIND_BYTE)
-        return true;
-    return false;
-}
+    /* SimpleAttributeOperand with a BrowsePath */
+    if(op->content.decoded.type == &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]) {
+        UA_SimpleAttributeOperand *sao =
+            (UA_SimpleAttributeOperand*)op->content.decoded.data;
+        return resolveSimpleAttributeOperand(ctx->server, ctx->session,
+                                             ctx->eventNode, sao, out);
+    }
 
-static UA_Boolean
-isNumericSigned(UA_UInt32 dataTypeKind){
-    if(dataTypeKind == UA_DATATYPEKIND_INT64 ||
-       dataTypeKind == UA_DATATYPEKIND_INT32 ||
-       dataTypeKind == UA_DATATYPEKIND_INT16 ||
-       dataTypeKind == UA_DATATYPEKIND_SBYTE)
-        return true;
-    return false;
+    return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
 }
 
-static UA_Boolean
-isFloatingPoint(UA_UInt32 dataTypeKind){
-    if(dataTypeKind == UA_DATATYPEKIND_FLOAT ||
-       dataTypeKind == UA_DATATYPEKIND_DOUBLE)
-        return true;
-    return false;
+/* The operandIndex is within the operator arguments, not the operand index for
+ * the overall stack */
+static UA_StatusCode
+setOperandError(UA_FilterEvalContext *ctx, size_t elementIndex,
+                size_t operandIndex, UA_StatusCode statusCode) {
+    UA_ContentFilterElementResult *res = &ctx->filterResult->elementResults[elementIndex];
+    res->operandStatusCodes[operandIndex] = statusCode;
+    /* The operator status is set globally in a single location upwards the call chain
+     * res->statusCode = statusCode; */
+    return statusCode;
 }
 
-static UA_Boolean
-isStringType(UA_UInt32 dataTypeKind){
-    if(dataTypeKind == UA_DATATYPEKIND_STRING ||
-       dataTypeKind == UA_DATATYPEKIND_BYTESTRING)
-        return true;
-    return false;
-}
+/* Filter Operators
+ * ~~~~~~~~~~~~~~~~ */
 
 static UA_StatusCode
-implicitNumericVariantTransformation(UA_Variant *variant, void *data){
-    if(variant->type == &UA_TYPES[UA_TYPES_UINT64]){
-        *(UA_UInt64 *)data = *(UA_UInt64 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT32]){
-        *(UA_UInt64 *)data = *(UA_UInt32 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT16]){
-        *(UA_UInt64 *)data = *(UA_UInt16 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_BYTE]){
-        *(UA_UInt64 *)data = *(UA_Byte *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_INT64]){
-        *(UA_Int64 *)data = *(UA_Int64 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_INT32]){
-        *(UA_Int64 *)data = *(UA_Int32 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_INT16]){
-        *(UA_Int64 *)data = *(UA_Int16 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
-        *(UA_Int64 *)data = *(UA_SByte *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_DOUBLE]){
-        *(UA_Double *)data = *(UA_Double *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_DOUBLE]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
-        *(UA_Double *)data = *(UA_Float *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_DOUBLE]);
-    } else {
-        return UA_STATUSCODE_BADTYPEMISMATCH;
+ofTypeOperator(UA_FilterEvalContext *ctx, size_t index) {
+    const UA_ContentFilterElement *elm = &ctx->filter->elements[index];
+    UA_assert(elm->filterOperandsSize == 1);
+
+    /* Get the operand. Must be a literal NodeId */
+    UA_Variant *op0 = &ctx->stack[ctx->top++];
+    UA_StatusCode res = resolveOperand(ctx, &elm->filterOperands[0], op0);
+    if(res != UA_STATUSCODE_GOOD || !UA_Variant_hasScalarType(op0, &UA_TYPES[UA_TYPES_NODEID]))
+        return setOperandError(ctx, index, 0, UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED);
+
+    /* Read the event type */
+    UA_Variant eventTypeVar;
+    UA_Variant_init(&eventTypeVar);
+    const UA_NodeId *operandTypeId = (const UA_NodeId *)op0->data;
+    res = readObjectProperty(ctx->server, *ctx->eventNode,
+                             UA_QUALIFIEDNAME(0, "EventType"), &eventTypeVar);
+    UA_CHECK_STATUS(res, return res);
+
+    if(!UA_Variant_hasScalarType(&eventTypeVar, &UA_TYPES[UA_TYPES_NODEID])) {
+        UA_LOG_WARNING(&ctx->server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "EventType has an invalid type.");
+        UA_Variant_clear(&eventTypeVar);
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
+
+    /* Check if the eventtype is equal to the operand or a subtype of it */
+    const UA_NodeId *eventTypeId = (UA_NodeId*)eventTypeVar.data;
+    UA_Boolean ofType = isNodeInTree_singleRef(ctx->server, eventTypeId, operandTypeId,
+                                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
+    ctx->results[index] = t2v(ofType ? UA_TERNARY_TRUE : UA_TERNARY_FALSE);
+    UA_Variant_clear(&eventTypeVar);
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-implicitNumericVariantTransformationUnsingedToSigned(UA_Variant *variant, void *data){
-    if(variant->type == &UA_TYPES[UA_TYPES_UINT64]){
-        if(*(UA_UInt64 *)variant->data > UA_INT64_MAX)
-            return UA_STATUSCODE_BADTYPEMISMATCH;
-        *(UA_Int64 *)data = *(UA_Int64 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT32]){
-        *(UA_Int64 *)data = *(UA_Int32 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_UINT16]){
-        *(UA_Int64 *)data = *(UA_Int16 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_BYTE]){
-        *(UA_Int64 *)data = *(UA_Byte *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_INT64]);
-    } else {
-        return UA_STATUSCODE_BADTYPEMISMATCH;
-    }
+andOperator(UA_FilterEvalContext *ctx, size_t index) {
+    const UA_ContentFilterElement *elm = &ctx->filter->elements[index];
+    UA_assert(elm->filterOperandsSize == 2);
+    UA_Variant *op0 = &ctx->stack[ctx->top++];
+    UA_StatusCode res = resolveOperand(ctx, &elm->filterOperands[0], op0);
+    UA_CHECK_STATUS(res, return res);
+    UA_Variant *op1 = &ctx->stack[ctx->top++];
+    res = resolveOperand(ctx, &elm->filterOperands[1], op1);
+    UA_CHECK_STATUS(res, return res);
+    ctx->results[index] = t2v(UA_Ternary_and(v2t(op0), v2t(op1)));
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-implicitNumericVariantTransformationSignedToUnSigned(UA_Variant *variant, void *data){
-    if(*(UA_Int64 *)variant->data < 0)
-        return UA_STATUSCODE_BADTYPEMISMATCH;
-    if(variant->type == &UA_TYPES[UA_TYPES_INT64]){
-        *(UA_UInt64 *)data = *(UA_UInt64 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_INT32]){
-        *(UA_UInt64 *)data = *(UA_UInt32 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_INT16]){
-        *(UA_UInt64 *)data = *(UA_UInt16 *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else if(variant->type == &UA_TYPES[UA_TYPES_SBYTE]){
-        *(UA_UInt64 *)data = *(UA_Byte *)variant->data;
-        UA_Variant_setScalar(variant, data, &UA_TYPES[UA_TYPES_UINT64]);
-    } else {
-        return UA_STATUSCODE_BADTYPEMISMATCH;
-    }
+orOperator(UA_FilterEvalContext *ctx, size_t index) {
+    const UA_ContentFilterElement *elm = &ctx->filter->elements[index];
+    UA_assert(elm->filterOperandsSize == 2);
+    UA_Variant *op0 = &ctx->stack[ctx->top++];
+    UA_StatusCode res = resolveOperand(ctx, &elm->filterOperands[0], op0);
+    UA_CHECK_STATUS(res, return res);
+    UA_Variant *op1 = &ctx->stack[ctx->top++];
+    res = resolveOperand(ctx, &elm->filterOperands[1], op1);
+    UA_CHECK_STATUS(res, return res);
+    ctx->results[index] = t2v(UA_Ternary_or(v2t(op0), v2t(op1)));
     return UA_STATUSCODE_GOOD;
 }
 
-/* 0 -> Same Type, 1 -> Implicit Cast, 2 -> Only explicit Cast, -1 -> cast invalid */
-static UA_SByte convertLookup[21][21] = {
-    { 0, 1,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
-    { 2, 0,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 1,-1, 2,-1,-1, 1, 1, 1,-1},
-    {-1,-1, 0,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
-    {-1,-1,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 0,-1, 2,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
-    {-1,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1, 2,-1,-1, 1,-1,-1,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 1,-1, 0,-1, 2, 2, 2,-1, 2,-1, 2,-1,-1, 2, 2, 2,-1},
-    {-1,-1, 2,-1,-1,-1,-1, 0,-1,-1,-1,-1,-1,-1, 2,-1,-1,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 0, 1, 1,-1, 2,-1, 2,-1,-1, 2, 1, 1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 0, 1,-1, 2, 2, 2,-1,-1, 2, 2, 1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 0,-1, 2, 2, 2,-1,-1, 2, 2, 2,-1},
-    {-1,-1,-1,-1,-1, 1,-1,-1,-1,-1,-1, 0,-1,-1, 1,-1,-1,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 0,-1, 2,-1,-1, 1, 1, 1,-1},
-    {-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1,-1,-1, 0,-1,-1,-1, 2, 1, 1,-1},
-    { 1, 1,-1, 2, 1, 2, 1, 1, 1, 1, 1, 2, 1,-1, 0, 2, 2, 1, 1, 1,-1},
-    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 0,-1,-1,-1,-1,-1},
-    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 1, 1, 0,-1,-1,-1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 1, 1, 1,-1, 2, 1, 2,-1,-1, 0, 1, 1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 1, 1,-1, 2, 2, 2,-1,-1, 2, 0, 1,-1},
-    { 2, 2,-1,-1, 1,-1, 1,-1, 2, 2, 1,-1, 2, 2, 2,-1,-1, 2, 2, 0,-1},
-    {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0}
-};
-
-/* This array maps the index of the
- * standard DataType-Kind order to the
- * order of the type convertion array */
-static UA_Byte dataTypeKindIndex[30] = {
-    0,   12,  1,  8, 17,
-    9,   18, 10, 19,  6,
-    4,   14,  3,  7,  2,
-    20,  11,  5, 13, 16,
-    15, 255,255,255,255,
-    255,255,255,255,255
-};
-
-/* The OPC UA Standard defines in Part 4 several data type casting-rules. (see
- * 1.04 part 4 Table 122)
- * Return:
- *      0 -> same type
- *      1 -> types can be casted implicit
- *      2 -> types can only be explicitly casted
- *     -1 -> types can't be casted */
-static UA_SByte
-checkTypeCastingOption(const UA_DataType *cast_target, const UA_DataType *cast_source) {
-    UA_Byte firstOperatorTypeKindIndex = dataTypeKindIndex[cast_target->typeKind];
-    UA_Byte secondOperatorTypeKindIndex = dataTypeKindIndex[cast_source->typeKind];
-    if(firstOperatorTypeKindIndex == UA_BYTE_MAX ||
-       secondOperatorTypeKindIndex == UA_BYTE_MAX)
-        return -1;
-
-    return convertLookup[firstOperatorTypeKindIndex][secondOperatorTypeKindIndex];
+static UA_StatusCode
+notOperator(UA_FilterEvalContext *ctx, size_t index) {
+    const UA_ContentFilterElement *elm = &ctx->filter->elements[index];
+    UA_assert(elm->filterOperandsSize == 1);
+    UA_Variant *op0 = &ctx->stack[ctx->top++];
+    UA_StatusCode res = resolveOperand(ctx, &elm->filterOperands[0], op0);
+    UA_CHECK_STATUS(res, return res);
+    ctx->results[index] = t2v(UA_Ternary_not(v2t(op0)));
+    return UA_STATUSCODE_GOOD;
 }
 
-/* Compare operation for equal, gt, le, gte, lee
- * UA_STATUSCODE_GOOD if the comparison was true
- * UA_STATUSCODE_BADNOMATCH if the comparison was false
- * UA_STATUSCODE_BADFILTEROPERATORINVALID for invalid operators
- * UA_STATUSCODE_BADTYPEMISMATCH if one of the operands was not numeric
- * ToDo Array-Casting
- */
+/* Resolves the operands and casts them implicitly to the same type.
+ * The result is set at &ctx->stack[ctx->top] (for the initial value of top). */
 static UA_StatusCode
-compareOperation(UA_Variant *firstOperand, UA_Variant *secondOperand, UA_FilterOperator op) {
-    /* get precedence of the operand types */
-    UA_Int16 firstOperand_precedence = UA_DataType_getPrecedence(firstOperand->type);
-    UA_Int16 secondOperand_precedence = UA_DataType_getPrecedence(secondOperand->type);
-    /* if the types are not equal and one of the precedence-ranks is -1, then there is
-       no implicit conversion possible and therefore no compare */
-    if(!UA_NodeId_equal(&firstOperand->type->typeId, &secondOperand->type->typeId) &&
-       (firstOperand_precedence == -1 || secondOperand_precedence == -1)){
-        return UA_STATUSCODE_BADTYPEMISMATCH;
-    }
-    /* check if the precedence order of the operators is swapped */
-    UA_Variant *firstCompareOperand = firstOperand;
-    UA_Variant *secondCompareOperand = secondOperand;
-    UA_Boolean swapped = false;
-    if (firstOperand_precedence < secondOperand_precedence){
-        firstCompareOperand = secondOperand;
-        secondCompareOperand = firstOperand;
-        swapped = true;
-    }
-    UA_SByte castRule =
-        checkTypeCastingOption(firstCompareOperand->type, secondCompareOperand->type);
-
-    if(!(castRule == 0 || castRule == 1)){
-        return UA_STATUSCODE_BADTYPEMISMATCH;
-    }
+castResolveOperands(UA_FilterEvalContext *ctx, size_t index, UA_Boolean setError) {
+    /* Enough space on the stack left? */
+    const UA_ContentFilterElement *elm = &ctx->filter->elements[index];
+    if(ctx->top + elm->filterOperandsSize > UA_EVENTFILTER_MAXOPERANDS)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    /* The operand Data-Types influence the behavior and steps for the comparison.
-     * We need to check the operand types and store a rule which is used to select
-     * the right behavior afterwards. */
-    enum compareHandlingRuleEnum {
-        UA_TYPES_EQUAL_ORDERED,
-        UA_TYPES_EQUAL_UNORDERED,
-        UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED,
-        UA_TYPES_DIFFERENT_NUMERIC_SIGNED,
-        UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT,
-        UA_TYPES_DIFFERENT_TEXT,
-        UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN,
-        UA_TYPES_DIFFERENT_COMPARE_EXPLIC,
-        UA_TYPES_DIFFERENT_SIGNEDNESS_CAST_TO_SIGNED,
-        UA_TYPES_DIFFERENT_SIGNEDNESS_CAST_TO_UNSIGNED
-    } compareHandlingRuleEnum;
-
-    if(castRule == 0 &&
-       (UA_DataType_isNumeric(firstOperand->type) ||
-        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_DATETIME ||
-        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_STRING ||
-        firstCompareOperand->type->typeKind == (UA_UInt32) UA_DATATYPEKIND_BYTESTRING)){
-        /* Data-Types with a natural order (allow le, gt, lee, gte) */
-        compareHandlingRuleEnum = UA_TYPES_EQUAL_ORDERED;
-    } else if(castRule == 0){
-        /* Data-Types without a natural order (le, gt, lee, gte are not allowed) */
-        compareHandlingRuleEnum = UA_TYPES_EQUAL_UNORDERED;
-    } else if(castRule == 1 &&
-              isNumericSigned(firstOperand->type->typeKind) &&
-              isNumericSigned(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_SIGNED;
-    } else if(castRule == 1 &&
-              isNumericUnsigned(firstOperand->type->typeKind) &&
-              isNumericUnsigned(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED;
-    } else if(castRule == 1 &&
-              isFloatingPoint(firstOperand->type->typeKind) &&
-              isFloatingPoint(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT;
-    } else if(castRule == 1 &&
-              isStringType(firstOperand->type->typeKind)&&
-              isStringType(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_TEXT;
-    } else if(castRule == 1 &&
-              isNumericSigned(firstOperand->type->typeKind) &&
-              isNumericUnsigned(secondOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_SIGNEDNESS_CAST_TO_SIGNED;
-    } else if(castRule == 1 &&
-              isNumericSigned(secondOperand->type->typeKind) &&
-              isNumericUnsigned(firstOperand->type->typeKind)){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_SIGNEDNESS_CAST_TO_UNSIGNED;
-    } else if(castRule == -1 || castRule == 2){
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_COMPARE_EXPLIC;
-    } else {
-        compareHandlingRuleEnum = UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN;
+    /* Resolve all operands */
+    UA_assert(ctx->top == 0); /* Assume the stack is empty */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    for(size_t i = 0; i < elm->filterOperandsSize; i++) {
+        res = resolveOperand(ctx, &elm->filterOperands[i], &ctx->stack[ctx->top++]);
+        UA_CHECK_STATUS(res, return res);
     }
+    UA_assert(ctx->top > 0); /* Assume the stack is no longer empty */
 
-    if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN)
-        return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-
-    if(swapped){
-        firstCompareOperand = secondCompareOperand;
-        secondCompareOperand = firstCompareOperand;
+    /* Get the datatype for casting */
+    const UA_DataType *targetType = ctx->stack[0].type;
+    for(size_t pos = 1; pos < ctx->top; pos++) {
+        if(targetType)
+            targetType = implicitCastTargetType(targetType, ctx->stack[pos].type);
+        if(!targetType)
+            return (setError) ? setOperandError(ctx, index, pos, res) : res;
     }
 
-    if(op == UA_FILTEROPERATOR_EQUALS){
-        UA_Byte variantContent[16];
-        memset(&variantContent, 0, sizeof(UA_Byte) * 16);
-        if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_SIGNED ||
-           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED ||
-           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT) {
-            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
-            implicitNumericVariantTransformation(secondCompareOperand, &variantContent[8]);
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_SIGNEDNESS_CAST_TO_SIGNED) {
-            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
-            implicitNumericVariantTransformationUnsingedToSigned(secondCompareOperand, &variantContent[8]);
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_SIGNEDNESS_CAST_TO_UNSIGNED) {
-            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
-            implicitNumericVariantTransformationSignedToUnSigned(secondCompareOperand, &variantContent[8]);
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_TEXT) {
-            firstCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
-            secondCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN ||
-                  compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_EXPLIC ){
-            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-        }
-        if(UA_order(firstCompareOperand, secondCompareOperand, &UA_TYPES[UA_TYPES_VARIANT]) == UA_ORDER_EQ) {
-            return UA_STATUSCODE_GOOD;
-        }
-    } else {
-        UA_Byte variantContent[16];
-        memset(&variantContent, 0, sizeof(UA_Byte) * 16);
-        if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_SIGNED ||
-           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_UNSIGNED ||
-           compareHandlingRuleEnum == UA_TYPES_DIFFERENT_NUMERIC_FLOATING_POINT) {
-            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
-            implicitNumericVariantTransformation(secondCompareOperand, &variantContent[8]);
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_SIGNEDNESS_CAST_TO_SIGNED) {
-            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
-            implicitNumericVariantTransformationUnsingedToSigned(secondCompareOperand, &variantContent[8]);
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_SIGNEDNESS_CAST_TO_UNSIGNED) {
-            implicitNumericVariantTransformation(firstCompareOperand, variantContent);
-            implicitNumericVariantTransformationSignedToUnSigned(secondCompareOperand, &variantContent[8]);
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_TEXT) {
-            firstCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
-            secondCompareOperand->type = &UA_TYPES[UA_TYPES_STRING];
-        } else if(compareHandlingRuleEnum == UA_TYPES_EQUAL_UNORDERED) {
-            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-        } else if(compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_FORBIDDEN ||
-                  compareHandlingRuleEnum == UA_TYPES_DIFFERENT_COMPARE_EXPLIC) {
-            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
-        }
-        UA_Order gte_result = UA_order(firstCompareOperand, secondCompareOperand,
-                                       &UA_TYPES[UA_TYPES_VARIANT]);
-        if(op == UA_FILTEROPERATOR_LESSTHAN) {
-            if(gte_result == UA_ORDER_LESS) {
-                return UA_STATUSCODE_GOOD;
-            }
-        } else if(op == UA_FILTEROPERATOR_GREATERTHAN) {
-            if(gte_result == UA_ORDER_MORE) {
-                return UA_STATUSCODE_GOOD;
-            }
-        } else if(op == UA_FILTEROPERATOR_LESSTHANOREQUAL) {
-            if(gte_result == UA_ORDER_LESS || gte_result == UA_ORDER_EQ) {
-                return UA_STATUSCODE_GOOD;
-            }
-        } else if(op == UA_FILTEROPERATOR_GREATERTHANOREQUAL) {
-            if(gte_result == UA_ORDER_MORE || gte_result == UA_ORDER_EQ) {
-                return UA_STATUSCODE_GOOD;
-            }
+    /* Cast the operands. Put the result in the same location on the stack. */
+    for(size_t pos = 0; pos < ctx->top; pos++) {
+        UA_Variant orig = ctx->stack[pos];
+        res = castImplicit(&orig, targetType, &ctx->stack[pos]);
+        if(res != UA_STATUSCODE_GOOD)
+            return (setError) ? setOperandError(ctx, index, pos, res) : res;
+        if(ctx->stack[pos].data == orig.data) {
+            /* Reuse the storage type of the original data if the variant is
+             * identical or only the type has changed */
+            ctx->stack[pos].storageType = orig.storageType;
+        } else {
+            UA_Variant_clear(&orig); /* Fresh allocation of the cast variant. Clean up. */
         }
     }
-    return UA_STATUSCODE_BADNOMATCH;
-}
 
-static UA_StatusCode
-compareOperator(UA_FilterOperatorContext *ctx) {
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    UA_Variant firstOperand = resolveOperand(ctx, 0);
-    if(UA_Variant_isEmpty(&firstOperand))
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    UA_Variant secondOperand = resolveOperand(ctx, 1);
-    if(UA_Variant_isEmpty(&secondOperand)) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-    /* ToDo remove the following restriction: Add support for arrays */
-    if(!UA_Variant_isScalar(&firstOperand) || !UA_Variant_isScalar(&secondOperand)){
-        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-    }
-    return compareOperation(&firstOperand, &secondOperand,
-                            ctx->contentFilter->elements[ctx->index].filterOperator);
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-bitwiseOperator(UA_FilterOperatorContext *ctx) {
-    /* The bitwise operators all have 2 operands which are evaluated equally. */
-    UA_Variant firstOperand = resolveOperand(ctx, 0);
-    if(UA_Variant_isEmpty(&firstOperand)) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+compareOperator(UA_FilterEvalContext *ctx, size_t index, UA_FilterOperator op) {
+    UA_assert(ctx->filter->elements[index].filterOperandsSize == 2);
+
+    /* Resolve and cast the operands. A failed casting results in FALSE. Note
+     * that operands could cast to NULL. */
+    UA_assert(ctx->top == 0); /* Assume the stack is empty */
+    UA_StatusCode res = castResolveOperands(ctx, index, false);
+    if(res != UA_STATUSCODE_GOOD || !ctx->stack[0].type ||
+       ctx->stack[0].type != ctx->stack[1].type) {
+        ctx->results[index] = t2v(UA_TERNARY_FALSE);
+        return UA_STATUSCODE_GOOD;
     }
-    UA_Variant secondOperand = resolveOperand(ctx, 1);
-    if(UA_Variant_isEmpty(&secondOperand)) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
+    UA_assert(ctx->top == 2); /* Assume the stack is no longer empty */
+
+    /* The equals operator is always possible. For the other comparisons it has
+     * to be an ordered type: Numerical, Boolean, StatusCode or DateTime. */
+    const UA_DataType *type = ctx->stack[0].type;
+    if(op != UA_FILTEROPERATOR_EQUALS && !UA_DataType_isNumeric(type) &&
+       type->typeKind != UA_DATATYPEKIND_BOOLEAN &&
+       type->typeKind != UA_DATATYPEKIND_STATUSCODE &&
+       type->typeKind != UA_DATATYPEKIND_DATETIME)
+        return setOperandError(ctx, index, 0, UA_STATUSCODE_BADFILTEROPERANDINVALID);
+
+    /* Compute the order */
+    UA_Order eq = UA_order(ctx->stack[0].data, ctx->stack[1].data, type);
+    UA_Ternary operatorResult = UA_TERNARY_FALSE;
+    switch(op) {
+    case UA_FILTEROPERATOR_EQUALS:
+    default:
+        if(eq == UA_ORDER_EQ)
+            operatorResult = UA_TERNARY_TRUE;
+        break;
+    case UA_FILTEROPERATOR_GREATERTHAN:
+        if(eq == UA_ORDER_MORE)
+            operatorResult = UA_TERNARY_TRUE;
+        break;
+    case UA_FILTEROPERATOR_LESSTHAN:
+        if(eq == UA_ORDER_LESS)
+            operatorResult = UA_TERNARY_TRUE;
+        break;
+    case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
+        if(eq == UA_ORDER_MORE || eq == UA_ORDER_EQ)
+            operatorResult = UA_TERNARY_TRUE;
+        break;
+    case UA_FILTEROPERATOR_LESSTHANOREQUAL:
+        if(eq == UA_ORDER_LESS || eq == UA_ORDER_EQ)
+            operatorResult = UA_TERNARY_TRUE;
+        break;
     }
 
-    UA_Boolean bitwiseAnd =
-        ctx->contentFilter->elements[ctx->index].filterOperator == UA_FILTEROPERATOR_BITWISEAND;
-
-    /* check if the operators are integers */
-    if(!UA_DataType_isNumeric(firstOperand.type) ||
-       !UA_DataType_isNumeric(secondOperand.type) ||
-       !UA_Variant_isScalar(&firstOperand) ||
-       !UA_Variant_isScalar(&secondOperand) ||
-       (firstOperand.type == &UA_TYPES[UA_TYPES_DOUBLE]) ||
-       (secondOperand.type == &UA_TYPES[UA_TYPES_DOUBLE]) ||
-       (secondOperand.type == &UA_TYPES[UA_TYPES_FLOAT]) ||
-       (firstOperand.type == &UA_TYPES[UA_TYPES_FLOAT])) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
+    /* Set result as a literal value */
+    ctx->results[index] = t2v(operatorResult);
+    return UA_STATUSCODE_GOOD;
+}
 
-    /* check which is the return type (higher precedence == bigger integer)*/
-    UA_Int16 precedence = UA_DataType_getPrecedence(firstOperand.type);
-    if(precedence > UA_DataType_getPrecedence(secondOperand.type)) {
-        precedence = UA_DataType_getPrecedence(secondOperand.type);
-    }
+static UA_StatusCode
+equalsOperator(UA_FilterEvalContext *ctx, size_t index) {
+    return compareOperator(ctx, index, UA_FILTEROPERATOR_EQUALS);
+}
 
-    switch(precedence){
-        case 3:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT64];
-            UA_Int64 result_int64;
-            if(bitwiseAnd) {
-                result_int64 = *((UA_Int64 *)firstOperand.data) & *((UA_Int64 *)secondOperand.data);
-            } else {
-                result_int64 = *((UA_Int64 *)firstOperand.data) | *((UA_Int64 *)secondOperand.data);
-            }
-            UA_Int64_copy(&result_int64, (UA_Int64 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 4:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT64];
-            UA_UInt64 result_uint64s;
-            if(bitwiseAnd) {
-                result_uint64s = *((UA_UInt64 *)firstOperand.data) & *((UA_UInt64 *)secondOperand.data);
-            } else {
-                result_uint64s = *((UA_UInt64 *)firstOperand.data) | *((UA_UInt64 *)secondOperand.data);
-            }
-            UA_UInt64_copy(&result_uint64s, (UA_UInt64 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 5:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT32];
-            UA_Int32 result_int32;
-            if(bitwiseAnd) {
-                result_int32 = *((UA_Int32 *)firstOperand.data) & *((UA_Int32 *)secondOperand.data);
-            } else {
-                result_int32 = *((UA_Int32 *)firstOperand.data) | *((UA_Int32 *)secondOperand.data);
-            }
-            UA_Int32_copy(&result_int32, (UA_Int32 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 6:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT32];
-            UA_UInt32 result_uint32;
-            if(bitwiseAnd) {
-                result_uint32 = *((UA_UInt32 *)firstOperand.data) & *((UA_UInt32 *)secondOperand.data);
-            } else {
-                result_uint32 = *((UA_UInt32 *)firstOperand.data) | *((UA_UInt32 *)secondOperand.data);
-            }
-            UA_UInt32_copy(&result_uint32, (UA_UInt32 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 8:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_INT16];
-            UA_Int16 result_int16;
-            if(bitwiseAnd) {
-                result_int16 = *((UA_Int16 *)firstOperand.data) & *((UA_Int16 *)secondOperand.data);
-            } else {
-                result_int16 = *((UA_Int16 *)firstOperand.data) | *((UA_Int16 *)secondOperand.data);
-            }
-            UA_Int16_copy(&result_int16, (UA_Int16 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 9:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_UINT16];
-            UA_UInt16 result_uint16;
-            if(bitwiseAnd) {
-                result_uint16 = *((UA_UInt16 *)firstOperand.data) & *((UA_UInt16 *)secondOperand.data);
-            } else {
-                result_uint16 = *((UA_UInt16 *)firstOperand.data) | *((UA_UInt16 *)secondOperand.data);
-            }
-            UA_UInt16_copy(&result_uint16, (UA_UInt16 *) ctx->valueResult[ctx->index].data);
-            break;
-        case 10:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_SBYTE];
-            UA_SByte result_sbyte;
-            if(bitwiseAnd) {
-                result_sbyte = *((UA_SByte *)firstOperand.data) & *((UA_SByte *)secondOperand.data);
-            } else {
-                result_sbyte = *((UA_SByte *)firstOperand.data) | *((UA_SByte *)secondOperand.data);
-            }
-            UA_SByte_copy(&result_sbyte, (UA_SByte *) ctx->valueResult[ctx->index].data);
-            break;
-        case 11:
-            ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BYTE];
-            UA_Byte result_byte;
-            if(bitwiseAnd) {
-                result_byte = *((UA_Byte *)firstOperand.data) & *((UA_Byte *)secondOperand.data);
-            } else {
-                result_byte = *((UA_Byte *)firstOperand.data) | *((UA_Byte *)secondOperand.data);
-            }
-            UA_Byte_copy(&result_byte, (UA_Byte *) ctx->valueResult[ctx->index].data);
-            break;
-        default:
-            return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
-    return UA_STATUSCODE_GOOD;
+static UA_StatusCode
+gtOperator(UA_FilterEvalContext *ctx, size_t index) {
+    return compareOperator(ctx, index, UA_FILTEROPERATOR_GREATERTHAN);
 }
 
 static UA_StatusCode
-betweenOperator(UA_FilterOperatorContext *ctx) {
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-
-    UA_Variant firstOperand = resolveOperand(ctx, 0);
-    UA_Variant secondOperand = resolveOperand(ctx, 1);
-    UA_Variant thirdOperand = resolveOperand(ctx, 2);
-
-    if((UA_Variant_isEmpty(&firstOperand) ||
-        UA_Variant_isEmpty(&secondOperand) ||
-        UA_Variant_isEmpty(&thirdOperand)) ||
-       (!UA_DataType_isNumeric(firstOperand.type) ||
-        !UA_DataType_isNumeric(secondOperand.type) ||
-        !UA_DataType_isNumeric(thirdOperand.type)) ||
-       (!UA_Variant_isScalar(&firstOperand) ||
-        !UA_Variant_isScalar(&secondOperand) ||
-        !UA_Variant_isScalar(&thirdOperand))) {
-        return UA_STATUSCODE_BADFILTEROPERANDINVALID;
-    }
+ltOperator(UA_FilterEvalContext *ctx, size_t index) {
+    return compareOperator(ctx, index, UA_FILTEROPERATOR_LESSTHAN);
+}
 
-    /* Between can be evaluated through greaterThanOrEqual and lessThanOrEqual */
-    if(compareOperation(&firstOperand, &secondOperand, UA_FILTEROPERATOR_GREATERTHANOREQUAL) == UA_STATUSCODE_GOOD &&
-       compareOperation(&firstOperand, &thirdOperand, UA_FILTEROPERATOR_LESSTHANOREQUAL) == UA_STATUSCODE_GOOD){
-        return UA_STATUSCODE_GOOD;
-    }
-    return UA_STATUSCODE_BADNOMATCH;
+static UA_StatusCode
+gteOperator(UA_FilterEvalContext *ctx, size_t index) {
+    return compareOperator(ctx, index, UA_FILTEROPERATOR_GREATERTHANOREQUAL);
 }
 
 static UA_StatusCode
-inListOperator(UA_FilterOperatorContext *ctx) {
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    UA_Variant firstOperand = resolveOperand(ctx, 0);
+lteOperator(UA_FilterEvalContext *ctx, size_t index) {
+    return compareOperator(ctx, index, UA_FILTEROPERATOR_LESSTHANOREQUAL);
+}
 
-    if(UA_Variant_isEmpty(&firstOperand) ||
-       !UA_Variant_isScalar(&firstOperand)) {
-        return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-    }
+static UA_StatusCode
+bitwiseOperator(UA_FilterEvalContext *ctx, size_t index, UA_FilterOperator op) {
+    UA_assert(ctx->filter->elements[index].filterOperandsSize == 2);
+
+    /* Resolve and cast the operands. Note that operands could cast to NULL. */
+    UA_assert(ctx->top == 0); /* Assume the stack is empty */
+    UA_StatusCode res = castResolveOperands(ctx, index, true);
+    UA_CHECK_STATUS(res, return res);
+    UA_assert(ctx->top == 2); /* Assume we have two elements */
+
+    /* Operands can cast to NULL */
+    const UA_DataType *type = ctx->stack[0].type;
+    if(!type || !UA_DataType_isNumeric(type) ||
+       ctx->stack[0].type != ctx->stack[1].type)
+        return UA_STATUSCODE_BADTYPEMISMATCH;
 
-    /* Evaluating the list of operands */
-    for(size_t i = 1; i < ctx->contentFilter->elements[ctx->index].filterOperandsSize; i++) {
-        /* Resolving the current operand */
-        UA_Variant currentOperator = resolveOperand(ctx, (UA_UInt16)i);
+    /* Copy the casted literal to the result */
+    res = UA_Variant_copy(&ctx->stack[0], &ctx->results[index]);
+    UA_CHECK_STATUS(res, return res);
 
-        /* Check if the operand conforms to the operator*/
-        if(UA_Variant_isEmpty(&currentOperator) ||
-           !UA_Variant_isScalar(&currentOperator)) {
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-        }
-        if(compareOperation(&firstOperand, &currentOperator, UA_FILTEROPERATOR_EQUALS)) {
-            return UA_STATUSCODE_GOOD;
-        }
+    /* Do the bitwise operation on the result data */
+    UA_Byte *bytesOut = (UA_Byte*)ctx->results[index].data;
+    const UA_Byte *bytes2 = (const UA_Byte*)ctx->stack[1].data;
+    for(size_t i = 0; i < type->memSize; i++) {
+        if(op == UA_FILTEROPERATOR_BITWISEAND)
+            bytesOut[i] = bytesOut[i] & bytes2[i];
+        else
+            bytesOut[i] = bytesOut[i] | bytes2[i];
     }
-    return UA_STATUSCODE_BADNOMATCH;
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-isNullOperator(UA_FilterOperatorContext *ctx) {
-    /* Checking if operand is NULL. This is done by reducing the operand to a
-    * variant and then checking if it is empty. */
-    UA_Variant operand = resolveOperand(ctx, 0);
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    if(!UA_Variant_isEmpty(&operand))
-        return UA_STATUSCODE_BADNOMATCH;
-    return UA_STATUSCODE_GOOD;
+bitwiseAndOperator(UA_FilterEvalContext *ctx, size_t index) {
+    return bitwiseOperator(ctx, index, UA_FILTEROPERATOR_BITWISEAND);
 }
 
 static UA_StatusCode
-notOperator(UA_FilterOperatorContext *ctx) {
-    /* Inverting the boolean value of the operand. */
-    UA_StatusCode res = resolveBoolean(resolveOperand(ctx, 0));
-    ctx->valueResult[ctx->index].type = &UA_TYPES[UA_TYPES_BOOLEAN];
-    /* invert result */
-    if(res == UA_STATUSCODE_GOOD)
-        return UA_STATUSCODE_BADNOMATCH;
-    return UA_STATUSCODE_GOOD;
+bitwiseOrOperator(UA_FilterEvalContext *ctx, size_t index) {
+    return bitwiseOperator(ctx, index, UA_FILTEROPERATOR_BITWISEOR);
 }
 
 static UA_StatusCode
-evaluateWhereClauseContentFilter(UA_FilterOperatorContext *ctx) {
-    UA_LOCK_ASSERT(&ctx->server->serviceMutex, 1);
-
-    if(ctx->contentFilter->elements == NULL || ctx->contentFilter->elementsSize == 0) {
-        /* Nothing to do.*/
+betweenOperator(UA_FilterEvalContext *ctx, size_t index) {
+    UA_assert(ctx->filter->elements[index].filterOperandsSize == 3);
+
+    /* If no implicit conversion is available and the operands are of different
+     * types, the particular result is FALSE. */
+    UA_assert(ctx->top == 0); /* Assume the stack is empty */
+    UA_StatusCode res = castResolveOperands(ctx, index, false);
+    if(res != UA_STATUSCODE_GOOD) {
+        ctx->results[index] = t2v(UA_TERNARY_FALSE);
         return UA_STATUSCODE_GOOD;
     }
+    UA_assert(ctx->top == 3); /* Assume we have three elements */
 
-    /* The first element needs to be evaluated, this might be linked to other
-     * elements, which are evaluated in these cases. See 7.4.1 in Part 4. */
-    UA_ContentFilterElement *pElement = &ctx->contentFilter->elements[ctx->index];
-    UA_StatusCode *result = &ctx->contentFilterResult->elementResults[ctx->index].statusCode;
-    switch(pElement->filterOperator) {
-        case UA_FILTEROPERATOR_INVIEW:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_RELATEDTO:
-            /* Not allowed for event WhereClause according to 7.17.3 in Part 4 */
-            return UA_STATUSCODE_BADEVENTFILTERINVALID;
-        case UA_FILTEROPERATOR_EQUALS:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_GREATERTHAN:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_LESSTHAN:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_GREATERTHANOREQUAL:
-            /* Fallthrough */
-        case UA_FILTEROPERATOR_LESSTHANOREQUAL:
-            *result = compareOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_LIKE:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-        case UA_FILTEROPERATOR_NOT:
-            *result = notOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_BETWEEN:
-            *result = betweenOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_INLIST:
-            /* ToDo currently only numeric types are allowed */
-            *result = inListOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_ISNULL:
-            *result = isNullOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_AND:
-            *result = andOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_OR:
-            *result = orOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_CAST:
-            return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
-        case UA_FILTEROPERATOR_BITWISEAND:
-            *result = bitwiseOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_BITWISEOR:
-            *result = bitwiseOperator(ctx);
-            break;
-        case UA_FILTEROPERATOR_OFTYPE:
-            *result = ofTypeOperator(ctx);
+    /* The casting can result in NULL values or a non-numerical type */
+    const UA_DataType *type = ctx->stack[0].type;
+    if(!type || !UA_DataType_isNumeric(type) ||
+       type != ctx->stack[1].type || type != ctx->stack[2].type)
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+
+    UA_Order o1 = UA_order(ctx->stack[0].data, ctx->stack[1].data, type);
+    UA_Order o2 = UA_order(ctx->stack[0].data, ctx->stack[2].data, type);
+    UA_Ternary comp = ((o1 == UA_ORDER_MORE || o1 == UA_ORDER_EQ) &&
+                       (o2 == UA_ORDER_LESS || o2 == UA_ORDER_EQ)) ?
+        UA_TERNARY_TRUE : UA_TERNARY_FALSE;
+
+    ctx->results[index] = t2v(comp);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+inListOperator(UA_FilterEvalContext *ctx, size_t index) {
+    const UA_ContentFilterElement *elm = &ctx->filter->elements[index];
+    UA_assert(elm->filterOperandsSize >= 2);
+    UA_Boolean found = false;
+    UA_Variant *op0 = &ctx->stack[ctx->top++];
+    UA_Variant *op1 = &ctx->stack[ctx->top++];
+    UA_StatusCode res = resolveOperand(ctx, &elm->filterOperands[0], op0);
+    UA_CHECK_STATUS(res, return res);
+    for(size_t i = 1; i < elm->filterOperandsSize; i++) {
+        res = resolveOperand(ctx, &elm->filterOperands[i], op1);
+        UA_CHECK_STATUS(res, continue);
+        if(op0->type == op1->type &&
+           UA_order(op0->data, op1->data, op0->type) == UA_ORDER_EQ) {
+            found = true;
             break;
-        default:
-            return UA_STATUSCODE_BADFILTEROPERATORINVALID;
+        }
+        UA_Variant_clear(op1);
     }
+    ctx->results[index] = t2v((found) ? UA_TERNARY_TRUE: UA_TERNARY_FALSE);
+    return UA_STATUSCODE_GOOD;
+}
 
-    if(ctx->valueResult[ctx->index].type == &UA_TYPES[UA_TYPES_BOOLEAN]) {
-        UA_Boolean *res = UA_Boolean_new();
-        if(ctx->contentFilterResult->elementResults[ctx->index].statusCode == UA_STATUSCODE_GOOD)
-            *res = true;
-        else
-            *res = false;
-        ctx->valueResult[ctx->index].data = res;
-    }
-    return ctx->contentFilterResult->elementResults[ctx->index].statusCode;
+static UA_StatusCode
+isNullOperator(UA_FilterEvalContext *ctx, size_t index) {
+    const UA_ContentFilterElement *elm = &ctx->filter->elements[index];
+    UA_assert(elm->filterOperandsSize == 1);
+    UA_Variant *op0 = &ctx->stack[ctx->top++];
+    UA_StatusCode res = resolveOperand(ctx, &elm->filterOperands[0], op0);
+    UA_CHECK_STATUS(res, return res);
+    ctx->results[index] = t2v(UA_Variant_isEmpty(op0) ? UA_TERNARY_TRUE : UA_TERNARY_FALSE);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+notImplementedOperator(UA_FilterEvalContext *ctx, size_t index) {
+    return UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED;
 }
 
-/* Exposes the filters For unit tests */
+/* Filter Evaluation
+ * ~~~~~~~~~~~~~~~~~ */
+
+typedef struct {
+    UA_StatusCode (*operatorMethod)(UA_FilterEvalContext *ctx, size_t index);
+    UA_Byte minOperatorCount;
+    UA_Byte maxOperatorCount;
+} UA_FilterOperatorJumptableElement;
+
+static const UA_FilterOperatorJumptableElement operatorJumptable[18] = {
+    {equalsOperator, 2, 2},
+    {isNullOperator, 1, 1},
+    {gtOperator, 2, 2},
+    {ltOperator, 2, 2},
+    {gteOperator, 2, 2},
+    {lteOperator, 2, 2},
+    {notImplementedOperator, 0, UA_EVENTFILTER_MAXOPERANDS}, /* like */
+    {notOperator, 1, 1},
+    {betweenOperator, 3, 3},
+    {inListOperator, 2, UA_EVENTFILTER_MAXOPERANDS},
+    {andOperator, 2, 2},
+    {orOperator, 2, 2},
+    {notImplementedOperator, 0, UA_EVENTFILTER_MAXOPERANDS}, /* cast */
+    {notImplementedOperator, 0, UA_EVENTFILTER_MAXOPERANDS}, /* in view */
+    {ofTypeOperator, 1, 1},
+    {notImplementedOperator, 0, UA_EVENTFILTER_MAXOPERANDS}, /* related to */
+    {bitwiseAndOperator, 2, 2},
+    {bitwiseOrOperator, 2, 2}
+};
+
 UA_StatusCode
 evaluateWhereClause(UA_Server *server, UA_Session *session, const UA_NodeId *eventNode,
                     const UA_ContentFilter *contentFilter,
                     UA_ContentFilterResult *contentFilterResult) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* An empty filter always succeeds */
     if(contentFilter->elementsSize == 0)
         return UA_STATUSCODE_GOOD;
-    /* TODO add maximum lenth size to the server config */
-    if(contentFilter->elementsSize > 256)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_Variant valueResult[256];
-    for(size_t i = 0; i < contentFilter->elementsSize; ++i) {
-        UA_Variant_init(&valueResult[i]);
-    }
 
-    UA_FilterOperatorContext ctx;
+    /* Prepare the context */
+    UA_FilterEvalContext ctx;
+    ctx.filterResult = contentFilterResult;
+    ctx.filter = contentFilter;
     ctx.server = server;
     ctx.session = session;
     ctx.eventNode = eventNode;
-    ctx.contentFilter = contentFilter;
-    ctx.contentFilterResult = contentFilterResult;
-    ctx.valueResult = valueResult;
-    ctx.index = 0;
-    UA_StatusCode res = evaluateWhereClauseContentFilter(&ctx);
-    for(size_t i = 0; i < ctx.contentFilter->elementsSize; i++) {
-        if(!UA_Variant_isEmpty(&ctx.valueResult[i]))
-            UA_Variant_clear(&ctx.valueResult[i]);
+    ctx.top = 0;
+
+    /* Pacify some compilers by initializing the first result */
+    UA_Variant_init(&ctx.results[0]);
+
+    /* Evaluate the filter. Iterate backwards over the filter elements and
+     * resolve each. This ensures that all element-index operands point to an
+     * evaluated element. */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    int i = (int)contentFilter->elementsSize - 1;
+    for(; i >= 0; i--) {
+        UA_ContentFilterElement *cfe = &contentFilter->elements[i];
+        res = operatorJumptable[cfe->filterOperator].operatorMethod(&ctx, (size_t)i);
+        for(size_t j = 0; j < ctx.top; j++)
+            UA_Variant_clear(&ctx.stack[j]); /* clean up the stack */
+        ctx.top = 0;
+        if(res != UA_STATUSCODE_GOOD)
+            break;
     }
+
+    /* The filter matches if the operator at the first position evaluates to TRUE */
+    if(res == UA_STATUSCODE_GOOD && v2t(&ctx.results[0]) != UA_TERNARY_TRUE)
+        res = UA_STATUSCODE_BADNOMATCH;
+
+    /* Clean up the element result variants */
+    for(int j = (int)contentFilter->elementsSize - 1; j > i; j--)
+        UA_Variant_clear(&ctx.results[j]);
     return res;
 }
 
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index b3c3bc7e8a7..ed0884fca58 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -484,7 +484,7 @@ START_TEST(selectFilterValidation) {
 
     filter.selectClauses->browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "");
     createResult = addMonitoredItem(handler_events_simple, &filter, true);
-    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADNODEIDUNKNOWN);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADBROWSENAMEINVALID);
 
     UA_QualifiedName_delete(&filter.selectClauses->browsePath[0]);
     filter.selectClauses->browsePath = NULL;

From d94f2b5fb9784d8a0207be1adf5e60d42967789a Mon Sep 17 00:00:00 2001
From: Muddasir shakil <30407857+Muddasir-Shakil@users.noreply.github.com>
Date: Mon, 19 Sep 2022 15:43:20 +0200
Subject: [PATCH 0462/1963] fix(example): Correctly set port in register and
 multicast examples (#5341)

Until 1.2 it was possible to set Port address dynamically but in version 1.3
it is not possible. Setting it to 0 will resolve to 4840, which will conflict
with port assinged by default to LDS server in the example. Also the comment is
misleading in the example. Therefore the comment is deleted and a fixed port
4841 is assinged to register and multicast server examples.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
---
 examples/discovery/server_multicast.c | 8 +++++---
 examples/discovery/server_register.c  | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/discovery/server_multicast.c b/examples/discovery/server_multicast.c
index 3120ac6a264..29537f8fca3 100644
--- a/examples/discovery/server_multicast.c
+++ b/examples/discovery/server_multicast.c
@@ -1,5 +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. */
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
 
 /*
  * A simple server instance which registers with the discovery server.
@@ -222,8 +225,7 @@ int main(int argc, char **argv) {
 
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    // use port 0 to dynamically assign port
-    UA_ServerConfig_setMinimal(config, 0, NULL);
+    UA_ServerConfig_setMinimal(config, 4841, NULL);
 
     // An LDS server normally has the application type to DISCOVERYSERVER.
     // Since this instance implements LDS and other OPC UA services, we set the type to SERVER.
diff --git a/examples/discovery/server_register.c b/examples/discovery/server_register.c
index 94298c45fab..51c3a97cf4e 100644
--- a/examples/discovery/server_register.c
+++ b/examples/discovery/server_register.c
@@ -1,5 +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. */
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
 /*
  * A simple server instance which registers with the discovery server (see server_lds.c).
  * Before shutdown it has to unregister itself.
@@ -66,8 +69,7 @@ int main(int argc, char **argv) {
 
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    // use port 0 to dynamically assign port
-    UA_ServerConfig_setMinimal(config, 0, NULL);
+    UA_ServerConfig_setMinimal(config, 4841, NULL);
 
     UA_String_clear(&config->applicationDescription.applicationUri);
     config->applicationDescription.applicationUri =

From dcf446300683ca790cc041ab03c59ea6888324db Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Tue, 20 Sep 2022 22:56:16 +0200
Subject: [PATCH 0463/1963] feat(pubsub): Implementation of the reserveIds
 method (#5296)

---
 src/pubsub/ua_pubsub_manager.c                | 178 +++++++++++++++++-
 src/pubsub/ua_pubsub_manager.h                |  28 +++
 src/pubsub/ua_pubsub_ns0.c                    |  48 +++++
 src/pubsub/ua_pubsub_writer.c                 |   2 +
 src/pubsub/ua_pubsub_writergroup.c            |   3 +
 src/server/ua_server.c                        |   5 +
 .../check_pubsub_informationmodel_methods.c   |  99 ++++++++++
 tools/schema/NodeIds.csv                      |   4 +
 .../schema/Opc.Ua.NodeSet2.PubSubMinimal.xml  | 141 +++++++++++++-
 9 files changed, 504 insertions(+), 4 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 3f4c90e6693..d1cdae9d4c5 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -110,9 +110,157 @@ UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerG
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_ReserveId *
+UA_ReserveId_new(UA_Server *server, UA_UInt16 id, UA_String transportProfileUri,
+                 UA_ReserveIdType reserveIdType, UA_NodeId sessionId) {
+    UA_ReserveId *reserveId = (UA_ReserveId *) calloc(1, sizeof(UA_ReserveId));
+    if(!reserveId) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub ReserveId creation failed. Out of Memory.");
+        return NULL;
+    }
+    reserveId->id = id;
+    reserveId->reserveIdType = reserveIdType;
+    UA_String_copy(&transportProfileUri, &reserveId->transportProfileUri);
+    reserveId->sessionId = sessionId;
+
+    return reserveId;
+}
+
+static UA_UInt16
+UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId, UA_String transportProfileUri, UA_ReserveIdType reserveIdType) {
+    const UA_UInt16 first_id = 0x8000;
+    const UA_UInt16 last_id = 0xFFFF;
+    UA_UInt16 next_id = first_id;
+    bool is_free = false;
+
+    UA_PubSubManager *pubSubManager = &server->pubSubManager;
+    UA_ReserveId *reserveId1;
+    /* It is checked whether the selected ID is already included in the reserved Ids */
+    while(!is_free) {
+        is_free = true;
+        LIST_FOREACH(reserveId1, &pubSubManager->reserveIds, listEntry){
+            if(UA_String_equal(&reserveId1->transportProfileUri, &transportProfileUri) && reserveId1->reserveIdType == reserveIdType && reserveId1->id == next_id) {
+                is_free = false;
+                next_id++;
+                break;
+            }
+        }
+        if(!is_free)
+            continue;
+
+        UA_PubSubConnection *tmpConnection;
+        if(reserveIdType == UA_WRITER_GROUP) {
+            TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry){
+                UA_WriterGroup *writerGroup;
+                LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
+                    if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) && writerGroup->config.writerGroupId == next_id) {
+                        is_free = false;
+                        next_id++;
+                        break;
+                    }
+                }
+                if(!is_free)
+                    break;
+            }
+        /* reserveIdType == UA_DATA_SET_WRITER */
+        } else {
+            TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry){
+                UA_WriterGroup *writerGroup;
+                LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry){
+                    UA_DataSetWriter *currentWriter;
+                    LIST_FOREACH(currentWriter, &writerGroup->writers, listEntry){
+                        if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) && currentWriter->identifier.identifierType == UA_NODEIDTYPE_NUMERIC && currentWriter->identifier.identifier.numeric == next_id) {
+                            is_free = false;
+                            next_id++;
+                            break;
+                        }
+                    }
+                    if(!is_free)
+                        break;
+                }
+                if(!is_free)
+                    break;
+            }
+        }
+        if(!is_free && next_id == last_id)
+            break;
+    }
+    if(!is_free) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub ReserveId creation failed. No free ID could be found.");
+        return 0;
+    }
+
+    UA_ReserveId *reserveId = UA_ReserveId_new(server, next_id, transportProfileUri, reserveIdType, sessionId);
+    if(reserveId != NULL) {
+        if (pubSubManager->reserveIdsSize != 0) {
+            LIST_INSERT_HEAD(&pubSubManager->reserveIds, reserveId, listEntry);
+        } else {
+            LIST_INIT(&pubSubManager->reserveIds);
+            LIST_INSERT_HEAD(&pubSubManager->reserveIds, reserveId, listEntry);
+        }
+        pubSubManager->reserveIdsSize++;
+
+        return next_id;
+    }
+    return 0;
+}
+
+void
+UA_PubSubManager_freeIds(UA_Server *server) {
+    bool is_active = false;
+    UA_ReserveId *reserveId1, *reserveId2;
+    LIST_FOREACH_SAFE(reserveId1, &server->pubSubManager.reserveIds, listEntry, reserveId2){
+        if(UA_NodeId_equal(&server->adminSession.sessionId, &reserveId1->sessionId))
+            continue;
+        is_active = false;
+        session_list_entry *session;
+        LIST_FOREACH(session, &server->sessions , pointers) {
+            if(UA_NodeId_equal(&session->session.sessionId, &reserveId1->sessionId)) {
+                is_active = true;
+                break;
+            }
+        }
+        if(!is_active) {
+            server->pubSubManager.reserveIdsSize--;
+            LIST_REMOVE(reserveId1, listEntry);
+        }
+    }
+}
+
+UA_StatusCode
+UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 numRegWriterGroupIds,
+                            UA_UInt16 numRegDataSetWriterIds, UA_String transportProfileUri,
+                            UA_UInt16 **writerGroupIds, UA_UInt16 **dataSetWriterIds) {
+
+    UA_PubSubManager_freeIds(server);
+    /* Check the validation of the transportProfileUri */
+    UA_String profile_1 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
+    UA_String profile_2 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json");
+    UA_String profile_3 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    if(!UA_String_equal(&transportProfileUri, &profile_1) && !UA_String_equal(&transportProfileUri, &profile_2) &&
+        !UA_String_equal(&transportProfileUri, &profile_3)) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub ReserveId creation failed. No valid transport profile uri.");
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+    *writerGroupIds = (UA_UInt16*)UA_Array_new(numRegWriterGroupIds, &UA_TYPES[UA_TYPES_UINT16]);
+    *dataSetWriterIds = (UA_UInt16*)UA_Array_new(numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
+
+    for(int i = 0; i < numRegWriterGroupIds; i++) {
+        (*writerGroupIds)[i] = UA_ReserveId_createId(server, sessionId, transportProfileUri, UA_WRITER_GROUP);
+    }
+    for(int i = 0; i < numRegDataSetWriterIds; i++) {
+        (*dataSetWriterIds)[i] = UA_ReserveId_createId(server, sessionId, transportProfileUri, UA_DATA_SET_WRITER);
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
 static UA_PubSubConnection *
 UA_PubSubConnection_new(UA_PubSubConnectionConfig *connectionConfig,
-                        UA_Logger *logger) {/* Create new connection and add to UA_PubSubManager */
+                        UA_Logger *logger) {
+    /* Create new connection and add to UA_PubSubManager */
     UA_PubSubConnection *newConnectionsField = (UA_PubSubConnection *)
         UA_calloc(1, sizeof(UA_PubSubConnection));
     if(!newConnectionsField) {
@@ -559,6 +707,22 @@ UA_PubSubManager_generateUniqueGuid(UA_Server *server) {
     }
 }
 
+/* Initialization the PubSub configuration. */
+void
+UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager) {
+    /* ToDo: Must be correctly generated from Mac address and port. */
+    UA_Guid *ident = NULL;
+    ident = UA_Guid_new();
+    if(!ident) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub generate defaultPublisherId failed.");
+        return;
+    }
+    *ident = UA_Guid_random();
+    pubSubManager->defaultPublisherId = *(UA_UInt64*)ident;
+    UA_free(ident);
+}
+
 /* Delete the current PubSub configuration including all nested members. This
  * action also delete the configured PubSub transport Layers. */
 void
@@ -585,12 +749,20 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     UA_TopicAssign *tmpTopicAssign1, *tmpTopicAssign2;
     TAILQ_FOREACH_SAFE(tmpTopicAssign1, &server->pubSubManager.topicAssign,
                        listEntry, tmpTopicAssign2){
-
         server->pubSubManager.topicAssignSize--;
         TAILQ_REMOVE(&server->pubSubManager.topicAssign, tmpTopicAssign1, listEntry);
         UA_free(tmpTopicAssign1);
     }
-    
+
+    /* Remove the ReserveIds*/
+    UA_ReserveId *tmpReserveId1, *tmpReserveId2;
+    LIST_FOREACH_SAFE(tmpReserveId1, &server->pubSubManager.reserveIds, listEntry, tmpReserveId2){
+        server->pubSubManager.reserveIdsSize--;
+        UA_String_clear(&tmpReserveId1->transportProfileUri);
+        LIST_REMOVE(tmpReserveId1, listEntry);
+        UA_free(tmpReserveId1);
+    }
+
     /* Free the list of transport layers */
     if(server->config.pubSubConfig.transportLayersSize > 0) {
         UA_free(server->config.pubSubConfig.transportLayers);
diff --git a/src/pubsub/ua_pubsub_manager.h b/src/pubsub/ua_pubsub_manager.h
index 00cc7785c6e..38110ec5e08 100644
--- a/src/pubsub/ua_pubsub_manager.h
+++ b/src/pubsub/ua_pubsub_manager.h
@@ -24,7 +24,21 @@ typedef struct UA_TopicAssign {
     TAILQ_ENTRY(UA_TopicAssign) listEntry;
 } UA_TopicAssign;
 
+typedef enum {
+    UA_WRITER_GROUP = 0,
+    UA_DATA_SET_WRITER = 1,
+}UA_ReserveIdType;
+
+typedef struct UA_ReserveId {
+    UA_UInt16 id;
+    UA_ReserveIdType reserveIdType;
+    UA_String transportProfileUri;
+    UA_NodeId sessionId;
+    LIST_ENTRY(UA_ReserveId) listEntry;
+} UA_ReserveId;
+
 typedef struct UA_PubSubManager {
+    UA_UInt64 defaultPublisherId;
     /* Connections and PublishedDataSets can exist alone (own lifecycle) -> top
      * level components */
     size_t connectionsSize;
@@ -38,6 +52,9 @@ typedef struct UA_PubSubManager {
     size_t topicAssignSize;
     TAILQ_HEAD(UA_ListOfTopicAssign, UA_TopicAssign) topicAssign;
 
+    size_t reserveIdsSize;
+    LIST_HEAD(UA_ListOfReserveIds, UA_ReserveId) reserveIds;
+
 #ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     UA_UInt32 uniqueIdCount;
 #endif
@@ -46,6 +63,17 @@ typedef struct UA_PubSubManager {
 UA_StatusCode
 UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerGroup, UA_String topic);
 
+UA_StatusCode
+UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 numRegWriterGroupIds,
+                            UA_UInt16 numRegDataSetWriterIds, UA_String transportProfileUri,
+                            UA_UInt16 **writerGroupIds, UA_UInt16 **dataSetWriterIds);
+
+void
+UA_PubSubManager_freeIds(UA_Server *server);
+
+void
+UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager);
+
 void
 UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager);
 
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 8b38257a942..35bc482169a 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1396,6 +1396,53 @@ removeGroupAction(UA_Server *server,
 }
 #endif
 
+/**********************************************/
+/*               ReserveIds                   */
+/**********************************************/
+
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
+static UA_StatusCode
+addReserveIdsAction(UA_Server *server,
+                             const UA_NodeId *sessionId, void *sessionHandle,
+                             const UA_NodeId *methodId, void *methodContext,
+                             const UA_NodeId *objectId, void *objectContext,
+                             size_t inputSize, const UA_Variant *input,
+                             size_t outputSize, UA_Variant *output){
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    UA_String transportProfileUri = *((UA_String *)input[0].data);
+    UA_UInt16 numRegWriterGroupIds = *((UA_UInt16 *)input[1].data);
+    UA_UInt16 numRegDataSetWriterIds = *((UA_UInt16 *)input[2].data);
+
+    UA_UInt16 *writerGroupIds;
+    UA_UInt16 *dataSetWriterIds;
+
+    retVal |= UA_PubSubManager_reserveIds(server, *sessionId, numRegWriterGroupIds, numRegDataSetWriterIds,
+                                          transportProfileUri, &writerGroupIds, &dataSetWriterIds);
+    if(retVal != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addReserveIds failed");
+        return retVal;
+    }
+
+    /* Check the transportProfileUri */
+    UA_String profile_1 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
+    UA_String profile_2 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json");
+
+    if(UA_String_equal(&transportProfileUri, &profile_1) || UA_String_equal(&transportProfileUri, &profile_2)) {
+        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "ApplicationUri: %.*s",
+                    (int)server->config.applicationDescription.applicationUri.length,
+                    server->config.applicationDescription.applicationUri.data);
+        retVal |= UA_Variant_setScalarCopy(&output[0], &server->config.applicationDescription.applicationUri,
+                                           &UA_TYPES[UA_TYPES_STRING]);
+    }
+    else
+        retVal |= UA_Variant_setScalarCopy(&output[0], &server->pubSubManager.defaultPublisherId, &UA_TYPES[UA_TYPES_UINT64]);
+    UA_Variant_setArray(&output[1], writerGroupIds, numRegWriterGroupIds, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_Variant_setArray(&output[2], dataSetWriterIds, numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
+
+    return retVal;
+}
+#endif
+
 /**********************************************/
 /*               ReaderGroup                  */
 /**********************************************/
@@ -1844,6 +1891,7 @@ UA_Server_initPubSubNS0(UA_Server *server) {
     retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), removeDataSetWriterAction);
     retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), addDataSetReaderAction);
     retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), removeDataSetReaderAction);
+    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS), addReserveIdsAction);
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
     retVal |= UA_addLoadPubSubConfigMethod(server);
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index cf054e933cf..43c1e8b0eeb 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -898,6 +898,8 @@ UA_Server_addDataSetWriter(UA_Server *server,
                            const UA_NodeId writerGroup, const UA_NodeId dataSet,
                            const UA_DataSetWriterConfig *dataSetWriterConfig,
                            UA_NodeId *writerIdentifier) {
+    /* Delete the reserved IDs if the related session no longer exists. */
+    UA_PubSubManager_freeIds(server);
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode res = addDataSetWriter(server, writerGroup, dataSet,
                                          dataSetWriterConfig, writerIdentifier);
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index c9c874f79a8..bba95c23d84 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -46,6 +46,9 @@ UA_StatusCode
 UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
                          const UA_WriterGroupConfig *writerGroupConfig,
                          UA_NodeId *writerGroupIdentifier) {
+
+    /* Delete the reserved IDs if the related session no longer exists. */
+    UA_PubSubManager_freeIds(server);
     if(!writerGroupConfig)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 5b7fe27d451..81805c575b5 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -711,6 +711,11 @@ UA_Server_run_startup(UA_Server *server) {
     UA_CHECK_STATUS(retVal, return retVal);
 #endif
 
+#ifdef UA_ENABLE_PUBSUB
+    /* Initialized PubSubManager */
+    UA_PubSubManager_init(server, &server->pubSubManager);
+#endif
+
     /* Sample the start time and set it to the Server object */
     server->startTime = UA_DateTime_now();
     UA_Variant var;
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index c1261efd2dc..ddad277ec8f 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -1151,6 +1151,103 @@ START_TEST(AddandRemoveReaderGroup){
         UA_LocalizedText_clear(&readerGroupDisplayName);
 } END_TEST
 
+START_TEST(AddReserveIds){
+        UA_StatusCode retVal;
+        UA_Client *client = UA_Client_new();
+        UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+        retVal = UA_Client_connect(client, "opc.tcp://localhost:4840");
+        if(retVal != UA_STATUSCODE_GOOD) {
+            UA_Client_delete(client);
+        }
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        UA_Variant *inputArguments = (UA_Variant *) UA_calloc(3, (sizeof(UA_Variant)));
+        UA_String transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json");
+        UA_Variant_setScalar(&inputArguments[0], &transportProfileUri, &UA_TYPES[UA_TYPES_STRING]);
+        UA_UInt16 numRegWriterGroupIds = 6;
+        UA_Variant_setScalar(&inputArguments[1], &numRegWriterGroupIds, &UA_TYPES[UA_TYPES_UINT16]);
+        UA_UInt16 numRegDataSetWriterIds = 5;
+        UA_Variant_setScalar(&inputArguments[2], &numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
+
+        UA_CallMethodRequest callMethodRequest;
+        UA_CallMethodRequest_init(&callMethodRequest);
+        callMethodRequest.inputArgumentsSize = 3;
+        callMethodRequest.inputArguments = inputArguments;
+        callMethodRequest.objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION);
+        callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS);
+
+        UA_CallMethodResult result;
+        UA_CallMethodResult_init(&result);
+        result = UA_Server_call(server, &callMethodRequest);
+        ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
+        ck_assert_uint_eq(3, result.outputArgumentsSize);
+
+        UA_Variant defaultPublisherId = result.outputArguments[0];
+        UA_Variant writerGroupIds =result.outputArguments[1];
+        UA_Variant dataSetWriterIds = result.outputArguments[2];
+        /* Output Default PublisherId */
+        ck_assert_str_eq("String", defaultPublisherId.type->typeName);
+        ck_assert_uint_eq(0, defaultPublisherId.arrayLength);
+        /* Output Reserved Writer Group Ids */
+        ck_assert_str_eq("UInt16", writerGroupIds.type->typeName);
+        ck_assert_uint_eq(numRegWriterGroupIds, writerGroupIds.arrayLength);
+        /* Output Reserved Data Set Writer Ids */
+        ck_assert_str_eq("UInt16", dataSetWriterIds.type->typeName);
+        ck_assert_uint_eq(numRegDataSetWriterIds, dataSetWriterIds.arrayLength);
+
+        /* Check reserved Ids */
+        UA_UInt16 start = 0x8000;
+        for(size_t i = 0; i < writerGroupIds.arrayLength; i++) {
+            ck_assert_uint_eq(start+i, ((UA_UInt16 *)writerGroupIds.data)[i]);
+        }
+        for(size_t i = 0; i < dataSetWriterIds.arrayLength; i++) {
+            ck_assert_uint_eq(start+i, ((UA_UInt16 *)dataSetWriterIds.data)[i]);
+        }
+
+        UA_free(inputArguments);
+
+        UA_CallMethodResult_clear(&result);
+        UA_Client_disconnect(client);
+        UA_Client_delete(client);
+} END_TEST
+
+START_TEST(ReserveIdsInvalidTransportUri){
+        UA_StatusCode retVal;
+        UA_Client *client = UA_Client_new();
+        UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+        retVal = UA_Client_connect(client, "opc.tcp://localhost:4840");
+        if(retVal != UA_STATUSCODE_GOOD) {
+            UA_Client_delete(client);
+        }
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        UA_Variant *inputArguments = (UA_Variant *) UA_calloc(3, (sizeof(UA_Variant)));
+        UA_String transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/mqtt");
+        UA_Variant_setScalar(&inputArguments[0], &transportProfileUri, &UA_TYPES[UA_TYPES_STRING]);
+        UA_UInt16 numRegWriterGroupIds = 6;
+        UA_Variant_setScalar(&inputArguments[1], &numRegWriterGroupIds, &UA_TYPES[UA_TYPES_UINT16]);
+        UA_UInt16 numRegDataSetWriterIds = 5;
+        UA_Variant_setScalar(&inputArguments[2], &numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
+
+        UA_CallMethodRequest callMethodRequest;
+        UA_CallMethodRequest_init(&callMethodRequest);
+        callMethodRequest.inputArgumentsSize = 3;
+        callMethodRequest.inputArguments = inputArguments;
+        callMethodRequest.objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION);
+        callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS);
+
+        UA_CallMethodResult result;
+        UA_CallMethodResult_init(&result);
+        result = UA_Server_call(server, &callMethodRequest);
+        ck_assert_int_eq(result.statusCode, UA_STATUSCODE_BADINVALIDARGUMENT);
+
+        UA_free(inputArguments);
+
+        UA_CallMethodResult_clear(&result);
+        UA_Client_disconnect(client);
+        UA_Client_delete(client);
+    } END_TEST
+
 int main(void) {
     TCase *tc_add_pubsub_informationmodel_methods_connection = tcase_create("PubSub connection delete and creation using the information model methods");
     tcase_add_checked_fixture(tc_add_pubsub_informationmodel_methods_connection, setup, teardown);
@@ -1166,6 +1263,8 @@ int main(void) {
     tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, AddNewPubSubConnectionWithReaderGroupandDataSetReader);
     tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, AddNewPubSubConnectionWithReaderGroup);
     tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, AddandRemoveReaderGroup);
+    tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, AddReserveIds);
+    tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, ReserveIdsInvalidTransportUri);
 
     Suite *s = suite_create("PubSub CRUD configuration by the information model functions");
     suite_add_tcase(s, tc_add_pubsub_informationmodel_methods_connection);
diff --git a/tools/schema/NodeIds.csv b/tools/schema/NodeIds.csv
index 7cf06874926..c12a751a4a9 100644
--- a/tools/schema/NodeIds.csv
+++ b/tools/schema/NodeIds.csv
@@ -8216,6 +8216,10 @@ PublishSubscribe_PublishedDataSets_AddPublishedEventsTemplate_InputArguments,173
 PublishSubscribe_PublishedDataSets_AddPublishedEventsTemplate_OutputArguments,17383,Variable
 PublishSubscribe_PublishedDataSets_RemovePublishedDataSet,17384,Method
 PublishSubscribe_PublishedDataSets_RemovePublishedDataSet_InputArguments,17385,Variable
+PublishSubscribe_PubSubConfiguration,25451,Object
+PublishSubscribe_PubSubConfiguration_ReserveIds,25474,Method
+PublishSubscribe_PubSubConfiguration_ReserveIds_InputArguments,25475,Variable
+PublishSubscribe_PubSubConfiguration_ReserveIds_OutputArguments,25476,Variable
 DataSetReaderType_CreateTargetVariables,17386,Method
 DataSetReaderType_CreateTargetVariables_InputArguments,17387,Variable
 DataSetReaderType_CreateTargetVariables_OutputArguments,17388,Variable
diff --git a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
index 76729bd87a5..8152d754580 100644
--- a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
+++ b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
@@ -937,7 +937,6 @@
       <Reference ReferenceType="HasComponent">i=14600</Reference> <!--Status -->
       <Reference ReferenceType="HasComponent">i=17203</Reference> <!--TransportSettings-->
 
-
       <!--
             <Reference ReferenceType="HasComponent">i=17325</Reference> ReaderGroupName
             <Reference ReferenceType="HasComponent">i=19241</Reference> Diagnostics -->
@@ -2162,9 +2161,29 @@
       <Reference ReferenceType="HasComponent">i=17369</Reference>
       <Reference ReferenceType="HasComponent">i=17371</Reference>
       <Reference ReferenceType="HasComponent" IsForward="false">i=2253</Reference>
+      <Reference ReferenceType="HasComponent">i=25451</Reference> <!-- PubSubConfiguration -->
       <Reference ReferenceType="HasTypeDefinition">i=14416</Reference>
     </References>
   </UAObject>
+  <UAObject NodeId="i=25451" BrowseName="PubSubConfiguration" ParentNodeId="i=14443">
+    <DisplayName>PubSubConfiguration</DisplayName>
+    <References>
+      <!--Reference ReferenceType="HasProperty">i=25452</Reference>
+      <Reference ReferenceType="HasProperty">i=25453</Reference>
+      <Reference ReferenceType="HasProperty">i=25454</Reference>
+      <Reference ReferenceType="HasProperty">i=25455</Reference>
+      <Reference ReferenceType="HasComponent">i=25459</Reference>
+      <Reference ReferenceType="HasComponent">i=25462</Reference>
+      <Reference ReferenceType="HasComponent">i=25464</Reference>
+      <Reference ReferenceType="HasComponent">i=25467</Reference>
+      <Reference ReferenceType="HasComponent">i=25469</Reference>
+      <Reference ReferenceType="HasComponent">i=25472</Reference-->
+      <Reference ReferenceType="HasComponent">i=25474</Reference> <!--ReserveIds-->
+      <!--Reference ReferenceType="HasComponent">i=25477</Reference>
+      <Reference ReferenceType="HasTypeDefinition">i=25482</Reference-->
+      <Reference ReferenceType="HasComponent" IsForward="false">i=14443</Reference>
+    </References>
+  </UAObject>
   <UAReferenceType NodeId="i=14476" BrowseName="HasPubSubConnection">
     <DisplayName>HasPubSubConnection</DisplayName>
     <References>
@@ -2885,4 +2904,124 @@
       </ListOfExtensionObject>
     </Value>
   </UAVariable>
+  <UAMethod NodeId="i=25474" BrowseName="ReserveIds" ParentNodeId="i=25451" MethodDeclarationId="i=25505">
+    <DisplayName>ReserveIds</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=25475</Reference>
+      <Reference ReferenceType="HasProperty">i=25476</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=25451</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=25475" BrowseName="InputArguments" ParentNodeId="i=25474" DataType="i=296" ValueRank="1" ArrayDimensions="3">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=25474</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>TransportProfileUri</Name>
+              <DataType>
+                <Identifier>i=12</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>NumReqWriterGroupIds</Name>
+              <DataType>
+                <Identifier>i=5</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>NumReqDataSetWriterIds</Name>
+              <DataType>
+                <Identifier>i=5</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAVariable NodeId="i=25476" BrowseName="OutputArguments" ParentNodeId="i=25474" DataType="i=296" ValueRank="1" ArrayDimensions="3">
+    <DisplayName>OutputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=25474</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>DefaultPublisherId</Name>
+              <DataType>
+                <Identifier>i=24</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>WriterGroupIds</Name>
+              <DataType>
+                <Identifier>i=5</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>DataSetWriterIds</Name>
+              <DataType>
+                <Identifier>i=5</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
 </UANodeSet>

From 162e0f81830dd2153f8f1c4a16da2a00b3234a6c Mon Sep 17 00:00:00 2001
From: Jonas Green <jgr@hms.se>
Date: Wed, 21 Sep 2022 14:36:17 +0200
Subject: [PATCH 0464/1963] feat(server): Publish more notifications with
 delayed callback (#5317)

* fix(server): Publish more notifications with timed callback

If a DataChangeSubsription publish event needs to publish many
notifications using multiple PublishRequests the event can take a
significant amount of time. This can cause delays for other timer
events that are scheduled in near future of the publish event.

An example, a monitored item samples a variable every 10 ms and the
subscription publishes the notifications every 1 second. The
QueueSize is set to 100 and 10 notifications per publish response.
The publish event takes >10 ms and delays the next sampling event
of the monitored item.

By removing the recursive call to UA_Subscription_publish() the
stack usage is reduced as well.

* Implemented UA_Server_addDelayedCallback()

This new API is used by UA_Subscription_publish() to schedule
publication of more notifications that did not fit into the
just transmitted publish response.

* Removed UA_Server_addDelayedCallback() API

* Added boolean guard for delayed callback

Co-authored-by: Julius Pfrommer <jpfr@users.noreply.github.com>
---
 src/server/ua_subscription.c | 33 +++++++++++++++++++++++++++------
 src/server/ua_subscription.h |  4 ++++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index b1766b588de..ab0c528cc53 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -52,8 +52,14 @@ void
 UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    /* Unregister the publish callback */
+    UA_EventLoop *el = server->config.eventLoop;
+
+    /* Unregister the publish callback and possible delayed callback */
     Subscription_unregisterPublishCallback(server, sub);
+    if(sub->delayedCallbackRegistered) {
+        el->removeDelayedCallback(el, &sub->delayedMoreNotifications);
+        sub->delayedCallbackRegistered = false;
+    }
 
     /* Remove the diagnostics object for the subscription */
 #ifdef UA_ENABLE_DIAGNOSTICS
@@ -122,7 +128,6 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     sub->delayedFreePointers.callback = delayedFreeSubscription;
     sub->delayedFreePointers.application = NULL;
     sub->delayedFreePointers.context = sub;
-    UA_EventLoop *el = server->config.eventLoop;
     el->addDelayedCallback(el, &sub->delayedFreePointers);
 }
 
@@ -368,12 +373,20 @@ UA_Subscription_nextSequenceNumber(UA_UInt32 sequenceNumber) {
 }
 
 static void
-publishCallback(UA_Server *server, UA_Subscription *sub) {
+repeatedPublishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_LOCK(&server->serviceMutex);
     UA_Subscription_publish(server, sub);
     UA_UNLOCK(&server->serviceMutex);
 }
 
+static void
+delayedPublishCallback(UA_Server *server, UA_Subscription *sub) {
+    UA_LOCK(&server->serviceMutex);
+    sub->delayedCallbackRegistered = false;
+    UA_Subscription_publish(server, sub);
+    UA_UNLOCK(&server->serviceMutex);
+}
+
 static void
 sendStatusChangeDelete(UA_Server *server, UA_Subscription *sub,
                        UA_PublishResponseEntry *pre) {
@@ -618,8 +631,16 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
 #endif
 
     /* Repeat sending responses if there are more notifications to send */
-    if(moreNotifications)
-        UA_Subscription_publish(server, sub);
+    if(moreNotifications && !sub->delayedCallbackRegistered) {
+        sub->delayedCallbackRegistered = true;
+
+        sub->delayedMoreNotifications.callback = (UA_Callback)delayedPublishCallback;
+        sub->delayedMoreNotifications.application = server;
+        sub->delayedMoreNotifications.context = sub;
+
+        UA_EventLoop *el = server->config.eventLoop;
+        el->addDelayedCallback(el, &sub->delayedMoreNotifications);
+    }
 }
 
 UA_Boolean
@@ -674,7 +695,7 @@ Subscription_registerPublishCallback(UA_Server *server, UA_Subscription *sub) {
         return UA_STATUSCODE_GOOD;
 
     UA_StatusCode retval =
-        addRepeatedCallback(server, (UA_ServerCallback)publishCallback,
+        addRepeatedCallback(server, (UA_ServerCallback)repeatedPublishCallback,
                             sub, sub->publishingInterval, &sub->publishCallbackId);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index e184d7572db..cc67bf6d594 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -252,6 +252,10 @@ struct UA_Subscription {
     /* Publish Callback. Registered if id > 0. */
     UA_UInt64 publishCallbackId;
 
+    /* Delayed callback to schedule publication of more notifications */
+    UA_Boolean delayedCallbackRegistered;
+    UA_DelayedCallback delayedMoreNotifications;
+
     /* MonitoredItems */
     UA_UInt32 lastMonitoredItemId; /* increase the identifiers */
     LIST_HEAD(, UA_MonitoredItem) monitoredItems;

From e1d77080527ae3c6baac3c986d2cd679629a4cf1 Mon Sep 17 00:00:00 2001
From: robertns <makr@keba.com>
Date: Thu, 22 Sep 2022 10:58:56 +0200
Subject: [PATCH 0465/1963] feat(server): optionally save rejected certificate
 (#5260)

---
 CHANGELOG                                     |  11 +
 CMakeLists.txt                                |   6 +
 examples/server_ctt.c                         |   6 +
 include/open62541/config.h.in                 |   1 +
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       |  50 ++
 plugins/crypto/openssl/ua_pki_openssl.c       |   4 +
 .../include/open62541/plugin/pki_default.h    |  10 +
 tests/CMakeLists.txt                          |   4 +
 tests/encryption/check_save_rejected_cert.c   | 507 ++++++++++++++++++
 tools/ci.sh                                   |   1 +
 10 files changed, 600 insertions(+)
 create mode 100644 tests/encryption/check_save_rejected_cert.c

diff --git a/CHANGELOG b/CHANGELOG
index 14a808d06e8..8bf1a1c2ba0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,17 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2022-08-04 Robert Mak <makr at keba.com>
+
+ * Saving unknown client certificates
+
+   'UA_CertificateVerification_CertFolders()' has been extended with
+   an additional parameter - path to the folder where the rejected
+   certificate should be stored. This change applies if
+   `UA_ENABLE_CERT_REJECTED_DIR` is set.
+
+   The change was done with pull request #5260.
+
 2022-08-07 Julius Pfrommer <julius.pfrommer at iosb.fraunhofer.de>
 
  * JSON decoding based on JSON5
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e4da7bccb3..78a723a21f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,6 +198,9 @@ mark_as_advanced(UA_ENABLE_ENCRYPTION_OPENSSL)
 option(UA_ENABLE_ENCRYPTION_MBEDTLS "Deprecated: Enable encryption support (uses mbedTLS)" OFF)
 mark_as_advanced(UA_ENABLE_ENCRYPTION_MBEDTLS)
 
+option(UA_ENABLE_CERT_REJECTED_DIR  "Enable specifying directory for rejected certificates (with mbedTLS)" OFF)
+mark_as_advanced(UA_ENABLE_CERT_REJECTED_DIR)
+
 list (FIND UA_ENCRYPTION_PLUGINS ${UA_ENABLE_ENCRYPTION} _tmp)
 if(UA_ENABLE_ENCRYPTION STREQUAL "OFF" OR ${_tmp} GREATER -1)
     set(UA_ENABLE_ENCRYPTION_OPENSSL OFF)
@@ -207,8 +210,10 @@ if(UA_ENABLE_ENCRYPTION STREQUAL "OFF" OR ${_tmp} GREATER -1)
         set(UA_ENABLE_ENCRYPTION_MBEDTLS ON)
     elseif(UA_ENABLE_ENCRYPTION STREQUAL "OPENSSL")
         set(UA_ENABLE_ENCRYPTION_OPENSSL ON)
+        set(UA_ENABLE_CERT_REJECTED_DIR OFF)
     elseif(UA_ENABLE_ENCRYPTION STREQUAL "LIBRESSL")
         set(UA_ENABLE_ENCRYPTION_LIBRESSL ON)
+        set(UA_ENABLE_CERT_REJECTED_DIR OFF)
     endif()
 # Only for backward compatability
 elseif(UA_ENABLE_ENCRYPTION)
@@ -225,6 +230,7 @@ else()
     if(UA_ENABLE_ENCRYPTION_OPENSSL)
         set(UA_ENABLE_ENCRYPTION "OPENSSL")
         set(UA_ENABLE_ENCRYPTION_MBEDTLS OFF)
+        set(UA_ENABLE_CERT_REJECTED_DIR OFF)
     endif()
 endif()
 
diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index df851e9dbcb..d6ae146cc3a 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1253,9 +1253,15 @@ int main(int argc, char **argv) {
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
     config.certificateVerification.clear(&config.certificateVerification);
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+    res = UA_CertificateVerification_CertFolders(&config.certificateVerification,
+                                                 trustlistFolder, issuerlistFolder,
+                                                 revocationlistFolder, NULL);
+#else
     res = UA_CertificateVerification_CertFolders(&config.certificateVerification,
                                                  trustlistFolder, issuerlistFolder,
                                                  revocationlistFolder);
+#endif
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 #endif /* __linux__ */
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 7f7166fca72..eea4d6f4af4 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -46,6 +46,7 @@
 #cmakedefine UA_ENABLE_MQTT_TLS_OPENSSL
 #cmakedefine UA_ENABLE_MQTT_TLS_MBEDTLS
 #cmakedefine UA_ENABLE_ENCRYPTION_MBEDTLS
+#cmakedefine UA_ENABLE_CERT_REJECTED_DIR
 #cmakedefine UA_ENABLE_TPM2_SECURITY
 #cmakedefine UA_ENABLE_ENCRYPTION_OPENSSL
 #cmakedefine UA_ENABLE_ENCRYPTION_LIBRESSL
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 3931caab5aa..a23d6e771e8 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -12,11 +12,15 @@
 
 #ifdef UA_ENABLE_ENCRYPTION_MBEDTLS
 
+#include "securitypolicy_mbedtls_common.h"
+
 #include <mbedtls/x509.h>
 #include <mbedtls/x509_crt.h>
 #include <mbedtls/error.h>
 #include <mbedtls/version.h>
 
+#include <inttypes.h>
+
 #define REMOTECERTIFICATETRUSTED 1
 #define ISSUERKNOWN              2
 #define DUALPARENT               3
@@ -88,6 +92,7 @@ typedef struct {
     UA_String trustListFolder;
     UA_String issuerListFolder;
     UA_String revocationListFolder;
+    UA_String rejectedListFolder;
 
     mbedtls_x509_crt certificateTrustList;
     mbedtls_x509_crt certificateIssuerList;
@@ -259,6 +264,7 @@ certificateVerification_verify(void *verificationContext,
     if(ci->trustListFolder.length == 0 &&
        ci->issuerListFolder.length == 0 &&
        ci->revocationListFolder.length == 0 &&
+       ci->rejectedListFolder.length == 0 &&
        ci->certificateTrustList.raw.len == 0 &&
        ci->certificateIssuerList.raw.len == 0 &&
        ci->certificateRevocationList.raw.len == 0) {
@@ -471,6 +477,35 @@ certificateVerification_verify(void *verificationContext,
         } else {
             retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         }
+
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+        if(ci->rejectedListFolder.length !=0) {
+            char rejectedFileName[256] = {0};
+            UA_ByteString thumbprint;
+            UA_ByteString_allocBuffer(&thumbprint, UA_SHA1_LENGTH);
+            if(mbedtls_thumbprint_sha1(certificate, &thumbprint) == UA_STATUSCODE_GOOD) {
+                static const char hex2char[] = "0123456789ABCDEF";
+                for (size_t pos = 0, namePos = 0; pos < thumbprint.length; pos++) {
+                    rejectedFileName[namePos++] = hex2char[(thumbprint.data[pos] & 0xf0) >> 4];
+                    rejectedFileName[namePos++] = hex2char[thumbprint.data[pos] & 0x0f];
+                }
+                strcat(rejectedFileName, ".der");
+            } else {
+                UA_UInt64 dt = (UA_UInt64) UA_DateTime_now();
+                sprintf(rejectedFileName, "cert_%" PRIu64 ".der", dt);
+            }
+            UA_ByteString_clear(&thumbprint);
+
+            char *rejectedFullFileName = (char *) calloc(ci->rejectedListFolder.length + 1 /* '/' */ + strlen(rejectedFileName) + 1, sizeof(char));
+            memcpy(rejectedFullFileName, ci->rejectedListFolder.data, ci->rejectedListFolder.length);
+            rejectedFullFileName[ci->rejectedListFolder.length] = '/';
+            memcpy(&rejectedFullFileName[ci->rejectedListFolder.length + 1], rejectedFileName, strlen(rejectedFileName));
+            FILE * fp_rejectedFile = fopen(rejectedFullFileName, "wb");
+            fwrite(certificate->data, sizeof(certificate->data[0]), certificate->length, fp_rejectedFile);
+            free(rejectedFullFileName);
+            fclose(fp_rejectedFile);
+        }
+#endif
     }
 
     mbedtls_x509_crt_free(&remoteCertificate);
@@ -518,6 +553,9 @@ certificateVerification_clear(UA_CertificateVerification *cv) {
     UA_String_clear(&ci->trustListFolder);
     UA_String_clear(&ci->issuerListFolder);
     UA_String_clear(&ci->revocationListFolder);
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+    UA_String_clear(&ci->rejectedListFolder);
+#endif
     UA_free(ci);
     cv->context = NULL;
 }
@@ -586,11 +624,20 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
 
 #ifdef __linux__ /* Linux only so far */
 
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+UA_StatusCode
+UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
+                                       const char *trustListFolder,
+                                       const char *issuerListFolder,
+                                       const char *revocationListFolder,
+                                       const char *rejectedListFolder) {
+#else
 UA_StatusCode
 UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
                                        const char *trustListFolder,
                                        const char *issuerListFolder,
                                        const char *revocationListFolder) {
+#endif
     CertInfo *ci = (CertInfo*)UA_malloc(sizeof(CertInfo));
     if(!ci)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -604,6 +651,9 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
     ci->trustListFolder = UA_STRING_ALLOC(trustListFolder);
     ci->issuerListFolder = UA_STRING_ALLOC(issuerListFolder);
     ci->revocationListFolder = UA_STRING_ALLOC(revocationListFolder);
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+    ci->rejectedListFolder = UA_STRING_ALLOC(rejectedListFolder);
+#endif
 
     reloadCertificates(ci);
 
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index d77670ae6a4..859ef6de344 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -68,6 +68,8 @@ typedef struct {
     UA_String             trustListFolder;
     UA_String             issuerListFolder;
     UA_String             revocationListFolder;
+    /* Used with mbedTLS and UA_ENABLE_CERT_REJECTED_DIR option */
+    UA_String             rejectedListFolder;
 
     STACK_OF(X509) *      skIssue;
     STACK_OF(X509) *      skTrusted;
@@ -99,6 +101,7 @@ UA_CertContext_Init (CertContext * context) {
     UA_ByteString_init (&context->trustListFolder);
     UA_ByteString_init (&context->issuerListFolder);
     UA_ByteString_init (&context->revocationListFolder);
+    UA_ByteString_init (&context->rejectedListFolder);
     return UA_CertContext_sk_Init (context);
 }
 
@@ -114,6 +117,7 @@ UA_CertificateVerification_clear (UA_CertificateVerification * cv) {
     UA_ByteString_clear (&context->trustListFolder);
     UA_ByteString_clear (&context->issuerListFolder);
     UA_ByteString_clear (&context->revocationListFolder);
+    UA_ByteString_clear (&context->rejectedListFolder);
 
     UA_CertContext_sk_free (context);
     UA_free (context);
diff --git a/plugins/include/open62541/plugin/pki_default.h b/plugins/include/open62541/plugin/pki_default.h
index d6a66be976b..a999fbbe626 100644
--- a/plugins/include/open62541/plugin/pki_default.h
+++ b/plugins/include/open62541/plugin/pki_default.h
@@ -30,12 +30,22 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
                                      size_t certificateRevocationListSize);
 
 #ifdef __linux__ /* Linux only so far */
+
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+UA_EXPORT UA_StatusCode
+UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
+                                       const char *trustListFolder,
+                                       const char *issuerListFolder,
+                                       const char *revocationListFolder,
+                                       const char *rejectedListFolder);
+#else
 UA_EXPORT UA_StatusCode
 UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
                                        const char *trustListFolder,
                                        const char *issuerListFolder,
                                        const char *revocationListFolder);
 #endif
+#endif
 
 #endif
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 266a1587691..06d69a80f02 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -397,6 +397,10 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
 endif()
 
+if(UA_ENABLE_ENCRYPTION_MBEDTLS AND UA_ENABLE_CERT_REJECTED_DIR)
+    ua_add_test(encryption/check_save_rejected_cert.c)
+endif()
+
 if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
     ua_add_test(encryption/check_encryption_basic128rsa15.c)
     ua_add_test(encryption/check_encryption_basic256.c)
diff --git a/tests/encryption/check_save_rejected_cert.c b/tests/encryption/check_save_rejected_cert.c
new file mode 100644
index 00000000000..c7a1d3ebcc2
--- /dev/null
+++ b/tests/encryption/check_save_rejected_cert.c
@@ -0,0 +1,507 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2022 (c) Robert Mak, KEBA 
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/securitypolicy.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <open62541/plugin/pki_default.h>
+
+#include "client/ua_client_internal.h"
+#include "ua_server_internal.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "certificates.h"
+#include "check.h"
+#include "testing_clock.h"
+#include "testing_networklayers.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+/* Generated with create_self-signed.py, with
+  -subj "/C=DE/L=Here/O=open62541/CN=open62541Client@localhost"\ */
+const size_t clientCertificatePemSize = 1456;
+UA_Byte clientCertificatePem[] = {
+    0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, 0x45, 0x52,
+    0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a,
+    0x4d, 0x49, 0x49, 0x45, 0x42, 0x6a, 0x43, 0x43, 0x41, 0x75, 0x36, 0x67, 0x41, 0x77,
+    0x49, 0x42, 0x41, 0x67, 0x49, 0x55, 0x41, 0x70, 0x49, 0x71, 0x49, 0x43, 0x47, 0x67,
+    0x7a, 0x76, 0x48, 0x77, 0x31, 0x47, 0x52, 0x64, 0x52, 0x4d, 0x50, 0x4e, 0x69, 0x6a,
+    0x70, 0x53, 0x51, 0x33, 0x63, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49,
+    0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x4c, 0x0a, 0x42, 0x51, 0x41, 0x77, 0x56,
+    0x44, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x68, 0x4d,
+    0x43, 0x52, 0x45, 0x55, 0x78, 0x44, 0x54, 0x41, 0x4c, 0x42, 0x67, 0x4e, 0x56, 0x42,
+    0x41, 0x63, 0x4d, 0x42, 0x45, 0x68, 0x6c, 0x63, 0x6d, 0x55, 0x78, 0x45, 0x6a, 0x41,
+    0x51, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x6f, 0x4d, 0x43, 0x57, 0x39, 0x77, 0x5a,
+    0x57, 0x34, 0x32, 0x0a, 0x4d, 0x6a, 0x55, 0x30, 0x4d, 0x54, 0x45, 0x69, 0x4d, 0x43,
+    0x41, 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x77, 0x77, 0x5a, 0x62, 0x33, 0x42, 0x6c,
+    0x62, 0x6a, 0x59, 0x79, 0x4e, 0x54, 0x51, 0x78, 0x51, 0x32, 0x78, 0x70, 0x5a, 0x57,
+    0x35, 0x30, 0x51, 0x47, 0x78, 0x76, 0x59, 0x32, 0x46, 0x73, 0x61, 0x47, 0x39, 0x7a,
+    0x64, 0x44, 0x41, 0x65, 0x46, 0x77, 0x30, 0x79, 0x4d, 0x6a, 0x41, 0x34, 0x0a, 0x4d,
+    0x54, 0x41, 0x78, 0x4d, 0x54, 0x55, 0x32, 0x4e, 0x44, 0x64, 0x61, 0x46, 0x77, 0x30,
+    0x79, 0x4d, 0x7a, 0x41, 0x34, 0x4d, 0x54, 0x41, 0x78, 0x4d, 0x54, 0x55, 0x32, 0x4e,
+    0x44, 0x64, 0x61, 0x4d, 0x46, 0x51, 0x78, 0x43, 0x7a, 0x41, 0x4a, 0x42, 0x67, 0x4e,
+    0x56, 0x42, 0x41, 0x59, 0x54, 0x41, 0x6b, 0x52, 0x46, 0x4d, 0x51, 0x30, 0x77, 0x43,
+    0x77, 0x59, 0x44, 0x56, 0x51, 0x51, 0x48, 0x0a, 0x44, 0x41, 0x52, 0x49, 0x5a, 0x58,
+    0x4a, 0x6c, 0x4d, 0x52, 0x49, 0x77, 0x45, 0x41, 0x59, 0x44, 0x56, 0x51, 0x51, 0x4b,
+    0x44, 0x41, 0x6c, 0x76, 0x63, 0x47, 0x56, 0x75, 0x4e, 0x6a, 0x49, 0x31, 0x4e, 0x44,
+    0x45, 0x78, 0x49, 0x6a, 0x41, 0x67, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x4d, 0x4d,
+    0x47, 0x57, 0x39, 0x77, 0x5a, 0x57, 0x34, 0x32, 0x4d, 0x6a, 0x55, 0x30, 0x4d, 0x55,
+    0x4e, 0x73, 0x0a, 0x61, 0x57, 0x56, 0x75, 0x64, 0x45, 0x42, 0x73, 0x62, 0x32, 0x4e,
+    0x68, 0x62, 0x47, 0x68, 0x76, 0x63, 0x33, 0x51, 0x77, 0x67, 0x67, 0x45, 0x69, 0x4d,
+    0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, 0x62, 0x33, 0x44, 0x51, 0x45,
+    0x42, 0x41, 0x51, 0x55, 0x41, 0x41, 0x34, 0x49, 0x42, 0x44, 0x77, 0x41, 0x77, 0x67,
+    0x67, 0x45, 0x4b, 0x41, 0x6f, 0x49, 0x42, 0x41, 0x51, 0x43, 0x34, 0x0a, 0x73, 0x56,
+    0x61, 0x59, 0x4a, 0x42, 0x57, 0x73, 0x76, 0x36, 0x55, 0x4b, 0x4f, 0x74, 0x55, 0x57,
+    0x37, 0x4e, 0x51, 0x6d, 0x7a, 0x44, 0x78, 0x53, 0x43, 0x73, 0x35, 0x6a, 0x6e, 0x6f,
+    0x4c, 0x6a, 0x6c, 0x76, 0x4d, 0x76, 0x42, 0x38, 0x52, 0x67, 0x42, 0x4d, 0x5a, 0x2b,
+    0x4c, 0x38, 0x34, 0x43, 0x71, 0x68, 0x32, 0x62, 0x47, 0x76, 0x66, 0x4b, 0x54, 0x77,
+    0x46, 0x75, 0x5a, 0x78, 0x73, 0x56, 0x0a, 0x58, 0x69, 0x4d, 0x31, 0x71, 0x69, 0x73,
+    0x30, 0x44, 0x2b, 0x52, 0x73, 0x4a, 0x32, 0x77, 0x37, 0x4e, 0x72, 0x67, 0x37, 0x56,
+    0x7a, 0x4a, 0x6c, 0x56, 0x58, 0x55, 0x67, 0x57, 0x50, 0x38, 0x4f, 0x34, 0x33, 0x48,
+    0x65, 0x54, 0x35, 0x36, 0x38, 0x66, 0x31, 0x6f, 0x4d, 0x2f, 0x30, 0x54, 0x4e, 0x52,
+    0x4d, 0x47, 0x6e, 0x4b, 0x51, 0x57, 0x52, 0x43, 0x38, 0x63, 0x36, 0x6e, 0x2f, 0x76,
+    0x38, 0x0a, 0x41, 0x4f, 0x52, 0x6c, 0x53, 0x46, 0x77, 0x73, 0x33, 0x6e, 0x45, 0x34,
+    0x4b, 0x72, 0x48, 0x69, 0x61, 0x47, 0x68, 0x6e, 0x63, 0x68, 0x4b, 0x38, 0x38, 0x32,
+    0x70, 0x6a, 0x43, 0x32, 0x71, 0x64, 0x37, 0x59, 0x78, 0x37, 0x6d, 0x61, 0x6e, 0x76,
+    0x6c, 0x45, 0x45, 0x4f, 0x73, 0x69, 0x41, 0x30, 0x36, 0x68, 0x4e, 0x36, 0x49, 0x34,
+    0x2b, 0x34, 0x4d, 0x54, 0x72, 0x4f, 0x6f, 0x4a, 0x65, 0x77, 0x0a, 0x70, 0x51, 0x36,
+    0x45, 0x53, 0x32, 0x42, 0x62, 0x43, 0x67, 0x66, 0x30, 0x4f, 0x67, 0x68, 0x34, 0x37,
+    0x54, 0x39, 0x77, 0x64, 0x6b, 0x41, 0x75, 0x51, 0x35, 0x62, 0x47, 0x73, 0x36, 0x6d,
+    0x36, 0x47, 0x68, 0x58, 0x5a, 0x58, 0x35, 0x56, 0x78, 0x41, 0x47, 0x6e, 0x6b, 0x70,
+    0x59, 0x7a, 0x75, 0x61, 0x6f, 0x64, 0x66, 0x52, 0x6e, 0x4d, 0x62, 0x4f, 0x58, 0x78,
+    0x34, 0x32, 0x62, 0x4d, 0x47, 0x0a, 0x65, 0x31, 0x64, 0x41, 0x35, 0x42, 0x4f, 0x62,
+    0x6c, 0x49, 0x52, 0x4e, 0x5a, 0x4e, 0x56, 0x77, 0x2b, 0x77, 0x33, 0x34, 0x4e, 0x4c,
+    0x55, 0x63, 0x75, 0x47, 0x52, 0x41, 0x4a, 0x69, 0x34, 0x43, 0x45, 0x77, 0x6c, 0x52,
+    0x4f, 0x4f, 0x59, 0x5a, 0x51, 0x77, 0x68, 0x6a, 0x4d, 0x32, 0x69, 0x47, 0x73, 0x48,
+    0x77, 0x61, 0x4c, 0x53, 0x6b, 0x44, 0x50, 0x76, 0x30, 0x42, 0x6d, 0x44, 0x79, 0x67,
+    0x0a, 0x69, 0x6f, 0x46, 0x48, 0x38, 0x67, 0x7a, 0x63, 0x61, 0x38, 0x72, 0x5a, 0x36,
+    0x32, 0x30, 0x70, 0x4e, 0x50, 0x5a, 0x4c, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41, 0x47,
+    0x6a, 0x67, 0x63, 0x38, 0x77, 0x67, 0x63, 0x77, 0x77, 0x48, 0x51, 0x59, 0x44, 0x56,
+    0x52, 0x30, 0x4f, 0x42, 0x42, 0x59, 0x45, 0x46, 0x48, 0x38, 0x66, 0x52, 0x32, 0x6a,
+    0x47, 0x56, 0x56, 0x39, 0x56, 0x38, 0x68, 0x41, 0x2f, 0x0a, 0x77, 0x41, 0x57, 0x59,
+    0x36, 0x78, 0x74, 0x4f, 0x39, 0x57, 0x4f, 0x41, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31,
+    0x55, 0x64, 0x49, 0x77, 0x51, 0x59, 0x4d, 0x42, 0x61, 0x41, 0x46, 0x48, 0x38, 0x66,
+    0x52, 0x32, 0x6a, 0x47, 0x56, 0x56, 0x39, 0x56, 0x38, 0x68, 0x41, 0x2f, 0x77, 0x41,
+    0x57, 0x59, 0x36, 0x78, 0x74, 0x4f, 0x39, 0x57, 0x4f, 0x41, 0x4d, 0x41, 0x6b, 0x47,
+    0x41, 0x31, 0x55, 0x64, 0x0a, 0x45, 0x77, 0x51, 0x43, 0x4d, 0x41, 0x41, 0x77, 0x43,
+    0x77, 0x59, 0x44, 0x56, 0x52, 0x30, 0x50, 0x42, 0x41, 0x51, 0x44, 0x41, 0x67, 0x4c,
+    0x30, 0x4d, 0x42, 0x30, 0x47, 0x41, 0x31, 0x55, 0x64, 0x4a, 0x51, 0x51, 0x57, 0x4d,
+    0x42, 0x51, 0x47, 0x43, 0x43, 0x73, 0x47, 0x41, 0x51, 0x55, 0x46, 0x42, 0x77, 0x4d,
+    0x42, 0x42, 0x67, 0x67, 0x72, 0x42, 0x67, 0x45, 0x46, 0x42, 0x51, 0x63, 0x44, 0x0a,
+    0x41, 0x6a, 0x42, 0x54, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x52, 0x45, 0x45, 0x54, 0x44,
+    0x42, 0x4b, 0x67, 0x67, 0x78, 0x6c, 0x59, 0x57, 0x4e, 0x6d, 0x4d, 0x44, 0x56, 0x68,
+    0x5a, 0x44, 0x4a, 0x6b, 0x5a, 0x47, 0x57, 0x43, 0x44, 0x47, 0x56, 0x68, 0x59, 0x32,
+    0x59, 0x77, 0x4e, 0x57, 0x46, 0x6b, 0x4d, 0x6d, 0x52, 0x6b, 0x5a, 0x59, 0x63, 0x45,
+    0x72, 0x42, 0x45, 0x41, 0x41, 0x6f, 0x63, 0x45, 0x0a, 0x66, 0x77, 0x41, 0x41, 0x41,
+    0x59, 0x59, 0x67, 0x64, 0x58, 0x4a, 0x75, 0x4f, 0x6d, 0x39, 0x77, 0x5a, 0x57, 0x34,
+    0x32, 0x4d, 0x6a, 0x55, 0x30, 0x4d, 0x53, 0x35, 0x7a, 0x5a, 0x58, 0x4a, 0x32, 0x5a,
+    0x58, 0x49, 0x75, 0x59, 0x58, 0x42, 0x77, 0x62, 0x47, 0x6c, 0x6a, 0x59, 0x58, 0x52,
+    0x70, 0x62, 0x32, 0x34, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68,
+    0x76, 0x63, 0x4e, 0x0a, 0x41, 0x51, 0x45, 0x4c, 0x42, 0x51, 0x41, 0x44, 0x67, 0x67,
+    0x45, 0x42, 0x41, 0x42, 0x39, 0x30, 0x52, 0x68, 0x4c, 0x39, 0x43, 0x46, 0x6b, 0x69,
+    0x52, 0x32, 0x4a, 0x37, 0x33, 0x50, 0x58, 0x6b, 0x36, 0x7a, 0x65, 0x79, 0x73, 0x57,
+    0x4f, 0x6f, 0x59, 0x4f, 0x63, 0x73, 0x57, 0x44, 0x67, 0x79, 0x62, 0x65, 0x55, 0x5a,
+    0x68, 0x78, 0x41, 0x71, 0x37, 0x58, 0x46, 0x42, 0x42, 0x53, 0x58, 0x42, 0x0a, 0x66,
+    0x4e, 0x78, 0x4a, 0x76, 0x55, 0x58, 0x6d, 0x43, 0x62, 0x6f, 0x72, 0x42, 0x53, 0x4b,
+    0x58, 0x65, 0x44, 0x52, 0x5a, 0x4a, 0x4a, 0x4a, 0x52, 0x73, 0x59, 0x37, 0x5a, 0x53,
+    0x53, 0x57, 0x76, 0x48, 0x5a, 0x4f, 0x78, 0x79, 0x62, 0x33, 0x5a, 0x43, 0x71, 0x69,
+    0x4f, 0x36, 0x70, 0x57, 0x78, 0x33, 0x44, 0x41, 0x58, 0x30, 0x2b, 0x31, 0x57, 0x69,
+    0x4c, 0x4d, 0x75, 0x54, 0x31, 0x39, 0x68, 0x0a, 0x52, 0x7a, 0x54, 0x67, 0x67, 0x32,
+    0x30, 0x43, 0x2b, 0x75, 0x36, 0x4f, 0x43, 0x66, 0x64, 0x71, 0x41, 0x65, 0x32, 0x4a,
+    0x2b, 0x55, 0x2b, 0x4f, 0x36, 0x6c, 0x6a, 0x44, 0x35, 0x69, 0x4a, 0x4d, 0x56, 0x4f,
+    0x61, 0x71, 0x4c, 0x79, 0x4f, 0x39, 0x4b, 0x62, 0x72, 0x62, 0x46, 0x59, 0x49, 0x44,
+    0x44, 0x6f, 0x75, 0x31, 0x77, 0x54, 0x55, 0x49, 0x4c, 0x78, 0x52, 0x59, 0x61, 0x31,
+    0x32, 0x6c, 0x0a, 0x70, 0x45, 0x71, 0x50, 0x6a, 0x2b, 0x63, 0x34, 0x49, 0x68, 0x42,
+    0x2f, 0x52, 0x6a, 0x42, 0x56, 0x41, 0x75, 0x37, 0x7a, 0x4f, 0x49, 0x64, 0x34, 0x59,
+    0x52, 0x5a, 0x33, 0x51, 0x48, 0x71, 0x71, 0x56, 0x50, 0x66, 0x4e, 0x2b, 0x55, 0x58,
+    0x54, 0x46, 0x78, 0x55, 0x46, 0x38, 0x69, 0x68, 0x55, 0x2b, 0x4b, 0x42, 0x52, 0x6a,
+    0x77, 0x4e, 0x71, 0x68, 0x6a, 0x74, 0x6e, 0x5a, 0x53, 0x62, 0x49, 0x0a, 0x5a, 0x6b,
+    0x34, 0x52, 0x55, 0x42, 0x70, 0x56, 0x2f, 0x38, 0x4b, 0x59, 0x54, 0x42, 0x70, 0x56,
+    0x72, 0x42, 0x61, 0x7a, 0x47, 0x43, 0x6d, 0x43, 0x64, 0x78, 0x6b, 0x32, 0x58, 0x6d,
+    0x53, 0x6a, 0x47, 0x36, 0x6a, 0x68, 0x73, 0x4d, 0x61, 0x70, 0x77, 0x78, 0x79, 0x4b,
+    0x59, 0x34, 0x42, 0x45, 0x79, 0x6f, 0x39, 0x4f, 0x32, 0x53, 0x6d, 0x59, 0x78, 0x69,
+    0x45, 0x48, 0x73, 0x59, 0x47, 0x76, 0x0a, 0x39, 0x61, 0x62, 0x33, 0x41, 0x75, 0x6e,
+    0x38, 0x53, 0x70, 0x51, 0x72, 0x6b, 0x55, 0x37, 0x44, 0x4f, 0x72, 0x45, 0x42, 0x31,
+    0x44, 0x69, 0x37, 0x6b, 0x36, 0x49, 0x67, 0x65, 0x4c, 0x53, 0x73, 0x76, 0x4f, 0x77,
+    0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, 0x45, 0x52,
+    0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a};
+
+UA_Byte clientCertificateThumbprint[] = "4D11B79D8100DCE2B19918A0FDACD24727FE99DE";
+
+UA_Byte clientCertificateKey[] = {
+    0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x52, 0x53, 0x41,
+    0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d,
+    0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x45, 0x6f, 0x77, 0x49, 0x42, 0x41, 0x41,
+    0x4b, 0x43, 0x41, 0x51, 0x45, 0x41, 0x75, 0x4c, 0x46, 0x57, 0x6d, 0x43, 0x51, 0x56,
+    0x72, 0x4c, 0x2b, 0x6c, 0x43, 0x6a, 0x72, 0x56, 0x46, 0x75, 0x7a, 0x55, 0x4a, 0x73,
+    0x77, 0x38, 0x55, 0x67, 0x72, 0x4f, 0x59, 0x35, 0x36, 0x43, 0x34, 0x35, 0x62, 0x7a,
+    0x4c, 0x77, 0x66, 0x45, 0x59, 0x41, 0x54, 0x47, 0x66, 0x69, 0x2f, 0x4f, 0x0a, 0x41,
+    0x71, 0x6f, 0x64, 0x6d, 0x78, 0x72, 0x33, 0x79, 0x6b, 0x38, 0x42, 0x62, 0x6d, 0x63,
+    0x62, 0x46, 0x56, 0x34, 0x6a, 0x4e, 0x61, 0x6f, 0x72, 0x4e, 0x41, 0x2f, 0x6b, 0x62,
+    0x43, 0x64, 0x73, 0x4f, 0x7a, 0x61, 0x34, 0x4f, 0x31, 0x63, 0x79, 0x5a, 0x56, 0x56,
+    0x31, 0x49, 0x46, 0x6a, 0x2f, 0x44, 0x75, 0x4e, 0x78, 0x33, 0x6b, 0x2b, 0x65, 0x76,
+    0x48, 0x39, 0x61, 0x44, 0x50, 0x39, 0x45, 0x0a, 0x7a, 0x55, 0x54, 0x42, 0x70, 0x79,
+    0x6b, 0x46, 0x6b, 0x51, 0x76, 0x48, 0x4f, 0x70, 0x2f, 0x37, 0x2f, 0x41, 0x44, 0x6b,
+    0x5a, 0x55, 0x68, 0x63, 0x4c, 0x4e, 0x35, 0x78, 0x4f, 0x43, 0x71, 0x78, 0x34, 0x6d,
+    0x68, 0x6f, 0x5a, 0x33, 0x49, 0x53, 0x76, 0x50, 0x4e, 0x71, 0x59, 0x77, 0x74, 0x71,
+    0x6e, 0x65, 0x32, 0x4d, 0x65, 0x35, 0x6d, 0x70, 0x37, 0x35, 0x52, 0x42, 0x44, 0x72,
+    0x49, 0x67, 0x0a, 0x4e, 0x4f, 0x6f, 0x54, 0x65, 0x69, 0x4f, 0x50, 0x75, 0x44, 0x45,
+    0x36, 0x7a, 0x71, 0x43, 0x58, 0x73, 0x4b, 0x55, 0x4f, 0x68, 0x45, 0x74, 0x67, 0x57,
+    0x77, 0x6f, 0x48, 0x39, 0x44, 0x6f, 0x49, 0x65, 0x4f, 0x30, 0x2f, 0x63, 0x48, 0x5a,
+    0x41, 0x4c, 0x6b, 0x4f, 0x57, 0x78, 0x72, 0x4f, 0x70, 0x75, 0x68, 0x6f, 0x56, 0x32,
+    0x56, 0x2b, 0x56, 0x63, 0x51, 0x42, 0x70, 0x35, 0x4b, 0x57, 0x4d, 0x0a, 0x37, 0x6d,
+    0x71, 0x48, 0x58, 0x30, 0x5a, 0x7a, 0x47, 0x7a, 0x6c, 0x38, 0x65, 0x4e, 0x6d, 0x7a,
+    0x42, 0x6e, 0x74, 0x58, 0x51, 0x4f, 0x51, 0x54, 0x6d, 0x35, 0x53, 0x45, 0x54, 0x57,
+    0x54, 0x56, 0x63, 0x50, 0x73, 0x4e, 0x2b, 0x44, 0x53, 0x31, 0x48, 0x4c, 0x68, 0x6b,
+    0x51, 0x43, 0x59, 0x75, 0x41, 0x68, 0x4d, 0x4a, 0x55, 0x54, 0x6a, 0x6d, 0x47, 0x55,
+    0x4d, 0x49, 0x59, 0x7a, 0x4e, 0x6f, 0x0a, 0x68, 0x72, 0x42, 0x38, 0x47, 0x69, 0x30,
+    0x70, 0x41, 0x7a, 0x37, 0x39, 0x41, 0x5a, 0x67, 0x38, 0x6f, 0x49, 0x71, 0x42, 0x52,
+    0x2f, 0x49, 0x4d, 0x33, 0x47, 0x76, 0x4b, 0x32, 0x65, 0x74, 0x74, 0x4b, 0x54, 0x54,
+    0x32, 0x53, 0x77, 0x49, 0x44, 0x41, 0x51, 0x41, 0x42, 0x41, 0x6f, 0x49, 0x42, 0x41,
+    0x45, 0x4d, 0x43, 0x68, 0x4b, 0x71, 0x61, 0x6e, 0x51, 0x71, 0x61, 0x56, 0x65, 0x55,
+    0x4b, 0x0a, 0x52, 0x33, 0x6f, 0x54, 0x33, 0x7a, 0x31, 0x63, 0x61, 0x4a, 0x35, 0x54,
+    0x73, 0x57, 0x4a, 0x50, 0x68, 0x71, 0x6e, 0x51, 0x67, 0x4e, 0x63, 0x56, 0x65, 0x46,
+    0x68, 0x6d, 0x49, 0x79, 0x5a, 0x78, 0x62, 0x63, 0x74, 0x6c, 0x73, 0x57, 0x77, 0x76,
+    0x4d, 0x71, 0x78, 0x43, 0x55, 0x67, 0x43, 0x65, 0x68, 0x43, 0x4d, 0x53, 0x6a, 0x71,
+    0x2f, 0x50, 0x31, 0x2f, 0x45, 0x42, 0x75, 0x78, 0x7a, 0x4b, 0x0a, 0x69, 0x4f, 0x68,
+    0x4c, 0x43, 0x44, 0x6a, 0x76, 0x67, 0x43, 0x64, 0x6f, 0x42, 0x43, 0x45, 0x43, 0x61,
+    0x54, 0x67, 0x62, 0x71, 0x5a, 0x72, 0x42, 0x52, 0x4a, 0x53, 0x62, 0x6d, 0x43, 0x36,
+    0x54, 0x42, 0x34, 0x46, 0x36, 0x61, 0x74, 0x43, 0x64, 0x66, 0x35, 0x6d, 0x4b, 0x72,
+    0x6e, 0x52, 0x45, 0x79, 0x34, 0x59, 0x35, 0x52, 0x4b, 0x54, 0x43, 0x78, 0x6a, 0x36,
+    0x35, 0x54, 0x6c, 0x62, 0x55, 0x0a, 0x6c, 0x73, 0x6e, 0x51, 0x6d, 0x2b, 0x43, 0x38,
+    0x63, 0x4c, 0x51, 0x42, 0x6c, 0x52, 0x33, 0x75, 0x62, 0x48, 0x5a, 0x30, 0x55, 0x37,
+    0x34, 0x63, 0x6d, 0x4a, 0x32, 0x46, 0x6a, 0x4c, 0x6c, 0x59, 0x61, 0x77, 0x74, 0x39,
+    0x6f, 0x4c, 0x63, 0x48, 0x35, 0x6f, 0x30, 0x42, 0x58, 0x70, 0x44, 0x79, 0x62, 0x73,
+    0x31, 0x4d, 0x69, 0x6e, 0x6e, 0x69, 0x6b, 0x4f, 0x55, 0x35, 0x33, 0x61, 0x48, 0x75,
+    0x0a, 0x38, 0x39, 0x6e, 0x2b, 0x69, 0x2b, 0x31, 0x35, 0x6d, 0x76, 0x6a, 0x31, 0x6a,
+    0x68, 0x67, 0x6c, 0x59, 0x48, 0x6c, 0x79, 0x31, 0x65, 0x70, 0x69, 0x53, 0x63, 0x50,
+    0x50, 0x39, 0x6d, 0x52, 0x6e, 0x41, 0x76, 0x46, 0x32, 0x43, 0x53, 0x2b, 0x64, 0x55,
+    0x64, 0x69, 0x73, 0x59, 0x47, 0x78, 0x5a, 0x4a, 0x73, 0x45, 0x51, 0x5a, 0x77, 0x4c,
+    0x39, 0x6f, 0x4b, 0x74, 0x6f, 0x58, 0x66, 0x34, 0x65, 0x0a, 0x5a, 0x76, 0x4d, 0x78,
+    0x51, 0x70, 0x6f, 0x6b, 0x4c, 0x56, 0x64, 0x74, 0x38, 0x59, 0x6b, 0x4d, 0x6c, 0x36,
+    0x42, 0x65, 0x6e, 0x61, 0x34, 0x49, 0x70, 0x45, 0x61, 0x50, 0x31, 0x7a, 0x62, 0x77,
+    0x58, 0x76, 0x63, 0x4e, 0x67, 0x31, 0x4d, 0x6a, 0x42, 0x6b, 0x79, 0x39, 0x55, 0x71,
+    0x6f, 0x4e, 0x69, 0x6d, 0x41, 0x70, 0x59, 0x7a, 0x56, 0x51, 0x37, 0x7a, 0x71, 0x53,
+    0x62, 0x57, 0x62, 0x42, 0x0a, 0x44, 0x46, 0x6c, 0x74, 0x53, 0x6d, 0x45, 0x43, 0x67,
+    0x59, 0x45, 0x41, 0x35, 0x58, 0x55, 0x75, 0x79, 0x2f, 0x67, 0x44, 0x6c, 0x56, 0x51,
+    0x45, 0x49, 0x41, 0x32, 0x72, 0x74, 0x71, 0x6c, 0x58, 0x57, 0x7a, 0x50, 0x57, 0x6c,
+    0x61, 0x6b, 0x42, 0x61, 0x4a, 0x48, 0x31, 0x66, 0x33, 0x62, 0x72, 0x37, 0x39, 0x57,
+    0x65, 0x30, 0x4e, 0x51, 0x46, 0x34, 0x59, 0x76, 0x79, 0x4f, 0x7a, 0x39, 0x33, 0x0a,
+    0x79, 0x76, 0x6d, 0x58, 0x6b, 0x2b, 0x53, 0x4d, 0x41, 0x76, 0x32, 0x32, 0x6d, 0x6e,
+    0x7a, 0x31, 0x69, 0x76, 0x48, 0x74, 0x57, 0x36, 0x54, 0x57, 0x57, 0x61, 0x68, 0x61,
+    0x66, 0x34, 0x54, 0x65, 0x44, 0x50, 0x65, 0x61, 0x4b, 0x62, 0x4e, 0x37, 0x66, 0x33,
+    0x2f, 0x67, 0x56, 0x71, 0x39, 0x68, 0x46, 0x46, 0x6d, 0x68, 0x79, 0x41, 0x4e, 0x46,
+    0x7a, 0x70, 0x47, 0x42, 0x50, 0x6f, 0x68, 0x36, 0x0a, 0x74, 0x52, 0x41, 0x71, 0x44,
+    0x36, 0x39, 0x43, 0x50, 0x5a, 0x36, 0x66, 0x47, 0x72, 0x71, 0x59, 0x55, 0x58, 0x59,
+    0x72, 0x51, 0x7a, 0x6e, 0x4d, 0x4c, 0x65, 0x73, 0x6c, 0x4c, 0x76, 0x70, 0x34, 0x53,
+    0x58, 0x68, 0x52, 0x6e, 0x6e, 0x46, 0x6b, 0x6c, 0x2b, 0x77, 0x61, 0x45, 0x75, 0x43,
+    0x45, 0x35, 0x6e, 0x4d, 0x36, 0x31, 0x67, 0x4d, 0x43, 0x67, 0x59, 0x45, 0x41, 0x7a,
+    0x67, 0x36, 0x4e, 0x0a, 0x4b, 0x6b, 0x73, 0x6c, 0x79, 0x38, 0x39, 0x42, 0x43, 0x41,
+    0x71, 0x36, 0x79, 0x73, 0x2f, 0x62, 0x47, 0x61, 0x61, 0x62, 0x73, 0x32, 0x75, 0x68,
+    0x74, 0x46, 0x6b, 0x50, 0x56, 0x61, 0x64, 0x44, 0x2f, 0x2f, 0x4f, 0x54, 0x52, 0x62,
+    0x68, 0x36, 0x73, 0x31, 0x43, 0x35, 0x74, 0x74, 0x6e, 0x52, 0x46, 0x57, 0x2b, 0x49,
+    0x6b, 0x4b, 0x76, 0x6b, 0x78, 0x6d, 0x4b, 0x37, 0x6c, 0x66, 0x50, 0x4f, 0x0a, 0x56,
+    0x53, 0x50, 0x47, 0x64, 0x65, 0x50, 0x57, 0x35, 0x73, 0x4c, 0x69, 0x4b, 0x63, 0x45,
+    0x67, 0x74, 0x7a, 0x30, 0x65, 0x64, 0x57, 0x6d, 0x7a, 0x59, 0x74, 0x6f, 0x72, 0x55,
+    0x76, 0x4d, 0x4b, 0x30, 0x37, 0x4d, 0x63, 0x31, 0x57, 0x38, 0x76, 0x75, 0x41, 0x38,
+    0x79, 0x4a, 0x44, 0x4d, 0x53, 0x50, 0x57, 0x57, 0x77, 0x45, 0x47, 0x32, 0x34, 0x34,
+    0x4d, 0x59, 0x4c, 0x77, 0x72, 0x46, 0x66, 0x0a, 0x76, 0x31, 0x35, 0x72, 0x66, 0x4a,
+    0x78, 0x61, 0x6c, 0x33, 0x79, 0x2f, 0x63, 0x48, 0x52, 0x4b, 0x33, 0x41, 0x6a, 0x50,
+    0x44, 0x34, 0x4b, 0x75, 0x6b, 0x57, 0x4e, 0x31, 0x44, 0x63, 0x53, 0x2f, 0x71, 0x4b,
+    0x38, 0x63, 0x73, 0x42, 0x6b, 0x43, 0x67, 0x59, 0x41, 0x4d, 0x43, 0x4a, 0x6f, 0x38,
+    0x72, 0x6a, 0x51, 0x5a, 0x35, 0x37, 0x38, 0x54, 0x6f, 0x30, 0x50, 0x6e, 0x48, 0x33,
+    0x68, 0x71, 0x0a, 0x57, 0x77, 0x79, 0x63, 0x36, 0x72, 0x45, 0x64, 0x4e, 0x39, 0x4a,
+    0x6c, 0x4c, 0x65, 0x70, 0x76, 0x75, 0x49, 0x64, 0x4d, 0x73, 0x6d, 0x48, 0x67, 0x6b,
+    0x30, 0x4e, 0x50, 0x34, 0x69, 0x4d, 0x35, 0x4c, 0x4e, 0x2f, 0x4c, 0x4c, 0x4d, 0x67,
+    0x2b, 0x2b, 0x2b, 0x6c, 0x51, 0x72, 0x73, 0x37, 0x39, 0x79, 0x33, 0x52, 0x45, 0x51,
+    0x78, 0x2f, 0x4f, 0x73, 0x65, 0x71, 0x56, 0x46, 0x33, 0x58, 0x42, 0x0a, 0x76, 0x6c,
+    0x61, 0x43, 0x61, 0x31, 0x78, 0x46, 0x73, 0x6f, 0x49, 0x6b, 0x61, 0x61, 0x77, 0x77,
+    0x73, 0x67, 0x61, 0x76, 0x41, 0x36, 0x54, 0x73, 0x6b, 0x57, 0x72, 0x79, 0x79, 0x5a,
+    0x75, 0x4e, 0x31, 0x56, 0x77, 0x76, 0x57, 0x47, 0x53, 0x6a, 0x38, 0x4b, 0x61, 0x74,
+    0x63, 0x79, 0x32, 0x37, 0x7a, 0x2f, 0x4f, 0x79, 0x34, 0x64, 0x77, 0x59, 0x61, 0x47,
+    0x57, 0x5a, 0x30, 0x68, 0x37, 0x75, 0x0a, 0x30, 0x33, 0x57, 0x4d, 0x56, 0x71, 0x77,
+    0x4d, 0x33, 0x35, 0x2f, 0x36, 0x62, 0x33, 0x58, 0x6f, 0x31, 0x42, 0x41, 0x34, 0x32,
+    0x77, 0x4b, 0x42, 0x67, 0x42, 0x58, 0x72, 0x76, 0x6d, 0x44, 0x4e, 0x64, 0x63, 0x76,
+    0x6b, 0x31, 0x49, 0x70, 0x43, 0x65, 0x66, 0x53, 0x78, 0x67, 0x43, 0x47, 0x4f, 0x63,
+    0x2b, 0x6e, 0x32, 0x66, 0x56, 0x46, 0x75, 0x57, 0x41, 0x39, 0x49, 0x71, 0x42, 0x64,
+    0x47, 0x0a, 0x6c, 0x6c, 0x68, 0x49, 0x63, 0x2b, 0x55, 0x33, 0x70, 0x55, 0x6f, 0x71,
+    0x69, 0x65, 0x2b, 0x35, 0x32, 0x64, 0x46, 0x71, 0x4f, 0x41, 0x42, 0x53, 0x36, 0x4a,
+    0x6e, 0x66, 0x51, 0x67, 0x67, 0x55, 0x73, 0x6a, 0x78, 0x41, 0x62, 0x4e, 0x42, 0x48,
+    0x30, 0x7a, 0x2b, 0x56, 0x36, 0x43, 0x45, 0x57, 0x51, 0x33, 0x4e, 0x43, 0x4e, 0x32,
+    0x39, 0x41, 0x76, 0x6e, 0x4d, 0x6f, 0x6e, 0x2f, 0x49, 0x39, 0x0a, 0x6a, 0x38, 0x65,
+    0x30, 0x2b, 0x47, 0x4b, 0x67, 0x57, 0x7a, 0x6b, 0x32, 0x70, 0x61, 0x34, 0x61, 0x62,
+    0x30, 0x79, 0x51, 0x48, 0x36, 0x62, 0x70, 0x36, 0x72, 0x35, 0x66, 0x6d, 0x45, 0x77,
+    0x48, 0x67, 0x32, 0x2f, 0x53, 0x51, 0x6d, 0x44, 0x7a, 0x53, 0x48, 0x70, 0x79, 0x4a,
+    0x4c, 0x53, 0x62, 0x79, 0x30, 0x74, 0x66, 0x48, 0x36, 0x73, 0x66, 0x35, 0x59, 0x66,
+    0x39, 0x63, 0x6c, 0x5a, 0x44, 0x0a, 0x71, 0x73, 0x32, 0x68, 0x41, 0x6f, 0x47, 0x42,
+    0x41, 0x4c, 0x53, 0x76, 0x34, 0x49, 0x74, 0x51, 0x38, 0x35, 0x4a, 0x4a, 0x4a, 0x69,
+    0x55, 0x36, 0x55, 0x63, 0x32, 0x77, 0x2b, 0x43, 0x42, 0x4e, 0x41, 0x50, 0x4f, 0x63,
+    0x4c, 0x33, 0x55, 0x51, 0x51, 0x44, 0x68, 0x70, 0x50, 0x75, 0x7a, 0x4e, 0x33, 0x6c,
+    0x7a, 0x74, 0x30, 0x43, 0x64, 0x68, 0x37, 0x78, 0x5a, 0x34, 0x59, 0x6a, 0x69, 0x78,
+    0x0a, 0x70, 0x6c, 0x6a, 0x55, 0x4c, 0x51, 0x44, 0x75, 0x41, 0x6d, 0x30, 0x79, 0x62,
+    0x6c, 0x59, 0x4c, 0x39, 0x4f, 0x44, 0x39, 0x78, 0x57, 0x38, 0x63, 0x4f, 0x4f, 0x6d,
+    0x32, 0x31, 0x71, 0x69, 0x50, 0x71, 0x70, 0x71, 0x46, 0x69, 0x38, 0x32, 0x32, 0x2f,
+    0x62, 0x34, 0x4a, 0x78, 0x63, 0x35, 0x32, 0x51, 0x33, 0x52, 0x67, 0x51, 0x33, 0x39,
+    0x6e, 0x48, 0x43, 0x62, 0x61, 0x39, 0x4b, 0x69, 0x61, 0x0a, 0x59, 0x66, 0x62, 0x2b,
+    0x54, 0x6a, 0x5a, 0x67, 0x61, 0x71, 0x74, 0x6a, 0x5a, 0x4c, 0x32, 0x36, 0x41, 0x46,
+    0x4e, 0x6d, 0x65, 0x51, 0x52, 0x74, 0x4b, 0x31, 0x57, 0x50, 0x79, 0x49, 0x56, 0x72,
+    0x4a, 0x6e, 0x75, 0x63, 0x71, 0x56, 0x52, 0x4e, 0x75, 0x32, 0x52, 0x71, 0x53, 0x6f,
+    0x72, 0x74, 0x79, 0x65, 0x2f, 0x51, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e,
+    0x44, 0x20, 0x52, 0x53, 0x41, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20,
+    0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a};
+
+#define CLIENT_CERTIFICATE_DER_SIZE 1034
+UA_Byte clientCertificateDer[] = {
+    0x30, 0x82, 0x04, 0x06, 0x30, 0x82, 0x02, 0xee, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02,
+    0x14, 0x02, 0x92, 0x2a, 0x20, 0x21, 0xa0, 0xce, 0xf1, 0xf0, 0xd4, 0x64, 0x5d, 0x44,
+    0xc3, 0xcd, 0x8a, 0x3a, 0x52, 0x43, 0x77, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48,
+    0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09,
+    0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06,
+    0x03, 0x55, 0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10,
+    0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35,
+    0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f,
+    0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+    0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d,
+    0x32, 0x32, 0x30, 0x38, 0x31, 0x30, 0x31, 0x31, 0x35, 0x36, 0x34, 0x37, 0x5a, 0x17,
+    0x0d, 0x32, 0x33, 0x30, 0x38, 0x31, 0x30, 0x31, 0x31, 0x35, 0x36, 0x34, 0x37, 0x5a,
+    0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
+    0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0c, 0x04, 0x48, 0x65,
+    0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f,
+    0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03,
+    0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31,
+    0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f,
+    0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
+    0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82,
+    0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb8, 0xb1, 0x56, 0x98, 0x24, 0x15, 0xac,
+    0xbf, 0xa5, 0x0a, 0x3a, 0xd5, 0x16, 0xec, 0xd4, 0x26, 0xcc, 0x3c, 0x52, 0x0a, 0xce,
+    0x63, 0x9e, 0x82, 0xe3, 0x96, 0xf3, 0x2f, 0x07, 0xc4, 0x60, 0x04, 0xc6, 0x7e, 0x2f,
+    0xce, 0x02, 0xaa, 0x1d, 0x9b, 0x1a, 0xf7, 0xca, 0x4f, 0x01, 0x6e, 0x67, 0x1b, 0x15,
+    0x5e, 0x23, 0x35, 0xaa, 0x2b, 0x34, 0x0f, 0xe4, 0x6c, 0x27, 0x6c, 0x3b, 0x36, 0xb8,
+    0x3b, 0x57, 0x32, 0x65, 0x55, 0x75, 0x20, 0x58, 0xff, 0x0e, 0xe3, 0x71, 0xde, 0x4f,
+    0x9e, 0xbc, 0x7f, 0x5a, 0x0c, 0xff, 0x44, 0xcd, 0x44, 0xc1, 0xa7, 0x29, 0x05, 0x91,
+    0x0b, 0xc7, 0x3a, 0x9f, 0xfb, 0xfc, 0x00, 0xe4, 0x65, 0x48, 0x5c, 0x2c, 0xde, 0x71,
+    0x38, 0x2a, 0xb1, 0xe2, 0x68, 0x68, 0x67, 0x72, 0x12, 0xbc, 0xf3, 0x6a, 0x63, 0x0b,
+    0x6a, 0x9d, 0xed, 0x8c, 0x7b, 0x99, 0xa9, 0xef, 0x94, 0x41, 0x0e, 0xb2, 0x20, 0x34,
+    0xea, 0x13, 0x7a, 0x23, 0x8f, 0xb8, 0x31, 0x3a, 0xce, 0xa0, 0x97, 0xb0, 0xa5, 0x0e,
+    0x84, 0x4b, 0x60, 0x5b, 0x0a, 0x07, 0xf4, 0x3a, 0x08, 0x78, 0xed, 0x3f, 0x70, 0x76,
+    0x40, 0x2e, 0x43, 0x96, 0xc6, 0xb3, 0xa9, 0xba, 0x1a, 0x15, 0xd9, 0x5f, 0x95, 0x71,
+    0x00, 0x69, 0xe4, 0xa5, 0x8c, 0xee, 0x6a, 0x87, 0x5f, 0x46, 0x73, 0x1b, 0x39, 0x7c,
+    0x78, 0xd9, 0xb3, 0x06, 0x7b, 0x57, 0x40, 0xe4, 0x13, 0x9b, 0x94, 0x84, 0x4d, 0x64,
+    0xd5, 0x70, 0xfb, 0x0d, 0xf8, 0x34, 0xb5, 0x1c, 0xb8, 0x64, 0x40, 0x26, 0x2e, 0x02,
+    0x13, 0x09, 0x51, 0x38, 0xe6, 0x19, 0x43, 0x08, 0x63, 0x33, 0x68, 0x86, 0xb0, 0x7c,
+    0x1a, 0x2d, 0x29, 0x03, 0x3e, 0xfd, 0x01, 0x98, 0x3c, 0xa0, 0x8a, 0x81, 0x47, 0xf2,
+    0x0c, 0xdc, 0x6b, 0xca, 0xd9, 0xeb, 0x6d, 0x29, 0x34, 0xf6, 0x4b, 0x02, 0x03, 0x01,
+    0x00, 0x01, 0xa3, 0x81, 0xcf, 0x30, 0x81, 0xcc, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
+    0x0e, 0x04, 0x16, 0x04, 0x14, 0x7f, 0x1f, 0x47, 0x68, 0xc6, 0x55, 0x5f, 0x55, 0xf2,
+    0x10, 0x3f, 0xc0, 0x05, 0x98, 0xeb, 0x1b, 0x4e, 0xf5, 0x63, 0x80, 0x30, 0x1f, 0x06,
+    0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x7f, 0x1f, 0x47, 0x68,
+    0xc6, 0x55, 0x5f, 0x55, 0xf2, 0x10, 0x3f, 0xc0, 0x05, 0x98, 0xeb, 0x1b, 0x4e, 0xf5,
+    0x63, 0x80, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x02, 0x30, 0x00, 0x30,
+    0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x02, 0xf4, 0x30, 0x1d,
+    0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01,
+    0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
+    0x02, 0x30, 0x53, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x4c, 0x30, 0x4a, 0x82, 0x0c,
+    0x65, 0x61, 0x63, 0x66, 0x30, 0x35, 0x61, 0x64, 0x32, 0x64, 0x64, 0x65, 0x82, 0x0c,
+    0x65, 0x61, 0x63, 0x66, 0x30, 0x35, 0x61, 0x64, 0x32, 0x64, 0x64, 0x65, 0x87, 0x04,
+    0xac, 0x11, 0x00, 0x02, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 0x86, 0x20, 0x75, 0x72,
+    0x6e, 0x3a, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x73, 0x65,
+    0x72, 0x76, 0x65, 0x72, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
+    0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+    0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x1f, 0x74, 0x46, 0x12, 0xfd, 0x08,
+    0x59, 0x22, 0x47, 0x62, 0x7b, 0xdc, 0xf5, 0xe4, 0xeb, 0x37, 0xb2, 0xb1, 0x63, 0xa8,
+    0x60, 0xe7, 0x2c, 0x58, 0x38, 0x32, 0x6d, 0xe5, 0x19, 0x87, 0x10, 0x2a, 0xed, 0x71,
+    0x41, 0x05, 0x25, 0xc1, 0x7c, 0xdc, 0x49, 0xbd, 0x45, 0xe6, 0x09, 0xba, 0x2b, 0x05,
+    0x22, 0x97, 0x78, 0x34, 0x59, 0x24, 0x92, 0x51, 0xb1, 0x8e, 0xd9, 0x49, 0x25, 0xaf,
+    0x1d, 0x93, 0xb1, 0xc9, 0xbd, 0xd9, 0x0a, 0xa8, 0x8e, 0xea, 0x95, 0xb1, 0xdc, 0x30,
+    0x17, 0xd3, 0xed, 0x56, 0x88, 0xb3, 0x2e, 0x4f, 0x5f, 0x61, 0x47, 0x34, 0xe0, 0x83,
+    0x6d, 0x02, 0xfa, 0xee, 0x8e, 0x09, 0xf7, 0x6a, 0x01, 0xed, 0x89, 0xf9, 0x4f, 0x8e,
+    0xea, 0x58, 0xc3, 0xe6, 0x22, 0x4c, 0x54, 0xe6, 0xaa, 0x2f, 0x23, 0xbd, 0x29, 0xba,
+    0xdb, 0x15, 0x82, 0x03, 0x0e, 0x8b, 0xb5, 0xc1, 0x35, 0x08, 0x2f, 0x14, 0x58, 0x6b,
+    0x5d, 0xa5, 0xa4, 0x4a, 0x8f, 0x8f, 0xe7, 0x38, 0x22, 0x10, 0x7f, 0x46, 0x30, 0x55,
+    0x02, 0xee, 0xf3, 0x38, 0x87, 0x78, 0x61, 0x16, 0x77, 0x40, 0x7a, 0xaa, 0x54, 0xf7,
+    0xcd, 0xf9, 0x45, 0xd3, 0x17, 0x15, 0x05, 0xf2, 0x28, 0x54, 0xf8, 0xa0, 0x51, 0x8f,
+    0x03, 0x6a, 0x86, 0x3b, 0x67, 0x65, 0x26, 0xc8, 0x66, 0x4e, 0x11, 0x50, 0x1a, 0x55,
+    0xff, 0xc2, 0x98, 0x4c, 0x1a, 0x55, 0xac, 0x16, 0xb3, 0x18, 0x29, 0x82, 0x77, 0x19,
+    0x36, 0x5e, 0x64, 0xa3, 0x1b, 0xa8, 0xe1, 0xb0, 0xc6, 0xa9, 0xc3, 0x1c, 0x8a, 0x63,
+    0x80, 0x44, 0xca, 0x8f, 0x4e, 0xd9, 0x29, 0x98, 0xc6, 0x21, 0x07, 0xb1, 0x81, 0xaf,
+    0xf5, 0xa6, 0xf7, 0x02, 0xe9, 0xfc, 0x4a, 0x94, 0x2b, 0x91, 0x4e, 0xc3, 0x3a, 0xb1,
+    0x01, 0xd4, 0x38, 0xbb, 0x93, 0xa2, 0x20, 0x78, 0xb4, 0xac, 0xbc, 0xec};
+
+static void setup(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_PEM_LENGTH;
+    certificate.data = CERT_PEM_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_PEM_LENGTH;
+    privateKey.data = KEY_PEM_DATA;
+
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+#ifndef __linux__
+    /* Load the trustlist */
+    size_t trustListSize = 0;
+    UA_ByteString *trustList = NULL;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 0;
+    UA_ByteString *issuerList = NULL;
+
+    /* Loading of a revocation list currently unsupported */
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    UA_StatusCode res =
+        UA_ServerConfig_setDefaultWithSecurityPolicies(*config, 4840,
+                                                       &certificate, &privateKey,
+                                                       trustList, trustListSize,
+                                                       issuerList, issuerListSize,
+                                                       revocationList, revocationListSize);
+        ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+#else /* On Linux we can monitor the certs folder and reload when changes are made */
+    UA_StatusCode res =
+        UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840,
+                                                       &certificate, &privateKey,
+                                                       NULL, 0, NULL, 0, NULL, 0);
+    ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+
+    config->certificateVerification.clear(&config->certificateVerification);
+    res = UA_CertificateVerification_CertFolders(&config->certificateVerification,
+                                                 NULL, NULL,
+                                                 NULL, ".");
+    ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+#endif /* __linux__ */
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(encryption_connect_reject_cert) {
+    UA_Client *client = NULL;
+    UA_EndpointDescription* endpointArray = NULL;
+    size_t endpointArraySize = 0;
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    const size_t certPemLength = sizeof(clientCertificatePem) / sizeof(clientCertificatePem[0]);
+    certificate.length = certPemLength;
+    certificate.data = clientCertificatePem;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = sizeof(clientCertificateKey) / sizeof(clientCertificateKey[0]);
+    privateKey.data = clientCertificateKey;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* The Get endpoint (discovery service) is done with
+     * security mode as none to see the server's capability
+     * and certificate */
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    ck_assert(client != NULL);
+    UA_StatusCode retval = UA_Client_getEndpoints(client, "opc.tcp://localhost:4840",
+                                                  &endpointArraySize, &endpointArray);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(endpointArraySize > 0);
+
+    UA_Array_delete(endpointArray, endpointArraySize,
+                    &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+
+    UA_Client_delete(client);
+    
+    /* Secure client initialization */
+    client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                         trustList, trustListSize,
+                                         revocationList, revocationListSize);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
+    ck_assert(client != NULL);
+
+    for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++) {
+        UA_ByteString_clear(&trustList[deleteCount]);
+    }
+
+#ifdef __linux__
+    /* Secure client connect */
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURITYCHECKSFAILED);
+
+    char rejectedFileName [256] = {0};
+    strcat(rejectedFileName, "./");
+    strcat(rejectedFileName, (char *)clientCertificateThumbprint);
+    strcat(rejectedFileName, ".der");
+    FILE * fp_rejectedFile = fopen(rejectedFileName, "rb");
+
+    UA_Byte readBuffer[CLIENT_CERTIFICATE_DER_SIZE] = {0};
+    fread(readBuffer, CLIENT_CERTIFICATE_DER_SIZE, 1, fp_rejectedFile);
+
+    for(size_t i=0; i<CLIENT_CERTIFICATE_DER_SIZE; i++) {
+        ck_assert(readBuffer[i] == clientCertificateDer[i]);
+    }
+    fclose(fp_rejectedFile);
+
+    UA_Client_disconnect(client);
+#endif
+    UA_Client_delete(client);
+}
+END_TEST
+
+static Suite* testSuite_saveRejectedCert(void) {
+    Suite *s = suite_create("Encryption");
+    TCase *tc_reject_cert = tcase_create("Check saving rejected client certificate");
+    tcase_add_checked_fixture(tc_reject_cert, setup, teardown);
+    tcase_add_test(tc_reject_cert, encryption_connect_reject_cert);
+    suite_add_tcase(s,tc_reject_cert);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_saveRejectedCert();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tools/ci.sh b/tools/ci.sh
index 6cdd2d435ad..d69c9811928 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -260,6 +260,7 @@ function unit_tests_encryption_mbedtls_pubsub {
           -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
+          -DUA_ENABLE_CERT_REJECTED_DIR=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \

From 5dab29487e2fee09ed70f9485ba890ebc585ea8e Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Mon, 26 Sep 2022 22:28:39 +0200
Subject: [PATCH 0466/1963] fix(plugin): Check for successful file creation
 (#5348)

fclose should only be called on valid FILE pointers, as fclose(0) is
undefined.
---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c     | 18 +++++++++++-------
 tests/encryption/check_save_rejected_cert.c | 14 ++++++++------
 tests/fuzz/ua_debug_dump_pkgs_file.c        | 12 +++++++-----
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index a23d6e771e8..6e60afca9da 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -497,13 +497,17 @@ certificateVerification_verify(void *verificationContext,
             UA_ByteString_clear(&thumbprint);
 
             char *rejectedFullFileName = (char *) calloc(ci->rejectedListFolder.length + 1 /* '/' */ + strlen(rejectedFileName) + 1, sizeof(char));
-            memcpy(rejectedFullFileName, ci->rejectedListFolder.data, ci->rejectedListFolder.length);
-            rejectedFullFileName[ci->rejectedListFolder.length] = '/';
-            memcpy(&rejectedFullFileName[ci->rejectedListFolder.length + 1], rejectedFileName, strlen(rejectedFileName));
-            FILE * fp_rejectedFile = fopen(rejectedFullFileName, "wb");
-            fwrite(certificate->data, sizeof(certificate->data[0]), certificate->length, fp_rejectedFile);
-            free(rejectedFullFileName);
-            fclose(fp_rejectedFile);
+            if (rejectedFullFileName) {
+                memcpy(rejectedFullFileName, ci->rejectedListFolder.data, ci->rejectedListFolder.length);
+                rejectedFullFileName[ci->rejectedListFolder.length] = '/';
+                memcpy(&rejectedFullFileName[ci->rejectedListFolder.length + 1], rejectedFileName, strlen(rejectedFileName));
+                FILE * fp_rejectedFile = fopen(rejectedFullFileName, "wb");
+                if (fp_rejectedFile) {
+                    fwrite(certificate->data, sizeof(certificate->data[0]), certificate->length, fp_rejectedFile);
+                    fclose(fp_rejectedFile);
+                }
+                free(rejectedFullFileName);
+            }
         }
 #endif
     }
diff --git a/tests/encryption/check_save_rejected_cert.c b/tests/encryption/check_save_rejected_cert.c
index c7a1d3ebcc2..5a096b8207a 100644
--- a/tests/encryption/check_save_rejected_cert.c
+++ b/tests/encryption/check_save_rejected_cert.c
@@ -473,13 +473,15 @@ START_TEST(encryption_connect_reject_cert) {
     strcat(rejectedFileName, ".der");
     FILE * fp_rejectedFile = fopen(rejectedFileName, "rb");
 
-    UA_Byte readBuffer[CLIENT_CERTIFICATE_DER_SIZE] = {0};
-    fread(readBuffer, CLIENT_CERTIFICATE_DER_SIZE, 1, fp_rejectedFile);
-
-    for(size_t i=0; i<CLIENT_CERTIFICATE_DER_SIZE; i++) {
-        ck_assert(readBuffer[i] == clientCertificateDer[i]);
+    if (fp_rejectedFile) {
+        UA_Byte readBuffer[CLIENT_CERTIFICATE_DER_SIZE] = {0};
+        fread(readBuffer, CLIENT_CERTIFICATE_DER_SIZE, 1, fp_rejectedFile);
+
+        for(size_t i=0; i<CLIENT_CERTIFICATE_DER_SIZE; i++) {
+           ck_assert(readBuffer[i] == clientCertificateDer[i]);
+        }
+        fclose(fp_rejectedFile);
     }
-    fclose(fp_rejectedFile);
 
     UA_Client_disconnect(client);
 #endif
diff --git a/tests/fuzz/ua_debug_dump_pkgs_file.c b/tests/fuzz/ua_debug_dump_pkgs_file.c
index 12b4b7e45a8..412004d31cf 100644
--- a/tests/fuzz/ua_debug_dump_pkgs_file.c
+++ b/tests/fuzz/ua_debug_dump_pkgs_file.c
@@ -173,9 +173,11 @@ UA_debug_dumpCompleteChunk(UA_Server *const server, UA_Connection *const connect
                 "Dumping package %s", dumpOutputFile);
 
     FILE *write_ptr = fopen(dumpOutputFile, "ab");
-    fwrite(messageBuffer->data, messageBuffer->length, 1, write_ptr); // write 10 bytes from our buffer
-    // add the available memory size. See the UA_DUMP_RAM_SIZE define for more info.
-    uint32_t ramSize = UA_DUMP_RAM_SIZE;
-    fwrite(&ramSize, sizeof(ramSize), 1, write_ptr);
-    fclose(write_ptr);
+    if (write_ptr) {
+        fwrite(messageBuffer->data, messageBuffer->length, 1, write_ptr); // write 10 bytes from our buffer
+        // add the available memory size. See the UA_DUMP_RAM_SIZE define for more info.
+        uint32_t ramSize = UA_DUMP_RAM_SIZE;
+        fwrite(&ramSize, sizeof(ramSize), 1, write_ptr);
+        fclose(write_ptr);
+    }
 }

From 5872b51830060f058c667a5eacbcc4b18991074d Mon Sep 17 00:00:00 2001
From: Bin Lan <Bin.Lan@windriver.com>
Date: Tue, 27 Sep 2022 21:45:38 +0800
Subject: [PATCH 0467/1963] feat(plugin): Add OpenSSL 3.0 support (#5349)

* Add OpenSSL3.0 support

This change set adds a new function UA_OpenSSL_RSA_Key_Size() to get
the RSA key size, re-writes the function
UA_Openssl_RSA_Private_Decrypt() by using the high level APIs of
OpenSSL3.0, add a new function UA_RSA_Generate_Key() to generate
a RSA key.

No build warning with OpenSSL3.0 and OpenSSL1.1.1f.

* Build & Test with OpenSSL3.0 in Ubuntu22.04
---
 .github/workflows/build_ubuntu2204.yml        | 29 ++++++++
 .../openssl/securitypolicy_openssl_common.c   | 68 ++++++++++++++-----
 .../openssl/ua_openssl_create_certificate.c   | 28 +++++++-
 3 files changed, 104 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/build_ubuntu2204.yml

diff --git a/.github/workflows/build_ubuntu2204.yml b/.github/workflows/build_ubuntu2204.yml
new file mode 100644
index 00000000000..216c0665c08
--- /dev/null
+++ b/.github/workflows/build_ubuntu2204.yml
@@ -0,0 +1,29 @@
+name: Linux Build & Test with OpenSSL3.0
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include: 
+          - build_name: "Encryption (OpenSSL3.0) Build & Unit Tests (gcc)"
+            cmd_deps: sudo apt-get install -y -qq openssl
+            cmd_action: unit_tests_encryption OPENSSL
+    name: ${{matrix.build_name}}
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Install Dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y -qq python3-sphinx graphviz check
+        ${{ matrix.cmd_deps }}
+    - name: ${{matrix.build_name}}
+      run: source tools/ci.sh && ${{matrix.cmd_action}}
+      env:
+        ETHERNET_INTERFACE: eth0
+
diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.c b/plugins/crypto/openssl/securitypolicy_openssl_common.c
index c6257949539..7d5df9b6bcb 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.c
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.c
@@ -4,6 +4,7 @@
  *
  *    Copyright 2020 (c) Wind River Systems, Inc.
  *    Copyright 2020 (c) basysKom GmbH
+ *    Copyright 2022 (c) Wind River Systems, Inc.
  */
 
 /*
@@ -30,6 +31,8 @@ modification history
 #include "ua_openssl_version_abstraction.h"
 
 #define SHA1_DIGEST_LENGTH 20          /* 160 bits */
+#define RSA_DECRYPT_BUFFER_LENGTH 2048  /* bytes */    
+
 
 /** P_SHA256 Context */
 typedef struct UA_Openssl_P_SHA256_Ctx_ {
@@ -73,6 +76,14 @@ UA_Openssl_Init (void) {
 #endif
 }
 
+static int UA_OpenSSL_RSA_Key_Size (EVP_PKEY * key){
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+    return EVP_PKEY_get_size (key);
+#else
+    return RSA_size (get_pkey_rsa(key));
+#endif
+}
+
 /* UA_copyCertificate - allocalte the buffer, copy the certificate and
  * add a NULL to the end
  */
@@ -192,8 +203,8 @@ UA_Openssl_X509_GetCertificateThumbprint (const UA_ByteString * certficate,
 }
 
 static UA_StatusCode
-UA_Openssl_RSA_Private_Decrypt (UA_ByteString *       data,
-                               EVP_PKEY * privateKey,
+UA_Openssl_RSA_Private_Decrypt (UA_ByteString *      data,
+                               EVP_PKEY *            privateKey,
                                UA_Int16              padding) {
     if (data == NULL || privateKey == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -203,27 +214,49 @@ UA_Openssl_RSA_Private_Decrypt (UA_ByteString *       data,
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    UA_Int32 keySize = RSA_size(get_pkey_rsa(privateKey));
+    size_t keySize = (size_t) UA_OpenSSL_RSA_Key_Size (privateKey);
     size_t cipherOffset = 0;
     size_t outOffset = 0;
-    unsigned char buf[2048];
-    UA_Int32 decryptedBytes;
+    unsigned char buf[RSA_DECRYPT_BUFFER_LENGTH];
+    size_t decryptedBytes;
+    EVP_PKEY_CTX * ctx;
+    int opensslRet;
+
+    ctx = EVP_PKEY_CTX_new (privateKey, NULL);
+    if (ctx == NULL) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    opensslRet = EVP_PKEY_decrypt_init (ctx);
+    if (opensslRet != 1)
+        {
+        EVP_PKEY_CTX_free (ctx);
+        return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    opensslRet = EVP_PKEY_CTX_set_rsa_padding (ctx, padding);
+    if (opensslRet != 1) {
+        EVP_PKEY_CTX_free (ctx);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     while (cipherOffset < data->length) {
-        decryptedBytes = RSA_private_decrypt (keySize,
-                           data->data + cipherOffset, /* what to decrypt  */
+        decryptedBytes = RSA_DECRYPT_BUFFER_LENGTH;
+        opensslRet = EVP_PKEY_decrypt (ctx,
                            buf,                       /* where to decrypt */
-                           get_pkey_rsa(privateKey),      /* private key      */
-                           padding
+                           &decryptedBytes,
+                           data->data + cipherOffset, /* what to decrypt  */
+                           keySize
                            );
-        if (decryptedBytes < 0) {
+        if (opensslRet != 1) {
+            EVP_PKEY_CTX_free (ctx);
             return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         }
-        memcpy(data->data + outOffset, buf, (size_t) decryptedBytes);
+        (void) memcpy(data->data + outOffset, buf, decryptedBytes);
         cipherOffset += (size_t) keySize;
-        outOffset += (size_t) decryptedBytes;
+        outOffset += decryptedBytes;
     }
     data->length = outOffset;
+    EVP_PKEY_CTX_free (ctx);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -249,7 +282,6 @@ UA_Openssl_RSA_Public_Encrypt  (const UA_ByteString * message,
     size_t encryptedPos = 0;
     size_t bytesToEncrypt = 0;
     size_t encryptedBlockSize = 0;
-    RSA *  rsa = NULL;
     size_t keySize = 0;
 
     evpPublicKey = X509_get_pubkey (publicX509);
@@ -274,8 +306,8 @@ UA_Openssl_RSA_Public_Encrypt  (const UA_ByteString * message,
     }
 
     /* get the encrypted block size */
-    rsa = get_pkey_rsa (evpPublicKey);
-    keySize = (size_t) RSA_size (rsa);
+
+    keySize = (size_t) UA_OpenSSL_RSA_Key_Size (evpPublicKey);
     if (keySize == 0) {
         ret = UA_STATUSCODE_BADINTERNALERROR;
         goto errout;
@@ -435,8 +467,8 @@ UA_Openssl_RSA_Public_GetKeyLength (X509 *     publicKeyX509,
     if (evpKey == NULL) {
         return  UA_STATUSCODE_BADINTERNALERROR;
     }
-    RSA * rsa = get_pkey_rsa (evpKey);
-    *keyLen = RSA_size(rsa);
+    *keyLen = UA_OpenSSL_RSA_Key_Size (evpKey);
+    
     EVP_PKEY_free (evpKey);
 
     return UA_STATUSCODE_GOOD;
@@ -448,7 +480,7 @@ UA_Openssl_RSA_Private_GetKeyLength (EVP_PKEY * privateKey,
     if (privateKey == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
-    *keyLen = RSA_size(get_pkey_rsa(privateKey));
+    *keyLen = UA_OpenSSL_RSA_Key_Size (privateKey);
 
     return UA_STATUSCODE_GOOD;
 }
diff --git a/plugins/crypto/openssl/ua_openssl_create_certificate.c b/plugins/crypto/openssl/ua_openssl_create_certificate.c
index 8664e38db2b..5ff31186a31 100644
--- a/plugins/crypto/openssl/ua_openssl_create_certificate.c
+++ b/plugins/crypto/openssl/ua_openssl_create_certificate.c
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  *    Copyright 2021 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
+ *    Copyright 2022 (c) Wind River Systems, Inc.
  *
  */
 
@@ -82,6 +83,16 @@ add_x509V3ext(X509 *x509, int nid, char *value) {
     return UA_STATUSCODE_GOOD;
 }
 
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+
+/* generate the RSA key */
+
+static EVP_PKEY * UA_RSA_Generate_Key (size_t keySizeBits){
+    return EVP_RSA_gen(keySizeBits);
+}
+
+#endif
+
 UA_StatusCode
 UA_CreateCertificate(const UA_Logger *logger,
                      const UA_String *subject, size_t subjectSize,
@@ -110,11 +121,18 @@ UA_CreateCertificate(const UA_Logger *logger,
 
     UA_StatusCode errRet = UA_STATUSCODE_GOOD;
 
+    X509 *x509 = X509_new();
+
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+    EVP_PKEY *pkey = UA_RSA_Generate_Key(keySizeBits);
+    if((pkey == NULL) || (x509 == NULL)) {
+        errRet = UA_STATUSCODE_BADOUTOFMEMORY;
+        goto cleanup;
+    }    
+#else
     BIGNUM *exponent = BN_new();
     EVP_PKEY *pkey = EVP_PKEY_new();
-    X509 *x509 = X509_new();
     RSA *rsa = RSA_new();
-
     if(!pkey || !x509 || !exponent || !rsa) {
         errRet = UA_STATUSCODE_BADOUTOFMEMORY;
         goto cleanup;
@@ -146,6 +164,8 @@ UA_CreateCertificate(const UA_Logger *logger,
     /* rsa will be freed by pkey */
     rsa = NULL;
 
+#endif  /* end of OPENSSL_VERSION_NUMBER >= 0x30000000L */
+
     /* x509v3 has version 2
      * (https://www.openssl.org/docs/man1.1.0/man3/X509_set_version.html) */
     if(X509_set_version(x509, 2) != 1) {
@@ -352,12 +372,14 @@ UA_CreateCertificate(const UA_Logger *logger,
 
 cleanup:
     UA_String_clear(&fullAltSubj);
+#if (OPENSSL_VERSION_NUMBER < 0x30000000L)
     RSA_free(rsa);
+    BN_free(exponent);    
+#endif
     X509_free(x509);
     EVP_PKEY_free(pkey);
     BIO_free(memCert);
     BIO_free(memPKey);
-    BN_free(exponent);
     return errRet;
 }
 

From 9fcfe78caa38b0d73f9212aa948afbf893883289 Mon Sep 17 00:00:00 2001
From: Opcua_Tsn_Team_Kalycito
 <37533590+opcua-tsn-team-kalycito@users.noreply.github.com>
Date: Wed, 28 Sep 2022 13:45:47 +0530
Subject: [PATCH 0468/1963] feat(server): Add support for LimitAlarmType and
 CertificateExpirationAlarmType (#3903)

* feat(server) Add support for Certificate AlarmType

 - Added support for triggering certificate expiration
   alarmType
 - Both the OpenSSL and mbedTLS library is supported

Signed-off-by: Jayanth Velusamy <jayanth.v@kalycito.com>
Change-Id: I80b8f18e9b601f1d3ec899798b5c60f6cfe0448e

* feat(server) Add support for LimitAlarmTypes

 - Added support for setting the limitState
   property of the limitAlarm

Signed-off-by: Jayanth Velusamy <jayanth.v@kalycito.com>
Change-Id: Ib15a38db62265a7e032538c3c021b187e31b6b6f

Signed-off-by: Jayanth Velusamy <jayanth.v@kalycito.com>
---
 include/open62541/plugin/pki.h                |   4 +
 include/open62541/server.h                    |  22 ++
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       |  26 ++
 plugins/crypto/openssl/ua_pki_openssl.c       |  38 +++
 .../ua_subscription_alarms_conditions.c       | 257 +++++++++++++++++-
 5 files changed, 345 insertions(+), 2 deletions(-)

diff --git a/include/open62541/plugin/pki.h b/include/open62541/plugin/pki.h
index b2893c9415c..f3ec7b7f966 100644
--- a/include/open62541/plugin/pki.h
+++ b/include/open62541/plugin/pki.h
@@ -44,6 +44,10 @@ struct UA_CertificateVerification {
                                           const UA_ByteString *certificate,
                                           const UA_String *applicationURI);
 
+    /* Get the expire date from certificate */
+    UA_StatusCode (*getExpirationDate)(UA_DateTime *expiryDateTime, 
+                                       UA_ByteString *certificate);
+
     /* Delete the certificate verification context */
     void (*clear)(UA_CertificateVerification *cv);
 };
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 8accba6ab47..10f5905a1f8 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -1738,6 +1738,28 @@ UA_Server_deleteCondition(UA_Server *server,
                           const UA_NodeId condition,
                           const UA_NodeId conditionSource);
 
+/*
+* Set the LimitState of the LimitAlarmType
+*
+* @param server The server object
+* @param conditionId The NodeId of the node representation of the Condition Instance
+* @param limitValue The value from the trigger node
+*/
+UA_StatusCode UA_EXPORT
+UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
+                        UA_Double limitValue);
+
+/*
+* Parse the certifcate and set Expiration date
+*
+* @param server The server object
+* @param conditionId The NodeId of the node representation of the Condition Instance
+* @param cert The certificate for parsing
+*/
+UA_StatusCode UA_EXPORT
+UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
+                            UA_ByteString  cert);
+
 #endif /* UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS */
 
 /**
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 6e60afca9da..67978d220bc 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -564,6 +564,31 @@ certificateVerification_clear(UA_CertificateVerification *cv) {
     cv->context = NULL;
 }
 
+static UA_StatusCode
+getCertificate_ExpirationDate(UA_DateTime *expiryDateTime, 
+                              UA_ByteString *certificate) {
+    mbedtls_x509_crt publicKey;
+    mbedtls_x509_crt_init(&publicKey);
+    int mbedErr = mbedtls_x509_crt_parse(&publicKey, certificate->data, certificate->length);
+    if(mbedErr)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_DateTimeStruct ts;
+    ts.year = (UA_Int16)publicKey.valid_to.year;
+    ts.month = (UA_UInt16)publicKey.valid_to.mon;
+    ts.day = (UA_UInt16)publicKey.valid_to.day;
+    ts.hour = (UA_UInt16)publicKey.valid_to.hour;
+    ts.min = (UA_UInt16)publicKey.valid_to.min;
+    ts.sec = (UA_UInt16)publicKey.valid_to.sec;
+    ts.milliSec = 0;
+    ts.microSec = 0;
+    ts.nanoSec = 0;
+
+    *expiryDateTime = UA_DateTime_fromStruct(ts);
+
+    return UA_STATUSCODE_GOOD;
+}
+
 UA_StatusCode
 UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
                                      const UA_ByteString *certificateTrustList,
@@ -587,6 +612,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
         cv->verifyCertificate = certificateVerification_allow;
     cv->clear = certificateVerification_clear;
     cv->verifyApplicationURI = certificateVerification_verifyApplicationURI;
+    cv->getExpirationDate = getCertificate_ExpirationDate;
 
     int err;
     UA_ByteString data;
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 859ef6de344..653e03a568c 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -19,6 +19,7 @@
 #include <openssl/pem.h>
 
 #include "ua_openssl_version_abstraction.h"
+#include "libc_time.h"
 
 /* Find binary substring. Taken and adjusted from
  * http://tungchingkai.blogspot.com/2011/07/binary-strstr.html */
@@ -653,6 +654,40 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
     return ret;
 }
 
+#ifdef UA_ENABLE_ENCRYPTION_OPENSSL
+static UA_StatusCode
+UA_GetCertificate_ExpirationDate(UA_DateTime *expiryDateTime, 
+                                 UA_ByteString *certificate) {
+    const unsigned char * pData;
+    pData = certificate->data;
+    X509 * x509 = d2i_X509 (NULL, &pData, (long) certificate->length);
+    if (x509 == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Get the certificate Expiry date */
+    ASN1_TIME *not_after = X509_get_notAfter(x509);
+
+    struct tm dtTime;
+    ASN1_TIME_to_tm(not_after, &dtTime);
+
+    struct mytm dateTime;
+    memset(&dateTime, 0, sizeof(struct mytm));
+    dateTime.tm_year = dtTime.tm_year;
+    dateTime.tm_mon = dtTime.tm_mon;
+    dateTime.tm_mday = dtTime.tm_mday;
+    dateTime.tm_hour = dtTime.tm_hour;
+    dateTime.tm_min = dtTime.tm_min;
+    dateTime.tm_sec = dtTime.tm_sec;
+
+    long long sec_epoch = __tm_to_secs(&dateTime);
+
+    *expiryDateTime = UA_DATETIME_UNIX_EPOCH;
+    *expiryDateTime += sec_epoch * UA_DATETIME_SEC;
+
+    return UA_STATUSCODE_GOOD;
+}
+#endif
 /* main entry */
 
 UA_StatusCode
@@ -686,6 +721,9 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
     else
         cv->verifyCertificate = UA_VerifyCertificateAllowAll;
 
+#ifdef UA_ENABLE_ENCRYPTION_OPENSSL
+    cv->getExpirationDate     = UA_GetCertificate_ExpirationDate;
+#endif
     if (certificateTrustListSize > 0) {
         if (UA_skTrusted_Cert2X509 (certificateTrustList, certificateTrustListSize,
                                     context) != UA_STATUSCODE_GOOD) {
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 899060ce01c..e57e62220de 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -113,12 +113,21 @@ struct UA_ConditionSource {
 #define CONDITION_FIELD_OKRESPONSE                             "OkResponse"
 #define CONDITION_FIELD_CANCELRESPONSE                         "CancelResponse"
 #define CONDITION_FIELD_RESPOND                                "Respond"
+#define CONDITION_FIELD_ENGINEERINGUNITS                       "EngineeringUnits"
+#define CONDITION_FIELD_EXPIRATION_DATE                        "ExpirationDate"
 
 #define REFRESHEVENT_START_IDX                                 0
 #define REFRESHEVENT_END_IDX                                   1
 #define REFRESHEVENT_SEVERITY_DEFAULT                          100
+#define EXPIRATION_LIMIT_DEFAULT_VALUE                         15
+
+#ifdef UA_ENABLE_ENCRYPTION
+#define CONDITION_FIELD_EXPIRATION_LIMIT                       "ExpirationLimit"
+#endif
 
 #define LOCALE                                                 "en"
+#define LOCALE_NULL                                             ""
+#define TEXT_NULL                                               ""
 #define ENABLED_TEXT                                           "Enabled"
 #define DISABLED_TEXT                                          "Disabled"
 #define ENABLED_MESSAGE                                        "The alarm was enabled"
@@ -149,6 +158,17 @@ static const UA_QualifiedName fieldConfirmedStateQN = STATIC_QN(CONDITION_FIELD_
 static const UA_QualifiedName fieldActiveStateQN = STATIC_QN(CONDITION_FIELD_ACTIVESTATE);
 static const UA_QualifiedName fieldTimeQN = STATIC_QN(CONDITION_FIELD_TIME);
 static const UA_QualifiedName fieldSourceQN = STATIC_QN(CONDITION_FIELD_SOURCENODE);
+static const UA_QualifiedName fieldLimitStateQN = STATIC_QN(CONDITION_FIELD_LIMITSTATE);
+static const UA_QualifiedName fieldLowLimitQN = STATIC_QN(CONDITION_FIELD_LOWLIMIT);
+static const UA_QualifiedName fieldLowLowLimitQN = STATIC_QN(CONDITION_FIELD_LOWLOWLIMIT);
+static const UA_QualifiedName fieldHighLimitQN = STATIC_QN(CONDITION_FIELD_HIGHLIMIT);
+static const UA_QualifiedName fieldHighHighLimitQN = STATIC_QN(CONDITION_FIELD_HIGHHIGHLIMIT);
+static const UA_QualifiedName fieldEngineeringUnitsQN = STATIC_QN(CONDITION_FIELD_ENGINEERINGUNITS);
+static const UA_QualifiedName fieldExpirationDateQN = STATIC_QN(CONDITION_FIELD_EXPIRATION_DATE);
+
+#ifdef UA_ENABLE_ENCRYPTION
+static const UA_QualifiedName fieldExpirationLimitQN = STATIC_QN(CONDITION_FIELD_EXPIRATION_LIMIT);
+#endif
 
 #define CONDITION_ASSERT_RETURN_RETVAL(retval, logMessage, deleteFunction)                \
     {                                                                                     \
@@ -1994,6 +2014,26 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
                                                          fieldConfirmedStateQN,
                                                          twoStateVariableIdQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set EnabledState/Id Field failed",);
+
+#ifdef UA_ENABLE_ENCRYPTION
+    /* Add  optional property for certificate expiration alarm type*/
+    UA_NodeId certificateConditionTypeId =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_CERTIFICATEEXPIRATIONALARMTYPE);
+    if(isNodeInTree_singleRef(server, conditionType, &certificateConditionTypeId,
+                               UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+        retval = UA_Server_addConditionOptionalField(server, *condition, certificateConditionTypeId,
+                                                 fieldExpirationLimitQN, NULL);
+        CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding Expiration Limit optional field failed",);
+
+        /* Set the default value for the Expiration limit property */
+        UA_Duration defaultValue = EXPIRATION_LIMIT_DEFAULT_VALUE;
+        retval |= UA_Server_writeObjectProperty_scalar(server, *condition, fieldExpirationLimitQN,
+                                                       &defaultValue,
+                                                       &UA_TYPES[UA_TYPES_DURATION]);
+
+    }
+#endif
+
 #endif//CONDITIONOPTIONALFIELDS_SUPPORT
 
     /* 2. Check if ConditionType is subType of AlarmConditionType */
@@ -2008,6 +2048,46 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set ActiveState Field failed",);
     }
 
+#ifdef CONDITIONOPTIONALFIELDS_SUPPORT
+    /* 3. Check if the ConditionType is subType of LimitAlarmType */
+    UA_NodeId LimitAlarmTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_LIMITALARMTYPE);
+    if(!isNodeInTree_singleRef(server, conditionType, &LimitAlarmTypeId,
+                               UA_REFERENCETYPEINDEX_HASSUBTYPE))
+        return retval;
+
+    /* Set optional field property. For the LimitAlarm and its subtypes, atleast one limit is mandatory*/
+    /* Add optional field LowLimit */
+    retval = UA_Server_addConditionOptionalField(server, *condition, LimitAlarmTypeId,
+                                                 fieldLowLimitQN, NULL);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding LowLimit optional Field failed",);
+
+    /* Add optional field HighLimit */
+    retval = UA_Server_addConditionOptionalField(server, *condition, LimitAlarmTypeId,
+                                                 fieldHighLimitQN, NULL);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding HighLimit optional Field failed",);
+
+    /* Add optional field HighHighLimit */
+    retval = UA_Server_addConditionOptionalField(server, *condition, LimitAlarmTypeId,
+                                                 fieldHighHighLimitQN, NULL);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding HighLimit optional Field failed",);
+
+    /* Add optional field LowLowLimit */
+    retval = UA_Server_addConditionOptionalField(server, *condition, LimitAlarmTypeId,
+                                                 fieldLowLowLimitQN, NULL);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding LowLowLimit optional Field failed",);
+
+    /* 4. Check if the ConditionType is subType of RateOfChangeAlarmType */
+    UA_NodeId RateOfChangeAlarmTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_EXCLUSIVERATEOFCHANGEALARMTYPE);
+    if(!isNodeInTree_singleRef(server, conditionType, &RateOfChangeAlarmTypeId,
+                               UA_REFERENCETYPEINDEX_HASSUBTYPE))
+        return retval;
+
+    retval = UA_Server_addConditionOptionalField(server, *condition, RateOfChangeAlarmTypeId,
+                                                fieldEngineeringUnitsQN, NULL);
+    CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding EngineeringUnit optional Field failed",);
+
+#endif//CONDITIONOPTIONALFIELDS_SUPPORT
+
     return retval;
 }
 
@@ -2607,7 +2687,8 @@ UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
     return retval;
 }
 
-UA_StatusCode UA_Server_deleteCondition(UA_Server *server, const UA_NodeId condition,
+UA_StatusCode
+UA_Server_deleteCondition(UA_Server *server, const UA_NodeId condition,
                                         const UA_NodeId conditionSource) {
     // Delete from internal list
     UA_Boolean found = UA_FALSE;
@@ -2638,4 +2719,176 @@ UA_StatusCode UA_Server_deleteCondition(UA_Server *server, const UA_NodeId condi
     /* Delete from address space */
     return UA_Server_deleteNode(server, condition, true);
 }
-#endif /* UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS */
+
+static UA_StatusCode
+getLowLimit(UA_Server *server, UA_NodeId conditionId, UA_Double *lowLimit) {
+    UA_Variant value;
+    UA_StatusCode retval = UA_Server_readObjectProperty(server, conditionId,
+                                UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLIMIT),
+                                &value);
+    *lowLimit = *(UA_Double*) value.data;
+    return retval;
+}
+
+static UA_StatusCode
+getLowLowLimit(UA_Server *server, UA_NodeId conditionId, UA_Double *lowLowLimit) {
+    UA_Variant value;
+    UA_StatusCode retval = UA_Server_readObjectProperty(server, conditionId,
+                                UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLOWLIMIT),
+                                &value);
+    *lowLowLimit = *(UA_Double*) value.data;
+    return retval;
+}
+
+static UA_StatusCode
+getHighLimit(UA_Server *server, UA_NodeId conditionId, UA_Double *highLimit) {
+    UA_Variant value;
+    UA_StatusCode retval = UA_Server_readObjectProperty(server, conditionId,
+                                UA_QUALIFIEDNAME(0, CONDITION_FIELD_HIGHLIMIT),
+                                &value);
+    *highLimit = *(UA_Double*) value.data;
+    return retval;
+}
+
+static UA_StatusCode
+getHighHighLimit(UA_Server *server, UA_NodeId conditionId, UA_Double *highHighLimit) {
+    UA_Variant value;
+    UA_StatusCode retval = UA_Server_readObjectProperty(server, conditionId,
+                                UA_QUALIFIEDNAME(0, CONDITION_FIELD_HIGHHIGHLIMIT),
+                                &value);
+    *highHighLimit = *(UA_Double*) value.data;
+    return retval;
+}
+
+UA_StatusCode
+UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
+                        UA_Double limitValue) {
+    UA_NodeId limitState;
+    UA_Double lowLowLimit;
+    UA_Double lowLimit;
+    UA_Double highLimit;
+    UA_Double highHighLimit;
+    UA_Variant value;
+    UA_QualifiedName currentStateField = UA_QUALIFIEDNAME(0,"CurrentState");
+    UA_QualifiedName currentStateIdField = UA_QUALIFIEDNAME(0,"Id");
+    UA_StatusCode retval = getConditionFieldNodeId(server, &conditionId, &fieldLimitStateQN, &limitState);
+
+    retval |= getHighHighLimit(server, conditionId, &highHighLimit);
+    if(retval == UA_STATUSCODE_GOOD) {
+        if(limitValue >= highHighLimit) {
+            UA_NodeId highHighLimitId;
+            retval |= getConditionFieldNodeId(server, &conditionId, &fieldHighHighLimitQN, &highHighLimitId);
+
+            UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACTIVE_HIGHHIGH_TEXT);
+            UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+            retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
+
+            UA_Variant_setScalar(&value, &highHighLimitId, &UA_TYPES[UA_TYPES_NODEID]);
+            retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+                                                                currentStateField,
+                                                                currentStateIdField);
+            return retval;
+        }
+    }
+
+    retval |= getHighLimit(server, conditionId, &highLimit);
+    if(retval == UA_STATUSCODE_GOOD) {
+        if(limitValue >= highLimit) {
+            UA_NodeId highLimitId;
+            retval |= getConditionFieldNodeId(server, &conditionId, &fieldHighLimitQN, &highLimitId);
+
+            UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACTIVE_HIGH_TEXT);
+            UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+            retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
+
+            UA_Variant_setScalar(&value, &highLimitId, &UA_TYPES[UA_TYPES_NODEID]);
+            retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+                                                        currentStateField,
+                                                        currentStateIdField);
+            return retval;
+        }
+    }
+
+    retval |= getLowLowLimit(server, conditionId, &lowLowLimit);
+    if(retval == UA_STATUSCODE_GOOD) {
+        if(limitValue <= lowLowLimit) {
+
+            UA_NodeId lowLowLimitId;
+            retval |= getConditionFieldNodeId(server, &conditionId, &fieldLowLowLimitQN, &lowLowLimitId);
+
+            UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACTIVE_LOWLOW_TEXT);
+            UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+            retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
+
+            UA_Variant_setScalar(&value, &lowLowLimitId, &UA_TYPES[UA_TYPES_NODEID]);
+            retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+                                                        currentStateField,
+                                                        currentStateIdField);
+            return retval;
+        }
+    }
+
+    retval |= getLowLimit(server, conditionId, &lowLimit);
+    if(retval == UA_STATUSCODE_GOOD) {
+        if(limitValue <= lowLimit) {
+            UA_NodeId lowLimitId;
+            retval |= getConditionFieldNodeId(server, &conditionId, &fieldLowLimitQN, &lowLimitId);
+
+            UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACTIVE_LOW_TEXT);
+            UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+            retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
+
+            UA_Variant_setScalar(&value, &lowLimitId, &UA_TYPES[UA_TYPES_NODEID]);
+            retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+                                                        currentStateField,
+                                                        currentStateIdField);
+            return retval;
+        }
+    }
+
+    UA_LocalizedText textNull = UA_LOCALIZEDTEXT(LOCALE_NULL, TEXT_NULL);
+    UA_Variant_setScalar(&value, &textNull, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+    retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
+
+    UA_NodeId nodeIdNull = UA_NODEID_NULL;
+    UA_Variant_setScalar(&value, &nodeIdNull, &UA_TYPES[UA_TYPES_NODEID]);
+    retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+                                                currentStateField,
+                                                currentStateIdField);
+    return retval;
+}
+
+/* Currently supports only MBEDTLS and OpenSSL */
+UA_StatusCode
+UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
+                            UA_ByteString  cert) {
+    UA_StatusCode retval;
+    if (cert.data == NULL){
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    "No Certificate found.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_CertificateVerification *cv = &server->config.certificateVerification;
+    UA_DateTime  getExpiryDateAndTime;
+    if (cv == NULL && cv->getExpirationDate == NULL){
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    "Certificate verification and get Expiration date function is not registered");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    
+    retval = cv->getExpirationDate(&getExpiryDateAndTime, &cert);
+    if (retval != UA_STATUSCODE_GOOD){
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    "Failed to get certificate expiration date");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Write the expiry date to the propery of the condition instance */
+    retval = UA_Server_writeObjectProperty_scalar(server, conditionId,
+                                                  fieldExpirationDateQN,
+                                                  &getExpiryDateAndTime,
+                                                  &UA_TYPES[UA_TYPES_DATETIME]);
+    return retval;
+}
+#endif/* UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS */

From 2d2cfa4a08a9ab3df3fd5d8010bd77753a3b7736 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 29 Sep 2022 23:50:18 +0200
Subject: [PATCH 0469/1963] refactor(server): Remove refactored network
 statistics

The indirection between network connections and SecureChannels no longer
exists in the server. The network statistics are made directly on the
SecureChannel level.
---
 include/open62541/common.h      | 22 +++++-----------------
 include/open62541/server.h      |  1 -
 src/server/ua_server.c          | 19 ++++++-------------
 src/server/ua_server_internal.h |  1 -
 4 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/include/open62541/common.h b/include/open62541/common.h
index 08b4e09df45..38a2271d2ba 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -188,27 +188,15 @@ typedef enum {
 } UA_SessionState;
 
 /**
- * Statistic counters
+ * Statistic Counters
  * ------------------
  *
- * The stack manages statistic counters for the following layers:
+ * The stack manages statistic counters for SecureChannels and Sessions.
  *
- * - Network
- * - Secure channel
- * - Session
- *
- * The session layer counters are matching the counters of the
+ * The Session layer counters are matching the counters of the
  * ServerDiagnosticsSummaryDataType that are defined in the OPC UA Part 5
- * specification. Counters of the other layers are not specified by OPC UA but
- * are harmonized with the session layer counters if possible. */
-
-typedef struct {
-    size_t currentConnectionCount;
-    size_t cumulatedConnectionCount;
-    size_t rejectedConnectionCount;
-    size_t connectionTimeoutCount;
-    size_t connectionAbortCount;
-} UA_NetworkStatistics;
+ * specification. The SecureChannel counters are not defined in the OPC UA spec,
+ * but are harmonized with the Session layer counters if possible. */
 
 typedef struct {
     size_t currentChannelCount;
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 10f5905a1f8..4fce4ebadea 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -1879,7 +1879,6 @@ UA_Server_setAsyncOperationResult(UA_Server *server,
 * are structured per OPC UA communication layer. */
 
 typedef struct {
-   UA_NetworkStatistics ns;
    UA_SecureChannelStatistics scs;
    UA_SessionStatistics ss;
 } UA_ServerStatistics;
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 81805c575b5..ba94f202082 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -550,21 +550,14 @@ verifyServerApplicationURI(const UA_Server *server) {
 UA_ServerStatistics
 UA_Server_getStatistics(UA_Server *server) {
     UA_ServerStatistics stat;
-    stat.ns = server->networkStatistics;
     stat.scs = server->secureChannelStatistics;
-
+    UA_ServerDiagnosticsSummaryDataType *sds = &server->serverDiagnosticsSummary;
     stat.ss.currentSessionCount = server->activeSessionCount;
-    stat.ss.cumulatedSessionCount =
-        server->serverDiagnosticsSummary.cumulatedSessionCount;
-    stat.ss.securityRejectedSessionCount =
-        server->serverDiagnosticsSummary.securityRejectedSessionCount;
-    stat.ss.rejectedSessionCount =
-        server->serverDiagnosticsSummary.rejectedSessionCount;
-    stat.ss.sessionTimeoutCount =
-        server->serverDiagnosticsSummary.sessionTimeoutCount;
-    stat.ss.sessionAbortCount =
-        server->serverDiagnosticsSummary.sessionAbortCount;
-
+    stat.ss.cumulatedSessionCount = sds->cumulatedSessionCount;
+    stat.ss.securityRejectedSessionCount = sds->securityRejectedSessionCount;
+    stat.ss.rejectedSessionCount = sds->rejectedSessionCount;
+    stat.ss.sessionTimeoutCount = sds->sessionTimeoutCount;
+    stat.ss.sessionAbortCount = sds->sessionAbortCount;
     return stat;
 }
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index db2addb07bd..a6919000ca4 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -171,7 +171,6 @@ struct UA_Server {
 #endif
 
     /* Statistics */
-    UA_NetworkStatistics networkStatistics;
     UA_SecureChannelStatistics secureChannelStatistics;
     UA_ServerDiagnosticsSummaryDataType serverDiagnosticsSummary;
 };

From b136af7a6d5e917f1692b172165733c46af1f5f9 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <70644594+MurzynJ@users.noreply.github.com>
Date: Mon, 3 Oct 2022 10:26:35 +0200
Subject: [PATCH 0470/1963] fix(build): Build examples with open62541 not being
 a root of the CMake project. (#5359)

---
 examples/nodeset/CMakeLists.txt                 | 2 +-
 examples/pubsub_realtime/nodeset/CMakeLists.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/nodeset/CMakeLists.txt b/examples/nodeset/CMakeLists.txt
index 022549e3142..72c95152e2c 100644
--- a/examples/nodeset/CMakeLists.txt
+++ b/examples/nodeset/CMakeLists.txt
@@ -20,7 +20,7 @@ if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     ua_generate_nodeset_and_datatypes(
         NAME "example"
         FILE_NS "${FILE_NS_DIRPREFIX}/server_nodeset.xml"
-        DEPENDS "${CMAKE_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Reduced.xml"
+        DEPENDS "${CMAKE_CURRENT_LIST_DIR}/../../tools/schema/Opc.Ua.NodeSet2.Reduced.xml"
     )
 else()
     # standalone examples build expects already installed Opc.Ua.NodeSet2.Reduced.xml
diff --git a/examples/pubsub_realtime/nodeset/CMakeLists.txt b/examples/pubsub_realtime/nodeset/CMakeLists.txt
index f92f4e4f0a5..7d1803fbe29 100644
--- a/examples/pubsub_realtime/nodeset/CMakeLists.txt
+++ b/examples/pubsub_realtime/nodeset/CMakeLists.txt
@@ -16,12 +16,12 @@ set(PROJECT_BINARY_DIR ${CMAKE_BINARY_DIR})
 ua_generate_nodeset_and_datatypes(
     NAME "example_publisher"
     FILE_NS "${FILE_NS_DIRPREFIX}/pubDataModel.xml"
-    DEPENDS "${CMAKE_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Reduced.xml"
+    DEPENDS "${CMAKE_CURRENT_LIST_DIR}/../../../tools/schema/Opc.Ua.NodeSet2.Reduced.xml"
 )
 ua_generate_nodeset_and_datatypes(
     NAME "example_subscriber"
     FILE_NS "${FILE_NS_DIRPREFIX}/subDataModel.xml"
-    DEPENDS "${CMAKE_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Reduced.xml"
+    DEPENDS "${CMAKE_CURRENT_LIST_DIR}/../../../tools/schema/Opc.Ua.NodeSet2.Reduced.xml"
 )
 # The .csv file can be created from within UaModeler or manually
 ua_generate_nodeid_header(

From a0328d4cb527f9778a262fc4a6b42bfbdffc38e9 Mon Sep 17 00:00:00 2001
From: Vyacheslav Yurkov <v.yurkov@precitec.de>
Date: Mon, 3 Oct 2022 18:25:15 +0200
Subject: [PATCH 0471/1963] fix(build): do not install git files

Signed-off-by: Vyacheslav Yurkov <v.yurkov@precitec.de>
---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78a723a21f8..8fe5939ddf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1745,6 +1745,7 @@ install(DIRECTORY ${UA_install_tools_dirs}
     FILES_MATCHING
     PATTERN "*"
     PATTERN "*.pyc" EXCLUDE
+    PATTERN ".git*" EXCLUDE
     )
 
 install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir})

From 8563396d0dffbd89fc4f22f26c4a566f9cc5fe08 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 3 Oct 2022 13:53:17 +0200
Subject: [PATCH 0472/1963] fix(pubsub): In the mqtt subscriber example, the
 messageReceiveTimout is set when pubsub monitoring is enabled, and the port
 has been changed.

---
 examples/pubsub/tutorial_pubsub_mqtt_subscribe.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index eae41a4946f..b09e1e273d6 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -200,6 +200,9 @@ addDataSetReader(UA_Server *server) {
     readerConfig.publisherId.data = &publisherIdentifier;
     readerConfig.writerGroupId    = 100;
     readerConfig.dataSetWriterId  = 62541;
+#ifdef UA_ENABLE_PUBSUB_MONITORING
+    readerConfig.messageReceiveTimeout = 0;
+#endif
 
     /* Setting up Meta data configuration in DataSetReader */
     fillTestDataSetMetaData(&readerConfig.dataSetMetaData);
@@ -360,7 +363,7 @@ int main(int argc, char **argv) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
+    UA_ServerConfig_setMinimal(config, 4841, NULL);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
 
     /* API calls */

From e7d26d483b3511fe33125e00c39b6ea5d16f702d Mon Sep 17 00:00:00 2001
From: Daniel Pauli <pauli@indel.ch>
Date: Tue, 4 Oct 2022 13:13:43 +0200
Subject: [PATCH 0473/1963] fix(client): Possible memory leak when deleting
 client.

Cleanup of EventLoop and Logger was skipped if there are no SecurityPolicies specified.
---
 src/client/ua_client.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index e711753456a..248fa18e5cc 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -71,12 +71,12 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
         config->certificateVerification.clear(&config->certificateVerification);
 
     /* Delete the SecurityPolicies */
-    if(config->securityPolicies == 0)
-        return;
-    for(size_t i = 0; i < config->securityPoliciesSize; i++)
-        config->securityPolicies[i].clear(&config->securityPolicies[i]);
-    UA_free(config->securityPolicies);
-    config->securityPolicies = 0;
+    if(config->securityPolicies != 0) {
+        for(size_t i = 0; i < config->securityPoliciesSize; i++)
+            config->securityPolicies[i].clear(&config->securityPolicies[i]);
+        UA_free(config->securityPolicies);
+        config->securityPolicies = 0;
+    }
 
     /* Stop and delete the EventLoop */
     UA_EventLoop *el = config->eventLoop;

From eb1abac236569e2f372794ef503ff1bf79d715bf Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Mon, 3 Oct 2022 11:49:55 +0200
Subject: [PATCH 0474/1963] fix(core): fix issues with checking method input
 arguments.

---
 src/server/ua_services_attribute.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 3ecf7086a7b..69b708779ef 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1037,7 +1037,7 @@ compatibleValue(UA_Server *server, UA_Session *session, const UA_NodeId *targetD
                 const UA_UInt32 *targetArrayDimensions, const UA_Variant *value,
                 const UA_NumericRange *range, const char **reason) {
     /* Empty value */
-    if(!value->type) {
+    if(UA_Variant_isEmpty(value)) {
         /* Empty value is allowed for BaseDataType */
         if(UA_NodeId_equal(targetDataTypeId, &UA_TYPES[UA_TYPES_VARIANT].typeId) ||
            UA_NodeId_equal(targetDataTypeId, &UA_NODEID_NULL))
@@ -1061,6 +1061,14 @@ compatibleValue(UA_Server *server, UA_Session *session, const UA_NodeId *targetD
         return false;
     }
 
+    /* Empty array of ExtensionObjects */
+    if(UA_Variant_hasArrayType(value, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) &&
+       value->arrayLength == 0) {
+        /* There is no way to check type compatibility here. Leave it for the upper layers to
+         * decide, if empty array is okay. */
+        return true;        
+    }
+
     /* Is the datatype compatible? */
     if(!compatibleValueDataType(server, value->type, targetDataTypeId)) {
         *reason = reason_ValueDataType;
@@ -1150,13 +1158,15 @@ adjustValueType(UA_Server *server, UA_Variant *value,
     if(!value->type)
         return;
 
-    const UA_DataType *targetDataType = UA_findDataType(targetDataTypeId);
-    if(!targetDataType)
-        return;
-
     /* Unwrap ExtensionObject arrays if they all contain the same DataType */
     unwrapEOArray(server, value);
 
+    const UA_DataType *targetDataType = UA_findDataType(targetDataTypeId);
+    if(!targetDataType) {
+        /* Type might not have been found, if it's a non-NS0 type or an abstract type. */
+        return;
+    }
+
     /* A string is written to a byte array. the valuerank and array dimensions
      * are checked later */
     if(targetDataType == &UA_TYPES[UA_TYPES_BYTE] &&

From 90068f2811764604b216c66e3e3f004217cb2e28 Mon Sep 17 00:00:00 2001
From: JanSurft <jan@hermes-technology.de>
Date: Thu, 6 Oct 2022 22:42:00 +0200
Subject: [PATCH 0475/1963] feat(el): cached address udp (#5355)

* feat(el): cached addresses for udp eventloop

Instead of using connect + send use sendto and cache
the destination address for each opened connection.

* fix(el): choose correct error wrapper

* fix(el): win32 use size_t not socklen

* docs(el): add netif param & active passiv distinct

* build: add new subproj to idea structure

* Use ai_addrlen for memcpy of address information

Co-authored-by: Julius Pfrommer <jpfr@users.noreply.github.com>
---
 .idea/vcs.xml                        |  1 +
 arch/eventloop_posix_tcp.c           |  2 +-
 arch/eventloop_posix_udp.c           | 68 +++++++++++++++-------------
 include/open62541/plugin/eventloop.h | 21 ++++++---
 4 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 9f4ebebc6e4..a431a2f69e5 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,6 +3,7 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/deps/mdnsd" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/deps/mqtt-c" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/deps/ua-nodeset" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index f301df72612..7f971c5cb9d 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -671,7 +671,7 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     return UA_STATUSCODE_GOOD;
 
  shutdown:
-    UA_LOG_SOCKET_ERRNO_GAI_WRAP(
+    UA_LOG_SOCKET_ERRNO_WRAP(
        UA_LOG_ERROR(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                     "TCP %u\t| Send failed with error %s",
                     (unsigned)connectionId, errno_str));
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 045572e03e2..9bec280f1c2 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -30,6 +30,12 @@
 /* A registered file descriptor with an additional method pointer */
 typedef struct {
     UA_RegisteredFD fd;
+    struct sockaddr_storage sendAddr;
+#ifdef _WIN32
+    size_t sendAddrLength;
+#else
+    socklen_t sendAddrLength;
+#endif
     UA_ConnectionManager_connectionCallback connectionCallback;
 } UDP_FD;
 
@@ -127,7 +133,7 @@ getNetworkInterfaceFromParams(size_t paramsSize, const UA_KeyValuePair *params,
     /* Prepare the networkinterface string */
     const UA_String *networkInterface = (const UA_String*)
         UA_KeyValueMap_getScalar(params, paramsSize,
-                                 UA_QUALIFIEDNAME(0, "networkInterface"),
+                                 UA_QUALIFIEDNAME(0, "network-interface"),
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!networkInterface) {
         UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
@@ -290,7 +296,8 @@ setConnectionConfig(UA_FD socket, const UA_KeyValuePair *connectionProperties,
     UA_String hostnameParam = UA_STRING("hostname");
     UA_String portParam = UA_STRING("port");
     UA_String listenHostnamesParam = UA_STRING("listen-hostnames");
-    UA_String listenPortParam= UA_STRING("listen-port");
+    UA_String listenPortParam = UA_STRING("listen-port");
+    UA_String networkInterfaceParam = UA_STRING("network-interface");
 
 #ifdef __linux__
     UA_String socketPriorityParam = UA_STRING("sockpriority");
@@ -330,8 +337,9 @@ setConnectionConfig(UA_FD socket, const UA_KeyValuePair *connectionProperties,
         } else if (UA_String_equal(&prop->key.name, &hostnameParam) ||
                    UA_String_equal(&prop->key.name, &portParam) ||
                    UA_String_equal(&prop->key.name, &listenHostnamesParam) ||
-                   UA_String_equal(&prop->key.name, &listenPortParam)) {
-            /* ignore, required args are handled elsewhere explicitly */
+                   UA_String_equal(&prop->key.name, &listenPortParam) ||
+                   UA_String_equal(&prop->key.name, &networkInterfaceParam)) {
+                /* ignore, required args are handled elsewhere explicitly */
         } else {
             UA_LOG_WARNING(logger, UA_LOGCATEGORY_SERVER,
                            "PubSub Connection creation. Unknown connection parameter: '%.*s'.",
@@ -377,6 +385,8 @@ setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, size_t paramsSize
         memcpy(interfaceAsChar, netif.data, netif.length);
         interfaceAsChar[netif.length] = 0;
 
+        UA_String_clear(&netif);
+
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
                          "PubSub Connection creation problem. "
@@ -416,6 +426,8 @@ setupListenMulticastIPv4(UA_FD socket, size_t paramsSize, const UA_KeyValuePair
         memcpy(interfaceAsChar, netif.data, netif.length);
         interfaceAsChar[netif.length] = 0;
 
+        UA_String_clear(&netif);
+
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
                          "PubSub Connection creation problem. "
@@ -680,7 +692,7 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                         "UDP %u\t| recv signaled the socket was shutdown (%s)",
                         (unsigned)rfd->fd, errno_str));
         UDP_close(ucm, rfd);
-        UA_free(rfd);
+        UA_free((UDP_FD*)rfd);
         return;
     }
 
@@ -950,7 +962,6 @@ UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     return UA_STATUSCODE_GOOD;
 }
 
-
 static UA_StatusCode
 UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                        size_t paramsSize, const UA_KeyValuePair *params,
@@ -965,6 +976,7 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     /* Send the full buffer. This may require several calls to send */
     size_t nWritten = 0;
 
+    UDP_FD *ufd = (UDP_FD *) UDP_findRegisteredFD((UDPConnectionManager *)cm, connectionId);
     do {
         ssize_t n = 0;
         do {
@@ -972,9 +984,9 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                          UA_LOGCATEGORY_NETWORK,
                          "UDP %u\t| Attempting to send", (unsigned)connectionId);
             size_t bytes_to_send = buf->length - nWritten;
-            n = UA_send((UA_FD)connectionId,
+            n = UA_sendto((UA_FD)connectionId,
                         (const char*)buf->data + nWritten,
-                        bytes_to_send, flags);
+                          bytes_to_send, flags, (struct sockaddr*) &ufd->sendAddr, ufd->sendAddrLength);
             if(n < 0) {
                 /* An error we cannot recover from? */
                 if(UA_ERRNO != UA_INTERRUPTED &&
@@ -1051,7 +1063,7 @@ checkForSendMulticastAndConfigure(size_t paramsSize, const UA_KeyValuePair *para
 static UA_StatusCode
 registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *params,
                                     const char *hostname, struct addrinfo *info,
-                                    int error, UA_FD *sock, const UA_Logger *logger) {
+                                    int error, UDP_FD * ufd, UA_FD *sock, const UA_Logger *logger) {
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     *sock = newSock;
     if(newSock == UA_INVALID_FD) {
@@ -1075,18 +1087,9 @@ registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *pa
                      "UDP\t| Configuring send multicast failed");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    /* Non-blocking connect */
-    error = UA_connect(newSock, info->ai_addr, info->ai_addrlen);
-    if(error != 0 &&
-       UA_ERRNO != UA_INPROGRESS &&
-       UA_ERRNO != UA_WOULDBLOCK) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                           "UDP\t| Connecting the socket to %s failed (%s)",
-                           hostname, errno_str));
-        UA_close(newSock);
-        return UA_STATUSCODE_BADDISCONNECT;
-    }
+    memcpy(&ufd->sendAddr, info->ai_addr, info->ai_addrlen);
+    ufd->sendAddrLength = info->ai_addrlen;
+
     return res;
 }
 
@@ -1114,25 +1117,26 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
     }
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
-    /* Create a socket and register the destination address from the provided parameters */
-    UA_FD newSock = UA_INVALID_FD;
-    UA_StatusCode res =
-        registerSocketAndDestinationForSend(paramsSize, params, hostname, info,
-                                            error, &newSock, el->eventLoop.logger);
-    UA_freeaddrinfo(info);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
 
     /* Allocate the UA_RegisteredFD */
     UDP_FD *newudpfd = (UDP_FD*)UA_calloc(1, sizeof(UDP_FD));
     if(!newudpfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| Error allocating memory for the socket, closing",
-                       (unsigned)newSock);
-        UA_close(newSock);
+                       "UDP\t| Error allocating memory for the socket, closing");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
+    /* Create a socket and register the destination address from the provided parameters */
+    UA_FD newSock = UA_INVALID_FD;
+    UA_StatusCode res =
+        registerSocketAndDestinationForSend(paramsSize, params, hostname, info,
+                                            error, newudpfd, &newSock, el->eventLoop.logger);
+    UA_freeaddrinfo(info);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_free(newudpfd);
+        return res;
+    }
+
     newudpfd->fd.fd = newSock;
     newudpfd->fd.es = &cm->eventSource;
     newudpfd->fd.callback = (UA_FDCallback)UDP_connectionSocketCallback;
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index c058a6959c8..26cbe20cc15 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -466,17 +466,24 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  * effect.
  *
  * Configuration Parameters:
- * - 0:listen-port [uint16]: Port to listen for new connections (default: do not
- *                           listen on any port).
- * - 0:listen-hostnames [string | string array]: Hostnames of the devices to
- *                                               listen on (default: listen on
- *                                               all devices).
+
  * - 0:recv-bufsize [uint32]: Size of the buffer that is allocated for receiving
  *                            messages (default 64kB).
  *
  * Open Connection Parameters:
- * - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
- * - 0:port [uint16]: Port of the target host (required).
+ *
+ * - Active Connection
+ * -   0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
+ * -   0:port [uint16]: Port of the target host (required).
+ * - Passive Connection
+ * -   0:listen-port [uint16]: Port to listen for new connections (default: do not
+ *                           listen on any port).
+ * -   0:listen-hostnames [string | string array]: Hostnames of the devices to
+ *                                               listen on (default: listen on
+ *                                               all devices).
+ *
+ * - 0:network-interface [string]: Network interface to listen on or send through when using
+ *                                 multicast addresses
  * - 0:ttl [uint32]: Multicast time to live, (optional, default: 1 - meaning multicast is
  *                   available only to the local subnet).
  * - 0:loopback [boolean]: Whether or not to use multicast loopback, enabling

From b8bcee935f474d8fcb5df538e25c737280ec9b7e Mon Sep 17 00:00:00 2001
From: Jan Altenberg <jan.altenberg@osadl.org>
Date: Tue, 4 Oct 2022 18:03:16 +0200
Subject: [PATCH 0476/1963] fix(examples): Fix usage of publisherId in
 pubsub_interrupt_publish.c

Signed-off-by: Jan Altenberg <jan.altenberg@osadl.org>
---
 examples/pubsub_realtime/pubsub_interrupt_publish.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/pubsub_realtime/pubsub_interrupt_publish.c b/examples/pubsub_realtime/pubsub_interrupt_publish.c
index 030487150d4..8d1293e39ea 100644
--- a/examples/pubsub_realtime/pubsub_interrupt_publish.c
+++ b/examples/pubsub_realtime/pubsub_interrupt_publish.c
@@ -276,7 +276,9 @@ addPubSubConfiguration(UA_Server* server) {
         {UA_STRING(ETH_INTERFACE), UA_STRING(ETH_PUBLISH_ADDRESS)};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherId.numeric = UA_UInt32_random();
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
+
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 
     UA_PublishedDataSetConfig publishedDataSetConfig;

From 093ae3ab9841916d5b0dea132f25ddd5b6fd3c2a Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 6 Oct 2022 13:09:33 +0200
Subject: [PATCH 0477/1963] docs(el): describe validation parameter

---
 include/open62541/plugin/eventloop.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 26cbe20cc15..95b83836be0 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -496,6 +496,9 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  *                            processed first depending on the selected device queueing
  *                            discipline.  Setting a priority outside the range 0 to 6
  *                            requires the CAP_NET_ADMIN capability.
+ * - 0:validate [boolean]: If true, the connection setup will act as a dry-run without
+ *                         actually creating any connection but solely validating the
+ *                         provided parameters, hostname(s) and port. (optional, default: false)
  *
  * Connection Callback Paramters:
  * - 0:remote-hostname [string]: When a new connection is opened by listening on

From 8c724bb6b1abfb3dfa0402a5f5eed207e669f060 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Fri, 7 Oct 2022 09:43:46 +0200
Subject: [PATCH 0478/1963] feat(el): udp cm validation logic

---
 arch/eventloop_posix_udp.c | 90 +++++++++++++++++++++++++++-----------
 1 file changed, 64 insertions(+), 26 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 9bec280f1c2..f8ca0f2e254 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -734,11 +734,12 @@ checkForListenMulticastAndConfigure(struct addrinfo *info, size_t paramsSize, co
     return res;
 }
 
-static void
+static UA_StatusCode
 UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrinfo *info,
                          size_t paramsSize, const UA_KeyValuePair *params,
                          void *application, void *context,
-                         UA_ConnectionManager_connectionCallback connectionCallback) {
+                         UA_ConnectionManager_connectionCallback connectionCallback,
+                         UA_Boolean validate) {
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
@@ -753,6 +754,9 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "UDP\t| getnameinfo(...) could not resolve the hostname (%s)",
                           errno_str));
+        if(validate) {
+            return UA_STATUSCODE_BADCONNECTIONREJECTED;
+        }
     }
 
     /* Create the listen socket */
@@ -763,7 +767,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                           "UDP %u\t| Error opening the listen socket for "
                           "\"%s\" on port %u (%s)",
                           (unsigned)listenSocket, hoststr, port, errno_str));
-        return;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -775,7 +779,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Configuring listen multicast failed");
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
@@ -789,7 +793,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                        "UDP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 #endif
 
@@ -800,7 +804,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                        "UDP %u\t| Could not make the socket reusable, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
     /* Set the socket non-blocking */
@@ -809,7 +813,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                        "UDP %u\t| Could not set the socket non-blocking, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
     /* Supress interrupts from the socket */
@@ -818,7 +822,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                        "UDP %u\t| Could not disable SIGPIPE, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
     /* Bind socket to address */
@@ -829,7 +833,12 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                           "UDP %u\t| Error binding the socket to the address (%s), closing",
                           (unsigned)listenSocket, errno_str));
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
+
+    if(validate) {
+        UA_close(listenSocket);
+        return UA_STATUSCODE_GOOD;
     }
 
     /* Allocate the UA_RegisteredFD */
@@ -839,7 +848,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                        "UDP %u\t| Error allocating memory for the socket, closing",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
-        return;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
     newudpfd->fd.fd = listenSocket;
@@ -858,7 +867,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                        (unsigned)listenSocket);
         UA_free(newudpfd);
         UA_close(listenSocket);
-        return;
+        return res;
     }
 
     /* Register the listen socket in the application */
@@ -866,13 +875,15 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                        application, &newudpfd->fd.context,
                        UA_CONNECTIONSTATE_ESTABLISHED,
                        0, NULL, UA_BYTESTRING_NULL);
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
 UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UInt16 port,
                           size_t paramsSize, const UA_KeyValuePair *params,
                           void *application, void *context,
-                          UA_ConnectionManager_connectionCallback connectionCallback) {
+                          UA_ConnectionManager_connectionCallback connectionCallback,
+                          UA_Boolean validate) {
     /* Get all the interface and IPv4/6 combinations for the configured hostname */
     struct addrinfo hints, *res;
     memset(&hints, 0, sizeof hints);
@@ -900,13 +911,18 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UIn
                           UA_LOGCATEGORY_NETWORK,
                           "UDP\t| getaddrinfo lookup for \"%s\" on port %u failed (%s)",
                           hostname, port, errno_str));
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
     /* Add listen sockets */
     struct addrinfo *ai = res;
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
     while(ai) {
-        UDP_registerListenSocket(cm, port, ai, paramsSize, params, application, context, connectionCallback);
+        rv = UDP_registerListenSocket(cm, port, ai, paramsSize, params, application, context, connectionCallback, validate);
+        if(rv != UA_STATUSCODE_GOOD && validate) {
+            UA_freeaddrinfo(res);
+            return rv;
+        }
         ai = ai->ai_next;
     }
     UA_freeaddrinfo(res);
@@ -1097,7 +1113,8 @@ static UA_StatusCode
 UDP_openSendConnection(UA_ConnectionManager *cm,
                        size_t paramsSize, const UA_KeyValuePair *params,
                        void *application, void *context,
-                       UA_ConnectionManager_connectionCallback connectionCallback) {
+                       UA_ConnectionManager_connectionCallback connectionCallback,
+                       UA_Boolean validate) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)cm->eventSource.eventLoop;
 
     /* Get the connection parameters */
@@ -1113,7 +1130,7 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
         }
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Opening a connection failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
@@ -1132,6 +1149,14 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
         registerSocketAndDestinationForSend(paramsSize, params, hostname, info,
                                             error, newudpfd, &newSock, el->eventLoop.logger);
     UA_freeaddrinfo(info);
+    if(validate && res == UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "UDP %u\t| Connection validated to \"%s\" on port %s",
+                    (unsigned)newSock, hostname, portStr);
+        UA_close(newSock);
+        UA_free(newudpfd);
+        return UA_STATUSCODE_GOOD;
+    }
     if(res != UA_STATUSCODE_GOOD) {
         UA_free(newudpfd);
         return res;
@@ -1173,7 +1198,8 @@ static UA_StatusCode
 UDP_openReceiveConnection(UA_ConnectionManager *cm,
                           size_t paramsSize, const UA_KeyValuePair *params,
                           void *application, void *context,
-                          UA_ConnectionManager_connectionCallback connectionCallback) {
+                          UA_ConnectionManager_connectionCallback connectionCallback,
+                          UA_Boolean validate) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get the socket */
@@ -1196,7 +1222,8 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP\t| Listening on all interfaces");
         return UDP_registerListenSockets(cm, NULL, *port, paramsSize, params,
-                                         application, context, connectionCallback);
+                                         application, context, connectionCallback,
+                                         validate);
     }
 
     /* Correct datatype for the hostnames? */
@@ -1212,9 +1239,11 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| Listening on all interfaces");
         return UDP_registerListenSockets(cm, NULL, *port, paramsSize, params,
-                                         application, context, connectionCallback);
+                                         application, context, connectionCallback,
+                                         validate);
     }
 
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
     /* Iterate over the configured hostnames */
     UA_String *hostStrings = (UA_String*)hostNames->data;
     for(size_t i = 0; i < hostNames->arrayLength; i++) {
@@ -1223,21 +1252,30 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
             continue;
         memcpy(hostname, hostStrings[i].data, hostStrings->length);
         hostname[hostStrings->length] = '\0';
-        UDP_registerListenSockets(cm, hostname, *port,
-                                  paramsSize, params,
-                                  application,
-                                  context, connectionCallback);
+        rv = UDP_registerListenSockets(cm, hostname, *port, paramsSize, params,
+                                  application, context, connectionCallback, validate);
+        if(rv != UA_STATUSCODE_GOOD) {
+            return rv;
+        }
     }
 
     return UA_STATUSCODE_GOOD;
 }
 
-
 static UA_StatusCode
 UDP_openConnection(UA_ConnectionManager *cm,
                    size_t paramsSize, const UA_KeyValuePair *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
+
+    const UA_Variant *validationValue = UA_KeyValueMap_get(params, paramsSize,
+                                               UA_QUALIFIEDNAME(0, "validate"));
+    UA_Boolean validate = false;
+    if(validationValue) {
+        if(UA_Variant_hasScalarType(validationValue, &UA_TYPES[UA_TYPES_BOOLEAN])) {
+            validate = *(UA_Boolean *)validationValue->data;
+        }
+    }
     /* If the "port"-parameter is defined, then try to open a send connection.
      * Otherwise try to open a socket that listens for incoming TCP
      * connections. */
@@ -1245,10 +1283,10 @@ UDP_openConnection(UA_ConnectionManager *cm,
                                                UA_QUALIFIEDNAME(0, "port"));
     if(val) {
         return UDP_openSendConnection(cm, paramsSize, params,
-                                      application, context, connectionCallback);
+                                      application, context, connectionCallback, validate);
     } else {
         return UDP_openReceiveConnection(cm, paramsSize, params,
-                                         application, context, connectionCallback);
+                                         application, context, connectionCallback, validate);
     }
 }
 

From 6407654a39b34a2b4830338985eeec8f93cac68c Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Fri, 7 Oct 2022 11:21:16 +0200
Subject: [PATCH 0479/1963] test(el): test connection validation

---
 tests/check_eventloop_udp.c | 100 ++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index 649126dfc98..0779ad7e477 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -105,6 +105,104 @@ START_TEST(listenUDP) {
     ck_assert_uint_eq(testContext.connCount, 0);
 } END_TEST
 
+START_TEST(connectUDPValidationSucceeds) {
+        UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+        el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+        el->registerEventSource(el, &cm->eventSource);
+
+        UA_UInt16 port = 30000;
+        UA_Variant portVar;
+        UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+
+        UA_Boolean validate = true;
+        UA_Variant validateVar;
+        UA_Variant_setScalar(&validateVar, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
+
+        UA_KeyValuePair params[3];
+        params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+        params[0].value = portVar;
+
+        UA_String hostname = UA_STRING("127.0.0.1");
+        params[1].key = UA_QUALIFIEDNAME(0, "listen-hostnames");
+        UA_Variant_setArray(&params[1].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
+
+        params[2].key = UA_QUALIFIEDNAME(0, "validate");
+        params[2].value = validateVar;
+
+        TestContext testContext;
+        testContext.connCount = 0;
+
+        UA_StatusCode retval =
+            cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+        /* Open a client connection */
+        clientId = 0;
+        UA_String targetHost = UA_STRING("localhost");
+        params[0].key = UA_QUALIFIEDNAME(0, "port");
+        params[0].value = portVar;
+        params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+        UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+        params[2].key = UA_QUALIFIEDNAME(0, "validate");
+        params[2].value = validateVar;
+
+        retval = cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+        el->free(el);
+        el = NULL;
+    } END_TEST
+
+START_TEST(connectUDPValidationFails) {
+        UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+        el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+        el->registerEventSource(el, &cm->eventSource);
+
+        UA_UInt16 port = 30000;
+        UA_Variant portVar;
+        UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+
+        UA_Boolean validate = true;
+        UA_Variant validateVar;
+        UA_Variant_setScalar(&validateVar, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
+
+        UA_KeyValuePair params[3];
+        params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+        params[0].value = portVar;
+
+        UA_String hostname = UA_STRING("300.300.300.300");
+        params[1].key = UA_QUALIFIEDNAME(0, "listen-hostnames");
+        UA_Variant_setArray(&params[1].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
+
+        params[2].key = UA_QUALIFIEDNAME(0, "validate");
+        params[2].value = validateVar;
+
+        TestContext testContext;
+        testContext.connCount = 0;
+
+        UA_StatusCode retval =
+            cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
+
+        /* Open a client connection */
+        clientId = 0;
+        UA_String targetHost = UA_STRING("localho");
+        params[0].key = UA_QUALIFIEDNAME(0, "port");
+        params[0].value = portVar;
+        params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+        UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+
+        params[2].key = UA_QUALIFIEDNAME(0, "validate");
+        params[2].value = validateVar;
+
+        retval = cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
+        el->free(el);
+        el = NULL;
+    } END_TEST
+
 START_TEST(connectUDP) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
@@ -412,6 +510,8 @@ int main(void) {
     TCase *tc = tcase_create("test cases");
     tcase_add_test(tc, listenUDP);
     tcase_add_test(tc, connectUDP);
+    tcase_add_test(tc, connectUDPValidationFails);
+    tcase_add_test(tc, connectUDPValidationSucceeds);
     tcase_add_test(tc, udpTalkerAndListener);
     tcase_add_test(tc, udpTalkerAndListenerDifferentDestination);
     suite_add_tcase(s, tc);

From 05205ddeb56adc7649b0f5e0c2d873cc1a654b8c Mon Sep 17 00:00:00 2001
From: Federico Francescon <fede.francescon@gmail.com>
Date: Thu, 13 Oct 2022 16:49:55 +0200
Subject: [PATCH 0480/1963] fix(core): UA_LOG_SESSION_INTERNAL gcc error
 (#5374)

Fixes a gcc errror when compiling with strict flags `-Wformat-overflow -Werror  -fdiagnostics-color=always -O3`
---
 src/server/ua_session.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index e4e4c411323..09e88553f69 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -134,7 +134,7 @@ UA_Session_dequeuePublishReq(UA_Session *session);
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                           \
         int nameLen = (SESSION) ? (int)(SESSION)->sessionName.length : 0; \
         const char *nameStr = (SESSION) ?                               \
-            (const char*)(SESSION)->sessionName.data : NULL;            \
+            (const char*)(SESSION)->sessionName.data : "";              \
         unsigned long sockId = ((SESSION) && (SESSION)->header.channel) ? \
             (unsigned long)(SESSION)->header.channel->connectionId : 0; \
         UA_UInt32 chanId = ((SESSION) && (SESSION)->header.channel) ?   \

From de7534e3573277fa3dde511044c28754e272f1a3 Mon Sep 17 00:00:00 2001
From: Joakim Roubert <joakimr@axis.com>
Date: Fri, 14 Oct 2022 14:17:33 +0200
Subject: [PATCH 0481/1963] fix(doc): client.h Documentation updates (#5381)

Change-Id: I21d3275563aab17bf0c7c33f9663a9d11a6e70ab
Signed-off-by: Joakim Roubert <joakimr@axis.com>

Signed-off-by: Joakim Roubert <joakimr@axis.com>
---
 include/open62541/client.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 0b9ff625d85..97ef59523f0 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -372,7 +372,7 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
  * Services
  * --------
  *
- * The raw OPC UA services are exposed to the client. But most of them time, it
+ * The raw OPC UA services are exposed to the client. But most of the time, it
  * is better to use the convenience functions from ``ua_client_highlevel.h``
  * that wrap the raw services. */
 /* Don't use this function. Use the type versions below instead. */
@@ -563,7 +563,7 @@ UA_Client_Service_queryNext(UA_Client *client,
  * explicitly.
  *
  * Connection and session management are also performed in
- * `UA_Client_run_iterate`, so to keep a connection healthy any client need to
+ * `UA_Client_run_iterate`, so to keep a connection healthy any client needs to
  * consider how and when it is appropriate to do the call.
  * This is especially true for the periodic renewal of a SecureChannel's
  * SecurityToken which is designed to have a limited lifetime and will
@@ -582,7 +582,7 @@ UA_Client_Service_queryNext(UA_Client *client,
  * The statusCode received when the client is shutting down is
  * UA_STATUSCODE_BADSHUTDOWN.
  *
- * The statusCode received when the client don't receive response
+ * The statusCode received when the client doesn't receive response
  * after specified config->timeout (in ms) is
  * UA_STATUSCODE_BADTIMEOUT.
  *
@@ -611,7 +611,7 @@ UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
  * @param client Pointer to the UA_Client
  * @param requestId RequestId of the request, which was returned by
  *        UA_Client_sendAsyncRequest before
- * @param userdata The new userdata.
+ * @param userdata The new userdata
  * @param callback The new callback
  * @return UA_StatusCode UA_STATUSCODE_GOOD on success
  *         UA_STATUSCODE_BADNOTFOUND when no request with requestId is found. */
@@ -629,7 +629,7 @@ UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout);
  * SecureChannel during a downtime when no time-critical operations are
  * performed. This method is asynchronous. The renewal is triggered (the OPN
  * message is sent) but not completed. The OPN response is handled with
- * ``UA_Client_run_iterate`` or a synchronous servica-call operation.
+ * ``UA_Client_run_iterate`` or a synchronous service-call operation.
  *
  * @return The return value is UA_STATUSCODE_GOODCALLAGAIN if the SecureChannel
  *         has not elapsed at least 75% of its lifetime. Otherwise the
@@ -649,7 +649,7 @@ UA_Client_renewSecureChannel(UA_Client *client);
  * The statusCode received when the client is shutting down is
  * UA_STATUSCODE_BADSHUTDOWN.
  *
- * The statusCode received when the client don't receive response
+ * The statusCode received when the client doesn't receive response
  * after specified timeout (in ms) is
  * UA_STATUSCODE_BADTIMEOUT.
  *
@@ -680,7 +680,7 @@ typedef void (*UA_ClientCallback)(UA_Client *client, void *data);
  * @param callback The callback that shall be added.
  * @param data Data that is forwarded to the callback.
  * @param date The timestamp for the execution time.
- * @param callbackId Set to the identifier of the repeated callback . This can
+ * @param callbackId Set to the identifier of the repeated callback. This can
  *        be used to cancel the callback later on. If the pointer is null, the
  *        identifier is not set.
  * @return Upon success, UA_STATUSCODE_GOOD is returned. An error code
@@ -697,7 +697,7 @@ UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
  * @param interval_ms The callback shall be repeatedly executed with the given
  *        interval (in ms). The interval must be positive. The first execution
  *        occurs at now() + interval at the latest.
- * @param callbackId Set to the identifier of the repeated callback . This can
+ * @param callbackId Set to the identifier of the repeated callback. This can
  *        be used to cancel the callback later on. If the pointer is null, the
  *        identifier is not set.
  * @return Upon success, UA_STATUSCODE_GOOD is returned. An error code

From 737f0562fcaabe4906f985981754e850e97b0c72 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 13 Jun 2022 14:32:37 +0200
Subject: [PATCH 0482/1963] feat(pubsub): Adding payload encryption in mqtt
 publish example

---
 CMakeLists.txt                                |  3 ++
 .../pubsub/tutorial_pubsub_mqtt_publish.c     | 40 +++++++++++++++++++
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   | 39 +++++++++++++++++-
 src/pubsub/ua_pubsub_readergroup.c            |  6 ++-
 src/pubsub/ua_pubsub_writergroup.c            |  6 ++-
 5 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fe5939ddf5..adfd5d57de4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1159,6 +1159,9 @@ if(UA_ENABLE_PUBSUB)
 endif()
 
 if(UA_ENABLE_JSON_ENCODING)
+    if(UA_ENABLE_PUBSUB_ENCRYPTION)
+        MESSAGE(WARNING "Payload encryption with JSON encoding is not possible according to the specification.The message security is only defined for the UADP message mapping.")
+    endif()
     if(UA_ENABLE_PUBSUB)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage_json.c)
     endif()
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index c629ce5b115..007dbaa8579 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -43,6 +43,7 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
+#include <open62541/plugin/securitypolicy_default.h>
 
 #include <signal.h>
 
@@ -79,6 +80,16 @@
 #define CA_FILE_PATH                    "/path/to/server.cert"
 #endif
 
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+#define UA_AES128CTR_SIGNING_KEY_LENGTH 32
+#define UA_AES128CTR_KEY_LENGTH 16
+#define UA_AES128CTR_KEYNONCE_LENGTH 4
+
+UA_Byte signingKey[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
+UA_Byte encryptingKey[UA_AES128CTR_KEY_LENGTH] = {0};
+UA_Byte keyNonce[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
+#endif
+
 #ifdef UA_ENABLE_JSON_ENCODING
 static UA_Boolean useJson = true;
 #else
@@ -254,6 +265,12 @@ addWriterGroup(UA_Server *server, char *topic, int interval) {
         writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
     }
 
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+    /* Encryption settings */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+#endif
 
     /* configure the mqtt publish topic */
     UA_BrokerWriterGroupTransportDataType brokerTransportSettings;
@@ -290,6 +307,19 @@ addWriterGroup(UA_Server *server, char *topic, int interval) {
         UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
     }
 
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKey};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKey};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNonce};
+    retval = UA_Server_setWriterGroupEncryptionKeys(server, writerGroupIdent, 1, sk, ek, kn);
+    if (retval!= UA_STATUSCODE_GOOD)
+    {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,"SV_PubSub.c : addWriterGroup : UA_Server_setWriterGroupEncryptionKeys : "
+                                                            "failure %s", UA_StatusCode_name(retval));
+    }
+#endif
+
     return retval;
 }
 
@@ -461,6 +491,16 @@ int main(int argc, char **argv) {
     /* Details about the connection configuration and handling are located in
      * the pubsub connection tutorial */
     UA_ServerConfig_setDefault(config);
+
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+    /* Instantiate the PubSub SecurityPolicy */
+    config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
+        UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+#endif
+
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
 
     addPubSubConnection(server, addressUrl);
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index b09e1e273d6..62ea7f3d908 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -7,6 +7,7 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
+#include <open62541/plugin/securitypolicy_default.h>
 
 #include <signal.h>
 
@@ -44,6 +45,16 @@
 #define CA_FILE_PATH                    "/path/to/server.cert"
 #endif
 
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+#define UA_AES128CTR_SIGNING_KEY_LENGTH 32
+#define UA_AES128CTR_KEY_LENGTH 16
+#define UA_AES128CTR_KEYNONCE_LENGTH 4
+
+UA_Byte signingKey[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
+UA_Byte encryptingKey[UA_AES128CTR_KEY_LENGTH] = {0};
+UA_Byte keyNonce[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
+#endif
+
 #ifdef UA_ENABLE_JSON_ENCODING
 static UA_Boolean useJson = true;
 #else
@@ -165,8 +176,24 @@ addReaderGroup(UA_Server *server,  int interval) {
 
     readerGroupConfig.transportSettings = transportSettings;
 
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+    /* Encryption settings */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+#endif
+
     retval |= UA_Server_addReaderGroup(server, connectionIdent, &readerGroupConfig,
                                        &readerGroupIdent);
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+    /* Add the encryption key informaton */
+    UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKey};
+    UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKey};
+    UA_ByteString kn = {UA_AES128CTR_KEYNONCE_LENGTH, keyNonce};
+
+    // TODO security token not necessary for readergroup (extracted from security-header)
+    retval |= UA_Server_setReaderGroupEncryptionKeys(server, readerGroupIdent, 1, sk, ek, kn);
+#endif
     retval |= UA_Server_setReaderGroupOperational(server, readerGroupIdent);
 
     return retval;
@@ -201,7 +228,7 @@ addDataSetReader(UA_Server *server) {
     readerConfig.writerGroupId    = 100;
     readerConfig.dataSetWriterId  = 62541;
 #ifdef UA_ENABLE_PUBSUB_MONITORING
-    readerConfig.messageReceiveTimeout = 0;
+    readerConfig.messageReceiveTimeout = 10;
 #endif
 
     /* Setting up Meta data configuration in DataSetReader */
@@ -364,6 +391,16 @@ int main(int argc, char **argv) {
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, 4841, NULL);
+
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+    /* Instantiate the PubSub SecurityPolicy */
+    config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
+        UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+#endif
+
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
 
     /* API calls */
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index c27b1e026fb..c4801af9bcd 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -451,7 +451,11 @@ UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId reader
                                        const UA_ByteString keyNonce) {
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
     UA_CHECK_MEM(rg, return UA_STATUSCODE_BADNOTFOUND);
-
+    if(rg->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+                                   "JSON encoding is enabled. The message security is only defined for the UADP message mapping.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
     if(!rg->config.securityPolicy) {
         UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
                                    "No SecurityPolicy configured for the ReaderGroup");
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index bba95c23d84..8da5eb71dcd 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -588,7 +588,11 @@ UA_Server_setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writer
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
-
+    if(wg->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) {
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                   "JSON encoding is enabled. The message security is only defined for the UADP message mapping.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
     if(!wg->config.securityPolicy) {
         UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
                                    "No SecurityPolicy configured for the WriterGroup");

From b457206d248b8ddd139f2eb29016af87e86f4377 Mon Sep 17 00:00:00 2001
From: Muddasir shakil <30407857+Muddasir-Shakil@users.noreply.github.com>
Date: Mon, 17 Oct 2022 20:55:11 +0200
Subject: [PATCH 0483/1963] feat(pubsub): KeyStorage and SetSecurityKeys
 (#5243)

* Add UA_ENABLE_PUBSUB_SKS Cmake option

The SKS related features are enabled in open62541. The UA_ENABLE_PUBSUB_SKS
cmake option adds the support to enable/disable SKS related features.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add securityGroupId parameter to PubSub Group Config

The PubSub groups (Reader/Writer) are associated to a security group by
securityGroupId. The securityGroupId parameter is added to UA_WriterGroupConfig
and UA_ReaderGroupConfig structs.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add UA_PubSubKeyListItem struct

The Keystorage contains a linked list of KeyItems. The KeyItems holds the
information related to a key. The UA_PubSubKeyListItem struct forms the keyItems
of the keystorage KeyList.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add UA_PubSubKeyStorage struct

A structured storage is required to store all the keys and related information,
such as which security group, what security policy, how many PubSub Groups, and
when to move to next keys. The UA_PubSubKeyStorage struct holds the list of keys
used to secure the pubsub message for a security group and related information.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add PubSubKeyStorageList to the pubSubManager

The KeyStorage is managed by the pubSubManager object. There can be multiple key
storages managed by a pubSubManager for different Security Groups. An
UA_PubSubKeyStorage List is added to the pubSubManager, which contains the
pointers to all the key Storages managed by the pubSubManager for different
Security Groups.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add KeyStorage pointer to ReaderGroup and WriterGroup struct

A reference to a Keystorage is created when a ReaderGroup or WriterGroup group
is created. This reference is used for the life cycle management of the
KeyStorage. A non-owning pointer is added to WriterGroup and ReaderGroup structs
to point to their associated keystorage in the server.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add function to initialize a keyStorage

An empty keystorage list is created when a ReaderGroup or a WriterGroup is
created in server. The new KeyStorage is added to the server KeyList and
initialized for a securityGroup. If a KeyStorage already exists in the server
for a securityGroupId, then the referenceCount is incremented and the keyStorage
is added to the initializing ReaderGroup or WriterGroup. In case of failure,
the keystorage is cleaned and deleted.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add storeSecurityKey function

After the keystorage is initialized and added to the server keyList, the
keys should be stored in the keystorage keylist. the storeSecurityKeys function
takes current key and future key list and add it a KeyStorage in the server.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add Mechanism for key Rollover after KeyLifeTime expires

After the KeyLifeTime expires the Publisher and Subscriber are required to
move to the next key in the existing list. The addMoveToNextKeyCallback function
calculates the time to trigger the callback function and adds a timed server
callback. The importKeyToChannelContext function takes the key material,
divides the key into singing, encrypting and keyNonce part according to security
Policy assigned to KeyStorage and adds them to the channelcontext of the PubSub
Group. The moveToKeyCallback is the callback function to set the keys and
add next callback for key Rollover.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add API function update the existing keyStorage

The existing KeyList is updated/replaced with the fetched list. If the
currentTokenId is unknown in the existing list, then the existing keylist is
replaced by the fetched KeyList. In othercases keystorage is updated and keylist
is extended with new future keys.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add removeKeyStorage function

A keyStorage can be referenced by multiple PubSub Groups in a server. When a
keyStorage is removed with removeKeyStorage function, it checks the number of
of referenceCount parameter and decrements it by 1. If referenceCount was 1, then
the keyStorage pointer is freed and removed from the server.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add keyStorage in Server with ReaderGroup

Each ReaderGroup is assocaited with a keyStorage. The keys are used in its
channel context to secure the messages. A keyStorage is added/updated when
a ReaderGroup is created in the server.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add KeyStorage in server with WriterGroup

Each WriterGroup is assocaited with a keyStorage. The keys are used in its
channel context to secure the messages. A keyStorage is added/updated when
a WriterGroup is created in the server.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Remove KeyStorage from server with ReaderGroup

Each ReaderGroup is assocaited with a keyStorage. The keys are used in its
channel context to secure the messages. A keyStorage is removed/updated when
a ReaderGroup is removed from the server.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Remove KeyStorage from server with a WriterGroup

Each WriterGroup is assocaited with a keyStorage. The keys are used in its
channel context to secure the messages. A keyStorage is removed/updated when
a WriterGroup is removed in the server.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Delete All KeyStorages from Server

When PubSub Configuration is deleted, all the nested configuration and members
are deleted from the server. The KeyStorages are also deleted when a
PubSubManager is deleted, because KeyStorages does not serve the purpose anymore.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add KeyStorage Test setup and unit tests

A test suite is added for the keystorage and the following using tests are added
to it
	- Initialization of empty keystorage
	- Initialization of keystorage with invalid PubSub security policy
	- storing keys into empty keystorage
	- move to next key after keylifetime expire
	- Setting keys to the channel context
	- Adding keyStorage with Writer and ReaderGroup
	- Adding a Reader/WriterGroup to existing Keystorage
	- Removing keyStorage with a Writer/ReaderGroup

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add setSecurityKeys Method Node Callback

The keys are pushed to the Publishers and Subscribers who do not have client
functionality using setSecurityKeys Method Node. The setSecurityKeys callback
implements the backend of the setSecurityKeys Method node exposed by the server.
Checking for user credentials against PubSub Security Group Object nodes
is unresolved becuase creation of Security Group Object is not implemented.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add sks push test setup and unit tests

Setups the PubSub SKS Push test suite and helper methods. The test suite
includes a server with encryption and a client to connect with the server
with encrypted channel. The following unit tests are added
	- insufficient Security Mode
	- MissingSecurityGroup
	- Setting Security Keys
	- Update CurrentKey from exisiting list
	- Update CurrentKey and add new future keys
	- Replace existing keys with new keys

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Add PubSubKeyStorage description

The PubSubKeyStorage description is added to the header file. It also includes
the implemented workflow of the KeyStorage API to interact with KeyStorage.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

* Integrate PubSub SKS build and unit test in CI

The unit tests should be intergerated in the CI of open62541 pipeline to provide
proper testing and integration support of the new feature. The  build and unit
tests of PubSub SKS are integrated in the CI pipeline.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
---
 .github/workflows/build_linux.yml      |   3 +
 CMakeLists.txt                         |  12 +
 include/open62541/config.h.in          |   1 +
 include/open62541/server_pubsub.h      |   3 +
 src/pubsub/ua_pubsub.h                 |  13 +-
 src/pubsub/ua_pubsub_keystorage.c      | 471 +++++++++++++++++++++++++
 src/pubsub/ua_pubsub_keystorage.h      | 374 ++++++++++++++++++++
 src/pubsub/ua_pubsub_manager.c         |  15 +-
 src/pubsub/ua_pubsub_manager.h         |   5 +
 src/pubsub/ua_pubsub_ns0.c             | 114 +++++-
 src/pubsub/ua_pubsub_readergroup.c     |  38 ++
 src/pubsub/ua_pubsub_writergroup.c     |  38 ++
 tests/CMakeLists.txt                   |   4 +
 tests/pubsub/check_pubsub_keystorage.c | 406 +++++++++++++++++++++
 tests/pubsub/check_pubsub_sks_push.c   | 396 +++++++++++++++++++++
 tools/ci.sh                            |  25 +-
 16 files changed, 1906 insertions(+), 12 deletions(-)
 create mode 100644 src/pubsub/ua_pubsub_keystorage.c
 create mode 100644 src/pubsub/ua_pubsub_keystorage.h
 create mode 100644 tests/pubsub/check_pubsub_keystorage.c
 create mode 100644 tests/pubsub/check_pubsub_sks_push.c

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index b1a92a54ff0..e80fd1df9e0 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -41,6 +41,9 @@ jobs:
           - build_name: "PubSub Encryption (MbedTLS) Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
             cmd_action: unit_tests_encryption_mbedtls_pubsub
+          - build_name: "PubSub SKS Build & Unit Tests (gcc)"
+            cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
+            cmd_action: unit_tests_pubsub_sks
           - build_name: "Encryption (OpenSSL) Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq openssl
             cmd_action: unit_tests_encryption OPENSSL
diff --git a/CMakeLists.txt b/CMakeLists.txt
index adfd5d57de4..d87052ce927 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,6 +388,16 @@ mark_as_advanced(UA_ENABLE_PUBSUB_MONITORING)
 option(UA_ENABLE_PUBSUB_BUFMALLOC "Enable allocation with static memory buffer for time critical PubSub parts" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_BUFMALLOC)
 
+option(UA_ENABLE_PUBSUB_SKS "Enable Security Key Service support for publisher and subscriber" OFF)
+mark_as_advanced(UA_ENABLE_PUBSUB_SKS)
+
+if(UA_ENABLE_PUBSUB_SKS)
+    message(WARNING "The PubSub SKS feature is under development and not yet ready.")
+    if(NOT UA_ENABLE_PUBSUB_ENCRYPTION)
+        message(FATAL_ERROR "PubSub SKS cannot be used with disabled UA_ENABLE_PUBSUB_ENCRYPTION")
+    endif()
+endif()
+
 #RT and Transport PubSub settings
 option(UA_ENABLE_PUBSUB_ETH_UADP "Enable publish/subscribe UADP over Ethernet" OFF)
 
@@ -957,6 +967,7 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub.h
                      ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_manager.h
                      ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_ns0.h
+                     ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_keystorage.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_server_internal.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_services.h
@@ -990,6 +1001,7 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_readergroup.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_manager.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_ns0.c
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_keystorage.c
                 # services
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_view.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_method.c
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index eea4d6f4af4..2bc3af7a555 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -76,6 +76,7 @@
 #cmakedefine UA_GENERATED_NAMESPACE_ZERO_FULL
 #cmakedefine UA_ENABLE_PUBSUB_MONITORING
 #cmakedefine UA_ENABLE_PUBSUB_BUFMALLOC
+#cmakedefine UA_ENABLE_PUBSUB_SKS
 
 #cmakedefine UA_PACK_DEBIAN
 
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 2ea38a3a9d7..46e52bd08a1 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -6,6 +6,7 @@
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #ifndef UA_SERVER_PUBSUB_H
@@ -519,6 +520,7 @@ typedef struct {
     UA_MessageSecurityMode securityMode; /* via the UA_WriterGroupDataType */
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_PubSubSecurityPolicy *securityPolicy;
+    UA_String securityGroupId;
 #endif
 } UA_WriterGroupConfig;
 
@@ -810,6 +812,7 @@ typedef struct {
     UA_MessageSecurityMode securityMode;
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_PubSubSecurityPolicy *securityPolicy;
+    UA_String securityGroupId;
 #endif
 } UA_ReaderGroupConfig;
 
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 3be1c1741f2..49a446d9b46 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -9,6 +9,7 @@
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #ifndef UA_PUBSUB_H_
@@ -21,6 +22,10 @@
 #include "open62541_queue.h"
 #include "ua_pubsub_networkmessage.h"
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+#include <ua_pubsub_keystorage.h>
+#endif
+
 /* The public configuration structs are defined in include/ua_plugin_pubsub.h */
 
 _UA_BEGIN_DECLS
@@ -77,7 +82,7 @@ UA_StandaloneSubscribedDataSet_findSDSbyId(UA_Server *server, UA_NodeId identifi
 UA_StandaloneSubscribedDataSet *
 UA_StandaloneSubscribedDataSet_findSDSbyName(UA_Server *server, UA_String identifier);
 void
-UA_StandaloneSubscribedDataSet_clear(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet); 
+UA_StandaloneSubscribedDataSet_clear(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet);
 
 #define UA_LOG_PDS_INTERNAL(LOGGER, LEVEL, PDS, MSG, ...)               \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
@@ -274,6 +279,9 @@ struct UA_WriterGroup {
     UA_UInt32 securityTokenId;
     UA_UInt32 nonceSequenceNumber; /* To be part of the MessageNonce */
     void *securityPolicyContext;
+#ifdef UA_ENABLE_PUBSUB_SKS
+    UA_PubSubKeyStorage *keyStorage; /* non-owning pointer to keyStorage*/
+#endif
 #endif
 };
 
@@ -465,6 +473,9 @@ struct UA_ReaderGroup {
     UA_UInt32 securityTokenId;
     UA_UInt32 nonceSequenceNumber; /* To be part of the MessageNonce */
     void *securityPolicyContext;
+#ifdef UA_ENABLE_PUBSUB_SKS
+    UA_PubSubKeyStorage *keyStorage;
+#endif
 #endif
 };
 
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
new file mode 100644
index 00000000000..b6d7660f0c4
--- /dev/null
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -0,0 +1,471 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2019 ifak e.V. Magdeburg (Holger Zipper)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include "ua_pubsub_keystorage.h"
+
+#ifdef UA_ENABLE_PUBSUB_SKS /* conditional compilation */
+
+#include "server/ua_server_internal.h"
+
+UA_PubSubKeyStorage *
+UA_Server_findKeyStorage(UA_Server *server, UA_String securityGroupId) {
+
+    if(!server || UA_String_isEmpty(&securityGroupId))
+        return NULL;
+
+    UA_PubSubKeyStorage *outKeyStorage, *keyStorageTemp;
+    LIST_FOREACH_SAFE(outKeyStorage, &server->pubSubManager.pubSubKeyList, keyStorageList,
+                      keyStorageTemp) {
+        if(UA_String_equal(&outKeyStorage->securityGroupID, &securityGroupId)) {
+            return outKeyStorage;
+        }
+    }
+    return NULL;
+}
+
+UA_StatusCode
+UA_Server_findPubSubSecurityPolicy(UA_Server *server, const UA_String *securityPolicyUri,
+                                   UA_PubSubSecurityPolicy **policy) {
+    if(!server || !securityPolicyUri)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_StatusCode retval = UA_STATUSCODE_BADNOTFOUND;
+
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    for(size_t i = 0; i < config->pubSubConfig.securityPoliciesSize; i++) {
+        if(UA_String_equal(securityPolicyUri,
+                           &config->pubSubConfig.securityPolicies[i].policyUri)) {
+            *policy = &config->pubSubConfig.securityPolicies[i];
+            retval = UA_STATUSCODE_GOOD;
+            break;
+        }
+    }
+    return retval;
+}
+
+static void
+UA_PubSubKeyStorage_clearKeyList(UA_PubSubKeyStorage *keyStorage) {
+    if(TAILQ_EMPTY(&keyStorage->keyList))
+        return;
+
+    UA_PubSubKeyListItem *item;
+    TAILQ_FOREACH(item, &keyStorage->keyList, keyListEntry){
+            TAILQ_REMOVE(&keyStorage->keyList, item, keyListEntry);
+            UA_ByteString_clear(&item->key);
+            UA_free(item);
+    }
+    keyStorage->keyListSize = 0;
+}
+
+void
+UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
+    UA_assert(keyStorage != NULL);
+    UA_assert(server != NULL);
+
+    /*Remove callback*/
+    if(!keyStorage->callBackId) {
+        removeCallback(server, keyStorage->callBackId);
+        keyStorage->callBackId = 0;
+    }
+
+    UA_PubSubKeyStorage_clearKeyList(keyStorage);
+
+    if(keyStorage->securityGroupID.data)
+        UA_String_clear(&keyStorage->securityGroupID);
+
+    memset(keyStorage, 0, sizeof(UA_PubSubKeyStorage));
+
+    UA_free(keyStorage);
+}
+
+UA_StatusCode
+UA_PubSubKeyStorage_init(UA_Server *server, const UA_String *securityGroupId,
+                               const UA_String *securityPolicyUri,
+                               UA_UInt32 maxPastKeyCount, UA_UInt32 maxFutureKeyCount,
+                               UA_PubSubKeyStorage *keyStorage) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+
+    if(!server || !securityPolicyUri || !securityGroupId || !keyStorage) {
+        retval = UA_STATUSCODE_BADINVALIDARGUMENT;
+        goto error;
+    }
+
+    UA_PubSubSecurityPolicy *policy;
+
+    UA_PubSubKeyStorage *tmpKeyStorage =
+        UA_Server_findKeyStorage(server, *securityGroupId);
+    if(tmpKeyStorage) {
+        ++tmpKeyStorage->referenceCount;
+        keyStorage = tmpKeyStorage;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    keyStorage->referenceCount = 1;
+
+    retval = UA_String_copy(securityGroupId, &keyStorage->securityGroupID);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto error;
+
+    retval = UA_Server_findPubSubSecurityPolicy(server, securityPolicyUri,
+                                                              &policy);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto error;
+    keyStorage->policy = policy;
+
+    UA_UInt32 currentkeyCount = 1;
+    keyStorage->maxKeyListSize =
+        maxPastKeyCount + currentkeyCount + maxFutureKeyCount;
+    keyStorage->maxPastKeyCount = maxPastKeyCount;
+    keyStorage->maxFutureKeyCount = maxFutureKeyCount;
+
+    /*Add this keystorage to the server keystoragelist*/
+    LIST_INSERT_HEAD(&server->pubSubManager.pubSubKeyList, keyStorage, keyStorageList);
+
+    return retval;
+error:
+    UA_PubSubKeyStorage_delete(server, keyStorage);
+    return retval;
+}
+
+UA_StatusCode
+UA_PubSubKeyStorage_storeSecurityKeys(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
+                                      UA_UInt32 currentTokenId, const UA_ByteString *currentKey,
+                                      UA_ByteString *futureKeys, size_t futureKeyCount,
+                                      UA_Duration msKeyLifeTime) {
+
+    UA_assert(server);
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+
+    if(futureKeyCount > 0 && !futureKeys) {
+        retval = UA_STATUSCODE_BADARGUMENTSMISSING;
+        goto error;
+    }
+
+    size_t keyNumber = futureKeyCount;
+
+    if(currentKey && keyStorage->keyListSize == 0) {
+
+        keyStorage->keyListSize++;
+        UA_PubSubKeyListItem *keyItem =
+            (UA_PubSubKeyListItem *)UA_calloc(1, sizeof(UA_PubSubKeyListItem));
+        if(!keyItem)
+            goto error;
+        retval = UA_ByteString_copy(currentKey, &keyItem->key);
+        if(UA_StatusCode_isBad(retval))
+            goto error;
+
+        keyItem->keyID = currentTokenId;
+
+        TAILQ_INIT(&keyStorage->keyList);
+        TAILQ_INSERT_HEAD(&keyStorage->keyList, keyItem, keyListEntry);
+    }
+
+    UA_PubSubKeyListItem *keyListIterator = TAILQ_FIRST(&keyStorage->keyList);
+    UA_UInt32 startingTokenID = currentTokenId + 1;
+    for(size_t i = 0; i < keyNumber; ++i) {
+        retval = UA_PubSubKeyStorage_getKeyByKeyID(
+            startingTokenID, keyStorage, &keyListIterator);
+        /*Skipping key with matching KeyID in existing list*/
+        if(retval == UA_STATUSCODE_BADNOTFOUND) {
+            keyListIterator = UA_PubSubKeyStorage_push(keyStorage, &futureKeys[i], startingTokenID);
+            if(!keyListIterator)
+                goto error;
+
+            keyStorage->keyListSize++;
+        }
+        if(startingTokenID == UA_UINT32_MAX)
+            startingTokenID = 1;
+        else
+            ++startingTokenID;
+    }
+
+    /*update keystorage references*/
+    retval = UA_PubSubKeyStorage_getKeyByKeyID(currentTokenId, keyStorage, &keyStorage->currentItem);
+    if (retval != UA_STATUSCODE_GOOD && !keyStorage->currentItem)
+        goto error;
+
+    keyStorage->keyLifeTime = msKeyLifeTime;
+
+    return retval;
+error:
+    if(keyStorage) {
+        UA_PubSubKeyStorage_clearKeyList(keyStorage);
+    }
+    return retval;
+}
+
+UA_StatusCode
+UA_PubSubKeyStorage_getKeyByKeyID(const UA_UInt32 keyId, UA_PubSubKeyStorage *keyStorage,
+                                  UA_PubSubKeyListItem **keyItem) {
+
+    if(!keyStorage)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_PubSubKeyListItem *item;
+    TAILQ_FOREACH(item, &keyStorage->keyList, keyListEntry){
+        if(item->keyID == keyId) {
+            *keyItem = item;
+            return UA_STATUSCODE_GOOD;
+        }
+    }
+    return UA_STATUSCODE_BADNOTFOUND;
+}
+
+UA_PubSubKeyListItem *
+UA_PubSubKeyStorage_push(UA_PubSubKeyStorage *keyStorage, const UA_ByteString *key,
+                         UA_UInt32 keyID) {
+    UA_PubSubKeyListItem *newItem = (UA_PubSubKeyListItem *)malloc(sizeof(UA_PubSubKeyListItem));
+    if (!newItem)
+        return NULL;
+
+    newItem->keyID = keyID;
+    UA_ByteString_copy(key, &newItem->key);
+    TAILQ_INSERT_TAIL(&keyStorage->keyList, newItem, keyListEntry);
+
+    return TAILQ_LAST(&keyStorage->keyList, keyListItems);
+}
+
+UA_StatusCode
+UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
+                                          UA_PubSubKeyStorage *keyStorage,
+                                          UA_ServerCallback callback,
+                                          UA_Duration timeToNextMs,
+                                          UA_UInt64 *callbackID) {
+    if(!server || !keyStorage || !callback || timeToNextMs <= 0)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_DateTime now = UA_DateTime_nowMonotonic();
+
+    UA_DateTime dateTimeToNextKey = now + (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);
+
+    retval = UA_Server_addTimedCallback(server, callback, keyStorage, dateTimeToNextKey,
+                                        callbackID);
+
+    return retval;
+}
+
+static UA_StatusCode
+splitCurrentKeyMaterial(UA_PubSubKeyStorage *keyStorage, UA_ByteString *signingKey,
+                        UA_ByteString *encryptingKey, UA_ByteString *keyNonce) {
+    if(!keyStorage)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    if(!keyStorage->policy)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_PubSubSecurityPolicy *policy = keyStorage->policy;
+
+    UA_ByteString key = keyStorage->currentItem->key;
+
+    /*Check the main key length is the same according to policy*/
+    if(key.length != policy->symmetricModule.secureChannelNonceLength)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /*Get Key Length according to policy*/
+    size_t signingkeyLength =
+        policy->symmetricModule.cryptoModule.signatureAlgorithm.getLocalKeyLength(NULL);
+    size_t encryptkeyLength =
+        policy->symmetricModule.cryptoModule.encryptionAlgorithm.getLocalKeyLength(NULL);
+    /*Rest of the part is the keyNonce*/
+    size_t keyNonceLength = key.length - signingkeyLength - encryptkeyLength;
+
+    /*DivideKeys in origin ByteString*/
+    UA_ByteString tSigningKey = {signingkeyLength, key.data};
+    UA_ByteString_copy(&tSigningKey, signingKey);
+
+    UA_String tEncryptingKey = {encryptkeyLength, key.data + signingkeyLength};
+    UA_ByteString_copy(&tEncryptingKey, encryptingKey);
+
+    UA_ByteString tKeyNonce = {keyNonceLength,
+                              key.data + signingkeyLength + encryptkeyLength};
+    UA_ByteString_copy(&tKeyNonce, keyNonce);
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+setPubSubGroupEncryptingKey(UA_Server *server, UA_NodeId PubSubGroupId, UA_UInt32 securityTokenId,
+                            UA_ByteString signingKey, UA_ByteString encryptingKey,
+                            UA_ByteString keyNonce) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    retval = UA_Server_setWriterGroupEncryptionKeys(
+        server, PubSubGroupId, securityTokenId, signingKey, encryptingKey, keyNonce);
+    if(retval == UA_STATUSCODE_BADNOTFOUND)
+        retval = UA_Server_setReaderGroupEncryptionKeys(
+            server, PubSubGroupId, securityTokenId, signingKey, encryptingKey, keyNonce);
+
+    return retval;
+}
+
+static UA_StatusCode
+setPubSubGroupEncryptingKeyForMatchingSecurityGroupId(
+    UA_Server *server, UA_String securityGroupId, UA_UInt32 securityTokenId,
+    UA_ByteString signingKey, UA_ByteString encryptingKey, UA_ByteString keyNonce) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_PubSubConnection *tmpPubSubConnections;
+
+    /* key storage is the same for all reader / writer groups, channel context isn't
+     * => Update channelcontext in all Writergroups / ReaderGroups which have the same
+     * securityGroupId*/
+    TAILQ_FOREACH(tmpPubSubConnections, &server->pubSubManager.connections, listEntry) {
+        /*ForEach writerGroup in server with matching SecurityGroupId*/
+        UA_WriterGroup *tmpWriterGroup;
+        LIST_FOREACH(tmpWriterGroup, &tmpPubSubConnections->writerGroups, listEntry) {
+
+            if(UA_String_equal(&tmpWriterGroup->config.securityGroupId,
+                               &securityGroupId)) {
+                retval = UA_Server_setWriterGroupEncryptionKeys(
+                    server, tmpWriterGroup->identifier, securityTokenId, signingKey,
+                    encryptingKey, keyNonce);
+                if(retval != UA_STATUSCODE_GOOD)
+                    return retval;
+            }
+        }
+
+        /*ForEach readerGroup in server with matching SecurityGroupId*/
+        UA_ReaderGroup *tmpReaderGroup;
+        LIST_FOREACH(tmpReaderGroup, &tmpPubSubConnections->readerGroups, listEntry) {
+
+            if(UA_String_equal(&tmpReaderGroup->config.securityGroupId,
+                               &securityGroupId)) {
+                retval = UA_Server_setReaderGroupEncryptionKeys(
+                    server, tmpReaderGroup->identifier, securityTokenId, signingKey,
+                    encryptingKey, keyNonce);
+                if(retval != UA_STATUSCODE_GOOD)
+                    return retval;
+            }
+        }
+    }
+    return retval;
+}
+
+UA_StatusCode
+UA_PubSubKeyStorage_activateKeyToChannelContext(UA_Server *server, UA_NodeId pubSubGroupId,
+                                              UA_String securityGroupId) {
+
+    if(securityGroupId.data == NULL)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
+    UA_PubSubKeyStorage *keyStorage =
+        UA_Server_findKeyStorage(server, securityGroupId);
+    if(!keyStorage)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    if(!keyStorage->policy && !(keyStorage->keyListSize > 0))
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_UInt32 securityTokenId = keyStorage->currentItem->keyID;
+
+    /*DivideKeys in origin ByteString*/
+    UA_ByteString signingKey;
+    UA_ByteString encryptKey;
+    UA_ByteString keyNonce;
+    splitCurrentKeyMaterial(keyStorage, &signingKey, &encryptKey, &keyNonce);
+
+    if(!UA_NodeId_isNull(&pubSubGroupId))
+        retval = setPubSubGroupEncryptingKey(server, pubSubGroupId, securityTokenId,
+                                             signingKey, encryptKey, keyNonce);
+    else
+        retval = setPubSubGroupEncryptingKeyForMatchingSecurityGroupId(
+            server, securityGroupId, securityTokenId, signingKey, encryptKey, keyNonce);
+
+    if(retval != UA_STATUSCODE_GOOD)
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Failed to set Encrypting keys with Error: %s",
+                     UA_StatusCode_name(retval));
+
+    return retval;
+}
+
+void
+UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
+
+    UA_StatusCode retval = UA_PubSubKeyStorage_addKeyRolloverCallback(
+        server, keyStorage, (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback,
+        keyStorage->keyLifeTime, &keyStorage->callBackId);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Failed to update keys for security group id '%.*s'. Reason: '%s'.",
+                     (int)keyStorage->securityGroupID.length,
+                     keyStorage->securityGroupID.data, UA_StatusCode_name(retval));
+    }
+
+    if(keyStorage->currentItem != TAILQ_LAST(&keyStorage->keyList, keyListItems)) {
+        keyStorage->currentItem = TAILQ_NEXT(keyStorage->currentItem, keyListEntry);
+        keyStorage->currentTokenId = keyStorage->currentItem->keyID;
+
+        retval = UA_PubSubKeyStorage_activateKeyToChannelContext(
+            server, UA_NODEID_NULL, keyStorage->securityGroupID);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR(
+                &server->config.logger, UA_LOGCATEGORY_SERVER,
+                "Failed to update keys for security group id '%.*s'. Reason: '%s'.",
+                (int)keyStorage->securityGroupID.length, keyStorage->securityGroupID.data,
+                UA_StatusCode_name(retval));
+        }
+    }
+}
+
+UA_StatusCode
+UA_PubSubKeyStorage_update(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
+                           const UA_ByteString *currentKey, UA_UInt32 currentKeyID,
+                           const size_t futureKeySize, UA_ByteString *futureKeys,
+                           UA_Duration msKeyLifeTime) {
+    if(!keyStorage)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_PubSubKeyListItem *keyListIterator = NULL;
+
+    if (currentKeyID != 0){
+        /*if currentKeyId is known then update keystorage currentItem*/
+        retval = UA_PubSubKeyStorage_getKeyByKeyID(currentKeyID, keyStorage,
+                                                   &keyListIterator);
+        if (retval == UA_STATUSCODE_GOOD && keyListIterator) {
+            keyStorage->currentItem = keyListIterator;
+            /*Add new keys at the end of KeyList*/
+            retval = UA_PubSubKeyStorage_storeSecurityKeys(
+                server, keyStorage, currentKeyID, NULL,
+                futureKeys, futureKeySize, msKeyLifeTime);
+            if(retval != UA_STATUSCODE_GOOD)
+                return retval;
+        } else if(retval == UA_STATUSCODE_BADNOTFOUND) {
+            /*If the CurrentTokenId is unknown, the existing list shall be discarded and
+             * replaced by the fetched list*/
+            UA_PubSubKeyStorage_clearKeyList(keyStorage);
+            retval = UA_PubSubKeyStorage_storeSecurityKeys(server, keyStorage,
+                                                  currentKeyID, currentKey, futureKeys,
+                                                  futureKeySize, msKeyLifeTime);
+            if (retval != UA_STATUSCODE_GOOD)
+                return retval;
+        }
+    }
+    return retval;
+}
+
+void
+UA_PubSubKeyStorage_removeKeyStorage(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
+    if(!keyStorage) {
+        return;
+    }
+    if(keyStorage->referenceCount > 1) {
+        --keyStorage->referenceCount;
+        return;
+    }
+    if(keyStorage->referenceCount == 1) {
+        LIST_REMOVE(keyStorage, keyStorageList);
+        UA_PubSubKeyStorage_delete(server, keyStorage);
+    }
+    return;
+}
+#endif
diff --git a/src/pubsub/ua_pubsub_keystorage.h b/src/pubsub/ua_pubsub_keystorage.h
new file mode 100644
index 00000000000..0132a8f6142
--- /dev/null
+++ b/src/pubsub/ua_pubsub_keystorage.h
@@ -0,0 +1,374 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2019 ifak e.V. Magdeburg (Holger Zipper)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#ifndef UA_PUBSUB_KEYSTORAGE
+#define UA_PUBSUB_KEYSTORAGE
+
+#include <open62541/plugin/securitypolicy.h>
+#include <open62541/server.h>
+
+#include "open62541_queue.h"
+
+_UA_BEGIN_DECLS
+
+#ifdef UA_ENABLE_PUBSUB_SKS
+
+/**
+ * PubSubKeyStorage
+ * ================
+ * A PubSubKeyStorage provides a linked list to store all the keys used to
+ * secure the messages. It keeps the records of old keys (past keys), current
+ * key, new keys (futurekeys), time to move to next key and callback id.
+ *
+ * PubSubKeyListItem is the basic item stored in the KeyList of KeyStorage. It
+ * provides keyId, Key, and pointer to the next key in KeyList. The KeyId is used
+ * to identify and update currentKey in the keystorage. The KeyId is the SecurityTokenId
+ * that appears in the header of messages secured with the CurrentKey.
+ *
+ * Working
+ * =======
+ *                     +------------------------------+
+ *                     |AddReaderGroup/AddWriterGroup |
+ *                     +------------------------------+
+ *                                    |
+ *                                    V
+ *                     +--------------------+
+ *                     |CheckSecurityGroupId|
+ *                     +--------------------+
+ *                                    |Yes
+ *                                    V
+ *                     +--------------------+
+ *                     |InitializeKeyStorage|
+ *                     +--------------------+
+ *                                    |
+ *                                    V
+ *                     +----------------------------+
+ *                     |store/updateKeysInKeyStorage|
+ *                     +----------------------------+
+ *                                    |
+ *                                    V
+ *                     +------------------------------------------+
+ *                     |activateKeysToAllPubSubGroupChannelContext|
+ *                     +------------------------------------------+
+ *                                    |                        Ʌ
+ *                                    V                        |
+ *                     +-----------------------+               |
+ *                     |addKeyRolloverCallbacks|               |
+ *                     +-----------------------+               |
+ *                                    |                        |
+ *                                    V                        |
+ *                     +-------------------+                   |
+ *                     |keyRolloverCallback|                   |
+ *                     +-------------------+                   |
+ *                                    |CurrentKey!=LastItem    |
+ *                                    -------------------------+
+ *
+ * A KeyStorage is created and initialized when a ReaderGroup or WriterGroup is
+ * created with securityGroupId and SecurityMode SignAndEncrypt. The new
+ * KeyStorage is added to the server KeyStorageList. At this time KeyList is empty.
+ *
+ * UA_PubSubKeyStorage_storeSecurityKeys is used to push the keys into existing
+ * keystorage. In order to update the KeyList of an existing keyStorage,
+ * UA_PubSubKeyStorage_update is called.
+ *
+ * After adding/updating the keys to keystorage, the current key should be
+ * activated to the associated PubSub Group's ChannelContext in the server. The
+ * security Policy associated with PubSub Group will take the keys from
+ * channel context and use them to secure the messages.
+ * The UA_PubSubKeyStorage_storeSecurityKeys and UA_PubSubKeyStorage_update
+ * method will be used by setSecurityKeysAction and getSecurityKeysAction to
+ * retrieve the keys from SKS server and store keys in local storage.
+ *
+ * Each key has a life time, after which the current key is expired and move to
+ * next key in the existing list. For this a callback function is added to the
+ * server. The callback function keyRolloverCallback is added to the server as a
+ * timed callback. The addKeyRolloverCallbacks function calculates the time
+ * stamp to trigger the callback when the current Key expires and roll
+ * over to the next key in existing list.
+ *
+ */
+
+/**
+ * @brief This structure holds the information about the keys
+ */
+typedef struct UA_PubSubKeyListItem {
+    /* The SecurityTokenId associated with Key*/
+    UA_UInt32 keyID;
+
+    /* This key is not used directly since the protocol associated with the PubSubGroup(s)
+     * specifies an algorithm to generate distinct keys for different types of
+     * cryptography operations*/
+    UA_ByteString key;
+
+    /* Pointers to the key list entries*/
+    TAILQ_ENTRY(UA_PubSubKeyListItem) keyListEntry;
+} UA_PubSubKeyListItem;
+
+/* Queue Definition*/
+typedef TAILQ_HEAD(keyListItems, UA_PubSubKeyListItem) keyListItems;
+
+/**
+ * @brief This structure holds all info and keys related to one SecurityGroup.
+ * it is used as a list.
+ */
+typedef struct UA_PubSubKeyStorage {
+
+    /**
+     * security group id of the security group related to this storage
+     */
+    UA_String securityGroupID;
+
+    /**
+     * none-owning pointer to the security policy related to this storage
+     */
+    UA_PubSubSecurityPolicy *policy;
+
+    /**
+     * in case of the SKS server, the key storage structure is deleted when removing the
+     * security group.
+     * in case of publisher / subscriber, one key storage structure is
+     * referenced by multiple reader / writer groups have a reference count to manage free
+     */
+    UA_UInt32 referenceCount;
+
+    /**
+     * array of keys. the elements inside this array have a next pointer.
+     * keyList can therefore be used as linked list.
+     */
+    keyListItems keyList;
+
+    /**
+     * size of the keyList
+     */
+    size_t keyListSize;
+
+    /**
+     * The maximum number of Past keys a keystorage is allowed to store
+     */
+    UA_UInt32 maxPastKeyCount;
+
+    /**
+     * The maximum number of Future keys a keyStorage is allowed to store
+     */
+    UA_UInt32 maxFutureKeyCount;
+
+    /*
+     * The maximum keylist size, calculated from maxPastKeyCount and maxFutureKeyCount
+     */
+    UA_UInt32 maxKeyListSize;
+
+    /**
+     * The SecurityTokenId that appears in the header of messages secured with the
+     * CurrentKey. It starts at 1 and is incremented by 1 each time the KeyLifetime
+     * elapses even if no keys are requested. If the CurrentTokenId increments past the
+     * maximum value of UInt32 it restarts a 1.
+     */
+    UA_UInt32 currentTokenId;
+
+    /**
+     *  the current key used to secure the messages
+     */
+    UA_PubSubKeyListItem *currentItem;
+
+    /**
+     * keyLifeTime used to update the CurrentKey from the Local KeyStorage
+     */
+    UA_Duration keyLifeTime;
+
+    /**
+     * id used to register the callback to retrieve the keys related to this security
+     * group
+     */
+    UA_UInt64 callBackId;
+
+    /**
+     * Pointer to the key storage list
+     */
+    LIST_ENTRY(UA_PubSubKeyStorage) keyStorageList;
+
+} UA_PubSubKeyStorage;
+
+/**
+ * @brief Find the Keystorage from the Server KeyStorageList and returns the pointer to
+ * the keystorage
+ *
+ * @param server holds the keystoragelist
+ * @param securityGroupId of the keystorage to be found
+ * @return Pointer to the keystorage on success, null pointer on failure
+ */
+UA_PubSubKeyStorage *
+UA_Server_findKeyStorage(UA_Server *server, UA_String securityGroupId);
+
+/**
+ * @brief retreives the security policy pointer from the PubSub configuration by
+ * SecurityPolicyUri
+ *
+ * @param server the server object
+ * @param securityPolicyUri the URI of the security policy
+ * @param policy the pointer to the security policy
+ * @return UA_StatusCode return status code
+ */
+UA_StatusCode
+UA_Server_findPubSubSecurityPolicy(UA_Server *server, const UA_String *securityPolicyUri,
+                                   UA_PubSubSecurityPolicy **policy);
+
+/**
+ * @brief Deletes the keystorage from the server and its members
+ *
+ * @param server where the keystorage is created
+ * @param keyStorage pointer to the keystorage
+ */
+void
+UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage);
+
+/**
+ * @brief Initializes an empty Keystorage for the SecurityGroupId and add it to the Server
+ * KeyStorageList
+ *
+ * @param server the server object
+ * @param securityGroupId the identifier of the SecurityGroup
+ * @param securityPolicyUri the security policy assocaited with the security algorithm
+ * @param maxPastKeyCount maximum number of past keys a keystorage is allowed to store
+ * @param maxFutureKeyCount maximum number of future keys a keystorage is allowed to store
+ * @param keyStorage pointer to the keystorage to be initialized
+ * @return UA_StatusCode return status code
+ */
+UA_StatusCode
+UA_PubSubKeyStorage_init(UA_Server *server, const UA_String *securityGroupId,
+                               const UA_String *securityPolicyUri,
+                               UA_UInt32 maxPastKeyCount, UA_UInt32 maxFutureKeyCount,
+                               UA_PubSubKeyStorage *keyStorage);
+
+/**
+ * @brief After Keystorage is initialized and added to the server, this method is called
+ * to store the current Keys and futurekeys.
+ *
+ * @param server the server object
+ * @param keyStorage pointer to the keyStorage
+ * @param currentTokenId The token Id of the current key it starts with 1 and increaments
+ * each time keylifetime expires
+ * @param currentKey the key used for encrypt the current messages
+ * @param futureKeys pointer to the future keys
+ * @param futureKeyCount the number future keys provided
+ * @param keyLifeTime the time period when the key expires and move to next future key in
+ * milli seconds
+ * @return UA_StatusCode the return status
+ */
+UA_StatusCode
+UA_PubSubKeyStorage_storeSecurityKeys(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
+                                      UA_UInt32 currentTokenId, const UA_ByteString *currentKey,
+                                      UA_ByteString *futureKeys, size_t futureKeyCount,
+                                      UA_Duration msKeyLifeTime);
+
+/**
+ * @brief Finds the KeyItem from the KeyList by KeyId
+ *
+ * @param keyId the identifier of the Key
+ * @param keyStorage pointer to the keystorage
+ * @param keyItem returned pointer to the keyItem in the KeyList
+ * @return UA_StatusCode return status code
+ */
+UA_StatusCode
+UA_PubSubKeyStorage_getKeyByKeyID(const UA_UInt32 keyId, UA_PubSubKeyStorage *keyStorage,
+                                  UA_PubSubKeyListItem **keyItem);
+
+/**
+ * @brief Adds a new KeyItem at the end of the KeyList
+ * to the new KeyListItem.
+ *
+ * @param keyStorage pointer to the keystorage
+ * @param key the key to be added
+ * @param keyID the keyID associated with the key to be added
+ */
+UA_PubSubKeyListItem *
+UA_PubSubKeyStorage_push(UA_PubSubKeyStorage *keyStorage, const UA_ByteString *key,
+                         UA_UInt32 keyID);
+
+/**
+ * @brief It calculates the time to trigger the callback to update current key, adds the
+ * callback to the server and returns the callbackId.
+ *
+ * @param server the server object
+ * @param keyStorage the pointer to the existing keystorage in the server
+ * @param callback the callback function to be added to the server
+ * @param timeToNextMs time in milli seconds to trigger the callback function
+ * @param callbackID the returned callbackId of the added callback function
+ * @return UA_StatusCode the return status
+ */
+UA_StatusCode
+UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
+                                          UA_PubSubKeyStorage *keyStorage,
+                                          UA_ServerCallback callback,
+                                          UA_Duration timeToNextMs,
+                                          UA_UInt64 *callbackID);
+
+/**
+ * @brief It takes the current Key data, divide it into signing key, encrypting key and
+ * keyNonce according to security policy associated with PubSub Group and set it in
+ * channel context of the assocaited PubSub Group. In case of pubSubGroupId is
+ * UA_NODEID_NULL, all the Reader/WriterGroup's channelcontext are updated with matching
+ * SecurityGroupId.
+ *
+ * @param server The server object
+ * @param pubSubGroupId the nodeId of the Reader/WirterGroup whose channel context to be
+ * updated
+ * @param securityGroupId The identifier for the SecurityGroup
+ * @return UA_StatusCode return status code
+ */
+UA_StatusCode
+UA_PubSubKeyStorage_activateKeyToChannelContext(UA_Server *server, const UA_NodeId pubSubGroupId,
+                                                const UA_String securityGroupId);
+
+/**
+ * @brief The callback function to update the current key from keystorage in the server
+ * and activate the current key into channel context of the associated PubSub Group
+ *
+ * @param server the server object
+ * @param keyStorage the pointer to the keystorage
+ */
+void
+UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *keyStorage);
+
+/**
+ * @brief It updates/adds the current and future keys into the existing KeyStorage.
+ * If the currentKeyID is known to existing keyStorage, then it is set as the currentKey
+ * and any future keys are appended to the existing list. If the currentKeyId is not know
+ * then, existing keyList is discarded and replaced with the new list.
+ *
+ * @param server the server object
+ * @param keyStorage pointer to the keystorage
+ * @param currentKey the currentKey data
+ * @param currentKeyID the identifier of the current Key
+ * @param futureKeySize the size of the future key list
+ * @param futureKeys the pointer to the future keys list
+ * @param msKeyLifeTime the updated time to move to next key
+ * @return UA_StatusCode the return status
+ */
+UA_StatusCode
+UA_PubSubKeyStorage_update(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
+                           const UA_ByteString *currentKey, UA_UInt32 currentKeyID,
+                           const size_t futureKeySize, UA_ByteString *futureKeys,
+                           UA_Duration msKeyLifeTime);
+
+/**
+ * @brief KeyStorage must be referenced by atleast one PubSubGroup. This method checks if
+ * KeyStorage is referenced by more then 1 PubSubGroup, then it decreases the
+ * referenceCount by one. If the referenceCount is exactly one then removes the KeyStorage
+ * from the server and PubSubGroup.
+ *
+ * @param server that holds the keystorage and PubSubGroups0
+ * @param keyStorage to be removed from server
+ */
+void
+UA_PubSubKeyStorage_removeKeyStorage(UA_Server *server, UA_PubSubKeyStorage *keyStorage);
+
+#endif
+
+_UA_END_DECLS
+
+#endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index d1cdae9d4c5..057cd7fa48b 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #include <open62541/server_pubsub.h>
@@ -15,6 +16,9 @@
 
 #include "server/ua_server_internal.h"
 #include "ua_pubsub_ns0.h"
+#ifdef UA_ENABLE_PUBSUB_SKS
+#include "ua_pubsub_keystorage.h"
+#endif
 
 #ifdef UA_ENABLE_PUBSUB_MQTT
 #include "../../plugins/mqtt/ua_mqtt-c_adapter.h"
@@ -633,7 +637,7 @@ UA_Server_addStandaloneSubscribedDataSet(UA_Server *server, const UA_StandaloneS
 
     newSubscribedDataSet->config = tmpSubscribedDataSetConfig;
     newSubscribedDataSet->connectedReader = UA_NODEID_NULL;
-    
+
     if (server->pubSubManager.subscribedDataSetsSize != 0)
         TAILQ_INSERT_TAIL(&server->pubSubManager.subscribedDataSets, newSubscribedDataSet, listEntry);
     else {
@@ -662,7 +666,7 @@ UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId s
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
-    //search for referenced readers. 
+    //search for referenced readers.
     UA_PubSubConnection *tmpConnectoin;
     TAILQ_FOREACH(tmpConnectoin, &server->pubSubManager.connections, listEntry){
         UA_ReaderGroup *readerGroup;
@@ -773,6 +777,13 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     TAILQ_FOREACH_SAFE(tmpSDS1, &server->pubSubManager.subscribedDataSets, listEntry, tmpSDS2){
         UA_Server_removeStandaloneSubscribedDataSet(server, tmpSDS1->identifier);
     }
+
+#ifdef UA_ENABLE_PUBSUB_SKS
+    /* Remove the keyStorages */
+    UA_PubSubKeyStorage *ks, *ksTmp;
+    LIST_FOREACH_SAFE(ks, &server->pubSubManager.pubSubKeyList, keyStorageList, ksTmp)
+        UA_PubSubKeyStorage_delete(server, ks);
+#endif
 }
 
 /***********************************/
diff --git a/src/pubsub/ua_pubsub_manager.h b/src/pubsub/ua_pubsub_manager.h
index 38110ec5e08..dcdbf09b86b 100644
--- a/src/pubsub/ua_pubsub_manager.h
+++ b/src/pubsub/ua_pubsub_manager.h
@@ -5,6 +5,7 @@
  * Copyright (c) 2017-2019 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #ifndef UA_PUBSUB_MANAGER_H_
@@ -55,6 +56,10 @@ typedef struct UA_PubSubManager {
     size_t reserveIdsSize;
     LIST_HEAD(UA_ListOfReserveIds, UA_ReserveId) reserveIds;
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+    LIST_HEAD(PubSubKeyList, UA_PubSubKeyStorage) pubSubKeyList;
+#endif
+
 #ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     UA_UInt32 uniqueIdCount;
 #endif
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 35bc482169a..cecb954aaed 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -6,6 +6,7 @@
  * Copyright (c) 2019-2021 Kalycito Infotech Private Limited
  * Copyright (c) 2020 Yannick Wallerer, Siemens AG
  * Copyright (c) 2020-2022 Thomas Fischer, Siemens AG
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #include <open62541/types.h>
@@ -1121,7 +1122,7 @@ addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSub
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", sdsName);
     UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* Create a new id */
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS), 
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS),
                                    UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                                    UA_QUALIFIEDNAME(0, sdsName),
                                    UA_NODEID_NUMERIC(0, UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE),
@@ -1152,24 +1153,24 @@ addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSub
         arrayDimensions[0] = (UA_UInt32) subscribedDataSet->config.subscribedDataSet.target.targetVariablesSize;
         attr.arrayDimensions = arrayDimensions;
         attr.accessLevel = UA_ACCESSLEVELMASK_READ;
-        UA_Variant_setArray(&attr.value, subscribedDataSet->config.subscribedDataSet.target.targetVariables, 
-                            subscribedDataSet->config.subscribedDataSet.target.targetVariablesSize, 
+        UA_Variant_setArray(&attr.value, subscribedDataSet->config.subscribedDataSet.target.targetVariables,
+                            subscribedDataSet->config.subscribedDataSet.target.targetVariablesSize,
                             &UA_TYPES[UA_TYPES_FIELDTARGETDATATYPE]);
         ret |= UA_Server_addVariableNode(server, UA_NODEID_NULL, sdsObjectNode, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
                                          UA_QUALIFIEDNAME(0, "TargetVariables"), UA_NODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE),
                                          attr, NULL, &targetVarsId);
     }
-                                
+
     UA_NodePropertyContext *isConnectedNodeContext = (UA_NodePropertyContext *) UA_malloc(sizeof(UA_NodePropertyContext));
     isConnectedNodeContext->parentNodeId = subscribedDataSet->identifier;
     isConnectedNodeContext->parentClassifier = UA_NS0ID_STANDALONESUBSCRIBEDDATASETREFDATATYPE;
     isConnectedNodeContext->elementClassiefier = UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_ISCONNECTED;
 
     UA_ValueCallback valueCallback;
-    valueCallback.onRead = onRead; 
+    valueCallback.onRead = onRead;
     valueCallback.onWrite = NULL;
     ret |= addVariableValueSource(server, valueCallback, connectedId, isConnectedNodeContext);
-    
+
     UA_NodePropertyContext *metaDataContext = (UA_NodePropertyContext *)
         UA_malloc(sizeof(UA_NodePropertyContext));
     metaDataContext->parentNodeId = subscribedDataSet->identifier;
@@ -1633,6 +1634,102 @@ removeDataSetWriterAction(UA_Server *server,
 }
 #endif
 
+#if defined(UA_ENABLE_PUBSUB_SKS) && defined(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
+/**
+ * @note The user credentials and permissions are checked in the AccessControl plugin
+ * before this callback is executed.
+ */
+static UA_StatusCode
+setSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessionHandle,
+                      const UA_NodeId *methodId, void *methodContext,
+                      const UA_NodeId *objectId, void *objectContext, size_t inputSize,
+                      const UA_Variant *input, size_t outputSize, UA_Variant *output) {
+
+    /*Check whether the channel is encrypted according to specification*/
+    session_list_entry *session_entry;
+    LIST_FOREACH(session_entry, &server->sessions, pointers) {
+        if(UA_NodeId_equal(&session_entry->session.sessionId, sessionId)) {
+            if(session_entry->session.header.channel->securityMode !=
+               UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
+                return UA_STATUSCODE_BADSECURITYMODEINSUFFICIENT;
+        }
+    }
+
+    if(!server || !input)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    if(inputSize < 7)
+        return UA_STATUSCODE_BADARGUMENTSMISSING;
+    if(inputSize > 7 || outputSize > 0)
+        return UA_STATUSCODE_BADTOOMANYARGUMENTS;
+
+    /*check for types*/
+    if(!UA_Variant_hasScalarType(&input[0], &UA_TYPES[UA_TYPES_STRING]) || /*SecurityGroupId*/
+        !UA_Variant_hasScalarType(&input[1], &UA_TYPES[UA_TYPES_STRING]) || /*SecurityPolicyUri*/
+        !UA_Variant_hasScalarType(&input[2], &UA_TYPES[UA_TYPES_UINT32]) || /*CurrentTokenId*/
+        !UA_Variant_hasScalarType(&input[3], &UA_TYPES[UA_TYPES_BYTESTRING]) || /*CurrentKey*/
+        !UA_Variant_hasArrayType(&input[4], &UA_TYPES[UA_TYPES_BYTESTRING]) || /*FutureKeys*/
+        (!UA_Variant_hasScalarType(&input[5], &UA_TYPES[UA_TYPES_DURATION]) &&
+        !UA_Variant_hasScalarType(&input[5], &UA_TYPES[UA_TYPES_DOUBLE])) || /*TimeToNextKey*/
+        (!UA_Variant_hasScalarType(&input[6], &UA_TYPES[UA_TYPES_DURATION]) &&
+        !UA_Variant_hasScalarType(&input[6], &UA_TYPES[UA_TYPES_DOUBLE]))) /*TimeToNextKey*/
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_Duration callbackTime;
+    UA_String *securityGroupId = (UA_String *)input[0].data;
+    UA_String *securityPolicyUri = (UA_String *)input[1].data;
+    UA_UInt32 currentKeyId = *(UA_UInt32 *)input[2].data;
+    UA_ByteString *currentKey = (UA_ByteString *)input[3].data;
+    UA_ByteString *futureKeys = (UA_ByteString *)input[4].data;
+    size_t futureKeySize = input[4].arrayLength;
+    UA_Duration msTimeToNextKey = *(UA_Duration *)input[5].data;
+    UA_Duration msKeyLifeTime = *(UA_Duration *)input[6].data;
+
+    UA_PubSubKeyStorage *ks =
+        UA_Server_findKeyStorage(server, *securityGroupId);
+    if(!ks)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    if(!UA_String_equal(securityPolicyUri, &ks->policy->policyUri))
+        return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
+
+    if(ks->keyListSize == 0) {
+        retval = UA_PubSubKeyStorage_storeSecurityKeys(
+            server, ks, currentKeyId, currentKey, futureKeys, futureKeySize,
+            msKeyLifeTime);
+        if(retval != UA_STATUSCODE_GOOD)
+            return retval;
+    } else {
+        retval = UA_PubSubKeyStorage_update(server, ks, currentKey, currentKeyId,
+                                            futureKeySize, futureKeys, msKeyLifeTime);
+        if(retval != UA_STATUSCODE_GOOD)
+            return retval;
+    }
+
+    retval = UA_PubSubKeyStorage_activateKeyToChannelContext(server, UA_NODEID_NULL,
+                                                           ks->securityGroupID);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(
+            &server->config.logger, UA_LOGCATEGORY_SERVER,
+            "Failed to import Symmetric Keys into PubSub Channel Context with %s \n",
+            UA_StatusCode_name(retval));
+        return retval;
+    }
+
+    callbackTime = msKeyLifeTime;
+    if(msTimeToNextKey > 0)
+        callbackTime = msTimeToNextKey;
+
+    /*move to setSecurityKeysAction*/
+    retval = UA_PubSubKeyStorage_addKeyRolloverCallback(
+        server, ks, (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback, callbackTime,
+        &ks->callBackId);
+    return retval;
+}
+
+#endif
+
 /**********************************************/
 /*                Destructors                 */
 /**********************************************/
@@ -1856,7 +1953,7 @@ UA_Server_initPubSubNS0(UA_Server *server) {
 
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
     oAttr.displayName = UA_LOCALIZEDTEXT("", "SubscribedDataSets");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS), 
+    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE), UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                             UA_QUALIFIEDNAME(0, "SubscribedDataSets"), UA_NODEID_NUMERIC(0, UA_NS0ID_SUBSCRIBEDDATASETFOLDERTYPE),
                             oAttr, NULL, NULL);
@@ -1892,6 +1989,9 @@ UA_Server_initPubSubNS0(UA_Server *server) {
     retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), addDataSetReaderAction);
     retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), removeDataSetReaderAction);
     retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS), addReserveIdsAction);
+#ifdef UA_ENABLE_PUBSUB_SKS
+    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SETSECURITYKEYS), setSecurityKeysAction);
+#endif
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
     retVal |= UA_addLoadPubSubConfigMethod(server);
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index c4801af9bcd..e090605a572 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -6,6 +6,8 @@
  * Copyright (c) 2019 Fraunhofer IOSB (Author: Julius Pfrommer)
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ *
  */
 
 #include <open62541/server_pubsub.h>
@@ -157,6 +159,33 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
     UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
                                           &newGroup->identifier);
 #endif
+
+#ifdef UA_ENABLE_PUBSUB_SKS
+    if(readerGroupConfig->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
+       readerGroupConfig->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
+        if(!UA_String_isEmpty(&readerGroupConfig->securityGroupId) &&
+           readerGroupConfig->securityPolicy) {
+            UA_String policyUri = readerGroupConfig->securityPolicy->policyUri;
+
+            newGroup->keyStorage = UA_Server_findKeyStorage(
+                server, readerGroupConfig->securityGroupId);
+            if(!newGroup->keyStorage) {
+                newGroup->keyStorage = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+                if(!newGroup->keyStorage)
+                    return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+
+            retval = UA_PubSubKeyStorage_init(server, &readerGroupConfig->securityGroupId,
+                                              &policyUri, 0, 0, newGroup->keyStorage);
+            if(retval != UA_STATUSCODE_GOOD) {
+                UA_free(newGroup);
+                return retval;
+            }
+        }
+    }
+
+#endif
+
     if(readerGroupIdentifier)
         UA_NodeId_copy(&newGroup->identifier, readerGroupIdentifier);
 
@@ -265,6 +294,15 @@ UA_Server_ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup) {
     }
 #endif
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+    if(readerGroup->config.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
+       readerGroup->config.securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
+        UA_PubSubKeyStorage_removeKeyStorage(server, readerGroup->keyStorage);
+        readerGroup->keyStorage = NULL;
+    }
+
+#endif
+
     UA_ReaderGroupConfig_clear(&readerGroup->config);
 }
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 8da5eb71dcd..a3024199107 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -8,6 +8,7 @@
  * Copyright (c) 2020 Yannick Wallerer, Siemens AG
  * Copyright (c) 2020 Thomas Fischer, Siemens AG
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #include <open62541/server_pubsub.h>
@@ -117,6 +118,34 @@ UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
     UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
                                           &newWriterGroup->identifier);
 #endif
+
+#ifdef UA_ENABLE_PUBSUB_SKS
+    if(writerGroupConfig->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
+       writerGroupConfig->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
+        if(!UA_String_isEmpty(&writerGroupConfig->securityGroupId) &&
+           writerGroupConfig->securityPolicy) {
+            UA_String policyUri = writerGroupConfig->securityPolicy->policyUri;
+
+            newWriterGroup->keyStorage =
+                UA_Server_findKeyStorage(
+                    server, writerGroupConfig->securityGroupId);
+            if(!newWriterGroup->keyStorage) {
+                newWriterGroup->keyStorage = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+                if(!newWriterGroup)
+                    return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+
+            res = UA_PubSubKeyStorage_init(server, &writerGroupConfig->securityGroupId,
+                                           &policyUri, 0, 0, newWriterGroup->keyStorage);
+            if(res != UA_STATUSCODE_GOOD) {
+                UA_free(newWriterGroup);
+                return res;
+            }
+        }
+    }
+
+#endif
+
     if(writerGroupIdentifier)
         UA_NodeId_copy(&newWriterGroup->identifier, writerGroupIdentifier);
     return res;
@@ -647,6 +676,15 @@ UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
     }
 #endif
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+    if(writerGroup->config.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
+       writerGroup->config.securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
+            UA_PubSubKeyStorage_removeKeyStorage(server,
+                                                 writerGroup->keyStorage);
+            writerGroup->keyStorage = NULL;
+    }
+#endif
+
     UA_NetworkMessageOffsetBuffer_clear(&writerGroup->bufferedMessage);
 }
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 06d69a80f02..611f850bf31 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -314,6 +314,10 @@ if(UA_ENABLE_PUBSUB)
         ua_add_test(pubsub/check_pubsub_decryption.c)
         ua_add_test(pubsub/check_pubsub_subscribe_encrypted.c)
         ua_add_test(pubsub/check_pubsub_encrypted_rt_levels.c)
+        if(UA_ENABLE_PUBSUB_SKS)
+            ua_add_test(pubsub/check_pubsub_keystorage.c)
+            ua_add_test(pubsub/check_pubsub_sks_push.c)
+        endif()
     endif()
 
     if (UA_ENABLE_PUBSUB_MONITORING)
diff --git a/tests/pubsub/check_pubsub_keystorage.c b/tests/pubsub/check_pubsub_keystorage.c
new file mode 100644
index 00000000000..a662ab3ef75
--- /dev/null
+++ b/tests/pubsub/check_pubsub_keystorage.c
@@ -0,0 +1,406 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/server_config_default.h>
+#include <open62541/server_pubsub.h>
+
+#include "ua_pubsub.h"
+#include "ua_pubsub_keystorage.h"
+#include "ua_server_internal.h"
+
+#include <check.h>
+#include "testing_clock.h"
+
+#define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
+#define UA_AES128CTR_SIGNING_KEY_LENGTH          32
+#define UA_AES128CTR_KEY_LENGTH                  32
+#define UA_AES128CTR_KEYNONCE_LENGTH             4
+#define UA_SymmetricKey_Length UA_AES128CTR_SIGNING_KEY_LENGTH + UA_AES128CTR_KEY_LENGTH + UA_AES128CTR_KEYNONCE_LENGTH
+
+#define MSG_LENGTH_ENCRYPTED 85
+#define MSG_LENGTH_DECRYPTED 39
+#define MSG_HEADER "f111ba08016400014df4030100000008b02d012e01000000"
+#define MSG_HEADER_NO_SEC "f101ba08016400014df4"
+#define MSG_PAYLOAD_ENC "da434ce02ee19922c6e916c8154123baa25f67288e3378d613f3203909"
+#define MSG_PAYLOAD_DEC "e1101054c2949f3a" \
+                        "d701b4205f69841e" \
+                        "5f6901000d7657c2" \
+                        "949F3ad701"
+#define MSG_SIG "6e08a9ff14b83ea2247792eeffc757c85ac99c0ffa79e4fbe5629783dc77b403"
+#define MSG_SIG_INVALID "5e08a9ff14b83ea2247792eeffc757c85ac99c0ffa79e4fbe5629783dc77b403"
+
+UA_Byte signingKeyPub[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
+UA_Byte encryptingKeyPub[UA_AES128CTR_KEY_LENGTH] = {0};
+UA_Byte keyNoncePub[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
+UA_Server *server = NULL;
+UA_ByteString currentKey;
+UA_ByteString *futureKey = NULL;
+UA_String SecurityGroupId;
+UA_NodeId connection, writerGroup, readerGroup, publishedDataSet, dataSetWriter;
+
+
+static UA_StatusCode
+generateKeyData(const UA_PubSubSecurityPolicy *policy, UA_ByteString *key) {
+    if(!key || !policy)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_StatusCode retVal;
+
+    /* Can't not found in specification for pubsub key generation, so use the idea of
+     * securechannel, see specification part6 p51 for more details*/
+
+    UA_Byte secretBytes[UA_PUBSUB_KEYMATERIAL_NONCELENGTH];
+    UA_ByteString secret;
+    secret.length = UA_PUBSUB_KEYMATERIAL_NONCELENGTH;
+    secret.data = secretBytes;
+
+    UA_Byte seedBytes[UA_PUBSUB_KEYMATERIAL_NONCELENGTH];
+    UA_ByteString seed;
+    seed.data = seedBytes;
+    seed.length = UA_PUBSUB_KEYMATERIAL_NONCELENGTH;
+
+    retVal = policy->symmetricModule.generateNonce(policy->policyContext, &secret);
+    retVal |= policy->symmetricModule.generateNonce(policy->policyContext, &seed);
+    if(retVal != UA_STATUSCODE_GOOD)
+        return retVal;
+
+    retVal = policy->symmetricModule.generateKey(policy->policyContext, &secret, &seed, key);
+    return retVal;
+}
+
+static void
+addTestWriterGroup(UA_String securitygroupId){
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+    writerGroupConfig.name = UA_STRING("WriterGroup");
+    writerGroupConfig.publishingInterval = 100;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    writerGroupConfig.securityGroupId = securitygroupId;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+
+    retval |= UA_Server_addWriterGroup(server, connection, &writerGroupConfig, &writerGroup);
+    UA_Server_setWriterGroupOperational(server, writerGroup);
+}
+
+static void
+addTestReaderGroup(UA_String securitygroupId){
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    /* To check status after running both publisher and subscriber */
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+
+    /* Reader Group */
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING ("ReaderGroup");
+
+    /* Reader Group Encryption settings */
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    readerGroupConfig.securityGroupId = securitygroupId;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+
+    retVal |=  UA_Server_addReaderGroup(server, connection, &readerGroupConfig, &readerGroup);
+    UA_Server_setReaderGroupOperational(server, readerGroup);
+}
+
+static UA_PubSubKeyStorage*
+createKeyStoragewithkeys(UA_UInt32 currentTokenId, UA_UInt32 futureKeySize,
+                         UA_Duration msKeyLifeTime, UA_Duration msTimeToNextKey, UA_String testSecurityGroupId) {
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_Duration callbackTime;
+    addTestWriterGroup(SecurityGroupId);
+    addTestReaderGroup(SecurityGroupId);
+
+    UA_PubSubKeyStorage *tKeyStorage =
+        UA_Server_findKeyStorage(server, SecurityGroupId);
+
+    size_t keyLength = server->config.pubSubConfig.securityPolicies->symmetricModule
+                           .secureChannelNonceLength;
+    UA_ByteString_allocBuffer(&currentKey, keyLength);
+    generateKeyData(server->config.pubSubConfig.securityPolicies, &currentKey);
+
+    futureKey = (UA_ByteString *)UA_calloc(futureKeySize, sizeof(UA_ByteString));
+    if(!futureKey)
+        return NULL;
+
+    for(size_t i = 0; i < futureKeySize; i++) {
+        UA_ByteString_allocBuffer(&futureKey[i], keyLength);
+        generateKeyData(server->config.pubSubConfig.securityPolicies, &futureKey[i]);
+    }
+
+    retval = UA_PubSubKeyStorage_storeSecurityKeys(server, tKeyStorage,
+                                                   currentTokenId, &currentKey, futureKey,
+                                                   futureKeySize, msKeyLifeTime);
+    if(retval != UA_STATUSCODE_GOOD)
+        return NULL;
+
+    retval = UA_PubSubKeyStorage_activateKeyToChannelContext(server, UA_NODEID_NULL,
+                                                           tKeyStorage->securityGroupID);
+    if(retval != UA_STATUSCODE_GOOD)
+        return NULL;
+
+    callbackTime = msKeyLifeTime;
+    if(msTimeToNextKey > 0)
+        callbackTime = msTimeToNextKey;
+
+    /*move to setSecurityKeysAction*/
+    retval = UA_PubSubKeyStorage_addKeyRolloverCallback(
+        server, tKeyStorage, (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback, callbackTime,
+        &tKeyStorage->callBackId);
+
+    return tKeyStorage;
+}
+
+static UA_Byte *
+hexstr_to_char(const char *hexstr) {
+    size_t len = strlen(hexstr);
+    if(len % 2 != 0)
+        return NULL;
+    size_t final_len = len / 2;
+    UA_Byte *chrs = (UA_Byte *)malloc((final_len + 1) * sizeof(*chrs));
+    for(size_t i = 0, j = 0; j < final_len; i += 2, j++)
+        chrs[j] =
+            (UA_Byte)((hexstr[i] % 32 + 9) % 25 * 16 + (hexstr[i + 1] % 32 + 9) % 25);
+    chrs[final_len] = '\0';
+    return chrs;
+}
+
+static void
+setup(void) {
+    server = UA_Server_new();
+    SecurityGroupId = UA_STRING("TestSecurityGroup");
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+
+    config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
+        UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+
+    UA_Server_run_startup(server);
+    //add 2 connections
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("UADP Connection");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_Server_addPubSubConnection(server, &connectionConfig, &connection);
+
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+    if(futureKey) {
+        UA_free(futureKey);
+        futureKey = NULL;
+    }
+}
+
+START_TEST(TestPubSubKeyStorage_initialize) {
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_String tSecurityPolicyUri = server->config.pubSubConfig.securityPolicies->policyUri;
+    UA_UInt32 maxPastkeyCount = 0;
+    UA_UInt32 maxFuturekeyCount = 0;
+    UA_PubSubKeyStorage *tKeyStorage = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+    ck_assert_ptr_ne(tKeyStorage, NULL);
+    retval =
+        UA_PubSubKeyStorage_init(server, &SecurityGroupId, &tSecurityPolicyUri,
+                                       maxPastkeyCount, maxFuturekeyCount, tKeyStorage);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_ptr_eq(server->config.pubSubConfig.securityPolicies, tKeyStorage->policy);
+    UA_PubSubKeyListItem *item;
+    UA_UInt32 startingKeyId = 1;
+    TAILQ_FOREACH(item, &tKeyStorage->keyList, keyListEntry){
+        ck_assert_msg(item->keyID == startingKeyId, "Expected KeyIDs to be incremented by 1 starting from currentKeyId");
+        startingKeyId++;
+    }
+    ck_assert_msg(UA_String_equal(&tKeyStorage->securityGroupID, &SecurityGroupId), "Expected SecurityGroupId to be equal to keystorage->securityGroupID");
+    /*check if the keystorage is in the Server Keystorage list*/
+    ck_assert_ptr_eq(server->pubSubManager.pubSubKeyList.lh_first, tKeyStorage);
+} END_TEST
+
+START_TEST(TestPubSubKeyStorage_InvalidSecurityPolicy) {
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_String tSecurityPolicyUri = UA_STRING("I am Wrong");
+    UA_UInt32 maxPastkeyCount = 0;
+    UA_UInt32 maxFuturekeyCount = 0;
+    UA_PubSubKeyStorage *tKeyStorage = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+    ck_assert_ptr_ne(tKeyStorage, NULL);
+    retval =
+        UA_PubSubKeyStorage_init(server, &SecurityGroupId, &tSecurityPolicyUri,
+                                       maxPastkeyCount, maxFuturekeyCount, tKeyStorage);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADNOTFOUND);
+} END_TEST
+
+START_TEST(TestPubSubKeyStorageSetKeys){
+    UA_UInt32 currentTokenId = 1;
+    UA_UInt32 futureKeySize = 2;
+    UA_Duration msTimeToNextKey = 2000;
+    UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
+    UA_PubSubKeyStorage *tKeyStorage = createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey, 0, testSecurityGroupId);
+    UA_PubSubKeyListItem *keyListIterator;
+    ck_assert_ptr_ne(tKeyStorage, NULL);
+    ck_assert_msg(UA_ByteString_equal(&currentKey, &tKeyStorage->keyList.tqh_first->key), "Expected CurrentKey to be equal to the first key in the KeyList");
+    ck_assert_msg(UA_ByteString_equal(&currentKey, &tKeyStorage->currentItem->key), "Expected CurrentItem to be equal to the CurrentKey");
+    keyListIterator = tKeyStorage->keyList.tqh_first->keyListEntry.tqe_next;
+    for (size_t i = 0; i < futureKeySize; i++) {
+        ck_assert_msg(UA_ByteString_equal(&futureKey[i], &keyListIterator->key), "Expected FutureKey to be equal to the second key in the KeyList");
+        keyListIterator = keyListIterator->keyListEntry.tqe_next;
+    }
+    keyListIterator = TAILQ_LAST(&tKeyStorage->keyList, keyListItems);
+    ck_assert_msg(UA_ByteString_equal(&futureKey[futureKeySize - 1], &keyListIterator->key), "Expected lastItem to be equal to the last FutureKey");
+    ck_assert_msg(futureKeySize + 1 == tKeyStorage->keyListSize,"Expected KeyListSize to be equal to FutureKeySize + 1");
+    ck_assert_msg(tKeyStorage->keyLifeTime == msTimeToNextKey, "Expected keyLifetime to be equal to the Keystorage->keyLifeTime");
+
+} END_TEST
+
+START_TEST(TestPubSubKeyStorage_MovetoNextKeyCallback){
+    UA_UInt32 currentTokenId = 1;
+    UA_UInt32 futureKeySize = 2;
+    UA_Duration msTimeToNextKey = 2000;
+    UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
+    UA_PubSubKeyStorage *tKeyStorage = createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey, 0, testSecurityGroupId);
+    ck_assert_ptr_ne(tKeyStorage, NULL);
+    UA_PubSubKeyListItem *nextCurrentKey = TAILQ_NEXT(tKeyStorage->currentItem, keyListEntry);
+    UA_fakeSleep(2000);
+    UA_Server_run_iterate(server,false);
+    ck_assert_ptr_eq(nextCurrentKey, tKeyStorage->currentItem);
+    ck_assert_msg(UA_ByteString_equal(&nextCurrentKey->key, &tKeyStorage->currentItem->key), "Expected Current key to be the First Future key after first TimeToNextKey expires");
+    /*securityTokenId must be updated after KeyLifeTime elapses*/
+    ck_assert_uint_eq(nextCurrentKey->keyID, tKeyStorage->currentTokenId);
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
+    ck_assert_uint_eq(wg->securityTokenId, nextCurrentKey->keyID);
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
+    ck_assert_uint_eq(rg->securityTokenId, nextCurrentKey->keyID);
+} END_TEST
+
+START_TEST(TestPubSubKeystorage_ImportedKey){
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+
+    UA_Byte nonceData[8]= {1,2,3,4,5,6,7,8};
+    UA_ByteString testMsgNonce = {8, nonceData};
+    UA_ByteString buffer, expect_buf, signature;
+    const char * msg_unenc = MSG_HEADER MSG_PAYLOAD_DEC;
+
+    UA_UInt32 currentTokenId = 1;
+    UA_UInt32 futureKeySize = 2;
+    UA_Duration msTimeToNextKey = 2000;
+    UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
+
+    buffer.length = MSG_LENGTH_DECRYPTED;
+    buffer.data = hexstr_to_char(msg_unenc);
+    UA_ByteString_copy(&buffer, &expect_buf);
+
+    createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey,0, testSecurityGroupId);
+
+    /*encrypt and sign with Writer channelContext*/
+
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
+    retval = wg->config.securityPolicy->setMessageNonce(wg->securityPolicyContext, &testMsgNonce);
+    retval =  wg->config.securityPolicy->symmetricModule.cryptoModule.encryptionAlgorithm.encrypt( wg->securityPolicyContext, &buffer);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected retval to be GOOD");
+    size_t sigSize = wg->config.securityPolicy->symmetricModule.cryptoModule.
+                     signatureAlgorithm.getLocalSignatureSize(wg->securityPolicyContext);
+    UA_ByteString_allocBuffer(&signature, sigSize);
+    retval = wg->config.securityPolicy->symmetricModule.cryptoModule.signatureAlgorithm.sign(wg->securityPolicyContext,&buffer,&signature);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected retval to be GOOD: Error Code %s", UA_StatusCode_name(retval));
+
+    /*decrypt and verify with the imported key in the ReaderGroup*/
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
+    retval = rg->config.securityPolicy->setMessageNonce(rg->securityPolicyContext, &testMsgNonce);
+    retval = rg->config.securityPolicy->symmetricModule.cryptoModule.signatureAlgorithm.verify(rg->securityPolicyContext, &buffer,&signature);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected retval to be GOOD: Error Code %s", UA_StatusCode_name(retval));
+    retval = rg->config.securityPolicy->symmetricModule.cryptoModule.encryptionAlgorithm.decrypt(rg->securityPolicyContext,&buffer);
+    ck_assert(memcmp(buffer.data, expect_buf.data, buffer.length) == 0);
+} END_TEST
+
+START_TEST(TestPubSubKeyStorage_InitWithWriterGroup){
+    addTestWriterGroup(SecurityGroupId);
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    ck_assert_ptr_ne(wg->keyStorage, NULL);
+    ck_assert_ptr_eq(ks, wg->keyStorage);
+} END_TEST
+
+START_TEST(TestPubSubKeyStorage_InitWithReaderGroup){
+    addTestReaderGroup(SecurityGroupId);
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    ck_assert_ptr_ne(rg->keyStorage, NULL);
+    ck_assert_ptr_eq(ks, rg->keyStorage);
+} END_TEST
+
+START_TEST(TestAddingNewGroupToExistingKeyStorage){
+    addTestWriterGroup(SecurityGroupId);
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    ck_assert_msg(ks->referenceCount == 1, "Expected the reference Count to be exactly 1 after adding one Group");
+    addTestReaderGroup(SecurityGroupId);
+    ck_assert_msg(ks->referenceCount == 2, "Expected the reference Count to be exactly 2 after adding second Group same SecurityGroupId");
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
+    ck_assert_ptr_eq(ks, rg->keyStorage);
+    ck_assert_ptr_eq(ks, wg->keyStorage);
+    ck_assert_ptr_eq(rg->keyStorage, wg->keyStorage);
+} END_TEST
+
+START_TEST(TestRemoveAPubSubGroupWithKeyStorage){
+    addTestWriterGroup(SecurityGroupId);
+    addTestReaderGroup(SecurityGroupId);
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    UA_UInt32 refCountBefore = ks->referenceCount;
+    UA_Server_removeWriterGroup(server, writerGroup);
+    --refCountBefore;
+    ck_assert_msg(ks->referenceCount == refCountBefore, "Expected keyStroage referenceCount to be One less then before after removing a Group");
+    UA_Server_removeReaderGroup(server, readerGroup);
+    ks = NULL;
+    ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    ck_assert_ptr_eq(ks, NULL);
+} END_TEST
+
+int
+main(void) {
+    int number_failed = 0;
+    TCase *tc_pubsub_keystorage = tcase_create("PubSub KeyStorage");
+    tcase_add_checked_fixture(tc_pubsub_keystorage, setup, teardown);
+    tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorage_initialize);
+    tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorage_InvalidSecurityPolicy);
+    tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorageSetKeys);
+    tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorage_MovetoNextKeyCallback);
+    tcase_add_test(tc_pubsub_keystorage, TestPubSubKeystorage_ImportedKey);
+    tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorage_InitWithWriterGroup);
+    tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorage_InitWithReaderGroup);
+    tcase_add_test(tc_pubsub_keystorage, TestAddingNewGroupToExistingKeyStorage);
+    tcase_add_test(tc_pubsub_keystorage, TestRemoveAPubSubGroupWithKeyStorage);
+
+    Suite *s =
+        suite_create("PubSub Keystorage and handling keys for Publisher and Subscriber");
+    suite_add_tcase(s, tc_pubsub_keystorage);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
new file mode 100644
index 00000000000..acde9ad1c14
--- /dev/null
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -0,0 +1,396 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/server_pubsub.h>
+#include <open62541/server_config_default.h>
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+
+#include "../encryption/certificates.h"
+#include "ua_pubsub.h"
+#include "ua_pubsub_keystorage.h"
+#include "ua_server_internal.h"
+
+#include <check.h>
+#include "thread_wrapper.h"
+
+#define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
+
+UA_Server *server = NULL;
+UA_ByteString currentKey;
+UA_ByteString *futureKey = NULL;
+UA_String securityGroupId;
+UA_NodeId connection, writerGroup, readerGroup, publishedDataSet, dataSetWriter;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static UA_StatusCode
+generateKeyData(const UA_PubSubSecurityPolicy *policy, UA_ByteString *key) {
+    if(!key || !policy)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_StatusCode retVal;
+
+    UA_Byte secretBytes[UA_PUBSUB_KEYMATERIAL_NONCELENGTH];
+    UA_ByteString secret;
+    secret.length = UA_PUBSUB_KEYMATERIAL_NONCELENGTH;
+    secret.data = secretBytes;
+
+    UA_Byte seedBytes[UA_PUBSUB_KEYMATERIAL_NONCELENGTH];
+    UA_ByteString seed;
+    seed.data = seedBytes;
+    seed.length = UA_PUBSUB_KEYMATERIAL_NONCELENGTH;
+
+    retVal = policy->symmetricModule.generateNonce(policy->policyContext, &secret);
+    retVal |= policy->symmetricModule.generateNonce(policy->policyContext, &seed);
+    if(retVal != UA_STATUSCODE_GOOD)
+        return retVal;
+
+    retVal =
+        policy->symmetricModule.generateKey(policy->policyContext, &secret, &seed, key);
+    return retVal;
+}
+
+static UA_StatusCode
+encyrptedclientconnect(UA_Client *client) {
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* Secure client initialization */
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey, trustList,
+                                         trustListSize, revocationList,
+                                         revocationListSize);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    ck_assert(client != NULL);
+
+    /* Secure client connect */
+    return UA_Client_connect(client, "opc.tcp://localhost:4840");
+}
+
+static UA_StatusCode
+callSetSecurityKey(UA_Client *client, UA_String pSecurityGroupId, UA_UInt32 currentTokenId, UA_UInt32 futureKeySize){
+    UA_NodeId parentId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE);
+    UA_NodeId methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SETSECURITYKEYS);
+    size_t inputSize = 7;
+    UA_Variant inputs[7];
+    size_t outputSize;
+    UA_Variant *output;
+
+    UA_Variant_setScalar(&inputs[0], &pSecurityGroupId, &UA_TYPES[UA_TYPES_STRING]);
+
+    UA_String policUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    UA_Variant_setScalar(&inputs[1], &policUri, &UA_TYPES[UA_TYPES_STRING]);
+
+    UA_Variant_setScalar(&inputs[2], &currentTokenId, &UA_TYPES[UA_TYPES_UINT32]);
+
+    size_t keyLength = server->config.pubSubConfig.securityPolicies->symmetricModule.secureChannelNonceLength;
+    UA_ByteString_allocBuffer(&currentKey, keyLength);
+    generateKeyData(server->config.pubSubConfig.securityPolicies, &currentKey);
+    UA_Variant_setScalar(&inputs[3], &currentKey, &UA_TYPES[UA_TYPES_BYTESTRING]);
+
+    futureKey = (UA_ByteString *)UA_calloc(futureKeySize, sizeof(UA_ByteString));
+
+    for (size_t i = 0; i < futureKeySize; i++) {
+        UA_ByteString_allocBuffer(&futureKey[i], keyLength);
+        generateKeyData(server->config.pubSubConfig.securityPolicies, &futureKey[i]);
+    }
+    UA_Variant_setArrayCopy(&inputs[4], futureKey, futureKeySize, &UA_TYPES[UA_TYPES_BYTESTRING]);
+
+    UA_Duration msTimeNextKey = 0;
+    UA_Variant_setScalar(&inputs[5], &msTimeNextKey, &UA_TYPES[UA_TYPES_DURATION]);
+
+    UA_Duration mskeyLifeTime = 2000;
+    UA_Variant_setScalar(&inputs[6], &mskeyLifeTime, &UA_TYPES[UA_TYPES_DURATION]);
+
+    return UA_Client_call(client,parentId, methodId, inputSize, inputs, &outputSize, &output);
+}
+
+
+static void
+addTestWriterGroup(UA_String securitygroupId) {
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+    writerGroupConfig.name = UA_STRING("WriterGroup");
+    writerGroupConfig.publishingInterval = 100;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    writerGroupConfig.securityGroupId = securitygroupId;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+
+    retval |=
+        UA_Server_addWriterGroup(server, connection, &writerGroupConfig, &writerGroup);
+    UA_Server_setWriterGroupOperational(server, writerGroup);
+}
+
+static void
+addTestReaderGroup(UA_String securitygroupId) {
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    /* To check status after running both publisher and subscriber */
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+
+    /* Reader Group */
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING("ReaderGroup");
+
+    /* Reader Group Encryption settings */
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    readerGroupConfig.securityGroupId = securitygroupId;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+
+    retVal |=
+        UA_Server_addReaderGroup(server, connection, &readerGroupConfig, &readerGroup);
+}
+
+static void
+setup(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    size_t trustListSize = 0;
+    UA_ByteString *trustList = NULL;
+    size_t issuerListSize = 0;
+    UA_ByteString *issuerList = NULL;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   trustList, trustListSize,
+                                                   issuerList, issuerListSize,
+                                                   revocationList, revocationListSize);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+
+    config->pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+
+    UA_Server_run_startup(server);
+    // add 2 connections
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("UADP Connection");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {
+        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_Server_addPubSubConnection(server, &connectionConfig, &connection);
+
+    securityGroupId = UA_STRING("TestSecurityGroup");
+
+    addTestReaderGroup(securityGroupId);
+    addTestWriterGroup(securityGroupId);
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void
+teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+    if(futureKey) {
+        UA_free(futureKey);
+        futureKey = NULL;
+    }
+}
+
+START_TEST(TestSetSecurityKeys_InsufficientSecurityMode) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(client);
+    }
+    retval = callSetSecurityKey(client, securityGroupId, 1, 2);
+    ck_assert_msg(retval == UA_STATUSCODE_BADSECURITYMODEINSUFFICIENT, "Expected BAD_SECURITYMODEINSUFFICIENT but erorr code : %s \n", UA_StatusCode_name(retval));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURITYMODEINSUFFICIENT);
+} END_TEST
+
+START_TEST(TestSetSecurityKeys_MissingSecurityGroup) {
+    UA_Client *client = UA_Client_new();
+    UA_StatusCode retval = encyrptedclientconnect(client);
+    UA_String wrongSecurityGroupId = UA_STRING("WrongSecurityGroupId");
+    retval = callSetSecurityKey(client, wrongSecurityGroupId, 1, 2);
+    ck_assert_msg(retval == UA_STATUSCODE_BADNOTFOUND, "Expected BAD_BADNOTFOUND but erorr code : %s \n", UA_StatusCode_name(retval));
+} END_TEST
+
+START_TEST(TestSetSecurityKeys_GOOD) {
+    UA_Client *client = UA_Client_new();
+    UA_UInt32 futureKeySize = 2;
+    UA_UInt32 currentTokenId = 1;
+    UA_UInt32 startingTokenId = 1;
+
+    UA_StatusCode retval = encyrptedclientconnect(client);
+
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, securityGroupId);
+
+    retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
+    ck_assert_uint_eq(ks->currentItem->keyID, currentTokenId);
+
+    startingTokenId = currentTokenId;
+    UA_PubSubKeyListItem *iterator = TAILQ_FIRST(&ks->keyList);
+    for (size_t i = 0; i < futureKeySize + 1; i++) {
+        ck_assert_ptr_ne(iterator, NULL);
+        ck_assert_uint_eq(iterator->keyID, startingTokenId);
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+        startingTokenId++;
+    }
+    ck_assert_uint_eq(ks->keyListSize, futureKeySize+1);
+} END_TEST
+
+START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingList){
+    UA_Client *client = UA_Client_new();
+    UA_UInt32 futureKeySize = 2;
+    UA_UInt32 currentTokenId = 1;
+
+    UA_StatusCode retval = encyrptedclientconnect(client);
+
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, securityGroupId);
+
+    retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
+
+    futureKeySize = 0;
+    currentTokenId = 3;
+    retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
+    ck_assert_uint_eq(ks->currentItem->keyID, currentTokenId);
+} END_TEST
+
+START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingListAndAddNewFutureKeys){
+    UA_Client *client = UA_Client_new();
+    UA_UInt32 futureKeySize = 2;
+    UA_UInt32 currentTokenId = 1;
+    UA_UInt32 startingTokenId = 1;
+    size_t keyListSize;
+    UA_StatusCode retval = encyrptedclientconnect(client);
+
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, securityGroupId);
+    retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
+
+    keyListSize = ks->keyListSize;
+    futureKeySize = 3;
+    currentTokenId = 2;
+    retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
+    ck_assert_uint_eq(ks->currentItem->keyID, currentTokenId);
+    /*After updating: KeyListSize = Pervious KeyListSize + FutureKeySize - Duplicated Keys with matching KeyID */
+    ck_assert_uint_eq(keyListSize + futureKeySize - 1, ks->keyListSize);
+    UA_PubSubKeyListItem *iterator = TAILQ_FIRST(&ks->keyList);
+    for (size_t i = 0; i < ks->keyListSize; i++) {
+        ck_assert_ptr_ne(iterator, NULL);
+        ck_assert_uint_eq(iterator->keyID, startingTokenId);
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+        startingTokenId++;
+    }
+} END_TEST
+
+START_TEST(TestSetSecurityKeys_ReplaceExistingKeyListWithFetchedKeyList){
+    UA_Client *client = UA_Client_new();
+    UA_UInt32 futureKeySize = 2;
+    UA_UInt32 currentTokenId = 1;
+    UA_UInt32 startingTokenId = 1;
+
+    UA_StatusCode retval = encyrptedclientconnect(client);
+
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, securityGroupId);
+
+    retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
+
+    futureKeySize = 3;
+    currentTokenId = 4;
+    startingTokenId = currentTokenId;
+    retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
+    UA_PubSubKeyListItem *iterator = TAILQ_FIRST(&ks->keyList);
+    for (size_t i = 0; i < futureKeySize + 1; i++) {
+        ck_assert_ptr_ne(iterator, NULL);
+        ck_assert_uint_eq(iterator->keyID, startingTokenId);
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+        startingTokenId++;
+    }
+    ck_assert_uint_eq(ks->keyListSize, futureKeySize+1);
+} END_TEST
+
+int
+main(void) {
+    int number_failed = 0;
+    TCase *tc_pubsub_sks_push = tcase_create("PubSub SKS Push");
+    tcase_add_checked_fixture(tc_pubsub_sks_push, setup, teardown);
+    tcase_add_test(tc_pubsub_sks_push, TestSetSecurityKeys_InsufficientSecurityMode);
+    tcase_add_test(tc_pubsub_sks_push, TestSetSecurityKeys_MissingSecurityGroup);
+    tcase_add_test(tc_pubsub_sks_push, TestSetSecurityKeys_GOOD);
+    tcase_add_test(tc_pubsub_sks_push, TestSetSecurityKeys_UpdateCurrentKeyFromExistingList);
+    tcase_add_test(tc_pubsub_sks_push, TestSetSecurityKeys_UpdateCurrentKeyFromExistingListAndAddNewFutureKeys);
+    tcase_add_test(tc_pubsub_sks_push, TestSetSecurityKeys_ReplaceExistingKeyListWithFetchedKeyList);
+    Suite *s = suite_create("PubSub SKS Push");
+    suite_add_tcase(s, tc_pubsub_sks_push);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tools/ci.sh b/tools/ci.sh
index d69c9811928..9a1a978363a 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Exit immediately if a command exits with a non-zero status
-set -e 
+set -e
 
 # Use the error status of the first failure in a pipeline
 set -o pipefail
@@ -127,7 +127,7 @@ function set_capabilities {
     for filename in bin/tests/*; do
         sudo setcap cap_sys_ptrace,cap_net_raw,cap_net_admin=eip $filename
     done
-} 
+}
 
 function unit_tests {
     mkdir -p build; cd build; rm -rf *
@@ -271,6 +271,27 @@ function unit_tests_encryption_mbedtls_pubsub {
     make test ARGS="-V"
 }
 
+function unit_tests_pubsub_sks {
+    mkdir -p build; cd build; rm -rf *
+    cmake -DCMAKE_BUILD_TYPE=Debug \
+          -DUA_NAMESPACE_ZERO=FULL \
+          -DUA_BUILD_EXAMPLES=ON \
+          -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_DISCOVERY=ON \
+          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
+          -DUA_ENABLE_ENCRYPTION=MBEDTLS \
+          -DUA_ENABLE_PUBSUB=ON \
+          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
+          -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
+          -DUA_ENABLE_PUBSUB_SKS=ON \
+          ..
+    make ${MAKEOPTS}
+    make test ARGS="-V"
+}
+
 ##########################################
 # Build and Run Unit Tests with Coverage #
 ##########################################

From 779e6b7902ff223b27d402c952fc5f06e967dd23 Mon Sep 17 00:00:00 2001
From: keba-uso <uso@keba.com>
Date: Thu, 22 Sep 2022 16:48:23 +0200
Subject: [PATCH 0484/1963] feat(plugin): Integration of nodesetLoader
 functionality within open62541 (#5371)

---
 .gitignore                                    |    4 +-
 .gitmodules                                   |    4 +
 CMakeLists.txt                                |   25 +-
 deps/nodesetLoader                            |    1 +
 examples/CMakeLists.txt                       |    7 +
 .../custom_datatype/client_types_custom.c     |    2 +-
 .../custom_datatype/server_types_custom.c     |    2 +-
 examples/nodeset/server_testnodeset.c         |    2 +-
 examples/nodeset_loader/CMakeLists.txt        |    8 +
 examples/nodeset_loader/nodeset_loader.c      |   34 +
 .../nodeset_loader/server_nodeset_loader.c    |   33 +
 examples/pubsub/tutorial_pubsub_publish_raw.c |    2 +-
 .../pubsub/tutorial_pubsub_subscribe_raw.c    |    2 +-
 include/open62541/types.h                     |    3 +
 .../include/open62541/plugin/nodesetloader.h  |   24 +
 plugins/ua_nodesetloader.c                    |   20 +
 src/client/ua_client.c                        |    3 +
 src/server/ua_server_config.c                 |    5 +
 src/ua_types.c                                |   21 +
 src/ua_util_internal.h                        |    3 +
 tests/CMakeLists.txt                          |    9 +
 tests/check_types_custom.c                    |   10 +-
 .../check_nodeset_compiler_testnodeset.c      |    2 +-
 tests/nodeset-loader/CMakeLists.txt           |   13 +
 .../nodeset-loader/check_nodeset_loader_adi.c |   57 +
 .../check_nodeset_loader_autoid.c             |   57 +
 .../nodeset-loader/check_nodeset_loader_di.c  |   49 +
 .../check_nodeset_loader_input.c              |   61 +
 .../nodeset-loader/check_nodeset_loader_plc.c |   57 +
 .../check_nodeset_loader_ua_nodeset.c         | 1231 +++++++++++++++++
 tests/server/check_local_monitored_item.c     |    2 +-
 tools/nodeset_compiler/backend_open62541.py   |    3 +-
 32 files changed, 1741 insertions(+), 15 deletions(-)
 create mode 160000 deps/nodesetLoader
 create mode 100644 examples/nodeset_loader/CMakeLists.txt
 create mode 100644 examples/nodeset_loader/nodeset_loader.c
 create mode 100644 examples/nodeset_loader/server_nodeset_loader.c
 create mode 100644 plugins/include/open62541/plugin/nodesetloader.h
 create mode 100644 plugins/ua_nodesetloader.c
 create mode 100644 tests/nodeset-loader/CMakeLists.txt
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_adi.c
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_autoid.c
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_di.c
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_input.c
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_plc.c
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c

diff --git a/.gitignore b/.gitignore
index e6d2e291239..2a71f818fb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,12 +77,14 @@ Makefile
 /exampleClient
 /exampleClient_legacy
 /src_generated/
-/build
+**/build
 /cmake-build*
 /tools/certs/certs/*
 Pipfile
 Pipfile.lock
 .vscode
+**/libxml2
+debian/*
 
 # clangd cache
 .cache/
diff --git a/.gitmodules b/.gitmodules
index 94f7cbce5ca..7265aaedf0d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,3 +9,7 @@
 	path = deps/mqtt-c
 	url = https://github.com/LiamBindle/MQTT-C.git
 	branch = master
+[submodule "deps/nodesetLoader"]
+	path = deps/nodesetLoader
+	url = https://github.com/open62541/nodesetLoader
+	branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d87052ce927..2b728012444 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,6 +165,7 @@ option(UA_ENABLE_DA "Enable OPC UA DataAccess (Part 8) definitions" ON)
 option(UA_ENABLE_HISTORIZING "Enable basic support for historical access (client and server)" OFF)
 option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" OFF)
 option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" ON)
+option(UA_ENABLE_NODESETLOADER "Enable nodesetLoader public API" OFF)
 
 set(MULTITHREADING_DEFAULT 0)
 if(WIN32 OR UNIX)
@@ -1228,6 +1229,22 @@ if(UA_BUILD_FUZZING OR UA_BUILD_OSS_FUZZ)
         ${PROJECT_SOURCE_DIR}/tests/fuzz/custom_memory_manager.c)
 endif()
 
+if(UA_ENABLE_NODESETLOADER)
+    # This is required because of issues with policy CMP0077.
+    # Source: https://stackoverflow.com/a/54404924
+    option(ENABLE_BUILD_INTO_OPEN62541 "make nodesetLoader part of the open62541 library" off)
+    set(ENABLE_BUILD_INTO_OPEN62541 on)
+
+    add_subdirectory(${PROJECT_SOURCE_DIR}/deps/nodesetLoader)
+
+    list(APPEND lib_sources ${NODESETLOADER_SOURCES})
+    list(APPEND default_plugin_headers
+                ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/nodesetloader.h)
+    list(APPEND default_plugin_sources
+                ${PROJECT_SOURCE_DIR}/plugins/ua_nodesetloader.c)
+    list(APPEND open62541_LIBRARIES ${NODESETLOADER_DEPS_LIBS})
+endif()
+
 #########################
 # Generate source files #
 #########################
@@ -1513,6 +1530,10 @@ else()
                                "${PROJECT_SOURCE_DIR}/src/pubsub"
                                "${PROJECT_BINARY_DIR}/src_generated")
 
+    if(UA_ENABLE_NODESETLOADER)
+        include_directories_public(${NODESETLOADER_PUBLIC_INCLUDES})
+    endif()
+
     # Private includes
     include_directories_private("${PROJECT_BINARY_DIR}")
 
@@ -1525,12 +1546,14 @@ else()
     if(UA_ENABLE_ENCRYPTION_LIBRESSL)
         include_directories_private(${LIBRESSL_INCLUDE_DIR})
     endif()
+    if(UA_ENABLE_NODESETLOADER)
+        include_directories_private(${NODESETLOADER_PRIVATE_INCLUDES})
+    endif()
 
     # Option-specific includes
     if(UA_ENABLE_DISCOVERY)
         include_directories_private("${PROJECT_SOURCE_DIR}/src/client")
     endif()
-
 endif()
 
 add_dependencies(open62541-object open62541-code-generation)
diff --git a/deps/nodesetLoader b/deps/nodesetLoader
new file mode 160000
index 00000000000..a05fdd843a3
--- /dev/null
+++ b/deps/nodesetLoader
@@ -0,0 +1 @@
+Subproject commit a05fdd843a38c34c64a6aaa25b68e5c90af0d182
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2bb3b2cec4e..95136172e1d 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -274,3 +274,10 @@ if(UA_ENABLE_PUBSUB)
         endif()
     endif()
 endif()
+
+###########################
+# Nodeser Loader Examples #
+###########################
+if(UA_ENABLE_NODESETLOADER)
+    add_subdirectory(nodeset_loader)
+endif()
\ No newline at end of file
diff --git a/examples/custom_datatype/client_types_custom.c b/examples/custom_datatype/client_types_custom.c
index d30b7e296d5..7c3d586aa53 100644
--- a/examples/custom_datatype/client_types_custom.c
+++ b/examples/custom_datatype/client_types_custom.c
@@ -20,7 +20,7 @@ int main(void) {
 
     /* Attention! Here the custom datatypes are allocated on the stack. So they
      * cannot be accessed from parallel (worker) threads. */
-    UA_DataTypeArray customDataTypes = {NULL, 4, types};
+    UA_DataTypeArray customDataTypes = {NULL, 4, types, UA_FALSE};
 
     UA_Client *client = UA_Client_new();
     UA_ClientConfig *cc = UA_Client_getConfig(client);
diff --git a/examples/custom_datatype/server_types_custom.c b/examples/custom_datatype/server_types_custom.c
index bb2d7f2dc0d..fab00767dc3 100644
--- a/examples/custom_datatype/server_types_custom.c
+++ b/examples/custom_datatype/server_types_custom.c
@@ -279,7 +279,7 @@ int main(void) {
 
     /* Attention! Here the custom datatypes are allocated on the stack. So they
      * cannot be accessed from parallel (worker) threads. */
-    UA_DataTypeArray customDataTypes = {config->customDataTypes, 4, types};
+    UA_DataTypeArray customDataTypes = {config->customDataTypes, 4, types, UA_FALSE};
     config->customDataTypes = &customDataTypes;
 
     add3DPointDataType(server);
diff --git a/examples/nodeset/server_testnodeset.c b/examples/nodeset/server_testnodeset.c
index d1b21188c88..606003d8802 100644
--- a/examples/nodeset/server_testnodeset.c
+++ b/examples/nodeset/server_testnodeset.c
@@ -15,7 +15,7 @@
 
 UA_Boolean running = true;
 
-UA_DataTypeArray customTypesArray = { NULL, UA_TYPES_TESTNODESET_COUNT, UA_TYPES_TESTNODESET};
+UA_DataTypeArray customTypesArray = { NULL, UA_TYPES_TESTNODESET_COUNT, UA_TYPES_TESTNODESET, UA_FALSE};
 
 static void stopHandler(int sign) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
diff --git a/examples/nodeset_loader/CMakeLists.txt b/examples/nodeset_loader/CMakeLists.txt
new file mode 100644
index 00000000000..89f617315b2
--- /dev/null
+++ b/examples/nodeset_loader/CMakeLists.txt
@@ -0,0 +1,8 @@
+###########################
+# Nodeset Loader Examples #
+###########################
+
+if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+    add_example(nodeset_loader nodeset_loader.c)
+    add_example(server_nodeset_loader server_nodeset_loader.c)
+endif()
diff --git a/examples/nodeset_loader/nodeset_loader.c b/examples/nodeset_loader/nodeset_loader.c
new file mode 100644
index 00000000000..628af47a868
--- /dev/null
+++ b/examples/nodeset_loader/nodeset_loader.c
@@ -0,0 +1,34 @@
+/* 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 <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+UA_Boolean running = true;
+static void stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+int main(int argc, const char *argv[]) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+
+    for (int cnt = 1; cnt < argc; cnt++) {
+        if (!UA_Server_loadNodeset(server, argv[cnt], NULL)) {
+            printf("Nodeset %s could not be loaded, exit\n", argv[cnt]);
+            return EXIT_FAILURE;
+        }
+    }
+
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+
+    return EXIT_SUCCESS;
+}
diff --git a/examples/nodeset_loader/server_nodeset_loader.c b/examples/nodeset_loader/server_nodeset_loader.c
new file mode 100644
index 00000000000..03cf41a2ad1
--- /dev/null
+++ b/examples/nodeset_loader/server_nodeset_loader.c
@@ -0,0 +1,33 @@
+/* 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 <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+UA_Boolean running = true;
+static void stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+int main(int argc, const char *argv[]) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+
+    for (int cnt = 1; cnt < argc; cnt++) {
+        if (!UA_Server_loadNodeset(server, argv[cnt], NULL)) {
+            printf("Nodeset %s could not be loaded, exit\n", argv[cnt]);
+            return EXIT_FAILURE;
+        }
+    }
+
+    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_Server_delete(server);
+
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/examples/pubsub/tutorial_pubsub_publish_raw.c b/examples/pubsub/tutorial_pubsub_publish_raw.c
index 5b5fefdbed7..97d85670fa5 100644
--- a/examples/pubsub/tutorial_pubsub_publish_raw.c
+++ b/examples/pubsub/tutorial_pubsub_publish_raw.c
@@ -276,7 +276,7 @@ static int run(UA_String *transportProfile,
     types[0] = PointType;
     types[0].members = pointMembers;
 
-    UA_DataTypeArray customDataTypes = {config->customDataTypes, 1, types};
+    UA_DataTypeArray customDataTypes = {config->customDataTypes, 1, types, UA_FALSE};
     config->customDataTypes = &customDataTypes;
 
     add3DPointDataType(server);
diff --git a/examples/pubsub/tutorial_pubsub_subscribe_raw.c b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
index 9757643b487..0535518746d 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe_raw.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
@@ -328,7 +328,7 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     types[0] = PointType;
     types[0].members = pointMembers;
 
-    UA_DataTypeArray customDataTypes = {config->customDataTypes, 1, types};
+    UA_DataTypeArray customDataTypes = {config->customDataTypes, 1, types, UA_FALSE};
     config->customDataTypes = &customDataTypes;
 
     add3DPointDataType(server);
diff --git a/include/open62541/types.h b/include/open62541/types.h
index 6297f34e29d..b89e090f7c6 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1074,6 +1074,9 @@ typedef struct UA_DataTypeArray {
     const struct UA_DataTypeArray *next;
     const size_t typesSize;
     const UA_DataType *types;
+    UA_Boolean cleanup; /* Free the array structure and its content
+                           when the client or server configuration
+                           containing it is cleaned up */
 } UA_DataTypeArray;
 
 /* Returns the offset and type of a structure member. The return value is false
diff --git a/plugins/include/open62541/plugin/nodesetloader.h b/plugins/include/open62541/plugin/nodesetloader.h
new file mode 100644
index 00000000000..a6416e244c1
--- /dev/null
+++ b/plugins/include/open62541/plugin/nodesetloader.h
@@ -0,0 +1,24 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ *
+ *    Copyright 2019 (c) Julius Pfrommer, Fraunhofer IOSB
+ */
+
+#ifndef UA_NODESET_LOADER_DEFAULT_H_
+#define UA_NODESET_LOADER_DEFAULT_H_
+
+#include <open62541/util.h>
+
+_UA_BEGIN_DECLS
+
+typedef void UA_NodeSetLoaderOptions;
+
+/* Load the typemodel at runtime, without the need to statically compile the model.
+ * This is an alternative to the Python nodeset compiler approach. */
+UA_EXPORT UA_StatusCode
+UA_Server_loadNodeset(UA_Server *server, const char *nodeset2XmlFilePath,
+                      UA_NodeSetLoaderOptions *options);
+
+_UA_END_DECLS
+
+#endif /* UA_NODESET_LOADER_DEFAULT_H_ */
diff --git a/plugins/ua_nodesetloader.c b/plugins/ua_nodesetloader.c
new file mode 100644
index 00000000000..c94e641bc58
--- /dev/null
+++ b/plugins/ua_nodesetloader.c
@@ -0,0 +1,20 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ *
+ *    Copyright 2014-2019 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2017 (c) Julian Grothoff
+ *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
+ */
+
+#include <open62541/plugin/nodesetloader.h>
+#include <NodesetLoader/backendOpen62541.h>
+#include <NodesetLoader/dataTypes.h>
+#include <open62541/server.h>
+
+UA_StatusCode
+UA_Server_loadNodeset(UA_Server *server, const char *nodeset2XmlFilePath,
+                      UA_NodeSetLoaderOptions *options) {
+    return NodesetLoader_loadFile(server,
+                                  nodeset2XmlFilePath,
+                                  (NodesetLoader_ExtensionInterface*)options);
+}
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 248fa18e5cc..d6a47a58fb6 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -104,6 +104,9 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
     }
     config->sessionLocaleIds = NULL;
     config->sessionLocaleIdsSize = 0;
+
+    /* Custom Data Types */
+    UA_cleanupDataTypeWithCustom(config->customDataTypes);
 }
 
 static void
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index ce8b347669d..739b7289f79 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -8,6 +8,8 @@
 
 #include <open62541/server.h>
 
+#include "ua_server_internal.h"
+
 void
 UA_ServerConfig_clean(UA_ServerConfig *config) {
     if(!config)
@@ -100,6 +102,9 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
     }
 #endif
 #endif /* UA_ENABLE_PUBSUB */
+
+    /* Custom Data Types */
+    UA_cleanupDataTypeWithCustom(config->customDataTypes);
 }
 
 #ifdef UA_ENABLE_PUBSUB
diff --git a/src/ua_types.c b/src/ua_types.c
index 76841669540..fa86991e99c 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -83,6 +83,27 @@ UA_findDataType(const UA_NodeId *typeId) {
     return UA_findDataTypeWithCustom(typeId, NULL);
 }
 
+void
+UA_cleanupDataTypeWithCustom(const UA_DataTypeArray *customTypes) {
+    while (customTypes) {
+        const UA_DataTypeArray *next = customTypes->next;
+        if (customTypes->cleanup) {
+            for(size_t i = 0; i < customTypes->typesSize; ++i) {
+                const UA_DataType *type = &customTypes->types[i];
+                UA_free((void*)(uintptr_t)type->typeName);
+                for(size_t j = 0; j < type->membersSize; ++j) {
+                    const UA_DataTypeMember *m = &type->members[j];
+                    UA_free((void*)(uintptr_t)m->memberName);
+                }
+                UA_free((void*)type->members);
+            }
+            UA_free((void*)(uintptr_t)customTypes->types);
+            UA_free((void*)(uintptr_t)customTypes);
+        }
+        customTypes = next;
+    }
+}
+
 /***************************/
 /* Random Number Generator */
 /***************************/
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 195b3c45f9a..356ec080ba5 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -175,6 +175,9 @@ const UA_DataType *
 UA_findDataTypeWithCustom(const UA_NodeId *typeId,
                           const UA_DataTypeArray *customTypes);
 
+void
+UA_cleanupDataTypeWithCustom(const UA_DataTypeArray *customTypes);
+
 /* Get the number of optional fields contained in an structure type */
 size_t UA_EXPORT
 getCountOfOptionalFields(const UA_DataType *type);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 611f850bf31..de8f9b2b3d0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -139,6 +139,10 @@ if(UA_ENABLE_PUBSUB)
     endif()
 endif()
 
+if(UA_ENABLE_NODESETLOADER)
+    list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_nodesetloader.c)
+endif()
+
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     set(NODESET_COMPILER_OUTPUT_DIR "${CMAKE_BINARY_DIR}/src_generated/tests")
 
@@ -416,6 +420,11 @@ endif()
 # Tests for Nodeset Compiler
 add_subdirectory(nodeset-compiler)
 
+# Tests for Nodeset Loader
+if(UA_ENABLE_NODESETLOADER)
+    add_subdirectory(nodeset-loader)
+endif()
+
 # Tests for interfaces
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     add_executable(check_interfaces server/check_interfaces.c ${NODESET_COMPILER_OUTPUT_DIR}/namespace_tests_interfaces_generated.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
diff --git a/tests/check_types_custom.c b/tests/check_types_custom.c
index 6e37c72fb5f..165bd67baf4 100644
--- a/tests/check_types_custom.c
+++ b/tests/check_types_custom.c
@@ -79,7 +79,7 @@ static const UA_DataType PointType = {
     members
 };
 
-const UA_DataTypeArray customDataTypes = {NULL, 1, &PointType};
+const UA_DataTypeArray customDataTypes = {NULL, 1, &PointType, UA_FALSE};
 
 typedef struct {
     UA_Int16 a;
@@ -129,7 +129,7 @@ static const UA_DataType OptType = {
         Opt_members
 };
 
-const UA_DataTypeArray customDataTypesOptStruct = {&customDataTypes, 2, &OptType};
+const UA_DataTypeArray customDataTypesOptStruct = {&customDataTypes, 2, &OptType, UA_FALSE};
 
 typedef struct {
     UA_String description;
@@ -178,7 +178,7 @@ static const UA_DataType ArrayOptType = {
     ArrayOptStruct_members
 };
 
-const UA_DataTypeArray customDataTypesOptArrayStruct = {&customDataTypesOptStruct, 3, &ArrayOptType};
+const UA_DataTypeArray customDataTypesOptArrayStruct = {&customDataTypesOptStruct, 3, &ArrayOptType, UA_FALSE};
 
 typedef enum {UA_UNISWITCH_NONE = 0, UA_UNISWITCH_OPTIONA = 1, UA_UNISWITCH_OPTIONB = 2} UA_UniSwitch;
 
@@ -219,7 +219,7 @@ static const UA_DataType UniType = {
         Uni_members
 };
 
-const UA_DataTypeArray customDataTypesUnion = {&customDataTypesOptArrayStruct, 2, &UniType};
+const UA_DataTypeArray customDataTypesUnion = {&customDataTypesOptArrayStruct, 2, &UniType, UA_FALSE};
 
 typedef enum {
     UA_SELFCONTAININGUNIONSWITCH_NONE = 0,
@@ -270,7 +270,7 @@ const UA_DataType selfContainingUnionType = {
     SelfContainingUnion_members  /* .members */
 };
 
-const UA_DataTypeArray customDataTypesSelfContainingUnion = {NULL, 1, &selfContainingUnionType};
+const UA_DataTypeArray customDataTypesSelfContainingUnion = {NULL, 1, &selfContainingUnionType, UA_FALSE};
 
 START_TEST(parseCustomScalar) {
     Point p;
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
index c3ca52680a9..3f78e123708 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
@@ -14,7 +14,7 @@
 #include "unistd.h"
 
 UA_Server *server = NULL;
-UA_DataTypeArray customTypesArray = { NULL, UA_TYPES_TESTS_TESTNODESET_COUNT, UA_TYPES_TESTS_TESTNODESET};
+UA_DataTypeArray customTypesArray = { NULL, UA_TYPES_TESTS_TESTNODESET_COUNT, UA_TYPES_TESTS_TESTNODESET, UA_FALSE};
 UA_UInt16 testNamespaceIndex = (UA_UInt16) -1;
 
 static void setup(void) {
diff --git a/tests/nodeset-loader/CMakeLists.txt b/tests/nodeset-loader/CMakeLists.txt
new file mode 100644
index 00000000000..e5cd09096f4
--- /dev/null
+++ b/tests/nodeset-loader/CMakeLists.txt
@@ -0,0 +1,13 @@
+####################################################
+# Test nodeset loader on a subset of nodeset files #
+####################################################
+
+if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+    add_compile_definitions(OPEN62541_NODESET_DIR="${UA_NODESET_DIR}/")
+    ua_add_test(check_nodeset_loader_di.c)
+    ua_add_test(check_nodeset_loader_adi.c)
+    ua_add_test(check_nodeset_loader_autoid.c)
+    ua_add_test(check_nodeset_loader_plc.c)
+    ua_add_test(check_nodeset_loader_input.c)
+    ua_add_test(check_nodeset_loader_ua_nodeset.c)
+endif()
diff --git a/tests/nodeset-loader/check_nodeset_loader_adi.c b/tests/nodeset-loader/check_nodeset_loader_adi.c
new file mode 100644
index 00000000000..e30104ee232
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_adi.c
@@ -0,0 +1,57 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+#include "check.h"
+#include "testing_clock.h"
+
+UA_Server *server = NULL;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_loadDiNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadAdiNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "ADI/Opc.Ua.Adi.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Loader");
+    TCase *tc_server = tcase_create("Server DI and ADI nodeset");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, Server_loadDiNodeset);
+    tcase_add_test(tc_server, Server_loadAdiNodeset);
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/nodeset-loader/check_nodeset_loader_autoid.c b/tests/nodeset-loader/check_nodeset_loader_autoid.c
new file mode 100644
index 00000000000..57527a993cb
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_autoid.c
@@ -0,0 +1,57 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+#include "check.h"
+#include "testing_clock.h"
+
+UA_Server *server = NULL;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_loadDiNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadAutoIDNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "AutoID/Opc.Ua.AutoID.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Loader");
+    TCase *tc_server = tcase_create("Server DI and AutoID nodeset");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, Server_loadDiNodeset);
+    tcase_add_test(tc_server, Server_loadAutoIDNodeset);
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/nodeset-loader/check_nodeset_loader_di.c b/tests/nodeset-loader/check_nodeset_loader_di.c
new file mode 100644
index 00000000000..c8d3f4350e4
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_di.c
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+#include "check.h"
+#include "testing_clock.h"
+
+UA_Server *server = NULL;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_loadDiNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Loader");
+    TCase *tc_server = tcase_create("Server DI nodeset");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, Server_loadDiNodeset);
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/nodeset-loader/check_nodeset_loader_input.c b/tests/nodeset-loader/check_nodeset_loader_input.c
new file mode 100644
index 00000000000..e79cbac44c1
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_input.c
@@ -0,0 +1,61 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+#include "check.h"
+#include "testing_clock.h"
+
+UA_Server *server = NULL;
+char **nodesetPaths = NULL;
+int nodesetsNum = 0;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_loadInputNodesets) {
+    for (int cnt = 0; cnt < nodesetsNum; cnt++) {
+        bool retVal = UA_Server_loadNodeset(server, nodesetPaths[cnt], NULL);
+        ck_assert_uint_eq(retVal, true);
+    }
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Loader");
+    TCase *tc_server = tcase_create("Server load input nodesets");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, Server_loadInputNodesets);
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(int argc, char *argv[]) {
+    if (argc < 2) {
+        nodesetPaths = (char**)malloc(sizeof(char*));
+        nodesetPaths[0] = OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml";
+        nodesetsNum = 1;
+    }
+    else {
+        nodesetPaths = &argv[1];
+        nodesetsNum = argc - 1;
+    }
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/nodeset-loader/check_nodeset_loader_plc.c b/tests/nodeset-loader/check_nodeset_loader_plc.c
new file mode 100644
index 00000000000..062a040ca60
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_plc.c
@@ -0,0 +1,57 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+#include "check.h"
+#include "testing_clock.h"
+
+UA_Server *server = NULL;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_loadDiNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlcNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Loader");
+    TCase *tc_server = tcase_create("Server DI and PLCopen nodeset");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, Server_loadDiNodeset);
+    tcase_add_test(tc_server, Server_loadPlcNodeset);
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
new file mode 100644
index 00000000000..a019611f10b
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
@@ -0,0 +1,1231 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Test case for all standardized companion nodesets. You can
+ * find the specifications at https://github.com/OPCFoundation/UA-Nodeset.
+ *      - branch: latest
+ *      - commit: a2208e8
+ * 
+ * Currently this test case is missing the following UA-Nodesets:
+ *    * NodesetLoader related issues:
+ *      - ${OPEN62541_NODESET_DIR}AML/Opc.Ua.AMLLibraries.NodeSet2.xml
+ *      - ${OPEN62541_NODESET_DIR}ISA95-JOBCONTROL/opc.ua.isa95-jobcontrol.nodeset2.xml
+ *      - ${OPEN62541_NODESET_DIR}PNRIO/Opc.Ua.PnRio.Nodeset2.xml
+ *      - ${OPEN62541_NODESET_DIR}TMC/Opc.Ua.TMC.NodeSet2.xml
+ *
+ *    * Memory leak issues (libXML2 library related):
+ *      - ${OPEN62541_NODESET_DIR}CNC/Opc.Ua.CNC.NodeSet.xml
+ *      - ${OPEN62541_NODESET_DIR}IJT/Tightening/Opc.Ua.Ijt.Tightening.NodeSet2.xml
+ *      - $(OPEN62541_NODESET_DIR)MachineVision/Opc.Ua.MachineVision.NodeSet2.xml
+ *      - $(OPEN62541_NODESET_DIR)Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml
+ *          - Dependent Nodesets:
+ *              * $(OPEN62541_NODESET_DIR)Mining/DevelopmentSupport/Dozer/1.0.0/Opc.Ua.Mining.DevelopmentSupport.Dozer.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/DevelopmentSupport/RoofSupportSystem/1.0.0/Opc.Ua.Mining.DevelopmentSupport.RoofSupportSystem.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/Extraction/ShearerLoader/1.0.0/Opc.Ua.Mining.Extraction.ShearerLoader.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/Loading/General/1.0.0/Opc.Ua.Mining.Loading.General.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/Loading/HydraulicExcavator/1.0.0/Opc.Ua.Mining.Loading.HydraulicExcavator.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/MineralProcessing/RockCrusher/1.0.0/Opc.Ua.Mining.MineralProcessing.RockCrusher.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/PELOServices/FaceAlignmentSystem/1.0.0/Opc.Ua.Mining.PELOServices.FaceAlignmentSystem.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/PELOServices/General/1.0.0/Opc.Ua.Mining.PELOServices.General.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/TransportDumping/ArmouredFaceConveyor/1.0.0/Opc.Ua.Mining.TransportDumping.ArmouredFaceConveyor.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/TransportDumping/General/1.0.0/Opc.Ua.Mining.TransportDumping.General.NodeSet2.xml
+ *              * $(OPEN62541_NODESET_DIR)Mining/TransportDumping/RearDumpTruck/1.0.0/Opc.Ua.Mining.TransportDumping.RearDumpTruck.NodeSet2.xml
+ *      - $(OPEN62541_NODESET_DIR)PADIM/Opc.Ua.IRDI.NodeSet2.xml
+ *          - Dependent Nodesets:
+ *              * $(OPEN62541_NODESET_DIR)PADIM/Opc.Ua.PADIM.NodeSet2.xml
+ *      - $(OPEN62541_NODESET_DIR)POWERLINK/Opc.Ua.POWERLINK.NodeSet2.xml
+ *      - $(OPEN62541_NODESET_DIR)Pumps/Opc.Ua.Pumps.NodeSet2.xml
+ *      - $(OPEN62541_NODESET_DIR)Scales/Opc.Ua.Scales.NodeSet2.xml
+ */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+#include "check.h"
+#include "testing_clock.h"
+
+UA_Server *server = NULL;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_loadADINodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "ADI/Opc.Ua.Adi.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadAMBNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "AMB/Opc.Ua.AMB.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadAMLBaseTypesNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "AML/Opc.Ua.AMLBaseTypes.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadAutoIDNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "AutoID/Opc.Ua.AutoID.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadCASNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "CAS/Opc.Ua.CAS.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadCommercialKitchenEquipmentNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "CommercialKitchenEquipment/Opc.Ua.CommercialKitchenEquipment.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadCSPPlusForMachineNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "CSPPlusForMachine/Opc.Ua.CSPPlusForMachine.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadDEXPINodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DEXPI/Opc.Ua.DEXPI.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadDINodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadDotNetNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DotNet/Opc.Ua.NodeSet.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadFDI5Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "FDI/Opc.Ua.Fdi5.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadFDI7Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "FDI/Opc.Ua.Fdi7.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadFDTNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "FDT/Opc.Ua.FDT.NodeSet.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadGDSNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "GDS/Opc.Ua.Gds.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadServer_loadGDSPart12Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "GDS/Opc.Ua.Gds.NodeSet2.Part12.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadServer_loadGlassNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Glass/Flat/Opc.Ua.Glass.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadI4AASNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "I4AAS/Opc.Ua.I4AAS.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadIANodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "IA/Opc.Ua.IA.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadIAExamplesNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "IA/Opc.Ua.IA.NodeSet2.examples.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadIEC61850_6_Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "IEC61850/Opc.Ua.IEC61850-6.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadIEC61850_7_3_Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "IEC61850/Opc.Ua.IEC61850-7-3.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadIEC61850_7_4_Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "IEC61850/Opc.Ua.IEC61850-7-4.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadIOLinkIODDNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "IOLink/Opc.Ua.IOLinkIODD.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadIOLinkNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "IOLink/Opc.Ua.IOLink.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadISA95Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "ISA-95/Opc.ISA95.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMachineryNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Machinery/Opc.Ua.Machinery.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMachineryExamplesNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Machinery/Opc.Ua.Machinery.Examples.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMachineToolNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "MachineTool/Opc.Ua.MachineTool.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMDISNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "MDIS/Opc.MDIS.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMiningDevelopmentSupportGeneralNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "Mining/DevelopmentSupport/General/1.0.0/Opc.Ua.Mining.DevelopmentSupport.General.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMiningExtractionGeneralNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "Mining/Extraction/General/1.0.0/Opc.Ua.Mining.Extraction.General.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMiningMineralProcessingGeneralNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "Mining/MineralProcessing/General/1.0.0/Opc.Ua.Mining.MineralProcessing.General.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMiningMonitoringSupervisionServicesGeneralNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "Mining/MonitoringSupervisionServices/General/1.0.0/Opc.Ua.Mining.MonitoringSupervisionServices.General.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadMTConnectNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "MTConnect/Opc.Ua.MTConnect.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadOPENSCSNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "OpenSCS/Opc.Ua.OPENSCS.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPackMLNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "PackML/Opc.Ua.PackML.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionCalenderNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/Calender/1.00/Opc.Ua.PlasticsRubber.Extrusion.Calender.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionCalibratorNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/Calibrator/1.00/Opc.Ua.PlasticsRubber.Extrusion.Calibrator.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionCorrugatorNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/Corrugator/1.00/Opc.Ua.PlasticsRubber.Extrusion.Corrugator.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionCutterNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/Cutter/1.00/Opc.Ua.PlasticsRubber.Extrusion.Cutter.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionDieNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/Die/1.00/Opc.Ua.PlasticsRubber.Extrusion.Die.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionExtruderNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/Extruder/1.00/Opc.Ua.PlasticsRubber.Extrusion.Extruder.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionExtrusionLineNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/ExtrusionLine/1.00/Opc.Ua.PlasticsRubber.Extrusion.ExtrusionLine.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionFilterNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/Filter/1.00/Opc.Ua.PlasticsRubber.Extrusion.Filter.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_1_Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/GeneralTypes/1.01/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionHaulOffNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/HaulOff/1.00/Opc.Ua.PlasticsRubber.Extrusion.HaulOff.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionMeltPumpNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/MeltPump/1.00/Opc.Ua.PlasticsRubber.Extrusion.MeltPump.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionPelletizerNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion/Pelletizer/1.00/Opc.Ua.PlasticsRubber.Extrusion.Pelletizer.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2CalenderNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/Calender/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Calender.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2CalibratorNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/Calibrator/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Calibrator.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2CorrugatorNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/Corrugator/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Corrugator.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2CutterNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/Cutter/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Cutter.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2DieNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/Die/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Die.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2ExtruderNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/Extruder/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Extruder.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2ExtrusionLineNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/ExtrusionLine/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.ExtrusionLine.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2FilterNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/Filter/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Filter.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2HaulOffNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/HaulOff/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.HaulOff.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2MeltPumpNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/MeltPump/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.MeltPump.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberExtrusionv2PelletizerNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/Extrusion_v2/Pelletizer/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Pelletizer.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberHotRunnerNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/HotRunner/1.00/Opc.Ua.PlasticsRubber.HotRunner.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberIMM2MESNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/IMM2MES/1.01/Opc.Ua.PlasticsRubber.IMM2MES.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberLDSNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR 
+        "PlasticsRubber/LDS/1.00/Opc.Ua.PlasticsRubber.LDS.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPlasticsRubberTCDNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
+        "PlasticsRubber/TCD/1.01/Opc.Ua.PlasticsRubber.TCD.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPLCopenNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPnEmNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "PNEM/Opc.Ua.PnEm.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadPROFINETNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "PROFINET/Opc.Ua.Pn.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadRoboticsNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Robotics/Opc.Ua.Robotics.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadSafetyNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Safety/Opc.Ua.Safety.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadSercosNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Sercos/Sercos.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadWeihenstephanNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Weihenstephan/Opc.Ua.Weihenstephan.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadWoodworkingEumaboisNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Woodworking/Opc.Ua.Eumabois.Nodeset2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadWoodworkingNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "Woodworking/Opc.Ua.Woodworking.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Loader");
+    {
+        TCase *tc_server = tcase_create("Server load ADI nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadADINodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load AMB nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadAMBNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load AMLBaseTypes nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadAMLBaseTypesNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load AutoID nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadAutoIDNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load CAS nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadIANodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadCASNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load CommercialKitchenEquipment nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadCommercialKitchenEquipmentNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load CSPPlusForMachine nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadCSPPlusForMachineNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load DEXPI nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDEXPINodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load DI nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load DotNet nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDotNetNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load FDI5 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadFDI5Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load FDI7 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadFDI7Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load FDT nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadFDTNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load GDS nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadGDSNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load GDSPart12 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadServer_loadGDSPart12Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load Glass nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadServer_loadGlassNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load I4AAS nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadI4AASNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load IA nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadIANodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load IAExamples nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadIANodeset);
+        tcase_add_test(tc_server, Server_loadIAExamplesNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load IEC61850-6 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadIEC61850_7_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadIEC61850_6_Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load IEC61850-7-3 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadIEC61850_7_3_Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load IEC61850-7-4 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadIEC61850_7_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadIEC61850_7_4_Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load IOLinkIODD nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadIOLinkIODDNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load IOLink nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadIOLinkNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load ISA95 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadISA95Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load Machinery nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load MachineryExamples nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadMachineryExamplesNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load MachineTool nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadIANodeset);
+        tcase_add_test(tc_server, Server_loadMachineToolNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load MDIS nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadMDISNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load MiningDevelopmentSupportGeneral nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadMiningDevelopmentSupportGeneralNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load MiningExtractionGeneral nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadMiningExtractionGeneralNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load MiningMineralProcessingGeneral nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadMiningMineralProcessingGeneralNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load MiningMonitoringSupervisionServicesGeneral nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadMiningMonitoringSupervisionServicesGeneralNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load MTConnect nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadMTConnectNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load OPENSCS nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadOPENSCSNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PackML nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadPackMLNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionCalender nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_1_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionCalenderNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionCalibrator nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionCalibratorNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionCorrugator nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionHaulOffNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionCorrugatorNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionCutter nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionCutterNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionDie nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionDieNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionExtruder nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionExtruderNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionExtrusionLine nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionExtrusionLineNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionFilter nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionFilterNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionGeneralTypes v1.00 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionGeneralTypes v1.01 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_1_Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionHaulOff nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionHaulOffNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionMeltPump nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionMeltPumpNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionPelletizer nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionPelletizerNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2Calender nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2CalenderNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2Calibrator nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2CalibratorNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2Corrugator nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2HaulOffNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2CorrugatorNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2Cutter nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2CutterNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2Die nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2DieNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2Extruder nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2ExtruderNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2ExtrusionLine nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2ExtrusionLineNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2Filter nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2FilterNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2GeneralTypes nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2HaulOff nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2HaulOffNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2MeltPump nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2MeltPumpNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberExtrusionv2Pelletizer nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberExtrusionv2PelletizerNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberGeneralTypes v1.02 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberGeneralTypes v1.03 nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberHotRunner nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberHotRunnerNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberIMM2MES nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberIMM2MESNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberLDS nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberLDSNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PlasticsRubberTCD nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset);
+        tcase_add_test(tc_server, Server_loadPlasticsRubberTCDNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PLCopen nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPLCopenNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PNEM nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPnEmNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load PROFINET nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadPROFINETNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load Robotics nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadRoboticsNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load Safety nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadSafetyNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load Sercos nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadSercosNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load Weihenstephan nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadPackMLNodeset);
+        tcase_add_test(tc_server, Server_loadWeihenstephanNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load WoodworkingEumabois nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadWoodworkingNodeset);
+        tcase_add_test(tc_server, Server_loadWoodworkingEumaboisNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    {
+        TCase *tc_server = tcase_create("Server load Woodworking nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadMachineryNodeset);
+        tcase_add_test(tc_server, Server_loadWoodworkingNodeset);
+        suite_add_tcase(s, tc_server);
+    }
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/server/check_local_monitored_item.c b/tests/server/check_local_monitored_item.c
index 57cfa0c6829..21c360a67ae 100644
--- a/tests/server/check_local_monitored_item.c
+++ b/tests/server/check_local_monitored_item.c
@@ -148,7 +148,7 @@ static UA_DataType PointType = {
     members
 };
 
-UA_DataTypeArray customDataTypes = {NULL, 1, &PointType};
+UA_DataTypeArray customDataTypes = {NULL, 1, &PointType, UA_FALSE};
 
 START_TEST(Server_LocalMonitoredItem_CustomType) {
     callbackCount = 0;
diff --git a/tools/nodeset_compiler/backend_open62541.py b/tools/nodeset_compiler/backend_open62541.py
index edefe1f9194..60a6fb65708 100644
--- a/tools/nodeset_compiler/backend_open62541.py
+++ b/tools/nodeset_compiler/backend_open62541.py
@@ -292,7 +292,8 @@ def writec(line):
         writec("\nstatic UA_DataTypeArray custom" + arr + " = {")
         writec("    NULL,")
         writec("    " + arr + "_COUNT,")
-        writec("    " + arr + "\n};")
+        writec("    " + arr + ",")
+        writec("    UA_FALSE\n};")
 
     writec("""
 UA_StatusCode %s(UA_Server *server) {

From 4c27233da968b00f1f2e136cb6e1754717662053 Mon Sep 17 00:00:00 2001
From: Muddasir shakil <30407857+Muddasir-Shakil@users.noreply.github.com>
Date: Fri, 21 Oct 2022 13:56:53 +0200
Subject: [PATCH 0485/1963] feat(pubsub): SKS SecurityGroups (#5387)

A SecurityGroup is used to managed the security settings and keys by the SKS.
A type definition of security group is created which stores the security
configuration of the SecurityGroup and the reference to a keystorage.
---
 CMakeLists.txt                                |   1 +
 include/open62541/server_pubsub.h             |  57 +++
 src/pubsub/ua_pubsub.h                        |  40 ++
 src/pubsub/ua_pubsub_manager.c                |   8 +
 src/pubsub/ua_pubsub_manager.h                |   2 +
 src/pubsub/ua_pubsub_ns0.c                    | 119 ++++++
 src/pubsub/ua_pubsub_ns0.h                    |   9 +
 src/pubsub/ua_pubsub_securitygroup.c          | 345 +++++++++++++++++
 tests/CMakeLists.txt                          |   1 +
 .../pubsub/check_pubsub_sks_securitygroups.c  | 351 ++++++++++++++++++
 10 files changed, 933 insertions(+)
 create mode 100644 src/pubsub/ua_pubsub_securitygroup.c
 create mode 100644 tests/pubsub/check_pubsub_sks_securitygroups.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b728012444..3711f6b742c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1003,6 +1003,7 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_manager.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_ns0.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_keystorage.c
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_securitygroup.c
                 # services
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_view.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_method.c
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 46e52bd08a1..5d0184df903 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -877,6 +877,63 @@ UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, UA_NodeId readerGroup,
                                        UA_ByteString keyNonce);
 #endif
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+/**
+ * SecurityGroup
+ * -------------
+ *
+ * A SecurityGroup is an abstraction that represents the message security settings and
+ * security keys for a subset of NetworkMessages exchanged between Publishers and
+ * Subscribers. The SecurityGroup objects are created on a Security Key Service (SKS). The
+ * SKS manages the access to the keys based on the role permission for a user assigned to
+ * a SecurityGroup Object. A SecurityGroup is identified with a unique identifier called
+ * the SecurityGroupId. It is unique within the SKS.
+ *
+ * .. note:: The access to the SecurityGroup and therefore the securitykeys managed by SKS
+ *           requires management of Roles and Permissions in the SKS. The Role Permission
+ *           model is not supported at the time of writing. However, the access control plugin can
+ *           be used to create and manage role permission on SecurityGroup object.
+ */
+
+typedef struct {
+    UA_String securityGroupName;
+    UA_Duration keyLifeTime;
+    UA_String securityPolicyUri;
+    UA_UInt32 maxFutureKeyCount;
+    UA_UInt32 maxPastKeyCount;
+} UA_SecurityGroupConfig;
+
+/**
+ * @brief Creates a SecurityGroup object and add it to the list in PubSub Manager. If the
+ * information model is enabled then the SecurityGroup object Node is also created in the
+ * server. A keyStorage with initial list of keys is created with a SecurityGroup. A
+ * callback is added to new SecurityGroup which updates the keys periodically at each
+ * KeyLifeTime expire.
+ *
+ * @param server The server instance
+ * @param securityGroupFolderNodeId The parent node of the SecurityGroup. It must be of
+ * SecurityGroupFolderType
+ * @param securityGroupConfig The security settings of a SecurityGroup
+ * @param securityGroupNodeId The output nodeId of the new SecurityGroup
+ * @return UA_StatusCode The return status code
+ */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Server_addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
+                           const UA_SecurityGroupConfig *securityGroupConfig,
+                           UA_NodeId *securityGroupNodeId);
+
+/**
+ * @brief Removes the SecurityGroup from PubSub Manager. It removes the KeyStorage
+ * associated with the SecurityGroup from the server.
+ *
+ * @param server The server instance
+ * @param securityGroup The nodeId of the securityGroup to be removed
+ * @return UA_StatusCode The returned status code.
+ */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Server_removeSecurityGroup(UA_Server *server, const UA_NodeId securityGroup);
+
+#endif /* UA_ENABLE_PUBSUB_SKS */
 
 #endif /* UA_ENABLE_PUBSUB */
 
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 49a446d9b46..9eb0ecd7f5c 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -38,6 +38,9 @@ typedef struct UA_WriterGroup UA_WriterGroup;
 struct UA_ReaderGroup;
 typedef struct UA_ReaderGroup UA_ReaderGroup;
 
+struct UA_SecurityGroup;
+typedef struct UA_SecurityGroup UA_SecurityGroup;
+
 /**********************************************/
 /*            PublishedDataSet                */
 /**********************************************/
@@ -584,6 +587,43 @@ UA_StatusCode
 decodeNetworkMessageJson(UA_Server *server, UA_ByteString *buffer, size_t *pos,
                          UA_NetworkMessage *nm, UA_PubSubConnection *connection);
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+/*********************************************************/
+/*                    SecurityGroup                      */
+/*********************************************************/
+struct UA_SecurityGroup {
+    UA_String securityGroupId;
+    UA_SecurityGroupConfig config;
+    UA_PubSubKeyStorage *keyStorage;
+    UA_NodeId securityGroupNodeId;
+    UA_UInt64 callbackId;
+    UA_DateTime baseTime;
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    UA_NodeId securityGroupFolderId;
+#endif
+    TAILQ_ENTRY(UA_SecurityGroup) listEntry;
+};
+
+UA_StatusCode
+UA_SecurityGroupConfig_copy(const UA_SecurityGroupConfig *src,
+                            UA_SecurityGroupConfig *dst);
+
+/* finds the SecurityGroup within the server by SecurityGroup Name/Id*/
+UA_SecurityGroup *
+UA_SecurityGroup_findSGbyName(UA_Server *server, UA_String securityGroupName);
+
+/* finds the SecurityGroup within the server by NodeId*/
+UA_SecurityGroup *
+UA_SecurityGroup_findSGbyId(UA_Server *server, UA_NodeId identifier);
+
+void
+UA_SecurityGroup_delete(UA_SecurityGroup *securityGroup);
+
+void
+removeSecurityGroup(UA_Server *server, UA_SecurityGroup *securityGroup);
+
+#endif /* UA_ENABLE_PUBSUB_SKS */
+
 #endif /* UA_ENABLE_PUBSUB */
 
 _UA_END_DECLS
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 057cd7fa48b..e175bf8934a 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -778,6 +778,14 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
         UA_Server_removeStandaloneSubscribedDataSet(server, tmpSDS1->identifier);
     }
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+    /* Remove the SecurityGroups */
+    UA_SecurityGroup *tmpSG1, *tmpSG2;
+    TAILQ_FOREACH_SAFE(tmpSG1, &server->pubSubManager.securityGroups, listEntry, tmpSG2) {
+        removeSecurityGroup(server, tmpSG1);
+    }
+#endif
+
 #ifdef UA_ENABLE_PUBSUB_SKS
     /* Remove the keyStorages */
     UA_PubSubKeyStorage *ks, *ksTmp;
diff --git a/src/pubsub/ua_pubsub_manager.h b/src/pubsub/ua_pubsub_manager.h
index dcdbf09b86b..26981313f1f 100644
--- a/src/pubsub/ua_pubsub_manager.h
+++ b/src/pubsub/ua_pubsub_manager.h
@@ -58,6 +58,8 @@ typedef struct UA_PubSubManager {
 
 #ifdef UA_ENABLE_PUBSUB_SKS
     LIST_HEAD(PubSubKeyList, UA_PubSubKeyStorage) pubSubKeyList;
+    size_t securityGroupsSize;
+    TAILQ_HEAD(UA_ListOfSecurityGroup, UA_SecurityGroup) securityGroups;
 #endif
 
 #ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index cecb954aaed..0dc2df3babe 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1498,6 +1498,125 @@ addReaderGroupAction(UA_Server *server,
 }
 #endif
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+static UA_Boolean
+isValidParentNode(UA_Server *server, UA_NodeId parentId) {
+    UA_Boolean retval = UA_TRUE;
+    const UA_Node *parentNodeType;
+    const UA_NodeId parentNodeTypeId =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_SECURITYGROUPFOLDERTYPE);
+    const UA_Node *parentNode = UA_NODESTORE_GET(server, &parentId);
+
+    if(parentNode) {
+        parentNodeType = getNodeType(server, &parentNode->head);
+        if(parentNodeType) {
+            retval = UA_NodeId_equal(&parentNodeType->head.nodeId, &parentNodeTypeId);
+            UA_NODESTORE_RELEASE(server, parentNodeType);
+        }
+        UA_NODESTORE_RELEASE(server, parentNode);
+    }
+    return retval;
+}
+
+static UA_StatusCode
+updateSecurityGroupProperties(UA_Server *server, UA_NodeId *securityGroupNodeId,
+                              UA_SecurityGroupConfig *config) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_Variant value;
+    UA_Variant_init(&value);
+    UA_Variant_setScalar(&value, &config->securityGroupName, &UA_TYPES[UA_TYPES_STRING]);
+    retval = writeObjectProperty(server, *securityGroupNodeId,
+                                 UA_QUALIFIEDNAME(0, "SecurityGroupId"), value);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /*AddValueCallback*/
+    UA_Variant_setScalar(&value, &config->securityPolicyUri, &UA_TYPES[UA_TYPES_STRING]);
+    retval = writeObjectProperty(server, *securityGroupNodeId,
+                                 UA_QUALIFIEDNAME(0, "SecurityPolicyUri"), value);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    UA_Variant_setScalar(&value, &config->keyLifeTime, &UA_TYPES[UA_TYPES_DURATION]);
+    retval = writeObjectProperty(server, *securityGroupNodeId,
+                                 UA_QUALIFIEDNAME(0, "KeyLifetime"), value);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    UA_Variant_setScalar(&value, &config->maxFutureKeyCount, &UA_TYPES[UA_TYPES_UINT32]);
+    retval = writeObjectProperty(server, *securityGroupNodeId,
+                                 UA_QUALIFIEDNAME(0, "MaxFutureKeyCount"), value);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    UA_Variant_setScalar(&value, &config->maxPastKeyCount, &UA_TYPES[UA_TYPES_UINT32]);
+    retval = writeObjectProperty(server, *securityGroupNodeId,
+                                 UA_QUALIFIEDNAME(0, "MaxPastKeyCount"), value);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    return retval;
+}
+
+UA_StatusCode
+addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGroup) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+
+    UA_SecurityGroupConfig *securityGroupConfig = &securityGroup->config;
+    if(!isValidParentNode(server, securityGroup->securityGroupFolderId))
+        return UA_STATUSCODE_BADPARENTNODEIDINVALID;
+
+    if(securityGroupConfig->securityGroupName.length <= 0)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    size_t sgNamelength = securityGroupConfig->securityGroupName.length;
+    char *sgName = (char *)UA_malloc(sgNamelength);
+    if(!sgName)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    memset(sgName, 0, sgNamelength);
+    memcpy(sgName, securityGroupConfig->securityGroupName.data,
+           securityGroupConfig->securityGroupName.length);
+    sgName[securityGroupConfig->securityGroupName.length] = '\0';
+
+    UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
+    object_attr.displayName = UA_LOCALIZEDTEXT("", sgName);
+    UA_NodeId refType = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
+    UA_NodeId nodeType = UA_NODEID_NUMERIC(0, UA_NS0ID_SECURITYGROUPTYPE);
+    retval = addNode(
+        server, UA_NODECLASS_OBJECT, &UA_NODEID_NULL,
+        &securityGroup->securityGroupFolderId, &refType, UA_QUALIFIEDNAME(0, sgName),
+        &nodeType, (const UA_NodeAttributes *)&object_attr,
+        &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, &securityGroup->securityGroupNodeId);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Add SecurityGroup failed with error: %s.",
+                     UA_StatusCode_name(retval));
+        UA_free(sgName);
+        return retval;
+    }
+
+    retval = updateSecurityGroupProperties(server, &securityGroup->securityGroupNodeId,
+                                           securityGroupConfig);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Add SecurityGroup failed with error: %s.",
+                     UA_StatusCode_name(retval));
+        UA_removeSecurityGroupRepresentation(server, securityGroup);
+    }
+    return retval;
+}
+
+UA_StatusCode
+UA_removeSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGroup) {
+    UA_StatusCode retval = deleteNode(server, securityGroup->securityGroupNodeId, true);
+    return  retval;
+}
+#endif /* UA_ENABLE_PUBSUB_INFORMATIONMODEL*/
+#endif /* UA_ENABLE_PUBSUB_SKS */
+
 /**********************************************/
 /*               DataSetWriter                */
 /**********************************************/
diff --git a/src/pubsub/ua_pubsub_ns0.h b/src/pubsub/ua_pubsub_ns0.h
index 1ff29cbb200..2be49daae5b 100644
--- a/src/pubsub/ua_pubsub_ns0.h
+++ b/src/pubsub/ua_pubsub_ns0.h
@@ -5,6 +5,7 @@
  * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #ifndef UA_PUBSUB_NS0_H_
@@ -65,6 +66,14 @@ removeReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup);
 UA_StatusCode
 connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId standaloneSdsId);
 
+#ifdef UA_ENABLE_PUBSUB_SKS
+UA_StatusCode
+addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGroup);
+
+UA_StatusCode
+UA_removeSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGroup);
+#endif /* UA_ENABLE_PUBSUB_SKS */
+
 #endif /* UA_ENABLE_PUBSUB_INFORMATIONMODEL */
 
 _UA_END_DECLS
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
new file mode 100644
index 00000000000..cb735b97951
--- /dev/null
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -0,0 +1,345 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2019 ifak e.V. Magdeburg (Holger Zipper)
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/server_pubsub.h>
+
+#include "ua_pubsub_ns0.h"
+
+#ifdef UA_ENABLE_PUBSUB_SKS /* conditional compilation */
+
+#include "server/ua_server_internal.h"
+
+#define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
+
+UA_SecurityGroup *
+UA_SecurityGroup_findSGbyName(UA_Server *server, UA_String securityGroupName) {
+    UA_SecurityGroup *tmpSG;
+    TAILQ_FOREACH(tmpSG, &server->pubSubManager.securityGroups, listEntry) {
+        if(UA_String_equal(&securityGroupName, &tmpSG->config.securityGroupName))
+            return tmpSG;
+    }
+    return NULL;
+}
+
+UA_StatusCode
+UA_SecurityGroupConfig_copy(const UA_SecurityGroupConfig *src,
+                            UA_SecurityGroupConfig *dst) {
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
+    memcpy(dst, src, sizeof(UA_SecurityGroupConfig));
+    if(UA_String_copy(&src->securityGroupName, &dst->securityGroupName) !=
+       UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BAD;
+
+    if(UA_String_copy(&src->securityPolicyUri, &dst->securityPolicyUri) !=
+       UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BAD;
+    return retval;
+}
+
+static UA_StatusCode
+generateKeyData(const UA_PubSubSecurityPolicy *policy, UA_ByteString *key) {
+    if(!key || !policy)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_StatusCode retVal;
+
+    /* Can't not found in specification for pubsub key generation, so use the idea of
+     * securechannel, see specification 1.0.3 6.7.5 Deriving keys for more details
+     In pubsub we do get have OpenSecureChannel request, so we cannot have Client or Server Nonce*/
+    UA_Byte secretBytes[UA_PUBSUB_KEYMATERIAL_NONCELENGTH];
+    UA_ByteString secret;
+    secret.length = UA_PUBSUB_KEYMATERIAL_NONCELENGTH;
+    secret.data = secretBytes;
+
+    UA_Byte seedBytes[UA_PUBSUB_KEYMATERIAL_NONCELENGTH];
+    UA_ByteString seed;
+    seed.data = seedBytes;
+    seed.length = UA_PUBSUB_KEYMATERIAL_NONCELENGTH;
+    memset(seed.data, 0, seed.length);
+    retVal = policy->symmetricModule.generateNonce(policy->policyContext, &secret);
+    retVal |= policy->symmetricModule.generateNonce(policy->policyContext, &seed);
+    if(retVal != UA_STATUSCODE_GOOD)
+        return retVal;
+
+    retVal = policy->symmetricModule.generateKey(policy->policyContext, &secret, &seed, key);
+    return retVal;
+}
+
+static void
+updateSKSKeyStorage(UA_Server *server, UA_SecurityGroup *securityGroup){
+
+    if(!securityGroup) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_PUBSUB,
+                       "UpdateSKSKeyStorage callback failed with Error: %s ",
+                       UA_StatusCode_name(UA_STATUSCODE_BADINVALIDARGUMENT));
+        return;
+    }
+
+    UA_PubSubKeyStorage *keyStorage = securityGroup->keyStorage;
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_ByteString newKey;
+    size_t keyLength = keyStorage->policy->symmetricModule.secureChannelNonceLength;
+
+    retval = UA_ByteString_allocBuffer(&newKey, keyLength);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_PUBSUB,
+                       "UpdateSKSKeyStorage callback failed to allocate memory for new key with Error: %s ",
+                       UA_StatusCode_name(retval));
+        return;
+    }
+
+    generateKeyData(keyStorage->policy, &newKey);
+    UA_UInt32 newKeyID = TAILQ_LAST(&keyStorage->keyList, keyListItems)->keyID;
+
+    if(newKeyID >= UA_UINT32_MAX)
+        newKeyID = 1;
+    else
+        ++newKeyID;
+
+    if(keyStorage->keyListSize >= keyStorage->maxKeyListSize) {
+        /* reusing the preallocated memory of the oldest key */
+        /* the first item has the oldest key */
+        UA_PubSubKeyListItem *oldestKey = TAILQ_FIRST(&keyStorage->keyList);
+        /* shift head to second oldest */
+        TAILQ_INSERT_HEAD(&keyStorage->keyList, oldestKey->keyListEntry.tqe_next, keyListEntry);
+        /* move oldest to the tail */
+        TAILQ_INSERT_TAIL(&keyStorage->keyList, oldestKey, keyListEntry);
+        /* copy new key over the oldest key locatio */
+        oldestKey->keyID = newKeyID;
+        UA_ByteString_copy(&newKey, &oldestKey->key);
+    } else {
+        UA_PubSubKeyListItem *newItem =
+            UA_PubSubKeyStorage_push(keyStorage, &newKey, newKeyID);
+        if(!newItem) {
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_PUBSUB,
+                           "UpdateSKSKeyStorage callback failed to add new key to the "
+                           "sks keystorage for the SecurityGroup %.*s",
+                           (int)securityGroup->securityGroupId.length,
+                           securityGroup->securityGroupId.data);
+            UA_Byte_delete(newKey.data);
+            return;
+        }
+        keyStorage->keyListSize++;
+    }
+
+    UA_PubSubKeyListItem *nextCurrentItem = TAILQ_NEXT(keyStorage->currentItem, keyListEntry);
+    if(nextCurrentItem)
+        keyStorage->currentItem = nextCurrentItem;
+
+    securityGroup->baseTime = UA_DateTime_nowMonotonic();
+
+    /* We allocated memory for data with allocBuffer so now we free it */
+    UA_Byte_delete(newKey.data);
+    return;
+}
+
+static UA_StatusCode
+initializeKeyStorageWithKeys(UA_Server *server, UA_SecurityGroup *securityGroup) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    size_t keyLength;
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+
+    UA_ByteString futurekeys[securityGroup->config.maxFutureKeyCount];
+    UA_ByteString currentKey;
+    UA_UInt32 startingKeyId = 1;
+    UA_PubSubKeyStorage *ks = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+    if(!ks)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    securityGroup->keyStorage = ks;
+    retval = UA_PubSubKeyStorage_init(server, &securityGroup->securityGroupId,
+                                            &securityGroup->config.securityPolicyUri,
+                                            securityGroup->config.maxPastKeyCount,
+                                            securityGroup->config.maxFutureKeyCount, ks);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto error;
+
+    keyLength = ks->policy->symmetricModule.secureChannelNonceLength;
+    retval = UA_ByteString_allocBuffer(&currentKey, keyLength);
+    retval = generateKeyData(ks->policy, &currentKey);
+
+    for(size_t i = 0; i < securityGroup->config.maxFutureKeyCount; i++) {
+        retval = UA_ByteString_allocBuffer(&futurekeys[i], keyLength);
+        retval = generateKeyData(ks->policy, &futurekeys[i]);
+    }
+
+    retval = UA_PubSubKeyStorage_storeSecurityKeys(
+        server, securityGroup->keyStorage, startingKeyId, &currentKey, futurekeys,
+        securityGroup->config.maxFutureKeyCount, securityGroup->config.keyLifeTime);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto error;
+
+    securityGroup->baseTime = UA_DateTime_nowMonotonic();
+
+    retval = addRepeatedCallback(server, (UA_ServerCallback)updateSKSKeyStorage,
+                                 securityGroup, securityGroup->config.keyLifeTime,
+                                 &securityGroup->callbackId);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto error;
+
+    return retval;
+error:
+    UA_PubSubKeyStorage_delete(server, ks);
+    return retval;
+}
+
+static UA_StatusCode
+addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
+                           const UA_SecurityGroupConfig *securityGroupConfig,
+                           UA_NodeId *securityGroupNodeId) {
+    if(!securityGroupConfig)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    /*check minimal config parameters*/
+    if(!securityGroupConfig->keyLifeTime ||
+       UA_String_isEmpty(&securityGroupConfig->securityGroupName) ||
+       UA_String_isEmpty(&securityGroupConfig->securityPolicyUri))
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    if(UA_SecurityGroup_findSGbyName(server, securityGroupConfig->securityGroupName))
+        return UA_STATUSCODE_BADNODEIDEXISTS;
+
+    UA_PubSubSecurityPolicy *policy = NULL;
+    UA_Server_findPubSubSecurityPolicy(server, &securityGroupConfig->securityPolicyUri,
+                                       &policy);
+    if(!policy)
+        return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
+
+    if(securityGroupConfig->securityGroupName.length > 512)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+
+    UA_SecurityGroup *newSecurityGroup =
+        (UA_SecurityGroup *)UA_calloc(1, sizeof(UA_SecurityGroup));
+    if(!newSecurityGroup)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    memset(newSecurityGroup, 0, sizeof(UA_SecurityGroup));
+    UA_SecurityGroupConfig_copy(securityGroupConfig, &newSecurityGroup->config);
+
+    retval = UA_NodeId_copy(&securityGroupFolderNodeId,
+                            &newSecurityGroup->securityGroupFolderId);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_SecurityGroup_delete(newSecurityGroup);
+        return retval;
+    }
+
+    retval = UA_String_copy(&securityGroupConfig->securityGroupName,
+                            &newSecurityGroup->securityGroupId);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_SecurityGroup_delete(newSecurityGroup);
+        return retval;
+    }
+
+    retval = initializeKeyStorageWithKeys(server, newSecurityGroup);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_SecurityGroup_delete(newSecurityGroup);
+        return retval;
+    }
+
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    retval = addSecurityGroupRepresentation(server, newSecurityGroup);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Add SecurityGroup failed with error: %s.",
+                     UA_StatusCode_name(retval));
+        UA_SecurityGroup_delete(newSecurityGroup);
+        return retval;
+    }
+#else
+    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
+                                          &newSecurityGroup->securityGroupNodeId);
+#endif
+    if(securityGroupNodeId)
+        UA_NodeId_copy(&newSecurityGroup->securityGroupNodeId, securityGroupNodeId);
+
+    if(server->pubSubManager.securityGroupsSize == 0)
+        TAILQ_INIT(&server->pubSubManager.securityGroups);
+
+    TAILQ_INSERT_TAIL(&server->pubSubManager.securityGroups, newSecurityGroup,
+                          listEntry);
+
+    server->pubSubManager.securityGroupsSize++;
+    return retval;
+}
+
+UA_StatusCode
+UA_Server_addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
+                           const UA_SecurityGroupConfig *securityGroupConfig,
+                           UA_NodeId *securityGroupNodeId) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode retval = addSecurityGroup(server, securityGroupFolderNodeId,
+                                            securityGroupConfig, securityGroupNodeId);
+    UA_UNLOCK(&server->serviceMutex);
+    return retval;
+}
+
+UA_SecurityGroup *
+UA_SecurityGroup_findSGbyId(UA_Server *server, UA_NodeId identifier) {
+    UA_SecurityGroup *tmpSG;
+    TAILQ_FOREACH(tmpSG, &server->pubSubManager.securityGroups, listEntry) {
+        if(UA_NodeId_equal(&identifier, &tmpSG->securityGroupNodeId))
+            return tmpSG;
+    }
+    return NULL;
+}
+
+static void
+UA_SecurityGroupConfig_clear(UA_SecurityGroupConfig *config) {
+    config->keyLifeTime = 0;
+    config->maxFutureKeyCount = 0;
+    UA_String_clear(&config->securityGroupName);
+    UA_String_clear(&config->securityPolicyUri);
+}
+
+static void
+UA_SecurityGroup_clear(UA_SecurityGroup *securityGroup) {
+    UA_SecurityGroupConfig_clear(&securityGroup->config);
+    UA_String_clear(&securityGroup->securityGroupId);
+    UA_NodeId_clear(&securityGroup->securityGroupFolderId);
+    UA_NodeId_clear(&securityGroup->securityGroupNodeId);
+}
+
+void
+UA_SecurityGroup_delete(UA_SecurityGroup *securityGroup) {
+    UA_SecurityGroup_clear(securityGroup);
+    UA_free(securityGroup);
+}
+
+void
+removeSecurityGroup(UA_Server *server, UA_SecurityGroup *securityGroup) {
+
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    UA_removeSecurityGroupRepresentation(server, securityGroup);
+#endif
+    /* Unlink from the server */
+    TAILQ_REMOVE(&server->pubSubManager.securityGroups, securityGroup, listEntry);
+    server->pubSubManager.securityGroupsSize--;
+    if(securityGroup->callbackId > 0)
+        removeCallback(server, securityGroup->callbackId);
+
+    UA_PubSubKeyStorage_removeKeyStorage(server, securityGroup->keyStorage);
+
+    UA_SecurityGroup_delete(securityGroup);
+}
+
+UA_StatusCode
+UA_Server_removeSecurityGroup(UA_Server *server, const UA_NodeId securityGroup) {
+    UA_LOCK(&server->serviceMutex);
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroup);
+    if(!sg)
+        return UA_STATUSCODE_BADBOUNDNOTFOUND;
+    removeSecurityGroup(server, sg);
+    UA_UNLOCK(&server->serviceMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index de8f9b2b3d0..9ab660fb0d4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -321,6 +321,7 @@ if(UA_ENABLE_PUBSUB)
         if(UA_ENABLE_PUBSUB_SKS)
             ua_add_test(pubsub/check_pubsub_keystorage.c)
             ua_add_test(pubsub/check_pubsub_sks_push.c)
+            ua_add_test(pubsub/check_pubsub_sks_securitygroups.c)
         endif()
     endif()
 
diff --git a/tests/pubsub/check_pubsub_sks_securitygroups.c b/tests/pubsub/check_pubsub_sks_securitygroups.c
new file mode 100644
index 00000000000..6ba32afaf0a
--- /dev/null
+++ b/tests/pubsub/check_pubsub_sks_securitygroups.c
@@ -0,0 +1,351 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/server_config_default.h>
+#include <open62541/server_pubsub.h>
+
+#include "ua_pubsub.h"
+#include "ua_pubsub_keystorage.h"
+#include "ua_server_internal.h"
+
+#include <check.h>
+#include <testing_clock.h>
+
+#include "../encryption/certificates.h"
+#include "thread_wrapper.h"
+
+UA_Server *server = NULL;
+UA_Boolean running;
+
+static void
+securityGroup_setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    /* Instantiate the PubSub SecurityPolicy */
+    config->pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_calloc(2, sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 2;
+    UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
+                                      &config->logger);
+    UA_PubSubSecurityPolicy_Aes256Ctr(&config->pubSubConfig.securityPolicies[1],
+                                      &config->logger);
+
+    UA_Server_run_startup(server);
+}
+
+static void
+securityGroup_teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(AddSecurityGroupWithNullConfig) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    retval = UA_Server_addSecurityGroup(
+        server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS), NULL,
+        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADINVALIDARGUMENT);
+}
+END_TEST
+
+START_TEST(AddSecurityGroupWithInvalidKeyLifeTime) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 0;
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 10;
+    config.maxPastKeyCount = 5;
+    retval = UA_Server_addSecurityGroup(
+        server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS), &config,
+        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADINVALIDARGUMENT);
+}
+END_TEST
+
+START_TEST(AddSecurityGroupWithInvalidSecurityGroupName) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 2000;
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    config.securityGroupName = UA_STRING_NULL;
+    config.maxFutureKeyCount = 10;
+    config.maxPastKeyCount = 5;
+    retval = UA_Server_addSecurityGroup(
+        server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS), &config,
+        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADINVALIDARGUMENT);
+}
+END_TEST
+
+START_TEST(AddSecurityGroupWithInvalidPolicy) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 2000;
+    config.securityPolicyUri = UA_STRING_NULL;
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 10;
+    config.maxPastKeyCount = 5;
+    retval = UA_Server_addSecurityGroup(
+        server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS), &config,
+        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADINVALIDARGUMENT);
+
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#InvalidPolicy");
+    retval = UA_Server_addSecurityGroup(
+        server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS), &config,
+        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURITYPOLICYREJECTED);
+}
+END_TEST
+
+START_TEST(AddSecurityGroupWithInvalidSecurityGroupFolderNodeId) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 2000;
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 10;
+    config.maxPastKeyCount = 5;
+    retval =
+        UA_Server_addSecurityGroup(server, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                   &config, &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADPARENTNODEIDINVALID);
+}
+END_TEST
+
+START_TEST(AddSecurityGroupWithvalidConfig) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_NodeId securityGroupParent =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 2000;
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 10;
+    config.maxPastKeyCount = 5;
+
+    retval = UA_Server_addSecurityGroup(server, securityGroupParent, &config,
+                                        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
+    ck_assert_ptr_ne(sg, NULL);
+    ck_assert(UA_NodeId_equal(&sg->securityGroupNodeId, &securityGroupNodeId) == UA_TRUE);
+    ck_assert(UA_NodeId_equal(&sg->securityGroupFolderId, &securityGroupParent) ==
+              UA_TRUE);
+    ck_assert(UA_String_equal(&sg->securityGroupId, &config.securityGroupName) ==
+              UA_TRUE);
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    /*check properties*/
+    UA_Variant value;
+    UA_Variant_init(&value);
+    retval = UA_Server_readObjectProperty(server, securityGroupNodeId,
+                                          UA_QUALIFIEDNAME(0, "SecurityGroupId"), &value);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(value.type == &UA_TYPES[UA_TYPES_STRING]);
+    ck_assert(UA_String_equal(&config.securityGroupName, (UA_String *)value.data) ==
+              UA_TRUE);
+
+    UA_Variant_clear(&value);
+    retval = UA_Server_readObjectProperty(
+        server, securityGroupNodeId, UA_QUALIFIEDNAME(0, "SecurityPolicyUri"), &value);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(UA_String_equal(&config.securityPolicyUri, (UA_String *)value.data) ==
+              UA_TRUE);
+
+    UA_Variant_clear(&value);
+    retval = UA_Server_readObjectProperty(server, securityGroupNodeId,
+                                          UA_QUALIFIEDNAME(0, "KeyLifetime"), &value);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(config.keyLifeTime == *(UA_Duration *)value.data);
+
+    UA_Variant_clear(&value);
+    retval = UA_Server_readObjectProperty(
+        server, securityGroupNodeId, UA_QUALIFIEDNAME(0, "MaxFutureKeyCount"), &value);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(config.maxFutureKeyCount == *(UA_UInt32 *)value.data);
+
+    UA_Variant_clear(&value);
+    retval = UA_Server_readObjectProperty(server, securityGroupNodeId,
+                                          UA_QUALIFIEDNAME(0, "MaxPastKeyCount"), &value);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(config.maxPastKeyCount == *(UA_UInt32 *)value.data);
+#endif /*UA_ENABLE_PUBSUB_INFORMATIONMODEL */
+}
+END_TEST
+
+START_TEST(AddTwoSecurityGroupsWithSameSecurityGroupName) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 2000;
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 10;
+    config.maxPastKeyCount = 5;
+    retval = UA_Server_addSecurityGroup(
+        server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS), &config,
+        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    retval = UA_Server_addSecurityGroup(
+        server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS), &config,
+        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADNODEIDEXISTS);
+}
+END_TEST
+
+START_TEST(RemoveSecurityGroup) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_NodeId securityGroupParent =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 2000;
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 10;
+    config.maxPastKeyCount = 5;
+
+    retval = UA_Server_addSecurityGroup(server, securityGroupParent, &config,
+                                        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
+    ck_assert_ptr_ne(sg, NULL);
+
+    UA_Server_removeSecurityGroup(server, securityGroupNodeId);
+
+    sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
+    ck_assert_ptr_eq(sg, NULL);
+} END_TEST
+
+START_TEST(AddSecurityGroupWithKeyManagement){
+     UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_NodeId securityGroupParent =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 2000;
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 1;
+    config.maxPastKeyCount = 1;
+
+    retval = UA_Server_addSecurityGroup(server, securityGroupParent, &config,
+                                        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
+    ck_assert_ptr_ne(sg, NULL);
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, sg->securityGroupId);
+    ck_assert_ptr_ne(ks, NULL);
+    ck_assert_uint_eq(ks->keyListSize, 1 + config.maxFutureKeyCount);
+    UA_UInt32 expectKeyId = 1;
+    UA_PubSubKeyListItem *iterator = TAILQ_FIRST(&ks->keyList);
+    for (size_t i = 0; i < ks->keyListSize; i++) {
+        ck_assert_ptr_ne(iterator, NULL);
+        ck_assert_uint_eq(iterator->keyID, expectKeyId);
+        ck_assert(UA_ByteString_equal(&iterator->key, &UA_BYTESTRING_NULL) != UA_TRUE);
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+        expectKeyId++;
+    }
+} END_TEST
+
+START_TEST(SecurityGroupPeriodicInsertNewKeys){
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId securityGroupNodeId;
+    UA_NodeId securityGroupParent =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 500;
+    config.securityPolicyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR");
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 1;
+    config.maxPastKeyCount = 1;
+
+    retval = UA_Server_addSecurityGroup(server, securityGroupParent, &config,
+                                        &securityGroupNodeId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
+    ck_assert_ptr_ne(sg, NULL);
+    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, sg->securityGroupId);
+    ck_assert_ptr_ne(ks, NULL);
+
+    UA_UInt32 expectKeyId = 1;
+    UA_PubSubKeyListItem *preLastItem = TAILQ_LAST(&ks->keyList, keyListItems);
+    for (size_t i = 0; i < ks->keyListSize; i++) {
+        UA_fakeSleep(500);
+        UA_Server_run_iterate(server, false);
+        UA_PubSubKeyListItem *newlastItem = TAILQ_LAST(&ks->keyList, keyListItems);
+        ck_assert_uint_eq(ks->keyListSize, config.maxPastKeyCount + 1 + config.maxFutureKeyCount);
+        ck_assert_ptr_eq(preLastItem->keyListEntry.tqe_next, newlastItem);
+        ck_assert_uint_eq(preLastItem->keyID + 1 ,  newlastItem->keyID);
+        ck_assert(UA_ByteString_equal(&preLastItem->keyListEntry.tqe_next->key, &newlastItem->key) == UA_TRUE);
+        preLastItem = newlastItem;
+        expectKeyId++;
+    }
+} END_TEST
+int
+main(void) {
+    int number_failed = 0;
+    TCase *tc_pubsub_sks_securityGroup = tcase_create("PubSub SKS SecurityGroup");
+    tcase_add_checked_fixture(tc_pubsub_sks_securityGroup, securityGroup_setup,
+                              securityGroup_teardown);
+    tcase_add_test(tc_pubsub_sks_securityGroup, AddSecurityGroupWithvalidConfig);
+    tcase_add_test(tc_pubsub_sks_securityGroup, AddSecurityGroupWithNullConfig);
+    tcase_add_test(tc_pubsub_sks_securityGroup, AddSecurityGroupWithInvalidKeyLifeTime);
+    tcase_add_test(tc_pubsub_sks_securityGroup,
+                   AddSecurityGroupWithInvalidSecurityGroupName);
+    tcase_add_test(tc_pubsub_sks_securityGroup, AddSecurityGroupWithInvalidPolicy);
+    tcase_add_test(tc_pubsub_sks_securityGroup,
+                   AddSecurityGroupWithInvalidSecurityGroupFolderNodeId);
+    tcase_add_test(tc_pubsub_sks_securityGroup,
+                   AddTwoSecurityGroupsWithSameSecurityGroupName);
+    tcase_add_test(tc_pubsub_sks_securityGroup, RemoveSecurityGroup);
+    tcase_add_test(tc_pubsub_sks_securityGroup, AddSecurityGroupWithKeyManagement);
+    tcase_add_test(tc_pubsub_sks_securityGroup, SecurityGroupPeriodicInsertNewKeys);
+    Suite *s = suite_create("PubSub SKS SecurityGroups");
+    suite_add_tcase(s, tc_pubsub_sks_securityGroup);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 2b0342f251312fe723728de96ec1272dcc90c2b9 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 20 Oct 2022 14:23:39 +0200
Subject: [PATCH 0486/1963] refactor(pubsub): Overhaul of the reserveId
 function.

---
 src/pubsub/ua_pubsub_manager.c | 113 ++++++++++++++++-----------------
 1 file changed, 56 insertions(+), 57 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index e175bf8934a..96e1cf1f6d8 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -26,6 +26,7 @@
 #endif
 
 #define UA_DATETIMESTAMP_2000 125911584000000000
+#define UA_RESERVEID_FIRST_ID 0x8000
 
 static UA_PubSubTransportLayer *
 getTransportProtocolLayer(const UA_Server *server,
@@ -131,64 +132,60 @@ UA_ReserveId_new(UA_Server *server, UA_UInt16 id, UA_String transportProfileUri,
     return reserveId;
 }
 
-static UA_UInt16
-UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId, UA_String transportProfileUri, UA_ReserveIdType reserveIdType) {
-    const UA_UInt16 first_id = 0x8000;
-    const UA_UInt16 last_id = 0xFFFF;
-    UA_UInt16 next_id = first_id;
-    bool is_free = false;
-
+static UA_Boolean
+UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id, UA_String transportProfileUri, UA_ReserveIdType reserveIdType) {
     UA_PubSubManager *pubSubManager = &server->pubSubManager;
+
     UA_ReserveId *reserveId1;
-    /* It is checked whether the selected ID is already included in the reserved Ids */
-    while(!is_free) {
-        is_free = true;
-        LIST_FOREACH(reserveId1, &pubSubManager->reserveIds, listEntry){
-            if(UA_String_equal(&reserveId1->transportProfileUri, &transportProfileUri) && reserveId1->reserveIdType == reserveIdType && reserveId1->id == next_id) {
-                is_free = false;
-                next_id++;
-                break;
-            }
+    LIST_FOREACH(reserveId1, &pubSubManager->reserveIds, listEntry){
+        if(UA_String_equal(&reserveId1->transportProfileUri, &transportProfileUri) && reserveId1->reserveIdType == reserveIdType && reserveId1->id == id) {
+            return false;
         }
-        if(!is_free)
-            continue;
+    }
 
-        UA_PubSubConnection *tmpConnection;
-        if(reserveIdType == UA_WRITER_GROUP) {
-            TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry){
-                UA_WriterGroup *writerGroup;
-                LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
-                    if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) && writerGroup->config.writerGroupId == next_id) {
-                        is_free = false;
-                        next_id++;
-                        break;
-                    }
-                }
-                if(!is_free)
-                    break;
-            }
-        /* reserveIdType == UA_DATA_SET_WRITER */
-        } else {
-            TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry){
-                UA_WriterGroup *writerGroup;
-                LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry){
-                    UA_DataSetWriter *currentWriter;
-                    LIST_FOREACH(currentWriter, &writerGroup->writers, listEntry){
-                        if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) && currentWriter->identifier.identifierType == UA_NODEIDTYPE_NUMERIC && currentWriter->identifier.identifier.numeric == next_id) {
-                            is_free = false;
-                            next_id++;
-                            break;
-                        }
-                    }
-                    if(!is_free)
-                        break;
+    UA_PubSubConnection *tmpConnection;
+    TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry) {
+        UA_WriterGroup *writerGroup;
+        LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
+            if(reserveIdType == UA_WRITER_GROUP) {
+                if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) && writerGroup->config.writerGroupId == id)
+                    return false;
+            /* reserveIdType == UA_DATA_SET_WRITER */
+            } else {
+                UA_DataSetWriter *currentWriter;
+                LIST_FOREACH(currentWriter, &writerGroup->writers, listEntry) {
+                    if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) &&
+                    currentWriter->identifier.identifierType == UA_NODEIDTYPE_NUMERIC && currentWriter->identifier.identifier.numeric == id)
+                       return false;
                 }
-                if(!is_free)
-                    break;
             }
         }
-        if(!is_free && next_id == last_id)
+    }
+    return true;
+}
+
+static UA_UInt16
+UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId, UA_String transportProfileUri, UA_ReserveIdType reserveIdType) {
+    /* Total number of possible Ids */
+    UA_UInt16 numberOfIds = 0x8000;
+    /* Contains next possible free Id */
+    static UA_UInt16 next_id_writerGroup = UA_RESERVEID_FIRST_ID;
+    static UA_UInt16 next_id_writer = UA_RESERVEID_FIRST_ID;
+    UA_UInt16 next_id;
+    UA_Boolean is_free = false;
+
+    if(reserveIdType == UA_WRITER_GROUP)
+        next_id = next_id_writerGroup;
+    else
+        next_id = next_id_writer;
+
+    for(;numberOfIds > 0;numberOfIds--) {
+        if(next_id < UA_RESERVEID_FIRST_ID)
+            next_id = UA_RESERVEID_FIRST_ID;
+        is_free = UA_ReserveId_isFree(server, next_id, transportProfileUri, reserveIdType);
+        if(is_free)
             break;
+        next_id++;
     }
     if(!is_free) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -196,16 +193,17 @@ UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId, UA_String transpo
         return 0;
     }
 
+    if(reserveIdType == UA_WRITER_GROUP)
+        next_id_writerGroup = (UA_UInt16)(next_id + 1);
+    else
+        next_id_writer = (UA_UInt16)(next_id + 1);
+
     UA_ReserveId *reserveId = UA_ReserveId_new(server, next_id, transportProfileUri, reserveIdType, sessionId);
+    UA_PubSubManager *pubSubManager = &server->pubSubManager;
     if(reserveId != NULL) {
-        if (pubSubManager->reserveIdsSize != 0) {
-            LIST_INSERT_HEAD(&pubSubManager->reserveIds, reserveId, listEntry);
-        } else {
-            LIST_INIT(&pubSubManager->reserveIds);
-            LIST_INSERT_HEAD(&pubSubManager->reserveIds, reserveId, listEntry);
-        }
+        /* The reserveIds list is already initialized in the pubsubmanager_init. */
+        LIST_INSERT_HEAD(&pubSubManager->reserveIds, reserveId, listEntry);
         pubSubManager->reserveIdsSize++;
-
         return next_id;
     }
     return 0;
@@ -724,6 +722,7 @@ UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager) {
     }
     *ident = UA_Guid_random();
     pubSubManager->defaultPublisherId = *(UA_UInt64*)ident;
+    LIST_INIT(&pubSubManager->reserveIds);
     UA_free(ident);
 }
 

From 78b4d522c40e72ca81a3e8f908ac7dc08a9efc88 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 24 Oct 2022 00:38:17 +0200
Subject: [PATCH 0487/1963] feat(pubsub) check the maxStringLength in the
 pubsub path (#5365)

---
 examples/pubsub/tutorial_pubsub_publish_raw.c | 18 +++++++
 include/open62541/server_pubsub.h             |  2 +-
 src/pubsub/ua_pubsub_networkmessage.c         | 48 +++++++++++++++++--
 src/pubsub/ua_pubsub_networkmessage.h         |  2 +
 src/pubsub/ua_pubsub_reader.c                 | 10 ++++
 src/pubsub/ua_pubsub_writer.c                 | 16 ++++++-
 src/pubsub/ua_pubsub_writergroup.c            |  4 +-
 7 files changed, 89 insertions(+), 11 deletions(-)

diff --git a/examples/pubsub/tutorial_pubsub_publish_raw.c b/examples/pubsub/tutorial_pubsub_publish_raw.c
index 97d85670fa5..00249baedf9 100644
--- a/examples/pubsub/tutorial_pubsub_publish_raw.c
+++ b/examples/pubsub/tutorial_pubsub_publish_raw.c
@@ -128,6 +128,16 @@ addDataSetField(UA_Server *server) {
     UA_Server_addDataSetField(server, publishedDataSetIdent,
                               &dataSetFieldConfig, &dataSetFieldIdent);
 
+    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("String field");
+    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 1000);
+    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    dataSetFieldConfig.field.variable.maxStringLength = 50;
+    UA_Server_addDataSetField(server, publishedDataSetIdent,
+                              &dataSetFieldConfig, &dataSetFieldIdent);
+
     memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
     dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
     dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server StartTime");
@@ -290,6 +300,14 @@ static int run(UA_String *transportProfile,
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
 #endif
 
+    //add string variable to information model
+    UA_VariableAttributes variableAttributes = UA_VariableAttributes_default;
+    UA_String value = UA_STRING("hello world");
+    UA_Variant_setScalar(&variableAttributes.value, &value, &UA_TYPES[UA_TYPES_STRING]);
+    variableAttributes.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
+    UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 1000), UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                              UA_QUALIFIEDNAME(1, "publishNode"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), variableAttributes, NULL, NULL );
+
     //generic OPC UA configuration
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 5d0184df903..5ae843899a5 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -379,7 +379,7 @@ typedef struct{
         //TODO -> decide if suppress C++ warnings and use 'UA_DataValue * * const staticValueSource;'
         UA_DataValue ** staticValueSource;
     } rtValueSource;
-
+    UA_UInt32 maxStringLength;
 
 } UA_DataSetVariableConfig;
 
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 13f0b6e97a9..56cc461ce07 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1437,9 +1437,30 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
             }
         } else if(src->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
             for (UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
-                rv = UA_encodeBinaryInternal(src->data.keyFrameData.dataSetFields[i].value.data,
-                                             src->data.keyFrameData.dataSetFields[i].value.type,
-                                             bufPos, &bufEnd, NULL, NULL);
+                if(src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0 &&
+                   (src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_STRING ||
+                    src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_BYTESTRING)){
+                    // copy string with original length
+                    rv = UA_encodeBinaryInternal(src->data.keyFrameData.dataSetFields[i].value.data,
+                                                 src->data.keyFrameData.dataSetFields[i].value.type,
+                                                 bufPos, &bufEnd, NULL, NULL);
+                    // zero out overhanging
+                    size_t lengthDifference = src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength -
+                                              ((UA_String *) src->data.keyFrameData.dataSetFields[i].value.data)->length;
+                    memset(*bufPos, 0, lengthDifference);
+                    //move bus pos
+                    *bufPos += lengthDifference;
+                } else if (src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0 &&
+                           src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT){
+                    //currently not supported!
+                    rv = UA_encodeBinaryInternal(src->data.keyFrameData.dataSetFields[i].value.data,
+                                                 src->data.keyFrameData.dataSetFields[i].value.type,
+                                                 bufPos, &bufEnd, NULL, NULL);
+                } else {
+                    rv = UA_encodeBinaryInternal(src->data.keyFrameData.dataSetFields[i].value.data,
+                                                 src->data.keyFrameData.dataSetFields[i].value.type,
+                                                 bufPos, &bufEnd, NULL, NULL);
+                }
                 UA_CHECK_STATUS(rv, return rv);
             }
         } else if(src->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
@@ -1678,8 +1699,25 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
                     //count the memory size of the specific field
                     offsetBuffer->rawMessageLength += p->data.keyFrameData.dataSetFields[i].value.type->memSize;
                 }
-                size += UA_calcSizeBinary(p->data.keyFrameData.dataSetFields[i].value.data,
-                                          p->data.keyFrameData.dataSetFields[i].value.type);
+                if(p->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0){
+                    if(p->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_STRING ||
+                       p->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_BYTESTRING){
+                        size += UA_calcSizeBinary(p->data.keyFrameData.dataSetFields[i].value.data,
+                                                  p->data.keyFrameData.dataSetFields[i].value.type);
+                        //check if length < maxStringLength, The types ByteString and String are equal in their base definition
+                        size_t lengthDifference = p->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength -
+                            ((UA_String *) p->data.keyFrameData.dataSetFields[i].value.data)->length;
+                        size += lengthDifference;
+                    }
+                    if(p->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT){
+                        //currently not supported!
+                        size += UA_calcSizeBinary(p->data.keyFrameData.dataSetFields[i].value.data,
+                                                  p->data.keyFrameData.dataSetFields[i].value.type);
+                    }
+                } else {
+                    size += UA_calcSizeBinary(p->data.keyFrameData.dataSetFields[i].value.data,
+                                              p->data.keyFrameData.dataSetFields[i].value.type);
+                }
             }
         } else if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
             for (UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++) {
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index be1b6c07ae0..480dc5ef7f5 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -71,6 +71,8 @@ typedef struct {
     UA_ByteString rawFields;
     /* Json keys for the dataSetFields: TODO: own dataSetMessageType for json? */
     UA_String* fieldNames;
+    /* This information is for proper en- and decoding needed */
+    UA_DataSetMetaDataType *dataSetMetaDataType;
 } UA_DataSetMessage_DataKeyFrameData;
 
 typedef struct {
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 200724caefd..fa01c99861f 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -78,6 +78,7 @@ UA_PubSubDataSetReader_generateKeyFrameMessage(UA_Server *server,
     dataSetMessage->data.keyFrameData.fieldCount = (UA_UInt16) tv->targetVariablesSize;
     dataSetMessage->data.keyFrameData.dataSetFields = (UA_DataValue *)
             UA_Array_new(tv->targetVariablesSize, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    dataSetMessage->data.keyFrameData.dataSetMetaDataType = &dataSetReader->config.dataSetMetaData;
     if(!dataSetMessage->data.keyFrameData.dataSetFields)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
@@ -1044,6 +1045,15 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
         UA_StatusCode res =
             UA_decodeBinaryInternal(&msg->data.keyFrameData.rawFields,
                                     &offset, value, type, NULL);
+        if(dsr->config.dataSetMetaData.fields[i].maxStringLength != 0) {
+            if(type->typeKind == UA_DATATYPEKIND_STRING ||
+                type->typeKind == UA_DATATYPEKIND_BYTESTRING) {
+                UA_ByteString *bs = (UA_ByteString *) value;
+                //check if length < maxStringLength, The types ByteString and String are equal in their base definition
+                size_t lengthDifference = dsr->config.dataSetMetaData.fields[i].maxStringLength - bs->length;
+                offset += lengthDifference;
+            }
+        }
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_INFO_READER(&server->config.logger, dsr,
                                "Error during Raw-decode KeyFrame field %u: %s",
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 43c1e8b0eeb..7bb2f140654 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -331,10 +331,20 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
                              "MetaData creation: Found DataType %s",
                              currentDataType->typeName);
 #endif
-        /* Check if the datatype is a builtInType, if yes set the builtinType.
-         * TODO: Remove the magic number */
+        /* Check if the datatype is a builtInType, if yes set the builtinType. */
         if(currentDataType->typeKind <= UA_DATATYPEKIND_ENUM)
             fieldMetaData->builtInType = (UA_Byte)currentDataType->typeKind;
+        /* set the maxStringLength attribute */
+        if(field->config.field.variable.maxStringLength != 0){
+            if(currentDataType->typeKind == UA_DATATYPEKIND_BYTESTRING ||
+            currentDataType->typeKind == UA_DATATYPEKIND_STRING ||
+            currentDataType->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT) {
+                fieldMetaData->maxStringLength = field->config.field.variable.maxStringLength;
+            } else {
+                UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                                       "PubSub meta data generation: MaxStringLength with incompatible DataType configured.");
+            }
+        }
     } else {
         UA_LOG_WARNING_DATASET(&server->config.logger, pds,
                                "PubSub meta data generation: DataType is UA_NODEID_NULL");
@@ -1123,6 +1133,8 @@ UA_PubSubDataSetWriter_generateKeyFrameMessage(UA_Server *server,
     dataSetMessage->data.keyFrameData.fieldCount = currentDataSet->fieldSize;
     dataSetMessage->data.keyFrameData.dataSetFields = (UA_DataValue *)
             UA_Array_new(currentDataSet->fieldSize, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_PublishedDataSet *pds = UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
+    dataSetMessage->data.keyFrameData.dataSetMetaDataType = &pds->dataSetMetaData;
     if(!dataSetMessage->data.keyFrameData.dataSetFields)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index a3024199107..2771030efe4 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -362,10 +362,8 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
         goto cleanup_dsm;
 
     memset(&wg->bufferedMessage, 0, sizeof(UA_NetworkMessageOffsetBuffer));
-    UA_NetworkMessage_calcSizeBinary(&networkMessage, &wg->bufferedMessage);
+    msgSize = UA_NetworkMessage_calcSizeBinary(&networkMessage, &wg->bufferedMessage);
 
-    /* Allocate the buffer. Allocate on the stack if the buffer is small. */
-    msgSize = UA_NetworkMessage_calcSizeBinary(&networkMessage, NULL);
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     if(wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
         UA_PubSubSecurityPolicy *sp = wg->config.securityPolicy;

From 7840496755faa3e01852bb1f522215f92ed478f0 Mon Sep 17 00:00:00 2001
From: applea9 <9065075+applea9@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:47:17 +0800
Subject: [PATCH 0488/1963] feat(pubsub) support mqtt openssl mutual
 authentication (#5399)

---
 plugins/mqtt/ua_mqtt-c_adapter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index 9a59fe0a723..a90b689f06c 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -153,7 +153,7 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
 #endif
 #if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Extend condition when mbedTLS support is added
         /* open the non-blocking TCP socket (connecting to the broker) */
-        UA_StatusCode rv = open_nb_socket(&sockfd, &ctx, addr, port, mqttCaFilePath, NULL, NULL, NULL);;
+        UA_StatusCode rv = open_nb_socket(&sockfd, &ctx, addr, port, mqttCaFilePath, NULL, mqttClientCertPath, mqttClientKeyPath);
         if(rv != UA_STATUSCODE_GOOD){
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
             UA_free(mqttCaFilePath);

From 14cbf2a24be84cf0f7c3964be00aeebd5506a565 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:37:11 +0200
Subject: [PATCH 0489/1963] build(deps): bump deps/ua-nodeset from `a2208e8` to
 `54e3513` (#5398)

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `a2208e8` to `54e3513`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/a2208e8960453aabbfeacee94aee287292398f3a...54e35134bb6629789c017f82360e4fdc1577298b)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index a2208e89604..54e35134bb6 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit a2208e8960453aabbfeacee94aee287292398f3a
+Subproject commit 54e35134bb6629789c017f82360e4fdc1577298b

From 766f1ea5efcab78e25c017167f7980bf25e92101 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 22 Oct 2022 22:20:50 +0200
Subject: [PATCH 0490/1963] fix(plugin): Fix crash in OpenSSL when loaded with
 an empty certificate

---
 plugins/crypto/openssl/securitypolicy_openssl_common.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.c b/plugins/crypto/openssl/securitypolicy_openssl_common.c
index 7d5df9b6bcb..38587f6a390 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.c
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.c
@@ -911,6 +911,8 @@ EVP_PKEY *
 UA_OpenSSL_LoadPrivateKey(const UA_ByteString *privateKey) {
     const unsigned char * pkData = privateKey->data;
     long len = (long) privateKey->length;
+    if(len == 0)
+        return NULL;
 
     EVP_PKEY *result = NULL;
 

From 116600e6645539ba61d6b013ac8cfb17a0dbbd42 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 22 Oct 2022 22:27:38 +0200
Subject: [PATCH 0491/1963] refactor(core): Shorten the log message for
 SecureChannel

---
 src/server/ua_session.h | 2 +-
 src/ua_securechannel.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index 09e88553f69..246d92eeff0 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -140,7 +140,7 @@ UA_Session_dequeuePublishReq(UA_Session *session);
         UA_UInt32 chanId = ((SESSION) && (SESSION)->header.channel) ?   \
             (SESSION)->header.channel->securityToken.channelId : 0;     \
         UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_SESSION,                  \
-                       "TCP %lu\t| SecureChannel %" PRIu32 "\t| Session \"%.*s\"\t| " MSG "%.0s", \
+                       "TCP %lu\t| SC %" PRIu32 "\t| Session \"%.*s\"\t| " MSG "%.0s", \
                        sockId, chanId, nameLen, nameStr, __VA_ARGS__);   \
     }
 
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 53da9399919..e76f1e6a69a 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -343,7 +343,7 @@ signAndEncryptSym(UA_MessageContext *messageContext,
 #define UA_LOG_CHANNEL_INTERNAL(LOGGER, LEVEL, CHANNEL, MSG, ...)       \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
         UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_SECURECHANNEL,            \
-                       "TCP %lu\t| SecureChannel %" PRIu32 "\t| " MSG "%.0s", \
+                       "TCP %lu\t| SC %" PRIu32 "\t| " MSG "%.0s", \
                        (long unsigned)(CHANNEL)->connectionId,          \
                        (CHANNEL)->securityToken.channelId, __VA_ARGS__); \
     }

From 0ef900e6ce7fbf16cc2547bb71b60ddb7dda72c0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Oct 2022 01:49:49 +0200
Subject: [PATCH 0492/1963] refactor(server): Rename getSessionById

---
 src/server/ua_server_async.c           | 2 +-
 src/server/ua_server_internal.h        | 2 +-
 src/server/ua_server_ns0.c             | 2 +-
 src/server/ua_server_ns0_diagnostics.c | 4 ++--
 src/server/ua_services_session.c       | 2 +-
 src/server/ua_session.c                | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 13b91faf26a..1b5d9d825d8 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -23,7 +23,7 @@ UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
     /* Get the session */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_LOCK(&server->serviceMutex);
-    UA_Session* session = UA_Server_getSessionById(server, &ar->sessionId);
+    UA_Session* session = getSessionById(server, &ar->sessionId);
     UA_UNLOCK(&server->serviceMutex);
     UA_SecureChannel* channel = NULL;
     UA_ResponseHeader *responseHeader = NULL;
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index a6919000ca4..b6e3913aec7 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -259,7 +259,7 @@ UA_Session *
 getSessionByToken(UA_Server *server, const UA_NodeId *token);
 
 UA_Session *
-UA_Server_getSessionById(UA_Server *server, const UA_NodeId *sessionId);
+getSessionById(UA_Server *server, const UA_NodeId *sessionId);
 
 /*****************/
 /* Node Handling */
diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 1bd73f6457d..a223fa4d403 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -573,7 +573,7 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
 
     /* Get the Session */
     UA_LOCK(&server->serviceMutex);
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
+    UA_Session *session = getSessionById(server, sessionId);
     if(!session) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 6d7c5600bf8..e36985cd7c5 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -128,7 +128,7 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
     UA_Session *session = NULL;
     session_list_entry *sentry;
     if(nodeContext) {
-        session = UA_Server_getSessionById(server, sessionId);
+        session = getSessionById(server, sessionId);
         if(!session)
             return UA_STATUSCODE_BADINTERNALERROR;
         sdSize = session->subscriptionsSize;
@@ -329,7 +329,7 @@ readSessionDiagnostics(UA_Server *server,
                        UA_Boolean sourceTimestamp,
                        const UA_NumericRange *range, UA_DataValue *value) {
     /* Get the Session */
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
+    UA_Session *session = getSessionById(server, sessionId);
     if(!session)
         return UA_STATUSCODE_BADINTERNALERROR;
 
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index f37e9091c85..0369282c60b 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -153,7 +153,7 @@ getSessionByToken(UA_Server *server, const UA_NodeId *token) {
 }
 
 UA_Session *
-UA_Server_getSessionById(UA_Server *server, const UA_NodeId *sessionId) {
+getSessionById(UA_Server *server, const UA_NodeId *sessionId) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     session_list_entry *current = NULL;
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index ad53f4a6401..f62187e4171 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -275,7 +275,7 @@ UA_Server_setSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
     if(protectedAttribute(key))
         return UA_STATUSCODE_BADNOTWRITABLE;
     UA_LOCK(&server->serviceMutex);
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
+    UA_Session *session = getSessionById(server, sessionId);
     UA_StatusCode res = UA_STATUSCODE_BADSESSIONIDINVALID;
     if(session)
         res = UA_KeyValueMap_set(&session->attributes, &session->attributesSize,
@@ -290,7 +290,7 @@ UA_Server_deleteSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
     if(protectedAttribute(key))
         return UA_STATUSCODE_BADNOTWRITABLE;
     UA_LOCK(&server->serviceMutex);
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
+    UA_Session *session = getSessionById(server, sessionId);
     if(!session)
         return UA_STATUSCODE_BADSESSIONIDINVALID;
     UA_StatusCode res =
@@ -306,7 +306,7 @@ getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
     if(!outValue)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
+    UA_Session *session = getSessionById(server, sessionId);
     if(!session)
         return UA_STATUSCODE_BADSESSIONIDINVALID;
 

From 861458c4780869bcba02b3e2a8a6bb7f905982f0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Oct 2022 01:51:50 +0200
Subject: [PATCH 0493/1963] refactor(server): Internally expose methods to
 update method callbacks

---
 src/server/ua_server_internal.h         |  8 ++++++++
 src/server/ua_services_nodemanagement.c | 17 +++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index b6e3913aec7..3e42a9c5794 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -395,6 +395,14 @@ UA_StatusCode
 setVariableNode_dataSource(UA_Server *server, const UA_NodeId nodeId,
                            const UA_DataSource dataSource);
 
+UA_StatusCode
+setVariableNode_valueCallback(UA_Server *server, const UA_NodeId nodeId,
+                              const UA_ValueCallback callback);
+
+UA_StatusCode
+setMethodNode_callback(UA_Server *server, const UA_NodeId methodNodeId,
+                       UA_MethodCallback methodCallback);
+
 UA_StatusCode
 writeAttribute(UA_Server *server, UA_Session *session,
                const UA_NodeId *nodeId, const UA_AttributeId attributeId,
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index bbc12b1631a..3a34aeb30bf 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -21,11 +21,6 @@
 #include "ua_server_internal.h"
 #include "ua_services.h"
 
-static UA_StatusCode
-setMethodNode_callback(UA_Server *server,
-                       const UA_NodeId methodNodeId,
-                       UA_MethodCallback methodCallback);
-
 /*********************/
 /* Edit Node Context */
 /*********************/
@@ -2268,6 +2263,16 @@ setValueCallback(UA_Server *server, UA_Session *session,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+setVariableNode_valueCallback(UA_Server *server, const UA_NodeId nodeId,
+                              const UA_ValueCallback callback) {
+    return UA_Server_editNode(server, &server->adminSession, &nodeId,
+                              (UA_EditNodeCallback)setValueCallback,
+                              /* cast away const because
+                               * callback uses const anyway */
+                              (UA_ValueCallback *)(uintptr_t) &callback);
+}
+
 UA_StatusCode
 UA_Server_setVariableNode_valueCallback(UA_Server *server,
                                         const UA_NodeId nodeId,
@@ -2643,7 +2648,7 @@ editMethodCallback(UA_Server *server, UA_Session* session,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode
+UA_StatusCode
 setMethodNode_callback(UA_Server *server,
                        const UA_NodeId methodNodeId,
                        UA_MethodCallback methodCallback) {

From 7bae1226f4a87674985873dc64eff70ac61c122f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Oct 2022 01:53:04 +0200
Subject: [PATCH 0494/1963] refactor(server): Internally expose
 writeIsAbstractAttribute

---
 src/server/ua_server_internal.h    | 7 +++++++
 src/server/ua_services_attribute.c | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 3e42a9c5794..441dfa7d784 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -415,6 +415,13 @@ writeValueAttribute(UA_Server *server, UA_Session *session,
                           value, &UA_TYPES[UA_TYPES_VARIANT]);
 }
 
+static UA_INLINE UA_StatusCode
+writeIsAbstractAttribute(UA_Server *server, UA_Session *session,
+                         const UA_NodeId *nodeId, UA_Boolean value) {
+    return writeAttribute(server, session, nodeId, UA_ATTRIBUTEID_ISABSTRACT,
+                          &value, &UA_TYPES[UA_TYPES_BOOLEAN]);
+}
+
 UA_DataValue
 readAttribute(UA_Server *server, const UA_ReadValueId *item,
               UA_TimestampsToReturn timestamps);
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 69b708779ef..be9b6b600cc 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1542,7 +1542,7 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
 }
 
 static UA_StatusCode
-writeIsAbstractAttribute(UA_Node *node, UA_Boolean value) {
+writeIsAbstract(UA_Node *node, UA_Boolean value) {
     switch(node->head.nodeClass) {
     case UA_NODECLASS_OBJECTTYPE:
         node->objectTypeNode.isAbstract = value;
@@ -1690,7 +1690,7 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
     case UA_ATTRIBUTEID_ISABSTRACT:
         CHECK_USERWRITEMASK(UA_WRITEMASK_ISABSTRACT);
         CHECK_DATATYPE_SCALAR(BOOLEAN);
-        retval = writeIsAbstractAttribute(node, *(const UA_Boolean*)value);
+        retval = writeIsAbstract(node, *(const UA_Boolean*)value);
         break;
     case UA_ATTRIBUTEID_SYMMETRIC:
         CHECK_NODECLASS_WRITE(UA_NODECLASS_REFERENCETYPE);

From a6c53e5f7c9d23c3643a7d85d4b2e2762ab16830 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Oct 2022 01:54:06 +0200
Subject: [PATCH 0495/1963] refactor(server): Internally expose createEvent

---
 src/server/ua_server_internal.h     |  6 ++++++
 src/server/ua_subscription_events.c | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 441dfa7d784..993cd34e8d6 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -446,6 +446,11 @@ UA_Subscription *
 UA_Server_getSubscriptionById(UA_Server *server, UA_UInt32 subscriptionId);
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
+
+UA_StatusCode
+createEvent(UA_Server *server, const UA_NodeId eventType,
+            UA_NodeId *outNodeId);
+
 UA_StatusCode
 triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
              const UA_NodeId origin, UA_ByteString *outEventId,
@@ -459,6 +464,7 @@ filterEvent(UA_Server *server, UA_Session *session,
             UA_EventFieldList *efl, UA_EventFilterResult *result);
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS_EVENTS */
+
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
 UA_BrowsePathResult
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 774c63f46af..94e136fc646 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -29,14 +29,11 @@ generateEventId(UA_ByteString *generatedId) {
 }
 
 UA_StatusCode
-UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
-                      UA_NodeId *outNodeId) {
-    UA_LOCK(&server->serviceMutex);
+createEvent(UA_Server *server, const UA_NodeId eventType, UA_NodeId *outNodeId) {
     if(!outNodeId) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "outNodeId must not be NULL. The event's NodeId must be returned "
                      "so it can be triggered.");
-        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
@@ -46,7 +43,6 @@ UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
                                UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Event type must be a subtype of BaseEventType!");
-        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
@@ -69,7 +65,6 @@ UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Adding event failed. StatusCode %s", UA_StatusCode_name(retval));
-        UA_UNLOCK(&server->serviceMutex);
         return retval;
     }
 
@@ -81,7 +76,6 @@ UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
         UA_BrowsePathResult_clear(&bpr);
         deleteNode(server, newNodeId, true);
         UA_NodeId_clear(&newNodeId);
-        UA_UNLOCK(&server->serviceMutex);
         return retval;
     }
 
@@ -95,15 +89,22 @@ UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
     if(retval != UA_STATUSCODE_GOOD) {
         deleteNode(server, newNodeId, true);
         UA_NodeId_clear(&newNodeId);
-        UA_UNLOCK(&server->serviceMutex);
         return retval;
     }
 
     *outNodeId = newNodeId;
-    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
+                      UA_NodeId *outNodeId) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = createEvent(server, eventType, outNodeId);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 static UA_StatusCode
 eventSetStandardFields(UA_Server *server, const UA_NodeId *event,
                        const UA_NodeId *origin, UA_ByteString *outEventId) {

From a2cffda52c3e953b8cbbbcdaba60d748810c341b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Oct 2022 01:54:53 +0200
Subject: [PATCH 0496/1963] fix(server): Fix handling of empty browsepaths in
 EventFilters

---
 src/server/ua_subscription_events_filter.c    | 23 +++++++------------
 .../server/check_subscription_event_filter.c  |  4 ++--
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 439b9280bfb..b3e27c6fd06 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -1134,25 +1134,18 @@ UA_SimpleAttributeOperandValidation(UA_Server *server,
     if(sao->attributeId == 0 || sao->attributeId >= 28)
         return UA_STATUSCODE_BADATTRIBUTEIDINVALID;
 
-    /* BrowsePath not empty?
-     *
-     * TODO: Check the following workaround. In UaExpert Event View the
-     * selection of the Server Object set up 7 select filter entries by default.
-     * The last element ist from node 2782 (A&C ConditionType). Since the
-     * reduced information model dos not contain this type, the result has a
-     * browse path of "null" which results in an error. */
-    UA_NodeId ac_conditionType = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
-    if(!UA_NodeId_equal(&sao->typeDefinitionId, &ac_conditionType) &&
-       sao->browsePathSize == 0)
-        return UA_STATUSCODE_BADBROWSENAMEINVALID;
-
-    /* browsePath contains empty browsenames? */
+    /* If the BrowsePath is empty, the Node is the instance of the
+     * TypeDefinition. (Part 4, 7.4.4.5) */
+    if(sao->browsePathSize == 0)
+        return UA_STATUSCODE_GOOD;
+
+    /* BrowsePath contains empty BrowseNames? */
     for(size_t j = 0; j < sao->browsePathSize; ++j) {
         if(UA_QualifiedName_isNull(&sao->browsePath[j]))
             return UA_STATUSCODE_BADBROWSENAMEINVALID;
     }
 
-    /* Get the list of subtypes from event type (including the event type) */
+    /* Get the list of subtypes from event type (including the event type itself) */
     UA_ReferenceTypeSet reftypes_interface =
         UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASSUBTYPE);
     UA_ExpandedNodeId *childTypeNodes = NULL;
@@ -1188,7 +1181,7 @@ UA_SimpleAttributeOperandValidation(UA_Server *server,
             return UA_STATUSCODE_BADINDEXRANGEINVALID;
         UA_free(numericRange.dimensions);
 
-        /* AttributeId is value? */
+        /* AttributeId has to be a value if an IndexRange is defined */
         if(sao->attributeId != UA_ATTRIBUTEID_VALUE)
             return UA_STATUSCODE_BADTYPEMISMATCH;
     }
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index ed0884fca58..f214c3131f0 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -490,7 +490,7 @@ START_TEST(selectFilterValidation) {
     filter.selectClauses->browsePath = NULL;
     filter.selectClauses->browsePathSize = 0;
     createResult = addMonitoredItem(handler_events_simple, &filter, true);
-    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADBROWSENAMEINVALID);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
     UA_EventFilter_clear(&filter);
 } END_TEST
 
@@ -808,7 +808,7 @@ START_TEST(inListOperatorValidation) {
 static Suite *testSuite_Client(void) {
     Suite *s = suite_create("Server Subscription Event Filters");
     TCase *tc_server = tcase_create("Basic Event Filters");
-    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_checked_fixture(tc_server, setup, teardown);
     tcase_add_test(tc_server, selectFilterValidation);
     tcase_add_test(tc_server, notOperatorValidation);
     tcase_add_test(tc_server, ofTypeOperatorValidation);

From a7397f3341a525584932c1095817fed92648cdb3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Oct 2022 01:48:17 +0200
Subject: [PATCH 0497/1963] fix(server): Fix mt locking issue in
 ua_subscription_alarms_conditions.c

---
 .../ua_subscription_alarms_conditions.c       | 930 +++++++++++-------
 1 file changed, 597 insertions(+), 333 deletions(-)

diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index e57e62220de..24200878fec 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -192,7 +192,22 @@ static const UA_QualifiedName fieldExpirationLimitQN = STATIC_QN(CONDITION_FIELD
 
 static UA_StatusCode
 setConditionField(UA_Server *server, const UA_NodeId condition,
-                            const UA_Variant* value, const UA_QualifiedName fieldName);
+                  const UA_Variant* value, const UA_QualifiedName fieldName);
+
+static UA_StatusCode
+setConditionVariableFieldProperty(UA_Server *server, const UA_NodeId condition,
+                                  const UA_Variant* value,
+                                  const UA_QualifiedName variableFieldName,
+                                  const UA_QualifiedName variablePropertyName);
+
+static UA_StatusCode
+triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
+                      const UA_NodeId conditionSource, UA_ByteString *outEventId);
+
+static UA_StatusCode
+addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
+                          const UA_NodeId conditionType, const UA_QualifiedName fieldName,
+                          UA_NodeId *outOptionalNode);
 
 /*****************************************************************************/
 /* Global Variables                                                          */
@@ -204,6 +219,7 @@ static UA_NodeId refreshEvents[2] =
 
 static UA_ConditionSource *
 getConditionSource(UA_Server *server, const UA_NodeId *sourceId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_ConditionSource *cs;
     LIST_FOREACH(cs, &server->conditionSources, listEntry) {
         if(UA_NodeId_equal(&cs->conditionSourceId, sourceId))
@@ -215,6 +231,7 @@ getConditionSource(UA_Server *server, const UA_NodeId *sourceId) {
 static UA_Condition *
 getCondition(UA_Server *server, const UA_NodeId *sourceId,
              const UA_NodeId *conditionId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_ConditionSource *cs = getConditionSource(server, sourceId);
     if(!cs)
         return NULL;
@@ -237,10 +254,15 @@ UA_Server_setConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeI
                                                const UA_NodeId conditionSource, UA_Boolean removeBranch,
                                                UA_TwoStateVariableChangeCallback callback,
                                                UA_TwoStateVariableCallbackType callbackType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
+
     /* Get Condition */
     UA_Condition *c = getCondition(server, &conditionSource, &condition);
-    if(!c)
+    if(!c) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
+    }
 
     /* Set the callback */
     switch(callbackType) {
@@ -259,8 +281,11 @@ UA_Server_setConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeI
         c->callbacks.activeStateCallback = callback;
         break;
     default:
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -268,6 +293,8 @@ static UA_StatusCode
 getConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeId *branch,
                                     UA_Condition *condition, UA_Boolean *removeBranch,
                                     UA_TwoStateVariableCallbackType callbackType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     switch(callbackType) {
     case UA_ENTERING_ENABLEDSTATE:
         if(condition->callbacks.enableStateCallback != NULL)
@@ -302,6 +329,8 @@ static UA_StatusCode
 callConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeId *condition,
                                       const UA_NodeId *conditionSource, UA_Boolean *removeBranch,
                                       UA_TwoStateVariableCallbackType callbackType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_ConditionSource *source = getConditionSource(server, conditionSource);
     if(!source)
         return UA_STATUSCODE_BADNOTFOUND;
@@ -323,10 +352,24 @@ callConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeId *condit
     return UA_STATUSCODE_BADNOTFOUND;
 }
 
+static UA_StatusCode
+UA_Server_callConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeId *condition,
+                                                const UA_NodeId *conditionSource,
+                                                UA_Boolean *removeBranch,
+                                                UA_TwoStateVariableCallbackType callbackType) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = callConditionTwoStateVariableCallback(server, condition, conditionSource,
+                                                              removeBranch, callbackType);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* Gets the parent NodeId of a Field (e.g. Severity) or Field Property (e.g.
  * EnabledState/Id) */
 static UA_StatusCode
 getFieldParentNodeId(UA_Server *server, const UA_NodeId *field, UA_NodeId *parent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     *parent = UA_NODEID_NULL;
     const UA_Node *fieldNode = UA_NODESTORE_GET(server, field);
     if(!fieldNode)
@@ -354,12 +397,22 @@ getFieldParentNodeId(UA_Server *server, const UA_NodeId *field, UA_NodeId *paren
     return retval;
 }
 
+static UA_StatusCode
+UA_Server_getFieldParentNodeId(UA_Server *server, const UA_NodeId *field, UA_NodeId *parent) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = getFieldParentNodeId(server, field, parent);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* Gets the NodeId of a Field (e.g. Severity) */
 static UA_StatusCode
 getConditionFieldNodeId(UA_Server *server, const UA_NodeId *conditionNodeId,
                         const UA_QualifiedName* fieldName, UA_NodeId *outFieldNodeId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_BrowsePathResult bpr =
-        UA_Server_browseSimplifiedBrowsePath(server, *conditionNodeId, 1, fieldName);
+        browseSimplifiedBrowsePath(server, *conditionNodeId, 1, fieldName);
     if(bpr.statusCode != UA_STATUSCODE_GOOD)
         return bpr.statusCode;
     UA_StatusCode retval = UA_NodeId_copy(&bpr.targets[0].targetId.nodeId, outFieldNodeId);
@@ -373,16 +426,18 @@ getConditionFieldPropertyNodeId(UA_Server *server, const UA_NodeId *originCondit
                                 const UA_QualifiedName* variableFieldName,
                                 const UA_QualifiedName* variablePropertyName,
                                 UA_NodeId *outFieldPropertyNodeId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* 1) Find Variable Field of the Condition */
     UA_BrowsePathResult bprConditionVariableField =
-        UA_Server_browseSimplifiedBrowsePath(server, *originCondition, 1, variableFieldName);
+        browseSimplifiedBrowsePath(server, *originCondition, 1, variableFieldName);
     if(bprConditionVariableField.statusCode != UA_STATUSCODE_GOOD)
         return bprConditionVariableField.statusCode;
 
     /* 2) Find Property of the Variable Field of the Condition */
     UA_BrowsePathResult bprVariableFieldProperty =
-        UA_Server_browseSimplifiedBrowsePath(server, bprConditionVariableField.targets->targetId.nodeId,
-                                             1, variablePropertyName);
+        browseSimplifiedBrowsePath(server, bprConditionVariableField.targets->targetId.nodeId,
+                                   1, variablePropertyName);
     if(bprVariableFieldProperty.statusCode != UA_STATUSCODE_GOOD) {
         UA_BrowsePathResult_clear(&bprConditionVariableField);
         return bprVariableFieldProperty.statusCode;
@@ -399,16 +454,16 @@ getConditionFieldPropertyNodeId(UA_Server *server, const UA_NodeId *originCondit
 static UA_StatusCode
 getNodeIdValueOfConditionField(UA_Server *server, const UA_NodeId *condition,
                                UA_QualifiedName fieldName, UA_NodeId *outNodeId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     *outNodeId = UA_NODEID_NULL;
     UA_NodeId nodeIdValue;
     UA_StatusCode retval = getConditionFieldNodeId(server, condition, &fieldName, &nodeIdValue);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Field not found",);
 
-    UA_Variant tOutVariant;
-    UA_Variant_init(&tOutVariant);
-
     /* Read the Value of SourceNode Property Node (the Value is a NodeId) */
-    retval = UA_Server_readValue(server, nodeIdValue, &tOutVariant);
+    UA_Variant tOutVariant;
+    retval = readWithReadValue(server, &nodeIdValue, UA_ATTRIBUTEID_VALUE, &tOutVariant);
     if(retval != UA_STATUSCODE_GOOD ||
        !UA_Variant_hasScalarType(&tOutVariant, &UA_TYPES[UA_TYPES_NODEID])) {
         UA_NodeId_clear(&nodeIdValue);
@@ -423,15 +478,28 @@ getNodeIdValueOfConditionField(UA_Server *server, const UA_NodeId *condition,
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_StatusCode
+UA_Server_getNodeIdValueOfConditionField(UA_Server *server, const UA_NodeId *condition,
+                                         UA_QualifiedName fieldName, UA_NodeId *outNodeId) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = getNodeIdValueOfConditionField(server, condition, fieldName, outNodeId);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* Gets the NodeId of a condition branch. In case of main branch (BranchId ==
  * UA_NODEID_NULL), ConditionId will be returned. */
 static UA_StatusCode
-getConditionBranchNodeId(UA_Server *server, const UA_ByteString *eventId,
+UA_Server_getConditionBranchNodeId(UA_Server *server, const UA_ByteString *eventId,
                          UA_NodeId *outConditionBranchNodeId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
+
     *outConditionBranchNodeId = UA_NODEID_NULL;
     /* The function checks the BranchId based on the event Id, if BranchId ==
        NULL -> outConditionId = ConditionId */
     /* Get ConditionSource Entry */
+    UA_StatusCode res = UA_STATUSCODE_BADEVENTIDUNKNOWN;
     UA_ConditionSource *source;
     LIST_FOREACH(source, &server->conditionSources, listEntry) {
         /* Get Condition Entry */
@@ -444,73 +512,93 @@ getConditionBranchNodeId(UA_Server *server, const UA_ByteString *eventId,
                     continue;
                 if(UA_NodeId_isNull(&branch->conditionBranchId))
                     return UA_NodeId_copy(&cond->conditionId, outConditionBranchNodeId);
-                return UA_NodeId_copy(&branch->conditionBranchId, outConditionBranchNodeId);
+                else
+                    return UA_NodeId_copy(&branch->conditionBranchId, outConditionBranchNodeId);
+                goto out;
             }
         }
     }
 
-    return UA_STATUSCODE_BADEVENTIDUNKNOWN;
+ out:
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 static UA_StatusCode
-getConditionLastSeverity(UA_Server *server, const UA_NodeId *conditionSource,
+UA_Server_getConditionLastSeverity(UA_Server *server, const UA_NodeId *conditionSource,
                          const UA_NodeId *conditionId, UA_UInt16 *outLastSeverity,
                          UA_DateTime *outLastSeveritySourceTimeStamp) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     *outLastSeverity = cond->lastSeverity;
     *outLastSeveritySourceTimeStamp = cond->lastSeveritySourceTimeStamp;
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-updateConditionLastSeverity(UA_Server *server, const UA_NodeId *conditionSource,
-                            const UA_NodeId *conditionId, UA_UInt16 lastSeverity,
-                            UA_DateTime lastSeveritySourceTimeStamp) {
+UA_Server_updateConditionLastSeverity(UA_Server *server, const UA_NodeId *conditionSource,
+                                      const UA_NodeId *conditionId, UA_UInt16 lastSeverity,
+                                      UA_DateTime lastSeveritySourceTimeStamp) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     cond->lastSeverity = lastSeverity;
     cond->lastSeveritySourceTimeStamp =  lastSeveritySourceTimeStamp;
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-getConditionActiveState(UA_Server *server, const UA_NodeId *conditionSource,
-                         const UA_NodeId *conditionId, UA_ActiveState *outLastActiveState,
-                         UA_ActiveState *outCurrentActiveState, UA_Boolean *outIsLimitAlarm) {
+UA_Server_getConditionActiveState(UA_Server *server, const UA_NodeId *conditionSource,
+                                  const UA_NodeId *conditionId, UA_ActiveState *outLastActiveState,
+                                  UA_ActiveState *outCurrentActiveState, UA_Boolean *outIsLimitAlarm) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     *outLastActiveState = cond->lastActiveState;
     *outCurrentActiveState = cond->currentActiveState;
     *outIsLimitAlarm = cond->isLimitAlarm;
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-updateConditionActiveState(UA_Server *server, const UA_NodeId *conditionSource,
-                            const UA_NodeId *conditionId, const UA_ActiveState lastActiveState,
-                            const UA_ActiveState currentActiveState, UA_Boolean isLimitAlarm) {
+UA_Server_updateConditionActiveState(UA_Server *server, const UA_NodeId *conditionSource,
+                                     const UA_NodeId *conditionId, const UA_ActiveState lastActiveState,
+                                     const UA_ActiveState currentActiveState, UA_Boolean isLimitAlarm) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     cond->lastActiveState = lastActiveState;
     cond->currentActiveState = currentActiveState;
     cond->isLimitAlarm = isLimitAlarm;
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -518,6 +606,8 @@ static UA_StatusCode
 updateConditionLastEventId(UA_Server *server, const UA_NodeId *triggeredEvent,
                            const UA_NodeId *conditionSource,
                            const UA_ByteString *lastEventId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_Condition *cond = getCondition(server, conditionSource, triggeredEvent);
     if(!cond) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
@@ -541,6 +631,8 @@ updateConditionLastEventId(UA_Server *server, const UA_NodeId *triggeredEvent,
 static void
 setIsCallerAC(UA_Server *server, const UA_NodeId *condition,
               const UA_NodeId *conditionSource, UA_Boolean isCallerAC) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_Condition *cond = getCondition(server, conditionSource, condition);
     if(!cond) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
@@ -562,6 +654,8 @@ setIsCallerAC(UA_Server *server, const UA_NodeId *condition,
 UA_Boolean
 isConditionOrBranch(UA_Server *server, const UA_NodeId *condition,
                     const UA_NodeId *conditionSource, UA_Boolean *isCallerAC) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_Condition *cond = getCondition(server, conditionSource, condition);
     if(!cond) {
         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_USERLAND,
@@ -583,6 +677,8 @@ isConditionOrBranch(UA_Server *server, const UA_NodeId *condition,
 
 static UA_Boolean
 isRetained(UA_Server *server, const UA_NodeId *condition) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Get EnabledStateId NodeId */
     UA_NodeId retainNodeId;
     UA_StatusCode retval = getConditionFieldNodeId(server, condition, &fieldRetainQN, &retainNodeId);
@@ -594,9 +690,7 @@ isRetained(UA_Server *server, const UA_NodeId *condition) {
 
     /* Read Retain value */
     UA_Variant tOutVariant;
-    UA_Variant_init(&tOutVariant);
-
-    retval = UA_Server_readValue(server, retainNodeId, &tOutVariant);
+    retval = readWithReadValue(server, &retainNodeId, UA_ATTRIBUTEID_VALUE, &tOutVariant);
     if(retval != UA_STATUSCODE_GOOD ||
        !UA_Variant_hasScalarType(&tOutVariant, &UA_TYPES[UA_TYPES_BOOLEAN])) {
           UA_NodeId_clear(&retainNodeId);
@@ -614,9 +708,19 @@ isRetained(UA_Server *server, const UA_NodeId *condition) {
     return false;
 }
 
+static UA_Boolean
+UA_Server_isRetained(UA_Server *server, const UA_NodeId *condition) {
+    UA_LOCK(&server->serviceMutex);
+    UA_Boolean res = isRetained(server, condition);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 static UA_Boolean
 isTwoStateVariableInTrueState(UA_Server *server, const UA_NodeId *condition,
                               const UA_QualifiedName *twoStateVariable) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Get TwoStateVariableId NodeId */
     UA_NodeId twoStateVariableIdNodeId;
     UA_StatusCode retval = getConditionFieldPropertyNodeId(server, condition, twoStateVariable,
@@ -630,9 +734,7 @@ isTwoStateVariableInTrueState(UA_Server *server, const UA_NodeId *condition,
 
     /* Read Id value */
     UA_Variant tOutVariant;
-    UA_Variant_init(&tOutVariant);
-
-    retval = UA_Server_readValue(server, twoStateVariableIdNodeId, &tOutVariant);
+    retval = readWithReadValue(server, &twoStateVariableIdNodeId, UA_ATTRIBUTEID_VALUE, &tOutVariant);
     if(retval != UA_STATUSCODE_GOOD ||
        !UA_Variant_hasScalarType(&tOutVariant, &UA_TYPES[UA_TYPES_BOOLEAN])) {
         UA_NodeId_clear(&twoStateVariableIdNodeId);
@@ -650,9 +752,20 @@ isTwoStateVariableInTrueState(UA_Server *server, const UA_NodeId *condition,
     return false;
 }
 
+static UA_Boolean
+UA_Server_isTwoStateVariableInTrueState(UA_Server *server, const UA_NodeId *condition,
+                                        const UA_QualifiedName *twoStateVariable) {
+    UA_LOCK(&server->serviceMutex);
+    UA_Boolean res = isTwoStateVariableInTrueState(server, condition, twoStateVariable);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 static UA_StatusCode
 enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
                       const UA_NodeId *conditionSource) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
@@ -674,17 +787,16 @@ enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
         UA_LocalizedText enableText = UA_LOCALIZEDTEXT(LOCALE, DISABLED_TEXT);
         UA_Variant value;
         UA_Variant_setScalar(&value, &message, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-        UA_StatusCode retval = UA_Server_setConditionField(server, triggeredNode,
-                                                           &value, fieldMessageQN);
+        UA_StatusCode retval = setConditionField(server, triggeredNode, &value, fieldMessageQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition Message failed",);
 
         UA_Variant_setScalar(&value, &enableText, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-        retval = UA_Server_setConditionField(server, triggeredNode, &value, fieldEnabledStateQN);
+        retval = setConditionField(server, triggeredNode, &value, fieldEnabledStateQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition EnabledState text failed",);
 
         UA_Boolean retain = false;
         UA_Variant_setScalar(&value, &retain, &UA_TYPES[UA_TYPES_BOOLEAN]);
-        retval = UA_Server_setConditionField(server, triggeredNode, &value, fieldRetainQN);
+        retval = setConditionField(server, triggeredNode, &value, fieldRetainQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Condition Retain failed",);
 
         /* Trigger event */
@@ -692,7 +804,7 @@ enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
         /* Trigger the event for Condition or its Branch */
         setIsCallerAC(server, &triggeredNode, conditionSource, true);
         /* Condition Nodes should not be deleted after triggering the event */
-        retval = UA_Server_triggerEvent(server, triggeredNode, *conditionSource, &lastEventId, false);
+        retval = triggerEvent(server, triggeredNode, *conditionSource, &lastEventId, false);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Triggering condition event failed",);
         setIsCallerAC(server, &triggeredNode, conditionSource, false);
 
@@ -705,10 +817,21 @@ enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_StatusCode
+UA_Server_enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
+                                const UA_NodeId *conditionSource) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = enteringDisabledState(server, conditionId, conditionSource);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 static UA_StatusCode
 enteringEnabledState(UA_Server *server,
                      const UA_NodeId *conditionId,
                      const UA_NodeId *conditionSource) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Get Condition */
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
@@ -731,12 +854,12 @@ enteringEnabledState(UA_Server *server,
         UA_LocalizedText enableText = UA_LOCALIZEDTEXT(LOCALE, ENABLED_TEXT);
         UA_Variant value;
         UA_Variant_setScalar(&value, &message, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-        UA_StatusCode retval = UA_Server_setConditionField(server, triggeredNode,
+        UA_StatusCode retval = setConditionField(server, triggeredNode,
                                                            &value, fieldMessageQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "set Condition Message failed",);
 
         UA_Variant_setScalar(&value, &enableText, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-        retval = UA_Server_setConditionField(server, triggeredNode, &value, fieldEnabledStateQN);
+        retval = setConditionField(server, triggeredNode, &value, fieldEnabledStateQN);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "set Condition EnabledState text failed",);
 
         /* User callback TODO how should branches be evaluated? see p.19 (5.5.2) */
@@ -748,33 +871,44 @@ enteringEnabledState(UA_Server *server,
 
         /* Trigger event */
         //Condition Nodes should not be deleted after triggering the event
-        retval = UA_Server_triggerConditionEvent(server, triggeredNode, *conditionSource, NULL);
+        retval = triggerConditionEvent(server, triggeredNode, *conditionSource, NULL);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "triggering condition event failed",);
     }
 
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_StatusCode
+UA_Server_enteringEnabledState(UA_Server *server, const UA_NodeId *conditionId,
+                               const UA_NodeId *conditionSource) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = enteringEnabledState(server, conditionId, conditionSource);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 static void
 afterWriteCallbackEnabledStateChange(UA_Server *server,
                                      const UA_NodeId *sessionId, void *sessionContext,
                                      const UA_NodeId *nodeId, void *nodeContext,
                                      const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     /* Callback for change in EnabledState/Id property.
      * First we get the EnabledState NodeId then The Condition NodeId */
     UA_NodeId twoStateVariableNode;
-    UA_StatusCode retval = getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
+    UA_StatusCode retval = UA_Server_getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent TwoStateVariable found for given EnabledState/Id",);
 
     UA_NodeId conditionNode;
-    retval = getFieldParentNodeId(server, &twoStateVariableNode, &conditionNode);
+    retval = UA_Server_getFieldParentNodeId(server, &twoStateVariableNode, &conditionNode);
     UA_NodeId_clear(&twoStateVariableNode);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent Condition found for given EnabledState",);
 
     /* Get conditionSource */
     UA_NodeId conditionSource;
-    retval = getNodeIdValueOfConditionField(server, &conditionNode, fieldSourceQN,
-                                            &conditionSource);
+    retval = UA_Server_getNodeIdValueOfConditionField(server, &conditionNode, fieldSourceQN,
+                                                      &conditionSource);
     CONDITION_ASSERT_RETURN_VOID(retval, "ConditionSource not found",
                                  UA_NodeId_clear(&conditionNode););
 
@@ -788,13 +922,13 @@ afterWriteCallbackEnabledStateChange(UA_Server *server,
 
     if(false == (*((UA_Boolean *)data->value.data))) {
         /* Disable all branches and update list */
-        retval = enteringDisabledState(server, &conditionNode, &conditionSource);
+        retval = UA_Server_enteringDisabledState(server, &conditionNode, &conditionSource);
         UA_NodeId_clear(&conditionNode);
         CONDITION_ASSERT_RETURN_VOID(retval, "Entering disabled state failed",
                                      UA_NodeId_clear(&conditionSource););
     } else {
         /* Enable all branches and update list */
-        retval = enteringEnabledState(server, &conditionNode, &conditionSource);
+        retval = UA_Server_enteringEnabledState(server, &conditionNode, &conditionSource);
         UA_NodeId_clear(&conditionNode);
         CONDITION_ASSERT_RETURN_VOID(retval, "Entering enabled state failed",
                                      UA_NodeId_clear(&conditionSource););
@@ -808,13 +942,15 @@ afterWriteCallbackAckedStateChange(UA_Server *server,
                                    const UA_NodeId *sessionId, void *sessionContext,
                                    const UA_NodeId *nodeId, void *nodeContext,
                                    const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     /* Get the AckedState NodeId then The Condition NodeId */
     UA_NodeId twoStateVariableNode;
-    UA_StatusCode retval = getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
+    UA_StatusCode retval = UA_Server_getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent TwoStateVariable found for given AckedState/Id",);
 
     UA_NodeId conditionNode;
-    retval = getFieldParentNodeId(server, &twoStateVariableNode, &conditionNode);
+    retval = UA_Server_getFieldParentNodeId(server, &twoStateVariableNode, &conditionNode);
     UA_NodeId_clear(&twoStateVariableNode);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent Condition found for given AckedState",);
 
@@ -840,15 +976,14 @@ afterWriteCallbackAckedStateChange(UA_Server *server,
     }
 
     /* Check if enabled and retained */
-    if(!isTwoStateVariableInTrueState(server, &conditionNode, &fieldEnabledStateQN) ||
-       !isRetained(server, &conditionNode)) {
+    if(!UA_Server_isTwoStateVariableInTrueState(server, &conditionNode, &fieldEnabledStateQN) ||
+       !UA_Server_isRetained(server, &conditionNode)) {
         /* Set AckedState/Id to false*/
         UA_Boolean idValue = false;
         UA_Variant value;
         UA_Variant_setScalar(&value, &idValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
-        retval = UA_Server_setConditionVariableFieldProperty(server, conditionNode,
-                                                             &value, fieldAckedStateQN,
-                                                             twoStateVariableIdQN);
+        retval = UA_Server_setConditionVariableFieldProperty(server, conditionNode, &value,
+                                                   fieldAckedStateQN, twoStateVariableIdQN);
         UA_NodeId_clear(&conditionNode);
         CONDITION_ASSERT_RETURN_VOID(retval, "Set AckedState/Id failed",);
         return;
@@ -871,15 +1006,15 @@ afterWriteCallbackAckedStateChange(UA_Server *server,
 
     /* Get conditionSource */
     UA_NodeId conditionSource;
-    retval = getNodeIdValueOfConditionField(server, &conditionNode, fieldSourceQN,
-                                            &conditionSource);
+    retval = UA_Server_getNodeIdValueOfConditionField(server, &conditionNode, fieldSourceQN,
+                                                      &conditionSource);
     CONDITION_ASSERT_RETURN_VOID(retval, "ConditionSource not found",
                                  UA_NodeId_clear(&conditionNode););
 
     /* User callback*/
     UA_Boolean removeBranch = false;
-    retval = callConditionTwoStateVariableCallback(server, &conditionNode, &conditionSource,
-                                                   &removeBranch, UA_ENTERING_ACKEDSTATE);
+    retval = UA_Server_callConditionTwoStateVariableCallback(server, &conditionNode, &conditionSource,
+                                                             &removeBranch, UA_ENTERING_ACKEDSTATE);
     CONDITION_ASSERT_RETURN_VOID(retval, "Calling condition callback failed",
                                  UA_NodeId_clear(&conditionNode);
                                  UA_NodeId_clear(&conditionSource););
@@ -899,13 +1034,15 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
                                        const UA_NodeId *sessionId, void *sessionContext,
                                        const UA_NodeId *nodeId, void *nodeContext,
                                        const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_Variant value;
     UA_NodeId twoStateVariableNode;
-    UA_StatusCode retval = getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
+    UA_StatusCode retval = UA_Server_getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent TwoStateVariable found for given ConfirmedState/Id",);
 
     UA_NodeId conditionNode;
-    retval = getFieldParentNodeId(server, &twoStateVariableNode, &conditionNode);
+    retval = UA_Server_getFieldParentNodeId(server, &twoStateVariableNode, &conditionNode);
     UA_NodeId_clear(&twoStateVariableNode);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent Condition found for given ConfirmedState",);
 
@@ -930,14 +1067,13 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
     }
 
     /* Check if enabled and retained */
-    if(!isTwoStateVariableInTrueState(server, &conditionNode, &fieldEnabledStateQN) ||
-       !isRetained(server, &conditionNode)) {
+    if(!UA_Server_isTwoStateVariableInTrueState(server, &conditionNode, &fieldEnabledStateQN) ||
+       !UA_Server_isRetained(server, &conditionNode)) {
         /* Set confirmedState/Id to false*/
         UA_Boolean idValue = false;
         UA_Variant_setScalar(&value, &idValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
-        retval = UA_Server_setConditionVariableFieldProperty(server, conditionNode,
-                                                             &value, fieldConfirmedStateQN,
-                                                             twoStateVariableIdQN);
+        retval = UA_Server_setConditionVariableFieldProperty(server, conditionNode, &value,
+                                                   fieldConfirmedStateQN, twoStateVariableIdQN);
         UA_NodeId_clear(&conditionNode);
         CONDITION_ASSERT_RETURN_VOID(retval, "Set ConfirmedState/Id failed",);
         return;
@@ -945,8 +1081,7 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
 
     /* Set confirming time */
     retval = UA_Server_writeObjectProperty_scalar(server, conditionNode, fieldTimeQN,
-                                                  &data->sourceTimestamp,
-                                                  &UA_TYPES[UA_TYPES_DATETIME]);
+                                                  &data->sourceTimestamp, &UA_TYPES[UA_TYPES_DATETIME]);
     CONDITION_ASSERT_RETURN_VOID(retval, "Set Confirming Time failed",
                                  UA_NodeId_clear(&conditionNode););
 
@@ -966,15 +1101,16 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
 
     /* Get conditionSource */
     UA_NodeId conditionSource;
-    retval = getNodeIdValueOfConditionField(server, &conditionNode, fieldSourceQN, &conditionSource);
+    retval = UA_Server_getNodeIdValueOfConditionField(server, &conditionNode,
+                                                      fieldSourceQN, &conditionSource);
     CONDITION_ASSERT_RETURN_VOID(retval, "ConditionSource not found",
                                  UA_NodeId_clear(&conditionNode););
 
     /* User callback*/
     UA_Boolean removeBranch = false;
-    retval = callConditionTwoStateVariableCallback(server, &conditionNode,
-                                                   &conditionSource, &removeBranch,
-                                                   UA_ENTERING_CONFIRMEDSTATE);
+    retval = UA_Server_callConditionTwoStateVariableCallback(server, &conditionNode,
+                                                             &conditionSource, &removeBranch,
+                                                             UA_ENTERING_CONFIRMEDSTATE);
     CONDITION_ASSERT_RETURN_VOID(retval, "Calling condition callback failed",
                                  UA_NodeId_clear(&conditionNode);
                                  UA_NodeId_clear(&conditionSource););
@@ -986,26 +1122,29 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
                                  UA_NodeId_clear(&conditionNode);
                                  UA_NodeId_clear(&conditionSource););
 }
-#endif//CONDITIONOPTIONALFIELDS_SUPPORT
+#endif /* CONDITIONOPTIONALFIELDS_SUPPORT */
 
 static void
 afterWriteCallbackActiveStateChange(UA_Server *server,
                                     const UA_NodeId *sessionId, void *sessionContext,
                                     const UA_NodeId *nodeId, void *nodeContext,
                                     const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_Variant value;
     UA_NodeId twoStateVariableNode;
-    UA_StatusCode retval = getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
+    UA_StatusCode retval = UA_Server_getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent TwoStateVariable found for given ActiveState/Id",);
 
     UA_NodeId conditionNode;
-    retval = getFieldParentNodeId(server, &twoStateVariableNode, &conditionNode);
+    retval = UA_Server_getFieldParentNodeId(server, &twoStateVariableNode, &conditionNode);
     UA_NodeId_clear(&twoStateVariableNode);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent Condition found for given ActiveState",);
 
     /* Get conditionSource */
     UA_NodeId conditionSource;
-    retval = getNodeIdValueOfConditionField(server, &conditionNode, fieldSourceQN, &conditionSource);
+    retval = UA_Server_getNodeIdValueOfConditionField(server, &conditionNode,
+                                                      fieldSourceQN, &conditionSource);
     CONDITION_ASSERT_RETURN_VOID(retval, "ConditionSource not found",
                                  UA_NodeId_clear(&conditionNode););
 
@@ -1013,29 +1152,31 @@ afterWriteCallbackActiveStateChange(UA_Server *server,
     UA_ActiveState currentActiveState = UA_INACTIVE;
     UA_Boolean isLimitalarm = false;
 
-    retval = getConditionActiveState(server, &conditionSource, &conditionNode,
-                                     &lastActiveState, &currentActiveState, &isLimitalarm);
+    retval = UA_Server_getConditionActiveState(server, &conditionSource, &conditionNode,
+                                               &lastActiveState, &currentActiveState,
+                                               &isLimitalarm);
     CONDITION_ASSERT_RETURN_VOID(retval, "ActiveState transition check failed",
                                  UA_NodeId_clear(&conditionNode);
                                  UA_NodeId_clear(&conditionSource););
 
     if(isLimitalarm == false) {
       if(*((UA_Boolean *)data->value.data) == true) {
-        retval = updateConditionActiveState(server, &conditionSource, &conditionNode,
-                                            currentActiveState, UA_ACTIVE, false);
+        retval = UA_Server_updateConditionActiveState(server, &conditionSource, &conditionNode,
+                                                      currentActiveState, UA_ACTIVE, false);
         CONDITION_ASSERT_RETURN_VOID(retval, "Updating ActiveState failed",
                                      UA_NodeId_clear(&conditionNode);
                                      UA_NodeId_clear(&conditionSource););
       } else {
-        retval = updateConditionActiveState(server, &conditionSource, &conditionNode,
-                                            currentActiveState, UA_INACTIVE, false);
+        retval = UA_Server_updateConditionActiveState(server, &conditionSource, &conditionNode,
+                                                      currentActiveState, UA_INACTIVE, false);
         CONDITION_ASSERT_RETURN_VOID(retval, "Updating ActiveState failed",
                                      UA_NodeId_clear(&conditionNode);
                                      UA_NodeId_clear(&conditionSource););
       }
 
-      retval = getConditionActiveState(server, &conditionSource, &conditionNode,
-                                       &lastActiveState, &currentActiveState, &isLimitalarm);
+      retval = UA_Server_getConditionActiveState(server, &conditionSource, &conditionNode,
+                                                 &lastActiveState, &currentActiveState,
+                                                 &isLimitalarm);
       CONDITION_ASSERT_RETURN_VOID(retval, "ActiveState transition check failed",
                                    UA_NodeId_clear(&conditionNode);
                                    UA_NodeId_clear(&conditionSource););
@@ -1048,8 +1189,8 @@ afterWriteCallbackActiveStateChange(UA_Server *server,
        (lastActiveState != currentActiveState)) {
 
         /* Check if enabled and retained */
-        if(isTwoStateVariableInTrueState(server, &conditionNode, &fieldEnabledStateQN) &&
-            isRetained(server, &conditionNode)) {
+        if(UA_Server_isTwoStateVariableInTrueState(server, &conditionNode, &fieldEnabledStateQN) &&
+           UA_Server_isRetained(server, &conditionNode)) {
             /* Set activating time */
             retval = UA_Server_writeObjectProperty_scalar(server, conditionNode, fieldTimeQN,
                                                           &data->sourceTimestamp,
@@ -1068,8 +1209,9 @@ afterWriteCallbackActiveStateChange(UA_Server *server,
 
             /* User callback*/
             UA_Boolean removeBranch = false;//not used
-            retval = callConditionTwoStateVariableCallback(server, &conditionNode, &conditionSource,
-                                                           &removeBranch, UA_ENTERING_ACTIVESTATE);
+            retval = UA_Server_callConditionTwoStateVariableCallback(server, &conditionNode,
+                                                                     &conditionSource, &removeBranch,
+                                                                     UA_ENTERING_ACTIVESTATE);
             CONDITION_ASSERT_RETURN_VOID(retval, "Calling condition callback failed",
                                          UA_NodeId_clear(&conditionNode);
                                          UA_NodeId_clear(&conditionSource););
@@ -1113,8 +1255,8 @@ afterWriteCallbackActiveStateChange(UA_Server *server,
                                      UA_NodeId_clear(&conditionNode);
                                      UA_NodeId_clear(&conditionSource););
 
-        retval = updateConditionActiveState(server, &conditionSource, &conditionNode,
-                                            currentActiveState, UA_INACTIVE, isLimitalarm);
+        retval = UA_Server_updateConditionActiveState(server, &conditionSource, &conditionNode,
+                                                      currentActiveState, UA_INACTIVE, isLimitalarm);
         UA_NodeId_clear(&conditionSource);
         UA_NodeId_clear(&conditionNode);
         CONDITION_ASSERT_RETURN_VOID(retval, "Set ActiveState failed",);
@@ -1134,25 +1276,28 @@ afterWriteCallbackSeverityChange(UA_Server *server,
                                  const UA_NodeId *sessionId, void *sessionContext,
                                  const UA_NodeId *nodeId, void *nodeContext,
                                  const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_QualifiedName fieldLastSeverity = UA_QUALIFIEDNAME(0, CONDITION_FIELD_LASTSEVERITY);
     UA_QualifiedName fieldSourceTimeStamp =
         UA_QUALIFIEDNAME(0, CONDITION_FIELD_CONDITIONVARIABLE_SOURCETIMESTAMP);
     UA_Variant value;
 
     UA_NodeId condition;
-    UA_StatusCode retval = getFieldParentNodeId(server, nodeId, &condition);
+    UA_StatusCode retval = UA_Server_getFieldParentNodeId(server, nodeId, &condition);
     CONDITION_ASSERT_RETURN_VOID(retval, "No Parent Condition found for given Severity Field",);
 
     /* Get conditionSource */
     UA_NodeId conditionSource;
-    retval = getNodeIdValueOfConditionField(server, &condition, fieldSourceQN, &conditionSource);
+    retval = UA_Server_getNodeIdValueOfConditionField(server, &condition,
+                                                      fieldSourceQN, &conditionSource);
     CONDITION_ASSERT_RETURN_VOID(retval, "ConditionSource not found",
                                  UA_NodeId_clear(&condition););
 
     UA_UInt16 lastSeverity;
     UA_DateTime lastSeveritySourceTimeStamp;
-    retval = getConditionLastSeverity(server, &conditionSource, &condition,
-                                      &lastSeverity, &lastSeveritySourceTimeStamp);
+    retval = UA_Server_getConditionLastSeverity(server, &conditionSource, &condition,
+                                                &lastSeverity, &lastSeveritySourceTimeStamp);
     CONDITION_ASSERT_RETURN_VOID(retval, "Get Condition LastSeverity failed",
                                  UA_NodeId_clear(&condition);
                                  UA_NodeId_clear(&conditionSource););
@@ -1174,7 +1319,7 @@ afterWriteCallbackSeverityChange(UA_Server *server,
     /* Set SourceTimestamp */
     UA_Variant_setScalar(&value, &lastSeveritySourceTimeStamp, &UA_TYPES[UA_TYPES_DATETIME]);
     retval = UA_Server_setConditionVariableFieldProperty(server, condition, &value,
-                                                         fieldLastSeverity, fieldSourceTimeStamp);
+                                               fieldLastSeverity, fieldSourceTimeStamp);
     CONDITION_ASSERT_RETURN_VOID(retval, "Set LastSeverity SourceTimestamp failed",
                                  UA_NodeId_clear(&condition);
                                  UA_NodeId_clear(&conditionSource););
@@ -1182,8 +1327,8 @@ afterWriteCallbackSeverityChange(UA_Server *server,
     /* Update lastSeverity in list */
     lastSeverity = *(UA_UInt16 *)data->value.data;
     lastSeveritySourceTimeStamp = data->sourceTimestamp;
-    retval = updateConditionLastSeverity(server, &conditionSource, &condition,
-                                         lastSeverity, lastSeveritySourceTimeStamp);
+    retval = UA_Server_updateConditionLastSeverity(server, &conditionSource, &condition,
+                                                   lastSeverity, lastSeveritySourceTimeStamp);
     CONDITION_ASSERT_RETURN_VOID(retval, "Update Condition LastSeverity failed",
                                  UA_NodeId_clear(&condition);
     UA_NodeId_clear(&conditionSource););
@@ -1203,7 +1348,7 @@ afterWriteCallbackSeverityChange(UA_Server *server,
 
 #ifdef CONDITION_SEVERITYCHANGECALLBACK_ENABLE
     /* Check if retained */
-    if(isRetained(server, &condition)) {
+    if(UA_Server_isRetained(server, &condition)) {
         /* Trigger event */
         //Condition Nodes should not be deleted after triggering the event
         retval = UA_Server_triggerConditionEvent(server, condition, conditionSource, NULL);
@@ -1211,7 +1356,7 @@ afterWriteCallbackSeverityChange(UA_Server *server,
                                      UA_NodeId_clear(&condition);
         UA_NodeId_clear(&conditionSource););
     }
-#endif//CONDITION_SEVERITYCHANGECALLBACK_ENABLE
+#endif /* CONDITION_SEVERITYCHANGECALLBACK_ENABLE */
     UA_NodeId_clear(&conditionSource);
     UA_NodeId_clear(&condition);
 }
@@ -1222,6 +1367,8 @@ disableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *methodContext, const UA_NodeId *objectId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize, UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
@@ -1231,7 +1378,7 @@ disableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     }
 
     /* Check if enabled */
-    if(!isTwoStateVariableInTrueState(server, objectId, &fieldEnabledStateQN))
+    if(!UA_Server_isTwoStateVariableInTrueState(server, objectId, &fieldEnabledStateQN))
         return UA_STATUSCODE_BADCONDITIONALREADYDISABLED;
 
     /* Disable by writing false to EnabledState/Id--> will cause a callback to
@@ -1239,8 +1386,9 @@ disableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     UA_Variant value;
     UA_Boolean idValue = false;
     UA_Variant_setScalar(&value, &idValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    UA_StatusCode retval = UA_Server_setConditionVariableFieldProperty(
-        server, *objectId, &value, fieldEnabledStateQN, twoStateVariableIdQN);
+    UA_StatusCode retval =
+        UA_Server_setConditionVariableFieldProperty(server, *objectId, &value,
+                                                    fieldEnabledStateQN, twoStateVariableIdQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Disable Condition failed",);
     return UA_STATUSCODE_GOOD;
 }
@@ -1252,6 +1400,8 @@ enableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                      void *objectContext, size_t inputSize,
                      const UA_Variant *input, size_t outputSize,
                      UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
@@ -1261,7 +1411,7 @@ enableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     }
 
     /* Check if disabled */
-    if(isTwoStateVariableInTrueState(server, objectId, &fieldEnabledStateQN))
+    if(UA_Server_isTwoStateVariableInTrueState(server, objectId, &fieldEnabledStateQN))
         return UA_STATUSCODE_BADCONDITIONALREADYENABLED;
 
     /* Enable by writing true to EnabledStateId--> will cause a callback to
@@ -1283,6 +1433,8 @@ addCommentMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                          void *objectContext, size_t inputSize,
                          const UA_Variant *input, size_t outputSize,
                          UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_QualifiedName fieldComment = UA_QUALIFIEDNAME(0, CONDITION_FIELD_COMMENT);
     UA_QualifiedName fieldSourceTimeStamp =
         UA_QUALIFIEDNAME(0, CONDITION_FIELD_CONDITIONVARIABLE_SOURCETIMESTAMP);
@@ -1305,12 +1457,13 @@ addCommentMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
      * in current implementation, methods are only being referenced from their ObjectType Node.
      * Because of that, the correct instance (Condition) will be found through
      * its last EventId */
-    UA_StatusCode retval = getConditionBranchNodeId(server, (UA_ByteString *)input[0].data,
-                                                    &triggerEvent);
+    UA_StatusCode retval =
+        UA_Server_getConditionBranchNodeId(server, (UA_ByteString *)input[0].data,
+                                           &triggerEvent);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "ConditionId based on EventId not found",);
 
     /* Check if enabled */
-    if(!isRetained(server, &triggerEvent))
+    if(!UA_Server_isRetained(server, &triggerEvent))
         return UA_STATUSCODE_BADCONDITIONDISABLED;
 
     /* Set SourceTimestamp */
@@ -1347,7 +1500,8 @@ addCommentMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     /* Get conditionSource */
     UA_NodeId conditionSource;
-    retval = getNodeIdValueOfConditionField(server, &triggerEvent, fieldSourceQN, &conditionSource);
+    retval = UA_Server_getNodeIdValueOfConditionField(server, &triggerEvent,
+                                                      fieldSourceQN, &conditionSource);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "ConditionSource not found",
                                    UA_NodeId_clear(&triggerEvent););
 
@@ -1367,6 +1521,8 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                           void *objectContext, size_t inputSize,
                           const UA_Variant *input, size_t outputSize,
                           UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_QualifiedName fieldComment = UA_QUALIFIEDNAME(0, CONDITION_FIELD_COMMENT);
     UA_Variant value;
 
@@ -1380,31 +1536,35 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     /* Get condition branch to trigger the correct event */
     UA_NodeId conditionNode;
-    UA_StatusCode retval = getConditionBranchNodeId(server, (UA_ByteString *)input[0].data,
-                                                    &conditionNode);
+    UA_StatusCode retval =
+        UA_Server_getConditionBranchNodeId(server, (UA_ByteString *)input[0].data,
+                                           &conditionNode);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "ConditionId based on EventId not found",);
 
     /* Check if retained */
-    if(!isRetained(server, &conditionNode))
+    if(!UA_Server_isRetained(server, &conditionNode))
         return UA_STATUSCODE_BADCONDITIONDISABLED;
 
     /* Check if already acknowledged */
-    if(isTwoStateVariableInTrueState(server, &conditionNode, &fieldAckedStateQN))
+    if(UA_Server_isTwoStateVariableInTrueState(server, &conditionNode, &fieldAckedStateQN))
         return UA_STATUSCODE_BADCONDITIONBRANCHALREADYACKED;
 
     /* Get EventType */
     UA_NodeId eventType;
-    retval = getNodeIdValueOfConditionField(server, &conditionNode,
-                                            UA_QUALIFIEDNAME(0, CONDITION_FIELD_EVENTTYPE),
-                                            &eventType);
+    retval = UA_Server_getNodeIdValueOfConditionField(server, &conditionNode,
+                                                      UA_QUALIFIEDNAME(0, CONDITION_FIELD_EVENTTYPE),
+                                                      &eventType);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "EventType not found",
                                    UA_NodeId_clear(&conditionNode););
 
     /* Check if ConditionType is subType of AcknowledgeableConditionType TODO Over Kill*/
     UA_NodeId AcknowledgeableConditionTypeId =
         UA_NODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE);
-    if(!isNodeInTree_singleRef(server, &eventType, &AcknowledgeableConditionTypeId,
-                               UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+    UA_LOCK(&server->serviceMutex);
+    UA_Boolean found = isNodeInTree_singleRef(server, &eventType, &AcknowledgeableConditionTypeId,
+                                              UA_REFERENCETYPEINDEX_HASSUBTYPE);
+    UA_UNLOCK(&server->serviceMutex);
+    if(!found) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of AcknowledgeableConditionType!");
         UA_NodeId_clear(&conditionNode);
@@ -1429,7 +1589,7 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     UA_Boolean idValue = true;
     UA_Variant_setScalar(&value, &idValue, &UA_TYPES[UA_TYPES_BOOLEAN]);
     retval = UA_Server_setConditionVariableFieldProperty(server, conditionNode, &value,
-                                                         fieldAckedStateQN, twoStateVariableIdQN);
+                                               fieldAckedStateQN, twoStateVariableIdQN);
     UA_NodeId_clear(&conditionNode);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Acknowledge Condition failed",);
     return retval;
@@ -1443,6 +1603,8 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_QualifiedName fieldComment = UA_QUALIFIEDNAME(0, CONDITION_FIELD_COMMENT);
     UA_Variant value;
 
@@ -1456,31 +1618,35 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     /* Get condition branch to trigger the correct event */
     UA_NodeId conditionNode;
-    UA_StatusCode retval = getConditionBranchNodeId(server, (UA_ByteString *)input[0].data,
-                                                    &conditionNode);
+    UA_StatusCode retval =
+        UA_Server_getConditionBranchNodeId(server, (UA_ByteString *)input[0].data,
+                                           &conditionNode);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "ConditionId based on EventId not found",);
 
     /* Check if retained */
-    if(!isRetained(server, &conditionNode))
+    if(!UA_Server_isRetained(server, &conditionNode))
         return UA_STATUSCODE_BADCONDITIONDISABLED;
 
     /* Check if already confirmed */
-    if(isTwoStateVariableInTrueState(server, &conditionNode, &fieldConfirmedStateQN))
+    if(UA_Server_isTwoStateVariableInTrueState(server, &conditionNode, &fieldConfirmedStateQN))
         return UA_STATUSCODE_BADCONDITIONBRANCHALREADYCONFIRMED;
 
     /* Get EventType */
     UA_NodeId eventType;
-    retval = getNodeIdValueOfConditionField(server, &conditionNode,
-                                            UA_QUALIFIEDNAME(0, CONDITION_FIELD_EVENTTYPE),
-                                            &eventType);
+    retval = UA_Server_getNodeIdValueOfConditionField(server, &conditionNode,
+                                                      UA_QUALIFIEDNAME(0, CONDITION_FIELD_EVENTTYPE),
+                                                      &eventType);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "EventType not found",
                                    UA_NodeId_clear(&conditionNode););
 
     /* Check if ConditionType is subType of AcknowledgeableConditionType. */
     UA_NodeId AcknowledgeableConditionTypeId =
         UA_NODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE);
-    if(!isNodeInTree_singleRef(server, &eventType, &AcknowledgeableConditionTypeId,
-                               UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+    UA_LOCK(&server->serviceMutex);
+    UA_Boolean found = isNodeInTree_singleRef(server, &eventType, &AcknowledgeableConditionTypeId,
+                                              UA_REFERENCETYPEINDEX_HASSUBTYPE);
+    UA_UNLOCK(&server->serviceMutex);
+    if(!found) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of AcknowledgeableConditionType!");
         UA_NodeId_clear(&conditionNode);
@@ -1511,11 +1677,12 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Acknowledge Condition failed",);
     return retval;
 }
-#endif//CONDITIONOPTIONALFIELDS_SUPPORT
+#endif /* CONDITIONOPTIONALFIELDS_SUPPORT */
 
 static UA_StatusCode
 setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodId) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_QualifiedName fieldSeverity = UA_QUALIFIEDNAME(0, CONDITION_FIELD_SEVERITY);
     UA_QualifiedName fieldSourceName = UA_QUALIFIEDNAME(0, CONDITION_FIELD_SOURCENAME);
     UA_QualifiedName fieldReceiveTime = UA_QUALIFIEDNAME(0, CONDITION_FIELD_RECEIVETIME);
@@ -1527,8 +1694,8 @@ setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodI
 
     /* Set Severity */
     UA_Variant_setScalar(&value, &severityValue, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_StatusCode retval = setConditionField(server, *refreshEventNodId, &value,
-                                                       fieldSeverity);
+    UA_StatusCode retval = setConditionField(server, *refreshEventNodId,
+                                             &value, fieldSeverity);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set RefreshEvent Severity failed",);
 
     /* Set SourceName */
@@ -1558,15 +1725,17 @@ setRefreshMethodEventFields(UA_Server *server, const UA_NodeId *refreshEventNodI
 static UA_StatusCode
 createRefreshMethodEvents(UA_Server *server, UA_NodeId *outRefreshStartNodId,
                           UA_NodeId *outRefreshEndNodId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_NodeId refreshStartEventTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_REFRESHSTARTEVENTTYPE);
     UA_NodeId refreshEndEventTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_REFRESHENDEVENTTYPE);
-    /* create RefreshStartEvent */
-    UA_StatusCode retval = UA_Server_createEvent(server, refreshStartEventTypeNodeId,
-                                                 outRefreshStartNodId);
+
+    /* Create RefreshStartEvent */
+    UA_StatusCode retval = createEvent(server, refreshStartEventTypeNodeId, outRefreshStartNodId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "CreateEvent RefreshStart failed",);
 
-    /* create RefreshEndEvent */
-    retval = UA_Server_createEvent(server, refreshEndEventTypeNodeId, outRefreshEndNodId);
+    /* Create RefreshEndEvent */
+    retval = createEvent(server, refreshEndEventTypeNodeId, outRefreshEndNodId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "CreateEvent RefreshEnd failed",);
 
     return retval;
@@ -1575,6 +1744,8 @@ createRefreshMethodEvents(UA_Server *server, UA_NodeId *outRefreshStartNodId,
 static UA_StatusCode
 setRefreshMethodEvents(UA_Server *server, const UA_NodeId *refreshStartNodId,
                        const UA_NodeId *refreshEndNodId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Set Standard Fields for RefreshStart */
     UA_StatusCode retval = setRefreshMethodEventFields(server, refreshStartNodId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set standard Fields of RefreshStartEvent failed",);
@@ -1589,6 +1760,8 @@ setRefreshMethodEvents(UA_Server *server, const UA_NodeId *refreshStartNodId,
 static UA_Boolean
 isConditionSourceInMonitoredItem(UA_Server *server, const UA_MonitoredItem *monitoredItem,
                                  const UA_NodeId *conditionSource){
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* TODO: check also other hierarchical references */
     UA_ReferenceTypeSet refs = UA_REFTYPESET(UA_REFERENCETYPEINDEX_ORGANIZES);
     refs = UA_ReferenceTypeSet_union(refs, UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASCOMPONENT));
@@ -1673,7 +1846,7 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     UA_LOCK(&server->serviceMutex);
     //TODO implement logic for subscription array
     /* Check if valid subscriptionId */
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
+    UA_Session *session = getSessionById(server, sessionId);
     UA_Subscription *subscription =
         UA_Session_getSubscriptionById(session, *((UA_UInt32 *)input[0].data));
     if(!subscription) {
@@ -1714,9 +1887,10 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
     UA_LOCK(&server->serviceMutex);
+
     //TODO implement logic for subscription array
     /* Check if valid subscriptionId */
-    UA_Session *session = UA_Server_getSessionById(server, sessionId);
+    UA_Session *session = getSessionById(server, sessionId);
     UA_Subscription *subscription =
         UA_Session_getSubscriptionById(session, *((UA_UInt32 *)input[0].data));
     if(!subscription) {
@@ -1752,6 +1926,8 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 static UA_StatusCode
 setConditionInConditionList(UA_Server *server, const UA_NodeId *conditionNodeId,
                             UA_ConditionSource *conditionSourceEntry) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_Condition *conditionListEntry = (UA_Condition*)UA_malloc(sizeof(UA_Condition));
     if(!conditionListEntry)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -1780,6 +1956,8 @@ setConditionInConditionList(UA_Server *server, const UA_NodeId *conditionNodeId,
 static UA_StatusCode
 appendConditionEntry(UA_Server *server, const UA_NodeId *conditionNodeId,
                      const UA_NodeId *conditionSourceNodeId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* See if the ConditionSource Entry already exists*/
     UA_ConditionSource *source = getConditionSource(server, conditionSourceNodeId);
     if(source)
@@ -1825,6 +2003,8 @@ deleteCondition(UA_Condition *cond) {
 
 void
 UA_ConditionList_delete(UA_Server *server) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_ConditionSource *source, *tmp_source;
     LIST_FOREACH_SAFE(source, &server->conditionSources, listEntry, tmp_source) {
         UA_Condition *cond, *tmp_cond;
@@ -1845,6 +2025,8 @@ UA_ConditionList_delete(UA_Server *server) {
 UA_StatusCode
 UA_getConditionId(UA_Server *server, const UA_NodeId *conditionNodeId,
                   UA_NodeId *outConditionId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Get ConditionSource Entry */
     UA_ConditionSource *source;
     LIST_FOREACH(source, &server->conditionSources, listEntry) {
@@ -1872,6 +2054,8 @@ UA_getConditionId(UA_Server *server, const UA_NodeId *conditionNodeId,
  * subtypes inverse reference. */
 static UA_Boolean
 doesHasEventSourceReferenceExist(UA_Server *server, const UA_NodeId nodeToCheck) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_NodeId hasEventSourceId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASEVENTSOURCE);
     const UA_Node* node = UA_NODESTORE_GET(server, &nodeToCheck);
     if(!node)
@@ -1894,39 +2078,41 @@ static UA_StatusCode
 setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
                            const UA_NodeId* conditionType, const UA_NodeId* conditionSource,
                            const UA_QualifiedName* conditionName) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Set Fields */
     /* 1.Set EventType */
     UA_Variant value;
     UA_Variant_setScalar(&value, (void*)(uintptr_t)conditionType, &UA_TYPES[UA_TYPES_NODEID]);
-    UA_StatusCode retval = UA_Server_setConditionField(server, *condition, &value,
-                                                       UA_QUALIFIEDNAME(0,CONDITION_FIELD_EVENTTYPE));
+    UA_StatusCode retval = setConditionField(server, *condition, &value,
+                                             UA_QUALIFIEDNAME(0,CONDITION_FIELD_EVENTTYPE));
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set EventType Field failed",);
 
     /* 2.Set ConditionName */
     UA_Variant_setScalar(&value, (void*)(uintptr_t)&conditionName->name,
                          &UA_TYPES[UA_TYPES_STRING]);
-    retval = UA_Server_setConditionField(server, *condition, &value,
-                                         UA_QUALIFIEDNAME(0,CONDITION_FIELD_CONDITIONNAME));
+    retval = setConditionField(server, *condition, &value,
+                               UA_QUALIFIEDNAME(0,CONDITION_FIELD_CONDITIONNAME));
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set ConditionName Field failed",);
 
     /* 3.Set EnabledState (Disabled by default -> Retain Field = false) */
     UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, DISABLED_TEXT);
     UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-    retval = UA_Server_setConditionField(server, *condition, &value,
-                                         UA_QUALIFIEDNAME(0,CONDITION_FIELD_ENABLEDSTATE));
+    retval = setConditionField(server, *condition, &value,
+                               UA_QUALIFIEDNAME(0,CONDITION_FIELD_ENABLEDSTATE));
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set EnabledState Field failed",);
 
     /* 4.Set EnabledState/Id */
     UA_Boolean stateId = false;
     UA_Variant_setScalar(&value, &stateId, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    retval = UA_Server_setConditionVariableFieldProperty(server, *condition, &value,
+    retval = setConditionVariableFieldProperty(server, *condition, &value,
                                                UA_QUALIFIEDNAME(0,CONDITION_FIELD_ENABLEDSTATE),
-                                                         twoStateVariableIdQN);
+                                               twoStateVariableIdQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set EnabledState/Id Field failed",);
 
     /* 5.Set Retain*/
     UA_Variant_setScalar(&value, &stateId, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    retval = UA_Server_setConditionField(server, *condition, &value, fieldRetainQN);
+    retval = setConditionField(server, *condition, &value, fieldRetainQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Retain Field failed",);
 
     /* Get ConditionSourceNode*/
@@ -1940,8 +2126,8 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
     /* 6.Set SourceName*/
     UA_Variant_setScalar(&value, (void*)(uintptr_t)&conditionSourceNode->head.browseName.name,
                          &UA_TYPES[UA_TYPES_STRING]);
-    retval = UA_Server_setConditionField(server, *condition, &value,
-                                         UA_QUALIFIEDNAME(0,CONDITION_FIELD_SOURCENAME));
+    retval = setConditionField(server, *condition, &value,
+                               UA_QUALIFIEDNAME(0,CONDITION_FIELD_SOURCENAME));
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Set SourceName Field failed. StatusCode %s",
@@ -1953,7 +2139,7 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
     /* 7.Set SourceNode*/
     UA_Variant_setScalar(&value, (void*)(uintptr_t)&conditionSourceNode->head.nodeId,
                          &UA_TYPES[UA_TYPES_NODEID]);
-    retval = UA_Server_setConditionField(server, *condition, &value, fieldSourceQN);
+    retval = setConditionField(server, *condition, &value, fieldSourceQN);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Set SourceNode Field failed. StatusCode %s", UA_StatusCode_name(retval));
@@ -1966,15 +2152,15 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
     /* 8. Set Quality (TODO not supported, thus set with Status Good) */
     UA_StatusCode qualityValue = UA_STATUSCODE_GOOD;
     UA_Variant_setScalar(&value, &qualityValue, &UA_TYPES[UA_TYPES_STATUSCODE]);
-    retval = UA_Server_setConditionField(server, *condition, &value,
-                                         UA_QUALIFIEDNAME(0,CONDITION_FIELD_QUALITY));
+    retval = setConditionField(server, *condition, &value,
+                               UA_QUALIFIEDNAME(0,CONDITION_FIELD_QUALITY));
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Quality Field failed",);
 
     /* 9. Set Severity */
     UA_UInt16 severityValue = 0;
     UA_Variant_setScalar(&value, &severityValue, &UA_TYPES[UA_TYPES_UINT16]);
-    retval = UA_Server_setConditionField(server, *condition, &value,
-                                         UA_QUALIFIEDNAME(0,CONDITION_FIELD_SEVERITY));
+    retval = setConditionField(server, *condition, &value,
+                               UA_QUALIFIEDNAME(0,CONDITION_FIELD_SEVERITY));
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Severity Field failed",);
 
     /* Check subTypes of ConditionType to set further Fields*/
@@ -1989,30 +2175,30 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
     /* Set AckedState (Id = false by default) */
     text = UA_LOCALIZEDTEXT(LOCALE, UNACKED_TEXT);
     UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-    retval = UA_Server_setConditionField(server, *condition, &value, fieldAckedStateQN);
+    retval = setConditionField(server, *condition, &value, fieldAckedStateQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set AckedState Field failed",);
 
     UA_Variant_setScalar(&value, &stateId, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    retval = UA_Server_setConditionVariableFieldProperty(server, *condition, &value,
-                                                         fieldAckedStateQN, twoStateVariableIdQN);
+    retval = setConditionVariableFieldProperty(server, *condition, &value,
+                                               fieldAckedStateQN, twoStateVariableIdQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set AckedState/Id Field failed",);
 
 #ifdef CONDITIONOPTIONALFIELDS_SUPPORT
     /* add optional field ConfirmedState*/
-    retval = UA_Server_addConditionOptionalField(server, *condition, acknowledgeableConditionTypeId,
-                                                 fieldConfirmedStateQN, NULL);
+    retval = addConditionOptionalField(server, *condition, acknowledgeableConditionTypeId,
+                                       fieldConfirmedStateQN, NULL);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding ConfirmedState optional Field failed",);
 
     /* Set ConfirmedState (Id = false by default) */
     text = UA_LOCALIZEDTEXT(LOCALE, UNCONFIRMED_TEXT);
     UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-    retval = UA_Server_setConditionField(server, *condition, &value, fieldConfirmedStateQN);
+    retval = setConditionField(server, *condition, &value, fieldConfirmedStateQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set ConfirmedState Field failed",);
 
     UA_Variant_setScalar(&value, &stateId, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    retval = UA_Server_setConditionVariableFieldProperty(server, *condition, &value,
-                                                         fieldConfirmedStateQN,
-                                                         twoStateVariableIdQN);
+    retval = setConditionVariableFieldProperty(server, *condition, &value,
+                                               fieldConfirmedStateQN,
+                                               twoStateVariableIdQN);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set EnabledState/Id Field failed",);
 
 #ifdef UA_ENABLE_ENCRYPTION
@@ -2021,20 +2207,19 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
         UA_NODEID_NUMERIC(0, UA_NS0ID_CERTIFICATEEXPIRATIONALARMTYPE);
     if(isNodeInTree_singleRef(server, conditionType, &certificateConditionTypeId,
                                UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-        retval = UA_Server_addConditionOptionalField(server, *condition, certificateConditionTypeId,
-                                                 fieldExpirationLimitQN, NULL);
+        retval = addConditionOptionalField(server, *condition, certificateConditionTypeId,
+                                           fieldExpirationLimitQN, NULL);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding Expiration Limit optional field failed",);
 
         /* Set the default value for the Expiration limit property */
         UA_Duration defaultValue = EXPIRATION_LIMIT_DEFAULT_VALUE;
-        retval |= UA_Server_writeObjectProperty_scalar(server, *condition, fieldExpirationLimitQN,
-                                                       &defaultValue,
-                                                       &UA_TYPES[UA_TYPES_DURATION]);
+        retval |= writeObjectProperty_scalar(server, *condition, fieldExpirationLimitQN,
+                                             &defaultValue, &UA_TYPES[UA_TYPES_DURATION]);
 
     }
 #endif
 
-#endif//CONDITIONOPTIONALFIELDS_SUPPORT
+#endif /* CONDITIONOPTIONALFIELDS_SUPPORT */
 
     /* 2. Check if ConditionType is subType of AlarmConditionType */
     UA_NodeId alarmConditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ALARMCONDITIONTYPE);
@@ -2043,8 +2228,8 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
         /* Set ActiveState (Id = false by default) */
         text = UA_LOCALIZEDTEXT(LOCALE, INACTIVE_TEXT);
         UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-        retval = UA_Server_setConditionField(server, *condition, &value,
-                                             UA_QUALIFIEDNAME(0,CONDITION_FIELD_ACTIVESTATE));
+        retval = setConditionField(server, *condition, &value,
+                                   UA_QUALIFIEDNAME(0,CONDITION_FIELD_ACTIVESTATE));
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set ActiveState Field failed",);
     }
 
@@ -2055,25 +2240,26 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
                                UA_REFERENCETYPEINDEX_HASSUBTYPE))
         return retval;
 
-    /* Set optional field property. For the LimitAlarm and its subtypes, atleast one limit is mandatory*/
+    /* Set optional field property. For the LimitAlarm and its subtypes, atleast
+     * one limit is mandatory */
     /* Add optional field LowLimit */
-    retval = UA_Server_addConditionOptionalField(server, *condition, LimitAlarmTypeId,
-                                                 fieldLowLimitQN, NULL);
+    retval = addConditionOptionalField(server, *condition, LimitAlarmTypeId,
+                                       fieldLowLimitQN, NULL);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding LowLimit optional Field failed",);
 
     /* Add optional field HighLimit */
-    retval = UA_Server_addConditionOptionalField(server, *condition, LimitAlarmTypeId,
-                                                 fieldHighLimitQN, NULL);
+    retval = addConditionOptionalField(server, *condition, LimitAlarmTypeId,
+                                       fieldHighLimitQN, NULL);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding HighLimit optional Field failed",);
 
     /* Add optional field HighHighLimit */
-    retval = UA_Server_addConditionOptionalField(server, *condition, LimitAlarmTypeId,
-                                                 fieldHighHighLimitQN, NULL);
+    retval = addConditionOptionalField(server, *condition, LimitAlarmTypeId,
+                                       fieldHighHighLimitQN, NULL);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding HighLimit optional Field failed",);
 
     /* Add optional field LowLowLimit */
-    retval = UA_Server_addConditionOptionalField(server, *condition, LimitAlarmTypeId,
-                                                 fieldLowLowLimitQN, NULL);
+    retval = addConditionOptionalField(server, *condition, LimitAlarmTypeId,
+                                       fieldLowLowLimitQN, NULL);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding LowLowLimit optional Field failed",);
 
     /* 4. Check if the ConditionType is subType of RateOfChangeAlarmType */
@@ -2082,11 +2268,11 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
                                UA_REFERENCETYPEINDEX_HASSUBTYPE))
         return retval;
 
-    retval = UA_Server_addConditionOptionalField(server, *condition, RateOfChangeAlarmTypeId,
-                                                fieldEngineeringUnitsQN, NULL);
+    retval = addConditionOptionalField(server, *condition, RateOfChangeAlarmTypeId,
+                                       fieldEngineeringUnitsQN, NULL);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding EngineeringUnit optional Field failed",);
 
-#endif//CONDITIONOPTIONALFIELDS_SUPPORT
+#endif /* CONDITIONOPTIONALFIELDS_SUPPORT */
 
     return retval;
 }
@@ -2095,6 +2281,8 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
 static UA_StatusCode
 setTwoStateVariableCallbacks(UA_Server *server, const UA_NodeId* condition,
                              const UA_NodeId* conditionType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Set EnabledState Callback */
     UA_NodeId twoStateVariableIdNodeId = UA_NODEID_NULL;
     UA_StatusCode retval = getConditionFieldPropertyNodeId(server, condition, &fieldEnabledStateQN,
@@ -2105,7 +2293,7 @@ setTwoStateVariableCallbacks(UA_Server *server, const UA_NodeId* condition,
     UA_ValueCallback callback;
     callback.onRead = NULL;
     callback.onWrite = afterWriteCallbackEnabledStateChange;
-    retval = UA_Server_setVariableNode_valueCallback(server, twoStateVariableIdNodeId, callback);
+    retval = setVariableNode_valueCallback(server, twoStateVariableIdNodeId, callback);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set EnabledState Callback failed",
                                    UA_NodeId_clear(&twoStateVariableIdNodeId););
 
@@ -2121,7 +2309,7 @@ setTwoStateVariableCallbacks(UA_Server *server, const UA_NodeId* condition,
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Id Property of TwoStateVariable not found",);
 
         callback.onWrite = afterWriteCallbackAckedStateChange;
-        retval = UA_Server_setVariableNode_valueCallback(server, twoStateVariableIdNodeId, callback);
+        retval = setVariableNode_valueCallback(server, twoStateVariableIdNodeId, callback);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set AckedState Callback failed",
                                        UA_NodeId_clear(&twoStateVariableIdNodeId););
 
@@ -2134,16 +2322,17 @@ setTwoStateVariableCallbacks(UA_Server *server, const UA_NodeId* condition,
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Id Property of TwoStateVariable not found",);
 
         /* add reference from Condition to Confirm Method */
-        retval = UA_Server_addReference(server, *condition, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE_CONFIRM), true);
+        UA_NodeId hasComponent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
+        UA_NodeId confirm = UA_NODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE_CONFIRM);
+        retval = addRef(server, &server->adminSession, condition, &hasComponent, &confirm, true);
         CONDITION_ASSERT_RETURN_RETVAL(retval,
                                        "Adding HasComponent Reference to Confirm Method failed",
                                        UA_NodeId_clear(&twoStateVariableIdNodeId););
 
-        retval = UA_Server_setVariableNode_valueCallback(server, twoStateVariableIdNodeId, callback);
+        retval = setVariableNode_valueCallback(server, twoStateVariableIdNodeId, callback);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding ConfirmedState/Id callback failed",
                                        UA_NodeId_clear(&twoStateVariableIdNodeId););
-#endif//CONDITIONOPTIONALFIELDS_SUPPORT
+#endif /* CONDITIONOPTIONALFIELDS_SUPPORT */
 
         /* Set ActiveState Callback */
         /* Check if ConditionType is subType of AlarmConditionType */
@@ -2156,7 +2345,7 @@ setTwoStateVariableCallbacks(UA_Server *server, const UA_NodeId* condition,
             CONDITION_ASSERT_RETURN_RETVAL(retval, "Id Property of TwoStateVariable not found",);
 
             callback.onWrite = afterWriteCallbackActiveStateChange;
-            retval = UA_Server_setVariableNode_valueCallback(server, twoStateVariableIdNodeId,
+            retval = setVariableNode_valueCallback(server, twoStateVariableIdNodeId,
                                                              callback);
             CONDITION_ASSERT_RETURN_RETVAL(retval, "Set ActiveState Callback failed",
                                            UA_NodeId_clear(&twoStateVariableIdNodeId););
@@ -2171,6 +2360,8 @@ setTwoStateVariableCallbacks(UA_Server *server, const UA_NodeId* condition,
 static UA_StatusCode
 setConditionVariableCallbacks(UA_Server *server, const UA_NodeId *condition,
                               const UA_NodeId *conditionType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_QualifiedName conditionVariableName[2] = {
         UA_QUALIFIEDNAME(0, CONDITION_FIELD_QUALITY),
@@ -2178,24 +2369,24 @@ setConditionVariableCallbacks(UA_Server *server, const UA_NodeId *condition,
     };// extend array with other fields when needed
 
     UA_BrowsePathResult bpr =
-        UA_Server_browseSimplifiedBrowsePath(server, *condition, 1, &conditionVariableName[0]);
+        browseSimplifiedBrowsePath(server, *condition, 1, &conditionVariableName[0]);
     if(bpr.statusCode != UA_STATUSCODE_GOOD)
         return bpr.statusCode;
     UA_ValueCallback callback ;
     callback.onRead = NULL;
     callback.onWrite = afterWriteCallbackQualityChange;
-    retval = UA_Server_setVariableNode_valueCallback(server, bpr.targets[0].targetId.nodeId,
-                                                     callback);
+    retval = setVariableNode_valueCallback(server, bpr.targets[0].targetId.nodeId,
+                                           callback);
     UA_BrowsePathResult_clear(&bpr);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    bpr = UA_Server_browseSimplifiedBrowsePath(server, *condition, 1, &conditionVariableName[1]);
+    bpr = browseSimplifiedBrowsePath(server, *condition, 1, &conditionVariableName[1]);
     if(bpr.statusCode != UA_STATUSCODE_GOOD)
         return bpr.statusCode;
     callback.onWrite = afterWriteCallbackSeverityChange;
-    retval = UA_Server_setVariableNode_valueCallback(server, bpr.targets[0].targetId.nodeId,
-                                                     callback);
+    retval = setVariableNode_valueCallback(server, bpr.targets[0].targetId.nodeId,
+                                           callback);
     UA_BrowsePathResult_clear(&bpr);
     return retval;
 }
@@ -2206,6 +2397,8 @@ setConditionVariableCallbacks(UA_Server *server, const UA_NodeId *condition,
 static UA_StatusCode
 setConditionMethodCallbacks(UA_Server *server, const UA_NodeId* condition,
                             const UA_NodeId* conditionType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_NodeId methodId[7] = {
         {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_CONDITIONTYPE_DISABLE}},
         {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_CONDITIONTYPE_ENABLE}},
@@ -2219,14 +2412,14 @@ setConditionMethodCallbacks(UA_Server *server, const UA_NodeId* condition,
     };
 
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_Server_setMethodNodeCallback(server, methodId[0], disableMethodCallback);
-    retval |= UA_Server_setMethodNodeCallback(server, methodId[1], enableMethodCallback);
-    retval |= UA_Server_setMethodNodeCallback(server, methodId[2], addCommentMethodCallback);
-    retval |= UA_Server_setMethodNodeCallback(server, methodId[3], refreshMethodCallback);
-    retval |= UA_Server_setMethodNodeCallback(server, methodId[4], refresh2MethodCallback);
-    retval |= UA_Server_setMethodNodeCallback(server, methodId[5], acknowledgeMethodCallback);
+    retval |= setMethodNode_callback(server, methodId[0], disableMethodCallback);
+    retval |= setMethodNode_callback(server, methodId[1], enableMethodCallback);
+    retval |= setMethodNode_callback(server, methodId[2], addCommentMethodCallback);
+    retval |= setMethodNode_callback(server, methodId[3], refreshMethodCallback);
+    retval |= setMethodNode_callback(server, methodId[4], refresh2MethodCallback);
+    retval |= setMethodNode_callback(server, methodId[5], acknowledgeMethodCallback);
 #ifdef CONDITIONOPTIONALFIELDS_SUPPORT
-    retval |= UA_Server_setMethodNodeCallback(server, methodId[6], confirmMethodCallback);
+    retval |= setMethodNode_callback(server, methodId[6], confirmMethodCallback);
 #endif
 
     return retval;
@@ -2235,6 +2428,8 @@ setConditionMethodCallbacks(UA_Server *server, const UA_NodeId* condition,
 static UA_StatusCode
 setStandardConditionCallbacks(UA_Server *server, const UA_NodeId* condition,
                               const UA_NodeId* conditionType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retval = setTwoStateVariableCallbacks(server, condition, conditionType);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Set TwoStateVariable Callback failed",);
 
@@ -2259,14 +2454,12 @@ setStandardConditionCallbacks(UA_Server *server, const UA_NodeId* condition,
 }
 
 static UA_StatusCode
-addCondition_finish(UA_Server *server,
-                    const UA_NodeId conditionId,
-                    const UA_NodeId conditionType,
-                    const UA_QualifiedName conditionName,
-                    const UA_NodeId conditionSource,
-                    const UA_NodeId hierarchialReferenceType) {
-
-    UA_StatusCode retval = UA_Server_addNode_finish(server, conditionId);
+addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
+                    const UA_NodeId conditionType, const UA_QualifiedName conditionName,
+                    const UA_NodeId conditionSource, const UA_NodeId hierarchialReferenceType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    UA_StatusCode retval = AddNode_finish(server, &server->adminSession, &conditionId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Finish node failed",);
 
     /* Make sure the ConditionSource has HasEventSource or one of its SubTypes ReferenceType */
@@ -2274,10 +2467,8 @@ addCondition_finish(UA_Server *server,
     if(!doesHasEventSourceReferenceExist(server, conditionSource) &&
        !UA_NodeId_equal(&serverObject, &conditionSource)) {
          UA_NodeId hasHasEventSourceId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASEVENTSOURCE);
-         UA_ExpandedNodeId expandedConditionSource = UA_EXPANDEDNODEID_NULL;
-         expandedConditionSource.nodeId = conditionSource;
-          retval = UA_Server_addReference(server, serverObject, hasHasEventSourceId,
-                                          expandedConditionSource, true);
+         retval = addRef(server, &server->adminSession, &serverObject, &hasHasEventSourceId,
+                         &conditionSource, true);
           CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating HasHasEventSource Reference "
                                          "to the Server Object failed",);
     }
@@ -2285,27 +2476,22 @@ addCondition_finish(UA_Server *server,
     /* create HasCondition Reference (HasCondition should be forward from the
      * ConditionSourceNode to the Condition. else, HasCondition should be
      * forward from the ConditionSourceNode to the ConditionType Node) */
+    UA_NodeId hasCondition = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCONDITION);
     if(!UA_NodeId_isNull(&hierarchialReferenceType)) {
         /* Create hierarchical Reference to ConditionSource to expose the
          * ConditionNode in Address Space */
         // only Check hierarchialReferenceType
-        UA_ExpandedNodeId expandedNewNodeId = UA_EXPANDEDNODEID_NULL;
-        expandedNewNodeId.nodeId = conditionId;
-        retval = UA_Server_addReference(server, conditionSource, hierarchialReferenceType,
-                                        expandedNewNodeId, true);
+        retval = addRef(server, &server->adminSession, &conditionSource,
+                        &hierarchialReferenceType, &conditionId, true);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating hierarchical Reference to "
                                        "ConditionSource failed",);
 
-        retval = UA_Server_addReference(server, conditionSource,
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCONDITION),
-                                        expandedNewNodeId, true);
+        retval = addRef(server, &server->adminSession, &conditionSource,
+                        &hasCondition, &conditionId, true);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating HasCondition Reference failed",);
     } else {
-        UA_ExpandedNodeId expandedConditionType = UA_EXPANDEDNODEID_NULL;
-        expandedConditionType.nodeId = conditionType;
-        retval = UA_Server_addReference(server, conditionSource,
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCONDITION),
-                                        expandedConditionType, true);
+        retval = addRef(server, &server->adminSession, &conditionSource,
+                        &hasCondition, &conditionType, true);
         if(retval != UA_STATUSCODE_BADDUPLICATEREFERENCENOTALLOWED)
             CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating HasCondition Reference failed",);
     }
@@ -2326,13 +2512,15 @@ addCondition_finish(UA_Server *server,
 
     UA_Boolean startAbstract = false;
     UA_Boolean endAbstract = false;
-    UA_Server_readIsAbstract(server, refreshStartEventTypeNodeId, &startAbstract);
-    UA_Server_readIsAbstract(server, refreshEndEventTypeNodeId, &endAbstract);
+    readWithReadValue(server, &refreshStartEventTypeNodeId,
+                      UA_ATTRIBUTEID_ISABSTRACT, &startAbstract);
+    readWithReadValue(server, &refreshEndEventTypeNodeId,
+                      UA_ATTRIBUTEID_ISABSTRACT, &endAbstract);
 
     UA_Boolean inner = (startAbstract == false && endAbstract == false);
     if(inner) {
-        UA_Server_writeIsAbstract(server, refreshStartEventTypeNodeId, false);
-        UA_Server_writeIsAbstract(server, refreshEndEventTypeNodeId, false);
+        writeIsAbstractAttribute(server, &server->adminSession, &refreshStartEventTypeNodeId, false);
+        writeIsAbstractAttribute(server, &server->adminSession, &refreshEndEventTypeNodeId, false);
     }
 
     /* append Condition to list */
@@ -2353,6 +2541,8 @@ UA_Server_createCondition(UA_Server *server,
                           const UA_NodeId conditionSource,
                           const UA_NodeId hierarchialReferenceType,
                           UA_NodeId *outNodeId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     if(!outNodeId) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "outNodeId cannot be NULL!");
@@ -2361,17 +2551,22 @@ UA_Server_createCondition(UA_Server *server,
 
     UA_StatusCode retval = UA_Server_addCondition_begin(server, conditionId, conditionType,
                                                         conditionName, outNodeId);
-    if(retval != UA_STATUSCODE_GOOD) {
+    if(retval != UA_STATUSCODE_GOOD)
         return retval;
-    }
-    return addCondition_finish(server, *outNodeId, conditionType, conditionName,
+
+    UA_LOCK(&server->serviceMutex);
+    retval = addCondition_finish(server, *outNodeId, conditionType, conditionName,
                                conditionSource, hierarchialReferenceType);
+    UA_UNLOCK(&server->serviceMutex);
+    return retval;
 }
 
 UA_StatusCode
 UA_Server_addCondition_begin(UA_Server *server, const UA_NodeId conditionId,
                              const UA_NodeId conditionType,
                              const UA_QualifiedName conditionName, UA_NodeId *outNodeId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     if(!outNodeId) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "outNodeId cannot be NULL!");
@@ -2380,57 +2575,58 @@ UA_Server_addCondition_begin(UA_Server *server, const UA_NodeId conditionId,
 
     /* Make sure the conditionType is a Subtype of ConditionType */
     UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
-    if(!isNodeInTree_singleRef(server, &conditionType, &conditionTypeId,
-                               UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
+    UA_LOCK(&server->serviceMutex);
+    UA_Boolean found = isNodeInTree_singleRef(server, &conditionType, &conditionTypeId,
+                                              UA_REFERENCETYPEINDEX_HASSUBTYPE);
+    UA_UNLOCK(&server->serviceMutex);
+    if(!found) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of ConditionType!");
         return UA_STATUSCODE_BADNOMATCH;
     }
 
     /* Create an ObjectNode which represents the condition */
-    UA_StatusCode retval;
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
     oAttr.displayName.locale = UA_STRING("en");
     oAttr.displayName.text = conditionName.name;
-    retval = UA_Server_addNode_begin(server,
-                                     UA_NODECLASS_OBJECT,
-                                     conditionId,
-                                     UA_NODEID_NULL,
-                                     UA_NODEID_NULL,
-                                     conditionName,
-                                     conditionType,
-                                     (const UA_NodeAttributes *)&oAttr,
-                                     &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
-                                     NULL,
-                                     outNodeId);
+    UA_StatusCode retval =
+        UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT, conditionId,
+                                UA_NODEID_NULL, UA_NODEID_NULL, conditionName,
+                                conditionType, (const UA_NodeAttributes *)&oAttr,
+                                &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, outNodeId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding Condition failed", );
     return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
-UA_Server_addCondition_finish(UA_Server *server,
-                              const UA_NodeId conditionId,
+UA_Server_addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
                               const UA_NodeId conditionSource,
                               const UA_NodeId hierarchialReferenceType) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
 
     const UA_Node *node = UA_NODESTORE_GET(server, &conditionId);
 
-    if(!node)
+    if(!node) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNODEIDUNKNOWN;
+    }
 
     const UA_Node *type = getNodeType(server, &node->head);
     if(!type) {
         UA_NODESTORE_RELEASE(server, node);
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
     }
 
     UA_StatusCode retval;
     retval = addCondition_finish(server, conditionId, type->head.nodeId, node->head.browseName,
-                                conditionSource, hierarchialReferenceType);
+                                 conditionSource, hierarchialReferenceType);
 
     UA_NODESTORE_RELEASE(server, type);
     UA_NODESTORE_RELEASE(server, node);
 
+    UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
 
@@ -2441,6 +2637,8 @@ addOptionalVariableField(UA_Server *server, const UA_NodeId *originCondition,
                          const UA_QualifiedName *fieldName,
                          const UA_VariableNode *optionalVariableFieldNode,
                          UA_NodeId *outOptionalVariable) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.valueRank = optionalVariableFieldNode->valueRank;
     vAttr.displayName = UA_Session_getNodeDisplayName(&server->adminSession,
@@ -2467,9 +2665,10 @@ addOptionalVariableField(UA_Server *server, const UA_NodeId *originCondition,
     /* Set a random unused NodeId with specified Namespace Index*/
     UA_NodeId optionalVariable = {originCondition->namespaceIndex, UA_NODEIDTYPE_NUMERIC, {0}};
     UA_StatusCode retval =
-        UA_Server_addVariableNode(server, optionalVariable, *originCondition,
-                                  referenceToParent, *fieldName, type->head.nodeId,
-                                  vAttr, NULL, outOptionalVariable);
+        addNode(server, UA_NODECLASS_VARIABLE, &optionalVariable,
+                originCondition, &referenceToParent, *fieldName,
+                &type->head.nodeId, (const UA_NodeAttributes*)&vAttr,
+                &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], NULL, outOptionalVariable);
     UA_NODESTORE_RELEASE(server, type);
     return retval;
 }
@@ -2479,6 +2678,8 @@ addOptionalObjectField(UA_Server *server, const UA_NodeId *originCondition,
                        const UA_QualifiedName* fieldName,
                        const UA_ObjectNode *optionalObjectFieldNode,
                        UA_NodeId *outOptionalObject) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
     oAttr.displayName = UA_Session_getNodeDisplayName(&server->adminSession,
                                                       &optionalObjectFieldNode->head);
@@ -2501,28 +2702,27 @@ addOptionalObjectField(UA_Server *server, const UA_NodeId *originCondition,
         referenceToParent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
 
     UA_NodeId optionalObject = {originCondition->namespaceIndex, UA_NODEIDTYPE_NUMERIC, {0}};
-    UA_StatusCode retval = UA_Server_addObjectNode(server, optionalObject, *originCondition,
-                                     referenceToParent, *fieldName, type->head.nodeId,
-                                     oAttr, NULL, outOptionalObject);
+    UA_StatusCode retval = addNode(server, UA_NODECLASS_OBJECT,
+                                   &optionalObject, originCondition,
+                                   &referenceToParent, *fieldName, &type->head.nodeId,
+                                   (const UA_NodeAttributes*)&oAttr,
+                                   &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, outOptionalObject);
     UA_NODESTORE_RELEASE(server, type);
     return retval;
 }
 
 #endif /* CONDITIONOPTIONALFIELDS_SUPPORT */
 
-/**
- * add an optional condition field using its name. (Adding optional methods
- * is not implemented yet)
- */
-UA_StatusCode
-UA_Server_addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
-                                    const UA_NodeId conditionType, const UA_QualifiedName fieldName,
-                                    UA_NodeId *outOptionalNode) {
+static UA_StatusCode
+addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
+                          const UA_NodeId conditionType, const UA_QualifiedName fieldName,
+                          UA_NodeId *outOptionalNode) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
 #ifdef CONDITIONOPTIONALFIELDS_SUPPORT
     /* Get optional Field NodId from ConditionType -> user should give the
      * correct ConditionType or Subtype!!!! */
-    UA_BrowsePathResult bpr =
-        UA_Server_browseSimplifiedBrowsePath(server, conditionType, 1, &fieldName);
+    UA_BrowsePathResult bpr = browseSimplifiedBrowsePath(server, conditionType, 1, &fieldName);
     if(bpr.statusCode != UA_STATUSCODE_GOOD)
         return bpr.statusCode;
 
@@ -2582,14 +2782,31 @@ UA_Server_addConditionOptionalField(UA_Server *server, const UA_NodeId condition
                  "Adding Condition Optional Fields disabled. StatusCode %s",
                  UA_StatusCode_name(UA_STATUSCODE_BADNOTSUPPORTED));
     return UA_STATUSCODE_BADNOTSUPPORTED;
-#endif//CONDITIONOPTIONALFIELDS_SUPPORT
+#endif /* CONDITIONOPTIONALFIELDS_SUPPORT */
+}
+
+/**
+ * add an optional condition field using its name. (Adding optional methods
+ * is not implemented yet)
+ */
+UA_StatusCode
+UA_Server_addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
+                                    const UA_NodeId conditionType, const UA_QualifiedName fieldName,
+                                    UA_NodeId *outOptionalNode) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = addConditionOptionalField(server, condition, conditionType,
+                                                  fieldName, outOptionalNode);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 /* Set the value of condition field (only scalar). */
 static UA_StatusCode
 setConditionField(UA_Server *server, const UA_NodeId condition,
-                            const UA_Variant* value, const UA_QualifiedName fieldName) {
+                  const UA_Variant* value, const UA_QualifiedName fieldName) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(value->arrayLength != 0 || value->data <= UA_EMPTY_ARRAY_SENTINEL) {
       //TODO implement logic for array variants!
       CONDITION_ASSERT_RETURN_RETVAL(UA_STATUSCODE_BADNOTIMPLEMENTED,
@@ -2600,7 +2817,8 @@ setConditionField(UA_Server *server, const UA_NodeId condition,
     if(bpr.statusCode != UA_STATUSCODE_GOOD)
         return bpr.statusCode;
 
-    UA_StatusCode retval = writeValueAttribute(server, &server->adminSession, &bpr.targets[0].targetId.nodeId, value);
+    UA_StatusCode retval = writeValueAttribute(server, &server->adminSession,
+                                               &bpr.targets[0].targetId.nodeId, value);
     UA_BrowsePathResult_clear(&bpr);
 
     return retval;
@@ -2610,54 +2828,70 @@ setConditionField(UA_Server *server, const UA_NodeId condition,
 UA_StatusCode
 UA_Server_setConditionField(UA_Server *server, const UA_NodeId condition,
                             const UA_Variant* value, const UA_QualifiedName fieldName) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode retval = setConditionField(server, condition, value, fieldName);
     UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
 
+static UA_StatusCode
+setConditionVariableFieldProperty(UA_Server *server, const UA_NodeId condition,
+                                  const UA_Variant* value,
+                                  const UA_QualifiedName variableFieldName,
+                                  const UA_QualifiedName variablePropertyName) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-/* Set the value of property of condition field. */
-UA_StatusCode
-UA_Server_setConditionVariableFieldProperty(UA_Server *server, const UA_NodeId condition,
-                                            const UA_Variant* value,
-                                            const UA_QualifiedName variableFieldName,
-                                            const UA_QualifiedName variablePropertyName) {
-
-  if(value->arrayLength != 0 || value->data <= UA_EMPTY_ARRAY_SENTINEL) {
-      //TODO implement logic for array variants!
-      CONDITION_ASSERT_RETURN_RETVAL(UA_STATUSCODE_BADNOTIMPLEMENTED,
-                                     "Set Property of Condition Field with Array value not implemented",);
+    if(value->arrayLength != 0 || value->data <= UA_EMPTY_ARRAY_SENTINEL) {
+        //TODO implement logic for array variants!
+        CONDITION_ASSERT_RETURN_RETVAL(UA_STATUSCODE_BADNOTIMPLEMENTED,
+                                       "Set Property of Condition Field with Array value not implemented",);
     }
 
-    /*1) find Variable Field of the Condition*/
+    /* 1) find Variable Field of the Condition*/
     UA_BrowsePathResult bprConditionVariableField =
-        UA_Server_browseSimplifiedBrowsePath(server, condition, 1, &variableFieldName);
+        browseSimplifiedBrowsePath(server, condition, 1, &variableFieldName);
     if(bprConditionVariableField.statusCode != UA_STATUSCODE_GOOD)
         return bprConditionVariableField.statusCode;
 
-    /*2) find Property of the Variable Field of the Condition*/
+    /* 2) find Property of the Variable Field of the Condition*/
     UA_BrowsePathResult bprVariableFieldProperty =
-        UA_Server_browseSimplifiedBrowsePath(server,
-                                             bprConditionVariableField.targets->targetId.nodeId,
-                                             1, &variablePropertyName);
+        browseSimplifiedBrowsePath(server, bprConditionVariableField.targets->targetId.nodeId,
+                                   1, &variablePropertyName);
     if(bprVariableFieldProperty.statusCode != UA_STATUSCODE_GOOD) {
         UA_BrowsePathResult_clear(&bprConditionVariableField);
         return bprVariableFieldProperty.statusCode;
     }
 
     UA_StatusCode retval =
-        UA_Server_writeValue(server, bprVariableFieldProperty.targets[0].targetId.nodeId, *value);
+        writeValueAttribute(server, &server->adminSession,
+                            &bprVariableFieldProperty.targets[0].targetId.nodeId, value);
     UA_BrowsePathResult_clear(&bprConditionVariableField);
     UA_BrowsePathResult_clear(&bprVariableFieldProperty);
     return retval;
 }
 
+/* Set the value of property of condition field. */
+UA_StatusCode
+UA_Server_setConditionVariableFieldProperty(UA_Server *server, const UA_NodeId condition,
+                                            const UA_Variant* value,
+                                            const UA_QualifiedName variableFieldName,
+                                            const UA_QualifiedName variablePropertyName) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = setConditionVariableFieldProperty(server, condition, value,
+                                                          variableFieldName, variablePropertyName);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* triggers an event only for an enabled condition. The condition list is
  * updated then with the last generated EventId. */
-UA_StatusCode
-UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
-                                const UA_NodeId conditionSource, UA_ByteString *outEventId){
+static UA_StatusCode
+triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
+                      const UA_NodeId conditionSource, UA_ByteString *outEventId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Check if enabled */
     UA_ByteString eventId = UA_BYTESTRING_NULL;
     UA_QualifiedName enabledStateField = UA_QUALIFIEDNAME(0, CONDITION_FIELD_ENABLEDSTATE);
@@ -2673,7 +2907,7 @@ UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
 
     /* Trigger the event for Condition*/
     //Condition Nodes should not be deleted after triggering the event
-    UA_StatusCode retval = UA_Server_triggerEvent(server, condition, conditionSource, &eventId, false);
+    UA_StatusCode retval = triggerEvent(server, condition, conditionSource, &eventId, false);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Triggering condition event failed",);
 
     setIsCallerAC(server, &condition, &conditionSource, false);
@@ -2687,23 +2921,39 @@ UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
     return retval;
 }
 
+/* triggers an event only for an enabled condition. The condition list is
+ * updated then with the last generated EventId. */
+UA_StatusCode
+UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
+                                const UA_NodeId conditionSource, UA_ByteString *outEventId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = triggerConditionEvent(server, condition, conditionSource, outEventId);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 UA_Server_deleteCondition(UA_Server *server, const UA_NodeId condition,
-                                        const UA_NodeId conditionSource) {
-    // Delete from internal list
-    UA_Boolean found = UA_FALSE;
+                          const UA_NodeId conditionSource) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     /* Get ConditionSource Entry */
+    UA_Boolean found = false; /* Delete from internal list */
     UA_ConditionSource *source, *tmp_source;
+
+    UA_LOCK(&server->serviceMutex);
     LIST_FOREACH_SAFE(source, &server->conditionSources, listEntry, tmp_source) {
         if(!UA_NodeId_equal(&source->conditionSourceId, &conditionSource))
             continue;
+
         /* Get Condition Entry */
         UA_Condition *cond, *tmp_cond;
         LIST_FOREACH_SAFE(cond, &source->conditions, listEntry, tmp_cond) {
             if(!UA_NodeId_equal(&cond->conditionId, &condition))
                 continue;
             deleteCondition(cond);
-            found = UA_TRUE;
+            found = true;
             break;
         }
 
@@ -2714,55 +2964,64 @@ UA_Server_deleteCondition(UA_Server *server, const UA_NodeId condition,
         }
         break;
     }
+    UA_UNLOCK(&server->serviceMutex);
+
     if(!found)
         return UA_STATUSCODE_BADNOTFOUND;
+
     /* Delete from address space */
     return UA_Server_deleteNode(server, condition, true);
 }
 
 static UA_StatusCode
 getLowLimit(UA_Server *server, UA_NodeId conditionId, UA_Double *lowLimit) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_Variant value;
-    UA_StatusCode retval = UA_Server_readObjectProperty(server, conditionId,
-                                UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLIMIT),
-                                &value);
+    UA_StatusCode retval =
+        readObjectProperty(server, conditionId,
+                           UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLIMIT), &value);
     *lowLimit = *(UA_Double*) value.data;
     return retval;
 }
 
 static UA_StatusCode
 getLowLowLimit(UA_Server *server, UA_NodeId conditionId, UA_Double *lowLowLimit) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_Variant value;
-    UA_StatusCode retval = UA_Server_readObjectProperty(server, conditionId,
-                                UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLOWLIMIT),
-                                &value);
+    UA_StatusCode retval =
+        readObjectProperty(server, conditionId,
+                           UA_QUALIFIEDNAME(0, CONDITION_FIELD_LOWLOWLIMIT), &value);
     *lowLowLimit = *(UA_Double*) value.data;
     return retval;
 }
 
 static UA_StatusCode
 getHighLimit(UA_Server *server, UA_NodeId conditionId, UA_Double *highLimit) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_Variant value;
-    UA_StatusCode retval = UA_Server_readObjectProperty(server, conditionId,
-                                UA_QUALIFIEDNAME(0, CONDITION_FIELD_HIGHLIMIT),
-                                &value);
+    UA_StatusCode retval =
+        readObjectProperty(server, conditionId,
+                           UA_QUALIFIEDNAME(0, CONDITION_FIELD_HIGHLIMIT), &value);
     *highLimit = *(UA_Double*) value.data;
     return retval;
 }
 
 static UA_StatusCode
 getHighHighLimit(UA_Server *server, UA_NodeId conditionId, UA_Double *highHighLimit) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_Variant value;
-    UA_StatusCode retval = UA_Server_readObjectProperty(server, conditionId,
-                                UA_QUALIFIEDNAME(0, CONDITION_FIELD_HIGHHIGHLIMIT),
-                                &value);
+    UA_StatusCode retval =
+        readObjectProperty(server, conditionId,
+                           UA_QUALIFIEDNAME(0, CONDITION_FIELD_HIGHHIGHLIMIT), &value);
     *highHighLimit = *(UA_Double*) value.data;
     return retval;
 }
 
-UA_StatusCode
-UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
-                        UA_Double limitValue) {
+static UA_StatusCode
+setLimitState(UA_Server *server, const UA_NodeId conditionId,
+              UA_Double limitValue) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_NodeId limitState;
     UA_Double lowLowLimit;
     UA_Double lowLimit;
@@ -2771,22 +3030,21 @@ UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
     UA_Variant value;
     UA_QualifiedName currentStateField = UA_QUALIFIEDNAME(0,"CurrentState");
     UA_QualifiedName currentStateIdField = UA_QUALIFIEDNAME(0,"Id");
-    UA_StatusCode retval = getConditionFieldNodeId(server, &conditionId, &fieldLimitStateQN, &limitState);
+    UA_StatusCode retval = getConditionFieldNodeId(server, &conditionId,
+                                                   &fieldLimitStateQN, &limitState);
 
     retval |= getHighHighLimit(server, conditionId, &highHighLimit);
     if(retval == UA_STATUSCODE_GOOD) {
         if(limitValue >= highHighLimit) {
             UA_NodeId highHighLimitId;
-            retval |= getConditionFieldNodeId(server, &conditionId, &fieldHighHighLimitQN, &highHighLimitId);
-
+            retval |= getConditionFieldNodeId(server, &conditionId,
+                                              &fieldHighHighLimitQN, &highHighLimitId);
             UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACTIVE_HIGHHIGH_TEXT);
             UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-            retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
-
+            retval |= setConditionField(server, limitState, &value, currentStateField);
             UA_Variant_setScalar(&value, &highHighLimitId, &UA_TYPES[UA_TYPES_NODEID]);
-            retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
-                                                                currentStateField,
-                                                                currentStateIdField);
+            retval |= setConditionVariableFieldProperty(server, limitState, &value,
+                                                        currentStateField, currentStateIdField);
             return retval;
         }
     }
@@ -2796,13 +3054,12 @@ UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
         if(limitValue >= highLimit) {
             UA_NodeId highLimitId;
             retval |= getConditionFieldNodeId(server, &conditionId, &fieldHighLimitQN, &highLimitId);
-
             UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACTIVE_HIGH_TEXT);
             UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-            retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
+            retval |= setConditionField(server, limitState, &value, currentStateField);
 
             UA_Variant_setScalar(&value, &highLimitId, &UA_TYPES[UA_TYPES_NODEID]);
-            retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+            retval |= setConditionVariableFieldProperty(server, limitState, &value,
                                                         currentStateField,
                                                         currentStateIdField);
             return retval;
@@ -2812,16 +3069,14 @@ UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
     retval |= getLowLowLimit(server, conditionId, &lowLowLimit);
     if(retval == UA_STATUSCODE_GOOD) {
         if(limitValue <= lowLowLimit) {
-
             UA_NodeId lowLowLimitId;
-            retval |= getConditionFieldNodeId(server, &conditionId, &fieldLowLowLimitQN, &lowLowLimitId);
-
+            retval |= getConditionFieldNodeId(server, &conditionId,
+                                              &fieldLowLowLimitQN, &lowLowLimitId);
             UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACTIVE_LOWLOW_TEXT);
             UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-            retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
-
+            retval |= setConditionField(server, limitState, &value, currentStateField);
             UA_Variant_setScalar(&value, &lowLowLimitId, &UA_TYPES[UA_TYPES_NODEID]);
-            retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+            retval |= setConditionVariableFieldProperty(server, limitState, &value,
                                                         currentStateField,
                                                         currentStateIdField);
             return retval;
@@ -2833,13 +3088,11 @@ UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
         if(limitValue <= lowLimit) {
             UA_NodeId lowLimitId;
             retval |= getConditionFieldNodeId(server, &conditionId, &fieldLowLimitQN, &lowLimitId);
-
             UA_LocalizedText text = UA_LOCALIZEDTEXT(LOCALE, ACTIVE_LOW_TEXT);
             UA_Variant_setScalar(&value, &text, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-            retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
-
+            retval |= setConditionField(server, limitState, &value, currentStateField);
             UA_Variant_setScalar(&value, &lowLimitId, &UA_TYPES[UA_TYPES_NODEID]);
-            retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+            retval |= setConditionVariableFieldProperty(server, limitState, &value,
                                                         currentStateField,
                                                         currentStateIdField);
             return retval;
@@ -2848,37 +3101,48 @@ UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
 
     UA_LocalizedText textNull = UA_LOCALIZEDTEXT(LOCALE_NULL, TEXT_NULL);
     UA_Variant_setScalar(&value, &textNull, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
-    retval |= UA_Server_setConditionField(server, limitState, &value, currentStateField);
+    retval |= setConditionField(server, limitState, &value, currentStateField);
 
     UA_NodeId nodeIdNull = UA_NODEID_NULL;
     UA_Variant_setScalar(&value, &nodeIdNull, &UA_TYPES[UA_TYPES_NODEID]);
-    retval |= UA_Server_setConditionVariableFieldProperty(server, limitState, &value,
+    retval |= setConditionVariableFieldProperty(server, limitState, &value,
                                                 currentStateField,
                                                 currentStateIdField);
     return retval;
 }
 
+UA_StatusCode
+UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
+                        UA_Double limitValue) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = setLimitState(server, conditionId, limitValue);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* Currently supports only MBEDTLS and OpenSSL */
 UA_StatusCode
 UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
                             UA_ByteString  cert) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_StatusCode retval;
-    if (cert.data == NULL){
+    if(cert.data == NULL){
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                     "No Certificate found.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     UA_CertificateVerification *cv = &server->config.certificateVerification;
-    UA_DateTime  getExpiryDateAndTime;
-    if (cv == NULL && cv->getExpirationDate == NULL){
+    UA_DateTime getExpiryDateAndTime;
+    if(cv == NULL && cv->getExpirationDate == NULL) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                     "Certificate verification and get Expiration date function is not registered");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     
     retval = cv->getExpirationDate(&getExpiryDateAndTime, &cert);
-    if (retval != UA_STATUSCODE_GOOD){
+    if(retval != UA_STATUSCODE_GOOD){
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                     "Failed to get certificate expiration date");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -2891,4 +3155,4 @@ UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
                                                   &UA_TYPES[UA_TYPES_DATETIME]);
     return retval;
 }
-#endif/* UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS */
+#endif /* UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS */

From 41df4e45d9fb01d9e87ea18ef60bf5cabf48fd1a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 26 Oct 2022 10:20:13 +0200
Subject: [PATCH 0498/1963] refactor(server): Cosmetic improvement in
 ua_subscription_events_filter.c

---
 src/server/ua_subscription_events_filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index b3e27c6fd06..4ff8d7d57a5 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -1054,7 +1054,7 @@ filterEvent(UA_Server *server, UA_Session *session,
         result->whereClauseResult.elementResultsSize = filter->whereClause.elementsSize;
         result->whereClauseResult.elementResults = (UA_ContentFilterElementResult *)
             UA_Array_new(filter->whereClause.elementsSize,
-            &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+                         &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
         if(!result->whereClauseResult.elementResults) {
             UA_EventFieldList_clear(efl);
             UA_EventFilterResult_clear(result);

From 526612263dd5e150fa81917c4ff4213bd1b1d5df Mon Sep 17 00:00:00 2001
From: Nico Sonack <nsonack@herrhotzenplotz.de>
Date: Wed, 26 Oct 2022 14:01:25 +0200
Subject: [PATCH 0499/1963] fix(pubsub): Remove usage of pipe2 (#5238)

Use pipe() instead and mark as non-blocking explicitly by calling
fcntl().

Co-authored-by: Julius Pfrommer <jpfr@users.noreply.github.com>
---
 arch/eventloop_posix_interrupt.c | 34 +++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
index 6850bb3ba82..badc0e8699f 100644
--- a/arch/eventloop_posix_interrupt.c
+++ b/arch/eventloop_posix_interrupt.c
@@ -330,6 +330,23 @@ pair(SOCKET fds[2]) {
 }
 #endif
 
+#if !defined(UA_HAVE_EPOLL) && !defined(_WIN32)
+/* mark fd as non-blocking */
+static int
+markNonBlock(int fd)
+{
+    int flags;
+
+    flags = fcntl(fd, F_GETFL);
+    if (flags < 0)
+        return flags;
+
+    flags |= O_NONBLOCK;
+
+    return fcntl(fd, F_SETFL, flags);
+}
+#endif
+
 static UA_StatusCode
 startPOSIXInterruptManager(UA_EventSource *es) {
     /* Check the state */
@@ -361,7 +378,7 @@ startPOSIXInterruptManager(UA_EventSource *es) {
 #ifdef _WIN32
     int err = pair(pipefd);
 #else
-    int err = pipe2(pipefd, O_NONBLOCK);
+    int err = pipe(pipefd);
 #endif
     if(err != 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -371,6 +388,21 @@ startPOSIXInterruptManager(UA_EventSource *es) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+#ifndef _WIN32
+    /* Mark pipes as non-blocking */
+    for (size_t i = 0; i < (sizeof(pipefd) / sizeof(*pipefd)); ++i) {
+        err = markNonBlock(pipefd[i]);
+        if (err != 0) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                               "Interrupt\t| Could mark pipe for "
+                               "self-signaling as non-blocking(%s)",
+                               errno_str));
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+#endif
+
     UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Interrupt\t| Socket pair for the self-pipe: %u,%u",
                  (unsigned)pipefd[0], (unsigned)pipefd[1]);

From 104951dfa7e36b9f5a6479449a79cb535ff635b9 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Mon, 17 Oct 2022 20:45:27 +0200
Subject: [PATCH 0500/1963] fix(pubsub): Improve tests for ReserveIds.

---
 .../check_pubsub_informationmodel_methods.c   | 188 ++++++++++++++----
 1 file changed, 145 insertions(+), 43 deletions(-)

diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index ddad277ec8f..834bea79e4f 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -175,6 +175,45 @@ static void addPublishedDataSets(void){
     UA_free(variablesToAdd);
 }
 
+static UA_StatusCode CallReserveIds(UA_Client *client, UA_String *transportProfileUri,
+    UA_UInt16 numRegWriterGroupIds, UA_UInt16 numRegDataSetWriterIds,
+    UA_Variant* defaultPublisherId, UA_Variant* regWriterGroupIds, UA_Variant *regDataSetWriterIds)
+{
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+
+    UA_Variant *inputArguments = (UA_Variant *) UA_calloc(3, (sizeof(UA_Variant)));
+    UA_Variant_setScalar(&inputArguments[0], transportProfileUri, &UA_TYPES[UA_TYPES_STRING]);
+    UA_Variant_setScalar(&inputArguments[1], &numRegWriterGroupIds, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_Variant_setScalar(&inputArguments[2], &numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_CallMethodRequest callMethodRequest;
+    UA_CallMethodRequest_init(&callMethodRequest);
+    callMethodRequest.inputArgumentsSize = 3;
+    callMethodRequest.inputArguments = inputArguments;
+    callMethodRequest.objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION);
+    callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS);
+
+    UA_CallRequest callReserveIds;
+    UA_CallRequest_init(&callReserveIds);
+    callReserveIds.methodsToCallSize = 1;
+    callReserveIds.methodsToCall = &callMethodRequest;
+
+    UA_CallResponse response = UA_Client_Service_call(client, callReserveIds);
+    ck_assert_uint_eq(1, response.resultsSize);
+    ck_assert_int_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(3, response.results[0].outputArgumentsSize);
+    ret = response.results->statusCode;
+
+    UA_Variant_copy(&response.results[0].outputArguments[0], defaultPublisherId);
+    UA_Variant_copy(&response.results[0].outputArguments[1], regWriterGroupIds);
+    UA_Variant_copy(&response.results[0].outputArguments[2], regDataSetWriterIds);
+
+    UA_free(inputArguments);
+    UA_CallResponse_clear(&response);
+
+    return ret;
+}
+
 START_TEST(AddandRemoveNewPubSubConnectionWithWriterGroup){
         UA_StatusCode retVal;
         UA_Client *client = UA_Client_new();
@@ -1151,7 +1190,7 @@ START_TEST(AddandRemoveReaderGroup){
         UA_LocalizedText_clear(&readerGroupDisplayName);
 } END_TEST
 
-START_TEST(AddReserveIds){
+START_TEST(ReserveIdsMultipleTimes){
         UA_StatusCode retVal;
         UA_Client *client = UA_Client_new();
         UA_ClientConfig_setDefault(UA_Client_getConfig(client));
@@ -1161,52 +1200,115 @@ START_TEST(AddReserveIds){
         }
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-        UA_Variant *inputArguments = (UA_Variant *) UA_calloc(3, (sizeof(UA_Variant)));
-        UA_String transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json");
-        UA_Variant_setScalar(&inputArguments[0], &transportProfileUri, &UA_TYPES[UA_TYPES_STRING]);
-        UA_UInt16 numRegWriterGroupIds = 6;
-        UA_Variant_setScalar(&inputArguments[1], &numRegWriterGroupIds, &UA_TYPES[UA_TYPES_UINT16]);
-        UA_UInt16 numRegDataSetWriterIds = 5;
-        UA_Variant_setScalar(&inputArguments[2], &numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
-
-        UA_CallMethodRequest callMethodRequest;
-        UA_CallMethodRequest_init(&callMethodRequest);
-        callMethodRequest.inputArgumentsSize = 3;
-        callMethodRequest.inputArguments = inputArguments;
-        callMethodRequest.objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION);
-        callMethodRequest.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS);
-
-        UA_CallMethodResult result;
-        UA_CallMethodResult_init(&result);
-        result = UA_Server_call(server, &callMethodRequest);
-        ck_assert_int_eq(result.statusCode, UA_STATUSCODE_GOOD);
-        ck_assert_uint_eq(3, result.outputArgumentsSize);
+        UA_Variant defaultPublisherId;
+        const UA_UInt16 numRegWriterGroupIds = 3;
+        const UA_UInt16 numRegDataSetWriterIds = 3;
+        const UA_UInt16 start = 0x8000;
+        UA_Variant regWriterGroupIds;
+        UA_Variant regDataSetWriterIds;
+        UA_String transportProfileUri =
+            UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+
+        /* Call ReserveIds 1st time - reserve some IDs. */
+        retVal = CallReserveIds(client, &transportProfileUri, numRegWriterGroupIds, numRegDataSetWriterIds,
+            &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
+        ck_assert(UA_StatusCode_isGood(retVal));
+
+        /* Create PubSubConfiguration using some of the reserved IDs. */
+        UA_PubSubConnectionConfig connectionConfig;
+        memset (&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+        connectionConfig.name = UA_STRING("TestConnection");
+        connectionConfig.transportProfileUri = transportProfileUri;
+        UA_NetworkAddressUrlDataType networkAddressUrl;
+        UA_NetworkAddressUrlDataType_init(&networkAddressUrl);
+        networkAddressUrl.url = UA_STRING("opc.udp://224.0.0.1:4840");
+        UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                            &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+        UA_NodeId connectionNodeId, writerGroupNodeId, dataSetWriterNodeId, publishedDataSetNodeId;
+        UA_Server_addPubSubConnection (server, &connectionConfig, &connectionNodeId);
+
+        UA_WriterGroupConfig writerGroupConfig;
+        memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+        writerGroupConfig.name = UA_STRING("TestWriterGroup");
+        writerGroupConfig.writerGroupId = ((UA_UInt16 *)regWriterGroupIds.data)[0]; // Here use the reserved WriterGroupId
+
+        UA_Server_addWriterGroup(server, connectionNodeId, &writerGroupConfig, &writerGroupNodeId);
+
+        UA_PublishedDataSetConfig publishedDataSetConfig;
+        memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
+        publishedDataSetConfig.name = UA_STRING("TestPublishedDataSet");
+        UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetNodeId);
+
+        UA_DataSetWriterConfig dataSetWriterConfig;
+        memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
+        dataSetWriterConfig.name = UA_STRING("TestDataSetWriter");
+        dataSetWriterConfig.dataSetWriterId = ((UA_UInt16 *)regDataSetWriterIds.data)[0]; // Here use the reserved DataSetWriterId
+        UA_Server_addDataSetWriter(server, writerGroupNodeId, publishedDataSetNodeId, &dataSetWriterConfig, &dataSetWriterNodeId);
+
+        UA_Variant_clear(&defaultPublisherId);
+        UA_Variant_clear(&regWriterGroupIds);
+        UA_Variant_clear(&regDataSetWriterIds);
+
+        /* Call ReserveIds 2nd time within the same session and try to reserve
+         * as many IDs as needed to consume the whole pool (and roll over the ID counter). */
+        retVal = CallReserveIds(client, &transportProfileUri,
+            (UA_UInt16)(UA_UINT16_MAX - start - numRegWriterGroupIds + 2),
+            (UA_UInt16)(UA_UINT16_MAX - start - numRegDataSetWriterIds + 2),
+            &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
+        ck_assert(UA_StatusCode_isGood(retVal));
+
+        UA_Variant_clear(&defaultPublisherId);
+        UA_Variant_clear(&regWriterGroupIds);
+        UA_Variant_clear(&regDataSetWriterIds);
+
+        /* Call ReserveIds 3rd time within the same session and try to reserve one more ID from each category -
+         * check if the already reserved IDs are blocked. */
+        retVal = CallReserveIds(client, &transportProfileUri, 1, 1,
+            &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
+        /* TODO: Currently Part 14 doesn't define what should happen if the ID cannot be reserved.
+         * See if that will be defined in future releases. */
+        // ck_assert(UA_StatusCode_isBad(retVal));
+        ck_assert_uint_eq(regWriterGroupIds.arrayLength, 1);
+        ck_assert_uint_eq(((UA_UInt16 *)regWriterGroupIds.data)[0], 0);
+        ck_assert_uint_eq(regDataSetWriterIds.arrayLength, 1);
+        ck_assert_uint_eq(((UA_UInt16 *)regDataSetWriterIds.data)[0], 0);
+
+        UA_Variant_clear(&defaultPublisherId);
+        UA_Variant_clear(&regWriterGroupIds);
+        UA_Variant_clear(&regDataSetWriterIds);
+
+        /* Reconnect client - previous reservations shall be cancelled. */
+        UA_Client_disconnect(client);
+        retVal = UA_Client_connect(client, "opc.tcp://localhost:4840");
+        if(retVal != UA_STATUSCODE_GOOD) {
+            UA_Client_delete(client);
+        }
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-        UA_Variant defaultPublisherId = result.outputArguments[0];
-        UA_Variant writerGroupIds =result.outputArguments[1];
-        UA_Variant dataSetWriterIds = result.outputArguments[2];
-        /* Output Default PublisherId */
-        ck_assert_str_eq("String", defaultPublisherId.type->typeName);
-        ck_assert_uint_eq(0, defaultPublisherId.arrayLength);
-        /* Output Reserved Writer Group Ids */
-        ck_assert_str_eq("UInt16", writerGroupIds.type->typeName);
-        ck_assert_uint_eq(numRegWriterGroupIds, writerGroupIds.arrayLength);
-        /* Output Reserved Data Set Writer Ids */
-        ck_assert_str_eq("UInt16", dataSetWriterIds.type->typeName);
-        ck_assert_uint_eq(numRegDataSetWriterIds, dataSetWriterIds.arrayLength);
-
-        /* Check reserved Ids */
-        UA_UInt16 start = 0x8000;
-        for(size_t i = 0; i < writerGroupIds.arrayLength; i++) {
-            ck_assert_uint_eq(start+i, ((UA_UInt16 *)writerGroupIds.data)[i]);
+        /* Call ReserveIds again - check if the new reservation takes into account
+         * the IDs alrady being used by PubSub configuration. */
+        retVal = CallReserveIds(client, &transportProfileUri, numRegWriterGroupIds, numRegDataSetWriterIds,
+            &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
+        ck_assert(UA_StatusCode_isGood(retVal));
+
+        /* Check reserved WriterGroupIds */
+        ck_assert_str_eq("UInt16", regWriterGroupIds.type->typeName);
+        ck_assert_uint_eq(numRegWriterGroupIds, regWriterGroupIds.arrayLength);
+        for(size_t i = 0; i < regWriterGroupIds.arrayLength; i++) {
+            ck_assert_uint_eq(start + i + 1, ((UA_UInt16 *)regWriterGroupIds.data)[i]); // Here check if the reservations started from 0x8000 + 1
         }
-        for(size_t i = 0; i < dataSetWriterIds.arrayLength; i++) {
-            ck_assert_uint_eq(start+i, ((UA_UInt16 *)dataSetWriterIds.data)[i]);
+
+        /* Check reserved DataSetWriterIds */
+        ck_assert_str_eq("UInt16", regDataSetWriterIds.type->typeName);
+        ck_assert_uint_eq(numRegDataSetWriterIds, regDataSetWriterIds.arrayLength);
+        for(size_t i = 0; i < regDataSetWriterIds.arrayLength; i++) {
+            ck_assert_uint_eq(start + i + 1, ((UA_UInt16 *)regDataSetWriterIds.data)[i]); // Here check if the reservations started from 0x8000 + 1
         }
 
-        UA_free(inputArguments);
+        UA_Variant_clear(&defaultPublisherId);
+        UA_Variant_clear(&regWriterGroupIds);
+        UA_Variant_clear(&regDataSetWriterIds);
 
-        UA_CallMethodResult_clear(&result);
         UA_Client_disconnect(client);
         UA_Client_delete(client);
 } END_TEST
@@ -1263,7 +1365,7 @@ int main(void) {
     tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, AddNewPubSubConnectionWithReaderGroupandDataSetReader);
     tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, AddNewPubSubConnectionWithReaderGroup);
     tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, AddandRemoveReaderGroup);
-    tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, AddReserveIds);
+    tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, ReserveIdsMultipleTimes);
     tcase_add_test(tc_add_pubsub_informationmodel_methods_connection, ReserveIdsInvalidTransportUri);
 
     Suite *s = suite_create("PubSub CRUD configuration by the information model functions");

From fab37539f6c2f5741ace0a41780c62c39f53f6df Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Mon, 17 Oct 2022 20:46:23 +0200
Subject: [PATCH 0501/1963] fix(pubsub): Fix a memory leak in the ReserveIds
 logic.

---
 src/pubsub/ua_pubsub_manager.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 96e1cf1f6d8..7dca27d3779 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -226,7 +226,9 @@ UA_PubSubManager_freeIds(UA_Server *server) {
         }
         if(!is_active) {
             server->pubSubManager.reserveIdsSize--;
+            UA_String_clear(&reserveId1->transportProfileUri);
             LIST_REMOVE(reserveId1, listEntry);
+            UA_free(reserveId1);
         }
     }
 }

From 83cc875dafcd6db900cb2e89915c6ac3626eb973 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Mon, 17 Oct 2022 20:51:44 +0200
Subject: [PATCH 0502/1963] fix(pubsub): Fix a bug in the ReserveIds logic.

NodeId of the DataSetWriter Object was used in comparison
instead of the DataSetWriterId.
---
 src/pubsub/ua_pubsub_manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 7dca27d3779..e56b89e1b97 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -155,7 +155,7 @@ UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id, UA_String transportProfile
                 UA_DataSetWriter *currentWriter;
                 LIST_FOREACH(currentWriter, &writerGroup->writers, listEntry) {
                     if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) &&
-                    currentWriter->identifier.identifierType == UA_NODEIDTYPE_NUMERIC && currentWriter->identifier.identifier.numeric == id)
+                    currentWriter->config.dataSetWriterId == id)
                        return false;
                 }
             }

From d5b40c6356a687f9c01941f168253e3a36d3b283 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Tue, 25 Oct 2022 18:03:13 +0200
Subject: [PATCH 0503/1963] Enable faster testing for the boundary conditions.

It's interesting to test what happens if all available IDs are reserved.
Additionally, the only way to roll over the ID counter is to reserve all
available IDs. However, testing such boundary condition involves a large
number of iterations in the implementation. Implemented a special
compile flag to reduce the number of required iterations just for
testing.
---
 CMakeLists.txt                                |  3 +++
 include/open62541/config.h.in                 |  1 +
 src/pubsub/ua_pubsub_manager.c                |  8 ++++++++
 .../check_pubsub_informationmodel_methods.c   | 19 +++++++++++++------
 tools/ci.sh                                   |  5 +++++
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc642e99b4b..8828ba3872a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -551,6 +551,9 @@ mark_as_advanced(UA_ENABLE_DISCOVERY_SEMAPHORE)
 option(UA_ENABLE_UNIT_TESTS_MEMCHECK "Use Valgrind (Linux) or DrMemory (Windows) to detect memory leaks when running the unit tests" OFF)
 mark_as_advanced(UA_ENABLE_UNIT_TESTS_MEMCHECK)
 
+option(UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING "Reduce the number of iterations required for testing a feature (e.g. to roll over a counter)" OFF)
+mark_as_advanced(UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING)
+
 set(UA_VALGRIND_INTERACTIVE_INTERVAL 1000 CACHE STRING "The number of iterations to wait before creating the next dump")
 mark_as_advanced(UA_VALGRIND_INTERACTIVE_INTERVAL)
 
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 2bc3af7a555..44ac46c9497 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -77,6 +77,7 @@
 #cmakedefine UA_ENABLE_PUBSUB_MONITORING
 #cmakedefine UA_ENABLE_PUBSUB_BUFMALLOC
 #cmakedefine UA_ENABLE_PUBSUB_SKS
+#cmakedefine UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING
 
 #cmakedefine UA_PACK_DEBIAN
 
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index e56b89e1b97..c0acd5d587d 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -27,6 +27,9 @@
 
 #define UA_DATETIMESTAMP_2000 125911584000000000
 #define UA_RESERVEID_FIRST_ID 0x8000
+#ifdef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING
+#define UA_RESERVEID_LAST_ID UA_RESERVEID_FIRST_ID + 10
+#endif
 
 static UA_PubSubTransportLayer *
 getTransportProtocolLayer(const UA_Server *server,
@@ -180,8 +183,13 @@ UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId, UA_String transpo
         next_id = next_id_writer;
 
     for(;numberOfIds > 0;numberOfIds--) {
+#ifndef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING        
         if(next_id < UA_RESERVEID_FIRST_ID)
             next_id = UA_RESERVEID_FIRST_ID;
+#else
+        if(next_id > UA_RESERVEID_LAST_ID)
+            next_id = UA_RESERVEID_FIRST_ID;
+#endif
         is_free = UA_ReserveId_isFree(server, next_id, transportProfileUri, reserveIdType);
         if(is_free)
             break;
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 834bea79e4f..62a6b36beda 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -1203,7 +1203,14 @@ START_TEST(ReserveIdsMultipleTimes){
         UA_Variant defaultPublisherId;
         const UA_UInt16 numRegWriterGroupIds = 3;
         const UA_UInt16 numRegDataSetWriterIds = 3;
-        const UA_UInt16 start = 0x8000;
+        const UA_UInt16 firstId = 0x8000;
+#ifdef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING        
+        const UA_UInt16 lastId = 0x8000 + 10;
+#else
+        const UA_UInt16 lastId = UA_UINT16_MAX;
+        #pragma message "Running this test without enabling UA_ENABLE_REDUCED_ITERATIONS takes very long time."
+#endif
+
         UA_Variant regWriterGroupIds;
         UA_Variant regDataSetWriterIds;
         UA_String transportProfileUri =
@@ -1252,8 +1259,8 @@ START_TEST(ReserveIdsMultipleTimes){
         /* Call ReserveIds 2nd time within the same session and try to reserve
          * as many IDs as needed to consume the whole pool (and roll over the ID counter). */
         retVal = CallReserveIds(client, &transportProfileUri,
-            (UA_UInt16)(UA_UINT16_MAX - start - numRegWriterGroupIds + 2),
-            (UA_UInt16)(UA_UINT16_MAX - start - numRegDataSetWriterIds + 2),
+            (UA_UInt16)(lastId - firstId - numRegWriterGroupIds + 1),
+            (UA_UInt16)(lastId - firstId - numRegDataSetWriterIds + 1),
             &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
         ck_assert(UA_StatusCode_isGood(retVal));
 
@@ -1266,7 +1273,7 @@ START_TEST(ReserveIdsMultipleTimes){
         retVal = CallReserveIds(client, &transportProfileUri, 1, 1,
             &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
         /* TODO: Currently Part 14 doesn't define what should happen if the ID cannot be reserved.
-         * See if that will be defined in future releases. */
+         * There is an open Mantis issue #8415. */
         // ck_assert(UA_StatusCode_isBad(retVal));
         ck_assert_uint_eq(regWriterGroupIds.arrayLength, 1);
         ck_assert_uint_eq(((UA_UInt16 *)regWriterGroupIds.data)[0], 0);
@@ -1295,14 +1302,14 @@ START_TEST(ReserveIdsMultipleTimes){
         ck_assert_str_eq("UInt16", regWriterGroupIds.type->typeName);
         ck_assert_uint_eq(numRegWriterGroupIds, regWriterGroupIds.arrayLength);
         for(size_t i = 0; i < regWriterGroupIds.arrayLength; i++) {
-            ck_assert_uint_eq(start + i + 1, ((UA_UInt16 *)regWriterGroupIds.data)[i]); // Here check if the reservations started from 0x8000 + 1
+            ck_assert_uint_eq(firstId + i + 1, ((UA_UInt16 *)regWriterGroupIds.data)[i]); // Here check if the reservations started from 0x8000 + 1
         }
 
         /* Check reserved DataSetWriterIds */
         ck_assert_str_eq("UInt16", regDataSetWriterIds.type->typeName);
         ck_assert_uint_eq(numRegDataSetWriterIds, regDataSetWriterIds.arrayLength);
         for(size_t i = 0; i < regDataSetWriterIds.arrayLength; i++) {
-            ck_assert_uint_eq(start + i + 1, ((UA_UInt16 *)regDataSetWriterIds.data)[i]); // Here check if the reservations started from 0x8000 + 1
+            ck_assert_uint_eq(firstId + i + 1, ((UA_UInt16 *)regDataSetWriterIds.data)[i]); // Here check if the reservations started from 0x8000 + 1
         }
 
         UA_Variant_clear(&defaultPublisherId);
diff --git a/tools/ci.sh b/tools/ci.sh
index 9a1a978363a..a676f11591a 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -145,6 +145,7 @@ function unit_tests {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
+          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           ..
@@ -203,6 +204,7 @@ function unit_tests_diag {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
+          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           ..
     make ${MAKEOPTS}
@@ -284,6 +286,7 @@ function unit_tests_pubsub_sks {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
+          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           -DUA_ENABLE_PUBSUB_SKS=ON \
@@ -313,6 +316,7 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
+          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           ..
@@ -342,6 +346,7 @@ function unit_tests_valgrind {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
+          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           ..

From d4b3a9bd3a6df84cdc0598659de2322d44153a58 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Wed, 27 Jul 2022 14:24:33 +0200
Subject: [PATCH 0504/1963] feat(pubsub): add GetSecurityKeys method node
 callback

The SKS pull model requires the publishers and subscribers to call the
GetSecurityKeys method node to get the key material from SKS. The
GetSecurityKeysAction function is added. It checks the whether the channel
is encrypted, the user has access rights, the securitygroup is managed by
SKS, and returns the requested keymaterial to the caller of this function.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_ns0.c | 132 +++++++++++++++++++++++++++++++++++++
 1 file changed, 132 insertions(+)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 0dc2df3babe..12f4087aafe 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1849,6 +1849,137 @@ setSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessi
 
 #endif
 
+#if defined(UA_ENABLE_PUBSUB_SKS) && defined(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
+static UA_StatusCode
+getSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessionHandle,
+                      const UA_NodeId *methodId, void *methodContext,
+                      const UA_NodeId *objectId, void *objectContext, size_t inputSize,
+                      const UA_Variant *input, size_t outputSize, UA_Variant *output) {
+    /*Check whether the channel is encrypted according to specification*/
+    session_list_entry *session_entry;
+    LIST_FOREACH(session_entry, &server->sessions, pointers) {
+        if(UA_NodeId_equal(&session_entry->session.sessionId, sessionId)) {
+            if(session_entry->session.header.channel->securityMode !=
+               UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
+                return UA_STATUSCODE_BADSECURITYMODEINSUFFICIENT;
+        }
+    }
+
+    if(!server || !input)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    if(inputSize < 3 || outputSize < 5)
+        return UA_STATUSCODE_BADARGUMENTSMISSING;
+    if(inputSize > 3 || outputSize > 5)
+        return UA_STATUSCODE_BADTOOMANYARGUMENTS;
+
+    /*check for types*/
+    if(!UA_Variant_hasScalarType(&input[0],
+                                 &UA_TYPES[UA_TYPES_STRING]) || /*SecurityGroupId*/
+       !UA_Variant_hasScalarType(&input[1],
+                                 &UA_TYPES[UA_TYPES_UINT32]) || /*StartingTokenId*/
+       !UA_Variant_hasScalarType(&input[2],
+                                 &UA_TYPES[UA_TYPES_UINT32])) /*RequestedKeyCount*/
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_UInt32 currentKeyCount = 1;
+    /* input */
+    UA_String *securityGroupId = (UA_String *)input[0].data;
+    UA_UInt32 startingTokenId = *(UA_UInt32 *)input[1].data;
+    UA_UInt32 requestedKeyCount = *(UA_UInt32 *)input[2].data;
+
+    UA_PubSubKeyStorage *ks =
+        UA_Server_findKeyStorage(server, *securityGroupId);
+    if(!ks)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    UA_Boolean executable = UA_FALSE;
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyName(server, *securityGroupId);
+    void *sgNodeCtx;
+    getNodeContext(server, sg->securityGroupNodeId, (void **)&sgNodeCtx);
+    executable = server->config.accessControl.getUserExecutableOnObject(
+        server, &server->config.accessControl, sessionId, sessionHandle, methodId,
+        methodContext, &sg->securityGroupNodeId, sgNodeCtx);
+
+    if(!executable)
+        return UA_STATUSCODE_BADUSERACCESSDENIED;
+
+    /* If the caller requests a number larger than the Security Key Service permits, then
+     * the SKS shall return the maximum it allows.*/
+    if(requestedKeyCount > sg->config.maxFutureKeyCount)
+        requestedKeyCount =(UA_UInt32) sg->keyStorage->keyListSize;
+    else
+        requestedKeyCount = requestedKeyCount + currentKeyCount; /* Add Current keyCount */
+
+    /*The current token is requested by passing 0.*/
+    UA_PubSubKeyListItem *startingItem = NULL;
+    if(startingTokenId == 0) {
+        /* currentItem is always set by the server when a security group is added */
+        UA_assert(sg->keyStorage->currentItem != NULL);
+        startingItem = sg->keyStorage->currentItem;
+    } else {
+        retval = UA_PubSubKeyStorage_getKeyByKeyID(
+            startingTokenId, sg->keyStorage, &startingItem);
+        /*If the StartingTokenId is unknown, the oldest (firstItem) available tokens are
+         * returned. */
+        if(retval == UA_STATUSCODE_BADNOTFOUND)
+            startingItem =  TAILQ_FIRST(&sg->keyStorage->keyList);
+    }
+
+    /*SecurityPolicyUri*/
+    retval = UA_Variant_setScalarCopy(&output[0], &(sg->keyStorage->policy->policyUri),
+                         &UA_TYPES[UA_TYPES_STRING]);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /*FirstTokenId*/
+    retval = UA_Variant_setScalarCopy(&output[1], &startingItem->keyID,
+                                      &UA_TYPES[UA_TYPES_INTEGERID]);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /*TimeToNextKey*/
+    UA_DateTime baseTime = sg->baseTime;
+    UA_DateTime currentTime = UA_DateTime_nowMonotonic();
+    UA_Duration interval = sg->config.keyLifeTime;
+    UA_Duration timeToNextKey =
+        (UA_Duration)((currentTime - baseTime) / UA_DATETIME_MSEC);
+    timeToNextKey = interval - timeToNextKey;
+    retval = UA_Variant_setScalarCopy(&output[3], &timeToNextKey,
+                                      &UA_TYPES[UA_TYPES_DURATION]);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /*KeyLifeTime*/
+    retval = UA_Variant_setScalarCopy(&output[4], &sg->config.keyLifeTime,
+                         &UA_TYPES[UA_TYPES_DURATION]);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /*Keys*/
+    UA_PubSubKeyListItem *iterator = startingItem;
+    output[2].data = (UA_ByteString *)UA_calloc(requestedKeyCount, startingItem->key.length);
+    if(!output[2].data)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    UA_ByteString *requestedKeys = (UA_ByteString *)output[2].data;
+    UA_UInt32 retkeyCount = 0;
+    for(size_t i = 0; i < requestedKeyCount; i++) {
+        UA_ByteString_copy(&iterator->key, &requestedKeys[i]);
+        ++retkeyCount;
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+        if(!iterator) {
+            requestedKeyCount = retkeyCount;
+            break;
+        }
+    }
+
+    UA_Variant_setArray(&output[2], requestedKeys, requestedKeyCount, &UA_TYPES[UA_TYPES_BYTESTRING]);
+    return retval;
+}
+#endif
+
 /**********************************************/
 /*                Destructors                 */
 /**********************************************/
@@ -2110,6 +2241,7 @@ UA_Server_initPubSubNS0(UA_Server *server) {
     retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS), addReserveIdsAction);
 #ifdef UA_ENABLE_PUBSUB_SKS
     retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SETSECURITYKEYS), setSecurityKeysAction);
+    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS), getSecurityKeysAction);
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG

From e5dff0536073852216ae8611f1a3ec8de40f7fac Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Wed, 27 Jul 2022 14:30:55 +0200
Subject: [PATCH 0505/1963] test(pubsub): add unit tests for GetSecurityKeys
 method node

The GetSecurityKeys method node must be tested for the use cases defined in
the Part 14. The unit tests are implemented for the following cases
  @testcases:
  - bad insufficient security mode
  - bad not found
  - bad user access denied
  - good and valid output
  - request current Token with future keys
  - request current Token without future Keys
  - request Past key
  - request unknown starting token id
  - request maxFutureKeys

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/CMakeLists.txt                 |   1 +
 tests/pubsub/check_pubsub_sks_pull.c | 479 +++++++++++++++++++++++++++
 2 files changed, 480 insertions(+)
 create mode 100644 tests/pubsub/check_pubsub_sks_pull.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9ab660fb0d4..f9eba5fd3e5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -321,6 +321,7 @@ if(UA_ENABLE_PUBSUB)
         if(UA_ENABLE_PUBSUB_SKS)
             ua_add_test(pubsub/check_pubsub_keystorage.c)
             ua_add_test(pubsub/check_pubsub_sks_push.c)
+            ua_add_test(pubsub/check_pubsub_sks_pull.c)
             ua_add_test(pubsub/check_pubsub_sks_securitygroups.c)
         endif()
     endif()
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
new file mode 100644
index 00000000000..ade3a45bb56
--- /dev/null
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -0,0 +1,479 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/server_config_default.h>
+#include <open62541/server_pubsub.h>
+
+#include "ua_pubsub.h"
+#include "ua_pubsub_keystorage.h"
+#include "ua_server_internal.h"
+
+#include <check.h>
+#include "testing_clock.h"
+#include "../encryption/certificates.h"
+#include "thread_wrapper.h"
+
+#define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
+#define policUri "http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR"
+
+UA_Server *sksServer = NULL;
+UA_String securityGroupId;
+UA_NodeId sgNodeId;
+UA_UInt32 maxKeyCount;
+UA_NodeId connection;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(sksServer, true);
+    return 0;
+}
+
+static void
+addSecurityGroup(void) {
+    UA_NodeId securityGroupParent =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
+    UA_NodeId outNodeId;
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 2000;
+    config.securityPolicyUri = UA_STRING(policUri);
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 1;
+    config.maxPastKeyCount = 1;
+
+    maxKeyCount = config.maxPastKeyCount + 1 + config.maxFutureKeyCount;
+
+    UA_Server_addSecurityGroup(sksServer, securityGroupParent, &config, &outNodeId);
+    UA_String_copy(&config.securityGroupName, &securityGroupId);
+
+    UA_String allowedUsername = UA_STRING("user1");
+
+    UA_ByteString *username = UA_ByteString_new();
+    UA_ByteString_copy(&allowedUsername, username);
+    UA_Server_setNodeContext(sksServer, outNodeId, username);
+    UA_NodeId_copy(&outNodeId, &sgNodeId);
+}
+
+static UA_Boolean
+getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
+                              const UA_NodeId *sessionId, void *sessionContext,
+                              const UA_NodeId *methodId, void *methodContext,
+                              const UA_NodeId *objectId, void *objectContext) {
+    /* For the CTT, recognize whether two sessions are  */
+    if(objectContext && sessionContext) {
+        UA_ByteString *username = (UA_ByteString *)objectContext;
+        UA_ByteString *sessionUsername = (UA_ByteString *)sessionContext;
+        if(!UA_ByteString_equal(username, sessionUsername))
+            return false;
+    }
+    return true;
+}
+
+static void
+setup(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    size_t trustListSize = 0;
+    UA_ByteString *trustList = NULL;
+    size_t issuerListSize = 0;
+    UA_ByteString *issuerList = NULL;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    sksServer = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(sksServer);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(
+        config, 4840, &certificate, &privateKey, trustList, trustListSize, issuerList,
+        issuerListSize, revocationList, revocationListSize);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+
+    config->pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("UADP Connection");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {
+        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_Server_addPubSubConnection(sksServer, &connectionConfig, &connection);
+
+    /*User Access Control*/
+    config->accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
+
+    addSecurityGroup();
+
+    UA_Server_run_startup(sksServer);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void
+teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(sksServer);
+    UA_Server_delete(sksServer);
+}
+
+static UA_StatusCode
+encyrptedclientconnect(UA_Client *client, const char *username, const char *password ) {
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* Secure client initialization */
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey, trustList,
+                                         trustListSize, revocationList,
+                                         revocationListSize);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    ck_assert(client != NULL);
+
+    /* Secure client connect */
+    return UA_Client_connectUsername(client, "opc.tcp://localhost:4840", username, password);
+}
+
+static UA_CallResponse
+callGetSecurityKeys(UA_Client *client, UA_String sksSecurityGroupId,
+                    UA_UInt32 startingTokenId, UA_UInt32 requestedKeyCount) {
+    UA_Variant *inputArguments = (UA_Variant *)UA_calloc(3, (sizeof(UA_Variant)));
+
+    UA_Variant_setScalarCopy(&inputArguments[0], &sksSecurityGroupId,
+                             &UA_TYPES[UA_TYPES_STRING]);
+    UA_Variant_setScalarCopy(&inputArguments[1], &startingTokenId,
+                             &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant_setScalarCopy(&inputArguments[2], &requestedKeyCount,
+                             &UA_TYPES[UA_TYPES_UINT32]);
+
+    // Call method from client
+    UA_CallRequest callMethodRequestFromClient;
+    UA_CallRequest_init(&callMethodRequestFromClient);
+    UA_CallMethodRequest item;
+    UA_CallMethodRequest_init(&item);
+
+    callMethodRequestFromClient.methodsToCall = &item;
+    callMethodRequestFromClient.methodsToCallSize = 1;
+    item.objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE);
+    item.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS);
+    item.inputArguments = (UA_Variant *)inputArguments;
+    item.inputArgumentsSize = 3;
+    return UA_Client_Service_call(client, callMethodRequestFromClient);
+}
+
+START_TEST(getSecuritykeysBadSecurityModeInsufficient) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(client);
+    }
+    UA_StatusCode expectedCode = UA_STATUSCODE_BADSECURITYMODEINSUFFICIENT;
+    UA_CallResponse response = callGetSecurityKeys(client, securityGroupId, 1, 1);
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+}
+END_TEST
+
+START_TEST(getSecuritykeysBadNotFound) {
+    UA_Client *sksClient = UA_Client_new();
+    encyrptedclientconnect(sksClient, "user1", "password");
+    UA_String badSecurityGroupId = UA_STRING("BadSecurityGroupId");
+    UA_StatusCode expectedCode = UA_STATUSCODE_BADNOTFOUND;
+    UA_CallResponse response = callGetSecurityKeys(sksClient, badSecurityGroupId, 1, 1);
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+}
+END_TEST
+
+START_TEST(getSecuritykeysBadUserAccessDenied) {
+    UA_Client *sksClient = UA_Client_new();
+    encyrptedclientconnect(sksClient, "user2", "password1");
+    UA_StatusCode expectedCode = UA_STATUSCODE_BADUSERACCESSDENIED;
+    UA_UInt32 reqkeyCount = 1;
+    UA_CallResponse response =
+        callGetSecurityKeys(sksClient, securityGroupId, 1, reqkeyCount);
+    /* set SecurityGroupNodeContext to username
+        compare the SGNodeContext with sessioncontext in getUserExecutableOnObject
+    */
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+}
+END_TEST
+
+START_TEST(getSecuritykeysGoodAndValidOutput) {
+    UA_fakeSleep(1000);
+    UA_Client *sksClient = UA_Client_new();
+    encyrptedclientconnect(sksClient, "user1", "password");
+    UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
+    UA_UInt32 reqkeyCount = 1;
+    UA_CallResponse response = callGetSecurityKeys(sksClient, securityGroupId, 1, reqkeyCount);
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+    ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
+
+    UA_Variant *output = response.results->outputArguments;
+    /* check types */
+    ck_assert(output[0].type == &UA_TYPES[UA_TYPES_STRING]);
+    ck_assert(output[1].type == &UA_TYPES[UA_TYPES_INTEGERID] ||
+              output[1].type == &UA_TYPES[UA_TYPES_UINT32]);
+    ck_assert(output[2].type == &UA_TYPES[UA_TYPES_BYTESTRING]);
+    ck_assert(output[3].type == &UA_TYPES[UA_TYPES_DURATION] ||
+              output[3].type == &UA_TYPES[UA_TYPES_DOUBLE]);
+    ck_assert(output[4].type == &UA_TYPES[UA_TYPES_DURATION] ||
+              output[4].type == &UA_TYPES[UA_TYPES_DOUBLE]);
+
+    /* epected values */
+    UA_String *securityPolicyUri = (UA_String *)output[0].data;
+    UA_String expectedUri = UA_STRING(policUri);
+    ck_assert(UA_String_equal(securityPolicyUri, &expectedUri) == UA_TRUE);
+
+    UA_IntegerId expectedToken = 1;
+    UA_IntegerId firstTokenId = *(UA_IntegerId *)output[1].data;
+    ck_assert(expectedToken == firstTokenId);
+
+    size_t retKeyCount = output[2].arrayLength;
+    UA_UInt32 totalReqkeyCount = reqkeyCount + 1;
+    ck_assert(retKeyCount == totalReqkeyCount || retKeyCount == maxKeyCount );
+    UA_ByteString *keys = (UA_ByteString *)output[2].data;
+    for(size_t i = 0; i < retKeyCount; i++) {
+        ck_assert(UA_ByteString_equal(&keys[i], &UA_BYTESTRING_NULL) == UA_FALSE);
+    }
+}
+END_TEST
+
+START_TEST(requestCurrentKeyWithFutureKeys) {
+    UA_fakeSleep(1000);
+    UA_Client *sksClient = UA_Client_new();
+    encyrptedclientconnect(sksClient, "user1", "password");
+    UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
+    UA_UInt32 reqkeyCount = 1;
+    UA_UInt32 reqStartingTokenId = 0;
+    UA_CallResponse response = callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+    ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(sksServer, sgNodeId);
+    UA_Variant *output = response.results->outputArguments;
+
+    UA_UInt32 firstTokenId = *(UA_UInt32 *) output[1].data;
+    size_t retKeyCount = output[2].arrayLength;
+    ck_assert(reqkeyCount + 1 == retKeyCount);
+
+    UA_ByteString *retKeys = (UA_ByteString *)output[2].data;
+    UA_PubSubKeyListItem *iterator = sg->keyStorage->currentItem;
+    for (size_t i = 0; i < retKeyCount; i++)
+    {
+        ck_assert(UA_ByteString_equal(&retKeys[i], &iterator->key) == UA_TRUE);
+        ck_assert(firstTokenId == iterator->keyID);
+        ++firstTokenId;
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+    }
+
+}
+END_TEST
+
+START_TEST(requestCurrentKeyOnly) {
+    UA_fakeSleep(1000);
+    UA_Client *sksClient = UA_Client_new();
+    encyrptedclientconnect(sksClient, "user1", "password");
+    UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
+    UA_UInt32 reqkeyCount = 0;
+    UA_UInt32 reqStartingTokenId = 0;
+    UA_CallResponse response =
+        callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+    ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(sksServer, sgNodeId);
+    UA_Variant *output = response.results->outputArguments;
+
+    UA_UInt32 firstTokenId = *(UA_UInt32 *)output[1].data;
+    size_t retKeyCount = output[2].arrayLength;
+    ck_assert(retKeyCount == 1);
+
+    UA_ByteString *retKeys = (UA_ByteString *)output[2].data;
+    UA_PubSubKeyListItem *iterator = sg->keyStorage->currentItem;
+    for(size_t i = 0; i < retKeyCount; i++) {
+        ck_assert(UA_ByteString_equal(&retKeys[i], &iterator->key) == UA_TRUE);
+        ck_assert(firstTokenId == iterator->keyID);
+        ++firstTokenId;
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+    }
+}
+END_TEST
+
+START_TEST(requestPastKey) {
+    /*wait for one keyLifeTime*/
+    UA_fakeSleep(2000);
+    UA_Client *sksClient = UA_Client_new();
+    encyrptedclientconnect(sksClient, "user1", "password");
+    UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
+    UA_UInt32 reqkeyCount = 0;
+    UA_UInt32 reqStartingTokenId = 1;
+    UA_CallResponse response =
+        callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+    ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(sksServer, sgNodeId);
+    UA_Variant *output = response.results->outputArguments;
+
+    UA_UInt32 firstTokenId = *(UA_UInt32 *)output[1].data;
+    size_t retKeyCount = output[2].arrayLength;
+    ck_assert(retKeyCount == 1);
+
+    UA_ByteString *retKeys = (UA_ByteString *)output[2].data;
+    UA_PubSubKeyListItem *firstItem = TAILQ_FIRST(&sg->keyStorage->keyList);
+    ck_assert(firstItem->keyID != sg->keyStorage->currentItem->keyID);
+    ck_assert(firstItem->keyID == firstTokenId);
+    ck_assert(UA_ByteString_equal(retKeys, &firstItem->key) == UA_TRUE);
+    ck_assert(UA_ByteString_equal(retKeys, &sg->keyStorage->currentItem->key) != UA_TRUE);
+}
+END_TEST
+
+START_TEST(requestUnknownStartingTokenId){
+    UA_fakeSleep(1000);
+    UA_sleep_ms(4000);
+    UA_Client *sksClient = UA_Client_new();
+    encyrptedclientconnect(sksClient, "user1", "password");
+    UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
+    UA_UInt32 reqkeyCount = UA_UINT32_MAX;
+    UA_UInt32 reqStartingTokenId = UA_UINT32_MAX;
+    UA_CallResponse response =
+        callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+    ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(sksServer, sgNodeId);
+    UA_Variant *output = response.results->outputArguments;
+
+    UA_UInt32 firstTokenId = *(UA_UInt32 *)output[1].data;
+    size_t retKeyCount = output[2].arrayLength;
+    ck_assert(retKeyCount == sg->keyStorage->keyListSize);
+
+    UA_ByteString *retKeys = (UA_ByteString *)output[2].data;
+    UA_PubSubKeyListItem *iterator = TAILQ_FIRST(&sg->keyStorage->keyList);
+    for(size_t i = 0; i < retKeyCount; i++) {
+        ck_assert(UA_ByteString_equal(&retKeys[i], &iterator->key) == UA_TRUE);
+        ck_assert(firstTokenId == iterator->keyID);
+        ++firstTokenId;
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+    }
+
+}END_TEST
+
+START_TEST(requestMaxFutureKeys) {
+    UA_fakeSleep(1000);
+    UA_Client *sksClient = UA_Client_new();
+    encyrptedclientconnect(sksClient, "user1", "password");
+    UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
+    UA_UInt32 reqkeyCount = UA_UINT32_MAX;
+    UA_UInt32 reqStartingTokenId = 0;
+    UA_CallResponse response =
+        callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert_msg(response.results->statusCode == expectedCode,
+                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  UA_StatusCode_name(response.results->statusCode));
+    ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
+
+    UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(sksServer, sgNodeId);
+    UA_Variant *output = response.results->outputArguments;
+
+    UA_UInt32 firstTokenId = *(UA_UInt32 *)output[1].data;
+    size_t retKeyCount = output[2].arrayLength;
+    ck_assert(retKeyCount == sg->keyStorage->maxFutureKeyCount + 1 );
+
+    UA_ByteString *retKeys = (UA_ByteString *)output[2].data;
+    UA_PubSubKeyListItem *iterator = sg->keyStorage->currentItem;
+    for(size_t i = 0; i < retKeyCount; i++) {
+        ck_assert(UA_ByteString_equal(&retKeys[i], &iterator->key) == UA_TRUE);
+        ck_assert(firstTokenId == iterator->keyID);
+        ++firstTokenId;
+        iterator = TAILQ_NEXT(iterator, keyListEntry);
+    }
+}
+END_TEST
+
+int
+main(void) {
+    int number_failed = 0;
+    TCase *tc_pubsub_sks_pull = tcase_create("PubSub SKS Pull");
+    tcase_add_checked_fixture(tc_pubsub_sks_pull, setup, teardown);
+    tcase_add_test(tc_pubsub_sks_pull, getSecuritykeysBadSecurityModeInsufficient);
+    tcase_add_test(tc_pubsub_sks_pull, getSecuritykeysBadNotFound);
+    tcase_add_test(tc_pubsub_sks_pull, getSecuritykeysBadUserAccessDenied);
+    tcase_add_test(tc_pubsub_sks_pull, getSecuritykeysGoodAndValidOutput);
+    tcase_add_test(tc_pubsub_sks_pull, requestCurrentKeyWithFutureKeys);
+    tcase_add_test(tc_pubsub_sks_pull, requestCurrentKeyOnly);
+    tcase_add_test(tc_pubsub_sks_pull, requestPastKey);
+    tcase_add_test(tc_pubsub_sks_pull, requestUnknownStartingTokenId);
+    tcase_add_test(tc_pubsub_sks_pull, requestMaxFutureKeys);
+    Suite *s = suite_create("PubSub SKS Pull");
+    suite_add_tcase(s, tc_pubsub_sks_pull);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 147f0e6959398b66b3a8bb8f4aff570372d2a005 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 9 Oct 2022 20:53:23 +0200
Subject: [PATCH 0506/1963] feat(el): Add eventloo_common.* with KeyValue
 parameter validation

---
 CMakeLists.txt          |  2 ++
 arch/eventloop_common.c | 37 +++++++++++++++++++++++++++++++++++++
 arch/eventloop_common.h | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 arch/eventloop_common.c
 create mode 100644 arch/eventloop_common.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8828ba3872a..40ccb22286e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,6 +120,8 @@ GET_PROPERTY(ua_architecture_headers_beginning GLOBAL PROPERTY UA_ARCHITECTURE_H
 GET_PROPERTY(ua_architecture_sources GLOBAL PROPERTY UA_ARCHITECTURE_SOURCES)
 
 set(ua_architecture_sources ${ua_architecture_sources}
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_common.h
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_common.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
diff --git a/arch/eventloop_common.c b/arch/eventloop_common.c
new file mode 100644
index 00000000000..a2f1b8c2b24
--- /dev/null
+++ b/arch/eventloop_common.c
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ */
+
+#include "eventloop_common.h"
+
+UA_StatusCode
+UA_KeyValueRestriction_validate(const UA_KeyValueRestriction *restrictions, size_t restrictionsSize,
+                                const UA_KeyValuePair *params, size_t paramsSize) {
+    for(size_t i = 0; i < restrictionsSize; i++) {
+        const UA_KeyValueRestriction *r = &restrictions[i];
+        const UA_Variant *val = UA_KeyValueMap_get(params, paramsSize, r->name);
+
+        /* Value not present but required? */
+        if(!val) {
+            if(r->required)
+                return UA_STATUSCODE_BADINTERNALERROR;
+            continue;
+        }
+
+        /* Type matches */
+        if(val->type != r->type)
+            return UA_STATUSCODE_BADINTERNALERROR;
+
+        /* Scalar / array is allowed */
+        UA_Boolean scalar = UA_Variant_isScalar(val);
+        if(scalar && !r->scalar)
+            return UA_STATUSCODE_BADINTERNALERROR;
+        if(!scalar && !r->array)
+            return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
diff --git a/arch/eventloop_common.h b/arch/eventloop_common.h
new file mode 100644
index 00000000000..1b3bebbaa91
--- /dev/null
+++ b/arch/eventloop_common.h
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#ifndef UA_EVENTLOOP_COMMON_H_
+#define UA_EVENTLOOP_COMMON_H_
+
+#include <open62541/plugin/eventloop.h>
+
+/* Utility definitions to be used in EventLoop implementations.
+ * Not part of the public API. */
+
+_UA_BEGIN_DECLS
+
+/* Typing restrictions for key-value parameters */
+typedef struct {
+    UA_QualifiedName name;
+    const UA_DataType *type;
+    UA_Boolean required;
+    UA_Boolean scalar;
+    UA_Boolean array;
+} UA_KeyValueRestriction;
+
+UA_StatusCode
+UA_KeyValueRestriction_validate(const UA_KeyValueRestriction *restrictions, size_t restrictionsSiz,
+                                const UA_KeyValuePair *params, size_t paramsSize);
+
+_UA_END_DECLS
+
+#endif /* UA_EVENTLOOP_COMMON_H_ */

From a6723dbe98516b845f23513ebf7ea6028d109c94 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 9 Oct 2022 20:54:24 +0200
Subject: [PATCH 0507/1963] refactor(el): Introduce shared methods for
 _setNonBlocking, _setNoSigPipe, _setReusable

---
 arch/eventloop_posix.c     | 33 +++++++++++++++++++++++++++++++
 arch/eventloop_posix.h     | 21 +++++++++++++++++++-
 arch/eventloop_posix_tcp.c | 40 ++++++--------------------------------
 arch/eventloop_posix_udp.c | 35 ++++-----------------------------
 4 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 0ea1bd876bf..d0ae3ffb314 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -467,3 +467,36 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger) {
 
     return &el->eventLoop;
 }
+
+UA_StatusCode
+UA_EventLoopPOSIX_setNonBlocking(UA_FD sockfd) {
+#ifndef _WIN32
+    int opts = fcntl(sockfd, F_GETFL);
+    if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#else
+    u_long iMode = 1;
+    if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_EventLoopPOSIX_setNoSigPipe(UA_FD sockfd) {
+#ifdef SO_NOSIGPIPE
+    int val = 1;
+    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
+    if(res < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_EventLoopPOSIX_setReusable(UA_FD sockfd) {
+    int enableReuseVal = 1;
+    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
+                            (const char*)&enableReuseVal, sizeof(enableReuseVal));
+    return (res == 0) ? UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
+}
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 60b424e83fe..c012de05de6 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -85,7 +85,9 @@ typedef struct {
 #endif
 } UA_EventLoopPOSIX;
 
-/* The following functions differ between epoll and normal select */
+/*
+ * The following functions differ between epoll and normal select
+ */
 
 /* Register to start receiving events */
 UA_StatusCode
@@ -102,6 +104,23 @@ UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd);
 UA_StatusCode
 UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout);
 
+/*
+ * Helper functions to be used across protocols
+ */
+
+/* Set the socket non-blocking. If the listen-socket is nonblocking, incoming
+ * connections inherit this state. */
+UA_StatusCode
+UA_EventLoopPOSIX_setNonBlocking(UA_FD sockfd);
+
+/* Don't have the socket create interrupt signals */
+UA_StatusCode
+UA_EventLoopPOSIX_setNoSigPipe(UA_FD sockfd);
+
+/* Enables sharing of the same listening address on different sockets */
+UA_StatusCode
+UA_EventLoopPOSIX_setReusable(UA_FD sockfd);
+
 _UA_END_DECLS
 
 #endif /* defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32) */
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 7f971c5cb9d..cd5f1824fe2 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -60,34 +60,6 @@ TCP_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_ByteString_clear(buf);
 }
 
-/* Set the socket non-blocking. If the listen-socket is nonblocking, incoming
- * connections inherit this state. */
-static UA_StatusCode
-TCP_setNonBlocking(UA_FD sockfd) {
-#ifndef _WIN32
-    int opts = fcntl(sockfd, F_GETFL);
-    if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#else
-    u_long iMode = 1;
-    if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#endif
-    return UA_STATUSCODE_GOOD;
-}
-
-/* Don't have the socket create interrupt signals */
-static UA_StatusCode
-TCP_setNoSigPipe(UA_FD sockfd) {
-#ifdef SO_NOSIGPIPE
-    int val = 1;
-    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
-    if(res < 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#endif
-    return UA_STATUSCODE_GOOD;
-}
-
 /* Do not merge packets on the socket (disable Nagle's algorithm) */
 static UA_StatusCode
 TCP_setNoNagle(UA_FD sockfd) {
@@ -308,8 +280,8 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
 
     /* Configure the new socket */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    /* res |= TCP_setNonBlocking(newsockfd); Inherited from the listen-socket */
-    res |= TCP_setNoSigPipe(newsockfd);   /* Supress interrupts from the socket */
+    /* res |= UA_EventLoopPOSIX_setNonBlocking(newsockfd); Inherited from the listen-socket */
+    res |= UA_EventLoopPOSIX_setNoSigPipe(newsockfd);   /* Supress interrupts from the socket */
     res |= TCP_setNoNagle(newsockfd);     /* Disable Nagle's algorithm */
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -424,7 +396,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     }
 
     /* Set the socket non-blocking */
-    if(TCP_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
+    if(UA_EventLoopPOSIX_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not set the socket non-blocking",
                        (unsigned)listenSocket);
@@ -433,7 +405,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     }
 
     /* Supress interrupts from the socket */
-    if(TCP_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
+    if(UA_EventLoopPOSIX_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Could not disable SIGPIPE",
                        (unsigned)listenSocket);
@@ -826,8 +798,8 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
 
     /* Set the socket options */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    res |= TCP_setNonBlocking(newSock);
-    res |= TCP_setNoSigPipe(newSock);
+    res |= UA_EventLoopPOSIX_setNonBlocking(newSock);
+    res |= UA_EventLoopPOSIX_setNoSigPipe(newSock);
     res |= TCP_setNoNagle(newSock);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index f8ca0f2e254..066cfa79075 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -55,33 +55,6 @@ typedef union {
     struct ipv6_mreq ipv6;
 #endif
 } IpMulticastRequest;
-/* Set the socket non-blocking. If the listen-socket is nonblocking, incoming
- * connections inherit this state. */
-static UA_StatusCode
-UDP_setNonBlocking(UA_FD sockfd) {
-#ifndef _WIN32
-    int opts = fcntl(sockfd, F_GETFL);
-    if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#else
-    u_long iMode = 1;
-    if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#endif
-    return UA_STATUSCODE_GOOD;
-}
-
-/* Don't have the socket create interrupt signals */
-static UA_StatusCode
-UDP_setNoSigPipe(UA_FD sockfd) {
-#ifdef SO_NOSIGPIPE
-    int val = 1;
-    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(val));
-    if(res < 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-#endif
-    return UA_STATUSCODE_GOOD;
-}
 
 /* Retrieves hostname and port from given key value parameters.
  *
@@ -351,8 +324,8 @@ setConnectionConfig(UA_FD socket, const UA_KeyValuePair *connectionProperties,
      * - passed in parameters
      * - specific callback that gives access to the allocated socket */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    res |= UDP_setNonBlocking(socket);
-    res |= UDP_setNoSigPipe(socket);
+    res |= UA_EventLoopPOSIX_setNonBlocking(socket);
+    res |= UA_EventLoopPOSIX_setNoSigPipe(socket);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
@@ -808,7 +781,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
     }
 
     /* Set the socket non-blocking */
-    if(UDP_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
+    if(UA_EventLoopPOSIX_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP %u\t| Could not set the socket non-blocking, closing",
                        (unsigned)listenSocket);
@@ -817,7 +790,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
     }
 
     /* Supress interrupts from the socket */
-    if(UDP_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
+    if(UA_EventLoopPOSIX_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP %u\t| Could not disable SIGPIPE, closing",
                        (unsigned)listenSocket);

From 0120d6ef5de827be8ba4bcc6114c2ac91b36b169 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 4 Oct 2022 17:39:49 +0200
Subject: [PATCH 0508/1963] feat(el): Add raw ethernet ConnectionManager

---
 CMakeLists.txt                       |  10 +-
 arch/eventloop_posix_eth.c           | 878 +++++++++++++++++++++++++++
 include/open62541/plugin/eventloop.h |  34 +-
 tests/CMakeLists.txt                 |   9 +
 tests/check_eventloop_eth.c          | 212 +++++++
 tools/ci.sh                          |   6 +
 6 files changed, 1147 insertions(+), 2 deletions(-)
 create mode 100644 arch/eventloop_posix_eth.c
 create mode 100644 tests/check_eventloop_eth.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40ccb22286e..1d2702eac38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,6 +101,10 @@ if("${UA_ARCHITECTURE}" STREQUAL "None")
     endif(UNIX)
 endif()
 
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+  set(LINUX TRUE)
+endif()
+
 message(STATUS "The selected architecture is: ${UA_ARCHITECTURE}")
 string(TOUPPER ${UA_ARCHITECTURE} UA_ARCHITECTURE_UPPER)
 add_definitions(-DUA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
@@ -129,7 +133,11 @@ set(ua_architecture_sources ${ua_architecture_sources}
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_udp.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
-)
+  )
+
+if(LINUX)
+    list(APPEND ua_architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
+endif()
 
 set(ua_architecture_headers ${ua_architecture_headers}
     ${PROJECT_SOURCE_DIR}/include/open62541/architecture_functions.h
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
new file mode 100644
index 00000000000..2dd41e26991
--- /dev/null
+++ b/arch/eventloop_posix_eth.c
@@ -0,0 +1,878 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *   Copyright 2018 (c) Kontron Europe GmbH (Author: Rudolf Hoyler)
+ *   Copyright 2019-2020 (c) Kalycito Infotech Private Limited
+ *   Copyright 2019-2020 (c) Wind River Systems, Inc.
+ *   Copyright 2022 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ */
+
+#include "eventloop_posix.h"
+#include "eventloop_common.h"
+
+#include <arpa/inet.h> /* htons */
+#include <net/ethernet.h> /* ETH_P_*/
+#include <linux/if_packet.h>
+
+/* Configuration parameters */
+#define ETH_PARAMETERSSIZE 8
+
+#define ETH_PARAMINDEX_ADDR 0
+#define ETH_PARAMINDEX_LISTEN 1
+#define ETH_PARAMINDEX_IFACE 2
+#define ETH_PARAMINDEX_ETHERTYPE 3
+#define ETH_PARAMINDEX_VID 4
+#define ETH_PARAMINDEX_PCP 5
+#define ETH_PARAMINDEX_DEI 6
+#define ETH_PARAMINDEX_PROMISCUOUS 7
+
+static UA_KeyValueRestriction ETHConfigParameters[ETH_PARAMETERSSIZE+1] = {
+    {{0, UA_STRING_STATIC("address")}, &UA_TYPES[UA_TYPES_STRING], false, true, false},
+    {{0, UA_STRING_STATIC("listen")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    {{0, UA_STRING_STATIC("interface")}, &UA_TYPES[UA_TYPES_STRING], true, true, false},
+    {{0, UA_STRING_STATIC("ethertype")}, &UA_TYPES[UA_TYPES_UINT16], false, true, false},
+    {{0, UA_STRING_STATIC("vid")}, &UA_TYPES[UA_TYPES_UINT16], false, true, false},
+    {{0, UA_STRING_STATIC("pcp")}, &UA_TYPES[UA_TYPES_BYTE], false, true, false},
+    {{0, UA_STRING_STATIC("dei")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    {{0, UA_STRING_STATIC("promiscuous")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    /* Duplicated address parameter with a scalar value required. For the send-socket case. */
+    {{0, UA_STRING_STATIC("address")}, &UA_TYPES[UA_TYPES_STRING], true, true, false},
+};
+
+#define UA_ETH_MAXHEADERLENGTH (2*ETHER_ADDR_LEN)+4+2+2
+
+typedef struct {
+    UA_RegisteredFD fd;
+    UA_ConnectionManager_connectionCallback connectionCallback;
+    struct sockaddr_ll sll;
+    /* The Ethernet header to prepend for sending frames is precomputed and reused.
+     * The length field (the last 2 byte) is adjusted.
+     * - 2 * ETHER_ADDR_LEN: destination and source
+     * - 4 byte: VLAN tagging (optional)
+     * - 2 byte: EtherType (optional)
+     * - 2 byte: length */
+    unsigned char header[UA_ETH_MAXHEADERLENGTH];
+    unsigned char headerSize;
+    unsigned char lengthOffset; /* No length field if zero */
+} ETH_FD;
+
+typedef struct {
+    UA_ConnectionManager cm;
+
+    size_t fdsSize;
+    LIST_HEAD(, UA_RegisteredFD) fds;
+} ETHConnectionManager;
+
+static UA_StatusCode
+ETHConnectionManager_register(ETHConnectionManager *ecm, UA_RegisteredFD *rfd) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ecm->cm.eventSource.eventLoop;
+
+    /* Set the EventSource */
+    rfd->es = &ecm->cm.eventSource;
+
+    /* Register in the EventLoop */
+    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, rfd);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    /* Add to the linked list in the ETH EventSource */
+    LIST_INSERT_HEAD(&ecm->fds, rfd, es_pointers);
+    ecm->fdsSize++;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+ETHConnectionManager_deregister(ETHConnectionManager *ecm, UA_RegisteredFD *rfd) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ecm->cm.eventSource.eventLoop;
+    UA_EventLoopPOSIX_deregisterFD(el, rfd);
+    LIST_REMOVE(rfd, es_pointers);
+    UA_assert(ecm->fdsSize > 0);
+    ecm->fdsSize--;
+}
+
+static UA_RegisteredFD *
+ETHConnectionManager_findRegisteredFD(ETHConnectionManager *ecm, uintptr_t connectionId) {
+    UA_RegisteredFD *rfd;
+    LIST_FOREACH(rfd, &ecm->fds, es_pointers) {
+        if(rfd->fd == (UA_FD)connectionId)
+            return rfd;
+    }
+    return NULL;
+}
+
+/* The format of a Ethernet address is six groups of hexadecimal digits,
+ * separated by hyphens (e.g. 01-23-45-67-89-ab). */
+static UA_StatusCode
+parseEthAddress(const UA_String *buf, UA_Byte *addr) {
+    size_t curr = 0, idx = 0;
+    for(; idx < ETHER_ADDR_LEN; idx++) {
+        UA_UInt32 value;
+        size_t progress = UA_readNumberWithBase(&buf->data[curr],
+                                                buf->length - curr, &value, 16);
+        if(progress == 0 || value > (long)0xff)
+            return UA_STATUSCODE_BADINTERNALERROR;
+
+        addr[idx] = (UA_Byte) value;
+
+        curr += progress;
+        if(curr == buf->length)
+            break;
+
+        if(buf->data[curr] != '-')
+            return UA_STATUSCODE_BADINTERNALERROR;
+
+        curr++; /* skip '-' */
+    }
+
+    if(idx != (ETH_ALEN-1))
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_Boolean
+isMulticastEthAddress(const UA_Byte *address) {
+    if((address[0] & 1) == 0)
+        return false; /* Unicast address */
+    for(size_t i = 0; i < ETHER_ADDR_LEN; i++) {
+        if(address[i] != 0xff)
+            return true; /* Not broadcast address ff-ff-ff-ff-ff-ff */
+    }
+    return false;
+}
+
+static void
+setAddrString(unsigned char addrStr[18], unsigned char addr[ETHER_ADDR_LEN]) {
+    snprintf((char*)addrStr, 18, "%02x-%02x-%02x-%02x-%02x-%02x",
+             addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+}
+
+/* Return zero if parsing failed */
+static size_t
+parseETHHeader(const UA_ByteString *buf,
+               unsigned char destAddr[ETHER_ADDR_LEN],
+               unsigned char sourceAddr[ETHER_ADDR_LEN],
+               UA_UInt16 *etherType, UA_UInt16 *vid,
+               UA_Byte *pcp, UA_Boolean *dei) {
+    if(buf->length < (2 * ETHER_ADDR_LEN)+2)
+        return 0;
+
+    /* Parse "normal" Ethernet header */
+    memcpy(destAddr, buf->data, ETHER_ADDR_LEN);
+    memcpy(sourceAddr, &buf->data[ETHER_ADDR_LEN], ETHER_ADDR_LEN);
+    size_t pos = 2 * ETHER_ADDR_LEN;
+    UA_UInt16 length = ntohs(*(UA_UInt16*)&buf->data[pos]);
+    pos += 2;
+
+    /* No EtherType and no VLAN */
+    if(length <= 1500)
+        return pos;
+
+    /* Parse 802.1Q VLAN header */
+    if(length == 0x8100) {
+        if(buf->length < (2 * ETHER_ADDR_LEN)+2+4)
+            return 0;
+        pos += 2;
+        UA_UInt16 vlan = ntohs(*(UA_UInt16*)&buf->data[pos]);
+        *pcp = 0x07 & vlan;
+        *dei = 0x01 & (vlan >> 3);
+        *vid = vlan >> 4;
+        pos += 2;
+        length = ntohs(*(UA_UInt16*)&buf->data[pos]);
+    }
+
+    /* Set the EtherType if it is set */
+    if(length > 1500)
+        *etherType = length;
+
+    return pos;
+}
+
+static unsigned char
+setETHHeader(unsigned char *buf,
+             unsigned char destAddr[ETHER_ADDR_LEN],
+             unsigned char sourceAddr[ETHER_ADDR_LEN],
+             UA_UInt16 etherType, UA_UInt16 vid,
+             UA_Byte pcp, UA_Boolean dei, unsigned char *lengthOffset) {
+    /* Set dest and source address */
+    size_t pos = 0;
+    memcpy(buf, destAddr, ETHER_ADDR_LEN);
+    pos += ETHER_ADDR_LEN;
+    memcpy(&buf[pos], destAddr, ETHER_ADDR_LEN);
+    pos += ETHER_ADDR_LEN;
+
+    /* Set the 802.1Q VLAN header */
+    if(vid > 0 && vid != ETH_P_ALL) {
+        *(UA_UInt16*)&buf[pos] = htons(0x8100);
+        pos += 2;
+        UA_UInt16 vlan = (UA_UInt16)((UA_UInt16)pcp + (((UA_UInt16)dei) << 3) + (vid << 4));
+        *(UA_UInt16*)&buf[pos] = htons(vlan);
+        pos += 2;
+    }
+
+    /* Set the Ethertype or store the offset for the length field */
+    if(etherType == 0 || etherType == ETH_P_ALL) {
+        *lengthOffset = (unsigned char)pos;
+    } else {
+        *(UA_UInt16*)&buf[pos] = htons(etherType);
+    }
+    pos += 2;
+    return (unsigned char)pos;
+}
+
+static UA_StatusCode
+ETH_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                       UA_ByteString *buf, size_t bufSize) {
+    /* Get the ETH_FD */
+    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
+    UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
+    ETH_FD *erfd = (ETH_FD*)rfd;
+    if(!erfd)
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+
+    /* Allocate the buffer with the hidden Ethernet header in front */
+    UA_StatusCode res = UA_ByteString_allocBuffer(buf, bufSize+erfd->headerSize);
+    buf->data   += erfd->headerSize;
+    buf->length -= erfd->headerSize;
+    return res;
+}
+
+static void
+ETH_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                      UA_ByteString *buf) {
+    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
+    UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
+    ETH_FD *erfd = (ETH_FD*)rfd;
+    if(!erfd)
+        return;
+    /* Unhide the Ethernet header */
+    buf->data   -= erfd->headerSize;
+    buf->length += erfd->headerSize;
+    UA_ByteString_clear(buf);
+}
+
+/* Test if the ConnectionManager can be stopped */
+static void
+ETH_checkStopped(ETHConnectionManager *ecm) {
+    if(ecm->fdsSize == 0 && ecm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
+        UA_LOG_DEBUG(ecm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                     "ETH\t| All sockets closed, the EventLoop has stopped");
+        ecm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+    }
+}
+
+/* This method must not be called from the application directly, but from within
+ * the EventLoop. Otherwise we cannot be sure whether the file descriptor is
+ * still used after calling close. */
+static void
+ETH_close(ETHConnectionManager *ecm, UA_RegisteredFD *rfd) {
+    ETH_FD *erfd = (ETH_FD*)rfd;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ecm->cm.eventSource.eventLoop;
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "ETH %u\t| Closing connection", (unsigned)rfd->fd);
+
+    /* Deregister from the EventLoop */
+    ETHConnectionManager_deregister(ecm, rfd);
+
+    /* Signal closing to the application */
+    erfd->connectionCallback(&ecm->cm, (uintptr_t)rfd->fd,
+                              rfd->application, &rfd->context,
+                              UA_CONNECTIONSTATE_CLOSING,
+                              0, NULL, UA_BYTESTRING_NULL);
+
+    /* Close the socket */
+    int ret = UA_close(rfd->fd);
+    if(ret == 0) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "ETH %u\t| Socket closed", (unsigned)rfd->fd);
+    } else {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                          "ETH %u\t| Could not close the socket (%s)",
+                          (unsigned)rfd->fd, errno_str));
+    }
+
+    /* Don't call free here. This might be done automatically via the delayed
+     * callback that calls ETH_close. */
+    /* UA_free(rfd); */
+
+    /* Stop if the ucm is stopping and this was the last open socket */
+    ETH_checkStopped(ecm);
+}
+
+static void
+ETH_delayedClose(void *application, void *context) {
+    ETHConnectionManager *ecm = (ETHConnectionManager*)application;
+    UA_ConnectionManager *cm = &ecm->cm;
+    UA_RegisteredFD* rfd = (UA_RegisteredFD *)context;
+    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "ETH %u\t| Delayed closing of the connection", (unsigned)rfd->fd);
+    ETH_close(ecm, rfd);
+    UA_free(rfd);
+}
+
+/* Gets called when a socket receives data or closes */
+static void
+ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
+                             short event) {
+    ETH_FD *efd = (ETH_FD*)rfd;
+    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
+    if(event == UA_FDEVENT_ERR) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                        "ETH %u\t| recv signaled the socket was shutdown (%s)",
+                        (unsigned)rfd->fd, errno_str));
+
+        /* A new socket has opened. Signal it to the application. */
+        efd->connectionCallback(cm, (uintptr_t)rfd->fd,
+                                rfd->application, &rfd->context,
+                                UA_CONNECTIONSTATE_CLOSING,
+                                0, NULL, UA_BYTESTRING_NULL);
+        ETH_close(ecm, rfd);
+        UA_free(rfd);
+        return;
+    }
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "ETH %u\t| Allocate receive buffer", (unsigned)rfd->fd);
+
+    /* Get the number of available bytes */
+    int bytes_available = 0;
+    UA_ioctl(rfd->fd, FIONREAD, &bytes_available);
+    if(bytes_available <= 0)
+        return;
+
+    UA_ByteString response;
+    UA_StatusCode res = UA_ByteString_allocBuffer(&response, (size_t)bytes_available);
+    if(res != UA_STATUSCODE_GOOD)
+        return;
+
+    /* Receive */
+#ifndef _WIN32
+    ssize_t ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+#else
+    int ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+#endif
+
+    /* Receive has failed */
+    if(ret <= 0) {
+        if(UA_ERRNO == UA_INTERRUPTED)
+            goto finish;
+
+        /* Orderly shutdown of the socket. We can immediately close as no method
+         * "below" in the call stack will use the socket in this iteration of
+         * the EventLoop. */
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                        "ETH %u\t| recv signaled the socket was shutdown (%s)",
+                        (unsigned)rfd->fd, errno_str));
+        ETH_close(ecm, rfd);
+        UA_free(rfd);
+        goto finish;
+    }
+
+    /* Set the length of the received buffer */
+    response.length = (size_t)ret;
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "ETH %u\t| Received message of size %u",
+                 (unsigned)rfd->fd, (unsigned)ret);
+
+    /* Parse the Ethernet header */
+    unsigned char destAddr[ETHER_ADDR_LEN];
+    unsigned char sourceAddr[ETHER_ADDR_LEN];
+    UA_UInt16 etherType = 0;
+    UA_UInt16 vid = 0;
+    UA_Byte pcp = 0;
+    UA_Boolean dei = 0;
+    size_t headerSize = parseETHHeader(&response, destAddr, sourceAddr,
+                                       &etherType, &vid, &pcp, &dei);
+    if(headerSize == 0)
+        goto finish;
+
+    /* Set up the parameter arguments */
+    unsigned char destAddrBytes[18];
+    unsigned char sourceAddrBytes[18];
+    setAddrString(destAddrBytes, destAddr);
+    setAddrString(sourceAddrBytes, sourceAddr);
+    UA_String destAddrStr = {17, destAddrBytes};
+    UA_String sourceAddrStr = {17, sourceAddrBytes};
+
+    size_t paramsSize = 2;
+    UA_KeyValuePair params[6];
+    params[0].key = UA_QUALIFIEDNAME(0, "destination-address");
+    UA_Variant_setScalar(&params[0].value, &destAddrStr, &UA_TYPES[UA_TYPES_STRING]);
+    params[1].key = UA_QUALIFIEDNAME(0, "source-address");
+    UA_Variant_setScalar(&params[1].value, &sourceAddrStr, &UA_TYPES[UA_TYPES_STRING]);
+    if(etherType > 0) {
+        params[2].key = UA_QUALIFIEDNAME(0, "ethertype");
+        UA_Variant_setScalar(&params[1].value, &etherType, &UA_TYPES[UA_TYPES_UINT16]);
+        paramsSize++;
+    }
+    if(vid > 0) {
+        params[paramsSize].key = UA_QUALIFIEDNAME(0, "vid");
+        UA_Variant_setScalar(&params[paramsSize].value, &vid, &UA_TYPES[UA_TYPES_UINT16]);
+        params[paramsSize+1].key = UA_QUALIFIEDNAME(0, "pcp");
+        UA_Variant_setScalar(&params[paramsSize+1].value, &pcp, &UA_TYPES[UA_TYPES_BYTE]);
+        params[paramsSize+2].key = UA_QUALIFIEDNAME(0, "dei");
+        UA_Variant_setScalar(&params[paramsSize+2].value, &dei, &UA_TYPES[UA_TYPES_BOOLEAN]);
+        paramsSize += 3;
+    }
+
+    /* Callback to the application layer with the Ethernet header hidden */
+    response.data += headerSize;
+    response.length -= headerSize;
+    efd->connectionCallback(cm, (uintptr_t)rfd->fd, rfd->application, &rfd->context,
+                              UA_CONNECTIONSTATE_ESTABLISHED, paramsSize, params, response);
+    response.data -= headerSize;
+    response.length += headerSize;
+
+ finish:
+    UA_ByteString_clear(&response);
+}
+
+static UA_StatusCode
+ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
+                         size_t paramsSize, const UA_KeyValuePair *params,
+                         int ifindex, UA_UInt16 etherType) {
+    /* Bind the socket to interface and EtherType. Don't receive anything else. */
+    struct sockaddr_ll sll = {0};
+    sll.sll_family = AF_PACKET;
+    sll.sll_protocol = htons(etherType);
+    sll.sll_ifindex = ifindex;
+    if(UA_bind(fd->fd.fd, (struct sockaddr*)&sll, sizeof(sll)) < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Immediately register for listen events. Don't have to wait for a
+     * connection to open. */
+    fd->fd.listenEvents = UA_FDEVENT_IN;
+
+    /* Set receiving to promiscuous (all target host addresses) */
+    const UA_Boolean *promiscuous = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_PROMISCUOUS].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(promiscuous && *promiscuous) {
+        struct packet_mreq mreq = {0};
+        mreq.mr_ifindex = ifindex;
+        mreq.mr_type = PACKET_MR_PROMISC;
+        int ret = setsockopt(fd->fd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
+        if(ret < 0) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+               UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                            "ETH %u\t| Could not set raw socket to promiscuous mode %s",
+                            (unsigned)fd->fd.fd, errno_str));
+            return UA_STATUSCODE_BADINTERNALERROR;
+        } else {
+            UA_LOG_INFO(el->logger, UA_LOGCATEGORY_NETWORK,
+                        "ETH %u\t| The socket was set to promiscuous mode", (unsigned)fd->fd.fd);
+        }
+    }
+
+    /* Register for multicast if an address is defined */
+    const UA_String *address = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_ADDR].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(address) {
+        UA_Byte addr[ETHER_ADDR_LEN];
+        UA_StatusCode res = parseEthAddress(address, addr);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                         "ETH\t| Address for listening cannot be parsed");
+            return res;
+        }
+
+        if(!isMulticastEthAddress(addr)) {
+            UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
+                         "ETH\t| Address for listening is not a multicast address. Ignoring.");
+            return UA_STATUSCODE_GOOD;
+        }
+
+        struct packet_mreq mreq;
+        mreq.mr_ifindex = ifindex;
+        mreq.mr_type = PACKET_MR_MULTICAST;
+        mreq.mr_alen = ETH_ALEN;
+        memcpy(mreq.mr_address, addr, ETHER_ADDR_LEN);
+        int ret = UA_setsockopt(fd->fd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
+                                (char *)&mreq, sizeof(mreq));
+        if(ret < 0) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+               UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                            "ETH\t| Registering for multicast failed with error %s", errno_str));
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    } 
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+ETH_openSendConnection(UA_EventLoop *el, ETH_FD *fd,
+                       size_t paramsSize, const UA_KeyValuePair *params,
+                       UA_Byte source[ETHER_ADDR_LEN], int ifindex, UA_UInt16 etherType) {
+    /* Parse the target address (has to exist) */
+    const UA_String *address = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_ADDR].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    UA_Byte dest[ETHER_ADDR_LEN];
+    UA_StatusCode res = parseEthAddress(address, dest);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                     "ETH\t| Could not parse the Ethernet address \"%.*s\"",
+                     (int)address->length, (char*)address->data);
+        return res;
+    }
+
+    /* Get the VLAN config */
+    UA_UInt16 vid = 0;
+    UA_Byte pcp = 0;
+    UA_Boolean eid = false;
+
+    const UA_UInt16 *vidp = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_VID].name,
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(vidp)
+        vid = *vidp;
+
+    const UA_Byte *pcpp = (const UA_Byte*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_PCP].name,
+                                 &UA_TYPES[UA_TYPES_BYTE]);
+    if(pcpp)
+        pcp = *pcpp;
+
+    const UA_Boolean *eidp = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_DEI].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(eidp)
+        eid = *eidp;
+
+    /* Store the structure for sendto */
+    fd->sll.sll_ifindex = ifindex;
+	fd->sll.sll_halen = ETH_ALEN;
+    memcpy(fd->sll.sll_addr, dest, ETHER_ADDR_LEN);
+
+    /* Generate the Ethernet header */
+    fd->headerSize = setETHHeader(fd->header, dest, source, etherType,
+                                  vid, pcp, eid, &fd->lengthOffset);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+ETH_openConnection(UA_ConnectionManager *cm, size_t paramsSize, const UA_KeyValuePair *params,
+                   void *application, void *context,
+                   UA_ConnectionManager_connectionCallback connectionCallback) {
+    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+
+    /* Listen or send connection? */
+    const UA_Boolean *listen = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_LISTEN].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    size_t ethParams = ETH_PARAMETERSSIZE;
+    if(!listen || !*listen)
+        ethParams++; /* Require the address parameter to exist */
+
+    /* Validate the parameters */
+    UA_StatusCode res =
+        UA_KeyValueRestriction_validate(ETHConfigParameters, ETH_PARAMETERSSIZE,
+                                        params, paramsSize);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    /* Get the EtherType parameter */
+    UA_UInt16 etherType = ETH_P_ALL;
+    const UA_UInt16 *etParam =  (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_ETHERTYPE].name,
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    if(etParam)
+        etherType = *etParam;
+
+    /* Get the interface index */
+    const UA_String *interface = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, paramsSize,
+                                 ETHConfigParameters[ETH_PARAMINDEX_IFACE].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(interface->length >= 128)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    char ifname[128];
+    memcpy(ifname, interface->data, interface->length);
+    ifname[interface->length] = 0;
+    int ifindex = (int)if_nametoindex(ifname);
+    if(ifindex == 0) {
+        UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                     "ETH \t| Could not find the interface %s", ifname);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Create the socket and add the basic configuration */
+    ETH_FD *fd = NULL;
+    UA_FD sockfd;
+    if(listen && *listen)
+        sockfd = UA_socket(PF_PACKET, SOCK_RAW, htons(etherType));
+    else
+        sockfd = UA_socket(PF_PACKET, SOCK_RAW, 0); /* Don't receive */
+    if(sockfd == -1) {
+        UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                     "ETH \t| Could not create a raw Ethernet socket (are you root?)");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    res |= UA_EventLoopPOSIX_setReusable(sockfd);
+    res |= UA_EventLoopPOSIX_setNonBlocking(sockfd);
+    res |= UA_EventLoopPOSIX_setNoSigPipe(sockfd);
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    /* Create the FD object */
+    fd = (ETH_FD*)UA_calloc(1, sizeof(ETH_FD));
+    if(!fd) {
+        res = UA_STATUSCODE_BADOUTOFMEMORY;
+        goto cleanup;
+    }
+    fd->fd.context = context;
+    fd->fd.application = application;
+    fd->fd.callback = (UA_FDCallback)ETH_connectionSocketCallback;
+    fd->fd.fd = sockfd;
+    fd->connectionCallback = connectionCallback;
+
+    /* Configure a listen or a send connection */
+    if(!listen || !*listen) {
+        /* Get the source address for the interface */
+        struct ifreq ifr;
+        memcpy(ifr.ifr_name, ifname, interface->length);
+        ifr.ifr_name[interface->length] = 0;
+        int result = ioctl(fd->fd.fd, SIOCGIFHWADDR, &ifr);
+        if(result == -1) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+               UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                            "ETH %u\t| Cannot get the source address, %s",
+                            (unsigned)fd->fd.fd, errno_str));
+            res = UA_STATUSCODE_BADCONNECTIONREJECTED;
+            goto cleanup;
+        }
+        res = ETH_openSendConnection(el, fd, paramsSize, params,
+                                     (unsigned char*)ifr.ifr_hwaddr.sa_data,
+                                     ifindex, etherType);
+    } else {
+        res = ETH_openListenConnection(el, fd, paramsSize, params, ifindex, etherType);
+    }
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    res = ETHConnectionManager_register(ecm, &fd->fd);
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    /* Register the listen socket in the application */
+    connectionCallback(cm, (uintptr_t)sockfd, application, &fd->fd.context,
+                       UA_CONNECTIONSTATE_ESTABLISHED, 0, NULL, UA_BYTESTRING_NULL);
+    return UA_STATUSCODE_GOOD;
+
+ cleanup:
+    UA_close(sockfd);
+    UA_free(fd);
+    return res;
+}
+
+/* Close the connection via a delayed callback */
+static void
+ETH_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+    if(rfd->dc.callback) {
+        UA_LOG_INFO(el->logger, UA_LOGCATEGORY_NETWORK,
+                    "ETH %u\t| Cannot close - already closing",
+                    (unsigned)rfd->fd);
+        return;
+    }
+
+    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+                 "ETH %u\t| Shutdown called", (unsigned)rfd->fd);
+
+    UA_DelayedCallback *dc = &rfd->dc;
+    dc->callback = ETH_delayedClose;
+    dc->application = cm;
+    dc->context = rfd;
+    el->addDelayedCallback(el, dc);
+}
+
+static UA_StatusCode
+ETH_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
+    UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
+    if(!rfd) {
+        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
+                       "ETH\t| Cannot close Ethernet connection %u - not found",
+                       (unsigned)connectionId);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+
+    ETH_shutdown(cm, rfd);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+ETH_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
+                       size_t paramsSize, const UA_KeyValuePair *params,
+                       UA_ByteString *buf) {
+    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+    UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
+    ETH_FD *efd = (ETH_FD*)rfd;
+    if(!efd)
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+
+    /* Uncover and set the Ethernet header */
+    buf->data -= efd->headerSize;
+    buf->length += efd->headerSize;
+    memcpy(buf->data, efd->header, efd->headerSize);
+    if(efd->lengthOffset) {
+        UA_UInt16 *ethLength =  (UA_UInt16*)&buf->data[efd->lengthOffset];
+        *ethLength = htons((UA_UInt16)(buf->length - efd->headerSize));
+    }
+
+    /* Prevent OS signals when sending to a closed socket */
+    int flags = MSG_NOSIGNAL;
+
+    struct pollfd tmp_poll_fd;
+    tmp_poll_fd.fd = (UA_FD)connectionId;
+    tmp_poll_fd.events = UA_POLLOUT;
+
+    /* Send the full buffer. This may require several calls to send */
+    size_t nWritten = 0;
+    do {
+        ssize_t n = 0;
+        do {
+            UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+                         "ETH %u\t| Attempting to send", (unsigned)connectionId);
+            size_t bytes_to_send = buf->length - nWritten;
+            n = UA_sendto(rfd->fd, (const char*)buf->data + nWritten, bytes_to_send,
+                          flags, (struct sockaddr*)&efd->sll, sizeof(efd->sll));
+            if(n < 0) {
+                /* An error we cannot recover from? */
+                if(UA_ERRNO != UA_INTERRUPTED &&
+                   UA_ERRNO != UA_WOULDBLOCK &&
+                   UA_ERRNO != UA_AGAIN) {
+                    UA_LOG_SOCKET_ERRNO_WRAP(
+                       UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                                    "ETH %u\t| Send failed with error %s",
+                                    (unsigned)connectionId, errno_str));
+                    ETH_shutdownConnection(cm, connectionId);
+                    UA_ByteString_clear(buf);
+                    return UA_STATUSCODE_BADCONNECTIONCLOSED;
+                }
+
+                /* Poll for the socket resources to become available and retry
+                 * (blocking) */
+                int poll_ret;
+                do {
+                    poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
+                    if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED) {
+                        UA_LOG_SOCKET_ERRNO_WRAP(
+                           UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                                        "ETH %u\t| Send failed with error %s",
+                                        (unsigned)connectionId, errno_str));
+                        ETH_shutdownConnection(cm, connectionId);
+                        UA_ByteString_clear(buf);
+                        return UA_STATUSCODE_BADCONNECTIONCLOSED;
+                    }
+                } while(poll_ret <= 0);
+            }
+        } while(n < 0);
+        nWritten += (size_t)n;
+    } while(nWritten < buf->length);
+
+    /* Free the buffer */
+    UA_ByteString_clear(buf);
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Asynchronously register the listenSocket */
+static UA_StatusCode
+ETH_eventSourceStart(UA_ConnectionManager *cm) {
+    /* Check the state */
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "To start the Ethernet ConnectionManager, "
+                     "it has to be registered in an EventLoop and not started");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Set the EventSource to the started state */
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+ETH_eventSourceStop(UA_ConnectionManager *cm) {
+    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                "ETH\t| Shutting down the ConnectionManager");
+
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
+
+    /* Shut down all registered fd. The cm is set to "stopped" when the last fd
+     * is closed (from within ETH_close). */
+    UA_RegisteredFD *rfd;
+    LIST_FOREACH(rfd, &ecm->fds, es_pointers) {
+        ETH_shutdown(cm, rfd);
+    }
+
+    /* Check if stopped once more (also checking inside ETH_close, but there we
+     * don't check if there is no rfd at all) */
+    ETH_checkStopped(ecm);
+}
+
+static UA_StatusCode
+ETH_eventSourceDelete(UA_ConnectionManager *cm) {
+    if(cm->eventSource.state >= UA_EVENTSOURCESTATE_STARTING) {
+        UA_LOG_ERROR(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
+                     "ETH\t| The EventSource must be stopped before it can be deleted");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Delete the parameters */
+    UA_Array_delete(cm->eventSource.params,
+                    cm->eventSource.paramsSize,
+                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    cm->eventSource.params = NULL;
+    cm->eventSource.paramsSize = 0;
+
+    UA_String_clear(&cm->eventSource.name);
+    UA_free(cm);
+    return UA_STATUSCODE_GOOD;
+}
+
+static const char *ethName = "eth";
+
+UA_ConnectionManager *
+UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName) {
+    ETHConnectionManager *cm = (ETHConnectionManager*)
+        UA_calloc(1, sizeof(ETHConnectionManager));
+    if(!cm)
+        return NULL;
+
+    cm->cm.eventSource.eventSourceType = UA_EVENTSOURCETYPE_CONNECTIONMANAGER;
+    UA_String_copy(&eventSourceName, &cm->cm.eventSource.name);
+    cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *))ETH_eventSourceStart;
+    cm->cm.eventSource.stop = (void (*)(UA_EventSource *))ETH_eventSourceStop;
+    cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))ETH_eventSourceDelete;
+    cm->cm.protocol = UA_STRING((char*)(uintptr_t)ethName);
+    cm->cm.openConnection = ETH_openConnection;
+    cm->cm.allocNetworkBuffer = ETH_allocNetworkBuffer;
+    cm->cm.freeNetworkBuffer = ETH_freeNetworkBuffer;
+    cm->cm.sendWithConnection = ETH_sendWithConnection;
+    cm->cm.closeConnection = ETH_shutdownConnection;
+    return &cm->cm;
+}
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 95b83836be0..1e9140ac4f3 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -506,10 +506,42 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  *                               hostname parameter.
  *
  * Send Parameters:
- * No additional parameters for sending over an established UDP socket defined. */
+ * No additional parameters for sending over an UDP connection defined. */
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName);
 
+/**
+ * Ethernet Connection Manager
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Listens on the network and manages UDP connections. This should be available
+ * for all architectures.
+ *
+ * The configuration parameters have to set before calling _start to take
+ * effect.
+ *
+ * Open Connection Parameters:
+ * - 0:listen [bool]: The connection is either for sending or for listening
+ *                    (default: false).
+ * - 0:interface [string]: The name of the Ethernet interface to use (required).
+ * - 0:address [string]: MAC target address consisting of six groups of
+ *                       hexadecimal digits separated by hyphens such as
+ *                       01-23-45-67-89-ab. For sending this is a required
+ *                       parameter. For listening this is a multicast address
+ *                       that the connections tries to register for.
+ * - 0:ethertype [uint16]: EtherType for sending and receiving frames (optional).
+ *                         For listening connections, this filters out all frames
+ *                         with different EtherTypes.
+ * - 0:promiscuous [bool]: Receive frames also for different target addresses.
+ *                         Defined only for listening connections (default: false).
+ * - 0:vid [uint16]: 12-bit VLAN identifier (optional for send connections).
+ * - 0:pcp [byte]: 3-bit priority code point (optional for send connections).
+ * - 0:dei [bool]: 1-bit drop eligible indicator (optional for seond connections).
+ *
+ * Send Parameters:
+ * No additional parameters for sending over an Ethernet connection defined. */
+UA_EXPORT UA_ConnectionManager *
+UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName);
+
 /**
  * Signal Interrupt Manager
  * ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f9eba5fd3e5..2f6bfd31dbb 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -58,6 +58,7 @@ endif()
 
 # Use different plugins for testing
 set(test_plugin_sources
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_common.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
@@ -76,6 +77,10 @@ set(test_plugin_sources
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_networklayers.c
     )
 
+if(LINUX)
+  list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
+endif()
+
 if(UA_ENABLE_HISTORIZING)
     set(test_plugin_sources ${test_plugin_sources}
         ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_history_data_backend_memory.c
@@ -240,6 +245,10 @@ ua_add_test(check_eventloop.c)
 ua_add_test(check_eventloop_tcp.c)
 ua_add_test(check_eventloop_udp.c)
 ua_add_test(check_eventloop_interrupt.c)
+if(LINUX AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
+    # Requires raw socket capability, currently not possible with valgrind
+    ua_add_test(check_eventloop_eth.c)
+endif()
 
 # Test Server
 
diff --git a/tests/check_eventloop_eth.c b/tests/check_eventloop_eth.c
new file mode 100644
index 00000000000..8af884800af
--- /dev/null
+++ b/tests/check_eventloop_eth.c
@@ -0,0 +1,212 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/plugin/eventloop.h>
+#include <open62541/plugin/log_stdout.h>
+#include "open62541/types.h"
+#include "open62541/types_generated.h"
+
+#include "testing_clock.h"
+#include <time.h>
+#include <check.h>
+
+static UA_EventLoop *el;
+static char *testMsg = "open62541";
+static uintptr_t clientId;
+static UA_Boolean received;
+
+#define ETHERNET_INTERFACE "lo" /* use the loopback interface for testing */
+#define MULTICAST_MAC_ADDRESS "00-00-00-00-00-00"
+
+typedef struct TestContext {
+    unsigned connCount;
+} TestContext;
+
+static void
+connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                   void *application, void **connectionContext,
+                   UA_ConnectionState status,
+                   size_t paramsSize, const UA_KeyValuePair *params,
+                   UA_ByteString msg) {
+    TestContext *ctx = (TestContext*) *connectionContext;
+    if(status == UA_CONNECTIONSTATE_CLOSING) {
+        UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                     "Closing connection %u", (unsigned)connectionId);
+    } else {
+        if(msg.length == 0) {
+            UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Opening connection %u", (unsigned)connectionId);
+        } else {
+            UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Received a message of length %u", (unsigned)msg.length);
+        }
+    }
+
+    if(msg.length == 0 && status == UA_CONNECTIONSTATE_ESTABLISHED) {
+        ctx->connCount++;
+        clientId = connectionId;
+
+        /* The remote-hostname is set during the first callback */
+        if(paramsSize > 0) {
+            const void *hn =
+                UA_KeyValueMap_getScalar(params, paramsSize,
+                                         UA_QUALIFIEDNAME(0, "remote-hostname"),
+                                         &UA_TYPES[UA_TYPES_STRING]);
+            ck_assert(hn != NULL);
+        }
+    }
+
+    if(status == UA_CONNECTIONSTATE_CLOSING)
+        ctx->connCount--;
+
+    if(msg.length > 0) {
+        UA_ByteString rcv = UA_BYTESTRING(testMsg);
+        ck_assert(UA_String_equal(&msg, &rcv));
+        received = true;
+    }
+}
+
+START_TEST(listenETH) {
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_Ethernet(UA_STRING("ethCM"));
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
+
+    TestContext testContext = {0};
+
+    UA_String interface = UA_STRING(ETHERNET_INTERFACE);
+    UA_String address = UA_STRING(MULTICAST_MAC_ADDRESS);
+    UA_Boolean listen = true;
+
+    UA_KeyValuePair params[5];
+    params[0].key = UA_QUALIFIEDNAME(0, "interface");
+    UA_Variant_setScalar(&params[0].value, &interface, &UA_TYPES[UA_TYPES_STRING]);
+    params[1].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&params[1].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    params[2].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
+    UA_StatusCode res = cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+    ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+
+    ck_assert(testContext.connCount == 1);
+
+    for(size_t i = 0; i < 10; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+
+    /* Stop the EventLoop */
+    int max_stop_iteration_count = 1000;
+    int iteration = 0;
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    el->free(el);
+    el = NULL;
+
+    ck_assert_uint_eq(testContext.connCount, 0);
+} END_TEST
+
+START_TEST(connectETH) {
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_Ethernet(UA_STRING("udpCM"));
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
+
+    UA_String interface = UA_STRING(ETHERNET_INTERFACE);
+    UA_String address = UA_STRING(MULTICAST_MAC_ADDRESS);
+    UA_Boolean listen = true;
+    UA_UInt16 etherType = 0xb62c; /* OPC UA PubSub EtherType */
+
+    UA_KeyValuePair params[4];
+    params[0].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&params[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    params[1].key = UA_QUALIFIEDNAME(0, "interface");
+    UA_Variant_setScalar(&params[1].value, &interface, &UA_TYPES[UA_TYPES_STRING]);
+    params[2].key = UA_QUALIFIEDNAME(0, "ethertype");
+    UA_Variant_setScalar(&params[2].value, &etherType, &UA_TYPES[UA_TYPES_UINT16]);
+    params[3].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[3].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
+    TestContext testContext;
+    testContext.connCount = 0;
+
+    /* Don't use the address parameter for listening */
+    UA_StatusCode retval =
+        cm->openConnection(cm, 3, &params[1], NULL, &testContext, connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    size_t listenSockets = testContext.connCount;
+
+    /* Open a client connection. Don't use the listen parameter.*/
+    clientId = 0;
+    retval = cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(clientId != 0);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
+
+    /* Send a message from the client */
+    received = false;
+    UA_ByteString snd;
+    retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    memcpy(snd.data, testMsg, strlen(testMsg));
+    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    while(!received) {
+        UA_DateTime next = el->run(el, 100);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert(received);
+
+    /* Close the connection */
+    retval = cm->closeConnection(cm, clientId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(testContext.connCount, listenSockets + 1);
+    for(size_t i = 0; i < 2; i++) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+    }
+    ck_assert_uint_eq(testContext.connCount, listenSockets);
+
+    /* Stop the EventLoop */
+    int max_stop_iteration_count = 10;
+    int iteration = 0;
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    ck_assert(el->state == UA_EVENTLOOPSTATE_STOPPED);
+    el->free(el);
+    el = NULL;
+} END_TEST
+
+int main(void) {
+    Suite *s  = suite_create("Test ETH EventLoop");
+    TCase *tc = tcase_create("test cases");
+    tcase_add_test(tc, listenETH);
+    tcase_add_test(tc, connectETH);
+    suite_add_tcase(s, tc);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all (sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tools/ci.sh b/tools/ci.sh
index a676f11591a..a6db0791925 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -224,6 +224,7 @@ function unit_tests_mt {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           ..
     make ${MAKEOPTS}
+    set_capabilities
     make test ARGS="-V"
 }
 
@@ -238,6 +239,7 @@ function unit_tests_alarms {
           -DUA_NAMESPACE_ZERO=FULL \
           ..
     make ${MAKEOPTS}
+    set_capabilities
     make test ARGS="-V"
 }
 
@@ -251,6 +253,7 @@ function unit_tests_encryption {
           -DUA_ENABLE_ENCRYPTION=$1 \
           ..
     make ${MAKEOPTS}
+    set_capabilities
     make test ARGS="-V"
 }
 
@@ -270,6 +273,7 @@ function unit_tests_encryption_mbedtls_pubsub {
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           ..
     make ${MAKEOPTS}
+    set_capabilities
     make test ARGS="-V"
 }
 
@@ -292,6 +296,7 @@ function unit_tests_pubsub_sks {
           -DUA_ENABLE_PUBSUB_SKS=ON \
           ..
     make ${MAKEOPTS}
+    set_capabilities
     make test ARGS="-V"
 }
 
@@ -351,6 +356,7 @@ function unit_tests_valgrind {
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           ..
     make ${MAKEOPTS}
+    # set_capabilities not possible with valgrind
     make test ARGS="-V"
 }
 

From ddefacf02ef9ac1de68e08f87a99f76555203608 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Oct 2022 00:03:27 +0000
Subject: [PATCH 0509/1963] build(deps): bump deps/nodesetLoader from `a05fdd8`
 to `ecd4cef`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `a05fdd8` to `ecd4cef`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/a05fdd843a38c34c64a6aaa25b68e5c90af0d182...ecd4cefd81f4f0b94d7f2252563b4302f032815b)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index a05fdd843a3..ecd4cefd81f 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit a05fdd843a38c34c64a6aaa25b68e5c90af0d182
+Subproject commit ecd4cefd81f4f0b94d7f2252563b4302f032815b

From 87798df12914e1f56925e99f85186af6d8725d35 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 27 Oct 2022 11:49:52 +0200
Subject: [PATCH 0510/1963] feat: add new keyvaluemap structure + utilities

---
 arch/eventloop_common.c                       |   4 +-
 arch/eventloop_common.h                       |   5 +-
 arch/eventloop_posix_eth.c                    |  78 ++++----
 arch/eventloop_posix_interrupt.c              |   8 +-
 arch/eventloop_posix_tcp.c                    |  72 +++----
 arch/eventloop_posix_udp.c                    | 142 +++++++-------
 include/open62541/plugin/eventloop.h          |  17 +-
 include/open62541/util.h                      |  67 +++++--
 src/client/ua_client_connect.c                |  10 +-
 src/server/ua_server.c                        |   5 +-
 src/server/ua_server_binary.c                 |   4 +-
 src/server/ua_server_internal.h               |   2 +-
 src/server/ua_session.c                       |  10 +-
 src/server/ua_session.h                       |   3 +-
 src/ua_securechannel.c                        |   6 +-
 src/ua_util.c                                 | 177 +++++++++++++----
 tests/CMakeLists.txt                          |   1 +
 tests/check_eventloop_eth.c                   |  21 +-
 tests/check_eventloop_interrupt.c             |   8 +-
 tests/check_eventloop_tcp.c                   |  20 +-
 tests/check_eventloop_udp.c                   |  69 +++++--
 tests/check_kvm_utils.c                       | 183 ++++++++++++++++++
 tests/fuzz/fuzz_binary_message.cc             |   2 +-
 tests/testing-plugins/testing_networklayers.c |   4 +-
 24 files changed, 643 insertions(+), 275 deletions(-)
 create mode 100644 tests/check_kvm_utils.c

diff --git a/arch/eventloop_common.c b/arch/eventloop_common.c
index a2f1b8c2b24..6841f350e34 100644
--- a/arch/eventloop_common.c
+++ b/arch/eventloop_common.c
@@ -9,10 +9,10 @@
 
 UA_StatusCode
 UA_KeyValueRestriction_validate(const UA_KeyValueRestriction *restrictions, size_t restrictionsSize,
-                                const UA_KeyValuePair *params, size_t paramsSize) {
+                                const UA_KeyValueMap *map) {
     for(size_t i = 0; i < restrictionsSize; i++) {
         const UA_KeyValueRestriction *r = &restrictions[i];
-        const UA_Variant *val = UA_KeyValueMap_get(params, paramsSize, r->name);
+        const UA_Variant *val = UA_KeyValueMap_get(map, r->name);
 
         /* Value not present but required? */
         if(!val) {
diff --git a/arch/eventloop_common.h b/arch/eventloop_common.h
index 1b3bebbaa91..bc373439075 100644
--- a/arch/eventloop_common.h
+++ b/arch/eventloop_common.h
@@ -26,8 +26,9 @@ typedef struct {
 } UA_KeyValueRestriction;
 
 UA_StatusCode
-UA_KeyValueRestriction_validate(const UA_KeyValueRestriction *restrictions, size_t restrictionsSiz,
-                                const UA_KeyValuePair *params, size_t paramsSize);
+UA_KeyValueRestriction_validate(const UA_KeyValueRestriction *restrictions,
+                                size_t restrictionsSiz,
+                                const UA_KeyValueMap *map);
 
 _UA_END_DECLS
 
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 2dd41e26991..23d2c12387b 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -280,7 +280,7 @@ ETH_close(ETHConnectionManager *ecm, UA_RegisteredFD *rfd) {
     erfd->connectionCallback(&ecm->cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
                               UA_CONNECTIONSTATE_CLOSING,
-                              0, NULL, UA_BYTESTRING_NULL);
+                              &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
 
     /* Close the socket */
     int ret = UA_close(rfd->fd);
@@ -331,7 +331,7 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         efd->connectionCallback(cm, (uintptr_t)rfd->fd,
                                 rfd->application, &rfd->context,
                                 UA_CONNECTIONSTATE_CLOSING,
-                                0, NULL, UA_BYTESTRING_NULL);
+                                &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
         ETH_close(ecm, rfd);
         UA_free(rfd);
         return;
@@ -360,8 +360,10 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 
     /* Receive has failed */
     if(ret <= 0) {
-        if(UA_ERRNO == UA_INTERRUPTED)
-            goto finish;
+        if(UA_ERRNO == UA_INTERRUPTED) {
+            UA_ByteString_clear(&response);
+            return;
+        }
 
         /* Orderly shutdown of the socket. We can immediately close as no method
          * "below" in the call stack will use the socket in this iteration of
@@ -372,7 +374,8 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                         (unsigned)rfd->fd, errno_str));
         ETH_close(ecm, rfd);
         UA_free(rfd);
-        goto finish;
+        UA_ByteString_clear(&response);
+        return;
     }
 
     /* Set the length of the received buffer */
@@ -391,8 +394,10 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     UA_Boolean dei = 0;
     size_t headerSize = parseETHHeader(&response, destAddr, sourceAddr,
                                        &etherType, &vid, &pcp, &dei);
-    if(headerSize == 0)
-        goto finish;
+    if(headerSize == 0) {
+        UA_ByteString_clear(&response);
+        return;
+    }
 
     /* Set up the parameter arguments */
     unsigned char destAddrBytes[18];
@@ -423,21 +428,21 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         paramsSize += 3;
     }
 
+    UA_KeyValueMap map = {paramsSize, params};
+
     /* Callback to the application layer with the Ethernet header hidden */
     response.data += headerSize;
     response.length -= headerSize;
     efd->connectionCallback(cm, (uintptr_t)rfd->fd, rfd->application, &rfd->context,
-                              UA_CONNECTIONSTATE_ESTABLISHED, paramsSize, params, response);
+                              UA_CONNECTIONSTATE_ESTABLISHED, &map, response);
     response.data -= headerSize;
     response.length += headerSize;
-
- finish:
     UA_ByteString_clear(&response);
 }
 
 static UA_StatusCode
 ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
-                         size_t paramsSize, const UA_KeyValuePair *params,
+                         const UA_KeyValueMap *params,
                          int ifindex, UA_UInt16 etherType) {
     /* Bind the socket to interface and EtherType. Don't receive anything else. */
     struct sockaddr_ll sll = {0};
@@ -453,8 +458,7 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
 
     /* Set receiving to promiscuous (all target host addresses) */
     const UA_Boolean *promiscuous = (const UA_Boolean*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_PROMISCUOUS].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_PROMISCUOUS].name,
                                  &UA_TYPES[UA_TYPES_BOOLEAN]);
     if(promiscuous && *promiscuous) {
         struct packet_mreq mreq = {0};
@@ -475,8 +479,7 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
 
     /* Register for multicast if an address is defined */
     const UA_String *address = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_ADDR].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_ADDR].name,
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(address) {
         UA_Byte addr[ETHER_ADDR_LEN];
@@ -513,12 +516,11 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
 
 static UA_StatusCode
 ETH_openSendConnection(UA_EventLoop *el, ETH_FD *fd,
-                       size_t paramsSize, const UA_KeyValuePair *params,
+                       const UA_KeyValueMap *params,
                        UA_Byte source[ETHER_ADDR_LEN], int ifindex, UA_UInt16 etherType) {
     /* Parse the target address (has to exist) */
     const UA_String *address = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_ADDR].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_ADDR].name,
                                  &UA_TYPES[UA_TYPES_STRING]);
     UA_Byte dest[ETHER_ADDR_LEN];
     UA_StatusCode res = parseEthAddress(address, dest);
@@ -535,22 +537,19 @@ ETH_openSendConnection(UA_EventLoop *el, ETH_FD *fd,
     UA_Boolean eid = false;
 
     const UA_UInt16 *vidp = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_VID].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_VID].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(vidp)
         vid = *vidp;
 
     const UA_Byte *pcpp = (const UA_Byte*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_PCP].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_PCP].name,
                                  &UA_TYPES[UA_TYPES_BYTE]);
     if(pcpp)
         pcp = *pcpp;
 
     const UA_Boolean *eidp = (const UA_Boolean*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_DEI].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_DEI].name,
                                  &UA_TYPES[UA_TYPES_BOOLEAN]);
     if(eidp)
         eid = *eidp;
@@ -567,7 +566,7 @@ ETH_openSendConnection(UA_EventLoop *el, ETH_FD *fd,
 }
 
 static UA_StatusCode
-ETH_openConnection(UA_ConnectionManager *cm, size_t paramsSize, const UA_KeyValuePair *params,
+ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
     ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
@@ -575,8 +574,7 @@ ETH_openConnection(UA_ConnectionManager *cm, size_t paramsSize, const UA_KeyValu
 
     /* Listen or send connection? */
     const UA_Boolean *listen = (const UA_Boolean*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_LISTEN].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_LISTEN].name,
                                  &UA_TYPES[UA_TYPES_BOOLEAN]);
     size_t ethParams = ETH_PARAMETERSSIZE;
     if(!listen || !*listen)
@@ -584,24 +582,21 @@ ETH_openConnection(UA_ConnectionManager *cm, size_t paramsSize, const UA_KeyValu
 
     /* Validate the parameters */
     UA_StatusCode res =
-        UA_KeyValueRestriction_validate(ETHConfigParameters, ETH_PARAMETERSSIZE,
-                                        params, paramsSize);
+        UA_KeyValueRestriction_validate(ETHConfigParameters, ETH_PARAMETERSSIZE, params);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
     /* Get the EtherType parameter */
     UA_UInt16 etherType = ETH_P_ALL;
     const UA_UInt16 *etParam =  (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_ETHERTYPE].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_ETHERTYPE].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(etParam)
         etherType = *etParam;
 
     /* Get the interface index */
     const UA_String *interface = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
-                                 ETHConfigParameters[ETH_PARAMINDEX_IFACE].name,
+        UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_IFACE].name,
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(interface->length >= 128)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -660,11 +655,11 @@ ETH_openConnection(UA_ConnectionManager *cm, size_t paramsSize, const UA_KeyValu
             res = UA_STATUSCODE_BADCONNECTIONREJECTED;
             goto cleanup;
         }
-        res = ETH_openSendConnection(el, fd, paramsSize, params,
+        res = ETH_openSendConnection(el, fd, params,
                                      (unsigned char*)ifr.ifr_hwaddr.sa_data,
                                      ifindex, etherType);
     } else {
-        res = ETH_openListenConnection(el, fd, paramsSize, params, ifindex, etherType);
+        res = ETH_openListenConnection(el, fd, params, ifindex, etherType);
     }
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
@@ -675,7 +670,8 @@ ETH_openConnection(UA_ConnectionManager *cm, size_t paramsSize, const UA_KeyValu
 
     /* Register the listen socket in the application */
     connectionCallback(cm, (uintptr_t)sockfd, application, &fd->fd.context,
-                       UA_CONNECTIONSTATE_ESTABLISHED, 0, NULL, UA_BYTESTRING_NULL);
+                       UA_CONNECTIONSTATE_ESTABLISHED, &UA_KEYVALUEMAP_NULL,
+                       UA_BYTESTRING_NULL);
     return UA_STATUSCODE_GOOD;
 
  cleanup:
@@ -723,8 +719,7 @@ ETH_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 
 static UA_StatusCode
 ETH_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
-                       size_t paramsSize, const UA_KeyValuePair *params,
-                       UA_ByteString *buf) {
+                       const UA_KeyValueMap *params, UA_ByteString *buf) {
     ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
     UA_EventLoop *el = cm->eventSource.eventLoop;
     UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
@@ -843,12 +838,7 @@ ETH_eventSourceDelete(UA_ConnectionManager *cm) {
     }
 
     /* Delete the parameters */
-    UA_Array_delete(cm->eventSource.params,
-                    cm->eventSource.paramsSize,
-                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    cm->eventSource.params = NULL;
-    cm->eventSource.paramsSize = 0;
-
+    UA_KeyValueMap_clear(cm->eventSource.params);
     UA_String_clear(&cm->eventSource.name);
     UA_free(cm);
     return UA_STATUSCODE_GOOD;
diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
index badc0e8699f..4af177d13f7 100644
--- a/arch/eventloop_posix_interrupt.c
+++ b/arch/eventloop_posix_interrupt.c
@@ -67,7 +67,7 @@ handlePOSIXInterruptEvent(UA_EventSource *es, UA_RegisteredFD *rfd, short event)
                  (unsigned)rfd->fd, fdsi.ssi_signo);
 
     rs->signalCallback((UA_InterruptManager *)es,
-                       (uintptr_t)rfd->fd, rfd->context, 0, NULL);
+                       (uintptr_t)rfd->fd, rfd->context, &UA_KEYVALUEMAP_NULL);
 }
 
 static void
@@ -240,7 +240,7 @@ executeTriggeredPOSIXInterrupts(UA_EventSource *es, UA_RegisteredFD *rfd, short
         TAILQ_REMOVE(&singletonIM->triggered, rs, triggeredEntry);
         rs->triggered = false;
         rs->signalCallback(&singletonIM->im, (uintptr_t)rs->signal,
-                           rs->rfd.context, 0, NULL);
+                           rs->rfd.context, &UA_KEYVALUEMAP_NULL);
     }
 }
 
@@ -248,10 +248,10 @@ executeTriggeredPOSIXInterrupts(UA_EventSource *es, UA_RegisteredFD *rfd, short
 
 static UA_StatusCode
 registerPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle,
-                       size_t paramsSize, const UA_KeyValuePair *params,
+                       const UA_KeyValueMap *params,
                        UA_InterruptCallback callback, void *interruptContext) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)im->eventSource.eventLoop;
-    if(paramsSize > 0) {
+    if(!UA_KeyValueMap_isEmpty(params)) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "Interrupt\t| Supplied parameters invalid for the "
                      "POSIX InterruptManager");
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index cd5f1824fe2..02e8f24f4a6 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -94,7 +94,7 @@ TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     tcpfd->connectionCallback(&tcm->cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
                               UA_CONNECTIONSTATE_CLOSING,
-                              0, NULL, UA_BYTESTRING_NULL);
+                              &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
 
     /* Close the socket */
     int ret = UA_close(rfd->fd);
@@ -184,7 +184,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         /* A new socket has opened. Signal it to the application. */
         tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                                   rfd->application, &rfd->context,
-                                  UA_CONNECTIONSTATE_ESTABLISHED, 0, NULL,
+                                  UA_CONNECTIONSTATE_ESTABLISHED, &UA_KEYVALUEMAP_NULL,
                                   UA_BYTESTRING_NULL);
 
         return;
@@ -229,7 +229,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
                               UA_CONNECTIONSTATE_ESTABLISHED,
-                              0, NULL, response);
+                              &UA_KEYVALUEMAP_NULL, response);
 }
 
 /* Gets called when a new connection opens or if the listenSocket is closed */
@@ -327,11 +327,15 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     UA_String hostName = UA_STRING(hoststr);
     UA_Variant_setScalar(&kvp.value, &hostName, &UA_TYPES[UA_TYPES_STRING]);
 
+    UA_KeyValueMap kvm;
+    kvm.mapSize = 1;
+    kvm.map = &kvp;
+
     /* The socket has opened. Signal it to the application. */
     tcpfd->connectionCallback(cm, (uintptr_t)newsockfd,
                               newtcpfd->fd.application, &newtcpfd->fd.context,
                               UA_CONNECTIONSTATE_ESTABLISHED,
-                              1, &kvp, UA_BYTESTRING_NULL);
+                              &kvm, UA_BYTESTRING_NULL);
 }
 
 static UA_StatusCode
@@ -467,20 +471,22 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "listen-hostname");
     params[1].key = UA_QUALIFIEDNAME(0, "listen-port");
+    UA_KeyValueMap paramMap;
+    paramMap.mapSize = 0;
     UA_String hostname;
-    size_t paramsSize = 0;
     if(hoststr[0] != 0) {
-        paramsSize = 2;
+        paramMap.mapSize = 2;
         hostname = UA_STRING(hoststr);
         UA_Variant_setScalar(&params[0].value, &hostname, &UA_TYPES[UA_TYPES_STRING]);
         UA_Variant_setScalar(&params[1].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+        paramMap.map = params;
     }
 
     /* Announce the listen-socket in the application */
     connectionCallback(cm, (uintptr_t)listenSocket, application,
                        &newtcpfd->fd.context,
                        UA_CONNECTIONSTATE_ESTABLISHED,
-                       paramsSize, params, UA_BYTESTRING_NULL);
+                       &paramMap, UA_BYTESTRING_NULL);
 
     return UA_STATUSCODE_GOOD;
 }
@@ -599,7 +605,7 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 
 static UA_StatusCode
 TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
-                       size_t paramsSize, const UA_KeyValuePair *params,
+                       const UA_KeyValueMap *params,
                        UA_ByteString *buf) {
     /* Prevent OS signals when sending to a closed socket */
     int flags = MSG_NOSIGNAL;
@@ -655,14 +661,14 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 /* Create a listen-socket that waits for incoming connections */
 static UA_StatusCode
 TCP_openPassiveConnection(UA_ConnectionManager *cm,
-                          size_t paramsSize, const UA_KeyValuePair *params,
+                          const UA_KeyValueMap *params,
                           void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get the port parameter */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
+        UA_KeyValueMap_getScalar(params,
                                  UA_QUALIFIEDNAME(0, "listen-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
@@ -673,7 +679,7 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm,
 
     /* Get the hostnames parameter */
     const UA_Variant *hostNames =
-        UA_KeyValueMap_get(params, paramsSize, UA_QUALIFIEDNAME(0, "listen-hostnames"));
+        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "listen-hostnames"));
     if(!hostNames) {
         /* No listen-hostnames parameter -> listen on all interfaces */
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -717,13 +723,13 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm,
 /* Open a TCP connection to a remote host */
 static UA_StatusCode
 TCP_openActiveConnection(UA_ConnectionManager *cm,
-                         size_t paramsSize, const UA_KeyValuePair *params,
+                         const UA_KeyValueMap *params,
                          void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback) {
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
-    if(paramsSize != 2) {
+    if(params->mapSize != 2) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP\t| Port and hostname need to be defined for the connection");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -735,7 +741,7 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
 
     /* Prepare the port parameter as a string */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize, UA_QUALIFIEDNAME(0, "port"),
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -746,7 +752,7 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
 
     /* Prepare the hostname string */
     const UA_String *host = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize, UA_QUALIFIEDNAME(0, "hostname"),
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "hostname"),
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!host) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -859,7 +865,7 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
     /* Signal the new connection to the application as asynchonously opening */
     connectionCallback(cm, (uintptr_t)newSock,
                        application, &newtcpfd->fd.context,
-                       UA_CONNECTIONSTATE_OPENING, 0, NULL,
+                       UA_CONNECTIONSTATE_OPENING, &UA_KEYVALUEMAP_NULL,
                        UA_BYTESTRING_NULL);
 
     return UA_STATUSCODE_GOOD;
@@ -867,7 +873,7 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
 
 static UA_StatusCode
 TCP_openConnection(UA_ConnectionManager *cm,
-                   size_t paramsSize, const UA_KeyValuePair *params,
+                   const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
@@ -882,12 +888,12 @@ TCP_openConnection(UA_ConnectionManager *cm,
      * connection. Otherwise try to open a socket that listens for incoming TCP
      * connections. */
     const UA_Variant *val =
-        UA_KeyValueMap_get(params, paramsSize, UA_QUALIFIEDNAME(0, "port"));
+        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "port"));
     if(val) {
-        return TCP_openActiveConnection(cm, paramsSize, params,
+        return TCP_openActiveConnection(cm, params,
                                         application, context, connectionCallback);
     } else {
-        return TCP_openPassiveConnection(cm, paramsSize, params,
+        return TCP_openPassiveConnection(cm, params,
                                          application, context, connectionCallback);
     }
 }
@@ -904,15 +910,17 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
                      "registered in an EventLoop and not started yet");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-
     /* Configure the receive buffer */
     UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
-    const UA_UInt32 *configRxBufSize = (const UA_UInt32*)
-        UA_KeyValueMap_getScalar(cm->eventSource.params, cm->eventSource.paramsSize,
-                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
-                                 &UA_TYPES[UA_TYPES_UINT32]);
-    if(configRxBufSize)
-        rxBufSize = *configRxBufSize;
+
+    if(cm->eventSource.params != NULL) {
+       const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
+            UA_KeyValueMap_getScalar(cm->eventSource.params,
+                                     UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                     &UA_TYPES[UA_TYPES_UINT32]);
+        if(configRxBufSize)
+            rxBufSize = *configRxBufSize;
+    }
     UA_StatusCode res = UA_ByteString_allocBuffer(&tcm->rxBuffer, rxBufSize);
     if(res != UA_STATUSCODE_GOOD)
         return res;
@@ -950,12 +958,10 @@ TCP_eventSourceDelete(UA_ConnectionManager *cm) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* Delete the parameters */
-    UA_Array_delete(cm->eventSource.params, cm->eventSource.paramsSize,
-                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    cm->eventSource.params = NULL;
-    cm->eventSource.paramsSize = 0;
-
+    if(cm->eventSource.params != NULL) {
+        /* Delete the parameters */
+        UA_KeyValueMap_clear(cm->eventSource.params);
+    }
     UA_String_clear(&cm->eventSource.name);
     UA_free(cm);
     return UA_STATUSCODE_GOOD;
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 066cfa79075..9a1b5278ef4 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -58,19 +58,18 @@ typedef union {
 
 /* Retrieves hostname and port from given key value parameters.
  *
- * @param[in] paramsSize the size of the parameter list
- * @param[in] params the parameter list to retrieve from
+ * @param[in] params the parameter map to retrieve from
  * @param[out] hostname the retrieved hostname when present, NULL otherwise
  * @param[out] portStr the retrieved port when present, NULL otherwise
  * @param[in] logger the logger to log information
  * @return -1 upon error, 0 if there was no host or port parameter, 1 if
  *         host and port are present */
 static int
-getHostAndPortFromParams(size_t paramsSize, const UA_KeyValuePair *params,
+getHostAndPortFromParams(const UA_KeyValueMap *params,
                          char *hostname, char *portStr, const UA_Logger *logger) {
     /* Prepare the port parameter as a string */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
+        UA_KeyValueMap_getScalar(params,
                                  UA_QUALIFIEDNAME(0, "port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
@@ -82,7 +81,7 @@ getHostAndPortFromParams(size_t paramsSize, const UA_KeyValuePair *params,
 
     /* Prepare the hostname string */
     const UA_String *host = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
+        UA_KeyValueMap_getScalar(params,
                                  UA_QUALIFIEDNAME(0, "hostname"),
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!host) {
@@ -101,11 +100,11 @@ getHostAndPortFromParams(size_t paramsSize, const UA_KeyValuePair *params,
 }
 
 static int
-getNetworkInterfaceFromParams(size_t paramsSize, const UA_KeyValuePair *params,
+getNetworkInterfaceFromParams(const UA_KeyValueMap *params,
                               UA_String *outNetworkInterface, const UA_Logger *logger) {
     /* Prepare the networkinterface string */
     const UA_String *networkInterface = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
+        UA_KeyValueMap_getScalar(params,
                                  UA_QUALIFIEDNAME(0, "network-interface"),
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!networkInterface) {
@@ -118,11 +117,11 @@ getNetworkInterfaceFromParams(size_t paramsSize, const UA_KeyValuePair *params,
 }
 
 static int
-getConnectionInfoFromParams(size_t paramsSize, const UA_KeyValuePair *params,
+getConnectionInfoFromParams(const UA_KeyValueMap *params,
                             char *hostname, char *portStr,
                             struct addrinfo **info, const UA_Logger *logger) {
 
-    int foundParams = getHostAndPortFromParams(paramsSize, params,
+    int foundParams = getHostAndPortFromParams(params,
                                                hostname, portStr, logger);
     if (foundParams < 0) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
@@ -258,8 +257,7 @@ isIPv6MulticastAddress(const UA_Byte *address) {
 #endif
 
 static UA_StatusCode
-setConnectionConfig(UA_FD socket, const UA_KeyValuePair *connectionProperties,
-                    const size_t connectionPropertiesSize,
+setConnectionConfig(UA_FD socket, const UA_KeyValueMap *connectionProperties,
                     int ai_family, const UA_Logger *logger) {
     /* Iterate over the given KeyValuePair parameters */
     UA_String ttlParam = UA_STRING("ttl");
@@ -275,8 +273,8 @@ setConnectionConfig(UA_FD socket, const UA_KeyValuePair *connectionProperties,
 #ifdef __linux__
     UA_String socketPriorityParam = UA_STRING("sockpriority");
 #endif
-    for(size_t i = 0; i < connectionPropertiesSize; i++) {
-        const UA_KeyValuePair *prop = &connectionProperties[i];
+    for(size_t i = 0; i < connectionProperties->mapSize; i++) {
+        const UA_KeyValuePair *prop = &connectionProperties->map[i];
         if(UA_String_equal(&prop->key.name, &ttlParam)) {
             if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
                 UA_UInt32 messageTTL = *(UA_UInt32*)prop->value.data;
@@ -336,7 +334,7 @@ setConnectionConfig(UA_FD socket, const UA_KeyValuePair *connectionProperties,
     return UA_STATUSCODE_GOOD;
 }
 static UA_StatusCode
-setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, size_t paramsSize, const UA_KeyValuePair *params,
+setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValueMap *params,
                        const UA_Logger *logger) {
     struct in_addr address = addr->sin_addr;
 
@@ -346,7 +344,7 @@ setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, size_t paramsSize
     ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
 
     UA_String netif = UA_STRING_NULL;
-    int foundInterface = getNetworkInterfaceFromParams(paramsSize, params, &netif, logger);
+    int foundInterface = getNetworkInterfaceFromParams(params, &netif, logger);
     if(foundInterface < 0) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Opening a connection failed");
@@ -377,7 +375,7 @@ setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, size_t paramsSize
 }
 
 static UA_StatusCode
-setupListenMulticastIPv4(UA_FD socket, size_t paramsSize, const UA_KeyValuePair *params, struct sockaddr_in *addr,
+setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sockaddr_in *addr,
                          const UA_Logger *logger) {
     struct in_addr address = addr->sin_addr;
 
@@ -387,7 +385,7 @@ setupListenMulticastIPv4(UA_FD socket, size_t paramsSize, const UA_KeyValuePair
     ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
 
     UA_String netif = UA_STRING_NULL;
-    int foundInterface = getNetworkInterfaceFromParams(paramsSize, params, &netif, logger);
+    int foundInterface = getNetworkInterfaceFromParams(params, &netif, logger);
     if(foundInterface < 0) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Opening a connection failed");
@@ -422,7 +420,7 @@ setupListenMulticastIPv4(UA_FD socket, size_t paramsSize, const UA_KeyValuePair
 
 #if UA_IPV6
 static UA_StatusCode
-setupListenMulticastIPv6(UA_FD socket, size_t paramsSize, const UA_KeyValuePair *params, struct sockaddr_in6 *addr,
+setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sockaddr_in6 *addr,
                          const UA_Logger *logger) {
 
     struct in6_addr address = addr->sin6_addr;
@@ -433,7 +431,7 @@ setupListenMulticastIPv6(UA_FD socket, size_t paramsSize, const UA_KeyValuePair
     ipMulticastRequest.ipv6.ipv6mr_interface = 0;
 
     UA_String netif = UA_STRING_NULL;
-    int foundInterface = getNetworkInterfaceFromParams(paramsSize, params, &netif, logger);
+    int foundInterface = getNetworkInterfaceFromParams(params, &netif, logger);
     if(foundInterface < 0) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Opening a connection failed");
@@ -466,7 +464,7 @@ setupListenMulticastIPv6(UA_FD socket, size_t paramsSize, const UA_KeyValuePair
 }
 
 static UA_StatusCode
-setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, size_t paramsSize, const UA_KeyValuePair *params,
+setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValueMap *params,
                        const UA_Logger *logger) {
     struct in6_addr address = addr->sin6_addr;
 
@@ -476,7 +474,7 @@ setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, size_t paramsSiz
     ipMulticastRequest.ipv6.ipv6mr_interface = 0;
 
     UA_String netif = UA_STRING_NULL;
-    int foundInterface = getNetworkInterfaceFromParams(paramsSize, params, &netif, logger);
+    int foundInterface = getNetworkInterfaceFromParams(params, &netif, logger);
     if(foundInterface < 0) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Opening a connection failed");
@@ -578,7 +576,7 @@ UDP_close(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
     udpfd->connectionCallback(&ucm->cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
                               UA_CONNECTIONSTATE_CLOSING,
-                              0, NULL, UA_BYTESTRING_NULL);
+                              &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
 
     /* Close the socket */
     int ret = UA_close(rfd->fd);
@@ -630,7 +628,7 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         udpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                                   rfd->application, &rfd->context,
                                   UA_CONNECTIONSTATE_ESTABLISHED,
-                                  0, NULL, UA_BYTESTRING_NULL);
+                                  &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
 
         /* Now we are interested in read-events. */
         rfd->listenEvents = UA_FDEVENT_IN;
@@ -677,18 +675,18 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     response.length = (size_t)ret; /* Set the length of the received buffer */
     udpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
                               rfd->application, &rfd->context,
-                              UA_CONNECTIONSTATE_ESTABLISHED, 0, NULL, response);
+                              UA_CONNECTIONSTATE_ESTABLISHED, &UA_KEYVALUEMAP_NULL, response);
 }
 
 static UA_StatusCode
-checkForListenMulticastAndConfigure(struct addrinfo *info, size_t paramsSize, const UA_KeyValuePair *params,
+checkForListenMulticastAndConfigure(struct addrinfo *info, const UA_KeyValueMap *params,
                                     UA_FD listenSocket, const UA_Logger *logger) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(info->ai_family == AF_INET) {
         UA_Byte *addressVal = (UA_Byte *) &((struct sockaddr_in *)info->ai_addr)->sin_addr;
         if(isIPv4MulticastAddress(addressVal)) {
             res = setupListenMulticastIPv4(listenSocket,
-                                           paramsSize, params, (struct sockaddr_in *)info->ai_addr,
+                                           params, (struct sockaddr_in *)info->ai_addr,
                                            logger);
         }
 #if UA_IPV6
@@ -696,7 +694,7 @@ checkForListenMulticastAndConfigure(struct addrinfo *info, size_t paramsSize, co
         UA_Byte *addressVal = (UA_Byte *) &((struct sockaddr_in6 *)info->ai_addr)->sin6_addr;
         if(isIPv6MulticastAddress(addressVal)) {
             res = setupListenMulticastIPv6(listenSocket,
-                                           paramsSize, params, (struct sockaddr_in6 *)info->ai_addr, logger);
+                                           params, (struct sockaddr_in6 *)info->ai_addr, logger);
         }
 #endif
     } else {
@@ -709,7 +707,7 @@ checkForListenMulticastAndConfigure(struct addrinfo *info, size_t paramsSize, co
 
 static UA_StatusCode
 UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrinfo *info,
-                         size_t paramsSize, const UA_KeyValuePair *params,
+                         const UA_KeyValueMap *params,
                          void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback,
                          UA_Boolean validate) {
@@ -747,7 +745,7 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                 "UDP %u\t| New listen socket for \"%s\" on port %u",
                 (unsigned)listenSocket, hoststr, port);
 
-    UA_StatusCode res = checkForListenMulticastAndConfigure(info, paramsSize, params, listenSocket, el->eventLoop.logger);
+    UA_StatusCode res = checkForListenMulticastAndConfigure(info, params, listenSocket, el->eventLoop.logger);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Configuring listen multicast failed");
@@ -847,13 +845,13 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
     connectionCallback(cm, (uintptr_t)newudpfd->fd.fd,
                        application, &newudpfd->fd.context,
                        UA_CONNECTIONSTATE_ESTABLISHED,
-                       0, NULL, UA_BYTESTRING_NULL);
+                       &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
 UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UInt16 port,
-                          size_t paramsSize, const UA_KeyValuePair *params,
+                          const UA_KeyValueMap *params,
                           void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback,
                           UA_Boolean validate) {
@@ -891,7 +889,8 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UIn
     struct addrinfo *ai = res;
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
     while(ai) {
-        rv = UDP_registerListenSocket(cm, port, ai, paramsSize, params, application, context, connectionCallback, validate);
+        rv = UDP_registerListenSocket(cm, port, ai, params, application,
+                                      context, connectionCallback, validate);
         if(rv != UA_STATUSCODE_GOOD && validate) {
             UA_freeaddrinfo(res);
             return rv;
@@ -953,7 +952,7 @@ UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 
 static UA_StatusCode
 UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
-                       size_t paramsSize, const UA_KeyValuePair *params,
+                       const UA_KeyValueMap *params,
                        UA_ByteString *buf) {
     /* Prevent OS signals when sending to a closed socket */
     int flags = MSG_NOSIGNAL;
@@ -1019,7 +1018,7 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 
 static UA_StatusCode
-checkForSendMulticastAndConfigure(size_t paramsSize, const UA_KeyValuePair *params, struct addrinfo *info, UA_FD newSock,
+checkForSendMulticastAndConfigure(const UA_KeyValueMap *params, struct addrinfo *info, UA_FD newSock,
                                   const UA_Logger *logger) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(info->ai_family == AF_INET) {
@@ -1028,7 +1027,6 @@ checkForSendMulticastAndConfigure(size_t paramsSize, const UA_KeyValuePair *para
 
         if(isIPv4MulticastAddress(addressVal)) {
             res = setupSendMulticastIPv4(newSock, (struct sockaddr_in *)info->ai_addr,
-                                         paramsSize,
                                          params, logger);
         }
 #if UA_IPV6
@@ -1037,7 +1035,6 @@ checkForSendMulticastAndConfigure(size_t paramsSize, const UA_KeyValuePair *para
         UA_Byte *addressVal = (UA_Byte *) &addr->sin6_addr;
         if(isIPv6MulticastAddress(addressVal)) {
             res = setupSendMulticastIPv6(newSock, (struct sockaddr_in6 *)info->ai_addr,
-                                         paramsSize,
                                          params, logger);
         }
 #endif
@@ -1050,7 +1047,7 @@ checkForSendMulticastAndConfigure(size_t paramsSize, const UA_KeyValuePair *para
 }
 
 static UA_StatusCode
-registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *params,
+registerSocketAndDestinationForSend(const UA_KeyValueMap *params,
                                     const char *hostname, struct addrinfo *info,
                                     int error, UDP_FD * ufd, UA_FD *sock, const UA_Logger *logger) {
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
@@ -1062,14 +1059,14 @@ registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *pa
                            hostname, errno_str));
         return UA_STATUSCODE_BADDISCONNECT;
     }
-    UA_StatusCode res = setConnectionConfig(newSock, params, paramsSize,
+    UA_StatusCode res = setConnectionConfig(newSock, params,
                                             info->ai_family, logger);
     if(res != UA_STATUSCODE_GOOD) {
         UA_close(newSock);
         return res;
     }
 
-    res = checkForSendMulticastAndConfigure(paramsSize, params, info, newSock, logger);
+    res = checkForSendMulticastAndConfigure(params, info, newSock, logger);
     if(res != UA_STATUSCODE_GOOD) {
         UA_close(newSock);
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
@@ -1084,7 +1081,7 @@ registerSocketAndDestinationForSend(size_t paramsSize, const UA_KeyValuePair *pa
 
 static UA_StatusCode
 UDP_openSendConnection(UA_ConnectionManager *cm,
-                       size_t paramsSize, const UA_KeyValuePair *params,
+                       const UA_KeyValueMap *params,
                        void *application, void *context,
                        UA_ConnectionManager_connectionCallback connectionCallback,
                        UA_Boolean validate) {
@@ -1095,7 +1092,7 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
     char portStr[UA_MAXPORTSTR_LENGTH];
     struct addrinfo *info = NULL;
 
-    int error = getConnectionInfoFromParams(paramsSize, params, hostname,
+    int error = getConnectionInfoFromParams(params, hostname,
                                             portStr, &info, el->eventLoop.logger);
     if(error < 0 || info == NULL) {
         if(info != NULL) {
@@ -1119,7 +1116,7 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
     /* Create a socket and register the destination address from the provided parameters */
     UA_FD newSock = UA_INVALID_FD;
     UA_StatusCode res =
-        registerSocketAndDestinationForSend(paramsSize, params, hostname, info,
+        registerSocketAndDestinationForSend(params, hostname, info,
                                             error, newudpfd, &newSock, el->eventLoop.logger);
     UA_freeaddrinfo(info);
     if(validate && res == UA_STATUSCODE_GOOD) {
@@ -1162,14 +1159,14 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
     /* Signal the connection as opening. The connection fully opens in the next
      * iteration of the EventLoop */
     connectionCallback(cm, (uintptr_t)newSock, application, &newudpfd->fd.context,
-                       UA_CONNECTIONSTATE_OPENING, 0, NULL, UA_BYTESTRING_NULL);
+                       UA_CONNECTIONSTATE_OPENING, &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
 
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
 UDP_openReceiveConnection(UA_ConnectionManager *cm,
-                          size_t paramsSize, const UA_KeyValuePair *params,
+                          const UA_KeyValueMap *params,
                           void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback,
                           UA_Boolean validate) {
@@ -1177,7 +1174,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
 
     /* Get the socket */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, paramsSize,
+        UA_KeyValueMap_getScalar(params,
                                  UA_QUALIFIEDNAME(0, "listen-port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
@@ -1188,15 +1185,14 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
 
     /* Get the hostnames configuration */
     const UA_Variant *hostNames =
-        UA_KeyValueMap_get(params, paramsSize,
+        UA_KeyValueMap_get(params,
                            UA_QUALIFIEDNAME(0, "listen-hostnames"));
     if(!hostNames) {
         /* No hostnames configured -> listen on all interfaces*/
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, *port, paramsSize, params,
-                                         application, context, connectionCallback,
-                                         validate);
+        return UDP_registerListenSockets(cm, NULL, *port, params, application,
+                                         context, connectionCallback, validate);
     }
 
     /* Correct datatype for the hostnames? */
@@ -1211,9 +1207,8 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
     if(interfaces == 0) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, *port, paramsSize, params,
-                                         application, context, connectionCallback,
-                                         validate);
+        return UDP_registerListenSockets(cm, NULL, *port, params, application,
+                                         context, connectionCallback, validate);
     }
 
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
@@ -1225,8 +1220,8 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
             continue;
         memcpy(hostname, hostStrings[i].data, hostStrings->length);
         hostname[hostStrings->length] = '\0';
-        rv = UDP_registerListenSockets(cm, hostname, *port, paramsSize, params,
-                                  application, context, connectionCallback, validate);
+        rv = UDP_registerListenSockets(cm, hostname, *port, params, application,
+                                  context, connectionCallback, validate);
         if(rv != UA_STATUSCODE_GOOD) {
             return rv;
         }
@@ -1237,11 +1232,11 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
 
 static UA_StatusCode
 UDP_openConnection(UA_ConnectionManager *cm,
-                   size_t paramsSize, const UA_KeyValuePair *params,
+                   const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
 
-    const UA_Variant *validationValue = UA_KeyValueMap_get(params, paramsSize,
+    const UA_Variant *validationValue = UA_KeyValueMap_get(params,
                                                UA_QUALIFIEDNAME(0, "validate"));
     UA_Boolean validate = false;
     if(validationValue) {
@@ -1252,14 +1247,14 @@ UDP_openConnection(UA_ConnectionManager *cm,
     /* If the "port"-parameter is defined, then try to open a send connection.
      * Otherwise try to open a socket that listens for incoming TCP
      * connections. */
-    const UA_Variant *val = UA_KeyValueMap_get(params, paramsSize,
+    const UA_Variant *val = UA_KeyValueMap_get(params,
                                                UA_QUALIFIEDNAME(0, "port"));
     if(val) {
-        return UDP_openSendConnection(cm, paramsSize, params,
-                                      application, context, connectionCallback, validate);
+        return UDP_openSendConnection(cm, params, application, context,
+                                      connectionCallback, validate);
     } else {
-        return UDP_openReceiveConnection(cm, paramsSize, params,
-                                         application, context, connectionCallback, validate);
+        return UDP_openReceiveConnection(cm, params, application, context,
+                                         connectionCallback, validate);
     }
 }
 
@@ -1279,13 +1274,14 @@ UDP_eventSourceStart(UA_ConnectionManager *cm) {
     /* The receive buffersize was configured? */
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
     UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
-    const UA_UInt32 *configRxBufSize = (const UA_UInt32*)
-        UA_KeyValueMap_getScalar(cm->eventSource.params,
-                                 cm->eventSource.paramsSize,
-                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
-                                 &UA_TYPES[UA_TYPES_UINT32]);
-    if(configRxBufSize)
-        rxBufSize = *configRxBufSize;
+    if(cm->eventSource.params != NULL) {
+        const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
+            UA_KeyValueMap_getScalar(cm->eventSource.params,
+                                     UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                     &UA_TYPES[UA_TYPES_UINT32]);
+        if(configRxBufSize)
+            rxBufSize = *configRxBufSize;
+    }
     UA_StatusCode res = UA_ByteString_allocBuffer(&ucm->rxBuffer, rxBufSize);
     if(res != UA_STATUSCODE_GOOD)
         return res;
@@ -1325,12 +1321,10 @@ UDP_eventSourceDelete(UA_ConnectionManager *cm) {
     }
 
     /* Delete the parameters */
-    UA_Array_delete(cm->eventSource.params,
-                    cm->eventSource.paramsSize,
-                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    cm->eventSource.params = NULL;
-    cm->eventSource.paramsSize = 0;
-
+    if(cm->eventSource.params != NULL) {
+        UA_KeyValueMap_delete(cm->eventSource.params);
+        cm->eventSource.params = NULL;
+    }
     UA_String_clear(&cm->eventSource.name);
     UA_free(cm);
     return UA_STATUSCODE_GOOD;
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 1e9140ac4f3..dda5ee13cab 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -75,8 +75,7 @@ struct UA_EventLoop {
      * ~~~~~~~~~~~~~~~
      * The configuration should be set before the EventLoop is started */
     const UA_Logger *logger;
-    size_t paramsSize;
-    UA_KeyValuePair *params; /* See the implementation-specific documentation */
+    UA_KeyValueMap *params; /* See the implementation-specific documentation */
 
     /* EventLoop Lifecycle
      * ~~~~~~~~~~~~~~~~~~~~ */
@@ -213,8 +212,7 @@ struct UA_EventSource {
      * ~~~~~~~~~~~~~ */
     UA_String name;                 /* Unique name of the ES */
     UA_EventLoop *eventLoop;        /* EventLoop where the ES is registered */
-    size_t paramsSize;              /* Configuration parameters */
-    UA_KeyValuePair *params;
+    UA_KeyValueMap *params;
 
     /* Lifecycle
      * ~~~~~~~~~ */
@@ -259,7 +257,7 @@ typedef void
 (*UA_ConnectionManager_connectionCallback)
      (UA_ConnectionManager *cm, uintptr_t connectionId,
       void *application, void **connectionContext, UA_ConnectionState state,
-      size_t paramsSize, const UA_KeyValuePair *params, UA_ByteString msg);
+      const UA_KeyValueMap *params, UA_ByteString msg);
 
 struct UA_ConnectionManager {
     /* Every ConnectionManager is treated like an EventSource from the
@@ -307,7 +305,7 @@ struct UA_ConnectionManager {
      * connections might be opened at once. */
     UA_StatusCode
     (*openConnection)(UA_ConnectionManager *cm,
-                      size_t paramsSize, const UA_KeyValuePair *params,
+                      const UA_KeyValueMap *params,
                       void *application, void *context,
                       UA_ConnectionManager_connectionCallback connectionCallback);
 
@@ -322,7 +320,7 @@ struct UA_ConnectionManager {
      * example a tx-time for sending in time-synchronized TSN settings. */
     UA_StatusCode
     (*sendWithConnection)(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          size_t paramsSize, const UA_KeyValuePair *params,
+                          const UA_KeyValueMap *params,
                           UA_ByteString *buf);
 
     /* Close a Connection
@@ -369,8 +367,7 @@ struct UA_ConnectionManager {
 typedef void
 (*UA_InterruptCallback)(UA_InterruptManager *im,
                         uintptr_t interruptHandle, void *interruptContext,
-                        size_t instanceInfosSize,
-                        const UA_KeyValuePair *instanceInfos);
+                        const UA_KeyValueMap *instanceInfos);
 
 struct UA_InterruptManager {
     /* Every InterruptManager is treated like an EventSource from the
@@ -390,7 +387,7 @@ struct UA_InterruptManager {
      * through to the callback without modification. */
     UA_StatusCode
     (*registerInterrupt)(UA_InterruptManager *im, uintptr_t interruptHandle,
-                         size_t paramsSize, const UA_KeyValuePair *params,
+                         const UA_KeyValueMap *params,
                          UA_InterruptCallback callback, void *interruptContext);
 
     /* Remove a registered interrupt. Returns no error code if the interrupt is
diff --git a/include/open62541/util.h b/include/open62541/util.h
index 1005ca4a3ff..77453596538 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -40,34 +40,77 @@ typedef enum {
  * Key Value Map
  * -------------
  * Helper functions to work with configuration parameters in an array of
- * UA_KeyValuePair. Lookup is linear. So this is for small numbers of
- * keys. */
+ * UA_KeyValuePair. Lookup is linear. So this is for small numbers of keys. The
+ * methods below that accept a `const UA_KeyValueMap` as an argument also accept
+ * NULL for that argument and treat it as an empty map. */
 
-/* Makes a copy of the value. Can reallocate the underlying array. This
+typedef struct {
+    size_t mapSize;
+    UA_KeyValuePair *map;
+} UA_KeyValueMap;
+
+UA_EXPORT extern const UA_KeyValueMap UA_KEYVALUEMAP_NULL;
+
+UA_EXPORT UA_KeyValueMap *
+UA_KeyValueMap_new(void);
+
+UA_EXPORT void
+UA_KeyValueMap_clear(UA_KeyValueMap *map);
+
+UA_EXPORT void
+UA_KeyValueMap_delete(UA_KeyValueMap *map);
+
+/* Is the map empty (or NULL)? */
+UA_EXPORT UA_Boolean
+UA_KeyValueMap_isEmpty(const UA_KeyValueMap *map);
+
+/* Does the map contain an entry for the key? */
+UA_EXPORT UA_Boolean
+UA_KeyValueMap_contains(const UA_KeyValueMap *map, const UA_QualifiedName key);
+
+/* Insert a copy of the value. Can reallocate the underlying array. This
  * invalidates pointers into the previous array. If the key exists already, the
- * value is overwritten. */
+ * value is overwritten (upsert semantics). */
 UA_EXPORT UA_StatusCode
-UA_KeyValueMap_set(UA_KeyValuePair **map, size_t *mapSize,
+UA_KeyValueMap_set(UA_KeyValueMap *map,
                    const UA_QualifiedName key,
                    const UA_Variant *value);
 
-/* Returns a pointer to the value or NULL if the key is not found.*/
+/* Helper function for scalar insertion that internally calls
+ * `UA_KeyValueMap_set` */
+UA_EXPORT UA_StatusCode
+UA_KeyValueMap_setScalar(UA_KeyValueMap *map,
+                         const UA_QualifiedName key,
+                         void * UA_RESTRICT p,
+                         const UA_DataType *type);
+
+/* Returns a pointer to the value or NULL if the key is not found */
 UA_EXPORT const UA_Variant *
-UA_KeyValueMap_get(const UA_KeyValuePair *map, size_t mapSize,
+UA_KeyValueMap_get(const UA_KeyValueMap *map,
                    const UA_QualifiedName key);
 
-/* Returns NULL if the value for the key is not defined or not of the right
- * datatype and scalar/array */
+/* Returns NULL if the value for the key is not defined, not of the right
+ * datatype or not a scalar */
 UA_EXPORT const void *
-UA_KeyValueMap_getScalar(const UA_KeyValuePair *map, size_t mapSize,
+UA_KeyValueMap_getScalar(const UA_KeyValueMap *map,
                          const UA_QualifiedName key,
                          const UA_DataType *type);
 
-/* Remove a single entry. To delete the entire map, use UA_Array_delete. */
+/* Remove a single entry. To delete the entire map, use `UA_KeyValueMap_clear`. */
 UA_EXPORT UA_StatusCode
-UA_KeyValueMap_delete(UA_KeyValuePair **map, size_t *mapSize,
+UA_KeyValueMap_remove(UA_KeyValueMap *map,
                       const UA_QualifiedName key);
 
+/* Create a deep copy of the given KeyValueMap */
+UA_EXPORT UA_StatusCode
+UA_KeyValueMap_copy(const UA_KeyValueMap *src, UA_KeyValueMap *dst);
+
+/* Copy entries from the right-hand-side into the left-hand-size. Reallocates
+ * previous memory in the left-hand-side. If the operation fails, both maps are
+ * left untouched. */
+UA_EXPORT UA_StatusCode
+UA_KeyValueMap_merge(UA_KeyValueMap *lhs, const UA_KeyValueMap *rhs);
+
 /**
  * Endpoint URL Parser
  * -------------------
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index ec43433f0ee..b702bcb6936 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -333,7 +333,7 @@ sendHELMessage(UA_Client *client) {
     /* Send the HEL message */
     message.length = messageHeader.messageSize;
     retval = cm->sendWithConnection(cm, client->channel.connectionId,
-                                    0, NULL, &message);
+                                    &UA_KEYVALUEMAP_NULL, &message);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT, "Sending HEL failed");
         closeSecureChannel(client);
@@ -1065,7 +1065,7 @@ static void
 UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                           void *application, void **connectionContext,
                           UA_ConnectionState state,
-                          size_t paramsSize, const UA_KeyValuePair *params,
+                          const UA_KeyValueMap *params,
                           UA_ByteString msg) {
     UA_Client *client = (UA_Client*)application;
 
@@ -1255,8 +1255,12 @@ initConnect(UA_Client *client) {
         params[1].key = UA_QUALIFIEDNAME(0, "hostname");
         UA_Variant_setScalar(&params[1].value, &hostname, &UA_TYPES[UA_TYPES_STRING]);
 
+        UA_KeyValueMap paramMap;
+        paramMap.map = params;
+        paramMap.mapSize = 2;
+
         /* Open the client TCP connection */
-        res = cm->openConnection(cm, 2, params, client, NULL, UA_Client_networkCallback);
+        res = cm->openConnection(cm, &paramMap, client, NULL, UA_Client_networkCallback);
         if(res == UA_STATUSCODE_GOOD)
             break;
     }
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index ba94f202082..b2df91e01d9 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -602,9 +602,12 @@ UA_Server_createServerConnection(UA_Server *server, const UA_String *serverUrl)
             UA_Variant_setArray(&params[2].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
             paramsSize = 3;
         }
+        UA_KeyValueMap paramsMap;
+        paramsMap.map = params;
+        paramsMap.mapSize = paramsSize;
 
         /* Open the server connection */
-        res = cm->openConnection(cm, paramsSize, params, server, NULL,
+        res = cm->openConnection(cm, &paramsMap, server, NULL,
                                  UA_Server_networkCallback);
         if(res == UA_STATUSCODE_GOOD)
             return res;
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 9fee4a028ad..c79c45bf3b1 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -382,7 +382,7 @@ processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *ms
     }
 
     ack_msg.length = ackHeader.messageSize;
-    retval = cm->sendWithConnection(cm, channel->connectionId, 0, NULL, &ack_msg);
+    retval = cm->sendWithConnection(cm, channel->connectionId, &UA_KEYVALUEMAP_NULL, &ack_msg);
     if(retval == UA_STATUSCODE_GOOD)
         channel->state = UA_SECURECHANNELSTATE_ACK_SENT;
     return retval;
@@ -893,7 +893,7 @@ void
 UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                           void *application, void **connectionContext,
                           UA_ConnectionState state,
-                          size_t paramsSize, const UA_KeyValuePair *params,
+                          const UA_KeyValueMap *params,
                           UA_ByteString msg) {
     UA_Server *server = (UA_Server*)application;
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 993cd34e8d6..ab85f236dbf 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -368,7 +368,7 @@ void
 UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                           void *application, void **connectionContext,
                           UA_ConnectionState state,
-                          size_t paramsSize, const UA_KeyValuePair *params,
+                          const UA_KeyValueMap *params,
                           UA_ByteString msg);
 
 /******************************************/
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index f62187e4171..994507977fd 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -55,10 +55,8 @@ void UA_Session_clear(UA_Session *session, UA_Server* server) {
     session->continuationPoints = NULL;
     session->availableContinuationPoints = UA_MAXCONTINUATIONPOINTS;
 
-    UA_Array_delete(session->attributes, session->attributesSize,
-                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    UA_KeyValueMap_delete(session->attributes);
     session->attributes = NULL;
-    session->attributesSize = 0;
 
     UA_Array_delete(session->localeIds, session->localeIdsSize,
                     &UA_TYPES[UA_TYPES_STRING]);
@@ -278,7 +276,7 @@ UA_Server_setSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
     UA_Session *session = getSessionById(server, sessionId);
     UA_StatusCode res = UA_STATUSCODE_BADSESSIONIDINVALID;
     if(session)
-        res = UA_KeyValueMap_set(&session->attributes, &session->attributesSize,
+        res = UA_KeyValueMap_set(session->attributes,
                                  key, value);
     UA_UNLOCK(&server->serviceMutex);
     return res;
@@ -294,7 +292,7 @@ UA_Server_deleteSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
     if(!session)
         return UA_STATUSCODE_BADSESSIONIDINVALID;
     UA_StatusCode res =
-        UA_KeyValueMap_delete(&session->attributes, &session->attributesSize, key);
+        UA_KeyValueMap_remove(session->attributes, key);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -330,7 +328,7 @@ getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
         attr = &localAttr;
     } else {
         /* Get from the actual key-value list */
-        attr = UA_KeyValueMap_get(session->attributes, session->attributesSize, key);
+        attr = UA_KeyValueMap_get(session->attributes, key);
         if(!attr)
             return UA_STATUSCODE_BADNOTFOUND;
     }
diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index 246d92eeff0..098a76cfba9 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -51,8 +51,7 @@ typedef struct {
     UA_UInt16         availableContinuationPoints;
     ContinuationPoint *continuationPoints;
 
-    size_t attributesSize;
-    UA_KeyValuePair *attributes;
+    UA_KeyValueMap *attributes;
 
     /* Localization information */
     size_t localeIdsSize;
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 5469953acb8..7002e2456ac 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -120,7 +120,7 @@ UA_SecureChannel_sendError(UA_SecureChannel *channel, UA_TcpErrorMessage *error)
                                       &bufPos, &bufEnd, NULL, NULL);
     (void)retval; /* Encoding of these cannot fail */
     msg.length = header.messageSize;
-    cm->sendWithConnection(cm, channel->connectionId, 0, NULL, &msg);
+    cm->sendWithConnection(cm, channel->connectionId, &UA_KEYVALUEMAP_NULL, &msg);
 }
 
 static void
@@ -294,7 +294,7 @@ UA_SecureChannel_sendAsymmetricOPNMessage(UA_SecureChannel *channel,
 
     /* Send the message, the buffer is freed in the network layer */
     buf.length = encryptedLength;
-    return cm->sendWithConnection(cm, channel->connectionId, 0, NULL, &buf);
+    return cm->sendWithConnection(cm, channel->connectionId, &UA_KEYVALUEMAP_NULL, &buf);
 
  error:
     cm->freeNetworkBuffer(cm, channel->connectionId, &buf);
@@ -420,7 +420,7 @@ sendSymmetricChunk(UA_MessageContext *mc) {
      * wrong, the connection is removed in the next iteration of the
      * SecureChannel. Set the SecureChannel to closing already. */
     res = cm->sendWithConnection(cm, channel->connectionId,
-                                 0, NULL, &mc->messageBuffer);
+                                 &UA_KEYVALUEMAP_NULL, &mc->messageBuffer);
     if(res != UA_STATUSCODE_GOOD && UA_SecureChannel_isConnected(channel))
         channel->state = UA_SECURECHANNELSTATE_CLOSING;
 
diff --git a/src/ua_util.c b/src/ua_util.c
index 88d522db394..2e6d583677d 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -227,15 +227,25 @@ UA_ByteString_fromBase64(UA_ByteString *bs,
 
 /* Key Value Map */
 
+const UA_KeyValueMap UA_KEYVALUEMAP_NULL = {0};
+
+UA_KeyValueMap *
+UA_KeyValueMap_new(void) {
+    return (UA_KeyValueMap*)UA_calloc(1, sizeof(UA_KeyValueMap));
+}
+
 UA_StatusCode
-UA_KeyValueMap_set(UA_KeyValuePair **map, size_t *mapSize,
+UA_KeyValueMap_set(UA_KeyValueMap *map,
                    const UA_QualifiedName key,
                    const UA_Variant *value) {
-    /* Parameter exists already */
-    const UA_Variant *v = UA_KeyValueMap_get(*map, *mapSize, key);
+    if(map == NULL || value == NULL)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    /* Key exists already */
+    const UA_Variant *v = UA_KeyValueMap_get(map, key);
     if(v) {
         UA_Variant copyV;
-        UA_StatusCode res = UA_Variant_copy(v, &copyV);
+        UA_StatusCode res = UA_Variant_copy(value, &copyV);
         if(res != UA_STATUSCODE_GOOD)
             return res;
         UA_Variant *target = (UA_Variant*)(uintptr_t)v;
@@ -248,60 +258,153 @@ UA_KeyValueMap_set(UA_KeyValuePair **map, size_t *mapSize,
     UA_KeyValuePair pair;
     pair.key = key;
     pair.value = *value;
-    return UA_Array_appendCopy((void**)map, mapSize, &pair,
+    return UA_Array_appendCopy((void**)&map->map, &map->mapSize, &pair,
                                &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
 }
 
+UA_StatusCode
+UA_KeyValueMap_setScalar(UA_KeyValueMap *map,
+                         const UA_QualifiedName key,
+                         void * UA_RESTRICT p,
+                         const UA_DataType *type) {
+    if(p == NULL || type == NULL)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_Variant v;
+    UA_Variant_init(&v);
+    v.type = type;
+    v.arrayLength = 0;
+    v.data = p;
+    return UA_KeyValueMap_set(map, key, &v);
+}
+
 const UA_Variant *
-UA_KeyValueMap_get(const UA_KeyValuePair *map, size_t mapSize,
+UA_KeyValueMap_get(const UA_KeyValueMap *map,
                    const UA_QualifiedName key) {
-    for(size_t i = 0; i < mapSize; i++) {
-        if(map[i].key.namespaceIndex == key.namespaceIndex &&
-           UA_String_equal(&map[i].key.name, &key.name))
-            return &map[i].value;
+    if(!map)
+        return NULL;
+    for(size_t i = 0; i < map->mapSize; i++) {
+        if(map->map[i].key.namespaceIndex == key.namespaceIndex &&
+           UA_String_equal(&map->map[i].key.name, &key.name))
+            return &map->map[i].value;
 
     }
     return NULL;
 }
 
-/* Returns NULL if the parameter is not defined or not of the right datatype */
+UA_Boolean
+UA_KeyValueMap_isEmpty(const UA_KeyValueMap *map) {
+    if(!map)
+        return true;
+    return map->mapSize == 0;
+}
+
 const void *
-UA_KeyValueMap_getScalar(const UA_KeyValuePair *map, size_t mapSize,
+UA_KeyValueMap_getScalar(const UA_KeyValueMap *map,
                          const UA_QualifiedName key,
                          const UA_DataType *type) {
-    const UA_Variant *v = UA_KeyValueMap_get(map, mapSize, key);
+    const UA_Variant *v = UA_KeyValueMap_get(map, key);
     if(!v || !UA_Variant_hasScalarType(v, type))
         return NULL;
     return v->data;
 }
 
+void
+UA_KeyValueMap_clear(UA_KeyValueMap *map) {
+    if(!map)
+        return;
+    UA_Array_delete(map->map, map->mapSize, &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    map->mapSize = 0;
+}
+
+void
+UA_KeyValueMap_delete(UA_KeyValueMap *map) {
+    UA_KeyValueMap_clear(map);
+    UA_free(map);
+}
+
 UA_StatusCode
-UA_KeyValueMap_delete(UA_KeyValuePair **map, size_t *mapSize,
+UA_KeyValueMap_remove(UA_KeyValueMap *map,
                       const UA_QualifiedName key) {
-    UA_KeyValuePair *m = *map;
-    size_t s = *mapSize;
-    for(size_t i = 0; i < s; i++) {
-        if(m[i].key.namespaceIndex != key.namespaceIndex ||
-           !UA_String_equal(&m[i].key.name, &key.name))
-            continue;
-
-        /* Clean the pair */
-        UA_KeyValuePair_clear(&m[i]);
-
-        /* Move the last pair to fill the empty slot */
-        if(s > 1 && i < s - 1) {
-            m[i] = m[s-1];
-            UA_KeyValuePair_init(&m[s-1]);
-        }
+    if(!map)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_KeyValuePair *m = map->map;
+    size_t s = map->mapSize;
+    size_t i = 0;
+    for(; i < s; i++) {
+        if(m[i].key.namespaceIndex == key.namespaceIndex &&
+           UA_String_equal(&m[i].key.name, &key.name))
+            break;
+    }
+    if(i == s)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    /* Clean the slot and move the last entry to fill the slot */
+    UA_KeyValuePair_clear(&m[i]);
+    if(s > 1 && i < s - 1) {
+        m[i] = m[s-1];
+        UA_KeyValuePair_init(&m[s-1]);
+    }
+    
+    /* Ignore the result. In case resize fails, keep the longer original array
+     * around. Resize never fails when reducing the size to zero. Reduce the
+     * size integer in any case. */
+    UA_StatusCode res =
+        UA_Array_resize((void**)&map->map, &map->mapSize, map->mapSize - 1,
+                          &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    (void)res;
+    map->mapSize--;
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_KeyValueMap_copy(const UA_KeyValueMap *src, UA_KeyValueMap *dst) {
+    if(!dst)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    if(!src) {
+        dst->map = NULL;
+        dst->mapSize = 0;
+        return UA_STATUSCODE_GOOD;
+    }
+    UA_StatusCode res = UA_Array_copy(src->map, src->mapSize, (void**)&dst->map,
+                                      &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    if(res == UA_STATUSCODE_GOOD)
+        dst->mapSize = src->mapSize;
+    return res;
+}
+
+UA_Boolean
+UA_KeyValueMap_contains(const UA_KeyValueMap *map, const UA_QualifiedName key) {
+    if(!map)
+        return false;
+    for(size_t i = 0; i < map->mapSize; ++i) {
+        if(UA_QualifiedName_equal(&map->map[i].key, &key))
+            return true;
+    }
+    return false;
+}
 
-        UA_StatusCode res = UA_Array_resize((void**)map, mapSize, *mapSize-1,
-                                            &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-        (void)res;
-        *mapSize = s - 1; /* In case resize fails, keep the longer original
-                           * array around. Resize never fails when reducing
-                           * the size to zero. Reduce the size integer in
-                           * any case. */
+UA_StatusCode
+UA_KeyValueMap_merge(UA_KeyValueMap *lhs, const UA_KeyValueMap *rhs) {
+    if(!lhs)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    if(!rhs)
         return UA_STATUSCODE_GOOD;
+
+    UA_KeyValueMap merge;
+    UA_StatusCode res = UA_KeyValueMap_copy(lhs, &merge);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    for(size_t i = 0; i < rhs->mapSize; ++i) {
+        res = UA_KeyValueMap_set(&merge, rhs->map[i].key, &rhs->map[i].value);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_KeyValueMap_clear(&merge);
+            return res;
+        }
     }
-    return UA_STATUSCODE_BADNOTFOUND;
+
+    UA_KeyValueMap_clear(lhs);
+    *lhs = merge;
+    return UA_STATUSCODE_GOOD;
 }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2f6bfd31dbb..65f940a937f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -239,6 +239,7 @@ endif()
 ua_add_test(check_types_custom.c)
 ua_add_test(check_chunking.c)
 ua_add_test(check_utils.c)
+ua_add_test(check_kvm_utils.c)
 ua_add_test(check_securechannel.c)
 ua_add_test(check_timer.c)
 ua_add_test(check_eventloop.c)
diff --git a/tests/check_eventloop_eth.c b/tests/check_eventloop_eth.c
index 8af884800af..c909acc9e9e 100644
--- a/tests/check_eventloop_eth.c
+++ b/tests/check_eventloop_eth.c
@@ -26,8 +26,7 @@ typedef struct TestContext {
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void *application, void **connectionContext,
-                   UA_ConnectionState status,
-                   size_t paramsSize, const UA_KeyValuePair *params,
+                   UA_ConnectionState status, const UA_KeyValueMap *params,
                    UA_ByteString msg) {
     TestContext *ctx = (TestContext*) *connectionContext;
     if(status == UA_CONNECTIONSTATE_CLOSING) {
@@ -48,10 +47,9 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         clientId = connectionId;
 
         /* The remote-hostname is set during the first callback */
-        if(paramsSize > 0) {
+        if(params->mapSize> 0) {
             const void *hn =
-                UA_KeyValueMap_getScalar(params, paramsSize,
-                                         UA_QUALIFIEDNAME(0, "remote-hostname"),
+                UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "remote-hostname"),
                                          &UA_TYPES[UA_TYPES_STRING]);
             ck_assert(hn != NULL);
         }
@@ -79,7 +77,7 @@ START_TEST(listenETH) {
     UA_String address = UA_STRING(MULTICAST_MAC_ADDRESS);
     UA_Boolean listen = true;
 
-    UA_KeyValuePair params[5];
+    UA_KeyValuePair params[3];
     params[0].key = UA_QUALIFIEDNAME(0, "interface");
     UA_Variant_setScalar(&params[0].value, &interface, &UA_TYPES[UA_TYPES_STRING]);
     params[1].key = UA_QUALIFIEDNAME(0, "address");
@@ -87,7 +85,8 @@ START_TEST(listenETH) {
     params[2].key = UA_QUALIFIEDNAME(0, "listen");
     UA_Variant_setScalar(&params[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
-    UA_StatusCode res = cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+    UA_KeyValueMap kvm = {3, params};
+    UA_StatusCode res = cm->openConnection(cm, &kvm, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
 
     ck_assert(testContext.connCount == 1);
@@ -138,15 +137,17 @@ START_TEST(connectETH) {
     testContext.connCount = 0;
 
     /* Don't use the address parameter for listening */
+    UA_KeyValueMap kvm = {3, &params[1]};
     UA_StatusCode retval =
-        cm->openConnection(cm, 3, &params[1], NULL, &testContext, connectionCallback);
+        cm->openConnection(cm, &kvm, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     size_t listenSockets = testContext.connCount;
 
     /* Open a client connection. Don't use the listen parameter.*/
+    kvm.map = params;
     clientId = 0;
-    retval = cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+    retval = cm->openConnection(cm, &kvm, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
@@ -161,7 +162,7 @@ START_TEST(connectETH) {
     retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     memcpy(snd.data, testMsg, strlen(testMsg));
-    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
+    retval = cm->sendWithConnection(cm, clientId, NULL, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     while(!received) {
diff --git a/tests/check_eventloop_interrupt.c b/tests/check_eventloop_interrupt.c
index 945cf1fbf51..292d3ba028b 100644
--- a/tests/check_eventloop_interrupt.c
+++ b/tests/check_eventloop_interrupt.c
@@ -23,7 +23,7 @@ unsigned counter = 0;
 static void
 interruptCallback(UA_InterruptManager *im,
                   uintptr_t interruptHandle, void *interruptContext,
-                  size_t instanceInfosSize, const UA_KeyValuePair *instanceInfos) {
+                  const UA_KeyValueMap *instanceInfos) {
     counter++;
 }
 
@@ -32,7 +32,7 @@ START_TEST(catchInterrupt) {
     UA_InterruptManager *im = UA_InterruptManager_new_POSIX(UA_STRING("im1"));
     el->registerEventSource(el, &im->eventSource);
 
-    im->registerInterrupt(im, TESTSIG, 0, NULL, interruptCallback, NULL);
+    im->registerInterrupt(im, TESTSIG, &UA_KEYVALUEMAP_NULL, interruptCallback, NULL);
     el->start(el);
 
     /* Send signal to self*/
@@ -63,11 +63,11 @@ START_TEST(registerDuplicate) {
     el->start(el);
 
     UA_StatusCode res =
-        im->registerInterrupt(im, TESTSIG, 0, NULL, interruptCallback, NULL);
+        im->registerInterrupt(im, TESTSIG, &UA_KEYVALUEMAP_NULL, interruptCallback, NULL);
     ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
 
     /* Registering the same signal twice must fail */
-    res = im->registerInterrupt(im, TESTSIG, 0, NULL, interruptCallback, NULL);
+    res = im->registerInterrupt(im, TESTSIG, &UA_KEYVALUEMAP_NULL, interruptCallback, NULL);
     ck_assert_uint_ne(res, UA_STATUSCODE_GOOD);
 
     /* Stop the EventLoop */
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index 145c27db5f0..1b9d47c3272 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -21,7 +21,7 @@ static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void *application, void **connectionContext,
                    UA_ConnectionState status,
-                   size_t paramsSize, const UA_KeyValuePair *params,
+                   const UA_KeyValueMap *params,
                    UA_ByteString msg) {
     if(status == UA_CONNECTIONSTATE_CLOSING) {
         UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
@@ -65,9 +65,13 @@ START_TEST(listenTCP) {
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
 
+    UA_KeyValueMap paramsMap;
+    paramsMap.map = params;
+    paramsMap.mapSize = 1;
+
     ck_assert_uint_eq(connCount, 0);
 
-    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+    cm->openConnection(cm, &paramsMap, NULL, NULL, connectionCallback);
 
     ck_assert(connCount > 0);
 
@@ -106,9 +110,13 @@ START_TEST(connectTCP) {
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
 
+    UA_KeyValueMap paramsMap;
+    paramsMap.map = params;
+    paramsMap.mapSize = 1;
+
     connCount = 0;
 
-    cm->openConnection(cm, 1, params, NULL, NULL, connectionCallback);
+    cm->openConnection(cm, &paramsMap, NULL, NULL, connectionCallback);
 
     size_t listenSockets = connCount;
 
@@ -121,8 +129,10 @@ START_TEST(connectTCP) {
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
+    paramsMap.mapSize = 2;
+
     UA_StatusCode retval =
-        cm->openConnection(cm, 2, params, NULL, (void*)0x01, connectionCallback);
+        cm->openConnection(cm, &paramsMap, NULL, (void*)0x01, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
@@ -138,7 +148,7 @@ START_TEST(connectTCP) {
     retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     memcpy(snd.data, testMsg, strlen(testMsg));
-    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
+    retval = cm->sendWithConnection(cm, clientId, NULL, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index 0779ad7e477..41d1d4a0192 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -24,7 +24,7 @@ static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void *application, void **connectionContext,
                    UA_ConnectionState status,
-                   size_t paramsSize, const UA_KeyValuePair *params,
+                   const UA_KeyValueMap *params,
                    UA_ByteString msg) {
     TestContext *ctx = (TestContext*) *connectionContext;
     if(status == UA_CONNECTIONSTATE_CLOSING) {
@@ -45,9 +45,9 @@ connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         clientId = connectionId;
 
         /* The remote-hostname is set during the first callback */
-        if(paramsSize > 0) {
+        if(!UA_KeyValueMap_isEmpty(params)) {
             const void *hn =
-                UA_KeyValueMap_getScalar(params, paramsSize,
+                UA_KeyValueMap_getScalar(params,
                                          UA_QUALIFIEDNAME(0, "remote-hostname"),
                                          &UA_TYPES[UA_TYPES_STRING]);
             ck_assert(hn != NULL);
@@ -79,8 +79,11 @@ START_TEST(listenUDP) {
     UA_KeyValuePair params[1];
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
+    UA_KeyValueMap paramsMap;
+    paramsMap.map = params;
+    paramsMap.mapSize = 1;
 
-    cm->openConnection(cm, 1, params, NULL, &testContext, connectionCallback);
+    cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
 
     ck_assert(testContext.connCount > 0);
 
@@ -133,8 +136,12 @@ START_TEST(connectUDPValidationSucceeds) {
         TestContext testContext;
         testContext.connCount = 0;
 
+        UA_KeyValueMap paramsMap;
+        paramsMap.map = params;
+        paramsMap.mapSize = 3;
+
         UA_StatusCode retval =
-            cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+            cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
         /* Open a client connection */
@@ -148,7 +155,10 @@ START_TEST(connectUDPValidationSucceeds) {
         params[2].key = UA_QUALIFIEDNAME(0, "validate");
         params[2].value = validateVar;
 
-        retval = cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+        paramsMap.map = params;
+        paramsMap.mapSize = 3;
+
+        retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         el->free(el);
         el = NULL;
@@ -182,8 +192,12 @@ START_TEST(connectUDPValidationFails) {
         TestContext testContext;
         testContext.connCount = 0;
 
+        UA_KeyValueMap paramsMap;
+        paramsMap.map = params;
+        paramsMap.mapSize = 3;
+
         UA_StatusCode retval =
-            cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+            cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
         ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
 
         /* Open a client connection */
@@ -197,7 +211,7 @@ START_TEST(connectUDPValidationFails) {
         params[2].key = UA_QUALIFIEDNAME(0, "validate");
         params[2].value = validateVar;
 
-        retval = cm->openConnection(cm, 3, params, NULL, &testContext, connectionCallback);
+        retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
         ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
         el->free(el);
         el = NULL;
@@ -216,12 +230,15 @@ START_TEST(connectUDP) {
     UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
+    UA_KeyValueMap paramsMap;
+    paramsMap.map = params;
+    paramsMap.mapSize = 1;
 
     TestContext testContext;
     testContext.connCount = 0;
 
     UA_StatusCode retval =
-        cm->openConnection(cm, 1, params, NULL, &testContext, connectionCallback);
+        cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     size_t listenSockets = testContext.connCount;
@@ -234,7 +251,9 @@ START_TEST(connectUDP) {
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    retval = cm->openConnection(cm, 2, params, NULL, &testContext, connectionCallback);
+    paramsMap.mapSize = 2;
+
+    retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
@@ -249,7 +268,7 @@ START_TEST(connectUDP) {
     retval = cm->allocNetworkBuffer(cm, clientId, &snd, strlen(testMsg));
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     memcpy(snd.data, testMsg, strlen(testMsg));
-    retval = cm->sendWithConnection(cm, clientId, 0, NULL, &snd);
+    retval = cm->sendWithConnection(cm, clientId, &UA_KEYVALUEMAP_NULL, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = el->run(el, 1);
@@ -302,11 +321,15 @@ START_TEST(udpTalkerAndListener) {
     params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     params[0].value = portVar;
 
+    UA_KeyValueMap paramsMap;
+    paramsMap.map = params;
+    paramsMap.mapSize = 1;
+
     TestContext testContext;
     testContext.connCount = 0;
 
     UA_StatusCode retval =
-        cmListener->openConnection(cmListener, 1, params, NULL, &testContext,
+        cmListener->openConnection(cmListener, &paramsMap, NULL, &testContext,
                                    connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -321,7 +344,9 @@ START_TEST(udpTalkerAndListener) {
     params[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    retval = cmTalker->openConnection(cmTalker, 2, params, NULL, &testContext,
+    paramsMap.mapSize = 2;
+
+    retval = cmTalker->openConnection(cmTalker, &paramsMap, NULL, &testContext,
                                       connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -340,7 +365,7 @@ START_TEST(udpTalkerAndListener) {
     retval = cmTalker->allocNetworkBuffer(cmTalker, clientId, &snd, strlen(testMsg));
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     memcpy(snd.data, testMsg, strlen(testMsg));
-    retval = cmTalker->sendWithConnection(cmTalker, clientId, 0, NULL, &snd);
+    retval = cmTalker->sendWithConnection(cmTalker, clientId, &UA_KEYVALUEMAP_NULL, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = elListener->run(elListener, 1);
@@ -408,12 +433,15 @@ START_TEST(udpTalkerAndListenerDifferentDestination) {
     UA_KeyValuePair listenParams[2];
     listenParams[0].key = UA_QUALIFIEDNAME(0, "listen-port");
     listenParams[0].value = portVar;
+    UA_KeyValueMap listenParamsMap;
+    listenParamsMap.map = listenParams;
+    listenParamsMap.mapSize = 1;
 
     TestContext testContext;
     testContext.connCount = 0;
 
     UA_StatusCode retval =
-        cmListener->openConnection(cmListener, 1, listenParams, NULL, &testContext,
+        cmListener->openConnection(cmListener, &listenParamsMap, NULL, &testContext,
                                    connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -428,8 +456,11 @@ START_TEST(udpTalkerAndListenerDifferentDestination) {
     connectionParams[0].value = portVar;
     connectionParams[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&connectionParams[1].value, &connectionTargetHost, &UA_TYPES[UA_TYPES_STRING]);
+    UA_KeyValueMap connectionParamsMap;
+    connectionParamsMap.map = connectionParams;
+    connectionParamsMap.mapSize = 2;
 
-    retval = cmTalker->openConnection(cmTalker, 2, connectionParams, NULL, &testContext,
+    retval = cmTalker->openConnection(cmTalker, &connectionParamsMap, NULL, &testContext,
                                       connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -456,7 +487,11 @@ START_TEST(udpTalkerAndListenerDifferentDestination) {
     sendParams[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&sendParams[1].value, &sendTargetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-    retval = cmTalker->sendWithConnection(cmTalker, clientId, 2, sendParams, &snd);
+    UA_KeyValueMap sendParamsMap;
+    sendParamsMap.map = sendParams;
+    sendParamsMap.mapSize = 2;
+
+    retval = cmTalker->sendWithConnection(cmTalker, clientId, &sendParamsMap, &snd);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
         UA_DateTime next = elListener->run(elListener, 1);
diff --git a/tests/check_kvm_utils.c b/tests/check_kvm_utils.c
new file mode 100644
index 00000000000..b4db55b3256
--- /dev/null
+++ b/tests/check_kvm_utils.c
@@ -0,0 +1,183 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ua_util_internal.h"
+
+#include <stdlib.h>
+
+#include "check.h"
+
+static UA_KeyValueMap*
+keyValueMap_setup(size_t n, size_t offsetKey, size_t offsetValue) {
+    UA_KeyValueMap *kvm = UA_KeyValueMap_new();
+
+    for(size_t i=0; i<n; i++) {
+        char key[10];
+        snprintf(key, 10, "key%02d", (UA_UInt16) (i + offsetKey));
+        UA_UInt16 *value = UA_UInt16_new();
+        *value = (UA_UInt16) (i + offsetValue);
+        UA_KeyValueMap_setScalar(kvm, UA_QUALIFIEDNAME(0, key), value, &UA_TYPES[UA_TYPES_UINT16]);
+        UA_free(value);
+    }
+    return kvm;
+}
+
+START_TEST(CheckNullArgs) {
+        // UA_KeyValueMap_setScalar(&UA_KEYVALUEMAP_NULL, UA_QUALIFIEDNAME(0, "any"), 0, &UA_TYPES[UA_TYPES_UINT16]);
+        //UA_KeyValueMap_get(&UA_KEYVALUEMAP_NULL, UA_QUALIFIEDNAME(0, "any"));
+        // UA_KeyValueMap_isEmpty(&UA_KEYVALUEMAP_NULL);
+        UA_KeyValueMap map;
+        UA_StatusCode res = UA_KeyValueMap_copy(&UA_KEYVALUEMAP_NULL, &map);
+        ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+        ck_assert_uint_eq(map.mapSize, UA_KEYVALUEMAP_NULL.mapSize);
+        ck_assert(map.map == UA_KEYVALUEMAP_NULL.map);
+
+        res = UA_KeyValueMap_copy(NULL, &map);
+        ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+
+        res = UA_KeyValueMap_copy(&UA_KEYVALUEMAP_NULL, NULL);
+        ck_assert_uint_eq(res, UA_STATUSCODE_BADINVALIDARGUMENT);
+
+        res = UA_KeyValueMap_copy(NULL, NULL);
+        ck_assert_uint_eq(res, UA_STATUSCODE_BADINVALIDARGUMENT);
+
+        UA_KeyValueMap_clear(&map);
+
+} END_TEST
+
+START_TEST(CheckKVMContains) {
+        UA_KeyValueMap *kvm = keyValueMap_setup(10, 0, 0);
+
+        for(UA_UInt16 i=0; i<10; i++) {
+            char key[6] = "key00";
+            sprintf(&key[3], "%02d", i);
+            UA_Boolean doesContain = UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, key));
+            ck_assert(doesContain);
+        }
+
+        for(UA_UInt16 i=10; i<20; i++) {
+            char key[6] = "key10";
+            sprintf(&key[3], "%02d", i);
+            UA_Boolean doesContain = UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, key));
+            ck_assert(!doesContain);
+        }
+
+        UA_KeyValueMap_delete(kvm);
+}
+END_TEST
+
+START_TEST(CheckKVMCopy) {
+
+        UA_KeyValueMap *kvm = keyValueMap_setup(10, 0, 0);
+        UA_KeyValueMap kvmCopy;
+        UA_KeyValueMap_copy(kvm, &kvmCopy);
+
+        for(size_t i = 0; i < 10; i++) {
+            ck_assert(UA_QualifiedName_equal(&kvm->map[i].key, &kvmCopy.map[i].key));
+        }
+        UA_KeyValueMap_delete(kvm);
+        UA_KeyValueMap_clear(&kvmCopy);
+}
+END_TEST
+
+START_TEST(CheckKVMCountMergedIntersecting) {
+        UA_KeyValueMap *kvmLhs = keyValueMap_setup(10, 0, 0);
+        UA_KeyValueMap *kvmRhs = keyValueMap_setup(10, 5, 10);
+
+        /**
+         key00: 0
+         key01: 1
+            ...
+         key09: 9
+         ---------------------
+         key05: 10
+         key06: 11
+            ...
+         key14: 19
+         */
+
+        UA_KeyValueMap_merge(kvmLhs, kvmRhs);
+        ck_assert_uint_eq(kvmLhs->mapSize, 15);
+
+        for(size_t i = 0; i < kvmLhs->mapSize; i++) {
+            char key[10];
+            snprintf(key, 10, "key%02d", (UA_UInt16) i);
+            const UA_UInt16 *value = (const UA_UInt16*)
+                UA_KeyValueMap_getScalar(kvmLhs, UA_QUALIFIEDNAME(0, key),
+                                         &UA_TYPES[UA_TYPES_UINT16]);
+            if(i < 5) {
+                ck_assert_uint_eq(*value, i);
+            } else {
+                ck_assert_uint_eq(*value, i+5);
+            }
+        }
+
+        UA_KeyValueMap_delete(kvmLhs);
+        UA_KeyValueMap_delete(kvmRhs);
+    }
+END_TEST
+
+
+START_TEST(CheckKVMCountMergedCommon) {
+        UA_KeyValueMap *kvmLhs = keyValueMap_setup(10, 0, 0);
+        UA_KeyValueMap *kvmRhs = keyValueMap_setup(10, 0, 10);
+        UA_KeyValueMap_merge(kvmLhs, kvmRhs);
+        ck_assert_uint_eq(kvmLhs->mapSize, 10);
+
+        for(size_t i = 0; i < kvmLhs->mapSize; i++) {
+            char key[10];
+            snprintf(key, 10, "key%02d", (UA_UInt16) i);
+            const UA_UInt16 *value = (const UA_UInt16*)
+                UA_KeyValueMap_getScalar(kvmLhs, UA_QUALIFIEDNAME(0, key),
+                                         &UA_TYPES[UA_TYPES_UINT16]);
+
+            ck_assert_uint_eq(*value, i+10);
+        }
+
+        UA_KeyValueMap_delete(kvmLhs);
+        UA_KeyValueMap_delete(kvmRhs);
+    }
+END_TEST
+
+START_TEST(CheckKVMCountMergedComplementary) {
+        UA_KeyValueMap *kvmLhs = keyValueMap_setup(10, 0, 0);
+        UA_KeyValueMap *kvmRhs = keyValueMap_setup(10, 10, 10);
+        UA_KeyValueMap_merge(kvmLhs, kvmRhs);
+        ck_assert_uint_eq(kvmLhs->mapSize, 20);
+
+        for(size_t i = 0; i < kvmLhs->mapSize; i++) {
+            char key[10];
+            snprintf(key, 10, "key%02d", (UA_UInt16) i);
+            const UA_UInt16 *value = (const UA_UInt16*)
+                UA_KeyValueMap_getScalar(kvmLhs, UA_QUALIFIEDNAME(0, key),
+                                         &UA_TYPES[UA_TYPES_UINT16]);
+            ck_assert_uint_eq(*value, i);
+        }
+
+        UA_KeyValueMap_delete(kvmLhs);
+        UA_KeyValueMap_delete(kvmRhs);
+    }
+END_TEST
+
+int main(void) {
+    Suite *s  = suite_create("Test KeyValueMap Utilities");
+    TCase *tc = tcase_create("test cases");
+    tcase_add_test(tc, CheckNullArgs);
+    tcase_add_test(tc, CheckKVMContains);
+    tcase_add_test(tc, CheckKVMCopy);
+    tcase_add_test(tc, CheckKVMCountMergedIntersecting);
+    tcase_add_test(tc, CheckKVMCountMergedComplementary);
+    tcase_add_test(tc, CheckKVMCountMergedCommon);
+    suite_add_tcase(s, tc);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all (sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+
diff --git a/tests/fuzz/fuzz_binary_message.cc b/tests/fuzz/fuzz_binary_message.cc
index 164fd1ffb23..6ca54a85724 100644
--- a/tests/fuzz/fuzz_binary_message.cc
+++ b/tests/fuzz/fuzz_binary_message.cc
@@ -63,7 +63,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     void *ctx;
     UA_Server_networkCallback(&testConnectionManagerTCP, 0, server,
                               &ctx, UA_CONNECTIONSTATE_ESTABLISHED,
-                              0, NULL, msg);
+                              &UA_KEYVALUEMAP_NULL, msg);
 
     // if we got an invalid chunk, the message is not deleted, so delete it here
     UA_ByteString_clear(&msg);
diff --git a/tests/testing-plugins/testing_networklayers.c b/tests/testing-plugins/testing_networklayers.c
index 20e589c5518..fef017da15e 100644
--- a/tests/testing-plugins/testing_networklayers.c
+++ b/tests/testing-plugins/testing_networklayers.c
@@ -8,7 +8,7 @@ UA_ByteString *testConnectionLastSentBuf;
 
 static UA_StatusCode
 testOpenConnection(UA_ConnectionManager *cm,
-                    size_t paramsSize, const UA_KeyValuePair *params,
+                    const UA_KeyValueMap *params,
                     void *application, void *context,
                     UA_ConnectionManager_connectionCallback connectionCallback) {
     return UA_STATUSCODE_BADNOTCONNECTED;
@@ -16,7 +16,7 @@ testOpenConnection(UA_ConnectionManager *cm,
 
 static UA_StatusCode
 testSendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
-                       size_t paramsSize, const UA_KeyValuePair *params,
+                       const UA_KeyValueMap *params,
                        UA_ByteString *buf) {
     if(testConnectionLastSentBuf) {
         UA_ByteString_clear(testConnectionLastSentBuf);

From ff3b0d23757d928a37474a9b2a32f6b065bb7e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Tyndel?= <michaltyndel@gmail.com>
Date: Wed, 2 Nov 2022 11:19:46 +0100
Subject: [PATCH 0511/1963] fix(pubsub): Create a copy of SecurityGroupId
 string when copying WG and RG config

Keep it consistent with other strings, which are copied. Clear the strings with configuration.
---
 src/pubsub/ua_pubsub_readergroup.c | 11 +++++++++++
 src/pubsub/ua_pubsub_writergroup.c |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index e090605a572..d3c42520875 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -73,6 +73,14 @@ UA_ReaderGroupConfig_copy(const UA_ReaderGroupConfig *src,
         UA_String_clear(&dst->name);
         return res;
     }
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    res = UA_String_copy(&src->securityGroupId, &dst->securityGroupId);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_String_clear(&dst->name);
+        UA_String_clear(&dst->securityGroupId);
+        return res;
+    }
+#endif
     dst->groupPropertiesSize = src->groupPropertiesSize;
     return UA_STATUSCODE_GOOD;
 }
@@ -85,6 +93,9 @@ UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig) {
                     &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
     readerGroupConfig->groupProperties = NULL;
     readerGroupConfig->groupPropertiesSize = 0;
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    UA_String_clear(&readerGroupConfig->securityGroupId);
+#endif
 }
 
 /* ReaderGroup Lifecycle */
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 2771030efe4..37c0e77f773 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -505,6 +505,9 @@ UA_WriterGroupConfig_copy(const UA_WriterGroupConfig *src,
             res |= UA_KeyValuePair_copy(&src->groupProperties[i], &dst->groupProperties[i]);
         }
     }
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    res |= UA_String_copy(&src->securityGroupId, &dst->securityGroupId);
+#endif
     if(res != UA_STATUSCODE_GOOD)
         UA_WriterGroupConfig_clear(dst);
     return res;
@@ -654,6 +657,9 @@ UA_WriterGroupConfig_clear(UA_WriterGroupConfig *writerGroupConfig) {
                     writerGroupConfig->groupPropertiesSize,
                     &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
     writerGroupConfig->groupProperties = NULL;
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    UA_String_clear(&writerGroupConfig->securityGroupId);
+#endif
 }
 
 static void

From 9e6c5d05e1f8214a020c7058bc7c91249774a5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Tyndel?= <michaltyndel@gmail.com>
Date: Wed, 2 Nov 2022 11:35:39 +0100
Subject: [PATCH 0512/1963] refactor(pubsub): Removed unused field from DSR and
 RG config

SecurityParameters member of reader and readerGroup config was not used anywhere and was a single instance of UA_PubSubSecurityParameters type. ReaderGroupConfig already contains this info in other memebers.
---
 include/open62541/server_pubsub.h | 10 ----------
 src/pubsub/ua_pubsub_reader.c     |  2 --
 2 files changed, 12 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 5ae843899a5..0599f5e5494 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -695,14 +695,6 @@ UA_Server_DataSetReader_createTargetVariables(UA_Server *server,
  * on the Subscriber side. DataSetReader must be linked with a
  * SubscribedDataSet and be contained within a ReaderGroup. */
 
-/* Parameters for PubSubSecurity */
-typedef struct {
-    UA_Int32 securityMode;          /* placeholder datatype 'MessageSecurityMode' */
-    UA_String securityGroupId;
-    size_t keyServersSize;
-    UA_Int32 *keyServers;
-} UA_PubSubSecurityParameters;
-
 typedef enum {
     UA_PUBSUB_RT_UNKNOWN = 0,
     UA_PUBSUB_RT_VARIANT = 1,
@@ -719,7 +711,6 @@ typedef struct {
     UA_DataSetMetaDataType dataSetMetaData;
     UA_DataSetFieldContentMask dataSetFieldContentMask;
     UA_Double messageReceiveTimeout;
-    UA_PubSubSecurityParameters securityParameters;
     UA_ExtensionObject messageSettings;
     UA_ExtensionObject transportSettings;
     UA_SubscribedDataSetEnumType subscribedDataSetType;
@@ -793,7 +784,6 @@ UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId s
 /* ReaderGroup configuration */
 typedef struct {
     UA_String name;
-    UA_PubSubSecurityParameters securityParameters;
     /* PubSub Manager Callback */
     UA_PubSub_CallbackLifecycle pubsubManagerCallback;
     /* non std. field */
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index fa01c99861f..04664e2b8b5 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -743,8 +743,6 @@ UA_DataSetReaderConfig_copy(const UA_DataSetReaderConfig *src,
     dst->dataSetFieldContentMask = src->dataSetFieldContentMask;
     dst->messageReceiveTimeout = src->messageReceiveTimeout;
 
-    /* Currently memcpy is used to copy the securityParameters */
-    memcpy(&dst->securityParameters, &src->securityParameters, sizeof(UA_PubSubSecurityParameters));
     retVal = UA_ExtensionObject_copy(&src->messageSettings, &dst->messageSettings);
     if(retVal != UA_STATUSCODE_GOOD)
         return retVal;

From bdd3d6213cab1661ea08a5bd94f4067a554134ee Mon Sep 17 00:00:00 2001
From: applea9 <9065075+applea9@users.noreply.github.com>
Date: Thu, 3 Nov 2022 19:29:41 +0800
Subject: [PATCH 0513/1963] fix(pubsub): Don't reinitialize DeltaFrameMessage
 (#5410)

---
 src/pubsub/ua_pubsub_writer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 7bb2f140654..8f35014afc6 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -1191,6 +1191,8 @@ UA_PubSubDataSetWriter_generateKeyFrameMessage(UA_Server *server,
     return UA_STATUSCODE_GOOD;
 }
 
+/* the input message is already initialized and that the method 
+ * must not be called twice for the same message */
 #ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
 static UA_StatusCode
 UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
@@ -1202,7 +1204,6 @@ UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
         return UA_STATUSCODE_BADNOTFOUND;
 
     /* Prepare DataSetMessageContent */
-    memset(dataSetMessage, 0, sizeof(UA_DataSetMessage));
     dataSetMessage->header.dataSetMessageValid = true;
     dataSetMessage->header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
     if(currentDataSet->fieldSize == 0)

From 0fb4efd61722790592a2e483c95b23170644b293 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 00:08:57 +0000
Subject: [PATCH 0514/1963] build(deps): bump deps/nodesetLoader from `ecd4cef`
 to `f2c03ca`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `ecd4cef` to `f2c03ca`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/ecd4cefd81f4f0b94d7f2252563b4302f032815b...f2c03cabbf1e38a4f7cb62526124d116661bcbc6)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index ecd4cefd81f..f2c03cabbf1 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit ecd4cefd81f4f0b94d7f2252563b4302f032815b
+Subproject commit f2c03cabbf1e38a4f7cb62526124d116661bcbc6

From 1c8af509fd5b2617cbd3257b6e14b49c8dd95c72 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Mon, 7 Nov 2022 07:32:28 +0100
Subject: [PATCH 0515/1963] fix(pubsub): reader not receiving msgs wo grouphdr

---
 src/pubsub/ua_pubsub_reader.c | 104 +++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 04664e2b8b5..6234ce4915b 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -335,66 +335,64 @@ UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode
-checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
-                      UA_DataSetReader *reader, UA_ReaderGroupConfig readerGroupConfig) {
-if(readerGroupConfig.encodingMimeType != UA_PUBSUB_ENCODING_JSON){
-    if(!msg->groupHeaderEnabled || !msg->groupHeader.writerGroupIdEnabled ||
-       !msg->payloadHeaderEnabled) {
-        UA_LOG_INFO_READER(&server->config.logger, reader,
-                           "Cannot process DataSetReader without WriterGroup"
-                           "and DataSetWriter identifiers");
-        return UA_STATUSCODE_BADNOTIMPLEMENTED;
-    }
-
+static UA_Boolean
+publisherIdIsMatching(UA_NetworkMessage *msg, UA_Variant publisherId) {
     switch(msg->publisherIdType) {
-    case UA_PUBLISHERIDTYPE_BYTE:
-        if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_BYTE] &&
-           msg->publisherId.byte == *(UA_Byte*)reader->config.publisherId.data)
-            break;
-        return UA_STATUSCODE_BADNOTFOUND;
-    case UA_PUBLISHERIDTYPE_UINT16:
-        if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT16] &&
-           msg->publisherId.uint16 == *(UA_UInt16*)reader->config.publisherId.data)
-            break;
-        return UA_STATUSCODE_BADNOTFOUND;
-    case UA_PUBLISHERIDTYPE_UINT32:
-        if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT32] &&
-           msg->publisherId.uint32 == *(UA_UInt32*)reader->config.publisherId.data)
-            break;
-        return UA_STATUSCODE_BADNOTFOUND;
-    case UA_PUBLISHERIDTYPE_UINT64:
-        if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT64] &&
-           msg->publisherId.uint64 == *(UA_UInt64*)reader->config.publisherId.data)
-            break;
-        return UA_STATUSCODE_BADNOTFOUND;
-    case UA_PUBLISHERIDTYPE_STRING:
-        if(reader->config.publisherId.type == &UA_TYPES[UA_TYPES_STRING] &&
-           UA_String_equal(&msg->publisherId.string, (UA_String*)reader->config.publisherId.data))
-            break;
-        return UA_STATUSCODE_BADNOTFOUND;
-    default:
-        return UA_STATUSCODE_BADNOTFOUND;
+        case UA_PUBLISHERIDTYPE_BYTE:
+            return (publisherId.type == &UA_TYPES[UA_TYPES_BYTE] &&
+               msg->publisherId.byte == *(UA_Byte*)publisherId.data);
+        case UA_PUBLISHERIDTYPE_UINT16:
+            return (publisherId.type == &UA_TYPES[UA_TYPES_UINT16] &&
+               msg->publisherId.uint16 == *(UA_UInt16*)publisherId.data);
+        case UA_PUBLISHERIDTYPE_UINT32:
+            return (publisherId.type == &UA_TYPES[UA_TYPES_UINT32] &&
+               msg->publisherId.uint32 == *(UA_UInt32*)publisherId.data);
+        case UA_PUBLISHERIDTYPE_UINT64:
+            return (publisherId.type == &UA_TYPES[UA_TYPES_UINT64] &&
+               msg->publisherId.uint64 == *(UA_UInt64*)publisherId.data);
+        case UA_PUBLISHERIDTYPE_STRING:
+            return (publisherId.type == &UA_TYPES[UA_TYPES_STRING] &&
+               UA_String_equal(&msg->publisherId.string, (UA_String*)publisherId.data));
+        default:
+            return false;
     }
+    return true;
+}
 
-    if(reader->config.writerGroupId == msg->groupHeader.writerGroupId &&
-       reader->config.dataSetWriterId == *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {
-        UA_LOG_DEBUG_READER(&server->config.logger, reader,
-                            "DataSetReader found, process NetworkMessage");
-        return UA_STATUSCODE_GOOD;
-    }
+static UA_StatusCode
+checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
+                      UA_DataSetReader *reader, UA_ReaderGroupConfig readerGroupConfig) {
 
-}else{
-    if(reader->config.publisherId.type != &UA_TYPES[UA_TYPES_UINT32] &&
-       msg->publisherId.uint32 != *(UA_UInt32*)reader->config.publisherId.data)
-        return UA_STATUSCODE_BADNOTFOUND;
 
-    if(reader->config.dataSetWriterId == *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "DataSetReader found. Process NetworkMessage");
+    if(readerGroupConfig.encodingMimeType != UA_PUBSUB_ENCODING_JSON){
+        if(!publisherIdIsMatching(msg, reader->config.publisherId)) {
+            return UA_STATUSCODE_BADNOTFOUND;
+        }
+        if(msg->groupHeaderEnabled && msg->groupHeader.writerGroupIdEnabled) {
+            if(reader->config.writerGroupId != msg->groupHeader.writerGroupId) {
+                UA_LOG_INFO_READER(&server->config.logger, reader,
+                                   "WriterGroupId doesn't match");
+                return UA_STATUSCODE_BADNOTFOUND;
+            }
+        }
+        if(msg->payloadHeaderEnabled) {
+            if(reader->config.dataSetWriterId != *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {
+                UA_LOG_INFO_READER(&server->config.logger, reader, "DataSetWriterId doesn't match");
+                return UA_STATUSCODE_BADNOTFOUND;
+            }
+        }
         return UA_STATUSCODE_GOOD;
+    }else{
+        if(reader->config.publisherId.type != &UA_TYPES[UA_TYPES_UINT32] &&
+           msg->publisherId.uint32 != *(UA_UInt32*)reader->config.publisherId.data)
+            return UA_STATUSCODE_BADNOTFOUND;
+
+        if(reader->config.dataSetWriterId == *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {
+            UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                         "DataSetReader found. Process NetworkMessage");
+            return UA_STATUSCODE_GOOD;
+        }
     }
-}
     return UA_STATUSCODE_BADNOTFOUND;
 }
 

From 8cf6098a0f6677831e9405547bdc67f06d0b4ad8 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Tue, 20 Sep 2022 19:49:30 +0200
Subject: [PATCH 0516/1963] fix(pubsub): Set a message receive timeout when
 pubsub monitoring is active. Separate function to generate the
 defaultpublisherId.

---
 src/pubsub/ua_pubsub_manager.c                | 28 ++++++++++---------
 .../schema/Opc.Ua.NodeSet2.PubSubMinimal.xml  | 18 +++++++++++-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index c0acd5d587d..6cb961801ec 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -183,7 +183,7 @@ UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId, UA_String transpo
         next_id = next_id_writer;
 
     for(;numberOfIds > 0;numberOfIds--) {
-#ifndef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING        
+#ifndef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING
         if(next_id < UA_RESERVEID_FIRST_ID)
             next_id = UA_RESERVEID_FIRST_ID;
 #else
@@ -719,21 +719,23 @@ UA_PubSubManager_generateUniqueGuid(UA_Server *server) {
     }
 }
 
+static UA_UInt64
+generateRandomUInt64(UA_Server *server) {
+    UA_UInt64 id = 0;
+    UA_Guid ident = UA_Guid_random();
+
+    id = id + ident.data1;
+    id = (id << 32) + ident.data2;
+    id = (id << 16) + ident.data3;
+    return id;
+}
+
 /* Initialization the PubSub configuration. */
 void
 UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager) {
-    /* ToDo: Must be correctly generated from Mac address and port. */
-    UA_Guid *ident = NULL;
-    ident = UA_Guid_new();
-    if(!ident) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub generate defaultPublisherId failed.");
-        return;
-    }
-    *ident = UA_Guid_random();
-    pubSubManager->defaultPublisherId = *(UA_UInt64*)ident;
-    LIST_INIT(&pubSubManager->reserveIds);
-    UA_free(ident);
+    //TODO: Using the Mac address to generate the defaultPublisherId.
+    // In the future, this can be retrieved from the eventloop.
+    pubSubManager->defaultPublisherId = generateRandomUInt64(server);
 }
 
 /* Delete the current PubSub configuration including all nested members. This
diff --git a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
index 8152d754580..66a0c87fa69 100644
--- a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
+++ b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
@@ -54,6 +54,7 @@
       <Reference ReferenceType="HasComponent">i=23622</Reference>
       <Reference ReferenceType="HasComponent">i=16598</Reference>
       <Reference ReferenceType="HasComponent">i=14432</Reference>
+      <Reference ReferenceType="HasProperty">i=25432</Reference> <!--DefaultDatagramPublisherId-->
       <Reference ReferenceType="HasSubtype" IsForward="false">i=15906</Reference>
     </References>
   </UAObjectType>
@@ -65,7 +66,14 @@
       <Reference ReferenceType="HasProperty" IsForward="false">i=14416</Reference>
     </References>
   </UAVariable>
-
+  <UAVariable NodeId="i=25432" BrowseName="DefaultDatagramPublisherId" ParentNodeId="i=14416" DataType="UInt64">
+    <DisplayName>DefaultDatagramPublisherId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=14416</Reference>
+    </References>
+  </UAVariable>
   <UAObjectType NodeId="i=14477" BrowseName="DataSetFolderType">
     <DisplayName>DataSetFolderType</DisplayName>
     <References>
@@ -2162,6 +2170,7 @@
       <Reference ReferenceType="HasComponent">i=17371</Reference>
       <Reference ReferenceType="HasComponent" IsForward="false">i=2253</Reference>
       <Reference ReferenceType="HasComponent">i=25451</Reference> <!-- PubSubConfiguration -->
+      <Reference ReferenceType="HasProperty">i=25480</Reference> <!-- DefaultDatagramPublisherId -->
       <Reference ReferenceType="HasTypeDefinition">i=14416</Reference>
     </References>
   </UAObject>
@@ -2415,6 +2424,13 @@
       <Reference ReferenceType="HasProperty" IsForward="false">i=14443</Reference>
     </References>
   </UAVariable>
+  <UAVariable NodeId="i=25480" BrowseName="DefaultDatagramPublisherId" ParentNodeId="i=14443" DataType="UInt64">
+    <DisplayName>DefaultDatagramPublisherId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=14443</Reference>
+    </References>
+  </UAVariable>
   <UAVariable NodeId="i=17292" BrowseName="TransportProfileUri" ParentNodeId="i=14417" DataType="String">
     <DisplayName>TransportProfileUri</DisplayName>
     <References>

From 4dfdc999a9942b5f857650c77a7069da0e266c25 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Mon, 7 Nov 2022 07:49:50 +0100
Subject: [PATCH 0517/1963] refactor(el): make sure eventloop starts correctly

- only start if its not started yet (external el)
- start in the configuration state (ready to be used)
---
 plugins/ua_config_default.c | 11 +++++++++++
 src/server/ua_server.c      | 15 ++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index c26091a6fb7..91fb525a00d 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -137,6 +137,9 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     /* EventLoop */
     if(conf->eventLoop == NULL) {
         conf->eventLoop = UA_EventLoop_new_POSIX(&conf->logger);
+        if(conf->eventLoop == NULL) {
+           return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
         conf->externalEventLoop = false;
 
         /* Add the TCP connection manager */
@@ -151,6 +154,14 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         if(udpCM)
             conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)udpCM);
     }
+    if(conf->eventLoop != NULL) {
+        if(conf->eventLoop->state != UA_EVENTLOOPSTATE_STARTED) {
+            UA_StatusCode statusCode = conf->eventLoop->start(conf->eventLoop);
+            if(statusCode != UA_STATUSCODE_GOOD) {
+                return statusCode;
+            }
+        }
+    }
 
     /* --> Start setting the default static config <-- */
 
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index b2df91e01d9..a02e5a69a07 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -631,6 +631,9 @@ UA_Server_createServerConnection(UA_Server *server, const UA_String *serverUrl)
 
 UA_StatusCode
 UA_Server_run_startup(UA_Server *server) {
+    if(server == NULL) {
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
     UA_ServerConfig *config = &server->config;
 
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
@@ -649,9 +652,15 @@ UA_Server_run_startup(UA_Server *server) {
                                       NULL, 1000.0, &server->houseKeepingCallbackId);
     }
 
-    /* Start the EventLoop */
-    UA_StatusCode retVal = config->eventLoop->start(config->eventLoop);
-    UA_CHECK_STATUS(retVal, return retVal);
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    /* Start the EventLoop if not already started */
+    UA_CHECK_MEM_ERROR(config->eventLoop, return UA_STATUSCODE_BADINTERNALERROR,
+                       &config->logger, UA_LOGCATEGORY_SERVER,
+                       "eventloop must be set");
+    if (config->eventLoop->state != UA_EVENTLOOPSTATE_STARTED) {
+        retVal = config->eventLoop->start(config->eventLoop);
+        UA_CHECK_STATUS(retVal, return retVal);
+    }
 
     /* Open server sockets */
     UA_Boolean haveServerSocket = false;

From f54f1961b2676d16d4e90ff80b91d302ddbf4bc2 Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Thu, 3 Nov 2022 09:11:27 +0100
Subject: [PATCH 0518/1963] feature(core): XML data encoding for numeric +
 string types (#5437)

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 CMakeLists.txt                  |   11 +
 include/open62541/types.h       |   59 +
 src/ua_types_encoding_xml.c     |  834 ++++++++++
 src/ua_types_encoding_xml.h     |   48 +
 tests/CMakeLists.txt            |    4 +
 tests/check_types_builtin_xml.c | 2678 +++++++++++++++++++++++++++++++
 6 files changed, 3634 insertions(+)
 create mode 100644 src/ua_types_encoding_xml.c
 create mode 100644 src/ua_types_encoding_xml.h
 create mode 100644 tests/check_types_builtin_xml.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d2702eac38..f363bfbeb0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,6 +175,7 @@ option(UA_ENABLE_DA "Enable OPC UA DataAccess (Part 8) definitions" ON)
 option(UA_ENABLE_HISTORIZING "Enable basic support for historical access (client and server)" OFF)
 option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" OFF)
 option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" ON)
+option(UA_ENABLE_XML_ENCODING "Enable XML encoding" OFF)
 option(UA_ENABLE_NODESETLOADER "Enable nodesetLoader public API" OFF)
 
 set(MULTITHREADING_DEFAULT 0)
@@ -1200,6 +1201,16 @@ if(UA_ENABLE_JSON_ENCODING)
                             ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.c)
 endif()
 
+if(UA_ENABLE_XML_ENCODING)
+    add_definitions(-DUA_ENABLE_XML_ENCODING)
+    if(NOT UA_ENABLE_JSON_ENCODING)
+        list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/parse_num.h)
+        list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/parse_num.c)
+    endif()
+    list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_xml.h)
+    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_xml.c)
+endif()
+
 if(UA_ENABLE_SUBSCRIPTIONS)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_subscription.c
                             ${PROJECT_SOURCE_DIR}/src/server/ua_subscription_monitoreditem.c
diff --git a/include/open62541/types.h b/include/open62541/types.h
index 472a7d8e782..3167890be5f 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1324,6 +1324,65 @@ UA_decodeJson(const UA_ByteString *src, void *dst, const UA_DataType *type,
 
 #endif /* UA_ENABLE_JSON_ENCODING */
 
+/**
+ * XML En/Decoding
+ * ----------------
+ *
+ * The XML decoding can parse the official encoding from the OPC UA
+ * specification.
+ *
+ * These extensions are not intended to be used for the OPC UA protocol on the
+ * network. They were rather added to allow more convenient configuration file
+ * formats that also include data in the OPC UA type system.
+ */
+
+#ifdef UA_ENABLE_XML_ENCODING
+
+typedef struct {
+    UA_Boolean prettyPrint;   /* Add newlines and spaces for legibility */
+} UA_EncodeXmlOptions;
+
+/* Returns the number of bytes the value src takes in xml encoding. Returns
+ * zero if an error occurs. */
+UA_EXPORT size_t
+UA_calcSizeXml(const void *src, const UA_DataType *type,
+               const UA_EncodeXmlOptions *options);
+
+/* Encodes the scalar value described by type to xml encoding.
+ *
+ * @param src The value. Must not be NULL.
+ * @param type The value type. Must not be NULL.
+ * @param outBuf Pointer to ByteString containing the result if the encoding
+ *        was successful
+ * @return Returns a statuscode whether encoding succeeded. */
+UA_StatusCode UA_EXPORT
+UA_encodeXml(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
+             const UA_EncodeXmlOptions *options);
+
+/* The structure with the decoding options may be extended in the future.
+ * Zero-out the entire structure initially to ensure code-compatibility when
+ * more fields are added in a later release. */
+typedef struct {
+    const UA_DataTypeArray *customTypes; /* Begin of a linked list with custom
+                                          * datatype definitions */
+} UA_DecodeXmlOptions;
+
+/* Decodes a scalar value described by type from xml encoding.
+ *
+ * @param src The buffer with the xml encoded value. Must not be NULL.
+ * @param dst The target value. Must not be NULL. The target is assumed to have
+ *        size type->memSize. The value is reset to zero before decoding. If
+ *        decoding fails, members are deleted and the value is reset (zeroed)
+ *        again.
+ * @param type The value type. Must not be NULL.
+ * @param options The options struct for decoding, currently unused
+ * @return Returns a statuscode whether decoding succeeded. */
+UA_StatusCode UA_EXPORT
+UA_decodeXml(const UA_ByteString *src, void *dst, const UA_DataType *type,
+             const UA_DecodeXmlOptions *options);
+
+#endif /* UA_ENABLE_XML_ENCODING */
+
 /**
  * .. _array-handling:
  *
diff --git a/src/ua_types_encoding_xml.c b/src/ua_types_encoding_xml.c
new file mode 100644
index 00000000000..e9940ae0f18
--- /dev/null
+++ b/src/ua_types_encoding_xml.c
@@ -0,0 +1,834 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/config.h>
+#include <open62541/types_generated.h>
+#include <open62541/types_generated_handling.h>
+
+#include "ua_types_encoding_xml.h"
+
+#include "../deps/itoa.h"
+#include "../deps/parse_num.h"
+#include "../deps/libc_time.h"
+
+#ifndef UA_ENABLE_PARSING
+#error UA_ENABLE_PARSING required for XML encoding
+#endif
+
+#ifndef UA_ENABLE_TYPEDESCRIPTION
+#error UA_ENABLE_TYPEDESCRIPTION required for XML encoding
+#endif
+
+/* vs2008 does not have INFINITY and NAN defined */
+#ifndef INFINITY
+# define INFINITY ((UA_Double)(DBL_MAX+DBL_MAX))
+#endif
+#ifndef NAN
+# define NAN ((UA_Double)(INFINITY-INFINITY))
+#endif
+
+/* Have some slack at the end. E.g. for negative and very long years. */
+#define UA_XML_DATETIME_LENGTH 40
+
+/************/
+/* Encoding */
+/************/
+
+#define ENCODE_XML(TYPE) static status \
+    TYPE##_encodeXml(CtxXml *ctx, const UA_##TYPE *src, const UA_DataType *type)
+
+static status UA_FUNC_ATTR_WARN_UNUSED_RESULT
+writeChars(CtxXml *ctx, const char *c, size_t len) {
+    if(ctx->pos + len > ctx->end)
+        return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
+    if(!ctx->calcOnly)
+        memcpy(ctx->pos, c, len);
+    ctx->pos += len;
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Boolean */
+ENCODE_XML(Boolean) {
+    if(*src == true)
+        return writeChars(ctx, "true", 4);
+    return writeChars(ctx, "false", 5);
+}
+
+static status encodeSigned(CtxXml *ctx, UA_Int64 value, char* buffer) {
+    UA_UInt16 digits = itoaSigned(value, buffer);
+    return writeChars(ctx, buffer, digits);
+}
+
+static status encodeUnsigned(CtxXml *ctx, UA_UInt64 value, char* buffer) {
+    UA_UInt16 digits = itoaUnsigned(value, buffer, 10);
+    return writeChars(ctx, buffer, digits);
+}
+
+/* signed Byte */
+ENCODE_XML(SByte) {
+    char buf[5];
+    return encodeSigned(ctx, *src, buf);
+}
+
+/* Byte */
+ENCODE_XML(Byte) {
+    char buf[4];
+    return encodeUnsigned(ctx, *src, buf);
+}
+
+/* Int16 */
+ENCODE_XML(Int16) {
+    char buf[7];
+    return encodeSigned(ctx, *src, buf);
+}
+
+/* UInt16 */
+ENCODE_XML(UInt16) {
+    char buf[6];
+    return encodeUnsigned(ctx, *src, buf);
+}
+
+/* Int32 */
+ENCODE_XML(Int32) {
+    char buf[12];
+    return encodeSigned(ctx, *src, buf);
+}
+
+/* UInt32 */
+ENCODE_XML(UInt32) {
+    char buf[11];
+    return encodeUnsigned(ctx, *src, buf);
+}
+
+/* Int64 */
+ENCODE_XML(Int64) {
+    char buf[23];
+    return encodeSigned(ctx, *src, buf);
+}
+
+/* UInt64 */
+ENCODE_XML(UInt64) {
+    char buf[23];
+    return encodeUnsigned(ctx, *src, buf);
+}
+
+/* Float */
+ENCODE_XML(Float) {
+    char buffer[200];
+    if(*src != *src) {
+        strcpy(buffer, "NaN");
+    } else if(*src == INFINITY) {
+        strcpy(buffer, "INF");
+    } else if(*src == -INFINITY) {
+        strcpy(buffer, "-INF");
+    } else {
+        /* https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
+         * Maximum digit counts for float: 149
+         */
+        UA_snprintf(buffer, 200, "%.149g", (UA_Double)*src);
+    }
+
+    size_t len = strlen(buffer);
+    if(len == 0)
+        return UA_STATUSCODE_BADENCODINGERROR;
+
+    return writeChars(ctx, buffer, len);
+}
+
+/* Double */
+ENCODE_XML(Double) {
+    char buffer[2000];
+    if(*src != *src) {
+        strcpy(buffer, "NaN");
+    } else if(*src == INFINITY) {
+        strcpy(buffer, "INF");
+    } else if(*src == -INFINITY) {
+        strcpy(buffer, "-INF");
+    } else {
+        /* https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
+         * Maximum digit counts for double: 1074
+         */
+        UA_snprintf(buffer, 2000, "%.1074g", *src);
+    }
+
+    size_t len = strlen(buffer);
+    if(len == 0)
+        return UA_STATUSCODE_BADENCODINGERROR;
+
+    return writeChars(ctx, buffer, len);
+}
+
+/* String */
+ENCODE_XML(String) {
+    if(!src->data)
+        return writeChars(ctx, "null", 4);
+    return writeChars(ctx, (const char*)src->data, src->length);
+}
+
+/* Guid */
+ENCODE_XML(Guid) {
+    if(ctx->pos + 36 > ctx->end)
+        return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
+    if(!ctx->calcOnly)
+        UA_Guid_to_hex(src, ctx->pos, false);
+    ctx->pos += 36;
+    return UA_STATUSCODE_GOOD;
+}
+
+/* DateTime */
+static u8
+printNumber(i32 n, char *pos, u8 min_digits) {
+    char digits[10];
+    u8 len = 0;
+    /* Handle negative values */
+    if(n < 0) {
+        pos[len++] = '-';
+        n = -n;
+    }
+
+    /* Extract the digits */
+    u8 i = 0;
+    for(; i < min_digits || n > 0; i++) {
+        digits[i] = (char)((n % 10) + '0');
+        n /= 10;
+    }
+
+    /* Print in reverse order and return */
+    for(; i > 0; i--)
+        pos[len++] = digits[i-1];
+    return len;
+}
+
+ENCODE_XML(DateTime) {
+    UA_DateTimeStruct tSt = UA_DateTime_toStruct(*src);
+
+    /* Format: -yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS'Z' is used. max 31 bytes.
+     * Note the optional minus for negative years. */
+    char buffer[UA_XML_DATETIME_LENGTH];
+    char *pos = buffer;
+    pos += printNumber(tSt.year, pos, 4);
+    *(pos++) = '-';
+    pos += printNumber(tSt.month, pos, 2);
+    *(pos++) = '-';
+    pos += printNumber(tSt.day, pos, 2);
+    *(pos++) = 'T';
+    pos += printNumber(tSt.hour, pos, 2);
+    *(pos++) = ':';
+    pos += printNumber(tSt.min, pos, 2);
+    *(pos++) = ':';
+    pos += printNumber(tSt.sec, pos, 2);
+    *(pos++) = '.';
+    pos += printNumber(tSt.milliSec, pos, 3);
+    pos += printNumber(tSt.microSec, pos, 3);
+    pos += printNumber(tSt.nanoSec, pos, 3);
+
+    UA_assert(pos <= &buffer[UA_XML_DATETIME_LENGTH]);
+
+    /* Remove trailing zeros */
+    pos--;
+    while(*pos == '0')
+        pos--;
+    if(*pos == '.')
+        pos--;
+
+    *(++pos) = 'Z';
+    UA_String str = {((uintptr_t)pos - (uintptr_t)buffer)+1, (UA_Byte*)buffer};
+
+    return writeChars(ctx, (const char*)str.data, str.length);
+}
+
+/* NodeId */
+ENCODE_XML(NodeId) {
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    UA_String out = UA_STRING_NULL;
+
+    ret |= UA_NodeId_print(src, &out);
+    ret |= encodeXmlJumpTable[UA_DATATYPEKIND_STRING](ctx, &out, NULL);
+
+    UA_String_clear(&out);
+    return ret;
+}
+
+/* ExpandedNodeId */
+ENCODE_XML(ExpandedNodeId) {
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    UA_String out = UA_STRING_NULL;
+
+    ret |= UA_ExpandedNodeId_print(src, &out);
+    ret |= encodeXmlJumpTable[UA_DATATYPEKIND_STRING](ctx, &out, NULL);
+
+    UA_String_clear(&out);
+    return ret;
+}
+
+static status
+encodeXmlNotImplemented(CtxXml *ctx, const void *src, const UA_DataType *type) {
+    (void)ctx, (void)src, (void)type;
+    return UA_STATUSCODE_BADNOTIMPLEMENTED;
+}
+
+const encodeXmlSignature encodeXmlJumpTable[UA_DATATYPEKINDS] = {
+    (encodeXmlSignature)Boolean_encodeXml,          /* Boolean */
+    (encodeXmlSignature)SByte_encodeXml,            /* SByte */
+    (encodeXmlSignature)Byte_encodeXml,             /* Byte */
+    (encodeXmlSignature)Int16_encodeXml,            /* Int16 */
+    (encodeXmlSignature)UInt16_encodeXml,           /* UInt16 */
+    (encodeXmlSignature)Int32_encodeXml,            /* Int32 */
+    (encodeXmlSignature)UInt32_encodeXml,           /* UInt32 */
+    (encodeXmlSignature)Int64_encodeXml,            /* Int64 */
+    (encodeXmlSignature)UInt64_encodeXml,           /* UInt64 */
+    (encodeXmlSignature)Float_encodeXml,            /* Float */
+    (encodeXmlSignature)Double_encodeXml,           /* Double */
+    (encodeXmlSignature)String_encodeXml,           /* String */
+    (encodeXmlSignature)DateTime_encodeXml,         /* DateTime */
+    (encodeXmlSignature)Guid_encodeXml,             /* Guid */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* ByteString */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* XmlElement */
+    (encodeXmlSignature)NodeId_encodeXml,           /* NodeId */
+    (encodeXmlSignature)ExpandedNodeId_encodeXml,   /* ExpandedNodeId */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* StatusCode */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* QualifiedName */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* LocalizedText */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* ExtensionObject */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* DataValue */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* Variant */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* DiagnosticInfo */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* Decimal */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* Enum */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* Structure */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* Structure with optional fields */
+    (encodeXmlSignature)encodeXmlNotImplemented,    /* Union */
+    (encodeXmlSignature)encodeXmlNotImplemented     /* BitfieldCluster */
+};
+
+UA_StatusCode
+UA_encodeXml(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
+             const UA_EncodeXmlOptions *options) {
+    if(!src || !type)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Allocate buffer */
+    UA_Boolean allocated = false;
+    status res = UA_STATUSCODE_GOOD;
+    if(outBuf->length == 0) {
+        size_t len = UA_calcSizeXml(src, type, options);
+        res = UA_ByteString_allocBuffer(outBuf, len);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+        allocated = true;
+    }
+
+    /* Set up the context */
+    CtxXml ctx;
+    memset(&ctx, 0, sizeof(ctx));
+    ctx.pos = outBuf->data;
+    ctx.end = &outBuf->data[outBuf->length];
+    ctx.depth = 0;
+    ctx.calcOnly = false;
+    if(options)
+        ctx.prettyPrint = options->prettyPrint;
+
+    /* Encode */
+    res = encodeXmlJumpTable[type->typeKind](&ctx, src, type);
+
+    /* Clean up */
+    if(res == UA_STATUSCODE_GOOD)
+        outBuf->length = (size_t)((uintptr_t)ctx.pos - (uintptr_t)outBuf->data);
+    else if(allocated)
+        UA_ByteString_clear(outBuf);
+    return res;
+}
+
+/************/
+/* CalcSize */
+/************/
+
+size_t
+UA_calcSizeXml(const void *src, const UA_DataType *type,
+               const UA_EncodeXmlOptions *options) {
+    if(!src || !type)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Set up the context */
+    CtxXml ctx;
+    memset(&ctx, 0, sizeof(ctx));
+    ctx.pos = NULL;
+    ctx.end = (const UA_Byte*)(uintptr_t)SIZE_MAX;
+    ctx.depth = 0;
+    if(options) {
+        ctx.prettyPrint = options->prettyPrint;
+    }
+
+    ctx.calcOnly = true;
+
+    /* Encode */
+    status ret = encodeXmlJumpTable[type->typeKind](&ctx, src, type);
+    if(ret != UA_STATUSCODE_GOOD)
+        return 0;
+    return (size_t)ctx.pos;
+}
+
+/**********/
+/* Decode */
+/**********/
+
+#define CHECK_TOKEN_BOUNDS do {                   \
+    if(ctx->index >= ctx->tokensSize)             \
+        return UA_STATUSCODE_BADDECODINGERROR;    \
+    } while(0)
+
+/* Forward declarations*/
+#define DECODE_XML(TYPE) static status                   \
+    TYPE##_decodeXml(ParseCtxXml *ctx, UA_##TYPE *dst,  \
+                      const UA_DataType *type)
+
+DECODE_XML(Boolean) {
+    if(ctx->length == 4 &&
+       ctx->data[0] == 't' && ctx->data[1] == 'r' &&
+       ctx->data[2] == 'u' && ctx->data[3] == 'e') {
+        *dst = true;
+    } else if(ctx->length == 5 &&
+              ctx->data[0] == 'f' && ctx->data[1] == 'a' &&
+              ctx->data[2] == 'l' && ctx->data[3] == 's' &&
+              ctx->data[4] == 'e') {
+        *dst = false;
+    } else {
+        return UA_STATUSCODE_BADDECODINGERROR;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+parseSignedInteger(const char *data, size_t dataSize, UA_Int64 *dst) {
+    size_t len = parseInt64(data, dataSize, dst);
+    if(len == 0)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    /* There must only be whitespace between the end of the parsed number and
+     * the end of the XML section */
+    for(size_t i = len; i < dataSize; i++) {
+        if(data[i] != ' ' && data[i] - '\t' >= 5)
+            return UA_STATUSCODE_BADDECODINGERROR;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+parseUnsignedInteger(const char *data, size_t dataSize, UA_UInt64 *dst) {
+    size_t len = parseUInt64(data, dataSize, dst);
+    if(len == 0)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    /* There must only be whitespace between the end of the parsed number and
+     * the end of the XML section */
+    for(size_t i = len; i < dataSize; i++) {
+        if(data[i] != ' ' && data[i] - '\t' >= 5)
+            return UA_STATUSCODE_BADDECODINGERROR;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(SByte) {
+    /* TODO:
+     *   1. Add support for optional "+" sign.
+     *   2. Add support for optional leading zeros.
+     *   3. Check if the value is in hex, octal or binray. */
+    UA_Int64 out = 0;
+    UA_StatusCode s = parseSignedInteger(ctx->data, ctx->length, &out);
+
+    if(s != UA_STATUSCODE_GOOD || out < UA_SBYTE_MIN || out > UA_SBYTE_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = (UA_SByte)out;
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(Byte) {
+    /* TODO:
+     *   1. Add support for optional "+" sign.
+     *   2. Add support for optional leading zeros.
+     *   3. Check if the value is in hex, octal or binray.
+     *   4. Check if decimal point exists. */
+    UA_UInt64 out = 0;
+    UA_StatusCode s = parseUnsignedInteger(ctx->data, ctx->length, &out);
+
+    if(s != UA_STATUSCODE_GOOD || out > UA_BYTE_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = (UA_Byte)out;
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(Int16) {
+    /* TODO:
+     *   1. Add support for optional "+" sign.
+     *   2. Add support for optional leading zeros.
+     *   3. Check if the value is in hex, octal or binray.
+     *   4. Check if decimal point exists. */
+    UA_Int64 out = 0;
+    UA_StatusCode s = parseSignedInteger(ctx->data, ctx->length, &out);
+
+    if(s != UA_STATUSCODE_GOOD || out < UA_INT16_MIN || out > UA_INT16_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = (UA_Int16)out;
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(UInt16) {
+    /* TODO:
+     *   1. Add support for optional "+" sign.
+     *   2. Add support for optional leading zeros.
+     *   3. Check if the value is in hex, octal or binray.
+     *   4. Check if decimal point exists. */
+    UA_UInt64 out = 0;
+    UA_StatusCode s = parseUnsignedInteger(ctx->data, ctx->length, &out);
+
+    if(s != UA_STATUSCODE_GOOD || out > UA_UINT16_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = (UA_UInt16)out;
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(Int32) {
+    /* TODO:
+     *   1. Add support for optional "+" sign.
+     *   2. Add support for optional leading zeros.
+     *   3. Check if the value is in hex, octal or binray.
+     *   4. Check if decimal point exists.
+     *   5. Check "-0" and "+0", and just remove the sign. */
+    UA_Int64 out = 0;
+    UA_StatusCode s = parseSignedInteger(ctx->data, ctx->length, &out);
+
+    if(s != UA_STATUSCODE_GOOD || out < UA_INT32_MIN || out > UA_INT32_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = (UA_Int32)out;
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(UInt32) {
+    /* TODO:
+     *   1. Add support for optional "+" sign.
+     *   2. Add support for optional leading zeros.
+     *   3. Check if the value is in hex, octal or binray.
+     *   4. Check if decimal point exists. */
+    UA_UInt64 out = 0;
+    UA_StatusCode s = parseUnsignedInteger(ctx->data, ctx->length, &out);
+
+    if(s != UA_STATUSCODE_GOOD || out > UA_UINT32_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = (UA_UInt32)out;
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(Int64) {
+    /* TODO:
+     *   1. Add support for optional "+" sign.
+     *   2. Add support for optional leading zeros.
+     *   3. Check if the value is in hex, octal or binray.
+     *   4. Check if decimal point exists. */
+    UA_Int64 out = 0;
+    UA_StatusCode s = parseSignedInteger(ctx->data, ctx->length, &out);
+
+    if(s != UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = (UA_Int64)out;
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(UInt64) {
+    /* TODO:
+     *   1. Add support for optional "+" sign.
+     *   2. Add support for optional leading zeros.
+     *   3. Check if the value is in hex, octal or binray.
+     *   4. Check if decimal point exists. */
+    UA_UInt64 out = 0;
+    UA_StatusCode s = parseUnsignedInteger(ctx->data, ctx->length, &out);
+
+    if(s != UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = (UA_UInt64)out;
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(Double) {
+
+    /* https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
+     * Maximum digit counts for select IEEE floating-point formats: 1074
+     * Sanity check.
+     */
+    if(ctx->length > 1075)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    if(ctx->length == 3 && memcmp(ctx->data, "INF", 3) == 0) {
+        *dst = INFINITY;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    if(ctx->length == 4 && memcmp(ctx->data, "-INF", 4) == 0) {
+        *dst = -INFINITY;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    if(ctx->length == 3 && memcmp(ctx->data, "NaN", 3) == 0) {
+        *dst = NAN;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    size_t len = parseDouble(ctx->data, ctx->length, dst);
+    if(len == 0)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    /* There must only be whitespace between the end of the parsed number and
+     * the end of the token */
+    for(size_t i = len; i < ctx->length; i++) {
+        if(ctx->data[i] != ' ' && ctx->data[i] -'\t' >= 5)
+            return UA_STATUSCODE_BADDECODINGERROR;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(Float) {
+    UA_Double v = 0.0;
+    UA_StatusCode res = Double_decodeXml(ctx, &v, NULL);
+    *dst = (UA_Float)v;
+    return res;
+}
+
+DECODE_XML(String) {
+    /* Empty string? */
+    if(ctx->length == 0) {
+        dst->data = (UA_Byte*)UA_EMPTY_ARRAY_SENTINEL;
+        dst->length = 0;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Set the output */
+    dst->length = ctx->length;
+    if(dst->length > 0) {
+        dst->data = (UA_Byte*)(uintptr_t)ctx->data;
+    } else {
+        dst->data = (UA_Byte*)UA_EMPTY_ARRAY_SENTINEL;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(DateTime) {
+    /* The last character has to be 'Z'. We can omit some length checks later on
+     * because we know the atoi functions stop before the 'Z'. */
+    if(ctx->length == 0 || ctx->data[ctx->length - 1] != 'Z')
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    struct mytm dts;
+    memset(&dts, 0, sizeof(dts));
+
+    size_t pos = 0;
+    size_t len;
+
+    /* Parse the year. The ISO standard asks for four digits. But we accept up
+     * to five with an optional plus or minus in front due to the range of the
+     * DateTime 64bit integer. But in that case we require the year and the
+     * month to be separated by a '-'. Otherwise we cannot know where the month
+     * starts. */
+    if(ctx->data[0] == '-' || ctx->data[0] == '+')
+        pos++;
+    UA_Int64 year = 0;
+    len = parseInt64(&ctx->data[pos], 5, &year);
+    pos += len;
+    if(len != 4 && ctx->data[pos] != '-')
+        return UA_STATUSCODE_BADDECODINGERROR;
+    if(ctx->data[0] == '-')
+        year = -year;
+    dts.tm_year = (UA_Int16)year - 1900;
+    if(ctx->data[pos] == '-')
+        pos++;
+
+    /* Parse the month */
+    UA_UInt64 month = 0;
+    len = parseUInt64(&ctx->data[pos], 2, &month);
+    pos += len;
+    UA_CHECK(len == 2, return UA_STATUSCODE_BADDECODINGERROR);
+    dts.tm_mon = (UA_UInt16)month - 1;
+    if(ctx->data[pos] == '-')
+        pos++;
+
+    /* Parse the day and check the T between date and time */
+    UA_UInt64 day = 0;
+    len = parseUInt64(&ctx->data[pos], 2, &day);
+    pos += len;
+    UA_CHECK(len == 2 || ctx->data[pos] != 'T',
+             return UA_STATUSCODE_BADDECODINGERROR);
+    dts.tm_mday = (UA_UInt16)day;
+    pos++;
+
+    /* Parse the hour */
+    UA_UInt64 hour = 0;
+    len = parseUInt64(&ctx->data[pos], 2, &hour);
+    pos += len;
+    UA_CHECK(len == 2, return UA_STATUSCODE_BADDECODINGERROR);
+    dts.tm_hour = (UA_UInt16)hour;
+    if(ctx->data[pos] == ':')
+        pos++;
+
+    /* Parse the minute */
+    UA_UInt64 min = 0;
+    len = parseUInt64(&ctx->data[pos], 2, &min);
+    pos += len;
+    UA_CHECK(len == 2, return UA_STATUSCODE_BADDECODINGERROR);
+    dts.tm_min = (UA_UInt16)min;
+    if(ctx->data[pos] == ':')
+        pos++;
+
+    /* Parse the second */
+    UA_UInt64 sec = 0;
+    len = parseUInt64(&ctx->data[pos], 2, &sec);
+    pos += len;
+    UA_CHECK(len == 2, return UA_STATUSCODE_BADDECODINGERROR);
+    dts.tm_sec = (UA_UInt16)sec;
+
+    /* Compute the seconds since the Unix epoch */
+    long long sinceunix = __tm_to_secs(&dts);
+
+    /* Are we within the range that can be represented? */
+    long long sinceunix_min =
+        (long long)(UA_INT64_MIN / UA_DATETIME_SEC) -
+        (long long)(UA_DATETIME_UNIX_EPOCH / UA_DATETIME_SEC) -
+        (long long)1; /* manual correction due to rounding */
+    long long sinceunix_max = (long long)
+        ((UA_INT64_MAX - UA_DATETIME_UNIX_EPOCH) / UA_DATETIME_SEC);
+    if(sinceunix < sinceunix_min || sinceunix > sinceunix_max)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    /* Convert to DateTime. Add or subtract one extra second here to prevent
+     * underflow/overflow. This is reverted once the fractional part has been
+     * added. */
+    sinceunix -= (sinceunix > 0) ? 1 : -1;
+    UA_DateTime dt = (UA_DateTime)
+        (sinceunix + (UA_DATETIME_UNIX_EPOCH / UA_DATETIME_SEC)) * UA_DATETIME_SEC;
+
+    /* Parse the fraction of the second if defined */
+    if(ctx->data[pos] == ',' || ctx->data[pos] == '.') {
+        pos++;
+        double frac = 0.0;
+        double denom = 0.1;
+        while(pos < ctx->length && ctx->data[pos] >= '0' && ctx->data[pos] <= '9') {
+            frac += denom * (ctx->data[pos] - '0');
+            denom *= 0.1;
+            pos++;
+        }
+        frac += 0.00000005; /* Correct rounding when converting to integer */
+        dt += (UA_DateTime)(frac * UA_DATETIME_SEC);
+    }
+
+    /* Remove the underflow/overflow protection (see above) */
+    if(sinceunix > 0) {
+        if(dt > UA_INT64_MAX - UA_DATETIME_SEC)
+            return UA_STATUSCODE_BADDECODINGERROR;
+        dt += UA_DATETIME_SEC;
+    } else {
+        if(dt < UA_INT64_MIN + UA_DATETIME_SEC)
+            return UA_STATUSCODE_BADDECODINGERROR;
+        dt -= UA_DATETIME_SEC;
+    }
+
+    /* We must be at the end of the string (ending with 'Z' as checked above) */
+    if(pos != ctx->length - 1)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
+    *dst = dt;
+
+    return UA_STATUSCODE_GOOD;
+}
+
+DECODE_XML(Guid) {
+    UA_String str = {ctx->length, (UA_Byte*)(uintptr_t)ctx->data};
+    return UA_Guid_parse(dst, str);
+}
+
+DECODE_XML(NodeId) {
+    UA_String str = {ctx->length, (UA_Byte*)(uintptr_t)ctx->data};
+    return UA_NodeId_parse(dst, str);
+}
+
+DECODE_XML(ExpandedNodeId) {
+    UA_String str = {ctx->length, (UA_Byte*)(uintptr_t)ctx->data};
+    return UA_ExpandedNodeId_parse(dst, str);
+}
+
+static status
+decodeXmlNotImplemented(ParseCtxXml *ctx, void *dst, const UA_DataType *type) {
+    (void)dst, (void)type, (void)ctx;
+    return UA_STATUSCODE_BADNOTIMPLEMENTED;
+}
+
+const decodeXmlSignature decodeXmlJumpTable[UA_DATATYPEKINDS] = {
+    (decodeXmlSignature)Boolean_decodeXml,          /* Boolean */
+    (decodeXmlSignature)SByte_decodeXml,            /* SByte */
+    (decodeXmlSignature)Byte_decodeXml,             /* Byte */
+    (decodeXmlSignature)Int16_decodeXml,            /* Int16 */
+    (decodeXmlSignature)UInt16_decodeXml,           /* UInt16 */
+    (decodeXmlSignature)Int32_decodeXml,            /* Int32 */
+    (decodeXmlSignature)UInt32_decodeXml,           /* UInt32 */
+    (decodeXmlSignature)Int64_decodeXml,            /* Int64 */
+    (decodeXmlSignature)UInt64_decodeXml,           /* UInt64 */
+    (decodeXmlSignature)Float_decodeXml,            /* Float */
+    (decodeXmlSignature)Double_decodeXml,           /* Double */
+    (decodeXmlSignature)String_decodeXml,           /* String */
+    (decodeXmlSignature)DateTime_decodeXml,         /* DateTime */
+    (decodeXmlSignature)Guid_decodeXml,             /* Guid */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* ByteString */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* XmlElement */
+    (decodeXmlSignature)NodeId_decodeXml,           /* NodeId */
+    (decodeXmlSignature)ExpandedNodeId_decodeXml,   /* ExpandedNodeId */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* StatusCode */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* QualifiedName */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* LocalizedText */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* ExtensionObject */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* DataValue */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* Variant */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* DiagnosticInfo */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* Decimal */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* Enum */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* Structure */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* Structure with optional fields */
+    (decodeXmlSignature)decodeXmlNotImplemented,    /* Union */
+    (decodeXmlSignature)decodeXmlNotImplemented     /* BitfieldCluster */
+};
+
+UA_StatusCode
+UA_decodeXml(const UA_ByteString *src, void *dst, const UA_DataType *type,
+              const UA_DecodeXmlOptions *options) {
+    if(!dst || !src || !type)
+        return UA_STATUSCODE_BADARGUMENTSMISSING;
+
+    /* Set up the context */
+    ParseCtxXml ctx;
+    memset(&ctx, 0, sizeof(ParseCtxXml));
+    ctx.data = (const char*)src->data;
+    ctx.length = src->length;
+    ctx.depth = 0;
+    if(options) {
+        ctx.customTypes = options->customTypes;
+    }
+
+    /* Decode */
+    memset(dst, 0, type->memSize); /* Initialize the value */
+    status ret = decodeXmlJumpTable[type->typeKind](&ctx, dst, type);
+
+    if(ret != UA_STATUSCODE_GOOD) {
+        UA_clear(dst, type);
+        memset(dst, 0, type->memSize);
+    }
+    return ret;
+}
\ No newline at end of file
diff --git a/src/ua_types_encoding_xml.h b/src/ua_types_encoding_xml.h
new file mode 100644
index 00000000000..51742e02c91
--- /dev/null
+++ b/src/ua_types_encoding_xml.h
@@ -0,0 +1,48 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef UA_TYPES_ENCODING_XML_H_
+#define UA_TYPES_ENCODING_XML_H_
+
+#include <open62541/types.h>
+
+#include "ua_util_internal.h"
+
+_UA_BEGIN_DECLS
+
+#define UA_XML_ENCODING_MAX_RECURSION 100
+
+typedef struct {
+    uint8_t *pos;
+    const uint8_t *end;
+
+    uint16_t depth; /* How often did we encoding recurse? */
+    UA_Boolean calcOnly; /* Only compute the length of the decoding */
+    UA_Boolean prettyPrint;
+
+    const UA_DataTypeArray *customTypes;
+} CtxXml;
+
+typedef struct {
+    const char* data;
+    size_t length;
+
+    uint16_t depth; /* How often did we decoding recurse? */
+
+    const UA_DataTypeArray *customTypes;
+} ParseCtxXml;
+
+typedef UA_StatusCode
+(*encodeXmlSignature)(CtxXml *ctx, const void *src, const UA_DataType *type);
+
+typedef UA_StatusCode
+(*decodeXmlSignature)(ParseCtxXml *ctx, void *dst, const UA_DataType *type);
+
+/* Expose the jump tables and some methods */
+extern const encodeXmlSignature encodeXmlJumpTable[UA_DATATYPEKINDS];
+extern const decodeXmlSignature decodeXmlJumpTable[UA_DATATYPEKINDS];
+
+_UA_END_DECLS
+
+#endif /* UA_TYPES_ENCODING_XML_H_ */
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 65f940a937f..2f6b67c9257 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -229,6 +229,10 @@ if(UA_ENABLE_JSON_ENCODING)
     endif()
 endif()
 
+if(UA_ENABLE_XML_ENCODING)
+    ua_add_test(check_types_builtin_xml.c)
+endif()
+
 ua_add_test(check_types_memory.c)
 ua_add_test(check_types_range.c)
 
diff --git a/tests/check_types_builtin_xml.c b/tests/check_types_builtin_xml.c
new file mode 100644
index 00000000000..9fd97dfb761
--- /dev/null
+++ b/tests/check_types_builtin_xml.c
@@ -0,0 +1,2678 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/types.h>
+#include <open62541/types_generated.h>
+#include <open62541/types_generated_handling.h>
+#include <open62541/util.h>
+
+#include "ua_types_encoding_xml.h"
+
+#include <check.h>
+
+#if defined(_MSC_VER)
+# pragma warning(disable: 4146)
+#endif
+
+/* Boolean */
+START_TEST(UA_Boolean_true_xml_encode) {
+    UA_Boolean *src = UA_Boolean_new();
+    UA_Boolean_init(src);
+    *src = true;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+    ck_assert_uint_eq(size, 4);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "true";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Boolean_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Boolean_false_xml_encode) {
+    UA_Boolean *src = UA_Boolean_new();
+    UA_Boolean_init(src);
+    *src = false;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_BOOLEAN];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+    ck_assert_uint_eq(size, 5);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "false";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Boolean_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Boolean_true_bufferTooSmall_xml_encode) {
+    UA_Boolean *src = UA_Boolean_new();
+    UA_Boolean_init(src);
+    *src = false;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_BOOLEAN];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_Boolean_delete(src);
+}
+END_TEST
+
+/* SByte */
+START_TEST(UA_SByte_Max_Number_xml_encode) {
+    UA_SByte src = 127;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_SBYTE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "127";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_SByte_Min_Number_xml_encode) {
+    UA_SByte src = -128;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_SBYTE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "-128";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_SByte_Zero_Number_xml_encode) {
+    UA_SByte *src = UA_SByte_new();
+    *src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_SBYTE];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_SByte_delete(src);
+}
+END_TEST
+
+START_TEST(UA_SByte_smallbuf_Number_xml_encode) {
+    UA_SByte *src = UA_SByte_new();
+    *src = 127;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_SBYTE];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_SByte_delete(src);
+}
+END_TEST
+
+/* Byte */
+START_TEST(UA_Byte_Max_Number_xml_encode) {
+    UA_Byte *src = UA_Byte_new();
+    *src = 255;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_BYTE];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "255";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Byte_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Byte_Min_Number_xml_encode) {
+    UA_Byte src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_BYTE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Byte_smallbuf_Number_xml_encode) {
+    UA_Byte src = 255;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_BYTE];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+/* Int16 */
+START_TEST(UA_Int16_Max_Number_xml_encode) {
+    UA_Int16 *src = UA_Int16_new();
+    *src = 32767;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT16];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "32767";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Int16_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Int16_Min_Number_xml_encode) {
+    UA_Int16 *src = UA_Int16_new();
+    *src = -32768;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT16];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "-32768";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Int16_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Int16_Zero_Number_xml_encode) {
+    UA_Int16 *src = UA_Int16_new();
+    *src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT16];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Int16_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Int16_smallbuf_Number_xml_encode) {
+    UA_Int16 *src = UA_Int16_new();
+    *src = 127;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT16];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_Int16_delete(src);
+}
+END_TEST
+
+/* UInt16 */
+START_TEST(UA_UInt16_Max_Number_xml_encode) {
+    UA_UInt16 *src = UA_UInt16_new();
+    *src = 65535;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT16];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "65535";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt16_delete(src);
+}
+END_TEST
+
+START_TEST(UA_UInt16_Min_Number_xml_encode) {
+    UA_UInt16 *src = UA_UInt16_new();
+    *src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT16];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt16_delete(src);
+}
+END_TEST
+
+START_TEST(UA_UInt16_smallbuf_Number_xml_encode) {
+    UA_UInt16 *src = UA_UInt16_new();
+    *src = 255;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT16];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt16_delete(src);
+}
+END_TEST
+
+/* Int32 */
+START_TEST(UA_Int32_Max_Number_xml_encode) {
+    UA_Int32 *src = UA_Int32_new();
+    *src = 2147483647;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT32];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "2147483647";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Int32_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Int32_Min_Number_xml_encode) {
+    UA_Int32 src = -2147483648;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT32];
+    size_t size = UA_calcSizeXml((void *)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "-2147483648";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Int32_Zero_Number_xml_encode) {
+    UA_Int32 *src = UA_Int32_new();
+    *src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT32];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Int32_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Int32_smallbuf_Number_xml_encode) {
+    UA_Int32 *src = UA_Int32_new();
+    *src = 127;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT32];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_Int32_delete(src);
+}
+END_TEST
+
+/* UInt32 */
+START_TEST(UA_UInt32_Max_Number_xml_encode) {
+    UA_UInt32 *src = UA_UInt32_new();
+    *src = 4294967295;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT32];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "4294967295";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt32_delete(src);
+}
+END_TEST
+
+START_TEST(UA_UInt32_Min_Number_xml_encode) {
+    UA_UInt32 *src = UA_UInt32_new();
+    *src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT32];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt32_delete(src);
+}
+END_TEST
+
+START_TEST(UA_UInt32_smallbuf_Number_xml_encode) {
+    UA_UInt32 *src = UA_UInt32_new();
+    *src = 127;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT32];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt32_delete(src);
+}
+END_TEST
+
+/* Int64 */
+START_TEST(UA_Int64_Max_Number_xml_encode) {
+    UA_Int64 *src = UA_Int64_new();
+    *src = 9223372036854775807LL;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "9223372036854775807";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Int64_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Int64_Min_Number_xml_encode) {
+    UA_Int64 *src = UA_Int64_new();
+    *src = -UA_INT64_MAX - 1LL;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "-9223372036854775808";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Int64_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Int64_Zero_Number_xml_encode) {
+    UA_Int64 *src = UA_Int64_new();
+    *src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_Int64_delete(src);
+}
+END_TEST
+
+START_TEST(UA_Int64_smallbuf_Number_xml_encode) {
+    UA_Int64 *src = UA_Int64_new();
+    *src = 127;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_INT64];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_Int64_delete(src);
+}
+END_TEST
+
+/* UInt64 */
+START_TEST(UA_UInt64_Max_Number_xml_encode) {
+    UA_UInt64 *src = UA_UInt64_new();
+    *src = 18446744073709551615ULL;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT64];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "18446744073709551615";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt64_delete(src);
+}
+END_TEST
+
+START_TEST(UA_UInt64_Min_Number_xml_encode) {
+    UA_UInt64 *src = UA_UInt64_new();
+    *src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT64];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt64_delete(src);
+}
+END_TEST
+
+START_TEST(UA_UInt64_smallbuf_Number_xml_encode) {
+    UA_UInt64 *src = UA_UInt64_new();
+    *src = -9223372036854775808ULL;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT64];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 2);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_UInt64_delete(src);
+}
+END_TEST
+
+/* Float */
+START_TEST(UA_Float_xml_encode) {
+    UA_Float src = 1.0000000000F;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_FLOAT];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "1";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+/* Double */
+START_TEST(UA_Double_xml_encode) {
+    UA_Double src = 1.1234;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "1.1233999999999999541699935434735380113124847412109375";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Double_pluszero_xml_encode) {
+    UA_Double src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Double_minuszero_xml_encode) {
+    UA_Double src = -0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "0";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Double_plusInf_xml_encode) {
+    UA_Double src = INFINITY;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "INF";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Double_minusInf_xml_encode) {
+    UA_Double src = -INFINITY;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "-INF";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Double_nan_xml_encode) {
+    UA_Double src = NAN;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "NaN";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Double_onesmallest_xml_encode) {
+    UA_Double src = 1.0000000000000002220446049250313080847263336181640625;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "1.0000000000000002220446049250313080847263336181640625";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+/* String */
+START_TEST(UA_String_xml_encode) {
+    UA_String src = UA_STRING("hello");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "hello";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_String_Empty_xml_encode) {
+    UA_String src = UA_STRING("");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_String_Null_xml_encode) {
+    UA_String src = UA_STRING_NULL;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "null";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_String_escapesimple_xml_encode) {
+    UA_String src = UA_STRING("\b\th\"e\fl\nl\\o\r");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "\b\th\"e\fl\nl\\o\r";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_String_escapeutf_xml_encode) {
+    UA_String src = UA_STRING("he\\zsdl\alo€ \x26\x3A asdasd");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "he\\zsdl\alo€ \x26\x3A asdasd";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_String_special_xml_encode) {
+    UA_String src = UA_STRING("𝄞𠂊𝕥🔍");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_STRING];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml(&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "𝄞𠂊𝕥🔍";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+/* DateTime */
+START_TEST(UA_DateTime_xml_encode) {
+    UA_DateTime *src = UA_DateTime_new();
+    *src = UA_DateTime_fromUnixTime(1234567);
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DATETIME];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "1970-01-15T06:56:07Z";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_DateTime_delete(src);
+}
+END_TEST
+
+START_TEST(UA_DateTime_xml_encode_null) {
+    UA_DateTime src = 0;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DATETIME];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "1601-01-01T00:00:00Z";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_DateTime_with_nanoseconds_xml_encode) {
+    UA_DateTime *src = UA_DateTime_new();
+    *src = UA_DateTime_fromUnixTime(1234567) + 8901234;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DATETIME];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "1970-01-15T06:56:07.8901234Z";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_DateTime_delete(src);
+}
+END_TEST
+
+/* Guid */
+START_TEST(UA_Guid_xml_encode) {
+    UA_Guid src = {3, 9, 10, {8, 7, 6, 5, 4, 3, 2, 1}};
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_GUID];
+    size_t size = UA_calcSizeXml((void*)&src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)&src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "00000003-0009-000A-0807-060504030201";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+    UA_ByteString_clear(&buf);
+}
+END_TEST
+
+START_TEST(UA_Guid_smallbuf_xml_encode) {
+    UA_Guid *src = UA_Guid_new();
+    *src = UA_Guid_random();
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_GUID];
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+
+    UA_ByteString_clear(&buf);
+    UA_Guid_delete(src);
+}
+END_TEST
+
+/* NodeId */
+START_TEST(UA_NodeId_Numeric_xml_encode) {
+    UA_NodeId *src = UA_NodeId_new();
+    *src = UA_NODEID_NUMERIC(0, 5555);
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "i=5555";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_NodeId_delete(src);
+}
+END_TEST
+
+START_TEST(UA_NodeId_Numeric_Namespace_xml_encode) {
+    UA_NodeId *src = UA_NodeId_new();
+    *src = UA_NODEID_NUMERIC(4, 5555);
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "ns=4;i=5555";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_NodeId_delete(src);
+}
+END_TEST
+
+START_TEST(UA_NodeId_String_xml_encode) {
+    UA_NodeId *src = UA_NodeId_new();
+    *src = UA_NODEID_STRING_ALLOC(0, "foobar");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "s=foobar";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_NodeId_delete(src);
+}
+END_TEST
+
+START_TEST(UA_NodeId_String_Namespace_xml_encode) {
+    UA_NodeId *src = UA_NodeId_new();
+    *src = UA_NODEID_STRING_ALLOC(5, "foobar");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "ns=5;s=foobar";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_NodeId_delete(src);
+}
+END_TEST
+
+START_TEST(UA_NodeId_Guid_xml_encode) {
+    UA_NodeId *src = UA_NodeId_new();
+    UA_NodeId_init(src);
+    UA_Guid g = {3, 9, 10, {8, 7, 6, 5, 4, 3, 2, 1}};
+    *src = UA_NODEID_GUID(0, g);
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "g=00000003-0009-000a-0807-060504030201";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_NodeId_delete(src);
+}
+END_TEST
+
+START_TEST(UA_NodeId_Guid_Namespace_xml_encode) {
+    UA_NodeId *src = UA_NodeId_new();
+    UA_Guid g = {3, 9, 10, {8, 7, 6, 5, 4, 3, 2, 1}};
+    *src = UA_NODEID_GUID(5, g);
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+    ck_assert_uint_eq(size, 43);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "ns=5;g=00000003-0009-000a-0807-060504030201";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_NodeId_delete(src);
+}
+END_TEST
+
+START_TEST(UA_NodeId_ByteString_xml_encode) {
+    UA_NodeId *src = UA_NodeId_new();
+    *src = UA_NODEID_BYTESTRING_ALLOC(0, "asdfasdf");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+    ck_assert_uint_eq(size, 14);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "b=YXNkZmFzZGY=";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_NodeId_delete(src);
+}
+END_TEST
+
+START_TEST(UA_NodeId_ByteString_Namespace_xml_encode) {
+    UA_NodeId *src = UA_NodeId_new();
+    *src = UA_NODEID_BYTESTRING_ALLOC(5, "asdfasdf");
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_NODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "ns=5;b=YXNkZmFzZGY=";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_NodeId_delete(src);
+}
+END_TEST
+
+/* ExpandedNodeId */
+START_TEST(UA_ExpandedNodeId_xml_encode) {
+    UA_ExpandedNodeId *src = UA_ExpandedNodeId_new();
+    UA_ExpandedNodeId_init(src);
+    *src = UA_EXPANDEDNODEID_STRING_ALLOC(23, "testtestTest");
+    src->namespaceUri = UA_STRING_ALLOC("asdf");
+    src->serverIndex = 1345;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "svr=1345;nsu=asdf;s=testtestTest";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_ExpandedNodeId_delete(src);
+}
+END_TEST
+
+START_TEST(UA_ExpandedNodeId_MissingNamespaceUri_xml_encode) {
+    UA_ExpandedNodeId *src = UA_ExpandedNodeId_new();
+    UA_ExpandedNodeId_init(src);
+    *src = UA_EXPANDEDNODEID_STRING_ALLOC(23, "testtestTest");
+    src->namespaceUri = UA_STRING_NULL;
+    src->serverIndex = 1345;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_EXPANDEDNODEID];
+    size_t size = UA_calcSizeXml((void*)src, type, NULL);
+
+    UA_ByteString buf;
+    UA_ByteString_allocBuffer(&buf, size + 1);
+
+    status s = UA_encodeXml((void*)src, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    char* result = "svr=1345;ns=23;s=testtestTest";
+    buf.data[size] = 0; /* zero terminate */
+    ck_assert_str_eq(result, (char*)buf.data);
+
+    UA_ByteString_clear(&buf);
+    UA_ExpandedNodeId_delete(src);
+}
+END_TEST
+
+
+// ---------------------------DECODE-------------------------------------
+
+
+/* Boolean */
+START_TEST(UA_Boolean_true_xml_decode) {
+    UA_Boolean out;
+    UA_Boolean_init(&out);
+    UA_ByteString buf = UA_STRING("true");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_BOOLEAN], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out, true);
+
+    UA_Boolean_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Boolean_false_xml_decode) {
+    UA_Boolean out;
+    UA_Boolean_init(&out);
+    UA_ByteString buf = UA_STRING("false");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_BOOLEAN], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out, false);
+
+    UA_Boolean_clear(&out);
+}
+END_TEST
+
+/* SByte */
+START_TEST(UA_SByte_Min_xml_decode) {
+    UA_SByte out;
+    UA_SByte_init(&out);
+    UA_ByteString buf = UA_STRING("-128");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_SBYTE], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out, -128);
+
+    UA_SByte_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_SByte_Max_xml_decode) {
+    UA_SByte out;
+    UA_SByte_init(&out);
+    UA_ByteString buf = UA_STRING("127");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_SBYTE], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out, 127);
+
+    UA_SByte_clear(&out);
+}
+END_TEST
+
+/* Byte */
+START_TEST(UA_Byte_Min_xml_decode) {
+    UA_Byte out;
+    UA_Byte_init(&out);
+    UA_ByteString buf = UA_STRING("0");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_BYTE], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out, 0);
+
+    UA_Byte_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Byte_Max_xml_decode) {
+    UA_Byte out;
+    UA_Byte_init(&out);
+    UA_ByteString buf = UA_STRING("255");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_BYTE], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out, 255);
+
+    UA_Byte_clear(&out);
+}
+END_TEST
+
+/* Int16 */
+START_TEST(UA_Int16_Min_xml_decode) {
+    UA_Int16 out;
+    UA_Int16_init(&out);
+    UA_ByteString buf = UA_STRING("-32768");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT16], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out, -32768);
+
+    UA_Int16_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Int16_Max_xml_decode) {
+    UA_Int16 out;
+    UA_Int16_init(&out);
+    UA_ByteString buf = UA_STRING("32767");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT16], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out, 32767);
+
+    UA_Int16_clear(&out);
+}
+END_TEST
+
+/* UInt16 */
+START_TEST(UA_UInt16_Min_xml_decode) {
+    UA_UInt16 out;
+    UA_UInt16_init(&out);
+    UA_ByteString buf = UA_STRING("0");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_UINT16], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out, 0);
+
+    UA_UInt16_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_UInt16_Max_xml_decode) {
+    UA_UInt16 out;
+    UA_UInt16_init(&out);
+    UA_ByteString buf = UA_STRING("65535");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_UINT16], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out, 65535);
+
+    UA_UInt16_clear(&out);
+}
+END_TEST
+
+/* Int32 */
+START_TEST(UA_Int32_Min_xml_decode) {
+    UA_Int32 out;
+    UA_Int32_init(&out);
+    UA_ByteString buf = UA_STRING("-2147483648");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT32], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(out == -2147483648);
+
+    UA_Int32_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Int32_Max_xml_decode) {
+    UA_Int32 out;
+    UA_Int32_init(&out);
+    UA_ByteString buf = UA_STRING("2147483647");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT32], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out, 2147483647);
+
+    UA_Int32_clear(&out);
+}
+END_TEST
+
+/* UInt32 */
+START_TEST(UA_UInt32_Min_xml_decode) {
+    UA_UInt32 out;
+    UA_UInt32_init(&out);
+    UA_ByteString buf = UA_STRING("0");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_UINT32], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out, 0);
+
+    UA_UInt32_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_UInt32_Max_xml_decode) {
+    UA_UInt32 out;
+    UA_UInt32_init(&out);
+    UA_ByteString buf = UA_STRING("4294967295");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_UINT32], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out, 4294967295);
+
+    UA_UInt32_clear(&out);
+}
+END_TEST
+
+/* Int64 */
+START_TEST(UA_Int64_Min_xml_decode) {
+    UA_Int64 out;
+    UA_Int64_init(&out);
+    UA_ByteString buf = UA_STRING("-9223372036854775808");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0x00);
+    ck_assert_int_eq(((u8*)&out)[7], 0x80);
+
+    UA_Int64_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Int64_Max_xml_decode) {
+    UA_Int64 out;
+    UA_Int64_init(&out);
+    UA_ByteString buf = UA_STRING("9223372036854775807");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[1], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[2], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[3], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[4], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[5], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[6], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[7], 0x7F);
+
+    UA_Int64_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Int64_Overflow_xml_decode) {
+    UA_Int64 out;
+    UA_Int64_init(&out);
+    UA_ByteString buf = UA_STRING("9223372036854775808");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Int64_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Int64_TooBig_xml_decode) {
+    UA_Int64 out;
+    UA_Int64_init(&out);
+    UA_ByteString buf = UA_STRING("111111111111111111111111111111");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Int64_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Int64_NoDigit_xml_decode) {
+    UA_Int64 out;
+    UA_Int64_init(&out);
+    UA_ByteString buf = UA_STRING("a");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Int64_clear(&out);
+}
+END_TEST
+
+/* UInt64 */
+START_TEST(UA_UInt64_Min_xml_decode) {
+    UA_UInt64 out;
+    UA_UInt64_init(&out);
+    UA_ByteString buf = UA_STRING("0");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_UINT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0x00);
+    ck_assert_int_eq(((u8*)&out)[7], 0x00);
+
+    UA_UInt64_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_UInt64_Max_xml_decode) {
+    UA_UInt64 out;
+    UA_UInt64_init(&out);
+    UA_ByteString buf = UA_STRING("18446744073709551615");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_UINT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[1], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[2], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[3], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[4], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[5], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[6], 0xFF);
+    ck_assert_int_eq(((u8*)&out)[7], 0xFF);
+
+    UA_UInt64_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_UInt64_Overflow_xml_decode) {
+    UA_UInt64 out;
+    UA_UInt64_init(&out);
+    UA_ByteString buf = UA_STRING("18446744073709551616");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_UINT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_UInt64_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_UInt64_TooBig_xml_decode) {
+    UA_Int64 out;
+    UA_Int64_init(&out);
+    UA_ByteString buf = UA_STRING("111111111111111111111111111111");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Int64_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_UInt64_NoDigit_xml_decode) {
+    UA_Int64 out;
+    UA_Int64_init(&out);
+    UA_ByteString buf = UA_STRING("a");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Int64_clear(&out);
+}
+END_TEST
+
+/* Float */
+START_TEST(UA_Float_xml_decode) {
+    UA_Float out;
+    UA_Float_init(&out);
+    UA_ByteString buf = UA_STRING("3.1415927410");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
+
+    // 0 10000000 10010010000111111011011
+    // 40 49 0f db
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0xdb);
+    ck_assert_int_eq(((u8*)&out)[1], 0x0f);
+    ck_assert_int_eq(((u8*)&out)[2], 0x49);
+    ck_assert_int_eq(((u8*)&out)[3], 0x40);
+    UA_Float_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Float_xml_one_decode) {
+    UA_Float out;
+    UA_Float_init(&out);
+    UA_ByteString buf = UA_STRING("1");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
+
+    // 0 01111111 00000000000000000000000
+    // 3f 80 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x80);
+    ck_assert_int_eq(((u8*)&out)[3], 0x3f);
+
+    UA_Float_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Float_xml_inf_decode) {
+    UA_Float out;
+    UA_Float_init(&out);
+    UA_ByteString buf = UA_STRING("INF");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
+
+    // 0 11111111 00000000000000000000000
+    // 7f 80 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x80);
+    ck_assert_int_eq(((u8*)&out)[3], 0x7f);
+
+    UA_Float_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Float_xml_neginf_decode) {
+    UA_Float out;
+    UA_Float_init(&out);
+    UA_ByteString buf = UA_STRING("-INF");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
+
+    // 1 11111111 00000000000000000000000
+    // ff 80 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x80);
+    ck_assert_int_eq(((u8*)&out)[3], 0xff);
+
+    UA_Float_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Float_xml_nan_decode) {
+    UA_Float out;
+    UA_Float_init(&out);
+    UA_ByteString buf = UA_STRING("NaN");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
+
+    // 1 11111111 10000000000000000000000
+    // ff c0 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0xc0);
+    ck_assert_int_eq(((u8*)&out)[3], 0xff);
+
+    UA_Float val = out;
+    ck_assert(val != val); /* Check if not a number */
+
+    UA_Float_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Float_xml_negnan_decode) {
+    UA_Float out;
+    UA_Float_init(&out);
+    UA_ByteString buf = UA_STRING("-NaN");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
+
+    // 1 11111111 10000000000000000000000
+    // ff c0 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0xc0);
+    ck_assert_int_eq(((u8*)&out)[3], 0xff);
+
+    UA_Float val = out;
+    ck_assert(val != val); /* Check if not a number */
+
+    UA_Float_clear(&out);
+}
+END_TEST
+
+/* Double */
+START_TEST(UA_Double_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("1.1234");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 0 01111111111 0001111110010111001001000111010001010011100011101111
+    // 3f f1 f9 72 47 45 38 ef
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0xef);
+    ck_assert_int_eq(((u8*)&out)[1], 0x38);
+    ck_assert_int_eq(((u8*)&out)[2], 0x45);
+    ck_assert_int_eq(((u8*)&out)[3], 0x47);
+    ck_assert_int_eq(((u8*)&out)[4], 0x72);
+    ck_assert_int_eq(((u8*)&out)[5], 0xf9);
+    ck_assert_int_eq(((u8*)&out)[6], 0xf1);
+    ck_assert_int_eq(((u8*)&out)[7], 0x3f);
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_corrupt_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("1.12.34");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_one_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("1");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 0 01111111111 0000000000000000000000000000000000000000000000000000
+    // 3f f0 00 00 00 00 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0xf0);
+    ck_assert_int_eq(((u8*)&out)[7], 0x3f);
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_onepointsmallest_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("1.0000000000000002");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 0 01111111111 0000000000000000000000000000000000000000000000000001
+    // 3f f0 00 00 00 00 00 01
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x01);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0xf0);
+    ck_assert_int_eq(((u8*)&out)[7], 0x3f);
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_nan_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("NaN");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 1 11111111111 1000000000000000000000000000000000000000000000000000
+    // ff f8 00 00 00 00 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0xf8);
+    ck_assert_int_eq(((u8*)&out)[7], 0xff);
+
+    UA_Double val = out;
+    ck_assert(val != val); /* Check if not a number */
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_negnan_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("-NaN");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 1 11111111111 1000000000000000000000000000000000000000000000000000
+    // ff f8 00 00 00 00 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0xf8);
+    ck_assert_int_eq(((u8*)&out)[7], 0xff);
+
+    UA_Double val = out;
+    ck_assert(val != val); /* Check if not a number */
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_inf_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("INF");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 0 11111111111 0000000000000000000000000000000000000000000000000000
+    // 7f f0 00 00 00 00 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0xf0);
+    ck_assert_int_eq(((u8*)&out)[7], 0x7f);
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_neginf_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("-INF");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 1 11111111111 0000000000000000000000000000000000000000000000000000
+    // ff f0 00 00 00 00 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0xf0);
+    ck_assert_int_eq(((u8*)&out)[7], 0xff);
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_zero_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("0");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 0 00000000000 0000000000000000000000000000000000000000000000000000
+    // 00 00 00 00 00 00 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0x00);
+    ck_assert_int_eq(((u8*)&out)[7], 0x00);
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Double_negzero_xml_decode) {
+    UA_Double out;
+    UA_Double_init(&out);
+    UA_ByteString buf = UA_STRING("-0");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+
+    // 1 00000000000 0000000000000000000000000000000000000000000000000000
+    // 80 00 00 00 00 00 00 00
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0x00);
+    ck_assert_int_eq(((u8*)&out)[7], 0x80);
+
+    UA_Double_clear(&out);
+}
+END_TEST
+
+/* String */
+START_TEST(UA_String_xml_decode) {
+    UA_String out;
+    UA_String_init(&out);
+    UA_ByteString buf = UA_STRING("abcdef");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_STRING], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.length, 6);
+    ck_assert_int_eq(out.data[0], 'a');
+    ck_assert_int_eq(out.data[1], 'b');
+    ck_assert_int_eq(out.data[2], 'c');
+    ck_assert_int_eq(out.data[3], 'd');
+    ck_assert_int_eq(out.data[4], 'e');
+    ck_assert_int_eq(out.data[5], 'f');
+}
+END_TEST
+
+START_TEST(UA_String_empty_xml_decode) {
+    UA_String out;
+    UA_String_init(&out);
+    UA_ByteString buf = UA_STRING("");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_STRING], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.length, 0);
+    ck_assert_ptr_eq(out.data, UA_EMPTY_ARRAY_SENTINEL);
+}
+END_TEST
+
+START_TEST(UA_String_unescapeBS_xml_decode) {
+    UA_String out;
+    UA_String_init(&out);
+    UA_ByteString buf = UA_STRING("ab\tcdef");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_STRING], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.length, 7);
+    ck_assert_int_eq(out.data[0], 'a');
+    ck_assert_int_eq(out.data[1], 'b');
+    ck_assert_int_eq(out.data[2], '\t');
+    ck_assert_int_eq(out.data[3], 'c');
+    ck_assert_int_eq(out.data[4], 'd');
+    ck_assert_int_eq(out.data[5], 'e');
+    ck_assert_int_eq(out.data[6], 'f');
+}
+END_TEST
+
+START_TEST(UA_String_escape2_xml_decode) {
+    UA_String out;
+    UA_String_init(&out);
+    UA_ByteString buf = UA_STRING("\b\th\"e\fl\nl\\o\r");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_STRING], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.length, 12);
+    ck_assert_int_eq(out.data[0], '\b');
+    ck_assert_int_eq(out.data[1], '\t');
+    ck_assert_int_eq(out.data[2], 'h');
+    ck_assert_int_eq(out.data[3], '\"');
+    ck_assert_int_eq(out.data[4], 'e');
+    ck_assert_int_eq(out.data[5], '\f');
+    ck_assert_int_eq(out.data[6], 'l');
+    ck_assert_int_eq(out.data[7], '\n');
+    ck_assert_int_eq(out.data[8], 'l');
+    ck_assert_int_eq(out.data[9], '\\');
+    ck_assert_int_eq(out.data[10], 'o');
+    ck_assert_int_eq(out.data[11], '\r');
+}
+END_TEST
+
+/* DateTime */
+START_TEST(UA_DateTime_xml_decode) {
+    UA_DateTime out;
+    UA_DateTime_init(&out);
+    UA_ByteString buf = UA_STRING("1970-01-02T01:02:03.005Z");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
+    ck_assert_int_eq(dts.year, 1970);
+    ck_assert_int_eq(dts.month, 1);
+    ck_assert_int_eq(dts.day, 2);
+    ck_assert_int_eq(dts.hour, 1);
+    ck_assert_int_eq(dts.min, 2);
+    ck_assert_int_eq(dts.sec, 3);
+    ck_assert_int_eq(dts.milliSec, 5);
+    ck_assert_int_eq(dts.microSec, 0);
+    ck_assert_int_eq(dts.nanoSec, 0);
+
+    UA_DateTime_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_DateTime_xml_decode_large) {
+    UA_DateTime out;
+    UA_DateTime_init(&out);
+    UA_ByteString buf = UA_STRING("10970-01-02T01:02:03.005Z");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
+    ck_assert_int_eq(dts.year, 10970);
+    ck_assert_int_eq(dts.month, 1);
+    ck_assert_int_eq(dts.day, 2);
+    ck_assert_int_eq(dts.hour, 1);
+    ck_assert_int_eq(dts.min, 2);
+    ck_assert_int_eq(dts.sec, 3);
+    ck_assert_int_eq(dts.milliSec, 5);
+    ck_assert_int_eq(dts.microSec, 0);
+    ck_assert_int_eq(dts.nanoSec, 0);
+    UA_DateTime_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_DateTime_xml_decode_negative) {
+    UA_DateTime out;
+    UA_DateTime_init(&out);
+    UA_ByteString buf = UA_STRING("-0050-01-02T01:02:03.005Z");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
+    ck_assert_int_eq(dts.year, -50);
+    ck_assert_int_eq(dts.month, 1);
+    ck_assert_int_eq(dts.day, 2);
+    ck_assert_int_eq(dts.hour, 1);
+    ck_assert_int_eq(dts.min, 2);
+    ck_assert_int_eq(dts.sec, 3);
+    ck_assert_int_eq(dts.milliSec, 5);
+    ck_assert_int_eq(dts.microSec, 0);
+    ck_assert_int_eq(dts.nanoSec, 0);
+
+    UA_DateTime_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_DateTime_xml_decode_min) {
+    UA_DateTime dt_min = (UA_DateTime)UA_INT64_MIN;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DATETIME];
+
+    UA_Byte data[128];
+    UA_ByteString buf;
+    buf.data = data;
+    buf.length = 128;
+
+    status s = UA_encodeXml((void*)&dt_min, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    UA_DateTime out;
+    s = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    ck_assert_int_eq(dt_min, out);
+    UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
+    ck_assert_int_eq(dts.year, -27627);
+    ck_assert_int_eq(dts.month, 4);
+    ck_assert_int_eq(dts.day, 19);
+    ck_assert_int_eq(dts.hour, 21);
+    ck_assert_int_eq(dts.min, 11);
+    ck_assert_int_eq(dts.sec, 54);
+    ck_assert_int_eq(dts.milliSec, 522);
+    ck_assert_int_eq(dts.microSec, 419);
+    ck_assert_int_eq(dts.nanoSec, 200);
+}
+END_TEST
+
+START_TEST(UA_DateTime_xml_decode_max) {
+    UA_DateTime dt_max = (UA_DateTime)UA_INT64_MAX;
+    const UA_DataType *type = &UA_TYPES[UA_TYPES_DATETIME];
+
+    UA_Byte data[128];
+    UA_ByteString buf;
+    buf.data = data;
+    buf.length = 128;
+
+    status s = UA_encodeXml((void*)&dt_max, type, &buf, NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+
+    UA_DateTime out;
+    s = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
+    ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(dt_max, out);
+
+    UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
+    ck_assert_int_eq(dts.year, 30828);
+    ck_assert_int_eq(dts.month, 9);
+    ck_assert_int_eq(dts.day, 14);
+    ck_assert_int_eq(dts.hour, 2);
+    ck_assert_int_eq(dts.min, 48);
+    ck_assert_int_eq(dts.sec, 5);
+    ck_assert_int_eq(dts.milliSec, 477);
+    ck_assert_int_eq(dts.microSec, 580);
+    ck_assert_int_eq(dts.nanoSec, 700);
+}
+END_TEST
+
+START_TEST(UA_DateTime_micro_xml_decode) {
+    UA_DateTime out;
+    UA_DateTime_init(&out);
+    UA_ByteString buf = UA_STRING("1970-01-02T01:02:03.042Z");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    UA_DateTimeStruct dts = UA_DateTime_toStruct(out);
+    ck_assert_int_eq(dts.year, 1970);
+    ck_assert_int_eq(dts.month, 1);
+    ck_assert_int_eq(dts.day, 2);
+    ck_assert_int_eq(dts.hour, 1);
+    ck_assert_int_eq(dts.min, 2);
+    ck_assert_int_eq(dts.sec, 3);
+    ck_assert_int_eq(dts.milliSec, 42);
+    ck_assert_int_eq(dts.microSec, 0);
+    ck_assert_int_eq(dts.nanoSec, 0);
+
+    UA_DateTime_clear(&out);
+}
+END_TEST
+
+/* Guid */
+START_TEST(UA_Guid_xml_decode) {
+    UA_Guid out;
+    UA_Guid_init(&out);
+    UA_ByteString buf = UA_STRING("00000001-0002-0003-0405-060708090A0B");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_GUID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out.data1, 1);
+    ck_assert_int_eq(out.data2, 2);
+    ck_assert_int_eq(out.data3, 3);
+    ck_assert_int_eq(out.data4[0], 4);
+    ck_assert_int_eq(out.data4[1], 5);
+    ck_assert_int_eq(out.data4[2], 6);
+    ck_assert_int_eq(out.data4[3], 7);
+    ck_assert_int_eq(out.data4[4], 8);
+    ck_assert_int_eq(out.data4[5], 9);
+    ck_assert_int_eq(out.data4[6], 10);
+    ck_assert_int_eq(out.data4[7], 11);
+
+    UA_Guid_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Guid_lower_xml_decode) {
+    UA_Guid out;
+    UA_Guid_init(&out);
+    UA_ByteString buf = UA_STRING("00000001-0002-0003-0405-060708090a0b");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_GUID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out.data1, 1);
+    ck_assert_int_eq(out.data2, 2);
+    ck_assert_int_eq(out.data3, 3);
+    ck_assert_int_eq(out.data4[0], 4);
+    ck_assert_int_eq(out.data4[1], 5);
+    ck_assert_int_eq(out.data4[2], 6);
+    ck_assert_int_eq(out.data4[3], 7);
+    ck_assert_int_eq(out.data4[4], 8);
+    ck_assert_int_eq(out.data4[5], 9);
+    ck_assert_int_eq(out.data4[6], 10);
+    ck_assert_int_eq(out.data4[7], 11);
+
+    UA_Guid_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Guid_tooShort_xml_decode) {
+    UA_Guid out;
+    UA_Guid_init(&out);
+    UA_ByteString buf = UA_STRING("00000001-00");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_GUID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Guid_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Guid_tooLong_xml_decode) {
+    UA_Guid out;
+    UA_Guid_init(&out);
+    UA_ByteString buf = UA_STRING("00000001-0002-0003-0405-060708090A0B00000001");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_GUID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Guid_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Guid_wrong_xml_decode) {
+    UA_Guid out;
+    UA_Guid_init(&out);
+    UA_ByteString buf = UA_STRING("00000=01-0002-0003-0405-060708090A0B");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_GUID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_BADDECODINGERROR);
+
+    UA_Guid_clear(&out);
+}
+END_TEST
+
+/* NodeId */
+START_TEST(UA_NodeId_Nummeric_xml_decode) {
+    UA_NodeId out;
+    UA_NodeId_init(&out);
+    UA_ByteString buf = UA_STRING("i=42");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.identifier.numeric, 42);
+    ck_assert_uint_eq(out.namespaceIndex, 0);
+    ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_NUMERIC);
+
+    UA_NodeId_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_NodeId_Nummeric_Namespace_xml_decode) {
+    UA_NodeId out;
+    UA_NodeId_init(&out);
+    UA_ByteString buf = UA_STRING("ns=123;i=42");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.identifier.numeric, 42);
+    ck_assert_uint_eq(out.namespaceIndex, 123);
+    ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_NUMERIC);
+
+    UA_NodeId_clear(&out);
+}
+END_TEST
+
+
+START_TEST(UA_NodeId_String_xml_decode) {
+    UA_NodeId out;
+    UA_NodeId_init(&out);
+    UA_ByteString buf = UA_STRING("s=test123");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.identifier.string.length, 7);
+    ck_assert_int_eq(out.identifier.string.data[0], 't');
+    ck_assert_int_eq(out.identifier.string.data[1], 'e');
+    ck_assert_int_eq(out.identifier.string.data[2], 's');
+    ck_assert_int_eq(out.identifier.string.data[3], 't');
+    ck_assert_int_eq(out.identifier.string.data[4], '1');
+    ck_assert_int_eq(out.identifier.string.data[5], '2');
+    ck_assert_int_eq(out.identifier.string.data[6], '3');
+    ck_assert_int_eq(out.namespaceIndex, 0);
+    ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_STRING);
+
+    UA_NodeId_clear(&out);
+}
+END_TEST
+
+
+START_TEST(UA_NodeId_Guid_xml_decode) {
+    UA_NodeId out;
+    UA_NodeId_init(&out);
+    UA_ByteString buf = UA_STRING("g=00000001-0002-0003-0405-060708090A0B");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out.namespaceIndex, 0);
+    ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_GUID);
+    ck_assert_int_eq(out.identifier.guid.data1, 1);
+    ck_assert_int_eq(out.identifier.guid.data2, 2);
+    ck_assert_int_eq(out.identifier.guid.data3, 3);
+    ck_assert_int_eq(out.identifier.guid.data4[0], 4);
+    ck_assert_int_eq(out.identifier.guid.data4[1], 5);
+    ck_assert_int_eq(out.identifier.guid.data4[2], 6);
+    ck_assert_int_eq(out.identifier.guid.data4[3], 7);
+    ck_assert_int_eq(out.identifier.guid.data4[4], 8);
+    ck_assert_int_eq(out.identifier.guid.data4[5], 9);
+    ck_assert_int_eq(out.identifier.guid.data4[6], 10);
+    ck_assert_int_eq(out.identifier.guid.data4[7], 11);
+
+    UA_NodeId_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_NodeId_ByteString_xml_decode) {
+    UA_NodeId out;
+    UA_NodeId_init(&out);
+    UA_ByteString buf = UA_STRING("b=YXNkZmFzZGY=");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out.namespaceIndex, 0);
+    ck_assert_int_eq(out.identifierType, UA_NODEIDTYPE_BYTESTRING);
+    ck_assert_uint_eq(out.identifier.byteString.length, 8);
+    ck_assert_int_eq(out.identifier.byteString.data[0], 'a');
+    ck_assert_int_eq(out.identifier.byteString.data[1], 's');
+    ck_assert_int_eq(out.identifier.byteString.data[2], 'd');
+    ck_assert_int_eq(out.identifier.byteString.data[3], 'f');
+    ck_assert_int_eq(out.identifier.byteString.data[4], 'a');
+    ck_assert_int_eq(out.identifier.byteString.data[5], 's');
+    ck_assert_int_eq(out.identifier.byteString.data[6], 'd');
+    ck_assert_int_eq(out.identifier.byteString.data[7], 'f');
+
+    UA_NodeId_clear(&out);
+}
+END_TEST
+
+/* ExpandedNodeId */
+START_TEST(UA_ExpandedNodeId_Nummeric_xml_decode) {
+    UA_ExpandedNodeId out;
+    UA_ExpandedNodeId_init(&out);
+    UA_ByteString buf = UA_STRING("i=42");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(out.nodeId.identifier.numeric, 42);
+    ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_NUMERIC);
+    ck_assert_ptr_eq(out.namespaceUri.data, NULL);
+    ck_assert_uint_eq(out.namespaceUri.length, 0);
+    ck_assert_int_eq(out.serverIndex, 0);
+
+    UA_ExpandedNodeId_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_ExpandedNodeId_String_xml_decode) {
+    UA_ExpandedNodeId out;
+    UA_ExpandedNodeId_init(&out);
+    UA_ByteString buf = UA_STRING("s=test");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
+    ck_assert_int_eq(out.nodeId.identifier.string.data[0], 't');
+    ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_STRING);
+    ck_assert_ptr_eq(out.namespaceUri.data, NULL);
+    ck_assert_uint_eq(out.namespaceUri.length, 0);
+    ck_assert_int_eq(out.serverIndex, 0);
+
+    UA_ExpandedNodeId_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_ExpandedNodeId_String_Namespace_xml_decode) {
+    UA_ExpandedNodeId out;
+    UA_ExpandedNodeId_init(&out);
+    UA_ByteString buf = UA_STRING("nsu=abcdef;s=test");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
+    ck_assert_int_eq(out.nodeId.identifier.string.data[0], 't');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[1], 'e');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[2], 's');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[3], 't');
+    ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_STRING);
+    ck_assert_uint_eq(out.namespaceUri.length, 6);
+    ck_assert_int_eq(out.namespaceUri.data[0], 'a');
+    ck_assert_int_eq(out.namespaceUri.data[1], 'b');
+    ck_assert_int_eq(out.namespaceUri.data[2], 'c');
+    ck_assert_int_eq(out.namespaceUri.data[3], 'd');
+    ck_assert_int_eq(out.namespaceUri.data[4], 'e');
+    ck_assert_int_eq(out.namespaceUri.data[5], 'f');
+    ck_assert_int_eq(out.serverIndex, 0);
+
+    UA_ExpandedNodeId_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_ExpandedNodeId_String_NamespaceAsIndex_xml_decode) {
+    UA_ExpandedNodeId out;
+    UA_ExpandedNodeId_init(&out);
+    UA_ByteString buf = UA_STRING("ns=42;s=test");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
+    ck_assert_int_eq(out.nodeId.identifier.string.data[0], 't');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[1], 'e');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[2], 's');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[3], 't');
+    ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_STRING);
+    ck_assert_uint_eq(out.namespaceUri.length, 0);
+    ck_assert_ptr_eq(out.namespaceUri.data, NULL);
+    ck_assert_uint_eq(out.nodeId.namespaceIndex, 42);
+    ck_assert_uint_eq(out.serverIndex, 0);
+
+    UA_ExpandedNodeId_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_ExpandedNodeId_String_Namespace_ServerUri_xml_decode) {
+    UA_ExpandedNodeId out;
+    UA_ExpandedNodeId_init(&out);
+    UA_ByteString buf = UA_STRING("svr=13;nsu=test;s=test");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 4);
+    ck_assert_int_eq(out.nodeId.identifier.string.data[0], 't');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[1], 'e');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[2], 's');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[3], 't');
+    ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_STRING);
+    ck_assert_uint_eq(out.serverIndex, 13);
+    ck_assert_int_eq(out.namespaceUri.data[0], 't');
+    ck_assert_int_eq(out.namespaceUri.data[1], 'e');
+    ck_assert_int_eq(out.namespaceUri.data[2], 's');
+    ck_assert_int_eq(out.namespaceUri.data[3], 't');
+
+    UA_ExpandedNodeId_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_ExpandedNodeId_ByteString_xml_decode) {
+    UA_ExpandedNodeId out;
+    UA_ExpandedNodeId_init(&out);
+    UA_ByteString buf = UA_STRING("svr=13;nsu=test;b=YXNkZmFzZGY=");
+
+    UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_EXPANDEDNODEID], NULL);
+
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(out.nodeId.identifier.string.length, 8);
+    ck_assert_int_eq(out.nodeId.identifier.string.data[0], 'a');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[1], 's');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[2], 'd');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[3], 'f');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[4], 'a');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[5], 's');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[6], 'd');
+    ck_assert_int_eq(out.nodeId.identifier.string.data[7], 'f');
+    ck_assert_int_eq(out.nodeId.identifierType, UA_NODEIDTYPE_BYTESTRING);
+    ck_assert_uint_eq(out.serverIndex, 13);
+    ck_assert_int_eq(out.namespaceUri.data[0], 't');
+    ck_assert_int_eq(out.namespaceUri.data[1], 'e');
+    ck_assert_int_eq(out.namespaceUri.data[2], 's');
+    ck_assert_int_eq(out.namespaceUri.data[3], 't');
+
+    UA_ExpandedNodeId_clear(&out);
+}
+END_TEST
+
+
+static Suite *testSuite_builtin_xml(void) {
+    Suite *s = suite_create("Built-in Data Types 62541-5 Xml");
+
+    TCase *tc_xml_encode = tcase_create("xml_encode");
+    tcase_add_test(tc_xml_encode, UA_Boolean_true_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Boolean_false_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Boolean_true_bufferTooSmall_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_SByte_Max_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_SByte_Min_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_SByte_Zero_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_SByte_smallbuf_Number_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_Byte_Max_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Byte_Min_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Byte_smallbuf_Number_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_Int16_Max_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int16_Min_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int16_Zero_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int16_smallbuf_Number_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_UInt16_Max_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_UInt16_Min_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_UInt16_smallbuf_Number_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_Int32_Max_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int32_Min_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int32_Zero_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int32_smallbuf_Number_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_UInt32_Max_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_UInt32_Min_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_UInt32_smallbuf_Number_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_Int64_Max_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int64_Min_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int64_Zero_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Int64_smallbuf_Number_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_UInt64_Max_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_UInt64_Min_Number_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_UInt64_smallbuf_Number_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_Float_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_Double_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Double_onesmallest_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Double_pluszero_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Double_minuszero_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Double_plusInf_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Double_minusInf_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Double_nan_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_String_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_String_Empty_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_String_Null_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_String_escapesimple_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_String_escapeutf_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_String_special_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_DateTime_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_DateTime_xml_encode_null);
+    tcase_add_test(tc_xml_encode, UA_DateTime_with_nanoseconds_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_Guid_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_Guid_smallbuf_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_NodeId_Numeric_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_NodeId_Numeric_Namespace_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_NodeId_String_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_NodeId_String_Namespace_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_NodeId_Guid_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_NodeId_Guid_Namespace_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_NodeId_ByteString_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_NodeId_ByteString_Namespace_xml_encode);
+
+    tcase_add_test(tc_xml_encode, UA_ExpandedNodeId_xml_encode);
+    tcase_add_test(tc_xml_encode, UA_ExpandedNodeId_MissingNamespaceUri_xml_encode);
+
+    suite_add_tcase(s, tc_xml_encode);
+
+    TCase *tc_xml_decode = tcase_create("xml_decode");
+
+    tcase_add_test(tc_xml_decode, UA_Boolean_true_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Boolean_false_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_SByte_Min_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_SByte_Max_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_Byte_Min_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Byte_Max_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_Int16_Min_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Int16_Max_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_UInt16_Min_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_UInt16_Max_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_UInt32_Min_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_UInt32_Max_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_Int32_Min_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Int32_Max_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_Int64_Min_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Int64_Max_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Int64_Overflow_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Int64_TooBig_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Int64_NoDigit_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_UInt64_Min_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_UInt64_Max_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_UInt64_Overflow_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_UInt64_TooBig_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_UInt64_NoDigit_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_Float_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Float_xml_one_decode);
+    tcase_add_test(tc_xml_decode, UA_Float_xml_inf_decode);
+    tcase_add_test(tc_xml_decode, UA_Float_xml_neginf_decode);
+    tcase_add_test(tc_xml_decode, UA_Float_xml_nan_decode);
+    tcase_add_test(tc_xml_decode, UA_Float_xml_negnan_decode);
+
+    tcase_add_test(tc_xml_decode, UA_Double_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_one_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_corrupt_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_onepointsmallest_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_nan_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_negnan_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_negzero_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_zero_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_inf_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Double_neginf_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_String_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_String_empty_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_String_unescapeBS_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_String_escape2_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_DateTime_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_DateTime_xml_decode_large);
+    tcase_add_test(tc_xml_decode, UA_DateTime_xml_decode_negative);
+    tcase_add_test(tc_xml_decode, UA_DateTime_xml_decode_min);
+    tcase_add_test(tc_xml_decode, UA_DateTime_xml_decode_max);
+    tcase_add_test(tc_xml_decode, UA_DateTime_micro_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_Guid_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Guid_lower_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Guid_tooShort_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Guid_tooLong_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_Guid_wrong_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_NodeId_Nummeric_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_NodeId_Nummeric_Namespace_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_NodeId_String_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_NodeId_Guid_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_NodeId_ByteString_xml_decode);
+
+    tcase_add_test(tc_xml_decode, UA_ExpandedNodeId_Nummeric_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_ExpandedNodeId_String_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_ExpandedNodeId_String_Namespace_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_ExpandedNodeId_String_NamespaceAsIndex_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_ExpandedNodeId_String_Namespace_ServerUri_xml_decode);
+    tcase_add_test(tc_xml_decode, UA_ExpandedNodeId_ByteString_xml_decode);
+
+    suite_add_tcase(s, tc_xml_decode);
+
+    return s;
+}
+
+int main(void) {
+    int      number_failed = 0;
+    Suite   *s;
+    SRunner *sr;
+
+    s  = testSuite_builtin_xml();
+    sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed += srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From acd1a465f9db3643f5275c4f50071a7f99a5b0dd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 14 Nov 2022 22:11:42 +0100
Subject: [PATCH 0519/1963] feat(core): Add UA_INLINABLE to optionally export
 "static inline" methods

---
 CMakeLists.txt                               |  3 +++
 include/open62541/architecture_definitions.h | 16 ++++++++++++++++
 include/open62541/config.h.in                |  1 +
 src/ua_util.c                                |  4 ++++
 tools/amalgamate.py                          |  2 ++
 5 files changed, 26 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f363bfbeb0b..5e19db5761f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,9 @@ mark_as_advanced(UA_ENABLE_NODEMANAGEMENT)
 option(UA_ENABLE_PARSING "Utility functions that require parsing (e.g. NodeId expressions)" ON)
 mark_as_advanced(UA_ENABLE_PARSING)
 
+option(UA_ENABLE_INLINABLE_EXPORT "Export 'static inline' methods as regular API" OFF)
+mark_as_advanced(UA_ENABLE_INLINABLE_EXPORT)
+
 option(UA_ENABLE_DISCOVERY_MULTICAST "Enable Discovery Service with multicast support (LDS-ME)" OFF)
 mark_as_advanced(UA_ENABLE_DISCOVERY_MULTICAST)
 
diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
index 531ac29782f..9a75c531df6 100644
--- a/include/open62541/architecture_definitions.h
+++ b/include/open62541/architecture_definitions.h
@@ -211,6 +211,22 @@ extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
 # define UA_INLINE inline
 #endif
 
+/* An inlinable method is typically defined as "static inline". Some
+ * applications, such as language bindings with a C FFI (foreign function
+ * interface), can however not work with static inline methods. These can set
+ * the global UA_ENABLE_INLINABLE_EXPORT macro which causes all inlinable
+ * methods to be exported as a regular public API method.
+ *
+ * Note that UA_ENABLE_INLINABLE_EXPORT has a negative impact for both size and
+ * performance of the library. */
+#if defined(UA_ENABLE_INLINABLE_EXPORT) && defined(UA_INLINABLE_IMPL)
+# define UA_INLINABLE(decl, impl) UA_EXPORT decl; decl impl
+#elif defined(UA_ENABLE_INLINABLE_EXPORT)
+# define UA_INLINABLE(decl, impl) UA_EXPORT decl;
+#else
+# define UA_INLINABLE(decl, impl) static UA_INLINE decl impl
+#endif
+
 /**
  * Non-aliasing pointers
  * -------------------- */
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 44ac46c9497..a1351394f80 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -62,6 +62,7 @@
 /* Advanced Options */
 #cmakedefine UA_ENABLE_STATUSCODE_DESCRIPTIONS
 #cmakedefine UA_ENABLE_TYPEDESCRIPTION
+#cmakedefine UA_ENABLE_INLINABLE_EXPORT
 #cmakedefine UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
 #cmakedefine UA_ENABLE_DETERMINISTIC_RNG
 #cmakedefine UA_ENABLE_DISCOVERY
diff --git a/src/ua_util.c b/src/ua_util.c
index 2e6d583677d..1df32fb0804 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -7,6 +7,10 @@
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  */
 
+/* If UA_ENABLE_INLINABLE_EXPORT is enabled, then this file is the compilation
+ * unit for the generated code from UA_INLINABLE definitions. */
+#define UA_INLINABLE_IMPL 1
+
 #include <open62541/types_generated_handling.h>
 #include <open62541/util.h>
 
diff --git a/tools/amalgamate.py b/tools/amalgamate.py
index 6e042a6ac91..f525d743d6d 100755
--- a/tools/amalgamate.py
+++ b/tools/amalgamate.py
@@ -53,6 +53,8 @@
 # define MDNSD_DYNAMIC_LINKING
 #endif
 
+#define UA_INLINABLE_IMPL 1
+
 /* Disable security warnings for BSD sockets on MSVC */
 #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
 # define _CRT_SECURE_NO_WARNINGS

From df90cc69875e4e4c8773960e027c6f5c555abf83 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 14 Nov 2022 22:34:57 +0100
Subject: [PATCH 0520/1963] refactor(core): Move DateTime and String handling
 to UA_INLINABLE

---
 include/open62541/types.h | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 3167890be5f..b3d1f79e72f 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -159,29 +159,21 @@ UA_StatusCode_name(UA_StatusCode code);
 
 /* Extracts the severity from a StatusCode. See Part 4, Section 7.34 for
  * details. */
-static UA_INLINE UA_Boolean
-UA_StatusCode_isBad(UA_StatusCode code) {
-    return ((code >> 30) >= 0x02);
-}
+UA_INLINABLE(UA_Boolean UA_StatusCode_isBad(UA_StatusCode code),
+             { return ((code >> 30) >= 0x02); })
 
-static UA_INLINE UA_Boolean
-UA_StatusCode_isUncertain(UA_StatusCode code) {
-    return ((code >> 30) == 0x01);
-}
+UA_INLINABLE(UA_Boolean UA_StatusCode_isUncertain(UA_StatusCode code),
+             { return ((code >> 30) == 0x01); })
 
-static UA_INLINE UA_Boolean
-UA_StatusCode_isGood(UA_StatusCode code) {
-    return ((code >> 30) == 0x00);
-}
+UA_INLINABLE(UA_Boolean UA_StatusCode_isGood(UA_StatusCode code),
+             { return ((code >> 30) == 0x00); })
 
 /* Compares the top 16 bits of two StatusCodes for equality. This should only
  * be used when processing user-defined StatusCodes e.g when processing a ReadResponse.
  * As a convention, the lower bits of StatusCodes should not be used internally, meaning
  * can compare them without the use of this function. */
-static UA_INLINE UA_Boolean
-UA_StatusCode_isEqualTop (UA_StatusCode s1, UA_StatusCode s2) {
-  return ((s1 & 0xFFFF0000) == (s2 & 0xFFFF0000));
-}
+UA_INLINABLE(UA_Boolean UA_StatusCode_isEqualTop(UA_StatusCode s1, UA_StatusCode s2),
+             { return ((s1 & 0xFFFF0000) == (s2 & 0xFFFF0000)); })
 
 /**
  * String
@@ -208,13 +200,13 @@ UA_EXPORT extern const UA_String UA_STRING_NULL;
  * ``UA_STRING`` returns a string pointing to the original char-array.
  * ``UA_STRING_ALLOC`` is shorthand for ``UA_String_fromChars`` and makes a copy
  * of the char-array. */
-static UA_INLINE UA_String
-UA_STRING(char *chars) {
-    UA_String s; s.length = 0; s.data = NULL;
+UA_INLINABLE(UA_String UA_STRING(char *chars), {
+    UA_String s = {0};
     if(!chars)
         return s;
-    s.length = strlen(chars); s.data = (UA_Byte*)chars; return s;
-}
+    s.length = strlen(chars); s.data = (UA_Byte*)chars;
+    return s;
+})
 
 #define UA_STRING_ALLOC(CHARS) UA_String_fromChars(CHARS)
 

From d25a2ff43e9c997c6d9d23705012397dcc77609a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 14 Nov 2022 21:39:50 +0100
Subject: [PATCH 0521/1963] refactor(core): Mark XML en/decoding as
 experimental until feature complete

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e19db5761f..6b77ff72225 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ option(UA_ENABLE_DA "Enable OPC UA DataAccess (Part 8) definitions" ON)
 option(UA_ENABLE_HISTORIZING "Enable basic support for historical access (client and server)" OFF)
 option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" OFF)
 option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" ON)
-option(UA_ENABLE_XML_ENCODING "Enable XML encoding" OFF)
+option(UA_ENABLE_XML_ENCODING "Enable XML encoding (EXPERIMENTAL)" OFF)
 option(UA_ENABLE_NODESETLOADER "Enable nodesetLoader public API" OFF)
 
 set(MULTITHREADING_DEFAULT 0)

From 6f3117951a1332593269f5e77944a7e8c80c090c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 14 Nov 2022 21:40:25 +0100
Subject: [PATCH 0522/1963] refactor(core): Add UA_ENABLE_XML_ENCODING to
 config.h.in

---
 CMakeLists.txt                | 1 -
 include/open62541/config.h.in | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b77ff72225..07782e2d04d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1205,7 +1205,6 @@ if(UA_ENABLE_JSON_ENCODING)
 endif()
 
 if(UA_ENABLE_XML_ENCODING)
-    add_definitions(-DUA_ENABLE_XML_ENCODING)
     if(NOT UA_ENABLE_JSON_ENCODING)
         list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/parse_num.h)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/parse_num.c)
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index a1351394f80..c5ca69db0e1 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -41,6 +41,7 @@
 #cmakedefine UA_ENABLE_EXPERIMENTAL_HISTORIZING
 #cmakedefine UA_ENABLE_SUBSCRIPTIONS_EVENTS
 #cmakedefine UA_ENABLE_JSON_ENCODING
+#cmakedefine UA_ENABLE_XML_ENCODING
 #cmakedefine UA_ENABLE_PUBSUB_MQTT
 #cmakedefine UA_ENABLE_MQTT_TLS
 #cmakedefine UA_ENABLE_MQTT_TLS_OPENSSL

From 89024740a8c880675258a1b3a60220e3b4438736 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 14 Nov 2022 21:44:54 +0100
Subject: [PATCH 0523/1963] feat(ci): Enable XML en/decoding for CI builds

---
 tools/ci.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index a6db0791925..b95e66f6e8d 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -93,6 +93,7 @@ function build_amalgamation {
           -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
@@ -109,6 +110,7 @@ function build_amalgamation_mt {
           -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
@@ -139,6 +141,7 @@ function unit_tests {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
@@ -164,6 +167,7 @@ function unit_tests_32 {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
@@ -199,6 +203,7 @@ function unit_tests_diag {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
@@ -315,6 +320,7 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
@@ -346,6 +352,7 @@ function unit_tests_valgrind {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
@@ -374,6 +381,7 @@ function build_clang_analyzer {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \

From 3f4f49a15da30599686dd14de22291cf96600c3c Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Tue, 15 Nov 2022 09:51:07 +0100
Subject: [PATCH 0524/1963] fix(tests): Fix xml en/decoding macro definitions

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 tests/check_types_builtin_xml.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/check_types_builtin_xml.c b/tests/check_types_builtin_xml.c
index 9fd97dfb761..e832bbdc089 100644
--- a/tests/check_types_builtin_xml.c
+++ b/tests/check_types_builtin_xml.c
@@ -10,6 +10,7 @@
 #include "ua_types_encoding_xml.h"
 
 #include <check.h>
+#include <math.h>
 
 #if defined(_MSC_VER)
 # pragma warning(disable: 4146)

From b39aedb7be8171993983542b8dc34a835b3d1ecb Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Tue, 15 Nov 2022 10:39:18 +0100
Subject: [PATCH 0525/1963] fix(core): Fix amalgamation build for xml
 en/decoding

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 src/ua_types_encoding_xml.c | 60 ++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/ua_types_encoding_xml.c b/src/ua_types_encoding_xml.c
index e9940ae0f18..49825ce745a 100644
--- a/src/ua_types_encoding_xml.c
+++ b/src/ua_types_encoding_xml.c
@@ -39,7 +39,7 @@
     TYPE##_encodeXml(CtxXml *ctx, const UA_##TYPE *src, const UA_DataType *type)
 
 static status UA_FUNC_ATTR_WARN_UNUSED_RESULT
-writeChars(CtxXml *ctx, const char *c, size_t len) {
+xmlEncodeWriteChars(CtxXml *ctx, const char *c, size_t len) {
     if(ctx->pos + len > ctx->end)
         return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
     if(!ctx->calcOnly)
@@ -51,18 +51,18 @@ writeChars(CtxXml *ctx, const char *c, size_t len) {
 /* Boolean */
 ENCODE_XML(Boolean) {
     if(*src == true)
-        return writeChars(ctx, "true", 4);
-    return writeChars(ctx, "false", 5);
+        return xmlEncodeWriteChars(ctx, "true", 4);
+    return xmlEncodeWriteChars(ctx, "false", 5);
 }
 
 static status encodeSigned(CtxXml *ctx, UA_Int64 value, char* buffer) {
     UA_UInt16 digits = itoaSigned(value, buffer);
-    return writeChars(ctx, buffer, digits);
+    return xmlEncodeWriteChars(ctx, buffer, digits);
 }
 
 static status encodeUnsigned(CtxXml *ctx, UA_UInt64 value, char* buffer) {
     UA_UInt16 digits = itoaUnsigned(value, buffer, 10);
-    return writeChars(ctx, buffer, digits);
+    return xmlEncodeWriteChars(ctx, buffer, digits);
 }
 
 /* signed Byte */
@@ -133,7 +133,7 @@ ENCODE_XML(Float) {
     if(len == 0)
         return UA_STATUSCODE_BADENCODINGERROR;
 
-    return writeChars(ctx, buffer, len);
+    return xmlEncodeWriteChars(ctx, buffer, len);
 }
 
 /* Double */
@@ -156,14 +156,14 @@ ENCODE_XML(Double) {
     if(len == 0)
         return UA_STATUSCODE_BADENCODINGERROR;
 
-    return writeChars(ctx, buffer, len);
+    return xmlEncodeWriteChars(ctx, buffer, len);
 }
 
 /* String */
 ENCODE_XML(String) {
     if(!src->data)
-        return writeChars(ctx, "null", 4);
-    return writeChars(ctx, (const char*)src->data, src->length);
+        return xmlEncodeWriteChars(ctx, "null", 4);
+    return xmlEncodeWriteChars(ctx, (const char*)src->data, src->length);
 }
 
 /* Guid */
@@ -178,7 +178,7 @@ ENCODE_XML(Guid) {
 
 /* DateTime */
 static u8
-printNumber(i32 n, char *pos, u8 min_digits) {
+xmlEncodePrintNumber(i32 n, char *pos, u8 min_digits) {
     char digits[10];
     u8 len = 0;
     /* Handle negative values */
@@ -207,21 +207,21 @@ ENCODE_XML(DateTime) {
      * Note the optional minus for negative years. */
     char buffer[UA_XML_DATETIME_LENGTH];
     char *pos = buffer;
-    pos += printNumber(tSt.year, pos, 4);
+    pos += xmlEncodePrintNumber(tSt.year, pos, 4);
     *(pos++) = '-';
-    pos += printNumber(tSt.month, pos, 2);
+    pos += xmlEncodePrintNumber(tSt.month, pos, 2);
     *(pos++) = '-';
-    pos += printNumber(tSt.day, pos, 2);
+    pos += xmlEncodePrintNumber(tSt.day, pos, 2);
     *(pos++) = 'T';
-    pos += printNumber(tSt.hour, pos, 2);
+    pos += xmlEncodePrintNumber(tSt.hour, pos, 2);
     *(pos++) = ':';
-    pos += printNumber(tSt.min, pos, 2);
+    pos += xmlEncodePrintNumber(tSt.min, pos, 2);
     *(pos++) = ':';
-    pos += printNumber(tSt.sec, pos, 2);
+    pos += xmlEncodePrintNumber(tSt.sec, pos, 2);
     *(pos++) = '.';
-    pos += printNumber(tSt.milliSec, pos, 3);
-    pos += printNumber(tSt.microSec, pos, 3);
-    pos += printNumber(tSt.nanoSec, pos, 3);
+    pos += xmlEncodePrintNumber(tSt.milliSec, pos, 3);
+    pos += xmlEncodePrintNumber(tSt.microSec, pos, 3);
+    pos += xmlEncodePrintNumber(tSt.nanoSec, pos, 3);
 
     UA_assert(pos <= &buffer[UA_XML_DATETIME_LENGTH]);
 
@@ -235,7 +235,7 @@ ENCODE_XML(DateTime) {
     *(++pos) = 'Z';
     UA_String str = {((uintptr_t)pos - (uintptr_t)buffer)+1, (UA_Byte*)buffer};
 
-    return writeChars(ctx, (const char*)str.data, str.length);
+    return xmlEncodeWriteChars(ctx, (const char*)str.data, str.length);
 }
 
 /* NodeId */
@@ -401,7 +401,7 @@ DECODE_XML(Boolean) {
 }
 
 static UA_StatusCode
-parseSignedInteger(const char *data, size_t dataSize, UA_Int64 *dst) {
+decodeSigned(const char *data, size_t dataSize, UA_Int64 *dst) {
     size_t len = parseInt64(data, dataSize, dst);
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -417,7 +417,7 @@ parseSignedInteger(const char *data, size_t dataSize, UA_Int64 *dst) {
 }
 
 static UA_StatusCode
-parseUnsignedInteger(const char *data, size_t dataSize, UA_UInt64 *dst) {
+decodeUnsigned(const char *data, size_t dataSize, UA_UInt64 *dst) {
     size_t len = parseUInt64(data, dataSize, dst);
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -438,7 +438,7 @@ DECODE_XML(SByte) {
      *   2. Add support for optional leading zeros.
      *   3. Check if the value is in hex, octal or binray. */
     UA_Int64 out = 0;
-    UA_StatusCode s = parseSignedInteger(ctx->data, ctx->length, &out);
+    UA_StatusCode s = decodeSigned(ctx->data, ctx->length, &out);
 
     if(s != UA_STATUSCODE_GOOD || out < UA_SBYTE_MIN || out > UA_SBYTE_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -454,7 +454,7 @@ DECODE_XML(Byte) {
      *   3. Check if the value is in hex, octal or binray.
      *   4. Check if decimal point exists. */
     UA_UInt64 out = 0;
-    UA_StatusCode s = parseUnsignedInteger(ctx->data, ctx->length, &out);
+    UA_StatusCode s = decodeUnsigned(ctx->data, ctx->length, &out);
 
     if(s != UA_STATUSCODE_GOOD || out > UA_BYTE_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -470,7 +470,7 @@ DECODE_XML(Int16) {
      *   3. Check if the value is in hex, octal or binray.
      *   4. Check if decimal point exists. */
     UA_Int64 out = 0;
-    UA_StatusCode s = parseSignedInteger(ctx->data, ctx->length, &out);
+    UA_StatusCode s = decodeSigned(ctx->data, ctx->length, &out);
 
     if(s != UA_STATUSCODE_GOOD || out < UA_INT16_MIN || out > UA_INT16_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -486,7 +486,7 @@ DECODE_XML(UInt16) {
      *   3. Check if the value is in hex, octal or binray.
      *   4. Check if decimal point exists. */
     UA_UInt64 out = 0;
-    UA_StatusCode s = parseUnsignedInteger(ctx->data, ctx->length, &out);
+    UA_StatusCode s = decodeUnsigned(ctx->data, ctx->length, &out);
 
     if(s != UA_STATUSCODE_GOOD || out > UA_UINT16_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -503,7 +503,7 @@ DECODE_XML(Int32) {
      *   4. Check if decimal point exists.
      *   5. Check "-0" and "+0", and just remove the sign. */
     UA_Int64 out = 0;
-    UA_StatusCode s = parseSignedInteger(ctx->data, ctx->length, &out);
+    UA_StatusCode s = decodeSigned(ctx->data, ctx->length, &out);
 
     if(s != UA_STATUSCODE_GOOD || out < UA_INT32_MIN || out > UA_INT32_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -519,7 +519,7 @@ DECODE_XML(UInt32) {
      *   3. Check if the value is in hex, octal or binray.
      *   4. Check if decimal point exists. */
     UA_UInt64 out = 0;
-    UA_StatusCode s = parseUnsignedInteger(ctx->data, ctx->length, &out);
+    UA_StatusCode s = decodeUnsigned(ctx->data, ctx->length, &out);
 
     if(s != UA_STATUSCODE_GOOD || out > UA_UINT32_MAX)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -535,7 +535,7 @@ DECODE_XML(Int64) {
      *   3. Check if the value is in hex, octal or binray.
      *   4. Check if decimal point exists. */
     UA_Int64 out = 0;
-    UA_StatusCode s = parseSignedInteger(ctx->data, ctx->length, &out);
+    UA_StatusCode s = decodeSigned(ctx->data, ctx->length, &out);
 
     if(s != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -551,7 +551,7 @@ DECODE_XML(UInt64) {
      *   3. Check if the value is in hex, octal or binray.
      *   4. Check if decimal point exists. */
     UA_UInt64 out = 0;
-    UA_StatusCode s = parseUnsignedInteger(ctx->data, ctx->length, &out);
+    UA_StatusCode s = decodeUnsigned(ctx->data, ctx->length, &out);
 
     if(s != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;

From 8c6be6385a3337f13c00e6b692ebaf6ae10a38de Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Tue, 15 Nov 2022 10:59:48 +0100
Subject: [PATCH 0526/1963] fix(tests): Fix unit tests of xml en/decoding for
 gcc 32-bit and clang

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 src/ua_types_encoding_xml.c     |  2 +-
 tests/check_types_builtin_xml.c | 30 ++++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/ua_types_encoding_xml.c b/src/ua_types_encoding_xml.c
index 49825ce745a..d0b80e8710d 100644
--- a/src/ua_types_encoding_xml.c
+++ b/src/ua_types_encoding_xml.c
@@ -831,4 +831,4 @@ UA_decodeXml(const UA_ByteString *src, void *dst, const UA_DataType *type,
         memset(dst, 0, type->memSize);
     }
     return ret;
-}
\ No newline at end of file
+}
diff --git a/tests/check_types_builtin_xml.c b/tests/check_types_builtin_xml.c
index e832bbdc089..3c8a69179e1 100644
--- a/tests/check_types_builtin_xml.c
+++ b/tests/check_types_builtin_xml.c
@@ -1665,13 +1665,24 @@ START_TEST(UA_Float_xml_nan_decode) {
 
     UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
 
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+#if (defined(__GNUC__) && (defined(__armhf__) || defined(__i386__))) || \
+    (defined(__linux__) && defined(__clang__))
+    // gcc 32-bit and linux clang specific
+    // 0 11111111 10000000000000000000000
+    // 7f c0 00 00
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0xc0);
+    ck_assert_int_eq(((u8*)&out)[3], 0x7f);
+#else
     // 1 11111111 10000000000000000000000
     // ff c0 00 00
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)&out)[0], 0x00);
     ck_assert_int_eq(((u8*)&out)[1], 0x00);
     ck_assert_int_eq(((u8*)&out)[2], 0xc0);
     ck_assert_int_eq(((u8*)&out)[3], 0xff);
+#endif
 
     UA_Float val = out;
     ck_assert(val != val); /* Check if not a number */
@@ -1792,9 +1803,23 @@ START_TEST(UA_Double_nan_xml_decode) {
 
     UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
 
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+#if (defined(__GNUC__) && (defined(__armhf__) || defined(__i386__))) || \
+    (defined(__linux__) && defined(__clang__))
+    // gcc 32-bit and linux clang specific
+    // 0 11111111111 1000000000000000000000000000000000000000000000000000
+    // ff f8 00 00 00 00 00 00
+    ck_assert_int_eq(((u8*)&out)[0], 0x00);
+    ck_assert_int_eq(((u8*)&out)[1], 0x00);
+    ck_assert_int_eq(((u8*)&out)[2], 0x00);
+    ck_assert_int_eq(((u8*)&out)[3], 0x00);
+    ck_assert_int_eq(((u8*)&out)[4], 0x00);
+    ck_assert_int_eq(((u8*)&out)[5], 0x00);
+    ck_assert_int_eq(((u8*)&out)[6], 0xf8);
+    ck_assert_int_eq(((u8*)&out)[7], 0x7f);
+#else
     // 1 11111111111 1000000000000000000000000000000000000000000000000000
     // ff f8 00 00 00 00 00 00
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(((u8*)&out)[0], 0x00);
     ck_assert_int_eq(((u8*)&out)[1], 0x00);
     ck_assert_int_eq(((u8*)&out)[2], 0x00);
@@ -1803,6 +1828,7 @@ START_TEST(UA_Double_nan_xml_decode) {
     ck_assert_int_eq(((u8*)&out)[5], 0x00);
     ck_assert_int_eq(((u8*)&out)[6], 0xf8);
     ck_assert_int_eq(((u8*)&out)[7], 0xff);
+#endif
 
     UA_Double val = out;
     ck_assert(val != val); /* Check if not a number */

From 3aa55f8866e63e19bb8d40645911ab21cf6ec996 Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Thu, 3 Nov 2022 09:58:21 +0100
Subject: [PATCH 0527/1963] feat(test): Add memory consumption test for
 nodesetLoader

Add script that measures heap memory usage for
the nodesetLoader. Include all currently supported
UA-Nodesets.

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 tests/nodeset-loader/check_memory.sh | 511 +++++++++++++++++++++++++++
 1 file changed, 511 insertions(+)
 create mode 100644 tests/nodeset-loader/check_memory.sh

diff --git a/tests/nodeset-loader/check_memory.sh b/tests/nodeset-loader/check_memory.sh
new file mode 100644
index 00000000000..586c70cfff5
--- /dev/null
+++ b/tests/nodeset-loader/check_memory.sh
@@ -0,0 +1,511 @@
+#!/usr/bin/env bash
+
+# Test case for all standardized companion nodesets. You can
+# find the specifications at https://github.com/OPCFoundation/UA-Nodeset.
+#      - branch: latest
+#      - commit: a2208e8
+# 
+# Currently this test case is missing the following UA-Nodesets:
+#   * NodesetLoader related issues:
+#      - ${OPEN62541_NODESET_DIR}AML/Opc.Ua.AMLLibraries.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}ISA95-JOBCONTROL/opc.ua.isa95-jobcontrol.nodeset2.xml
+#      - ${OPEN62541_NODESET_DIR}PNRIO/Opc.Ua.PnRio.Nodeset2.xml
+#      - ${OPEN62541_NODESET_DIR}TMC/Opc.Ua.TMC.NodeSet2.xml
+#
+#   * Memory leak issues (libXML2 library related):
+#      - ${OPEN62541_NODESET_DIR}CNC/Opc.Ua.CNC.NodeSet.xml
+#      - ${OPEN62541_NODESET_DIR}IJT/Tightening/Opc.Ua.Ijt.Tightening.NodeSet2.xml
+#      - $(OPEN62541_NODESET_DIR)MachineVision/Opc.Ua.MachineVision.NodeSet2.xml
+#      - $(OPEN62541_NODESET_DIR)Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml
+#          - Dependent Nodesets:
+#             * $(OPEN62541_NODESET_DIR)Mining/DevelopmentSupport/Dozer/1.0.0/Opc.Ua.Mining.DevelopmentSupport.Dozer.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/DevelopmentSupport/RoofSupportSystem/1.0.0/Opc.Ua.Mining.DevelopmentSupport.RoofSupportSystem.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/Extraction/ShearerLoader/1.0.0/Opc.Ua.Mining.Extraction.ShearerLoader.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/Loading/General/1.0.0/Opc.Ua.Mining.Loading.General.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/Loading/HydraulicExcavator/1.0.0/Opc.Ua.Mining.Loading.HydraulicExcavator.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/MineralProcessing/RockCrusher/1.0.0/Opc.Ua.Mining.MineralProcessing.RockCrusher.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/PELOServices/FaceAlignmentSystem/1.0.0/Opc.Ua.Mining.PELOServices.FaceAlignmentSystem.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/PELOServices/General/1.0.0/Opc.Ua.Mining.PELOServices.General.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/TransportDumping/ArmouredFaceConveyor/1.0.0/Opc.Ua.Mining.TransportDumping.ArmouredFaceConveyor.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/TransportDumping/General/1.0.0/Opc.Ua.Mining.TransportDumping.General.NodeSet2.xml
+#             * $(OPEN62541_NODESET_DIR)Mining/TransportDumping/RearDumpTruck/1.0.0/Opc.Ua.Mining.TransportDumping.RearDumpTruck.NodeSet2.xml
+#      - $(OPEN62541_NODESET_DIR)PADIM/Opc.Ua.IRDI.NodeSet2.xml
+#          - Dependent Nodesets:
+#             * $(OPEN62541_NODESET_DIR)PADIM/Opc.Ua.PADIM.NodeSet2.xml
+#      - $(OPEN62541_NODESET_DIR)POWERLINK/Opc.Ua.POWERLINK.NodeSet2.xml
+#      - $(OPEN62541_NODESET_DIR)Pumps/Opc.Ua.Pumps.NodeSet2.xml
+#      - $(OPEN62541_NODESET_DIR)Scales/Opc.Ua.Scales.NodeSet2.xml
+#
+
+set -e
+IFS=
+
+function print_nodesets() {
+
+    echo "Nodesets:"
+    shift
+
+    for i in $@
+    do
+        echo "      $(basename $i)"
+    done
+}
+
+function total_memory_usage() {
+
+    echo -ne "Total memory usage: "
+
+    TEST_APP=$1
+    shift
+
+    touch tmp.log
+    valgrind --trace-children=yes --tool=memcheck --log-file=tmp.log $TEST_APP $@ &> /dev/null
+    grep -o -P '(?<=frees,\ ).*(?=\ bytes\ allocated)' tmp.log | echo "$(tail -n 1)" "B"
+    rm tmp.log
+}
+
+function memory_usage() {
+    echo -en "|\n-> "
+    print_nodesets $@
+    echo -en "|\n-> "
+    total_memory_usage $@
+    echo; echo
+}
+
+UA_NODESET_PATH=/usr/local/share/open62541/tools/ua-nodeset
+NODESETLOADER_TESTS_PATH=./../../build/bin/tests
+NODESETLOADER_TEST_APP=check_nodeset_loader_input
+
+echo "... ADI ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/ADI/Opc.Ua.Adi.NodeSet2.xml
+
+echo "... AMB ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/AMB/Opc.Ua.AMB.NodeSet2.xml
+
+echo "... AMLBaseTypes ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/AML/Opc.Ua.AMLBaseTypes.NodeSet2.xml
+
+echo "... AutoID ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/AutoID/Opc.Ua.AutoID.NodeSet2.xml
+
+echo "... CAS ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/CAS/Opc.Ua.CAS.NodeSet2.xml
+
+echo "... CommercialKitchenEquipment ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/CommercialKitchenEquipment/Opc.Ua.CommercialKitchenEquipment.NodeSet2.xml
+
+echo "... CSPPlusForMachine ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/CSPPlusForMachine/Opc.Ua.CSPPlusForMachine.NodeSet2.xml
+
+echo "... DEXPI ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DEXPI/Opc.Ua.DEXPI.NodeSet2.xml
+
+echo "... DI ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml
+
+echo "... DotNet ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DotNet/Opc.Ua.NodeSet.xml
+
+echo "... FDI5 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/FDI/Opc.Ua.Fdi5.NodeSet2.xml
+
+echo "... FDI7 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/FDI/Opc.Ua.Fdi7.NodeSet2.xml
+
+echo "... FDT ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/FDT/Opc.Ua.FDT.NodeSet.xml 
+
+echo "... GDS ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/GDS/Opc.Ua.Gds.NodeSet2.xml
+
+echo "... GDS.Part12 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/GDS/Opc.Ua.Gds.NodeSet2.Part12.xml
+
+echo "... Flat.Glass ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/Glass/Flat/Opc.Ua.Glass.NodeSet2.xml
+
+echo "... I4AAS ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/I4AAS/Opc.Ua.I4AAS.NodeSet2.xml
+
+echo "... IA ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml
+
+echo "... IA.examples ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml \
+             $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.examples.xml
+
+echo "... IEC61850-6 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-3.NodeSet2.xml \
+             $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-6.NodeSet2.xml
+echo "... IEC61850-7-3 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-3.NodeSet2.xml
+
+echo "... IEC61850-7-4 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-3.NodeSet2.xml \
+             $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-4.NodeSet2.xml
+
+echo "... IOLinkIODD ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/IOLink/Opc.Ua.IOLinkIODD.NodeSet2.xml
+
+echo "... IOLink ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/IOLink/Opc.Ua.IOLink.NodeSet2.xml
+
+echo "... ISA95 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/ISA-95/Opc.ISA95.NodeSet2.xml
+
+echo "... Machinery ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml
+
+echo "... Machinery.Examples ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.Examples.NodeSet2.xml 
+
+echo "... MachineTool ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml \
+             $UA_NODESET_PATH/MachineTool/Opc.Ua.MachineTool.NodeSet2.xml
+
+echo "... MDIS ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/MDIS/Opc.MDIS.NodeSet2.xml
+
+echo "... Mining.DevelopmentSupport.General ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/Mining/DevelopmentSupport/General/1.0.0/Opc.Ua.Mining.DevelopmentSupport.General.NodeSet2.xml
+
+echo "... Mining.Extraction.General ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/Mining/Extraction/General/1.0.0/Opc.Ua.Mining.Extraction.General.NodeSet2.xml
+
+echo "... Mining.MineralProcessing.General ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/Mining/MineralProcessing/General/1.0.0/Opc.Ua.Mining.MineralProcessing.General.NodeSet2.xml
+
+echo "... Mining.MonitoringSupervisionServices.General ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/Mining/MonitoringSupervisionServices/General/1.0.0/Opc.Ua.Mining.MonitoringSupervisionServices.General.NodeSet2.xml
+
+echo "... MTConnect ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/MTConnect/Opc.Ua.MTConnect.NodeSet2.xml
+
+echo "... OpenSCS ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/OpenSCS/Opc.Ua.OPENSCS.NodeSet2.xml
+
+echo "... PackML ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/PackML/Opc.Ua.PackML.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.Calender ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.01/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/Calender/1.00/Opc.Ua.PlasticsRubber.Extrusion.Calender.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.Calibrator ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/Calibrator/1.00/Opc.Ua.PlasticsRubber.Extrusion.Calibrator.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.Corrugator ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/HaulOff/1.00/Opc.Ua.PlasticsRubber.Extrusion.HaulOff.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/Corrugator/1.00/Opc.Ua.PlasticsRubber.Extrusion.Corrugator.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.Cutter ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/Cutter/1.00/Opc.Ua.PlasticsRubber.Extrusion.Cutter.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.Die ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/Die/1.00/Opc.Ua.PlasticsRubber.Extrusion.Die.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.Extruder ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/Extruder/1.00/Opc.Ua.PlasticsRubber.Extrusion.Extruder.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.ExtrusionLine ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/ExtrusionLine/1.00/Opc.Ua.PlasticsRubber.Extrusion.ExtrusionLine.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.Filter ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/Filter/1.00/Opc.Ua.PlasticsRubber.Extrusion.Filter.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.GeneralTypes ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml
+
+echo "1.01/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.01/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.HaulOff ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/HaulOff/1.00/Opc.Ua.PlasticsRubber.Extrusion.HaulOff.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.MeltPump ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/MeltPump/1.00/Opc.Ua.PlasticsRubber.Extrusion.MeltPump.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion.Pelletizer ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion/Pelletizer/1.00/Opc.Ua.PlasticsRubber.Extrusion.Pelletizer.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.Calender ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Calender/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Calender.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.Calibrator ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Calibrator/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Calibrator.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.Corrugator ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/HaulOff/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.HaulOff.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Corrugator/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Corrugator.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.Cutter ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Cutter/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Cutter.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.Die ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Die/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Die.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.Extruder ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Extruder/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Extruder.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.ExtrusionLine ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/ExtrusionLine/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.ExtrusionLine.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.Filter ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Filter/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Filter.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.GeneralTypes ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.HaulOff ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/HaulOff/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.HaulOff.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.MeltPump ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/MeltPump/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.MeltPump.NodeSet2.xml
+
+echo "... PlasticsRubber.Extrusion_v2.Pelletizer ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Pelletizer/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Pelletizer.NodeSet2.xml
+
+echo "... PlasticsRubber.GeneralTypes.1.02 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml
+
+echo "... PlasticsRubber.GeneralTypes.1.03 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml
+
+echo "... PlasticsRubber.HotRunner ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/HotRunner/1.00/Opc.Ua.PlasticsRubber.HotRunner.NodeSet2.xml
+
+echo "... PlasticsRubber.IMM2MES ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/IMM2MES/1.01/Opc.Ua.PlasticsRubber.IMM2MES.NodeSet2.xml
+
+echo "... PlasticsRubber.LDS ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/LDS/1.00/Opc.Ua.PlasticsRubber.LDS.NodeSet2.xml
+
+echo "... PlasticsRubber.TCD ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+             $UA_NODESET_PATH/PlasticsRubber/TCD/1.01/Opc.Ua.PlasticsRubber.TCD.NodeSet2.xml
+
+echo "... PLCopen.V1.02 ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml
+
+echo "... PNEM ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/PNEM/Opc.Ua.PnEm.NodeSet2.xml
+
+echo "... PROFINET ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/PROFINET/Opc.Ua.Pn.NodeSet2.xml
+
+echo "... Robotics ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Robotics/Opc.Ua.Robotics.NodeSet2.xml
+
+echo "... Safety ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/Safety/Opc.Ua.Safety.NodeSet2.xml
+
+echo "... Sercos ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Sercos/Sercos.NodeSet2.xml
+
+echo "... Weihenstephan ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/PackML/Opc.Ua.PackML.NodeSet2.xml \
+             $UA_NODESET_PATH/Weihenstephan/Opc.Ua.Weihenstephan.NodeSet2.xml
+
+echo "... Woodworking.Eumabois ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/Woodworking/Opc.Ua.Woodworking.NodeSet2.xml \
+             $UA_NODESET_PATH/Woodworking/Opc.Ua.Eumabois.Nodeset2.xml
+
+echo "... Woodworking ..."
+memory_usage $NODESETLOADER_TESTS_PATH/$NODESETLOADER_TEST_APP \
+             $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+             $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+             $UA_NODESET_PATH/Woodworking/Opc.Ua.Woodworking.NodeSet2.xml
\ No newline at end of file

From a3a86944dd2170c0f0c214092aafac8d4b55d645 Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Thu, 3 Nov 2022 10:13:30 +0100
Subject: [PATCH 0528/1963] feat(test): Custom data type access test for
 nodesetLoader

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 tests/nodeset-loader/CMakeLists.txt           | 22 ++++++
 .../check_nodeset_loader_compare_di.c         | 78 +++++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_compare_di.c

diff --git a/tests/nodeset-loader/CMakeLists.txt b/tests/nodeset-loader/CMakeLists.txt
index e5cd09096f4..25243fe0d42 100644
--- a/tests/nodeset-loader/CMakeLists.txt
+++ b/tests/nodeset-loader/CMakeLists.txt
@@ -10,4 +10,26 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     ua_add_test(check_nodeset_loader_plc.c)
     ua_add_test(check_nodeset_loader_input.c)
     ua_add_test(check_nodeset_loader_ua_nodeset.c)
+
+    set(GENERATE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/src_generated/tests")
+
+    # Generate types and namespace for DI
+    ua_generate_nodeset_and_datatypes(
+        NAME "nodesetloader-di"
+        FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
+        FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
+        NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
+        OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
+        FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
+        INTERNAL
+    )
+
+    add_executable(check_nodeset_loader_compare_di check_nodeset_loader_compare_di.c
+                   ${UA_NODESET_NODESETLOADER_DI_SOURCES}
+                   ${UA_TYPES_NODESETLOADER_DI_SOURCES}
+                   $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    add_dependencies(check_nodeset_loader_compare_di open62541-generator-ns-nodesetloader-di)
+    target_link_libraries(check_nodeset_loader_compare_di ${LIBS})
+    add_test_valgrind(check_nodeset_loader_compare_di ${TESTS_BINARY_DIR}/check_nodeset_loader_compare_di)
+
 endif()
diff --git a/tests/nodeset-loader/check_nodeset_loader_compare_di.c b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
new file mode 100644
index 00000000000..cb512ad685c
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
@@ -0,0 +1,78 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+#include <open62541/types.h>
+
+#include "check.h"
+#include "tests/namespace_nodesetloader_di_generated.h"
+#include "testing_clock.h"
+
+UA_Server *server = NULL;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_compareDiNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    ck_assert(config->customDataTypes);
+
+    for(int i = 0; i < UA_TYPES_NODESETLOADER_DI_COUNT; ++i) {
+        const UA_DataType *compiledType = &UA_TYPES_NODESETLOADER_DI[i];
+        const UA_DataType *loadedType = UA_Server_findDataType(server, &compiledType->typeId);
+
+        ck_assert(loadedType != NULL);
+        ck_assert(compiledType->typeKind == loadedType->typeKind);
+        ck_assert(compiledType->membersSize == loadedType->membersSize);
+        ck_assert(compiledType->memSize == loadedType->memSize);
+        ck_assert(compiledType->overlayable == loadedType->overlayable);
+        ck_assert(compiledType->pointerFree == loadedType->pointerFree);
+        ck_assert(!strcmp(compiledType->typeName, loadedType->typeName));
+
+        for(int j = 0; j < compiledType->membersSize; ++j) {
+            const UA_DataTypeMember *compMember = &compiledType->members[j];
+            const UA_DataTypeMember *loadMember = &loadedType->members[j];
+
+            ck_assert(compMember->isArray == loadMember->isArray);
+            ck_assert(UA_NodeId_equal(
+                &compMember->memberType->typeId, &loadMember->memberType->typeId));
+            ck_assert(compMember->padding == loadMember->padding);
+            ck_assert(compMember->isOptional == loadMember->isOptional);
+        }
+    }
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Loader");
+    TCase *tc_server = tcase_create("Compare DI Nodeset");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, Server_compareDiNodeset);
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
\ No newline at end of file

From 0f208d36a721f7f60a8a6ebd6653000547f8cc88 Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Thu, 3 Nov 2022 10:40:05 +0100
Subject: [PATCH 0529/1963] feat(test): Add testnodeset test for nodesetLoader

Import testnodeset.xml file used in test cases of the
nodeset-compiler. This test case is missing to have parity
between compiler and loader when testing.

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 tests/nodeset-loader/CMakeLists.txt           |   3 +
 .../check_nodeset_loader_testnodeset.c        | 281 ++++++++++++++++++
 2 files changed, 284 insertions(+)
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_testnodeset.c

diff --git a/tests/nodeset-loader/CMakeLists.txt b/tests/nodeset-loader/CMakeLists.txt
index 25243fe0d42..a526939a9c4 100644
--- a/tests/nodeset-loader/CMakeLists.txt
+++ b/tests/nodeset-loader/CMakeLists.txt
@@ -32,4 +32,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     target_link_libraries(check_nodeset_loader_compare_di ${LIBS})
     add_test_valgrind(check_nodeset_loader_compare_di ${TESTS_BINARY_DIR}/check_nodeset_loader_compare_di)
 
+    add_compile_definitions(OPEN62541_TESTNODESET_DIR="${CMAKE_BINARY_DIR}/../deps/nodesetloader/nodesets/open62541/")
+    ua_add_test(check_nodeset_loader_testnodeset.c)
+
 endif()
diff --git a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
new file mode 100644
index 00000000000..d01a55e5560
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
@@ -0,0 +1,281 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+#include <open62541/types.h>
+
+#include "check.h"
+#include "testing_clock.h"
+#include "unistd.h"
+
+UA_Server *server = NULL;
+UA_UInt16 testNamespaceIndex = (UA_UInt16) -1;
+
+typedef enum {
+    UA_SELFCONTAININGUNIONSWITCH_NONE = 0,
+    UA_SELFCONTAININGUNIONSWITCH_DOUBLE = 1,
+    UA_SELFCONTAININGUNIONSWITCH_ARRAY = 2,
+    __UA_SELFCONTAININGUNIONSWITCH_FORCE32BIT = 0x7fffffff
+} UA_SelfContainingUnionSwitch;
+
+typedef struct UA_SelfContainingUnion UA_SelfContainingUnion;
+struct UA_SelfContainingUnion {
+    UA_SelfContainingUnionSwitch switchField;
+    union {
+        UA_Double _double;
+        struct {
+            size_t arraySize;
+            UA_SelfContainingUnion *array;
+        } array;
+    } fields;
+};
+
+typedef struct {
+    UA_Double x;
+    UA_Double y;
+} UA_Point;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_loadDiNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+START_TEST(Server_loadTestNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_TESTNODESET_DIR "testnodeset.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+    size_t nsIndex = (size_t) -1;
+    UA_Server_getNamespaceByName(server, UA_STRING("http://yourorganisation.org/test/"), &nsIndex);
+    ck_assert(nsIndex != (size_t)-1);
+    testNamespaceIndex = (UA_UInt16) nsIndex;
+}
+END_TEST
+
+START_TEST(checkScalarValues) {
+    UA_Variant out;
+    UA_Variant_init(&out);
+    // Point_scalar_Init
+    UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &out);
+    ck_assert(UA_Variant_isScalar(&out));
+    UA_Point *p = (UA_Point *)out.data;
+    ck_assert(p->x == (UA_Double)1.0);
+    ck_assert(p->y == (UA_Double)2.0);
+    UA_Variant_clear(&out);
+    // Point_scalar_noInit
+
+    /* TODO: Check error when reading
+     *       this particular value */
+    // UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10005), &out);
+    // ck_assert(out.data != NULL); /* a default value is generated */
+    // UA_Variant_clear(&out);
+}
+END_TEST
+
+START_TEST(checkSelfContainingUnion) {
+    // Check union switch enum
+    ck_assert(UA_SELFCONTAININGUNIONSWITCH_NONE == 0);
+    ck_assert(UA_SELFCONTAININGUNIONSWITCH_DOUBLE == 1);
+    ck_assert(UA_SELFCONTAININGUNIONSWITCH_ARRAY == 2);
+
+    UA_Variant in;
+    UA_Variant_init(&in);
+
+    UA_SelfContainingUnion data;
+    memset(&data, 0, sizeof(UA_SelfContainingUnion));
+
+    data.fields._double = 23.0;
+    data.fields.array.arraySize = 0;
+    data.fields.array.array = NULL;
+
+    /* ns=1;i=4002 */
+    UA_NodeId testNsSelfContainingUnionId = UA_NODEID_NUMERIC(testNamespaceIndex, 4002);
+    const UA_DataType *selfContainingUnionType = UA_Server_findDataType(server, &testNsSelfContainingUnionId);
+
+    UA_Variant_setScalar(&in, &data, selfContainingUnionType);
+
+    UA_StatusCode result = UA_Server_writeValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 5110), in);
+
+    ck_assert(result == UA_STATUSCODE_GOOD);
+}
+END_TEST
+
+START_TEST(check1dimValues) {
+    UA_Variant out;
+    UA_Variant_init(&out);
+    // Point_1dim_noInit
+    UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10007), &out);
+    ck_assert(!UA_Variant_isScalar(&out));
+    ck_assert(out.arrayDimensionsSize == 0);
+    ck_assert(out.arrayDimensions == NULL);
+    UA_Variant_clear(&out);
+    // Point_1dim_init
+    UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10004), &out);
+    UA_Point *p = (UA_Point *)out.data;
+    ck_assert(!UA_Variant_isScalar(&out));
+    ck_assert(out.arrayLength == 4);
+    ck_assert(out.arrayDimensionsSize == 0);
+    ck_assert(p[0].x == (UA_Double)1.0);
+    ck_assert(p[3].y == (UA_Double)8.0);
+    UA_Variant_clear(&out);
+}
+END_TEST
+
+START_TEST(readValueRank) {
+    UA_Int32 rank;
+    UA_Variant dims;
+    // scalar
+    UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &rank);
+    ck_assert_int_eq(rank, -2);
+    UA_Variant_init(&dims);
+    UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &dims);
+    ck_assert_uint_eq(dims.arrayLength, 0);
+    UA_Variant_clear(&dims);
+    // 1-dim
+    UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10007), &rank);
+    ck_assert_int_eq(rank, 1);
+    UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10007), &dims);
+    ck_assert_uint_eq(dims.arrayLength, 1);
+    ck_assert_int_eq(*((UA_UInt32 *)dims.data), 0);
+    UA_Variant_clear(&dims);
+    UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10004), &rank);
+    ck_assert_int_eq(rank, 1);
+    UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10004), &dims);
+    ck_assert_uint_eq(dims.arrayLength, 1);
+    ck_assert_int_eq(*((UA_UInt32 *)dims.data), 4);
+    UA_Variant_clear(&dims);
+    // 2-dim
+    UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10006), &rank);
+    ck_assert_int_eq(rank, 2);
+    UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10006), &dims);
+    ck_assert_uint_eq(dims.arrayLength, 2);
+    UA_UInt32 *dimensions = (UA_UInt32 *)dims.data;
+    ck_assert_int_eq(dimensions[0], 2);
+    ck_assert_int_eq(dimensions[1], 2);
+    UA_Variant_clear(&dims);
+}
+END_TEST
+
+START_TEST(checkFrameValues) {
+    UA_Variant out;
+    UA_Variant_init(&out);
+    // Frame variable
+    UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 15235), &out);
+    ck_assert(out.type == &UA_TYPES[UA_TYPES_THREEDFRAME]);
+    UA_ThreeDFrame *f = (UA_ThreeDFrame *)out.data;
+    ck_assert(UA_Variant_isScalar(&out));
+    ck_assert(out.arrayLength == 0);
+    ck_assert(out.arrayDimensionsSize == 0);
+    ck_assert(f[0].cartesianCoordinates.x == (UA_Double)0.123);
+    ck_assert(f[0].cartesianCoordinates.y == (UA_Double)456.7);
+    ck_assert(f[0].cartesianCoordinates.z == (UA_Double)89);
+    ck_assert(f[0].orientation.a == (UA_Double)0.12);
+    ck_assert(f[0].orientation.b == (UA_Double)3.4);
+    ck_assert(f[0].orientation.c == (UA_Double)56);
+    UA_Variant_clear(&out);
+}
+END_TEST
+
+/* TODO: Enable successful execution
+ *       of this test case. */
+// START_TEST(checkInputArguments) {
+//     UA_Variant out;
+//     UA_Variant_init(&out);
+//     // Check argument
+//     UA_StatusCode status = UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 6020), &out);
+//     ck_assert(status == UA_STATUSCODE_GOOD);
+//     ck_assert(out.type == &UA_TYPES[UA_TYPES_ARGUMENT]);
+//     UA_Argument *p = (UA_Argument *)out.data;
+//     ck_assert(p->dataType.identifierType == UA_NODEIDTYPE_NUMERIC);
+//     ck_assert(p->dataType.identifier.numeric == (UA_UInt32) 3006);
+//     ck_assert(p->dataType.namespaceIndex == (UA_UInt16) testNamespaceIndex);
+//     UA_Variant_clear(&out);
+// }
+// END_TEST
+
+START_TEST(checkGuid) {
+    UA_Variant out;
+    UA_Variant_init(&out);
+    UA_StatusCode status = UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 7051), &out);
+    ck_assert(status == UA_STATUSCODE_GOOD);
+    ck_assert(out.type == &UA_TYPES[UA_TYPES_GUID]);
+    UA_Guid *scalarData = (UA_Guid *)out.data;
+    UA_Guid scalarGuidVal = UA_GUID("7822a391-de79-4a59-b08d-b70bc63fecec");
+    ck_assert(UA_Guid_equal(scalarData, &scalarGuidVal));
+    UA_Variant_clear(&out);
+    status = UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 7052), &out);
+    ck_assert(status == UA_STATUSCODE_GOOD);
+    ck_assert(out.type == &UA_TYPES[UA_TYPES_GUID]);
+    ck_assert(out.arrayLength == 3);
+    UA_Guid *ArrayData = (UA_Guid *)out.data;
+    UA_Guid ArrayGuidVal[3] = {UA_GUID("7822a391-1111-4a59-b08d-b70bc63fecec"),
+                               UA_GUID("7822a391-2222-4a59-b08d-b70bc63fecec"),
+                               UA_GUID("7822a391-3333-4a59-b08d-b70bc63fecec")};
+    ck_assert(UA_Guid_equal(&ArrayData[0], &ArrayGuidVal[0]));
+    ck_assert(UA_Guid_equal(&ArrayData[1], &ArrayGuidVal[1]));
+    ck_assert(UA_Guid_equal(&ArrayData[2], &ArrayGuidVal[2]));
+    UA_Variant_clear(&out);
+}
+END_TEST
+
+/* TODO: Enable successful execution
+ *       of this test case. */
+// START_TEST(checkDataSetMetaData) {
+//     UA_Variant out;
+//     UA_Variant_init(&out);
+//     UA_StatusCode status = UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 6021), &out);
+//     ck_assert(status == UA_STATUSCODE_GOOD);
+//     ck_assert(out.type == &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
+//     UA_DataSetMetaDataType *p = (UA_DataSetMetaDataType *)out.data;
+//     UA_String dataSetName = UA_STRING("DataSetName");
+//     ck_assert(UA_String_equal(&p->name, &dataSetName) == UA_TRUE);
+//     ck_assert(p->fieldsSize == 1);
+//     UA_String fieldName = UA_STRING("FieldName");
+//     ck_assert(UA_String_equal(&p->fields[0].name, &fieldName) == UA_TRUE);
+//     UA_Guid guid = UA_GUID("10000000-2000-3000-4000-500000000000");
+//     ck_assert(UA_Guid_equal(&p->dataSetClassId, &guid) == UA_TRUE);
+
+//     UA_Variant_clear(&out);
+// }
+// END_TEST
+
+static Suite *testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Compiler");
+    TCase *tc_server = tcase_create("Server Testnodeset");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, Server_loadDiNodeset);
+    tcase_add_test(tc_server, Server_loadTestNodeset);
+    tcase_add_test(tc_server, checkScalarValues);
+    tcase_add_test(tc_server, checkSelfContainingUnion);
+    tcase_add_test(tc_server, check1dimValues);
+    tcase_add_test(tc_server, readValueRank);
+    tcase_add_test(tc_server, checkFrameValues);
+    tcase_add_test(tc_server, checkGuid);
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 84c2ebcc33ef57c607d43573349c5f015f39f211 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 16 Nov 2022 22:05:01 +0100
Subject: [PATCH 0530/1963] refactor(core): Replace static inline with
 UA_INLINABLE in types.h

---
 include/open62541/types.h | 317 ++++++++++++++++++++------------------
 1 file changed, 168 insertions(+), 149 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index b3d1f79e72f..1348d22cd3a 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -159,21 +159,29 @@ UA_StatusCode_name(UA_StatusCode code);
 
 /* Extracts the severity from a StatusCode. See Part 4, Section 7.34 for
  * details. */
-UA_INLINABLE(UA_Boolean UA_StatusCode_isBad(UA_StatusCode code),
-             { return ((code >> 30) >= 0x02); })
+UA_INLINABLE(UA_Boolean
+             UA_StatusCode_isBad(UA_StatusCode code), {
+    return ((code >> 30) >= 0x02);
+})
 
-UA_INLINABLE(UA_Boolean UA_StatusCode_isUncertain(UA_StatusCode code),
-             { return ((code >> 30) == 0x01); })
+UA_INLINABLE(UA_Boolean
+             UA_StatusCode_isUncertain(UA_StatusCode code), {
+    return ((code >> 30) == 0x01);
+})
 
-UA_INLINABLE(UA_Boolean UA_StatusCode_isGood(UA_StatusCode code),
-             { return ((code >> 30) == 0x00); })
+UA_INLINABLE(UA_Boolean
+             UA_StatusCode_isGood(UA_StatusCode code), {
+    return ((code >> 30) == 0x00);
+})
 
 /* Compares the top 16 bits of two StatusCodes for equality. This should only
  * be used when processing user-defined StatusCodes e.g when processing a ReadResponse.
  * As a convention, the lower bits of StatusCodes should not be used internally, meaning
  * can compare them without the use of this function. */
-UA_INLINABLE(UA_Boolean UA_StatusCode_isEqualTop(UA_StatusCode s1, UA_StatusCode s2),
-             { return ((s1 & 0xFFFF0000) == (s2 & 0xFFFF0000)); })
+UA_INLINABLE(UA_Boolean
+             UA_StatusCode_isEqualTop(UA_StatusCode s1, UA_StatusCode s2), {
+    return ((s1 & 0xFFFF0000) == (s2 & 0xFFFF0000));
+})
 
 /**
  * String
@@ -200,7 +208,8 @@ UA_EXPORT extern const UA_String UA_STRING_NULL;
  * ``UA_STRING`` returns a string pointing to the original char-array.
  * ``UA_STRING_ALLOC`` is shorthand for ``UA_String_fromChars`` and makes a copy
  * of the char-array. */
-UA_INLINABLE(UA_String UA_STRING(char *chars), {
+UA_INLINABLE(UA_String
+             UA_STRING(char *chars), {
     UA_String s = {0};
     if(!chars)
         return s;
@@ -270,15 +279,15 @@ UA_DateTime UA_EXPORT UA_DateTime_fromStruct(UA_DateTimeStruct ts);
 /* Datetime of 1 Jan 1970 00:00 */
 #define UA_DATETIME_UNIX_EPOCH (11644473600LL * UA_DATETIME_SEC)
 
-static UA_INLINE UA_Int64
-UA_DateTime_toUnixTime(UA_DateTime date) {
+UA_INLINABLE(UA_Int64
+             UA_DateTime_toUnixTime(UA_DateTime date), {
     return (date - UA_DATETIME_UNIX_EPOCH) / UA_DATETIME_SEC;
-}
+})
 
-static UA_INLINE UA_DateTime
-UA_DateTime_fromUnixTime(UA_Int64 unixDate) {
+UA_INLINABLE(UA_DateTime
+             UA_DateTime_fromUnixTime(UA_Int64 unixDate), {
     return (unixDate * UA_DATETIME_SEC) + UA_DATETIME_UNIX_EPOCH;
-}
+})
 
 /**
  * Guid
@@ -312,12 +321,12 @@ UA_Guid_print(const UA_Guid *guid, UA_String *output);
 UA_StatusCode UA_EXPORT
 UA_Guid_parse(UA_Guid *guid, const UA_String str);
 
-static UA_INLINE UA_Guid
-UA_GUID(const char *chars) {
+UA_INLINABLE(UA_Guid
+             UA_GUID(const char *chars), {
     UA_Guid guid;
     UA_Guid_parse(&guid, UA_STRING((char*)(uintptr_t)chars));
     return guid;
-}
+})
 #endif
 
 /**
@@ -336,34 +345,17 @@ UA_ByteString_allocBuffer(UA_ByteString *bs, size_t length);
 /* Converts a ByteString to the corresponding
  * base64 representation */
 UA_StatusCode UA_EXPORT
-UA_ByteString_toBase64(const UA_ByteString *bs,
-                       UA_String *output);
+UA_ByteString_toBase64(const UA_ByteString *bs, UA_String *output);
 
 /* Parse a ByteString from a base64 representation */
 UA_StatusCode UA_EXPORT
 UA_ByteString_fromBase64(UA_ByteString *bs,
                          const UA_String *input);
 
-static UA_INLINE UA_ByteString
-UA_BYTESTRING(char *chars) {
-    UA_ByteString bs; bs.length = 0; bs.data = NULL;
-    if(!chars)
-        return bs;
-    bs.length = strlen(chars); bs.data = (UA_Byte*)chars; return bs;
-}
-
-static UA_INLINE UA_ByteString
-UA_BYTESTRING_ALLOC(const char *chars) {
-    UA_String str = UA_String_fromChars(chars); UA_ByteString bstr;
-    bstr.length = str.length; bstr.data = str.data; return bstr;
-}
-
-static UA_INLINE UA_Boolean
-UA_ByteString_equal(const UA_ByteString *string1,
-                    const UA_ByteString *string2) {
-    return UA_String_equal((const UA_String*)string1,
-                           (const UA_String*)string2);
-}
+#define UA_BYTESTRING(chars) UA_STRING(chars)
+#define UA_BYTESTRING_ALLOC(chars) UA_STRING_ALLOC(chars)
+
+#define UA_ByteString_equal(s1, s2) UA_String_equal(s1, s2)
 
 /* Returns a non-cryptographic hash of a bytestring */
 UA_UInt32 UA_EXPORT
@@ -428,66 +420,81 @@ UA_NodeId_print(const UA_NodeId *id, UA_String *output);
 UA_StatusCode UA_EXPORT
 UA_NodeId_parse(UA_NodeId *id, const UA_String str);
 
-static UA_INLINE UA_NodeId
-UA_NODEID(const char *chars) {
+UA_INLINABLE(UA_NodeId
+             UA_NODEID(const char *chars), {
     UA_NodeId id;
     UA_NodeId_parse(&id, UA_STRING((char*)(uintptr_t)chars));
     return id;
-}
+})
 #endif
 
-/** The following functions are shorthand for creating NodeIds. */
-static UA_INLINE UA_NodeId
-UA_NODEID_NUMERIC(UA_UInt16 nsIndex, UA_UInt32 identifier) {
-    UA_NodeId id; id.namespaceIndex = nsIndex;
+/** The following methods are a shorthand for creating NodeIds. */
+UA_INLINABLE(UA_NodeId
+             UA_NODEID_NUMERIC(UA_UInt16 nsIndex,
+                               UA_UInt32 identifier), {
+    UA_NodeId id;
+    id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_NUMERIC;
-    id.identifier.numeric = identifier; return id;
-}
+    id.identifier.numeric = identifier;
+    return id;
+})
 
-static UA_INLINE UA_NodeId
-UA_NODEID_STRING(UA_UInt16 nsIndex, char *chars) {
-    UA_NodeId id; id.namespaceIndex = nsIndex;
+UA_INLINABLE(UA_NodeId
+             UA_NODEID_STRING(UA_UInt16 nsIndex, char *chars), {
+    UA_NodeId id;
+    id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_STRING;
-    id.identifier.string = UA_STRING(chars); return id;
-}
+    id.identifier.string = UA_STRING(chars);
+    return id;
+})
 
-static UA_INLINE UA_NodeId
-UA_NODEID_STRING_ALLOC(UA_UInt16 nsIndex, const char *chars) {
-    UA_NodeId id; id.namespaceIndex = nsIndex;
+UA_INLINABLE(UA_NodeId
+             UA_NODEID_STRING_ALLOC(UA_UInt16 nsIndex,
+                                    const char *chars), {
+    UA_NodeId id;
+    id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_STRING;
-    id.identifier.string = UA_STRING_ALLOC(chars); return id;
-}
+    id.identifier.string = UA_STRING_ALLOC(chars);
+    return id;
+})
 
-static UA_INLINE UA_NodeId
-UA_NODEID_GUID(UA_UInt16 nsIndex, UA_Guid guid) {
-    UA_NodeId id; id.namespaceIndex = nsIndex;
+UA_INLINABLE(UA_NodeId
+             UA_NODEID_GUID(UA_UInt16 nsIndex, UA_Guid guid), {
+    UA_NodeId id;
+    id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_GUID;
-    id.identifier.guid = guid; return id;
-}
+    id.identifier.guid = guid;
+    return id;
+})
 
-static UA_INLINE UA_NodeId
-UA_NODEID_BYTESTRING(UA_UInt16 nsIndex, char *chars) {
-    UA_NodeId id; id.namespaceIndex = nsIndex;
+UA_INLINABLE(UA_NodeId
+             UA_NODEID_BYTESTRING(UA_UInt16 nsIndex, char *chars), {
+    UA_NodeId id;
+    id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_BYTESTRING;
-    id.identifier.byteString = UA_BYTESTRING(chars); return id;
-}
+    id.identifier.byteString = UA_BYTESTRING(chars);
+    return id;
+})
 
-static UA_INLINE UA_NodeId
-UA_NODEID_BYTESTRING_ALLOC(UA_UInt16 nsIndex, const char *chars) {
-    UA_NodeId id; id.namespaceIndex = nsIndex;
+UA_INLINABLE(UA_NodeId
+             UA_NODEID_BYTESTRING_ALLOC(UA_UInt16 nsIndex,
+                                        const char *chars), {
+    UA_NodeId id;
+    id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_BYTESTRING;
-    id.identifier.byteString = UA_BYTESTRING_ALLOC(chars); return id;
-}
+    id.identifier.byteString = UA_BYTESTRING_ALLOC(chars);
+    return id;
+})
 
 /* Total ordering of NodeId */
 UA_Order UA_EXPORT
 UA_NodeId_order(const UA_NodeId *n1, const UA_NodeId *n2);
 
 /* Check for equality */
-static UA_INLINE UA_Boolean
-UA_NodeId_equal(const UA_NodeId *n1, const UA_NodeId *n2) {
+UA_INLINABLE(UA_Boolean
+             UA_NodeId_equal(const UA_NodeId *n1, const UA_NodeId *n2), {
     return (UA_NodeId_order(n1, n2) == UA_ORDER_EQ);
-}
+})
 
 /* Returns a non-cryptographic hash for NodeId */
 UA_UInt32 UA_EXPORT UA_NodeId_hash(const UA_NodeId *n);
@@ -525,55 +532,56 @@ UA_ExpandedNodeId_print(const UA_ExpandedNodeId *id, UA_String *output);
 UA_StatusCode UA_EXPORT
 UA_ExpandedNodeId_parse(UA_ExpandedNodeId *id, const UA_String str);
 
-static UA_INLINE UA_ExpandedNodeId
-UA_EXPANDEDNODEID(const char *chars) {
+UA_INLINABLE(UA_ExpandedNodeId
+             UA_EXPANDEDNODEID(const char *chars), {
     UA_ExpandedNodeId id;
     UA_ExpandedNodeId_parse(&id, UA_STRING((char*)(uintptr_t)chars));
     return id;
-}
+})
 #endif
 
 /** The following functions are shorthand for creating ExpandedNodeIds. */
-static UA_INLINE UA_ExpandedNodeId
-UA_EXPANDEDNODEID_NUMERIC(UA_UInt16 nsIndex, UA_UInt32 identifier) {
+UA_INLINABLE(UA_ExpandedNodeId
+             UA_EXPANDEDNODEID_NUMERIC(UA_UInt16 nsIndex, UA_UInt32 identifier), {
     UA_ExpandedNodeId id; id.nodeId = UA_NODEID_NUMERIC(nsIndex, identifier);
     id.serverIndex = 0; id.namespaceUri = UA_STRING_NULL; return id;
-}
+})
 
-static UA_INLINE UA_ExpandedNodeId
-UA_EXPANDEDNODEID_STRING(UA_UInt16 nsIndex, char *chars) {
+UA_INLINABLE(UA_ExpandedNodeId
+             UA_EXPANDEDNODEID_STRING(UA_UInt16 nsIndex, char *chars), {
     UA_ExpandedNodeId id; id.nodeId = UA_NODEID_STRING(nsIndex, chars);
     id.serverIndex = 0; id.namespaceUri = UA_STRING_NULL; return id;
-}
+})
 
-static UA_INLINE UA_ExpandedNodeId
-UA_EXPANDEDNODEID_STRING_ALLOC(UA_UInt16 nsIndex, const char *chars) {
+UA_INLINABLE(UA_ExpandedNodeId
+             UA_EXPANDEDNODEID_STRING_ALLOC(UA_UInt16 nsIndex, const char *chars), {
     UA_ExpandedNodeId id; id.nodeId = UA_NODEID_STRING_ALLOC(nsIndex, chars);
     id.serverIndex = 0; id.namespaceUri = UA_STRING_NULL; return id;
-}
+})
 
-static UA_INLINE UA_ExpandedNodeId
-UA_EXPANDEDNODEID_STRING_GUID(UA_UInt16 nsIndex, UA_Guid guid) {
+UA_INLINABLE(UA_ExpandedNodeId
+             UA_EXPANDEDNODEID_STRING_GUID(UA_UInt16 nsIndex, UA_Guid guid), {
     UA_ExpandedNodeId id; id.nodeId = UA_NODEID_GUID(nsIndex, guid);
     id.serverIndex = 0; id.namespaceUri = UA_STRING_NULL; return id;
-}
+})
 
-static UA_INLINE UA_ExpandedNodeId
-UA_EXPANDEDNODEID_BYTESTRING(UA_UInt16 nsIndex, char *chars) {
+UA_INLINABLE(UA_ExpandedNodeId
+             UA_EXPANDEDNODEID_BYTESTRING(UA_UInt16 nsIndex, char *chars), {
     UA_ExpandedNodeId id; id.nodeId = UA_NODEID_BYTESTRING(nsIndex, chars);
     id.serverIndex = 0; id.namespaceUri = UA_STRING_NULL; return id;
-}
+})
 
-static UA_INLINE UA_ExpandedNodeId
-UA_EXPANDEDNODEID_BYTESTRING_ALLOC(UA_UInt16 nsIndex, const char *chars) {
+UA_INLINABLE(UA_ExpandedNodeId
+             UA_EXPANDEDNODEID_BYTESTRING_ALLOC(UA_UInt16 nsIndex, const char *chars), {
     UA_ExpandedNodeId id; id.nodeId = UA_NODEID_BYTESTRING_ALLOC(nsIndex, chars);
     id.serverIndex = 0; id.namespaceUri = UA_STRING_NULL; return id;
-}
+})
 
-static UA_INLINE UA_ExpandedNodeId
-UA_EXPANDEDNODEID_NODEID(UA_NodeId nodeId) {
-    UA_ExpandedNodeId id; memset(&id, 0, sizeof(UA_ExpandedNodeId)); id.nodeId = nodeId; return id;
-}
+UA_INLINABLE(UA_ExpandedNodeId
+             UA_EXPANDEDNODEID_NODEID(UA_NodeId nodeId), {
+    UA_ExpandedNodeId id; memset(&id, 0, sizeof(UA_ExpandedNodeId));
+    id.nodeId = nodeId; return id;
+})
 
 /* Does the ExpandedNodeId point to a local node? That is, are namespaceUri and
  * serverIndex empty? */
@@ -586,11 +594,11 @@ UA_ExpandedNodeId_order(const UA_ExpandedNodeId *n1,
                         const UA_ExpandedNodeId *n2);
 
 /* Check for equality */
-static UA_INLINE UA_Boolean
-UA_ExpandedNodeId_equal(const UA_ExpandedNodeId *n1,
-                        const UA_ExpandedNodeId *n2) {
+UA_INLINABLE(UA_Boolean
+             UA_ExpandedNodeId_equal(const UA_ExpandedNodeId *n1,
+                                     const UA_ExpandedNodeId *n2), {
     return (UA_ExpandedNodeId_order(n1, n2) == UA_ORDER_EQ);
-}
+})
 
 /* Returns a non-cryptographic hash for ExpandedNodeId. The hash of an
  * ExpandedNodeId is identical to the hash of the embedded (simple) NodeId if
@@ -609,26 +617,30 @@ typedef struct {
     UA_String name;
 } UA_QualifiedName;
 
-static UA_INLINE UA_Boolean
-UA_QualifiedName_isNull(const UA_QualifiedName *q) {
+UA_INLINABLE(UA_Boolean
+             UA_QualifiedName_isNull(const UA_QualifiedName *q), {
     return (q->namespaceIndex == 0 && q->name.length == 0);
-}
+})
 
 /* Returns a non-cryptographic hash for QualifiedName */
 UA_UInt32 UA_EXPORT
 UA_QualifiedName_hash(const UA_QualifiedName *q);
 
-static UA_INLINE UA_QualifiedName
-UA_QUALIFIEDNAME(UA_UInt16 nsIndex, char *chars) {
-    UA_QualifiedName qn; qn.namespaceIndex = nsIndex;
-    qn.name = UA_STRING(chars); return qn;
-}
+UA_INLINABLE(UA_QualifiedName
+             UA_QUALIFIEDNAME(UA_UInt16 nsIndex, char *chars), {
+    UA_QualifiedName qn;
+    qn.namespaceIndex = nsIndex;
+    qn.name = UA_STRING(chars);
+    return qn;
+})
 
-static UA_INLINE UA_QualifiedName
-UA_QUALIFIEDNAME_ALLOC(UA_UInt16 nsIndex, const char *chars) {
-    UA_QualifiedName qn; qn.namespaceIndex = nsIndex;
-    qn.name = UA_STRING_ALLOC(chars); return qn;
-}
+UA_INLINABLE(UA_QualifiedName
+             UA_QUALIFIEDNAME_ALLOC(UA_UInt16 nsIndex, const char *chars), {
+    UA_QualifiedName qn;
+    qn.namespaceIndex = nsIndex;
+    qn.name = UA_STRING_ALLOC(chars);
+    return qn;
+})
 
 UA_Boolean UA_EXPORT
 UA_QualifiedName_equal(const UA_QualifiedName *qn1,
@@ -643,17 +655,21 @@ typedef struct {
     UA_String text;
 } UA_LocalizedText;
 
-static UA_INLINE UA_LocalizedText
-UA_LOCALIZEDTEXT(char *locale, char *text) {
-    UA_LocalizedText lt; lt.locale = UA_STRING(locale);
-    lt.text = UA_STRING(text); return lt;
-}
+UA_INLINABLE(UA_LocalizedText
+             UA_LOCALIZEDTEXT(char *locale, char *text), {
+    UA_LocalizedText lt;
+    lt.locale = UA_STRING(locale);
+    lt.text = UA_STRING(text);
+    return lt;
+})
 
-static UA_INLINE UA_LocalizedText
-UA_LOCALIZEDTEXT_ALLOC(const char *locale, const char *text) {
-    UA_LocalizedText lt; lt.locale = UA_STRING_ALLOC(locale);
-    lt.text = UA_STRING_ALLOC(text); return lt;
-}
+UA_INLINABLE(UA_LocalizedText
+             UA_LOCALIZEDTEXT_ALLOC(const char *locale, const char *text), {
+    UA_LocalizedText lt;
+    lt.locale = UA_STRING_ALLOC(locale);
+    lt.text = UA_STRING_ALLOC(text);
+    return lt;
+})
 
 /**
  * .. _numericrange:
@@ -679,11 +695,12 @@ typedef struct  {
 UA_StatusCode UA_EXPORT
 UA_NumericRange_parse(UA_NumericRange *range, const UA_String str);
 
-static UA_INLINE UA_NumericRange
-UA_NUMERICRANGE(const char *s) {
-    UA_NumericRange nr; nr.dimensionsSize = 0; nr.dimensions = NULL;
-    UA_NumericRange_parse(&nr, UA_STRING((char*)(uintptr_t)s)); return nr;
-}
+UA_INLINABLE(UA_NumericRange
+             UA_NUMERICRANGE(const char *s), {
+    UA_NumericRange nr = {0};
+    UA_NumericRange_parse(&nr, UA_STRING((char*)(uintptr_t)s));
+    return nr;
+})
 
 /**
  * .. _variant:
@@ -746,40 +763,42 @@ typedef struct {
  *
  * @param v The variant
  * @return Is the variant empty */
-static UA_INLINE UA_Boolean
-UA_Variant_isEmpty(const UA_Variant *v) {
+UA_INLINABLE(UA_Boolean
+             UA_Variant_isEmpty(const UA_Variant *v), {
     return v->type == NULL;
-}
+})
 
 /* Returns true if the variant contains a scalar value. Note that empty variants
  * contain an array of length -1 (undefined).
  *
  * @param v The variant
  * @return Does the variant contain a scalar value */
-static UA_INLINE UA_Boolean
-UA_Variant_isScalar(const UA_Variant *v) {
+UA_INLINABLE(UA_Boolean
+             UA_Variant_isScalar(const UA_Variant *v), {
     return (v->arrayLength == 0 && v->data > UA_EMPTY_ARRAY_SENTINEL);
-}
+})
 
 /* Returns true if the variant contains a scalar value of the given type.
  *
  * @param v The variant
  * @param type The data type
  * @return Does the variant contain a scalar value of the given type */
-static UA_INLINE UA_Boolean
-UA_Variant_hasScalarType(const UA_Variant *v, const UA_DataType *type) {
+UA_INLINABLE(UA_Boolean
+             UA_Variant_hasScalarType(const UA_Variant *v,
+                                      const UA_DataType *type), {
     return UA_Variant_isScalar(v) && type == v->type;
-}
+})
 
 /* Returns true if the variant contains an array of the given type.
  *
  * @param v The variant
  * @param type The data type
  * @return Does the variant contain an array of the given type */
-static UA_INLINE UA_Boolean
-UA_Variant_hasArrayType(const UA_Variant *v, const UA_DataType *type) {
+UA_INLINABLE(UA_Boolean
+             UA_Variant_hasArrayType(const UA_Variant *v,
+                                     const UA_DataType *type), {
     return (!UA_Variant_isScalar(v)) && type == v->type;
-}
+})
 
 /* Set the variant to a scalar value that already resides in memory. The value
  * takes on the lifecycle of the variant and is deleted with it.
@@ -1123,10 +1142,10 @@ void UA_EXPORT * UA_new(const UA_DataType *type) UA_FUNC_ATTR_MALLOC;
  *
  * @param p The memory location of the variable
  * @param type The datatype description */
-static UA_INLINE void
-UA_init(void *p, const UA_DataType *type) {
+UA_INLINABLE(void
+             UA_init(void *p, const UA_DataType *type), {
     memset(p, 0, type->memSize);
-}
+})
 
 /* Copies the content of two variables. If copying fails (e.g. because no memory
  * was available for an array), then dst is emptied and initialized to prevent

From 7a2579dbf805c8d04e0307e1c4268bb50c98a508 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 16 Nov 2022 22:28:43 +0100
Subject: [PATCH 0531/1963] refactor(core): Remove use of UA_TRUE/UA_FALSE from
 internal use

---
 plugins/ua_config_default.c                  | 26 ++++++++++----------
 src/pubsub/ua_pubsub.h                       |  1 +
 src/pubsub/ua_pubsub_manager.c               | 12 +++++----
 src/pubsub/ua_pubsub_manager.h               |  2 --
 src/pubsub/ua_pubsub_ns0.c                   |  9 +++----
 src/pubsub/ua_pubsub_ns0.h                   |  2 +-
 src/pubsub/ua_pubsub_reader.c                |  9 +++----
 src/pubsub/ua_pubsub_readergroup.c           | 21 +++++++---------
 src/pubsub/ua_pubsub_security.c              | 19 ++++++--------
 src/pubsub/ua_pubsub_writer.c                |  5 ++--
 src/pubsub/ua_pubsub_writergroup.c           | 11 ++++-----
 src/server/ua_server_discovery_mdns.c        |  4 +--
 src/server/ua_server_internal.h              |  1 +
 src/server/ua_services_attribute.c           |  2 +-
 src/server/ua_services_discovery_multicast.c | 10 ++++----
 15 files changed, 62 insertions(+), 72 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 91fb525a00d..b8eba54a470 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -274,7 +274,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     /* conf->nodeLifecycle.destructor = NULL; */
     /* conf->nodeLifecycle.createOptionalChild = NULL; */
     /* conf->nodeLifecycle.generateChildNodeId = NULL; */
-    conf->modellingRulesOnInstances = UA_TRUE;
+    conf->modellingRulesOnInstances = true;
 
     /* Limits for SecureChannels */
     conf->maxSecureChannels = 40;
@@ -306,25 +306,25 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 #endif
 
 #ifdef UA_ENABLE_HISTORIZING
-    /* conf->accessHistoryDataCapability = UA_FALSE; */
+    /* conf->accessHistoryDataCapability = false; */
     /* conf->maxReturnDataValues = 0; */
 
-    /* conf->accessHistoryEventsCapability = UA_FALSE; */
+    /* conf->accessHistoryEventsCapability = false; */
     /* conf->maxReturnEventValues = 0; */
 
-    /* conf->insertDataCapability = UA_FALSE; */
-    /* conf->insertEventCapability = UA_FALSE; */
-    /* conf->insertAnnotationsCapability = UA_FALSE; */
+    /* conf->insertDataCapability = false; */
+    /* conf->insertEventCapability = false; */
+    /* conf->insertAnnotationsCapability = false; */
 
-    /* conf->replaceDataCapability = UA_FALSE; */
-    /* conf->replaceEventCapability = UA_FALSE; */
+    /* conf->replaceDataCapability = false; */
+    /* conf->replaceEventCapability = false; */
 
-    /* conf->updateDataCapability = UA_FALSE; */
-    /* conf->updateEventCapability = UA_FALSE; */
+    /* conf->updateDataCapability = false; */
+    /* conf->updateEventCapability = false; */
 
-    /* conf->deleteRawCapability = UA_FALSE; */
-    /* conf->deleteEventCapability = UA_FALSE; */
-    /* conf->deleteAtTimeDataCapability = UA_FALSE; */
+    /* conf->deleteRawCapability = false; */
+    /* conf->deleteEventCapability = false; */
+    /* conf->deleteAtTimeDataCapability = false; */
 #endif
 
 #if UA_MULTITHREADING >= 100
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 9eb0ecd7f5c..c91e49ebcb7 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -15,6 +15,7 @@
 #ifndef UA_PUBSUB_H_
 #define UA_PUBSUB_H_
 
+#define UA_INTERNAL
 #include <open62541/plugin/pubsub.h>
 #include <open62541/server.h>
 #include <open62541/server_pubsub.h>
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 6cb961801ec..fcee39cf5d7 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -10,11 +10,11 @@
  * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
-#include <open62541/server_pubsub.h>
+#include "ua_pubsub.h"
+#include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
-#include "server/ua_server_internal.h"
 #include "ua_pubsub_ns0.h"
 #ifdef UA_ENABLE_PUBSUB_SKS
 #include "ua_pubsub_keystorage.h"
@@ -434,14 +434,16 @@ UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier, c
     if(readerGroupConfig != NULL) {
         UA_ExtensionObject transportSettings = readerGroupConfig->transportSettings;
         retval = connection->channel->regist(connection->channel, &transportSettings, NULL);
-    }else
+    } else {
         retval = connection->channel->regist(connection->channel, NULL, NULL);
+    }
 
-    if(retval != UA_STATUSCODE_GOOD)
+    if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "register channel failed: 0x%" PRIx32 "!", retval);
+    }
 
-    connection->isRegistered = UA_TRUE;
+    connection->isRegistered = true;
     return retval;
 }
 
diff --git a/src/pubsub/ua_pubsub_manager.h b/src/pubsub/ua_pubsub_manager.h
index 26981313f1f..d149317d988 100644
--- a/src/pubsub/ua_pubsub_manager.h
+++ b/src/pubsub/ua_pubsub_manager.h
@@ -11,8 +11,6 @@
 #ifndef UA_PUBSUB_MANAGER_H_
 #define UA_PUBSUB_MANAGER_H_
 
-#include <open62541/server_pubsub.h>
-
 #include "ua_pubsub.h"
 
 _UA_BEGIN_DECLS
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 12f4087aafe..5e31db77ac5 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -9,7 +9,6 @@
  * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
-#include <open62541/types.h>
 #include "ua_pubsub_ns0.h"
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
@@ -1502,7 +1501,7 @@ addReaderGroupAction(UA_Server *server,
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
 static UA_Boolean
 isValidParentNode(UA_Server *server, UA_NodeId parentId) {
-    UA_Boolean retval = UA_TRUE;
+    UA_Boolean retval = true;
     const UA_Node *parentNodeType;
     const UA_NodeId parentNodeTypeId =
         UA_NODEID_NUMERIC(0, UA_NS0ID_SECURITYGROUPFOLDERTYPE);
@@ -1894,7 +1893,7 @@ getSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessi
     if(!ks)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    UA_Boolean executable = UA_FALSE;
+    UA_Boolean executable = false;
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyName(server, *securityGroupId);
     void *sgNodeCtx;
     getNodeContext(server, sg->securityGroupNodeId, (void **)&sgNodeCtx);
@@ -2312,9 +2311,9 @@ connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId stan
     UA_NODESTORE_REMOVE(server, &subscribedDataSetOnDsrId);
 
     retVal |= UA_Server_addReference(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-        UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex, dataSetMetaDataOnSdsId.identifier.numeric), UA_TRUE);
+        UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex, dataSetMetaDataOnSdsId.identifier.numeric), true);
     retVal |= UA_Server_addReference(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-        UA_EXPANDEDNODEID_NUMERIC(subscribedDataSetOnSdsId.namespaceIndex, subscribedDataSetOnSdsId.identifier.numeric), UA_TRUE);
+        UA_EXPANDEDNODEID_NUMERIC(subscribedDataSetOnSdsId.namespaceIndex, subscribedDataSetOnSdsId.identifier.numeric), true);
 
     return retVal;
 }
diff --git a/src/pubsub/ua_pubsub_ns0.h b/src/pubsub/ua_pubsub_ns0.h
index 2be49daae5b..f6cd983f5b9 100644
--- a/src/pubsub/ua_pubsub_ns0.h
+++ b/src/pubsub/ua_pubsub_ns0.h
@@ -11,8 +11,8 @@
 #ifndef UA_PUBSUB_NS0_H_
 #define UA_PUBSUB_NS0_H_
 
-#include "server/ua_server_internal.h"
 #include "ua_pubsub.h"
+#include "server/ua_server_internal.h"
 
 _UA_BEGIN_DECLS
 
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 6234ce4915b..d7ae7a7e400 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -10,14 +10,11 @@
  * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
  */
 
-#include <open62541/server_pubsub.h>
-
+#include "ua_pubsub.h"
 #include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
-#include "ua_pubsub.h"
-
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
 #include "ua_pubsub_networkmessage.h"
 #include "ua_pubsub_ns0.h"
@@ -801,13 +798,13 @@ UA_DataSetReader_setState_disabled(UA_Server *server, UA_DataSetReader *dsr) {
     case UA_PUBSUBSTATE_OPERATIONAL:
 #ifdef UA_ENABLE_PUBSUB_MONITORING
         /* Stop MessageReceiveTimeout timer */
-        if(dsr->msgRcvTimeoutTimerRunning == UA_TRUE) {
+        if(dsr->msgRcvTimeoutTimerRunning == true) {
             ret = server->config.pubSubConfig.monitoringInterface.
                 stopMonitoring(server, dsr->identifier,
                                UA_PUBSUB_COMPONENT_DATASETREADER,
                                UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT, dsr);
             if(ret == UA_STATUSCODE_GOOD) {
-                dsr->msgRcvTimeoutTimerRunning = UA_FALSE;
+                dsr->msgRcvTimeoutTimerRunning = false;
             } else {
                 UA_LOG_ERROR_READER(&server->config.logger, dsr,
                                     "Disable ReaderGroup failed. Stop message receive "
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index d3c42520875..d56a8d0fbf7 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -10,14 +10,11 @@
  *
  */
 
-#include <open62541/server_pubsub.h>
-
+#include "ua_pubsub.h"
 #include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
-#include "ua_pubsub.h"
-
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
 #include "ua_pubsub_networkmessage.h"
 #include "ua_pubsub_ns0.h"
@@ -548,18 +545,18 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
     UA_PubSubConnection *pubSubConnection =
         UA_PubSubConnection_findConnectionbyId(server, pubSubConnectionId);
     pubSubConnection->configurationFreezeCounter++;
-    pubSubConnection->configurationFrozen = UA_TRUE;
+    pubSubConnection->configurationFrozen = true;
 
     /* ReaderGroup freeze */
     /* TODO: Clarify on the freeze functionality in multiple DSR, multiple
      * networkMessage conf in a RG */
-    rg->configurationFrozen = UA_TRUE;
+    rg->configurationFrozen = true;
 
     /* DataSetReader freeze */
     UA_DataSetReader *dataSetReader;
     UA_UInt16 dsrCount = 0;
     LIST_FOREACH(dataSetReader, &rg->readers, listEntry){
-        dataSetReader->configurationFrozen = UA_TRUE;
+        dataSetReader->configurationFrozen = true;
         dsrCount++;
         /* TODO: Configuration frozen for subscribedDataSet once
          * UA_Server_DataSetReader_addTargetVariables API modified to support
@@ -694,16 +691,16 @@ UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
         UA_PubSubConnection_findConnectionbyId(server, pubSubConnectionId);
     pubSubConnection->configurationFreezeCounter--;
     if(pubSubConnection->configurationFreezeCounter == 0){
-        pubSubConnection->configurationFrozen = UA_FALSE;
+        pubSubConnection->configurationFrozen = false;
     }
 
     /* ReaderGroup unfreeze */
-    rg->configurationFrozen = UA_FALSE;
+    rg->configurationFrozen = false;
 
     /* DataSetReader unfreeze */
     UA_DataSetReader *dataSetReader;
     LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
-        dataSetReader->configurationFrozen = UA_FALSE;
+        dataSetReader->configurationFrozen = false;
         UA_NetworkMessageOffsetBuffer_clear(&dataSetReader->bufferedMessage);
     }
 
@@ -750,7 +747,7 @@ UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGro
                UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
                &readerGroup->subscribeCallbackId);
     else {
-        if(readerGroup->config.enableBlockingSocket == UA_TRUE) {
+        if(readerGroup->config.enableBlockingSocket == true) {
             UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
                                        "addSubscribeCallback() failed, blocking socket "
                                        "functionality only supported in customcallback");
@@ -770,7 +767,7 @@ UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGro
     /* When using blocking socket functionality, the server mechanism might get
      * blocked. It is highly recommended to use custom callback when using
      * blockingsocket. */
-    if(readerGroup->config.enableBlockingSocket != UA_TRUE)
+    if(readerGroup->config.enableBlockingSocket != true)
         UA_ReaderGroup_subscribeCallback(server, readerGroup);
 
     return retval;
diff --git a/src/pubsub/ua_pubsub_security.c b/src/pubsub/ua_pubsub_security.c
index 5cb2c424d27..b753c795d55 100644
--- a/src/pubsub/ua_pubsub_security.c
+++ b/src/pubsub/ua_pubsub_security.c
@@ -21,9 +21,9 @@ needsDecryption(const UA_Logger *logger,
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
     if(isEncrypted && requiresEncryption) {
-        *doDecrypt = UA_TRUE;
+        *doDecrypt = true;
     } else if(!isEncrypted && !requiresEncryption) {
-        *doDecrypt = UA_FALSE;
+        *doDecrypt = false;
     } else {
         if(isEncrypted) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURITYPOLICY,
@@ -40,23 +40,20 @@ needsDecryption(const UA_Logger *logger,
     return retval;
 }
 
-static
-UA_StatusCode
+static UA_StatusCode
 needsValidation(const UA_Logger *logger,
-                    const UA_NetworkMessage *networkMessage,
-                    const UA_MessageSecurityMode securityMode,
-                    UA_Boolean *doValidate) {
-
+                const UA_NetworkMessage *networkMessage,
+                const UA_MessageSecurityMode securityMode,
+                UA_Boolean *doValidate) {
     UA_Boolean isSigned = networkMessage->securityHeader.networkMessageSigned;
     UA_Boolean requiresSignature = securityMode > UA_MESSAGESECURITYMODE_NONE;
-
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
     if(isSigned &&
        requiresSignature) {
-        *doValidate = UA_TRUE;
+        *doValidate = true;
     } else if(!isSigned && !requiresSignature) {
-        *doValidate = UA_FALSE;
+        *doValidate = false;
     } else {
 
         if(isSigned) {
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 8f35014afc6..da0bf6589b0 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -10,12 +10,11 @@
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  */
 
-#include <open62541/server_pubsub.h>
+#include "ua_pubsub.h"
 #include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
-#include "ua_pubsub.h"
 #include "ua_pubsub_networkmessage.h"
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
@@ -1105,7 +1104,7 @@ UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
         *value = **rtNode->valueBackend.backend.external.value;
         value->value.storageType = UA_VARIANT_DATA_NODELETE;
         UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
-    } else if(field->config.field.variable.rtValueSource.rtFieldSourceEnabled == UA_FALSE){
+    } else if(field->config.field.variable.rtValueSource.rtFieldSourceEnabled == false){
         UA_ReadValueId rvid;
         UA_ReadValueId_init(&rvid);
         rvid.nodeId = params->publishedVariable;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 37c0e77f773..242a3ce5c9b 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -11,12 +11,11 @@
  * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
-#include <open62541/server_pubsub.h>
+#include "ua_pubsub.h"
 #include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
-#include "ua_pubsub.h"
 #include "ua_pubsub_networkmessage.h"
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
@@ -433,7 +432,7 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
     UA_PubSubConnection *pubSubConnection =  wg->linkedConnection;
     pubSubConnection->configurationFreezeCounter--;
     if(pubSubConnection->configurationFreezeCounter == 0){
-        pubSubConnection->configurationFrozen = UA_FALSE;
+        pubSubConnection->configurationFrozen = false;
     }
 
     //DataSetWriter unfreeze
@@ -445,13 +444,13 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
         if(publishedDataSet != NULL){ /* This means the DSW is a heartbeat configuration */
             publishedDataSet->configurationFreezeCounter--;
             if(publishedDataSet->configurationFreezeCounter == 0){
-                publishedDataSet->configurationFrozen = UA_FALSE;
+                publishedDataSet->configurationFrozen = false;
                 UA_DataSetField *dataSetField;
                 TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry){
-                    dataSetField->configurationFrozen = UA_FALSE;
+                    dataSetField->configurationFrozen = false;
                 }
             }
-            dataSetWriter->configurationFrozen = UA_FALSE;
+            dataSetWriter->configurationFrozen = false;
         }
     }
 
diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_server_discovery_mdns.c
index f78beaf86bd..b8aa9460f21 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_server_discovery_mdns.c
@@ -68,7 +68,7 @@ UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fq
 
     struct serverOnNetwork_list_entry *entry =
             mdns_record_add_or_get(server, fqdnMdnsRecord, serverName,
-                                   serverNameLen, UA_FALSE);
+                                   serverNameLen, false);
     if (entry) {
         if (addedEntry != NULL)
             *addedEntry = entry;
@@ -179,7 +179,7 @@ UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const cha
 
     struct serverOnNetwork_list_entry *entry =
             mdns_record_add_or_get(server, fqdnMdnsRecord, serverName,
-                                   serverNameLen, UA_FALSE);
+                                   serverNameLen, false);
     if (!entry)
         return UA_STATUSCODE_BADNOTFOUND;
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index ab85f236dbf..6d5c00a990d 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -19,6 +19,7 @@
 #ifndef UA_SERVER_INTERNAL_H_
 #define UA_SERVER_INTERNAL_H_
 
+#define UA_INTERNAL
 #include <open62541/server.h>
 #include <open62541/plugin/nodestore.h>
 
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index be9b6b600cc..beb95d004c4 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -357,7 +357,7 @@ getStructureDefinition(const UA_DataType *type, UA_StructureDefinition *def) {
 
     for(size_t cnt = 0; cnt < def->fieldsSize; cnt++) {
         const UA_DataTypeMember *m = &type->members[cnt];
-        def->fields[cnt].valueRank = UA_TRUE == m->isArray ? 1 : -1;
+        def->fields[cnt].valueRank = (m->isArray) ? 1 : -1;
         def->fields[cnt].arrayDimensions = NULL;
         def->fields[cnt].arrayDimensionsSize = 0;
         def->fields[cnt].name = UA_STRING((char *)(uintptr_t)m->memberName);
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index 4da7eefbb5f..c889acee3ee 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -189,20 +189,20 @@ entryMatchesCapabilityFilter(size_t serverCapabilityFilterSize, UA_String *serve
                    serverOnNetwork_list_entry* current) {
     // if the entry has less capabilities defined than the filter, there's no match
     if (serverCapabilityFilterSize > current->serverOnNetwork.serverCapabilitiesSize)
-        return UA_FALSE;
+        return false;
     for(size_t i = 0; i < serverCapabilityFilterSize; i++) {
-        UA_Boolean capabilityFound = UA_FALSE;
+        UA_Boolean capabilityFound = false;
         for(size_t j = 0; j < current->serverOnNetwork.serverCapabilitiesSize; j++) {
             if(UA_String_equal_ignorecase(&serverCapabilityFilter[i],
                                &current->serverOnNetwork.serverCapabilities[j])) {
-                capabilityFound = UA_TRUE;
+                capabilityFound = true;
                 break;
             }
         }
         if (!capabilityFound)
-            return UA_FALSE; // entry does not match capability
+            return false; // entry does not match capability
     }
-    return UA_TRUE;
+    return true;
 }
 
 void Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,

From d1d9ecb7e12832613e08ea8f34ba37726af644a2 Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Tue, 15 Nov 2022 15:30:36 +0100
Subject: [PATCH 0532/1963] feat(tests): Integration test for open62541
 nodesetLoader (#5453)

Add integration test consisting of an OPC UA Server
with custom loaded nodesets. Include an OPC UA Client
that connects to the server and browses all of the nodes
defined in the nodeset files. Validate if all of the
nodes within the nodeset(s) can be successfully browsed
(check if any node encountered an `AddNode()` issue).

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 tests/nodeset-loader/CMakeLists.txt           |   2 +
 .../add_node_integration_test/CMakeLists.txt  |  23 +
 .../add_node_integration_test/client.c        | 121 ++++
 .../add_node_integration_test/run_test.sh     | 551 ++++++++++++++++++
 .../add_node_integration_test/server.c        |  33 ++
 5 files changed, 730 insertions(+)
 create mode 100644 tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
 create mode 100644 tests/nodeset-loader/add_node_integration_test/client.c
 create mode 100644 tests/nodeset-loader/add_node_integration_test/run_test.sh
 create mode 100644 tests/nodeset-loader/add_node_integration_test/server.c

diff --git a/tests/nodeset-loader/CMakeLists.txt b/tests/nodeset-loader/CMakeLists.txt
index a526939a9c4..731cdb1ed85 100644
--- a/tests/nodeset-loader/CMakeLists.txt
+++ b/tests/nodeset-loader/CMakeLists.txt
@@ -36,3 +36,5 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     ua_add_test(check_nodeset_loader_testnodeset.c)
 
 endif()
+
+add_subdirectory(add_node_integration_test)
diff --git a/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt b/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
new file mode 100644
index 00000000000..366b8255659
--- /dev/null
+++ b/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
@@ -0,0 +1,23 @@
+#######################################################
+# Integration test for adding nodes via nodesetLoader #
+#######################################################
+
+if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+
+    add_executable(client client.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    set_target_properties(client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+    target_link_libraries(client ${LIBS})
+
+    add_executable(server server.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    set_target_properties(server PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+    target_link_libraries(server ${LIBS})
+
+    find_program(BASH_PROGRAM bash)
+
+    add_test(check_nodeset_loader_add_node_integration
+             ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh 
+             "${CMAKE_CURRENT_BINARY_DIR}/client"
+             "${CMAKE_CURRENT_BINARY_DIR}/server"
+    )
+
+endif()
\ No newline at end of file
diff --git a/tests/nodeset-loader/add_node_integration_test/client.c b/tests/nodeset-loader/add_node_integration_test/client.c
new file mode 100644
index 00000000000..c8a5c2bf268
--- /dev/null
+++ b/tests/nodeset-loader/add_node_integration_test/client.c
@@ -0,0 +1,121 @@
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/types.h>
+
+#include "ua_types_encoding_xml.h"
+
+#include <stdio.h>
+
+#define MIN_ARGUMENTS_NUM 3
+
+int main(int argc, char *argv[]) {
+    if (argc < MIN_ARGUMENTS_NUM) {
+        printf("Error: Not enough command line arguments:\n\n");
+        printf("\t%s ", argv[0]);
+        printf("NODESET_NAME ");
+        printf("[NODEIDS_1] [NODEIDS_2 ...]\n\n");
+        return EXIT_FAILURE;
+    }
+
+    printf("Connecting to server.\n");
+
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+
+    const size_t cNoOfReconnectTries = 10;
+    size_t iteration = 0;
+    UA_StatusCode retval = UA_STATUSCODE_BADNOTCONNECTED;
+    do {
+        printf("Try to connect ...\n");
+        retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+        sleep(1);
+        iteration++;
+    } while ((retval != UA_STATUSCODE_GOOD) && (iteration < cNoOfReconnectTries));
+
+    if(retval != UA_STATUSCODE_GOOD) {
+        printf("Error: connection could not be established.\n");
+        goto failure;
+    }
+
+    for(int i = 2; i < argc; ++i) {
+        FILE *nodeids;
+        char *nodeid = NULL;
+        size_t readLen = 0;
+        ssize_t nodeIdSize;
+
+        nodeids = fopen(argv[i], "r");
+        if(nodeids == NULL) {
+            printf("Failed to open file: %s.\n", argv[i]);
+            fclose(nodeids);
+            goto failure;
+        }
+
+        while((nodeIdSize = getline(&nodeid, &readLen, nodeids)) != -1) {
+            UA_NodeId out;
+            UA_NodeId_init(&out);
+
+            /* Exclude added new line. */
+            nodeid[--nodeIdSize] = '\0';
+
+            UA_ByteString buf = UA_STRING(nodeid);
+            retval |= UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_NODEID], NULL);
+
+            if(retval != UA_STATUSCODE_GOOD) {
+                printf("Invalid nodeid format.\n");
+                UA_NodeId_clear(&out);
+                fclose(nodeids);
+                goto failure;
+            }
+
+            /* Browse nodeid. */
+            UA_BrowseRequest bReq;
+            UA_BrowseRequest_init(&bReq);
+
+            bReq.requestedMaxReferencesPerNode = 0;
+            bReq.nodesToBrowse = UA_BrowseDescription_new();
+            bReq.nodesToBrowseSize = 1;
+            UA_NodeId_copy(&out, &bReq.nodesToBrowse[0].nodeId);
+            bReq.nodesToBrowse[0].resultMask = UA_BROWSERESULTMASK_ALL;
+            bReq.nodesToBrowse[0].browseDirection = UA_BROWSEDIRECTION_BOTH;
+
+            UA_BrowseResponse bResp = UA_Client_Service_browse(client, bReq);
+
+            retval |= bResp.responseHeader.serviceResult;
+            if(retval != UA_STATUSCODE_GOOD) {
+                printf("Error: cannot browse node: %s\n", nodeid);
+                UA_BrowseRequest_clear(&bReq);
+                UA_BrowseResponse_clear(&bResp);
+                UA_NodeId_clear(&out);
+                fclose(nodeids);
+                goto failure;
+            }
+
+            for(size_t j = 0; j < bResp.resultsSize; ++j) {
+                if(bResp.results[j].statusCode != UA_STATUSCODE_GOOD) {
+                    printf("Error: cannot browse node: %s\n", nodeid);
+                    UA_BrowseRequest_clear(&bReq);
+                    UA_BrowseResponse_clear(&bResp);
+                    UA_NodeId_clear(&out);
+                    fclose(nodeids);
+                    goto failure;
+                }
+            }
+            UA_BrowseRequest_clear(&bReq);
+            UA_BrowseResponse_clear(&bResp);
+            UA_NodeId_clear(&out);
+        }
+
+        fclose(nodeids);
+    }
+
+    printf("\n########### AddNode integration test successfully finished for %s ###########\n\n", argv[1]);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+    return EXIT_SUCCESS;
+
+failure:
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+    return EXIT_FAILURE;
+}
diff --git a/tests/nodeset-loader/add_node_integration_test/run_test.sh b/tests/nodeset-loader/add_node_integration_test/run_test.sh
new file mode 100644
index 00000000000..cde095dd5a7
--- /dev/null
+++ b/tests/nodeset-loader/add_node_integration_test/run_test.sh
@@ -0,0 +1,551 @@
+#!/usr/bin/env bash
+
+# Test case for all standardized companion nodesets. You can
+# find the specifications at https://github.com/OPCFoundation/UA-Nodeset.
+#      - branch: latest
+#      - commit: a2208e8
+# 
+# Currently this test case is missing the following UA-Nodesets:
+#   * NodesetLoader related issues:
+#      - ${OPEN62541_NODESET_DIR}AML/Opc.Ua.AMLLibraries.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}ISA95-JOBCONTROL/opc.ua.isa95-jobcontrol.nodeset2.xml
+#      - ${OPEN62541_NODESET_DIR}PNRIO/Opc.Ua.PnRio.Nodeset2.xml
+#      - ${OPEN62541_NODESET_DIR}TMC/Opc.Ua.TMC.NodeSet2.xml
+#
+#   * Nodesets with known 'AddNode()' issues:
+#      - ${OPEN62541_NODESET_DIR}AML/Opc.Ua.AMLBaseTypes.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}FDI/Opc.Ua.Fdi5.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}FDI/Opc.Ua.Fdi7.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}IEC61850/Opc.Ua.IEC61850-6.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}ISA-95/Opc.ISA95.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}MTConnect/Opc.Ua.MTConnect.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}POWERLINK/Opc.Ua.POWERLINK.NodeSet2.xml
+#
+#
+# Adding new entry within the integration test:
+#
+#       add_node_integration_test [arbitrarily_defined_nodeset_name] \
+#           [nodeset_xml_path1] \
+#           [nodeset_xml_path2 ...]
+#
+
+IFS=
+
+argv=("$@")
+argc=$#
+CLIENT_BINARY_PATH="${argv[0]}"
+SERVER_BINARY_PATH="${argv[1]}"
+SERVER_PID=
+CustomNsStartNum=
+declare -a NodeIdFiles=()
+
+function start_server() {
+    echo "Start server: "$@
+    $SERVER_BINARY_PATH $@ & disown
+    SERVER_PID=$!
+}
+
+function prepare_nodeids() {
+    CustomNsStartNum=2
+    for nodeset in "$@"
+    do
+        nodesetIdPath=$(basename $nodeset)
+        nodesetIdPath=${nodesetIdPath%.*}
+        if [[ $nodesetIdPath == *"MTConnect"* ]]; then
+            grep --line-buffered -R '<UAObjectType\|<UAObject\|<UAVariable\|<UAVariableType\|<UAMethod\|<UADataType\|<UAReferenceType\|<UAView' \
+                                    $nodeset | awk '{ sub(/.*\ NodeId=\x27/, ""); sub(/\x27.*/, ""); print $1}' >> $nodesetIdPath
+        else
+            grep --line-buffered -R '<UAObjectType\|<UAObject\|<UAVariable\|<UAVariableType\|<UAMethod\|<UADataType\|<UAReferenceType\|<UAView' \
+                                    $nodeset | awk '{ sub(/.*\ NodeId="/, ""); sub(/".*/, ""); print $1}' >> $nodesetIdPath
+        fi
+        
+        if [[ $nodesetIdPath == *"IEC61850"* ]] || [[ $nodesetIdPath == *"PLCopen"* ]]; then
+            sed -i "s/ns=2;/ns=$CustomNsStartNum;/gI" $nodesetIdPath
+            sed -i "s/ns=1;/ns=2;/gI" $nodesetIdPath
+        elif [[ $nodesetIdPath == *"PADIM"* ]]; then
+            sed -i "s/ns=3;/ns=$CustomNsStartNum;/gI" $nodesetIdPath
+        elif [[ $nodesetIdPath == *"Weihenstephan"* ]]; then
+            sed -i "s/ns=4;/ns=$CustomNsStartNum;/gI" $nodesetIdPath
+        else
+            sed -i "s/ns=1;/ns=$CustomNsStartNum;/gI" $nodesetIdPath
+        fi
+
+        NodeIdFiles+=("$nodesetIdPath")
+        CustomNsStartNum=$((CustomNsStartNum+1))
+    done
+}
+
+function run_client() {
+    echo "Start client: "$@
+    $CLIENT_BINARY_PATH $@
+    clientResult=$?
+    if [ $clientResult -ne 0 ] ; then
+        stop_server
+        rm ${NodeIdFiles[@]}
+        exit 1
+    fi
+}
+
+function stop_server() {
+    echo "Stop server:"
+    kill -9 $SERVER_PID
+    if [ $? -ne 0 ] ; then
+        echo "Error: stopping the server failed"
+        echo "PID = " $SERVER_PID
+        rm ${NodeIdFiles[@]}
+        exit 1
+    fi
+}
+
+function add_node_integration_test() {
+    nodesetName=$1
+    shift 1
+    prepare_nodeids $@
+    start_server $@
+    sleep 3
+    run_client $nodesetName ${NodeIdFiles[@]}
+    stop_server
+    rm ${NodeIdFiles[@]}
+    NodeIdFiles=()
+}
+
+UA_NODESET_PATH=/usr/local/share/open62541/tools/ua-nodeset
+
+add_node_integration_test "ADI" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/ADI/Opc.Ua.Adi.NodeSet2.xml
+
+add_node_integration_test "AMB" \
+    $UA_NODESET_PATH/AMB/Opc.Ua.AMB.NodeSet2.xml
+
+add_node_integration_test "AutoID" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/AutoID/Opc.Ua.AutoID.NodeSet2.xml
+
+add_node_integration_test "CAS" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/CAS/Opc.Ua.CAS.NodeSet2.xml
+
+add_node_integration_test "CNC" \
+    $UA_NODESET_PATH/CNC/Opc.Ua.CNC.NodeSet.xml
+
+add_node_integration_test "CommercialKitchenEquipment" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/CommercialKitchenEquipment/Opc.Ua.CommercialKitchenEquipment.NodeSet2.xml
+
+add_node_integration_test "CSPPlusForMachine" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/CSPPlusForMachine/Opc.Ua.CSPPlusForMachine.NodeSet2.xml
+
+add_node_integration_test "DEXPI" \
+    $UA_NODESET_PATH/DEXPI/Opc.Ua.DEXPI.NodeSet2.xml
+
+add_node_integration_test "DI" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml
+
+add_node_integration_test "DotNet" \
+    $UA_NODESET_PATH/DotNet/Opc.Ua.NodeSet.xml
+
+add_node_integration_test "FDT" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/FDT/Opc.Ua.FDT.NodeSet.xml
+
+add_node_integration_test "GDS" \
+    $UA_NODESET_PATH/GDS/Opc.Ua.Gds.NodeSet2.xml
+
+add_node_integration_test "GDS.Part12" \
+    $UA_NODESET_PATH/GDS/Opc.Ua.Gds.NodeSet2.Part12.xml
+
+add_node_integration_test "Flat.Glass" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Glass/Flat/Opc.Ua.Glass.NodeSet2.xml
+
+add_node_integration_test "I4AAS" \
+    $UA_NODESET_PATH/I4AAS/Opc.Ua.I4AAS.NodeSet2.xml
+
+add_node_integration_test "IA" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml
+
+add_node_integration_test "IA.examples" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml \
+    $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.examples.xml
+
+add_node_integration_test "IEC61850-7-3" \
+    $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-3.NodeSet2.xml
+
+add_node_integration_test "IEC61850-7-4" \
+    $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-3.NodeSet2.xml \
+    $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-4.NodeSet2.xml
+
+add_node_integration_test "IJT" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/IJT/Tightening/Opc.Ua.Ijt.Tightening.NodeSet2.xml
+
+add_node_integration_test "IOLinkIODD" \
+    $UA_NODESET_PATH/IOLink/Opc.Ua.IOLinkIODD.NodeSet2.xml
+
+add_node_integration_test "IOLink" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/IOLink/Opc.Ua.IOLink.NodeSet2.xml
+
+add_node_integration_test "Machinery" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml
+
+add_node_integration_test "Machinery.Examples" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.Examples.NodeSet2.xml
+
+add_node_integration_test "MachineTool" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml \
+    $UA_NODESET_PATH/MachineTool/Opc.Ua.MachineTool.NodeSet2.xml
+
+add_node_integration_test "MachineVision" \
+    $UA_NODESET_PATH/MachineVision/Opc.Ua.MachineVision.NodeSet2.xml
+
+add_node_integration_test "MDIS" \
+    $UA_NODESET_PATH/MDIS/Opc.MDIS.NodeSet2.xml
+
+add_node_integration_test "Mining.DevelopmentSupport.Dozer" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/DevelopmentSupport/Dozer/1.0.0/Opc.Ua.Mining.DevelopmentSupport.Dozer.NodeSet2.xml
+
+add_node_integration_test "Mining.DevelopmentSupport.General" \
+    $UA_NODESET_PATH/Mining/DevelopmentSupport/General/1.0.0/Opc.Ua.Mining.DevelopmentSupport.General.NodeSet2.xml
+
+add_node_integration_test "Mining.DevelopmentSupport.RoofSupportSystem" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/DevelopmentSupport/RoofSupportSystem/1.0.0/Opc.Ua.Mining.DevelopmentSupport.RoofSupportSystem.NodeSet2.xml
+
+add_node_integration_test "Mining.Extraction.General" \
+    $UA_NODESET_PATH/Mining/Extraction/General/1.0.0/Opc.Ua.Mining.Extraction.General.NodeSet2.xml
+
+add_node_integration_test "Mining.Extraction.ShearerLoader" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/Extraction/ShearerLoader/1.0.0/Opc.Ua.Mining.Extraction.ShearerLoader.NodeSet2.xml
+
+add_node_integration_test "Mining.General" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml
+
+add_node_integration_test "Mining.Loading.General" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/Loading/General/1.0.0/Opc.Ua.Mining.Loading.General.NodeSet2.xml
+
+add_node_integration_test "Mining.Loading.HydraulicExcavator" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/Loading/General/1.0.0/Opc.Ua.Mining.Loading.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/Loading/HydraulicExcavator/1.0.0/Opc.Ua.Mining.Loading.HydraulicExcavator.NodeSet2.xml
+
+add_node_integration_test "Mining.MineralProcessing.General" \
+    $UA_NODESET_PATH/Mining/MineralProcessing/General/1.0.0/Opc.Ua.Mining.MineralProcessing.General.NodeSet2.xml
+
+add_node_integration_test "Mining.MineralProcessing.RockCrusher" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/MineralProcessing/RockCrusher/1.0.0/Opc.Ua.Mining.MineralProcessing.RockCrusher.NodeSet2.xml
+
+add_node_integration_test "Mining.MonitoringSupervisionServices.General" \
+    $UA_NODESET_PATH/Mining/MonitoringSupervisionServices/General/1.0.0/Opc.Ua.Mining.MonitoringSupervisionServices.General.NodeSet2.xml
+
+add_node_integration_test "Mining.PELOServices.FaceAlignmentSystem" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/PELOServices/FaceAlignmentSystem/1.0.0/Opc.Ua.Mining.PELOServices.FaceAlignmentSystem.NodeSet2.xml
+
+add_node_integration_test "Mining.PELOServices.General" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/PELOServices/General/1.0.0/Opc.Ua.Mining.PELOServices.General.NodeSet2.xml
+
+add_node_integration_test "Mining.TransportDumping.ArmouredFaceConveyor" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/TransportDumping/ArmouredFaceConveyor/1.0.0/Opc.Ua.Mining.TransportDumping.ArmouredFaceConveyor.NodeSet2.xml
+
+add_node_integration_test "Mining.TransportDumping.General" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/TransportDumping/General/1.0.0/Opc.Ua.Mining.TransportDumping.General.NodeSet2.xml
+
+add_node_integration_test "Mining.TransportDumping.RearDumpTruck" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/General/1.0.0/Opc.Ua.Mining.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/TransportDumping/General/1.0.0/Opc.Ua.Mining.TransportDumping.General.NodeSet2.xml \
+    $UA_NODESET_PATH/Mining/TransportDumping/RearDumpTruck/1.0.0/Opc.Ua.Mining.TransportDumping.RearDumpTruck.NodeSet2.xml
+
+add_node_integration_test "OpenSCS" \
+    $UA_NODESET_PATH/OpenSCS/Opc.Ua.OPENSCS.NodeSet2.xml
+
+add_node_integration_test "PackML" \
+    $UA_NODESET_PATH/PackML/Opc.Ua.PackML.NodeSet2.xml
+
+add_node_integration_test "PADIM.IRDI" \
+    $UA_NODESET_PATH/PADIM/Opc.Ua.IRDI.NodeSet2.xml
+
+add_node_integration_test "PADIM" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PADIM/Opc.Ua.IRDI.NodeSet2.xml \
+    $UA_NODESET_PATH/PADIM/Opc.Ua.PADIM.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.Calender" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.01/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/Calender/1.00/Opc.Ua.PlasticsRubber.Extrusion.Calender.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.Calibrator" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/Calibrator/1.00/Opc.Ua.PlasticsRubber.Extrusion.Calibrator.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.Corrugator" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/HaulOff/1.00/Opc.Ua.PlasticsRubber.Extrusion.HaulOff.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/Corrugator/1.00/Opc.Ua.PlasticsRubber.Extrusion.Corrugator.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.Cutter" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/Cutter/1.00/Opc.Ua.PlasticsRubber.Extrusion.Cutter.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.Die" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/Die/1.00/Opc.Ua.PlasticsRubber.Extrusion.Die.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.Extruder" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/Extruder/1.00/Opc.Ua.PlasticsRubber.Extrusion.Extruder.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.ExtrusionLine" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/ExtrusionLine/1.00/Opc.Ua.PlasticsRubber.Extrusion.ExtrusionLine.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.Filter" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/Filter/1.00/Opc.Ua.PlasticsRubber.Extrusion.Filter.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.GeneralTypes" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml
+
+add_node_integration_test "1.01/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.01/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.HaulOff" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/HaulOff/1.00/Opc.Ua.PlasticsRubber.Extrusion.HaulOff.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.MeltPump" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/MeltPump/1.00/Opc.Ua.PlasticsRubber.Extrusion.MeltPump.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion.Pelletizer" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion/Pelletizer/1.00/Opc.Ua.PlasticsRubber.Extrusion.Pelletizer.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.Calender" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Calender/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Calender.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.Calibrator" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Calibrator/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Calibrator.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.Corrugator" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/HaulOff/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.HaulOff.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Corrugator/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Corrugator.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.Cutter" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Cutter/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Cutter.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.Die" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Die/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Die.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.Extruder" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Extruder/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Extruder.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.ExtrusionLine" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/ExtrusionLine/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.ExtrusionLine.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.Filter" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Filter/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Filter.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.GeneralTypes" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.HaulOff" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/HaulOff/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.HaulOff.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.MeltPump" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/MeltPump/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.MeltPump.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.Extrusion_v2.Pelletizer" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/Extrusion_v2/Pelletizer/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Pelletizer.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.GeneralTypes.1.02" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.GeneralTypes.1.03" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.HotRunner" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/HotRunner/1.00/Opc.Ua.PlasticsRubber.HotRunner.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.IMM2MES" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/IMM2MES/1.01/Opc.Ua.PlasticsRubber.IMM2MES.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.LDS" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/LDS/1.00/Opc.Ua.PlasticsRubber.LDS.NodeSet2.xml
+
+add_node_integration_test "PlasticsRubber.TCD" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml \
+    $UA_NODESET_PATH/PlasticsRubber/TCD/1.01/Opc.Ua.PlasticsRubber.TCD.NodeSet2.xml
+
+add_node_integration_test "PLCopen" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml
+
+add_node_integration_test "PNEM" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PNEM/Opc.Ua.PnEm.NodeSet2.xml
+
+add_node_integration_test "PROFINET" \
+    $UA_NODESET_PATH/PROFINET/Opc.Ua.Pn.NodeSet2.xml
+
+add_node_integration_test "Pumps" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Pumps/Opc.Ua.Pumps.NodeSet2.xml
+
+add_node_integration_test "Robotics" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Robotics/Opc.Ua.Robotics.NodeSet2.xml
+
+add_node_integration_test "Safety" \
+    $UA_NODESET_PATH/Safety/Opc.Ua.Safety.NodeSet2.xml
+
+add_node_integration_test "Scales" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Scales/Opc.Ua.Scales.NodeSet2.xml
+
+add_node_integration_test "Sercos" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Sercos/Sercos.NodeSet2.xml
+
+add_node_integration_test "Weihenstephan" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PackML/Opc.Ua.PackML.NodeSet2.xml \
+    $UA_NODESET_PATH/Weihenstephan/Opc.Ua.Weihenstephan.NodeSet2.xml
+
+add_node_integration_test "Woodworking.Eumabois" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Woodworking/Opc.Ua.Woodworking.NodeSet2.xml \
+    $UA_NODESET_PATH/Woodworking/Opc.Ua.Eumabois.Nodeset2.xml
+
+add_node_integration_test "Woodworking" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/Woodworking/Opc.Ua.Woodworking.NodeSet2.xml
diff --git a/tests/nodeset-loader/add_node_integration_test/server.c b/tests/nodeset-loader/add_node_integration_test/server.c
new file mode 100644
index 00000000000..03cf41a2ad1
--- /dev/null
+++ b/tests/nodeset-loader/add_node_integration_test/server.c
@@ -0,0 +1,33 @@
+/* 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 <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+UA_Boolean running = true;
+static void stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+int main(int argc, const char *argv[]) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+
+    for (int cnt = 1; cnt < argc; cnt++) {
+        if (!UA_Server_loadNodeset(server, argv[cnt], NULL)) {
+            printf("Nodeset %s could not be loaded, exit\n", argv[cnt]);
+            return EXIT_FAILURE;
+        }
+    }
+
+    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_Server_delete(server);
+
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From a85388a107874873d634b767d2f99779afbd8474 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Nov 2022 17:50:37 +0100
Subject: [PATCH 0533/1963] refactor(server): Don't redefine UA_THREADSAFE as
 deprecated

This was used to prevent thread-safe public API from within the core
library. No longer required and leads to problem in unit tests that
include ua_server_internal.h.
---
 src/server/ua_server_internal.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 6d5c00a990d..a15c1a06c8e 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -30,11 +30,6 @@
 
 _UA_BEGIN_DECLS
 
-#if UA_MULTITHREADING >= 100
-#undef UA_THREADSAFE
-#define UA_THREADSAFE UA_DEPRECATED
-#endif
-
 #ifdef UA_ENABLE_PUBSUB
 #include "ua_pubsub_manager.h"
 #endif

From 4bbcbcb870b9b4ebc46e1a50f89d0d6d9007d01c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Nov 2022 09:43:39 +0100
Subject: [PATCH 0534/1963] refactor(server): Remove unused networkMutex (is
 now in the EventLoop)

---
 src/server/ua_server.c          | 2 --
 src/server/ua_server_internal.h | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index a02e5a69a07..3d78dcd2ff5 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -247,7 +247,6 @@ void UA_Server_delete(UA_Server *server) {
     UA_ServerConfig_clean(&server->config);
 
 #if UA_MULTITHREADING >= 100
-    UA_LOCK_DESTROY(&server->networkMutex);
     UA_LOCK_DESTROY(&server->serviceMutex);
 #endif
 
@@ -296,7 +295,6 @@ UA_Server_init(UA_Server *server) {
 #endif
 
 #if UA_MULTITHREADING >= 100
-    UA_LOCK_INIT(&server->networkMutex);
     UA_LOCK_INIT(&server->serviceMutex);
 #endif
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index a15c1a06c8e..5484892a7b5 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -162,7 +162,6 @@ struct UA_Server {
 #endif
 
 #if UA_MULTITHREADING >= 100
-    UA_Lock networkMutex;
     UA_Lock serviceMutex;
 #endif
 

From 00b3ab2dd0d18b17d66ec64378a72e7b617f6051 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Nov 2022 09:46:07 +0100
Subject: [PATCH 0535/1963] feat(client): Introduce client mutex

---
 src/client/ua_client.c          | 8 ++++++++
 src/client/ua_client_internal.h | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d6a47a58fb6..dd9ef66717a 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -45,6 +45,10 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
     client->channel.config = client->config.localConnectionConfig;
     client->connectStatus = UA_STATUSCODE_GOOD;
 
+#if UA_MULTITHREADING >= 100
+    UA_LOCK_INIT(&client->clientMutex);
+#endif
+
     /* Set up the regular callback for checking the internal state */
     UA_StatusCode res =
         UA_Client_addRepeatedCallback(client,
@@ -128,6 +132,10 @@ UA_Client_clear(UA_Client *client) {
     /* Remove the internal regular callback */
     UA_Client_removeCallback(client, client->houseKeepingCallbackId);
     client->houseKeepingCallbackId = 0;
+
+#if UA_MULTITHREADING >= 100
+    UA_LOCK_DESTROY(&client->clientMutex);
+#endif
 }
 
 void
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index c5e7bae2e83..4c80053c543 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -168,6 +168,15 @@ struct UA_Client {
     UA_UInt32 monitoredItemHandles;
     UA_UInt16 currentlyOutStandingPublishRequests;
 #endif
+
+    /* Internal locking for thread-safety. Methods starting with UA_Client_ that
+     * are marked with UA_THREADSAFE take the lock. The lock is released before
+     * dropping into the EventLoop and before calling user-defined callbacks.
+     * That way user-defined callbacks can themselves call thread-safe client
+     * methods. */
+#if UA_MULTITHREADING >= 100
+    UA_Lock clientMutex;
+#endif
 };
 
 UA_StatusCode

From 22735529de939bb84a4c15acf4d777634e82d264 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Nov 2022 17:50:11 +0100
Subject: [PATCH 0536/1963] feat(client): Make the client-API threadsafe

---
 CHANGELOG                                  |   8 +
 include/open62541/client.h                 |  77 ++---
 include/open62541/client_highlevel_async.h |   6 +-
 src/client/ua_client.c                     | 150 ++++++---
 src/client/ua_client_connect.c             | 147 ++++++---
 src/client/ua_client_discovery.c           |  45 ++-
 src/client/ua_client_internal.h            |  26 +-
 src/client/ua_client_subscriptions.c       | 359 +++++++++++++--------
 8 files changed, 557 insertions(+), 261 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8bf1a1c2ba0..e7be05c5810 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,14 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2022-11-19 Julius Pfrommer <julius.pfrommer at iosb.fraunhofer.de>
+
+ * Thread-safe client
+
+   A large portion of the client API is now marked UA_THREADSAFE. For
+   those methods, if multithreading is enabled, an internal mutex
+   protects the client.
+
 2022-08-04 Robert Mak <makr at keba.com>
 
  * Saving unknown client certificates
diff --git a/include/open62541/client.h b/include/open62541/client.h
index 97ef59523f0..6237446902f 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -198,7 +198,7 @@ UA_Client UA_EXPORT *
 UA_Client_newWithConfig(const UA_ClientConfig *config);
 
 /* Returns the current state. All arguments except ``client`` can be NULL. */
-void UA_EXPORT
+void UA_EXPORT UA_THREADSAFE
 UA_Client_getState(UA_Client *client,
                    UA_SecureChannelState *channelState,
                    UA_SessionState *sessionState,
@@ -238,7 +238,7 @@ UA_Client_delete(UA_Client *client);
  * @param client to use
  * @param endpointURL to connect (for example "opc.tcp://localhost:4840")
  * @return Indicates whether the operation succeeded or returns an error code */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_connect(UA_Client *client, const char *endpointUrl);
 
 /* Connect async (non-blocking) to the server. After initiating the connection,
@@ -246,7 +246,7 @@ UA_Client_connect(UA_Client *client, const char *endpointUrl);
  * established. You can set a callback to client->config.stateCallback to be
  * notified when the connection status changes. Or use UA_Client_getState to get
  * the state manually. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_connectAsync(UA_Client *client, const char *endpointUrl);
 
 /* Connect to the server without creating a session
@@ -254,11 +254,11 @@ UA_Client_connectAsync(UA_Client *client, const char *endpointUrl);
  * @param client to use
  * @param endpointURL to connect (for example "opc.tcp://localhost:4840")
  * @return Indicates whether the operation succeeded or returns an error code */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl);
 
 /* Connect async (non-blocking) only the SecureChannel */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl);
 
 /* Connect to the server and create+activate a Session with the given username
@@ -277,22 +277,23 @@ UA_Client_connectUsername(UA_Client *client, const char *endpointUrl,
     cc->userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
     cc->userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN];
     cc->userIdentityToken.content.decoded.data = identityToken;
+    /* Silence a false-positive deprecated warning */
     return UA_Client_connect(client, endpointUrl);
 }
 
 /* Disconnect and close a connection to the selected server. Disconnection is
  * always performed async (without blocking). */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_disconnect(UA_Client *client);
 
 /* Disconnect async. Run UA_Client_run_iterate until the callback notifies that
  * all connections are closed. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_disconnectAsync(UA_Client *client);
 
 /* Disconnect the SecureChannel but keep the Session intact (if it exists).
  * This is always an async (non-blocking) operation. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_disconnectSecureChannel(UA_Client *client);
 
 /**
@@ -308,7 +309,7 @@ UA_Client_disconnectSecureChannel(UA_Client *client);
  * @param endpointDescriptions array of endpoint descriptions that is allocated
  *        by the function (you need to free manually)
  * @return Indicates whether the operation succeeded or returns an error code */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
                        size_t* endpointDescriptionsSize,
                        UA_EndpointDescription** endpointDescriptions);
@@ -333,7 +334,7 @@ UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
  * @param registeredServersSize size of returned array, i.e., number of found/registered servers
  * @param registeredServers array containing found/registered servers
  * @return Indicates whether the operation succeeded or returns an error code */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_findServers(UA_Client *client, const char *serverUrl,
                       size_t serverUrisSize, UA_String *serverUris,
                       size_t localeIdsSize, UA_String *localeIds,
@@ -359,7 +360,7 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
  *        known/registered servers
  * @param serverOnNetwork array containing known/registered servers
  * @return Indicates whether the operation succeeded or returns an error code */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
                                UA_UInt32 startingRecordId, UA_UInt32 maxRecordsToReturn,
                                size_t serverCapabilityFilterSize, UA_String *serverCapabilityFilter,
@@ -376,7 +377,7 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
  * is better to use the convenience functions from ``ua_client_highlevel.h``
  * that wrap the raw services. */
 /* Don't use this function. Use the type versions below instead. */
-void UA_EXPORT
+void UA_EXPORT UA_THREADSAFE
 __UA_Client_Service(UA_Client *client, const void *request,
                     const UA_DataType *requestType, void *response,
                     const UA_DataType *responseType);
@@ -384,7 +385,7 @@ __UA_Client_Service(UA_Client *client, const void *request,
 /*
  * Attribute Service Set
  * ^^^^^^^^^^^^^^^^^^^^^ */
-static UA_INLINE UA_ReadResponse
+static UA_INLINE UA_THREADSAFE UA_ReadResponse
 UA_Client_Service_read(UA_Client *client, const UA_ReadRequest request) {
     UA_ReadResponse response;
     __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_READREQUEST],
@@ -392,7 +393,7 @@ UA_Client_Service_read(UA_Client *client, const UA_ReadRequest request) {
     return response;
 }
 
-static UA_INLINE UA_WriteResponse
+static UA_INLINE UA_THREADSAFE UA_WriteResponse
 UA_Client_Service_write(UA_Client *client, const UA_WriteRequest request) {
     UA_WriteResponse response;
     __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_WRITEREQUEST],
@@ -404,7 +405,7 @@ UA_Client_Service_write(UA_Client *client, const UA_WriteRequest request) {
 * Historical Access Service Set
 * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
 #ifdef UA_ENABLE_HISTORIZING
-static UA_INLINE UA_HistoryReadResponse
+static UA_INLINE UA_THREADSAFE UA_HistoryReadResponse
 UA_Client_Service_historyRead(UA_Client *client, const UA_HistoryReadRequest request) {
     UA_HistoryReadResponse response;
     __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST],
@@ -412,7 +413,7 @@ UA_Client_Service_historyRead(UA_Client *client, const UA_HistoryReadRequest req
     return response;
 }
 
-static UA_INLINE UA_HistoryUpdateResponse
+static UA_INLINE UA_THREADSAFE UA_HistoryUpdateResponse
 UA_Client_Service_historyUpdate(UA_Client *client, const UA_HistoryUpdateRequest request) {
     UA_HistoryUpdateResponse response;
     __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST],
@@ -425,7 +426,7 @@ UA_Client_Service_historyUpdate(UA_Client *client, const UA_HistoryUpdateRequest
  * Method Service Set
  * ^^^^^^^^^^^^^^^^^^ */
 #ifdef UA_ENABLE_METHODCALLS
-static UA_INLINE UA_CallResponse
+static UA_INLINE UA_THREADSAFE UA_CallResponse
 UA_Client_Service_call(UA_Client *client, const UA_CallRequest request) {
     UA_CallResponse response;
     __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_CALLREQUEST],
@@ -437,7 +438,7 @@ UA_Client_Service_call(UA_Client *client, const UA_CallRequest request) {
 /*
  * NodeManagement Service Set
  * ^^^^^^^^^^^^^^^^^^^^^^^^^^ */
-static UA_INLINE UA_AddNodesResponse
+static UA_INLINE UA_THREADSAFE UA_AddNodesResponse
 UA_Client_Service_addNodes(UA_Client *client, const UA_AddNodesRequest request) {
     UA_AddNodesResponse response;
     __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_ADDNODESREQUEST],
@@ -445,7 +446,7 @@ UA_Client_Service_addNodes(UA_Client *client, const UA_AddNodesRequest request)
     return response;
 }
 
-static UA_INLINE UA_AddReferencesResponse
+static UA_INLINE UA_THREADSAFE UA_AddReferencesResponse
 UA_Client_Service_addReferences(UA_Client *client,
                                 const UA_AddReferencesRequest request) {
     UA_AddReferencesResponse response;
@@ -454,7 +455,7 @@ UA_Client_Service_addReferences(UA_Client *client,
     return response;
 }
 
-static UA_INLINE UA_DeleteNodesResponse
+static UA_INLINE UA_THREADSAFE UA_DeleteNodesResponse
 UA_Client_Service_deleteNodes(UA_Client *client,
                               const UA_DeleteNodesRequest request) {
     UA_DeleteNodesResponse response;
@@ -463,7 +464,7 @@ UA_Client_Service_deleteNodes(UA_Client *client,
     return response;
 }
 
-static UA_INLINE UA_DeleteReferencesResponse
+static UA_INLINE UA_THREADSAFE UA_DeleteReferencesResponse
 UA_Client_Service_deleteReferences(UA_Client *client,
                                    const UA_DeleteReferencesRequest request) {
     UA_DeleteReferencesResponse response;
@@ -475,7 +476,7 @@ UA_Client_Service_deleteReferences(UA_Client *client,
 /*
  * View Service Set
  * ^^^^^^^^^^^^^^^^ */
-static UA_INLINE UA_BrowseResponse
+static UA_INLINE UA_THREADSAFE UA_BrowseResponse
 UA_Client_Service_browse(UA_Client *client, const UA_BrowseRequest request) {
     UA_BrowseResponse response;
     __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_BROWSEREQUEST],
@@ -483,7 +484,7 @@ UA_Client_Service_browse(UA_Client *client, const UA_BrowseRequest request) {
     return response;
 }
 
-static UA_INLINE UA_BrowseNextResponse
+static UA_INLINE UA_THREADSAFE UA_BrowseNextResponse
 UA_Client_Service_browseNext(UA_Client *client,
                              const UA_BrowseNextRequest request) {
     UA_BrowseNextResponse response;
@@ -492,7 +493,7 @@ UA_Client_Service_browseNext(UA_Client *client,
     return response;
 }
 
-static UA_INLINE UA_TranslateBrowsePathsToNodeIdsResponse
+static UA_INLINE UA_THREADSAFE UA_TranslateBrowsePathsToNodeIdsResponse
 UA_Client_Service_translateBrowsePathsToNodeIds(UA_Client *client,
                         const UA_TranslateBrowsePathsToNodeIdsRequest request) {
     UA_TranslateBrowsePathsToNodeIdsResponse response;
@@ -503,7 +504,7 @@ UA_Client_Service_translateBrowsePathsToNodeIds(UA_Client *client,
     return response;
 }
 
-static UA_INLINE UA_RegisterNodesResponse
+static UA_INLINE UA_THREADSAFE UA_RegisterNodesResponse
 UA_Client_Service_registerNodes(UA_Client *client,
                                 const UA_RegisterNodesRequest request) {
     UA_RegisterNodesResponse response;
@@ -512,7 +513,7 @@ UA_Client_Service_registerNodes(UA_Client *client,
     return response;
 }
 
-static UA_INLINE UA_UnregisterNodesResponse
+static UA_INLINE UA_THREADSAFE UA_UnregisterNodesResponse
 UA_Client_Service_unregisterNodes(UA_Client *client,
                                   const UA_UnregisterNodesRequest request) {
     UA_UnregisterNodesResponse response;
@@ -527,7 +528,7 @@ UA_Client_Service_unregisterNodes(UA_Client *client,
  * ^^^^^^^^^^^^^^^^^ */
 #ifdef UA_ENABLE_QUERY
 
-static UA_INLINE UA_QueryFirstResponse
+static UA_INLINE UA_THREADSAFE UA_QueryFirstResponse
 UA_Client_Service_queryFirst(UA_Client *client,
                              const UA_QueryFirstRequest request) {
     UA_QueryFirstResponse response;
@@ -536,7 +537,7 @@ UA_Client_Service_queryFirst(UA_Client *client,
     return response;
 }
 
-static UA_INLINE UA_QueryNextResponse
+static UA_INLINE UA_THREADSAFE UA_QueryNextResponse
 UA_Client_Service_queryNext(UA_Client *client,
                             const UA_QueryNextRequest request) {
     UA_QueryNextResponse response;
@@ -594,14 +595,14 @@ UA_Client_Service_queryNext(UA_Client *client,
 typedef void (*UA_ClientAsyncServiceCallback)(UA_Client *client, void *userdata,
                                               UA_UInt32 requestId, void *response);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 __UA_Client_AsyncService(UA_Client *client, const void *request,
                          const UA_DataType *requestType,
                          UA_ClientAsyncServiceCallback callback,
                          const UA_DataType *responseType,
                          void *userdata, UA_UInt32 *requestId);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
         const UA_DataType *requestType, UA_ClientAsyncServiceCallback callback,
         const UA_DataType *responseType, void *userdata, UA_UInt32 *requestId);
@@ -615,14 +616,14 @@ UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
  * @param callback The new callback
  * @return UA_StatusCode UA_STATUSCODE_GOOD on success
  *         UA_STATUSCODE_BADNOTFOUND when no request with requestId is found. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_modifyAsyncCallback(UA_Client *client, UA_UInt32 requestId,
-        void *userdata, UA_ClientAsyncServiceCallback callback);
+                              void *userdata, UA_ClientAsyncServiceCallback callback);
 
 /* Listen on the network and process arriving asynchronous responses in the
  * background. Internal housekeeping, renewal of SecureChannels and subscription
  * management is done as well. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout);
 
 /* Force the manual renewal of the SecureChannel. This is useful to renew the
@@ -634,7 +635,7 @@ UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout);
  * @return The return value is UA_STATUSCODE_GOODCALLAGAIN if the SecureChannel
  *         has not elapsed at least 75% of its lifetime. Otherwise the
  *         ``connectStatus`` is returned. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_renewSecureChannel(UA_Client *client);
 
 /* Use the type versions of this method. See below. However, the general
@@ -685,7 +686,7 @@ typedef void (*UA_ClientCallback)(UA_Client *client, void *data);
  *        identifier is not set.
  * @return Upon success, UA_STATUSCODE_GOOD is returned. An error code
  *         otherwise. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId);
 
@@ -702,17 +703,17 @@ UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
  *        identifier is not set.
  * @return Upon success, UA_STATUSCODE_GOOD is returned. An error code
  *         otherwise. */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_addRepeatedCallback(UA_Client *client, UA_ClientCallback callback,
                               void *data, UA_Double interval_ms,
                               UA_UInt64 *callbackId);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_changeRepeatedCallbackInterval(UA_Client *client,
                                          UA_UInt64 callbackId,
                                          UA_Double interval_ms);
 
-void UA_EXPORT
+void UA_EXPORT UA_THREADSAFE
 UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId);
 
 #define UA_Client_removeRepeatedCallback(server, callbackId)    \
diff --git a/include/open62541/client_highlevel_async.h b/include/open62541/client_highlevel_async.h
index c39cea7bc1e..95d68b33cbc 100644
--- a/include/open62541/client_highlevel_async.h
+++ b/include/open62541/client_highlevel_async.h
@@ -22,7 +22,7 @@ _UA_BEGIN_DECLS
 
 typedef void (*UA_ClientAsyncReadCallback)(UA_Client *client, void *userdata,
                                            UA_UInt32 requestId, UA_ReadResponse *rr);
-static UA_INLINE UA_StatusCode
+static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Client_sendAsyncReadRequest(UA_Client *client, UA_ReadRequest *request,
                                UA_ClientAsyncReadCallback readCallback, void *userdata,
                                UA_UInt32 *reqId) {
@@ -33,7 +33,7 @@ UA_Client_sendAsyncReadRequest(UA_Client *client, UA_ReadRequest *request,
 
 typedef void (*UA_ClientAsyncWriteCallback)(UA_Client *client, void *userdata,
                                             UA_UInt32 requestId, UA_WriteResponse *wr);
-static UA_INLINE UA_StatusCode
+static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Client_sendAsyncWriteRequest(UA_Client *client, UA_WriteRequest *request,
                                 UA_ClientAsyncWriteCallback writeCallback, void *userdata,
                                 UA_UInt32 *reqId) {
@@ -44,7 +44,7 @@ UA_Client_sendAsyncWriteRequest(UA_Client *client, UA_WriteRequest *request,
 
 typedef void (*UA_ClientAsyncBrowseCallback)(UA_Client *client, void *userdata,
                                              UA_UInt32 requestId, UA_BrowseResponse *wr);
-static UA_INLINE UA_StatusCode
+static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Client_sendAsyncBrowseRequest(UA_Client *client, UA_BrowseRequest *request,
                                  UA_ClientAsyncBrowseCallback browseCallback,
                                  void *userdata, UA_UInt32 *reqId) {
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index dd9ef66717a..7f4bcd0786b 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -116,7 +116,7 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
 static void
 UA_Client_clear(UA_Client *client) {
     /* Delete the async service calls with BADHSUTDOWN */
-    UA_Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSHUTDOWN);
+    __Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSHUTDOWN);
 
     UA_Client_disconnect(client);
     UA_String_clear(&client->endpointUrl);
@@ -126,7 +126,7 @@ UA_Client_clear(UA_Client *client) {
 
     /* Delete the subscriptions */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
-    UA_Client_Subscriptions_clean(client);
+    __Client_Subscriptions_clean(client);
 #endif
 
     /* Remove the internal regular callback */
@@ -149,12 +149,14 @@ UA_Client_delete(UA_Client* client) {
 void
 UA_Client_getState(UA_Client *client, UA_SecureChannelState *channelState,
                    UA_SessionState *sessionState, UA_StatusCode *connectStatus) {
+    UA_LOCK(&client->clientMutex);
     if(channelState)
         *channelState = client->channel.state;
     if(sessionState)
         *sessionState = client->sessionState;
     if(connectStatus)
         *connectStatus = client->connectStatus;
+    UA_UNLOCK(&client->clientMutex);
 }
 
 UA_ClientConfig *
@@ -175,6 +177,8 @@ static const char *sessionStateTexts[6] =
 
 void
 notifyClientState(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     if(client->connectStatus == client->oldConnectStatus &&
        client->channel.state == client->oldChannelState &&
        client->sessionState == client->oldSessionState)
@@ -208,9 +212,11 @@ notifyClientState(UA_Client *client) {
     client->oldChannelState = client->channel.state;
     client->oldSessionState = client->sessionState;
 
+    UA_UNLOCK(&client->clientMutex);
     if(client->config.stateCallback)
         client->config.stateCallback(client, client->channel.state,
                                      client->sessionState, client->connectStatus);
+    UA_LOCK(&client->clientMutex);
 }
 
 /****************/
@@ -221,8 +227,10 @@ notifyClientState(UA_Client *client) {
 static UA_StatusCode
 sendRequest(UA_Client *client, const void *request,
             const UA_DataType *requestType, UA_UInt32 *requestId) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     /* Renew SecureChannel if necessary */
-    UA_Client_renewSecureChannel(client);
+    __Client_renewSecureChannel(client);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return client->connectStatus;
 
@@ -284,6 +292,8 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
     UA_Response *response = (ac->syncResponse) ? ac->syncResponse : &asyncResponse;
     const UA_DataType *responseType = ac->responseType;
 
+    /* TODO: Handle UA_STATUSCODE_BADSESSIONCLOSED et al. here */
+
     /* Dequeue ac. We might disconnect the client (remove all ac) in the callback. */
     LIST_REMOVE(ac, pointers);
 
@@ -334,9 +344,12 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
         response->responseHeader.serviceResult = retval;
     }
 
-    /* Call the async callback */
+    /* Call the async callback. This is the only thread with access to ac. So we
+     * can just unlock for the callback into userland. */
+    UA_UNLOCK(&client->clientMutex);
     if(ac->callback)
         ac->callback(client, ac->userdata, requestId, response);
+    UA_LOCK(&client->clientMutex);
 
     /* Clean up */
     UA_NodeId_clear(&responseTypeId);
@@ -393,14 +406,14 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
 }
 
 void
-__UA_Client_Service(UA_Client *client, const void *request,
+__Client_Service(UA_Client *client, const void *request,
                     const UA_DataType *requestType, void *response,
                     const UA_DataType *responseType) {
+    UA_ResponseHeader *respHeader = (UA_ResponseHeader*)response;
+
     /* Initialize. Response is valied in case of aborting. */
     UA_init(response, responseType);
 
-    UA_ResponseHeader *respHeader = (UA_ResponseHeader*)response;
-
     /* Verify that the EventLoop is running */
     UA_EventLoop *el = client->config.eventLoop;
     if(!el || el->state != UA_EVENTLOOPSTATE_STARTED) {
@@ -467,13 +480,18 @@ __UA_Client_Service(UA_Client *client, const void *request,
     /* Run the EventLoop until the request was processed, the request has timed
      * out or the client connection fails */
     while(true) {
+        /* Unlock before dropping into the EventLoop. The client lock is
+         * re-taken in the network callback if an event occurs. */
+        UA_UNLOCK(&client->clientMutex);
         retval = el->run(el, timeout);
+        UA_LOCK(&client->clientMutex);
 
         /* Was the response received? In that case we can directly return. The
          * ac was already removed from the internal linked list. */
         if(ac.syncResponse == NULL)
             return;
 
+
         /* Check the status. Do not try to resend if the connection breaks.
          * Leave this to the application-level user. For example, we do not want
          * to call a method twice is the connection broke after sending the
@@ -508,13 +526,22 @@ __UA_Client_Service(UA_Client *client, const void *request,
     respHeader->serviceResult = retval;
 }
 
+void
+__UA_Client_Service(UA_Client *client, const void *request,
+                    const UA_DataType *requestType, void *response,
+                    const UA_DataType *responseType) {
+    UA_LOCK(&client->clientMutex);
+    __Client_Service(client, request, requestType, response, responseType);
+    UA_UNLOCK(&client->clientMutex);
+}
+
 /***********************************/
 /* Handling of Async Service Calls */
 /***********************************/
 
 static void
-UA_Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
-                              UA_StatusCode statusCode) {
+__Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
+                             UA_StatusCode statusCode) {
     /* Set the status for the synchronous service call. Don't free the ac. */
     if(ac->syncResponse) {
         ac->syncResponse->responseHeader.serviceResult = statusCode;
@@ -527,7 +554,9 @@ UA_Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
         UA_Response response;
         UA_init(&response, ac->responseType);
         response.responseHeader.serviceResult = statusCode;
+        UA_UNLOCK(&client->clientMutex);
         ac->callback(client, ac->userdata, ac->requestId, &response);
+        UA_LOCK(&client->clientMutex);
 
         /* Clean up the response. The user callback might move data into it. For
          * whatever reasons. */
@@ -538,7 +567,7 @@ UA_Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
 }
 
 void
-UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode) {
+__Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode) {
     /* Make this function reentrant. One of the async callbacks could indirectly
      * operate on the list. Moving all elements to a local list before iterating
      * that. */
@@ -551,31 +580,37 @@ UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode) {
     AsyncServiceCall *ac, *ac_tmp;
     LIST_FOREACH_SAFE(ac, &asyncServiceCalls, pointers, ac_tmp) {
         LIST_REMOVE(ac, pointers);
-        UA_Client_AsyncService_cancel(client, ac, statusCode);
+        __Client_AsyncService_cancel(client, ac, statusCode);
     }
 }
 
 UA_StatusCode
 UA_Client_modifyAsyncCallback(UA_Client *client, UA_UInt32 requestId,
                               void *userdata, UA_ClientAsyncServiceCallback callback) {
+    UA_LOCK(&client->clientMutex);
     AsyncServiceCall *ac;
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     LIST_FOREACH(ac, &client->asyncServiceCalls, pointers) {
         if(ac->requestId == requestId) {
             ac->callback = callback;
             ac->userdata = userdata;
-            return UA_STATUSCODE_GOOD;
+            res = UA_STATUSCODE_GOOD;
+            break;
         }
     }
-    return UA_STATUSCODE_BADNOTFOUND;
+    UA_UNLOCK(&client->clientMutex);
+    return res;
 }
 
 UA_StatusCode
-__UA_Client_AsyncServiceEx(UA_Client *client, const void *request,
-                           const UA_DataType *requestType,
-                           UA_ClientAsyncServiceCallback callback,
-                           const UA_DataType *responseType,
-                           void *userdata, UA_UInt32 *requestId,
-                           UA_UInt32 timeout) {
+__Client_AsyncServiceEx(UA_Client *client, const void *request,
+                        const UA_DataType *requestType,
+                        UA_ClientAsyncServiceCallback callback,
+                        const UA_DataType *responseType,
+                        void *userdata, UA_UInt32 *requestId,
+                        UA_UInt32 timeout) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
         UA_LOG_WARNING_CHANNEL(&client->config.logger, &client->channel,
                                "SecureChannel must be connected before sending requests");
@@ -612,17 +647,37 @@ __UA_Client_AsyncServiceEx(UA_Client *client, const void *request,
         *requestId = ac->requestId;
 
     notifyClientState(client);
+
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+__UA_Client_AsyncServiceEx(UA_Client *client, const void *request,
+                           const UA_DataType *requestType,
+                           UA_ClientAsyncServiceCallback callback,
+                           const UA_DataType *responseType,
+                           void *userdata, UA_UInt32 *requestId,
+                           UA_UInt32 timeout) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res =
+        __Client_AsyncServiceEx(client, request, requestType, callback, responseType,
+                                userdata, requestId, timeout);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
+}
+
 UA_StatusCode
 __UA_Client_AsyncService(UA_Client *client, const void *request,
                          const UA_DataType *requestType,
                          UA_ClientAsyncServiceCallback callback,
                          const UA_DataType *responseType,
                          void *userdata, UA_UInt32 *requestId) {
-    return __UA_Client_AsyncServiceEx(client, request, requestType, callback, responseType,
-                                      userdata, requestId, client->config.timeout);
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res =
+        __Client_AsyncServiceEx(client, request, requestType, callback, responseType,
+                                userdata, requestId, client->config.timeout);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
 }
 
 UA_StatusCode
@@ -644,9 +699,12 @@ UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
     if(!client->config.eventLoop)
         return UA_STATUSCODE_BADINTERNALERROR;
-    return client->config.eventLoop->
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = client->config.eventLoop->
         addTimedCallback(client->config.eventLoop, (UA_Callback)callback,
                          client, data, date, callbackId);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
 }
 
 UA_StatusCode
@@ -654,10 +712,13 @@ UA_Client_addRepeatedCallback(UA_Client *client, UA_ClientCallback callback,
                               void *data, UA_Double interval_ms, UA_UInt64 *callbackId) {
     if(!client->config.eventLoop)
         return UA_STATUSCODE_BADINTERNALERROR;
-    return client->config.eventLoop->
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = client->config.eventLoop->
         addCyclicCallback(client->config.eventLoop, (UA_Callback)callback,
                           client, data, interval_ms, NULL,
                           UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, callbackId);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
 }
 
 UA_StatusCode
@@ -665,17 +726,22 @@ UA_Client_changeRepeatedCallbackInterval(UA_Client *client, UA_UInt64 callbackId
                                          UA_Double interval_ms) {
     if(!client->config.eventLoop)
         return UA_STATUSCODE_BADINTERNALERROR;
-    return client->config.eventLoop->
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = client->config.eventLoop->
         modifyCyclicCallback(client->config.eventLoop, callbackId, interval_ms,
                              NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
 }
 
 void
 UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId) {
     if(!client->config.eventLoop)
         return;
+    UA_LOCK(&client->clientMutex);
     client->config.eventLoop->
         removeCyclicCallback(client->config.eventLoop, callbackId);
+    UA_UNLOCK(&client->clientMutex);
 }
 
 /**********************/
@@ -703,23 +769,28 @@ asyncServiceTimeoutCheck(UA_Client *client) {
     /* Cancel and remove the elements from the local list */
     LIST_FOREACH_SAFE(ac, &asyncServiceCalls, pointers, ac_tmp) {
         LIST_REMOVE(ac, pointers);
-        UA_Client_AsyncService_cancel(client, ac, UA_STATUSCODE_BADTIMEOUT);
+        __Client_AsyncService_cancel(client, ac, UA_STATUSCODE_BADTIMEOUT);
     }
 }
 
 static void
 backgroundConnectivityCallback(UA_Client *client, void *userdata,
                                UA_UInt32 requestId, const UA_ReadResponse *response) {
+    UA_LOCK(&client->clientMutex);
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADTIMEOUT) {
-        if(client->config.inactivityCallback)
+        if(client->config.inactivityCallback) {
+            UA_UNLOCK(&client->clientMutex);
             client->config.inactivityCallback(client);
+            UA_LOCK(&client->clientMutex);
+        }
     }
     client->pendingConnectivityCheck = false;
     client->lastConnectivityCheck = UA_DateTime_nowMonotonic();
+    UA_UNLOCK(&client->clientMutex);
 }
 
 static void
-UA_Client_backgroundConnectivity(UA_Client *client) {
+__Client_backgroundConnectivity(UA_Client *client) {
     if(!client->config.connectivityCheckInterval)
         return;
 
@@ -742,9 +813,10 @@ UA_Client_backgroundConnectivity(UA_Client *client) {
     request.nodesToRead = &rvid;
     request.nodesToReadSize = 1;
     UA_StatusCode retval =
-        __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_READREQUEST],
-                                 (UA_ClientAsyncServiceCallback)backgroundConnectivityCallback,
-                                 &UA_TYPES[UA_TYPES_READRESPONSE], NULL, NULL);
+        __Client_AsyncServiceEx(client, &request, &UA_TYPES[UA_TYPES_READREQUEST],
+                                (UA_ClientAsyncServiceCallback)backgroundConnectivityCallback,
+                                &UA_TYPES[UA_TYPES_READRESPONSE], NULL, NULL,
+                                client->config.timeout);
     if(retval == UA_STATUSCODE_GOOD)
         client->pendingConnectivityCheck = true;
 }
@@ -752,22 +824,24 @@ UA_Client_backgroundConnectivity(UA_Client *client) {
 /* Regular housekeeping activities in the client -- called via a cyclic callback */
 static void
 clientHouseKeeping(UA_Client *client, void *_) {
+    UA_LOCK(&client->clientMutex);
+
     UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                  "Internally check the the client state and "
                  "required activities");
 
     /* Renew Secure Channel */
-    UA_Client_renewSecureChannel(client);
+    __Client_renewSecureChannel(client);
 
     /* Send read requests from time to time to test the connectivity */
-    UA_Client_backgroundConnectivity(client);
+    __Client_backgroundConnectivity(client);
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     /* Feed the server PublishRequests for the Subscriptions */
-    UA_Client_Subscriptions_backgroundPublish(client);
+    __Client_Subscriptions_backgroundPublish(client);
 
     /* Check for inactive Subscriptions */
-    UA_Client_Subscriptions_backgroundPublishInactivityCheck(client);
+    __Client_Subscriptions_backgroundPublishInactivityCheck(client);
 #endif
 
     /* Did async services time out? Process callbacks with an error code */
@@ -775,13 +849,16 @@ clientHouseKeeping(UA_Client *client, void *_) {
 
     /* Log and notify user if the client state has changed */
     notifyClientState(client);
+
+    UA_UNLOCK(&client->clientMutex);
 }
 
 UA_StatusCode
 UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
-    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_ClientConfig *cc = &client->config;
     UA_EventLoop *el = cc->eventLoop;
-    UA_CHECK_ERROR(el != NULL, return UA_STATUSCODE_BADINTERNALERROR,
+    UA_CHECK_ERROR(el != NULL,
+                   return UA_STATUSCODE_BADINTERNALERROR,
                    &client->config.logger, UA_LOGCATEGORY_CLIENT,
                    "No EventLoop configured");
 
@@ -795,7 +872,6 @@ UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
     /* Process timed and network events in the EventLoop */
     rv = el->run(el, timeout);
     UA_CHECK_STATUS(rv, return rv);
-
     return client->connectStatus;
 }
 
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index b702bcb6936..891ec33d10e 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -481,7 +481,7 @@ sendOPNAsync(UA_Client *client, UA_Boolean renew) {
 }
 
 UA_StatusCode
-UA_Client_renewSecureChannel(UA_Client *client) {
+__Client_renewSecureChannel(UA_Client *client) {
     /* Check if OPN has been sent or the SecureChannel is still valid */
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN ||
        client->channel.renewState == UA_SECURECHANNELRENEWSTATE_SENT ||
@@ -491,9 +491,19 @@ UA_Client_renewSecureChannel(UA_Client *client) {
     return client->connectStatus;
 }
 
+UA_StatusCode
+UA_Client_renewSecureChannel(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = __Client_renewSecureChannel(client);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
+}
+
 static void
-responseActivateSession(UA_Client *client, void *userdata, UA_UInt32 requestId,
-                        void *response) {
+responseActivateSession(UA_Client *client, void *userdata,
+                        UA_UInt32 requestId, void *response) {
+    UA_LOCK(&client->clientMutex);
+
     UA_ActivateSessionResponse *ar = (UA_ActivateSessionResponse*)response;
     if(ar->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
@@ -510,6 +520,7 @@ responseActivateSession(UA_Client *client, void *userdata, UA_UInt32 requestId,
             /* Something else is wrong. Give up. */
             client->connectStatus = ar->responseHeader.serviceResult;
         }
+        UA_UNLOCK(&client->clientMutex);
         return;
     }
 
@@ -524,12 +535,16 @@ responseActivateSession(UA_Client *client, void *userdata, UA_UInt32 requestId,
     /* Immediately check if publish requests are outstanding - for example when
      * an existing Session has been reattached / activated. */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
-    UA_Client_Subscriptions_backgroundPublish(client);
+    __Client_Subscriptions_backgroundPublish(client);
 #endif
+
+    UA_UNLOCK(&client->clientMutex);
 }
 
 static UA_StatusCode
 activateSessionAsync(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_ActivateSessionRequest request;
     UA_ActivateSessionRequest_init(&request);
     request.requestHeader.requestHandle = ++client->requestHandle;
@@ -579,11 +594,11 @@ activateSessionAsync(UA_Client *client) {
 #endif
 
     if(retval == UA_STATUSCODE_GOOD)
-        retval = UA_Client_sendAsyncRequest(client, &request,
-                                            &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST],
-                                            (UA_ClientAsyncServiceCallback)responseActivateSession,
-                                            &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE],
-                                            NULL, NULL);
+        retval = __Client_AsyncServiceEx(client, &request,
+                                         &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST],
+                                         (UA_ClientAsyncServiceCallback)responseActivateSession,
+                                         &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE],
+                                         NULL, NULL, client->config.timeout);
 
     UA_ActivateSessionRequest_clear(&request);
     if(retval == UA_STATUSCODE_GOOD)
@@ -598,8 +613,10 @@ activateSessionAsync(UA_Client *client) {
 
 /* Combination of UA_Client_getEndpointsInternal and getEndpoints */
 static void
-responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
-                     void *response) {
+responseGetEndpoints(UA_Client *client, void *userdata,
+                     UA_UInt32 requestId, void *response) {
+    UA_LOCK(&client->clientMutex);
+
     client->endpointsHandshake = false;
 
     UA_GetEndpointsResponse *resp = (UA_GetEndpointsResponse*)response;
@@ -617,6 +634,7 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
         }
 
         UA_GetEndpointsResponse_clear(resp);
+        UA_UNLOCK(&client->clientMutex);
         return;
     }
 
@@ -633,7 +651,7 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
         /* Look out for binary transport endpoints.
          * Note: Siemens returns empty ProfileUrl, we will accept it as binary. */
         if(endpoint->transportProfileUri.length != 0 &&
-           !UA_String_equal (&endpoint->transportProfileUri, &binaryTransport))
+           !UA_String_equal(&endpoint->transportProfileUri, &binaryTransport))
             continue;
 
         /* Valid SecurityMode? */
@@ -793,19 +811,23 @@ responseGetEndpoints(UA_Client *client, void *userdata, UA_UInt32 requestId,
        !UA_String_equal(&client->config.endpoint.securityPolicyUri,
                         &client->channel.securityPolicy->policyUri))
         closeSecureChannel(client);
+    UA_UNLOCK(&client->clientMutex);
 }
 
 static UA_StatusCode
 requestGetEndpoints(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_GetEndpointsRequest request;
     UA_GetEndpointsRequest_init(&request);
     request.requestHeader.timestamp = UA_DateTime_now();
     request.requestHeader.timeoutHint = 10000;
     request.endpointUrl = client->endpointUrl;
     UA_StatusCode retval =
-        UA_Client_sendAsyncRequest(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
-                                   (UA_ClientAsyncServiceCallback) responseGetEndpoints,
-                                   &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], NULL, NULL);
+        __Client_AsyncServiceEx(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
+                                (UA_ClientAsyncServiceCallback) responseGetEndpoints,
+                                &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], NULL, NULL,
+                                client->config.timeout);
     if(retval == UA_STATUSCODE_GOOD)
         client->endpointsHandshake = true;
     else
@@ -818,6 +840,8 @@ requestGetEndpoints(UA_Client *client) {
 static void
 responseSessionCallback(UA_Client *client, void *userdata,
                         UA_UInt32 requestId, void *response) {
+    UA_LOCK(&client->clientMutex);
+
     UA_CreateSessionResponse *sessionResponse = (UA_CreateSessionResponse*)response;
     UA_StatusCode res = sessionResponse->responseHeader.serviceResult;
     if(res != UA_STATUSCODE_GOOD)
@@ -857,10 +881,14 @@ responseSessionCallback(UA_Client *client, void *userdata,
     client->connectStatus = res;
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_CLOSED;
+
+    UA_UNLOCK(&client->clientMutex);
 }
 
 static UA_StatusCode
 createSessionAsync(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     /* Generate the local nonce for the session */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
@@ -895,10 +923,11 @@ createSessionAsync(UA_Client *client) {
         request.clientCertificate = client->channel.securityPolicy->localCertificate;
     }
 
-    res = UA_Client_sendAsyncRequest(client, &request,
-                                     &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST],
-                                     (UA_ClientAsyncServiceCallback)responseSessionCallback,
-                                     &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL, NULL);
+    res = __Client_AsyncServiceEx(client, &request,
+                                  &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST],
+                                  (UA_ClientAsyncServiceCallback)responseSessionCallback,
+                                  &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL, NULL,
+                                  client->config.timeout);
 
     if(res == UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_CREATE_REQUESTED;
@@ -1062,12 +1091,13 @@ verifyClientApplicationURI(const UA_Client *client) {
 }
 
 static void
-UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void *application, void **connectionContext,
-                          UA_ConnectionState state,
-                          const UA_KeyValueMap *params,
-                          UA_ByteString msg) {
+__Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                         void *application, void **connectionContext,
+                         UA_ConnectionState state, const UA_KeyValueMap *params,
+                         UA_ByteString msg) {
+    /* Take the client lock */
     UA_Client *client = (UA_Client*)application;
+    UA_LOCK(&client->clientMutex);
 
     UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                  "Client network callback");
@@ -1121,7 +1151,7 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         /* Delete outstanding async services - the RequestId is no longer valid. Do
          * this after setting the Session state. Otherwise we send out new Publish
          * Requests immediately. */
-        UA_Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSECURECHANNELCLOSED);
+        __Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSECURECHANNELCLOSED);
 
         /* Clean up the channel and set the status to CLOSED */
         UA_SecureChannel_clear(&client->channel);
@@ -1161,6 +1191,7 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * callback from the ConnectionManager when the connection closes with a
          * StatusCode. */
         closeSecureChannel(client);
+        UA_UNLOCK(&client->clientMutex);
         return;
     }
 
@@ -1173,11 +1204,13 @@ UA_Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     /* Notify the application if the client state has changed */
     notifyClientState(client);
+    UA_UNLOCK(&client->clientMutex);
     return;
 
  refuse_connection:
     client->connectStatus = UA_STATUSCODE_BADCONNECTIONREJECTED;
     notifyClientState(client);
+    UA_UNLOCK(&client->clientMutex);
 }
 
 /* Initialize a TCP connection. Writes the result to client->connectStatus. */
@@ -1260,7 +1293,9 @@ initConnect(UA_Client *client) {
         paramMap.mapSize = 2;
 
         /* Open the client TCP connection */
-        res = cm->openConnection(cm, &paramMap, client, NULL, UA_Client_networkCallback);
+        UA_UNLOCK(&client->clientMutex);
+        res = cm->openConnection(cm, &paramMap, client, NULL, __Client_networkCallback);
+        UA_LOCK(&client->clientMutex);
         if(res == UA_STATUSCODE_GOOD)
             break;
     }
@@ -1277,6 +1312,7 @@ initConnect(UA_Client *client) {
 
 UA_StatusCode
 UA_Client_connectAsync(UA_Client *client, const char *endpointUrl) {
+    UA_LOCK(&client->clientMutex);
     client->noReconnect = false;
 
     /* Set the endpoint URL the client connects to */
@@ -1289,11 +1325,14 @@ UA_Client_connectAsync(UA_Client *client, const char *endpointUrl) {
     /* Connect Async */
     client->connectStatus = initConnect(client);
     notifyClientState(client);
+
+    UA_UNLOCK(&client->clientMutex);
     return client->connectStatus;
 }
 
 UA_StatusCode
 UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl) {
+    UA_LOCK(&client->clientMutex);
     client->noReconnect = false;
 
     /* Set the endpoint URL the client connects to */
@@ -1306,11 +1345,15 @@ UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl)
     /* Connect Async */
     client->connectStatus = initConnect(client);
     notifyClientState(client);
+
+    UA_UNLOCK(&client->clientMutex);
     return client->connectStatus;
 }
 
 void
 connectSync(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_DateTime now = UA_DateTime_nowMonotonic();
     UA_DateTime maxDate = now + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
 
@@ -1320,6 +1363,10 @@ connectSync(UA_Client *client) {
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return;
 
+    /* EventLoop is started. Otherwise initConnect would have failed. */
+    UA_EventLoop *el = client->config.eventLoop;
+    UA_assert(el);
+
     /* Run the EventLoop until connected, connect fail or timeout. Write the
      * iterate result to the connectStatus. So we do not attempt to restore a
      * failed connection during the sync connect. */
@@ -1334,14 +1381,19 @@ connectSync(UA_Client *client) {
             client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
             return;
         }
-        client->connectStatus =
-            UA_Client_run_iterate(client,
-                                  (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
+        UA_UNLOCK(&client->clientMutex);
+        UA_StatusCode res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
+        UA_LOCK(&client->clientMutex);
+        if(res != UA_STATUSCODE_GOOD) {
+            closeSecureChannel(client);
+            client->connectStatus = res;
+        }
     }
 }
 
 UA_StatusCode
 UA_Client_connect(UA_Client *client, const char *endpointUrl) {
+    UA_LOCK(&client->clientMutex);
     client->noReconnect = false;
 
     /* Set the endpoint URL the client connects to */
@@ -1353,11 +1405,15 @@ UA_Client_connect(UA_Client *client, const char *endpointUrl) {
 
     /* Connect Synchronous */
     connectSync(client);
+
+    UA_UNLOCK(&client->clientMutex);
     return client->connectStatus;
 }
 
 UA_StatusCode
 UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl) {
+    UA_LOCK(&client->clientMutex);
+
     client->noReconnect = false;
 
     /* Set the endpoint URL the client connects to */
@@ -1369,6 +1425,8 @@ UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl) {
 
     /* Connect Synchronous */
     connectSync(client);
+
+    UA_UNLOCK(&client->clientMutex);
     return client->connectStatus;
 }
 
@@ -1415,7 +1473,7 @@ sendCloseSession(UA_Client *client) {
     request.requestHeader.timeoutHint = 10000;
     request.deleteSubscriptions = true;
     UA_CloseSessionResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
+    __Client_Service(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
                         &response, &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE]);
     UA_CloseSessionRequest_clear(&request);
     UA_CloseSessionResponse_clear(&response);
@@ -1440,14 +1498,14 @@ closeSession(UA_Client *client) {
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     /* We need to clean up the subscriptions */
-    UA_Client_Subscriptions_clean(client);
+    __Client_Subscriptions_clean(client);
 #endif
 
     /* Reset so the next async connect creates a session by default */
     client->noSession = false;
 
     /* Delete outstanding async services */
-    UA_Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSESSIONCLOSED);
+    __Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSESSIONCLOSED);
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     client->currentlyOutStandingPublishRequests = 0;
@@ -1459,18 +1517,23 @@ closeSession(UA_Client *client) {
 static void
 closeSessionCallback(UA_Client *client, void *userdata,
                      UA_UInt32 requestId, void *response) {
+    UA_LOCK(&client->clientMutex);
     closeSession(client);
     closeSecureChannel(client);
     notifyClientState(client);
+    UA_UNLOCK(&client->clientMutex);
 }
 
 UA_StatusCode
 UA_Client_disconnectAsync(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
+
     client->noReconnect = true;
 
     if(client->sessionState == UA_SESSIONSTATE_CLOSED ||
        client->sessionState == UA_SESSIONSTATE_CLOSING) {
         closeSecureChannel(client);
+        UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -1483,20 +1546,25 @@ UA_Client_disconnectAsync(UA_Client *client) {
     request.requestHeader.timeoutHint = 10000;
     request.deleteSubscriptions = true;
     UA_StatusCode res =
-        UA_Client_sendAsyncRequest(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
-                                   (UA_ClientAsyncServiceCallback)closeSessionCallback,
-                                   &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE], NULL, NULL);
+        __Client_AsyncServiceEx(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
+                                (UA_ClientAsyncServiceCallback)closeSessionCallback,
+                                &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE], NULL, NULL,
+                                client->config.timeout);
     if(res != UA_STATUSCODE_GOOD) {
         /* Sending the close request failed. Continue to close the connection anyway. */
         closeSession(client);
         closeSecureChannel(client);
     }
     notifyClientState(client);
+
+    UA_UNLOCK(&client->clientMutex);
     return res;
 }
 
 UA_StatusCode
 UA_Client_disconnectSecureChannel(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
+
     client->noReconnect = true;
     closeSecureChannel(client);
 
@@ -1508,18 +1576,25 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
     if(el &&
        el->state != UA_EVENTLOOPSTATE_FRESH &&
        el->state != UA_EVENTLOOPSTATE_STOPPED) {
+        UA_UNLOCK(&client->clientMutex);
         while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
             el->run(el, 100);
         }
+        UA_LOCK(&client->clientMutex);
     }
 
     notifyClientState(client);
+
+    UA_UNLOCK(&client->clientMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
 UA_Client_disconnect(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
     client->noReconnect = true;
     closeSession(client);
-    return UA_Client_disconnectSecureChannel(client);
+    UA_UNLOCK(&client->clientMutex);
+    UA_StatusCode res = UA_Client_disconnectSecureChannel(client);
+    return res;
 }
diff --git a/src/client/ua_client_discovery.c b/src/client/ua_client_discovery.c
index 2d14d4adb28..9ea8f288947 100644
--- a/src/client/ua_client_discovery.c
+++ b/src/client/ua_client_discovery.c
@@ -11,9 +11,11 @@
 
 /* Gets a list of endpoints. Memory is allocated for endpointDescription array */
 static UA_StatusCode
-UA_Client_getEndpointsInternal(UA_Client *client, const UA_String endpointUrl,
-                               size_t *endpointDescriptionsSize,
-                               UA_EndpointDescription **endpointDescriptions) {
+getEndpointsInternal(UA_Client *client, const UA_String endpointUrl,
+                     size_t *endpointDescriptionsSize,
+                     UA_EndpointDescription **endpointDescriptions) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_GetEndpointsRequest request;
     UA_GetEndpointsRequest_init(&request);
     request.requestHeader.timestamp = UA_DateTime_now();
@@ -22,8 +24,8 @@ UA_Client_getEndpointsInternal(UA_Client *client, const UA_String endpointUrl,
     request.endpointUrl = endpointUrl;
 
     UA_GetEndpointsResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
+    __Client_Service(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
+                     &response, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
 
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_StatusCode retval = response.responseHeader.serviceResult;
@@ -43,24 +45,30 @@ UA_Client_getEndpointsInternal(UA_Client *client, const UA_String endpointUrl,
 
 UA_StatusCode
 UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
-                       size_t* endpointDescriptionsSize,
+                       size_t *endpointDescriptionsSize,
                        UA_EndpointDescription** endpointDescriptions) {
+    UA_LOCK(&client->clientMutex);
+
     UA_Boolean connected = (client->channel.state == UA_SECURECHANNELSTATE_OPEN);
     /* Client is already connected to a different server */
     if(connected && strncmp((const char*)client->config.endpoint.endpointUrl.data, serverUrl,
                             client->config.endpoint.endpointUrl.length) != 0) {
+        UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
     UA_StatusCode retval;
     const UA_String url = UA_STRING((char*)(uintptr_t)serverUrl);
     if(!connected) {
+        UA_UNLOCK(&client->clientMutex);
         retval = UA_Client_connectSecureChannel(client, serverUrl);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
+        UA_LOCK(&client->clientMutex);
     }
-    retval = UA_Client_getEndpointsInternal(client, url, endpointDescriptionsSize,
-                                            endpointDescriptions);
+    retval = getEndpointsInternal(client, url, endpointDescriptionsSize,
+                                  endpointDescriptions);
+    UA_UNLOCK(&client->clientMutex);
 
     if(!connected)
         UA_Client_disconnect(client);
@@ -73,18 +81,22 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
                       size_t localeIdsSize, UA_String *localeIds,
                       size_t *registeredServersSize,
                       UA_ApplicationDescription **registeredServers) {
+    UA_LOCK(&client->clientMutex);
     UA_Boolean connected = (client->channel.state == UA_SECURECHANNELSTATE_OPEN);
     /* Client is already connected to a different server */
     if(connected && strncmp((const char*)client->config.endpoint.endpointUrl.data, serverUrl,
                             client->config.endpoint.endpointUrl.length) != 0) {
+        UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
     UA_StatusCode retval;
     if(!connected) {
+        UA_UNLOCK(&client->clientMutex);
         retval = UA_Client_connectSecureChannel(client, serverUrl);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
+        UA_LOCK(&client->clientMutex);
     }
 
     /* Prepare the request */
@@ -97,8 +109,10 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
 
     /* Send the request */
     UA_FindServersResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+    __Client_Service(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST],
+                     &response, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+
+    UA_UNLOCK(&client->clientMutex);
 
     /* Process the response */
     retval = response.responseHeader.serviceResult;
@@ -126,18 +140,23 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
                                UA_UInt32 startingRecordId, UA_UInt32 maxRecordsToReturn,
                                size_t serverCapabilityFilterSize, UA_String *serverCapabilityFilter,
                                size_t *serverOnNetworkSize, UA_ServerOnNetwork **serverOnNetwork) {
+    UA_LOCK(&client->clientMutex);
+
     UA_Boolean connected = (client->channel.state == UA_SECURECHANNELSTATE_OPEN);
     /* Client is already connected to a different server */
     if(connected && strncmp((const char*)client->config.endpoint.endpointUrl.data, serverUrl,
                             client->config.endpoint.endpointUrl.length) != 0) {
+        UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
     UA_StatusCode retval;
     if(!connected) {
+        UA_UNLOCK(&client->clientMutex);
         retval = UA_Client_connectSecureChannel(client, serverUrl);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
+        UA_LOCK(&client->clientMutex);
     }
 
     /* Prepare the request */
@@ -150,8 +169,10 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
 
     /* Send the request */
     UA_FindServersOnNetworkResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSONNETWORKREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_FINDSERVERSONNETWORKRESPONSE]);
+    __Client_Service(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSONNETWORKREQUEST],
+                     &response, &UA_TYPES[UA_TYPES_FINDSERVERSONNETWORKRESPONSE]);
+
+    UA_UNLOCK(&client->clientMutex);
 
     /* Process the response */
     retval = response.responseHeader.serviceResult;
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 4c80053c543..092d9ddef2d 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -76,17 +76,17 @@ struct UA_Client_MonitoredItem_ForDelete {
 };
 
 void
-UA_Client_Subscriptions_clean(UA_Client *client);
+__Client_Subscriptions_clean(UA_Client *client);
 
 /* Exposed for fuzzing */
 UA_StatusCode
-UA_Client_preparePublishRequest(UA_Client *client, UA_PublishRequest *request);
+__Client_preparePublishRequest(UA_Client *client, UA_PublishRequest *request);
 
 void
-UA_Client_Subscriptions_backgroundPublish(UA_Client *client);
+__Client_Subscriptions_backgroundPublish(UA_Client *client);
 
 void
-UA_Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client);
+__Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client);
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
@@ -110,7 +110,7 @@ typedef struct AsyncServiceCall {
 typedef LIST_HEAD(UA_AsyncServiceList, AsyncServiceCall) UA_AsyncServiceList;
 
 void
-UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode);
+__Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode);
 
 typedef struct CustomCallback {
     UA_UInt32 callbackId;
@@ -179,6 +179,22 @@ struct UA_Client {
 #endif
 };
 
+UA_StatusCode
+__Client_AsyncServiceEx(UA_Client *client, const void *request,
+                        const UA_DataType *requestType,
+                        UA_ClientAsyncServiceCallback callback,
+                        const UA_DataType *responseType,
+                        void *userdata, UA_UInt32 *requestId,
+                        UA_UInt32 timeout);
+
+void
+__Client_Service(UA_Client *client, const void *request,
+                 const UA_DataType *requestType, void *response,
+                 const UA_DataType *responseType);
+
+UA_StatusCode
+__Client_renewSecureChannel(UA_Client *client);
+
 UA_StatusCode
 processServiceResponse(void *application, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index aa6f2629e91..38cbb33e0dd 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -49,6 +49,8 @@ MonitoredItem_delete(UA_Client *client, UA_Client_Subscription *sub,
 static void
 ua_Subscriptions_create(UA_Client *client, UA_Client_Subscription *newSub,
                         UA_CreateSubscriptionResponse *response) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     newSub->subscriptionId = response->subscriptionId;
     newSub->sequenceNumber = 0;
     newSub->lastActivity = UA_DateTime_nowMonotonic();
@@ -59,12 +61,14 @@ ua_Subscriptions_create(UA_Client *client, UA_Client_Subscription *newSub,
 
     /* Immediately send the first publish requests if there are none
      * outstanding */
-    UA_Client_Subscriptions_backgroundPublish(client);
+    __Client_Subscriptions_backgroundPublish(client);
 }
 
 static void
-ua_Subscriptions_create_handler(UA_Client *client, void *data, UA_UInt32 requestId,
-                                void *r) {
+ua_Subscriptions_create_handler(UA_Client *client, void *data,
+                                UA_UInt32 requestId, void *r) {
+    UA_LOCK_ASSERT(&client->clientMutex, 0);
+
     UA_CreateSubscriptionResponse *response = (UA_CreateSubscriptionResponse *)r;
     CustomCallback *cc = (CustomCallback *)data;
     UA_Client_Subscription *newSub = (UA_Client_Subscription *)cc->clientData;
@@ -74,7 +78,9 @@ ua_Subscriptions_create_handler(UA_Client *client, void *data, UA_UInt32 request
     }
 
     /* Prepare the internal representation */
+    UA_LOCK(&client->clientMutex);
     ua_Subscriptions_create(client, newSub, response);
+    UA_UNLOCK(&client->clientMutex);
 
 cleanup:
     if(cc->userCallback)
@@ -105,7 +111,9 @@ UA_Client_Subscriptions_create(UA_Client *client,
                         &request, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST],
                         &response, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
 
+    UA_LOCK(&client->clientMutex);
     ua_Subscriptions_create(client, sub, &response);
+    UA_UNLOCK(&client->clientMutex);
 
     return response;
 }
@@ -138,10 +146,9 @@ UA_Client_Subscriptions_create_async(UA_Client *client,
     cc->clientData = sub;
 
     /* Send the request as asynchronous service call */
-    return __UA_Client_AsyncService(
-        client, &request, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST],
-        ua_Subscriptions_create_handler, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE],
-        cc, requestId);
+    return __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST],
+                                    ua_Subscriptions_create_handler, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE],
+                                    cc, requestId);
 }
 
 static UA_Client_Subscription *
@@ -166,6 +173,7 @@ ua_Subscriptions_modify_handler(UA_Client *client, void *data, UA_UInt32 request
                                 void *r) {
     UA_ModifySubscriptionResponse *response = (UA_ModifySubscriptionResponse *)r;
     CustomCallback *cc = (CustomCallback *)data;
+    UA_LOCK(&client->clientMutex);
     UA_Client_Subscription *sub =
         findSubscription(client, (UA_UInt32)(uintptr_t)cc->clientData);
     if(sub) {
@@ -175,6 +183,7 @@ ua_Subscriptions_modify_handler(UA_Client *client, void *data, UA_UInt32 request
                     "No internal representation of subscription %" PRIu32,
                     (UA_UInt32)(uintptr_t)cc->clientData);
     }
+    UA_UNLOCK(&client->clientMutex);
 
     if(cc->userCallback)
         cc->userCallback(client, cc->userData, requestId, response);
@@ -188,7 +197,9 @@ UA_Client_Subscriptions_modify(UA_Client *client,
     UA_ModifySubscriptionResponse_init(&response);
 
     /* Find the internal representation */
+    UA_LOCK(&client->clientMutex);
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
+    UA_UNLOCK(&client->clientMutex);
     if(!sub) {
         response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return response;
@@ -199,8 +210,16 @@ UA_Client_Subscriptions_modify(UA_Client *client,
                         &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
                         &response, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 
-    /* Adjust the internal representation */
+    /* Adjust the internal representation. Lookup again for thread-safety. */
+    UA_LOCK(&client->clientMutex);
+    sub = findSubscription(client, request.subscriptionId);
+    if(!sub) {
+        response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
+        UA_UNLOCK(&client->clientMutex);
+        return response;
+    }
     ua_Subscriptions_modify(client, sub, &response);
+    UA_UNLOCK(&client->clientMutex);
     return response;
 }
 
@@ -210,7 +229,9 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
                                      UA_ClientAsyncServiceCallback callback,
                                      void *userdata, UA_UInt32 *requestId) {
     /* Find the internal representation */
+    UA_LOCK(&client->clientMutex);
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
+    UA_UNLOCK(&client->clientMutex);
     if(!sub)
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
 
@@ -222,10 +243,9 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
     cc->userData = userdata;
     cc->userCallback = callback;
 
-    return __UA_Client_AsyncService(
-        client, &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
-        ua_Subscriptions_modify_handler, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE],
-        cc, requestId);
+    return __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
+                                    ua_Subscriptions_modify_handler, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE],
+                                    cc, requestId);
 }
 
 static void
@@ -242,16 +262,23 @@ UA_MonitoredItem_delete_wrapper(UA_Client_MonitoredItem *mon, void *data) {
 }
 
 static void
-UA_Client_Subscription_deleteInternal(UA_Client *client,
-                                      UA_Client_Subscription *sub) {
+__Client_Subscription_deleteInternal(UA_Client *client,
+                                     UA_Client_Subscription *sub) {
     /* Remove the MonitoredItems */
     struct UA_Client_MonitoredItem_ForDelete deleteMonitoredItem = {0};
     deleteMonitoredItem.client = client;
     deleteMonitoredItem.sub = sub;
-    ZIP_ITER(MonitorItemsTree,&sub->monitoredItems, UA_MonitoredItem_delete_wrapper, &deleteMonitoredItem);
+    ZIP_ITER(MonitorItemsTree, &sub->monitoredItems,
+             UA_MonitoredItem_delete_wrapper, &deleteMonitoredItem);
+
     /* Call the delete callback */
-    if(sub->deleteCallback)
-        sub->deleteCallback(client, sub->subscriptionId, sub->context);
+    if(sub->deleteCallback) {
+        void *subC = sub->context;
+        UA_UInt32 subId = sub->subscriptionId;
+        UA_UNLOCK(&client->clientMutex);
+        sub->deleteCallback(client, subId, subC);
+        UA_LOCK(&client->clientMutex);
+    }
 
     /* Remove */
     LIST_REMOVE(sub, listEntry);
@@ -259,9 +286,9 @@ UA_Client_Subscription_deleteInternal(UA_Client *client,
 }
 
 static void
-UA_Client_Subscription_processDelete(UA_Client *client,
-                                     const UA_DeleteSubscriptionsRequest *request,
-                                     const UA_DeleteSubscriptionsResponse *response)  {
+__Client_Subscription_processDelete(UA_Client *client,
+                                    const UA_DeleteSubscriptionsRequest *request,
+                                    const UA_DeleteSubscriptionsResponse *response)  {
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
         return;
 
@@ -285,9 +312,8 @@ UA_Client_Subscription_processDelete(UA_Client *client,
         }
 
         /* Delete the Subscription */
-        UA_Client_Subscription_deleteInternal(client, sub);
+        __Client_Subscription_deleteInternal(client, sub);
     }
-
 }
 
 typedef struct {
@@ -297,15 +323,17 @@ typedef struct {
 } DeleteSubscriptionCallback;
 
 static void
-ua_Subscriptions_delete_handler(UA_Client *client, void *data, UA_UInt32 requestId,
-                                void *r) {
+ua_Subscriptions_delete_handler(UA_Client *client, void *data,
+                                UA_UInt32 requestId, void *r) {
     UA_DeleteSubscriptionsResponse *response =
         (UA_DeleteSubscriptionsResponse *)r;
     DeleteSubscriptionCallback *dsc =
         (DeleteSubscriptionCallback*)data;
 
     /* Delete */
-    UA_Client_Subscription_processDelete(client, &dsc->request, response);
+    UA_LOCK(&client->clientMutex);
+    __Client_Subscription_processDelete(client, &dsc->request, response);
+    UA_UNLOCK(&client->clientMutex);
 
     /* Userland Callback */
     dsc->userCallback(client, dsc->userData, requestId, response);
@@ -321,8 +349,8 @@ UA_Client_Subscriptions_delete_async(UA_Client *client,
                                      UA_ClientAsyncServiceCallback callback,
                                      void *userdata, UA_UInt32 *requestId) {
     /* Make a copy of the request that persists into the async callback */
-    DeleteSubscriptionCallback *dsc =
-        (DeleteSubscriptionCallback*)UA_malloc(sizeof(DeleteSubscriptionCallback));
+    DeleteSubscriptionCallback *dsc = (DeleteSubscriptionCallback*)
+        UA_malloc(sizeof(DeleteSubscriptionCallback));
     if(!dsc)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     dsc->userCallback = callback;
@@ -334,10 +362,9 @@ UA_Client_Subscriptions_delete_async(UA_Client *client,
     }
 
     /* Make the async call */
-    return __UA_Client_AsyncService(
-        client, &request, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST],
-        ua_Subscriptions_delete_handler, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE],
-        dsc, requestId);
+    return __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST],
+                                    ua_Subscriptions_delete_handler, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE],
+                                    dsc, requestId);
 }
 
 UA_DeleteSubscriptionsResponse
@@ -349,7 +376,9 @@ UA_Client_Subscriptions_delete(UA_Client *client,
                         &response, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
 
     /* Process */
-    UA_Client_Subscription_processDelete(client, &request, &response);
+    UA_LOCK(&client->clientMutex);
+    __Client_Subscription_processDelete(client, &request, &response);
+    UA_UNLOCK(&client->clientMutex);
     return response;
 }
 
@@ -386,10 +415,18 @@ UA_Client_Subscriptions_deleteSingle(UA_Client *client, UA_UInt32 subscriptionId
 static void
 MonitoredItem_delete(UA_Client *client, UA_Client_Subscription *sub,
                      UA_Client_MonitoredItem *mon) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     ZIP_REMOVE(MonitorItemsTree, &sub->monitoredItems, mon);
-    if(mon->deleteCallback)
-        mon->deleteCallback(client, sub->subscriptionId, sub->context,
-                            mon->monitoredItemId, mon->context);
+    if(mon->deleteCallback) {
+        void *subC = sub->context;
+        void *monC = mon->context;
+        UA_UInt32 subId = sub->subscriptionId;
+        UA_UInt32 monId = mon->monitoredItemId;
+        UA_UNLOCK(&client->clientMutex);
+        mon->deleteCallback(client, subId, subC, monId, monC);
+        UA_LOCK(&client->clientMutex);
+    }
     UA_free(mon);
 }
 
@@ -433,18 +470,24 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
     /* Add internally */
     for(size_t i = 0; i < request->itemsToCreateSize; i++) {
         if(response->results[i].statusCode != UA_STATUSCODE_GOOD) {
+            void *subC = sub->context;
+            UA_UInt32 subId = sub->subscriptionId;
+            UA_UNLOCK(&client->clientMutex);
             if(deleteCallbacks[i])
-                deleteCallbacks[i](client, sub->subscriptionId, sub->context,
-                                   0, data->contexts[i]);
+                deleteCallbacks[i](client, subId, subC, 0, data->contexts[i]);
+            UA_LOCK(&client->clientMutex);
             continue;
         }
 
         UA_Client_MonitoredItem *newMon = (UA_Client_MonitoredItem *)
             UA_malloc(sizeof(UA_Client_MonitoredItem));
         if(!newMon) {
+            void *subC = sub->context;
+            UA_UInt32 subId = sub->subscriptionId;
+            UA_UNLOCK(&client->clientMutex);
             if(deleteCallbacks[i])
-                deleteCallbacks[i](client, sub->subscriptionId, sub->context, 0,
-                                   data->contexts[i]);
+                deleteCallbacks[i](client, subId, subC, 0, data->contexts[i]);
+            UA_LOCK(&client->clientMutex);
             continue;
         }
 
@@ -456,13 +499,11 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
             (UA_Client_DataChangeNotificationCallback)(uintptr_t)
                 data->handlingCallbacks[i];
         newMon->isEventMonitoredItem =
-            (request->itemsToCreate[i].itemToMonitor.attributeId ==
-             UA_ATTRIBUTEID_EVENTNOTIFIER);
+            (request->itemsToCreate[i].itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER);
         ZIP_INSERT(MonitorItemsTree, &sub->monitoredItems, newMon, UA_UInt32_random());
 
         UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                     "Subscription %" PRIu32
-                     " | Added a MonitoredItem with handle %" PRIu32,
+                     "Subscription %" PRIu32 " | Added a MonitoredItem with handle %" PRIu32,
                      sub->subscriptionId, newMon->clientHandle);
     }
     return;
@@ -470,9 +511,12 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
     /* Adding failed */
  cleanup:
     for(size_t i = 0; i < request->itemsToCreateSize; i++) {
+        void *subC = sub ? sub->context : NULL;
+        UA_UNLOCK(&client->clientMutex);
         if(deleteCallbacks[i])
             deleteCallbacks[i](client, data->request.subscriptionId,
-                               sub ? sub->context : NULL, 0, data->contexts[i]);
+                               subC, 0, data->contexts[i]);
+        UA_LOCK(&client->clientMutex);
     }
 }
 
@@ -482,12 +526,14 @@ ua_MonitoredItems_create_async_handler(UA_Client *client, void *d, UA_UInt32 req
     UA_CreateMonitoredItemsResponse *response = (UA_CreateMonitoredItemsResponse *)r;
     MonitoredItems_CreateData *data = (MonitoredItems_CreateData *)d;
 
+    UA_LOCK(&client->clientMutex);
     ua_MonitoredItems_create(client, data, response);
+    MonitoredItems_CreateData_clear(client, data);
+    UA_UNLOCK(&client->clientMutex);
 
     if(data->userCallback)
         data->userCallback(client, data->userData, requestId, response);
 
-    MonitoredItems_CreateData_clear(client, data);
     UA_free(data);
 }
 
@@ -570,9 +616,9 @@ ua_Client_MonitoredItems_create(UA_Client *client,
 
     /* Call the service. Use data->request as it contains the client handle
      * information. */
-    __UA_Client_Service(client, &data.request,
-                        &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST],
-                        response, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
+    __Client_Service(client, &data.request,
+                     &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST],
+                     response, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
 
     /* Add internal representation */
     ua_MonitoredItems_create(client, &data, response);
@@ -581,10 +627,13 @@ ua_Client_MonitoredItems_create(UA_Client *client,
 }
 
 static UA_StatusCode
-ua_Client_MonitoredItems_createDataChanges_async(
-    UA_Client *client, const UA_CreateMonitoredItemsRequest request, void **contexts,
-    void **callbacks, UA_Client_DeleteMonitoredItemCallback *deleteCallbacks,
-    UA_ClientAsyncServiceCallback createCallback, void *userdata, UA_UInt32 *requestId) {
+createDataChanges_async(UA_Client *client, const UA_CreateMonitoredItemsRequest request,
+                        void **contexts, void **callbacks,
+                        UA_Client_DeleteMonitoredItemCallback *deleteCallbacks,
+                        UA_ClientAsyncServiceCallback createCallback, void *userdata,
+                        UA_UInt32 *requestId) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub)
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
@@ -593,20 +642,23 @@ ua_Client_MonitoredItems_createDataChanges_async(
         UA_calloc(1, sizeof(MonitoredItems_CreateData));
     if(!data)
         return UA_STATUSCODE_BADOUTOFMEMORY;
+
     data->userCallback = createCallback;
     data->userData = userdata;
 
-    UA_StatusCode res = MonitoredItems_CreateData_prepare(
-        client, &request, contexts, callbacks, deleteCallbacks, data);
+    UA_StatusCode res =
+        MonitoredItems_CreateData_prepare(client, &request, contexts,
+                                          callbacks, deleteCallbacks, data);
     if(res != UA_STATUSCODE_GOOD) {
         UA_free(data);
         return res;
     }
 
-    return __UA_Client_AsyncService(
-        client, &data->request, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST],
-        ua_MonitoredItems_create_async_handler,
-        &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE], data, requestId);
+    return __Client_AsyncServiceEx(client, &data->request,
+                                   &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST],
+                                   ua_MonitoredItems_create_async_handler,
+                                   &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE],
+                                   data, requestId, client->config.timeout);
 }
 
 UA_CreateMonitoredItemsResponse
@@ -616,8 +668,10 @@ UA_Client_MonitoredItems_createDataChanges(UA_Client *client,
                                            UA_Client_DataChangeNotificationCallback *callbacks,
                                            UA_Client_DeleteMonitoredItemCallback *deleteCallbacks) {
     UA_CreateMonitoredItemsResponse response;
+    UA_LOCK(&client->clientMutex);
     ua_Client_MonitoredItems_create(client, &request, contexts, (void **)callbacks,
                                     deleteCallbacks, &response);
+    UA_UNLOCK(&client->clientMutex);
     return response;
 }
 
@@ -629,9 +683,12 @@ UA_Client_MonitoredItems_createDataChanges_async(UA_Client *client,
                                                  UA_Client_DeleteMonitoredItemCallback *deleteCallbacks,
                                                  UA_ClientAsyncServiceCallback createCallback,
                                                  void *userdata, UA_UInt32 *requestId) {
-    return ua_Client_MonitoredItems_createDataChanges_async(
-        client, request, contexts, (void **)callbacks, deleteCallbacks, createCallback,
-        userdata, requestId);
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res =
+        createDataChanges_async(client, request, contexts, (void **)callbacks,
+                                deleteCallbacks, createCallback, userdata, requestId);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
 }
 
 UA_MonitoredItemCreateResult
@@ -672,8 +729,10 @@ UA_Client_MonitoredItems_createEvents(UA_Client *client,
                                       UA_Client_EventNotificationCallback *callback,
                                       UA_Client_DeleteMonitoredItemCallback *deleteCallback) {
     UA_CreateMonitoredItemsResponse response;
+    UA_LOCK(&client->clientMutex);
     ua_Client_MonitoredItems_create(client, &request, contexts, (void **)callback,
                                     deleteCallback, &response);
+    UA_UNLOCK(&client->clientMutex);
     return response;
 }
 
@@ -686,9 +745,12 @@ UA_Client_MonitoredItems_createEvents_async(UA_Client *client,
                                             UA_Client_DeleteMonitoredItemCallback *deleteCallbacks,
                                             UA_ClientAsyncServiceCallback createCallback,
                                             void *userdata, UA_UInt32 *requestId) {
-    return ua_Client_MonitoredItems_createDataChanges_async(
-        client, request, contexts, (void **)callbacks, deleteCallbacks, createCallback,
-        userdata, requestId);
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res =
+        createDataChanges_async(client, request, contexts, (void **)callbacks, deleteCallbacks,
+                                createCallback, userdata, requestId);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
 }
 
 UA_MonitoredItemCreateResult
@@ -739,18 +801,20 @@ ua_MonitoredItems_delete(UA_Client *client, UA_Client_Subscription *sub,
         }
         deleteMonitoredItem.monitoredItemId = &request->monitoredItemIds[i];
         /* Delete the internal representation */
-
-        ZIP_ITER(MonitorItemsTree,&sub->monitoredItems, UA_MonitoredItem_delete_wrapper, &deleteMonitoredItem);
+        ZIP_ITER(MonitorItemsTree,&sub->monitoredItems,
+                 UA_MonitoredItem_delete_wrapper, &deleteMonitoredItem);
     }
 }
 
 static void
-ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId,
-                                 void *r) {
+ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId, void *r) {
     CustomCallback *cc = (CustomCallback *)d;
     UA_DeleteMonitoredItemsResponse *response = (UA_DeleteMonitoredItemsResponse *)r;
     UA_DeleteMonitoredItemsRequest *request =
         (UA_DeleteMonitoredItemsRequest *)cc->clientData;
+
+    UA_LOCK(&client->clientMutex);
+
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
         goto cleanup;
 
@@ -766,6 +830,7 @@ ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId
     ua_MonitoredItems_delete(client, sub, request, response);
 
 cleanup:
+    UA_UNLOCK(&client->clientMutex);
     if(cc->userCallback)
         cc->userCallback(client, cc->userData, requestId, response);
     UA_DeleteMonitoredItemsRequest_delete(request);
@@ -784,17 +849,23 @@ UA_Client_MonitoredItems_delete(UA_Client *client,
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
         return response;
 
+    UA_LOCK(&client->clientMutex);
+
     /* Find the internal subscription representation */
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                     "No internal representation of subscription %" PRIu32,
                     request.subscriptionId);
+        UA_UNLOCK(&client->clientMutex);
         return response;
     }
 
     /* Remove MonitoredItems in the internal representation */
     ua_MonitoredItems_delete(client, sub, &request, &response);
+
+    UA_UNLOCK(&client->clientMutex);
+
     return response;
 }
 
@@ -819,10 +890,9 @@ UA_Client_MonitoredItems_delete_async(UA_Client *client,
     cc->userCallback = callback;
     cc->userData = userdata;
 
-    return __UA_Client_AsyncService(
-        client, &request, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST],
-        ua_MonitoredItems_delete_handler,
-        &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE], cc, requestId);
+    return __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST],
+                                    ua_MonitoredItems_delete_handler,
+                                    &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE], cc, requestId);
 }
 
 UA_StatusCode
@@ -869,30 +939,33 @@ UA_Client_MonitoredItems_modify(UA_Client *client,
                                 const UA_ModifyMonitoredItemsRequest request) {
     UA_ModifyMonitoredItemsResponse response;
 
+    UA_LOCK(&client->clientMutex);
     UA_Client_Subscription *sub;
     LIST_FOREACH(sub, &client->subscriptions, listEntry) {
         if (sub->subscriptionId == request.subscriptionId)
             break;
     }
 
-    if (!sub) {
+    if(!sub) {
         UA_ModifyMonitoredItemsResponse_init(&response);
         response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
+        UA_UNLOCK(&client->clientMutex);
         return response;
     }
 
     UA_ModifyMonitoredItemsRequest modifiedRequest;
     UA_ModifyMonitoredItemsRequest_copy(&request, &modifiedRequest);
 
-    for (size_t i = 0; i < modifiedRequest.itemsToModifySize; ++i) {
+    for(size_t i = 0; i < modifiedRequest.itemsToModifySize; ++i) {
         ZIP_ITER(MonitorItemsTree, &sub->monitoredItems,
                  UA_MonitoredItem_change_clientHandle, &modifiedRequest.itemsToModify[i]);
-
-        __UA_Client_Service(client, &modifiedRequest,
-                            &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], &response,
-                            &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+        __Client_Service(client, &modifiedRequest,
+                         &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], &response,
+                         &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
     }
     UA_ModifyMonitoredItemsRequest_clear(&modifiedRequest);
+
+    UA_UNLOCK(&client->clientMutex);
     return response;
 }
 
@@ -902,7 +975,9 @@ UA_Client_MonitoredItems_modify(UA_Client *client,
 
 /* Assume the request is already initialized */
 UA_StatusCode
-UA_Client_preparePublishRequest(UA_Client *client, UA_PublishRequest *request) {
+__Client_preparePublishRequest(UA_Client *client, UA_PublishRequest *request) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     /* Count acks */
     UA_Client_NotificationsAckNumber *ack;
     LIST_FOREACH(ack, &client->pendingNotificationsAcks, listEntry)
@@ -932,7 +1007,7 @@ UA_Client_preparePublishRequest(UA_Client *client, UA_PublishRequest *request) {
 /* According to OPC Unified Architecture, Part 4 5.13.1.1 i) */
 /* The value 0 is never used for the sequence number         */
 static UA_UInt32
-UA_Client_Subscriptions_nextSequenceNumber(UA_UInt32 sequenceNumber) {
+__nextSequenceNumber(UA_UInt32 sequenceNumber) {
     UA_UInt32 nextSequenceNumber = sequenceNumber + 1;
     if(nextSequenceNumber == 0)
         nextSequenceNumber = 1;
@@ -942,6 +1017,8 @@ UA_Client_Subscriptions_nextSequenceNumber(UA_UInt32 sequenceNumber) {
 static void
 processDataChangeNotification(UA_Client *client, UA_Client_Subscription *sub,
                               UA_DataChangeNotification *dataChangeNotification) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     for(size_t j = 0; j < dataChangeNotification->monitoredItemsSize; ++j) {
         UA_MonitoredItemNotification *min = &dataChangeNotification->monitoredItems[j];
 
@@ -966,9 +1043,13 @@ processDataChangeNotification(UA_Client *client, UA_Client_Subscription *sub,
         }
 
         if(mon->handler.dataChangeCallback) {
-            mon->handler.dataChangeCallback(client, sub->subscriptionId, sub->context,
-                                            mon->monitoredItemId, mon->context,
-                                            &min->value);
+            void *subC = sub->context;
+            void *monC = mon->context;
+            UA_UInt32 subId = sub->subscriptionId;
+            UA_UInt32 monId = mon->monitoredItemId;
+            UA_UNLOCK(&client->clientMutex);
+            mon->handler.dataChangeCallback(client, subId, subC, monId, monC, &min->value);
+            UA_LOCK(&client->clientMutex);
         }
     }
 }
@@ -976,6 +1057,8 @@ processDataChangeNotification(UA_Client *client, UA_Client_Subscription *sub,
 static void
 processEventNotification(UA_Client *client, UA_Client_Subscription *sub,
                          UA_EventNotificationList *eventNotificationList) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     for(size_t j = 0; j < eventNotificationList->eventsSize; ++j) {
         UA_EventFieldList *eventFieldList = &eventNotificationList->events[j];
 
@@ -1000,16 +1083,23 @@ processEventNotification(UA_Client *client, UA_Client_Subscription *sub,
             continue;
         }
 
-        mon->handler.eventCallback(client, sub->subscriptionId, sub->context,
-                                   mon->monitoredItemId, mon->context,
+        void *subC = sub->context;
+        void *monC = mon->context;
+        UA_UInt32 subId = sub->subscriptionId;
+        UA_UInt32 monId = mon->monitoredItemId;
+        UA_UNLOCK(&client->clientMutex);
+        mon->handler.eventCallback(client, subId, subC, monId, monC,
                                    eventFieldList->eventFieldsSize,
                                    eventFieldList->eventFields);
+        UA_LOCK(&client->clientMutex);
     }
 }
 
 static void
 processNotificationMessage(UA_Client *client, UA_Client_Subscription *sub,
                            UA_ExtensionObject *msg) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     if(msg->encoding != UA_EXTENSIONOBJECT_DECODED)
         return;
 
@@ -1032,8 +1122,12 @@ processNotificationMessage(UA_Client *client, UA_Client_Subscription *sub,
     /* Handle StatusChangeNotification */
     if(msg->content.decoded.type == &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]) {
         if(sub->statusChangeCallback) {
-            sub->statusChangeCallback(client, sub->subscriptionId, sub->context,
+            void *subC = sub->context;
+            UA_UInt32 subId = sub->subscriptionId;
+            UA_UNLOCK(&client->clientMutex);
+            sub->statusChangeCallback(client, subId, subC,
                                       (UA_StatusChangeNotification*)msg->content.decoded.data);
+            UA_LOCK(&client->clientMutex);
         } else {
             UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                            "Dropped a StatusChangeNotification since no "
@@ -1047,8 +1141,10 @@ processNotificationMessage(UA_Client *client, UA_Client_Subscription *sub,
 }
 
 static void
-UA_Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishRequest *request,
-                                               UA_PublishResponse *response) {
+__Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishRequest *request,
+                                              UA_PublishResponse *response) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_NotificationMessage *msg = &response->notificationMessage;
 
     client->currentlyOutStandingPublishRequests--;
@@ -1075,31 +1171,31 @@ UA_Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishRequ
         return;
     }
 
+    UA_Client_Subscription *sub = findSubscription(client, response->subscriptionId);
+    if(!sub) {
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Received Publish Response for a non-existant subscription");
+        return;
+    }
+
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
         if(client->sessionState != UA_SESSIONSTATE_ACTIVATED) {
             UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                            "Received Publish Response with code %s",
                            UA_StatusCode_name(response->responseHeader.serviceResult));
-            UA_Client_Subscription* sub = findSubscription(client, response->subscriptionId);
-            if (sub != NULL)
-              UA_Client_Subscription_deleteInternal(client, sub);
+            __Client_Subscription_deleteInternal(client, sub);
         }
         return;
     }
 
-    if(response->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID) {
-        UA_Client_disconnectAsync(client); /* TODO: This should be handled before the process callback */
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "Received BadSessionIdInvalid");
-        return;
-    }
-
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADTIMEOUT) {
-        if (client->config.subscriptionInactivityCallback) {
-            UA_Client_Subscription* sub = findSubscription(client, response->subscriptionId);
-            if (sub != NULL)
-                client->config.subscriptionInactivityCallback(client, sub->subscriptionId,
-                                                              sub->context);
+        if(client->config.subscriptionInactivityCallback) {
+            void *subC = sub->context;
+            UA_UInt32 subId = sub->subscriptionId;
+            UA_UNLOCK(&client->clientMutex);
+            client->config.subscriptionInactivityCallback(client, subId, subC);
+            UA_LOCK(&client->clientMutex);
         }
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Received Timeout for Publish Response");
@@ -1113,22 +1209,13 @@ UA_Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishRequ
         return;
     }
 
-    UA_Client_Subscription *sub = findSubscription(client, response->subscriptionId);
-    if(!sub) {
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "Received Publish Response for a non-existant subscription");
-        return;
-    }
-
     sub->lastActivity = UA_DateTime_nowMonotonic();
 
     /* Detect missing message - OPC Unified Architecture, Part 4 5.13.1.1 e) */
-    if(UA_Client_Subscriptions_nextSequenceNumber(sub->sequenceNumber) != msg->sequenceNumber) {
+    if(__nextSequenceNumber(sub->sequenceNumber) != msg->sequenceNumber) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Invalid subscription sequence number: expected %" PRIu32
-                       " but got %" PRIu32,
-                       UA_Client_Subscriptions_nextSequenceNumber(sub->sequenceNumber),
+                       " but got %" PRIu32, __nextSequenceNumber(sub->sequenceNumber),
                        msg->sequenceNumber);
         /* This is an error. But we do not abort the connection. Some server
          * SDKs misbehave from time to time and send out-of-order sequence
@@ -1172,18 +1259,22 @@ processPublishResponseAsync(UA_Client *client, void *userdata,
     UA_PublishRequest *req = (UA_PublishRequest*)userdata;
     UA_PublishResponse *res = (UA_PublishResponse*)response;
 
+    UA_LOCK(&client->clientMutex);
+
     /* Process the response */
-    UA_Client_Subscriptions_processPublishResponse(client, req, res);
+    __Client_Subscriptions_processPublishResponse(client, req, res);
 
     /* Delete the cached request */
     UA_PublishRequest_delete(req);
 
     /* Fill up the outstanding publish requests */
-    UA_Client_Subscriptions_backgroundPublish(client);
+    __Client_Subscriptions_backgroundPublish(client);
+
+    UA_UNLOCK(&client->clientMutex);
 }
 
 void
-UA_Client_Subscriptions_clean(UA_Client *client) {
+__Client_Subscriptions_clean(UA_Client *client) {
     UA_Client_NotificationsAckNumber *n;
     UA_Client_NotificationsAckNumber *tmp;
     LIST_FOREACH_SAFE(n, &client->pendingNotificationsAcks, listEntry, tmp) {
@@ -1194,13 +1285,15 @@ UA_Client_Subscriptions_clean(UA_Client *client) {
     UA_Client_Subscription *sub;
     UA_Client_Subscription *tmps;
     LIST_FOREACH_SAFE(sub, &client->subscriptions, listEntry, tmps)
-        UA_Client_Subscription_deleteInternal(client, sub); /* force local removal */
+        __Client_Subscription_deleteInternal(client, sub); /* force local removal */
 
     client->monitoredItemHandles = 0;
 }
 
 void
-UA_Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client) {
+__Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     if(client->sessionState < UA_SESSIONSTATE_ACTIVATED)
         return;
 
@@ -1217,9 +1310,13 @@ UA_Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client) {
             /* Reset activity */
             sub->lastActivity = UA_DateTime_nowMonotonic();
 
-            if(client->config.subscriptionInactivityCallback)
-                client->config.subscriptionInactivityCallback(client, sub->subscriptionId,
-                                                              sub->context);
+            if(client->config.subscriptionInactivityCallback) {
+                void *subC = sub->context;
+                UA_UInt32 subId = sub->subscriptionId;
+                UA_UNLOCK(&client->clientMutex);
+                client->config.subscriptionInactivityCallback(client, subId, subC);
+                UA_LOCK(&client->clientMutex);
+            }
             UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                            "Inactivity for Subscription %" PRIu32 ".", sub->subscriptionId);
         }
@@ -1227,7 +1324,9 @@ UA_Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client) {
 }
 
 void
-UA_Client_Subscriptions_backgroundPublish(UA_Client *client) {
+__Client_Subscriptions_backgroundPublish(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     if(client->sessionState < UA_SESSIONSTATE_ACTIVATED)
         return;
 
@@ -1240,8 +1339,8 @@ UA_Client_Subscriptions_backgroundPublish(UA_Client *client) {
         if(!request)
             return;
 
-        request->requestHeader.timeoutHint=60000;
-        UA_StatusCode retval = UA_Client_preparePublishRequest(client, request);
+        request->requestHeader.timeoutHint = 60000;
+        UA_StatusCode retval = __Client_preparePublishRequest(client, request);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_PublishRequest_delete(request);
             return;
@@ -1252,11 +1351,11 @@ UA_Client_Subscriptions_backgroundPublish(UA_Client *client) {
 
         /* Disable the timeout, it is treat in
          * UA_Client_Subscriptions_backgroundPublishInactivityCheck */
-        retval = __UA_Client_AsyncServiceEx(client, request,
-                                            &UA_TYPES[UA_TYPES_PUBLISHREQUEST],
-                                            processPublishResponseAsync,
-                                            &UA_TYPES[UA_TYPES_PUBLISHRESPONSE],
-                                            (void*)request, &requestId, 0);
+        retval = __Client_AsyncServiceEx(client, request,
+                                         &UA_TYPES[UA_TYPES_PUBLISHREQUEST],
+                                         processPublishResponseAsync,
+                                         &UA_TYPES[UA_TYPES_PUBLISHRESPONSE],
+                                         (void*)request, &requestId, 0);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_PublishRequest_delete(request);
             return;

From b9d933413695ff94e7b1d987a43171483d94d23f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Nov 2022 18:24:37 +0100
Subject: [PATCH 0537/1963] feat(client): Warn if the Session closed during a
 request

---
 src/client/ua_client.c          | 15 ++++++++++++---
 src/client/ua_client_connect.c  | 28 +++++++++++-----------------
 src/client/ua_client_internal.h |  1 +
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 7f4bcd0786b..256130852fa 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -292,8 +292,6 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
     UA_Response *response = (ac->syncResponse) ? ac->syncResponse : &asyncResponse;
     const UA_DataType *responseType = ac->responseType;
 
-    /* TODO: Handle UA_STATUSCODE_BADSESSIONCLOSED et al. here */
-
     /* Dequeue ac. We might disconnect the client (remove all ac) in the callback. */
     LIST_REMOVE(ac, pointers);
 
@@ -344,6 +342,16 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
         response->responseHeader.serviceResult = retval;
     }
 
+    /* Warn if the Session closed */
+    if(responseType != &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE] &&
+       (response->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
+        response->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED)) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Session no longer valid. A new Session is created for the next "
+                       "Service request but we do not re-send the current request.");
+        cleanupSession(client);
+    }
+
     /* Call the async callback. This is the only thread with access to ac. So we
      * can just unlock for the callback into userland. */
     UA_UNLOCK(&client->clientMutex);
@@ -425,7 +433,8 @@ __Client_Service(UA_Client *client, const void *request,
     UA_DateTime maxDate = UA_DateTime_nowMonotonic() +
         ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
 
-    /* Check that the SecureChannel is open. Otherwise reopen. */
+    /* Check that the SecureChannel is open and also a Session active (if we
+     * want a Session). Otherwise reopen. */
     if((client->sessionState != UA_SESSIONSTATE_ACTIVATED && !client->noSession) ||
        client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 891ec33d10e..8029b40f013 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -17,7 +17,6 @@
 #define MAX_DATA_SIZE 4096
 
 static UA_StatusCode initConnect(UA_Client *client);
-static void closeSession(UA_Client *client);
 static UA_StatusCode createSessionAsync(UA_Client *client);
 
 static UA_SecurityPolicy *
@@ -512,10 +511,10 @@ responseActivateSession(UA_Client *client, void *userdata,
         if(ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
            ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
             /* The session is no longer usable. Create a brand new one. */
-            closeSession(client);
-            client->connectStatus = createSessionAsync(client);
+            cleanupSession(client);
             UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                          "Session cannot be activated. Create a new Session.");
+            client->connectStatus = createSessionAsync(client);
         } else {
             /* Something else is wrong. Give up. */
             client->connectStatus = ar->responseHeader.serviceResult;
@@ -1483,16 +1482,8 @@ sendCloseSession(UA_Client *client) {
     client->sessionState = UA_SESSIONSTATE_CLOSING;
 }
 
-static void
-closeSession(UA_Client *client) {
-    if(client->sessionState == UA_SESSIONSTATE_CLOSED ||
-       client->sessionState == UA_SESSIONSTATE_CLOSING)
-        return;
-
-    /* Is a session established? */
-    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
-        sendCloseSession(client);
-
+void
+cleanupSession(UA_Client *client) {
     UA_NodeId_clear(&client->authenticationToken);
     client->requestHandle = 0;
 
@@ -1518,7 +1509,7 @@ static void
 closeSessionCallback(UA_Client *client, void *userdata,
                      UA_UInt32 requestId, void *response) {
     UA_LOCK(&client->clientMutex);
-    closeSession(client);
+    cleanupSession(client);
     closeSecureChannel(client);
     notifyClientState(client);
     UA_UNLOCK(&client->clientMutex);
@@ -1551,8 +1542,9 @@ UA_Client_disconnectAsync(UA_Client *client) {
                                 &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE], NULL, NULL,
                                 client->config.timeout);
     if(res != UA_STATUSCODE_GOOD) {
-        /* Sending the close request failed. Continue to close the connection anyway. */
-        closeSession(client);
+        /* Sending the close request failed. Continue to close the connection
+         * anyway. */
+        cleanupSession(client);
         closeSecureChannel(client);
     }
     notifyClientState(client);
@@ -1593,7 +1585,9 @@ UA_StatusCode
 UA_Client_disconnect(UA_Client *client) {
     UA_LOCK(&client->clientMutex);
     client->noReconnect = true;
-    closeSession(client);
+    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
+        sendCloseSession(client);
+    cleanupSession(client);
     UA_UNLOCK(&client->clientMutex);
     UA_StatusCode res = UA_Client_disconnectSecureChannel(client);
     return res;
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 092d9ddef2d..272dabcb3a7 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -206,6 +206,7 @@ void processERRResponse(UA_Client *client, const UA_ByteString *chunk);
 void processACKResponse(UA_Client *client, const UA_ByteString *chunk);
 void processOPNResponse(UA_Client *client, const UA_ByteString *message);
 void closeSecureChannel(UA_Client *client);
+void cleanupSession(UA_Client *client);
 
 _UA_END_DECLS
 

From 38e716ed59230759334670c10df15566325754ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 00:27:43 +0000
Subject: [PATCH 0538/1963] build(deps): bump deps/nodesetLoader from `f2c03ca`
 to `8a26df9`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `f2c03ca` to `8a26df9`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/f2c03cabbf1e38a4f7cb62526124d116661bcbc6...8a26df93aa5aec176c6d9a718a5c1ef8def35f37)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index f2c03cabbf1..8a26df93aa5 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit f2c03cabbf1e38a4f7cb62526124d116661bcbc6
+Subproject commit 8a26df93aa5aec176c6d9a718a5c1ef8def35f37

From 892233aa85e1513c03f3b297582ad7c6026253a3 Mon Sep 17 00:00:00 2001
From: Colin Hogben <Colin.Hogben@ukaea.uk>
Date: Wed, 23 Nov 2022 11:23:39 +0000
Subject: [PATCH 0539/1963] fix(server) Refine fixup of logger pointers

Only fix up the loggers of the event loop and security policies if
they pointed into the supplied config.  E.g. a shared external event
loop may use a logger with a different context from that of the server
instance.
---
 src/server/ua_server.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 3d78dcd2ff5..023eb18cdbe 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -366,9 +366,11 @@ UA_Server_newWithConfig(UA_ServerConfig *config) {
     /* The config might have been "moved" into the server struct. Ensure that
      * the logger pointer is correct. */
     for(size_t i = 0; i < server->config.securityPoliciesSize; i++)
-        server->config.securityPolicies[i].logger = &server->config.logger;
+        if(server->config.securityPolicies[i].logger == &config->logger)
+            server->config.securityPolicies[i].logger = &server->config.logger;
 
-    server->config.eventLoop->logger = &server->config.logger;
+    if(server->config.eventLoop->logger == &config->logger)
+        server->config.eventLoop->logger = &server->config.logger;
 
     /* Reset the old config */
     memset(config, 0, sizeof(UA_ServerConfig));

From b947ba3627b51a451ff0ebcca55c806ceda6fa27 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas_fischer@siemens.com>
Date: Thu, 24 Nov 2022 11:06:05 +0100
Subject: [PATCH 0540/1963] fix(pubsub): deadlock on removeSDS (#5461)

* fix deadlock on removeSDS

* adjust remove function
---
 src/pubsub/ua_pubsub_manager.c | 14 +++++++++++---
 src/pubsub/ua_pubsub_ns0.c     |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index fcee39cf5d7..902236ebe04 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -669,8 +669,8 @@ UA_Server_addStandaloneSubscribedDataSet(UA_Server *server, const UA_StandaloneS
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
-UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
+static UA_StatusCode
+removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
     UA_StandaloneSubscribedDataSet *subscribedDataSet = UA_StandaloneSubscribedDataSet_findSDSbyId(server, sds);
     if(!subscribedDataSet){
         return UA_STATUSCODE_BADNOTFOUND;
@@ -684,7 +684,7 @@ UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId s
             UA_DataSetReader *currentReader, *tmpReader;
             LIST_FOREACH_SAFE(currentReader, &readerGroup->readers, listEntry, tmpReader){
                 if(UA_NodeId_equal(&currentReader->identifier, &subscribedDataSet->connectedReader)){
-                    UA_Server_removeDataSetReader(server, currentReader->identifier);
+                    removeDataSetReader(server, currentReader->identifier);
                     // todo -> break out of loop
                 }
             }
@@ -701,6 +701,14 @@ UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId s
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = removeStandaloneSubscribedDataSet(server, sds);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* Generate a new unique NodeId. This NodeId will be used for the information
  * model representation of PubSub entities. */
 #ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 5e31db77ac5..8fb0bd31dd5 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1182,7 +1182,7 @@ addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSub
 
 UA_StatusCode
 removeStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet) {
-    return UA_Server_deleteNode(server, subscribedDataSet->identifier, true);
+    return deleteNode(server, subscribedDataSet->identifier, true);
 }
 
 /**********************************************/

From d6e07083cf0bff8c9d0d12df2e303c217bb04f15 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 24 Nov 2022 22:56:42 +0100
Subject: [PATCH 0541/1963] refactor(el): Remove unused UA_EVENTSOURCETYPE_ANY

---
 include/open62541/plugin/eventloop.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index dda5ee13cab..faf0c1e5e33 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -197,7 +197,6 @@ typedef enum {
 /* Type-tag for proper casting of the difference EventSource (e.g. when they are
  * looked up via UA_EventLoop_findEventSource). */
 typedef enum {
-    UA_EVENTSOURCETYPE_ANY = 0,
     UA_EVENTSOURCETYPE_CONNECTIONMANAGER,
     UA_EVENTSOURCETYPE_INTERRUPTMANAGER
 } UA_EventSourceType;

From 81e47c2ed15f6fe094524fe69793983400c6fb0c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 25 Nov 2022 00:42:37 +0100
Subject: [PATCH 0542/1963] refactor(el): Make params a direct member of
 UA_EventSource

---
 arch/eventloop_posix_eth.c           |  2 +-
 arch/eventloop_posix_tcp.c           | 20 ++++++++------------
 arch/eventloop_posix_udp.c           | 21 ++++++++-------------
 include/open62541/plugin/eventloop.h |  8 +++-----
 4 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 23d2c12387b..3e2e3f71d0f 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -838,7 +838,7 @@ ETH_eventSourceDelete(UA_ConnectionManager *cm) {
     }
 
     /* Delete the parameters */
-    UA_KeyValueMap_clear(cm->eventSource.params);
+    UA_KeyValueMap_clear(&cm->eventSource.params);
     UA_String_clear(&cm->eventSource.name);
     UA_free(cm);
     return UA_STATUSCODE_GOOD;
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 02e8f24f4a6..167931addfe 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -913,14 +913,12 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
     /* Configure the receive buffer */
     UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
 
-    if(cm->eventSource.params != NULL) {
-       const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
-            UA_KeyValueMap_getScalar(cm->eventSource.params,
-                                     UA_QUALIFIEDNAME(0, "recv-bufsize"),
-                                     &UA_TYPES[UA_TYPES_UINT32]);
-        if(configRxBufSize)
-            rxBufSize = *configRxBufSize;
-    }
+    const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
+        UA_KeyValueMap_getScalar(&cm->eventSource.params,
+                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                 &UA_TYPES[UA_TYPES_UINT32]);
+    if(configRxBufSize)
+        rxBufSize = *configRxBufSize;
     UA_StatusCode res = UA_ByteString_allocBuffer(&tcm->rxBuffer, rxBufSize);
     if(res != UA_STATUSCODE_GOOD)
         return res;
@@ -958,12 +956,10 @@ TCP_eventSourceDelete(UA_ConnectionManager *cm) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    if(cm->eventSource.params != NULL) {
-        /* Delete the parameters */
-        UA_KeyValueMap_clear(cm->eventSource.params);
-    }
+    UA_KeyValueMap_clear(&cm->eventSource.params);
     UA_String_clear(&cm->eventSource.name);
     UA_free(cm);
+
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 9a1b5278ef4..9054d46b323 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -1274,14 +1274,12 @@ UDP_eventSourceStart(UA_ConnectionManager *cm) {
     /* The receive buffersize was configured? */
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
     UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
-    if(cm->eventSource.params != NULL) {
-        const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
-            UA_KeyValueMap_getScalar(cm->eventSource.params,
-                                     UA_QUALIFIEDNAME(0, "recv-bufsize"),
-                                     &UA_TYPES[UA_TYPES_UINT32]);
-        if(configRxBufSize)
-            rxBufSize = *configRxBufSize;
-    }
+    const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
+        UA_KeyValueMap_getScalar(&cm->eventSource.params,
+                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                 &UA_TYPES[UA_TYPES_UINT32]);
+    if(configRxBufSize)
+        rxBufSize = *configRxBufSize;
     UA_StatusCode res = UA_ByteString_allocBuffer(&ucm->rxBuffer, rxBufSize);
     if(res != UA_STATUSCODE_GOOD)
         return res;
@@ -1320,13 +1318,10 @@ UDP_eventSourceDelete(UA_ConnectionManager *cm) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* Delete the parameters */
-    if(cm->eventSource.params != NULL) {
-        UA_KeyValueMap_delete(cm->eventSource.params);
-        cm->eventSource.params = NULL;
-    }
+    UA_KeyValueMap_clear(&cm->eventSource.params);
     UA_String_clear(&cm->eventSource.name);
     UA_free(cm);
+
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index faf0c1e5e33..0400b8e795d 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -211,7 +211,7 @@ struct UA_EventSource {
      * ~~~~~~~~~~~~~ */
     UA_String name;                 /* Unique name of the ES */
     UA_EventLoop *eventLoop;        /* EventLoop where the ES is registered */
-    UA_KeyValueMap *params;
+    UA_KeyValueMap params;
 
     /* Lifecycle
      * ~~~~~~~~~ */
@@ -303,8 +303,7 @@ struct UA_ConnectionManager {
      * hostname. Each protocol implementation documents whether multiple
      * connections might be opened at once. */
     UA_StatusCode
-    (*openConnection)(UA_ConnectionManager *cm,
-                      const UA_KeyValueMap *params,
+    (*openConnection)(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                       void *application, void *context,
                       UA_ConnectionManager_connectionCallback connectionCallback);
 
@@ -319,8 +318,7 @@ struct UA_ConnectionManager {
      * example a tx-time for sending in time-synchronized TSN settings. */
     UA_StatusCode
     (*sendWithConnection)(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          const UA_KeyValueMap *params,
-                          UA_ByteString *buf);
+                          const UA_KeyValueMap *params, UA_ByteString *buf);
 
     /* Close a Connection
      * ~~~~~~~~~~~~~~~~~~

From 88b8d6a7995f0cdf17781a2ac612511314b3b6c0 Mon Sep 17 00:00:00 2001
From: Colin Hogben <Colin.Hogben@ukaea.uk>
Date: Sat, 19 Nov 2022 17:13:23 +0000
Subject: [PATCH 0543/1963] fix(client): Fix up logger references in client
 config

In UA_Client_newWithConfig, fix up logger references within eventLoop
and securityPolicies: if they point into the (possibly transient)
supplied UA_ClientConfig structure, change them to point into the
"moved" config within the client itself.  The fixups are similar to
those done in UA_Server_newWithConfig.

Partly addresses #5435
---
 src/client/ua_client.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 256130852fa..c8192dc0a92 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -40,6 +40,14 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
         return NULL;
     memset(client, 0, sizeof(UA_Client));
     client->config = *config;
+    /* Fix up known logger pointers now that the config has "moved" into the
+     * client struct */
+    if(client->config.eventLoop->logger == &config->logger)
+        client->config.eventLoop->logger = &client->config.logger;
+    for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
+        if(client->config.securityPolicies[i].logger == &config->logger)
+            client->config.securityPolicies[i].logger = &client->config.logger;
+    }
 
     UA_SecureChannel_init(&client->channel);
     client->channel.config = client->config.localConnectionConfig;

From 021d04dc7cb6bf0b1b8bc8da6f65741d95860594 Mon Sep 17 00:00:00 2001
From: Colin Hogben <Colin.Hogben@ukaea.uk>
Date: Sat, 19 Nov 2022 17:13:23 +0000
Subject: [PATCH 0544/1963] refactor(plugin): Remove redundant client logger
 fixup

Remove the event loop logger fixup from UA_Client_new, since this is
now done in UA_Client_newWithConfig.

Partly addresses #5435
---
 plugins/ua_config_default.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index b8eba54a470..599b559beb1 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -795,16 +795,7 @@ UA_Client * UA_Client_new(void) {
         config.eventLoop->registerEventSource(config.eventLoop, (UA_EventSource *)udpCM);
     }
 
-    UA_Client *c = UA_Client_newWithConfig(&config);
-
-    if(c) {
-        /* Update the EventLoop to the logger in the new location inside the
-         * client */
-        UA_ClientConfig *cc = UA_Client_getConfig(c);
-        cc->eventLoop->logger = &cc->logger;
-    }
-
-    return c;
+    return UA_Client_newWithConfig(&config);
 }
 
 UA_StatusCode

From bf4a729e3f6afd57c8babc9b4348c16a02f2792d Mon Sep 17 00:00:00 2001
From: Colin Hogben <Colin.Hogben@ukaea.uk>
Date: Sat, 19 Nov 2022 17:44:46 +0000
Subject: [PATCH 0545/1963] refactor(client): Defer setup of client
 housekeeping callback

Defer setting up the housekeeping callback until the event loop is
used - normally when connecting.  This allows replacing the default
event loop after calling UA_Client_new.

Partly addresses #5435
---
 src/client/ua_client.c          | 37 +++++++++++++++++++++------------
 src/client/ua_client_connect.c  | 14 ++-----------
 src/client/ua_client_internal.h |  3 +++
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index c8192dc0a92..e586231ace2 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -57,15 +57,6 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
     UA_LOCK_INIT(&client->clientMutex);
 #endif
 
-    /* Set up the regular callback for checking the internal state */
-    UA_StatusCode res =
-        UA_Client_addRepeatedCallback(client,
-                                      (UA_ClientCallback)clientHouseKeeping,
-                                      NULL, 1000.0, &client->houseKeepingCallbackId);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_Client_delete(client);
-        return NULL;
-    }
     return client;
 }
 
@@ -871,22 +862,42 @@ clientHouseKeeping(UA_Client *client, void *_) {
 }
 
 UA_StatusCode
-UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
-    UA_ClientConfig *cc = &client->config;
-    UA_EventLoop *el = cc->eventLoop;
+__UA_Client_startup(UA_Client *client)
+{
+    /* On entry, the client mutex is already locked */
+    UA_EventLoop *el = client->config.eventLoop;
     UA_CHECK_ERROR(el != NULL,
                    return UA_STATUSCODE_BADINTERNALERROR,
                    &client->config.logger, UA_LOGCATEGORY_CLIENT,
                    "No EventLoop configured");
 
-    /* Start the EventLoop? */
+    /* Set up the regular callback for checking the internal state? */
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
+    if(!client->houseKeepingCallbackId) {
+        /* As per UA_Client_addRepeatedCallback but without locking mutex */
+        rv = el->addCyclicCallback(el, (UA_Callback)clientHouseKeeping,
+                                   client, NULL, 1000.0, NULL,
+                                   UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                   &client->houseKeepingCallbackId);
+        UA_CHECK_STATUS(rv, return rv);
+    }
+
+    /* Start the EventLoop? */
     if(el->state == UA_EVENTLOOPSTATE_FRESH) {
         rv = el->start(el);
         UA_CHECK_STATUS(rv, return rv);
     }
 
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
+    UA_StatusCode rv = __UA_Client_startup(client);
+    UA_CHECK_STATUS(rv, return rv);
+
     /* Process timed and network events in the EventLoop */
+    UA_EventLoop *el = client->config.eventLoop;
     rv = el->run(el, timeout);
     UA_CHECK_STATUS(rv, return rv);
     return client->connectStatus;
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 8029b40f013..85e438c7bb5 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1226,18 +1226,8 @@ initConnect(UA_Client *client) {
     }
 
     /* Start the EventLoop if not already started */
-    UA_EventLoop *el = client->config.eventLoop;
-    if(!el) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "No EventLoop configured");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_StatusCode res =  UA_STATUSCODE_GOOD;
-    if(el->state != UA_EVENTLOOPSTATE_STARTED) {
-        res = el->start(el);
-        UA_CHECK_STATUS(res, return res);
-    }
+    UA_StatusCode res = __UA_Client_startup(client);
+    UA_CHECK_STATUS(res, return res);
 
     /* Consistency check the client's own ApplicationURI */
     verifyClientApplicationURI(client);
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 272dabcb3a7..8847c813ab2 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -192,6 +192,9 @@ __Client_Service(UA_Client *client, const void *request,
                  const UA_DataType *requestType, void *response,
                  const UA_DataType *responseType);
 
+UA_StatusCode
+__UA_Client_startup(UA_Client *client);
+
 UA_StatusCode
 __Client_renewSecureChannel(UA_Client *client);
 

From 299db00400c6af2f55072e902f950e2c7fdc6534 Mon Sep 17 00:00:00 2001
From: Colin Hogben <Colin.Hogben@ukaea.uk>
Date: Tue, 22 Nov 2022 17:26:11 +0000
Subject: [PATCH 0546/1963] feat(plugin): Only set ClientConfig defaults where
 unset

Modify UA_ClientConfig_setDefault to set only those fields which are
unset (zero or NULL).  This allows the user to set some fields of a
UA_ClientConfig before calling UA_ClientConfig_setDefault, rather than
having to unpick some unwanted defaults afterwards.

The sequence UA_Client_new / UA_Client_getConfig /
UA_ClientConfig_setDefault is unaffected.

Partly addresses #5435
---
 plugins/ua_config_default.c | 94 ++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 44 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 599b559beb1..c6666f20d75 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -800,8 +800,26 @@ UA_Client * UA_Client_new(void) {
 
 UA_StatusCode
 UA_ClientConfig_setDefault(UA_ClientConfig *config) {
-    config->timeout = 5000;
-    config->secureChannelLifeTime = 10 * 60 * 1000; /* 10 minutes */
+    /* The following fields are untouched and OK to leave as NULL or 0:
+     *  clientContext
+     *  userIdentityToken
+     *  securityMode
+     *  securityPolicyUri
+     *  endpoint
+     *  userTokenPolicy
+     *  customDataTypes
+     *  connectivityCheckInterval
+     *  stateCallback
+     *  inactivityCallback
+     *  outStandingPublishRequests
+     *  subscriptionInactivityCallback
+     *  sessionLocaleIds
+     *  sessionLocaleIdsSize */
+
+    if(config->timeout == 0)
+        config->timeout = 5000;
+    if(config->secureChannelLifeTime == 0)
+        config->secureChannelLifeTime = 10 * 60 * 1000; /* 10 minutes */
 
     if(!config->logger.log) {
         config->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
@@ -823,57 +841,45 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
         config->eventLoop->registerEventSource(config->eventLoop, (UA_EventSource *)udpCM);
     }
 
-    if(config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
-        UA_Array_delete(config->sessionLocaleIds,
-                        config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
-    }
-    config->sessionLocaleIds = NULL;
-    config->sessionLocaleIds = 0;
-
-    config->localConnectionConfig = UA_ConnectionConfig_default;
+    if(config->localConnectionConfig.recvBufferSize == 0)
+        config->localConnectionConfig = UA_ConnectionConfig_default;
 
-    /* Certificate Verification that accepts every certificate. Can be
-     * overwritten when the policy is specialized. */
-    UA_CertificateVerification_AcceptAll(&config->certificateVerification);
-    UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                   "AcceptAll Certificate Verification. "
-                   "Any remote certificate will be accepted.");
+    if(!config->certificateVerification.verifyCertificate) {
+        /* Certificate Verification that accepts every certificate. Can be
+         * overwritten when the policy is specialized. */
+        UA_CertificateVerification_AcceptAll(&config->certificateVerification);
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "AcceptAll Certificate Verification. "
+                       "Any remote certificate will be accepted.");
+    }
 
     /* With encryption enabled, the applicationUri needs to match the URI from
      * the certificate */
-    config->clientDescription.applicationUri = UA_STRING_ALLOC(APPLICATION_URI);
-    config->clientDescription.applicationType = UA_APPLICATIONTYPE_CLIENT;
+    if(!config->clientDescription.applicationUri.data)
+        config->clientDescription.applicationUri = UA_STRING_ALLOC(APPLICATION_URI);
+    if(config->clientDescription.applicationType == 0)
+        config->clientDescription.applicationType = UA_APPLICATIONTYPE_CLIENT;
 
-    if(config->securityPoliciesSize > 0) {
-        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_NETWORK,
-                     "Could not initialize a config that already has SecurityPolicies");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    config->securityPolicies = (UA_SecurityPolicy*)UA_malloc(sizeof(UA_SecurityPolicy));
-    if(!config->securityPolicies)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    UA_StatusCode retval = UA_SecurityPolicy_None(config->securityPolicies,
-                                                  UA_BYTESTRING_NULL, &config->logger);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_free(config->securityPolicies);
-        config->securityPolicies = NULL;
-        return retval;
+    if(config->securityPoliciesSize == 0) {
+        config->securityPolicies = (UA_SecurityPolicy*)UA_malloc(sizeof(UA_SecurityPolicy));
+        if(!config->securityPolicies)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        UA_StatusCode retval = UA_SecurityPolicy_None(config->securityPolicies,
+                                                      UA_BYTESTRING_NULL, &config->logger);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_free(config->securityPolicies);
+            config->securityPolicies = NULL;
+            return retval;
+        }
+        config->securityPoliciesSize = 1;
     }
-    config->securityPoliciesSize = 1;
-
-    config->customDataTypes = NULL;
-    config->stateCallback = NULL;
-    config->connectivityCheckInterval = 0;
-
-    config->requestedSessionTimeout = 1200000; /* requestedSessionTimeout */
 
-    config->inactivityCallback = NULL;
-    config->clientContext = NULL;
+    if(config->requestedSessionTimeout == 0)
+        config->requestedSessionTimeout = 1200000;
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
-    config->outStandingPublishRequests = 10;
-    config->subscriptionInactivityCallback = NULL;
+    if(config->outStandingPublishRequests == 0)
+        config->outStandingPublishRequests = 10;
 #endif
 
     return UA_STATUSCODE_GOOD;

From 8faf2420d076be22f4ecd7be46529a88e336ec6b Mon Sep 17 00:00:00 2001
From: Colin Hogben <Colin.Hogben@ukaea.uk>
Date: Wed, 23 Nov 2022 10:58:24 +0000
Subject: [PATCH 0547/1963] refactor(plugin): Simplify UA_Client_new

Remove duplication of event loop creation code by calling
UA_ClientConfig_setDefault within UA_Client_new.  Since the former is
idempotent, the typical calling sequence (e.g. from examples):
    UA_Client *client = UA_Client_new();
    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
is unaffected.

Partly addresses #5435
---
 plugins/ua_config_default.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index c6666f20d75..5eac367a762 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -777,24 +777,10 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
 UA_Client * UA_Client_new(void) {
     UA_ClientConfig config;
     memset(&config, 0, sizeof(UA_ClientConfig));
-    config.logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
-
-    /* EventLoop */
-    if(config.eventLoop == NULL) {
-        config.eventLoop = UA_EventLoop_new_POSIX(&config.logger);
-        config.externalEventLoop = false;
-
-        /* Add the TCP connection manager */
-        UA_ConnectionManager *tcpCM =
-            UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcp connection manager"));
-        config.eventLoop->registerEventSource(config.eventLoop, (UA_EventSource *)tcpCM);
-
-        /* Add the UDP connection manager */
-        UA_ConnectionManager *udpCM =
-            UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp connection manager"));
-        config.eventLoop->registerEventSource(config.eventLoop, (UA_EventSource *)udpCM);
-    }
-
+    /* Set up basic usable config including logger and event loop */
+    UA_StatusCode res = UA_ClientConfig_setDefault(&config);
+    if(res != UA_STATUSCODE_GOOD)
+        return NULL;
     return UA_Client_newWithConfig(&config);
 }
 

From b8338a31da27a18aed7afc14540b6b5836eed8e0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 00:30:18 +0100
Subject: [PATCH 0548/1963] refactor(doc): Split the NodeStore documentation
 and the information model basics documentation

---
 doc/information_modelling.rst        | 336 +++++++++++++++++++++++++++
 doc/internal.rst                     |   1 +
 doc/toc.rst                          |   2 +-
 include/open62541/plugin/nodestore.h | 263 ++-------------------
 include/open62541/types.h            |   2 +
 5 files changed, 355 insertions(+), 249 deletions(-)
 create mode 100644 doc/information_modelling.rst

diff --git a/doc/information_modelling.rst b/doc/information_modelling.rst
new file mode 100644
index 00000000000..35007c5b33f
--- /dev/null
+++ b/doc/information_modelling.rst
@@ -0,0 +1,336 @@
+.. _information-modelling:
+
+Information Modelling
+=====================
+
+Information modelling in OPC UA combines concepts from object-orientation and
+semantic modelling. At the core, an OPC UA information model is a graph
+consisting of
+
+- Nodes: From eight possible NodeClasses (Variable, VariableType, Object,
+  ObjectType, ReferenceType, DataType, Method, View)
+- References between Nodes: Typed and directed relations between two nodes
+
+The original source for the following information is Part 3 of the OPC UA
+specification (https://reference.opcfoundation.org/Core/Part3/).
+
+Every Node is identified by a unique (within the server) :ref:`nodeid` and
+carries different attributes depending on the NodeClass. These attributes can be
+read (and sometimes also written) via the OPC UA protocol. The protocol further
+allows the creation and deletion of Nodes and References at runtime. But this is
+not supported by all servers.
+
+Reference are triples of the form ``(source-nodeid, referencetype-nodeid,
+target-nodeid)``. (The ``target-nodeid`` is actually an :ref:`expandednodeid`
+which is a NodeId that can additionally point to a remote server.) An example
+reference between nodes is a ``hasTypeDefinition`` reference between a Variable
+and its VariableType. Some ReferenceTypes are *hierarchical* and must not form
+*directed loops*. See the section on :ref:`ReferenceTypes <referencetypenode>`
+for more details on possible references and their semantics.
+
+The following table (adapted from Part 3 of the specification) shows which
+attributes are mandatory (M), optional (O) or not defined (-) for each
+NodeClass. In open62541 all optional attributes are defined - with sensible
+defaults if users do not change them.
+
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| Attribute               | DataType               | Variable | VariableType | Object | ObjectType | ReferenceType | DataType | Method | View |
++=========================+========================+==========+==============+========+============+===============+==========+========+======+
+| NodeId                  | NodeId                 |     M    |       M      |    M   |      M     |       M       |     M    |    M   |   M  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| NodeClass               | NodeClass              |     M    |       M      |    M   |      M     |       M       |     M    |    M   |   M  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| BrowseName              | QualifiedName          |     M    |       M      |    M   |      M     |       M       |     M    |    M   |   M  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| DisplayName             | LocalizedText          |     M    |       M      |    M   |      M     |       M       |     M    |    M   |   M  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| Description             | LocalizedText          |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| WriteMask               | UInt32                 |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| UserWriteMask           | UInt32                 |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| IsAbstract              | Boolean                |     X    |       M      |    X   |      M     |       M       |     M    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| Symmetric               | Boolean                |     X    |       X      |    X   |      X     |       M       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| InverseName             | LocalizedText          |     X    |       X      |    X   |      X     |       O       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| ContainsNoLoops         | Boolean                |     X    |       X      |    X   |      X     |       X       |     X    |    X   |   M  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| EventNotifier           | Byte                   |     X    |       X      |    M   |      X     |       X       |     X    |    X   |   M  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| Value                   | Variant                |     M    |       O      |    X   |      X     |       X       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| DataType                | NodeId                 |     M    |       M      |    X   |      X     |       X       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| ValueRank               | Int32                  |     M    |       M      |    X   |      X     |       X       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| ArrayDimensions         | [UInt32]               |     O    |       O      |    X   |      X     |       X       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| AccessLevel             | Byte                   |     M    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| UserAccessLevel         | Byte                   |     M    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| MinimumSamplingInterval | Double                 |     O    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| Historizing             | Boolean                |     M    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| Executable              | Boolean                |     X    |       X      |    X   |      X     |       X       |     X    |    M   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| UserExecutable          | Boolean                |     X    |       X      |    X   |      X     |       X       |     X    |    M   |   X  |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| DataTypeDefinition      | DataTypeDefinition     |     X    |       X      |    X   |      X     |       X       |     O    |    X   |   X  |
+| (unsupported)           |                        |          |              |        |            |               |          |        |      |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| RolePermissions         | [RolePermissionType]   |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
+| (unsupported)           |                        |          |              |        |            |               |          |        |      |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| UserRolePermissions     | [RolePermissionType]   |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
+| (unsupported)           |                        |          |              |        |            |               |          |        |      |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| AccessRestrictions      | AccessRestrictionsType |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
+| (unsupported)           |                        |          |              |        |            |               |          |        |      |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+| AccessLevelEx           | UInt32                 |     O    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
+| (unsupported)           |                        |          |              |        |            |               |          |        |      |
++-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+
+VariableNode
+------------
+
+Variables store values in a :ref:`datavalue` together with
+metadata for introspection. Most notably, the attributes data type, value
+rank and array dimensions constrain the possible values the variable can take
+on.
+
+Variables come in two flavours: properties and datavariables. Properties are
+related to a parent with a ``hasProperty`` reference and may not have child
+nodes themselves. Datavariables may contain properties (``hasProperty``) and
+also datavariables (``hasComponents``).
+
+All variables are instances of some :ref:`variabletypenode` in return
+constraining the possible data type, value rank and array dimensions
+attributes.
+
+Data Type
+~~~~~~~~~
+
+The (scalar) data type of the variable is constrained to be of a specific
+type or one of its children in the type hierarchy. The data type is given as
+a NodeId pointing to a :ref:`datatypenode` in the type hierarchy. See the
+Section :ref:`datatypenode` for more details.
+
+If the data type attribute points to ``UInt32``, then the value attribute
+must be of that exact type since ``UInt32`` does not have children in the
+type hierarchy. If the data type attribute points ``Number``, then the type
+of the value attribute may still be ``UInt32``, but also ``Float`` or
+``Byte``.
+
+Consistency between the data type attribute in the variable and its
+:ref:`VariableTypeNode` is ensured.
+
+Value Rank
+~~~~~~~~~~
+
+This attribute indicates whether the value attribute of the variable is an
+array and how many dimensions the array has. It may have the following
+values:
+
+- ``n >= 1``: the value is an array with the specified number of dimensions
+- ``n =  0``: the value is an array with one or more dimensions
+- ``n = -1``: the value is a scalar
+- ``n = -2``: the value can be a scalar or an array with any number of dimensions
+- ``n = -3``: the value can be a scalar or a one dimensional array
+
+Consistency between the value rank attribute in the variable and its
+:ref:`variabletypenode` is ensured.
+
+Array Dimensions
+~~~~~~~~~~~~~~~~
+
+If the value rank permits the value to be a (multi-dimensional) array, the
+exact length in each dimensions can be further constrained with this
+attribute.
+
+- For positive lengths, the variable value must have a dimension length less
+  or equal to the array dimension length defined in the VariableNode.
+- The dimension length zero is a wildcard and the actual value may have any
+  length in this dimension. Note that a value (variant) must have array
+  dimensions that are positive (not zero).
+
+Consistency between the array dimensions attribute in the variable and its
+:ref:`variabletypenode` is ensured. However, we consider that an array of
+length zero (can also be a null-array with undefined length) has implicit
+array dimensions ``[0,0,...]``. These always match the required array
+dimensions.
+
+.. _variabletypenode:
+
+VariableTypeNode
+----------------
+
+VariableTypes are used to provide type definitions for variables.
+VariableTypes constrain the data type, value rank and array dimensions
+attributes of variable instances. Furthermore, instantiating from a specific
+variable type may provide semantic information. For example, an instance from
+``MotorTemperatureVariableType`` is more meaningful than a float variable
+instantiated from ``BaseDataVariable``.
+
+ObjectNode
+----------
+
+Objects are used to represent systems, system components, real-world objects
+and software objects. Objects are instances of an :ref:`object type<objecttypenode>`
+and may contain variables, methods and further objects.
+
+.. _objecttypenode:
+
+ObjectTypeNode
+--------------
+
+ObjectTypes provide definitions for Objects. Abstract objects cannot be
+instantiated. See :ref:`node-lifecycle` for the use of constructor and
+destructor callbacks. */
+
+.. _referencetypenode:
+
+ReferenceTypeNode
+-----------------
+
+Each reference between two nodes is typed with a ReferenceType that gives
+meaning to the relation. The OPC UA standard defines a set of ReferenceTypes
+as a mandatory part of OPC UA information models.
+
+- Abstract ReferenceTypes cannot be used in actual references and are only
+  used to structure the ReferenceTypes hierarchy
+- Symmetric references have the same meaning from the perspective of the
+  source and target node
+
+The figure below shows the hierarchy of the standard ReferenceTypes (arrows
+indicate a ``hasSubType`` relation). Refer to Part 3 of the OPC UA
+specification for the full semantics of each ReferenceType.
+
+.. graphviz::
+
+   digraph tree {
+
+   node [height=0, shape=box, fillcolor="#E5E5E5", concentrate=true]
+
+   references [label="References\n(Abstract, Symmetric)"]
+   hierarchical_references [label="HierarchicalReferences\n(Abstract)"]
+   references -> hierarchical_references
+
+   nonhierarchical_references [label="NonHierarchicalReferences\n(Abstract, Symmetric)"]
+   references -> nonhierarchical_references
+
+   haschild [label="HasChild\n(Abstract)"]
+   hierarchical_references -> haschild
+
+   aggregates [label="Aggregates\n(Abstract)"]
+   haschild -> aggregates
+
+   organizes [label="Organizes"]
+   hierarchical_references -> organizes
+
+   hascomponent [label="HasComponent"]
+   aggregates -> hascomponent
+
+   hasorderedcomponent [label="HasOrderedComponent"]
+   hascomponent -> hasorderedcomponent
+
+   hasproperty [label="HasProperty"]
+   aggregates -> hasproperty
+
+   hassubtype [label="HasSubtype"]
+   haschild -> hassubtype
+
+   hasmodellingrule [label="HasModellingRule"]
+   nonhierarchical_references -> hasmodellingrule
+
+   hastypedefinition [label="HasTypeDefinition"]
+   nonhierarchical_references -> hastypedefinition
+
+   hasencoding [label="HasEncoding"]
+   nonhierarchical_references -> hasencoding
+
+   hasdescription [label="HasDescription"]
+   nonhierarchical_references -> hasdescription
+
+   haseventsource [label="HasEventSource"]
+   hierarchical_references -> haseventsource
+
+   hasnotifier [label="HasNotifier"]
+   hierarchical_references -> hasnotifier
+
+   generatesevent [label="GeneratesEvent"]
+   nonhierarchical_references -> generatesevent
+
+   alwaysgeneratesevent [label="AlwaysGeneratesEvent"]
+   generatesevent -> alwaysgeneratesevent
+
+   {rank=same hierarchical_references nonhierarchical_references}
+   {rank=same generatesevent haseventsource hasmodellingrule
+              hasencoding hassubtype}
+   {rank=same alwaysgeneratesevent hasproperty}
+
+   }
+
+The ReferenceType hierarchy can be extended with user-defined ReferenceTypes.
+Many Companion Specifications for OPC UA define new ReferenceTypes to be used
+in their domain of interest.
+
+For the following example of custom ReferenceTypes, we attempt to model the
+structure of a technical system. For this, we introduce two custom
+ReferenceTypes. First, the hierarchical ``contains`` ReferenceType indicates
+that a system (represented by an OPC UA object) contains a component (or
+subsystem). This gives rise to a tree-structure of containment relations. For
+example, the motor (object) is contained in the car and the crankshaft is
+contained in the motor. Second, the symmetric ``connectedTo`` ReferenceType
+indicates that two components are connected. For example, the motor's
+crankshaft is connected to the gear box. Connections are independent of the
+containment hierarchy and can induce a general graph-structure. Further
+subtypes of ``connectedTo`` could be used to differentiate between physical,
+electrical and information related connections. A client can then learn the
+layout of a (physical) system represented in an OPC UA information model
+based on a common understanding of just two custom reference types.
+
+.. _datatypenode:
+
+DataTypeNode
+------------
+
+DataTypes represent simple and structured data types. DataTypes may contain
+arrays. But they always describe the structure of a single instance. In
+open62541, DataTypeNodes in the information model hierarchy are matched to
+``UA_DataType`` type descriptions for :ref:`generic-types` via their NodeId.
+
+Abstract DataTypes (e.g. ``Number``) cannot be the type of actual values.
+They are used to constrain values to possible child DataTypes (e.g.
+``UInt32``).
+
+.. _methodnode:
+
+MethodNode
+----------
+
+Methods define callable functions and are invoked using the :ref:`Call <method-services>`
+service. MethodNodes may have special properties (variable
+children with a ``hasProperty`` reference) with the :ref:`qualifiedname` ``(0, "InputArguments")``
+and ``(0, "OutputArguments")``. The input and output
+arguments are both described via an array of ``UA_Argument``. While the Call
+service uses a generic array of :ref:`variant` for input and output, the
+actual argument values are checked to match the signature of the MethodNode.
+
+Note that the same MethodNode may be referenced from several objects (and
+object types). For this, the NodeId of the method *and of the object
+providing context* is part of a Call request message.
+
+ViewNode
+--------
+
+Each View defines a subset of the Nodes in the AddressSpace. Views can be
+used when browsing an information model to focus on a subset of nodes and
+references only. ViewNodes can be created and be interacted with. But their
+use in the :ref:`Browse<view-services>` service is currently unsupported in
+open62541.
diff --git a/doc/internal.rst b/doc/internal.rst
index 2c2e3bf3c35..4744b68dd09 100644
--- a/doc/internal.rst
+++ b/doc/internal.rst
@@ -4,6 +4,7 @@ Internals
 .. toctree::
 
    statuscodes
+   nodestore
    plugin_network
    plugin_accesscontrol
    plugin_log
diff --git a/doc/toc.rst b/doc/toc.rst
index ab681a67e4d..5b7a507b31d 100644
--- a/doc/toc.rst
+++ b/doc/toc.rst
@@ -10,7 +10,7 @@ open62541 Documentation
    protocol
    types
    services
-   nodestore
+   information_modelling
    server
    client
    pubsub
diff --git a/include/open62541/plugin/nodestore.h b/include/open62541/plugin/nodestore.h
index 88dd9ef8244..28685684b0b 100644
--- a/include/open62541/plugin/nodestore.h
+++ b/include/open62541/plugin/nodestore.h
@@ -7,8 +7,8 @@
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  */
 
-#ifndef UA_SERVER_NODES_H_
-#define UA_SERVER_NODES_H_
+#ifndef UA_NODESTORE_H_
+#define UA_NODESTORE_H_
 
 /* !!! Warning !!!
  *
@@ -29,26 +29,9 @@ typedef struct UA_MonitoredItem UA_MonitoredItem;
 #endif
 
 /**
- * .. _information-modelling:
- *
- * Information Modelling
+ * Node Store Plugin API
  * =====================
  *
- * Information modelling in OPC UA combines concepts from object-orientation and
- * semantic modelling. At the core, an OPC UA information model is a graph made
- * up of
- *
- * - Nodes: There are eight possible Node types (variable, object, method, ...)
- * - References: Typed and directed relations between two nodes
- *
- * Every node is identified by a unique (within the server) :ref:`nodeid`.
- * Reference are triples of the form ``(source-nodeid, referencetype-nodeid,
- * target-nodeid)``. An example reference between nodes is a
- * ``hasTypeDefinition`` reference between a Variable and its VariableType. Some
- * ReferenceTypes are *hierarchic* and must not form *directed loops*. See the
- * section on :ref:`ReferenceTypes <referencetypenode>` for more details on
- * possible references and their semantics.
- *
  * **Warning!!** The structures defined in this section are only relevant for
  * the developers of custom Nodestores. The interaction with the information
  * model is possible only via the OPC UA :ref:`services`. So the following
@@ -247,7 +230,7 @@ UA_ReferenceTypeSet_contains(const UA_ReferenceTypeSet *set, UA_Byte index) {
 
 /**
  * Node Pointer
- * ============
+ * ------------
  *
  * The "native" format for reference between nodes is the ExpandedNodeId. That
  * is, references can also point to external servers. In practice, most
@@ -428,73 +411,7 @@ struct UA_NodeHead {
 
 /**
  * VariableNode
- * ------------
- *
- * Variables store values in a :ref:`datavalue` together with
- * metadata for introspection. Most notably, the attributes data type, value
- * rank and array dimensions constrain the possible values the variable can take
- * on.
- *
- * Variables come in two flavours: properties and datavariables. Properties are
- * related to a parent with a ``hasProperty`` reference and may not have child
- * nodes themselves. Datavariables may contain properties (``hasProperty``) and
- * also datavariables (``hasComponents``).
- *
- * All variables are instances of some :ref:`variabletypenode` in return
- * constraining the possible data type, value rank and array dimensions
- * attributes.
- *
- * Data Type
- * ~~~~~~~~~
- *
- * The (scalar) data type of the variable is constrained to be of a specific
- * type or one of its children in the type hierarchy. The data type is given as
- * a NodeId pointing to a :ref:`datatypenode` in the type hierarchy. See the
- * Section :ref:`datatypenode` for more details.
- *
- * If the data type attribute points to ``UInt32``, then the value attribute
- * must be of that exact type since ``UInt32`` does not have children in the
- * type hierarchy. If the data type attribute points ``Number``, then the type
- * of the value attribute may still be ``UInt32``, but also ``Float`` or
- * ``Byte``.
- *
- * Consistency between the data type attribute in the variable and its
- * :ref:`VariableTypeNode` is ensured.
- *
- * Value Rank
- * ~~~~~~~~~~
- *
- * This attribute indicates whether the value attribute of the variable is an
- * array and how many dimensions the array has. It may have the following
- * values:
- *
- * - ``n >= 1``: the value is an array with the specified number of dimensions
- * - ``n =  0``: the value is an array with one or more dimensions
- * - ``n = -1``: the value is a scalar
- * - ``n = -2``: the value can be a scalar or an array with any number of dimensions
- * - ``n = -3``: the value can be a scalar or a one dimensional array
- *
- * Consistency between the value rank attribute in the variable and its
- * :ref:`variabletypenode` is ensured.
- *
- * Array Dimensions
- * ~~~~~~~~~~~~~~~~
- *
- * If the value rank permits the value to be a (multi-dimensional) array, the
- * exact length in each dimensions can be further constrained with this
- * attribute.
- *
- * - For positive lengths, the variable value must have a dimension length less
- *   or equal to the array dimension length defined in the VariableNode.
- * - The dimension length zero is a wildcard and the actual value may have any
- *   length in this dimension. Note that a value (variant) must have array
- *   dimensions that are positive (not zero).
- *
- * Consistency between the array dimensions attribute in the variable and its
- * :ref:`variabletypenode` is ensured. However, we consider that an array of
- * length zero (can also be a null-array with undefined length) has implicit
- * array dimensions ``[0,0,...]``. These always match the required array
- * dimensions. */
+ * ------------ */
 
 /* Indicates whether a variable contains data inline or whether it points to an
  * external data source */
@@ -697,17 +614,8 @@ typedef struct {
 } UA_VariableNode;
 
 /**
- * .. _variabletypenode:
- *
  * VariableTypeNode
- * ----------------
- *
- * VariableTypes are used to provide type definitions for variables.
- * VariableTypes constrain the data type, value rank and array dimensions
- * attributes of variable instances. Furthermore, instantiating from a specific
- * variable type may provide semantic information. For example, an instance from
- * ``MotorTemperatureVariableType`` is more meaningful than a float variable
- * instantiated from ``BaseDataVariable``. */
+ * ---------------- */
 
 typedef struct {
     UA_NodeHead head;
@@ -719,22 +627,8 @@ typedef struct {
 } UA_VariableTypeNode;
 
 /**
- * .. _methodnode:
- *
  * MethodNode
- * ----------
- *
- * Methods define callable functions and are invoked using the :ref:`Call
- * <method-services>` service. MethodNodes may have special properties (variable
- * children with a ``hasProperty`` reference) with the :ref:`qualifiedname` ``(0,
- * "InputArguments")`` and ``(0, "OutputArguments")``. The input and output
- * arguments are both described via an array of ``UA_Argument``. While the Call
- * service uses a generic array of :ref:`variant` for input and output, the
- * actual argument values are checked to match the signature of the MethodNode.
- *
- * Note that the same MethodNode may be referenced from several objects (and
- * object types). For this, the NodeId of the method *and of the object
- * providing context* is part of a Call request message. */
+ * ---------- */
 
 typedef UA_StatusCode
 (*UA_MethodCallback)(UA_Server *server, const UA_NodeId *sessionId,
@@ -757,12 +651,7 @@ typedef struct {
 
 /**
  * ObjectNode
- * ----------
- *
- * Objects are used to represent systems, system components, real-world objects
- * and software objects. Objects are instances of an :ref:`object
- * type<objecttypenode>` and may contain variables, methods and further
- * objects. */
+ * ---------- */
 
 typedef struct {
     UA_NodeHead head;
@@ -770,14 +659,8 @@ typedef struct {
 } UA_ObjectNode;
 
 /**
- * .. _objecttypenode:
- *
  * ObjectTypeNode
- * --------------
- *
- * ObjectTypes provide definitions for Objects. Abstract objects cannot be
- * instantiated. See :ref:`node-lifecycle` for the use of constructor and
- * destructor callbacks. */
+ * -------------- */
 
 typedef struct {
     UA_NodeHead head;
@@ -788,107 +671,8 @@ typedef struct {
 } UA_ObjectTypeNode;
 
 /**
- * .. _referencetypenode:
- *
  * ReferenceTypeNode
- * -----------------
- *
- * Each reference between two nodes is typed with a ReferenceType that gives
- * meaning to the relation. The OPC UA standard defines a set of ReferenceTypes
- * as a mandatory part of OPC UA information models.
- *
- * - Abstract ReferenceTypes cannot be used in actual references and are only
- *   used to structure the ReferenceTypes hierarchy
- * - Symmetric references have the same meaning from the perspective of the
- *   source and target node
- *
- * The figure below shows the hierarchy of the standard ReferenceTypes (arrows
- * indicate a ``hasSubType`` relation). Refer to Part 3 of the OPC UA
- * specification for the full semantics of each ReferenceType.
- *
- * .. graphviz::
- *
- *    digraph tree {
- *
- *    node [height=0, shape=box, fillcolor="#E5E5E5", concentrate=true]
- *
- *    references [label="References\n(Abstract, Symmetric)"]
- *    hierarchical_references [label="HierarchicalReferences\n(Abstract)"]
- *    references -> hierarchical_references
- *
- *    nonhierarchical_references [label="NonHierarchicalReferences\n(Abstract, Symmetric)"]
- *    references -> nonhierarchical_references
- *
- *    haschild [label="HasChild\n(Abstract)"]
- *    hierarchical_references -> haschild
- *
- *    aggregates [label="Aggregates\n(Abstract)"]
- *    haschild -> aggregates
- *
- *    organizes [label="Organizes"]
- *    hierarchical_references -> organizes
- *
- *    hascomponent [label="HasComponent"]
- *    aggregates -> hascomponent
- *
- *    hasorderedcomponent [label="HasOrderedComponent"]
- *    hascomponent -> hasorderedcomponent
- *
- *    hasproperty [label="HasProperty"]
- *    aggregates -> hasproperty
- *
- *    hassubtype [label="HasSubtype"]
- *    haschild -> hassubtype
- *
- *    hasmodellingrule [label="HasModellingRule"]
- *    nonhierarchical_references -> hasmodellingrule
- *
- *    hastypedefinition [label="HasTypeDefinition"]
- *    nonhierarchical_references -> hastypedefinition
- *
- *    hasencoding [label="HasEncoding"]
- *    nonhierarchical_references -> hasencoding
- *
- *    hasdescription [label="HasDescription"]
- *    nonhierarchical_references -> hasdescription
- *
- *    haseventsource [label="HasEventSource"]
- *    hierarchical_references -> haseventsource
- *
- *    hasnotifier [label="HasNotifier"]
- *    hierarchical_references -> hasnotifier
- *
- *    generatesevent [label="GeneratesEvent"]
- *    nonhierarchical_references -> generatesevent
- *
- *    alwaysgeneratesevent [label="AlwaysGeneratesEvent"]
- *    generatesevent -> alwaysgeneratesevent
- *
- *    {rank=same hierarchical_references nonhierarchical_references}
- *    {rank=same generatesevent haseventsource hasmodellingrule
- *               hasencoding hassubtype}
- *    {rank=same alwaysgeneratesevent hasproperty}
- *
- *    }
- *
- * The ReferenceType hierarchy can be extended with user-defined ReferenceTypes.
- * Many Companion Specifications for OPC UA define new ReferenceTypes to be used
- * in their domain of interest.
- *
- * For the following example of custom ReferenceTypes, we attempt to model the
- * structure of a technical system. For this, we introduce two custom
- * ReferenceTypes. First, the hierarchical ``contains`` ReferenceType indicates
- * that a system (represented by an OPC UA object) contains a component (or
- * subsystem). This gives rise to a tree-structure of containment relations. For
- * example, the motor (object) is contained in the car and the crankshaft is
- * contained in the motor. Second, the symmetric ``connectedTo`` ReferenceType
- * indicates that two components are connected. For example, the motor's
- * crankshaft is connected to the gear box. Connections are independent of the
- * containment hierarchy and can induce a general graph-structure. Further
- * subtypes of ``connectedTo`` could be used to differentiate between physical,
- * electrical and information related connections. A client can then learn the
- * layout of a (physical) system represented in an OPC UA information model
- * based on a common understanding of just two custom reference types. */
+ * ----------------- */
 
 typedef struct {
     UA_NodeHead head;
@@ -902,19 +686,8 @@ typedef struct {
 } UA_ReferenceTypeNode;
 
 /**
- * .. _datatypenode:
- *
  * DataTypeNode
- * ------------
- *
- * DataTypes represent simple and structured data types. DataTypes may contain
- * arrays. But they always describe the structure of a single instance. In
- * open62541, DataTypeNodes in the information model hierarchy are matched to
- * ``UA_DataType`` type descriptions for :ref:`generic-types` via their NodeId.
- *
- * Abstract DataTypes (e.g. ``Number``) cannot be the type of actual values.
- * They are used to constrain values to possible child DataTypes (e.g.
- * ``UInt32``). */
+ * ------------ */
 
 typedef struct {
     UA_NodeHead head;
@@ -923,13 +696,7 @@ typedef struct {
 
 /**
  * ViewNode
- * --------
- *
- * Each View defines a subset of the Nodes in the AddressSpace. Views can be
- * used when browsing an information model to focus on a subset of nodes and
- * references only. ViewNodes can be created and be interacted with. But their
- * use in the :ref:`Browse<view-services>` service is currently unsupported in
- * open62541. */
+ * -------- */
 
 typedef struct {
     UA_NodeHead head;
@@ -958,8 +725,8 @@ typedef union {
 } UA_Node;
 
 /**
- * Nodestore Plugin API
- * --------------------
+ * Nodestore
+ * ---------
  *
  * The following definitions are used for implementing custom node storage
  * backends. **Most users will want to use the default nodestore and don't need
@@ -1090,4 +857,4 @@ UA_Node_clear(UA_Node *node);
 
 _UA_END_DECLS
 
-#endif /* UA_SERVER_NODES_H_ */
+#endif /* UA_NODESTORE_H_ */
diff --git a/include/open62541/types.h b/include/open62541/types.h
index 1348d22cd3a..a079188b5ea 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -500,6 +500,8 @@ UA_INLINABLE(UA_Boolean
 UA_UInt32 UA_EXPORT UA_NodeId_hash(const UA_NodeId *n);
 
 /**
+ * .. _expandednodeid:
+ *
  * ExpandedNodeId
  * ^^^^^^^^^^^^^^
  * A NodeId that allows the namespace URI to be specified instead of an index. */

From f7ef685253c780f546cab29236e3e9f784960e7e Mon Sep 17 00:00:00 2001
From: Bin Lan <Bin.Lan@windriver.com>
Date: Sat, 26 Nov 2022 11:12:23 +0800
Subject: [PATCH 0549/1963] Fix the build error in
 pubsub_interrupt_publish_tsn.c

For OPEN62541 upgraded, some variables and functions
are removed or changed. So change the file,
pubsub_interrupt_publish_tsn.c to meet the upgradation.
---
 .../vxworks/pubsub_interrupt_publish_tsn.c          | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c b/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c
index 889ce3d1d94..31149722016 100644
--- a/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c
+++ b/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *   Copyright (c) 2020 Wind River Systems, Inc.
+ *   Copyright (c) 2020, 2022 Wind River Systems, Inc.
  */
 
 #include <vxWorks.h>
@@ -307,7 +307,7 @@ addPubSubConfiguration(UA_Server* server) {
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
     writerGroupConfig.pubsubManagerCallback.addCustomCallback = addApplicationCallback;
-    writerGroupConfig.pubsubManagerCallback.changeCustomCallbackInterval = changeApplicationCallbackInterval;
+    writerGroupConfig.pubsubManagerCallback.changeCustomCallback = changeApplicationCallbackInterval;
     writerGroupConfig.pubsubManagerCallback.removeCustomCallback = removeApplicationPubSubCallback;
     UA_Server_addWriterGroup(server, connectionIdent,
                              &writerGroupConfig, &writerGroupIdent);
@@ -444,13 +444,8 @@ static void open62541ServerTask(void) {
 
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    config->pubsubTransportLayers = (UA_PubSubTransportLayer *)UA_malloc(sizeof(UA_PubSubTransportLayer));
-    if(config->pubsubTransportLayers == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Cannot allocate a UA_PubSubTransportLayer");
-        goto serverCleanup;
-    }
-    config->pubsubTransportLayers[0] = UA_PubSubTransportLayerEthernet();
-    config->pubsubTransportLayersSize++;
+	
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
 
     addServerNodes(server);
     addPubSubConfiguration(server);

From 8faec90e26bf39550368325c2aed6aa5232ebb54 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 15:00:15 +0100
Subject: [PATCH 0550/1963] refactor(doc): Better LaTeX settings for
 documentation generation

---
 doc/conf.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index e2bf275be8e..4a74e0f0828 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -54,7 +54,6 @@
 
 # General information about the project.
 project = u'open62541'
-copyright = u'2016, The open62541 authors'
 author = u'The open62541 authors'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -82,7 +81,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["client_config.rst", "server_config.rst"]
+#exclude_patterns = ["client_config.rst", "server_config.rst"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -158,7 +157,7 @@
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
 #html_sidebars = {}
@@ -216,6 +215,16 @@
 # The paper size ('letterpaper' or 'a4paper').
 'papersize': 'a4paper',
 
+# The chapter title style
+'fncychap': '\\usepackage[Sonny]{fncychap}',
+
+# Font settings
+'fontpkg': r"""
+\usepackage{sourcesanspro}
+\usepackage{newtx}
+\usepackage[scaled=.98,varqu,varl]{zi4}
+""",
+
 # The font size ('10pt', '11pt' or '12pt').
 #'pointsize': '10pt',
 

From f4e6671b19c7cfab04a5d4eaebd0c26033d3f51f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 15:00:42 +0100
Subject: [PATCH 0551/1963] refactor(doc): Use soft-hyphens for LaTeX line
 break in NodeClass table

---
 doc/information_modelling.rst | 119 ++++++++++++++++------------------
 1 file changed, 56 insertions(+), 63 deletions(-)

diff --git a/doc/information_modelling.rst b/doc/information_modelling.rst
index 35007c5b33f..6d4a1dd6f49 100644
--- a/doc/information_modelling.rst
+++ b/doc/information_modelling.rst
@@ -29,72 +29,65 @@ and its VariableType. Some ReferenceTypes are *hierarchical* and must not form
 for more details on possible references and their semantics.
 
 The following table (adapted from Part 3 of the specification) shows which
-attributes are mandatory (M), optional (O) or not defined (-) for each
+attributes are mandatory (``M``), optional (``O``) or not defined for each
 NodeClass. In open62541 all optional attributes are defined - with sensible
 defaults if users do not change them.
 
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| Attribute               | DataType               | Variable | VariableType | Object | ObjectType | ReferenceType | DataType | Method | View |
-+=========================+========================+==========+==============+========+============+===============+==========+========+======+
-| NodeId                  | NodeId                 |     M    |       M      |    M   |      M     |       M       |     M    |    M   |   M  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| NodeClass               | NodeClass              |     M    |       M      |    M   |      M     |       M       |     M    |    M   |   M  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| BrowseName              | QualifiedName          |     M    |       M      |    M   |      M     |       M       |     M    |    M   |   M  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| DisplayName             | LocalizedText          |     M    |       M      |    M   |      M     |       M       |     M    |    M   |   M  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| Description             | LocalizedText          |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| WriteMask               | UInt32                 |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| UserWriteMask           | UInt32                 |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| IsAbstract              | Boolean                |     X    |       M      |    X   |      M     |       M       |     M    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| Symmetric               | Boolean                |     X    |       X      |    X   |      X     |       M       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| InverseName             | LocalizedText          |     X    |       X      |    X   |      X     |       O       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| ContainsNoLoops         | Boolean                |     X    |       X      |    X   |      X     |       X       |     X    |    X   |   M  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| EventNotifier           | Byte                   |     X    |       X      |    M   |      X     |       X       |     X    |    X   |   M  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| Value                   | Variant                |     M    |       O      |    X   |      X     |       X       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| DataType                | NodeId                 |     M    |       M      |    X   |      X     |       X       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| ValueRank               | Int32                  |     M    |       M      |    X   |      X     |       X       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| ArrayDimensions         | [UInt32]               |     O    |       O      |    X   |      X     |       X       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| AccessLevel             | Byte                   |     M    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| UserAccessLevel         | Byte                   |     M    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| MinimumSamplingInterval | Double                 |     O    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| Historizing             | Boolean                |     M    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| Executable              | Boolean                |     X    |       X      |    X   |      X     |       X       |     X    |    M   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| UserExecutable          | Boolean                |     X    |       X      |    X   |      X     |       X       |     X    |    M   |   X  |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| DataTypeDefinition      | DataTypeDefinition     |     X    |       X      |    X   |      X     |       X       |     O    |    X   |   X  |
-| (unsupported)           |                        |          |              |        |            |               |          |        |      |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| RolePermissions         | [RolePermissionType]   |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
-| (unsupported)           |                        |          |              |        |            |               |          |        |      |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| UserRolePermissions     | [RolePermissionType]   |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
-| (unsupported)           |                        |          |              |        |            |               |          |        |      |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| AccessRestrictions      | AccessRestrictionsType |     O    |       O      |    O   |      O     |       O       |     O    |    O   |   O  |
-| (unsupported)           |                        |          |              |        |            |               |          |        |      |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
-| AccessLevelEx           | UInt32                 |     O    |       X      |    X   |      X     |       X       |     X    |    X   |   X  |
-| (unsupported)           |                        |          |              |        |            |               |          |        |      |
-+-------------------------+------------------------+----------+--------------+--------+------------+---------------+----------+--------+------+
+.. table:: Node attributes for the different NodeClasses
+   :width: 100%
+
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Attribute               | DataType               | Variable | Variable­Type | Object | Object­Type | Reference­Type | Data­Type | Method | View  |
+   +=========================+========================+==========+===============+========+=============+================+===========+========+=======+
+   | NodeId                  | NodeId                 |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | NodeClass               | NodeClass              |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | BrowseName              | QualifiedName          |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | DisplayName             | LocalizedText          |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Description             | LocalizedText          |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | WriteMask               | UInt32                 |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | UserWriteMask           | UInt32                 |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | IsAbstract              | Boolean                |          |     ``M``     |        |    ``M``    |     ``M``      |   ``M``   |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Symmetric               | Boolean                |          |               |        |             |     ``M``      |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | InverseName             | LocalizedText          |          |               |        |             |     ``O``      |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | ContainsNoLoops         | Boolean                |          |               |        |             |                |           |        | ``M`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | EventNotifier           | Byte                   |          |               |  ``M`` |             |                |           |        | ``M`` |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Value                   | Variant                |   ``M``  |     ``O``     |        |             |                |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | DataType                | NodeId                 |   ``M``  |     ``M``     |        |             |                |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | ValueRank               | Int32                  |   ``M``  |     ``M``     |        |             |                |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | ArrayDimensions         | [UInt32]               |   ``O``  |     ``O``     |        |             |                |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | AccessLevel             | Byte                   |   ``M``  |               |        |             |                |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | UserAccessLevel         | Byte                   |   ``M``  |               |        |             |                |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | MinimumSamplingInterval | Double                 |   ``O``  |               |        |             |                |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Historizing             | Boolean                |   ``M``  |               |        |             |                |           |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Executable              | Boolean                |          |               |        |             |                |           |  ``M`` |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | UserExecutable          | Boolean                |          |               |        |             |                |           |  ``M`` |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | DataTypeDefinition      | DataTypeDefinition     |          |               |        |             |                |   ``O``   |        |       |
+   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+
+New attributes in the standard that are still unsupported in open62541 are
+RolePermissions, UserRolePermissions, AccessRestrictions and AccessLevelEx.
 
 VariableNode
 ------------

From b3c085845db7623becd4084c842e295644ca7fac Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 17:53:30 +0100
Subject: [PATCH 0552/1963] refactor(core): Move RNG definitions to util.h

---
 include/open62541/types.h | 10 ----------
 include/open62541/util.h  | 16 ++++++++++++++++
 src/ua_types.c            | 38 --------------------------------------
 src/ua_util.c             | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index a079188b5ea..974d2c77a71 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1481,16 +1481,6 @@ UA_Array_appendCopy(void **p, size_t *size, const void *newElem,
 void UA_EXPORT
 UA_Array_delete(void *p, size_t size, const UA_DataType *type);
 
-/**
- * Random Number Generator
- * -----------------------
- * If UA_MULTITHREADING is defined, then the seed is stored in thread
- * local storage. The seed is initialized for every thread in the
- * server/client. */
-void UA_EXPORT UA_random_seed(UA_UInt64 seed);
-UA_UInt32 UA_EXPORT UA_UInt32_random(void); /* no cryptographic entropy */
-UA_Guid UA_EXPORT UA_Guid_random(void);     /* no cryptographic entropy */
-
 /**
  * .. _generated-types:
  *
diff --git a/include/open62541/util.h b/include/open62541/util.h
index 77453596538..996b717099b 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -36,6 +36,22 @@ typedef enum {
     UA_TIMER_HANDLE_CYCLEMISS_WITH_BASETIME
 } UA_TimerPolicy;
 
+/**
+ * Random Number Generator
+ * -----------------------
+ * If UA_MULTITHREADING is defined, then the seed is stored in thread
+ * local storage. The seed is initialized for every thread in the
+ * server/client. */
+
+void UA_EXPORT
+UA_random_seed(UA_UInt64 seed);
+
+UA_UInt32 UA_EXPORT
+UA_UInt32_random(void); /* no cryptographic entropy */
+
+UA_Guid UA_EXPORT
+UA_Guid_random(void);   /* no cryptographic entropy */
+
 /**
  * Key Value Map
  * -------------
diff --git a/src/ua_types.c b/src/ua_types.c
index fa86991e99c..871555a0145 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -23,7 +23,6 @@
 #include "../deps/itoa.h"
 #include "../deps/base64.h"
 #include "libc_time.h"
-#include "pcg_basic.h"
 
 #define UA_MAX_ARRAY_DIMS 100 /* Max dimensions of an array */
 
@@ -104,23 +103,6 @@ UA_cleanupDataTypeWithCustom(const UA_DataTypeArray *customTypes) {
     }
 }
 
-/***************************/
-/* Random Number Generator */
-/***************************/
-
-//TODO is this safe for multithreading?
-static pcg32_random_t UA_rng = PCG32_INITIALIZER;
-
-void
-UA_random_seed(u64 seed) {
-    pcg32_srandom_r(&UA_rng, seed, (u64)UA_DateTime_now());
-}
-
-u32
-UA_UInt32_random(void) {
-    return (u32)pcg32_random_r(&UA_rng);
-}
-
 /*****************/
 /* Builtin Types */
 /*****************/
@@ -277,26 +259,6 @@ UA_Guid_equal(const UA_Guid *g1, const UA_Guid *g2) {
     return (guidOrder(g1, g2, NULL) == UA_ORDER_EQ);
 }
 
-UA_Guid
-UA_Guid_random(void) {
-    UA_Guid result;
-    result.data1 = (u32)pcg32_random_r(&UA_rng);
-    u32 r = (u32)pcg32_random_r(&UA_rng);
-    result.data2 = (u16) r;
-    result.data3 = (u16) (r >> 16);
-    r = (u32)pcg32_random_r(&UA_rng);
-    result.data4[0] = (u8)r;
-    result.data4[1] = (u8)(r >> 4);
-    result.data4[2] = (u8)(r >> 8);
-    result.data4[3] = (u8)(r >> 12);
-    r = (u32)pcg32_random_r(&UA_rng);
-    result.data4[4] = (u8)r;
-    result.data4[5] = (u8)(r >> 4);
-    result.data4[6] = (u8)(r >> 8);
-    result.data4[7] = (u8)(r >> 12);
-    return result;
-}
-
 static const u8 hexmapLower[16] =
     {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 static const u8 hexmapUpper[16] =
diff --git a/src/ua_util.c b/src/ua_util.c
index 1df32fb0804..9f24f6102fe 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -15,6 +15,7 @@
 #include <open62541/util.h>
 
 #include "ua_util_internal.h"
+#include "pcg_basic.h"
 #include "base64.h"
 
 size_t
@@ -412,3 +413,40 @@ UA_KeyValueMap_merge(UA_KeyValueMap *lhs, const UA_KeyValueMap *rhs) {
     *lhs = merge;
     return UA_STATUSCODE_GOOD;
 }
+
+/***************************/
+/* Random Number Generator */
+/***************************/
+
+/* TODO is this safe for multithreading? */
+static pcg32_random_t UA_rng = PCG32_INITIALIZER;
+
+void
+UA_random_seed(u64 seed) {
+    pcg32_srandom_r(&UA_rng, seed, (u64)UA_DateTime_now());
+}
+
+u32
+UA_UInt32_random(void) {
+    return (u32)pcg32_random_r(&UA_rng);
+}
+
+UA_Guid
+UA_Guid_random(void) {
+    UA_Guid result;
+    result.data1 = (u32)pcg32_random_r(&UA_rng);
+    u32 r = (u32)pcg32_random_r(&UA_rng);
+    result.data2 = (u16) r;
+    result.data3 = (u16) (r >> 16);
+    r = (u32)pcg32_random_r(&UA_rng);
+    result.data4[0] = (u8)r;
+    result.data4[1] = (u8)(r >> 4);
+    result.data4[2] = (u8)(r >> 8);
+    result.data4[3] = (u8)(r >> 12);
+    r = (u32)pcg32_random_r(&UA_rng);
+    result.data4[4] = (u8)r;
+    result.data4[5] = (u8)(r >> 4);
+    result.data4[6] = (u8)(r >> 8);
+    result.data4[7] = (u8)(r >> 12);
+    return result;
+}

From 3297faad04969c13a95e01ae75c869b2c58ad8b2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 18:08:02 +0100
Subject: [PATCH 0553/1963] refactor(core): Move TimerPolicy to eventloop.h

---
 arch/common/ua_timer.h               |  2 +-
 include/open62541/plugin/eventloop.h | 15 +++++++++++++++
 include/open62541/util.h             |  6 ------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/arch/common/ua_timer.h b/arch/common/ua_timer.h
index acc2775ef6b..a452b82a3fb 100644
--- a/arch/common/ua_timer.h
+++ b/arch/common/ua_timer.h
@@ -10,7 +10,7 @@
 #define UA_TIMER_H_
 
 #include <open62541/types.h>
-#include <open62541/util.h>
+#include <open62541/plugin/eventloop.h>
 #include "aa_tree.h"
 
 _UA_BEGIN_DECLS
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 0400b8e795d..eaee8d2067c 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -45,6 +45,21 @@ typedef struct UA_InterruptManager UA_InterruptManager;
  * ConnectionManager implementations. So the EventLoop can extract socket
  * information, etc. from the ConnectionManagers.
  *
+ * Timer Policies
+ * --------------
+ *
+ * A timer comes with a cyclic interval in which a callback is executed. If an
+ * application is congested the interval can be missed. Two different policies
+ * can be used when this happens. Either schedule the next execution after the
+ * interval has elapsed again from the current time onwards or stay within the
+ * regular interval with respect to the original basetime. */
+
+typedef enum {
+    UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+    UA_TIMER_HANDLE_CYCLEMISS_WITH_BASETIME
+} UA_TimerPolicy;
+
+/**
  * Event Loop
  * ----------
  * The EventLoop implementation is part of the selected architecture. For
diff --git a/include/open62541/util.h b/include/open62541/util.h
index 996b717099b..56d4315c222 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -30,12 +30,6 @@ typedef void (*UA_ServerCallback)(UA_Server *server, void *data);
 struct UA_Client;
 typedef struct UA_Client UA_Client;
 
-/* Timer policy to handle cycle misses */
-typedef enum {
-    UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-    UA_TIMER_HANDLE_CYCLEMISS_WITH_BASETIME
-} UA_TimerPolicy;
-
 /**
  * Random Number Generator
  * -----------------------

From 3cb601eccf69051f68072566dceda77280682170 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 18:08:22 +0100
Subject: [PATCH 0554/1963] refactor(doc): Improve documentation in eventloop.h

---
 include/open62541/plugin/eventloop.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index eaee8d2067c..405a29c00c9 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -69,7 +69,8 @@ typedef enum {
 
 typedef void (*UA_Callback)(void *application, void *context);
 
-/* To be executed in the next EventLoop cycle */
+/* Delayed callbacks are executed not when they are registered, but in the
+ * following EventLoop cycle */
 typedef struct UA_DelayedCallback {
     struct UA_DelayedCallback *next; /* Singly-linked list */
     UA_Callback callback;
@@ -89,11 +90,18 @@ struct UA_EventLoop {
     /* Configuration
      * ~~~~~~~~~~~~~~~
      * The configuration should be set before the EventLoop is started */
+
     const UA_Logger *logger;
     UA_KeyValueMap *params; /* See the implementation-specific documentation */
 
     /* EventLoop Lifecycle
-     * ~~~~~~~~~~~~~~~~~~~~ */
+     * ~~~~~~~~~~~~~~~~~~~~
+     * The EventLoop state also controls the state of the configured
+     * EventSources. Stopping the EventLoop gracefully closes e.g. the open
+     * network connections. The only way to process incoming events is to call
+     * the 'run' method. Events are then triggering their respective callbacks
+     * from within that method.*/
+
     const volatile UA_EventLoopState state; /* Only read the state from outside */
 
     /* Start the EventLoop and start all already registered EventSources */
@@ -127,6 +135,7 @@ struct UA_EventLoop {
      * The time domain of the EventLoop is exposed via the following functons.
      * See `open62541/types.h` for the documentation of their equivalent
      * globally defined functions. */
+
     UA_DateTime (*dateTime_now)(UA_EventLoop *el);
     UA_DateTime (*dateTime_nowMonotonic)(UA_EventLoop *el);
     UA_Int64    (*dateTime_localTimeUtcOffset)(UA_EventLoop *el);
@@ -170,6 +179,7 @@ struct UA_EventLoop {
      * between the handling of timed cyclic callbacks and polling for (network)
      * events. The memory for the delayed callback is *NOT* automatically freed
      * after the execution. */
+
     void (*addDelayedCallback)(UA_EventLoop *el, UA_DelayedCallback *dc);
     void (*removeDelayedCallback)(UA_EventLoop *el, UA_DelayedCallback *dc);
 

From 7c592a41bc7cbc748deb5a2e90088ca7e6483ac5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 19:22:01 +0100
Subject: [PATCH 0555/1963] refactor(core): Simplify standard includes

---
 include/open62541/client.h                    |  7 +--
 include/open62541/common.h                    | 17 +++++++
 include/open62541/server.h                    | 49 +++++++++----------
 include/open62541/server_pubsub.h             |  4 +-
 include/open62541/types.h                     |  3 ++
 include/open62541/util.h                      | 16 ------
 .../backend_open62541_typedefinitions.py      | 11 +----
 7 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 6237446902f..b266130b6fe 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -18,16 +18,13 @@
 #ifndef UA_CLIENT_H_
 #define UA_CLIENT_H_
 
-#include <open62541/config.h>
-#include <open62541/nodeids.h>
 #include <open62541/types.h>
-#include <open62541/types_generated.h>
-#include <open62541/types_generated_handling.h>
+#include <open62541/common.h>
 
 #include <open62541/plugin/log.h>
 #include <open62541/plugin/network.h>
-#include <open62541/plugin/securitypolicy.h>
 #include <open62541/plugin/eventloop.h>
+#include <open62541/plugin/securitypolicy.h>
 
 _UA_BEGIN_DECLS
 
diff --git a/include/open62541/common.h b/include/open62541/common.h
index 38a2271d2ba..570036873ee 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -13,6 +13,7 @@
 #define UA_COMMON_H_
 
 #include <open62541/config.h>
+#include <open62541/nodeids.h>
 
 _UA_BEGIN_DECLS
 
@@ -216,6 +217,22 @@ typedef struct {
     size_t sessionAbortCount;            /* only used by servers */
 } UA_SessionStatistics;
 
+/**
+ * Forward Declarations
+ * --------------------
+ * Opaque pointers used in Client, Server and PubSub. */
+
+struct UA_Server;
+typedef struct UA_Server UA_Server;
+
+struct UA_ServerConfig;
+typedef struct UA_ServerConfig UA_ServerConfig;
+
+typedef void (*UA_ServerCallback)(UA_Server *server, void *data);
+
+struct UA_Client;
+typedef struct UA_Client UA_Client;
+
 /**
  * .. include:: util.rst */
 
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 4fce4ebadea..3e5246afaa5 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -17,23 +17,18 @@
 #ifndef UA_SERVER_H_
 #define UA_SERVER_H_
 
-#include <open62541/util.h>
 #include <open62541/types.h>
 #include <open62541/common.h>
-#include <open62541/nodeids.h>
-#include <open62541/types_generated.h>
-#include <open62541/types_generated_handling.h>
 
-#include <open62541/plugin/eventloop.h>
-#include <open62541/plugin/securitypolicy.h>
-#include <open62541/plugin/accesscontrol.h>
-#include <open62541/plugin/nodestore.h>
-#include <open62541/plugin/network.h>
 #include <open62541/plugin/log.h>
 #include <open62541/plugin/pki.h>
+#include <open62541/plugin/network.h>
+#include <open62541/plugin/nodestore.h>
+#include <open62541/plugin/eventloop.h>
+#include <open62541/plugin/accesscontrol.h>
+#include <open62541/plugin/securitypolicy.h>
 
 #ifdef UA_ENABLE_PUBSUB
-#include <open62541/plugin/pubsub.h>
 #include <open62541/server_pubsub.h>
 #endif
 
@@ -1739,23 +1734,23 @@ UA_Server_deleteCondition(UA_Server *server,
                           const UA_NodeId conditionSource);
 
 /*
-* Set the LimitState of the LimitAlarmType
-*
-* @param server The server object
-* @param conditionId The NodeId of the node representation of the Condition Instance
-* @param limitValue The value from the trigger node
-*/
+ * Set the LimitState of the LimitAlarmType
+ *
+ * @param server The server object
+ * @param conditionId The NodeId of the node representation of the Condition Instance
+ * @param limitValue The value from the trigger node
+ */
 UA_StatusCode UA_EXPORT
 UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
                         UA_Double limitValue);
 
 /*
-* Parse the certifcate and set Expiration date
-*
-* @param server The server object
-* @param conditionId The NodeId of the node representation of the Condition Instance
-* @param cert The certificate for parsing
-*/
+ * Parse the certifcate and set Expiration date
+ *
+ * @param server The server object
+ * @param conditionId The NodeId of the node representation of the Condition Instance
+ * @param cert The certificate for parsing
+ */
 UA_StatusCode UA_EXPORT
 UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
                             UA_ByteString  cert);
@@ -1872,11 +1867,11 @@ UA_Server_setAsyncOperationResult(UA_Server *server,
 #endif /* !UA_MULTITHREADING >= 100 */
 
 /**
-* Statistics
-* ----------
-*
-* Statistic counters keeping track of the current state of the stack. Counters
-* are structured per OPC UA communication layer. */
+ * Statistics
+ * ----------
+ *
+ * Statistic counters keeping track of the current state of the stack. Counters
+ * are structured per OPC UA communication layer. */
 
 typedef struct {
    UA_SecureChannelStatistics scs;
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 0599f5e5494..fbaffd72fb0 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -12,10 +12,12 @@
 #ifndef UA_SERVER_PUBSUB_H
 #define UA_SERVER_PUBSUB_H
 
-#include <open62541/util.h>
+#include <open62541/common.h>
 #include <open62541/plugin/pubsub.h>
 #include <open62541/plugin/securitypolicy.h>
 
+#include <open62541/plugin/eventloop.h>
+
 _UA_BEGIN_DECLS
 
 #ifdef UA_ENABLE_PUBSUB
diff --git a/include/open62541/types.h b/include/open62541/types.h
index 974d2c77a71..b2c8cda58c0 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1498,6 +1498,9 @@ UA_Array_delete(void *p, size_t size, const UA_DataType *type);
 # define UA_TYPENAME(name)
 #endif
 
+#include <open62541/types_generated.h>
+#include <open62541/types_generated_handling.h>
+
 /**
  * .. include:: types_generated.rst */
 
diff --git a/include/open62541/util.h b/include/open62541/util.h
index 56d4315c222..3f011e83892 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -14,22 +14,6 @@
 
 _UA_BEGIN_DECLS
 
-/**
- * Forward Declarations
- * --------------------
- * Opaque pointers used by the plugins. */
-
-struct UA_Server;
-typedef struct UA_Server UA_Server;
-
-struct UA_ServerConfig;
-typedef struct UA_ServerConfig UA_ServerConfig;
-
-typedef void (*UA_ServerCallback)(UA_Server *server, void *data);
-
-struct UA_Client;
-typedef struct UA_Client UA_Client;
-
 /**
  * Random Number Generator
  * -----------------------
diff --git a/tools/nodeset_compiler/backend_open62541_typedefinitions.py b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
index aaac8592a51..5151ab4b4c9 100644
--- a/tools/nodeset_compiler/backend_open62541_typedefinitions.py
+++ b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
@@ -402,20 +402,13 @@ def print_header(self):
  * Autogenerated -- do not modify *
  **********************************/
 
+#include <open62541/types.h> /* Must be before the include guards */
+
 #ifndef ''' + self.parser.outname.upper() + '''_GENERATED_H_
 #define ''' + self.parser.outname.upper() + '''_GENERATED_H_
 
-#ifdef UA_ENABLE_AMALGAMATION
-#include "open62541.h"
-#else
-#include <open62541/types.h>
-''' + ('#include <open62541/types_generated.h>\n' if self.parser.outname != "types" else '') + '''
-#endif
-
 ''' + (additionalHeaders) + '''
-
 _UA_BEGIN_DECLS
-
 ''')
 
         self.printh('''/**

From 02c1e19612f1478928c78fd34a64e35efc8afa55 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 22:01:55 +0100
Subject: [PATCH 0556/1963] refactor(doc): Update and simplify CONTRIBUTING.md

---
 CONTRIBUTING.md | 398 +++++++++++++++++++++++-------------------------
 1 file changed, 188 insertions(+), 210 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 92966dd71d9..65dec9b0942 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,8 +25,6 @@ expectations for all contributors.
 Everybody can propose a pull request (PR). But only the core-maintainers of the
 project can merge PR.
 
-### Minimal requirements for a PR
-
 The following are the minimal requirements that every PR needs to meet.
 
 - **Pass Continuous Integration (CI)**: Every PR has to pass our CI. This
@@ -34,26 +32,79 @@ The following are the minimal requirements that every PR needs to meet.
   architectures, passing the unit tests and no detected issues with static code
   analysis tools.
 
-- **Code-Style**: Please consider the
-  [Code-Style](#code-style)
-  recommendations when formatting your code.
+- **Code-Style**: Please consider the [Code-Style](#code-style) recommendations
+  when formatting your code.
 
 - **Signed CLA**: Every contributor must sign the Contributor License Agreement
   (CLA) before we can merge his first PR. The signing can be done online. The
   link automatically appears on the page of the first PR. In addition, the CLA
   text can be accessed [here](https://cla-assistant.io/open62541/open62541).
 
+- **Separation of Concerns**: Small changes are much easier to review.
+  Typically, small PR are merged much faster. For larger contributions, it might
+  make sense to break them up into a series of PR. For example, a PR with a new
+  feature should not contain other commits with only stylistic improvements to
+  another portion of the code.
+
+- **Feature Commits**: The same holds true for the individual PR as well. Every
+  commit inside the PR should do one thing only. If many changes have been
+  applied at the same time, `git add --patch` can be used to partially stage and
+  commit changes that belong together.
+
+- **Commit Messages**: Good commit messages help in understanding changes.
+  See the next section.
+
+- **Linear Commit History**: Our goal is to maintain a linear commit history
+  where possible. Use the `git rebase` functionality before pushing a PR. Use
+  `git rebase --interactive` to squash bugfix commits.
+
+These labels can be used for the PR title to indicate its status.
+
+- `[WIP]`: The PR is work in progress and at this point simply informative.
+- `[Review]`: The PR is ready from the developers perspective. He requests a
+  review from a core-maintainer.
+- `[Discussion]`: The PR is a contribution to ongoing technical discussions. The
+  PR may be incomplete and is not intended to be merged before the discussion
+  has concluded.
+
+The core-maintainers are busy people. If they take especially long to react,
+feel free to trigger them by additional comments in the PR thread. Again, small
+PR are much faster to review.
+
+It is the job of the developer that posts the PR to rebase the PR on the target
+branch when the two diverge.
+
+### Changes to the Public API
+
+The *public* API is the collection of header files in the /include folder.
+
+Changes to the public API are under especially high scrutiny. Public API changes
+are best discussed with the core-maintainers early on. Simply to avoid duplicate
+work when changes to the proposed API become necessary.
+
+You can create a special issue or PR just for the sake of discussing a proposed
+API change. The actual implementation can follow later on.
+
+Breaking changes are frowned upon. If you cannot avoid API changes, try to
+create a new one and keep the old API alive (maybe with an addition
+UA_DEPRECATED macro).
+
+Breaking changes have to be mentioned in the CHANGELOG file.
+
 ## Commit and PR Hygiene
 
-We have very precise rules over how our git commit messages can be formatted.  This leads to **more
-readable messages** that are easy to follow when looking through the **project history**.  But also,
-we use the git commit messages to **generate the change log**.
+We have very precise rules over how our git commit messages can be formatted.
+This leads to **more readable messages** that are easy to follow when looking
+through the **project history**. But also, we use the git commit messages to
+**generate the change log**.
 
-This convention is identical to the [Conventional Commits](https://www.conventionalcommits.org) specification or the one used by Angular.
+This convention is identical to the [Conventional
+Commits](https://www.conventionalcommits.org) specification or the one used by
+Angular.
 
-### Commit Message Format
-Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
-format that includes a **type**, a **scope** and a **subject**:
+Each commit message consists of a **Header**, a **Body** and a **Footer**. The
+header has a special format that includes a **Type**, a **Scope** and a
+**Subject**:
 
 ```text
 <type>(<scope>): <subject>
@@ -63,10 +114,10 @@ format that includes a **type**, a **scope** and a **subject**:
 <footer>
 ```
 
-The **header** is mandatory and the **scope** of the header is optional.
+The **Header** is mandatory and the **Scope** of the header is optional.
 
-Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
-to read on GitHub as well as in various git tools.
+Any line of the commit message cannot be longer 100 characters! This allows the
+message to be easier to read on GitHub as well as in various git tools.
 
 The footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.
 
@@ -81,26 +132,28 @@ fix(core): fix parsing of endpoint url
 Parsing of endpoint urls now also supports https
 ```
 
-### Revert
-If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
+If the commit reverts a previous commit, it should begin with `revert: `,
+followed by the header of the reverted commit. In the body it should say: `This
+reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
 
-### Type
-Must be one of the following:
+The commit **Type** Must be one of the following:
 
 - **build**: Changes that affect the build system or external dependencies
-- **ci**: Changes to our CI configuration files and scripts (example scopes: travis, appveyor, fuzz)
+- **ci**: Changes to our CI configuration files and scripts (example scopes:
+  travis, appveyor, fuzz)
 - **docs**: Documentation only changes
 - **feat**: A new feature
 - **fix**: A bug fix
 - **perf**: A code change that improves performance
 - **refactor**: A code change that neither fixes a bug nor adds a feature
-- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
+- **style**: Changes that do not affect the meaning of the code (white-space,
+  formatting, missing semi-colons, etc)
 - **test**: Adding missing tests or correcting existing tests
 
-### Scope
-The scope is optional, but recommended to be used. It should be the name of the component which is affected (as perceived by the person reading the changelog generated from commit messages).
-
-The following is the list of supported scopes:
+The commit **Scope** is optional, but recommended to be used. It should be the
+name of the component which is affected (as perceived by the person reading the
+changelog generated from commit messages). The following is the list of
+supported scopes:
 
 - **arch**: Changes to specific architecture code in `root/arch`
 - **el**: Changes to the eventloop and associated event sources (also networking)
@@ -115,89 +168,38 @@ The following is the list of supported scopes:
 - **sec**: Changes to security, encryption, etc.
 - **server**: Changes only affecting server code
 
-### Subject
-The subject contains a succinct description of the change:
-
-- use the imperative, present tense: "change" not "changed" nor "changes"
-- don't capitalize the first letter
-- no dot (.) at the end
+The **Subject** contains a succinct description of the change:
 
-### Body
-Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
-The body should include the motivation for the change and contrast this with previous behavior.
+- Use the imperative, present tense: "change" not "changed" nor "changes"
+- Don't capitalize the first letter
+- No dot (.) at the end
 
-### Footer
-The footer should contain any information about **Breaking Changes** and is also the place to
-reference GitHub issues that this commit **Closes**.
+For the **Body**, Just as in the **Subject**, use the imperative, present tense: "change" not
+"changed" nor "changes". The body should include the motivation for the change
+and contrast this with previous behavior.
 
-**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
-
-## General commit hygiene
-
-We are using the [Conventional Commits](https://www.conventionalcommits.org) specification (see previous section).
-
-These sites explain a core set of good practice rules for preparing a PR:
-
-- https://wiki.openstack.org/wiki/GitCommitMessages
-- https://nvie.com/posts/a-successful-git-branching-model/
-
-The following points will be especially looked at during the review.
-
-- **Separation of Concerns**: Small changes are much easier to review.
-  Typically, small PR are merged much faster. For larger contributions, it might
-  make sense to break them up into a series of PR. For example, a PR with a new
-  feature should not contain other commits with only stylistic improvements to
-  another portion of the code.
-
-- **Feature Commits**: The same holds true for the individual PR as well. Every
-  commit inside the PR should do one thing only. If many changes have been
-  applied at the same time, `git add --patch` can be used to partially stage and
-  commit changes that belong together.
-
-- **Commit Messages**: Good commit messages help in understanding changes.
-  See previous section.
-
-- **Linear Commit History**: Our goal is to maintain a linear commit history
-  where possible. Use the `git rebase` functionality before pushing a PR. Use
-  `git rebase --interactive` to squash bugfix commits.
-
-### Review Process
-
-These labels can be used for the PR title to indicate its status.
-
-- `[WIP]`: The PR is work in progress and at this point simply informative.
-- `[Review]`: The PR is ready from the developers perspective. He requests a review from a core-maintainer.
-- `[Discussion]`: The PR is a contribution to ongoing technical discussions. The PR may be incomplete and is not intended to be merged before the discussion has concluded.
-
-The core-maintainers are busy people. If they take especially long to react,
-feel free to trigger them by additional comments in the PR thread. Again, small
-PR are much faster to review.
-
-It is the job of the developer that posts the PR to rebase the PR on the target
-branch when the two diverge.
-
-### Changes to the public API
-
-The *public* API is the collection of header files in the /include folder.
-
-Changes to the public API are under especially high scrutiny. Public API changes
-are best discussed with the core-maintainers early on. Simply to avoid duplicate
-work when changes to the proposed API become necessary.
-
-You can create a special issue or PR just for the sake of discussing a proposed
-API change. The actual implementation can follow later on.
+The **Footer** should contain any information about **Breaking Changes** and is also
+the place to reference GitHub issues that this commit **Closes**.
 
 ## Code Style
 
 ###  General
+
 1. Avoid the use of [Magic Numbers](https://en.wikipedia.org/wiki/Magic_number_(programming)#Unnamed_numerical_constants).
    For example use `UA_STATUSCODE_BADINTERNALERROR` instead of `0x80020000`
-2. Avoid using global variables. If you for some reason really need to use global variables, prefix them with `g_` so that it is immediately clear in the code, that we are dealing with a global variable.
-3. Almost all of the code is indented by four (4) spaces and regardless of which is better, spaces or tabs, you should indent with four spaces in order to be consistent.
-4. If you find yourself copy-pasting code, consider refactoring it into a function and calling that.
-   Try keeping functions short (about 20-30 lines, that way they will in most cases fit onto the screen).
-   In case of simple switch statements for example this can be exceeded, but there is not much complexity that needs to be understood.
-   Most of the time, if functions are longer than 30 lines, they can be refactored into smaller functions that make their intent clear.
+2. Avoid using global variables. If you for some reason really need to use
+   global variables, prefix them with `g_` so that it is immediately clear in
+   the code, that we are dealing with a global variable.
+3. Almost all of the code is indented by four (4) spaces and regardless of which
+   is better, spaces or tabs, you should indent with four spaces in order to be
+   consistent.
+4. If you find yourself copy-pasting code, consider refactoring it into a
+   function and calling that. Try keeping functions short (about 20-30 lines,
+   that way they will in most cases fit onto the screen). In case of simple
+   switch statements for example this can be exceeded, but there is not much
+   complexity that needs to be understood. Most of the time, if functions are
+   longer than 30 lines, they can be refactored into smaller functions that make
+   their intent clear.
 5. Use of comments
 
 Use C-style comments as follows:
@@ -215,7 +217,9 @@ Use C-style comments as follows:
  * gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. */
 ```
 
-Note that public header files (in the /include directory) use comments beginning with a double-star to generate documentation. Just follow along the formatting that is already in place.
+Note that public header files (in the /include directory) use comments beginning
+with a double-star to generate documentation. Just follow along the formatting
+that is already in place.
 
 ```c
 /** This is documentation */
@@ -226,6 +230,7 @@ Every (good) editor can reflow comments for nice formatting.
 Do not use C++ comments (double-slash `//`).
 
 See the following general rules for comments: [\[1\]](https://www.kernel.org/doc/Documentation/CodingStyle)
+
 > Comments are good, but there is also a danger of over-commenting.  NEVER
 > try to explain HOW your code works in a comment: it's much better to
 > write the code so that the _working_ is obvious, and it's a waste of
@@ -240,85 +245,69 @@ See the following general rules for comments: [\[1\]](https://www.kernel.org/doc
 > of the function, telling people what it does, and possibly WHY it does
 > it.
 
-### 1 Packages:
-1. "Package" = organizational element to aggregate methods, types, constants.
-2. Package are underline-aggregated or CamelCased, lowercase and in singular formal
-
-`examples: services_view, encoder, linkedList`
-3. Pseudo-Packages can be used for consolidation reasons (e.g. enclose dozens built-in types)
-   Pseudo-Packages' name should be using plural to focus on the consolidation aspect
-
-`examples: basictypes to aggregate all the hand coded basic types`
-
-### 2 Source file organization:
-1. every file starts with a prefix ua_ followed by the package name
-   examples: `ua_encoder.c, ua_transport_binary.c, ua_basictypes.c`
-2. source files are located in the /src folder
-3. source files can be further aggreagated on the file-system level, i.e.
-```
-	/src/.
-		ua_encoder.c
-		...	
-		util/.
-			ua_indexedList.c
-			...
-```
-	NOTE: file-system organization *is not* reflected in the source code
+### Methods
 
-### 3 Header files
-1. The header files for the public API are stored in the /include folder and have the same name as .c files
-2. The /include folder is a flattened /src folder e.g. it does not contain subdirectories
-
-### 4 Methods and instances
-1. Methods and instances are prefixed with UA_packageName
+1. Public methods are prefixed with `UA_`. If a public method operates on a
+   server it begins with `UA_Server_` and takes a pointer to `UA_Server` as its
+   first arguments (the same for the client).
 2. Methods and instances are camelCased starting with *lower* case
-   Examples: `UA_encoder_encode`, `UA_Int32_calculateSize`
-3. Use const on variables that will not be changed.
-   For example in functions, make all parameters const, that are not used as out arguments.
-   When declaring local variables in a function make them const, if you know that they will not be modified.
-   When using pointers, remember to declare both the pointer and the actual type as const, if they are never modified:
-   `const int *const myInt`
+   Examples: `UA_Server_new`, `UA_Int32_calculateSize`
+3. Use const on variables that will not be changed. For example in functions,
+   make all parameters const, that are not used as out arguments. When declaring
+   local variables in a function make them const, if you know that they will not
+   be modified. When using pointers, remember to declare both the pointer and
+   the actual type as const, if they are never modified: `const int *const
+   myInt`
 4. In- variables should be always *in front* of the out- variables in argument lists
 
-### 5 Types
-1. Types are prefixed with `UA_packageName`.
+### Types
+
+1. Public types are prefixed with `UA_`
 2. Types are CamelCased starting with *upper* case. Example: `UA_ResponseHeader`
 
-3. Builtin datatypes do not have a package name. Example: `UA_Int32, UA_Int64`
+### Constants, enums, defines
 
-### 6 Constants, enums, defines
-1. Constants and defines are in full capital letters, eg.: `MY_CONST`
-2. Constants should be defined in a matching package's .h file, if they are part of the interface.
-   Otherwise they should be kept in the .c file in order to not pollute the interface.
-3. Enums are preferred when defining several related constants, for example the different states of a secure channel:
-```
-typedef enum {
-    UA_SECURECHANNELSTATE_FRESH,
-    UA_SECURECHANNELSTATE_OPEN,
-    UA_SECURECHANNELSTATE_CLOSED
-} UA_SecureChannelState;
-```
+1. Constants and defines are in full capital letters, eg.: `UA_CONST`
+2. Enums are preferred when defining several related constants, for example the
+   different states of a secure channel:
+   ```
+   typedef enum {
+       UA_SECURECHANNELSTATE_FRESH,
+       UA_SECURECHANNELSTATE_OPEN,
+       UA_SECURECHANNELSTATE_CLOSED
+   } UA_SecureChannelState;
+   ```
+
+### Variable Naming
 
-### 7 Variable naming
-1. Variables should be descriptive and use camelCase starting with a lower case letter.
+1. Variables should be descriptive and use camelCase starting with a lower case
+   letter.
 2. Some commonly known abbreviations or variable name conventions can be used.
-   This includes for example loop variables like `i` and temporary variables like `tmp`.
-   Use common sense, and think about if you would still understand your own code if you looked at it two weeks in the future.
-3. Do not use Hungarian notation. The code base so far does not use it and neither should you, to be consistent.
-   For some reasons, why Hungarian notation might be bad, see [here](https://stackoverflow.com/questions/111933/why-shouldnt-i-use-hungarian-notation)
-
-### 8 Formatting
-1. Braces: Opening braces start on the same line as a function, if statement, etc. and the closing brace is placed on a separate line.
-   If the next keyword after a closing braces logically belongs to the previous keyword (i.e. if and else), the keyword is placed next to the closing brace on the same line with one space in between. Example:
-    ```c
-    if(a) {
-        doSomething();
-    } else if(b) {
-        doSomething();
-    } else doSomething();
-    ```
-2. Switch statement: Do not indent the case keyword and place the content of each case in new lines that are indented.
-   If using a code block to limit the scope of variables, follow the above convention. Example:
+   This includes for example loop variables like `i` and temporary variables
+   like `tmp`. Use common sense, and think about if you would still understand
+   your own code if you looked at it two weeks in the future.
+3. Do not use Hungarian notation. The code base so far does not use it and
+   neither should you, to be consistent. For some reasons, why Hungarian
+   notation might be bad, see
+   [here](https://stackoverflow.com/questions/111933/why-shouldnt-i-use-hungarian-notation)
+
+### Formatting
+
+1. Braces: Opening braces start on the same line as a function, if statement,
+   etc. and the closing brace is placed on a separate line. If the next keyword
+   after a closing braces logically belongs to the previous keyword (i.e. if and
+   else), the keyword is placed next to the closing brace on the same line with
+   one space in between. Example:
+   ```c
+   if(a) {
+       doSomething();
+   } else if(b) {
+       doSomething();
+   } else doSomething();
+   ```
+2. Switch statement: Do not indent the case keyword and place the content of
+   each case in new lines that are indented. If using a code block to limit the
+   scope of variables, follow the above convention. Example:
     ```c
     switch(a) {
     case 0:
@@ -338,57 +327,54 @@ typedef enum {
     int b = ((1) + 2) -
             (4 * 5 / 6 % 7);
     ```
-4. Keep the number of blank lines to a minimum, but leave some if it makes the code more readable.
-5. Surround binary operators with spaces except for member access operators. Do not use spaces around unary operators.
+4. Keep the number of blank lines to a minimum, but leave some if it makes the
+   code more readable.
+5. Surround binary operators with spaces except for member access operators. Do
+   not use spaces around unary operators.
 6. Do not place a space between a keyword and following parentheses.
 7. Do not place spaces within parentheses.
-8. Place a space before, but not after a pointer symbol (\*). Example: `const int *const **const myPtr;`
+8. Place a space before, but not after a pointer symbol (\*). Example: `const
+   int *const **const myPtr;`
 
 If you are using CLion you can configure your IDE by importing [this scheme](https://gist.github.com/Infinity95/c5c743180b447863aff9e5c76dfde0bb).
 
-### 9 Tests
-1. tests are contained in `/tests` dir and start with check_ prefix followed by a package name (corresponding .c file)
+### Tests
 
-   `example: check_encoder.c, check_securityLayer.c`
+Tests are contained in the `/tests` dir and start with check_ prefix followed by a
+package name (corresponding .c file).
 
-2. `check_main.c` file is used to aggregate test cases that are executed
+   `example: check_encoder.c, check_securityLayer.c`
 
-### 10 Checking returns, error logging and cleanup
+### Checking returns, error logging and cleanup
 
 Error handling and corresponding reactions like cleanup, logging or updating
 internal error states is important for a stable program flow.
 
-This section firstly describes specific macros that are used for checking return 
-values in various situations in [Check Macros](#check-macros).
-Secondly, [Cleanup](#cleanup) describes in which situations cleanup routines should be
-used and how to use them in combination with the check macros.
-
-#### Check Macros
-
 For checking return values within functions there are specific macros that are used.
 Handling check values and errors belongs to three different categories:
 
 1. Handling `UA_StatusCode` check values
-2. Handling memory allocation errors  
+2. Handling memory allocation errors
 3. Handling general `boolean` check values
 
-A very frequent use case is the checking of a `UA_StatusCode` return value and performing
-a specific action upon error. The workflow and usage is the same for all of the above categories.
-
-The basic check macro follows the structure `UA_CHECK_STATUS(STATUSCODE, EVAL_ON_ERROR)`, performing
-a check on the `STATUSCODE` and execute `EVAL_ON_ERROR` if an erroneous state is detected.
-
-The below example thus checks `rv` and executes `return rv` on error.
+A very frequent use case is the checking of a `UA_StatusCode` return value and
+performing a specific action upon error. The workflow and usage is the same for
+all of the above categories. The basic check macro follows the structure
+`UA_CHECK_STATUS(STATUSCODE, EVAL_ON_ERROR)`, performing a check on the
+`STATUSCODE` and execute `EVAL_ON_ERROR` if an erroneous state is detected. The
+below example thus checks `rv` and executes `return rv` on error.
 
 ```c
 UA_StatusCode rv = someAction();
 UA_CHECK_STATUS(rv, return rv);
 ```
 
-Similar to the above there exist logging variants for each check macro that logs to a specific
-logging level. The macro names are appended with a suffix `_FATAL`, `_ERROR`, `_WARN` or `_INFO`.
+Similar to the above there exist logging variants for each check macro that logs
+to a specific logging level. The macro names are appended with a suffix
+`_FATAL`, `_ERROR`, `_WARN` or `_INFO`.
 
-In this code snippet, the status code gets checked with a specified error action, while logging a specified error level message:
+In this code snippet, the status code gets checked with a specified error
+action, while logging a specified error level message:
 
 ```c
 UA_Logger *logger = &server->config.logger;
@@ -398,16 +384,13 @@ UA_StatusCode rv = someAction();
 UA_CHECK_STATUS_ERROR(rv, return rv, logger, UA_LOGCATEGORY_SERVER, "my message");
 ```
 
-Make sure to check out more examples below for applications of different macros.
-
-#### Cleanup
-
 In some situations it is nice to use the `goto` command in C. This is the case
 e.g. for jumping to cleanup routines that are used to perform a series of commands.
 
-For the development of `open62541` we employ a specific rule for which cleanup routines 
-should be used: **If the same cleanup routine is used from at least two places in the same function
-then this routine should be called via a `goto` statement.**
+For the development of `open62541` we employ a specific rule for which cleanup
+routines should be used: **If the same cleanup routine is used from at least two
+places in the same function then this routine should be called via a `goto`
+statement.**
 
 In this example e.g. only the second error check needs to free up some memory upon encountering
 an error, thus a jump to a cleanup routine is not indicated.
@@ -450,10 +433,6 @@ cleanup:
 }
 ```
 
-##### More Examples
-
-###### 2. Handling `UA_StatusCode` check values
-
 In this example only the status codes are checked and the corresponding
 action is evaluated on error. There is no message logging included.
 
@@ -518,8 +497,6 @@ foo(UA_Server *server) {
 }
 ```
 
-###### Short check examples for `boolean` and memory checking
-
 All the other check macros function analogously to the above `UA_CHECK_STATUS` examples,
 with a short example to explain the basic usage:
 
@@ -564,5 +541,6 @@ foo() {
 }
 ```
 
-### Still unsure?
+## Still unsure?
+
 If any questions arise concerning code style, feel free to start an issue.

From b5ad8db92ff62ed906bb6c0d5d559f368e1d329c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 22:02:19 +0100
Subject: [PATCH 0557/1963] feat(doc): Reference CONTRIBUTING.md from README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1549ca08ff9..41fe15cf2e2 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ For custom development that shall eventually become part of the open62541 librar
 
 ### Development
 
-As an open source project, new contributors are encouraged to help improve open62541. The following are good starting points for new contributors:
+As an open source project, new contributors are encouraged to help improve open62541. The file [CONTRIBUTING.md](CONTRIBUTING.md) aggregates good practices that we expect for code contributions. The following are good starting points for new contributors:
 
 - [Report bugs](https://github.com/open62541/open62541/issues)
 - Improve the [documentation](http://open62541.org/doc/current)

From b60349ea3cfc426e0c1bed6880a1af4c60ad5a0b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 26 Nov 2022 22:15:50 +0100
Subject: [PATCH 0558/1963] refactor(core): Use memset to zero out instead of
 '= {0};' (Android NDK problems)

---
 CONTRIBUTING.md                        |  3 +++
 arch/eventloop_posix_eth.c             |  6 ++++--
 include/open62541/types.h              |  6 ++++--
 plugins/mqtt/templates/posix_sockets.h |  8 ++++----
 src/client/ua_client_subscriptions.c   |  6 ++++--
 src/pubsub/ua_pubsub_writer.c          | 10 ++++++----
 src/server/ua_nodes.c                  |  2 +-
 src/ua_types.c                         | 10 +++++-----
 src/ua_types_encoding_json.c           |  3 ++-
 src/ua_util.c                          |  2 +-
 10 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 65dec9b0942..f40e7a3419c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -264,6 +264,9 @@ See the following general rules for comments: [\[1\]](https://www.kernel.org/doc
 
 1. Public types are prefixed with `UA_`
 2. Types are CamelCased starting with *upper* case. Example: `UA_ResponseHeader`
+3. Don't use `var = {0}` to zero-initialize variables. This results in warnings
+   for some exotic environments (e.g. some versions of the Android NDK). Use
+   `memset(ptr, 0, size)` insted.
 
 ### Constants, enums, defines
 
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 3e2e3f71d0f..8c95ad56e02 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -445,7 +445,8 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
                          const UA_KeyValueMap *params,
                          int ifindex, UA_UInt16 etherType) {
     /* Bind the socket to interface and EtherType. Don't receive anything else. */
-    struct sockaddr_ll sll = {0};
+    struct sockaddr_ll sll;
+    memset(&sll, 0, sizeof(struct sockaddr_ll));
     sll.sll_family = AF_PACKET;
     sll.sll_protocol = htons(etherType);
     sll.sll_ifindex = ifindex;
@@ -461,7 +462,8 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
         UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_PROMISCUOUS].name,
                                  &UA_TYPES[UA_TYPES_BOOLEAN]);
     if(promiscuous && *promiscuous) {
-        struct packet_mreq mreq = {0};
+        struct packet_mreq mreq;
+        memset(&mreq, 0, sizeof(struct packet_mreq));
         mreq.mr_ifindex = ifindex;
         mreq.mr_type = PACKET_MR_PROMISC;
         int ret = setsockopt(fd->fd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
diff --git a/include/open62541/types.h b/include/open62541/types.h
index b2c8cda58c0..32921ddcee9 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -210,7 +210,8 @@ UA_EXPORT extern const UA_String UA_STRING_NULL;
  * of the char-array. */
 UA_INLINABLE(UA_String
              UA_STRING(char *chars), {
-    UA_String s = {0};
+    UA_String s;
+    memset(&s, 0, sizeof(s));
     if(!chars)
         return s;
     s.length = strlen(chars); s.data = (UA_Byte*)chars;
@@ -699,7 +700,8 @@ UA_NumericRange_parse(UA_NumericRange *range, const UA_String str);
 
 UA_INLINABLE(UA_NumericRange
              UA_NUMERICRANGE(const char *s), {
-    UA_NumericRange nr = {0};
+    UA_NumericRange nr;
+    memset(&nr, 0, sizeof(nr)); 
     UA_NumericRange_parse(&nr, UA_STRING((char*)(uintptr_t)s));
     return nr;
 })
diff --git a/plugins/mqtt/templates/posix_sockets.h b/plugins/mqtt/templates/posix_sockets.h
index a12897850a7..1fb76c42008 100644
--- a/plugins/mqtt/templates/posix_sockets.h
+++ b/plugins/mqtt/templates/posix_sockets.h
@@ -23,16 +23,16 @@
 UA_StatusCode open_nb_socket(int* sockfd, const char* addr, const char* port);
 
 UA_StatusCode open_nb_socket(int* sockfd, const char* addr, const char* port) {
-    struct addrinfo hints = {0};
-
+    struct addrinfo hints;
+    memset(&hints, 0, sizeof(struct addrinfo));
     hints.ai_family = AF_UNSPEC; /* IPv4 or IPv6 */
     hints.ai_socktype = SOCK_STREAM; /* Must be TCP */
+
     *sockfd = -1;
-    int rv;
     struct addrinfo *p, *servinfo;
 
     /* get address information */
-    rv = getaddrinfo(addr, port, &hints, &servinfo);
+    int rv = getaddrinfo(addr, port, &hints, &servinfo);
     if(rv != 0) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "MQTT PubSub: Failed to open socket (getaddrinfo): %s", gai_strerror(rv));
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 06b57ccc99f..09f5f7c8d14 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -269,7 +269,8 @@ static void
 __Client_Subscription_deleteInternal(UA_Client *client,
                                      UA_Client_Subscription *sub) {
     /* Remove the MonitoredItems */
-    struct UA_Client_MonitoredItem_ForDelete deleteMonitoredItem = {0};
+    struct UA_Client_MonitoredItem_ForDelete deleteMonitoredItem;
+    memset(&deleteMonitoredItem, 0, sizeof(struct UA_Client_MonitoredItem_ForDelete));
     deleteMonitoredItem.client = client;
     deleteMonitoredItem.sub = sub;
     ZIP_ITER(MonitorItemsTree, &sub->monitoredItems,
@@ -794,7 +795,8 @@ ua_MonitoredItems_delete(UA_Client *client, UA_Client_Subscription *sub,
 #endif
 
     /* Loop over deleted MonitoredItems */
-    struct UA_Client_MonitoredItem_ForDelete deleteMonitoredItem = {0};
+    struct UA_Client_MonitoredItem_ForDelete deleteMonitoredItem;
+    memset(&deleteMonitoredItem, 0, sizeof(struct UA_Client_MonitoredItem_ForDelete));
     deleteMonitoredItem.client = client;
     deleteMonitoredItem.sub = sub;
 
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index da0bf6589b0..bb11e85bde9 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -381,7 +381,8 @@ static UA_DataSetFieldResult
 addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
                 const UA_DataSetFieldConfig *fieldConfig,
                 UA_NodeId *fieldIdentifier) {
-    UA_DataSetFieldResult result = {0};
+    UA_DataSetFieldResult result;
+    memset(&result, 0, sizeof(UA_DataSetFieldResult));
     if(!fieldConfig) {
         result.result = UA_STATUSCODE_BADINVALIDARGUMENT;
         return result;
@@ -495,7 +496,8 @@ UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
 
 UA_DataSetFieldResult
 removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
-    UA_DataSetFieldResult result = {0};
+    UA_DataSetFieldResult result;
+    memset(&result, 0, sizeof(UA_DataSetFieldResult));
 
     UA_DataSetField *currentField = UA_DataSetField_findDSFbyId(server, dsf);
     if(!currentField) {
@@ -1050,12 +1052,12 @@ valueChangedVariant(UA_Variant *oldValue, UA_Variant *newValue) {
     if(oldValueEncodingSize != newValueEncodingSize)
         return true;
 
-    UA_ByteString oldValueEncoding = {0};
+    UA_ByteString oldValueEncoding = UA_BYTESTRING_NULL;
     UA_StatusCode res = UA_ByteString_allocBuffer(&oldValueEncoding, oldValueEncodingSize);
     if(res != UA_STATUSCODE_GOOD)
         return false;
 
-    UA_ByteString newValueEncoding = {0};
+    UA_ByteString newValueEncoding = UA_BYTESTRING_NULL;
     res = UA_ByteString_allocBuffer(&newValueEncoding, newValueEncodingSize);
     if(res != UA_STATUSCODE_GOOD) {
         UA_ByteString_clear(&oldValueEncoding);
diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index b23d3a1c8bd..b30f429c979 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -44,7 +44,7 @@
 #endif
 
 const UA_ReferenceTypeSet UA_REFERENCETYPESET_NONE = {{0}};
-const UA_ReferenceTypeSet UA_REFERENCETYPESET_ALL  = {{UA_REFTYPES_ALL_ARRAY}};
+const UA_ReferenceTypeSet UA_REFERENCETYPESET_ALL = {{UA_REFTYPES_ALL_ARRAY}};
 
 /*****************/
 /* Node Pointers */
diff --git a/src/ua_types.c b/src/ua_types.c
index 871555a0145..bfa4565f7e6 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -35,11 +35,11 @@
 
 /* Global definition of NULL type instances. These are always zeroed out, as
  * mandated by the C/C++ standard for global values with no initializer. */
-const UA_String UA_STRING_NULL = {0};
-const UA_ByteString UA_BYTESTRING_NULL = {0};
-const UA_Guid UA_GUID_NULL = {0};
-const UA_NodeId UA_NODEID_NULL = {0};
-const UA_ExpandedNodeId UA_EXPANDEDNODEID_NULL = { {0}, {0}, 0 };
+const UA_String UA_STRING_NULL = {0, NULL};
+const UA_ByteString UA_BYTESTRING_NULL = {0, NULL};
+const UA_Guid UA_GUID_NULL = {0, 0, 0, {0,0,0,0,0,0,0,0}};
+const UA_NodeId UA_NODEID_NULL = {0, UA_NODEIDTYPE_NUMERIC, {0}};
+const UA_ExpandedNodeId UA_EXPANDEDNODEID_NULL = {{0, UA_NODEIDTYPE_NUMERIC, {0}}, {0, NULL}, 0};
 
 typedef UA_StatusCode
 (*UA_copySignature)(const void *src, void *dst, const UA_DataType *type);
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index cee11418ca7..8b6c1755f5f 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1354,7 +1354,8 @@ UA_print(const void *p, const UA_DataType *type, UA_String *output) {
     if(!p || !type || !output)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    UA_EncodeJsonOptions options = {0};
+    UA_EncodeJsonOptions options;
+    memset(&options, 0, sizeof(UA_EncodeJsonOptions));
     options.useReversible = true;
     options.prettyPrint = true;
     options.unquotedKeys = true;
diff --git a/src/ua_util.c b/src/ua_util.c
index 9f24f6102fe..4d559d906a9 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -232,7 +232,7 @@ UA_ByteString_fromBase64(UA_ByteString *bs,
 
 /* Key Value Map */
 
-const UA_KeyValueMap UA_KEYVALUEMAP_NULL = {0};
+const UA_KeyValueMap UA_KEYVALUEMAP_NULL = {0, NULL};
 
 UA_KeyValueMap *
 UA_KeyValueMap_new(void) {

From dc9b32d80ff6598a6d2e406ac175f80acca4caec Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 27 Nov 2022 17:42:19 +0100
Subject: [PATCH 0559/1963] refactor(doc): Improve the styling of the generated
 PDF

---
 doc/conf.py | 50 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index 4a74e0f0828..768945d04bd 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -215,21 +215,53 @@
 # The paper size ('letterpaper' or 'a4paper').
 'papersize': 'a4paper',
 
-# The chapter title style
-'fncychap': '\\usepackage[Sonny]{fncychap}',
-
 # Font settings
 'fontpkg': r"""
-\usepackage{sourcesanspro}
-\usepackage{newtx}
 \usepackage[scaled=.98,varqu,varl]{zi4}
+\usepackage[default,semibold]{sourcesanspro}
 """,
 
 # The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+'pointsize': '11pt',
+
+# Clean up the header and footer
+'preamble': r"""
+\fancypagestyle{normal}{
+    \fancyhf{}
+    \fancyfoot[RO,LE]{\thepage}
+    \renewcommand{\headrulewidth}{0pt}
+    \renewcommand{\footrulewidth}{0pt}
+}
+\fancypagestyle{plain}{
+    \fancyhf{}
+    \fancyfoot[RO,LE]{\thepage}
+    \renewcommand{\headrulewidth}{0pt}
+    \renewcommand{\footrulewidth}{0pt}
+}""",
+
+'maketitle': r"""
+    \makeatletter
+ \begin{titlepage}%
+      \begingroup % for PDF information dictionary
+       \def\endgraf{ }\def\and{\& }%
+       \pdfstringdefDisableCommands{\def\\{, }}% overwrite hyperref setup
+       \hypersetup{pdfauthor={\@author}, pdftitle={\@title}}%
+      \endgroup
+    \begin{flushright}%
+	\vspace*{2\baselineskip}
+      \begin{minipage}{.75\linewidth}
+      \sphinxlogo
+      \end{minipage} \bigskip \par
+      \py@HeaderFamily
+      {\Huge \@title \par}
+      {\itshape\LARGE \py@release\releaseinfo \par}
+      \bigskip
+      {\large \@date \par}%
+    \end{flushright}
+  \end{titlepage}%
+  \if@openright\cleardoublepage\else\clearpage\fi
+\makeatother
+""",
 
 # Latex figure (float) alignment
 #'figure_align': 'htbp',

From 8ce26192b47aeaa35e2ee46adff13cd5563ac2b9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 27 Nov 2022 17:42:50 +0100
Subject: [PATCH 0560/1963] feat(doc): Add references from attributes to their
 helper macros

---
 doc/information_modelling.rst | 116 +++++++++++++++++++---------------
 include/open62541/common.h    |  12 +++-
 2 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/doc/information_modelling.rst b/doc/information_modelling.rst
index 6d4a1dd6f49..0de5efdc8cb 100644
--- a/doc/information_modelling.rst
+++ b/doc/information_modelling.rst
@@ -36,55 +36,65 @@ defaults if users do not change them.
 .. table:: Node attributes for the different NodeClasses
    :width: 100%
 
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | Attribute               | DataType               | Variable | Variable­Type | Object | Object­Type | Reference­Type | Data­Type | Method | View  |
-   +=========================+========================+==========+===============+========+=============+================+===========+========+=======+
-   | NodeId                  | NodeId                 |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | NodeClass               | NodeClass              |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | BrowseName              | QualifiedName          |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | DisplayName             | LocalizedText          |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | Description             | LocalizedText          |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | WriteMask               | UInt32                 |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | UserWriteMask           | UInt32                 |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | IsAbstract              | Boolean                |          |     ``M``     |        |    ``M``    |     ``M``      |   ``M``   |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | Symmetric               | Boolean                |          |               |        |             |     ``M``      |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | InverseName             | LocalizedText          |          |               |        |             |     ``O``      |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | ContainsNoLoops         | Boolean                |          |               |        |             |                |           |        | ``M`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | EventNotifier           | Byte                   |          |               |  ``M`` |             |                |           |        | ``M`` |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | Value                   | Variant                |   ``M``  |     ``O``     |        |             |                |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | DataType                | NodeId                 |   ``M``  |     ``M``     |        |             |                |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | ValueRank               | Int32                  |   ``M``  |     ``M``     |        |             |                |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | ArrayDimensions         | [UInt32]               |   ``O``  |     ``O``     |        |             |                |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | AccessLevel             | Byte                   |   ``M``  |               |        |             |                |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | UserAccessLevel         | Byte                   |   ``M``  |               |        |             |                |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | MinimumSamplingInterval | Double                 |   ``O``  |               |        |             |                |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | Historizing             | Boolean                |   ``M``  |               |        |             |                |           |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | Executable              | Boolean                |          |               |        |             |                |           |  ``M`` |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | UserExecutable          | Boolean                |          |               |        |             |                |           |  ``M`` |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
-   | DataTypeDefinition      | DataTypeDefinition     |          |               |        |             |                |   ``O``   |        |       |
-   +-------------------------+------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Attribute               | DataType                    | Variable | Variable­Type | Object | Object­Type | Reference­Type | Data­Type | Method | View  |
+   +=========================+=============================+==========+===============+========+=============+================+===========+========+=======+
+   | NodeId                  | NodeId                      |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | NodeClass               | NodeClass                   |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | BrowseName              | QualifiedName               |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | DisplayName             | LocalizedText               |   ``M``  |     ``M``     |  ``M`` |    ``M``    |     ``M``      |   ``M``   |  ``M`` | ``M`` |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Description             | LocalizedText               |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | WriteMask               | UInt32                      |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
+   |                         | (:ref:`write-mask`)         |          |               |        |             |                |           |  ``M`` |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | UserWriteMask           | UInt32                      |   ``O``  |     ``O``     |  ``O`` |    ``O``    |     ``O``      |   ``O``   |  ``O`` | ``O`` |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | IsAbstract              | Boolean                     |          |     ``M``     |        |    ``M``    |     ``M``      |   ``M``   |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Symmetric               | Boolean                     |          |               |        |             |     ``M``      |           |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | InverseName             | LocalizedText               |          |               |        |             |     ``O``      |           |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | ContainsNoLoops         | Boolean                     |          |               |        |             |                |           |        | ``M`` |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | EventNotifier           | Byte                        |          |               |  ``M`` |             |                |           |        | ``M`` |
+   |                         | (:ref:`eventnotifier`)      |          |               |        |             |                |           |  ``M`` |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Value                   | Variant                     |   ``M``  |     ``O``     |        |             |                |           |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | DataType                | NodeId                      |   ``M``  |     ``M``     |        |             |                |           |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | ValueRank               | Int32                       |   ``M``  |     ``M``     |        |             |                |           |        |       |
+   |                         | (:ref:`valuerank-defines`)  |          |               |        |             |                |           |  ``M`` |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | ArrayDimensions         | [UInt32]                    |   ``O``  |     ``O``     |        |             |                |           |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | AccessLevel             | Byte                        |   ``M``  |               |        |             |                |           |        |       |
+   |                         | (:ref:`access-level-mask`)  |          |               |        |             |                |           |  ``M`` |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | UserAccessLevel         | Byte                        |   ``M``  |               |        |             |                |           |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | MinimumSamplingInterval | Double                      |   ``O``  |               |        |             |                |           |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Historizing             | Boolean                     |   ``M``  |               |        |             |                |           |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | Executable              | Boolean                     |          |               |        |             |                |           |  ``M`` |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | UserExecutable          | Boolean                     |          |               |        |             |                |           |  ``M`` |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+   | DataTypeDefinition      | DataTypeDefinition          |          |               |        |             |                |   ``O``   |        |       |
+   +-------------------------+-----------------------------+----------+---------------+--------+-------------+----------------+-----------+--------+-------+
+
+Each attribute is referenced by a numerical :ref:`attribute-id`.
+
+Some numerical attributes are used as bitfields or come with special semantics.
+In particular, see the sections on :ref:`access-level-mask`, :ref:`write-mask`,
+:ref:`valuerank-defines` and :ref:`eventnotifier`.
 
 New attributes in the standard that are still unsupported in open62541 are
 RolePermissions, UserRolePermissions, AccessRestrictions and AccessLevelEx.
@@ -123,7 +133,7 @@ of the value attribute may still be ``UInt32``, but also ``Float`` or
 Consistency between the data type attribute in the variable and its
 :ref:`VariableTypeNode` is ensured.
 
-Value Rank
+ValueRank
 ~~~~~~~~~~
 
 This attribute indicates whether the value attribute of the variable is an
@@ -136,8 +146,10 @@ values:
 - ``n = -2``: the value can be a scalar or an array with any number of dimensions
 - ``n = -3``: the value can be a scalar or a one dimensional array
 
-Consistency between the value rank attribute in the variable and its
-:ref:`variabletypenode` is ensured.
+Some helper macros for ValueRanks are defined :ref:`here <valuerank-defines>`.
+
+The consistency between the value rank attribute of a VariableNode and its
+:ref:`variabletypenode` is tested within the server.
 
 Array Dimensions
 ~~~~~~~~~~~~~~~~
diff --git a/include/open62541/common.h b/include/open62541/common.h
index 570036873ee..cd460cb2987 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -61,6 +61,8 @@ typedef enum {
 } UA_AttributeId;
 
 /**
+ * .. _access-level-mask:
+ *
  * Access Level Masks
  * ------------------
  * The access level to a node is given by the following constants that are ANDed
@@ -75,6 +77,8 @@ typedef enum {
 #define UA_ACCESSLEVELMASK_TIMESTAMPWRITE (0x01u << 6u)
 
 /**
+ * .. _write-mask:
+ *
  * Write Masks
  * -----------
  * The write mask and user write mask is given by the following constants that
@@ -104,8 +108,10 @@ typedef enum {
 #define UA_WRITEMASK_VALUEFORVARIABLETYPE    (0x01u << 21u)
 
 /**
- * ValueRanks
- * ----------
+ * .. _valuerank-defines:
+ *
+ * ValueRank
+ * ---------
  * The following are the most common ValueRanks used for Variables,
  * VariableTypes and method arguments. ValueRanks higher than 3 are valid as
  * well (but less common). */
@@ -119,6 +125,8 @@ typedef enum {
 #define UA_VALUERANK_THREE_DIMENSIONS          3
 
 /**
+ * .. _eventnotifier:
+ *
  * EventNotifier
  * -------------
  * The following are the available EventNotifier used for Nodes.

From 051e16c6f85320c3ce23a768c6ad8723235a09b8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 27 Nov 2022 21:41:13 +0100
Subject: [PATCH 0561/1963] fix(doc): Install required fronts for PDF docs
 build

---
 .github/workflows/doc_upload.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/doc_upload.yml b/.github/workflows/doc_upload.yml
index 5af89e55288..d989f572845 100644
--- a/.github/workflows/doc_upload.yml
+++ b/.github/workflows/doc_upload.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y -qq python3-sphinx graphviz python-six texlive-fonts-recommended texlive-latex-extra texlive-plain-generic texlive-latex-recommended latexmk
+          sudo apt-get install -y -qq python3-sphinx graphviz python-six texlive-fonts-recommended texlive-latex-extra texlive-plain-generic texlive-latex-recommended latexmk texlive-fonts-extra
           pip install sphinx-rtd-theme
       - name: Build Documentation
         run: source tools/ci.sh && build_docs_pdf

From bea9e985ec11098012ca5ce08fdbc9f625cec8e1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 27 Nov 2022 22:04:07 +0100
Subject: [PATCH 0562/1963] feat(doc): Include more plugin APIs into the
 documentation

---
 doc/CMakeLists.txt                        | 14 +++++++++-----
 doc/generated.rst                         | 14 ++++++++++++++
 doc/internal.rst                          | 11 -----------
 doc/plugin.rst                            | 13 +++++++++++++
 doc/toc.rst                               |  3 ++-
 include/open62541/plugin/securitypolicy.h |  4 ++--
 include/open62541/types.h                 | 13 ++++++-------
 7 files changed, 46 insertions(+), 26 deletions(-)
 create mode 100644 doc/generated.rst
 delete mode 100644 doc/internal.rst
 create mode 100644 doc/plugin.rst

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index adb288b291f..0d526e1dccf 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -39,14 +39,18 @@ generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/server.h ${DOC_SRC_DIR}/ser
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client_subscriptions.h ${DOC_SRC_DIR}/client_subscriptions.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client.h ${DOC_SRC_DIR}/client.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client_highlevel.h ${DOC_SRC_DIR}/client_highlevel.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/log.h ${DOC_SRC_DIR}/plugin_log.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/network.h ${DOC_SRC_DIR}/plugin_network.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/accesscontrol.h ${DOC_SRC_DIR}/plugin_accesscontrol.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/src/server/ua_services.h ${DOC_SRC_DIR}/services.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h ${DOC_SRC_DIR}/nodestore.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/pubsub.h ${DOC_SRC_DIR}/plugin_pubsub_connection.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/server_pubsub.h ${DOC_SRC_DIR}/pubsub.rst)
 
+generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/accesscontrol.h ${DOC_SRC_DIR}/plugin_accesscontrol.rst)
+generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/network.h ${DOC_SRC_DIR}/plugin_network.rst)
+generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/log.h ${DOC_SRC_DIR}/plugin_log.rst)
+generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h ${DOC_SRC_DIR}/plugin_nodestore.rst)
+generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/pubsub.h ${DOC_SRC_DIR}/plugin_pubsub.rst)
+generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/eventloop.h ${DOC_SRC_DIR}/plugin_eventloop.rst)
+generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/pki.h ${DOC_SRC_DIR}/plugin_pki.rst)
+generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/securitypolicy.h ${DOC_SRC_DIR}/plugin_securitypolicy.rst)
+
 # Doc from tutorial code
 generate_rst(${PROJECT_SOURCE_DIR}/examples/tutorial_datatypes.c ${DOC_SRC_DIR}/tutorial_datatypes.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/examples/tutorial_server_firststeps.c ${DOC_SRC_DIR}/tutorial_server_firststeps.rst)
diff --git a/doc/generated.rst b/doc/generated.rst
new file mode 100644
index 00000000000..d7bcc9218eb
--- /dev/null
+++ b/doc/generated.rst
@@ -0,0 +1,14 @@
+.. _generated-definitions:
+
+Generated Definitions
+=====================
+
+The following definitions are auto-generated from XML files that are part of the
+OPC UA standard.
+
+Generated Data Types
+--------------------
+
+.. include:: types_generated.rst
+
+.. include:: statuscodes.rst
diff --git a/doc/internal.rst b/doc/internal.rst
deleted file mode 100644
index 4744b68dd09..00000000000
--- a/doc/internal.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Internals
-=========
-
-.. toctree::
-
-   statuscodes
-   nodestore
-   plugin_network
-   plugin_accesscontrol
-   plugin_log
-   plugin_pubsub_connection
diff --git a/doc/plugin.rst b/doc/plugin.rst
new file mode 100644
index 00000000000..accdbd2bcf5
--- /dev/null
+++ b/doc/plugin.rst
@@ -0,0 +1,13 @@
+Plugin API
+==========
+
+.. toctree::
+
+   plugin_log
+   plugin_nodestore
+   plugin_network
+   plugin_accesscontrol
+   plugin_pubsub
+   plugin_eventloop
+   plugin_pki
+   plugin_securitypolicy
diff --git a/doc/toc.rst b/doc/toc.rst
index 5b7a507b31d..62555d861c4 100644
--- a/doc/toc.rst
+++ b/doc/toc.rst
@@ -16,4 +16,5 @@ open62541 Documentation
    pubsub
    common
    nodeset_compiler
-   internal
+   plugin
+   generated
diff --git a/include/open62541/plugin/securitypolicy.h b/include/open62541/plugin/securitypolicy.h
index 1220b5d3038..1b9a32dfbb8 100644
--- a/include/open62541/plugin/securitypolicy.h
+++ b/include/open62541/plugin/securitypolicy.h
@@ -22,8 +22,8 @@ struct UA_SecurityPolicy;
 typedef struct UA_SecurityPolicy UA_SecurityPolicy;
 
 /**
- * SecurityPolicy Interface Definition
- * ----------------------------------- */
+ * SecurityPolicy 
+ * -------------- */
 
 typedef struct {
     UA_String uri;
diff --git a/include/open62541/types.h b/include/open62541/types.h
index 32921ddcee9..df76059b0e1 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1489,11 +1489,13 @@ UA_Array_delete(void *p, size_t size, const UA_DataType *type);
  * Generated Data Type Definitions
  * -------------------------------
  *
- * The following data types were auto-generated from a definition in XML format.
- */
+ * The OPC UA standard defines many data types that are combinations of the 25
+ * builtin data types. See the section on :ref:`generated-definitions` for the
+ * list of data types that are integrated for this build of the open62541
+ * library. */
 
-/* The following is used to exclude type names in the definition of UA_DataType
- * structures if the feature is disabled. */
+/* Helper used to exclude type names in the definition of UA_DataType structures
+ * if the feature is disabled. */
 #ifdef UA_ENABLE_TYPEDESCRIPTION
 # define UA_TYPENAME(name) name,
 #else
@@ -1503,9 +1505,6 @@ UA_Array_delete(void *p, size_t size, const UA_DataType *type);
 #include <open62541/types_generated.h>
 #include <open62541/types_generated_handling.h>
 
-/**
- * .. include:: types_generated.rst */
-
 _UA_END_DECLS
 
 #endif /* UA_TYPES_H_ */

From f7d8f70be3ef478255746be6564245b2acec76b4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 27 Nov 2022 22:20:55 +0100
Subject: [PATCH 0563/1963] refactor(doc): Combine the build and install
 chapters

---
 doc/building.rst   |  77 +++++++++++++++++++++++++---
 doc/installing.rst | 123 ---------------------------------------------
 doc/toc.rst        |   1 -
 3 files changed, 69 insertions(+), 132 deletions(-)
 delete mode 100644 doc/installing.rst

diff --git a/doc/building.rst b/doc/building.rst
index a844e9e1a63..286303a980e 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -3,14 +3,13 @@
 Building open62541
 ==================
 
-open62541 uses CMake to build the library and binaries. The library version is automatically
-detected using ``git describe``. This command returns a valid version string based on the current tag.
-If you did not directly clone the sources, but use the tar or zip package from a release, you need
-to manually specify the version. In that case use e.g. ``cmake -DOPEN62541_VERSION=v1.0.3``.
-
 Building the Library
 --------------------
 
+open62541 uses CMake to build the library and binaries. CMake generates a
+Makefile or a Visual Studio project. This is then used to perform the actual
+build.
+
 Building with CMake on Ubuntu or Debian
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -39,6 +38,30 @@ Building with CMake on Ubuntu or Debian
    make doc # html documentation
    make doc_pdf # pdf documentation (requires LaTeX)
 
+You can install open62541 using the well known `make install` command. This
+allows you to use pre-built libraries and headers for your own project. In order
+to use open62541 as a shared library (.dll or .so) make sure to activate the
+``BUILD_SHARED_LIBS`` CMake option.
+
+To override the default installation directory use ``cmake
+-DCMAKE_INSTALL_PREFIX=/some/path``. Based on the SDK Features you selected, as
+described in :ref:`build_options`, these features will also be included in the
+installation. Thus we recommend to enable as many non-experimental features as
+possible for the installed binary.
+
+In your own CMake project you can then include the open62541 library using:
+
+.. code-block:: cmake
+
+   # optionally you can also specify a specific version
+   # e.g. find_package(open62541 1.0.0)
+   find_package(open62541 REQUIRED COMPONENTS Events FullNamespace)
+   add_executable(main main.cpp)
+   target_link_libraries(main open62541::open62541)
+
+A full list of enabled features during build time is stored in the CMake
+Variable ``open62541_COMPONENTS_ALL``
+
 Building with CMake on Windows
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -87,7 +110,9 @@ Follow Ubuntu instructions without the ``apt-get`` commands as these are taken c
 
 Building on OpenBSD
 ^^^^^^^^^^^^^^^^^^^
-The procedure below works on OpenBSD 5.8 with gcc version 4.8.4, cmake version 3.2.3 and Python version 2.7.10.
+
+The procedure below works on OpenBSD 5.8 with gcc version 4.8.4, cmake version
+3.2.3 and Python version 2.7.10.
 
 - Install a recent gcc, python and cmake:
 
@@ -412,12 +437,48 @@ The RAM requirements of a server are mostly due to the following settings:
 - The number of connected clients
 - The configured maximum message size that is preallocated
 
+Prebuilt packages
+-----------------
+
+Debian
+^^^^^^
+Debian packages can be found in our official PPA:
+
+ * Daily Builds (based on master branch): https://launchpad.net/~open62541-team/+archive/ubuntu/daily
+ * Release Builds (starting with Version 0.4): https://launchpad.net/~open62541-team/+archive/ubuntu/ppa
+
+Install them with:
+
+.. code-block:: bash
+
+    sudo add-apt-repository ppa:open62541-team/ppa
+    sudo apt-get update
+    sudo apt-get install libopen62541-1-dev
+
+Arch
+^^^^
+Arch packages are available in the AUR:
+
+ * Stable Builds: https://aur.archlinux.org/packages/open62541/
+ * Unstable Builds (current master): https://aur.archlinux.org/packages/open62541-git/
+ * In order to add custom build options (:ref:`build_options`), you can set the environment variable ``OPEN62541_CMAKE_FLAGS``
+
+OpenBSD
+^^^^^^^
+Starting with OpenBSD 6.7 the ports directory misc/open62541 can
+build the released version of open62541.
+Install the binary package from the OpenBSD mirrors:
+
+.. code-block:: bash
+   
+   pkg_add open62541
 
 Building the Examples
 ---------------------
 
-Make sure that you can build the shared library as explained in the previous steps. Even easier way
-to build the examples is to install open62541 in your operating system (see :ref:`installing`).
+Make sure that you have installed the shared library as explained in the
+previous steps. Even easier way to build the examples is to install open62541 in
+your operating system (see :ref:`installing`).
 
 Then the compiler should automatically find the includes and the shared library.
 
diff --git a/doc/installing.rst b/doc/installing.rst
deleted file mode 100644
index 1cdd1618410..00000000000
--- a/doc/installing.rst
+++ /dev/null
@@ -1,123 +0,0 @@
-.. _installing:
-
-Installing open62541
-====================
-
-Manual installation
--------------------
-
-You can install open62541 using the well known `make install` command.
-This allows you to use pre-built libraries and headers for your own project.
-
-To override the default installation directory use ``cmake -DCMAKE_INSTALL_PREFIX=/some/path``.
-Based on the SDK Features you selected, as described in :ref:`build_options`, these features will also
-be included in the installation. Thus we recommend to enable as many non-experimental features as possible
-for the installed binary.
-
-The recommended cmake options for a default installation are:
-
-.. code-block:: bash
-
-   git submodule update --init --recursive
-   mkdir build && cd build
-   cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=FULL ..
-   make
-   sudo make install
-
-This will enable the following features in 0.4:
-
- * Discovery
- * FullNamespace
- * Methods
- * Subscriptions
-
-The following features are not enabled and can be optionally enabled using the build options as described in :ref:`build_options`:
-
- * Amalgamation
- * DiscoveryMulticast
- * Encryption
- * Multithreading
- * Subscriptions
-
-.. important::
-   We strongly recommend to not use ``UA_ENABLE_AMALGAMATION=ON`` for your installation. This will only generate a single ``open62541.h`` header file instead of the single header files.
-   We encourage our users to use the non-amalgamated version to reduce the header size and simplify dependency management.
-
-
-In your own CMake project you can then include the open62541 library using:
-
-.. code-block:: cmake
-
-   # optionally you can also specify a specific version
-   # e.g. find_package(open62541 1.0.0)
-   find_package(open62541 REQUIRED COMPONENTS Events FullNamespace)
-   add_executable(main main.cpp)
-   target_link_libraries(main open62541::open62541)
-
-
-A full list of enabled features during build time is stored in the CMake Variable ``open62541_COMPONENTS_ALL``
-
-
-Prebuilt packages
------------------
-
-Pack branches
-^^^^^^^^^^^^^
-
-Github allows you to download a specific branch as .zip package. Just using this .zip package for open62541 will likely fail:
-
- * CMake uses ``git describe --tags`` to automatically detect the version string. The .zip package does not include any git information
- * Specific options during the build stack require additional git submodules which are not inlined in the .zip
-
-Therefore we provide packaging branches. They have the prefix `pack/` and are automatically updated to match the referenced branch.
-
-Here are some examples:
-
- * `pack/master.zip <https://github.com/open62541/open62541/archive/pack/master.zip>`_
- * `pack/1.0.zip <https://github.com/open62541/open62541/archive/pack/1.0.zip>`_
-
-These pack branches have inlined submodules and the version string is hardcoded. If you need to build from source but do not want to use git,
-use these specific pack versions.
-
-Prebuilt binaries
-^^^^^^^^^^^^^^^^^
-
-You can always find prebuilt binaries for every release on our `Github Release Page <https://github.com/open62541/open62541/releases>`_.
-
-
-Nightly single file releases for Linux and Windows of the last 50 commits can be found here: https://open62541.org/releases/
-
-
-Debian
-^^^^^^
-Debian packages can be found in our official PPA:
-
- * Daily Builds (based on master branch): https://launchpad.net/~open62541-team/+archive/ubuntu/daily
- * Release Builds (starting with Version 0.4): https://launchpad.net/~open62541-team/+archive/ubuntu/ppa
-
-Install them with:
-
-
-.. code-block:: bash
-
-    sudo add-apt-repository ppa:open62541-team/ppa
-    sudo apt-get update
-    sudo apt-get install libopen62541-1-dev
-
-Arch
-^^^^
-Arch packages are available in the AUR:
-
- * Stable Builds: https://aur.archlinux.org/packages/open62541/
- * Unstable Builds (current master): https://aur.archlinux.org/packages/open62541-git/
- * In order to add custom build options (:ref:`build_options`), you can set the environment variable ``OPEN62541_CMAKE_FLAGS``
-
-OpenBSD
-^^^^^^^
-Starting with OpenBSD 6.7 the ports directory misc/open62541 can
-build the released version of open62541.
-Install the binary package from the OpenBSD mirrors:
-
-.. code-block:: bash
-   
-   pkg_add open62541
diff --git a/doc/toc.rst b/doc/toc.rst
index 62555d861c4..4341095303b 100644
--- a/doc/toc.rst
+++ b/doc/toc.rst
@@ -5,7 +5,6 @@ open62541 Documentation
 
    index
    building
-   installing
    tutorials
    protocol
    types

From 2d86ed647d223e01c1bba2f9c84373b19525b024 Mon Sep 17 00:00:00 2001
From: ReidJunLi-Rockwell
 <73766811+ReidJunLi-Rockwell@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:34:24 +0800
Subject: [PATCH 0564/1963] fix(nc): issues when parse GUID and Variant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nodeset compiler cannot parse 'DataSetFieldId', the value are all zero
UnboundLocalError: local variable ‘val’ reference before assignment when parse GUID
getTypeByString cannot parse 'Variant' BuiltinType
---
 tools/nodeset_compiler/datatypes.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index 07b3805e81e..51b4595cad7 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -284,8 +284,9 @@ def __parseXMLSingleValue(self, xmlvalue, parentDataTypeNode, parent, parser, al
                                 extobj.value.append(values)
                             else:
                                 t = self.getTypeByString(e.member_type.name, None)
-                                t.alias = ebodypart.localName
-                                t.parseXML(ebodypart)
+                                if t is not None:   # cannot get Type for 'Variant' now
+                                    t.alias = ebodypart.localName
+                                    t.parseXML(ebodypart)
                                 extobj.value.append(t)
                         elif isinstance(e.member_type, StructType):
                             # information is_array!
@@ -851,8 +852,11 @@ def parseXML(self, xmlvalue):
         # <Guid>
         #   <String>01234567-89AB-CDEF-ABCD-0123456789AB</String>
         # </Guid>
+        val = None  # set to None before check
         if len(xmlvalue.getElementsByTagName("String")) != 0:
             val = getXmlTextTrimmed(xmlvalue.getElementsByTagName("String")[0].firstChild)
+        else:
+            val = getXmlTextTrimmed(xmlvalue.firstChild)    # no 'String' like 'DataSetFieldId'
 
         if val is None:
             self.value = ['00000000', '0000', '0000', '0000', '000000000000']  # Catch XML <Guid /> by setting the value to a default

From e05f479c9d48690b9098760974e3c71e728acad8 Mon Sep 17 00:00:00 2001
From: ReidJunLi-Rockwell
 <73766811+ReidJunLi-Rockwell@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:50:14 +0800
Subject: [PATCH 0565/1963] fix(pubsub): only read the first DataSetMessage

---
 src/pubsub/ua_pubsub_reader.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index d7ae7a7e400..74245c3a095 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -373,7 +373,14 @@ checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
             }
         }
         if(msg->payloadHeaderEnabled) {
-            if(reader->config.dataSetWriterId != *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {
+            UA_Byte totalDataSets = msg->payloadHeader.dataSetPayloadHeader.count;
+            UA_Byte iterator = 0;
+            for(iterator = 0; iterator < totalDataSets; iterator++) { 
+                if(reader->config.dataSetWriterId == msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[iterator]) {
+                    return UA_STATUSCODE_GOOD;
+                }
+            }
+            if (iterator == totalDataSets) {
                 UA_LOG_INFO_READER(&server->config.logger, reader, "DataSetWriterId doesn't match");
                 return UA_STATUSCODE_BADNOTFOUND;
             }
@@ -1321,10 +1328,14 @@ processMessageWithReader(UA_Server *server, UA_ReaderGroup *readerGroup,
     if(msg->payloadHeaderEnabled)
         totalDataSets = msg->payloadHeader.dataSetPayloadHeader.count;
     for(UA_Byte i = 0; i < totalDataSets; i++) {
-        UA_LOG_DEBUG_READER(&server->config.logger, reader,
+        /* map dataset reader to dataset message since multiple dataset reader may read this network message
+           otherwise the dataset message may be written to the wrong dataset reader.  */
+        if (reader->config.dataSetWriterId == msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i]) {
+            UA_LOG_DEBUG_READER(&server->config.logger, reader,
                             "Process Msg with DataSetReader!");
-        UA_DataSetReader_process(server, readerGroup, reader,
+            UA_DataSetReader_process(server, readerGroup, reader,
                                  &msg->payload.dataSetPayload.dataSetMessages[i]);
+        }
     }
 }
 

From 46b42f57ad5d6c55981d4c0e2fe409a68232cef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norbert=20Wo=C5=82owiec?= <nokem61@gmail.com>
Date: Wed, 30 Nov 2022 16:58:51 +0100
Subject: [PATCH 0566/1963] fix(client): Fix response on Publish status:
 BAD_NOSUBSCRIPTION (#5489)

---
 src/client/ua_client_subscriptions.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 09f5f7c8d14..043c8a64771 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -1172,6 +1172,16 @@ __Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishReque
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADSHUTDOWN)
         return;
 
+    if(response->responseHeader.serviceResult == UA_STATUSCODE_BADNOSUBSCRIPTION) 
+    {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Received BadNoSubscription, delete internal information about subscription");
+        UA_Client_Subscription *sub = findSubscription(client, response->subscriptionId);
+        if(sub != NULL)
+            __Client_Subscription_deleteInternal(client, sub);
+        return;
+    }
+
     if(!LIST_FIRST(&client->subscriptions)) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADNOSUBSCRIPTION;
         return;

From 9c13c7596242c573ca67a004bc000574af2cff03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 13:44:19 +0100
Subject: [PATCH 0567/1963] build(deps): bump deps/mdnsd from `3151afe` to
 `0611cc0` (#5440)

Bumps [deps/mdnsd](https://github.com/Pro/mdnsd) from `3151afe` to `0611cc0`.
- [Release notes](https://github.com/Pro/mdnsd/releases)
- [Commits](https://github.com/Pro/mdnsd/compare/3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0...0611cc06da863e083c0e0534a932cf016fa9efe0)

---
updated-dependencies:
- dependency-name: deps/mdnsd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 deps/mdnsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mdnsd b/deps/mdnsd
index 3151afe5899..0611cc06da8 160000
--- a/deps/mdnsd
+++ b/deps/mdnsd
@@ -1 +1 @@
-Subproject commit 3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0
+Subproject commit 0611cc06da863e083c0e0534a932cf016fa9efe0

From f58642167a6ab6856a57d71f3fd8e0a8c9080763 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 00:03:14 +0000
Subject: [PATCH 0568/1963] build(deps): bump deps/nodesetLoader from `8a26df9`
 to `43b7684`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `8a26df9` to `43b7684`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/8a26df93aa5aec176c6d9a718a5c1ef8def35f37...43b76840059679b7de6931b066d6e45cdb1239b6)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index 8a26df93aa5..43b76840059 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit 8a26df93aa5aec176c6d9a718a5c1ef8def35f37
+Subproject commit 43b76840059679b7de6931b066d6e45cdb1239b6

From 350da1de4cb20713a0753b5016dd47959e074169 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas_fischer@siemens.com>
Date: Wed, 7 Dec 2022 14:45:43 +0100
Subject: [PATCH 0569/1963] feat(pubsub) add standaloneSubscribedDataSets
 information model representation

* add SubscribedDataSets Folder in Minimal XML

this change will prohibit the error message when Namespace0 is set to FULL

* use correct function for cleanup

* fix onRead for SDS childs

* reset isConnected when reader is removed

* add unittest isConnected

* fix pipeline

missing END_TEST for new unit test
---
 src/pubsub/ua_pubsub_manager.c                |  2 +-
 src/pubsub/ua_pubsub_ns0.c                    | 40 +++++------
 src/pubsub/ua_pubsub_reader.c                 | 11 +++-
 tests/pubsub/check_pubsub_subscribe.c         | 66 +++++++++++++++++++
 .../schema/Opc.Ua.NodeSet2.PubSubMinimal.xml  |  8 +++
 5 files changed, 102 insertions(+), 25 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 902236ebe04..61063c7e01d 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -796,7 +796,7 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     /* delete subscribed datasets */
     UA_StandaloneSubscribedDataSet *tmpSDS1, *tmpSDS2;
     TAILQ_FOREACH_SAFE(tmpSDS1, &server->pubSubManager.subscribedDataSets, listEntry, tmpSDS2){
-        UA_Server_removeStandaloneSubscribedDataSet(server, tmpSDS1->identifier);
+        removeStandaloneSubscribedDataSet(server, tmpSDS1->identifier);
     }
 
 #ifdef UA_ENABLE_PUBSUB_SKS
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 8fb0bd31dd5..bbb7f41b26e 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -185,28 +185,28 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
                                      &UA_TYPES[UA_TYPES_CONFIGURATIONVERSIONDATATYPE]);
             break;
         }
-        case UA_NS0ID_STANDALONESUBSCRIBEDDATASETREFDATATYPE: {
-            UA_StandaloneSubscribedDataSet *sds = UA_StandaloneSubscribedDataSet_findSDSbyId(server, *myNodeId);
-            switch(nodeContext->elementClassiefier) {
-                case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_ISCONNECTED: {
-                    UA_Variant_setScalar(&value, &sds->config.isConnected, &UA_TYPES[UA_TYPES_BOOLEAN]);
-                    break;
-                }
-                case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_DATASETMETADATA: {
-                    UA_Variant_setScalar(&value, &sds->config.dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
-                    break;
-                }
-                default:
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                                "Read error! Unknown property.");
-            }
-            break;
-        }
         default:
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown property.");
         }
         break;
+    }    
+    case UA_NS0ID_STANDALONESUBSCRIBEDDATASETREFDATATYPE: {
+        UA_StandaloneSubscribedDataSet *sds = UA_StandaloneSubscribedDataSet_findSDSbyId(server, *myNodeId);
+        switch(nodeContext->elementClassiefier) {
+            case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_ISCONNECTED: {
+                UA_Variant_setScalar(&value, &sds->config.isConnected, &UA_TYPES[UA_TYPES_BOOLEAN]);
+                break;
+            }
+            case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_DATASETMETADATA: {
+                UA_Variant_setScalar(&value, &sds->config.dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
+                break;
+            }
+            default:
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                            "Read error! Unknown property.");
+        }
+        break;
     }
     default:
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -2200,12 +2200,6 @@ UA_Server_initPubSubNS0(UA_Server *server) {
     retVal |= writePubSubNs0VariableArray(server, UA_NS0ID_PUBLISHSUBSCRIBE_SUPPORTEDTRANSPORTPROFILES,
                                     profileArray, 1, &UA_TYPES[UA_TYPES_STRING]);
 
-    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
-    oAttr.displayName = UA_LOCALIZEDTEXT("", "SubscribedDataSets");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE), UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                            UA_QUALIFIEDNAME(0, "SubscribedDataSets"), UA_NODEID_NUMERIC(0, UA_NS0ID_SUBSCRIBEDDATASETFOLDERTYPE),
-                            oAttr, NULL, NULL);
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
     /* Add missing references */
     retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 74245c3a095..654ffed5d8b 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -482,7 +482,7 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
     LIST_INSERT_HEAD(&readerGroup->readers, newDataSetReader, listEntry);
     readerGroup->readersCount++;
 
-    if(newDataSetReader->config.linkedStandaloneSubscribedDataSetName.length != 0) {
+    if(!UA_String_isEmpty(&newDataSetReader->config.linkedStandaloneSubscribedDataSetName)) {
         // find sds by name
         UA_StandaloneSubscribedDataSet *subscribedDataSet =
             UA_StandaloneSubscribedDataSet_findSDSbyName(
@@ -591,6 +591,15 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
                             (int) dsr->config.name.length, dsr->config.name.data);
     }
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
+    /* check if a Standalone-SubscribedDataSet is associated with this reader and disconnect it*/
+    if(!UA_String_isEmpty(&dsr->config.linkedStandaloneSubscribedDataSetName)) {
+        UA_StandaloneSubscribedDataSet *subscribedDataSet =
+            UA_StandaloneSubscribedDataSet_findSDSbyName(
+                server, dsr->config.linkedStandaloneSubscribedDataSetName);
+        if(subscribedDataSet != NULL) {
+            subscribedDataSet->config.isConnected = false;
+        }
+    }
 
     /* Delete DataSetReader config */
     UA_DataSetReaderConfig_clear(&dsr->config);
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 2ae85317f71..188ddff8f68 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -1865,6 +1865,71 @@ START_TEST(ReceiveStandaloneDataSetFrame) {
 
 } END_TEST
 
+START_TEST(AddAndRemoveReaderUsingStandaloneDataSet) {
+    addTargetVariable();
+    UA_StandaloneSubscribedDataSetConfig cfg;
+    UA_NodeId ret;
+    memset(&cfg, 0, sizeof(UA_StandaloneSubscribedDataSetConfig));
+
+    /* Fill the SSDS MetaData */
+    UA_DataSetMetaDataType_init(&cfg.dataSetMetaData);
+    cfg.dataSetMetaData.name = UA_STRING("DemoStandaloneSDS");
+    cfg.dataSetMetaData.fieldsSize = 1;
+    UA_FieldMetaData fieldMetaData;
+    cfg.dataSetMetaData.fields = &fieldMetaData;
+
+    /* DateTime DataType */
+    UA_FieldMetaData_init(&cfg.dataSetMetaData.fields[0]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_DATETIME].typeId, &cfg.dataSetMetaData.fields[0].dataType);
+    cfg.dataSetMetaData.fields[0].builtInType = UA_NS0ID_DATETIME;
+    cfg.dataSetMetaData.fields[0].name = UA_STRING("subscribedTargetVar");
+    cfg.dataSetMetaData.fields[0].valueRank = -1; /* scalar */
+
+    cfg.name = UA_STRING("DemoStandaloneSDS");
+    cfg.isConnected = UA_FALSE;
+    cfg.subscribedDataSet.target.targetVariablesSize = 1;
+    UA_FieldTargetDataType fieldTargetDataType;
+    cfg.subscribedDataSet.target.targetVariables = &fieldTargetDataType;
+
+    UA_FieldTargetDataType_init(&cfg.subscribedDataSet.target.targetVariables[0]);
+    cfg.subscribedDataSet.target.targetVariables[0].attributeId = UA_ATTRIBUTEID_VALUE;
+    cfg.subscribedDataSet.target.targetVariables[0].targetNodeId =
+    UA_NODEID_STRING(1, "demoVar");
+    UA_StatusCode retVal = UA_Server_addStandaloneSubscribedDataSet(server, &cfg, &ret);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_StandaloneSubscribedDataSet *ssds = NULL;
+    ssds = UA_StandaloneSubscribedDataSet_findSDSbyId(server, ret);
+    ck_assert_ptr_ne(ssds, NULL); 
+    /* Reader Group */
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+    retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &readerGroupId);
+
+    /* Data Set Reader */
+    /* Parameters to filter received NetworkMessage */
+    UA_DataSetReaderConfig readerConfig;
+    memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+    readerConfig.name             = UA_STRING ("DataSetReader Test");
+    UA_UInt16 publisherIdentifier = PUBLISHER_ID;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId    = WRITER_GROUP_ID;
+    readerConfig.dataSetWriterId  = DATASET_WRITER_ID;
+    readerConfig.linkedStandaloneSubscribedDataSetName = cfg.name;
+    /* DataSetMetaData already contained in Standalone SDS no need to set up */
+    UA_NodeId readerIdentifier;
+    retVal |= UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
+                                         &readerIdentifier);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    /* SSDS is now connected to this reader -> isConnected shall be true */
+    ck_assert_uint_eq(ssds->config.isConnected, UA_TRUE);
+
+    UA_Server_removeDataSetReader(server, readerIdentifier);
+    /* SSDS no longer connected, isConnected has to reset(false) */
+    ck_assert_uint_eq(ssds->config.isConnected, UA_FALSE);
+} END_TEST
+
 int main(void) {
     TCase *tc_add_pubsub_readergroup = tcase_create("PubSub readerGroup items handling");
     tcase_add_checked_fixture(tc_add_pubsub_readergroup, setup, teardown);
@@ -1910,6 +1975,7 @@ int main(void) {
     TCase *tc_pubsub_standalone_datasets = tcase_create("Subscriber using standalone datasets");
     tcase_add_test(tc_pubsub_publish_subscribe, ValidStandaloneDataSetConfigurationAddAndRemove);
     tcase_add_test(tc_pubsub_publish_subscribe, ReceiveStandaloneDataSetFrame);
+    tcase_add_test(tc_pubsub_publish_subscribe, AddAndRemoveReaderUsingStandaloneDataSet);
 
 
     Suite *suite = suite_create("PubSub readerGroups/reader/Fields handling and publishing");
diff --git a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
index 66a0c87fa69..96f3f79a59c 100644
--- a/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
+++ b/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml
@@ -2168,6 +2168,7 @@
       <Reference ReferenceType="HasComponent">i=17366</Reference> <!-- addConnection -->
       <Reference ReferenceType="HasComponent">i=17369</Reference>
       <Reference ReferenceType="HasComponent">i=17371</Reference>
+      <Reference ReferenceType="HasComponent">i=23658</Reference> <!-- SubscribedDataSets -->
       <Reference ReferenceType="HasComponent" IsForward="false">i=2253</Reference>
       <Reference ReferenceType="HasComponent">i=25451</Reference> <!-- PubSubConfiguration -->
       <Reference ReferenceType="HasProperty">i=25480</Reference> <!-- DefaultDatagramPublisherId -->
@@ -2417,6 +2418,13 @@
           <Reference ReferenceType="HasComponent" IsForward="false">i=14443</Reference>
       </References>
   </UAObject>
+  <UAObject NodeId="i=23658" BrowseName="SubscribedDataSets" ParentNodeId="i=14443">
+    <DisplayName>SubscribedDataSets</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=23795</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=14443</Reference>
+    </References>
+  </UAObject>
   <UAVariable NodeId="i=17481" BrowseName="SupportedTransportProfiles" ParentNodeId="i=14443" DataType="String" ValueRank="1">
     <DisplayName>SupportedTransportProfiles</DisplayName>
     <References>

From 953360d9aa137f2e97327b49527a5e2076633f5d Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Thu, 8 Dec 2022 15:09:21 +0100
Subject: [PATCH 0570/1963] feat(client): Enable clients to securely
 authenticate to a server using an X.509 certificate (#5422)

---
 examples/client_connect.c                     |  75 ++-
 include/open62541/client.h                    |   8 +
 plugins/crypto/ua_pki_none.c                  |   3 +
 .../include/open62541/client_config_default.h |  12 +
 plugins/ua_config_default.c                   |  93 ++++
 src/client/ua_client.c                        |   9 +
 src/client/ua_client_connect.c                |  75 ++-
 src/server/ua_services_session.c              |  24 +-
 tests/CMakeLists.txt                          |   8 +-
 tests/client/certificates.h                   | 454 ++++++++++++++++++
 tests/client/check_client_authentication.c    | 194 ++++++++
 11 files changed, 930 insertions(+), 25 deletions(-)
 create mode 100644 tests/client/certificates.h
 create mode 100644 tests/client/check_client_authentication.c

diff --git a/examples/client_connect.c b/examples/client_connect.c
index 9ebce9e7985..1df3eab0926 100644
--- a/examples/client_connect.c
+++ b/examples/client_connect.c
@@ -3,8 +3,8 @@
 
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
-#include <open62541/client_subscriptions.h>
 #include <open62541/plugin/log_stdout.h>
+#include <open62541/plugin/pki_default.h>
 
 #include "common.h"
 
@@ -26,6 +26,11 @@ int main(int argc, char *argv[]) {
 #ifdef UA_ENABLE_ENCRYPTION
     char *certfile = NULL;
     char *keyfile = NULL;
+    char *trustList = NULL;
+#endif
+#if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
+    char *certAuthFile = NULL;
+    char *keyAuthFile = NULL;
 #endif
 
     /* At least one argument is required for the server uri */
@@ -72,6 +77,12 @@ int main(int argc, char *argv[]) {
             continue;
         }
 
+        if(strcmp(argv[argpos], "-trustList") == 0) {
+            argpos++;
+            trustList = argv[argpos];
+            continue;
+        }
+
         if(strcmp(argv[argpos], "-securityMode") == 0) {
             argpos++;
             if(sscanf(argv[argpos], "%i", (int*)&securityMode) != 1) {
@@ -87,7 +98,19 @@ int main(int argc, char *argv[]) {
             continue;
         }
 #endif
+#if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
+        if(strcmp(argv[argpos], "-certAuth") == 0) {
+            argpos++;
+            certAuthFile = argv[argpos];
+            continue;
+        }
 
+        if(strcmp(argv[argpos], "-keyAuth") == 0) {
+            argpos++;
+            keyAuthFile = argv[argpos];
+            continue;
+        }
+#endif
         usage();
         return EXIT_FAILURE;
     }
@@ -96,28 +119,66 @@ int main(int argc, char *argv[]) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig *cc = UA_Client_getConfig(client);
 
+    /* Set securityMode and securityPolicyUri */
+    cc->securityMode = securityMode;
+    cc->securityPolicyUri = securityPolicyUri;
+
 #ifdef UA_ENABLE_ENCRYPTION
     if(certfile) {
         UA_ByteString certificate = loadFile(certfile);
         UA_ByteString privateKey  = loadFile(keyfile);
-        UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
-                                             NULL, 0, NULL, 0);
+        if(trustList) {
+            /* Load the trust list */
+            size_t trustListSize = 1;
+            UA_STACKARRAY(UA_ByteString, trustListAuth, trustListSize);
+            trustListAuth[0] = loadFile(trustList);
+            UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                                 trustListAuth, trustListSize, NULL, 0);
+            UA_ByteString_clear(&trustListAuth[0]);
+        }else {
+            /* If no trust list is passed, all certificates are accepted. */
+            UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                                 NULL, 0, NULL, 0);
+            UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+        }
         UA_ByteString_clear(&certificate);
         UA_ByteString_clear(&privateKey);
     } else {
         UA_ClientConfig_setDefault(cc);
+        cc->securityMode = UA_MESSAGESECURITYMODE_NONE;
+        UA_ByteString_clear(&cc->securityPolicyUri);
+        cc->securityPolicyUri = UA_String_fromChars("http://opcfoundation.org/UA/SecurityPolicy#None");
     }
 #else
     UA_ClientConfig_setDefault(cc);
 #endif
 
-    cc->securityMode = securityMode;
-    cc->securityPolicyUri = securityPolicyUri;
+    /* The application URI must be the same as the one in the certificate.
+     * The script for creating a self-created certificate generates a certificate
+     * with the Uri specified below.*/
+    UA_ApplicationDescription_clear(&cc->clientDescription);
+    cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
+    cc->clientDescription.applicationType = UA_APPLICATIONTYPE_CLIENT;
 
     /* Connect to the server */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(username)
-        retval = UA_Client_connectUsername(client, serverurl, username, password);
+    if(username) {
+        UA_ClientConfig_setAuthenticationUsername(cc, username, password);
+        retval = UA_Client_connect(client, serverurl);
+        /* Alternative */
+        //retval = UA_Client_connectUsername(client, serverurl, username, password);
+    }
+#if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
+    else if(certAuthFile && certfile) {
+        UA_ByteString certificateAuth = loadFile(certAuthFile);
+        UA_ByteString privateKeyAuth  = loadFile(keyAuthFile);
+        UA_ClientConfig_setAuthenticationCert(cc, certificateAuth, privateKeyAuth);
+        retval = UA_Client_connect(client, serverurl);
+
+        UA_ByteString_clear(&certificateAuth);
+        UA_ByteString_clear(&privateKeyAuth);
+    }
+#endif
     else
         retval = UA_Client_connect(client, serverurl);
     if(retval != UA_STATUSCODE_GOOD) {
diff --git a/include/open62541/client.h b/include/open62541/client.h
index b266130b6fe..aef2833a1e7 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -144,6 +144,14 @@ typedef struct {
     /* Certificate Verification Plugin */
     UA_CertificateVerification certificateVerification;
 
+    /* Available SecurityPolicies for Authentication. The policy defined by the
+     * AccessControl is selected. If no policy is defined, the policy of the secure channel
+     * is selected.*/
+    size_t authSecurityPoliciesSize;
+    UA_SecurityPolicy *authSecurityPolicies;
+    /* SecurityPolicyUri for the Authentication. */
+    UA_String authSecurityPolicyUri;
+
     /* Callback for state changes. The client state is differentated into the
      * SecureChannel state and the Session state. The connectStatus is set if
      * the client connection (including reconnects) has failed and the client
diff --git a/plugins/crypto/ua_pki_none.c b/plugins/crypto/ua_pki_none.c
index cc5c8647f6a..1c5e761f157 100644
--- a/plugins/crypto/ua_pki_none.c
+++ b/plugins/crypto/ua_pki_none.c
@@ -25,6 +25,9 @@ clearVerifyAllowAll(UA_CertificateVerification *cv) {
 }
 
 void UA_CertificateVerification_AcceptAll(UA_CertificateVerification *cv) {
+    /* Clear the structure, as it may have already been initialized. */
+    if(cv->clear)
+        cv->clear(cv);
     cv->verifyCertificate = verifyCertificateAllowAll;
     cv->verifyApplicationURI = verifyApplicationURIAllowAll;
     cv->clear = clearVerifyAllowAll;
diff --git a/plugins/include/open62541/client_config_default.h b/plugins/include/open62541/client_config_default.h
index 20a1eaed249..74bc92de4a1 100644
--- a/plugins/include/open62541/client_config_default.h
+++ b/plugins/include/open62541/client_config_default.h
@@ -18,6 +18,18 @@ UA_Client UA_EXPORT * UA_Client_new(void);
 UA_StatusCode UA_EXPORT
 UA_ClientConfig_setDefault(UA_ClientConfig *config);
 
+UA_StatusCode UA_EXPORT
+UA_ClientConfig_setAuthenticationUsername(UA_ClientConfig *config,
+                                          const char *username, const char *password);
+
+/* If certificates are used for authentication, this is only possible when
+ * openssl or mbedtls is used. Libressl is currently not supported.*/
+#if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
+UA_StatusCode UA_EXPORT
+UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
+                                      UA_ByteString certificateAuth, UA_ByteString privateKeyAuth);
+#endif
+
 #ifdef UA_ENABLE_ENCRYPTION
 UA_StatusCode UA_EXPORT
 UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 5eac367a762..8634715b4bb 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -871,6 +871,22 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_ClientConfig_setAuthenticationUsername(UA_ClientConfig *config,
+                                          const char *username, const char *password) {
+    /* Create UserIdentityToken */
+    UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
+    if(!identityToken)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    identityToken->userName = UA_STRING_ALLOC(username);
+    identityToken->password = UA_STRING_ALLOC(password);
+    UA_ExtensionObject_clear(&config->userIdentityToken);
+    config->userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
+    config->userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN];
+    config->userIdentityToken.content.decoded.data = identityToken;
+    return UA_STATUSCODE_GOOD;
+}
+
 #ifdef UA_ENABLE_ENCRYPTION
 UA_StatusCode
 UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
@@ -943,3 +959,80 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     return UA_STATUSCODE_GOOD;
 }
 #endif
+
+#if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
+UA_StatusCode
+UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
+                                   UA_ByteString certificateAuth, UA_ByteString privateKeyAuth) {
+#ifdef UA_ENABLE_ENCRYPTION_LIBRESSL
+    UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                   "Certificate authentication with LibreSSL as crypto backend is not supported.");
+    return UA_STATUSCODE_BADNOTIMPLEMENTED;
+#endif
+    /* Create UserIdentityToken */
+    UA_X509IdentityToken* identityToken = UA_X509IdentityToken_new();
+    if(!identityToken)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    identityToken->policyId = UA_STRING_ALLOC("open62541-certificate-policy");
+    UA_StatusCode retval = UA_ByteString_copy(&certificateAuth, &identityToken->certificateData);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_ExtensionObject_clear(&config->userIdentityToken);
+    config->userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
+    config->userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN];
+    config->userIdentityToken.content.decoded.data = identityToken;
+
+    /* Populate SecurityPolicies */
+    UA_SecurityPolicy *sp = (UA_SecurityPolicy*)
+        UA_realloc(config->authSecurityPolicies, sizeof(UA_SecurityPolicy) * 5);
+    if(!sp)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    config->authSecurityPolicies = sp;
+
+    retval = UA_SecurityPolicy_Basic128Rsa15(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
+                                                           certificateAuth, privateKeyAuth, &config->logger);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->authSecurityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    retval = UA_SecurityPolicy_Basic256(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
+                                        certificateAuth, privateKeyAuth, &config->logger);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->authSecurityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic256 with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    retval = UA_SecurityPolicy_Basic256Sha256(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
+                                              certificateAuth, privateKeyAuth, &config->logger);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->authSecurityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
+                                                   certificateAuth, privateKeyAuth, &config->logger);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->authSecurityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    if(config->authSecurityPoliciesSize == 0) {
+        UA_free(config->authSecurityPolicies);
+        config->authSecurityPolicies = NULL;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+#endif
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index e586231ace2..82dbf2d51a4 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -65,7 +65,16 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
     UA_ApplicationDescription_clear(&config->clientDescription);
 
     UA_ExtensionObject_clear(&config->userIdentityToken);
+
+    /* Delete the SecurityPolicies for Authentication */
+    if(config->authSecurityPolicies != 0) {
+        for(size_t i = 0; i < config->authSecurityPoliciesSize; i++)
+            config->authSecurityPolicies[i].clear(&config->authSecurityPolicies[i]);
+        UA_free(config->authSecurityPolicies);
+        config->authSecurityPolicies = 0;
+    }
     UA_String_clear(&config->securityPolicyUri);
+    UA_String_clear(&config->authSecurityPolicyUri);
 
     UA_EndpointDescription_clear(&config->endpoint);
     UA_UserTokenPolicy_clear(&config->userTokenPolicy);
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 85e438c7bb5..fd23902cb16 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -28,6 +28,17 @@ getSecurityPolicy(UA_Client *client, UA_String policyUri) {
     return NULL;
 }
 
+#ifdef UA_ENABLE_ENCRYPTION
+static UA_SecurityPolicy *
+getAuthSecurityPolicy(UA_Client *client, UA_String policyUri) {
+    for(size_t i = 0; i < client->config.authSecurityPoliciesSize; i++) {
+        if(UA_String_equal(&policyUri, &client->config.authSecurityPolicies[i].policyUri))
+            return &client->config.authSecurityPolicies[i];
+    }
+    return NULL;
+}
+#endif
+
 static UA_Boolean
 endpointUnconfigured(UA_Client *client) {
     char test = 0;
@@ -53,7 +64,7 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
     const UA_SecurityPolicy *sp = channel->securityPolicy;
     UA_SignatureData *sd = &request->clientSignature;
 
-    /* Prepare the signature */
+    /* Prepare the clientSignature */
     size_t signatureSize = sp->certificateSigningAlgorithm.
         getLocalSignatureSize(channel->channelContext);
     UA_StatusCode retval = UA_String_copy(&sp->certificateSigningAlgorithm.uri,
@@ -75,14 +86,66 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
     if(retval != UA_STATUSCODE_GOOD)
         return retval; /* sd->signature is cleaned up with the response */
 
-    /* Sign the signature */
+    /* Sign the clientSignature */
     memcpy(dataToSign.data, channel->remoteCertificate.data,
            channel->remoteCertificate.length);
     memcpy(dataToSign.data + channel->remoteCertificate.length,
            client->remoteNonce.data, client->remoteNonce.length);
     retval = sp->certificateSigningAlgorithm.sign(channel->channelContext,
                                                   &dataToSign, &sd->signature);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Prepare the userTokenSignature */
+if(client->config.userTokenPolicy.tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
+    UA_SignatureData *utsd = &request->userTokenSignature;
+    UA_X509IdentityToken *userIdentityToken = (UA_X509IdentityToken *)
+        request->userIdentityToken.content.decoded.data;
+
+    /* Get the correct securityPolicy for authentication */
+    UA_SecurityPolicy* utpSecurityPolicy;
+    utpSecurityPolicy = getAuthSecurityPolicy(client, client->config.authSecurityPolicyUri);
+
+    /* We need a channel context with the user certificate in order to reuse
+    * the code for signing. */
+    void *tempChannelContext;
+    retval = utpSecurityPolicy->channelModule.
+        newContext(utpSecurityPolicy, &userIdentityToken->certificateData, &tempChannelContext);
+    if(retval != UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    size_t userTokenSignatureSize = utpSecurityPolicy->certificateSigningAlgorithm.
+        getLocalSignatureSize(tempChannelContext);
+    retval = UA_String_copy(&utpSecurityPolicy->certificateSigningAlgorithm.uri,
+                            &utsd->algorithm);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
 
+    retval = UA_ByteString_allocBuffer(&utsd->signature, userTokenSignatureSize);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Allocate a temporary buffer */
+    size_t userTokenSignSize = channel->remoteCertificate.length + client->remoteNonce.length;
+    if(dataToSignSize > MAX_DATA_SIZE)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString userTokenSign;
+    retval = UA_ByteString_allocBuffer(&userTokenSign, userTokenSignSize);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval; /* sd->signature is cleaned up with the response */
+
+    /* Create the userTokenSignature */
+    memcpy(userTokenSign.data, channel->remoteCertificate.data,
+           channel->remoteCertificate.length);
+    memcpy(userTokenSign.data + channel->remoteCertificate.length,
+           client->remoteNonce.data, client->remoteNonce.length);
+    retval = utpSecurityPolicy->certificateSigningAlgorithm.sign(tempChannelContext,
+                                                  &userTokenSign, &utsd->signature);
+    /* Clean up */
+    UA_ByteString_clear(&userTokenSign);
+    utpSecurityPolicy->channelModule.deleteContext(tempChannelContext);
+}
     /* Clean up */
     UA_ByteString_clear(&dataToSign);
     return retval;
@@ -579,9 +642,10 @@ activateSessionAsync(UA_Client *client) {
     }
 
     /* Set the policy-Id from the endpoint. Every IdentityToken starts with a
-     * string. */
-    retval = UA_String_copy(&client->config.userTokenPolicy.policyId,
-                            (UA_String*)request.userIdentityToken.content.decoded.data);
+     * string. With an X509IdentityToken, the policy-Id is already set. */
+    if(client->config.userTokenPolicy.tokenType != UA_USERTOKENTYPE_CERTIFICATE)
+        retval = UA_String_copy(&client->config.userTokenPolicy.policyId,
+                                (UA_String*)request.userIdentityToken.content.decoded.data);
 
 #ifdef UA_ENABLE_ENCRYPTION
     /* Encrypt the UserIdentityToken */
@@ -760,6 +824,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             UA_String *securityPolicyUri = &tokenPolicy->securityPolicyUri;
             if(securityPolicyUri->length == 0)
                 securityPolicyUri = &endpoint->securityPolicyUri;
+            UA_String_copy(securityPolicyUri, &client->config.authSecurityPolicyUri);
 
             /* Log the selected endpoint */
             UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 0369282c60b..8d9ba71ad29 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -415,8 +415,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
 
 static UA_StatusCode
 checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
-               void *channelContext, const UA_ByteString *serverNonce,
-               const UA_SignatureData *signature) {
+               void *channelContext, const UA_ByteString *serverNonce, const UA_SignatureData *signature) {
     /* Check for zero signature length */
     if(signature->signature.length == 0)
         return UA_STATUSCODE_BADAPPLICATIONSIGNATUREINVALID;
@@ -424,6 +423,7 @@ checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
     if(!securityPolicy)
         return UA_STATUSCODE_BADINTERNALERROR;
 
+    /* Server certificate */
     const UA_ByteString *localCertificate = &securityPolicy->localCertificate;
     /* Data to verify is calculated by appending the serverNonce to the local certificate */
     UA_ByteString dataToVerify;
@@ -757,12 +757,12 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
 
         /* If the userTokenPolicy doesn't specify a security policy the security
          * policy of the secure channel is used. */
-        UA_SecurityPolicy* securityPolicy;
+        UA_SecurityPolicy* utpSecurityPolicy;
         if(!utp->securityPolicyUri.data)
-            securityPolicy = getSecurityPolicyByUri(server, &ed->securityPolicyUri);
+            utpSecurityPolicy = getSecurityPolicyByUri(server, &ed->securityPolicyUri);
         else
-            securityPolicy = getSecurityPolicyByUri(server, &utp->securityPolicyUri);
-        if(!securityPolicy) {
+            utpSecurityPolicy = getSecurityPolicyByUri(server, &utp->securityPolicyUri);
+        if(!utpSecurityPolicy) {
             response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
             goto securityRejected;
         }
@@ -771,25 +771,25 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
          * the signature checking code. */
         void *tempChannelContext;
         UA_UNLOCK(&server->serviceMutex);
-        response->responseHeader.serviceResult = securityPolicy->channelModule.
-            newContext(securityPolicy, &userCertToken->certificateData, &tempChannelContext);
+        response->responseHeader.serviceResult = utpSecurityPolicy->channelModule.
+            newContext(utpSecurityPolicy, &userCertToken->certificateData, &tempChannelContext);
         UA_LOCK(&server->serviceMutex);
         if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_SESSION(&server->config.logger, session, "ActivateSession: "
                                    "Failed to create a context for the SecurityPolicy %.*s",
-                                   (int)securityPolicy->policyUri.length,
-                                   securityPolicy->policyUri.data);
+                                   (int)utpSecurityPolicy->policyUri.length,
+                                   utpSecurityPolicy->policyUri.data);
             goto securityRejected;
         }
 
         /* Check the user token signature */
         response->responseHeader.serviceResult =
-            checkSignature(server, channel->securityPolicy, tempChannelContext,
+            checkSignature(server, utpSecurityPolicy, tempChannelContext,
                            &session->serverNonce, &request->userTokenSignature);
 
         /* Delete the temporary channel context */
         UA_UNLOCK(&server->serviceMutex);
-        securityPolicy->channelModule.deleteContext(tempChannelContext);
+        utpSecurityPolicy->channelModule.deleteContext(tempChannelContext);
         UA_LOCK(&server->serviceMutex);
         if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_SESSION(&server->config.logger, session,
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2f6b67c9257..753bf5f0bd2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -406,12 +406,18 @@ if(UA_ENABLE_HISTORIZING)
     ua_add_test(client/check_client_historical_data.c)
 endif()
 
-# Test Encryption
+# Test Encryption and Authentication
 
 if(UA_ENABLE_ENCRYPTION)
     add_executable(check_client_encryption client/check_client_encryption.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
     target_link_libraries(check_client_encryption ${LIBS})
     add_test_valgrind(client_encryption ${TESTS_BINARY_DIR}/check_client_encryption)
+
+    if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_MBEDTLS)
+        ua_add_test(client/check_client_authentication.c)
+    else()
+        MESSAGE(WARNING "Certificate authentication with LibreSSL as crypto backend is not supported.")
+    endif()
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS)
diff --git a/tests/client/certificates.h b/tests/client/certificates.h
new file mode 100644
index 00000000000..8e52a00995f
--- /dev/null
+++ b/tests/client/certificates.h
@@ -0,0 +1,454 @@
+#ifndef OPEN62541_CERTIFICATES_H
+#define OPEN62541_CERTIFICATES_H
+
+#include <open62541/types.h>
+
+_UA_BEGIN_DECLS
+
+#define CLIENT_CERT_DER_LENGTH 1040
+UA_Byte CLIENT_CERT_DER_DATA[1040] = {
+    0x30, 0x82, 0x04, 0x0c, 0x30, 0x82, 0x02, 0xf4, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x17,
+    0x4f, 0x72, 0x6b, 0xde, 0x8d, 0xb7, 0xd9, 0x72, 0x80, 0x35, 0xff, 0x3d, 0xe2, 0x3f, 0x7c, 0xb8,
+    0xe8, 0x77, 0xbd, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
+    0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
+    0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65,
+    0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
+    0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f,
+    0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c,
+    0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x31, 0x31,
+    0x31, 0x34, 0x31, 0x36, 0x31, 0x38, 0x31, 0x34, 0x5a, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31, 0x31,
+    0x34, 0x31, 0x36, 0x31, 0x38, 0x31, 0x34, 0x5a, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03,
+    0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
+    0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
+    0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03,
+    0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
+    0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82,
+    0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
+    0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0x98,
+    0xc6, 0x5d, 0xad, 0xf6, 0xf3, 0x3f, 0x7b, 0x73, 0x55, 0x10, 0xc1, 0xd7, 0x0c, 0xa4, 0x78, 0xc0,
+    0x76, 0xb1, 0x41, 0xa2, 0x00, 0xd1, 0xc9, 0xb0, 0x34, 0xe1, 0x9c, 0x36, 0xb8, 0x63, 0xa8, 0xa8,
+    0xad, 0xd5, 0xfc, 0x17, 0xae, 0xdd, 0xbe, 0xfb, 0x23, 0x10, 0x4e, 0x10, 0xc4, 0x13, 0xe3, 0x78,
+    0x49, 0xe1, 0xd4, 0x72, 0x2a, 0xf9, 0x6f, 0xfa, 0x7c, 0xbd, 0x3d, 0xce, 0xc0, 0x0e, 0xcb, 0x63,
+    0x13, 0xda, 0x46, 0xa2, 0xd4, 0x16, 0xef, 0xe8, 0xd8, 0x81, 0x20, 0x1d, 0x50, 0xbe, 0x9e, 0x1d,
+    0xd1, 0xb7, 0xc3, 0x13, 0x6f, 0xfa, 0x54, 0xfe, 0x3b, 0x3a, 0x88, 0xfe, 0xc0, 0xcc, 0x17, 0x4b,
+    0xb8, 0x22, 0xa1, 0x05, 0x47, 0xc0, 0xeb, 0xa3, 0x5a, 0x43, 0x4f, 0xe7, 0x7f, 0x9b, 0xf3, 0x8e,
+    0xbf, 0x4e, 0xf6, 0x40, 0x6b, 0xcd, 0x9a, 0xba, 0xa7, 0x0d, 0xef, 0xe0, 0x17, 0x97, 0x23, 0x91,
+    0x65, 0x29, 0x66, 0x12, 0xad, 0x13, 0xdf, 0x22, 0x4f, 0xd4, 0x52, 0x2f, 0xc0, 0x22, 0xea, 0x6a,
+    0x57, 0x72, 0x65, 0x37, 0xf5, 0x9c, 0x91, 0x5d, 0x3a, 0xb6, 0x34, 0x55, 0x1f, 0xe2, 0xc8, 0x86,
+    0xd2, 0xf0, 0x04, 0x27, 0x93, 0x82, 0x81, 0x83, 0xfa, 0x89, 0x78, 0xdd, 0x16, 0x96, 0x7d, 0x96,
+    0xc8, 0x75, 0xae, 0x60, 0x68, 0xcc, 0xb3, 0xb1, 0xbc, 0x06, 0x4b, 0xb1, 0xe7, 0x5a, 0xa1, 0xa2,
+    0x67, 0xac, 0x9a, 0x7a, 0x8f, 0x7f, 0x40, 0x01, 0x75, 0x66, 0x68, 0x2d, 0x7a, 0x3e, 0x74, 0x5e,
+    0xb9, 0x14, 0xf6, 0x2f, 0x1f, 0x96, 0x33, 0xa7, 0x34, 0x39, 0xfd, 0xd8, 0xf9, 0x77, 0x0a, 0x16,
+    0xc2, 0x09, 0xd6, 0x51, 0xa9, 0xdf, 0x67, 0x8d, 0xf4, 0x3d, 0xf9, 0xf3, 0xff, 0x3b, 0x1b, 0xd8,
+    0x6a, 0x1d, 0x1e, 0x90, 0x09, 0x24, 0xc3, 0x48, 0x1b, 0x78, 0x05, 0xff, 0xb7, 0xfe, 0x95, 0x02,
+    0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xd5, 0x30, 0x81, 0xd2, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
+    0x0e, 0x04, 0x16, 0x04, 0x14, 0x11, 0x42, 0x36, 0x14, 0x77, 0x99, 0xe8, 0x08, 0xaf, 0xe2, 0xea,
+    0xd2, 0xb1, 0xd7, 0x0d, 0x0b, 0xe3, 0xf1, 0x89, 0x5b, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23,
+    0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x11, 0x42, 0x36, 0x14, 0x77, 0x99, 0xe8, 0x08, 0xaf, 0xe2,
+    0xea, 0xd2, 0xb1, 0xd7, 0x0d, 0x0b, 0xe3, 0xf1, 0x89, 0x5b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02,
+    0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b,
+    0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
+    0x02, 0x30, 0x59, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x52, 0x30, 0x50, 0x82, 0x0f, 0x44, 0x45,
+    0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x82, 0x0f, 0x44,
+    0x45, 0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x87, 0x04,
+    0xac, 0x17, 0xd1, 0xe9, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a,
+    0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+    0x2e, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09,
+    0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,
+    0x4f, 0x05, 0x26, 0x68, 0x3d, 0x60, 0x9f, 0x14, 0xa5, 0x7f, 0x55, 0x0e, 0x69, 0xc2, 0xef, 0x8d,
+    0x62, 0xdd, 0x74, 0x7d, 0x98, 0x9b, 0x6f, 0x58, 0xc9, 0x58, 0x6e, 0x21, 0xf3, 0x2b, 0xbe, 0x8b,
+    0xf1, 0x26, 0x9c, 0x22, 0x01, 0xcf, 0xea, 0x8d, 0xad, 0x06, 0x05, 0x23, 0xa4, 0x2c, 0xc8, 0x05,
+    0x36, 0xc8, 0x49, 0x4c, 0x48, 0x15, 0x8b, 0xd8, 0x24, 0x30, 0x7c, 0x5a, 0x78, 0x45, 0x40, 0x21,
+    0x55, 0x71, 0x28, 0x3a, 0xea, 0xb1, 0xa1, 0x80, 0xa4, 0xa6, 0xeb, 0xf6, 0x47, 0x13, 0x92, 0xa1,
+    0xad, 0xe4, 0xb4, 0x87, 0xdf, 0xd0, 0xc5, 0x33, 0x88, 0x0f, 0x5e, 0x7e, 0x62, 0xd6, 0x03, 0xaa,
+    0xb9, 0x08, 0xab, 0x1b, 0x09, 0x49, 0x8b, 0x68, 0xe7, 0x42, 0x74, 0x0c, 0x94, 0xf6, 0x2d, 0xaa,
+    0x07, 0x12, 0x68, 0xb0, 0x7e, 0x4e, 0x84, 0xed, 0x80, 0xba, 0xf3, 0xb4, 0x16, 0xe9, 0xcd, 0xc4,
+    0xd2, 0xec, 0x3c, 0xa9, 0xa0, 0x63, 0xdd, 0x86, 0x9d, 0x6a, 0xd6, 0x80, 0xfa, 0x3b, 0x62, 0xdf,
+    0x91, 0x39, 0xea, 0x3c, 0x22, 0x28, 0x32, 0xaf, 0x22, 0x98, 0x40, 0x7f, 0x5c, 0x6f, 0x56, 0x04,
+    0xdb, 0xe9, 0xb9, 0xdd, 0xd1, 0xdb, 0x74, 0x98, 0x36, 0x94, 0x5a, 0x38, 0xa5, 0xa9, 0x42, 0x16,
+    0x6b, 0x3f, 0x27, 0xb9, 0xd7, 0x90, 0x26, 0x6a, 0x38, 0x32, 0x6e, 0x5d, 0xee, 0xff, 0xdf, 0xdf,
+    0x9b, 0xbe, 0x8b, 0xa5, 0x75, 0xe5, 0xdf, 0x98, 0xeb, 0x17, 0x95, 0x91, 0x62, 0x6d, 0xbf, 0x6e,
+    0x91, 0xf5, 0xed, 0x7e, 0x5a, 0xf7, 0x87, 0x70, 0x1f, 0x5d, 0x2f, 0x88, 0xb1, 0x14, 0xf0, 0xb7,
+    0x0f, 0xde, 0x91, 0xec, 0x1f, 0x25, 0xe6, 0x0c, 0xcc, 0x5d, 0x25, 0x62, 0x96, 0x80, 0x50, 0xfb,
+    0xd0, 0x33, 0xc6, 0x3c, 0x44, 0xb9, 0xe7, 0x0f, 0xee, 0x15, 0x4b, 0x81, 0x18, 0x52, 0x21, 0x83
+};
+
+#define CLIENT_KEY_DER_LENGTH 1192
+UA_Byte CLIENT_KEY_DER_DATA[1192] = {
+    0x30, 0x82, 0x04, 0xa4, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0x98, 0xc6, 0x5d, 0xad,
+    0xf6, 0xf3, 0x3f, 0x7b, 0x73, 0x55, 0x10, 0xc1, 0xd7, 0x0c, 0xa4, 0x78, 0xc0, 0x76, 0xb1, 0x41,
+    0xa2, 0x00, 0xd1, 0xc9, 0xb0, 0x34, 0xe1, 0x9c, 0x36, 0xb8, 0x63, 0xa8, 0xa8, 0xad, 0xd5, 0xfc,
+    0x17, 0xae, 0xdd, 0xbe, 0xfb, 0x23, 0x10, 0x4e, 0x10, 0xc4, 0x13, 0xe3, 0x78, 0x49, 0xe1, 0xd4,
+    0x72, 0x2a, 0xf9, 0x6f, 0xfa, 0x7c, 0xbd, 0x3d, 0xce, 0xc0, 0x0e, 0xcb, 0x63, 0x13, 0xda, 0x46,
+    0xa2, 0xd4, 0x16, 0xef, 0xe8, 0xd8, 0x81, 0x20, 0x1d, 0x50, 0xbe, 0x9e, 0x1d, 0xd1, 0xb7, 0xc3,
+    0x13, 0x6f, 0xfa, 0x54, 0xfe, 0x3b, 0x3a, 0x88, 0xfe, 0xc0, 0xcc, 0x17, 0x4b, 0xb8, 0x22, 0xa1,
+    0x05, 0x47, 0xc0, 0xeb, 0xa3, 0x5a, 0x43, 0x4f, 0xe7, 0x7f, 0x9b, 0xf3, 0x8e, 0xbf, 0x4e, 0xf6,
+    0x40, 0x6b, 0xcd, 0x9a, 0xba, 0xa7, 0x0d, 0xef, 0xe0, 0x17, 0x97, 0x23, 0x91, 0x65, 0x29, 0x66,
+    0x12, 0xad, 0x13, 0xdf, 0x22, 0x4f, 0xd4, 0x52, 0x2f, 0xc0, 0x22, 0xea, 0x6a, 0x57, 0x72, 0x65,
+    0x37, 0xf5, 0x9c, 0x91, 0x5d, 0x3a, 0xb6, 0x34, 0x55, 0x1f, 0xe2, 0xc8, 0x86, 0xd2, 0xf0, 0x04,
+    0x27, 0x93, 0x82, 0x81, 0x83, 0xfa, 0x89, 0x78, 0xdd, 0x16, 0x96, 0x7d, 0x96, 0xc8, 0x75, 0xae,
+    0x60, 0x68, 0xcc, 0xb3, 0xb1, 0xbc, 0x06, 0x4b, 0xb1, 0xe7, 0x5a, 0xa1, 0xa2, 0x67, 0xac, 0x9a,
+    0x7a, 0x8f, 0x7f, 0x40, 0x01, 0x75, 0x66, 0x68, 0x2d, 0x7a, 0x3e, 0x74, 0x5e, 0xb9, 0x14, 0xf6,
+    0x2f, 0x1f, 0x96, 0x33, 0xa7, 0x34, 0x39, 0xfd, 0xd8, 0xf9, 0x77, 0x0a, 0x16, 0xc2, 0x09, 0xd6,
+    0x51, 0xa9, 0xdf, 0x67, 0x8d, 0xf4, 0x3d, 0xf9, 0xf3, 0xff, 0x3b, 0x1b, 0xd8, 0x6a, 0x1d, 0x1e,
+    0x90, 0x09, 0x24, 0xc3, 0x48, 0x1b, 0x78, 0x05, 0xff, 0xb7, 0xfe, 0x95, 0x02, 0x03, 0x01, 0x00,
+    0x01, 0x02, 0x82, 0x01, 0x00, 0x3f, 0x77, 0x00, 0x49, 0x99, 0x71, 0xf9, 0x68, 0x36, 0x44, 0x1b,
+    0x3e, 0xfb, 0x30, 0x04, 0x4f, 0x29, 0x5c, 0xe5, 0x4b, 0xe7, 0x99, 0xc1, 0x8c, 0xb0, 0x87, 0x77,
+    0x45, 0xa6, 0xb1, 0xb8, 0xac, 0xc2, 0xcd, 0xdc, 0x3b, 0xea, 0x36, 0xb9, 0x65, 0x71, 0xfc, 0x61,
+    0xf4, 0x9c, 0x20, 0x68, 0x46, 0xb1, 0x9c, 0xb7, 0x94, 0xc2, 0x8c, 0xb9, 0xac, 0x5b, 0xf9, 0x5f,
+    0xc0, 0x02, 0x58, 0x64, 0x8c, 0xf7, 0x2e, 0xb3, 0x19, 0x6e, 0xe0, 0xfe, 0x5a, 0x51, 0x77, 0x47,
+    0x44, 0xe9, 0x08, 0xb6, 0xf7, 0x06, 0x5a, 0x2d, 0xa5, 0x7b, 0x38, 0xa4, 0x5c, 0x94, 0x74, 0x54,
+    0x5f, 0xbe, 0xbc, 0xa6, 0xcb, 0xf2, 0xa7, 0x9e, 0xb3, 0x17, 0x77, 0x74, 0x5c, 0x2f, 0x32, 0xfb,
+    0x0d, 0x81, 0x94, 0xd0, 0x5b, 0x40, 0x6c, 0x96, 0xc7, 0xd3, 0x81, 0x35, 0x1b, 0x56, 0xf8, 0xb8,
+    0xe0, 0x72, 0x4e, 0x3a, 0x79, 0x66, 0xbf, 0x3b, 0xcd, 0xb6, 0xca, 0x99, 0xdb, 0xfd, 0x62, 0x9a,
+    0xb7, 0x7d, 0xa5, 0x7a, 0x77, 0x6a, 0x22, 0x63, 0x11, 0x46, 0x4a, 0x41, 0xcc, 0x60, 0x89, 0xb7,
+    0x6f, 0x44, 0x74, 0x90, 0x9a, 0x1e, 0x71, 0x3a, 0x6e, 0xba, 0x8b, 0x0d, 0x56, 0xeb, 0x2b, 0x3f,
+    0x10, 0xd7, 0x80, 0xe3, 0xf5, 0x8f, 0x4c, 0xf5, 0xa7, 0xde, 0x4d, 0x11, 0x03, 0x3f, 0xe4, 0xf1,
+    0xc4, 0x2d, 0x28, 0x4c, 0xbb, 0x63, 0xd9, 0x6f, 0x3e, 0xcd, 0xe9, 0x9c, 0x2c, 0x11, 0x58, 0xf4,
+    0xa0, 0xc2, 0x7f, 0x14, 0xbd, 0x35, 0x46, 0x45, 0xf7, 0x1f, 0x1b, 0x73, 0x8e, 0x9b, 0xf4, 0x79,
+    0x57, 0x23, 0xc3, 0x37, 0x67, 0xc5, 0x9f, 0x2f, 0xe2, 0xf3, 0x0c, 0xc0, 0x70, 0x2a, 0x35, 0x53,
+    0x6e, 0xe8, 0x76, 0x9a, 0x0a, 0x3c, 0xb3, 0x6e, 0xe6, 0x82, 0xe9, 0xd1, 0x34, 0xd7, 0x07, 0x21,
+    0xc1, 0xff, 0x96, 0xa0, 0x01, 0x02, 0x81, 0x81, 0x00, 0xca, 0x00, 0x03, 0xbe, 0x3c, 0x8c, 0x56,
+    0xe4, 0x4d, 0x1f, 0x76, 0xac, 0xca, 0xd9, 0x32, 0xd6, 0x8b, 0x2a, 0x5b, 0x95, 0xde, 0x42, 0xa2,
+    0x81, 0x43, 0xc8, 0x9d, 0xb3, 0xb0, 0x04, 0xa2, 0x9a, 0x9e, 0x4b, 0x9d, 0x82, 0x7e, 0x5a, 0xd8,
+    0xa2, 0xb8, 0x39, 0xa8, 0xee, 0x27, 0xc9, 0x1a, 0x35, 0x0b, 0x5b, 0x62, 0x44, 0x8d, 0x32, 0x19,
+    0xee, 0x31, 0x10, 0x0f, 0x0e, 0xc7, 0x98, 0xfc, 0x70, 0x6c, 0x4d, 0x00, 0x47, 0x00, 0xb5, 0x5e,
+    0x2d, 0x19, 0x8a, 0xb3, 0x06, 0x1d, 0xfd, 0xcd, 0x32, 0xfb, 0x09, 0x8f, 0x42, 0x7f, 0x5e, 0x0c,
+    0x4e, 0x80, 0x91, 0x4f, 0x9f, 0x44, 0x87, 0x58, 0xdc, 0xdb, 0x6e, 0xd5, 0x64, 0x1c, 0xac, 0xc0,
+    0xb7, 0xce, 0xdb, 0x71, 0xb9, 0x6d, 0xbc, 0xb7, 0xd8, 0x52, 0x44, 0xcc, 0x02, 0x7f, 0xc9, 0xb4,
+    0xf7, 0xf1, 0xa5, 0x00, 0x8e, 0xcf, 0x7f, 0x08, 0x01, 0x02, 0x81, 0x81, 0x00, 0xc1, 0x9d, 0x99,
+    0x27, 0x97, 0x4f, 0xe3, 0x84, 0x85, 0x38, 0x1c, 0xee, 0xd1, 0xd8, 0xd2, 0x99, 0x8f, 0x4a, 0x00,
+    0x76, 0x40, 0xa0, 0x1a, 0x99, 0xe3, 0xbb, 0xf2, 0xb6, 0x26, 0x55, 0xcb, 0x43, 0x8d, 0xcb, 0x6b,
+    0xbe, 0xb0, 0x00, 0xc8, 0x2a, 0xdc, 0xc5, 0x82, 0xb9, 0xde, 0x71, 0xa0, 0x71, 0x8c, 0x98, 0xb9,
+    0xbc, 0xc7, 0xa1, 0x2f, 0x8c, 0x46, 0xae, 0x4d, 0x0a, 0x51, 0x59, 0xb7, 0xf2, 0xac, 0xd4, 0x64,
+    0xb0, 0xdb, 0x5e, 0x31, 0xfb, 0xd3, 0x66, 0x22, 0xbf, 0x34, 0xe7, 0x12, 0x54, 0x04, 0x50, 0x8c,
+    0x69, 0x79, 0xf6, 0xfa, 0xd1, 0x0f, 0xa0, 0x4c, 0x75, 0x01, 0x5e, 0x41, 0xc4, 0x82, 0x48, 0x07,
+    0x78, 0x3e, 0x90, 0x5e, 0x40, 0x9d, 0x42, 0x83, 0x73, 0x6c, 0xad, 0xb4, 0x1f, 0xb8, 0x27, 0x98,
+    0x9c, 0x8a, 0x42, 0x76, 0x9f, 0xca, 0x28, 0xb6, 0xd9, 0xce, 0x18, 0x56, 0x95, 0x02, 0x81, 0x81,
+    0x00, 0xc3, 0x0b, 0x20, 0x92, 0x1f, 0x84, 0xa2, 0xa1, 0xee, 0x95, 0xe2, 0xd1, 0x15, 0x4c, 0x83,
+    0x7a, 0x05, 0x05, 0xf1, 0x48, 0xd4, 0x43, 0x23, 0x06, 0x0d, 0x9d, 0x38, 0x28, 0xb8, 0x5c, 0xc1,
+    0x64, 0xea, 0x53, 0xb8, 0xd2, 0xb7, 0x8e, 0xa0, 0x7e, 0xfd, 0xc3, 0x2f, 0x0a, 0x46, 0x00, 0x37,
+    0xfd, 0xdf, 0xe9, 0x6d, 0x09, 0x24, 0x0c, 0xac, 0x5d, 0x01, 0xa2, 0xaf, 0xe7, 0x65, 0x72, 0xa2,
+    0xcd, 0x2a, 0xc5, 0x6e, 0xef, 0x20, 0x0f, 0xff, 0xcf, 0x2c, 0x4a, 0x70, 0x72, 0x07, 0xa3, 0x78,
+    0xef, 0x30, 0xd6, 0x1a, 0x2d, 0xeb, 0x2d, 0xb4, 0x54, 0x58, 0x6f, 0xf6, 0xa1, 0xa2, 0x59, 0xcd,
+    0xc3, 0xf3, 0x5d, 0x21, 0x4e, 0x79, 0x21, 0x95, 0x33, 0xe5, 0xd8, 0x9e, 0x06, 0x9d, 0x9f, 0x0b,
+    0x25, 0x24, 0xca, 0xa8, 0xf2, 0x00, 0xd1, 0x92, 0x9b, 0x96, 0x07, 0xec, 0x71, 0xf8, 0x88, 0x80,
+    0x01, 0x02, 0x81, 0x80, 0x4b, 0xf4, 0x75, 0x96, 0xd0, 0x87, 0x68, 0xac, 0x1e, 0x4f, 0x0b, 0x1a,
+    0xad, 0x7c, 0x2f, 0xf2, 0x4a, 0x02, 0x2f, 0xf8, 0x34, 0x16, 0x1b, 0x19, 0x6f, 0xfb, 0xd5, 0x95,
+    0x9b, 0xa8, 0x60, 0x9b, 0x59, 0xcf, 0x09, 0xaf, 0xbf, 0x00, 0x2f, 0x86, 0x91, 0x21, 0x72, 0xcd,
+    0x53, 0xf4, 0xa3, 0x8a, 0xa8, 0x2b, 0x6a, 0x02, 0x23, 0x16, 0x9a, 0xbe, 0x9f, 0x23, 0xd5, 0xd9,
+    0x4c, 0x5c, 0xb4, 0x0b, 0x21, 0xbe, 0x18, 0xda, 0x40, 0xd4, 0xcd, 0x2b, 0x0b, 0x9d, 0xaf, 0xd7,
+    0xee, 0xfb, 0x0f, 0x77, 0xa2, 0x51, 0xaf, 0x23, 0xd9, 0xd3, 0x08, 0x46, 0x67, 0xa8, 0xed, 0x15,
+    0xa1, 0xb9, 0xc6, 0x77, 0x3e, 0xdc, 0xdf, 0x01, 0x4f, 0x19, 0xf7, 0xbf, 0xc5, 0x71, 0xc8, 0x7b,
+    0xc9, 0x90, 0xc3, 0x6f, 0x06, 0x21, 0x92, 0x7f, 0x26, 0xc6, 0x38, 0x1f, 0x2b, 0x81, 0x99, 0x6a,
+    0x0c, 0xae, 0x03, 0x99, 0x02, 0x81, 0x81, 0x00, 0x98, 0x75, 0x81, 0x7a, 0xc6, 0x18, 0xd2, 0xb1,
+    0x74, 0xb4, 0x7e, 0x1d, 0x48, 0x9c, 0xe4, 0x49, 0x1e, 0xfa, 0x8a, 0x0a, 0x36, 0xc4, 0xa0, 0xca,
+    0x55, 0xb8, 0x98, 0x86, 0x8c, 0x8a, 0x66, 0xba, 0x90, 0x5e, 0x3a, 0x76, 0x9a, 0xa9, 0x5b, 0x15,
+    0xc2, 0x6e, 0x50, 0xed, 0x8f, 0x70, 0xe7, 0x67, 0x80, 0xd4, 0x46, 0x5f, 0x63, 0xdd, 0xed, 0x0a,
+    0xdd, 0xfb, 0xf7, 0xbc, 0xa4, 0x96, 0x85, 0x70, 0x51, 0xa1, 0x62, 0xc9, 0xfd, 0x41, 0xd3, 0x77,
+    0x50, 0x42, 0xc5, 0x8c, 0x49, 0x5f, 0xa7, 0xe3, 0xaa, 0x1e, 0x0e, 0x4e, 0xc5, 0x13, 0x25, 0x16,
+    0x3a, 0x1c, 0x9d, 0xc9, 0x05, 0xd9, 0xa4, 0x4a, 0x57, 0xaa, 0x2a, 0x87, 0x23, 0x13, 0x6a, 0x2c,
+    0x2a, 0x76, 0x60, 0xda, 0xb1, 0x8a, 0x7a, 0xf8, 0x6d, 0xad, 0x23, 0x00, 0x1b, 0x53, 0xad, 0xc1,
+    0xc5, 0x12, 0x2c, 0xca, 0x4b, 0xb4, 0x8d, 0x74
+};
+
+#define SERVER_CERT_DER_LENGTH 1040
+UA_Byte SERVER_CERT_DER_DATA[1040] = {
+    0x30, 0x82, 0x04, 0x0c, 0x30, 0x82, 0x02, 0xf4, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x03,
+  0x35, 0x42, 0xb9, 0x6d, 0x85, 0x7e, 0x8b, 0xd2, 0xe5, 0x3b, 0xd0, 0xd4, 0x28, 0x34, 0x0c, 0x31,
+  0x1f, 0x7f, 0x69, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
+  0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
+  0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65,
+  0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
+  0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f,
+  0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c,
+  0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x31, 0x31,
+  0x31, 0x35, 0x31, 0x32, 0x34, 0x30, 0x32, 0x33, 0x5a, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31, 0x31,
+  0x35, 0x31, 0x32, 0x34, 0x30, 0x32, 0x33, 0x5a, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03,
+  0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
+  0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
+  0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03,
+  0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
+  0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82,
+  0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
+  0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xd3,
+  0xde, 0x49, 0x13, 0x18, 0x08, 0x67, 0x9e, 0x72, 0xe9, 0x63, 0xec, 0xce, 0x00, 0xcd, 0xb9, 0xfd,
+  0x4e, 0xd3, 0xa7, 0x02, 0x41, 0x4c, 0xe1, 0x9d, 0xd0, 0xfd, 0x0c, 0xe7, 0x5d, 0xef, 0xe3, 0x43,
+  0x46, 0x09, 0x35, 0x21, 0xb4, 0x25, 0xbf, 0x9a, 0x81, 0xcb, 0x2e, 0x9e, 0xbd, 0x62, 0x03, 0x93,
+  0x9e, 0x34, 0x13, 0xd4, 0x23, 0x36, 0x82, 0x8a, 0xff, 0x24, 0x30, 0x14, 0xb4, 0xf3, 0xde, 0x0b,
+  0xf1, 0x41, 0x39, 0xf3, 0x03, 0x57, 0xdc, 0x0e, 0xdc, 0x7b, 0x20, 0x62, 0x04, 0xf7, 0x60, 0xf1,
+  0xdb, 0x44, 0xd7, 0x6f, 0x70, 0x1e, 0xd0, 0xa5, 0x5b, 0x8a, 0x21, 0xa8, 0x1b, 0xb4, 0xf5, 0x65,
+  0x95, 0xc1, 0x4c, 0xae, 0x55, 0xd1, 0x7c, 0xb7, 0x73, 0x79, 0x63, 0xd6, 0x5a, 0xa8, 0x1d, 0x52,
+  0xeb, 0xc2, 0x9d, 0x57, 0xb6, 0x63, 0xe2, 0x28, 0x6e, 0xf8, 0x7b, 0xd7, 0x9c, 0x5f, 0x07, 0x11,
+  0x8c, 0xfb, 0x55, 0x94, 0x60, 0x6d, 0xb1, 0x7e, 0xff, 0x82, 0x5c, 0xc9, 0x62, 0xc9, 0x68, 0xa6,
+  0x8b, 0x33, 0xba, 0x13, 0x85, 0xe7, 0x6a, 0x74, 0xb3, 0xa6, 0x1c, 0x0c, 0x3c, 0xee, 0xc7, 0x13,
+  0xed, 0x98, 0xea, 0xf2, 0x2b, 0x9b, 0xba, 0xb6, 0xfb, 0xaf, 0x02, 0x7a, 0x01, 0x37, 0xef, 0xed,
+  0x60, 0x6f, 0xd4, 0xbf, 0xbb, 0xe4, 0x63, 0x03, 0x6d, 0x9b, 0x6d, 0xe5, 0x8e, 0xe7, 0xbb, 0xac,
+  0x2e, 0x0f, 0xa4, 0x8a, 0x6a, 0x05, 0x36, 0x3e, 0x48, 0xcb, 0x47, 0x9e, 0xa8, 0x4b, 0x4a, 0x11,
+  0xbc, 0xc2, 0x5b, 0x04, 0xcd, 0x8a, 0x48, 0xb1, 0x88, 0x53, 0xcd, 0x66, 0x70, 0xcb, 0x08, 0xa0,
+  0x5c, 0x10, 0x99, 0xa4, 0x94, 0x3d, 0xc7, 0xfa, 0xa2, 0x63, 0xad, 0xa5, 0xae, 0xa0, 0xba, 0xde,
+  0xcc, 0x91, 0xd8, 0xdb, 0xc5, 0xd2, 0x28, 0x60, 0x06, 0x1c, 0x20, 0x3b, 0x45, 0xb9, 0x37, 0x02,
+  0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xd5, 0x30, 0x81, 0xd2, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
+  0x0e, 0x04, 0x16, 0x04, 0x14, 0x4f, 0xc1, 0xb2, 0x6c, 0xd1, 0xc1, 0xf6, 0x77, 0x26, 0x5f, 0xf0,
+  0xe0, 0xe9, 0x1a, 0x40, 0xaf, 0x79, 0xdc, 0xe4, 0x01, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23,
+  0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x4f, 0xc1, 0xb2, 0x6c, 0xd1, 0xc1, 0xf6, 0x77, 0x26, 0x5f,
+  0xf0, 0xe0, 0xe9, 0x1a, 0x40, 0xaf, 0x79, 0xdc, 0xe4, 0x01, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
+  0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02,
+  0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b,
+  0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
+  0x02, 0x30, 0x59, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x52, 0x30, 0x50, 0x82, 0x0f, 0x44, 0x45,
+  0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x82, 0x0f, 0x44,
+  0x45, 0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x87, 0x04,
+  0xac, 0x17, 0xd1, 0xe9, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a,
+  0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+  0x2e, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09,
+  0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,
+  0x93, 0x10, 0xdb, 0x06, 0x14, 0x2e, 0xe2, 0x82, 0x84, 0x53, 0xc1, 0x56, 0x71, 0x30, 0xf4, 0x26,
+  0xaf, 0x41, 0xaf, 0xde, 0x38, 0x6b, 0x39, 0x4d, 0xa9, 0x9b, 0x31, 0x9d, 0x20, 0xf8, 0x24, 0xff,
+  0xee, 0x1a, 0x66, 0x48, 0x01, 0x80, 0x1d, 0x0b, 0xe9, 0xa7, 0x37, 0xf1, 0x89, 0x94, 0x90, 0xe4,
+  0x6c, 0xe0, 0x20, 0xf0, 0x76, 0x3e, 0x78, 0x91, 0x0b, 0xf2, 0x46, 0xdd, 0xb6, 0x02, 0x67, 0xfa,
+  0x5a, 0xbd, 0xea, 0x56, 0xa2, 0xcd, 0xaa, 0x0f, 0xe7, 0xda, 0xad, 0x88, 0x60, 0x8a, 0x45, 0x0e,
+  0x10, 0x9e, 0x1b, 0xef, 0xc2, 0x39, 0x7b, 0x81, 0x27, 0x31, 0x21, 0x55, 0xb3, 0xb8, 0xe5, 0xda,
+  0x42, 0xa5, 0xb1, 0x77, 0x10, 0xfc, 0xb4, 0x49, 0xed, 0xa2, 0x1a, 0x8a, 0xa6, 0x73, 0x00, 0xbf,
+  0x00, 0xda, 0x39, 0x0b, 0x96, 0x52, 0xe7, 0x1a, 0xf6, 0xd8, 0xc1, 0xb8, 0x85, 0xe1, 0x99, 0x0a,
+  0x9b, 0x84, 0xed, 0x22, 0xf6, 0xf7, 0xc3, 0x8e, 0x95, 0x82, 0x9a, 0xa3, 0x4b, 0x2e, 0x3c, 0x69,
+  0x0b, 0xac, 0x0f, 0x5c, 0x1a, 0xdb, 0x11, 0xb6, 0xad, 0xee, 0x20, 0xd0, 0x75, 0x2e, 0x21, 0xdf,
+  0xaa, 0x66, 0x42, 0xe9, 0x9a, 0x88, 0x52, 0x5c, 0x41, 0x22, 0xeb, 0x97, 0xbd, 0xf3, 0x47, 0xae,
+  0xbd, 0x93, 0x3f, 0x52, 0x3b, 0xb6, 0x75, 0xca, 0xb4, 0xcb, 0x7b, 0x08, 0xcc, 0x1f, 0x1c, 0x41,
+  0xa3, 0xee, 0x90, 0x48, 0xda, 0xfc, 0x05, 0x6b, 0x01, 0x49, 0x96, 0xbb, 0x5b, 0xcb, 0x47, 0xa5,
+  0x48, 0xb1, 0x65, 0x9e, 0x64, 0xda, 0x15, 0x9d, 0xa9, 0xaf, 0xd1, 0x3f, 0x16, 0x68, 0x61, 0x66,
+  0xb3, 0xd1, 0x86, 0x8e, 0xef, 0xc4, 0x40, 0x58, 0xa8, 0x2d, 0xee, 0x15, 0x96, 0x89, 0xfe, 0x37,
+  0x3d, 0x69, 0xe4, 0x2c, 0xfe, 0xb2, 0xf4, 0x3b, 0xbe, 0x3a, 0xa9, 0x69, 0x75, 0x1c, 0x31, 0xf1
+};
+
+#define SERVER_KEY_DER_LENGTH 1194
+UA_Byte SERVER_KEY_DER_DATA[1194] = {
+0x30, 0x82, 0x04, 0xa6, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xd3, 0xde, 0x49, 0x13,
+  0x18, 0x08, 0x67, 0x9e, 0x72, 0xe9, 0x63, 0xec, 0xce, 0x00, 0xcd, 0xb9, 0xfd, 0x4e, 0xd3, 0xa7,
+  0x02, 0x41, 0x4c, 0xe1, 0x9d, 0xd0, 0xfd, 0x0c, 0xe7, 0x5d, 0xef, 0xe3, 0x43, 0x46, 0x09, 0x35,
+  0x21, 0xb4, 0x25, 0xbf, 0x9a, 0x81, 0xcb, 0x2e, 0x9e, 0xbd, 0x62, 0x03, 0x93, 0x9e, 0x34, 0x13,
+  0xd4, 0x23, 0x36, 0x82, 0x8a, 0xff, 0x24, 0x30, 0x14, 0xb4, 0xf3, 0xde, 0x0b, 0xf1, 0x41, 0x39,
+  0xf3, 0x03, 0x57, 0xdc, 0x0e, 0xdc, 0x7b, 0x20, 0x62, 0x04, 0xf7, 0x60, 0xf1, 0xdb, 0x44, 0xd7,
+  0x6f, 0x70, 0x1e, 0xd0, 0xa5, 0x5b, 0x8a, 0x21, 0xa8, 0x1b, 0xb4, 0xf5, 0x65, 0x95, 0xc1, 0x4c,
+  0xae, 0x55, 0xd1, 0x7c, 0xb7, 0x73, 0x79, 0x63, 0xd6, 0x5a, 0xa8, 0x1d, 0x52, 0xeb, 0xc2, 0x9d,
+  0x57, 0xb6, 0x63, 0xe2, 0x28, 0x6e, 0xf8, 0x7b, 0xd7, 0x9c, 0x5f, 0x07, 0x11, 0x8c, 0xfb, 0x55,
+  0x94, 0x60, 0x6d, 0xb1, 0x7e, 0xff, 0x82, 0x5c, 0xc9, 0x62, 0xc9, 0x68, 0xa6, 0x8b, 0x33, 0xba,
+  0x13, 0x85, 0xe7, 0x6a, 0x74, 0xb3, 0xa6, 0x1c, 0x0c, 0x3c, 0xee, 0xc7, 0x13, 0xed, 0x98, 0xea,
+  0xf2, 0x2b, 0x9b, 0xba, 0xb6, 0xfb, 0xaf, 0x02, 0x7a, 0x01, 0x37, 0xef, 0xed, 0x60, 0x6f, 0xd4,
+  0xbf, 0xbb, 0xe4, 0x63, 0x03, 0x6d, 0x9b, 0x6d, 0xe5, 0x8e, 0xe7, 0xbb, 0xac, 0x2e, 0x0f, 0xa4,
+  0x8a, 0x6a, 0x05, 0x36, 0x3e, 0x48, 0xcb, 0x47, 0x9e, 0xa8, 0x4b, 0x4a, 0x11, 0xbc, 0xc2, 0x5b,
+  0x04, 0xcd, 0x8a, 0x48, 0xb1, 0x88, 0x53, 0xcd, 0x66, 0x70, 0xcb, 0x08, 0xa0, 0x5c, 0x10, 0x99,
+  0xa4, 0x94, 0x3d, 0xc7, 0xfa, 0xa2, 0x63, 0xad, 0xa5, 0xae, 0xa0, 0xba, 0xde, 0xcc, 0x91, 0xd8,
+  0xdb, 0xc5, 0xd2, 0x28, 0x60, 0x06, 0x1c, 0x20, 0x3b, 0x45, 0xb9, 0x37, 0x02, 0x03, 0x01, 0x00,
+  0x01, 0x02, 0x82, 0x01, 0x01, 0x00, 0x8e, 0x2d, 0xc1, 0xc4, 0x3a, 0x80, 0x89, 0x68, 0xdf, 0x9c,
+  0x98, 0x1e, 0x36, 0x30, 0x7b, 0xde, 0xb0, 0x8a, 0xd1, 0xa6, 0x65, 0xf1, 0x04, 0x72, 0xf3, 0xc1,
+  0x67, 0xcf, 0xdd, 0x04, 0x41, 0x13, 0xb5, 0xf5, 0xae, 0x00, 0x25, 0xda, 0x0a, 0xeb, 0x05, 0xf8,
+  0xcc, 0x2d, 0x41, 0x01, 0xbe, 0x60, 0xc0, 0x13, 0x8e, 0xc7, 0x2f, 0xb9, 0x61, 0xbf, 0x41, 0x1f,
+  0xef, 0x5d, 0x04, 0xc8, 0x5a, 0x4f, 0x4c, 0x9c, 0x5e, 0x35, 0x51, 0x4b, 0x91, 0x0e, 0x70, 0x3a,
+  0xad, 0xb6, 0x11, 0x91, 0x5b, 0xa1, 0x87, 0x2c, 0xaa, 0x8a, 0x18, 0x92, 0x99, 0x5b, 0x53, 0x5c,
+  0x96, 0xd9, 0xf7, 0x42, 0x80, 0xb1, 0x9d, 0xb6, 0x5d, 0xbd, 0xe3, 0xd0, 0x5b, 0x80, 0xe2, 0x6b,
+  0x6f, 0xae, 0xfc, 0x0e, 0x62, 0x7b, 0x2b, 0x46, 0x63, 0x97, 0xcb, 0x60, 0xee, 0xae, 0xba, 0x8b,
+  0x9d, 0xdd, 0x1d, 0xd8, 0x26, 0x3c, 0x13, 0x7e, 0xcb, 0x46, 0x03, 0xc0, 0x00, 0x6b, 0x01, 0x35,
+  0x34, 0x27, 0xd9, 0xdc, 0xc5, 0x0c, 0x6f, 0x95, 0x30, 0x16, 0x92, 0x8e, 0x02, 0xfe, 0xae, 0x98,
+  0x2a, 0x37, 0x97, 0x21, 0xe5, 0x49, 0x3d, 0x62, 0xdc, 0xe3, 0xd9, 0xff, 0x8d, 0x6e, 0xaa, 0xc7,
+  0x05, 0x09, 0x1d, 0x7d, 0xd6, 0xa2, 0xbe, 0x16, 0xc4, 0x72, 0x74, 0xf5, 0x65, 0x54, 0xe6, 0x04,
+  0x0d, 0xf3, 0x04, 0x7b, 0xfd, 0xb0, 0xcb, 0xbf, 0x37, 0x41, 0xb2, 0xda, 0x77, 0x48, 0xeb, 0xc7,
+  0xfe, 0x15, 0x94, 0x82, 0x8d, 0xab, 0x8f, 0x7f, 0x88, 0x1d, 0xb3, 0x9b, 0xaa, 0x20, 0x6d, 0xe0,
+  0xe9, 0x59, 0xa5, 0xfe, 0xf1, 0x4e, 0x91, 0x14, 0xc0, 0x1f, 0x13, 0xed, 0x94, 0x30, 0x84, 0x6c,
+  0x36, 0xeb, 0x9b, 0xcb, 0x36, 0xcb, 0xfb, 0xc8, 0x3a, 0x2b, 0xfa, 0xa1, 0xd3, 0x34, 0xbe, 0xd3,
+  0xde, 0x44, 0xa3, 0xd4, 0xd4, 0x41, 0x02, 0x81, 0x81, 0x00, 0xed, 0x04, 0xa2, 0x67, 0x2c, 0xc4,
+  0xe7, 0x83, 0x5e, 0xee, 0xa8, 0x5f, 0x4e, 0x46, 0x60, 0xfb, 0xf2, 0x96, 0x91, 0xab, 0x21, 0xf9,
+  0xa6, 0xb8, 0x84, 0x18, 0xb4, 0xe4, 0xf2, 0xc8, 0xe5, 0x02, 0xfb, 0x35, 0x19, 0x62, 0xad, 0xe5,
+  0xe7, 0x3c, 0xc9, 0xce, 0x39, 0xb5, 0xc5, 0xf6, 0x24, 0x08, 0x4a, 0xfa, 0xc1, 0xbd, 0x70, 0x81,
+  0x64, 0x47, 0x65, 0x57, 0x41, 0x45, 0x3e, 0xec, 0xd5, 0xb6, 0x2e, 0x74, 0x04, 0xf3, 0x67, 0xed,
+  0x3f, 0x54, 0x04, 0x30, 0x75, 0xf9, 0xa6, 0x5d, 0x40, 0xa9, 0xb3, 0x1d, 0x29, 0x8f, 0xf7, 0x39,
+  0xd6, 0xe8, 0x71, 0xe0, 0x5c, 0xb8, 0x77, 0xa0, 0x6c, 0xb0, 0x8d, 0xe5, 0x7b, 0x2c, 0xea, 0x10,
+  0x8e, 0x12, 0x97, 0x2c, 0x03, 0x5f, 0x4f, 0x16, 0x9f, 0x0c, 0x99, 0xa3, 0xbd, 0x68, 0xea, 0x96,
+  0xc4, 0x64, 0x32, 0xf7, 0x73, 0x32, 0xff, 0x4c, 0x8a, 0x29, 0x02, 0x81, 0x81, 0x00, 0xe4, 0xd6,
+  0x07, 0x15, 0xf2, 0x09, 0xd0, 0xf2, 0xdc, 0x19, 0xc2, 0xd7, 0x25, 0x13, 0x55, 0x71, 0x13, 0x98,
+  0x0f, 0x7d, 0xc7, 0xae, 0x5a, 0x8f, 0x0d, 0x5d, 0xe9, 0x76, 0x9b, 0xc2, 0xe5, 0x72, 0xf6, 0x42,
+  0xc3, 0xb6, 0x9b, 0x60, 0xed, 0x32, 0x76, 0xcb, 0x9f, 0x71, 0x0e, 0x9f, 0x16, 0xc9, 0xdf, 0xc3,
+  0x61, 0x6f, 0x6d, 0xbb, 0x02, 0xce, 0x99, 0xa2, 0x78, 0xaa, 0x53, 0x25, 0x18, 0xa1, 0x1b, 0xc0,
+  0x1f, 0xdf, 0xda, 0x1f, 0x35, 0x4c, 0x43, 0xba, 0xa1, 0x5c, 0xab, 0x7b, 0x0f, 0xf2, 0x2e, 0x2d,
+  0x17, 0x7e, 0x67, 0xee, 0x78, 0xe3, 0x43, 0x89, 0x60, 0x19, 0x0e, 0xcd, 0x40, 0xac, 0x1c, 0x68,
+  0xbf, 0x14, 0x5e, 0x3d, 0x23, 0x22, 0x8f, 0x76, 0xae, 0xc5, 0x94, 0x5f, 0x0a, 0x5e, 0xbe, 0x1d,
+  0x74, 0xc9, 0xc9, 0xa9, 0x59, 0xad, 0xa0, 0x3c, 0x79, 0x9c, 0xaf, 0x61, 0x54, 0x5f, 0x02, 0x81,
+  0x81, 0x00, 0xb0, 0x4a, 0xe4, 0x28, 0xed, 0xc9, 0xbf, 0x91, 0x9d, 0x48, 0xd2, 0x7f, 0xa1, 0x0f,
+  0x04, 0x10, 0x22, 0x4e, 0x10, 0x27, 0x43, 0xec, 0x17, 0x2f, 0xe3, 0x41, 0x25, 0x3b, 0xad, 0xc1,
+  0xf3, 0x65, 0x16, 0x48, 0x56, 0x8b, 0x69, 0x61, 0x39, 0x6f, 0xa3, 0x82, 0xfa, 0xb5, 0xd3, 0x7a,
+  0xd3, 0x2e, 0x3f, 0xe6, 0xe7, 0xb7, 0xea, 0x38, 0xb3, 0xc7, 0xce, 0xfe, 0xe9, 0x93, 0x81, 0xcc,
+  0x52, 0xe1, 0x61, 0x07, 0xf6, 0xae, 0xbd, 0x3c, 0x60, 0x00, 0x33, 0xe5, 0x7f, 0xba, 0xa3, 0x1d,
+  0x75, 0x7d, 0x43, 0xb6, 0x8b, 0x35, 0x83, 0xe3, 0xc7, 0x8f, 0xb9, 0x33, 0xf2, 0x83, 0x5a, 0xa7,
+  0x3e, 0x70, 0xcb, 0xfa, 0x46, 0x76, 0x0f, 0xdb, 0x24, 0x71, 0x7b, 0x73, 0xc7, 0x46, 0x5a, 0xe3,
+  0x2e, 0x86, 0x06, 0xb9, 0x1d, 0xa7, 0x2d, 0xe5, 0xda, 0x49, 0xd5, 0x06, 0xec, 0xee, 0x9f, 0xa9,
+  0xe4, 0x91, 0x02, 0x81, 0x81, 0x00, 0x85, 0x02, 0x76, 0x79, 0xe6, 0x06, 0x98, 0xa2, 0x21, 0x17,
+  0x04, 0x2e, 0x63, 0x89, 0x7a, 0x57, 0x50, 0x89, 0x49, 0x2f, 0xd5, 0xf9, 0xdc, 0xff, 0x5b, 0x48,
+  0xa3, 0xe3, 0xe2, 0x23, 0x85, 0x94, 0xad, 0xd9, 0x1e, 0xc3, 0x2c, 0x4b, 0x49, 0x73, 0xd4, 0xa3,
+  0x04, 0x99, 0x05, 0x63, 0xa9, 0x2e, 0x4b, 0xd6, 0xd7, 0xf2, 0x99, 0xb8, 0x62, 0xa8, 0x4d, 0x9a,
+  0xa7, 0x42, 0x71, 0x33, 0x95, 0xbe, 0x47, 0x50, 0x03, 0xf6, 0xec, 0x64, 0xc9, 0x68, 0xfb, 0xd1,
+  0x25, 0xeb, 0xa4, 0x6c, 0xd2, 0x56, 0xf5, 0x4a, 0x16, 0x66, 0xcd, 0xe8, 0x49, 0xf1, 0xe7, 0x16,
+  0x99, 0x79, 0xd7, 0x25, 0xac, 0x9a, 0x9d, 0xa4, 0xb0, 0xb4, 0x19, 0x16, 0xb6, 0x2e, 0x67, 0x6f,
+  0x17, 0xa5, 0x16, 0x59, 0xab, 0xc0, 0x68, 0x06, 0xdd, 0x14, 0x51, 0x18, 0x13, 0x5d, 0x1d, 0x4f,
+  0x29, 0x6c, 0xce, 0x6f, 0xe7, 0x47, 0x02, 0x81, 0x81, 0x00, 0x9a, 0x8d, 0xd5, 0x3e, 0x24, 0xb5,
+  0xeb, 0x3b, 0xda, 0x59, 0x1b, 0x40, 0x11, 0x3b, 0xac, 0xcf, 0x74, 0xe5, 0xe6, 0xae, 0x38, 0x06,
+  0xa0, 0x51, 0x96, 0xfe, 0xb5, 0xeb, 0x66, 0xd1, 0x7a, 0x61, 0x73, 0xa0, 0x60, 0xb1, 0xf9, 0xe8,
+  0x01, 0x46, 0xa4, 0x3a, 0x31, 0x63, 0xcd, 0xb6, 0x4f, 0xcd, 0xfa, 0x67, 0x0d, 0x44, 0x8f, 0xef,
+  0x2e, 0x7e, 0xa0, 0xbc, 0x87, 0x46, 0x21, 0x83, 0x7f, 0xfd, 0x1d, 0x00, 0xbf, 0x35, 0x6e, 0xca,
+  0x79, 0xf7, 0x5b, 0x4f, 0x1e, 0xe1, 0x5b, 0xfb, 0xa0, 0x56, 0x1c, 0xfc, 0x9c, 0x91, 0x60, 0x91,
+  0x22, 0xd8, 0xc3, 0x72, 0x7c, 0x25, 0x76, 0xf5, 0xe1, 0xeb, 0xb7, 0x28, 0x0f, 0xd4, 0x90, 0x6c,
+  0x31, 0x55, 0x7a, 0xf9, 0x7f, 0xe9, 0x86, 0x3b, 0x03, 0xee, 0xcd, 0xd2, 0x63, 0xac, 0xef, 0x9d,
+  0xdd, 0xee, 0x66, 0x35, 0x4e, 0x92, 0x7b, 0xb2, 0x44, 0xc0
+};
+
+#define CLIENT_CERT_AUTH_DER_LENGTH 1040
+UA_Byte CLIENT_CERT_AUTH_DER_DATA[1040] = {
+    0x30, 0x82, 0x04, 0x0c, 0x30, 0x82, 0x02, 0xf4, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x7d,
+    0xc5, 0x5e, 0x49, 0x62, 0x67, 0x65, 0x02, 0xbe, 0xae, 0xc1, 0x17, 0x4f, 0x31, 0xb9, 0xb6, 0x0a,
+    0x77, 0x7d, 0xb8, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
+    0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
+    0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65,
+    0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
+    0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f,
+    0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c,
+    0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x31, 0x31,
+    0x30, 0x33, 0x31, 0x30, 0x33, 0x36, 0x32, 0x36, 0x5a, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31, 0x30,
+    0x33, 0x31, 0x30, 0x33, 0x36, 0x32, 0x36, 0x5a, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03,
+    0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
+    0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
+    0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03,
+    0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
+    0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82,
+    0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
+    0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb3,
+    0x7b, 0xbb, 0x2f, 0xc2, 0xb8, 0x69, 0xc1, 0x7b, 0x5a, 0xdd, 0xe6, 0xd3, 0x60, 0x4f, 0x73, 0xb3,
+    0x77, 0x04, 0x31, 0x76, 0x6a, 0xf8, 0xf7, 0x96, 0xf0, 0x03, 0xf4, 0x65, 0x87, 0x28, 0x0e, 0xf9,
+    0x45, 0xac, 0xa2, 0xbf, 0x2e, 0xc2, 0x4c, 0x6f, 0x4f, 0xf4, 0x79, 0x1a, 0xb0, 0x3f, 0x7d, 0x74,
+    0x53, 0x9c, 0xe9, 0xd5, 0xb6, 0x73, 0x4f, 0xaf, 0x93, 0xb5, 0x74, 0x9e, 0x21, 0x70, 0x1a, 0xd8,
+    0xd4, 0x61, 0x61, 0xcf, 0xf4, 0xaa, 0x19, 0x8f, 0x5f, 0xa6, 0xc1, 0x5b, 0xb7, 0x6d, 0x65, 0xf4,
+    0x40, 0xa1, 0x8e, 0x8e, 0x60, 0x48, 0x8e, 0x27, 0xc8, 0xb8, 0x12, 0xb5, 0x49, 0x43, 0x21, 0x6c,
+    0xcb, 0x20, 0xa7, 0x59, 0x53, 0x3c, 0xf4, 0xab, 0xe1, 0xbe, 0x7f, 0xaa, 0xe5, 0x2f, 0x36, 0x92,
+    0x3d, 0xf8, 0xd8, 0xf8, 0x85, 0x9e, 0xdc, 0x1d, 0x81, 0x9f, 0xc1, 0x9f, 0xf1, 0x04, 0x9d, 0xe0,
+    0x8f, 0x9f, 0x76, 0x73, 0x51, 0xcd, 0x7b, 0xdb, 0xec, 0xe4, 0x46, 0x78, 0x9b, 0x60, 0x4a, 0x6d,
+    0x90, 0x25, 0xef, 0x53, 0xf9, 0x47, 0x50, 0xfe, 0xa7, 0x53, 0x60, 0xff, 0xb7, 0x70, 0xe1, 0x14,
+    0xc9, 0x12, 0x82, 0xfc, 0xd0, 0x1f, 0xc6, 0xda, 0x41, 0xbd, 0x2e, 0x57, 0x71, 0xad, 0x54, 0xd0,
+    0xe8, 0x8a, 0x5e, 0xa8, 0xa7, 0xf3, 0xa9, 0xc7, 0xc8, 0x64, 0x23, 0x84, 0xa1, 0x25, 0x91, 0x79,
+    0x68, 0xe3, 0x78, 0xd3, 0x39, 0x7c, 0xd2, 0x27, 0x2a, 0x0e, 0xaa, 0x0b, 0x0f, 0xeb, 0xf6, 0x44,
+    0x8b, 0x4d, 0x36, 0x35, 0xe3, 0xea, 0x02, 0x21, 0xd6, 0x73, 0x47, 0x75, 0xef, 0xe9, 0x87, 0x09,
+    0x23, 0xf0, 0xe4, 0x48, 0x9e, 0x70, 0xe9, 0x7d, 0xdc, 0xc8, 0xd0, 0x93, 0xff, 0x64, 0x91, 0x0f,
+    0x30, 0x1a, 0xc8, 0xfc, 0x4c, 0xb4, 0x11, 0xe9, 0xbc, 0xa5, 0x71, 0xcf, 0xa5, 0x35, 0x35, 0x02,
+    0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xd5, 0x30, 0x81, 0xd2, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
+    0x0e, 0x04, 0x16, 0x04, 0x14, 0x18, 0xbb, 0x91, 0x02, 0x25, 0x8d, 0xa5, 0xd2, 0x92, 0xc5, 0x09,
+    0x15, 0xcb, 0x4b, 0x87, 0x97, 0x97, 0x1c, 0x76, 0xdd, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23,
+    0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x18, 0xbb, 0x91, 0x02, 0x25, 0x8d, 0xa5, 0xd2, 0x92, 0xc5,
+    0x09, 0x15, 0xcb, 0x4b, 0x87, 0x97, 0x97, 0x1c, 0x76, 0xdd, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
+    0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02,
+    0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b,
+    0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
+    0x02, 0x30, 0x59, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x52, 0x30, 0x50, 0x82, 0x0f, 0x44, 0x45,
+    0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x82, 0x0f, 0x44,
+    0x45, 0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x87, 0x04,
+    0xac, 0x17, 0xcd, 0x7c, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a,
+    0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+    0x2e, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09,
+    0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,
+    0x15, 0xc1, 0x12, 0xce, 0x8c, 0xc9, 0x74, 0xb7, 0xd6, 0xc5, 0x2c, 0x52, 0x78, 0xc5, 0xbf, 0xca,
+    0xf1, 0x47, 0xb9, 0x25, 0x88, 0x24, 0x03, 0x2b, 0x10, 0xa4, 0x97, 0x3c, 0xe4, 0xdf, 0xc3, 0xea,
+    0x7e, 0xe5, 0x8a, 0x5a, 0x24, 0x10, 0x4b, 0x91, 0xaf, 0x5e, 0xa8, 0x2b, 0x74, 0x83, 0x1f, 0x01,
+    0xc3, 0x0b, 0x17, 0xea, 0x35, 0xab, 0x2c, 0x5c, 0xfd, 0x28, 0xa2, 0xf7, 0x80, 0x10, 0xc6, 0xd8,
+    0x92, 0x76, 0xef, 0x5b, 0x72, 0x9d, 0xf4, 0x53, 0xc1, 0x1b, 0xd4, 0x9d, 0xaa, 0x0a, 0x87, 0x23,
+    0x72, 0xad, 0x00, 0x2f, 0x2c, 0xd1, 0x3a, 0x87, 0x9b, 0x3c, 0xb8, 0xad, 0x1a, 0x2c, 0xa7, 0x06,
+    0x89, 0xb0, 0xba, 0x9f, 0xfd, 0x86, 0x42, 0xfa, 0x5e, 0x68, 0x3e, 0xe6, 0xfe, 0x4d, 0xf7, 0xc3,
+    0x43, 0x8c, 0x81, 0x5f, 0x91, 0xf9, 0x20, 0x2e, 0x6b, 0x4d, 0x7d, 0x4f, 0xa0, 0x62, 0x65, 0x95,
+    0xbc, 0xe3, 0xb7, 0x5b, 0xa1, 0x0b, 0x48, 0x32, 0xf9, 0x3e, 0xb4, 0xf3, 0x03, 0xa2, 0x98, 0x6f,
+    0x20, 0x2e, 0x9e, 0x77, 0x7a, 0xca, 0x52, 0x59, 0x59, 0x66, 0xb2, 0x45, 0x1e, 0x0c, 0x22, 0x0d,
+    0xbc, 0xf0, 0x6f, 0x07, 0x1a, 0xa7, 0x05, 0x35, 0x71, 0x43, 0xdb, 0xb5, 0x33, 0xf4, 0x37, 0x72,
+    0xaa, 0x07, 0x77, 0x56, 0x3e, 0x87, 0x77, 0x11, 0xc0, 0xf8, 0xe2, 0x79, 0x56, 0xa0, 0x80, 0x24,
+    0x29, 0x48, 0x38, 0xa5, 0xe1, 0xf2, 0x66, 0xae, 0x2f, 0xab, 0x12, 0x4b, 0x0e, 0x33, 0x25, 0xdb,
+    0xb3, 0x4f, 0x9d, 0xde, 0xdf, 0xa3, 0xfb, 0x5f, 0xac, 0x1f, 0xd1, 0xc0, 0xc9, 0x94, 0x54, 0x4e,
+    0x64, 0x01, 0x46, 0x08, 0x1d, 0xac, 0x44, 0xb5, 0x76, 0x86, 0x99, 0x61, 0xdb, 0xe4, 0xe9, 0x99,
+    0xca, 0xdc, 0xdc, 0x9e, 0xad, 0xed, 0x88, 0x42, 0xae, 0xe9, 0xe3, 0x1d, 0x3f, 0xd3, 0xce, 0xa9
+};
+
+#define CLIENT_KEY_AUTH_DER_LENGTH 1190
+UA_Byte CLIENT_KEY_AUTH_DER_DATA[1190] = {
+    0x30, 0x82, 0x04, 0xa2, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb3, 0x7b, 0xbb, 0x2f,
+    0xc2, 0xb8, 0x69, 0xc1, 0x7b, 0x5a, 0xdd, 0xe6, 0xd3, 0x60, 0x4f, 0x73, 0xb3, 0x77, 0x04, 0x31,
+    0x76, 0x6a, 0xf8, 0xf7, 0x96, 0xf0, 0x03, 0xf4, 0x65, 0x87, 0x28, 0x0e, 0xf9, 0x45, 0xac, 0xa2,
+    0xbf, 0x2e, 0xc2, 0x4c, 0x6f, 0x4f, 0xf4, 0x79, 0x1a, 0xb0, 0x3f, 0x7d, 0x74, 0x53, 0x9c, 0xe9,
+    0xd5, 0xb6, 0x73, 0x4f, 0xaf, 0x93, 0xb5, 0x74, 0x9e, 0x21, 0x70, 0x1a, 0xd8, 0xd4, 0x61, 0x61,
+    0xcf, 0xf4, 0xaa, 0x19, 0x8f, 0x5f, 0xa6, 0xc1, 0x5b, 0xb7, 0x6d, 0x65, 0xf4, 0x40, 0xa1, 0x8e,
+    0x8e, 0x60, 0x48, 0x8e, 0x27, 0xc8, 0xb8, 0x12, 0xb5, 0x49, 0x43, 0x21, 0x6c, 0xcb, 0x20, 0xa7,
+    0x59, 0x53, 0x3c, 0xf4, 0xab, 0xe1, 0xbe, 0x7f, 0xaa, 0xe5, 0x2f, 0x36, 0x92, 0x3d, 0xf8, 0xd8,
+    0xf8, 0x85, 0x9e, 0xdc, 0x1d, 0x81, 0x9f, 0xc1, 0x9f, 0xf1, 0x04, 0x9d, 0xe0, 0x8f, 0x9f, 0x76,
+    0x73, 0x51, 0xcd, 0x7b, 0xdb, 0xec, 0xe4, 0x46, 0x78, 0x9b, 0x60, 0x4a, 0x6d, 0x90, 0x25, 0xef,
+    0x53, 0xf9, 0x47, 0x50, 0xfe, 0xa7, 0x53, 0x60, 0xff, 0xb7, 0x70, 0xe1, 0x14, 0xc9, 0x12, 0x82,
+    0xfc, 0xd0, 0x1f, 0xc6, 0xda, 0x41, 0xbd, 0x2e, 0x57, 0x71, 0xad, 0x54, 0xd0, 0xe8, 0x8a, 0x5e,
+    0xa8, 0xa7, 0xf3, 0xa9, 0xc7, 0xc8, 0x64, 0x23, 0x84, 0xa1, 0x25, 0x91, 0x79, 0x68, 0xe3, 0x78,
+    0xd3, 0x39, 0x7c, 0xd2, 0x27, 0x2a, 0x0e, 0xaa, 0x0b, 0x0f, 0xeb, 0xf6, 0x44, 0x8b, 0x4d, 0x36,
+    0x35, 0xe3, 0xea, 0x02, 0x21, 0xd6, 0x73, 0x47, 0x75, 0xef, 0xe9, 0x87, 0x09, 0x23, 0xf0, 0xe4,
+    0x48, 0x9e, 0x70, 0xe9, 0x7d, 0xdc, 0xc8, 0xd0, 0x93, 0xff, 0x64, 0x91, 0x0f, 0x30, 0x1a, 0xc8,
+    0xfc, 0x4c, 0xb4, 0x11, 0xe9, 0xbc, 0xa5, 0x71, 0xcf, 0xa5, 0x35, 0x35, 0x02, 0x03, 0x01, 0x00,
+    0x01, 0x02, 0x82, 0x01, 0x00, 0x04, 0x2b, 0xc4, 0xee, 0xd8, 0x34, 0x96, 0xe8, 0x93, 0x28, 0x4a,
+    0x6d, 0xd9, 0xcd, 0xac, 0x2b, 0x01, 0x29, 0xab, 0xe4, 0x46, 0x5f, 0x38, 0x07, 0xf0, 0xef, 0x04,
+    0xf8, 0x81, 0xff, 0x81, 0x13, 0xd0, 0x01, 0x29, 0x80, 0xe2, 0xb6, 0x80, 0x77, 0x6c, 0x42, 0xcc,
+    0x68, 0xa0, 0x11, 0x26, 0x78, 0x90, 0xe2, 0x7c, 0x8c, 0x06, 0x96, 0x65, 0xd9, 0x9d, 0x37, 0xee,
+    0x88, 0x96, 0x40, 0x2a, 0xad, 0xc5, 0x0a, 0x32, 0x75, 0x26, 0x73, 0x06, 0x1c, 0xef, 0xf3, 0x06,
+    0x1a, 0x0a, 0x3a, 0x9a, 0x05, 0x3b, 0x86, 0xe0, 0xfa, 0x42, 0x1e, 0xc4, 0xb0, 0xe1, 0x05, 0xce,
+    0x19, 0x49, 0x33, 0x39, 0xa7, 0x26, 0x33, 0x16, 0x40, 0x2d, 0x58, 0x3c, 0xdb, 0x66, 0xbf, 0x29,
+    0x41, 0x28, 0x44, 0x89, 0x33, 0x58, 0x74, 0xae, 0x3a, 0xc4, 0x93, 0xbe, 0x5c, 0x59, 0x27, 0x31,
+    0x02, 0x3b, 0xe8, 0x4a, 0xf6, 0x22, 0x4a, 0xd2, 0xc2, 0xce, 0x7b, 0x7a, 0xc1, 0xd6, 0xcd, 0x46,
+    0x01, 0x04, 0xc6, 0xe2, 0xa7, 0xc0, 0x30, 0x30, 0x9f, 0xaf, 0xd4, 0x11, 0x2b, 0x4b, 0xd8, 0xbb,
+    0x0a, 0xa5, 0xe2, 0x2c, 0xd5, 0x0f, 0x88, 0xbe, 0x12, 0x71, 0x31, 0x7d, 0xb3, 0x54, 0xb2, 0x8b,
+    0x46, 0x39, 0x4a, 0x3d, 0xeb, 0x09, 0x0a, 0x7c, 0xfc, 0xbe, 0xce, 0x7e, 0x36, 0xed, 0x76, 0xa0,
+    0xd6, 0x72, 0x83, 0x3f, 0x59, 0x92, 0x2d, 0x34, 0x9f, 0x7f, 0xc1, 0xaa, 0x7f, 0x76, 0x1d, 0x47,
+    0xc2, 0xba, 0xb2, 0xeb, 0xf9, 0xe8, 0xdc, 0xd6, 0x14, 0x38, 0x91, 0xb1, 0x1c, 0x4b, 0xac, 0x8e,
+    0x32, 0x5a, 0xb0, 0x3d, 0xef, 0x9d, 0x74, 0x18, 0xf5, 0xfa, 0x89, 0xd9, 0x81, 0x2f, 0x49, 0x92,
+    0xdc, 0x29, 0xbc, 0xa9, 0x09, 0xee, 0xe1, 0xcb, 0xf3, 0x70, 0xa0, 0x2d, 0xae, 0x5f, 0x84, 0x48,
+    0xff, 0xca, 0x49, 0x43, 0x65, 0x02, 0x81, 0x81, 0x00, 0xe7, 0x77, 0x0b, 0xd8, 0xba, 0xc9, 0x9a,
+    0x0c, 0xd1, 0x17, 0xe8, 0xc1, 0x2c, 0x09, 0xcd, 0x60, 0x3a, 0xd7, 0xf3, 0x4e, 0xca, 0xec, 0x1f,
+    0xeb, 0x9d, 0x55, 0x46, 0x47, 0x5e, 0xce, 0x63, 0x60, 0xf1, 0xdb, 0x7c, 0x61, 0x89, 0x47, 0xaf,
+    0xbb, 0x63, 0x66, 0x71, 0xf2, 0xa1, 0xc6, 0x2c, 0x67, 0x3a, 0xd7, 0x45, 0x95, 0x42, 0xdf, 0xe5,
+    0x3b, 0x78, 0xb3, 0x5d, 0x11, 0x3d, 0x71, 0x30, 0xd5, 0x29, 0xc8, 0x8a, 0x34, 0xee, 0x86, 0x3f,
+    0x93, 0x60, 0x58, 0xf6, 0x88, 0x71, 0x73, 0xa0, 0xa9, 0xca, 0xe4, 0x71, 0xab, 0xe6, 0x15, 0xe4,
+    0x83, 0x54, 0x8f, 0xa0, 0x4a, 0x1d, 0x8d, 0x91, 0xbc, 0x7a, 0x7c, 0xcb, 0xde, 0x78, 0x04, 0x77,
+    0xa3, 0x61, 0xea, 0xc3, 0xee, 0x35, 0x0e, 0xd3, 0x27, 0x21, 0x06, 0x64, 0xf1, 0xb9, 0x3f, 0x6b,
+    0x0f, 0xb3, 0x14, 0x0a, 0x42, 0xa5, 0x97, 0x39, 0x33, 0x02, 0x81, 0x81, 0x00, 0xc6, 0x82, 0x20,
+    0xb4, 0x8a, 0x42, 0x67, 0x51, 0xde, 0x6f, 0xfe, 0x54, 0x40, 0xfc, 0x92, 0xf9, 0xdb, 0x52, 0xb4,
+    0x13, 0x99, 0xbb, 0xcc, 0x91, 0x14, 0xaa, 0xd2, 0x34, 0x89, 0x12, 0x48, 0x4a, 0xca, 0x60, 0xcb,
+    0x37, 0x42, 0x20, 0x3d, 0x7a, 0xd7, 0x31, 0x5c, 0x3f, 0xd1, 0x28, 0x86, 0xee, 0xc5, 0x0b, 0x61,
+    0x7d, 0x9f, 0xbb, 0x72, 0x34, 0x8a, 0x53, 0x00, 0x80, 0xd2, 0x6a, 0xa4, 0x6b, 0x5f, 0x20, 0xcd,
+    0x76, 0xed, 0xbf, 0xcd, 0x9c, 0xcd, 0xc0, 0x79, 0x74, 0x0d, 0xfc, 0xa9, 0xf6, 0x1a, 0xb9, 0x5b,
+    0x72, 0x55, 0x88, 0xd2, 0x90, 0xfd, 0xe1, 0x26, 0xe1, 0xa1, 0x3c, 0x14, 0xea, 0x6d, 0xc1, 0x77,
+    0x09, 0x98, 0xd3, 0x1d, 0xe9, 0x5b, 0xdc, 0x24, 0x87, 0x80, 0x96, 0x57, 0x7d, 0xc7, 0x36, 0x2d,
+    0x50, 0x05, 0x6d, 0x61, 0x74, 0xfc, 0x38, 0x92, 0x6e, 0x51, 0x60, 0xe7, 0xf7, 0x02, 0x81, 0x80,
+    0x69, 0x84, 0x47, 0x8e, 0x41, 0x78, 0x6e, 0x15, 0xb1, 0xac, 0x28, 0x9b, 0x07, 0x2c, 0x60, 0xc7,
+    0xa1, 0x8b, 0x98, 0x8b, 0x2e, 0xce, 0x7d, 0xae, 0xb7, 0x46, 0x8c, 0x87, 0x34, 0x9c, 0xf9, 0x88,
+    0xd4, 0x38, 0xae, 0x76, 0xf8, 0x52, 0x09, 0xb6, 0x6f, 0x15, 0xe0, 0x94, 0x2f, 0x53, 0x5c, 0x22,
+    0xa3, 0x1c, 0x47, 0xc8, 0x47, 0x78, 0x31, 0xd3, 0xee, 0xae, 0x35, 0x9b, 0x0a, 0x5b, 0x73, 0x5b,
+    0x79, 0x74, 0xc6, 0x2c, 0x63, 0x20, 0x28, 0x13, 0x53, 0x34, 0xbb, 0x0e, 0x70, 0x49, 0xb9, 0xd0,
+    0x2d, 0x81, 0xfe, 0x9f, 0xd2, 0x7f, 0xe0, 0x70, 0x4e, 0x38, 0x3b, 0x66, 0x0e, 0x1a, 0xdf, 0x79,
+    0x00, 0x8d, 0xab, 0x92, 0x7b, 0x3b, 0xee, 0x1e, 0x39, 0x21, 0x00, 0xb8, 0xb2, 0xcf, 0x53, 0x4a,
+    0xdf, 0x2f, 0x3f, 0x0d, 0x42, 0xd9, 0xba, 0x40, 0xa9, 0xee, 0x54, 0xcf, 0x15, 0x15, 0xdf, 0x29,
+    0x02, 0x81, 0x80, 0x33, 0xb6, 0x98, 0xb0, 0x8f, 0xc8, 0x26, 0xc4, 0x64, 0x2f, 0x46, 0xd1, 0x4a,
+    0x30, 0xc2, 0x55, 0x46, 0xf6, 0xaf, 0xa4, 0xdf, 0x8a, 0xd6, 0x0b, 0x01, 0x98, 0x52, 0xb4, 0x8e,
+    0xf4, 0xed, 0x52, 0x56, 0x90, 0x8a, 0xc0, 0x35, 0x80, 0xd2, 0xa3, 0x5a, 0xc6, 0x28, 0x23, 0x13,
+    0xe8, 0xfb, 0xe5, 0xdd, 0xfd, 0x4e, 0x03, 0x7d, 0x06, 0x47, 0x05, 0x3a, 0xf7, 0xce, 0x8c, 0xc0,
+    0xc4, 0x39, 0x5b, 0x23, 0x68, 0x17, 0x3e, 0xa1, 0x47, 0x33, 0x58, 0x63, 0x1d, 0x7e, 0x46, 0x66,
+    0x92, 0x68, 0xf0, 0x8d, 0x1b, 0xb6, 0x9f, 0xfd, 0x7a, 0x6c, 0x68, 0x8b, 0x4b, 0x09, 0x67, 0x04,
+    0x2a, 0xf3, 0xc3, 0xf2, 0x9d, 0xd0, 0xd5, 0xf6, 0x33, 0x21, 0x7a, 0xb6, 0x8c, 0x8e, 0x13, 0xa2,
+    0xc3, 0x07, 0xbd, 0xe3, 0x94, 0xd0, 0x8f, 0x25, 0x2a, 0xce, 0x95, 0xbc, 0x53, 0x3c, 0x8a, 0x72,
+    0xb6, 0xcd, 0x17, 0x02, 0x81, 0x80, 0x2e, 0x07, 0x75, 0x1e, 0x89, 0x89, 0xfc, 0x40, 0x35, 0x14,
+    0x48, 0x5f, 0x9a, 0x23, 0x87, 0x2d, 0x32, 0x2d, 0x30, 0x95, 0x4e, 0x0f, 0x5f, 0xb3, 0x46, 0x53,
+    0x90, 0x86, 0x2c, 0x2b, 0xe2, 0x84, 0x5f, 0x76, 0xee, 0x8f, 0x8b, 0xa0, 0xbf, 0x63, 0x02, 0xca,
+    0xaa, 0x5a, 0x43, 0x41, 0xc5, 0x84, 0x55, 0x94, 0x72, 0x52, 0x24, 0xbd, 0x4a, 0xec, 0x9d, 0xcf,
+    0xb8, 0xca, 0x16, 0x64, 0x5d, 0x79, 0xe1, 0xe2, 0xce, 0x92, 0x25, 0xac, 0x31, 0x91, 0x4f, 0x6a,
+    0x8c, 0xfe, 0x5e, 0xff, 0x17, 0xa2, 0x57, 0x53, 0xef, 0x31, 0xa7, 0x7a, 0x4d, 0xff, 0x07, 0xb0,
+    0xab, 0x5b, 0xcd, 0x65, 0x4b, 0xe9, 0x86, 0x1b, 0x95, 0xad, 0x30, 0xde, 0x3e, 0x61, 0x58, 0x05,
+    0xd6, 0xde, 0x58, 0xc2, 0xfa, 0xfb, 0x92, 0x03, 0xa9, 0xf0, 0xeb, 0x73, 0x74, 0xb6, 0xd5, 0x56,
+    0x1d, 0xd3, 0x9d, 0xf5, 0x64, 0xea
+};
+
+_UA_END_DECLS
+
+#endif //OPEN62541_CERTIFICATES_H
diff --git a/tests/client/check_client_authentication.c b/tests/client/check_client_authentication.c
new file mode 100644
index 00000000000..75307d96033
--- /dev/null
+++ b/tests/client/check_client_authentication.c
@@ -0,0 +1,194 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Noel Graf)
+ */
+
+#include <open62541/client_config_default.h>
+#include <open62541/server_config_default.h>
+
+#include <open62541/client.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/securitypolicy.h>
+#include <open62541/plugin/pki_default.h>
+#include <open62541/plugin/accesscontrol_default.h>
+#include <open62541/server.h>
+
+#include "client/ua_client_internal.h"
+#include "ua_server_internal.h"
+
+#include <check.h>
+#include <stdlib.h>
+
+#include "certificates.h"
+#include "testing_clock.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+    UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static void setup(void) {
+    running = true;
+
+    /* Load server certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = SERVER_CERT_DER_LENGTH;
+    certificate.data = SERVER_CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = SERVER_KEY_DER_LENGTH;
+    privateKey.data = SERVER_KEY_DER_DATA;
+
+    /* Load client certificate for authentication */
+    UA_ByteString certificate_client;
+    certificate_client.length = CLIENT_CERT_AUTH_DER_LENGTH;
+    certificate_client.data = CLIENT_CERT_AUTH_DER_DATA;
+
+    /* Add client certificate to the trust list */
+    size_t trustListSize = 1;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
+    trustList[0] = certificate_client;
+    size_t issuerListSize = 0;
+    UA_ByteString *issuerList = NULL;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   trustList, trustListSize,
+                                                   issuerList, issuerListSize,
+                                                   revocationList, revocationListSize);
+
+    config->certificateVerification.clear(&config->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&config->certificateVerification);
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Client_connect_certificate) {
+    /* Load client certificate and private key for the SecureChannel */
+    UA_ByteString certificate;
+    certificate.length = CLIENT_CERT_DER_LENGTH;
+    certificate.data = CLIENT_CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = CLIENT_KEY_DER_LENGTH;
+    privateKey.data = CLIENT_KEY_DER_DATA;
+
+    /* Load client certificate and private key for authentication */
+    UA_ByteString certificateAuth;
+    certificateAuth.length = CLIENT_CERT_AUTH_DER_LENGTH;
+    certificateAuth.data = CLIENT_CERT_AUTH_DER_DATA;
+
+    UA_ByteString privateKeyAuth;
+    privateKeyAuth.length = CLIENT_KEY_AUTH_DER_LENGTH;
+    privateKeyAuth.data = CLIENT_KEY_AUTH_DER_DATA;
+
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+
+    /* Set securityMode and securityPolicyUri */
+    cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    cc->securityPolicyUri = UA_String_fromChars("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
+
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                         NULL, 0, NULL, 0);
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&cc->clientDescription.applicationUri);
+    //cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
+    cc->clientDescription.applicationUri = UA_STRING_ALLOC("http://test.de/root");
+
+    UA_ClientConfig_setAuthenticationCert(cc, certificateAuth, privateKeyAuth);
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(Client_connect_invalid_certificate) {
+        /* Load client certificate and private key for the SecureChannel */
+        UA_ByteString certificate;
+        certificate.length = CLIENT_CERT_DER_LENGTH;
+        certificate.data = CLIENT_CERT_DER_DATA;
+
+        UA_ByteString privateKey;
+        privateKey.length = CLIENT_KEY_DER_LENGTH;
+        privateKey.data = CLIENT_KEY_DER_DATA;
+
+        /* Load client certificate and private key for authentication */
+        UA_ByteString certificateAuth;
+        certificateAuth.length = CLIENT_CERT_DER_LENGTH;
+        certificateAuth.data = CLIENT_CERT_DER_DATA;
+
+        UA_ByteString privateKeyAuth;
+        privateKeyAuth.length = CLIENT_KEY_DER_LENGTH;
+        privateKeyAuth.data = CLIENT_KEY_DER_DATA;
+
+        UA_Client *client = UA_Client_new();
+        UA_ClientConfig *cc = UA_Client_getConfig(client);
+
+        /* Set securityMode and securityPolicyUri */
+        cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+        cc->securityPolicyUri = UA_String_fromChars("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
+
+        UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                             NULL, 0, NULL, 0);
+        UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
+        /* Set the ApplicationUri used in the certificate */
+        UA_String_clear(&cc->clientDescription.applicationUri);
+        cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
+
+        UA_ClientConfig_setAuthenticationCert(cc, certificateAuth, privateKeyAuth);
+        UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+
+        /* openssl v.3 returns a different exit code than other versions. */
+        //ck_assert_uint_eq(retval, UA_STATUSCODE_BADCERTIFICATEUNTRUSTED);
+        ck_assert_uint_ne(retval, UA_STATUSCODE_GOOD);
+
+        UA_Client_disconnect(client);
+        UA_Client_delete(client);
+    }
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Client");
+    TCase *tc_client = tcase_create("Client with Authentication");
+    tcase_add_checked_fixture(tc_client, setup, teardown);
+    tcase_add_test(tc_client, Client_connect_certificate);
+    tcase_add_test(tc_client, Client_connect_invalid_certificate);
+    suite_add_tcase(s,tc_client);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 42bd8e1c98c230ffb9d99c6c6c426ce2da175514 Mon Sep 17 00:00:00 2001
From: basyskom-jvoe <33348624+basyskom-jvoe@users.noreply.github.com>
Date: Fri, 9 Dec 2022 10:14:47 +0100
Subject: [PATCH 0571/1963] feat(server): Implement reverse connect on the
 server side (#5363)

---
 examples/CMakeLists.txt                    |   2 +
 examples/tutorial_server_reverseconnect.c  |  57 ++++
 include/open62541/common.h                 |   1 +
 include/open62541/server.h                 |  55 +++
 src/client/ua_client.c                     |   4 +-
 src/server/ua_server.c                     | 156 +++++++++
 src/server/ua_server_binary.c              | 212 +++++++++++-
 src/server/ua_server_internal.h            |  35 ++
 tests/CMakeLists.txt                       |   2 +
 tests/server/check_server_reverseconnect.c | 370 +++++++++++++++++++++
 tools/schema/Custom.Opc.Ua.Transport.bsd   |   8 +-
 tools/schema/datatypes_transport.txt       |   1 +
 12 files changed, 899 insertions(+), 4 deletions(-)
 create mode 100644 examples/tutorial_server_reverseconnect.c
 create mode 100644 tests/server/check_server_reverseconnect.c

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 95136172e1d..4f14b6a1963 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -83,6 +83,8 @@ add_example(tutorial_server_variabletype tutorial_server_variabletype.c)
 
 add_example(tutorial_server_object tutorial_server_object.c)
 
+add_example(tutorial_server_reverseconnect tutorial_server_reverseconnect.c)
+
 if(UA_ENABLE_METHODCALLS)
     add_example(tutorial_server_method tutorial_server_method.c)
     if (UA_MULTITHREADING EQUAL 100)
diff --git a/examples/tutorial_server_reverseconnect.c b/examples/tutorial_server_reverseconnect.c
new file mode 100644
index 00000000000..f4d4b5a565a
--- /dev/null
+++ b/examples/tutorial_server_reverseconnect.c
@@ -0,0 +1,57 @@
+/* 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 <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <signal.h>
+#include <stdlib.h>
+
+static volatile UA_Boolean running = true;
+static void stopHandler(int sig) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "received ctrl-c");
+    running = false;
+}
+
+static void reverseConnectStateCallback(UA_Server *server, UA_UInt64 handle,
+                                        UA_SecureChannelState state, void *context) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                "Reverse connect state callback for %lu with context %p: State %d",
+                (unsigned long)handle, context,  state);
+}
+
+
+int main(void) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+
+    /*UA_Server_run_startup(server); */
+
+    UA_UInt64 handle = 0;
+    UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
+                                reverseConnectStateCallback, (void *)123456, &handle);
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
+    /* Test remove */
+    /*for (int i = 0; i < 10000; ++i) {
+        retval = UA_Server_run_iterate(server, true);
+
+        if (i == 8000)
+            UA_Server_removeReverseConnect(server, handle);
+
+        if (!running)
+            break;
+    }
+
+    UA_Server_run_shutdown(server);*/
+
+    UA_Server_run(server, &running);
+
+    UA_Server_delete(server);
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/include/open62541/common.h b/include/open62541/common.h
index cd460cb2987..da2e9ac8619 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -177,6 +177,7 @@ typedef enum {
     UA_SECURECHANNELSTATE_FRESH = 0,
     UA_SECURECHANNELSTATE_CONNECTING,
     UA_SECURECHANNELSTATE_CONNECTED,
+    UA_SECURECHANNELSTATE_RHE_SENT,
     UA_SECURECHANNELSTATE_HEL_SENT,
     UA_SECURECHANNELSTATE_HEL_RECEIVED,
     UA_SECURECHANNELSTATE_ACK_SENT,
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 3e5246afaa5..ed7ce0a34ec 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -358,6 +358,11 @@ struct UA_ServerConfig {
     UA_Boolean deleteEventCapability;
     UA_Boolean deleteAtTimeDataCapability;
 #endif
+
+    /**
+     * Reverse Connect
+     * ^^^^^^^^^^^^^^^ */
+    UA_UInt32 reverseReconnectInterval; /* Default is 15000 ms */
 };
 
 void UA_EXPORT
@@ -1881,6 +1886,56 @@ typedef struct {
 UA_ServerStatistics UA_EXPORT
 UA_Server_getStatistics(UA_Server *server);
 
+/**
+  * Reverse Connect
+  * ---------------
+  *
+  * The reverse connect feature of OPC UA permits the server instead of the client to
+  * establish the connection.
+  * The client must expose the listening port so the server is able to reach it.
+  */
+
+/**
+ * The reverse connect state change callback is called whenever the state of a reverse
+ * connect is changed by a connection attempt, a successful connection or a connection
+ * loss.
+ *
+ * The reverse connect states reflect the state of the secure channel currently associated
+ * with a reverse connect. The state will remain UA_SECURECHANNELSTATE_CONNECTING while
+ * the server attempts repeatedly to establish a connection.
+ */
+typedef void (*UA_Server_ReverseConnectStateCallback)(UA_Server *server, UA_UInt64 handle,
+                                                      UA_SecureChannelState state,
+                                                      void *context);
+
+/**
+ * Registers a reverse connect in the server.
+ * The server periodically attempts to establish a connection if the initial connect fails
+ * or if the connection breaks.
+ *
+ * @param server The server object
+ * @param url The URL of the remote client
+ * @param stateCallback The callback which will be called on state changes
+ * @param callbackContext The context for the state callback
+ * @param handle Is set to the handle of the reverse connect if not NULL
+ * @return Returns UA_STATUSCODE_GOOD if the reverse connect has been registered
+ */
+UA_StatusCode UA_EXPORT
+UA_Server_addReverseConnect(UA_Server *server, UA_String url,
+                                          UA_Server_ReverseConnectStateCallback stateCallback,
+                                          void *callbackContext, UA_UInt64 *handle);
+
+/**
+ * Removes a reverse connect from the server and closes the connection if it is currently
+ * open.
+ *
+ * @param server The server object
+ * @param handle The handle of the reverse connect to remove
+ * @return Returns UA_STATUSCODE_GOOD if the reverse connect has been successfully removed
+ */
+UA_StatusCode UA_EXPORT
+UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle);
+
 _UA_END_DECLS
 
 #ifdef UA_ENABLE_PUBSUB
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 82dbf2d51a4..abb5be5af85 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -175,8 +175,8 @@ UA_Client_getConfig(UA_Client *client) {
 }
 
 #if UA_LOGLEVEL <= 300
-static const char *channelStateTexts[11] = {
-    "Fresh", "Connecting", "Connected", "HELSent", "HELReceived", "ACKSent",
+static const char *channelStateTexts[12] = {
+    "Fresh", "Connecting", "Connected", "RHESent", "HELSent", "HELReceived", "ACKSent",
     "AckReceived", "OPNSent", "Open", "Closing", "Closed"};
 static const char *sessionStateTexts[6] =
     {"Closed", "CreateRequested", "Created",
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 023eb18cdbe..870dd9ebf16 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -616,6 +616,141 @@ UA_Server_createServerConnection(UA_Server *server, const UA_String *serverUrl)
     return UA_STATUSCODE_BADINTERNALERROR;
 }
 
+UA_StatusCode attemptReverseConnect(UA_Server *server, reverse_connect_context *context) {
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    UA_StatusCode res = UA_STATUSCODE_BADINTERNALERROR;
+    UA_String tcpString = UA_STRING_STATIC("tcp");
+    for(UA_EventSource *es = config->eventLoop->eventSources; es != NULL; es = es->next) {
+        /* Is this a usable connection manager? */
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+        if(!UA_String_equal(&tcpString, &cm->protocol))
+            continue;
+
+        if (es->state != UA_EVENTSOURCESTATE_STARTED)
+            return UA_STATUSCODE_GOODCOMPLETESASYNCHRONOUSLY;
+
+        /* Set up the parameters */
+        UA_KeyValueMap params;
+        params.mapSize = 0;
+        params.map = NULL;
+        UA_KeyValueMap_setScalar(&params, UA_QUALIFIEDNAME(0, "hostname"), &context->hostname,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+        UA_KeyValueMap_setScalar(&params, UA_QUALIFIEDNAME(0, "port"), &context->port,
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+
+        /* Open the server connection */
+        res = cm->openConnection(cm, &params, server, context,
+                                 UA_Server_reverseConnectCallback);
+
+        UA_KeyValueMap_clear(&params);
+
+        if (res != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "Failed to create connection for reverse connect: %s\n",
+                           UA_StatusCode_name(res));
+            context->currentConnection.connectionId = 0;
+        }
+
+        if (context->state != UA_SECURECHANNELSTATE_CONNECTING) {
+            context->state = UA_SECURECHANNELSTATE_CONNECTING;
+            if (context->stateCallback)
+                context->stateCallback(server, context->handle, context->state,
+                                       context->callbackContext);
+        }
+    }
+
+    return res;
+}
+
+UA_StatusCode UA_Server_addReverseConnect(UA_Server *server, UA_String url,
+                                          UA_Server_ReverseConnectStateCallback stateCallback,
+                                          void *callbackContext, UA_UInt64 *handle) {
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    UA_String hostname = UA_STRING_NULL;
+    UA_UInt16 port = 0;
+    UA_StatusCode res = UA_parseEndpointUrl(&url, &hostname, &port, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                       "OPC UA URL is invalid: %.*s",
+                       (int)url.length, url.data);
+        return res;
+    }
+
+    if (SLIST_EMPTY(&server->reverseConnects))
+        setReverseConnectRetryCallback(server, true);
+
+    reverse_connect_context *newContext = (reverse_connect_context *)calloc(1, sizeof(reverse_connect_context));
+    if (newContext == NULL)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    UA_String_copy(&hostname, &newContext->hostname);
+    newContext->port = port;
+    newContext->handle = ++server->lastReverseConnectHandle;
+    newContext->stateCallback = stateCallback;
+    newContext->callbackContext = callbackContext;
+    SLIST_INSERT_HEAD(&server->reverseConnects, newContext, next);
+
+    if (handle)
+        *handle = newContext->handle;
+
+    return attemptReverseConnect(server, newContext);
+}
+
+static void freeReverseConnectCallback(void *application, void *context) {
+    reverse_connect_context *reverseConnect = (reverse_connect_context *)context;
+
+    if (reverseConnect) {
+        UA_String_clear(&reverseConnect->hostname);
+        free(reverseConnect);
+    }
+
+    if (application)
+        free(application);
+}
+
+UA_StatusCode UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
+    reverse_connect_context *rev = NULL;
+    reverse_connect_context *temp = NULL;
+    UA_StatusCode result = UA_STATUSCODE_BADNOTFOUND;
+
+    SLIST_FOREACH_SAFE(rev, &server->reverseConnects, next, temp) {
+        if (rev->handle == handle) {
+            SLIST_REMOVE(&server->reverseConnects, rev, reverse_connect_context, next);
+
+            if (rev->currentConnection.connectionId) {
+                rev->destruction = true;
+                /* Request disconnect and run the event loop for one iteration */
+                if (rev->currentConnection.connectionId) {
+                    UA_DelayedCallback *freeCallback = (UA_DelayedCallback *)calloc(1, sizeof(UA_DelayedCallback));
+                    freeCallback->context = rev;
+                    freeCallback->application = freeCallback;
+                    freeCallback->callback = freeReverseConnectCallback;
+
+                    server->config.eventLoop->addDelayedCallback(server->config.eventLoop, freeCallback);
+
+                    rev->currentConnection.connectionManager->closeConnection(
+                                rev->currentConnection.connectionManager,
+                                rev->currentConnection.connectionId);
+                }
+            } else {
+                setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
+                UA_String_clear(&rev->hostname);
+                free(rev);
+            }
+            result = UA_STATUSCODE_GOOD;
+            break;
+        }
+    }
+
+    if (SLIST_EMPTY(&server->reverseConnects))
+         setReverseConnectRetryCallback(server, false);
+
+    return result;
+}
+
 /********************/
 /* Main Server Loop */
 /********************/
@@ -807,6 +942,18 @@ UA_Server_run_shutdown(UA_Server *server) {
     UA_Server_removeCallback(server, server->houseKeepingCallbackId);
     server->houseKeepingCallbackId = 0;
 
+    /* Mark all reverse connects as destroying */
+    reverse_connect_context *rev = NULL;
+    SLIST_FOREACH(rev, &server->reverseConnects, next) {
+        rev->destruction = true;
+        if (rev->currentConnection.connectionId) {
+            rev->currentConnection.connectionManager->closeConnection(rev->currentConnection.connectionManager,
+                                                                      rev->currentConnection.connectionId);
+        }
+
+        setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
+    }
+
     /* Stop all SecureChannels */
     UA_Server_deleteSecureChannels(server);
 
@@ -837,6 +984,15 @@ UA_Server_run_shutdown(UA_Server *server) {
         stopMulticastDiscoveryServer(server);
 #endif
 
+    setReverseConnectRetryCallback(server, false);
+    reverse_connect_context *next = server->reverseConnects.slh_first;
+    while (next) {
+        reverse_connect_context *current = next;
+        next = current->next.sle_next;
+        UA_String_clear(&current->hostname);
+        free(current);
+    }
+
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index c79c45bf3b1..914a297eb5b 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -323,7 +323,8 @@ getServicePointers(UA_UInt32 requestTypeId, const UA_DataType **requestType,
 static UA_StatusCode
 processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *msg) {
     UA_ConnectionManager *cm = channel->connectionManager;
-    if(!cm || channel->state != UA_SECURECHANNELSTATE_CONNECTED)
+    if(!cm || (channel->state != UA_SECURECHANNELSTATE_CONNECTED &&
+               channel->state != UA_SECURECHANNELSTATE_RHE_SENT))
         return UA_STATUSCODE_BADINTERNALERROR;
 
     size_t offset = 0; /* Go to the beginning of the TcpHelloMessage */
@@ -996,3 +997,212 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         UA_SecureChannel_shutdown(channel);
     }
 }
+
+#define UA_MINMESSAGESIZE 8192
+
+static UA_StatusCode
+sendRHEMessage(UA_Server *server, uintptr_t connectionId, UA_ConnectionManager *cm) {
+    /* Get a buffer */
+    UA_ByteString message;
+    UA_StatusCode retval = cm->allocNetworkBuffer(cm, connectionId,
+                                                  &message, UA_MINMESSAGESIZE);
+
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Prepare the RHE message and encode at offset 8 */
+    UA_TcpReverseHelloMessage reverseHello;
+    UA_TcpReverseHelloMessage_init(&reverseHello);
+
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    reverseHello.serverUri = config->applicationDescription.applicationUri;
+    if (config->applicationDescription.discoveryUrlsSize)
+        reverseHello.endpointUrl = config->applicationDescription.discoveryUrls[0];
+
+    UA_Byte *bufPos = &message.data[8]; /* skip the header */
+    const UA_Byte *bufEnd = &message.data[message.length];
+    UA_StatusCode result = UA_encodeBinaryInternal(&reverseHello, &UA_TRANSPORT[UA_TRANSPORT_TCPREVERSEHELLOMESSAGE],
+                                                    &bufPos, &bufEnd, NULL, NULL);
+
+    if (result != UA_STATUSCODE_GOOD) {
+        cm->freeNetworkBuffer(cm, connectionId, &message);
+        return result;
+    }
+
+    /* Encode the message header at offset 0 */
+    UA_TcpMessageHeader messageHeader;
+    messageHeader.messageTypeAndChunkType = UA_CHUNKTYPE_FINAL + UA_MESSAGETYPE_RHE;
+    messageHeader.messageSize = (UA_UInt32) ((uintptr_t)bufPos - (uintptr_t)message.data);
+    bufPos = message.data;
+    retval = UA_encodeBinaryInternal(&messageHeader,
+                                     &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER],
+                                     &bufPos, &bufEnd, NULL, NULL);
+
+    if(retval != UA_STATUSCODE_GOOD) {
+        cm->freeNetworkBuffer(cm, connectionId, &message);
+        return retval;
+    }
+
+    /* Send the RHE message */
+    message.length = messageHeader.messageSize;
+    retval = cm->sendWithConnection(cm, connectionId,
+                                    NULL, &message);
+
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_CLIENT, "Sending RHE failed");
+        cm->closeConnection(cm, connectionId);
+        return retval;
+    }
+
+    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_CLIENT, "Sent RHE message");
+    return UA_STATUSCODE_GOOD;
+}
+
+static void retryReverseConnectCallback(UA_Server *server, void *context) {
+    (void)context;
+
+    reverse_connect_context *rc = NULL;
+    SLIST_FOREACH(rc, &server->reverseConnects, next) {
+        if (!rc->currentConnection.connectionId) {
+            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                        "Attempt to reverse reconnect to %.*s:%d", (int)rc->hostname.length,
+                        rc->hostname.data, rc->port);
+            attemptReverseConnect(server, rc);
+        }
+    }
+}
+
+UA_StatusCode setReverseConnectRetryCallback(UA_Server *server, UA_Boolean enabled) {
+    if (enabled && !server->reverseConnectsCheckHandle) {
+        const UA_UInt32 reconnectInterval = server->config.reverseReconnectInterval ?
+                    server->config.reverseReconnectInterval : 15000;
+        return UA_Server_addRepeatedCallback(server, retryReverseConnectCallback, NULL,
+                                             reconnectInterval, &server->reverseConnectsCheckHandle);
+    } else if (!enabled && server->reverseConnectsCheckHandle) {
+        UA_Server_removeCallback(server, server->reverseConnectsCheckHandle);
+        server->reverseConnectsCheckHandle = 0;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+void setReverseConnectState(UA_Server *server, reverse_connect_context *context,
+                                   UA_SecureChannelState newState) {
+    if (context->state == newState)
+        return;
+
+    context->state = newState;
+
+    if (context->stateCallback)
+        context->stateCallback(server, context->handle, context->state,
+                               context->callbackContext);
+}
+
+void UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_ConnectionState state, const UA_KeyValueMap *params,
+                          UA_ByteString msg) {
+    (void)params;
+
+    UA_Server *server = (UA_Server*)application;
+
+    /* UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Reverse connect has state %d", state); */
+
+    reverse_connect_context *context = (reverse_connect_context *)*connectionContext;
+
+    context->currentConnection.state = state;
+
+    if(context->currentConnection.connectionId == 0) {
+        /* The socket is closing without being previously registered -> ignore */
+        if(state == UA_CONNECTIONSTATE_CLOSED ||
+           state == UA_CONNECTIONSTATE_CLOSING) {
+            setReverseConnectState(server, context, context->destruction ?
+                                       UA_SECURECHANNELSTATE_CLOSED :
+                                       UA_SECURECHANNELSTATE_CONNECTING);
+            return;
+        }
+
+        context->currentConnection.state = state;
+        context->currentConnection.connectionId = connectionId;
+        context->currentConnection.connectionManager = cm;
+        return;
+    }
+
+    /* The connection is closing. This is the last callback for it. */
+    if(state == UA_CONNECTIONSTATE_CLOSING && context->channel) {
+        deleteServerSecureChannel(server, context->channel);
+        context->channel = NULL;
+        setReverseConnectState(server, context, context->destruction ?
+                                   UA_SECURECHANNELSTATE_CLOSED :
+                                   UA_SECURECHANNELSTATE_CONNECTING);
+        context->currentConnection.connectionId = 0;
+        return;
+    }
+
+    if (state == UA_CONNECTIONSTATE_CLOSING) {
+        context->currentConnection.connectionId = 0;
+        setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CONNECTING);
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(state == UA_CONNECTIONSTATE_ESTABLISHED && !context->channel) {
+        /* A new connection is opening. This is the only place where
+         * createSecureChannel is used. */
+        retval = createServerSecureChannel(server, cm, connectionId, &context->channel);
+
+        if (retval == UA_STATUSCODE_GOOD) {
+            UA_LOG_INFO_CHANNEL(&server->config.logger, context->channel, "SecureChannel created");
+
+            /* Send the RHE message */
+            UA_StatusCode result = sendRHEMessage(server, connectionId, cm);
+
+            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Sending RHE returned %s", UA_StatusCode_name(result));
+
+            context->channel->state = UA_SECURECHANNELSTATE_RHE_SENT;
+
+            setReverseConnectState(server, context, UA_SECURECHANNELSTATE_RHE_SENT);
+        } else {
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "TCP %lu\t| Could not accept the connection with status %s",
+                           (unsigned long)context->currentConnection.connectionId, UA_StatusCode_name(retval));
+        }
+
+        if(retval != UA_STATUSCODE_GOOD) {
+            setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CONNECTING);
+            cm->closeConnection(cm, connectionId);
+        }
+
+        return;
+    }
+
+    /* The connection has fully opened */
+    if (context->channel) {
+        if(context->channel->state < UA_SECURECHANNELSTATE_CONNECTED)
+            context->channel->state = UA_SECURECHANNELSTATE_CONNECTED;
+
+        retval = UA_SecureChannel_processBuffer(context->channel, server,
+                                                processSecureChannelMessage, &msg);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING_CHANNEL(&server->config.logger, context->channel,
+                                   "Processing the message failed with error %s",
+                                   UA_StatusCode_name(retval));
+
+            /* Send an ERR message and close the connection */
+            UA_TcpErrorMessage error;
+            error.error = retval;
+            error.reason = UA_STRING_NULL;
+            UA_SecureChannel_sendError(context->channel, &error);
+            UA_SecureChannel_shutdown(context->channel);
+
+            setReverseConnectState(server, context, context->destruction ?
+                                       UA_SECURECHANNELSTATE_CLOSED :
+                                       UA_SECURECHANNELSTATE_CONNECTING);
+            return;
+        }
+    }
+
+    if (context->channel) {
+        setReverseConnectState(server, context, context->channel->state);
+    }
+}
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 5484892a7b5..dba6c549f09 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -89,6 +89,23 @@ typedef struct {
     UA_ConnectionManager *connectionManager;
 } UA_ServerConnection;
 
+typedef struct reverse_connect_context {
+    UA_String hostname;
+    UA_UInt16 port;
+    UA_UInt64 handle;
+
+    UA_SecureChannelState state;
+    UA_Server_ReverseConnectStateCallback stateCallback;
+    void *callbackContext;
+
+     /* If this is set to true, the state won't change to connecting on disconnect */
+    UA_Boolean destruction;
+
+    UA_ServerConnection currentConnection;
+    UA_SecureChannel *channel;
+    SLIST_ENTRY(reverse_connect_context) next;
+} reverse_connect_context;
+
 struct UA_Server {
     /* Config */
     UA_ServerConfig config;
@@ -168,6 +185,10 @@ struct UA_Server {
     /* Statistics */
     UA_SecureChannelStatistics secureChannelStatistics;
     UA_ServerDiagnosticsSummaryDataType serverDiagnosticsSummary;
+
+    SLIST_HEAD(, reverse_connect_context) reverseConnects;
+    UA_UInt64 reverseConnectsCheckHandle;
+    UA_UInt64 lastReverseConnectHandle;
 };
 
 /***********************/
@@ -366,6 +387,13 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                           const UA_KeyValueMap *params,
                           UA_ByteString msg);
 
+/* Processing for reverse connect */
+void
+UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                                 void *application, void **connectionContext,
+                                 UA_ConnectionState state, const UA_KeyValueMap *params,
+                                 UA_ByteString msg);
+
 /******************************************/
 /* Internal function calls, without locks */
 /******************************************/
@@ -761,6 +789,13 @@ UA_StatusCode
 UA_Node_insertOrUpdateDescription(UA_NodeHead *head,
                                   const UA_LocalizedText *value);
 
+
+/* Reverse connect */
+void setReverseConnectState(UA_Server *server, reverse_connect_context *context,
+                            UA_SecureChannelState newState);
+UA_StatusCode attemptReverseConnect(UA_Server *server, reverse_connect_context *context);
+UA_StatusCode setReverseConnectRetryCallback(UA_Server *server, UA_Boolean enabled);
+
 _UA_END_DECLS
 
 #endif /* UA_SERVER_INTERNAL_H_ */
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 753bf5f0bd2..290a7557e7b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -389,6 +389,8 @@ if(UA_ENABLE_ASYNCOPERATIONS)
     ua_add_test(server/check_server_asyncop.c)
 endif()
 
+ua_add_test(server/check_server_reverseconnect.c)
+
 # Test Client
 
 ua_add_test(client/check_client.c)
diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
new file mode 100644
index 00000000000..22815bb6c0d
--- /dev/null
+++ b/tests/server/check_server_reverseconnect.c
@@ -0,0 +1,370 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 2022 (c) basysKom GmbH <opensource@basyskom.com> (Author: Jannis Völker)
+ */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/types.h>
+#include <open62541/plugin/log_stdout.h>
+
+#include "server/ua_server_internal.h"
+#include "server/ua_services.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "check.h"
+#include "testing_clock.h"
+
+static int max_stop_iteration_count = 100;
+
+static UA_Server *server = NULL;
+
+static int numCallbackCalled = 0;
+static UA_SecureChannelState callbackStates[10];
+static UA_UInt64 reverseConnectHandle = 0;
+static UA_Boolean listening = false;
+static UA_Boolean rheReceived = false;
+
+UA_EventLoop *eventLoop = NULL;
+UA_ConnectionManager *connectionManager = NULL;
+
+static void listenCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                           void *application, void **connectionContext,
+                           UA_ConnectionState state,
+                           const UA_KeyValueMap *params,
+                           UA_ByteString msg) {
+    (void)cm;
+    (void)connectionId;
+    (void)application;
+    (void)connectionContext;
+    (void)params;
+    (void)msg;
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                "Listen callback was called with state %d and connection id %lu", state,
+                (unsigned long)connectionId);
+
+    if (msg.length) {
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Message: %ld %.*s",
+                    (unsigned long)msg.length, (int) msg.length, (char *)msg.data);
+        rheReceived = msg.length >= 3 && !strncmp((char *)msg.data, "RHE", 3);
+    }
+
+    listening = state == UA_CONNECTIONSTATE_ESTABLISHED;
+}
+
+static void setupListeningSocket(void) {
+    connectionManager = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
+
+    eventLoop = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    eventLoop->registerEventSource(eventLoop, &connectionManager->eventSource);
+    eventLoop->start(eventLoop);
+
+    UA_String listenHost = UA_STRING_STATIC("localhost");
+    UA_UInt16 listenPort = 4841;
+
+    UA_KeyValuePair params[3];
+    size_t paramsSize = 2;
+
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+    UA_Variant_setScalar(&params[0].value, (void *)&listenPort, &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_UInt32 bufSize = 1 << 16; /* 64kB */
+    params[1].key = UA_QUALIFIEDNAME(0, "recv-bufsize");
+    UA_Variant_setScalar(&params[1].value, &bufSize, &UA_TYPES[UA_TYPES_UINT32]);
+
+    params[2].key = UA_QUALIFIEDNAME(0, "listen-hostnames");
+    UA_Variant_setArray(&params[2].value, (void *)&listenHost, 1, &UA_TYPES[UA_TYPES_STRING]);
+    paramsSize = 3;
+    UA_KeyValueMap paramsMap;
+    paramsMap.map = params;
+    paramsMap.mapSize = paramsSize;
+
+    UA_StatusCode res = connectionManager->openConnection(connectionManager, &paramsMap, NULL, NULL,
+                             listenCallback);
+
+    ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
+
+    for (int i = 0; i < 100; ++i) {
+        eventLoop->run(eventLoop, 100);
+
+        if (listening)
+            break;
+    }
+
+    ck_assert_int_eq(listening, true);
+}
+
+static void stopListening(void) {
+    if (eventLoop) {
+        eventLoop->stop(eventLoop);
+
+        for (int i = 0; i < max_stop_iteration_count && eventLoop->state != UA_EVENTLOOPSTATE_STOPPED; ++i) {
+            UA_DateTime next = eventLoop->run(eventLoop, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        }
+
+        eventLoop->free(eventLoop);
+        eventLoop = NULL;
+        connectionManager = NULL;
+    }
+}
+
+static void setup(void) {
+    for (int i = 0; i < numCallbackCalled; ++i)
+        callbackStates[i] = UA_SECURECHANNELSTATE_FRESH;
+
+    numCallbackCalled = 0;
+    reverseConnectHandle = 0;
+    listening = false;
+    rheReceived = false;
+
+    setupListeningSocket();
+
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+}
+
+static void teardown(void) {
+    UA_Server_delete(server);
+    stopListening();
+}
+
+static void stateCallback(UA_Server *s, UA_UInt64 handle,
+                          UA_SecureChannelState state,
+                          void *context) {
+    callbackStates[numCallbackCalled++] = state;
+
+    ck_assert_ptr_eq(server, s);
+    ck_assert_ptr_eq(context, (void *)1234);
+    ck_assert_uint_eq(handle, reverseConnectHandle);
+
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                 "Reverse connect callback called with state %d", state);
+
+}
+
+START_TEST(addBeforeStart) {
+    UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
+
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
+                                      stateCallback, (void *)1234, &reverseConnectHandle);
+
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+    ck_assert_uint_ne(reverseConnectHandle, 0);
+
+    ret = UA_Server_run_startup(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    for (int i = 0; i < 100; ++i) {
+        UA_Server_run_iterate(server, true);
+        eventLoop->run(eventLoop, 1);
+
+        if (i == 10)
+            UA_Server_removeReverseConnect(server, reverseConnectHandle);
+
+        UA_fakeSleep(1);
+    }
+
+    ret = UA_Server_run_shutdown(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    ck_assert_int_eq(numCallbackCalled, 3);
+    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+    ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CLOSED);
+    ck_assert(rheReceived);
+} END_TEST
+
+START_TEST(addAfterStart) {
+    UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
+
+    ret = UA_Server_run_startup(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    for (int i = 0; i < 100; ++i) {
+        UA_Server_run_iterate(server, true);
+        eventLoop->run(eventLoop, 1);
+
+        if (i == 10) {
+            ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
+                                              stateCallback, (void *)1234, &reverseConnectHandle);
+
+            ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+            ck_assert_uint_ne(reverseConnectHandle, 0);
+        }
+
+        if (i == 20)
+            UA_Server_removeReverseConnect(server, reverseConnectHandle);
+
+        UA_fakeSleep(1);
+    }
+
+    ret = UA_Server_run_shutdown(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    ck_assert_int_eq(numCallbackCalled, 3);
+    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+    ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CLOSED);
+    ck_assert(rheReceived);
+} END_TEST
+
+START_TEST(checkReconnect) {
+    UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
+
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
+                                      stateCallback, (void *)1234, &reverseConnectHandle);
+
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+    ck_assert_uint_ne(reverseConnectHandle, 0);
+
+    ret = UA_Server_run_startup(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    for (int i = 0; i < 100; ++i) {
+        UA_Server_run_iterate(server, true);
+        if (eventLoop)
+            eventLoop->run(eventLoop, 1);
+
+        if (i == 10) {
+            ck_assert_int_eq(numCallbackCalled, 2);
+            ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+            ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+
+            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                        "Stop listening and wait for reconnect");
+            stopListening();
+
+            UA_EventLoop *e = UA_Server_getConfig(server)->eventLoop;
+            UA_DateTime next = e->run(e, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+
+            ck_assert_int_eq(numCallbackCalled, 3);
+            ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CONNECTING);
+
+            setupListeningSocket();
+
+            ck_assert(listening);
+
+            UA_fakeSleep(UA_Server_getConfig(server)->reverseReconnectInterval + 1000);
+
+            next = e->run(e, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+
+            if (eventLoop)
+                eventLoop->run(eventLoop, 1);
+
+            next = e->run(e, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+
+            if (eventLoop)
+                eventLoop->run(eventLoop, 1);
+
+            next = e->run(e, 1);
+            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+
+            ck_assert_int_eq(numCallbackCalled, 4);
+            ck_assert_int_eq(callbackStates[3], UA_SECURECHANNELSTATE_RHE_SENT);
+        }
+
+        if (i == 50)
+            UA_Server_removeReverseConnect(server, reverseConnectHandle);
+
+        UA_fakeSleep(1);
+    }
+
+    ret = UA_Server_run_shutdown(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    ck_assert_int_eq(numCallbackCalled, 5);
+    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+    ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(callbackStates[3], UA_SECURECHANNELSTATE_RHE_SENT);
+    ck_assert_int_eq(callbackStates[4], UA_SECURECHANNELSTATE_CLOSED);
+
+    ck_assert(rheReceived);
+} END_TEST
+
+START_TEST(removeOnShutdownWithConnection) {
+    UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
+
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
+                                      stateCallback, (void *)1234, &reverseConnectHandle);
+
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+    ck_assert_uint_ne(reverseConnectHandle, 0);
+
+    ret = UA_Server_run_startup(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    for (int i = 0; i < 100; ++i) {
+        UA_Server_run_iterate(server, true);
+        eventLoop->run(eventLoop, 1);
+
+        UA_fakeSleep(1);
+    }
+
+    ret = UA_Server_run_shutdown(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    ck_assert_int_eq(numCallbackCalled, 3);
+    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+    ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CLOSED);
+    ck_assert(rheReceived);
+} END_TEST
+
+START_TEST(removeOnShutdownWithoutConnection) {
+    stopListening();
+
+    UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
+
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
+                                      stateCallback, (void *)1234, &reverseConnectHandle);
+
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+    ck_assert_uint_ne(reverseConnectHandle, 0);
+
+    ret = UA_Server_run_startup(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    for (int i = 0; i < 100; ++i) {
+        UA_Server_run_iterate(server, true);
+        UA_fakeSleep(1);
+    }
+
+    ret = UA_Server_run_shutdown(server);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    ck_assert_int_eq(numCallbackCalled, 2);
+    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_CLOSED);
+} END_TEST
+
+int main(void) {
+    Suite *s = suite_create("server_reverseconnect");
+
+    TCase *tc_call = tcase_create("basics");
+    tcase_add_checked_fixture(tc_call, setup, teardown);
+    tcase_add_test(tc_call, addBeforeStart);
+    tcase_add_test(tc_call, addAfterStart);
+    tcase_add_test(tc_call, checkReconnect);
+    tcase_add_test(tc_call, removeOnShutdownWithConnection);
+    tcase_add_test(tc_call, removeOnShutdownWithoutConnection);
+
+    suite_add_tcase(s, tc_call);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tools/schema/Custom.Opc.Ua.Transport.bsd b/tools/schema/Custom.Opc.Ua.Transport.bsd
index 69eab07f6c0..ce5d9f9a6c5 100644
--- a/tools/schema/Custom.Opc.Ua.Transport.bsd
+++ b/tools/schema/Custom.Opc.Ua.Transport.bsd
@@ -19,6 +19,7 @@
     <opc:EnumeratedValue Name="OPN" Value="0x4E504F" />
     <opc:EnumeratedValue Name="CLO" Value="0x4F4C43" />
     <opc:EnumeratedValue Name="ERR" Value="0x525245" />
+    <opc:EnumeratedValue Name="RHE" Value="0x454852" />
     <opc:EnumeratedValue Name="INVALID" Value="0x0" />
   </opc:EnumeratedType>
   
@@ -44,7 +45,12 @@
 	<opc:Field Name="MaxChunkCount" TypeName="opc:UInt32" />
     <opc:Field Name="EndpointUrl" TypeName="opc:String" />
   </opc:StructuredType>
-  
+
+  <opc:StructuredType Name="TcpReverseHelloMessage">
+    <opc:Field Name="ServerUri" TypeName="opc:String" />
+    <opc:Field Name="EndpointUrl" TypeName="opc:String" />
+  </opc:StructuredType>
+
    <opc:StructuredType Name="TcpAcknowledgeMessage">
     <opc:Documentation>Acknowledge Message</opc:Documentation>
     <opc:Field Name="ProtocolVersion" TypeName="opc:UInt32" />
diff --git a/tools/schema/datatypes_transport.txt b/tools/schema/datatypes_transport.txt
index 234ab442adf..9974c36ed75 100644
--- a/tools/schema/datatypes_transport.txt
+++ b/tools/schema/datatypes_transport.txt
@@ -2,6 +2,7 @@ MessageType
 ChunkType
 TcpMessageHeader
 TcpHelloMessage
+TcpReverseHelloMessage
 TcpAcknowledgeMessage
 TcpErrorMessage
 AsymmetricAlgorithmSecurityHeader

From c1cb004483ec4d6fd8eacbc49e39b24f15006158 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Fri, 16 Dec 2022 08:12:23 +0100
Subject: [PATCH 0572/1963] fix (pubsub): exception reading message without
 payload header

The array dataSetPayloadHeader.dataSetWriterIds may only be evaluated
if the payload header is enabled.
Added test for pubsub messages without payload header.
---
 src/pubsub/ua_pubsub_reader.c         |   3 +-
 tests/pubsub/check_pubsub_subscribe.c | 141 ++++++++++++++++++++++++++
 2 files changed, 143 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 654ffed5d8b..23668b34bf3 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1339,7 +1339,8 @@ processMessageWithReader(UA_Server *server, UA_ReaderGroup *readerGroup,
     for(UA_Byte i = 0; i < totalDataSets; i++) {
         /* map dataset reader to dataset message since multiple dataset reader may read this network message
            otherwise the dataset message may be written to the wrong dataset reader.  */
-        if (reader->config.dataSetWriterId == msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i]) {
+        if (!msg->payloadHeaderEnabled ||
+            (reader->config.dataSetWriterId == msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i])) {
             UA_LOG_DEBUG_READER(&server->config.logger, reader,
                             "Process Msg with DataSetReader!");
             UA_DataSetReader_process(server, readerGroup, reader,
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 188ddff8f68..61d112bb79f 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -1605,6 +1605,146 @@ START_TEST(SinglePublishSubscribeHeartbeat) {
 
 } END_TEST
 
+START_TEST(SinglePublishSubscribeWithoutPayloadHeader) {
+        /* To check status after running both publisher and subscriber */
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+        UA_PublishedDataSetConfig pdsConfig;
+        UA_NodeId dataSetWriter;
+        UA_NodeId readerIdentifier;
+        UA_NodeId writerGroup;
+        UA_DataSetReaderConfig readerConfig;
+
+        /* Published DataSet */
+        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+        pdsConfig.name = UA_STRING("PublishedDataSet Test");
+        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Create variable to publish integer data */
+        UA_NodeId publisherNode;
+        UA_VariableAttributes attr = UA_VariableAttributes_default;
+        attr.description           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+        attr.displayName           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+        attr.dataType              = UA_TYPES[UA_TYPES_INT32].typeId;
+        UA_Int32 publisherData     = 42;
+        UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT32]);
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                           UA_QUALIFIEDNAME(1, "Published Int32"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                           attr, NULL, &publisherNode);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Data Set Field */
+        UA_NodeId dataSetFieldIdent;
+        UA_DataSetFieldConfig dataSetFieldConfig;
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType              = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Published Int32");
+        dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
+        dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
+        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+
+        /* Writer group */
+        UA_WriterGroupConfig writerGroupConfig;
+        memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+        writerGroupConfig.name               = UA_STRING("WriterGroup Test");
+        writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
+        writerGroupConfig.enabled            = UA_FALSE;
+        writerGroupConfig.writerGroupId      = WRITER_GROUP_ID;
+        writerGroupConfig.encodingMimeType   = UA_PUBSUB_ENCODING_UADP;
+        /* Message settings in WriterGroup to include necessary headers */
+        writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+        writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+        UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+        writerGroupMessage->networkMessageContentMask =
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID;
+        writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+        retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
+        UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* DataSetWriter */
+        UA_DataSetWriterConfig dataSetWriterConfig;
+        memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+        dataSetWriterConfig.name            = UA_STRING("DataSetWriter Test");
+        dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
+        dataSetWriterConfig.keyFrameCount   = 10;
+        retVal |= UA_Server_addDataSetWriter(server, writerGroup, publishedDataSetId,
+                                             &dataSetWriterConfig, &dataSetWriter);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Reader Group */
+        UA_ReaderGroupConfig readerGroupConfig;
+        memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+        readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+        retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &readerGroupId);
+        /* Data Set Reader */
+        /* Parameters to filter received NetworkMessage */
+        memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+        readerConfig.name             = UA_STRING ("DataSetReader Test");
+        UA_UInt16 publisherIdentifier = PUBLISHER_ID;
+        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+        readerConfig.publisherId.data = &publisherIdentifier;
+        readerConfig.writerGroupId    = WRITER_GROUP_ID;
+        readerConfig.dataSetWriterId  = DATASET_WRITER_ID;
+        /* Setting up Meta data configuration in DataSetReader */
+        UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+        /* FilltestMetadata function in subscriber implementation */
+        UA_DataSetMetaDataType_init (pMetaData);
+        pMetaData->name       = UA_STRING ("DataSet Test");
+        /* Static definition of number of fields size to 1 to create one
+           targetVariable */
+        pMetaData->fieldsSize = 1;
+        pMetaData->fields     = (UA_FieldMetaData*)
+            UA_Array_new(pMetaData->fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+        /* Unsigned Integer DataType */
+        UA_FieldMetaData_init (&pMetaData->fields[0]);
+        UA_NodeId_copy (&UA_TYPES[UA_TYPES_INT32].typeId,
+                        &pMetaData->fields[0].dataType);
+        pMetaData->fields[0].builtInType = UA_NS0ID_INT32;
+        pMetaData->fields[0].valueRank   = -1; /* scalar */
+        retVal |= UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
+                                             &readerIdentifier);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Add Subscribed Variables */
+        /* Variable to subscribe data */
+        UA_NodeId newnodeId;
+        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+        vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+        vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+        vAttr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), folderId,
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_FieldTargetVariable targetVar;
+        memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
+        /* For creating Targetvariable */
+        UA_FieldTargetDataType_init(&targetVar.targetVariable);
+        targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+        targetVar.targetVariable.targetNodeId = newnodeId;
+        retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
+                                                                1, &targetVar);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_FieldTargetDataType_clear(&targetVar.targetVariable);
+        UA_free(pMetaData->fields);
+
+        /* run server - publisher and subscriber */
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        checkReceived();
+} END_TEST
+
 /* Have two readers listening for the same writer */
 START_TEST(MultiPublishSubscribeInt32) {
     /* To check status after running both publisher and subscriber */
@@ -1969,6 +2109,7 @@ int main(void) {
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeBool);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribewithValidIdentifiers);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeHeartbeat);
+    tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeWithoutPayloadHeader);
     tcase_add_test(tc_pubsub_publish_subscribe, MultiPublishSubscribeInt32);
 
     /*Test cases for the standalone datasets */

From b32aa8951fd1141fe90f700d2c73f3ebfd8d536a Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 15 Dec 2022 11:14:12 +0100
Subject: [PATCH 0573/1963] fix(client): Check existence of event loop in
 UA_Client_newWithConfig

Only copy event loop logger in UA_Client_newWithConfig if an event
loop has been set in the config.
---
 src/client/ua_client.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index abb5be5af85..24cb73f5dfb 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -42,7 +42,8 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
     client->config = *config;
     /* Fix up known logger pointers now that the config has "moved" into the
      * client struct */
-    if(client->config.eventLoop->logger == &config->logger)
+    if(client->config.eventLoop &&
+       (client->config.eventLoop->logger == &config->logger))
         client->config.eventLoop->logger = &client->config.logger;
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         if(client->config.securityPolicies[i].logger == &config->logger)

From 2c1cdf44c9251f670edfcd3e881bc0044786a650 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Dec 2022 20:52:26 +0100
Subject: [PATCH 0574/1963] feat(core): Allow NULL path in UA_parseEndpointUrl

---
 include/open62541/util.h |  7 ++++---
 src/ua_util.c            | 23 ++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/include/open62541/util.h b/include/open62541/util.h
index 3f011e83892..1ed41672dc0 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -120,9 +120,10 @@ UA_KeyValueMap_merge(UA_KeyValueMap *lhs, const UA_KeyValueMap *rhs);
  *        original endpointUrl, so no memory is allocated. If an IPv6 address is
  *        given, hostname contains e.g. '[2001:0db8:85a3::8a2e:0370:7334]'
  * @param outPort Set to the port of the url or left unchanged.
- * @param outPath Set to the path if one is present in the endpointUrl.
- *        Starting or trailing '/' are NOT included in the path. The string
- *        points into the original endpointUrl, so no memory is allocated.
+ * @param outPath Set to the path if one is present in the endpointUrl. Can be
+ *        NULL. Then not path is returned. Starting or trailing '/' are NOT
+ *        included in the path. The string points into the original endpointUrl,
+ *        so no memory is allocated.
  * @return Returns UA_STATUSCODE_BADTCPENDPOINTURLINVALID if parsing failed. */
 UA_StatusCode UA_EXPORT
 UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
diff --git a/src/ua_util.c b/src/ua_util.c
index 4d559d906a9..e8173e3eb81 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -48,7 +48,7 @@ UA_readNumber(const UA_Byte *buf, size_t buflen, UA_UInt32 *number) {
 
 UA_StatusCode
 UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
-                    u16 *outPort, UA_String *outPath) {
+                    UA_UInt16 *outPort, UA_String *outPath) {
     UA_Boolean ipv6 = false;
 
     /* Url must begin with "opc.tcp://" or opc.udp:// (if pubsub enabled) */
@@ -124,18 +124,19 @@ UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
     UA_assert(curr < endpointUrl->length);
     if(endpointUrl->data[curr] != '/')
         return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
-    if(++curr == endpointUrl->length)
-        return UA_STATUSCODE_GOOD;
-    outPath->data = &endpointUrl->data[curr];
-    outPath->length = endpointUrl->length - curr;
 
-    /* Remove trailing slash from the path */
-    if(endpointUrl->data[endpointUrl->length - 1] == '/')
-        outPath->length--;
+    if(outPath && ++curr < endpointUrl->length) {
+        outPath->data = &endpointUrl->data[curr];
+        outPath->length = endpointUrl->length - curr;
 
-    /* Empty string? */
-    if(outPath->length == 0)
-        outPath->data = NULL;
+        /* Remove trailing slash from the path */
+        if(endpointUrl->data[endpointUrl->length - 1] == '/')
+            outPath->length--;
+
+        /* Empty string? */
+        if(outPath->length == 0)
+            outPath->data = NULL;
+    }
 
     return UA_STATUSCODE_GOOD;
 }

From 43b3c8a4d0b54f2a20ab12eee86a7d3aa7d4cd9f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 25 Sep 2022 22:34:51 +0200
Subject: [PATCH 0575/1963] feat(el): Small logging improvement in the TCP
 ConnectionManager

---
 arch/eventloop_posix_tcp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 167931addfe..b1fcfb10de5 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -900,13 +900,15 @@ TCP_openConnection(UA_ConnectionManager *cm,
 
 static UA_StatusCode
 TCP_eventSourceStart(UA_ConnectionManager *cm) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    if(!el)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
     /* Check the state */
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "To start the TCP ConnectionManager, it has to be "
+                     "TCP\t| To start the ConnectionManager, it has to be "
                      "registered in an EventLoop and not started yet");
         return UA_STATUSCODE_BADINTERNALERROR;
     }

From 3bd432e3ae5bd38a7c6a590f380d14bbde249fb6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Dec 2022 09:26:27 +0100
Subject: [PATCH 0576/1963] fix(core): Reset map pointer during
 UA_KeyValueMap_clear

---
 src/ua_util.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ua_util.c b/src/ua_util.c
index e8173e3eb81..5c93996609b 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -319,6 +319,7 @@ UA_KeyValueMap_clear(UA_KeyValueMap *map) {
     if(!map)
         return;
     UA_Array_delete(map->map, map->mapSize, &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    map->map = NULL;
     map->mapSize = 0;
 }
 

From 6c00ab8746b7efaefaf2315a508805a594d9f10d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Dec 2022 21:52:47 +0100
Subject: [PATCH 0577/1963] fix(arch): Fix logging strings in
 arch/eventloop_posix_udp.c

---
 arch/eventloop_posix_udp.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 9054d46b323..e072a18608d 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -173,9 +173,9 @@ setLoopBackData(UA_SOCKET sockfd, UA_Boolean enableLoopback,
     {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation failed. Loopback setup failed: "
+                         "UDP %u\t| Loopback setup failed: "
                          "Cannot set socket option IP_MULTICAST_LOOP. Error: %s",
-                         errno_str));
+                         (unsigned)sockfd, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_GOOD;
@@ -199,9 +199,9 @@ setTimeToLive(UA_SOCKET sockfd, UA_UInt32 messageTTL,
     {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                           "PubSub Connection creation problem. Time to live setup failed: "
+                           "UDP %u\t| Time to live setup failed: "
                            "Cannot set socket option IP_MULTICAST_TTL. Error: %s",
-                           errno_str));
+                           (unsigned)sockfd, errno_str));
     }
 }
 
@@ -216,9 +216,9 @@ setReuseAddress(UA_SOCKET sockfd, UA_Boolean enableReuse, const UA_Logger *logge
                      (const char*)&enableReuseVal, sizeof(enableReuseVal)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                           "PubSub Connection creation problem. Reuse address setup failed: "
+                           "UDP %u\t| Reuse address setup failed: "
                            "Cannot set socket option SO_REUSEADDR. Error: %s",
-                           errno_str));
+                           (unsigned)sockfd, errno_str));
     }
 }
 
@@ -231,8 +231,9 @@ setSocketPriority(UA_SOCKET sockfd, UA_UInt32 *socketPriority,
                       socketPriority, sizeof(*socketPriority)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation problem. Priority setup failed: "
-                         "Cannot set socket option SO_PRIORITY. Error: %s", errno_str));
+                         "UDP %u\t| Socket priority setup failed: "
+                         "Cannot set socket option SO_PRIORITY. Error: %s",
+                         (unsigned)sockfd, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_GOOD;
@@ -360,8 +361,8 @@ setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValue
 
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Connection creation problem. "
-                         "Interface configuration preparation failed.");
+                         "UDP %u\t| Interface configuration preparation failed",
+                         (unsigned)socket);
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
@@ -401,8 +402,7 @@ setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sock
 
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Connection creation problem. "
-                         "Interface configuration preparation failed.");
+                         "UDP\t| Interface configuration preparation failed.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
@@ -410,7 +410,7 @@ setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sock
                      &ipMulticastRequest.ipv4, sizeof(ipMulticastRequest.ipv4)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection regist failed. IP membership setup failed: "
+                         "UDP\t| Multicast IP membership setup failed: "
                          "Cannot set socket option IP_ADD_MEMBERSHIP. Error: %s",
                          errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -446,8 +446,7 @@ setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sock
         ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
         if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Connection creation problem. "
-                         "Interface configuration preparation failed.");
+                         "UDP\t| Interface configuration preparation failed.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
@@ -455,7 +454,7 @@ setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sock
                      &ipMulticastRequest.ipv6,sizeof(ipMulticastRequest.ipv6)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection regist failed. IP membership setup failed: "
+                         "UDP\t| Multicast IP membership setup failed: "
                          "Cannot set socket option IP_ADD_MEMBERSHIP. Error: %s",
                          errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -489,8 +488,7 @@ setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValu
         ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
         if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "PubSub Connection creation problem. "
-                         "Interface configuration preparation failed.");
+                         "UDP\t| Interface configuration preparation failed.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
@@ -503,8 +501,7 @@ setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValu
 #endif
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "Opening UDP connection failed: "
-                         "Cannot set socket option IPV6_MULTICAST_IF. Error: %s",
+                         "UDP\t| Cannot set socket option IPV6_MULTICAST_IF. Error: %s",
                          errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }

From 70ef6409a553d3abdeb11f61c8aa29561881c1fc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Dec 2022 22:04:58 +0100
Subject: [PATCH 0578/1963] refactor(el): Simplify the EventLoop UDP interface

---
 arch/eventloop_posix_udp.c           | 115 ++++++------
 include/open62541/plugin/eventloop.h |  55 +++---
 tests/check_eventloop_udp.c          | 252 ++++++++++++---------------
 3 files changed, 185 insertions(+), 237 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index e072a18608d..8a68701fd88 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -267,9 +267,8 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *connectionProperties,
 
     UA_String hostnameParam = UA_STRING("hostname");
     UA_String portParam = UA_STRING("port");
-    UA_String listenHostnamesParam = UA_STRING("listen-hostnames");
-    UA_String listenPortParam = UA_STRING("listen-port");
-    UA_String networkInterfaceParam = UA_STRING("network-interface");
+    UA_String listenParam = UA_STRING("listen");
+    UA_String interfaceParam = UA_STRING("interface");
 
 #ifdef __linux__
     UA_String socketPriorityParam = UA_STRING("sockpriority");
@@ -295,29 +294,22 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *connectionProperties,
 #ifdef __linux__
         } else if(UA_String_equal(&prop->key.name, &socketPriorityParam)){
             if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                UA_UInt32 *socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
-                if(!socketPriority) {
-                    UA_LOG_WARNING(logger, UA_LOGCATEGORY_SERVER,
-                                   "PubSub Connection creation. Could not set socket priority due to out of memory.");
-                    continue;
-                }
-                UA_UInt32_copy((UA_UInt32 *) prop->value.data, socketPriority);
-                setSocketPriority(socket, socketPriority, logger);
-                UA_free(socketPriority);
+                UA_UInt32 socketPriority = *(UA_UInt32 *) prop->value.data;
+                setSocketPriority(socket, &socketPriority, logger);
             }
 #endif
         } else if (UA_String_equal(&prop->key.name, &hostnameParam) ||
                    UA_String_equal(&prop->key.name, &portParam) ||
-                   UA_String_equal(&prop->key.name, &listenHostnamesParam) ||
-                   UA_String_equal(&prop->key.name, &listenPortParam) ||
-                   UA_String_equal(&prop->key.name, &networkInterfaceParam)) {
+                   UA_String_equal(&prop->key.name, &listenParam) ||
+                   UA_String_equal(&prop->key.name, &interfaceParam)) {
                 /* ignore, required args are handled elsewhere explicitly */
         } else {
             UA_LOG_WARNING(logger, UA_LOGCATEGORY_SERVER,
-                           "PubSub Connection creation. Unknown connection parameter: '%.*s'.",
+                           "UDP\t| Unknown connection parameter: '%.*s'.",
                            (int)prop->key.name.length, (char*)prop->key.name.data);
         }
     }
+
     /* Set the socket options also there might be external requirements for
      * socket options how to handle and set those either
      * - passed in parameters
@@ -1171,8 +1163,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
 
     /* Get the socket */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params,
-                                 UA_QUALIFIEDNAME(0, "listen-port"),
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "port"),
                                  &UA_TYPES[UA_TYPES_UINT16]);
     if(!port) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -1180,48 +1171,42 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* Get the hostnames configuration */
-    const UA_Variant *hostNames =
-        UA_KeyValueMap_get(params,
-                           UA_QUALIFIEDNAME(0, "listen-hostnames"));
-    if(!hostNames) {
-        /* No hostnames configured -> listen on all interfaces*/
-        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                    "UDP\t| Listening on all interfaces");
+    /* Get the hostname configuration */
+    const UA_Variant *hostname =
+        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "hostname"));
+
+    /* No hostname configured -> listen on all interfaces */
+    if(!hostname || (!UA_Variant_isScalar(hostname) && hostname->arrayLength == 0))  {
+        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Listening on all interfaces");
         return UDP_registerListenSockets(cm, NULL, *port, params, application,
                                          context, connectionCallback, validate);
     }
 
-    /* Correct datatype for the hostnames? */
-    if(hostNames->type != &UA_TYPES[UA_TYPES_STRING] ||
-       UA_Variant_isScalar(hostNames)) {
+    /* Correct datatype for the hostname? */
+    if(hostname->type != &UA_TYPES[UA_TYPES_STRING]) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| The hostnames have to be an array of string");
+                     "UDP\t| The hostname parameter needs to be of type string");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    size_t interfaces = hostNames->arrayLength;
-    if(interfaces == 0) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, *port, params, application,
-                                         context, connectionCallback, validate);
-    }
+    size_t hostNamesSize = hostname->arrayLength;
+    if(UA_Variant_isScalar(hostname))
+        hostNamesSize = 1;
 
-    UA_StatusCode rv = UA_STATUSCODE_GOOD;
     /* Iterate over the configured hostnames */
-    UA_String *hostStrings = (UA_String*)hostNames->data;
-    for(size_t i = 0; i < hostNames->arrayLength; i++) {
-        char hostname[512];
-        if(hostStrings[i].length >= sizeof(hostname))
+    UA_String *hostStrings = (UA_String*)hostname->data;
+    for(size_t i = 0; i < hostNamesSize; i++) {
+        char hn[512];
+        if(hostStrings[i].length >= sizeof(hn))
             continue;
-        memcpy(hostname, hostStrings[i].data, hostStrings->length);
-        hostname[hostStrings->length] = '\0';
-        rv = UDP_registerListenSockets(cm, hostname, *port, params, application,
-                                  context, connectionCallback, validate);
-        if(rv != UA_STATUSCODE_GOOD) {
+        memcpy(hn, hostStrings[i].data, hostStrings->length);
+        hn[hostStrings->length] = '\0';
+        UA_StatusCode rv =
+            UDP_registerListenSockets(cm, hn, *port, params, application,
+                                      context, connectionCallback, validate);
+        if(rv != UA_STATUSCODE_GOOD)
             return rv;
-        }
     }
 
     return UA_STATUSCODE_GOOD;
@@ -1232,26 +1217,26 @@ UDP_openConnection(UA_ConnectionManager *cm,
                    const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
-
-    const UA_Variant *validationValue = UA_KeyValueMap_get(params,
-                                               UA_QUALIFIEDNAME(0, "validate"));
     UA_Boolean validate = false;
-    if(validationValue) {
-        if(UA_Variant_hasScalarType(validationValue, &UA_TYPES[UA_TYPES_BOOLEAN])) {
-            validate = *(UA_Boolean *)validationValue->data;
-        }
-    }
-    /* If the "port"-parameter is defined, then try to open a send connection.
-     * Otherwise try to open a socket that listens for incoming TCP
-     * connections. */
-    const UA_Variant *val = UA_KeyValueMap_get(params,
-                                               UA_QUALIFIEDNAME(0, "port"));
-    if(val) {
-        return UDP_openSendConnection(cm, params, application, context,
-                                      connectionCallback, validate);
-    } else {
+    const UA_Variant *validationValue =
+        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "validate"));
+    if(validationValue &&
+       UA_Variant_hasScalarType(validationValue, &UA_TYPES[UA_TYPES_BOOLEAN]))
+        validate = *(UA_Boolean *)validationValue->data;
+
+    UA_Boolean listen = false;
+    const UA_Variant *listenValue =
+        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "listen"));
+    if(listenValue &&
+       UA_Variant_hasScalarType(listenValue, &UA_TYPES[UA_TYPES_BOOLEAN]))
+        listen = *(UA_Boolean *)listenValue->data;
+
+    if(listen) {
         return UDP_openReceiveConnection(cm, params, application, context,
                                          connectionCallback, validate);
+    } else {
+        return UDP_openSendConnection(cm, params, application, context,
+                                      connectionCallback, validate);
     }
 }
 
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 405a29c00c9..1779faa7b0f 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -478,48 +478,45 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
 /**
  * UDP Connection Manager
  * ~~~~~~~~~~~~~~~~~~~~~~
- * Listens on the network and manages UDP connections. This should be available
- * for all architectures.
+ *
+ * Manages UDP connections. This should be available for all architectures.
  *
  * The configuration parameters have to set before calling _start to take
  * effect.
  *
  * Configuration Parameters:
-
+ *
  * - 0:recv-bufsize [uint32]: Size of the buffer that is allocated for receiving
  *                            messages (default 64kB).
  *
  * Open Connection Parameters:
  *
- * - Active Connection
- * -   0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
- * -   0:port [uint16]: Port of the target host (required).
- * - Passive Connection
- * -   0:listen-port [uint16]: Port to listen for new connections (default: do not
- *                           listen on any port).
- * -   0:listen-hostnames [string | string array]: Hostnames of the devices to
- *                                               listen on (default: listen on
- *                                               all devices).
- *
- * - 0:network-interface [string]: Network interface to listen on or send through when using
- *                                 multicast addresses
- * - 0:ttl [uint32]: Multicast time to live, (optional, default: 1 - meaning multicast is
- *                   available only to the local subnet).
+ * - 0:listen [boolean]: Use the connection for listening or for sending
+ *       (default: false)
+ * - 0:hostname [string | string array]: Hostname (or IPv4/v6 address) for
+ *       sending or receiving. A scalar is required for sending. For listening a
+ *       string array for the list-hostnames is possible as well (default: list
+ *       on all hostnames).
+ * - 0:port [uint16]: Port for sending or listening (required).
+ * - 0:interface [string]: Network interface for listening or sending (e.g. when
+ *       using multicast addresses)
+ * - 0:ttl [uint32]: Multicast time to live, (optional, default: 1 - meaning
+ *       multicast is available only to the local subnet).
  * - 0:loopback [boolean]: Whether or not to use multicast loopback, enabling
- *                         local interfaces belonging to the multicast group
- *                         to receive packages. (optional, default: enabled).
- * - 0:reuse [boolean]: Set reuse address -> enables sharing of the same
- *                      listening address on different sockets (optional, default: disabled).
- * - 0:sockpriority [uint32]: The socket priority (optional) - only available on linux.
- *                            packets with a higher priority may be
- *                            processed first depending on the selected device queueing
- *                            discipline.  Setting a priority outside the range 0 to 6
- *                            requires the CAP_NET_ADMIN capability.
- * - 0:validate [boolean]: If true, the connection setup will act as a dry-run without
- *                         actually creating any connection but solely validating the
- *                         provided parameters, hostname(s) and port. (optional, default: false)
+ *       local interfaces belonging to the multicast group to receive packages.
+ *       (default: enabled).
+ * - 0:reuse [boolean]: Enables sharing of the same listening address on
+ *       different sockets (default: disabled).
+ * - 0:sockpriority [uint32]: The socket priority (optional) - only available on
+ *       linux. packets with a higher priority may be processed first depending
+ *       on the selected device queueing discipline. Setting a priority outside
+ *       the range 0 to 6 requires the CAP_NET_ADMIN capability (on Linux).
+ * - 0:validate [boolean]: If true, the connection setup will act as a dry-run
+ *       without actually creating any connection but solely validating the
+ *       provided parameters (default: false)
  *
  * Connection Callback Paramters:
+ *
  * - 0:remote-hostname [string]: When a new connection is opened by listening on
  *                               a port, the first callback contains the remote
  *                               hostname parameter.
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index 41d1d4a0192..ee4c20ad11c 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -72,16 +72,15 @@ START_TEST(listenUDP) {
 
     TestContext testContext = {0};
 
+    UA_Boolean listen = true;
     UA_UInt16 port = 4840;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
 
-    UA_KeyValuePair params[1];
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    params[0].value = portVar;
-    UA_KeyValueMap paramsMap;
-    paramsMap.map = params;
-    paramsMap.mapSize = 1;
+    UA_KeyValuePair params[2];
+    UA_KeyValueMap paramsMap = {2, params};
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
 
@@ -109,113 +108,91 @@ START_TEST(listenUDP) {
 } END_TEST
 
 START_TEST(connectUDPValidationSucceeds) {
-        UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
-        el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-        el->registerEventSource(el, &cm->eventSource);
-
-        UA_UInt16 port = 30000;
-        UA_Variant portVar;
-        UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-
-        UA_Boolean validate = true;
-        UA_Variant validateVar;
-        UA_Variant_setScalar(&validateVar, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
 
+    UA_UInt16 port = 30000;
+    UA_Boolean validate = true;
+    UA_Boolean listen = true;
 
-        UA_KeyValuePair params[3];
-        params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-        params[0].value = portVar;
+    UA_KeyValuePair params[4];
+    UA_KeyValueMap paramsMap = {4, params};
 
-        UA_String hostname = UA_STRING("127.0.0.1");
-        params[1].key = UA_QUALIFIEDNAME(0, "listen-hostnames");
-        UA_Variant_setArray(&params[1].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
 
-        params[2].key = UA_QUALIFIEDNAME(0, "validate");
-        params[2].value = validateVar;
+    UA_String hostname = UA_STRING("127.0.0.1");
+    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setArray(&params[1].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
 
-        TestContext testContext;
-        testContext.connCount = 0;
+    params[2].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&params[2].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
-        UA_KeyValueMap paramsMap;
-        paramsMap.map = params;
-        paramsMap.mapSize = 3;
+    params[3].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[3].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
-        UA_StatusCode retval =
-            cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    TestContext testContext;
+    testContext.connCount = 0;
 
-        /* Open a client connection */
-        clientId = 0;
-        UA_String targetHost = UA_STRING("localhost");
-        params[0].key = UA_QUALIFIEDNAME(0, "port");
-        params[0].value = portVar;
-        params[1].key = UA_QUALIFIEDNAME(0, "hostname");
-        UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+    UA_StatusCode retval =
+        cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-        params[2].key = UA_QUALIFIEDNAME(0, "validate");
-        params[2].value = validateVar;
+    /* Open a client connection */
+    clientId = 0;
+    listen = false;
+    UA_String targetHost = UA_STRING("localhost");
+    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-        paramsMap.map = params;
-        paramsMap.mapSize = 3;
+    retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-        retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        el->free(el);
-        el = NULL;
-    } END_TEST
+    el->free(el);
+    el = NULL;
+}
+END_TEST
 
 START_TEST(connectUDPValidationFails) {
-        UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
-        el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-        el->registerEventSource(el, &cm->eventSource);
-
-        UA_UInt16 port = 30000;
-        UA_Variant portVar;
-        UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-
-        UA_Boolean validate = true;
-        UA_Variant validateVar;
-        UA_Variant_setScalar(&validateVar, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
+    el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
 
+    UA_UInt16 port = 30000;
+    UA_Boolean validate = true;
 
-        UA_KeyValuePair params[3];
-        params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-        params[0].value = portVar;
+    UA_KeyValuePair params[3];
+    UA_KeyValueMap paramsMap = {3, params};
 
-        UA_String hostname = UA_STRING("300.300.300.300");
-        params[1].key = UA_QUALIFIEDNAME(0, "listen-hostnames");
-        UA_Variant_setArray(&params[1].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
 
-        params[2].key = UA_QUALIFIEDNAME(0, "validate");
-        params[2].value = validateVar;
+    UA_String hostname = UA_STRING("300.300.300.300");
+    params[1].key = UA_QUALIFIEDNAME(0, "hostnames");
+    UA_Variant_setArray(&params[1].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
 
-        TestContext testContext;
-        testContext.connCount = 0;
+    params[2].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&params[2].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
-        UA_KeyValueMap paramsMap;
-        paramsMap.map = params;
-        paramsMap.mapSize = 3;
+    TestContext testContext;
+    testContext.connCount = 0;
 
-        UA_StatusCode retval =
-            cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
+    UA_StatusCode retval =
+        cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
 
-        /* Open a client connection */
-        clientId = 0;
-        UA_String targetHost = UA_STRING("localho");
-        params[0].key = UA_QUALIFIEDNAME(0, "port");
-        params[0].value = portVar;
-        params[1].key = UA_QUALIFIEDNAME(0, "hostname");
-        UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+    /* Open a client connection */
+    clientId = 0;
+    UA_String targetHost = UA_STRING("localho");
+    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
-        params[2].key = UA_QUALIFIEDNAME(0, "validate");
-        params[2].value = validateVar;
+    retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
 
-        retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
-        el->free(el);
-        el = NULL;
-    } END_TEST
+    el->free(el);
+    el = NULL;
+}
+END_TEST
 
 START_TEST(connectUDP) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
@@ -224,16 +201,18 @@ START_TEST(connectUDP) {
     el->start(el);
 
     UA_UInt16 port = 30000;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_Boolean listen = true;
+    UA_String targetHost = UA_STRING("localhost");
 
-    UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    params[0].value = portVar;
-    UA_KeyValueMap paramsMap;
-    paramsMap.map = params;
-    paramsMap.mapSize = 1;
+    UA_KeyValuePair params[3];
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    params[2].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setScalar(&params[2].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
+    UA_KeyValueMap paramsMap = {2, params}; /* hide the third parameter */
     TestContext testContext;
     testContext.connCount = 0;
 
@@ -244,15 +223,8 @@ START_TEST(connectUDP) {
     size_t listenSockets = testContext.connCount;
 
     /* Open a client connection */
-    clientId = 0;
-    UA_String targetHost = UA_STRING("localhost");
-    params[0].key = UA_QUALIFIEDNAME(0, "port");
-    params[0].value = portVar;
-    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
-    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
-
-    paramsMap.mapSize = 2;
-
+    listen = false;
+    paramsMap.mapSize = 3;
     retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     for(size_t i = 0; i < 2; i++) {
@@ -315,15 +287,14 @@ START_TEST(udpTalkerAndListener) {
 
     /* Open a listener connection */
     UA_UInt16 port = 30000;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    params[0].value = portVar;
+    UA_Boolean listen = true;
 
-    UA_KeyValueMap paramsMap;
-    paramsMap.map = params;
-    paramsMap.mapSize = 1;
+    UA_KeyValuePair params[3];
+    UA_KeyValueMap paramsMap = {2, params}; /* Hide some parameters */
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     TestContext testContext;
     testContext.connCount = 0;
@@ -337,14 +308,12 @@ START_TEST(udpTalkerAndListener) {
 
     /* Open a talker connection */
     clientId = 0;
+    listen = false;
 
     UA_String targetHost = UA_STRING("localhost");
-    params[0].key = UA_QUALIFIEDNAME(0, "port");
-    params[0].value = portVar;
-    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
-    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
-
-    paramsMap.mapSize = 2;
+    params[2].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setScalar(&params[2].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+    paramsMap.mapSize = 3;
 
     retval = cmTalker->openConnection(cmTalker, &paramsMap, NULL, &testContext,
                                       connectionCallback);
@@ -428,20 +397,21 @@ START_TEST(udpTalkerAndListenerDifferentDestination) {
 
     /* Open a listener connection */
     UA_UInt16 port = 30000;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_KeyValuePair listenParams[2];
-    listenParams[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    listenParams[0].value = portVar;
-    UA_KeyValueMap listenParamsMap;
-    listenParamsMap.map = listenParams;
-    listenParamsMap.mapSize = 1;
+    UA_Boolean listen = true;
+
+    UA_KeyValuePair params[3];
+    UA_KeyValueMap paramsMap = {2, params}; /* hide some parameters */
+
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     TestContext testContext;
     testContext.connCount = 0;
 
     UA_StatusCode retval =
-        cmListener->openConnection(cmListener, &listenParamsMap, NULL, &testContext,
+        cmListener->openConnection(cmListener, &paramsMap, NULL, &testContext,
                                    connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -449,18 +419,14 @@ START_TEST(udpTalkerAndListenerDifferentDestination) {
 
     /* Open a talker connection */
     clientId = 0;
+    listen = false;
 
-    UA_KeyValuePair connectionParams[2];
     UA_String connectionTargetHost = UA_STRING("localhost");
-    connectionParams[0].key = UA_QUALIFIEDNAME(0, "port");
-    connectionParams[0].value = portVar;
-    connectionParams[1].key = UA_QUALIFIEDNAME(0, "hostname");
-    UA_Variant_setScalar(&connectionParams[1].value, &connectionTargetHost, &UA_TYPES[UA_TYPES_STRING]);
-    UA_KeyValueMap connectionParamsMap;
-    connectionParamsMap.map = connectionParams;
-    connectionParamsMap.mapSize = 2;
-
-    retval = cmTalker->openConnection(cmTalker, &connectionParamsMap, NULL, &testContext,
+    params[2].key = UA_QUALIFIEDNAME(0, "hostname");
+    UA_Variant_setScalar(&params[2].value, &connectionTargetHost, &UA_TYPES[UA_TYPES_STRING]);
+    paramsMap.mapSize = 3;
+
+    retval = cmTalker->openConnection(cmTalker, &paramsMap, NULL, &testContext,
                                       connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -483,7 +449,7 @@ START_TEST(udpTalkerAndListenerDifferentDestination) {
     UA_KeyValuePair sendParams[2];
     UA_String sendTargetHost = UA_STRING("127.0.0.1");
     sendParams[0].key = UA_QUALIFIEDNAME(0, "port");
-    sendParams[0].value = portVar;
+    UA_Variant_setScalar(&sendParams[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
     sendParams[1].key = UA_QUALIFIEDNAME(0, "hostname");
     UA_Variant_setScalar(&sendParams[1].value, &sendTargetHost, &UA_TYPES[UA_TYPES_STRING]);
 

From 41b86a7b7d49b10ab64f33f9fb3bd57bb2cc944e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 11:23:19 +0100
Subject: [PATCH 0579/1963] refactor(el): Simplify use of UDP
 getNetworkInterfaceFromParams

---
 arch/eventloop_posix_udp.c | 132 ++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 81 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 8a68701fd88..39f0e23dc85 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -99,21 +99,14 @@ getHostAndPortFromParams(const UA_KeyValueMap *params,
     return 1;
 }
 
-static int
-getNetworkInterfaceFromParams(const UA_KeyValueMap *params,
-                              UA_String *outNetworkInterface, const UA_Logger *logger) {
+static void
+getNetworkInterfaceFromParams(const UA_KeyValueMap *params, UA_String *outIf) {
     /* Prepare the networkinterface string */
     const UA_String *networkInterface = (const UA_String*)
-        UA_KeyValueMap_getScalar(params,
-                                 UA_QUALIFIEDNAME(0, "network-interface"),
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "network-interface"),
                                  &UA_TYPES[UA_TYPES_STRING]);
-    if(!networkInterface) {
-        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| No network interface found");
-        return 0;
-    }
-    UA_String_copy(networkInterface, outNetworkInterface);
-    return 1;
+    if(networkInterface)
+        *outIf = *networkInterface;
 }
 
 static int
@@ -329,28 +322,17 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *connectionProperties,
 static UA_StatusCode
 setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValueMap *params,
                        const UA_Logger *logger) {
-    struct in_addr address = addr->sin_addr;
-
     IpMulticastRequest ipMulticastRequest;
-    ipMulticastRequest.ipv4.imr_multiaddr = address;
-    /* default outgoing interface ANY */
-    ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
+    ipMulticastRequest.ipv4.imr_multiaddr = addr->sin_addr;
+    ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY); /* default ANY */
 
+    /* Use a defined network interface */
     UA_String netif = UA_STRING_NULL;
-    int foundInterface = getNetworkInterfaceFromParams(params, &netif, logger);
-    if(foundInterface < 0) {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Opening a connection failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    if(netif.length > 0) {
+    getNetworkInterfaceFromParams(params, &netif);
+    if(!UA_String_isEmpty(&netif)) {
         UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
         memcpy(interfaceAsChar, netif.data, netif.length);
         interfaceAsChar[netif.length] = 0;
-
-        UA_String_clear(&netif);
-
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
                          "UDP %u\t| Interface configuration preparation failed",
@@ -358,48 +340,50 @@ setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValue
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
-    setsockopt(socket, IPPROTO_IP, IP_MULTICAST_IF,
+
+    int res = setsockopt(socket, IPPROTO_IP, IP_MULTICAST_IF,
 #ifdef _WIN32
-               (const char *)&ipMulticastRequest.ipv4.imr_interface, sizeof(struct in_addr));
+                         (const char *)&ipMulticastRequest.ipv4.imr_interface,
 #else
-               &ipMulticastRequest.ipv4.imr_interface, sizeof(struct in_addr));
+                         &ipMulticastRequest.ipv4.imr_interface,
 #endif
+                         sizeof(struct in_addr));
+    if(res < 0) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
+                         "UDP\t| Multicast IP membership setup failed: "
+                         "Cannot set socket option IP_MULTICAST_IF. Error: %s",
+                         errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
 setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sockaddr_in *addr,
                          const UA_Logger *logger) {
-    struct in_addr address = addr->sin_addr;
-
     IpMulticastRequest ipMulticastRequest;
-    ipMulticastRequest.ipv4.imr_multiaddr = address;
-    /* default outgoing interface ANY */
-    ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
+    ipMulticastRequest.ipv4.imr_multiaddr = addr->sin_addr;
+    ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY); /* default ANY */
 
+    /* Use a defined interface */
     UA_String netif = UA_STRING_NULL;
-    int foundInterface = getNetworkInterfaceFromParams(params, &netif, logger);
-    if(foundInterface < 0) {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Opening a connection failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    if(netif.length > 0) {
+    getNetworkInterfaceFromParams(params, &netif);
+    if(!UA_String_isEmpty(&netif)) {
         UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
         memcpy(interfaceAsChar, netif.data, netif.length);
         interfaceAsChar[netif.length] = 0;
-
-        UA_String_clear(&netif);
-
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
                          "UDP\t| Interface configuration preparation failed.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
-    if(UA_setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                     &ipMulticastRequest.ipv4, sizeof(ipMulticastRequest.ipv4)) < 0) {
+
+    int res = UA_setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                            &ipMulticastRequest.ipv4, sizeof(ipMulticastRequest.ipv4));
+    if(res < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                          "UDP\t| Multicast IP membership setup failed: "
@@ -407,6 +391,7 @@ setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sock
                          errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -414,27 +399,17 @@ setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sock
 static UA_StatusCode
 setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sockaddr_in6 *addr,
                          const UA_Logger *logger) {
-
-    struct in6_addr address = addr->sin6_addr;
-
     IpMulticastRequest ipMulticastRequest;
-    ipMulticastRequest.ipv6.ipv6mr_multiaddr = address;
-    /* default outgoing interface ANY */
-    ipMulticastRequest.ipv6.ipv6mr_interface = 0;
+    ipMulticastRequest.ipv6.ipv6mr_multiaddr = addr->sin6_addr;
+    ipMulticastRequest.ipv6.ipv6mr_interface = 0; /* default ANY interface */
 
+    /* Bind to a defined interface */
     UA_String netif = UA_STRING_NULL;
-    int foundInterface = getNetworkInterfaceFromParams(params, &netif, logger);
-    if(foundInterface < 0) {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Opening a connection failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    if(netif.length > 0) {
+    getNetworkInterfaceFromParams(params, &netif);
+    if(!UA_String_isEmpty(&netif)) {
         UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
         memcpy(interfaceAsChar, netif.data, netif.length);
         interfaceAsChar[netif.length] = 0;
-
         ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
         if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
@@ -442,6 +417,7 @@ setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sock
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
+
     if(UA_setsockopt(socket, IPPROTO_IPV6,IPV6_JOIN_GROUP,
                      &ipMulticastRequest.ipv6,sizeof(ipMulticastRequest.ipv6)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -457,26 +433,17 @@ setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sock
 static UA_StatusCode
 setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValueMap *params,
                        const UA_Logger *logger) {
-    struct in6_addr address = addr->sin6_addr;
-
     IpMulticastRequest ipMulticastRequest;
-    ipMulticastRequest.ipv6.ipv6mr_multiaddr = address;
-    /* default outgoing interface ANY */
-    ipMulticastRequest.ipv6.ipv6mr_interface = 0;
+    ipMulticastRequest.ipv6.ipv6mr_multiaddr = addr->sin6_addr;
+    ipMulticastRequest.ipv6.ipv6mr_interface = 0; /* default ANY interface */
 
+    /* Use a defined network interface */
     UA_String netif = UA_STRING_NULL;
-    int foundInterface = getNetworkInterfaceFromParams(params, &netif, logger);
-    if(foundInterface < 0) {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Opening a connection failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    if(netif.length > 0) {
+    getNetworkInterfaceFromParams(params, &netif);
+    if(!UA_String_isEmpty(&netif)) {
         UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
         memcpy(interfaceAsChar, netif.data, netif.length);
         interfaceAsChar[netif.length] = 0;
-
         ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
         if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
@@ -485,12 +452,14 @@ setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValu
         }
     }
 
-    if(setsockopt(socket, IPPROTO_IPV6, IPV6_MULTICAST_IF,
+    int res = setsockopt(socket, IPPROTO_IPV6, IPV6_MULTICAST_IF,
 #ifdef _WIN32
-        (const char *)&ipMulticastRequest.ipv6.ipv6mr_interface, sizeof(ipMulticastRequest.ipv6.ipv6mr_interface)) < 0) {
+                         (const char *)&ipMulticastRequest.ipv6.ipv6mr_interface,
 #else
-        &ipMulticastRequest.ipv6.ipv6mr_interface, sizeof(ipMulticastRequest.ipv6.ipv6mr_interface)) < 0) {
+                         &ipMulticastRequest.ipv6.ipv6mr_interface,
 #endif
+                         sizeof(ipMulticastRequest.ipv6.ipv6mr_interface));
+    if(res < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                          "UDP\t| Cannot set socket option IPV6_MULTICAST_IF. Error: %s",
@@ -499,6 +468,7 @@ setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValu
     }
     return UA_STATUSCODE_GOOD;
 }
+
 #endif
 
 static UA_StatusCode

From afecf28b34247f5b0edbde819b98548c795fc58f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 11:02:51 +0100
Subject: [PATCH 0580/1963] fix(el): Fix failure case for UDP connection lookup

---
 arch/eventloop_posix_udp.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 39f0e23dc85..82e964ec96c 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -920,10 +920,13 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     tmp_poll_fd.fd = (UA_FD)connectionId;
     tmp_poll_fd.events = UA_POLLOUT;
 
+    /* Look up the registered UDP socket */
+    UDP_FD *ufd = (UDP_FD *)UDP_findRegisteredFD((UDPConnectionManager *)cm, connectionId);
+    if(!ufd)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
     /* Send the full buffer. This may require several calls to send */
     size_t nWritten = 0;
-
-    UDP_FD *ufd = (UDP_FD *) UDP_findRegisteredFD((UDPConnectionManager *)cm, connectionId);
     do {
         ssize_t n = 0;
         do {

From fe1d864f777b9c7db8b639e00fed49945489bb1a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 11:03:29 +0100
Subject: [PATCH 0581/1963] fix(el): Require that the UDP EventSource is
 started before opening connections

---
 arch/eventloop_posix_udp.c  | 11 +++++++++--
 tests/check_eventloop_udp.c | 10 ++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 82e964ec96c..edc562aeef5 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -1186,10 +1186,17 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
 }
 
 static UA_StatusCode
-UDP_openConnection(UA_ConnectionManager *cm,
-                   const UA_KeyValueMap *params,
+UDP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STARTED) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Cannot open a connection for a "
+                     "ConnectionManager that is not started");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     UA_Boolean validate = false;
     const UA_Variant *validationValue =
         UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "validate"));
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index ee4c20ad11c..76e501e3169 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -111,6 +111,7 @@ START_TEST(connectUDPValidationSucceeds) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
     el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
 
     UA_UInt16 port = 30000;
     UA_Boolean validate = true;
@@ -148,6 +149,10 @@ START_TEST(connectUDPValidationSucceeds) {
     retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED) {
+        el->run(el, 100);
+    }
     el->free(el);
     el = NULL;
 }
@@ -157,6 +162,7 @@ START_TEST(connectUDPValidationFails) {
     UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udpCM"));
     el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
     el->registerEventSource(el, &cm->eventSource);
+    el->start(el);
 
     UA_UInt16 port = 30000;
     UA_Boolean validate = true;
@@ -189,6 +195,10 @@ START_TEST(connectUDPValidationFails) {
     retval = cm->openConnection(cm, &paramsMap, NULL, &testContext, connectionCallback);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONREJECTED);
 
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED) {
+        el->run(el, 100);
+    }
     el->free(el);
     el = NULL;
 }

From ac7ab8fa43904f2cebf184f4253cb5d7e03ca7d6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Dec 2022 09:23:35 +0100
Subject: [PATCH 0582/1963] refactor(pubsub): Split out Connection and DataSet
 into separate compilation units

---
 CMakeLists.txt                    |   2 +
 src/pubsub/ua_pubsub.h            |   4 +
 src/pubsub/ua_pubsub_connection.c | 111 +++++
 src/pubsub/ua_pubsub_dataset.c    | 566 +++++++++++++++++++++++++
 src/pubsub/ua_pubsub_writer.c     | 660 ------------------------------
 5 files changed, 683 insertions(+), 660 deletions(-)
 create mode 100644 src/pubsub/ua_pubsub_connection.c
 create mode 100644 src/pubsub/ua_pubsub_dataset.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07782e2d04d..2c3bf8ee5b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1013,6 +1013,8 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_discovery.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage.c
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_connection.c
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_dataset.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_writer.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_writergroup.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_reader.c
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index c91e49ebcb7..cb95cfa6868 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -355,6 +355,10 @@ UA_DataSetField_findDSFbyId(UA_Server *server, UA_NodeId identifier);
 UA_DataSetFieldResult
 removeDataSetField(UA_Server *server, const UA_NodeId dsf);
 
+void
+UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
+                                  UA_DataValue *value);
+
 /**********************************************/
 /*               DataSetReader                */
 /**********************************************/
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
new file mode 100644
index 00000000000..de57619a00e
--- /dev/null
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -0,0 +1,111 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2017-2022 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright (c) 2019 Fraunhofer IOSB (Author: Julius Pfrommer)
+ * Copyright (c) 2019 Kalycito Infotech Private Limited
+ * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
+ * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
+ */
+
+#include "ua_pubsub.h"
+#include "server/ua_server_internal.h"
+
+#ifdef UA_ENABLE_PUBSUB /* conditional compilation */
+
+UA_StatusCode
+UA_PubSubConnectionConfig_copy(const UA_PubSubConnectionConfig *src,
+                               UA_PubSubConnectionConfig *dst) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    memcpy(dst, src, sizeof(UA_PubSubConnectionConfig));
+    if (src->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
+        res |= UA_String_copy(&src->publisherId.string, &dst->publisherId.string);
+    }
+    res |= UA_String_copy(&src->name, &dst->name);
+    res |= UA_Variant_copy(&src->address, &dst->address);
+    res |= UA_String_copy(&src->transportProfileUri, &dst->transportProfileUri);
+    res |= UA_Variant_copy(&src->connectionTransportSettings,
+                           &dst->connectionTransportSettings);
+    if(src->connectionPropertiesSize > 0) {
+        dst->connectionProperties = (UA_KeyValuePair *)
+            UA_calloc(src->connectionPropertiesSize, sizeof(UA_KeyValuePair));
+        if(!dst->connectionProperties) {
+            UA_PubSubConnectionConfig_clear(dst);
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
+        for(size_t i = 0; i < src->connectionPropertiesSize; i++){
+            res |= UA_QualifiedName_copy(&src->connectionProperties[i].key,
+                                            &dst->connectionProperties[i].key);
+            res |= UA_Variant_copy(&src->connectionProperties[i].value,
+                                      &dst->connectionProperties[i].value);
+        }
+    }
+    if(res != UA_STATUSCODE_GOOD)
+        UA_PubSubConnectionConfig_clear(dst);
+    return res;
+}
+
+UA_StatusCode
+UA_Server_getPubSubConnectionConfig(UA_Server *server, const UA_NodeId connection,
+                                    UA_PubSubConnectionConfig *config) {
+    if(!config)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_PubSubConnection *currentPubSubConnection =
+        UA_PubSubConnection_findConnectionbyId(server, connection);
+    if(!currentPubSubConnection)
+        return UA_STATUSCODE_BADNOTFOUND;
+    return UA_PubSubConnectionConfig_copy(currentPubSubConnection->config, config);
+}
+
+UA_PubSubConnection *
+UA_PubSubConnection_findConnectionbyId(UA_Server *server, UA_NodeId connectionIdentifier) {
+    UA_PubSubConnection *pubSubConnection;
+    TAILQ_FOREACH(pubSubConnection, &server->pubSubManager.connections, listEntry){
+        if(UA_NodeId_equal(&connectionIdentifier, &pubSubConnection->identifier))
+            break;
+    }
+    return pubSubConnection;
+}
+
+void
+UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig) {
+    if (connectionConfig->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
+        UA_String_clear(&connectionConfig->publisherId.string);
+    }
+    UA_String_clear(&connectionConfig->name);
+    UA_String_clear(&connectionConfig->transportProfileUri);
+    UA_Variant_clear(&connectionConfig->connectionTransportSettings);
+    UA_Variant_clear(&connectionConfig->address);
+    for(size_t i = 0; i < connectionConfig->connectionPropertiesSize; i++){
+        UA_QualifiedName_clear(&connectionConfig->connectionProperties[i].key);
+        UA_Variant_clear(&connectionConfig->connectionProperties[i].value);
+    }
+    UA_free(connectionConfig->connectionProperties);
+}
+
+void
+UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection) {
+    /* Remove WriterGroups */
+    UA_WriterGroup *writerGroup, *tmpWriterGroup;
+    LIST_FOREACH_SAFE(writerGroup, &connection->writerGroups,
+                      listEntry, tmpWriterGroup) {
+        removeWriterGroup(server, writerGroup->identifier);
+    }
+
+    /* Remove ReaderGroups */
+    UA_ReaderGroup *readerGroups, *tmpReaderGroup;
+    LIST_FOREACH_SAFE(readerGroups, &connection->readerGroups, listEntry, tmpReaderGroup)
+        removeReaderGroup(server, readerGroups->identifier);
+
+    UA_NodeId_clear(&connection->identifier);
+    if(connection->channel)
+        connection->channel->close(connection->channel);
+
+    UA_PubSubConnectionConfig_clear(connection->config);
+    UA_free(connection->config);
+}
+
+
+#endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
new file mode 100644
index 00000000000..d00f4e39db4
--- /dev/null
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -0,0 +1,566 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2017-2019 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright (c) 2019 Fraunhofer IOSB (Author: Julius Pfrommer)
+ * Copyright (c) 2019-2021 Kalycito Infotech Private Limited
+ * Copyright (c) 2020 Yannick Wallerer, Siemens AG
+ * Copyright (c) 2020 Thomas Fischer, Siemens AG
+ * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#include "ua_pubsub.h"
+#include "server/ua_server_internal.h"
+
+#ifdef UA_ENABLE_PUBSUB /* conditional compilation */
+
+static void
+UA_DataSetField_clear(UA_DataSetField *field) {
+    UA_DataSetFieldConfig_clear(&field->config);
+    UA_NodeId_clear(&field->identifier);
+    UA_NodeId_clear(&field->publishedDataSet);
+    UA_FieldMetaData_clear(&field->fieldMetaData);
+}
+
+UA_StatusCode
+UA_PublishedDataSetConfig_copy(const UA_PublishedDataSetConfig *src,
+                               UA_PublishedDataSetConfig *dst) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    memcpy(dst, src, sizeof(UA_PublishedDataSetConfig));
+    res |= UA_String_copy(&src->name, &dst->name);
+    switch(src->publishedDataSetType) {
+        case UA_PUBSUB_DATASET_PUBLISHEDITEMS:
+            //no additional items
+            break;
+
+        case UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE:
+            if(src->config.itemsTemplate.variablesToAddSize > 0) {
+                dst->config.itemsTemplate.variablesToAdd = (UA_PublishedVariableDataType *)
+                    UA_calloc(src->config.itemsTemplate.variablesToAddSize,
+                              sizeof(UA_PublishedVariableDataType));
+                if(!dst->config.itemsTemplate.variablesToAdd) {
+                    res = UA_STATUSCODE_BADOUTOFMEMORY;
+                    break;
+                }
+                dst->config.itemsTemplate.variablesToAddSize =
+                    src->config.itemsTemplate.variablesToAddSize;
+            }
+
+            for(size_t i = 0; i < src->config.itemsTemplate.variablesToAddSize; i++) {
+                res |= UA_PublishedVariableDataType_copy(&src->config.itemsTemplate.variablesToAdd[i],
+                                                         &dst->config.itemsTemplate.variablesToAdd[i]);
+            }
+            res |= UA_DataSetMetaDataType_copy(&src->config.itemsTemplate.metaData,
+                                               &dst->config.itemsTemplate.metaData);
+            break;
+
+        default:
+            res = UA_STATUSCODE_BADINVALIDARGUMENT;
+            break;
+    }
+
+    if(res != UA_STATUSCODE_GOOD)
+        UA_PublishedDataSetConfig_clear(dst);
+    return res;
+}
+
+UA_StatusCode
+UA_Server_getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
+                                    UA_PublishedDataSetConfig *config) {
+    if(!config)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
+    if(!currentPDS)
+        return UA_STATUSCODE_BADNOTFOUND;
+    return UA_PublishedDataSetConfig_copy(&currentPDS->config, config);
+}
+
+UA_StatusCode
+UA_Server_getPublishedDataSetMetaData(UA_Server *server, const UA_NodeId pds,
+                                      UA_DataSetMetaDataType *metaData) {
+    if(!metaData)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
+    if(!currentPDS)
+        return UA_STATUSCODE_BADNOTFOUND;
+    return UA_DataSetMetaDataType_copy(&currentPDS->dataSetMetaData, metaData);
+}
+
+UA_PublishedDataSet *
+UA_PublishedDataSet_findPDSbyId(UA_Server *server, UA_NodeId identifier) {
+    UA_PublishedDataSet *tmpPDS = NULL;
+    TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry) {
+        if(UA_NodeId_equal(&tmpPDS->identifier, &identifier))
+            break;
+    }
+    return tmpPDS;
+}
+
+UA_PublishedDataSet *
+UA_PublishedDataSet_findPDSbyName(UA_Server *server, UA_String name) {
+    UA_PublishedDataSet *tmpPDS = NULL;
+    TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry) {
+        if(UA_String_equal(&name, &tmpPDS->config.name))
+            break;
+    }
+
+    return tmpPDS;
+}
+
+void
+UA_PublishedDataSetConfig_clear(UA_PublishedDataSetConfig *pdsConfig) {
+    //delete pds config
+    UA_String_clear(&pdsConfig->name);
+    switch (pdsConfig->publishedDataSetType){
+        case UA_PUBSUB_DATASET_PUBLISHEDITEMS:
+            //no additional items
+            break;
+        case UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE:
+            if(pdsConfig->config.itemsTemplate.variablesToAddSize > 0){
+                for(size_t i = 0; i < pdsConfig->config.itemsTemplate.variablesToAddSize; i++){
+                    UA_PublishedVariableDataType_clear(&pdsConfig->config.itemsTemplate.variablesToAdd[i]);
+                }
+                UA_free(pdsConfig->config.itemsTemplate.variablesToAdd);
+            }
+            UA_DataSetMetaDataType_clear(&pdsConfig->config.itemsTemplate.metaData);
+            break;
+        default:
+            break;
+    }
+}
+
+void
+UA_PublishedDataSet_clear(UA_Server *server, UA_PublishedDataSet *publishedDataSet) {
+    UA_DataSetField *field, *tmpField;
+    TAILQ_FOREACH_SAFE(field, &publishedDataSet->fields, listEntry, tmpField) {
+        removeDataSetField(server, field->identifier);
+    }
+    UA_PublishedDataSetConfig_clear(&publishedDataSet->config);
+    UA_DataSetMetaDataType_clear(&publishedDataSet->dataSetMetaData);
+    UA_NodeId_clear(&publishedDataSet->identifier);
+}
+
+/* The fieldMetaData variable has to be cleaned up external in case of an error */
+static UA_StatusCode
+generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
+                      UA_DataSetField *field, UA_FieldMetaData *fieldMetaData) {
+    if(field->config.dataSetFieldType != UA_PUBSUB_DATASETFIELD_VARIABLE)
+        return UA_STATUSCODE_BADNOTSUPPORTED;
+
+    /* Set the field identifier */
+    fieldMetaData->dataSetFieldId = UA_PubSubManager_generateUniqueGuid(server);
+
+    /* Set the description */
+    fieldMetaData->description = UA_LOCALIZEDTEXT_ALLOC("", "");
+
+    /* Set the name */
+    const UA_DataSetVariableConfig *var = &field->config.field.variable;
+    UA_StatusCode res = UA_String_copy(&var->fieldNameAlias, &fieldMetaData->name);
+    UA_CHECK_STATUS(res, return res);
+
+    /* Static value source. ToDo after freeze PR, the value source must be
+     * checked (other behavior for static value source) */
+    if(var->rtValueSource.rtFieldSourceEnabled &&
+       !var->rtValueSource.rtInformationModelNode) {
+        const UA_DataValue *svs = *var->rtValueSource.staticValueSource;
+        if(svs->value.arrayDimensionsSize > 0) {
+            fieldMetaData->arrayDimensions = (UA_UInt32 *)
+                UA_calloc(svs->value.arrayDimensionsSize, sizeof(UA_UInt32));
+            if(fieldMetaData->arrayDimensions == NULL)
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            memcpy(fieldMetaData->arrayDimensions, svs->value.arrayDimensions,
+                   sizeof(UA_UInt32) * svs->value.arrayDimensionsSize);
+        }
+        fieldMetaData->arrayDimensionsSize = svs->value.arrayDimensionsSize;
+
+        res = UA_NodeId_copy(&svs->value.type->typeId, &fieldMetaData->dataType);
+        UA_CHECK_STATUS(res, return res);
+
+        //TODO collect value rank for the static field source
+        fieldMetaData->properties = NULL;
+        fieldMetaData->propertiesSize = 0;
+        fieldMetaData->fieldFlags = UA_DATASETFIELDFLAGS_NONE;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Set the Array Dimensions */
+    const UA_PublishedVariableDataType *pp = &var->publishParameters;
+    UA_Variant value;
+    UA_Variant_init(&value);
+    res = readWithReadValue(server, &pp->publishedVariable,
+                            UA_ATTRIBUTEID_ARRAYDIMENSIONS, &value);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "PubSub meta data generation: Reading the array dimensions failed");
+        return res;
+    }
+
+    if(value.arrayDimensionsSize > 0) {
+        fieldMetaData->arrayDimensions = (UA_UInt32 *)
+            UA_calloc(value.arrayDimensionsSize, sizeof(UA_UInt32));
+        if(!fieldMetaData->arrayDimensions)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        memcpy(fieldMetaData->arrayDimensions, value.arrayDimensions,
+               sizeof(UA_UInt32)*value.arrayDimensionsSize);
+    }
+    fieldMetaData->arrayDimensionsSize = value.arrayDimensionsSize;
+
+    /* Set the DataType */
+    res = readWithReadValue(server, &pp->publishedVariable,
+                            UA_ATTRIBUTEID_DATATYPE, &fieldMetaData->dataType);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "PubSub meta data generation: Reading the datatype failed");
+        return res;
+    }
+
+    if(!UA_NodeId_isNull(&fieldMetaData->dataType)) {
+        const UA_DataType *currentDataType =
+            UA_findDataTypeWithCustom(&fieldMetaData->dataType,
+                                      server->config.customDataTypes);
+#ifdef UA_ENABLE_TYPEDESCRIPTION
+        UA_LOG_DEBUG_DATASET(&server->config.logger, pds,
+                             "MetaData creation: Found DataType %s",
+                             currentDataType->typeName);
+#endif
+        /* Check if the datatype is a builtInType, if yes set the builtinType. */
+        if(currentDataType->typeKind <= UA_DATATYPEKIND_ENUM)
+            fieldMetaData->builtInType = (UA_Byte)currentDataType->typeKind;
+        /* set the maxStringLength attribute */
+        if(field->config.field.variable.maxStringLength != 0){
+            if(currentDataType->typeKind == UA_DATATYPEKIND_BYTESTRING ||
+            currentDataType->typeKind == UA_DATATYPEKIND_STRING ||
+            currentDataType->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT) {
+                fieldMetaData->maxStringLength = field->config.field.variable.maxStringLength;
+            } else {
+                UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                                       "PubSub meta data generation: MaxStringLength with incompatible DataType configured.");
+            }
+        }
+    } else {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "PubSub meta data generation: DataType is UA_NODEID_NULL");
+    }
+
+    /* Set the ValueRank */
+    UA_Int32 valueRank;
+    res = readWithReadValue(server, &pp->publishedVariable,
+                            UA_ATTRIBUTEID_VALUERANK, &valueRank);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "PubSub meta data generation: Reading the value rank failed");
+        return res;
+    }
+    fieldMetaData->valueRank = valueRank;
+
+    /* PromotedField? */
+    if(var->promotedField)
+        fieldMetaData->fieldFlags = UA_DATASETFIELDFLAGS_PROMOTEDFIELD;
+    else
+        fieldMetaData->fieldFlags = UA_DATASETFIELDFLAGS_NONE;
+
+    /* Properties */
+    fieldMetaData->properties = NULL;
+    fieldMetaData->propertiesSize = 0;
+
+    //TODO collect the following fields*/
+    //fieldMetaData.builtInType
+    //fieldMetaData.maxStringLength
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_DataSetFieldResult
+addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
+                const UA_DataSetFieldConfig *fieldConfig,
+                UA_NodeId *fieldIdentifier) {
+    UA_DataSetFieldResult result;
+    memset(&result, 0, sizeof(UA_DataSetFieldResult));
+    if(!fieldConfig) {
+        result.result = UA_STATUSCODE_BADINVALIDARGUMENT;
+        return result;
+    }
+
+    UA_PublishedDataSet *currDS =
+        UA_PublishedDataSet_findPDSbyId(server, publishedDataSet);
+    if(!currDS) {
+        result.result = UA_STATUSCODE_BADNOTFOUND;
+        return result;
+    }
+
+    if(currDS->configurationFrozen) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, currDS,
+                               "Adding DataSetField failed: PublishedDataSet is frozen");
+        result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
+        return result;
+    }
+
+    if(currDS->config.publishedDataSetType != UA_PUBSUB_DATASET_PUBLISHEDITEMS) {
+        result.result = UA_STATUSCODE_BADNOTIMPLEMENTED;
+        return result;
+    }
+
+    UA_DataSetField *newField = (UA_DataSetField*)UA_calloc(1, sizeof(UA_DataSetField));
+    if(!newField) {
+        result.result = UA_STATUSCODE_BADINTERNALERROR;
+        return result;
+    }
+
+    result.result = UA_DataSetFieldConfig_copy(fieldConfig, &newField->config);
+    if(result.result != UA_STATUSCODE_GOOD) {
+        UA_free(newField);
+        return result;
+    }
+
+    result.result = UA_NodeId_copy(&currDS->identifier, &newField->publishedDataSet);
+    if(result.result != UA_STATUSCODE_GOOD) {
+        UA_DataSetFieldConfig_clear(&newField->config);
+        UA_free(newField);
+        return result;
+    }
+
+    /* Initialize the field metadata. Also generates a FieldId */
+    UA_FieldMetaData fmd;
+    UA_FieldMetaData_init(&fmd);
+    result.result = generateFieldMetaData(server, currDS, newField, &fmd);
+    if(result.result != UA_STATUSCODE_GOOD) {
+        UA_FieldMetaData_clear(&fmd);
+        UA_DataSetFieldConfig_clear(&newField->config);
+        UA_NodeId_clear(&newField->publishedDataSet);
+        UA_free(newField);
+        return result;
+    }
+
+    /* Append to the metadata fields array. Point of last return. */
+    result.result = UA_Array_append((void**)&currDS->dataSetMetaData.fields,
+                                    &currDS->dataSetMetaData.fieldsSize,
+                                    &fmd, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+    if(result.result != UA_STATUSCODE_GOOD) {
+        UA_FieldMetaData_clear(&fmd);
+        UA_DataSetFieldConfig_clear(&newField->config);
+        UA_NodeId_clear(&newField->publishedDataSet);
+        UA_free(newField);
+        return result;
+    }
+
+    /* Copy the identifier from the metadata. Cannot fail with a guid NodeId. */
+    newField->identifier = UA_NODEID_GUID(1, fmd.dataSetFieldId);
+    if(fieldIdentifier)
+        UA_NodeId_copy(&newField->identifier, fieldIdentifier);
+
+    /* Register the field. The order of DataSetFields should be the same in both
+     * creating and publishing. So adding DataSetFields at the the end of the
+     * DataSets using the TAILQ structure. */
+    TAILQ_INSERT_TAIL(&currDS->fields, newField, listEntry);
+    currDS->fieldSize++;
+
+    if(newField->config.field.variable.promotedField)
+        currDS->promotedFieldsCount++;
+
+    /* The values of the metadata are "borrowed" in a mirrored structure in the
+     * pds. Reset them after resizing the array. */
+    size_t counter = 0;
+    UA_DataSetField *dsf;
+    TAILQ_FOREACH(dsf, &currDS->fields, listEntry) {
+        dsf->fieldMetaData = currDS->dataSetMetaData.fields[counter++];
+    }
+
+    /* Update major version of parent published data set */
+    currDS->dataSetMetaData.configurationVersion.majorVersion =
+        UA_PubSubConfigurationVersionTimeDifference();
+
+    result.configurationVersion.majorVersion =
+        currDS->dataSetMetaData.configurationVersion.majorVersion;
+    result.configurationVersion.minorVersion =
+        currDS->dataSetMetaData.configurationVersion.minorVersion;
+    return result;
+}
+
+UA_DataSetFieldResult
+UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
+                          const UA_DataSetFieldConfig *fieldConfig,
+                          UA_NodeId *fieldIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_DataSetFieldResult res =
+        addDataSetField(server, publishedDataSet, fieldConfig, fieldIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_DataSetFieldResult
+removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
+    UA_DataSetFieldResult result;
+    memset(&result, 0, sizeof(UA_DataSetFieldResult));
+
+    UA_DataSetField *currentField = UA_DataSetField_findDSFbyId(server, dsf);
+    if(!currentField) {
+        result.result = UA_STATUSCODE_BADNOTFOUND;
+        return result;
+    }
+
+    UA_PublishedDataSet *pds =
+        UA_PublishedDataSet_findPDSbyId(server, currentField->publishedDataSet);
+    if(!pds) {
+        result.result = UA_STATUSCODE_BADNOTFOUND;
+        return result;
+    }
+
+    if(currentField->configurationFrozen) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "Remove DataSetField failed: DataSetField is frozen");
+        result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
+        return result;
+    }
+
+    if(pds->configurationFrozen) {
+        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                               "Remove DataSetField failed: PublishedDataSet is frozen");
+        result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
+        return result;
+    }
+
+    /* Reduce the counters before the config is cleaned up */
+    if(currentField->config.field.variable.promotedField)
+        pds->promotedFieldsCount--;
+    pds->fieldSize--;
+
+    /* Update major version of PublishedDataSet */
+    pds->dataSetMetaData.configurationVersion.majorVersion =
+        UA_PubSubConfigurationVersionTimeDifference();
+
+    /* Clean up */
+    currentField->fieldMetaData.arrayDimensions = NULL;
+    currentField->fieldMetaData.properties = NULL;
+    currentField->fieldMetaData.name = UA_STRING_NULL;
+    currentField->fieldMetaData.description.locale = UA_STRING_NULL;
+    currentField->fieldMetaData.description.text = UA_STRING_NULL;
+    UA_DataSetField_clear(currentField);
+
+    /* Remove */
+    TAILQ_REMOVE(&pds->fields, currentField, listEntry);
+    UA_free(currentField);
+
+    /* Regenerate DataSetMetaData */
+    pds->dataSetMetaData.fieldsSize--;
+    if(pds->dataSetMetaData.fieldsSize > 0) {
+        for(size_t i = 0; i < pds->dataSetMetaData.fieldsSize+1; i++) {
+            UA_FieldMetaData_clear(&pds->dataSetMetaData.fields[i]);
+        }
+        UA_free(pds->dataSetMetaData.fields);
+        UA_FieldMetaData *fieldMetaData = (UA_FieldMetaData *)
+            UA_calloc(pds->dataSetMetaData.fieldsSize, sizeof(UA_FieldMetaData));
+        if(!fieldMetaData) {
+            result.result =  UA_STATUSCODE_BADOUTOFMEMORY;
+            return result;
+        }
+        UA_DataSetField *tmpDSF;
+        size_t counter = 0;
+        TAILQ_FOREACH(tmpDSF, &pds->fields, listEntry) {
+            result.result = generateFieldMetaData(server, pds, tmpDSF, &fieldMetaData[counter]);
+            if(result.result != UA_STATUSCODE_GOOD) {
+                UA_FieldMetaData_clear(&fieldMetaData[counter]);
+                UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                                       "PubSub MetaData regeneration failed "
+                                       "after removing a field!");
+                break;
+            }
+            counter++;
+        }
+        pds->dataSetMetaData.fields = fieldMetaData;
+    } else {
+        UA_FieldMetaData_delete(pds->dataSetMetaData.fields);
+        pds->dataSetMetaData.fields = NULL;
+    }
+
+    result.configurationVersion.majorVersion =
+        pds->dataSetMetaData.configurationVersion.majorVersion;
+    result.configurationVersion.minorVersion =
+        pds->dataSetMetaData.configurationVersion.minorVersion;
+    return result;
+}
+
+UA_DataSetFieldResult
+UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
+    UA_LOCK(&server->serviceMutex);
+    UA_DataSetFieldResult res = removeDataSetField(server, dsf);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_DataSetFieldConfig_copy(const UA_DataSetFieldConfig *src,
+                           UA_DataSetFieldConfig *dst) {
+    if(src->dataSetFieldType != UA_PUBSUB_DATASETFIELD_VARIABLE)
+        return UA_STATUSCODE_BADNOTSUPPORTED;
+    memcpy(dst, src, sizeof(UA_DataSetFieldConfig));
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    res |= UA_String_copy(&src->field.variable.fieldNameAlias,
+                          &dst->field.variable.fieldNameAlias);
+    res |= UA_PublishedVariableDataType_copy(&src->field.variable.publishParameters,
+                                             &dst->field.variable.publishParameters);
+    if(res != UA_STATUSCODE_GOOD)
+        UA_DataSetFieldConfig_clear(dst);
+    return res;
+}
+
+UA_StatusCode
+UA_Server_getDataSetFieldConfig(UA_Server *server, const UA_NodeId dsf,
+                                UA_DataSetFieldConfig *config) {
+    if(!config)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_DataSetField *currentDataSetField = UA_DataSetField_findDSFbyId(server, dsf);
+    if(!currentDataSetField)
+        return UA_STATUSCODE_BADNOTFOUND;
+    return UA_DataSetFieldConfig_copy(&currentDataSetField->config, config);
+}
+
+UA_DataSetField *
+UA_DataSetField_findDSFbyId(UA_Server *server, UA_NodeId identifier) {
+    UA_PublishedDataSet *tmpPDS;
+    TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry) {
+        UA_DataSetField *tmpField;
+        TAILQ_FOREACH(tmpField, &tmpPDS->fields, listEntry) {
+            if(UA_NodeId_equal(&tmpField->identifier, &identifier))
+                return tmpField;
+        }
+    }
+    return NULL;
+}
+
+void
+UA_DataSetFieldConfig_clear(UA_DataSetFieldConfig *dataSetFieldConfig) {
+    if(dataSetFieldConfig->dataSetFieldType == UA_PUBSUB_DATASETFIELD_VARIABLE) {
+        UA_String_clear(&dataSetFieldConfig->field.variable.fieldNameAlias);
+        UA_PublishedVariableDataType_clear(&dataSetFieldConfig->field.variable.publishParameters);
+    }
+}
+
+/* Obtain the latest value for a specific DataSetField. This method is currently
+ * called inside the DataSetMessage generation process. */
+void
+UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
+                                  UA_DataValue *value) {
+    UA_PublishedVariableDataType *params = &field->config.field.variable.publishParameters;
+
+    /* Read the value */
+    if(field->config.field.variable.rtValueSource.rtInformationModelNode) {
+        const UA_VariableNode *rtNode = (const UA_VariableNode *)
+            UA_NODESTORE_GET(server, &params->publishedVariable);
+        *value = **rtNode->valueBackend.backend.external.value;
+        value->value.storageType = UA_VARIANT_DATA_NODELETE;
+        UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
+    } else if(field->config.field.variable.rtValueSource.rtFieldSourceEnabled == false){
+        UA_ReadValueId rvid;
+        UA_ReadValueId_init(&rvid);
+        rvid.nodeId = params->publishedVariable;
+        rvid.attributeId = params->attributeId;
+        rvid.indexRange = params->indexRange;
+        *value = readAttribute(server, &rvid, UA_TIMESTAMPSTORETURN_BOTH);
+    } else {
+        *value = **field->config.field.variable.rtValueSource.staticValueSource;
+        value->value.storageType = UA_VARIANT_DATA_NODELETE;
+    }
+}
+
+#endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index bb11e85bde9..e63b14eeb84 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -25,579 +25,6 @@
 #include "ua_types_encoding_binary.h"
 #endif
 
-/* Forward declaration */
-static void
-UA_DataSetField_clear(UA_DataSetField *field);
-
-/**********************************************/
-/*               Connection                   */
-/**********************************************/
-
-UA_StatusCode
-UA_PubSubConnectionConfig_copy(const UA_PubSubConnectionConfig *src,
-                               UA_PubSubConnectionConfig *dst) {
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    memcpy(dst, src, sizeof(UA_PubSubConnectionConfig));
-    if (src->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
-        res |= UA_String_copy(&src->publisherId.string, &dst->publisherId.string);
-    }
-    res |= UA_String_copy(&src->name, &dst->name);
-    res |= UA_Variant_copy(&src->address, &dst->address);
-    res |= UA_String_copy(&src->transportProfileUri, &dst->transportProfileUri);
-    res |= UA_Variant_copy(&src->connectionTransportSettings,
-                           &dst->connectionTransportSettings);
-    if(src->connectionPropertiesSize > 0) {
-        dst->connectionProperties = (UA_KeyValuePair *)
-            UA_calloc(src->connectionPropertiesSize, sizeof(UA_KeyValuePair));
-        if(!dst->connectionProperties) {
-            UA_PubSubConnectionConfig_clear(dst);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        for(size_t i = 0; i < src->connectionPropertiesSize; i++){
-            res |= UA_QualifiedName_copy(&src->connectionProperties[i].key,
-                                            &dst->connectionProperties[i].key);
-            res |= UA_Variant_copy(&src->connectionProperties[i].value,
-                                      &dst->connectionProperties[i].value);
-        }
-    }
-    if(res != UA_STATUSCODE_GOOD)
-        UA_PubSubConnectionConfig_clear(dst);
-    return res;
-}
-
-UA_StatusCode
-UA_Server_getPubSubConnectionConfig(UA_Server *server, const UA_NodeId connection,
-                                    UA_PubSubConnectionConfig *config) {
-    if(!config)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_PubSubConnection *currentPubSubConnection =
-        UA_PubSubConnection_findConnectionbyId(server, connection);
-    if(!currentPubSubConnection)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_PubSubConnectionConfig_copy(currentPubSubConnection->config, config);
-}
-
-UA_PubSubConnection *
-UA_PubSubConnection_findConnectionbyId(UA_Server *server, UA_NodeId connectionIdentifier) {
-    UA_PubSubConnection *pubSubConnection;
-    TAILQ_FOREACH(pubSubConnection, &server->pubSubManager.connections, listEntry){
-        if(UA_NodeId_equal(&connectionIdentifier, &pubSubConnection->identifier))
-            break;
-    }
-    return pubSubConnection;
-}
-
-void
-UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig) {
-    if (connectionConfig->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
-        UA_String_clear(&connectionConfig->publisherId.string);
-    }
-    UA_String_clear(&connectionConfig->name);
-    UA_String_clear(&connectionConfig->transportProfileUri);
-    UA_Variant_clear(&connectionConfig->connectionTransportSettings);
-    UA_Variant_clear(&connectionConfig->address);
-    for(size_t i = 0; i < connectionConfig->connectionPropertiesSize; i++){
-        UA_QualifiedName_clear(&connectionConfig->connectionProperties[i].key);
-        UA_Variant_clear(&connectionConfig->connectionProperties[i].value);
-    }
-    UA_free(connectionConfig->connectionProperties);
-}
-
-void
-UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection) {
-    /* Remove WriterGroups */
-    UA_WriterGroup *writerGroup, *tmpWriterGroup;
-    LIST_FOREACH_SAFE(writerGroup, &connection->writerGroups,
-                      listEntry, tmpWriterGroup) {
-        removeWriterGroup(server, writerGroup->identifier);
-    }
-
-    /* Remove ReaderGroups */
-    UA_ReaderGroup *readerGroups, *tmpReaderGroup;
-    LIST_FOREACH_SAFE(readerGroups, &connection->readerGroups, listEntry, tmpReaderGroup)
-        removeReaderGroup(server, readerGroups->identifier);
-
-    UA_NodeId_clear(&connection->identifier);
-    if(connection->channel)
-        connection->channel->close(connection->channel);
-
-    UA_PubSubConnectionConfig_clear(connection->config);
-    UA_free(connection->config);
-}
-
-/**********************************************/
-/*               PublishedDataSet             */
-/**********************************************/
-
-UA_StatusCode
-UA_PublishedDataSetConfig_copy(const UA_PublishedDataSetConfig *src,
-                               UA_PublishedDataSetConfig *dst) {
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    memcpy(dst, src, sizeof(UA_PublishedDataSetConfig));
-    res |= UA_String_copy(&src->name, &dst->name);
-    switch(src->publishedDataSetType) {
-        case UA_PUBSUB_DATASET_PUBLISHEDITEMS:
-            //no additional items
-            break;
-
-        case UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE:
-            if(src->config.itemsTemplate.variablesToAddSize > 0) {
-                dst->config.itemsTemplate.variablesToAdd = (UA_PublishedVariableDataType *)
-                    UA_calloc(src->config.itemsTemplate.variablesToAddSize,
-                              sizeof(UA_PublishedVariableDataType));
-                if(!dst->config.itemsTemplate.variablesToAdd) {
-                    res = UA_STATUSCODE_BADOUTOFMEMORY;
-                    break;
-                }
-                dst->config.itemsTemplate.variablesToAddSize =
-                    src->config.itemsTemplate.variablesToAddSize;
-            }
-
-            for(size_t i = 0; i < src->config.itemsTemplate.variablesToAddSize; i++) {
-                res |= UA_PublishedVariableDataType_copy(&src->config.itemsTemplate.variablesToAdd[i],
-                                                         &dst->config.itemsTemplate.variablesToAdd[i]);
-            }
-            res |= UA_DataSetMetaDataType_copy(&src->config.itemsTemplate.metaData,
-                                               &dst->config.itemsTemplate.metaData);
-            break;
-
-        default:
-            res = UA_STATUSCODE_BADINVALIDARGUMENT;
-            break;
-    }
-
-    if(res != UA_STATUSCODE_GOOD)
-        UA_PublishedDataSetConfig_clear(dst);
-    return res;
-}
-
-UA_StatusCode
-UA_Server_getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
-                                    UA_PublishedDataSetConfig *config) {
-    if(!config)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
-    if(!currentPDS)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_PublishedDataSetConfig_copy(&currentPDS->config, config);
-}
-
-UA_StatusCode
-UA_Server_getPublishedDataSetMetaData(UA_Server *server, const UA_NodeId pds,
-                                      UA_DataSetMetaDataType *metaData) {
-    if(!metaData)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
-    if(!currentPDS)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_DataSetMetaDataType_copy(&currentPDS->dataSetMetaData, metaData);
-}
-
-UA_PublishedDataSet *
-UA_PublishedDataSet_findPDSbyId(UA_Server *server, UA_NodeId identifier) {
-    UA_PublishedDataSet *tmpPDS = NULL;
-    TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry) {
-        if(UA_NodeId_equal(&tmpPDS->identifier, &identifier))
-            break;
-    }
-    return tmpPDS;
-}
-
-UA_PublishedDataSet *
-UA_PublishedDataSet_findPDSbyName(UA_Server *server, UA_String name) {
-    UA_PublishedDataSet *tmpPDS = NULL;
-    TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry) {
-        if(UA_String_equal(&name, &tmpPDS->config.name))
-            break;
-    }
-
-    return tmpPDS;
-}
-
-void
-UA_PublishedDataSetConfig_clear(UA_PublishedDataSetConfig *pdsConfig) {
-    //delete pds config
-    UA_String_clear(&pdsConfig->name);
-    switch (pdsConfig->publishedDataSetType){
-        case UA_PUBSUB_DATASET_PUBLISHEDITEMS:
-            //no additional items
-            break;
-        case UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE:
-            if(pdsConfig->config.itemsTemplate.variablesToAddSize > 0){
-                for(size_t i = 0; i < pdsConfig->config.itemsTemplate.variablesToAddSize; i++){
-                    UA_PublishedVariableDataType_clear(&pdsConfig->config.itemsTemplate.variablesToAdd[i]);
-                }
-                UA_free(pdsConfig->config.itemsTemplate.variablesToAdd);
-            }
-            UA_DataSetMetaDataType_clear(&pdsConfig->config.itemsTemplate.metaData);
-            break;
-        default:
-            break;
-    }
-}
-
-void
-UA_PublishedDataSet_clear(UA_Server *server, UA_PublishedDataSet *publishedDataSet) {
-    UA_DataSetField *field, *tmpField;
-    TAILQ_FOREACH_SAFE(field, &publishedDataSet->fields, listEntry, tmpField) {
-        removeDataSetField(server, field->identifier);
-    }
-    UA_PublishedDataSetConfig_clear(&publishedDataSet->config);
-    UA_DataSetMetaDataType_clear(&publishedDataSet->dataSetMetaData);
-    UA_NodeId_clear(&publishedDataSet->identifier);
-}
-
-/* The fieldMetaData variable has to be cleaned up external in case of an error */
-static UA_StatusCode
-generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
-                      UA_DataSetField *field, UA_FieldMetaData *fieldMetaData) {
-    if(field->config.dataSetFieldType != UA_PUBSUB_DATASETFIELD_VARIABLE)
-        return UA_STATUSCODE_BADNOTSUPPORTED;
-
-    /* Set the field identifier */
-    fieldMetaData->dataSetFieldId = UA_PubSubManager_generateUniqueGuid(server);
-
-    /* Set the description */
-    fieldMetaData->description = UA_LOCALIZEDTEXT_ALLOC("", "");
-
-    /* Set the name */
-    const UA_DataSetVariableConfig *var = &field->config.field.variable;
-    UA_StatusCode res = UA_String_copy(&var->fieldNameAlias, &fieldMetaData->name);
-    UA_CHECK_STATUS(res, return res);
-
-    /* Static value source. ToDo after freeze PR, the value source must be
-     * checked (other behavior for static value source) */
-    if(var->rtValueSource.rtFieldSourceEnabled &&
-       !var->rtValueSource.rtInformationModelNode) {
-        const UA_DataValue *svs = *var->rtValueSource.staticValueSource;
-        if(svs->value.arrayDimensionsSize > 0) {
-            fieldMetaData->arrayDimensions = (UA_UInt32 *)
-                UA_calloc(svs->value.arrayDimensionsSize, sizeof(UA_UInt32));
-            if(fieldMetaData->arrayDimensions == NULL)
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            memcpy(fieldMetaData->arrayDimensions, svs->value.arrayDimensions,
-                   sizeof(UA_UInt32) * svs->value.arrayDimensionsSize);
-        }
-        fieldMetaData->arrayDimensionsSize = svs->value.arrayDimensionsSize;
-
-        res = UA_NodeId_copy(&svs->value.type->typeId, &fieldMetaData->dataType);
-        UA_CHECK_STATUS(res, return res);
-
-        //TODO collect value rank for the static field source
-        fieldMetaData->properties = NULL;
-        fieldMetaData->propertiesSize = 0;
-        fieldMetaData->fieldFlags = UA_DATASETFIELDFLAGS_NONE;
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* Set the Array Dimensions */
-    const UA_PublishedVariableDataType *pp = &var->publishParameters;
-    UA_Variant value;
-    UA_Variant_init(&value);
-    res = readWithReadValue(server, &pp->publishedVariable,
-                            UA_ATTRIBUTEID_ARRAYDIMENSIONS, &value);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
-                               "PubSub meta data generation: Reading the array dimensions failed");
-        return res;
-    }
-
-    if(value.arrayDimensionsSize > 0) {
-        fieldMetaData->arrayDimensions = (UA_UInt32 *)
-            UA_calloc(value.arrayDimensionsSize, sizeof(UA_UInt32));
-        if(!fieldMetaData->arrayDimensions)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        memcpy(fieldMetaData->arrayDimensions, value.arrayDimensions,
-               sizeof(UA_UInt32)*value.arrayDimensionsSize);
-    }
-    fieldMetaData->arrayDimensionsSize = value.arrayDimensionsSize;
-
-    /* Set the DataType */
-    res = readWithReadValue(server, &pp->publishedVariable,
-                            UA_ATTRIBUTEID_DATATYPE, &fieldMetaData->dataType);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
-                               "PubSub meta data generation: Reading the datatype failed");
-        return res;
-    }
-
-    if(!UA_NodeId_isNull(&fieldMetaData->dataType)) {
-        const UA_DataType *currentDataType =
-            UA_findDataTypeWithCustom(&fieldMetaData->dataType,
-                                      server->config.customDataTypes);
-#ifdef UA_ENABLE_TYPEDESCRIPTION
-        UA_LOG_DEBUG_DATASET(&server->config.logger, pds,
-                             "MetaData creation: Found DataType %s",
-                             currentDataType->typeName);
-#endif
-        /* Check if the datatype is a builtInType, if yes set the builtinType. */
-        if(currentDataType->typeKind <= UA_DATATYPEKIND_ENUM)
-            fieldMetaData->builtInType = (UA_Byte)currentDataType->typeKind;
-        /* set the maxStringLength attribute */
-        if(field->config.field.variable.maxStringLength != 0){
-            if(currentDataType->typeKind == UA_DATATYPEKIND_BYTESTRING ||
-            currentDataType->typeKind == UA_DATATYPEKIND_STRING ||
-            currentDataType->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT) {
-                fieldMetaData->maxStringLength = field->config.field.variable.maxStringLength;
-            } else {
-                UA_LOG_WARNING_DATASET(&server->config.logger, pds,
-                                       "PubSub meta data generation: MaxStringLength with incompatible DataType configured.");
-            }
-        }
-    } else {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
-                               "PubSub meta data generation: DataType is UA_NODEID_NULL");
-    }
-
-    /* Set the ValueRank */
-    UA_Int32 valueRank;
-    res = readWithReadValue(server, &pp->publishedVariable,
-                            UA_ATTRIBUTEID_VALUERANK, &valueRank);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
-                               "PubSub meta data generation: Reading the value rank failed");
-        return res;
-    }
-    fieldMetaData->valueRank = valueRank;
-
-    /* PromotedField? */
-    if(var->promotedField)
-        fieldMetaData->fieldFlags = UA_DATASETFIELDFLAGS_PROMOTEDFIELD;
-    else
-        fieldMetaData->fieldFlags = UA_DATASETFIELDFLAGS_NONE;
-
-    /* Properties */
-    fieldMetaData->properties = NULL;
-    fieldMetaData->propertiesSize = 0;
-
-    //TODO collect the following fields*/
-    //fieldMetaData.builtInType
-    //fieldMetaData.maxStringLength
-
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_DataSetFieldResult
-addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
-                const UA_DataSetFieldConfig *fieldConfig,
-                UA_NodeId *fieldIdentifier) {
-    UA_DataSetFieldResult result;
-    memset(&result, 0, sizeof(UA_DataSetFieldResult));
-    if(!fieldConfig) {
-        result.result = UA_STATUSCODE_BADINVALIDARGUMENT;
-        return result;
-    }
-
-    UA_PublishedDataSet *currDS =
-        UA_PublishedDataSet_findPDSbyId(server, publishedDataSet);
-    if(!currDS) {
-        result.result = UA_STATUSCODE_BADNOTFOUND;
-        return result;
-    }
-
-    if(currDS->configurationFrozen) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, currDS,
-                               "Adding DataSetField failed: PublishedDataSet is frozen");
-        result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
-        return result;
-    }
-
-    if(currDS->config.publishedDataSetType != UA_PUBSUB_DATASET_PUBLISHEDITEMS) {
-        result.result = UA_STATUSCODE_BADNOTIMPLEMENTED;
-        return result;
-    }
-
-    UA_DataSetField *newField = (UA_DataSetField*)UA_calloc(1, sizeof(UA_DataSetField));
-    if(!newField) {
-        result.result = UA_STATUSCODE_BADINTERNALERROR;
-        return result;
-    }
-
-    result.result = UA_DataSetFieldConfig_copy(fieldConfig, &newField->config);
-    if(result.result != UA_STATUSCODE_GOOD) {
-        UA_free(newField);
-        return result;
-    }
-
-    result.result = UA_NodeId_copy(&currDS->identifier, &newField->publishedDataSet);
-    if(result.result != UA_STATUSCODE_GOOD) {
-        UA_DataSetFieldConfig_clear(&newField->config);
-        UA_free(newField);
-        return result;
-    }
-
-    /* Initialize the field metadata. Also generates a FieldId */
-    UA_FieldMetaData fmd;
-    UA_FieldMetaData_init(&fmd);
-    result.result = generateFieldMetaData(server, currDS, newField, &fmd);
-    if(result.result != UA_STATUSCODE_GOOD) {
-        UA_FieldMetaData_clear(&fmd);
-        UA_DataSetFieldConfig_clear(&newField->config);
-        UA_NodeId_clear(&newField->publishedDataSet);
-        UA_free(newField);
-        return result;
-    }
-
-    /* Append to the metadata fields array. Point of last return. */
-    result.result = UA_Array_append((void**)&currDS->dataSetMetaData.fields,
-                                    &currDS->dataSetMetaData.fieldsSize,
-                                    &fmd, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
-    if(result.result != UA_STATUSCODE_GOOD) {
-        UA_FieldMetaData_clear(&fmd);
-        UA_DataSetFieldConfig_clear(&newField->config);
-        UA_NodeId_clear(&newField->publishedDataSet);
-        UA_free(newField);
-        return result;
-    }
-
-    /* Copy the identifier from the metadata. Cannot fail with a guid NodeId. */
-    newField->identifier = UA_NODEID_GUID(1, fmd.dataSetFieldId);
-    if(fieldIdentifier)
-        UA_NodeId_copy(&newField->identifier, fieldIdentifier);
-
-    /* Register the field. The order of DataSetFields should be the same in both
-     * creating and publishing. So adding DataSetFields at the the end of the
-     * DataSets using the TAILQ structure. */
-    TAILQ_INSERT_TAIL(&currDS->fields, newField, listEntry);
-    currDS->fieldSize++;
-
-    if(newField->config.field.variable.promotedField)
-        currDS->promotedFieldsCount++;
-
-    /* The values of the metadata are "borrowed" in a mirrored structure in the
-     * pds. Reset them after resizing the array. */
-    size_t counter = 0;
-    UA_DataSetField *dsf;
-    TAILQ_FOREACH(dsf, &currDS->fields, listEntry) {
-        dsf->fieldMetaData = currDS->dataSetMetaData.fields[counter++];
-    }
-
-    /* Update major version of parent published data set */
-    currDS->dataSetMetaData.configurationVersion.majorVersion =
-        UA_PubSubConfigurationVersionTimeDifference();
-
-    result.configurationVersion.majorVersion =
-        currDS->dataSetMetaData.configurationVersion.majorVersion;
-    result.configurationVersion.minorVersion =
-        currDS->dataSetMetaData.configurationVersion.minorVersion;
-    return result;
-}
-
-UA_DataSetFieldResult
-UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
-                          const UA_DataSetFieldConfig *fieldConfig,
-                          UA_NodeId *fieldIdentifier) {
-    UA_LOCK(&server->serviceMutex);
-    UA_DataSetFieldResult res =
-        addDataSetField(server, publishedDataSet, fieldConfig, fieldIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-UA_DataSetFieldResult
-removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
-    UA_DataSetFieldResult result;
-    memset(&result, 0, sizeof(UA_DataSetFieldResult));
-
-    UA_DataSetField *currentField = UA_DataSetField_findDSFbyId(server, dsf);
-    if(!currentField) {
-        result.result = UA_STATUSCODE_BADNOTFOUND;
-        return result;
-    }
-
-    UA_PublishedDataSet *pds =
-        UA_PublishedDataSet_findPDSbyId(server, currentField->publishedDataSet);
-    if(!pds) {
-        result.result = UA_STATUSCODE_BADNOTFOUND;
-        return result;
-    }
-
-    if(currentField->configurationFrozen) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
-                               "Remove DataSetField failed: DataSetField is frozen");
-        result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
-        return result;
-    }
-
-    if(pds->configurationFrozen) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
-                               "Remove DataSetField failed: PublishedDataSet is frozen");
-        result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
-        return result;
-    }
-
-    /* Reduce the counters before the config is cleaned up */
-    if(currentField->config.field.variable.promotedField)
-        pds->promotedFieldsCount--;
-    pds->fieldSize--;
-
-    /* Update major version of PublishedDataSet */
-    pds->dataSetMetaData.configurationVersion.majorVersion =
-        UA_PubSubConfigurationVersionTimeDifference();
-
-    /* Clean up */
-    currentField->fieldMetaData.arrayDimensions = NULL;
-    currentField->fieldMetaData.properties = NULL;
-    currentField->fieldMetaData.name = UA_STRING_NULL;
-    currentField->fieldMetaData.description.locale = UA_STRING_NULL;
-    currentField->fieldMetaData.description.text = UA_STRING_NULL;
-    UA_DataSetField_clear(currentField);
-
-    /* Remove */
-    TAILQ_REMOVE(&pds->fields, currentField, listEntry);
-    UA_free(currentField);
-
-    /* Regenerate DataSetMetaData */
-    pds->dataSetMetaData.fieldsSize--;
-    if(pds->dataSetMetaData.fieldsSize > 0) {
-        for(size_t i = 0; i < pds->dataSetMetaData.fieldsSize+1; i++) {
-            UA_FieldMetaData_clear(&pds->dataSetMetaData.fields[i]);
-        }
-        UA_free(pds->dataSetMetaData.fields);
-        UA_FieldMetaData *fieldMetaData = (UA_FieldMetaData *)
-            UA_calloc(pds->dataSetMetaData.fieldsSize, sizeof(UA_FieldMetaData));
-        if(!fieldMetaData) {
-            result.result =  UA_STATUSCODE_BADOUTOFMEMORY;
-            return result;
-        }
-        UA_DataSetField *tmpDSF;
-        size_t counter = 0;
-        TAILQ_FOREACH(tmpDSF, &pds->fields, listEntry) {
-            result.result = generateFieldMetaData(server, pds, tmpDSF, &fieldMetaData[counter]);
-            if(result.result != UA_STATUSCODE_GOOD) {
-                UA_FieldMetaData_clear(&fieldMetaData[counter]);
-                UA_LOG_WARNING_DATASET(&server->config.logger, pds,
-                                       "PubSub MetaData regeneration failed "
-                                       "after removing a field!");
-                break;
-            }
-            counter++;
-        }
-        pds->dataSetMetaData.fields = fieldMetaData;
-    } else {
-        UA_FieldMetaData_delete(pds->dataSetMetaData.fields);
-        pds->dataSetMetaData.fields = NULL;
-    }
-
-    result.configurationVersion.majorVersion =
-        pds->dataSetMetaData.configurationVersion.majorVersion;
-    result.configurationVersion.minorVersion =
-        pds->dataSetMetaData.configurationVersion.minorVersion;
-    return result;
-}
-
-UA_DataSetFieldResult
-UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
-    UA_LOCK(&server->serviceMutex);
-    UA_DataSetFieldResult res = removeDataSetField(server, dsf);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-/**********************************************/
-/*               DataSetWriter                */
-/**********************************************/
-
 UA_StatusCode
 UA_DataSetWriterConfig_copy(const UA_DataSetWriterConfig *src,
                             UA_DataSetWriterConfig *dst){
@@ -973,66 +400,6 @@ UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
     return res;
 }
 
-/**********************************************/
-/*                DataSetField                */
-/**********************************************/
-
-static void
-UA_DataSetField_clear(UA_DataSetField *field) {
-    UA_DataSetFieldConfig_clear(&field->config);
-    UA_NodeId_clear(&field->identifier);
-    UA_NodeId_clear(&field->publishedDataSet);
-    UA_FieldMetaData_clear(&field->fieldMetaData);
-}
-
-UA_StatusCode
-UA_DataSetFieldConfig_copy(const UA_DataSetFieldConfig *src,
-                           UA_DataSetFieldConfig *dst) {
-    if(src->dataSetFieldType != UA_PUBSUB_DATASETFIELD_VARIABLE)
-        return UA_STATUSCODE_BADNOTSUPPORTED;
-    memcpy(dst, src, sizeof(UA_DataSetFieldConfig));
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    res |= UA_String_copy(&src->field.variable.fieldNameAlias,
-                          &dst->field.variable.fieldNameAlias);
-    res |= UA_PublishedVariableDataType_copy(&src->field.variable.publishParameters,
-                                             &dst->field.variable.publishParameters);
-    if(res != UA_STATUSCODE_GOOD)
-        UA_DataSetFieldConfig_clear(dst);
-    return res;
-}
-
-UA_StatusCode
-UA_Server_getDataSetFieldConfig(UA_Server *server, const UA_NodeId dsf,
-                                UA_DataSetFieldConfig *config) {
-    if(!config)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_DataSetField *currentDataSetField = UA_DataSetField_findDSFbyId(server, dsf);
-    if(!currentDataSetField)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_DataSetFieldConfig_copy(&currentDataSetField->config, config);
-}
-
-UA_DataSetField *
-UA_DataSetField_findDSFbyId(UA_Server *server, UA_NodeId identifier) {
-    UA_PublishedDataSet *tmpPDS;
-    TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry) {
-        UA_DataSetField *tmpField;
-        TAILQ_FOREACH(tmpField, &tmpPDS->fields, listEntry) {
-            if(UA_NodeId_equal(&tmpField->identifier, &identifier))
-                return tmpField;
-        }
-    }
-    return NULL;
-}
-
-void
-UA_DataSetFieldConfig_clear(UA_DataSetFieldConfig *dataSetFieldConfig) {
-    if(dataSetFieldConfig->dataSetFieldType == UA_PUBSUB_DATASETFIELD_VARIABLE) {
-        UA_String_clear(&dataSetFieldConfig->field.variable.fieldNameAlias);
-        UA_PublishedVariableDataType_clear(&dataSetFieldConfig->field.variable.publishParameters);
-    }
-}
-
 /*********************************************************/
 /*               PublishValues handling                  */
 /*********************************************************/
@@ -1092,33 +459,6 @@ valueChangedVariant(UA_Variant *oldValue, UA_Variant *newValue) {
 }
 #endif
 
-/* Obtain the latest value for a specific DataSetField. This method is currently
- * called inside the DataSetMessage generation process. */
-static void
-UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
-                                  UA_DataValue *value) {
-    UA_PublishedVariableDataType *params = &field->config.field.variable.publishParameters;
-
-    /* Read the value */
-    if(field->config.field.variable.rtValueSource.rtInformationModelNode) {
-        const UA_VariableNode *rtNode = (const UA_VariableNode *)
-            UA_NODESTORE_GET(server, &params->publishedVariable);
-        *value = **rtNode->valueBackend.backend.external.value;
-        value->value.storageType = UA_VARIANT_DATA_NODELETE;
-        UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
-    } else if(field->config.field.variable.rtValueSource.rtFieldSourceEnabled == false){
-        UA_ReadValueId rvid;
-        UA_ReadValueId_init(&rvid);
-        rvid.nodeId = params->publishedVariable;
-        rvid.attributeId = params->attributeId;
-        rvid.indexRange = params->indexRange;
-        *value = readAttribute(server, &rvid, UA_TIMESTAMPSTORETURN_BOTH);
-    } else {
-        *value = **field->config.field.variable.rtValueSource.staticValueSource;
-        value->value.storageType = UA_VARIANT_DATA_NODELETE;
-    }
-}
-
 static UA_StatusCode
 UA_PubSubDataSetWriter_generateKeyFrameMessage(UA_Server *server,
                                                UA_DataSetMessage *dataSetMessage,

From 9db33027db307b56047e648df8da2b27fdee4e7a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Dec 2022 09:56:23 +0100
Subject: [PATCH 0583/1963] refactor(pubsub): Use UA_KeyValueMap instead of raw
 UA_KeyValuePair

---
 CHANGELOG                                     |  7 +++
 examples/pubsub/tutorial_pubsub_connection.c  | 10 +--
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |  4 +-
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   |  4 +-
 .../nodeset/pubsub_nodeset_rt_publisher.c     |  4 +-
 .../pubsub_realtime/pubsub_TSN_loopback.c     |  8 +--
 .../pubsub_TSN_loopback_single_thread.c       |  6 +-
 .../pubsub_realtime/pubsub_TSN_publisher.c    |  8 +--
 .../pubsub_TSN_publisher_multiple_thread.c    |  6 +-
 include/open62541/server_pubsub.h             | 12 ++--
 plugins/ua_pubsub_ethernet.c                  | 51 +++++++--------
 plugins/ua_pubsub_mqtt.c                      | 63 ++++++++++---------
 plugins/ua_pubsub_udp.c                       | 10 ++-
 src/pubsub/ua_pubsub_connection.c             | 22 +------
 src/pubsub/ua_pubsub_ns0.c                    |  4 +-
 src/pubsub/ua_pubsub_readergroup.c            | 31 +++------
 src/pubsub/ua_pubsub_writer.c                 | 19 ++----
 src/pubsub/ua_pubsub_writergroup.c            | 16 +----
 .../pubsub/check_pubsub_connection_ethernet.c | 16 ++---
 .../check_pubsub_connection_ethernet_etf.c    | 32 +++++-----
 tests/pubsub/check_pubsub_connection_mqtt.c   | 20 +++---
 tests/pubsub/check_pubsub_connection_udp.c    | 16 ++---
 tests/pubsub/check_pubsub_mqtt.c              |  4 +-
 .../check_pubsub_publish_ethernet_etf.c       |  8 +--
 24 files changed, 166 insertions(+), 215 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e7be05c5810..0734351813d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2022-12-03 Julius Pfrommer <julius.pfrommer at iosb.fraunhofer.de>
+
+ * KeyValueMap in PubSub configuration
+
+   The UA_KeyValueMap structure is used everywhere instead of raw
+   arrays of UA_KeyValuePair.
+
 2022-11-19 Julius Pfrommer <julius.pfrommer at iosb.fraunhofer.de>
 
  * Thread-safe client
diff --git a/examples/pubsub/tutorial_pubsub_connection.c b/examples/pubsub/tutorial_pubsub_connection.c
index 05c32b9f253..cdf1a21732d 100644
--- a/examples/pubsub/tutorial_pubsub_connection.c
+++ b/examples/pubsub/tutorial_pubsub_connection.c
@@ -45,7 +45,7 @@ int main(void) {
     memset(&connectionConfig, 0, sizeof(connectionConfig));
     connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.enabled = UA_TRUE;
+    connectionConfig.enabled = true;
     /* The address and interface is part of the standard
      * defined UA_NetworkAddressUrlDataType. */
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
@@ -59,13 +59,13 @@ int main(void) {
     UA_UInt32 ttl = 10;
     UA_Variant_setScalar(&connectionOptions[0].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "loopback");
-    UA_Boolean loopback = UA_FALSE;
+    UA_Boolean loopback = false;
     UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
     connectionOptions[2].key = UA_QUALIFIEDNAME(0, "reuse");
-    UA_Boolean reuse = UA_TRUE;
+    UA_Boolean reuse = true;
     UA_Variant_setScalar(&connectionOptions[2].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 3;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 3;
     /* Create a new concrete connection and add the connection
      * to the current PubSub configuration. */
     UA_NodeId connectionIdentifier;
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 007dbaa8579..7d894b8491e 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -156,8 +156,8 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttCaFile, &UA_TYPES[UA_TYPES_STRING]);
 #endif
 
-    connectionConfig.connectionProperties = connectionOptions;
-    connectionConfig.connectionPropertiesSize = connectionOptionIndex;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = connectionOptionIndex;
 
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index 62ea7f3d908..95301432d67 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -126,8 +126,8 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttCaFile, &UA_TYPES[UA_TYPES_STRING]);
 #endif
 
-    connectionConfig.connectionProperties = connectionOptions;
-    connectionConfig.connectionPropertiesSize = connectionOptionIndex;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = connectionOptionIndex;
 
     retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
index 7e6a1bb5ffb..5f9db6b693b 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
@@ -267,8 +267,8 @@ addPubSubConnection(UA_Server *server, UA_NetworkAddressUrlDataType *networkAddr
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Boolean enableTxTime  = UA_TRUE;
     UA_Variant_setScalar(&connectionOptions[1].value, &enableTxTime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map     = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index 39e5999bfff..106ee56ed46 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -466,8 +466,8 @@ addPubSubConnectionSubscriber(UA_Server *server,
     connectionOptions[3].key = UA_QUALIFIEDNAME(0, "xdpbindflag");
     UA_UInt32 bindflags = xdpBindFlag;
     UA_Variant_setScalar(&connectionOptions[3].value, &bindflags, &UA_TYPES[UA_TYPES_UINT16]);
-    connectionConfig.connectionProperties = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 4;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 4;
 
 
     UA_NetworkAddressUrlDataType networkAddressUrlsubscribe = *networkAddressUrlSubscriber;
@@ -750,8 +750,8 @@ addPubSubConnection(UA_Server *server, UA_NetworkAddressUrlDataType *networkAddr
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Variant_setScalar(&connectionOptions[1].value, &disableSoTxtime,
                          &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index c981e070118..3319ca99f2f 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -600,11 +600,11 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Variant_setScalar(&connectionOptions[1].value, &disableSoTxtime, &UA_TYPES[UA_TYPES_BOOLEAN]);
 #endif
-    connectionConfig.connectionProperties     = connectionOptions;
+    connectionConfig.connectionProperties.map = connectionOptions;
 #ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.mapSize = 2;
 #else
-    connectionConfig.connectionPropertiesSize = 1;
+    connectionConfig.connectionProperties.mapSize = 1;
 #endif
 
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index 2c2820c0a65..fef2e33c5a1 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -465,8 +465,8 @@ addPubSubConnectionSubscriber(UA_Server *server,
     connectionOptions[3].key                  = UA_QUALIFIEDNAME(0, "xdpbindflag");
     UA_UInt32 bindflags                       = xdpBindFlag;
     UA_Variant_setScalar(&connectionOptions[3].value, &bindflags, &UA_TYPES[UA_TYPES_UINT16]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 4;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 4;
 
 
     UA_NetworkAddressUrlDataType networkAddressUrlsubscribe = *networkAddressUrlSubscriber;
@@ -743,8 +743,8 @@ addPubSubConnection(UA_Server *server, UA_NetworkAddressUrlDataType *networkAddr
     UA_Variant_setScalar(&connectionOptions[0].value, &socketPriority, &UA_TYPES[UA_TYPES_UINT32]);
     connectionOptions[1].key                  = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Variant_setScalar(&connectionOptions[1].value, &disableSoTxtime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
 
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index 7d1918f837f..82258da3006 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -611,11 +611,11 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Variant_setScalar(&connectionOptions[1].value, &disableSoTxtime, &UA_TYPES[UA_TYPES_BOOLEAN]);
 #endif
-    connectionConfig.connectionProperties     = connectionOptions;
+    connectionConfig.connectionProperties.map = connectionOptions;
 #ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.mapSize = 2;
 #else
-    connectionConfig.connectionPropertiesSize = 1;
+    connectionConfig.connectionProperties.mapSize = 1;
 #endif
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index fbaffd72fb0..549d868adc5 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -174,8 +174,7 @@ struct UA_PubSubConnectionConfig {
     UA_PublisherId publisherId;
     UA_String transportProfileUri;
     UA_Variant address;
-    size_t connectionPropertiesSize;
-    UA_KeyValuePair *connectionProperties;
+    UA_KeyValueMap connectionProperties;
     UA_Variant connectionTransportSettings;
 };
 
@@ -505,8 +504,7 @@ typedef struct {
     UA_Byte priority;
     UA_ExtensionObject transportSettings;
     UA_ExtensionObject messageSettings;
-    size_t groupPropertiesSize;
-    UA_KeyValuePair *groupProperties;
+    UA_KeyValueMap groupProperties;
     UA_PubSubEncodingType encodingMimeType;
     /* PubSub Manager Callback */
     UA_PubSub_CallbackLifecycle pubsubManagerCallback;
@@ -593,8 +591,7 @@ typedef struct {
     UA_ExtensionObject messageSettings;
     UA_ExtensionObject transportSettings;
     UA_String dataSetName;
-    size_t dataSetWriterPropertiesSize;
-    UA_KeyValuePair *dataSetWriterProperties;
+    UA_KeyValueMap dataSetWriterProperties;
 } UA_DataSetWriterConfig;
 
 void UA_EXPORT
@@ -793,8 +790,7 @@ typedef struct {
     UA_Boolean enableBlockingSocket; // To enable or disable blocking socket option
     UA_UInt32 timeout; // Timeout for receive to wait for the packets
     UA_PubSubRTLevel rtLevel;
-    size_t groupPropertiesSize;
-    UA_KeyValuePair *groupProperties;
+    UA_KeyValueMap groupProperties;
     UA_PubSubEncodingType encodingMimeType;
     UA_ExtensionObject transportSettings;
 
diff --git a/plugins/ua_pubsub_ethernet.c b/plugins/ua_pubsub_ethernet.c
index c069683d919..6641e78009e 100644
--- a/plugins/ua_pubsub_ethernet.c
+++ b/plugins/ua_pubsub_ethernet.c
@@ -632,41 +632,42 @@ UA_PubSubChannelEthernet_open(const UA_PubSubConnectionConfig *connectionConfig)
     UA_String enableErrorReport = UA_STRING("enableerrorreport");
 
     /* iterate over the given KeyValuePair paramters */
-    for(size_t i = 0; i < connectionConfig->connectionPropertiesSize; i++){
-        if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &socketPriority)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_UINT32])){
+    for(size_t i = 0; i < connectionConfig->connectionProperties.mapSize; i++){
+        UA_KeyValuePair *prop = &connectionConfig->connectionProperties.map[i];
+        if(UA_String_equal(&prop->key.name, &socketPriority)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
                 sockOptions.socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
-                UA_UInt32_copy((UA_UInt32 *) connectionConfig->connectionProperties[i].value.data, sockOptions.socketPriority);
+                UA_UInt32_copy((UA_UInt32 *) prop->value.data, sockOptions.socketPriority);
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &enableSocketTxtime)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                sockOptions.enableSocketTxTime = *(UA_Boolean *) connectionConfig->connectionProperties[i].value.data;
+        } else if(UA_String_equal(&prop->key.name, &enableSocketTxtime)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
+                sockOptions.enableSocketTxTime = *(UA_Boolean *) prop->value.data;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &enableDeadlineMode)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                if(*(UA_Boolean *) connectionConfig->connectionProperties[i].value.data == UA_TRUE)
+        } else if(UA_String_equal(&prop->key.name, &enableDeadlineMode)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
+                if(*(UA_Boolean *) prop->value.data == UA_TRUE)
                     sockOptions.sotxtimeDeadlinemode = SOF_TXTIME_DEADLINE_MODE;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &enableErrorReport)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                if(*(UA_Boolean *) connectionConfig->connectionProperties[i].value.data == UA_TRUE)
+        } else if(UA_String_equal(&prop->key.name, &enableErrorReport)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
+                if(*(UA_Boolean *) prop->value.data == UA_TRUE)
                     sockOptions.sotxtimeDeadlinemode = SOF_TXTIME_REPORT_ERRORS;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &xdpSocketParam)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                sockOptions.enableXdpSocket = *(UA_Boolean *) connectionConfig->connectionProperties[i].value.data;
+        } else if(UA_String_equal(&prop->key.name, &xdpSocketParam)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
+                sockOptions.enableXdpSocket = *(UA_Boolean *) prop->value.data;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &xdpFlagParam)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_UINT32])){
-                sockOptions.xdp_flags = *(UA_UInt32 *) connectionConfig->connectionProperties[i].value.data;
+        } else if(UA_String_equal(&prop->key.name, &xdpFlagParam)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
+                sockOptions.xdp_flags = *(UA_UInt32 *) prop->value.data;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &hwReceiveQueueParam)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_UINT32])){
-                sockOptions.hw_receive_queue = *(UA_UInt32 *) connectionConfig->connectionProperties[i].value.data;
+        } else if(UA_String_equal(&prop->key.name, &hwReceiveQueueParam)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
+                sockOptions.hw_receive_queue = *(UA_UInt32 *) prop->value.data;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &xdpBindFlagParam)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_UINT16])){
-                sockOptions.xdp_bind_flags = *(UA_UInt16 *) connectionConfig->connectionProperties[i].value.data;
+        } else if(UA_String_equal(&prop->key.name, &xdpBindFlagParam)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT16])){
+                sockOptions.xdp_bind_flags = *(UA_UInt16 *) prop->value.data;
             }
         } else {
             UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Ethernet Connection creation. Unknown connection parameter.");
diff --git a/plugins/ua_pubsub_mqtt.c b/plugins/ua_pubsub_mqtt.c
index b85bd27e0bc..6d91e212d34 100644
--- a/plugins/ua_pubsub_mqtt.c
+++ b/plugins/ua_pubsub_mqtt.c
@@ -83,46 +83,47 @@ UA_PubSubChannelMQTT_open(const UA_PubSubConnectionConfig *connectionConfig) {
             username = UA_STRING("mqttUsername"), password = UA_STRING("mqttPassword"), caFilePath = UA_STRING("mqttCaFilePath"),
             caPath = UA_STRING("mqttCaPath"), useTLS = UA_STRING("mqttUseTLS"), clientCertPath = UA_STRING("mqttClientCertPath"),
             clientKeyPath = UA_STRING("mqttClientKeyPath");
-    for(size_t i = 0; i < connectionConfig->connectionPropertiesSize; i++){
-        if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &sendBuffer)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_UINT32])){
-                channelDataMQTT->mqttSendBufferSize = *(UA_UInt32 *) connectionConfig->connectionProperties[i].value.data;
+    for(size_t i = 0; i < connectionConfig->connectionProperties.mapSize; i++){
+        UA_KeyValuePair *prop = &connectionConfig->connectionProperties.map[i];
+        if(UA_String_equal(&prop->key.name, &sendBuffer)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
+                channelDataMQTT->mqttSendBufferSize = *(UA_UInt32 *) prop->value.data;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &recvBuffer)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_UINT32])){
-                channelDataMQTT->mqttRecvBufferSize = *(UA_UInt32 *) connectionConfig->connectionProperties[i].value.data;
+        } else if(UA_String_equal(&prop->key.name, &recvBuffer)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
+                channelDataMQTT->mqttRecvBufferSize = *(UA_UInt32 *) prop->value.data;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &clientId)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_STRING])){
-                channelDataMQTT->mqttClientId = (UA_String *) connectionConfig->connectionProperties[i].value.data;
+        } else if(UA_String_equal(&prop->key.name, &clientId)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
+                channelDataMQTT->mqttClientId = (UA_String *) prop->value.data;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &username)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) connectionConfig->connectionProperties[i].value.data, &channelDataMQTT->mqttUsername);
+        } else if(UA_String_equal(&prop->key.name, &username)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
+                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttUsername);
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &password)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) connectionConfig->connectionProperties[i].value.data, &channelDataMQTT->mqttPassword);
+        } else if(UA_String_equal(&prop->key.name, &password)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
+                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttPassword);
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &caFilePath)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) connectionConfig->connectionProperties[i].value.data, &channelDataMQTT->mqttCaFilePath);
+        } else if(UA_String_equal(&prop->key.name, &caFilePath)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
+                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttCaFilePath);
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &caPath)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) connectionConfig->connectionProperties[i].value.data, &channelDataMQTT->mqttCaPath);
+        } else if(UA_String_equal(&prop->key.name, &caPath)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
+                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttCaPath);
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &useTLS)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                channelDataMQTT->mqttUseTLS = *(UA_Boolean *) connectionConfig->connectionProperties[i].value.data;
+        } else if(UA_String_equal(&prop->key.name, &useTLS)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
+                channelDataMQTT->mqttUseTLS = *(UA_Boolean *) prop->value.data;
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &clientCertPath)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) connectionConfig->connectionProperties[i].value.data, &channelDataMQTT->mqttClientCertPath);
+        } else if(UA_String_equal(&prop->key.name, &clientCertPath)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
+                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttClientCertPath);
             }
-        } else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &clientKeyPath)){
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) connectionConfig->connectionProperties[i].value.data, &channelDataMQTT->mqttClientKeyPath);
+        } else if(UA_String_equal(&prop->key.name, &clientKeyPath)){
+            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
+                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttClientKeyPath);
             }
         }  else {
             UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT Connection creation. Unknown connection parameter.");
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 1a9ab1219d9..29f9ebc6363 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -126,8 +126,7 @@ chooseValidAddrInfoAndCreateSocket(UA_SOCKET *sockfd, struct addrinfo* addrInfoL
 
 static void
 UA_setConnectionConfigurationProperties(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
-                                        const UA_KeyValuePair *connectionProperties,
-                                        const size_t connectionPropertiesSize) {
+                                        const UA_KeyValueMap *connectionProperties) {
     /* Set default values */
     memset(channelDataUDPMC, 0, sizeof(UA_PubSubChannelDataUDPMC));
     channelDataUDPMC->messageTTL = 255;
@@ -142,8 +141,8 @@ UA_setConnectionConfigurationProperties(UA_PubSubChannelDataUDPMC *channelDataUD
 #ifdef __linux__
     UA_String socketPriorityParam = UA_STRING("sockpriority");
 #endif
-    for(size_t i = 0; i < connectionPropertiesSize; i++) {
-        const UA_KeyValuePair *prop = &connectionProperties[i];
+    for(size_t i = 0; i < connectionProperties->mapSize; i++) {
+        const UA_KeyValuePair *prop = &connectionProperties->map[i];
         if(UA_String_equal(&prop->key.name, &ttlParam)) {
             if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
                 channelDataUDPMC->messageTTL = *(UA_UInt32*)prop->value.data;
@@ -312,8 +311,7 @@ UA_PubSubChannelDataUDPMC_new(UA_PubSubChannel *channel, const UA_PubSubConnecti
                      "PubSub Connection creation failed. Out of memory.");
         goto error;
     }
-    UA_setConnectionConfigurationProperties(channelDataUDPMC, connectionConfig->connectionProperties,
-                                            connectionConfig->connectionPropertiesSize);
+    UA_setConnectionConfigurationProperties(channelDataUDPMC, &connectionConfig->connectionProperties);
     UA_NetworkAddressUrlDataType *address =
         (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
 
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index de57619a00e..a0bf4a9b5a4 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -28,20 +28,8 @@ UA_PubSubConnectionConfig_copy(const UA_PubSubConnectionConfig *src,
     res |= UA_String_copy(&src->transportProfileUri, &dst->transportProfileUri);
     res |= UA_Variant_copy(&src->connectionTransportSettings,
                            &dst->connectionTransportSettings);
-    if(src->connectionPropertiesSize > 0) {
-        dst->connectionProperties = (UA_KeyValuePair *)
-            UA_calloc(src->connectionPropertiesSize, sizeof(UA_KeyValuePair));
-        if(!dst->connectionProperties) {
-            UA_PubSubConnectionConfig_clear(dst);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        for(size_t i = 0; i < src->connectionPropertiesSize; i++){
-            res |= UA_QualifiedName_copy(&src->connectionProperties[i].key,
-                                            &dst->connectionProperties[i].key);
-            res |= UA_Variant_copy(&src->connectionProperties[i].value,
-                                      &dst->connectionProperties[i].value);
-        }
-    }
+    res |= UA_KeyValueMap_copy(&src->connectionProperties,
+                               &dst->connectionProperties);
     if(res != UA_STATUSCODE_GOOD)
         UA_PubSubConnectionConfig_clear(dst);
     return res;
@@ -78,11 +66,7 @@ UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig) {
     UA_String_clear(&connectionConfig->transportProfileUri);
     UA_Variant_clear(&connectionConfig->connectionTransportSettings);
     UA_Variant_clear(&connectionConfig->address);
-    for(size_t i = 0; i < connectionConfig->connectionPropertiesSize; i++){
-        UA_QualifiedName_clear(&connectionConfig->connectionProperties[i].key);
-        UA_Variant_clear(&connectionConfig->connectionProperties[i].value);
-    }
-    UA_free(connectionConfig->connectionProperties);
+    UA_KeyValueMap_clear(&connectionConfig->connectionProperties);
 }
 
 void
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index bbb7f41b26e..ac1e1482ee4 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -597,8 +597,8 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
     }
 
     retVal |= writePubSubNs0VariableArray(server, connectionPropertieNode.identifier.numeric,
-                                          connection->config->connectionProperties,
-                                          connection->config->connectionPropertiesSize,
+                                          connection->config->connectionProperties.map,
+                                          connection->config->connectionProperties.mapSize,
                                           &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
 
     UA_NetworkAddressUrlDataType *networkAddressUrl=
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index d56a8d0fbf7..9bde6989236 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -58,38 +58,21 @@ UA_StatusCode
 UA_ReaderGroupConfig_copy(const UA_ReaderGroupConfig *src,
                           UA_ReaderGroupConfig *dst) {
     memcpy(dst, src, sizeof(UA_ReaderGroupConfig));
-
-    UA_StatusCode res = UA_String_copy(&src->name, &dst->name);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-
-    res = UA_Array_copy(src->groupProperties, src->groupPropertiesSize,
-                        (void**)&dst->groupProperties,
-                        &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_String_clear(&dst->name);
-        return res;
-    }
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    res |= UA_String_copy(&src->name, &dst->name);
+    res |= UA_KeyValueMap_copy(&src->groupProperties, &dst->groupProperties);
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     res = UA_String_copy(&src->securityGroupId, &dst->securityGroupId);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_String_clear(&dst->name);
-        UA_String_clear(&dst->securityGroupId);
-        return res;
-    }
 #endif
-    dst->groupPropertiesSize = src->groupPropertiesSize;
-    return UA_STATUSCODE_GOOD;
+    if(res != UA_STATUSCODE_GOOD)
+        UA_ReaderGroupConfig_clear(dst);
+    return res;
 }
 
 void
 UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig) {
     UA_String_clear(&readerGroupConfig->name);
-    UA_Array_delete(readerGroupConfig->groupProperties,
-                    readerGroupConfig->groupPropertiesSize,
-                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    readerGroupConfig->groupProperties = NULL;
-    readerGroupConfig->groupPropertiesSize = 0;
+    UA_KeyValueMap_clear(&readerGroupConfig->groupProperties);
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_String_clear(&readerGroupConfig->securityGroupId);
 #endif
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index e63b14eeb84..119d0efc9b4 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -33,16 +33,9 @@ UA_DataSetWriterConfig_copy(const UA_DataSetWriterConfig *src,
     retVal |= UA_String_copy(&src->name, &dst->name);
     retVal |= UA_String_copy(&src->dataSetName, &dst->dataSetName);
     retVal |= UA_ExtensionObject_copy(&src->messageSettings, &dst->messageSettings);
-    if(src->dataSetWriterPropertiesSize > 0) {
-        dst->dataSetWriterProperties = (UA_KeyValuePair *)
-            UA_calloc(src->dataSetWriterPropertiesSize, sizeof(UA_KeyValuePair));
-        if(!dst->dataSetWriterProperties)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        for(size_t i = 0; i < src->dataSetWriterPropertiesSize; i++){
-            retVal |= UA_KeyValuePair_copy(&src->dataSetWriterProperties[i],
-                                           &dst->dataSetWriterProperties[i]);
-        }
-    }
+    retVal |= UA_KeyValueMap_copy(&src->dataSetWriterProperties, &dst->dataSetWriterProperties);
+    if(retVal != UA_STATUSCODE_GOOD)
+        UA_DataSetWriterConfig_clear(dst);
     return retVal;
 }
 
@@ -91,11 +84,9 @@ void
 UA_DataSetWriterConfig_clear(UA_DataSetWriterConfig *pdsConfig) {
     UA_String_clear(&pdsConfig->name);
     UA_String_clear(&pdsConfig->dataSetName);
-    for(size_t i = 0; i < pdsConfig->dataSetWriterPropertiesSize; i++) {
-        UA_KeyValuePair_clear(&pdsConfig->dataSetWriterProperties[i]);
-    }
-    UA_free(pdsConfig->dataSetWriterProperties);
+    UA_KeyValueMap_clear(&pdsConfig->dataSetWriterProperties);
     UA_ExtensionObject_clear(&pdsConfig->messageSettings);
+    memset(pdsConfig, 0, sizeof(UA_DataSetWriterConfig));
 }
 
 static void
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 242a3ce5c9b..fad06feb09c 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -495,15 +495,7 @@ UA_WriterGroupConfig_copy(const UA_WriterGroupConfig *src,
     res |= UA_String_copy(&src->name, &dst->name);
     res |= UA_ExtensionObject_copy(&src->transportSettings, &dst->transportSettings);
     res |= UA_ExtensionObject_copy(&src->messageSettings, &dst->messageSettings);
-    if(src->groupPropertiesSize > 0) {
-        dst->groupProperties = (UA_KeyValuePair*)
-            UA_calloc(src->groupPropertiesSize, sizeof(UA_KeyValuePair));
-        if(!dst->groupProperties)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        for(size_t i = 0; i < src->groupPropertiesSize; i++) {
-            res |= UA_KeyValuePair_copy(&src->groupProperties[i], &dst->groupProperties[i]);
-        }
-    }
+    res |= UA_KeyValueMap_copy(&src->groupProperties, &dst->groupProperties);
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     res |= UA_String_copy(&src->securityGroupId, &dst->securityGroupId);
 #endif
@@ -652,13 +644,11 @@ UA_WriterGroupConfig_clear(UA_WriterGroupConfig *writerGroupConfig) {
     UA_String_clear(&writerGroupConfig->name);
     UA_ExtensionObject_clear(&writerGroupConfig->transportSettings);
     UA_ExtensionObject_clear(&writerGroupConfig->messageSettings);
-    UA_Array_delete(writerGroupConfig->groupProperties,
-                    writerGroupConfig->groupPropertiesSize,
-                    &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    writerGroupConfig->groupProperties = NULL;
+    UA_KeyValueMap_clear(&writerGroupConfig->groupProperties);
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_String_clear(&writerGroupConfig->securityGroupId);
 #endif
+    memset(writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
 }
 
 static void
diff --git a/tests/pubsub/check_pubsub_connection_ethernet.c b/tests/pubsub/check_pubsub_connection_ethernet.c
index 24d1f7b5bfa..d2f26931ea6 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet.c
@@ -163,8 +163,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
-    connectionConf.connectionPropertiesSize = 3;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.map = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 3;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
@@ -195,8 +195,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
-    connectionConf.connectionPropertiesSize = 3;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.map = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 3;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
@@ -205,15 +205,15 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     retVal |= UA_Server_getPubSubConnectionConfig(server, connection, &connectionConfig);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    ck_assert(connectionConfig.connectionPropertiesSize == connectionConf.connectionPropertiesSize);
+    ck_assert(connectionConfig.connectionProperties.mapSize == connectionConf.connectionProperties.mapSize);
     ck_assert(UA_String_equal(&connectionConfig.name, &connectionConf.name) == UA_TRUE);
     ck_assert(UA_String_equal(&connectionConfig.transportProfileUri, &connectionConf.transportProfileUri) == UA_TRUE);
     UA_NetworkAddressUrlDataType networkAddressUrlDataCopy = *((UA_NetworkAddressUrlDataType *)connectionConfig.address.data);
     ck_assert(UA_calcSizeBinary(&networkAddressUrlDataCopy, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) ==
               UA_calcSizeBinary(&networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]));
-    for(size_t i = 0; i < connectionConfig.connectionPropertiesSize; i++){
-        ck_assert(UA_String_equal(&connectionConfig.connectionProperties[i].key.name, &connectionConf.connectionProperties[i].key.name) == UA_TRUE);
-        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties[i].value));
+    for(size_t i = 0; i < connectionConfig.connectionProperties.mapSize; i++){
+        ck_assert(UA_String_equal(&connectionConfig.connectionProperties.map[i].key.name, &connectionConf.connectionProperties.map[i].key.name) == UA_TRUE);
+        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties.map[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties.map[i].value));
     }
     UA_PubSubConnectionConfig_clear(&connectionConfig);
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_connection_ethernet_etf.c b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
index 315ad4c6c51..aa1622c1cba 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
@@ -53,8 +53,8 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Boolean enableTxTime  = UA_TRUE;
     UA_Variant_setScalar(&connectionOptions[1].value, &enableTxTime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -82,8 +82,8 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Boolean enableTxTime  = UA_TRUE;
     UA_Variant_setScalar(&connectionOptions[1].value, &enableTxTime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map     = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
     UA_NodeId connectionIdent;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
     ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
@@ -115,8 +115,8 @@ START_TEST(AddConnectionWithInvalidAddress){
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Boolean enableTxTime  = UA_TRUE;
     UA_Variant_setScalar(&connectionOptions[1].value, &enableTxTime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map     = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
@@ -142,8 +142,8 @@ START_TEST(AddConnectionWithInvalidInterface){
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Boolean enableTxTime  = UA_TRUE;
     UA_Variant_setScalar(&connectionOptions[1].value, &enableTxTime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
@@ -203,8 +203,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
-    connectionConf.connectionPropertiesSize = 5;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.map = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 5;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
@@ -242,8 +242,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
-    connectionConf.connectionPropertiesSize = 5;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.map = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 5;
     connectionConf.address = address;
 
     UA_NodeId connection;
@@ -253,15 +253,15 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     retVal |= UA_Server_getPubSubConnectionConfig(server, connection, &connectionConfig);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    ck_assert(connectionConfig.connectionPropertiesSize == connectionConf.connectionPropertiesSize);
+    ck_assert(connectionConfig.connectionProperties.mapSize == connectionConf.connectionProperties.mapSize);
     ck_assert(UA_String_equal(&connectionConfig.name, &connectionConf.name) == UA_TRUE);
     ck_assert(UA_String_equal(&connectionConfig.transportProfileUri, &connectionConf.transportProfileUri) == UA_TRUE);
     UA_NetworkAddressUrlDataType networkAddressUrlDataCopy = *((UA_NetworkAddressUrlDataType *)connectionConfig.address.data);
     ck_assert(UA_calcSizeBinary(&networkAddressUrlDataCopy, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) ==
               UA_calcSizeBinary(&networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]));
-    for(size_t i = 0; i < connectionConfig.connectionPropertiesSize; i++){
-        ck_assert(UA_String_equal(&connectionConfig.connectionProperties[i].key.name, &connectionConf.connectionProperties[i].key.name) == UA_TRUE);
-        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties[i].value));
+    for(size_t i = 0; i < connectionConfig.connectionProperties.mapSize; i++){
+        ck_assert(UA_String_equal(&connectionConfig.connectionProperties.map[i].key.name, &connectionConf.connectionProperties.map[i].key.name) == UA_TRUE);
+        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties.map[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties.map[i].value));
     }
     UA_PubSubConnectionConfig_clear(&connectionConfig);
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index 7e744346aae..31a61094c56 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -146,8 +146,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
-    connectionConf.connectionPropertiesSize = 3;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.map = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 3;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
@@ -179,8 +179,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
-    connectionConf.connectionPropertiesSize = 3;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.map = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 3;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
@@ -189,7 +189,7 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     retVal |= UA_Server_getPubSubConnectionConfig(server, connection, &connectionConfig);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    ck_assert(connectionConfig.connectionPropertiesSize == connectionConf.connectionPropertiesSize);
+    ck_assert(connectionConfig.connectionProperties.mapSize == connectionConf.connectionProperties.mapSize);
     ck_assert(UA_String_equal(&connectionConfig.name, &connectionConf.name) == UA_TRUE);
     ck_assert(UA_String_equal(&connectionConfig.transportProfileUri, &connectionConf.transportProfileUri) == UA_TRUE);
     UA_NetworkAddressUrlDataType networkAddressUrlDataCopy =
@@ -198,11 +198,11 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
                                 &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) ==
               UA_calcSizeBinary(&networkAddressUrlData,
                                 &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]));
-    for(size_t i = 0; i < connectionConfig.connectionPropertiesSize; i++){
-        ck_assert(UA_String_equal(&connectionConfig.connectionProperties[i].key.name,
-                                  &connectionConf.connectionProperties[i].key.name) == UA_TRUE);
-        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties[i].value) ==
-                  UA_Variant_calcSizeBinary(&connectionConf.connectionProperties[i].value));
+    for(size_t i = 0; i < connectionConfig.connectionProperties.mapSize; i++){
+        ck_assert(UA_String_equal(&connectionConfig.connectionProperties.map[i].key.name,
+                                  &connectionConf.connectionProperties.map[i].key.name) == UA_TRUE);
+        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties.map[i].value) ==
+                  UA_Variant_calcSizeBinary(&connectionConf.connectionProperties.map[i].value));
     }
     UA_PubSubConnectionConfig_clear(&connectionConfig);
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_connection_udp.c b/tests/pubsub/check_pubsub_connection_udp.c
index 7c3617aefc0..8765fb7455a 100644
--- a/tests/pubsub/check_pubsub_connection_udp.c
+++ b/tests/pubsub/check_pubsub_connection_udp.c
@@ -191,8 +191,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
     connectionConf.publisherId.uint64 = 223344;
-    connectionConf.connectionPropertiesSize = 3;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 3;
+    connectionConf.connectionProperties.map = connectionOptions;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
@@ -223,8 +223,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
     connectionConf.publisherId.uint64 = 223344;
-    connectionConf.connectionPropertiesSize = 3;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 3;
+    connectionConf.connectionProperties.map = connectionOptions;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
@@ -233,15 +233,15 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     retVal |= UA_Server_getPubSubConnectionConfig(server, connection, &connectionConfig);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    ck_assert(connectionConfig.connectionPropertiesSize == connectionConf.connectionPropertiesSize);
+    ck_assert(connectionConfig.connectionProperties.mapSize == connectionConf.connectionProperties.mapSize);
     ck_assert(UA_String_equal(&connectionConfig.name, &connectionConf.name) == UA_TRUE);
     ck_assert(UA_String_equal(&connectionConfig.transportProfileUri, &connectionConf.transportProfileUri) == UA_TRUE);
     UA_NetworkAddressUrlDataType networkAddressUrlDataCopy = *((UA_NetworkAddressUrlDataType *)connectionConfig.address.data);
     ck_assert(UA_calcSizeBinary(&networkAddressUrlDataCopy, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) ==
               UA_calcSizeBinary(&networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]));
-    for(size_t i = 0; i < connectionConfig.connectionPropertiesSize; i++){
-        ck_assert(UA_String_equal(&connectionConfig.connectionProperties[i].key.name, &connectionConf.connectionProperties[i].key.name) == UA_TRUE);
-        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties[i].value));
+    for(size_t i = 0; i < connectionConfig.connectionProperties.mapSize; i++){
+        ck_assert(UA_String_equal(&connectionConfig.connectionProperties.map[i].key.name, &connectionConf.connectionProperties.map[i].key.name) == UA_TRUE);
+        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties.map[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties.map[i].value));
     }
     UA_PubSubConnectionConfig_clear(&connectionConfig);
     } END_TEST
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index a9a9bdd77cd..55bc6953fdb 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -67,8 +67,8 @@ static void setup(void) {
     UA_String mqttClientId = UA_STRING(MQTT_CLIENT_ID);
     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttClientId, &UA_TYPES[UA_TYPES_STRING]);
 
-    connectionConfig.connectionProperties = connectionOptions;
-    connectionConfig.connectionPropertiesSize = connectionOptionIndex;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = connectionOptionIndex;
 
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index 9a3a35cbdc7..709b7be9004 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -81,8 +81,8 @@ START_TEST(EthernetSendWithoutVLANTag) {
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Boolean enableTxTime  = UA_TRUE;
     UA_Variant_setScalar(&connectionOptions[1].value, &enableTxTime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     if(!connection) {
@@ -134,8 +134,8 @@ START_TEST(EthernetSendWithVLANTag) {
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Boolean enableTxTime  = UA_TRUE;
     UA_Variant_setScalar(&connectionOptions[1].value, &enableTxTime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    connectionConfig.connectionProperties     = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 2;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 2;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     if(!connection) {

From 58f46cb810b12233246c723bf48a5bbe4296283e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 21:41:25 +0100
Subject: [PATCH 0584/1963] refactor(pubsub): Cosmetic improvements in
 server_pubsub.h

---
 include/open62541/server_pubsub.h | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 549d868adc5..a431f6223c2 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -55,7 +55,18 @@ _UA_BEGIN_DECLS
  * can be used with broker based protocols like MQTT and AMQP or brokerless
  * implementations like UDP-Multicasting.
  *
- * The PubSub API uses the following scheme:
+ * The configuration model for PubSub uses the following components: */
+
+typedef enum  {
+    UA_PUBSUB_COMPONENT_CONNECTION,
+    UA_PUBSUB_COMPONENT_WRITERGROUP,
+    UA_PUBSUB_COMPONENT_DATASETWRITER,
+    UA_PUBSUB_COMPONENT_READERGROUP,
+    UA_PUBSUB_COMPONENT_DATASETREADER
+} UA_PubSubComponentEnumType;
+
+/**
+ * The open62541 PubSub API uses the following scheme:
  *
  * 1. Create a configuration for the needed PubSub element.
  *
@@ -129,20 +140,11 @@ _UA_BEGIN_DECLS
  * The PubSub connections are the abstraction between the concrete transport protocol
  * and the PubSub functionality. It is possible to create multiple connections with
  * different transport protocols at runtime.
- *
- * Take a look on the PubSub Tutorials for mor details about the API usage.
  */
 
-typedef enum  {
-    UA_PUBSUB_COMPONENT_CONNECTION,
-    UA_PUBSUB_COMPONENT_WRITERGROUP,
-    UA_PUBSUB_COMPONENT_DATASETWRITER,
-    UA_PUBSUB_COMPONENT_READERGROUP,
-    UA_PUBSUB_COMPONENT_DATASETREADER
-} UA_PubSubComponentEnumType;
-
+/* Valid PublisherId types from Part 14 */
 typedef enum {
-    UA_PUBLISHERIDTYPE_BYTE = 0,
+    UA_PUBLISHERIDTYPE_BYTE   = 0,
     UA_PUBLISHERIDTYPE_UINT16 = 1,
     UA_PUBLISHERIDTYPE_UINT32 = 2,
     UA_PUBLISHERIDTYPE_UINT64 = 3,

From b4c519c7c6fbd6399cc9efd4ae0ddba2ed104a9d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 17 Dec 2022 20:57:05 +0100
Subject: [PATCH 0585/1963] fix(el): Don't warn for the "validate" parameter

---
 arch/eventloop_posix_udp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index edc562aeef5..399b832f2f6 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -262,6 +262,7 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *connectionProperties,
     UA_String portParam = UA_STRING("port");
     UA_String listenParam = UA_STRING("listen");
     UA_String interfaceParam = UA_STRING("interface");
+    UA_String validateParam = UA_STRING("validate");
 
 #ifdef __linux__
     UA_String socketPriorityParam = UA_STRING("sockpriority");
@@ -294,7 +295,8 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *connectionProperties,
         } else if (UA_String_equal(&prop->key.name, &hostnameParam) ||
                    UA_String_equal(&prop->key.name, &portParam) ||
                    UA_String_equal(&prop->key.name, &listenParam) ||
-                   UA_String_equal(&prop->key.name, &interfaceParam)) {
+                   UA_String_equal(&prop->key.name, &interfaceParam) ||
+                   UA_String_equal(&prop->key.name, &validateParam)) {
                 /* ignore, required args are handled elsewhere explicitly */
         } else {
             UA_LOG_WARNING(logger, UA_LOGCATEGORY_SERVER,

From 6df6267fc32b3d86f9272eca679a3acba2b57ced Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 17 Dec 2022 21:58:34 +0100
Subject: [PATCH 0586/1963] fix(pubsub): Fix a use-after-free in
 ua_pubsub_keystorage.c

---
 src/pubsub/ua_pubsub_keystorage.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index b6d7660f0c4..84949c31243 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -54,11 +54,11 @@ UA_PubSubKeyStorage_clearKeyList(UA_PubSubKeyStorage *keyStorage) {
     if(TAILQ_EMPTY(&keyStorage->keyList))
         return;
 
-    UA_PubSubKeyListItem *item;
-    TAILQ_FOREACH(item, &keyStorage->keyList, keyListEntry){
-            TAILQ_REMOVE(&keyStorage->keyList, item, keyListEntry);
-            UA_ByteString_clear(&item->key);
-            UA_free(item);
+    UA_PubSubKeyListItem *item, *item_tmp;
+    TAILQ_FOREACH_SAFE(item, &keyStorage->keyList, keyListEntry, item_tmp) {
+        TAILQ_REMOVE(&keyStorage->keyList, item, keyListEntry);
+        UA_ByteString_clear(&item->key);
+        UA_free(item);
     }
     keyStorage->keyListSize = 0;
 }

From 7e456cb77b25d68649f0d68afc852eb09ebbdb26 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 17 Dec 2022 21:59:09 +0100
Subject: [PATCH 0587/1963] refactor(pubsub): Cosmetic improvements in
 ua_pubsub_keystorage.c

---
 src/pubsub/ua_pubsub_keystorage.c | 36 ++++++++++++-------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 84949c31243..990b08d4ccc 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -14,16 +14,13 @@
 
 UA_PubSubKeyStorage *
 UA_Server_findKeyStorage(UA_Server *server, UA_String securityGroupId) {
-
     if(!server || UA_String_isEmpty(&securityGroupId))
         return NULL;
 
-    UA_PubSubKeyStorage *outKeyStorage, *keyStorageTemp;
-    LIST_FOREACH_SAFE(outKeyStorage, &server->pubSubManager.pubSubKeyList, keyStorageList,
-                      keyStorageTemp) {
-        if(UA_String_equal(&outKeyStorage->securityGroupID, &securityGroupId)) {
+    UA_PubSubKeyStorage *outKeyStorage;
+    LIST_FOREACH(outKeyStorage, &server->pubSubManager.pubSubKeyList, keyStorageList) {
+        if(UA_String_equal(&outKeyStorage->securityGroupID, &securityGroupId))
             return outKeyStorage;
-        }
     }
     return NULL;
 }
@@ -312,33 +309,29 @@ setPubSubGroupEncryptingKeyForMatchingSecurityGroupId(
     UA_StatusCode retval = UA_STATUSCODE_BAD;
     UA_PubSubConnection *tmpPubSubConnections;
 
-    /* key storage is the same for all reader / writer groups, channel context isn't
+    /* Key storage is the same for all reader / writer groups, channel context isn't
      * => Update channelcontext in all Writergroups / ReaderGroups which have the same
      * securityGroupId*/
     TAILQ_FOREACH(tmpPubSubConnections, &server->pubSubManager.connections, listEntry) {
-        /*ForEach writerGroup in server with matching SecurityGroupId*/
+        /* For each writerGroup in server with matching SecurityGroupId */
         UA_WriterGroup *tmpWriterGroup;
         LIST_FOREACH(tmpWriterGroup, &tmpPubSubConnections->writerGroups, listEntry) {
-
-            if(UA_String_equal(&tmpWriterGroup->config.securityGroupId,
-                               &securityGroupId)) {
-                retval = UA_Server_setWriterGroupEncryptionKeys(
-                    server, tmpWriterGroup->identifier, securityTokenId, signingKey,
-                    encryptingKey, keyNonce);
+            if(UA_String_equal(&tmpWriterGroup->config.securityGroupId, &securityGroupId)) {
+                retval = UA_Server_setWriterGroupEncryptionKeys(server, tmpWriterGroup->identifier,
+                                                                securityTokenId, signingKey,
+                                                                encryptingKey, keyNonce);
                 if(retval != UA_STATUSCODE_GOOD)
                     return retval;
             }
         }
 
-        /*ForEach readerGroup in server with matching SecurityGroupId*/
+        /* For each readerGroup in server with matching SecurityGroupId */
         UA_ReaderGroup *tmpReaderGroup;
         LIST_FOREACH(tmpReaderGroup, &tmpPubSubConnections->readerGroups, listEntry) {
-
-            if(UA_String_equal(&tmpReaderGroup->config.securityGroupId,
-                               &securityGroupId)) {
-                retval = UA_Server_setReaderGroupEncryptionKeys(
-                    server, tmpReaderGroup->identifier, securityTokenId, signingKey,
-                    encryptingKey, keyNonce);
+            if(UA_String_equal(&tmpReaderGroup->config.securityGroupId, &securityGroupId)) {
+                retval = UA_Server_setReaderGroupEncryptionKeys(server, tmpReaderGroup->identifier,
+                                                                securityTokenId, signingKey,
+                                                                encryptingKey, keyNonce);
                 if(retval != UA_STATUSCODE_GOOD)
                     return retval;
             }
@@ -466,6 +459,5 @@ UA_PubSubKeyStorage_removeKeyStorage(UA_Server *server, UA_PubSubKeyStorage *key
         LIST_REMOVE(keyStorage, keyStorageList);
         UA_PubSubKeyStorage_delete(server, keyStorage);
     }
-    return;
 }
 #endif

From a24032f23935fd2bdec8766d2d588f165634ecc3 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 19 Dec 2022 14:26:13 +0100
Subject: [PATCH 0588/1963] feat(pubsub) Extend PubSub API with on-demand
 pubslish functionality (#5423)

* feat(pubsub) extend api with on-demand publish functionality and last-publish timestamp

* feat(pubsub) add missing return code, extended example with on-demand-publish

* feat(pubsub) extend on-demand api with thread safety

* feat(pubsub) add dedicated publish on demand example
---
 examples/CMakeLists.txt                       |   1 +
 .../server_pubsub_publisher_on_demand.c       | 243 ++++++++++++++++++
 include/open62541/server_pubsub.h             |   7 +
 src/pubsub/ua_pubsub.h                        |   1 +
 src/pubsub/ua_pubsub_writergroup.c            |  33 +++
 tests/pubsub/check_pubsub_publish.c           |   8 +-
 tests/pubsub/check_pubsub_subscribe.c         | 153 ++++++++++-
 7 files changed, 443 insertions(+), 3 deletions(-)
 create mode 100644 examples/pubsub/server_pubsub_publisher_on_demand.c

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 4f14b6a1963..2d2fd3a89b7 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -209,6 +209,7 @@ add_subdirectory(nodeset)
 if(UA_ENABLE_PUBSUB)
     add_example(tutorial_pubsub_connection pubsub/tutorial_pubsub_connection.c)
     add_example(tutorial_pubsub_publish pubsub/tutorial_pubsub_publish.c)
+    add_example(server_pubsub_publish_on_demand pubsub/server_pubsub_publisher_on_demand.c)
     add_example(tutorial_pubsub_publish_raw pubsub/tutorial_pubsub_publish_raw.c)
     add_example(tutorial_pubsub_subscribe_raw pubsub/tutorial_pubsub_subscribe_raw.c)
     add_example(server_pubsub_publisher_iop pubsub/server_pubsub_publisher_iop.c)
diff --git a/examples/pubsub/server_pubsub_publisher_on_demand.c b/examples/pubsub/server_pubsub_publisher_on_demand.c
new file mode 100644
index 00000000000..597044d6bb2
--- /dev/null
+++ b/examples/pubsub/server_pubsub_publisher_on_demand.c
@@ -0,0 +1,243 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
+
+/**
+ * .. _pubsub-tutorial:
+ *
+ * Working with Publish/Subscribe
+ * ------------------------------
+ *
+ * Work in progress: This Tutorial will be continuously extended during the next
+ * PubSub batches. More details about the PubSub extension and corresponding
+ * open62541 API are located here: :ref:`pubsub`.
+ *
+ * Publishing Fields
+ * ^^^^^^^^^^^^^^^^^
+ * The PubSub publish example demonstrates the simplest way to publish
+ * information from the information model over UDP multicast using the UADP
+ * encoding.
+ *
+ * **Connection handling**
+ *
+ * PubSubConnections can be created and deleted on runtime. More details about
+ * the system preconfiguration and connection can be found in
+ * ``tutorial_pubsub_connection.c``.
+ */
+
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/plugin/pubsub_ethernet.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <signal.h>
+
+UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent;
+
+static void
+addPubSubConnection(UA_Server *server, UA_String *transportProfile,
+                    UA_NetworkAddressUrlDataType *networkAddressUrl){
+    /* Details about the connection configuration and handling are located
+     * in the pubsub connection tutorial */
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(connectionConfig));
+    connectionConfig.name = UA_STRING("UADP Connection 1");
+    connectionConfig.transportProfileUri = *transportProfile;
+    connectionConfig.enabled = UA_TRUE;
+    UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    /* Changed to static publisherId from random generation to identify
+     * the publisher on Subscriber side */
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
+    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
+}
+
+/**
+ * **PublishedDataSet handling**
+ *
+ * The PublishedDataSet (PDS) and PubSubConnection are the toplevel entities and
+ * can exist alone. The PDS contains the collection of the published fields. All
+ * other PubSub elements are directly or indirectly linked with the PDS or
+ * connection. */
+static void
+addPublishedDataSet(UA_Server *server) {
+    /* The PublishedDataSetConfig contains all necessary public
+    * information for the creation of a new PublishedDataSet */
+    UA_PublishedDataSetConfig publishedDataSetConfig;
+    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    publishedDataSetConfig.name = UA_STRING("Demo PDS");
+    /* Create new PublishedDataSet based on the PublishedDataSetConfig. */
+    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent);
+}
+
+/**
+ * **DataSetField handling**
+ *
+ * The DataSetField (DSF) is part of the PDS and describes exactly one published
+ * field. */
+static void
+addDataSetField(UA_Server *server) {
+    /* Add a field to the previous created PublishedDataSet */
+    UA_NodeId dataSetFieldIdent;
+    UA_DataSetFieldConfig dataSetFieldConfig;
+    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
+    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
+    UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    UA_Server_addDataSetField(server, publishedDataSetIdent,
+                              &dataSetFieldConfig, &dataSetFieldIdent);
+}
+
+/**
+ * **WriterGroup handling**
+ *
+ * The WriterGroup (WG) is part of the connection and contains the primary
+ * configuration parameters for the message creation. */
+static void
+addWriterGroup(UA_Server *server) {
+    /* Now we create a new WriterGroupConfig and add the group to the existing
+     * PubSubConnection. */
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
+    writerGroupConfig.publishingInterval = 1000;
+    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.writerGroupId = 100;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+    writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+    writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    /* The configuration flags for the messages are encapsulated inside the
+     * message- and transport settings extension objects. These extension
+     * objects are defined by the standard. e.g.
+     * UadpWriterGroupMessageDataType */
+    UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+    /* Change message settings of writerGroup to send PublisherId,
+     * WriterGroupId in GroupHeader and DataSetWriterId in PayloadHeader
+     * of NetworkMessage */
+    writerGroupMessage->networkMessageContentMask          = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+    UA_Server_addWriterGroup(server, connectionIdent, &writerGroupConfig, &writerGroupIdent);
+    UA_Server_setWriterGroupOperational(server, writerGroupIdent);
+    UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+}
+
+/**
+ * **DataSetWriter handling**
+ *
+ * A DataSetWriter (DSW) is the glue between the WG and the PDS. The DSW is
+ * linked to exactly one PDS and contains additional information for the
+ * message generation. */
+static void
+addDataSetWriter(UA_Server *server) {
+    /* We need now a DataSetWriter within the WriterGroup. This means we must
+     * create a new DataSetWriterConfig and add call the addWriterGroup function. */
+    UA_NodeId dataSetWriterIdent;
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING("Demo DataSetWriter");
+    dataSetWriterConfig.dataSetWriterId = 62541;
+    dataSetWriterConfig.keyFrameCount = 10;
+    UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
+                               &dataSetWriterConfig, &dataSetWriterIdent);
+}
+
+/**
+ * That's it! You're now publishing the selected fields. Open a packet
+ * inspection tool of trust e.g. wireshark and take a look on the outgoing
+ * packages. The following graphic figures out the packages created by this
+ * tutorial.
+ *
+ * .. figure:: ua-wireshark-pubsub.png
+ *     :figwidth: 100 %
+ *     :alt: OPC UA PubSub communication in wireshark
+ *
+ * The open62541 subscriber API will be released later. If you want to process
+ * the the datagrams, take a look on the ``ua_network_pubsub_networkmessage.c``
+ * which already contains the decoding code for UADP messages.
+ *
+ * It follows the main server code, making use of the above definitions. */
+UA_Boolean running = true;
+static void stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+static void
+onDemandPublish(UA_Server *server, void *data){
+    UA_Server_WriterGroup_publish(server, writerGroupIdent);
+}
+
+static int run(UA_String *transportProfile,
+               UA_NetworkAddressUrlDataType *networkAddressUrl) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+
+    /* Details about the connection configuration and handling are located in
+     * the pubsub connection tutorial */
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+#ifdef UA_ENABLE_PUBSUB_ETH_UADP
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
+#endif
+
+    addPubSubConnection(server, transportProfile, networkAddressUrl);
+    addPublishedDataSet(server);
+    addDataSetField(server);
+    addWriterGroup(server);
+    addDataSetWriter(server);
+
+    UA_Server_addRepeatedCallback(server, onDemandPublish, NULL, 5000, NULL);
+
+
+    UA_StatusCode retval = UA_Server_run(server, &running);
+
+    UA_Server_delete(server);
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+static void
+usage(char *progname) {
+    printf("usage: %s <uri> [device]\n", progname);
+}
+
+int main(int argc, char **argv) {
+    UA_String transportProfile =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+
+    if (argc > 1) {
+        if (strcmp(argv[1], "-h") == 0) {
+            usage(argv[0]);
+            return EXIT_SUCCESS;
+        } else if (strncmp(argv[1], "opc.udp://", 10) == 0) {
+            networkAddressUrl.url = UA_STRING(argv[1]);
+        } else if (strncmp(argv[1], "opc.eth://", 10) == 0) {
+            transportProfile =
+                UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
+            if (argc < 3) {
+                printf("Error: UADP/ETH needs an interface name\n");
+                return EXIT_FAILURE;
+            }
+            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
+            networkAddressUrl.url = UA_STRING(argv[1]);
+        } else {
+            printf("Error: unknown URI\n");
+            return EXIT_FAILURE;
+        }
+    }
+
+
+    return run(&transportProfile, &networkAddressUrl);
+}
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index a431f6223c2..272f86086cc 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -549,6 +549,13 @@ UA_StatusCode UA_EXPORT
 UA_Server_WriterGroup_getState(UA_Server *server, UA_NodeId writerGroupIdentifier,
                                UA_PubSubState *state);
 
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Server_WriterGroup_publish(UA_Server *server, const UA_NodeId writerGroupIdentifier);
+
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_WriterGroup_lastPublishTimestamp(UA_Server *server, const UA_NodeId writerGroupId,
+                                    UA_DateTime *timestamp);
+
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup);
 
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index cb95cfa6868..b978543ce65 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -278,6 +278,7 @@ struct UA_WriterGroup {
     UA_NetworkMessageOffsetBuffer bufferedMessage;
     UA_UInt16 sequenceNumber; /* Increased after every succressuly sent message */
     UA_Boolean configurationFrozen;
+    UA_DateTime lastPublishTimeStamp;
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_UInt32 securityTokenId;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index fad06feb09c..5a03ad17aa9 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -586,6 +586,37 @@ UA_Server_WriterGroup_getState(UA_Server *server, UA_NodeId writerGroupIdentifie
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_WriterGroup_publish(UA_Server *server, const UA_NodeId writerGroupIdentifier){
+    UA_LOCK(&server->serviceMutex);
+
+    //search WriterGroup ToDo create lookup table for more efficiency
+    UA_WriterGroup *writerGroup;
+    writerGroup = UA_WriterGroup_findWGbyId(server, writerGroupIdentifier);
+    if(writerGroup == NULL){
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_UNLOCK(&server->serviceMutex);
+    UA_WriterGroup_publishCallback(server, writerGroup);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_WriterGroup_lastPublishTimestamp(UA_Server *server, const UA_NodeId writerGroupId, UA_DateTime *timestamp){
+    UA_LOCK(&server->serviceMutex);
+    //search WriterGroup ToDo create lookup table for more efficiency
+    UA_WriterGroup *writerGroup;
+    writerGroup = UA_WriterGroup_findWGbyId(server, writerGroupId);
+    if(writerGroup == NULL){
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    *timestamp = writerGroup->lastPublishTimeStamp;
+    UA_UNLOCK(&server->serviceMutex);
+    return UA_STATUSCODE_BADNOTFOUND;
+}
+
 UA_WriterGroup *
 UA_WriterGroup_findWGbyId(UA_Server *server, UA_NodeId identifier) {
     UA_PubSubConnection *tmpConnection;
@@ -1238,6 +1269,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
 
         /* There is no promoted field -> send right away */
         if(pds && pds->promotedFieldsCount > 0) {
+            writerGroup->lastPublishTimeStamp = UA_DateTime_nowMonotonic();
             sendNetworkMessage(server, writerGroup, connection, &dsmStore[dsmCount],
                                &dsWriterIds[dsmCount], 1);
 
@@ -1261,6 +1293,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
         /* How many dsm are batched in this iteration? */
         nmDsmCount = (i + maxDSM > dsmCount) ? (UA_Byte)(dsmCount - i) : maxDSM;
 
+        writerGroup->lastPublishTimeStamp = UA_DateTime_nowMonotonic();
         /* Send the batched messages */
         sendNetworkMessage(server, writerGroup, connection, &dsmStore[i],
                            &dsWriterIds[i], nmDsmCount);
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index d7848096fcf..f0d60595c4a 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -402,7 +402,7 @@ START_TEST(GetDataSetFieldConfigurationAndCompareValues){
     } END_TEST
 
 
-START_TEST(SinglePublishDataSetField){
+START_TEST(SinglePublishDataSetFieldAndPublishTimestampTest){
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
         writerGroupConfig.name = UA_STRING("WriterGroup 1");
@@ -440,8 +440,12 @@ START_TEST(SinglePublishDataSetField){
         dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
         UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
 
+        UA_DateTime currentTime = UA_DateTime_now();
         UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
         UA_WriterGroup_publishCallback(server, wg);
+        UA_DateTime publishTime;
+        UA_WriterGroup_lastPublishTimestamp(server, writerGroup1, &publishTime);
+        ck_assert((publishTime - currentTime) < UA_DATETIME_MSEC * 100);
     } END_TEST
 
 START_TEST(PublishDataSetFieldAsDeltaFrame){
@@ -497,7 +501,7 @@ int main(void) {
 
     TCase *tc_pubsub_publish = tcase_create("PubSub publish DataSetFields");
     tcase_add_checked_fixture(tc_pubsub_publish, setup, teardown);
-    tcase_add_test(tc_pubsub_publish, SinglePublishDataSetField);
+    tcase_add_test(tc_pubsub_publish, SinglePublishDataSetFieldAndPublishTimestampTest);
     tcase_add_test(tc_pubsub_publish, PublishDataSetFieldAsDeltaFrame);
 
     Suite *s = suite_create("PubSub WriterGroups/Writer/Fields handling and publishing");
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 61d112bb79f..6f5d4cbca4b 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -2039,7 +2039,7 @@ START_TEST(AddAndRemoveReaderUsingStandaloneDataSet) {
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_StandaloneSubscribedDataSet *ssds = NULL;
     ssds = UA_StandaloneSubscribedDataSet_findSDSbyId(server, ret);
-    ck_assert_ptr_ne(ssds, NULL); 
+    ck_assert_ptr_ne(ssds, NULL);
     /* Reader Group */
     UA_ReaderGroupConfig readerGroupConfig;
     memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
@@ -2070,6 +2070,155 @@ START_TEST(AddAndRemoveReaderUsingStandaloneDataSet) {
     ck_assert_uint_eq(ssds->config.isConnected, UA_FALSE);
 } END_TEST
 
+START_TEST(SinglePublishOnDemand) {
+        /* To check status after running both publisher and subscriber */
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+        UA_PublishedDataSetConfig pdsConfig;
+        UA_NodeId dataSetWriter;
+        UA_NodeId readerIdentifier;
+        UA_NodeId writerGroup;
+        UA_DataSetReaderConfig readerConfig;
+
+        /* Published DataSet */
+        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+        pdsConfig.name = UA_STRING("PublishedDataSet Test");
+        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Create variable to publish integer data */
+        UA_NodeId publisherNode;
+        UA_VariableAttributes attr = UA_VariableAttributes_default;
+        attr.description           = UA_LOCALIZEDTEXT("en-US","Published Int64");
+        attr.displayName           = UA_LOCALIZEDTEXT("en-US","Published Int64");
+        attr.dataType              = UA_TYPES[UA_TYPES_INT64].typeId;
+        UA_Int64 publisherData     = 64;
+        UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT64]);
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                           UA_QUALIFIEDNAME(1, "Published Int64"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                           attr, NULL, &publisherNode);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Data Set Field */
+        UA_NodeId dataSetFieldIdent;
+        UA_DataSetFieldConfig dataSetFieldConfig;
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType              = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Published Int64");
+        dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
+        dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
+        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+
+        /* Writer group */
+        UA_WriterGroupConfig writerGroupConfig;
+        memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+        writerGroupConfig.name               = UA_STRING("WriterGroup Test");
+        writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
+        writerGroupConfig.enabled            = UA_FALSE;
+        writerGroupConfig.writerGroupId      = WRITER_GROUP_ID;
+        writerGroupConfig.encodingMimeType   = UA_PUBSUB_ENCODING_UADP;
+        /* Message settings in WriterGroup to include necessary headers */
+        writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+        writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+        UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+        writerGroupMessage->networkMessageContentMask =
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
+        writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+        retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
+        UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* DataSetWriter */
+        UA_DataSetWriterConfig dataSetWriterConfig;
+        memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+        dataSetWriterConfig.name            = UA_STRING("DataSetWriter Test");
+        dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
+        dataSetWriterConfig.keyFrameCount   = 10;
+        retVal |= UA_Server_addDataSetWriter(server, writerGroup, publishedDataSetId,
+                                             &dataSetWriterConfig, &dataSetWriter);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Reader Group */
+        UA_ReaderGroupConfig readerGroupConfig;
+        memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+        readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+        retVal |=  UA_Server_addReaderGroup(server, connectionId,
+                                            &readerGroupConfig, &readerGroupId);
+        /* Data Set Reader */
+        /* Parameters to filter received NetworkMessage */
+        memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+        readerConfig.name             = UA_STRING ("DataSetReader Test");
+        UA_UInt16 publisherIdentifier = PUBLISHER_ID;
+        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+        readerConfig.publisherId.data = &publisherIdentifier;
+        readerConfig.writerGroupId    = WRITER_GROUP_ID;
+        readerConfig.dataSetWriterId  = DATASET_WRITER_ID;
+        /* Setting up Meta data configuration in DataSetReader */
+        UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+        /* FilltestMetadata function in subscriber implementation */
+        UA_DataSetMetaDataType_init (pMetaData);
+        pMetaData->name       = UA_STRING ("DataSet Test");
+        /* Static definition of number of fields size to 1 to create one
+           targetVariable */
+        pMetaData->fieldsSize = 1;
+        pMetaData->fields     = (UA_FieldMetaData*)
+            UA_Array_new(pMetaData->fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+
+        /* Unsigned Integer DataType */
+        UA_FieldMetaData_init (&pMetaData->fields[0]);
+        UA_NodeId_copy (&UA_TYPES[UA_TYPES_INT64].typeId,
+                        &pMetaData->fields[0].dataType);
+        pMetaData->fields[0].builtInType = UA_NS0ID_INT64;
+        pMetaData->fields[0].valueRank   = -1; /* scalar */
+        retVal |= UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
+                                             &readerIdentifier);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Add Subscribed Variables */
+        /* Variable to subscribe data */
+        UA_NodeId newnodeId;
+        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+        vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int64");
+        vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int64");
+        vAttr.dataType    = UA_TYPES[UA_TYPES_INT64].typeId;
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), folderId,
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                           UA_QUALIFIEDNAME(1, "Subscribed Int64"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                           vAttr, NULL, &newnodeId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_FieldTargetVariable targetVar;
+        memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
+        /* For creating Targetvariable */
+        UA_FieldTargetDataType_init(&targetVar.targetVariable);
+        targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+        targetVar.targetVariable.targetNodeId = newnodeId;
+        retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
+                                                                1, &targetVar);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_FieldTargetDataType_clear(&targetVar.targetVariable);
+        UA_free(pMetaData->fields);
+
+        /* run server - publisher and subscriber */
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        checkReceived();
+        retVal = UA_Server_WriterGroup_publish(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        checkReceived();
+
+    } END_TEST
+
 int main(void) {
     TCase *tc_add_pubsub_readergroup = tcase_create("PubSub readerGroup items handling");
     tcase_add_checked_fixture(tc_add_pubsub_readergroup, setup, teardown);
@@ -2111,6 +2260,8 @@ int main(void) {
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeHeartbeat);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeWithoutPayloadHeader);
     tcase_add_test(tc_pubsub_publish_subscribe, MultiPublishSubscribeInt32);
+    tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishOnDemand);
+
 
     /*Test cases for the standalone datasets */
     TCase *tc_pubsub_standalone_datasets = tcase_create("Subscriber using standalone datasets");

From c77e32d47fea9be0520be36e85770bc5df2019af Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 18 Dec 2022 00:48:58 +0100
Subject: [PATCH 0589/1963] refactor(el): Simplify the TCP EventSource API

---
 arch/eventloop_posix_tcp.c                 | 158 +++++++++++----------
 include/open62541/plugin/eventloop.h       |  21 ++-
 src/client/ua_client_connect.c             |   2 +-
 src/server/ua_server.c                     |  26 ++--
 tests/check_eventloop_tcp.c                |  36 +++--
 tests/server/check_server_reverseconnect.c |  26 ++--
 6 files changed, 132 insertions(+), 137 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index b1fcfb10de5..4a7a047fdc5 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -7,6 +7,7 @@
  */
 
 #include "eventloop_posix.h"
+#include "eventloop_common.h"
 
 #define UA_MAXBACKLOG 100
 
@@ -18,6 +19,22 @@
 #define MSG_DONTWAIT 0
 #endif
 
+/* Configuration parameters */
+#define TCP_PARAMETERSSIZE 5
+#define TCP_PARAMINDEX_RECVBUF 0
+#define TCP_PARAMINDEX_ADDR 1
+#define TCP_PARAMINDEX_PORT 2
+#define TCP_PARAMINDEX_LISTEN 3
+#define TCP_PARAMINDEX_VALIDATE 4
+
+static UA_KeyValueRestriction TCPConfigParameters[TCP_PARAMETERSSIZE] = {
+    {{0, UA_STRING_STATIC("recv-bufsize")}, &UA_TYPES[UA_TYPES_UINT32], false, true, false},
+    {{0, UA_STRING_STATIC("address")}, &UA_TYPES[UA_TYPES_STRING], false, true, true},
+    {{0, UA_STRING_STATIC("port")}, &UA_TYPES[UA_TYPES_UINT16], true, true, false},
+    {{0, UA_STRING_STATIC("listen")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    {{0, UA_STRING_STATIC("validate")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false}
+};
+
 /* A registered file descriptor with an additional method pointer */
 typedef struct {
     UA_RegisteredFD fd;
@@ -323,7 +340,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
 
     /* Forward the remote hostname to the application */
     UA_KeyValuePair kvp;
-    kvp.key = UA_QUALIFIEDNAME(0, "remote-hostname");
+    kvp.key = UA_QUALIFIEDNAME(0, "remote-address");
     UA_String hostName = UA_STRING(hoststr);
     UA_Variant_setScalar(&kvp.value, &hostName, &UA_TYPES[UA_TYPES_STRING]);
 
@@ -469,7 +486,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
 
     /* Set up the callback parameters */
     UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-hostname");
+    params[0].key = UA_QUALIFIEDNAME(0, "listen-address");
     params[1].key = UA_QUALIFIEDNAME(0, "listen-port");
     UA_KeyValueMap paramMap;
     paramMap.mapSize = 0;
@@ -520,7 +537,7 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
 #ifdef _WIN32
         UA_LOG_SOCKET_ERRNO_WRAP(
         UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                       "tcp\t| Lookup for \"%s\" on port %u failed (%s)",
+                       "TCP\t| Lookup for \"%s\" on port %u failed (%s)",
                        hostname, port, errno_str));
 #else
         UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
@@ -605,8 +622,7 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 
 static UA_StatusCode
 TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
-                       const UA_KeyValueMap *params,
-                       UA_ByteString *buf) {
+                       const UA_KeyValueMap *params, UA_ByteString *buf) {
     /* Prevent OS signals when sending to a closed socket */
     int flags = MSG_NOSIGNAL;
 
@@ -660,54 +676,40 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 /* Create a listen-socket that waits for incoming connections */
 static UA_StatusCode
-TCP_openPassiveConnection(UA_ConnectionManager *cm,
-                          const UA_KeyValueMap *params,
+TCP_openPassiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                           void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get the port parameter */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params,
-                                 UA_QUALIFIEDNAME(0, "listen-port"),
+        UA_KeyValueMap_getScalar(params, TCPConfigParameters[TCP_PARAMINDEX_PORT].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
-    if(!port) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| The listen-port was not correctly configured");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Get the hostnames parameter */
-    const UA_Variant *hostNames =
-        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "listen-hostnames"));
-    if(!hostNames) {
-        /* No listen-hostnames parameter -> listen on all interfaces */
+    UA_assert(port); /* existence is checked before */
+
+    /* Get the address parameter */
+    const UA_Variant *addrs =
+        UA_KeyValueMap_get(params, TCPConfigParameters[TCP_PARAMINDEX_ADDR].name);
+    size_t addrsSize = 0;
+    if(addrs) {
+        UA_assert(addrs->type == &UA_TYPES[UA_TYPES_STRING]);
+        if(UA_Variant_isScalar(addrs))
+            addrsSize = 1;
+        else
+            addrsSize = addrs->arrayLength;
+    }
+
+    /* Undefined or empty addresses array -> listen on all interfaces */
+    if(addrsSize == 0) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "TCP\t| Listening on all interfaces");
         return TCP_registerListenSockets(cm, NULL, *port, application,
                                          context, connectionCallback);
     }
 
-    /* Wrong datatype for the hostnames */
-    if(hostNames->type != &UA_TYPES[UA_TYPES_STRING] ||
-       UA_Variant_isScalar(hostNames)) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "TCP\t| The listen-hostnames have to be an array of strings");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Empty array -> listen on all interfaces */
-    size_t interfaces = hostNames->arrayLength;
-    if(interfaces == 0) {
-        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "TCP\t| Listening on all interfaces");
-        return TCP_registerListenSockets(cm, NULL, *port, application,
-                                         context, connectionCallback);
-    }
-
     /* Iterate over the configured hostnames */
-    UA_String *hostStrings = (UA_String*)hostNames->data;
-    for(size_t i = 0; i < hostNames->arrayLength; i++) {
+    UA_String *hostStrings = (UA_String*)addrs->data;
+    for(size_t i = 0; i < addrsSize; i++) {
         char hostname[512];
         if(hostStrings[i].length >= sizeof(hostname))
             continue;
@@ -722,50 +724,39 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm,
 
 /* Open a TCP connection to a remote host */
 static UA_StatusCode
-TCP_openActiveConnection(UA_ConnectionManager *cm,
-                         const UA_KeyValueMap *params,
+TCP_openActiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                          void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback) {
     TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
-    if(params->mapSize != 2) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| Port and hostname need to be defined for the connection");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
     /* Get the connection parameters */
     char hostname[256];
     char portStr[16];
 
     /* Prepare the port parameter as a string */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "port"),
+        UA_KeyValueMap_getScalar(params, TCPConfigParameters[TCP_PARAMINDEX_PORT].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
-    if(!port) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| Open TCP Connection: No port defined, aborting");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
+    UA_assert(port); /* existence is checked before */
     UA_snprintf(portStr, 6, "%d", *port);
 
     /* Prepare the hostname string */
-    const UA_String *host = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "hostname"),
+    const UA_String *addr = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, TCPConfigParameters[TCP_PARAMINDEX_ADDR].name,
                                  &UA_TYPES[UA_TYPES_STRING]);
-    if(!host) {
+    if(!addr) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP\t| Open TCP Connection: No hostname defined, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    if(host->length >= 256) {
+    if(addr->length >= 256) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| Open TCP Connection: Hostname too long, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    strncpy(hostname, (const char*)host->data, host->length);
-    hostname[host->length] = 0;
+    strncpy(hostname, (const char*)addr->data, addr->length);
+    hostname[addr->length] = 0;
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
@@ -872,8 +863,7 @@ TCP_openActiveConnection(UA_ConnectionManager *cm,
 }
 
 static UA_StatusCode
-TCP_openConnection(UA_ConnectionManager *cm,
-                   const UA_KeyValueMap *params,
+TCP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
@@ -884,18 +874,28 @@ TCP_openConnection(UA_ConnectionManager *cm,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* If the "port"-parameter is defined, then try to open an active
-     * connection. Otherwise try to open a socket that listens for incoming TCP
-     * connections. */
-    const UA_Variant *val =
-        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "port"));
-    if(val) {
-        return TCP_openActiveConnection(cm, params,
-                                        application, context, connectionCallback);
-    } else {
-        return TCP_openPassiveConnection(cm, params,
-                                         application, context, connectionCallback);
-    }
+    /* Check the parameters */
+    UA_StatusCode res =
+        UA_KeyValueRestriction_validate(&TCPConfigParameters[1],
+                                        TCP_PARAMETERSSIZE-1, params);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    /* Listen or active connection? */
+    UA_Boolean listen = false;
+    const UA_Boolean *listenParam = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params,
+                                 TCPConfigParameters[TCP_PARAMINDEX_LISTEN].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(listenParam)
+        listen = *listenParam;
+
+    if(listen)
+        return TCP_openPassiveConnection(cm, params, application,
+                                         context, connectionCallback);
+    else
+        return TCP_openActiveConnection(cm, params, application,
+                                        context, connectionCallback);
 }
 
 static UA_StatusCode
@@ -912,16 +912,22 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
                      "registered in an EventLoop and not started yet");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+
+    /* Check the parameters */
+    UA_StatusCode res = UA_KeyValueRestriction_validate(TCPConfigParameters, 1,
+                                                        &cm->eventSource.params);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
     /* Configure the receive buffer */
     UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
-
     const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
         UA_KeyValueMap_getScalar(&cm->eventSource.params,
-                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                 TCPConfigParameters[TCP_PARAMINDEX_RECVBUF].name,
                                  &UA_TYPES[UA_TYPES_UINT32]);
     if(configRxBufSize)
         rxBufSize = *configRxBufSize;
-    UA_StatusCode res = UA_ByteString_allocBuffer(&tcm->rxBuffer, rxBufSize);
+    res = UA_ByteString_allocBuffer(&tcm->rxBuffer, rxBufSize);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 1779faa7b0f..6c2a19eeda8 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -454,20 +454,19 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  *                            messages (default 64kB).
  *
  * Open Connection Parameters:
- * - Active Connection
- *   - 0:hostname [string]: Hostname (or IPv4/v6 address) to connect to (required).
- *   - 0:port [uint16]: Port of the target host (required).
- * - Passive Connection (Listening on a port for incoming connections)
- *   - 0:listen-port [uint16]: Port to listen for new connections (required).
- *   - 0:listen-hostnames [string array]: Hostnames of the devices to listen on
- *                                        (default: listen on all devices).
+ * - 0:address [string | array of string]: Hostname or IPv4/v6 address for the
+ *             connection (scalar parameter required for active connections).
+ *             For listen-connections the address implies the network interfaces
+ *             for listening (default: listen on all interfaces).
+ * - 0:port [uint16]: Port of the target host (required).
+ * - 0:listen [boolean]: Listen-connection or active-connection (default: false)
  *
  * Connection Callback Parameters (first callback only):
  * - Active Connection
- *   - 0:remote-hostname [string]: Hostname of the remote connection.
- * - Passive Connection
- *   - 0:listen-hostname [string]: Local hostname for that particular
- *                                 listen-connection.
+ *   - 0:remote-address [string]: Address of the remote side (hostname or IP address).
+ * - Listen Connection
+ *   - 0:listen-address [string]: Local address for that particular
+ *                                listen-connection.
  *   - 0:listen-port [uint16]: Port on which the connection listens.
  *
  * Send Parameters:
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index fd23902cb16..5a0b7588cfd 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1339,7 +1339,7 @@ initConnect(UA_Client *client) {
         UA_KeyValuePair params[2];
         params[0].key = UA_QUALIFIEDNAME(0, "port");
         UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
-        params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+        params[1].key = UA_QUALIFIEDNAME(0, "address");
         UA_Variant_setScalar(&params[1].value, &hostname, &UA_TYPES[UA_TYPES_STRING]);
 
         UA_KeyValueMap paramMap;
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 870dd9ebf16..5ea3cee1749 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -587,28 +587,26 @@ UA_Server_createServerConnection(UA_Server *server, const UA_String *serverUrl)
         UA_KeyValuePair params[3];
         size_t paramsSize = 2;
 
-        params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
+        params[0].key = UA_QUALIFIEDNAME(0, "port");
         UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
 
-        UA_UInt32 bufSize = config->tcpBufSize;
-        if(bufSize == 0)
-            bufSize = 1 << 16; /* 64kB */
-        params[1].key = UA_QUALIFIEDNAME(0, "recv-bufsize");
-        UA_Variant_setScalar(&params[1].value, &bufSize, &UA_TYPES[UA_TYPES_UINT32]);
+        UA_Boolean listen = true;
+        params[1].key = UA_QUALIFIEDNAME(0, "listen");
+        UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
-        /* If the hostname is non-empty */
         if(hostname.length > 0) {
-            params[2].key = UA_QUALIFIEDNAME(0, "listen-hostnames");
+            /* The hostname is non-empty */
+            params[2].key = UA_QUALIFIEDNAME(0, "address");
             UA_Variant_setArray(&params[2].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
             paramsSize = 3;
         }
+
         UA_KeyValueMap paramsMap;
         paramsMap.map = params;
         paramsMap.mapSize = paramsSize;
 
         /* Open the server connection */
-        res = cm->openConnection(cm, &paramsMap, server, NULL,
-                                 UA_Server_networkCallback);
+        res = cm->openConnection(cm, &paramsMap, server, NULL, UA_Server_networkCallback);
         if(res == UA_STATUSCODE_GOOD)
             return res;
     }
@@ -636,10 +634,10 @@ UA_StatusCode attemptReverseConnect(UA_Server *server, reverse_connect_context *
         UA_KeyValueMap params;
         params.mapSize = 0;
         params.map = NULL;
-        UA_KeyValueMap_setScalar(&params, UA_QUALIFIEDNAME(0, "hostname"), &context->hostname,
-                                 &UA_TYPES[UA_TYPES_STRING]);
-        UA_KeyValueMap_setScalar(&params, UA_QUALIFIEDNAME(0, "port"), &context->port,
-                                 &UA_TYPES[UA_TYPES_UINT16]);
+        UA_KeyValueMap_setScalar(&params, UA_QUALIFIEDNAME(0, "address"),
+                                 &context->hostname, &UA_TYPES[UA_TYPES_STRING]);
+        UA_KeyValueMap_setScalar(&params, UA_QUALIFIEDNAME(0, "port"),
+                                 &context->port, &UA_TYPES[UA_TYPES_UINT16]);
 
         /* Open the server connection */
         res = cm->openConnection(cm, &params, server, context,
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index 1b9d47c3272..7af160bc977 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -58,16 +58,17 @@ START_TEST(listenTCP) {
     el->start(el);
 
     UA_UInt16 port = 4840;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_Boolean listen = true;
 
     UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    params[0].value = portVar;
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     UA_KeyValueMap paramsMap;
     paramsMap.map = params;
-    paramsMap.mapSize = 1;
+    paramsMap.mapSize = 2;
 
     ck_assert_uint_eq(connCount, 0);
 
@@ -103,16 +104,20 @@ START_TEST(connectTCP) {
     el->start(el);
 
     UA_UInt16 port = 4840;
-    UA_Variant portVar;
-    UA_Variant_setScalar(&portVar, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_Boolean listen = true;
+    UA_String host = UA_STRING("localhost");
 
-    UA_KeyValuePair params[2];
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    params[0].value = portVar;
+    UA_KeyValuePair params[3];
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    params[2].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&params[2].value, &host, &UA_TYPES[UA_TYPES_STRING]);
 
     UA_KeyValueMap paramsMap;
     paramsMap.map = params;
-    paramsMap.mapSize = 1;
+    paramsMap.mapSize = 3;
 
     connCount = 0;
 
@@ -122,14 +127,7 @@ START_TEST(connectTCP) {
 
     /* Open a client connection */
     clientId = 0;
-
-    UA_String targetHost = UA_STRING("localhost");
-    params[0].key = UA_QUALIFIEDNAME(0, "port");
-    params[0].value = portVar;
-    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
-    UA_Variant_setScalar(&params[1].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
-
-    paramsMap.mapSize = 2;
+    listen = false;
 
     UA_StatusCode retval =
         cm->openConnection(cm, &paramsMap, NULL, (void*)0x01, connectionCallback);
diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
index 22815bb6c0d..f22d57b59de 100644
--- a/tests/server/check_server_reverseconnect.c
+++ b/tests/server/check_server_reverseconnect.c
@@ -67,32 +67,26 @@ static void setupListeningSocket(void) {
 
     UA_String listenHost = UA_STRING_STATIC("localhost");
     UA_UInt16 listenPort = 4841;
+    UA_Boolean listen = true;
 
     UA_KeyValuePair params[3];
-    size_t paramsSize = 2;
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &listenPort, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    params[2].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setArray(&params[2].value, &listenHost, 1, &UA_TYPES[UA_TYPES_STRING]);
 
-    params[0].key = UA_QUALIFIEDNAME(0, "listen-port");
-    UA_Variant_setScalar(&params[0].value, (void *)&listenPort, &UA_TYPES[UA_TYPES_UINT16]);
-
-    UA_UInt32 bufSize = 1 << 16; /* 64kB */
-    params[1].key = UA_QUALIFIEDNAME(0, "recv-bufsize");
-    UA_Variant_setScalar(&params[1].value, &bufSize, &UA_TYPES[UA_TYPES_UINT32]);
-
-    params[2].key = UA_QUALIFIEDNAME(0, "listen-hostnames");
-    UA_Variant_setArray(&params[2].value, (void *)&listenHost, 1, &UA_TYPES[UA_TYPES_STRING]);
-    paramsSize = 3;
     UA_KeyValueMap paramsMap;
     paramsMap.map = params;
-    paramsMap.mapSize = paramsSize;
-
-    UA_StatusCode res = connectionManager->openConnection(connectionManager, &paramsMap, NULL, NULL,
-                             listenCallback);
+    paramsMap.mapSize = 3;
 
+    UA_StatusCode res = connectionManager->openConnection(connectionManager, &paramsMap,
+                                                          NULL, NULL, listenCallback);
     ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
 
     for (int i = 0; i < 100; ++i) {
         eventLoop->run(eventLoop, 100);
-
         if (listening)
             break;
     }

From bd4c2b21746ab5273d32f1c6f665914432f65ab9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 18 Dec 2022 00:53:35 +0100
Subject: [PATCH 0590/1963] refactor(el): Move reused defines to
 eventloop_posix.h

---
 arch/eventloop_posix.h     | 12 ++++++++++++
 arch/eventloop_posix_eth.c |  1 -
 arch/eventloop_posix_tcp.c | 27 ++++++++-------------------
 arch/eventloop_posix_udp.c | 12 ------------
 4 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index c012de05de6..614ad46c0b6 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -23,6 +23,18 @@
 # include <sys/epoll.h>
 #endif
 
+#define UA_MAXBACKLOG 100
+#define UA_MAXHOSTNAME_LENGTH 256
+#define UA_MAXPORTSTR_LENGTH 6
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+#ifndef MSG_DONTWAIT
+#define MSG_DONTWAIT 0
+#endif
+
 _UA_BEGIN_DECLS
 
 /* POSIX events are based on sockets / file descriptors. The EventSources can
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 8c95ad56e02..c83f07aaf8c 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -17,7 +17,6 @@
 
 /* Configuration parameters */
 #define ETH_PARAMETERSSIZE 8
-
 #define ETH_PARAMINDEX_ADDR 0
 #define ETH_PARAMINDEX_LISTEN 1
 #define ETH_PARAMINDEX_IFACE 2
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 4a7a047fdc5..15e0dee8c36 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -9,16 +9,6 @@
 #include "eventloop_posix.h"
 #include "eventloop_common.h"
 
-#define UA_MAXBACKLOG 100
-
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-#ifndef MSG_DONTWAIT
-#define MSG_DONTWAIT 0
-#endif
-
 /* Configuration parameters */
 #define TCP_PARAMETERSSIZE 5
 #define TCP_PARAMINDEX_RECVBUF 0
@@ -281,7 +271,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     }
 
     /* Log the name of the remote host */
-    char hoststr[256];
+    char hoststr[UA_MAXHOSTNAME_LENGTH];
     int get_res = UA_getnameinfo((struct sockaddr *)&remote, sizeof(remote),
                                  hoststr, sizeof(hoststr),
                                  NULL, 0, NI_NUMERICHOST);
@@ -363,10 +353,9 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get the hostname information */
-    char hoststr[256];
-    int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                                 hoststr, sizeof(hoststr),
-                                 NULL, 0, NI_NUMERICHOST);
+    char hoststr[UA_MAXHOSTNAME_LENGTH];
+    int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen, hoststr,
+                                 sizeof(hoststr), NULL, 0, NI_NUMERICHOST);
     if(get_res != 0) {
         hoststr[0] = 0;
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -731,15 +720,15 @@ TCP_openActiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
 
     /* Get the connection parameters */
-    char hostname[256];
-    char portStr[16];
+    char hostname[UA_MAXHOSTNAME_LENGTH];
+    char portStr[UA_MAXPORTSTR_LENGTH];
 
     /* Prepare the port parameter as a string */
     const UA_UInt16 *port = (const UA_UInt16*)
         UA_KeyValueMap_getScalar(params, TCPConfigParameters[TCP_PARAMINDEX_PORT].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
     UA_assert(port); /* existence is checked before */
-    UA_snprintf(portStr, 6, "%d", *port);
+    UA_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
 
     /* Prepare the hostname string */
     const UA_String *addr = (const UA_String*)
@@ -750,7 +739,7 @@ TCP_openActiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                      "TCP\t| Open TCP Connection: No hostname defined, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    if(addr->length >= 256) {
+    if(addr->length >= UA_MAXHOSTNAME_LENGTH) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| Open TCP Connection: Hostname too long, aborting");
         return UA_STATUSCODE_BADINTERNALERROR;
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 399b832f2f6..f96be59a615 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -15,18 +15,6 @@
 #   define IPV6_MULTICAST_PREFIX 0xFF
 #endif
 
-#define UA_MAXBACKLOG 100
-#define UA_MAXHOSTNAME_LENGTH 256
-#define UA_MAXPORTSTR_LENGTH 6
-
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-#ifndef MSG_DONTWAIT
-#define MSG_DONTWAIT 0
-#endif
-
 /* A registered file descriptor with an additional method pointer */
 typedef struct {
     UA_RegisteredFD fd;

From 8938f974cd735db21020a499f2034f22eaacd660 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 18 Dec 2022 01:33:31 +0100
Subject: [PATCH 0591/1963] refactor(el): Align the UDP API with TCP and
 Ethernet

---
 arch/eventloop_posix_udp.c           | 301 +++++++++++++--------------
 include/open62541/plugin/eventloop.h |   2 +-
 tests/check_eventloop_udp.c          |  12 +-
 3 files changed, 150 insertions(+), 165 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index f96be59a615..1b25528961a 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -7,6 +7,7 @@
  */
 
 #include "eventloop_posix.h"
+#include "eventloop_common.h"
 
 #define IPV4_PREFIX_MASK 0xF0
 #define IPV4_MULTICAST_PREFIX 0xE0
@@ -15,6 +16,32 @@
 #   define IPV6_MULTICAST_PREFIX 0xFF
 #endif
 
+/* Configuration parameters */
+#define UDP_PARAMETERSSIZE 10
+#define UDP_PARAMINDEX_RECVBUF 0
+#define UDP_PARAMINDEX_LISTEN 1
+#define UDP_PARAMINDEX_ADDR 2
+#define UDP_PARAMINDEX_PORT 3
+#define UDP_PARAMINDEX_INTERFACE 4
+#define UDP_PARAMINDEX_TTL 5
+#define UDP_PARAMINDEX_LOOPBACK 6
+#define UDP_PARAMINDEX_REUSE 7
+#define UDP_PARAMINDEX_SOCKPRIO 8
+#define UDP_PARAMINDEX_VALIDATE 9
+
+static UA_KeyValueRestriction UDPConfigParameters[UDP_PARAMETERSSIZE] = {
+    {{0, UA_STRING_STATIC("recv-bufsize")}, &UA_TYPES[UA_TYPES_UINT32], false, true, false},
+    {{0, UA_STRING_STATIC("listen")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    {{0, UA_STRING_STATIC("address")}, &UA_TYPES[UA_TYPES_STRING], false, true, true},
+    {{0, UA_STRING_STATIC("port")}, &UA_TYPES[UA_TYPES_UINT16], true, true, false},
+    {{0, UA_STRING_STATIC("interface")}, &UA_TYPES[UA_TYPES_STRING], false, true, false},
+    {{0, UA_STRING_STATIC("ttl")}, &UA_TYPES[UA_TYPES_UINT32], false, true, false},
+    {{0, UA_STRING_STATIC("loopback")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    {{0, UA_STRING_STATIC("reuse")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    {{0, UA_STRING_STATIC("sockpriority")}, &UA_TYPES[UA_TYPES_UINT32], false, true, false},
+    {{0, UA_STRING_STATIC("validate")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false}
+};
+
 /* A registered file descriptor with an additional method pointer */
 typedef struct {
     UA_RegisteredFD fd;
@@ -57,25 +84,19 @@ getHostAndPortFromParams(const UA_KeyValueMap *params,
                          char *hostname, char *portStr, const UA_Logger *logger) {
     /* Prepare the port parameter as a string */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params,
-                                 UA_QUALIFIEDNAME(0, "port"),
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_PORT].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
-    if(!port) {
-        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| No port found");
-        return 0;
-    }
+    UA_assert(port); /* checked before */
     UA_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
 
     /* Prepare the hostname string */
     const UA_String *host = (const UA_String*)
-        UA_KeyValueMap_getScalar(params,
-                                 UA_QUALIFIEDNAME(0, "hostname"),
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_ADDR].name,
                                  &UA_TYPES[UA_TYPES_STRING]);
     if(!host) {
         UA_LOG_DEBUG(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| No hostname found");
-        return 0;
+                     "UDP\t| No address configured");
+        return -1;
     }
     if(host->length >= UA_MAXHOSTNAME_LENGTH) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
@@ -87,33 +108,14 @@ getHostAndPortFromParams(const UA_KeyValueMap *params,
     return 1;
 }
 
-static void
-getNetworkInterfaceFromParams(const UA_KeyValueMap *params, UA_String *outIf) {
-    /* Prepare the networkinterface string */
-    const UA_String *networkInterface = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "network-interface"),
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(networkInterface)
-        *outIf = *networkInterface;
-}
-
 static int
 getConnectionInfoFromParams(const UA_KeyValueMap *params,
                             char *hostname, char *portStr,
                             struct addrinfo **info, const UA_Logger *logger) {
-
-    int foundParams = getHostAndPortFromParams(params,
-                                               hostname, portStr, logger);
-    if (foundParams < 0) {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| Failed retrieving host and port parameters");
+    int foundParams = getHostAndPortFromParams(params, hostname, portStr, logger);
+    if(foundParams < 0)
         return -1;
-    }
-    if(foundParams == 0) {
-        UA_LOG_DEBUG(logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| Hostname or Port not present");
-        return 0;
-    }
+
     /* Create the socket description from the connectString
      * TODO: Make this non-blocking */
     struct addrinfo hints;
@@ -162,7 +164,7 @@ setLoopBackData(UA_SOCKET sockfd, UA_Boolean enableLoopback,
     return UA_STATUSCODE_GOOD;
 }
 
-static void
+static UA_StatusCode
 setTimeToLive(UA_SOCKET sockfd, UA_UInt32 messageTTL,
               int ai_family, const UA_Logger *logger) {
     /* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
@@ -183,10 +185,12 @@ setTimeToLive(UA_SOCKET sockfd, UA_UInt32 messageTTL,
                            "UDP %u\t| Time to live setup failed: "
                            "Cannot set socket option IP_MULTICAST_TTL. Error: %s",
                            (unsigned)sockfd, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
+    return UA_STATUSCODE_GOOD;
 }
 
-static void
+static UA_StatusCode
 setReuseAddress(UA_SOCKET sockfd, UA_Boolean enableReuse, const UA_Logger *logger) {
     /* Set reuse address -> enables sharing of the same listening address on
      * different sockets */
@@ -200,16 +204,17 @@ setReuseAddress(UA_SOCKET sockfd, UA_Boolean enableReuse, const UA_Logger *logge
                            "UDP %u\t| Reuse address setup failed: "
                            "Cannot set socket option SO_REUSEADDR. Error: %s",
                            (unsigned)sockfd, errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
+    return UA_STATUSCODE_GOOD;
 }
 
 #ifdef __linux__
 static UA_StatusCode
-setSocketPriority(UA_SOCKET sockfd, UA_UInt32 *socketPriority,
+setSocketPriority(UA_SOCKET sockfd, UA_UInt32 socketPriority,
                   const UA_Logger *logger) {
-    /* Setting the socket priority to the socket */
-    if (UA_setsockopt(sockfd, SOL_SOCKET, SO_PRIORITY,
-                      socketPriority, sizeof(*socketPriority)) < 0) {
+    int prio = (int)socketPriority;
+    if(UA_setsockopt(sockfd, SOL_SOCKET, SO_PRIORITY, &prio, sizeof(int)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                          "UDP %u\t| Socket priority setup failed: "
@@ -239,75 +244,46 @@ isIPv6MulticastAddress(const UA_Byte *address) {
 #endif
 
 static UA_StatusCode
-setConnectionConfig(UA_FD socket, const UA_KeyValueMap *connectionProperties,
+setConnectionConfig(UA_FD socket, const UA_KeyValueMap *params,
                     int ai_family, const UA_Logger *logger) {
-    /* Iterate over the given KeyValuePair parameters */
-    UA_String ttlParam = UA_STRING("ttl");
-    UA_String loopbackParam = UA_STRING("loopback");
-    UA_String reuseParam = UA_STRING("reuse");
+    /* Set socket config that is always set */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    res |= UA_EventLoopPOSIX_setNonBlocking(socket);
+    res |= UA_EventLoopPOSIX_setNoSigPipe(socket);
 
-    UA_String hostnameParam = UA_STRING("hostname");
-    UA_String portParam = UA_STRING("port");
-    UA_String listenParam = UA_STRING("listen");
-    UA_String interfaceParam = UA_STRING("interface");
-    UA_String validateParam = UA_STRING("validate");
+    /* Set socket settings from the parameters */
+    const UA_UInt32 *messageTTL = (const UA_UInt32*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_TTL].name,
+                                 &UA_TYPES[UA_TYPES_UINT32]);
+    if(messageTTL)
+        res |= setTimeToLive(socket, *messageTTL, ai_family, logger);
+
+    const UA_Boolean *enableLoopback = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_LOOPBACK].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(enableLoopback)
+        res |= setLoopBackData(socket, *enableLoopback, ai_family, logger);
+
+    const UA_Boolean *enableReuse = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_REUSE].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(enableReuse)
+        res |= setReuseAddress(socket, *enableReuse, logger);
 
 #ifdef __linux__
-    UA_String socketPriorityParam = UA_STRING("sockpriority");
-#endif
-    for(size_t i = 0; i < connectionProperties->mapSize; i++) {
-        const UA_KeyValuePair *prop = &connectionProperties->map[i];
-        if(UA_String_equal(&prop->key.name, &ttlParam)) {
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                UA_UInt32 messageTTL = *(UA_UInt32*)prop->value.data;
-                setTimeToLive(socket, messageTTL, ai_family, logger);
-            }
-        } else if(UA_String_equal(&prop->key.name, &loopbackParam)) {
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
-                UA_Boolean enableLoopback = *(UA_Boolean*)prop->value.data;
-                UA_StatusCode res = setLoopBackData(socket, enableLoopback, ai_family, logger);
-                if (res != UA_STATUSCODE_GOOD) return res;
-            }
-        } else if(UA_String_equal(&prop->key.name, &reuseParam)) {
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
-                UA_Boolean enableReuse = *(UA_Boolean *)prop->value.data;
-                setReuseAddress(socket, enableReuse, logger);
-            }
-#ifdef __linux__
-        } else if(UA_String_equal(&prop->key.name, &socketPriorityParam)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                UA_UInt32 socketPriority = *(UA_UInt32 *) prop->value.data;
-                setSocketPriority(socket, &socketPriority, logger);
-            }
+    const UA_UInt32 *socketPriority = (const UA_UInt32*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_SOCKPRIO].name,
+                                 &UA_TYPES[UA_TYPES_UINT32]);
+    if(socketPriority)
+        res |= setSocketPriority(socket, *socketPriority, logger);
 #endif
-        } else if (UA_String_equal(&prop->key.name, &hostnameParam) ||
-                   UA_String_equal(&prop->key.name, &portParam) ||
-                   UA_String_equal(&prop->key.name, &listenParam) ||
-                   UA_String_equal(&prop->key.name, &interfaceParam) ||
-                   UA_String_equal(&prop->key.name, &validateParam)) {
-                /* ignore, required args are handled elsewhere explicitly */
-        } else {
-            UA_LOG_WARNING(logger, UA_LOGCATEGORY_SERVER,
-                           "UDP\t| Unknown connection parameter: '%.*s'.",
-                           (int)prop->key.name.length, (char*)prop->key.name.data);
-        }
-    }
 
-    /* Set the socket options also there might be external requirements for
-     * socket options how to handle and set those either
-     * - passed in parameters
-     * - specific callback that gives access to the allocated socket */
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    res |= UA_EventLoopPOSIX_setNonBlocking(socket);
-    res |= UA_EventLoopPOSIX_setNoSigPipe(socket);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
                            "UDP\t| Could not set socket options: %s", errno_str));
-        return res;
     }
-
-    return UA_STATUSCODE_GOOD;
+    return res;
 }
 static UA_StatusCode
 setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValueMap *params,
@@ -317,12 +293,13 @@ setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValue
     ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY); /* default ANY */
 
     /* Use a defined network interface */
-    UA_String netif = UA_STRING_NULL;
-    getNetworkInterfaceFromParams(params, &netif);
-    if(!UA_String_isEmpty(&netif)) {
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
-        memcpy(interfaceAsChar, netif.data, netif.length);
-        interfaceAsChar[netif.length] = 0;
+    const UA_String *netif = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(netif) {
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
+        memcpy(interfaceAsChar, netif->data, netif->length);
+        interfaceAsChar[netif->length] = 0;
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
                          "UDP %u\t| Interface configuration preparation failed",
@@ -358,12 +335,13 @@ setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sock
     ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY); /* default ANY */
 
     /* Use a defined interface */
-    UA_String netif = UA_STRING_NULL;
-    getNetworkInterfaceFromParams(params, &netif);
-    if(!UA_String_isEmpty(&netif)) {
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
-        memcpy(interfaceAsChar, netif.data, netif.length);
-        interfaceAsChar[netif.length] = 0;
+    const UA_String *netif = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(netif) {
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
+        memcpy(interfaceAsChar, netif->data, netif->length);
+        interfaceAsChar[netif->length] = 0;
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
                          "UDP\t| Interface configuration preparation failed.");
@@ -394,12 +372,13 @@ setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sock
     ipMulticastRequest.ipv6.ipv6mr_interface = 0; /* default ANY interface */
 
     /* Bind to a defined interface */
-    UA_String netif = UA_STRING_NULL;
-    getNetworkInterfaceFromParams(params, &netif);
-    if(!UA_String_isEmpty(&netif)) {
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
-        memcpy(interfaceAsChar, netif.data, netif.length);
-        interfaceAsChar[netif.length] = 0;
+    const UA_String *netif = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(netif) {
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
+        memcpy(interfaceAsChar, netif->data, netif->length);
+        interfaceAsChar[netif->length] = 0;
         ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
         if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
@@ -428,12 +407,13 @@ setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValu
     ipMulticastRequest.ipv6.ipv6mr_interface = 0; /* default ANY interface */
 
     /* Use a defined network interface */
-    UA_String netif = UA_STRING_NULL;
-    getNetworkInterfaceFromParams(params, &netif);
-    if(!UA_String_isEmpty(&netif)) {
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (netif).length + 1);
-        memcpy(interfaceAsChar, netif.data, netif.length);
-        interfaceAsChar[netif.length] = 0;
+    const UA_String *netif = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(netif) {
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
+        memcpy(interfaceAsChar, netif->data, netif->length);
+        interfaceAsChar[netif->length] = 0;
         ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
         if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
@@ -1117,8 +1097,7 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
 }
 
 static UA_StatusCode
-UDP_openReceiveConnection(UA_ConnectionManager *cm,
-                          const UA_KeyValueMap *params,
+UDP_openReceiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                           void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback,
                           UA_Boolean validate) {
@@ -1126,41 +1105,34 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm,
 
     /* Get the socket */
     const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "port"),
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_PORT].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
-    if(!port) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Port information required for UDP listening");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
+    UA_assert(port); /* checked before */
 
     /* Get the hostname configuration */
-    const UA_Variant *hostname =
-        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "hostname"));
+    const UA_Variant *addrs =
+        UA_KeyValueMap_get(params, UDPConfigParameters[UDP_PARAMINDEX_ADDR].name);
+    size_t addrsSize = 0;
+    if(addrs) {
+        UA_assert(addrs->type == &UA_TYPES[UA_TYPES_STRING]);
+        if(UA_Variant_isScalar(addrs))
+            addrsSize = 1;
+        else
+            addrsSize = addrs->arrayLength;
+    }
 
     /* No hostname configured -> listen on all interfaces */
-    if(!hostname || (!UA_Variant_isScalar(hostname) && hostname->arrayLength == 0))  {
+    if(addrsSize == 0) {
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Listening on all interfaces");
         return UDP_registerListenSockets(cm, NULL, *port, params, application,
                                          context, connectionCallback, validate);
     }
 
-    /* Correct datatype for the hostname? */
-    if(hostname->type != &UA_TYPES[UA_TYPES_STRING]) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "UDP\t| The hostname parameter needs to be of type string");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    size_t hostNamesSize = hostname->arrayLength;
-    if(UA_Variant_isScalar(hostname))
-        hostNamesSize = 1;
-
     /* Iterate over the configured hostnames */
-    UA_String *hostStrings = (UA_String*)hostname->data;
-    for(size_t i = 0; i < hostNamesSize; i++) {
-        char hn[512];
+    UA_String *hostStrings = (UA_String*)addrs->data;
+    for(size_t i = 0; i < addrsSize; i++) {
+        char hn[UA_MAXHOSTNAME_LENGTH];
         if(hostStrings[i].length >= sizeof(hn))
             continue;
         memcpy(hn, hostStrings[i].data, hostStrings->length);
@@ -1187,19 +1159,26 @@ UDP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Check the parameters */
+    UA_StatusCode res =
+        UA_KeyValueRestriction_validate(&UDPConfigParameters[1],
+                                        UDP_PARAMETERSSIZE-1, params);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
     UA_Boolean validate = false;
-    const UA_Variant *validationValue =
-        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "validate"));
-    if(validationValue &&
-       UA_Variant_hasScalarType(validationValue, &UA_TYPES[UA_TYPES_BOOLEAN]))
-        validate = *(UA_Boolean *)validationValue->data;
+    const UA_Boolean *validationValue = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_VALIDATE].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(validationValue)
+        validate = *validationValue;
 
     UA_Boolean listen = false;
-    const UA_Variant *listenValue =
-        UA_KeyValueMap_get(params, UA_QUALIFIEDNAME(0, "listen"));
-    if(listenValue &&
-       UA_Variant_hasScalarType(listenValue, &UA_TYPES[UA_TYPES_BOOLEAN]))
-        listen = *(UA_Boolean *)listenValue->data;
+    const UA_Boolean *listenValue = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_LISTEN].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(listenValue)
+        listen = *listenValue;
 
     if(listen) {
         return UDP_openReceiveConnection(cm, params, application, context,
@@ -1223,16 +1202,22 @@ UDP_eventSourceStart(UA_ConnectionManager *cm) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Check the parameters */
+    UA_StatusCode res = UA_KeyValueRestriction_validate(UDPConfigParameters, 1,
+                                                        &cm->eventSource.params);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
     /* The receive buffersize was configured? */
     UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
     UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
     const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
         UA_KeyValueMap_getScalar(&cm->eventSource.params,
-                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                 UDPConfigParameters[UDP_PARAMINDEX_RECVBUF].name,
                                  &UA_TYPES[UA_TYPES_UINT32]);
     if(configRxBufSize)
         rxBufSize = *configRxBufSize;
-    UA_StatusCode res = UA_ByteString_allocBuffer(&ucm->rxBuffer, rxBufSize);
+    res = UA_ByteString_allocBuffer(&ucm->rxBuffer, rxBufSize);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 6c2a19eeda8..f67e6c860f3 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -492,7 +492,7 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  *
  * - 0:listen [boolean]: Use the connection for listening or for sending
  *       (default: false)
- * - 0:hostname [string | string array]: Hostname (or IPv4/v6 address) for
+ * - 0:address [string | string array]: Hostname (or IPv4/v6 address) for
  *       sending or receiving. A scalar is required for sending. For listening a
  *       string array for the list-hostnames is possible as well (default: list
  *       on all hostnames).
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index 76e501e3169..1e9b2256c6e 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -124,7 +124,7 @@ START_TEST(connectUDPValidationSucceeds) {
     UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
 
     UA_String hostname = UA_STRING("127.0.0.1");
-    params[1].key = UA_QUALIFIEDNAME(0, "hostname");
+    params[1].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setArray(&params[1].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
 
     params[2].key = UA_QUALIFIEDNAME(0, "validate");
@@ -174,7 +174,7 @@ START_TEST(connectUDPValidationFails) {
     UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
 
     UA_String hostname = UA_STRING("300.300.300.300");
-    params[1].key = UA_QUALIFIEDNAME(0, "hostnames");
+    params[1].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setArray(&params[1].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
 
     params[2].key = UA_QUALIFIEDNAME(0, "validate");
@@ -219,7 +219,7 @@ START_TEST(connectUDP) {
     UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
     params[1].key = UA_QUALIFIEDNAME(0, "listen");
     UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    params[2].key = UA_QUALIFIEDNAME(0, "hostname");
+    params[2].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&params[2].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
 
     UA_KeyValueMap paramsMap = {2, params}; /* hide the third parameter */
@@ -321,7 +321,7 @@ START_TEST(udpTalkerAndListener) {
     listen = false;
 
     UA_String targetHost = UA_STRING("localhost");
-    params[2].key = UA_QUALIFIEDNAME(0, "hostname");
+    params[2].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&params[2].value, &targetHost, &UA_TYPES[UA_TYPES_STRING]);
     paramsMap.mapSize = 3;
 
@@ -432,7 +432,7 @@ START_TEST(udpTalkerAndListenerDifferentDestination) {
     listen = false;
 
     UA_String connectionTargetHost = UA_STRING("localhost");
-    params[2].key = UA_QUALIFIEDNAME(0, "hostname");
+    params[2].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&params[2].value, &connectionTargetHost, &UA_TYPES[UA_TYPES_STRING]);
     paramsMap.mapSize = 3;
 
@@ -460,7 +460,7 @@ START_TEST(udpTalkerAndListenerDifferentDestination) {
     UA_String sendTargetHost = UA_STRING("127.0.0.1");
     sendParams[0].key = UA_QUALIFIEDNAME(0, "port");
     UA_Variant_setScalar(&sendParams[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    sendParams[1].key = UA_QUALIFIEDNAME(0, "hostname");
+    sendParams[1].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&sendParams[1].value, &sendTargetHost, &UA_TYPES[UA_TYPES_STRING]);
 
     UA_KeyValueMap sendParamsMap;

From aecc95f835d652e3aa40b47115c70a250e3c8aea Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 18 Dec 2022 17:28:07 +0100
Subject: [PATCH 0592/1963] refactor(pubsub): Simplify the initialization of
 the KeyStorage; Make tests valgrind-clean

---
 src/pubsub/ua_pubsub_keystorage.c      | 84 ++++++++------------------
 src/pubsub/ua_pubsub_keystorage.h      | 30 ++++-----
 src/pubsub/ua_pubsub_readergroup.c     | 31 +++++-----
 src/pubsub/ua_pubsub_securitygroup.c   | 61 +++++++++++--------
 src/pubsub/ua_pubsub_writergroup.c     | 41 +++++++------
 tests/pubsub/check_pubsub_keystorage.c | 51 ++++++----------
 6 files changed, 133 insertions(+), 165 deletions(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 990b08d4ccc..b7ef3d27d11 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -65,7 +65,7 @@ UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     UA_assert(keyStorage != NULL);
     UA_assert(server != NULL);
 
-    /*Remove callback*/
+    /* Remove callback */
     if(!keyStorage->callBackId) {
         removeCallback(server, keyStorage->callBackId);
         keyStorage->callBackId = 0;
@@ -76,58 +76,28 @@ UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     if(keyStorage->securityGroupID.data)
         UA_String_clear(&keyStorage->securityGroupID);
 
-    memset(keyStorage, 0, sizeof(UA_PubSubKeyStorage));
-
     UA_free(keyStorage);
 }
 
 UA_StatusCode
-UA_PubSubKeyStorage_init(UA_Server *server, const UA_String *securityGroupId,
-                               const UA_String *securityPolicyUri,
-                               UA_UInt32 maxPastKeyCount, UA_UInt32 maxFutureKeyCount,
-                               UA_PubSubKeyStorage *keyStorage) {
-    UA_StatusCode retval = UA_STATUSCODE_BAD;
-
-    if(!server || !securityPolicyUri || !securityGroupId || !keyStorage) {
-        retval = UA_STATUSCODE_BADINVALIDARGUMENT;
-        goto error;
-    }
-
-    UA_PubSubSecurityPolicy *policy;
-
-    UA_PubSubKeyStorage *tmpKeyStorage =
-        UA_Server_findKeyStorage(server, *securityGroupId);
-    if(tmpKeyStorage) {
-        ++tmpKeyStorage->referenceCount;
-        keyStorage = tmpKeyStorage;
-        return UA_STATUSCODE_GOOD;
-    }
-
-    keyStorage->referenceCount = 1;
-
-    retval = UA_String_copy(securityGroupId, &keyStorage->securityGroupID);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto error;
-
-    retval = UA_Server_findPubSubSecurityPolicy(server, securityPolicyUri,
-                                                              &policy);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto error;
-    keyStorage->policy = policy;
+UA_PubSubKeyStorage_init(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
+                         const UA_String *securityGroupId,
+                         UA_PubSubSecurityPolicy *policy,
+                         UA_UInt32 maxPastKeyCount, UA_UInt32 maxFutureKeyCount) {
+    UA_StatusCode res = UA_String_copy(securityGroupId, &keyStorage->securityGroupID);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
 
     UA_UInt32 currentkeyCount = 1;
-    keyStorage->maxKeyListSize =
-        maxPastKeyCount + currentkeyCount + maxFutureKeyCount;
     keyStorage->maxPastKeyCount = maxPastKeyCount;
     keyStorage->maxFutureKeyCount = maxFutureKeyCount;
+    keyStorage->maxKeyListSize = maxPastKeyCount + currentkeyCount + maxFutureKeyCount;
+    keyStorage->policy = policy;
 
-    /*Add this keystorage to the server keystoragelist*/
+    /* Add this keystorage to the server keystoragelist */
     LIST_INSERT_HEAD(&server->pubSubManager.pubSubKeyList, keyStorage, keyStorageList);
 
-    return retval;
-error:
-    UA_PubSubKeyStorage_delete(server, keyStorage);
-    return retval;
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
@@ -275,15 +245,14 @@ splitCurrentKeyMaterial(UA_PubSubKeyStorage *keyStorage, UA_ByteString *signingK
     size_t keyNonceLength = key.length - signingkeyLength - encryptkeyLength;
 
     /*DivideKeys in origin ByteString*/
-    UA_ByteString tSigningKey = {signingkeyLength, key.data};
-    UA_ByteString_copy(&tSigningKey, signingKey);
+    signingKey->data = key.data;
+    signingKey->length = signingkeyLength;
 
-    UA_String tEncryptingKey = {encryptkeyLength, key.data + signingkeyLength};
-    UA_ByteString_copy(&tEncryptingKey, encryptingKey);
+    encryptingKey->data = key.data + signingkeyLength;
+    encryptingKey->length = encryptkeyLength;
 
-    UA_ByteString tKeyNonce = {keyNonceLength,
-                              key.data + signingkeyLength + encryptkeyLength};
-    UA_ByteString_copy(&tKeyNonce, keyNonce);
+    keyNonce->data = key.data + signingkeyLength + encryptkeyLength;
+    keyNonce->length = keyNonceLength;
 
     return UA_STATUSCODE_GOOD;
 }
@@ -363,7 +332,9 @@ UA_PubSubKeyStorage_activateKeyToChannelContext(UA_Server *server, UA_NodeId pub
     UA_ByteString signingKey;
     UA_ByteString encryptKey;
     UA_ByteString keyNonce;
-    splitCurrentKeyMaterial(keyStorage, &signingKey, &encryptKey, &keyNonce);
+    retval = splitCurrentKeyMaterial(keyStorage, &signingKey, &encryptKey, &keyNonce);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
 
     if(!UA_NodeId_isNull(&pubSubGroupId))
         retval = setPubSubGroupEncryptingKey(server, pubSubGroupId, securityTokenId,
@@ -447,17 +418,12 @@ UA_PubSubKeyStorage_update(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
 }
 
 void
-UA_PubSubKeyStorage_removeKeyStorage(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
-    if(!keyStorage) {
-        return;
-    }
-    if(keyStorage->referenceCount > 1) {
-        --keyStorage->referenceCount;
-        return;
-    }
-    if(keyStorage->referenceCount == 1) {
+UA_PubSubKeyStorage_detachKeyStorage(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
+    keyStorage->referenceCount--;
+    if(keyStorage->referenceCount == 0) {
         LIST_REMOVE(keyStorage, keyStorageList);
         UA_PubSubKeyStorage_delete(server, keyStorage);
     }
 }
+
 #endif
diff --git a/src/pubsub/ua_pubsub_keystorage.h b/src/pubsub/ua_pubsub_keystorage.h
index 0132a8f6142..ec18e9dc0e1 100644
--- a/src/pubsub/ua_pubsub_keystorage.h
+++ b/src/pubsub/ua_pubsub_keystorage.h
@@ -230,19 +230,19 @@ UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage);
  * @brief Initializes an empty Keystorage for the SecurityGroupId and add it to the Server
  * KeyStorageList
  *
- * @param server the server object
- * @param securityGroupId the identifier of the SecurityGroup
- * @param securityPolicyUri the security policy assocaited with the security algorithm
+ * @param server The server object
+ * @param keyStorage Pointer to the keystorage to be initialized
+ * @param securityGroupId The identifier of the SecurityGroup
+ * @param policy The security policy assocaited with the security algorithm
  * @param maxPastKeyCount maximum number of past keys a keystorage is allowed to store
  * @param maxFutureKeyCount maximum number of future keys a keystorage is allowed to store
- * @param keyStorage pointer to the keystorage to be initialized
  * @return UA_StatusCode return status code
  */
 UA_StatusCode
-UA_PubSubKeyStorage_init(UA_Server *server, const UA_String *securityGroupId,
-                               const UA_String *securityPolicyUri,
-                               UA_UInt32 maxPastKeyCount, UA_UInt32 maxFutureKeyCount,
-                               UA_PubSubKeyStorage *keyStorage);
+UA_PubSubKeyStorage_init(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
+                         const UA_String *securityGroupId,
+                         UA_PubSubSecurityPolicy *policy,
+                         UA_UInt32 maxPastKeyCount, UA_UInt32 maxFutureKeyCount);
 
 /**
  * @brief After Keystorage is initialized and added to the server, this method is called
@@ -355,17 +355,11 @@ UA_PubSubKeyStorage_update(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
                            const size_t futureKeySize, UA_ByteString *futureKeys,
                            UA_Duration msKeyLifeTime);
 
-/**
- * @brief KeyStorage must be referenced by atleast one PubSubGroup. This method checks if
- * KeyStorage is referenced by more then 1 PubSubGroup, then it decreases the
- * referenceCount by one. If the referenceCount is exactly one then removes the KeyStorage
- * from the server and PubSubGroup.
- *
- * @param server that holds the keystorage and PubSubGroups0
- * @param keyStorage to be removed from server
- */
+/* KeyStorage must be referenced by atleast one PubSubGroup. This method reduces
+ * the reference count by one. If no PubSubGroup uses the key storage, then it
+ * is deleted. */
 void
-UA_PubSubKeyStorage_removeKeyStorage(UA_Server *server, UA_PubSubKeyStorage *keyStorage);
+UA_PubSubKeyStorage_detachKeyStorage(UA_Server *server, UA_PubSubKeyStorage *keyStorage);
 
 #endif
 
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 9bde6989236..058bb869bca 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -156,22 +156,27 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
        readerGroupConfig->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
         if(!UA_String_isEmpty(&readerGroupConfig->securityGroupId) &&
            readerGroupConfig->securityPolicy) {
-            UA_String policyUri = readerGroupConfig->securityPolicy->policyUri;
+            /* Does the key storage already exist? */
+            newGroup->keyStorage =
+                UA_Server_findKeyStorage(server, readerGroupConfig->securityGroupId);
 
-            newGroup->keyStorage = UA_Server_findKeyStorage(
-                server, readerGroupConfig->securityGroupId);
             if(!newGroup->keyStorage) {
-                newGroup->keyStorage = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+                /* Create a new key storage */
+                newGroup->keyStorage = (UA_PubSubKeyStorage *)
+                    UA_calloc(1, sizeof(UA_PubSubKeyStorage));
                 if(!newGroup->keyStorage)
                     return UA_STATUSCODE_BADOUTOFMEMORY;
+                retval = UA_PubSubKeyStorage_init(server, newGroup->keyStorage,
+                                                  &readerGroupConfig->securityGroupId,
+                                                  readerGroupConfig->securityPolicy, 0, 0);
+                if(retval != UA_STATUSCODE_GOOD) {
+                    UA_free(newGroup);
+                    return retval;
+                }
             }
 
-            retval = UA_PubSubKeyStorage_init(server, &readerGroupConfig->securityGroupId,
-                                              &policyUri, 0, 0, newGroup->keyStorage);
-            if(retval != UA_STATUSCODE_GOOD) {
-                UA_free(newGroup);
-                return retval;
-            }
+            /* Increase the ref count */
+            newGroup->keyStorage->referenceCount++;
         }
     }
 
@@ -286,12 +291,10 @@ UA_Server_ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup) {
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_SKS
-    if(readerGroup->config.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
-       readerGroup->config.securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
-        UA_PubSubKeyStorage_removeKeyStorage(server, readerGroup->keyStorage);
+    if(readerGroup->keyStorage) {
+        UA_PubSubKeyStorage_detachKeyStorage(server, readerGroup->keyStorage);
         readerGroup->keyStorage = NULL;
     }
-
 #endif
 
     UA_ReaderGroupConfig_clear(&readerGroup->config);
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index cb735b97951..ac69d2300ba 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -136,55 +136,65 @@ updateSKSKeyStorage(UA_Server *server, UA_SecurityGroup *securityGroup){
     securityGroup->baseTime = UA_DateTime_nowMonotonic();
 
     /* We allocated memory for data with allocBuffer so now we free it */
-    UA_Byte_delete(newKey.data);
-    return;
+    UA_ByteString_clear(&newKey);
 }
 
 static UA_StatusCode
 initializeKeyStorageWithKeys(UA_Server *server, UA_SecurityGroup *securityGroup) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    size_t keyLength;
-    UA_StatusCode retval = UA_STATUSCODE_BAD;
 
-    UA_ByteString futurekeys[securityGroup->config.maxFutureKeyCount];
-    UA_ByteString currentKey;
-    UA_UInt32 startingKeyId = 1;
-    UA_PubSubKeyStorage *ks = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+    UA_PubSubSecurityPolicy *policy = NULL;
+    UA_StatusCode retval =
+        UA_Server_findPubSubSecurityPolicy(server,
+                                           &securityGroup->config.securityPolicyUri,
+                                           &policy);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    UA_PubSubKeyStorage *ks = (UA_PubSubKeyStorage *)
+        UA_calloc(1, sizeof(UA_PubSubKeyStorage));
     if(!ks)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
+    retval = UA_PubSubKeyStorage_init(server, ks, &securityGroup->securityGroupId,
+                                      policy, securityGroup->config.maxPastKeyCount,
+                                      securityGroup->config.maxFutureKeyCount);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_free(ks);
+        return retval;
+    }
+
+    ks->referenceCount++;
     securityGroup->keyStorage = ks;
-    retval = UA_PubSubKeyStorage_init(server, &securityGroup->securityGroupId,
-                                            &securityGroup->config.securityPolicyUri,
-                                            securityGroup->config.maxPastKeyCount,
-                                            securityGroup->config.maxFutureKeyCount, ks);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto error;
 
-    keyLength = ks->policy->symmetricModule.secureChannelNonceLength;
+    UA_ByteString currentKey;
+    size_t keyLength = ks->policy->symmetricModule.secureChannelNonceLength;
     retval = UA_ByteString_allocBuffer(&currentKey, keyLength);
     retval = generateKeyData(ks->policy, &currentKey);
 
+    UA_ByteString futurekeys[securityGroup->config.maxFutureKeyCount];
     for(size_t i = 0; i < securityGroup->config.maxFutureKeyCount; i++) {
         retval = UA_ByteString_allocBuffer(&futurekeys[i], keyLength);
         retval = generateKeyData(ks->policy, &futurekeys[i]);
     }
 
-    retval = UA_PubSubKeyStorage_storeSecurityKeys(
-        server, securityGroup->keyStorage, startingKeyId, &currentKey, futurekeys,
-        securityGroup->config.maxFutureKeyCount, securityGroup->config.keyLifeTime);
+    UA_UInt32 startingKeyId = 1;
+    retval = UA_PubSubKeyStorage_storeSecurityKeys(server, securityGroup->keyStorage,
+                                                   startingKeyId, &currentKey, futurekeys,
+                                                   securityGroup->config.maxFutureKeyCount,
+                                                   securityGroup->config.keyLifeTime);
     if(retval != UA_STATUSCODE_GOOD)
         goto error;
 
     securityGroup->baseTime = UA_DateTime_nowMonotonic();
-
     retval = addRepeatedCallback(server, (UA_ServerCallback)updateSKSKeyStorage,
                                  securityGroup, securityGroup->config.keyLifeTime,
                                  &securityGroup->callbackId);
     if(retval != UA_STATUSCODE_GOOD)
         goto error;
 
-    return retval;
+    return UA_STATUSCODE_GOOD;
+
 error:
     UA_PubSubKeyStorage_delete(server, ks);
     return retval;
@@ -192,8 +202,8 @@ initializeKeyStorageWithKeys(UA_Server *server, UA_SecurityGroup *securityGroup)
 
 static UA_StatusCode
 addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
-                           const UA_SecurityGroupConfig *securityGroupConfig,
-                           UA_NodeId *securityGroupNodeId) {
+                 const UA_SecurityGroupConfig *securityGroupConfig,
+                 UA_NodeId *securityGroupNodeId) {
     if(!securityGroupConfig)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
@@ -316,17 +326,20 @@ UA_SecurityGroup_delete(UA_SecurityGroup *securityGroup) {
 
 void
 removeSecurityGroup(UA_Server *server, UA_SecurityGroup *securityGroup) {
-
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     UA_removeSecurityGroupRepresentation(server, securityGroup);
 #endif
+
     /* Unlink from the server */
     TAILQ_REMOVE(&server->pubSubManager.securityGroups, securityGroup, listEntry);
     server->pubSubManager.securityGroupsSize--;
     if(securityGroup->callbackId > 0)
         removeCallback(server, securityGroup->callbackId);
 
-    UA_PubSubKeyStorage_removeKeyStorage(server, securityGroup->keyStorage);
+    if(securityGroup->keyStorage) {
+        UA_PubSubKeyStorage_detachKeyStorage(server, securityGroup->keyStorage);
+        securityGroup->keyStorage = NULL;
+    }
 
     UA_SecurityGroup_delete(securityGroup);
 }
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 5a03ad17aa9..65eb7f27f17 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -123,23 +123,27 @@ UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
        writerGroupConfig->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
         if(!UA_String_isEmpty(&writerGroupConfig->securityGroupId) &&
            writerGroupConfig->securityPolicy) {
-            UA_String policyUri = writerGroupConfig->securityPolicy->policyUri;
-
+            /* Does the key storage already exist? */
             newWriterGroup->keyStorage =
-                UA_Server_findKeyStorage(
-                    server, writerGroupConfig->securityGroupId);
+                UA_Server_findKeyStorage(server, writerGroupConfig->securityGroupId);
+
             if(!newWriterGroup->keyStorage) {
-                newWriterGroup->keyStorage = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+                /* Create a new key storage */
+                newWriterGroup->keyStorage = (UA_PubSubKeyStorage *)
+                    UA_calloc(1, sizeof(UA_PubSubKeyStorage));
                 if(!newWriterGroup)
                     return UA_STATUSCODE_BADOUTOFMEMORY;
+                res = UA_PubSubKeyStorage_init(server, newWriterGroup->keyStorage,
+                                               &writerGroupConfig->securityGroupId,
+                                               writerGroupConfig->securityPolicy, 0, 0);
+                if(res != UA_STATUSCODE_GOOD) {
+                    UA_free(newWriterGroup);
+                    return res;
+                }
             }
 
-            res = UA_PubSubKeyStorage_init(server, &writerGroupConfig->securityGroupId,
-                                           &policyUri, 0, 0, newWriterGroup->keyStorage);
-            if(res != UA_STATUSCODE_GOOD) {
-                UA_free(newWriterGroup);
-                return res;
-            }
+            /* Increase the ref count */
+            newWriterGroup->keyStorage->referenceCount++;
         }
     }
 
@@ -194,7 +198,9 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     removeGroupRepresentation(server, wg);
 #endif
 
+    /* _clear also removes the refcount in the key storage */
     UA_WriterGroup_clear(server, wg);
+
     LIST_REMOVE(wg, listEntry);
     UA_free(wg);
     return UA_STATUSCODE_GOOD;
@@ -684,9 +690,6 @@ UA_WriterGroupConfig_clear(UA_WriterGroupConfig *writerGroupConfig) {
 
 static void
 UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
-    UA_WriterGroupConfig_clear(&writerGroup->config);
-    UA_NodeId_clear(&writerGroup->identifier);
-
     /* Delete all writers */
     UA_DataSetWriter *dataSetWriter, *tmpDataSetWriter;
     LIST_FOREACH_SAFE(dataSetWriter, &writerGroup->writers, listEntry, tmpDataSetWriter){
@@ -701,14 +704,14 @@ UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_SKS
-    if(writerGroup->config.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
-       writerGroup->config.securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
-            UA_PubSubKeyStorage_removeKeyStorage(server,
-                                                 writerGroup->keyStorage);
-            writerGroup->keyStorage = NULL;
+    if(writerGroup->keyStorage) {
+        UA_PubSubKeyStorage_detachKeyStorage(server, writerGroup->keyStorage);
+        writerGroup->keyStorage = NULL;
     }
 #endif
 
+    UA_WriterGroupConfig_clear(&writerGroup->config);
+    UA_NodeId_clear(&writerGroup->identifier);
     UA_NetworkMessageOffsetBuffer_clear(&writerGroup->bufferedMessage);
 }
 
diff --git a/tests/pubsub/check_pubsub_keystorage.c b/tests/pubsub/check_pubsub_keystorage.c
index a662ab3ef75..c3744851063 100644
--- a/tests/pubsub/check_pubsub_keystorage.c
+++ b/tests/pubsub/check_pubsub_keystorage.c
@@ -41,6 +41,7 @@ UA_Byte keyNoncePub[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
 UA_Server *server = NULL;
 UA_ByteString currentKey;
 UA_ByteString *futureKey = NULL;
+UA_UInt32 futureKeySize;
 UA_String SecurityGroupId;
 UA_NodeId connection, writerGroup, readerGroup, publishedDataSet, dataSetWriter;
 
@@ -114,7 +115,7 @@ addTestReaderGroup(UA_String securitygroupId){
 }
 
 static UA_PubSubKeyStorage*
-createKeyStoragewithkeys(UA_UInt32 currentTokenId, UA_UInt32 futureKeySize,
+createKeyStoragewithkeys(UA_UInt32 currentTokenId, UA_UInt32 keysize,
                          UA_Duration msKeyLifeTime, UA_Duration msTimeToNextKey, UA_String testSecurityGroupId) {
 
     UA_StatusCode retval = UA_STATUSCODE_BAD;
@@ -130,23 +131,23 @@ createKeyStoragewithkeys(UA_UInt32 currentTokenId, UA_UInt32 futureKeySize,
     UA_ByteString_allocBuffer(&currentKey, keyLength);
     generateKeyData(server->config.pubSubConfig.securityPolicies, &currentKey);
 
-    futureKey = (UA_ByteString *)UA_calloc(futureKeySize, sizeof(UA_ByteString));
+    futureKey = (UA_ByteString *)UA_calloc(keysize, sizeof(UA_ByteString));
     if(!futureKey)
         return NULL;
 
-    for(size_t i = 0; i < futureKeySize; i++) {
+    for(size_t i = 0; i < keysize; i++) {
         UA_ByteString_allocBuffer(&futureKey[i], keyLength);
         generateKeyData(server->config.pubSubConfig.securityPolicies, &futureKey[i]);
     }
 
     retval = UA_PubSubKeyStorage_storeSecurityKeys(server, tKeyStorage,
                                                    currentTokenId, &currentKey, futureKey,
-                                                   futureKeySize, msKeyLifeTime);
+                                                   keysize, msKeyLifeTime);
     if(retval != UA_STATUSCODE_GOOD)
         return NULL;
 
     retval = UA_PubSubKeyStorage_activateKeyToChannelContext(server, UA_NODEID_NULL,
-                                                           tKeyStorage->securityGroupID);
+                                                             tKeyStorage->securityGroupID);
     if(retval != UA_STATUSCODE_GOOD)
         return NULL;
 
@@ -206,23 +207,25 @@ setup(void) {
 static void teardown(void) {
     UA_Server_run_shutdown(server);
     UA_Server_delete(server);
+    UA_ByteString_clear(&currentKey);
     if(futureKey) {
-        UA_free(futureKey);
+        UA_Array_delete(futureKey, futureKeySize, &UA_TYPES[UA_TYPES_STRING]);
         futureKey = NULL;
+        futureKeySize = 0;
     }
 }
 
 START_TEST(TestPubSubKeyStorage_initialize) {
-
     UA_StatusCode retval = UA_STATUSCODE_BAD;
-    UA_String tSecurityPolicyUri = server->config.pubSubConfig.securityPolicies->policyUri;
     UA_UInt32 maxPastkeyCount = 0;
     UA_UInt32 maxFuturekeyCount = 0;
-    UA_PubSubKeyStorage *tKeyStorage = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
+    UA_PubSubKeyStorage *tKeyStorage = (UA_PubSubKeyStorage *)
+        UA_calloc(1, sizeof(UA_PubSubKeyStorage));
     ck_assert_ptr_ne(tKeyStorage, NULL);
     retval =
-        UA_PubSubKeyStorage_init(server, &SecurityGroupId, &tSecurityPolicyUri,
-                                       maxPastkeyCount, maxFuturekeyCount, tKeyStorage);
+        UA_PubSubKeyStorage_init(server, tKeyStorage,
+                                 &SecurityGroupId, server->config.pubSubConfig.securityPolicies,
+                                 maxPastkeyCount, maxFuturekeyCount);
 
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_ptr_eq(server->config.pubSubConfig.securityPolicies, tKeyStorage->policy);
@@ -237,24 +240,9 @@ START_TEST(TestPubSubKeyStorage_initialize) {
     ck_assert_ptr_eq(server->pubSubManager.pubSubKeyList.lh_first, tKeyStorage);
 } END_TEST
 
-START_TEST(TestPubSubKeyStorage_InvalidSecurityPolicy) {
-
-    UA_StatusCode retval = UA_STATUSCODE_BAD;
-    UA_String tSecurityPolicyUri = UA_STRING("I am Wrong");
-    UA_UInt32 maxPastkeyCount = 0;
-    UA_UInt32 maxFuturekeyCount = 0;
-    UA_PubSubKeyStorage *tKeyStorage = (UA_PubSubKeyStorage *)UA_calloc(1, sizeof(UA_PubSubKeyStorage));
-    ck_assert_ptr_ne(tKeyStorage, NULL);
-    retval =
-        UA_PubSubKeyStorage_init(server, &SecurityGroupId, &tSecurityPolicyUri,
-                                       maxPastkeyCount, maxFuturekeyCount, tKeyStorage);
-
-    ck_assert_int_eq(retval, UA_STATUSCODE_BADNOTFOUND);
-} END_TEST
-
 START_TEST(TestPubSubKeyStorageSetKeys){
     UA_UInt32 currentTokenId = 1;
-    UA_UInt32 futureKeySize = 2;
+    futureKeySize = 2;
     UA_Duration msTimeToNextKey = 2000;
     UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
     UA_PubSubKeyStorage *tKeyStorage = createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey, 0, testSecurityGroupId);
@@ -271,12 +259,11 @@ START_TEST(TestPubSubKeyStorageSetKeys){
     ck_assert_msg(UA_ByteString_equal(&futureKey[futureKeySize - 1], &keyListIterator->key), "Expected lastItem to be equal to the last FutureKey");
     ck_assert_msg(futureKeySize + 1 == tKeyStorage->keyListSize,"Expected KeyListSize to be equal to FutureKeySize + 1");
     ck_assert_msg(tKeyStorage->keyLifeTime == msTimeToNextKey, "Expected keyLifetime to be equal to the Keystorage->keyLifeTime");
-
 } END_TEST
 
 START_TEST(TestPubSubKeyStorage_MovetoNextKeyCallback){
     UA_UInt32 currentTokenId = 1;
-    UA_UInt32 futureKeySize = 2;
+    futureKeySize = 2;
     UA_Duration msTimeToNextKey = 2000;
     UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
     UA_PubSubKeyStorage *tKeyStorage = createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey, 0, testSecurityGroupId);
@@ -304,7 +291,7 @@ START_TEST(TestPubSubKeystorage_ImportedKey){
     const char * msg_unenc = MSG_HEADER MSG_PAYLOAD_DEC;
 
     UA_UInt32 currentTokenId = 1;
-    UA_UInt32 futureKeySize = 2;
+    futureKeySize = 2;
     UA_Duration msTimeToNextKey = 2000;
     UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
 
@@ -333,6 +320,9 @@ START_TEST(TestPubSubKeystorage_ImportedKey){
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected retval to be GOOD: Error Code %s", UA_StatusCode_name(retval));
     retval = rg->config.securityPolicy->symmetricModule.cryptoModule.encryptionAlgorithm.decrypt(rg->securityPolicyContext,&buffer);
     ck_assert(memcmp(buffer.data, expect_buf.data, buffer.length) == 0);
+    UA_ByteString_clear(&expect_buf);
+    UA_ByteString_clear(&signature);
+    UA_ByteString_clear(&buffer);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorage_InitWithWriterGroup){
@@ -384,7 +374,6 @@ main(void) {
     TCase *tc_pubsub_keystorage = tcase_create("PubSub KeyStorage");
     tcase_add_checked_fixture(tc_pubsub_keystorage, setup, teardown);
     tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorage_initialize);
-    tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorage_InvalidSecurityPolicy);
     tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorageSetKeys);
     tcase_add_test(tc_pubsub_keystorage, TestPubSubKeyStorage_MovetoNextKeyCallback);
     tcase_add_test(tc_pubsub_keystorage, TestPubSubKeystorage_ImportedKey);

From 703a5f710c24769ef90316a3da658f36d074fc26 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 19 Dec 2022 00:01:50 +0100
Subject: [PATCH 0593/1963] fix(test): Include eventloop_common.c in fuzzing
 build

---
 tests/fuzz/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 94cedf10b08..02816af079a 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -60,6 +60,7 @@ link_libraries("-fsanitize=fuzzer")
 
 # Use different plugins for testing
 set(fuzzing_plugin_sources
+    ${PROJECT_SOURCE_DIR}/arch/eventloop_common.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c

From 2cfcdd6dff678d0097ea38a491406e26ba7be41c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 19 Dec 2022 00:02:21 +0100
Subject: [PATCH 0594/1963] feat(el): Improve logging for the parameter
 validation

---
 arch/eventloop_common.c    | 28 +++++++++++++++++++++++-----
 arch/eventloop_common.h    |  4 +++-
 arch/eventloop_posix_eth.c |  7 ++++---
 arch/eventloop_posix_tcp.c |  9 ++++++---
 arch/eventloop_posix_udp.c |  9 ++++++---
 5 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/arch/eventloop_common.c b/arch/eventloop_common.c
index 6841f350e34..26aa2d0669f 100644
--- a/arch/eventloop_common.c
+++ b/arch/eventloop_common.c
@@ -8,7 +8,9 @@
 #include "eventloop_common.h"
 
 UA_StatusCode
-UA_KeyValueRestriction_validate(const UA_KeyValueRestriction *restrictions, size_t restrictionsSize,
+UA_KeyValueRestriction_validate(const UA_Logger *logger,
+                                const char *logprefix,
+                                const UA_KeyValueRestriction *restrictions, size_t restrictionsSize,
                                 const UA_KeyValueMap *map) {
     for(size_t i = 0; i < restrictionsSize; i++) {
         const UA_KeyValueRestriction *r = &restrictions[i];
@@ -16,21 +18,37 @@ UA_KeyValueRestriction_validate(const UA_KeyValueRestriction *restrictions, size
 
         /* Value not present but required? */
         if(!val) {
-            if(r->required)
+            if(r->required) {
+                UA_LOG_WARNING(logger, UA_LOGCATEGORY_USERLAND,
+                               "%s\t| Parameter %.*s required but not defined",
+                               logprefix, (int)r->name.name.length, (char*)r->name.name.data);
                 return UA_STATUSCODE_BADINTERNALERROR;
+            }
             continue;
         }
 
         /* Type matches */
-        if(val->type != r->type)
+        if(val->type != r->type) {
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_USERLAND,
+                           "%s\t| Parameter %.*s has the wrong type",
+                           logprefix, (int)r->name.name.length, (char*)r->name.name.data);
             return UA_STATUSCODE_BADINTERNALERROR;
+        }
 
         /* Scalar / array is allowed */
         UA_Boolean scalar = UA_Variant_isScalar(val);
-        if(scalar && !r->scalar)
+        if(scalar && !r->scalar) {
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_USERLAND,
+                           "%s\t| Parameter %.*s must not be scalar",
+                           logprefix, (int)r->name.name.length, (char*)r->name.name.data);
             return UA_STATUSCODE_BADINTERNALERROR;
-        if(!scalar && !r->array)
+        }
+        if(!scalar && !r->array) {
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_USERLAND,
+                           "%s\t| Parameter %.*s must not be an array",
+                           logprefix, (int)r->name.name.length, (char*)r->name.name.data);
             return UA_STATUSCODE_BADCONNECTIONREJECTED;
+        }
     }
 
     return UA_STATUSCODE_GOOD;
diff --git a/arch/eventloop_common.h b/arch/eventloop_common.h
index bc373439075..f36cb7facb4 100644
--- a/arch/eventloop_common.h
+++ b/arch/eventloop_common.h
@@ -26,7 +26,9 @@ typedef struct {
 } UA_KeyValueRestriction;
 
 UA_StatusCode
-UA_KeyValueRestriction_validate(const UA_KeyValueRestriction *restrictions,
+UA_KeyValueRestriction_validate(const UA_Logger *logger,
+                                const char *logprefix,
+                                const UA_KeyValueRestriction *restrictions,
                                 size_t restrictionsSiz,
                                 const UA_KeyValueMap *map);
 
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index c83f07aaf8c..c9b4914ee84 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -583,7 +583,8 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
 
     /* Validate the parameters */
     UA_StatusCode res =
-        UA_KeyValueRestriction_validate(ETHConfigParameters, ETH_PARAMETERSSIZE, params);
+        UA_KeyValueRestriction_validate(el->logger, "ETH", ETHConfigParameters,
+                                        ETH_PARAMETERSSIZE, params);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
@@ -607,7 +608,7 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
     int ifindex = (int)if_nametoindex(ifname);
     if(ifindex == 0) {
         UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
-                     "ETH \t| Could not find the interface %s", ifname);
+                     "ETH\t| Could not find the interface %s", ifname);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -620,7 +621,7 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         sockfd = UA_socket(PF_PACKET, SOCK_RAW, 0); /* Don't receive */
     if(sockfd == -1) {
         UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
-                     "ETH \t| Could not create a raw Ethernet socket (are you root?)");
+                     "ETH\t| Could not create a raw Ethernet socket (are you root?)");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     res |= UA_EventLoopPOSIX_setReusable(sockfd);
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 15e0dee8c36..0e177d45496 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -865,7 +865,8 @@ TCP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
 
     /* Check the parameters */
     UA_StatusCode res =
-        UA_KeyValueRestriction_validate(&TCPConfigParameters[1],
+        UA_KeyValueRestriction_validate(el->eventLoop.logger, "TCP",
+                                        &TCPConfigParameters[1],
                                         TCP_PARAMETERSSIZE-1, params);
     if(res != UA_STATUSCODE_GOOD)
         return res;
@@ -903,8 +904,10 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
     }
 
     /* Check the parameters */
-    UA_StatusCode res = UA_KeyValueRestriction_validate(TCPConfigParameters, 1,
-                                                        &cm->eventSource.params);
+    UA_StatusCode res =
+        UA_KeyValueRestriction_validate(el->eventLoop.logger, "TCP",
+                                        TCPConfigParameters, 1,
+                                        &cm->eventSource.params);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 1b25528961a..ad1f1664a22 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -1161,7 +1161,8 @@ UDP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
 
     /* Check the parameters */
     UA_StatusCode res =
-        UA_KeyValueRestriction_validate(&UDPConfigParameters[1],
+        UA_KeyValueRestriction_validate(el->eventLoop.logger, "UDP",
+                                        &UDPConfigParameters[1],
                                         UDP_PARAMETERSSIZE-1, params);
     if(res != UA_STATUSCODE_GOOD)
         return res;
@@ -1203,8 +1204,10 @@ UDP_eventSourceStart(UA_ConnectionManager *cm) {
     }
 
     /* Check the parameters */
-    UA_StatusCode res = UA_KeyValueRestriction_validate(UDPConfigParameters, 1,
-                                                        &cm->eventSource.params);
+    UA_StatusCode res =
+        UA_KeyValueRestriction_validate(el->eventLoop.logger, "UDP",
+                                        UDPConfigParameters, 1,
+                                        &cm->eventSource.params);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 

From a3fce5e7e1a49e85251f9545f9a45800b29447ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Dec 2022 08:53:12 +0000
Subject: [PATCH 0595/1963] build(deps): bump deps/nodesetLoader from `43b7684`
 to `cefa5c3`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `43b7684` to `cefa5c3`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/43b76840059679b7de6931b066d6e45cdb1239b6...cefa5c32e71caf80e1c8ceb03ea6c44664ec5a52)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index 43b76840059..cefa5c32e71 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit 43b76840059679b7de6931b066d6e45cdb1239b6
+Subproject commit cefa5c32e71caf80e1c8ceb03ea6c44664ec5a52

From 8eeb6c33da78a0d020aeafcf20eab6cbf84a3c0a Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Mon, 12 Dec 2022 13:23:56 +0100
Subject: [PATCH 0596/1963] feat(tests): Node ordering test case for
 open62541-nodeset-loader

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 tests/nodeset-loader/CMakeLists.txt           |  3 +
 .../add_node_integration_test/CMakeLists.txt  | 22 +++--
 .../run_test_ordering.sh                      | 93 +++++++++++++++++++
 .../check_nodeset_loader_ordering_di.c        | 49 ++++++++++
 4 files changed, 159 insertions(+), 8 deletions(-)
 create mode 100644 tests/nodeset-loader/add_node_integration_test/run_test_ordering.sh
 create mode 100644 tests/nodeset-loader/check_nodeset_loader_ordering_di.c

diff --git a/tests/nodeset-loader/CMakeLists.txt b/tests/nodeset-loader/CMakeLists.txt
index 731cdb1ed85..29379996326 100644
--- a/tests/nodeset-loader/CMakeLists.txt
+++ b/tests/nodeset-loader/CMakeLists.txt
@@ -35,6 +35,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     add_compile_definitions(OPEN62541_TESTNODESET_DIR="${CMAKE_BINARY_DIR}/../deps/nodesetloader/nodesets/open62541/")
     ua_add_test(check_nodeset_loader_testnodeset.c)
 
+    add_compile_definitions(OPEN62541_ORDERING_DIR="${CMAKE_BINARY_DIR}/../deps/nodesetloader/nodesets/open62541/")
+    ua_add_test(check_nodeset_loader_ordering_di.c)
+
 endif()
 
 add_subdirectory(add_node_integration_test)
diff --git a/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt b/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
index 366b8255659..907444e71af 100644
--- a/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
+++ b/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
@@ -4,20 +4,26 @@
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
 
-    add_executable(client client.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    set_target_properties(client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-    target_link_libraries(client ${LIBS})
+    add_executable(add_node_integration_test_client client.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    set_target_properties(add_node_integration_test_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+    target_link_libraries(add_node_integration_test_client ${LIBS})
 
-    add_executable(server server.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    set_target_properties(server PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-    target_link_libraries(server ${LIBS})
+    add_executable(add_node_integration_test_server server.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    set_target_properties(add_node_integration_test_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+    target_link_libraries(add_node_integration_test_server ${LIBS})
 
     find_program(BASH_PROGRAM bash)
 
     add_test(check_nodeset_loader_add_node_integration
              ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh 
-             "${CMAKE_CURRENT_BINARY_DIR}/client"
-             "${CMAKE_CURRENT_BINARY_DIR}/server"
+             "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_client"
+             "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_server"
+    )
+
+    add_test(check_nodeset_loader_DI_ordering_integration
+             ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/run_test_ordering.sh
+             "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_client"
+             "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_server"
     )
 
 endif()
\ No newline at end of file
diff --git a/tests/nodeset-loader/add_node_integration_test/run_test_ordering.sh b/tests/nodeset-loader/add_node_integration_test/run_test_ordering.sh
new file mode 100644
index 00000000000..480d1c52c5f
--- /dev/null
+++ b/tests/nodeset-loader/add_node_integration_test/run_test_ordering.sh
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+# NodesetLoader `AddNode()` integration test use-case for the
+# ordering of the nodes within nodeset XML file. Two different
+# versions of DI companion standard are tested:
+#      - Official version
+#      - Version where the ordering is invalid:
+#          * Parent node (ns=1;i=15001) is defined after child nodes:
+#              + ns=1;i=15002
+#              + ns=1;i=15003
+#              + ns=1;i=15004
+#              + ns=1;i=15005
+#              + ns=1;i=15006
+#              + ns=1;i=15007
+#              + ns=1;i=15008
+#              + ns=1;i=15031
+#              + ns=1;i=15032
+#              + ns=1;i=15033
+#
+
+IFS=
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" && pwd )
+
+argv=("$@")
+argc=$#
+CLIENT_BINARY_PATH="${argv[0]}"
+SERVER_BINARY_PATH="${argv[1]}"
+SERVER_PID=
+CustomNsStartNum=
+declare -a NodeIdFiles=()
+
+function start_server() {
+    echo "Start server: "$@
+    $SERVER_BINARY_PATH $@ & disown
+    SERVER_PID=$!
+}
+
+function prepare_nodeids() {
+    CustomNsStartNum=2
+    for nodeset in "$@"
+    do
+        nodesetIdPath=$(basename $nodeset)
+        nodesetIdPath=${nodesetIdPath%.*}
+
+        grep --line-buffered -R '<UAObjectType\|<UAObject\|<UAVariable\|<UAVariableType\|<UAMethod\|<UADataType\|<UAReferenceType\|<UAView' \
+                                $nodeset | awk '{ sub(/.*\ NodeId="/, ""); sub(/".*/, ""); print $1}' >> $nodesetIdPath
+        sed -i "s/ns=1;/ns=$CustomNsStartNum;/gI" $nodesetIdPath
+
+        NodeIdFiles+=("$nodesetIdPath")
+        CustomNsStartNum=$((CustomNsStartNum+1))
+    done
+}
+
+function run_client() {
+    echo "Start client: "$@
+    $CLIENT_BINARY_PATH $@
+    clientResult=$?
+    if [ $clientResult -ne 0 ] ; then
+        stop_server
+        rm ${NodeIdFiles[@]}
+        exit 1
+    fi
+}
+
+function stop_server() {
+    echo "Stop server:"
+    kill -9 $SERVER_PID
+    if [ $? -ne 0 ] ; then
+        echo "Error: stopping the server failed"
+        echo "PID = " $SERVER_PID
+        rm ${NodeIdFiles[@]}
+        exit 1
+    fi
+}
+
+function add_node_integration_test() {
+    nodesetName=$1
+    shift 1
+    prepare_nodeids $@
+    start_server $@
+    sleep 3
+    run_client $nodesetName ${NodeIdFiles[@]}
+    stop_server
+    rm ${NodeIdFiles[@]}
+    NodeIdFiles=()
+}
+
+add_node_integration_test "DI" \
+    $SCRIPT_DIR/../../../deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml
+
+add_node_integration_test "DI-Invalid-Ordering" \
+    $SCRIPT_DIR/../../../deps/nodesetloader/nodesets/open62541/Opc.Ua.Di.NodeSet2_invalid_ordering.xml
diff --git a/tests/nodeset-loader/check_nodeset_loader_ordering_di.c b/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
new file mode 100644
index 00000000000..183e2037acf
--- /dev/null
+++ b/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/nodesetloader.h>
+
+#include "check.h"
+#include "testing_clock.h"
+
+UA_Server *server = NULL;
+
+static void setup(void) {
+    server = UA_Server_new();
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+}
+
+static void teardown(void) {
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(Server_loadInvalidOrderingDiNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_ORDERING_DIR "Opc.Ua.Di.NodeSet2_invalid_ordering.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Server Nodeset Loader");
+    TCase *tc_server = tcase_create("Server invalid ordering DI nodeset");
+    tcase_add_unchecked_fixture(tc_server, setup, teardown);
+    tcase_add_test(tc_server, Server_loadInvalidOrderingDiNodeset);
+    suite_add_tcase(s, tc_server);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From b6f8e5268476afa7488dc4ace33c3373e2d98f52 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 21 Dec 2022 12:19:14 +0100
Subject: [PATCH 0597/1963] refactor(pubsub): prepare for unicast integration

change the filename of the old legacy multicast layer to udp_multicast
for better rebase and integration of the new unicast/multicast layer.
---
 CMakeLists.txt                                         | 2 +-
 plugins/{ua_pubsub_udp.c => ua_pubsub_udp_multicast.c} | 0
 tests/CMakeLists.txt                                   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename plugins/{ua_pubsub_udp.c => ua_pubsub_udp_multicast.c} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c3bf8ee5b2..d0b2f0d5d06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1157,7 +1157,7 @@ endif()
 
 if(UA_ENABLE_PUBSUB)
     list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h)
-    list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
+    list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp_multicast.c)
     if(UA_ENABLE_PUBSUB_ETH_UADP)
         list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet.h)
         list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet.c)
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp_multicast.c
similarity index 100%
rename from plugins/ua_pubsub_udp.c
rename to plugins/ua_pubsub_udp_multicast.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 290a7557e7b..413c28880fe 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -123,7 +123,7 @@ endif()
 
 if(UA_ENABLE_PUBSUB)
   list(APPEND test_plugin_sources
-              ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
+       ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp_multicast.c)
     if(UA_ENABLE_PUBSUB_ETH_UADP)
         list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet.h)
         list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet.c)

From 50fcc0ea436c08e79853b623ed2ac576406509ab Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Thu, 17 Nov 2022 12:41:16 +0100
Subject: [PATCH 0598/1963] feat(ci): Enable nodesetLoader for CI builds
 (#5454)

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 .github/workflows/build_linux.yml             |  2 +-
 CMakeLists.txt                                | 10 ++++++
 tests/check_types_builtin_xml.c               |  6 ++--
 tests/nodeset-loader/CMakeLists.txt           | 16 +++++-----
 .../add_node_integration_test/run_test.sh     | 32 ++++++++-----------
 .../run_test_ordering.sh                      |  2 +-
 .../check_nodeset_loader_ua_nodeset.c         | 15 ++++++++-
 tools/ci.sh                                   | 10 ++++++
 8 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index e80fd1df9e0..99323a559b0 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -15,7 +15,7 @@ jobs:
             cmd_deps: |
                 sudo dpkg --add-architecture i386
                 sudo apt-get update
-                sudo apt-get install -y -qq gcc-multilib libsubunit-dev:i386 check:i386
+                sudo apt-get install -y -qq gcc-multilib libsubunit-dev:i386 check:i386 libxml2-dev:i386
             cmd_action: unit_tests_32
           - build_name: "Debug Build & Unit Tests without Subscriptions (gcc)"
             cmd_deps: ""
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0b2f0d5d06..5c345e3e20f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1272,6 +1272,11 @@ if(UA_ENABLE_NODESETLOADER)
     list(APPEND default_plugin_sources
                 ${PROJECT_SOURCE_DIR}/plugins/ua_nodesetloader.c)
     list(APPEND open62541_LIBRARIES ${NODESETLOADER_DEPS_LIBS})
+
+    if(UA_ENABLE_AMALGAMATION)
+        list(APPEND exported_headers ${NODESETLOADER_PUBLIC_HEADERS})
+        list(APPEND internal_headers ${NODESETLOADER_PRIVATE_HEADERS})
+    endif()
 endif()
 
 #########################
@@ -1473,6 +1478,11 @@ if(UA_ENABLE_AMALGAMATION)
     if(UA_ENABLE_ENCRYPTION_LIBRESSL)
         target_include_directories(open62541-object PRIVATE ${LIBRESSL_INCLUDE_DIR})
     endif()
+    if(UA_ENABLE_NODESETLOADER)
+        target_include_directories(open62541-object PRIVATE
+                                   ${NODESETLOADER_PUBLIC_INCLUDES}
+                                   ${NODESETLOADER_PRIVATE_INCLUDES})
+    endif()
 
     # make sure the open62541_amalgamation target builds before so that amalgamation is finished and it is not executed again for open62541-object
     # and thus may overwrite the amalgamation result during multiprocessor compilation
diff --git a/tests/check_types_builtin_xml.c b/tests/check_types_builtin_xml.c
index 3c8a69179e1..1a152f726ae 100644
--- a/tests/check_types_builtin_xml.c
+++ b/tests/check_types_builtin_xml.c
@@ -1666,8 +1666,7 @@ START_TEST(UA_Float_xml_nan_decode) {
     UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
 
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-#if (defined(__GNUC__) && (defined(__armhf__) || defined(__i386__))) || \
-    (defined(__linux__) && defined(__clang__))
+#if !defined(__TINYC__) && (defined(__clang__) || (!defined(__aarch64__) && !defined(__amd64__)))
     // gcc 32-bit and linux clang specific
     // 0 11111111 10000000000000000000000
     // 7f c0 00 00
@@ -1804,8 +1803,7 @@ START_TEST(UA_Double_nan_xml_decode) {
     UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
 
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-#if (defined(__GNUC__) && (defined(__armhf__) || defined(__i386__))) || \
-    (defined(__linux__) && defined(__clang__))
+#if !defined(__TINYC__) && (defined(__clang__) || (!defined(__aarch64__) && !defined(__amd64__)))
     // gcc 32-bit and linux clang specific
     // 0 11111111111 1000000000000000000000000000000000000000000000000000
     // ff f8 00 00 00 00 00 00
diff --git a/tests/nodeset-loader/CMakeLists.txt b/tests/nodeset-loader/CMakeLists.txt
index 29379996326..6b1a4fff337 100644
--- a/tests/nodeset-loader/CMakeLists.txt
+++ b/tests/nodeset-loader/CMakeLists.txt
@@ -2,13 +2,14 @@
 # Test nodeset loader on a subset of nodeset files #
 ####################################################
 
+add_compile_definitions(OPEN62541_NODESET_DIR="${UA_NODESET_DIR}/")
+ua_add_test(check_nodeset_loader_di.c)
+ua_add_test(check_nodeset_loader_autoid.c)
+ua_add_test(check_nodeset_loader_plc.c)
+ua_add_test(check_nodeset_loader_input.c)
+
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
-    add_compile_definitions(OPEN62541_NODESET_DIR="${UA_NODESET_DIR}/")
-    ua_add_test(check_nodeset_loader_di.c)
     ua_add_test(check_nodeset_loader_adi.c)
-    ua_add_test(check_nodeset_loader_autoid.c)
-    ua_add_test(check_nodeset_loader_plc.c)
-    ua_add_test(check_nodeset_loader_input.c)
     ua_add_test(check_nodeset_loader_ua_nodeset.c)
 
     set(GENERATE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/src_generated/tests")
@@ -32,12 +33,11 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     target_link_libraries(check_nodeset_loader_compare_di ${LIBS})
     add_test_valgrind(check_nodeset_loader_compare_di ${TESTS_BINARY_DIR}/check_nodeset_loader_compare_di)
 
-    add_compile_definitions(OPEN62541_TESTNODESET_DIR="${CMAKE_BINARY_DIR}/../deps/nodesetloader/nodesets/open62541/")
+    add_compile_definitions(OPEN62541_TESTNODESET_DIR="${CMAKE_BINARY_DIR}/../deps/nodesetLoader/nodesets/open62541/")
     ua_add_test(check_nodeset_loader_testnodeset.c)
 
-    add_compile_definitions(OPEN62541_ORDERING_DIR="${CMAKE_BINARY_DIR}/../deps/nodesetloader/nodesets/open62541/")
+    add_compile_definitions(OPEN62541_ORDERING_DIR="${CMAKE_BINARY_DIR}/../deps/nodesetLoader/nodesets/open62541/")
     ua_add_test(check_nodeset_loader_ordering_di.c)
-
 endif()
 
 add_subdirectory(add_node_integration_test)
diff --git a/tests/nodeset-loader/add_node_integration_test/run_test.sh b/tests/nodeset-loader/add_node_integration_test/run_test.sh
index cde095dd5a7..27f8b699a78 100644
--- a/tests/nodeset-loader/add_node_integration_test/run_test.sh
+++ b/tests/nodeset-loader/add_node_integration_test/run_test.sh
@@ -3,7 +3,7 @@
 # Test case for all standardized companion nodesets. You can
 # find the specifications at https://github.com/OPCFoundation/UA-Nodeset.
 #      - branch: latest
-#      - commit: a2208e8
+#      - commit: 54e3513
 # 
 # Currently this test case is missing the following UA-Nodesets:
 #   * NodesetLoader related issues:
@@ -12,8 +12,14 @@
 #      - ${OPEN62541_NODESET_DIR}PNRIO/Opc.Ua.PnRio.Nodeset2.xml
 #      - ${OPEN62541_NODESET_DIR}TMC/Opc.Ua.TMC.NodeSet2.xml
 #
+#   * NodesetLoader XML decoding not supported for certain types issues:
+#      - ${OPEN62541_NODESET_DIR}IJT/Tightening/Opc.Ua.Ijt.Tightening.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}MachineVision/Opc.Ua.MachineVision.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}Pumps/Opc.Ua.Pumps.NodeSet2.xml
+#
 #   * Nodesets with known 'AddNode()' issues:
 #      - ${OPEN62541_NODESET_DIR}AML/Opc.Ua.AMLBaseTypes.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}CSPPlusForMachine/Opc.Ua.CSPPlusForMachine.NodeSet2.xml
 #      - ${OPEN62541_NODESET_DIR}FDI/Opc.Ua.Fdi5.NodeSet2.xml
 #      - ${OPEN62541_NODESET_DIR}FDI/Opc.Ua.Fdi7.NodeSet2.xml
 #      - ${OPEN62541_NODESET_DIR}IEC61850/Opc.Ua.IEC61850-6.NodeSet2.xml
@@ -31,6 +37,8 @@
 
 IFS=
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" && pwd )
+
 argv=("$@")
 argc=$#
 CLIENT_BINARY_PATH="${argv[0]}"
@@ -109,7 +117,7 @@ function add_node_integration_test() {
     NodeIdFiles=()
 }
 
-UA_NODESET_PATH=/usr/local/share/open62541/tools/ua-nodeset
+UA_NODESET_PATH=$SCRIPT_DIR/../../../deps/ua-nodeset
 
 add_node_integration_test "ADI" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
@@ -122,6 +130,9 @@ add_node_integration_test "AutoID" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
     $UA_NODESET_PATH/AutoID/Opc.Ua.AutoID.NodeSet2.xml
 
+add_node_integration_test "BACnet" \
+    $UA_NODESET_PATH/BACnet/Opc.Ua.BACnet.NodeSet2.xml
+
 add_node_integration_test "CAS" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
     $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml \
@@ -135,10 +146,6 @@ add_node_integration_test "CommercialKitchenEquipment" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
     $UA_NODESET_PATH/CommercialKitchenEquipment/Opc.Ua.CommercialKitchenEquipment.NodeSet2.xml
 
-add_node_integration_test "CSPPlusForMachine" \
-    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
-    $UA_NODESET_PATH/CSPPlusForMachine/Opc.Ua.CSPPlusForMachine.NodeSet2.xml
-
 add_node_integration_test "DEXPI" \
     $UA_NODESET_PATH/DEXPI/Opc.Ua.DEXPI.NodeSet2.xml
 
@@ -182,11 +189,6 @@ add_node_integration_test "IEC61850-7-4" \
     $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-3.NodeSet2.xml \
     $UA_NODESET_PATH/IEC61850/Opc.Ua.IEC61850-7-4.NodeSet2.xml
 
-add_node_integration_test "IJT" \
-    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
-    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
-    $UA_NODESET_PATH/IJT/Tightening/Opc.Ua.Ijt.Tightening.NodeSet2.xml
-
 add_node_integration_test "IOLinkIODD" \
     $UA_NODESET_PATH/IOLink/Opc.Ua.IOLinkIODD.NodeSet2.xml
 
@@ -209,9 +211,6 @@ add_node_integration_test "MachineTool" \
     $UA_NODESET_PATH/IA/Opc.Ua.IA.NodeSet2.xml \
     $UA_NODESET_PATH/MachineTool/Opc.Ua.MachineTool.NodeSet2.xml
 
-add_node_integration_test "MachineVision" \
-    $UA_NODESET_PATH/MachineVision/Opc.Ua.MachineVision.NodeSet2.xml
-
 add_node_integration_test "MDIS" \
     $UA_NODESET_PATH/MDIS/Opc.MDIS.NodeSet2.xml
 
@@ -513,11 +512,6 @@ add_node_integration_test "PNEM" \
 add_node_integration_test "PROFINET" \
     $UA_NODESET_PATH/PROFINET/Opc.Ua.Pn.NodeSet2.xml
 
-add_node_integration_test "Pumps" \
-    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
-    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
-    $UA_NODESET_PATH/Pumps/Opc.Ua.Pumps.NodeSet2.xml
-
 add_node_integration_test "Robotics" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
     $UA_NODESET_PATH/Robotics/Opc.Ua.Robotics.NodeSet2.xml
diff --git a/tests/nodeset-loader/add_node_integration_test/run_test_ordering.sh b/tests/nodeset-loader/add_node_integration_test/run_test_ordering.sh
index 480d1c52c5f..bc422bbda7f 100644
--- a/tests/nodeset-loader/add_node_integration_test/run_test_ordering.sh
+++ b/tests/nodeset-loader/add_node_integration_test/run_test_ordering.sh
@@ -90,4 +90,4 @@ add_node_integration_test "DI" \
     $SCRIPT_DIR/../../../deps/ua-nodeset/DI/Opc.Ua.Di.NodeSet2.xml
 
 add_node_integration_test "DI-Invalid-Ordering" \
-    $SCRIPT_DIR/../../../deps/nodesetloader/nodesets/open62541/Opc.Ua.Di.NodeSet2_invalid_ordering.xml
+    $SCRIPT_DIR/../../../deps/nodesetLoader/nodesets/open62541/Opc.Ua.Di.NodeSet2_invalid_ordering.xml
diff --git a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
index a019611f10b..ed789290b18 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
@@ -5,7 +5,7 @@
 /* Test case for all standardized companion nodesets. You can
  * find the specifications at https://github.com/OPCFoundation/UA-Nodeset.
  *      - branch: latest
- *      - commit: a2208e8
+ *      - commit: 54e3513
  * 
  * Currently this test case is missing the following UA-Nodesets:
  *    * NodesetLoader related issues:
@@ -87,6 +87,13 @@ START_TEST(Server_loadAutoIDNodeset) {
 }
 END_TEST
 
+START_TEST(Server_loadBACnetNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "BACnet/Opc.Ua.BACnet.NodeSet2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
 START_TEST(Server_loadCASNodeset) {
     bool retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "CAS/Opc.Ua.CAS.NodeSet2.xml", NULL);
@@ -656,6 +663,12 @@ static Suite* testSuite_Client(void) {
         tcase_add_test(tc_server, Server_loadAutoIDNodeset);
         suite_add_tcase(s, tc_server);
     }
+    {
+        TCase *tc_server = tcase_create("Server load BACnet nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadBACnetNodeset);
+        suite_add_tcase(s, tc_server);
+    }
     {
         TCase *tc_server = tcase_create("Server load CAS nodeset");
         tcase_add_unchecked_fixture(tc_server, setup, teardown);
diff --git a/tools/ci.sh b/tools/ci.sh
index b95e66f6e8d..abd0efcb11a 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -94,6 +94,7 @@ function build_amalgamation {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
@@ -111,6 +112,7 @@ function build_amalgamation_mt {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
@@ -142,6 +144,7 @@ function unit_tests {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
@@ -168,6 +171,7 @@ function unit_tests_32 {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
@@ -204,6 +208,7 @@ function unit_tests_diag {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
@@ -239,6 +244,8 @@ function unit_tests_alarms {
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_DA=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
+          -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
 	      -DUA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS=ON \
           -DUA_NAMESPACE_ZERO=FULL \
@@ -321,6 +328,7 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
@@ -353,6 +361,7 @@ function unit_tests_valgrind {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
@@ -382,6 +391,7 @@ function build_clang_analyzer {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
+          -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \

From c7beccabeac3997b322a25a8f0c1594dc891fdbc Mon Sep 17 00:00:00 2001
From: tm <tm@bumblebee.com.sg>
Date: Thu, 22 Dec 2022 20:12:40 +0800
Subject: [PATCH 0599/1963] fix(arch): change BaseTsd.h to lowercase to compile
 on fedora for windows

---
 arch/win32/ua_architecture.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 5f9a17098c8..10d90b6e86a 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -38,7 +38,7 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <ws2tcpip.h>
-#include <BaseTsd.h>
+#include <basetsd.h>
 
 #if defined (_MSC_VER) || defined(__clang__)
 # ifndef UNDER_CE

From a86aa4f4c6e2d8459cc372fb695fc37df682bd8b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 22 Dec 2022 15:24:42 +0100
Subject: [PATCH 0600/1963] fix(deps): JSON5 parser throws an error if no token
 was parsed

---
 deps/cj5.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/deps/cj5.c b/deps/cj5.c
index f2f9962a583..2c6d9d6990f 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -541,6 +541,10 @@ cj5_parse(const char *json5, unsigned int len,
     r.num_tokens = parser.token_count; // How many tokens (would) have been
                                        // consumed by the parser?
 
+    // Not a single token was parsed -> return an error
+    if(r.num_tokens == 0)
+        r.error = CJ5_ERROR_INCOMPLETE;
+
     // Set the tokens and original string only if successfully parsed
     if(r.error == CJ5_ERROR_NONE) {
         r.tokens = tokens;

From 244c728e6c17cbe5956521c6bd49b5d046b90835 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 3 Jan 2023 13:40:26 +0100
Subject: [PATCH 0601/1963] refactor(server): Improve loggin in
 ua_services_nodemanagement.c

---
 src/server/ua_services_attribute.c      |  8 ++++----
 src/server/ua_services_nodemanagement.c | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index beb95d004c4..7a0283efae0 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -378,8 +378,8 @@ void
 ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
              UA_TimestampsToReturn timestampsToReturn,
              const UA_ReadValueId *id, UA_DataValue *v) {
-    UA_LOG_NODEID_DEBUG(&node->head.nodeId,
-                        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_NODEID_TRACE(&node->head.nodeId,
+                        UA_LOG_TRACE_SESSION(&server->config.logger, session,
                                              "Read attribute %"PRIi32 " of Node %.*s",
                                              id->attributeId, (int)nodeIdStr.length,
                                              nodeIdStr.data));
@@ -1652,8 +1652,8 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
     UA_UInt32 userWriteMask = getUserWriteMask(server, session, &node->head);
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
-    UA_LOG_NODEID_DEBUG(&node->head.nodeId,
-                        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_NODEID_TRACE(&node->head.nodeId,
+                        UA_LOG_TRACE_SESSION(&server->config.logger, session,
                                              "Write attribute %"PRIi32 " of Node %.*s",
                                              wvalue->attributeId, (int)nodeIdStr.length,
                                              nodeIdStr.data));
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 3a34aeb30bf..4af3ff04d29 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -2036,10 +2036,18 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
     /* Check the ReferenceType and get the index */
     const UA_Node *refType = UA_NODESTORE_GET(server, &item->referenceTypeId);
     if(!refType) {
+        UA_LOG_NODEID_DEBUG(&item->referenceTypeId,
+            UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                                 "Cannot add reference - ReferenceType %.*s unknown",
+                                 (int)nodeIdStr.length, nodeIdStr.data));
         *retval = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
         return;
     }
     if(refType->head.nodeClass != UA_NODECLASS_REFERENCETYPE) {
+        UA_LOG_NODEID_DEBUG(&item->referenceTypeId,
+            UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                                 "Cannot add reference - ReferenceType %.*s with wrong NodeClass",
+                                 (int)nodeIdStr.length, nodeIdStr.data));
         UA_NODESTORE_RELEASE(server, refType);
         *retval = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
         return;
@@ -2050,6 +2058,10 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
     /* Get the source and target node BrowseName hash */
     const UA_Node *targetNode = UA_NODESTORE_GET(server, &item->targetNodeId.nodeId);
     if(!targetNode) {
+        UA_LOG_NODEID_DEBUG(&item->targetNodeId.nodeId,
+            UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                                 "Cannot add reference - target %.*s does not exist",
+                                 (int)nodeIdStr.length, nodeIdStr.data));
         *retval = UA_STATUSCODE_BADTARGETNODEIDINVALID;
         return;
     }

From a847589c701429f11477d7f27b18cded0a52c26b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 3 Jan 2023 13:35:39 +0100
Subject: [PATCH 0602/1963] refactor(deps): Make pcg_basic.h independent from
 UA definitions

---
 deps/pcg_basic.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/deps/pcg_basic.h b/deps/pcg_basic.h
index 4f7bcc262eb..0b075a6e8bf 100644
--- a/deps/pcg_basic.h
+++ b/deps/pcg_basic.h
@@ -24,7 +24,11 @@
 #ifndef PCG_BASIC_H_
 #define PCG_BASIC_H_
 
-#include <open62541/config.h>
+#if defined(UNDER_CE) || !defined(_MSC_VER) || _MSC_VER >= 1800
+# include <stdint.h>
+#else
+# include "ms_stdint.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {

From 1db20e7c9e732d9cd1132c646bc7dad75a4ef8a6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 28 Dec 2022 00:20:09 +0100
Subject: [PATCH 0603/1963] refactor(build): Don't warn for maybe unitialized

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c345e3e20f..416fa3ae7ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -737,6 +737,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL
     check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods
     check_add_cc_flag("-Wno-overlength-strings") # May happen in the nodeset compiler when complex values are directly encoded
     check_add_cc_flag("-Wno-unused-parameter") # some methods may require unused arguments to cast to a method pointer
+    check_add_cc_flag("-Wno-maybe-uninitialized") # too many false positives
 
     # Use a strict subset of the C and C++ languages
     check_add_cc_flag("-Wc++-compat")

From f4accce8b4badf59960a31a6639621a4495cd128 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 30 Dec 2022 22:19:41 +0100
Subject: [PATCH 0604/1963] fix(server): Locking fixes in ua_server_async.c

---
 src/server/ua_server_async.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 1b5d9d825d8..b4854bc82fc 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -22,9 +22,7 @@ UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
                                   UA_AsyncResponse *ar) {
     /* Get the session */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    UA_LOCK(&server->serviceMutex);
     UA_Session* session = getSessionById(server, &ar->sessionId);
-    UA_UNLOCK(&server->serviceMutex);
     UA_SecureChannel* channel = NULL;
     UA_ResponseHeader *responseHeader = NULL;
     if(!session) {
@@ -67,7 +65,9 @@ integrateOperationResult(UA_AsyncManager *am, UA_Server *server,
     UA_AsyncResponse *ar = ao->parent;
 
     /* Reduce the number of open results */
+    UA_LOCK(&am->queueLock);
     ar->opCountdown -= 1;
+    UA_UNLOCK(&am->queueLock);
 
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "Return result in the server thread with %" PRIu32 " remaining",
@@ -78,8 +78,11 @@ integrateOperationResult(UA_AsyncManager *am, UA_Server *server,
     UA_CallMethodResult_init(&ao->response);
 
     /* Are we done with all operations? */
-    if(ar->opCountdown == 0)
+    if(ar->opCountdown == 0) {
+        UA_LOCK(&server->serviceMutex);
         UA_AsyncManager_sendAsyncResponse(am, server, ar);
+        UA_UNLOCK(&server->serviceMutex);
+    }
 }
 
 /* Process all operations in the result queue -> move content over to the
@@ -161,8 +164,8 @@ UA_AsyncManager_init(UA_AsyncManager *am, UA_Server *server) {
 
     /* Add a regular callback for cleanup and sending finished responses at a
      * 100s interval. */
-    UA_Server_addRepeatedCallback(server, (UA_ServerCallback)checkTimeouts,
-                                  NULL, 100.0, &am->checkTimeoutCallbackId);
+    addRepeatedCallback(server, (UA_ServerCallback)checkTimeouts,
+                        NULL, 100.0, &am->checkTimeoutCallbackId);
 }
 
 void
@@ -379,8 +382,12 @@ setMethodNodeAsync(UA_Server *server, UA_Session *session,
 UA_StatusCode
 UA_Server_setMethodNodeAsync(UA_Server *server, const UA_NodeId id,
                              UA_Boolean isAsync) {
-    return UA_Server_editNode(server, &server->adminSession, &id,
-                              (UA_EditNodeCallback)setMethodNodeAsync, &isAsync);
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res =
+        UA_Server_editNode(server, &server->adminSession, &id,
+                           (UA_EditNodeCallback)setMethodNodeAsync, &isAsync);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode

From c005953c1482299b127315a48fd81f9055a859ba Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 30 Dec 2022 22:20:54 +0100
Subject: [PATCH 0605/1963] refactor(server): Lock server during ns0
 initialization

---
 src/pubsub/ua_pubsub_ns0.c                    |  10 +-
 src/server/ua_server.c                        |  24 +-
 src/server/ua_server_internal.h               |  54 ++--
 src/server/ua_server_ns0.c                    | 266 +++++++++---------
 src/server/ua_server_ns0_diagnostics.c        |  15 +-
 src/server/ua_services_attribute.c            |  13 +-
 src/server/ua_services_nodemanagement.c       |  68 +++--
 src/server/ua_services_subscription.c         |   2 +-
 src/server/ua_session.c                       |   2 +-
 .../ua_subscription_alarms_conditions.c       |  45 ++-
 src/server/ua_subscription_events.c           |  24 +-
 tests/client/check_client_subscriptions.c     |   3 +-
 12 files changed, 275 insertions(+), 251 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index ac1e1482ee4..74fef37b2bc 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1584,11 +1584,11 @@ addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGrou
     object_attr.displayName = UA_LOCALIZEDTEXT("", sgName);
     UA_NodeId refType = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
     UA_NodeId nodeType = UA_NODEID_NUMERIC(0, UA_NS0ID_SECURITYGROUPTYPE);
-    retval = addNode(
-        server, UA_NODECLASS_OBJECT, &UA_NODEID_NULL,
-        &securityGroup->securityGroupFolderId, &refType, UA_QUALIFIEDNAME(0, sgName),
-        &nodeType, (const UA_NodeAttributes *)&object_attr,
-        &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, &securityGroup->securityGroupNodeId);
+    retval = addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NULL,
+                     securityGroup->securityGroupFolderId, refType,
+                     UA_QUALIFIEDNAME(0, sgName), nodeType, &object_attr,
+                     &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL,
+                     &securityGroup->securityGroupNodeId);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "Add SecurityGroup failed with error: %s.",
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index a918cfcf6c2..b56f1c85195 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -294,9 +294,8 @@ UA_Server_init(UA_Server *server) {
     UA_random_seed((UA_UInt64)UA_DateTime_now());
 #endif
 
-#if UA_MULTITHREADING >= 100
     UA_LOCK_INIT(&server->serviceMutex);
-#endif
+    UA_LOCK(&server->serviceMutex);
 
     /* Initialize the adminSession */
     UA_Session_init(&server->adminSession);
@@ -329,13 +328,15 @@ UA_Server_init(UA_Server *server) {
 #endif
 
     /* Initialize namespace 0*/
-    res = UA_Server_initNS0(server);
+    res = initNS0(server);
     UA_CHECK_STATUS(res, goto cleanup);
 
 #ifdef UA_ENABLE_PUBSUB
     /* Build PubSub information model */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    UA_UNLOCK(&server->serviceMutex);
     UA_Server_initPubSubNS0(server);
+    UA_LOCK(&server->serviceMutex);
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
@@ -344,9 +345,12 @@ UA_Server_init(UA_Server *server) {
     UA_CHECK_STATUS(res, goto cleanup);
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
 #endif /* UA_ENABLE_PUBSUB */
+
+    UA_UNLOCK(&server->serviceMutex);
     return server;
 
  cleanup:
+    UA_UNLOCK(&server->serviceMutex);
     UA_Server_delete(server);
     return NULL;
 }
@@ -790,7 +794,7 @@ UA_Server_run_startup(UA_Server *server) {
     UA_CHECK_MEM_ERROR(config->eventLoop, return UA_STATUSCODE_BADINTERNALERROR,
                        &config->logger, UA_LOGCATEGORY_SERVER,
                        "eventloop must be set");
-    if (config->eventLoop->state != UA_EVENTLOOPSTATE_STARTED) {
+    if(config->eventLoop->state != UA_EVENTLOOPSTATE_STARTED) {
         retVal = config->eventLoop->start(config->eventLoop);
         UA_CHECK_STATUS(retVal, return retVal);
     }
@@ -814,6 +818,8 @@ UA_Server_run_startup(UA_Server *server) {
         }
     }
 
+    UA_LOCK(&server->serviceMutex);
+
     /* Warn if no socket available */
     if(!haveServerSocket) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -827,10 +833,14 @@ UA_Server_run_startup(UA_Server *server) {
     retVal = writeNs0VariableArray(server, UA_NS0ID_SERVER_SERVERARRAY,
                                    &server->config.applicationDescription.applicationUri,
                                    1, &UA_TYPES[UA_TYPES_STRING]);
-    UA_CHECK_STATUS(retVal, return retVal);
+    UA_CHECK_STATUS(retVal,
+                    UA_UNLOCK(&server->serviceMutex);
+                    return retVal);
 
-    if(server->state > UA_SERVERLIFECYCLE_FRESH)
+    if(server->state > UA_SERVERLIFECYCLE_FRESH) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_GOOD;
+    }
 
     /* At least one endpoint has to be configured */
     if(server->config.endpointsSize == 0) {
@@ -849,6 +859,8 @@ UA_Server_run_startup(UA_Server *server) {
     UA_CHECK_STATUS(retVal, return retVal);
 #endif
 
+    UA_UNLOCK(&server->serviceMutex); /* TODO: Make PubSub initialization thread-safe */
+
 #ifdef UA_ENABLE_PUBSUB
     /* Initialized PubSubManager */
     UA_PubSubManager_init(server, &server->pubSubManager);
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index dba6c549f09..5eb7fe87529 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -403,17 +403,22 @@ deleteNode(UA_Server *server, const UA_NodeId nodeId,
 
 UA_StatusCode
 addNode(UA_Server *server, const UA_NodeClass nodeClass,
-        const UA_NodeId *requestedNewNodeId,
-        const UA_NodeId *parentNodeId, const UA_NodeId *referenceTypeId,
-        const UA_QualifiedName browseName, const UA_NodeId *typeDefinition,
-        const UA_NodeAttributes *attr, const UA_DataType *attributeType,
+        const UA_NodeId requestedNewNodeId,
+        const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+        const UA_QualifiedName browseName, const UA_NodeId typeDefinition,
+        const void *attr, const UA_DataType *attributeType,
         void *nodeContext, UA_NodeId *outNewNodeId);
 
 UA_StatusCode
-addRef(UA_Server *server, UA_Session *session, const UA_NodeId *sourceId,
-       const UA_NodeId *referenceTypeId, const UA_NodeId *targetId,
+addRef(UA_Server *server, const UA_NodeId sourceId,
+       const UA_NodeId referenceTypeId, const UA_NodeId targetId,
        UA_Boolean forward);
 
+UA_StatusCode
+addRefWithSession(UA_Server *server, UA_Session *session, const UA_NodeId *sourceId,
+                  const UA_NodeId *referenceTypeId, const UA_NodeId *targetId,
+                  UA_Boolean forward);
+
 UA_StatusCode
 setVariableNode_dataSource(UA_Server *server, const UA_NodeId nodeId,
                            const UA_DataSource dataSource);
@@ -431,20 +436,33 @@ writeAttribute(UA_Server *server, UA_Session *session,
                const UA_NodeId *nodeId, const UA_AttributeId attributeId,
                const void *attr, const UA_DataType *attr_type);
 
-static UA_INLINE UA_StatusCode
-writeValueAttribute(UA_Server *server, UA_Session *session,
-                    const UA_NodeId *nodeId, const UA_Variant *value) {
-    return writeAttribute(server, session, nodeId, UA_ATTRIBUTEID_VALUE,
-                          value, &UA_TYPES[UA_TYPES_VARIANT]);
-}
+#define UA_WRITEATTRIBUTEFUNCS(ATTR, ATTRID, TYPE, TYPENAME)            \
+    static UA_INLINE UA_StatusCode                                      \
+    write##ATTR##Attribute(UA_Server *server, const UA_NodeId nodeId,   \
+                           const TYPE value) {                          \
+        return writeAttribute(server, &server->adminSession, &nodeId,   \
+                              ATTRID, &value, &UA_TYPES[UA_TYPES_##TYPENAME]); \
+    }                                                                   \
+    static UA_INLINE UA_StatusCode                                      \
+    write##ATTR##AttributeWithSession(UA_Server *server, UA_Session *session, \
+                                      const UA_NodeId nodeId, const TYPE value) { \
+        return writeAttribute(server, session, &nodeId, ATTRID, &value, \
+                              &UA_TYPES[UA_TYPES_##TYPENAME]);          \
+    }
 
 static UA_INLINE UA_StatusCode
-writeIsAbstractAttribute(UA_Server *server, UA_Session *session,
-                         const UA_NodeId *nodeId, UA_Boolean value) {
-    return writeAttribute(server, session, nodeId, UA_ATTRIBUTEID_ISABSTRACT,
-                          &value, &UA_TYPES[UA_TYPES_BOOLEAN]);
+writeValueAttribute(UA_Server *server, const UA_NodeId nodeId,
+                    const UA_Variant *value) {
+    return writeAttribute(server, &server->adminSession, &nodeId,
+                          UA_ATTRIBUTEID_VALUE, value, &UA_TYPES[UA_TYPES_VARIANT]);
 }
 
+UA_WRITEATTRIBUTEFUNCS(IsAbstract, UA_ATTRIBUTEID_ISABSTRACT, UA_Boolean, BOOLEAN)
+UA_WRITEATTRIBUTEFUNCS(ValueRank, UA_ATTRIBUTEID_VALUERANK, UA_Int32, INT32)
+UA_WRITEATTRIBUTEFUNCS(AccessLevel, UA_ATTRIBUTEID_ACCESSLEVEL, UA_Byte, BYTE)
+UA_WRITEATTRIBUTEFUNCS(MinimumSamplingInterval, UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL,
+                       UA_Double, DOUBLE)
+
 UA_DataValue
 readAttribute(UA_Server *server, const UA_ReadValueId *item,
               UA_TimestampsToReturn timestamps);
@@ -466,7 +484,7 @@ translateBrowsePathToNodeIds(UA_Server *server, const UA_BrowsePath *browsePath)
 void monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *monitoredItem);
 
 UA_Subscription *
-UA_Server_getSubscriptionById(UA_Server *server, UA_UInt32 subscriptionId);
+getSubscriptionById(UA_Server *server, UA_UInt32 subscriptionId);
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
 
@@ -677,7 +695,7 @@ AddNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId);
 /* Create Namespace 0 */
 /**********************/
 
-UA_StatusCode UA_Server_initNS0(UA_Server *server);
+UA_StatusCode initNS0(UA_Server *server);
 
 UA_StatusCode writeNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
                       size_t length, const UA_DataType *type);
diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index a223fa4d403..a36dbe630fe 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -37,8 +37,8 @@ addNode_finish(UA_Server *server, UA_UInt32 nodeId,
                UA_UInt32 parentNodeId, UA_UInt32 referenceTypeId) {
     const UA_NodeId sourceId = UA_NODEID_NUMERIC(0, nodeId);
     const UA_NodeId refTypeId = UA_NODEID_NUMERIC(0, referenceTypeId);
-    const UA_ExpandedNodeId targetId = UA_EXPANDEDNODEID_NUMERIC(0, parentNodeId);
-    UA_StatusCode retval = UA_Server_addReference(server, sourceId, refTypeId, targetId, false);
+    const UA_NodeId targetId = UA_NODEID_NUMERIC(0, parentNodeId);
+    UA_StatusCode retval = addRef(server, sourceId, refTypeId, targetId, false);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
     return AddNode_finish(server, &server->adminSession, &sourceId);
@@ -49,12 +49,11 @@ addObjectNode(UA_Server *server, char* name, UA_UInt32 objectid,
               UA_UInt32 parentid, UA_UInt32 referenceid, UA_UInt32 type_id) {
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", name);
-    return UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(0, objectid),
-                                   UA_NODEID_NUMERIC(0, parentid),
-                                   UA_NODEID_NUMERIC(0, referenceid),
-                                   UA_QUALIFIEDNAME(0, name),
-                                   UA_NODEID_NUMERIC(0, type_id),
-                                   object_attr, NULL, NULL);
+    return addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(0, objectid),
+                   UA_NODEID_NUMERIC(0, parentid), UA_NODEID_NUMERIC(0, referenceid),
+                   UA_QUALIFIEDNAME(0, name), UA_NODEID_NUMERIC(0, type_id),
+                   &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                   NULL, NULL);
 }
 
 static UA_StatusCode
@@ -66,9 +65,10 @@ addReferenceTypeNode(UA_Server *server, char* name, char *inverseName, UA_UInt32
     reference_attr.symmetric = symmetric;
     if(inverseName)
         reference_attr.inverseName = UA_LOCALIZEDTEXT("", inverseName);
-    return UA_Server_addReferenceTypeNode(server, UA_NODEID_NUMERIC(0, referencetypeid),
-                                   UA_NODEID_NUMERIC(0, parentid), UA_NODEID_NULL,
-                                   UA_QUALIFIEDNAME(0, name), reference_attr, NULL, NULL);
+    return addNode(server, UA_NODECLASS_REFERENCETYPE, UA_NODEID_NUMERIC(0, referencetypeid),
+                   UA_NODEID_NUMERIC(0, parentid), UA_NODEID_NULL, UA_QUALIFIEDNAME(0, name),
+                   UA_NODEID_NULL, &reference_attr,
+                   &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES], NULL, NULL);
 }
 
 /***************************/
@@ -79,7 +79,7 @@ addReferenceTypeNode(UA_Server *server, char* name, char *inverseName, UA_UInt32
  * already created. This is necessary to reduce the dependencies for the nodeset
  * compiler. */
 static UA_StatusCode
-UA_Server_createNS0_base(UA_Server *server) {
+createNS0_base(UA_Server *server) {
     /* Bootstrap ReferenceTypes. The order of these is important for the
      * ReferenceTypeIndex. The ReferenceTypeIndex is created with the raw node.
      * The ReferenceTypeSet of subtypes for every ReferenceType is created
@@ -187,19 +187,23 @@ UA_Server_createNS0_base(UA_Server *server) {
     bdv_attr.displayName = UA_LOCALIZEDTEXT("", "BaseDataVariableType");
     bdv_attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATATYPE);
     bdv_attr.valueRank = UA_VALUERANK_ANY;
-    ret |= UA_Server_addVariableTypeNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                         UA_NODEID_NUMERIC(0, UA_NS0ID_BASEVARIABLETYPE),
-                                         UA_NODEID_NULL, UA_QUALIFIEDNAME(0, "BaseDataVariableType"),
-                                         UA_NODEID_NULL, bdv_attr, NULL, NULL);
+    ret |= addNode(server, UA_NODECLASS_VARIABLETYPE,
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_BASEVARIABLETYPE),
+                   UA_NODEID_NULL, UA_QUALIFIEDNAME(0, "BaseDataVariableType"),
+                   UA_NODEID_NULL, &bdv_attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],
+                   NULL, NULL);
 
     UA_VariableTypeAttributes prop_attr = UA_VariableTypeAttributes_default;
     prop_attr.displayName = UA_LOCALIZEDTEXT("", "PropertyType");
     prop_attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATATYPE);
     prop_attr.valueRank = UA_VALUERANK_ANY;
-    ret |= UA_Server_addVariableTypeNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE),
-                                         UA_NODEID_NUMERIC(0, UA_NS0ID_BASEVARIABLETYPE),
-                                         UA_NODEID_NULL, UA_QUALIFIEDNAME(0, "PropertyType"),
-                                         UA_NODEID_NULL, prop_attr, NULL, NULL);
+    ret |= addNode(server, UA_NODECLASS_VARIABLETYPE,
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE),
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_BASEVARIABLETYPE),
+                   UA_NODEID_NULL, UA_QUALIFIEDNAME(0, "PropertyType"),
+                   UA_NODEID_NULL, &prop_attr,
+                   &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES], NULL, NULL);
 
     /***************/
     /* ObjectTypes */
@@ -212,10 +216,12 @@ UA_Server_createNS0_base(UA_Server *server) {
 
     UA_ObjectTypeAttributes folder_attr = UA_ObjectTypeAttributes_default;
     folder_attr.displayName = UA_LOCALIZEDTEXT("", "FolderType");
-    ret |= UA_Server_addObjectTypeNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE),
-                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
-                                       UA_NODEID_NULL, UA_QUALIFIEDNAME(0, "FolderType"),
-                                       folder_attr, NULL, NULL);
+    ret |= addNode(server, UA_NODECLASS_OBJECTTYPE,
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE),
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
+                   UA_NODEID_NULL, UA_QUALIFIEDNAME(0, "FolderType"),
+                   UA_NODEID_NULL,
+                   &folder_attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES], NULL, NULL);
 
     /******************/
     /* Root and below */
@@ -585,7 +591,7 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
 
     /* Get the Subscription */
     UA_UInt32 subscriptionId = *((UA_UInt32*)(input[0].data));
-    UA_Subscription *subscription = UA_Server_getSubscriptionById(server, subscriptionId);
+    UA_Subscription *subscription = getSubscriptionById(server, subscriptionId);
     if(!subscription) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
@@ -644,7 +650,7 @@ writeNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
     UA_Variant var;
     UA_Variant_init(&var);
     UA_Variant_setArray(&var, v, length, type);
-    return UA_Server_writeValue(server, UA_NODEID_NUMERIC(0, id), var);
+    return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
 }
 
 #ifndef UA_GENERATED_NAMESPACE_ZERO
@@ -657,17 +663,17 @@ addVariableNode(UA_Server *server, char* name, UA_UInt32 variableid,
     attr.dataType = UA_NODEID_NUMERIC(0, dataType);
     attr.valueRank = valueRank;
     attr.accessLevel = UA_ACCESSLEVELMASK_READ;
-    return UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(0, variableid),
-                                     UA_NODEID_NUMERIC(0, parentid), UA_NODEID_NUMERIC(0, referenceid),
-                                     UA_QUALIFIEDNAME(0, name),
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                     attr, NULL, NULL);
+    return addNode(server, UA_NODECLASS_VARIABLE, UA_NODEID_NUMERIC(0, variableid),
+                   UA_NODEID_NUMERIC(0, parentid), UA_NODEID_NUMERIC(0, referenceid),
+                   UA_QUALIFIEDNAME(0, name),
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                   &attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], NULL, NULL);
 }
 
 /* A minimal server object that is not complete and does not use the mandated
  * references to a server type. To be used on very constrained devices. */
 static UA_StatusCode
-UA_Server_minimalServerObject(UA_Server *server) {
+minimalServerObject(UA_Server *server) {
     /* Server */
     UA_StatusCode retval = addObjectNode(server, "Server", UA_NS0ID_SERVER, UA_NS0ID_OBJECTSFOLDER,
                                          UA_NS0ID_ORGANIZES, UA_NS0ID_BASEOBJECTTYPE);
@@ -736,54 +742,48 @@ writeNs0Variable(UA_Server *server, UA_UInt32 id, void *v, const UA_DataType *ty
     UA_Variant var;
     UA_Variant_init(&var);
     UA_Variant_setScalar(&var, v, type);
-    return UA_Server_writeValue(server, UA_NODEID_NUMERIC(0, id), var);
+    return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
 }
 
 static void
 addModellingRules(UA_Server *server) {
     /* Test if the ModellingRules folder was added. (Only for the full ns0.) */
-    UA_NodeClass mrnc = UA_NODECLASS_UNSPECIFIED;
-    UA_StatusCode retval = UA_Server_readNodeClass(server,
-                                                   UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
-                                                   &mrnc);
-    if(retval != UA_STATUSCODE_GOOD)
+    UA_NodeId mrNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES);
+    const UA_Node *mrnode = UA_NODESTORE_GET(server, &mrNodeId);
+    if(!mrnode)
         return;
+    UA_NODESTORE_RELEASE(server, mrnode);
 
     /* Add ExposesItsArray */
-    UA_Server_addReference(server,
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_EXPOSESITSARRAY),
-                           true);
+    addRef(server,
+           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_EXPOSESITSARRAY), true);
 
     /* Add Mandatory */
-    UA_Server_addReference(server,
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_MANDATORY),
-                           true);
+    addRef(server,
+           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_MANDATORY), true);
 
 
     /* Add MandatoryPlaceholder */
-    UA_Server_addReference(server,
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_MANDATORYPLACEHOLDER),
-                           true);
+    addRef(server,
+           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_MANDATORYPLACEHOLDER), true);
 
     /* Add Optional */
-    UA_Server_addReference(server,
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_OPTIONAL),
-                           true);
+    addRef(server,
+           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_OPTIONAL), true);
 
     /* Add OptionalPlaceholder */
-    UA_Server_addReference(server,
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_OPTIONALPLACEHOLDER),
-                           true);
+    addRef(server,
+           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MODELLINGRULES),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+           UA_NODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_OPTIONALPLACEHOLDER), true);
 }
 
 #endif
@@ -792,18 +792,20 @@ addModellingRules(UA_Server *server) {
  * This also initialized the data sources for various variables, such as for
  * example server time. */
 UA_StatusCode
-UA_Server_initNS0(UA_Server *server) {
+initNS0(UA_Server *server) {
     /* Initialize base nodes which are always required an cannot be created
      * through the NS compiler */
     server->bootstrapNS0 = true;
-    UA_StatusCode retVal = UA_Server_createNS0_base(server);
+    UA_StatusCode retVal = createNS0_base(server);
 
 #ifdef UA_GENERATED_NAMESPACE_ZERO
+    UA_UNLOCK(&server->serviceMutex);
     /* Load nodes and references generated from the XML ns0 definition */
     retVal |= namespace0_generated(server);
+    UA_LOCK(&server->serviceMutex);
 #else
     /* Create a minimal server object */
-    retVal |= UA_Server_minimalServerObject(server);
+    retVal |= minimalServerObject(server);
 #endif
 
     server->bootstrapNS0 = false;
@@ -818,20 +820,19 @@ UA_Server_initNS0(UA_Server *server) {
 
     /* NamespaceArray */
     UA_DataSource namespaceDataSource = {readNamespaces, writeNamespaces};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
-                                                   UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY),
-                                                   namespaceDataSource);
-    retVal |= UA_Server_writeValueRank(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY), 1);
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY),
+                                         namespaceDataSource);
+    retVal |= writeValueRankAttribute(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY), 1);
 
     /* ServerArray */
     retVal |= writeNs0VariableArray(server, UA_NS0ID_SERVER_SERVERARRAY,
                                     &server->config.applicationDescription.applicationUri,
                                     1, &UA_TYPES[UA_TYPES_STRING]);
-    retVal |= UA_Server_writeValueRank(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERARRAY), 1);
+    retVal |= writeValueRankAttribute(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERARRAY), 1);
 
     /* ServerStatus */
     UA_DataSource serverStatus = {readStatus, NULL};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS), serverStatus);
 
     /* StartTime will be sampled in UA_Server_run_startup()*/
@@ -839,52 +840,51 @@ UA_Server_initNS0(UA_Server *server) {
     /* CurrentTime */
     UA_DataSource currentTime = {readCurrentTime, NULL};
     UA_NodeId currTime = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
-    retVal |= UA_Server_setVariableNode_dataSource(server, currTime, currentTime);
-    retVal |= UA_Server_writeMinimumSamplingInterval(server, currTime, 100.0);
+    retVal |= setVariableNode_dataSource(server, currTime, currentTime);
+    retVal |= writeMinimumSamplingIntervalAttribute(server, currTime, 100.0);
 
     /* State */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
-                 UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE),
-                                                   serverStatus);
+    retVal |= setVariableNode_dataSource(server,
+                 UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE), serverStatus);
 
     /* BuildInfo */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO), serverStatus);
 
     /* BuildInfo - ProductUri */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_PRODUCTURI),
                                                    serverStatus);
 
     /* BuildInfo - ManufacturerName */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_MANUFACTURERNAME),
                                                    serverStatus);
 
     /* BuildInfo - ProductName */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_PRODUCTNAME),
                                                    serverStatus);
 
     /* BuildInfo - SoftwareVersion */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_SOFTWAREVERSION),
                                                    serverStatus);
 
     /* BuildInfo - BuildNumber */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_BUILDNUMBER),
                                                    serverStatus);
 
     /* BuildInfo - BuildDate */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_BUILDINFO_BUILDDATE),
                                                    serverStatus);
 
 #ifdef UA_GENERATED_NAMESPACE_ZERO
 
     /* SecondsTillShutdown */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_SECONDSTILLSHUTDOWN),
                                                    serverStatus);
 
@@ -896,7 +896,7 @@ UA_Server_initNS0(UA_Server *server) {
 
     /* ServiceLevel */
     UA_DataSource serviceLevel = {readServiceLevel, NULL};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVICELEVEL), serviceLevel);
 
     /* ServerDiagnostics - EnabledFlag */
@@ -913,24 +913,24 @@ UA_Server_initNS0(UA_Server *server) {
      * In CTT, Subscription_Minimum_1/002.js test will modify the above flag. This will not be a problem when build
      * configuration is set at UA_NAMESPACE_ZERO="REDUCED" as NodeIds will not be present. When UA_NAMESPACE_ZERO="FULL",
      * the test will fail. Hence made the NodeId as read only */
-    retVal |= UA_Server_writeAccessLevel(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_ENABLEDFLAG),
-                                         UA_ACCESSLEVELMASK_READ);
+    retVal |= writeAccessLevelAttribute(server,
+                       UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_ENABLEDFLAG),
+                                        UA_ACCESSLEVELMASK_READ);
 
     /* Auditing */
     UA_DataSource auditing = {readAuditing, NULL};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_AUDITING), auditing);
 
     /* Redundancy Support */
     UA_RedundancySupport redundancySupport = UA_REDUNDANCYSUPPORT_NONE;
     retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERREDUNDANCY_REDUNDANCYSUPPORT,
                                &redundancySupport, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
-
     /* Remove unused subtypes of ServerRedundancy */
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_CURRENTSERVERID), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_REDUNDANTSERVERARRAY), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_SERVERURIARRAY), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_SERVERNETWORKGROUPS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_CURRENTSERVERID), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_REDUNDANTSERVERARRAY), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_SERVERURIARRAY), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_SERVERNETWORKGROUPS), true);
 
     /* ServerCapabilities - LocaleIdArray */
     UA_LocaleId locale_en = UA_STRING("en");
@@ -968,7 +968,7 @@ UA_Server_initNS0(UA_Server *server) {
 
     /* ServerCapabilities - MinSupportedSampleRate */
     UA_DataSource samplingInterval = {readMinSamplingInterval, NULL};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                  UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MINSUPPORTEDSAMPLERATE),
                                                    samplingInterval);
 
@@ -1005,92 +1005,92 @@ UA_Server_initNS0(UA_Server *server) {
                                &server->config.maxMonitoredItemsPerCall, &UA_TYPES[UA_TYPES_UINT32]);
 
     /* Remove unused operation limit components */
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYREADDATA), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYREADEVENTS), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYUPDATEDATA), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYUPDATEEVENTS), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_ROLESET), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXSTRINGLENGTH), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXARRAYLENGTH), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXBYTESTRINGLENGTH), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYREADDATA), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYREADEVENTS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYUPDATEDATA), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYUPDATEEVENTS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_ROLESET), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXSTRINGLENGTH), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXARRAYLENGTH), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXBYTESTRINGLENGTH), true);
 
     /* Remove not supported server configurations */
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_ESTIMATEDRETURNTIME), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_REQUESTSERVERSTATECHANGE), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_RESENDDATA), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVERCONFIGURATION), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SETSUBSCRIPTIONDURABLE), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_ESTIMATEDRETURNTIME), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_REQUESTSERVERSTATECHANGE), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_RESENDDATA), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVERCONFIGURATION), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SETSUBSCRIPTIONDURABLE), true);
 
 #ifdef UA_ENABLE_DIAGNOSTICS
     /* ServerDiagnostics - ServerDiagnosticsSummary */
     UA_DataSource serverDiagSummary = {readDiagnostics, NULL};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - ServerViewCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_SERVERVIEWCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - CurrentSessionCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_CURRENTSESSIONCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - CumulatedSessionCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_CUMULATEDSESSIONCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - SecurityRejectedSessionCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_SECURITYREJECTEDSESSIONCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - RejectedSessionCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_REJECTEDSESSIONCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - SessionTimeoutCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_SESSIONTIMEOUTCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - SessionAbortCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_SESSIONABORTCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - CurrentSubscriptionCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_CURRENTSUBSCRIPTIONCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - CumulatedSubscriptionCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_CUMULATEDSUBSCRIPTIONCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - PublishingIntervalCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_PUBLISHINGINTERVALCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - SecurityRejectedRequestsCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_SECURITYREJECTEDREQUESTSCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - ServerDiagnosticsSummary - RejectedRequestsCount */
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY_REJECTEDREQUESTSCOUNT), serverDiagSummary);
 
     /* ServerDiagnostics - SubscriptionDiagnosticsArray */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     UA_DataSource serverSubDiagSummary = {readSubscriptionDiagnosticsArray, NULL};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SUBSCRIPTIONDIAGNOSTICSARRAY), serverSubDiagSummary);
 #endif
 
     /* ServerDiagnostics - SessionDiagnosticsSummary - SessionDiagnosticsArray */
     UA_DataSource sessionDiagSummary = {readSessionDiagnosticsArray, NULL};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SESSIONSDIAGNOSTICSSUMMARY_SESSIONDIAGNOSTICSARRAY), sessionDiagSummary);
 
     /* ServerDiagnostics - SessionDiagnosticsSummary - SessionSecurityDiagnosticsArray */
     UA_DataSource sessionSecDiagSummary = {readSessionSecurityDiagnostics, NULL};
-    retVal |= UA_Server_setVariableNode_dataSource(server,
+    retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SESSIONSDIAGNOSTICSSUMMARY_SESSIONSECURITYDIAGNOSTICSARRAY), sessionSecDiagSummary);
 
 #else
@@ -1098,18 +1098,18 @@ UA_Server_initNS0(UA_Server *server) {
      * 1.03 in CTT (Base Inforamtion/Base Info Core Structure/ 001.js) In the
      * 1.04 specification this has been resolved by allowing to remove these
      * static nodes as well */
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SAMPLINGINTERVALDIAGNOSTICSARRAY), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SESSIONSDIAGNOSTICSSUMMARY), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY), true);
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SUBSCRIPTIONDIAGNOSTICSARRAY), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SAMPLINGINTERVALDIAGNOSTICSARRAY), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SESSIONSDIAGNOSTICSSUMMARY), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SUBSCRIPTIONDIAGNOSTICSARRAY), true);
 #endif
 
 #ifndef UA_ENABLE_PUBSUB
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE), true);
 #endif
 
 #ifndef UA_ENABLE_HISTORIZING
-    UA_Server_deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_HISTORYSERVERCAPABILITIES), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_HISTORYSERVERCAPABILITIES), true);
 #else
     /* ServerCapabilities - HistoryServerCapabilities - AccessHistoryDataCapability */
     retVal |= writeNs0Variable(server, UA_NS0ID_HISTORYSERVERCAPABILITIES_ACCESSHISTORYDATACAPABILITY,
@@ -1169,8 +1169,8 @@ UA_Server_initNS0(UA_Server *server) {
 #endif
 
 #if defined(UA_ENABLE_METHODCALLS) && defined(UA_ENABLE_SUBSCRIPTIONS)
-    retVal |= UA_Server_setMethodNodeCallback(server,
-                        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_GETMONITOREDITEMS), readMonitoredItems);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_GETMONITOREDITEMS),
+                                     readMonitoredItems);
 #endif
 
     /* The HasComponent references to the ModellingRules are not part of the
diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index e36985cd7c5..38f9a7c285e 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -201,18 +201,16 @@ createSubscriptionObject(UA_Server *server, UA_Session *session,
     UA_QualifiedName browseName = UA_QUALIFIEDNAME(0, subIdStr);
     UA_NodeId typeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SUBSCRIPTIONDIAGNOSTICSTYPE);
     UA_NodeId objId = UA_NODEID_NUMERIC(1, 0); /* 0 => assign a random free id */
-    UA_StatusCode res = addNode(server, UA_NODECLASS_VARIABLE,
-                                &objId,
-                                &bpr.targets[0].targetId.nodeId /* parent */,
-                                &refId, browseName, &typeId,
-                                (UA_NodeAttributes*)&var_attr,
+    UA_StatusCode res = addNode(server, UA_NODECLASS_VARIABLE, objId,
+                                bpr.targets[0].targetId.nodeId,
+                                refId, browseName, typeId, &var_attr,
                                 &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], NULL, &objId);
     UA_CHECK_STATUS(res, goto cleanup);
 
     /* Add a second reference from the overall SubscriptionDiagnosticsArray variable */
     const UA_NodeId subDiagArray =
         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SUBSCRIPTIONDIAGNOSTICSARRAY);
-    res = addRef(server, session,  &subDiagArray, &refId, &objId, true);
+    res = addRefWithSession(server, session,  &subDiagArray, &refId, &objId, true);
 
     /* Get all children (including the variable itself) and set the contenxt + callback */
     res = referenceTypeIndices(server, &hasComponent, &refTypes, false);
@@ -458,9 +456,8 @@ createSessionObject(UA_Server *server, UA_Session *session) {
     UA_QualifiedName browseName = UA_QUALIFIEDNAME(0, "");
     browseName.name = session->sessionName; /* shallow copy */
     UA_NodeId typeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SESSIONDIAGNOSTICSOBJECTTYPE);
-    UA_StatusCode res = addNode(server, UA_NODECLASS_OBJECT,
-                                &session->sessionId, &parentId, &refId, browseName, &typeId,
-                                (UA_NodeAttributes*)&object_attr,
+    UA_StatusCode res = addNode(server, UA_NODECLASS_OBJECT, session->sessionId,
+                                parentId, refId, browseName, typeId, &object_attr,
                                 &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, NULL);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 7a0283efae0..9787ea173e3 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1258,9 +1258,9 @@ writeArrayDimensionsAttribute(UA_Server *server, UA_Session *session,
 
 /* Stack layout: ... | node | type */
 static UA_StatusCode
-writeValueRankAttribute(UA_Server *server, UA_Session *session,
-                        UA_VariableNode *node, const UA_VariableTypeNode *type,
-                        UA_Int32 valueRank) {
+writeValueRank(UA_Server *server, UA_Session *session,
+               UA_VariableNode *node, const UA_VariableTypeNode *type,
+               UA_Int32 valueRank) {
     UA_assert(node != NULL);
     UA_assert(type != NULL);
 
@@ -1756,8 +1756,8 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
         CHECK_USERWRITEMASK(UA_WRITEMASK_VALUERANK);
         CHECK_DATATYPE_SCALAR(INT32);
         GET_NODETYPE;
-        retval = writeValueRankAttribute(server, session, &node->variableNode,
-                                         type, *(const UA_Int32*)value);
+        retval = writeValueRank(server, session, &node->variableNode,
+                                type, *(const UA_Int32*)value);
         UA_NODESTORE_RELEASE(server, (const UA_Node*)type);
         break;
     case UA_ATTRIBUTEID_ARRAYDIMENSIONS:
@@ -2112,8 +2112,7 @@ writeObjectProperty(UA_Server *server, const UA_NodeId objectId,
         return retval;
     }
 
-    retval = writeValueAttribute(server, &server->adminSession,
-                                 &bpr.targets[0].targetId.nodeId, &value);
+    retval = writeValueAttribute(server, bpr.targets[0].targetId.nodeId, &value);
 
     UA_BrowsePathResult_clear(&bpr);
     return retval;
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 4af3ff04d29..4b157d2c8e8 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -363,7 +363,9 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
     if(!compatibleValue(server, session, &node->dataType, node->valueRank,
                         node->arrayDimensionsSize, node->arrayDimensions,
                         &value.value, NULL, &reason)) {
-        retval = writeValueAttribute(server, session, &node->head.nodeId, &value.value);
+        retval = writeAttribute(server, session, &node->head.nodeId,
+                                UA_ATTRIBUTEID_VALUE, &value.value,
+                                &UA_TYPES[UA_TYPES_VARIANT]);
         if(retval != UA_STATUSCODE_GOOD) {
             logAddNode(&server->config.logger, session, &node->head.nodeId,
                        "The value is incompatible with the variable definition");
@@ -408,7 +410,9 @@ useVariableTypeAttributes(UA_Server *server, UA_Session *session,
         UA_DataValue_init(&v);
         retval = readValueAttribute(server, session, (const UA_VariableNode*)vt, &v);
         if(retval == UA_STATUSCODE_GOOD && v.hasValue) {
-            retval = writeValueAttribute(server, session, &node->head.nodeId, &v.value);
+            retval = writeAttribute(server, session, &node->head.nodeId,
+                                    UA_ATTRIBUTEID_VALUE, &v.value,
+                                    &UA_TYPES[UA_TYPES_VARIANT]);
         }
         UA_DataValue_clear(&v);
 
@@ -527,9 +531,9 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
                        const UA_AddReferencesItem *item, UA_StatusCode *retval);
 
 UA_StatusCode
-addRef(UA_Server *server, UA_Session *session, const UA_NodeId *sourceId,
-       const UA_NodeId *referenceTypeId, const UA_NodeId *targetId,
-       UA_Boolean forward) {
+addRefWithSession(UA_Server *server, UA_Session *session, const UA_NodeId *sourceId,
+                  const UA_NodeId *referenceTypeId, const UA_NodeId *targetId,
+                  UA_Boolean forward) {
     UA_AddReferencesItem ref_item;
     UA_AddReferencesItem_init(&ref_item);
     ref_item.sourceNodeId = *sourceId;
@@ -542,6 +546,14 @@ addRef(UA_Server *server, UA_Session *session, const UA_NodeId *sourceId,
     return retval;
 }
 
+UA_StatusCode
+addRef(UA_Server *server, const UA_NodeId sourceId,
+       const UA_NodeId referenceTypeId, const UA_NodeId targetId,
+       UA_Boolean forward) {
+    return addRefWithSession(server, &server->adminSession, &sourceId,
+                             &referenceTypeId, &targetId, forward);
+}
+
 static UA_StatusCode
 addInterfaceChildren(UA_Server *server, UA_Session *session,
                      const UA_NodeId *nodeId, const UA_NodeId *typeId) {
@@ -564,7 +576,7 @@ addInterfaceChildren(UA_Server *server, UA_Session *session,
 
     for(size_t i = 0; i < hierarchySize; ++i) {
         UA_NodeId refId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASINTERFACE);
-        retval = addRef(server, &server->adminSession, nodeId, &refId, &hierarchy[i], true);
+        retval = addRef(server, *nodeId, refId, hierarchy[i], true);
 
         /* Don't add the original HasInterface reference to ObjectType sub nodes */
         if(retval == UA_STATUSCODE_BADDUPLICATEREFERENCENOTALLOWED) {
@@ -974,8 +986,8 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
             goto cleanup;
         }
 
-        retval = addRef(server, session, &head->nodeId, referenceTypeId,
-                        parentNodeId, false);
+        retval = addRefWithSession(server, session, &head->nodeId, referenceTypeId,
+                                   parentNodeId, false);
         if(retval != UA_STATUSCODE_GOOD) {
             logAddNode(&server->config.logger, session, nodeId,
                        "Adding reference to parent failed");
@@ -987,8 +999,8 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
     if(head->nodeClass == UA_NODECLASS_VARIABLE ||
        head->nodeClass == UA_NODECLASS_OBJECT) {
         UA_assert(type != NULL); /* see above */
-        retval = addRef(server, session, &head->nodeId, &hasTypeDefinition,
-                        &type->head.nodeId, true);
+        retval = addRefWithSession(server, session, &head->nodeId, &hasTypeDefinition,
+                                   &type->head.nodeId, true);
         if(retval != UA_STATUSCODE_GOOD) {
             logAddNode(&server->config.logger, session, nodeId,
                        "Adding a reference to the type definition failed");
@@ -1589,10 +1601,10 @@ Service_AddNodes(UA_Server *server, UA_Session *session,
 }
 
 UA_StatusCode
-addNode(UA_Server *server, const UA_NodeClass nodeClass, const UA_NodeId *requestedNewNodeId,
-        const UA_NodeId *parentNodeId, const UA_NodeId *referenceTypeId,
-        const UA_QualifiedName browseName, const UA_NodeId *typeDefinition,
-        const UA_NodeAttributes *attr, const UA_DataType *attributeType,
+addNode(UA_Server *server, const UA_NodeClass nodeClass, const UA_NodeId requestedNewNodeId,
+        const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+        const UA_QualifiedName browseName, const UA_NodeId typeDefinition,
+        const void *attr, const UA_DataType *attributeType,
         void *nodeContext, UA_NodeId *outNewNodeId) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -1600,11 +1612,11 @@ addNode(UA_Server *server, const UA_NodeClass nodeClass, const UA_NodeId *reques
     UA_AddNodesItem item;
     UA_AddNodesItem_init(&item);
     item.nodeClass = nodeClass;
-    item.requestedNewNodeId.nodeId = *requestedNewNodeId;
+    item.requestedNewNodeId.nodeId = requestedNewNodeId;
     item.browseName = browseName;
-    item.parentNodeId.nodeId = *parentNodeId;
-    item.referenceTypeId = *referenceTypeId;
-    item.typeDefinition.nodeId = *typeDefinition;
+    item.parentNodeId.nodeId = parentNodeId;
+    item.referenceTypeId = referenceTypeId;
+    item.typeDefinition.nodeId = typeDefinition;
     UA_ExtensionObject_setValueNoDelete(&item.nodeAttributes,
                                         (void*)(uintptr_t)attr, attributeType);
 
@@ -1631,8 +1643,8 @@ __UA_Server_addNode(UA_Server *server, const UA_NodeClass nodeClass,
                     void *nodeContext, UA_NodeId *outNewNodeId) {
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode reval =
-        addNode(server, nodeClass, requestedNewNodeId, parentNodeId,
-                referenceTypeId, browseName, typeDefinition, attr,
+        addNode(server, nodeClass, *requestedNewNodeId, *parentNodeId,
+                *referenceTypeId, browseName, *typeDefinition, attr,
                 attributeType, nodeContext, outNewNodeId);
     UA_UNLOCK(&server->serviceMutex);
     return reval;
@@ -2372,7 +2384,7 @@ setDataSource(UA_Server *server, UA_Session *session,
 
 UA_StatusCode
 setVariableNode_dataSource(UA_Server *server, const UA_NodeId nodeId,
-                                     const UA_DataSource dataSource) {
+                           const UA_DataSource dataSource) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     return UA_Server_editNode(server, &server->adminSession, &nodeId,
                               (UA_EditNodeCallback)setDataSource,
@@ -2530,10 +2542,9 @@ UA_Server_addMethodNodeEx_finish(UA_Server *server, const UA_NodeId nodeId,
         attr.arrayDimensionsSize = 1;
         UA_Variant_setArray(&attr.value, (void *)(uintptr_t)inputArguments,
                             inputArgumentsSize, &UA_TYPES[UA_TYPES_ARGUMENT]);
-        retval = addNode(server, UA_NODECLASS_VARIABLE, &inputArgumentsRequestedNewNodeId,
-                         &nodeId, &hasproperty, UA_QUALIFIEDNAME(0, name),
-                         &propertytype, (const UA_NodeAttributes*)&attr,
-                         &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],
+        retval = addNode(server, UA_NODECLASS_VARIABLE, inputArgumentsRequestedNewNodeId,
+                         nodeId, hasproperty, UA_QUALIFIEDNAME(0, name),
+                         propertytype, &attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],
                          NULL, &inputArgsId);
         if(retval != UA_STATUSCODE_GOOD)
             goto error;
@@ -2551,10 +2562,9 @@ UA_Server_addMethodNodeEx_finish(UA_Server *server, const UA_NodeId nodeId,
         attr.arrayDimensionsSize = 1;
         UA_Variant_setArray(&attr.value, (void *)(uintptr_t)outputArguments,
                             outputArgumentsSize, &UA_TYPES[UA_TYPES_ARGUMENT]);
-        retval = addNode(server, UA_NODECLASS_VARIABLE, &outputArgumentsRequestedNewNodeId,
-                         &nodeId, &hasproperty, UA_QUALIFIEDNAME(0, name),
-                         &propertytype, (const UA_NodeAttributes*)&attr,
-                         &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],
+        retval = addNode(server, UA_NODECLASS_VARIABLE, outputArgumentsRequestedNewNodeId,
+                         nodeId, hasproperty, UA_QUALIFIEDNAME(0, name),
+                         propertytype, &attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],
                          NULL, &outputArgsId);
         if(retval != UA_STATUSCODE_GOOD)
             goto error;
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index a6c56d54f28..f3827cd3368 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -454,7 +454,7 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
                                UA_TransferResult *result) {
     /* Get the subscription. This requires a server-wide lookup instead of the
      * usual session-wide lookup. */
-    UA_Subscription *sub = UA_Server_getSubscriptionById(server, *subscriptionId);
+    UA_Subscription *sub = getSubscriptionById(server, *subscriptionId);
     if(!sub) {
         result->statusCode = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return;
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index 994507977fd..c24c4aba85f 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -197,7 +197,7 @@ UA_Session_getSubscriptionById(UA_Session *session, UA_UInt32 subscriptionId) {
 }
 
 UA_Subscription *
-UA_Server_getSubscriptionById(UA_Server *server, UA_UInt32 subscriptionId) {
+getSubscriptionById(UA_Server *server, UA_UInt32 subscriptionId) {
     UA_Subscription *sub;
     LIST_FOREACH(sub, &server->subscriptions, serverListEntry) {
         /* Prevent lookup of subscriptions that are to be deleted with a statuschange */
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 24200878fec..a54b9ec641d 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -2324,7 +2324,7 @@ setTwoStateVariableCallbacks(UA_Server *server, const UA_NodeId* condition,
         /* add reference from Condition to Confirm Method */
         UA_NodeId hasComponent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
         UA_NodeId confirm = UA_NODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE_CONFIRM);
-        retval = addRef(server, &server->adminSession, condition, &hasComponent, &confirm, true);
+        retval = addRef(server, *condition, hasComponent, confirm, true);
         CONDITION_ASSERT_RETURN_RETVAL(retval,
                                        "Adding HasComponent Reference to Confirm Method failed",
                                        UA_NodeId_clear(&twoStateVariableIdNodeId););
@@ -2467,8 +2467,7 @@ addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
     if(!doesHasEventSourceReferenceExist(server, conditionSource) &&
        !UA_NodeId_equal(&serverObject, &conditionSource)) {
          UA_NodeId hasHasEventSourceId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASEVENTSOURCE);
-         retval = addRef(server, &server->adminSession, &serverObject, &hasHasEventSourceId,
-                         &conditionSource, true);
+         retval = addRef(server, serverObject, hasHasEventSourceId, conditionSource, true);
           CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating HasHasEventSource Reference "
                                          "to the Server Object failed",);
     }
@@ -2481,17 +2480,14 @@ addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
         /* Create hierarchical Reference to ConditionSource to expose the
          * ConditionNode in Address Space */
         // only Check hierarchialReferenceType
-        retval = addRef(server, &server->adminSession, &conditionSource,
-                        &hierarchialReferenceType, &conditionId, true);
+        retval = addRef(server, conditionSource, hierarchialReferenceType, conditionId, true);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating hierarchical Reference to "
                                        "ConditionSource failed",);
 
-        retval = addRef(server, &server->adminSession, &conditionSource,
-                        &hasCondition, &conditionId, true);
+        retval = addRef(server, conditionSource, hasCondition, conditionId, true);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating HasCondition Reference failed",);
     } else {
-        retval = addRef(server, &server->adminSession, &conditionSource,
-                        &hasCondition, &conditionType, true);
+        retval = addRef(server, conditionSource, hasCondition, conditionType, true);
         if(retval != UA_STATUSCODE_BADDUPLICATEREFERENCENOTALLOWED)
             CONDITION_ASSERT_RETURN_RETVAL(retval, "Creating HasCondition Reference failed",);
     }
@@ -2519,8 +2515,8 @@ addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
 
     UA_Boolean inner = (startAbstract == false && endAbstract == false);
     if(inner) {
-        writeIsAbstractAttribute(server, &server->adminSession, &refreshStartEventTypeNodeId, false);
-        writeIsAbstractAttribute(server, &server->adminSession, &refreshEndEventTypeNodeId, false);
+        writeIsAbstractAttribute(server, refreshStartEventTypeNodeId, false);
+        writeIsAbstractAttribute(server, refreshEndEventTypeNodeId, false);
     }
 
     /* append Condition to list */
@@ -2592,8 +2588,8 @@ UA_Server_addCondition_begin(UA_Server *server, const UA_NodeId conditionId,
     UA_StatusCode retval =
         UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT, conditionId,
                                 UA_NODEID_NULL, UA_NODEID_NULL, conditionName,
-                                conditionType, (const UA_NodeAttributes *)&oAttr,
-                                &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, outNodeId);
+                                conditionType, &oAttr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                                NULL, outNodeId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Adding Condition failed", );
     return UA_STATUSCODE_GOOD;
 }
@@ -2665,10 +2661,10 @@ addOptionalVariableField(UA_Server *server, const UA_NodeId *originCondition,
     /* Set a random unused NodeId with specified Namespace Index*/
     UA_NodeId optionalVariable = {originCondition->namespaceIndex, UA_NODEIDTYPE_NUMERIC, {0}};
     UA_StatusCode retval =
-        addNode(server, UA_NODECLASS_VARIABLE, &optionalVariable,
-                originCondition, &referenceToParent, *fieldName,
-                &type->head.nodeId, (const UA_NodeAttributes*)&vAttr,
-                &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], NULL, outOptionalVariable);
+        addNode(server, UA_NODECLASS_VARIABLE, optionalVariable,
+                *originCondition, referenceToParent, *fieldName,
+                type->head.nodeId, &vAttr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],
+                NULL, outOptionalVariable);
     UA_NODESTORE_RELEASE(server, type);
     return retval;
 }
@@ -2702,11 +2698,10 @@ addOptionalObjectField(UA_Server *server, const UA_NodeId *originCondition,
         referenceToParent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
 
     UA_NodeId optionalObject = {originCondition->namespaceIndex, UA_NODEIDTYPE_NUMERIC, {0}};
-    UA_StatusCode retval = addNode(server, UA_NODECLASS_OBJECT,
-                                   &optionalObject, originCondition,
-                                   &referenceToParent, *fieldName, &type->head.nodeId,
-                                   (const UA_NodeAttributes*)&oAttr,
-                                   &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, outOptionalObject);
+    UA_StatusCode retval = addNode(server, UA_NODECLASS_OBJECT, optionalObject,
+                                   *originCondition, referenceToParent, *fieldName,
+                                   type->head.nodeId, &oAttr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                                   NULL, outOptionalObject);
     UA_NODESTORE_RELEASE(server, type);
     return retval;
 }
@@ -2817,8 +2812,7 @@ setConditionField(UA_Server *server, const UA_NodeId condition,
     if(bpr.statusCode != UA_STATUSCODE_GOOD)
         return bpr.statusCode;
 
-    UA_StatusCode retval = writeValueAttribute(server, &server->adminSession,
-                                               &bpr.targets[0].targetId.nodeId, value);
+    UA_StatusCode retval = writeValueAttribute(server, bpr.targets[0].targetId.nodeId, value);
     UA_BrowsePathResult_clear(&bpr);
 
     return retval;
@@ -2864,8 +2858,7 @@ setConditionVariableFieldProperty(UA_Server *server, const UA_NodeId condition,
     }
 
     UA_StatusCode retval =
-        writeValueAttribute(server, &server->adminSession,
-                            &bprVariableFieldProperty.targets[0].targetId.nodeId, value);
+        writeValueAttribute(server, bprVariableFieldProperty.targets[0].targetId.nodeId, value);
     UA_BrowsePathResult_clear(&bprConditionVariableField);
     UA_BrowsePathResult_clear(&bprVariableFieldProperty);
     return retval;
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 94e136fc646..fd3780a695d 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -53,12 +53,12 @@ createEvent(UA_Server *server, const UA_NodeId eventType, UA_NodeId *outNodeId)
     UA_NodeId newNodeId = UA_NODEID_NULL;
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
     UA_StatusCode retval = addNode(server, UA_NODECLASS_OBJECT,
-                                   &UA_NODEID_NULL, /* Set a random unused NodeId */
-                                   &UA_NODEID_NULL, /* No parent */
-                                   &UA_NODEID_NULL, /* No parent reference */
-                                   name,            /* an event does not have a name */
-                                   &eventType,      /* the type of the event */
-                                   (const UA_NodeAttributes*)&oAttr, /* default attributes are fine */
+                                   UA_NODEID_NULL, /* Set a random unused NodeId */
+                                   UA_NODEID_NULL, /* No parent */
+                                   UA_NODEID_NULL, /* No parent reference */
+                                   name,           /* an event does not have a name */
+                                   eventType,      /* the type of the event */
+                                   &oAttr,         /* default attributes are fine */
                                    &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
                                    NULL,           /* no node context */
                                    &newNodeId);
@@ -83,8 +83,7 @@ createEvent(UA_Server *server, const UA_NodeId eventType, UA_NodeId *outNodeId)
     UA_Variant value;
     UA_Variant_init(&value);
     UA_Variant_setScalar(&value, (void*)(uintptr_t)&eventType, &UA_TYPES[UA_TYPES_NODEID]);
-    retval = writeValueAttribute(server, &server->adminSession,
-                                 &bpr.targets[0].targetId.nodeId, &value);
+    retval = writeValueAttribute(server, bpr.targets[0].targetId.nodeId, &value);
     UA_BrowsePathResult_clear(&bpr);
     if(retval != UA_STATUSCODE_GOOD) {
         deleteNode(server, newNodeId, true);
@@ -120,8 +119,7 @@ eventSetStandardFields(UA_Server *server, const UA_NodeId *event,
     UA_Variant value;
     UA_Variant_init(&value);
     UA_Variant_setScalarCopy(&value, origin, &UA_TYPES[UA_TYPES_NODEID]);
-    retval = writeValueAttribute(server, &server->adminSession,
-                                 &bpr.targets[0].targetId.nodeId, &value);
+    retval = writeValueAttribute(server, bpr.targets[0].targetId.nodeId, &value);
     UA_Variant_clear(&value);
     UA_BrowsePathResult_clear(&bpr);
     if(retval != UA_STATUSCODE_GOOD)
@@ -137,8 +135,7 @@ eventSetStandardFields(UA_Server *server, const UA_NodeId *event,
     }
     UA_DateTime rcvTime = UA_DateTime_now();
     UA_Variant_setScalar(&value, &rcvTime, &UA_TYPES[UA_TYPES_DATETIME]);
-    retval = writeValueAttribute(server, &server->adminSession,
-                                 &bpr.targets[0].targetId.nodeId, &value);
+    retval = writeValueAttribute(server, bpr.targets[0].targetId.nodeId, &value);
     UA_BrowsePathResult_clear(&bpr);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
@@ -158,8 +155,7 @@ eventSetStandardFields(UA_Server *server, const UA_NodeId *event,
     }
     UA_Variant_init(&value);
     UA_Variant_setScalar(&value, &eventId, &UA_TYPES[UA_TYPES_BYTESTRING]);
-    retval = writeValueAttribute(server, &server->adminSession,
-                                 &bpr.targets[0].targetId.nodeId, &value);
+    retval = writeValueAttribute(server, bpr.targets[0].targetId.nodeId, &value);
     UA_BrowsePathResult_clear(&bpr);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ByteString_clear(&eventId);
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 8f27f9df835..6780c62a704 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -962,8 +962,7 @@ START_TEST(Client_subscription_statusChange) {
     THREAD_JOIN(server_thread);
 
     /* Manually set the StatusChange */
-    UA_Subscription *sub =
-        UA_Server_getSubscriptionById(server, response.subscriptionId);
+    UA_Subscription *sub = getSubscriptionById(server, response.subscriptionId);
     sub->statusChange = 1234; /* some statuscode */
 
     /* Send publish requests and receive them on the server side */

From 77c240b6d3ad0cf55770b017b1cce5f095b397c7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 3 Jan 2023 17:21:31 +0100
Subject: [PATCH 0606/1963] refactor(deps): Allow duplicate keys in ZipTree

---
 deps/ziptree.c                       | 383 ++++++++++++++++++---------
 deps/ziptree.h                       | 137 ++++++----
 plugins/ua_nodestore_ziptree.c       |  14 +-
 src/client/ua_client_subscriptions.c |  22 +-
 src/server/ua_services_view.c        |   2 +-
 tests/CMakeLists.txt                 |   1 +
 tests/check_ziptree.c                | 142 ++++++++++
 7 files changed, 498 insertions(+), 203 deletions(-)
 create mode 100644 tests/check_ziptree.c

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 7c8ad6153c9..7db4f53c44d 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -2,151 +2,179 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
  *
- *    Copyright 2021 (c) Julius Pfrommer
+ *    Copyright 2021-2022 (c) Julius Pfrommer
  */
 
 #include "ziptree.h"
 
-#if defined(_MSC_VER)
-#include <intrin.h>
-#endif
-
-unsigned char
-__ZIP_FFS32(unsigned int v) {
-#if defined(__GNUC__) || defined(__clang__) 
-    return (unsigned char)((unsigned char)__builtin_ffs((int)v) - 1u);
-#elif defined(_MSC_VER)
-    unsigned long index = 255;
-    _BitScanForward(&index, v);
-    return (unsigned char)index;
-#else
-    if(v == 0)
-        return 255;
-    unsigned int t = 1;
-    unsigned char r = 0;
-    while((v & t) == 0) {
-        t = t << 1;
-        r++;
-    }
-    return r;
-#endif
+/* Dummy types */
+struct zip_elem;
+typedef struct zip_elem zip_elem;
+typedef ZIP_ENTRY(zip_elem) zip_entry;
+typedef ZIP_HEAD(, zip_elem) zip_head;
+
+/* Access macros */
+#define ZIP_ENTRY_PTR(x) ((zip_entry*)((char*)x + fieldoffset))
+#define ZIP_KEY_PTR(x) (const void*)((const char*)x + keyoffset)
+
+/* Hash pointers to keep the tie-breeaking of equal keys (mostly) uncorrelated
+ * from the rank (pointer order). Hashing code taken from sdbm-hash
+ * (http://www.cse.yorku.ca/~oz/hash.html). */
+static unsigned int
+__ZIP_PTR_HASH(const void *p) {
+    unsigned int h = 0;
+    const unsigned char *data = (const unsigned char*)&p;
+    for(size_t i = 0; i < (sizeof(void*) / sizeof(char)); i++)
+        h = data[i] + (h << 6) + (h << 16) - h;
+    return h;
 }
 
-/* Generic analog to ZIP_ENTRY(type) */
-struct zip_entry {
-    void *left;
-    void *right;
-    unsigned char rank;
-};
+static ZIP_INLINE enum ZIP_CMP
+__ZIP_RANK_CMP(const void *p1, const void *p2) {
+    /* assert(p1 != p2); */
+    unsigned int h1 = __ZIP_PTR_HASH(p1);
+    unsigned int h2 = __ZIP_PTR_HASH(p2);
+    if(h1 == h2)
+        return (p1 < p2) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
+    return (h1 < h2) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
+}
 
-#define ZIP_ENTRY_PTR(x) (struct zip_entry*)((char*)x + fieldoffset)
-#define ZIP_KEY_PTR(x) (void*)((char*)x + keyoffset)
+static ZIP_INLINE enum ZIP_CMP
+__ZIP_KEY_CMP(zip_cmp_cb cmp, unsigned short keyoffset,
+          const void *p1, const void *p2) {
+    if(p1 == p2)
+        return ZIP_CMP_EQ;
+    enum ZIP_CMP order = cmp(ZIP_KEY_PTR(p1), ZIP_KEY_PTR(p2));
+    if(order == ZIP_CMP_EQ)
+        return (p1 < p2) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
+    return order;
+}
 
-void *
-__ZIP_INSERT(zip_cmp_cb cmp, unsigned short fieldoffset,
-             unsigned short keyoffset, void *root, void *elm) {
-    struct zip_entry *elm_entry  = ZIP_ENTRY_PTR(elm);
-    if(!root) {
-        elm_entry->left = NULL;
-        elm_entry->right = NULL;
-        return elm;
+void
+__ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
+             unsigned short keyoffset, void *elm) {
+    zip_elem *x = (zip_elem*)elm;
+    ZIP_ENTRY_PTR(x)->left = NULL;
+    ZIP_ENTRY_PTR(x)->right = NULL;
+
+    zip_head *head = (zip_head*)h;
+    if(!head->root) {
+        head->root = x;
+        return;
     }
-    struct zip_entry *root_entry = ZIP_ENTRY_PTR(root);
-    enum ZIP_CMP order = cmp(ZIP_KEY_PTR(elm), ZIP_KEY_PTR(root));
-    if(order == ZIP_CMP_LESS) {
-        if(__ZIP_INSERT(cmp, fieldoffset, keyoffset, root_entry->left, elm) == elm) {
-            if(elm_entry->rank < root_entry->rank) {
-                root_entry->left = elm;
-            } else {
-                root_entry->left = elm_entry->right;
-                elm_entry->right = root;
-                return elm;
-            }
-        }
+
+    zip_elem *prev = NULL;
+    zip_elem *cur = head->root;
+    enum ZIP_CMP cur_order;
+    enum ZIP_CMP prev_order;
+    do {
+        if(x == cur)
+            return;
+        cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+        if(__ZIP_RANK_CMP(x, cur) == ZIP_CMP_MORE)
+            break;
+        prev = cur;
+        prev_order = cur_order;
+        cur = (cur_order == ZIP_CMP_MORE) ?
+            ZIP_ENTRY_PTR(cur)->right : ZIP_ENTRY_PTR(cur)->left;
+    } while(cur);
+
+    if(cur == head->root) {
+        head->root = x;
     } else {
-        if(__ZIP_INSERT(cmp, fieldoffset, keyoffset, root_entry->right, elm) == elm) {
-            if(elm_entry->rank <= root_entry->rank) {
-                root_entry->right = elm;
-            } else {
-                root_entry->right = elm_entry->left;
-                elm_entry->left = root;
-                return elm;
-            }
-        }
+        if(prev_order == ZIP_CMP_MORE)
+            ZIP_ENTRY_PTR(prev)->right = x;
+        else
+            ZIP_ENTRY_PTR(prev)->left = x;
     }
-    return root;
-}
 
-static void *
-__ZIP(unsigned short fieldoffset, void *x, void *y) {
-    if(!x) return y;
-    if(!y) return x;
-    struct zip_entry *x_entry = ZIP_ENTRY_PTR(x);
-    struct zip_entry *y_entry = ZIP_ENTRY_PTR(y);
-    if(x_entry->rank < y_entry->rank) {
-        y_entry->left = __ZIP(fieldoffset, x, y_entry->left);
-        return y;
+    if(!cur)
+        return;
+
+    if(cur_order != ZIP_CMP_LESS) {
+        ZIP_ENTRY_PTR(x)->left = cur;
     } else {
-        x_entry->right = __ZIP(fieldoffset, x_entry->right, y);
-        return x;
+        ZIP_ENTRY_PTR(x)->right = cur;
     }
+
+    prev = x;
+    do {
+        zip_elem *fix = prev;
+        if(cur_order != ZIP_CMP_LESS) {
+            do {
+                prev = cur;
+                cur = ZIP_ENTRY_PTR(cur)->right;
+                if(!cur)
+                    break;
+                cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+            } while(cur_order == ZIP_CMP_MORE);
+        } else {
+            do {
+                prev = cur;
+                cur = ZIP_ENTRY_PTR(cur)->left;
+                if(!cur)
+                    break;
+                cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+            } while(cur_order == ZIP_CMP_LESS);
+        }
+
+        if((fix != x && __ZIP_KEY_CMP(cmp, keyoffset, x, fix) == ZIP_CMP_LESS) ||
+           (fix == x && __ZIP_KEY_CMP(cmp, keyoffset, x, prev) == ZIP_CMP_LESS))
+            ZIP_ENTRY_PTR(fix)->left = cur;
+        else
+            ZIP_ENTRY_PTR(fix)->right = cur;
+    } while(cur);
 }
 
-/* Modified from the original algorithm. Allow multiple elements with the same
- * key. */
-void *
-__ZIP_REMOVE(zip_cmp_cb cmp, unsigned short fieldoffset,
-             unsigned short keyoffset, void *root, void *elm) {
-    struct zip_entry *root_entry = ZIP_ENTRY_PTR(root);
-    if(root == elm)
-        return __ZIP(fieldoffset, root_entry->left, root_entry->right);
-    void *left = root_entry->left;
-    void *right = root_entry->right;
-    enum ZIP_CMP eq = cmp(ZIP_KEY_PTR(elm), ZIP_KEY_PTR(root));
-    if(eq == ZIP_CMP_LESS) {
-        struct zip_entry *left_entry = ZIP_ENTRY_PTR(left);
-        if(elm == left)
-            root_entry->left = __ZIP(fieldoffset, left_entry->left, left_entry->right);
-        else if(left)
-            __ZIP_REMOVE(cmp, fieldoffset, keyoffset, left, elm);
-    } else if(eq == ZIP_CMP_MORE) {
-        struct zip_entry *right_entry = ZIP_ENTRY_PTR(right);
-        if(elm == right)
-            root_entry->right = __ZIP(fieldoffset, right_entry->left, right_entry->right);
-        else if(right)
-            __ZIP_REMOVE(cmp, fieldoffset, keyoffset, right, elm);
-    } else { /* ZIP_CMP_EQ, but root != elm */
-        if(right)
-            root_entry->right = __ZIP_REMOVE(cmp, fieldoffset, keyoffset, right, elm);
-        if(left)
-            root_entry->left = __ZIP_REMOVE(cmp, fieldoffset, keyoffset, left, elm);
+void
+__ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
+             unsigned short keyoffset, void *elm) {
+    zip_head *head = (zip_head*)h;
+    zip_elem *x = (zip_elem*)elm;
+    zip_elem *cur = head->root;
+    if(!cur)
+        return;
+
+    zip_elem **prev_edge;
+    enum ZIP_CMP cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+    while(cur_order != ZIP_CMP_EQ) {
+        prev_edge = (cur_order == ZIP_CMP_LESS) ?
+            &ZIP_ENTRY_PTR(cur)->left : &ZIP_ENTRY_PTR(cur)->right;
+        cur = *prev_edge;
+        if(!cur)
+            return;
+        cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
     }
-    return root;
+    cur = (zip_elem*)__ZIP_ZIP(fieldoffset,
+                               ZIP_ENTRY_PTR(cur)->left,
+                               ZIP_ENTRY_PTR(cur)->right);
+    if(head->root == x)
+        head->root = cur;
+    else
+        *prev_edge = cur;
 }
 
 void *
 __ZIP_FIND(zip_cmp_cb cmp, unsigned short fieldoffset,
-           unsigned short keyoffset, void *root, const void *key) {
-    if(!root)
-        return NULL;
-    enum ZIP_CMP eq = cmp(key, ZIP_KEY_PTR(root));
-    if(eq == ZIP_CMP_EQ)
-        return root;
-    struct zip_entry *root_entry = ZIP_ENTRY_PTR(root);
-    if(eq == ZIP_CMP_LESS)
-        return __ZIP_FIND(cmp, fieldoffset, keyoffset, root_entry->left, key);
-    else
-        return __ZIP_FIND(cmp, fieldoffset, keyoffset, root_entry->right, key);
+           unsigned short keyoffset, void *cur, const void *key) {
+    while(cur) {
+        enum ZIP_CMP eq = cmp(key, ZIP_KEY_PTR(cur));
+        if(eq == ZIP_CMP_EQ)
+            return cur;
+        if(eq == ZIP_CMP_LESS)
+            cur = ZIP_ENTRY_PTR(cur)->left;
+        else
+            cur = ZIP_ENTRY_PTR(cur)->right;
+    }
+    return NULL;
 }
 
 void *
 __ZIP_MIN(unsigned short fieldoffset, void *elm) {
     if(!elm)
         return NULL;
-    struct zip_entry *elm_entry = ZIP_ENTRY_PTR(elm);
-    while(elm_entry->left) {
-        elm = elm_entry->left;
-        elm_entry  = (struct zip_entry*)((char*)elm + fieldoffset);
+    while(ZIP_ENTRY_PTR(elm)->left) {
+        elm = ZIP_ENTRY_PTR(elm)->left;
     }
     return elm;
 }
@@ -155,21 +183,120 @@ void *
 __ZIP_MAX(unsigned short fieldoffset, void *elm) {
     if(!elm)
         return NULL;
-    struct zip_entry *elm_entry = ZIP_ENTRY_PTR(elm);
-    while(elm_entry->right) {
-        elm = elm_entry->right;
-        elm_entry  = (struct zip_entry*)((char*)elm + fieldoffset);
+    while(ZIP_ENTRY_PTR(elm)->right) {
+        elm = ZIP_ENTRY_PTR(elm)->right;
     }
     return elm;
 }
 
-void
-__ZIP_ITER(unsigned short fieldoffset, __zip_iter_cb cb,
+void *
+__ZIP_ITER(unsigned short fieldoffset, zip_iter_cb cb,
            void *context, void *elm) {
     if(!elm)
+        return NULL;
+    zip_elem *left = ZIP_ENTRY_PTR(elm)->left;
+    zip_elem *right = ZIP_ENTRY_PTR(elm)->right;
+    void *res = __ZIP_ITER(fieldoffset, cb, context, left);
+    if(res)
+        return res;
+    res = cb(context, elm);
+    if(res)
+        return res;
+    return __ZIP_ITER(fieldoffset, cb, context, right);
+}
+
+void *
+__ZIP_ZIP(unsigned short fieldoffset, void *left, void *right) {
+    if(!left)
+        return right;
+    if(!right)
+        return left;
+    zip_elem *l = (zip_elem*)left;
+    zip_elem *r = (zip_elem*)right;
+    zip_elem *root = NULL;
+    zip_elem **prev_edge = &root;
+    while(l && r) {
+        if(__ZIP_RANK_CMP(l, r) == ZIP_CMP_LESS) {
+            *prev_edge = r;
+            prev_edge = &ZIP_ENTRY_PTR(r)->left;
+            r = ZIP_ENTRY_PTR(r)->left;
+        } else {
+            *prev_edge = l;
+            prev_edge = &ZIP_ENTRY_PTR(l)->right;
+            l = ZIP_ENTRY_PTR(l)->right;
+        }
+    }
+    *prev_edge = (l) ? l : r;
+    return root;
+}
+
+void
+__ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
+            unsigned short keyoffset, const void *key,
+            void *h, void *l, void *r) {
+    zip_elem *prev;
+    zip_head *head = (zip_head*)h;
+    zip_head *left = (zip_head*)l;
+    zip_head *right = (zip_head*)r;
+    if(!head->root) {
+        left->root = NULL;
+        right->root = NULL;
         return;
-    struct zip_entry *elm_entry = ZIP_ENTRY_PTR(elm);
-    __ZIP_ITER(fieldoffset, cb, context, elm_entry->left);
-    __ZIP_ITER(fieldoffset, cb, context, elm_entry->right);
-    cb(elm, context);
+    }
+
+    zip_elem *cur = head->root;
+    enum ZIP_CMP head_order = cmp(key, ZIP_KEY_PTR(cur));
+    if(head_order == ZIP_CMP_EQ) {
+        right->root = ZIP_ENTRY_PTR(cur)->right;
+        ZIP_ENTRY_PTR(cur)->right = NULL;
+        left->root = cur;
+    } else if(head_order == ZIP_CMP_MORE) {
+        left->root = cur;
+        do {
+            prev = cur;
+            cur = ZIP_ENTRY_PTR(cur)->right;
+            if(!cur) {
+                right->root = NULL;
+                return;
+            }
+        } while(cmp(key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS);
+        right->root = cur;
+        ZIP_ENTRY_PTR(prev)->right = NULL;
+        zip_elem *left_rightmost = prev;
+        while(ZIP_ENTRY_PTR(cur)->left) {
+            prev = cur;
+            cur = ZIP_ENTRY_PTR(cur)->left;
+            if(cmp(key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS) {
+                ZIP_ENTRY_PTR(prev)->left = ZIP_ENTRY_PTR(cur)->right;
+                ZIP_ENTRY_PTR(cur)->right = NULL;
+                ZIP_ENTRY_PTR(left_rightmost)->right = cur;
+                left_rightmost = cur;
+                cur = prev;
+            }
+        }
+    } else {
+        right->root = cur;
+        do {
+            prev = cur;
+            cur = ZIP_ENTRY_PTR(cur)->left;
+            if(!cur) {
+                left->root = NULL;
+                return;
+            }
+        } while(cmp(key, ZIP_KEY_PTR(cur)) == ZIP_CMP_LESS);
+        left->root = cur;
+        ZIP_ENTRY_PTR(prev)->left = NULL;
+        zip_elem *right_leftmost = prev;
+        while(ZIP_ENTRY_PTR(cur)->right) {
+            prev = cur;
+            cur = ZIP_ENTRY_PTR(cur)->right;
+            if(cmp(key, ZIP_KEY_PTR(cur)) == ZIP_CMP_LESS) {
+                ZIP_ENTRY_PTR(prev)->right = ZIP_ENTRY_PTR(cur)->left;
+                ZIP_ENTRY_PTR(cur)->left = NULL;
+                ZIP_ENTRY_PTR(right_leftmost)->left = cur;
+                right_leftmost = cur;
+                cur = prev;
+            }
+        }
+    }
 }
diff --git a/deps/ziptree.h b/deps/ziptree.h
index 923718aee95..44be512ae4b 100644
--- a/deps/ziptree.h
+++ b/deps/ziptree.h
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
  *
- *    Copyright 2018, 2021 (c) Julius Pfrommer
+ *    Copyright 2018, 2021-2022 (c) Julius Pfrommer
  */
 
 #ifndef	ZIPTREE_H_
@@ -16,7 +16,6 @@
 # define ZIP_INLINE inline
 #endif
 
-/* Prevent warnings on unused static inline functions for some compilers */
 #if defined(__GNUC__) || defined(__clang__)
 # define ZIP_UNUSED __attribute__((unused))
 #else
@@ -32,8 +31,12 @@ extern "C" {
  *
  * Zip trees were developed in: Tarjan, R. E., Levy, C. C., and Timmel, S. "Zip
  * Trees." arXiv preprint arXiv:1806.06726 (2018). The original definition was
- * modified so that several elements with the same key can be inserted. However,
- * ZIP_FIND will only return the topmost of these elements in the tree.
+ * modified in two ways:
+ *
+ * - Multiple elements with the same key can be inserted. These appear adjacent
+ *   in the tree. ZIP_FIND will return the topmost of these elements.
+ * - The pointer-value of the elements are used as the rank. This simplifies the
+ *   code and is (empirically) faster.
  *
  * The ZIP_ENTRY definitions are to be contained in the tree entries themselves.
  * Use ZIP_FUNCTIONS to define the signature of the zip tree functions. */
@@ -47,7 +50,6 @@ struct name {                                   \
 struct {                                        \
     struct type *left;                          \
     struct type *right;                         \
-    unsigned char rank;                         \
 }
 
 enum ZIP_CMP {
@@ -56,74 +58,51 @@ enum ZIP_CMP {
     ZIP_CMP_MORE = 1
 };
 
+/* The comparison method "cmp" for a zip tree has the signature.
+ * Provide this to the ZIP_FUNCTIONS macro.
+ *
+ *   enum ZIP_CMP cmpMethod(const keytype *a, const keytype *b);
+ */
 typedef enum ZIP_CMP (*zip_cmp_cb)(const void *key1, const void *key2);
 
 #define ZIP_INIT(head) do { (head)->root = NULL; } while (0)
 #define ZIP_ROOT(head) (head)->root
 #define ZIP_LEFT(elm, field) (elm)->field.left
 #define ZIP_RIGHT(elm, field) (elm)->field.right
-#define ZIP_RANK(elm, field) (elm)->field.rank
-
-/* Internal definitions. Don't use directly. */
-
-typedef void (*__zip_iter_cb)(void *elm, void *context);
-
-void *
-__ZIP_INSERT(zip_cmp_cb cmp, unsigned short fieldoffset,
-             unsigned short keyoffset, void *root, void *elm);
-
-void *
-__ZIP_REMOVE(zip_cmp_cb cmp, unsigned short fieldoffset,
-             unsigned short keyoffset, void *root, void *elm);
 
-void *
-__ZIP_FIND(zip_cmp_cb cmp, unsigned short fieldoffset,
-           unsigned short keyoffset, void *root,
-           const void *key);
-
-void
-__ZIP_ITER(unsigned short fieldoffset, __zip_iter_cb cb,
-           void *context, void *elm);
-
-void * __ZIP_MIN(unsigned short fieldoffset, void *elm);
-void * __ZIP_MAX(unsigned short fieldoffset, void *elm);
-
-/* Zip trees are a probabilistic data structure. Entries are assigned a
- * (non-negative) rank k with probability 1/2^{k+1}. A uniformly sampled random
- * number has to be supplied with the insert method. __ZIP_FFS32 extracts from
- * it least significant nonzero bit of a 32bit number. This then has the correct
- * distribution. */
-unsigned char __ZIP_FFS32(unsigned int v);
-
-/* Generate zip tree method definitions with the ZIP_FUNCTIONS macro. The
- * comparison method "cmp" defined for every zip tree has the signature
+/* ZIP_ITER uses in-order traversal of the tree (in the order of the keys). The
+ * memory if a node is not accessed by ZIP_ITER after the callback has been
+ * executed for it. So a tree can be cleaned by calling free on each node from
+ * within the iteration callback.
  *
- *   enum ZIP_CMP cmpDateTime(const keytype *a, const keytype *b); */
+ * ZIP_ITER returns a void pointer. The first callback to return non-NULL aborts
+ * the iteration. This pointer is then returned. */
+typedef void * (*zip_iter_cb)(void *context, void *elm);
+
+/* Generate typed method definitions with the ZIP_FUNCTIONS macro */
 
-#define ZIP_INSERT(name, head, elm, rank) name##_ZIP_INSERT(head, elm, rank)
+#define ZIP_INSERT(name, head, elm) name##_ZIP_INSERT(head, elm)
 #define ZIP_REMOVE(name, head, elm) name##_ZIP_REMOVE(head, elm)
 #define ZIP_FIND(name, head, key) name##_ZIP_FIND(head, key)
+#define ZIP_ITER(name, head, cb, d) name##_ZIP_ITER(head, cb, d)
 #define ZIP_MIN(name, head) name##_ZIP_MIN(head)
 #define ZIP_MAX(name, head) name##_ZIP_MAX(head)
-#define ZIP_ITER(name, head, cb, d) name##_ZIP_ITER(head, cb, d)
+#define ZIP_ZIP(name, left, right) name##_ZIP_ZIP(left, right)
+#define ZIP_UNZIP(name, head, key, left, right) \
+    name##_ZIP_UNZIP(head, key, left, right)
 
 #define ZIP_FUNCTIONS(name, type, field, keytype, keyfield, cmp)        \
+                                                                        \
 ZIP_UNUSED static ZIP_INLINE void                                       \
-name##_ZIP_INSERT(struct name *head, struct type *elm,                  \
-                  unsigned int r) {                                     \
-    ZIP_RANK(elm, field) = __ZIP_FFS32(r);                              \
-    ZIP_ROOT(head) = (struct type*)                                     \
-        __ZIP_INSERT(cmp, offsetof(struct type, field),                 \
-                     offsetof(struct type, keyfield),                   \
-                     ZIP_ROOT(head), elm);                              \
+name##_ZIP_INSERT(struct name *head, struct type *el) {                 \
+    __ZIP_INSERT(head, cmp, offsetof(struct type, field),               \
+                 offsetof(struct type, keyfield), el);                  \
 }                                                                       \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE void                                       \
 name##_ZIP_REMOVE(struct name *head, struct type *elm) {                \
-    ZIP_ROOT(head) = (struct type*)                                     \
-        __ZIP_REMOVE(cmp, offsetof(struct type, field),                 \
-                     offsetof(struct type, keyfield),                   \
-                     ZIP_ROOT(head), elm);                              \
+    __ZIP_REMOVE(head, cmp, offsetof(struct type, field),               \
+                 offsetof(struct type, keyfield), elm);                 \
 }                                                                       \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE struct type *                              \
@@ -145,14 +124,58 @@ name##_ZIP_MAX(struct name *head) {                                     \
                                     ZIP_ROOT(head));                    \
 }                                                                       \
                                                                         \
-typedef void (*name##_cb)(struct type *elm, void *context);             \
+typedef void * (*name##_cb)(void *context, struct type *elm);           \
                                                                         \
-ZIP_UNUSED static ZIP_INLINE void                                       \
+ZIP_UNUSED static ZIP_INLINE void *                                     \
 name##_ZIP_ITER(struct name *head, name##_cb cb, void *context) {       \
-    __ZIP_ITER(offsetof(struct type, field), (__zip_iter_cb)cb,         \
-               context, ZIP_ROOT(head));                                \
+    return __ZIP_ITER(offsetof(struct type, field), (zip_iter_cb)cb,    \
+                      context, ZIP_ROOT(head));                         \
+}                                                                       \
+                                                                        \
+ZIP_UNUSED static ZIP_INLINE struct type *                              \
+name##_ZIP_ZIP(struct type *left, struct type *right) {                 \
+    return (struct type*)                                               \
+        __ZIP_ZIP(offsetof(struct type, field), left, right);           \
+}                                                                       \
+                                                                        \
+ZIP_UNUSED static ZIP_INLINE void                                       \
+name##_ZIP_UNZIP(struct name *head, const keytype *key,                 \
+                 struct name *left, struct name *right) {               \
+    __ZIP_UNZIP(cmp, offsetof(struct type, field),                      \
+                offsetof(struct type, keyfield), key,                   \
+                head, left, right);                                     \
 }
 
+/* Internal definitions. Don't use directly. */
+
+void
+__ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
+             unsigned short keyoffset, void *elm);
+
+void
+__ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
+             unsigned short keyoffset, void *elm);
+
+void *
+__ZIP_FIND(zip_cmp_cb cmp, unsigned short fieldoffset,
+           unsigned short keyoffset, void *root,
+           const void *key);
+
+void *
+__ZIP_ITER(unsigned short fieldoffset, zip_iter_cb cb,
+           void *context, void *elm);
+
+void * __ZIP_MIN(unsigned short fieldoffset, void *elm);
+void * __ZIP_MAX(unsigned short fieldoffset, void *elm);
+
+void *
+__ZIP_ZIP(unsigned short fieldoffset, void *left, void *right);
+
+void
+__ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
+            unsigned short keyoffset, const void *key,
+            void *h, void *l, void *r);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/plugins/ua_nodestore_ziptree.c b/plugins/ua_nodestore_ziptree.c
index a86df950b39..be3b111776c 100644
--- a/plugins/ua_nodestore_ziptree.c
+++ b/plugins/ua_nodestore_ziptree.c
@@ -273,7 +273,7 @@ zipNsInsertNode(void *nsCtx, UA_Node *node, UA_NodeId *addedNodeId) {
 
     /* Insert the node */
     entry->nodeIdHash = dummy.nodeIdHash;
-    ZIP_INSERT(NodeTree, &ns->root, entry, UA_UInt32_random());
+    ZIP_INSERT(NodeTree, &ns->root, entry);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -302,7 +302,7 @@ zipNsReplaceNode(void *nsCtx, UA_Node *node) {
     ZipContext *ns = (ZipContext*)nsCtx;
     ZIP_REMOVE(NodeTree, &ns->root, oldEntry);
     entry->nodeIdHash = oldEntry->nodeIdHash;
-    ZIP_INSERT(NodeTree, &ns->root, entry, ZIP_RANK(entry, zipfields));
+    ZIP_INSERT(NodeTree, &ns->root, entry);
     oldEntry->deleted = true;
 
     zipNsReleaseNode(nsCtx, oldNode);
@@ -337,10 +337,11 @@ struct VisitorData {
     void *visitorContext;
 };
 
-static void
-nodeVisitor(NodeEntry *entry, void *data) {
+static void *
+nodeVisitor(void *data, NodeEntry *entry) {
     struct VisitorData *d = (struct VisitorData*)data;
     d->visitor(d->visitorContext, (UA_Node*)&entry->nodeId);
+    return NULL;
 }
 
 static void
@@ -353,9 +354,10 @@ zipNsIterate(void *nsCtx, UA_NodestoreVisitor visitor,
     ZIP_ITER(NodeTree, &ns->root, nodeVisitor, &d);
 }
 
-static void
-deleteNodeVisitor(NodeEntry *entry, void *data) {
+static void *
+deleteNodeVisitor(void *data, NodeEntry *entry) {
     deleteEntry(entry);
+    return NULL;
 }
 
 /***********************/
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 043c8a64771..e9a40c8f9a0 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -252,17 +252,18 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
                                     cc, requestId);
 }
 
-static void
-UA_MonitoredItem_delete_wrapper(UA_Client_MonitoredItem *mon, void *data) {
+static void *
+UA_MonitoredItem_delete_wrapper(void *data, UA_Client_MonitoredItem *mon) {
     struct UA_Client_MonitoredItem_ForDelete *deleteMonitoredItem =
         (struct UA_Client_MonitoredItem_ForDelete *)data;
     if(deleteMonitoredItem != NULL) {
         if(deleteMonitoredItem->monitoredItemId != NULL &&
            (mon->monitoredItemId != *deleteMonitoredItem->monitoredItemId)) {
-            return;
+            return NULL;
         }
         MonitoredItem_delete(deleteMonitoredItem->client, deleteMonitoredItem->sub, mon);
     }
+    return NULL;
 }
 
 static void
@@ -505,7 +506,7 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
                 data->handlingCallbacks[i];
         newMon->isEventMonitoredItem =
             (request->itemsToCreate[i].itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER);
-        ZIP_INSERT(MonitorItemsTree, &sub->monitoredItems, newMon, UA_UInt32_random());
+        ZIP_INSERT(MonitorItemsTree, &sub->monitoredItems, newMon);
 
         UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                      "Subscription %" PRIu32 " | Added a MonitoredItem with handle %" PRIu32,
@@ -929,15 +930,14 @@ UA_Client_MonitoredItems_deleteSingle(UA_Client *client, UA_UInt32 subscriptionI
     return retval;
 }
 
-static void
-UA_MonitoredItem_change_clientHandle(UA_Client_MonitoredItem *mon, void *data) {
+static void *
+UA_MonitoredItem_change_clientHandle(void *data, UA_Client_MonitoredItem *mon) {
     UA_MonitoredItemModifyRequest *monitoredItemModifyRequest =
         (UA_MonitoredItemModifyRequest *)data;
-    if(monitoredItemModifyRequest != NULL) {
-        if(mon->monitoredItemId == monitoredItemModifyRequest->monitoredItemId) {
-            monitoredItemModifyRequest->requestedParameters.clientHandle = mon->clientHandle;
-        }
-    }
+    if(monitoredItemModifyRequest &&
+       mon->monitoredItemId == monitoredItemModifyRequest->monitoredItemId)
+        monitoredItemModifyRequest->requestedParameters.clientHandle = mon->clientHandle;
+    return NULL;
 }
 
 UA_ModifyMonitoredItemsResponse
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index ea6189a7a2e..c5a45b843a6 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -286,7 +286,7 @@ RefTree_add(RefTree *rt, UA_NodePointer target, UA_Boolean *duplicate) {
                                (sizeof(RefEntry) * rt->size));
     re->target = &rt->targets[rt->size];
     re->targetHash = dummy.targetHash;
-    ZIP_INSERT(RefHead, &rt->head, re, UA_UInt32_random());
+    ZIP_INSERT(RefHead, &rt->head, re);
     rt->size++;
     return UA_STATUSCODE_GOOD;
 }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 413c28880fe..9adda1eb7b7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -218,6 +218,7 @@ function(ua_add_test test_path_relative)
 endfunction()
 
 ua_add_test(check_types_builtin.c)
+ua_add_test(check_ziptree.c)
 
 if(UA_ENABLE_JSON_ENCODING)
     ua_add_test(check_cj5.c)
diff --git a/tests/check_ziptree.c b/tests/check_ziptree.c
new file mode 100644
index 00000000000..55ac0c95668
--- /dev/null
+++ b/tests/check_ziptree.c
@@ -0,0 +1,142 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <check.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "ziptree.h"
+#include "assert.h"
+
+struct treeEntry {
+    unsigned int key;
+    ZIP_ENTRY(treeEntry) pointers;
+};
+
+ZIP_HEAD(tree, treeEntry);
+
+static enum ZIP_CMP
+compareKeys(const void *k1, const void *k2) {
+    unsigned int key1 = *(const unsigned int*)k1;
+    unsigned int key2 = *(const unsigned int*)k2;
+    if(key1 == key2)
+        return ZIP_CMP_EQ;
+    return (key1 < key2) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
+}
+
+ZIP_FUNCTIONS(tree, treeEntry, pointers, unsigned int, key, compareKeys)
+
+static void
+checkTree(struct treeEntry *e) {
+    if(!e)
+        return;
+
+    struct treeEntry *left = e->pointers.left;
+    if(left)
+        ck_assert_uint_le(left->key, e->key);
+
+    struct treeEntry *right = e->pointers.right;
+    if(right)
+        ck_assert_uint_ge(right->key, e->key);
+
+    checkTree(left);
+    checkTree(right);
+}
+
+START_TEST(randTree) {
+    srand(0);
+    struct tree t1 = {NULL};
+    for(unsigned int i = 0; i < 100; i++) {
+        struct treeEntry *e1 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
+        e1->key = (unsigned int)rand();
+        ZIP_INSERT(tree, &t1, e1);
+    }
+
+    checkTree(t1.root);
+
+    while(t1.root) {
+        checkTree(t1.root);
+        struct treeEntry *left = t1.root->pointers.left;
+        struct treeEntry *right = t1.root->pointers.right;
+        free(t1.root);
+        t1.root = ZIP_ZIP(tree, left, right);
+    }
+} END_TEST
+
+START_TEST(mergeTrees) {
+    struct tree t1 = {NULL};
+    struct tree t2 = {NULL};
+    for(unsigned int i = 0; i < 100; i++) {
+        struct treeEntry *e1 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
+        struct treeEntry *e2 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
+        e1->key = i;
+        e2->key = i + 1000;
+        ZIP_INSERT(tree, &t1, e1);
+        ZIP_INSERT(tree, &t2, e2);
+    }
+
+    checkTree(t1.root);
+    checkTree(t2.root);
+
+    struct tree t3;
+    t3.root = ZIP_ZIP(tree, t1.root, t2.root);
+
+    checkTree(t3.root);
+
+    while(t3.root) {
+        checkTree(t3.root);
+        struct treeEntry *left = t3.root->pointers.left;
+        struct treeEntry *right = t3.root->pointers.right;
+        free(t3.root);
+        t3.root = ZIP_ZIP(tree, left, right);
+    }
+} END_TEST
+
+START_TEST(splitTree) {
+    struct tree t1 = {NULL};
+    for(unsigned int i = 0; i < 100; i++) {
+        struct treeEntry *e1 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
+        struct treeEntry *e2 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
+        e1->key = i;
+        e2->key = i;
+        ZIP_INSERT(tree, &t1, e1);
+        ZIP_INSERT(tree, &t1, e2);
+    }
+
+    checkTree(t1.root);
+
+    for(unsigned int split_key = 50; split_key < 60; split_key++) {
+        struct tree t2;
+        struct tree t3;
+        ZIP_UNZIP(tree, &t1, &split_key, &t2, &t3);
+        checkTree(t2.root);
+        checkTree(t3.root);
+        t1.root = ZIP_ZIP(tree, t2.root, t3.root);
+        checkTree(t1.root);
+    }
+
+    while(t1.root) {
+        checkTree(t1.root);
+        struct treeEntry *left = t1.root->pointers.left;
+        struct treeEntry *right = t1.root->pointers.right;
+        free(t1.root);
+        t1.root = ZIP_ZIP(tree, left, right);
+    }
+} END_TEST
+
+int main(void) {
+    int number_failed = 0;
+    TCase *tc_parse = tcase_create("ziptree");
+    tcase_add_test(tc_parse, randTree);
+    tcase_add_test(tc_parse, mergeTrees);
+    tcase_add_test(tc_parse, splitTree);
+    Suite *s = suite_create("Test ziptree library");
+    suite_add_tcase(s, tc_parse);
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed += srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+

From 7bc42d1520fbd8072e12aaa2e0a60de2c9856b61 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 3 Jan 2023 17:23:04 +0100
Subject: [PATCH 0607/1963] refactor(el): Use ZipTree for the EventLoop timer

---
 arch/common/ua_timer.c | 208 +++++++++++++++++++++++------------------
 arch/common/ua_timer.h |  46 +++++----
 arch/eventloop_posix.c |  12 +--
 tests/check_timer.c    |   8 +-
 4 files changed, 143 insertions(+), 131 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index 80a19193594..3cf925683ea 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -11,29 +11,32 @@
 /* There may be several entries with the same nextTime in the tree. We give them
  * an absolute order by considering the memory address to break ties. Because of
  * this, the nextTime property cannot be used to lookup specific entries. */
-static enum aa_cmp
+static enum ZIP_CMP
 cmpDateTime(const UA_DateTime *a, const UA_DateTime *b) {
     if(*a < *b)
-        return AA_CMP_LESS;
+        return ZIP_CMP_LESS;
     if(*a > *b)
-        return AA_CMP_MORE;
+        return ZIP_CMP_MORE;
     if(a == b)
-        return AA_CMP_EQ;
+        return ZIP_CMP_EQ;
     if(a < b)
-        return AA_CMP_LESS;
-    return AA_CMP_MORE;
+        return ZIP_CMP_LESS;
+    return ZIP_CMP_MORE;
 }
 
 /* The identifiers of entries are unique */
-static enum aa_cmp
+static enum ZIP_CMP
 cmpId(const UA_UInt64 *a, const UA_UInt64 *b) {
     if(*a < *b)
-        return AA_CMP_LESS;
+        return ZIP_CMP_LESS;
     if(*a == *b)
-        return AA_CMP_EQ;
-    return AA_CMP_MORE;
+        return ZIP_CMP_EQ;
+    return ZIP_CMP_MORE;
 }
 
+ZIP_FUNCTIONS(UA_TimerTree, UA_TimerEntry, treeEntry, UA_DateTime, nextTime, (zip_cmp_cb)cmpDateTime)
+ZIP_FUNCTIONS(UA_TimerIdTree, UA_TimerEntry, idTreeEntry, UA_UInt64, id, (zip_cmp_cb)cmpId)
+
 static UA_DateTime
 calculateNextTime(UA_DateTime currentTime, UA_DateTime baseTime,
                   UA_DateTime interval) {
@@ -55,14 +58,6 @@ calculateNextTime(UA_DateTime currentTime, UA_DateTime baseTime,
 void
 UA_Timer_init(UA_Timer *t) {
     memset(t, 0, sizeof(UA_Timer));
-    aa_init(&t->root,
-            (enum aa_cmp (*)(const void*, const void*))cmpDateTime,
-            offsetof(UA_TimerEntry, treeEntry),
-            offsetof(UA_TimerEntry, nextTime));
-    aa_init(&t->idRoot,
-            (enum aa_cmp (*)(const void*, const void*))cmpId,
-            offsetof(UA_TimerEntry, idTreeEntry),
-            offsetof(UA_TimerEntry, id));
     UA_LOCK_INIT(&t->timerMutex);
 }
 
@@ -92,8 +87,8 @@ addCallback(UA_Timer *t, UA_ApplicationCallback callback, void *application,
     if(callbackId)
         *callbackId = te->id;
 
-    aa_insert(&t->root, te);
-    aa_insert(&t->idRoot, te);
+    ZIP_INSERT(UA_TimerTree, &t->tree, te);
+    ZIP_INSERT(UA_TimerIdTree, &t->idTree, te);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -155,12 +150,12 @@ UA_Timer_changeRepeatedCallback(UA_Timer *t, UA_UInt64 callbackId,
     UA_LOCK(&t->timerMutex);
 
     /* Remove from the sorted tree */
-    UA_TimerEntry *te = (UA_TimerEntry*)aa_find(&t->idRoot, &callbackId);
+    UA_TimerEntry *te = ZIP_FIND(UA_TimerIdTree, &t->idTree, &callbackId);
     if(!te) {
         UA_UNLOCK(&t->timerMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
-    aa_remove(&t->root, te);
+    ZIP_REMOVE(UA_TimerTree, &t->tree, te);
 
     /* Compute the next time for execution. The logic is identical to the
      * creation of a new repeated callback. */
@@ -175,7 +170,7 @@ UA_Timer_changeRepeatedCallback(UA_Timer *t, UA_UInt64 callbackId,
     /* Update the remaining parameters and re-insert */
     te->interval = interval;
     te->timerPolicy = timerPolicy;
-    aa_insert(&t->root, te);
+    ZIP_INSERT(UA_TimerTree, &t->tree, te);
 
     UA_UNLOCK(&t->timerMutex);
     return UA_STATUSCODE_GOOD;
@@ -184,100 +179,135 @@ UA_Timer_changeRepeatedCallback(UA_Timer *t, UA_UInt64 callbackId,
 void
 UA_Timer_removeCallback(UA_Timer *t, UA_UInt64 callbackId) {
     UA_LOCK(&t->timerMutex);
-    UA_TimerEntry *te = (UA_TimerEntry*)aa_find(&t->idRoot, &callbackId);
+    UA_TimerEntry *te = ZIP_FIND(UA_TimerIdTree, &t->idTree, &callbackId);
     if(UA_LIKELY(te != NULL)) {
-        aa_remove(&t->root, te);
-        aa_remove(&t->idRoot, te);
-        UA_free(te);
+        if(t->processTree.root == NULL) {
+            /* Remove/free the entry */
+            ZIP_REMOVE(UA_TimerTree, &t->tree, te);
+            ZIP_REMOVE(UA_TimerIdTree, &t->idTree, te);
+            UA_free(te);
+        } else {
+            /* We are currently processing. Only mark the entry to be deleted.
+             * Will be removed/freed the next time we reach it in the processing
+             * callback. */
+            te->callback = NULL;
+        }
     }
     UA_UNLOCK(&t->timerMutex);
 }
 
-UA_DateTime
-UA_Timer_process(UA_Timer *t, UA_DateTime nowMonotonic,
-                 UA_TimerExecutionCallback executionCallback,
-                 void *executionApplication) {
-    UA_LOCK(&t->timerMutex);
-    UA_TimerEntry *first;
-    while((first = (UA_TimerEntry*)aa_min(&t->root)) &&
-          first->nextTime <= nowMonotonic) {
-        /* Remove before modifying the nextTime timestamp.
-         * aa_remove gets confused if we remove later. */
-        aa_remove(&t->root, first);
-
-        if(first->interval == 0) {
-            aa_remove(&t->idRoot, first);
-            UA_UNLOCK(&t->timerMutex);
-            executionCallback(executionApplication, first->callback,
-                              first->application, first->data);
-            UA_LOCK(&t->timerMutex);
-            UA_free(first);
-            continue;
-        }
-
-        /* Set the time for the next execution. Prevent an infinite loop by
-         * forcing the execution time in the next iteration.
-         *
-         * If the timer policy is "CurrentTime", then there is at least the
-         * interval between executions. This is used for Monitoreditems, for
-         * which the spec says: The sampling interval indicates the fastest rate
-         * at which the Server should sample its underlying source for data
-         * changes. (Part 4, 5.12.1.2) */
-        first->nextTime += (UA_DateTime)first->interval;
-        if(first->nextTime < nowMonotonic) {
-            if(first->timerPolicy == UA_TIMER_HANDLE_CYCLEMISS_WITH_BASETIME)
-                first->nextTime = calculateNextTime(nowMonotonic, first->nextTime,
-                                                    (UA_DateTime)first->interval);
-            else
-                first->nextTime = nowMonotonic + (UA_DateTime)first->interval;
-        }
+struct TimerProcessContext {
+    UA_Timer *t;
+    UA_DateTime nowMonotonic;
+};
 
-        /* Insert before running the callback. The entry can be removed from the
-         * callback itself. */
-        aa_insert(&t->root, first);
+static void *
+processEntryCallback(void *context, UA_TimerEntry *te) {
+    struct TimerProcessContext *tpc = (struct TimerProcessContext*)context;
+    UA_Timer *t = tpc->t;
 
-        /* Unlock the mutex before dropping into the callback. So that the timer
-         * itself can be removed / edited within the callback. When we return,
-         * only the pointer to t must still exist. */
-        UA_ApplicationCallback cb = first->callback;
-        void *app = first->application;
-        void *data = first->data;
+    /* Execute the callback. The memory is not freed during the callback.
+     * Instead, whenever t->processTree != NULL, the entries are only marked for
+     * deletion by setting elm->callback to NULL. */
+    if(te->callback) {
         UA_UNLOCK(&t->timerMutex);
-        executionCallback(executionApplication, cb, app, data);
+        te->callback(te->application, te->data);
         UA_LOCK(&t->timerMutex);
     }
 
-    /* Return the timestamp of the earliest next callback */
-    first = (UA_TimerEntry*)aa_min(&t->root);
+    /* Remove and free the entry if marked for deletion or a one-time timed
+     * callback */
+    if(!te->callback || te->interval == 0) {
+        ZIP_REMOVE(UA_TimerIdTree, &t->idTree, te);
+        UA_free(te);
+        return NULL;
+    }
+
+    /* Set the time for the next regular execution */
+    te->nextTime += (UA_DateTime)te->interval;
+
+    /* Handle the case where the "window" was missed. E.g. due to congestion of
+     * the application or if the clock was shifted.
+     *
+     * If the timer policy is "CurrentTime", then there is at least the
+     * interval between executions. This is used for Monitoreditems, for
+     * which the spec says: The sampling interval indicates the fastest rate
+     * at which the Server should sample its underlying source for data
+     * changes. (Part 4, 5.12.1.2) */
+    if(te->nextTime < tpc->nowMonotonic) {
+        if(te->timerPolicy == UA_TIMER_HANDLE_CYCLEMISS_WITH_BASETIME)
+            te->nextTime = calculateNextTime(tpc->nowMonotonic, te->nextTime,
+                                              (UA_DateTime)te->interval);
+        else
+            te->nextTime = tpc->nowMonotonic + (UA_DateTime)te->interval;
+    }
+
+    /* Insert back into the time-sorted tree */
+    ZIP_INSERT(UA_TimerTree, &t->tree, te);
+    return NULL;
+}
+
+UA_DateTime
+UA_Timer_process(UA_Timer *t, UA_DateTime nowMonotonic) {
+    UA_LOCK(&t->timerMutex);
+
+    /* Not reentrant. Don't call _process from within _process. */
+    if(!t->processTree.root) {
+        /* Move all entries <= nowMonotonic to processTree */
+        ZIP_UNZIP(UA_TimerTree, &t->tree, &nowMonotonic,
+                  &t->processTree, &t->tree);
+
+        /* Consistency check. The smallest not-processed entry isn't ready. */
+        UA_assert(!ZIP_MIN(UA_TimerTree, &t->tree) ||
+                  ZIP_MIN(UA_TimerTree, &t->tree)->nextTime > nowMonotonic);
+        
+        /* Iterate over the entries that need processing in-order. This also
+         * moves them back to the regular time-ordered tree. */
+        struct TimerProcessContext ctx;
+        ctx.t = t;
+        ctx.nowMonotonic = nowMonotonic;
+        ZIP_ITER(UA_TimerTree, &t->processTree, processEntryCallback, &ctx);
+        
+        /* Reset processTree. All entries are already moved to the normal tree. */
+        t->processTree.root = NULL;
+    }
+
+    /* Compute the timestamp of the earliest next callback */
+    UA_TimerEntry *first = ZIP_MIN(UA_TimerTree, &t->tree);
     UA_DateTime next = (first) ? first->nextTime : UA_INT64_MAX;
     if(next < nowMonotonic)
         next = nowMonotonic;
+
     UA_UNLOCK(&t->timerMutex);
     return next;
 }
 
 UA_DateTime
 UA_Timer_nextRepeatedTime(UA_Timer *t) {
-    UA_TimerEntry *first = (UA_TimerEntry*)aa_min(&t->root);
-    return (first) ? first->nextTime : UA_INT64_MAX;
+    UA_LOCK(&t->timerMutex);
+    UA_TimerEntry *first = ZIP_MIN(UA_TimerTree, &t->tree);
+    UA_DateTime next = (first) ? first->nextTime : UA_INT64_MAX;
+    UA_UNLOCK(&t->timerMutex);
+    return next;
+}
+
+static void *
+freeEntryCallback(void *context, UA_TimerEntry *entry) {
+    UA_free(entry);
+    return NULL;
 }
 
 void
 UA_Timer_clear(UA_Timer *t) {
     UA_LOCK(&t->timerMutex);
 
-    /* Free all entries */
-    UA_TimerEntry *top;
-    while((top = (UA_TimerEntry*)aa_min(&t->idRoot))) {
-        aa_remove(&t->idRoot, top);
-        UA_free(top);
-    }
-
-    /* Reset the trees to avoid future access */
-    t->root.root = NULL;
-    t->idRoot.root = NULL;
+    ZIP_ITER(UA_TimerIdTree, &t->idTree, freeEntryCallback, NULL);
+    t->tree.root = NULL;
+    t->idTree.root = NULL;
+    t->idCounter = 0;
 
     UA_UNLOCK(&t->timerMutex);
+
 #if UA_MULTITHREADING >= 100
     UA_LOCK_DESTROY(&t->timerMutex);
 #endif
diff --git a/arch/common/ua_timer.h b/arch/common/ua_timer.h
index a452b82a3fb..660cb9aec28 100644
--- a/arch/common/ua_timer.h
+++ b/arch/common/ua_timer.h
@@ -11,7 +11,7 @@
 
 #include <open62541/types.h>
 #include <open62541/plugin/eventloop.h>
-#include "aa_tree.h"
+#include "ziptree.h"
 
 _UA_BEGIN_DECLS
 
@@ -27,30 +27,38 @@ _UA_BEGIN_DECLS
 typedef void (*UA_ApplicationCallback)(void *application, void *data);
 
 typedef struct UA_TimerEntry {
-    struct aa_entry treeEntry;
-    UA_TimerPolicy timerPolicy;              /* Timer policy to handle cycle misses */
-    UA_DateTime nextTime;                    /* The next time when the callback
-                                              * is to be executed */
-    UA_UInt64 interval;                      /* Interval in 100ns resolution. If
-                                                the interval is zero, the
-                                                callback is not repeated and
-                                                removed after execution. */
-    UA_ApplicationCallback callback;
+    ZIP_ENTRY(UA_TimerEntry) treeEntry;
+    UA_TimerPolicy timerPolicy;      /* Timer policy to handle cycle misses */
+    UA_DateTime nextTime;            /* The next time when the callback is to be
+                                      * executed */
+    UA_UInt64 interval;              /* Interval in 100ns resolution. If the
+                                      * interval is zero, the callback is not
+                                      * repeated and removed after execution. */
+    UA_ApplicationCallback callback; /* This is also a sentinel value. If the
+                                      * callback is NULL, then the entry is
+                                      * marked for deletion. */
     void *application;
     void *data;
 
-    struct aa_entry idTreeEntry;
+    ZIP_ENTRY(UA_TimerEntry) idTreeEntry;
     UA_UInt64 id;                            /* Id of the entry */
 } UA_TimerEntry;
 
+typedef ZIP_HEAD(UA_TimerTree, UA_TimerEntry) UA_TimerTree;
+typedef ZIP_HEAD(UA_TimerIdTree, UA_TimerEntry) UA_TimerIdTree;
+
 typedef struct {
-    struct aa_head root;   /* The root of the time-sorted tree */
-    struct aa_head idRoot; /* The root of the id-sorted tree */
+    UA_TimerTree tree;     /* The root of the time-sorted tree */
+    UA_TimerIdTree idTree; /* The root of the id-sorted tree */
     UA_UInt64 idCounter;   /* Generate unique identifiers. Identifiers are
                             * always above zero. */
 #if UA_MULTITHREADING >= 100
     UA_Lock timerMutex;
 #endif
+
+    UA_TimerTree processTree; /* When the timer is processed, all entries that
+                               * need processing now are moved to processTree.
+                               * Then we iterate over that tree. */
 } UA_Timer;
 
 void
@@ -78,18 +86,8 @@ UA_Timer_changeRepeatedCallback(UA_Timer *t, UA_UInt64 callbackId,
 void
 UA_Timer_removeCallback(UA_Timer *t, UA_UInt64 callbackId);
 
-/* Process (dispatch) the repeated callbacks that have timed out. Returns the
- * timestamp of the next scheduled repeated callback. Not thread-safe.
- * Application is a pointer to the client / server environment for the callback.
- * Dispatched is set to true when at least one callback was run / dispatched. */
-typedef void
-(*UA_TimerExecutionCallback)(void *executionApplication, UA_ApplicationCallback cb,
-                             void *callbackApplication, void *data);
-
 UA_DateTime
-UA_Timer_process(UA_Timer *t, UA_DateTime nowMonotonic,
-                 UA_TimerExecutionCallback executionCallback,
-                 void *executionApplication);
+UA_Timer_process(UA_Timer *t, UA_DateTime nowMonotonic);
 
 void
 UA_Timer_clear(UA_Timer *t);
diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index d0ae3ffb314..92d929856be 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -13,14 +13,6 @@
 /* Timer */
 /*********/
 
-static void
-timerExecutionTrampoline(void *executionApplication,
-                         UA_ApplicationCallback cb,
-                         void *callbackApplication,
-                         void *data) {
-    cb(callbackApplication, data);
-}
-
 static UA_DateTime
 UA_EventLoopPOSIX_nextCyclicTime(UA_EventLoop *public_el) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
@@ -253,9 +245,7 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
         el->eventLoop.dateTime_nowMonotonic(&el->eventLoop);
 
     UA_UNLOCK(&el->elMutex);
-    UA_DateTime dateNext =
-        UA_Timer_process(&el->timer, dateBefore,
-                         timerExecutionTrampoline, NULL);
+    UA_DateTime dateNext = UA_Timer_process(&el->timer, dateBefore);
     UA_LOCK(&el->elMutex);
 
     /* Process delayed callbacks here:
diff --git a/tests/check_timer.c b/tests/check_timer.c
index 38dd1a2fde5..482f7f72274 100644
--- a/tests/check_timer.c
+++ b/tests/check_timer.c
@@ -17,12 +17,6 @@ timerCallback(void *application, void *data) {
     count++;
 }
 
-static void
-executionCallback(void *executionApplication, UA_ApplicationCallback cb,
-                  void *callbackApplication, void *data) {
-    cb(callbackApplication, data);
-}
-
 /* Create empty events with different callback intervals */
 static void
 createEvents(UA_Timer *t, UA_UInt32 events) {
@@ -42,7 +36,7 @@ START_TEST(benchmarkTimer) {
     clock_t begin = clock();
     UA_DateTime now = 0;
     for(size_t i = 0; i < 1000; i++) {
-        UA_DateTime next = UA_Timer_process(&timer, now, executionCallback, NULL);
+        UA_DateTime next = UA_Timer_process(&timer, now);
         /* At least 100 msec distance between _process */
         now = next + (UA_DATETIME_MSEC * 100);
         if(next > now)

From f3205e4066a447586241ccd57b3b5a8a02a8ae2a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 3 Jan 2023 17:23:51 +0100
Subject: [PATCH 0608/1963] refactor(server): Only use ZipTree in the server

---
 include/open62541/plugin/nodestore.h          |  36 +-
 src/server/ua_nodes.c                         | 300 ++++---
 src/server/ua_server_internal.h               |  12 +-
 src/server/ua_server_utils.c                  |  26 +-
 src/server/ua_services_method.c               |  80 +-
 src/server/ua_services_nodemanagement.c       | 130 +--
 src/server/ua_services_view.c                 | 738 ++++++++++--------
 .../ua_subscription_alarms_conditions.c       |  26 +-
 8 files changed, 751 insertions(+), 597 deletions(-)

diff --git a/include/open62541/plugin/nodestore.h b/include/open62541/plugin/nodestore.h
index 28685684b0b..ee663aa637f 100644
--- a/include/open62541/plugin/nodestore.h
+++ b/include/open62541/plugin/nodestore.h
@@ -18,7 +18,7 @@
  * / OPC UA services to interact with the information model. */
 
 #include <open62541/util.h>
-#include "aa_tree.h"
+#include "ziptree.h"
 
 _UA_BEGIN_DECLS
 
@@ -322,13 +322,16 @@ typedef struct {
                                * if the target is remote. */
 } UA_ReferenceTarget;
 
-typedef struct {
+typedef struct UA_ReferenceTargetTreeElem {
     UA_ReferenceTarget target;   /* Has to be the first entry */
     UA_UInt32 targetIdHash;      /* Hash of the targetId */
-    struct aa_entry idTreeEntry; /* Binary-Tree for fast lookup */
-    struct aa_entry nameTreeEntry;
+    ZIP_ENTRY(UA_ReferenceTargetTreeElem) idTreeEntry;
+    ZIP_ENTRY(UA_ReferenceTargetTreeElem) nameTreeEntry;
 } UA_ReferenceTargetTreeElem;
 
+typedef ZIP_HEAD(UA_ReferenceIdTree, UA_ReferenceTargetTreeElem) UA_ReferenceIdTree;
+typedef ZIP_HEAD(UA_ReferenceNameTree, UA_ReferenceTargetTreeElem) UA_ReferenceNameTree;
+
 /* List of reference targets with the same reference type and direction. Uses
  * either an array or a tree structure. The SDK will not change the type of
  * reference target structure internally. The nodestore implementations may
@@ -344,8 +347,8 @@ typedef struct {
 
         /* Organize the references in a tree for fast lookup */
         struct {
-            struct aa_entry *idTreeRoot;   /* Fast lookup based on the target id */
-            struct aa_entry *nameTreeRoot; /* Fast lookup based on the target browseName*/
+            UA_ReferenceIdTree idTree;     /* Fast lookup based on the target id */
+            UA_ReferenceNameTree nameTree; /* Fast lookup based on the target browseName*/
         } tree;
     } targets;
     size_t targetsSize;
@@ -354,17 +357,18 @@ typedef struct {
     UA_Boolean isInverse;
 } UA_NodeReferenceKind;
 
-/* Iterate over the references. Assumes that "prev" points to a
- * NodeReferenceKind. If prev == NULL, the first element is returned. At the end
- * of the iteration, NULL is returned.
- *
- * Do not continue the iteration after the rk was modified. */
-UA_EXPORT const UA_ReferenceTarget *
-UA_NodeReferenceKind_iterate(const UA_NodeReferenceKind *rk,
-                             const UA_ReferenceTarget *prev);
+/* Iterate over the references. Aborts when the first callback return a non-NULL
+ * pointer and returns that pointer. Do not modify the reference targets during
+ * the iteration. */
+typedef void *
+(*UA_NodeReferenceKind_iterateCallback)(void *context, UA_ReferenceTarget *target);
+
+UA_EXPORT void *
+UA_NodeReferenceKind_iterate(UA_NodeReferenceKind *rk,
+                             UA_NodeReferenceKind_iterateCallback callback,
+                             void *context);
 
-/* Returns the entry for the targetId or NULL if not found. This can be much
- * faster than _iterate if the references are in the tree-structure. */
+/* Returns the entry for the targetId or NULL if not found */
 UA_EXPORT const UA_ReferenceTarget *
 UA_NodeReferenceKind_findTarget(const UA_NodeReferenceKind *rk,
                                 const UA_ExpandedNodeId *targetId);
diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index b30f429c979..87a7a32a0ff 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -13,7 +13,6 @@
 
 #include "ua_server_internal.h"
 #include "ua_types_encoding_binary.h"
-#include "aa_tree.h"
 
 /*********************/
 /* ReferenceType Set */
@@ -256,72 +255,57 @@ static UA_StatusCode
 addReferenceTarget(UA_NodeReferenceKind *refs, UA_NodePointer target,
                    UA_UInt32 targetNameHash);
 
-static enum aa_cmp
+static UA_StatusCode
+addReferenceTargetToTree(UA_NodeReferenceKind *rk, UA_NodePointer targetId,
+                         UA_UInt32 targetIdHash, UA_UInt32 targetNameHash);
+
+enum ZIP_CMP
 cmpRefTargetId(const void *a, const void *b) {
     const UA_ReferenceTargetTreeElem *aa = (const UA_ReferenceTargetTreeElem*)a;
     const UA_ReferenceTargetTreeElem *bb = (const UA_ReferenceTargetTreeElem*)b;
     if(aa->targetIdHash < bb->targetIdHash)
-        return AA_CMP_LESS;
+        return ZIP_CMP_LESS;
     if(aa->targetIdHash > bb->targetIdHash)
-        return AA_CMP_MORE;
-    return (enum aa_cmp)UA_NodePointer_order(aa->target.targetId,
-                                             bb->target.targetId);
+        return ZIP_CMP_MORE;
+    return (enum ZIP_CMP)UA_NodePointer_order(aa->target.targetId,
+                                              bb->target.targetId);
 }
 
-static enum aa_cmp
+enum ZIP_CMP
 cmpRefTargetName(const void *a, const void *b) {
-    const UA_UInt32 *nameHashA = (const UA_UInt32*)a;
-    const UA_UInt32 *nameHashB = (const UA_UInt32*)b;
-    if(*nameHashA < *nameHashB)
-        return AA_CMP_LESS;
-    if(*nameHashA > *nameHashB)
-        return AA_CMP_MORE;
-    return AA_CMP_EQ;
-}
-
-/* Reusable binary search tree "heads". Just switch out the root pointer. */
-static const struct aa_head refIdTree =
-    { NULL, cmpRefTargetId, offsetof(UA_ReferenceTargetTreeElem, idTreeEntry), 0 };
-const struct aa_head refNameTree =
-    { NULL, cmpRefTargetName, offsetof(UA_ReferenceTargetTreeElem, nameTreeEntry),
-      offsetof(UA_ReferenceTarget, targetNameHash) };
-
-const UA_ReferenceTarget *
-UA_NodeReferenceKind_iterate(const UA_NodeReferenceKind *rk,
-                             const UA_ReferenceTarget *prev) {
-    /* Return from the tree */
-    if(rk->hasRefTree) {
-        const struct aa_head _refIdTree =
-            { rk->targets.tree.idTreeRoot, cmpRefTargetId,
-              offsetof(UA_ReferenceTargetTreeElem, idTreeEntry), 0 };
-        if(prev == NULL)
-            return (const UA_ReferenceTarget*)aa_min(&_refIdTree);
-        return (const UA_ReferenceTarget*)aa_next(&_refIdTree, prev);
-    }
-    if(prev == NULL) /* Return start of the array */
-        return rk->targets.array;
-    if(prev + 1 >= &rk->targets.array[rk->targetsSize])
-        return NULL; /* End of the array */
-    return prev + 1; /* Next element in the array */
+    const UA_ReferenceTargetTreeElem *aa = (const UA_ReferenceTargetTreeElem*)a;
+    const UA_ReferenceTargetTreeElem *bb = (const UA_ReferenceTargetTreeElem*)b;
+    if(aa->target.targetNameHash == bb->target.targetNameHash)
+        return ZIP_CMP_EQ;
+    return (aa->target.targetNameHash < bb->target.targetNameHash) ?
+        ZIP_CMP_LESS : ZIP_CMP_MORE;
 }
 
-/* Also deletes the elements of the tree */
+/* Move to the array in-order, also deletes the tree elements */
 static void
 moveTreeToArray(UA_ReferenceTarget *array, size_t *pos,
-                struct aa_entry *entry) {
-    if(!entry)
+                UA_ReferenceTargetTreeElem *elem) {
+    if(!elem)
         return;
-    UA_ReferenceTargetTreeElem *elem = (UA_ReferenceTargetTreeElem*)
-        ((uintptr_t)entry - offsetof(UA_ReferenceTargetTreeElem, idTreeEntry));
     moveTreeToArray(array, pos, elem->idTreeEntry.left);
-    moveTreeToArray(array, pos, elem->idTreeEntry.right);
     array[*pos] = elem->target;
     (*pos)++;
+    moveTreeToArray(array, pos, elem->idTreeEntry.right);
+    UA_free(elem);
+}
+
+static void *
+removeTreeEntry(void *context, UA_ReferenceTargetTreeElem *elem) {
+    (void)context;
+    UA_NodePointer_clear(&elem->target.targetId);
     UA_free(elem);
+    return NULL;
 }
 
 UA_StatusCode
 UA_NodeReferenceKind_switch(UA_NodeReferenceKind *rk) {
+    UA_assert(rk->targetsSize > 0);
+
     if(rk->hasRefTree) {
         /* From tree to array */
         UA_ReferenceTarget *array = (UA_ReferenceTarget*)
@@ -329,7 +313,7 @@ UA_NodeReferenceKind_switch(UA_NodeReferenceKind *rk) {
         if(!array)
             return UA_STATUSCODE_BADOUTOFMEMORY;
         size_t pos = 0;
-        moveTreeToArray(array, &pos, rk->targets.tree.idTreeRoot);
+        moveTreeToArray(array, &pos, rk->targets.tree.idTree.root);
         rk->targets.array = array;
         rk->hasRefTree = false;
         return UA_STATUSCODE_GOOD;
@@ -338,23 +322,16 @@ UA_NodeReferenceKind_switch(UA_NodeReferenceKind *rk) {
     /* From array to tree */
     UA_NodeReferenceKind newRk = *rk;
     newRk.hasRefTree = true;
-    newRk.targets.tree.idTreeRoot = NULL;
-    newRk.targets.tree.nameTreeRoot = NULL;
+    newRk.targets.tree.idTree.root = NULL;
+    newRk.targets.tree.nameTree.root = NULL;
+    newRk.targetsSize = 0;
     for(size_t i = 0; i < rk->targetsSize; i++) {
         UA_StatusCode res =
             addReferenceTarget(&newRk, rk->targets.array[i].targetId,
                                rk->targets.array[i].targetNameHash);
         if(res != UA_STATUSCODE_GOOD) {
-            struct aa_head _refIdTree = refIdTree;
-            _refIdTree.root = newRk.targets.tree.idTreeRoot;
-            while(_refIdTree.root) {
-                UA_ReferenceTargetTreeElem *elem = (UA_ReferenceTargetTreeElem*)
-                    ((uintptr_t)_refIdTree.root -
-                     offsetof(UA_ReferenceTargetTreeElem, idTreeEntry));
-                aa_remove(&_refIdTree, elem);
-                UA_NodePointer_clear(&elem->target.targetId);
-                UA_free(elem);
-            }
+            ZIP_ITER(UA_ReferenceIdTree, &newRk.targets.tree.idTree,
+                     removeTreeEntry, NULL);
             return res;
         }
     }
@@ -365,26 +342,41 @@ UA_NodeReferenceKind_switch(UA_NodeReferenceKind *rk) {
     return UA_STATUSCODE_GOOD;
 }
 
+void *
+UA_NodeReferenceKind_iterate(UA_NodeReferenceKind *rk,
+                             UA_NodeReferenceKind_iterateCallback callback,
+                             void *context) {
+    if(rk->hasRefTree)
+        return ZIP_ITER(UA_ReferenceIdTree, &rk->targets.tree.idTree,
+                        (UA_ReferenceIdTree_cb)callback, context);
+    for(size_t i = 0; i < rk->targetsSize; i++) {
+        void *res = callback(context, &rk->targets.array[i]);
+        if(res)
+            return res;
+    }
+    return NULL;
+}
+
 const UA_ReferenceTarget *
 UA_NodeReferenceKind_findTarget(const UA_NodeReferenceKind *rk,
                                 const UA_ExpandedNodeId *targetId) {
     UA_NodePointer targetP = UA_NodePointer_fromExpandedNodeId(targetId);
-
-    /* Return from the tree */
     if(rk->hasRefTree) {
+        /* Return from the tree */
         UA_ReferenceTargetTreeElem tmpTarget;
         tmpTarget.target.targetId = targetP;
         tmpTarget.targetIdHash = UA_ExpandedNodeId_hash(targetId);
-        const struct aa_head _refIdTree =
-            { rk->targets.tree.idTreeRoot, cmpRefTargetId,
-              offsetof(UA_ReferenceTargetTreeElem, idTreeEntry), 0 };
-        return (const UA_ReferenceTarget*)aa_find(&_refIdTree, &tmpTarget);
-    }
-
-    /* Return from the array */
-    for(size_t i = 0; i < rk->targetsSize; i++) {
-        if(UA_NodePointer_equal(targetP, rk->targets.array[i].targetId))
-            return &rk->targets.array[i];
+        UA_ReferenceTargetTreeElem *result =
+            ZIP_FIND(UA_ReferenceIdTree, (UA_ReferenceIdTree*)
+                     (uintptr_t)&rk->targets.tree.idTree, &tmpTarget);
+        if(result)
+            return &result->target;
+    } else {
+        /* Return from the array */
+        for(size_t i = 0; i < rk->targetsSize; i++) {
+            if(UA_NodePointer_equal(targetP, rk->targets.array[i].targetId))
+                return &rk->targets.array[i];
+        }
     }
     return NULL;
 }
@@ -533,6 +525,15 @@ UA_ViewNode_copy(const UA_ViewNode *src, UA_ViewNode *dst) {
     return UA_STATUSCODE_GOOD;
 }
 
+static void *
+copyTarget(void *context, UA_ReferenceTargetTreeElem *elm) {
+    UA_NodeReferenceKind *drefs = (UA_NodeReferenceKind*)context;
+    return (void*)(uintptr_t)
+        addReferenceTargetToTree(drefs, elm->target.targetId,
+                                 elm->targetIdHash,
+                                 elm->target.targetNameHash);
+}
+
 UA_StatusCode
 UA_Node_copy(const UA_Node *src, UA_Node *dst) {
     const UA_NodeHead *srchead = &src->head;
@@ -604,14 +605,35 @@ UA_Node_copy(const UA_Node *src, UA_Node *dst) {
             drefs->hasRefTree = srefs->hasRefTree; /* initially empty */
 
             /* Copy all the targets */
-            const UA_ReferenceTarget *t = NULL;
-            while((t = UA_NodeReferenceKind_iterate(srefs, t))) {
-                retval = addReferenceTarget(drefs, t->targetId, t->targetNameHash);
-                if(retval != UA_STATUSCODE_GOOD) {
+            if(!srefs->hasRefTree) {
+                drefs->targets.array = (UA_ReferenceTarget*)
+                    UA_malloc(sizeof(UA_ReferenceTarget) * srefs->targetsSize);
+                if(!drefs->targets.array) {
+                    UA_Node_clear(dst);
+                    return UA_STATUSCODE_BADOUTOFMEMORY;
+                }
+                for(size_t j = 0; j < srefs->targetsSize; j++) {
+                    drefs->targets.array[j].targetNameHash =
+                        srefs->targets.array[j].targetNameHash;
+                    retval = UA_NodePointer_copy(srefs->targets.array[j].targetId,
+                                                 &drefs->targets.array[j].targetId);
+                    drefs->targetsSize++; /* avoid that targetsSize == 0 in error case */
+                    if(retval != UA_STATUSCODE_GOOD) {
+                        UA_Node_clear(dst);
+                        return retval;
+                    }
+                }
+            } else {
+                void *res = ZIP_ITER(UA_ReferenceIdTree, &srefs->targets.tree.idTree,
+                                     copyTarget, drefs);
+                if(res != NULL) {
                     UA_Node_clear(dst);
-                    return retval;
+                    return (UA_StatusCode)(uintptr_t)res;
                 }
             }
+
+            UA_assert(srefs->targetsSize > 0);
+            UA_assert(srefs->targetsSize == drefs->targetsSize);
         }
     }
 
@@ -870,66 +892,60 @@ UA_Node_setAttributes(UA_Node *node, const void *attributes, const UA_DataType *
 /*********************/
 
 static UA_StatusCode
-addReferenceTarget(UA_NodeReferenceKind *rk, UA_NodePointer targetId,
-                   UA_UInt32 targetNameHash) {
-    /* Insert into array */
-    if(!rk->hasRefTree) {
-        UA_ReferenceTarget *newRefs = (UA_ReferenceTarget*)
-            UA_realloc(rk->targets.array,
-                       sizeof(UA_ReferenceTarget) * (rk->targetsSize + 1));
-        if(!newRefs)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        rk->targets.array = newRefs;
-
-        UA_StatusCode retval =
-            UA_NodePointer_copy(targetId,
-                                &rk->targets.array[rk->targetsSize].targetId);
-        rk->targets.array[rk->targetsSize].targetNameHash = targetNameHash;
-        if(retval != UA_STATUSCODE_GOOD) {
-            if(rk->targetsSize == 0) {
-                UA_free(rk->targets.array);
-                rk->targets.array = NULL;
-            }
-            return retval;
-        }
-        rk->targetsSize++;
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* Insert into tree */
+addReferenceTargetToTree(UA_NodeReferenceKind *rk, UA_NodePointer targetId,
+                         UA_UInt32 targetIdHash, UA_UInt32 targetNameHash) {
     UA_ReferenceTargetTreeElem *entry = (UA_ReferenceTargetTreeElem*)
         UA_malloc(sizeof(UA_ReferenceTargetTreeElem));
     if(!entry)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    UA_StatusCode retval =
-        UA_NodePointer_copy(targetId, &entry->target.targetId);
-    if(retval != UA_STATUSCODE_GOOD) {
+    UA_StatusCode res = UA_NodePointer_copy(targetId, &entry->target.targetId);
+    if(res != UA_STATUSCODE_GOOD) {
         UA_free(entry);
-        return retval;
+        return res;
     }
 
-    /* <-- The point of no return --> */
-
-    UA_ExpandedNodeId en = UA_NodePointer_toExpandedNodeId(targetId);
-    entry->targetIdHash = UA_ExpandedNodeId_hash(&en);
+    entry->targetIdHash = targetIdHash;
     entry->target.targetNameHash = targetNameHash;
 
-    /* Insert to the id lookup binary search tree. Only the root is kept in refs
-     * to save space. */
-    struct aa_head _refIdTree = refIdTree;
-    _refIdTree.root = rk->targets.tree.idTreeRoot;
-    aa_insert(&_refIdTree, entry);
-    rk->targets.tree.idTreeRoot = _refIdTree.root;
-
-    /* Insert to the name lookup binary search tree */
-    struct aa_head _refNameTree = refNameTree;
-    _refNameTree.root = rk->targets.tree.nameTreeRoot;
-    aa_insert(&_refNameTree, entry);
-    rk->targets.tree.nameTreeRoot = _refNameTree.root;
+    ZIP_INSERT(UA_ReferenceIdTree, &rk->targets.tree.idTree, entry);
+    ZIP_INSERT(UA_ReferenceNameTree, &rk->targets.tree.nameTree, entry);
 
     rk->targetsSize++;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+addReferenceTarget(UA_NodeReferenceKind *rk, UA_NodePointer targetId,
+                   UA_UInt32 targetNameHash) {
+    /* Insert into tree */
+    if(rk->hasRefTree) {
+        UA_ExpandedNodeId en = UA_NodePointer_toExpandedNodeId(targetId);
+        return addReferenceTargetToTree(rk, targetId, UA_ExpandedNodeId_hash(&en),
+                                        targetNameHash);
+    }
+
+    /* Insert to the array */
+    UA_ReferenceTarget *newRefs = (UA_ReferenceTarget*)
+        UA_realloc(rk->targets.array,
+                   sizeof(UA_ReferenceTarget) * (rk->targetsSize + 1));
+    if(!newRefs)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    rk->targets.array = newRefs;
+
+    UA_StatusCode retval =
+        UA_NodePointer_copy(targetId,
+                            &rk->targets.array[rk->targetsSize].targetId);
+    rk->targets.array[rk->targetsSize].targetNameHash = targetNameHash;
+    if(retval != UA_STATUSCODE_GOOD) {
+        if(rk->targetsSize == 0) {
+            UA_free(rk->targets.array);
+            rk->targets.array = NULL;
+        }
+        return retval;
+    }
 
+    rk->targetsSize++;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -947,14 +963,13 @@ addReferenceKind(UA_NodeHead *head, UA_Byte refTypeIndex, UA_Boolean isForward,
     memset(newRef, 0, sizeof(UA_NodeReferenceKind));
     newRef->referenceTypeIndex = refTypeIndex;
     newRef->isInverse = !isForward;
-    UA_StatusCode retval =
-        addReferenceTarget(newRef, target, targetBrowseNameHash);
-    if(retval != UA_STATUSCODE_GOOD) {
+    UA_StatusCode res = addReferenceTarget(newRef, target, targetBrowseNameHash);
+    if(res != UA_STATUSCODE_GOOD) {
         if(head->referencesSize == 0) {
             UA_free(head->references);
             head->references = NULL;
         }
-        return retval;
+        return res;
     }
 
     head->referencesSize++;
@@ -998,9 +1013,6 @@ UA_Node_addReference(UA_Node *node, UA_Byte refTypeIndex, UA_Boolean isForward,
 UA_StatusCode
 UA_Node_deleteReference(UA_Node *node, UA_Byte refTypeIndex, UA_Boolean isForward,
                         const UA_ExpandedNodeId *targetNodeId) {
-    struct aa_head _refIdTree = refIdTree;
-    struct aa_head _refNameTree = refNameTree;
-
     UA_NodeHead *head = &node->head;
     for(size_t i = 0; i < head->referencesSize; i++) {
         UA_NodeReferenceKind *refs = &head->references[i];
@@ -1037,19 +1049,13 @@ UA_Node_deleteReference(UA_Node *node, UA_Byte refTypeIndex, UA_Boolean isForwar
             /* Remove the last target. Remove the ReferenceKind below */
             UA_free(refs->targets.array);
         } else {
-            /* Remove from the tree */
-            _refIdTree.root = refs->targets.tree.idTreeRoot;
-            aa_remove(&_refIdTree, target);
-            refs->targets.tree.idTreeRoot = _refIdTree.root;
-
-            _refNameTree.root = refs->targets.tree.nameTreeRoot;
-            aa_remove(&_refNameTree, target);
-            refs->targets.tree.nameTreeRoot = _refNameTree.root;
-
+            UA_ReferenceTargetTreeElem *elem = (UA_ReferenceTargetTreeElem*)target;
+            ZIP_REMOVE(UA_ReferenceIdTree, &refs->targets.tree.idTree, elem);
+            ZIP_REMOVE(UA_ReferenceNameTree, &refs->targets.tree.nameTree, elem);
             UA_NodePointer_clear(&target->targetId);
             UA_free(target);
-            if(refs->targets.tree.idTreeRoot)
-                return UA_STATUSCODE_GOOD; /* At least one target remains */
+            if(refs->targetsSize > 0)
+                return UA_STATUSCODE_GOOD;
         }
 
         /* No targets remaining. Remove the ReferenceKind. */
@@ -1078,7 +1084,6 @@ UA_Node_deleteReference(UA_Node *node, UA_Byte refTypeIndex, UA_Boolean isForwar
 void
 UA_Node_deleteReferencesSubset(UA_Node *node, const UA_ReferenceTypeSet *keepSet) {
     UA_NodeHead *head = &node->head;
-    struct aa_head _refIdTree = refIdTree;
     for(size_t i = 0; i < head->referencesSize; i++) {
         /* Keep the references of this type? */
         UA_NodeReferenceKind *refs = &head->references[i];
@@ -1092,15 +1097,8 @@ UA_Node_deleteReferencesSubset(UA_Node *node, const UA_ReferenceTypeSet *keepSet
                 UA_NodePointer_clear(&refs->targets.array[j].targetId);
             UA_free(refs->targets.array);
         } else {
-            _refIdTree.root = refs->targets.tree.idTreeRoot;
-            while(_refIdTree.root) {
-                UA_ReferenceTargetTreeElem *elem = (UA_ReferenceTargetTreeElem*)
-                    ((uintptr_t)_refIdTree.root -
-                     offsetof(UA_ReferenceTargetTreeElem, idTreeEntry));
-                aa_remove(&_refIdTree, elem);
-                UA_NodePointer_clear(&elem->target.targetId);
-                UA_free(elem);
-            }
+            ZIP_ITER(UA_ReferenceIdTree, &refs->targets.tree.idTree,
+                     removeTreeEntry, NULL);
         }
 
         /* Move last references-kind entry to this position. Don't memcpy over
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 5eb7fe87529..08568dff009 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -195,7 +195,17 @@ struct UA_Server {
 /* References Handling */
 /***********************/
 
-extern const struct aa_head refNameTree;
+enum ZIP_CMP
+cmpRefTargetId(const void *a, const void *b);
+
+enum ZIP_CMP
+cmpRefTargetName(const void *a, const void *b);
+
+/* Static inline methods for tree handling */
+ZIP_FUNCTIONS(UA_ReferenceIdTree, UA_ReferenceTargetTreeElem, idTreeEntry,
+              UA_ReferenceTargetTreeElem, target, cmpRefTargetId)
+ZIP_FUNCTIONS(UA_ReferenceNameTree, UA_ReferenceTargetTreeElem, nameTreeEntry,
+              UA_ReferenceTarget, target, cmpRefTargetName)
 
 /**************************/
 /* SecureChannel Handling */
diff --git a/src/server/ua_server_utils.c b/src/server/ua_server_utils.c
index 152b143a598..8b020a20fe0 100644
--- a/src/server/ua_server_utils.c
+++ b/src/server/ua_server_utils.c
@@ -21,22 +21,27 @@ UA_Server_findDataType(UA_Server *server, const UA_NodeId *typeId) {
 /* Information Model Operations */
 /********************************/
 
+static void *
+returnFirstType(void *context, UA_ReferenceTarget *t) {
+    UA_Server *server = (UA_Server*)context;
+    /* Don't release the node that is returned.
+     * Continues to iterate if NULL is returned. */
+    return (void*)(uintptr_t)UA_NODESTORE_GETFROMREF(server, t->targetId);
+}
+
 const UA_Node *
 getNodeType(UA_Server *server, const UA_NodeHead *head) {
     /* The reference to the parent is different for variable and variabletype */
     UA_Byte parentRefIndex;
     UA_Boolean inverse;
-    UA_NodeClass typeNodeClass;
     switch(head->nodeClass) {
     case UA_NODECLASS_OBJECT:
         parentRefIndex = UA_REFERENCETYPEINDEX_HASTYPEDEFINITION;
         inverse = false;
-        typeNodeClass = UA_NODECLASS_OBJECTTYPE;
         break;
     case UA_NODECLASS_VARIABLE:
         parentRefIndex = UA_REFERENCETYPEINDEX_HASTYPEDEFINITION;
         inverse = false;
-        typeNodeClass = UA_NODECLASS_VARIABLETYPE;
         break;
     case UA_NODECLASS_OBJECTTYPE:
     case UA_NODECLASS_VARIABLETYPE:
@@ -44,7 +49,6 @@ getNodeType(UA_Server *server, const UA_NodeHead *head) {
     case UA_NODECLASS_DATATYPE:
         parentRefIndex = UA_REFERENCETYPEINDEX_HASSUBTYPE;
         inverse = true;
-        typeNodeClass = head->nodeClass;
         break;
     default:
         return NULL;
@@ -57,16 +61,10 @@ getNodeType(UA_Server *server, const UA_NodeHead *head) {
             continue;
         if(rk->referenceTypeIndex != parentRefIndex)
             continue;
-
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-            const UA_Node *type = UA_NODESTORE_GETFROMREF(server, t->targetId);
-            if(!type)
-                continue;
-            if(type->head.nodeClass == typeNodeClass)
-                return type; /* Don't release the node that is returned */
-            UA_NODESTORE_RELEASE(server, type);
-        }
+        const UA_Node *type = (const UA_Node*)
+            UA_NodeReferenceKind_iterate(rk, returnFirstType, server);
+        if(type)
+            return type;
     }
 
     return NULL;
diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 6cd5324a43f..366c6c7ff6b 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -20,33 +20,45 @@
 
 #define UA_MAX_METHOD_ARGUMENTS 64
 
+struct GetArgumentsNodeContext {
+    UA_Server *server;
+    UA_String withBrowseName;
+};
+
+static void *
+getArgumentsNodeCallback(void *context, UA_ReferenceTarget *t) {
+    struct GetArgumentsNodeContext *ctx = (struct GetArgumentsNodeContext*)context;
+    const UA_Node *refTarget =
+        UA_NODESTORE_GETFROMREF_SELECTIVE(ctx->server, t->targetId,
+                                          UA_NODEATTRIBUTESMASK_NODECLASS |
+                                          UA_NODEATTRIBUTESMASK_VALUE,
+                                          UA_REFERENCETYPESET_NONE,
+                                          UA_BROWSEDIRECTION_INVALID);
+    if(!refTarget)
+        return NULL;
+    if(refTarget->head.nodeClass == UA_NODECLASS_VARIABLE &&
+       refTarget->head.browseName.namespaceIndex == 0 &&
+       UA_String_equal(&ctx->withBrowseName, &refTarget->head.browseName.name)) {
+        return (void*)(uintptr_t)&refTarget->variableNode;
+    }
+    UA_NODESTORE_RELEASE(ctx->server, refTarget);
+    return NULL;
+}
+
 static const UA_VariableNode *
 getArgumentsVariableNode(UA_Server *server, const UA_NodeHead *head,
                          UA_String withBrowseName) {
     for(size_t i = 0; i < head->referencesSize; ++i) {
-        const UA_NodeReferenceKind *rk = &head->references[i];
+        UA_NodeReferenceKind *rk = &head->references[i];
         if(rk->isInverse)
             continue;
         if(rk->referenceTypeIndex != UA_REFERENCETYPEINDEX_HASPROPERTY)
             continue;
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-            /* Get only the NodeClass and Value attributes, no references */
-            const UA_Node *refTarget =
-                UA_NODESTORE_GETFROMREF_SELECTIVE(server, t->targetId,
-                                                  UA_NODEATTRIBUTESMASK_NODECLASS |
-                                                  UA_NODEATTRIBUTESMASK_VALUE,
-                                                  UA_REFERENCETYPESET_NONE,
-                                                  UA_BROWSEDIRECTION_INVALID);
-            if(!refTarget)
-                continue;
-            if(refTarget->head.nodeClass == UA_NODECLASS_VARIABLE &&
-               refTarget->head.browseName.namespaceIndex == 0 &&
-               UA_String_equal(&withBrowseName, &refTarget->head.browseName.name)) {
-                return &refTarget->variableNode;
-            }
-            UA_NODESTORE_RELEASE(server, refTarget);
-        }
+        struct GetArgumentsNodeContext ctx;
+        ctx.server = server;
+        ctx.withBrowseName = withBrowseName;
+        return (const UA_VariableNode*)
+            UA_NodeReferenceKind_iterate(rk, getArgumentsNodeCallback, &ctx);
     }
     return NULL;
 }
@@ -121,6 +133,19 @@ checkMethodReference(const UA_NodeHead *h, UA_ReferenceTypeSet refs,
     return false;
 }
 
+static void *
+iterateFunctionGroupSearch(void *context, UA_ReferenceTarget *t) {
+    UA_Server *server = (UA_Server*)context;
+    if(!UA_NodePointer_isLocal(t->targetId))
+        return NULL;
+
+    UA_NodeId tmpId = UA_NodePointer_toNodeId(t->targetId);
+    if(isNodeInTree_singleRef(server, &tmpId, &functionGroupNodeId,
+                               UA_REFERENCETYPEINDEX_HASSUBTYPE))
+        return (void*)0x01;
+    return NULL;
+}
+
 static UA_StatusCode
 checkFunctionalGroupMethodReference(UA_Server *server, const UA_NodeHead *h,
                                     const UA_ExpandedNodeId *methodId,
@@ -139,7 +164,7 @@ checkFunctionalGroupMethodReference(UA_Server *server, const UA_NodeHead *h,
     /* Search for a HasTypeDefinition (or sub-) reference to the FunctionGroupType */
     UA_Boolean isFunctionGroup = false;
     for(size_t i = 0; i < h->referencesSize && !isFunctionGroup; ++i) {
-        const UA_NodeReferenceKind *rk = &h->references[i];
+        UA_NodeReferenceKind *rk = &h->references[i];
         if(rk->isInverse)
             continue;
 
@@ -149,18 +174,11 @@ checkFunctionalGroupMethodReference(UA_Server *server, const UA_NodeHead *h,
 
         /* Reference points to FunctionGroupType (or sub-type) from the DI
          * model? */
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-            if(!UA_NodePointer_isLocal(t->targetId))
-                continue;
-
-            UA_NodeId tmpId = UA_NodePointer_toNodeId(t->targetId);
-            if(!isNodeInTree_singleRef(server, &tmpId, &functionGroupNodeId,
-                                       UA_REFERENCETYPEINDEX_HASSUBTYPE))
-                continue;
-            isFunctionGroup = true;
+        isFunctionGroup =
+            (UA_NodeReferenceKind_iterate(rk, iterateFunctionGroupSearch,
+                                          server) != NULL);
+        if(isFunctionGroup)
             break;
-        }
     }
     if(!isFunctionGroup)
         return UA_STATUSCODE_GOOD;
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 4b157d2c8e8..205f310b4ee 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -489,8 +489,8 @@ findChildByBrowsename(UA_Server *server, UA_Session *session,
     return retval;
 }
 
-static const UA_NodeId mandatoryId =
-    {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_MODELLINGRULE_MANDATORY}};
+static const UA_ExpandedNodeId mandatoryId =
+    {{0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_MODELLINGRULE_MANDATORY}}, {0, NULL}, 0};
 
 static UA_Boolean
 isMandatoryChild(UA_Server *server, UA_Session *session,
@@ -501,7 +501,7 @@ isMandatoryChild(UA_Server *server, UA_Session *session,
         return false;
 
     /* Look for the reference making the child mandatory */
-    UA_NodePointer mandatoryP = UA_NodePointer_fromNodeId(&mandatoryId);
+    UA_Boolean found = false;
     for(size_t i = 0; i < child->head.referencesSize; ++i) {
         UA_NodeReferenceKind *rk = &child->head.references[i];
         if(rk->referenceTypeIndex != UA_REFERENCETYPEINDEX_HASMODELLINGRULE)
@@ -509,17 +509,14 @@ isMandatoryChild(UA_Server *server, UA_Session *session,
         if(rk->isInverse)
             continue;
 
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-            if(UA_NodePointer_equal(mandatoryP, t->targetId)) {
-                UA_NODESTORE_RELEASE(server, child);
-                return true;
-            }
+        if(UA_NodeReferenceKind_findTarget(rk, &mandatoryId)) {
+            found = true;
+            break;
         }
     }
 
     UA_NODESTORE_RELEASE(server, child);
-    return false;
+    return found;
 }
 
 static UA_StatusCode
@@ -1690,48 +1687,69 @@ static void
 Operation_deleteReference(UA_Server *server, UA_Session *session, void *context,
                           const UA_DeleteReferencesItem *item, UA_StatusCode *retval);
 
+struct RemoveIncomingContext {
+    UA_Server *server;
+    UA_Session *session;
+    UA_DeleteReferencesItem *item;
+};
+
+static void *
+removeIncomingReferencesCallback(void *context, UA_ReferenceTarget *t) {
+    struct RemoveIncomingContext *ctx = (struct RemoveIncomingContext *)context;
+    if(!UA_NodePointer_isLocal(t->targetId))
+        return NULL;
+    UA_StatusCode dummy;
+    ctx->item->sourceNodeId = UA_NodePointer_toNodeId(t->targetId);
+    Operation_deleteReference(ctx->server, ctx->session, NULL, ctx->item, &dummy);
+    return NULL;
+}
+
 /* Remove references to this node (in the other nodes) */
 static void
-removeIncomingReferences(UA_Server *server, UA_Session *session, const UA_NodeHead *head) {
+removeIncomingReferences(UA_Server *server, UA_Session *session,
+                         const UA_NodeHead *head) {
     UA_DeleteReferencesItem item;
     UA_DeleteReferencesItem_init(&item);
     item.targetNodeId.nodeId = head->nodeId;
     item.deleteBidirectional = false;
 
-    UA_StatusCode dummy;
+    struct RemoveIncomingContext ctx;
+    ctx.server = server;
+    ctx.session = session;
+    ctx.item = &item;
+
     for(size_t i = 0; i < head->referencesSize; ++i) {
-        const UA_NodeReferenceKind *rk = &head->references[i];
+        UA_NodeReferenceKind *rk = &head->references[i];
         item.isForward = rk->isInverse;
         item.referenceTypeId =
             *UA_NODESTORE_GETREFERENCETYPEID(server, rk->referenceTypeIndex);
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-            if(!UA_NodePointer_isLocal(t->targetId))
-                continue;
-            item.sourceNodeId = UA_NodePointer_toNodeId(t->targetId);
-            Operation_deleteReference(server, session, NULL, &item, &dummy);
-        }
+        UA_NodeReferenceKind_iterate(rk, removeIncomingReferencesCallback, &ctx);
     }
 }
 
+static void *
+checkTargetInRefTree(void *context, UA_ReferenceTarget *t) {
+    RefTree *refTree = (RefTree*)context;
+    if(!UA_NodePointer_isLocal(t->targetId))
+        return NULL;
+    UA_NodeId tmpId = UA_NodePointer_toNodeId(t->targetId);
+    if(!RefTree_containsNodeId(refTree, &tmpId))
+        return (void*)0x1;
+    return NULL;
+}
+
 /* A node is auto-deleted if all its hierarchical parents are being deleted */
 static UA_Boolean
 hasParentRef(const UA_NodeHead *head, const UA_ReferenceTypeSet *refSet,
              RefTree *refTree) {
     for(size_t i = 0; i < head->referencesSize; i++) {
-        const UA_NodeReferenceKind *rk = &head->references[i];
+        UA_NodeReferenceKind *rk = &head->references[i];
         if(!rk->isInverse)
             continue;
         if(!UA_ReferenceTypeSet_contains(refSet, rk->referenceTypeIndex))
             continue;
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-            if(!UA_NodePointer_isLocal(t->targetId))
-                continue;
-            UA_NodeId tmpId = UA_NodePointer_toNodeId(t->targetId);
-            if(!RefTree_containsNodeId(refTree, &tmpId))
-                return true;
-        }
+        if(UA_NodeReferenceKind_iterate(rk, checkTargetInRefTree, refTree) != NULL)
+            return true;
     }
     return false;
 }
@@ -1791,6 +1809,30 @@ deconstructNodeSet(UA_Server *server, UA_Session *session,
     }
 }
 
+struct DeleteChildrenContext {
+    UA_Server *server;
+    const UA_ReferenceTypeSet *hierarchRefsSet;
+    RefTree *refTree;
+    UA_StatusCode res;
+};
+
+static void *
+deleteChildrenCallback(void *context, UA_ReferenceTarget *t) {
+    struct DeleteChildrenContext *ctx = (struct DeleteChildrenContext*)context;
+
+    /* Get the child */
+    const UA_Node *child = UA_NODESTORE_GETFROMREF(ctx->server, t->targetId);
+    if(!child)
+        return NULL;
+
+    /* Only delete child nodes that have no other parent */
+    if(!hasParentRef(&child->head, ctx->hierarchRefsSet, ctx->refTree))
+        ctx->res = RefTree_addNodeId(ctx->refTree, &child->head.nodeId, NULL);
+
+    UA_NODESTORE_RELEASE(ctx->server, child);
+    return (ctx->res == UA_STATUSCODE_GOOD) ? NULL : (void*)0x01;
+}
+
 /* The processNodeLayer function searches all children's of the head node and
  * adds the children node to the RefTree if all incoming references sources are
  * contained in the RefTree (No external references to this node --> node can be
@@ -1798,32 +1840,26 @@ deconstructNodeSet(UA_Server *server, UA_Session *session,
 static UA_StatusCode
 autoDeleteChildren(UA_Server *server, UA_Session *session, RefTree *refTree,
                    const UA_ReferenceTypeSet *hierarchRefsSet, const UA_NodeHead *head){
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    struct DeleteChildrenContext ctx;
+    ctx.server = server;
+    ctx.hierarchRefsSet = hierarchRefsSet;
+    ctx.refTree = refTree;
+    ctx.res = UA_STATUSCODE_GOOD;
+
     for(size_t i = 0; i < head->referencesSize; ++i) {
         /* Check if the ReferenceType is hierarchical */
-        UA_NodeReferenceKind *refs = &head->references[i];
-        if(!UA_ReferenceTypeSet_contains(hierarchRefsSet, refs->referenceTypeIndex))
+        UA_NodeReferenceKind *rk = &head->references[i];
+        if(!UA_ReferenceTypeSet_contains(hierarchRefsSet, rk->referenceTypeIndex))
             continue;
 
         /* Check if the references are forward (to a child) */
-        if(refs->isInverse)
+        if(rk->isInverse)
             continue;
 
         /* Loop over the references */
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(refs, t))) {
-            /* Get the child */
-            const UA_Node *child = UA_NODESTORE_GETFROMREF(server, t->targetId);
-            if(!child)
-                continue;
-
-            /* Only delete child nodes that have no other parent */
-            if(!hasParentRef(&child->head, hierarchRefsSet, refTree))
-                res = RefTree_addNodeId(refTree, &child->head.nodeId, NULL);
-            UA_NODESTORE_RELEASE(server, child);
-            if(res != UA_STATUSCODE_GOOD)
-                return res;
-        }
+        UA_NodeReferenceKind_iterate(rk, deleteChildrenCallback, &ctx);
+        if(ctx.res != UA_STATUSCODE_GOOD)
+            return ctx.res;
     }
     return UA_STATUSCODE_GOOD;
 }
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index c5a45b843a6..0661517490e 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -84,98 +84,97 @@ matchClassMask(const UA_Node *node, UA_UInt32 nodeClassMask) {
 
 /* Internal method to check if a node is already upwards from a leaf node */
 
-/* Keeps track of visited nodes to detect circular references */
-struct ref_history {
-    struct ref_history *parent; /* the previous element */
-    const UA_NodePointer id;    /* the id of the node at this depth */
+static enum ZIP_CMP
+cmpRefTarget(const void *a, const void *b) {
+    const UA_ReferenceTarget *aa = (const UA_ReferenceTarget*)a;
+    const UA_ReferenceTarget *bb = (const UA_ReferenceTarget*)b;
+    return (enum ZIP_CMP)UA_NodePointer_order(aa->targetId, bb->targetId);
+}
+
+typedef ZIP_HEAD(UA_ParentRefsTree, UA_ReferenceTargetTreeElem) UA_ParentRefsTree;
+ZIP_FUNCTIONS(UA_ParentRefsTree, UA_ReferenceTargetTreeElem, idTreeEntry,
+              UA_NodePointer, target, cmpRefTarget)
+
+struct IsNodeInTreeContext {
+    UA_Server *server;
+    UA_NodePointer nodeToFind;
+    UA_ParentRefsTree parents;
+    UA_ReferenceTypeSet relevantRefs;
     UA_UInt16 depth;
 };
 
-static UA_Boolean
-isNodeInTreeNoCircular(UA_Server *server,
-                       UA_NodePointer leafNode,
-                       UA_NodePointer nodeToFind,
-                       struct ref_history *visitedRefs,
-                       const UA_ReferenceTypeSet *relevantRefs) {
-    if(UA_NodePointer_equal(nodeToFind, leafNode))
-        return true;
-
-    if(visitedRefs->depth >= UA_MAX_TREE_RECURSE)
-        return false;
+static void *
+isNodeInTreeIterateCallback(void *context, UA_ReferenceTarget *t) {
+    struct IsNodeInTreeContext *tc =
+        (struct IsNodeInTreeContext*)context;
+
+    /* Don't follow remote targets */
+    if(!UA_NodePointer_isLocal(t->targetId))
+        return NULL;
+
+    /* Found the node? -> return non-NULL */
+    if(UA_NodePointer_equal(tc->nodeToFind, t->targetId))
+        return (void*)0x01;
+
+    /* Prevent endless loop */
+    if(ZIP_FIND(UA_ParentRefsTree, &tc->parents, &t->targetId))
+        return NULL;
+
+    /* Prevent pathological recursion depth */
+    if(tc->depth >= UA_MAX_TREE_RECURSE)
+        return NULL;
 
     /* Get the node without attributes (if the NodeStore supports it) and only
      * the relevant references in inverse direction */
     const UA_Node *node =
-        UA_NODESTORE_GETFROMREF_SELECTIVE(server, leafNode,
+        UA_NODESTORE_GETFROMREF_SELECTIVE(tc->server, t->targetId,
                                           UA_NODEATTRIBUTESMASK_NONE,
-                                          *relevantRefs,
+                                          tc->relevantRefs,
                                           UA_BROWSEDIRECTION_INVERSE);
     if(!node)
-        return false;
+        return NULL;
 
-    for(size_t i = 0; i < node->head.referencesSize; ++i) {
+    /* Add current NodeId to parents tree */
+    UA_ReferenceTargetTreeElem stackElem;
+    stackElem.target = *t;
+    ZIP_INSERT(UA_ParentRefsTree, &tc->parents, &stackElem);
+
+    /* Recurse into appropriate references starting from this tree */
+    tc->depth++;
+    void *res = NULL;
+    for(size_t i = 0; i < node->head.referencesSize && !res; i++) {
         UA_NodeReferenceKind *rk = &node->head.references[i];
         /* Search upwards in the tree */
         if(!rk->isInverse)
             continue;
 
         /* Consider only the indicated reference types */
-        if(!UA_ReferenceTypeSet_contains(relevantRefs, rk->referenceTypeIndex))
+        if(!UA_ReferenceTypeSet_contains(&tc->relevantRefs, rk->referenceTypeIndex))
             continue;
 
-        /* Match the targets or recurse */
-        const UA_ReferenceTarget *t = NULL;
-        while((t = UA_NodeReferenceKind_iterate(rk, t))) {
-            /* Don't follow remote targets */
-            if(!UA_NodePointer_isLocal(t->targetId))
-                continue;
-
-            /* Check if we already have seen the referenced node and skip to
-             * avoid endless recursion. Do this only at every 5th depth to save
-             * effort. Circular dependencies are rare and forbidden for most
-             * reference types. */
-            if(visitedRefs->depth % 5 == 4) {
-                struct ref_history *last = visitedRefs;
-                UA_Boolean skip = false;
-                while(last) {
-                    if(UA_NodePointer_equal(last->id, t->targetId)) {
-                        skip = true;
-                        break;
-                    }
-                    last = last->parent;
-                }
-                if(skip)
-                    continue;
-            }
-
-            /* Stack-allocate the visitedRefs structure for the next depth */
-            struct ref_history nextVisitedRefs = {visitedRefs, t->targetId,
-                                                  (UA_UInt16)(visitedRefs->depth+1)};
-
-            /* Recurse */
-            UA_Boolean foundRecursive =
-                isNodeInTreeNoCircular(server, t->targetId, nodeToFind,
-                                       &nextVisitedRefs, relevantRefs);
-            if(foundRecursive) {
-                UA_NODESTORE_RELEASE(server, node);
-                return true;
-            }
-        }
+        res = UA_NodeReferenceKind_iterate(rk, isNodeInTreeIterateCallback, tc);
     }
+    tc->depth--;
 
-    UA_NODESTORE_RELEASE(server, node);
-    return false;
+    /* Clean up */
+    UA_NODESTORE_RELEASE(tc->server, node);
+    ZIP_REMOVE(UA_ParentRefsTree, &tc->parents, &stackElem);
+    return res;
 }
 
 UA_Boolean
 isNodeInTree(UA_Server *server, const UA_NodeId *leafNode,
              const UA_NodeId *nodeToFind,
              const UA_ReferenceTypeSet *relevantRefs) {
-    UA_NodePointer leafP = UA_NodePointer_fromNodeId(leafNode);
-    UA_NodePointer targetP = UA_NodePointer_fromNodeId(nodeToFind);
-    struct ref_history visitedRefs = {NULL, leafP, 0};
-    return isNodeInTreeNoCircular(server, leafP, targetP,
-                                  &visitedRefs, relevantRefs);
+    struct IsNodeInTreeContext ctx;
+    ctx.server = server;
+    ctx.nodeToFind = UA_NodePointer_fromNodeId(nodeToFind);
+    ctx.parents.root = NULL;
+    ctx.relevantRefs = *relevantRefs;
+    ctx.depth = 0;
+    UA_ReferenceTarget tmpTarget;
+    tmpTarget.targetId = UA_NodePointer_fromNodeId(leafNode);
+    return (isNodeInTreeIterateCallback(&ctx, &tmpTarget) != NULL);
 }
 
 UA_Boolean
@@ -318,66 +317,76 @@ RefTree_containsNodeId(RefTree *rt, const UA_NodeId *target) {
 /* Browse Recursive */
 /********************/
 
-static UA_StatusCode
-browseRecursiveInner(UA_Server *server, RefTree *rt, UA_UInt16 depth, UA_Boolean skip,
-                     UA_NodePointer nodeP, UA_BrowseDirection browseDirection,
-                     const UA_ReferenceTypeSet *refTypes, UA_UInt32 nodeClassMask) {
+struct BrowseRecursiveContext {
+    UA_Server *server;
+    RefTree *rt;
+    UA_UInt16 depth;
+    UA_BrowseDirection browseDirection;
+    UA_ReferenceTypeSet refTypes;
+    UA_UInt32 nodeClassMask;
+    UA_StatusCode status;
+    UA_Boolean includeStartNodes;
+};
+
+static void *
+browseRecursiveCallback(void *context, UA_ReferenceTarget *t) {
+    struct BrowseRecursiveContext *brc =
+        (struct BrowseRecursiveContext*)context;
+
     /* Have we reached the max recursion depth? */
-    if(depth >= UA_MAX_TREE_RECURSE)
-        return UA_STATUSCODE_GOOD;
+    if(brc->depth >= UA_MAX_TREE_RECURSE)
+        return NULL;
+
+    /* Is this a non-local reference? If yes include it in the returned set. */
+    if(!UA_NodePointer_isLocal(t->targetId)) {
+        brc->status = RefTree_add(brc->rt, t->targetId, NULL);
+        return (brc->status == UA_STATUSCODE_GOOD) ? NULL : (void*)0x01;
+    }
 
     /* We only look at the NodeClass attribute and a subset of the references.
      * Get a node with only these elements if the NodeStore supports that. */
     const UA_Node *node =
-        UA_NODESTORE_GETFROMREF_SELECTIVE(server, nodeP,
+        UA_NODESTORE_GETFROMREF_SELECTIVE(brc->server, t->targetId,
                                           UA_NODEATTRIBUTESMASK_NODECLASS,
-                                          *refTypes, browseDirection);
+                                          brc->refTypes, brc->browseDirection);
     if(!node)
-        return UA_STATUSCODE_BADNODEIDUNKNOWN;
+        return NULL;
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    /* Add the current node if we don't want to skip it as a start node and it
+     * matches the nodeClassMask filter Recurse into the children in any
+     * case. */
     const UA_NodeHead *head = &node->head;
-
-    /* Add the current node to the results if we don't want to skip it (i.e. for
-     * includeStartNodes) and it matches the nodeClassMask filter. Process the
-     * children also if the nodeClassMask does not match. */
-    if(!skip && matchClassMask(node, nodeClassMask)) {
+    if((brc->includeStartNodes || brc->depth > 0)  &&
+       matchClassMask(node, brc->nodeClassMask)) {
         UA_Boolean duplicate = false;
-        retval = RefTree_addNodeId(rt, &head->nodeId, &duplicate);
-        if(duplicate || retval != UA_STATUSCODE_GOOD)
+        brc->status = RefTree_addNodeId(brc->rt, &head->nodeId, &duplicate);
+        if(duplicate || brc->status != UA_STATUSCODE_GOOD)
             goto cleanup;
     }
 
-    for(size_t i = 0; i < head->referencesSize; i++) {
+    /* Recurse */
+    brc->depth++;
+    void *res = NULL;
+    for(size_t i = 0; i < head->referencesSize && !res; i++) {
         UA_NodeReferenceKind *rk = &head->references[i];
 
         /* Reference in the right direction? */
-        if(rk->isInverse && browseDirection == UA_BROWSEDIRECTION_FORWARD)
+        if(rk->isInverse && brc->browseDirection == UA_BROWSEDIRECTION_FORWARD)
             continue;
-        if(!rk->isInverse && browseDirection == UA_BROWSEDIRECTION_INVERSE)
+        if(!rk->isInverse && brc->browseDirection == UA_BROWSEDIRECTION_INVERSE)
             continue;
 
         /* Is the reference part of the hierarchy of references we look for? */
-        if(!UA_ReferenceTypeSet_contains(refTypes, rk->referenceTypeIndex))
+        if(!UA_ReferenceTypeSet_contains(&brc->refTypes, rk->referenceTypeIndex))
             continue;
 
-        const UA_ReferenceTarget *target = NULL;
-        while((target = UA_NodeReferenceKind_iterate(rk, target))) {
-            if(UA_NodePointer_isLocal(target->targetId)) {
-                retval = browseRecursiveInner(server, rt, (UA_UInt16)(depth+1), false,
-                                              target->targetId, browseDirection,
-                                              refTypes, nodeClassMask);
-            } else {
-                retval = RefTree_add(rt, target->targetId, NULL);
-            }
-            if(retval != UA_STATUSCODE_GOOD)
-                goto cleanup;
-        }
+        res = UA_NodeReferenceKind_iterate(rk, browseRecursiveCallback, brc);
     }
+    brc->depth--;
 
  cleanup:
-    UA_NODESTORE_RELEASE(server, node);
-    return retval;
+    UA_NODESTORE_RELEASE(brc->server, node);
+    return (brc->status == UA_STATUSCODE_GOOD) ? NULL : (void*)0x01;
 }
 
 UA_StatusCode
@@ -390,33 +399,42 @@ browseRecursive(UA_Server *server, size_t startNodesSize, const UA_NodeId *start
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    for(size_t i = 0; i < startNodesSize; i++) {
+    struct BrowseRecursiveContext brc;
+    brc.server = server;
+    brc.rt = &rt;
+    brc.depth = 0;
+    brc.refTypes = *refTypes;
+    brc.nodeClassMask = nodeClassMask;
+    brc.status = UA_STATUSCODE_GOOD;
+    brc.includeStartNodes = includeStartNodes;
+
+    for(size_t i = 0; i < startNodesSize && brc.status == UA_STATUSCODE_GOOD; i++) {
+        UA_ReferenceTarget target;
+        target.targetId = UA_NodePointer_fromNodeId(&startNodes[i]);
+
         /* Call the inner recursive browse separately for the search direction.
          * Otherwise we might take one step up and another step down in the
          * search tree. */
         if(browseDirection == UA_BROWSEDIRECTION_FORWARD ||
-           browseDirection == UA_BROWSEDIRECTION_BOTH)
-            retval |= browseRecursiveInner(server, &rt, 0, !includeStartNodes,
-                                           UA_NodePointer_fromNodeId(&startNodes[i]),
-                                           UA_BROWSEDIRECTION_FORWARD,
-                                           refTypes, nodeClassMask);
+           browseDirection == UA_BROWSEDIRECTION_BOTH) {
+            brc.browseDirection = UA_BROWSEDIRECTION_FORWARD;
+            browseRecursiveCallback(&brc, &target);
+        }
+
         if(browseDirection == UA_BROWSEDIRECTION_INVERSE ||
-           browseDirection == UA_BROWSEDIRECTION_BOTH)
-            retval |= browseRecursiveInner(server, &rt, 0, !includeStartNodes,
-                                           UA_NodePointer_fromNodeId(&startNodes[i]),
-                                           UA_BROWSEDIRECTION_INVERSE,
-                                           refTypes, nodeClassMask);
-        if(retval != UA_STATUSCODE_GOOD)
-            break;
+           browseDirection == UA_BROWSEDIRECTION_BOTH) {
+            brc.browseDirection = UA_BROWSEDIRECTION_INVERSE;
+            browseRecursiveCallback(&brc, &target);
+        }
     }
 
-    if(rt.size > 0 && retval == UA_STATUSCODE_GOOD) {
+    if(rt.size > 0 && brc.status == UA_STATUSCODE_GOOD) {
         *results = rt.targets;
         *resultsSize = rt.size;
     } else {
         RefTree_clear(&rt);
     }
-    return retval;
+    return brc.status;
 }
 
 UA_StatusCode
@@ -493,136 +511,162 @@ struct ContinuationPoint {
     UA_UInt32 maxReferences;
     UA_ReferenceTypeSet relevantReferences;
 
-    /* The next target to be transmitted to the client */
-    UA_ExpandedNodeId nextTarget;
-    UA_Byte nextRefKindIndex;
+    /* The last reference target that was transmitted to the client. The results
+     * list may be incomplete if the last target is removed or references added
+     * between the calls to Browse/BrowseNext. */
+    UA_NodePointer lastTarget;
+    UA_Byte lastRefKindIndex;
 };
 
 ContinuationPoint *
 ContinuationPoint_clear(ContinuationPoint *cp) {
     UA_ByteString_clear(&cp->identifier);
     UA_BrowseDescription_clear(&cp->browseDescription);
-    UA_ExpandedNodeId_clear(&cp->nextTarget);
+    UA_NodePointer_clear(&cp->lastTarget);
     return cp->next;
 }
 
+struct BrowseContext {
+    /* Context */
+    ContinuationPoint *cp;
+    UA_Server *server;
+    UA_Session *session;
+    UA_NodeReferenceKind *rk;
+    UA_ReferenceTypeSet resultRefs; /* With additional references for type
+                                     * lookups */
+    UA_Boolean activeCP; /* true during "forwarding" to the position of the last
+                          * reference target */
+
+    /* Results */
+    RefResult rr;
+    UA_StatusCode status;
+    UA_Boolean done;
+};
+
 /* Target node on top of the stack */
-static UA_StatusCode UA_FUNC_ATTR_WARN_UNUSED_RESULT
-addReferenceDescription(UA_Server *server, const UA_Session *session, RefResult *rr,
-                        const UA_NodeReferenceKind *ref, UA_UInt32 mask,
-                        UA_NodePointer nodeP, const UA_Node *curr) {
+static UA_StatusCode
+addReferenceDescription(struct BrowseContext *bc, UA_NodePointer nodeP,
+                        const UA_Node *curr) {
+    UA_assert(curr);
+    UA_BrowseDescription *bd = &bc->cp->browseDescription;
+
     /* Ensure capacity is left */
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(rr->size >= rr->capacity) {
-        retval = RefResult_double(rr);
-        if(retval != UA_STATUSCODE_GOOD)
-           return retval;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(bc->rr.size >= bc->rr.capacity) {
+        res = RefResult_double(&bc->rr);
+        if(res != UA_STATUSCODE_GOOD)
+           return res;
     }
 
-    UA_ReferenceDescription *descr = &rr->descr[rr->size];
+    UA_ReferenceDescription *descr = &bc->rr.descr[bc->rr.size];
 
     /* Fields without access to the actual node */
     UA_ExpandedNodeId en = UA_NodePointer_toExpandedNodeId(nodeP);
-    retval = UA_ExpandedNodeId_copy(&en, &descr->nodeId);
-    if(mask & UA_BROWSERESULTMASK_REFERENCETYPEID) {
+    res = UA_ExpandedNodeId_copy(&en, &descr->nodeId);
+    if(bd->resultMask & UA_BROWSERESULTMASK_REFERENCETYPEID) {
         const UA_NodeId *refTypeId =
-            UA_NODESTORE_GETREFERENCETYPEID(server, ref->referenceTypeIndex);
-        retval |= UA_NodeId_copy(refTypeId, &descr->referenceTypeId);
-    }
-    if(mask & UA_BROWSERESULTMASK_ISFORWARD)
-        descr->isForward = !ref->isInverse;
-
-    /* Remote references (ExpandedNodeId) are not further looked up here */
-    if(!curr) {
-        UA_ReferenceDescription_clear(descr);
-        return retval;
+            UA_NODESTORE_GETREFERENCETYPEID(bc->server, bc->rk->referenceTypeIndex);
+        res |= UA_NodeId_copy(refTypeId, &descr->referenceTypeId);
     }
+    if(bd->resultMask & UA_BROWSERESULTMASK_ISFORWARD)
+        descr->isForward = !bc->rk->isInverse;
 
-    /* Fields that require the actual node */
-    if(mask & UA_BROWSERESULTMASK_NODECLASS)
+    /* Create fields that require access to the actual node */
+    if(bd->resultMask & UA_BROWSERESULTMASK_NODECLASS)
         descr->nodeClass = curr->head.nodeClass;
-    if(mask & UA_BROWSERESULTMASK_BROWSENAME)
-        retval |= UA_QualifiedName_copy(&curr->head.browseName, &descr->browseName);
-    if(mask & UA_BROWSERESULTMASK_DISPLAYNAME) {
+
+    if(bd->resultMask & UA_BROWSERESULTMASK_BROWSENAME)
+        res |= UA_QualifiedName_copy(&curr->head.browseName,
+                                     &descr->browseName);
+
+    if(bd->resultMask & UA_BROWSERESULTMASK_DISPLAYNAME) {
         UA_LocalizedText displayname =
-            UA_Session_getNodeDisplayName(session, &curr->head);
-        retval |= UA_LocalizedText_copy(&displayname, &descr->displayName);
+            UA_Session_getNodeDisplayName(bc->session, &curr->head);
+        res |= UA_LocalizedText_copy(&displayname, &descr->displayName);
     }
-    if(mask & UA_BROWSERESULTMASK_TYPEDEFINITION) {
+
+    if(bd->resultMask & UA_BROWSERESULTMASK_TYPEDEFINITION) {
         if(curr->head.nodeClass == UA_NODECLASS_OBJECT ||
            curr->head.nodeClass == UA_NODECLASS_VARIABLE) {
-            const UA_Node *type = getNodeType(server, &curr->head);
+            const UA_Node *type = getNodeType(bc->server, &curr->head);
             if(type) {
-                retval |= UA_NodeId_copy(&type->head.nodeId, &descr->typeDefinition.nodeId);
-                UA_NODESTORE_RELEASE(server, type);
+                res |= UA_NodeId_copy(&type->head.nodeId,
+                                      &descr->typeDefinition.nodeId);
+                UA_NODESTORE_RELEASE(bc->server, type);
             }
         }
     }
 
-    if(retval == UA_STATUSCODE_GOOD)
-        rr->size++; /* Increase the counter */
-    else
+    /* Clean up and return */
+    if(res != UA_STATUSCODE_GOOD) {
         UA_ReferenceDescription_clear(descr);
-    return retval;
+        return res;
+    }
+    bc->rr.size++;
+    return UA_STATUSCODE_GOOD;
 }
 
-/* Returns whether the node / continuationpoint is done */
-static UA_StatusCode
-browseReferences(UA_Server *server, const UA_Session *session, const UA_NodeHead *head,
-                 ContinuationPoint *cp, RefResult *rr, UA_Boolean *done) {
-    UA_assert(cp);
-    const UA_BrowseDescription *bd = &cp->browseDescription;
-
-    size_t i = 0;
-    const UA_ReferenceTarget *ref = NULL;
+static void *
+browseReferencTargetCallback(void *context, UA_ReferenceTarget *t) {
+    struct BrowseContext *bc = (struct BrowseContext*)context;
+    const UA_BrowseDescription *bd = &bc->cp->browseDescription;
+    ContinuationPoint *cp = bc->cp;
+
+    /* Remote references are ignored */
+    if(!UA_NodePointer_isLocal(t->targetId))
+        return NULL;
+    
+    /* Get the node. Include only the ReferenceTypes we are interested in,
+     * including those for figuring out the TypeDefinition (if that was
+     * requested). */
+    const UA_Node *target =
+        UA_NODESTORE_GETFROMREF_SELECTIVE(bc->server, t->targetId,
+                                          resultMask2AttributesMask(bd->resultMask),
+                                          bc->resultRefs, bd->browseDirection);
+    if(!target)
+        return NULL;
+    
+    /* The node class has to match */
+    if(!matchClassMask(target, bd->nodeClassMask)) {
+        UA_NODESTORE_RELEASE(bc->server, target);
+        return NULL;
+    }
+    
+    /* Reached maxrefs. Return the "abort" signal. */
+    if(bc->rr.size >= cp->maxReferences) {
+        UA_NODESTORE_RELEASE(bc->server, target);
+        return (void*)0x01;
+    }
 
-    /* If the cp was previously used, skip forward to the next ReferenceType to
-     * be transmitted. */
-    if(cp->identifier.length > 0) {
-        for(; i < head->referencesSize; ++i) {
-            UA_NodeReferenceKind *rk = &head->references[i];
+    /* Create the reference description */
+    bc->status = addReferenceDescription(bc, t->targetId, target);
 
-            /* Was this the last transmitted ReferenceType? */
-            if(head->references[i].referenceTypeIndex != cp->nextRefKindIndex)
-                continue;
+    /* Release the node */
+    UA_NODESTORE_RELEASE(bc->server, target);
 
-            /* Reference in the right direction? */
-            if(rk->isInverse && bd->browseDirection == UA_BROWSEDIRECTION_FORWARD)
-                continue;
-            if(!rk->isInverse && bd->browseDirection == UA_BROWSEDIRECTION_INVERSE)
-                continue;
-
-            /* Get the next target */
-            ref = UA_NodeReferenceKind_findTarget(rk, &cp->nextTarget);
-            if(ref)
-                break;
+    /* Store as last target. The itarget-id is a shallow copy for now. */
+    cp->lastTarget = t->targetId;
+    cp->lastRefKindIndex = bc->rk->referenceTypeIndex;
 
-            /* The target no longer exists for this ReferenceType (and
-             * direction). Continue to iterate for the case that a nodestore has
-             * a duplicate UA_NodeReferenceKind (should not happen though). */
-        }
-
-        /* Fail with an error if the reference no longer exists. */
-        if(!ref)
-            return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Get the node with additional reference types if we need to lookup the
-     * TypeDefinition */
-    UA_ReferenceTypeSet resultRefs = cp->relevantReferences;
-    if(bd->resultMask & UA_BROWSERESULTMASK_TYPEDEFINITION) {
-        resultRefs = UA_ReferenceTypeSet_union(resultRefs,
-                                               UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASTYPEDEFINITION));
-        resultRefs = UA_ReferenceTypeSet_union(resultRefs,
-                                               UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASSUBTYPE));
-    }
+    /* Abort the iteration if the status is not good */
+    return (bc->status == UA_STATUSCODE_GOOD) ? NULL : (void*)0x01;
+}
 
-    /* Loop over the ReferenceTypes */
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+/* Returns whether the node / continuationpoint is done */
+static void
+browseWithNode(struct BrowseContext *bc, const UA_NodeHead *head ) {
+    ContinuationPoint *cp = bc->cp;
+    const UA_BrowseDescription *bd = &cp->browseDescription;
 
-    for(; i < head->referencesSize; ++i) {
+    /* Loop over the ReferenceKinds */
+    for(size_t i = 0; i < head->referencesSize && bc->status == UA_STATUSCODE_GOOD; ++i) {
         UA_NodeReferenceKind *rk = &head->references[i];
 
+        /* If the continuation point was previously used, skip forward to the
+         * last ReferenceType that was transmitted */
+        if(bc->activeCP && rk->referenceTypeIndex != cp->lastRefKindIndex)
+            continue;
+
         /* Reference in the right direction? */
         if(rk->isInverse && bd->browseDirection == UA_BROWSEDIRECTION_FORWARD)
             continue;
@@ -630,67 +674,85 @@ browseReferences(UA_Server *server, const UA_Session *session, const UA_NodeHead
             continue;
 
         /* Is the reference part of the hierarchy of references we look for? */
-        if(!UA_ReferenceTypeSet_contains(&cp->relevantReferences,
-                                         rk->referenceTypeIndex))
+        if(!UA_ReferenceTypeSet_contains(&cp->relevantReferences, rk->referenceTypeIndex))
             continue;
 
-        /* We have a matching ReferenceType! */
-
-        /* Loop over the targets for the ReferenceType. Start with the first
-         * entry if we don't have a known entry-point from the cp. */
-        if(!ref)
-            ref = UA_NodeReferenceKind_iterate(rk, ref);
-        for(;ref; ref = UA_NodeReferenceKind_iterate(rk, ref)) {
-            /* Get the node (NULL if is a remote reference). Include only the
-             * ReferenceTypes we are interested in, including those for figuring
-             * out the TypeDefinition (if that was requested). */
-            const UA_Node *target =
-                UA_NODESTORE_GETFROMREF_SELECTIVE(server, ref->targetId,
-                                                  resultMask2AttributesMask(bd->resultMask),
-                                                  resultRefs, bd->browseDirection);
-
-            /* Test if the node class matches */
-            if(target && !matchClassMask(target, bd->nodeClassMask)) {
-                UA_NODESTORE_RELEASE(server, target);
-                continue;
+        /* We have a matching ReferenceKind */
+
+        /* Skip ahead to the target where the last continuation point stopped.
+         * This temporarily modifies rk. */
+        UA_ReferenceIdTree left = {NULL}, right = {NULL};
+        size_t nextTargetIndex = 0;
+        if(bc->activeCP) {
+            if(rk->hasRefTree) {
+                /* Unzip the tree until the continuation point. All NodeIds
+                 * larger than the last target are guaranteed to sit on the
+                 * right-hand side. */
+                UA_ExpandedNodeId lastEn =
+                    UA_NodePointer_toExpandedNodeId(cp->lastTarget);
+                UA_ReferenceTargetTreeElem key;
+                key.target.targetId = cp->lastTarget;
+                key.targetIdHash = UA_ExpandedNodeId_hash(&lastEn);
+                ZIP_UNZIP(UA_ReferenceIdTree, &rk->targets.tree.idTree,
+                          &key, &left, &right);
+                rk->targets.tree.idTree = right;
+            } else {
+                /* Iterate over the array to find the match */
+                for(; nextTargetIndex < rk->targetsSize; nextTargetIndex++) {
+                    UA_ReferenceTarget *t = &rk->targets.array[nextTargetIndex];
+                    if(UA_NodePointer_equal(cp->lastTarget, t->targetId))
+                        break;
+                }
+                if(nextTargetIndex == rk->targetsSize) {
+                    /* Not found - assume that this reference kind is done */
+                    bc->activeCP = false;
+                    continue;
+                }
+                nextTargetIndex++; /* From the last index to the next index */
+                rk->targets.array = &rk->targets.array[nextTargetIndex];
+                rk->targetsSize -= nextTargetIndex;
             }
+        }
 
-            /* We have a matching target! */
-
-            /* Reached maxrefs. Update the cp and bail. */
-            if(rr->size >= cp->maxReferences) {
-                if(target)
-                    UA_NODESTORE_RELEASE(server, target);
-                cp->nextRefKindIndex = rk->referenceTypeIndex;
-                /* Make a deep copy */
-                UA_ExpandedNodeId tmpEn =
-                    UA_NodePointer_toExpandedNodeId(ref->targetId);
-                return UA_ExpandedNodeId_copy(&tmpEn, &cp->nextTarget);
+        /* Iterate over all reference targets */
+        bc->rk = rk;
+        void *res = UA_NodeReferenceKind_iterate(rk, browseReferencTargetCallback, bc);
+
+        /* Undo the "skipping ahead" for the continuation point */
+        if(bc->activeCP) {
+            if(rk->hasRefTree) {
+                rk->targets.tree.idTree.root =
+                    ZIP_ZIP(UA_ReferenceIdTree, left.root, right.root);
+            } else {
+                /* rk->targets.array = rk->targets.array[-nextTargetIndex]; */
+                rk->targets.array = rk->targets.array - nextTargetIndex;
+                rk->targetsSize += nextTargetIndex;
+                UA_assert(rk->targetsSize > 0);
             }
+            bc->activeCP = false;
+        }
 
-            /* Copy the node description. Target is on top of the stack */
-            retval = addReferenceDescription(server, session, rr, rk, bd->resultMask,
-                                             ref->targetId, target);
-            if(target)
-                UA_NODESTORE_RELEASE(server, target);
-            if(retval != UA_STATUSCODE_GOOD)
-                return retval;
+        /* The iteration was aborted */
+        if(res != NULL) {
+            /* Aborted with status code good. The continuation point picks up
+             * from the last target. Make a deep copy of the last target. */
+            if(bc->status == UA_STATUSCODE_GOOD)
+                bc->status = UA_NodePointer_copy(cp->lastTarget, &cp->lastTarget);
+            return;
         }
     }
 
-    /* The node is done */
-    *done = true;
-    return UA_STATUSCODE_GOOD;
+    /* Browsing the node is done */
+    bc->done = true;
 }
 
 /* Results for a single browsedescription. This is the inner loop for both
  * Browse and BrowseNext. The ContinuationPoint contains all the data used.
  * Including the BrowseDescription. Returns whether there are remaining
  * references. */
-static UA_Boolean
-browseWithContinuation(UA_Server *server, UA_Session *session,
-                       ContinuationPoint *cp, UA_BrowseResult *result) {
-    UA_assert(cp);
+static void
+browse(struct BrowseContext *bc, UA_BrowseResult *result) {
+    struct ContinuationPoint *cp = bc->cp;
     const UA_BrowseDescription *descr = &cp->browseDescription;
 
     /* Is the browsedirection valid? */
@@ -698,77 +760,70 @@ browseWithContinuation(UA_Server *server, UA_Session *session,
        descr->browseDirection != UA_BROWSEDIRECTION_FORWARD &&
        descr->browseDirection != UA_BROWSEDIRECTION_INVERSE) {
         result->statusCode = UA_STATUSCODE_BADBROWSEDIRECTIONINVALID;
-        return true;
+        return;
     }
 
     /* Is the reference type valid? */
     if(!UA_NodeId_isNull(&descr->referenceTypeId)) {
         const UA_Node *reftype =
-            UA_NODESTORE_GET_SELECTIVE(server, &descr->referenceTypeId,
+            UA_NODESTORE_GET_SELECTIVE(bc->server, &descr->referenceTypeId,
                                        UA_NODEATTRIBUTESMASK_NODECLASS,
                                        UA_REFERENCETYPESET_NONE,
                                        UA_BROWSEDIRECTION_INVALID);
         if(!reftype) {
             result->statusCode = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
-            return true;
+            return;
         }
 
         UA_Boolean isRef = (reftype->head.nodeClass == UA_NODECLASS_REFERENCETYPE);
-        UA_NODESTORE_RELEASE(server, reftype);
+        UA_NODESTORE_RELEASE(bc->server, reftype);
 
         if(!isRef) {
             result->statusCode = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
-            return true;
+            return;
         }
     }
 
     /* Get node with only the selected references and attributes */
     const UA_Node *node =
-        UA_NODESTORE_GET_SELECTIVE(server, &descr->nodeId,
+        UA_NODESTORE_GET_SELECTIVE(bc->server, &descr->nodeId,
                                    resultMask2AttributesMask(descr->resultMask),
-                                   cp->relevantReferences, descr->browseDirection);
+                                   bc->resultRefs, descr->browseDirection);
     if(!node) {
-        result->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
-        return true;
+        bc->status = UA_STATUSCODE_BADNODEIDUNKNOWN;
+        return;
     }
 
-    if(session != &server->adminSession &&
-       !server->config.accessControl.
-         allowBrowseNode(server, &server->config.accessControl,
-                         &session->sessionId, session->sessionHandle,
+    /* Check AccessControl rights */
+    if(bc->session != &bc->server->adminSession &&
+       !bc->server->config.accessControl.
+         allowBrowseNode(bc->server, &bc->server->config.accessControl,
+                         &bc->session->sessionId, bc->session->sessionHandle,
                          &descr->nodeId, node->head.context)) {
-        result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
-        UA_NODESTORE_RELEASE(server, node);
-        return true;
+        UA_NODESTORE_RELEASE(bc->server, node);
+        bc->status = UA_STATUSCODE_BADUSERACCESSDENIED;
+        return;
     }
 
-    RefResult rr;
-    result->statusCode = RefResult_init(&rr);
-    if(result->statusCode != UA_STATUSCODE_GOOD) {
-        UA_NODESTORE_RELEASE(server, node);
-        return true;
-    }
+    /* Browse the node */
+    browseWithNode(bc, &node->head);
+    UA_NODESTORE_RELEASE(bc->server, node);
 
-    /* Browse the references */
-    UA_Boolean done = false;
-    result->statusCode = browseReferences(server, session, &node->head, cp, &rr, &done);
-    UA_NODESTORE_RELEASE(server, node);
-    if(result->statusCode != UA_STATUSCODE_GOOD) {
-        RefResult_clear(&rr);
-        return true;
+    if(bc->status != UA_STATUSCODE_GOOD) {
+        result->statusCode = bc->status;
+        RefResult_clear(&bc->rr);
+        return;
     }
 
     /* Move results */
-    if(rr.size > 0) {
-        result->references = rr.descr;
-        result->referencesSize = rr.size;
+    if(bc->rr.size > 0) {
+        result->references = bc->rr.descr;
+        result->referencesSize = bc->rr.size;
     } else {
         /* No relevant references, return array of length zero */
-        RefResult_clear(&rr);
+        RefResult_clear(&bc->rr);
         result->references = (UA_ReferenceDescription*)UA_EMPTY_ARRAY_SENTINEL;
     }
-
-    return done;
 }
 
 /* Start to browse with no previous cp */
@@ -802,13 +857,34 @@ Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxref
     if(result->statusCode != UA_STATUSCODE_GOOD)
         return;
 
-    UA_Boolean done = browseWithContinuation(server, session, &cp, result);
+    /* Prepare the context */
+    struct BrowseContext bc;
+    bc.cp = &cp;
+    bc.server = server;
+    bc.session = session;
+    bc.status = UA_STATUSCODE_GOOD;
+    bc.done = false;
+    bc.activeCP = false;
+    bc.resultRefs = cp.relevantReferences;
+    if(cp.browseDescription.resultMask & UA_BROWSERESULTMASK_TYPEDEFINITION) {
+        /* Get the node with additional reference types if we need to lookup the
+         * TypeDefinition */
+        bc.resultRefs = UA_ReferenceTypeSet_union(bc.resultRefs,
+              UA_ReferenceTypeSet_union(UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASTYPEDEFINITION),
+                                        UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASSUBTYPE)));
+    }
+    result->statusCode = RefResult_init(&bc.rr);
+    if(result->statusCode != UA_STATUSCODE_GOOD)
+        return;
+
+    /* Perform the browse */
+    browse(&bc, result);
 
-    /* Exit early if done or an error occurred */
-    if(done || result->statusCode != UA_STATUSCODE_GOOD)
+    /* Exit early if done */
+    if(bc.done || result->statusCode != UA_STATUSCODE_GOOD)
         return;
 
-    /* Persist the new continuation point */
+    /* Persist the continuation point */
 
     ContinuationPoint *cp2 = NULL;
     UA_Guid *ident = NULL;
@@ -821,21 +897,20 @@ Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxref
     }
 
     /* Allocate and fill the data structure */
-    cp2 = (ContinuationPoint*)UA_malloc(sizeof(ContinuationPoint));
+    cp2 = (ContinuationPoint*)UA_calloc(1, sizeof(ContinuationPoint));
     if(!cp2) {
         retval = UA_STATUSCODE_BADOUTOFMEMORY;
         goto cleanup;
     }
 
-    memset(cp2, 0, sizeof(ContinuationPoint));
-    /* The BrowseDescription is only a shallow copy in cp */
+    /* The BrowseDescription is only a shallow copy so far */
     retval = UA_BrowseDescription_copy(descr, &cp2->browseDescription);
     if(retval != UA_STATUSCODE_GOOD)
         goto cleanup;
     cp2->maxReferences = cp.maxReferences;
     cp2->relevantReferences = cp.relevantReferences;
-    cp2->nextTarget = cp.nextTarget;
-    cp2->nextRefKindIndex = cp.nextRefKindIndex;
+    cp2->lastTarget = cp.lastTarget;
+    cp2->lastRefKindIndex = cp.lastRefKindIndex;
 
     /* Create a random bytestring via a Guid */
     ident = UA_Guid_new();
@@ -931,16 +1006,36 @@ Operation_BrowseNext(UA_Server *server, UA_Session *session,
         return;
     }
 
+    /* Prepare the context */
+    struct BrowseContext bc;
+    bc.cp = cp;
+    bc.server = server;
+    bc.session = session;
+    bc.status = UA_STATUSCODE_GOOD;
+    bc.done = false;
+    bc.activeCP = true;
+    bc.resultRefs = cp->relevantReferences;
+    if(cp->browseDescription.resultMask & UA_BROWSERESULTMASK_TYPEDEFINITION) {
+        /* Get the node with additional reference types if we need to lookup the
+         * TypeDefinition */
+        bc.resultRefs = UA_ReferenceTypeSet_union(bc.resultRefs,
+              UA_ReferenceTypeSet_union(UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASTYPEDEFINITION),
+                                        UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASSUBTYPE)));
+    }
+    result->statusCode = RefResult_init(&bc.rr);
+    if(result->statusCode != UA_STATUSCODE_GOOD)
+        return;
+
     /* Continue browsing */
-    UA_Boolean done = browseWithContinuation(server, session, cp, result);
+    browse(&bc, result);
 
-    if(done) {
-        /* Remove the cp if there are no references left */
+    if(bc.done || result->statusCode != UA_STATUSCODE_GOOD) {
+        /* Remove the cp */
         *prev = ContinuationPoint_clear(cp);
         UA_free(cp);
         ++session->availableContinuationPoints;
     } else {
-        /* Return the cp identifier */
+        /* Return the cp identifier to signal that there are references left */
         UA_StatusCode retval =
             UA_ByteString_copy(&cp->identifier, &result->continuationPoint);
         if(retval != UA_STATUSCODE_GOOD) {
@@ -989,20 +1084,13 @@ UA_Server_browseNext(UA_Server *server, UA_Boolean releaseContinuationPoint,
 /* Find all entries for that hash. There are duplicate for the possible hash
  * collisions. The exact browsename is checked afterwards. */
 static UA_StatusCode
-recursiveAddBrowseHashTarget(RefTree *results, struct aa_head *head,
-                             const UA_ReferenceTarget *rt) {
-    UA_assert(rt);
-    UA_StatusCode res = RefTree_add(results, rt->targetId, NULL);
-    UA_ReferenceTarget *prev = (UA_ReferenceTarget*)aa_prev(head, rt);
-    while(prev && prev->targetNameHash == rt->targetNameHash) {
-        res |= RefTree_add(results, prev->targetId, NULL);
-        prev = (UA_ReferenceTarget*)aa_prev(head, prev);
-    }
-    UA_ReferenceTarget *next= (UA_ReferenceTarget*)aa_next(head, rt);
-    while(next && next->targetNameHash == rt->targetNameHash) {
-        res |= RefTree_add(results, next->targetId, NULL);
-        next = (UA_ReferenceTarget*)aa_next(head, next);
-    }
+addBrowseHashTargetRecursive(UA_UInt32 browseNameHash, UA_ReferenceTargetTreeElem *elem,
+                             RefTree *next) {
+    if(!elem || elem->target.targetNameHash != browseNameHash)
+        return UA_STATUSCODE_GOOD;
+    UA_StatusCode res = RefTree_add(next, elem->target.targetId, NULL);
+    res |= addBrowseHashTargetRecursive(browseNameHash, elem->nameTreeEntry.left, next);
+    res |= addBrowseHashTargetRecursive(browseNameHash, elem->nameTreeEntry.right, next);
     return res;
 }
 
@@ -1023,8 +1111,6 @@ walkBrowsePathElement(UA_Server *server, UA_Session *session,
     if(res != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADNOMATCH;
 
-    struct aa_head _refNameTree = refNameTree;
-
     /* Loop over all Nodes in the current depth level */
     for(size_t i = 0; i < current->size; i++) {
         /* Remote Node. Immediately add to the results with the
@@ -1075,6 +1161,8 @@ walkBrowsePathElement(UA_Server *server, UA_Session *session,
         }
 
         /* Loop over the ReferenceKinds */
+        UA_ReferenceTarget targetHashKey;
+        targetHashKey.targetNameHash = browseNameHash;
         for(size_t j = 0; j < node->head.referencesSize; j++) {
             UA_NodeReferenceKind *rk = &node->head.references[j];
 
@@ -1086,18 +1174,16 @@ walkBrowsePathElement(UA_Server *server, UA_Session *session,
             if(!UA_ReferenceTypeSet_contains(&refTypes, rk->referenceTypeIndex))
                 continue;
 
-            if(rk->hasRefTree) {
-                /* Retrieve by BrowseName hash. We might have several nodes where
-                 * the hash matches. The exact BrowseName will be verified in the
-                 * next iteration of the outer loop. So we only have to retrieve
-                 * every node just once. */
-                _refNameTree.root = rk->targets.tree.nameTreeRoot;
-                UA_ReferenceTarget *rt = (UA_ReferenceTarget*)
-                    aa_find(&_refNameTree, &browseNameHash);
-                if(!rt)
-                    continue;
+            /* Retrieve by BrowseName hash. We might have several nodes where
+             * the hash matches. The exact BrowseName will be verified in the
+             * next iteration of the outer loop. So we only have to retrieve
+             * every node just once. */
 
-                res = recursiveAddBrowseHashTarget(next, &_refNameTree, rt);
+            if(rk->hasRefTree) {
+                UA_ReferenceTargetTreeElem *elm =
+                    ZIP_FIND(UA_ReferenceNameTree, &rk->targets.tree.nameTree,
+                             &targetHashKey);
+                res = addBrowseHashTargetRecursive(browseNameHash, elm, next);
                 if(res != UA_STATUSCODE_GOOD)
                     break;
             } else {
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index a54b9ec641d..ff5662f9f00 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -364,17 +364,25 @@ UA_Server_callConditionTwoStateVariableCallback(UA_Server *server, const UA_Node
     return res;
 }
 
+static void *
+copyFieldParent(void *context, UA_ReferenceTarget *t) {
+    UA_NodeId *parent = (UA_NodeId*)context;
+    if(!UA_NodePointer_isLocal(t->targetId))
+        return NULL;
+    UA_NodeId tmpNodeId = UA_NodePointer_toNodeId(t->targetId);
+    UA_StatusCode res = UA_NodeId_copy(&tmpNodeId, parent);
+    return (res == UA_STATUSCODE_GOOD) ? (void*)0x1 : NULL;
+}
+
 /* Gets the parent NodeId of a Field (e.g. Severity) or Field Property (e.g.
  * EnabledState/Id) */
 static UA_StatusCode
 getFieldParentNodeId(UA_Server *server, const UA_NodeId *field, UA_NodeId *parent) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
     *parent = UA_NODEID_NULL;
     const UA_Node *fieldNode = UA_NODESTORE_GET(server, field);
     if(!fieldNode)
         return UA_STATUSCODE_BADNOTFOUND;
-    UA_StatusCode retval = UA_STATUSCODE_BADNOTFOUND;
     for(size_t i = 0; i < fieldNode->head.referencesSize; i++) {
         UA_NodeReferenceKind *rk = &fieldNode->head.references[i];
         if(rk->referenceTypeIndex != UA_REFERENCETYPEINDEX_HASPROPERTY &&
@@ -383,18 +391,14 @@ getFieldParentNodeId(UA_Server *server, const UA_NodeId *field, UA_NodeId *paren
         if(!rk->isInverse)
             continue;
         /* Take the first hierarchical inverse reference */
-        const UA_ReferenceTarget *target = NULL;
-        while((target = UA_NodeReferenceKind_iterate(rk, target))) {
-            if(!UA_NodePointer_isLocal(target->targetId))
-                continue;
-            UA_NodeId tmpNodeId = UA_NodePointer_toNodeId(target->targetId);
-            retval = UA_NodeId_copy(&tmpNodeId, parent);
-            goto finish;
+        void *success = UA_NodeReferenceKind_iterate(rk, copyFieldParent, parent);
+        if(success) {
+            UA_NODESTORE_RELEASE(server, (const UA_Node *)fieldNode);
+            return UA_STATUSCODE_GOOD;
         }
     }
- finish:
     UA_NODESTORE_RELEASE(server, (const UA_Node *)fieldNode);
-    return retval;
+    return UA_STATUSCODE_BADNOTFOUND;
 }
 
 static UA_StatusCode

From 9f4b099aac7e1a3d4e5a7043e6a7dbed38d938a5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 30 Dec 2022 00:04:20 +0100
Subject: [PATCH 0609/1963] refactor(deps): Remove unused AA-Tree
 implementation

---
 CMakeLists.txt |   2 -
 deps/aa_tree.c | 256 -------------------------------------------------
 deps/aa_tree.h |  53 ----------
 3 files changed, 311 deletions(-)
 delete mode 100644 deps/aa_tree.c
 delete mode 100644 deps/aa_tree.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 416fa3ae7ed..208ed32f3d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -958,7 +958,6 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/securitypolicy.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/pubsub.h
                      ${PROJECT_SOURCE_DIR}/deps/ziptree.h
-                     ${PROJECT_SOURCE_DIR}/deps/aa_tree.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/eventloop.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h
                      ${historizing_exported_headers}
@@ -1047,7 +1046,6 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/deps/pcg_basic.c
                 ${PROJECT_SOURCE_DIR}/deps/base64.c
                 ${PROJECT_SOURCE_DIR}/deps/itoa.c
-                ${PROJECT_SOURCE_DIR}/deps/aa_tree.c
                 ${PROJECT_SOURCE_DIR}/deps/ziptree.c
 
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_config.c)
diff --git a/deps/aa_tree.c b/deps/aa_tree.c
deleted file mode 100644
index 77c8495d8cd..00000000000
--- a/deps/aa_tree.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
- *
- *    Copyright 2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- */
-
-#include "aa_tree.h"
-#include <stddef.h>
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1800
-# include <inttypes.h>
-#elif !defined(uintptr_t)
-  /* Workaround missing standard includes in older Visual Studio */
-# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-typedef _W64 unsigned int uintptr_t;
-# else
-typedef unsigned __int64 uintptr_t;
-# endif
-#endif
-
-#define aa_entry_container(head, entry)                 \
-    ((void*)((uintptr_t)entry - head->entry_offset))
-#define aa_entry_key(head, entry)                       \
-    ((const void*)((uintptr_t)entry + head->key_offset - head->entry_offset))
-#define aa_container_entry(head, container)             \
-    ((struct aa_entry*)((uintptr_t)container + head->entry_offset))
-#define aa_container_key(head, container)               \
-    ((const void*)((uintptr_t)container + head->key_offset))
-
-void
-aa_init(struct aa_head *head,
-        enum aa_cmp (*cmp)(const void*, const void*),
-        unsigned int entry_offset, unsigned int key_offset) {
-    head->root = NULL;
-    head->cmp = cmp;
-    head->entry_offset = entry_offset;
-    head->key_offset = key_offset;
-}
-
-static struct aa_entry *
-_aa_skew(struct aa_entry *n) {
-    if(!n)
-        return NULL;
-    if(n->left && n->level == n->left->level) {
-        struct aa_entry *l = n->left;
-        n->left = l->right;
-        l->right = n;
-        return l;
-    }
-    return n;
-}
-
-static struct aa_entry *
-_aa_split(struct aa_entry *n) {
-    if(!n)
-        return NULL;
-    if(n->right && n->right->right &&
-       n->right->right->level == n->level) {
-        struct aa_entry *r = n->right;
-        n->right = r->left;
-        r->left = n;
-        r->level++;
-        return r;
-    }
-    return n;
-}
-
-static struct aa_entry *
-_aa_fixup(struct aa_entry *n) {
-    unsigned int should_be = 0;
-    if(n->left)
-        should_be = n->left->level;
-    if(n->right && n->right->level < should_be)
-        should_be = n->right->level;
-    should_be++;
-    if(should_be < n->level)
-        n->level = should_be;
-    if(n->right && n->right->level > should_be)
-        n->right->level = should_be;
-    n = _aa_skew(n);
-    n->right = _aa_skew(n->right);
-    if(n->right)
-        n->right->right = _aa_skew(n->right->right);
-    n = _aa_split(n);
-    n->right = _aa_split(n->right);
-    return n;
-}
-
-static struct aa_entry *
-_aa_insert(struct aa_head *h, struct aa_entry *n, void *elem) {
-    if(!n) {
-        struct aa_entry *e = aa_container_entry(h, elem);
-        e->left = NULL;
-        e->right = NULL;
-        e->level = 1;
-        return e;
-    }
-    const void *n_key = aa_entry_key(h, n);
-    const void *key = aa_container_key(h, elem);
-    enum aa_cmp eq = h->cmp(key, n_key);
-    if(eq == AA_CMP_EQ)
-        eq = (key > n_key) ? AA_CMP_MORE : AA_CMP_LESS;
-    if(eq == AA_CMP_LESS)
-        n->left = _aa_insert(h, n->left, elem);
-    else
-        n->right = _aa_insert(h, n->right, elem);
-    return _aa_split(_aa_skew(n));
-}
-
-void
-aa_insert(struct aa_head *h, void *elem) {
-    h->root = _aa_insert(h, h->root, elem);
-}
-
-void *
-aa_find(const struct aa_head *h, const void *key) {
-    struct aa_entry *n = h->root;
-    while(n) {
-        enum aa_cmp eq = h->cmp(key, aa_entry_key(h, n));
-        if(eq == AA_CMP_EQ)
-            return aa_entry_container(h, n);
-        n = (eq == AA_CMP_LESS) ? n->left : n->right;
-    }
-    return NULL;
-}
-
-static struct aa_entry *
-unlink_succ(struct aa_entry *n, struct aa_entry **succ) {
-    if(!n->left) {
-        *succ = n;
-        return n->right;
-    }
-    n->left = unlink_succ(n->left, succ);
-    return _aa_fixup(n);
-}
-
-static struct aa_entry *
-unlink_pred(struct aa_entry *n, struct aa_entry **pred) {
-    if(!n->right) {
-        *pred = n;
-        return n->left;
-    }
-    n->right = unlink_pred(n->right, pred);
-    return _aa_fixup(n);
-}
-
-static struct aa_entry *
-_aa_remove(struct aa_head *h, void *elem, struct aa_entry *n) {
-    if(!n)
-        return NULL;
-
-    const void *elem_key = aa_container_key(h, elem);
-    const void *n_key = aa_entry_key(h, n);
-    if(n_key == elem_key) {
-        if(!n->left && !n->right)
-            return NULL;
-        struct aa_entry *replace = NULL;
-        if(!n->left)
-            n->right = unlink_succ(n->right, &replace);
-        else
-            n->left = unlink_pred(n->left, &replace);
-        replace->left = n->left;
-        replace->right = n->right;
-        replace->level = n->level;
-        return _aa_fixup(replace);
-    }
-
-    enum aa_cmp eq = h->cmp(elem_key, n_key);
-    if(eq == AA_CMP_EQ)
-        eq = (elem_key > n_key) ? AA_CMP_MORE : AA_CMP_LESS;
-    if(eq == AA_CMP_LESS)
-        n->left = _aa_remove(h, elem, n->left);
-    else
-        n->right = _aa_remove(h, elem, n->right);
-    return _aa_fixup(n);
-}
-
-void
-aa_remove(struct aa_head *head, void *elem) {
-    head->root = _aa_remove(head, elem, head->root);
-}
-
-void *
-aa_min(const struct aa_head *head) {
-    struct aa_entry *e = head->root;
-    if(!e)
-        return NULL;
-    while(e->left)
-        e = e->left;
-    return aa_entry_container(head, e);
-}
-
-void *
-aa_max(const struct aa_head *head) {
-    struct aa_entry *e = head->root;
-    if(!e)
-        return NULL;
-    while(e->right)
-        e = e->right;
-    return aa_entry_container(head, e);
-}
-
-void *
-aa_next(const struct aa_head *head, const void *elem) {
-    struct aa_entry *e = aa_container_entry(head, elem);
-    if(e->right) {
-        e = e->right;
-        while(e->left)
-            e = e->left;
-        return aa_entry_container(head, e);
-    }
-    struct aa_entry *next = NULL;
-    struct aa_entry *n = head->root;
-    const void *key = aa_container_key(head, elem);
-    while(n && n != e) {
-        const void *n_key = aa_entry_key(head, n);
-        enum aa_cmp eq = head->cmp(key, n_key);
-        if(eq == AA_CMP_EQ)
-            eq = (key > n_key) ? AA_CMP_MORE : AA_CMP_LESS;
-        if(eq == AA_CMP_MORE) {
-            n = n->right;
-        } else {
-            next = n;
-            n = n->left;
-        }
-    }
-    return (next) ? aa_entry_container(head, next) : NULL;
-}
-
-void *
-aa_prev(const struct aa_head *head, const void *elem) {
-    struct aa_entry *e = aa_container_entry(head, elem);
-    if(e->left) {
-        e = e->left;
-        while(e->right)
-            e = e->right;
-        return aa_entry_container(head, e);
-    }
-    struct aa_entry *prev = NULL;
-    struct aa_entry *n = head->root;
-    const void *key = aa_container_key(head, elem);
-    while(n && n != e) {
-        const void *n_key = aa_entry_key(head, n);
-        enum aa_cmp eq = head->cmp(key, n_key);
-        if(eq == AA_CMP_EQ)
-            eq = (key > n_key) ? AA_CMP_MORE : AA_CMP_LESS;
-        if(eq == AA_CMP_MORE) {
-            prev = n;
-            n = n->right;
-        } else {
-            n = n->left;
-        }
-    }
-    return (prev) ? aa_entry_container(head, prev) : NULL;
-}
diff --git a/deps/aa_tree.h b/deps/aa_tree.h
deleted file mode 100644
index 87bbff1eb1e..00000000000
--- a/deps/aa_tree.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
- *
- *    Copyright 2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- */
-
-#ifndef	AA_TREE_H_
-#define	AA_TREE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum aa_cmp {
-    AA_CMP_LESS = -1,
-    AA_CMP_EQ = 0,
-    AA_CMP_MORE = 1
-};
-
-struct aa_entry {
-    struct aa_entry *left;
-    struct aa_entry *right;
-    unsigned int level;
-};
-
-struct aa_head {
-    struct aa_entry *root;
-    enum aa_cmp (*cmp)(const void* a, const void* b);
-    /* Offset from the container element to the aa_entry and the key */
-    unsigned int entry_offset;
-    unsigned int key_offset;
-};
-
-/* The AA-Tree allows duplicate entries. The first matching key is returned in
- * aa_find. */
-
-void aa_init(struct aa_head *head,
-             enum aa_cmp (*cmp)(const void*, const void*),
-             unsigned int entry_offset, unsigned int key_offset);
-void aa_insert(struct aa_head *head, void *elem);
-void aa_remove(struct aa_head *head, void *elem);
-void * aa_find(const struct aa_head *head, const void *key);
-void * aa_min(const struct aa_head *head);
-void * aa_max(const struct aa_head *head);
-void * aa_next(const struct aa_head *head, const void *elem);
-void * aa_prev(const struct aa_head *head, const void *elem);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* AA_TREE_H_ */

From bad6a672b0c6c43b8106d8a916bfa91e2b63f272 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 3 Jan 2023 21:42:46 +0100
Subject: [PATCH 0610/1963] fix(test): Fix a GCC-12 warning in
 check_discovery.c

---
 tests/server/check_discovery.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 65bb5d3e4ae..2d02f4757ce 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -458,7 +458,7 @@ Client_filter_locale(void) {
 // Test if registered server is returned from LDS using FindServersOnNetwork
 static void
 Client_find_on_network_registered(void) {
-    char urls[2][64];
+    char urls[2][384];
     UA_String expectedUris[2];
     char hostname[256];
 
@@ -468,8 +468,8 @@ Client_find_on_network_registered(void) {
     // otherwise gcc >7.2 will complain about format-truncation, but we want it
     // here
     void *hostnameVoid = (void*)hostname;
-    snprintf(urls[0], 64, "LDS_test-%s", (char*)hostnameVoid);
-    snprintf(urls[1], 64, "Register_test-%s", (char*)hostnameVoid);
+    snprintf(urls[0], 384, "LDS_test-%s", (char*)hostnameVoid);
+    snprintf(urls[1], 384, "Register_test-%s", (char*)hostnameVoid);
     expectedUris[0] = UA_STRING(urls[0]);
     expectedUris[1] = UA_STRING(urls[1]);
     FindOnNetworkAndCheck(expectedUris, 2, NULL, NULL, NULL, 0);

From 5c9faf3c3eb8df177343f8315c665b07627ce59b Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 21 Dec 2022 15:15:09 +0100
Subject: [PATCH 0611/1963] fix(core): Resolve edge-case in endpoint parsing

---
 src/ua_util.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/ua_util.c b/src/ua_util.c
index 5c93996609b..3634304786c 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -124,19 +124,18 @@ UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
     UA_assert(curr < endpointUrl->length);
     if(endpointUrl->data[curr] != '/')
         return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
+    if(++curr == endpointUrl->length)
+        return UA_STATUSCODE_GOOD;
+    outPath->data = &endpointUrl->data[curr];
+    outPath->length = endpointUrl->length - curr;
 
-    if(outPath && ++curr < endpointUrl->length) {
-        outPath->data = &endpointUrl->data[curr];
-        outPath->length = endpointUrl->length - curr;
-
-        /* Remove trailing slash from the path */
-        if(endpointUrl->data[endpointUrl->length - 1] == '/')
-            outPath->length--;
+    /* Remove trailing slash from the path */
+    if(endpointUrl->data[endpointUrl->length - 1] == '/')
+        outPath->length--;
 
-        /* Empty string? */
-        if(outPath->length == 0)
-            outPath->data = NULL;
-    }
+    /* Empty string? */
+    if(outPath->length == 0)
+        outPath->data = NULL;
 
     return UA_STATUSCODE_GOOD;
 }

From ddbb8e6af04ec47fd91b96a710981be14e6b130f Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 21 Dec 2022 15:15:55 +0100
Subject: [PATCH 0612/1963] fix(core): Allow clearing empty KeyValueMap

---
 src/ua_util.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ua_util.c b/src/ua_util.c
index 3634304786c..394d250e259 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -317,9 +317,10 @@ void
 UA_KeyValueMap_clear(UA_KeyValueMap *map) {
     if(!map)
         return;
-    UA_Array_delete(map->map, map->mapSize, &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    map->map = NULL;
-    map->mapSize = 0;
+    if(map->mapSize > 0) {
+        UA_Array_delete(map->map, map->mapSize, &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+        map->mapSize = 0;
+    }
 }
 
 void

From d1806a360fa46d2a19fb15da364f75d9c1e985f6 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 22 Dec 2022 20:11:22 +0100
Subject: [PATCH 0613/1963] refactor(pubsub): PubSub - EventLoop integration

---
 examples/pubsub/pubsub_subscribe_standalone.c |  3 +-
 include/open62541/plugin/pubsub.h             | 29 +++++++++++++++--
 plugins/ua_pubsub_ethernet.c                  | 30 ++++++++++++++++--
 plugins/ua_pubsub_mqtt.c                      | 30 ++++++++++++++++--
 plugins/ua_pubsub_udp_multicast.c             | 31 ++++++++++++++++---
 src/pubsub/ua_pubsub.h                        |  5 +++
 src/pubsub/ua_pubsub_manager.c                | 19 +++++++++---
 src/pubsub/ua_pubsub_manager.h                |  4 +++
 src/pubsub/ua_pubsub_reader.c                 | 21 +++++++++++--
 src/pubsub/ua_pubsub_readergroup.c            | 16 ++++++++--
 10 files changed, 165 insertions(+), 23 deletions(-)

diff --git a/examples/pubsub/pubsub_subscribe_standalone.c b/examples/pubsub/pubsub_subscribe_standalone.c
index 835da0121d1..ad0a4f75560 100644
--- a/examples/pubsub/pubsub_subscribe_standalone.c
+++ b/examples/pubsub/pubsub_subscribe_standalone.c
@@ -19,6 +19,7 @@
 #include "ua_types_encoding_binary.h"
 #include "ua_pubsub_networkmessage.h"
 #include "ua_util_internal.h"
+#include "ua_pubsub.h"
 
 #include <signal.h>
 
@@ -137,7 +138,7 @@ int main(int argc, char **argv) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
 
     UA_PubSubChannel *psc =
-        udpLayer.createPubSubChannel(&connectionConfig);
+        udpLayer.createPubSubChannel(&udpLayer, &connectionConfig);
     psc->regist(psc, NULL, NULL);
 
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
diff --git a/include/open62541/plugin/pubsub.h b/include/open62541/plugin/pubsub.h
index 1328b13722d..6cfcad0f601 100644
--- a/include/open62541/plugin/pubsub.h
+++ b/include/open62541/plugin/pubsub.h
@@ -12,6 +12,8 @@
 #include <open62541/types_generated.h>
 #include <open62541/util.h>
 
+#include <open62541/plugin/eventloop.h>
+
 _UA_BEGIN_DECLS
 
 #ifdef UA_ENABLE_PUBSUB
@@ -64,7 +66,7 @@ struct UA_PubSubChannel {
 
     /* Sending out the content of the buf parameter */
     UA_StatusCode (*send)(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-                          const UA_ByteString *buf);
+                          UA_ByteString *buf);
 
     /* Register to an specified message source, e.g. multicast group or topic. Callback is used for mqtt. */
     UA_StatusCode (*regist)(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
@@ -83,6 +85,14 @@ struct UA_PubSubChannel {
     /* Closing the connection and implicit free of the channel structures. */
     UA_StatusCode (*close)(UA_PubSubChannel *channel);
 
+    UA_StatusCode (*closeSubscriber)(UA_PubSubChannel *channel);
+    UA_StatusCode (*closePublisher)(UA_PubSubChannel *channel);
+    UA_StatusCode (*openSubscriber)(UA_PubSubChannel *channel);
+    UA_StatusCode (*openPublisher)(UA_PubSubChannel *channel);
+
+    UA_StatusCode (*allocNetworkBuffer)(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize);
+    UA_StatusCode (*freeNetworkBuffer)(UA_PubSubChannel *channel, UA_ByteString *buf);
+
     /* Giving the connection protocoll time to process inbound and outbound traffic. */
     UA_StatusCode (*yield)(UA_PubSubChannel *channel, UA_UInt16 timeout);
 };
@@ -97,11 +107,24 @@ struct UA_PubSubChannel {
  * UA_PubSubTransportLayer. Take a look in the tutorial_pubsub_connection to get
  * information about the TransportLayer handling. */
 
-typedef struct {
+typedef struct UA_PubSubTransportLayer {
     UA_String transportProfileUri;
-    UA_PubSubChannel *(*createPubSubChannel)(UA_PubSubConnectionConfig *connectionConfig);
+    UA_ConnectionManager *connectionManager;
+    // UA_Server *server;
+    UA_PubSubChannel *(*createPubSubChannel)(struct UA_PubSubTransportLayer *tl, void *ctx);
 } UA_PubSubTransportLayer;
 
+
+typedef struct {
+    void *connection;
+    UA_PubSubConnectionConfig *connectionConfig;
+    UA_NetworkAddressUrlDataType  *writerGroupAddress;
+    UA_Server *server;
+    UA_StatusCode (*decodeAndProcessNetworkMessage)(UA_Server *server,
+                                                    void *connection,
+                                                    UA_ByteString *buffer);
+} UA_TransportLayerContext;
+
 #endif /* UA_ENABLE_PUBSUB */
 
 _UA_END_DECLS
diff --git a/plugins/ua_pubsub_ethernet.c b/plugins/ua_pubsub_ethernet.c
index 6641e78009e..88c73c9fbf3 100644
--- a/plugins/ua_pubsub_ethernet.c
+++ b/plugins/ua_pubsub_ethernet.c
@@ -57,6 +57,7 @@ static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferETH[UA_RECEIVE_MSG_BUFFER_SIZE];
 #endif
 
 #include <time.h>
+
 #define ETHERTYPE_UADP                       0xb62c
 #define MIN_ETHERNET_PACKET_SIZE_WITHOUT_FCS 60
 #define VLAN_HEADER_SIZE                     4
@@ -1028,7 +1029,7 @@ sendWithTxTime(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
 static UA_StatusCode
 UA_PubSubChannelEthernet_send(UA_PubSubChannel *channel,
                               UA_ExtensionObject *transportSettings,
-                              const UA_ByteString *buf) {
+                              UA_ByteString *buf) {
     UA_PubSubChannelDataEthernet *channelDataEthernet =
         (UA_PubSubChannelDataEthernet *) channel->handle;
 
@@ -1299,6 +1300,18 @@ UA_PubSubChannelEthernet_close(UA_PubSubChannel *channel) {
     UA_free(channel);
     return UA_STATUSCODE_GOOD;
 }
+static UA_StatusCode
+UA_PubSubChannelEthernet_allocNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize) {
+
+    UA_StatusCode rv = UA_ByteString_allocBuffer(buf, bufSize);
+    return rv;
+}
+
+static UA_StatusCode
+UA_PubSubChannelEthernet_freeNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf) {
+    UA_ByteString_clear(buf);
+    return UA_STATUSCODE_GOOD;
+}
 
 /**
  * Generate a new channel. based on the given configuration.
@@ -1307,8 +1320,11 @@ UA_PubSubChannelEthernet_close(UA_PubSubChannel *channel) {
  * @return  ref to created channel, NULL on error
  */
 static UA_PubSubChannel *
-TransportLayerEthernet_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
+TransportLayerEthernet_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSub channel requested");
+    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
+    UA_PubSubConnectionConfig *connectionConfig = tctx->connectionConfig;
+
     UA_PubSubChannel * pubSubChannel = UA_PubSubChannelEthernet_open(connectionConfig);
     if(pubSubChannel) {
         pubSubChannel->regist = UA_PubSubChannelEthernet_regist;
@@ -1316,7 +1332,14 @@ TransportLayerEthernet_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
         pubSubChannel->send = UA_PubSubChannelEthernet_send;
         pubSubChannel->receive = UA_PubSubChannelEthernet_receive;
         pubSubChannel->close = UA_PubSubChannelEthernet_close;
+        pubSubChannel->openPublisher = NULL;
+        pubSubChannel->openSubscriber = NULL;
+        pubSubChannel->closePublisher = NULL;
+        pubSubChannel->closeSubscriber = NULL;
         pubSubChannel->connectionConfig = connectionConfig;
+        pubSubChannel->allocNetworkBuffer = UA_PubSubChannelEthernet_allocNetworkBuffer;
+        pubSubChannel->freeNetworkBuffer = UA_PubSubChannelEthernet_freeNetworkBuffer;
+
     }
     return pubSubChannel;
 }
@@ -1324,8 +1347,11 @@ TransportLayerEthernet_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
 UA_PubSubTransportLayer
 UA_PubSubTransportLayerEthernet(void) {
     UA_PubSubTransportLayer pubSubTransportLayer;
+
     pubSubTransportLayer.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     pubSubTransportLayer.createPubSubChannel = &TransportLayerEthernet_addChannel;
+    pubSubTransportLayer.connectionManager = NULL;
+
     return pubSubTransportLayer;
 }
diff --git a/plugins/ua_pubsub_mqtt.c b/plugins/ua_pubsub_mqtt.c
index 6d91e212d34..3e14e343605 100644
--- a/plugins/ua_pubsub_mqtt.c
+++ b/plugins/ua_pubsub_mqtt.c
@@ -270,7 +270,7 @@ UA_PubSubChannelMQTT_unregist(UA_PubSubChannel *channel, UA_ExtensionObject *tra
  * @return UA_STATUSCODE_GOOD if success
  */
 static UA_StatusCode
-UA_PubSubChannelMQTT_send(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings, const UA_ByteString *buf) {
+UA_PubSubChannelMQTT_send(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings, UA_ByteString *buf) {
     if(channel->state != UA_PUBSUB_CHANNEL_RDY){
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: sending failed. Invalid state.");
         return UA_STATUSCODE_BADCONNECTIONCLOSED;
@@ -365,6 +365,18 @@ UA_PubSubChannelMQTT_receive(UA_PubSubChannel *channel, UA_ExtensionObject *tran
     /* Nothing to do */
     return UA_STATUSCODE_GOOD;
 }
+static UA_StatusCode
+UA_PubSubChannelMQTT_allocNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize) {
+
+    UA_StatusCode rv = UA_ByteString_allocBuffer(buf, bufSize);
+    return rv;
+}
+
+static UA_StatusCode
+UA_PubSubChannelMQTT_freeNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf) {
+    UA_ByteString_clear(buf);
+    return UA_STATUSCODE_GOOD;
+}
 
 /**
  * Generate a new MQTT channel. Based on the given configuration. Uses yield and no recv call.
@@ -373,8 +385,11 @@ UA_PubSubChannelMQTT_receive(UA_PubSubChannel *channel, UA_ExtensionObject *tran
  * @return  ref to created channel, NULL on error
  */
 static UA_PubSubChannel *
-TransportLayerMQTT_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
+TransportLayerMQTT_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSub MQTT: channel requested.");
+    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
+    UA_PubSubConnectionConfig *connectionConfig = tctx->connectionConfig;
+
     UA_PubSubChannel * pubSubChannel = UA_PubSubChannelMQTT_open(connectionConfig);
     if(pubSubChannel){
         pubSubChannel->regist = UA_PubSubChannelMQTT_regist;
@@ -382,6 +397,13 @@ TransportLayerMQTT_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
         pubSubChannel->send = UA_PubSubChannelMQTT_send;
         pubSubChannel->close = UA_PubSubChannelMQTT_close;
         pubSubChannel->yield = UA_PubSubChannelMQTT_yield;
+        pubSubChannel->openPublisher = NULL;
+        pubSubChannel->openSubscriber = NULL;
+        pubSubChannel->closePublisher = NULL;
+        pubSubChannel->closeSubscriber = NULL;
+        pubSubChannel->allocNetworkBuffer = UA_PubSubChannelMQTT_allocNetworkBuffer;
+        pubSubChannel->freeNetworkBuffer = UA_PubSubChannelMQTT_freeNetworkBuffer;
+
         pubSubChannel->receive = UA_PubSubChannelMQTT_receive;
 
         pubSubChannel->connectionConfig = connectionConfig;
@@ -391,10 +413,12 @@ TransportLayerMQTT_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
 
 //MQTT channel factory
 UA_PubSubTransportLayer
-UA_PubSubTransportLayerMQTT(){
+UA_PubSubTransportLayerMQTT(void){
     UA_PubSubTransportLayer pubSubTransportLayer;
+
     pubSubTransportLayer.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
     pubSubTransportLayer.createPubSubChannel = &TransportLayerMQTT_addChannel;
+    pubSubTransportLayer.connectionManager = NULL;
     return pubSubTransportLayer;
 }
 
diff --git a/plugins/ua_pubsub_udp_multicast.c b/plugins/ua_pubsub_udp_multicast.c
index 29f9ebc6363..e9cd8ec3a5f 100644
--- a/plugins/ua_pubsub_udp_multicast.c
+++ b/plugins/ua_pubsub_udp_multicast.c
@@ -678,7 +678,7 @@ UA_PubSubChannelUDPMC_unregist(UA_PubSubChannel *channel, UA_ExtensionObject *tr
  */
 static UA_StatusCode
 UA_PubSubChannelUDPMC_send(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-                           const UA_ByteString *buf) {
+                           UA_ByteString *buf) {
     UA_PubSubChannelDataUDPMC *channelConfigUDPMC = (UA_PubSubChannelDataUDPMC *) channel->handle;
     if(!(channel->state == UA_PUBSUB_CHANNEL_PUB || channel->state == UA_PUBSUB_CHANNEL_PUB_SUB)){
         UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -826,22 +826,45 @@ UA_PubSubChannelUDPMC_close(UA_PubSubChannel *channel) {
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_StatusCode
+UA_PubSubChannelUDPMC_allocNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize) {
+
+    UA_StatusCode rv = UA_ByteString_allocBuffer(buf, bufSize);
+    return rv;
+}
+
+static UA_StatusCode
+UA_PubSubChannelUDPMC_freeNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf) {
+    UA_ByteString_clear(buf);
+    return UA_STATUSCODE_GOOD;
+}
+
 /**
  * Generate a new channel. based on the given configuration.
- *
- * @param connectionConfig connection configuration
+ * @param tl the transport layer to use for the channel
+ * @param ctx connection configuration ctx
  * @return  ref to created channel, NULL on error
  */
 static UA_PubSubChannel *
-TransportLayerUDPMC_addChannel(UA_PubSubConnectionConfig *connectionConfig) {
+TransportLayerUDPMC_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSub channel requested");
+
+    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
+    UA_PubSubConnectionConfig *connectionConfig = tctx->connectionConfig;
     UA_PubSubChannel * pubSubChannel = UA_PubSubChannelUDPMC_open(connectionConfig);
+
     if(pubSubChannel){
         pubSubChannel->regist = UA_PubSubChannelUDPMC_regist;
         pubSubChannel->unregist = UA_PubSubChannelUDPMC_unregist;
         pubSubChannel->send = UA_PubSubChannelUDPMC_send;
         pubSubChannel->receive = UA_PubSubChannelUDPMC_receive;
         pubSubChannel->close = UA_PubSubChannelUDPMC_close;
+        pubSubChannel->openPublisher = NULL;
+        pubSubChannel->openSubscriber = NULL;
+        pubSubChannel->closePublisher = NULL;
+        pubSubChannel->closeSubscriber = NULL;
+        pubSubChannel->allocNetworkBuffer = UA_PubSubChannelUDPMC_allocNetworkBuffer;
+        pubSubChannel->freeNetworkBuffer = UA_PubSubChannelUDPMC_freeNetworkBuffer;
         pubSubChannel->connectionConfig = connectionConfig;
     }
     return pubSubChannel;
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index b978543ce65..90bee4c1858 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -176,6 +176,11 @@ UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier, c
 #define UA_LOG_FATAL_CONNECTION(LOGGER, CONNECTION, ...)                \
     UA_MACRO_EXPAND(UA_LOG_CONNECTION_INTERNAL(LOGGER, FATAL, CONNECTION, __VA_ARGS__, ""))
 
+UA_StatusCode
+UA_decodeAndProcessNetworkMessage(UA_Server *server,
+                                  UA_PubSubConnection *connection,
+                                  UA_ByteString *buf);
+
 /**********************************************/
 /*              DataSetWriter                 */
 /**********************************************/
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 61063c7e01d..72ad77018f5 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -31,9 +31,9 @@
 #define UA_RESERVEID_LAST_ID UA_RESERVEID_FIRST_ID + 10
 #endif
 
-static UA_PubSubTransportLayer *
-getTransportProtocolLayer(const UA_Server *server,
-                          const UA_String *transportProfileUri) {
+UA_PubSubTransportLayer *
+UA_getTransportProtocolLayer(const UA_Server *server,
+                             const UA_String *transportProfileUri) {
     /* Find the matching UA_PubSubTransportLayers */
     UA_PubSubTransportLayer *tl = NULL;
     for(size_t i = 0; i < server->config.pubSubConfig.transportLayersSize; i++) {
@@ -340,7 +340,7 @@ UA_Server_addPubSubConnection(UA_Server *server,
                        UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. No connection configuration supplied.");
 
     /* Retrieve the transport layer for the given profile uri */
-    UA_PubSubTransportLayer *tl = getTransportProtocolLayer(server, &connectionConfig->transportProfileUri);
+    UA_PubSubTransportLayer *tl = UA_getTransportProtocolLayer(server, &connectionConfig->transportProfileUri);
     UA_CHECK_MEM_ERROR(tl, return UA_STATUSCODE_BADNOTFOUND, &server->config.logger,
                        UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. Requested transport layer not found.");
 
@@ -349,8 +349,17 @@ UA_Server_addPubSubConnection(UA_Server *server,
     UA_StatusCode retval = createAndAddConnection(server, connectionConfig, &newConnectionsField);
     UA_CHECK_STATUS(retval, return retval);
 
+    UA_TransportLayerContext ctx;
+    ctx.connection = newConnectionsField;
+    ctx.connectionConfig = newConnectionsField->config;
+    ctx.decodeAndProcessNetworkMessage =
+        (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
+        UA_decodeAndProcessNetworkMessage;
+    ctx.writerGroupAddress = NULL;
+    ctx.server = server;
+
     /* Open the communication channel */
-    newConnectionsField->channel = tl->createPubSubChannel(newConnectionsField->config);
+    newConnectionsField->channel = tl->createPubSubChannel(tl, &ctx);
     UA_CHECK_MEM(newConnectionsField->channel, return channelErrorHandling(server, newConnectionsField));
 
 #ifdef UA_ENABLE_PUBSUB_MQTT
diff --git a/src/pubsub/ua_pubsub_manager.h b/src/pubsub/ua_pubsub_manager.h
index d149317d988..931005d6c56 100644
--- a/src/pubsub/ua_pubsub_manager.h
+++ b/src/pubsub/ua_pubsub_manager.h
@@ -107,6 +107,10 @@ UA_PubSubManager_changeRepeatedCallback(UA_Server *server, UA_UInt64 callbackId,
 void
 UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callbackId);
 
+UA_PubSubTransportLayer *
+UA_getTransportProtocolLayer(const UA_Server *server,
+                             const UA_String *transportProfileUri);
+
 /*************************************************/
 /*      PubSub component monitoring              */
 /*************************************************/
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 23668b34bf3..a6676e3b6ae 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1501,13 +1501,20 @@ decodeNetworkMessageJson(UA_Server *server, UA_ByteString *buffer, size_t *pos,
 
 static UA_StatusCode
 decodeAndProcessNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
-                               UA_ReaderGroup *readerGroup, UA_ByteString *buf) {
+                                  UA_PubSubEncodingType encodingMimeType, UA_ByteString *buf) {
     UA_NetworkMessage nm;
     memset(&nm, 0, sizeof(UA_NetworkMessage));
 
+    UA_ReaderGroup *readerGroup = LIST_FIRST(&connection->readerGroups);
+    if(!readerGroup) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                                  "Received message, but no reader configured");
+        return UA_STATUSCODE_GOOD;
+    }
+
     size_t currentPosition = 0;
     UA_StatusCode rv;
-    if(readerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_UADP){
+    if(encodingMimeType == UA_PUBSUB_ENCODING_UADP){
         rv = decodeNetworkMessage(server, buf, &currentPosition,
                                   &nm, connection);
     } else { /* if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) */
@@ -1535,6 +1542,13 @@ decodeAndProcessNetworkMessage(UA_Server *server, UA_PubSubConnection *connectio
     return rv;
 }
 
+UA_StatusCode
+UA_decodeAndProcessNetworkMessage(UA_Server *server,
+                                  UA_PubSubConnection *connection,
+                                  UA_ByteString *buffer) {
+    return decodeAndProcessNetworkMessage(server, connection, UA_PUBSUB_ENCODING_UADP, buffer);
+}
+
 static UA_StatusCode
 decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
                                  UA_PubSubConnection *connection, UA_ByteString *buf) {
@@ -1612,7 +1626,8 @@ decodeAndProcessFun(UA_PubSubChannel *channel, void *cbContext,
                     const UA_ByteString *buf) {
     UA_RGContext *ctx = (UA_RGContext*)cbContext;
     UA_ByteString mutableBuffer = {buf->length, buf->data};
-    return decodeAndProcessNetworkMessage(ctx->server, ctx->connection, ctx->readerGroup, &mutableBuffer);
+    return decodeAndProcessNetworkMessage(ctx->server, ctx->connection,
+                                          ctx->readerGroup->config.encodingMimeType, &mutableBuffer);
 }
 
 static UA_StatusCode
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 058bb869bca..f29e69198d2 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -325,14 +325,20 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
         return UA_STATUSCODE_GOOD;
     case UA_PUBSUBSTATE_PAUSED:
         break;
-    case UA_PUBSUBSTATE_OPERATIONAL:
+    case UA_PUBSUBSTATE_OPERATIONAL: {
         UA_ReaderGroup_removeSubscribeCallback(server, rg);
+        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, rg->linkedConnection);
+        UA_PubSubChannel *channel = connection->channel;
+        if(channel->closeSubscriber) {
+            channel->closeSubscriber(channel);
+        }
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
             UA_DataSetReader_setPubSubState(server, dataSetReader,
                                             UA_PUBSUBSTATE_DISABLED, cause);
         }
         rg->state = UA_PUBSUBSTATE_DISABLED;
         break;
+    }
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
@@ -372,14 +378,20 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
                                           UA_StatusCode cause) {
     UA_DataSetReader *dataSetReader;
     switch(rg->state) {
-    case UA_PUBSUBSTATE_DISABLED:
+    case UA_PUBSUBSTATE_DISABLED: {
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
             UA_DataSetReader_setPubSubState(server, dataSetReader, UA_PUBSUBSTATE_OPERATIONAL,
                                             cause);
         }
+        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, rg->linkedConnection);
+        UA_PubSubChannel *channel = connection->channel;
+        if(channel->openSubscriber) {
+            channel->openSubscriber(channel);
+        }
         UA_ReaderGroup_addSubscribeCallback(server, rg);
         rg->state = UA_PUBSUBSTATE_OPERATIONAL;
         return UA_STATUSCODE_GOOD;
+    }
     case UA_PUBSUBSTATE_PAUSED:
         break;
     case UA_PUBSUBSTATE_OPERATIONAL:

From 3fda9716aa7e1c946461262009e2799b661c7c2c Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Fri, 23 Dec 2022 11:53:19 +0100
Subject: [PATCH 0614/1963] feat(pubsub): add pubsub unicast udp

---
 CMakeLists.txt                                |   1 +
 plugins/include/open62541/plugin/pubsub_udp.h |   3 +
 plugins/ua_pubsub_udp.c                       | 543 ++++++++++++++++++
 src/pubsub/ua_pubsub.h                        |   1 +
 src/pubsub/ua_pubsub_writergroup.c            | 106 +++-
 tools/schema/datatypes_pubsub.txt             |   2 +
 6 files changed, 643 insertions(+), 13 deletions(-)
 create mode 100644 plugins/ua_pubsub_udp.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 208ed32f3d5..f38c5fdfcb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1157,6 +1157,7 @@ endif()
 if(UA_ENABLE_PUBSUB)
     list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h)
     list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp_multicast.c)
+    list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
     if(UA_ENABLE_PUBSUB_ETH_UADP)
         list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet.h)
         list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet.c)
diff --git a/plugins/include/open62541/plugin/pubsub_udp.h b/plugins/include/open62541/plugin/pubsub_udp.h
index 7c590d19492..105d27af1d3 100644
--- a/plugins/include/open62541/plugin/pubsub_udp.h
+++ b/plugins/include/open62541/plugin/pubsub_udp.h
@@ -11,6 +11,9 @@
 
 _UA_BEGIN_DECLS
 
+UA_PubSubTransportLayer UA_EXPORT
+UA_PubSubTransportLayerUDP(void);
+
 UA_PubSubTransportLayer UA_EXPORT
 UA_PubSubTransportLayerUDPMP(void);
 
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
new file mode 100644
index 00000000000..a4657cdc92b
--- /dev/null
+++ b/plugins/ua_pubsub_udp.c
@@ -0,0 +1,543 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright 2018 (c) Jose Cabral, fortiss GmbH
+ * Copyright (c) 2020 Fraunhofer IOSB (Author: Julius Pfrommer)
+ * Copyright (c) 2020 Kalycito Infotech Private Limited
+ * Copyright (c) 2021 Linutronix GmbH (Author: Kurt Kanzenbach)
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#include <open62541/util.h>
+
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/server.h>
+
+#define RECEIVE_MSG_BUFFER_SIZE   4096
+#define UA_MAX_DEFAULT_PARAM_SIZE 6
+
+#define UA_MULTICAST_TTL_NO_LIMIT 255
+
+#define MAX_URL_LENGTH 512
+#define MAX_PORT_CHARACTER_COUNT 6
+
+#define UA_STRING_ANY_ADDR "0.0.0.0"
+#define UA_STRING_LOCALHOST "localhost"
+#define UA_STRING_LENGTH_LOCALHOST 10
+
+static UA_StatusCode
+getRawAddressAndPortValues(const UA_NetworkAddressUrlDataType *address, char *outAddress, UA_UInt16 *outPort) {
+
+    UA_String hostname = UA_STRING_NULL;
+    UA_String path = UA_STRING_NULL;
+    UA_StatusCode res = UA_parseEndpointUrl(&address->url, &hostname, outPort, &path);
+    if(res != UA_STATUSCODE_GOOD){
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Invalid URL.");
+        return res;
+    }
+
+    if(hostname.length >= MAX_URL_LENGTH) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. URL maximum length is 512.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    memcpy(outAddress, hostname.data, hostname.length);
+    outAddress[hostname.length] = 0;
+
+    return UA_STATUSCODE_GOOD;
+}
+
+typedef struct UA_UDPConnectionContext {
+    UA_ConnectionManager *connectionManager;
+    UA_Server *server;
+    void *connection;
+    uintptr_t connectionIdPublish;
+    uintptr_t connectionIdSubscribe;
+    UA_KeyValueMap subscriberParams;
+    UA_KeyValueMap publisherParams;
+    UA_StatusCode (*decodeAndProcessNetworkMessage)(UA_Server *server,
+                                                    void *connection,
+                                                    UA_ByteString *buffer);
+} UA_UDPConnectionContext;
+
+
+/* Callback of a TCP socket (server socket or an active connection) */
+static void
+UA_PubSub_udpCallbackSubscribe(UA_ConnectionManager *cm, uintptr_t connectionId,
+                               void *application, void **connectionContext,
+                               UA_ConnectionState state, const UA_KeyValueMap *params,
+                               UA_ByteString msg) {
+    if (state == UA_CONNECTIONSTATE_CLOSED || state == UA_CONNECTIONSTATE_CLOSING) {
+        return;
+    }
+
+    UA_PubSubChannel *channel = (UA_PubSubChannel *) application;
+    channel->sockfd = (int) connectionId;
+
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext*) *connectionContext;
+    ctx->connectionIdSubscribe = connectionId;
+    ctx->connectionManager = cm;
+
+    if(msg.length > 0) {
+        ctx->decodeAndProcessNetworkMessage(ctx->server, ctx->connection, &msg);
+    }
+}
+
+/* Callback of a TCP socket (server socket or an active connection) */
+static void
+UA_PubSub_udpCallbackPublish(UA_ConnectionManager *cm, uintptr_t connectionId,
+                             void *application, void **connectionContext,
+                             UA_ConnectionState state, const UA_KeyValueMap *params,
+                             UA_ByteString msg) {
+
+    if(state == UA_CONNECTIONSTATE_CLOSED || state == UA_CONNECTIONSTATE_CLOSING) {
+        return;
+    }
+    UA_PubSubChannel *channel = (UA_PubSubChannel *) application;
+    channel->sockfd = (int) connectionId;
+
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) *connectionContext;
+    ctx->connectionIdPublish = connectionId;
+    ctx->connectionManager = cm;
+}
+
+/**
+ * Close channel and free the channel data.
+ *
+ * @return UA_STATUSCODE_GOOD if success
+ */
+static UA_StatusCode
+UA_PubSubChannelUDP_close(UA_PubSubChannel *channel) {
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
+    UA_KeyValueMap_clear(&ctx->subscriberParams);
+    UA_KeyValueMap_clear(&ctx->publisherParams);
+    UA_free(ctx);
+    UA_free(channel);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UA_openSubscribeDirection(UA_ConnectionManager *connectionManager,
+                          const UA_PubSubConnectionConfig *connectionConfig, UA_PubSubChannel *newChannel,
+                          UA_NetworkAddressUrlDataType *address, char *addressAsChar, UA_UInt16 port) {
+    UA_KeyValueMap *defaultParams = UA_KeyValueMap_new();
+    if(!defaultParams) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    UA_Boolean listen = true;
+    UA_StatusCode res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "listen"), &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    UA_String listenHost = UA_STRING(addressAsChar);
+    if(UA_strncasecmp(addressAsChar, UA_STRING_LOCALHOST, UA_STRING_LENGTH_LOCALHOST) == 0){
+        listenHost = UA_STRING(UA_STRING_ANY_ADDR);
+    }
+    UA_Variant listenHostnames; // = UA_Variant_new();
+    UA_Variant_setArray(&listenHostnames, &listenHost, 1, &UA_TYPES[UA_TYPES_STRING]);
+    res = UA_KeyValueMap_set(defaultParams, UA_QUALIFIEDNAME(0, "address"), &listenHostnames);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    UA_UInt16 targetPort = port;
+    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "port"), &targetPort, &UA_TYPES[UA_TYPES_UINT16]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    if(address->networkInterface.length > 0) {
+        res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "interface"), &address->networkInterface, &UA_TYPES[UA_TYPES_STRING]);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_KeyValueMap_delete(defaultParams);
+            return res;
+        }
+    }
+    UA_Boolean reuse = true;
+    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "reuse"), &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+
+    res = UA_KeyValueMap_merge(defaultParams, &connectionConfig->connectionProperties);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) newChannel->handle;
+    res = UA_KeyValueMap_copy(defaultParams, &ctx->subscriberParams);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    UA_Boolean validate = true;
+    UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "validate"), &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    res = connectionManager->openConnection(connectionManager, defaultParams, NULL, NULL, NULL);
+    UA_KeyValueMap_delete(defaultParams);
+    return res;
+}
+
+static UA_StatusCode
+UA_openPublishDirection(UA_ConnectionManager *connectionManager,
+                        const UA_PubSubConnectionConfig *connectionConfig, UA_PubSubChannel *newChannel,
+                        UA_NetworkAddressUrlDataType *address, char *addressAsChar, UA_UInt16 port) {
+    UA_KeyValueMap *defaultParams = UA_KeyValueMap_new();
+    if(!defaultParams) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    UA_Boolean listen = false;
+    UA_StatusCode res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "listen"), &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+
+    UA_String targetHost = UA_STRING(addressAsChar);
+    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "address"),
+                                                 &targetHost, &UA_TYPES[UA_TYPES_STRING]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    UA_UInt16 targetPort = port;
+    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "port"),
+                                   &targetPort, &UA_TYPES[UA_TYPES_UINT16]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    if(address->networkInterface.length > 0) {
+        res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "interface"),
+                                       &address->networkInterface, &UA_TYPES[UA_TYPES_STRING]);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_KeyValueMap_delete(defaultParams);
+            return res;
+        }
+    }
+    UA_UInt32 ttl = UA_MULTICAST_TTL_NO_LIMIT;
+    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "ttl"),
+                             &ttl, &UA_TYPES[UA_TYPES_UINT32]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    UA_Boolean reuse = true;
+    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "reuse"), &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    UA_Boolean loopback = true;
+    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "loopback"), &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    UA_KeyValueMap_merge(defaultParams, &connectionConfig->connectionProperties);
+
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) newChannel->handle;
+    res = UA_KeyValueMap_copy(defaultParams, &ctx->publisherParams);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_KeyValueMap_delete(defaultParams);
+        return res;
+    }
+    UA_Boolean validate = true;
+    UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "validate"), &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    res = connectionManager->openConnection(connectionManager, defaultParams, NULL, NULL, NULL);
+    UA_KeyValueMap_delete(defaultParams);
+    return res;
+}
+
+static UA_Boolean
+startsWith(const char *pre, const char *str) {
+    return strncmp(pre, str, strlen(pre)) == 0;
+}
+
+/**
+ * Open communication socket based on the connectionConfig. Protocol specific parameters are
+ * provided within the connectionConfig as KeyValuePair.
+ * Currently supported options: "ttl" , "loopback", "reuse"
+ *
+ * @return ref to created channel, NULL on error
+ */
+static UA_PubSubChannel *
+UA_PubSubChannelUDP_open(UA_ConnectionManager *connectionManager, UA_TransportLayerContext *ctx, UA_NetworkAddressUrlDataType *address) {
+    UA_initialize_architecture_network();
+
+    UA_PubSubConnectionConfig *connectionConfig = ctx->connectionConfig;
+    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
+        UA_calloc(1, sizeof(UA_PubSubChannel));
+    if(!newChannel) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Out of memory.");
+        return NULL;
+    }
+
+    char addressAsChar[MAX_URL_LENGTH];
+    UA_UInt16 port;
+    UA_StatusCode res = getRawAddressAndPortValues(address, addressAsChar, &port);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+    UA_UDPConnectionContext *context = (UA_UDPConnectionContext *) UA_calloc(1, sizeof(UA_UDPConnectionContext));
+    if(!context) {
+        goto error;
+    }
+    context->server = ctx->server;
+    context->connection = ctx->connection;
+    context->connectionManager = connectionManager;
+    context->decodeAndProcessNetworkMessage = ctx->decodeAndProcessNetworkMessage;
+    newChannel->handle = context; /* Link channel and internal channel data */
+
+    // if the connection does not start with localhost, then it is a multicast connection
+    // so the publishing of messages originates from the pubsub connection,
+    // otherwise, in the unicast-case the publish direction only originates in
+    // a writergroup channel
+    if(!startsWith("opc.udp://localhost", (char*) address->url.data)) {
+        res = UA_openPublishDirection(connectionManager, connectionConfig, newChannel, address, addressAsChar, port);
+        if(res != UA_STATUSCODE_GOOD) {
+            goto error;
+        }
+    }
+
+    res = UA_openSubscribeDirection(connectionManager, connectionConfig, newChannel, address, addressAsChar, port);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+    return newChannel;
+error:
+    UA_PubSubChannelUDP_close(newChannel);
+    return NULL;
+}
+
+static UA_PubSubChannel *
+UA_PubSubChannelUDP_openUnicast(UA_ConnectionManager *connectionManager, UA_TransportLayerContext *ctx, UA_NetworkAddressUrlDataType *address) {
+    UA_initialize_architecture_network();
+
+    UA_PubSubConnectionConfig *connectionConfig = ctx->connectionConfig;
+    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
+        UA_calloc(1, sizeof(UA_PubSubChannel));
+    if(!newChannel) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Out of memory.");
+        return NULL;
+    }
+
+    char addressAsChar[MAX_URL_LENGTH];
+    UA_UInt16 port;
+    UA_StatusCode res = getRawAddressAndPortValues(address, addressAsChar, &port);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+
+    UA_UDPConnectionContext *context = (UA_UDPConnectionContext *) UA_calloc(1, sizeof(UA_UDPConnectionContext));
+    context->server = ctx->server;
+    context->connection = ctx->connection;
+    context->connectionManager = connectionManager;
+    newChannel->handle = context; /* Link channel and internal channel data */
+
+    res = UA_openPublishDirection(connectionManager, connectionConfig, newChannel, address, addressAsChar, port);
+    if(res != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+
+    return newChannel;
+error:
+    UA_free(newChannel);
+    return NULL;
+}
+
+/**
+ * Subscribe to a given address.
+ *
+ * @return UA_STATUSCODE_GOOD on success
+ */
+static UA_StatusCode
+UA_PubSubChannelUDP_regist(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
+                           void (*notUsedHere)(UA_ByteString *encodedBuffer,
+                                                 UA_ByteString *topic)) {
+    if(!(channel->state == UA_PUBSUB_CHANNEL_PUB || channel->state == UA_PUBSUB_CHANNEL_RDY)){
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection regist failed.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+/**
+ * Remove current subscription.
+ *
+ * @return UA_STATUSCODE_GOOD on success
+ */
+static UA_StatusCode
+UA_PubSubChannelUDP_unregist(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings) {
+    if(!(channel->state == UA_PUBSUB_CHANNEL_PUB_SUB || channel->state == UA_PUBSUB_CHANNEL_SUB)){
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection unregist failed.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+/**
+ * Send messages to the connection defined address
+ *
+ * @return UA_STATUSCODE_GOOD if success
+ */
+static UA_StatusCode
+UA_PubSubChannelUDP_send(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
+                         UA_ByteString *buf) {
+
+    UA_UDPConnectionContext *udpContext = (UA_UDPConnectionContext *) channel->handle;
+    UA_ConnectionManager *cm = udpContext->connectionManager;
+
+    uintptr_t connectionId = udpContext->connectionIdPublish;
+
+    return cm->sendWithConnection(cm, connectionId, &UA_KEYVALUEMAP_NULL, buf);
+}
+
+/**
+ * Receive messages. The regist function should be called before.
+ *
+ * @param timeout in usec | on windows platforms are only multiples of 1000usec possible
+ * @return
+ */
+static UA_StatusCode
+UA_PubSubChannelUDP_receive(UA_PubSubChannel *channel,
+                            UA_ExtensionObject *transportSettings,
+                            UA_PubSubReceiveCallback receiveCallback,
+                            void *receiveCallbackContext,
+                            UA_UInt32 timeout) {
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UA_PubSubChannelUDP_openPublisher(UA_PubSubChannel *channel) {
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
+    ctx->connectionManager->openConnection(ctx->connectionManager, &ctx->publisherParams,
+                                           channel, ctx, UA_PubSub_udpCallbackPublish);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UA_PubSubChannelUDP_openSubscriber(UA_PubSubChannel *channel) {
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
+    ctx->connectionManager->openConnection(ctx->connectionManager, &ctx->subscriberParams,
+                                           channel, ctx, UA_PubSub_udpCallbackSubscribe);
+    return UA_STATUSCODE_GOOD;
+}
+static UA_StatusCode
+UA_PubSubChannelUDP_closePublisher(UA_PubSubChannel *channel) {
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
+    // UA_KeyValueMap_clear(&ctx->publisherParams);
+    ctx->connectionManager->closeConnection(ctx->connectionManager, ctx->connectionIdPublish);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UA_PubSubChannelUDP_closeSubscriber(UA_PubSubChannel *channel) {
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
+    // UA_KeyValueMap_clear(&ctx->subscriberParams);
+    ctx->connectionManager->closeConnection(ctx->connectionManager, ctx->connectionIdSubscribe);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UA_PubSubChannelUDP_allocNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize) {
+    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
+    return ctx->connectionManager->allocNetworkBuffer(ctx->connectionManager, ctx->connectionIdPublish, buf, bufSize);
+}
+static UA_StatusCode
+UA_PubSubChannelUDP_freeNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf) {
+    /* noop */
+    return UA_STATUSCODE_GOOD;
+}
+/**
+ * Generate a new channel. based on the given configuration.
+ *
+ * @param connectionConfig connection configuration
+ * @return  ref to created channel, NULL on error
+ */
+static UA_PubSubChannel *
+TransportLayerUDP_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSub channel requested");
+    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
+    UA_PubSubConnectionConfig *connectionConfig = tctx->connectionConfig;
+    UA_PubSubChannel *pubSubChannel = NULL;
+    UA_Server *server = tctx->server;
+
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_EventLoop *el = config->eventLoop;
+    UA_String needle = UA_STRING("udp connection manager");
+
+    UA_EventSource *es;
+    for(es = el->eventSources; es != NULL; es=es->next) {
+        if(UA_String_equal(&es->name, &needle)) {
+            break;
+        }
+    }
+    if(!es) {
+        return NULL;
+    }
+    tl->connectionManager = (UA_ConnectionManager *) es;
+
+    if(!UA_Variant_hasScalarType(&connectionConfig->address,
+                                 &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Invalid Address.");
+        return NULL;
+    }
+    UA_NetworkAddressUrlDataType *address =
+        (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
+
+    if(tctx->writerGroupAddress)  {
+        pubSubChannel = UA_PubSubChannelUDP_openUnicast(tl->connectionManager, tctx, tctx->writerGroupAddress);
+    } else {
+        pubSubChannel = UA_PubSubChannelUDP_open(tl->connectionManager, tctx, address);
+    }
+
+    if(pubSubChannel){
+        pubSubChannel->regist = UA_PubSubChannelUDP_regist;
+        pubSubChannel->unregist = UA_PubSubChannelUDP_unregist;
+        pubSubChannel->send = UA_PubSubChannelUDP_send;
+        pubSubChannel->receive = UA_PubSubChannelUDP_receive;
+        pubSubChannel->close = UA_PubSubChannelUDP_close;
+        pubSubChannel->closeSubscriber = UA_PubSubChannelUDP_closeSubscriber;
+        pubSubChannel->closePublisher = UA_PubSubChannelUDP_closePublisher;
+        pubSubChannel->openSubscriber = UA_PubSubChannelUDP_openSubscriber;
+        pubSubChannel->openPublisher = UA_PubSubChannelUDP_openPublisher;
+        pubSubChannel->allocNetworkBuffer = UA_PubSubChannelUDP_allocNetworkBuffer;
+        pubSubChannel->freeNetworkBuffer = UA_PubSubChannelUDP_freeNetworkBuffer;
+        pubSubChannel->connectionConfig = connectionConfig;
+
+        pubSubChannel->state = UA_PUBSUB_CHANNEL_PUB;
+    }
+    return pubSubChannel;
+}
+
+//UDP channel factory
+UA_PubSubTransportLayer
+UA_PubSubTransportLayerUDP(void) {
+    // UA_ServerConfig *config = UA_Server_getConfig(server);
+    // UA_EventLoop *el = config->eventLoop;
+
+    UA_PubSubTransportLayer pubSubTransportLayer;
+    memset(&pubSubTransportLayer, 0, sizeof(UA_PubSubTransportLayer));
+    // pubSubTransportLayer.connectionManager = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp-cm"));
+    // pubSubTransportLayer.server = server;
+    // el->registerEventSource(el, &pubSubTransportLayer.connectionManager->eventSource);
+
+    pubSubTransportLayer.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    pubSubTransportLayer.createPubSubChannel = &TransportLayerUDP_addChannel;
+    pubSubTransportLayer.connectionManager = NULL;
+    return pubSubTransportLayer;
+}
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 90bee4c1858..7edc05e316e 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -284,6 +284,7 @@ struct UA_WriterGroup {
     UA_UInt16 sequenceNumber; /* Increased after every succressuly sent message */
     UA_Boolean configurationFrozen;
     UA_DateTime lastPublishTimeStamp;
+    UA_PubSubChannel *channel; /* channel used for udp unicast communication */
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_UInt32 securityTokenId;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 65eb7f27f17..da2759e48b2 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -105,6 +105,53 @@ UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
             &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
         newConfig->messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
     }
+    /* writerGroupTransportSettings */
+    newWriterGroup->channel = NULL;
+    const UA_ExtensionObject *writerGroupTransportSettings = &writerGroupConfig->transportSettings;
+    if(writerGroupTransportSettings && writerGroupTransportSettings->content.decoded.type == &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE]) {
+        UA_DatagramWriterGroupTransport2DataType *ts = (UA_DatagramWriterGroupTransport2DataType *) writerGroupTransportSettings->content.decoded.data;
+        if(UA_Variant_hasScalarType(&currentConnectionContext->config->address,
+                                     &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
+            UA_NetworkAddressUrlDataType *address =
+                (UA_NetworkAddressUrlDataType *)currentConnectionContext->config->address.data;
+            const char *prefix = "opc.udp://localhost:";
+
+            if(strncmp(prefix, (char *) address->url.data, strlen(prefix)) != 0) {
+
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                             "PubSub WriterGroup creating failed. Invalid Address of PubSub Connection.");
+                UA_free(newWriterGroup);
+                return UA_STATUSCODE_BADINTERNALERROR;
+            }
+        }
+
+        if(ts->address.content.decoded.type == &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) {
+            UA_NetworkAddressUrlDataType *address = (UA_NetworkAddressUrlDataType *) ts->address.content.decoded.data;
+            const char *prefix = "opc.udp://";
+            if(strncmp(prefix, (char *) address->url.data, strlen(prefix)) == 0) {
+
+                UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                             "adding udp unicast WriterGroup connecting to "
+
+                             );
+                /* Retrieve the transport layer for the given profile uri */
+                UA_PubSubTransportLayer *tl = UA_getTransportProtocolLayer(server, &currentConnectionContext->config->transportProfileUri);
+                UA_CHECK_MEM_ERROR(tl, UA_free(newWriterGroup); return UA_STATUSCODE_BADNOTFOUND, &server->config.logger,
+                                   UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. Requested transport layer not found.");
+                UA_TransportLayerContext ctx;
+                ctx.writerGroupAddress = address;
+                ctx.connection = currentConnectionContext;
+                ctx.connectionConfig = currentConnectionContext->config;
+                /* TODO: The callback is for readers, not writers. Currently unused. */
+                ctx.decodeAndProcessNetworkMessage =
+                    (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
+                     UA_decodeAndProcessNetworkMessage;
+                ctx.server = server;
+
+                newWriterGroup->channel = tl->createPubSubChannel(tl, &ctx);
+            }
+        }
+    }
 
     /* Attach to the connection */
     LIST_INSERT_HEAD(&currentConnectionContext->writerGroups, newWriterGroup, listEntry);
@@ -713,6 +760,9 @@ UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
     UA_WriterGroupConfig_clear(&writerGroup->config);
     UA_NodeId_clear(&writerGroup->identifier);
     UA_NetworkMessageOffsetBuffer_clear(&writerGroup->bufferedMessage);
+    if(writerGroup->channel) {
+        writerGroup->channel->close(writerGroup->channel);
+    }
 }
 
 UA_StatusCode
@@ -729,7 +779,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                     break;
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
-                case UA_PUBSUBSTATE_OPERATIONAL:
+                case UA_PUBSUBSTATE_OPERATIONAL: {
                     if(writerGroup->config.pubsubManagerCallback.removeCustomCallback)
                         writerGroup->config.pubsubManagerCallback.
                             removeCustomCallback(server, writerGroup->identifier, writerGroup->publishCallbackId);
@@ -740,8 +790,18 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                         UA_DataSetWriter_setPubSubState(server, dataSetWriter, UA_PUBSUBSTATE_DISABLED,
                                                         UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
                     }
+
+                    UA_PubSubChannel *channel = writerGroup->channel;
+                    if(!channel) {
+                        UA_PubSubConnection *connection = writerGroup->linkedConnection;
+                        channel = connection->channel;
+                    }
+                    if(channel->closePublisher) {
+                        channel->closePublisher(channel);
+                    }
                     writerGroup->state = UA_PUBSUBSTATE_DISABLED;
                     break;
+                }
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
@@ -766,7 +826,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
             break;
         case UA_PUBSUBSTATE_OPERATIONAL:
             switch (writerGroup->state) {
-                case UA_PUBSUBSTATE_DISABLED:
+                case UA_PUBSUBSTATE_DISABLED: {
                     writerGroup->state = UA_PUBSUBSTATE_OPERATIONAL;
                     if(writerGroup->config.pubsubManagerCallback.removeCustomCallback)
                         writerGroup->config.pubsubManagerCallback.
@@ -779,8 +839,17 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                         UA_DataSetWriter_setPubSubState(server, dataSetWriter,
                                                         UA_PUBSUBSTATE_OPERATIONAL, cause);
                     }
+                    UA_PubSubChannel *channel = writerGroup->channel;
+                    if(!channel) {
+                        UA_PubSubConnection *connection = writerGroup->linkedConnection;
+                        channel = connection->channel;
+                    }
+                    if(channel->openPublisher) {
+                        channel->openPublisher(channel);
+                    }
                     UA_WriterGroup_addPublishCallback(server, writerGroup);
                     break;
+                }
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
                 case UA_PUBSUBSTATE_OPERATIONAL:
@@ -905,8 +974,16 @@ encodeNetworkMessage(UA_WriterGroup *wg, UA_NetworkMessage *nm,
 static void
 sendNetworkMessageBuffer(UA_Server *server, UA_WriterGroup *wg,
                          UA_PubSubConnection *connection, UA_ByteString *buffer) {
+    /* Choose the channel */
+    UA_PubSubChannel *channel = NULL;
+
+    if(wg->channel != NULL) {
+        channel = wg->channel;
+    } else {
+        channel = connection->channel;
+    }
     UA_StatusCode res =
-        connection->channel->send(connection->channel,
+        channel->send(channel,
                                   &wg->config.transportSettings, buffer);
     /* Failure, set the WriterGroup into an error mode */
     if(res != UA_STATUSCODE_GOOD) {
@@ -1094,16 +1171,18 @@ sendNetworkMessageBinary(UA_Server *server, UA_PubSubConnection *connection, UA_
     }
 #endif
 
-    /* Allocate the buffer. Allocate on the stack if the buffer is small. */
-    UA_ByteString buf;
-    UA_Byte stackBuf[UA_MAX_STACKBUF];
-    buf.data = stackBuf;
-    buf.length = msgSize;
-    if(msgSize > UA_MAX_STACKBUF) {
-        rv = UA_ByteString_allocBuffer(&buf, msgSize);
-        UA_CHECK_STATUS(rv, goto cleanup);
+        /* Choose the channel */
+    UA_PubSubChannel *channel = NULL;
+    if(wg->channel != NULL) {
+        channel = wg->channel;
+    } else {
+        channel = connection->channel;
     }
 
+    UA_ByteString buf = UA_BYTESTRING_NULL;
+    rv = channel->allocNetworkBuffer(channel, &buf, msgSize);
+    UA_CHECK_STATUS(rv, goto cleanup);
+
     /* Encode and encrypt the message */
     rv = encodeNetworkMessage(wg, &nm, &buf);
     UA_CHECK_STATUS(rv, goto cleanup_with_msg_size);
@@ -1112,8 +1191,9 @@ sendNetworkMessageBinary(UA_Server *server, UA_PubSubConnection *connection, UA_
     sendNetworkMessageBuffer(server, wg, connection, &buf);
 
 cleanup_with_msg_size:
-    if(msgSize > UA_MAX_STACKBUF)
-        UA_ByteString_clear(&buf);
+    rv = channel->freeNetworkBuffer(channel, &buf);
+    // if(msgSize > UA_MAX_STACKBUF)
+    //     UA_ByteString_clear(&buf);
 cleanup:
     UA_free(nm.payload.dataSetPayload.sizes);
     return rv;
diff --git a/tools/schema/datatypes_pubsub.txt b/tools/schema/datatypes_pubsub.txt
index 66fe9a4b394..7a3e17fc950 100644
--- a/tools/schema/datatypes_pubsub.txt
+++ b/tools/schema/datatypes_pubsub.txt
@@ -53,3 +53,5 @@ ContentFilter
 PublishedEventsDataType
 DatagramConnectionTransportDataType
 DatagramWriterGroupTransportDataType
+DatagramWriterGroupTransport2DataType
+DatagramConnectionTransport2DataType

From a0bfc92a07fca18e6a7f4a8e401b9990dfa93f22 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Fri, 23 Dec 2022 11:53:44 +0100
Subject: [PATCH 0615/1963] test(pubsub): add udp unicast test

---
 tests/CMakeLists.txt                    |   4 +
 tests/pubsub/check_pubsub_udp_unicast.c | 344 ++++++++++++++++++++++++
 2 files changed, 348 insertions(+)
 create mode 100644 tests/pubsub/check_pubsub_udp_unicast.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9adda1eb7b7..5a8c05a70fc 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_compile_options(-Wno-unused-variable -Wno-unused-function)
 # Load CMake Packages
 find_package(Check REQUIRED)
 set(LIBS ${CHECK_LIBRARIES} ${open62541_LIBRARIES})
@@ -124,6 +125,8 @@ endif()
 if(UA_ENABLE_PUBSUB)
   list(APPEND test_plugin_sources
        ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp_multicast.c)
+  list(APPEND test_plugin_sources
+       ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
     if(UA_ENABLE_PUBSUB_ETH_UADP)
         list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet.h)
         list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet.c)
@@ -315,6 +318,7 @@ if(UA_ENABLE_PUBSUB)
     ua_add_test(pubsub/check_pubsub_publish.c)
     ua_add_test(pubsub/check_pubsub_publish_uadp.c)
     ua_add_test(pubsub/check_pubsub_get_state.c)
+    ua_add_test(pubsub/check_pubsub_udp_unicast.c)
     ua_add_test(pubsub/check_pubsub_publisherid.c)
 
     #Link libraries for executing subscriber unit test
diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
new file mode 100644
index 00000000000..fa4d763642a
--- /dev/null
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -0,0 +1,344 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Fraunhofer IOSB (Author: Jan Hermes)
+ */
+
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/server_config_default.h>
+#include <open62541/server_pubsub.h>
+#include <check.h>
+#include <time.h>
+
+#include "testing_clock.h"
+#include "open62541/types_generated_handling.h"
+#include "ua_pubsub.h"
+#include "ua_server_internal.h"
+
+#define STR_BUFSIZE             1024
+
+#define UA_SUBSCRIBER_PORT       4801    /* Port for Subscriber*/
+#define UA_PUBLISHER_PORT        4800    /* Port for Publisher*/
+#define PUBLISH_INTERVAL         5       /* Publish interval*/
+#define PUBLISHER_ID             2234    /* Publisher Id*/
+#define DATASET_WRITER_ID        62541   /* DataSet Writer Id*/
+#define WRITER_GROUP_ID          100     /* Writer group Id  */
+#define PUBLISHVARIABLE_NODEID   1000    /* Published data nodeId */
+#define SUBSCRIBEVARIABLE_NODEID 1002    /* Subscribed data nodeId */
+
+/* Global declaration for test cases  */
+UA_Server *serverPublisher = NULL;
+UA_Server *serverSubscriber = NULL;
+
+UA_ServerConfig *configPublisher = NULL;
+UA_ServerConfig *configSubscriber = NULL;
+
+// #define UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE 264
+// typedef struct UA_DatagramWriterGroupTransport2DataType {
+//     UA_Variant address;
+// } UA_DatagramWriterGroupTransport2DataType;
+
+// UA_NodeId publisherConnectionId;
+// UA_NodeId subscriberConnectionId;
+//
+// UA_NodeId readerGroupId;
+static void setupFolder(UA_Server *server, UA_NodeId *folderId) {
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName;
+    oAttr.displayName = UA_LOCALIZEDTEXT("en-US", "Subscribed Variables");
+    folderBrowseName = UA_QUALIFIEDNAME(1, "Subscribed Variables");
+    UA_StatusCode res = UA_Server_addObjectNode(server, UA_NODEID_NULL,
+                                                UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                                UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                                folderBrowseName,
+                                                UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
+                                                oAttr, NULL, folderId);
+    ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
+}
+
+
+static void setupPubSubServer(UA_Server **server, UA_ServerConfig **config, UA_UInt16 portNumber) {
+    *server = UA_Server_new();
+    *config = UA_Server_getConfig(*server);
+
+    UA_ServerConfig_setMinimal(*config, portNumber, NULL);
+    UA_Server_run_startup(*server);
+    UA_ServerConfig_addPubSubTransportLayer(*config, UA_PubSubTransportLayerUDP());
+}
+
+static void addUDPConnection(UA_Server *server, const char *host, UA_Int16 portNumber, UA_NodeId *outConnectionId) {
+    /* Add connection to the server */
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("UADP Test Connection");
+    char address[STR_BUFSIZE];
+    memset(&address, 0, sizeof(address));
+    snprintf(address, STR_BUFSIZE, "opc.udp://%s:%d", host, portNumber);
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        {UA_STRING_NULL, UA_STRING(address)};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+
+    /* also set the same publisher Id for the subscriber connection as it does not matter */
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
+    UA_Server_addPubSubConnection(server, &connectionConfig, outConnectionId);
+}
+
+static void setupPublishedDataInt32(UA_Server *server, UA_UInt32 publishVariableNodeId, UA_NodeId *outPublishedDataSetId) {
+    UA_PublishedDataSetConfig pdsConfig;
+    memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    pdsConfig.name = UA_STRING("PublishedDataSet Test");
+    UA_AddPublishedDataSetResult result = UA_Server_addPublishedDataSet(server, &pdsConfig, outPublishedDataSetId);
+    ck_assert_int_eq(result.addResult, UA_STATUSCODE_GOOD);
+
+    /* Create variable to publish integer data */
+    UA_NodeId publisherNode;
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    attr.description           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+    attr.displayName           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+    attr.dataType              = UA_TYPES[UA_TYPES_INT32].typeId;
+    UA_Int32 publisherData     = 42;
+    UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT32]);
+    UA_StatusCode retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, publishVariableNodeId),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                       UA_QUALIFIEDNAME(1, "Published Int32"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                       attr, NULL, &publisherNode);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    /* Data Set Field */
+    UA_NodeId dataSetFieldId;
+    UA_DataSetFieldConfig dataSetFieldConfig;
+    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Published Int32");
+    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
+    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+    UA_Server_addDataSetField(server, *outPublishedDataSetId, &dataSetFieldConfig, &dataSetFieldId);
+}
+
+static void setupWrittenData(UA_Server *server, UA_NodeId connectionId, UA_NodeId publishedDataSetId, const char *dstHost, UA_UInt16 dstPort) {
+
+    char dstAddress[STR_BUFSIZE];
+    memset(&dstAddress, 0, sizeof(dstAddress));
+    snprintf(dstAddress, STR_BUFSIZE, "opc.udp://%s:%d", dstHost, dstPort);
+
+    UA_NodeId writerGroup;
+    UA_NodeId dataSetWriter;
+    /* Writer group */
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+    writerGroupConfig.name = UA_STRING("WriterGroup Test");
+    writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
+    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.writerGroupId = WRITER_GROUP_ID;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+
+    /* Message settings in WriterGroup to include necessary headers */
+    writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+    writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+    writerGroupMessage->networkMessageContentMask =
+        (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+        (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+        (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+        (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
+    writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+
+    /* udpTransportSettings. */
+    UA_DatagramWriterGroupTransport2DataType udpTransportSettings;
+    memset(&udpTransportSettings, 0, sizeof(UA_DatagramWriterGroupTransport2DataType));
+    UA_NetworkAddressUrlDataType url =
+        {UA_STRING_NULL, UA_STRING(dstAddress)};
+    UA_ExtensionObject_setValue(&udpTransportSettings.address, &url,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+
+    /* Encapsulate config in transportSettings */
+    UA_ExtensionObject transportSettings;
+    memset(&transportSettings, 0, sizeof(UA_ExtensionObject));
+    transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    transportSettings.content.decoded.type = &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE];
+    transportSettings.content.decoded.data = &udpTransportSettings;
+
+    writerGroupConfig.transportSettings = transportSettings;
+
+    UA_StatusCode retVal = UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
+    UA_Server_setWriterGroupOperational(server, writerGroup);
+    /* DataSetWriter */
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING("DataSetWriter Test");
+    dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
+    dataSetWriterConfig.keyFrameCount = 10;
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup, publishedDataSetId,
+                                         &dataSetWriterConfig, &dataSetWriter);
+    UA_free(writerGroupMessage);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+}
+
+static void setupPublishingUnicast(UA_Server *server, UA_NodeId connectionId, const char *dstHost, UA_UInt16 dstPort, UA_UInt32 publishVariableNodeId) {
+    UA_NodeId outPublishedDataSetId;
+    setupPublishedDataInt32(serverPublisher, publishVariableNodeId, &outPublishedDataSetId);
+    setupWrittenData(server, connectionId, outPublishedDataSetId, dstHost, dstPort);
+}
+
+static void setupSubscribing(UA_Server *server, UA_NodeId connectionId, UA_NodeId folderId, UA_UInt32 subscribeVariableNodeId) {
+    /* Reader Group */
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+
+    UA_NodeId outReaderGroupId;
+    UA_StatusCode retVal =  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &outReaderGroupId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    retVal = UA_Server_setReaderGroupOperational(server, outReaderGroupId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    /* Data Set Reader */
+    /* Parameters to filter received NetworkMessage */
+    UA_DataSetReaderConfig readerConfig;
+    memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+    readerConfig.name             = UA_STRING ("DataSetReader Test");
+    UA_UInt16 publisherIdentifier = PUBLISHER_ID;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId    = WRITER_GROUP_ID;
+    readerConfig.dataSetWriterId  = DATASET_WRITER_ID;
+    /* Setting up Meta data configuration in DataSetReader */
+    UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+    /* FilltestMetadata function in subscriber implementation */
+    UA_DataSetMetaDataType_init (pMetaData);
+    pMetaData->name       = UA_STRING ("DataSet Test");
+    /* Static definition of number of fields size to 1 to create one
+       targetVariable */
+    pMetaData->fieldsSize = 1;
+    pMetaData->fields     = (UA_FieldMetaData*)
+        UA_Array_new(pMetaData->fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+    /* Unsigned Integer DataType */
+    UA_FieldMetaData_init (&pMetaData->fields[0]);
+    retVal = UA_NodeId_copy (&UA_TYPES[UA_TYPES_INT32].typeId,
+                    &pMetaData->fields[0].dataType);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    pMetaData->fields[0].builtInType = UA_NS0ID_INT32;
+    pMetaData->fields[0].valueRank   = -1; /* scalar */
+
+    UA_NodeId readerIdentifier;
+    retVal = UA_Server_addDataSetReader(server, outReaderGroupId, &readerConfig,
+                                         &readerIdentifier);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    /* Add Subscribed Variables */
+    /* Variable to subscribe data */
+    UA_NodeId newnodeId;
+    UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+    vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+    vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+    vAttr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, subscribeVariableNodeId), folderId,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    UA_FieldTargetVariable targetVar;
+    memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
+    /* For creating Targetvariable */
+    UA_FieldTargetDataType_init(&targetVar.targetVariable);
+    targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+    targetVar.targetVariable.targetNodeId = newnodeId;
+    retVal = UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
+                                                            1, &targetVar);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_FieldTargetDataType_clear(&targetVar.targetVariable);
+    UA_free(pMetaData->fields);
+}
+
+/* setup() is to create an environment for test cases */
+static void setup(void) {
+    /*Add setup by creating new server with valid configuration */
+    setupPubSubServer(&serverPublisher, &configPublisher, UA_PUBLISHER_PORT);
+    UA_NodeId publisherConnectionId;
+    addUDPConnection(serverPublisher, "localhost", UA_PUBLISHER_PORT, &publisherConnectionId);
+    setupPublishingUnicast(serverPublisher, publisherConnectionId, "127.0.0.1", UA_SUBSCRIBER_PORT,
+                           PUBLISHVARIABLE_NODEID);
+
+    setupPubSubServer(&serverSubscriber, &configSubscriber, UA_SUBSCRIBER_PORT);
+    UA_NodeId folderId;
+    setupFolder(serverSubscriber, &folderId);
+    UA_NodeId subscriberConnectionId;
+    addUDPConnection(serverSubscriber, "localhost", UA_SUBSCRIBER_PORT, &subscriberConnectionId);
+    setupSubscribing(serverSubscriber, subscriberConnectionId, folderId, SUBSCRIBEVARIABLE_NODEID);
+}
+
+/* teardown() is to delete the environment set for test cases */
+static void teardown(void) {
+    /*Call server delete functions */
+    UA_Server_run_shutdown(serverPublisher);
+    UA_Server_delete(serverPublisher);
+    /*Call server delete functions */
+    UA_Server_run_shutdown(serverSubscriber);
+    UA_Server_delete(serverSubscriber);
+}
+
+static void checkReceived(UA_Server *publisher, UA_UInt32 publishVariableNodeId, UA_Server *subscriber, UA_UInt32 subscribeVariableNodeId) {
+    /* Read data sent by the Publisher */
+    UA_Variant publishedNodeData;
+    UA_Variant_init(&publishedNodeData);
+    UA_StatusCode retVal =
+        UA_Server_readValue(publisher, UA_NODEID_NUMERIC(1, publishVariableNodeId),
+                            &publishedNodeData);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    /* Read data received by the Subscriber */
+    UA_Variant subscribedNodeData;
+    UA_Variant_init(&subscribedNodeData);
+    retVal = UA_Server_readValue(subscriber, UA_NODEID_NUMERIC(1, subscribeVariableNodeId),
+                                 &subscribedNodeData);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    /* Check if data sent from Publisher is being received by Subscriber */
+    ck_assert(publishedNodeData.type == subscribedNodeData.type);
+    ck_assert(UA_order(publishedNodeData.data,
+                       subscribedNodeData.data,
+                       subscribedNodeData.type) == UA_ORDER_EQ);
+    UA_Variant_clear(&subscribedNodeData);
+    UA_Variant_clear(&publishedNodeData);
+}
+
+START_TEST(SinglePublishSubscribeInt32) {
+    /* run server - publisher and subscriber */
+    UA_fakeSleep(PUBLISH_INTERVAL + 1);
+    UA_Server_run_iterate(serverPublisher,true);
+    UA_fakeSleep(PUBLISH_INTERVAL + 1);
+    UA_Server_run_iterate(serverSubscriber,true);
+
+    checkReceived(serverPublisher, PUBLISHVARIABLE_NODEID,
+                  serverSubscriber, SUBSCRIBEVARIABLE_NODEID);
+}END_TEST
+
+int main(void) {
+
+    /*Test case to run both publisher and subscriber */
+    TCase *tc_pubsub_publish_subscribe = tcase_create("Publisher publishing and Subscriber subscribing");
+    tcase_add_checked_fixture(tc_pubsub_publish_subscribe, setup, teardown);
+    tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeInt32);
+
+    Suite *suite = suite_create("PubSub readerGroups/reader/Fields handling and publishing");
+    suite_add_tcase(suite, tc_pubsub_publish_subscribe);
+
+    SRunner *suiteRunner = srunner_create(suite);
+    srunner_set_fork_status(suiteRunner, CK_NOFORK);
+    srunner_run_all(suiteRunner,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(suiteRunner);
+    srunner_free(suiteRunner);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 67898e9847bc48596b7783ee07a802fa8efe4898 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Wed, 28 Dec 2022 19:30:14 +0100
Subject: [PATCH 0616/1963] refactor(pubsub): relocate udp specifics to layer

---
 include/open62541/plugin/pubsub.h             |  3 +
 plugins/ua_pubsub_ethernet.c                  |  7 ++
 plugins/ua_pubsub_mqtt.c                      |  7 ++
 plugins/ua_pubsub_udp.c                       | 35 ++++++++++
 plugins/ua_pubsub_udp_multicast.c             |  6 ++
 src/pubsub/ua_pubsub_writergroup.c            | 70 +++++++------------
 tests/pubsub/check_pubsub_config_freeze.c     |  2 +-
 tests/pubsub/check_pubsub_get_state.c         |  2 +-
 tests/pubsub/check_pubsub_informationmodel.c  |  2 +-
 .../check_pubsub_informationmodel_methods.c   |  2 +-
 tests/pubsub/check_pubsub_keystorage.c        |  2 +-
 tests/pubsub/check_pubsub_multiple_layer.c    |  6 +-
 tests/pubsub/check_pubsub_pds.c               |  2 +-
 tests/pubsub/check_pubsub_publish.c           |  2 +-
 tests/pubsub/check_pubsub_publish_json.c      |  2 +-
 tests/pubsub/check_pubsub_publishspeed.c      |  2 +-
 .../check_pubsub_subscribe_config_freeze.c    |  2 +-
 17 files changed, 96 insertions(+), 58 deletions(-)

diff --git a/include/open62541/plugin/pubsub.h b/include/open62541/plugin/pubsub.h
index 6cfcad0f601..d14896e89f3 100644
--- a/include/open62541/plugin/pubsub.h
+++ b/include/open62541/plugin/pubsub.h
@@ -112,14 +112,17 @@ typedef struct UA_PubSubTransportLayer {
     UA_ConnectionManager *connectionManager;
     // UA_Server *server;
     UA_PubSubChannel *(*createPubSubChannel)(struct UA_PubSubTransportLayer *tl, void *ctx);
+    UA_StatusCode (*createWriterGroupPubSubChannel)(UA_PubSubChannel** outChannel, struct UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void *ctx);
 } UA_PubSubTransportLayer;
 
 
 typedef struct {
     void *connection;
+    UA_NetworkAddressUrlDataType *connectionAddress;
     UA_PubSubConnectionConfig *connectionConfig;
     UA_NetworkAddressUrlDataType  *writerGroupAddress;
     UA_Server *server;
+    UA_Logger *logger;
     UA_StatusCode (*decodeAndProcessNetworkMessage)(UA_Server *server,
                                                     void *connection,
                                                     UA_ByteString *buffer);
diff --git a/plugins/ua_pubsub_ethernet.c b/plugins/ua_pubsub_ethernet.c
index 88c73c9fbf3..d730bf15b33 100644
--- a/plugins/ua_pubsub_ethernet.c
+++ b/plugins/ua_pubsub_ethernet.c
@@ -1344,6 +1344,12 @@ TransportLayerEthernet_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
     return pubSubChannel;
 }
 
+static UA_StatusCode
+TransportLayerEthernet_addWritergroupChannel(UA_PubSubChannel **out, UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void* ctx)  {
+    *out = NULL;
+    return UA_STATUSCODE_GOOD;
+}
+
 UA_PubSubTransportLayer
 UA_PubSubTransportLayerEthernet(void) {
     UA_PubSubTransportLayer pubSubTransportLayer;
@@ -1351,6 +1357,7 @@ UA_PubSubTransportLayerEthernet(void) {
     pubSubTransportLayer.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     pubSubTransportLayer.createPubSubChannel = &TransportLayerEthernet_addChannel;
+    pubSubTransportLayer.createWriterGroupPubSubChannel= &TransportLayerEthernet_addWritergroupChannel;
     pubSubTransportLayer.connectionManager = NULL;
 
     return pubSubTransportLayer;
diff --git a/plugins/ua_pubsub_mqtt.c b/plugins/ua_pubsub_mqtt.c
index 3e14e343605..a95bcd55f98 100644
--- a/plugins/ua_pubsub_mqtt.c
+++ b/plugins/ua_pubsub_mqtt.c
@@ -411,6 +411,12 @@ TransportLayerMQTT_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
     return pubSubChannel;
 }
 
+static UA_StatusCode
+TransportLayerMQTT_addWritergroupChannel(UA_PubSubChannel **out, UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void* ctx)  {
+    *out = NULL;
+    return UA_STATUSCODE_GOOD;
+}
+
 //MQTT channel factory
 UA_PubSubTransportLayer
 UA_PubSubTransportLayerMQTT(void){
@@ -418,6 +424,7 @@ UA_PubSubTransportLayerMQTT(void){
 
     pubSubTransportLayer.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
     pubSubTransportLayer.createPubSubChannel = &TransportLayerMQTT_addChannel;
+    pubSubTransportLayer.createWriterGroupPubSubChannel= &TransportLayerMQTT_addWritergroupChannel;
     pubSubTransportLayer.connectionManager = NULL;
     return pubSubTransportLayer;
 }
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index a4657cdc92b..084034d572f 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -523,6 +523,40 @@ TransportLayerUDP_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
     return pubSubChannel;
 }
 
+static UA_StatusCode
+TransportLayerUDP_addWritergroupChannel(UA_PubSubChannel **out, UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void* ctx)  {
+    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
+    if(writerGroupTransportSettings && writerGroupTransportSettings->content.decoded.type == &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE]) {
+        UA_DatagramWriterGroupTransport2DataType *ts = (UA_DatagramWriterGroupTransport2DataType *) writerGroupTransportSettings->content.decoded.data;
+        const char *assertedPrefix = "opc.udp://localhost:";
+
+        if(strncmp(assertedPrefix, (char *) tctx->connectionAddress->url.data, strlen(assertedPrefix)) != 0) {
+
+            UA_LOG_ERROR(tctx->logger, UA_LOGCATEGORY_PUBSUB,
+                         "PubSub WriterGroup creating failed. Invalid Address of PubSub Connection.");
+            return UA_STATUSCODE_BADCONNECTIONREJECTED;
+        }
+
+        if(ts->address.content.decoded.type == &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) {
+            UA_NetworkAddressUrlDataType *address = (UA_NetworkAddressUrlDataType *) ts->address.content.decoded.data;
+            const char *prefix = "opc.udp://";
+            if(strncmp(prefix, (char *) address->url.data, strlen(prefix)) == 0) {
+
+                /* Retrieve the transport layer for the given profile uri */
+                tctx->writerGroupAddress = address;
+                *out = tl->createPubSubChannel(tl, tctx);
+                return UA_STATUSCODE_GOOD;
+            } else {
+                return UA_STATUSCODE_BADCONNECTIONREJECTED;
+            }
+        } else {
+            return UA_STATUSCODE_BADCONNECTIONREJECTED;
+        }
+    } else {
+        return UA_STATUSCODE_GOOD;
+    }
+}
+
 //UDP channel factory
 UA_PubSubTransportLayer
 UA_PubSubTransportLayerUDP(void) {
@@ -538,6 +572,7 @@ UA_PubSubTransportLayerUDP(void) {
     pubSubTransportLayer.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     pubSubTransportLayer.createPubSubChannel = &TransportLayerUDP_addChannel;
+    pubSubTransportLayer.createWriterGroupPubSubChannel= &TransportLayerUDP_addWritergroupChannel;
     pubSubTransportLayer.connectionManager = NULL;
     return pubSubTransportLayer;
 }
diff --git a/plugins/ua_pubsub_udp_multicast.c b/plugins/ua_pubsub_udp_multicast.c
index e9cd8ec3a5f..2b4a92a1909 100644
--- a/plugins/ua_pubsub_udp_multicast.c
+++ b/plugins/ua_pubsub_udp_multicast.c
@@ -869,6 +869,11 @@ TransportLayerUDPMC_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
     }
     return pubSubChannel;
 }
+static UA_StatusCode
+TransportLayerUDPMC_addWritergroupChannel(UA_PubSubChannel **out, UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void* ctx)  {
+    *out = NULL;
+    return UA_STATUSCODE_GOOD;
+}
 
 //UDPMC channel factory
 UA_PubSubTransportLayer
@@ -877,5 +882,6 @@ UA_PubSubTransportLayerUDPMP(void) {
     pubSubTransportLayer.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     pubSubTransportLayer.createPubSubChannel = &TransportLayerUDPMC_addChannel;
+    pubSubTransportLayer.createWriterGroupPubSubChannel= &TransportLayerUDPMC_addWritergroupChannel;
     return pubSubTransportLayer;
 }
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index da2759e48b2..e469e40b8fa 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -106,52 +106,32 @@ UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
         newConfig->messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
     }
     /* writerGroupTransportSettings */
-    newWriterGroup->channel = NULL;
-    const UA_ExtensionObject *writerGroupTransportSettings = &writerGroupConfig->transportSettings;
-    if(writerGroupTransportSettings && writerGroupTransportSettings->content.decoded.type == &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE]) {
-        UA_DatagramWriterGroupTransport2DataType *ts = (UA_DatagramWriterGroupTransport2DataType *) writerGroupTransportSettings->content.decoded.data;
-        if(UA_Variant_hasScalarType(&currentConnectionContext->config->address,
-                                     &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
-            UA_NetworkAddressUrlDataType *address =
-                (UA_NetworkAddressUrlDataType *)currentConnectionContext->config->address.data;
-            const char *prefix = "opc.udp://localhost:";
-
-            if(strncmp(prefix, (char *) address->url.data, strlen(prefix)) != 0) {
-
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                             "PubSub WriterGroup creating failed. Invalid Address of PubSub Connection.");
-                UA_free(newWriterGroup);
-                return UA_STATUSCODE_BADINTERNALERROR;
-            }
-        }
-
-        if(ts->address.content.decoded.type == &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) {
-            UA_NetworkAddressUrlDataType *address = (UA_NetworkAddressUrlDataType *) ts->address.content.decoded.data;
-            const char *prefix = "opc.udp://";
-            if(strncmp(prefix, (char *) address->url.data, strlen(prefix)) == 0) {
-
-                UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                             "adding udp unicast WriterGroup connecting to "
-
-                             );
-                /* Retrieve the transport layer for the given profile uri */
-                UA_PubSubTransportLayer *tl = UA_getTransportProtocolLayer(server, &currentConnectionContext->config->transportProfileUri);
-                UA_CHECK_MEM_ERROR(tl, UA_free(newWriterGroup); return UA_STATUSCODE_BADNOTFOUND, &server->config.logger,
-                                   UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. Requested transport layer not found.");
-                UA_TransportLayerContext ctx;
-                ctx.writerGroupAddress = address;
-                ctx.connection = currentConnectionContext;
-                ctx.connectionConfig = currentConnectionContext->config;
-                /* TODO: The callback is for readers, not writers. Currently unused. */
-                ctx.decodeAndProcessNetworkMessage =
-                    (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
-                     UA_decodeAndProcessNetworkMessage;
-                ctx.server = server;
-
-                newWriterGroup->channel = tl->createPubSubChannel(tl, &ctx);
-            }
-        }
+    /* Retrieve the transport layer for the given profile uri */
+    UA_PubSubTransportLayer *tl = UA_getTransportProtocolLayer(server, &currentConnectionContext->config->transportProfileUri);
+    UA_CHECK_MEM_ERROR(tl, UA_free(newWriterGroup); return UA_STATUSCODE_BADNOTFOUND, &server->config.logger,
+                       UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. Requested transport layer not found.");
+    UA_TransportLayerContext ctx;
+    ctx.writerGroupAddress = NULL;
+    ctx.connection = currentConnectionContext;
+    if(UA_Variant_hasScalarType(&currentConnectionContext->config->address,
+                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
+        UA_NetworkAddressUrlDataType *address =
+            (UA_NetworkAddressUrlDataType *)currentConnectionContext->config->address.data;
+        ctx.connectionAddress = address;
+    } else {
+        UA_free(newWriterGroup);
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
+    ctx.connectionConfig = currentConnectionContext->config;
+    /* TODO: The callback is for readers, not writers. Currently unused. */
+    ctx.decodeAndProcessNetworkMessage =
+        (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
+            UA_decodeAndProcessNetworkMessage;
+    ctx.server = server;
+    ctx.logger = &server->config.logger;
+    res = tl->createWriterGroupPubSubChannel(&newWriterGroup->channel, tl, &writerGroupConfig->transportSettings, &ctx);
+    UA_CHECK_STATUS_ERROR(res, UA_free(newWriterGroup); return res, &server->config.logger, UA_LOGCATEGORY_PUBSUB,
+                          "PubSub Connection creation failed. WriterGroup specific PubSub channel failed");
 
     /* Attach to the connection */
     LIST_INSERT_HEAD(&currentConnectionContext->writerGroups, newWriterGroup, listEntry);
diff --git a/tests/pubsub/check_pubsub_config_freeze.c b/tests/pubsub/check_pubsub_config_freeze.c
index 51cd017669e..080d5734528 100644
--- a/tests/pubsub/check_pubsub_config_freeze.c
+++ b/tests/pubsub/check_pubsub_config_freeze.c
@@ -21,7 +21,7 @@ static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 389986ea2a4..21f1022a882 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -18,7 +18,7 @@ static void setup(void) {
     assert(server != 0);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_informationmodel.c b/tests/pubsub/check_pubsub_informationmodel.c
index b316096be70..b3db3b6baa6 100644
--- a/tests/pubsub/check_pubsub_informationmodel.c
+++ b/tests/pubsub/check_pubsub_informationmodel.c
@@ -30,7 +30,7 @@ static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 62a6b36beda..f26391f61db 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -33,7 +33,7 @@ static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
     THREAD_CREATE(server_thread, serverloop);
 }
diff --git a/tests/pubsub/check_pubsub_keystorage.c b/tests/pubsub/check_pubsub_keystorage.c
index c3744851063..435f36786d0 100644
--- a/tests/pubsub/check_pubsub_keystorage.c
+++ b/tests/pubsub/check_pubsub_keystorage.c
@@ -183,7 +183,7 @@ setup(void) {
     SecurityGroupId = UA_STRING("TestSecurityGroup");
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
 
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
diff --git a/tests/pubsub/check_pubsub_multiple_layer.c b/tests/pubsub/check_pubsub_multiple_layer.c
index d0aa7c97344..7c922fddeaf 100644
--- a/tests/pubsub/check_pubsub_multiple_layer.c
+++ b/tests/pubsub/check_pubsub_multiple_layer.c
@@ -27,13 +27,13 @@ START_TEST(AddMultipleTransportLayers){
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 1);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 2);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 3);
 
     UA_Server_delete(server);
diff --git a/tests/pubsub/check_pubsub_pds.c b/tests/pubsub/check_pubsub_pds.c
index 518c6458396..42f176f6ade 100644
--- a/tests/pubsub/check_pubsub_pds.c
+++ b/tests/pubsub/check_pubsub_pds.c
@@ -19,7 +19,7 @@ static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index f0d60595c4a..3a26c9fbdab 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -24,7 +24,7 @@ static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
 
     UA_Server_run_startup(server);
     //add 2 connections
diff --git a/tests/pubsub/check_pubsub_publish_json.c b/tests/pubsub/check_pubsub_publish_json.c
index f9488ddf64b..ff11bbaa1a3 100644
--- a/tests/pubsub/check_pubsub_publish_json.c
+++ b/tests/pubsub/check_pubsub_publish_json.c
@@ -23,7 +23,7 @@ static void setup(void) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
 
     UA_Server_run_startup(server);
     UA_PubSubConnectionConfig connectionConfig;
diff --git a/tests/pubsub/check_pubsub_publishspeed.c b/tests/pubsub/check_pubsub_publishspeed.c
index ead5a3077ef..8947bea8cd8 100644
--- a/tests/pubsub/check_pubsub_publishspeed.c
+++ b/tests/pubsub/check_pubsub_publishspeed.c
@@ -22,7 +22,7 @@ static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
 
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
diff --git a/tests/pubsub/check_pubsub_subscribe_config_freeze.c b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
index 05526f0a12f..e51cd9a1905 100644
--- a/tests/pubsub/check_pubsub_subscribe_config_freeze.c
+++ b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
@@ -21,7 +21,7 @@ static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
 }
 

From 018e52d14ff4cc53d99d2d7d52ba7794d5b1f1ed Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 29 Dec 2022 11:19:38 +0100
Subject: [PATCH 0617/1963] fix(pubsub): if application is NULL no callback

This fix cares about a state where e.g. at the same time
of a connection callback there is a remote method call on that
same connection to remove it. If the removal is done prior to the
connection callback the state is invalidated. The channel
of the connection is allready freed and NULL thus leading to
SEGFAULT when accessing that same channel in the connection callback.
---
 plugins/ua_pubsub_udp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 084034d572f..046b9d712da 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -95,7 +95,7 @@ UA_PubSub_udpCallbackPublish(UA_ConnectionManager *cm, uintptr_t connectionId,
                              UA_ConnectionState state, const UA_KeyValueMap *params,
                              UA_ByteString msg) {
 
-    if(state == UA_CONNECTIONSTATE_CLOSED || state == UA_CONNECTIONSTATE_CLOSING) {
+    if(state == UA_CONNECTIONSTATE_CLOSED || state == UA_CONNECTIONSTATE_CLOSING || !application) {
         return;
     }
     UA_PubSubChannel *channel = (UA_PubSubChannel *) application;

From dab7a6fcd79aeb4cb50f77cb3569528deb644ec8 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 29 Dec 2022 12:27:01 +0100
Subject: [PATCH 0618/1963] fix(pubsub): make amalgamation build succeed

---
 include/open62541/plugin/pubsub.h | 4 ++--
 plugins/ua_pubsub_udp.c           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/open62541/plugin/pubsub.h b/include/open62541/plugin/pubsub.h
index d14896e89f3..466d2949faa 100644
--- a/include/open62541/plugin/pubsub.h
+++ b/include/open62541/plugin/pubsub.h
@@ -11,8 +11,8 @@
 #include <open62541/types.h>
 #include <open62541/types_generated.h>
 #include <open62541/util.h>
+#include <open62541/plugin/log.h>
 
-#include <open62541/plugin/eventloop.h>
 
 _UA_BEGIN_DECLS
 
@@ -109,7 +109,7 @@ struct UA_PubSubChannel {
 
 typedef struct UA_PubSubTransportLayer {
     UA_String transportProfileUri;
-    UA_ConnectionManager *connectionManager;
+    void *connectionManager;
     // UA_Server *server;
     UA_PubSubChannel *(*createPubSubChannel)(struct UA_PubSubTransportLayer *tl, void *ctx);
     UA_StatusCode (*createWriterGroupPubSubChannel)(UA_PubSubChannel** outChannel, struct UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void *ctx);
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 046b9d712da..121a063c553 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -499,9 +499,9 @@ TransportLayerUDP_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
         (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
 
     if(tctx->writerGroupAddress)  {
-        pubSubChannel = UA_PubSubChannelUDP_openUnicast(tl->connectionManager, tctx, tctx->writerGroupAddress);
+        pubSubChannel = UA_PubSubChannelUDP_openUnicast((UA_ConnectionManager*) tl->connectionManager, tctx, tctx->writerGroupAddress);
     } else {
-        pubSubChannel = UA_PubSubChannelUDP_open(tl->connectionManager, tctx, address);
+        pubSubChannel = UA_PubSubChannelUDP_open((UA_ConnectionManager*) tl->connectionManager, tctx, address);
     }
 
     if(pubSubChannel){

From bbaced2827e4d8f2b2d64353e313b48d969bec9c Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 29 Dec 2022 14:08:54 +0100
Subject: [PATCH 0619/1963] test(pubsub): check if legacy-test succeeds in
 pipeline

---
 tests/pubsub/check_pubsub_informationmodel_methods.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index f26391f61db..62a6b36beda 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -33,7 +33,7 @@ static void setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     UA_Server_run_startup(server);
     THREAD_CREATE(server_thread, serverloop);
 }

From cdc1a3173b9a884d055d38aa5e9f24bc29632c8c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 3 Jan 2023 23:00:46 +0100
Subject: [PATCH 0620/1963] refactor(deps): Update NodeIds.csv

---
 tools/schema/NodeIds.csv | 9392 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 9363 insertions(+), 29 deletions(-)

diff --git a/tools/schema/NodeIds.csv b/tools/schema/NodeIds.csv
index c12a751a4a9..1da405f2f97 100644
--- a/tools/schema/NodeIds.csv
+++ b/tools/schema/NodeIds.csv
@@ -87,10 +87,6 @@ DataTypeDescriptionType_DataTypeVersion,104,Variable
 DataTypeDescriptionType_DictionaryFragment,105,Variable
 DataTypeDictionaryType_DataTypeVersion,106,Variable
 DataTypeDictionaryType_NamespaceUri,107,Variable
-ModellingRuleType_NamingRule,111,Variable
-ModellingRule_Mandatory_NamingRule,112,Variable
-ModellingRule_Optional_NamingRule,113,Variable
-ModellingRule_ExposesItsArray_NamingRule,114,Variable
 HasSubStateMachine,117,ReferenceType
 NamingRuleType,120,DataType
 DataTypeDefinition_Encoding_DefaultBinary,121,Object
@@ -4254,9 +4250,7 @@ AggregateFunction_StartBound,11505,Object
 AggregateFunction_EndBound,11506,Object
 AggregateFunction_DeltaBounds,11507,Object
 ModellingRule_OptionalPlaceholder,11508,Object
-ModellingRule_OptionalPlaceholder_NamingRule,11509,Variable
 ModellingRule_MandatoryPlaceholder,11510,Object
-ModellingRule_MandatoryPlaceholder_NamingRule,11511,Variable
 MaxArrayLength,11512,Variable
 EngineeringUnits,11513,Variable
 ServerType_ServerCapabilities_MaxArrayLength,11514,Variable
@@ -4833,8 +4827,6 @@ TrustListUpdatedAuditEventType_Status,12572,Variable
 TrustListUpdatedAuditEventType_ServerId,12573,Variable
 TrustListUpdatedAuditEventType_ClientAuditEntryId,12574,Variable
 TrustListUpdatedAuditEventType_ClientUserId,12575,Variable
-TrustListUpdatedAuditEventType_MethodId,12576,Variable
-TrustListUpdatedAuditEventType_InputArguments,12577,Variable
 UpdateCertificateMethodType,12578,Method
 UpdateCertificateMethodType_InputArguments,12579,Variable
 UpdateCertificateMethodType_OutputArguments,12580,Variable
@@ -4860,8 +4852,6 @@ CertificateUpdatedAuditEventType_Status,12631,Variable
 CertificateUpdatedAuditEventType_ServerId,12632,Variable
 CertificateUpdatedAuditEventType_ClientAuditEntryId,12633,Variable
 CertificateUpdatedAuditEventType_ClientUserId,12634,Variable
-CertificateUpdatedAuditEventType_MethodId,12635,Variable
-CertificateUpdatedAuditEventType_InputArguments,12636,Variable
 ServerConfiguration,12637,Object
 ServerConfiguration_SupportedPrivateKeyFormats,12639,Variable
 ServerConfiguration_MaxTrustListSize,12640,Variable
@@ -6227,16 +6217,6 @@ ProgramDiagnostic2Type_LastMethodInputValues,15392,Variable
 ProgramDiagnostic2Type_LastMethodOutputValues,15393,Variable
 ProgramDiagnostic2Type_LastMethodCallTime,15394,Variable
 ProgramDiagnostic2Type_LastMethodReturnStatus,15395,Variable
-ProgramDiagnostic2DataType,15396,DataType
-ProgramDiagnostic2DataType_Encoding_DefaultBinary,15397,Object
-OpcUa_BinarySchema_ProgramDiagnostic2DataType,15398,Variable
-OpcUa_BinarySchema_ProgramDiagnostic2DataType_DataTypeVersion,15399,Variable
-OpcUa_BinarySchema_ProgramDiagnostic2DataType_DictionaryFragment,15400,Variable
-ProgramDiagnostic2DataType_Encoding_DefaultXml,15401,Object
-OpcUa_XmlSchema_ProgramDiagnostic2DataType,15402,Variable
-OpcUa_XmlSchema_ProgramDiagnostic2DataType_DataTypeVersion,15403,Variable
-OpcUa_XmlSchema_ProgramDiagnostic2DataType_DictionaryFragment,15404,Variable
-ProgramDiagnostic2DataType_Encoding_DefaultJson,15405,Object
 AccessLevelExType,15406,DataType
 AccessLevelExType_OptionSetValues,15407,Variable
 RoleSetType_RoleName_Placeholder_ApplicationsExclude,15408,Variable
@@ -8051,7 +8031,7 @@ DiscrepancyAlarmType_Tolerance,17217,Variable
 SafetyConditionClassType,17218,ObjectType
 HighlyManagedAlarmConditionClassType,17219,ObjectType
 TrainingConditionClassType,17220,ObjectType
-TestingConditionSubClassType,17221,ObjectType
+TestingConditionClassType,17221,ObjectType
 AuditConditionCommentEventType_ConditionEventId,17222,Variable
 AuditConditionAcknowledgeEventType_ConditionEventId,17223,Variable
 AuditConditionConfirmEventType_ConditionEventId,17224,Variable
@@ -8216,10 +8196,6 @@ PublishSubscribe_PublishedDataSets_AddPublishedEventsTemplate_InputArguments,173
 PublishSubscribe_PublishedDataSets_AddPublishedEventsTemplate_OutputArguments,17383,Variable
 PublishSubscribe_PublishedDataSets_RemovePublishedDataSet,17384,Method
 PublishSubscribe_PublishedDataSets_RemovePublishedDataSet_InputArguments,17385,Variable
-PublishSubscribe_PubSubConfiguration,25451,Object
-PublishSubscribe_PubSubConfiguration_ReserveIds,25474,Method
-PublishSubscribe_PubSubConfiguration_ReserveIds_InputArguments,25475,Variable
-PublishSubscribe_PubSubConfiguration_ReserveIds_OutputArguments,25476,Variable
 DataSetReaderType_CreateTargetVariables,17386,Method
 DataSetReaderType_CreateTargetVariables_InputArguments,17387,Variable
 DataSetReaderType_CreateTargetVariables_OutputArguments,17388,Variable
@@ -8827,9 +8803,9 @@ AudioVariableType_VersionId,17990,Variable
 AlarmMetricsType_StartTime,17991,Variable
 WriterGroupType_RemoveDataSetWriter,17992,Method
 WriterGroupType_RemoveDataSetWriter_InputArguments,17993,Variable
-PubSubGroupTypeAddWriterrMethodType,17994,Method
-PubSubGroupTypeAddWriterrMethodType_InputArguments,17995,Variable
-PubSubGroupTypeAddWriterrMethodType_OutputArguments,17996,Variable
+PubSubGroupTypeAddWriterMethodType,17994,Method
+PubSubGroupTypeAddWriterMethodType_InputArguments,17995,Variable
+PubSubGroupTypeAddWriterMethodType_OutputArguments,17996,Variable
 WriterGroupTransportType,17997,ObjectType
 WriterGroupMessageType,17998,ObjectType
 ReaderGroupType,17999,ObjectType
@@ -10280,6 +10256,106 @@ TrustListOutOfDateAlarmType_TrustListId,19446,Variable
 TrustListOutOfDateAlarmType_LastUpdateTime,19447,Variable
 TrustListOutOfDateAlarmType_UpdateFrequency,19448,Variable
 CertificateGroupType_TrustList_UpdateFrequency,19449,Variable
+CertificateGroupType_CertificateExpired,19450,Object
+CertificateGroupType_CertificateExpired_EventId,19451,Variable
+CertificateGroupType_CertificateExpired_EventType,19452,Variable
+CertificateGroupType_CertificateExpired_SourceNode,19453,Variable
+CertificateGroupType_CertificateExpired_SourceName,19454,Variable
+CertificateGroupType_CertificateExpired_Time,19455,Variable
+CertificateGroupType_CertificateExpired_ReceiveTime,19456,Variable
+CertificateGroupType_CertificateExpired_LocalTime,19457,Variable
+CertificateGroupType_CertificateExpired_Message,19458,Variable
+CertificateGroupType_CertificateExpired_Severity,19459,Variable
+CertificateGroupType_CertificateExpired_ConditionClassId,19460,Variable
+CertificateGroupType_CertificateExpired_ConditionClassName,19461,Variable
+CertificateGroupType_CertificateExpired_ConditionSubClassId,19462,Variable
+CertificateGroupType_CertificateExpired_ConditionSubClassName,19463,Variable
+CertificateGroupType_CertificateExpired_ConditionName,19464,Variable
+CertificateGroupType_CertificateExpired_BranchId,19465,Variable
+CertificateGroupType_CertificateExpired_Retain,19466,Variable
+CertificateGroupType_CertificateExpired_EnabledState,19467,Variable
+CertificateGroupType_CertificateExpired_EnabledState_Id,19468,Variable
+CertificateGroupType_CertificateExpired_EnabledState_Name,19469,Variable
+CertificateGroupType_CertificateExpired_EnabledState_Number,19470,Variable
+CertificateGroupType_CertificateExpired_EnabledState_EffectiveDisplayName,19471,Variable
+CertificateGroupType_CertificateExpired_EnabledState_TransitionTime,19472,Variable
+CertificateGroupType_CertificateExpired_EnabledState_EffectiveTransitionTime,19473,Variable
+CertificateGroupType_CertificateExpired_EnabledState_TrueState,19474,Variable
+CertificateGroupType_CertificateExpired_EnabledState_FalseState,19475,Variable
+CertificateGroupType_CertificateExpired_Quality,19476,Variable
+CertificateGroupType_CertificateExpired_Quality_SourceTimestamp,19477,Variable
+CertificateGroupType_CertificateExpired_LastSeverity,19478,Variable
+CertificateGroupType_CertificateExpired_LastSeverity_SourceTimestamp,19479,Variable
+CertificateGroupType_CertificateExpired_Comment,19480,Variable
+CertificateGroupType_CertificateExpired_Comment_SourceTimestamp,19481,Variable
+CertificateGroupType_CertificateExpired_ClientUserId,19482,Variable
+CertificateGroupType_CertificateExpired_Disable,19483,Method
+CertificateGroupType_CertificateExpired_Enable,19484,Method
+CertificateGroupType_CertificateExpired_AddComment,19485,Method
+CertificateGroupType_CertificateExpired_AddComment_InputArguments,19486,Variable
+CertificateGroupType_CertificateExpired_AckedState,19487,Variable
+CertificateGroupType_CertificateExpired_AckedState_Id,19488,Variable
+CertificateGroupType_CertificateExpired_AckedState_Name,19489,Variable
+CertificateGroupType_CertificateExpired_AckedState_Number,19490,Variable
+CertificateGroupType_CertificateExpired_AckedState_EffectiveDisplayName,19491,Variable
+CertificateGroupType_CertificateExpired_AckedState_TransitionTime,19492,Variable
+CertificateGroupType_CertificateExpired_AckedState_EffectiveTransitionTime,19493,Variable
+CertificateGroupType_CertificateExpired_AckedState_TrueState,19494,Variable
+CertificateGroupType_CertificateExpired_AckedState_FalseState,19495,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState,19496,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState_Id,19497,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState_Name,19498,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState_Number,19499,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState_EffectiveDisplayName,19500,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState_TransitionTime,19501,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState_EffectiveTransitionTime,19502,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState_TrueState,19503,Variable
+CertificateGroupType_CertificateExpired_ConfirmedState_FalseState,19504,Variable
+CertificateGroupType_CertificateExpired_Acknowledge,19505,Method
+CertificateGroupType_CertificateExpired_Acknowledge_InputArguments,19506,Variable
+CertificateGroupType_CertificateExpired_Confirm,19507,Method
+CertificateGroupType_CertificateExpired_Confirm_InputArguments,19508,Variable
+CertificateGroupType_CertificateExpired_ActiveState,19509,Variable
+CertificateGroupType_CertificateExpired_ActiveState_Id,19510,Variable
+CertificateGroupType_CertificateExpired_ActiveState_Name,19511,Variable
+CertificateGroupType_CertificateExpired_ActiveState_Number,19512,Variable
+CertificateGroupType_CertificateExpired_ActiveState_EffectiveDisplayName,19513,Variable
+CertificateGroupType_CertificateExpired_ActiveState_TransitionTime,19514,Variable
+CertificateGroupType_CertificateExpired_ActiveState_EffectiveTransitionTime,19515,Variable
+CertificateGroupType_CertificateExpired_ActiveState_TrueState,19516,Variable
+CertificateGroupType_CertificateExpired_ActiveState_FalseState,19517,Variable
+CertificateGroupType_CertificateExpired_InputNode,19518,Variable
+CertificateGroupType_CertificateExpired_SuppressedState,19519,Variable
+CertificateGroupType_CertificateExpired_SuppressedState_Id,19520,Variable
+CertificateGroupType_CertificateExpired_SuppressedState_Name,19521,Variable
+CertificateGroupType_CertificateExpired_SuppressedState_Number,19522,Variable
+CertificateGroupType_CertificateExpired_SuppressedState_EffectiveDisplayName,19523,Variable
+CertificateGroupType_CertificateExpired_SuppressedState_TransitionTime,19524,Variable
+CertificateGroupType_CertificateExpired_SuppressedState_EffectiveTransitionTime,19525,Variable
+CertificateGroupType_CertificateExpired_SuppressedState_TrueState,19526,Variable
+CertificateGroupType_CertificateExpired_SuppressedState_FalseState,19527,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState,19528,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState_Id,19529,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState_Name,19530,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState_Number,19531,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState_EffectiveDisplayName,19532,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState_TransitionTime,19533,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,19534,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState_TrueState,19535,Variable
+CertificateGroupType_CertificateExpired_OutOfServiceState_FalseState,19536,Variable
+CertificateGroupType_CertificateExpired_ShelvingState,19537,Object
+CertificateGroupType_CertificateExpired_ShelvingState_CurrentState,19538,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_CurrentState_Id,19539,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_CurrentState_Name,19540,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_CurrentState_Number,19541,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,19542,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_LastTransition,19543,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_LastTransition_Id,19544,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_LastTransition_Name,19545,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_LastTransition_Number,19546,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_LastTransition_TransitionTime,19547,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,19548,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_AvailableStates,19549,Variable
 DataSetWriterType_Diagnostics,19550,Object
 DataSetWriterType_Diagnostics_DiagnosticsLevel,19551,Variable
 DataSetWriterType_Diagnostics_TotalInformation,19552,Variable
@@ -10825,11 +10901,909 @@ PubSubDiagnosticsDataSetReaderType_LiveValues_SecurityTokenID,20091,Variable
 PubSubDiagnosticsDataSetReaderType_LiveValues_SecurityTokenID_DiagnosticsLevel,20092,Variable
 PubSubDiagnosticsDataSetReaderType_LiveValues_TimeToNextTokenID,20093,Variable
 PubSubDiagnosticsDataSetReaderType_LiveValues_TimeToNextTokenID_DiagnosticsLevel,20094,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_AvailableTransitions,20095,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_UnshelveTime,20096,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_TimedShelve,20097,Method
+CertificateGroupType_CertificateExpired_ShelvingState_TimedShelve_InputArguments,20098,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_Unshelve,20099,Method
+CertificateGroupType_CertificateExpired_ShelvingState_OneShotShelve,20100,Method
+CertificateGroupType_CertificateExpired_SuppressedOrShelved,20101,Variable
+CertificateGroupType_CertificateExpired_MaxTimeShelved,20102,Variable
+CertificateGroupType_CertificateExpired_AudibleEnabled,20103,Variable
+CertificateGroupType_CertificateExpired_AudibleSound,20104,Variable
+CertificateGroupType_CertificateExpired_AudibleSound_ListId,20105,Variable
+CertificateGroupType_CertificateExpired_AudibleSound_AgencyId,20106,Variable
+CertificateGroupType_CertificateExpired_AudibleSound_VersionId,20107,Variable
+CertificateGroupType_CertificateExpired_SilenceState,20108,Variable
+CertificateGroupType_CertificateExpired_SilenceState_Id,20109,Variable
+CertificateGroupType_CertificateExpired_SilenceState_Name,20110,Variable
+CertificateGroupType_CertificateExpired_SilenceState_Number,20111,Variable
+CertificateGroupType_CertificateExpired_SilenceState_EffectiveDisplayName,20112,Variable
+CertificateGroupType_CertificateExpired_SilenceState_TransitionTime,20113,Variable
+CertificateGroupType_CertificateExpired_SilenceState_EffectiveTransitionTime,20114,Variable
+CertificateGroupType_CertificateExpired_SilenceState_TrueState,20115,Variable
+CertificateGroupType_CertificateExpired_SilenceState_FalseState,20116,Variable
+CertificateGroupType_CertificateExpired_OnDelay,20117,Variable
+CertificateGroupType_CertificateExpired_OffDelay,20118,Variable
+CertificateGroupType_CertificateExpired_FirstInGroupFlag,20119,Variable
+CertificateGroupType_CertificateExpired_FirstInGroup,20120,Object
+CertificateGroupType_CertificateExpired_LatchedState,20121,Variable
+CertificateGroupType_CertificateExpired_LatchedState_Id,20122,Variable
+CertificateGroupType_CertificateExpired_LatchedState_Name,20123,Variable
+CertificateGroupType_CertificateExpired_LatchedState_Number,20124,Variable
+CertificateGroupType_CertificateExpired_LatchedState_EffectiveDisplayName,20125,Variable
+CertificateGroupType_CertificateExpired_LatchedState_TransitionTime,20126,Variable
+CertificateGroupType_CertificateExpired_LatchedState_EffectiveTransitionTime,20127,Variable
+CertificateGroupType_CertificateExpired_LatchedState_TrueState,20128,Variable
+CertificateGroupType_CertificateExpired_LatchedState_FalseState,20129,Variable
+CertificateGroupType_CertificateExpired_ReAlarmTime,20130,Variable
+CertificateGroupType_CertificateExpired_ReAlarmRepeatCount,20131,Variable
+CertificateGroupType_CertificateExpired_Silence,20132,Method
+CertificateGroupType_CertificateExpired_Suppress,20133,Method
+CertificateGroupType_CertificateExpired_Unsuppress,20134,Method
+CertificateGroupType_CertificateExpired_RemoveFromService,20135,Method
+CertificateGroupType_CertificateExpired_PlaceInService,20136,Method
+CertificateGroupType_CertificateExpired_Reset,20137,Method
+CertificateGroupType_CertificateExpired_NormalState,20138,Variable
+CertificateGroupType_CertificateExpired_ExpirationDate,20139,Variable
+CertificateGroupType_CertificateExpired_ExpirationLimit,20140,Variable
+CertificateGroupType_CertificateExpired_CertificateType,20141,Variable
+CertificateGroupType_CertificateExpired_Certificate,20142,Variable
+CertificateGroupType_TrustListOutOfDate,20143,Object
+CertificateGroupType_TrustListOutOfDate_EventId,20144,Variable
+CertificateGroupType_TrustListOutOfDate_EventType,20145,Variable
+CertificateGroupType_TrustListOutOfDate_SourceNode,20146,Variable
+CertificateGroupType_TrustListOutOfDate_SourceName,20147,Variable
+CertificateGroupType_TrustListOutOfDate_Time,20148,Variable
+CertificateGroupType_TrustListOutOfDate_ReceiveTime,20149,Variable
+CertificateGroupType_TrustListOutOfDate_LocalTime,20150,Variable
+CertificateGroupType_TrustListOutOfDate_Message,20151,Variable
+CertificateGroupType_TrustListOutOfDate_Severity,20152,Variable
+CertificateGroupType_TrustListOutOfDate_ConditionClassId,20153,Variable
+CertificateGroupType_TrustListOutOfDate_ConditionClassName,20154,Variable
+CertificateGroupType_TrustListOutOfDate_ConditionSubClassId,20155,Variable
+CertificateGroupType_TrustListOutOfDate_ConditionSubClassName,20156,Variable
+CertificateGroupType_TrustListOutOfDate_ConditionName,20157,Variable
+CertificateGroupType_TrustListOutOfDate_BranchId,20158,Variable
+CertificateGroupType_TrustListOutOfDate_Retain,20159,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState,20160,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState_Id,20161,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState_Name,20162,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState_Number,20163,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState_EffectiveDisplayName,20164,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState_TransitionTime,20165,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,20166,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState_TrueState,20167,Variable
+CertificateGroupType_TrustListOutOfDate_EnabledState_FalseState,20168,Variable
+CertificateGroupType_TrustListOutOfDate_Quality,20169,Variable
+CertificateGroupType_TrustListOutOfDate_Quality_SourceTimestamp,20170,Variable
+CertificateGroupType_TrustListOutOfDate_LastSeverity,20171,Variable
+CertificateGroupType_TrustListOutOfDate_LastSeverity_SourceTimestamp,20172,Variable
+CertificateGroupType_TrustListOutOfDate_Comment,20173,Variable
+CertificateGroupType_TrustListOutOfDate_Comment_SourceTimestamp,20174,Variable
+CertificateGroupType_TrustListOutOfDate_ClientUserId,20175,Variable
+CertificateGroupType_TrustListOutOfDate_Disable,20176,Method
+CertificateGroupType_TrustListOutOfDate_Enable,20177,Method
+CertificateGroupType_TrustListOutOfDate_AddComment,20178,Method
+CertificateGroupType_TrustListOutOfDate_AddComment_InputArguments,20179,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState,20180,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState_Id,20181,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState_Name,20182,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState_Number,20183,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState_EffectiveDisplayName,20184,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState_TransitionTime,20185,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState_EffectiveTransitionTime,20186,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState_TrueState,20187,Variable
+CertificateGroupType_TrustListOutOfDate_AckedState_FalseState,20188,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState,20189,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState_Id,20190,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState_Name,20191,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState_Number,20192,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,20193,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState_TransitionTime,20194,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,20195,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState_TrueState,20196,Variable
+CertificateGroupType_TrustListOutOfDate_ConfirmedState_FalseState,20197,Variable
+CertificateGroupType_TrustListOutOfDate_Acknowledge,20198,Method
+CertificateGroupType_TrustListOutOfDate_Acknowledge_InputArguments,20199,Variable
+CertificateGroupType_TrustListOutOfDate_Confirm,20200,Method
+CertificateGroupType_TrustListOutOfDate_Confirm_InputArguments,20201,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState,20202,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState_Id,20203,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState_Name,20204,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState_Number,20205,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState_EffectiveDisplayName,20206,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState_TransitionTime,20207,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,20208,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState_TrueState,20209,Variable
+CertificateGroupType_TrustListOutOfDate_ActiveState_FalseState,20210,Variable
+CertificateGroupType_TrustListOutOfDate_InputNode,20211,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState,20212,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState_Id,20213,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState_Name,20214,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState_Number,20215,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,20216,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState_TransitionTime,20217,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,20218,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState_TrueState,20219,Variable
+CertificateGroupType_TrustListOutOfDate_SuppressedState_FalseState,20220,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState,20221,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState_Id,20222,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState_Name,20223,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState_Number,20224,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,20225,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState_TransitionTime,20226,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,20227,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState_TrueState,20228,Variable
+CertificateGroupType_TrustListOutOfDate_OutOfServiceState_FalseState,20229,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState,20230,Object
+CertificateGroupType_TrustListOutOfDate_ShelvingState_CurrentState,20231,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_CurrentState_Id,20232,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_CurrentState_Name,20233,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_CurrentState_Number,20234,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,20235,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_LastTransition,20236,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_LastTransition_Id,20237,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_LastTransition_Name,20238,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_LastTransition_Number,20239,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,20240,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,20241,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_AvailableStates,20242,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_AvailableTransitions,20243,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_UnshelveTime,20244,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_TimedShelve,20245,Method
+CertificateGroupType_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,20246,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_Unshelve,20247,Method
+CertificateGroupType_TrustListOutOfDate_ShelvingState_OneShotShelve,20248,Method
+CertificateGroupType_TrustListOutOfDate_SuppressedOrShelved,20249,Variable
+CertificateGroupType_TrustListOutOfDate_MaxTimeShelved,20250,Variable
+CertificateGroupType_TrustListOutOfDate_AudibleEnabled,20251,Variable
+CertificateGroupType_TrustListOutOfDate_AudibleSound,20252,Variable
+CertificateGroupType_TrustListOutOfDate_AudibleSound_ListId,20253,Variable
+CertificateGroupType_TrustListOutOfDate_AudibleSound_AgencyId,20254,Variable
+CertificateGroupType_TrustListOutOfDate_AudibleSound_VersionId,20255,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState,20256,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState_Id,20257,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState_Name,20258,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState_Number,20259,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState_EffectiveDisplayName,20260,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState_TransitionTime,20261,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,20262,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState_TrueState,20263,Variable
+CertificateGroupType_TrustListOutOfDate_SilenceState_FalseState,20264,Variable
+CertificateGroupType_TrustListOutOfDate_OnDelay,20265,Variable
+CertificateGroupType_TrustListOutOfDate_OffDelay,20266,Variable
+CertificateGroupType_TrustListOutOfDate_FirstInGroupFlag,20267,Variable
+CertificateGroupType_TrustListOutOfDate_FirstInGroup,20268,Object
+CertificateGroupType_TrustListOutOfDate_LatchedState,20269,Variable
+CertificateGroupType_TrustListOutOfDate_LatchedState_Id,20270,Variable
+CertificateGroupType_TrustListOutOfDate_LatchedState_Name,20271,Variable
+CertificateGroupType_TrustListOutOfDate_LatchedState_Number,20272,Variable
+CertificateGroupType_TrustListOutOfDate_LatchedState_EffectiveDisplayName,20273,Variable
+CertificateGroupType_TrustListOutOfDate_LatchedState_TransitionTime,20274,Variable
+CertificateGroupType_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,20275,Variable
+CertificateGroupType_TrustListOutOfDate_LatchedState_TrueState,20276,Variable
+CertificateGroupType_TrustListOutOfDate_LatchedState_FalseState,20277,Variable
+CertificateGroupType_TrustListOutOfDate_ReAlarmTime,20278,Variable
+CertificateGroupType_TrustListOutOfDate_ReAlarmRepeatCount,20279,Variable
+CertificateGroupType_TrustListOutOfDate_Silence,20280,Method
+CertificateGroupType_TrustListOutOfDate_Suppress,20281,Method
+CertificateGroupType_TrustListOutOfDate_Unsuppress,20282,Method
+CertificateGroupType_TrustListOutOfDate_RemoveFromService,20283,Method
+CertificateGroupType_TrustListOutOfDate_PlaceInService,20284,Method
+CertificateGroupType_TrustListOutOfDate_Reset,20285,Method
+CertificateGroupType_TrustListOutOfDate_NormalState,20286,Variable
+CertificateGroupType_TrustListOutOfDate_TrustListId,20287,Variable
+CertificateGroupType_TrustListOutOfDate_LastUpdateTime,20288,Variable
+CertificateGroupType_TrustListOutOfDate_UpdateFrequency,20289,Variable
 CertificateGroupFolderType_DefaultApplicationGroup_TrustList_UpdateFrequency,20290,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired,20291,Object
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EventId,20292,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EventType,20293,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SourceNode,20294,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SourceName,20295,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Time,20296,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ReceiveTime,20297,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LocalTime,20298,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Message,20299,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Severity,20300,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConditionClassId,20301,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConditionClassName,20302,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConditionSubClassId,20303,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConditionSubClassName,20304,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConditionName,20305,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_BranchId,20306,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Retain,20307,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState,20308,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState_Id,20309,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState_Name,20310,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState_Number,20311,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveDisplayName,20312,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState_TransitionTime,20313,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,20314,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState_TrueState,20315,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_EnabledState_FalseState,20316,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Quality,20317,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Quality_SourceTimestamp,20318,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LastSeverity,20319,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LastSeverity_SourceTimestamp,20320,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Comment,20321,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Comment_SourceTimestamp,20322,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ClientUserId,20323,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Disable,20324,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Enable,20325,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AddComment,20326,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AddComment_InputArguments,20327,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState,20328,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState_Id,20329,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState_Name,20330,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState_Number,20331,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveDisplayName,20332,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState_TransitionTime,20333,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveTransitionTime,20334,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState_TrueState,20335,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AckedState_FalseState,20336,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState,20337,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Id,20338,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Name,20339,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Number,20340,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,20341,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TransitionTime,20342,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,20343,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TrueState,20344,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ConfirmedState_FalseState,20345,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Acknowledge,20346,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Acknowledge_InputArguments,20347,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Confirm,20348,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Confirm_InputArguments,20349,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState,20350,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState_Id,20351,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState_Name,20352,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState_Number,20353,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveDisplayName,20354,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState_TransitionTime,20355,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,20356,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState_TrueState,20357,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ActiveState_FalseState,20358,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_InputNode,20359,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState,20360,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState_Id,20361,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState_Name,20362,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState_Number,20363,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,20364,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState_TransitionTime,20365,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,20366,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState_TrueState,20367,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedState_FalseState,20368,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState,20369,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Id,20370,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Name,20371,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Number,20372,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,20373,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TransitionTime,20374,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,20375,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TrueState,20376,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_FalseState,20377,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState,20378,Object
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState,20379,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Id,20380,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Name,20381,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Number,20382,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,20383,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition,20384,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Id,20385,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Name,20386,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Number,20387,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,20388,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,20389,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableStates,20390,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableTransitions,20391,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_UnshelveTime,20392,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve,20393,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,20394,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve,20395,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve,20396,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SuppressedOrShelved,20397,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_MaxTimeShelved,20398,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AudibleEnabled,20399,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AudibleSound,20400,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AudibleSound_ListId,20401,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AudibleSound_AgencyId,20402,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_AudibleSound_VersionId,20403,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState,20404,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState_Id,20405,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState_Name,20406,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState_Number,20407,Variable
 DataSetOrderingType,20408,DataType
 ReaderGroupType_DataSetReaderName_Placeholder_Diagnostics_LiveValues_SecurityTokenID,20409,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveDisplayName,20410,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState_TransitionTime,20411,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,20412,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState_TrueState,20413,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_SilenceState_FalseState,20414,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OnDelay,20415,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_OffDelay,20416,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_FirstInGroupFlag,20417,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_FirstInGroup,20418,Object
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState,20419,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState_Id,20420,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState_Name,20421,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState_Number,20422,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveDisplayName,20423,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState_TransitionTime,20424,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,20425,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState_TrueState,20426,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_LatchedState_FalseState,20427,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ReAlarmTime,20428,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ReAlarmRepeatCount,20429,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Silence,20430,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Suppress,20431,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Unsuppress,20432,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_RemoveFromService,20433,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_PlaceInService,20434,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Reset,20435,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_NormalState,20436,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ExpirationDate,20437,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ExpirationLimit,20438,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_CertificateType,20439,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Certificate,20440,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate,20441,Object
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EventId,20442,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EventType,20443,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SourceNode,20444,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SourceName,20445,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Time,20446,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ReceiveTime,20447,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LocalTime,20448,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Message,20449,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Severity,20450,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassId,20451,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassName,20452,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassId,20453,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassName,20454,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConditionName,20455,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_BranchId,20456,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Retain,20457,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState,20458,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Id,20459,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Name,20460,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Number,20461,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,20462,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TransitionTime,20463,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,20464,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TrueState,20465,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_FalseState,20466,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Quality,20467,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Quality_SourceTimestamp,20468,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity,20469,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,20470,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Comment,20471,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Comment_SourceTimestamp,20472,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ClientUserId,20473,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Disable,20474,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Enable,20475,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AddComment,20476,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AddComment_InputArguments,20477,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState,20478,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Id,20479,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Name,20480,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Number,20481,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,20482,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TransitionTime,20483,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,20484,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TrueState,20485,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AckedState_FalseState,20486,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState,20487,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Id,20488,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Name,20489,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Number,20490,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,20491,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,20492,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,20493,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TrueState,20494,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_FalseState,20495,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge,20496,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge_InputArguments,20497,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Confirm,20498,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Confirm_InputArguments,20499,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState,20500,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Id,20501,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Name,20502,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Number,20503,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,20504,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TransitionTime,20505,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,20506,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TrueState,20507,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_FalseState,20508,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_InputNode,20509,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState,20510,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Id,20511,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Name,20512,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Number,20513,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,20514,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TransitionTime,20515,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,20516,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TrueState,20517,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_FalseState,20518,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState,20519,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Id,20520,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Name,20521,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Number,20522,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,20523,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,20524,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,20525,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TrueState,20526,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_FalseState,20527,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState,20528,Object
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState,20529,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,20530,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,20531,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,20532,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,20533,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition,20534,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,20535,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,20536,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,20537,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,20538,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,20539,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableStates,20540,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,20541,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,20542,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve,20543,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,20544,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve,20545,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,20546,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SuppressedOrShelved,20547,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_MaxTimeShelved,20548,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AudibleEnabled,20549,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound,20550,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_ListId,20551,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_AgencyId,20552,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_VersionId,20553,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState,20554,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Id,20555,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Name,20556,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Number,20557,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,20558,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TransitionTime,20559,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,20560,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TrueState,20561,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_FalseState,20562,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OnDelay,20563,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_OffDelay,20564,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroupFlag,20565,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroup,20566,Object
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState,20567,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Id,20568,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Name,20569,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Number,20570,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,20571,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TransitionTime,20572,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,20573,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TrueState,20574,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_FalseState,20575,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmTime,20576,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmRepeatCount,20577,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Silence,20578,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Suppress,20579,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress,20580,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService,20581,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService,20582,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Reset,20583,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_NormalState,20584,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_TrustListId,20585,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_LastUpdateTime,20586,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_UpdateFrequency,20587,Variable
 CertificateGroupFolderType_DefaultHttpsGroup_TrustList_UpdateFrequency,20588,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired,20589,Object
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EventId,20590,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EventType,20591,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SourceNode,20592,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SourceName,20593,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Time,20594,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ReceiveTime,20595,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LocalTime,20596,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Message,20597,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Severity,20598,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConditionClassId,20599,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConditionClassName,20600,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConditionSubClassId,20601,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConditionSubClassName,20602,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConditionName,20603,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_BranchId,20604,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Retain,20605,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState,20606,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState_Id,20607,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState_Name,20608,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState_Number,20609,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveDisplayName,20610,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState_TransitionTime,20611,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,20612,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState_TrueState,20613,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_EnabledState_FalseState,20614,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Quality,20615,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Quality_SourceTimestamp,20616,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LastSeverity,20617,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LastSeverity_SourceTimestamp,20618,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Comment,20619,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Comment_SourceTimestamp,20620,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ClientUserId,20621,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Disable,20622,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Enable,20623,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AddComment,20624,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AddComment_InputArguments,20625,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState,20626,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState_Id,20627,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState_Name,20628,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState_Number,20629,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveDisplayName,20630,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState_TransitionTime,20631,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveTransitionTime,20632,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState_TrueState,20633,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AckedState_FalseState,20634,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState,20635,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Id,20636,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Name,20637,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Number,20638,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,20639,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TransitionTime,20640,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,20641,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TrueState,20642,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ConfirmedState_FalseState,20643,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Acknowledge,20644,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Acknowledge_InputArguments,20645,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Confirm,20646,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Confirm_InputArguments,20647,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState,20648,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState_Id,20649,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState_Name,20650,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState_Number,20651,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveDisplayName,20652,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState_TransitionTime,20653,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,20654,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState_TrueState,20655,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ActiveState_FalseState,20656,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_InputNode,20657,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState,20658,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState_Id,20659,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState_Name,20660,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState_Number,20661,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,20662,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState_TransitionTime,20663,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,20664,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState_TrueState,20665,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedState_FalseState,20666,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState,20667,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Id,20668,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Name,20669,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Number,20670,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,20671,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TransitionTime,20672,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,20673,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TrueState,20674,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_FalseState,20675,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState,20676,Object
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState,20677,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Id,20678,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Name,20679,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Number,20680,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,20681,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition,20682,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Id,20683,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Name,20684,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Number,20685,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,20686,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,20687,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableStates,20688,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableTransitions,20689,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_UnshelveTime,20690,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve,20691,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,20692,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve,20693,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve,20694,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SuppressedOrShelved,20695,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_MaxTimeShelved,20696,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AudibleEnabled,20697,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AudibleSound,20698,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AudibleSound_ListId,20699,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AudibleSound_AgencyId,20700,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_AudibleSound_VersionId,20701,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState,20702,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState_Id,20703,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState_Name,20704,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState_Number,20705,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveDisplayName,20706,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState_TransitionTime,20707,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,20708,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState_TrueState,20709,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_SilenceState_FalseState,20710,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OnDelay,20711,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_OffDelay,20712,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_FirstInGroupFlag,20713,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_FirstInGroup,20714,Object
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState,20715,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState_Id,20716,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState_Name,20717,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState_Number,20718,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveDisplayName,20719,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState_TransitionTime,20720,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,20721,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState_TrueState,20722,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_LatchedState_FalseState,20723,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ReAlarmTime,20724,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ReAlarmRepeatCount,20725,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Silence,20726,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Suppress,20727,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Unsuppress,20728,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_RemoveFromService,20729,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_PlaceInService,20730,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Reset,20731,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_NormalState,20732,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ExpirationDate,20733,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ExpirationLimit,20734,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_CertificateType,20735,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Certificate,20736,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate,20737,Object
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EventId,20738,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EventType,20739,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SourceNode,20740,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SourceName,20741,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Time,20742,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ReceiveTime,20743,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LocalTime,20744,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Message,20745,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Severity,20746,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassId,20747,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassName,20748,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassId,20749,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassName,20750,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConditionName,20751,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_BranchId,20752,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Retain,20753,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState,20754,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Id,20755,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Name,20756,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Number,20757,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,20758,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TransitionTime,20759,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,20760,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TrueState,20761,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_FalseState,20762,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Quality,20763,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Quality_SourceTimestamp,20764,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity,20765,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,20766,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Comment,20767,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Comment_SourceTimestamp,20768,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ClientUserId,20769,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Disable,20770,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Enable,20771,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AddComment,20772,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AddComment_InputArguments,20773,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState,20774,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Id,20775,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Name,20776,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Number,20777,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,20778,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TransitionTime,20779,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,20780,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TrueState,20781,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AckedState_FalseState,20782,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState,20783,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Id,20784,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Name,20785,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Number,20786,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,20787,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,20788,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,20789,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TrueState,20790,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_FalseState,20791,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge,20792,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge_InputArguments,20793,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Confirm,20794,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Confirm_InputArguments,20795,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState,20796,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Id,20797,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Name,20798,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Number,20799,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,20800,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TransitionTime,20801,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,20802,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TrueState,20803,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_FalseState,20804,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_InputNode,20805,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState,20806,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Id,20807,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Name,20808,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Number,20809,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,20810,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TransitionTime,20811,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,20812,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TrueState,20813,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_FalseState,20814,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState,20815,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Id,20816,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Name,20817,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Number,20818,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,20819,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,20820,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,20821,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TrueState,20822,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_FalseState,20823,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState,20824,Object
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState,20825,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,20826,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,20827,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,20828,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,20829,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition,20830,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,20831,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,20832,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,20833,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,20834,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,20835,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableStates,20836,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,20837,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,20838,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve,20839,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,20840,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve,20841,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,20842,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SuppressedOrShelved,20843,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_MaxTimeShelved,20844,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AudibleEnabled,20845,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound,20846,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_ListId,20847,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_AgencyId,20848,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_VersionId,20849,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState,20850,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Id,20851,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Name,20852,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Number,20853,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,20854,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TransitionTime,20855,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,20856,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TrueState,20857,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_FalseState,20858,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OnDelay,20859,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_OffDelay,20860,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroupFlag,20861,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroup,20862,Object
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState,20863,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Id,20864,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Name,20865,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Number,20866,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,20867,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TransitionTime,20868,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,20869,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TrueState,20870,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_FalseState,20871,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmTime,20872,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmRepeatCount,20873,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Silence,20874,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Suppress,20875,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress,20876,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService,20877,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService,20878,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Reset,20879,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_NormalState,20880,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_TrustListId,20881,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_LastUpdateTime,20882,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_UpdateFrequency,20883,Variable
 CertificateGroupFolderType_DefaultUserTokenGroup_TrustList_UpdateFrequency,20884,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired,20885,Object
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EventId,20886,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EventType,20887,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SourceNode,20888,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SourceName,20889,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Time,20890,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ReceiveTime,20891,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LocalTime,20892,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Message,20893,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Severity,20894,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConditionClassId,20895,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConditionClassName,20896,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassId,20897,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassName,20898,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConditionName,20899,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_BranchId,20900,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Retain,20901,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState,20902,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState_Id,20903,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState_Name,20904,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState_Number,20905,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveDisplayName,20906,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState_TransitionTime,20907,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,20908,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState_TrueState,20909,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_EnabledState_FalseState,20910,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Quality,20911,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Quality_SourceTimestamp,20912,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LastSeverity,20913,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LastSeverity_SourceTimestamp,20914,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Comment,20915,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Comment_SourceTimestamp,20916,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ClientUserId,20917,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Disable,20918,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Enable,20919,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AddComment,20920,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AddComment_InputArguments,20921,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState,20922,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState_Id,20923,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState_Name,20924,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState_Number,20925,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveDisplayName,20926,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState_TransitionTime,20927,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveTransitionTime,20928,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState_TrueState,20929,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AckedState_FalseState,20930,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState,20931,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Id,20932,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Name,20933,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Number,20934,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,20935,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TransitionTime,20936,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,20937,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TrueState,20938,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_FalseState,20939,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Acknowledge,20940,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Acknowledge_InputArguments,20941,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Confirm,20942,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Confirm_InputArguments,20943,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState,20944,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState_Id,20945,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState_Name,20946,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState_Number,20947,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveDisplayName,20948,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState_TransitionTime,20949,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,20950,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState_TrueState,20951,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ActiveState_FalseState,20952,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_InputNode,20953,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState,20954,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Id,20955,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Name,20956,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Number,20957,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,20958,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TransitionTime,20959,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,20960,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TrueState,20961,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedState_FalseState,20962,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState,20963,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Id,20964,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Name,20965,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Number,20966,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,20967,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TransitionTime,20968,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,20969,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TrueState,20970,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_FalseState,20971,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState,20972,Object
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState,20973,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Id,20974,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Name,20975,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Number,20976,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,20977,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition,20978,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Id,20979,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Name,20980,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Number,20981,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,20982,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,20983,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableStates,20984,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableTransitions,20985,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_UnshelveTime,20986,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve,20987,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,20988,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve,20989,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve,20990,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SuppressedOrShelved,20991,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_MaxTimeShelved,20992,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AudibleEnabled,20993,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AudibleSound,20994,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AudibleSound_ListId,20995,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AudibleSound_AgencyId,20996,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_AudibleSound_VersionId,20997,Variable
 VersionTime,20998,DataType
 SessionlessInvokeResponseType,20999,DataType
 SessionlessInvokeResponseType_Encoding_DefaultXml,21000,Object
@@ -10839,6 +11813,8 @@ ReaderGroupType_DataSetReaderName_Placeholder_Diagnostics_LiveValues_SecurityTok
 ReaderGroupType_DataSetReaderName_Placeholder_Diagnostics_LiveValues_TimeToNextTokenID,21004,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_Diagnostics_LiveValues_TimeToNextTokenID_DiagnosticsLevel,21005,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_SubscribedDataSet,21006,Object
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState,21007,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState_Id,21008,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_CreateTargetVariables,21009,Method
 ReaderGroupType_DataSetReaderName_Placeholder_CreateTargetVariables_InputArguments,21010,Variable
 ReaderGroupType_DataSetReaderName_Placeholder_CreateTargetVariables_OutputArguments,21011,Variable
@@ -10948,6 +11924,7 @@ UadpDataSetWriterMessageType_NetworkMessageNumber,21114,Variable
 UadpDataSetWriterMessageType_DataSetOffset,21115,Variable
 UadpDataSetReaderMessageType,21116,ObjectType
 UadpDataSetReaderMessageType_GroupVersion,21117,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState_Name,21118,Variable
 UadpDataSetReaderMessageType_NetworkMessageNumber,21119,Variable
 UadpDataSetReaderMessageType_DataSetClassId,21120,Variable
 UadpDataSetReaderMessageType_NetworkMessageContentMask,21121,Variable
@@ -11033,13 +12010,2257 @@ NetworkAddressUrlDataType_Encoding_DefaultJson,21200,Object
 ReaderGroupDataType_Encoding_DefaultJson,21201,Object
 PubSubConfigurationDataType_Encoding_DefaultJson,21202,Object
 DatagramWriterGroupTransportDataType_Encoding_DefaultJson,21203,Object
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState_Number,21204,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveDisplayName,21205,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState_TransitionTime,21206,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,21207,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState_TrueState,21208,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_SilenceState_FalseState,21209,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OnDelay,21210,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_OffDelay,21211,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_FirstInGroupFlag,21212,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_FirstInGroup,21213,Object
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState,21214,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState_Id,21215,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState_Name,21216,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState_Number,21217,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveDisplayName,21218,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState_TransitionTime,21219,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,21220,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState_TrueState,21221,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_LatchedState_FalseState,21222,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ReAlarmTime,21223,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ReAlarmRepeatCount,21224,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Silence,21225,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Suppress,21226,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Unsuppress,21227,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_RemoveFromService,21228,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_PlaceInService,21229,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Reset,21230,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_NormalState,21231,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ExpirationDate,21232,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ExpirationLimit,21233,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_CertificateType,21234,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Certificate,21235,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate,21236,Object
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EventId,21237,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EventType,21238,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SourceNode,21239,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SourceName,21240,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Time,21241,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ReceiveTime,21242,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LocalTime,21243,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Message,21244,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Severity,21245,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassId,21246,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassName,21247,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassId,21248,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassName,21249,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConditionName,21250,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_BranchId,21251,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Retain,21252,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState,21253,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Id,21254,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Name,21255,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Number,21256,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,21257,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TransitionTime,21258,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,21259,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TrueState,21260,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_FalseState,21261,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Quality,21262,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Quality_SourceTimestamp,21263,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity,21264,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,21265,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Comment,21266,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Comment_SourceTimestamp,21267,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ClientUserId,21268,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Disable,21269,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Enable,21270,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AddComment,21271,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AddComment_InputArguments,21272,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState,21273,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Id,21274,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Name,21275,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Number,21276,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,21277,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TransitionTime,21278,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,21279,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TrueState,21280,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_FalseState,21281,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState,21282,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Id,21283,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Name,21284,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Number,21285,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,21286,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,21287,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,21288,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TrueState,21289,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_FalseState,21290,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge,21291,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge_InputArguments,21292,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Confirm,21293,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Confirm_InputArguments,21294,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState,21295,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Id,21296,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Name,21297,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Number,21298,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,21299,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TransitionTime,21300,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,21301,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TrueState,21302,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_FalseState,21303,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_InputNode,21304,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState,21305,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Id,21306,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Name,21307,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Number,21308,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,21309,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TransitionTime,21310,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,21311,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TrueState,21312,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_FalseState,21313,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState,21314,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Id,21315,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Name,21316,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Number,21317,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,21318,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,21319,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,21320,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TrueState,21321,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_FalseState,21322,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState,21323,Object
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState,21324,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,21325,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,21326,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,21327,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,21328,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition,21329,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,21330,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,21331,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,21332,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,21333,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,21334,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableStates,21335,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,21336,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,21337,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve,21338,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,21339,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve,21340,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,21341,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedOrShelved,21342,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_MaxTimeShelved,21343,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AudibleEnabled,21344,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound,21345,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_ListId,21346,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_AgencyId,21347,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_VersionId,21348,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState,21349,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Id,21350,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Name,21351,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Number,21352,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,21353,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TransitionTime,21354,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,21355,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TrueState,21356,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_FalseState,21357,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OnDelay,21358,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_OffDelay,21359,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroupFlag,21360,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroup,21361,Object
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState,21362,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Id,21363,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Name,21364,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Number,21365,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,21366,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TransitionTime,21367,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,21368,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TrueState,21369,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_FalseState,21370,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmTime,21371,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmRepeatCount,21372,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Silence,21373,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Suppress,21374,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress,21375,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService,21376,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService,21377,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Reset,21378,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_NormalState,21379,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_TrustListId,21380,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_LastUpdateTime,21381,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_UpdateFrequency,21382,Variable
 CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustList_UpdateFrequency,21383,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired,21384,Object
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EventId,21385,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EventType,21386,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SourceNode,21387,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SourceName,21388,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Time,21389,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ReceiveTime,21390,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LocalTime,21391,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Message,21392,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Severity,21393,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConditionClassId,21394,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConditionClassName,21395,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConditionSubClassId,21396,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConditionSubClassName,21397,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConditionName,21398,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_BranchId,21399,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Retain,21400,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState,21401,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState_Id,21402,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState_Name,21403,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState_Number,21404,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState_EffectiveDisplayName,21405,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState_TransitionTime,21406,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState_EffectiveTransitionTime,21407,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState_TrueState,21408,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_EnabledState_FalseState,21409,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Quality,21410,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Quality_SourceTimestamp,21411,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LastSeverity,21412,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LastSeverity_SourceTimestamp,21413,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Comment,21414,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Comment_SourceTimestamp,21415,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ClientUserId,21416,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Disable,21417,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Enable,21418,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AddComment,21419,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AddComment_InputArguments,21420,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState,21421,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState_Id,21422,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState_Name,21423,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState_Number,21424,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState_EffectiveDisplayName,21425,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState_TransitionTime,21426,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState_EffectiveTransitionTime,21427,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState_TrueState,21428,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AckedState_FalseState,21429,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState,21430,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState_Id,21431,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState_Name,21432,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState_Number,21433,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState_EffectiveDisplayName,21434,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState_TransitionTime,21435,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState_EffectiveTransitionTime,21436,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState_TrueState,21437,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ConfirmedState_FalseState,21438,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Acknowledge,21439,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Acknowledge_InputArguments,21440,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Confirm,21441,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Confirm_InputArguments,21442,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState,21443,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState_Id,21444,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState_Name,21445,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState_Number,21446,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState_EffectiveDisplayName,21447,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState_TransitionTime,21448,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState_EffectiveTransitionTime,21449,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState_TrueState,21450,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ActiveState_FalseState,21451,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_InputNode,21452,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState,21453,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState_Id,21454,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState_Name,21455,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState_Number,21456,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState_EffectiveDisplayName,21457,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState_TransitionTime,21458,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState_EffectiveTransitionTime,21459,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState_TrueState,21460,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedState_FalseState,21461,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState,21462,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState_Id,21463,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState_Name,21464,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState_Number,21465,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState_EffectiveDisplayName,21466,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState_TransitionTime,21467,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,21468,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState_TrueState,21469,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OutOfServiceState_FalseState,21470,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState,21471,Object
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_CurrentState,21472,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_CurrentState_Id,21473,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_CurrentState_Name,21474,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_CurrentState_Number,21475,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,21476,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_LastTransition,21477,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_LastTransition_Id,21478,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_LastTransition_Name,21479,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_LastTransition_Number,21480,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_LastTransition_TransitionTime,21481,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,21482,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_AvailableStates,21483,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_AvailableTransitions,21484,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_UnshelveTime,21485,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_TimedShelve,21486,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_TimedShelve_InputArguments,21487,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_Unshelve,21488,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_OneShotShelve,21489,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SuppressedOrShelved,21490,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_MaxTimeShelved,21491,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AudibleEnabled,21492,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AudibleSound,21493,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AudibleSound_ListId,21494,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AudibleSound_AgencyId,21495,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_AudibleSound_VersionId,21496,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState,21497,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState_Id,21498,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState_Name,21499,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState_Number,21500,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState_EffectiveDisplayName,21501,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState_TransitionTime,21502,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState_EffectiveTransitionTime,21503,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState_TrueState,21504,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_SilenceState_FalseState,21505,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OnDelay,21506,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_OffDelay,21507,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_FirstInGroupFlag,21508,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_FirstInGroup,21509,Object
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState,21510,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState_Id,21511,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState_Name,21512,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState_Number,21513,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState_EffectiveDisplayName,21514,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState_TransitionTime,21515,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState_EffectiveTransitionTime,21516,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState_TrueState,21517,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_LatchedState_FalseState,21518,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ReAlarmTime,21519,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ReAlarmRepeatCount,21520,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Silence,21521,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Suppress,21522,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Unsuppress,21523,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_RemoveFromService,21524,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_PlaceInService,21525,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Reset,21526,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_NormalState,21527,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ExpirationDate,21528,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ExpirationLimit,21529,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_CertificateType,21530,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Certificate,21531,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate,21532,Object
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EventId,21533,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EventType,21534,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SourceNode,21535,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SourceName,21536,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Time,21537,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ReceiveTime,21538,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LocalTime,21539,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Message,21540,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Severity,21541,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConditionClassId,21542,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConditionClassName,21543,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConditionSubClassId,21544,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConditionSubClassName,21545,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConditionName,21546,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_BranchId,21547,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Retain,21548,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState,21549,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState_Id,21550,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState_Name,21551,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState_Number,21552,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState_EffectiveDisplayName,21553,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState_TransitionTime,21554,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,21555,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState_TrueState,21556,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_EnabledState_FalseState,21557,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Quality,21558,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Quality_SourceTimestamp,21559,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LastSeverity,21560,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LastSeverity_SourceTimestamp,21561,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Comment,21562,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Comment_SourceTimestamp,21563,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ClientUserId,21564,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Disable,21565,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Enable,21566,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AddComment,21567,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AddComment_InputArguments,21568,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState,21569,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState_Id,21570,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState_Name,21571,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState_Number,21572,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState_EffectiveDisplayName,21573,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState_TransitionTime,21574,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState_EffectiveTransitionTime,21575,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState_TrueState,21576,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AckedState_FalseState,21577,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState,21578,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState_Id,21579,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState_Name,21580,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState_Number,21581,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,21582,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState_TransitionTime,21583,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,21584,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState_TrueState,21585,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ConfirmedState_FalseState,21586,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Acknowledge,21587,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Acknowledge_InputArguments,21588,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Confirm,21589,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Confirm_InputArguments,21590,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState,21591,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState_Id,21592,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState_Name,21593,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState_Number,21594,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState_EffectiveDisplayName,21595,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState_TransitionTime,21596,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,21597,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState_TrueState,21598,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ActiveState_FalseState,21599,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_InputNode,21600,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState,21601,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState_Id,21602,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState_Name,21603,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState_Number,21604,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,21605,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState_TransitionTime,21606,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,21607,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState_TrueState,21608,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedState_FalseState,21609,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState,21610,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState_Id,21611,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState_Name,21612,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState_Number,21613,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,21614,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState_TransitionTime,21615,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,21616,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState_TrueState,21617,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OutOfServiceState_FalseState,21618,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState,21619,Object
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_CurrentState,21620,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_CurrentState_Id,21621,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_CurrentState_Name,21622,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_CurrentState_Number,21623,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,21624,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_LastTransition,21625,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_LastTransition_Id,21626,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_LastTransition_Name,21627,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_LastTransition_Number,21628,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,21629,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,21630,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_AvailableStates,21631,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_AvailableTransitions,21632,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_UnshelveTime,21633,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_TimedShelve,21634,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,21635,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_Unshelve,21636,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_OneShotShelve,21637,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SuppressedOrShelved,21638,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_MaxTimeShelved,21639,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AudibleEnabled,21640,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AudibleSound,21641,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AudibleSound_ListId,21642,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AudibleSound_AgencyId,21643,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_AudibleSound_VersionId,21644,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState,21645,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState_Id,21646,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState_Name,21647,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState_Number,21648,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState_EffectiveDisplayName,21649,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState_TransitionTime,21650,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,21651,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState_TrueState,21652,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_SilenceState_FalseState,21653,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OnDelay,21654,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_OffDelay,21655,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_FirstInGroupFlag,21656,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_FirstInGroup,21657,Object
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState,21658,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState_Id,21659,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState_Name,21660,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState_Number,21661,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState_EffectiveDisplayName,21662,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState_TransitionTime,21663,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,21664,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState_TrueState,21665,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LatchedState_FalseState,21666,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ReAlarmTime,21667,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ReAlarmRepeatCount,21668,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Silence,21669,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Suppress,21670,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Unsuppress,21671,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_RemoveFromService,21672,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_PlaceInService,21673,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Reset,21674,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_NormalState,21675,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_TrustListId,21676,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_LastUpdateTime,21677,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_UpdateFrequency,21678,Variable
 ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_UpdateFrequency,21679,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired,21680,Object
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventId,21681,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventType,21682,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceNode,21683,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceName,21684,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Time,21685,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReceiveTime,21686,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LocalTime,21687,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Message,21688,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Severity,21689,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassId,21690,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassName,21691,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassId,21692,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassName,21693,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionName,21694,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_BranchId,21695,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Retain,21696,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState,21697,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Id,21698,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Name,21699,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Number,21700,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveDisplayName,21701,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TransitionTime,21702,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,21703,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TrueState,21704,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_FalseState,21705,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality,21706,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality_SourceTimestamp,21707,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity,21708,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity_SourceTimestamp,21709,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment,21710,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment_SourceTimestamp,21711,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ClientUserId,21712,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Disable,21713,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Enable,21714,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment,21715,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment_InputArguments,21716,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState,21717,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Id,21718,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Name,21719,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Number,21720,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveDisplayName,21721,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TransitionTime,21722,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveTransitionTime,21723,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TrueState,21724,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_FalseState,21725,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState,21726,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Id,21727,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Name,21728,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Number,21729,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,21730,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TransitionTime,21731,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,21732,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TrueState,21733,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_FalseState,21734,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge,21735,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge_InputArguments,21736,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm,21737,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm_InputArguments,21738,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState,21739,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Id,21740,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Name,21741,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Number,21742,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveDisplayName,21743,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TransitionTime,21744,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,21745,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TrueState,21746,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_FalseState,21747,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_InputNode,21748,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState,21749,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Id,21750,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Name,21751,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Number,21752,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,21753,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TransitionTime,21754,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,21755,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TrueState,21756,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_FalseState,21757,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState,21758,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Id,21759,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Name,21760,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Number,21761,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,21762,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TransitionTime,21763,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,21764,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TrueState,21765,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_FalseState,21766,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState,21767,Object
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState,21768,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Id,21769,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Name,21770,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Number,21771,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,21772,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition,21773,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Id,21774,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Name,21775,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Number,21776,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,21777,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,21778,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableStates,21779,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableTransitions,21780,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_UnshelveTime,21781,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve,21782,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,21783,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve,21784,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve,21785,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedOrShelved,21786,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_MaxTimeShelved,21787,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleEnabled,21788,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound,21789,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_ListId,21790,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_AgencyId,21791,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_VersionId,21792,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState,21793,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Id,21794,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Name,21795,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Number,21796,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveDisplayName,21797,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TransitionTime,21798,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,21799,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TrueState,21800,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_FalseState,21801,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OnDelay,21802,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OffDelay,21803,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroupFlag,21804,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroup,21805,Object
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState,21806,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Id,21807,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Name,21808,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Number,21809,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveDisplayName,21810,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TransitionTime,21811,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,21812,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TrueState,21813,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_FalseState,21814,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmTime,21815,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmRepeatCount,21816,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Silence,21817,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress,21818,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress,21819,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService,21820,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService,21821,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset,21822,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_NormalState,21823,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationDate,21824,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationLimit,21825,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_CertificateType,21826,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Certificate,21827,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate,21828,Object
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventId,21829,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventType,21830,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceNode,21831,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceName,21832,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Time,21833,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReceiveTime,21834,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LocalTime,21835,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Message,21836,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Severity,21837,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassId,21838,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassName,21839,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassId,21840,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassName,21841,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionName,21842,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_BranchId,21843,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Retain,21844,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState,21845,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Id,21846,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Name,21847,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Number,21848,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,21849,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TransitionTime,21850,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,21851,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TrueState,21852,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_FalseState,21853,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality,21854,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality_SourceTimestamp,21855,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity,21856,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,21857,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment,21858,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment_SourceTimestamp,21859,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ClientUserId,21860,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Disable,21861,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Enable,21862,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment,21863,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment_InputArguments,21864,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState,21865,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Id,21866,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Name,21867,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Number,21868,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,21869,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TransitionTime,21870,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,21871,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TrueState,21872,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_FalseState,21873,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState,21874,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Id,21875,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Name,21876,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Number,21877,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,21878,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,21879,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,21880,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TrueState,21881,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_FalseState,21882,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge,21883,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge_InputArguments,21884,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm,21885,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm_InputArguments,21886,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState,21887,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Id,21888,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Name,21889,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Number,21890,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,21891,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TransitionTime,21892,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,21893,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TrueState,21894,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_FalseState,21895,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_InputNode,21896,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState,21897,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Id,21898,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Name,21899,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Number,21900,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,21901,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TransitionTime,21902,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,21903,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TrueState,21904,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_FalseState,21905,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState,21906,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Id,21907,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Name,21908,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Number,21909,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,21910,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,21911,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,21912,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TrueState,21913,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_FalseState,21914,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState,21915,Object
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState,21916,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,21917,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,21918,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,21919,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,21920,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition,21921,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,21922,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,21923,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,21924,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,21925,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,21926,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableStates,21927,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,21928,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,21929,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve,21930,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,21931,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve,21932,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,21933,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedOrShelved,21934,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_MaxTimeShelved,21935,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleEnabled,21936,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound,21937,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_ListId,21938,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_AgencyId,21939,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_VersionId,21940,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState,21941,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Id,21942,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Name,21943,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Number,21944,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,21945,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TransitionTime,21946,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,21947,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TrueState,21948,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_FalseState,21949,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OnDelay,21950,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OffDelay,21951,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroupFlag,21952,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroup,21953,Object
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState,21954,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Id,21955,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Name,21956,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Number,21957,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,21958,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TransitionTime,21959,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,21960,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TrueState,21961,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_FalseState,21962,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmTime,21963,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmRepeatCount,21964,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Silence,21965,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress,21966,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress,21967,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService,21968,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService,21969,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset,21970,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_NormalState,21971,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_TrustListId,21972,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastUpdateTime,21973,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_UpdateFrequency,21974,Variable
 ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_UpdateFrequency,21975,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired,21976,Object
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventId,21977,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventType,21978,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceNode,21979,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceName,21980,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Time,21981,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReceiveTime,21982,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LocalTime,21983,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Message,21984,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Severity,21985,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassId,21986,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassName,21987,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassId,21988,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassName,21989,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionName,21990,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_BranchId,21991,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Retain,21992,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState,21993,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Id,21994,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Name,21995,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Number,21996,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveDisplayName,21997,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TransitionTime,21998,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,21999,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TrueState,22000,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_FalseState,22001,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality,22002,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality_SourceTimestamp,22003,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity,22004,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity_SourceTimestamp,22005,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment,22006,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment_SourceTimestamp,22007,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ClientUserId,22008,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Disable,22009,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Enable,22010,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment,22011,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment_InputArguments,22012,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState,22013,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Id,22014,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Name,22015,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Number,22016,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveDisplayName,22017,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TransitionTime,22018,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveTransitionTime,22019,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TrueState,22020,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_FalseState,22021,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState,22022,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Id,22023,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Name,22024,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Number,22025,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,22026,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TransitionTime,22027,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,22028,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TrueState,22029,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_FalseState,22030,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge,22031,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge_InputArguments,22032,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm,22033,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm_InputArguments,22034,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState,22035,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Id,22036,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Name,22037,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Number,22038,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveDisplayName,22039,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TransitionTime,22040,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,22041,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TrueState,22042,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_FalseState,22043,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_InputNode,22044,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState,22045,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Id,22046,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Name,22047,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Number,22048,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,22049,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TransitionTime,22050,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,22051,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TrueState,22052,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_FalseState,22053,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState,22054,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Id,22055,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Name,22056,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Number,22057,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,22058,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TransitionTime,22059,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,22060,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TrueState,22061,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_FalseState,22062,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState,22063,Object
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState,22064,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Id,22065,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Name,22066,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Number,22067,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,22068,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition,22069,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Id,22070,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Name,22071,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Number,22072,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,22073,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,22074,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableStates,22075,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableTransitions,22076,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_UnshelveTime,22077,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve,22078,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,22079,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve,22080,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve,22081,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedOrShelved,22082,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_MaxTimeShelved,22083,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleEnabled,22084,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound,22085,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_ListId,22086,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_AgencyId,22087,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_VersionId,22088,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState,22089,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Id,22090,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Name,22091,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Number,22092,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveDisplayName,22093,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TransitionTime,22094,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,22095,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TrueState,22096,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_FalseState,22097,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OnDelay,22098,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OffDelay,22099,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroupFlag,22100,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroup,22101,Object
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState,22102,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Id,22103,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Name,22104,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Number,22105,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveDisplayName,22106,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TransitionTime,22107,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,22108,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TrueState,22109,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_FalseState,22110,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmTime,22111,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmRepeatCount,22112,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Silence,22113,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress,22114,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress,22115,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService,22116,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService,22117,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset,22118,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_NormalState,22119,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationDate,22120,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationLimit,22121,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_CertificateType,22122,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Certificate,22123,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate,22124,Object
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventId,22125,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventType,22126,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceNode,22127,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceName,22128,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Time,22129,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReceiveTime,22130,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LocalTime,22131,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Message,22132,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Severity,22133,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassId,22134,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassName,22135,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassId,22136,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassName,22137,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionName,22138,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_BranchId,22139,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Retain,22140,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState,22141,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Id,22142,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Name,22143,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Number,22144,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,22145,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TransitionTime,22146,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,22147,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TrueState,22148,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_FalseState,22149,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality,22150,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality_SourceTimestamp,22151,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity,22152,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,22153,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment,22154,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment_SourceTimestamp,22155,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ClientUserId,22156,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Disable,22157,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Enable,22158,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment,22159,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment_InputArguments,22160,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState,22161,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Id,22162,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Name,22163,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Number,22164,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,22165,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TransitionTime,22166,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,22167,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TrueState,22168,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_FalseState,22169,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState,22170,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Id,22171,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Name,22172,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Number,22173,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,22174,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,22175,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,22176,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TrueState,22177,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_FalseState,22178,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge,22179,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge_InputArguments,22180,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm,22181,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm_InputArguments,22182,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState,22183,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Id,22184,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Name,22185,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Number,22186,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,22187,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TransitionTime,22188,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,22189,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TrueState,22190,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_FalseState,22191,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_InputNode,22192,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState,22193,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Id,22194,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Name,22195,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Number,22196,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,22197,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TransitionTime,22198,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,22199,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TrueState,22200,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_FalseState,22201,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState,22202,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Id,22203,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Name,22204,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Number,22205,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,22206,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,22207,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,22208,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TrueState,22209,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_FalseState,22210,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState,22211,Object
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState,22212,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,22213,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,22214,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,22215,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,22216,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition,22217,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,22218,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,22219,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,22220,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,22221,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,22222,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableStates,22223,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,22224,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,22225,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve,22226,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,22227,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve,22228,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,22229,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedOrShelved,22230,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_MaxTimeShelved,22231,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleEnabled,22232,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound,22233,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_ListId,22234,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_AgencyId,22235,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_VersionId,22236,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState,22237,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Id,22238,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Name,22239,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Number,22240,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,22241,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TransitionTime,22242,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,22243,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TrueState,22244,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_FalseState,22245,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OnDelay,22246,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OffDelay,22247,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroupFlag,22248,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroup,22249,Object
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState,22250,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Id,22251,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Name,22252,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Number,22253,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,22254,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TransitionTime,22255,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,22256,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TrueState,22257,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_FalseState,22258,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmTime,22259,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmRepeatCount,22260,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Silence,22261,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress,22262,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress,22263,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService,22264,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService,22265,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset,22266,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_NormalState,22267,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_TrustListId,22268,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastUpdateTime,22269,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_UpdateFrequency,22270,Variable
 ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_UpdateFrequency,22271,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired,22272,Object
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventId,22273,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventType,22274,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceNode,22275,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceName,22276,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Time,22277,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReceiveTime,22278,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LocalTime,22279,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Message,22280,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Severity,22281,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassId,22282,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassName,22283,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassId,22284,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassName,22285,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionName,22286,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_BranchId,22287,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Retain,22288,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState,22289,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Id,22290,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Name,22291,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Number,22292,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveDisplayName,22293,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TransitionTime,22294,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,22295,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TrueState,22296,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_FalseState,22297,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality,22298,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality_SourceTimestamp,22299,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity,22300,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity_SourceTimestamp,22301,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment,22302,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment_SourceTimestamp,22303,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ClientUserId,22304,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Disable,22305,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Enable,22306,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment,22307,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment_InputArguments,22308,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState,22309,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Id,22310,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Name,22311,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Number,22312,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveDisplayName,22313,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TransitionTime,22314,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveTransitionTime,22315,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TrueState,22316,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_FalseState,22317,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState,22318,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Id,22319,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Name,22320,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Number,22321,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,22322,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TransitionTime,22323,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,22324,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TrueState,22325,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_FalseState,22326,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge,22327,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge_InputArguments,22328,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm,22329,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm_InputArguments,22330,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState,22331,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Id,22332,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Name,22333,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Number,22334,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveDisplayName,22335,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TransitionTime,22336,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,22337,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TrueState,22338,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_FalseState,22339,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_InputNode,22340,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState,22341,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Id,22342,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Name,22343,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Number,22344,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,22345,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TransitionTime,22346,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,22347,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TrueState,22348,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_FalseState,22349,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState,22350,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Id,22351,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Name,22352,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Number,22353,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,22354,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TransitionTime,22355,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,22356,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TrueState,22357,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_FalseState,22358,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState,22359,Object
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState,22360,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Id,22361,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Name,22362,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Number,22363,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,22364,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition,22365,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Id,22366,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Name,22367,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Number,22368,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,22369,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,22370,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableStates,22371,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableTransitions,22372,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_UnshelveTime,22373,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve,22374,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,22375,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve,22376,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve,22377,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedOrShelved,22378,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_MaxTimeShelved,22379,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleEnabled,22380,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound,22381,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_ListId,22382,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_AgencyId,22383,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_VersionId,22384,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState,22385,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Id,22386,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Name,22387,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Number,22388,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveDisplayName,22389,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TransitionTime,22390,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,22391,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TrueState,22392,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_FalseState,22393,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OnDelay,22394,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OffDelay,22395,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroupFlag,22396,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroup,22397,Object
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState,22398,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Id,22399,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Name,22400,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Number,22401,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveDisplayName,22402,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TransitionTime,22403,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,22404,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TrueState,22405,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_FalseState,22406,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmTime,22407,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmRepeatCount,22408,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Silence,22409,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress,22410,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress,22411,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService,22412,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService,22413,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset,22414,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_NormalState,22415,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationDate,22416,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationLimit,22417,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_CertificateType,22418,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Certificate,22419,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate,22420,Object
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventId,22421,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventType,22422,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceNode,22423,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceName,22424,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Time,22425,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReceiveTime,22426,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LocalTime,22427,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Message,22428,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Severity,22429,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassId,22430,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassName,22431,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassId,22432,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassName,22433,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionName,22434,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_BranchId,22435,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Retain,22436,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState,22437,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Id,22438,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Name,22439,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Number,22440,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,22441,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TransitionTime,22442,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,22443,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TrueState,22444,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_FalseState,22445,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality,22446,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality_SourceTimestamp,22447,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity,22448,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,22449,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment,22450,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment_SourceTimestamp,22451,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ClientUserId,22452,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Disable,22453,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Enable,22454,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment,22455,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment_InputArguments,22456,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState,22457,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Id,22458,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Name,22459,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Number,22460,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,22461,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TransitionTime,22462,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,22463,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TrueState,22464,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_FalseState,22465,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState,22466,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Id,22467,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Name,22468,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Number,22469,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,22470,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,22471,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,22472,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TrueState,22473,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_FalseState,22474,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge,22475,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge_InputArguments,22476,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm,22477,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm_InputArguments,22478,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState,22479,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Id,22480,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Name,22481,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Number,22482,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,22483,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TransitionTime,22484,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,22485,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TrueState,22486,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_FalseState,22487,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_InputNode,22488,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState,22489,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Id,22490,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Name,22491,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Number,22492,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,22493,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TransitionTime,22494,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,22495,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TrueState,22496,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_FalseState,22497,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState,22498,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Id,22499,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Name,22500,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Number,22501,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,22502,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,22503,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,22504,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TrueState,22505,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_FalseState,22506,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState,22507,Object
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState,22508,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,22509,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,22510,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,22511,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,22512,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition,22513,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,22514,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,22515,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,22516,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,22517,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,22518,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableStates,22519,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,22520,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,22521,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve,22522,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,22523,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve,22524,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,22525,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedOrShelved,22526,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_MaxTimeShelved,22527,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleEnabled,22528,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound,22529,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_ListId,22530,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_AgencyId,22531,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_VersionId,22532,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState,22533,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Id,22534,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Name,22535,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Number,22536,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,22537,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TransitionTime,22538,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,22539,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TrueState,22540,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_FalseState,22541,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OnDelay,22542,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OffDelay,22543,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroupFlag,22544,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroup,22545,Object
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState,22546,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Id,22547,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Name,22548,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Number,22549,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,22550,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TransitionTime,22551,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,22552,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TrueState,22553,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_FalseState,22554,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmTime,22555,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmRepeatCount,22556,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Silence,22557,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress,22558,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress,22559,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService,22560,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService,22561,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset,22562,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_NormalState,22563,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_TrustListId,22564,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastUpdateTime,22565,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_UpdateFrequency,22566,Variable
 ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustList_UpdateFrequency,22567,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired,22568,Object
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventId,22569,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventType,22570,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceNode,22571,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceName,22572,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Time,22573,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReceiveTime,22574,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LocalTime,22575,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Message,22576,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Severity,22577,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassId,22578,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassName,22579,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassId,22580,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassName,22581,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionName,22582,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_BranchId,22583,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Retain,22584,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState,22585,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Id,22586,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Name,22587,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Number,22588,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveDisplayName,22589,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TransitionTime,22590,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,22591,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TrueState,22592,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_FalseState,22593,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality,22594,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality_SourceTimestamp,22595,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity,22596,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity_SourceTimestamp,22597,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment,22598,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment_SourceTimestamp,22599,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ClientUserId,22600,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Disable,22601,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Enable,22602,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment,22603,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment_InputArguments,22604,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState,22605,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Id,22606,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Name,22607,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Number,22608,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveDisplayName,22609,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TransitionTime,22610,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveTransitionTime,22611,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TrueState,22612,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_FalseState,22613,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState,22614,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Id,22615,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Name,22616,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Number,22617,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,22618,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TransitionTime,22619,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,22620,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TrueState,22621,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_FalseState,22622,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge,22623,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge_InputArguments,22624,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm,22625,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm_InputArguments,22626,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState,22627,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Id,22628,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Name,22629,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Number,22630,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveDisplayName,22631,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TransitionTime,22632,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,22633,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TrueState,22634,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_FalseState,22635,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_InputNode,22636,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState,22637,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Id,22638,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Name,22639,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Number,22640,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,22641,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TransitionTime,22642,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,22643,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TrueState,22644,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_FalseState,22645,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState,22646,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Id,22647,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Name,22648,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Number,22649,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,22650,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TransitionTime,22651,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,22652,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TrueState,22653,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_FalseState,22654,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState,22655,Object
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState,22656,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Id,22657,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Name,22658,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Number,22659,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,22660,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition,22661,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Id,22662,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Name,22663,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Number,22664,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,22665,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,22666,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableStates,22667,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableTransitions,22668,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_UnshelveTime,22669,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve,22670,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,22671,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve,22672,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve,22673,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedOrShelved,22674,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_MaxTimeShelved,22675,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleEnabled,22676,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound,22677,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_ListId,22678,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_AgencyId,22679,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_VersionId,22680,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState,22681,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Id,22682,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Name,22683,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Number,22684,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveDisplayName,22685,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TransitionTime,22686,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,22687,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TrueState,22688,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_FalseState,22689,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OnDelay,22690,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OffDelay,22691,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroupFlag,22692,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroup,22693,Object
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState,22694,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Id,22695,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Name,22696,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Number,22697,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveDisplayName,22698,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TransitionTime,22699,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,22700,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TrueState,22701,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_FalseState,22702,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmTime,22703,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmRepeatCount,22704,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Silence,22705,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress,22706,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress,22707,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService,22708,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService,22709,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset,22710,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_NormalState,22711,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationDate,22712,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationLimit,22713,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_CertificateType,22714,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Certificate,22715,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate,22716,Object
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventId,22717,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventType,22718,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceNode,22719,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceName,22720,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Time,22721,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReceiveTime,22722,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LocalTime,22723,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Message,22724,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Severity,22725,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassId,22726,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassName,22727,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassId,22728,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassName,22729,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionName,22730,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_BranchId,22731,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Retain,22732,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState,22733,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Id,22734,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Name,22735,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Number,22736,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,22737,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TransitionTime,22738,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,22739,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TrueState,22740,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_FalseState,22741,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality,22742,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality_SourceTimestamp,22743,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity,22744,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,22745,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment,22746,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment_SourceTimestamp,22747,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ClientUserId,22748,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Disable,22749,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Enable,22750,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment,22751,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment_InputArguments,22752,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState,22753,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Id,22754,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Name,22755,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Number,22756,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,22757,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TransitionTime,22758,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,22759,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TrueState,22760,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_FalseState,22761,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState,22762,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Id,22763,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Name,22764,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Number,22765,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,22766,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,22767,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,22768,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TrueState,22769,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_FalseState,22770,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge,22771,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge_InputArguments,22772,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm,22773,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm_InputArguments,22774,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState,22775,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Id,22776,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Name,22777,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Number,22778,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,22779,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TransitionTime,22780,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,22781,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TrueState,22782,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_FalseState,22783,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_InputNode,22784,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState,22785,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Id,22786,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Name,22787,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Number,22788,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,22789,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TransitionTime,22790,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,22791,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TrueState,22792,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_FalseState,22793,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState,22794,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Id,22795,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Name,22796,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Number,22797,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,22798,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,22799,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,22800,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TrueState,22801,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_FalseState,22802,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState,22803,Object
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState,22804,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,22805,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,22806,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,22807,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,22808,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition,22809,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,22810,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,22811,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,22812,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,22813,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,22814,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableStates,22815,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,22816,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,22817,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve,22818,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,22819,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve,22820,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,22821,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedOrShelved,22822,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_MaxTimeShelved,22823,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleEnabled,22824,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound,22825,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_ListId,22826,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_AgencyId,22827,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_VersionId,22828,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState,22829,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Id,22830,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Name,22831,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Number,22832,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,22833,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TransitionTime,22834,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,22835,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TrueState,22836,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_FalseState,22837,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OnDelay,22838,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OffDelay,22839,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroupFlag,22840,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroup,22841,Object
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState,22842,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Id,22843,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Name,22844,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Number,22845,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,22846,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TransitionTime,22847,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,22848,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TrueState,22849,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_FalseState,22850,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmTime,22851,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmRepeatCount,22852,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Silence,22853,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress,22854,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress,22855,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService,22856,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService,22857,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset,22858,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_NormalState,22859,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_TrustListId,22860,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastUpdateTime,22861,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_UpdateFrequency,22862,Variable
 ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustList_UpdateFrequency,22863,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired,22864,Object
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventId,22865,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventType,22866,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceNode,22867,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceName,22868,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Time,22869,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReceiveTime,22870,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LocalTime,22871,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Message,22872,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Severity,22873,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassId,22874,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassName,22875,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassId,22876,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassName,22877,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionName,22878,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_BranchId,22879,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Retain,22880,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState,22881,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Id,22882,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Name,22883,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Number,22884,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveDisplayName,22885,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TransitionTime,22886,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,22887,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TrueState,22888,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_FalseState,22889,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality,22890,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality_SourceTimestamp,22891,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity,22892,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity_SourceTimestamp,22893,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment,22894,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment_SourceTimestamp,22895,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ClientUserId,22896,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Disable,22897,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Enable,22898,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment,22899,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment_InputArguments,22900,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState,22901,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Id,22902,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Name,22903,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Number,22904,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveDisplayName,22905,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TransitionTime,22906,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveTransitionTime,22907,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TrueState,22908,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_FalseState,22909,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState,22910,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Id,22911,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Name,22912,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Number,22913,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,22914,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TransitionTime,22915,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,22916,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TrueState,22917,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_FalseState,22918,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge,22919,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge_InputArguments,22920,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm,22921,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm_InputArguments,22922,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState,22923,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Id,22924,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Name,22925,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Number,22926,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveDisplayName,22927,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TransitionTime,22928,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,22929,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TrueState,22930,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_FalseState,22931,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_InputNode,22932,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState,22933,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Id,22934,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Name,22935,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Number,22936,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,22937,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TransitionTime,22938,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,22939,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TrueState,22940,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_FalseState,22941,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState,22942,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Id,22943,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Name,22944,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Number,22945,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,22946,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TransitionTime,22947,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,22948,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TrueState,22949,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_FalseState,22950,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState,22951,Object
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState,22952,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Id,22953,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Name,22954,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Number,22955,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,22956,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition,22957,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Id,22958,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Name,22959,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Number,22960,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,22961,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,22962,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableStates,22963,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableTransitions,22964,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_UnshelveTime,22965,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve,22966,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,22967,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve,22968,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve,22969,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedOrShelved,22970,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_MaxTimeShelved,22971,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleEnabled,22972,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound,22973,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_ListId,22974,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_AgencyId,22975,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_VersionId,22976,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState,22977,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Id,22978,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Name,22979,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Number,22980,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveDisplayName,22981,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TransitionTime,22982,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,22983,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TrueState,22984,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_FalseState,22985,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OnDelay,22986,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OffDelay,22987,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroupFlag,22988,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroup,22989,Object
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState,22990,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Id,22991,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Name,22992,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Number,22993,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveDisplayName,22994,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TransitionTime,22995,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,22996,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TrueState,22997,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_FalseState,22998,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmTime,22999,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmRepeatCount,23000,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Silence,23001,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress,23002,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress,23003,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService,23004,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService,23005,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset,23006,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_NormalState,23007,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationDate,23008,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationLimit,23009,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_CertificateType,23010,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Certificate,23011,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate,23012,Object
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventId,23013,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventType,23014,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceNode,23015,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceName,23016,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Time,23017,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReceiveTime,23018,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LocalTime,23019,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Message,23020,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Severity,23021,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassId,23022,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassName,23023,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassId,23024,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassName,23025,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionName,23026,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_BranchId,23027,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Retain,23028,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState,23029,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Id,23030,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Name,23031,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Number,23032,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,23033,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TransitionTime,23034,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,23035,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TrueState,23036,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_FalseState,23037,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality,23038,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality_SourceTimestamp,23039,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity,23040,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,23041,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment,23042,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment_SourceTimestamp,23043,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ClientUserId,23044,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Disable,23045,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Enable,23046,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment,23047,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment_InputArguments,23048,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState,23049,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Id,23050,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Name,23051,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Number,23052,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,23053,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TransitionTime,23054,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,23055,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TrueState,23056,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_FalseState,23057,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState,23058,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Id,23059,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Name,23060,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Number,23061,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,23062,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,23063,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,23064,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TrueState,23065,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_FalseState,23066,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge,23067,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge_InputArguments,23068,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm,23069,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm_InputArguments,23070,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState,23071,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Id,23072,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Name,23073,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Number,23074,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,23075,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TransitionTime,23076,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,23077,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TrueState,23078,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_FalseState,23079,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_InputNode,23080,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState,23081,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Id,23082,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Name,23083,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Number,23084,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,23085,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TransitionTime,23086,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,23087,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TrueState,23088,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_FalseState,23089,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState,23090,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Id,23091,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Name,23092,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Number,23093,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,23094,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,23095,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,23096,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TrueState,23097,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_FalseState,23098,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState,23099,Object
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState,23100,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,23101,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,23102,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,23103,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,23104,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition,23105,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,23106,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,23107,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,23108,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,23109,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,23110,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableStates,23111,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,23112,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,23113,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve,23114,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,23115,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve,23116,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,23117,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedOrShelved,23118,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_MaxTimeShelved,23119,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleEnabled,23120,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound,23121,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_ListId,23122,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_AgencyId,23123,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_VersionId,23124,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState,23125,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Id,23126,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Name,23127,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Number,23128,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,23129,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TransitionTime,23130,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,23131,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TrueState,23132,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_FalseState,23133,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OnDelay,23134,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OffDelay,23135,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroupFlag,23136,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroup,23137,Object
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState,23138,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Id,23139,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Name,23140,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Number,23141,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,23142,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TransitionTime,23143,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,23144,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TrueState,23145,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_FalseState,23146,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmTime,23147,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmRepeatCount,23148,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Silence,23149,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress,23150,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress,23151,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService,23152,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService,23153,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset,23154,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_NormalState,23155,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_TrustListId,23156,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastUpdateTime,23157,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_UpdateFrequency,23158,Variable
 ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustList_UpdateFrequency,23159,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired,23160,Object
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventId,23161,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventType,23162,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceNode,23163,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceName,23164,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Time,23165,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReceiveTime,23166,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LocalTime,23167,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Message,23168,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Severity,23169,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassId,23170,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassName,23171,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassId,23172,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassName,23173,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionName,23174,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_BranchId,23175,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Retain,23176,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState,23177,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Id,23178,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Name,23179,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Number,23180,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveDisplayName,23181,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TransitionTime,23182,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,23183,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TrueState,23184,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_FalseState,23185,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality,23186,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality_SourceTimestamp,23187,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity,23188,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity_SourceTimestamp,23189,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment,23190,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment_SourceTimestamp,23191,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ClientUserId,23192,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Disable,23193,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Enable,23194,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment,23195,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment_InputArguments,23196,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState,23197,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Id,23198,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Name,23199,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Number,23200,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveDisplayName,23201,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TransitionTime,23202,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveTransitionTime,23203,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TrueState,23204,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_FalseState,23205,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState,23206,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Id,23207,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Name,23208,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Number,23209,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,23210,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TransitionTime,23211,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,23212,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TrueState,23213,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_FalseState,23214,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge,23215,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge_InputArguments,23216,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm,23217,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm_InputArguments,23218,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState,23219,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Id,23220,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Name,23221,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Number,23222,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveDisplayName,23223,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TransitionTime,23224,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,23225,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TrueState,23226,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_FalseState,23227,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_InputNode,23228,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState,23229,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Id,23230,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Name,23231,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Number,23232,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,23233,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TransitionTime,23234,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,23235,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TrueState,23236,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_FalseState,23237,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState,23238,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Id,23239,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Name,23240,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Number,23241,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,23242,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TransitionTime,23243,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,23244,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TrueState,23245,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_FalseState,23246,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState,23247,Object
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState,23248,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Id,23249,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Name,23250,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Number,23251,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,23252,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition,23253,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Id,23254,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Name,23255,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Number,23256,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,23257,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,23258,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableStates,23259,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableTransitions,23260,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_UnshelveTime,23261,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve,23262,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,23263,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve,23264,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve,23265,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedOrShelved,23266,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_MaxTimeShelved,23267,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleEnabled,23268,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound,23269,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_ListId,23270,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_AgencyId,23271,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_VersionId,23272,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState,23273,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Id,23274,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Name,23275,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Number,23276,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveDisplayName,23277,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TransitionTime,23278,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,23279,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TrueState,23280,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_FalseState,23281,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OnDelay,23282,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OffDelay,23283,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroupFlag,23284,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroup,23285,Object
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState,23286,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Id,23287,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Name,23288,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Number,23289,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveDisplayName,23290,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TransitionTime,23291,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,23292,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TrueState,23293,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_FalseState,23294,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmTime,23295,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmRepeatCount,23296,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Silence,23297,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress,23298,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress,23299,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService,23300,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService,23301,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset,23302,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_NormalState,23303,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationDate,23304,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationLimit,23305,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_CertificateType,23306,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Certificate,23307,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate,23308,Object
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventId,23309,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventType,23310,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceNode,23311,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceName,23312,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Time,23313,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReceiveTime,23314,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LocalTime,23315,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Message,23316,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Severity,23317,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassId,23318,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassName,23319,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassId,23320,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassName,23321,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionName,23322,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_BranchId,23323,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Retain,23324,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState,23325,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Id,23326,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Name,23327,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Number,23328,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,23329,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TransitionTime,23330,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,23331,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TrueState,23332,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_FalseState,23333,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality,23334,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality_SourceTimestamp,23335,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity,23336,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,23337,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment,23338,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment_SourceTimestamp,23339,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ClientUserId,23340,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Disable,23341,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Enable,23342,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment,23343,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment_InputArguments,23344,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState,23345,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Id,23346,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Name,23347,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Number,23348,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,23349,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TransitionTime,23350,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,23351,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TrueState,23352,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_FalseState,23353,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState,23354,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Id,23355,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Name,23356,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Number,23357,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,23358,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,23359,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,23360,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TrueState,23361,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_FalseState,23362,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge,23363,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge_InputArguments,23364,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm,23365,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm_InputArguments,23366,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState,23367,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Id,23368,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Name,23369,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Number,23370,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,23371,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TransitionTime,23372,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,23373,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TrueState,23374,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_FalseState,23375,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_InputNode,23376,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState,23377,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Id,23378,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Name,23379,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Number,23380,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,23381,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TransitionTime,23382,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,23383,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TrueState,23384,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_FalseState,23385,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState,23386,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Id,23387,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Name,23388,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Number,23389,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,23390,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,23391,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,23392,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TrueState,23393,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_FalseState,23394,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState,23395,Object
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState,23396,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,23397,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,23398,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,23399,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,23400,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition,23401,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,23402,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,23403,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,23404,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,23405,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,23406,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableStates,23407,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,23408,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,23409,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve,23410,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,23411,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve,23412,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,23413,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedOrShelved,23414,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_MaxTimeShelved,23415,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleEnabled,23416,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound,23417,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_ListId,23418,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_AgencyId,23419,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_VersionId,23420,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState,23421,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Id,23422,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Name,23423,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Number,23424,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,23425,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TransitionTime,23426,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,23427,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TrueState,23428,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_FalseState,23429,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OnDelay,23430,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OffDelay,23431,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroupFlag,23432,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroup,23433,Object
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState,23434,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Id,23435,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Name,23436,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Number,23437,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,23438,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TransitionTime,23439,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,23440,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TrueState,23441,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_FalseState,23442,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmTime,23443,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmRepeatCount,23444,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Silence,23445,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress,23446,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress,23447,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService,23448,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService,23449,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset,23450,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_NormalState,23451,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_TrustListId,23452,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastUpdateTime,23453,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_UpdateFrequency,23454,Variable
 AliasNameType,23455,ObjectType
 AliasNameCategoryType,23456,ObjectType
 AliasNameCategoryType_Alias_Placeholder,23457,Object
@@ -11146,9 +14367,98 @@ AuthorizationServicesConfigurationFolderType_ServiceName_Placeholder,23557,Objec
 AuthorizationServicesConfigurationFolderType_ServiceName_Placeholder_ServiceUri,23558,Variable
 AuthorizationServicesConfigurationFolderType_ServiceName_Placeholder_ServiceCertificate,23559,Variable
 AuthorizationServicesConfigurationFolderType_ServiceName_Placeholder_IssuerEndpointUrl,23560,Variable
+IsDeprecated,23562,ReferenceType
+TrustListType_DefaultValidationOptions,23563,Variable
+TrustListValidationOptions,23564,DataType
+TrustListValidationOptions_OptionSetValues,23565,Variable
+CertificateGroupType_TrustList_DefaultValidationOptions,23566,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustList_DefaultValidationOptions,23567,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustList_DefaultValidationOptions,23568,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustList_DefaultValidationOptions,23569,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustList_DefaultValidationOptions,23570,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_DefaultValidationOptions,23571,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_DefaultValidationOptions,23572,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_DefaultValidationOptions,23573,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustList_DefaultValidationOptions,23574,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustList_DefaultValidationOptions,23575,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustList_DefaultValidationOptions,23576,Variable
+ServerConfigurationType_HasSecureElement,23593,Variable
+ServerConfiguration_HasSecureElement,23597,Variable
 StandaloneSubscribedDataSetRefDataType,23599,DataType
+StandaloneSubscribedDataSetDataType,23600,DataType
+SecurityGroupDataType,23601,DataType
+PubSubConfiguration2DataType,23602,DataType
+QosDataType,23603,DataType
+TransmitQosDataType,23604,DataType
+TransmitQosPriorityDataType,23605,DataType
+AuditClientEventType,23606,ObjectType
+AuditClientEventType_EventId,23607,Variable
+ReceiveQosDataType,23608,DataType
+ReceiveQosPriorityDataType,23609,DataType
+AuditClientEventType_EventType,23610,Variable
+AuditClientEventType_SourceNode,23611,Variable
+DatagramConnectionTransport2DataType,23612,DataType
+DatagramWriterGroupTransport2DataType,23613,DataType
+DatagramDataSetReaderTransportDataType,23614,DataType
 PublishSubscribeType_SubscribedDataSets,23622,Object
+PublishSubscribeType_SubscribedDataSets_AddDataSetFolder,23637,Method
+PublishSubscribeType_SubscribedDataSets_AddDataSetFolder_InputArguments,23638,Variable
+PublishSubscribeType_SubscribedDataSets_AddDataSetFolder_OutputArguments,23639,Variable
+PublishSubscribeType_SubscribedDataSets_RemoveDataSetFolder,23640,Method
+PublishSubscribeType_SubscribedDataSets_RemoveDataSetFolder_InputArguments,23641,Variable
+PublishSubscribeType_PubSubCapablities,23642,Object
+PublishSubscribeType_PubSubCapablities_MaxPubSubConnections,23643,Variable
+PublishSubscribeType_PubSubCapablities_MaxWriterGroups,23644,Variable
+PublishSubscribeType_PubSubCapablities_MaxReaderGroups,23645,Variable
+PublishSubscribeType_PubSubCapablities_MaxDataSetWriters,23646,Variable
+PublishSubscribeType_PubSubCapablities_MaxDataSetReaders,23647,Variable
+PublishSubscribeType_PubSubCapablities_MaxFieldsPerDataSet,23648,Variable
+PublishSubscribeType_DataSetClasses,23649,Object
 PublishSubscribe_SubscribedDataSets,23658,Object
+PublishSubscribe_SubscribedDataSets_AddDataSetFolder,23673,Method
+PublishSubscribe_SubscribedDataSets_AddDataSetFolder_InputArguments,23674,Variable
+PublishSubscribe_SubscribedDataSets_AddDataSetFolder_OutputArguments,23675,Variable
+PublishSubscribe_SubscribedDataSets_RemoveDataSetFolder,23676,Method
+PublishSubscribe_SubscribedDataSets_RemoveDataSetFolder_InputArguments,23677,Variable
+PublishSubscribe_PubSubCapablities,23678,Object
+PublishSubscribe_PubSubCapablities_MaxPubSubConnections,23679,Variable
+PublishSubscribe_PubSubCapablities_MaxWriterGroups,23680,Variable
+PublishSubscribe_PubSubCapablities_MaxReaderGroups,23681,Variable
+PublishSubscribe_PubSubCapablities_MaxDataSetWriters,23682,Variable
+PublishSubscribe_PubSubCapablities_MaxDataSetReaders,23683,Variable
+PublishSubscribe_PubSubCapablities_MaxFieldsPerDataSet,23684,Variable
+PublishSubscribe_DataSetClasses,23685,Object
+GetConnectionMethodType,23726,Method
+GetConnectionMethodType_InputArguments,23727,Variable
+GetConnectionMethodType_OutputArguments,23728,Variable
+ModifyConnectionMethodType,23729,Method
+ModifyConnectionMethodType_InputArguments,23730,Variable
+ModifyConnectionMethodType_OutputArguments,23731,Variable
+GetWriterGroupMethodType,23745,Method
+GetWriterGroupMethodType_InputArguments,23746,Variable
+GetWriterGroupMethodType_OutputArguments,23747,Variable
+ModifyWriterGroupMethodType,23748,Method
+ModifyWriterGroupMethodType_InputArguments,23749,Variable
+ModifyWriterGroupMethodType_OutputArguments,23750,Variable
+UriString,23751,DataType
+ServerType_ServerCapabilities_MaxSessions,23752,Variable
+ServerType_ServerCapabilities_MaxSubscriptions,23753,Variable
+GetReaderGroupMethodType,23767,Method
+GetReaderGroupMethodType_InputArguments,23768,Variable
+GetReaderGroupMethodType_OutputArguments,23769,Variable
+ModifyReaderGroupMethodType,23770,Method
+ModifyReaderGroupMethodType_InputArguments,23771,Variable
+ModifyReaderGroupMethodType_OutputArguments,23772,Variable
+GetDataSetWriterMethodType,23779,Method
+GetDataSetWriterMethodType_OutputArguments,23780,Variable
+ModifyDataSetWriterMethodType,23781,Method
+ModifyDataSetWriterMethodType_InputArguments,23782,Variable
+ModifyDataSetWriterMethodType_OutputArguments,23783,Variable
+GetDataSetReaderMethodType,23790,Method
+GetDataSetReaderMethodType_OutputArguments,23791,Variable
+ModifyDataSetReaderMethodType,23792,Method
+ModifyDataSetReaderMethodType_InputArguments,23793,Variable
+ModifyDataSetReaderMethodType_OutputArguments,23794,Variable
 SubscribedDataSetFolderType,23795,ObjectType
 SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder,23796,Object
 SubscribedDataSetFolderType_SubscribedDataSetFolderName_Placeholder_AddSubscribedDataSet,23797,Method
@@ -11175,7 +14485,6031 @@ SubscribedDataSetFolderType_AddDataSetFolder_InputArguments,23817,Variable
 SubscribedDataSetFolderType_AddDataSetFolder_OutputArguments,23818,Variable
 SubscribedDataSetFolderType_RemoveDataSetFolder,23819,Method
 SubscribedDataSetFolderType_RemoveDataSetFolder_InputArguments,23820,Variable
+AddSubscribedDataSetMethodType,23821,Method
+AddSubscribedDataSetMethodType_InputArguments,23822,Variable
+AddSubscribedDataSetMethodType_OutputArguments,23823,Variable
+RemoveSubscribedDataSetMethodType,23824,Method
+RemoveSubscribedDataSetMethodType_InputArguments,23825,Variable
 StandaloneSubscribedDataSetType,23828,ObjectType
 StandaloneSubscribedDataSetType_SubscribedDataSet,23829,Object
 StandaloneSubscribedDataSetType_DataSetMetaData,23830,Variable
-StandaloneSubscribedDataSetType_IsConnected,23831,Variable
\ No newline at end of file
+StandaloneSubscribedDataSetType_IsConnected,23831,Variable
+PubSubCapabilitiesType,23832,ObjectType
+PubSubCapabilitiesType_MaxPubSubConnections,23833,Variable
+PubSubCapabilitiesType_MaxWriterGroups,23834,Variable
+PubSubCapabilitiesType_MaxReaderGroups,23835,Variable
+PubSubCapabilitiesType_MaxDataSetWriters,23836,Variable
+PubSubCapabilitiesType_MaxDataSetReaders,23837,Variable
+PubSubCapabilitiesType_MaxFieldsPerDataSet,23838,Variable
+DatagramConnectionTransportType_DiscoveryAnnounceRate,23839,Variable
+DatagramConnectionTransportType_DiscoveryMaxMessageSize,23840,Variable
+DatagramWriterGroupTransportType_Address,23842,Object
+DatagramWriterGroupTransportType_Address_NetworkInterface,23843,Variable
+DatagramWriterGroupTransportType_Address_NetworkInterface_Selections,23844,Variable
+DatagramWriterGroupTransportType_Address_NetworkInterface_SelectionDescriptions,23845,Variable
+DatagramWriterGroupTransportType_Address_NetworkInterface_RestrictToList,23846,Variable
+DatagramWriterGroupTransportType_DatagramQos,23847,Variable
+DatagramWriterGroupTransportType_DiscoveryAnnounceRate,23848,Variable
+DatagramWriterGroupTransportType_Topic,23849,Variable
+StandaloneSubscribedDataSetRefDataType_Encoding_DefaultBinary,23851,Object
+StandaloneSubscribedDataSetDataType_Encoding_DefaultBinary,23852,Object
+SecurityGroupDataType_Encoding_DefaultBinary,23853,Object
+PubSubConfiguration2DataType_Encoding_DefaultBinary,23854,Object
+QosDataType_Encoding_DefaultBinary,23855,Object
+TransmitQosDataType_Encoding_DefaultBinary,23856,Object
+TransmitQosPriorityDataType_Encoding_DefaultBinary,23857,Object
+ReceiveQosDataType_Encoding_DefaultBinary,23860,Object
+ReceiveQosPriorityDataType_Encoding_DefaultBinary,23861,Object
+DatagramConnectionTransport2DataType_Encoding_DefaultBinary,23864,Object
+DatagramWriterGroupTransport2DataType_Encoding_DefaultBinary,23865,Object
+DatagramDataSetReaderTransportDataType_Encoding_DefaultBinary,23866,Object
+OpcUa_BinarySchema_StandaloneSubscribedDataSetRefDataType,23870,Variable
+OpcUa_BinarySchema_StandaloneSubscribedDataSetRefDataType_DataTypeVersion,23871,Variable
+OpcUa_BinarySchema_StandaloneSubscribedDataSetRefDataType_DictionaryFragment,23872,Variable
+OpcUa_BinarySchema_StandaloneSubscribedDataSetDataType,23873,Variable
+OpcUa_BinarySchema_StandaloneSubscribedDataSetDataType_DataTypeVersion,23874,Variable
+OpcUa_BinarySchema_StandaloneSubscribedDataSetDataType_DictionaryFragment,23875,Variable
+OpcUa_BinarySchema_SecurityGroupDataType,23876,Variable
+OpcUa_BinarySchema_SecurityGroupDataType_DataTypeVersion,23877,Variable
+OpcUa_BinarySchema_SecurityGroupDataType_DictionaryFragment,23878,Variable
+OpcUa_BinarySchema_PubSubConfiguration2DataType,23879,Variable
+OpcUa_BinarySchema_PubSubConfiguration2DataType_DataTypeVersion,23880,Variable
+OpcUa_BinarySchema_PubSubConfiguration2DataType_DictionaryFragment,23881,Variable
+OpcUa_BinarySchema_QosDataType,23882,Variable
+OpcUa_BinarySchema_QosDataType_DataTypeVersion,23883,Variable
+OpcUa_BinarySchema_QosDataType_DictionaryFragment,23884,Variable
+OpcUa_BinarySchema_TransmitQosDataType,23885,Variable
+OpcUa_BinarySchema_TransmitQosDataType_DataTypeVersion,23886,Variable
+OpcUa_BinarySchema_TransmitQosDataType_DictionaryFragment,23887,Variable
+OpcUa_BinarySchema_TransmitQosPriorityDataType,23888,Variable
+OpcUa_BinarySchema_TransmitQosPriorityDataType_DataTypeVersion,23889,Variable
+OpcUa_BinarySchema_TransmitQosPriorityDataType_DictionaryFragment,23890,Variable
+AuditClientEventType_SourceName,23891,Variable
+AuditClientEventType_Time,23892,Variable
+AuditClientEventType_ReceiveTime,23893,Variable
+AuditClientEventType_LocalTime,23894,Variable
+AuditClientEventType_Message,23895,Variable
+AuditClientEventType_Severity,23896,Variable
+OpcUa_BinarySchema_ReceiveQosDataType,23897,Variable
+OpcUa_BinarySchema_ReceiveQosDataType_DataTypeVersion,23898,Variable
+OpcUa_BinarySchema_ReceiveQosDataType_DictionaryFragment,23899,Variable
+OpcUa_BinarySchema_ReceiveQosPriorityDataType,23900,Variable
+OpcUa_BinarySchema_ReceiveQosPriorityDataType_DataTypeVersion,23901,Variable
+OpcUa_BinarySchema_ReceiveQosPriorityDataType_DictionaryFragment,23902,Variable
+AuditClientEventType_ActionTimeStamp,23903,Variable
+AuditClientEventType_Status,23904,Variable
+AuditClientEventType_ServerId,23905,Variable
+AuditClientEventType_ClientAuditEntryId,23906,Variable
+AuditClientEventType_ClientUserId,23907,Variable
+AuditClientEventType_ServerUri,23908,Variable
+OpcUa_BinarySchema_DatagramConnectionTransport2DataType,23909,Variable
+OpcUa_BinarySchema_DatagramConnectionTransport2DataType_DataTypeVersion,23910,Variable
+OpcUa_BinarySchema_DatagramConnectionTransport2DataType_DictionaryFragment,23911,Variable
+OpcUa_BinarySchema_DatagramWriterGroupTransport2DataType,23912,Variable
+OpcUa_BinarySchema_DatagramWriterGroupTransport2DataType_DataTypeVersion,23913,Variable
+OpcUa_BinarySchema_DatagramWriterGroupTransport2DataType_DictionaryFragment,23914,Variable
+OpcUa_BinarySchema_DatagramDataSetReaderTransportDataType,23915,Variable
+OpcUa_BinarySchema_DatagramDataSetReaderTransportDataType_DataTypeVersion,23916,Variable
+OpcUa_BinarySchema_DatagramDataSetReaderTransportDataType_DictionaryFragment,23917,Variable
+StandaloneSubscribedDataSetRefDataType_Encoding_DefaultXml,23919,Object
+StandaloneSubscribedDataSetDataType_Encoding_DefaultXml,23920,Object
+SecurityGroupDataType_Encoding_DefaultXml,23921,Object
+PubSubConfiguration2DataType_Encoding_DefaultXml,23922,Object
+QosDataType_Encoding_DefaultXml,23923,Object
+TransmitQosDataType_Encoding_DefaultXml,23924,Object
+TransmitQosPriorityDataType_Encoding_DefaultXml,23925,Object
+AuditClientUpdateMethodResultEventType,23926,ObjectType
+AuditClientUpdateMethodResultEventType_EventId,23927,Variable
+ReceiveQosDataType_Encoding_DefaultXml,23928,Object
+ReceiveQosPriorityDataType_Encoding_DefaultXml,23929,Object
+AuditClientUpdateMethodResultEventType_EventType,23930,Variable
+AuditClientUpdateMethodResultEventType_SourceNode,23931,Variable
+DatagramConnectionTransport2DataType_Encoding_DefaultXml,23932,Object
+DatagramWriterGroupTransport2DataType_Encoding_DefaultXml,23933,Object
+DatagramDataSetReaderTransportDataType_Encoding_DefaultXml,23934,Object
+OpcUa_XmlSchema_StandaloneSubscribedDataSetRefDataType,23938,Variable
+OpcUa_XmlSchema_StandaloneSubscribedDataSetRefDataType_DataTypeVersion,23939,Variable
+OpcUa_XmlSchema_StandaloneSubscribedDataSetRefDataType_DictionaryFragment,23940,Variable
+OpcUa_XmlSchema_StandaloneSubscribedDataSetDataType,23941,Variable
+OpcUa_XmlSchema_StandaloneSubscribedDataSetDataType_DataTypeVersion,23942,Variable
+OpcUa_XmlSchema_StandaloneSubscribedDataSetDataType_DictionaryFragment,23943,Variable
+OpcUa_XmlSchema_SecurityGroupDataType,23944,Variable
+OpcUa_XmlSchema_SecurityGroupDataType_DataTypeVersion,23945,Variable
+OpcUa_XmlSchema_SecurityGroupDataType_DictionaryFragment,23946,Variable
+OpcUa_XmlSchema_PubSubConfiguration2DataType,23947,Variable
+OpcUa_XmlSchema_PubSubConfiguration2DataType_DataTypeVersion,23948,Variable
+OpcUa_XmlSchema_PubSubConfiguration2DataType_DictionaryFragment,23949,Variable
+OpcUa_XmlSchema_QosDataType,23950,Variable
+OpcUa_XmlSchema_QosDataType_DataTypeVersion,23951,Variable
+OpcUa_XmlSchema_QosDataType_DictionaryFragment,23952,Variable
+OpcUa_XmlSchema_TransmitQosDataType,23953,Variable
+OpcUa_XmlSchema_TransmitQosDataType_DataTypeVersion,23954,Variable
+OpcUa_XmlSchema_TransmitQosDataType_DictionaryFragment,23955,Variable
+OpcUa_XmlSchema_TransmitQosPriorityDataType,23956,Variable
+OpcUa_XmlSchema_TransmitQosPriorityDataType_DataTypeVersion,23957,Variable
+OpcUa_XmlSchema_TransmitQosPriorityDataType_DictionaryFragment,23958,Variable
+AuditClientUpdateMethodResultEventType_SourceName,23959,Variable
+AuditClientUpdateMethodResultEventType_Time,23960,Variable
+AuditClientUpdateMethodResultEventType_ReceiveTime,23961,Variable
+AuditClientUpdateMethodResultEventType_LocalTime,23962,Variable
+AuditClientUpdateMethodResultEventType_Message,23963,Variable
+AuditClientUpdateMethodResultEventType_Severity,23964,Variable
+OpcUa_XmlSchema_ReceiveQosDataType,23965,Variable
+OpcUa_XmlSchema_ReceiveQosDataType_DataTypeVersion,23966,Variable
+OpcUa_XmlSchema_ReceiveQosDataType_DictionaryFragment,23967,Variable
+OpcUa_XmlSchema_ReceiveQosPriorityDataType,23968,Variable
+OpcUa_XmlSchema_ReceiveQosPriorityDataType_DataTypeVersion,23969,Variable
+OpcUa_XmlSchema_ReceiveQosPriorityDataType_DictionaryFragment,23970,Variable
+AuditClientUpdateMethodResultEventType_ActionTimeStamp,23971,Variable
+AuditClientUpdateMethodResultEventType_Status,23972,Variable
+AuditClientUpdateMethodResultEventType_ServerId,23973,Variable
+AuditClientUpdateMethodResultEventType_ClientAuditEntryId,23974,Variable
+AuditClientUpdateMethodResultEventType_ClientUserId,23975,Variable
+AuditClientUpdateMethodResultEventType_ServerUri,23976,Variable
+OpcUa_XmlSchema_DatagramConnectionTransport2DataType,23977,Variable
+OpcUa_XmlSchema_DatagramConnectionTransport2DataType_DataTypeVersion,23978,Variable
+OpcUa_XmlSchema_DatagramConnectionTransport2DataType_DictionaryFragment,23979,Variable
+OpcUa_XmlSchema_DatagramWriterGroupTransport2DataType,23980,Variable
+OpcUa_XmlSchema_DatagramWriterGroupTransport2DataType_DataTypeVersion,23981,Variable
+OpcUa_XmlSchema_DatagramWriterGroupTransport2DataType_DictionaryFragment,23982,Variable
+OpcUa_XmlSchema_DatagramDataSetReaderTransportDataType,23983,Variable
+OpcUa_XmlSchema_DatagramDataSetReaderTransportDataType_DataTypeVersion,23984,Variable
+OpcUa_XmlSchema_DatagramDataSetReaderTransportDataType_DictionaryFragment,23985,Variable
+StandaloneSubscribedDataSetRefDataType_Encoding_DefaultJson,23987,Object
+StandaloneSubscribedDataSetDataType_Encoding_DefaultJson,23988,Object
+SecurityGroupDataType_Encoding_DefaultJson,23989,Object
+PubSubConfiguration2DataType_Encoding_DefaultJson,23990,Object
+QosDataType_Encoding_DefaultJson,23991,Object
+TransmitQosDataType_Encoding_DefaultJson,23992,Object
+TransmitQosPriorityDataType_Encoding_DefaultJson,23993,Object
+AuditClientUpdateMethodResultEventType_ObjectId,23994,Variable
+AuditClientUpdateMethodResultEventType_MethodId,23995,Variable
+ReceiveQosDataType_Encoding_DefaultJson,23996,Object
+ReceiveQosPriorityDataType_Encoding_DefaultJson,23997,Object
+AuditClientUpdateMethodResultEventType_StatusCodeId,23998,Variable
+AuditClientUpdateMethodResultEventType_InputArguments,23999,Variable
+DatagramConnectionTransport2DataType_Encoding_DefaultJson,24000,Object
+DatagramWriterGroupTransport2DataType_Encoding_DefaultJson,24001,Object
+DatagramDataSetReaderTransportDataType_Encoding_DefaultJson,24002,Object
+PublishSubscribeType_SubscribedDataSets_AddSubscribedDataSet,24004,Method
+PublishSubscribeType_SubscribedDataSets_AddSubscribedDataSet_InputArguments,24005,Variable
+PublishSubscribeType_SubscribedDataSets_AddSubscribedDataSet_OutputArguments,24006,Variable
+PublishSubscribeType_SubscribedDataSets_RemoveSubscribedDataSet,24007,Method
+PublishSubscribeType_SubscribedDataSets_RemoveSubscribedDataSet_InputArguments,24008,Variable
+PublishSubscribeType_DataSetClasses_DataSetName_Placeholder,24009,Variable
+PublishSubscribe_SubscribedDataSets_AddSubscribedDataSet,24010,Method
+PublishSubscribe_SubscribedDataSets_AddSubscribedDataSet_InputArguments,24011,Variable
+PublishSubscribe_SubscribedDataSets_AddSubscribedDataSet_OutputArguments,24012,Variable
+PublishSubscribe_SubscribedDataSets_RemoveSubscribedDataSet,24013,Method
+PublishSubscribe_SubscribedDataSets_RemoveSubscribedDataSet_InputArguments,24014,Variable
+PublishSubscribe_DataSetClasses_DataSetName_Placeholder,24015,Variable
+DatagramDataSetReaderTransportType,24016,ObjectType
+DatagramDataSetReaderTransportType_Address,24017,Object
+DatagramDataSetReaderTransportType_Address_NetworkInterface,24018,Variable
+DatagramDataSetReaderTransportType_Address_NetworkInterface_Selections,24019,Variable
+DatagramDataSetReaderTransportType_Address_NetworkInterface_SelectionDescriptions,24020,Variable
+DatagramDataSetReaderTransportType_Address_NetworkInterface_RestrictToList,24021,Variable
+DatagramDataSetReaderTransportType_DatagramQos,24022,Variable
+DatagramDataSetReaderTransportType_Topic,24023,Variable
+ProgramDiagnostic2DataType,24033,DataType
+ProgramDiagnostic2DataType_Encoding_DefaultBinary,24034,Object
+OpcUa_BinarySchema_ProgramDiagnostic2DataType,24035,Variable
+OpcUa_BinarySchema_ProgramDiagnostic2DataType_DataTypeVersion,24036,Variable
+OpcUa_BinarySchema_ProgramDiagnostic2DataType_DictionaryFragment,24037,Variable
+ProgramDiagnostic2DataType_Encoding_DefaultXml,24038,Object
+OpcUa_XmlSchema_ProgramDiagnostic2DataType,24039,Variable
+OpcUa_XmlSchema_ProgramDiagnostic2DataType_DataTypeVersion,24040,Variable
+OpcUa_XmlSchema_ProgramDiagnostic2DataType_DictionaryFragment,24041,Variable
+ProgramDiagnostic2DataType_Encoding_DefaultJson,24042,Object
+ServerType_ServerCapabilities_MaxMonitoredItems,24083,Variable
+ServerType_ServerCapabilities_MaxSubscriptionsPerSession,24084,Variable
+ServerType_ServerCapabilities_MaxSelectClauseParameters,24085,Variable
+ServerType_ServerCapabilities_MaxWhereClauseParameters,24086,Variable
+ServerType_ServerCapabilities_ConformanceUnits,24087,Variable
+ServerCapabilitiesType_MaxSessions,24088,Variable
+ServerCapabilitiesType_MaxSubscriptions,24089,Variable
+ServerCapabilitiesType_MaxMonitoredItems,24090,Variable
+ServerCapabilitiesType_MaxSubscriptionsPerSession,24091,Variable
+ServerCapabilitiesType_MaxSelectClauseParameters,24092,Variable
+ServerCapabilitiesType_MaxWhereClauseParameters,24093,Variable
+ServerCapabilitiesType_ConformanceUnits,24094,Variable
+Server_ServerCapabilities_MaxSessions,24095,Variable
+Server_ServerCapabilities_MaxSubscriptions,24096,Variable
+Server_ServerCapabilities_MaxMonitoredItems,24097,Variable
+Server_ServerCapabilities_MaxSubscriptionsPerSession,24098,Variable
+Server_ServerCapabilities_MaxSelectClauseParameters,24099,Variable
+Server_ServerCapabilities_MaxWhereClauseParameters,24100,Variable
+Server_ServerCapabilities_ConformanceUnits,24101,Variable
+ServerType_ServerCapabilities_MaxMonitoredItemsPerSubscription,24102,Variable
+ServerCapabilitiesType_MaxMonitoredItemsPerSubscription,24103,Variable
+Server_ServerCapabilities_MaxMonitoredItemsPerSubscription,24104,Variable
+PortableQualifiedName,24105,DataType
+PortableNodeId,24106,DataType
+UnsignedRationalNumber,24107,DataType
+PortableQualifiedName_Encoding_DefaultBinary,24108,Object
+PortableNodeId_Encoding_DefaultBinary,24109,Object
+UnsignedRationalNumber_Encoding_DefaultBinary,24110,Object
+OpcUa_BinarySchema_PortableQualifiedName,24111,Variable
+OpcUa_BinarySchema_PortableQualifiedName_DataTypeVersion,24112,Variable
+OpcUa_BinarySchema_PortableQualifiedName_DictionaryFragment,24113,Variable
+OpcUa_BinarySchema_PortableNodeId,24114,Variable
+OpcUa_BinarySchema_PortableNodeId_DataTypeVersion,24115,Variable
+OpcUa_BinarySchema_PortableNodeId_DictionaryFragment,24116,Variable
+OpcUa_BinarySchema_UnsignedRationalNumber,24117,Variable
+OpcUa_BinarySchema_UnsignedRationalNumber_DataTypeVersion,24118,Variable
+OpcUa_BinarySchema_UnsignedRationalNumber_DictionaryFragment,24119,Variable
+PortableQualifiedName_Encoding_DefaultXml,24120,Object
+PortableNodeId_Encoding_DefaultXml,24121,Object
+UnsignedRationalNumber_Encoding_DefaultXml,24122,Object
+OpcUa_XmlSchema_PortableQualifiedName,24123,Variable
+OpcUa_XmlSchema_PortableQualifiedName_DataTypeVersion,24124,Variable
+OpcUa_XmlSchema_PortableQualifiedName_DictionaryFragment,24125,Variable
+OpcUa_XmlSchema_PortableNodeId,24126,Variable
+OpcUa_XmlSchema_PortableNodeId_DataTypeVersion,24127,Variable
+OpcUa_XmlSchema_PortableNodeId_DictionaryFragment,24128,Variable
+OpcUa_XmlSchema_UnsignedRationalNumber,24129,Variable
+OpcUa_XmlSchema_UnsignedRationalNumber_DataTypeVersion,24130,Variable
+OpcUa_XmlSchema_UnsignedRationalNumber_DictionaryFragment,24131,Variable
+PortableQualifiedName_Encoding_DefaultJson,24132,Object
+PortableNodeId_Encoding_DefaultJson,24133,Object
+UnsignedRationalNumber_Encoding_DefaultJson,24134,Object
+AuditOpenSecureChannelEventType_CertificateErrorEventId,24135,Variable
+HasStructuredComponent,24136,ReferenceType
+AssociatedWith,24137,ReferenceType
+RoleSetType_RoleName_Placeholder_CustomConfiguration,24138,Variable
+RoleType_CustomConfiguration,24139,Variable
+WellKnownRole_Anonymous_CustomConfiguration,24140,Variable
+WellKnownRole_AuthenticatedUser_CustomConfiguration,24141,Variable
+WellKnownRole_Observer_CustomConfiguration,24142,Variable
+WellKnownRole_Operator_CustomConfiguration,24143,Variable
+WellKnownRole_Engineer_CustomConfiguration,24144,Variable
+WellKnownRole_Supervisor_CustomConfiguration,24145,Variable
+WellKnownRole_ConfigureAdmin_CustomConfiguration,24146,Variable
+WellKnownRole_SecurityAdmin_CustomConfiguration,24147,Variable
+IIetfBaseNetworkInterfaceType,24148,ObjectType
+IIetfBaseNetworkInterfaceType_AdminStatus,24149,Variable
+IIetfBaseNetworkInterfaceType_OperStatus,24150,Variable
+IIetfBaseNetworkInterfaceType_PhysAddress,24151,Variable
+IIetfBaseNetworkInterfaceType_Speed,24152,Variable
+IIetfBaseNetworkInterfaceType_Speed_Definition,24153,Variable
+IIetfBaseNetworkInterfaceType_Speed_ValuePrecision,24154,Variable
+IIetfBaseNetworkInterfaceType_Speed_InstrumentRange,24155,Variable
+IIetfBaseNetworkInterfaceType_Speed_EURange,24156,Variable
+IIetfBaseNetworkInterfaceType_Speed_EngineeringUnits,24157,Variable
+IIeeeBaseEthernetPortType,24158,ObjectType
+IIeeeBaseEthernetPortType_Speed,24159,Variable
+IIeeeBaseEthernetPortType_Speed_Definition,24160,Variable
+IIeeeBaseEthernetPortType_Speed_ValuePrecision,24161,Variable
+IIeeeBaseEthernetPortType_Speed_InstrumentRange,24162,Variable
+IIeeeBaseEthernetPortType_Speed_EURange,24163,Variable
+IIeeeBaseEthernetPortType_Speed_EngineeringUnits,24164,Variable
+IIeeeBaseEthernetPortType_Duplex,24165,Variable
+IIeeeBaseEthernetPortType_MaxFrameLength,24166,Variable
+IBaseEthernetCapabilitiesType,24167,ObjectType
+IBaseEthernetCapabilitiesType_VlanTagCapable,24168,Variable
+ISrClassType,24169,ObjectType
+ISrClassType_Id,24170,Variable
+ISrClassType_Priority,24171,Variable
+ISrClassType_Vid,24172,Variable
+IIeeeBaseTsnStreamType,24173,ObjectType
+IIeeeBaseTsnStreamType_StreamId,24174,Variable
+IIeeeBaseTsnStreamType_StreamName,24175,Variable
+IIeeeBaseTsnStreamType_State,24176,Variable
+IIeeeBaseTsnStreamType_AccumulatedLatency,24177,Variable
+IIeeeBaseTsnStreamType_SrClassId,24178,Variable
+IIeeeBaseTsnTrafficSpecificationType,24179,ObjectType
+IIeeeBaseTsnTrafficSpecificationType_MaxIntervalFrames,24180,Variable
+IIeeeBaseTsnTrafficSpecificationType_MaxFrameSize,24181,Variable
+IIeeeBaseTsnTrafficSpecificationType_Interval,24182,Variable
+IIeeeBaseTsnStatusStreamType,24183,ObjectType
+IIeeeBaseTsnStatusStreamType_TalkerStatus,24184,Variable
+IIeeeBaseTsnStatusStreamType_ListenerStatus,24185,Variable
+IIeeeBaseTsnStatusStreamType_FailureCode,24186,Variable
+IIeeeBaseTsnStatusStreamType_FailureSystemIdentifier,24187,Variable
+IIeeeTsnInterfaceConfigurationType,24188,ObjectType
+IIeeeTsnInterfaceConfigurationType_MacAddress,24189,Variable
+IIeeeTsnInterfaceConfigurationType_InterfaceName,24190,Variable
+IIeeeTsnInterfaceConfigurationTalkerType,24191,ObjectType
+IIeeeTsnInterfaceConfigurationTalkerType_MacAddress,24192,Variable
+IIeeeTsnInterfaceConfigurationTalkerType_InterfaceName,24193,Variable
+IIeeeTsnInterfaceConfigurationTalkerType_TimeAwareOffset,24194,Variable
+IIeeeTsnInterfaceConfigurationListenerType,24195,ObjectType
+IIeeeTsnInterfaceConfigurationListenerType_MacAddress,24196,Variable
+IIeeeTsnInterfaceConfigurationListenerType_InterfaceName,24197,Variable
+IIeeeTsnInterfaceConfigurationListenerType_ReceiveOffset,24198,Variable
+IIeeeTsnMacAddressType,24199,ObjectType
+IIeeeTsnMacAddressType_DestinationAddress,24200,Variable
+IIeeeTsnMacAddressType_SourceAddress,24201,Variable
+IIeeeTsnVlanTagType,24202,ObjectType
+IIeeeTsnVlanTagType_VlanId,24203,Variable
+IIeeeTsnVlanTagType_PriorityCodePoint,24204,Variable
+IPriorityMappingEntryType,24205,ObjectType
+IPriorityMappingEntryType_MappingUri,24206,Variable
+IPriorityMappingEntryType_PriorityLabel,24207,Variable
+IPriorityMappingEntryType_PriorityValue_PCP,24208,Variable
+IPriorityMappingEntryType_PriorityValue_DSCP,24209,Variable
+Duplex,24210,DataType
+InterfaceAdminStatus,24212,DataType
+InterfaceOperStatus,24214,DataType
+NegotiationStatus,24216,DataType
+TsnFailureCode,24218,DataType
+TsnStreamState,24220,DataType
+TsnTalkerStatus,24222,DataType
+TsnListenerStatus,24224,DataType
+Resources,24226,Object
+Communication,24227,Object
+MappingTables,24228,Object
+NetworkInterfaces,24229,Object
+Streams,24230,Object
+TalkerStreams,24231,Object
+ListenerStreams,24232,Object
+IIeeeAutoNegotiationStatusType,24233,ObjectType
+IIeeeAutoNegotiationStatusType_NegotiationStatus,24234,Variable
+Duplex_EnumValues,24235,Variable
+InterfaceAdminStatus_EnumValues,24236,Variable
+InterfaceOperStatus_EnumValues,24237,Variable
+NegotiationStatus_EnumValues,24238,Variable
+TsnFailureCode_EnumValues,24239,Variable
+TsnStreamState_EnumValues,24240,Variable
+TsnTalkerStatus_EnumValues,24241,Variable
+TsnListenerStatus_EnumValues,24242,Variable
+OPCUANamespaceMetadata_NamespaceFile_MaxByteStringLength,24243,Variable
+FileType_MaxByteStringLength,24244,Variable
+AddressSpaceFileType_MaxByteStringLength,24245,Variable
+NamespaceMetadataType_NamespaceFile_MaxByteStringLength,24246,Variable
+NamespacesType_NamespaceIdentifier_Placeholder_NamespaceFile_MaxByteStringLength,24247,Variable
+FileDirectoryType_FileName_Placeholder_MaxByteStringLength,24248,Variable
+FileSystem_FileName_Placeholder_MaxByteStringLength,24249,Variable
+TrustListType_MaxByteStringLength,24250,Variable
+CertificateGroupType_TrustList_MaxByteStringLength,24251,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustList_MaxByteStringLength,24252,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustList_MaxByteStringLength,24253,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustList_MaxByteStringLength,24254,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustList_MaxByteStringLength,24255,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_MaxByteStringLength,24256,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_MaxByteStringLength,24257,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_MaxByteStringLength,24258,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustList_MaxByteStringLength,24259,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustList_MaxByteStringLength,24260,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustList_MaxByteStringLength,24261,Variable
+SemanticVersionString,24263,DataType
+UserManagementType,24264,ObjectType
+UserManagementType_Users,24265,Variable
+UserManagementType_PasswordLength,24266,Variable
+UserManagementType_PasswordOptions,24267,Variable
+UserManagementType_PasswordRestrictions,24268,Variable
+UserManagementType_AddUser,24269,Method
+UserManagementType_AddUser_InputArguments,24270,Variable
+UserManagementType_ModifyUser,24271,Method
+UserManagementType_ModifyUser_InputArguments,24272,Variable
+UserManagementType_RemoveUser,24273,Method
+UserManagementType_RemoveUser_InputArguments,24274,Variable
+UserManagementType_ChangePassword,24275,Method
+UserManagementType_ChangePassword_InputArguments,24276,Variable
+PasswordOptionsMask,24277,DataType
+PasswordOptionsMask_OptionSetValues,24278,Variable
+UserConfigurationMask,24279,DataType
+UserConfigurationMask_OptionSetValues,24280,Variable
+UserManagementDataType,24281,DataType
+AddUserMethodType,24282,Method
+AddUserMethodType_InputArguments,24283,Variable
+ModifyUserMethodType,24284,Method
+ModifyUserMethodType_InputArguments,24285,Variable
+RemoveUserMethodType,24286,Method
+RemoveUserMethodType_InputArguments,24287,Variable
+ChangePasswordMethodType,24288,Method
+ChangePasswordMethodType_InputArguments,24289,Variable
+UserManagement,24290,Object
+UserManagement_PasswordRestrictions,24291,Variable
+UserManagementDataType_Encoding_DefaultBinary,24292,Object
+OpcUa_BinarySchema_UserManagementDataType,24293,Variable
+OpcUa_BinarySchema_UserManagementDataType_DataTypeVersion,24294,Variable
+OpcUa_BinarySchema_UserManagementDataType_DictionaryFragment,24295,Variable
+UserManagementDataType_Encoding_DefaultXml,24296,Object
+OpcUa_XmlSchema_UserManagementDataType,24297,Variable
+OpcUa_XmlSchema_UserManagementDataType_DataTypeVersion,24298,Variable
+OpcUa_XmlSchema_UserManagementDataType_DictionaryFragment,24299,Variable
+UserManagementDataType_Encoding_DefaultJson,24300,Object
+UserManagement_Users,24301,Variable
+UserManagement_PasswordLength,24302,Variable
+UserManagement_PasswordOptions,24303,Variable
+UserManagement_AddUser,24304,Method
+UserManagement_AddUser_InputArguments,24305,Variable
+UserManagement_ModifyUser,24306,Method
+UserManagement_ModifyUser_InputArguments,24307,Variable
+UserManagement_RemoveUser,24308,Method
+UserManagement_RemoveUser_InputArguments,24309,Variable
+UserManagement_ChangePassword,24310,Method
+UserManagement_ChangePassword_InputArguments,24311,Variable
+DialogConditionType_Respond2,24312,Method
+DialogConditionType_Respond2_InputArguments,24313,Variable
+DialogResponse2MethodType,24314,Method
+DialogResponse2MethodType_InputArguments,24315,Variable
+AlarmConditionType_Suppress2,24316,Method
+AlarmConditionType_Suppress2_InputArguments,24317,Variable
+AlarmConditionType_Unsuppress2,24318,Method
+AlarmConditionType_Unsuppress2_InputArguments,24319,Variable
+AlarmConditionType_RemoveFromService2,24320,Method
+AlarmConditionType_RemoveFromService2_InputArguments,24321,Variable
+AlarmConditionType_PlaceInService2,24322,Method
+AlarmConditionType_PlaceInService2_InputArguments,24323,Variable
+AlarmConditionType_Reset2,24324,Method
+AlarmConditionType_Reset2_InputArguments,24325,Variable
+WithCommentMethodType,24326,Method
+WithCommentMethodType_InputArguments,24327,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_Suppress2,24328,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_Suppress2_InputArguments,24329,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_Unsuppress2,24330,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_Unsuppress2_InputArguments,24331,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_RemoveFromService2,24332,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_RemoveFromService2_InputArguments,24333,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_PlaceInService2,24334,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_PlaceInService2_InputArguments,24335,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_Reset2,24336,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_Reset2_InputArguments,24337,Variable
+LimitAlarmType_Suppress2,24338,Method
+LimitAlarmType_Suppress2_InputArguments,24339,Variable
+LimitAlarmType_Unsuppress2,24340,Method
+LimitAlarmType_Unsuppress2_InputArguments,24341,Variable
+LimitAlarmType_RemoveFromService2,24342,Method
+LimitAlarmType_RemoveFromService2_InputArguments,24343,Variable
+LimitAlarmType_PlaceInService2,24344,Method
+LimitAlarmType_PlaceInService2_InputArguments,24345,Variable
+LimitAlarmType_Reset2,24346,Method
+LimitAlarmType_Reset2_InputArguments,24347,Variable
+ExclusiveLimitAlarmType_Suppress2,24348,Method
+ExclusiveLimitAlarmType_Suppress2_InputArguments,24349,Variable
+ExclusiveLimitAlarmType_Unsuppress2,24350,Method
+ExclusiveLimitAlarmType_Unsuppress2_InputArguments,24351,Variable
+ExclusiveLimitAlarmType_RemoveFromService2,24352,Method
+ExclusiveLimitAlarmType_RemoveFromService2_InputArguments,24353,Variable
+ExclusiveLimitAlarmType_PlaceInService2,24354,Method
+ExclusiveLimitAlarmType_PlaceInService2_InputArguments,24355,Variable
+ExclusiveLimitAlarmType_Reset2,24356,Method
+ExclusiveLimitAlarmType_Reset2_InputArguments,24357,Variable
+NonExclusiveLimitAlarmType_Suppress2,24358,Method
+NonExclusiveLimitAlarmType_Suppress2_InputArguments,24359,Variable
+NonExclusiveLimitAlarmType_Unsuppress2,24360,Method
+NonExclusiveLimitAlarmType_Unsuppress2_InputArguments,24361,Variable
+NonExclusiveLimitAlarmType_RemoveFromService2,24362,Method
+NonExclusiveLimitAlarmType_RemoveFromService2_InputArguments,24363,Variable
+NonExclusiveLimitAlarmType_PlaceInService2,24364,Method
+NonExclusiveLimitAlarmType_PlaceInService2_InputArguments,24365,Variable
+NonExclusiveLimitAlarmType_Reset2,24366,Method
+NonExclusiveLimitAlarmType_Reset2_InputArguments,24367,Variable
+NonExclusiveLevelAlarmType_Suppress2,24368,Method
+NonExclusiveLevelAlarmType_Suppress2_InputArguments,24369,Variable
+NonExclusiveLevelAlarmType_Unsuppress2,24370,Method
+NonExclusiveLevelAlarmType_Unsuppress2_InputArguments,24371,Variable
+NonExclusiveLevelAlarmType_RemoveFromService2,24372,Method
+NonExclusiveLevelAlarmType_RemoveFromService2_InputArguments,24373,Variable
+NonExclusiveLevelAlarmType_PlaceInService2,24374,Method
+NonExclusiveLevelAlarmType_PlaceInService2_InputArguments,24375,Variable
+NonExclusiveLevelAlarmType_Reset2,24376,Method
+NonExclusiveLevelAlarmType_Reset2_InputArguments,24377,Variable
+ExclusiveLevelAlarmType_Suppress2,24378,Method
+ExclusiveLevelAlarmType_Suppress2_InputArguments,24379,Variable
+ExclusiveLevelAlarmType_Unsuppress2,24380,Method
+ExclusiveLevelAlarmType_Unsuppress2_InputArguments,24381,Variable
+ExclusiveLevelAlarmType_RemoveFromService2,24382,Method
+ExclusiveLevelAlarmType_RemoveFromService2_InputArguments,24383,Variable
+ExclusiveLevelAlarmType_PlaceInService2,24384,Method
+ExclusiveLevelAlarmType_PlaceInService2_InputArguments,24385,Variable
+ExclusiveLevelAlarmType_Reset2,24386,Method
+ExclusiveLevelAlarmType_Reset2_InputArguments,24387,Variable
+NonExclusiveDeviationAlarmType_Suppress2,24388,Method
+NonExclusiveDeviationAlarmType_Suppress2_InputArguments,24389,Variable
+NonExclusiveDeviationAlarmType_Unsuppress2,24390,Method
+NonExclusiveDeviationAlarmType_Unsuppress2_InputArguments,24391,Variable
+NonExclusiveDeviationAlarmType_RemoveFromService2,24392,Method
+NonExclusiveDeviationAlarmType_RemoveFromService2_InputArguments,24393,Variable
+NonExclusiveDeviationAlarmType_PlaceInService2,24394,Method
+NonExclusiveDeviationAlarmType_PlaceInService2_InputArguments,24395,Variable
+NonExclusiveDeviationAlarmType_Reset2,24396,Method
+NonExclusiveDeviationAlarmType_Reset2_InputArguments,24397,Variable
+NonExclusiveRateOfChangeAlarmType_Suppress2,24398,Method
+NonExclusiveRateOfChangeAlarmType_Suppress2_InputArguments,24399,Variable
+NonExclusiveRateOfChangeAlarmType_Unsuppress2,24400,Method
+NonExclusiveRateOfChangeAlarmType_Unsuppress2_InputArguments,24401,Variable
+NonExclusiveRateOfChangeAlarmType_RemoveFromService2,24402,Method
+NonExclusiveRateOfChangeAlarmType_RemoveFromService2_InputArguments,24403,Variable
+NonExclusiveRateOfChangeAlarmType_PlaceInService2,24404,Method
+NonExclusiveRateOfChangeAlarmType_PlaceInService2_InputArguments,24405,Variable
+NonExclusiveRateOfChangeAlarmType_Reset2,24406,Method
+NonExclusiveRateOfChangeAlarmType_Reset2_InputArguments,24407,Variable
+ExclusiveDeviationAlarmType_Suppress2,24408,Method
+ExclusiveDeviationAlarmType_Suppress2_InputArguments,24409,Variable
+ExclusiveDeviationAlarmType_Unsuppress2,24410,Method
+ExclusiveDeviationAlarmType_Unsuppress2_InputArguments,24411,Variable
+ExclusiveDeviationAlarmType_RemoveFromService2,24412,Method
+ExclusiveDeviationAlarmType_RemoveFromService2_InputArguments,24413,Variable
+ExclusiveDeviationAlarmType_PlaceInService2,24414,Method
+ExclusiveDeviationAlarmType_PlaceInService2_InputArguments,24415,Variable
+ExclusiveDeviationAlarmType_Reset2,24416,Method
+ExclusiveDeviationAlarmType_Reset2_InputArguments,24417,Variable
+ExclusiveRateOfChangeAlarmType_Suppress2,24418,Method
+ExclusiveRateOfChangeAlarmType_Suppress2_InputArguments,24419,Variable
+ExclusiveRateOfChangeAlarmType_Unsuppress2,24420,Method
+ExclusiveRateOfChangeAlarmType_Unsuppress2_InputArguments,24421,Variable
+ExclusiveRateOfChangeAlarmType_RemoveFromService2,24422,Method
+ExclusiveRateOfChangeAlarmType_RemoveFromService2_InputArguments,24423,Variable
+ExclusiveRateOfChangeAlarmType_PlaceInService2,24424,Method
+ExclusiveRateOfChangeAlarmType_PlaceInService2_InputArguments,24425,Variable
+ExclusiveRateOfChangeAlarmType_Reset2,24426,Method
+ExclusiveRateOfChangeAlarmType_Reset2_InputArguments,24427,Variable
+DiscreteAlarmType_Suppress2,24428,Method
+DiscreteAlarmType_Suppress2_InputArguments,24429,Variable
+DiscreteAlarmType_Unsuppress2,24430,Method
+DiscreteAlarmType_Unsuppress2_InputArguments,24431,Variable
+DiscreteAlarmType_RemoveFromService2,24432,Method
+DiscreteAlarmType_RemoveFromService2_InputArguments,24433,Variable
+DiscreteAlarmType_PlaceInService2,24434,Method
+DiscreteAlarmType_PlaceInService2_InputArguments,24435,Variable
+DiscreteAlarmType_Reset2,24436,Method
+DiscreteAlarmType_Reset2_InputArguments,24437,Variable
+OffNormalAlarmType_Suppress2,24438,Method
+OffNormalAlarmType_Suppress2_InputArguments,24439,Variable
+OffNormalAlarmType_Unsuppress2,24440,Method
+OffNormalAlarmType_Unsuppress2_InputArguments,24441,Variable
+OffNormalAlarmType_RemoveFromService2,24442,Method
+OffNormalAlarmType_RemoveFromService2_InputArguments,24443,Variable
+OffNormalAlarmType_PlaceInService2,24444,Method
+OffNormalAlarmType_PlaceInService2_InputArguments,24445,Variable
+OffNormalAlarmType_Reset2,24446,Method
+OffNormalAlarmType_Reset2_InputArguments,24447,Variable
+SystemOffNormalAlarmType_Suppress2,24448,Method
+SystemOffNormalAlarmType_Suppress2_InputArguments,24449,Variable
+SystemOffNormalAlarmType_Unsuppress2,24450,Method
+SystemOffNormalAlarmType_Unsuppress2_InputArguments,24451,Variable
+SystemOffNormalAlarmType_RemoveFromService2,24452,Method
+SystemOffNormalAlarmType_RemoveFromService2_InputArguments,24453,Variable
+SystemOffNormalAlarmType_PlaceInService2,24454,Method
+SystemOffNormalAlarmType_PlaceInService2_InputArguments,24455,Variable
+SystemOffNormalAlarmType_Reset2,24456,Method
+SystemOffNormalAlarmType_Reset2_InputArguments,24457,Variable
+TripAlarmType_Suppress2,24458,Method
+TripAlarmType_Suppress2_InputArguments,24459,Variable
+TripAlarmType_Unsuppress2,24460,Method
+TripAlarmType_Unsuppress2_InputArguments,24461,Variable
+TripAlarmType_RemoveFromService2,24462,Method
+TripAlarmType_RemoveFromService2_InputArguments,24463,Variable
+TripAlarmType_PlaceInService2,24464,Method
+TripAlarmType_PlaceInService2_InputArguments,24465,Variable
+TripAlarmType_Reset2,24466,Method
+TripAlarmType_Reset2_InputArguments,24467,Variable
+InstrumentDiagnosticAlarmType_Suppress2,24468,Method
+InstrumentDiagnosticAlarmType_Suppress2_InputArguments,24469,Variable
+InstrumentDiagnosticAlarmType_Unsuppress2,24470,Method
+InstrumentDiagnosticAlarmType_Unsuppress2_InputArguments,24471,Variable
+InstrumentDiagnosticAlarmType_RemoveFromService2,24472,Method
+InstrumentDiagnosticAlarmType_RemoveFromService2_InputArguments,24473,Variable
+InstrumentDiagnosticAlarmType_PlaceInService2,24474,Method
+InstrumentDiagnosticAlarmType_PlaceInService2_InputArguments,24475,Variable
+InstrumentDiagnosticAlarmType_Reset2,24476,Method
+InstrumentDiagnosticAlarmType_Reset2_InputArguments,24477,Variable
+SystemDiagnosticAlarmType_Suppress2,24478,Method
+SystemDiagnosticAlarmType_Suppress2_InputArguments,24479,Variable
+SystemDiagnosticAlarmType_Unsuppress2,24480,Method
+SystemDiagnosticAlarmType_Unsuppress2_InputArguments,24481,Variable
+SystemDiagnosticAlarmType_RemoveFromService2,24482,Method
+SystemDiagnosticAlarmType_RemoveFromService2_InputArguments,24483,Variable
+SystemDiagnosticAlarmType_PlaceInService2,24484,Method
+SystemDiagnosticAlarmType_PlaceInService2_InputArguments,24485,Variable
+SystemDiagnosticAlarmType_Reset2,24486,Method
+SystemDiagnosticAlarmType_Reset2_InputArguments,24487,Variable
+CertificateExpirationAlarmType_Suppress2,24488,Method
+CertificateExpirationAlarmType_Suppress2_InputArguments,24489,Variable
+CertificateExpirationAlarmType_Unsuppress2,24490,Method
+CertificateExpirationAlarmType_Unsuppress2_InputArguments,24491,Variable
+CertificateExpirationAlarmType_RemoveFromService2,24492,Method
+CertificateExpirationAlarmType_RemoveFromService2_InputArguments,24493,Variable
+CertificateExpirationAlarmType_PlaceInService2,24494,Method
+CertificateExpirationAlarmType_PlaceInService2_InputArguments,24495,Variable
+CertificateExpirationAlarmType_Reset2,24496,Method
+CertificateExpirationAlarmType_Reset2_InputArguments,24497,Variable
+DiscrepancyAlarmType_Suppress2,24498,Method
+DiscrepancyAlarmType_Suppress2_InputArguments,24499,Variable
+DiscrepancyAlarmType_Unsuppress2,24500,Method
+DiscrepancyAlarmType_Unsuppress2_InputArguments,24501,Variable
+DiscrepancyAlarmType_RemoveFromService2,24502,Method
+DiscrepancyAlarmType_RemoveFromService2_InputArguments,24503,Variable
+DiscrepancyAlarmType_PlaceInService2,24504,Method
+DiscrepancyAlarmType_PlaceInService2_InputArguments,24505,Variable
+DiscrepancyAlarmType_Reset2,24506,Method
+DiscrepancyAlarmType_Reset2_InputArguments,24507,Variable
+TrustListOutOfDateAlarmType_Suppress2,24508,Method
+TrustListOutOfDateAlarmType_Suppress2_InputArguments,24509,Variable
+TrustListOutOfDateAlarmType_Unsuppress2,24510,Method
+TrustListOutOfDateAlarmType_Unsuppress2_InputArguments,24511,Variable
+TrustListOutOfDateAlarmType_RemoveFromService2,24512,Method
+TrustListOutOfDateAlarmType_RemoveFromService2_InputArguments,24513,Variable
+TrustListOutOfDateAlarmType_PlaceInService2,24514,Method
+TrustListOutOfDateAlarmType_PlaceInService2_InputArguments,24515,Variable
+TrustListOutOfDateAlarmType_Reset2,24516,Method
+TrustListOutOfDateAlarmType_Reset2_InputArguments,24517,Variable
+CertificateGroupType_CertificateExpired_Suppress2,24518,Method
+CertificateGroupType_CertificateExpired_Suppress2_InputArguments,24519,Variable
+CertificateGroupType_CertificateExpired_Unsuppress2,24520,Method
+CertificateGroupType_CertificateExpired_Unsuppress2_InputArguments,24521,Variable
+CertificateGroupType_CertificateExpired_RemoveFromService2,24522,Method
+CertificateGroupType_CertificateExpired_RemoveFromService2_InputArguments,24523,Variable
+CertificateGroupType_CertificateExpired_PlaceInService2,24524,Method
+CertificateGroupType_CertificateExpired_PlaceInService2_InputArguments,24525,Variable
+CertificateGroupType_CertificateExpired_Reset2,24526,Method
+CertificateGroupType_CertificateExpired_Reset2_InputArguments,24527,Variable
+CertificateGroupType_TrustListOutOfDate_Suppress2,24528,Method
+CertificateGroupType_TrustListOutOfDate_Suppress2_InputArguments,24529,Variable
+CertificateGroupType_TrustListOutOfDate_Unsuppress2,24530,Method
+CertificateGroupType_TrustListOutOfDate_Unsuppress2_InputArguments,24531,Variable
+CertificateGroupType_TrustListOutOfDate_RemoveFromService2,24532,Method
+CertificateGroupType_TrustListOutOfDate_RemoveFromService2_InputArguments,24533,Variable
+CertificateGroupType_TrustListOutOfDate_PlaceInService2,24534,Method
+CertificateGroupType_TrustListOutOfDate_PlaceInService2_InputArguments,24535,Variable
+CertificateGroupType_TrustListOutOfDate_Reset2,24536,Method
+CertificateGroupType_TrustListOutOfDate_Reset2_InputArguments,24537,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Suppress2,24538,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Suppress2_InputArguments,24539,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Unsuppress2,24540,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Unsuppress2_InputArguments,24541,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_RemoveFromService2,24542,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_RemoveFromService2_InputArguments,24543,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_PlaceInService2,24544,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_PlaceInService2_InputArguments,24545,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Reset2,24546,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_Reset2_InputArguments,24547,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Suppress2,24548,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Suppress2_InputArguments,24549,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2,24550,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24551,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2,24552,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24553,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2,24554,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24555,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Reset2,24556,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_Reset2_InputArguments,24557,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Suppress2,24558,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Suppress2_InputArguments,24559,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Unsuppress2,24560,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Unsuppress2_InputArguments,24561,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_RemoveFromService2,24562,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_RemoveFromService2_InputArguments,24563,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_PlaceInService2,24564,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_PlaceInService2_InputArguments,24565,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Reset2,24566,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_Reset2_InputArguments,24567,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Suppress2,24568,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Suppress2_InputArguments,24569,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2,24570,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24571,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2,24572,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24573,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2,24574,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24575,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Reset2,24576,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_Reset2_InputArguments,24577,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Suppress2,24578,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Suppress2_InputArguments,24579,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Unsuppress2,24580,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Unsuppress2_InputArguments,24581,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2,24582,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2_InputArguments,24583,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_PlaceInService2,24584,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_PlaceInService2_InputArguments,24585,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Reset2,24586,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_Reset2_InputArguments,24587,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2,24588,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2_InputArguments,24589,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2,24590,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24591,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2,24592,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24593,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2,24594,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24595,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Reset2,24596,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_Reset2_InputArguments,24597,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Suppress2,24598,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Suppress2_InputArguments,24599,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Unsuppress2,24600,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Unsuppress2_InputArguments,24601,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_RemoveFromService2,24602,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_RemoveFromService2_InputArguments,24603,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_PlaceInService2,24604,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_PlaceInService2_InputArguments,24605,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Reset2,24606,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_Reset2_InputArguments,24607,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Suppress2,24608,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Suppress2_InputArguments,24609,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Unsuppress2,24610,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Unsuppress2_InputArguments,24611,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_RemoveFromService2,24612,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_RemoveFromService2_InputArguments,24613,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_PlaceInService2,24614,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_PlaceInService2_InputArguments,24615,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Reset2,24616,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_Reset2_InputArguments,24617,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2,24618,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2_InputArguments,24619,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2,24620,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2_InputArguments,24621,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2,24622,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2_InputArguments,24623,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2,24624,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2_InputArguments,24625,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2,24626,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2_InputArguments,24627,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2,24628,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2_InputArguments,24629,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2,24630,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24631,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2,24632,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24633,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2,24634,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24635,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2,24636,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2_InputArguments,24637,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2,24638,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2_InputArguments,24639,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2,24640,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2_InputArguments,24641,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2,24642,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2_InputArguments,24643,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2,24644,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2_InputArguments,24645,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2,24646,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2_InputArguments,24647,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2,24648,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2_InputArguments,24649,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2,24650,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24651,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2,24652,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24653,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2,24654,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24655,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2,24656,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2_InputArguments,24657,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2,24658,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2_InputArguments,24659,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2,24660,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2_InputArguments,24661,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2,24662,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2_InputArguments,24663,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2,24664,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2_InputArguments,24665,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2,24666,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2_InputArguments,24667,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2,24668,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2_InputArguments,24669,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2,24670,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24671,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2,24672,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24673,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2,24674,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24675,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2,24676,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2_InputArguments,24677,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2,24678,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2_InputArguments,24679,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2,24680,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2_InputArguments,24681,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2,24682,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2_InputArguments,24683,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2,24684,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2_InputArguments,24685,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2,24686,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2_InputArguments,24687,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2,24688,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2_InputArguments,24689,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2,24690,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24691,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2,24692,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24693,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2,24694,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24695,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2,24696,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2_InputArguments,24697,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2,24698,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2_InputArguments,24699,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2,24700,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2_InputArguments,24701,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2,24702,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2_InputArguments,24703,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2,24704,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2_InputArguments,24705,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2,24706,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2_InputArguments,24707,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2,24708,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2_InputArguments,24709,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2,24710,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24711,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2,24712,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24713,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2,24714,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24715,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2,24716,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2_InputArguments,24717,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2,24718,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2_InputArguments,24719,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2,24720,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2_InputArguments,24721,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2,24722,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2_InputArguments,24723,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2,24724,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2_InputArguments,24725,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2,24726,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2_InputArguments,24727,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2,24728,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2_InputArguments,24729,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2,24730,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2_InputArguments,24731,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2,24732,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,24733,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2,24734,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2_InputArguments,24735,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2,24736,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2_InputArguments,24737,Variable
+AlarmConditionType_ShelvingState_TimedShelve2,24738,Method
+AlarmConditionType_ShelvingState_TimedShelve2_InputArguments,24739,Variable
+AlarmConditionType_ShelvingState_Unshelve2,24740,Method
+AlarmConditionType_ShelvingState_Unshelve2_InputArguments,24741,Variable
+AlarmConditionType_ShelvingState_OneShotShelve2,24742,Method
+AlarmConditionType_ShelvingState_OneShotShelve2_InputArguments,24743,Variable
+AlarmConditionType_GetGroupMemberships,24744,Method
+GetGroupMembershipsMethodType,24746,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_ShelvingState_TimedShelve2,24748,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_ShelvingState_TimedShelve2_InputArguments,24749,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_ShelvingState_Unshelve2,24750,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_ShelvingState_Unshelve2_InputArguments,24751,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_ShelvingState_OneShotShelve2,24752,Method
+AlarmGroupType_AlarmConditionInstance_Placeholder_ShelvingState_OneShotShelve2_InputArguments,24753,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_GetGroupMemberships,24754,Method
+ShelvedStateMachineType_TimedShelve2,24756,Method
+ShelvedStateMachineType_TimedShelve2_InputArguments,24757,Variable
+ShelvedStateMachineType_Unshelve2,24758,Method
+ShelvedStateMachineType_Unshelve2_InputArguments,24759,Variable
+ShelvedStateMachineType_OneShotShelve2,24760,Method
+ShelvedStateMachineType_OneShotShelve2_InputArguments,24761,Variable
+LimitAlarmType_ShelvingState_TimedShelve2,24762,Method
+LimitAlarmType_ShelvingState_TimedShelve2_InputArguments,24763,Variable
+LimitAlarmType_ShelvingState_Unshelve2,24764,Method
+LimitAlarmType_ShelvingState_Unshelve2_InputArguments,24765,Variable
+LimitAlarmType_ShelvingState_OneShotShelve2,24766,Method
+LimitAlarmType_ShelvingState_OneShotShelve2_InputArguments,24767,Variable
+LimitAlarmType_GetGroupMemberships,24768,Method
+LimitAlarmType_SeverityHighHigh,24770,Variable
+LimitAlarmType_SeverityHigh,24771,Variable
+LimitAlarmType_SeverityLow,24772,Variable
+LimitAlarmType_SeverityLowLow,24773,Variable
+LimitAlarmType_HighHighDeadband,24774,Variable
+LimitAlarmType_HighDeadband,24775,Variable
+LimitAlarmType_LowDeadband,24776,Variable
+LimitAlarmType_LowLowDeadband,24777,Variable
+ExclusiveLimitAlarmType_ShelvingState_TimedShelve2,24778,Method
+ExclusiveLimitAlarmType_ShelvingState_TimedShelve2_InputArguments,24779,Variable
+ExclusiveLimitAlarmType_ShelvingState_Unshelve2,24780,Method
+ExclusiveLimitAlarmType_ShelvingState_Unshelve2_InputArguments,24781,Variable
+ExclusiveLimitAlarmType_ShelvingState_OneShotShelve2,24782,Method
+ExclusiveLimitAlarmType_ShelvingState_OneShotShelve2_InputArguments,24783,Variable
+ExclusiveLimitAlarmType_GetGroupMemberships,24784,Method
+ExclusiveLimitAlarmType_SeverityHighHigh,24786,Variable
+ExclusiveLimitAlarmType_SeverityHigh,24787,Variable
+ExclusiveLimitAlarmType_SeverityLow,24788,Variable
+ExclusiveLimitAlarmType_SeverityLowLow,24789,Variable
+ExclusiveLimitAlarmType_HighHighDeadband,24790,Variable
+ExclusiveLimitAlarmType_HighDeadband,24791,Variable
+ExclusiveLimitAlarmType_LowDeadband,24792,Variable
+ExclusiveLimitAlarmType_LowLowDeadband,24793,Variable
+NonExclusiveLimitAlarmType_ShelvingState_TimedShelve2,24794,Method
+NonExclusiveLimitAlarmType_ShelvingState_TimedShelve2_InputArguments,24795,Variable
+NonExclusiveLimitAlarmType_ShelvingState_Unshelve2,24796,Method
+NonExclusiveLimitAlarmType_ShelvingState_Unshelve2_InputArguments,24797,Variable
+NonExclusiveLimitAlarmType_ShelvingState_OneShotShelve2,24798,Method
+NonExclusiveLimitAlarmType_ShelvingState_OneShotShelve2_InputArguments,24799,Variable
+NonExclusiveLimitAlarmType_GetGroupMemberships,24800,Method
+NonExclusiveLimitAlarmType_SeverityHighHigh,24802,Variable
+NonExclusiveLimitAlarmType_SeverityHigh,24803,Variable
+NonExclusiveLimitAlarmType_SeverityLow,24804,Variable
+NonExclusiveLimitAlarmType_SeverityLowLow,24805,Variable
+NonExclusiveLimitAlarmType_HighHighDeadband,24806,Variable
+NonExclusiveLimitAlarmType_HighDeadband,24807,Variable
+NonExclusiveLimitAlarmType_LowDeadband,24808,Variable
+NonExclusiveLimitAlarmType_LowLowDeadband,24809,Variable
+NonExclusiveLevelAlarmType_ShelvingState_TimedShelve2,24810,Method
+NonExclusiveLevelAlarmType_ShelvingState_TimedShelve2_InputArguments,24811,Variable
+NonExclusiveLevelAlarmType_ShelvingState_Unshelve2,24812,Method
+NonExclusiveLevelAlarmType_ShelvingState_Unshelve2_InputArguments,24813,Variable
+NonExclusiveLevelAlarmType_ShelvingState_OneShotShelve2,24814,Method
+NonExclusiveLevelAlarmType_ShelvingState_OneShotShelve2_InputArguments,24815,Variable
+NonExclusiveLevelAlarmType_GetGroupMemberships,24816,Method
+NonExclusiveLevelAlarmType_SeverityHighHigh,24818,Variable
+NonExclusiveLevelAlarmType_SeverityHigh,24819,Variable
+NonExclusiveLevelAlarmType_SeverityLow,24820,Variable
+NonExclusiveLevelAlarmType_SeverityLowLow,24821,Variable
+NonExclusiveLevelAlarmType_HighHighDeadband,24822,Variable
+NonExclusiveLevelAlarmType_HighDeadband,24823,Variable
+NonExclusiveLevelAlarmType_LowDeadband,24824,Variable
+NonExclusiveLevelAlarmType_LowLowDeadband,24825,Variable
+ExclusiveLevelAlarmType_ShelvingState_TimedShelve2,24826,Method
+ExclusiveLevelAlarmType_ShelvingState_TimedShelve2_InputArguments,24827,Variable
+ExclusiveLevelAlarmType_ShelvingState_Unshelve2,24828,Method
+ExclusiveLevelAlarmType_ShelvingState_Unshelve2_InputArguments,24829,Variable
+ExclusiveLevelAlarmType_ShelvingState_OneShotShelve2,24830,Method
+ExclusiveLevelAlarmType_ShelvingState_OneShotShelve2_InputArguments,24831,Variable
+ExclusiveLevelAlarmType_GetGroupMemberships,24832,Method
+ExclusiveLevelAlarmType_SeverityHighHigh,24834,Variable
+ExclusiveLevelAlarmType_SeverityHigh,24835,Variable
+ExclusiveLevelAlarmType_SeverityLow,24836,Variable
+ExclusiveLevelAlarmType_SeverityLowLow,24837,Variable
+ExclusiveLevelAlarmType_HighHighDeadband,24838,Variable
+ExclusiveLevelAlarmType_HighDeadband,24839,Variable
+ExclusiveLevelAlarmType_LowDeadband,24840,Variable
+ExclusiveLevelAlarmType_LowLowDeadband,24841,Variable
+NonExclusiveDeviationAlarmType_ShelvingState_TimedShelve2,24842,Method
+NonExclusiveDeviationAlarmType_ShelvingState_TimedShelve2_InputArguments,24843,Variable
+NonExclusiveDeviationAlarmType_ShelvingState_Unshelve2,24844,Method
+NonExclusiveDeviationAlarmType_ShelvingState_Unshelve2_InputArguments,24845,Variable
+NonExclusiveDeviationAlarmType_ShelvingState_OneShotShelve2,24846,Method
+NonExclusiveDeviationAlarmType_ShelvingState_OneShotShelve2_InputArguments,24847,Variable
+NonExclusiveDeviationAlarmType_GetGroupMemberships,24848,Method
+NonExclusiveDeviationAlarmType_SeverityHighHigh,24850,Variable
+NonExclusiveDeviationAlarmType_SeverityHigh,24851,Variable
+NonExclusiveDeviationAlarmType_SeverityLow,24852,Variable
+NonExclusiveDeviationAlarmType_SeverityLowLow,24853,Variable
+NonExclusiveDeviationAlarmType_HighHighDeadband,24854,Variable
+NonExclusiveDeviationAlarmType_HighDeadband,24855,Variable
+NonExclusiveDeviationAlarmType_LowDeadband,24856,Variable
+NonExclusiveDeviationAlarmType_LowLowDeadband,24857,Variable
+NonExclusiveRateOfChangeAlarmType_ShelvingState_TimedShelve2,24858,Method
+NonExclusiveRateOfChangeAlarmType_ShelvingState_TimedShelve2_InputArguments,24859,Variable
+NonExclusiveRateOfChangeAlarmType_ShelvingState_Unshelve2,24860,Method
+NonExclusiveRateOfChangeAlarmType_ShelvingState_Unshelve2_InputArguments,24861,Variable
+NonExclusiveRateOfChangeAlarmType_ShelvingState_OneShotShelve2,24862,Method
+NonExclusiveRateOfChangeAlarmType_ShelvingState_OneShotShelve2_InputArguments,24863,Variable
+NonExclusiveRateOfChangeAlarmType_GetGroupMemberships,24864,Method
+NonExclusiveRateOfChangeAlarmType_SeverityHighHigh,24866,Variable
+NonExclusiveRateOfChangeAlarmType_SeverityHigh,24867,Variable
+NonExclusiveRateOfChangeAlarmType_SeverityLow,24868,Variable
+NonExclusiveRateOfChangeAlarmType_SeverityLowLow,24869,Variable
+NonExclusiveRateOfChangeAlarmType_HighHighDeadband,24870,Variable
+NonExclusiveRateOfChangeAlarmType_HighDeadband,24871,Variable
+NonExclusiveRateOfChangeAlarmType_LowDeadband,24872,Variable
+NonExclusiveRateOfChangeAlarmType_LowLowDeadband,24873,Variable
+ExclusiveDeviationAlarmType_ShelvingState_TimedShelve2,24874,Method
+ExclusiveDeviationAlarmType_ShelvingState_TimedShelve2_InputArguments,24875,Variable
+ExclusiveDeviationAlarmType_ShelvingState_Unshelve2,24876,Method
+ExclusiveDeviationAlarmType_ShelvingState_Unshelve2_InputArguments,24877,Variable
+ExclusiveDeviationAlarmType_ShelvingState_OneShotShelve2,24878,Method
+ExclusiveDeviationAlarmType_ShelvingState_OneShotShelve2_InputArguments,24879,Variable
+ExclusiveDeviationAlarmType_GetGroupMemberships,24880,Method
+ExclusiveDeviationAlarmType_SeverityHighHigh,24882,Variable
+ExclusiveDeviationAlarmType_SeverityHigh,24883,Variable
+ExclusiveDeviationAlarmType_SeverityLow,24884,Variable
+ExclusiveDeviationAlarmType_SeverityLowLow,24885,Variable
+ExclusiveDeviationAlarmType_HighHighDeadband,24886,Variable
+ExclusiveDeviationAlarmType_HighDeadband,24887,Variable
+ExclusiveDeviationAlarmType_LowDeadband,24888,Variable
+ExclusiveDeviationAlarmType_LowLowDeadband,24889,Variable
+ExclusiveRateOfChangeAlarmType_ShelvingState_TimedShelve2,24890,Method
+ExclusiveRateOfChangeAlarmType_ShelvingState_TimedShelve2_InputArguments,24891,Variable
+ExclusiveRateOfChangeAlarmType_ShelvingState_Unshelve2,24892,Method
+ExclusiveRateOfChangeAlarmType_ShelvingState_Unshelve2_InputArguments,24893,Variable
+ExclusiveRateOfChangeAlarmType_ShelvingState_OneShotShelve2,24894,Method
+ExclusiveRateOfChangeAlarmType_ShelvingState_OneShotShelve2_InputArguments,24895,Variable
+ExclusiveRateOfChangeAlarmType_GetGroupMemberships,24896,Method
+ExclusiveRateOfChangeAlarmType_SeverityHighHigh,24898,Variable
+ExclusiveRateOfChangeAlarmType_SeverityHigh,24899,Variable
+ExclusiveRateOfChangeAlarmType_SeverityLow,24900,Variable
+ExclusiveRateOfChangeAlarmType_SeverityLowLow,24901,Variable
+ExclusiveRateOfChangeAlarmType_HighHighDeadband,24902,Variable
+ExclusiveRateOfChangeAlarmType_HighDeadband,24903,Variable
+ExclusiveRateOfChangeAlarmType_LowDeadband,24904,Variable
+ExclusiveRateOfChangeAlarmType_LowLowDeadband,24905,Variable
+DiscreteAlarmType_ShelvingState_TimedShelve2,24906,Method
+DiscreteAlarmType_ShelvingState_TimedShelve2_InputArguments,24907,Variable
+DiscreteAlarmType_ShelvingState_Unshelve2,24908,Method
+DiscreteAlarmType_ShelvingState_Unshelve2_InputArguments,24909,Variable
+DiscreteAlarmType_ShelvingState_OneShotShelve2,24910,Method
+DiscreteAlarmType_ShelvingState_OneShotShelve2_InputArguments,24911,Variable
+DiscreteAlarmType_GetGroupMemberships,24912,Method
+OffNormalAlarmType_ShelvingState_TimedShelve2,24914,Method
+OffNormalAlarmType_ShelvingState_TimedShelve2_InputArguments,24915,Variable
+OffNormalAlarmType_ShelvingState_Unshelve2,24916,Method
+OffNormalAlarmType_ShelvingState_Unshelve2_InputArguments,24917,Variable
+OffNormalAlarmType_ShelvingState_OneShotShelve2,24918,Method
+OffNormalAlarmType_ShelvingState_OneShotShelve2_InputArguments,24919,Variable
+OffNormalAlarmType_GetGroupMemberships,24920,Method
+SystemOffNormalAlarmType_ShelvingState_TimedShelve2,24922,Method
+SystemOffNormalAlarmType_ShelvingState_TimedShelve2_InputArguments,24923,Variable
+SystemOffNormalAlarmType_ShelvingState_Unshelve2,24924,Method
+SystemOffNormalAlarmType_ShelvingState_Unshelve2_InputArguments,24925,Variable
+SystemOffNormalAlarmType_ShelvingState_OneShotShelve2,24926,Method
+SystemOffNormalAlarmType_ShelvingState_OneShotShelve2_InputArguments,24927,Variable
+SystemOffNormalAlarmType_GetGroupMemberships,24928,Method
+TripAlarmType_ShelvingState_TimedShelve2,24930,Method
+TripAlarmType_ShelvingState_TimedShelve2_InputArguments,24931,Variable
+TripAlarmType_ShelvingState_Unshelve2,24932,Method
+TripAlarmType_ShelvingState_Unshelve2_InputArguments,24933,Variable
+TripAlarmType_ShelvingState_OneShotShelve2,24934,Method
+TripAlarmType_ShelvingState_OneShotShelve2_InputArguments,24935,Variable
+TripAlarmType_GetGroupMemberships,24936,Method
+InstrumentDiagnosticAlarmType_ShelvingState_TimedShelve2,24938,Method
+InstrumentDiagnosticAlarmType_ShelvingState_TimedShelve2_InputArguments,24939,Variable
+InstrumentDiagnosticAlarmType_ShelvingState_Unshelve2,24940,Method
+InstrumentDiagnosticAlarmType_ShelvingState_Unshelve2_InputArguments,24941,Variable
+InstrumentDiagnosticAlarmType_ShelvingState_OneShotShelve2,24942,Method
+InstrumentDiagnosticAlarmType_ShelvingState_OneShotShelve2_InputArguments,24943,Variable
+InstrumentDiagnosticAlarmType_GetGroupMemberships,24944,Method
+SystemDiagnosticAlarmType_ShelvingState_TimedShelve2,24946,Method
+SystemDiagnosticAlarmType_ShelvingState_TimedShelve2_InputArguments,24947,Variable
+SystemDiagnosticAlarmType_ShelvingState_Unshelve2,24948,Method
+SystemDiagnosticAlarmType_ShelvingState_Unshelve2_InputArguments,24949,Variable
+SystemDiagnosticAlarmType_ShelvingState_OneShotShelve2,24950,Method
+SystemDiagnosticAlarmType_ShelvingState_OneShotShelve2_InputArguments,24951,Variable
+SystemDiagnosticAlarmType_GetGroupMemberships,24952,Method
+CertificateExpirationAlarmType_ShelvingState_TimedShelve2,24954,Method
+CertificateExpirationAlarmType_ShelvingState_TimedShelve2_InputArguments,24955,Variable
+CertificateExpirationAlarmType_ShelvingState_Unshelve2,24956,Method
+CertificateExpirationAlarmType_ShelvingState_Unshelve2_InputArguments,24957,Variable
+CertificateExpirationAlarmType_ShelvingState_OneShotShelve2,24958,Method
+CertificateExpirationAlarmType_ShelvingState_OneShotShelve2_InputArguments,24959,Variable
+CertificateExpirationAlarmType_GetGroupMemberships,24960,Method
+DiscrepancyAlarmType_ShelvingState_TimedShelve2,24962,Method
+DiscrepancyAlarmType_ShelvingState_TimedShelve2_InputArguments,24963,Variable
+DiscrepancyAlarmType_ShelvingState_Unshelve2,24964,Method
+DiscrepancyAlarmType_ShelvingState_Unshelve2_InputArguments,24965,Variable
+DiscrepancyAlarmType_ShelvingState_OneShotShelve2,24966,Method
+DiscrepancyAlarmType_ShelvingState_OneShotShelve2_InputArguments,24967,Variable
+DiscrepancyAlarmType_GetGroupMemberships,24968,Method
+TrustListOutOfDateAlarmType_ShelvingState_TimedShelve2,24970,Method
+TrustListOutOfDateAlarmType_ShelvingState_TimedShelve2_InputArguments,24971,Variable
+TrustListOutOfDateAlarmType_ShelvingState_Unshelve2,24972,Method
+TrustListOutOfDateAlarmType_ShelvingState_Unshelve2_InputArguments,24973,Variable
+TrustListOutOfDateAlarmType_ShelvingState_OneShotShelve2,24974,Method
+TrustListOutOfDateAlarmType_ShelvingState_OneShotShelve2_InputArguments,24975,Variable
+TrustListOutOfDateAlarmType_GetGroupMemberships,24976,Method
+CertificateGroupType_CertificateExpired_ShelvingState_TimedShelve2,24978,Method
+CertificateGroupType_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,24979,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_Unshelve2,24980,Method
+CertificateGroupType_CertificateExpired_ShelvingState_Unshelve2_InputArguments,24981,Variable
+CertificateGroupType_CertificateExpired_ShelvingState_OneShotShelve2,24982,Method
+CertificateGroupType_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,24983,Variable
+CertificateGroupType_CertificateExpired_GetGroupMemberships,24984,Method
+CertificateGroupType_TrustListOutOfDate_ShelvingState_TimedShelve2,24986,Method
+CertificateGroupType_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,24987,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_Unshelve2,24988,Method
+CertificateGroupType_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,24989,Variable
+CertificateGroupType_TrustListOutOfDate_ShelvingState_OneShotShelve2,24990,Method
+CertificateGroupType_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,24991,Variable
+CertificateGroupType_TrustListOutOfDate_GetGroupMemberships,24992,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2,24994,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,24995,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2,24996,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,24997,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2,24998,Method
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,24999,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships,25000,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25002,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25003,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25004,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25005,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25006,Method
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25007,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships,25008,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2,25010,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25011,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2,25012,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25013,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2,25014,Method
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25015,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships,25016,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25018,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25019,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25020,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25021,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25022,Method
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25023,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships,25024,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2,25026,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25027,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2,25028,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25029,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2,25030,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25031,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships,25032,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25034,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25035,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25036,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25037,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25038,Method
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25039,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships,25040,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_TimedShelve2,25042,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25043,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_Unshelve2,25044,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25045,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_OneShotShelve2,25046,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25047,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_GetGroupMemberships,25048,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_TimedShelve2,25050,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25051,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_Unshelve2,25052,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25053,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_OneShotShelve2,25054,Method
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25055,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_GetGroupMemberships,25056,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2,25058,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25059,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2,25060,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25061,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2,25062,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25063,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships,25064,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25066,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25067,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25068,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25069,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25070,Method
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25071,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships,25072,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2,25074,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25075,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2,25076,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25077,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2,25078,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25079,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships,25080,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25082,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25083,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25084,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25085,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25086,Method
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25087,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships,25088,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2,25090,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25091,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2,25092,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25093,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2,25094,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25095,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships,25096,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25098,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25099,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25100,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25101,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25102,Method
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25103,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships,25104,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2,25106,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25107,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2,25108,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25109,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2,25110,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25111,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships,25112,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25114,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25115,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25116,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25117,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25118,Method
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25119,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships,25120,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2,25122,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25123,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2,25124,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25125,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2,25126,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25127,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships,25128,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25130,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25131,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25132,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25133,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25134,Method
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25135,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships,25136,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2,25138,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25139,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2,25140,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25141,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2,25142,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25143,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships,25144,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,25146,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,25147,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2,25148,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,25149,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,25150,Method
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,25151,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships,25152,Method
+AlarmConditionType_GetGroupMemberships_OutputArguments,25154,Variable
+GetGroupMembershipsMethodType_OutputArguments,25155,Variable
+AlarmGroupType_AlarmConditionInstance_Placeholder_GetGroupMemberships_OutputArguments,25156,Variable
+TimedShelve2MethodType,25157,Method
+TimedShelve2MethodType_InputArguments,25158,Variable
+LimitAlarmType_GetGroupMemberships_OutputArguments,25159,Variable
+ExclusiveLimitAlarmType_GetGroupMemberships_OutputArguments,25160,Variable
+NonExclusiveLimitAlarmType_GetGroupMemberships_OutputArguments,25161,Variable
+NonExclusiveLevelAlarmType_GetGroupMemberships_OutputArguments,25162,Variable
+ExclusiveLevelAlarmType_GetGroupMemberships_OutputArguments,25163,Variable
+NonExclusiveDeviationAlarmType_GetGroupMemberships_OutputArguments,25164,Variable
+NonExclusiveRateOfChangeAlarmType_GetGroupMemberships_OutputArguments,25165,Variable
+ExclusiveDeviationAlarmType_GetGroupMemberships_OutputArguments,25166,Variable
+ExclusiveRateOfChangeAlarmType_GetGroupMemberships_OutputArguments,25167,Variable
+DiscreteAlarmType_GetGroupMemberships_OutputArguments,25168,Variable
+OffNormalAlarmType_GetGroupMemberships_OutputArguments,25169,Variable
+SystemOffNormalAlarmType_GetGroupMemberships_OutputArguments,25170,Variable
+TripAlarmType_GetGroupMemberships_OutputArguments,25171,Variable
+InstrumentDiagnosticAlarmType_GetGroupMemberships_OutputArguments,25172,Variable
+SystemDiagnosticAlarmType_GetGroupMemberships_OutputArguments,25173,Variable
+CertificateExpirationAlarmType_GetGroupMemberships_OutputArguments,25174,Variable
+DiscrepancyAlarmType_GetGroupMemberships_OutputArguments,25175,Variable
+TrustListOutOfDateAlarmType_GetGroupMemberships_OutputArguments,25176,Variable
+CertificateGroupType_CertificateExpired_GetGroupMemberships_OutputArguments,25177,Variable
+CertificateGroupType_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25178,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25179,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25180,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25181,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25182,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25183,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25184,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_CertificateExpired_GetGroupMemberships_OutputArguments,25185,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25186,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25187,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25188,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25189,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25190,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25191,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25192,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25193,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25194,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25195,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25196,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25197,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,25198,Variable
+OPCUANamespaceMetadata_NamespaceFile_LastModifiedTime,25199,Variable
+FileType_LastModifiedTime,25200,Variable
+AddressSpaceFileType_LastModifiedTime,25201,Variable
+NamespaceMetadataType_NamespaceFile_LastModifiedTime,25202,Variable
+NamespacesType_NamespaceIdentifier_Placeholder_NamespaceFile_LastModifiedTime,25203,Variable
+FileDirectoryType_FileName_Placeholder_LastModifiedTime,25204,Variable
+FileSystem_FileName_Placeholder_LastModifiedTime,25205,Variable
+TrustListType_LastModifiedTime,25206,Variable
+CertificateGroupType_TrustList_LastModifiedTime,25207,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustList_LastModifiedTime,25208,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustList_LastModifiedTime,25209,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustList_LastModifiedTime,25210,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustList_LastModifiedTime,25211,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_LastModifiedTime,25212,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_LastModifiedTime,25213,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_LastModifiedTime,25214,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustList_LastModifiedTime,25215,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustList_LastModifiedTime,25216,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustList_LastModifiedTime,25217,Variable
+IVlanIdType,25218,ObjectType
+IVlanIdType_VlanId,25219,Variable
+PriorityMappingEntryType,25220,DataType
+IetfBaseNetworkInterfaceType,25221,ObjectType
+IetfBaseNetworkInterfaceType_AdminStatus,25222,Variable
+IetfBaseNetworkInterfaceType_OperStatus,25223,Variable
+IetfBaseNetworkInterfaceType_PhysAddress,25224,Variable
+IetfBaseNetworkInterfaceType_Speed,25225,Variable
+IetfBaseNetworkInterfaceType_InterfaceName_Placeholder,25226,Object
+PriorityMappingTableType,25227,ObjectType
+PriorityMappingTableType_PriorityMapppingEntries,25228,Variable
+PriorityMappingTableType_AddPriorityMappingEntry,25229,Method
+PriorityMappingTableType_AddPriorityMappingEntry_InputArguments,25230,Variable
+PriorityMappingTableType_DeletePriorityMappingEntry,25231,Method
+PriorityMappingTableType_DeletePriorityMappingEntry_InputArguments,25232,Variable
+AddPriorityMappingEntryMethodType,25233,Method
+AddPriorityMappingEntryMethodType_InputArguments,25234,Variable
+DeletePriorityMappingEntryMethodType,25235,Method
+DeletePriorityMappingEntryMethodType_InputArguments,25236,Variable
+UsesPriorityMappingTable,25237,ReferenceType
+HasLowerLayerInterface,25238,ReferenceType
+PriorityMappingEntryType_Encoding_DefaultBinary,25239,Object
+OpcUa_BinarySchema_PriorityMappingEntryType,25240,Variable
+OpcUa_BinarySchema_PriorityMappingEntryType_DataTypeVersion,25241,Variable
+OpcUa_BinarySchema_PriorityMappingEntryType_DictionaryFragment,25242,Variable
+PriorityMappingEntryType_Encoding_DefaultXml,25243,Object
+OpcUa_XmlSchema_PriorityMappingEntryType,25244,Variable
+OpcUa_XmlSchema_PriorityMappingEntryType_DataTypeVersion,25245,Variable
+OpcUa_XmlSchema_PriorityMappingEntryType_DictionaryFragment,25246,Variable
+PriorityMappingEntryType_Encoding_DefaultJson,25247,Object
+IetfBaseNetworkInterfaceType_Speed_Definition,25248,Variable
+IetfBaseNetworkInterfaceType_Speed_ValuePrecision,25249,Variable
+IetfBaseNetworkInterfaceType_Speed_InstrumentRange,25250,Variable
+IetfBaseNetworkInterfaceType_Speed_EURange,25251,Variable
+IetfBaseNetworkInterfaceType_Speed_EngineeringUnits,25252,Variable
+IsExecutableOn,25253,ReferenceType
+Controls,25254,ReferenceType
+Utilizes,25255,ReferenceType
+Requires,25256,ReferenceType
+IsPhysicallyConnectedTo,25257,ReferenceType
+RepresentsSameEntityAs,25258,ReferenceType
+RepresentsSameHardwareAs,25259,ReferenceType
+RepresentsSameFunctionalityAs,25260,ReferenceType
+IsHostedBy,25261,ReferenceType
+HasPhysicalComponent,25262,ReferenceType
+HasContainedComponent,25263,ReferenceType
+HasAttachedComponent,25264,ReferenceType
+IsExecutingOn,25265,ReferenceType
+OPCUANamespaceMetadata_ConfigurationVersion,25266,Variable
+NamespaceMetadataType_ConfigurationVersion,25267,Variable
+NamespacesType_NamespaceIdentifier_Placeholder_ConfigurationVersion,25268,Variable
+PublishedDataSetCustomSourceDataType,25269,DataType
+PubSubKeyPushTargetDataType,25270,DataType
+PubSubKeyServiceType_SecurityGroups_AddSecurityGroupFolder,25271,Method
+PubSubKeyServiceType_SecurityGroups_AddSecurityGroupFolder_InputArguments,25272,Variable
+PubSubKeyServiceType_SecurityGroups_AddSecurityGroupFolder_OutputArguments,25273,Variable
+PubSubKeyServiceType_SecurityGroups_RemoveSecurityGroupFolder,25274,Method
+PubSubKeyServiceType_SecurityGroups_RemoveSecurityGroupFolder_InputArguments,25275,Variable
+PubSubKeyServiceType_SecurityGroups_SupportedSecurityPolicyUris,25276,Variable
+PubSubKeyServiceType_KeyPushTargets,25277,Object
+PubSubKeyServiceType_KeyPushTargets_AddPushTarget,25278,Method
+PubSubKeyServiceType_KeyPushTargets_AddPushTarget_InputArguments,25279,Variable
+PubSubKeyServiceType_KeyPushTargets_AddPushTarget_OutputArguments,25280,Variable
+PubSubKeyServiceType_KeyPushTargets_RemovePushTarget,25281,Method
+PubSubKeyServiceType_KeyPushTargets_RemovePushTarget_InputArguments,25282,Variable
+PubSubKeyServiceType_KeyPushTargets_AddPushTargetFolder,25283,Method
+PubSubKeyServiceType_KeyPushTargets_AddPushTargetFolder_InputArguments,25284,Variable
+PubSubKeyServiceType_KeyPushTargets_AddPushTargetFolder_OutputArguments,25285,Variable
+PubSubKeyServiceType_KeyPushTargets_RemovePushTargetFolder,25286,Method
+PubSubKeyServiceType_KeyPushTargets_RemovePushTargetFolder_InputArguments,25287,Variable
+AddSecurityGroupFolderMethodType,25288,Method
+AddSecurityGroupFolderMethodType_InputArguments,25289,Variable
+AddSecurityGroupFolderMethodType_OutputArguments,25290,Variable
+RemoveSecurityGroupFolderMethodType,25291,Method
+RemoveSecurityGroupFolderMethodType_InputArguments,25292,Variable
+SecurityGroupFolderType_SecurityGroupFolderName_Placeholder_AddSecurityGroupFolder,25293,Method
+SecurityGroupFolderType_SecurityGroupFolderName_Placeholder_AddSecurityGroupFolder_InputArguments,25294,Variable
+SecurityGroupFolderType_SecurityGroupFolderName_Placeholder_AddSecurityGroupFolder_OutputArguments,25295,Variable
+SecurityGroupFolderType_SecurityGroupFolderName_Placeholder_RemoveSecurityGroupFolder,25296,Method
+SecurityGroupFolderType_SecurityGroupFolderName_Placeholder_RemoveSecurityGroupFolder_InputArguments,25297,Variable
+SecurityGroupFolderType_SecurityGroupFolderName_Placeholder_SupportedSecurityPolicyUris,25298,Variable
+SecurityGroupFolderType_AddSecurityGroupFolder,25312,Method
+SecurityGroupFolderType_AddSecurityGroupFolder_InputArguments,25313,Variable
+SecurityGroupFolderType_AddSecurityGroupFolder_OutputArguments,25314,Variable
+SecurityGroupFolderType_RemoveSecurityGroupFolder,25315,Method
+SecurityGroupFolderType_RemoveSecurityGroupFolder_InputArguments,25316,Variable
+SecurityGroupFolderType_SupportedSecurityPolicyUris,25317,Variable
+ConnectSecurityGroupsMethodType,25331,Method
+ConnectSecurityGroupsMethodType_InputArguments,25332,Variable
+ConnectSecurityGroupsMethodType_OutputArguments,25333,Variable
+DisconnectSecurityGroupsMethodType,25334,Method
+DisconnectSecurityGroupsMethodType_InputArguments,25335,Variable
+DisconnectSecurityGroupsMethodType_OutputArguments,25336,Variable
+PubSubKeyPushTargetType,25337,ObjectType
+PubSubKeyPushTargetType_SecurityPolicyUri,25340,Variable
+HasPushedSecurityGroup,25345,ReferenceType
+PubSubKeyPushTargetFolderType,25346,ObjectType
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder,25347,Object
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_AddPushTarget,25348,Method
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_AddPushTarget_InputArguments,25349,Variable
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_AddPushTarget_OutputArguments,25350,Variable
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_RemovePushTarget,25351,Method
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_RemovePushTarget_InputArguments,25352,Variable
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_AddPushTargetFolder,25353,Method
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_AddPushTargetFolder_InputArguments,25354,Variable
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_AddPushTargetFolder_OutputArguments,25355,Variable
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_RemovePushTargetFolder,25356,Method
+PubSubKeyPushTargetFolderType_PushTargetFolderName_Placeholder_RemovePushTargetFolder_InputArguments,25357,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder,25358,Object
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_SecurityPolicyUri,25361,Variable
+PubSubKeyPushTargetFolderType_AddPushTarget,25366,Method
+PubSubKeyPushTargetFolderType_AddPushTarget_InputArguments,25367,Variable
+PubSubKeyPushTargetFolderType_AddPushTarget_OutputArguments,25368,Variable
+PubSubKeyPushTargetFolderType_RemovePushTarget,25369,Method
+PubSubKeyPushTargetFolderType_RemovePushTarget_InputArguments,25370,Variable
+PubSubKeyPushTargetFolderType_AddPushTargetFolder,25371,Method
+PubSubKeyPushTargetFolderType_AddPushTargetFolder_InputArguments,25372,Variable
+PubSubKeyPushTargetFolderType_AddPushTargetFolder_OutputArguments,25373,Variable
+PubSubKeyPushTargetFolderType_RemovePushTargetFolder,25374,Method
+PubSubKeyPushTargetFolderType_RemovePushTargetFolder_InputArguments,25375,Variable
+AddPushTargetMethodType,25376,Method
+AddPushTargetMethodType_InputArguments,25377,Variable
+AddPushTargetMethodType_OutputArguments,25378,Variable
+RemovePushTargetMethodType,25379,Method
+RemovePushTargetMethodType_InputArguments,25380,Variable
+AddPushTargetFolderMethodType,25381,Method
+AddPushTargetFolderMethodType_InputArguments,25382,Variable
+AddPushTargetFolderMethodType_OutputArguments,25383,Variable
+RemovePushTargetFolderMethodType,25384,Method
+RemovePushTargetFolderMethodType_InputArguments,25385,Variable
+PublishSubscribeType_SecurityGroups_AddSecurityGroupFolder,25386,Method
+PublishSubscribeType_SecurityGroups_AddSecurityGroupFolder_InputArguments,25387,Variable
+PublishSubscribeType_SecurityGroups_AddSecurityGroupFolder_OutputArguments,25388,Variable
+PublishSubscribeType_SecurityGroups_RemoveSecurityGroupFolder,25389,Method
+PublishSubscribeType_SecurityGroups_RemoveSecurityGroupFolder_InputArguments,25390,Variable
+PublishSubscribeType_SecurityGroups_SupportedSecurityPolicyUris,25391,Variable
+PublishSubscribeType_KeyPushTargets,25392,Object
+PublishSubscribeType_KeyPushTargets_AddPushTarget,25393,Method
+PublishSubscribeType_KeyPushTargets_AddPushTarget_InputArguments,25394,Variable
+PublishSubscribeType_KeyPushTargets_AddPushTarget_OutputArguments,25395,Variable
+PublishSubscribeType_KeyPushTargets_RemovePushTarget,25396,Method
+PublishSubscribeType_KeyPushTargets_RemovePushTarget_InputArguments,25397,Variable
+PublishSubscribeType_KeyPushTargets_AddPushTargetFolder,25398,Method
+PublishSubscribeType_KeyPushTargets_AddPushTargetFolder_InputArguments,25399,Variable
+PublishSubscribeType_KeyPushTargets_AddPushTargetFolder_OutputArguments,25400,Variable
+PublishSubscribeType_KeyPushTargets_RemovePushTargetFolder,25401,Method
+PublishSubscribeType_KeyPushTargets_RemovePushTargetFolder_InputArguments,25402,Variable
+PublishSubscribeType_PubSubConfiguration,25403,Object
+PublishSubscribeType_PubSubConfiguration_Size,25404,Variable
+PublishSubscribeType_PubSubConfiguration_Writable,25405,Variable
+PublishSubscribeType_PubSubConfiguration_UserWritable,25406,Variable
+PublishSubscribeType_PubSubConfiguration_OpenCount,25407,Variable
+PublishSubscribeType_PubSubConfiguration_MimeType,25408,Variable
+PublishSubscribeType_PubSubConfiguration_MaxByteStringLength,25409,Variable
+PublishSubscribeType_PubSubConfiguration_LastModifiedTime,25410,Variable
+PublishSubscribeType_PubSubConfiguration_Open,25411,Method
+PublishSubscribeType_PubSubConfiguration_Open_InputArguments,25412,Variable
+PublishSubscribeType_PubSubConfiguration_Open_OutputArguments,25413,Variable
+PublishSubscribeType_PubSubConfiguration_Close,25414,Method
+PublishSubscribeType_PubSubConfiguration_Close_InputArguments,25415,Variable
+PublishSubscribeType_PubSubConfiguration_Read,25416,Method
+PublishSubscribeType_PubSubConfiguration_Read_InputArguments,25417,Variable
+PublishSubscribeType_PubSubConfiguration_Read_OutputArguments,25418,Variable
+PublishSubscribeType_PubSubConfiguration_Write,25419,Method
+PublishSubscribeType_PubSubConfiguration_Write_InputArguments,25420,Variable
+PublishSubscribeType_PubSubConfiguration_GetPosition,25421,Method
+PublishSubscribeType_PubSubConfiguration_GetPosition_InputArguments,25422,Variable
+PublishSubscribeType_PubSubConfiguration_GetPosition_OutputArguments,25423,Variable
+PublishSubscribeType_PubSubConfiguration_SetPosition,25424,Method
+PublishSubscribeType_PubSubConfiguration_SetPosition_InputArguments,25425,Variable
+PublishSubscribeType_PubSubConfiguration_ReserveIds,25426,Method
+PublishSubscribeType_PubSubConfiguration_ReserveIds_InputArguments,25427,Variable
+PublishSubscribeType_PubSubConfiguration_ReserveIds_OutputArguments,25428,Variable
+PublishSubscribeType_PubSubConfiguration_CloseAndUpdate,25429,Method
+PublishSubscribeType_PubSubConfiguration_CloseAndUpdate_InputArguments,25430,Variable
+PublishSubscribeType_PubSubConfiguration_CloseAndUpdate_OutputArguments,25431,Variable
+PublishSubscribeType_DefaultDatagramPublisherId,25432,Variable
+PublishSubscribeType_ConfigurationVersion,25433,Variable
+PublishSubscribe_SecurityGroups_AddSecurityGroupFolder,25434,Method
+PublishSubscribe_SecurityGroups_AddSecurityGroupFolder_InputArguments,25435,Variable
+PublishSubscribe_SecurityGroups_AddSecurityGroupFolder_OutputArguments,25436,Variable
+PublishSubscribe_SecurityGroups_RemoveSecurityGroupFolder,25437,Method
+PublishSubscribe_SecurityGroups_RemoveSecurityGroupFolder_InputArguments,25438,Variable
+PublishSubscribe_SecurityGroups_SupportedSecurityPolicyUris,25439,Variable
+PublishSubscribe_KeyPushTargets,25440,Object
+PublishSubscribe_KeyPushTargets_AddPushTarget,25441,Method
+PublishSubscribe_KeyPushTargets_AddPushTarget_InputArguments,25442,Variable
+PublishSubscribe_KeyPushTargets_AddPushTarget_OutputArguments,25443,Variable
+PublishSubscribe_KeyPushTargets_RemovePushTarget,25444,Method
+PublishSubscribe_KeyPushTargets_RemovePushTarget_InputArguments,25445,Variable
+PublishSubscribe_KeyPushTargets_AddPushTargetFolder,25446,Method
+PublishSubscribe_KeyPushTargets_AddPushTargetFolder_InputArguments,25447,Variable
+PublishSubscribe_KeyPushTargets_AddPushTargetFolder_OutputArguments,25448,Variable
+PublishSubscribe_KeyPushTargets_RemovePushTargetFolder,25449,Method
+PublishSubscribe_KeyPushTargets_RemovePushTargetFolder_InputArguments,25450,Variable
+PublishSubscribe_PubSubConfiguration,25451,Object
+PublishSubscribe_PubSubConfiguration_Size,25452,Variable
+PublishSubscribe_PubSubConfiguration_Writable,25453,Variable
+PublishSubscribe_PubSubConfiguration_UserWritable,25454,Variable
+PublishSubscribe_PubSubConfiguration_OpenCount,25455,Variable
+PublishSubscribe_PubSubConfiguration_MimeType,25456,Variable
+PublishSubscribe_PubSubConfiguration_MaxByteStringLength,25457,Variable
+PublishSubscribe_PubSubConfiguration_LastModifiedTime,25458,Variable
+PublishSubscribe_PubSubConfiguration_Open,25459,Method
+PublishSubscribe_PubSubConfiguration_Open_InputArguments,25460,Variable
+PublishSubscribe_PubSubConfiguration_Open_OutputArguments,25461,Variable
+PublishSubscribe_PubSubConfiguration_Close,25462,Method
+PublishSubscribe_PubSubConfiguration_Close_InputArguments,25463,Variable
+PublishSubscribe_PubSubConfiguration_Read,25464,Method
+PublishSubscribe_PubSubConfiguration_Read_InputArguments,25465,Variable
+PublishSubscribe_PubSubConfiguration_Read_OutputArguments,25466,Variable
+PublishSubscribe_PubSubConfiguration_Write,25467,Method
+PublishSubscribe_PubSubConfiguration_Write_InputArguments,25468,Variable
+PublishSubscribe_PubSubConfiguration_GetPosition,25469,Method
+PublishSubscribe_PubSubConfiguration_GetPosition_InputArguments,25470,Variable
+PublishSubscribe_PubSubConfiguration_GetPosition_OutputArguments,25471,Variable
+PublishSubscribe_PubSubConfiguration_SetPosition,25472,Method
+PublishSubscribe_PubSubConfiguration_SetPosition_InputArguments,25473,Variable
+PublishSubscribe_PubSubConfiguration_ReserveIds,25474,Method
+PublishSubscribe_PubSubConfiguration_ReserveIds_InputArguments,25475,Variable
+PublishSubscribe_PubSubConfiguration_ReserveIds_OutputArguments,25476,Variable
+PublishSubscribe_PubSubConfiguration_CloseAndUpdate,25477,Method
+PublishSubscribe_PubSubConfiguration_CloseAndUpdate_InputArguments,25478,Variable
+PublishSubscribe_PubSubConfiguration_CloseAndUpdate_OutputArguments,25479,Variable
+PublishSubscribe_DefaultDatagramPublisherId,25480,Variable
+PublishSubscribe_ConfigurationVersion,25481,Variable
+PubSubConfigurationType,25482,ObjectType
+PubSubConfigurationType_Size,25483,Variable
+PubSubConfigurationType_Writable,25484,Variable
+PubSubConfigurationType_UserWritable,25485,Variable
+PubSubConfigurationType_OpenCount,25486,Variable
+PubSubConfigurationType_MimeType,25487,Variable
+PubSubConfigurationType_MaxByteStringLength,25488,Variable
+PubSubConfigurationType_LastModifiedTime,25489,Variable
+PubSubConfigurationType_Open,25490,Method
+PubSubConfigurationType_Open_InputArguments,25491,Variable
+PubSubConfigurationType_Open_OutputArguments,25492,Variable
+PubSubConfigurationType_Close,25493,Method
+PubSubConfigurationType_Close_InputArguments,25494,Variable
+PubSubConfigurationType_Read,25495,Method
+PubSubConfigurationType_Read_InputArguments,25496,Variable
+PubSubConfigurationType_Read_OutputArguments,25497,Variable
+PubSubConfigurationType_Write,25498,Method
+PubSubConfigurationType_Write_InputArguments,25499,Variable
+PubSubConfigurationType_GetPosition,25500,Method
+PubSubConfigurationType_GetPosition_InputArguments,25501,Variable
+PubSubConfigurationType_GetPosition_OutputArguments,25502,Variable
+PubSubConfigurationType_SetPosition,25503,Method
+PubSubConfigurationType_SetPosition_InputArguments,25504,Variable
+PubSubConfigurationType_ReserveIds,25505,Method
+PubSubConfigurationType_ReserveIds_InputArguments,25506,Variable
+PubSubConfigurationType_ReserveIds_OutputArguments,25507,Variable
+PubSubConfigurationType_CloseAndUpdate,25508,Method
+PubSubConfigurationType_CloseAndUpdate_InputArguments,25509,Variable
+PubSubConfigurationType_CloseAndUpdate_OutputArguments,25510,Variable
+PubSubConfigurationTypeReserveIdsMethodType,25511,Method
+PubSubConfigurationTypeReserveIdsMethodType_InputArguments,25512,Variable
+PubSubConfigurationTypeReserveIdsMethodType_OutputArguments,25513,Variable
+PubSubConfigurationTypeCloseAndUpdateMethodType,25514,Method
+PubSubConfigurationTypeCloseAndUpdateMethodType_InputArguments,25515,Variable
+PubSubConfigurationTypeCloseAndUpdateMethodType_OutputArguments,25516,Variable
+PubSubConfigurationRefMask,25517,DataType
+PubSubConfigurationRefMask_OptionSetValues,25518,Variable
+PubSubConfigurationRefDataType,25519,DataType
+PubSubConfigurationValueDataType,25520,DataType
+PublishedDataSetType_CyclicDataSet,25521,Variable
+PublishedDataItemsType_CyclicDataSet,25522,Variable
+PublishedEventsType_CyclicDataSet,25523,Variable
+DataSetFolderType_PublishedDataSetName_Placeholder_CyclicDataSet,25524,Variable
+DatagramConnectionTransportType_QosCategory,25525,Variable
+DatagramConnectionTransportType_DatagramQos,25526,Variable
+DatagramWriterGroupTransportType_QosCategory,25527,Variable
+DatagramDataSetReaderTransportType_QosCategory,25528,Variable
+PublishedDataSetCustomSourceDataType_Encoding_DefaultBinary,25529,Object
+PubSubKeyPushTargetDataType_Encoding_DefaultBinary,25530,Object
+PubSubConfigurationRefDataType_Encoding_DefaultBinary,25531,Object
+PubSubConfigurationValueDataType_Encoding_DefaultBinary,25532,Object
+OpcUa_BinarySchema_PublishedDataSetCustomSourceDataType,25533,Variable
+OpcUa_BinarySchema_PublishedDataSetCustomSourceDataType_DataTypeVersion,25534,Variable
+OpcUa_BinarySchema_PublishedDataSetCustomSourceDataType_DictionaryFragment,25535,Variable
+OpcUa_BinarySchema_PubSubKeyPushTargetDataType,25536,Variable
+OpcUa_BinarySchema_PubSubKeyPushTargetDataType_DataTypeVersion,25537,Variable
+OpcUa_BinarySchema_PubSubKeyPushTargetDataType_DictionaryFragment,25538,Variable
+OpcUa_BinarySchema_PubSubConfigurationRefDataType,25539,Variable
+OpcUa_BinarySchema_PubSubConfigurationRefDataType_DataTypeVersion,25540,Variable
+OpcUa_BinarySchema_PubSubConfigurationRefDataType_DictionaryFragment,25541,Variable
+OpcUa_BinarySchema_PubSubConfigurationValueDataType,25542,Variable
+OpcUa_BinarySchema_PubSubConfigurationValueDataType_DataTypeVersion,25543,Variable
+OpcUa_BinarySchema_PubSubConfigurationValueDataType_DictionaryFragment,25544,Variable
+PublishedDataSetCustomSourceDataType_Encoding_DefaultXml,25545,Object
+PubSubKeyPushTargetDataType_Encoding_DefaultXml,25546,Object
+PubSubConfigurationRefDataType_Encoding_DefaultXml,25547,Object
+PubSubConfigurationValueDataType_Encoding_DefaultXml,25548,Object
+OpcUa_XmlSchema_PublishedDataSetCustomSourceDataType,25549,Variable
+OpcUa_XmlSchema_PublishedDataSetCustomSourceDataType_DataTypeVersion,25550,Variable
+OpcUa_XmlSchema_PublishedDataSetCustomSourceDataType_DictionaryFragment,25551,Variable
+OpcUa_XmlSchema_PubSubKeyPushTargetDataType,25552,Variable
+OpcUa_XmlSchema_PubSubKeyPushTargetDataType_DataTypeVersion,25553,Variable
+OpcUa_XmlSchema_PubSubKeyPushTargetDataType_DictionaryFragment,25554,Variable
+OpcUa_XmlSchema_PubSubConfigurationRefDataType,25555,Variable
+OpcUa_XmlSchema_PubSubConfigurationRefDataType_DataTypeVersion,25556,Variable
+OpcUa_XmlSchema_PubSubConfigurationRefDataType_DictionaryFragment,25557,Variable
+OpcUa_XmlSchema_PubSubConfigurationValueDataType,25558,Variable
+OpcUa_XmlSchema_PubSubConfigurationValueDataType_DataTypeVersion,25559,Variable
+OpcUa_XmlSchema_PubSubConfigurationValueDataType_DictionaryFragment,25560,Variable
+PublishedDataSetCustomSourceDataType_Encoding_DefaultJson,25561,Object
+PubSubKeyPushTargetDataType_Encoding_DefaultJson,25562,Object
+PubSubConfigurationRefDataType_Encoding_DefaultJson,25563,Object
+PubSubConfigurationValueDataType_Encoding_DefaultJson,25564,Object
+WellKnownRole_SecurityKeyServerAdmin,25565,Object
+WellKnownRole_SecurityKeyServerAdmin_Identities,25566,Variable
+WellKnownRole_SecurityKeyServerAdmin_ApplicationsExclude,25567,Variable
+WellKnownRole_SecurityKeyServerAdmin_Applications,25568,Variable
+WellKnownRole_SecurityKeyServerAdmin_EndpointsExclude,25569,Variable
+WellKnownRole_SecurityKeyServerAdmin_Endpoints,25570,Variable
+WellKnownRole_SecurityKeyServerAdmin_CustomConfiguration,25571,Variable
+WellKnownRole_SecurityKeyServerAdmin_AddIdentity,25572,Method
+WellKnownRole_SecurityKeyServerAdmin_AddIdentity_InputArguments,25573,Variable
+WellKnownRole_SecurityKeyServerAdmin_RemoveIdentity,25574,Method
+WellKnownRole_SecurityKeyServerAdmin_RemoveIdentity_InputArguments,25575,Variable
+WellKnownRole_SecurityKeyServerAdmin_AddApplication,25576,Method
+WellKnownRole_SecurityKeyServerAdmin_AddApplication_InputArguments,25577,Variable
+WellKnownRole_SecurityKeyServerAdmin_RemoveApplication,25578,Method
+WellKnownRole_SecurityKeyServerAdmin_RemoveApplication_InputArguments,25579,Variable
+WellKnownRole_SecurityKeyServerAdmin_AddEndpoint,25580,Method
+WellKnownRole_SecurityKeyServerAdmin_AddEndpoint_InputArguments,25581,Variable
+WellKnownRole_SecurityKeyServerAdmin_RemoveEndpoint,25582,Method
+WellKnownRole_SecurityKeyServerAdmin_RemoveEndpoint_InputArguments,25583,Variable
+WellKnownRole_SecurityKeyServerPush,25584,Object
+WellKnownRole_SecurityKeyServerPush_Identities,25585,Variable
+WellKnownRole_SecurityKeyServerPush_ApplicationsExclude,25586,Variable
+WellKnownRole_SecurityKeyServerPush_Applications,25587,Variable
+WellKnownRole_SecurityKeyServerPush_EndpointsExclude,25588,Variable
+WellKnownRole_SecurityKeyServerPush_Endpoints,25589,Variable
+WellKnownRole_SecurityKeyServerPush_CustomConfiguration,25590,Variable
+WellKnownRole_SecurityKeyServerPush_AddIdentity,25591,Method
+WellKnownRole_SecurityKeyServerPush_AddIdentity_InputArguments,25592,Variable
+WellKnownRole_SecurityKeyServerPush_RemoveIdentity,25593,Method
+WellKnownRole_SecurityKeyServerPush_RemoveIdentity_InputArguments,25594,Variable
+WellKnownRole_SecurityKeyServerPush_AddApplication,25595,Method
+WellKnownRole_SecurityKeyServerPush_AddApplication_InputArguments,25596,Variable
+WellKnownRole_SecurityKeyServerPush_RemoveApplication,25597,Method
+WellKnownRole_SecurityKeyServerPush_RemoveApplication_InputArguments,25598,Variable
+WellKnownRole_SecurityKeyServerPush_AddEndpoint,25599,Method
+WellKnownRole_SecurityKeyServerPush_AddEndpoint_InputArguments,25600,Variable
+WellKnownRole_SecurityKeyServerPush_RemoveEndpoint,25601,Method
+WellKnownRole_SecurityKeyServerPush_RemoveEndpoint_InputArguments,25602,Variable
+WellKnownRole_SecurityKeyServerAccess,25603,Object
+WellKnownRole_SecurityKeyServerAccess_Identities,25604,Variable
+WellKnownRole_SecurityKeyServerAccess_ApplicationsExclude,25605,Variable
+WellKnownRole_SecurityKeyServerAccess_Applications,25606,Variable
+WellKnownRole_SecurityKeyServerAccess_EndpointsExclude,25607,Variable
+WellKnownRole_SecurityKeyServerAccess_Endpoints,25608,Variable
+WellKnownRole_SecurityKeyServerAccess_CustomConfiguration,25609,Variable
+WellKnownRole_SecurityKeyServerAccess_AddIdentity,25610,Method
+WellKnownRole_SecurityKeyServerAccess_AddIdentity_InputArguments,25611,Variable
+WellKnownRole_SecurityKeyServerAccess_RemoveIdentity,25612,Method
+WellKnownRole_SecurityKeyServerAccess_RemoveIdentity_InputArguments,25613,Variable
+WellKnownRole_SecurityKeyServerAccess_AddApplication,25614,Method
+WellKnownRole_SecurityKeyServerAccess_AddApplication_InputArguments,25615,Variable
+WellKnownRole_SecurityKeyServerAccess_RemoveApplication,25616,Method
+WellKnownRole_SecurityKeyServerAccess_RemoveApplication_InputArguments,25617,Variable
+WellKnownRole_SecurityKeyServerAccess_AddEndpoint,25618,Method
+WellKnownRole_SecurityKeyServerAccess_AddEndpoint_InputArguments,25619,Variable
+WellKnownRole_SecurityKeyServerAccess_RemoveEndpoint,25620,Method
+WellKnownRole_SecurityKeyServerAccess_RemoveEndpoint_InputArguments,25621,Variable
+SecurityGroupFolderType_SecurityGroupName_Placeholder_InvalidateKeys,25622,Method
+SecurityGroupFolderType_SecurityGroupName_Placeholder_ForceKeyRotation,25623,Method
+SecurityGroupType_InvalidateKeys,25624,Method
+SecurityGroupType_ForceKeyRotation,25625,Method
+PubSubKeyPushTargetType_SecurityGroupName_Placeholder,25626,Object
+PubSubKeyPushTargetType_SecurityGroupName_Placeholder_SecurityGroupId,25627,Variable
+PubSubKeyPushTargetType_SecurityGroupName_Placeholder_KeyLifetime,25628,Variable
+PubSubKeyPushTargetType_SecurityGroupName_Placeholder_SecurityPolicyUri,25629,Variable
+PubSubKeyPushTargetType_SecurityGroupName_Placeholder_MaxFutureKeyCount,25630,Variable
+PubSubKeyPushTargetType_SecurityGroupName_Placeholder_MaxPastKeyCount,25631,Variable
+PubSubKeyPushTargetType_SecurityGroupName_Placeholder_InvalidateKeys,25632,Method
+PubSubKeyPushTargetType_SecurityGroupName_Placeholder_ForceKeyRotation,25633,Method
+PubSubKeyPushTargetType_ApplicationUri,25634,Variable
+PubSubKeyPushTargetType_EndpointUrl,25635,Variable
+PubSubKeyPushTargetType_UserTokenType,25636,Variable
+PubSubKeyPushTargetType_RequestedKeyCount,25637,Variable
+PubSubKeyPushTargetType_RetryInterval,25638,Variable
+PubSubKeyPushTargetType_LastPushExecutionTime,25639,Variable
+PubSubKeyPushTargetType_LastPushErrorTime,25640,Variable
+PubSubKeyPushTargetType_ConnectSecurityGroups,25641,Method
+PubSubKeyPushTargetType_ConnectSecurityGroups_InputArguments,25642,Variable
+PubSubKeyPushTargetType_ConnectSecurityGroups_OutputArguments,25643,Variable
+PubSubKeyPushTargetType_DisconnectSecurityGroups,25644,Method
+PubSubKeyPushTargetType_DisconnectSecurityGroups_InputArguments,25645,Variable
+PubSubKeyPushTargetType_DisconnectSecurityGroups_OutputArguments,25646,Variable
+PubSubKeyPushTargetType_TriggerKeyUpdate,25647,Method
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_ApplicationUri,25648,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_EndpointUrl,25649,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_UserTokenType,25650,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_RequestedKeyCount,25651,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_RetryInterval,25652,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_LastPushExecutionTime,25653,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_LastPushErrorTime,25654,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_ConnectSecurityGroups,25655,Method
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_ConnectSecurityGroups_InputArguments,25656,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_ConnectSecurityGroups_OutputArguments,25657,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_DisconnectSecurityGroups,25658,Method
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_DisconnectSecurityGroups_InputArguments,25659,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_DisconnectSecurityGroups_OutputArguments,25660,Variable
+PubSubKeyPushTargetFolderType_PushTargetName_Placeholder_TriggerKeyUpdate,25661,Method
+AuditClientUpdateMethodResultEventType_OutputArguments,25684,Variable
+ServerConfigurationType_ApplicationUri,25696,Variable
+ServerConfigurationType_ApplicationType,25697,Variable
+ServerConfigurationType_CancelChanges,25698,Method
+ServerConfigurationType_ResetToServerDefaults,25699,Method
+ServerConfiguration_ApplicationUri,25706,Variable
+ServerConfiguration_ApplicationType,25707,Variable
+ServerConfiguration_CancelChanges,25708,Method
+ServerConfiguration_ResetToServerDefaults,25709,Method
+ServerConfiguration_SetAdminPassword,25710,Method
+ServerConfigurationType_ProductUri,25724,Variable
+ServerConfiguration_ProductUri,25725,Variable
+EncodedTicket,25726,DataType
+RequestTicketsMethodType,25727,Method
+RequestTicketsMethodType_OutputArguments,25728,Variable
+SetRegistrarEndpointsMethodType,25729,Method
+SetRegistrarEndpointsMethodType_InputArguments,25730,Variable
+ApplicationConfigurationType,25731,ObjectType
+ApplicationConfigurationType_CertificateGroups,25732,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup,25733,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList,25734,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Size,25735,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Writable,25736,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_UserWritable,25737,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_OpenCount,25738,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_MimeType,25739,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_MaxByteStringLength,25740,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_LastModifiedTime,25741,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Open,25742,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Open_InputArguments,25743,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Open_OutputArguments,25744,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Close,25745,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Close_InputArguments,25746,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Read,25747,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Read_InputArguments,25748,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Read_OutputArguments,25749,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Write,25750,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_Write_InputArguments,25751,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition,25752,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition_InputArguments,25753,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition_OutputArguments,25754,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_SetPosition,25755,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_SetPosition_InputArguments,25756,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_LastUpdateTime,25757,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_UpdateFrequency,25758,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_DefaultValidationOptions,25759,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks,25760,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks_InputArguments,25761,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks_OutputArguments,25762,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate,25763,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate_InputArguments,25764,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate_OutputArguments,25765,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_AddCertificate,25766,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_AddCertificate_InputArguments,25767,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_RemoveCertificate,25768,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_RemoveCertificate_InputArguments,25769,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateTypes,25770,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_GetRejectedList,25772,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_GetRejectedList_OutputArguments,25773,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired,25774,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventId,25775,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventType,25776,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceNode,25777,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceName,25778,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Time,25779,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReceiveTime,25780,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LocalTime,25781,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Message,25782,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Severity,25783,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassId,25784,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassName,25785,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassId,25786,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassName,25787,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionName,25788,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_BranchId,25789,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Retain,25790,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState,25791,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Id,25792,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Name,25793,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Number,25794,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveDisplayName,25795,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TransitionTime,25796,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,25797,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TrueState,25798,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_FalseState,25799,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality,25800,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality_SourceTimestamp,25801,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity,25802,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity_SourceTimestamp,25803,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment,25804,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment_SourceTimestamp,25805,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ClientUserId,25806,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Disable,25807,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Enable,25808,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment,25809,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment_InputArguments,25810,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState,25811,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Id,25812,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Name,25813,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Number,25814,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveDisplayName,25815,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TransitionTime,25816,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveTransitionTime,25817,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TrueState,25818,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_FalseState,25819,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState,25820,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Id,25821,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Name,25822,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Number,25823,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,25824,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TransitionTime,25825,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,25826,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TrueState,25827,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_FalseState,25828,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge,25829,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge_InputArguments,25830,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm,25831,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm_InputArguments,25832,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState,25833,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Id,25834,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Name,25835,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Number,25836,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveDisplayName,25837,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TransitionTime,25838,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,25839,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TrueState,25840,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_FalseState,25841,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_InputNode,25842,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState,25843,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Id,25844,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Name,25845,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Number,25846,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,25847,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TransitionTime,25848,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,25849,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TrueState,25850,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_FalseState,25851,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState,25852,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Id,25853,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Name,25854,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Number,25855,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,25856,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TransitionTime,25857,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,25858,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TrueState,25859,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_FalseState,25860,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState,25861,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState,25862,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Id,25863,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Name,25864,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Number,25865,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,25866,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition,25867,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Id,25868,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Name,25869,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Number,25870,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,25871,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,25872,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableStates,25873,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableTransitions,25874,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_UnshelveTime,25875,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve,25876,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,25877,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2,25878,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,25879,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve,25880,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2,25881,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,25882,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve,25883,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2,25884,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,25885,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedOrShelved,25886,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_MaxTimeShelved,25887,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleEnabled,25888,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound,25889,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_ListId,25890,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_AgencyId,25891,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_VersionId,25892,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState,25893,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Id,25894,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Name,25895,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Number,25896,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveDisplayName,25897,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TransitionTime,25898,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,25899,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TrueState,25900,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_FalseState,25901,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OnDelay,25902,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OffDelay,25903,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroupFlag,25904,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroup,25905,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState,25906,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Id,25907,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Name,25908,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Number,25909,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveDisplayName,25910,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TransitionTime,25911,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,25912,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TrueState,25913,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_FalseState,25914,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmTime,25915,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmRepeatCount,25916,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Silence,25917,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress,25918,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2,25919,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2_InputArguments,25920,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress,25921,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2,25922,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2_InputArguments,25923,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService,25924,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2,25925,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2_InputArguments,25926,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService,25927,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2,25928,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2_InputArguments,25929,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset,25930,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2,25931,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2_InputArguments,25932,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships,25933,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships_OutputArguments,25934,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_NormalState,25935,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationDate,25936,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationLimit,25937,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_CertificateType,25938,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Certificate,25939,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate,25940,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventId,25941,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventType,25942,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceNode,25943,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceName,25944,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Time,25945,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReceiveTime,25946,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LocalTime,25947,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Message,25948,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Severity,25949,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassId,25950,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassName,25951,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassId,25952,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassName,25953,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionName,25954,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_BranchId,25955,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Retain,25956,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState,25957,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Id,25958,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Name,25959,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Number,25960,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,25961,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TransitionTime,25962,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,25963,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TrueState,25964,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_FalseState,25965,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality,25966,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality_SourceTimestamp,25967,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity,25968,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,25969,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment,25970,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment_SourceTimestamp,25971,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ClientUserId,25972,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Disable,25973,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Enable,25974,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment,25975,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment_InputArguments,25976,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState,25977,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Id,25978,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Name,25979,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Number,25980,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,25981,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TransitionTime,25982,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,25983,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TrueState,25984,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_FalseState,25985,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState,25986,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Id,25987,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Name,25988,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Number,25989,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,25990,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,25991,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,25992,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TrueState,25993,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_FalseState,25994,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge,25995,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge_InputArguments,25996,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm,25997,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm_InputArguments,25998,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState,25999,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Id,26000,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Name,26001,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Number,26002,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,26003,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TransitionTime,26004,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,26005,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TrueState,26006,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_FalseState,26007,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_InputNode,26008,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState,26009,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Id,26010,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Name,26011,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Number,26012,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,26013,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TransitionTime,26014,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,26015,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TrueState,26016,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_FalseState,26017,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState,26018,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Id,26019,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Name,26020,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Number,26021,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,26022,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,26023,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,26024,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TrueState,26025,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_FalseState,26026,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState,26027,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState,26028,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,26029,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,26030,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,26031,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,26032,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition,26033,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,26034,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,26035,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,26036,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,26037,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,26038,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableStates,26039,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,26040,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,26041,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve,26042,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,26043,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,26044,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,26045,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve,26046,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2,26047,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,26048,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,26049,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,26050,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,26051,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedOrShelved,26052,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_MaxTimeShelved,26053,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleEnabled,26054,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound,26055,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_ListId,26056,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_AgencyId,26057,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_VersionId,26058,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState,26059,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Id,26060,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Name,26061,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Number,26062,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,26063,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TransitionTime,26064,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,26065,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TrueState,26066,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_FalseState,26067,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OnDelay,26068,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OffDelay,26069,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroupFlag,26070,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroup,26071,Object
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState,26072,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Id,26073,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Name,26074,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Number,26075,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,26076,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TransitionTime,26077,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,26078,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TrueState,26079,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_FalseState,26080,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmTime,26081,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmRepeatCount,26082,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Silence,26083,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress,26084,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2,26085,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2_InputArguments,26086,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress,26087,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2,26088,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2_InputArguments,26089,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService,26090,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2,26091,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,26092,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService,26093,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2,26094,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2_InputArguments,26095,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset,26096,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2,26097,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2_InputArguments,26098,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships,26099,Method
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,26100,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_NormalState,26101,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_TrustListId,26102,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastUpdateTime,26103,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_UpdateFrequency,26104,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup,26105,Object
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList,26106,Object
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Size,26107,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Writable,26108,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_UserWritable,26109,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_OpenCount,26110,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_MimeType,26111,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_MaxByteStringLength,26112,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_LastModifiedTime,26113,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Open,26114,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Open_InputArguments,26115,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Open_OutputArguments,26116,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Close,26117,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Close_InputArguments,26118,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Read,26119,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Read_InputArguments,26120,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Read_OutputArguments,26121,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Write,26122,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_Write_InputArguments,26123,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition,26124,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition_InputArguments,26125,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition_OutputArguments,26126,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_SetPosition,26127,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_SetPosition_InputArguments,26128,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_LastUpdateTime,26129,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_UpdateFrequency,26130,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_DefaultValidationOptions,26131,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks,26132,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks_InputArguments,26133,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks_OutputArguments,26134,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate,26135,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate_InputArguments,26136,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate_OutputArguments,26137,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_AddCertificate,26138,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_AddCertificate_InputArguments,26139,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_RemoveCertificate,26140,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_RemoveCertificate_InputArguments,26141,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateTypes,26142,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_GetRejectedList,26144,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_GetRejectedList_OutputArguments,26145,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired,26146,Object
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventId,26147,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventType,26148,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceNode,26149,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceName,26150,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Time,26151,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReceiveTime,26152,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LocalTime,26153,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Message,26154,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Severity,26155,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassId,26156,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassName,26157,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassId,26158,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassName,26159,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionName,26160,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_BranchId,26161,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Retain,26162,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState,26163,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Id,26164,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Name,26165,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Number,26166,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveDisplayName,26167,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TransitionTime,26168,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,26169,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TrueState,26170,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_FalseState,26171,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality,26172,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality_SourceTimestamp,26173,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity,26174,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity_SourceTimestamp,26175,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment,26176,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment_SourceTimestamp,26177,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ClientUserId,26178,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Disable,26179,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Enable,26180,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment,26181,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment_InputArguments,26182,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState,26183,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Id,26184,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Name,26185,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Number,26186,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveDisplayName,26187,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TransitionTime,26188,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveTransitionTime,26189,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TrueState,26190,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_FalseState,26191,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState,26192,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Id,26193,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Name,26194,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Number,26195,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,26196,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TransitionTime,26197,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,26198,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TrueState,26199,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_FalseState,26200,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge,26201,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge_InputArguments,26202,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm,26203,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm_InputArguments,26204,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState,26205,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Id,26206,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Name,26207,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Number,26208,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveDisplayName,26209,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TransitionTime,26210,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,26211,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TrueState,26212,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_FalseState,26213,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_InputNode,26214,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState,26215,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Id,26216,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Name,26217,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Number,26218,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,26219,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TransitionTime,26220,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,26221,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TrueState,26222,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_FalseState,26223,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState,26224,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Id,26225,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Name,26226,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Number,26227,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,26228,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TransitionTime,26229,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,26230,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TrueState,26231,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_FalseState,26232,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState,26233,Object
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState,26234,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Id,26235,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Name,26236,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Number,26237,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,26238,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition,26239,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Id,26240,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Name,26241,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Number,26242,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,26243,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,26244,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableStates,26245,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableTransitions,26246,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_UnshelveTime,26247,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve,26248,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,26249,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2,26250,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,26251,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve,26252,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2,26253,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,26254,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve,26255,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2,26256,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,26257,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedOrShelved,26258,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_MaxTimeShelved,26259,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleEnabled,26260,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound,26261,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_ListId,26262,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_AgencyId,26263,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_VersionId,26264,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState,26265,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Id,26266,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Name,26267,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Number,26268,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveDisplayName,26269,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TransitionTime,26270,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,26271,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TrueState,26272,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_FalseState,26273,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OnDelay,26274,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OffDelay,26275,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroupFlag,26276,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroup,26277,Object
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState,26278,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Id,26279,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Name,26280,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Number,26281,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveDisplayName,26282,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TransitionTime,26283,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,26284,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TrueState,26285,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_FalseState,26286,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmTime,26287,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmRepeatCount,26288,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Silence,26289,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress,26290,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2,26291,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2_InputArguments,26292,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress,26293,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2,26294,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2_InputArguments,26295,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService,26296,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2,26297,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2_InputArguments,26298,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService,26299,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2,26300,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2_InputArguments,26301,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset,26302,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2,26303,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2_InputArguments,26304,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships,26305,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships_OutputArguments,26306,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_NormalState,26307,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationDate,26308,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationLimit,26309,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_CertificateType,26310,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Certificate,26311,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate,26312,Object
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventId,26313,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventType,26314,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceNode,26315,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceName,26316,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Time,26317,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReceiveTime,26318,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LocalTime,26319,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Message,26320,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Severity,26321,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassId,26322,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassName,26323,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassId,26324,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassName,26325,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionName,26326,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_BranchId,26327,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Retain,26328,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState,26329,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Id,26330,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Name,26331,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Number,26332,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,26333,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TransitionTime,26334,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,26335,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TrueState,26336,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_FalseState,26337,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality,26338,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality_SourceTimestamp,26339,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity,26340,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,26341,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment,26342,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment_SourceTimestamp,26343,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ClientUserId,26344,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Disable,26345,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Enable,26346,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment,26347,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment_InputArguments,26348,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState,26349,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Id,26350,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Name,26351,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Number,26352,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,26353,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TransitionTime,26354,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,26355,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TrueState,26356,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_FalseState,26357,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState,26358,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Id,26359,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Name,26360,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Number,26361,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,26362,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,26363,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,26364,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TrueState,26365,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_FalseState,26366,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge,26367,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge_InputArguments,26368,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm,26369,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm_InputArguments,26370,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState,26371,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Id,26372,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Name,26373,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Number,26374,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,26375,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TransitionTime,26376,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,26377,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TrueState,26378,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_FalseState,26379,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_InputNode,26380,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState,26381,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Id,26382,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Name,26383,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Number,26384,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,26385,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TransitionTime,26386,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,26387,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TrueState,26388,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_FalseState,26389,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState,26390,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Id,26391,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Name,26392,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Number,26393,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,26394,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,26395,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,26396,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TrueState,26397,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_FalseState,26398,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState,26399,Object
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState,26400,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,26401,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,26402,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,26403,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,26404,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition,26405,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,26406,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,26407,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,26408,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,26409,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,26410,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableStates,26411,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,26412,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,26413,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve,26414,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,26415,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,26416,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,26417,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve,26418,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2,26419,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,26420,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,26421,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,26422,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,26423,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedOrShelved,26424,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_MaxTimeShelved,26425,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleEnabled,26426,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound,26427,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_ListId,26428,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_AgencyId,26429,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_VersionId,26430,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState,26431,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Id,26432,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Name,26433,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Number,26434,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,26435,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TransitionTime,26436,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,26437,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TrueState,26438,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_FalseState,26439,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OnDelay,26440,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OffDelay,26441,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroupFlag,26442,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroup,26443,Object
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState,26444,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Id,26445,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Name,26446,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Number,26447,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,26448,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TransitionTime,26449,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,26450,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TrueState,26451,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_FalseState,26452,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmTime,26453,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmRepeatCount,26454,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Silence,26455,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress,26456,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2,26457,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2_InputArguments,26458,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress,26459,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2,26460,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2_InputArguments,26461,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService,26462,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2,26463,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,26464,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService,26465,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2,26466,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2_InputArguments,26467,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset,26468,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2,26469,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2_InputArguments,26470,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships,26471,Method
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,26472,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_NormalState,26473,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_TrustListId,26474,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastUpdateTime,26475,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_UpdateFrequency,26476,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup,26477,Object
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList,26478,Object
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Size,26479,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Writable,26480,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_UserWritable,26481,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenCount,26482,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_MimeType,26483,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_MaxByteStringLength,26484,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_LastModifiedTime,26485,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Open,26486,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Open_InputArguments,26487,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Open_OutputArguments,26488,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Close,26489,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Close_InputArguments,26490,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Read,26491,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Read_InputArguments,26492,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Read_OutputArguments,26493,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Write,26494,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_Write_InputArguments,26495,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition,26496,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition_InputArguments,26497,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition_OutputArguments,26498,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_SetPosition,26499,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_SetPosition_InputArguments,26500,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_LastUpdateTime,26501,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_UpdateFrequency,26502,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_DefaultValidationOptions,26503,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks,26504,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks_InputArguments,26505,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks_OutputArguments,26506,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate,26507,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate_InputArguments,26508,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate_OutputArguments,26509,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_AddCertificate,26510,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_AddCertificate_InputArguments,26511,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_RemoveCertificate,26512,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_RemoveCertificate_InputArguments,26513,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateTypes,26514,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_GetRejectedList,26516,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_GetRejectedList_OutputArguments,26517,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired,26518,Object
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventId,26519,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventType,26520,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceNode,26521,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceName,26522,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Time,26523,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReceiveTime,26524,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LocalTime,26525,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Message,26526,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Severity,26527,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassId,26528,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassName,26529,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassId,26530,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassName,26531,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionName,26532,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_BranchId,26533,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Retain,26534,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState,26535,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Id,26536,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Name,26537,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Number,26538,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveDisplayName,26539,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TransitionTime,26540,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,26541,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TrueState,26542,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_FalseState,26543,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality,26544,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality_SourceTimestamp,26545,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity,26546,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity_SourceTimestamp,26547,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment,26548,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment_SourceTimestamp,26549,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ClientUserId,26550,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Disable,26551,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Enable,26552,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment,26553,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment_InputArguments,26554,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState,26555,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Id,26556,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Name,26557,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Number,26558,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveDisplayName,26559,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TransitionTime,26560,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveTransitionTime,26561,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TrueState,26562,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_FalseState,26563,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState,26564,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Id,26565,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Name,26566,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Number,26567,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,26568,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TransitionTime,26569,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,26570,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TrueState,26571,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_FalseState,26572,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge,26573,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge_InputArguments,26574,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm,26575,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm_InputArguments,26576,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState,26577,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Id,26578,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Name,26579,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Number,26580,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveDisplayName,26581,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TransitionTime,26582,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,26583,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TrueState,26584,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_FalseState,26585,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_InputNode,26586,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState,26587,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Id,26588,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Name,26589,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Number,26590,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,26591,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TransitionTime,26592,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,26593,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TrueState,26594,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_FalseState,26595,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState,26596,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Id,26597,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Name,26598,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Number,26599,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,26600,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TransitionTime,26601,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,26602,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TrueState,26603,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_FalseState,26604,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState,26605,Object
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState,26606,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Id,26607,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Name,26608,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Number,26609,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,26610,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition,26611,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Id,26612,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Name,26613,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Number,26614,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,26615,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,26616,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableStates,26617,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableTransitions,26618,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_UnshelveTime,26619,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve,26620,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,26621,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2,26622,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,26623,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve,26624,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2,26625,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,26626,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve,26627,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2,26628,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,26629,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedOrShelved,26630,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_MaxTimeShelved,26631,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleEnabled,26632,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound,26633,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_ListId,26634,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_AgencyId,26635,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_VersionId,26636,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState,26637,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Id,26638,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Name,26639,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Number,26640,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveDisplayName,26641,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TransitionTime,26642,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,26643,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TrueState,26644,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_FalseState,26645,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OnDelay,26646,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OffDelay,26647,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroupFlag,26648,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroup,26649,Object
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState,26650,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Id,26651,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Name,26652,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Number,26653,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveDisplayName,26654,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TransitionTime,26655,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,26656,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TrueState,26657,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_FalseState,26658,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmTime,26659,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmRepeatCount,26660,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Silence,26661,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress,26662,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2,26663,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2_InputArguments,26664,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress,26665,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2,26666,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2_InputArguments,26667,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService,26668,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2,26669,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2_InputArguments,26670,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService,26671,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2,26672,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2_InputArguments,26673,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset,26674,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2,26675,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2_InputArguments,26676,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships,26677,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships_OutputArguments,26678,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_NormalState,26679,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationDate,26680,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationLimit,26681,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_CertificateType,26682,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Certificate,26683,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate,26684,Object
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventId,26685,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventType,26686,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceNode,26687,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceName,26688,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Time,26689,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReceiveTime,26690,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LocalTime,26691,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Message,26692,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Severity,26693,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassId,26694,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassName,26695,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassId,26696,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassName,26697,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionName,26698,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_BranchId,26699,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Retain,26700,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState,26701,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Id,26702,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Name,26703,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Number,26704,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,26705,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TransitionTime,26706,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,26707,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TrueState,26708,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_FalseState,26709,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality,26710,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality_SourceTimestamp,26711,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity,26712,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,26713,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment,26714,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment_SourceTimestamp,26715,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ClientUserId,26716,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Disable,26717,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Enable,26718,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment,26719,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment_InputArguments,26720,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState,26721,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Id,26722,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Name,26723,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Number,26724,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,26725,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TransitionTime,26726,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,26727,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TrueState,26728,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_FalseState,26729,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState,26730,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Id,26731,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Name,26732,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Number,26733,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,26734,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,26735,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,26736,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TrueState,26737,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_FalseState,26738,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge,26739,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge_InputArguments,26740,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm,26741,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm_InputArguments,26742,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState,26743,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Id,26744,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Name,26745,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Number,26746,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,26747,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TransitionTime,26748,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,26749,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TrueState,26750,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_FalseState,26751,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_InputNode,26752,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState,26753,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Id,26754,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Name,26755,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Number,26756,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,26757,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TransitionTime,26758,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,26759,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TrueState,26760,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_FalseState,26761,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState,26762,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Id,26763,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Name,26764,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Number,26765,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,26766,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,26767,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,26768,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TrueState,26769,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_FalseState,26770,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState,26771,Object
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState,26772,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,26773,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,26774,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,26775,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,26776,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition,26777,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,26778,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,26779,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,26780,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,26781,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,26782,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableStates,26783,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,26784,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,26785,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve,26786,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,26787,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,26788,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,26789,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve,26790,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2,26791,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,26792,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,26793,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,26794,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,26795,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedOrShelved,26796,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_MaxTimeShelved,26797,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleEnabled,26798,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound,26799,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_ListId,26800,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_AgencyId,26801,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_VersionId,26802,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState,26803,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Id,26804,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Name,26805,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Number,26806,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,26807,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TransitionTime,26808,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,26809,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TrueState,26810,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_FalseState,26811,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OnDelay,26812,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OffDelay,26813,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroupFlag,26814,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroup,26815,Object
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState,26816,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Id,26817,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Name,26818,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Number,26819,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,26820,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TransitionTime,26821,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,26822,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TrueState,26823,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_FalseState,26824,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmTime,26825,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmRepeatCount,26826,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Silence,26827,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress,26828,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2,26829,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2_InputArguments,26830,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress,26831,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2,26832,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2_InputArguments,26833,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService,26834,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2,26835,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,26836,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService,26837,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2,26838,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2_InputArguments,26839,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset,26840,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2,26841,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2_InputArguments,26842,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships,26843,Method
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,26844,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_NormalState,26845,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_TrustListId,26846,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastUpdateTime,26847,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_UpdateFrequency,26848,Variable
+ApplicationConfigurationType_Enabled,26849,Variable
+ApplicationConfigurationType_ApplicationUri,26850,Variable
+ApplicationConfigurationType_ProductUri,26851,Variable
+ApplicationConfigurationType_ApplicationType,26852,Variable
+ApplicationConfigurationType_ServerCapabilities,26853,Variable
+ApplicationConfigurationType_SupportedPrivateKeyFormats,26854,Variable
+ApplicationConfigurationType_MaxTrustListSize,26855,Variable
+ApplicationConfigurationType_MulticastDnsEnabled,26856,Variable
+ApplicationConfigurationType_HasSecureElement,26857,Variable
+ApplicationConfigurationType_UpdateCertificate,26858,Method
+ApplicationConfigurationType_UpdateCertificate_InputArguments,26859,Variable
+ApplicationConfigurationType_UpdateCertificate_OutputArguments,26860,Variable
+ApplicationConfigurationType_ApplyChanges,26861,Method
+ApplicationConfigurationType_CancelChanges,26862,Method
+ApplicationConfigurationType_CreateSigningRequest,26863,Method
+ApplicationConfigurationType_CreateSigningRequest_InputArguments,26864,Variable
+ApplicationConfigurationType_CreateSigningRequest_OutputArguments,26865,Variable
+ApplicationConfigurationType_GetRejectedList,26866,Method
+ApplicationConfigurationType_GetRejectedList_OutputArguments,26867,Variable
+ApplicationConfigurationType_ResetToServerDefaults,26868,Method
+ProvisionableDeviceType,26871,ObjectType
+ProvisionableDeviceType_IsSingleton,26872,Variable
+ProvisionableDeviceType_RequestTickets,26873,Method
+ProvisionableDeviceType_RequestTickets_OutputArguments,26874,Variable
+ProvisionableDeviceType_SetRegistrarEndpoints,26875,Method
+ProvisionableDeviceType_SetRegistrarEndpoints_InputArguments,26876,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder,26878,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups,26879,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup,26880,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList,26881,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Size,26882,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Writable,26883,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_UserWritable,26884,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_OpenCount,26885,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_MimeType,26886,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_MaxByteStringLength,26887,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_LastModifiedTime,26888,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Open,26889,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Open_InputArguments,26890,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Open_OutputArguments,26891,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Close,26892,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Close_InputArguments,26893,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Read,26894,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Read_InputArguments,26895,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Read_OutputArguments,26896,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Write,26897,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Write_InputArguments,26898,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition,26899,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition_InputArguments,26900,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition_OutputArguments,26901,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_SetPosition,26902,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_SetPosition_InputArguments,26903,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_LastUpdateTime,26904,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_UpdateFrequency,26905,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_DefaultValidationOptions,26906,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks,26907,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks_InputArguments,26908,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks_OutputArguments,26909,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate,26910,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate_InputArguments,26911,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate_OutputArguments,26912,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_AddCertificate,26913,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_AddCertificate_InputArguments,26914,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_RemoveCertificate,26915,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_RemoveCertificate_InputArguments,26916,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateTypes,26917,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_GetRejectedList,26919,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_GetRejectedList_OutputArguments,26920,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired,26921,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventId,26922,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventType,26923,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceNode,26924,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceName,26925,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Time,26926,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReceiveTime,26927,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LocalTime,26928,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Message,26929,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Severity,26930,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassId,26931,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassName,26932,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassId,26933,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassName,26934,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionName,26935,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_BranchId,26936,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Retain,26937,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState,26938,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Id,26939,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Name,26940,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Number,26941,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveDisplayName,26942,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TransitionTime,26943,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,26944,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TrueState,26945,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_FalseState,26946,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality,26947,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality_SourceTimestamp,26948,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity,26949,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity_SourceTimestamp,26950,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment,26951,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment_SourceTimestamp,26952,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ClientUserId,26953,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Disable,26954,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Enable,26955,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment,26956,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment_InputArguments,26957,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState,26958,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Id,26959,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Name,26960,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Number,26961,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveDisplayName,26962,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TransitionTime,26963,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveTransitionTime,26964,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TrueState,26965,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_FalseState,26966,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState,26967,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Id,26968,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Name,26969,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Number,26970,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,26971,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TransitionTime,26972,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,26973,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TrueState,26974,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_FalseState,26975,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge,26976,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge_InputArguments,26977,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm,26978,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm_InputArguments,26979,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState,26980,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Id,26981,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Name,26982,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Number,26983,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveDisplayName,26984,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TransitionTime,26985,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,26986,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TrueState,26987,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_FalseState,26988,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_InputNode,26989,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState,26990,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Id,26991,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Name,26992,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Number,26993,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,26994,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TransitionTime,26995,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,26996,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TrueState,26997,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_FalseState,26998,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState,26999,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Id,27000,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Name,27001,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Number,27002,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,27003,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TransitionTime,27004,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,27005,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TrueState,27006,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_FalseState,27007,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState,27008,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState,27009,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Id,27010,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Name,27011,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Number,27012,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,27013,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition,27014,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Id,27015,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Name,27016,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Number,27017,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,27018,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,27019,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableStates,27020,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableTransitions,27021,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_UnshelveTime,27022,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve,27023,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,27024,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2,27025,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,27026,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve,27027,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2,27028,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,27029,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve,27030,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2,27031,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,27032,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedOrShelved,27033,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_MaxTimeShelved,27034,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleEnabled,27035,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound,27036,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_ListId,27037,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_AgencyId,27038,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_VersionId,27039,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState,27040,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Id,27041,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Name,27042,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Number,27043,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveDisplayName,27044,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TransitionTime,27045,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,27046,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TrueState,27047,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_FalseState,27048,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OnDelay,27049,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OffDelay,27050,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroupFlag,27051,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroup,27052,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState,27053,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Id,27054,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Name,27055,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Number,27056,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveDisplayName,27057,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TransitionTime,27058,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,27059,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TrueState,27060,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_FalseState,27061,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmTime,27062,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmRepeatCount,27063,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Silence,27064,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress,27065,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2,27066,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2_InputArguments,27067,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress,27068,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2,27069,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2_InputArguments,27070,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService,27071,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2,27072,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2_InputArguments,27073,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService,27074,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2,27075,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2_InputArguments,27076,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset,27077,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2,27078,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2_InputArguments,27079,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships,27080,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships_OutputArguments,27081,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_NormalState,27082,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationDate,27083,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationLimit,27084,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_CertificateType,27085,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Certificate,27086,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate,27087,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventId,27088,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventType,27089,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceNode,27090,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceName,27091,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Time,27092,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReceiveTime,27093,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LocalTime,27094,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Message,27095,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Severity,27096,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassId,27097,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassName,27098,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassId,27099,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassName,27100,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionName,27101,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_BranchId,27102,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Retain,27103,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState,27104,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Id,27105,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Name,27106,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Number,27107,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,27108,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TransitionTime,27109,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,27110,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TrueState,27111,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_FalseState,27112,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality,27113,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality_SourceTimestamp,27114,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity,27115,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,27116,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment,27117,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment_SourceTimestamp,27118,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ClientUserId,27119,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Disable,27120,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Enable,27121,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment,27122,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment_InputArguments,27123,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState,27124,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Id,27125,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Name,27126,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Number,27127,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,27128,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TransitionTime,27129,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,27130,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TrueState,27131,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_FalseState,27132,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState,27133,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Id,27134,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Name,27135,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Number,27136,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,27137,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,27138,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,27139,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TrueState,27140,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_FalseState,27141,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge,27142,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge_InputArguments,27143,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm,27144,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm_InputArguments,27145,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState,27146,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Id,27147,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Name,27148,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Number,27149,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,27150,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TransitionTime,27151,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,27152,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TrueState,27153,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_FalseState,27154,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_InputNode,27155,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState,27156,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Id,27157,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Name,27158,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Number,27159,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,27160,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TransitionTime,27161,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,27162,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TrueState,27163,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_FalseState,27164,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState,27165,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Id,27166,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Name,27167,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Number,27168,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,27169,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,27170,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,27171,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TrueState,27172,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_FalseState,27173,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState,27174,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState,27175,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,27176,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,27177,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,27178,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,27179,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition,27180,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,27181,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,27182,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,27183,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,27184,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,27185,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableStates,27186,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,27187,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,27188,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve,27189,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,27190,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,27191,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,27192,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve,27193,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2,27194,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,27195,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,27196,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,27197,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,27198,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedOrShelved,27199,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_MaxTimeShelved,27200,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleEnabled,27201,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound,27202,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_ListId,27203,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_AgencyId,27204,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_VersionId,27205,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState,27206,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Id,27207,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Name,27208,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Number,27209,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,27210,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TransitionTime,27211,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,27212,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TrueState,27213,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_FalseState,27214,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OnDelay,27215,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OffDelay,27216,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroupFlag,27217,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroup,27218,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState,27219,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Id,27220,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Name,27221,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Number,27222,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,27223,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TransitionTime,27224,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,27225,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TrueState,27226,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_FalseState,27227,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmTime,27228,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmRepeatCount,27229,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Silence,27230,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress,27231,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2,27232,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2_InputArguments,27233,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress,27234,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2,27235,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2_InputArguments,27236,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService,27237,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2,27238,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,27239,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService,27240,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2,27241,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2_InputArguments,27242,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset,27243,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2,27244,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2_InputArguments,27245,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships,27246,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,27247,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_NormalState,27248,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_TrustListId,27249,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastUpdateTime,27250,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_UpdateFrequency,27251,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup,27252,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList,27253,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Size,27254,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Writable,27255,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_UserWritable,27256,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_OpenCount,27257,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_MimeType,27258,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_MaxByteStringLength,27259,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_LastModifiedTime,27260,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Open,27261,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Open_InputArguments,27262,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Open_OutputArguments,27263,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Close,27264,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Close_InputArguments,27265,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Read,27266,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Read_InputArguments,27267,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Read_OutputArguments,27268,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Write,27269,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Write_InputArguments,27270,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition,27271,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition_InputArguments,27272,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition_OutputArguments,27273,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_SetPosition,27274,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_SetPosition_InputArguments,27275,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_LastUpdateTime,27276,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_UpdateFrequency,27277,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_DefaultValidationOptions,27278,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks,27279,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks_InputArguments,27280,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks_OutputArguments,27281,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate,27282,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate_InputArguments,27283,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate_OutputArguments,27284,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_AddCertificate,27285,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_AddCertificate_InputArguments,27286,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_RemoveCertificate,27287,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_RemoveCertificate_InputArguments,27288,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateTypes,27289,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_GetRejectedList,27291,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_GetRejectedList_OutputArguments,27292,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired,27293,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventId,27294,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventType,27295,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceNode,27296,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceName,27297,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Time,27298,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReceiveTime,27299,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LocalTime,27300,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Message,27301,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Severity,27302,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassId,27303,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassName,27304,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassId,27305,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassName,27306,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionName,27307,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_BranchId,27308,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Retain,27309,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState,27310,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Id,27311,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Name,27312,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Number,27313,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveDisplayName,27314,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TransitionTime,27315,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,27316,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TrueState,27317,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_FalseState,27318,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality,27319,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality_SourceTimestamp,27320,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity,27321,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity_SourceTimestamp,27322,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment,27323,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment_SourceTimestamp,27324,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ClientUserId,27325,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Disable,27326,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Enable,27327,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment,27328,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment_InputArguments,27329,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState,27330,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Id,27331,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Name,27332,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Number,27333,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveDisplayName,27334,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TransitionTime,27335,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveTransitionTime,27336,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TrueState,27337,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_FalseState,27338,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState,27339,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Id,27340,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Name,27341,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Number,27342,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,27343,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TransitionTime,27344,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,27345,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TrueState,27346,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_FalseState,27347,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge,27348,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge_InputArguments,27349,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm,27350,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm_InputArguments,27351,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState,27352,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Id,27353,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Name,27354,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Number,27355,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveDisplayName,27356,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TransitionTime,27357,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,27358,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TrueState,27359,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_FalseState,27360,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_InputNode,27361,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState,27362,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Id,27363,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Name,27364,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Number,27365,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,27366,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TransitionTime,27367,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,27368,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TrueState,27369,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_FalseState,27370,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState,27371,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Id,27372,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Name,27373,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Number,27374,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,27375,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TransitionTime,27376,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,27377,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TrueState,27378,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_FalseState,27379,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState,27380,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState,27381,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Id,27382,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Name,27383,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Number,27384,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,27385,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition,27386,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Id,27387,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Name,27388,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Number,27389,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,27390,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,27391,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableStates,27392,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableTransitions,27393,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_UnshelveTime,27394,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve,27395,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,27396,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2,27397,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,27398,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve,27399,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2,27400,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,27401,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve,27402,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2,27403,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,27404,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedOrShelved,27405,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_MaxTimeShelved,27406,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleEnabled,27407,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound,27408,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_ListId,27409,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_AgencyId,27410,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_VersionId,27411,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState,27412,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Id,27413,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Name,27414,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Number,27415,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveDisplayName,27416,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TransitionTime,27417,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,27418,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TrueState,27419,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_FalseState,27420,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OnDelay,27421,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OffDelay,27422,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroupFlag,27423,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroup,27424,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState,27425,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Id,27426,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Name,27427,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Number,27428,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveDisplayName,27429,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TransitionTime,27430,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,27431,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TrueState,27432,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_FalseState,27433,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmTime,27434,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmRepeatCount,27435,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Silence,27436,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress,27437,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2,27438,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2_InputArguments,27439,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress,27440,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2,27441,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2_InputArguments,27442,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService,27443,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2,27444,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2_InputArguments,27445,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService,27446,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2,27447,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2_InputArguments,27448,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset,27449,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2,27450,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2_InputArguments,27451,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships,27452,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships_OutputArguments,27453,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_NormalState,27454,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationDate,27455,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationLimit,27456,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_CertificateType,27457,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Certificate,27458,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate,27459,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventId,27460,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventType,27461,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceNode,27462,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceName,27463,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Time,27464,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReceiveTime,27465,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LocalTime,27466,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Message,27467,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Severity,27468,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassId,27469,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassName,27470,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassId,27471,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassName,27472,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionName,27473,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_BranchId,27474,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Retain,27475,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState,27476,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Id,27477,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Name,27478,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Number,27479,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,27480,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TransitionTime,27481,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,27482,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TrueState,27483,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_FalseState,27484,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality,27485,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality_SourceTimestamp,27486,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity,27487,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,27488,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment,27489,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment_SourceTimestamp,27490,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ClientUserId,27491,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Disable,27492,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Enable,27493,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment,27494,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment_InputArguments,27495,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState,27496,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Id,27497,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Name,27498,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Number,27499,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,27500,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TransitionTime,27501,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,27502,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TrueState,27503,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_FalseState,27504,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState,27505,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Id,27506,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Name,27507,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Number,27508,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,27509,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,27510,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,27511,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TrueState,27512,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_FalseState,27513,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge,27514,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge_InputArguments,27515,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm,27516,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm_InputArguments,27517,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState,27518,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Id,27519,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Name,27520,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Number,27521,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,27522,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TransitionTime,27523,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,27524,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TrueState,27525,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_FalseState,27526,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_InputNode,27527,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState,27528,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Id,27529,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Name,27530,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Number,27531,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,27532,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TransitionTime,27533,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,27534,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TrueState,27535,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_FalseState,27536,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState,27537,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Id,27538,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Name,27539,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Number,27540,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,27541,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,27542,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,27543,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TrueState,27544,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_FalseState,27545,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState,27546,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState,27547,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,27548,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,27549,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,27550,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,27551,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition,27552,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,27553,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,27554,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,27555,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,27556,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,27557,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableStates,27558,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,27559,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,27560,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve,27561,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,27562,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,27563,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,27564,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve,27565,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2,27566,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,27567,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,27568,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,27569,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,27570,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedOrShelved,27571,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_MaxTimeShelved,27572,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleEnabled,27573,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound,27574,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_ListId,27575,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_AgencyId,27576,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_VersionId,27577,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState,27578,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Id,27579,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Name,27580,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Number,27581,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,27582,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TransitionTime,27583,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,27584,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TrueState,27585,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_FalseState,27586,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OnDelay,27587,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OffDelay,27588,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroupFlag,27589,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroup,27590,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState,27591,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Id,27592,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Name,27593,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Number,27594,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,27595,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TransitionTime,27596,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,27597,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TrueState,27598,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_FalseState,27599,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmTime,27600,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmRepeatCount,27601,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Silence,27602,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress,27603,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2,27604,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2_InputArguments,27605,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress,27606,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2,27607,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2_InputArguments,27608,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService,27609,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2,27610,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,27611,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService,27612,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2,27613,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2_InputArguments,27614,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset,27615,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2,27616,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2_InputArguments,27617,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships,27618,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,27619,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_NormalState,27620,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_TrustListId,27621,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastUpdateTime,27622,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_UpdateFrequency,27623,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup,27624,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList,27625,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Size,27626,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Writable,27627,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_UserWritable,27628,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenCount,27629,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_MimeType,27630,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_MaxByteStringLength,27631,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_LastModifiedTime,27632,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Open,27633,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Open_InputArguments,27634,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Open_OutputArguments,27635,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Close,27636,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Close_InputArguments,27637,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Read,27638,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Read_InputArguments,27639,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Read_OutputArguments,27640,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Write,27641,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Write_InputArguments,27642,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition,27643,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition_InputArguments,27644,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition_OutputArguments,27645,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_SetPosition,27646,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_SetPosition_InputArguments,27647,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_LastUpdateTime,27648,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_UpdateFrequency,27649,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_DefaultValidationOptions,27650,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks,27651,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks_InputArguments,27652,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks_OutputArguments,27653,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate,27654,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate_InputArguments,27655,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate_OutputArguments,27656,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_AddCertificate,27657,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_AddCertificate_InputArguments,27658,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_RemoveCertificate,27659,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_RemoveCertificate_InputArguments,27660,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateTypes,27661,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_GetRejectedList,27663,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_GetRejectedList_OutputArguments,27664,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired,27665,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventId,27666,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventType,27667,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceNode,27668,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceName,27669,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Time,27670,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReceiveTime,27671,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LocalTime,27672,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Message,27673,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Severity,27674,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassId,27675,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassName,27676,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassId,27677,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassName,27678,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionName,27679,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_BranchId,27680,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Retain,27681,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState,27682,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Id,27683,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Name,27684,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Number,27685,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveDisplayName,27686,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TransitionTime,27687,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,27688,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TrueState,27689,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_FalseState,27690,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality,27691,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality_SourceTimestamp,27692,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity,27693,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity_SourceTimestamp,27694,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment,27695,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment_SourceTimestamp,27696,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ClientUserId,27697,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Disable,27698,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Enable,27699,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment,27700,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment_InputArguments,27701,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState,27702,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Id,27703,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Name,27704,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Number,27705,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveDisplayName,27706,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TransitionTime,27707,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveTransitionTime,27708,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TrueState,27709,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_FalseState,27710,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState,27711,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Id,27712,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Name,27713,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Number,27714,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,27715,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TransitionTime,27716,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,27717,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TrueState,27718,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_FalseState,27719,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge,27720,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge_InputArguments,27721,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm,27722,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm_InputArguments,27723,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState,27724,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Id,27725,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Name,27726,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Number,27727,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveDisplayName,27728,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TransitionTime,27729,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,27730,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TrueState,27731,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_FalseState,27732,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_InputNode,27733,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState,27734,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Id,27735,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Name,27736,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Number,27737,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,27738,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TransitionTime,27739,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,27740,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TrueState,27741,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_FalseState,27742,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState,27743,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Id,27744,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Name,27745,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Number,27746,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,27747,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TransitionTime,27748,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,27749,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TrueState,27750,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_FalseState,27751,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState,27752,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState,27753,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Id,27754,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Name,27755,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Number,27756,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,27757,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition,27758,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Id,27759,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Name,27760,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Number,27761,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,27762,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,27763,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableStates,27764,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableTransitions,27765,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_UnshelveTime,27766,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve,27767,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,27768,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2,27769,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,27770,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve,27771,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2,27772,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,27773,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve,27774,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2,27775,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,27776,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedOrShelved,27777,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_MaxTimeShelved,27778,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleEnabled,27779,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound,27780,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_ListId,27781,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_AgencyId,27782,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_VersionId,27783,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState,27784,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Id,27785,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Name,27786,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Number,27787,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveDisplayName,27788,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TransitionTime,27789,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,27790,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TrueState,27791,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_FalseState,27792,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OnDelay,27793,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OffDelay,27794,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroupFlag,27795,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroup,27796,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState,27797,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Id,27798,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Name,27799,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Number,27800,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveDisplayName,27801,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TransitionTime,27802,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,27803,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TrueState,27804,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_FalseState,27805,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmTime,27806,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmRepeatCount,27807,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Silence,27808,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress,27809,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2,27810,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2_InputArguments,27811,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress,27812,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2,27813,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2_InputArguments,27814,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService,27815,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2,27816,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2_InputArguments,27817,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService,27818,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2,27819,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2_InputArguments,27820,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset,27821,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2,27822,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2_InputArguments,27823,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships,27824,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships_OutputArguments,27825,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_NormalState,27826,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationDate,27827,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationLimit,27828,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_CertificateType,27829,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Certificate,27830,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate,27831,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventId,27832,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventType,27833,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceNode,27834,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceName,27835,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Time,27836,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReceiveTime,27837,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LocalTime,27838,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Message,27839,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Severity,27840,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassId,27841,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassName,27842,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassId,27843,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassName,27844,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionName,27845,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_BranchId,27846,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Retain,27847,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState,27848,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Id,27849,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Name,27850,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Number,27851,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,27852,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TransitionTime,27853,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,27854,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TrueState,27855,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_FalseState,27856,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality,27857,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality_SourceTimestamp,27858,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity,27859,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,27860,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment,27861,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment_SourceTimestamp,27862,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ClientUserId,27863,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Disable,27864,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Enable,27865,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment,27866,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment_InputArguments,27867,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState,27868,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Id,27869,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Name,27870,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Number,27871,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,27872,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TransitionTime,27873,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,27874,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TrueState,27875,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_FalseState,27876,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState,27877,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Id,27878,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Name,27879,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Number,27880,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,27881,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,27882,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,27883,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TrueState,27884,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_FalseState,27885,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge,27886,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge_InputArguments,27887,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm,27888,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm_InputArguments,27889,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState,27890,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Id,27891,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Name,27892,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Number,27893,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,27894,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TransitionTime,27895,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,27896,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TrueState,27897,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_FalseState,27898,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_InputNode,27899,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState,27900,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Id,27901,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Name,27902,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Number,27903,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,27904,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TransitionTime,27905,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,27906,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TrueState,27907,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_FalseState,27908,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState,27909,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Id,27910,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Name,27911,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Number,27912,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,27913,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,27914,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,27915,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TrueState,27916,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_FalseState,27917,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState,27918,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState,27919,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,27920,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,27921,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,27922,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,27923,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition,27924,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,27925,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,27926,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,27927,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,27928,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,27929,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableStates,27930,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,27931,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,27932,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve,27933,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,27934,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,27935,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,27936,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve,27937,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2,27938,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,27939,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,27940,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,27941,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,27942,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedOrShelved,27943,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_MaxTimeShelved,27944,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleEnabled,27945,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound,27946,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_ListId,27947,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_AgencyId,27948,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_VersionId,27949,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState,27950,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Id,27951,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Name,27952,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Number,27953,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,27954,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TransitionTime,27955,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,27956,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TrueState,27957,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_FalseState,27958,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OnDelay,27959,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OffDelay,27960,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroupFlag,27961,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroup,27962,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState,27963,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Id,27964,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Name,27965,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Number,27966,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,27967,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TransitionTime,27968,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,27969,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TrueState,27970,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_FalseState,27971,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmTime,27972,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmRepeatCount,27973,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Silence,27974,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress,27975,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2,27976,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2_InputArguments,27977,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress,27978,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2,27979,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2_InputArguments,27980,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService,27981,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2,27982,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,27983,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService,27984,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2,27985,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2_InputArguments,27986,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset,27987,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2,27988,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2_InputArguments,27989,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships,27990,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,27991,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_NormalState,27992,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_TrustListId,27993,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastUpdateTime,27994,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_UpdateFrequency,27995,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_Enabled,27996,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_ApplicationUri,27997,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_ProductUri,27998,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_ApplicationType,27999,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_ServerCapabilities,28000,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_SupportedPrivateKeyFormats,28001,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_MaxTrustListSize,28002,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_MulticastDnsEnabled,28003,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_HasSecureElement,28004,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_UpdateCertificate,28005,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_UpdateCertificate_InputArguments,28006,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_UpdateCertificate_OutputArguments,28007,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_ApplyChanges,28008,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CancelChanges,28009,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CreateSigningRequest,28010,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_CreateSigningRequest_InputArguments,28011,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CreateSigningRequest_OutputArguments,28012,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_GetRejectedList,28013,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_GetRejectedList_OutputArguments,28014,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_ResetToServerDefaults,28015,Method
+ProvisionableDevice,29878,Object
+ProvisionableDevice_IsSingleton,29879,Variable
+ProvisionableDevice_RequestTickets,29880,Method
+ProvisionableDevice_RequestTickets_OutputArguments,29881,Variable
+ProvisionableDevice_SetRegistrarEndpoints,29882,Method
+ProvisionableDevice_SetRegistrarEndpoints_InputArguments,29883,Variable
+ProvisionableDevice_ApplicationName_Placeholder,29885,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups,29886,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup,29887,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList,29888,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Size,29889,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Writable,29890,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_UserWritable,29891,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_OpenCount,29892,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_MimeType,29893,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_MaxByteStringLength,29894,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_LastModifiedTime,29895,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Open,29896,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Open_InputArguments,29897,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Open_OutputArguments,29898,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Close,29899,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Close_InputArguments,29900,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Read,29901,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Read_InputArguments,29902,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Read_OutputArguments,29903,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Write,29904,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_Write_InputArguments,29905,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition,29906,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition_InputArguments,29907,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_GetPosition_OutputArguments,29908,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_SetPosition,29909,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_SetPosition_InputArguments,29910,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_LastUpdateTime,29911,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_UpdateFrequency,29912,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_DefaultValidationOptions,29913,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks,29914,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks_InputArguments,29915,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_OpenWithMasks_OutputArguments,29916,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate,29917,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate_InputArguments,29918,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_CloseAndUpdate_OutputArguments,29919,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_AddCertificate,29920,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_AddCertificate_InputArguments,29921,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_RemoveCertificate,29922,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_RemoveCertificate_InputArguments,29923,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateTypes,29924,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_GetRejectedList,29926,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_GetRejectedList_OutputArguments,29927,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired,29928,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventId,29929,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EventType,29930,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceNode,29931,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SourceName,29932,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Time,29933,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReceiveTime,29934,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LocalTime,29935,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Message,29936,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Severity,29937,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassId,29938,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionClassName,29939,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassId,29940,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionSubClassName,29941,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConditionName,29942,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_BranchId,29943,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Retain,29944,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState,29945,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Id,29946,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Name,29947,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_Number,29948,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveDisplayName,29949,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TransitionTime,29950,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,29951,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_TrueState,29952,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_EnabledState_FalseState,29953,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality,29954,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Quality_SourceTimestamp,29955,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity,29956,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LastSeverity_SourceTimestamp,29957,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment,29958,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Comment_SourceTimestamp,29959,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ClientUserId,29960,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Disable,29961,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Enable,29962,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment,29963,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AddComment_InputArguments,29964,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState,29965,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Id,29966,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Name,29967,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_Number,29968,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveDisplayName,29969,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TransitionTime,29970,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_EffectiveTransitionTime,29971,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_TrueState,29972,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AckedState_FalseState,29973,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState,29974,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Id,29975,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Name,29976,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_Number,29977,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,29978,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TransitionTime,29979,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,29980,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_TrueState,29981,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ConfirmedState_FalseState,29982,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge,29983,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Acknowledge_InputArguments,29984,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm,29985,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Confirm_InputArguments,29986,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState,29987,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Id,29988,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Name,29989,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_Number,29990,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveDisplayName,29991,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TransitionTime,29992,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,29993,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_TrueState,29994,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ActiveState_FalseState,29995,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_InputNode,29996,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState,29997,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Id,29998,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Name,29999,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_Number,30000,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,30001,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TransitionTime,30002,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,30003,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_TrueState,30004,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedState_FalseState,30005,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState,30006,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Id,30007,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Name,30008,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_Number,30009,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,30010,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TransitionTime,30011,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,30012,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_TrueState,30013,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OutOfServiceState_FalseState,30014,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState,30015,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState,30016,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Id,30017,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Name,30018,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_Number,30019,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,30020,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition,30021,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Id,30022,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Name,30023,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_Number,30024,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,30025,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,30026,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableStates,30027,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_AvailableTransitions,30028,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_UnshelveTime,30029,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve,30030,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,30031,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2,30032,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,30033,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve,30034,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2,30035,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,30036,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve,30037,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2,30038,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,30039,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SuppressedOrShelved,30040,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_MaxTimeShelved,30041,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleEnabled,30042,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound,30043,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_ListId,30044,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_AgencyId,30045,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_AudibleSound_VersionId,30046,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState,30047,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Id,30048,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Name,30049,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_Number,30050,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveDisplayName,30051,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TransitionTime,30052,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,30053,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_TrueState,30054,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_SilenceState_FalseState,30055,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OnDelay,30056,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_OffDelay,30057,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroupFlag,30058,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_FirstInGroup,30059,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState,30060,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Id,30061,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Name,30062,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_Number,30063,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveDisplayName,30064,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TransitionTime,30065,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,30066,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_TrueState,30067,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_LatchedState_FalseState,30068,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmTime,30069,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ReAlarmRepeatCount,30070,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Silence,30071,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress,30072,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2,30073,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Suppress2_InputArguments,30074,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress,30075,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2,30076,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Unsuppress2_InputArguments,30077,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService,30078,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2,30079,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_RemoveFromService2_InputArguments,30080,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService,30081,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2,30082,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_PlaceInService2_InputArguments,30083,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset,30084,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2,30085,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Reset2_InputArguments,30086,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships,30087,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_GetGroupMemberships_OutputArguments,30088,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_NormalState,30089,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationDate,30090,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_ExpirationLimit,30091,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_CertificateType,30092,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_CertificateExpired_Certificate,30093,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate,30094,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventId,30095,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EventType,30096,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceNode,30097,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SourceName,30098,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Time,30099,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReceiveTime,30100,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LocalTime,30101,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Message,30102,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Severity,30103,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassId,30104,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionClassName,30105,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassId,30106,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionSubClassName,30107,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConditionName,30108,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_BranchId,30109,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Retain,30110,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState,30111,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Id,30112,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Name,30113,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_Number,30114,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,30115,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TransitionTime,30116,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,30117,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_TrueState,30118,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_EnabledState_FalseState,30119,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality,30120,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Quality_SourceTimestamp,30121,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity,30122,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,30123,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment,30124,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Comment_SourceTimestamp,30125,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ClientUserId,30126,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Disable,30127,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Enable,30128,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment,30129,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AddComment_InputArguments,30130,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState,30131,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Id,30132,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Name,30133,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_Number,30134,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,30135,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TransitionTime,30136,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,30137,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_TrueState,30138,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AckedState_FalseState,30139,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState,30140,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Id,30141,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Name,30142,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_Number,30143,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,30144,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,30145,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,30146,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_TrueState,30147,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ConfirmedState_FalseState,30148,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge,30149,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Acknowledge_InputArguments,30150,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm,30151,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Confirm_InputArguments,30152,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState,30153,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Id,30154,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Name,30155,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_Number,30156,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,30157,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TransitionTime,30158,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,30159,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_TrueState,30160,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ActiveState_FalseState,30161,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_InputNode,30162,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState,30163,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Id,30164,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Name,30165,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_Number,30166,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,30167,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TransitionTime,30168,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,30169,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_TrueState,30170,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedState_FalseState,30171,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState,30172,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Id,30173,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Name,30174,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_Number,30175,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,30176,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,30177,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,30178,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_TrueState,30179,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OutOfServiceState_FalseState,30180,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState,30181,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState,30182,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,30183,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,30184,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,30185,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,30186,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition,30187,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,30188,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,30189,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,30190,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,30191,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,30192,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableStates,30193,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,30194,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,30195,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve,30196,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,30197,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,30198,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,30199,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve,30200,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2,30201,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,30202,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,30203,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,30204,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,30205,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SuppressedOrShelved,30206,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_MaxTimeShelved,30207,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleEnabled,30208,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound,30209,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_ListId,30210,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_AgencyId,30211,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_AudibleSound_VersionId,30212,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState,30213,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Id,30214,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Name,30215,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_Number,30216,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,30217,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TransitionTime,30218,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,30219,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_TrueState,30220,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_SilenceState_FalseState,30221,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OnDelay,30222,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_OffDelay,30223,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroupFlag,30224,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_FirstInGroup,30225,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState,30226,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Id,30227,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Name,30228,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_Number,30229,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,30230,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TransitionTime,30231,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,30232,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_TrueState,30233,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LatchedState_FalseState,30234,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmTime,30235,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_ReAlarmRepeatCount,30236,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Silence,30237,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress,30238,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2,30239,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Suppress2_InputArguments,30240,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress,30241,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2,30242,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Unsuppress2_InputArguments,30243,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService,30244,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2,30245,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,30246,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService,30247,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2,30248,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_PlaceInService2_InputArguments,30249,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset,30250,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2,30251,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_Reset2_InputArguments,30252,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships,30253,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,30254,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_NormalState,30255,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_TrustListId,30256,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_LastUpdateTime,30257,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustListOutOfDate_UpdateFrequency,30258,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup,30259,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList,30260,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Size,30261,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Writable,30262,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_UserWritable,30263,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_OpenCount,30264,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_MimeType,30265,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_MaxByteStringLength,30266,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_LastModifiedTime,30267,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Open,30268,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Open_InputArguments,30269,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Open_OutputArguments,30270,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Close,30271,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Close_InputArguments,30272,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Read,30273,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Read_InputArguments,30274,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Read_OutputArguments,30275,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Write,30276,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_Write_InputArguments,30277,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition,30278,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition_InputArguments,30279,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_GetPosition_OutputArguments,30280,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_SetPosition,30281,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_SetPosition_InputArguments,30282,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_LastUpdateTime,30283,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_UpdateFrequency,30284,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_DefaultValidationOptions,30285,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks,30286,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks_InputArguments,30287,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_OpenWithMasks_OutputArguments,30288,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate,30289,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate_InputArguments,30290,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_CloseAndUpdate_OutputArguments,30291,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_AddCertificate,30292,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_AddCertificate_InputArguments,30293,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_RemoveCertificate,30294,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_RemoveCertificate_InputArguments,30295,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateTypes,30296,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_GetRejectedList,30298,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_GetRejectedList_OutputArguments,30299,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired,30300,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventId,30301,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EventType,30302,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceNode,30303,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SourceName,30304,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Time,30305,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReceiveTime,30306,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LocalTime,30307,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Message,30308,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Severity,30309,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassId,30310,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionClassName,30311,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassId,30312,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionSubClassName,30313,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConditionName,30314,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_BranchId,30315,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Retain,30316,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState,30317,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Id,30318,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Name,30319,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_Number,30320,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveDisplayName,30321,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TransitionTime,30322,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,30323,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_TrueState,30324,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_EnabledState_FalseState,30325,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality,30326,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Quality_SourceTimestamp,30327,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity,30328,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LastSeverity_SourceTimestamp,30329,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment,30330,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Comment_SourceTimestamp,30331,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ClientUserId,30332,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Disable,30333,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Enable,30334,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment,30335,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AddComment_InputArguments,30336,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState,30337,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Id,30338,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Name,30339,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_Number,30340,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveDisplayName,30341,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TransitionTime,30342,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_EffectiveTransitionTime,30343,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_TrueState,30344,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AckedState_FalseState,30345,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState,30346,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Id,30347,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Name,30348,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_Number,30349,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,30350,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TransitionTime,30351,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,30352,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_TrueState,30353,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ConfirmedState_FalseState,30354,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge,30355,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Acknowledge_InputArguments,30356,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm,30357,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Confirm_InputArguments,30358,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState,30359,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Id,30360,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Name,30361,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_Number,30362,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveDisplayName,30363,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TransitionTime,30364,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,30365,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_TrueState,30366,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ActiveState_FalseState,30367,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_InputNode,30368,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState,30369,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Id,30370,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Name,30371,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_Number,30372,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,30373,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TransitionTime,30374,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,30375,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_TrueState,30376,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedState_FalseState,30377,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState,30378,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Id,30379,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Name,30380,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_Number,30381,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,30382,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TransitionTime,30383,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,30384,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_TrueState,30385,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OutOfServiceState_FalseState,30386,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState,30387,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState,30388,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Id,30389,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Name,30390,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_Number,30391,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,30392,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition,30393,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Id,30394,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Name,30395,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_Number,30396,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,30397,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,30398,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableStates,30399,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_AvailableTransitions,30400,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_UnshelveTime,30401,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve,30402,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,30403,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2,30404,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,30405,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve,30406,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2,30407,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,30408,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve,30409,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2,30410,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,30411,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SuppressedOrShelved,30412,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_MaxTimeShelved,30413,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleEnabled,30414,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound,30415,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_ListId,30416,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_AgencyId,30417,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_AudibleSound_VersionId,30418,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState,30419,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Id,30420,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Name,30421,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_Number,30422,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveDisplayName,30423,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TransitionTime,30424,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,30425,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_TrueState,30426,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_SilenceState_FalseState,30427,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OnDelay,30428,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_OffDelay,30429,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroupFlag,30430,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_FirstInGroup,30431,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState,30432,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Id,30433,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Name,30434,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_Number,30435,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveDisplayName,30436,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TransitionTime,30437,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,30438,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_TrueState,30439,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_LatchedState_FalseState,30440,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmTime,30441,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ReAlarmRepeatCount,30442,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Silence,30443,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress,30444,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2,30445,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Suppress2_InputArguments,30446,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress,30447,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2,30448,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Unsuppress2_InputArguments,30449,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService,30450,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2,30451,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_RemoveFromService2_InputArguments,30452,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService,30453,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2,30454,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_PlaceInService2_InputArguments,30455,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset,30456,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2,30457,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Reset2_InputArguments,30458,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships,30459,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_GetGroupMemberships_OutputArguments,30460,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_NormalState,30461,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationDate,30462,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_ExpirationLimit,30463,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_CertificateType,30464,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_CertificateExpired_Certificate,30465,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate,30466,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventId,30467,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EventType,30468,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceNode,30469,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SourceName,30470,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Time,30471,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReceiveTime,30472,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LocalTime,30473,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Message,30474,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Severity,30475,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassId,30476,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionClassName,30477,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassId,30478,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionSubClassName,30479,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConditionName,30480,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_BranchId,30481,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Retain,30482,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState,30483,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Id,30484,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Name,30485,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_Number,30486,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,30487,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TransitionTime,30488,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,30489,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_TrueState,30490,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_EnabledState_FalseState,30491,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality,30492,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Quality_SourceTimestamp,30493,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity,30494,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,30495,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment,30496,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Comment_SourceTimestamp,30497,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ClientUserId,30498,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Disable,30499,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Enable,30500,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment,30501,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AddComment_InputArguments,30502,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState,30503,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Id,30504,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Name,30505,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_Number,30506,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,30507,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TransitionTime,30508,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,30509,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_TrueState,30510,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AckedState_FalseState,30511,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState,30512,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Id,30513,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Name,30514,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_Number,30515,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,30516,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,30517,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,30518,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_TrueState,30519,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ConfirmedState_FalseState,30520,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge,30521,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Acknowledge_InputArguments,30522,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm,30523,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Confirm_InputArguments,30524,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState,30525,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Id,30526,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Name,30527,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_Number,30528,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,30529,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TransitionTime,30530,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,30531,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_TrueState,30532,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ActiveState_FalseState,30533,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_InputNode,30534,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState,30535,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Id,30536,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Name,30537,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_Number,30538,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,30539,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TransitionTime,30540,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,30541,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_TrueState,30542,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedState_FalseState,30543,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState,30544,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Id,30545,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Name,30546,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_Number,30547,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,30548,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,30549,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,30550,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_TrueState,30551,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OutOfServiceState_FalseState,30552,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState,30553,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState,30554,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,30555,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,30556,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,30557,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,30558,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition,30559,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,30560,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,30561,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,30562,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,30563,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,30564,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableStates,30565,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,30566,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,30567,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve,30568,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,30569,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,30570,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,30571,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve,30572,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2,30573,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,30574,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,30575,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,30576,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,30577,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SuppressedOrShelved,30578,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_MaxTimeShelved,30579,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleEnabled,30580,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound,30581,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_ListId,30582,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_AgencyId,30583,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_AudibleSound_VersionId,30584,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState,30585,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Id,30586,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Name,30587,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_Number,30588,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,30589,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TransitionTime,30590,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,30591,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_TrueState,30592,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_SilenceState_FalseState,30593,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OnDelay,30594,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_OffDelay,30595,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroupFlag,30596,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_FirstInGroup,30597,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState,30598,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Id,30599,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Name,30600,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_Number,30601,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,30602,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TransitionTime,30603,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,30604,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_TrueState,30605,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LatchedState_FalseState,30606,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmTime,30607,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_ReAlarmRepeatCount,30608,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Silence,30609,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress,30610,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2,30611,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Suppress2_InputArguments,30612,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress,30613,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2,30614,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Unsuppress2_InputArguments,30615,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService,30616,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2,30617,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,30618,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService,30619,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2,30620,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_PlaceInService2_InputArguments,30621,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset,30622,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2,30623,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_Reset2_InputArguments,30624,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships,30625,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,30626,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_NormalState,30627,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_TrustListId,30628,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_LastUpdateTime,30629,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustListOutOfDate_UpdateFrequency,30630,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup,30631,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList,30632,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Size,30633,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Writable,30634,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_UserWritable,30635,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenCount,30636,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_MimeType,30637,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_MaxByteStringLength,30638,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_LastModifiedTime,30639,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Open,30640,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Open_InputArguments,30641,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Open_OutputArguments,30642,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Close,30643,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Close_InputArguments,30644,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Read,30645,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Read_InputArguments,30646,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Read_OutputArguments,30647,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Write,30648,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_Write_InputArguments,30649,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition,30650,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition_InputArguments,30651,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_GetPosition_OutputArguments,30652,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_SetPosition,30653,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_SetPosition_InputArguments,30654,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_LastUpdateTime,30655,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_UpdateFrequency,30656,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_DefaultValidationOptions,30657,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks,30658,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks_InputArguments,30659,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_OpenWithMasks_OutputArguments,30660,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate,30661,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate_InputArguments,30662,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_CloseAndUpdate_OutputArguments,30663,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_AddCertificate,30664,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_AddCertificate_InputArguments,30665,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_RemoveCertificate,30666,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_RemoveCertificate_InputArguments,30667,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateTypes,30668,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_GetRejectedList,30670,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_GetRejectedList_OutputArguments,30671,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired,30672,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventId,30673,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EventType,30674,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceNode,30675,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SourceName,30676,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Time,30677,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReceiveTime,30678,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LocalTime,30679,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Message,30680,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Severity,30681,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassId,30682,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionClassName,30683,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassId,30684,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionSubClassName,30685,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConditionName,30686,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_BranchId,30687,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Retain,30688,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState,30689,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Id,30690,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Name,30691,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_Number,30692,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveDisplayName,30693,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TransitionTime,30694,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_EffectiveTransitionTime,30695,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_TrueState,30696,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_EnabledState_FalseState,30697,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality,30698,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Quality_SourceTimestamp,30699,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity,30700,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LastSeverity_SourceTimestamp,30701,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment,30702,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Comment_SourceTimestamp,30703,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ClientUserId,30704,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Disable,30705,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Enable,30706,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment,30707,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AddComment_InputArguments,30708,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState,30709,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Id,30710,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Name,30711,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_Number,30712,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveDisplayName,30713,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TransitionTime,30714,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_EffectiveTransitionTime,30715,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_TrueState,30716,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AckedState_FalseState,30717,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState,30718,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Id,30719,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Name,30720,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_Number,30721,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveDisplayName,30722,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TransitionTime,30723,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_EffectiveTransitionTime,30724,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_TrueState,30725,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ConfirmedState_FalseState,30726,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge,30727,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Acknowledge_InputArguments,30728,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm,30729,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Confirm_InputArguments,30730,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState,30731,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Id,30732,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Name,30733,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_Number,30734,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveDisplayName,30735,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TransitionTime,30736,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_EffectiveTransitionTime,30737,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_TrueState,30738,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ActiveState_FalseState,30739,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_InputNode,30740,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState,30741,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Id,30742,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Name,30743,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_Number,30744,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveDisplayName,30745,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TransitionTime,30746,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_EffectiveTransitionTime,30747,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_TrueState,30748,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedState_FalseState,30749,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState,30750,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Id,30751,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Name,30752,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_Number,30753,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveDisplayName,30754,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TransitionTime,30755,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_EffectiveTransitionTime,30756,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_TrueState,30757,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OutOfServiceState_FalseState,30758,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState,30759,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState,30760,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Id,30761,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Name,30762,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_Number,30763,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_CurrentState_EffectiveDisplayName,30764,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition,30765,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Id,30766,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Name,30767,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_Number,30768,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_TransitionTime,30769,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_LastTransition_EffectiveTransitionTime,30770,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableStates,30771,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_AvailableTransitions,30772,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_UnshelveTime,30773,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve,30774,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve_InputArguments,30775,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2,30776,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_TimedShelve2_InputArguments,30777,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve,30778,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2,30779,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_Unshelve2_InputArguments,30780,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve,30781,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2,30782,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ShelvingState_OneShotShelve2_InputArguments,30783,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SuppressedOrShelved,30784,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_MaxTimeShelved,30785,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleEnabled,30786,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound,30787,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_ListId,30788,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_AgencyId,30789,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_AudibleSound_VersionId,30790,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState,30791,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Id,30792,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Name,30793,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_Number,30794,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveDisplayName,30795,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TransitionTime,30796,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_EffectiveTransitionTime,30797,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_TrueState,30798,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_SilenceState_FalseState,30799,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OnDelay,30800,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_OffDelay,30801,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroupFlag,30802,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_FirstInGroup,30803,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState,30804,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Id,30805,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Name,30806,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_Number,30807,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveDisplayName,30808,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TransitionTime,30809,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_EffectiveTransitionTime,30810,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_TrueState,30811,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_LatchedState_FalseState,30812,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmTime,30813,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ReAlarmRepeatCount,30814,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Silence,30815,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress,30816,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2,30817,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Suppress2_InputArguments,30818,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress,30819,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2,30820,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Unsuppress2_InputArguments,30821,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService,30822,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2,30823,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_RemoveFromService2_InputArguments,30824,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService,30825,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2,30826,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_PlaceInService2_InputArguments,30827,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset,30828,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2,30829,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Reset2_InputArguments,30830,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships,30831,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_GetGroupMemberships_OutputArguments,30832,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_NormalState,30833,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationDate,30834,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_ExpirationLimit,30835,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_CertificateType,30836,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_CertificateExpired_Certificate,30837,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate,30838,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventId,30839,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EventType,30840,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceNode,30841,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SourceName,30842,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Time,30843,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReceiveTime,30844,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LocalTime,30845,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Message,30846,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Severity,30847,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassId,30848,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionClassName,30849,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassId,30850,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionSubClassName,30851,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConditionName,30852,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_BranchId,30853,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Retain,30854,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState,30855,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Id,30856,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Name,30857,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_Number,30858,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveDisplayName,30859,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TransitionTime,30860,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_EffectiveTransitionTime,30861,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_TrueState,30862,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_EnabledState_FalseState,30863,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality,30864,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Quality_SourceTimestamp,30865,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity,30866,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastSeverity_SourceTimestamp,30867,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment,30868,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Comment_SourceTimestamp,30869,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ClientUserId,30870,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Disable,30871,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Enable,30872,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment,30873,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AddComment_InputArguments,30874,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState,30875,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Id,30876,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Name,30877,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_Number,30878,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveDisplayName,30879,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TransitionTime,30880,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_EffectiveTransitionTime,30881,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_TrueState,30882,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AckedState_FalseState,30883,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState,30884,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Id,30885,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Name,30886,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_Number,30887,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveDisplayName,30888,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TransitionTime,30889,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_EffectiveTransitionTime,30890,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_TrueState,30891,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ConfirmedState_FalseState,30892,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge,30893,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Acknowledge_InputArguments,30894,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm,30895,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Confirm_InputArguments,30896,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState,30897,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Id,30898,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Name,30899,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_Number,30900,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveDisplayName,30901,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TransitionTime,30902,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_EffectiveTransitionTime,30903,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_TrueState,30904,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ActiveState_FalseState,30905,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_InputNode,30906,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState,30907,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Id,30908,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Name,30909,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_Number,30910,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveDisplayName,30911,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TransitionTime,30912,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_EffectiveTransitionTime,30913,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_TrueState,30914,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedState_FalseState,30915,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState,30916,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Id,30917,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Name,30918,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_Number,30919,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveDisplayName,30920,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TransitionTime,30921,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_EffectiveTransitionTime,30922,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_TrueState,30923,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OutOfServiceState_FalseState,30924,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState,30925,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState,30926,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Id,30927,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Name,30928,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_Number,30929,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_CurrentState_EffectiveDisplayName,30930,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition,30931,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Id,30932,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Name,30933,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_Number,30934,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_TransitionTime,30935,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_LastTransition_EffectiveTransitionTime,30936,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableStates,30937,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_AvailableTransitions,30938,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_UnshelveTime,30939,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve,30940,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve_InputArguments,30941,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2,30942,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_TimedShelve2_InputArguments,30943,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve,30944,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2,30945,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_Unshelve2_InputArguments,30946,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve,30947,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2,30948,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ShelvingState_OneShotShelve2_InputArguments,30949,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SuppressedOrShelved,30950,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_MaxTimeShelved,30951,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleEnabled,30952,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound,30953,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_ListId,30954,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_AgencyId,30955,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_AudibleSound_VersionId,30956,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState,30957,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Id,30958,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Name,30959,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_Number,30960,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveDisplayName,30961,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TransitionTime,30962,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_EffectiveTransitionTime,30963,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_TrueState,30964,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_SilenceState_FalseState,30965,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OnDelay,30966,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_OffDelay,30967,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroupFlag,30968,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_FirstInGroup,30969,Object
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState,30970,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Id,30971,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Name,30972,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_Number,30973,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveDisplayName,30974,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TransitionTime,30975,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_EffectiveTransitionTime,30976,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_TrueState,30977,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LatchedState_FalseState,30978,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmTime,30979,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_ReAlarmRepeatCount,30980,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Silence,30981,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress,30982,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2,30983,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Suppress2_InputArguments,30984,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress,30985,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2,30986,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Unsuppress2_InputArguments,30987,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService,30988,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2,30989,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_RemoveFromService2_InputArguments,30990,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService,30991,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2,30992,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_PlaceInService2_InputArguments,30993,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset,30994,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2,30995,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_Reset2_InputArguments,30996,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships,30997,Method
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_GetGroupMemberships_OutputArguments,30998,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_NormalState,30999,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_TrustListId,31000,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_LastUpdateTime,31001,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustListOutOfDate_UpdateFrequency,31002,Variable
+ProvisionableDevice_ApplicationName_Placeholder_Enabled,31375,Variable
+ProvisionableDevice_ApplicationName_Placeholder_ApplicationUri,31376,Variable
+ProvisionableDevice_ApplicationName_Placeholder_ProductUri,31377,Variable
+ProvisionableDevice_ApplicationName_Placeholder_ApplicationType,31378,Variable
+ProvisionableDevice_ApplicationName_Placeholder_ServerCapabilities,31379,Variable
+ProvisionableDevice_ApplicationName_Placeholder_SupportedPrivateKeyFormats,31380,Variable
+ProvisionableDevice_ApplicationName_Placeholder_MaxTrustListSize,31381,Variable
+ProvisionableDevice_ApplicationName_Placeholder_MulticastDnsEnabled,31382,Variable
+ProvisionableDevice_ApplicationName_Placeholder_HasSecureElement,31383,Variable
+ProvisionableDevice_ApplicationName_Placeholder_UpdateCertificate,31384,Method
+ProvisionableDevice_ApplicationName_Placeholder_UpdateCertificate_InputArguments,31385,Variable
+ProvisionableDevice_ApplicationName_Placeholder_UpdateCertificate_OutputArguments,31386,Variable
+ProvisionableDevice_ApplicationName_Placeholder_ApplyChanges,31387,Method
+ProvisionableDevice_ApplicationName_Placeholder_CancelChanges,31388,Method
+ProvisionableDevice_ApplicationName_Placeholder_CreateSigningRequest,31389,Method
+ProvisionableDevice_ApplicationName_Placeholder_CreateSigningRequest_InputArguments,31390,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CreateSigningRequest_OutputArguments,31391,Variable
+ProvisionableDevice_ApplicationName_Placeholder_GetRejectedList,31392,Method
+ProvisionableDevice_ApplicationName_Placeholder_GetRejectedList_OutputArguments,31393,Variable
+ProvisionableDevice_ApplicationName_Placeholder_ResetToServerDefaults,31394,Method
+ServerType_ServerCapabilities_MaxMonitoredItemsQueueSize,31769,Variable
+ServerCapabilitiesType_MaxMonitoredItemsQueueSize,31770,Variable
+BaseEventType_ConditionClassId,31771,Variable
+BaseEventType_ConditionClassName,31772,Variable
+BaseEventType_ConditionSubClassId,31773,Variable
+BaseEventType_ConditionSubClassName,31774,Variable
+AuditEventType_ConditionClassId,31775,Variable
+AuditEventType_ConditionClassName,31776,Variable
+AuditEventType_ConditionSubClassId,31777,Variable
+AuditEventType_ConditionSubClassName,31778,Variable
+AuditSecurityEventType_ConditionClassId,31779,Variable
+AuditSecurityEventType_ConditionClassName,31780,Variable
+AuditSecurityEventType_ConditionSubClassId,31781,Variable
+AuditSecurityEventType_ConditionSubClassName,31782,Variable
+AuditChannelEventType_ConditionClassId,31783,Variable
+AuditChannelEventType_ConditionClassName,31784,Variable
+AuditChannelEventType_ConditionSubClassId,31785,Variable
+AuditChannelEventType_ConditionSubClassName,31786,Variable
+AuditOpenSecureChannelEventType_ConditionClassId,31787,Variable
+AuditOpenSecureChannelEventType_ConditionClassName,31788,Variable
+AuditOpenSecureChannelEventType_ConditionSubClassId,31789,Variable
+AuditOpenSecureChannelEventType_ConditionSubClassName,31790,Variable
+AuditSessionEventType_ConditionClassId,31791,Variable
+AuditSessionEventType_ConditionClassName,31792,Variable
+AuditSessionEventType_ConditionSubClassId,31793,Variable
+AuditSessionEventType_ConditionSubClassName,31794,Variable
+AuditCreateSessionEventType_ConditionClassId,31795,Variable
+AuditCreateSessionEventType_ConditionClassName,31796,Variable
+AuditCreateSessionEventType_ConditionSubClassId,31797,Variable
+AuditCreateSessionEventType_ConditionSubClassName,31798,Variable
+AuditUrlMismatchEventType_ConditionClassId,31799,Variable
+AuditUrlMismatchEventType_ConditionClassName,31800,Variable
+AuditUrlMismatchEventType_ConditionSubClassId,31801,Variable
+AuditUrlMismatchEventType_ConditionSubClassName,31802,Variable
+AuditActivateSessionEventType_ConditionClassId,31803,Variable
+AuditActivateSessionEventType_ConditionClassName,31804,Variable
+AuditActivateSessionEventType_ConditionSubClassId,31805,Variable
+AuditActivateSessionEventType_ConditionSubClassName,31806,Variable
+AuditCancelEventType_ConditionClassId,31807,Variable
+AuditCancelEventType_ConditionClassName,31808,Variable
+AuditCancelEventType_ConditionSubClassId,31809,Variable
+AuditCancelEventType_ConditionSubClassName,31810,Variable
+AuditCertificateEventType_ConditionClassId,31811,Variable
+AuditCertificateEventType_ConditionClassName,31812,Variable
+AuditCertificateEventType_ConditionSubClassId,31813,Variable
+AuditCertificateEventType_ConditionSubClassName,31814,Variable
+AuditCertificateDataMismatchEventType_ConditionClassId,31815,Variable
+AuditCertificateDataMismatchEventType_ConditionClassName,31816,Variable
+AuditCertificateDataMismatchEventType_ConditionSubClassId,31817,Variable
+AuditCertificateDataMismatchEventType_ConditionSubClassName,31818,Variable
+AuditCertificateExpiredEventType_ConditionClassId,31819,Variable
+AuditCertificateExpiredEventType_ConditionClassName,31820,Variable
+AuditCertificateExpiredEventType_ConditionSubClassId,31821,Variable
+AuditCertificateExpiredEventType_ConditionSubClassName,31822,Variable
+AuditCertificateInvalidEventType_ConditionClassId,31823,Variable
+AuditCertificateInvalidEventType_ConditionClassName,31824,Variable
+AuditCertificateInvalidEventType_ConditionSubClassId,31825,Variable
+AuditCertificateInvalidEventType_ConditionSubClassName,31826,Variable
+AuditCertificateUntrustedEventType_ConditionClassId,31827,Variable
+AuditCertificateUntrustedEventType_ConditionClassName,31828,Variable
+AuditCertificateUntrustedEventType_ConditionSubClassId,31829,Variable
+AuditCertificateUntrustedEventType_ConditionSubClassName,31830,Variable
+AuditCertificateRevokedEventType_ConditionClassId,31831,Variable
+AuditCertificateRevokedEventType_ConditionClassName,31832,Variable
+AuditCertificateRevokedEventType_ConditionSubClassId,31833,Variable
+AuditCertificateRevokedEventType_ConditionSubClassName,31834,Variable
+AuditCertificateMismatchEventType_ConditionClassId,31835,Variable
+AuditCertificateMismatchEventType_ConditionClassName,31836,Variable
+AuditCertificateMismatchEventType_ConditionSubClassId,31837,Variable
+AuditCertificateMismatchEventType_ConditionSubClassName,31838,Variable
+AuditNodeManagementEventType_ConditionClassId,31839,Variable
+AuditNodeManagementEventType_ConditionClassName,31840,Variable
+AuditNodeManagementEventType_ConditionSubClassId,31841,Variable
+AuditNodeManagementEventType_ConditionSubClassName,31842,Variable
+AuditAddNodesEventType_ConditionClassId,31843,Variable
+AuditAddNodesEventType_ConditionClassName,31844,Variable
+AuditAddNodesEventType_ConditionSubClassId,31845,Variable
+AuditAddNodesEventType_ConditionSubClassName,31846,Variable
+AuditDeleteNodesEventType_ConditionClassId,31847,Variable
+AuditDeleteNodesEventType_ConditionClassName,31848,Variable
+AuditDeleteNodesEventType_ConditionSubClassId,31849,Variable
+AuditDeleteNodesEventType_ConditionSubClassName,31850,Variable
+AuditAddReferencesEventType_ConditionClassId,31851,Variable
+AuditAddReferencesEventType_ConditionClassName,31852,Variable
+AuditAddReferencesEventType_ConditionSubClassId,31853,Variable
+AuditAddReferencesEventType_ConditionSubClassName,31854,Variable
+AuditDeleteReferencesEventType_ConditionClassId,31855,Variable
+AuditDeleteReferencesEventType_ConditionClassName,31856,Variable
+AuditDeleteReferencesEventType_ConditionSubClassId,31857,Variable
+AuditDeleteReferencesEventType_ConditionSubClassName,31858,Variable
+AuditUpdateEventType_ConditionClassId,31859,Variable
+AuditUpdateEventType_ConditionClassName,31860,Variable
+AuditUpdateEventType_ConditionSubClassId,31861,Variable
+AuditUpdateEventType_ConditionSubClassName,31862,Variable
+AuditWriteUpdateEventType_ConditionClassId,31863,Variable
+AuditWriteUpdateEventType_ConditionClassName,31864,Variable
+AuditWriteUpdateEventType_ConditionSubClassId,31865,Variable
+AuditWriteUpdateEventType_ConditionSubClassName,31866,Variable
+AuditHistoryUpdateEventType_ConditionClassId,31867,Variable
+AuditHistoryUpdateEventType_ConditionClassName,31868,Variable
+AuditHistoryUpdateEventType_ConditionSubClassId,31869,Variable
+AuditHistoryUpdateEventType_ConditionSubClassName,31870,Variable
+AuditUpdateMethodEventType_ConditionClassId,31871,Variable
+AuditUpdateMethodEventType_ConditionClassName,31872,Variable
+AuditUpdateMethodEventType_ConditionSubClassId,31873,Variable
+AuditUpdateMethodEventType_ConditionSubClassName,31874,Variable
+SystemEventType_ConditionClassId,31875,Variable
+SystemEventType_ConditionClassName,31876,Variable
+SystemEventType_ConditionSubClassId,31877,Variable
+SystemEventType_ConditionSubClassName,31878,Variable
+DeviceFailureEventType_ConditionClassId,31879,Variable
+DeviceFailureEventType_ConditionClassName,31880,Variable
+DeviceFailureEventType_ConditionSubClassId,31881,Variable
+DeviceFailureEventType_ConditionSubClassName,31882,Variable
+SystemStatusChangeEventType_ConditionClassId,31883,Variable
+SystemStatusChangeEventType_ConditionClassName,31884,Variable
+SystemStatusChangeEventType_ConditionSubClassId,31885,Variable
+SystemStatusChangeEventType_ConditionSubClassName,31886,Variable
+BaseModelChangeEventType_ConditionClassId,31887,Variable
+BaseModelChangeEventType_ConditionClassName,31888,Variable
+BaseModelChangeEventType_ConditionSubClassId,31889,Variable
+BaseModelChangeEventType_ConditionSubClassName,31890,Variable
+GeneralModelChangeEventType_ConditionClassId,31891,Variable
+GeneralModelChangeEventType_ConditionClassName,31892,Variable
+GeneralModelChangeEventType_ConditionSubClassId,31893,Variable
+GeneralModelChangeEventType_ConditionSubClassName,31894,Variable
+SemanticChangeEventType_ConditionClassId,31895,Variable
+SemanticChangeEventType_ConditionClassName,31896,Variable
+SemanticChangeEventType_ConditionSubClassId,31897,Variable
+SemanticChangeEventType_ConditionSubClassName,31898,Variable
+EventQueueOverflowEventType_ConditionClassId,31899,Variable
+EventQueueOverflowEventType_ConditionClassName,31900,Variable
+EventQueueOverflowEventType_ConditionSubClassId,31901,Variable
+EventQueueOverflowEventType_ConditionSubClassName,31902,Variable
+ProgressEventType_ConditionClassId,31903,Variable
+ProgressEventType_ConditionClassName,31904,Variable
+ProgressEventType_ConditionSubClassId,31905,Variable
+ProgressEventType_ConditionSubClassName,31906,Variable
+AuditClientEventType_ConditionClassId,31907,Variable
+AuditClientEventType_ConditionClassName,31908,Variable
+AuditClientEventType_ConditionSubClassId,31909,Variable
+AuditClientEventType_ConditionSubClassName,31910,Variable
+AuditClientUpdateMethodResultEventType_ConditionClassId,31911,Variable
+AuditClientUpdateMethodResultEventType_ConditionClassName,31912,Variable
+AuditClientUpdateMethodResultEventType_ConditionSubClassId,31913,Variable
+AuditClientUpdateMethodResultEventType_ConditionSubClassName,31914,Variable
+Locations,31915,Object
+Server_ServerCapabilities_MaxMonitoredItemsQueueSize,31916,Variable
+Handle,31917,DataType
+TrimmedString,31918,DataType
+TransitionEventType_ConditionClassId,31919,Variable
+TransitionEventType_ConditionClassName,31920,Variable
+TransitionEventType_ConditionSubClassId,31921,Variable
+TransitionEventType_ConditionSubClassName,31922,Variable
+AuditUpdateStateEventType_ConditionClassId,31923,Variable
+AuditUpdateStateEventType_ConditionClassName,31924,Variable
+AuditUpdateStateEventType_ConditionSubClassId,31925,Variable
+AuditUpdateStateEventType_ConditionSubClassName,31926,Variable
+RoleMappingRuleChangedAuditEventType_ConditionClassId,31927,Variable
+RoleMappingRuleChangedAuditEventType_ConditionClassName,31928,Variable
+RoleMappingRuleChangedAuditEventType_ConditionSubClassId,31929,Variable
+RoleMappingRuleChangedAuditEventType_ConditionSubClassName,31930,Variable
+AuditConditionEventType_ConditionClassId,31931,Variable
+AuditConditionEventType_ConditionClassName,31932,Variable
+AuditConditionEventType_ConditionSubClassId,31933,Variable
+AuditConditionEventType_ConditionSubClassName,31934,Variable
+AuditConditionEnableEventType_ConditionClassId,31935,Variable
+AuditConditionEnableEventType_ConditionClassName,31936,Variable
+AuditConditionEnableEventType_ConditionSubClassId,31937,Variable
+AuditConditionEnableEventType_ConditionSubClassName,31938,Variable
+AuditConditionCommentEventType_ConditionClassId,31939,Variable
+AuditConditionCommentEventType_ConditionClassName,31940,Variable
+AuditConditionCommentEventType_ConditionSubClassId,31941,Variable
+AuditConditionCommentEventType_ConditionSubClassName,31942,Variable
+AuditConditionRespondEventType_ConditionClassId,31943,Variable
+AuditConditionRespondEventType_ConditionClassName,31944,Variable
+AuditConditionRespondEventType_ConditionSubClassId,31945,Variable
+AuditConditionRespondEventType_ConditionSubClassName,31946,Variable
+AuditConditionAcknowledgeEventType_ConditionClassId,31947,Variable
+AuditConditionAcknowledgeEventType_ConditionClassName,31948,Variable
+AuditConditionAcknowledgeEventType_ConditionSubClassId,31949,Variable
+AuditConditionAcknowledgeEventType_ConditionSubClassName,31950,Variable
+AuditConditionConfirmEventType_ConditionClassId,31951,Variable
+AuditConditionConfirmEventType_ConditionClassName,31952,Variable
+AuditConditionConfirmEventType_ConditionSubClassId,31953,Variable
+AuditConditionConfirmEventType_ConditionSubClassName,31954,Variable
+AuditConditionShelvingEventType_ConditionClassId,31955,Variable
+AuditConditionShelvingEventType_ConditionClassName,31956,Variable
+AuditConditionShelvingEventType_ConditionSubClassId,31957,Variable
+AuditConditionShelvingEventType_ConditionSubClassName,31958,Variable
+AuditConditionSuppressionEventType_ConditionClassId,31959,Variable
+AuditConditionSuppressionEventType_ConditionClassName,31960,Variable
+AuditConditionSuppressionEventType_ConditionSubClassId,31961,Variable
+AuditConditionSuppressionEventType_ConditionSubClassName,31962,Variable
+AuditConditionSilenceEventType_ConditionClassId,31963,Variable
+AuditConditionSilenceEventType_ConditionClassName,31964,Variable
+AuditConditionSilenceEventType_ConditionSubClassId,31965,Variable
+AuditConditionSilenceEventType_ConditionSubClassName,31966,Variable
+AuditConditionResetEventType_ConditionClassId,31967,Variable
+AuditConditionResetEventType_ConditionClassName,31968,Variable
+AuditConditionResetEventType_ConditionSubClassId,31969,Variable
+AuditConditionResetEventType_ConditionSubClassName,31970,Variable
+AuditConditionOutOfServiceEventType_ConditionClassId,31971,Variable
+AuditConditionOutOfServiceEventType_ConditionClassName,31972,Variable
+AuditConditionOutOfServiceEventType_ConditionSubClassId,31973,Variable
+AuditConditionOutOfServiceEventType_ConditionSubClassName,31974,Variable
+RefreshStartEventType_ConditionClassId,31975,Variable
+RefreshStartEventType_ConditionClassName,31976,Variable
+RefreshStartEventType_ConditionSubClassId,31977,Variable
+RefreshStartEventType_ConditionSubClassName,31978,Variable
+RefreshEndEventType_ConditionClassId,31979,Variable
+RefreshEndEventType_ConditionClassName,31980,Variable
+RefreshEndEventType_ConditionSubClassId,31981,Variable
+RefreshEndEventType_ConditionSubClassName,31982,Variable
+RefreshRequiredEventType_ConditionClassId,31983,Variable
+RefreshRequiredEventType_ConditionClassName,31984,Variable
+RefreshRequiredEventType_ConditionSubClassId,31985,Variable
+RefreshRequiredEventType_ConditionSubClassName,31986,Variable
+ProgramTransitionEventType_ConditionClassId,31987,Variable
+ProgramTransitionEventType_ConditionClassName,31988,Variable
+ProgramTransitionEventType_ConditionSubClassId,31989,Variable
+ProgramTransitionEventType_ConditionSubClassName,31990,Variable
+AuditProgramTransitionEventType_ConditionClassId,31991,Variable
+AuditProgramTransitionEventType_ConditionClassName,31992,Variable
+AuditProgramTransitionEventType_ConditionSubClassId,31993,Variable
+AuditProgramTransitionEventType_ConditionSubClassName,31994,Variable
+ProgramTransitionAuditEventType_ConditionClassId,31995,Variable
+ProgramTransitionAuditEventType_ConditionClassName,31996,Variable
+ProgramTransitionAuditEventType_ConditionSubClassId,31997,Variable
+ProgramTransitionAuditEventType_ConditionSubClassName,31998,Variable
+AuditHistoryEventUpdateEventType_ConditionClassId,31999,Variable
+AuditHistoryEventUpdateEventType_ConditionClassName,32000,Variable
+AuditHistoryEventUpdateEventType_ConditionSubClassId,32001,Variable
+AuditHistoryEventUpdateEventType_ConditionSubClassName,32002,Variable
+AuditHistoryValueUpdateEventType_ConditionClassId,32003,Variable
+AuditHistoryValueUpdateEventType_ConditionClassName,32004,Variable
+AuditHistoryValueUpdateEventType_ConditionSubClassId,32005,Variable
+AuditHistoryValueUpdateEventType_ConditionSubClassName,32006,Variable
+AuditHistoryAnnotationUpdateEventType_ConditionClassId,32007,Variable
+AuditHistoryAnnotationUpdateEventType_ConditionClassName,32008,Variable
+AuditHistoryAnnotationUpdateEventType_ConditionSubClassId,32009,Variable
+AuditHistoryAnnotationUpdateEventType_ConditionSubClassName,32010,Variable
+AuditHistoryDeleteEventType_ConditionClassId,32011,Variable
+AuditHistoryDeleteEventType_ConditionClassName,32012,Variable
+AuditHistoryDeleteEventType_ConditionSubClassId,32013,Variable
+AuditHistoryDeleteEventType_ConditionSubClassName,32014,Variable
+AuditHistoryRawModifyDeleteEventType_ConditionClassId,32015,Variable
+AuditHistoryRawModifyDeleteEventType_ConditionClassName,32016,Variable
+AuditHistoryRawModifyDeleteEventType_ConditionSubClassId,32017,Variable
+AuditHistoryRawModifyDeleteEventType_ConditionSubClassName,32018,Variable
+AuditHistoryAtTimeDeleteEventType_ConditionClassId,32019,Variable
+AuditHistoryAtTimeDeleteEventType_ConditionClassName,32020,Variable
+AuditHistoryAtTimeDeleteEventType_ConditionSubClassId,32021,Variable
+AuditHistoryAtTimeDeleteEventType_ConditionSubClassName,32022,Variable
+AuditHistoryEventDeleteEventType_ConditionClassId,32023,Variable
+AuditHistoryEventDeleteEventType_ConditionClassName,32024,Variable
+AuditHistoryEventDeleteEventType_ConditionSubClassId,32025,Variable
+AuditHistoryEventDeleteEventType_ConditionSubClassName,32026,Variable
+TrustListUpdatedAuditEventType_ConditionClassId,32027,Variable
+TrustListUpdatedAuditEventType_ConditionClassName,32028,Variable
+TrustListUpdatedAuditEventType_ConditionSubClassId,32029,Variable
+TrustListUpdatedAuditEventType_ConditionSubClassName,32030,Variable
+CertificateUpdatedAuditEventType_ConditionClassId,32031,Variable
+CertificateUpdatedAuditEventType_ConditionClassName,32032,Variable
+CertificateUpdatedAuditEventType_ConditionSubClassId,32033,Variable
+CertificateUpdatedAuditEventType_ConditionSubClassName,32034,Variable
+KeyCredentialAuditEventType_ConditionClassId,32035,Variable
+KeyCredentialAuditEventType_ConditionClassName,32036,Variable
+KeyCredentialAuditEventType_ConditionSubClassId,32037,Variable
+KeyCredentialAuditEventType_ConditionSubClassName,32038,Variable
+KeyCredentialUpdatedAuditEventType_ConditionClassId,32039,Variable
+KeyCredentialUpdatedAuditEventType_ConditionClassName,32040,Variable
+KeyCredentialUpdatedAuditEventType_ConditionSubClassId,32041,Variable
+KeyCredentialUpdatedAuditEventType_ConditionSubClassName,32042,Variable
+KeyCredentialDeletedAuditEventType_ConditionClassId,32043,Variable
+KeyCredentialDeletedAuditEventType_ConditionClassName,32044,Variable
+KeyCredentialDeletedAuditEventType_ConditionSubClassId,32045,Variable
+KeyCredentialDeletedAuditEventType_ConditionSubClassName,32046,Variable
+PubSubStatusEventType_ConditionClassId,32047,Variable
+PubSubStatusEventType_ConditionClassName,32048,Variable
+PubSubStatusEventType_ConditionSubClassId,32049,Variable
+PubSubStatusEventType_ConditionSubClassName,32050,Variable
+PubSubTransportLimitsExceedEventType_ConditionClassId,32051,Variable
+PubSubTransportLimitsExceedEventType_ConditionClassName,32052,Variable
+PubSubTransportLimitsExceedEventType_ConditionSubClassId,32053,Variable
+PubSubTransportLimitsExceedEventType_ConditionSubClassName,32054,Variable
+PubSubCommunicationFailureEventType_ConditionClassId,32055,Variable
+PubSubCommunicationFailureEventType_ConditionClassName,32056,Variable
+PubSubCommunicationFailureEventType_ConditionSubClassId,32057,Variable
+PubSubCommunicationFailureEventType_ConditionSubClassName,32058,Variable
+AlarmSuppressionGroupMember,32059,ReferenceType
+ConditionType_SupportsFilteredRetain,32060,Variable
+DialogConditionType_SupportsFilteredRetain,32061,Variable
+AcknowledgeableConditionType_SupportsFilteredRetain,32062,Variable
+AlarmConditionType_SupportsFilteredRetain,32063,Variable
+AlarmSuppressionGroupType,32064,ObjectType
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder,32065,Object
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EventId,32066,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EventType,32067,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SourceNode,32068,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SourceName,32069,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Time,32070,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ReceiveTime,32071,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LocalTime,32072,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Message,32073,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Severity,32074,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConditionClassId,32075,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConditionClassName,32076,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConditionSubClassId,32077,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConditionSubClassName,32078,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConditionName,32079,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_BranchId,32080,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Retain,32081,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState,32082,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState_Id,32083,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState_Name,32084,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState_Number,32085,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState_EffectiveDisplayName,32086,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState_TransitionTime,32087,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState_EffectiveTransitionTime,32088,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState_TrueState,32089,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_EnabledState_FalseState,32090,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Quality,32091,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Quality_SourceTimestamp,32092,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LastSeverity,32093,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LastSeverity_SourceTimestamp,32094,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Comment,32095,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Comment_SourceTimestamp,32096,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ClientUserId,32097,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Disable,32098,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Enable,32099,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AddComment,32100,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AddComment_InputArguments,32101,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState,32102,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState_Id,32103,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState_Name,32104,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState_Number,32105,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState_EffectiveDisplayName,32106,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState_TransitionTime,32107,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState_EffectiveTransitionTime,32108,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState_TrueState,32109,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AckedState_FalseState,32110,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState,32111,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState_Id,32112,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState_Name,32113,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState_Number,32114,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState_EffectiveDisplayName,32115,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState_TransitionTime,32116,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState_EffectiveTransitionTime,32117,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState_TrueState,32118,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ConfirmedState_FalseState,32119,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Acknowledge,32120,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Acknowledge_InputArguments,32121,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Confirm,32122,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Confirm_InputArguments,32123,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState,32124,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState_Id,32125,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState_Name,32126,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState_Number,32127,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState_EffectiveDisplayName,32128,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState_TransitionTime,32129,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState_EffectiveTransitionTime,32130,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState_TrueState,32131,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ActiveState_FalseState,32132,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_InputNode,32133,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState,32134,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState_Id,32135,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState_Name,32136,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState_Number,32137,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState_EffectiveDisplayName,32138,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState_TransitionTime,32139,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState_EffectiveTransitionTime,32140,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState_TrueState,32141,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedState_FalseState,32142,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState,32143,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState_Id,32144,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState_Name,32145,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState_Number,32146,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState_EffectiveDisplayName,32147,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState_TransitionTime,32148,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState_EffectiveTransitionTime,32149,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState_TrueState,32150,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OutOfServiceState_FalseState,32151,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState,32152,Object
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_CurrentState,32153,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_CurrentState_Id,32154,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_CurrentState_Name,32155,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_CurrentState_Number,32156,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_CurrentState_EffectiveDisplayName,32157,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_LastTransition,32158,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_LastTransition_Id,32159,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_LastTransition_Name,32160,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_LastTransition_Number,32161,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_LastTransition_TransitionTime,32162,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_LastTransition_EffectiveTransitionTime,32163,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_AvailableStates,32164,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_AvailableTransitions,32165,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_UnshelveTime,32166,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_TimedShelve,32167,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_TimedShelve_InputArguments,32168,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_TimedShelve2,32169,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_TimedShelve2_InputArguments,32170,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_Unshelve,32171,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_Unshelve2,32172,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_Unshelve2_InputArguments,32173,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_OneShotShelve,32174,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_OneShotShelve2,32175,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ShelvingState_OneShotShelve2_InputArguments,32176,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SuppressedOrShelved,32177,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_MaxTimeShelved,32178,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AudibleEnabled,32179,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AudibleSound,32180,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AudibleSound_ListId,32181,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AudibleSound_AgencyId,32182,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_AudibleSound_VersionId,32183,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState,32184,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState_Id,32185,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState_Name,32186,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState_Number,32187,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState_EffectiveDisplayName,32188,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState_TransitionTime,32189,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState_EffectiveTransitionTime,32190,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState_TrueState,32191,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_SilenceState_FalseState,32192,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OnDelay,32193,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_OffDelay,32194,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_FirstInGroupFlag,32195,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_FirstInGroup,32196,Object
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState,32197,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState_Id,32198,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState_Name,32199,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState_Number,32200,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState_EffectiveDisplayName,32201,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState_TransitionTime,32202,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState_EffectiveTransitionTime,32203,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState_TrueState,32204,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_LatchedState_FalseState,32205,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ReAlarmTime,32206,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_ReAlarmRepeatCount,32207,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Silence,32208,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Suppress,32209,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Suppress2,32210,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Suppress2_InputArguments,32211,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Unsuppress,32212,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Unsuppress2,32213,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Unsuppress2_InputArguments,32214,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_RemoveFromService,32215,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_RemoveFromService2,32216,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_RemoveFromService2_InputArguments,32217,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_PlaceInService,32218,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_PlaceInService2,32219,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_PlaceInService2_InputArguments,32220,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Reset,32221,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Reset2,32222,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_Reset2_InputArguments,32223,Variable
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_GetGroupMemberships,32224,Method
+AlarmSuppressionGroupType_AlarmConditionInstance_Placeholder_GetGroupMemberships_OutputArguments,32225,Variable
+AlarmSuppressionGroupType_DigitalVariable_Placeholder,32226,Variable
+LimitAlarmType_SupportsFilteredRetain,32227,Variable
+ExclusiveLimitAlarmType_SupportsFilteredRetain,32228,Variable
+NonExclusiveLimitAlarmType_SupportsFilteredRetain,32229,Variable
+NonExclusiveLevelAlarmType_SupportsFilteredRetain,32230,Variable
+ExclusiveLevelAlarmType_SupportsFilteredRetain,32231,Variable
+NonExclusiveDeviationAlarmType_SupportsFilteredRetain,32232,Variable
+NonExclusiveRateOfChangeAlarmType_SupportsFilteredRetain,32233,Variable
+ExclusiveDeviationAlarmType_SupportsFilteredRetain,32234,Variable
+ExclusiveRateOfChangeAlarmType_SupportsFilteredRetain,32235,Variable
+DiscreteAlarmType_SupportsFilteredRetain,32236,Variable
+OffNormalAlarmType_SupportsFilteredRetain,32237,Variable
+SystemOffNormalAlarmType_SupportsFilteredRetain,32238,Variable
+TripAlarmType_SupportsFilteredRetain,32239,Variable
+InstrumentDiagnosticAlarmType_SupportsFilteredRetain,32240,Variable
+SystemDiagnosticAlarmType_SupportsFilteredRetain,32241,Variable
+CertificateExpirationAlarmType_SupportsFilteredRetain,32242,Variable
+DiscrepancyAlarmType_SupportsFilteredRetain,32243,Variable
+AlarmStateVariableType,32244,VariableType
+AlarmStateVariableType_HighestActiveSeverity,32245,Variable
+AlarmStateVariableType_HighestUnackSeverity,32246,Variable
+AlarmStateVariableType_ActiveCount,32247,Variable
+AlarmStateVariableType_UnacknowledgedCount,32248,Variable
+AlarmStateVariableType_UnconfirmedCount,32249,Variable
+AlarmStateVariableType_Filter,32250,Variable
+AlarmMask,32251,DataType
+AlarmMask_OptionSetValues,32252,Variable
+TrustListOutOfDateAlarmType_SupportsFilteredRetain,32253,Variable
+TrustListType_ActivityTimeout,32254,Variable
+CertificateGroupType_TrustList_ActivityTimeout,32255,Variable
+CertificateGroupFolderType_DefaultApplicationGroup_TrustList_ActivityTimeout,32256,Variable
+CertificateGroupFolderType_DefaultHttpsGroup_TrustList_ActivityTimeout,32257,Variable
+CertificateGroupFolderType_DefaultUserTokenGroup_TrustList_ActivityTimeout,32258,Variable
+CertificateGroupFolderType_AdditionalGroup_Placeholder_TrustList_ActivityTimeout,32259,Variable
+TrustListUpdateRequestedAuditEventType,32260,ObjectType
+TrustListUpdateRequestedAuditEventType_EventId,32261,Variable
+TrustListUpdateRequestedAuditEventType_EventType,32262,Variable
+TrustListUpdateRequestedAuditEventType_SourceNode,32263,Variable
+TrustListUpdateRequestedAuditEventType_SourceName,32264,Variable
+TrustListUpdateRequestedAuditEventType_Time,32265,Variable
+TrustListUpdateRequestedAuditEventType_ReceiveTime,32266,Variable
+TrustListUpdateRequestedAuditEventType_LocalTime,32267,Variable
+TrustListUpdateRequestedAuditEventType_Message,32268,Variable
+TrustListUpdateRequestedAuditEventType_Severity,32269,Variable
+TrustListUpdateRequestedAuditEventType_ConditionClassId,32270,Variable
+TrustListUpdateRequestedAuditEventType_ConditionClassName,32271,Variable
+TrustListUpdateRequestedAuditEventType_ConditionSubClassId,32272,Variable
+TrustListUpdateRequestedAuditEventType_ConditionSubClassName,32273,Variable
+TrustListUpdateRequestedAuditEventType_ActionTimeStamp,32274,Variable
+TrustListUpdateRequestedAuditEventType_Status,32275,Variable
+TrustListUpdateRequestedAuditEventType_ServerId,32276,Variable
+TrustListUpdateRequestedAuditEventType_ClientAuditEntryId,32277,Variable
+TrustListUpdateRequestedAuditEventType_ClientUserId,32278,Variable
+TrustListUpdateRequestedAuditEventType_MethodId,32279,Variable
+TrustListUpdateRequestedAuditEventType_InputArguments,32280,Variable
+TrustListUpdatedAuditEventType_TrustListId,32281,Variable
+GetCertificatesMethodType,32282,Method
+GetCertificatesMethodType_InputArguments,32283,Variable
+GetCertificatesMethodType_OutputArguments,32284,Variable
+TransactionErrorType,32285,DataType
+TransactionDiagnosticsType,32286,ObjectType
+TransactionDiagnosticsType_StartTime,32287,Variable
+TransactionDiagnosticsType_EndTime,32288,Variable
+TransactionDiagnosticsType_Result,32289,Variable
+TransactionDiagnosticsType_AffectedTrustLists,32290,Variable
+TransactionDiagnosticsType_AffectedCertificateGroups,32291,Variable
+TransactionDiagnosticsType_Errors,32292,Variable
+ServerConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_ActivityTimeout,32293,Variable
+ServerConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_ActivityTimeout,32294,Variable
+ServerConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_ActivityTimeout,32295,Variable
+ServerConfigurationType_GetCertificates,32296,Method
+ServerConfigurationType_GetCertificates_InputArguments,32297,Variable
+ServerConfigurationType_GetCertificates_OutputArguments,32298,Variable
+ServerConfigurationType_TransactionDiagnostics,32299,Object
+ServerConfigurationType_TransactionDiagnostics_StartTime,32300,Variable
+ServerConfigurationType_TransactionDiagnostics_EndTime,32301,Variable
+ServerConfigurationType_TransactionDiagnostics_Result,32302,Variable
+ServerConfigurationType_TransactionDiagnostics_AffectedTrustLists,32303,Variable
+ServerConfigurationType_TransactionDiagnostics_AffectedCertificateGroups,32304,Variable
+ServerConfigurationType_TransactionDiagnostics_Errors,32305,Variable
+CertificateUpdateRequestedAuditEventType,32306,ObjectType
+CertificateUpdateRequestedAuditEventType_EventId,32307,Variable
+CertificateUpdateRequestedAuditEventType_EventType,32308,Variable
+CertificateUpdateRequestedAuditEventType_SourceNode,32309,Variable
+CertificateUpdateRequestedAuditEventType_SourceName,32310,Variable
+CertificateUpdateRequestedAuditEventType_Time,32311,Variable
+CertificateUpdateRequestedAuditEventType_ReceiveTime,32312,Variable
+CertificateUpdateRequestedAuditEventType_LocalTime,32313,Variable
+CertificateUpdateRequestedAuditEventType_Message,32314,Variable
+CertificateUpdateRequestedAuditEventType_Severity,32315,Variable
+CertificateUpdateRequestedAuditEventType_ConditionClassId,32316,Variable
+CertificateUpdateRequestedAuditEventType_ConditionClassName,32317,Variable
+CertificateUpdateRequestedAuditEventType_ConditionSubClassId,32318,Variable
+CertificateUpdateRequestedAuditEventType_ConditionSubClassName,32319,Variable
+CertificateUpdateRequestedAuditEventType_ActionTimeStamp,32320,Variable
+CertificateUpdateRequestedAuditEventType_Status,32321,Variable
+CertificateUpdateRequestedAuditEventType_ServerId,32322,Variable
+CertificateUpdateRequestedAuditEventType_ClientAuditEntryId,32323,Variable
+CertificateUpdateRequestedAuditEventType_ClientUserId,32324,Variable
+CertificateUpdateRequestedAuditEventType_MethodId,32325,Variable
+CertificateUpdateRequestedAuditEventType_InputArguments,32326,Variable
+ServerConfiguration_CertificateGroups_DefaultApplicationGroup_TrustList_ActivityTimeout,32330,Variable
+ServerConfiguration_CertificateGroups_DefaultHttpsGroup_TrustList_ActivityTimeout,32331,Variable
+ServerConfiguration_CertificateGroups_DefaultUserTokenGroup_TrustList_ActivityTimeout,32332,Variable
+ServerConfiguration_GetCertificates,32333,Method
+ServerConfiguration_GetCertificates_InputArguments,32334,Variable
+ServerConfiguration_GetCertificates_OutputArguments,32335,Variable
+ServerConfiguration_TransactionDiagnostics,32336,Object
+ServerConfiguration_TransactionDiagnostics_StartTime,32337,Variable
+ServerConfiguration_TransactionDiagnostics_EndTime,32338,Variable
+ServerConfiguration_TransactionDiagnostics_Result,32339,Variable
+ServerConfiguration_TransactionDiagnostics_AffectedTrustLists,32340,Variable
+ServerConfiguration_TransactionDiagnostics_AffectedCertificateGroups,32341,Variable
+ServerConfiguration_TransactionDiagnostics_Errors,32342,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultApplicationGroup_TrustList_ActivityTimeout,32343,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultHttpsGroup_TrustList_ActivityTimeout,32344,Variable
+ApplicationConfigurationType_CertificateGroups_DefaultUserTokenGroup_TrustList_ActivityTimeout,32345,Variable
+ApplicationConfigurationType_GetCertificates,32346,Method
+ApplicationConfigurationType_GetCertificates_InputArguments,32347,Variable
+ApplicationConfigurationType_GetCertificates_OutputArguments,32348,Variable
+ApplicationConfigurationType_TransactionDiagnostics,32349,Object
+ApplicationConfigurationType_TransactionDiagnostics_StartTime,32350,Variable
+ApplicationConfigurationType_TransactionDiagnostics_EndTime,32351,Variable
+ApplicationConfigurationType_TransactionDiagnostics_Result,32352,Variable
+ApplicationConfigurationType_TransactionDiagnostics_AffectedTrustLists,32353,Variable
+ApplicationConfigurationType_TransactionDiagnostics_AffectedCertificateGroups,32354,Variable
+ApplicationConfigurationType_TransactionDiagnostics_Errors,32355,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_ActivityTimeout,32356,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_ActivityTimeout,32357,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_ActivityTimeout,32358,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_GetCertificates,32359,Method
+ProvisionableDeviceType_ApplicationName_Placeholder_GetCertificates_InputArguments,32360,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_GetCertificates_OutputArguments,32361,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_TransactionDiagnostics,32362,Object
+ProvisionableDeviceType_ApplicationName_Placeholder_TransactionDiagnostics_StartTime,32363,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_TransactionDiagnostics_EndTime,32364,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_TransactionDiagnostics_Result,32365,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_TransactionDiagnostics_AffectedTrustLists,32366,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_TransactionDiagnostics_AffectedCertificateGroups,32367,Variable
+ProvisionableDeviceType_ApplicationName_Placeholder_TransactionDiagnostics_Errors,32368,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultApplicationGroup_TrustList_ActivityTimeout,32369,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultHttpsGroup_TrustList_ActivityTimeout,32370,Variable
+ProvisionableDevice_ApplicationName_Placeholder_CertificateGroups_DefaultUserTokenGroup_TrustList_ActivityTimeout,32371,Variable
+ProvisionableDevice_ApplicationName_Placeholder_GetCertificates,32372,Method
+ProvisionableDevice_ApplicationName_Placeholder_GetCertificates_InputArguments,32373,Variable
+ProvisionableDevice_ApplicationName_Placeholder_GetCertificates_OutputArguments,32374,Variable
+ProvisionableDevice_ApplicationName_Placeholder_TransactionDiagnostics,32375,Object
+ProvisionableDevice_ApplicationName_Placeholder_TransactionDiagnostics_StartTime,32376,Variable
+ProvisionableDevice_ApplicationName_Placeholder_TransactionDiagnostics_EndTime,32377,Variable
+ProvisionableDevice_ApplicationName_Placeholder_TransactionDiagnostics_Result,32378,Variable
+ProvisionableDevice_ApplicationName_Placeholder_TransactionDiagnostics_AffectedTrustLists,32379,Variable
+ProvisionableDevice_ApplicationName_Placeholder_TransactionDiagnostics_AffectedCertificateGroups,32380,Variable
+ProvisionableDevice_ApplicationName_Placeholder_TransactionDiagnostics_Errors,32381,Variable
+TransactionErrorType_Encoding_DefaultBinary,32382,Object
+OpcUa_BinarySchema_TransactionErrorType,32383,Variable
+OpcUa_BinarySchema_TransactionErrorType_DataTypeVersion,32384,Variable
+OpcUa_BinarySchema_TransactionErrorType_DictionaryFragment,32385,Variable
+TransactionErrorType_Encoding_DefaultXml,32386,Object
+OpcUa_XmlSchema_TransactionErrorType,32387,Variable
+OpcUa_XmlSchema_TransactionErrorType_DataTypeVersion,32388,Variable
+OpcUa_XmlSchema_TransactionErrorType_DictionaryFragment,32389,Variable
+TransactionErrorType_Encoding_DefaultJson,32390,Object
+PublishSubscribeType_PubSubCapablities_MaxDataSetWritersPerGroup,32391,Variable
+PublishSubscribeType_PubSubCapablities_MaxNetworkMessageSizeDatagram,32392,Variable
+PublishSubscribeType_PubSubCapablities_MaxNetworkMessageSizeBroker,32393,Variable
+PublishSubscribeType_PubSubCapablities_SupportSecurityKeyPull,32394,Variable
+PublishSubscribeType_PubSubCapablities_SupportSecurityKeyPush,32395,Variable
+PublishSubscribeType_DefaultSecurityKeyServices,32396,Variable
+PublishSubscribeType_ConfigurationProperties,32397,Variable
+PublishSubscribe_PubSubCapablities_MaxDataSetWritersPerGroup,32398,Variable
+PublishSubscribe_PubSubCapablities_MaxNetworkMessageSizeDatagram,32399,Variable
+PublishSubscribe_PubSubCapablities_MaxNetworkMessageSizeBroker,32400,Variable
+PublishSubscribe_PubSubCapablities_SupportSecurityKeyPull,32401,Variable
+PublishSubscribe_PubSubCapablities_SupportSecurityKeyPush,32402,Variable
+PublishSubscribe_DefaultSecurityKeyServices,32403,Variable
+PublishSubscribe_ConfigurationProperties,32404,Variable
+DataSetClasses,32405,Object
+DataSetClasses_GetSecurityKeys,32406,Method
+DataSetClasses_GetSecurityKeys_InputArguments,32407,Variable
+DataSetClasses_GetSecurityKeys_OutputArguments,32408,Variable
+DataSetClasses_GetSecurityGroup,32409,Method
+DataSetClasses_GetSecurityGroup_InputArguments,32410,Variable
+DataSetClasses_GetSecurityGroup_OutputArguments,32411,Variable
+DataSetClasses_SecurityGroups,32412,Object
+DataSetClasses_SecurityGroups_AddSecurityGroup,32413,Method
+DataSetClasses_SecurityGroups_AddSecurityGroup_InputArguments,32414,Variable
+DataSetClasses_SecurityGroups_AddSecurityGroup_OutputArguments,32415,Variable
+DataSetClasses_SecurityGroups_RemoveSecurityGroup,32416,Method
+DataSetClasses_SecurityGroups_RemoveSecurityGroup_InputArguments,32417,Variable
+DataSetClasses_SecurityGroups_AddSecurityGroupFolder,32418,Method
+DataSetClasses_SecurityGroups_AddSecurityGroupFolder_InputArguments,32419,Variable
+DataSetClasses_SecurityGroups_AddSecurityGroupFolder_OutputArguments,32420,Variable
+DataSetClasses_SecurityGroups_RemoveSecurityGroupFolder,32421,Method
+DataSetClasses_SecurityGroups_RemoveSecurityGroupFolder_InputArguments,32422,Variable
+DataSetClasses_SecurityGroups_SupportedSecurityPolicyUris,32423,Variable
+DataSetClasses_KeyPushTargets,32424,Object
+DataSetClasses_KeyPushTargets_AddPushTarget,32425,Method
+DataSetClasses_KeyPushTargets_AddPushTarget_InputArguments,32426,Variable
+DataSetClasses_KeyPushTargets_AddPushTarget_OutputArguments,32427,Variable
+DataSetClasses_KeyPushTargets_RemovePushTarget,32428,Method
+DataSetClasses_KeyPushTargets_RemovePushTarget_InputArguments,32429,Variable
+DataSetClasses_KeyPushTargets_AddPushTargetFolder,32430,Method
+DataSetClasses_KeyPushTargets_AddPushTargetFolder_InputArguments,32431,Variable
+DataSetClasses_KeyPushTargets_AddPushTargetFolder_OutputArguments,32432,Variable
+DataSetClasses_KeyPushTargets_RemovePushTargetFolder,32433,Method
+DataSetClasses_KeyPushTargets_RemovePushTargetFolder_InputArguments,32434,Variable
+DataSetClasses_ConnectionName_Placeholder,32435,Object
+DataSetClasses_ConnectionName_Placeholder_PublisherId,32436,Variable
+DataSetClasses_ConnectionName_Placeholder_TransportProfileUri,32437,Variable
+DataSetClasses_ConnectionName_Placeholder_TransportProfileUri_Selections,32438,Variable
+DataSetClasses_ConnectionName_Placeholder_TransportProfileUri_SelectionDescriptions,32439,Variable
+DataSetClasses_ConnectionName_Placeholder_TransportProfileUri_RestrictToList,32440,Variable
+DataSetClasses_ConnectionName_Placeholder_ConnectionProperties,32441,Variable
+DataSetClasses_ConnectionName_Placeholder_Address,32442,Object
+DataSetClasses_ConnectionName_Placeholder_Address_NetworkInterface,32443,Variable
+DataSetClasses_ConnectionName_Placeholder_Address_NetworkInterface_Selections,32444,Variable
+DataSetClasses_ConnectionName_Placeholder_Address_NetworkInterface_SelectionDescriptions,32445,Variable
+DataSetClasses_ConnectionName_Placeholder_Address_NetworkInterface_RestrictToList,32446,Variable
+DataSetClasses_ConnectionName_Placeholder_TransportSettings,32447,Object
+DataSetClasses_ConnectionName_Placeholder_Status,32448,Object
+DataSetClasses_ConnectionName_Placeholder_Status_State,32449,Variable
+DataSetClasses_ConnectionName_Placeholder_Status_Enable,32450,Method
+DataSetClasses_ConnectionName_Placeholder_Status_Disable,32451,Method
+DataSetClasses_ConnectionName_Placeholder_Diagnostics,32452,Object
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_DiagnosticsLevel,32453,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalInformation,32454,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalInformation_Active,32455,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalInformation_Classification,32456,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalInformation_DiagnosticsLevel,32457,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalInformation_TimeFirstChange,32458,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalError,32459,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalError_Active,32460,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalError_Classification,32461,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalError_DiagnosticsLevel,32462,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_TotalError_TimeFirstChange,32463,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Reset,32464,Method
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_SubError,32465,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters,32466,Object
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateError,32467,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateError_Active,32468,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateError_Classification,32469,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateError_DiagnosticsLevel,32470,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateError_TimeFirstChange,32471,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByMethod,32472,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByMethod_Active,32473,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByMethod_Classification,32474,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByMethod_DiagnosticsLevel,32475,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByMethod_TimeFirstChange,32476,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByParent,32477,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByParent_Active,32478,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByParent_Classification,32479,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByParent_DiagnosticsLevel,32480,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalByParent_TimeFirstChange,32481,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalFromError,32482,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalFromError_Active,32483,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalFromError_Classification,32484,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalFromError_DiagnosticsLevel,32485,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateOperationalFromError_TimeFirstChange,32486,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StatePausedByParent,32487,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StatePausedByParent_Active,32488,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StatePausedByParent_Classification,32489,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StatePausedByParent_DiagnosticsLevel,32490,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StatePausedByParent_TimeFirstChange,32491,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateDisabledByMethod,32492,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateDisabledByMethod_Active,32493,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateDisabledByMethod_Classification,32494,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateDisabledByMethod_DiagnosticsLevel,32495,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_Counters_StateDisabledByMethod_TimeFirstChange,32496,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_LiveValues,32497,Object
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_LiveValues_ResolvedAddress,32498,Variable
+DataSetClasses_ConnectionName_Placeholder_Diagnostics_LiveValues_ResolvedAddress_DiagnosticsLevel,32499,Variable
+DataSetClasses_ConnectionName_Placeholder_AddWriterGroup,32500,Method
+DataSetClasses_ConnectionName_Placeholder_AddWriterGroup_InputArguments,32501,Variable
+DataSetClasses_ConnectionName_Placeholder_AddWriterGroup_OutputArguments,32502,Variable
+DataSetClasses_ConnectionName_Placeholder_AddReaderGroup,32503,Method
+DataSetClasses_ConnectionName_Placeholder_AddReaderGroup_InputArguments,32504,Variable
+DataSetClasses_ConnectionName_Placeholder_AddReaderGroup_OutputArguments,32505,Variable
+DataSetClasses_ConnectionName_Placeholder_RemoveGroup,32506,Method
+DataSetClasses_ConnectionName_Placeholder_RemoveGroup_InputArguments,32507,Variable
+DataSetClasses_SetSecurityKeys,32508,Method
+DataSetClasses_SetSecurityKeys_InputArguments,32509,Variable
+DataSetClasses_AddConnection,32510,Method
+DataSetClasses_AddConnection_InputArguments,32511,Variable
+DataSetClasses_AddConnection_OutputArguments,32512,Variable
+DataSetClasses_RemoveConnection,32513,Method
+DataSetClasses_RemoveConnection_InputArguments,32514,Variable
+DataSetClasses_PublishedDataSets,32515,Object
+DataSetClasses_PublishedDataSets_AddPublishedDataItems,32516,Method
+DataSetClasses_PublishedDataSets_AddPublishedDataItems_InputArguments,32517,Variable
+DataSetClasses_PublishedDataSets_AddPublishedDataItems_OutputArguments,32518,Variable
+DataSetClasses_PublishedDataSets_AddPublishedEvents,32519,Method
+DataSetClasses_PublishedDataSets_AddPublishedEvents_InputArguments,32520,Variable
+DataSetClasses_PublishedDataSets_AddPublishedEvents_OutputArguments,32521,Variable
+DataSetClasses_PublishedDataSets_AddPublishedDataItemsTemplate,32522,Method
+DataSetClasses_PublishedDataSets_AddPublishedDataItemsTemplate_InputArguments,32523,Variable
+DataSetClasses_PublishedDataSets_AddPublishedDataItemsTemplate_OutputArguments,32524,Variable
+DataSetClasses_PublishedDataSets_AddPublishedEventsTemplate,32525,Method
+DataSetClasses_PublishedDataSets_AddPublishedEventsTemplate_InputArguments,32526,Variable
+DataSetClasses_PublishedDataSets_AddPublishedEventsTemplate_OutputArguments,32527,Variable
+DataSetClasses_PublishedDataSets_RemovePublishedDataSet,32528,Method
+DataSetClasses_PublishedDataSets_RemovePublishedDataSet_InputArguments,32529,Variable
+DataSetClasses_PublishedDataSets_AddDataSetFolder,32530,Method
+DataSetClasses_PublishedDataSets_AddDataSetFolder_InputArguments,32531,Variable
+DataSetClasses_PublishedDataSets_AddDataSetFolder_OutputArguments,32532,Variable
+DataSetClasses_PublishedDataSets_RemoveDataSetFolder,32533,Method
+DataSetClasses_PublishedDataSets_RemoveDataSetFolder_InputArguments,32534,Variable
+DataSetClasses_SubscribedDataSets,32535,Object
+DataSetClasses_SubscribedDataSets_AddSubscribedDataSet,32536,Method
+DataSetClasses_SubscribedDataSets_AddSubscribedDataSet_InputArguments,32537,Variable
+DataSetClasses_SubscribedDataSets_AddSubscribedDataSet_OutputArguments,32538,Variable
+DataSetClasses_SubscribedDataSets_RemoveSubscribedDataSet,32539,Method
+DataSetClasses_SubscribedDataSets_RemoveSubscribedDataSet_InputArguments,32540,Variable
+DataSetClasses_SubscribedDataSets_AddDataSetFolder,32541,Method
+DataSetClasses_SubscribedDataSets_AddDataSetFolder_InputArguments,32542,Variable
+DataSetClasses_SubscribedDataSets_AddDataSetFolder_OutputArguments,32543,Variable
+DataSetClasses_SubscribedDataSets_RemoveDataSetFolder,32544,Method
+DataSetClasses_SubscribedDataSets_RemoveDataSetFolder_InputArguments,32545,Variable
+DataSetClasses_PubSubConfiguration,32546,Object
+DataSetClasses_PubSubConfiguration_Size,32547,Variable
+DataSetClasses_PubSubConfiguration_Writable,32548,Variable
+DataSetClasses_PubSubConfiguration_UserWritable,32549,Variable
+DataSetClasses_PubSubConfiguration_OpenCount,32550,Variable
+DataSetClasses_PubSubConfiguration_MimeType,32551,Variable
+DataSetClasses_PubSubConfiguration_MaxByteStringLength,32552,Variable
+DataSetClasses_PubSubConfiguration_LastModifiedTime,32553,Variable
+DataSetClasses_PubSubConfiguration_Open,32554,Method
+DataSetClasses_PubSubConfiguration_Open_InputArguments,32555,Variable
+DataSetClasses_PubSubConfiguration_Open_OutputArguments,32556,Variable
+DataSetClasses_PubSubConfiguration_Close,32557,Method
+DataSetClasses_PubSubConfiguration_Close_InputArguments,32558,Variable
+DataSetClasses_PubSubConfiguration_Read,32559,Method
+DataSetClasses_PubSubConfiguration_Read_InputArguments,32560,Variable
+DataSetClasses_PubSubConfiguration_Read_OutputArguments,32561,Variable
+DataSetClasses_PubSubConfiguration_Write,32562,Method
+DataSetClasses_PubSubConfiguration_Write_InputArguments,32563,Variable
+DataSetClasses_PubSubConfiguration_GetPosition,32564,Method
+DataSetClasses_PubSubConfiguration_GetPosition_InputArguments,32565,Variable
+DataSetClasses_PubSubConfiguration_GetPosition_OutputArguments,32566,Variable
+DataSetClasses_PubSubConfiguration_SetPosition,32567,Method
+DataSetClasses_PubSubConfiguration_SetPosition_InputArguments,32568,Variable
+DataSetClasses_PubSubConfiguration_ReserveIds,32569,Method
+DataSetClasses_PubSubConfiguration_ReserveIds_InputArguments,32570,Variable
+DataSetClasses_PubSubConfiguration_ReserveIds_OutputArguments,32571,Variable
+DataSetClasses_PubSubConfiguration_CloseAndUpdate,32572,Method
+DataSetClasses_PubSubConfiguration_CloseAndUpdate_InputArguments,32573,Variable
+DataSetClasses_PubSubConfiguration_CloseAndUpdate_OutputArguments,32574,Variable
+DataSetClasses_Status,32575,Object
+DataSetClasses_Status_State,32576,Variable
+DataSetClasses_Status_Enable,32577,Method
+DataSetClasses_Status_Disable,32578,Method
+DataSetClasses_Diagnostics,32579,Object
+DataSetClasses_Diagnostics_DiagnosticsLevel,32580,Variable
+DataSetClasses_Diagnostics_TotalInformation,32581,Variable
+DataSetClasses_Diagnostics_TotalInformation_Active,32582,Variable
+DataSetClasses_Diagnostics_TotalInformation_Classification,32583,Variable
+DataSetClasses_Diagnostics_TotalInformation_DiagnosticsLevel,32584,Variable
+DataSetClasses_Diagnostics_TotalInformation_TimeFirstChange,32585,Variable
+DataSetClasses_Diagnostics_TotalError,32586,Variable
+DataSetClasses_Diagnostics_TotalError_Active,32587,Variable
+DataSetClasses_Diagnostics_TotalError_Classification,32588,Variable
+DataSetClasses_Diagnostics_TotalError_DiagnosticsLevel,32589,Variable
+DataSetClasses_Diagnostics_TotalError_TimeFirstChange,32590,Variable
+DataSetClasses_Diagnostics_Reset,32591,Method
+DataSetClasses_Diagnostics_SubError,32592,Variable
+DataSetClasses_Diagnostics_Counters,32593,Object
+DataSetClasses_Diagnostics_Counters_StateError,32594,Variable
+DataSetClasses_Diagnostics_Counters_StateError_Active,32595,Variable
+DataSetClasses_Diagnostics_Counters_StateError_Classification,32596,Variable
+DataSetClasses_Diagnostics_Counters_StateError_DiagnosticsLevel,32597,Variable
+DataSetClasses_Diagnostics_Counters_StateError_TimeFirstChange,32598,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByMethod,32599,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByMethod_Active,32600,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByMethod_Classification,32601,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByMethod_DiagnosticsLevel,32602,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByMethod_TimeFirstChange,32603,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByParent,32604,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByParent_Active,32605,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByParent_Classification,32606,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByParent_DiagnosticsLevel,32607,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalByParent_TimeFirstChange,32608,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalFromError,32609,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalFromError_Active,32610,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalFromError_Classification,32611,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalFromError_DiagnosticsLevel,32612,Variable
+DataSetClasses_Diagnostics_Counters_StateOperationalFromError_TimeFirstChange,32613,Variable
+DataSetClasses_Diagnostics_Counters_StatePausedByParent,32614,Variable
+DataSetClasses_Diagnostics_Counters_StatePausedByParent_Active,32615,Variable
+DataSetClasses_Diagnostics_Counters_StatePausedByParent_Classification,32616,Variable
+DataSetClasses_Diagnostics_Counters_StatePausedByParent_DiagnosticsLevel,32617,Variable
+DataSetClasses_Diagnostics_Counters_StatePausedByParent_TimeFirstChange,32618,Variable
+DataSetClasses_Diagnostics_Counters_StateDisabledByMethod,32619,Variable
+DataSetClasses_Diagnostics_Counters_StateDisabledByMethod_Active,32620,Variable
+DataSetClasses_Diagnostics_Counters_StateDisabledByMethod_Classification,32621,Variable
+DataSetClasses_Diagnostics_Counters_StateDisabledByMethod_DiagnosticsLevel,32622,Variable
+DataSetClasses_Diagnostics_Counters_StateDisabledByMethod_TimeFirstChange,32623,Variable
+DataSetClasses_Diagnostics_LiveValues,32624,Object
+DataSetClasses_Diagnostics_LiveValues_ConfiguredDataSetWriters,32625,Variable
+DataSetClasses_Diagnostics_LiveValues_ConfiguredDataSetWriters_DiagnosticsLevel,32626,Variable
+DataSetClasses_Diagnostics_LiveValues_ConfiguredDataSetReaders,32627,Variable
+DataSetClasses_Diagnostics_LiveValues_ConfiguredDataSetReaders_DiagnosticsLevel,32628,Variable
+DataSetClasses_Diagnostics_LiveValues_OperationalDataSetWriters,32629,Variable
+DataSetClasses_Diagnostics_LiveValues_OperationalDataSetWriters_DiagnosticsLevel,32630,Variable
+DataSetClasses_Diagnostics_LiveValues_OperationalDataSetReaders,32631,Variable
+DataSetClasses_Diagnostics_LiveValues_OperationalDataSetReaders_DiagnosticsLevel,32632,Variable
+DataSetClasses_PubSubCapablities,32633,Object
+DataSetClasses_PubSubCapablities_MaxPubSubConnections,32634,Variable
+DataSetClasses_PubSubCapablities_MaxWriterGroups,32635,Variable
+DataSetClasses_PubSubCapablities_MaxReaderGroups,32636,Variable
+DataSetClasses_PubSubCapablities_MaxDataSetWriters,32637,Variable
+DataSetClasses_PubSubCapablities_MaxDataSetReaders,32638,Variable
+DataSetClasses_PubSubCapablities_MaxDataSetWritersPerGroup,32639,Variable
+DataSetClasses_PubSubCapablities_MaxNetworkMessageSizeDatagram,32640,Variable
+DataSetClasses_PubSubCapablities_MaxNetworkMessageSizeBroker,32641,Variable
+DataSetClasses_PubSubCapablities_SupportSecurityKeyPull,32642,Variable
+DataSetClasses_PubSubCapablities_SupportSecurityKeyPush,32643,Variable
+DataSetClasses_DataSetClasses,32644,Object
+DataSetClasses_DataSetClasses_DataSetName_Placeholder,32645,Variable
+DataSetClasses_SupportedTransportProfiles,32646,Variable
+DataSetClasses_DefaultDatagramPublisherId,32647,Variable
+DataSetClasses_ConfigurationVersion,32648,Variable
+DataSetClasses_DefaultSecurityKeyServices,32649,Variable
+DataSetClasses_ConfigurationProperties,32650,Variable
+PubSubCapabilitiesType_MaxDataSetWritersPerGroup,32651,Variable
+PubSubCapabilitiesType_MaxNetworkMessageSizeDatagram,32652,Variable
+PubSubCapabilitiesType_MaxNetworkMessageSizeBroker,32653,Variable
+PubSubCapabilitiesType_SupportSecurityKeyPull,32654,Variable
+PubSubCapabilitiesType_SupportSecurityKeyPush,32655,Variable
+DataSetClasses_PubSubCapablities_MaxFieldsPerDataSet,32656,Variable
+ReferenceDescriptionVariableType,32657,VariableType
+ReferenceDescriptionVariableType_ReferenceRefinement,32658,Variable
+ReferenceDescriptionDataType,32659,DataType
+ReferenceListEntryDataType,32660,DataType
+ReferenceDescriptionDataType_Encoding_DefaultBinary,32661,Object
+ReferenceListEntryDataType_Encoding_DefaultBinary,32662,Object
+OpcUa_BinarySchema_ReferenceDescriptionDataType,32663,Variable
+OpcUa_BinarySchema_ReferenceDescriptionDataType_DataTypeVersion,32664,Variable
+OpcUa_BinarySchema_ReferenceDescriptionDataType_DictionaryFragment,32665,Variable
+OpcUa_BinarySchema_ReferenceListEntryDataType,32666,Variable
+OpcUa_BinarySchema_ReferenceListEntryDataType_DataTypeVersion,32667,Variable
+OpcUa_BinarySchema_ReferenceListEntryDataType_DictionaryFragment,32668,Variable
+ReferenceDescriptionDataType_Encoding_DefaultXml,32669,Object
+ReferenceListEntryDataType_Encoding_DefaultXml,32670,Object
+OpcUa_XmlSchema_ReferenceDescriptionDataType,32671,Variable
+OpcUa_XmlSchema_ReferenceDescriptionDataType_DataTypeVersion,32672,Variable
+OpcUa_XmlSchema_ReferenceDescriptionDataType_DictionaryFragment,32673,Variable
+OpcUa_XmlSchema_ReferenceListEntryDataType,32674,Variable
+OpcUa_XmlSchema_ReferenceListEntryDataType_DataTypeVersion,32675,Variable
+OpcUa_XmlSchema_ReferenceListEntryDataType_DictionaryFragment,32676,Variable
+ReferenceDescriptionDataType_Encoding_DefaultJson,32677,Object
+ReferenceListEntryDataType_Encoding_DefaultJson,32678,Object
+HasReferenceDescription,32679,ReferenceType
+OptionSetLength,32750,Variable

From 983188c831758af76056525eb2af50f97986517d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 12 Dec 2022 08:02:06 +0100
Subject: [PATCH 0621/1963] refactor(pubsub): Remove dead code in
 ua_pubsub_readergroup.c

---
 src/pubsub/ua_pubsub_readergroup.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index f29e69198d2..b2ac6fd4554 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -239,14 +239,6 @@ UA_Server_removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
     return res;
 }
 
-/* TODO: Implement
-UA_StatusCode
-UA_Server_ReaderGroup_updateConfig(UA_Server *server, UA_NodeId readerGroupIdentifier,
-                                   const UA_ReaderGroupConfig *config) {
-    return UA_STATUSCODE_BADNOTIMPLEMENTED;
-}
-*/
-
 UA_StatusCode
 UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifier,
                                 UA_ReaderGroupConfig *config) {

From 4bb13ef21649ed21f5bdd7bf7bf6ad46657bd77b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 10 Dec 2022 00:06:36 +0100
Subject: [PATCH 0622/1963] feat(pubsub): Make UA_Server_ReaderGroup_getConfig
 threadsafe

---
 include/open62541/server_pubsub.h  |  2 +-
 src/pubsub/ua_pubsub_readergroup.c | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 272f86086cc..000b1cf898d 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -833,7 +833,7 @@ UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier);
  */
 
 /* Get configuraiton of ReaderGroup */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifier,
                                 UA_ReaderGroupConfig *config);
 
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index b2ac6fd4554..c8c3c7c14ab 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -245,17 +245,21 @@ UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifi
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
+    UA_LOCK(&server->serviceMutex);
+
     /* Identify the readergroup through the readerGroupIdentifier */
     UA_ReaderGroup *currentReaderGroup =
         UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
-    if(!currentReaderGroup)
+    if(!currentReaderGroup) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
+    }
 
-    UA_ReaderGroupConfig tmpReaderGroupConfig;
-    /* deep copy of the actual config */
-    UA_ReaderGroupConfig_copy(&currentReaderGroup->config, &tmpReaderGroupConfig);
-    *config = tmpReaderGroupConfig;
-    return UA_STATUSCODE_GOOD;
+    UA_StatusCode ret =
+        UA_ReaderGroupConfig_copy(&currentReaderGroup->config, config);
+
+    UA_UNLOCK(&server->serviceMutex);
+    return ret;
 }
 
 static void

From ae9ad3934b15045a8d0bd6c9de7b961952937a51 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 10 Dec 2022 00:31:49 +0100
Subject: [PATCH 0623/1963] feat(pubsub): Make
 UA_Server_setReaderGroupOperational and UA_Server_setReaderGroupDisabled
 thread-safe

---
 include/open62541/server_pubsub.h  |  4 ++--
 src/pubsub/ua_pubsub_readergroup.c | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 000b1cf898d..3e52d7370d3 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -858,10 +858,10 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server, const UA_NodeId read
 UA_StatusCode UA_EXPORT
 UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server, const UA_NodeId readerGroupId);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_setReaderGroupOperational(UA_Server *server, const UA_NodeId readerGroupId);
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_setReaderGroupDisabled(UA_Server *server, const UA_NodeId readerGroupId);
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index c8c3c7c14ab..26310d8a849 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -466,20 +466,26 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
 
 UA_StatusCode
 UA_Server_setReaderGroupOperational(UA_Server *server, const UA_NodeId readerGroupId){
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
-    if(!rg)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_OPERATIONAL,
-                                         UA_STATUSCODE_GOOD);
+    if(rg)
+        ret = UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_OPERATIONAL,
+                                            UA_STATUSCODE_GOOD);
+    UA_UNLOCK(&server->serviceMutex);
+    return ret;
 }
 
 UA_StatusCode
 UA_Server_setReaderGroupDisabled(UA_Server *server, const UA_NodeId readerGroupId){
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
-    if(!rg)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_DISABLED,
-                                         UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
+    if(rg)
+        ret = UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_DISABLED,
+                                            UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
+    UA_UNLOCK(&server->serviceMutex);
+    return ret;
 }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION

From 13b100d6dd74fa6e5fbb9f0987bee71fe836e74f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 10 Dec 2022 00:39:26 +0100
Subject: [PATCH 0624/1963] feat(pubsub): Make UA_Server_ReaderGroup_getState
 threadsafe

---
 include/open62541/server_pubsub.h  |  2 +-
 src/pubsub/ua_pubsub_readergroup.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 3e52d7370d3..39d909a53a2 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -838,7 +838,7 @@ UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifi
                                 UA_ReaderGroupConfig *config);
 
 /* Get state of ReaderGroup */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifier,
                                UA_PubSubState *state);
 
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 26310d8a849..0e579f69043 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -301,12 +301,16 @@ UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifie
                                UA_PubSubState *state) {
     if((server == NULL) || (state == NULL))
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *currentReaderGroup =
         UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
-    if(!currentReaderGroup)
-        return UA_STATUSCODE_BADNOTFOUND;
-    *state = currentReaderGroup->state;
-    return UA_STATUSCODE_GOOD;
+    if(currentReaderGroup) {
+        *state = currentReaderGroup->state;
+        ret = UA_STATUSCODE_GOOD;
+    }
+    UA_UNLOCK(&server->serviceMutex);
+    return ret;
 }
 
 /* ReaderGroup State */

From d3a10260239d52b0a15395a58626a7277df2097e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 10 Dec 2022 00:39:58 +0100
Subject: [PATCH 0625/1963] feat(pubsub): Make UA_Server_addReaderGroup
 threadsafe

---
 include/open62541/server_pubsub.h  |  2 +-
 src/pubsub/ua_pubsub_readergroup.c | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 39d909a53a2..3007692faa7 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -843,7 +843,7 @@ UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifie
                                UA_PubSubState *state);
 
 /* Add ReaderGroup to the created connection */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
                          const UA_ReaderGroupConfig *readerGroupConfig,
                          UA_NodeId *readerGroupIdentifier);
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 0e579f69043..80f171862e8 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -80,10 +80,10 @@ UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig) {
 
 /* ReaderGroup Lifecycle */
 
-UA_StatusCode
-UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
-                         const UA_ReaderGroupConfig *readerGroupConfig,
-                         UA_NodeId *readerGroupIdentifier) {
+static UA_StatusCode
+addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
+               const UA_ReaderGroupConfig *readerGroupConfig,
+               UA_NodeId *readerGroupIdentifier) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
     /* Check for valid readergroup configuration */
@@ -194,6 +194,17 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
     return retval;
 }
 
+UA_StatusCode
+UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
+                         const UA_ReaderGroupConfig *readerGroupConfig,
+                         UA_NodeId *readerGroupIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res =
+        addReaderGroup(server, connectionIdentifier, readerGroupConfig, readerGroupIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
     UA_ReaderGroup* readerGroup =

From f568d029ec9b3b37e104edcfcc1ab58f68114348 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 11:55:16 +0100
Subject: [PATCH 0626/1963] fix(pubsub): Remove a deadlock in the reader

---
 src/pubsub/ua_pubsub_reader.c      | 4 ++--
 src/server/ua_server_internal.h    | 4 ++++
 src/server/ua_services_attribute.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index a6676e3b6ae..ceb7e7929ed 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1102,7 +1102,7 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
         writeVal.nodeId = tv->targetVariable.targetNodeId;
         UA_Variant_setScalar(&writeVal.value.value, value, type);
         writeVal.value.hasValue = true;
-        res = UA_Server_write(server, &writeVal);
+        Operation_Write(server, &server->adminSession, NULL, &writeVal, &res);
         UA_clear(value, type);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_INFO_READER(&server->config.logger, dsr,
@@ -1237,7 +1237,7 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
         writeVal.indexRange = tv->targetVariable.receiverIndexRange;
         writeVal.nodeId = tv->targetVariable.targetNodeId;
         writeVal.value = msg->data.keyFrameData.dataSetFields[i];
-        res = UA_Server_write(server, &writeVal);
+        Operation_Write(server, &server->adminSession, NULL, &writeVal, &res);
         if(res != UA_STATUSCODE_GOOD)
             UA_LOG_INFO_READER(&server->config.logger, dsr,
                                "Error writing KeyFrame field %u: %s",
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 08568dff009..c4e14ca26fa 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -441,6 +441,10 @@ UA_StatusCode
 setMethodNode_callback(UA_Server *server, const UA_NodeId methodNodeId,
                        UA_MethodCallback methodCallback);
 
+void
+Operation_Write(UA_Server *server, UA_Session *session, void *context,
+                const UA_WriteValue *wv, UA_StatusCode *result);
+
 UA_StatusCode
 writeAttribute(UA_Server *server, UA_Session *session,
                const UA_NodeId *nodeId, const UA_AttributeId attributeId,
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 9787ea173e3..b06e0304450 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1815,7 +1815,7 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
     return UA_STATUSCODE_GOOD;
 }
 
-static void
+void
 Operation_Write(UA_Server *server, UA_Session *session, void *context,
                 const UA_WriteValue *wv, UA_StatusCode *result) {
     UA_assert(session != NULL);

From d9d59060fafe46454f6e24705ae2daebde4c9ea8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 11:58:00 +0100
Subject: [PATCH 0627/1963] feat(pubsub): Make UA_Server_addDataSetReader
 threadsafe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub_reader.c     | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 3007692faa7..f2b9875d65c 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -817,7 +817,7 @@ void UA_EXPORT
 UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig);
 
 /* Add DataSetReader to the ReaderGroup */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
                            const UA_DataSetReaderConfig *dataSetReaderConfig,
                            UA_NodeId *readerIdentifier);
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index ceb7e7929ed..9147ddf292a 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -400,10 +400,10 @@ checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
     return UA_STATUSCODE_BADNOTFOUND;
 }
 
-UA_StatusCode
-UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
-                           const UA_DataSetReaderConfig *dataSetReaderConfig,
-                           UA_NodeId *readerIdentifier) {
+static UA_StatusCode
+addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
+                 const UA_DataSetReaderConfig *dataSetReaderConfig,
+                 UA_NodeId *readerIdentifier) {
     /* Search the reader group by the given readerGroupIdentifier */
     UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
     if(readerGroup == NULL)
@@ -548,6 +548,17 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
     return retVal;
 }
 
+UA_StatusCode
+UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
+                           const UA_DataSetReaderConfig *dataSetReaderConfig,
+                           UA_NodeId *readerIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = addDataSetReader(server, readerGroupIdentifier,
+                                         dataSetReaderConfig, readerIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     /* Remove datasetreader given by the identifier */

From 4399a79c43888dd1a82d2083c1a9a769bc77aeaa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 12:00:18 +0100
Subject: [PATCH 0628/1963] refactor(pubsub): Cosmetic fixes in
 ua_pubsub_reader.c

---
 src/pubsub/ua_pubsub_reader.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 9147ddf292a..32177ed4438 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -386,7 +386,7 @@ checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
             }
         }
         return UA_STATUSCODE_GOOD;
-    }else{
+    } else {
         if(reader->config.publisherId.type != &UA_TYPES[UA_TYPES_UINT32] &&
            msg->publisherId.uint32 != *(UA_UInt32*)reader->config.publisherId.data)
             return UA_STATUSCODE_BADNOTFOUND;
@@ -458,15 +458,14 @@ addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
-    /* create message receive timeout timer */
-    retVal = server->config.pubSubConfig.monitoringInterface.createMonitoring(
-        server,
-        newDataSetReader->identifier,
-        UA_PUBSUB_COMPONENT_DATASETREADER,
-        UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT,
-        newDataSetReader,
-        (void (*)(UA_Server *, void *))
-        UA_DataSetReader_handleMessageReceiveTimeout);
+    /* Create message receive timeout timer */
+    retVal = server->config.pubSubConfig.monitoringInterface.
+        createMonitoring(server, newDataSetReader->identifier,
+                         UA_PUBSUB_COMPONENT_DATASETREADER,
+                         UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT,
+                         newDataSetReader,
+                         (void (*)(UA_Server *, void *))
+                         UA_DataSetReader_handleMessageReceiveTimeout);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
                                  "Add DataSetReader failed, create message "
@@ -485,8 +484,8 @@ addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
     if(!UA_String_isEmpty(&newDataSetReader->config.linkedStandaloneSubscribedDataSetName)) {
         // find sds by name
         UA_StandaloneSubscribedDataSet *subscribedDataSet =
-            UA_StandaloneSubscribedDataSet_findSDSbyName(
-                server, newDataSetReader->config.linkedStandaloneSubscribedDataSetName);
+            UA_StandaloneSubscribedDataSet_findSDSbyName(server,
+               newDataSetReader->config.linkedStandaloneSubscribedDataSetName);
         if(subscribedDataSet != NULL) {
             if(subscribedDataSet->config.subscribedDataSetType != UA_PUBSUB_SDS_TARGET) {
                 UA_LOG_ERROR_READER(&server->config.logger, newDataSetReader,

From a9f3288489e5efbe46bf32bdda92a4ebd40ad14c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 12:40:48 +0100
Subject: [PATCH 0629/1963] feat(pubsub): Make
 UA_Server_DataSetReader_createTargetVariables threadsafe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub_reader.c     | 58 +++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index f2b9875d65c..7d32973ad41 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -683,7 +683,7 @@ typedef struct {
 } UA_TargetVariables;
 
 /* Return Status Code after creating TargetVariables in Subscriber AddressSpace */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_DataSetReader_createTargetVariables(UA_Server *server,
                                               UA_NodeId dataSetReaderIdentifier,
                                               size_t targetVariablesSize,
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 32177ed4438..f85d2e7c1ef 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -36,6 +36,11 @@ static void
 UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader *dsr);
 #endif
 
+static UA_StatusCode
+DataSetReader_createTargetVariables(UA_Server *server, UA_DataSetReader *dsr,
+                                    size_t targetVariablesSize,
+                                    const UA_FieldTargetVariable *targetVariables);
+
 /* This functionality of this API will be used in future to create mirror Variables - TODO */
 /* #define UA_MAX_SIZENAME           64 */ /* Max size of Qualified Name of Subscribed Variable */
 
@@ -404,6 +409,8 @@ static UA_StatusCode
 addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
                  const UA_DataSetReaderConfig *dataSetReaderConfig,
                  UA_NodeId *readerIdentifier) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Search the reader group by the given readerGroupIdentifier */
     UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
     if(readerGroup == NULL)
@@ -516,11 +523,10 @@ addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
                                  .targetVariables[index],
                             &targetVars[index].targetVariable);
                     }
-                    UA_Server_DataSetReader_createTargetVariables(
-                        server, newDataSetReader->identifier,
-                        subscribedDataSet->config.subscribedDataSet.target
-                            .targetVariablesSize,
-                        targetVars);
+
+                    DataSetReader_createTargetVariables(server, newDataSetReader,
+                                                        subscribedDataSet->config.subscribedDataSet.
+                                                        target.targetVariablesSize, targetVars);
                     subscribedDataSet->connectedReader = newDataSetReader->identifier;
 
                     for(size_t index = 0;
@@ -924,31 +930,45 @@ UA_TargetVariables_clear(UA_TargetVariables *subscribedDataSetTarget) {
 /* This Method is used to initially set the SubscribedDataSet to
  * TargetVariablesType and to create the list of target Variables of a
  * SubscribedDataSetType. */
-UA_StatusCode
-UA_Server_DataSetReader_createTargetVariables(UA_Server *server,
-                                              UA_NodeId dataSetReaderIdentifier,
-                                              size_t targetVariablesSize,
-                                              const UA_FieldTargetVariable *targetVariables) {
-    UA_DataSetReader *dataSetReader = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
-    if(!dataSetReader)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
+static UA_StatusCode
+DataSetReader_createTargetVariables(UA_Server *server, UA_DataSetReader *dsr,
+                                    size_t targetVariablesSize,
+                                    const UA_FieldTargetVariable *targetVariables) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    if(dataSetReader->configurationFrozen) {
-        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+    if(dsr->configurationFrozen) {
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
                               "Create Target Variables failed. "
                               "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    if(dataSetReader->config.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize > 0)
-        UA_TargetVariables_clear(&dataSetReader->config.subscribedDataSet.subscribedDataSetTarget);
+    if(dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize > 0)
+        UA_TargetVariables_clear(&dsr->config.subscribedDataSet.subscribedDataSetTarget);
 
     /* Set subscribed dataset to TargetVariableType */
-    dataSetReader->config.subscribedDataSetType = UA_PUBSUB_SDS_TARGET;
+    dsr->config.subscribedDataSetType = UA_PUBSUB_SDS_TARGET;
     UA_TargetVariables tmp;
     tmp.targetVariablesSize = targetVariablesSize;
     tmp.targetVariables = (UA_FieldTargetVariable*)(uintptr_t)targetVariables;
-    return UA_TargetVariables_copy(&tmp, &dataSetReader->config.subscribedDataSet.subscribedDataSetTarget);
+    return UA_TargetVariables_copy(&tmp, &dsr->config.subscribedDataSet.subscribedDataSetTarget);
+}
+
+UA_StatusCode
+UA_Server_DataSetReader_createTargetVariables(UA_Server *server,
+                                              UA_NodeId dataSetReaderIdentifier,
+                                              size_t targetVariablesSize,
+                                              const UA_FieldTargetVariable *targetVariables) {
+    UA_LOCK(&server->serviceMutex);
+    UA_DataSetReader *dataSetReader = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
+    if(!dataSetReader) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+    UA_StatusCode res = DataSetReader_createTargetVariables(server, dataSetReader,
+                                                            targetVariablesSize, targetVariables);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 /* This functionality of this API will be used in future to create mirror Variables - TODO */

From 58bca7cddcbcad3657b1715b927f2a738ae4c340 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 12:53:09 +0100
Subject: [PATCH 0630/1963] feat(pubsub): Make
 UA_Server_DataSetReader_updateConfig threadsafe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub_reader.c     | 91 +++++++++++++++++--------------
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 7d32973ad41..fbb2987bc66 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -733,7 +733,7 @@ typedef struct {
 } UA_DataSetReaderConfig;
 
 /* Update configuration to the dataSetReader */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                      UA_NodeId readerGroupIdentifier,
                                      const UA_DataSetReaderConfig *config);
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index f85d2e7c1ef..70e1339d5ad 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -652,77 +652,67 @@ UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     return res;
 }
 
-UA_StatusCode
-UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
-                                     UA_NodeId readerGroupIdentifier,
-                                     const UA_DataSetReaderConfig *config) {
-    if(config == NULL)
-       return UA_STATUSCODE_BADINVALIDARGUMENT;
-
-    UA_DataSetReader *currentDataSetReader =
-        UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
-    if(!currentDataSetReader)
-       return UA_STATUSCODE_BADNOTFOUND;
+static UA_StatusCode
+DataSetReader_updateConfig(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *dsr,
+                           const UA_DataSetReaderConfig *config) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    if(currentDataSetReader->configurationFrozen) {
-        UA_LOG_WARNING_READER(&server->config.logger, currentDataSetReader,
+    if(dsr->configurationFrozen) {
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
                               "Update DataSetReader config failed. "
                               "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    UA_ReaderGroup *currentReaderGroup =
-        UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
-    if(currentReaderGroup->configurationFrozen) {
-        UA_LOG_WARNING_READER(&server->config.logger, currentDataSetReader,
+    if(rg->configurationFrozen) {
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
                               "Update DataSetReader config failed. "
                               "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    /* The update functionality will be extended during the next PubSub batches.
-     * Currently changes for writerGroupId, dataSetWriterId and TargetVariables are possible. */
-    if(currentDataSetReader->config.writerGroupId != config->writerGroupId)
-        currentDataSetReader->config.writerGroupId = config->writerGroupId;
-
-    if(currentDataSetReader->config.dataSetWriterId != config->dataSetWriterId)
-        currentDataSetReader->config.dataSetWriterId = config->dataSetWriterId;
-
-    if(currentDataSetReader->config.subscribedDataSetType != UA_PUBSUB_SDS_TARGET) {
-        UA_LOG_WARNING_READER(&server->config.logger, currentDataSetReader,
+    if(dsr->config.subscribedDataSetType != UA_PUBSUB_SDS_TARGET) {
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
                               "Unsupported SubscribedDataSetType.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    UA_TargetVariables *oldTV =
-        &currentDataSetReader->config.subscribedDataSet.subscribedDataSetTarget;
-    const UA_TargetVariables *newTV =
-        &config->subscribedDataSet.subscribedDataSetTarget;
+    /* The update functionality will be extended during the next PubSub batches.
+     * Currently changes for writerGroupId, dataSetWriterId and TargetVariables are possible. */
+    if(dsr->config.writerGroupId != config->writerGroupId)
+        dsr->config.writerGroupId = config->writerGroupId;
+    if(dsr->config.dataSetWriterId != config->dataSetWriterId)
+        dsr->config.dataSetWriterId = config->dataSetWriterId;
+
+    UA_TargetVariables *oldTV = &dsr->config.subscribedDataSet.subscribedDataSetTarget;
+    const UA_TargetVariables *newTV = &config->subscribedDataSet.subscribedDataSetTarget;
     if(oldTV->targetVariablesSize == newTV->targetVariablesSize) {
-        for(size_t i = 0; i < config->subscribedDataSet.subscribedDataSetTarget.targetVariablesSize; i++) {
+        for(size_t i = 0; i < newTV->targetVariablesSize; i++) {
             if(!UA_NodeId_equal(&oldTV->targetVariables[i].targetVariable.targetNodeId,
                                 &newTV->targetVariables[i].targetVariable.targetNodeId)) {
-                UA_Server_DataSetReader_createTargetVariables(server, currentDataSetReader->identifier,
-                                                              newTV->targetVariablesSize, newTV->targetVariables);
+                DataSetReader_createTargetVariables(server, dsr,
+                                                    newTV->targetVariablesSize,
+                                                    newTV->targetVariables);
+                break;
             }
         }
     } else {
-        UA_Server_DataSetReader_createTargetVariables(server, currentDataSetReader->identifier,
-                                                      newTV->targetVariablesSize, newTV->targetVariables);
+        DataSetReader_createTargetVariables(server, dsr, newTV->targetVariablesSize,
+                                            newTV->targetVariables);
     }
 
     UA_StatusCode res = UA_STATUSCODE_GOOD;
 #ifdef UA_ENABLE_PUBSUB_MONITORING
-    if(currentDataSetReader->config.messageReceiveTimeout != config->messageReceiveTimeout) {
+    if(dsr->config.messageReceiveTimeout != config->messageReceiveTimeout) {
         /* Update message receive timeout timer interval */
-        currentDataSetReader->config.messageReceiveTimeout = config->messageReceiveTimeout;
+        dsr->config.messageReceiveTimeout = config->messageReceiveTimeout;
         res = server->config.pubSubConfig.monitoringInterface.
-            updateMonitoringInterval(server, currentDataSetReader->identifier,
+            updateMonitoringInterval(server, dsr->identifier,
                                      UA_PUBSUB_COMPONENT_DATASETREADER,
                                      UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT,
-                                     currentDataSetReader);
+                                     dsr);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_READER(&server->config.logger, currentDataSetReader,
+            UA_LOG_ERROR_READER(&server->config.logger, dsr,
                                 "Update DataSetReader message receive timeout timer failed.");
         }
     }
@@ -730,6 +720,25 @@ UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderI
     return res;
 }
 
+UA_StatusCode
+UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
+                                     UA_NodeId readerGroupIdentifier,
+                                     const UA_DataSetReaderConfig *config) {
+    if(config == NULL)
+       return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_LOCK(&server->serviceMutex);
+    UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
+    if(!dsr || !rg) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = DataSetReader_updateConfig(server, rg, dsr, config);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 UA_Server_DataSetReader_getConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                  UA_DataSetReaderConfig *config) {

From a1b4bb3ac9755f9c3eac6d4b9fb12693f07c94cb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 12:55:20 +0100
Subject: [PATCH 0631/1963] feat(pubsub): Make
 UA_Server_DataSetReader_getConfig threadsafe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub_reader.c     | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index fbb2987bc66..c642b86b7ae 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -739,7 +739,7 @@ UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderI
                                      const UA_DataSetReaderConfig *config);
 
 /* Get configuration of the dataSetReader */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_DataSetReader_getConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                   UA_DataSetReaderConfig *config);
 
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 70e1339d5ad..c7c0196b9a3 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -744,17 +744,13 @@ UA_Server_DataSetReader_getConfig(UA_Server *server, UA_NodeId dataSetReaderIden
                                  UA_DataSetReaderConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-
-    UA_DataSetReader *currentDataSetReader =
-        UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
-    if(!currentDataSetReader)
-        return UA_STATUSCODE_BADNOTFOUND;
-
-    UA_DataSetReaderConfig tmpReaderConfig;
-    /* Deep copy of the actual config */
-    UA_DataSetReaderConfig_copy(&currentDataSetReader->config, &tmpReaderConfig);
-    *config = tmpReaderConfig;
-    return UA_STATUSCODE_GOOD;
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
+    if(dsr)
+        res = UA_DataSetReaderConfig_copy(&dsr->config, config);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode

From d8ff8d7e72b27bb54767689e832187d87a006ba8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 12:57:53 +0100
Subject: [PATCH 0632/1963] feat(pubsub): Make UA_Server_DataSetReader_getState
 threadsafe

---
 include/open62541/server_pubsub.h |  2 +-
 src/pubsub/ua_pubsub_reader.c     | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index c642b86b7ae..4d71d92b2fa 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -744,7 +744,7 @@ UA_Server_DataSetReader_getConfig(UA_Server *server, UA_NodeId dataSetReaderIden
                                   UA_DataSetReaderConfig *config);
 
 /* Get state of DataSetReader */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_DataSetReader_getState(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                  UA_PubSubState *state);
 
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index c7c0196b9a3..4460462ff36 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -811,16 +811,19 @@ UA_DataSetReaderConfig_clear(UA_DataSetReaderConfig *cfg) {
 
 UA_StatusCode
 UA_Server_DataSetReader_getState(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
-                               UA_PubSubState *state) {
-
-    if((server == NULL) || (state == NULL))
+                                 UA_PubSubState *state) {
+    if(!server || !state)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_DataSetReader *currentDataSetReader =
-        UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
-    if(currentDataSetReader == NULL)
-        return UA_STATUSCODE_BADNOTFOUND;
-    *state = currentDataSetReader->state;
-    return UA_STATUSCODE_GOOD;
+
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
+    if(dsr) {
+        res = UA_STATUSCODE_GOOD;
+        *state = dsr->state;
+    }
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 static UA_StatusCode

From 6e954fffeb735ba433634621f82009becca5642f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Dec 2022 13:00:01 +0100
Subject: [PATCH 0633/1963] refactor(pubsub): ua_pubsub_reader.c internally
 never calls methods prefixed with UA_Server_

---
 src/pubsub/ua_pubsub_reader.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 4460462ff36..7b8d3095f6d 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -894,9 +894,9 @@ UA_DataSetReader_setPubSubState(UA_Server *server,
     }
     if (state != oldState) {
         /* inform application about state change */
-        UA_ServerConfig *pConfig = UA_Server_getConfig(server);
-        if(pConfig->pubSubConfig.stateChangeCallback != 0) {
-            pConfig->pubSubConfig.
+        UA_ServerConfig *config = &server->config;
+        if(config->pubSubConfig.stateChangeCallback != 0) {
+            config->pubSubConfig.
                 stateChangeCallback(server, &dataSetReader->identifier, state, cause);
         }
     }

From b9fe8ca3ba612372b6b7e74c17c16f56e8f8804b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 4 Jan 2023 22:15:08 +0100
Subject: [PATCH 0634/1963] refactor(core): Expose more addNodes methods
 internally

---
 src/server/ua_server_internal.h               |  41 +++++-
 src/server/ua_server_ns0.c                    |  63 +++++----
 src/server/ua_services_nodemanagement.c       | 133 ++++++++++++------
 .../ua_subscription_alarms_conditions.c       |   2 +-
 4 files changed, 156 insertions(+), 83 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index c4e14ca26fa..ee2c5097380 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -686,24 +686,53 @@ UA_Server_readWithSession(UA_Server *server, UA_Session *session,
                           const UA_ReadValueId *item,
                           UA_TimestampsToReturn timestampsToReturn);
 
-/*****************************/
-/* AddNodes Begin and Finish */
-/*****************************/
+/************/
+/* AddNodes */
+/************/
+
+UA_StatusCode
+addNode(UA_Server *server, const UA_NodeClass nodeClass,
+        const UA_NodeId requestedNewNodeId,
+        const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+        const UA_QualifiedName browseName, const UA_NodeId typeDefinition,
+        const void *attr, const UA_DataType *attributeType,
+        void *nodeContext, UA_NodeId *outNewNodeId);
+
+UA_StatusCode
+addMethodNode(UA_Server *server, const UA_NodeId requestedNewNodeId,
+              const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+              const UA_QualifiedName browseName,
+              const UA_MethodAttributes *attr, UA_MethodCallback method,
+              size_t inputArgumentsSize, const UA_Argument *inputArguments,
+              const UA_NodeId inputArgumentsRequestedNewNodeId,
+              UA_NodeId *inputArgumentsOutNewNodeId,
+              size_t outputArgumentsSize, const UA_Argument *outputArguments,
+              const UA_NodeId outputArgumentsRequestedNewNodeId,
+              UA_NodeId *outputArgumentsOutNewNodeId,
+              void *nodeContext, UA_NodeId *outNewNodeId);
+
+UA_StatusCode
+addNode_begin(UA_Server *server, const UA_NodeClass nodeClass,
+              const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
+              const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
+              const UA_NodeId typeDefinition, const void *attr,
+              const UA_DataType *attributeType, void *nodeContext,
+              UA_NodeId *outNewNodeId);
 
 /* Creates a new node in the nodestore. */
 UA_StatusCode
-AddNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
+addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
             const UA_AddNodesItem *item, UA_NodeId *outNewNodeId);
 
 /* Check the reference to the parent node; Add references. */
 UA_StatusCode
-AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
+addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
                 const UA_NodeId *parentNodeId, const UA_NodeId *referenceTypeId,
                 const UA_NodeId *typeDefinitionId);
 
 /* Type-check type-definition; Run the constructors */
 UA_StatusCode
-AddNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId);
+addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId);
 
 /**********************/
 /* Create Namespace 0 */
diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index a36dbe630fe..1d3cb25d21d 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -19,7 +19,7 @@
 #include "ua_subscription.h"
 
 static UA_StatusCode
-addNode_raw(UA_Server *server, UA_NodeClass nodeClass,
+ns0_addNode_raw(UA_Server *server, UA_NodeClass nodeClass,
             UA_UInt32 nodeId, char *name, void *attributes,
             const UA_DataType *attributesType) {
     UA_AddNodesItem item;
@@ -29,11 +29,11 @@ addNode_raw(UA_Server *server, UA_NodeClass nodeClass,
     item.browseName = UA_QUALIFIEDNAME(0, name);
     UA_ExtensionObject_setValueNoDelete(&item.nodeAttributes,
                                         attributes, attributesType);
-    return AddNode_raw(server, &server->adminSession, NULL, &item, NULL);
+    return addNode_raw(server, &server->adminSession, NULL, &item, NULL);
 }
 
 static UA_StatusCode
-addNode_finish(UA_Server *server, UA_UInt32 nodeId,
+ns0_addNode_finish(UA_Server *server, UA_UInt32 nodeId,
                UA_UInt32 parentNodeId, UA_UInt32 referenceTypeId) {
     const UA_NodeId sourceId = UA_NODEID_NUMERIC(0, nodeId);
     const UA_NodeId refTypeId = UA_NODEID_NUMERIC(0, referenceTypeId);
@@ -41,7 +41,7 @@ addNode_finish(UA_Server *server, UA_UInt32 nodeId,
     UA_StatusCode retval = addRef(server, sourceId, refTypeId, targetId, false);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
-    return AddNode_finish(server, &server->adminSession, &sourceId);
+    return addNode_finish(server, &server->adminSession, &sourceId);
 }
 
 static UA_StatusCode
@@ -90,24 +90,24 @@ createNS0_base(UA_Server *server) {
     references_attr.isAbstract = true;
     references_attr.symmetric = true;
     references_attr.inverseName = UA_LOCALIZEDTEXT("", "References");
-    ret |= addNode_raw(server, UA_NODECLASS_REFERENCETYPE, UA_NS0ID_REFERENCES, "References",
-                       &references_attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+    ret |= ns0_addNode_raw(server, UA_NODECLASS_REFERENCETYPE, UA_NS0ID_REFERENCES, "References",
+                           &references_attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 
     UA_ReferenceTypeAttributes hassubtype_attr = UA_ReferenceTypeAttributes_default;
     hassubtype_attr.displayName = UA_LOCALIZEDTEXT("", "HasSubtype");
     hassubtype_attr.isAbstract = false;
     hassubtype_attr.symmetric = false;
     hassubtype_attr.inverseName = UA_LOCALIZEDTEXT("", "HasSupertype");
-    ret |= addNode_raw(server, UA_NODECLASS_REFERENCETYPE, UA_NS0ID_HASSUBTYPE, "HasSubtype",
-                       &hassubtype_attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+    ret |= ns0_addNode_raw(server, UA_NODECLASS_REFERENCETYPE, UA_NS0ID_HASSUBTYPE, "HasSubtype",
+                           &hassubtype_attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 
     UA_ReferenceTypeAttributes aggregates_attr = UA_ReferenceTypeAttributes_default;
     aggregates_attr.displayName = UA_LOCALIZEDTEXT("", "Aggregates");
     aggregates_attr.isAbstract = true;
     aggregates_attr.symmetric = false;
     aggregates_attr.inverseName = UA_LOCALIZEDTEXT("", "AggregatedBy");
-    ret |= addNode_raw(server, UA_NODECLASS_REFERENCETYPE, UA_NS0ID_AGGREGATES, "Aggregates",
-                       &aggregates_attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+    ret |= ns0_addNode_raw(server, UA_NODECLASS_REFERENCETYPE, UA_NS0ID_AGGREGATES, "Aggregates",
+                           &aggregates_attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 
     ret |= addReferenceTypeNode(server, "HierarchicalReferences", NULL,
                          UA_NS0ID_HIERARCHICALREFERENCES, true, false, UA_NS0ID_REFERENCES);
@@ -140,10 +140,10 @@ createNS0_base(UA_Server *server) {
                          false, false, UA_NS0ID_NONHIERARCHICALREFERENCES);
 
     /* Complete bootstrap of Aggregates */
-    ret |= addNode_finish(server, UA_NS0ID_AGGREGATES, UA_NS0ID_HASCHILD, UA_NS0ID_HASSUBTYPE);
+    ret |= ns0_addNode_finish(server, UA_NS0ID_AGGREGATES, UA_NS0ID_HASCHILD, UA_NS0ID_HASSUBTYPE);
 
     /* Complete bootstrap of HasSubtype */
-    ret |= addNode_finish(server, UA_NS0ID_HASSUBTYPE, UA_NS0ID_HASCHILD, UA_NS0ID_HASSUBTYPE);
+    ret |= ns0_addNode_finish(server, UA_NS0ID_HASSUBTYPE, UA_NS0ID_HASCHILD, UA_NS0ID_HASSUBTYPE);
 
     ret |= addReferenceTypeNode(server, "HasProperty", "PropertyOf", UA_NS0ID_HASPROPERTY,
                          false, false, UA_NS0ID_AGGREGATES);
@@ -168,8 +168,8 @@ createNS0_base(UA_Server *server) {
     UA_DataTypeAttributes basedatatype_attr = UA_DataTypeAttributes_default;
     basedatatype_attr.displayName = UA_LOCALIZEDTEXT("", "BaseDataType");
     basedatatype_attr.isAbstract = true;
-    ret |= addNode_raw(server, UA_NODECLASS_DATATYPE, UA_NS0ID_BASEDATATYPE, "BaseDataType",
-                       &basedatatype_attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
+    ret |= ns0_addNode_raw(server, UA_NODECLASS_DATATYPE, UA_NS0ID_BASEDATATYPE, "BaseDataType",
+                           &basedatatype_attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
 
     /*****************/
     /* VariableTypes */
@@ -180,8 +180,9 @@ createNS0_base(UA_Server *server) {
     basevar_attr.isAbstract = true;
     basevar_attr.valueRank = UA_VALUERANK_ANY;
     basevar_attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATATYPE);
-    ret |= addNode_raw(server, UA_NODECLASS_VARIABLETYPE, UA_NS0ID_BASEVARIABLETYPE, "BaseVariableType",
-                       &basevar_attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
+    ret |= ns0_addNode_raw(server, UA_NODECLASS_VARIABLETYPE,
+                           UA_NS0ID_BASEVARIABLETYPE, "BaseVariableType",
+                           &basevar_attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
 
     UA_VariableTypeAttributes bdv_attr = UA_VariableTypeAttributes_default;
     bdv_attr.displayName = UA_LOCALIZEDTEXT("", "BaseDataVariableType");
@@ -211,8 +212,9 @@ createNS0_base(UA_Server *server) {
 
     UA_ObjectTypeAttributes baseobj_attr = UA_ObjectTypeAttributes_default;
     baseobj_attr.displayName = UA_LOCALIZEDTEXT("", "BaseObjectType");
-    ret |= addNode_raw(server, UA_NODECLASS_OBJECTTYPE, UA_NS0ID_BASEOBJECTTYPE, "BaseObjectType",
-                       &baseobj_attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
+    ret |= ns0_addNode_raw(server, UA_NODECLASS_OBJECTTYPE,
+                           UA_NS0ID_BASEOBJECTTYPE, "BaseObjectType",
+                           &baseobj_attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
 
     UA_ObjectTypeAttributes folder_attr = UA_ObjectTypeAttributes_default;
     folder_attr.displayName = UA_LOCALIZEDTEXT("", "FolderType");
@@ -237,23 +239,23 @@ createNS0_base(UA_Server *server) {
 
     ret |= addObjectNode(server, "ReferenceTypes", UA_NS0ID_REFERENCETYPESFOLDER, UA_NS0ID_TYPESFOLDER,
                   UA_NS0ID_ORGANIZES, UA_NS0ID_FOLDERTYPE);
-    ret |= addNode_finish(server, UA_NS0ID_REFERENCES, UA_NS0ID_REFERENCETYPESFOLDER,
-                   UA_NS0ID_ORGANIZES);
+    ret |= ns0_addNode_finish(server, UA_NS0ID_REFERENCES,
+                              UA_NS0ID_REFERENCETYPESFOLDER, UA_NS0ID_ORGANIZES);
 
     ret |= addObjectNode(server, "DataTypes", UA_NS0ID_DATATYPESFOLDER, UA_NS0ID_TYPESFOLDER,
                   UA_NS0ID_ORGANIZES, UA_NS0ID_FOLDERTYPE);
-    ret |= addNode_finish(server, UA_NS0ID_BASEDATATYPE, UA_NS0ID_DATATYPESFOLDER,
-                   UA_NS0ID_ORGANIZES);
+    ret |= ns0_addNode_finish(server, UA_NS0ID_BASEDATATYPE,
+                              UA_NS0ID_DATATYPESFOLDER, UA_NS0ID_ORGANIZES);
 
     ret |= addObjectNode(server, "VariableTypes", UA_NS0ID_VARIABLETYPESFOLDER, UA_NS0ID_TYPESFOLDER,
                   UA_NS0ID_ORGANIZES, UA_NS0ID_FOLDERTYPE);
-    ret |= addNode_finish(server, UA_NS0ID_BASEVARIABLETYPE, UA_NS0ID_VARIABLETYPESFOLDER,
-                   UA_NS0ID_ORGANIZES);
+    ret |= ns0_addNode_finish(server, UA_NS0ID_BASEVARIABLETYPE,
+                              UA_NS0ID_VARIABLETYPESFOLDER, UA_NS0ID_ORGANIZES);
 
     ret |= addObjectNode(server, "ObjectTypes", UA_NS0ID_OBJECTTYPESFOLDER, UA_NS0ID_TYPESFOLDER,
                   UA_NS0ID_ORGANIZES, UA_NS0ID_FOLDERTYPE);
-    ret |= addNode_finish(server, UA_NS0ID_BASEOBJECTTYPE, UA_NS0ID_OBJECTTYPESFOLDER,
-                   UA_NS0ID_ORGANIZES);
+    ret |= ns0_addNode_finish(server, UA_NS0ID_BASEOBJECTTYPE,
+                              UA_NS0ID_OBJECTTYPESFOLDER, UA_NS0ID_ORGANIZES);
 
     ret |= addObjectNode(server, "EventTypes", UA_NS0ID_EVENTTYPESFOLDER, UA_NS0ID_TYPESFOLDER,
                   UA_NS0ID_ORGANIZES, UA_NS0ID_FOLDERTYPE);
@@ -264,10 +266,11 @@ createNS0_base(UA_Server *server) {
     /* Add BaseEventType */
     UA_ObjectTypeAttributes eventtype_attr = UA_ObjectTypeAttributes_default;
     eventtype_attr.displayName = UA_LOCALIZEDTEXT("", "BaseEventType");
-    ret |= addNode_raw(server, UA_NODECLASS_OBJECTTYPE, UA_NS0ID_BASEEVENTTYPE, "BaseEventType",
-                       &eventtype_attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
-    ret |= addNode_finish(server, UA_NS0ID_BASEEVENTTYPE, UA_NS0ID_EVENTTYPESFOLDER,
-                   UA_NS0ID_ORGANIZES);
+    ret |= ns0_addNode_raw(server, UA_NODECLASS_OBJECTTYPE,
+                           UA_NS0ID_BASEEVENTTYPE, "BaseEventType",
+                           &eventtype_attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
+    ret |= ns0_addNode_finish(server, UA_NS0ID_BASEEVENTTYPE,
+                              UA_NS0ID_EVENTTYPESFOLDER, UA_NS0ID_ORGANIZES);
 
     if(ret != UA_STATUSCODE_GOOD)
         ret = UA_STATUSCODE_BADINTERNALERROR;
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 205f310b4ee..7812f9f8837 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -708,7 +708,7 @@ copyChild(UA_Server *server, UA_Session *session,
             return retval;
 
         /* Add the node references */
-        retval = AddNode_addRefs(server, session, &newNodeId, destinationNodeId,
+        retval = addNode_addRefs(server, session, &newNodeId, destinationNodeId,
                                  &rd->referenceTypeId, &rd->typeDefinition.nodeId);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_NODESTORE_REMOVE(server, &newNodeId);
@@ -736,7 +736,7 @@ copyChild(UA_Server *server, UA_Session *session,
 
         /* Check if its a dynamic variable, add all type and/or interface
          * children and call the constructor */
-        retval = AddNode_finish(server, session, &newNodeId);
+        retval = addNode_finish(server, session, &newNodeId);
         if(retval != UA_STATUSCODE_GOOD) {
             deleteNode(server, newNodeId, true);
             return retval;
@@ -814,7 +814,7 @@ addTypeChildren(UA_Server *server, UA_Session *session,
 static const UA_NodeId hasSubtype = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_HASSUBTYPE}};
 
 UA_StatusCode
-AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
+addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
                 const UA_NodeId *parentNodeId, const UA_NodeId *referenceTypeId,
                 const UA_NodeId *typeDefinitionId) {
     /* Get the node */
@@ -1014,7 +1014,7 @@ AddNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
 /* Create the node and add it to the nodestore. But don't typecheck and add
  * references so far */
 UA_StatusCode
-AddNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
+addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
             const UA_AddNodesItem *item, UA_NodeId *outNewNodeId) {
     /* Do not check access for server */
     if(session != &server->adminSession && server->config.accessControl.allowAddNode) {
@@ -1175,12 +1175,12 @@ Operation_addNode_begin(UA_Server *server, UA_Session *session, void *nodeContex
         return retval;
 
     /* Create the node and add it to the nodestore */
-    retval = AddNode_raw(server, session, nodeContext, item, outNewNodeId);
+    retval = addNode_raw(server, session, nodeContext, item, outNewNodeId);
     if(retval != UA_STATUSCODE_GOOD)
         goto cleanup;
 
     /* Typecheck and add references to parent and type definition */
-    retval = AddNode_addRefs(server, session, outNewNodeId, parentNodeId,
+    retval = addNode_addRefs(server, session, outNewNodeId, parentNodeId,
                              referenceTypeId, &item->typeDefinition.nodeId);
     if(retval != UA_STATUSCODE_GOOD)
         deleteNode(server, *outNewNodeId, true);
@@ -1408,7 +1408,7 @@ checkSetIsDynamicVariable(UA_Server *server, UA_Session *session,
 
 /* Children, references, type-checking, constructors. */
 UA_StatusCode
-AddNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId) {
+addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId) {
     /* Get the node */
     const UA_Node *type = NULL;
     const UA_Node *node = UA_NODESTORE_GET(server, nodeId);
@@ -1568,7 +1568,7 @@ Operation_addNode(UA_Server *server, UA_Session *session, void *nodeContext,
         return;
 
     /* AddNodes_finish */
-    result->statusCode = AddNode_finish(server, session, &result->addedNodeId);
+    result->statusCode = addNode_finish(server, session, &result->addedNodeId);
 
     /* If finishing failed, the node was deleted */
     if(result->statusCode != UA_STATUSCODE_GOOD)
@@ -1648,12 +1648,12 @@ __UA_Server_addNode(UA_Server *server, const UA_NodeClass nodeClass,
 }
 
 UA_StatusCode
-UA_Server_addNode_begin(UA_Server *server, const UA_NodeClass nodeClass,
-                        const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
-                        const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
-                        const UA_NodeId typeDefinition, const void *attr,
-                        const UA_DataType *attributeType, void *nodeContext,
-                        UA_NodeId *outNewNodeId) {
+addNode_begin(UA_Server *server, const UA_NodeClass nodeClass,
+              const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
+              const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
+              const UA_NodeId typeDefinition, const void *attr,
+              const UA_DataType *attributeType, void *nodeContext,
+              UA_NodeId *outNewNodeId) {
     UA_AddNodesItem item;
     UA_AddNodesItem_init(&item);
     item.nodeClass = nodeClass;
@@ -1662,19 +1662,30 @@ UA_Server_addNode_begin(UA_Server *server, const UA_NodeClass nodeClass,
     item.typeDefinition.nodeId = typeDefinition;
     UA_ExtensionObject_setValueNoDelete(&item.nodeAttributes,
                                         (void*)(uintptr_t)attr, attributeType);
+    return Operation_addNode_begin(server, &server->adminSession, nodeContext, &item,
+                                   &parentNodeId, &referenceTypeId, outNewNodeId);
+}
 
+UA_StatusCode
+UA_Server_addNode_begin(UA_Server *server, const UA_NodeClass nodeClass,
+                        const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
+                        const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
+                        const UA_NodeId typeDefinition, const void *attr,
+                        const UA_DataType *attributeType, void *nodeContext,
+                        UA_NodeId *outNewNodeId) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode retval =
-        Operation_addNode_begin(server, &server->adminSession, nodeContext, &item,
-                                &parentNodeId, &referenceTypeId, outNewNodeId);
+    UA_StatusCode res =
+        addNode_begin(server, nodeClass, requestedNewNodeId, parentNodeId,
+                      referenceTypeId, browseName, typeDefinition, attr,
+                      attributeType, nodeContext, outNewNodeId);
     UA_UNLOCK(&server->serviceMutex);
-    return retval;
+    return res;
 }
 
 UA_StatusCode
 UA_Server_addNode_finish(UA_Server *server, const UA_NodeId nodeId) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode retval = AddNode_finish(server, &server->adminSession, &nodeId);
+    UA_StatusCode retval = addNode_finish(server, &server->adminSession, &nodeId);
     UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
@@ -2379,7 +2390,7 @@ UA_Server_addDataSourceVariableNode(UA_Server *server, const UA_NodeId requested
 
     UA_LOCK(&server->serviceMutex);
     /* Create the node and add it to the nodestore */
-    UA_StatusCode retval = AddNode_raw(server, &server->adminSession, nodeContext,
+    UA_StatusCode retval = addNode_raw(server, &server->adminSession, nodeContext,
                                        &item, outNewNodeId);
     if(retval != UA_STATUSCODE_GOOD)
         goto cleanup;
@@ -2390,13 +2401,13 @@ UA_Server_addDataSourceVariableNode(UA_Server *server, const UA_NodeId requested
         goto cleanup;
 
     /* Typecheck and add references to parent and type definition */
-    retval = AddNode_addRefs(server, &server->adminSession, outNewNodeId, &parentNodeId,
+    retval = addNode_addRefs(server, &server->adminSession, outNewNodeId, &parentNodeId,
                              &referenceTypeId, &typeDefinition);
     if(retval != UA_STATUSCODE_GOOD)
         goto cleanup;
 
     /* Call the constructors */
-    retval = AddNode_finish(server, &server->adminSession, outNewNodeId);
+    retval = addNode_finish(server, &server->adminSession, outNewNodeId);
 
  cleanup:
     UA_UNLOCK(&server->serviceMutex);
@@ -2611,7 +2622,7 @@ UA_Server_addMethodNodeEx_finish(UA_Server *server, const UA_NodeId nodeId,
         goto error;
 
     /* Call finish to add the parent reference */
-    retval = AddNode_finish(server, &server->adminSession, &nodeId);
+    retval = addNode_finish(server, &server->adminSession, &nodeId);
     if(retval != UA_STATUSCODE_GOOD)
         goto error;
 
@@ -2651,38 +2662,34 @@ UA_Server_addMethodNode_finish(UA_Server *server, const UA_NodeId nodeId,
 }
 
 UA_StatusCode
-UA_Server_addMethodNodeEx(UA_Server *server, const UA_NodeId requestedNewNodeId,
-                          const UA_NodeId parentNodeId,
-                          const UA_NodeId referenceTypeId,
-                          const UA_QualifiedName browseName,
-                          const UA_MethodAttributes attr, UA_MethodCallback method,
-                          size_t inputArgumentsSize, const UA_Argument *inputArguments,
-                          const UA_NodeId inputArgumentsRequestedNewNodeId,
-                          UA_NodeId *inputArgumentsOutNewNodeId,
-                          size_t outputArgumentsSize, const UA_Argument *outputArguments,
-                          const UA_NodeId outputArgumentsRequestedNewNodeId,
-                          UA_NodeId *outputArgumentsOutNewNodeId,
-                          void *nodeContext, UA_NodeId *outNewNodeId) {
+addMethodNode(UA_Server *server, const UA_NodeId requestedNewNodeId,
+              const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+              const UA_QualifiedName browseName,
+              const UA_MethodAttributes *attr, UA_MethodCallback method,
+              size_t inputArgumentsSize, const UA_Argument *inputArguments,
+              const UA_NodeId inputArgumentsRequestedNewNodeId,
+              UA_NodeId *inputArgumentsOutNewNodeId,
+              size_t outputArgumentsSize, const UA_Argument *outputArguments,
+              const UA_NodeId outputArgumentsRequestedNewNodeId,
+              UA_NodeId *outputArgumentsOutNewNodeId,
+              void *nodeContext, UA_NodeId *outNewNodeId) {
     UA_AddNodesItem item;
     UA_AddNodesItem_init(&item);
     item.nodeClass = UA_NODECLASS_METHOD;
     item.requestedNewNodeId.nodeId = requestedNewNodeId;
     item.browseName = browseName;
-    UA_ExtensionObject_setValueNoDelete(&item.nodeAttributes, (void*)(uintptr_t)&attr,
+    UA_ExtensionObject_setValueNoDelete(&item.nodeAttributes, (void*)(uintptr_t)attr,
                                         &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
     UA_NodeId newId;
     if(!outNewNodeId) {
         UA_NodeId_init(&newId);
         outNewNodeId = &newId;
     }
-    UA_LOCK(&server->serviceMutex);
     UA_StatusCode retval = Operation_addNode_begin(server, &server->adminSession,
                                                    nodeContext, &item, &parentNodeId,
                                                    &referenceTypeId, outNewNodeId);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&server->serviceMutex);
+    if(retval != UA_STATUSCODE_GOOD)
         return retval;
-    }
 
     retval = UA_Server_addMethodNodeEx_finish(server, *outNewNodeId, method,
                                               inputArgumentsSize, inputArguments,
@@ -2691,12 +2698,40 @@ UA_Server_addMethodNodeEx(UA_Server *server, const UA_NodeId requestedNewNodeId,
                                               outputArgumentsSize, outputArguments,
                                               outputArgumentsRequestedNewNodeId,
                                               outputArgumentsOutNewNodeId);
-    UA_UNLOCK(&server->serviceMutex);
     if(outNewNodeId == &newId)
         UA_NodeId_clear(&newId);
     return retval;
 }
 
+UA_StatusCode
+UA_Server_addMethodNodeEx(UA_Server *server, const UA_NodeId requestedNewNodeId,
+                          const UA_NodeId parentNodeId,
+                          const UA_NodeId referenceTypeId,
+                          const UA_QualifiedName browseName,
+                          const UA_MethodAttributes attr, UA_MethodCallback method,
+                          size_t inputArgumentsSize, const UA_Argument *inputArguments,
+                          const UA_NodeId inputArgumentsRequestedNewNodeId,
+                          UA_NodeId *inputArgumentsOutNewNodeId,
+                          size_t outputArgumentsSize, const UA_Argument *outputArguments,
+                          const UA_NodeId outputArgumentsRequestedNewNodeId,
+                          UA_NodeId *outputArgumentsOutNewNodeId,
+                          void *nodeContext, UA_NodeId *outNewNodeId) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = addMethodNode(server, requestedNewNodeId,
+                                      parentNodeId, referenceTypeId,
+                                      browseName, &attr, method,
+                                      inputArgumentsSize, inputArguments,
+                                      inputArgumentsRequestedNewNodeId,
+                                      inputArgumentsOutNewNodeId,
+                                      outputArgumentsSize,
+                                      outputArguments,
+                                      outputArgumentsRequestedNewNodeId,
+                                      outputArgumentsOutNewNodeId,
+                                      nodeContext, outNewNodeId);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 static UA_StatusCode
 editMethodCallback(UA_Server *server, UA_Session* session,
                    UA_Node *node, UA_MethodCallback methodCallback) {
@@ -2762,8 +2797,8 @@ UA_Server_setAdminSessionContext(UA_Server *server,
 }
 
 static UA_StatusCode
-setNodeTypeLifecycle(UA_Server *server, UA_Session *session,
-                     UA_Node *node, UA_NodeTypeLifecycle *lifecycle) {
+setNodeTypeLifecycleCallback(UA_Server *server, UA_Session *session,
+                             UA_Node *node, UA_NodeTypeLifecycle *lifecycle) {
     if(node->head.nodeClass == UA_NODECLASS_OBJECTTYPE) {
         node->objectTypeNode.lifecycle = *lifecycle;
     } else if(node->head.nodeClass == UA_NODECLASS_VARIABLETYPE) {
@@ -2774,13 +2809,19 @@ setNodeTypeLifecycle(UA_Server *server, UA_Session *session,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+setNodeTypeLifecycle(UA_Server *server, UA_NodeId nodeId,
+                     UA_NodeTypeLifecycle lifecycle) {
+    return UA_Server_editNode(server, &server->adminSession, &nodeId,
+                              (UA_EditNodeCallback)setNodeTypeLifecycleCallback,
+                              &lifecycle);
+}
+
 UA_StatusCode
 UA_Server_setNodeTypeLifecycle(UA_Server *server, UA_NodeId nodeId,
                                UA_NodeTypeLifecycle lifecycle) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode retval = UA_Server_editNode(server, &server->adminSession, &nodeId,
-                                             (UA_EditNodeCallback)setNodeTypeLifecycle,
-                                              &lifecycle);
+    UA_StatusCode retval = setNodeTypeLifecycle(server, nodeId, lifecycle);
     UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index ff5662f9f00..243b30d57ae 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -2463,7 +2463,7 @@ addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
                     const UA_NodeId conditionSource, const UA_NodeId hierarchialReferenceType) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_StatusCode retval = AddNode_finish(server, &server->adminSession, &conditionId);
+    UA_StatusCode retval = addNode_finish(server, &server->adminSession, &conditionId);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Finish node failed",);
 
     /* Make sure the ConditionSource has HasEventSource or one of its SubTypes ReferenceType */

From 65e38d1b23760bd5d9e9fb3c6f1136eda6888cfb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 4 Jan 2023 21:56:57 +0100
Subject: [PATCH 0635/1963] feat(pubsub): Make PubSub ns0 representation
 thread-safe

---
 src/pubsub/ua_pubsub.h                        |   47 +
 src/pubsub/ua_pubsub_manager.c                |  119 +-
 src/pubsub/ua_pubsub_ns0.c                    | 1006 ++++++++++-------
 src/pubsub/ua_pubsub_ns0.h                    |   26 +-
 src/pubsub/ua_pubsub_reader.c                 |   21 +-
 src/pubsub/ua_pubsub_readergroup.c            |   52 +-
 src/pubsub/ua_pubsub_securitygroup.c          |    2 +-
 src/pubsub/ua_pubsub_writer.c                 |   16 +-
 src/pubsub/ua_pubsub_writergroup.c            |  132 ++-
 src/server/ua_server.c                        |    6 +-
 src/server/ua_server_internal.h               |   18 +-
 src/server/ua_services_nodemanagement.c       |   22 +-
 tests/pubsub/check_pubsub_get_state.c         |    3 +
 tests/pubsub/check_pubsub_publisherid.c       |    3 +
 .../check_pubsub_subscribe_msgrcvtimeout.c    |   61 +-
 15 files changed, 947 insertions(+), 587 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 7edc05e316e..fb4accdfe99 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -139,6 +139,11 @@ UA_PubSubConnection *
 UA_PubSubConnection_findConnectionbyId(UA_Server *server,
                                        UA_NodeId connectionIdentifier);
 
+UA_StatusCode
+UA_PubSubConnection_create(UA_Server *server,
+                           const UA_PubSubConnectionConfig *connectionConfig,
+                           UA_NodeId *connectionIdentifier);
+
 void
 UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig);
 
@@ -232,6 +237,12 @@ UA_StatusCode
 UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
                         UA_DataSetWriter *dataSetWriter);
 
+UA_StatusCode
+UA_DataSetWriter_create(UA_Server *server,
+                        const UA_NodeId writerGroup, const UA_NodeId dataSet,
+                        const UA_DataSetWriterConfig *dataSetWriterConfig,
+                        UA_NodeId *writerIdentifier);
+
 UA_StatusCode
 removeDataSetWriter(UA_Server *server, const UA_NodeId dsw);
 
@@ -296,6 +307,11 @@ struct UA_WriterGroup {
 #endif
 };
 
+UA_StatusCode
+UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
+                      const UA_WriterGroupConfig *writerGroupConfig,
+                      UA_NodeId *writerGroupIdentifier);
+
 UA_StatusCode
 removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup);
 
@@ -306,12 +322,22 @@ UA_WriterGroupConfig_copy(const UA_WriterGroupConfig *src,
 UA_WriterGroup *
 UA_WriterGroup_findWGbyId(UA_Server *server, UA_NodeId identifier);
 
+UA_StatusCode
+UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg);
+
+UA_StatusCode
+UA_WriterGroup_unfreezeConfiguration(UA_Server *server, UA_WriterGroup *wg);
+
 UA_StatusCode
 UA_WriterGroup_setPubSubState(UA_Server *server,
                               UA_WriterGroup *writerGroup,
                               UA_PubSubState state,
                               UA_StatusCode cause);
 
+UA_StatusCode
+UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
+                            const UA_WriterGroupConfig *config);
+
 #define UA_LOG_WRITERGROUP_INTERNAL(LOGGER, LEVEL, WRITERGROUP, MSG, ...) \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
         UA_String idStr = UA_STRING_NULL;                               \
@@ -398,6 +424,11 @@ UA_DataSetReader_process(UA_Server *server,
                          UA_DataSetReader *dataSetReader,
                          UA_DataSetMessage *dataSetMsg);
 
+UA_StatusCode
+UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
+                        const UA_DataSetReaderConfig *dataSetReaderConfig,
+                        UA_NodeId *readerIdentifier);
+
 UA_StatusCode
 removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier);
 
@@ -419,6 +450,11 @@ void UA_TargetVariables_clear(UA_TargetVariables *subscribedDataSetTarget);
 UA_StatusCode UA_FieldTargetVariable_copy(const UA_FieldTargetVariable *src,
                                           UA_FieldTargetVariable *dst);
 
+UA_StatusCode
+DataSetReader_createTargetVariables(UA_Server *server, UA_DataSetReader *dsr,
+                                    size_t targetVariablesSize,
+                                    const UA_FieldTargetVariable *targetVariables);
+
 UA_StatusCode
 UA_DataSetReader_setPubSubState(UA_Server *server,
                                 UA_DataSetReader *dataSetReader,
@@ -494,6 +530,11 @@ struct UA_ReaderGroup {
 #endif
 };
 
+UA_StatusCode
+UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
+                      const UA_ReaderGroupConfig *readerGroupConfig,
+                      UA_NodeId *readerGroupIdentifier);
+
 UA_StatusCode
 removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier);
 
@@ -509,6 +550,12 @@ UA_ReaderGroup_findRGbyId(UA_Server *server, UA_NodeId identifier);
 UA_DataSetReader *
 UA_ReaderGroup_findDSRbyId(UA_Server *server, UA_NodeId identifier);
 
+UA_StatusCode
+UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg);
+
+UA_StatusCode
+UA_ReaderGroup_unfreezeConfiguration(UA_Server *server, UA_ReaderGroup *rg);
+
 UA_StatusCode
 UA_ReaderGroup_setPubSubState(UA_Server *server,
                               UA_ReaderGroup *readerGroup,
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 72ad77018f5..2d1c2648bd5 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -330,19 +330,21 @@ assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnection
 }
 
 UA_StatusCode
-UA_Server_addPubSubConnection(UA_Server *server,
-                              const UA_PubSubConnectionConfig *connectionConfig,
-                              UA_NodeId *connectionIdentifier) {
-
-    /* validate preconditions */
+UA_PubSubConnection_create(UA_Server *server,
+                          const UA_PubSubConnectionConfig *connectionConfig,
+                          UA_NodeId *connectionIdentifier) {
+    /* Validate preconditions */
     UA_CHECK_MEM(server, return UA_STATUSCODE_BADINTERNALERROR);
-    UA_CHECK_MEM_ERROR(connectionConfig, return UA_STATUSCODE_BADINTERNALERROR, &server->config.logger,
-                       UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. No connection configuration supplied.");
+    UA_CHECK_MEM_ERROR(connectionConfig, return UA_STATUSCODE_BADINTERNALERROR,
+                       &server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection creation failed. No connection configuration supplied.");
 
     /* Retrieve the transport layer for the given profile uri */
-    UA_PubSubTransportLayer *tl = UA_getTransportProtocolLayer(server, &connectionConfig->transportProfileUri);
-    UA_CHECK_MEM_ERROR(tl, return UA_STATUSCODE_BADNOTFOUND, &server->config.logger,
-                       UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. Requested transport layer not found.");
+    UA_PubSubTransportLayer *tl =
+        UA_getTransportProtocolLayer(server, &connectionConfig->transportProfileUri);
+    UA_CHECK_MEM_ERROR(tl, return UA_STATUSCODE_BADNOTFOUND,
+                       &server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection creation failed. Requested transport layer not found.");
 
     /* create and add new connection from connection config */
     UA_PubSubConnection *newConnectionsField = NULL;
@@ -360,14 +362,17 @@ UA_Server_addPubSubConnection(UA_Server *server,
 
     /* Open the communication channel */
     newConnectionsField->channel = tl->createPubSubChannel(tl, &ctx);
-    UA_CHECK_MEM(newConnectionsField->channel, return channelErrorHandling(server, newConnectionsField));
+    UA_CHECK_MEM(newConnectionsField->channel,
+                 return channelErrorHandling(server, newConnectionsField));
 
 #ifdef UA_ENABLE_PUBSUB_MQTT
     /* If the transport layer is MQTT, attach the server pointer to the callback function
      * that is called when a PUBLISH is received. */
-    const UA_String transport_uri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+    const UA_String transport_uri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
     if(UA_String_equal(&newConnectionsField->config->transportProfileUri, &transport_uri)) {
-        UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *)newConnectionsField->channel->handle;
+        UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *)
+            newConnectionsField->channel->handle;
         struct mqtt_client* client = (struct mqtt_client*)channelDataMQTT->mqttClient;
         client->publish_response_callback_state = server;
     }
@@ -378,6 +383,16 @@ UA_Server_addPubSubConnection(UA_Server *server,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_addPubSubConnection(UA_Server *server,
+                              const UA_PubSubConnectionConfig *connectionConfig,
+                              UA_NodeId *connectionIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = UA_PubSubConnection_create(server, connectionConfig, connectionIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
     /* Find the connection */
@@ -391,7 +406,7 @@ removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
     LIST_FOREACH_SAFE(writerGroup, &c->writerGroups, listEntry, tmpWriterGroup) {
         UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
                                       UA_STATUSCODE_BADSHUTDOWN);
-        UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup->identifier);
+        UA_WriterGroup_unfreezeConfiguration(server, writerGroup);
         removeWriterGroup(server, writerGroup->identifier);
     }
 
@@ -400,13 +415,13 @@ removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
     LIST_FOREACH_SAFE(readerGroup, &c->readerGroups, listEntry, tmpReaderGroup) {
         UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
                                       UA_STATUSCODE_BADSHUTDOWN);
-        UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup->identifier);
+        UA_ReaderGroup_unfreezeConfiguration(server, readerGroup);
         removeReaderGroup(server, readerGroup->identifier);
     }
 
     /* Remove from the information model */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    removePubSubConnectionRepresentation(server, c);
+    deleteNode(server, c->identifier, true);
 #endif
 
     /* Unlink from the server */
@@ -429,7 +444,10 @@ UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection)
 }
 
 UA_StatusCode
-UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier, const UA_ReaderGroupConfig *readerGroupConfig) {
+UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier,
+                           const UA_ReaderGroupConfig *readerGroupConfig) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_PubSubConnection *connection =
         UA_PubSubConnection_findConnectionbyId(server, *connectionIdentifier);
     if(!connection)
@@ -456,10 +474,12 @@ UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier, c
     return retval;
 }
 
-UA_AddPublishedDataSetResult
-UA_Server_addPublishedDataSet(UA_Server *server,
-                              const UA_PublishedDataSetConfig *publishedDataSetConfig,
-                              UA_NodeId *pdsIdentifier) {
+static UA_AddPublishedDataSetResult
+addPublishedDataSet(UA_Server *server,
+                    const UA_PublishedDataSetConfig *publishedDataSetConfig,
+                    UA_NodeId *pdsIdentifier) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_AddPublishedDataSetResult result = {UA_STATUSCODE_BADINVALIDARGUMENT, 0, NULL, {0, 0}};
     if(!publishedDataSetConfig){
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -473,16 +493,14 @@ UA_Server_addPublishedDataSet(UA_Server *server,
         return result;
     }
 
-    if(UA_String_isEmpty(&publishedDataSetConfig->name))
-    {
+    if(UA_String_isEmpty(&publishedDataSetConfig->name)) {
         // DataSet has to have a valid name
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "PublishedDataSet creation failed. Invalid name.");
         return result;
     }
 
-    if(UA_PublishedDataSet_findPDSbyName(server, publishedDataSetConfig->name))
-    {
+    if(UA_PublishedDataSet_findPDSbyName(server, publishedDataSetConfig->name)) {
         // DataSet name has to be unique in the publisher
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "PublishedDataSet creation failed. DataSet with the same name already exists.");
@@ -576,6 +594,17 @@ UA_Server_addPublishedDataSet(UA_Server *server,
     return result;
 }
 
+UA_AddPublishedDataSetResult
+UA_Server_addPublishedDataSet(UA_Server *server,
+                              const UA_PublishedDataSetConfig *publishedDataSetConfig,
+                              UA_NodeId *pdsIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_AddPublishedDataSetResult res =
+        addPublishedDataSet(server, publishedDataSetConfig, pdsIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 static UA_StatusCode
 removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
     //search the identified PublishedDataSet and store the PDS index
@@ -602,9 +631,11 @@ removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
             }
         }
     }
+
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    removePublishedDataSetRepresentation(server, publishedDataSet);
+    deleteNode(server, publishedDataSet->identifier, true);
 #endif
+
     UA_PublishedDataSet_clear(server, publishedDataSet);
     server->pubSubManager.publishedDataSetsSize--;
 
@@ -628,10 +659,14 @@ UA_PubSubConfigurationVersionTimeDifference(void) {
     UA_UInt32 timeDiffSince2000 = (UA_UInt32) (UA_DateTime_now() - UA_DATETIMESTAMP_2000);
     return timeDiffSince2000;
 }
-UA_StatusCode
-UA_Server_addStandaloneSubscribedDataSet(UA_Server *server, const UA_StandaloneSubscribedDataSetConfig *subscribedDataSetConfig,
-                              UA_NodeId *sdsIdentifier) {
-    if(!subscribedDataSetConfig){
+
+static UA_StatusCode
+addStandaloneSubscribedDataSet(UA_Server *server,
+                               const UA_StandaloneSubscribedDataSetConfig *sdsConfig,
+                               UA_NodeId *sdsIdentifier) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    if(!sdsConfig){
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "SubscribedDataSet creation failed. No config passed in.");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -639,7 +674,7 @@ UA_Server_addStandaloneSubscribedDataSet(UA_Server *server, const UA_StandaloneS
 
     UA_StandaloneSubscribedDataSetConfig tmpSubscribedDataSetConfig;
     memset(&tmpSubscribedDataSetConfig, 0, sizeof(UA_StandaloneSubscribedDataSetConfig));
-    if(UA_StandaloneSubscribedDataSetConfig_copy(subscribedDataSetConfig, &tmpSubscribedDataSetConfig) != UA_STATUSCODE_GOOD){
+    if(UA_StandaloneSubscribedDataSetConfig_copy(sdsConfig, &tmpSubscribedDataSetConfig) != UA_STATUSCODE_GOOD){
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "SubscribedDataSet creation failed. Configuration copy failed.");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -671,16 +706,28 @@ UA_Server_addStandaloneSubscribedDataSet(UA_Server *server, const UA_StandaloneS
     UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager, &newSubscribedDataSet->identifier);
 #endif
 
-    if(sdsIdentifier){
+    if(sdsIdentifier)
         UA_NodeId_copy(&newSubscribedDataSet->identifier, sdsIdentifier);
-    }
 
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_addStandaloneSubscribedDataSet(UA_Server *server,
+                                         const UA_StandaloneSubscribedDataSetConfig *sdsConfig,
+                                         UA_NodeId *sdsIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = addStandaloneSubscribedDataSet(server, sdsConfig, sdsIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 static UA_StatusCode
 removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
-    UA_StandaloneSubscribedDataSet *subscribedDataSet = UA_StandaloneSubscribedDataSet_findSDSbyId(server, sds);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    UA_StandaloneSubscribedDataSet *subscribedDataSet =
+        UA_StandaloneSubscribedDataSet_findSDSbyId(server, sds);
     if(!subscribedDataSet){
         return UA_STATUSCODE_BADNOTFOUND;
     }
@@ -699,9 +746,11 @@ removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
             }
         }
     }
+
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    removeStandaloneSubscribedDataSetRepresentation(server, subscribedDataSet);
+    deleteNode(server, subscribedDataSet->identifier, true);
 #endif
+
     UA_StandaloneSubscribedDataSet_clear(server, subscribedDataSet);
     server->pubSubManager.subscribedDataSetsSize--;
 
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 74fef37b2bc..744b192ec47 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -25,16 +25,18 @@ typedef struct {
 
 static UA_StatusCode
 writePubSubNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
-                      size_t length, const UA_DataType *type) {
+                            size_t length, const UA_DataType *type) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_Variant var;
     UA_Variant_init(&var);
     UA_Variant_setArray(&var, v, length, type);
-    return UA_Server_writeValue(server, UA_NODEID_NUMERIC(0, id), var);
+    return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
 }
 
 static UA_NodeId
 findSingleChildNode(UA_Server *server, UA_QualifiedName targetName,
                     UA_NodeId referenceTypeId, UA_NodeId startingNode){
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_NodeId resultNodeId;
     UA_RelativePathElement rpe;
     UA_RelativePathElement_init(&rpe);
@@ -47,7 +49,7 @@ findSingleChildNode(UA_Server *server, UA_QualifiedName targetName,
     bp.startingNode = startingNode;
     bp.relativePath.elementsSize = 1;
     bp.relativePath.elements = &rpe;
-    UA_BrowsePathResult bpr = UA_Server_translateBrowsePathToNodeIds(server, &bp);
+    UA_BrowsePathResult bpr = translateBrowsePathToNodeIds(server, &bp);
     if(bpr.statusCode != UA_STATUSCODE_GOOD ||
        bpr.targetsSize < 1)
         return UA_NODEID_NULL;
@@ -61,16 +63,20 @@ findSingleChildNode(UA_Server *server, UA_QualifiedName targetName,
 }
 
 static void
-onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
-       const UA_NodeId *nodeid, void *context,
-       const UA_NumericRange *range, const UA_DataValue *data) {
-    UA_Variant value;
-    UA_Variant_init(&value);
+onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
+             const UA_NodeId *nodeid, void *context,
+             const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     const UA_NodePropertyContext *nodeContext = (const UA_NodePropertyContext*)context;
     const UA_NodeId *myNodeId = &nodeContext->parentNodeId;
+
     UA_PublishedVariableDataType *pvd = NULL;
     UA_PublishedDataSet *publishedDataSet = NULL;
 
+    UA_Variant value;
+    UA_Variant_init(&value);
+
     switch(nodeContext->parentClassifier){
     case UA_NS0ID_PUBSUBCONNECTIONTYPE: {
         UA_PubSubConnection *pubSubConnection =
@@ -168,8 +174,10 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
             UA_DataSetField *field;
             TAILQ_FOREACH(field, &publishedDataSet->fields, listEntry) {
                 pvd[counter].attributeId = UA_ATTRIBUTEID_VALUE;
-                pvd[counter].publishedVariable = field->config.field.variable.publishParameters.publishedVariable;
-                //UA_NodeId_copy(&field->config.field.variable.publishParameters.publishedVariable, &pvd[counter].publishedVariable);
+                pvd[counter].publishedVariable =
+                    field->config.field.variable.publishParameters.publishedVariable;
+                //UA_NodeId_copy(&field->config.field.variable.publishParameters.publishedVariable,
+                //               &pvd[counter].publishedVariable);
                 counter++;
             }
             UA_Variant_setArray(&value, pvd, publishedDataSet->fieldSize,
@@ -177,7 +185,8 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
             break;
         }
         case UA_NS0ID_PUBLISHEDDATAITEMSTYPE_DATASETMETADATA: {
-            UA_Variant_setScalar(&value, &publishedDataSet->dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
+            UA_Variant_setScalar(&value, &publishedDataSet->dataSetMetaData,
+                                 &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
             break;
         }
         case UA_NS0ID_PUBLISHEDDATAITEMSTYPE_CONFIGURATIONVERSION: {
@@ -192,14 +201,17 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
         break;
     }    
     case UA_NS0ID_STANDALONESUBSCRIBEDDATASETREFDATATYPE: {
-        UA_StandaloneSubscribedDataSet *sds = UA_StandaloneSubscribedDataSet_findSDSbyId(server, *myNodeId);
+        UA_StandaloneSubscribedDataSet *sds =
+            UA_StandaloneSubscribedDataSet_findSDSbyId(server, *myNodeId);
         switch(nodeContext->elementClassiefier) {
             case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_ISCONNECTED: {
-                UA_Variant_setScalar(&value, &sds->config.isConnected, &UA_TYPES[UA_TYPES_BOOLEAN]);
+                UA_Variant_setScalar(&value, &sds->config.isConnected,
+                                     &UA_TYPES[UA_TYPES_BOOLEAN]);
                 break;
             }
             case UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_DATASETMETADATA: {
-                UA_Variant_setScalar(&value, &sds->config.dataSetMetaData, &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
+                UA_Variant_setScalar(&value, &sds->config.dataSetMetaData,
+                                     &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
                 break;
             }
             default:
@@ -212,36 +224,54 @@ onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Read error! Unknown parent element.");
     }
-    UA_Server_writeValue(server, *nodeid, value);
+
+    writeValueAttribute(server, *nodeid, &value);
     if(pvd && publishedDataSet) {
-        UA_Array_delete(pvd, publishedDataSet->fieldSize, &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]);
+        UA_Array_delete(pvd, publishedDataSet->fieldSize,
+                        &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]);
     }
 }
 
 static void
-onWrite(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
-        const UA_NodeId *nodeId, void *nodeContext,
-        const UA_NumericRange *range, const UA_DataValue *data){
-    UA_Variant value;
-    UA_NodeId myNodeId;
+onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
+       const UA_NodeId *nodeid, void *context,
+       const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK(&server->serviceMutex);
+    onReadLocked(server, sessionId, sessionContext, nodeid, context, range, data);
+    UA_UNLOCK(&server->serviceMutex);
+}
+
+static void
+onWriteLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
+              const UA_NodeId *nodeId, void *nodeContext,
+              const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_NodePropertyContext *npc = (UA_NodePropertyContext *)nodeContext;
+
     UA_WriterGroup *writerGroup = NULL;
-    switch(((UA_NodePropertyContext *) nodeContext)->parentClassifier){
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    switch(npc->parentClassifier) {
         case UA_NS0ID_PUBSUBCONNECTIONTYPE:
             //no runtime writable attributes
             break;
-        case UA_NS0ID_WRITERGROUPTYPE:
-            myNodeId = ((UA_NodePropertyContext *) nodeContext)->parentNodeId;
-            writerGroup = UA_WriterGroup_findWGbyId(server, myNodeId);
-            UA_WriterGroupConfig writerGroupConfig;
-            memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+        case UA_NS0ID_WRITERGROUPTYPE: {
+            writerGroup = UA_WriterGroup_findWGbyId(server, npc->parentNodeId);
             if(!writerGroup)
                 return;
-            switch(((UA_NodePropertyContext *) nodeContext)->elementClassiefier){
+            UA_WriterGroupConfig writerGroupConfig;
+            memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+            switch(npc->elementClassiefier) {
                 case UA_NS0ID_WRITERGROUPTYPE_PUBLISHINGINTERVAL:
-                    UA_Server_getWriterGroupConfig(server, writerGroup->identifier, &writerGroupConfig);
+                    if(!UA_Variant_hasScalarType(&data->value, &UA_TYPES[UA_TYPES_DURATION]) &&
+                       !UA_Variant_hasScalarType(&data->value, &UA_TYPES[UA_TYPES_DOUBLE])) {
+                        res = UA_STATUSCODE_BADTYPEMISMATCH;
+                        goto cleanup;
+                    }
+                    res = UA_WriterGroupConfig_copy(&writerGroup->config, &writerGroupConfig);
+                    if(res != UA_STATUSCODE_GOOD)
+                        goto cleanup;
                     writerGroupConfig.publishingInterval = *((UA_Duration *) data->value.data);
-                    UA_Server_updateWriterGroupConfig(server, writerGroup->identifier, &writerGroupConfig);
-                    UA_Variant_setScalar(&value, data->value.data, &UA_TYPES[UA_TYPES_DURATION]);
+                    UA_WriterGroup_updateConfig(server, writerGroup, &writerGroupConfig);
                     UA_WriterGroupConfig_clear(&writerGroupConfig);
                     break;
                 default:
@@ -249,23 +279,44 @@ onWrite(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
                                    "Write error! Unknown property element.");
             }
             break;
+        }
         default:
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown parent element.");
     }
+
+ cleanup:
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "Changing the ReaderGroupConfig failed with status %s",
+                       UA_StatusCode_name(res));
+    }
+}
+
+static void
+onWrite(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
+        const UA_NodeId *nodeId, void *nodeContext,
+        const UA_NumericRange *range, const UA_DataValue *data) {
+    UA_LOCK(&server->serviceMutex);
+    onWriteLocked(server, sessionId, sessionContext, nodeId, nodeContext, range, data);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 static UA_StatusCode
 addVariableValueSource(UA_Server *server, UA_ValueCallback valueCallback,
                        UA_NodeId node, UA_NodePropertyContext *context){
-    UA_Server_setNodeContext(server, node, context);
-    return UA_Server_setVariableNode_valueCallback(server, node, valueCallback);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    setNodeContext(server, node, context);
+    return setVariableNode_valueCallback(server, node, valueCallback);
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
+
 static UA_StatusCode
 addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsubConnection,
-                          UA_NodeId *connectionId){
+                          UA_NodeId *connectionId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_NetworkAddressUrlDataType networkAddressUrl;
     memset(&networkAddressUrl, 0, sizeof(networkAddressUrl));
@@ -304,13 +355,15 @@ addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsub
         connectionConfig.publisherId.uint64 = *((UA_UInt64*)pubsubConnection->publisherId.data);
     } else if (pubsubConnection->publisherId.type == &UA_TYPES[UA_TYPES_STRING]) {
         connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_STRING;
-        UA_String_copy((UA_String *) pubsubConnection->publisherId.data, &connectionConfig.publisherId.string);
+        UA_String_copy((UA_String *) pubsubConnection->publisherId.data,
+                       &connectionConfig.publisherId.string);
     } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Unsupported PublisherId Type used.");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Unsupported PublisherId Type used.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, connectionId);
+    retVal |= UA_PubSubConnection_create(server, &connectionConfig, connectionId);
     UA_NetworkAddressUrlDataType_clear(&networkAddressUrl);
     return retVal;
 }
@@ -323,6 +376,8 @@ addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsub
 static UA_StatusCode
 addWriterGroupConfig(UA_Server *server, UA_NodeId connectionId,
                      UA_WriterGroupDataType *writerGroup, UA_NodeId *writerGroupId){
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Now we create a new WriterGroupConfig and add the group to the existing
      * PubSubConnection. */
     UA_WriterGroupConfig writerGroupConfig;
@@ -349,7 +404,7 @@ addWriterGroupConfig(UA_Server *server, UA_NodeId connectionId,
         }
     }
 
-    return UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, writerGroupId);
+    return UA_WriterGroup_create(server, connectionId, &writerGroupConfig, writerGroupId);
 }
 
 /**
@@ -362,6 +417,8 @@ static UA_StatusCode
 addDataSetWriterConfig(UA_Server *server, const UA_NodeId *writerGroupId,
                        UA_DataSetWriterDataType *dataSetWriter,
                        UA_NodeId *dataSetWriterId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_NodeId publishedDataSetId = UA_NODEID_NULL;
     UA_PublishedDataSet *tmpPDS;
     TAILQ_FOREACH(tmpPDS, &server->pubSubManager.publishedDataSets, listEntry){
@@ -382,8 +439,8 @@ addDataSetWriterConfig(UA_Server *server, const UA_NodeId *writerGroupId,
     dataSetWriterConfig.dataSetWriterId = dataSetWriter->dataSetWriterId;
     dataSetWriterConfig.keyFrameCount = dataSetWriter->keyFrameCount;
     dataSetWriterConfig.dataSetFieldContentMask =  dataSetWriter->dataSetFieldContentMask;
-    return UA_Server_addDataSetWriter(server, *writerGroupId, publishedDataSetId,
-                                      &dataSetWriterConfig, dataSetWriterId);
+    return UA_DataSetWriter_create(server, *writerGroupId, publishedDataSetId,
+                                   &dataSetWriterConfig, dataSetWriterId);
 }
 
 /**
@@ -397,11 +454,13 @@ static UA_StatusCode
 addReaderGroupConfig(UA_Server *server, UA_NodeId connectionId,
                      UA_ReaderGroupDataType *readerGroup,
                      UA_NodeId *readerGroupId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_ReaderGroupConfig readerGroupConfig;
     memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name = readerGroup->name;
-    return UA_Server_addReaderGroup(server, connectionId,
-                                    &readerGroupConfig, readerGroupId);
+    return UA_ReaderGroup_create(server, connectionId,
+                                 &readerGroupConfig, readerGroupId);
 }
 
 /**
@@ -413,6 +472,8 @@ static UA_StatusCode
 addSubscribedVariables(UA_Server *server, UA_NodeId dataSetReaderId,
                        UA_DataSetReaderDataType *dataSetReader,
                        UA_DataSetMetaDataType *pMetaData) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ExtensionObject *eoTargetVar = &dataSetReader->subscribedDataSet;
     if(eoTargetVar->encoding != UA_EXTENSIONOBJECT_DECODED ||
@@ -436,12 +497,13 @@ addSubscribedVariables(UA_Server *server, UA_NodeId dataSetReaderId,
         folderBrowseName = UA_QUALIFIEDNAME(1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode(server, UA_NODEID_NULL,
-                            UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
-                            UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
-                            folderBrowseName,
-                            UA_NODEID_NUMERIC (0, UA_NS0ID_BASEOBJECTTYPE),
-                            oAttr, NULL, &folderId);
+    addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NULL,
+            UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+            UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+            folderBrowseName,
+            UA_NODEID_NUMERIC (0, UA_NS0ID_BASEOBJECTTYPE),
+            &oAttr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+            NULL, &folderId);
 
     /* The SubscribedDataSet option TargetVariables defines a list of Variable
      * mappings between received DataSet fields and target Variables in the
@@ -463,18 +525,22 @@ addSubscribedVariables(UA_Server *server, UA_NodeId dataSetReaderId,
         vAttr.displayName.text = pMetaData->fields[i].name;
         vAttr.dataType = pMetaData->fields[i].dataType;
         UA_QualifiedName varname = {1, pMetaData->fields[i].name};
-        retVal |= UA_Server_addVariableNode(server, targetVars->targetVariables[i].targetNodeId,
-                                            folderId,
-                                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                            varname,
-                                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                            vAttr, NULL,
-                                            &targetVarsData[i].targetVariable.targetNodeId);
+        retVal |= addNode(server, UA_NODECLASS_VARIABLE,
+                          targetVars->targetVariables[i].targetNodeId,
+                          folderId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                          varname, UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                          &vAttr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],
+                          NULL, &targetVarsData[i].targetVariable.targetNodeId);
 
     }
-    retVal = UA_Server_DataSetReader_createTargetVariables(server, dataSetReaderId,
-                                                           targetVars->targetVariablesSize,
-                                                           targetVarsData);
+    UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, dataSetReaderId);
+    if(dsr) {
+        retVal = DataSetReader_createTargetVariables(server, dsr,
+                                                     targetVars->targetVariablesSize,
+                                                     targetVarsData);
+    } else {
+        retVal = UA_STATUSCODE_BADINTERNALERROR;
+    }
     for(size_t j = 0; j < targetVars->targetVariablesSize; j++)
         UA_FieldTargetDataType_clear(&targetVarsData[j].targetVariable);
     UA_free(targetVarsData);
@@ -489,11 +555,12 @@ addSubscribedVariables(UA_Server *server, UA_NodeId dataSetReaderId,
  * the configuration necessary to receive and process DataSetMessages
  * on the Subscriber side. DataSetReader must be linked with a
  * SubscribedDataSet and be contained within a ReaderGroup. */
-/* Add DataSetReader to the ReaderGroup */
 static UA_StatusCode
 addDataSetReaderConfig(UA_Server *server, UA_NodeId readerGroupId,
                        UA_DataSetReaderDataType *dataSetReader,
                        UA_NodeId *dataSetReaderId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_DataSetReaderConfig readerConfig;
     memset(&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
@@ -519,8 +586,8 @@ addDataSetReaderConfig(UA_Server *server, UA_NodeId readerGroupId,
         pMetaData->fields[i].valueRank = dataSetReader->dataSetMetaData.fields[i].valueRank;
     }
 
-    retVal |= UA_Server_addDataSetReader(server, readerGroupId,
-                                         &readerConfig, dataSetReaderId);
+    retVal |= UA_DataSetReader_create(server, readerGroupId,
+                                      &readerConfig, dataSetReaderId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_free(pMetaData->fields);
         return retVal;
@@ -535,6 +602,7 @@ addDataSetReaderConfig(UA_Server *server, UA_NodeId readerGroupId,
 /*************************************************/
 /*            PubSubConnection                   */
 /*************************************************/
+
 UA_StatusCode
 addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connection) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -546,25 +614,24 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
 
     UA_ObjectAttributes attr = UA_ObjectAttributes_default;
     attr.displayName = UA_LOCALIZEDTEXT("", connectionName);
-    retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-                                      UA_NODEID_NUMERIC(1, 0), /* Generate a new id */
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASPUBSUBCONNECTION),
-                                      UA_QUALIFIEDNAME(0, connectionName),
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE),
-                                      (const UA_NodeAttributes*)&attr,
-                                      &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
-                                      NULL, &connection->identifier);
+    retVal |= addNode_begin(server, UA_NODECLASS_OBJECT,
+                            UA_NODEID_NUMERIC(1, 0), /* Generate a new id */
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASPUBSUBCONNECTION),
+                            UA_QUALIFIEDNAME(0, connectionName),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE),
+                            (const UA_NodeAttributes*)&attr,
+                            &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                            NULL, &connection->identifier);
 
     attr.displayName = UA_LOCALIZEDTEXT("", "Address");
-    retVal |= UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0),
-                                   connection->identifier,
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                   UA_QUALIFIEDNAME(0, "Address"),
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_NETWORKADDRESSURLTYPE),
-                                   attr, NULL, NULL);
+    retVal |= addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(1, 0),
+                      connection->identifier, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                      UA_QUALIFIEDNAME(0, "Address"),
+                      UA_NODEID_NUMERIC(0, UA_NS0ID_NETWORKADDRESSURLTYPE),
+                      &attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, NULL);
 
-    UA_Server_addNode_finish(server, connection->identifier);
+    addNode_finish(server, &server->adminSession, &connection->identifier);
 
     UA_NodeId addressNode, urlNode, interfaceNode, publisherIdNode,
         connectionPropertieNode, transportProfileUri;
@@ -605,18 +672,18 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
         ((UA_NetworkAddressUrlDataType*)connection->config->address.data);
     UA_Variant value;
     UA_Variant_init(&value);
-    UA_Variant_setScalar(&value, &networkAddressUrl->url,
-                         &UA_TYPES[UA_TYPES_STRING]);
-    UA_Server_writeValue(server, urlNode, value);
-    UA_Variant_setScalar(&value, &networkAddressUrl->networkInterface,
-                         &UA_TYPES[UA_TYPES_STRING]);
-    UA_Server_writeValue(server, interfaceNode, value);
-    UA_Variant_setScalar(&value, &connection->config->transportProfileUri,
-                         &UA_TYPES[UA_TYPES_STRING]);
-    UA_Server_writeValue(server, transportProfileUri, value);
 
-    UA_NodePropertyContext *connectionPublisherIdContext = (UA_NodePropertyContext *)
-        UA_malloc(sizeof(UA_NodePropertyContext));
+    UA_Variant_setScalar(&value, &networkAddressUrl->url, &UA_TYPES[UA_TYPES_STRING]);
+    writeValueAttribute(server, urlNode, &value);
+
+    UA_Variant_setScalar(&value, &networkAddressUrl->networkInterface, &UA_TYPES[UA_TYPES_STRING]);
+    writeValueAttribute(server, interfaceNode, &value);
+
+    UA_Variant_setScalar(&value, &connection->config->transportProfileUri, &UA_TYPES[UA_TYPES_STRING]);
+    writeValueAttribute(server, transportProfileUri, &value);
+
+    UA_NodePropertyContext *connectionPublisherIdContext =
+        (UA_NodePropertyContext *)UA_malloc(sizeof(UA_NodePropertyContext));
     connectionPublisherIdContext->parentNodeId = connection->identifier;
     connectionPublisherIdContext->parentClassifier = UA_NS0ID_PUBSUBCONNECTIONTYPE;
     connectionPublisherIdContext->elementClassiefier =
@@ -628,30 +695,30 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
                                      connectionPublisherIdContext);
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= UA_Server_addReference(server, connection->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDWRITERGROUP),
-                                     true);
-    retVal |= UA_Server_addReference(server, connection->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDREADERGROUP),
-                                     true);
-    retVal |= UA_Server_addReference(server, connection->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_REMOVEGROUP),
-                                     true);
+    retVal |= addRef(server, connection->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDWRITERGROUP), true);
+    retVal |= addRef(server, connection->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDREADERGROUP), true);
+    retVal |= addRef(server, connection->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_REMOVEGROUP), true);
 #endif
     return retVal;
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
+
 static UA_StatusCode
-addPubSubConnectionAction(UA_Server *server,
+addPubSubConnectionLocked(UA_Server *server,
                           const UA_NodeId *sessionId, void *sessionHandle,
                           const UA_NodeId *methodId, void *methodContext,
                           const UA_NodeId *objectId, void *objectContext,
                           size_t inputSize, const UA_Variant *input,
                           size_t outputSize, UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_PubSubConnectionDataType *pubSubConnection =
         (UA_PubSubConnectionDataType *) input[0].data;
@@ -687,11 +754,16 @@ addPubSubConnectionAction(UA_Server *server,
 
         /* TODO: Need to handle the UA_Server_setWriterGroupOperational based on
          * the status variable in information model */
+        UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroupId);
+        if(!wg)
+            continue;
         if(pubSubConnection->enabled) {
-            UA_Server_freezeWriterGroupConfiguration(server, writerGroupId);
-            UA_Server_setWriterGroupOperational(server, writerGroupId);
+            UA_WriterGroup_freezeConfiguration(server, wg);
+            UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL,
+                                          UA_STATUSCODE_GOOD);
         } else {
-            UA_Server_setWriterGroupDisabled(server, writerGroupId);
+            UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_DISABLED,
+                                          UA_STATUSCODE_BADINTERNALERROR);
         }
     }
 
@@ -720,11 +792,16 @@ addPubSubConnectionAction(UA_Server *server,
 
         /* TODO: Need to handle the UA_Server_setReaderGroupOperational based on
          * the status variable in information model */
+        UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
+        if(!rg)
+            continue;
         if(pubSubConnection->enabled) {
-            UA_Server_freezeReaderGroupConfiguration(server, readerGroupId);
-            UA_Server_setReaderGroupOperational(server, readerGroupId);
+            UA_ReaderGroup_freezeConfiguration(server, rg);
+            UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_OPERATIONAL,
+                                          UA_STATUSCODE_GOOD);
         } else {
-            UA_Server_setReaderGroupDisabled(server, readerGroupId);
+            UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_DISABLED,
+                                          UA_STATUSCODE_BADINTERNALERROR);
         }
     }
 
@@ -732,15 +809,28 @@ addPubSubConnectionAction(UA_Server *server,
     UA_Variant_setScalarCopy(output, &connectionId, &UA_TYPES[UA_TYPES_NODEID]);
     return UA_STATUSCODE_GOOD;
 }
-#endif
 
-UA_StatusCode
-removePubSubConnectionRepresentation(UA_Server *server,
-                                     UA_PubSubConnection *connection) {
-    return deleteNode(server, connection->identifier, true);
+static UA_StatusCode
+addPubSubConnectionAction(UA_Server *server,
+                          const UA_NodeId *sessionId, void *sessionHandle,
+                          const UA_NodeId *methodId, void *methodContext,
+                          const UA_NodeId *objectId, void *objectContext,
+                          size_t inputSize, const UA_Variant *input,
+                          size_t outputSize, UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = addPubSubConnectionLocked(server, sessionId, sessionHandle,
+                                                  methodId, methodContext,
+                                                  objectId, objectContext,
+                                                  inputSize, input, outputSize, output);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
+#endif
+
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
+
 static UA_StatusCode
 removeConnectionAction(UA_Server *server,
                        const UA_NodeId *sessionId, void *sessionHandle,
@@ -748,6 +838,7 @@ removeConnectionAction(UA_Server *server,
                        const UA_NodeId *objectId, void *objectContext,
                        size_t inputSize, const UA_Variant *input,
                        size_t outputSize, UA_Variant *output){
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_NodeId nodeToRemove = *((UA_NodeId *) input[0].data);
     retVal |= UA_Server_removePubSubConnection(server, nodeToRemove);
@@ -755,13 +846,17 @@ removeConnectionAction(UA_Server *server,
         retVal = UA_STATUSCODE_BADNODEIDUNKNOWN;
     return retVal;
 }
+
 #endif
 
 /**********************************************/
 /*               DataSetReader                */
 /**********************************************/
+
 UA_StatusCode
 addDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader *dataSetReader){
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(dataSetReader->config.name.length > 512)
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
 
@@ -774,12 +869,13 @@ addDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader *dataSetReade
 
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", dsrName);
-    retVal = UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* create an id */
-                                   dataSetReader->linkedReaderGroup,
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASDATASETREADER),
-                                   UA_QUALIFIEDNAME(0, dsrName),
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETREADERTYPE),
-                                   object_attr, NULL, &dataSetReader->identifier);
+    retVal = addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(1, 0), /* create an id */
+                     dataSetReader->linkedReaderGroup,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASDATASETREADER),
+                     UA_QUALIFIEDNAME(0, dsrName),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETREADERTYPE),
+                     &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                     NULL, &dataSetReader->identifier);
 
     /* Add childNodes such as PublisherId, WriterGroupId and DataSetWriterId in
      * DataSetReader object */
@@ -815,26 +911,28 @@ addDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader *dataSetReade
     UA_Variant_init(&value);
     UA_Variant_setScalar(&value, &dataSetReader->config.writerGroupId,
                          &UA_TYPES[UA_TYPES_UINT16]);
-    UA_Server_writeValue(server, writerGroupIdNode, value);
+    writeValueAttribute(server, writerGroupIdNode, &value);
     UA_Variant_setScalar(&value, &dataSetReader->config.dataSetWriterId,
                          &UA_TYPES[UA_TYPES_UINT16]);
-    UA_Server_writeValue(server, dataSetwriterIdNode, value);
+    writeValueAttribute(server, dataSetwriterIdNode, &value);
     return retVal;
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
+
 static UA_StatusCode
-addDataSetReaderAction(UA_Server *server,
+addDataSetReaderLocked(UA_Server *server,
                        const UA_NodeId *sessionId, void *sessionHandle,
                        const UA_NodeId *methodId, void *methodContext,
                        const UA_NodeId *objectId, void *objectContext,
                        size_t inputSize, const UA_Variant *input,
                        size_t outputSize, UA_Variant *output){
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, *objectId);
     if(rg->configurationFrozen) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "addDataSetReader cannot be done because ReaderGroup config frozen");
+                     "AddDataSetReader cannot be done because ReaderGroup config frozen");
         return UA_STATUSCODE_BAD;
     }
 
@@ -842,21 +940,30 @@ addDataSetReaderAction(UA_Server *server,
     UA_DataSetReaderDataType *dataSetReader= (UA_DataSetReaderDataType *) input[0].data;
     retVal |= addDataSetReaderConfig(server, *objectId, dataSetReader, &dataSetReaderId);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addDataSetReader failed");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "AddDataSetReader failed");
         return retVal;
     }
 
     UA_Variant_setScalarCopy(output, &dataSetReaderId, &UA_TYPES[UA_TYPES_NODEID]);
     return retVal;
 }
-#endif
 
-UA_StatusCode
-removeDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader* dataSetReader) {
-    return deleteNode(server, dataSetReader->identifier, true);
+static UA_StatusCode
+addDataSetReaderAction(UA_Server *server,
+                       const UA_NodeId *sessionId, void *sessionHandle,
+                       const UA_NodeId *methodId, void *methodContext,
+                       const UA_NodeId *objectId, void *objectContext,
+                       size_t inputSize, const UA_Variant *input,
+                       size_t outputSize, UA_Variant *output){
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = addDataSetReaderLocked(server, sessionId, sessionHandle,
+                                               methodId, methodContext, objectId, objectContext,
+                                               inputSize, input, outputSize, output);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 removeDataSetReaderAction(UA_Server *server,
                           const UA_NodeId *sessionId, void *sessionHandle,
@@ -880,6 +987,8 @@ addDataSetFolderAction(UA_Server *server,
                        const UA_NodeId *objectId, void *objectContext,
                        size_t inputSize, const UA_Variant *input,
                        size_t outputSize, UA_Variant *output){
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     /* defined in R 1.04 9.1.4.5.7 */
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_String newFolderName = *((UA_String *) input[0].data);
@@ -927,6 +1036,8 @@ removeDataSetFolderAction(UA_Server *server,
 UA_StatusCode
 addPublishedDataItemsRepresentation(UA_Server *server,
                                     UA_PublishedDataSet *publishedDataSet) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     if(publishedDataSet->config.name.length > 512)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -936,12 +1047,13 @@ addPublishedDataItemsRepresentation(UA_Server *server,
 
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", pdsName);
-    retVal = UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* Create a new id */
-                       UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                       UA_QUALIFIEDNAME(0, pdsName),
-                       UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE),
-                       object_attr, NULL, &publishedDataSet->identifier);
+    retVal = addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(1, 0), /* Create a new id */
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_QUALIFIEDNAME(0, pdsName),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE),
+                     &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                     NULL, &publishedDataSet->identifier);
     UA_CHECK_STATUS(retVal, return retVal);
 
     UA_ValueCallback valueCallback;
@@ -995,12 +1107,12 @@ addPublishedDataItemsRepresentation(UA_Server *server,
                                      dataSetMetaDataNode, metaDataContext);
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= UA_Server_addReference(server, publishedDataSet->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_ADDVARIABLES), true);
-    retVal |= UA_Server_addReference(server, publishedDataSet->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_REMOVEVARIABLES), true);
+    retVal |= addRef(server, publishedDataSet->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_ADDVARIABLES), true);
+    retVal |= addRef(server, publishedDataSet->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_REMOVEVARIABLES), true);
 #endif
     return retVal;
 }
@@ -1013,6 +1125,7 @@ addPublishedDataItemsAction(UA_Server *server,
                             const UA_NodeId *objectId, void *objectContext,
                             size_t inputSize, const UA_Variant *input,
                             size_t outputSize, UA_Variant *output){
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     size_t fieldNameAliasesSize = input[1].arrayLength;
     UA_String * fieldNameAliases = (UA_String *) input[1].data;
@@ -1082,16 +1195,7 @@ removeVariablesAction(UA_Server *server,
                       size_t outputSize, UA_Variant *output){
     return UA_STATUSCODE_GOOD;
 }
-#endif
-
-
-UA_StatusCode
-removePublishedDataSetRepresentation(UA_Server *server,
-                                     UA_PublishedDataSet *publishedDataSet) {
-    return deleteNode(server, publishedDataSet->identifier, true);
-}
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 removePublishedDataSetAction(UA_Server *server,
                              const UA_NodeId *sessionId, void *sessionHandle,
@@ -1109,7 +1213,10 @@ removePublishedDataSetAction(UA_Server *server,
 /**********************************************/
 
 UA_StatusCode
-addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet) {
+addStandaloneSubscribedDataSetRepresentation(UA_Server *server,
+                                             UA_StandaloneSubscribedDataSet *subscribedDataSet) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     if(subscribedDataSet->config.name.length > 512)
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -1120,12 +1227,13 @@ addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSub
 
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", sdsName);
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* Create a new id */
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS),
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                   UA_QUALIFIEDNAME(0, sdsName),
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE),
-                                   object_attr, NULL, &subscribedDataSet->identifier);
+    addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(1, 0), /* Create a new id */
+            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUBSCRIBEDDATASETS),
+            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+            UA_QUALIFIEDNAME(0, sdsName),
+            UA_NODEID_NUMERIC(0, UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE),
+            &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+            NULL, &subscribedDataSet->identifier);
     UA_NodeId sdsObjectNode = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                                       subscribedDataSet->identifier);
@@ -1149,18 +1257,24 @@ addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSub
         attr.valueRank = UA_VALUERANK_ONE_DIMENSION;
         attr.arrayDimensionsSize = 1;
         UA_UInt32 arrayDimensions[1];
-        arrayDimensions[0] = (UA_UInt32) subscribedDataSet->config.subscribedDataSet.target.targetVariablesSize;
+        arrayDimensions[0] = (UA_UInt32)
+            subscribedDataSet->config.subscribedDataSet.target.targetVariablesSize;
         attr.arrayDimensions = arrayDimensions;
         attr.accessLevel = UA_ACCESSLEVELMASK_READ;
-        UA_Variant_setArray(&attr.value, subscribedDataSet->config.subscribedDataSet.target.targetVariables,
+        UA_Variant_setArray(&attr.value,
+                            subscribedDataSet->config.subscribedDataSet.target.targetVariables,
                             subscribedDataSet->config.subscribedDataSet.target.targetVariablesSize,
                             &UA_TYPES[UA_TYPES_FIELDTARGETDATATYPE]);
-        ret |= UA_Server_addVariableNode(server, UA_NODEID_NULL, sdsObjectNode, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                                         UA_QUALIFIEDNAME(0, "TargetVariables"), UA_NODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE),
-                                         attr, NULL, &targetVarsId);
+        ret |= addNode(server, UA_NODECLASS_VARIABLE, UA_NODEID_NULL, sdsObjectNode,
+                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                       UA_QUALIFIEDNAME(0, "TargetVariables"),
+                       UA_NODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE),
+                       &attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],
+                       NULL, &targetVarsId);
     }
 
-    UA_NodePropertyContext *isConnectedNodeContext = (UA_NodePropertyContext *) UA_malloc(sizeof(UA_NodePropertyContext));
+    UA_NodePropertyContext *isConnectedNodeContext = (UA_NodePropertyContext *)
+        UA_malloc(sizeof(UA_NodePropertyContext));
     isConnectedNodeContext->parentNodeId = subscribedDataSet->identifier;
     isConnectedNodeContext->parentClassifier = UA_NS0ID_STANDALONESUBSCRIBEDDATASETREFDATATYPE;
     isConnectedNodeContext->elementClassiefier = UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE_ISCONNECTED;
@@ -1180,11 +1294,6 @@ addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSub
     return ret;
 }
 
-UA_StatusCode
-removeStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet) {
-    return deleteNode(server, subscribedDataSet->identifier, true);
-}
-
 /**********************************************/
 /*               WriterGroup                  */
 /**********************************************/
@@ -1194,6 +1303,8 @@ readContentMask(UA_Server *server, const UA_NodeId *sessionId,
                 void *sessionContext, const UA_NodeId *nodeId,
                 void *nodeContext, UA_Boolean includeSourceTimeStamp,
                 const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_WriterGroup *writerGroup = (UA_WriterGroup*)nodeContext;
     if((writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED &&
         writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
@@ -1214,6 +1325,8 @@ writeContentMask(UA_Server *server, const UA_NodeId *sessionId,
                  void *sessionContext, const UA_NodeId *nodeId,
                  void *nodeContext, const UA_NumericRange *range,
                  const UA_DataValue *value) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_WriterGroup *writerGroup = (UA_WriterGroup*)nodeContext;
     if((writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED &&
         writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
@@ -1234,7 +1347,9 @@ writeContentMask(UA_Server *server, const UA_NodeId *sessionId,
 }
 
 UA_StatusCode
-addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup){
+addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     if(writerGroup->config.name.length > 512)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -1244,12 +1359,14 @@ addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup){
 
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", wgName);
-    retVal = UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* create a new id */
-                                     writerGroup->linkedConnection->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_QUALIFIEDNAME(0, wgName),
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE),
-                                     object_attr, NULL, &writerGroup->identifier);
+    retVal = addNode(server, UA_NODECLASS_OBJECT,
+                     UA_NODEID_NUMERIC(1, 0), /* create a new id */
+                     writerGroup->linkedConnection->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_QUALIFIEDNAME(0, wgName),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE),
+                     &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                     NULL, &writerGroup->identifier);
 
     UA_NodeId keepAliveNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "KeepAliveTime"),
@@ -1273,8 +1390,8 @@ addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup){
     valueCallback.onWrite = onWrite;
     retVal |= addVariableValueSource(server, valueCallback,
                                      publishingIntervalNode, publishingIntervalContext);
-    UA_Server_writeAccessLevel(server, publishingIntervalNode,
-                               UA_ACCESSLEVELMASK_READ ^ UA_ACCESSLEVELMASK_WRITE);
+    writeAccessLevelAttribute(server, publishingIntervalNode,
+                              UA_ACCESSLEVELMASK_READ ^ UA_ACCESSLEVELMASK_WRITE);
 
     UA_NodeId priorityNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "Priority"),
@@ -1288,21 +1405,23 @@ addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup){
     UA_Variant value;
     UA_Variant_init(&value);
     UA_Variant_setScalar(&value, &writerGroup->config.publishingInterval, &UA_TYPES[UA_TYPES_DURATION]);
-    UA_Server_writeValue(server, publishingIntervalNode, value);
+    writeValueAttribute(server, publishingIntervalNode, &value);
     UA_Variant_setScalar(&value, &writerGroup->config.keepAliveTime, &UA_TYPES[UA_TYPES_DURATION]);
-    UA_Server_writeValue(server, keepAliveNode, value);
+    writeValueAttribute(server, keepAliveNode, &value);
     UA_Variant_setScalar(&value, &writerGroup->config.priority, &UA_TYPES[UA_TYPES_BYTE]);
-    UA_Server_writeValue(server, priorityNode, value);
+    writeValueAttribute(server, priorityNode, &value);
     UA_Variant_setScalar(&value, &writerGroup->config.writerGroupId, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_Server_writeValue(server, writerGroupIdNode, value);
+    writeValueAttribute(server, writerGroupIdNode, &value);
 
     object_attr.displayName = UA_LOCALIZEDTEXT("", "MessageSettings");
-    retVal |= UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0),
-                                      writerGroup->identifier,
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                      UA_QUALIFIEDNAME(0, "MessageSettings"),
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_UADPWRITERGROUPMESSAGETYPE),
-                                      object_attr, NULL, NULL);
+    retVal |= addNode(server, UA_NODECLASS_OBJECT,
+                      UA_NODEID_NUMERIC(1, 0),
+                      writerGroup->identifier,
+                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                      UA_QUALIFIEDNAME(0, "MessageSettings"),
+                      UA_NODEID_NUMERIC(0, UA_NS0ID_UADPWRITERGROUPMESSAGETYPE),
+                      &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                      NULL, NULL);
 
     /* Find the variable with the content mask */
 
@@ -1318,23 +1437,23 @@ addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup){
         UA_DataSource ds;
         ds.read = readContentMask;
         ds.write = writeContentMask;
-        UA_Server_setVariableNode_dataSource(server, contentMaskId, ds);
-        UA_Server_setNodeContext(server, contentMaskId, writerGroup);
+        setVariableNode_dataSource(server, contentMaskId, ds);
+        setNodeContext(server, contentMaskId, writerGroup);
 
         /* Make writable */
-        UA_Server_writeAccessLevel(server, contentMaskId,
-                                   UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_READ);
+        writeAccessLevelAttribute(server, contentMaskId,
+                                  UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_READ);
 
     }
 
     /* Add reference to methods */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= UA_Server_addReference(server, writerGroup->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_ADDDATASETWRITER), true);
-    retVal |= UA_Server_addReference(server, writerGroup->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), true);
+    retVal |= addRef(server, writerGroup->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_ADDDATASETWRITER), true);
+    retVal |= addRef(server, writerGroup->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), true);
 #endif
 
     return retVal;
@@ -1348,32 +1467,24 @@ addWriterGroupAction(UA_Server *server,
                              const UA_NodeId *objectId, void *objectContext,
                              size_t inputSize, const UA_Variant *input,
                              size_t outputSize, UA_Variant *output){
+    UA_LOCK(&server->serviceMutex);
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_WriterGroupDataType *writerGroup = ((UA_WriterGroupDataType *) input[0].data);
     UA_NodeId writerGroupId;
     retVal |= addWriterGroupConfig(server, *objectId, writerGroup, &writerGroupId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addWriterGroup failed");
+        UA_UNLOCK(&server->serviceMutex);
         return retVal;
     }
-    //TODO: Need to handle the UA_Server_setWriterGroupOperational based on the status variable in information model
+    // TODO: Need to handle the UA_Server_setWriterGroupOperational based on the
+    // status variable in information model
 
     UA_Variant_setScalarCopy(output, &writerGroupId, &UA_TYPES[UA_TYPES_NODEID]);
+    UA_UNLOCK(&server->serviceMutex);
     return retVal;
 }
-#endif
-
-UA_StatusCode
-removeGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup) {
-    return deleteNode(server, writerGroup->identifier, true);
-}
-
-UA_StatusCode
-removeReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup) {
-    return deleteNode(server, readerGroup->identifier, true);
-}
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 removeGroupAction(UA_Server *server,
                   const UA_NodeId *sessionId, void *sessionHandle,
@@ -1381,6 +1492,8 @@ removeGroupAction(UA_Server *server,
                   const UA_NodeId *objectId, void *objectContext,
                   size_t inputSize, const UA_Variant *input,
                   size_t outputSize, UA_Variant *output){
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     UA_NodeId nodeToRemove = *((UA_NodeId *)input->data);
     if(UA_WriterGroup_findWGbyId(server, nodeToRemove)) {
         UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, nodeToRemove);
@@ -1402,12 +1515,13 @@ removeGroupAction(UA_Server *server,
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
-addReserveIdsAction(UA_Server *server,
-                             const UA_NodeId *sessionId, void *sessionHandle,
-                             const UA_NodeId *methodId, void *methodContext,
-                             const UA_NodeId *objectId, void *objectContext,
-                             size_t inputSize, const UA_Variant *input,
-                             size_t outputSize, UA_Variant *output){
+addReserveIdsLocked(UA_Server *server,
+                    const UA_NodeId *sessionId, void *sessionHandle,
+                    const UA_NodeId *methodId, void *methodContext,
+                    const UA_NodeId *objectId, void *objectContext,
+                    size_t inputSize, const UA_Variant *input,
+                    size_t outputSize, UA_Variant *output){
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_String transportProfileUri = *((UA_String *)input[0].data);
     UA_UInt16 numRegWriterGroupIds = *((UA_UInt16 *)input[1].data);
@@ -1416,8 +1530,9 @@ addReserveIdsAction(UA_Server *server,
     UA_UInt16 *writerGroupIds;
     UA_UInt16 *dataSetWriterIds;
 
-    retVal |= UA_PubSubManager_reserveIds(server, *sessionId, numRegWriterGroupIds, numRegDataSetWriterIds,
-                                          transportProfileUri, &writerGroupIds, &dataSetWriterIds);
+    retVal |= UA_PubSubManager_reserveIds(server, *sessionId, numRegWriterGroupIds,
+                                          numRegDataSetWriterIds, transportProfileUri,
+                                          &writerGroupIds, &dataSetWriterIds);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addReserveIds failed");
         return retVal;
@@ -1427,20 +1542,42 @@ addReserveIdsAction(UA_Server *server,
     UA_String profile_1 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     UA_String profile_2 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json");
 
-    if(UA_String_equal(&transportProfileUri, &profile_1) || UA_String_equal(&transportProfileUri, &profile_2)) {
+    if(UA_String_equal(&transportProfileUri, &profile_1) ||
+       UA_String_equal(&transportProfileUri, &profile_2)) {
         UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "ApplicationUri: %.*s",
                     (int)server->config.applicationDescription.applicationUri.length,
                     server->config.applicationDescription.applicationUri.data);
-        retVal |= UA_Variant_setScalarCopy(&output[0], &server->config.applicationDescription.applicationUri,
+        retVal |= UA_Variant_setScalarCopy(&output[0],
+                                           &server->config.applicationDescription.applicationUri,
                                            &UA_TYPES[UA_TYPES_STRING]);
+    } else {
+        retVal |= UA_Variant_setScalarCopy(&output[0],
+                                           &server->pubSubManager.defaultPublisherId,
+                                           &UA_TYPES[UA_TYPES_UINT64]);
     }
-    else
-        retVal |= UA_Variant_setScalarCopy(&output[0], &server->pubSubManager.defaultPublisherId, &UA_TYPES[UA_TYPES_UINT64]);
-    UA_Variant_setArray(&output[1], writerGroupIds, numRegWriterGroupIds, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_Variant_setArray(&output[2], dataSetWriterIds, numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_Variant_setArray(&output[1], writerGroupIds,
+                        numRegWriterGroupIds, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_Variant_setArray(&output[2], dataSetWriterIds,
+                        numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
 
     return retVal;
 }
+
+static UA_StatusCode
+addReserveIdsAction(UA_Server *server,
+                    const UA_NodeId *sessionId, void *sessionHandle,
+                    const UA_NodeId *methodId, void *methodContext,
+                    const UA_NodeId *objectId, void *objectContext,
+                    size_t inputSize, const UA_Variant *input,
+                    size_t outputSize, UA_Variant *output) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = addReserveIdsLocked(server, sessionId, sessionHandle,
+                                            methodId, methodContext, objectId, objectContext,
+                                            inputSize, input, outputSize, output);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
 #endif
 
 /**********************************************/
@@ -1449,6 +1586,7 @@ addReserveIdsAction(UA_Server *server,
 
 UA_StatusCode
 addReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(readerGroup->config.name.length > 512)
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     char rgName[513];
@@ -1457,19 +1595,19 @@ addReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup) {
 
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", rgName);
-    UA_StatusCode retVal = UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* create an id */
-                                   readerGroup->linkedConnection,
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                   UA_QUALIFIEDNAME(0, rgName),
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE),
-                                   object_attr, NULL, &readerGroup->identifier);
+    UA_StatusCode retVal =
+        addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(1, 0), /* create an id */
+                readerGroup->linkedConnection, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                UA_QUALIFIEDNAME(0, rgName), UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE),
+                &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                NULL, &readerGroup->identifier);
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= UA_Server_addReference(server, readerGroup->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), true);
-    retVal |= UA_Server_addReference(server, readerGroup->identifier,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), true);
+    retVal |= addRef(server, readerGroup->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), true);
+    retVal |= addRef(server, readerGroup->identifier,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), true);
 #endif
     return retVal;
 }
@@ -1482,17 +1620,21 @@ addReaderGroupAction(UA_Server *server,
                      const UA_NodeId *objectId, void *objectContext,
                      size_t inputSize, const UA_Variant *input,
                      size_t outputSize, UA_Variant *output){
+    UA_LOCK(&server->serviceMutex);
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ReaderGroupDataType *readerGroup = ((UA_ReaderGroupDataType *) input->data);
     UA_NodeId readerGroupId;
     retVal |= addReaderGroupConfig(server, *objectId, readerGroup, &readerGroupId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addReaderGroup failed");
+        UA_UNLOCK(&server->serviceMutex);
         return retVal;
     }
-    //TODO: Need to handle the UA_Server_setReaderGroupOperational based on the status variable in information model
+    // TODO: Need to handle the UA_Server_setReaderGroupOperational based on the
+    // status variable in information model
 
     UA_Variant_setScalarCopy(output, &readerGroupId, &UA_TYPES[UA_TYPES_NODEID]);
+    UA_UNLOCK(&server->serviceMutex);
     return retVal;
 }
 #endif
@@ -1501,6 +1643,7 @@ addReaderGroupAction(UA_Server *server,
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
 static UA_Boolean
 isValidParentNode(UA_Server *server, UA_NodeId parentId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_Boolean retval = true;
     const UA_Node *parentNodeType;
     const UA_NodeId parentNodeTypeId =
@@ -1521,6 +1664,8 @@ isValidParentNode(UA_Server *server, UA_NodeId parentId) {
 static UA_StatusCode
 updateSecurityGroupProperties(UA_Server *server, UA_NodeId *securityGroupNodeId,
                               UA_SecurityGroupConfig *config) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retval = UA_STATUSCODE_BAD;
     UA_Variant value;
     UA_Variant_init(&value);
@@ -1603,16 +1748,11 @@ addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGrou
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "Add SecurityGroup failed with error: %s.",
                      UA_StatusCode_name(retval));
-        UA_removeSecurityGroupRepresentation(server, securityGroup);
+        deleteNode(server, securityGroup->securityGroupNodeId, true);
     }
     return retval;
 }
 
-UA_StatusCode
-UA_removeSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGroup) {
-    UA_StatusCode retval = deleteNode(server, securityGroup->securityGroupNodeId, true);
-    return  retval;
-}
 #endif /* UA_ENABLE_PUBSUB_INFORMATIONMODEL*/
 #endif /* UA_ENABLE_PUBSUB_SKS */
 
@@ -1632,22 +1772,20 @@ addDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWrite
     memcpy(dswName, dataSetWriter->config.name.data, dataSetWriter->config.name.length);
     dswName[dataSetWriter->config.name.length] = '\0';
 
-    UA_UNLOCK(&server->serviceMutex);
-
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.displayName = UA_LOCALIZEDTEXT("", dswName);
-    retVal = UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0), /* create an id */
-                                   dataSetWriter->linkedWriterGroup,
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASDATASETWRITER),
-                                   UA_QUALIFIEDNAME(0, dswName),
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETWRITERTYPE),
-                                   object_attr, NULL, &dataSetWriter->identifier);
+    retVal = addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(1, 0), /* create an id */
+                     dataSetWriter->linkedWriterGroup,
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASDATASETWRITER),
+                     UA_QUALIFIEDNAME(0, dswName),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETWRITERTYPE),
+                     &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                     NULL, &dataSetWriter->identifier);
     //if connected dataset is null this means it's configured for heartbeats
-    if(!UA_NodeId_isNull(&dataSetWriter->connectedDataSet)){
-        retVal |= UA_Server_addReference(server, dataSetWriter->connectedDataSet,
-                                         UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETTOWRITER),
-                                         UA_EXPANDEDNODEID_NODEID(dataSetWriter->identifier),
-                                         true);
+    if(!UA_NodeId_isNull(&dataSetWriter->connectedDataSet)) {
+        retVal |= addRef(server, dataSetWriter->connectedDataSet,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETTOWRITER),
+                         dataSetWriter->identifier, true);
     }
 
     UA_NodeId dataSetWriterIdNode =
@@ -1678,34 +1816,39 @@ addDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWrite
     UA_Variant_init(&value);
     UA_Variant_setScalar(&value, &dataSetWriter->config.dataSetWriterId,
                          &UA_TYPES[UA_TYPES_UINT16]);
-    UA_Server_writeValue(server, dataSetWriterIdNode, value);
+    writeValueAttribute(server, dataSetWriterIdNode, &value);
+
     UA_Variant_setScalar(&value, &dataSetWriter->config.keyFrameCount,
                          &UA_TYPES[UA_TYPES_UINT32]);
-    UA_Server_writeValue(server, keyFrameNode, value);
+    writeValueAttribute(server, keyFrameNode, &value);
+
     UA_Variant_setScalar(&value, &dataSetWriter->config.dataSetFieldContentMask,
                          &UA_TYPES[UA_TYPES_DATASETFIELDCONTENTMASK]);
-    UA_Server_writeValue(server, dataSetFieldContentMaskNode, value);
+    writeValueAttribute(server, dataSetFieldContentMaskNode, &value);
 
     object_attr.displayName = UA_LOCALIZEDTEXT("", "MessageSettings");
-    retVal |= UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, 0),
-                                      dataSetWriter->identifier,
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                      UA_QUALIFIEDNAME(0, "MessageSettings"),
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_UADPDATASETWRITERMESSAGETYPE),
-                                      object_attr, NULL, NULL);
+    retVal |= addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(1, 0),
+                      dataSetWriter->identifier,
+                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                      UA_QUALIFIEDNAME(0, "MessageSettings"),
+                      UA_NODEID_NUMERIC(0, UA_NS0ID_UADPDATASETWRITERMESSAGETYPE),
+                      &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
+                      NULL, NULL);
 
-    UA_LOCK(&server->serviceMutex);
     return retVal;
 }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
+
 static UA_StatusCode
-addDataSetWriterAction(UA_Server *server,
+addDataSetWriterLocked(UA_Server *server,
                        const UA_NodeId *sessionId, void *sessionHandle,
                        const UA_NodeId *methodId, void *methodContext,
                        const UA_NodeId *objectId, void *objectContext,
                        size_t inputSize, const UA_Variant *input,
-                       size_t outputSize, UA_Variant *output){
+                       size_t outputSize, UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, *objectId);
     if(!wg) {
@@ -1731,15 +1874,22 @@ addDataSetWriterAction(UA_Server *server,
     UA_Variant_setScalarCopy(output, &dataSetWriterId, &UA_TYPES[UA_TYPES_NODEID]);
     return UA_STATUSCODE_GOOD;
 }
-#endif
 
-UA_StatusCode
-removeDataSetWriterRepresentation(UA_Server *server,
-                                  UA_DataSetWriter *dataSetWriter) {
-    return deleteNode(server, dataSetWriter->identifier, true);
+static UA_StatusCode
+addDataSetWriterAction(UA_Server *server,
+                       const UA_NodeId *sessionId, void *sessionHandle,
+                       const UA_NodeId *methodId, void *methodContext,
+                       const UA_NodeId *objectId, void *objectContext,
+                       size_t inputSize, const UA_Variant *input,
+                       size_t outputSize, UA_Variant *output) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = addDataSetWriterLocked(server, sessionId, sessionHandle,
+                                               methodId, methodContext, objectId, objectContext,
+                                               inputSize, input, outputSize, output);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 removeDataSetWriterAction(UA_Server *server,
                           const UA_NodeId *sessionId, void *sessionHandle,
@@ -1747,6 +1897,7 @@ removeDataSetWriterAction(UA_Server *server,
                           const UA_NodeId *objectId, void *objectContext,
                           size_t inputSize, const UA_Variant *input,
                           size_t outputSize, UA_Variant *output){
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_NodeId nodeToRemove = *((UA_NodeId *) input[0].data);
     return UA_Server_removeDataSetWriter(server, nodeToRemove);
 }
@@ -1758,10 +1909,11 @@ removeDataSetWriterAction(UA_Server *server,
  * before this callback is executed.
  */
 static UA_StatusCode
-setSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessionHandle,
+setSecurityKeysLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionHandle,
                       const UA_NodeId *methodId, void *methodContext,
                       const UA_NodeId *objectId, void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize, UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /*Check whether the channel is encrypted according to specification*/
     session_list_entry *session_entry;
@@ -1846,14 +1998,27 @@ setSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessi
     return retval;
 }
 
-#endif
+static UA_StatusCode
+setSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessionHandle,
+                      const UA_NodeId *methodId, void *methodContext,
+                      const UA_NodeId *objectId, void *objectContext, size_t inputSize,
+                      const UA_Variant *input, size_t outputSize, UA_Variant *output) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = setSecurityKeysLocked(server, sessionId, sessionHandle,
+                                              methodId, methodContext,
+                                              objectId, objectContext, inputSize,
+                                              input, outputSize, output);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
 
-#if defined(UA_ENABLE_PUBSUB_SKS) && defined(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
 static UA_StatusCode
-getSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessionHandle,
+getSecurityKeysLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionHandle,
                       const UA_NodeId *methodId, void *methodContext,
                       const UA_NodeId *objectId, void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize, UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /*Check whether the channel is encrypted according to specification*/
     session_list_entry *session_entry;
     LIST_FOREACH(session_entry, &server->sessions, pointers) {
@@ -1977,6 +2142,20 @@ getSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessi
     UA_Variant_setArray(&output[2], requestedKeys, requestedKeyCount, &UA_TYPES[UA_TYPES_BYTESTRING]);
     return retval;
 }
+
+static UA_StatusCode
+getSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessionHandle,
+                      const UA_NodeId *methodId, void *methodContext,
+                      const UA_NodeId *objectId, void *objectContext, size_t inputSize,
+                      const UA_Variant *input, size_t outputSize, UA_Variant *output) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = getSecurityKeysLocked(server, sessionId, sessionHandle,
+                                              methodId, methodContext,
+                                              objectId, objectContext, inputSize,
+                                              input, outputSize, output);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
 #endif
 
 /**********************************************/
@@ -1988,15 +2167,17 @@ connectionTypeDestructor(UA_Server *server,
                          const UA_NodeId *sessionId, void *sessionContext,
                          const UA_NodeId *typeId, void *typeContext,
                          const UA_NodeId *nodeId, void **nodeContext) {
+    UA_LOCK(&server->serviceMutex);
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                 "Connection destructor called!");
     UA_NodeId publisherIdNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublisherId"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
     UA_NodePropertyContext *ctx;
-    UA_Server_getNodeContext(server, publisherIdNode, (void **)&ctx);
+    getNodeContext(server, publisherIdNode, (void **)&ctx);
     if(!UA_NodeId_isNull(&publisherIdNode))
         UA_free(ctx);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2006,13 +2187,15 @@ writerGroupTypeDestructor(UA_Server *server,
                           const UA_NodeId *nodeId, void **nodeContext) {
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                 "WriterGroup destructor called!");
+    UA_LOCK(&server->serviceMutex);
     UA_NodeId intervalNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublishingInterval"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
     UA_NodePropertyContext *ctx;
-    UA_Server_getNodeContext(server, intervalNode, (void **)&ctx);
+    getNodeContext(server, intervalNode, (void **)&ctx);
     if(!UA_NodeId_isNull(&intervalNode))
         UA_free(ctx);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2031,13 +2214,15 @@ dataSetWriterTypeDestructor(UA_Server *server,
                             const UA_NodeId *nodeId, void **nodeContext) {
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                 "DataSetWriter destructor called!");
+    UA_LOCK(&server->serviceMutex);
     UA_NodeId dataSetWriterIdNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetWriterId"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
     UA_NodePropertyContext *ctx;
-    UA_Server_getNodeContext(server, dataSetWriterIdNode, (void **)&ctx);
+    getNodeContext(server, dataSetWriterIdNode, (void **)&ctx);
     if(!UA_NodeId_isNull(&dataSetWriterIdNode))
         UA_free(ctx);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2047,15 +2232,15 @@ dataSetReaderTypeDestructor(UA_Server *server,
                             const UA_NodeId *nodeId, void **nodeContext) {
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                 "DataSetReader destructor called!");
-
-    /* Deallocate the memory allocated for publisherId */
+    UA_LOCK(&server->serviceMutex);
     UA_NodeId publisherIdNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublisherId"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
     UA_NodePropertyContext *ctx;
-    UA_Server_getNodeContext(server, publisherIdNode, (void **)&ctx);
+    getNodeContext(server, publisherIdNode, (void **)&ctx);
     if(!UA_NodeId_isNull(&publisherIdNode))
         UA_free(ctx);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2065,25 +2250,27 @@ publishedDataItemsTypeDestructor(UA_Server *server,
                             const UA_NodeId *nodeId, void **nodeContext) {
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                 "PublishedDataItems destructor called!");
+    UA_LOCK(&server->serviceMutex);
     void *childContext;
     UA_NodeId node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublishedData"),
                                          UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
-    UA_Server_getNodeContext(server, node, (void**)&childContext);
+    getNodeContext(server, node, (void**)&childContext);
     if(!UA_NodeId_isNull(&node))
         UA_free(childContext);
 
     node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "ConfigurationVersion"),
                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
                                *nodeId);
-    UA_Server_getNodeContext(server, node, (void**)&childContext);
+    getNodeContext(server, node, (void**)&childContext);
     if(!UA_NodeId_isNull(&node))
         UA_free(childContext);
 
     node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
-    UA_Server_getNodeContext(server, node, (void**)&childContext);
+    getNodeContext(server, node, (void**)&childContext);
     if(!UA_NodeId_isNull(&node))
         UA_free(childContext);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2093,21 +2280,21 @@ standaloneSubscribedDataSetTypeDestructor(UA_Server *server,
                             const UA_NodeId *nodeId, void **nodeContext) {
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
                 "Standalone SubscribedDataSet destructor called!");
+    UA_LOCK(&server->serviceMutex);
     void *childContext;
-
     UA_NodeId node =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
-    UA_Server_getNodeContext(server, node, (void**)&childContext);
+    getNodeContext(server, node, (void**)&childContext);
     if(!UA_NodeId_equal(&UA_NODEID_NULL , &node))
         UA_free(childContext);
-
     node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "IsConnected"),
                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
                                *nodeId);
-    UA_Server_getNodeContext(server, node, (void**)&childContext);
+    getNodeContext(server, node, (void**)&childContext);
     if(!UA_NodeId_equal(&UA_NODEID_NULL , &node))
         UA_free(childContext);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 /*************************************/
@@ -2126,8 +2313,11 @@ UA_loadPubSubConfigMethodCallback(UA_Server *server,
                                   size_t inputSize, const UA_Variant *input,
                                   size_t outputSize, UA_Variant *output) {
     if(inputSize == 1) {
+        UA_LOCK(&server->serviceMutex);
         UA_ByteString *inputStr = (UA_ByteString*)input->data;
-        return UA_PubSubManager_loadPubSubConfigFromByteString(server, *inputStr);
+        UA_StatusCode res = UA_PubSubManager_loadPubSubConfigFromByteString(server, *inputStr);
+        UA_UNLOCK(&server->serviceMutex);
+        return res;
     } else if(inputSize > 1) {
         return UA_STATUSCODE_BADTOOMANYARGUMENTS;
     } else {
@@ -2135,30 +2325,6 @@ UA_loadPubSubConfigMethodCallback(UA_Server *server,
     }
 }
 
-/* Adds method node to server. This method is used to load binary files for
- * PubSub configuration and delete / replace old PubSub configurations. */
-static UA_StatusCode
-UA_addLoadPubSubConfigMethod(UA_Server *server) {
-    UA_Argument inputArgument;
-    UA_Argument_init(&inputArgument);
-    inputArgument.description = UA_LOCALIZEDTEXT("", "PubSub config binfile");
-    inputArgument.name = UA_STRING("BinFile");
-    inputArgument.dataType = UA_TYPES[UA_TYPES_BYTESTRING].typeId;
-    inputArgument.valueRank = UA_VALUERANK_SCALAR;
-
-    UA_MethodAttributes configAttr = UA_MethodAttributes_default;
-    configAttr.description = UA_LOCALIZEDTEXT("","Load binary configuration file");
-    configAttr.displayName = UA_LOCALIZEDTEXT("","LoadPubSubConfigurationFile");
-    configAttr.executable = true;
-    configAttr.userExecutable = true;
-    return UA_Server_addMethodNode(server, UA_NODEID_NULL,
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASORDEREDCOMPONENT),
-                                   UA_QUALIFIEDNAME(1, "PubSub configuration"),
-                                   configAttr, &UA_loadPubSubConfigMethodCallback,
-                                   1, &inputArgument, 0, NULL, NULL, NULL);
-}
-
 /* Callback function that will be executed when the method "PubSub configurator
  *  (delete config)" is called. */
 static UA_StatusCode
@@ -2168,31 +2334,18 @@ UA_deletePubSubConfigMethodCallback(UA_Server *server,
                                     const UA_NodeId *objectId, void *objectContext,
                                     size_t inputSize, const UA_Variant *input,
                                     size_t outputSize, UA_Variant *output) {
-    UA_PubSubManager_delete(server, &(server->pubSubManager));
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubManager_delete(server, &server->pubSubManager);
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
-/* Adds method node to server. This method is used to delete the current PubSub
- * configuration. */
-static UA_StatusCode
-UA_addDeletePubSubConfigMethod(UA_Server *server) {
-    UA_MethodAttributes configAttr = UA_MethodAttributes_default;
-    configAttr.description = UA_LOCALIZEDTEXT("","Delete current PubSub configuration");
-    configAttr.displayName = UA_LOCALIZEDTEXT("","DeletePubSubConfiguration");
-    configAttr.executable = true;
-    configAttr.userExecutable = true;
-    return UA_Server_addMethodNode(server, UA_NODEID_NULL,
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                                   UA_NODEID_NUMERIC(0, UA_NS0ID_HASORDEREDCOMPONENT),
-                                   UA_QUALIFIEDNAME(1, "Delete PubSub config"),
-                                   configAttr, &UA_deletePubSubConfigMethodCallback,
-                                   0, NULL, 0, NULL, NULL, NULL);
-}
-
 #endif /* defined(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS) && defined(UA_ENABLE_PUBSUB_FILE_CONFIG) */
 
 UA_StatusCode
-UA_Server_initPubSubNS0(UA_Server *server) {
+initPubSubNS0(UA_Server *server) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_String profileArray[1];
     profileArray[0] = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -2202,56 +2355,91 @@ UA_Server_initPubSubNS0(UA_Server *server) {
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
     /* Add missing references */
-    retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), true);
-    retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), true);
-    retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), true);
-    retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), true);
+    retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), true);
+    retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), true);
+    retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), true);
+    retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), true);
 
     /* Set method callbacks */
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_ADDCONNECTION), addPubSubConnectionAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_REMOVECONNECTION), removeConnectionAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), addDataSetFolderAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), removeDataSetFolderAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), addPublishedDataItemsAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), removePublishedDataSetAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_ADDVARIABLES), addVariablesAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_REMOVEVARIABLES), removeVariablesAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDWRITERGROUP), addWriterGroupAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDREADERGROUP), addReaderGroupAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_REMOVEGROUP), removeGroupAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_ADDDATASETWRITER), addDataSetWriterAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), removeDataSetWriterAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), addDataSetReaderAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), removeDataSetReaderAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS), addReserveIdsAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_ADDCONNECTION), addPubSubConnectionAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_REMOVECONNECTION), removeConnectionAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), addDataSetFolderAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), removeDataSetFolderAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), addPublishedDataItemsAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), removePublishedDataSetAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_ADDVARIABLES), addVariablesAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_REMOVEVARIABLES), removeVariablesAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDWRITERGROUP), addWriterGroupAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDREADERGROUP), addReaderGroupAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_REMOVEGROUP), removeGroupAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_ADDDATASETWRITER), addDataSetWriterAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), removeDataSetWriterAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), addDataSetReaderAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), removeDataSetReaderAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS), addReserveIdsAction);
 #ifdef UA_ENABLE_PUBSUB_SKS
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SETSECURITYKEYS), setSecurityKeysAction);
-    retVal |= UA_Server_setMethodNodeCallback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS), getSecurityKeysAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SETSECURITYKEYS), setSecurityKeysAction);
+    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS), getSecurityKeysAction);
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
-    retVal |= UA_addLoadPubSubConfigMethod(server);
-    retVal |= UA_addDeletePubSubConfigMethod(server);
+    /* Adds method node to server. This method is used to load binary files for
+     * PubSub configuration and delete / replace old PubSub configurations. */
+    UA_Argument inputArgument;
+    UA_Argument_init(&inputArgument);
+    inputArgument.description = UA_LOCALIZEDTEXT("", "PubSub config binfile");
+    inputArgument.name = UA_STRING("BinFile");
+    inputArgument.dataType = UA_TYPES[UA_TYPES_BYTESTRING].typeId;
+    inputArgument.valueRank = UA_VALUERANK_SCALAR;
+
+    UA_MethodAttributes configAttr = UA_MethodAttributes_default;
+    configAttr.description = UA_LOCALIZEDTEXT("","Load binary configuration file");
+    configAttr.displayName = UA_LOCALIZEDTEXT("","LoadPubSubConfigurationFile");
+    configAttr.executable = true;
+    configAttr.userExecutable = true;
+    retVal |= addMethodNode(server, UA_NODEID_NULL,
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASORDEREDCOMPONENT),
+                            UA_QUALIFIEDNAME(1, "PubSub configuration"),
+                            &configAttr, UA_loadPubSubConfigMethodCallback,
+                            1, &inputArgument, UA_NODEID_NULL, NULL,
+                            0, NULL, UA_NODEID_NULL, NULL,
+                            NULL, NULL);
+
+    /* Adds method node to server. This method is used to delete the current
+     * PubSub configuration. */
+    configAttr.description = UA_LOCALIZEDTEXT("","Delete current PubSub configuration");
+    configAttr.displayName = UA_LOCALIZEDTEXT("","DeletePubSubConfiguration");
+    configAttr.executable = true;
+    configAttr.userExecutable = true;
+    retVal |= addMethodNode(server, UA_NODEID_NULL,
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASORDEREDCOMPONENT),
+                            UA_QUALIFIEDNAME(1, "Delete PubSub config"),
+                            &configAttr, UA_deletePubSubConfigMethodCallback,
+                            0, NULL, UA_NODEID_NULL, NULL,
+                            0, NULL, UA_NODEID_NULL, NULL,
+                            NULL, NULL);
 #endif
 
 #else
     /* Remove methods */
-    retVal |= UA_Server_deleteReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), true,
-                                        UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_ADDCONNECTION),
-                                        false);
-    retVal |= UA_Server_deleteReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), true,
-                                        UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_REMOVECONNECTION),
-                                        false);
+    retVal |= deleteReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), true,
+                              UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_ADDCONNECTION),
+                              false);
+    retVal |= deleteReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), true,
+                              UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_REMOVECONNECTION),
+                              false);
 #endif
 
     /* Set the object-type destructors */
@@ -2259,55 +2447,77 @@ UA_Server_initPubSubNS0(UA_Server *server) {
     lifeCycle.constructor = NULL;
 
     lifeCycle.destructor = connectionTypeDestructor;
-    retVal |= UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE), lifeCycle);
+    retVal |= setNodeTypeLifecycle(server,
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE),
+                                   lifeCycle);
 
     lifeCycle.destructor = writerGroupTypeDestructor;
-    retVal |= UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE), lifeCycle);
+    retVal |= setNodeTypeLifecycle(server,
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE),
+                                   lifeCycle);
 
     lifeCycle.destructor = readerGroupTypeDestructor;
-    retVal |= UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE), lifeCycle);
+    retVal |= setNodeTypeLifecycle(server,
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE),
+                                   lifeCycle);
 
     lifeCycle.destructor = dataSetWriterTypeDestructor;
-    retVal |= UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETWRITERTYPE), lifeCycle);
+    retVal |= setNodeTypeLifecycle(server,
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETWRITERTYPE),
+                                   lifeCycle);
 
     lifeCycle.destructor = publishedDataItemsTypeDestructor;
-    retVal |= UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE), lifeCycle);
+    retVal |= setNodeTypeLifecycle(server,
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE),
+                                   lifeCycle);
 
     lifeCycle.destructor = dataSetReaderTypeDestructor;
-    retVal |= UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETREADERTYPE), lifeCycle);
+    retVal |= setNodeTypeLifecycle(server,
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETREADERTYPE),
+                                   lifeCycle);
 
     lifeCycle.destructor = standaloneSubscribedDataSetTypeDestructor;
-    UA_Server_setNodeTypeLifecycle(server, UA_NODEID_NUMERIC(0, UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE),lifeCycle);
+    retVal |= setNodeTypeLifecycle(server,
+                                   UA_NODEID_NUMERIC(0, UA_NS0ID_STANDALONESUBSCRIBEDDATASETTYPE),
+                                   lifeCycle);
 
     return retVal;
 }
 
 UA_StatusCode
 connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId standaloneSdsId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 
-    UA_NodeId dataSetMetaDataOnDsrId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
-                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), dsrId);
-    UA_NodeId subscribedDataSetOnDsrId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
-                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), dsrId);
-    UA_NodeId dataSetMetaDataOnSdsId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
-                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), standaloneSdsId);
-    UA_NodeId subscribedDataSetOnSdsId = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
-                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), standaloneSdsId);
-
-    if (UA_NodeId_isNull(&dataSetMetaDataOnDsrId) || UA_NodeId_isNull(&subscribedDataSetOnDsrId)
-        || UA_NodeId_isNull(&dataSetMetaDataOnSdsId) || UA_NodeId_isNull(&subscribedDataSetOnSdsId))
-    {
+    UA_NodeId dataSetMetaDataOnDsrId =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), dsrId);
+    UA_NodeId subscribedDataSetOnDsrId =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), dsrId);
+    UA_NodeId dataSetMetaDataOnSdsId =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), standaloneSdsId);
+    UA_NodeId subscribedDataSetOnSdsId =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "SubscribedDataSet"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), standaloneSdsId);
+
+    if(UA_NodeId_isNull(&dataSetMetaDataOnDsrId) ||
+       UA_NodeId_isNull(&subscribedDataSetOnDsrId) ||
+       UA_NodeId_isNull(&dataSetMetaDataOnSdsId) ||
+       UA_NodeId_isNull(&subscribedDataSetOnSdsId))
         return UA_STATUSCODE_BADNOTFOUND;
-    }
 
     UA_NODESTORE_REMOVE(server, &dataSetMetaDataOnDsrId);
     UA_NODESTORE_REMOVE(server, &subscribedDataSetOnDsrId);
 
-    retVal |= UA_Server_addReference(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-        UA_EXPANDEDNODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex, dataSetMetaDataOnSdsId.identifier.numeric), true);
-    retVal |= UA_Server_addReference(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-        UA_EXPANDEDNODEID_NUMERIC(subscribedDataSetOnSdsId.namespaceIndex, subscribedDataSetOnSdsId.identifier.numeric), true);
+    retVal |= addRef(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                     UA_NODEID_NUMERIC(dataSetMetaDataOnSdsId.namespaceIndex,
+                                       dataSetMetaDataOnSdsId.identifier.numeric), true);
+    retVal |= addRef(server, dsrId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                     UA_NODEID_NUMERIC(subscribedDataSetOnSdsId.namespaceIndex,
+                                       subscribedDataSetOnSdsId.identifier.numeric), true);
 
     return retVal;
 }
diff --git a/src/pubsub/ua_pubsub_ns0.h b/src/pubsub/ua_pubsub_ns0.h
index f6cd983f5b9..4e24cd19f0e 100644
--- a/src/pubsub/ua_pubsub_ns0.h
+++ b/src/pubsub/ua_pubsub_ns0.h
@@ -19,59 +19,35 @@ _UA_BEGIN_DECLS
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL /* conditional compilation */
 
 UA_StatusCode
-UA_Server_initPubSubNS0(UA_Server *server);
+initPubSubNS0(UA_Server *server);
 
 UA_StatusCode
 addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connection);
 
-UA_StatusCode
-removePubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connection);
-
 UA_StatusCode
 addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup);
 
 UA_StatusCode
 addReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup);
 
-UA_StatusCode
-removeGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup);
-
 UA_StatusCode
 addDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWriter);
 
-UA_StatusCode
-removeDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWriter);
-
 UA_StatusCode
 addPublishedDataItemsRepresentation(UA_Server *server, UA_PublishedDataSet *publishedDataSet);
 
 UA_StatusCode
 addStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet);
 
-UA_StatusCode
-removePublishedDataSetRepresentation(UA_Server *server, UA_PublishedDataSet *publishedDataSet);
-
-UA_StatusCode
-removeStandaloneSubscribedDataSetRepresentation(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet);
-
 UA_StatusCode
 addDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader *dataSetReader);
 
-UA_StatusCode
-removeDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader *dataSetReader);
-
-UA_StatusCode
-removeReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup);
-
 UA_StatusCode
 connectDataSetReaderToDataSet(UA_Server *server, UA_NodeId dsrId, UA_NodeId standaloneSdsId);
 
 #ifdef UA_ENABLE_PUBSUB_SKS
 UA_StatusCode
 addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGroup);
-
-UA_StatusCode
-UA_removeSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGroup);
 #endif /* UA_ENABLE_PUBSUB_SKS */
 
 #endif /* UA_ENABLE_PUBSUB_INFORMATIONMODEL */
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 7b8d3095f6d..8d2bb58f2b9 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -36,11 +36,6 @@ static void
 UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader *dsr);
 #endif
 
-static UA_StatusCode
-DataSetReader_createTargetVariables(UA_Server *server, UA_DataSetReader *dsr,
-                                    size_t targetVariablesSize,
-                                    const UA_FieldTargetVariable *targetVariables);
-
 /* This functionality of this API will be used in future to create mirror Variables - TODO */
 /* #define UA_MAX_SIZENAME           64 */ /* Max size of Qualified Name of Subscribed Variable */
 
@@ -405,10 +400,10 @@ checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
     return UA_STATUSCODE_BADNOTFOUND;
 }
 
-static UA_StatusCode
-addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
-                 const UA_DataSetReaderConfig *dataSetReaderConfig,
-                 UA_NodeId *readerIdentifier) {
+UA_StatusCode
+UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
+                        const UA_DataSetReaderConfig *dataSetReaderConfig,
+                        UA_NodeId *readerIdentifier) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Search the reader group by the given readerGroupIdentifier */
@@ -558,8 +553,8 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
                            const UA_DataSetReaderConfig *dataSetReaderConfig,
                            UA_NodeId *readerIdentifier) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = addDataSetReader(server, readerGroupIdentifier,
-                                         dataSetReaderConfig, readerIdentifier);
+    UA_StatusCode res = UA_DataSetReader_create(server, readerGroupIdentifier,
+                                                dataSetReaderConfig, readerIdentifier);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -579,7 +574,7 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    removeDataSetReaderRepresentation(server, dsr);
+    deleteNode(server, dsr->identifier, true);
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
@@ -938,7 +933,7 @@ UA_TargetVariables_clear(UA_TargetVariables *subscribedDataSetTarget) {
 /* This Method is used to initially set the SubscribedDataSet to
  * TargetVariablesType and to create the list of target Variables of a
  * SubscribedDataSetType. */
-static UA_StatusCode
+UA_StatusCode
 DataSetReader_createTargetVariables(UA_Server *server, UA_DataSetReader *dsr,
                                     size_t targetVariablesSize,
                                     const UA_FieldTargetVariable *targetVariables) {
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 80f171862e8..2ed02d8a0c7 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -80,10 +80,10 @@ UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig) {
 
 /* ReaderGroup Lifecycle */
 
-static UA_StatusCode
-addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
-               const UA_ReaderGroupConfig *readerGroupConfig,
-               UA_NodeId *readerGroupIdentifier) {
+UA_StatusCode
+UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
+                      const UA_ReaderGroupConfig *readerGroupConfig,
+                      UA_NodeId *readerGroupIdentifier) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
     /* Check for valid readergroup configuration */
@@ -200,7 +200,8 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
                          UA_NodeId *readerGroupIdentifier) {
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode res =
-        addReaderGroup(server, connectionIdentifier, readerGroupConfig, readerGroupIdentifier);
+        UA_ReaderGroup_create(server, connectionIdentifier,
+                              readerGroupConfig, readerGroupIdentifier);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -230,7 +231,7 @@ removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
         UA_ReaderGroup_removeSubscribeCallback(server, readerGroup);
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    removeReaderGroupRepresentation(server, readerGroup);
+    deleteNode(server, readerGroup->identifier, true);
 #endif
 
     /* UA_Server_ReaderGroup_clear also removes itself from the list */
@@ -546,12 +547,8 @@ UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId reader
 /* Freezing of the configuration */
 
 UA_StatusCode
-UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
-                                         const UA_NodeId readerGroupId) {
-    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
-    if(!rg)
-        return UA_STATUSCODE_BADNOTFOUND;
-
+UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(rg->configurationFrozen)
         return UA_STATUSCODE_GOOD;
 
@@ -694,11 +691,22 @@ UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
 }
 
 UA_StatusCode
-UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
-                                           const UA_NodeId readerGroupId) {
+UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
+                                         const UA_NodeId readerGroupId) {
+    UA_LOCK(&server->serviceMutex);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
-    if(!rg)
+    if(!rg) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_ReaderGroup_freezeConfiguration(server, rg);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_ReaderGroup_unfreezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* PubSubConnection freezeCounter-- */
     UA_NodeId pubSubConnectionId =  rg->linkedConnection;
@@ -722,6 +730,20 @@ UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
+                                           const UA_NodeId readerGroupId) {
+    UA_LOCK(&server->serviceMutex);
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
+    if(!rg) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_ReaderGroup_unfreezeConfiguration(server, rg);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* This triggers the collection and reception of NetworkMessages and the
  * contained DataSetMessages. */
 void
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index ac69d2300ba..5e41ac2091b 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -327,7 +327,7 @@ UA_SecurityGroup_delete(UA_SecurityGroup *securityGroup) {
 void
 removeSecurityGroup(UA_Server *server, UA_SecurityGroup *securityGroup) {
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    UA_removeSecurityGroupRepresentation(server, securityGroup);
+    deleteNode(server, securityGroup->securityGroupNodeId, true);
 #endif
 
     /* Unlink from the server */
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 119d0efc9b4..7bf7597dedb 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -195,11 +195,11 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
     return ret;
 }
 
-static UA_StatusCode
-addDataSetWriter(UA_Server *server,
-                 const UA_NodeId writerGroup, const UA_NodeId dataSet,
-                 const UA_DataSetWriterConfig *dataSetWriterConfig,
-                 UA_NodeId *writerIdentifier) {
+UA_StatusCode
+UA_DataSetWriter_create(UA_Server *server,
+                        const UA_NodeId writerGroup, const UA_NodeId dataSet,
+                        const UA_DataSetWriterConfig *dataSetWriterConfig,
+                        UA_NodeId *writerIdentifier) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(!dataSetWriterConfig)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -330,8 +330,8 @@ UA_Server_addDataSetWriter(UA_Server *server,
     /* Delete the reserved IDs if the related session no longer exists. */
     UA_PubSubManager_freeIds(server);
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = addDataSetWriter(server, writerGroup, dataSet,
-                                         dataSetWriterConfig, writerIdentifier);
+    UA_StatusCode res = UA_DataSetWriter_create(server, writerGroup, dataSet,
+                                                dataSetWriterConfig, writerIdentifier);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -350,7 +350,7 @@ UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
 
     /* Remove from information model */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    removeDataSetWriterRepresentation(server, dataSetWriter);
+    deleteNode(server, dataSetWriter->identifier, true);
 #endif
 
     /* Remove DataSetWriter from group */
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index e469e40b8fa..72f3828950b 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -43,10 +43,9 @@ generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
                        UA_NetworkMessage *networkMessage);
 
 UA_StatusCode
-UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
-                         const UA_WriterGroupConfig *writerGroupConfig,
-                         UA_NodeId *writerGroupIdentifier) {
-
+UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
+                      const UA_WriterGroupConfig *writerGroupConfig,
+                      UA_NodeId *writerGroupIdentifier) {
     /* Delete the reserved IDs if the related session no longer exists. */
     UA_PubSubManager_freeIds(server);
     if(!writerGroupConfig)
@@ -181,6 +180,17 @@ UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
     return res;
 }
 
+UA_StatusCode
+UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
+                         const UA_WriterGroupConfig *writerGroupConfig,
+                         UA_NodeId *writerGroupIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = UA_WriterGroup_create(server, connection, writerGroupConfig,
+                                              writerGroupIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
@@ -221,8 +231,9 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     }
 
     connection->writerGroupsSize--;
+
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    removeGroupRepresentation(server, wg);
+    deleteNode(server, wg->identifier, true);
 #endif
 
     /* _clear also removes the refcount in the key storage */
@@ -241,12 +252,10 @@ UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     return res;
 }
 
+
 UA_StatusCode
-UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
-                                         const UA_NodeId writerGroup) {
-    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(!wg)
-        return UA_STATUSCODE_BADNOTFOUND;
+UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(wg->configurationFrozen)
         return UA_STATUSCODE_GOOD;
@@ -445,11 +454,22 @@ UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
 }
 
 UA_StatusCode
-UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
-                                           const UA_NodeId writerGroup) {
+UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
+                                         const UA_NodeId writerGroup) {
+    UA_LOCK(&server->serviceMutex);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(!wg)
+    if(!wg) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_WriterGroup_freezeConfiguration(server, wg);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_WriterGroup_unfreezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Already unfrozen */
     if(!wg->configurationFrozen)
@@ -494,6 +514,20 @@ UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
+                                           const UA_NodeId writerGroup) {
+    UA_LOCK(&server->serviceMutex);
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
+    if(!wg) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_WriterGroup_unfreezeConfiguration(server, wg);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 UA_Server_setWriterGroupOperational(UA_Server *server,
                                     const UA_NodeId writerGroup) {
@@ -522,7 +556,7 @@ UA_Server_setWriterGroupDisabled(UA_Server *server,
 
 UA_StatusCode
 UA_WriterGroupConfig_copy(const UA_WriterGroupConfig *src,
-                          UA_WriterGroupConfig *dst){
+                          UA_WriterGroupConfig *dst) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     memcpy(dst, src, sizeof(UA_WriterGroupConfig));
     res |= UA_String_copy(&src->name, &dst->name);
@@ -549,63 +583,69 @@ UA_Server_getWriterGroupConfig(UA_Server *server, const UA_NodeId writerGroup,
 }
 
 UA_StatusCode
-UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdentifier,
-                                  const UA_WriterGroupConfig *config){
+UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
+                            const UA_WriterGroupConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_LOCK(&server->serviceMutex);
-    UA_WriterGroup *currentWriterGroup =
-        UA_WriterGroup_findWGbyId(server, writerGroupIdentifier);
-    if(!currentWriterGroup) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADNOTFOUND;
-    }
-
-    if(currentWriterGroup->configurationFrozen){
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, currentWriterGroup,
+    if(wg->configurationFrozen){
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
                                    "Modify WriterGroup failed. WriterGroup is frozen.");
-        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
     //The update functionality will be extended during the next PubSub batches.
     //Currently is only a change of the publishing interval possible.
-    if(currentWriterGroup->config.maxEncapsulatedDataSetMessageCount != config->maxEncapsulatedDataSetMessageCount) {
-        currentWriterGroup->config.maxEncapsulatedDataSetMessageCount = config->maxEncapsulatedDataSetMessageCount;
-        if(currentWriterGroup->config.messageSettings.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
-            UA_LOG_WARNING_WRITERGROUP(&server->config.logger, currentWriterGroup,
+    if(wg->config.maxEncapsulatedDataSetMessageCount != config->maxEncapsulatedDataSetMessageCount) {
+        wg->config.maxEncapsulatedDataSetMessageCount = config->maxEncapsulatedDataSetMessageCount;
+        if(wg->config.messageSettings.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
+            UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
                                        "MaxEncapsulatedDataSetMessag need enabled "
                                        "'PayloadHeader' within the message settings.");
         }
     }
 
-    if(currentWriterGroup->config.publishingInterval != config->publishingInterval) {
-        if(currentWriterGroup->config.rtLevel == UA_PUBSUB_RT_NONE &&
-           currentWriterGroup->state == UA_PUBSUBSTATE_OPERATIONAL) {
-            if(currentWriterGroup->config.pubsubManagerCallback.removeCustomCallback)
-                currentWriterGroup->config.pubsubManagerCallback.
-                    removeCustomCallback(server, currentWriterGroup->identifier,
-                                         currentWriterGroup->publishCallbackId);
+    if(wg->config.publishingInterval != config->publishingInterval) {
+        if(wg->config.rtLevel == UA_PUBSUB_RT_NONE &&
+           wg->state == UA_PUBSUBSTATE_OPERATIONAL) {
+            if(wg->config.pubsubManagerCallback.removeCustomCallback)
+                wg->config.pubsubManagerCallback.
+                    removeCustomCallback(server, wg->identifier,
+                                         wg->publishCallbackId);
             else
-                UA_PubSubManager_removeRepeatedPubSubCallback(server, currentWriterGroup->publishCallbackId);
+                UA_PubSubManager_removeRepeatedPubSubCallback(server, wg->publishCallbackId);
 
-            currentWriterGroup->config.publishingInterval = config->publishingInterval;
-            UA_WriterGroup_addPublishCallback(server, currentWriterGroup);
+            wg->config.publishingInterval = config->publishingInterval;
+            UA_WriterGroup_addPublishCallback(server, wg);
         } else {
-            currentWriterGroup->config.publishingInterval = config->publishingInterval;
+            wg->config.publishingInterval = config->publishingInterval;
         }
     }
 
-    if(currentWriterGroup->config.priority != config->priority) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, currentWriterGroup,
-                                   "No or unsupported WriterGroup update.");
+    if(wg->config.priority != config->priority) {
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                   "Priority parameter is not yet "
+                                   "supported for WriterGroup updates");
     }
 
-    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdentifier,
+                                  const UA_WriterGroupConfig *config) {
+    UA_LOCK(&server->serviceMutex);
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroupIdentifier);
+    if(!wg) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+
+    UA_StatusCode res = UA_WriterGroup_updateConfig(server, wg, config);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 UA_StatusCode
 UA_Server_WriterGroup_getState(UA_Server *server, UA_NodeId writerGroupIdentifier,
                                UA_PubSubState *state) {
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index b56f1c85195..edcbe72fa05 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -332,11 +332,9 @@ UA_Server_init(UA_Server *server) {
     UA_CHECK_STATUS(res, goto cleanup);
 
 #ifdef UA_ENABLE_PUBSUB
-    /* Build PubSub information model */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    UA_UNLOCK(&server->serviceMutex);
-    UA_Server_initPubSubNS0(server);
-    UA_LOCK(&server->serviceMutex);
+    /* Build PubSub information model */
+    initPubSubNS0(server);
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index ee2c5097380..2909c51c654 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -411,19 +411,17 @@ UA_StatusCode
 deleteNode(UA_Server *server, const UA_NodeId nodeId,
            UA_Boolean deleteReferences);
 
-UA_StatusCode
-addNode(UA_Server *server, const UA_NodeClass nodeClass,
-        const UA_NodeId requestedNewNodeId,
-        const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
-        const UA_QualifiedName browseName, const UA_NodeId typeDefinition,
-        const void *attr, const UA_DataType *attributeType,
-        void *nodeContext, UA_NodeId *outNewNodeId);
-
 UA_StatusCode
 addRef(UA_Server *server, const UA_NodeId sourceId,
        const UA_NodeId referenceTypeId, const UA_NodeId targetId,
        UA_Boolean forward);
 
+UA_StatusCode
+deleteReference(UA_Server *server, const UA_NodeId sourceNodeId,
+                const UA_NodeId referenceTypeId, UA_Boolean isForward,
+                const UA_ExpandedNodeId targetNodeId,
+                UA_Boolean deleteBidirectional);
+
 UA_StatusCode
 addRefWithSession(UA_Server *server, UA_Session *session, const UA_NodeId *sourceId,
                   const UA_NodeId *referenceTypeId, const UA_NodeId *targetId,
@@ -441,6 +439,10 @@ UA_StatusCode
 setMethodNode_callback(UA_Server *server, const UA_NodeId methodNodeId,
                        UA_MethodCallback methodCallback);
 
+UA_StatusCode
+setNodeTypeLifecycle(UA_Server *server, UA_NodeId nodeId,
+                     UA_NodeTypeLifecycle lifecycle);
+
 void
 Operation_Write(UA_Server *server, UA_Session *session, void *context,
                 const UA_WriteValue *wv, UA_StatusCode *result);
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 7812f9f8837..a86d00e30b9 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -2303,10 +2303,10 @@ Service_DeleteReferences(UA_Server *server, UA_Session *session,
 }
 
 UA_StatusCode
-UA_Server_deleteReference(UA_Server *server, const UA_NodeId sourceNodeId,
-                          const UA_NodeId referenceTypeId, UA_Boolean isForward,
-                          const UA_ExpandedNodeId targetNodeId,
-                          UA_Boolean deleteBidirectional) {
+deleteReference(UA_Server *server, const UA_NodeId sourceNodeId,
+                const UA_NodeId referenceTypeId, UA_Boolean isForward,
+                const UA_ExpandedNodeId targetNodeId,
+                UA_Boolean deleteBidirectional) {
     UA_DeleteReferencesItem item;
     item.sourceNodeId = sourceNodeId;
     item.referenceTypeId = referenceTypeId;
@@ -2315,12 +2315,22 @@ UA_Server_deleteReference(UA_Server *server, const UA_NodeId sourceNodeId,
     item.deleteBidirectional = deleteBidirectional;
 
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_LOCK(&server->serviceMutex);
     Operation_deleteReference(server, &server->adminSession, NULL, &item, &retval);
-    UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
 
+UA_StatusCode
+UA_Server_deleteReference(UA_Server *server, const UA_NodeId sourceNodeId,
+                          const UA_NodeId referenceTypeId, UA_Boolean isForward,
+                          const UA_ExpandedNodeId targetNodeId,
+                          UA_Boolean deleteBidirectional) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = deleteReference(server, sourceNodeId, referenceTypeId,
+                                        isForward, targetNodeId, deleteBidirectional);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /**********************/
 /* Set Value Callback */
 /**********************/
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 21f1022a882..bb40e1fd1bc 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -4,6 +4,7 @@
 #include <open62541/plugin/log_stdout.h>
 
 #include "ua_pubsub.h"
+#include "ua_server_internal.h"
 #include <check.h>
 #include <assert.h>
 
@@ -57,7 +58,9 @@ static void AddConnection(
     connectionConfig.publisherId.uint32 = PublisherId;
 
     ck_assert(UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId) == UA_STATUSCODE_GOOD);
+    UA_LOCK(&server->serviceMutex);
     ck_assert(UA_PubSubConnection_regist(server, opConnectionId, NULL) == UA_STATUSCODE_GOOD);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 /***************************************************************************************************/
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 337d5ff2239..6f35ecd03d3 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -4,6 +4,7 @@
 #include <open62541/plugin/log_stdout.h>
 
 #include "testing_clock.h"
+#include "ua_server_internal.h"
 #include "ua_pubsub.h"
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
@@ -71,7 +72,9 @@ static void AddConnection(
     /* deep copy is not needed (not even for string) because UA_Server_addPubSubConnection performs deep copy */
     connectionConfig.publisherId = publisherId;
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId));
+    UA_LOCK(&server->serviceMutex);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_PubSubConnection_regist(server, opConnectionId, NULL));
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 /***************************************************************************************************/
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index d130cb36bb0..0c123eef635 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -4,6 +4,7 @@
 #include <open62541/plugin/log_stdout.h>
 
 #include "testing_clock.h"
+#include "ua_server_internal.h"
 #include "ua_pubsub.h"
 
 #include <check.h>
@@ -99,7 +100,9 @@ static void AddConnection(
     connectionConfig.publisherId.uint32 = PublisherId;
 
     ck_assert(UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId) == UA_STATUSCODE_GOOD);
+    UA_LOCK(&server->serviceMutex);
     ck_assert(UA_PubSubConnection_regist(server, opConnectionId, NULL) == UA_STATUSCODE_GOOD);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 /***************************************************************************************************/
@@ -410,31 +413,33 @@ static void ValidatePublishSubscribe_fast_path(
 static void PubSubStateChangeCallback_basic (UA_Server *hostServer,
                                 UA_NodeId *pubsubComponentId,
                                 UA_PubSubState state,
-                                UA_StatusCode status) {
+                                UA_StatusCode reason) {
     ck_assert(hostServer == server);
 
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
+                "Component Id = %.*s, state = %i, status = 0x%08x %s",
+                (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason));
     UA_String_clear(&strId);
 
     ck_assert(ExpectedCallbackStateChange == state);
-    ck_assert(ExpectedCallbackStatus == status);
+    ck_assert(ExpectedCallbackStatus == reason);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Callback Cnt = %u", CallbackCnt);
+                "Callback Cnt = %u", CallbackCnt);
 
     ck_assert(CallbackCnt < ExpectedCallbackCnt);
     ck_assert(pExpectedComponentCallbackIds != 0);
     UA_String_init(&strId);
     UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Expected Id = %.*s", (UA_Int32) strId.length, strId.data);
+                "Expected Id = %.*s", (UA_Int32) strId.length, strId.data);
     UA_String_clear(&strId);
 
-    ck_assert(UA_NodeId_equal(pubsubComponentId, &(pExpectedComponentCallbackIds[CallbackCnt])) == UA_TRUE);
+    ck_assert(UA_NodeId_equal(pubsubComponentId,
+                              &(pExpectedComponentCallbackIds[CallbackCnt])) == UA_TRUE);
     CallbackCnt++;
 }
 
@@ -718,7 +723,7 @@ START_TEST(Test_basic) {
 
 static void
 PubSubStateChangeCallback_different_timeouts(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
-                                             UA_PubSubState state, UA_StatusCode status) {
+                                             UA_PubSubState state, UA_StatusCode reason) {
     ck_assert(hostServer == server);
 
     /* Disable some checks during shutdown */
@@ -729,11 +734,12 @@ PubSubStateChangeCallback_different_timeouts(UA_Server *hostServer, UA_NodeId *p
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
+                "Component Id = %.*s, state = %i, status = 0x%08x %s",
+                (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason));
     UA_String_clear(&strId);
 
     ck_assert(ExpectedCallbackStateChange == state);
-    ck_assert(ExpectedCallbackStatus == status);
+    ck_assert(ExpectedCallbackStatus == reason);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
         "Callback Cnt = %u", CallbackCnt);
@@ -942,11 +948,9 @@ START_TEST(Test_different_timeouts) {
 /* Test wrong message receive timeout setting (receive timeout is smaller than publishing interval)*/
 
 /***************************************************************************************************/
-static void PubSubStateChangeCallback_wrong_timeout (
-    UA_Server *hostServer,
-    UA_NodeId *pubsubComponentId,
-    UA_PubSubState state,
-    UA_StatusCode status) {
+static void
+PubSubStateChangeCallback_wrong_timeout (UA_Server *hostServer, UA_NodeId *pubsubComponentId,
+                                         UA_PubSubState state, UA_StatusCode reason) {
 
     ck_assert(hostServer == server);
 
@@ -954,12 +958,13 @@ static void PubSubStateChangeCallback_wrong_timeout (
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
+                "Component Id = %.*s, state = %i, status = 0x%08x %s",
+                (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason));
     UA_String_clear(&strId);
 
     if ((UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) &&
         (state == ExpectedCallbackStateChange) &&
-        (status == ExpectedCallbackStatus)) {
+        (reason == ExpectedCallbackStatus)) {
 
         CallbackCnt++;
     }
@@ -1064,7 +1069,7 @@ START_TEST(Test_wrong_timeout) {
 /***************************************************************************************************/
 static void
 PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
-                                          UA_PubSubState state, UA_StatusCode status) {
+                                          UA_PubSubState state, UA_StatusCode reason) {
     ck_assert(hostServer == server);
 
     if(!runtime)
@@ -1074,7 +1079,7 @@ PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubs
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
+        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason));
     UA_String_clear(&strId);
 
     ck_assert(pExpectedComponentCallbackIds != 0);
@@ -1087,7 +1092,7 @@ PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubs
     UA_String_clear(&strId);
 
     ck_assert(state == ExpectedCallbackStateChange);
-    ck_assert(status == ExpectedCallbackStatus);
+    ck_assert(reason == ExpectedCallbackStatus);
     if (ExpectedCallbackStateChange == UA_PUBSUBSTATE_ERROR) {
         /*  On error we want to verify the order of DataSetReader timeouts */
         ck_assert(UA_NodeId_equal(pubsubComponentId, &pExpectedComponentCallbackIds[CallbackCnt]) == UA_TRUE);
@@ -1635,7 +1640,7 @@ START_TEST(Test_many_components) {
 */
 static void
 PubSubStateChangeCallback_update_config(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
-                                        UA_PubSubState state, UA_StatusCode status) {
+                                        UA_PubSubState state, UA_StatusCode reason) {
     ck_assert(hostServer == server);
 
     if(!runtime)
@@ -1646,13 +1651,13 @@ PubSubStateChangeCallback_update_config(UA_Server *hostServer, UA_NodeId *pubsub
     UA_NodeId_print(pubsubComponentId, &strId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
                 "Component Id = %.*s, state = %i, status = 0x%08x %s",
-                (UA_Int32) strId.length, strId.data, state, status,
-                UA_StatusCode_name(status));
+                (UA_Int32) strId.length, strId.data, state, reason,
+                UA_StatusCode_name(reason));
     UA_String_clear(&strId);
 
     if (UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) {
         ck_assert(ExpectedCallbackStateChange == state);
-        ck_assert(ExpectedCallbackStatus == status);
+        ck_assert(ExpectedCallbackStatus == reason);
         CallbackCnt++;
     }
 }
@@ -1819,21 +1824,21 @@ START_TEST(Test_add_remove) {
 
 
 /***************************************************************************************************/
-static void PubSubStateChangeCallback_fast_path (UA_Server *hostServer, UA_NodeId *pubsubComponentId,
-                                UA_PubSubState state,
-                                UA_StatusCode status) {
+static void
+PubSubStateChangeCallback_fast_path (UA_Server *hostServer, UA_NodeId *pubsubComponentId,
+                                     UA_PubSubState state, UA_StatusCode reason) {
     ck_assert(hostServer == server);
 
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(pubsubComponentId, &strId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback_fast_path(): "
-        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, status, UA_StatusCode_name(status));
+        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason));
     UA_String_clear(&strId);
 
     if (UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) {
         ck_assert(ExpectedCallbackStateChange == state);
-        ck_assert(ExpectedCallbackStatus == status);
+        ck_assert(ExpectedCallbackStatus == reason);
         CallbackCnt++;
     }
 }

From 6a1a4de7daca135386f17346e9b903e82534482d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 5 Jan 2023 01:28:14 +0100
Subject: [PATCH 0636/1963] refactor(pubsub): Finish making the PubSub API
 thread-safe

---
 include/open62541/server_pubsub.h         |  91 +++++-----
 src/pubsub/ua_pubsub.h                    |  14 ++
 src/pubsub/ua_pubsub_config.c             | 211 ++++++++++++++--------
 src/pubsub/ua_pubsub_connection.c         |  13 +-
 src/pubsub/ua_pubsub_dataset.c            |  48 +++--
 src/pubsub/ua_pubsub_keystorage.c         |  27 +--
 src/pubsub/ua_pubsub_manager.c            |  10 +-
 src/pubsub/ua_pubsub_readergroup.c        |  43 +++--
 src/pubsub/ua_pubsub_securitygroup.c      |  11 +-
 src/pubsub/ua_pubsub_writer.c             |  26 ++-
 src/pubsub/ua_pubsub_writergroup.c        |  51 ++++--
 tests/pubsub/check_pubsub_configuration.c |  12 +-
 tests/pubsub/check_pubsub_publisherid.c   |   2 +
 13 files changed, 348 insertions(+), 211 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 4d71d92b2fa..8c40dfd0dcc 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -259,13 +259,13 @@ UA_ServerConfig_addPubSubTransportLayer(UA_ServerConfig *config,
  * @return UA_STATUSCODE_GOOD if connection was successfully added, otherwise an
  *         error code.
  */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_addPubSubConnection(UA_Server *server,
                               const UA_PubSubConnectionConfig *connectionConfig,
                               UA_NodeId *connectionIdentifier);
 
 /* Returns a deep copy of the config */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_getPubSubConnectionConfig(UA_Server *server,
                                     const UA_NodeId connection,
                                     UA_PubSubConnectionConfig *config);
@@ -337,18 +337,18 @@ typedef struct {
     UA_ConfigurationVersionDataType configurationVersion;
 } UA_AddPublishedDataSetResult;
 
-UA_AddPublishedDataSetResult UA_EXPORT
+UA_EXPORT UA_AddPublishedDataSetResult UA_THREADSAFE
 UA_Server_addPublishedDataSet(UA_Server *server,
                               const UA_PublishedDataSetConfig *publishedDataSetConfig,
                               UA_NodeId *pdsIdentifier);
 
 /* Returns a deep copy of the config */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
                                     UA_PublishedDataSetConfig *config);
 
 /* Returns a deep copy of the DataSetMetaData for an specific PDS */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_getPublishedDataSetMetaData(UA_Server *server, const UA_NodeId pds,
                                       UA_DataSetMetaDataType *metaData);
 
@@ -407,18 +407,18 @@ typedef struct {
     UA_ConfigurationVersionDataType configurationVersion;
 } UA_DataSetFieldResult;
 
-UA_DataSetFieldResult UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_DataSetFieldResult UA_THREADSAFE
 UA_Server_addDataSetField(UA_Server *server,
                           const UA_NodeId publishedDataSet,
                           const UA_DataSetFieldConfig *fieldConfig,
                           UA_NodeId *fieldIdentifier);
 
 /* Returns a deep copy of the config */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_getDataSetFieldConfig(UA_Server *server, const UA_NodeId dsf,
                                 UA_DataSetFieldConfig *config);
 
-UA_DataSetFieldResult UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_DataSetFieldResult UA_THREADSAFE
 UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf);
 
 /**
@@ -530,50 +530,50 @@ void UA_EXPORT
 UA_WriterGroupConfig_clear(UA_WriterGroupConfig *writerGroupConfig);
 
 /* Add a new WriterGroup to an existing Connection */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
                          const UA_WriterGroupConfig *writerGroupConfig,
                          UA_NodeId *writerGroupIdentifier);
 
 /* Returns a deep copy of the config */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_getWriterGroupConfig(UA_Server *server, const UA_NodeId writerGroup,
                                UA_WriterGroupConfig *config);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdentifier,
                                   const UA_WriterGroupConfig *config);
 
 /* Get state of WriterGroup */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_WriterGroup_getState(UA_Server *server, UA_NodeId writerGroupIdentifier,
                                UA_PubSubState *state);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_WriterGroup_publish(UA_Server *server, const UA_NodeId writerGroupIdentifier);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_WriterGroup_lastPublishTimestamp(UA_Server *server, const UA_NodeId writerGroupId,
                                     UA_DateTime *timestamp);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup);
 
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_freezeWriterGroupConfiguration(UA_Server *server, const UA_NodeId writerGroup);
 
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server, const UA_NodeId writerGroup);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_setWriterGroupOperational(UA_Server *server, const UA_NodeId writerGroup);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_setWriterGroupDisabled(UA_Server *server, const UA_NodeId writerGroup);
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
 /* Set the group key for the message encryption */
-UA_StatusCode UA_EXPORT
+UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
                                        UA_UInt32 securityTokenId,
                                        const UA_ByteString signingKey,
@@ -612,23 +612,23 @@ UA_DataSetWriterConfig_clear(UA_DataSetWriterConfig *pdsConfig);
  * Part 14, 7.1.5.2.1 defines: The link between the PublishedDataSet and
  * DataSetWriter shall be created when an instance of the DataSetWriterType is
  * created. */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_addDataSetWriter(UA_Server *server,
                            const UA_NodeId writerGroup, const UA_NodeId dataSet,
                            const UA_DataSetWriterConfig *dataSetWriterConfig,
                            UA_NodeId *writerIdentifier);
 
 /* Returns a deep copy of the config */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_getDataSetWriterConfig(UA_Server *server, const UA_NodeId dsw,
                                  UA_DataSetWriterConfig *config);
 
 /* Get state of DataSetWriter */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_DataSetWriter_getState(UA_Server *server, UA_NodeId dataSetWriterIdentifier,
-                               UA_PubSubState *state);
+                                 UA_PubSubState *state);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw);
 
 /**
@@ -683,7 +683,7 @@ typedef struct {
 } UA_TargetVariables;
 
 /* Return Status Code after creating TargetVariables in Subscriber AddressSpace */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_DataSetReader_createTargetVariables(UA_Server *server,
                                               UA_NodeId dataSetReaderIdentifier,
                                               size_t targetVariablesSize,
@@ -733,18 +733,18 @@ typedef struct {
 } UA_DataSetReaderConfig;
 
 /* Update configuration to the dataSetReader */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                      UA_NodeId readerGroupIdentifier,
                                      const UA_DataSetReaderConfig *config);
 
 /* Get configuration of the dataSetReader */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_DataSetReader_getConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                   UA_DataSetReaderConfig *config);
 
 /* Get state of DataSetReader */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_DataSetReader_getState(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                  UA_PubSubState *state);
 
@@ -762,19 +762,19 @@ typedef struct {
 void
 UA_StandaloneSubscribedDataSetConfig_clear(UA_StandaloneSubscribedDataSetConfig *sdsConfig);
 
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_addStandaloneSubscribedDataSet(UA_Server *server,
                                const UA_StandaloneSubscribedDataSetConfig *subscribedDataSetConfig,
                                UA_NodeId *sdsIdentifier);
 
 /* Remove StandaloneSubscribedDataSet, identified by the NodeId. */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds);
 
 /**
  * ReaderGroup
  * -----------
-
+ *
  * ReaderGroup is used to group a list of DataSetReaders. All ReaderGroups are
  * created within a PubSubConnection and automatically deleted if the connection
  * is removed. All network message related filters are only available in the
@@ -817,13 +817,13 @@ void UA_EXPORT
 UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig);
 
 /* Add DataSetReader to the ReaderGroup */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
                            const UA_DataSetReaderConfig *dataSetReaderConfig,
                            UA_NodeId *readerIdentifier);
 
 /* Remove DataSetReader from ReaderGroup */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier);
 
 /* To Do: Update Configuration of ReaderGroup
@@ -833,40 +833,40 @@ UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier);
  */
 
 /* Get configuraiton of ReaderGroup */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifier,
                                 UA_ReaderGroupConfig *config);
 
 /* Get state of ReaderGroup */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifier,
                                UA_PubSubState *state);
 
 /* Add ReaderGroup to the created connection */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
                          const UA_ReaderGroupConfig *readerGroupConfig,
                          UA_NodeId *readerGroupIdentifier);
 
 /* Remove ReaderGroup from connection */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier);
 
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_freezeReaderGroupConfiguration(UA_Server *server, const UA_NodeId readerGroupId);
 
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server, const UA_NodeId readerGroupId);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_setReaderGroupOperational(UA_Server *server, const UA_NodeId readerGroupId);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_setReaderGroupDisabled(UA_Server *server, const UA_NodeId readerGroupId);
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
 /* Set the group key for the message encryption */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, UA_NodeId readerGroup,
                                        UA_UInt32 securityTokenId,
                                        UA_ByteString signingKey,
@@ -875,6 +875,7 @@ UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, UA_NodeId readerGroup,
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_SKS
+
 /**
  * SecurityGroup
  * -------------
@@ -914,7 +915,7 @@ typedef struct {
  * @param securityGroupNodeId The output nodeId of the new SecurityGroup
  * @return UA_StatusCode The return status code
  */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
                            const UA_SecurityGroupConfig *securityGroupConfig,
                            UA_NodeId *securityGroupNodeId);
@@ -927,7 +928,7 @@ UA_Server_addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeI
  * @param securityGroup The nodeId of the securityGroup to be removed
  * @return UA_StatusCode The returned status code.
  */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_removeSecurityGroup(UA_Server *server, const UA_NodeId securityGroup);
 
 #endif /* UA_ENABLE_PUBSUB_SKS */
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index fb4accdfe99..3498b67fdab 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -68,10 +68,19 @@ UA_PublishedDataSet_findPDSbyId(UA_Server *server, UA_NodeId identifier);
 UA_PublishedDataSet *
 UA_PublishedDataSet_findPDSbyName(UA_Server *server, UA_String name);
 
+UA_AddPublishedDataSetResult
+UA_PublishedDataSet_create(UA_Server *server,
+                           const UA_PublishedDataSetConfig *publishedDataSetConfig,
+                           UA_NodeId *pdsIdentifier);
+
 void
 UA_PublishedDataSet_clear(UA_Server *server,
                           UA_PublishedDataSet *publishedDataSet);
 
+UA_StatusCode
+getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
+                          UA_PublishedDataSetConfig *config);
+
 typedef struct UA_StandaloneSubscribedDataSet{
     UA_StandaloneSubscribedDataSetConfig config;
     UA_NodeId identifier;
@@ -388,6 +397,11 @@ UA_DataSetField_findDSFbyId(UA_Server *server, UA_NodeId identifier);
 UA_DataSetFieldResult
 removeDataSetField(UA_Server *server, const UA_NodeId dsf);
 
+UA_DataSetFieldResult
+UA_DataSetField_create(UA_Server *server, const UA_NodeId publishedDataSet,
+                       const UA_DataSetFieldConfig *fieldConfig,
+                       UA_NodeId *fieldIdentifier);
+
 void
 UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
                                   UA_DataValue *value);
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index ff1ac6b40e7..b7a6d0e2a25 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -60,7 +60,7 @@ createDataSetFields(UA_Server *server,
                     const UA_PublishedDataSetDataType *publishedDataSetParameters);
 
 static UA_StatusCode
-generatePubSubConfigurationDataType(const UA_Server *server,
+generatePubSubConfigurationDataType(UA_Server *server,
                                     UA_PubSubConfigurationDataType *pubSubConfiguration);
 
 /* Gets PubSub Configuration from an ExtensionObject */
@@ -99,15 +99,15 @@ extractPubSubConfigFromExtensionObject(const UA_ExtensionObject *src,
 static UA_StatusCode
 updatePubSubConfig(UA_Server *server,
                    const UA_PubSubConfigurationDataType *configurationParameters) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(server == NULL || configurationParameters == NULL) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_updatePubSubConfig] Invalid argument");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    UA_LOCK(&server->serviceMutex);
     UA_PubSubManager_delete(server, &server->pubSubManager);
-    UA_UNLOCK(&server->serviceMutex);
 
     /* Configuration of Published DataSets: */
     UA_UInt32 pdsCount = (UA_UInt32)configurationParameters->publishedDataSetsSize;
@@ -186,6 +186,8 @@ createComponentsForConnection(UA_Server *server,
                               const UA_PubSubConnectionDataType *connParams,
                               UA_NodeId connectionIdent, UA_UInt32 pdsCount,
                               const UA_NodeId *pdsIdent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* WriterGroups configuration */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     for(size_t i = 0; i < connParams->writerGroupsSize; i++) {
@@ -233,10 +235,12 @@ transportLayerExists(UA_Server *server, UA_String transportProfileUri) {
 /* Creates transportlayer for specified transport protocol if this layer doesn't exist yet */
 static UA_StatusCode
 createTransportLayer(UA_Server *server, const UA_String transportProfileUri) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(transportLayerExists(server, transportProfileUri))
         return UA_STATUSCODE_GOOD;
 
-    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig *config = &server->config;
     UA_PubSubTransportLayer tl;
 
     do {
@@ -262,20 +266,20 @@ createTransportLayer(UA_Server *server, const UA_String transportProfileUri) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     } while(0);
 
+    UA_PubSubTransportLayer *newLayer;
     if(config->pubSubConfig.transportLayersSize > 0) {
-        config->pubSubConfig.transportLayers = (UA_PubSubTransportLayer *)
+        newLayer = (UA_PubSubTransportLayer *)
             UA_realloc(config->pubSubConfig.transportLayers,
                        (config->pubSubConfig.transportLayersSize + 1) *
                        sizeof(UA_PubSubTransportLayer));
     } else {
-        config->pubSubConfig.transportLayers = (UA_PubSubTransportLayer *)
+        newLayer = (UA_PubSubTransportLayer *)
             UA_calloc(1, sizeof(UA_PubSubTransportLayer));
     }
-
-    if(config->pubSubConfig.transportLayers == NULL) {
-        UA_Server_delete(server);
+    if(!newLayer)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
+    config->pubSubConfig.transportLayers = newLayer;
+
     config->pubSubConfig.transportLayers[config->pubSubConfig.transportLayersSize] = tl;
     config->pubSubConfig.transportLayersSize++;
     return UA_STATUSCODE_GOOD;
@@ -290,16 +294,16 @@ createTransportLayer(UA_Server *server, const UA_String transportProfileUri) {
 static UA_StatusCode
 createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *connParams,
                        UA_UInt32 pdsCount, UA_NodeId *pdsIdent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_PubSubConnectionConfig config;
     memset(&config, 0, sizeof(UA_PubSubConnectionConfig));
 
     config.name =                       connParams->name;
     config.enabled =                    connParams->enabled;
     config.transportProfileUri =        connParams->transportProfileUri;
-    config.connectionPropertiesSize =   connParams->connectionPropertiesSize;
-    if(config.connectionPropertiesSize > 0) {
-        config.connectionProperties = connParams->connectionProperties;
-    }
+    config.connectionProperties.map =   connParams->connectionProperties;
+    config.connectionProperties.mapSize = connParams->connectionPropertiesSize;
 
     UA_StatusCode res = setConnectionPublisherId(connParams, &config);
     if(res != UA_STATUSCODE_GOOD) {
@@ -340,7 +344,7 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
 
     /* Load connection config into server: */
     UA_NodeId connectionIdent;
-    res = UA_Server_addPubSubConnection(server, &config, &connectionIdent);
+    res = UA_PubSubConnection_create(server, &config, &connectionIdent);
     if(res == UA_STATUSCODE_GOOD) {
         /* Configuration of all Components that belong to this connection: */
         res = createComponentsForConnection(server, connParams, connectionIdent,
@@ -397,6 +401,8 @@ createWriterGroup(UA_Server *server,
                   const UA_WriterGroupDataType *writerGroupParameters,
                   UA_NodeId connectionIdent, UA_UInt32 pdsCount,
                   const UA_NodeId *pdsIdent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_WriterGroupConfig config;
     memset(&config, 0, sizeof(UA_WriterGroupConfig));
     config.name =                  writerGroupParameters->name;
@@ -408,10 +414,8 @@ createWriterGroup(UA_Server *server,
     config.securityMode =          writerGroupParameters->securityMode;
     config.transportSettings =     writerGroupParameters->transportSettings;
     config.messageSettings =       writerGroupParameters->messageSettings;
-    config.groupPropertiesSize =   writerGroupParameters->groupPropertiesSize;
-    if(config.groupPropertiesSize > 0)
-        config.groupProperties = writerGroupParameters->groupProperties;
-
+    config.groupProperties.mapSize =   writerGroupParameters->groupPropertiesSize;
+    config.groupProperties.map =   writerGroupParameters->groupProperties;
     config.maxEncapsulatedDataSetMessageCount = 255; /* non std parameter */
 
     UA_StatusCode res = setWriterGroupEncodingType(writerGroupParameters, &config);
@@ -424,8 +428,10 @@ createWriterGroup(UA_Server *server,
 
     /* Load config into server: */
     UA_NodeId writerGroupIdent;
-    res = UA_Server_addWriterGroup(server, connectionIdent, &config, &writerGroupIdent);
-    UA_Server_setWriterGroupOperational(server, writerGroupIdent);
+    res = UA_WriterGroup_create(server, connectionIdent, &config, &writerGroupIdent);
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroupIdent);
+    if(wg)
+        UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL, UA_STATUSCODE_GOOD);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createWriterGroup] "
@@ -460,13 +466,15 @@ static UA_StatusCode
 addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
                                  const UA_DataSetWriterConfig *dsWriterConfig,
                                  UA_UInt32 pdsCount, const UA_NodeId *pdsIdent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_NodeId dataSetWriterIdent;
     UA_PublishedDataSetConfig pdsConfig;
     UA_Boolean pdsFound = false;
 
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     for(size_t pds = 0; pds < pdsCount && res == UA_STATUSCODE_GOOD; pds++) {
-        res = UA_Server_getPublishedDataSetConfig(server, pdsIdent[pds], &pdsConfig);
+        res = getPublishedDataSetConfig(server, pdsIdent[pds], &pdsConfig);
         /* members of pdsConfig must be deleted manually */
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -480,8 +488,8 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
                         (const char *)pdsConfig.name.data,
                         dsWriterConfig->dataSetName.length)) {
             /* DSWriter will only be created, if a matching PDS is found: */
-            res = UA_Server_addDataSetWriter(server, writerGroupIdent, pdsIdent[pds],
-                                             dsWriterConfig, &dataSetWriterIdent);
+            res = UA_DataSetWriter_create(server, writerGroupIdent, pdsIdent[pds],
+                                          dsWriterConfig, &dataSetWriterIdent);
             if(res != UA_STATUSCODE_GOOD) {
                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                              "[UA_PubSubManager_addDataSetWriterWithPdsReference] "
@@ -517,6 +525,8 @@ createDataSetWriter(UA_Server *server,
                     const UA_DataSetWriterDataType *dataSetWriterParameters,
                     UA_NodeId writerGroupIdent, UA_UInt32 pdsCount,
                     const UA_NodeId *pdsIdent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_DataSetWriterConfig config;
     memset(&config, 0, sizeof(UA_DataSetWriterConfig));
     config.name = dataSetWriterParameters->name;
@@ -525,9 +535,8 @@ createDataSetWriter(UA_Server *server,
     config.dataSetFieldContentMask = dataSetWriterParameters->dataSetFieldContentMask;
     config.messageSettings = dataSetWriterParameters->messageSettings;
     config.dataSetName = dataSetWriterParameters->dataSetName;
-    config.dataSetWriterPropertiesSize = dataSetWriterParameters->dataSetWriterPropertiesSize;
-    if(config.dataSetWriterPropertiesSize > 0)
-        config.dataSetWriterProperties = dataSetWriterParameters->dataSetWriterProperties;
+    config.dataSetWriterProperties.mapSize = dataSetWriterParameters->dataSetWriterPropertiesSize;
+    config.dataSetWriterProperties.map = dataSetWriterParameters->dataSetWriterProperties;
 
     UA_StatusCode res = addDataSetWriterWithPdsReference(server, writerGroupIdent,
                                                          &config, pdsCount, pdsIdent);
@@ -549,6 +558,8 @@ static UA_StatusCode
 createReaderGroup(UA_Server *server,
                   const UA_ReaderGroupDataType *readerGroupParameters,
                   UA_NodeId connectionIdent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_ReaderGroupConfig config;
     memset(&config, 0, sizeof(UA_ReaderGroupConfig));
 
@@ -557,7 +568,7 @@ createReaderGroup(UA_Server *server,
 
     UA_NodeId readerGroupIdent;
     UA_StatusCode res =
-        UA_Server_addReaderGroup(server, connectionIdent, &config, &readerGroupIdent);
+        UA_ReaderGroup_create(server, connectionIdent, &config, &readerGroupIdent);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createReaderGroup] Adding ReaderGroup "
@@ -577,8 +588,10 @@ createReaderGroup(UA_Server *server,
         }
     }
 
-    if(res == UA_STATUSCODE_GOOD)
-        UA_Server_setReaderGroupOperational(server, readerGroupIdent);
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupIdent);
+    if(res == UA_STATUSCODE_GOOD && rg)
+        UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_OPERATIONAL,
+                                      UA_STATUSCODE_GOOD);
 
     return res;
 }
@@ -591,6 +604,8 @@ createReaderGroup(UA_Server *server,
 static UA_StatusCode
 addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
                      const UA_ExtensionObject *subscribedDataSet) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(subscribedDataSet->content.decoded.type ==
        &UA_TYPES[UA_TYPES_TARGETVARIABLESDATATYPE]) {
         UA_TargetVariablesDataType *tmpTargetVars = (UA_TargetVariablesDataType*)
@@ -603,10 +618,12 @@ addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
                                         &targetVars[index].targetVariable);
         }
 
-        UA_StatusCode res =
-            UA_Server_DataSetReader_createTargetVariables(server, dsReaderIdent,
-                                                          tmpTargetVars->targetVariablesSize,
-                                                          targetVars);
+        UA_StatusCode res = UA_STATUSCODE_BADINTERNALERROR;
+        UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, dsReaderIdent);
+        if(dsr)
+            res = DataSetReader_createTargetVariables(server, dsr,
+                                                      tmpTargetVars->targetVariablesSize,
+                                                      targetVars);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addSubscribedDataSet] "
@@ -643,6 +660,8 @@ addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
 static UA_StatusCode
 createDataSetReader(UA_Server *server, const UA_DataSetReaderDataType *dsrParams,
                     UA_NodeId readerGroupIdent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_DataSetReaderConfig config;
     memset(&config, 0, sizeof(UA_DataSetReaderConfig));
 
@@ -656,8 +675,8 @@ createDataSetReader(UA_Server *server, const UA_DataSetReaderDataType *dsrParams
     config.messageSettings = dsrParams->messageSettings;
 
     UA_NodeId dsReaderIdent;
-    UA_StatusCode res = UA_Server_addDataSetReader(server, readerGroupIdent,
-                                                   &config, &dsReaderIdent);
+    UA_StatusCode res = UA_DataSetReader_create(server, readerGroupIdent,
+                                                &config, &dsReaderIdent);
     if(res == UA_STATUSCODE_GOOD)
         res = addSubscribedDataSet(server, dsReaderIdent,
                                    &dsrParams->subscribedDataSet);
@@ -706,6 +725,8 @@ static UA_StatusCode
 createPublishedDataSet(UA_Server *server,
                        const UA_PublishedDataSetDataType *pdsParams,
                        UA_NodeId *pdsIdent) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_PublishedDataSetConfig config;
     memset(&config, 0, sizeof(UA_PublishedDataSetConfig));
 
@@ -714,7 +735,7 @@ createPublishedDataSet(UA_Server *server,
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
-    res = UA_Server_addPublishedDataSet(server, &config, pdsIdent).addResult;
+    res = UA_PublishedDataSet_create(server, &config, pdsIdent).addResult;
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPublishedDataSet] "
@@ -742,6 +763,8 @@ createPublishedDataSet(UA_Server *server,
 static UA_StatusCode
 addDataSetFieldVariables(UA_Server *server, const UA_NodeId *pdsIdent,
                          const UA_PublishedDataSetDataType *pdsParams) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_PublishedDataItemsDataType *pdItems = (UA_PublishedDataItemsDataType *)
         pdsParams->dataSetSource.content.decoded.data;
     if(pdItems->publishedDataSize != pdsParams->dataSetMetaData.fieldsSize)
@@ -759,7 +782,7 @@ addDataSetFieldVariables(UA_Server *server, const UA_NodeId *pdsIdent,
         fc.field.variable.publishParameters = pdItems->publishedData[i];
 
         UA_NodeId fieldIdent;
-        UA_StatusCode res = UA_Server_addDataSetField(server, *pdsIdent, &fc, &fieldIdent).result;
+        UA_StatusCode res = UA_DataSetField_create(server, *pdsIdent, &fc, &fieldIdent).result;
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addDataSetFieldVariables] "
@@ -780,6 +803,8 @@ addDataSetFieldVariables(UA_Server *server, const UA_NodeId *pdsIdent,
 static UA_StatusCode
 createDataSetFields(UA_Server *server, const UA_NodeId *pdsIdent,
                     const UA_PublishedDataSetDataType *pdsParams) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(pdsParams->dataSetSource.encoding != UA_EXTENSIONOBJECT_DECODED)
         return UA_STATUSCODE_BADINTERNALERROR;
 
@@ -805,6 +830,7 @@ createDataSetFields(UA_Server *server, const UA_NodeId *pdsIdent,
 UA_StatusCode
 UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
                                                 const UA_ByteString buffer) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     size_t offset = 0;
     UA_ExtensionObject decodedFile;
     UA_StatusCode res = UA_ExtensionObject_decodeBinary(&buffer, &offset, &decodedFile);
@@ -924,22 +950,29 @@ generatePublishedDataSetDataType(const UA_PublishedDataSet *src,
 static UA_StatusCode
 generateDataSetWriterDataType(const UA_DataSetWriter *src,
                               UA_DataSetWriterDataType *dst) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     memset(dst, 0, sizeof(UA_DataSetWriterDataType));
-
-    UA_String_copy(&src->config.name, &dst->name);
+    res |= UA_String_copy(&src->config.name, &dst->name);
     dst->dataSetWriterId = src->config.dataSetWriterId;
     dst->keyFrameCount = src->config.keyFrameCount;
     dst->dataSetFieldContentMask = src->config.dataSetFieldContentMask;
-    UA_ExtensionObject_copy(&src->config.messageSettings, &dst->messageSettings);
-    UA_String_copy(&src->config.dataSetName, &dst->dataSetName);
-
-    dst->dataSetWriterPropertiesSize = src->config.dataSetWriterPropertiesSize;
-    for(size_t i = 0; i < src->config.dataSetWriterPropertiesSize; i++) {
-        UA_KeyValuePair_copy(&src->config.dataSetWriterProperties[i],
-                             &dst->dataSetWriterProperties[i]);
+    res |= UA_ExtensionObject_copy(&src->config.messageSettings, &dst->messageSettings);
+    res |= UA_String_copy(&src->config.dataSetName, &dst->dataSetName);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_DataSetWriterDataType_clear(dst);
+        return res;
     }
 
-    return UA_STATUSCODE_GOOD;
+    res = UA_Array_copy(src->config.dataSetWriterProperties.map,
+                        src->config.dataSetWriterProperties.mapSize,
+                        (void**)&dst->dataSetWriterProperties,
+                        &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    if(res == UA_STATUSCODE_GOOD)
+        dst->dataSetWriterPropertiesSize = src->config.dataSetWriterProperties.mapSize;
+    else
+        UA_DataSetWriterDataType_clear(dst);
+
+    return res;
 }
 
 static UA_StatusCode
@@ -958,32 +991,35 @@ generateWriterGroupDataType(const UA_WriterGroup *src,
     UA_ExtensionObject_copy(&src->config.transportSettings, &dst->transportSettings);
     UA_ExtensionObject_copy(&src->config.messageSettings, &dst->messageSettings);
 
-    dst->groupPropertiesSize = src->config.groupPropertiesSize;
-    dst->groupProperties = (UA_KeyValuePair*)
-        UA_Array_new(dst->groupPropertiesSize, &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    for(size_t index = 0; index < dst->groupPropertiesSize; index++) {
-        UA_KeyValuePair_copy(&src->config.groupProperties[index],
-                             &dst->groupProperties[index]);
+    UA_StatusCode res =
+        UA_Array_copy(src->config.groupProperties.map,
+                      src->config.groupProperties.mapSize,
+                      (void**)&dst->groupProperties,
+                      &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_WriterGroupDataType_clear(dst);
+        return res;
     }
+    dst->groupPropertiesSize = src->config.groupProperties.mapSize,
 
     dst->dataSetWriters = (UA_DataSetWriterDataType*)
         UA_calloc(src->writersCount, sizeof(UA_DataSetWriterDataType));
-    if(!dst->dataSetWriters)
+    if(!dst->dataSetWriters) {
+        UA_WriterGroupDataType_clear(dst);
         return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
 
     dst->dataSetWritersSize = src->writersCount;
 
     UA_DataSetWriter *dsw;
     size_t dsWriterIndex = 0;
     LIST_FOREACH(dsw, &src->writers, listEntry) {
-        UA_StatusCode res =
-            generateDataSetWriterDataType(dsw, &dst->dataSetWriters[dsWriterIndex]);
-        if(res != UA_STATUSCODE_GOOD)
-            return res;
+        res |= generateDataSetWriterDataType(dsw, &dst->dataSetWriters[dsWriterIndex]);
         dsWriterIndex++;
     }
-
-    return UA_STATUSCODE_GOOD;
+    if(res != UA_STATUSCODE_GOOD)
+        UA_WriterGroupDataType_clear(dst);
+    return res;
 }
 
 static UA_StatusCode
@@ -1052,7 +1088,6 @@ generateReaderGroupDataType(const UA_ReaderGroup *src,
 static UA_StatusCode
 generatePubSubConnectionDataType(const UA_PubSubConnection *src,
                                  UA_PubSubConnectionDataType *dst) {
-
     const UA_DataType *publisherIdType;
     memset(dst, 0, sizeof(UA_PubSubConnectionDataType));
 
@@ -1060,11 +1095,16 @@ generatePubSubConnectionDataType(const UA_PubSubConnection *src,
     UA_String_copy(&src->config->transportProfileUri, &dst->transportProfileUri);
     dst->enabled = src->config->enabled;
 
-    dst->connectionPropertiesSize = src->config->connectionPropertiesSize;
-    for(size_t i = 0; i < src->config->connectionPropertiesSize; i++) {
-        UA_KeyValuePair_copy(&src->config->connectionProperties[i],
-                             &dst->connectionProperties[i]);
+    UA_StatusCode res =
+        UA_Array_copy(src->config->connectionProperties.map,
+                      src->config->connectionProperties.mapSize,
+                      (void**)&dst->connectionProperties,
+                      &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_PubSubConnectionDataType_clear(dst);
+        return res;
     }
+    dst->connectionPropertiesSize = src->config->connectionProperties.mapSize;
 
     switch (src->config->publisherIdType) {
         case UA_PUBLISHERIDTYPE_BYTE:
@@ -1083,7 +1123,8 @@ generatePubSubConnectionDataType(const UA_PubSubConnection *src,
             publisherIdType = &UA_TYPES[UA_TYPES_STRING];
             break;
         default:
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "generatePubSubConnectionDataType(): publisher Id type is not supported");
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "generatePubSubConnectionDataType(): publisher Id type is not supported");
             return UA_STATUSCODE_BADINTERNALERROR;
             break;
     }
@@ -1095,11 +1136,13 @@ generatePubSubConnectionDataType(const UA_PubSubConnection *src,
      * src->config->connectionTransportSettings should be checked beforehand. */
     dst->address.encoding = UA_EXTENSIONOBJECT_DECODED;
     dst->address.content.decoded.type = src->config->address.type;
-    UA_StatusCode res =
-        UA_Array_copy(src->config->address.data, 1,
-                      &dst->address.content.decoded.data, src->config->address.type);
-    if(res != UA_STATUSCODE_GOOD)
+    res = UA_Array_copy(src->config->address.data, 1,
+                        &dst->address.content.decoded.data,
+                        src->config->address.type);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_PubSubConnectionDataType_clear(dst);
         return res;
+    }
 
     if(src->config->connectionTransportSettings.data) {
         dst->transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
@@ -1109,29 +1152,35 @@ generatePubSubConnectionDataType(const UA_PubSubConnection *src,
                             &dst->transportSettings.content.decoded.data,
                             src->config->connectionTransportSettings.type);
 
-        if(res != UA_STATUSCODE_GOOD)
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_PubSubConnectionDataType_clear(dst);
             return res;
+        }
     }
 
     dst->writerGroups = (UA_WriterGroupDataType*)
         UA_calloc(src->writerGroupsSize, sizeof(UA_WriterGroupDataType));
-    if(dst->writerGroups == NULL) {
+    if(!dst->writerGroups) {
+        UA_PubSubConnectionDataType_clear(dst);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
     dst->writerGroupsSize = src->writerGroupsSize;
     UA_WriterGroup *wg, *wg_tmp = NULL;
     size_t wgIndex = 0;
-    LIST_FOREACH_SAFE(wg ,&src->writerGroups, listEntry, wg_tmp) {
+    LIST_FOREACH_SAFE(wg, &src->writerGroups, listEntry, wg_tmp) {
         res = generateWriterGroupDataType(wg, &dst->writerGroups[wgIndex]);
-        if(res != UA_STATUSCODE_GOOD)
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_PubSubConnectionDataType_clear(dst);
             return res;
+        }
         wgIndex++;
     }
 
     dst->readerGroups = (UA_ReaderGroupDataType*)
         UA_calloc(src->readerGroupsSize, sizeof(UA_ReaderGroupDataType));
     if(dst->readerGroups == NULL) {
+        UA_PubSubConnectionDataType_clear(dst);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -1140,17 +1189,21 @@ generatePubSubConnectionDataType(const UA_PubSubConnection *src,
     size_t rgIndex = 0;
     LIST_FOREACH(rg, &src->readerGroups, listEntry) {
         res = generateReaderGroupDataType(rg, &dst->readerGroups[rgIndex]);
-        if(res != UA_STATUSCODE_GOOD)
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_PubSubConnectionDataType_clear(dst);
             return res;
+        }
         rgIndex++;
     }
 
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
-generatePubSubConfigurationDataType(const UA_Server* server,
+static UA_StatusCode
+generatePubSubConfigurationDataType(UA_Server* server,
                                     UA_PubSubConfigurationDataType *configDT) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     const UA_PubSubManager *manager = &server->pubSubManager;
     memset(configDT, 0, sizeof(UA_PubSubConfigurationDataType));
@@ -1202,6 +1255,8 @@ generatePubSubConfigurationDataType(const UA_Server* server,
 UA_StatusCode
 UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
                                                UA_ByteString *buffer) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_PubSubConfigurationDataType config;
     memset(&config, 0, sizeof(UA_PubSubConfigurationDataType));
 
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index a0bf4a9b5a4..8800fbba5c1 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -38,13 +38,18 @@ UA_PubSubConnectionConfig_copy(const UA_PubSubConnectionConfig *src,
 UA_StatusCode
 UA_Server_getPubSubConnectionConfig(UA_Server *server, const UA_NodeId connection,
                                     UA_PubSubConnectionConfig *config) {
-    if(!config)
+    UA_LOCK(&server->serviceMutex);
+    if(!config) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
     UA_PubSubConnection *currentPubSubConnection =
         UA_PubSubConnection_findConnectionbyId(server, connection);
-    if(!currentPubSubConnection)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_PubSubConnectionConfig_copy(currentPubSubConnection->config, config);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    if(currentPubSubConnection)
+        res = UA_PubSubConnectionConfig_copy(currentPubSubConnection->config, config);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_PubSubConnection *
diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index d00f4e39db4..efbb5655ab0 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -66,14 +66,24 @@ UA_PublishedDataSetConfig_copy(const UA_PublishedDataSetConfig *src,
 }
 
 UA_StatusCode
-UA_Server_getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
-                                    UA_PublishedDataSetConfig *config) {
+getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
+                          UA_PublishedDataSetConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
-    if(!currentPDS)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_PublishedDataSetConfig_copy(&currentPDS->config, config);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    if(currentPDS)
+        res = UA_PublishedDataSetConfig_copy(&currentPDS->config, config);
+    return res;
+}
+
+UA_StatusCode
+UA_Server_getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
+                                    UA_PublishedDataSetConfig *config) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = getPublishedDataSetConfig(server, pds, config);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode
@@ -81,10 +91,13 @@ UA_Server_getPublishedDataSetMetaData(UA_Server *server, const UA_NodeId pds,
                                       UA_DataSetMetaDataType *metaData) {
     if(!metaData)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_LOCK(&server->serviceMutex);
     UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
-    if(!currentPDS)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_DataSetMetaDataType_copy(&currentPDS->dataSetMetaData, metaData);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    if(currentPDS)
+        res = UA_DataSetMetaDataType_copy(&currentPDS->dataSetMetaData, metaData);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_PublishedDataSet *
@@ -271,10 +284,10 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_DataSetFieldResult
-addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
-                const UA_DataSetFieldConfig *fieldConfig,
-                UA_NodeId *fieldIdentifier) {
+UA_DataSetFieldResult
+UA_DataSetField_create(UA_Server *server, const UA_NodeId publishedDataSet,
+                       const UA_DataSetFieldConfig *fieldConfig,
+                       UA_NodeId *fieldIdentifier) {
     UA_DataSetFieldResult result;
     memset(&result, 0, sizeof(UA_DataSetFieldResult));
     if(!fieldConfig) {
@@ -383,7 +396,7 @@ UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
                           UA_NodeId *fieldIdentifier) {
     UA_LOCK(&server->serviceMutex);
     UA_DataSetFieldResult res =
-        addDataSetField(server, publishedDataSet, fieldConfig, fieldIdentifier);
+        UA_DataSetField_create(server, publishedDataSet, fieldConfig, fieldIdentifier);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -509,10 +522,13 @@ UA_Server_getDataSetFieldConfig(UA_Server *server, const UA_NodeId dsf,
                                 UA_DataSetFieldConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_LOCK(&server->serviceMutex);
     UA_DataSetField *currentDataSetField = UA_DataSetField_findDSFbyId(server, dsf);
-    if(!currentDataSetField)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_DataSetFieldConfig_copy(&currentDataSetField->config, config);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    if(currentDataSetField)
+        res = UA_DataSetFieldConfig_copy(&currentDataSetField->config, config);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_DataSetField *
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index b7ef3d27d11..249e3a06b9d 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -32,9 +32,7 @@ UA_Server_findPubSubSecurityPolicy(UA_Server *server, const UA_String *securityP
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     UA_StatusCode retval = UA_STATUSCODE_BADNOTFOUND;
-
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
+    UA_ServerConfig *config = &server->config;
     for(size_t i = 0; i < config->pubSubConfig.securityPoliciesSize; i++) {
         if(UA_String_equal(securityPolicyUri,
                            &config->pubSubConfig.securityPolicies[i].policyUri)) {
@@ -201,22 +199,17 @@ UA_PubSubKeyStorage_push(UA_PubSubKeyStorage *keyStorage, const UA_ByteString *k
 
 UA_StatusCode
 UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
-                                          UA_PubSubKeyStorage *keyStorage,
-                                          UA_ServerCallback callback,
-                                          UA_Duration timeToNextMs,
-                                          UA_UInt64 *callbackID) {
+                                           UA_PubSubKeyStorage *keyStorage,
+                                           UA_ServerCallback callback,
+                                           UA_Duration timeToNextMs,
+                                           UA_UInt64 *callbackID) {
     if(!server || !keyStorage || !callback || timeToNextMs <= 0)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_DateTime now = UA_DateTime_nowMonotonic();
-
-    UA_DateTime dateTimeToNextKey = now + (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);
-
-    retval = UA_Server_addTimedCallback(server, callback, keyStorage, dateTimeToNextKey,
-                                        callbackID);
-
-    return retval;
+    UA_DateTime dateTimeToNextKey = UA_DateTime_nowMonotonic() +
+        (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);
+    UA_EventLoop *el = server->config.eventLoop;
+    return el->addTimedCallback(el, (UA_Callback)callback, server, keyStorage,
+                                dateTimeToNextKey, callbackID);
 }
 
 static UA_StatusCode
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 2d1c2648bd5..bcd03e27f5c 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -474,10 +474,10 @@ UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier,
     return retval;
 }
 
-static UA_AddPublishedDataSetResult
-addPublishedDataSet(UA_Server *server,
-                    const UA_PublishedDataSetConfig *publishedDataSetConfig,
-                    UA_NodeId *pdsIdentifier) {
+UA_AddPublishedDataSetResult
+UA_PublishedDataSet_create(UA_Server *server,
+                           const UA_PublishedDataSetConfig *publishedDataSetConfig,
+                           UA_NodeId *pdsIdentifier) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_AddPublishedDataSetResult result = {UA_STATUSCODE_BADINVALIDARGUMENT, 0, NULL, {0, 0}};
@@ -600,7 +600,7 @@ UA_Server_addPublishedDataSet(UA_Server *server,
                               UA_NodeId *pdsIdentifier) {
     UA_LOCK(&server->serviceMutex);
     UA_AddPublishedDataSetResult res =
-        addPublishedDataSet(server, publishedDataSetConfig, pdsIdentifier);
+        UA_PublishedDataSet_create(server, publishedDataSetConfig, pdsIdentifier);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 2ed02d8a0c7..760fca5c22b 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -50,7 +50,7 @@ UA_DataSetReader *UA_ReaderGroup_findDSRbyId(UA_Server *server, UA_NodeId identi
 
 /* Clear ReaderGroup */
 static void
-UA_Server_ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup);
+ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup);
 
 /* ReaderGroup Config Handling */
 
@@ -235,7 +235,7 @@ removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
 #endif
 
     /* UA_Server_ReaderGroup_clear also removes itself from the list */
-    UA_Server_ReaderGroup_clear(server, readerGroup);
+    ReaderGroup_clear(server, readerGroup);
 
     /* Remove readerGroup from Connection */
     LIST_REMOVE(readerGroup, listEntry);
@@ -275,7 +275,9 @@ UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifi
 }
 
 static void
-UA_Server_ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup) {
+ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_ReaderGroupConfig_clear(&readerGroup->config);
     UA_DataSetReader *dataSetReader;
     UA_DataSetReader *tmpDataSetReader;
@@ -449,6 +451,8 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
                               UA_ReaderGroup *readerGroup,
                               UA_PubSubState state,
                               UA_StatusCode cause) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode ret = UA_STATUSCODE_BADINVALIDARGUMENT;
     UA_PubSubState oldState = readerGroup->state;
     switch(state) {
@@ -469,9 +473,9 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
                                        "Received unknown PubSub state!");
             break;
     }
-    if (state != oldState) {
+    if(state != oldState) {
         /* inform application about state change */
-        UA_ServerConfig *pConfig = UA_Server_getConfig(server);
+        UA_ServerConfig *pConfig = &server->config;
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
             pConfig->pubSubConfig.
                 stateChangeCallback(server, &readerGroup->identifier, state, cause);
@@ -505,17 +509,18 @@ UA_Server_setReaderGroupDisabled(UA_Server *server, const UA_NodeId readerGroupI
 }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-UA_StatusCode
-UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
-                                       UA_UInt32 securityTokenId,
-                                       const UA_ByteString signingKey,
-                                       const UA_ByteString encryptingKey,
-                                       const UA_ByteString keyNonce) {
+static UA_StatusCode
+setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
+                             UA_UInt32 securityTokenId,
+                             const UA_ByteString signingKey,
+                             const UA_ByteString encryptingKey,
+                             const UA_ByteString keyNonce) {
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
     UA_CHECK_MEM(rg, return UA_STATUSCODE_BADNOTFOUND);
     if(rg->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) {
         UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
-                                   "JSON encoding is enabled. The message security is only defined for the UADP message mapping.");
+                                   "JSON encoding is enabled. The message security is "
+                                   "only defined for the UADP message mapping.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     if(!rg->config.securityPolicy) {
@@ -542,6 +547,20 @@ UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId reader
         setSecurityKeys(rg->securityPolicyContext, &signingKey,
                         &encryptingKey, &keyNonce);
 }
+
+UA_StatusCode
+UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
+                                       UA_UInt32 securityTokenId,
+                                       const UA_ByteString signingKey,
+                                       const UA_ByteString encryptingKey,
+                                       const UA_ByteString keyNonce) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = setReaderGroupEncryptionKeys(server, readerGroup,
+                                                     securityTokenId, signingKey,
+                                                     encryptingKey, keyNonce);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
 #endif
 
 /* Freezing of the configuration */
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 5e41ac2091b..f83e4c32c52 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -348,11 +348,14 @@ UA_StatusCode
 UA_Server_removeSecurityGroup(UA_Server *server, const UA_NodeId securityGroup) {
     UA_LOCK(&server->serviceMutex);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroup);
-    if(!sg)
-        return UA_STATUSCODE_BADBOUNDNOTFOUND;
-    removeSecurityGroup(server, sg);
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(sg) {
+        removeSecurityGroup(server, sg);
+    } else {
+        res = UA_STATUSCODE_BADBOUNDNOTFOUND;
+    }
     UA_UNLOCK(&server->serviceMutex);
-    return UA_STATUSCODE_GOOD;
+    return res;
 }
 
 #endif
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 7bf7597dedb..37ab83178ef 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -44,10 +44,13 @@ UA_Server_getDataSetWriterConfig(UA_Server *server, const UA_NodeId dsw,
                                  UA_DataSetWriterConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_LOCK(&server->serviceMutex);
     UA_DataSetWriter *currentDataSetWriter = UA_DataSetWriter_findDSWbyId(server, dsw);
-    if(!currentDataSetWriter)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_DataSetWriterConfig_copy(&currentDataSetWriter->config, config);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    if(currentDataSetWriter)
+        res = UA_DataSetWriterConfig_copy(&currentDataSetWriter->config, config);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode
@@ -55,12 +58,17 @@ UA_Server_DataSetWriter_getState(UA_Server *server, UA_NodeId dataSetWriterIdent
                                UA_PubSubState *state) {
     if((server == NULL) || (state == NULL))
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_LOCK(&server->serviceMutex);
     UA_DataSetWriter *currentDataSetWriter =
         UA_DataSetWriter_findDSWbyId(server, dataSetWriterIdentifier);
-    if(currentDataSetWriter == NULL)
-        return UA_STATUSCODE_BADNOTFOUND;
-    *state = currentDataSetWriter->state;
-    return UA_STATUSCODE_GOOD;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(currentDataSetWriter) {
+        *state = currentDataSetWriter->state;
+    } else {
+        res = UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_DataSetWriter *
@@ -186,7 +194,7 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
     }
     if (state != oldState) {
         /* inform application about state change */
-        UA_ServerConfig *pConfig = UA_Server_getConfig(server);
+        UA_ServerConfig *pConfig = &server->config;
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
             pConfig->pubSubConfig.
                 stateChangeCallback(server, &dataSetWriter->identifier, state, cause);
@@ -327,9 +335,9 @@ UA_Server_addDataSetWriter(UA_Server *server,
                            const UA_NodeId writerGroup, const UA_NodeId dataSet,
                            const UA_DataSetWriterConfig *dataSetWriterConfig,
                            UA_NodeId *writerIdentifier) {
+    UA_LOCK(&server->serviceMutex);
     /* Delete the reserved IDs if the related session no longer exists. */
     UA_PubSubManager_freeIds(server);
-    UA_LOCK(&server->serviceMutex);
     UA_StatusCode res = UA_DataSetWriter_create(server, writerGroup, dataSet,
                                                 dataSetWriterConfig, writerIdentifier);
     UA_UNLOCK(&server->serviceMutex);
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 72f3828950b..d07639f1e5c 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -576,10 +576,13 @@ UA_Server_getWriterGroupConfig(UA_Server *server, const UA_NodeId writerGroup,
                                UA_WriterGroupConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_LOCK(&server->serviceMutex);
     UA_WriterGroup *currentWG = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(!currentWG)
-        return UA_STATUSCODE_BADNOTFOUND;
-    return UA_WriterGroupConfig_copy(&currentWG->config, config);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    if(currentWG)
+        res = UA_WriterGroupConfig_copy(&currentWG->config, config);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode
@@ -651,12 +654,17 @@ UA_Server_WriterGroup_getState(UA_Server *server, UA_NodeId writerGroupIdentifie
                                UA_PubSubState *state) {
     if((server == NULL) || (state == NULL))
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+    UA_LOCK(&server->serviceMutex);
     UA_WriterGroup *currentWriterGroup =
         UA_WriterGroup_findWGbyId(server, writerGroupIdentifier);
-    if(currentWriterGroup == NULL)
-        return UA_STATUSCODE_BADNOTFOUND;
-    *state = currentWriterGroup->state;
-    return UA_STATUSCODE_GOOD;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(currentWriterGroup) {
+        *state = currentWriterGroup->state;
+    } else {
+        res = UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode
@@ -704,12 +712,12 @@ UA_WriterGroup_findWGbyId(UA_Server *server, UA_NodeId identifier) {
 }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-UA_StatusCode
-UA_Server_setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
-                                       UA_UInt32 securityTokenId,
-                                       const UA_ByteString signingKey,
-                                       const UA_ByteString encryptingKey,
-                                       const UA_ByteString keyNonce) {
+static UA_StatusCode
+setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
+                             UA_UInt32 securityTokenId,
+                             const UA_ByteString signingKey,
+                             const UA_ByteString encryptingKey,
+                             const UA_ByteString keyNonce) {
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
@@ -741,6 +749,19 @@ UA_Server_setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writer
     return wg->config.securityPolicy->
         setSecurityKeys(wg->securityPolicyContext, &signingKey, &encryptingKey, &keyNonce);
 }
+
+UA_StatusCode
+UA_Server_setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
+                                       UA_UInt32 securityTokenId,
+                                       const UA_ByteString signingKey,
+                                       const UA_ByteString encryptingKey,
+                                       const UA_ByteString keyNonce) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = setWriterGroupEncryptionKeys(server, writerGroup, securityTokenId,
+                                                     signingKey, encryptingKey, keyNonce);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
 #endif
 
 void
@@ -760,7 +781,7 @@ UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
     /* Delete all writers */
     UA_DataSetWriter *dataSetWriter, *tmpDataSetWriter;
     LIST_FOREACH_SAFE(dataSetWriter, &writerGroup->writers, listEntry, tmpDataSetWriter){
-        UA_Server_removeDataSetWriter(server, dataSetWriter->identifier);
+        removeDataSetWriter(server, dataSetWriter->identifier);
     }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
@@ -910,7 +931,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
 
     if(state != oldState) {
         /* inform application about state change */
-        UA_ServerConfig *pConfig = UA_Server_getConfig(server);
+        UA_ServerConfig *pConfig = &server->config;
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
             pConfig->pubSubConfig.
                 stateChangeCallback(server, &writerGroup->identifier, state, cause);
diff --git a/tests/pubsub/check_pubsub_configuration.c b/tests/pubsub/check_pubsub_configuration.c
index 99cc8146fdf..c2319e6e9c3 100644
--- a/tests/pubsub/check_pubsub_configuration.c
+++ b/tests/pubsub/check_pubsub_configuration.c
@@ -58,9 +58,9 @@ START_TEST(AddPublisherUsingBinaryFile) {
             }
         }
     }
-    ck_assert_int_eq(connectionCount, 1);
-    ck_assert_int_eq(writerGroupCount, 1);
-    ck_assert_int_eq(dataSetWriterCount, 1);
+    ck_assert_uint_eq(connectionCount, 1);
+    ck_assert_uint_eq(writerGroupCount, 1);
+    ck_assert_uint_eq(dataSetWriterCount, 1);
     UA_ByteString_clear(&publisherConfiguration);
 } END_TEST
 
@@ -91,9 +91,9 @@ START_TEST(AddSubscriberUsingBinaryFile) {
             }
         }
     }
-    ck_assert_int_eq(connectionCount, 1);
-    ck_assert_int_eq(readerGroupCount, 1);
-    ck_assert_int_eq(dataSetReaderCount, 1);
+    ck_assert_uint_eq(connectionCount, 1);
+    ck_assert_uint_eq(readerGroupCount, 1);
+    ck_assert_uint_eq(dataSetReaderCount, 1);
     UA_ByteString_clear(&subscriberConfiguration);
 } END_TEST
 
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 6f35ecd03d3..ff778f5107a 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -1563,7 +1563,9 @@ START_TEST(Test_string_publisherId_file_config) {
     UA_PubSubConfigurationDataType_clear(&config);
 }
     /* load and apply config from ByteString buffer */
+    UA_LOCK(&server->serviceMutex);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_PubSubManager_loadPubSubConfigFromByteString(server, encodedConfigDataBuffer));
+    UA_UNLOCK(&server->serviceMutex);
 
     /* groups are already operational */
     /* check that publish/subscribe works -> set some test values */

From e1e46b6e88eb634ebb051881d5d08faeb989be9e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 5 Jan 2023 10:36:11 +0100
Subject: [PATCH 0637/1963] fix(server): Fix a memleak in the browse service

---
 src/server/ua_services_view.c | 63 ++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 0661517490e..c727e586faf 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -808,22 +808,6 @@ browse(struct BrowseContext *bc, UA_BrowseResult *result) {
     /* Browse the node */
     browseWithNode(bc, &node->head);
     UA_NODESTORE_RELEASE(bc->server, node);
-
-    if(bc->status != UA_STATUSCODE_GOOD) {
-        result->statusCode = bc->status;
-        RefResult_clear(&bc->rr);
-        return;
-    }
-
-    /* Move results */
-    if(bc->rr.size > 0) {
-        result->references = bc->rr.descr;
-        result->referencesSize = bc->rr.size;
-    } else {
-        /* No relevant references, return array of length zero */
-        RefResult_clear(&bc->rr);
-        result->references = (UA_ReferenceDescription*)UA_EMPTY_ARRAY_SENTINEL;
-    }
 }
 
 /* Start to browse with no previous cp */
@@ -880,8 +864,20 @@ Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxref
     /* Perform the browse */
     browse(&bc, result);
 
+    if(bc.status != UA_STATUSCODE_GOOD || bc.rr.size == 0) {
+        /* No relevant references, return array of length zero */
+        RefResult_clear(&bc.rr);
+        result->references = (UA_ReferenceDescription*)UA_EMPTY_ARRAY_SENTINEL;
+        result->statusCode = bc.status;
+        return;
+    }
+
+    /* Move results */
+    result->references = bc.rr.descr;
+    result->referencesSize = bc.rr.size;
+
     /* Exit early if done */
-    if(bc.done || result->statusCode != UA_STATUSCODE_GOOD)
+    if(bc.done)
         return;
 
     /* Persist the continuation point */
@@ -1029,20 +1025,33 @@ Operation_BrowseNext(UA_Server *server, UA_Session *session,
     /* Continue browsing */
     browse(&bc, result);
 
-    if(bc.done || result->statusCode != UA_STATUSCODE_GOOD) {
+    if(bc.status != UA_STATUSCODE_GOOD || bc.rr.size == 0) {
+        /* No relevant references, return array of length zero */
+        RefResult_clear(&bc.rr);
+        result->references = (UA_ReferenceDescription*)UA_EMPTY_ARRAY_SENTINEL;
+        result->statusCode = bc.status;
+        goto remove_cp;
+    }
+
+    /* Move results */
+    result->references = bc.rr.descr;
+    result->referencesSize = bc.rr.size;
+
+    if(bc.done)
+        goto remove_cp;
+
+    /* Return the cp identifier to signal that there are references left */
+    bc.status = UA_ByteString_copy(&cp->identifier, &result->continuationPoint);
+    if(bc.status != UA_STATUSCODE_GOOD) {
+        UA_BrowseResult_clear(result);
+        result->statusCode = bc.status;
+    }
+
+ remove_cp:
         /* Remove the cp */
         *prev = ContinuationPoint_clear(cp);
         UA_free(cp);
         ++session->availableContinuationPoints;
-    } else {
-        /* Return the cp identifier to signal that there are references left */
-        UA_StatusCode retval =
-            UA_ByteString_copy(&cp->identifier, &result->continuationPoint);
-        if(retval != UA_STATUSCODE_GOOD) {
-            UA_BrowseResult_clear(result);
-            result->statusCode = retval;
-        }
-    }
 }
 
 void

From 0a8306df3fad4d54a3e2bdf7ae3467a1bd0876f5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 5 Jan 2023 10:40:54 +0100
Subject: [PATCH 0638/1963] refactor(server): Only validate the ReferenceType
 for browsing if no results

---
 src/server/ua_services_view.c | 64 ++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index c727e586faf..b8606307055 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -751,39 +751,17 @@ browseWithNode(struct BrowseContext *bc, const UA_NodeHead *head ) {
  * Including the BrowseDescription. Returns whether there are remaining
  * references. */
 static void
-browse(struct BrowseContext *bc, UA_BrowseResult *result) {
+browse(struct BrowseContext *bc) {
+    /* Is the browsedirection valid? */
     struct ContinuationPoint *cp = bc->cp;
     const UA_BrowseDescription *descr = &cp->browseDescription;
-
-    /* Is the browsedirection valid? */
     if(descr->browseDirection != UA_BROWSEDIRECTION_BOTH &&
        descr->browseDirection != UA_BROWSEDIRECTION_FORWARD &&
        descr->browseDirection != UA_BROWSEDIRECTION_INVERSE) {
-        result->statusCode = UA_STATUSCODE_BADBROWSEDIRECTIONINVALID;
+        bc->status = UA_STATUSCODE_BADBROWSEDIRECTIONINVALID;
         return;
     }
 
-    /* Is the reference type valid? */
-    if(!UA_NodeId_isNull(&descr->referenceTypeId)) {
-        const UA_Node *reftype =
-            UA_NODESTORE_GET_SELECTIVE(bc->server, &descr->referenceTypeId,
-                                       UA_NODEATTRIBUTESMASK_NODECLASS,
-                                       UA_REFERENCETYPESET_NONE,
-                                       UA_BROWSEDIRECTION_INVALID);
-        if(!reftype) {
-            result->statusCode = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
-            return;
-        }
-
-        UA_Boolean isRef = (reftype->head.nodeClass == UA_NODECLASS_REFERENCETYPE);
-        UA_NODESTORE_RELEASE(bc->server, reftype);
-
-        if(!isRef) {
-            result->statusCode = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
-            return;
-        }
-    }
-
     /* Get node with only the selected references and attributes */
     const UA_Node *node =
         UA_NODESTORE_GET_SELECTIVE(bc->server, &descr->nodeId,
@@ -808,6 +786,29 @@ browse(struct BrowseContext *bc, UA_BrowseResult *result) {
     /* Browse the node */
     browseWithNode(bc, &node->head);
     UA_NODESTORE_RELEASE(bc->server, node);
+
+    /* Is the reference type valid? This is very infrequent. So we only test
+     * this if browsing came up empty. If the node has references of that type,
+     * we know the reftype to be good. */
+    if(bc->rr.size == 0 && !UA_NodeId_isNull(&descr->referenceTypeId)) {
+        const UA_Node *reftype =
+            UA_NODESTORE_GET_SELECTIVE(bc->server, &descr->referenceTypeId,
+                                       UA_NODEATTRIBUTESMASK_NODECLASS,
+                                       UA_REFERENCETYPESET_NONE,
+                                       UA_BROWSEDIRECTION_INVALID);
+        if(!reftype) {
+            bc->status = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
+            return;
+        }
+
+        UA_Boolean isRef = (reftype->head.nodeClass == UA_NODECLASS_REFERENCETYPE);
+        UA_NODESTORE_RELEASE(bc->server, reftype);
+
+        if(!isRef) {
+            bc->status = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
+            return;
+        }
+    }
 }
 
 /* Start to browse with no previous cp */
@@ -862,7 +863,7 @@ Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxref
         return;
 
     /* Perform the browse */
-    browse(&bc, result);
+    browse(&bc);
 
     if(bc.status != UA_STATUSCODE_GOOD || bc.rr.size == 0) {
         /* No relevant references, return array of length zero */
@@ -1023,7 +1024,7 @@ Operation_BrowseNext(UA_Server *server, UA_Session *session,
         return;
 
     /* Continue browsing */
-    browse(&bc, result);
+    browse(&bc);
 
     if(bc.status != UA_STATUSCODE_GOOD || bc.rr.size == 0) {
         /* No relevant references, return array of length zero */
@@ -1046,12 +1047,13 @@ Operation_BrowseNext(UA_Server *server, UA_Session *session,
         UA_BrowseResult_clear(result);
         result->statusCode = bc.status;
     }
+    return;
 
  remove_cp:
-        /* Remove the cp */
-        *prev = ContinuationPoint_clear(cp);
-        UA_free(cp);
-        ++session->availableContinuationPoints;
+    /* Remove the cp */
+    *prev = ContinuationPoint_clear(cp);
+    UA_free(cp);
+    ++session->availableContinuationPoints;
 }
 
 void

From 3e0ca367830cbbec5ed9b5c64d01e8c7f7550cd1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 5 Jan 2023 20:40:36 +0100
Subject: [PATCH 0639/1963] fix(pubsub): Clean up thread-safety issues in the
 SKS

---
 src/pubsub/ua_pubsub.h                        |  14 ++
 src/pubsub/ua_pubsub_keystorage.c             | 127 ++++++++++--------
 src/pubsub/ua_pubsub_keystorage.h             |   7 +-
 src/pubsub/ua_pubsub_ns0.c                    |   8 +-
 src/pubsub/ua_pubsub_readergroup.c            |   4 +-
 src/pubsub/ua_pubsub_securitygroup.c          |  23 ++--
 src/pubsub/ua_pubsub_writergroup.c            |   4 +-
 tests/pubsub/check_pubsub_keystorage.c        |  45 +++++--
 tests/pubsub/check_pubsub_sks_push.c          |  20 ++-
 .../pubsub/check_pubsub_sks_securitygroups.c  |  18 ++-
 10 files changed, 170 insertions(+), 100 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 3498b67fdab..f046d6aed1b 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -324,6 +324,13 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
 UA_StatusCode
 removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup);
 
+UA_StatusCode
+setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
+                             UA_UInt32 securityTokenId,
+                             const UA_ByteString signingKey,
+                             const UA_ByteString encryptingKey,
+                             const UA_ByteString keyNonce);
+
 UA_StatusCode
 UA_WriterGroupConfig_copy(const UA_WriterGroupConfig *src,
                           UA_WriterGroupConfig *dst);
@@ -552,6 +559,13 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
 UA_StatusCode
 removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier);
 
+UA_StatusCode
+setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
+                             UA_UInt32 securityTokenId,
+                             const UA_ByteString signingKey,
+                             const UA_ByteString encryptingKey,
+                             const UA_ByteString keyNonce);
+
 UA_StatusCode
 UA_ReaderGroupConfig_copy(const UA_ReaderGroupConfig *src,
                           UA_ReaderGroupConfig *dst);
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 249e3a06b9d..6eafe7ced57 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -13,10 +13,12 @@
 #include "server/ua_server_internal.h"
 
 UA_PubSubKeyStorage *
-UA_Server_findKeyStorage(UA_Server *server, UA_String securityGroupId) {
+UA_PubSubKeyStorage_findKeyStorage(UA_Server *server, UA_String securityGroupId) {
     if(!server || UA_String_isEmpty(&securityGroupId))
         return NULL;
 
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_PubSubKeyStorage *outKeyStorage;
     LIST_FOREACH(outKeyStorage, &server->pubSubManager.pubSubKeyList, keyStorageList) {
         if(UA_String_equal(&outKeyStorage->securityGroupID, &securityGroupId))
@@ -25,23 +27,20 @@ UA_Server_findKeyStorage(UA_Server *server, UA_String securityGroupId) {
     return NULL;
 }
 
-UA_StatusCode
-UA_Server_findPubSubSecurityPolicy(UA_Server *server, const UA_String *securityPolicyUri,
-                                   UA_PubSubSecurityPolicy **policy) {
+UA_PubSubSecurityPolicy *
+findPubSubSecurityPolicy(UA_Server *server, const UA_String *securityPolicyUri) {
     if(!server || !securityPolicyUri)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
+        return NULL;
+
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_StatusCode retval = UA_STATUSCODE_BADNOTFOUND;
     UA_ServerConfig *config = &server->config;
     for(size_t i = 0; i < config->pubSubConfig.securityPoliciesSize; i++) {
         if(UA_String_equal(securityPolicyUri,
-                           &config->pubSubConfig.securityPolicies[i].policyUri)) {
-            *policy = &config->pubSubConfig.securityPolicies[i];
-            retval = UA_STATUSCODE_GOOD;
-            break;
-        }
+                           &config->pubSubConfig.securityPolicies[i].policyUri))
+            return &config->pubSubConfig.securityPolicies[i];
     }
-    return retval;
+    return NULL;
 }
 
 static void
@@ -63,6 +62,8 @@ UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     UA_assert(keyStorage != NULL);
     UA_assert(server != NULL);
 
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Remove callback */
     if(!keyStorage->callBackId) {
         removeCallback(server, keyStorage->callBackId);
@@ -103,8 +104,8 @@ UA_PubSubKeyStorage_storeSecurityKeys(UA_Server *server, UA_PubSubKeyStorage *ke
                                       UA_UInt32 currentTokenId, const UA_ByteString *currentKey,
                                       UA_ByteString *futureKeys, size_t futureKeyCount,
                                       UA_Duration msKeyLifeTime) {
-
     UA_assert(server);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_StatusCode retval = UA_STATUSCODE_BAD;
 
@@ -205,6 +206,9 @@ UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
                                            UA_UInt64 *callbackID) {
     if(!server || !keyStorage || !callback || timeToNextMs <= 0)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_DateTime dateTimeToNextKey = UA_DateTime_nowMonotonic() +
         (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);
     UA_EventLoop *el = server->config.eventLoop;
@@ -254,20 +258,24 @@ static UA_StatusCode
 setPubSubGroupEncryptingKey(UA_Server *server, UA_NodeId PubSubGroupId, UA_UInt32 securityTokenId,
                             UA_ByteString signingKey, UA_ByteString encryptingKey,
                             UA_ByteString keyNonce) {
-    UA_StatusCode retval = UA_STATUSCODE_BAD;
-    retval = UA_Server_setWriterGroupEncryptionKeys(
-        server, PubSubGroupId, securityTokenId, signingKey, encryptingKey, keyNonce);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_StatusCode retval =
+        setWriterGroupEncryptionKeys(server, PubSubGroupId, securityTokenId,
+                                     signingKey, encryptingKey, keyNonce);
     if(retval == UA_STATUSCODE_BADNOTFOUND)
-        retval = UA_Server_setReaderGroupEncryptionKeys(
-            server, PubSubGroupId, securityTokenId, signingKey, encryptingKey, keyNonce);
-
+        retval = setReaderGroupEncryptionKeys(server, PubSubGroupId, securityTokenId,
+                                              signingKey, encryptingKey, keyNonce);
     return retval;
 }
 
 static UA_StatusCode
-setPubSubGroupEncryptingKeyForMatchingSecurityGroupId(
-    UA_Server *server, UA_String securityGroupId, UA_UInt32 securityTokenId,
-    UA_ByteString signingKey, UA_ByteString encryptingKey, UA_ByteString keyNonce) {
+setPubSubGroupEncryptingKeyForMatchingSecurityGroupId(UA_Server *server,
+                                                      UA_String securityGroupId,
+                                                      UA_UInt32 securityTokenId,
+                                                      UA_ByteString signingKey,
+                                                      UA_ByteString encryptingKey,
+                                                      UA_ByteString keyNonce) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_StatusCode retval = UA_STATUSCODE_BAD;
     UA_PubSubConnection *tmpPubSubConnections;
 
@@ -279,9 +287,9 @@ setPubSubGroupEncryptingKeyForMatchingSecurityGroupId(
         UA_WriterGroup *tmpWriterGroup;
         LIST_FOREACH(tmpWriterGroup, &tmpPubSubConnections->writerGroups, listEntry) {
             if(UA_String_equal(&tmpWriterGroup->config.securityGroupId, &securityGroupId)) {
-                retval = UA_Server_setWriterGroupEncryptionKeys(server, tmpWriterGroup->identifier,
-                                                                securityTokenId, signingKey,
-                                                                encryptingKey, keyNonce);
+                retval = setWriterGroupEncryptionKeys(server, tmpWriterGroup->identifier,
+                                                      securityTokenId, signingKey,
+                                                      encryptingKey, keyNonce);
                 if(retval != UA_STATUSCODE_GOOD)
                     return retval;
             }
@@ -291,9 +299,9 @@ setPubSubGroupEncryptingKeyForMatchingSecurityGroupId(
         UA_ReaderGroup *tmpReaderGroup;
         LIST_FOREACH(tmpReaderGroup, &tmpPubSubConnections->readerGroups, listEntry) {
             if(UA_String_equal(&tmpReaderGroup->config.securityGroupId, &securityGroupId)) {
-                retval = UA_Server_setReaderGroupEncryptionKeys(server, tmpReaderGroup->identifier,
-                                                                securityTokenId, signingKey,
-                                                                encryptingKey, keyNonce);
+                retval = setReaderGroupEncryptionKeys(server, tmpReaderGroup->identifier,
+                                                      securityTokenId, signingKey,
+                                                      encryptingKey, keyNonce);
                 if(retval != UA_STATUSCODE_GOOD)
                     return retval;
             }
@@ -304,15 +312,13 @@ setPubSubGroupEncryptingKeyForMatchingSecurityGroupId(
 
 UA_StatusCode
 UA_PubSubKeyStorage_activateKeyToChannelContext(UA_Server *server, UA_NodeId pubSubGroupId,
-                                              UA_String securityGroupId) {
-
+                                                UA_String securityGroupId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(securityGroupId.data == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-
     UA_PubSubKeyStorage *keyStorage =
-        UA_Server_findKeyStorage(server, securityGroupId);
+        UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
     if(!keyStorage)
         return UA_STATUSCODE_BADNOTFOUND;
 
@@ -325,7 +331,8 @@ UA_PubSubKeyStorage_activateKeyToChannelContext(UA_Server *server, UA_NodeId pub
     UA_ByteString signingKey;
     UA_ByteString encryptKey;
     UA_ByteString keyNonce;
-    retval = splitCurrentKeyMaterial(keyStorage, &signingKey, &encryptKey, &keyNonce);
+    UA_StatusCode retval = splitCurrentKeyMaterial(keyStorage, &signingKey,
+                                                   &encryptKey, &keyNonce);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -346,10 +353,12 @@ UA_PubSubKeyStorage_activateKeyToChannelContext(UA_Server *server, UA_NodeId pub
 
 void
 UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
-
-    UA_StatusCode retval = UA_PubSubKeyStorage_addKeyRolloverCallback(
-        server, keyStorage, (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback,
-        keyStorage->keyLifeTime, &keyStorage->callBackId);
+    /* Callbacks from the EventLoop are initially unlocked */
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode retval =
+        UA_PubSubKeyStorage_addKeyRolloverCallback(server, keyStorage,
+                                     (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback,
+                                                   keyStorage->keyLifeTime, &keyStorage->callBackId);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "Failed to update keys for security group id '%.*s'. Reason: '%s'.",
@@ -360,17 +369,16 @@ UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *
     if(keyStorage->currentItem != TAILQ_LAST(&keyStorage->keyList, keyListItems)) {
         keyStorage->currentItem = TAILQ_NEXT(keyStorage->currentItem, keyListEntry);
         keyStorage->currentTokenId = keyStorage->currentItem->keyID;
-
-        retval = UA_PubSubKeyStorage_activateKeyToChannelContext(
-            server, UA_NODEID_NULL, keyStorage->securityGroupID);
+        retval = UA_PubSubKeyStorage_activateKeyToChannelContext(server, UA_NODEID_NULL,
+                                                                 keyStorage->securityGroupID);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(
-                &server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Failed to update keys for security group id '%.*s'. Reason: '%s'.",
-                (int)keyStorage->securityGroupID.length, keyStorage->securityGroupID.data,
-                UA_StatusCode_name(retval));
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                         "Failed to update keys for security group id '%.*s'. Reason: '%s'.",
+                         (int)keyStorage->securityGroupID.length, keyStorage->securityGroupID.data,
+                         UA_StatusCode_name(retval));
         }
     }
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 UA_StatusCode
@@ -378,32 +386,33 @@ UA_PubSubKeyStorage_update(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
                            const UA_ByteString *currentKey, UA_UInt32 currentKeyID,
                            const size_t futureKeySize, UA_ByteString *futureKeys,
                            UA_Duration msKeyLifeTime) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(!keyStorage)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_PubSubKeyListItem *keyListIterator = NULL;
 
-    if (currentKeyID != 0){
-        /*if currentKeyId is known then update keystorage currentItem*/
+    if(currentKeyID != 0){
+        /* If currentKeyId is known then update keystorage currentItem */
         retval = UA_PubSubKeyStorage_getKeyByKeyID(currentKeyID, keyStorage,
                                                    &keyListIterator);
-        if (retval == UA_STATUSCODE_GOOD && keyListIterator) {
+        if(retval == UA_STATUSCODE_GOOD && keyListIterator) {
             keyStorage->currentItem = keyListIterator;
-            /*Add new keys at the end of KeyList*/
-            retval = UA_PubSubKeyStorage_storeSecurityKeys(
-                server, keyStorage, currentKeyID, NULL,
-                futureKeys, futureKeySize, msKeyLifeTime);
+            /* Add new keys at the end of KeyList */
+            retval = UA_PubSubKeyStorage_storeSecurityKeys(server, keyStorage, currentKeyID,
+                                                           NULL, futureKeys, futureKeySize,
+                                                           msKeyLifeTime);
             if(retval != UA_STATUSCODE_GOOD)
                 return retval;
         } else if(retval == UA_STATUSCODE_BADNOTFOUND) {
-            /*If the CurrentTokenId is unknown, the existing list shall be discarded and
-             * replaced by the fetched list*/
+            /* If the CurrentTokenId is unknown, the existing list shall be
+             * discarded and replaced by the fetched list */
             UA_PubSubKeyStorage_clearKeyList(keyStorage);
             retval = UA_PubSubKeyStorage_storeSecurityKeys(server, keyStorage,
-                                                  currentKeyID, currentKey, futureKeys,
-                                                  futureKeySize, msKeyLifeTime);
-            if (retval != UA_STATUSCODE_GOOD)
+                                                           currentKeyID, currentKey, futureKeys,
+                                                           futureKeySize, msKeyLifeTime);
+            if(retval != UA_STATUSCODE_GOOD)
                 return retval;
         }
     }
@@ -412,6 +421,8 @@ UA_PubSubKeyStorage_update(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
 
 void
 UA_PubSubKeyStorage_detachKeyStorage(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     keyStorage->referenceCount--;
     if(keyStorage->referenceCount == 0) {
         LIST_REMOVE(keyStorage, keyStorageList);
diff --git a/src/pubsub/ua_pubsub_keystorage.h b/src/pubsub/ua_pubsub_keystorage.h
index ec18e9dc0e1..d3da7911586 100644
--- a/src/pubsub/ua_pubsub_keystorage.h
+++ b/src/pubsub/ua_pubsub_keystorage.h
@@ -202,7 +202,7 @@ typedef struct UA_PubSubKeyStorage {
  * @return Pointer to the keystorage on success, null pointer on failure
  */
 UA_PubSubKeyStorage *
-UA_Server_findKeyStorage(UA_Server *server, UA_String securityGroupId);
+UA_PubSubKeyStorage_findKeyStorage(UA_Server *server, UA_String securityGroupId);
 
 /**
  * @brief retreives the security policy pointer from the PubSub configuration by
@@ -213,9 +213,8 @@ UA_Server_findKeyStorage(UA_Server *server, UA_String securityGroupId);
  * @param policy the pointer to the security policy
  * @return UA_StatusCode return status code
  */
-UA_StatusCode
-UA_Server_findPubSubSecurityPolicy(UA_Server *server, const UA_String *securityPolicyUri,
-                                   UA_PubSubSecurityPolicy **policy);
+UA_PubSubSecurityPolicy *
+findPubSubSecurityPolicy(UA_Server *server, const UA_String *securityPolicyUri);
 
 /**
  * @brief Deletes the keystorage from the server and its members
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 744b192ec47..4c8959a63bb 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1957,7 +1957,7 @@ setSecurityKeysLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessi
     UA_Duration msKeyLifeTime = *(UA_Duration *)input[6].data;
 
     UA_PubSubKeyStorage *ks =
-        UA_Server_findKeyStorage(server, *securityGroupId);
+        UA_PubSubKeyStorage_findKeyStorage(server, *securityGroupId);
     if(!ks)
         return UA_STATUSCODE_BADNOTFOUND;
 
@@ -1965,8 +1965,8 @@ setSecurityKeysLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessi
         return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
 
     if(ks->keyListSize == 0) {
-        retval = UA_PubSubKeyStorage_storeSecurityKeys(
-            server, ks, currentKeyId, currentKey, futureKeys, futureKeySize,
+        retval = UA_PubSubKeyStorage_storeSecurityKeys(server, ks, currentKeyId,
+                                                       currentKey, futureKeys, futureKeySize,
             msKeyLifeTime);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
@@ -2054,7 +2054,7 @@ getSecurityKeysLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessi
     UA_UInt32 requestedKeyCount = *(UA_UInt32 *)input[2].data;
 
     UA_PubSubKeyStorage *ks =
-        UA_Server_findKeyStorage(server, *securityGroupId);
+        UA_PubSubKeyStorage_findKeyStorage(server, *securityGroupId);
     if(!ks)
         return UA_STATUSCODE_BADNOTFOUND;
 
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 760fca5c22b..68ece0ddeff 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -158,7 +158,7 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
            readerGroupConfig->securityPolicy) {
             /* Does the key storage already exist? */
             newGroup->keyStorage =
-                UA_Server_findKeyStorage(server, readerGroupConfig->securityGroupId);
+                UA_PubSubKeyStorage_findKeyStorage(server, readerGroupConfig->securityGroupId);
 
             if(!newGroup->keyStorage) {
                 /* Create a new key storage */
@@ -509,7 +509,7 @@ UA_Server_setReaderGroupDisabled(UA_Server *server, const UA_NodeId readerGroupI
 }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-static UA_StatusCode
+UA_StatusCode
 setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
                              UA_UInt32 securityTokenId,
                              const UA_ByteString signingKey,
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index f83e4c32c52..401ca0756d3 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -143,22 +143,20 @@ static UA_StatusCode
 initializeKeyStorageWithKeys(UA_Server *server, UA_SecurityGroup *securityGroup) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_PubSubSecurityPolicy *policy = NULL;
-    UA_StatusCode retval =
-        UA_Server_findPubSubSecurityPolicy(server,
-                                           &securityGroup->config.securityPolicyUri,
-                                           &policy);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    UA_PubSubSecurityPolicy *policy =
+        findPubSubSecurityPolicy(server, &securityGroup->config.securityPolicyUri);
+    if(!policy)
+        return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
 
     UA_PubSubKeyStorage *ks = (UA_PubSubKeyStorage *)
         UA_calloc(1, sizeof(UA_PubSubKeyStorage));
     if(!ks)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    retval = UA_PubSubKeyStorage_init(server, ks, &securityGroup->securityGroupId,
-                                      policy, securityGroup->config.maxPastKeyCount,
-                                      securityGroup->config.maxFutureKeyCount);
+    UA_StatusCode retval =
+        UA_PubSubKeyStorage_init(server, ks, &securityGroup->securityGroupId,
+                                 policy, securityGroup->config.maxPastKeyCount,
+                                 securityGroup->config.maxFutureKeyCount);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_free(ks);
         return retval;
@@ -216,9 +214,8 @@ addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
     if(UA_SecurityGroup_findSGbyName(server, securityGroupConfig->securityGroupName))
         return UA_STATUSCODE_BADNODEIDEXISTS;
 
-    UA_PubSubSecurityPolicy *policy = NULL;
-    UA_Server_findPubSubSecurityPolicy(server, &securityGroupConfig->securityPolicyUri,
-                                       &policy);
+    UA_PubSubSecurityPolicy *policy =
+        findPubSubSecurityPolicy(server, &securityGroupConfig->securityPolicyUri);
     if(!policy)
         return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index d07639f1e5c..b313057af80 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -151,7 +151,7 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
            writerGroupConfig->securityPolicy) {
             /* Does the key storage already exist? */
             newWriterGroup->keyStorage =
-                UA_Server_findKeyStorage(server, writerGroupConfig->securityGroupId);
+                UA_PubSubKeyStorage_findKeyStorage(server, writerGroupConfig->securityGroupId);
 
             if(!newWriterGroup->keyStorage) {
                 /* Create a new key storage */
@@ -712,7 +712,7 @@ UA_WriterGroup_findWGbyId(UA_Server *server, UA_NodeId identifier) {
 }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-static UA_StatusCode
+UA_StatusCode
 setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
                              UA_UInt32 securityTokenId,
                              const UA_ByteString signingKey,
diff --git a/tests/pubsub/check_pubsub_keystorage.c b/tests/pubsub/check_pubsub_keystorage.c
index 435f36786d0..01dc2b90c1c 100644
--- a/tests/pubsub/check_pubsub_keystorage.c
+++ b/tests/pubsub/check_pubsub_keystorage.c
@@ -116,15 +116,16 @@ addTestReaderGroup(UA_String securitygroupId){
 
 static UA_PubSubKeyStorage*
 createKeyStoragewithkeys(UA_UInt32 currentTokenId, UA_UInt32 keysize,
-                         UA_Duration msKeyLifeTime, UA_Duration msTimeToNextKey, UA_String testSecurityGroupId) {
-
+                         UA_Duration msKeyLifeTime, UA_Duration msTimeToNextKey,
+                         UA_String testSecurityGroupId) {
     UA_StatusCode retval = UA_STATUSCODE_BAD;
     UA_Duration callbackTime;
     addTestWriterGroup(SecurityGroupId);
     addTestReaderGroup(SecurityGroupId);
 
+    UA_LOCK(&server->serviceMutex);
     UA_PubSubKeyStorage *tKeyStorage =
-        UA_Server_findKeyStorage(server, SecurityGroupId);
+        UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
 
     size_t keyLength = server->config.pubSubConfig.securityPolicies->symmetricModule
                            .secureChannelNonceLength;
@@ -159,6 +160,7 @@ createKeyStoragewithkeys(UA_UInt32 currentTokenId, UA_UInt32 keysize,
     retval = UA_PubSubKeyStorage_addKeyRolloverCallback(
         server, tKeyStorage, (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback, callbackTime,
         &tKeyStorage->callBackId);
+    UA_UNLOCK(&server->serviceMutex);
 
     return tKeyStorage;
 }
@@ -201,7 +203,6 @@ setup(void) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection);
-
 }
 
 static void teardown(void) {
@@ -222,6 +223,9 @@ START_TEST(TestPubSubKeyStorage_initialize) {
     UA_PubSubKeyStorage *tKeyStorage = (UA_PubSubKeyStorage *)
         UA_calloc(1, sizeof(UA_PubSubKeyStorage));
     ck_assert_ptr_ne(tKeyStorage, NULL);
+
+    UA_LOCK(&server->serviceMutex);
+
     retval =
         UA_PubSubKeyStorage_init(server, tKeyStorage,
                                  &SecurityGroupId, server->config.pubSubConfig.securityPolicies,
@@ -238,6 +242,8 @@ START_TEST(TestPubSubKeyStorage_initialize) {
     ck_assert_msg(UA_String_equal(&tKeyStorage->securityGroupID, &SecurityGroupId), "Expected SecurityGroupId to be equal to keystorage->securityGroupID");
     /*check if the keystorage is in the Server Keystorage list*/
     ck_assert_ptr_eq(server->pubSubManager.pubSubKeyList.lh_first, tKeyStorage);
+
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorageSetKeys){
@@ -246,6 +252,7 @@ START_TEST(TestPubSubKeyStorageSetKeys){
     UA_Duration msTimeToNextKey = 2000;
     UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
     UA_PubSubKeyStorage *tKeyStorage = createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey, 0, testSecurityGroupId);
+    UA_LOCK(&server->serviceMutex);
     UA_PubSubKeyListItem *keyListIterator;
     ck_assert_ptr_ne(tKeyStorage, NULL);
     ck_assert_msg(UA_ByteString_equal(&currentKey, &tKeyStorage->keyList.tqh_first->key), "Expected CurrentKey to be equal to the first key in the KeyList");
@@ -259,6 +266,7 @@ START_TEST(TestPubSubKeyStorageSetKeys){
     ck_assert_msg(UA_ByteString_equal(&futureKey[futureKeySize - 1], &keyListIterator->key), "Expected lastItem to be equal to the last FutureKey");
     ck_assert_msg(futureKeySize + 1 == tKeyStorage->keyListSize,"Expected KeyListSize to be equal to FutureKeySize + 1");
     ck_assert_msg(tKeyStorage->keyLifeTime == msTimeToNextKey, "Expected keyLifetime to be equal to the Keystorage->keyLifeTime");
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorage_MovetoNextKeyCallback){
@@ -266,10 +274,14 @@ START_TEST(TestPubSubKeyStorage_MovetoNextKeyCallback){
     futureKeySize = 2;
     UA_Duration msTimeToNextKey = 2000;
     UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
+
     UA_PubSubKeyStorage *tKeyStorage = createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey, 0, testSecurityGroupId);
+    UA_LOCK(&server->serviceMutex);
     ck_assert_ptr_ne(tKeyStorage, NULL);
     UA_PubSubKeyListItem *nextCurrentKey = TAILQ_NEXT(tKeyStorage->currentItem, keyListEntry);
     UA_fakeSleep(2000);
+    UA_UNLOCK(&server->serviceMutex);
+
     UA_Server_run_iterate(server,false);
     ck_assert_ptr_eq(nextCurrentKey, tKeyStorage->currentItem);
     ck_assert_msg(UA_ByteString_equal(&nextCurrentKey->key, &tKeyStorage->currentItem->key), "Expected Current key to be the First Future key after first TimeToNextKey expires");
@@ -300,6 +312,7 @@ START_TEST(TestPubSubKeystorage_ImportedKey){
     UA_ByteString_copy(&buffer, &expect_buf);
 
     createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey,0, testSecurityGroupId);
+    UA_LOCK(&server->serviceMutex);
 
     /*encrypt and sign with Writer channelContext*/
 
@@ -323,49 +336,63 @@ START_TEST(TestPubSubKeystorage_ImportedKey){
     UA_ByteString_clear(&expect_buf);
     UA_ByteString_clear(&signature);
     UA_ByteString_clear(&buffer);
+
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorage_InitWithWriterGroup){
     addTestWriterGroup(SecurityGroupId);
+    UA_LOCK(&server->serviceMutex);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     ck_assert_ptr_ne(wg->keyStorage, NULL);
     ck_assert_ptr_eq(ks, wg->keyStorage);
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorage_InitWithReaderGroup){
     addTestReaderGroup(SecurityGroupId);
+    UA_LOCK(&server->serviceMutex);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     ck_assert_ptr_ne(rg->keyStorage, NULL);
     ck_assert_ptr_eq(ks, rg->keyStorage);
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 START_TEST(TestAddingNewGroupToExistingKeyStorage){
     addTestWriterGroup(SecurityGroupId);
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     ck_assert_msg(ks->referenceCount == 1, "Expected the reference Count to be exactly 1 after adding one Group");
+    UA_UNLOCK(&server->serviceMutex);
     addTestReaderGroup(SecurityGroupId);
+    UA_LOCK(&server->serviceMutex);
     ck_assert_msg(ks->referenceCount == 2, "Expected the reference Count to be exactly 2 after adding second Group same SecurityGroupId");
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
     ck_assert_ptr_eq(ks, rg->keyStorage);
     ck_assert_ptr_eq(ks, wg->keyStorage);
     ck_assert_ptr_eq(rg->keyStorage, wg->keyStorage);
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 START_TEST(TestRemoveAPubSubGroupWithKeyStorage){
     addTestWriterGroup(SecurityGroupId);
     addTestReaderGroup(SecurityGroupId);
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     UA_UInt32 refCountBefore = ks->referenceCount;
+    UA_UNLOCK(&server->serviceMutex);
     UA_Server_removeWriterGroup(server, writerGroup);
     --refCountBefore;
     ck_assert_msg(ks->referenceCount == refCountBefore, "Expected keyStroage referenceCount to be One less then before after removing a Group");
     UA_Server_removeReaderGroup(server, readerGroup);
+    UA_LOCK(&server->serviceMutex);
     ks = NULL;
-    ks = UA_Server_findKeyStorage(server, SecurityGroupId);
+    ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     ck_assert_ptr_eq(ks, NULL);
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 int
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index acde9ad1c14..d809097e932 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -280,10 +280,13 @@ START_TEST(TestSetSecurityKeys_GOOD) {
 
     UA_StatusCode retval = encyrptedclientconnect(client);
 
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, securityGroupId);
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
+    UA_UNLOCK(&server->serviceMutex);
 
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
-    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n",
+                  UA_StatusCode_name(retval));
     ck_assert_uint_eq(ks->currentItem->keyID, currentTokenId);
 
     startingTokenId = currentTokenId;
@@ -304,7 +307,9 @@ START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingList){
 
     UA_StatusCode retval = encyrptedclientconnect(client);
 
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, securityGroupId);
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
+    UA_UNLOCK(&server->serviceMutex);
 
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
@@ -324,7 +329,10 @@ START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingListAndAddNewFutureKe
     size_t keyListSize;
     UA_StatusCode retval = encyrptedclientconnect(client);
 
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, securityGroupId);
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
+    UA_UNLOCK(&server->serviceMutex);
+
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
 
@@ -353,7 +361,9 @@ START_TEST(TestSetSecurityKeys_ReplaceExistingKeyListWithFetchedKeyList){
 
     UA_StatusCode retval = encyrptedclientconnect(client);
 
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, securityGroupId);
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
+    UA_UNLOCK(&server->serviceMutex);
 
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
diff --git a/tests/pubsub/check_pubsub_sks_securitygroups.c b/tests/pubsub/check_pubsub_sks_securitygroups.c
index 6ba32afaf0a..20679e6507d 100644
--- a/tests/pubsub/check_pubsub_sks_securitygroups.c
+++ b/tests/pubsub/check_pubsub_sks_securitygroups.c
@@ -154,6 +154,7 @@ START_TEST(AddSecurityGroupWithvalidConfig) {
                                         &securityGroupNodeId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
+    UA_LOCK(&server->serviceMutex);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
     ck_assert(UA_NodeId_equal(&sg->securityGroupNodeId, &securityGroupNodeId) == UA_TRUE);
@@ -161,6 +162,8 @@ START_TEST(AddSecurityGroupWithvalidConfig) {
               UA_TRUE);
     ck_assert(UA_String_equal(&sg->securityGroupId, &config.securityGroupName) ==
               UA_TRUE);
+    UA_UNLOCK(&server->serviceMutex);
+
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     /*check properties*/
     UA_Variant value;
@@ -240,17 +243,21 @@ START_TEST(RemoveSecurityGroup) {
                                         &securityGroupNodeId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
+    UA_LOCK(&server->serviceMutex);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
+    UA_UNLOCK(&server->serviceMutex);
 
     UA_Server_removeSecurityGroup(server, securityGroupNodeId);
 
+    UA_LOCK(&server->serviceMutex);
     sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_eq(sg, NULL);
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 START_TEST(AddSecurityGroupWithKeyManagement){
-     UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
     UA_NodeId securityGroupNodeId;
     UA_NodeId securityGroupParent =
         UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
@@ -267,9 +274,10 @@ START_TEST(AddSecurityGroupWithKeyManagement){
                                         &securityGroupNodeId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
+    UA_LOCK(&server->serviceMutex);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, sg->securityGroupId);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, sg->securityGroupId);
     ck_assert_ptr_ne(ks, NULL);
     ck_assert_uint_eq(ks->keyListSize, 1 + config.maxFutureKeyCount);
     UA_UInt32 expectKeyId = 1;
@@ -281,6 +289,7 @@ START_TEST(AddSecurityGroupWithKeyManagement){
         iterator = TAILQ_NEXT(iterator, keyListEntry);
         expectKeyId++;
     }
+    UA_UNLOCK(&server->serviceMutex);
 } END_TEST
 
 START_TEST(SecurityGroupPeriodicInsertNewKeys){
@@ -301,13 +310,15 @@ START_TEST(SecurityGroupPeriodicInsertNewKeys){
                                         &securityGroupNodeId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
+    UA_LOCK(&server->serviceMutex);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
-    UA_PubSubKeyStorage *ks = UA_Server_findKeyStorage(server, sg->securityGroupId);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, sg->securityGroupId);
     ck_assert_ptr_ne(ks, NULL);
 
     UA_UInt32 expectKeyId = 1;
     UA_PubSubKeyListItem *preLastItem = TAILQ_LAST(&ks->keyList, keyListItems);
+    UA_UNLOCK(&server->serviceMutex);
     for (size_t i = 0; i < ks->keyListSize; i++) {
         UA_fakeSleep(500);
         UA_Server_run_iterate(server, false);
@@ -320,6 +331,7 @@ START_TEST(SecurityGroupPeriodicInsertNewKeys){
         expectKeyId++;
     }
 } END_TEST
+
 int
 main(void) {
     int number_failed = 0;

From be83185d56985f487d0abcecd31c692b75152dc8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 02:19:26 +0100
Subject: [PATCH 0640/1963] feat(client): Warn if the EndpointUrl returned from
 the server does not match the request

---
 src/client/ua_client_connect.c   |  3 +++
 src/client/ua_client_discovery.c | 32 ++++++++++++++++++++++++++++++++
 src/client/ua_client_internal.h  |  5 +++++
 3 files changed, 40 insertions(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 5a0b7588cfd..a3417d21857 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -701,6 +701,9 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         return;
     }
 
+    /* Warn if the Endpoints look incomplete / don't match the EndpointUrl */
+    Client_warnEndpointsResult(client, resp, &client->endpointUrl);
+
     UA_Boolean endpointFound = false;
     UA_Boolean tokenFound = false;
     const UA_String binaryTransport = UA_STRING("http://opcfoundation.org/UA-Profile/"
diff --git a/src/client/ua_client_discovery.c b/src/client/ua_client_discovery.c
index 9ea8f288947..e996c783cac 100644
--- a/src/client/ua_client_discovery.c
+++ b/src/client/ua_client_discovery.c
@@ -9,6 +9,34 @@
 
 #include "ua_client_internal.h"
 
+/* Helper method for additional warnings */
+void
+Client_warnEndpointsResult(UA_Client *client,
+                           const UA_GetEndpointsResponse *response,
+                           const UA_String *endpointUrl) {
+    if(response->endpointsSize == 0) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "The server did not return any endpoints. "
+                       "Did you use the correct endpointUrl?");
+        return;
+    }
+
+    if(!UA_String_equal(endpointUrl, &response->endpoints[0].endpointUrl) ||
+       (response->endpoints[0].server.discoveryUrlsSize > 0 &&
+        !UA_String_equal(endpointUrl, &response->endpoints[0].server.discoveryUrls[0]))) {
+        UA_String *betterUrl = &response->endpoints[0].endpointUrl;
+        if(response->endpoints[0].server.discoveryUrlsSize > 0)
+            betterUrl = &response->endpoints[0].server.discoveryUrls[0];
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "The server returned Endpoints with a different EndpointUrl %.*s than was "
+                       "used to initialize the connection: %.*s. Some servers require a complete "
+                       "match of the EndpointUrl/DiscoveryUrl (including the path) "
+                       "to return all endpoints.",
+                       (int)betterUrl->length, betterUrl->data,
+                       (int)endpointUrl->length, endpointUrl->data);
+    }
+}
+
 /* Gets a list of endpoints. Memory is allocated for endpointDescription array */
 static UA_StatusCode
 getEndpointsInternal(UA_Client *client, const UA_String endpointUrl,
@@ -35,6 +63,10 @@ getEndpointsInternal(UA_Client *client, const UA_String endpointUrl,
         UA_GetEndpointsResponse_clear(&response);
         return retval;
     }
+
+    /* Warn if the Endpoints look incomplete / don't match the EndpointUrl */
+    Client_warnEndpointsResult(client, &response, &endpointUrl);
+
     *endpointDescriptions = response.endpoints;
     *endpointDescriptionsSize = response.endpointsSize;
     response.endpoints = NULL;
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 8847c813ab2..80977e5e879 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -211,6 +211,11 @@ void processOPNResponse(UA_Client *client, const UA_ByteString *message);
 void closeSecureChannel(UA_Client *client);
 void cleanupSession(UA_Client *client);
 
+void
+Client_warnEndpointsResult(UA_Client *client,
+                           const UA_GetEndpointsResponse *response,
+                           const UA_String *endpointUrl);
+
 _UA_END_DECLS
 
 #endif /* UA_CLIENT_INTERNAL_H_ */

From 6e618fdb78e5c1b7b8c4e2c38d6208026d505e54 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 15:33:36 +0100
Subject: [PATCH 0641/1963] refactor(client): Always first set the
 connectStatus, then close the SecureChannel

---
 examples/encryption/client_encryption.c |  1 +
 src/client/ua_client_connect.c          | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/examples/encryption/client_encryption.c b/examples/encryption/client_encryption.c
index eab3deee78b..be551a19634 100644
--- a/examples/encryption/client_encryption.c
+++ b/examples/encryption/client_encryption.c
@@ -44,6 +44,7 @@ int main(int argc, char* argv[]) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig *cc = UA_Client_getConfig(client);
     cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
     UA_StatusCode retval = UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index a3417d21857..ceb7c9f516e 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -303,6 +303,7 @@ processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
                              "Received an ERR response that could not be decoded "
                              "with StatusCode %s", UA_StatusCode_name(res));
         client->connectStatus = res;
+        closeSecureChannel(client);
         return;
     }
 
@@ -311,6 +312,7 @@ processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
                          "reason: %.*s", UA_StatusCode_name(errMessage.error),
                          (int)errMessage.reason.length, errMessage.reason.data);
     client->connectStatus = errMessage.error;
+    closeSecureChannel(client);
     UA_TcpErrorMessage_clear(&errMessage);
 }
 
@@ -320,8 +322,8 @@ processACKResponse(UA_Client *client, const UA_ByteString *chunk) {
     if(channel->state != UA_SECURECHANNELSTATE_HEL_SENT) {
         UA_LOG_ERROR_CHANNEL(&client->config.logger, channel,
                              "SecureChannel not in the HEL-sent state");
-        closeSecureChannel(client);
         client->connectStatus = UA_STATUSCODE_BADSECURECHANNELCLOSED;
+        closeSecureChannel(client);
         return;
     }
 
@@ -527,10 +529,10 @@ sendOPNAsync(UA_Client *client, UA_Boolean renew) {
         UA_SecureChannel_sendAsymmetricOPNMessage(&client->channel, requestId, &opnSecRq,
                                                   &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
     if(retval != UA_STATUSCODE_GOOD) {
-        client->connectStatus = retval;
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_SECURECHANNEL,
                       "Sending OPN message failed with error %s",
                       UA_StatusCode_name(retval));
+        client->connectStatus = retval;
         closeSecureChannel(client);
         return retval;
     }
@@ -581,6 +583,7 @@ responseActivateSession(UA_Client *client, void *userdata,
         } else {
             /* Something else is wrong. Give up. */
             client->connectStatus = ar->responseHeader.serviceResult;
+            closeSecureChannel(client);
         }
         UA_UNLOCK(&client->clientMutex);
         return;
@@ -691,6 +694,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
          * the connectStatus should come from there. */
         if(UA_SecureChannel_isConnected(&client->channel)) {
            client->connectStatus = resp->responseHeader.serviceResult;
+           closeSecureChannel(client);
            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                         "GetEndpointRequest failed with error code %s",
                         UA_StatusCode_name(client->connectStatus));
@@ -867,10 +871,12 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                      "No suitable endpoint found");
         client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        closeSecureChannel(client);
     } else if(!tokenFound) {
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                      "No suitable UserTokenPolicy found for the possible endpoints");
         client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        closeSecureChannel(client);
     }
 
     /* Close the SecureChannel if a different SecurityPolicy is defined by the Endpoint */
@@ -1434,16 +1440,16 @@ connectSync(UA_Client *client) {
             break;
         now = UA_DateTime_nowMonotonic();
         if(maxDate < now) {
-            /* TODO: Close the SecureChannel properly */
-            client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
-            return;
+            if(client->connectStatus == UA_STATUSCODE_GOOD)
+                client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
+            closeSecureChannel(client);
         }
         UA_UNLOCK(&client->clientMutex);
         UA_StatusCode res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
         UA_LOCK(&client->clientMutex);
         if(res != UA_STATUSCODE_GOOD) {
-            closeSecureChannel(client);
             client->connectStatus = res;
+            closeSecureChannel(client);
         }
     }
 }

From 2ec1445b439cf1a17b8396cf59e77e62b3b19d33 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 15:34:15 +0100
Subject: [PATCH 0642/1963] fix(client): Make setting the authSecurityPolicyUri
 independent from the LogLevel

---
 src/client/ua_client_connect.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index ceb7c9f516e..175d6f184b1 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -824,15 +824,19 @@ responseGetEndpoints(UA_Client *client, void *userdata,
 
             /* Endpoint with matching usertokenpolicy found */
 
-#if UA_LOGLEVEL <= 300
-            const char *securityModeNames[3] = {"None", "Sign", "SignAndEncrypt"};
-            const char *userTokenTypeNames[4] = {"Anonymous", "UserName",
-                                                 "Certificate", "IssuedToken"};
+            /* If not explicit PolicyUri for authentication is configured, use
+             * that from the TokenPolicy or (if that is not defined) from the
+             * Endpoint SecurityPolicy. */
             UA_String *securityPolicyUri = &tokenPolicy->securityPolicyUri;
             if(securityPolicyUri->length == 0)
                 securityPolicyUri = &endpoint->securityPolicyUri;
-            UA_String_copy(securityPolicyUri, &client->config.authSecurityPolicyUri);
+            if(UA_String_isEmpty(&client->config.authSecurityPolicyUri))
+                UA_String_copy(securityPolicyUri, &client->config.authSecurityPolicyUri);
 
+#if UA_LOGLEVEL <= 300
+            const char *securityModeNames[3] = {"None", "Sign", "SignAndEncrypt"};
+            const char *userTokenTypeNames[4] = {"Anonymous", "UserName",
+                                                 "Certificate", "IssuedToken"};
             /* Log the selected endpoint */
             UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                         "Selected endpoint %lu in URL %.*s with SecurityMode "

From 68cb25ca2e0e3526b0ec1b9c07241fe5293ce96d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 15:34:44 +0100
Subject: [PATCH 0643/1963] refactor(client): Better documentation in
 ua_client_connect.c

---
 src/client/ua_client_connect.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 175d6f184b1..fe337e9b19e 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1249,8 +1249,9 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         goto continue_connect;
     }
 
-    /* The connection has oepened, set the SecureChannel state to reflect this.
-     * Otherwise later consistency checks for the received messages fail. */
+    /* The connection has opened on the TCP level. Set the SecureChannel state
+     * to reflect this. Otherwise later consistency checks for the received
+     * messages fail. */
     if(client->channel.state < UA_SECURECHANNELSTATE_CONNECTED)
         client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
 
@@ -1259,14 +1260,23 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         UA_SecureChannel_processBuffer(&client->channel, client,
                                        processServiceResponse, &msg);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "Processing the message returned the error code %s",
-                       UA_StatusCode_name(res));
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "Processing the message returned the error code %s",
+                     UA_StatusCode_name(res));
+
+        /* If connecting has failed before the SecureChannel has opened, then
+         * the client cannot recover. Set the connectStatus to reflect this. The
+         * application is notified when the socket has closed. */
+        if(client->channel.state != UA_SECURECHANNELSTATE_OPEN)
+            client->connectStatus = res;
 
         /* Close the SecureChannel, but don't notify the client right away.
          * Return immediately. notifyClientState will be called in the next
          * callback from the ConnectionManager when the connection closes with a
-         * StatusCode. */
+         * StatusCode.
+         *
+         * If the connectStatus is still good (the SecureChannel was fully
+         * opened before), then a reconnect is attempted. */
         closeSecureChannel(client);
         UA_UNLOCK(&client->clientMutex);
         return;

From 1766a520d12ba4e60515403f7bed9ebb323aaae2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 15:35:09 +0100
Subject: [PATCH 0644/1963] fix(client): Don't try to reconnect once the
 connectStatus is bad

---
 src/client/ua_client_connect.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index fe337e9b19e..553317c4772 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1284,8 +1284,9 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     /* Trigger the next action from our end to fully open up the connection */
  continue_connect:
-    if((client->noSession && client->channel.state != UA_SECURECHANNELSTATE_OPEN) ||
-       client->sessionState < UA_SESSIONSTATE_ACTIVATED) {
+    if(client->connectStatus == UA_STATUSCODE_GOOD &&
+       ((client->noSession && client->channel.state != UA_SECURECHANNELSTATE_OPEN) ||
+        client->sessionState < UA_SESSIONSTATE_ACTIVATED)) {
         connectActivity(client);
     }
 

From dbde1f2b9685bca3046b57e3b5f660061a009c90 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 15:36:03 +0100
Subject: [PATCH 0645/1963] fix(client): Run the EventLoop until the
 SecureChannel has closed on the TCP level

---
 src/client/ua_client_connect.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 553317c4772..166cba7d460 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1448,17 +1448,32 @@ connectSync(UA_Client *client) {
     /* Run the EventLoop until connected, connect fail or timeout. Write the
      * iterate result to the connectStatus. So we do not attempt to restore a
      * failed connection during the sync connect. */
-    while(client->connectStatus == UA_STATUSCODE_GOOD) {
+    while(true) {
+        /* If the connection has aborted (bad connectStatus), wait until the
+         * channel is truly closed */
+        if(client->connectStatus != UA_STATUSCODE_GOOD &&
+           client->channel.state == UA_SECURECHANNELSTATE_CLOSED)
+            break;
+
+        /* Sufficiently connected? */
         if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
             break;
         if(client->noSession && client->channel.state == UA_SECURECHANNELSTATE_OPEN)
             break;
+
+        /* Timeout -> abort */
         now = UA_DateTime_nowMonotonic();
         if(maxDate < now) {
             if(client->connectStatus == UA_STATUSCODE_GOOD)
                 client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
             closeSecureChannel(client);
         }
+
+        /* Aborting. Run the EventLoop with a zero timeout. */
+        if(client->connectStatus != UA_STATUSCODE_GOOD)
+            maxDate = now;
+
+        /* Drop into the EventLoop */
         UA_UNLOCK(&client->clientMutex);
         UA_StatusCode res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
         UA_LOCK(&client->clientMutex);

From cd1b59c15b1591406fc99f3268cd9cef3a2c780d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 15:36:32 +0100
Subject: [PATCH 0646/1963] fix(client): Don't overwrite the connectStatus
 during a manual "close" if already bad

---
 src/client/ua_client_connect.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 166cba7d460..55da4c30fe7 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1655,7 +1655,8 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
     closeSecureChannel(client);
 
     /* Manually set the status to closed to prevent an automatic reconnection */
-    client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
+    if(client->connectStatus == UA_STATUSCODE_GOOD)
+        client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
 
     /* Closing is async. Loop until the client has actually closed. */
     UA_EventLoop *el = client->config.eventLoop;

From 00452ae76279da7ded683d6e37631317126c215b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 16:27:58 +0100
Subject: [PATCH 0647/1963] fix(test): Fix a timing issue (only when using
 valgrind) in check_client.c

---
 tests/client/check_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 2efa023e9ce..a57d8b5ff71 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -198,7 +198,7 @@ START_TEST(Client_renewSecureChannelWithActiveSubscription) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
     UA_ClientConfig *cc = UA_Client_getConfig(client);
-    cc->secureChannelLifeTime = 10000;
+    cc->secureChannelLifeTime = 60000;
 
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);

From c6c585283690d97056804f22b2fa4e8833006c1a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 22:06:56 +0100
Subject: [PATCH 0648/1963] fix(examples): Only sleep internally in
 server_mainloop.c

---
 examples/server_mainloop.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/examples/server_mainloop.c b/examples/server_mainloop.c
index 0fa50e1e62c..81c5f23412f 100644
--- a/examples/server_mainloop.c
+++ b/examples/server_mainloop.c
@@ -8,7 +8,6 @@
 #include <open62541/server_config_default.h>
 
 #include <signal.h>
-#include <stdlib.h>
 
 UA_Boolean running = true;
 static void stopHandler(int sign) {
@@ -28,7 +27,7 @@ int main(int argc, char** argv) {
 
     /* Should the server networklayer block (with a timeout) until a message
        arrives or should it return immediately? */
-    UA_Boolean waitInternal = false;
+    UA_Boolean waitInternal = true;
 
     UA_StatusCode retval = UA_Server_run_startup(server);
     if(retval != UA_STATUSCODE_GOOD)
@@ -42,15 +41,7 @@ int main(int argc, char** argv) {
          * It will be handled on the next call, which may be too late for requesting clients.
          * if needed, the select with timeout on the multicast socket server->mdnsSocket (see example in mdnsd library)
          */
-        UA_UInt16 timeout = UA_Server_run_iterate(server, waitInternal);
-
-        /* Now we can use the max timeout to do something else. In this case, we
-           just sleep. (select is used as a platform-independent sleep
-           function.) */
-        struct timeval tv;
-        tv.tv_sec = 0;
-        tv.tv_usec = timeout * 1000;
-        select(0, NULL, NULL, NULL, &tv);
+        UA_Server_run_iterate(server, waitInternal);
     }
     retval = UA_Server_run_shutdown(server);
 

From 99890a71a090af7b8554038fdd1fa43152432d98 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 23:12:05 +0100
Subject: [PATCH 0649/1963] refactor(pubsub): Move ua_pubsub_manager.h into
 ua_pubsub.h

---
 CMakeLists.txt                                |   1 -
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   |   2 +-
 plugins/mqtt/ua_mqtt-c_adapter.c              |   1 -
 src/pubsub/ua_pubsub.h                        | 113 ++++++++++++++-
 src/pubsub/ua_pubsub_config.c                 |   1 -
 src/pubsub/ua_pubsub_manager.h                | 129 ------------------
 src/pubsub/ua_pubsub_security.c               |   2 +-
 src/server/ua_server.c                        |   4 -
 src/server/ua_server_internal.h               |   2 +-
 .../pubsub/check_pubsub_connection_ethernet.c |   1 -
 10 files changed, 114 insertions(+), 142 deletions(-)
 delete mode 100644 src/pubsub/ua_pubsub_manager.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f38c5fdfcb3..21bb4fa4dcc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -983,7 +983,6 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_subscription.h
                      ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage.h
                      ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub.h
-                     ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_manager.h
                      ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_ns0.h
                      ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_keystorage.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.h
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index 95301432d67..a0585f0ebb1 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -12,7 +12,7 @@
 #include <signal.h>
 
 #include <open62541/plugin/pubsub_mqtt.h>
-#include "ua_pubsub_manager.h"
+#include "ua_pubsub.h"
 
 #define CONNECTION_NAME               "MQTT Subscriber Connection"
 #define TRANSPORT_PROFILE_URI         "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index a90b689f06c..9b22172210e 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -8,7 +8,6 @@
  */
 
 #include "ua_mqtt-c_adapter.h"
-#include "ua_pubsub_manager.h"
 #include "server/ua_server_internal.h"
 #include <mqtt.h>
 #include <open62541/plugin/log_stdout.h>
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index f046d6aed1b..06030457971 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -2,10 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
+ * Copyright (c) 2017-2019 Fraunhofer IOSB (Author: Andreas Ebner)
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  * Copyright (c) 2020 Yannick Wallerer, Siemens AG
- * Copyright (c) 2020 Thomas Fischer, Siemens AG
+ * Copyright (c) 2020, 2022 Thomas Fischer, Siemens AG
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
  * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
@@ -711,6 +711,115 @@ removeSecurityGroup(UA_Server *server, UA_SecurityGroup *securityGroup);
 
 #endif /* UA_ENABLE_PUBSUB_SKS */
 
+/******************/
+/* PubSub Manager */
+/******************/
+
+typedef struct UA_TopicAssign {
+    UA_ReaderGroup *rgIdentifier;
+    UA_String topic;
+    TAILQ_ENTRY(UA_TopicAssign) listEntry;
+} UA_TopicAssign;
+
+typedef enum {
+    UA_WRITER_GROUP = 0,
+    UA_DATA_SET_WRITER = 1,
+} UA_ReserveIdType;
+
+typedef struct UA_ReserveId {
+    UA_UInt16 id;
+    UA_ReserveIdType reserveIdType;
+    UA_String transportProfileUri;
+    UA_NodeId sessionId;
+    LIST_ENTRY(UA_ReserveId) listEntry;
+} UA_ReserveId;
+
+typedef struct UA_PubSubManager {
+    UA_UInt64 defaultPublisherId;
+    /* Connections and PublishedDataSets can exist alone (own lifecycle) -> top
+     * level components */
+    size_t connectionsSize;
+    TAILQ_HEAD(UA_ListOfPubSubConnection, UA_PubSubConnection) connections;
+
+    size_t publishedDataSetsSize;
+    TAILQ_HEAD(UA_ListOfPublishedDataSet, UA_PublishedDataSet) publishedDataSets;
+    size_t subscribedDataSetsSize;
+    TAILQ_HEAD(UA_ListOfStandaloneSubscribedDataSet, UA_StandaloneSubscribedDataSet) subscribedDataSets;
+
+    size_t topicAssignSize;
+    TAILQ_HEAD(UA_ListOfTopicAssign, UA_TopicAssign) topicAssign;
+
+    size_t reserveIdsSize;
+    LIST_HEAD(UA_ListOfReserveIds, UA_ReserveId) reserveIds;
+
+#ifdef UA_ENABLE_PUBSUB_SKS
+    LIST_HEAD(PubSubKeyList, UA_PubSubKeyStorage) pubSubKeyList;
+    size_t securityGroupsSize;
+    TAILQ_HEAD(UA_ListOfSecurityGroup, UA_SecurityGroup) securityGroups;
+#endif
+
+#ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    UA_UInt32 uniqueIdCount;
+#endif
+} UA_PubSubManager;
+
+UA_StatusCode
+UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerGroup, UA_String topic);
+
+UA_StatusCode
+UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 numRegWriterGroupIds,
+                            UA_UInt16 numRegDataSetWriterIds, UA_String transportProfileUri,
+                            UA_UInt16 **writerGroupIds, UA_UInt16 **dataSetWriterIds);
+
+void
+UA_PubSubManager_freeIds(UA_Server *server);
+
+void
+UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager);
+
+void
+UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager);
+
+#ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+void
+UA_PubSubManager_generateUniqueNodeId(UA_PubSubManager *psm, UA_NodeId *nodeId);
+#endif
+
+UA_Guid
+UA_PubSubManager_generateUniqueGuid(UA_Server *server);
+
+UA_UInt32
+UA_PubSubConfigurationVersionTimeDifference(void);
+
+/***********************************/
+/*      PubSub Jobs abstraction    */
+/***********************************/
+UA_StatusCode
+UA_PubSubManager_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
+                                     void *data, UA_Double interval_ms, UA_DateTime *baseTime,
+                                     UA_TimerPolicy timerPolicy, UA_UInt64 *callbackId);
+UA_StatusCode
+UA_PubSubManager_changeRepeatedCallback(UA_Server *server, UA_UInt64 callbackId,
+                                        UA_Double interval_ms, UA_DateTime *baseTime,
+                                        UA_TimerPolicy timerPolicy);
+void
+UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callbackId);
+
+UA_PubSubTransportLayer *
+UA_getTransportProtocolLayer(const UA_Server *server,
+                             const UA_String *transportProfileUri);
+
+/*************************************************/
+/*      PubSub component monitoring              */
+/*************************************************/
+
+#ifdef UA_ENABLE_PUBSUB_MONITORING
+
+UA_StatusCode
+UA_PubSubManager_setDefaultMonitoringCallbacks(UA_PubSubMonitoringInterface *monitoringInterface);
+
+#endif /* UA_ENABLE_PUBSUB_MONITORING */
+
 #endif /* UA_ENABLE_PUBSUB */
 
 _UA_END_DECLS
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index b7a6d0e2a25..534a1610c83 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -17,7 +17,6 @@
 
 #include "pubsub/ua_pubsub_config.h"
 #include "pubsub/ua_pubsub.h"
-#include "pubsub/ua_pubsub_manager.h"
 #include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
diff --git a/src/pubsub/ua_pubsub_manager.h b/src/pubsub/ua_pubsub_manager.h
deleted file mode 100644
index 931005d6c56..00000000000
--- a/src/pubsub/ua_pubsub_manager.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2017-2019 Fraunhofer IOSB (Author: Andreas Ebner)
- * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
- * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
- * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
- */
-
-#ifndef UA_PUBSUB_MANAGER_H_
-#define UA_PUBSUB_MANAGER_H_
-
-#include "ua_pubsub.h"
-
-_UA_BEGIN_DECLS
-
-#ifdef UA_ENABLE_PUBSUB /* conditional compilation */
-
-typedef struct UA_TopicAssign {
-    UA_ReaderGroup *rgIdentifier;
-    UA_String topic;
-    TAILQ_ENTRY(UA_TopicAssign) listEntry;
-} UA_TopicAssign;
-
-typedef enum {
-    UA_WRITER_GROUP = 0,
-    UA_DATA_SET_WRITER = 1,
-}UA_ReserveIdType;
-
-typedef struct UA_ReserveId {
-    UA_UInt16 id;
-    UA_ReserveIdType reserveIdType;
-    UA_String transportProfileUri;
-    UA_NodeId sessionId;
-    LIST_ENTRY(UA_ReserveId) listEntry;
-} UA_ReserveId;
-
-typedef struct UA_PubSubManager {
-    UA_UInt64 defaultPublisherId;
-    /* Connections and PublishedDataSets can exist alone (own lifecycle) -> top
-     * level components */
-    size_t connectionsSize;
-    TAILQ_HEAD(UA_ListOfPubSubConnection, UA_PubSubConnection) connections;
-
-    size_t publishedDataSetsSize;
-    TAILQ_HEAD(UA_ListOfPublishedDataSet, UA_PublishedDataSet) publishedDataSets;
-    size_t subscribedDataSetsSize;
-    TAILQ_HEAD(UA_ListOfStandaloneSubscribedDataSet, UA_StandaloneSubscribedDataSet) subscribedDataSets;
-
-    size_t topicAssignSize;
-    TAILQ_HEAD(UA_ListOfTopicAssign, UA_TopicAssign) topicAssign;
-
-    size_t reserveIdsSize;
-    LIST_HEAD(UA_ListOfReserveIds, UA_ReserveId) reserveIds;
-
-#ifdef UA_ENABLE_PUBSUB_SKS
-    LIST_HEAD(PubSubKeyList, UA_PubSubKeyStorage) pubSubKeyList;
-    size_t securityGroupsSize;
-    TAILQ_HEAD(UA_ListOfSecurityGroup, UA_SecurityGroup) securityGroups;
-#endif
-
-#ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    UA_UInt32 uniqueIdCount;
-#endif
-} UA_PubSubManager;
-
-UA_StatusCode
-UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerGroup, UA_String topic);
-
-UA_StatusCode
-UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 numRegWriterGroupIds,
-                            UA_UInt16 numRegDataSetWriterIds, UA_String transportProfileUri,
-                            UA_UInt16 **writerGroupIds, UA_UInt16 **dataSetWriterIds);
-
-void
-UA_PubSubManager_freeIds(UA_Server *server);
-
-void
-UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager);
-
-void
-UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager);
-
-#ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-void
-UA_PubSubManager_generateUniqueNodeId(UA_PubSubManager *psm, UA_NodeId *nodeId);
-#endif
-
-UA_Guid
-UA_PubSubManager_generateUniqueGuid(UA_Server *server);
-
-UA_UInt32
-UA_PubSubConfigurationVersionTimeDifference(void);
-
-/***********************************/
-/*      PubSub Jobs abstraction    */
-/***********************************/
-UA_StatusCode
-UA_PubSubManager_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
-                                     void *data, UA_Double interval_ms, UA_DateTime *baseTime,
-                                     UA_TimerPolicy timerPolicy, UA_UInt64 *callbackId);
-UA_StatusCode
-UA_PubSubManager_changeRepeatedCallback(UA_Server *server, UA_UInt64 callbackId,
-                                        UA_Double interval_ms, UA_DateTime *baseTime,
-                                        UA_TimerPolicy timerPolicy);
-void
-UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callbackId);
-
-UA_PubSubTransportLayer *
-UA_getTransportProtocolLayer(const UA_Server *server,
-                             const UA_String *transportProfileUri);
-
-/*************************************************/
-/*      PubSub component monitoring              */
-/*************************************************/
-
-#ifdef UA_ENABLE_PUBSUB_MONITORING
-
-UA_StatusCode
-UA_PubSubManager_setDefaultMonitoringCallbacks(UA_PubSubMonitoringInterface *monitoringInterface);
-
-#endif /* UA_ENABLE_PUBSUB_MONITORING */
-
-#endif /* UA_ENABLE_PUBSUB */
-
-_UA_END_DECLS
-
-#endif /* UA_PUBSUB_MANAGER_H_ */
diff --git a/src/pubsub/ua_pubsub_security.c b/src/pubsub/ua_pubsub_security.c
index b753c795d55..b2200a01974 100644
--- a/src/pubsub/ua_pubsub_security.c
+++ b/src/pubsub/ua_pubsub_security.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  */
 
-#include "ua_pubsub_manager.h"
+#include "ua_pubsub.h"
 #include "ua_util_internal.h"
 
 static
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index edcbe72fa05..2f4f868080f 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -25,10 +25,6 @@
 #include "ua_pubsub_ns0.h"
 #endif
 
-#ifdef UA_ENABLE_PUBSUB
-#include "ua_pubsub_manager.h"
-#endif
-
 #ifdef UA_ENABLE_SUBSCRIPTIONS
 #include "ua_subscription.h"
 #endif
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 2909c51c654..fd6255510fc 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -31,7 +31,7 @@
 _UA_BEGIN_DECLS
 
 #ifdef UA_ENABLE_PUBSUB
-#include "ua_pubsub_manager.h"
+#include "ua_pubsub.h"
 #endif
 
 #ifdef UA_ENABLE_DISCOVERY
diff --git a/tests/pubsub/check_pubsub_connection_ethernet.c b/tests/pubsub/check_pubsub_connection_ethernet.c
index d2f26931ea6..16d6f53aad0 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet.c
@@ -14,7 +14,6 @@
 #include <open62541/plugin/pubsub_ethernet.h>
 
 #include "ua_pubsub.h"
-#include "ua_pubsub_manager.h"
 
 #include <linux/if_packet.h>
 #include <netinet/ether.h>

From 41e28a35ae39b537450c3f529a189675750af7a1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 23:34:32 +0100
Subject: [PATCH 0650/1963] refactor(pubsub): Make UA_PubSubConnectionConfig an
 immediate member

---
 plugins/mqtt/ua_mqtt-c_adapter.c   |  2 +-
 src/pubsub/ua_pubsub.h             |  2 +-
 src/pubsub/ua_pubsub_connection.c  | 11 ++---
 src/pubsub/ua_pubsub_manager.c     | 71 +++++++++---------------------
 src/pubsub/ua_pubsub_ns0.c         | 26 +++++------
 src/pubsub/ua_pubsub_readergroup.c |  5 ++-
 src/pubsub/ua_pubsub_writergroup.c | 22 ++++-----
 7 files changed, 55 insertions(+), 84 deletions(-)

diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index 9b22172210e..e3c6815a2b8 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -334,7 +334,7 @@ publish_callback(void** ptrServer, struct mqtt_response_publish *published)
 
     UA_PubSubConnection *pubSubConnection;
     TAILQ_FOREACH(pubSubConnection, &server->pubSubManager.connections, listEntry){
-        if(!UA_String_equal(&pubSubConnection->config->transportProfileUri, &transport_uri))
+        if(!UA_String_equal(&pubSubConnection->config.transportProfileUri, &transport_uri))
             break;
         UA_ReaderGroup* readerGroup = NULL;
         LIST_FOREACH(readerGroup, &pubSubConnection->readerGroups, listEntry) {
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 06030457971..bc83f24700f 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -127,7 +127,7 @@ UA_StandaloneSubscribedDataSet_clear(UA_Server *server, UA_StandaloneSubscribedD
 
 typedef struct UA_PubSubConnection {
     UA_PubSubComponentEnumType componentType;
-    UA_PubSubConnectionConfig *config;
+    UA_PubSubConnectionConfig config;
     UA_PubSubChannel *channel;
     UA_NodeId identifier;
     LIST_HEAD(UA_ListOfWriterGroup, UA_WriterGroup) writerGroups;
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index 8800fbba5c1..ee547539a6c 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -38,16 +38,14 @@ UA_PubSubConnectionConfig_copy(const UA_PubSubConnectionConfig *src,
 UA_StatusCode
 UA_Server_getPubSubConnectionConfig(UA_Server *server, const UA_NodeId connection,
                                     UA_PubSubConnectionConfig *config) {
-    UA_LOCK(&server->serviceMutex);
-    if(!config) {
-        UA_UNLOCK(&server->serviceMutex);
+    if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
+    UA_LOCK(&server->serviceMutex);
     UA_PubSubConnection *currentPubSubConnection =
         UA_PubSubConnection_findConnectionbyId(server, connection);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     if(currentPubSubConnection)
-        res = UA_PubSubConnectionConfig_copy(currentPubSubConnection->config, config);
+        res = UA_PubSubConnectionConfig_copy(&currentPubSubConnection->config, config);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -92,8 +90,7 @@ UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection) {
     if(connection->channel)
         connection->channel->close(connection->channel);
 
-    UA_PubSubConnectionConfig_clear(connection->config);
-    UA_free(connection->config);
+    UA_PubSubConnectionConfig_clear(&connection->config);
 }
 
 
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index bcd03e27f5c..660d7e7e5ac 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -50,33 +50,9 @@ UA_getTransportProtocolLayer(const UA_Server *server,
     return tl;
 }
 
-static void
-UA_PubSubConfig_delete(UA_PubSubConnectionConfig *tmpConnectionConfig) {
-    UA_PubSubConnectionConfig_clear(tmpConnectionConfig);
-    UA_free(tmpConnectionConfig);
-}
-
-static UA_StatusCode
-copyConnectionConfig(const UA_PubSubConnectionConfig *srcConfig, UA_PubSubConnectionConfig **dstConfig, UA_Logger *logger) {
-    /* Create a copy of the connection config */
-    *dstConfig = (UA_PubSubConnectionConfig *) UA_calloc(1, sizeof(UA_PubSubConnectionConfig));
-    UA_CHECK_MEM_ERROR(dstConfig, return UA_STATUSCODE_BADOUTOFMEMORY,
-                       logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection creation failed. Out of Memory.");
-
-    UA_StatusCode retval = UA_PubSubConnectionConfig_copy(srcConfig, *dstConfig);
-    UA_CHECK_STATUS_ERROR(retval, goto copy_error, logger, UA_LOGCATEGORY_SERVER,
-                          "PubSub Connection creation failed. Could not copy the config.");
-
-    return UA_STATUSCODE_GOOD;
-copy_error:
-    UA_free(*dstConfig);
-    return retval;
-}
-
 static void
 UA_PubSubManager_addConnection(UA_PubSubManager *pubSubManager, UA_PubSubConnection *connection) {
-    if (pubSubManager->connectionsSize != 0) {
+    if(pubSubManager->connectionsSize != 0) {
         TAILQ_INSERT_TAIL(&pubSubManager->connections, connection, listEntry);
     } else {
         TAILQ_INIT(&pubSubManager->connections);
@@ -87,7 +63,7 @@ UA_PubSubManager_addConnection(UA_PubSubManager *pubSubManager, UA_PubSubConnect
 
 static void
 UA_PubSubManager_addTopic(UA_PubSubManager *pubSubManager, UA_TopicAssign *topicAssign) {
-    if (pubSubManager->topicAssignSize != 0) {
+    if(pubSubManager->topicAssignSize != 0) {
         TAILQ_INSERT_TAIL(&pubSubManager->topicAssign, topicAssign, listEntry);
     } else {
         TAILQ_INIT(&pubSubManager->topicAssign);
@@ -151,13 +127,15 @@ UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id, UA_String transportProfile
         UA_WriterGroup *writerGroup;
         LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
             if(reserveIdType == UA_WRITER_GROUP) {
-                if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) && writerGroup->config.writerGroupId == id)
+                if(UA_String_equal(&tmpConnection->config.transportProfileUri,
+                                   &transportProfileUri) && writerGroup->config.writerGroupId == id)
                     return false;
             /* reserveIdType == UA_DATA_SET_WRITER */
             } else {
                 UA_DataSetWriter *currentWriter;
                 LIST_FOREACH(currentWriter, &writerGroup->writers, listEntry) {
-                    if(UA_String_equal(&tmpConnection->config->transportProfileUri, &transportProfileUri) &&
+                    if(UA_String_equal(&tmpConnection->config.transportProfileUri,
+                                       &transportProfileUri) &&
                     currentWriter->config.dataSetWriterId == id)
                        return false;
                 }
@@ -270,7 +248,7 @@ UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 nu
 }
 
 static UA_PubSubConnection *
-UA_PubSubConnection_new(UA_PubSubConnectionConfig *connectionConfig,
+UA_PubSubConnection_new(const UA_PubSubConnectionConfig *connectionConfig,
                         UA_Logger *logger) {
     /* Create new connection and add to UA_PubSubManager */
     UA_PubSubConnection *newConnectionsField = (UA_PubSubConnection *)
@@ -282,7 +260,13 @@ UA_PubSubConnection_new(UA_PubSubConnectionConfig *connectionConfig,
     }
     newConnectionsField->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
     LIST_INIT(&newConnectionsField->writerGroups);
-    newConnectionsField->config = connectionConfig;
+    UA_StatusCode res =
+        UA_PubSubConnectionConfig_copy(connectionConfig, &newConnectionsField->config);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_free(newConnectionsField);
+        return NULL;
+    }
+        
     return newConnectionsField;
 }
 
@@ -297,22 +281,6 @@ channelErrorHandling(UA_Server *server, UA_PubSubConnection *newConnectionsField
     return UA_STATUSCODE_BADINTERNALERROR;
 }
 
-static UA_StatusCode
-createAndAddConnection(UA_Server *server, const UA_PubSubConnectionConfig *connectionConfig,
-                       UA_PubSubConnection **connection) {
-    /* Create a copy of the connection config */
-    UA_PubSubConnectionConfig *tmpConnectionConfig = NULL;
-    UA_StatusCode retval = copyConnectionConfig(connectionConfig, &tmpConnectionConfig, &server->config.logger);
-    UA_CHECK_STATUS(retval, return retval);
-
-    *connection = UA_PubSubConnection_new(tmpConnectionConfig, &server->config.logger);
-    UA_CHECK_MEM(*connection, UA_PubSubConfig_delete(tmpConnectionConfig); return UA_STATUSCODE_BADOUTOFMEMORY;);
-
-    UA_PubSubManager *pubSubManager = &server->pubSubManager;
-    UA_PubSubManager_addConnection(pubSubManager, *connection);
-    return UA_STATUSCODE_GOOD;
-}
-
 static void
 assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnectionsField,
                            UA_NodeId *connectionIdentifier) {
@@ -347,13 +315,16 @@ UA_PubSubConnection_create(UA_Server *server,
                        "PubSub Connection creation failed. Requested transport layer not found.");
 
     /* create and add new connection from connection config */
-    UA_PubSubConnection *newConnectionsField = NULL;
-    UA_StatusCode retval = createAndAddConnection(server, connectionConfig, &newConnectionsField);
-    UA_CHECK_STATUS(retval, return retval);
+    UA_PubSubConnection *newConnectionsField = 
+        UA_PubSubConnection_new(connectionConfig, &server->config.logger);
+    UA_CHECK_MEM(newConnectionsField, return UA_STATUSCODE_BADOUTOFMEMORY);
+
+    UA_PubSubManager *pubSubManager = &server->pubSubManager;
+    UA_PubSubManager_addConnection(pubSubManager, newConnectionsField);
 
     UA_TransportLayerContext ctx;
     ctx.connection = newConnectionsField;
-    ctx.connectionConfig = newConnectionsField->config;
+    ctx.connectionConfig = &newConnectionsField->config;
     ctx.decodeAndProcessNetworkMessage =
         (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
         UA_decodeAndProcessNetworkMessage;
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 4c8959a63bb..31394536b73 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -83,25 +83,25 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
             UA_PubSubConnection_findConnectionbyId(server, *myNodeId);
         switch(nodeContext->elementClassiefier) {
         case UA_NS0ID_PUBSUBCONNECTIONTYPE_PUBLISHERID:
-            switch (pubSubConnection->config->publisherIdType) {
+            switch (pubSubConnection->config.publisherIdType) {
                 case UA_PUBLISHERIDTYPE_BYTE:
-                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.byte,
+                    UA_Variant_setScalar(&value, &pubSubConnection->config.publisherId.byte,
                                          &UA_TYPES[UA_TYPES_BYTE]);
                     break;
                 case UA_PUBLISHERIDTYPE_UINT16:
-                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.uint16,
+                    UA_Variant_setScalar(&value, &pubSubConnection->config.publisherId.uint16,
                                          &UA_TYPES[UA_TYPES_UINT16]);
                     break;
                 case UA_PUBLISHERIDTYPE_UINT32:
-                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.uint32,
+                    UA_Variant_setScalar(&value, &pubSubConnection->config.publisherId.uint32,
                                          &UA_TYPES[UA_TYPES_UINT32]);
                     break;
                 case UA_PUBLISHERIDTYPE_UINT64:
-                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.uint64,
+                    UA_Variant_setScalar(&value, &pubSubConnection->config.publisherId.uint64,
                                          &UA_TYPES[UA_TYPES_UINT64]);
                     break;
                 case UA_PUBLISHERIDTYPE_STRING:
-                    UA_Variant_setScalar(&value, &pubSubConnection->config->publisherId.string,
+                    UA_Variant_setScalar(&value, &pubSubConnection->config.publisherId.string,
                                          &UA_TYPES[UA_TYPES_STRING]);
                     break;
                 default:
@@ -606,11 +606,11 @@ addDataSetReaderConfig(UA_Server *server, UA_NodeId readerGroupId,
 UA_StatusCode
 addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connection) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    if(connection->config->name.length > 512)
+    if(connection->config.name.length > 512)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     char connectionName[513];
-    memcpy(connectionName, connection->config->name.data, connection->config->name.length);
-    connectionName[connection->config->name.length] = '\0';
+    memcpy(connectionName, connection->config.name.data, connection->config.name.length);
+    connectionName[connection->config.name.length] = '\0';
 
     UA_ObjectAttributes attr = UA_ObjectAttributes_default;
     attr.displayName = UA_LOCALIZEDTEXT("", connectionName);
@@ -664,12 +664,12 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
     }
 
     retVal |= writePubSubNs0VariableArray(server, connectionPropertieNode.identifier.numeric,
-                                          connection->config->connectionProperties.map,
-                                          connection->config->connectionProperties.mapSize,
+                                          connection->config.connectionProperties.map,
+                                          connection->config.connectionProperties.mapSize,
                                           &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
 
     UA_NetworkAddressUrlDataType *networkAddressUrl=
-        ((UA_NetworkAddressUrlDataType*)connection->config->address.data);
+        ((UA_NetworkAddressUrlDataType*)connection->config.address.data);
     UA_Variant value;
     UA_Variant_init(&value);
 
@@ -679,7 +679,7 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
     UA_Variant_setScalar(&value, &networkAddressUrl->networkInterface, &UA_TYPES[UA_TYPES_STRING]);
     writeValueAttribute(server, interfaceNode, &value);
 
-    UA_Variant_setScalar(&value, &connection->config->transportProfileUri, &UA_TYPES[UA_TYPES_STRING]);
+    UA_Variant_setScalar(&value, &connection->config.transportProfileUri, &UA_TYPES[UA_TYPES_STRING]);
     writeValueAttribute(server, transportProfileUri, &value);
 
     UA_NodePropertyContext *connectionPublisherIdContext =
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 68ece0ddeff..17bea74d75d 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -187,8 +187,9 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
 
     /* Set the assigment between ReaderGroup and Topic if the transport layer is MQTT. */
     const UA_String transport_uri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
-    if(UA_String_equal(&currentConnectionContext->config->transportProfileUri, &transport_uri)) {
-        UA_String topic = ((UA_BrokerWriterGroupTransportDataType *)readerGroupConfig->transportSettings.content.decoded.data)->queueName;
+    if(UA_String_equal(&currentConnectionContext->config.transportProfileUri, &transport_uri)) {
+        UA_String topic = ((UA_BrokerWriterGroupTransportDataType *)
+                           readerGroupConfig->transportSettings.content.decoded.data)->queueName;
         retval |= UA_PubSubManager_addPubSubTopicAssign(server, newGroup, topic);
     }
     return retval;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index b313057af80..6100ef022c3 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -106,22 +106,24 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
     }
     /* writerGroupTransportSettings */
     /* Retrieve the transport layer for the given profile uri */
-    UA_PubSubTransportLayer *tl = UA_getTransportProtocolLayer(server, &currentConnectionContext->config->transportProfileUri);
-    UA_CHECK_MEM_ERROR(tl, UA_free(newWriterGroup); return UA_STATUSCODE_BADNOTFOUND, &server->config.logger,
-                       UA_LOGCATEGORY_SERVER, "PubSub Connection creation failed. Requested transport layer not found.");
+    UA_PubSubTransportLayer *tl =
+        UA_getTransportProtocolLayer(server, &currentConnectionContext->config.transportProfileUri);
+    UA_CHECK_MEM_ERROR(tl, UA_free(newWriterGroup); return UA_STATUSCODE_BADNOTFOUND,
+                       &server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection creation failed. Requested transport layer not found.");
     UA_TransportLayerContext ctx;
     ctx.writerGroupAddress = NULL;
     ctx.connection = currentConnectionContext;
-    if(UA_Variant_hasScalarType(&currentConnectionContext->config->address,
+    if(UA_Variant_hasScalarType(&currentConnectionContext->config.address,
                                 &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
         UA_NetworkAddressUrlDataType *address =
-            (UA_NetworkAddressUrlDataType *)currentConnectionContext->config->address.data;
+            (UA_NetworkAddressUrlDataType *)currentConnectionContext->config.address.data;
         ctx.connectionAddress = address;
     } else {
         UA_free(newWriterGroup);
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
-    ctx.connectionConfig = currentConnectionContext->config;
+    ctx.connectionConfig = &currentConnectionContext->config;
     /* TODO: The callback is for readers, not writers. Currently unused. */
     ctx.decodeAndProcessNetworkMessage =
         (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
@@ -1052,8 +1054,8 @@ sendNetworkMessageJson(UA_Server *server, UA_PubSubConnection *connection, UA_Wr
     nm.payloadHeader.dataSetPayloadHeader.dataSetWriterIds = writerIds;
     nm.payload.dataSetPayload.dataSetMessages = dsm;
     nm.publisherIdEnabled = true;
-    nm.publisherIdType = connection->config->publisherIdType;
-    nm.publisherId = connection->config->publisherId;
+    nm.publisherIdType = connection->config.publisherIdType;
+    nm.publisherId = connection->config.publisherId;
 
     /* Compute the message length */
     size_t msgSize = UA_NetworkMessage_calcSizeJson(&nm, NULL, 0, NULL, 0, true);
@@ -1159,11 +1161,11 @@ generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
 
     networkMessage->version = 1;
     networkMessage->networkMessageType = UA_NETWORKMESSAGE_DATASET;
-    networkMessage->publisherIdType = connection->config->publisherIdType;
+    networkMessage->publisherIdType = connection->config.publisherIdType;
     /* shallow copy of the PublisherId from connection configuration
         -> the configuration needs to be stable during publishing process
         -> it must not be cleaned after network message has been sent */
-    networkMessage->publisherId = connection->config->publisherId;
+    networkMessage->publisherId = connection->config.publisherId;
 
     if(networkMessage->groupHeader.sequenceNumberEnabled)
         networkMessage->groupHeader.sequenceNumber = wg->sequenceNumber;

From cae67d18606fb4fc36944a10b27541df07b4351d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 23:40:58 +0100
Subject: [PATCH 0651/1963] refactor(pubsub): Simplify the use of TAILQs

---
 src/pubsub/ua_pubsub_manager.c       | 41 ++++++++++------------------
 src/pubsub/ua_pubsub_securitygroup.c |  6 +---
 src/server/ua_server.c               |  8 ++----
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 660d7e7e5ac..d382c2ebd59 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -52,23 +52,13 @@ UA_getTransportProtocolLayer(const UA_Server *server,
 
 static void
 UA_PubSubManager_addConnection(UA_PubSubManager *pubSubManager, UA_PubSubConnection *connection) {
-    if(pubSubManager->connectionsSize != 0) {
-        TAILQ_INSERT_TAIL(&pubSubManager->connections, connection, listEntry);
-    } else {
-        TAILQ_INIT(&pubSubManager->connections);
-        TAILQ_INSERT_HEAD(&pubSubManager->connections, connection, listEntry);
-    }
+    TAILQ_INSERT_TAIL(&pubSubManager->connections, connection, listEntry);
     pubSubManager->connectionsSize++;
 }
 
 static void
 UA_PubSubManager_addTopic(UA_PubSubManager *pubSubManager, UA_TopicAssign *topicAssign) {
-    if(pubSubManager->topicAssignSize != 0) {
-        TAILQ_INSERT_TAIL(&pubSubManager->topicAssign, topicAssign, listEntry);
-    } else {
-        TAILQ_INIT(&pubSubManager->topicAssign);
-        TAILQ_INSERT_HEAD(&pubSubManager->topicAssign, topicAssign, listEntry);
-    }
+    TAILQ_INSERT_TAIL(&pubSubManager->topicAssign, topicAssign, listEntry);
     pubSubManager->topicAssignSize++;
 }
 
@@ -542,14 +532,7 @@ UA_PublishedDataSet_create(UA_Server *server,
     }
 
     /* Insert into the queue of the manager */
-    if(server->pubSubManager.publishedDataSetsSize != 0) {
-        TAILQ_INSERT_TAIL(&server->pubSubManager.publishedDataSets,
-                          newPDS, listEntry);
-    } else {
-        TAILQ_INIT(&server->pubSubManager.publishedDataSets);
-        TAILQ_INSERT_HEAD(&server->pubSubManager.publishedDataSets,
-                          newPDS, listEntry);
-    }
+    TAILQ_INSERT_TAIL(&server->pubSubManager.publishedDataSets, newPDS, listEntry);
     server->pubSubManager.publishedDataSetsSize++;
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
@@ -663,14 +646,9 @@ addStandaloneSubscribedDataSet(UA_Server *server,
     newSubscribedDataSet->config = tmpSubscribedDataSetConfig;
     newSubscribedDataSet->connectedReader = UA_NODEID_NULL;
 
-    if (server->pubSubManager.subscribedDataSetsSize != 0)
-        TAILQ_INSERT_TAIL(&server->pubSubManager.subscribedDataSets, newSubscribedDataSet, listEntry);
-    else {
-        TAILQ_INIT(&server->pubSubManager.subscribedDataSets);
-        TAILQ_INSERT_HEAD(&server->pubSubManager.subscribedDataSets, newSubscribedDataSet, listEntry);
-    }
-
+    TAILQ_INSERT_TAIL(&server->pubSubManager.subscribedDataSets, newSubscribedDataSet, listEntry);
     server->pubSubManager.subscribedDataSetsSize++;
+
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     addStandaloneSubscribedDataSetRepresentation(server, newSubscribedDataSet);
 #else
@@ -775,6 +753,15 @@ UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager) {
     //TODO: Using the Mac address to generate the defaultPublisherId.
     // In the future, this can be retrieved from the eventloop.
     pubSubManager->defaultPublisherId = generateRandomUInt64(server);
+
+    TAILQ_INIT(&pubSubManager->connections);
+    TAILQ_INIT(&pubSubManager->publishedDataSets);
+    TAILQ_INIT(&pubSubManager->subscribedDataSets);
+    TAILQ_INIT(&pubSubManager->topicAssign);
+
+#ifdef UA_ENABLE_PUBSUB_SKS
+    TAILQ_INIT(&pubSubManager->securityGroups);
+#endif
 }
 
 /* Delete the current PubSub configuration including all nested members. This
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 401ca0756d3..144b88a9f19 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -268,11 +268,7 @@ addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
     if(securityGroupNodeId)
         UA_NodeId_copy(&newSecurityGroup->securityGroupNodeId, securityGroupNodeId);
 
-    if(server->pubSubManager.securityGroupsSize == 0)
-        TAILQ_INIT(&server->pubSubManager.securityGroups);
-
-    TAILQ_INSERT_TAIL(&server->pubSubManager.securityGroups, newSecurityGroup,
-                          listEntry);
+    TAILQ_INSERT_TAIL(&server->pubSubManager.securityGroups, newSecurityGroup, listEntry);
 
     server->pubSubManager.securityGroupsSize++;
     return retval;
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 2f4f868080f..1985acec4a8 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -328,6 +328,9 @@ UA_Server_init(UA_Server *server) {
     UA_CHECK_STATUS(res, goto cleanup);
 
 #ifdef UA_ENABLE_PUBSUB
+    /* Initialized PubSubManager */
+    UA_PubSubManager_init(server, &server->pubSubManager);
+
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     /* Build PubSub information model */
     initPubSubNS0(server);
@@ -855,11 +858,6 @@ UA_Server_run_startup(UA_Server *server) {
 
     UA_UNLOCK(&server->serviceMutex); /* TODO: Make PubSub initialization thread-safe */
 
-#ifdef UA_ENABLE_PUBSUB
-    /* Initialized PubSubManager */
-    UA_PubSubManager_init(server, &server->pubSubManager);
-#endif
-
     /* Sample the start time and set it to the Server object */
     server->startTime = UA_DateTime_now();
     UA_Variant var;

From d7e8adc590c6ac7020db5e607ad1ca310ec254fb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 23:42:40 +0100
Subject: [PATCH 0652/1963] refactor(pubsub): Cosmetic improvements in
 ua_pubsub_manager.c

---
 src/pubsub/ua_pubsub_manager.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index d382c2ebd59..8dd5632f3c3 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -563,9 +563,9 @@ static UA_StatusCode
 removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
     //search the identified PublishedDataSet and store the PDS index
     UA_PublishedDataSet *publishedDataSet = UA_PublishedDataSet_findPDSbyId(server, pds);
-    if(!publishedDataSet){
+    if(!publishedDataSet)
         return UA_STATUSCODE_BADNOTFOUND;
-    }
+
     if(publishedDataSet->configurationFrozen){
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Remove PublishedDataSet failed. PublishedDataSet is frozen.");
@@ -821,13 +821,12 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     TAILQ_FOREACH_SAFE(tmpSG1, &server->pubSubManager.securityGroups, listEntry, tmpSG2) {
         removeSecurityGroup(server, tmpSG1);
     }
-#endif
 
-#ifdef UA_ENABLE_PUBSUB_SKS
     /* Remove the keyStorages */
     UA_PubSubKeyStorage *ks, *ksTmp;
-    LIST_FOREACH_SAFE(ks, &server->pubSubManager.pubSubKeyList, keyStorageList, ksTmp)
+    LIST_FOREACH_SAFE(ks, &server->pubSubManager.pubSubKeyList, keyStorageList, ksTmp) {
         UA_PubSubKeyStorage_delete(server, ks);
+    }
 #endif
 }
 

From 9001c2946c1cd964df5c63ee89bb61d14f485a87 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 23:47:22 +0100
Subject: [PATCH 0653/1963] refactor(pubsub): Simplify the creation of PubSub
 Connections

---
 src/pubsub/ua_pubsub_manager.c | 45 +++++++++++++---------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 8dd5632f3c3..39c625b2460 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -237,29 +237,6 @@ UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 nu
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_PubSubConnection *
-UA_PubSubConnection_new(const UA_PubSubConnectionConfig *connectionConfig,
-                        UA_Logger *logger) {
-    /* Create new connection and add to UA_PubSubManager */
-    UA_PubSubConnection *newConnectionsField = (UA_PubSubConnection *)
-        UA_calloc(1, sizeof(UA_PubSubConnection));
-    if(!newConnectionsField) {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of Memory.");
-        return NULL;
-    }
-    newConnectionsField->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
-    LIST_INIT(&newConnectionsField->writerGroups);
-    UA_StatusCode res =
-        UA_PubSubConnectionConfig_copy(connectionConfig, &newConnectionsField->config);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_free(newConnectionsField);
-        return NULL;
-    }
-        
-    return newConnectionsField;
-}
-
 static UA_StatusCode
 channelErrorHandling(UA_Server *server, UA_PubSubConnection *newConnectionsField) {
     UA_PubSubConnection_clear(server, newConnectionsField);
@@ -304,14 +281,27 @@ UA_PubSubConnection_create(UA_Server *server,
                        &server->config.logger, UA_LOGCATEGORY_SERVER,
                        "PubSub Connection creation failed. Requested transport layer not found.");
 
-    /* create and add new connection from connection config */
-    UA_PubSubConnection *newConnectionsField = 
-        UA_PubSubConnection_new(connectionConfig, &server->config.logger);
-    UA_CHECK_MEM(newConnectionsField, return UA_STATUSCODE_BADOUTOFMEMORY);
+    /* Create new connection from connection config */
+    UA_PubSubConnection *newConnectionsField = (UA_PubSubConnection *)
+        UA_calloc(1, sizeof(UA_PubSubConnection));
+    if(!newConnectionsField) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Out of Memory.");
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    newConnectionsField->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
+    UA_StatusCode res = UA_PubSubConnectionConfig_copy(connectionConfig,
+                                                       &newConnectionsField->config);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_free(newConnectionsField);
+        return res;
+    }
 
+    /* Register in the PubSubManager */
     UA_PubSubManager *pubSubManager = &server->pubSubManager;
     UA_PubSubManager_addConnection(pubSubManager, newConnectionsField);
 
+    /* Open the communication channel */
     UA_TransportLayerContext ctx;
     ctx.connection = newConnectionsField;
     ctx.connectionConfig = &newConnectionsField->config;
@@ -321,7 +311,6 @@ UA_PubSubConnection_create(UA_Server *server,
     ctx.writerGroupAddress = NULL;
     ctx.server = server;
 
-    /* Open the communication channel */
     newConnectionsField->channel = tl->createPubSubChannel(tl, &ctx);
     UA_CHECK_MEM(newConnectionsField->channel,
                  return channelErrorHandling(server, newConnectionsField));

From 1cec2c2f087f6e6d11b00d34724293755bbc9456 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 6 Jan 2023 23:51:25 +0100
Subject: [PATCH 0654/1963] refactor(pubsub): Move connection handling to
 ua_pubsub_connection.c

---
 src/pubsub/ua_pubsub_connection.c | 196 +++++++++++++++++++++++++++++
 src/pubsub/ua_pubsub_manager.c    | 198 ------------------------------
 2 files changed, 196 insertions(+), 198 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index ee547539a6c..5f5cbe3f640 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -13,6 +13,15 @@
 #include "ua_pubsub.h"
 #include "server/ua_server_internal.h"
 
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+#include "ua_pubsub_ns0.h"
+#endif
+
+#ifdef UA_ENABLE_PUBSUB_MQTT
+#include "../../plugins/mqtt/ua_mqtt-c_adapter.h"
+#include "mqtt.h"
+#endif
+
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
 UA_StatusCode
@@ -93,5 +102,192 @@ UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection) {
     UA_PubSubConnectionConfig_clear(&connection->config);
 }
 
+static void
+assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnectionsField,
+                           UA_NodeId *connectionIdentifier) {
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    /* Internally createa a unique id */
+    addPubSubConnectionRepresentation(server, newConnectionsField);
+#else
+    /* Create a unique NodeId that does not correspond to a Node */
+    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
+                                          &newConnectionsField->identifier);
+#endif
+    if(connectionIdentifier) {
+        UA_NodeId_copy(&newConnectionsField->identifier, connectionIdentifier);
+    }
+}
+
+static UA_StatusCode
+channelErrorHandling(UA_Server *server, UA_PubSubConnection *newConnectionsField) {
+    UA_PubSubConnection_clear(server, newConnectionsField);
+    TAILQ_REMOVE(&server->pubSubManager.connections, newConnectionsField, listEntry);
+    server->pubSubManager.connectionsSize--;
+    UA_free(newConnectionsField);
+    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                 "PubSub Connection creation failed. Transport layer creation problem.");
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
+UA_StatusCode
+UA_PubSubConnection_create(UA_Server *server,
+                          const UA_PubSubConnectionConfig *connectionConfig,
+                          UA_NodeId *connectionIdentifier) {
+    /* Validate preconditions */
+    UA_CHECK_MEM(server, return UA_STATUSCODE_BADINTERNALERROR);
+    UA_CHECK_MEM_ERROR(connectionConfig, return UA_STATUSCODE_BADINTERNALERROR,
+                       &server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection creation failed. No connection configuration supplied.");
+
+    /* Retrieve the transport layer for the given profile uri */
+    UA_PubSubTransportLayer *tl =
+        UA_getTransportProtocolLayer(server, &connectionConfig->transportProfileUri);
+    UA_CHECK_MEM_ERROR(tl, return UA_STATUSCODE_BADNOTFOUND,
+                       &server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "PubSub Connection creation failed. Requested transport layer not found.");
+
+    /* Create new connection from connection config */
+    UA_PubSubConnection *newConnectionsField = (UA_PubSubConnection *)
+        UA_calloc(1, sizeof(UA_PubSubConnection));
+    if(!newConnectionsField) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Out of Memory.");
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    newConnectionsField->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
+    UA_StatusCode res = UA_PubSubConnectionConfig_copy(connectionConfig,
+                                                       &newConnectionsField->config);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_free(newConnectionsField);
+        return res;
+    }
+
+    /* Register in the PubSubManager */
+    UA_PubSubManager *pubSubManager = &server->pubSubManager;
+    TAILQ_INSERT_TAIL(&pubSubManager->connections, newConnectionsField, listEntry);
+    pubSubManager->connectionsSize++;
+
+    /* Open the communication channel */
+    UA_TransportLayerContext ctx;
+    ctx.connection = newConnectionsField;
+    ctx.connectionConfig = &newConnectionsField->config;
+    ctx.decodeAndProcessNetworkMessage =
+        (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
+        UA_decodeAndProcessNetworkMessage;
+    ctx.writerGroupAddress = NULL;
+    ctx.server = server;
+
+    newConnectionsField->channel = tl->createPubSubChannel(tl, &ctx);
+    UA_CHECK_MEM(newConnectionsField->channel,
+                 return channelErrorHandling(server, newConnectionsField));
+
+#ifdef UA_ENABLE_PUBSUB_MQTT
+    /* If the transport layer is MQTT, attach the server pointer to the callback function
+     * that is called when a PUBLISH is received. */
+    const UA_String transport_uri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+    if(UA_String_equal(&newConnectionsField->config.transportProfileUri, &transport_uri)) {
+        UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *)
+            newConnectionsField->channel->handle;
+        struct mqtt_client* client = (struct mqtt_client*)channelDataMQTT->mqttClient;
+        client->publish_response_callback_state = server;
+    }
+#endif
+
+    assignConnectionIdentifier(server, newConnectionsField, connectionIdentifier);
+
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Server_addPubSubConnection(UA_Server *server,
+                              const UA_PubSubConnectionConfig *connectionConfig,
+                              UA_NodeId *connectionIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = UA_PubSubConnection_create(server, connectionConfig, connectionIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
+    /* Find the connection */
+    UA_PubSubConnection *c =
+        UA_PubSubConnection_findConnectionbyId(server, connection);
+    if(!c)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    /* Stop, unfreeze and delete all WriterGroups attached to the Connection */
+    UA_WriterGroup *writerGroup, *tmpWriterGroup;
+    LIST_FOREACH_SAFE(writerGroup, &c->writerGroups, listEntry, tmpWriterGroup) {
+        UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
+                                      UA_STATUSCODE_BADSHUTDOWN);
+        UA_WriterGroup_unfreezeConfiguration(server, writerGroup);
+        removeWriterGroup(server, writerGroup->identifier);
+    }
+
+    /* Stop, unfreeze and delete all ReaderGroups attached to the Connection */
+    UA_ReaderGroup *readerGroup, *tmpReaderGroup;
+    LIST_FOREACH_SAFE(readerGroup, &c->readerGroups, listEntry, tmpReaderGroup) {
+        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
+                                      UA_STATUSCODE_BADSHUTDOWN);
+        UA_ReaderGroup_unfreezeConfiguration(server, readerGroup);
+        removeReaderGroup(server, readerGroup->identifier);
+    }
+
+    /* Remove from the information model */
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    deleteNode(server, c->identifier, true);
+#endif
+
+    /* Unlink from the server */
+    TAILQ_REMOVE(&server->pubSubManager.connections, c, listEntry);
+    server->pubSubManager.connectionsSize--;
+
+    /* Clean up the connection structure */
+    UA_PubSubConnection_clear(server, c);
+    UA_free(c);
+
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = removePubSubConnection(server, connection);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier,
+                           const UA_ReaderGroupConfig *readerGroupConfig) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    UA_PubSubConnection *connection =
+        UA_PubSubConnection_findConnectionbyId(server, *connectionIdentifier);
+    if(!connection)
+        return UA_STATUSCODE_BADNOTFOUND;
+
+    if(connection->isRegistered) {
+        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Connection already registered");
+        return UA_STATUSCODE_GOOD;
+    }
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    if(readerGroupConfig != NULL) {
+        UA_ExtensionObject transportSettings = readerGroupConfig->transportSettings;
+        retval = connection->channel->regist(connection->channel, &transportSettings, NULL);
+    } else {
+        retval = connection->channel->regist(connection->channel, NULL, NULL);
+    }
+
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "register channel failed: 0x%" PRIx32 "!", retval);
+    }
+
+    connection->isRegistered = true;
+    return retval;
+}
 
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 39c625b2460..888efe4c914 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -20,11 +20,6 @@
 #include "ua_pubsub_keystorage.h"
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_MQTT
-#include "../../plugins/mqtt/ua_mqtt-c_adapter.h"
-#include "mqtt.h"
-#endif
-
 #define UA_DATETIMESTAMP_2000 125911584000000000
 #define UA_RESERVEID_FIRST_ID 0x8000
 #ifdef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING
@@ -50,12 +45,6 @@ UA_getTransportProtocolLayer(const UA_Server *server,
     return tl;
 }
 
-static void
-UA_PubSubManager_addConnection(UA_PubSubManager *pubSubManager, UA_PubSubConnection *connection) {
-    TAILQ_INSERT_TAIL(&pubSubManager->connections, connection, listEntry);
-    pubSubManager->connectionsSize++;
-}
-
 static void
 UA_PubSubManager_addTopic(UA_PubSubManager *pubSubManager, UA_TopicAssign *topicAssign) {
     TAILQ_INSERT_TAIL(&pubSubManager->topicAssign, topicAssign, listEntry);
@@ -237,193 +226,6 @@ UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 nu
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode
-channelErrorHandling(UA_Server *server, UA_PubSubConnection *newConnectionsField) {
-    UA_PubSubConnection_clear(server, newConnectionsField);
-    TAILQ_REMOVE(&server->pubSubManager.connections, newConnectionsField, listEntry);
-    server->pubSubManager.connectionsSize--;
-    UA_free(newConnectionsField);
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "PubSub Connection creation failed. Transport layer creation problem.");
-    return UA_STATUSCODE_BADINTERNALERROR;
-}
-
-static void
-assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnectionsField,
-                           UA_NodeId *connectionIdentifier) {
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    /* Internally createa a unique id */
-    addPubSubConnectionRepresentation(server, newConnectionsField);
-#else
-    /* Create a unique NodeId that does not correspond to a Node */
-    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
-                                          &newConnectionsField->identifier);
-#endif
-    if(connectionIdentifier) {
-        UA_NodeId_copy(&newConnectionsField->identifier, connectionIdentifier);
-    }
-}
-
-UA_StatusCode
-UA_PubSubConnection_create(UA_Server *server,
-                          const UA_PubSubConnectionConfig *connectionConfig,
-                          UA_NodeId *connectionIdentifier) {
-    /* Validate preconditions */
-    UA_CHECK_MEM(server, return UA_STATUSCODE_BADINTERNALERROR);
-    UA_CHECK_MEM_ERROR(connectionConfig, return UA_STATUSCODE_BADINTERNALERROR,
-                       &server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection creation failed. No connection configuration supplied.");
-
-    /* Retrieve the transport layer for the given profile uri */
-    UA_PubSubTransportLayer *tl =
-        UA_getTransportProtocolLayer(server, &connectionConfig->transportProfileUri);
-    UA_CHECK_MEM_ERROR(tl, return UA_STATUSCODE_BADNOTFOUND,
-                       &server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection creation failed. Requested transport layer not found.");
-
-    /* Create new connection from connection config */
-    UA_PubSubConnection *newConnectionsField = (UA_PubSubConnection *)
-        UA_calloc(1, sizeof(UA_PubSubConnection));
-    if(!newConnectionsField) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of Memory.");
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    newConnectionsField->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
-    UA_StatusCode res = UA_PubSubConnectionConfig_copy(connectionConfig,
-                                                       &newConnectionsField->config);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_free(newConnectionsField);
-        return res;
-    }
-
-    /* Register in the PubSubManager */
-    UA_PubSubManager *pubSubManager = &server->pubSubManager;
-    UA_PubSubManager_addConnection(pubSubManager, newConnectionsField);
-
-    /* Open the communication channel */
-    UA_TransportLayerContext ctx;
-    ctx.connection = newConnectionsField;
-    ctx.connectionConfig = &newConnectionsField->config;
-    ctx.decodeAndProcessNetworkMessage =
-        (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
-        UA_decodeAndProcessNetworkMessage;
-    ctx.writerGroupAddress = NULL;
-    ctx.server = server;
-
-    newConnectionsField->channel = tl->createPubSubChannel(tl, &ctx);
-    UA_CHECK_MEM(newConnectionsField->channel,
-                 return channelErrorHandling(server, newConnectionsField));
-
-#ifdef UA_ENABLE_PUBSUB_MQTT
-    /* If the transport layer is MQTT, attach the server pointer to the callback function
-     * that is called when a PUBLISH is received. */
-    const UA_String transport_uri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
-    if(UA_String_equal(&newConnectionsField->config->transportProfileUri, &transport_uri)) {
-        UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *)
-            newConnectionsField->channel->handle;
-        struct mqtt_client* client = (struct mqtt_client*)channelDataMQTT->mqttClient;
-        client->publish_response_callback_state = server;
-    }
-#endif
-
-    assignConnectionIdentifier(server, newConnectionsField, connectionIdentifier);
-
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-UA_Server_addPubSubConnection(UA_Server *server,
-                              const UA_PubSubConnectionConfig *connectionConfig,
-                              UA_NodeId *connectionIdentifier) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = UA_PubSubConnection_create(server, connectionConfig, connectionIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-UA_StatusCode
-removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
-    /* Find the connection */
-    UA_PubSubConnection *c =
-        UA_PubSubConnection_findConnectionbyId(server, connection);
-    if(!c)
-        return UA_STATUSCODE_BADNOTFOUND;
-
-    /* Stop, unfreeze and delete all WriterGroups attached to the Connection */
-    UA_WriterGroup *writerGroup, *tmpWriterGroup;
-    LIST_FOREACH_SAFE(writerGroup, &c->writerGroups, listEntry, tmpWriterGroup) {
-        UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
-                                      UA_STATUSCODE_BADSHUTDOWN);
-        UA_WriterGroup_unfreezeConfiguration(server, writerGroup);
-        removeWriterGroup(server, writerGroup->identifier);
-    }
-
-    /* Stop, unfreeze and delete all ReaderGroups attached to the Connection */
-    UA_ReaderGroup *readerGroup, *tmpReaderGroup;
-    LIST_FOREACH_SAFE(readerGroup, &c->readerGroups, listEntry, tmpReaderGroup) {
-        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
-                                      UA_STATUSCODE_BADSHUTDOWN);
-        UA_ReaderGroup_unfreezeConfiguration(server, readerGroup);
-        removeReaderGroup(server, readerGroup->identifier);
-    }
-
-    /* Remove from the information model */
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    deleteNode(server, c->identifier, true);
-#endif
-
-    /* Unlink from the server */
-    TAILQ_REMOVE(&server->pubSubManager.connections, c, listEntry);
-    server->pubSubManager.connectionsSize--;
-
-    /* Clean up the connection structure */
-    UA_PubSubConnection_clear(server, c);
-    UA_free(c);
-
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = removePubSubConnection(server, connection);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-UA_StatusCode
-UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier,
-                           const UA_ReaderGroupConfig *readerGroupConfig) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
-    UA_PubSubConnection *connection =
-        UA_PubSubConnection_findConnectionbyId(server, *connectionIdentifier);
-    if(!connection)
-        return UA_STATUSCODE_BADNOTFOUND;
-
-    if(connection->isRegistered) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Connection already registered");
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_StatusCode retval = UA_STATUSCODE_BAD;
-    if(readerGroupConfig != NULL) {
-        UA_ExtensionObject transportSettings = readerGroupConfig->transportSettings;
-        retval = connection->channel->regist(connection->channel, &transportSettings, NULL);
-    } else {
-        retval = connection->channel->regist(connection->channel, NULL, NULL);
-    }
-
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "register channel failed: 0x%" PRIx32 "!", retval);
-    }
-
-    connection->isRegistered = true;
-    return retval;
-}
-
 UA_AddPublishedDataSetResult
 UA_PublishedDataSet_create(UA_Server *server,
                            const UA_PublishedDataSetConfig *publishedDataSetConfig,

From 79e0bdd7ab44a068df08be8a2a30ce02d1bc22d3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Jan 2023 00:45:16 +0100
Subject: [PATCH 0655/1963] refactor(pubsub): Remove unused arguments from
 message processing

---
 plugins/mqtt/ua_mqtt-c_adapter.c |  4 ++--
 src/pubsub/ua_pubsub.h           |  5 ++---
 src/pubsub/ua_pubsub_reader.c    | 31 ++++++++++++++++++++++---------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index e3c6815a2b8..7997bc41909 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -374,10 +374,10 @@ publish_callback(void** ptrServer, struct mqtt_response_publish *published)
 
     UA_TopicAssign *topicAssign1;
     TAILQ_FOREACH(topicAssign1, &pubSubManager.topicAssign, listEntry){
-        if(UA_String_equal(&topicAssign1->topic, topic)){
+        if(UA_String_equal(&topicAssign1->topic, topic)) {
             UA_PubSubConnection* pConn =
                 UA_PubSubConnection_findConnectionbyId(server, topicAssign1->rgIdentifier->linkedConnection);
-            processMqttSubscriberCallback(server, topicAssign1->rgIdentifier,pConn, msg, topic);
+            processMqttSubscriberCallback(server, pConn, msg);
         }
     }
 }
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index bc83f24700f..dd7e727ad2f 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -666,9 +666,8 @@ receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
 
 /* It serves as the entry point into reader processing and is called when
  * a publish is received, and the topic matches with one or more readers. */
-void processMqttSubscriberCallback(UA_Server *server, UA_ReaderGroup *readerGroup,
-                      UA_PubSubConnection *connection, UA_ByteString *msg,
-                      UA_ByteString *topic);
+void processMqttSubscriberCallback(UA_Server *server, UA_PubSubConnection *connection,
+                                   UA_ByteString *msg);
 
 UA_StatusCode
 decodeNetworkMessageJson(UA_Server *server, UA_ByteString *buffer, size_t *pos,
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 8d2bb58f2b9..c03a2e2ba46 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1651,7 +1651,6 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
 typedef struct {
     UA_Server *server;
     UA_PubSubConnection *connection;
-    UA_ReaderGroup *readerGroup;
 } UA_RGContext;
 
 static UA_StatusCode
@@ -1659,8 +1658,16 @@ decodeAndProcessFun(UA_PubSubChannel *channel, void *cbContext,
                     const UA_ByteString *buf) {
     UA_RGContext *ctx = (UA_RGContext*)cbContext;
     UA_ByteString mutableBuffer = {buf->length, buf->data};
+
+    /* If there is no ReaderGroup attached -> nothing to do.
+     * Otherwise assume they all have the same encoding mime-type. */
+    UA_ReaderGroup *rg = LIST_FIRST(&ctx->connection->readerGroups);
+    if(!rg)
+        return UA_STATUSCODE_BADNOTHINGTODO;
+
     return decodeAndProcessNetworkMessage(ctx->server, ctx->connection,
-                                          ctx->readerGroup->config.encodingMimeType, &mutableBuffer);
+                                          rg->config.encodingMimeType,
+                                          &mutableBuffer);
 }
 
 static UA_StatusCode
@@ -1668,21 +1675,27 @@ decodeAndProcessFunRT(UA_PubSubChannel *channel, void *cbContext,
                       const UA_ByteString *buf) {
     UA_RGContext *ctx = (UA_RGContext*)cbContext;
     UA_ByteString mutableBuffer = {buf->length, buf->data};
-    return decodeAndProcessNetworkMessageRT(ctx->server, ctx->readerGroup,
-                                            ctx->connection, &mutableBuffer);
+
+    /* Process for all ReaderGroups that are operational and linked to the connection */
+    UA_ReaderGroup *rg;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    LIST_FOREACH(rg, &ctx->connection->readerGroups, listEntry) {
+        res |= decodeAndProcessNetworkMessageRT(ctx->server, rg, ctx->connection,
+                                                &mutableBuffer);
+    }
+    return res;
 }
 
-void processMqttSubscriberCallback(UA_Server *server, UA_ReaderGroup *readerGroup,
-                      UA_PubSubConnection *connection, UA_ByteString *msg,
-                      UA_ByteString *topic) {
-    UA_RGContext ctx = {server, connection, readerGroup};
+void processMqttSubscriberCallback(UA_Server *server, UA_PubSubConnection *connection,
+                                   UA_ByteString *msg) {
+    UA_RGContext ctx = {server, connection};
     decodeAndProcessFun(connection->channel, &ctx, msg);
 }
 
 UA_StatusCode
 receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
                               UA_PubSubConnection *connection) {
-    UA_RGContext ctx = {server, connection, readerGroup};
+    UA_RGContext ctx = {server, connection};
     UA_PubSubReceiveCallback receiveCB;
     if(readerGroup->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE)
         receiveCB = decodeAndProcessFunRT;

From 552a67f850334bd7d81f9227aa92a93e4a4b9e21 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Wed, 14 Dec 2022 16:42:07 +0100
Subject: [PATCH 0656/1963] fix(doc): add instructions to run individual tests

Ctest provides option to run individual tests. However, this information was
not documented in the docs. This information is helpful for stack developers,
so that they can run individual tests for the feature they are develoing.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 doc/building.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/building.rst b/doc/building.rst
index 286303a980e..8ccea583630 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -263,7 +263,9 @@ artifacts can be specified by the following options:
    Compile example servers and clients from :file:`examples/*.c`.
 
 **UA_BUILD_UNIT_TESTS**
-   Compile unit tests. The tests can be executed with ``make test``
+   Compile unit tests. The tests can be executed with ``make test``.
+   An individual test can be executed with ``make test ARGS="-R <test_name> -V"``.
+   The list of available tests can be displayed with ``make test ARGS="-N"``.
 
 **UA_BUILD_SELFSIGNED_CERTIFICATE**
    Generate a self-signed certificate for the server (openSSL required)

From 58249b5dd3681a95ce407230008202eeeadcd8d8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Jan 2023 21:13:10 +0100
Subject: [PATCH 0657/1963] refactor(pubsub): Cosmetic improvements in
 ua_pubsub.h

---
 src/pubsub/ua_pubsub.h | 43 +++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index dd7e727ad2f..411ef0531a8 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -49,9 +49,9 @@ typedef struct UA_SecurityGroup UA_SecurityGroup;
 typedef struct UA_PublishedDataSet {
     UA_PublishedDataSetConfig config;
     UA_DataSetMetaDataType dataSetMetaData;
-    TAILQ_HEAD(UA_ListOfDataSetField, UA_DataSetField) fields;
-    UA_NodeId identifier;
+    TAILQ_HEAD(, UA_DataSetField) fields;
     UA_UInt16 fieldSize;
+    UA_NodeId identifier;
     UA_UInt16 promotedFieldsCount;
     UA_UInt16 configurationFreezeCounter;
     TAILQ_ENTRY(UA_PublishedDataSet) listEntry;
@@ -89,13 +89,15 @@ typedef struct UA_StandaloneSubscribedDataSet{
 } UA_StandaloneSubscribedDataSet;
 
 UA_StatusCode
-UA_StandaloneSubscribedDataSetConfig_copy(const UA_StandaloneSubscribedDataSetConfig *src, UA_StandaloneSubscribedDataSetConfig *dst);
+UA_StandaloneSubscribedDataSetConfig_copy(const UA_StandaloneSubscribedDataSetConfig *src,
+                                          UA_StandaloneSubscribedDataSetConfig *dst);
 UA_StandaloneSubscribedDataSet *
 UA_StandaloneSubscribedDataSet_findSDSbyId(UA_Server *server, UA_NodeId identifier);
 UA_StandaloneSubscribedDataSet *
 UA_StandaloneSubscribedDataSet_findSDSbyName(UA_Server *server, UA_String identifier);
 void
-UA_StandaloneSubscribedDataSet_clear(UA_Server *server, UA_StandaloneSubscribedDataSet *subscribedDataSet);
+UA_StandaloneSubscribedDataSet_clear(UA_Server *server,
+                                     UA_StandaloneSubscribedDataSet *subscribedDataSet);
 
 #define UA_LOG_PDS_INTERNAL(LOGGER, LEVEL, PDS, MSG, ...)               \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
@@ -130,10 +132,13 @@ typedef struct UA_PubSubConnection {
     UA_PubSubConnectionConfig config;
     UA_PubSubChannel *channel;
     UA_NodeId identifier;
-    LIST_HEAD(UA_ListOfWriterGroup, UA_WriterGroup) writerGroups;
+
+    LIST_HEAD(, UA_WriterGroup) writerGroups;
     size_t writerGroupsSize;
-    LIST_HEAD(UA_ListOfPubSubReaderGroup, UA_ReaderGroup) readerGroups;
+
+    LIST_HEAD(, UA_ReaderGroup) readerGroups;
     size_t readerGroupsSize;
+
     TAILQ_ENTRY(UA_PubSubConnection) listEntry;
     UA_UInt16 configurationFreezeCounter;
     UA_Boolean isRegistered; /* Subscriber requires connection channel regist */
@@ -164,7 +169,8 @@ UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection);
 
 /* Register channel for given connectionIdentifier */
 UA_StatusCode
-UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier, const UA_ReaderGroupConfig *readerGroupConfig);
+UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier,
+                           const UA_ReaderGroupConfig *readerGroupConfig);
 
 #define UA_LOG_CONNECTION_INTERNAL(LOGGER, LEVEL, CONNECTION, MSG, ...) \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
@@ -295,7 +301,7 @@ struct UA_WriterGroup {
     LIST_ENTRY(UA_WriterGroup) listEntry;
     UA_NodeId identifier;
     UA_PubSubConnection *linkedConnection;
-    LIST_HEAD(UA_ListOfDataSetWriter, UA_DataSetWriter) writers;
+    LIST_HEAD(, UA_DataSetWriter) writers;
     UA_UInt32 writersCount;
     UA_UInt64 publishCallbackId;
     UA_Boolean publishCallbackIsRegistered;
@@ -534,7 +540,7 @@ struct UA_ReaderGroup {
     UA_NodeId identifier;
     UA_NodeId linkedConnection;
     LIST_ENTRY(UA_ReaderGroup) listEntry;
-    LIST_HEAD(UA_ListOfPubSubDataSetReader, UA_DataSetReader) readers;
+    LIST_HEAD(, UA_DataSetReader) readers;
     /* for simplified information access */
     UA_UInt32 readersCount;
     UA_UInt64 subscribeCallbackId;
@@ -738,23 +744,25 @@ typedef struct UA_PubSubManager {
     /* Connections and PublishedDataSets can exist alone (own lifecycle) -> top
      * level components */
     size_t connectionsSize;
-    TAILQ_HEAD(UA_ListOfPubSubConnection, UA_PubSubConnection) connections;
+    TAILQ_HEAD(, UA_PubSubConnection) connections;
 
     size_t publishedDataSetsSize;
-    TAILQ_HEAD(UA_ListOfPublishedDataSet, UA_PublishedDataSet) publishedDataSets;
+    TAILQ_HEAD(, UA_PublishedDataSet) publishedDataSets;
+
     size_t subscribedDataSetsSize;
-    TAILQ_HEAD(UA_ListOfStandaloneSubscribedDataSet, UA_StandaloneSubscribedDataSet) subscribedDataSets;
+    TAILQ_HEAD(, UA_StandaloneSubscribedDataSet) subscribedDataSets;
 
     size_t topicAssignSize;
-    TAILQ_HEAD(UA_ListOfTopicAssign, UA_TopicAssign) topicAssign;
+    TAILQ_HEAD(, UA_TopicAssign) topicAssign;
 
     size_t reserveIdsSize;
-    LIST_HEAD(UA_ListOfReserveIds, UA_ReserveId) reserveIds;
+    LIST_HEAD(, UA_ReserveId) reserveIds;
 
 #ifdef UA_ENABLE_PUBSUB_SKS
-    LIST_HEAD(PubSubKeyList, UA_PubSubKeyStorage) pubSubKeyList;
+    LIST_HEAD(, UA_PubSubKeyStorage) pubSubKeyList;
+
     size_t securityGroupsSize;
-    TAILQ_HEAD(UA_ListOfSecurityGroup, UA_SecurityGroup) securityGroups;
+    TAILQ_HEAD(, UA_SecurityGroup) securityGroups;
 #endif
 
 #ifndef UA_ENABLE_PUBSUB_INFORMATIONMODEL
@@ -763,7 +771,8 @@ typedef struct UA_PubSubManager {
 } UA_PubSubManager;
 
 UA_StatusCode
-UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerGroup, UA_String topic);
+UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerGroup,
+                                      UA_String topic);
 
 UA_StatusCode
 UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 numRegWriterGroupIds,

From fdf9cf59c1621f2b9b586552077f0a2b232a9a6c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 8 Jan 2023 23:00:04 +0100
Subject: [PATCH 0658/1963] refactor(pubsub): Use ZipTree for fast
 existence-check of ReserveIds

---
 src/pubsub/ua_pubsub.h         |   6 +-
 src/pubsub/ua_pubsub_manager.c | 136 +++++++++++++++++++++------------
 2 files changed, 91 insertions(+), 51 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 411ef0531a8..317ed89b99f 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -736,9 +736,11 @@ typedef struct UA_ReserveId {
     UA_ReserveIdType reserveIdType;
     UA_String transportProfileUri;
     UA_NodeId sessionId;
-    LIST_ENTRY(UA_ReserveId) listEntry;
+    ZIP_ENTRY(UA_ReserveId) treeEntry;
 } UA_ReserveId;
 
+typedef ZIP_HEAD(UA_ReserveIdTree, UA_ReserveId) UA_ReserveIdTree;
+
 typedef struct UA_PubSubManager {
     UA_UInt64 defaultPublisherId;
     /* Connections and PublishedDataSets can exist alone (own lifecycle) -> top
@@ -756,7 +758,7 @@ typedef struct UA_PubSubManager {
     TAILQ_HEAD(, UA_TopicAssign) topicAssign;
 
     size_t reserveIdsSize;
-    LIST_HEAD(, UA_ReserveId) reserveIds;
+    UA_ReserveIdTree reserveIds;
 
 #ifdef UA_ENABLE_PUBSUB_SKS
     LIST_HEAD(, UA_PubSubKeyStorage) pubSubKeyList;
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 888efe4c914..f421a083262 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -73,6 +73,20 @@ UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerG
     return UA_STATUSCODE_GOOD;
 }
 
+static enum ZIP_CMP
+cmpReserveId(const void *a, const void *b) {
+    const UA_ReserveId *aa = (const UA_ReserveId*)a;
+    const UA_ReserveId *bb = (const UA_ReserveId*)b;
+    if(aa->id != bb->id)
+        return (aa->id < bb->id) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
+    if(aa->reserveIdType != bb->reserveIdType)
+        return (aa->reserveIdType < bb->reserveIdType) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
+    return (enum ZIP_CMP)UA_order(&aa->transportProfileUri,
+                                  &bb->transportProfileUri, &UA_TYPES[UA_TYPES_STRING]);
+}
+
+ZIP_FUNCTIONS(UA_ReserveIdTree, UA_ReserveId, treeEntry, UA_ReserveId, id, cmpReserveId)
+
 static UA_ReserveId *
 UA_ReserveId_new(UA_Server *server, UA_UInt16 id, UA_String transportProfileUri,
                  UA_ReserveIdType reserveIdType, UA_NodeId sessionId) {
@@ -91,15 +105,17 @@ UA_ReserveId_new(UA_Server *server, UA_UInt16 id, UA_String transportProfileUri,
 }
 
 static UA_Boolean
-UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id, UA_String transportProfileUri, UA_ReserveIdType reserveIdType) {
+UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id,
+                    UA_String transportProfileUri, UA_ReserveIdType reserveIdType) {
     UA_PubSubManager *pubSubManager = &server->pubSubManager;
 
-    UA_ReserveId *reserveId1;
-    LIST_FOREACH(reserveId1, &pubSubManager->reserveIds, listEntry){
-        if(UA_String_equal(&reserveId1->transportProfileUri, &transportProfileUri) && reserveId1->reserveIdType == reserveIdType && reserveId1->id == id) {
-            return false;
-        }
-    }
+    /* Is the id already in use? */
+    UA_ReserveId compare;
+    compare.id = id;
+    compare.reserveIdType = reserveIdType;
+    compare.transportProfileUri = transportProfileUri;
+    if(ZIP_FIND(UA_ReserveIdTree, &pubSubManager->reserveIds, &compare))
+        return false;
 
     UA_PubSubConnection *tmpConnection;
     TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry) {
@@ -107,7 +123,8 @@ UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id, UA_String transportProfile
         LIST_FOREACH(writerGroup, &tmpConnection->writerGroups, listEntry) {
             if(reserveIdType == UA_WRITER_GROUP) {
                 if(UA_String_equal(&tmpConnection->config.transportProfileUri,
-                                   &transportProfileUri) && writerGroup->config.writerGroupId == id)
+                                   &transportProfileUri) &&
+                   writerGroup->config.writerGroupId == id)
                     return false;
             /* reserveIdType == UA_DATA_SET_WRITER */
             } else {
@@ -116,7 +133,7 @@ UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id, UA_String transportProfile
                     if(UA_String_equal(&tmpConnection->config.transportProfileUri,
                                        &transportProfileUri) &&
                     currentWriter->config.dataSetWriterId == id)
-                       return false;
+                        return false;
                 }
             }
         }
@@ -125,7 +142,8 @@ UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id, UA_String transportProfile
 }
 
 static UA_UInt16
-UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId, UA_String transportProfileUri, UA_ReserveIdType reserveIdType) {
+UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId,
+                      UA_String transportProfileUri, UA_ReserveIdType reserveIdType) {
     /* Total number of possible Ids */
     UA_UInt16 numberOfIds = 0x8000;
     /* Contains next possible free Id */
@@ -163,53 +181,76 @@ UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId, UA_String transpo
     else
         next_id_writer = (UA_UInt16)(next_id + 1);
 
-    UA_ReserveId *reserveId = UA_ReserveId_new(server, next_id, transportProfileUri, reserveIdType, sessionId);
+    UA_ReserveId *reserveId =
+        UA_ReserveId_new(server, next_id, transportProfileUri, reserveIdType, sessionId);
+    if(!reserveId)
+        return 0;
     UA_PubSubManager *pubSubManager = &server->pubSubManager;
-    if(reserveId != NULL) {
-        /* The reserveIds list is already initialized in the pubsubmanager_init. */
-        LIST_INSERT_HEAD(&pubSubManager->reserveIds, reserveId, listEntry);
-        pubSubManager->reserveIdsSize++;
-        return next_id;
+    ZIP_INSERT(UA_ReserveIdTree, &pubSubManager->reserveIds, reserveId);
+    pubSubManager->reserveIdsSize++;
+    return next_id;
+}
+
+static void *
+removeReserveId(void *context, UA_ReserveId *elem) {
+    UA_String_clear(&elem->transportProfileUri);
+    UA_free(elem);
+    return NULL;
+}
+
+struct RemoveInactiveReserveIdContext {
+    UA_Server *server;
+    UA_ReserveIdTree newTree;
+};
+
+/* Remove ReserveIds that are not attached to any session */
+static void *
+removeInactiveReserveId(void *context, UA_ReserveId *elem) {
+    struct RemoveInactiveReserveIdContext *ctx =
+        (struct RemoveInactiveReserveIdContext*)context;
+
+    if(UA_NodeId_equal(&ctx->server->adminSession.sessionId, &elem->sessionId))
+        goto still_active;
+
+    session_list_entry *session;
+    LIST_FOREACH(session, &ctx->server->sessions, pointers) {
+        if(UA_NodeId_equal(&session->session.sessionId, &elem->sessionId))
+            goto still_active;
     }
-    return 0;
+
+    ctx->server->pubSubManager.reserveIdsSize--;
+    UA_String_clear(&elem->transportProfileUri);
+    UA_free(elem);
+    return NULL;
+
+ still_active:
+    ZIP_INSERT(UA_ReserveIdTree, &ctx->newTree, elem);
+    return NULL;
 }
 
 void
 UA_PubSubManager_freeIds(UA_Server *server) {
-    bool is_active = false;
-    UA_ReserveId *reserveId1, *reserveId2;
-    LIST_FOREACH_SAFE(reserveId1, &server->pubSubManager.reserveIds, listEntry, reserveId2){
-        if(UA_NodeId_equal(&server->adminSession.sessionId, &reserveId1->sessionId))
-            continue;
-        is_active = false;
-        session_list_entry *session;
-        LIST_FOREACH(session, &server->sessions , pointers) {
-            if(UA_NodeId_equal(&session->session.sessionId, &reserveId1->sessionId)) {
-                is_active = true;
-                break;
-            }
-        }
-        if(!is_active) {
-            server->pubSubManager.reserveIdsSize--;
-            UA_String_clear(&reserveId1->transportProfileUri);
-            LIST_REMOVE(reserveId1, listEntry);
-            UA_free(reserveId1);
-        }
-    }
+    struct RemoveInactiveReserveIdContext removeCtx;
+    removeCtx.server = server;
+    removeCtx.newTree.root = NULL;
+    ZIP_ITER(UA_ReserveIdTree, &server->pubSubManager.reserveIds,
+             removeInactiveReserveId, &removeCtx);
+    server->pubSubManager.reserveIds = removeCtx.newTree;
 }
 
 UA_StatusCode
 UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 numRegWriterGroupIds,
                             UA_UInt16 numRegDataSetWriterIds, UA_String transportProfileUri,
                             UA_UInt16 **writerGroupIds, UA_UInt16 **dataSetWriterIds) {
-
     UA_PubSubManager_freeIds(server);
+
     /* Check the validation of the transportProfileUri */
     UA_String profile_1 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     UA_String profile_2 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json");
     UA_String profile_3 = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    if(!UA_String_equal(&transportProfileUri, &profile_1) && !UA_String_equal(&transportProfileUri, &profile_2) &&
-        !UA_String_equal(&transportProfileUri, &profile_3)) {
+    if(!UA_String_equal(&transportProfileUri, &profile_1) &&
+       !UA_String_equal(&transportProfileUri, &profile_2) &&
+       !UA_String_equal(&transportProfileUri, &profile_3)) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "PubSub ReserveId creation failed. No valid transport profile uri.");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -218,10 +259,12 @@ UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 nu
     *dataSetWriterIds = (UA_UInt16*)UA_Array_new(numRegDataSetWriterIds, &UA_TYPES[UA_TYPES_UINT16]);
 
     for(int i = 0; i < numRegWriterGroupIds; i++) {
-        (*writerGroupIds)[i] = UA_ReserveId_createId(server, sessionId, transportProfileUri, UA_WRITER_GROUP);
+        (*writerGroupIds)[i] =
+            UA_ReserveId_createId(server, sessionId, transportProfileUri, UA_WRITER_GROUP);
     }
     for(int i = 0; i < numRegDataSetWriterIds; i++) {
-        (*dataSetWriterIds)[i] = UA_ReserveId_createId(server, sessionId, transportProfileUri, UA_DATA_SET_WRITER);
+        (*dataSetWriterIds)[i] =
+            UA_ReserveId_createId(server, sessionId, transportProfileUri, UA_DATA_SET_WRITER);
     }
     return UA_STATUSCODE_GOOD;
 }
@@ -587,13 +630,8 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     }
 
     /* Remove the ReserveIds*/
-    UA_ReserveId *tmpReserveId1, *tmpReserveId2;
-    LIST_FOREACH_SAFE(tmpReserveId1, &server->pubSubManager.reserveIds, listEntry, tmpReserveId2){
-        server->pubSubManager.reserveIdsSize--;
-        UA_String_clear(&tmpReserveId1->transportProfileUri);
-        LIST_REMOVE(tmpReserveId1, listEntry);
-        UA_free(tmpReserveId1);
-    }
+    ZIP_ITER(UA_ReserveIdTree, &server->pubSubManager.reserveIds, removeReserveId, NULL);
+    server->pubSubManager.reserveIdsSize = 0;
 
     /* Free the list of transport layers */
     if(server->config.pubSubConfig.transportLayersSize > 0) {

From 66bfbe3b9abcb3be0a0a252881707f826e652ce4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 Jan 2023 09:14:55 +0100
Subject: [PATCH 0659/1963] refactor(server): Reduce pointer magic and fix a
 bug in zip-tree handling

---
 src/server/ua_services_view.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index b8606307055..0923e9eb387 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -228,29 +228,21 @@ RefTree_double(RefTree *rt) {
     if(!newTargets)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    /* Repair the pointers for the realloced array+tree  */
-    // What is this sorcery?
-    // FIXME: This needs some cleaning up or explanation.
-    // IMO uintptr could be completely avoided here.
-    uintptr_t arraydiff = (uintptr_t)newTargets - (uintptr_t)rt->targets;
+    /* Move the entries to the new location  */
     RefEntry *reArray = (RefEntry*)
         ((uintptr_t)newTargets + (capacity * sizeof(UA_ExpandedNodeId)));
-    uintptr_t entrydiff = (uintptr_t)reArray -
-        ((uintptr_t)rt->targets + (rt->capacity * sizeof(UA_ExpandedNodeId)));
     RefEntry *oldReArray = (RefEntry*)
         ((uintptr_t)newTargets + (rt->capacity * sizeof(UA_ExpandedNodeId)));
     memmove(reArray, oldReArray, rt->size * sizeof(RefEntry));
+
+    /* Reinsert all entries into the tree. The new pointer location has changed
+     * their ziptree rank. */
+    rt->head.root = NULL;
     for(size_t i = 0; i < rt->size; i++) {
-        uintptr_t *left = (uintptr_t*)&ZIP_LEFT(&reArray[i], zipfields);
-        uintptr_t *right = (uintptr_t*)&ZIP_RIGHT(&reArray[i], zipfields);
-        if(*left != 0)
-            *left += entrydiff;
-        if(*right != 0)
-            *right += entrydiff;
-        reArray[i].target = (UA_ExpandedNodeId*)((uintptr_t)reArray[i].target + arraydiff);
+        reArray[i].target = &newTargets[i];
+        ZIP_INSERT(RefHead, &rt->head, &reArray[i]);
     }
 
-    ZIP_ROOT(&rt->head) = (RefEntry*)((uintptr_t)ZIP_ROOT(&rt->head) + entrydiff);
     rt->capacity = capacity;
     rt->targets = newTargets;
     return UA_STATUSCODE_GOOD;

From 8de819c7305b48e231ff3952805453a117ec22cf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 Jan 2023 10:41:21 +0100
Subject: [PATCH 0660/1963] feat(deps): Add validation helper function to
 ziptree.c

---
 deps/ziptree.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 7db4f53c44d..7ff88f1f428 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -50,6 +50,30 @@ __ZIP_KEY_CMP(zip_cmp_cb cmp, unsigned short keyoffset,
     return order;
 }
 
+#if 0
+#include <assert.h>
+ZIP_UNUSED static ZIP_INLINE void
+__ZIP_VALIDATE(zip_cmp_cb cmp, unsigned short fieldoffset,
+               unsigned short keyoffset, void *elm,
+               void *min_elm, void *max_elm) {
+    if(!elm)
+        return;
+    enum ZIP_CMP c1 = __ZIP_KEY_CMP(cmp, ZIP_KEY_PTR(min_elm), ZIP_KEY_PTR(elm));
+    assert((elm == min_elm && c1 == ZIP_CMP_EQ) || c1 == ZIP_CMP_LESS);
+
+    enum ZIP_CMP c2 = __ZIP_KEY_CMP(cmp, ZIP_KEY_PTR(max_elm), ZIP_KEY_PTR(elm));
+    assert((elm == max_elm && c2 == ZIP_CMP_EQ) || c2 == ZIP_CMP_MORE);
+
+    assert(!ZIP_ENTRY_PTR(elm)->right ||
+           __ZIP_RANK_CMP(elm, ZIP_ENTRY_PTR(elm)->right) == ZIP_CMP_MORE);
+    assert(!ZIP_ENTRY_PTR(elm)->left ||
+           __ZIP_RANK_CMP(elm, ZIP_ENTRY_PTR(elm)->left) == ZIP_CMP_MORE);
+
+    __ZIP_VALIDATE(cmp, fieldoffset, keyoffset, ZIP_ENTRY_PTR(elm)->right, elm, max_elm);
+    __ZIP_VALIDATE(cmp, fieldoffset, keyoffset, ZIP_ENTRY_PTR(elm)->left, min_elm, elm);
+}
+#endif
+
 void
 __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
              unsigned short keyoffset, void *elm) {

From 1b36db8fec7db907fbc7a0018ea1dae4ab72fb6b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 Jan 2023 10:42:47 +0100
Subject: [PATCH 0661/1963] refactor(deps): Simplifications in ziptree.c

---
 deps/ziptree.c | 48 ++++++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 7ff88f1f428..81ec6ba9315 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -40,11 +40,10 @@ __ZIP_RANK_CMP(const void *p1, const void *p2) {
 }
 
 static ZIP_INLINE enum ZIP_CMP
-__ZIP_KEY_CMP(zip_cmp_cb cmp, unsigned short keyoffset,
-          const void *p1, const void *p2) {
+__ZIP_KEY_CMP(zip_cmp_cb cmp, const void *p1, const void *p2) {
     if(p1 == p2)
         return ZIP_CMP_EQ;
-    enum ZIP_CMP order = cmp(ZIP_KEY_PTR(p1), ZIP_KEY_PTR(p2));
+    enum ZIP_CMP order = cmp(p1, p2);
     if(order == ZIP_CMP_EQ)
         return (p1 < p2) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
     return order;
@@ -81,6 +80,7 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
     ZIP_ENTRY_PTR(x)->left = NULL;
     ZIP_ENTRY_PTR(x)->right = NULL;
 
+    const void *x_key = ZIP_KEY_PTR(x);
     zip_head *head = (zip_head*)h;
     if(!head->root) {
         head->root = x;
@@ -89,12 +89,11 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
 
     zip_elem *prev = NULL;
     zip_elem *cur = head->root;
-    enum ZIP_CMP cur_order;
-    enum ZIP_CMP prev_order;
+    enum ZIP_CMP cur_order, prev_order;
     do {
         if(x == cur)
             return;
-        cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+        cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
         if(__ZIP_RANK_CMP(x, cur) == ZIP_CMP_MORE)
             break;
         prev = cur;
@@ -124,13 +123,13 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
     prev = x;
     do {
         zip_elem *fix = prev;
-        if(cur_order != ZIP_CMP_LESS) {
+        if(cur_order == ZIP_CMP_MORE) {
             do {
                 prev = cur;
                 cur = ZIP_ENTRY_PTR(cur)->right;
                 if(!cur)
                     break;
-                cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+                cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
             } while(cur_order == ZIP_CMP_MORE);
         } else {
             do {
@@ -138,12 +137,12 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
                 cur = ZIP_ENTRY_PTR(cur)->left;
                 if(!cur)
                     break;
-                cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+                cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
             } while(cur_order == ZIP_CMP_LESS);
         }
 
-        if((fix != x && __ZIP_KEY_CMP(cmp, keyoffset, x, fix) == ZIP_CMP_LESS) ||
-           (fix == x && __ZIP_KEY_CMP(cmp, keyoffset, x, prev) == ZIP_CMP_LESS))
+        if(__ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(fix)) == ZIP_CMP_LESS ||
+           (fix == x && __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(prev)) == ZIP_CMP_LESS))
             ZIP_ENTRY_PTR(fix)->left = cur;
         else
             ZIP_ENTRY_PTR(fix)->right = cur;
@@ -159,23 +158,20 @@ __ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
     if(!cur)
         return;
 
-    zip_elem **prev_edge;
-    enum ZIP_CMP cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+    const void *x_key = ZIP_KEY_PTR(x);
+    zip_elem **prev_edge = &head->root;
+    enum ZIP_CMP cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
     while(cur_order != ZIP_CMP_EQ) {
         prev_edge = (cur_order == ZIP_CMP_LESS) ?
             &ZIP_ENTRY_PTR(cur)->left : &ZIP_ENTRY_PTR(cur)->right;
         cur = *prev_edge;
         if(!cur)
             return;
-        cur_order = __ZIP_KEY_CMP(cmp, keyoffset, x, cur);
+        cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
     }
-    cur = (zip_elem*)__ZIP_ZIP(fieldoffset,
-                               ZIP_ENTRY_PTR(cur)->left,
-                               ZIP_ENTRY_PTR(cur)->right);
-    if(head->root == x)
-        head->root = cur;
-    else
-        *prev_edge = cur;
+    *prev_edge = (zip_elem*)__ZIP_ZIP(fieldoffset,
+                                      ZIP_ENTRY_PTR(cur)->left,
+                                      ZIP_ENTRY_PTR(cur)->right);
 }
 
 void *
@@ -270,11 +266,7 @@ __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
 
     zip_elem *cur = head->root;
     enum ZIP_CMP head_order = cmp(key, ZIP_KEY_PTR(cur));
-    if(head_order == ZIP_CMP_EQ) {
-        right->root = ZIP_ENTRY_PTR(cur)->right;
-        ZIP_ENTRY_PTR(cur)->right = NULL;
-        left->root = cur;
-    } else if(head_order == ZIP_CMP_MORE) {
+    if(head_order != ZIP_CMP_LESS) {
         left->root = cur;
         do {
             prev = cur;
@@ -290,7 +282,7 @@ __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
         while(ZIP_ENTRY_PTR(cur)->left) {
             prev = cur;
             cur = ZIP_ENTRY_PTR(cur)->left;
-            if(cmp(key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS) {
+            if(__ZIP_KEY_CMP(cmp, key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS) {
                 ZIP_ENTRY_PTR(prev)->left = ZIP_ENTRY_PTR(cur)->right;
                 ZIP_ENTRY_PTR(cur)->right = NULL;
                 ZIP_ENTRY_PTR(left_rightmost)->right = cur;
@@ -314,7 +306,7 @@ __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
         while(ZIP_ENTRY_PTR(cur)->right) {
             prev = cur;
             cur = ZIP_ENTRY_PTR(cur)->right;
-            if(cmp(key, ZIP_KEY_PTR(cur)) == ZIP_CMP_LESS) {
+            if(__ZIP_KEY_CMP(cmp, key, ZIP_KEY_PTR(cur)) == ZIP_CMP_LESS) {
                 ZIP_ENTRY_PTR(prev)->right = ZIP_ENTRY_PTR(cur)->left;
                 ZIP_ENTRY_PTR(cur)->left = NULL;
                 ZIP_ENTRY_PTR(right_leftmost)->left = cur;

From c8efcd2f9b7f2bcfd635d04fff6b63ecffd46d92 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 8 Jan 2023 22:57:30 +0100
Subject: [PATCH 0662/1963] feat(pubsub): Allow the configuration of external
 EventLoops

---
 include/open62541/server_pubsub.h             |   5 +
 plugins/mqtt/ua_mqtt-c_adapter.c              |   3 +-
 src/pubsub/ua_pubsub.h                        |  22 +--
 src/pubsub/ua_pubsub_manager.c                |  56 ++------
 src/pubsub/ua_pubsub_ns0.c                    |   3 +-
 src/pubsub/ua_pubsub_readergroup.c            |  87 +++++-------
 src/pubsub/ua_pubsub_writergroup.c            |  88 ++++++------
 tests/pubsub/check_pubsub_publish_rt_levels.c | 133 ++++++++----------
 8 files changed, 163 insertions(+), 234 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 8c40dfd0dcc..a4ba76d9ccf 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -178,6 +178,11 @@ struct UA_PubSubConnectionConfig {
     UA_Variant address;
     UA_KeyValueMap connectionProperties;
     UA_Variant connectionTransportSettings;
+
+    UA_EventLoop *eventLoop; /* Use an external EventLoop (use the EventLoop of
+                              * the server if this is NULL). Propagates to the
+                              * ReaderGroup/WriterGroup attached to the
+                              * Connection. */
 };
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index 7997bc41909..524a049a8de 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -375,8 +375,7 @@ publish_callback(void** ptrServer, struct mqtt_response_publish *published)
     UA_TopicAssign *topicAssign1;
     TAILQ_FOREACH(topicAssign1, &pubSubManager.topicAssign, listEntry){
         if(UA_String_equal(&topicAssign1->topic, topic)) {
-            UA_PubSubConnection* pConn =
-                UA_PubSubConnection_findConnectionbyId(server, topicAssign1->rgIdentifier->linkedConnection);
+            UA_PubSubConnection* pConn = topicAssign1->rgIdentifier->linkedConnection;
             processMqttSubscriberCallback(server, pConn, msg);
         }
     }
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 317ed89b99f..a80570210c1 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -303,8 +303,7 @@ struct UA_WriterGroup {
     UA_PubSubConnection *linkedConnection;
     LIST_HEAD(, UA_DataSetWriter) writers;
     UA_UInt32 writersCount;
-    UA_UInt64 publishCallbackId;
-    UA_Boolean publishCallbackIsRegistered;
+    UA_UInt64 publishCallbackId; /* registered if != 0 */
     UA_PubSubState state;
     UA_NetworkMessageOffsetBuffer bufferedMessage;
     UA_UInt16 sequenceNumber; /* Increased after every succressuly sent message */
@@ -350,6 +349,9 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg);
 UA_StatusCode
 UA_WriterGroup_unfreezeConfiguration(UA_Server *server, UA_WriterGroup *wg);
 
+void
+UA_ReaderGroup_removePublishCallback(UA_Server *server, UA_WriterGroup *wg);
+
 UA_StatusCode
 UA_WriterGroup_setPubSubState(UA_Server *server,
                               UA_WriterGroup *writerGroup,
@@ -538,7 +540,7 @@ struct UA_ReaderGroup {
     UA_PubSubComponentEnumType componentType;
     UA_ReaderGroupConfig config;
     UA_NodeId identifier;
-    UA_NodeId linkedConnection;
+    UA_PubSubConnection *linkedConnection;
     LIST_ENTRY(UA_ReaderGroup) listEntry;
     LIST_HEAD(, UA_DataSetReader) readers;
     /* for simplified information access */
@@ -801,20 +803,6 @@ UA_PubSubManager_generateUniqueGuid(UA_Server *server);
 UA_UInt32
 UA_PubSubConfigurationVersionTimeDifference(void);
 
-/***********************************/
-/*      PubSub Jobs abstraction    */
-/***********************************/
-UA_StatusCode
-UA_PubSubManager_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
-                                     void *data, UA_Double interval_ms, UA_DateTime *baseTime,
-                                     UA_TimerPolicy timerPolicy, UA_UInt64 *callbackId);
-UA_StatusCode
-UA_PubSubManager_changeRepeatedCallback(UA_Server *server, UA_UInt64 callbackId,
-                                        UA_Double interval_ms, UA_DateTime *baseTime,
-                                        UA_TimerPolicy timerPolicy);
-void
-UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callbackId);
-
 UA_PubSubTransportLayer *
 UA_getTransportProtocolLayer(const UA_Server *server,
                              const UA_String *transportProfileUri);
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index f421a083262..e885f55cd65 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -659,36 +659,6 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
 #endif
 }
 
-/***********************************/
-/*      PubSub Jobs abstraction    */
-/***********************************/
-
-/* Default Timer based PubSub Callbacks */
-
-UA_StatusCode
-UA_PubSubManager_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
-                                     void *data, UA_Double interval_ms, UA_DateTime *baseTime,
-                                     UA_TimerPolicy timerPolicy, UA_UInt64 *callbackId) {
-    return server->config.eventLoop->
-        addCyclicCallback(server->config.eventLoop, (UA_Callback)callback, server, data,
-                          interval_ms, baseTime, timerPolicy, callbackId);
-}
-
-UA_StatusCode
-UA_PubSubManager_changeRepeatedCallback(UA_Server *server, UA_UInt64 callbackId,
-                                        UA_Double interval_ms, UA_DateTime *baseTime,
-                                        UA_TimerPolicy timerPolicy) {
-    return server->config.eventLoop->
-        modifyCyclicCallback(server->config.eventLoop, callbackId, interval_ms,
-                             baseTime, timerPolicy);
-}
-
-void
-UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callbackId) {
-    server->config.eventLoop->removeCyclicCallback(server->config.eventLoop, callbackId);
-}
-
-
 #ifdef UA_ENABLE_PUBSUB_MONITORING
 
 static UA_StatusCode
@@ -732,7 +702,8 @@ static void
 monitoringReceiveTimeoutOnce(UA_Server *server, void *data) {
     UA_DataSetReader *reader = (UA_DataSetReader*)data;
     reader->msgRcvTimeoutTimerCallback(server, reader);
-    UA_PubSubManager_removeRepeatedPubSubCallback(server, reader->msgRcvTimeoutTimerId);
+    UA_EventLoop *el = server->config.eventLoop;
+    el->removeCyclicCallback(el, reader->msgRcvTimeoutTimerId);
     reader->msgRcvTimeoutTimerId = 0;
 }
 
@@ -756,12 +727,12 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
                     /* use a timed callback, because one notification is enough,
                      * we assume that MessageReceiveTimeout configuration is in
                      * [ms], we do not handle or check fractions */
-                    ret = UA_PubSubManager_addRepeatedCallback(server, monitoringReceiveTimeoutOnce,
-                                                               reader, reader->config.messageReceiveTimeout,
-                                                               NULL,
-                                                               UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-                                                               &reader->msgRcvTimeoutTimerId);
-                    if (ret == UA_STATUSCODE_GOOD) {
+                    UA_EventLoop *el = server->config.eventLoop;
+                    ret = el->addCyclicCallback(el, (UA_Callback)monitoringReceiveTimeoutOnce,
+                                                server, reader, reader->config.messageReceiveTimeout,
+                                                NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                                &reader->msgRcvTimeoutTimerId);
+                    if(ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                             "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s'- MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
                             "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data,
@@ -807,7 +778,8 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComp
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
-                    server->config.eventLoop->removeCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId);
+                    UA_EventLoop *el = server->config.eventLoop;
+                    el->removeCyclicCallback(el, reader->msgRcvTimeoutTimerId);
                     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                         "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
                             "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data,
@@ -847,10 +819,10 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
-                    ret = server->config.eventLoop->
-                        modifyCyclicCallback(server->config.eventLoop, reader->msgRcvTimeoutTimerId,
-                                             reader->config.messageReceiveTimeout, NULL,
-                                             UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
+                    UA_EventLoop *el = server->config.eventLoop;
+                    ret = el->modifyCyclicCallback(el, reader->msgRcvTimeoutTimerId,
+                                                   reader->config.messageReceiveTimeout, NULL,
+                                                   UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
                     if (ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                             "UA_PubSubComponent_updateMonitoringInterval(): DataSetReader '%.*s' - MessageReceiveTimeout: new MessageReceiveTimeout = '%f' "
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 31394536b73..f0e78a949b3 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1597,7 +1597,8 @@ addReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup) {
     object_attr.displayName = UA_LOCALIZEDTEXT("", rgName);
     UA_StatusCode retVal =
         addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NUMERIC(1, 0), /* create an id */
-                readerGroup->linkedConnection, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                readerGroup->linkedConnection->identifier,
+                UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                 UA_QUALIFIEDNAME(0, rgName), UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE),
                 &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
                 NULL, &readerGroup->identifier);
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 17bea74d75d..d4b2e3915e5 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -126,7 +126,7 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
     newGroup->componentType = UA_PUBSUB_COMPONENT_READERGROUP;
 
     /* Deep copy of the config */
-    retval |= UA_NodeId_copy(&currentConnectionContext->identifier, &newGroup->linkedConnection);
+    newGroup->linkedConnection = currentConnectionContext;
     retval |= UA_ReaderGroupConfig_copy(readerGroupConfig, &newGroup->config);
 
     /* Check user configured params and define it accordingly */
@@ -214,19 +214,13 @@ removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
     if(readerGroup == NULL)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    if(readerGroup->configurationFrozen){
+    if(readerGroup->configurationFrozen) {
         UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
                                    "Remove ReaderGroup failed. "
                                    "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    /* Search the connection to which the given readergroup is connected to */
-    UA_PubSubConnection *connection =
-        UA_PubSubConnection_findConnectionbyId(server, readerGroup->linkedConnection);
-    if(connection == NULL)
-        return UA_STATUSCODE_BADNOTFOUND;
-
     /* Unregister subscribe callback */
     if(readerGroup->state == UA_PUBSUBSTATE_OPERATIONAL)
         UA_ReaderGroup_removeSubscribeCallback(server, readerGroup);
@@ -285,13 +279,11 @@ ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup) {
     LIST_FOREACH_SAFE(dataSetReader, &readerGroup->readers, listEntry, tmpDataSetReader) {
         removeDataSetReader(server, dataSetReader->identifier);
     }
-    UA_PubSubConnection* pConn =
-        UA_PubSubConnection_findConnectionbyId(server, readerGroup->linkedConnection);
+    UA_PubSubConnection* pConn = readerGroup->linkedConnection;
     if(pConn != NULL)
         pConn->readerGroupsSize--;
 
     /* Delete ReaderGroup and its members */
-    UA_NodeId_clear(&readerGroup->linkedConnection);
     UA_NodeId_clear(&readerGroup->identifier);
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
@@ -342,7 +334,7 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
         break;
     case UA_PUBSUBSTATE_OPERATIONAL: {
         UA_ReaderGroup_removeSubscribeCallback(server, rg);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, rg->linkedConnection);
+        UA_PubSubConnection *connection = rg->linkedConnection;
         UA_PubSubChannel *channel = connection->channel;
         if(channel->closeSubscriber) {
             channel->closeSubscriber(channel);
@@ -398,7 +390,7 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
             UA_DataSetReader_setPubSubState(server, dataSetReader, UA_PUBSUBSTATE_OPERATIONAL,
                                             cause);
         }
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, rg->linkedConnection);
+        UA_PubSubConnection *connection = rg->linkedConnection;
         UA_PubSubChannel *channel = connection->channel;
         if(channel->openSubscriber) {
             channel->openSubscriber(channel);
@@ -573,9 +565,7 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
         return UA_STATUSCODE_GOOD;
 
     /* PubSubConnection freezeCounter++ */
-    UA_NodeId pubSubConnectionId =  rg->linkedConnection;
-    UA_PubSubConnection *pubSubConnection =
-        UA_PubSubConnection_findConnectionbyId(server, pubSubConnectionId);
+    UA_PubSubConnection *pubSubConnection = rg->linkedConnection;
     pubSubConnection->configurationFreezeCounter++;
     pubSubConnection->configurationFrozen = true;
 
@@ -729,9 +719,7 @@ UA_ReaderGroup_unfreezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* PubSubConnection freezeCounter-- */
-    UA_NodeId pubSubConnectionId =  rg->linkedConnection;
-    UA_PubSubConnection *pubSubConnection =
-        UA_PubSubConnection_findConnectionbyId(server, pubSubConnectionId);
+    UA_PubSubConnection *pubSubConnection = rg->linkedConnection;
     pubSubConnection->configurationFreezeCounter--;
     if(pubSubConnection->configurationFreezeCounter == 0){
         pubSubConnection->configurationFrozen = false;
@@ -776,8 +764,7 @@ UA_ReaderGroup_subscribeCallback(UA_Server *server,
     UA_LOG_DEBUG_READERGROUP(&server->config.logger, readerGroup,
                              "PubSub subscribe callback");
 
-    UA_PubSubConnection *connection =
-        UA_PubSubConnection_findConnectionbyId(server, readerGroup->linkedConnection);
+    UA_PubSubConnection *connection = readerGroup->linkedConnection;
     if(!connection) {
         UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
                      "SubscribeCallback(): Find linked connection failed");
@@ -793,32 +780,27 @@ UA_ReaderGroup_subscribeCallback(UA_Server *server,
  * creation. */
 UA_StatusCode
 UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(readerGroup->config.pubsubManagerCallback.addCustomCallback)
-        retval = readerGroup->config.pubsubManagerCallback.
-            addCustomCallback(server, readerGroup->identifier,
-               (UA_ServerCallback)UA_ReaderGroup_subscribeCallback,
-               readerGroup, readerGroup->config.subscribingInterval,
-               NULL, // TODO: Send base time from reader group config
-               // TODO: Send timer policy from reader group config
-               UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-               &readerGroup->subscribeCallbackId);
-    else {
-        if(readerGroup->config.enableBlockingSocket == true) {
-            UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
-                                       "addSubscribeCallback() failed, blocking socket "
-                                       "functionality only supported in customcallback");
-            return UA_STATUSCODE_BADNOTSUPPORTED;
-        }
+    /* Already registered */
+    if(readerGroup->subscribeCallbackId != 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
-        retval = UA_PubSubManager_addRepeatedCallback(server,
-                    (UA_ServerCallback)UA_ReaderGroup_subscribeCallback,
-                    readerGroup, readerGroup->config.subscribingInterval,
-                    NULL, // TODO: Send base time from reader group config
-                    // TODO: Send timer policy from reader group config
-                    UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-                    &readerGroup->subscribeCallbackId);
-    }
+    UA_EventLoop *el = readerGroup->linkedConnection->config.eventLoop;
+    if(!el)
+        el = server->config.eventLoop;
+
+    UA_StatusCode retval =
+        el->addCyclicCallback(el, (UA_Callback)UA_ReaderGroup_subscribeCallback,
+                              server, readerGroup,
+                              readerGroup->config.subscribingInterval,
+                              NULL /* TODO: use basetime */,
+                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME /* TODO: Send
+                                                                          * timer policy
+                                                                          * from writer
+                                                                          * group
+                                                                          * config */,
+                              &readerGroup->subscribeCallbackId);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
 
     /* Run once after creation */
     /* When using blocking socket functionality, the server mechanism might get
@@ -832,13 +814,12 @@ UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGro
 
 void
 UA_ReaderGroup_removeSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup) {
-    if(readerGroup->config.pubsubManagerCallback.removeCustomCallback)
-        readerGroup->config.pubsubManagerCallback.
-            removeCustomCallback(server, readerGroup->identifier,
-                                 readerGroup->subscribeCallbackId);
-    else
-        UA_PubSubManager_removeRepeatedPubSubCallback(server,
-                                                      readerGroup->subscribeCallbackId);
+    UA_EventLoop *el = readerGroup->linkedConnection->config.eventLoop;
+    if(!el)
+        el = server->config.eventLoop;
+    if(readerGroup->subscribeCallbackId != 0)
+        el->removeCyclicCallback(el, readerGroup->subscribeCallbackId);
+    readerGroup->subscribeCallbackId = 0;
 }
 
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 6100ef022c3..b1ae2ba1c4f 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -218,13 +218,7 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     }
 
     if(wg->state == UA_PUBSUBSTATE_OPERATIONAL) {
-        /* Unregister the publish callback */
-        if(wg->config.pubsubManagerCallback.removeCustomCallback)
-            wg->config.pubsubManagerCallback.
-                removeCustomCallback(server, wg->identifier, wg->publishCallbackId);
-        else
-            UA_PubSubManager_removeRepeatedPubSubCallback(server, wg->publishCallbackId);
-
+        UA_ReaderGroup_removePublishCallback(server, wg);
     }
 
     UA_DataSetWriter *dsw, *dsw_tmp;
@@ -611,19 +605,11 @@ UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
     }
 
     if(wg->config.publishingInterval != config->publishingInterval) {
+        wg->config.publishingInterval = config->publishingInterval;
         if(wg->config.rtLevel == UA_PUBSUB_RT_NONE &&
            wg->state == UA_PUBSUBSTATE_OPERATIONAL) {
-            if(wg->config.pubsubManagerCallback.removeCustomCallback)
-                wg->config.pubsubManagerCallback.
-                    removeCustomCallback(server, wg->identifier,
-                                         wg->publishCallbackId);
-            else
-                UA_PubSubManager_removeRepeatedPubSubCallback(server, wg->publishCallbackId);
-
-            wg->config.publishingInterval = config->publishingInterval;
+            UA_ReaderGroup_removePublishCallback(server, wg);
             UA_WriterGroup_addPublishCallback(server, wg);
-        } else {
-            wg->config.publishingInterval = config->publishingInterval;
         }
     }
 
@@ -823,11 +809,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
                 case UA_PUBSUBSTATE_OPERATIONAL: {
-                    if(writerGroup->config.pubsubManagerCallback.removeCustomCallback)
-                        writerGroup->config.pubsubManagerCallback.
-                            removeCustomCallback(server, writerGroup->identifier, writerGroup->publishCallbackId);
-                    else
-                        UA_PubSubManager_removeRepeatedPubSubCallback(server, writerGroup->publishCallbackId);
+                    UA_ReaderGroup_removePublishCallback(server, writerGroup);
 
                     LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
                         UA_DataSetWriter_setPubSubState(server, dataSetWriter, UA_PUBSUBSTATE_DISABLED,
@@ -871,12 +853,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
             switch (writerGroup->state) {
                 case UA_PUBSUBSTATE_DISABLED: {
                     writerGroup->state = UA_PUBSUBSTATE_OPERATIONAL;
-                    if(writerGroup->config.pubsubManagerCallback.removeCustomCallback)
-                        writerGroup->config.pubsubManagerCallback.
-                            removeCustomCallback(server, writerGroup->identifier,
-                                                 writerGroup->publishCallbackId);
-                    else
-                        UA_PubSubManager_removeRepeatedPubSubCallback(server, writerGroup->publishCallbackId);
+                    UA_ReaderGroup_removePublishCallback(server, writerGroup);
 
                     LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
                         UA_DataSetWriter_setPubSubState(server, dataSetWriter,
@@ -910,13 +887,15 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                     break;
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
-                case UA_PUBSUBSTATE_OPERATIONAL:
-                    UA_PubSubManager_removeRepeatedPubSubCallback(server, writerGroup->publishCallbackId);
+                case UA_PUBSUBSTATE_OPERATIONAL: {
+                    UA_ReaderGroup_removePublishCallback(server, writerGroup);
+
                     LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
                         UA_DataSetWriter_setPubSubState(server, dataSetWriter, UA_PUBSUBSTATE_ERROR,
                                                         UA_STATUSCODE_GOOD);
                     }
                     break;
+                }
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
@@ -1443,25 +1422,28 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
 UA_StatusCode
 UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(writerGroup->config.pubsubManagerCallback.addCustomCallback)
-        retval |= writerGroup->config.pubsubManagerCallback.
-            addCustomCallback(server, writerGroup->identifier,
-                              (UA_ServerCallback) UA_WriterGroup_publishCallback,
-                              writerGroup, writerGroup->config.publishingInterval,
-                              NULL,                                        // TODO: Send base time from writer group config
-                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,  // TODO: Send timer policy from writer group config
-                              &writerGroup->publishCallbackId);
-    else
-        retval |= UA_PubSubManager_addRepeatedCallback(server,
-                     (UA_ServerCallback) UA_WriterGroup_publishCallback,
-                     writerGroup, writerGroup->config.publishingInterval,
-                     NULL,                                        // TODO: Send base time from writer group config
-                     UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,  // TODO: Send timer policy from writer group config
-                     &writerGroup->publishCallbackId);
 
-    if(retval == UA_STATUSCODE_GOOD)
-        writerGroup->publishCallbackIsRegistered = true;
+    /* Already registered */
+    if(writerGroup->publishCallbackId != 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_EventLoop *el = server->config.eventLoop;
+    if(writerGroup->linkedConnection && writerGroup->linkedConnection->config.eventLoop)
+        el = writerGroup->linkedConnection->config.eventLoop;
+
+    UA_StatusCode retval =
+        el->addCyclicCallback(el, (UA_Callback)UA_WriterGroup_publishCallback,
+                              server, writerGroup,
+                              writerGroup->config.publishingInterval,
+                              NULL /* TODO: use basetime */,
+                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME /* TODO: Send
+                                                                          * timer policy
+                                                                          * from writer
+                                                                          * group
+                                                                          * config */,
+                              &writerGroup->publishCallbackId);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
 
     /* Run once after creation. The Publish callback itself takes the server
      * mutex. So we release it first. */
@@ -1471,4 +1453,14 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup
     return retval;
 }
 
+void
+UA_ReaderGroup_removePublishCallback(UA_Server *server, UA_WriterGroup *wg) {
+    UA_EventLoop *el = server->config.eventLoop;
+    if(wg->linkedConnection && wg->linkedConnection->config.eventLoop)
+        el = wg->linkedConnection->config.eventLoop;
+    if(wg->publishCallbackId != 0)
+        el->removeCyclicCallback(el, wg->publishCallbackId);
+    wg->publishCallbackId = 0;
+}
+
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index a2a10ff6f6f..4593257458d 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -16,9 +16,12 @@
 #include <check.h>
 #include <stdio.h>
 
+UA_EventLoop *rtEventLoop = NULL;
 UA_Server *server = NULL;
 UA_NodeId connectionIdentifier, publishedDataSetIdent, writerGroupIdent, dataSetWriterIdent, dataSetFieldIdent;
 
+UA_DataValue *staticSource1, *staticSource2;
+
 static UA_StatusCode
 addMinimalPubSubConfiguration(void){
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -28,6 +31,7 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.enabled = UA_TRUE;
+    connectionConfig.eventLoop = rtEventLoop;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
@@ -51,11 +55,48 @@ static void setup(void) {
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     UA_Server_run_startup(server);
+
+    rtEventLoop = UA_EventLoop_new_POSIX(&server->config.logger);
+
+    /* Add the TCP connection manager */
+    UA_ConnectionManager *tcpCM =
+        UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcp connection manager"));
+    rtEventLoop->registerEventSource(rtEventLoop, (UA_EventSource *)tcpCM);
+
+    /* Add the UDP connection manager */
+    UA_ConnectionManager *udpCM =
+        UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp connection manager"));
+    rtEventLoop->registerEventSource(rtEventLoop, (UA_EventSource *)udpCM);
+
+    rtEventLoop->start(rtEventLoop);
 }
 
 static void teardown(void) {
     UA_Server_run_shutdown(server);
+
+    if(rtEventLoop->state != UA_EVENTLOOPSTATE_FRESH &&
+       rtEventLoop->state != UA_EVENTLOOPSTATE_STOPPED) {
+        rtEventLoop->stop(rtEventLoop);
+        while(rtEventLoop->state != UA_EVENTLOOPSTATE_STOPPED) {
+            rtEventLoop->run(rtEventLoop, 100);
+        }
+    }
+
     UA_Server_delete(server);
+    rtEventLoop->free(rtEventLoop);
+
+    rtEventLoop = NULL;
+    server = NULL;
+
+    /* Clean these up only after the server is done */
+    if(staticSource1) {
+        UA_DataValue_delete(staticSource1);
+        staticSource1 = NULL;
+    }
+    if(staticSource2) {
+        UA_DataValue_delete(staticSource2);
+        staticSource2 = NULL;
+    }
 }
 
 typedef struct {
@@ -133,10 +174,10 @@ START_TEST(PublishSingleFieldWithStaticValueSource) {
         /* Create Variant and configure as DataSetField source */
         UA_UInt32 *intValue = UA_UInt32_new();
         *intValue = 1000;
-        UA_DataValue *dataValue = UA_DataValue_new();
-        UA_Variant_setScalar(&dataValue->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
+        staticSource1 = UA_DataValue_new();
+        UA_Variant_setScalar(&staticSource1->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
         dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
-        dsfConfig.field.variable.rtValueSource.staticValueSource = &dataValue;
+        dsfConfig.field.variable.rtValueSource.staticValueSource = &staticSource1;
         ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent).result == UA_STATUSCODE_GOOD);
 
         /* DataSetWriter muste be added AFTER addDataSetField otherwize lastSamples will be uninitialized */
@@ -150,8 +191,7 @@ START_TEST(PublishSingleFieldWithStaticValueSource) {
         receiveSingleMessage(buffer, connection, &networkMessage);
         ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
         UA_NetworkMessage_clear(&networkMessage);
-        UA_DataValue_delete(dataValue);
-    } END_TEST
+} END_TEST
 
 START_TEST(PublishSingleFieldWithDifferentBinarySizes) {
         ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
@@ -183,11 +223,11 @@ START_TEST(PublishSingleFieldWithDifferentBinarySizes) {
         memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
         /* Create Variant and configure as DataSetField source */
         UA_String stringValue = UA_STRING_ALLOC("12345");
-        UA_DataValue *dataValue = UA_DataValue_new();
-        UA_Variant_setScalar(&dataValue->value, &stringValue, &UA_TYPES[UA_TYPES_STRING]);
-        dataValue->value.storageType = UA_VARIANT_DATA_NODELETE;
+        staticSource1 = UA_DataValue_new();
+        UA_Variant_setScalar(&staticSource1->value, &stringValue, &UA_TYPES[UA_TYPES_STRING]);
+        staticSource1->value.storageType = UA_VARIANT_DATA_NODELETE;
         dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
-        dsfConfig.field.variable.rtValueSource.staticValueSource = &dataValue;
+        dsfConfig.field.variable.rtValueSource.staticValueSource = &staticSource1;
         dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
         ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent).result == UA_STATUSCODE_GOOD);
         ck_assert(UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent) == UA_STATUSCODE_GOOD);
@@ -213,7 +253,6 @@ START_TEST(PublishSingleFieldWithDifferentBinarySizes) {
         ck_assert(UA_String_equal(((UA_String *) networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data), &compareString) == UA_TRUE);
         UA_NetworkMessage_clear(&networkMessage);
         UA_String_clear(&stringValue);
-        UA_DataValue_delete(dataValue);
     } END_TEST
 
 START_TEST(SetupInvalidPubSubConfigWithStaticValueSource) {
@@ -287,10 +326,10 @@ START_TEST(PublishSingleFieldWithFixedOffsets) {
         // Create Variant and configure as DataSetField source
         UA_UInt32 *intValue = UA_UInt32_new();
         *intValue = (UA_UInt32) 1000;
-        UA_DataValue *dataValue = UA_DataValue_new();
-        UA_Variant_setScalar(&dataValue->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
+        staticSource1 = UA_DataValue_new();
+        UA_Variant_setScalar(&staticSource1->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
         dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
-        dsfConfig.field.variable.rtValueSource.staticValueSource = &dataValue;
+        dsfConfig.field.variable.rtValueSource.staticValueSource = &staticSource1;
         dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
         ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent).result == UA_STATUSCODE_GOOD);
 
@@ -304,10 +343,6 @@ START_TEST(PublishSingleFieldWithFixedOffsets) {
         receiveSingleMessage(buffer, connection, &networkMessage);
         ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
         UA_NetworkMessage_clear(&networkMessage);
-        UA_DataValue_delete(dataValue);
-
-        UA_Server_run_shutdown(server);
-        UA_Server_delete(server);
     } END_TEST
 
 START_TEST(PublishPDSWithMultipleFieldsAndFixedOffset) {
@@ -341,18 +376,18 @@ START_TEST(PublishPDSWithMultipleFieldsAndFixedOffset) {
         // Create Variant and configure as DataSetField source
         UA_UInt32 *intValue = UA_UInt32_new();
         *intValue = (UA_UInt32) 1000;
-        UA_DataValue *dataValue = UA_DataValue_new();
-        UA_Variant_setScalar(&dataValue->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
+        staticSource1 = UA_DataValue_new();
+        UA_Variant_setScalar(&staticSource1->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
         dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
         dsfConfig.field.variable.rtValueSource.rtInformationModelNode = UA_FALSE;
-        dsfConfig.field.variable.rtValueSource.staticValueSource = &dataValue;
+        dsfConfig.field.variable.rtValueSource.staticValueSource = &staticSource1;
         dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
         ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, NULL).result == UA_STATUSCODE_GOOD);
         UA_UInt32 *intValue2 = UA_UInt32_new();
         *intValue2 = (UA_UInt32) 2000;
-        UA_DataValue *dataValue2 = UA_DataValue_new();
-        UA_Variant_setScalar(&dataValue2->value, intValue2, &UA_TYPES[UA_TYPES_UINT32]);
-        dsfConfig.field.variable.rtValueSource.staticValueSource = &dataValue2;
+        staticSource2 = UA_DataValue_new();
+        UA_Variant_setScalar(&staticSource2->value, intValue2, &UA_TYPES[UA_TYPES_UINT32]);
+        dsfConfig.field.variable.rtValueSource.staticValueSource = &staticSource2;
         ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, NULL).result == UA_STATUSCODE_GOOD);
 
         ck_assert(UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent) == UA_STATUSCODE_GOOD);
@@ -377,45 +412,8 @@ START_TEST(PublishPDSWithMultipleFieldsAndFixedOffset) {
         ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1001);
         ck_assert(*((UA_UInt32 *) networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields[1].value.data) == 2001);
         UA_NetworkMessage_clear(&networkMessage);
-
-        UA_Server_run_shutdown(server);
-        UA_Server_delete(server);
-        UA_DataValue_delete(dataValue);
-        UA_DataValue_delete(dataValue2);
 } END_TEST
 
-/* Custom callbacks for add, change and remove pubsub callbacks */
-static UA_StatusCode
-addPubSubApplicationCallback(UA_Server *server_local, UA_NodeId identifier,
-                             UA_ServerCallback callback,
-                             void *data, UA_Double interval_ms,
-                             UA_DateTime *baseTime, UA_TimerPolicy timerPolicy,
-                             UA_UInt64 *callbackId) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_WriterGroup *writerGroup = (UA_WriterGroup *)data;
-    /* User defined threads can be called here. For testing, internal repeated callbacks are used */
-    retval = UA_PubSubManager_addRepeatedCallback(server_local,
-                                                  (UA_ServerCallback) callback,
-                                                  writerGroup, writerGroup->config.publishingInterval,
-                                                  baseTime, timerPolicy,
-                                                  &writerGroup->publishCallbackId);
-    return retval;
-}
-
-static UA_StatusCode
-changePubSubApplicationCallback(UA_Server *server_local, UA_NodeId identifier,
-                                UA_UInt64 callbackId, UA_Double interval_ms,
-                                UA_DateTime *baseTime, UA_TimerPolicy timerPolicy) {
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-removePubSubApplicationCallback(UA_Server *server_local, UA_NodeId identifier, UA_UInt64 callbackId) {
-    /* Using the internal repeated callbacks for the tests. */
-    UA_WriterGroup *writerGroup = UA_WriterGroup_findWGbyId(server_local, identifier);
-    UA_PubSubManager_removeRepeatedPubSubCallback(server_local, writerGroup->publishCallbackId);
-}
-
 START_TEST(PublishSingleFieldInCustomCallback) {
         ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
         UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
@@ -430,9 +428,6 @@ START_TEST(PublishSingleFieldInCustomCallback) {
         writerGroupConfig.writerGroupId = 100;
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
         writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-        writerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
-        writerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
-        writerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
         UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
         wgm->networkMessageContentMask = UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
         writerGroupConfig.messageSettings.content.decoded.data = wgm;
@@ -450,10 +445,10 @@ START_TEST(PublishSingleFieldInCustomCallback) {
         // Create Variant and configure as DataSetField source
         UA_UInt32 *intValue = UA_UInt32_new();
         *intValue = (UA_UInt32) 1000;
-        UA_DataValue *dataValue = UA_DataValue_new();
-        UA_Variant_setScalar(&dataValue->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
+        staticSource1 = UA_DataValue_new();
+        UA_Variant_setScalar(&staticSource1->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
         dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
-        dsfConfig.field.variable.rtValueSource.staticValueSource = &dataValue;
+        dsfConfig.field.variable.rtValueSource.staticValueSource = &staticSource1;
         dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
         ck_assert(UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent).result == UA_STATUSCODE_GOOD);
 
@@ -467,10 +462,6 @@ START_TEST(PublishSingleFieldInCustomCallback) {
         receiveSingleMessage(buffer, connection, &networkMessage);
         ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
         UA_NetworkMessage_clear(&networkMessage);
-        UA_DataValue_delete(dataValue);
-
-        UA_Server_run_shutdown(server);
-        UA_Server_delete(server);
 } END_TEST
 
 static UA_StatusCode
@@ -650,7 +641,7 @@ int main(void) {
     tcase_add_test(tc_pubsub_rt_static_value_source, PubSubConfigWithMultipleInformationModelRTVariables);
 
     TCase *tc_pubsub_rt_fixed_offsets = tcase_create("PubSub RT publish with fixed offsets");
-    tcase_add_checked_fixture(tc_pubsub_rt_fixed_offsets, setup, NULL);
+    tcase_add_checked_fixture(tc_pubsub_rt_fixed_offsets, setup, teardown);
     tcase_add_test(tc_pubsub_rt_fixed_offsets, PublishSingleFieldWithFixedOffsets);
     tcase_add_test(tc_pubsub_rt_fixed_offsets, PublishPDSWithMultipleFieldsAndFixedOffset);
     tcase_add_test(tc_pubsub_rt_fixed_offsets, PublishSingleFieldInCustomCallback);

From eb73845cce8703d3e641f04eed7a058a6630c389 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 9 Jan 2023 00:06:24 +0100
Subject: [PATCH 0663/1963] refactor(pubsub): Cosmetic improvements in
 ua_pubsub_manager.c

---
 src/pubsub/ua_pubsub_manager.c | 109 ++++++++++++++++++++-------------
 1 file changed, 68 insertions(+), 41 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index e885f55cd65..741b02d7d4a 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -734,20 +734,25 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
                                                 &reader->msgRcvTimeoutTimerId);
                     if(ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s'- MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
-                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data,
-                                reader->config.messageReceiveTimeout, (UA_UInt32) reader->msgRcvTimeoutTimerId);
+                                     "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s'- "
+                                     "MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
+                                     "Timer Id = '%u'", (UA_Int32) reader->config.name.length,
+                                     reader->config.name.data, reader->config.messageReceiveTimeout,
+                                     (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     } else {
                         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "Error UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: start timer failed",
-                                (UA_Int32) reader->config.name.length, reader->config.name.data);
+                                     "Error UA_PubSubComponent_startMonitoring(): DataSetReader "
+                                     "'%.*s' - MessageReceiveTimeout: start timer failed",
+                                     (UA_Int32) reader->config.name.length, reader->config.name.data);
                     }
                     break;
                 }
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
-                            eMonitoringType);
+                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                 "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s' "
+                                 "DataSetReader does not support timeout type '%i'",
+                                 (UA_Int32) reader->config.name.length, reader->config.name.data,
+                                 eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
             }
@@ -755,7 +760,8 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
         }
         default:
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Error UA_PubSubComponent_startMonitoring(): PubSub component type '%i' is not supported", eComponentType);
+                         "Error UA_PubSubComponent_startMonitoring(): PubSub component "
+                         "type '%i' is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
             break;
     }
@@ -763,12 +769,13 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
 }
 
 static UA_StatusCode
-UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
+UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id,
+                                  UA_PubSubComponentEnumType eComponentType,
                                   UA_PubSubMonitoringType eMonitoringType, void *data) {
-
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Error UA_PubSubComponent_stopMonitoring(): "
-            "null pointer param");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Error UA_PubSubComponent_stopMonitoring(): "
+                     "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
@@ -781,14 +788,18 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComp
                     UA_EventLoop *el = server->config.eventLoop;
                     el->removeCyclicCallback(el, reader->msgRcvTimeoutTimerId);
                     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
-                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data,
-                                reader->config.messageReceiveTimeout, (UA_UInt32) reader->msgRcvTimeoutTimerId);
+                                 "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' - "
+                                 "MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
+                                 "Timer Id = '%u'", (UA_Int32) reader->config.name.length,
+                                 reader->config.name.data, reader->config.messageReceiveTimeout,
+                                 (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     break;
                 }
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
+                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                 "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' "
+                                 "DataSetReader does not support timeout type '%i'",
+                                 (UA_Int32) reader->config.name.length, reader->config.name.data,
                         eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
@@ -797,7 +808,8 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComp
         }
         default:
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Error UA_PubSubComponent_stopMonitoring(): PubSub component type '%i' is not supported", eComponentType);
+                         "Error UA_PubSubComponent_stopMonitoring(): PubSub component type '%i' "
+                         "is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
             break;
     }
@@ -805,12 +817,13 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComp
 }
 
 static UA_StatusCode
-UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
-                                            UA_PubSubMonitoringType eMonitoringType, void *data)
-{
+UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id,
+                                            UA_PubSubComponentEnumType eComponentType,
+                                            UA_PubSubMonitoringType eMonitoringType, void *data) {
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Error UA_PubSubComponent_updateMonitoringInterval(): "
-            "null pointer param");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Error UA_PubSubComponent_updateMonitoringInterval(): "
+                     "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
@@ -825,20 +838,26 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_
                                                    UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
                     if (ret == UA_STATUSCODE_GOOD) {
                         UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "UA_PubSubComponent_updateMonitoringInterval(): DataSetReader '%.*s' - MessageReceiveTimeout: new MessageReceiveTimeout = '%f' "
-                            "Timer Id = '%u'", (UA_Int32) reader->config.name.length, reader->config.name.data,
-                                reader->config.messageReceiveTimeout, (UA_UInt32) reader->msgRcvTimeoutTimerId);
+                                     "UA_PubSubComponent_updateMonitoringInterval(): "
+                                     "DataSetReader '%.*s' - MessageReceiveTimeout: new "
+                                     "MessageReceiveTimeout = '%f' Timer Id = '%u'",
+                                     (UA_Int32) reader->config.name.length, reader->config.name.data,
+                                     reader->config.messageReceiveTimeout,
+                                     (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     } else {
                         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "Error UA_PubSubComponent_updateMonitoringInterval(): DataSetReader '%.*s': update timer interval failed",
-                                (UA_Int32) reader->config.name.length, reader->config.name.data);
+                                     "Error UA_PubSubComponent_updateMonitoringInterval(): "
+                                     "DataSetReader '%.*s': update timer interval failed",
+                                     (UA_Int32) reader->config.name.length, reader->config.name.data);
                     }
                     break;
                 }
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
-                        eMonitoringType);
+                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                 "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
+                                 "DataSetReader does not support timeout type '%i'",
+                                 (UA_Int32) reader->config.name.length, reader->config.name.data,
+                                 eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
             }
@@ -846,7 +865,8 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_
         }
         default:
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Error UA_PubSubComponent_updateMonitoringInterval(): PubSub component type '%i' is not supported", eComponentType);
+                         "Error UA_PubSubComponent_updateMonitoringInterval(): "
+                         "PubSub component type '%i' is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
             break;
     }
@@ -854,12 +874,14 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id, UA_
 }
 
 static UA_StatusCode
-UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
+UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id,
+                                    UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data) {
 
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Error UA_PubSubComponent_deleteMonitoring(): "
-            "null pointer param");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Error UA_PubSubComponent_deleteMonitoring(): "
+                     "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
@@ -869,12 +891,16 @@ UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT:
                     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' - MessageReceiveTimeout: Timer Id = '%u'",
-                        (UA_Int32) reader->config.name.length, reader->config.name.data, (UA_UInt32) reader->msgRcvTimeoutTimerId);
+                                 "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' - "
+                                 "MessageReceiveTimeout: Timer Id = '%u'",
+                                 (UA_Int32)reader->config.name.length, reader->config.name.data,
+                                 (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     break;
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' "
-                        "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
+                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                                 "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' "
+                                 "DataSetReader does not support timeout type '%i'",
+                                 (UA_Int32) reader->config.name.length, reader->config.name.data,
                         eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
                     break;
@@ -883,7 +909,8 @@ UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
         }
         default:
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Error UA_PubSubComponent_deleteMonitoring(): PubSub component type '%i' is not supported", eComponentType);
+                         "Error UA_PubSubComponent_deleteMonitoring(): PubSub component type "
+                         "'%i' is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
             break;
     }

From e4a915dbe6b6224e77c5c8796743209364ecc170 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 Jan 2023 13:47:30 +0100
Subject: [PATCH 0664/1963] fix(pubsub): Fix a possible NULL dereference if
 static value source is not initialized

---
 src/pubsub/ua_pubsub_dataset.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index efbb5655ab0..7343ffb1bee 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -187,7 +187,8 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
         }
         fieldMetaData->arrayDimensionsSize = svs->value.arrayDimensionsSize;
 
-        res = UA_NodeId_copy(&svs->value.type->typeId, &fieldMetaData->dataType);
+        if(svs->value.type)
+            res = UA_NodeId_copy(&svs->value.type->typeId, &fieldMetaData->dataType);
         UA_CHECK_STATUS(res, return res);
 
         //TODO collect value rank for the static field source

From 782530e9b26bc753ff88f25c3778233297ad5c51 Mon Sep 17 00:00:00 2001
From: Teijo Kinnunen <teijo.kinnunen@code-q.fi>
Date: Wed, 11 Jan 2023 14:49:46 +0200
Subject: [PATCH 0665/1963] fix(server): Fix ConditionRefresh events with
 multiple server instances

Refresh event node ids were stored in a static variable; this failed if
there were more than one server instance in the same address space. The
node ids are now moved to UA_Server.
---
 src/server/ua_server_internal.h               |  1 +
 .../ua_subscription_alarms_conditions.c       | 36 ++++++++-----------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index fd6255510fc..1e53e71a798 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -169,6 +169,7 @@ struct UA_Server {
 
 # ifdef UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS
     LIST_HEAD(, UA_ConditionSource) conditionSources;
+    UA_NodeId refreshEvents[2];
 # endif
 
 #endif
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 243b30d57ae..d01596abe9d 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -209,14 +209,6 @@ addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
                           const UA_NodeId conditionType, const UA_QualifiedName fieldName,
                           UA_NodeId *outOptionalNode);
 
-/*****************************************************************************/
-/* Global Variables                                                          */
-/*****************************************************************************/
-
-static UA_NodeId refreshEvents[2] =
-    {{0, UA_NODEIDTYPE_NUMERIC, {0}},
-     {0, UA_NODEIDTYPE_NUMERIC, {0}}};
-
 static UA_ConditionSource *
 getConditionSource(UA_Server *server, const UA_NodeId *sourceId) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
@@ -1860,8 +1852,8 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     /* set RefreshStartEvent and RefreshEndEvent */
     UA_StatusCode retval = setRefreshMethodEvents(server,
-                                                  &refreshEvents[REFRESHEVENT_START_IDX],
-                                                  &refreshEvents[REFRESHEVENT_END_IDX]);
+                                                  &server->refreshEvents[REFRESHEVENT_START_IDX],
+                                                  &server->refreshEvents[REFRESHEVENT_END_IDX]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",
                                    UA_UNLOCK(&server->serviceMutex););
 
@@ -1875,8 +1867,8 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     }
 
     //TODO when there are a lot of monitoreditems (not only events)?
-    retval = refreshLogic(server, &refreshEvents[REFRESHEVENT_START_IDX],
-                          &refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
+    retval = refreshLogic(server, &server->refreshEvents[REFRESHEVENT_START_IDX],
+                          &server->refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",
                                    UA_UNLOCK(&server->serviceMutex););
     UA_UNLOCK(&server->serviceMutex);
@@ -1904,8 +1896,8 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     /* set RefreshStartEvent and RefreshEndEvent */
     UA_StatusCode retval =
-        setRefreshMethodEvents(server, &refreshEvents[REFRESHEVENT_START_IDX],
-                               &refreshEvents[REFRESHEVENT_END_IDX]);
+        setRefreshMethodEvents(server, &server->refreshEvents[REFRESHEVENT_START_IDX],
+                               &server->refreshEvents[REFRESHEVENT_END_IDX]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",
                                    UA_UNLOCK(&server->serviceMutex););
 
@@ -1914,8 +1906,8 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     //TODO when there are a lot of monitoreditems (not only events)?
     UA_MonitoredItem *monitoredItem = NULL;
     LIST_FOREACH(monitoredItem, &subscription->monitoredItems, listEntry) {
-        retval = refreshLogic(server, &refreshEvents[REFRESHEVENT_START_IDX],
-                              &refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
+        retval = refreshLogic(server, &server->refreshEvents[REFRESHEVENT_START_IDX],
+                              &server->refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",
                                        UA_UNLOCK(&server->serviceMutex););
     }
@@ -2020,8 +2012,8 @@ UA_ConditionList_delete(UA_Server *server) {
         UA_free(source);
     }
     /* Free memory allocated for RefreshEvents NodeIds */
-    UA_NodeId_clear(&refreshEvents[REFRESHEVENT_START_IDX]);
-    UA_NodeId_clear(&refreshEvents[REFRESHEVENT_END_IDX]);
+    UA_NodeId_clear(&server->refreshEvents[REFRESHEVENT_START_IDX]);
+    UA_NodeId_clear(&server->refreshEvents[REFRESHEVENT_END_IDX]);
 }
 
 /* Get the ConditionId based on the EventId (all branches of one condition
@@ -2446,10 +2438,10 @@ setStandardConditionCallbacks(UA_Server *server, const UA_NodeId* condition,
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Set Method Callback failed",);
 
         // Create RefreshEvents
-        if(UA_NodeId_isNull(&refreshEvents[REFRESHEVENT_START_IDX]) &&
-           UA_NodeId_isNull(&refreshEvents[REFRESHEVENT_END_IDX])) {
-            retval = createRefreshMethodEvents(server, &refreshEvents[REFRESHEVENT_START_IDX],
-                                               &refreshEvents[REFRESHEVENT_END_IDX]);
+        if(UA_NodeId_isNull(&server->refreshEvents[REFRESHEVENT_START_IDX]) &&
+           UA_NodeId_isNull(&server->refreshEvents[REFRESHEVENT_END_IDX])) {
+            retval = createRefreshMethodEvents(server, &server->refreshEvents[REFRESHEVENT_START_IDX],
+                                               &server->refreshEvents[REFRESHEVENT_END_IDX]);
             CONDITION_ASSERT_RETURN_RETVAL(retval, "Create RefreshEvents failed",);
         }
     }

From 16f5396c452515402e4359f2485194a67ca58de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 4 Jan 2023 09:52:26 +0000
Subject: [PATCH 0666/1963] build(deps): bump deps/ua-nodeset from 54e3513 to
 71774b4

---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 54e35134bb6..71774b4f129 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 54e35134bb6629789c017f82360e4fdc1577298b
+Subproject commit 71774b4f129840d38c16e03fbcb0f372ac6cc2bd

From 687adb7c900a209fc294e48a68d86571b5635703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 4 Jan 2023 09:55:39 +0000
Subject: [PATCH 0667/1963] fix(refactor): DI/NodeIds file renamed upstream

---
 doc/nodeset_compiler.rst              | 4 ++--
 examples/nodeset/CMakeLists.txt       | 2 +-
 tests/nodeset-compiler/CMakeLists.txt | 2 +-
 tests/nodeset-loader/CMakeLists.txt   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
index cc7b1721250..0d4c00f9147 100644
--- a/doc/nodeset_compiler.rst
+++ b/doc/nodeset_compiler.rst
@@ -292,7 +292,7 @@ Here are some examples for the ``DI`` and ``PLCOpen`` nodesets::
     # Generate types and namespace for DI
     ua_generate_nodeset_and_datatypes(
         NAME "di"
-        FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
+        FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
         FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
         NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
@@ -401,7 +401,7 @@ This DI nodeset makes use of some additional data types in ``deps/ua-nodeset/DI/
         NAME "ua_types_di"
         TARGET_SUFFIX "types-di"
         NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
-        FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
+        FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
         FILES_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
     )
 
diff --git a/examples/nodeset/CMakeLists.txt b/examples/nodeset/CMakeLists.txt
index 72c95152e2c..449179491a7 100644
--- a/examples/nodeset/CMakeLists.txt
+++ b/examples/nodeset/CMakeLists.txt
@@ -80,7 +80,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     # Generate types and namespace for DI
     ua_generate_nodeset_and_datatypes(
         NAME "di"
-        FILE_CSV "${FILE_CSV_DIRPREFIX}/DI/OpcUaDiModel.csv"
+        FILE_CSV "${FILE_CSV_DIRPREFIX}/DI/Opc.Ua.Di.NodeIds.csv"
         FILE_BSD "${FILE_BSD_PLCOPEN_DIRPREFIX}/DI/Opc.Ua.Di.Types.bsd"
         NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         FILE_NS "${FILE_NS_DIRPREFIX}/DI/Opc.Ua.Di.NodeSet2.xml"
diff --git a/tests/nodeset-compiler/CMakeLists.txt b/tests/nodeset-compiler/CMakeLists.txt
index 0aa4eaca9b9..29e26c15cc4 100644
--- a/tests/nodeset-compiler/CMakeLists.txt
+++ b/tests/nodeset-compiler/CMakeLists.txt
@@ -11,7 +11,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     # Generate types and namespace for DI
     ua_generate_nodeset_and_datatypes(
         NAME "tests-di"
-        FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
+        FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
         FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
         NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
diff --git a/tests/nodeset-loader/CMakeLists.txt b/tests/nodeset-loader/CMakeLists.txt
index 6b1a4fff337..a80537cec8b 100644
--- a/tests/nodeset-loader/CMakeLists.txt
+++ b/tests/nodeset-loader/CMakeLists.txt
@@ -17,7 +17,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     # Generate types and namespace for DI
     ua_generate_nodeset_and_datatypes(
         NAME "nodesetloader-di"
-        FILE_CSV "${UA_NODESET_DIR}/DI/OpcUaDiModel.csv"
+        FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
         FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
         NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"

From d66ae2ebf4a9cd2da68c7474cd47f20955be5e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 4 Jan 2023 14:04:55 +0000
Subject: [PATCH 0668/1963] build(deps): bump deps/nodesetLoader from cefa5c3
 to a4a7ce0

---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index cefa5c32e71..a4a7ce087fe 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit cefa5c32e71caf80e1c8ceb03ea6c44664ec5a52
+Subproject commit a4a7ce087fed6d6fa9a2af7f21bdfc3fa01bace6

From d9c0f5bb17ab22fff5855cd2c4b1bc958843bb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Tue, 10 Jan 2023 16:42:00 +0000
Subject: [PATCH 0669/1963] fix(test): Remove test Server_loadGDSPart12Nodeset

* nodeset file was removed vom UA-Nodeset with https://github.com/OPCFoundation/UA-Nodeset/commit/608308ea2f6de67688943e131df4e27df30fc605
---
 .../nodeset-loader/check_nodeset_loader_ua_nodeset.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
index ed789290b18..68a12e4fd4e 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
@@ -166,12 +166,6 @@ START_TEST(Server_loadGDSNodeset) {
 }
 END_TEST
 
-START_TEST(Server_loadServer_loadGDSPart12Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
-        OPEN62541_NODESET_DIR "GDS/Opc.Ua.Gds.NodeSet2.Part12.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
-}
-END_TEST
 
 START_TEST(Server_loadServer_loadGlassNodeset) {
     bool retVal = UA_Server_loadNodeset(server,
@@ -737,12 +731,6 @@ static Suite* testSuite_Client(void) {
         tcase_add_test(tc_server, Server_loadGDSNodeset);
         suite_add_tcase(s, tc_server);
     }
-    {
-        TCase *tc_server = tcase_create("Server load GDSPart12 nodeset");
-        tcase_add_unchecked_fixture(tc_server, setup, teardown);
-        tcase_add_test(tc_server, Server_loadServer_loadGDSPart12Nodeset);
-        suite_add_tcase(s, tc_server);
-    }
     {
         TCase *tc_server = tcase_create("Server load Glass nodeset");
         tcase_add_unchecked_fixture(tc_server, setup, teardown);

From 5bbb1c2cb06dd10304a3a1f03b945604bfa934ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Tue, 10 Jan 2023 16:56:06 +0000
Subject: [PATCH 0670/1963] fix(test): Removes integration test for GDS.Part12

* nodeset removed from ua-nodeset with OPCFoundation/UA-Nodeset@608308e
---
 tests/nodeset-loader/add_node_integration_test/run_test.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/nodeset-loader/add_node_integration_test/run_test.sh b/tests/nodeset-loader/add_node_integration_test/run_test.sh
index 27f8b699a78..d0034c3fea0 100644
--- a/tests/nodeset-loader/add_node_integration_test/run_test.sh
+++ b/tests/nodeset-loader/add_node_integration_test/run_test.sh
@@ -162,9 +162,6 @@ add_node_integration_test "FDT" \
 add_node_integration_test "GDS" \
     $UA_NODESET_PATH/GDS/Opc.Ua.Gds.NodeSet2.xml
 
-add_node_integration_test "GDS.Part12" \
-    $UA_NODESET_PATH/GDS/Opc.Ua.Gds.NodeSet2.Part12.xml
-
 add_node_integration_test "Flat.Glass" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
     $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \

From 9b3e7f365a03c181d7f63b5a816b22a5d11e87f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 11 Jan 2023 16:25:51 +0000
Subject: [PATCH 0671/1963] fix(test): Extend check_server_userspace test

---
 tests/server/check_server_userspace.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/server/check_server_userspace.c b/tests/server/check_server_userspace.c
index 8fe0e7c6670..42d32bb6384 100644
--- a/tests/server/check_server_userspace.c
+++ b/tests/server/check_server_userspace.c
@@ -70,7 +70,7 @@ struct nodeIterData {
 };
 
 #ifdef UA_GENERATED_NAMESPACE_ZERO_FULL
-#define NODE_ITER_DATA_SIZE 4
+#define NODE_ITER_DATA_SIZE 5
 #else
 #define NODE_ITER_DATA_SIZE 3
 #endif
@@ -128,6 +128,11 @@ START_TEST(Server_forEachChildNodeCall) {
     objectsFolderChildren[3].isInverse = UA_FALSE;
     objectsFolderChildren[3].referenceTypeID = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
     objectsFolderChildren[3].hit = UA_FALSE;
+
+    objectsFolderChildren[4].id = UA_NODEID_NUMERIC(0, UA_NS0ID_LOCATIONS);
+    objectsFolderChildren[4].isInverse = UA_FALSE;
+    objectsFolderChildren[4].referenceTypeID = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    objectsFolderChildren[4].hit = UA_FALSE;
 #endif
 
     UA_StatusCode retval =

From 13b412558ff026d73e0d44bd162690cc043997a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 11 Jan 2023 16:47:03 +0000
Subject: [PATCH 0672/1963] fix(ci): Updates azure pipelines

* now using ubuntu-20.04
---
 .azure-pipelines/azure-pipelines-dist.yml  | 2 +-
 .azure-pipelines/azure-pipelines-linux.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-dist.yml b/.azure-pipelines/azure-pipelines-dist.yml
index de12655b011..9b07fb6b54c 100644
--- a/.azure-pipelines/azure-pipelines-dist.yml
+++ b/.azure-pipelines/azure-pipelines-dist.yml
@@ -5,7 +5,7 @@ jobs:
 - job: 'dist_debian'
   displayName: 'Dist (debian)'
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-20.04'
   steps:
   - checkout: self
     submodules: recursive
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index 4240cfcae6d..6625754ea2f 100644
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -5,7 +5,7 @@ jobs:
 - job: 'cross_freeRTOS'
   displayName: 'Arch (freeRTOS)'
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-20.04'
   variables:
     IDF_PATH: $(Build.BinariesDirectory)/esp-idf
   steps:

From b87738545a9975d91a33a4a07ec847c41cb50347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 11 Jan 2023 17:05:41 +0000
Subject: [PATCH 0673/1963] fix(ci): Adapts install script to ubuntu-20.04

* updates mbedTLS to 2.28.2
---
 tools/azure-devops/debian/install.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/azure-devops/debian/install.sh b/tools/azure-devops/debian/install.sh
index 19935fa6299..6168486c9a5 100644
--- a/tools/azure-devops/debian/install.sh
+++ b/tools/azure-devops/debian/install.sh
@@ -12,17 +12,17 @@ sudo apt install -y \
     graphviz \
     latexmk \
     libsubunit-dev \
-    python-sphinx \
+    python3-sphinx \
     python3-pip \
     tar \
     texlive-fonts-recommended \
-    texlive-generic-extra \
+    texlive-extra-utils \
     texlive-latex-extra \
     wget
 
-wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.7.1.tar.gz
-tar xf mbedtls-2.7.1.tar.gz
-cd mbedtls-mbedtls-2.7.1
+wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.28.2.tar.gz
+tar xf mbedtls-2.28.2.tar.gz
+cd mbedtls-mbedtls-2.28.2
 cmake -DENABLE_TESTING=Off .
 make -j
 sudo make install

From cfcf9753f284ce0ad49dc119b1f13a4c12460818 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 12 Jan 2023 12:48:21 +0100
Subject: [PATCH 0674/1963] fix(pubsub): Fix memory leak in udp transport layer

---
 plugins/ua_pubsub_udp.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index 121a063c553..fb08157763f 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -275,6 +275,7 @@ UA_PubSubChannelUDP_open(UA_ConnectionManager *connectionManager, UA_TransportLa
     UA_initialize_architecture_network();
 
     UA_PubSubConnectionConfig *connectionConfig = ctx->connectionConfig;
+    UA_UDPConnectionContext *context = NULL;
     UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
         UA_calloc(1, sizeof(UA_PubSubChannel));
     if(!newChannel) {
@@ -289,7 +290,7 @@ UA_PubSubChannelUDP_open(UA_ConnectionManager *connectionManager, UA_TransportLa
     if(res != UA_STATUSCODE_GOOD) {
         goto error;
     }
-    UA_UDPConnectionContext *context = (UA_UDPConnectionContext *) UA_calloc(1, sizeof(UA_UDPConnectionContext));
+    context = (UA_UDPConnectionContext *) UA_calloc(1, sizeof(UA_UDPConnectionContext));
     if(!context) {
         goto error;
     }
@@ -316,6 +317,10 @@ UA_PubSubChannelUDP_open(UA_ConnectionManager *connectionManager, UA_TransportLa
     }
     return newChannel;
 error:
+    if(context != NULL) {
+        newChannel->handle = NULL;
+        UA_free(context);
+    }
     UA_PubSubChannelUDP_close(newChannel);
     return NULL;
 }
@@ -325,6 +330,7 @@ UA_PubSubChannelUDP_openUnicast(UA_ConnectionManager *connectionManager, UA_Tran
     UA_initialize_architecture_network();
 
     UA_PubSubConnectionConfig *connectionConfig = ctx->connectionConfig;
+    UA_UDPConnectionContext *context = NULL;
     UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
         UA_calloc(1, sizeof(UA_PubSubChannel));
     if(!newChannel) {
@@ -340,7 +346,7 @@ UA_PubSubChannelUDP_openUnicast(UA_ConnectionManager *connectionManager, UA_Tran
         goto error;
     }
 
-    UA_UDPConnectionContext *context = (UA_UDPConnectionContext *) UA_calloc(1, sizeof(UA_UDPConnectionContext));
+    context = (UA_UDPConnectionContext *) UA_calloc(1, sizeof(UA_UDPConnectionContext));
     context->server = ctx->server;
     context->connection = ctx->connection;
     context->connectionManager = connectionManager;
@@ -353,6 +359,10 @@ UA_PubSubChannelUDP_openUnicast(UA_ConnectionManager *connectionManager, UA_Tran
 
     return newChannel;
 error:
+    if(context != NULL) {
+        newChannel->handle = NULL;
+        UA_free(context);
+    }
     UA_free(newChannel);
     return NULL;
 }

From 4652ccc3ed676c0fc6f1782b2bf2bb7410256ada Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 12 Jan 2023 14:21:51 +0100
Subject: [PATCH 0675/1963] fix(pubsub): Fix memory access at udp close

Freeing the memory with the previous commit
cfcf9753f284ce0ad49dc119b1f13a4c12460818 resulted in a memory access
error.
---
 plugins/ua_pubsub_udp.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
index fb08157763f..401a9698fd5 100644
--- a/plugins/ua_pubsub_udp.c
+++ b/plugins/ua_pubsub_udp.c
@@ -114,9 +114,11 @@ UA_PubSub_udpCallbackPublish(UA_ConnectionManager *cm, uintptr_t connectionId,
 static UA_StatusCode
 UA_PubSubChannelUDP_close(UA_PubSubChannel *channel) {
     UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
-    UA_KeyValueMap_clear(&ctx->subscriberParams);
-    UA_KeyValueMap_clear(&ctx->publisherParams);
-    UA_free(ctx);
+    if (ctx != NULL) {
+        UA_KeyValueMap_clear(&ctx->subscriberParams);
+        UA_KeyValueMap_clear(&ctx->publisherParams);
+        UA_free(ctx);
+    }
     UA_free(channel);
     return UA_STATUSCODE_GOOD;
 }

From 35939a5b688d9647dbc96db88df5df27ebcced7a Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Fri, 3 Jun 2022 12:16:16 +0200
Subject: [PATCH 0676/1963] fix(core): LibreSSL 3.5

---
 plugins/crypto/openssl/ua_openssl_version_abstraction.h | 4 ++--
 plugins/crypto/openssl/ua_pki_openssl.c                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/crypto/openssl/ua_openssl_version_abstraction.h b/plugins/crypto/openssl/ua_openssl_version_abstraction.h
index a6fa45bdf70..c3eb7fd7dc5 100644
--- a/plugins/crypto/openssl/ua_openssl_version_abstraction.h
+++ b/plugins/crypto/openssl/ua_openssl_version_abstraction.h
@@ -21,11 +21,11 @@
 #define X509_STORE_CTX_set0_trusted_stack(STORE_CTX, CTX_SKTRUSTED) X509_STORE_CTX_trusted_stack(STORE_CTX, CTX_SKTRUSTED)
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL)
 #define X509_STORE_CTX_get_check_issued(STORE_CTX) STORE_CTX->check_issued
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL)
 #define get_pkey_rsa(evp) ((evp)->pkey.rsa)
 #else
 #define get_pkey_rsa(evp) EVP_PKEY_get0_RSA(evp)
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 17612cc1773..e5213792cd4 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -490,7 +490,7 @@ UA_CertificateVerification_Verify (void *                verificationContext,
     /* Set flag to check if the certificate has an invalid signature */
     X509_STORE_CTX_set_flags (storeCtx, X509_V_FLAG_CHECK_SS_SIGNATURE);
 
-    if (X509_STORE_CTX_get_check_issued(storeCtx) (storeCtx,certificateX509, certificateX509) != 1) {
+    if (X509_check_issued(certificateX509,certificateX509) != X509_V_OK) {
         X509_STORE_CTX_set_flags (storeCtx, X509_V_FLAG_CRL_CHECK);
     }
 
@@ -510,7 +510,7 @@ UA_CertificateVerification_Verify (void *                verificationContext,
         /* Check if the not trusted certificate has a CRL file. If there is no CRL file available for the corresponding
          * parent certificate then return status code UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN. Refer the test
          * case CTT/Security/Security Certificate Validation/002.js */
-        if (X509_STORE_CTX_get_check_issued (storeCtx) (storeCtx,certificateX509, certificateX509) != 1) {
+        if (X509_check_issued(certificateX509,certificateX509) != X509_V_OK) {
             /* Free X509_STORE_CTX and reuse it for certification verification */
             if (storeCtx != NULL) {
                X509_STORE_CTX_free(storeCtx);

From 7da45f2c1da0af9cdf1446bbca8688f80856e80f Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Tue, 14 Jun 2022 09:47:03 +0200
Subject: [PATCH 0677/1963] feat(core): Extend log when creating certificates

---
 .../openssl/ua_openssl_create_certificate.c   | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/plugins/crypto/openssl/ua_openssl_create_certificate.c b/plugins/crypto/openssl/ua_openssl_create_certificate.c
index 5ff31186a31..4d805526eb4 100644
--- a/plugins/crypto/openssl/ua_openssl_create_certificate.c
+++ b/plugins/crypto/openssl/ua_openssl_create_certificate.c
@@ -16,6 +16,7 @@
 
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
+#include <openssl/err.h>
 
 /**
  * Join an array of UA_String to a single NULL-Terminated UA_String
@@ -70,14 +71,25 @@ UA_String_chr(const UA_String *pUaStr, char needl) {
 
 /* char *value cannot be const due to openssl 1.0 compatibility */
 static UA_StatusCode
-add_x509V3ext(X509 *x509, int nid, char *value) {
+add_x509V3ext(const UA_Logger *logger, X509 *x509, int nid, char *value) {
     X509_EXTENSION *ex;
     X509V3_CTX ctx;
     X509V3_set_ctx_nodb(&ctx);
     X509V3_set_ctx(&ctx, x509, x509, NULL, NULL, 0);
     ex = X509V3_EXT_conf_nid(NULL, &ctx, nid, value);
     if(!ex)
+    {
+#if UA_LOGLEVEL <= 300
+        const char * file =  NULL;
+        int line =  0;
+        const char * data =  NULL;
+        int flags =  0;
+        ERR_get_error_line_data(&file, &line, &data, &flags);
+        UA_LOG_INFO(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Internal SSL error file: %s:%d data: %s", file, line, data);
+#endif
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
     X509_add_ext(x509, ex, -1);
     X509_EXTENSION_free(ex);
     return UA_STATUSCODE_GOOD;
@@ -244,7 +256,7 @@ UA_CreateCertificate(const UA_Logger *logger,
         goto cleanup;
     }
 
-    errRet = add_x509V3ext(x509, NID_basic_constraints, "CA:FALSE");
+    errRet = add_x509V3ext(logger, x509, NID_basic_constraints, "CA:FALSE");
     if(errRet != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                      "Create Certificate: Setting 'Basic Constraints' failed.");
@@ -253,7 +265,7 @@ UA_CreateCertificate(const UA_Logger *logger,
 
     /* See https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.3 for
      * possible values */
-    errRet = add_x509V3ext(x509, NID_key_usage,
+    errRet = add_x509V3ext(logger, x509, NID_key_usage,
                            "digitalSignature,nonRepudiation,keyEncipherment,dataEncipherment,keyCertSign");
     if(errRet != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
@@ -261,14 +273,14 @@ UA_CreateCertificate(const UA_Logger *logger,
         goto cleanup;
     }
 
-    errRet = add_x509V3ext(x509, NID_ext_key_usage, "serverAuth,clientAuth");
+    errRet = add_x509V3ext(logger, x509, NID_ext_key_usage, "serverAuth,clientAuth");
     if(errRet != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                      "Create Certificate: Setting 'Extended Key Usage' failed.");
         goto cleanup;
     }
 
-    errRet = add_x509V3ext(x509, NID_subject_key_identifier, "hash");
+    errRet = add_x509V3ext(logger, x509, NID_subject_key_identifier, "hash");
     if(errRet != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                      "Create Certificate: Setting 'Subject Key Identifier' failed.");
@@ -282,10 +294,10 @@ UA_CreateCertificate(const UA_Logger *logger,
         goto cleanup;
     }
 
-    errRet = add_x509V3ext(x509, NID_subject_alt_name, (char*) fullAltSubj.data);
+    errRet = add_x509V3ext(logger, x509, NID_subject_alt_name, (char*) fullAltSubj.data);
     if(errRet != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
-                     "Create Certificate: Setting 'Subject Alternative Name:' failed.");
+                     "Create Certificate: Setting 'Subject Alternative Name' failed.");
         goto cleanup;
     }
 

From 2692a4c624f5b3a86be3c788a4e0ce975923e044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 4 Jan 2023 09:27:22 +0000
Subject: [PATCH 0678/1963] fix(deps): Bump LibreSSL to 3.7.0

---
 .github/workflows/build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 99323a559b0..4c2415a04a6 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -50,9 +50,9 @@ jobs:
           - build_name: "Encryption (LibreSSL) Build & Unit Tests (gcc)"
             cmd_deps: |
                 sudo apt-get install -y -qq curl
-                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.3.tar.gz --output libressl.tar.gz
+                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.0.tar.gz --output libressl.tar.gz
                 tar -xvz -f libressl.tar.gz
-                cd libressl-3.4.3
+                cd libressl-3.7.0
                 ./configure
                 sudo make install
             cmd_action: unit_tests_encryption LIBRESSL

From e1f0e14f6d7f110fcbffb0040e4fd10abbadb618 Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Thu, 12 Jan 2023 13:27:03 +0100
Subject: [PATCH 0679/1963] Fix(plugin): Do not use deprecated
 ERR_get_error_line_data in new versions of OpenSSL

---
 plugins/crypto/openssl/ua_openssl_create_certificate.c  | 3 ++-
 plugins/crypto/openssl/ua_openssl_version_abstraction.h | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/crypto/openssl/ua_openssl_create_certificate.c b/plugins/crypto/openssl/ua_openssl_create_certificate.c
index 4d805526eb4..2a949defea7 100644
--- a/plugins/crypto/openssl/ua_openssl_create_certificate.c
+++ b/plugins/crypto/openssl/ua_openssl_create_certificate.c
@@ -10,6 +10,7 @@
 #include <open62541/plugin/create_certificate.h>
 
 #include "securitypolicy_openssl_common.h"
+#include "ua_openssl_version_abstraction.h"
 
 #if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_LIBRESSL)
 
@@ -84,7 +85,7 @@ add_x509V3ext(const UA_Logger *logger, X509 *x509, int nid, char *value) {
         int line =  0;
         const char * data =  NULL;
         int flags =  0;
-        ERR_get_error_line_data(&file, &line, &data, &flags);
+        get_error_line_data(&file, &line, &data, &flags);
         UA_LOG_INFO(logger, UA_LOGCATEGORY_SECURECHANNEL,
                      "Internal SSL error file: %s:%d data: %s", file, line, data);
 #endif
diff --git a/plugins/crypto/openssl/ua_openssl_version_abstraction.h b/plugins/crypto/openssl/ua_openssl_version_abstraction.h
index c3eb7fd7dc5..174f100b898 100644
--- a/plugins/crypto/openssl/ua_openssl_version_abstraction.h
+++ b/plugins/crypto/openssl/ua_openssl_version_abstraction.h
@@ -35,5 +35,11 @@
 #define X509_get0_subject_key_id(PX509_CERT) (const ASN1_OCTET_STRING *)X509_get_ext_d2i(PX509_CERT, NID_subject_key_identifier, NULL, NULL);
 #endif
 
+#if OPENSSL_VERSION_NUMBER < 0x2000000fL || defined(LIBRESSL_VERSION_NUMBER)
+#define get_error_line_data(pFile, pLine, pData, pFlags) ERR_get_error_line_data(pFile, pLine, pData, pFlags)
+#else
+#define get_error_line_data(pFile, pLine, pData, pFlags) ERR_get_error_all(pFile, pLine, NULL, pData, pFlags)
+#endif
+
 #endif /* defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_LIBRESSL) */
 #endif /* UA_OPENSSL_VERSION_ABSTRACTION_H_ */

From e52d3a68aac200bf7ce204260a05eafdf5daf148 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Sun, 8 Jan 2023 14:31:59 +0100
Subject: [PATCH 0680/1963] fix(el): use REUSEPORT to allow binding

The server is configured to use the default address "0.0.0.0" and
specific address to of a nic to bind to at the same time on the same
port. This fix avoids having the "address already in use" error when
setting up and running the server with new tcp connections.
---
 arch/eventloop_posix_tcp.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 0e177d45496..c3b513ce779 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -399,7 +399,17 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR,
                      (const char *)&optval, sizeof(optval)) == -1) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Could not make the socket reusable",
+                       "TCP %u\t| Could not make the socket addr reusable",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
+    if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEPORT,
+                     (const char *)&optval, sizeof(optval)) == -1) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP %u\t| Could not make the socket port reusable",
                        (unsigned)listenSocket);
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;

From 87b9bc5395e743ed95eb148d4a86131963d9d8b2 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Sun, 8 Jan 2023 19:23:03 +0100
Subject: [PATCH 0681/1963] fix(el): no REUSEPORT on win32

---
 arch/eventloop_posix_tcp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index c3b513ce779..7c42544d7f8 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -404,7 +404,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-
+#ifndef _WIN32
     /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
     if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEPORT,
                      (const char *)&optval, sizeof(optval)) == -1) {
@@ -414,7 +414,7 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-
+#endif
     /* Set the socket non-blocking */
     if(UA_EventLoopPOSIX_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,

From d0f741308ba7636ef595f787fff56a00a294acde Mon Sep 17 00:00:00 2001
From: Tobias Zimmermann <Tobias.Zimmermann@tq-group.com>
Date: Fri, 13 Jan 2023 14:07:29 +0100
Subject: [PATCH 0682/1963] fix(build): replace absolute paths of OpenSSL with
 imported target

${OPENSSL_LIBRARIES} contains the absolute paths to the OpenSSL library.
Instead, the imported targets are used. This is important when using
exported targets e.g. while cross compiling.

Signed-off-by: Tobias Zimmermann <Tobias.Zimmermann@tq-group.com>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21bb4fa4dcc..1a3428416f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -663,7 +663,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_MQTT_TLS_OPENSSL)
     # use the OpenSSL encryption library
     # https://cmake.org/cmake/help/v3.0/module/FindOpenSSL.html
     find_package(OpenSSL REQUIRED)
-    list(APPEND open62541_LIBRARIES ${OPENSSL_LIBRARIES})
+    list(APPEND open62541_LIBRARIES OpenSSL::Crypto OpenSSL::SSL)
     endif ()
 
 if(UA_ENABLE_ENCRYPTION_LIBRESSL)

From fd1b3b347e532a70628d8c8d6da528f8d93dbc77 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 13 Jan 2023 00:08:22 +0100
Subject: [PATCH 0683/1963] refactor(doc): Pull section "OPC UA Core Concepts"
 to the front of the docs

---
 ...mation_modelling.rst => core_concepts.rst} | 201 ++++++++++++++++--
 doc/protocol.rst                              | 136 ------------
 doc/toc.rst                                   |   3 +-
 3 files changed, 184 insertions(+), 156 deletions(-)
 rename doc/{information_modelling.rst => core_concepts.rst} (68%)
 delete mode 100644 doc/protocol.rst

diff --git a/doc/information_modelling.rst b/doc/core_concepts.rst
similarity index 68%
rename from doc/information_modelling.rst
rename to doc/core_concepts.rst
index 0de5efdc8cb..2d22dcfb086 100644
--- a/doc/information_modelling.rst
+++ b/doc/core_concepts.rst
@@ -1,20 +1,185 @@
+.. _introduction:
+
+Core Concepts of OPC UA
+=======================
+
+In one sentence, OPC UA (ISO 62541) defines a framework for object-oriented
+information models (typically representing a physical device) that live in an
+OPC UA server and a protocol with which a client can interact with the
+information model over the network (read and write variables, call methods,
+instantiate and delete objects, subscribe to change notifications, and so on).
+
+This Section introduces the core concepts of OPC UA. For the full specification
+see the OPC UA standard at `https://reference.opcfoundation.org/
+<https://reference.opcfoundation.org/>`_.
+
+.. _protocol:
+
+Protocol
+--------
+
+We focus on the TCP-based binary protocol since it is by far the most common
+transport layer for OPC UA. The general concepts also translate to HTTP and
+SOAP-based communication defined in the standard. Communication in OPC UA is
+best understood by starting with the following key principles:
+
+Request / Response
+  All communication is based on the Request/Response pattern. Only clients can
+  send a request to a server. And servers can only send responses to a matching
+  request. Often the server is hosted close to a (physical) device, such as a
+  sensor or a machine tool.
+
+Asynchronous Responses
+  A server does not have to immediately respond to requests and responses may be
+  sent in a different order. This keeps the server responsive when it takes time
+  until a specific request has been processed (e.g. a method call or when
+  reading from a sensor with delay). Subscriptions (push-notifications) are
+  implemented via special requests where the response is delayed until a
+  notification is published.
+
+.. note::
+   *OPC UA PubSub* (Part 14 of the standard) is an extension for the integration
+   of many-to-many communication with OPC UA. PubSub does not use the
+   client-server protocol. Rather, OPC UA PubSub integrates with either existing
+   broker-based protocols such as MQTT, UDP-multicast or Ethernet-based
+   communication. Typically an OPC UA server (accessed via the client-server
+   protocol) is used to configured PubSub communication.
+
+   Note that the client-server protocol also supports Subscriptions for
+   one-to-one communication and does not depend on PubSub for this feature.
+
+A client-server connection for the OPC UA binary protocol consists of three
+nested levels: The stateful TCP connection, a SecureChannel and the Session. For
+full details, see Part 6 of the OPC UA standard.
+
+TCP Connection
+  The TCP connection is opened to the corresponding hostname and port with an
+  initial handshake of HEL/ACK messages. The handshake establishes the basic
+  settings of the connection, such as the maximum message length. The *Reverse
+  Connect* extension of OPC UA allows the server to initiate the underlying TCP
+  connection.
+
+SecureChannel
+  SecureChannels are created on top of the raw TCP connection. A SecureChannel
+  is established with an *OpenSecureChannel* request and response message pair.
+  **Attention!** Even though a SecureChannel is mandatory, encryption might
+  still be disabled. The *SecurityMode* of a SecureChannel can be either
+  ``None``, ``Sign``, or ``SignAndEncrypt``. As of version 0.2 of open62541,
+  message signing and encryption is still under ongoing development.
+
+  With message signing or encryption enabled, the *OpenSecureChannel* messages
+  are encrypted using an asymmetric encryption algorithm (public-key
+  cryptography) [#key-mgmnt]_. As part of the *OpenSecureChannel* messages,
+  client and server establish a common secret over an initially unsecure
+  channel. For subsequent messages, the common secret is used for symmetric
+  encryption, which has the advantage of being much faster.
+
+  Different *SecurityPolicies* -- defined in part 7 of the OPC UA standard --
+  specify the algorithms for asymmetric and symmetric encryption, encryption key
+  lengths, hash functions for message signing, and so on. Example
+  SecurityPolicies are ``None`` for transmission of cleartext and
+  ``Basic256Sha256`` which mandates a variant of RSA with SHA256 certificate
+  hashing for asymmetric encryption and AES256 for symmetric encryption.
+
+  The possible SecurityPolicies of a server are described with a list of
+  *Endpoints*. An endpoint jointly defines the SecurityMode, SecurityPolicy and
+  means for authenticating a session (discussed in the next section) in order to
+  connect to a certain server. The *GetEndpoints* service returns a list of
+  available endpoints. This service can usually be invoked without a session and
+  from an unencrypted SecureChannel. This allows clients to first discover
+  available endpoints and then use an appropriate SecurityPolicy that might be
+  required to open a session.
+
+Session
+  Sessions are created on top of a SecureChannel. This ensures that users may
+  authenticate without sending their credentials, such as username and password,
+  in cleartext. Currently defined authentication mechanisms are anonymous login,
+  username/password, Kerberos and x509 certificates. The latter requires that
+  the request message is accompanied by a signature to prove that the sender is
+  in possession of the private key with which the certificate was created.
+
+  There are two message exchanges required to establish a session:
+  *CreateSession* and *ActicateSession*. The ActivateSession service can be used
+  to switch an existing session to a different SecureChannel. This is important,
+  for example when the connection broke down and the existing session is
+  reused with a new SecureChannel.
+
+.. [#key-mgmnt] This entails that the client and server exchange so-called
+   public keys. The public keys might come with a certificate from a key-signing
+   authority or be verified against an external key repository. But we will not
+   discuss certificate management in detail in this section.
+
+Structure of a protocol message
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Consider the example OPC UA binary conversation in Figure
+:numref:`ua-wireshark`, recorded and displayed with `Wireshark
+<https://www.wireshark.org/>`_.
+
+.. _ua-wireshark:
+
+.. figure:: ua-wireshark.png
+   :figwidth: 100 %
+   :alt: OPC UA conversation in Wireshark
+
+   OPC UA conversation displayed in Wireshark
+
+The top part of the Wireshark window shows the messages from the conversation in
+order. The green line contains the applied filter. Here, we want to see the OPC
+UA protocol messages only. The first messages (from TCP packets 49 to 56) show
+the client opening an unencrypted SecureChannel and retrieving the server's
+endpoints. Then, starting with packet 63, a new connection and SecureChannel are
+created in conformance with one of the endpoints. On top of this SecureChannel,
+the client can then create and activate a session. The following *ReadRequest*
+message is selected and covered in more detail in the bottom windows.
+
+The bottom left window shows the structure of the selected *ReadRequest*
+message. The purpose of the message is invoking the *Read* :ref:`service
+<services>`. The message is structured into a header and a message body. Note
+that we do not consider encryption or signing of messages here.
+
+Message Header
+  As stated before, OPC UA defines an asynchronous protocol. So responses may be
+  out of order. The message header contains some basic information, such as the
+  length of the message, as well as necessary information to relate messages to
+  a SecureChannel and each request to the corresponding response. "Chunking"
+  refers to the splitting and reassembling of messages that are longer than the
+  maximum network packet size.
+
+Message Body
+  Every OPC UA :ref:`service <services>` has a signature in the form of a
+  request and response data structure. These are defined according to the OPC UA
+  protocol :ref:`type system <types>`. See especially the :ref:`auto-generated
+  type definitions<generated-types>` for the data types corresponding to service
+  requests and responses. The message body begins with the identifier of the
+  following data type. Then, the main payload of the message follows.
+
+The bottom right window shows the binary payload of the selected *ReadRequest*
+message. The message header is highlighted in light-grey. The message body in
+blue highlighting shows the encoded *ReadRequest* data structure.
+
 .. _information-modelling:
 
 Information Modelling
-=====================
+---------------------
 
 Information modelling in OPC UA combines concepts from object-orientation and
 semantic modelling. At the core, an OPC UA information model is a graph
-consisting of
+consisting of Nodes and References between them.
 
-- Nodes: From eight possible NodeClasses (Variable, VariableType, Object,
-  ObjectType, ReferenceType, DataType, Method, View)
-- References between Nodes: Typed and directed relations between two nodes
+Nodes
+  There are eight possible NodeClasses for Nodes (Variable, VariableType,
+  Object, ObjectType, ReferenceType, DataType, Method, View). The NodeClass
+  defines the attributes a Node can have.
+
+References
+  References are links between Nodes. References are typed (refer to a
+  ReferenceType) and directed.
 
 The original source for the following information is Part 3 of the OPC UA
 specification (https://reference.opcfoundation.org/Core/Part3/).
 
-Every Node is identified by a unique (within the server) :ref:`nodeid` and
+Each Node is identified by a unique (within the server) :ref:`nodeid` and
 carries different attributes depending on the NodeClass. These attributes can be
 read (and sometimes also written) via the OPC UA protocol. The protocol further
 allows the creation and deletion of Nodes and References at runtime. But this is
@@ -100,7 +265,7 @@ New attributes in the standard that are still unsupported in open62541 are
 RolePermissions, UserRolePermissions, AccessRestrictions and AccessLevelEx.
 
 VariableNode
-------------
+~~~~~~~~~~~~
 
 Variables store values in a :ref:`datavalue` together with
 metadata for introspection. Most notably, the attributes data type, value
@@ -117,7 +282,7 @@ constraining the possible data type, value rank and array dimensions
 attributes.
 
 Data Type
-~~~~~~~~~
+^^^^^^^^^
 
 The (scalar) data type of the variable is constrained to be of a specific
 type or one of its children in the type hierarchy. The data type is given as
@@ -134,7 +299,7 @@ Consistency between the data type attribute in the variable and its
 :ref:`VariableTypeNode` is ensured.
 
 ValueRank
-~~~~~~~~~~
+^^^^^^^^^
 
 This attribute indicates whether the value attribute of the variable is an
 array and how many dimensions the array has. It may have the following
@@ -152,7 +317,7 @@ The consistency between the value rank attribute of a VariableNode and its
 :ref:`variabletypenode` is tested within the server.
 
 Array Dimensions
-~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^
 
 If the value rank permits the value to be a (multi-dimensional) array, the
 exact length in each dimensions can be further constrained with this
@@ -173,7 +338,7 @@ dimensions.
 .. _variabletypenode:
 
 VariableTypeNode
-----------------
+~~~~~~~~~~~~~~~~
 
 VariableTypes are used to provide type definitions for variables.
 VariableTypes constrain the data type, value rank and array dimensions
@@ -183,7 +348,7 @@ variable type may provide semantic information. For example, an instance from
 instantiated from ``BaseDataVariable``.
 
 ObjectNode
-----------
+~~~~~~~~~~
 
 Objects are used to represent systems, system components, real-world objects
 and software objects. Objects are instances of an :ref:`object type<objecttypenode>`
@@ -192,16 +357,16 @@ and may contain variables, methods and further objects.
 .. _objecttypenode:
 
 ObjectTypeNode
---------------
+~~~~~~~~~~~~~~
 
 ObjectTypes provide definitions for Objects. Abstract objects cannot be
 instantiated. See :ref:`node-lifecycle` for the use of constructor and
-destructor callbacks. */
+destructor callbacks.
 
 .. _referencetypenode:
 
 ReferenceTypeNode
------------------
+~~~~~~~~~~~~~~~~~
 
 Each reference between two nodes is typed with a ReferenceType that gives
 meaning to the relation. The OPC UA standard defines a set of ReferenceTypes
@@ -303,7 +468,7 @@ based on a common understanding of just two custom reference types.
 .. _datatypenode:
 
 DataTypeNode
-------------
+~~~~~~~~~~~~
 
 DataTypes represent simple and structured data types. DataTypes may contain
 arrays. But they always describe the structure of a single instance. In
@@ -317,7 +482,7 @@ They are used to constrain values to possible child DataTypes (e.g.
 .. _methodnode:
 
 MethodNode
-----------
+~~~~~~~~~~
 
 Methods define callable functions and are invoked using the :ref:`Call <method-services>`
 service. MethodNodes may have special properties (variable
@@ -332,7 +497,7 @@ object types). For this, the NodeId of the method *and of the object
 providing context* is part of a Call request message.
 
 ViewNode
---------
+~~~~~~~~
 
 Each View defines a subset of the Nodes in the AddressSpace. Views can be
 used when browsing an information model to focus on a subset of nodes and
diff --git a/doc/protocol.rst b/doc/protocol.rst
deleted file mode 100644
index 135580d877b..00000000000
--- a/doc/protocol.rst
+++ /dev/null
@@ -1,136 +0,0 @@
-.. _protocol:
-
-Protocol
-========
-
-In this section, we give an overview on the OPC UA binary protocol. We focus on
-binary since that is what has been implemented in open62541. The TCP-based
-binary protocol is by far the most common transport layer for OPC UA. The
-general concepts also translate to HTTP and SOAP-based communication defined in
-the standard. Communication in OPC UA is best understood by starting with the
-following key principles:
-
-Request / Response
-  All communication is based on the Request/Response pattern. Only clients can
-  send a request to a server. And servers can only send responses to a request.
-  Usually, the server is hosted on the (physical) device, such as a sensor or a
-  machine tool.
-
-Asynchronous Responses
-  A server does not have to immediately respond to requests and responses may be
-  sent in a different order. This keeps the server responsive when it takes time
-  until a specific request has been processed (e.g. a method call or when
-  reading from a sensor with delay). Furthermore, Subscriptions (aka
-  push-notifications) are implemented via special requests where the response is
-  delayed until a notification is generated.
-
-Establishing a Connection
--------------------------
-
-A client-server connection in OPC UA consists of three nested levels: The raw
-connection, a SecureChannel and the Session. For full details, see Part 6 of the
-OPC UA standard.
-
-Raw Connection
-  The raw connection is created by opening a TCP connection to the corresponding
-  hostname and port and an initial HEL/ACK handshake. The handshake establishes
-  the basic settings of the connection, such as the maximum message length.
-
-SecureChannel
-  SecureChannels are created on top of the raw TCP connection. A SecureChannel
-  is established with an *OpenSecureChannel* request and response message pair.
-  **Attention!** Even though a SecureChannel is mandatory, encryption might
-  still be disabled. The *SecurityMode* of a SecureChannel can be either
-  ``None``, ``Sign``, or ``SignAndEncrypt``. As of version 0.2 of open62541,
-  message signing and encryption is still under ongoing development.
-
-  With message signing or encryption enabled, the *OpenSecureChannel* messages
-  are encrypted using an asymmetric encryption algorithm (public-key
-  cryptography) [#key-mgmnt]_. As part of the *OpenSecureChannel* messages,
-  client and server establish a common secret over an initially unsecure
-  channel. For subsequent messages, the common secret is used for symmetric
-  encryption, which has the advantage of being much faster.
-
-  Different *SecurityPolicies* -- defined in part 7 of the OPC UA standard --
-  specify the algorithms for asymmetric and symmetric encryption, encryption key
-  lengths, hash functions for message signing, and so on. Example
-  SecurityPolicies are ``None`` for transmission of cleartext and
-  ``Basic256Sha256`` which mandates a variant of RSA with SHA256 certificate
-  hashing for asymmetric encryption and AES256 for symmetric encryption.
-
-  The possible SecurityPolicies of a server are described with a list of
-  *Endpoints*. An endpoint jointly defines the SecurityMode, SecurityPolicy and
-  means for authenticating a session (discussed in the next section) in order to
-  connect to a certain server. The *GetEndpoints* service returns a list of
-  available endpoints. This service can usually be invoked without a session and
-  from an unencrypted SecureChannel. This allows clients to first discover
-  available endpoints and then use an appropriate SecurityPolicy that might be
-  required to open a session.
-
-Session
-  Sessions are created on top of a SecureChannel. This ensures that users may
-  authenticate without sending their credentials, such as username and password,
-  in cleartext. Currently defined authentication mechanisms are anonymous login,
-  username/password, Kerberos and x509 certificates. The latter requires that
-  the request message is accompanied by a signature to prove that the sender is
-  in possession of the private key with which the certificate was created.
-
-  There are two message exchanges required to establish a session:
-  *CreateSession* and *ActicateSession*. The ActivateSession service can be used
-  to switch an existing session to a different SecureChannel. This is important,
-  for example when the connection broke down and the existing session is
-  reused with a new SecureChannel.
-
-.. [#key-mgmnt] This entails that the client and server exchange so-called
-   public keys. The public keys might come with a certificate from a key-signing
-   authority or be verified against an external key repository. But we will not
-   discuss certificate management in detail in this section.
-
-Structure of a protocol message
--------------------------------
-
-For the following introduction to the structure of OPC UA protocol messages,
-consider the example OPC UA binary conversation, recorded and displayed with the
-`Wireshark <https://www.wireshark.org/>`_ tool, shown in :numref:`ua-wireshark`.
-
-.. _ua-wireshark:
-
-.. figure:: ua-wireshark.png
-   :figwidth: 100 %
-   :alt: OPC UA conversation in Wireshark
-
-   OPC UA conversation displayed in Wireshark
-
-The top part of the Wireshark window shows the messages from the conversation in
-order. The green line contains the applied filter. Here, we want to see the OPC
-UA protocol messages only. The first messages (from TCP packets 49 to 56) show
-the client opening an unencrypted SecureChannel and retrieving the server's
-endpoints. Then, starting with packet 63, a new connection and SecureChannel are
-created in conformance with one of the endpoints. On top of this SecureChannel,
-the client can then create and activate a session. The following *ReadRequest*
-message is selected and covered in more detail in the bottom windows.
-
-The bottom left window shows the structure of the selected *ReadRequest*
-message. The purpose of the message is invoking the *Read* :ref:`service
-<services>`. The message is structured into a header and a message body. Note
-that we do not consider encryption or signing of messages here.
-
-Message Header
-  As stated before, OPC UA defines an asynchronous protocol. So responses may be
-  out of order. The message header contains some basic information, such as the
-  length of the message, as well as necessary information to relate messages to
-  a SecureChannel and each request to the corresponding response. "Chunking"
-  refers to the splitting and reassembling of messages that are longer than the
-  maximum network packet size.
-
-Message Body
-  Every OPC UA :ref:`service <services>` has a signature in the form of a
-  request and response data structure. These are defined according to the OPC UA
-  protocol :ref:`type system <types>`. See especially the :ref:`auto-generated
-  type definitions<generated-types>` for the data types corresponding to service
-  requests and responses. The message body begins with the identifier of the
-  following data type. Then, the main payload of the message follows.
-
-The bottom right window shows the binary payload of the selected *ReadRequest*
-message. The message header is highlighted in light-grey. The message body in
-blue highlighting shows the encoded *ReadRequest* data structure.
diff --git a/doc/toc.rst b/doc/toc.rst
index 4341095303b..ca8c5e1a489 100644
--- a/doc/toc.rst
+++ b/doc/toc.rst
@@ -4,12 +4,11 @@ open62541 Documentation
 .. toctree::
 
    index
+   core_concepts
    building
    tutorials
-   protocol
    types
    services
-   information_modelling
    server
    client
    pubsub

From d194808d3d5a0b7e7035d083f5193b771343e14c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 13:37:16 +0100
Subject: [PATCH 0684/1963] fix(doc): Remove a missing reference in
 building.rst

---
 doc/building.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/building.rst b/doc/building.rst
index 8ccea583630..4bec8e26043 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -479,10 +479,8 @@ Building the Examples
 ---------------------
 
 Make sure that you have installed the shared library as explained in the
-previous steps. Even easier way to build the examples is to install open62541 in
-your operating system (see :ref:`installing`).
-
-Then the compiler should automatically find the includes and the shared library.
+previous steps. Then the build system should automatically find the includes and
+the shared library.
 
 .. code-block:: bash
 

From ca1dbf9f1a955caf5b639170d508d778bcbdedf7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 15 Jan 2023 14:44:11 +0100
Subject: [PATCH 0685/1963] refactor(arch): Create at most one InterruptManager
 if no epoll is configured

---
 arch/eventloop_posix_interrupt.c | 33 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
index 4af177d13f7..7090a699949 100644
--- a/arch/eventloop_posix_interrupt.c
+++ b/arch/eventloop_posix_interrupt.c
@@ -349,6 +349,9 @@ markNonBlock(int fd)
 
 static UA_StatusCode
 startPOSIXInterruptManager(UA_EventSource *es) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    (void)el;
+
     /* Check the state */
     if(es->state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
@@ -357,17 +360,6 @@ startPOSIXInterruptManager(UA_EventSource *es) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-#ifndef UA_HAVE_EPOLL
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
-    /* Set the global pointer */
-    if(singletonIM != NULL) {
-        UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "Interrupt\t| There can be at most one active "
-                     "InterruptManager at a time");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-#endif
-
     POSIXInterruptManager *pim = (POSIXInterruptManager *)es;
     UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Interrupt\t| Starting the InterruptManager");
@@ -420,9 +412,6 @@ startPOSIXInterruptManager(UA_EventSource *es) {
         UA_close(pipefd[1]);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-
-    /* Register the singleton pointer */
-    singletonIM = pim;
 #endif
 
     /* Activate the registered signal handlers */
@@ -457,9 +446,6 @@ stopPOSIXInterruptManager(UA_EventSource *es) {
     UA_EventLoopPOSIX_deregisterFD(el, &pim->readFD);
     UA_close(pim->readFD.fd);
     UA_close(pim->writeFD);
-
-    /* Reset the global pointer */
-    singletonIM = NULL;
 #endif
 
     /* Immediately set to stopped */
@@ -485,19 +471,32 @@ freePOSIXInterruptmanager(UA_EventSource *es) {
 
     UA_String_clear(&es->name);
     UA_free(es);
+
+#ifndef UA_HAVE_EPOLL
+    singletonIM = NULL; /* Reset the global singleton pointer */
+#endif
+
     return UA_STATUSCODE_GOOD;
 }
 
 UA_InterruptManager *
 UA_InterruptManager_new_POSIX(const UA_String eventSourceName) {
+#ifndef UA_HAVE_EPOLL
+    /* There can be only one InterruptManager if epoll is not present */
+    if(singletonIM)
+        return NULL;
+#endif
+
     POSIXInterruptManager *pim =
         (POSIXInterruptManager *)UA_calloc(1, sizeof(POSIXInterruptManager));
     if(!pim)
         return NULL;
 
     LIST_INIT(&pim->signals);
+
 #ifndef UA_HAVE_EPOLL
     TAILQ_INIT(&pim->triggered);
+    singletonIM = pim; /* Register the singleton singleton pointer */
 #endif
 
     UA_InterruptManager *im = &pim->im;

From 6551c36d92f31cc9c5b144a665a4d1d399ec4714 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 13:50:35 +0100
Subject: [PATCH 0686/1963] refactor(server): Move MQTT and multicast polling
 to dedicated callback

---
 src/server/ua_server.c          | 78 +++++++++++++++++++++------------
 src/server/ua_server_internal.h |  3 ++
 2 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 1985acec4a8..5ba37be2390 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -264,6 +264,38 @@ serverHouseKeeping(UA_Server *server, void *_) {
     UA_UNLOCK(&server->serviceMutex);
 }
 
+/* Some subsystems require regula polling of the network. This is a holdover
+ * from before the EventLoop model.
+ *
+ * TODO: Refactor to use the EventLoop instead of polling. Get rid of this
+ * entirely. */
+static void
+serverPolling(UA_Server *server, void *_) {
+    /* Listen on the pubsublayer, but only if the yield function is set. */
+#if defined(UA_ENABLE_PUBSUB_MQTT)
+    UA_PubSubConnection *connection;
+    TAILQ_FOREACH(connection, &server->pubSubManager.connections, listEntry){
+        UA_PubSubConnection *ps = connection;
+        if(ps && ps->channel && ps->channel->yield){
+            ps->channel->yield(ps->channel, 0);
+        }
+    }
+#endif
+
+#if defined(UA_ENABLE_DISCOVERY_MULTICAST) && (UA_MULTITHREADING < 200)
+    UA_LOCK(&server->serviceMutex);
+    if(server->config.mdnsEnabled) {
+        /* TODO multicastNextRepeat does not consider new input data (requests)
+         * on the socket. It will be handled on the next call. if needed, we
+         * need to use select with timeout on the multicast socket
+         * server->mdnsSocket (see example in mdnsd library) on higher level. */
+        UA_DateTime multicastNextRepeat = 0;
+        iterateMulticastDiscoveryServer(server, &multicastNextRepeat, true);
+    }
+    UA_UNLOCK(&server->serviceMutex);
+#endif
+}
+
 /********************/
 /* Server Lifecycle */
 /********************/
@@ -786,6 +818,15 @@ UA_Server_run_startup(UA_Server *server) {
                                       NULL, 1000.0, &server->houseKeepingCallbackId);
     }
 
+    /* Add a regular callback for network polling tasks. With a 200ms interval.
+     *
+     * TODO: Move this to the EventLoop model without polling.
+     */
+    if(server->pollingCallbackId == 0) {
+        UA_Server_addRepeatedCallback(server, (UA_ServerCallback)serverPolling,
+                                      NULL, 200.0, &server->pollingCallbackId);
+    }
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     /* Start the EventLoop if not already started */
     UA_CHECK_MEM_ERROR(config->eventLoop, return UA_STATUSCODE_BADINTERNALERROR,
@@ -905,34 +946,9 @@ UA_Server_run_startup(UA_Server *server) {
 
 UA_UInt16
 UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
-    /* Listen on the pubsublayer, but only if the yield function is set.
-     * TODO: Integrate into the EventLoop */
-#if defined(UA_ENABLE_PUBSUB_MQTT)
-    UA_PubSubConnection *connection;
-    TAILQ_FOREACH(connection, &server->pubSubManager.connections, listEntry){
-        UA_PubSubConnection *ps = connection;
-        if(ps && ps->channel && ps->channel->yield){
-            ps->channel->yield(ps->channel, 0);
-        }
-    }
-#endif
-
     /* Process timed and network events in the EventLoop */
     server->config.eventLoop->run(server->config.eventLoop, UA_MAXTIMEOUT);
 
-#if defined(UA_ENABLE_DISCOVERY_MULTICAST) && (UA_MULTITHREADING < 200)
-    UA_LOCK(&server->serviceMutex);
-    if(server->config.mdnsEnabled) {
-        /* TODO multicastNextRepeat does not consider new input data (requests)
-         * on the socket. It will be handled on the next call. if needed, we
-         * need to use select with timeout on the multicast socket
-         * server->mdnsSocket (see example in mdnsd library) on higher level. */
-        UA_DateTime multicastNextRepeat = 0;
-        iterateMulticastDiscoveryServer(server, &multicastNextRepeat, true);
-    }
-    UA_UNLOCK(&server->serviceMutex);
-#endif
-
     /* Return the time until the next scheduled callback */
     return (UA_UInt16)((server->config.eventLoop->nextCyclicTime(server->config.eventLoop)
                         - UA_DateTime_nowMonotonic()) / UA_DATETIME_MSEC);
@@ -941,8 +957,16 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
 UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server) {
     /* Stop the regular housekeeping tasks */
-    UA_Server_removeCallback(server, server->houseKeepingCallbackId);
-    server->houseKeepingCallbackId = 0;
+    if(server->houseKeepingCallbackId != 0) {
+        UA_Server_removeCallback(server, server->houseKeepingCallbackId);
+        server->houseKeepingCallbackId = 0;
+    }
+
+    /* Stop the polling tasks */
+    if(server->pollingCallbackId != 0) {
+        UA_Server_removeCallback(server, server->pollingCallbackId);
+        server->pollingCallbackId = 0;
+    }
 
     /* Mark all reverse connects as destroying */
     reverse_connect_context *rev = NULL;
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 1e53e71a798..e444040ab28 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -117,6 +117,9 @@ struct UA_Server {
 
     UA_ServerLifecycle state;
     UA_UInt64 houseKeepingCallbackId;
+    UA_UInt64 pollingCallbackId; /* TODO: Move all subsystems that poll on the
+                                  * network to a true EventLoop
+                                  * implementation */
 
     UA_ServerConnection serverConnections[UA_MAXSERVERCONNECTIONS];
     size_t serverConnectionsSize;

From 384a67276457223d505c2060c3224e567ce1930d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 13:53:38 +0100
Subject: [PATCH 0687/1963] fix(server): Respect the waitInternal argument for
 UA_Server_run_iterate

---
 include/open62541/server.h |  2 +-
 src/server/ua_server.c     | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index ed7ce0a34ec..ccae4744417 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -411,7 +411,7 @@ UA_Server_run_startup(UA_Server *server);
  * @param server The server object.
  * @param waitInternal Should we wait for messages in the networklayer?
  *        Otherwise, the timouts for the networklayers are set to zero.
- *        The default max wait time is 50millisec.
+ *        The default max wait time is 200ms.
  * @return Returns how long we can wait until the next scheduled
  *         callback (in ms) */
 UA_UInt16 UA_EXPORT
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 5ba37be2390..426690f5839 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -786,7 +786,7 @@ UA_StatusCode UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle
 /* Main Server Loop */
 /********************/
 
-#define UA_MAXTIMEOUT 50 /* Max timeout in ms between main-loop iterations */
+#define UA_MAXTIMEOUT 200 /* Max timeout in ms between main-loop iterations */
 
 /* Start: Spin up the workers and the network layer and sample the server's
  *        start time.
@@ -947,11 +947,16 @@ UA_Server_run_startup(UA_Server *server) {
 UA_UInt16
 UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
     /* Process timed and network events in the EventLoop */
-    server->config.eventLoop->run(server->config.eventLoop, UA_MAXTIMEOUT);
+    UA_UInt32 timeout = (waitInternal) ? UA_MAXTIMEOUT : 0;
+    server->config.eventLoop->run(server->config.eventLoop, timeout);
 
     /* Return the time until the next scheduled callback */
-    return (UA_UInt16)((server->config.eventLoop->nextCyclicTime(server->config.eventLoop)
-                        - UA_DateTime_nowMonotonic()) / UA_DATETIME_MSEC);
+    UA_DateTime nextTimeout =
+        ((server->config.eventLoop->nextCyclicTime(server->config.eventLoop)
+         - UA_DateTime_nowMonotonic()) / UA_DATETIME_MSEC);
+    if(nextTimeout > UA_UINT16_MAX)
+        return UA_UINT16_MAX;
+    return (UA_UInt16)nextTimeout;
 }
 
 UA_StatusCode

From d9dde3ab2959cc7052ca67f70fdf49e973b86f02 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 16:17:13 +0100
Subject: [PATCH 0688/1963] feat(server): Add UA_Server_runUntilInterrupt

---
 examples/tutorial_server_firststeps.c | 15 +-----
 include/open62541/server.h            | 19 +++++++
 plugins/ua_config_default.c           | 76 +++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 14 deletions(-)

diff --git a/examples/tutorial_server_firststeps.c b/examples/tutorial_server_firststeps.c
index fb2f07e3ee2..085c62113e5 100644
--- a/examples/tutorial_server_firststeps.c
+++ b/examples/tutorial_server_firststeps.c
@@ -20,27 +20,14 @@
  * you have the ``open62541.c/.h`` files in the current folder. Now create a new
  * C source-file called ``myServer.c`` with the following content: */
 
-#include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include <signal.h>
-#include <stdlib.h>
-
-static volatile UA_Boolean running = true;
-static void stopHandler(int sig) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "received ctrl-c");
-    running = false;
-}
-
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/include/open62541/server.h b/include/open62541/server.h
index ccae4744417..9041b337dff 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -401,6 +401,25 @@ UA_Server_getConfig(UA_Server *server);
 UA_StatusCode UA_EXPORT
 UA_Server_run(UA_Server *server, const volatile UA_Boolean *running);
 
+/* Runs the server until interrupted. On Unix/Windows this registers an
+ * interrupt for SIGINT (ctrl-c). The method only returns after having received
+ * the interrupt or upon an error condition. The logical sequence is as follows:
+ *
+ * - Register the interrupt
+ * - UA_Server_run_startup
+ * - Loop until interrupt: UA_Server_run_iterate
+ * - UA_Server_run_shutdown
+ * - Deregister the interrupt
+ *
+ * Attention! This method is implemented individually for the different
+ * platforms (POSIX/Win32/etc.). The default implementation is in
+ * /plugins/ua_config_default.c under the CC0 license. Adjust as needed.
+ *
+ * @param server The server object.
+ * @return Returns a bad statuscode if an error occurred internally. */
+UA_StatusCode UA_EXPORT
+UA_Server_runUntilInterrupt(UA_Server *server);
+
 /* The prologue part of UA_Server_run (no need to use if you call
  * UA_Server_run) */
 UA_StatusCode UA_EXPORT
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 8634715b4bb..cad6f29c3f0 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -55,6 +55,82 @@ UA_Server_new(void) {
     return UA_Server_newWithConfig(&config);
 }
 
+#if defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32)
+
+/* Required for the definition of SIGINT */
+#include <signal.h>
+
+struct InterruptContext {
+    UA_Server *server;
+    UA_Boolean running;
+};
+
+static void
+interruptServer(UA_InterruptManager *im, uintptr_t interruptHandle,
+                void *context, const UA_KeyValueMap *parameters) {
+    struct InterruptContext *ic = (struct InterruptContext*)context;
+    UA_ServerConfig *config = UA_Server_getConfig(ic->server);
+    UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_USERLAND,
+                "Received SIGINT interrupt. Stopping the server.");
+    ic->running = false;
+}
+
+UA_StatusCode
+UA_Server_runUntilInterrupt(UA_Server *server) {
+    if(!server)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_EventLoop *el = config->eventLoop;
+    if(!el)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Get the interrupt manager */
+    UA_EventSource *es = el->eventSources;
+    while(es) {
+        if(es->eventSourceType == UA_EVENTSOURCETYPE_INTERRUPTMANAGER)
+            break;
+        es = es->next;
+    }
+    if(!es) {
+        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "No Interrupt EventSource configured");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_InterruptManager *im = (UA_InterruptManager*)es;
+
+    /* Register the interrupt */
+    struct InterruptContext ic;
+    ic.server = server;
+    ic.running = true;
+    UA_StatusCode retval =
+        im->registerInterrupt(im, SIGINT, &UA_KEYVALUEMAP_NULL,
+                              interruptServer, &ic);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_USERLAND,
+                     "Could not register the interrupt with status code %s",
+                     UA_StatusCode_name(retval));
+        return retval;
+    }
+
+    /* Run the server */
+    retval = UA_Server_run_startup(server);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto deregister_interrupt;
+    while(ic.running) {
+        UA_Server_run_iterate(server, true);
+    }
+
+    /* Shut down the server */
+    retval = UA_Server_run_shutdown(server);
+
+    /* Deregister the interrupt */
+ deregister_interrupt:
+    im->deregisterInterrupt(im, SIGINT);
+    return retval;
+}
+
+#endif /* defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32) */
+
 /*******************************/
 /* Default Connection Settings */
 /*******************************/

From a850f0349b7a64233717b03567c2b72bec68a7f2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 16:22:27 +0100
Subject: [PATCH 0689/1963] feat(plugin): Add InterruptManager to default
 server config

---
 plugins/ua_config_default.c             |  9 +++++++++
 tests/pubsub/check_pubsub_udp_unicast.c | 27 +++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index cad6f29c3f0..e2f8d95e2b0 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -229,6 +229,15 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
             UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp connection manager"));
         if(udpCM)
             conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)udpCM);
+
+        /* Add the interrupt manager */
+        UA_InterruptManager *im = UA_InterruptManager_new_POSIX(UA_STRING("interrupt manager"));
+        if(im) {
+            conf->eventLoop->registerEventSource(conf->eventLoop, &im->eventSource);
+        } else {
+            UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
+                           "Cannot create the Interrupt Manager (only relevant if used)");
+        }
     }
     if(conf->eventLoop != NULL) {
         if(conf->eventLoop->state != UA_EVENTLOOPSTATE_STARTED) {
diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
index fa4d763642a..e0a6cf6a0df 100644
--- a/tests/pubsub/check_pubsub_udp_unicast.c
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -58,11 +58,19 @@ static void setupFolder(UA_Server *server, UA_NodeId *folderId) {
 }
 
 
-static void setupPubSubServer(UA_Server **server, UA_ServerConfig **config, UA_UInt16 portNumber) {
-    *server = UA_Server_new();
+static void
+setupPubSubServer(UA_Server **server, UA_ServerConfig **config, UA_UInt16 portNumber,
+                  UA_EventLoop *el) {
+    UA_ServerConfig stack_config;
+    memset(&stack_config, 0, sizeof(UA_ServerConfig));
+    if(el) {
+        stack_config.eventLoop = el;
+        stack_config.externalEventLoop = true;
+    }
+    UA_ServerConfig_setMinimal(&stack_config, portNumber, NULL);
+    *server = UA_Server_newWithConfig(&stack_config);
     *config = UA_Server_getConfig(*server);
 
-    UA_ServerConfig_setMinimal(*config, portNumber, NULL);
     UA_Server_run_startup(*server);
     UA_ServerConfig_addPubSubTransportLayer(*config, UA_PubSubTransportLayerUDP());
 }
@@ -264,13 +272,14 @@ static void setupSubscribing(UA_Server *server, UA_NodeId connectionId, UA_NodeI
 /* setup() is to create an environment for test cases */
 static void setup(void) {
     /*Add setup by creating new server with valid configuration */
-    setupPubSubServer(&serverPublisher, &configPublisher, UA_PUBLISHER_PORT);
+    setupPubSubServer(&serverPublisher, &configPublisher, UA_PUBLISHER_PORT, NULL);
     UA_NodeId publisherConnectionId;
     addUDPConnection(serverPublisher, "localhost", UA_PUBLISHER_PORT, &publisherConnectionId);
     setupPublishingUnicast(serverPublisher, publisherConnectionId, "127.0.0.1", UA_SUBSCRIBER_PORT,
                            PUBLISHVARIABLE_NODEID);
 
-    setupPubSubServer(&serverSubscriber, &configSubscriber, UA_SUBSCRIBER_PORT);
+    setupPubSubServer(&serverSubscriber, &configSubscriber, UA_SUBSCRIBER_PORT,
+                      configPublisher->eventLoop);
     UA_NodeId folderId;
     setupFolder(serverSubscriber, &folderId);
     UA_NodeId subscriberConnectionId;
@@ -280,12 +289,14 @@ static void setup(void) {
 
 /* teardown() is to delete the environment set for test cases */
 static void teardown(void) {
-    /*Call server delete functions */
-    UA_Server_run_shutdown(serverPublisher);
-    UA_Server_delete(serverPublisher);
     /*Call server delete functions */
     UA_Server_run_shutdown(serverSubscriber);
     UA_Server_delete(serverSubscriber);
+
+    /* Call server delete functions (this deletes the eventloop also used in the
+     * other server) */
+    UA_Server_run_shutdown(serverPublisher);
+    UA_Server_delete(serverPublisher);
 }
 
 static void checkReceived(UA_Server *publisher, UA_UInt32 publishVariableNodeId, UA_Server *subscriber, UA_UInt32 subscribeVariableNodeId) {

From 1b5a67764163d9fc8cd59205ab12f7096a65859a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 16:54:56 +0100
Subject: [PATCH 0690/1963] refactor(server): Expose UA_Server_new as part of
 open62541/server.h

---
 README.md                                     | 29 +++++++------------
 include/open62541/server.h                    | 15 ++++++----
 .../include/open62541/server_config_default.h |  4 ---
 plugins/ua_config_default.c                   |  4 +--
 tests/server/check_discovery.c                |  1 -
 5 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 41fe15cf2e2..9f44d2df65a 100644
--- a/README.md
+++ b/README.md
@@ -184,25 +184,16 @@ The following simple server example can be built using gcc, after you installed
 Using the GCC compiler, just run ```gcc -std=c99 -DUA_ARCHITECTURE_POSIX <server.c> -lopen62541 -o server``` (under Windows you may need to add ``` -lws2_32``` 
 and change `-DUA_ARCHITECTURE_POSIX` to `-DUA_ARCHITECTURE_WIN32`).
 ```c
-#include <signal.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-UA_Boolean running = true;
-void signalHandler(int sig) {
-    running = false;
-}
 
 int main(int argc, char** argv)
 {
-    signal(SIGINT, signalHandler); /* catch ctrl-c */
-
-    /* Create a server listening on port 4840 */
+    /* Create a server listening on port 4840 (default) */
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
-    /* Add a variable node */
-    /* 1) Define the node attributes */
+    /* Add a variable node to the server */
+
+    /* 1) Define the variable attributes */
     UA_VariableAttributes attr = UA_VariableAttributes_default;
     attr.displayName = UA_LOCALIZEDTEXT("en-US", "the answer");
     UA_Int32 myInteger = 42;
@@ -216,14 +207,16 @@ int main(int argc, char** argv)
     UA_QualifiedName browseName = UA_QUALIFIEDNAME(1, "the answer");
 
     /* 3) Add the node */
-    UA_Server_addVariableNode(server, newNodeId, parentNodeId, parentReferenceNodeId,
-                              browseName, variableType, attr, NULL, NULL);
+    UA_Server_addVariableNode(server, newNodeId, parentNodeId,
+                              parentReferenceNodeId, browseName,
+                              variableType, attr, NULL, NULL);
 
-    /* Run the server loop */
-    UA_StatusCode status = UA_Server_run(server, &running);
+    /* Run the server (until ctrl-c interrupt) */
+    UA_StatusCode status = UA_Server_runUntilInterrupt(server);
 
+    /* Clean up */
     UA_Server_delete(server);
-    return status;
+    return status == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 ```
 
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 9041b337dff..68798ba2206 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -374,12 +374,17 @@ UA_ServerConfig_clean(UA_ServerConfig *config);
  * Server Lifecycle
  * ---------------- */
 
-/* The method UA_Server_new is defined in server_config_default.h. So default
- * plugins outside of the core library (for logging, etc) are already available
- * during the initialization.
+/* Create a new server with a default configuration that adds plugins for
+ * networking, security, logging and so on. See `server_config_default.h` for
+ * more detailed options.
  *
- * UA_Server UA_EXPORT * UA_Server_new(void);
- */
+ * The default configuration can be used as the starting point to adjust the
+ * server configuration to individual needs. UA_Server_new is implemented in the
+ * /plugins folder under the CC0 license. Furthermore the server confiugration
+ * only uses the public server API.
+ *
+ * @return Returns the configured server or NULL if an error occurs. */
+UA_EXPORT UA_Server * UA_Server_new(void);
 
 /* Creates a new server. Moves the config into the server with a shallow copy.
  * The config content is cleared together with the server. */
diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index 58e0d3ed43a..5e4f266d507 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -14,10 +14,6 @@
 
 _UA_BEGIN_DECLS
 
-/* Create a new server with default plugins for logging etc. used during
- * initialization. No network layer and SecurityPolicies are set so far. */
-UA_Server UA_EXPORT * UA_Server_new(void);
-
 /**********************/
 /* Default Connection */
 /**********************/
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index e2f8d95e2b0..2a9992d1fcb 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -47,11 +47,9 @@ UA_Server *
 UA_Server_new(void) {
     UA_ServerConfig config;
     memset(&config, 0, sizeof(UA_ServerConfig));
-
-    UA_StatusCode res = setDefaultConfig(&config, 4840);
+    UA_StatusCode res = UA_ServerConfig_setDefault(&config);
     if(res != UA_STATUSCODE_GOOD)
         return NULL;
-
     return UA_Server_newWithConfig(&config);
 }
 
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 2d02f4757ce..337fd4d596e 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -48,7 +48,6 @@ THREAD_CALLBACK(serverloop_lds) {
 static void
 configure_lds_server(UA_Server *pServer) {
     UA_ServerConfig *config_lds = UA_Server_getConfig(pServer);
-    UA_ServerConfig_setDefault(config_lds);
 
     config_lds->applicationDescription.applicationType =
         UA_APPLICATIONTYPE_DISCOVERYSERVER;

From 21169c946c39f874ad8162d690db7573cc6ab457 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 16:57:34 +0100
Subject: [PATCH 0691/1963] refactor(client): Expose UA_Client_new as part of
 open62541/client.h

---
 README.md                                         |  3 +--
 include/open62541/client.h                        | 15 ++++++++++-----
 plugins/include/open62541/client_config_default.h |  2 --
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 9f44d2df65a..43817d7cc18 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,6 @@ int main(int argc, char** argv)
 ```c
 #include <stdio.h>
 #include <open62541/client.h>
-#include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 
 int main(int argc, char *argv[])
@@ -251,6 +250,6 @@ int main(int argc, char *argv[])
     /* Clean up */
     UA_Variant_clear(&value);
     UA_Client_delete(client); /* Disconnects the client internally */
-    return status;
+    return status == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 ```
diff --git a/include/open62541/client.h b/include/open62541/client.h
index aef2833a1e7..1b2360ee748 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -190,12 +190,17 @@ typedef struct {
  * Client Lifecycle
  * ---------------- */
 
-/* The method UA_Client_new is defined in client_config_default.h. So default
- * plugins outside of the core library (for logging, etc) are already available
- * during the initialization.
+/* Create a new client with a default configuration that adds plugins for
+ * networking, security, logging and so on. See `client_config_default.h` for
+ * more detailed options.
  *
- * UA_Client UA_EXPORT * UA_Client_new(void);
- */
+ * The default configuration can be used as the starting point to adjust the
+ * client configuration to individual needs. UA_Client_new is implemented in the
+ * /plugins folder under the CC0 license. Furthermore the client confiugration
+ * only uses the public server API.
+ *
+ * @return Returns the configured client or NULL if an error occurs. */
+UA_EXPORT UA_Client * UA_Client_new(void);
 
 /* Creates a new client. Moves the config into the client with a shallow copy.
  * The config content is cleared together with the client. */
diff --git a/plugins/include/open62541/client_config_default.h b/plugins/include/open62541/client_config_default.h
index 74bc92de4a1..d81e52e1dc3 100644
--- a/plugins/include/open62541/client_config_default.h
+++ b/plugins/include/open62541/client_config_default.h
@@ -13,8 +13,6 @@
 
 _UA_BEGIN_DECLS
 
-UA_Client UA_EXPORT * UA_Client_new(void);
-
 UA_StatusCode UA_EXPORT
 UA_ClientConfig_setDefault(UA_ClientConfig *config);
 

From 53a759d532a978f7b72865681c22270e446fb7d4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 16:58:02 +0100
Subject: [PATCH 0692/1963] refactor(server): Cosmetic improvements in
 include/open62541/server.h

---
 include/open62541/server.h | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 68798ba2206..761b3341153 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -388,22 +388,28 @@ UA_EXPORT UA_Server * UA_Server_new(void);
 
 /* Creates a new server. Moves the config into the server with a shallow copy.
  * The config content is cleared together with the server. */
-UA_Server UA_EXPORT *
+UA_EXPORT UA_Server *
 UA_Server_newWithConfig(UA_ServerConfig *config);
 
-void UA_EXPORT UA_Server_delete(UA_Server *server);
+/* Delete the server. */
+UA_EXPORT void UA_Server_delete(UA_Server *server);
 
-UA_ServerConfig UA_EXPORT *
+/* Get the configuration. Always succeeds as this simplfy resolves a pointer.
+ * Attention! Do not adjust the configuration while the server is running! */
+UA_EXPORT UA_ServerConfig *
 UA_Server_getConfig(UA_Server *server);
 
-/* Runs the main loop of the server. In each iteration, this calls into the
- * networklayers to see if messages have arrived.
+/* Runs the server until interrupted. On Unix/Windows this registers an
+ * interrupt for SIGINT (ctrl-c). The method only returns after having received
+ * the interrupt. The logical sequence is as follows:
+ *
+ * - UA_Server_run_startup
+ * - Loop until interrupt: UA_Server_run_iterate
+ * - UA_Server_run_shutdown
  *
  * @param server The server object.
- * @param running The loop is run as long as *running is true.
- *        Otherwise, the server shuts down.
- * @return Returns the statuscode of the UA_Server_run_shutdown method */
-UA_StatusCode UA_EXPORT
+ * @return Returns a bad statuscode if an error occurred internally. */
+UA_EXPORT UA_StatusCode
 UA_Server_run(UA_Server *server, const volatile UA_Boolean *running);
 
 /* Runs the server until interrupted. On Unix/Windows this registers an
@@ -422,12 +428,12 @@ UA_Server_run(UA_Server *server, const volatile UA_Boolean *running);
  *
  * @param server The server object.
  * @return Returns a bad statuscode if an error occurred internally. */
-UA_StatusCode UA_EXPORT
+UA_EXPORT UA_StatusCode
 UA_Server_runUntilInterrupt(UA_Server *server);
 
 /* The prologue part of UA_Server_run (no need to use if you call
- * UA_Server_run) */
-UA_StatusCode UA_EXPORT
+ * UA_Server_run or UA_Server_runUntilInterrupt) */
+UA_EXPORT UA_StatusCode
 UA_Server_run_startup(UA_Server *server);
 
 /* Executes a single iteration of the server's main loop.
@@ -438,12 +444,12 @@ UA_Server_run_startup(UA_Server *server);
  *        The default max wait time is 200ms.
  * @return Returns how long we can wait until the next scheduled
  *         callback (in ms) */
-UA_UInt16 UA_EXPORT
+UA_EXPORT UA_UInt16
 UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal);
 
 /* The epilogue part of UA_Server_run (no need to use if you call
- * UA_Server_run) */
-UA_StatusCode UA_EXPORT
+ * UA_Server_run or UA_Server_runUntilInterrupt) */
+UA_EXPORT UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server);
 
 /**

From 4b8ec01827e833c9d4f57926e4b9577bce55dffd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 21:10:30 +0100
Subject: [PATCH 0693/1963] refactor(examples): Use UA_Server_runUntilInterrupt
 in examples

---
 examples/pubsub/tutorial_pubsub_connection.c  | 28 +++----
 .../pubsub/tutorial_pubsub_mqtt_publish.c     | 23 ++----
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   | 17 +---
 examples/pubsub/tutorial_pubsub_publish.c     | 14 +---
 examples/pubsub/tutorial_pubsub_publish_raw.c | 25 ++----
 examples/pubsub/tutorial_pubsub_subscribe.c   | 23 ++----
 .../pubsub/tutorial_pubsub_subscribe_raw.c    | 81 +++++++++----------
 examples/server.cpp                           | 21 +----
 examples/server_inheritance.c                 | 71 ++++++++--------
 examples/server_mainloop.c                    |  4 +-
 examples/tutorial_server_alarms_conditions.c  | 19 +----
 examples/tutorial_server_datasource.c         | 17 +---
 examples/tutorial_server_events.c             | 61 +++++++-------
 examples/tutorial_server_firststeps.c         | 29 ++-----
 examples/tutorial_server_historicaldata.c     | 40 +++------
 .../tutorial_server_historicaldata_circular.c | 40 +++------
 examples/tutorial_server_method.c             | 16 +---
 examples/tutorial_server_method_async.c       | 20 +----
 examples/tutorial_server_monitoreditems.c     | 16 +---
 examples/tutorial_server_object.c             | 48 +++++------
 examples/tutorial_server_reverseconnect.c     | 16 +---
 examples/tutorial_server_variable.c           | 21 +----
 examples/tutorial_server_variabletype.c       | 21 +----
 23 files changed, 199 insertions(+), 472 deletions(-)

diff --git a/examples/pubsub/tutorial_pubsub_connection.c b/examples/pubsub/tutorial_pubsub_connection.c
index cdf1a21732d..8d8c997dd71 100644
--- a/examples/pubsub/tutorial_pubsub_connection.c
+++ b/examples/pubsub/tutorial_pubsub_connection.c
@@ -5,28 +5,14 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
-
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
 
 /**
  * The PubSub connection example demonstrate the PubSub TransportLayer configuration and
  * the dynamic creation of PubSub Connections on runtime.
  */
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
 
     /* Add the PubSubTransportLayer implementation to the server config.
      * The PubSubTransportLayer is a factory to create new connections
@@ -44,12 +30,15 @@ int main(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(connectionConfig));
     connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
-    connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.enabled = true;
     /* The address and interface is part of the standard
      * defined UA_NetworkAddressUrlDataType. */
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
-    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConfig.publisherId.uint32 = UA_UInt32_random();
     /* Connection options are given as Key/Value Pairs. The available options are
@@ -69,13 +58,14 @@ int main(void) {
     /* Create a new concrete connection and add the connection
      * to the current PubSub configuration. */
     UA_NodeId connectionIdentifier;
-    UA_StatusCode retval = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
+    UA_StatusCode retval =
+        UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     if(retval == UA_STATUSCODE_GOOD){
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                     "The PubSub Connection was created successfully!");
     }
 
-    retval |= UA_Server_run(server, &running);
+    retval |= UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 7d894b8491e..8d960a56e6e 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -42,11 +42,7 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
 #include <open62541/plugin/securitypolicy_default.h>
-
-#include <signal.h>
-
 #include <open62541/plugin/pubsub_mqtt.h>
 
 #define CONNECTION_NAME              "MQTT Publisher Connection"
@@ -403,11 +399,6 @@ addDataSetWriter(UA_Server *server, char *topic) {
  * which already contains the decoding code for UADP messages.
  *
  * It follows the main server code, making use of the above definitions. */
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
 
 static void usage(void) {
     printf("Usage: tutorial_pubsub_mqtt_publish [--url <opc.mqtt://hostname:port>] "
@@ -422,9 +413,6 @@ static void usage(void) {
 }
 
 int main(int argc, char **argv) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     /* TODO: Change to secure mqtt port:8883 */
     char *addressUrl = BROKER_ADDRESS_URL;
     char *topic = PUBLISHER_TOPIC;
@@ -485,12 +473,11 @@ int main(int argc, char **argv) {
     }
 
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    /* Set up the server config */
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
+
     /* Details about the connection configuration and handling are located in
      * the pubsub connection tutorial */
-    UA_ServerConfig_setDefault(config);
 
 #if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
     /* Instantiate the PubSub SecurityPolicy */
@@ -507,14 +494,14 @@ int main(int argc, char **argv) {
     addPublishedDataSet(server);
     addDataSetField(server);
     retval = addWriterGroup(server, topic, interval);
-    if (UA_STATUSCODE_GOOD != retval)
-    {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Error Name = %s", UA_StatusCode_name(retval));
+    if(UA_STATUSCODE_GOOD != retval) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "Error Name = %s", UA_StatusCode_name(retval));
         return EXIT_FAILURE;
     }
     addDataSetWriter(server, topic);
 
-    UA_Server_run(server, &running);
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
     return 0;
 }
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index a0585f0ebb1..ff3eb2352c2 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -6,13 +6,8 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
 #include <open62541/plugin/securitypolicy_default.h>
-
-#include <signal.h>
-
 #include <open62541/plugin/pubsub_mqtt.h>
-#include "ua_pubsub.h"
 
 #define CONNECTION_NAME               "MQTT Subscriber Connection"
 #define TRANSPORT_PROFILE_URI         "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
@@ -371,17 +366,8 @@ static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
 
 /**
  * Followed by the main server code, making use of the above definitions */
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 
 int main(int argc, char **argv) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     char *addressUrl = BROKER_ADDRESS_URL;
     //char *topic = SUBSCRIBER_TOPIC;
     int interval = SUBSCRIBE_INTERVAL;
@@ -390,7 +376,6 @@ int main(int argc, char **argv) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setMinimal(config, 4841, NULL);
 
 #if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
     /* Instantiate the PubSub SecurityPolicy */
@@ -424,7 +409,7 @@ int main(int argc, char **argv) {
     if (retval != UA_STATUSCODE_GOOD)
         return EXIT_FAILURE;
 
-    retval = UA_Server_run(server, &running);
+    retval = UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/examples/pubsub/tutorial_pubsub_publish.c b/examples/pubsub/tutorial_pubsub_publish.c
index b13ed8ace23..fc191310c52 100644
--- a/examples/pubsub/tutorial_pubsub_publish.c
+++ b/examples/pubsub/tutorial_pubsub_publish.c
@@ -28,9 +28,6 @@
 #include <open62541/plugin/pubsub_ethernet.h>
 #include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
 
 UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent;
 
@@ -164,20 +161,11 @@ addDataSetWriter(UA_Server *server) {
  * which already contains the decoding code for UADP messages.
  *
  * It follows the main server code, making use of the above definitions. */
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
 
 static int run(UA_String *transportProfile,
                UA_NetworkAddressUrlDataType *networkAddressUrl) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
 
     /* Details about the connection configuration and handling are located in
      * the pubsub connection tutorial */
@@ -192,7 +180,7 @@ static int run(UA_String *transportProfile,
     addWriterGroup(server);
     addDataSetWriter(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/pubsub/tutorial_pubsub_publish_raw.c b/examples/pubsub/tutorial_pubsub_publish_raw.c
index 00249baedf9..f4874a56947 100644
--- a/examples/pubsub/tutorial_pubsub_publish_raw.c
+++ b/examples/pubsub/tutorial_pubsub_publish_raw.c
@@ -12,9 +12,6 @@
 #include <open62541/plugin/pubsub_ethernet.h>
 #include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
 
 const UA_NodeId pointVariableTypeId = {
     1, UA_NODEIDTYPE_NUMERIC, {4243}};
@@ -262,20 +259,10 @@ add3DPointVariable(UA_Server *server) {
                               pointVariableTypeId, vattr, NULL, &pointVariableNode);
 }
 
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 static int run(UA_String *transportProfile,
                UA_NetworkAddressUrlDataType *networkAddressUrl) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
 
     /* Add custom Datatypes */
     UA_DataType *types = (UA_DataType*)UA_malloc(sizeof(UA_DataType));
@@ -305,8 +292,12 @@ static int run(UA_String *transportProfile,
     UA_String value = UA_STRING("hello world");
     UA_Variant_setScalar(&variableAttributes.value, &value, &UA_TYPES[UA_TYPES_STRING]);
     variableAttributes.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
-    UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 1000), UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                              UA_QUALIFIEDNAME(1, "publishNode"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), variableAttributes, NULL, NULL );
+    UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 1000),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                              UA_QUALIFIEDNAME(1, "publishNode"),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              variableAttributes, NULL, NULL );
 
     //generic OPC UA configuration
     addPubSubConnection(server, transportProfile, networkAddressUrl);
@@ -316,7 +307,7 @@ static int run(UA_String *transportProfile,
     //contain RAW-encoding specific configuration fields
     addDataSetWriter(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     UA_Server_delete(server);
@@ -336,7 +327,7 @@ int main(int argc, char **argv) {
     UA_NetworkAddressUrlDataType networkAddressUrl =
         {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
 
-    if (argc > 1) {
+    if(argc > 1) {
         if (strcmp(argv[1], "-h") == 0) {
             usage(argv[0]);
             return EXIT_SUCCESS;
diff --git a/examples/pubsub/tutorial_pubsub_subscribe.c b/examples/pubsub/tutorial_pubsub_subscribe.c
index b489da872de..881de73eb89 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe.c
@@ -33,18 +33,12 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-#include <open62541/types_generated.h>
-
-#include "ua_pubsub.h"
 
 #if defined (UA_ENABLE_PUBSUB_ETH_UADP)
 #include <open62541/plugin/pubsub_ethernet.h>
 #endif
 
 #include <stdio.h>
-#include <signal.h>
-#include <stdlib.h>
 
 UA_NodeId connectionIdentifier;
 UA_NodeId readerGroupIdentifier;
@@ -274,21 +268,13 @@ static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
 
 /**
  * Followed by the main server code, making use of the above definitions */
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
 
 static int
 run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
     /* Return value initialized to Status Good */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setMinimal(config, 4801, NULL);
 
     /* Add the PubSub network layer implementation to the server config.
      * The TransportLayer is acting as factory to create new connections
@@ -320,7 +306,8 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     if (retval != UA_STATUSCODE_GOOD)
         return EXIT_FAILURE;
 
-    retval = UA_Server_run(server, &running);
+    retval = UA_Server_runUntilInterrupt(server);
+
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
@@ -331,8 +318,10 @@ usage(char *progname) {
 }
 
 int main(int argc, char **argv) {
-    UA_String transportProfile = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_String transportProfile =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     if(argc > 1) {
         if(strcmp(argv[1], "-h") == 0) {
             usage(argv[0]);
diff --git a/examples/pubsub/tutorial_pubsub_subscribe_raw.c b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
index 0535518746d..644c03dbbce 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe_raw.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
@@ -12,13 +12,9 @@
 #define METADATA_SOURCE_SERVER "opc.tcp://localhost:4840"
 #define METADATA_DATASET_NAME "Demo PDS"
 
-
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-#include <open62541/types_generated.h>
-#include "ua_pubsub.h"
 
 #ifdef UA_ENABLE_PUBSUB_ETH_UADP
 #include <open62541/plugin/pubsub_ethernet.h>
@@ -27,21 +23,17 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 
-#include <server/ua_server_internal.h>
+#include "server/ua_server_internal.h"
 
-#include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
 
-#include <custom_datatype/custom_datatype.h>
+#include "custom_datatype/custom_datatype.h"
 
 UA_NodeId connectionIdentifier;
 UA_NodeId readerGroupIdentifier;
 UA_NodeId readerIdentifier;
-
 UA_DataSetReaderConfig readerConfig;
 
-
 static void collectDataSetMetaDataFromServer(UA_Server *server, UA_DataSetMetaDataType *pMetaData);
 
 /* Add new connection to the server */
@@ -65,7 +57,7 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
-    if (retval != UA_STATUSCODE_GOOD) {
+    if(retval != UA_STATUSCODE_GOOD) {
         return retval;
     }
     retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
@@ -177,7 +169,8 @@ addSubscribedVariables (UA_Server *server, UA_NodeId dataSetReaderId) {
     }
 
     retval = UA_Server_DataSetReader_createTargetVariables(server, dataSetReaderId,
-                                                           readerConfig.dataSetMetaData.fieldsSize, targetVars);
+                                                           readerConfig.dataSetMetaData.fieldsSize,
+                                                           targetVars);
     UA_free(readerConfig.dataSetMetaData.fields);
     return retval;
 }
@@ -189,18 +182,16 @@ static void printDataSetMetaDataType(const UA_DataSetMetaDataType *pMetaData){
         UA_NodeId_print(&pMetaData->fields[i].dataType, typeName);
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                     "FieldNumber: %i, Name: %s, DataTypeId: %s, InternalTypeid: %i", (int) i,
-                    pMetaData->fields[i].name.data, (char *) typeName->data, (int) pMetaData->fields[i].builtInType);
+                    pMetaData->fields[i].name.data, (char *) typeName->data,
+                    (int) pMetaData->fields[i].builtInType);
     }
 }
 
 /* Collect MetaData from remote server */
-UA_StatusCode
-UA_Server_DataSetReader_getMetaDataFromRemote(UA_Server *server, UA_String remoteServer,
-                                              UA_QualifiedName pdsName, UA_DataSetMetaDataType *dsMetaData);
-
-UA_StatusCode
+static UA_StatusCode
 UA_Server_DataSetReader_getMetaDataFromRemote(UA_Server *server, UA_String remoteServer,
-                                              UA_QualifiedName pdsName, UA_DataSetMetaDataType *dsMetaData){
+                                              UA_QualifiedName pdsName,
+                                              UA_DataSetMetaDataType *dsMetaData) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
     char remoteServer_ar[512];
@@ -228,8 +219,12 @@ UA_Server_DataSetReader_getMetaDataFromRemote(UA_Server *server, UA_String remot
     browseRequest.requestedMaxReferencesPerNode = 1000;
 
     UA_BrowseResponse browseResponse = UA_Client_Service_browse(client, browseRequest);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,"Result size: %i result: %s, ref size: %i ",
-                (int) browseResponse.resultsSize, UA_StatusCode_name(browseResponse.responseHeader.serviceResult), (int) browseResponse.results->referencesSize);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                "Result size: %i result: %s, ref size: %i ",
+                (int) browseResponse.resultsSize,
+                UA_StatusCode_name(browseResponse.responseHeader.serviceResult),
+                (int) browseResponse.results->referencesSize);
+
     for(size_t i = 0; i < browseResponse.resultsSize; ++i) {
         for(size_t j = 0; j < browseResponse.results[i].referencesSize; ++j) {
             UA_ReferenceDescription *ref = &(browseResponse.results[i].references[j]);
@@ -263,7 +258,8 @@ UA_Server_DataSetReader_getMetaDataFromRemote(UA_Server *server, UA_String remot
     UA_BrowseRequest_clear(&browseRequest);
 
     if(UA_NodeId_isNull(&resultMetaDataNodeId)){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Unable to request metadata from remote server!");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Unable to request metadata from remote server!");
     } else {
         UA_Variant value;
         retval = UA_Client_readValueAttribute(client, resultMetaDataNodeId, &value);
@@ -287,37 +283,31 @@ collectDataSetMetaDataFromServer(UA_Server *server, UA_DataSetMetaDataType *pMet
                                                   UA_QUALIFIEDNAME(0, METADATA_DATASET_NAME),
                                                   pMetaData);
     if(getMetaDataResult != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Unable to get metadata from remote server");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Unable to get metadata from remote server");
         return;
     }
     printDataSetMetaDataType(pMetaData);
 }
 
-static void add3DPointDataType(UA_Server* server)
-{
+static void
+add3DPointDataType(UA_Server* server) {
     UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
     attr.displayName = UA_LOCALIZEDTEXT("en-US", "3D Point Type");
 
-    UA_Server_addDataTypeNode(
-        server, PointType.typeId, UA_NODEID_NUMERIC(0, UA_NS0ID_STRUCTURE),
-        UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE), UA_QUALIFIEDNAME(1, "3D.Point"), attr, NULL, NULL);
-}
-
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
+    UA_Server_addDataTypeNode(server, PointType.typeId,
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_STRUCTURE),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
+                              UA_QUALIFIEDNAME(1, "3D.Point"),
+                              attr, NULL, NULL);
 }
 
 static int
 run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
     /* Return value initialized to Status Good */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setMinimal(config, 4801, NULL);
 
     /* Add custom Datatypes */
     UA_DataType *types = (UA_DataType*)UA_malloc(sizeof(UA_DataType));
@@ -345,25 +335,26 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     /* API calls */
     /* Add PubSubConnection */
     retval |= addPubSubConnection(server, transportProfile, networkAddressUrl);
-    if (retval != UA_STATUSCODE_GOOD)
+    if(retval != UA_STATUSCODE_GOOD)
         return EXIT_FAILURE;
 
     /* Add ReaderGroup to the created PubSubConnection */
     retval |= addReaderGroup(server);
-    if (retval != UA_STATUSCODE_GOOD)
+    if(retval != UA_STATUSCODE_GOOD)
         return EXIT_FAILURE;
 
     /* Add DataSetReader to the created ReaderGroup */
     retval |= addDataSetReader(server);
-    if (retval != UA_STATUSCODE_GOOD)
+    if(retval != UA_STATUSCODE_GOOD)
         return EXIT_FAILURE;
 
     /* Add SubscribedVariables to the created DataSetReader */
     retval |= addSubscribedVariables(server, readerIdentifier);
-    if (retval != UA_STATUSCODE_GOOD)
+    if(retval != UA_STATUSCODE_GOOD)
         return EXIT_FAILURE;
 
-    retval = UA_Server_run(server, &running);
+    retval = UA_Server_runUntilInterrupt(server);
+
     UA_Server_delete(server);
     UA_free(pointMembers);
     UA_free(types);
@@ -376,8 +367,10 @@ usage(char *progname) {
 }
 
 int main(int argc, char **argv) {
-    UA_String transportProfile = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_String transportProfile =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     if(argc > 1) {
         if(strcmp(argv[1], "-h") == 0) {
             usage(argv[0]);
diff --git a/examples/server.cpp b/examples/server.cpp
index 08d55da40c7..c0d2ce29e52 100644
--- a/examples/server.cpp
+++ b/examples/server.cpp
@@ -1,30 +1,15 @@
 /* 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 "open62541.h"
-
-#include <signal.h>
-#include <stdlib.h>
+#include <open62541/server.h>
 
 /* Build Instructions (Linux)
- * - gcc -std=c99 -c open62541.c
- * - g++ server.cpp open62541.o -o server */
+ * - g++ server.cpp -lopen62541 -o server */
 
 using namespace std;
 
-UA_Boolean running = true;
-
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 int main() {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     // add a variable node to the adresspace
     UA_VariableAttributes attr = UA_VariableAttributes_default;
@@ -45,7 +30,7 @@ int main() {
     UA_NodeId_clear(&myIntegerNodeId);
     UA_QualifiedName_clear(&myIntegerName);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/server_inheritance.c b/examples/server_inheritance.c
index 600d1ee7ee4..f2a611b7a24 100644
--- a/examples/server_inheritance.c
+++ b/examples/server_inheritance.c
@@ -3,15 +3,6 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
-
-UA_Boolean running = true;
-static void stopHandler(int sig) {
-    running = false;
-}
 
 /**
  * This will create a type structure and some instances of the types:
@@ -32,7 +23,8 @@ static void stopHandler(int sig) {
  *          v- MakeSound = "Wuff"
  *           v- FetchNewPaper
  */
-static void createMammals(UA_Server *server) {
+static void
+createMammals(UA_Server *server) {
 
 
     UA_ObjectTypeAttributes otAttr = UA_ObjectTypeAttributes_default;
@@ -51,7 +43,8 @@ static void createMammals(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 10001),
                               UA_NODEID_NUMERIC(1, 10000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                              UA_QUALIFIEDNAME(1, "Class"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              UA_QUALIFIEDNAME(1, "Class"),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               vAttr, NULL, NULL);
 
     vAttr = UA_VariableAttributes_default;
@@ -60,7 +53,8 @@ static void createMammals(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 10002),
                               UA_NODEID_NUMERIC(1, 10000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                              UA_QUALIFIEDNAME(1, "Species"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              UA_QUALIFIEDNAME(1, "Species"),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               vAttr, NULL, NULL);
 
     otAttr = UA_ObjectTypeAttributes_default;
@@ -79,7 +73,8 @@ static void createMammals(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 20001),
                               UA_NODEID_NUMERIC(1, 20000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                              UA_QUALIFIEDNAME(1, "Species"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              UA_QUALIFIEDNAME(1, "Species"),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               vAttr, NULL, NULL);
 
     vAttr = UA_VariableAttributes_default;
@@ -90,7 +85,8 @@ static void createMammals(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 20002),
                               UA_NODEID_NUMERIC(1, 20000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                              UA_QUALIFIEDNAME(1, "Name"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              UA_QUALIFIEDNAME(1, "Name"),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               vAttr, NULL, NULL);
 
     /* Instatiate a dog named bello:
@@ -157,10 +153,9 @@ static void createMammals(UA_Server *server) {
  *          IsOn should have the node ID 30101, Brightness will be inherited with a generated node ID
  *
  */
-static void createCustomInheritance(UA_Server *server) {
-
+static void
+createCustomInheritance(UA_Server *server) {
     /* Add LampType object type node */
-
     UA_ObjectTypeAttributes otAttr = UA_ObjectTypeAttributes_default;
     otAttr.description = UA_LOCALIZEDTEXT("en-US", "A Lamp");
     otAttr.displayName = UA_LOCALIZEDTEXT("en-US", "LampType");
@@ -169,7 +164,6 @@ static void createCustomInheritance(UA_Server *server) {
                                 UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
                                 UA_QUALIFIEDNAME(1, "LampType"), otAttr, NULL, NULL);
 
-
     /* Add the two mandatory children, IsOn and Brightness */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description =  UA_LOCALIZEDTEXT("en-US", "Switch lamp on/off");
@@ -179,7 +173,8 @@ static void createCustomInheritance(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 30001),
                               UA_NODEID_NUMERIC(1, 30000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                              UA_QUALIFIEDNAME(1, "IsOn"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              UA_QUALIFIEDNAME(1, "IsOn"),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               vAttr, NULL, NULL);
     UA_Server_addReference(server, UA_NODEID_NUMERIC(1, 30001),
                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE),
@@ -193,14 +188,16 @@ static void createCustomInheritance(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 30002),
                               UA_NODEID_NUMERIC(1, 30000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                              UA_QUALIFIEDNAME(1, "Brightness"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              UA_QUALIFIEDNAME(1, "Brightness"),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               vAttr, NULL, NULL);
     UA_Server_addReference(server, UA_NODEID_NUMERIC(1, 30002),
                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE),
                            UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_MANDATORY), true);
 
-    /* Now we want to inherit all the mandatory children for LampGreen and don't care about the node ids.
-     * These will be automatically generated. This will internally call the _begin and _finish methods */
+    /* Now we want to inherit all the mandatory children for LampGreen and don't
+     * care about the node ids. These will be automatically generated. This will
+     * internally call the _begin and _finish methods */
 
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
     oAttr.description = UA_LOCALIZEDTEXT("en-US", "A green lamp");
@@ -211,11 +208,11 @@ static void createCustomInheritance(UA_Server *server) {
                             UA_QUALIFIEDNAME(1, "LampGreen"), UA_NODEID_NUMERIC(1, 30000),
                             oAttr, NULL, NULL);
 
-    /* For the red lamp we want to set the node ID of the IsOn child manually, thus we need to use
-     * the _begin method, add the child and then _finish: */
+    /* For the red lamp we want to set the node ID of the IsOn child manually,
+     * thus we need to use the _begin method, add the child and then _finish: */
 
-    /* The call to UA_Server_addNode_begin will create the node and its parent references,
-     * but it will not instantiate the mandatory children */
+    /* The call to UA_Server_addNode_begin will create the node and its parent
+     * references, but it will not instantiate the mandatory children */
     oAttr = UA_ObjectAttributes_default;
     oAttr.description = UA_LOCALIZEDTEXT("en-US", "A red lamp");
     oAttr.displayName = UA_LOCALIZEDTEXT("en-US", "LampRed");
@@ -225,8 +222,8 @@ static void createCustomInheritance(UA_Server *server) {
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                             UA_QUALIFIEDNAME(1, "LampRed"),
                             UA_NODEID_NUMERIC(1, 30000),
-                            (const UA_NodeAttributes*)&oAttr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
-                            NULL, NULL);
+                            (const UA_NodeAttributes*)&oAttr,
+                            &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, NULL);
 
     /* Now we can add the IsOn with our own node ID */
     vAttr = UA_VariableAttributes_default;
@@ -237,28 +234,24 @@ static void createCustomInheritance(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 30101),
                               UA_NODEID_NUMERIC(1, 30100),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                              UA_QUALIFIEDNAME(1, "IsOn"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              UA_QUALIFIEDNAME(1, "IsOn"),
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               vAttr, NULL, NULL);
 
-    /* And then we need to call the UA_Server_addNode_finish which adds all the remaining
-     * children and does some further initialization. It will not add the IsNode child,
-     * since a child with the same browse name already exists */
+    /* And then we need to call the UA_Server_addNode_finish which adds all the
+     * remaining children and does some further initialization. It will not add
+     * the IsNode child, since a child with the same browse name already
+     * exists */
     UA_Server_addNode_finish(server, UA_NODEID_NUMERIC(1, 30100));
 }
 
 int main(void) {
-    signal(SIGINT,  stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     createMammals(server);
-
     createCustomInheritance(server);
 
-    /* Run the server */
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/server_mainloop.c b/examples/server_mainloop.c
index 81c5f23412f..d698abc441d 100644
--- a/examples/server_mainloop.c
+++ b/examples/server_mainloop.c
@@ -5,7 +5,6 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
 
 #include <signal.h>
 
@@ -16,14 +15,13 @@ static void stopHandler(int sign) {
 }
 
 /* In this example, we integrate the server into an external "mainloop". This
-   can be for example the event-loop used in GUI toolkits, such as Qt or GTK. */
+ * can be for example the event-loop used in GUI toolkits, such as Qt or GTK. */
 
 int main(int argc, char** argv) {
     signal(SIGINT, stopHandler);
     signal(SIGTERM, stopHandler);
 
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     /* Should the server networklayer block (with a timeout) until a message
        arrives or should it return immediately? */
diff --git a/examples/tutorial_server_alarms_conditions.c b/examples/tutorial_server_alarms_conditions.c
index d5a9d42853f..3f8d4e769fb 100644
--- a/examples/tutorial_server_alarms_conditions.c
+++ b/examples/tutorial_server_alarms_conditions.c
@@ -3,10 +3,6 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
 
 /**
  * Using Alarms and Conditions Server
@@ -550,23 +546,12 @@ setUpEnvironment(UA_Server *server) {
 /**
  * It follows the main server code, making use of the above definitions. */
 
-static UA_Boolean running = true;
-static void stopHandler(int sig) {
-    running = false;
-}
-
 int main (void) {
-    /* default server values */
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
-    UA_StatusCode retval = setUpEnvironment(server);
+    setUpEnvironment(server);
 
-    if(retval == UA_STATUSCODE_GOOD)
-        retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/tutorial_server_datasource.c b/examples/tutorial_server_datasource.c
index 2bf55d84ed7..e7d6cd067b4 100644
--- a/examples/tutorial_server_datasource.c
+++ b/examples/tutorial_server_datasource.c
@@ -27,10 +27,6 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
 
 static void
 updateCurrentTime(UA_Server *server) {
@@ -166,26 +162,15 @@ addCurrentTimeExternalDataSource(UA_Server *server) {
 
 /** It follows the main server code, making use of the above definitions. */
 
-static volatile UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     addCurrentTimeVariable(server);
     addValueCallbackToCurrentTimeVariable(server);
     addCurrentTimeDataSourceVariable(server);
-
     addCurrentTimeExternalDataSource(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/tutorial_server_events.c b/examples/tutorial_server_events.c
index 9b1090e3055..4c1b0e5e303 100644
--- a/examples/tutorial_server_events.c
+++ b/examples/tutorial_server_events.c
@@ -3,17 +3,15 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
 
 /**
  * Generating events
  * -----------------
- * To make sense of the many things going on in a server, monitoring items can be useful. Though in many cases, data
- * change does not convey enough information to be the optimal solution. Events can be generated at any time,
- * hold a lot of information and can be filtered so the client only receives the specific attributes of interest.
+ * To make sense of the many things going on in a server, monitoring items can
+ * be useful. Though in many cases, data change does not convey enough
+ * information to be the optimal solution. Events can be generated at any time,
+ * hold a lot of information and can be filtered so the client only receives the
+ * specific attributes of interest.
  *
  * Emitting events by calling methods
  * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -41,13 +39,17 @@ addNewEventType(UA_Server *server) {
 /**
  * Setting up an event
  * ^^^^^^^^^^^^^^^^^^^
- * In order to set up the event, we can first use ``UA_Server_createEvent`` to give us a node representation of the event.
- * All we need for this is our `EventType`. Once we have our event node, which is saved internally as an `ObjectNode`,
- * we can define the attributes the event has the same way we would define the attributes of an object node. It is not
- * necessary to define the attributes `EventId`, `ReceiveTime`, `SourceNode` or `EventType` since these are set
- * automatically by the server. In this example, we will be setting the fields 'Message' and 'Severity' in addition
- * to `Time` which is needed to make the example UaExpert compliant.
+ * In order to set up the event, we can first use ``UA_Server_createEvent`` to
+ * give us a node representation of the event. All we need for this is our
+ * `EventType`. Once we have our event node, which is saved internally as an
+ * `ObjectNode`, we can define the attributes the event has the same way we
+ * would define the attributes of an object node. It is not necessary to define
+ * the attributes `EventId`, `ReceiveTime`, `SourceNode` or `EventType` since
+ * these are set automatically by the server. In this example, we will be
+ * setting the fields 'Message' and 'Severity' in addition to `Time` which is
+ * needed to make the example UaExpert compliant.
  */
+
 static UA_StatusCode
 setUpEvent(UA_Server *server, UA_NodeId *outId) {
     UA_StatusCode retval = UA_Server_createEvent(server, eventType, outId);
@@ -81,10 +83,13 @@ setUpEvent(UA_Server *server, UA_NodeId *outId) {
 /**
  * Triggering an event
  * ^^^^^^^^^^^^^^^^^^^
- * First a node representing an event is generated using ``setUpEvent``. Once our event is good to go, we specify
- * a node which emits the event - in this case the server node. We can use ``UA_Server_triggerEvent`` to trigger our
- * event onto said node. Passing ``NULL`` as the second-last argument means we will not receive the `EventId`.
- * The last boolean argument states whether the node should be deleted. */
+ * First a node representing an event is generated using ``setUpEvent``. Once
+ * our event is good to go, we specify a node which emits the event - in this
+ * case the server node. We can use ``UA_Server_triggerEvent`` to trigger our
+ * event onto said node. Passing ``NULL`` as the second-last argument means we
+ * will not receive the `EventId`. The last boolean argument states whether the
+ * node should be deleted. */
+
 static UA_StatusCode
 generateEventMethodCallback(UA_Server *server,
                          const UA_NodeId *sessionId, void *sessionHandle,
@@ -115,9 +120,11 @@ generateEventMethodCallback(UA_Server *server,
 }
 
 /**
- * Now, all that is left to do is to create a method node which uses our callback. We do not
- * require any input and as output we will be using the `EventId` we receive from ``triggerEvent``. The `EventId` is
- * generated by the server internally and is a random unique ID which identifies that specific event.
+ * Now, all that is left to do is to create a method node which uses our
+ * callback. We do not require any input and as output we will be using the
+ * `EventId` we receive from ``triggerEvent``. The `EventId` is generated by the
+ * server internally and is a random unique ID which identifies that specific
+ * event.
  *
  * This method node will be added to a basic server setup.
  */
@@ -139,23 +146,13 @@ addGenerateEventMethod(UA_Server *server) {
 
 /** It follows the main server code, making use of the above definitions. */
 
-static volatile UA_Boolean running = true;
-static void stopHandler(int sig) {
-    running = false;
-}
-
-int main (void) {
-    /* default server values */
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
+int main(void) {
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     addNewEventType(server);
     addGenerateEventMethod(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/tutorial_server_firststeps.c b/examples/tutorial_server_firststeps.c
index 085c62113e5..4a561a814e7 100644
--- a/examples/tutorial_server_firststeps.c
+++ b/examples/tutorial_server_firststeps.c
@@ -21,14 +21,10 @@
  * C source-file called ``myServer.c`` with the following content: */
 
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
 
 int main(void) {
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
-
     UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
@@ -39,13 +35,13 @@ int main(void) {
  *
  * .. code-block:: bash
  *
- *    $ gcc -std=c99 open62541.c myServer.c -o myServer
+ *    $ gcc -std=c99 myServer.c -lopen62541 -o myServer
  *
  * In a MinGW environment, the Winsock library must be added.
  *
  * .. code-block:: bash
  *
- *    $ gcc -std=c99 open62541.c myServer.c -lws2_32 -o myServer.exe
+ *    $ gcc -std=c99 myServer.c -lopen62541 -lws2_32 -o myServer.exe
  *
  * Now start the server (stop with ctrl-c):
  *
@@ -55,8 +51,8 @@ int main(void) {
  *
  * You have now compiled and run your first OPC UA server. You can go ahead and
  * browse the information model with client. The server is listening on
- * ``opc.tcp://localhost:4840``. In the next two sections, we will continue to
- * explain the different parts of the code in detail.
+ * ``opc.tcp://localhost:4840``.
+ *
  *
  * Server Configuration and Plugins
  * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -80,23 +76,12 @@ int main(void) {
  * The code in this example shows the three parts for server lifecycle
  * management: Creating a server, running the server, and deleting the server.
  * Creating and deleting a server is trivial once the configuration is set up.
- * The server is started with ``UA_Server_run``. Internally, the server then
- * uses timeouts to schedule regular tasks. Between the timeouts, the server
- * listens on the network layer for incoming messages.
- *
- * You might ask how the server knows when to stop running. For this, we have
- * created a global variable ``running``. Furthermore, we have registered the
- * method ``stopHandler`` that catches the signal (interrupt) the program
- * receives when the operating systems tries to close it. This happens for
- * example when you press ctrl-c in a terminal program. The signal handler then
- * sets the variable ``running`` to false and the server shuts down once it
- * takes back control.
+ * The server is started with ``UA_Server_run``. Internally, the server
+ * schedules regular tasks. Between the timeouts, the server listens on the
+ * network layer for incoming messages.
  *
  * In order to integrate OPC UA in a single-threaded application with its own
  * mainloop (for example provided by a GUI toolkit), one can alternatively drive
  * the server manually. See the section of the server documentation on
  * :ref:`server-lifecycle` for details.
- *
- * The server configuration and lifecycle management is needed for all servers.
- * We will use it in the following tutorials without further comment.
  */
diff --git a/examples/tutorial_server_historicaldata.c b/examples/tutorial_server_historicaldata.c
index 26c89457f74..4b5e56cc306 100644
--- a/examples/tutorial_server_historicaldata.c
+++ b/examples/tutorial_server_historicaldata.c
@@ -10,25 +10,10 @@
 #include <open62541/plugin/historydatabase.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
-
-static volatile UA_Boolean running = true;
-static void stopHandler(int sign) {
-    (void)sign;
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
 
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
 
     /* We need a gathering for the plugin to constuct.
      * The UA_HistoryDataGathering is responsible to collect data and store it to the database.
@@ -49,7 +34,8 @@ int main(void) {
     attr.dataType = UA_TYPES[UA_TYPES_UINT32].typeId;
     /* We set the access level to also support history read
      * This is what will be reported to clients */
-    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD;
+    attr.accessLevel =
+        UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD;
     /* We also set this node to historizing, so the server internals also know from it. */
     attr.historizing = true;
 
@@ -60,15 +46,11 @@ int main(void) {
     UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
     UA_NodeId outNodeId;
     UA_NodeId_init(&outNodeId);
-    UA_StatusCode retval = UA_Server_addVariableNode(server,
-                                                     uint32NodeId,
-                                                     parentNodeId,
-                                                     parentReferenceNodeId,
-                                                     uint32Name,
-                                                     UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                                     attr,
-                                                     NULL,
-                                                     &outNodeId);
+    UA_StatusCode retval =
+        UA_Server_addVariableNode(server, uint32NodeId, parentNodeId,
+                                  parentReferenceNodeId, uint32Name,
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                  attr, NULL, &outNodeId);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                 "UA_Server_addVariableNode %s", UA_StatusCode_name(retval));
@@ -111,15 +93,17 @@ int main(void) {
 
     /* At the end we register the node for gathering data in the database. */
     retval = gathering.registerNodeId(server, gathering.context, &outNodeId, setting);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "registerNodeId %s", UA_StatusCode_name(retval));
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                "registerNodeId %s", UA_StatusCode_name(retval));
 
     /* If you use UA_HISTORIZINGUPDATESTRATEGY_POLL, then start the polling.
      *
     retval = gathering.startPoll(server, gathering.context, &outNodeId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "startPoll %s", UA_StatusCode_name(retval));
     */
-    retval = UA_Server_run(server, &running);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "UA_Server_run %s", UA_StatusCode_name(retval));
+    retval = UA_Server_runUntilInterrupt(server);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                "UA_Server_run %s", UA_StatusCode_name(retval));
     /*
      * If you use UA_HISTORIZINGUPDATESTRATEGY_POLL, then stop the polling.
      *
diff --git a/examples/tutorial_server_historicaldata_circular.c b/examples/tutorial_server_historicaldata_circular.c
index bc61f8327f0..1bc52b3fb82 100644
--- a/examples/tutorial_server_historicaldata_circular.c
+++ b/examples/tutorial_server_historicaldata_circular.c
@@ -11,25 +11,10 @@
 #include <open62541/plugin/historydatabase.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
-
-static volatile UA_Boolean running = true;
-static void stopHandler(int sign) {
-    (void)sign;
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
 
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
 
     /* We need a gathering for the plugin to constuct.
      * The UA_HistoryDataGathering is responsible to collect data and store it to the database.
@@ -50,7 +35,8 @@ int main(void) {
     attr.dataType = UA_TYPES[UA_TYPES_UINT32].typeId;
     /* We set the access level to also support history read
      * This is what will be reported to clients */
-    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD;
+    attr.accessLevel =
+        UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD;
     /* We also set this node to historizing, so the server internals also know from it. */
     attr.historizing = true;
 
@@ -61,15 +47,11 @@ int main(void) {
     UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
     UA_NodeId outNodeId;
     UA_NodeId_init(&outNodeId);
-    UA_StatusCode retval = UA_Server_addVariableNode(server,
-                                                     uint32NodeId,
-                                                     parentNodeId,
-                                                     parentReferenceNodeId,
-                                                     uint32Name,
-                                                     UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                                     attr,
-                                                     NULL,
-                                                     &outNodeId);
+    UA_StatusCode retval =
+        UA_Server_addVariableNode(server, uint32NodeId, parentNodeId,
+                                  parentReferenceNodeId, uint32Name,
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                  attr, NULL, &outNodeId);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                 "UA_Server_addVariableNode %s", UA_StatusCode_name(retval));
@@ -112,15 +94,17 @@ int main(void) {
 
     /* At the end we register the node for gathering data in the database. */
     retval = gathering.registerNodeId(server, gathering.context, &outNodeId, setting);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "registerNodeId %s", UA_StatusCode_name(retval));
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                "registerNodeId %s", UA_StatusCode_name(retval));
 
     /* If you use UA_HISTORIZINGUPDATESTRATEGY_POLL, then start the polling.
      *
     retval = gathering.startPoll(server, gathering.context, &outNodeId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "startPoll %s", UA_StatusCode_name(retval));
     */
-    retval = UA_Server_run(server, &running);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "UA_Server_run %s", UA_StatusCode_name(retval));
+    retval = UA_Server_runUntilInterrupt(server);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                "UA_Server_run %s", UA_StatusCode_name(retval));
     /*
      * If you use UA_HISTORIZINGUPDATESTRATEGY_POLL, then stop the polling.
      *
diff --git a/examples/tutorial_server_method.c b/examples/tutorial_server_method.c
index 9a9d96988f3..37e10a3dfac 100644
--- a/examples/tutorial_server_method.c
+++ b/examples/tutorial_server_method.c
@@ -33,10 +33,6 @@
 #include <open62541/client_config_default.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
 
 static UA_StatusCode
 helloWorldMethodCallback(UA_Server *server,
@@ -164,23 +160,13 @@ addIncInt32ArrayMethod(UA_Server *server) {
 
 /** It follows the main server code, making use of the above definitions. */
 
-static volatile UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     addHelloWorldMethod(server);
     addIncInt32ArrayMethod(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/tutorial_server_method_async.c b/examples/tutorial_server_method_async.c
index 691d6579933..399544baba2 100644
--- a/examples/tutorial_server_method_async.c
+++ b/examples/tutorial_server_method_async.c
@@ -33,10 +33,6 @@
 #include <open62541/client_config_default.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
 
 #ifndef WIN32
 #include <pthread.h>
@@ -55,11 +51,6 @@
 static UA_Server* globalServer;
 static volatile UA_Boolean running = true;
 
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 static UA_StatusCode
 helloWorldMethodCallback1(UA_Server *server,
                          const UA_NodeId *sessionId, void *sessionHandle,
@@ -199,19 +190,14 @@ THREAD_CALLBACK(ThreadWorker) {
 /* This callback will be called when a new entry is added to the Callrequest queue */
 static void
 TestCallback(UA_Server *server) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "Dispatched an async method");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Dispatched an async method");
 }
 
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     globalServer = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(globalServer);
-    UA_ServerConfig_setDefault(config);
 
     /* Set the NotifyCallback */
+    UA_ServerConfig *config = UA_Server_getConfig(globalServer);
     config->asyncOperationNotifyCallback = TestCallback;
 
     /* Start the Worker-Thread */
@@ -222,7 +208,7 @@ int main(void) {
     addHelloWorldMethod1(globalServer);
 	addHelloWorldMethod2(globalServer);
 
-    UA_StatusCode retval = UA_Server_run(globalServer, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(globalServer);
 
     /* Shutdown the thread */
     THREAD_JOIN(hThread);
diff --git a/examples/tutorial_server_monitoreditems.c b/examples/tutorial_server_monitoreditems.c
index 8914913250e..0a3f7b1b1e2 100644
--- a/examples/tutorial_server_monitoreditems.c
+++ b/examples/tutorial_server_monitoreditems.c
@@ -22,10 +22,6 @@
 #include <open62541/client_subscriptions.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
 
 static void
 dataChangeNotificationCallback(UA_Server *server, UA_UInt32 monitoredItemId,
@@ -48,22 +44,12 @@ addMonitoredItemToCurrentTimeVariable(UA_Server *server) {
 
 /** It follows the main server code, making use of the above definitions. */
 
-static volatile UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     addMonitoredItemToCurrentTimeVariable(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
 
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/tutorial_server_object.c b/examples/tutorial_server_object.c
index 7874870f0d5..84738dbbaeb 100644
--- a/examples/tutorial_server_object.c
+++ b/examples/tutorial_server_object.c
@@ -1,6 +1,9 @@
 /* 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 <open62541/plugin/log_stdout.h>
+#include <open62541/server.h>
+
 /**
  * Working with Objects and Object Types
  * -------------------------------------
@@ -55,12 +58,6 @@
  * setting constraints on the variable values as this is not the focus of this
  * tutorial and was already covered. */
 
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-
 static void
 manuallyDefinePump(UA_Server *server) {
     UA_NodeId pumpId; /* get the nodeid assigned by the server */
@@ -69,7 +66,8 @@ manuallyDefinePump(UA_Server *server) {
     UA_Server_addObjectNode(server, UA_NODEID_NULL,
                             UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                            UA_QUALIFIEDNAME(1, "Pump (Manual)"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
+                            UA_QUALIFIEDNAME(1, "Pump (Manual)"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
                             oAttr, NULL, &pumpId);
 
     UA_VariableAttributes mnAttr = UA_VariableAttributes_default;
@@ -79,7 +77,8 @@ manuallyDefinePump(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NULL, pumpId,
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                               UA_QUALIFIEDNAME(1, "ManufacturerName"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), mnAttr, NULL, NULL);
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              mnAttr, NULL, NULL);
 
     UA_VariableAttributes modelAttr = UA_VariableAttributes_default;
     UA_String modelName = UA_STRING("Mega Pump 3000");
@@ -88,7 +87,8 @@ manuallyDefinePump(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NULL, pumpId,
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                               UA_QUALIFIEDNAME(1, "ModelName"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), modelAttr, NULL, NULL);
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              modelAttr, NULL, NULL);
 
     UA_VariableAttributes statusAttr = UA_VariableAttributes_default;
     UA_Boolean status = true;
@@ -97,7 +97,8 @@ manuallyDefinePump(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NULL, pumpId,
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                               UA_QUALIFIEDNAME(1, "Status"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), statusAttr, NULL, NULL);
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              statusAttr, NULL, NULL);
 
     UA_VariableAttributes rpmAttr = UA_VariableAttributes_default;
     UA_Double rpm = 50.0;
@@ -106,7 +107,8 @@ manuallyDefinePump(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NULL, pumpId,
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                               UA_QUALIFIEDNAME(1, "MotorRPMs"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), rpmAttr, NULL, NULL);
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              rpmAttr, NULL, NULL);
 }
 
 /**
@@ -186,7 +188,8 @@ defineObjectTypes(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NULL, deviceTypeId,
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                               UA_QUALIFIEDNAME(1, "ManufacturerName"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), mnAttr, NULL, &manufacturerNameId);
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              mnAttr, NULL, &manufacturerNameId);
     /* Make the manufacturer name mandatory */
     UA_Server_addReference(server, manufacturerNameId,
                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE),
@@ -198,7 +201,8 @@ defineObjectTypes(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NULL, deviceTypeId,
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                               UA_QUALIFIEDNAME(1, "ModelName"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), modelAttr, NULL, NULL);
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              modelAttr, NULL, NULL);
 
     /* Define the object type for "Pump" */
     UA_ObjectTypeAttributes ptAttr = UA_ObjectTypeAttributes_default;
@@ -215,7 +219,8 @@ defineObjectTypes(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NULL, pumpTypeId,
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                               UA_QUALIFIEDNAME(1, "Status"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), statusAttr, NULL, &statusId);
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              statusAttr, NULL, &statusId);
     /* Make the status variable mandatory */
     UA_Server_addReference(server, statusId,
                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE),
@@ -227,7 +232,8 @@ defineObjectTypes(UA_Server *server) {
     UA_Server_addVariableNode(server, UA_NODEID_NULL, pumpTypeId,
                               UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                               UA_QUALIFIEDNAME(1, "MotorRPMs"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), rpmAttr, NULL, NULL);
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              rpmAttr, NULL, NULL);
 }
 
 /**
@@ -308,18 +314,8 @@ addPumpTypeConstructor(UA_Server *server) {
 
 /** It follows the main server code, making use of the above definitions. */
 
-static volatile UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     manuallyDefinePump(server);
     defineObjectTypes(server);
@@ -329,7 +325,7 @@ int main(void) {
     addPumpObjectInstance(server, "pump4");
     addPumpObjectInstance(server, "pump5");
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/tutorial_server_reverseconnect.c b/examples/tutorial_server_reverseconnect.c
index f4d4b5a565a..042e64a346c 100644
--- a/examples/tutorial_server_reverseconnect.c
+++ b/examples/tutorial_server_reverseconnect.c
@@ -3,16 +3,6 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
-
-static volatile UA_Boolean running = true;
-static void stopHandler(int sig) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "received ctrl-c");
-    running = false;
-}
 
 static void reverseConnectStateCallback(UA_Server *server, UA_UInt64 handle,
                                         UA_SecureChannelState state, void *context) {
@@ -23,11 +13,7 @@ static void reverseConnectStateCallback(UA_Server *server, UA_UInt64 handle,
 
 
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     /*UA_Server_run_startup(server); */
 
@@ -50,7 +36,7 @@ int main(void) {
 
     UA_Server_run_shutdown(server);*/
 
-    UA_Server_run(server, &running);
+    UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/tutorial_server_variable.c b/examples/tutorial_server_variable.c
index 5f371750867..d0f006af659 100644
--- a/examples/tutorial_server_variable.c
+++ b/examples/tutorial_server_variable.c
@@ -16,10 +16,6 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
 
 static void
 addVariable(UA_Server *server) {
@@ -128,30 +124,15 @@ writeWrongVariable(UA_Server *server) {
 
 /** It follows the main server code, making use of the above definitions. */
 
-static volatile UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
-    UA_ServerConfig* config = UA_Server_getConfig(server);
-    config->verifyRequestTimestamp = UA_RULEHANDLING_ACCEPT;
-#ifdef UA_ENABLE_WEBSOCKET_SERVER
-    UA_ServerConfig_addNetworkLayerWS(UA_Server_getConfig(server), 7681, 0, 0, NULL, NULL);
-#endif
 
     addVariable(server);
     addMatrixVariable(server);
     writeVariable(server);
     writeWrongVariable(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/examples/tutorial_server_variabletype.c b/examples/tutorial_server_variabletype.c
index 9402c7aa1fa..53708b87b05 100644
--- a/examples/tutorial_server_variabletype.c
+++ b/examples/tutorial_server_variabletype.c
@@ -20,10 +20,6 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
 
 static UA_NodeId pointTypeId;
 
@@ -108,34 +104,25 @@ addVariableFail(UA_Server *server) {
 
 static void
 writeVariable(UA_Server *server) {
-    UA_StatusCode retval = UA_Server_writeValueRank(server, pointVariableId, UA_VALUERANK_ONE_OR_MORE_DIMENSIONS);
+    UA_StatusCode retval =
+        UA_Server_writeValueRank(server, pointVariableId,
+                                 UA_VALUERANK_ONE_OR_MORE_DIMENSIONS);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                 "Setting the Value Rank failed with Status Code %s",
                 UA_StatusCode_name(retval));
-
 }
 
 /** It follows the main server code, making use of the above definitions. */
 
-static volatile UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     addVariableType2DPoint(server);
     addVariable(server);
     addVariableFail(server);
     writeVariable(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;

From 0632a1d6c265faa7160a610fb9ce5068aec76d62 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 21:43:24 +0100
Subject: [PATCH 0694/1963] refactor(server): Use cyclic callback instead of
 dedicated thread for multicast discovery

---
 src/server/ua_discovery_manager.h            |   9 +-
 src/server/ua_server.c                       |  13 --
 src/server/ua_services_discovery_multicast.c | 135 ++++++-------------
 3 files changed, 39 insertions(+), 118 deletions(-)

diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index 2a1e36576be..eb920e43994 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -100,10 +100,7 @@ typedef struct {
     UA_Server_serverOnNetworkCallback serverOnNetworkCallback;
     void *serverOnNetworkCallbackData;
 
-#if UA_MULTITHREADING >= 100
-    pthread_t mdnsThread;
-    UA_Boolean mdnsRunning;
-#  endif
+    UA_UInt64 mdnsCallbackId;
 # endif /* UA_ENABLE_DISCOVERY_MULTICAST */
 } UA_DiscoveryManager;
 
@@ -147,10 +144,6 @@ mdns_find_record(mdns_daemon_t *mdnsDaemon, unsigned short type,
 void startMulticastDiscoveryServer(UA_Server *server);
 void stopMulticastDiscoveryServer(UA_Server *server);
 
-UA_StatusCode
-iterateMulticastDiscoveryServer(UA_Server *server, UA_DateTime *nextRepeat,
-                                UA_Boolean processIn);
-
 UA_StatusCode
 UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord,
                                                const char *serverName, size_t serverNameLen,
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 426690f5839..918719f588a 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -281,19 +281,6 @@ serverPolling(UA_Server *server, void *_) {
         }
     }
 #endif
-
-#if defined(UA_ENABLE_DISCOVERY_MULTICAST) && (UA_MULTITHREADING < 200)
-    UA_LOCK(&server->serviceMutex);
-    if(server->config.mdnsEnabled) {
-        /* TODO multicastNextRepeat does not consider new input data (requests)
-         * on the socket. It will be handled on the next call. if needed, we
-         * need to use select with timeout on the multicast socket
-         * server->mdnsSocket (see example in mdnsd library) on higher level. */
-        UA_DateTime multicastNextRepeat = 0;
-        iterateMulticastDiscoveryServer(server, &multicastNextRepeat, true);
-    }
-    UA_UNLOCK(&server->serviceMutex);
-#endif
 }
 
 /********************/
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index c889acee3ee..eccd36505e1 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -45,69 +45,28 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
 static int
 discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg);
 
-#if UA_MULTITHREADING >= 100
-
-static void *
-multicastWorkerLoop(UA_Server *server) {
+static void
+multicastPolling(UA_Server *server, void *_) {
     struct timeval next_sleep = {.tv_sec = 0, .tv_usec = 0};
-    volatile UA_Boolean *running = &server->discoveryManager.mdnsRunning;
     fd_set fds;
-
-    while(*running) {
-        FD_ZERO(&fds);
-        UA_fd_set(server->discoveryManager.mdnsSocket, &fds);
-        select(server->discoveryManager.mdnsSocket + 1, &fds, 0, 0, &next_sleep);
-
-        if(!*running)
-            break;
-
-        unsigned short retVal =
-            mdnsd_step(server->discoveryManager.mdnsDaemon, server->discoveryManager.mdnsSocket,
-                       FD_ISSET(server->discoveryManager.mdnsSocket, &fds), true, &next_sleep);
-        if(retVal == 1) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                          "Multicast error: Can not read from socket. %s", errno_str));
-            break;
-        } else if (retVal == 2) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                         "Multicast error: Can not write to socket. %s", errno_str));
-            break;
+    FD_ZERO(&fds);
+    UA_fd_set(server->discoveryManager.mdnsSocket, &fds);
+    select(server->discoveryManager.mdnsSocket + 1, &fds, 0, 0, &next_sleep);
+
+    unsigned short retVal =
+        mdnsd_step(server->discoveryManager.mdnsDaemon, server->discoveryManager.mdnsSocket,
+                   FD_ISSET(server->discoveryManager.mdnsSocket, &fds), true, &next_sleep);
+    if(retVal == 1) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                        "Multicast error: Can not read from socket. %s", errno_str));
+    } else if (retVal == 2) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                        "Multicast error: Can not write to socket. %s", errno_str));
         }
-    }
-    return NULL;
 }
 
-static UA_StatusCode
-multicastListenStart(UA_Server* server) {
-    int err = pthread_create(&server->discoveryManager.mdnsThread, NULL,
-                             (void* (*)(void*))multicastWorkerLoop, server);
-    if(err != 0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                     "Multicast error: Can not create multicast thread.");
-        return UA_STATUSCODE_BADUNEXPECTEDERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-multicastListenStop(UA_Server* server) {
-    mdnsd_shutdown(server->discoveryManager.mdnsDaemon);
-    // wake up select
-    if (write(server->discoveryManager.mdnsSocket, "\0", 1)) {
-        // TODO: if makes no sense here?
-    }  // TODO: move to arch?
-    if (pthread_join(server->discoveryManager.mdnsThread, NULL)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                     "Multicast error: Can not stop thread.");
-        return UA_STATUSCODE_BADUNEXPECTEDERROR;
-    }
-    return UA_STATUSCODE_BADNOTIMPLEMENTED;
-}
-
-# endif /* UA_MULTITHREADING */
-
 static UA_StatusCode
 addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
                              const UA_String *discoveryUrl) {
@@ -136,7 +95,8 @@ addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
     return UA_STATUSCODE_GOOD;
 }
 
-void startMulticastDiscoveryServer(UA_Server *server) {
+void
+startMulticastDiscoveryServer(UA_Server *server) {
     UA_String *appName = &server->config.mdnsConfig.mdnsServerName;
     for(size_t i = 0; i < server->config.serverUrlsSize; i++)
         addMdnsRecordForNetworkLayer(server, appName, &server->config.serverUrls[i]);
@@ -146,16 +106,20 @@ void startMulticastDiscoveryServer(UA_Server *server) {
     mdnsd_query(server->discoveryManager.mdnsDaemon, "_opcua-tcp._tcp.local.",
                 QTYPE_PTR,discovery_multicastQueryAnswer, server);
 
-#if UA_MULTITHREADING >= 100
-    multicastListenStart(server);
-# endif
+    /* Start the cyclic polling callback */
+    if(server->discoveryManager.mdnsCallbackId == 0) {
+        UA_EventLoop *el = server->config.eventLoop;
+        if(el) {
+            el->addCyclicCallback(el, (UA_Callback)multicastPolling,
+                                  server, NULL, 200, NULL,
+                                  UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                  &server->discoveryManager.mdnsCallbackId);
+        }
+    }
 }
 
 void
 stopMulticastDiscoveryServer(UA_Server *server) {
-    if(!server->discoveryManager.mdnsDaemon)
-        return;
-
     for(size_t i = 0; i < server->config.serverUrlsSize; i++) {
         UA_String hostname = UA_STRING_NULL;
         UA_String path = UA_STRING_NULL;
@@ -172,12 +136,15 @@ stopMulticastDiscoveryServer(UA_Server *server) {
                                   &hostname, port, true);
     }
 
-#if UA_MULTITHREADING >= 100
-    multicastListenStop(server);
-# else
-    // send out last package with TTL = 0
-    iterateMulticastDiscoveryServer(server, NULL, false);
-# endif
+    /* Stop the cyclic polling callback */
+    if(server->discoveryManager.mdnsCallbackId != 0) {
+        UA_EventLoop *el = server->config.eventLoop;
+        if(el) {
+            el->removeCyclicCallback(el, server->discoveryManager.mdnsCallbackId);
+            server->discoveryManager.mdnsCallbackId = 0;
+        }
+    }
+    mdnsd_shutdown(server->discoveryManager.mdnsDaemon);
 }
 
 /* All filter criteria must be fulfilled in the list entry. The comparison is case
@@ -610,30 +577,4 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
-iterateMulticastDiscoveryServer(UA_Server* server, UA_DateTime *nextRepeat,
-                                UA_Boolean processIn) {
-    struct timeval next_sleep = { 0, 0 };
-    unsigned short retval = mdnsd_step(server->discoveryManager.mdnsDaemon,
-                                       (int)server->discoveryManager.mdnsSocket,
-                                       processIn, true, &next_sleep);
-    if(retval == 1) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-               UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                     "Multicast error: Can not read from socket. %s", errno_str));
-        return UA_STATUSCODE_BADNOCOMMUNICATION;
-    } else if(retval == 2) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                     "Multicast error: Can not write to socket. %s", errno_str));
-        return UA_STATUSCODE_BADNOCOMMUNICATION;
-    }
-
-    if(nextRepeat)
-        *nextRepeat = UA_DateTime_now() +
-            (UA_DateTime)((next_sleep.tv_sec * UA_DATETIME_SEC) +
-                          (next_sleep.tv_usec * UA_DATETIME_USEC));
-    return UA_STATUSCODE_GOOD;
-}
-
 #endif /* defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST) */

From 0565b1a4b10c731f3d2ad7171a9c0e7e7614296f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 22:24:13 +0100
Subject: [PATCH 0695/1963] refactor(server): Cosmetic cleanups in
 ua_services_discovery_multicast.c

---
 src/server/ua_services_discovery_multicast.c | 206 +++++++++++--------
 1 file changed, 115 insertions(+), 91 deletions(-)

diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index eccd36505e1..fb148b652d7 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -54,13 +54,15 @@ multicastPolling(UA_Server *server, void *_) {
     select(server->discoveryManager.mdnsSocket + 1, &fds, 0, 0, &next_sleep);
 
     unsigned short retVal =
-        mdnsd_step(server->discoveryManager.mdnsDaemon, server->discoveryManager.mdnsSocket,
-                   FD_ISSET(server->discoveryManager.mdnsSocket, &fds), true, &next_sleep);
+        mdnsd_step(server->discoveryManager.mdnsDaemon,
+                   server->discoveryManager.mdnsSocket,
+                   FD_ISSET(server->discoveryManager.mdnsSocket, &fds),
+                   true, &next_sleep);
     if(retVal == 1) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                         "Multicast error: Can not read from socket. %s", errno_str));
-    } else if (retVal == 2) {
+    } else if(retVal == 2) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                         "Multicast error: Can not write to socket. %s", errno_str));
@@ -73,8 +75,8 @@ addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
     UA_String hostname = UA_STRING_NULL;
     UA_UInt16 port = 4840;
     UA_String path = UA_STRING_NULL;
-    UA_StatusCode retval = UA_parseEndpointUrl(discoveryUrl, &hostname,
-                                               &port, &path);
+    UA_StatusCode retval =
+        UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Server url is invalid: %.*s",
@@ -132,7 +134,8 @@ stopMulticastDiscoveryServer(UA_Server *server) {
         if(retval != UA_STATUSCODE_GOOD || hostname.length == 0)
             continue;
 
-        UA_Discovery_removeRecord(server, &server->config.mdnsConfig.mdnsServerName,
+        UA_Discovery_removeRecord(server,
+                                  &server->config.mdnsConfig.mdnsServerName,
                                   &hostname, port, true);
     }
 
@@ -147,15 +150,14 @@ stopMulticastDiscoveryServer(UA_Server *server) {
     mdnsd_shutdown(server->discoveryManager.mdnsDaemon);
 }
 
-/* All filter criteria must be fulfilled in the list entry. The comparison is case
- * insensitive.
- * @returns true if the entry matches the filter. False if the filter does not match.
- * */
+/* All filter criteria must be fulfilled in the list entry. The comparison is
+ * case insensitive. Returns true if the entry matches the filter. */
 static UA_Boolean
-entryMatchesCapabilityFilter(size_t serverCapabilityFilterSize, UA_String *serverCapabilityFilter,
-                   serverOnNetwork_list_entry* current) {
-    // if the entry has less capabilities defined than the filter, there's no match
-    if (serverCapabilityFilterSize > current->serverOnNetwork.serverCapabilitiesSize)
+entryMatchesCapabilityFilter(size_t serverCapabilityFilterSize,
+                             UA_String *serverCapabilityFilter,
+                             serverOnNetwork_list_entry* current) {
+    /* If the entry has less capabilities defined than the filter, there's no match */
+    if(serverCapabilityFilterSize > current->serverOnNetwork.serverCapabilitiesSize)
         return false;
     for(size_t i = 0; i < serverCapabilityFilterSize; i++) {
         UA_Boolean capabilityFound = false;
@@ -166,25 +168,26 @@ entryMatchesCapabilityFilter(size_t serverCapabilityFilterSize, UA_String *serve
                 break;
             }
         }
-        if (!capabilityFound)
-            return false; // entry does not match capability
+        if(!capabilityFound)
+            return false;
     }
     return true;
 }
 
-void Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
-                                  const UA_FindServersOnNetworkRequest *request,
-                                  UA_FindServersOnNetworkResponse *response) {
+void
+Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
+                             const UA_FindServersOnNetworkRequest *request,
+                             UA_FindServersOnNetworkResponse *response) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    if (!server->config.mdnsEnabled) {
+    if(!server->config.mdnsEnabled) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTIMPLEMENTED;
         return;
     }
 
     /* Set LastCounterResetTime */
-    UA_DateTime_copy(&server->discoveryManager.serverOnNetworkRecordIdLastReset,
-                     &response->lastCounterResetTime);
+    response->lastCounterResetTime =
+        server->discoveryManager.serverOnNetworkRecordIdLastReset;
 
     /* Compute the max number of records to return */
     UA_UInt32 recordCount = 0;
@@ -217,8 +220,8 @@ void Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
         return;
 
     /* Allocate the array for the response */
-    response->servers =
-        (UA_ServerOnNetwork*)UA_malloc(sizeof(UA_ServerOnNetwork)*filteredCount);
+    response->servers = (UA_ServerOnNetwork*)
+        UA_malloc(sizeof(UA_ServerOnNetwork)*filteredCount);
     if(!response->servers) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
         return;
@@ -238,7 +241,8 @@ UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverNa
     UA_String hostname = UA_STRING_NULL;
     UA_UInt16 port = 4840;
     UA_String path = UA_STRING_NULL;
-    UA_StatusCode retval = UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
+    UA_StatusCode retval =
+        UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Server url invalid: %.*s",
@@ -287,7 +291,10 @@ UA_Server_setServerOnNetworkCallback(UA_Server *server,
 
 static void
 UA_Discovery_multicastConflict(char *name, int type, void *arg) {
-    // cppcheck-suppress unreadVariable
+    /* In case logging is disabled */
+    (void)name;
+    (void)type;
+
     UA_Server *server = (UA_Server*) arg;
     UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                  "Multicast DNS name conflict detected: "
@@ -315,18 +322,17 @@ createFullServiceDomain(char *outServiceDomain, size_t maxLen,
     }
 
     size_t offset = 0;
-    if (hostnameLen > 0) {
+    if(hostnameLen > 0) {
         UA_snprintf(outServiceDomain, maxLen + 1, "%.*s-%.*s",
                     (int) servernameLen, (char *) servername->data,
                     (int) hostnameLen, (char *) hostname->data);
         offset = servernameLen + hostnameLen + 1;
         //replace all dots with minus. Otherwise mDNS is not valid
-        for (size_t i=servernameLen+1; i<offset; i++) {
-            if (outServiceDomain[i] == '.')
+        for(size_t i=servernameLen+1; i<offset; i++) {
+            if(outServiceDomain[i] == '.')
                 outServiceDomain[i] = '-';
         }
-    }
-    else {
+    } else {
         UA_snprintf(outServiceDomain, maxLen + 1, "%.*s",
                     (int) servernameLen, (char *) servername->data);
         offset = servernameLen;
@@ -339,7 +345,8 @@ static UA_Boolean
 UA_Discovery_recordExists(UA_Server* server, const char* fullServiceDomain,
                           unsigned short port, const UA_DiscoveryProtocol protocol) {
     // [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname].
-    mdns_record_t *r  = mdnsd_get_published(server->discoveryManager.mdnsDaemon, fullServiceDomain);
+    mdns_record_t *r  =
+        mdnsd_get_published(server->discoveryManager.mdnsDaemon, fullServiceDomain);
     while(r) {
         const mdns_answer_t *data = mdnsd_record_data(r);
         if(data->type == QTYPE_SRV && (port == 0 || data->srv.port == port))
@@ -384,9 +391,9 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
                        UA_Boolean createTxt, const UA_String* capabilites,
                        const size_t capabilitiesSize,
                        UA_Boolean isSelf) {
-    // we assume that the hostname is not an IP address, but a valid domain name
-    // It is required by the OPC UA spec (see Part 12, DiscoveryURL to DNS SRV mapping)
-    // to always use the hostname instead of the IP address
+    /* We assume that the hostname is not an IP address, but a valid domain
+     * name. It is required by the OPC UA spec (see Part 12, DiscoveryURL to DNS
+     * SRV mapping) to always use the hostname instead of the IP address. */
 
     if(capabilitiesSize > 0 && !capabilites)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -396,9 +403,9 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     if(hostnameLen == 0 || servernameLen == 0)
         return UA_STATUSCODE_BADOUTOFRANGE;
 
-    // use a limit for the hostname length to make sure full string fits into 63
-    // chars (limited by DNS spec)
-    if(hostnameLen+servernameLen + 1 > 63) { // include dash between servername-hostname
+    /* Use a limit for the hostname length to make sure full string fits into 63
+     * chars (limited by DNS spec) */
+    if(hostnameLen+servernameLen + 1 > 63) { /* include dash between servername-hostname */
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: Combination of hostname+servername exceeds "
                        "maximum of 62 chars. It will be truncated.");
@@ -410,76 +417,88 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
 
     if(!server->discoveryManager.mdnsMainSrvAdded) {
         mdns_record_t *r =
-            mdnsd_shared(server->discoveryManager.mdnsDaemon, "_services._dns-sd._udp.local.",
+            mdnsd_shared(server->discoveryManager.mdnsDaemon,
+                         "_services._dns-sd._udp.local.",
                          QTYPE_PTR, 600);
-        mdnsd_set_host(server->discoveryManager.mdnsDaemon, r, "_opcua-tcp._tcp.local.");
+        mdnsd_set_host(server->discoveryManager.mdnsDaemon,
+                       r, "_opcua-tcp._tcp.local.");
         server->discoveryManager.mdnsMainSrvAdded = true;
     }
 
-    // [servername]-[hostname]._opcua-tcp._tcp.local.
+    /* [servername]-[hostname]._opcua-tcp._tcp.local. */
     char fullServiceDomain[63+24];
     createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
 
-    UA_Boolean exists = UA_Discovery_recordExists(server, fullServiceDomain, port, protocol);
+    UA_Boolean exists = UA_Discovery_recordExists(server, fullServiceDomain,
+                                                  port, protocol);
     if(exists == true)
         return UA_STATUSCODE_GOOD;
 
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                 "Multicast DNS: add record for domain: %s", fullServiceDomain);
 
-
-    if (isSelf && server->discoveryManager.selfFqdnMdnsRecord.length == 0) {
+    if(isSelf && server->discoveryManager.selfFqdnMdnsRecord.length == 0) {
         server->discoveryManager.selfFqdnMdnsRecord = UA_STRING_ALLOC(fullServiceDomain);
-        if (!server->discoveryManager.selfFqdnMdnsRecord.data)
+        if(!server->discoveryManager.selfFqdnMdnsRecord.data)
             return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
-
     struct serverOnNetwork_list_entry *listEntry;
-    // The servername is servername + hostname. It is the same which we get through mDNS and therefore we need to match servername
-    UA_StatusCode retval = UA_DiscoveryManager_addEntryToServersOnNetwork(server, fullServiceDomain, fullServiceDomain,
-            UA_MIN(63, (servernameLen+hostnameLen)+1), &listEntry);
-    if (retval != UA_STATUSCODE_GOOD && retval != UA_STATUSCODE_BADALREADYEXISTS)
+    /* The servername is servername + hostname. It is the same which we get
+     * through mDNS and therefore we need to match servername */
+    UA_StatusCode retval =
+        UA_DiscoveryManager_addEntryToServersOnNetwork(server, fullServiceDomain,
+                                                       fullServiceDomain,
+                                                       UA_MIN(63, (servernameLen+hostnameLen)+1),
+                                                       &listEntry);
+    if(retval != UA_STATUSCODE_GOOD &&
+       retval != UA_STATUSCODE_BADALREADYEXISTS)
         return retval;
 
-    // If entry is already in list, skip initialization of capabilities and txt+srv
-    if (retval != UA_STATUSCODE_BADALREADYEXISTS) {
-        // if capabilitiesSize is 0, then add default cap 'NA'
+    /* If entry is already in list, skip initialization of capabilities and txt+srv */
+    if(retval != UA_STATUSCODE_BADALREADYEXISTS) {
+        /* if capabilitiesSize is 0, then add default cap 'NA' */
         listEntry->serverOnNetwork.serverCapabilitiesSize = UA_MAX(1, capabilitiesSize);
-        listEntry->serverOnNetwork.serverCapabilities =
-                (UA_String *) UA_Array_new(listEntry->serverOnNetwork.serverCapabilitiesSize, &UA_TYPES[UA_TYPES_STRING]);
-        if (!listEntry->serverOnNetwork.serverCapabilities)
+        listEntry->serverOnNetwork.serverCapabilities = (UA_String *)
+            UA_Array_new(listEntry->serverOnNetwork.serverCapabilitiesSize,
+                         &UA_TYPES[UA_TYPES_STRING]);
+        if(!listEntry->serverOnNetwork.serverCapabilities)
             return UA_STATUSCODE_BADOUTOFMEMORY;
-        if (capabilitiesSize == 0) {
+        if(capabilitiesSize == 0) {
             UA_String na;
             na.length = 2;
             na.data = (UA_Byte *) (uintptr_t) "NA";
             UA_String_copy(&na, &listEntry->serverOnNetwork.serverCapabilities[0]);
         } else {
-            for (size_t i = 0; i < capabilitiesSize; i++) {
-                UA_String_copy(&capabilites[i], &listEntry->serverOnNetwork.serverCapabilities[i]);
-            }
+            for(size_t i = 0; i < capabilitiesSize; i++)
+                UA_String_copy(&capabilites[i],
+                               &listEntry->serverOnNetwork.serverCapabilities[i]);
         }
 
         listEntry->txtSet = true;
 
         UA_STACKARRAY(char, newUrl, 10 + hostnameLen + 8 + path->length + 1);
-        UA_snprintf(newUrl, 10 + hostnameLen + 8 + path->length + 1, "opc.tcp://%.*s:%d%s%.*s", (int) hostnameLen,
-                    hostname->data, port, path->length > 0 ? "/" : "", (int) path->length, path->data);
+        UA_snprintf(newUrl, 10 + hostnameLen + 8 + path->length + 1,
+                    "opc.tcp://%.*s:%d%s%.*s", (int) hostnameLen,
+                    hostname->data, port, path->length > 0 ? "/" : "",
+                    (int) path->length, path->data);
         listEntry->serverOnNetwork.discoveryUrl = UA_String_fromChars(newUrl);
         listEntry->srvSet = true;
     }
 
-    // _services._dns-sd._udp.local. PTR _opcua-tcp._tcp.local
+    /* _services._dns-sd._udp.local. PTR _opcua-tcp._tcp.local */
 
-    // check if there is already a PTR entry for the given service.
+    /* check if there is already a PTR entry for the given service. */
 
-    // _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local.
-    mdns_record_t *r = mdns_find_record(server->discoveryManager.mdnsDaemon, QTYPE_PTR,
-                                        "_opcua-tcp._tcp.local.", fullServiceDomain);
+    /* _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local. */
+    mdns_record_t *r =
+        mdns_find_record(server->discoveryManager.mdnsDaemon, QTYPE_PTR,
+                         "_opcua-tcp._tcp.local.", fullServiceDomain);
     if(!r) {
-        r = mdnsd_shared(server->discoveryManager.mdnsDaemon, "_opcua-tcp._tcp.local.", QTYPE_PTR, 600);
-        mdnsd_set_host(server->discoveryManager.mdnsDaemon, r, fullServiceDomain);
+        r = mdnsd_shared(server->discoveryManager.mdnsDaemon,
+                         "_opcua-tcp._tcp.local.", QTYPE_PTR, 600);
+        mdnsd_set_host(server->discoveryManager.mdnsDaemon,
+                       r, fullServiceDomain);
     }
 
     /* The first 63 characters of the hostname (or less) */
@@ -489,17 +508,17 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     localDomain[maxHostnameLen] = '.';
     localDomain[maxHostnameLen+1] = '\0';
 
-    // [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname].
-    r = mdnsd_unique(server->discoveryManager.mdnsDaemon, fullServiceDomain, QTYPE_SRV, 600,
-                     UA_Discovery_multicastConflict, server);
+    /* [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname]. */
+    r = mdnsd_unique(server->discoveryManager.mdnsDaemon, fullServiceDomain,
+                     QTYPE_SRV, 600, UA_Discovery_multicastConflict, server);
     mdnsd_set_srv(server->discoveryManager.mdnsDaemon, r, 0, 0, port, localDomain);
 
-    // A/AAAA record for all ip addresses.
-    // [servername]-[hostname]._opcua-tcp._tcp.local. A [ip].
-    // [hostname]. A [ip].
+    /* A/AAAA record for all ip addresses.
+     * [servername]-[hostname]._opcua-tcp._tcp.local. A [ip].
+     * [hostname]. A [ip]. */
     mdns_set_address_record(server, fullServiceDomain, localDomain);
 
-    // TXT record: [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,...
+    /* TXT record: [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,... */
     UA_STACKARRAY(char, pathChars, path->length + 1);
     if(createTxt) {
         if(path->length > 0)
@@ -516,34 +535,37 @@ static UA_StatusCode
 UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
                           const UA_String *hostname, UA_UInt16 port,
                           UA_Boolean removeTxt) {
-    // use a limit for the hostname length to make sure full string fits into 63
-    // chars (limited by DNS spec)
+    /* use a limit for the hostname length to make sure full string fits into 63
+     * chars (limited by DNS spec) */
     size_t hostnameLen = hostname->length;
     size_t servernameLen = servername->length;
     if(hostnameLen == 0 || servernameLen == 0)
         return UA_STATUSCODE_BADOUTOFRANGE;
 
-    if(hostnameLen+servernameLen+1 > 63) { // include dash between servername-hostname
+    if(hostnameLen+servernameLen+1 > 63) { /* include dash between servername-hostname */
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: Combination of hostname+servername exceeds "
                        "maximum of 62 chars. It will be truncated.");
     }
 
-    // [servername]-[hostname]._opcua-tcp._tcp.local.
+    /* [servername]-[hostname]._opcua-tcp._tcp.local. */
     char fullServiceDomain[63 + 24];
     createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
 
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                "Multicast DNS: remove record for domain: %s", fullServiceDomain);
+                "Multicast DNS: remove record for domain: %s",
+                fullServiceDomain);
 
-    UA_StatusCode retval = UA_DiscoveryManager_removeEntryFromServersOnNetwork(
-            server, fullServiceDomain, fullServiceDomain, UA_MIN(63, (servernameLen+hostnameLen)+1));
-    if (retval != UA_STATUSCODE_GOOD)
+    UA_StatusCode retval =
+        UA_DiscoveryManager_removeEntryFromServersOnNetwork(server, fullServiceDomain,
+                   fullServiceDomain, UA_MIN(63, (servernameLen+hostnameLen)+1));
+    if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    // _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local.
-    mdns_record_t *r = mdns_find_record(server->discoveryManager.mdnsDaemon, QTYPE_PTR,
-                                        "_opcua-tcp._tcp.local.", fullServiceDomain);
+    /* _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local. */
+    mdns_record_t *r =
+        mdns_find_record(server->discoveryManager.mdnsDaemon, QTYPE_PTR,
+                         "_opcua-tcp._tcp.local.", fullServiceDomain);
     if(!r) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: could not remove record. "
@@ -552,10 +574,12 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
     }
     mdnsd_done(server->discoveryManager.mdnsDaemon, r);
 
-    // looks for [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port hostname.local.
-    // and TXT record: [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,...
-    // and A record: [servername]-[hostname]._opcua-tcp._tcp.local. A [ip]
-    mdns_record_t *r2 = mdnsd_get_published(server->discoveryManager.mdnsDaemon, fullServiceDomain);
+    /* looks for [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5
+     * port hostname.local. and TXT record:
+     * [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,...
+     * and A record: [servername]-[hostname]._opcua-tcp._tcp.local. A [ip] */
+    mdns_record_t *r2 =
+        mdnsd_get_published(server->discoveryManager.mdnsDaemon, fullServiceDomain);
     if(!r2) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: could not remove record. Record not "

From ca29ec17c8e1a19c57a21129c4721cff1d6d885f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 22:25:16 +0100
Subject: [PATCH 0696/1963] refactor(server): Simplify mdns discovery setup and
 shutdown

---
 src/server/ua_discovery_manager.c            | 125 -----------------
 src/server/ua_services_discovery_multicast.c | 134 +++++++++++++++++--
 2 files changed, 126 insertions(+), 133 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index 332a6315c57..f38fc11e790 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -15,125 +15,6 @@
 
 #ifdef UA_ENABLE_DISCOVERY
 
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-
-#ifndef IN_ZERONET
-#define IN_ZERONET(addr) ((addr & IN_CLASSA_NET) == 0)
-#endif
-
-/* Create multicast 224.0.0.251:5353 socket */
-static UA_SOCKET
-discovery_createMulticastSocket(UA_Server* server) {
-    int flag = 1, ittl = 255;
-    struct sockaddr_in in;
-    struct ip_mreq mc;
-    char ttl = (char)255; // publish to complete net, not only subnet. See:
-                          // https://docs.oracle.com/cd/E23824_01/html/821-1602/sockets-137.html
-
-    memset(&in, 0, sizeof(in));
-    in.sin_family = AF_INET;
-    in.sin_port = htons(5353);
-    in.sin_addr.s_addr = 0;
-
-    UA_SOCKET s = UA_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if(s == UA_INVALID_SOCKET)
-        return UA_INVALID_SOCKET;
-
-#ifdef SO_REUSEPORT
-    UA_setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (char *)&flag, sizeof(flag));
-#endif
-    UA_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&flag, sizeof(flag));
-    if(UA_bind(s, (struct sockaddr *)&in, sizeof(in))) {
-        UA_close(s);
-        return UA_INVALID_SOCKET;
-    }
-
-    /* Custom outbound multicast interface */
-    size_t length = server->config.mdnsInterfaceIP.length;
-    if(length > 0){
-        char* interfaceName = (char*)UA_malloc(length+1);
-        if(!interfaceName) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                         "Multicast DNS: cannot alloc memory for iface name");
-            return 0;
-        }
-        struct in_addr ina;
-        memset(&ina, 0, sizeof(ina));
-        memcpy(interfaceName, server->config.mdnsInterfaceIP.data, length);
-        interfaceName[length] = '\0';
-        inet_pton(AF_INET, interfaceName, &ina);
-        UA_free(interfaceName);
-        /* Set interface for outbound multicast */
-        if(setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&ina, sizeof(ina)) < 0)
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                         "Multicast DNS: failed setting IP_MULTICAST_IF to %s: %s",
-                         inet_ntoa(ina), strerror(errno));
-    }
-
-    /* Check outbound multicast interface parameters */
-    struct in_addr interface_addr;
-    socklen_t addr_size = sizeof(struct in_addr);
-    if(getsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&interface_addr, &addr_size) <  0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                     "Multicast DNS: getsockopt(IP_MULTICAST_IF) failed");
-    }
-
-    if(IN_ZERONET(ntohl(interface_addr.s_addr))){
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                       "Multicast DNS: outbound interface 0.0.0.0, it means that "
-                       "the first OS interface is used (you can explicitly set the "
-                       "interface by using 'discovery.mdnsInterfaceIP' config parameter)");
-    } else {
-        char buf[16];
-        inet_ntop(AF_INET, &interface_addr, buf, 16);
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                    "Multicast DNS: outbound interface is %s", buf);
-    }
-
-    mc.imr_multiaddr.s_addr = inet_addr("224.0.0.251");
-    mc.imr_interface.s_addr = htonl(INADDR_ANY);
-    UA_setsockopt(s, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&mc, sizeof(mc));
-    UA_setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(ttl));
-    UA_setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ittl, sizeof(ittl));
-
-    UA_socket_set_nonblocking(s); //TODO: check return value
-    return s;
-}
-
-static UA_StatusCode
-initMulticastDiscoveryServer(UA_DiscoveryManager *dm, UA_Server* server) {
-    server->discoveryManager.mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
-    UA_initialize_architecture_network();
-
-    server->discoveryManager.mdnsSocket = discovery_createMulticastSocket(server);
-    if(server->discoveryManager.mdnsSocket == UA_INVALID_SOCKET) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                             "Could not create multicast socket. Error: %d - %s",
-                             errno, errno_str));
-        return UA_STATUSCODE_BADUNEXPECTEDERROR;
-    }
-    mdnsd_register_receive_callback(server->discoveryManager.mdnsDaemon,
-                                    mdns_record_received, server);
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-destroyMulticastDiscoveryServer(UA_DiscoveryManager *dm) {
-    if(!dm->mdnsDaemon)
-        return;
-
-    mdnsd_shutdown(dm->mdnsDaemon);
-    mdnsd_free(dm->mdnsDaemon);
-
-    if(dm->mdnsSocket != UA_INVALID_SOCKET) {
-        UA_close(dm->mdnsSocket);
-        dm->mdnsSocket = UA_INVALID_SOCKET;
-    }
-}
-
-#endif /* UA_ENABLE_DISCOVERY_MULTICAST */
-
 void
 UA_DiscoveryManager_init(UA_DiscoveryManager *dm, UA_Server *server) {
     LIST_INIT(&dm->registeredServers);
@@ -146,9 +27,6 @@ UA_DiscoveryManager_init(UA_DiscoveryManager *dm, UA_Server *server) {
     dm->mdnsDaemon = NULL;
     dm->mdnsSocket = UA_INVALID_SOCKET;
     dm->mdnsMainSrvAdded = false;
-    if(server->config.mdnsEnabled)
-        initMulticastDiscoveryServer(dm, server);
-
     dm->selfFqdnMdnsRecord = UA_STRING_NULL;
 
     LIST_INIT(&dm->serverOnNetwork);
@@ -180,9 +58,6 @@ UA_DiscoveryManager_clear(UA_DiscoveryManager *dm, UA_Server *server) {
     }
 
 # ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    if(server->config.mdnsEnabled)
-        destroyMulticastDiscoveryServer(dm);
-
     serverOnNetwork_list_entry *son, *son_tmp;
     LIST_FOREACH_SAFE(son, &dm->serverOnNetwork, pointers, son_tmp) {
         LIST_REMOVE(son, pointers);
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index fb148b652d7..9e171d1ef9a 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -97,25 +97,130 @@ addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
     return UA_STATUSCODE_GOOD;
 }
 
+#ifndef IN_ZERONET
+#define IN_ZERONET(addr) ((addr & IN_CLASSA_NET) == 0)
+#endif
+
+/* Create multicast 224.0.0.251:5353 socket */
+static UA_SOCKET
+discovery_createMulticastSocket(UA_Server* server) {
+    int flag = 1, ittl = 255;
+    struct sockaddr_in in;
+    struct ip_mreq mc;
+    char ttl = (char)255; // publish to complete net, not only subnet. See:
+                          // https://docs.oracle.com/cd/E23824_01/html/821-1602/sockets-137.html
+
+    memset(&in, 0, sizeof(in));
+    in.sin_family = AF_INET;
+    in.sin_port = htons(5353);
+    in.sin_addr.s_addr = 0;
+
+    UA_SOCKET s = UA_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if(s == UA_INVALID_SOCKET)
+        return UA_INVALID_SOCKET;
+
+#ifdef SO_REUSEPORT
+    UA_setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (char *)&flag, sizeof(flag));
+#endif
+    UA_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&flag, sizeof(flag));
+    if(UA_bind(s, (struct sockaddr *)&in, sizeof(in))) {
+        UA_close(s);
+        return UA_INVALID_SOCKET;
+    }
+
+    /* Custom outbound multicast interface */
+    size_t length = server->config.mdnsInterfaceIP.length;
+    if(length > 0){
+        char* interfaceName = (char*)UA_malloc(length+1);
+        if(!interfaceName) {
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                         "Multicast DNS: cannot alloc memory for iface name");
+            return 0;
+        }
+        struct in_addr ina;
+        memset(&ina, 0, sizeof(ina));
+        memcpy(interfaceName, server->config.mdnsInterfaceIP.data, length);
+        interfaceName[length] = '\0';
+        inet_pton(AF_INET, interfaceName, &ina);
+        UA_free(interfaceName);
+        /* Set interface for outbound multicast */
+        if(setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&ina, sizeof(ina)) < 0)
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                         "Multicast DNS: failed setting IP_MULTICAST_IF to %s: %s",
+                         inet_ntoa(ina), strerror(errno));
+    }
+
+    /* Check outbound multicast interface parameters */
+    struct in_addr interface_addr;
+    socklen_t addr_size = sizeof(struct in_addr);
+    if(getsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&interface_addr, &addr_size) <  0) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                     "Multicast DNS: getsockopt(IP_MULTICAST_IF) failed");
+    }
+
+    if(IN_ZERONET(ntohl(interface_addr.s_addr))) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                       "Multicast DNS: outbound interface 0.0.0.0, it means that "
+                       "the first OS interface is used (you can explicitly set the "
+                       "interface by using 'discovery.mdnsInterfaceIP' config parameter)");
+    } else {
+        char buf[16];
+        inet_ntop(AF_INET, &interface_addr, buf, 16);
+        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                    "Multicast DNS: outbound interface is %s", buf);
+    }
+
+    mc.imr_multiaddr.s_addr = inet_addr("224.0.0.251");
+    mc.imr_interface.s_addr = htonl(INADDR_ANY);
+    UA_setsockopt(s, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&mc, sizeof(mc));
+    UA_setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(ttl));
+    UA_setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ittl, sizeof(ittl));
+
+    UA_socket_set_nonblocking(s); //TODO: check return value
+    return s;
+}
+
 void
 startMulticastDiscoveryServer(UA_Server *server) {
+    /* Initialize the mdns daemon */
+    UA_DiscoveryManager *dm = &server->discoveryManager;
+    if(!dm->mdnsDaemon) {
+        server->discoveryManager.mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
+        mdnsd_register_receive_callback(dm->mdnsDaemon,
+                                        mdns_record_received, server);
+    }
+
+    /* Open the mdns listen socket */
+    UA_initialize_architecture_network();
+    if(dm->mdnsSocket == UA_INVALID_SOCKET)
+        dm->mdnsSocket = discovery_createMulticastSocket(server);
+    if(dm->mdnsSocket == UA_INVALID_SOCKET) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                             "Could not create multicast socket. Error: %d - %s",
+                             errno, errno_str));
+        return;
+    }
+
+    /* Add record for the server itself */
     UA_String *appName = &server->config.mdnsConfig.mdnsServerName;
     for(size_t i = 0; i < server->config.serverUrlsSize; i++)
-        addMdnsRecordForNetworkLayer(server, appName, &server->config.serverUrls[i]);
+        addMdnsRecordForNetworkLayer(server, appName,
+                                     &server->config.serverUrls[i]);
 
     /* Send a multicast probe to find any other OPC UA server on the network
      * through mDNS */
-    mdnsd_query(server->discoveryManager.mdnsDaemon, "_opcua-tcp._tcp.local.",
+    mdnsd_query(dm->mdnsDaemon, "_opcua-tcp._tcp.local.",
                 QTYPE_PTR,discovery_multicastQueryAnswer, server);
 
     /* Start the cyclic polling callback */
-    if(server->discoveryManager.mdnsCallbackId == 0) {
+    if(dm->mdnsCallbackId == 0) {
         UA_EventLoop *el = server->config.eventLoop;
         if(el) {
             el->addCyclicCallback(el, (UA_Callback)multicastPolling,
                                   server, NULL, 200, NULL,
                                   UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-                                  &server->discoveryManager.mdnsCallbackId);
+                                  &dm->mdnsCallbackId);
         }
     }
 }
@@ -140,14 +245,27 @@ stopMulticastDiscoveryServer(UA_Server *server) {
     }
 
     /* Stop the cyclic polling callback */
-    if(server->discoveryManager.mdnsCallbackId != 0) {
+    UA_DiscoveryManager *dm = &server->discoveryManager;
+    if(dm->mdnsCallbackId != 0) {
         UA_EventLoop *el = server->config.eventLoop;
         if(el) {
-            el->removeCyclicCallback(el, server->discoveryManager.mdnsCallbackId);
-            server->discoveryManager.mdnsCallbackId = 0;
+            el->removeCyclicCallback(el, dm->mdnsCallbackId);
+            dm->mdnsCallbackId = 0;
         }
     }
-    mdnsd_shutdown(server->discoveryManager.mdnsDaemon);
+
+    /* Clean up mdns daemon */
+    if(dm->mdnsDaemon) {
+        mdnsd_shutdown(dm->mdnsDaemon);
+        mdnsd_free(dm->mdnsDaemon);
+        dm->mdnsDaemon = NULL;
+    }
+
+    /* Close the socket */
+    if(dm->mdnsSocket != UA_INVALID_SOCKET) {
+        UA_close(dm->mdnsSocket);
+        dm->mdnsSocket = UA_INVALID_SOCKET;
+    }
 }
 
 /* All filter criteria must be fulfilled in the list entry. The comparison is

From 643d6ea8181cf73731fd8f0fdf14b164e8b83686 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Jan 2023 23:30:49 +0100
Subject: [PATCH 0697/1963] fix(plugin): Prevent adding duplicate Endpoints

---
 plugins/ua_config_default.c | 114 +++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 60 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 2a9992d1fcb..9ee13f87a3c 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -159,35 +159,62 @@ const UA_ConnectionConfig UA_ConnectionConfig_default = {
     STRINGIFY(MAJOR) "." STRINGIFY(MINOR) "." STRINGIFY(PATCH) LABEL
 
 static UA_StatusCode
-createEndpoint(UA_ServerConfig *conf, UA_EndpointDescription *endpoint,
-               const UA_SecurityPolicy *securityPolicy,
-               UA_MessageSecurityMode securityMode) {
+addEndpoint(UA_ServerConfig *conf,
+            const UA_SecurityPolicy *securityPolicy,
+            UA_MessageSecurityMode securityMode) {
+    /* Test if the endpoint already exists */
+    for(size_t i = 0; i < conf->endpointsSize; i++) {
+        UA_EndpointDescription *ep = &conf->endpoints[i];
+        if(!UA_String_equal(&securityPolicy->policyUri, &ep->securityPolicyUri))
+            continue;
+        if(ep->securityMode != securityMode)
+            continue;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Reallocate the array size */
+    UA_EndpointDescription *tmp = (UA_EndpointDescription *)
+        UA_realloc(conf->endpoints,
+                   sizeof(UA_EndpointDescription) * (1 + conf->endpointsSize));
+    if(!tmp)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    conf->endpoints = tmp;
+
+    UA_EndpointDescription *endpoint = &conf->endpoints[conf->endpointsSize];
     UA_EndpointDescription_init(endpoint);
 
+    /* Add security level value for the corresponding message security mode */
     endpoint->securityMode = securityMode;
-    UA_String_copy(&securityPolicy->policyUri, &endpoint->securityPolicyUri);
+    endpoint->securityLevel = (UA_Byte)securityMode;
+
+    /* Enable all login mechanisms from the access control plugin  */
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    retval |= UA_Array_copy(conf->accessControl.userTokenPolicies,
+                            conf->accessControl.userTokenPoliciesSize,
+                            (void **)&endpoint->userIdentityTokens,
+                            &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+    if(retval == UA_STATUSCODE_GOOD)
+        endpoint->userIdentityTokensSize = conf->accessControl.userTokenPoliciesSize;
+
+    retval |= UA_String_copy(&securityPolicy->policyUri, &endpoint->securityPolicyUri);
     endpoint->transportProfileUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
+    retval |= UA_String_copy(&securityPolicy->localCertificate,
+                             &endpoint->serverCertificate);
+    retval |= UA_ApplicationDescription_copy(&conf->applicationDescription,
+                                             &endpoint->server);
 
-    /* Add security level value for the corresponding message security mode */
-    endpoint->securityLevel = (UA_Byte) securityMode;
-
-    /* Enable all login mechanisms from the access control plugin  */
-    UA_StatusCode retval = UA_Array_copy(conf->accessControl.userTokenPolicies,
-                                         conf->accessControl.userTokenPoliciesSize,
-                                         (void **)&endpoint->userIdentityTokens,
-                                         &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
-    if(retval != UA_STATUSCODE_GOOD){
-        UA_String_clear(&endpoint->securityPolicyUri);
-        UA_String_clear(&endpoint->transportProfileUri);
-        return retval;
+    if(retval == UA_STATUSCODE_GOOD) {
+        conf->endpointsSize++;
+    } else {
+        UA_EndpointDescription_clear(endpoint);
+        if(conf->endpointsSize == 0) {
+            UA_free(conf->endpoints);
+            conf->endpoints = NULL;
+        }
     }
-    endpoint->userIdentityTokensSize = conf->accessControl.userTokenPoliciesSize;
-
-    UA_String_copy(&securityPolicy->localCertificate, &endpoint->serverCertificate);
-    UA_ApplicationDescription_copy(&conf->applicationDescription, &endpoint->server);
 
-    return UA_STATUSCODE_GOOD;
+    return retval;
 }
 
 static const size_t usernamePasswordsSize = 2;
@@ -490,15 +517,6 @@ UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config,
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_addEndpoint(UA_ServerConfig *config, const UA_String securityPolicyUri,
                             UA_MessageSecurityMode securityMode) {
-    /* Allocate the endpoint */
-    UA_EndpointDescription *tmp = (UA_EndpointDescription *)
-        UA_realloc(config->endpoints,
-                   sizeof(UA_EndpointDescription) * (1 + config->endpointsSize));
-    if(!tmp) {
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    config->endpoints = tmp;
-
     /* Lookup the security policy */
     const UA_SecurityPolicy *policy = NULL;
     for (size_t i = 0; i < config->securityPoliciesSize; ++i) {
@@ -507,55 +525,31 @@ UA_ServerConfig_addEndpoint(UA_ServerConfig *config, const UA_String securityPol
             break;
         }
     }
-    if (!policy)
+    if(!policy)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     /* Populate the endpoint */
-    UA_StatusCode retval =
-        createEndpoint(config, &config->endpoints[config->endpointsSize],
-                       policy, securityMode);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-    config->endpointsSize++;
-
-    return UA_STATUSCODE_GOOD;
+    return addEndpoint(config, policy, securityMode);
 }
 
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_addAllEndpoints(UA_ServerConfig *config) {
-    /* Allocate the endpoints */
-    UA_EndpointDescription * tmp = (UA_EndpointDescription *)
-        UA_realloc(config->endpoints,
-                   sizeof(UA_EndpointDescription) *
-                   (2 * config->securityPoliciesSize + config->endpointsSize));
-    if(!tmp) {
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    config->endpoints = tmp;
-
     /* Populate the endpoints */
     for(size_t i = 0; i < config->securityPoliciesSize; ++i) {
         if(UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &config->securityPolicies[i].policyUri)) {
             UA_StatusCode retval =
-                createEndpoint(config, &config->endpoints[config->endpointsSize],
-                               &config->securityPolicies[i], UA_MESSAGESECURITYMODE_NONE);
+                addEndpoint(config, &config->securityPolicies[i], UA_MESSAGESECURITYMODE_NONE);
             if(retval != UA_STATUSCODE_GOOD)
                 return retval;
-            config->endpointsSize++;
         } else {
             UA_StatusCode retval =
-                createEndpoint(config, &config->endpoints[config->endpointsSize],
-                               &config->securityPolicies[i], UA_MESSAGESECURITYMODE_SIGN);
+                addEndpoint(config, &config->securityPolicies[i], UA_MESSAGESECURITYMODE_SIGN);
             if(retval != UA_STATUSCODE_GOOD)
                 return retval;
-            config->endpointsSize++;
-
-            retval = createEndpoint(config, &config->endpoints[config->endpointsSize],
-                                    &config->securityPolicies[i],
-                                    UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
+            retval = addEndpoint(config, &config->securityPolicies[i],
+                                 UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
             if(retval != UA_STATUSCODE_GOOD)
                 return retval;
-            config->endpointsSize++;
         }
     }
 

From f4db84ae8b0a267a4a2be6ebe445d9832640e583 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 15 Jan 2023 12:25:01 +0100
Subject: [PATCH 0698/1963] fix(plugin): Fix a conversion warning in
 ua_log_syslog.c

---
 plugins/ua_log_syslog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ua_log_syslog.c b/plugins/ua_log_syslog.c
index a3d2391ec3c..e39b0d372f7 100644
--- a/plugins/ua_log_syslog.c
+++ b/plugins/ua_log_syslog.c
@@ -85,7 +85,7 @@ UA_Log_Syslog(void) {
 
 UA_Logger
 UA_Log_Syslog_withLevel(UA_LogLevel minlevel) {
-    UA_Logger logger = {UA_Log_Syslog_log, (void*)minlevel, UA_Log_Syslog_clear};
+    UA_Logger logger = {UA_Log_Syslog_log, (void*)(uintptr_t)minlevel, UA_Log_Syslog_clear};
     return logger;
 }
 

From 02ae614c723751eb848ba1de2ec00349e526128b Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Mon, 16 Jan 2023 07:34:56 +0100
Subject: [PATCH 0699/1963] feat(server): fix documentation of
 UA_ServerConfig_setBasics

Since commit 86c20068e3ff92d9a1601bfbc5d9c5c4e530f517 the function
setDefaultConfig (and thus also UA_ServerConfig_setBasics) initializes
the event loop, if not already set.
Document this new behaviour.
---
 plugins/include/open62541/server_config_default.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index 5e4f266d507..7069b56dad2 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -81,11 +81,13 @@ UA_ServerConfig_setDefault(UA_ServerConfig *config) {
     return UA_ServerConfig_setMinimal(config, 4840, NULL);
 }
 
-/* Creates a new server config with no network layer and no endpoints.
+/* Creates a new server config with no security policies and no endpoints.
  *
  * It initializes reasonable defaults for many things, but does not
- * add any network layer, security policies and endpoints.
+ * add any security policies and endpoints.
  * Use the various UA_ServerConfig_addXxx functions to add them.
+ * The config will set the tcp network layer to the default port 4840 if the
+ * eventloop is not already set.
  *
  * @param conf The configuration to manipulate
  */

From e48d819026c5129de1e1bbeb45703a741260a7d5 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Mon, 16 Jan 2023 07:37:56 +0100
Subject: [PATCH 0700/1963] refactor(server): Remove unneeded forward
 declaration

Forward declaration of setDefaultConfig is not needed any more
---
 plugins/ua_config_default.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 9ee13f87a3c..0067f16b470 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -40,9 +40,6 @@ UA_DURATIONRANGE(UA_Duration min, UA_Duration max) {
     return range;
 }
 
-static UA_StatusCode
-setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber);
-
 UA_Server *
 UA_Server_new(void) {
     UA_ServerConfig config;

From 2abcba1a0037185d6cc3219b97a2fd798163ca8c Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Mon, 16 Jan 2023 07:38:55 +0100
Subject: [PATCH 0701/1963] feat(server): Provide function for setting port
 with basic config

In the version 1.3 the port was settable after calling UA_ServerConfig_setBasics
with the function UA_ServerConfig_addNetworkLayerTCP.
This function has been removed with commit
86c20068e3ff92d9a1601bfbc5d9c5c4e530f517, so provide a new function
UA_ServerConfig_setBasics_withPort to set the port.
---
 plugins/include/open62541/server_config_default.h | 15 +++++++++++++++
 plugins/ua_config_default.c                       |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index 7069b56dad2..d5537dac83f 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -94,6 +94,21 @@ UA_ServerConfig_setDefault(UA_ServerConfig *config) {
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_setBasics(UA_ServerConfig *conf);
 
+/* Creates a new server config with no security policies and no endpoints.
+ *
+ * It initializes reasonable defaults for many things, but does not
+ * add any security policies and endpoints.
+ * Use the various UA_ServerConfig_addXxx functions to add them.
+ * The config will set the tcp network layer to the given port if the
+ * eventloop is not already set.
+ *
+ * @param conf The configuration to manipulate
+ * @param portNumber The port number for the tcp network layer
+ */
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_setBasics_withPort(UA_ServerConfig *conf,
+                                   UA_UInt16 portNumber);
+
 #ifdef UA_ENABLE_WEBSOCKET_SERVER
 /* Adds a Websocket network layer with custom buffer sizes
  *
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 0067f16b470..adf624ea666 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -446,7 +446,12 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_setBasics(UA_ServerConfig* conf) {
-    UA_StatusCode res = setDefaultConfig(conf, 4840);
+    return UA_ServerConfig_setBasics_withPort(conf, 4840);
+}
+
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_setBasics_withPort(UA_ServerConfig* conf, UA_UInt16 portNumber) {
+    UA_StatusCode res = setDefaultConfig(conf, portNumber);
     UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
                    "AcceptAll Certificate Verification. "
                    "Any remote certificate will be accepted.");

From 18d9e42fea3fa27abd11ee3bb7a5e145f33362f7 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Mon, 16 Jan 2023 14:49:53 +0100
Subject: [PATCH 0702/1963] fix(pubsub): use server logger in
 ua_pubsub_config.c

---
 src/pubsub/ua_pubsub_config.c | 159 +++++++++++++++++++---------------
 1 file changed, 90 insertions(+), 69 deletions(-)

diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 534a1610c83..5d493a8b987 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -64,11 +64,12 @@ generatePubSubConfigurationDataType(UA_Server *server,
 
 /* Gets PubSub Configuration from an ExtensionObject */
 static UA_StatusCode
-extractPubSubConfigFromExtensionObject(const UA_ExtensionObject *src,
+extractPubSubConfigFromExtensionObject(UA_Server *server,
+                                       const UA_ExtensionObject *src,
                                        UA_PubSubConfigurationDataType **dst) {
     if(src->encoding != UA_EXTENSIONOBJECT_DECODED ||
        src->content.decoded.type != &UA_TYPES[UA_TYPES_UABINARYFILEDATATYPE]) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_extractPubSubConfigFromDecodedObject] "
                      "Reading extensionObject failed");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -77,14 +78,14 @@ extractPubSubConfigFromExtensionObject(const UA_ExtensionObject *src,
     UA_UABinaryFileDataType *binFile = (UA_UABinaryFileDataType*)src->content.decoded.data;
 
     if(binFile->body.arrayLength != 0 || binFile->body.arrayDimensionsSize != 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_extractPubSubConfigFromDecodedObject] "
                      "Loading multiple configurations is not supported");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
     if(binFile->body.type != &UA_TYPES[UA_TYPES_PUBSUBCONFIGURATIONDATATYPE]) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_extractPubSubConfigFromDecodedObject] "
                      "Invalid datatype encoded in the binary file");
         return UA_STATUSCODE_BADTYPEMISMATCH;
@@ -100,8 +101,8 @@ updatePubSubConfig(UA_Server *server,
                    const UA_PubSubConfigurationDataType *configurationParameters) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    if(server == NULL || configurationParameters == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+    if(configurationParameters == NULL) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_updatePubSubConfig] Invalid argument");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -121,7 +122,7 @@ updatePubSubConfig(UA_Server *server,
                                      &configurationParameters->publishedDataSets[i],
                                      &publishedDataSetIdent[i]);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_updatePubSubConfig] PDS creation failed");
             UA_free(publishedDataSetIdent);
             return res;
@@ -130,7 +131,7 @@ updatePubSubConfig(UA_Server *server,
 
     /* Configuration of PubSub Connections: */
     if(configurationParameters->connectionsSize < 1) {
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "[UA_PubSubManager_updatePubSubConfig] no connection in "
                        "UA_PubSubConfigurationDataType");
         UA_free(publishedDataSetIdent);
@@ -153,7 +154,8 @@ updatePubSubConfig(UA_Server *server,
 /* Function called by UA_PubSubManager_createPubSubConnection to set the
  * PublisherId of a certain connection. */
 static UA_StatusCode
-setConnectionPublisherId(const UA_PubSubConnectionDataType *src,
+setConnectionPublisherId(UA_Server *server,
+                         const UA_PubSubConnectionDataType *src,
                          UA_PubSubConnectionConfig *dst) {
     if(src->publisherId.type == &UA_TYPES[UA_TYPES_STRING]) {
         dst->publisherIdType = UA_PUBLISHERIDTYPE_STRING;
@@ -171,7 +173,7 @@ setConnectionPublisherId(const UA_PubSubConnectionDataType *src,
         dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
         dst->publisherId.uint64 = *(UA_UInt64*)src->publisherId.data;
     } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setConnectionPublisherId] PublisherId is not valid.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -193,7 +195,7 @@ createComponentsForConnection(UA_Server *server,
         res = createWriterGroup(server, &connParams->writerGroups[i],
                                 connectionIdent, pdsCount, pdsIdent);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createComponentsForConnection] "
                          "Error occured during %d. WriterGroup Creation", (UA_UInt32)i+1);
             return res;
@@ -206,7 +208,7 @@ createComponentsForConnection(UA_Server *server,
         if(res == UA_STATUSCODE_GOOD)
             res |= UA_PubSubConnection_regist(server, &connectionIdent, NULL);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createComponentsForConnection] "
                          "Error occured during %d. ReaderGroup Creation", (UA_UInt32)j+1);
             return res;
@@ -259,7 +261,7 @@ createTransportLayer(UA_Server *server, const UA_String transportProfileUri) {
         }
 #endif
 
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createTransportLayer] "
                      "invalid transportProfileUri");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -304,9 +306,9 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
     config.connectionProperties.map =   connParams->connectionProperties;
     config.connectionProperties.mapSize = connParams->connectionPropertiesSize;
 
-    UA_StatusCode res = setConnectionPublisherId(connParams, &config);
+    UA_StatusCode res = setConnectionPublisherId(server, connParams, &config);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPubSubConnection] "
                      "Setting PublisherId failed");
         return res;
@@ -317,7 +319,7 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
                              connParams->address.content.decoded.data,
                              connParams->address.content.decoded.type);
     } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPubSubConnection] "
                      "Reading connection address failed");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -328,14 +330,14 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
                              connParams->transportSettings.content.decoded.data,
                              connParams->transportSettings.content.decoded.type);
     } else {
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "[UA_PubSubManager_createPubSubConnection] "
                        "TransportSettings can not be read");
     }
 
     res = createTransportLayer(server, connParams->transportProfileUri);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPubSubConnection] "
                      "Creating transportLayer failed");
         return res;
@@ -349,7 +351,7 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
         res = createComponentsForConnection(server, connParams, connectionIdent,
                                             pdsCount, pdsIdent);
     } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPubSubConnection] "
                      "Connection creation failed");
     }
@@ -360,10 +362,11 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
 /* Function called by UA_PubSubManager_createWriterGroup to configure the messageSettings
  * of a writerGroup */
 static UA_StatusCode
-setWriterGroupEncodingType(const UA_WriterGroupDataType *writerGroupParameters,
+setWriterGroupEncodingType(UA_Server *server,
+                           const UA_WriterGroupDataType *writerGroupParameters,
                            UA_WriterGroupConfig *config) {
     if(writerGroupParameters->messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setWriterGroupEncodingType] "
                      "getting message type information failed");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -374,12 +377,12 @@ setWriterGroupEncodingType(const UA_WriterGroupDataType *writerGroupParameters,
         config->encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     } else if(writerGroupParameters->messageSettings.content.decoded.type ==
               &UA_TYPES[UA_TYPES_JSONWRITERGROUPMESSAGEDATATYPE]) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setWriterGroupEncodingType] "
                      "encoding type: JSON (not implemented!)");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setWriterGroupEncodingType] "
                      "invalid message encoding type");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -417,9 +420,9 @@ createWriterGroup(UA_Server *server,
     config.groupProperties.map =   writerGroupParameters->groupProperties;
     config.maxEncapsulatedDataSetMessageCount = 255; /* non std parameter */
 
-    UA_StatusCode res = setWriterGroupEncodingType(writerGroupParameters, &config);
+    UA_StatusCode res = setWriterGroupEncodingType(server, writerGroupParameters, &config);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createWriterGroup] "
                      "Setting message settings failed");
         return res;
@@ -432,7 +435,7 @@ createWriterGroup(UA_Server *server,
     if(wg)
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL, UA_STATUSCODE_GOOD);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createWriterGroup] "
                      "Adding WriterGroup to server failed: 0x%x", res);
         return res;
@@ -443,7 +446,7 @@ createWriterGroup(UA_Server *server,
         res = createDataSetWriter(server, &writerGroupParameters->dataSetWriters[dsw],
                                   writerGroupIdent, pdsCount, pdsIdent);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createWriterGroup] "
                          "DataSetWriter Creation failed.");
             break;
@@ -476,7 +479,7 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
         res = getPublishedDataSetConfig(server, pdsIdent[pds], &pdsConfig);
         /* members of pdsConfig must be deleted manually */
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addDataSetWriterWithPdsReference] "
                          "Getting pdsConfig from NodeId failed.");
             return res;
@@ -490,7 +493,7 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
             res = UA_DataSetWriter_create(server, writerGroupIdent, pdsIdent[pds],
                                           dsWriterConfig, &dataSetWriterIdent);
             if(res != UA_STATUSCODE_GOOD) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                              "[UA_PubSubManager_addDataSetWriterWithPdsReference] "
                              "Adding DataSetWriter failed");
             } else {
@@ -504,7 +507,7 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
     }
 
     if(!pdsFound) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_addDataSetWriterWithPdsReference] "
                      "No matching DataSet found; no DataSetWriter created");
     }
@@ -540,7 +543,7 @@ createDataSetWriter(UA_Server *server,
     UA_StatusCode res = addDataSetWriterWithPdsReference(server, writerGroupIdent,
                                                          &config, pdsCount, pdsIdent);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createDataSetWriter] "
                      "Referencing related PDS failed");
     }
@@ -569,19 +572,19 @@ createReaderGroup(UA_Server *server,
     UA_StatusCode res =
         UA_ReaderGroup_create(server, connectionIdent, &config, &readerGroupIdent);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createReaderGroup] Adding ReaderGroup "
                      "to server failed: 0x%x", res);
         return res;
     }
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
                 "[UA_PubSubManager_createReaderGroup] ReaderGroup successfully added.");
     for(UA_UInt32 i = 0; i < readerGroupParameters->dataSetReadersSize; i++) {
         res = createDataSetReader(server, &readerGroupParameters->dataSetReaders[i],
                                   readerGroupIdent);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createReaderGroup] Creating DataSetReader failed");
             break;
         }
@@ -624,7 +627,7 @@ addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
                                                       tmpTargetVars->targetVariablesSize,
                                                       targetVars);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addSubscribedDataSet] "
                          "create TargetVariables failed");
         }
@@ -639,13 +642,13 @@ addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
 
     if(subscribedDataSet->content.decoded.type ==
        &UA_TYPES[UA_TYPES_SUBSCRIBEDDATASETMIRRORDATATYPE]) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_addSubscribedDataSet] "
                      "DataSetMirror is currently not supported");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "[UA_PubSubManager_addSubscribedDataSet] "
                  "Invalid Type of SubscribedDataSet");
     return UA_STATUSCODE_BADINTERNALERROR;
@@ -680,7 +683,7 @@ createDataSetReader(UA_Server *server, const UA_DataSetReaderDataType *dsrParams
         res = addSubscribedDataSet(server, dsReaderIdent,
                                    &dsrParams->subscribedDataSet);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createDataSetReader] "
                      "create subscribedDataSet failed");
     }
@@ -705,12 +708,12 @@ setPublishedDataSetType(const UA_PublishedDataSetDataType *pdsParams,
         return UA_STATUSCODE_GOOD;
     } else if(sourceType == &UA_TYPES[UA_TYPES_PUBLISHEDEVENTSDATATYPE]) {
         /* config.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDEVENTS; */
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setPublishedDataSetType] Published events not supported.");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "[UA_PubSubManager_setPublishedDataSetType] Invalid DataSetSourceDataType.");
     return UA_STATUSCODE_BADINTERNALERROR;
 }
@@ -736,7 +739,7 @@ createPublishedDataSet(UA_Server *server,
 
     res = UA_PublishedDataSet_create(server, &config, pdsIdent).addResult;
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPublishedDataSet] "
                      "Adding PublishedDataSet failed.");
         return res;
@@ -745,7 +748,7 @@ createPublishedDataSet(UA_Server *server,
     /* DataSetField configuration for this publishedDataSet: */
     res = createDataSetFields(server, pdsIdent, pdsParams);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPublishedDataSet] "
                      "Creating DataSetFieldConfig failed.");
     }
@@ -783,7 +786,7 @@ addDataSetFieldVariables(UA_Server *server, const UA_NodeId *pdsIdent,
         UA_NodeId fieldIdent;
         UA_StatusCode res = UA_DataSetField_create(server, *pdsIdent, &fc, &fieldIdent).result;
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addDataSetFieldVariables] "
                          "Adding DataSetField Variable failed.");
             return res;
@@ -814,13 +817,13 @@ createDataSetFields(UA_Server *server, const UA_NodeId *pdsIdent,
     /* TODO: Implement Routine for adding Event DataSetFields */
     if(pdsParams->dataSetSource.content.decoded.type ==
        &UA_TYPES[UA_TYPES_PUBLISHEDEVENTSDATATYPE]) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createDataSetFields] "
                      "Published events not supported.");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "[UA_PubSubManager_createDataSetFields] "
                  "Invalid DataSetSourceDataType.");
     return UA_STATUSCODE_BADINTERNALERROR;
@@ -829,20 +832,29 @@ createDataSetFields(UA_Server *server, const UA_NodeId *pdsIdent,
 UA_StatusCode
 UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
                                                 const UA_ByteString buffer) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     size_t offset = 0;
     UA_ExtensionObject decodedFile;
-    UA_StatusCode res = UA_ExtensionObject_decodeBinary(&buffer, &offset, &decodedFile);
-    if(res != UA_STATUSCODE_GOOD) {
+    UA_StatusCode res;
+
+    if(server == NULL) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "[UA_PubSubManager_loadPubSubConfigFromByteString] Invalid argument");
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    res = UA_ExtensionObject_decodeBinary(&buffer, &offset, &decodedFile);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_decodeBinFile] decoding UA_Binary failed");
         goto cleanup;
     }
 
     UA_PubSubConfigurationDataType *pubSubConfig = NULL;
-    res = extractPubSubConfigFromExtensionObject(&decodedFile, &pubSubConfig);
+    res = extractPubSubConfigFromExtensionObject(server, &decodedFile, &pubSubConfig);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_loadPubSubConfigFromByteString] "
                      "Extracting PubSub Configuration failed");
         goto cleanup;
@@ -850,7 +862,7 @@ UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
 
     res = updatePubSubConfig(server, pubSubConfig);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_loadPubSubConfigFromByteString] "
                      "Loading PubSub configuration into server failed");
         goto cleanup;
@@ -864,7 +876,8 @@ UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
 /* Encodes a PubSubConfigurationDataType object as ByteString using the UA Binary Data
  * Encoding */
 static UA_StatusCode
-encodePubSubConfiguration(UA_PubSubConfigurationDataType *configurationParameters,
+encodePubSubConfiguration(UA_Server *server,
+                          UA_PubSubConfigurationDataType *configurationParameters,
                           UA_ByteString *buffer) {
     UA_UABinaryFileDataType binFile;
     memset(&binFile, 0, sizeof(UA_UABinaryFileDataType));
@@ -882,7 +895,7 @@ encodePubSubConfiguration(UA_PubSubConfigurationDataType *configurationParameter
     size_t fileSize = UA_ExtensionObject_calcSizeBinary(&container);
     buffer->data = (UA_Byte*)UA_calloc(fileSize, sizeof(UA_Byte));
     if(buffer->data == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_encodePubSubConfiguration] Allocating buffer failed");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
@@ -893,14 +906,15 @@ encodePubSubConfiguration(UA_PubSubConfigurationDataType *configurationParameter
     UA_StatusCode res =
         UA_ExtensionObject_encodeBinary(&container, &bufferPos, bufferPos + fileSize);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_encodePubSubConfiguration] Encoding failed");
     }
     return res;
 }
 
 static UA_StatusCode
-generatePublishedDataSetDataType(const UA_PublishedDataSet *src,
+generatePublishedDataSetDataType(UA_Server* server,
+                                 const UA_PublishedDataSet *src,
                                  UA_PublishedDataSetDataType *dst) {
     if(src->config.publishedDataSetType != UA_PUBSUB_DATASET_PUBLISHEDITEMS)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
@@ -916,7 +930,7 @@ generatePublishedDataSetDataType(const UA_PublishedDataSet *src,
     tmp->publishedData = (UA_PublishedVariableDataType*)
         UA_Array_new(tmp->publishedDataSize, &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]);
     if(tmp->publishedData == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Allocation memory failed");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Allocation memory failed");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -924,7 +938,7 @@ generatePublishedDataSetDataType(const UA_PublishedDataSet *src,
         UA_Array_new(dst->dataSetMetaData.fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
     if(dst->dataSetMetaData.fields == NULL) {
         UA_free(tmp->publishedData);
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Allocation memory failed");
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Allocation memory failed");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -1085,7 +1099,8 @@ generateReaderGroupDataType(const UA_ReaderGroup *src,
 
 /* Generates a PubSubConnectionDataType object from a PubSubConnection. */
 static UA_StatusCode
-generatePubSubConnectionDataType(const UA_PubSubConnection *src,
+generatePubSubConnectionDataType(UA_Server* server,
+                                 const UA_PubSubConnection *src,
                                  UA_PubSubConnectionDataType *dst) {
     const UA_DataType *publisherIdType;
     memset(dst, 0, sizeof(UA_PubSubConnectionDataType));
@@ -1122,7 +1137,7 @@ generatePubSubConnectionDataType(const UA_PubSubConnection *src,
             publisherIdType = &UA_TYPES[UA_TYPES_STRING];
             break;
         default:
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "generatePubSubConnectionDataType(): publisher Id type is not supported");
             return UA_STATUSCODE_BADINTERNALERROR;
             break;
@@ -1218,9 +1233,9 @@ generatePubSubConfigurationDataType(UA_Server* server,
     UA_UInt32 pdsIndex = 0;
     TAILQ_FOREACH(pds, &manager->publishedDataSets, listEntry) {
         UA_PublishedDataSetDataType *dst = &configDT->publishedDataSets[pdsIndex];
-        res = generatePublishedDataSetDataType(pds, dst);
+        res = generatePublishedDataSetDataType(server, pds, dst);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_generatePubSubConfigurationDataType] "
                          "retrieving PublishedDataSet configuration failed");
             return res;
@@ -1238,9 +1253,9 @@ generatePubSubConfigurationDataType(UA_Server* server,
     UA_PubSubConnection *connection;
     TAILQ_FOREACH(connection, &manager->connections, listEntry) {
         UA_PubSubConnectionDataType *cdt = &configDT->connections[connectionIndex];
-        res = generatePubSubConnectionDataType(connection, cdt);
+        res = generatePubSubConnectionDataType(server, connection, cdt);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_generatePubSubConfigurationDataType] "
                          "retrieving PubSubConnection configuration failed");
             return res;
@@ -1254,26 +1269,32 @@ generatePubSubConfigurationDataType(UA_Server* server,
 UA_StatusCode
 UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
                                                UA_ByteString *buffer) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
     UA_PubSubConfigurationDataType config;
     memset(&config, 0, sizeof(UA_PubSubConfigurationDataType));
 
+    if(server == NULL) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "[UA_PubSubManager_getEncodedPubSubConfiguration] Invalid argument");
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode res = generatePubSubConfigurationDataType(server, &config);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "retrieving PubSub configuration from server failed");
         goto cleanup;
     }
 
-    res = encodePubSubConfiguration(&config, buffer);
+    res = encodePubSubConfiguration(server, &config, buffer);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "encoding PubSub configuration failed");
         goto cleanup;
     }
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
                 "Saving PubSub config was successful");
 
  cleanup:

From 9b9292cf47552208dc7518c2b8716e0221e0d3c9 Mon Sep 17 00:00:00 2001
From: Tobias Zimmermann <Tobias.Zimmermann@tq-group.com>
Date: Fri, 26 Aug 2022 09:07:26 +0200
Subject: [PATCH 0703/1963] fix(examples): remove sys/io.h

For Arm processors sys/io.h does not exist, which
results in a build error. On x86 the header is not
needed. Therefore it can be removed.

Signed-off-by: Tobias Zimmermann <Tobias.Zimmermann@tq-group.com>
---
 examples/pubsub_realtime/pubsub_TSN_loopback.c                  | 1 -
 examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c    | 1 -
 examples/pubsub_realtime/pubsub_TSN_publisher.c                 | 1 -
 examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c | 1 -
 4 files changed, 4 deletions(-)

diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index 106ee56ed46..7d6cf9c07be 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -77,7 +77,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <linux/types.h>
-#include <sys/io.h>
 #include <getopt.h>
 
 /* For thread operations */
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index 3319ca99f2f..707e2eeac12 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -54,7 +54,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <linux/types.h>
-#include <sys/io.h>
 #include <getopt.h>
 
 /* For thread operations */
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index fef2e33c5a1..a6891dbebc3 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -78,7 +78,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <linux/types.h>
-#include <sys/io.h>
 #include <getopt.h>
 
 /* For thread operations */
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index 82258da3006..20b5594e1e5 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -57,7 +57,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <linux/types.h>
-#include <sys/io.h>
 #include <getopt.h>
 
 /* For thread operations */

From b51b9bd228f191d45b986441dd7f564130239df6 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 17 Jan 2023 08:55:47 +0100
Subject: [PATCH 0704/1963] feat(plugin): Use server and client logger for
 crypto plugins

---
 include/open62541/plugin/pki.h          |  3 ++
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 37 ++++++++++++------
 plugins/crypto/openssl/ua_pki_openssl.c | 51 ++++++++++++++++---------
 plugins/ua_accesscontrol_default.c      |  4 ++
 plugins/ua_config_default.c             | 11 ++++++
 src/client/ua_client.c                  |  2 +
 src/server/ua_server.c                  |  3 ++
 7 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/include/open62541/plugin/pki.h b/include/open62541/plugin/pki.h
index f3ec7b7f966..92b902a127a 100644
--- a/include/open62541/plugin/pki.h
+++ b/include/open62541/plugin/pki.h
@@ -10,6 +10,7 @@
 
 #include <open62541/types.h>
 #include <open62541/types_generated.h>
+#include <open62541/plugin/log.h>
 
 _UA_BEGIN_DECLS
 
@@ -50,6 +51,8 @@ struct UA_CertificateVerification {
 
     /* Delete the certificate verification context */
     void (*clear)(UA_CertificateVerification *cv);
+
+    const UA_Logger *logger;
 };
 
 _UA_END_DECLS
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index e2197056ce7..0e163575cd5 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -97,6 +97,8 @@ typedef struct {
     mbedtls_x509_crt certificateTrustList;
     mbedtls_x509_crt certificateIssuerList;
     mbedtls_x509_crl certificateRevocationList;
+
+    const UA_Logger *logger;
 } CertInfo;
 
 #ifdef __linux__ /* Linux only so far */
@@ -158,7 +160,7 @@ reloadCertificates(CertInfo *ci) {
 
     /* Load the trustlists */
     if(ci->trustListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
+        UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
         mbedtls_x509_crt_free(&ci->certificateTrustList);
         mbedtls_x509_crt_init(&ci->certificateTrustList);
 
@@ -167,12 +169,12 @@ reloadCertificates(CertInfo *ci) {
         f[ci->trustListFolder.length] = 0;
         err = mbedtls_x509_crt_parse_path(&ci->certificateTrustList, f);
         if(err == 0) {
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
                         "Loaded certificate from %s", f);
         } else {
             char errBuff[300];
             mbedtls_strerror(err, errBuff, 300);
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
                         "Failed to load certificate from %s, mbedTLS error: %s (error code: %d)", f, errBuff, err);
             internalErrorFlag = 1;
         }
@@ -180,7 +182,7 @@ reloadCertificates(CertInfo *ci) {
 
     /* Load the revocationlists */
     if(ci->revocationListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
+        UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
         size_t pathsSize = 0;
         UA_String *paths = NULL;
         retval = fileNamesFromFolder(&ci->revocationListFolder, &pathsSize, &paths);
@@ -194,13 +196,13 @@ reloadCertificates(CertInfo *ci) {
             f[paths[i].length] = 0;
             err = mbedtls_x509_crl_parse_file(&ci->certificateRevocationList, f);
             if(err == 0) {
-                UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
                             "Loaded certificate from %.*s",
                             (int)paths[i].length, paths[i].data);
             } else {
                 char errBuff[300];
                 mbedtls_strerror(err, errBuff, 300);
-                UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
                             "Failed to load certificate from %.*s, mbedTLS error: %s (error code: %d)",
                             (int)paths[i].length, paths[i].data, errBuff, err);
                 internalErrorFlag = 1;
@@ -213,7 +215,7 @@ reloadCertificates(CertInfo *ci) {
 
     /* Load the issuerlists */
     if(ci->issuerListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
+        UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
         mbedtls_x509_crt_free(&ci->certificateIssuerList);
         mbedtls_x509_crt_init(&ci->certificateIssuerList);
         char f[PATH_MAX];
@@ -221,12 +223,12 @@ reloadCertificates(CertInfo *ci) {
         f[ci->issuerListFolder.length] = 0;
         err = mbedtls_x509_crt_parse_path(&ci->certificateIssuerList, f);
         if(err == 0) {
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
                         "Loaded certificate from %s", f);
         } else {
             char errBuff[300];
             mbedtls_strerror(err, errBuff, 300);
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
                         "Failed to load certificate from %s, mbedTLS error: %s (error code: %d)",
                         f, errBuff, err);
             internalErrorFlag = 1;
@@ -262,7 +264,7 @@ certificateVerification_verify(void *verificationContext,
        ci->certificateTrustList.raw.len == 0 &&
        ci->certificateIssuerList.raw.len == 0 &&
        ci->certificateRevocationList.raw.len == 0) {
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(ci->logger, UA_LOGCATEGORY_SERVER,
                        "PKI plugin unconfigured. Accepting the certificate.");
         return UA_STATUSCODE_GOOD;
     }
@@ -457,7 +459,7 @@ certificateVerification_verify(void *verificationContext,
 #if UA_LOGLEVEL <= 400
         char buff[100];
         int len = mbedtls_x509_crt_verify_info(buff, 100, "", flags);
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SECURITYPOLICY,
+        UA_LOG_WARNING(ci->logger, UA_LOGCATEGORY_SECURITYPOLICY,
                        "Verifying the certificate failed with error: %.*s", len-1, buff);
 #endif
         if(flags & (uint32_t)MBEDTLS_X509_BADCERT_NOT_TRUSTED) {
@@ -554,6 +556,7 @@ certificateVerification_clear(UA_CertificateVerification *cv) {
 #ifdef UA_ENABLE_CERT_REJECTED_DIR
     UA_String_clear(&ci->rejectedListFolder);
 #endif
+    ci->logger = NULL;
     UA_free(ci);
     cv->context = NULL;
 }
@@ -599,6 +602,12 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
     mbedtls_x509_crl_init(&ci->certificateRevocationList);
     mbedtls_x509_crt_init(&ci->certificateIssuerList);
 
+    if(cv->logger) {
+        ci->logger = cv->logger;
+    } else {
+        ci->logger = UA_Log_Stdout;
+    }
+
     cv->context = (void*)ci;
     cv->verifyCertificate = certificateVerification_verify;
     cv->clear = certificateVerification_clear;
@@ -667,6 +676,12 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
     mbedtls_x509_crl_init(&ci->certificateRevocationList);
     mbedtls_x509_crt_init(&ci->certificateIssuerList);
 
+    if(cv->logger) {
+        ci->logger = cv->logger;
+    } else {
+        ci->logger = UA_Log_Stdout;
+    }
+
     /* Only set the folder paths. They will be reloaded during runtime.
      * TODO: Add a more efficient reloading of only the changes */
     ci->trustListFolder = UA_STRING_ALLOC(trustListFolder);
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index e5213792cd4..5627903b775 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -75,6 +75,8 @@ typedef struct {
     STACK_OF(X509) *      skIssue;
     STACK_OF(X509) *      skTrusted;
     STACK_OF(X509_CRL) *  skCrls; /* Revocation list*/
+
+    const UA_Logger *logger;
 } CertContext;
 
 static UA_StatusCode
@@ -97,12 +99,19 @@ UA_CertContext_sk_free (CertContext * context) {
 }
 
 static UA_StatusCode
-UA_CertContext_Init (CertContext * context) {
+UA_CertContext_Init (CertContext * context, const UA_Logger *logger) {
     (void) memset (context, 0, sizeof (CertContext));
     UA_ByteString_init (&context->trustListFolder);
     UA_ByteString_init (&context->issuerListFolder);
     UA_ByteString_init (&context->revocationListFolder);
     UA_ByteString_init (&context->rejectedListFolder);
+
+    if(logger) {
+        context->logger = logger;
+    } else {
+        context->logger = UA_Log_Stdout;
+    }
+
     return UA_CertContext_sk_Init (context);
 }
 
@@ -121,6 +130,7 @@ UA_CertificateVerification_clear (UA_CertificateVerification * cv) {
     UA_ByteString_clear (&context->rejectedListFolder);
 
     UA_CertContext_sk_free (context);
+    context->logger = NULL;
     UA_free (context);
 
     cv->context = NULL;
@@ -286,7 +296,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     UA_ByteString_init (&strCert);
 
     if (ctx->trustListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
+        UA_LOG_INFO(ctx->logger, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
 
         sk_X509_pop_free (ctx->skTrusted, X509_free);
         ctx->skTrusted = sk_X509_new_null();
@@ -307,12 +317,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
                             "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skTrusted_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -322,7 +332,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->issuerListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
+        UA_LOG_INFO(ctx->logger, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
 
         sk_X509_pop_free (ctx->skIssue, X509_free);
         ctx->skIssue = sk_X509_new_null();
@@ -342,12 +352,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
                             "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skIssuer_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -357,7 +367,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->revocationListFolder.length > 0) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
+        UA_LOG_INFO(ctx->logger, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
 
         sk_X509_CRL_pop_free (ctx->skCrls, X509_CRL_free);
         ctx->skCrls = sk_X509_CRL_new_null();
@@ -377,12 +387,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
                             "Failed to load the revocation file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skCrls_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the revocation file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -590,24 +600,27 @@ static UA_StatusCode
 UA_CertificateVerification_VerifyApplicationURI (void *                verificationContext,
                                                  const UA_ByteString * certificate,
                                                  const UA_String *     applicationURI) {
-    (void) verificationContext;
-
     const unsigned char * pData;
     X509 *                certificateX509;
     UA_String             subjectURI;
     GENERAL_NAMES *       pNames;
     int                   i;
     UA_StatusCode         ret;
+    CertContext *         ctx = (CertContext *)verificationContext;
+
+    if (ctx == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     pData = certificate->data;
     if (pData == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Error Empty Certificate");
+        UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Error Empty Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
     certificateX509 = UA_OpenSSL_LoadCertificate(certificate);
     if (certificateX509 == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Error loading X509 Certificate");
+        UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Error loading X509 Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
@@ -615,7 +628,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
                                                 NULL, NULL);
     if (pNames == NULL) {
         X509_free (certificateX509);
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Error processing X509 Certificate");
+        UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Error processing X509 Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
     for (i = 0; i < sk_GENERAL_NAME_num (pNames); i++) {
@@ -624,7 +637,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
              subjectURI.length = (size_t) (value->d.ia5->length);
              subjectURI.data = (UA_Byte *) UA_malloc (subjectURI.length);
              if (subjectURI.data == NULL) {
-                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Error Empty subjectURI");
+                 UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Error Empty subjectURI");
                  X509_free (certificateX509);
                  sk_GENERAL_NAME_pop_free(pNames, GENERAL_NAME_free);
                  return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
@@ -638,7 +651,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
     ret = UA_STATUSCODE_GOOD;
     if (UA_Bstrstr (subjectURI.data, subjectURI.length,
                     applicationURI->data, applicationURI->length) == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Empty comparing subjectURI and applicationURI");
+        UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Empty comparing subjectURI and applicationURI");
         ret = UA_STATUSCODE_BADCERTIFICATEURIINVALID;
     }
 
@@ -702,7 +715,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    ret = UA_CertContext_Init (context);
+    ret = UA_CertContext_Init (context, cv->logger);
     if (ret != UA_STATUSCODE_GOOD) {
         return ret;
     }
@@ -761,7 +774,7 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    ret = UA_CertContext_Init (context);
+    ret = UA_CertContext_Init (context, cv->logger);
     if (ret != UA_STATUSCODE_GOOD) {
         return ret;
     }
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index a80a65f6380..bdb5f419cfe 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -323,8 +323,12 @@ UA_AccessControl_default(UA_ServerConfig *config,
     if(verifyX509) {
         context->verifyX509 = *verifyX509;
         memset(verifyX509, 0, sizeof(UA_CertificateVerification));
+        if (context->verifyX509.logger == NULL) {
+            context->verifyX509.logger = &config->logger;
+        }
     } else {
         memset(&context->verifyX509, 0, sizeof(UA_CertificateVerification));
+        context->verifyX509.logger = &config->logger;
         UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_SERVER,
                     "AccessControl: x509 certificate user authentication is enabled");
     }
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index adf624ea666..3593159bc7e 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -372,6 +372,11 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     /* Endpoints */
     /* conf->endpoints = {0, NULL}; */
 
+    if(!conf->certificateVerification.logger) {
+        /* Set Logger for Certificate Verification */
+        conf->certificateVerification.logger = &conf->logger;
+    }
+
     /* Certificate Verification that accepts every certificate. Can be
      * overwritten when the policy is specialized. */
     UA_CertificateVerification_AcceptAll(&conf->certificateVerification);
@@ -826,6 +831,7 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
     }
 
     UA_CertificateVerification accessControlVerification;
+    memset(&accessControlVerification, 0, sizeof(accessControlVerification));
     retval = UA_CertificateVerification_Trustlist(&accessControlVerification,
                                                   trustList, trustListSize,
                                                   issuerList, issuerListSize,
@@ -909,6 +915,11 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     if(config->localConnectionConfig.recvBufferSize == 0)
         config->localConnectionConfig = UA_ConnectionConfig_default;
 
+    if(!config->certificateVerification.logger) {
+        /* Set Logger for Certificate Verification */
+        config->certificateVerification.logger = &config->logger;
+    }
+
     if(!config->certificateVerification.verifyCertificate) {
         /* Certificate Verification that accepts every certificate. Can be
          * overwritten when the policy is specialized. */
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 24cb73f5dfb..86dd189a5b9 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -45,6 +45,8 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
     if(client->config.eventLoop &&
        (client->config.eventLoop->logger == &config->logger))
         client->config.eventLoop->logger = &client->config.logger;
+    if(client->config.certificateVerification.logger == &config->logger)
+        client->config.certificateVerification.logger = &client->config.logger;
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         if(client->config.securityPolicies[i].logger == &config->logger)
             client->config.securityPolicies[i].logger = &client->config.logger;
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 918719f588a..64fa2a22a24 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -392,6 +392,9 @@ UA_Server_newWithConfig(UA_ServerConfig *config) {
     if(server->config.eventLoop->logger == &config->logger)
         server->config.eventLoop->logger = &server->config.logger;
 
+    if(server->config.certificateVerification.logger == &config->logger)
+        server->config.certificateVerification.logger = &server->config.logger;
+
     /* Reset the old config */
     memset(config, 0, sizeof(UA_ServerConfig));
     return UA_Server_init(server);

From 30b64f14afc88131af52fd26a49d200a39018377 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 17 Jan 2023 15:48:01 +0100
Subject: [PATCH 0705/1963] fix(deps): Fix an edge case and improve test
 coverage for ziptree

---
 deps/ziptree.c        |   4 +-
 tests/check_ziptree.c | 137 +++++++++++++++++++++++++++++++-----------
 2 files changed, 103 insertions(+), 38 deletions(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 81ec6ba9315..2d06f3ddca0 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -282,7 +282,7 @@ __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
         while(ZIP_ENTRY_PTR(cur)->left) {
             prev = cur;
             cur = ZIP_ENTRY_PTR(cur)->left;
-            if(__ZIP_KEY_CMP(cmp, key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS) {
+            if(cmp(key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS) {
                 ZIP_ENTRY_PTR(prev)->left = ZIP_ENTRY_PTR(cur)->right;
                 ZIP_ENTRY_PTR(cur)->right = NULL;
                 ZIP_ENTRY_PTR(left_rightmost)->right = cur;
@@ -306,7 +306,7 @@ __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
         while(ZIP_ENTRY_PTR(cur)->right) {
             prev = cur;
             cur = ZIP_ENTRY_PTR(cur)->right;
-            if(__ZIP_KEY_CMP(cmp, key, ZIP_KEY_PTR(cur)) == ZIP_CMP_LESS) {
+            if(cmp(key, ZIP_KEY_PTR(cur)) == ZIP_CMP_LESS) {
                 ZIP_ENTRY_PTR(prev)->right = ZIP_ENTRY_PTR(cur)->left;
                 ZIP_ENTRY_PTR(cur)->left = NULL;
                 ZIP_ENTRY_PTR(right_leftmost)->left = cur;
diff --git a/tests/check_ziptree.c b/tests/check_ziptree.c
index 55ac0c95668..5fc7aca4495 100644
--- a/tests/check_ziptree.c
+++ b/tests/check_ziptree.c
@@ -6,14 +6,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "ziptree.h"
-#include "assert.h"
 
-struct treeEntry {
-    unsigned int key;
-    ZIP_ENTRY(treeEntry) pointers;
-};
-
-ZIP_HEAD(tree, treeEntry);
+#define TEST_ITERATIONS 50
 
 static enum ZIP_CMP
 compareKeys(const void *k1, const void *k2) {
@@ -24,38 +18,55 @@ compareKeys(const void *k1, const void *k2) {
     return (key1 < key2) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
 }
 
+struct treeEntry {
+    unsigned int key;
+    ZIP_ENTRY(treeEntry) pointers;
+};
+
+ZIP_HEAD(tree, treeEntry);
 ZIP_FUNCTIONS(tree, treeEntry, pointers, unsigned int, key, compareKeys)
 
 static void
-checkTree(struct treeEntry *e) {
-    if(!e)
-        return;
+checkTreeInternal(struct treeEntry *e,
+                  unsigned int min_key, unsigned int max_key) {
+    ck_assert_uint_ge(e->key, min_key);
+    ck_assert_uint_le(e->key, max_key);
 
     struct treeEntry *left = e->pointers.left;
-    if(left)
+    if(left) {
         ck_assert_uint_le(left->key, e->key);
+        checkTreeInternal(left, min_key, e->key);
+    }
 
     struct treeEntry *right = e->pointers.right;
-    if(right)
+    if(right) {
         ck_assert_uint_ge(right->key, e->key);
+        checkTreeInternal(right, e->key, max_key);
+    }
+}
 
-    checkTree(left);
-    checkTree(right);
+static void
+checkTree(struct tree *e) {
+    if(!e->root)
+        return;
+    struct treeEntry *max_entry = ZIP_MAX(tree, e);
+    struct treeEntry *min_entry = ZIP_MIN(tree, e);
+    checkTreeInternal(e->root, min_entry->key, max_entry->key);
 }
 
 START_TEST(randTree) {
     srand(0);
     struct tree t1 = {NULL};
-    for(unsigned int i = 0; i < 100; i++) {
+    for(unsigned int i = 0; i < TEST_ITERATIONS; i++) {
         struct treeEntry *e1 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
         e1->key = (unsigned int)rand();
         ZIP_INSERT(tree, &t1, e1);
     }
 
-    checkTree(t1.root);
+    checkTree(&t1);
 
     while(t1.root) {
-        checkTree(t1.root);
+        checkTree(&t1);
         struct treeEntry *left = t1.root->pointers.left;
         struct treeEntry *right = t1.root->pointers.right;
         free(t1.root);
@@ -66,7 +77,7 @@ START_TEST(randTree) {
 START_TEST(mergeTrees) {
     struct tree t1 = {NULL};
     struct tree t2 = {NULL};
-    for(unsigned int i = 0; i < 100; i++) {
+    for(unsigned int i = 0; i < TEST_ITERATIONS; i++) {
         struct treeEntry *e1 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
         struct treeEntry *e2 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
         e1->key = i;
@@ -75,16 +86,16 @@ START_TEST(mergeTrees) {
         ZIP_INSERT(tree, &t2, e2);
     }
 
-    checkTree(t1.root);
-    checkTree(t2.root);
+    checkTree(&t1);
+    checkTree(&t2);
 
     struct tree t3;
     t3.root = ZIP_ZIP(tree, t1.root, t2.root);
 
-    checkTree(t3.root);
+    checkTree(&t3);
 
     while(t3.root) {
-        checkTree(t3.root);
+        checkTree(&t3);
         struct treeEntry *left = t3.root->pointers.left;
         struct treeEntry *right = t3.root->pointers.right;
         free(t3.root);
@@ -94,29 +105,83 @@ START_TEST(mergeTrees) {
 
 START_TEST(splitTree) {
     struct tree t1 = {NULL};
-    for(unsigned int i = 0; i < 100; i++) {
-        struct treeEntry *e1 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
-        struct treeEntry *e2 = (struct treeEntry*)malloc(sizeof(struct treeEntry));
-        e1->key = i;
-        e2->key = i;
-        ZIP_INSERT(tree, &t1, e1);
-        ZIP_INSERT(tree, &t1, e2);
+    for(unsigned int i = 0; i < TEST_ITERATIONS; i++) {
+        for(size_t j = 0; j < 5; j++) {
+            struct treeEntry *e = (struct treeEntry*)malloc(sizeof(struct treeEntry));
+            e->key = i;
+            ZIP_INSERT(tree, &t1, e);
+        }
     }
 
-    checkTree(t1.root);
+    checkTree(&t1);
 
-    for(unsigned int split_key = 50; split_key < 60; split_key++) {
+    for(unsigned int split_key = 0; split_key < 110; split_key++) {
         struct tree t2;
         struct tree t3;
         ZIP_UNZIP(tree, &t1, &split_key, &t2, &t3);
-        checkTree(t2.root);
-        checkTree(t3.root);
+        checkTree(&t2);
+        checkTree(&t3);
+
+        struct treeEntry *find_right = ZIP_FIND(tree, &t3, &split_key);
+        ck_assert(find_right == NULL);
+        struct treeEntry *smallest_right = ZIP_MIN(tree, &t3);
+        if(smallest_right)
+            ck_assert_uint_gt(smallest_right->key, split_key);
+
+        struct treeEntry *largest_left = ZIP_MAX(tree, &t2);
+        if(largest_left)
+            ck_assert_uint_le(largest_left->key, split_key);
+
         t1.root = ZIP_ZIP(tree, t2.root, t3.root);
-        checkTree(t1.root);
+        checkTree(&t1);
     }
 
     while(t1.root) {
-        checkTree(t1.root);
+        checkTree(&t1);
+        struct treeEntry *left = t1.root->pointers.left;
+        struct treeEntry *right = t1.root->pointers.right;
+        free(t1.root);
+        t1.root = ZIP_ZIP(tree, left, right);
+    }
+} END_TEST
+
+START_TEST(splitTreeRand) {
+    struct tree t1 = {NULL};
+    for(unsigned int i = 0; i < TEST_ITERATIONS; i++) {
+        unsigned int key = (unsigned int)rand();
+        unsigned int num = (unsigned int)rand() % 10;
+        for(size_t j = 0; j < num; j++) {
+            struct treeEntry *e = (struct treeEntry*)malloc(sizeof(struct treeEntry));
+            e->key = key;
+            ZIP_INSERT(tree, &t1, e);
+        }
+    }
+
+    checkTree(&t1);
+
+    for(unsigned int split_key = 0; split_key < 110; split_key++) {
+        struct tree t2;
+        struct tree t3;
+        ZIP_UNZIP(tree, &t1, &split_key, &t2, &t3);
+        checkTree(&t2);
+        checkTree(&t3);
+
+        struct treeEntry *find_right = ZIP_FIND(tree, &t3, &split_key);
+        ck_assert(find_right == NULL);
+        struct treeEntry *smallest_right = ZIP_MIN(tree, &t3);
+        if(smallest_right)
+            ck_assert_uint_gt(smallest_right->key, split_key);
+
+        struct treeEntry *largest_left = ZIP_MAX(tree, &t2);
+        if(largest_left)
+            ck_assert_uint_le(largest_left->key, split_key);
+
+        t1.root = ZIP_ZIP(tree, t2.root, t3.root);
+        checkTree(&t1);
+    }
+
+    while(t1.root) {
+        checkTree(&t1);
         struct treeEntry *left = t1.root->pointers.left;
         struct treeEntry *right = t1.root->pointers.right;
         free(t1.root);
@@ -130,6 +195,7 @@ int main(void) {
     tcase_add_test(tc_parse, randTree);
     tcase_add_test(tc_parse, mergeTrees);
     tcase_add_test(tc_parse, splitTree);
+    tcase_add_test(tc_parse, splitTreeRand);
     Suite *s = suite_create("Test ziptree library");
     suite_add_tcase(s, tc_parse);
     SRunner *sr = srunner_create(s);
@@ -139,4 +205,3 @@ int main(void) {
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-

From e785fa2a57c9ade4651cc8632f9381fa12f3ce52 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Wed, 18 Jan 2023 10:37:50 +0100
Subject: [PATCH 0706/1963] fix(test): use correct timeout in
 check_client_securechannel test

The maximum server timeout has been increased from 50 to 200 with
commit 384a67276457223d505c2060c3224e567ce1930d.
---
 tests/client/check_client_securechannel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index 314f59e6533..2ba64761333 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -117,7 +117,7 @@ START_TEST(SecureChannel_timeout_fail) {
 
     UA_ClientConfig *cconfig = UA_Client_getConfig(client);
     UA_fakeSleep(cconfig->secureChannelLifeTime + 1);
-    UA_realSleep(50 + 1); // UA_MAXTIMEOUT+1 wait to be sure UA_Server_run_iterate can be completely executed
+    UA_realSleep(200 + 1); // UA_MAXTIMEOUT+1 wait to be sure UA_Server_run_iterate can be completely executed
 
     UA_Variant val;
     UA_Variant_init(&val);

From 94ceea3cd532319f003d3beeeb146cf2197025af Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Wed, 18 Jan 2023 10:04:55 +0100
Subject: [PATCH 0707/1963] fix(test): fix pointer parameter in
 check_save_rejected_cert

---
 tests/encryption/check_save_rejected_cert.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/encryption/check_save_rejected_cert.c b/tests/encryption/check_save_rejected_cert.c
index 5a096b8207a..17bb593186d 100644
--- a/tests/encryption/check_save_rejected_cert.c
+++ b/tests/encryption/check_save_rejected_cert.c
@@ -375,7 +375,7 @@ static void setup(void) {
     size_t revocationListSize = 0;
 
     UA_StatusCode res =
-        UA_ServerConfig_setDefaultWithSecurityPolicies(*config, 4840,
+        UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840,
                                                        &certificate, &privateKey,
                                                        trustList, trustListSize,
                                                        issuerList, issuerListSize,

From 545625b79f36a6962887a4d3bfe8cd06cde13c34 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 17 Jan 2023 16:32:46 +0100
Subject: [PATCH 0708/1963] refactor(doc): Remove the realtime publisher
 tutorials from the generated PDF -- not of common interest

---
 doc/tutorials.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/tutorials.rst b/doc/tutorials.rst
index 64ef4f7dd61..8c233380459 100644
--- a/doc/tutorials.rst
+++ b/doc/tutorials.rst
@@ -18,7 +18,3 @@ Tutorials
    tutorial_client_firststeps.rst
    tutorial_pubsub_publish.rst
    tutorial_pubsub_subscribe.rst
-   pubsub_TSN_publisher.rst
-   pubsub_TSN_loopback.rst
-   pubsub_nodeset_rt_publisher.rst
-   pubsub_nodeset_rt_subscriber.rst

From af805ff2dea2c092b207203b4c5cc5723f67136d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 17 Jan 2023 16:33:33 +0100
Subject: [PATCH 0709/1963] refactor(doc): Move client tutorial to the front,
 stylistic improvements

---
 examples/tutorial_client_firststeps.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/examples/tutorial_client_firststeps.c b/examples/tutorial_client_firststeps.c
index ba7822718a0..5aa38ee68f6 100644
--- a/examples/tutorial_client_firststeps.c
+++ b/examples/tutorial_client_firststeps.c
@@ -19,8 +19,11 @@ int main(void) {
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                    "The connection failed with status code %s",
+                    UA_StatusCode_name(retval));
         UA_Client_delete(client);
-        return (int)retval;
+        return EXIT_FAILURE;
     }
 
     /* Read the value attribute of the node. UA_Client_readValueAttribute is a
@@ -29,15 +32,22 @@ int main(void) {
     UA_Variant_init(&value);
 
     /* NodeId of the variable holding the current time */
-    const UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    const UA_NodeId nodeId =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
     retval = UA_Client_readValueAttribute(client, nodeId, &value);
 
     if(retval == UA_STATUSCODE_GOOD &&
        UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_DATETIME])) {
         UA_DateTime raw_date = *(UA_DateTime *) value.data;
         UA_DateTimeStruct dts = UA_DateTime_toStruct(raw_date);
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "date is: %u-%u-%u %u:%u:%u.%03u\n",
-                    dts.day, dts.month, dts.year, dts.hour, dts.min, dts.sec, dts.milliSec);
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                    "date is: %u-%u-%u %u:%u:%u.%03u",
+                    dts.day, dts.month, dts.year, dts.hour,
+                    dts.min, dts.sec, dts.milliSec);
+    } else {
+        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                    "Reading the value failed with status code %s",
+                    UA_StatusCode_name(retval));
     }
 
     /* Clean up */
@@ -51,13 +61,13 @@ int main(void) {
  *
  * .. code-block:: bash
  *
- *     $ gcc -std=c99 open62541.c myClient.c -o myClient
+ *     $ gcc -std=c99 myClient.c -lopen62541 -o myClient
  *
  * In a MinGW environment, the Winsock library must be added.
  *
  * .. code-block:: bash
  *
- *    $ gcc -std=c99 open62541.c myClient.c -lws2_32 -o myClient.exe
+ *    $ gcc -std=c99 myClient.c -lopen62541 -lws2_32 -o myClient.exe
  *
  * Further tasks
  * ^^^^^^^^^^^^^

From 07eb4eae2cf4102dc8127f910bd1e4dd4fc85ab2 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Wed, 18 Jan 2023 14:05:27 +0100
Subject: [PATCH 0710/1963] fix(tests): add check
 UA_ENABLE_SUBSCRIPTIONS_EVENTS in CMakeLists

When UA_ENABLE_SUBSCRIPTIONS is enabled and UA_ENABLE_SUBSCRIPTIONS_EVENTS is
not enabled, then events related unit tests are also added to tests. This
causes compilation errors due to missing declarations in from Events system.
Therefore a check is added in CMakeLists, to check if the
UA_ENABLE_SUBSCRIPTIONS_EVENTS is enabled, then add events related tests.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
---
 tests/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5a8c05a70fc..de99b047fbe 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -286,9 +286,11 @@ endif()
 if(UA_ENABLE_SUBSCRIPTIONS)
   ua_add_test(server/check_services_subscriptions.c)
   ua_add_test(server/check_monitoreditem_filter.c)
+if(UA_ENABLE_SUBSCRIPTIONS_EVENTS)
   ua_add_test(server/check_subscription_events.c)
   ua_add_test(server/check_subscription_event_filter.c)
 endif()
+endif()
 
 ua_add_test(server/check_nodestore.c)
 

From 72e12cb77c6ae6a90d21a22aff23375d8cbad7ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Jan 2023 14:12:26 +0000
Subject: [PATCH 0711/1963] build(deps): bump deps/ua-nodeset from `71774b4` to
 `08d08a8`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `71774b4` to `08d08a8`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/71774b4f129840d38c16e03fbcb0f372ac6cc2bd...08d08a88647c8f874be7dfaf931bde856723ef7f)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 71774b4f129..08d08a88647 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 71774b4f129840d38c16e03fbcb0f372ac6cc2bd
+Subproject commit 08d08a88647c8f874be7dfaf931bde856723ef7f

From 38fc1ccdafe3f8e0963c3b548eb11c6e1077475c Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Tue, 6 Dec 2022 17:02:42 +0100
Subject: [PATCH 0712/1963] feat(client): add UA_ClientConfig_copy API

A deep copy of the client config is required to create and delete the client
instance independent of the source client config object, therefore the
UA_ClientConfig_copy method is added to client public API. It makes a partial
deep copy of the source client config. A partial deep copy contains the
shallow copies of the pointers to the plugins, e.g. eventloop, security policies,
logger. These plugins contains deep hierarchies of structures which are not
accessible outside of the plugin implementation and make it difficult to alloc
memory for those structures. A complete deep copy of client config requires,
the implementation of copy interface from these plugins, which should take care
of those internal structures, as done in the clear interface of these plugins.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 include/open62541/client.h  | 12 +++++++
 src/client/ua_client.c      | 70 +++++++++++++++++++++++++++++++++++++
 tests/client/check_client.c | 20 +++++++++++
 3 files changed, 102 insertions(+)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 1b2360ee748..64451c64223 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -13,6 +13,7 @@
  *    Copyright 2018 (c) Thomas Stalder, Blue Time Concept SA
  *    Copyright 2018 (c) Kalycito Infotech Private Limited
  *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart
+ *    Copyright 2022 (c) Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #ifndef UA_CLIENT_H_
@@ -186,6 +187,17 @@ typedef struct {
     size_t sessionLocaleIdsSize;
 } UA_ClientConfig;
 
+/**
+ * @brief It makes a partial deep copy of the clientconfig. It makes a shallow
+ * copies of the plugins (logger, eventloop, securitypolicy).
+ *
+ * NOTE: It makes a shallow copy of all the plugins from source to destination.
+ * Therefore calling _clear on the dst object will also delete the plugins in src
+ * object.
+ */
+UA_EXPORT UA_StatusCode
+UA_ClientConfig_copy(UA_ClientConfig const *src, UA_ClientConfig *dst);
+
  /**
  * Client Lifecycle
  * ---------------- */
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 86dd189a5b9..ef3eee3a741 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -17,6 +17,7 @@
  *    Copyright 2018 (c) Kalycito Infotech Private Limited
  *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
+ *    Copyright 2022 (c) Linutronix GmbH (Author: Muddasir Shakil)
  */
 
 #include <open62541/transport_generated.h>
@@ -31,6 +32,75 @@ clientHouseKeeping(UA_Client *client, void *_);
 /* Client Lifecycle */
 /********************/
 
+UA_StatusCode
+UA_ClientConfig_copy(UA_ClientConfig const *src, UA_ClientConfig *dst){
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
+    retval = UA_ApplicationDescription_copy(&src->clientDescription, &dst->clientDescription);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    retval = UA_ExtensionObject_copy(&src->userIdentityToken, &dst->userIdentityToken);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    retval = UA_String_copy(&src->securityPolicyUri, &dst->securityPolicyUri);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    retval = UA_EndpointDescription_copy(&src->endpoint, &dst->endpoint);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    retval = UA_UserTokenPolicy_copy(&src->userTokenPolicy, &dst->userTokenPolicy);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    retval = UA_Array_copy(src->sessionLocaleIds, src->sessionLocaleIdsSize,
+                           (void **)&dst->sessionLocaleIds, &UA_TYPES[UA_TYPES_LOCALEID]);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    dst->sessionLocaleIdsSize = src->sessionLocaleIdsSize;
+    dst->connectivityCheckInterval = src->connectivityCheckInterval;
+    dst->certificateVerification = src->certificateVerification;
+    dst->clientContext = src->clientContext;
+    dst->customDataTypes = src->customDataTypes;
+    dst->eventLoop = src->eventLoop;
+    dst->externalEventLoop = src->externalEventLoop;
+    dst->inactivityCallback = src->inactivityCallback;
+    dst->localConnectionConfig = src->localConnectionConfig;
+    dst->logger = src->logger;
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+    dst->outStandingPublishRequests = src->outStandingPublishRequests;
+#endif
+    dst->requestedSessionTimeout = src->requestedSessionTimeout;
+    dst->secureChannelLifeTime = src->secureChannelLifeTime;
+    dst->securityMode = src->securityMode;
+    dst->stateCallback = src->stateCallback;
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+    dst->subscriptionInactivityCallback = src->subscriptionInactivityCallback;
+#endif
+    dst->timeout = src->timeout;
+    dst->userTokenPolicy = src->userTokenPolicy;
+    dst->securityPolicies = src->securityPolicies;
+    dst->securityPoliciesSize = src->securityPoliciesSize;
+    dst->authSecurityPolicies = src->authSecurityPolicies;
+    dst->authSecurityPoliciesSize = src->authSecurityPoliciesSize;
+
+cleanup:
+    if(retval != UA_STATUSCODE_GOOD) {
+        /* _clear will free the plugins in dst that are a shallow copy from src. */
+        dst->authSecurityPolicies = NULL;
+        dst->certificateVerification.context = NULL;
+        dst->eventLoop = NULL;
+        dst->logger.context = NULL;
+        dst->securityPolicies = NULL;
+        UA_ClientConfig_clear(dst);
+    }
+    return retval;
+}
+
 UA_Client *
 UA_Client_newWithConfig(const UA_ClientConfig *config) {
     if(!config)
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index a57d8b5ff71..ae3e9b272a6 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -69,6 +69,25 @@ static void teardown(void) {
     UA_Server_delete(server);
 }
 
+START_TEST(ClientConfig_Copy){
+    UA_ClientConfig dstConfig;
+    memset(&dstConfig, 0, sizeof(UA_ClientConfig));
+    UA_ClientConfig srcConfig;
+    memset(&srcConfig, 0, sizeof(UA_ClientConfig));
+    UA_ClientConfig_setDefault(&srcConfig);
+
+    UA_StatusCode retval = UA_ClientConfig_copy(&srcConfig, &dstConfig);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Client *dstConfigClient = UA_Client_newWithConfig(&dstConfig);
+    retval = UA_Client_connect(dstConfigClient, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Client_disconnect(dstConfigClient);
+    UA_Client_delete(dstConfigClient);
+    UA_ApplicationDescription_clear(&srcConfig.clientDescription);
+}
+END_TEST
+
 START_TEST(Client_connect) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
@@ -412,6 +431,7 @@ static Suite* testSuite_Client(void) {
     Suite *s = suite_create("Client");
     TCase *tc_client = tcase_create("Client Basic");
     tcase_add_checked_fixture(tc_client, setup, teardown);
+    tcase_add_test(tc_client, ClientConfig_Copy);
     tcase_add_test(tc_client, Client_connect);
     tcase_add_test(tc_client, Client_connect_username);
     tcase_add_test(tc_client, Client_delete_without_connect);

From 0c45061f7169714ac0d9f40770b996d96a62bad8 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Tue, 6 Dec 2022 17:20:57 +0100
Subject: [PATCH 0713/1963] feat(client): add UA_ClientConfig_delete API

The clientconfig is required to be cleanedup and freed when, it is not used
by a client. Therefore a delete method is added to free up a standalone
client config pointer.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 include/open62541/client.h | 6 ++++++
 src/client/ua_client.c     | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 64451c64223..0b8f7b71167 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -198,6 +198,12 @@ typedef struct {
 UA_EXPORT UA_StatusCode
 UA_ClientConfig_copy(UA_ClientConfig const *src, UA_ClientConfig *dst);
 
+/**
+ * @brief It cleans the client config and frees the pointer.
+ */
+UA_EXPORT void
+UA_ClientConfig_delete(UA_ClientConfig *config);
+
  /**
  * Client Lifecycle
  * ---------------- */
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index ef3eee3a741..0d25b6265b4 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -194,6 +194,13 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
     UA_cleanupDataTypeWithCustom(config->customDataTypes);
 }
 
+void
+UA_ClientConfig_delete(UA_ClientConfig *config){
+    UA_assert(config != NULL);
+    UA_ClientConfig_clear(config);
+    UA_free(config);
+}
+
 static void
 UA_Client_clear(UA_Client *client) {
     /* Delete the async service calls with BADHSUTDOWN */

From 9c2f63e3808701a61db90cdb46e9b8936c4e75a0 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 13 Jan 2023 16:12:44 +0100
Subject: [PATCH 0714/1963] feat(pubsub): make UA_ClienConfig_clear public

The _clear function is also required for the stack allocated client
configs and also config objects which are contained by other objects.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 include/open62541/client.h | 6 ++++++
 src/client/ua_client.c     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 0b8f7b71167..6731666b184 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -204,6 +204,12 @@ UA_ClientConfig_copy(UA_ClientConfig const *src, UA_ClientConfig *dst);
 UA_EXPORT void
 UA_ClientConfig_delete(UA_ClientConfig *config);
 
+/**
+ * @brief It cleans the client config and deletes the plugins, whereas
+ * _copy makes a shallow copy of the plugins.
+ */
+UA_EXPORT void
+UA_ClientConfig_clear(UA_ClientConfig *config);
  /**
  * Client Lifecycle
  * ---------------- */
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 0d25b6265b4..9cfbd268cb2 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -133,7 +133,7 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
     return client;
 }
 
-static void
+void
 UA_ClientConfig_clear(UA_ClientConfig *config) {
     UA_ApplicationDescription_clear(&config->clientDescription);
 

From 1a813cef2395f879d8dd32cb56ffbb410fe175d7 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 4 Aug 2022 14:25:32 +0200
Subject: [PATCH 0715/1963] feat(pubsub): set SKS config for a securityGroup on
 Publisher/Subscriber side

The sks client is required to make connection with the SKS server and call
GetSecuritykeys periodically.The UA_Server_setSKSClient method is defined to
set the sks client config on Publisher and Subscriber side for the matching
securityGroupId. It calls the GetSecuritykeys method and store the returned
keys. A data structure is added to PubSubKeyStorage, to hold the information
required to spin up an sks client instance and fetch the keys. This way the
server will take care of the lifecycle of that sks client.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 include/open62541/server_pubsub.h |  47 ++++++
 src/pubsub/ua_pubsub_keystorage.c | 265 ++++++++++++++++++++++++++++++
 src/pubsub/ua_pubsub_keystorage.h |  23 +++
 3 files changed, 335 insertions(+)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index a4ba76d9ccf..2110c2cbc76 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -13,6 +13,8 @@
 #define UA_SERVER_PUBSUB_H
 
 #include <open62541/common.h>
+#include <open62541/util.h>
+#include <open62541/client.h>
 #include <open62541/plugin/pubsub.h>
 #include <open62541/plugin/securitypolicy.h>
 
@@ -936,6 +938,51 @@ UA_Server_addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeI
 UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_removeSecurityGroup(UA_Server *server, const UA_NodeId securityGroup);
 
+/**
+ * @brief This is a repeated callback which is triggered on each iteration of SKS Pull request.
+ * The server uses this callback to notify user about the status of current Pull request iteration.
+ * The period is calculated based on the KeylifeTime of specified in the SecurityGroup object node on
+ * the SKS server.
+ *
+ * @param server The server instance managing the publisher/subscriber.
+ * @param sksPullRequestStatus The current status of sks pull request.
+ * @param context The pointer to user defined data passed to this callback.
+ */
+typedef void
+(*UA_Server_sksPullRequestCallback)(UA_Server *server, UA_StatusCode sksPullRequestStatus, void* context);
+
+/**
+ * @brief Sets the SKS client config used to call the GetSecurityKeys Method on SKS and get the
+ * initial set of keys for a SecurityGroupId and adds timedCallback for the next GetSecurityKeys
+ * method Call. This uses async Client API for SKS Pull request. The SKS Client instance is created and destroyed at
+ * runtime on each iteration of SKS Pull request by the server. The key Rollover mechanism will check if the new
+ * keys are needed then it will call the getSecurityKeys Method on SKS Server. At the end of SKS Pull request
+ * iteration, the sks client will be deleted by a delayed callback (in next server iteration).
+ *
+ * @note It is be called before setting Reader/Writer Group into Operational because this also allocates
+ * a channel context for the pubsub security policy.
+ *
+ * @note the stateCallback of sksClientConfig will be overwritten by an internal callback.
+ *
+ * @param server the server instance
+ * @param clientConfig holds the required configuration to make encrypted connection with
+ * SKS Server. The input client config takes the lifecycle as long as SKS request are made.
+ * It is deleted with its plugins when the server is deleted or the last Reader/Writer
+ * Group of the securityGroupId is deleted. The input config is copied to an internal
+ * config object and the content of input config object will be reset to zero.
+ * @param endpointUrl holds the endpointUrl of the SKS server
+ * @param securityGroupId the SecurityGroupId of the securityGroup on SKS and
+ * reader/writergroups
+ * @param callback the user defined callback to notify the user about the status of SKS
+ * Pull request.
+ * @param context passed to the callback function
+ * @return UA_StatusCode the retuned status
+ */
+UA_StatusCode UA_EXPORT
+UA_Server_setSksClient(UA_Server *server, UA_String securityGroupId,
+                       UA_ClientConfig *clientConfig, const char *endpointUrl,
+                       UA_Server_sksPullRequestCallback callback, void *context);
+
 #endif /* UA_ENABLE_PUBSUB_SKS */
 
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 6eafe7ced57..164ddd2c6e1 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -10,7 +10,10 @@
 
 #ifdef UA_ENABLE_PUBSUB_SKS /* conditional compilation */
 
+#define UA_REQ_CURRENT_TOKEN 0
+
 #include "server/ua_server_internal.h"
+#include "client/ua_client_internal.h"
 
 UA_PubSubKeyStorage *
 UA_PubSubKeyStorage_findKeyStorage(UA_Server *server, UA_String securityGroupId) {
@@ -430,4 +433,266 @@ UA_PubSubKeyStorage_detachKeyStorage(UA_Server *server, UA_PubSubKeyStorage *key
     }
 }
 
+/**
+ * @brief It holds the information required in the async callback to
+ * GetSecurityKeys method Call.
+ */
+typedef struct {
+    UA_Server *server;
+    UA_PubSubKeyStorage *ks;
+    UA_UInt32 startingTokenId;
+    UA_UInt32 requestedKeyCount;
+} sksClientContext;
+
+void
+sksClientCleanupCb(void *client, void *context);
+
+static UA_StatusCode
+addDelayedSksClientCleanupCb(UA_Client *client){
+    UA_DelayedCallback *dc = (UA_DelayedCallback *)UA_calloc(1, sizeof(UA_DelayedCallback));
+    if(!dc) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "SKS Client: Failed to add addDelayedSksClientCleanup callback "
+                       "with error: %s ",
+                       UA_StatusCode_name(UA_STATUSCODE_BADOUTOFMEMORY));
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    dc->application = client;
+    dc->callback = sksClientCleanupCb;
+    dc->context = dc;
+    client->config.eventLoop->addDelayedCallback(client->config.eventLoop, dc);
+    return UA_STATUSCODE_GOOD;
+}
+
+void
+sksClientCleanupCb(void *client, void *context) {
+    UA_Client *sksClient = (UA_Client *)client;
+    /* we do not want to call state change Callback when cleaning up */
+    sksClient->config.stateCallback = NULL;
+    if(sksClient->sessionState > UA_SESSIONSTATE_CLOSED &&
+       sksClient->channel.state < UA_SECURECHANNELSTATE_CLOSED) {
+        UA_Client_disconnectAsync(sksClient);
+    }
+    if(sksClient->sessionState != UA_SESSIONSTATE_ACTIVATED &&
+       sksClient->channel.state == UA_SECURECHANNELSTATE_CLOSED) {
+        /* we cannot make deep copy of the following pointers because these have internal structures,
+        therefore we do not free them here. These will be freed in UA_PubSubKeyStorage_delete */
+        sksClient->config.securityPolicies = NULL;
+        sksClient->config.securityPoliciesSize = 0;
+        sksClient->config.certificateVerification.context = NULL;
+        sksClient->config.logger.context = NULL;
+        UA_Client_delete(sksClient);
+    } else {
+        addDelayedSksClientCleanupCb(sksClient);
+    }
+    UA_free(context);
+}
+
+static void
+storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
+                 UA_CallResponse *response) {
+
+    sksClientContext *ctx = (sksClientContext *)userdata;
+    UA_PubSubKeyStorage *ks = ctx->ks;
+    UA_Server *server = ctx->server;
+    UA_StatusCode retval = response->responseHeader.serviceResult;
+
+    UA_LOCK(&server->serviceMutex);
+    /* check if the call to getSecurityKeys was a success */
+    if(response->resultsSize != 0)
+        retval = response->results->statusCode;
+    if(retval != UA_STATUSCODE_GOOD) {
+         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "SKS Client: Failed to call GetSecurityKeys on SKS server with error: %s ",
+                     UA_StatusCode_name(retval));
+        goto cleanup;
+    }
+
+    UA_String *securityPolicyUri = (UA_String *)response->results->outputArguments[0].data;
+    UA_UInt32 firstTokenId = *(UA_UInt32 *)response->results->outputArguments[1].data;
+    UA_ByteString *keys = (UA_ByteString *)response->results->outputArguments[2].data;
+    UA_ByteString *currentKey = &keys[0];
+    UA_UInt32 currentKeyCount = 1;
+    UA_ByteString *futureKeys = &keys[currentKeyCount];
+    size_t futureKeySize = response->results->outputArguments[2].arrayLength - currentKeyCount;
+    UA_Duration msKeyLifeTime = *(UA_Duration *)response->results->outputArguments[4].data;
+
+    if(!UA_String_equal(securityPolicyUri, &ks->policy->policyUri)) {
+        retval = UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
+        goto cleanup;
+    }
+
+    if(ks->keyListSize == 0) {
+        retval = UA_PubSubKeyStorage_storeSecurityKeys(server, ks, firstTokenId,
+                                                       currentKey, futureKeys,
+                                                       futureKeySize, msKeyLifeTime);
+        if(retval != UA_STATUSCODE_GOOD)
+            goto cleanup;
+    } else {
+        retval = UA_PubSubKeyStorage_update(server, ks, currentKey, firstTokenId,
+                                            futureKeySize, futureKeys, msKeyLifeTime);
+        if(retval != UA_STATUSCODE_GOOD)
+            goto cleanup;
+    }
+
+    UA_Duration msTimeToNextKey =
+        *(UA_Duration *)response->results->outputArguments[3].data;
+    if(!(msTimeToNextKey > 0))
+        msTimeToNextKey = ks->keyLifeTime;
+    retval = UA_PubSubKeyStorage_addKeyRolloverCallback(
+        server, ks, (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback,
+        msTimeToNextKey, &ks->callBackId);
+
+cleanup:
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Failed to store the fetched keys from SKS server with error: %s",
+                     UA_StatusCode_name(retval));
+    }
+    /* call user callback to notify about the status */
+    UA_UNLOCK(&server->serviceMutex);
+    if(ks->sksConfig.userNotifyCallback)
+        ks->sksConfig.userNotifyCallback(server, retval, ks->sksConfig.context);
+    UA_Client_disconnectAsync(client);
+    addDelayedSksClientCleanupCb(client);
+    return;
+}
+
+static UA_StatusCode
+callGetSecurityKeysMethod(UA_Client *client) {
+
+    sksClientContext *ctx = (sksClientContext *)client->config.clientContext;
+
+    UA_Variant *inputArguments = (UA_Variant *)UA_calloc(3, (sizeof(UA_Variant)));
+    UA_Variant_setScalarCopy(&inputArguments[0], &ctx->ks->securityGroupID,
+                             &UA_TYPES[UA_TYPES_STRING]);
+    UA_Variant_setScalarCopy(&inputArguments[1], &ctx->startingTokenId,
+                             &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant_setScalarCopy(&inputArguments[2], &ctx->requestedKeyCount,
+                             &UA_TYPES[UA_TYPES_UINT32]);
+
+    UA_NodeId objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE);
+    UA_NodeId methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS);
+    size_t inputArgumentsSize = 3;
+
+    return UA_Client_call_async(client, objectId, methodId, inputArgumentsSize,
+                                inputArguments, storeFetchedKeys, (void *)ctx, NULL);
+}
+
+static void
+onConnect(UA_Client *client, UA_SecureChannelState channelState,
+          UA_SessionState sessionState, UA_StatusCode connectStatus) {
+    UA_Boolean triggerSKSCleanup = false;
+    if(connectStatus != UA_STATUSCODE_GOOD && channelState == UA_SECURECHANNELSTATE_CLOSED && sessionState == UA_SESSIONSTATE_CLOSED) {
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "SKS Client: Failed to connect SKS server with error: %s ",
+                     UA_StatusCode_name(connectStatus));
+        triggerSKSCleanup = true;
+    }
+    if(connectStatus == UA_STATUSCODE_GOOD && sessionState == UA_SESSIONSTATE_ACTIVATED) {
+        connectStatus = callGetSecurityKeysMethod(client);
+        if(connectStatus != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_SERVER,
+                         "SKS Client: Failed to call GetSecurityKeys on SKS server with "
+                         "error: %s ",
+                         UA_StatusCode_name(connectStatus));
+            triggerSKSCleanup = true;
+        }
+    }
+    if(triggerSKSCleanup) {
+        client->noReconnect = true;
+        /* call user callback to notify about the status */
+        sksClientContext *ctx = (sksClientContext *)client->config.clientContext;
+        UA_PubSubKeyStorage *ks = ctx->ks;
+        if(ks->sksConfig.userNotifyCallback)
+            ks->sksConfig.userNotifyCallback(ctx->server, connectStatus,
+                                             ks->sksConfig.context);
+    }
+    return;
+}
+
+static void
+setServerEventloopOnSksClient(UA_ClientConfig *cc, UA_EventLoop *externalEventloop) {
+    UA_assert(externalEventloop != NULL);
+    cc->eventLoop = externalEventloop;
+    cc->externalEventLoop = true;
+}
+
+UA_StatusCode
+getSecurityKeysAndStoreFetchedKeys(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_UInt32 startingTokenId = UA_REQ_CURRENT_TOKEN;
+    UA_UInt32 requestKeyCount = UA_UINT32_MAX;
+
+    UA_ClientConfig cc;
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+
+    /* over write the client config with user specified SKS config */
+    retval = UA_ClientConfig_copy(&keyStorage->sksConfig.clientConfig, &cc);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    setServerEventloopOnSksClient(&cc, server->config.eventLoop);
+
+    /* this is cleanedup in sksClientCleanupCb */
+    sksClientContext *ctx   = (sksClientContext *)UA_calloc(1, sizeof(sksClientContext));
+    if(!ctx)
+         return UA_STATUSCODE_BADOUTOFMEMORY;
+    ctx->ks = keyStorage;
+    ctx->server = server;
+    ctx->startingTokenId = startingTokenId;
+    ctx->requestedKeyCount = requestKeyCount;
+    cc.clientContext = ctx;
+
+    UA_Client *client = UA_Client_newWithConfig(&cc);
+    if(!client)
+        return retval;
+    /* connect to sks server */
+    retval = UA_Client_connectAsync(client, keyStorage->sksConfig.endpointUrl);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "Failed to connect SKS server with error: %s ",
+                     UA_StatusCode_name(retval));
+        /* Make sure the client channel state is closed and not fresh, otherwise, eventloop will
+        keep waiting for the client status to go from Fresh to closed in UA_Client_delete*/
+        client->channel.state = UA_SECURECHANNELSTATE_CLOSED;
+        /* this client instance will be cleared in the next event loop iteration */
+        addDelayedSksClientCleanupCb(client);
+        return retval;
+    }
+
+    /* add user specified callback, if the client is properly configured. */
+    client->config.stateCallback = onConnect;
+
+    return retval;
+}
+
+UA_StatusCode
+UA_Server_setSksClient(UA_Server *server, UA_String securityGroupId,
+                       UA_ClientConfig *clientConfig, const char *endpointUrl,
+                       UA_Server_sksPullRequestCallback callback, void *context) {
+    if(!server || !clientConfig || !endpointUrl)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_StatusCode retval = UA_STATUSCODE_BADNOTFOUND;
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
+    if(!ks) {
+        UA_UNLOCK(&server->serviceMutex);
+        return retval;
+    }
+
+    ks->sksConfig.clientConfig = *clientConfig;
+    memset(clientConfig, 0, sizeof(UA_ClientConfig));
+    ks->sksConfig.endpointUrl = endpointUrl;
+    ks->sksConfig.userNotifyCallback = callback;
+    ks->sksConfig.context = context;
+    /* if keys are not previously fetched, then first call GetSecurityKeys*/
+    if(ks->keyListSize == 0) {
+        retval = getSecurityKeysAndStoreFetchedKeys(server, ks);
+    }
+    UA_UNLOCK(&server->serviceMutex);
+    return retval;
+}
+
 #endif
diff --git a/src/pubsub/ua_pubsub_keystorage.h b/src/pubsub/ua_pubsub_keystorage.h
index d3da7911586..d75bb527c3c 100644
--- a/src/pubsub/ua_pubsub_keystorage.h
+++ b/src/pubsub/ua_pubsub_keystorage.h
@@ -10,7 +10,10 @@
 #define UA_PUBSUB_KEYSTORAGE
 
 #include <open62541/plugin/securitypolicy.h>
+#include <open62541/client_highlevel_async.h>
+#include <open62541/client_config_default.h>
 #include <open62541/server.h>
+#include <open62541/client.h>
 
 #include "open62541_queue.h"
 
@@ -112,6 +115,17 @@ typedef struct UA_PubSubKeyListItem {
 /* Queue Definition*/
 typedef TAILQ_HEAD(keyListItems, UA_PubSubKeyListItem) keyListItems;
 
+/**
+ * @brief It is used to hold configuration information required to connect an SKS server
+ * and fetch the security keys
+ */
+typedef struct UA_PubSubSKSConfig {
+    UA_ClientConfig clientConfig;
+    const char *endpointUrl;
+    UA_Server_sksPullRequestCallback userNotifyCallback;
+    void *context;
+} UA_PubSubSKSConfig;
+
 /**
  * @brief This structure holds all info and keys related to one SecurityGroup.
  * it is used as a list.
@@ -186,6 +200,11 @@ typedef struct UA_PubSubKeyStorage {
      */
     UA_UInt64 callBackId;
 
+    /**
+     * used to store the sks related information to connect with SKS server and fetch security keys.
+     */
+    UA_PubSubSKSConfig sksConfig;
+
     /**
      * Pointer to the key storage list
      */
@@ -360,6 +379,10 @@ UA_PubSubKeyStorage_update(UA_Server *server, UA_PubSubKeyStorage *keyStorage,
 void
 UA_PubSubKeyStorage_detachKeyStorage(UA_Server *server, UA_PubSubKeyStorage *keyStorage);
 
+/*Calls get SecurityKeys Method and Store the returned keys into KeyStorage*/
+UA_StatusCode
+getSecurityKeysAndStoreFetchedKeys(UA_Server *server, UA_PubSubKeyStorage *keyStorage);
+
 #endif
 
 _UA_END_DECLS

From 09857ef27f78ec5d9a9f3592773a5f9ad81c37e5 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 4 Aug 2022 14:32:26 +0200
Subject: [PATCH 0716/1963] feat(pubsub): set encrypting key when pubsubgroup
 is operational

After setting the sksclient for a keystorage to fetch the keys from SKS
server, the Currentkey in the keystorage has to be set in the channel context
of Reader/Writer Group for encryption and signing. This has to be done
before Reader/Writer Group is in operational state. Therefore
setWriterGroupOperationl and setReaderGroupOprational is modified to set the
current key in keystorage in the channelcontext of associated Reader/Writer
Group.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_readergroup.c | 13 ++++++++++++-
 src/pubsub/ua_pubsub_writergroup.c | 14 +++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index d4b2e3915e5..8ff7842aa01 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -482,9 +482,20 @@ UA_Server_setReaderGroupOperational(UA_Server *server, const UA_NodeId readerGro
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
-    if(rg)
+    if(rg) {
+#ifdef UA_ENABLE_PUBSUB_SKS
+        if(rg->keyStorage && rg->keyStorage->currentItem) {
+            UA_StatusCode retval = UA_PubSubKeyStorage_activateKeyToChannelContext(
+                server, rg->identifier, rg->config.securityGroupId);
+            if(retval != UA_STATUSCODE_GOOD) {
+                UA_UNLOCK(&server->serviceMutex);
+                return retval;
+            }
+        }
+#endif
         ret = UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_OPERATIONAL,
                                             UA_STATUSCODE_GOOD);
+    }
     UA_UNLOCK(&server->serviceMutex);
     return ret;
 }
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index b1ae2ba1c4f..46747505524 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -530,9 +530,21 @@ UA_Server_setWriterGroupOperational(UA_Server *server,
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(wg)
+    if(wg) {
+#ifdef UA_ENABLE_PUBSUB_SKS
+        if(wg->keyStorage && wg->keyStorage->currentItem) {
+            res = UA_PubSubKeyStorage_activateKeyToChannelContext(
+                server, wg->identifier, wg->config.securityGroupId);
+            if(res != UA_STATUSCODE_GOOD) {
+                UA_UNLOCK(&server->serviceMutex);
+                return res;
+            }
+        }
+#endif
+
         res = UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL,
                                             UA_STATUSCODE_GOOD);
+    }
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }

From bd98e870eb7675c2c983d9aeecfb769710e24513 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 4 Aug 2022 14:52:41 +0200
Subject: [PATCH 0717/1963] feat(pubsub): add timedcallback for next
 GetSecurityKeys method call

The Publishers and Subscribers are required to pull the keys from SKS
before the expiration of keylifetime of their last key. The nextGetSecurityKeys
Callback is added to pull the keys from SKS. It is added when the keyStorage
switches to the last key in the existing keylist.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_keystorage.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 164ddd2c6e1..195c0868aca 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -354,6 +354,22 @@ UA_PubSubKeyStorage_activateKeyToChannelContext(UA_Server *server, UA_NodeId pub
     return retval;
 }
 
+static void
+nextGetSecuritykeysCallback(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    if(!keyStorage) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "GetSecurityKeysCall Failed with error: KeyStorage does not exist "
+                     "in the server");
+        return;
+    }
+    retval = getSecurityKeysAndStoreFetchedKeys(server, keyStorage);
+    if(retval != UA_STATUSCODE_GOOD)
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "GetSecurityKeysCall Failed with error: %s ",
+                     UA_StatusCode_name(retval));
+}
+
 void
 UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     /* Callbacks from the EventLoop are initially unlocked */
@@ -380,6 +396,15 @@ UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *
                          (int)keyStorage->securityGroupID.length, keyStorage->securityGroupID.data,
                          UA_StatusCode_name(retval));
         }
+    } else if(keyStorage->sksConfig.endpointUrl) {
+        UA_DateTime now = UA_DateTime_nowMonotonic();
+        /*Publishers using a central SKS shall call GetSecurityKeys at a period of half the KeyLifetime */
+        UA_Duration msTimeToNextGetSecurityKeys = keyStorage->keyLifeTime / 2;
+        UA_DateTime dateTimeToNextGetSecurityKeys =
+            now + (UA_DateTime)(UA_DATETIME_MSEC * msTimeToNextGetSecurityKeys);
+        retval = server->config.eventLoop->addTimedCallback(
+            server->config.eventLoop, (UA_Callback)nextGetSecuritykeysCallback, server,
+            keyStorage, dateTimeToNextGetSecurityKeys, NULL);
     }
     UA_UNLOCK(&server->serviceMutex);
 }

From 5842a447abf9cb7190f9eddcf92c54502ce9c955 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 4 Aug 2022 15:25:12 +0200
Subject: [PATCH 0718/1963] test(pubsub): add unit tests for SKS client
 functionality

The test suit includes following test cases:

@testcases:
- AddWriterGroupWithValidConfig
- AddReaderGroupWithValidConfig
- SetInvalidSKSClient
- checkPublishedValuesInUserLand
- PublisherSubscriberTogethor
- DelayedSubscriber
- FatchNextBatchofKeys
- invalid SKS endpointUrl

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/CMakeLists.txt                   |   1 +
 tests/pubsub/check_pubsub_sks_client.c | 816 +++++++++++++++++++++++++
 2 files changed, 817 insertions(+)
 create mode 100644 tests/pubsub/check_pubsub_sks_client.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index de99b047fbe..66de978ab4a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -344,6 +344,7 @@ if(UA_ENABLE_PUBSUB)
             ua_add_test(pubsub/check_pubsub_sks_push.c)
             ua_add_test(pubsub/check_pubsub_sks_pull.c)
             ua_add_test(pubsub/check_pubsub_sks_securitygroups.c)
+            ua_add_test(pubsub/check_pubsub_sks_client.c)
         endif()
     endif()
 
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
new file mode 100644
index 00000000000..8fcac96d1a2
--- /dev/null
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -0,0 +1,816 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/server_config_default.h>
+#include <open62541/server_pubsub.h>
+
+#include "ua_pubsub.h"
+#include "ua_pubsub_keystorage.h"
+#include "ua_server_internal.h"
+
+#include <check.h>
+
+#include "../encryption/certificates.h"
+#include "testing_clock.h"
+#include "thread_wrapper.h"
+
+#define PUBLISHER_ID 2234             /*Publisher Id*/
+#define WRITER_GROUP_ID 100           /*Writer group Id*/
+#define DATASET_WRITER_ID 62541       /*Dataset Writer id*/
+#define PUBLISHVARIABLE_NODEID 1000   /* Published data nodeId */
+#define SUBSCRIBEVARIABLE_NODEID 1002 /* Subscribed data nodeId */
+#define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
+#define policUri "http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR"
+#define testingSKSEndpointUrl "opc.tcp://localhost:4840"
+
+#define TESTINGSECURITYMODE UA_MESSAGESECURITYMODE_SIGNANDENCRYPT
+
+
+UA_Boolean running;
+UA_UInt32 maxKeyCount;
+UA_String securityGroupId;
+THREAD_HANDLE server_thread;
+UA_Server *sksServer, *publisherApp, *subscriberApp;
+UA_NodeId writerGroupId, readerGroupId;
+UA_NodeId publisherConnection, subscriberConnection;
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(sksServer, true);
+    return 0;
+}
+
+static void
+disableAnonymous(UA_ServerConfig *config) {
+    for(size_t i = 0; i < config->endpointsSize; i++) {
+        UA_EndpointDescription *ep = &config->endpoints[i];
+
+        for(size_t j = 0; j < ep->userIdentityTokensSize; j++) {
+            UA_UserTokenPolicy *utp = &ep->userIdentityTokens[j];
+            if(utp->tokenType != UA_USERTOKENTYPE_ANONYMOUS)
+                continue;
+
+            UA_UserTokenPolicy_clear(utp);
+            /* Move the last to this position */
+            if(j + 1 < ep->userIdentityTokensSize) {
+                ep->userIdentityTokens[j] = ep->userIdentityTokens[ep->userIdentityTokensSize-1];
+                j--;
+            }
+            ep->userIdentityTokensSize--;
+        }
+
+        /* Delete the entire array if the last UserTokenPolicy was removed */
+        if(ep->userIdentityTokensSize == 0) {
+            UA_free(ep->userIdentityTokens);
+            ep->userIdentityTokens = NULL;
+        }
+    }
+}
+
+static void
+addSecurityGroup(void) {
+    UA_NodeId securityGroupParent =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
+    UA_NodeId outNodeId;
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = 200;
+    config.securityPolicyUri = UA_STRING(policUri);
+    config.securityGroupName = UA_STRING("TestSecurityGroup");
+    config.maxFutureKeyCount = 1;
+    config.maxPastKeyCount = 1;
+
+    maxKeyCount = config.maxPastKeyCount + 1 + config.maxFutureKeyCount;
+
+    UA_Server_addSecurityGroup(sksServer, securityGroupParent, &config, &outNodeId);
+    UA_String_copy(&config.securityGroupName, &securityGroupId);
+
+    UA_String allowedUsername = UA_STRING("user1");
+
+    UA_ByteString *username = UA_ByteString_new();
+    UA_ByteString_copy(&allowedUsername, username);
+    UA_Server_setNodeContext(sksServer, outNodeId, username);
+}
+
+static UA_Boolean
+getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
+                              const UA_NodeId *sessionId, void *sessionContext,
+                              const UA_NodeId *methodId, void *methodContext,
+                              const UA_NodeId *objectId, void *objectContext) {
+    if(objectContext && sessionContext) {
+        UA_ByteString *username = (UA_ByteString *)objectContext;
+        UA_ByteString *sessionUsername = (UA_ByteString *)sessionContext;
+        if(!UA_ByteString_equal(username, sessionUsername))
+            return false;
+    }
+    return true;
+}
+
+static void
+skssetup(void) {
+    running = true;
+
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    size_t trustListSize = 0;
+    UA_ByteString *trustList = NULL;
+    size_t issuerListSize = 0;
+    UA_ByteString *issuerList = NULL;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    sksServer = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(sksServer);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(
+        config, 4840, &certificate, &privateKey, trustList, trustListSize, issuerList,
+        issuerListSize, revocationList, revocationListSize);
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    disableAnonymous(config);
+
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+
+    config->pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+
+    /*User Access Control*/
+    config->accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
+
+    addSecurityGroup();
+
+    UA_Server_run_startup(sksServer);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void
+publishersetup(void) {
+    running = true;
+    publisherApp = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(publisherApp);
+    UA_ServerConfig_setMinimal(config, 4841, NULL);
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+
+    config->pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("UADP Connection");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {
+        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = PUBLISHER_ID;
+    UA_Server_addPubSubConnection(publisherApp, &connectionConfig, &publisherConnection);
+
+    UA_Server_run_startup(publisherApp);
+}
+
+static void
+subscribersetup(void) {
+    running = true;
+    subscriberApp = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(subscriberApp);
+    UA_ServerConfig_setMinimal(config, 4842, NULL);
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+
+    config->pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("UADP Connection");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {
+        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_Server_addPubSubConnection(subscriberApp, &connectionConfig,
+                                  &subscriberConnection);
+
+    UA_Server_run_startup(subscriberApp);
+}
+
+static void
+sksteardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(sksServer);
+    UA_Server_delete(sksServer);
+}
+
+static void
+publisherteardown(void) {
+    running = false;
+    UA_Server_run_shutdown(publisherApp);
+    UA_Server_delete(publisherApp);
+}
+
+static void
+subscriberteardown(void) {
+    running = false;
+    UA_Server_run_shutdown(subscriberApp);
+    UA_Server_delete(subscriberApp);
+}
+
+static UA_StatusCode
+addPublisher(UA_Server *server) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId publishedDataSetIdent;
+    UA_NodeId dataSetFieldIdent;
+    UA_NodeId dataSetWriterIdent;
+
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
+    writerGroupConfig.publishingInterval = 100;
+    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.writerGroupId = WRITER_GROUP_ID;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+
+    writerGroupConfig.securityMode = TESTINGSECURITYMODE;
+    writerGroupConfig.securityGroupId = securityGroupId;
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+
+    writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    writerGroupConfig.messageSettings.content.decoded.type =
+        &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    UA_UadpWriterGroupMessageDataType *writerGroupMessage =
+        UA_UadpWriterGroupMessageDataType_new();
+    writerGroupMessage->networkMessageContentMask =
+        (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                           (UA_UadpNetworkMessageContentMask)
+                                               UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                           (UA_UadpNetworkMessageContentMask)
+                                               UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                           (UA_UadpNetworkMessageContentMask)
+                                               UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+
+    retval = UA_Server_addWriterGroup(server, publisherConnection, &writerGroupConfig,
+                                      &writerGroupId);
+    UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+    UA_PublishedDataSetConfig publishedDataSetConfig;
+    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    publishedDataSetConfig.name = UA_STRING("test PDS");
+    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig,
+                                  &publishedDataSetIdent);
+
+    /* Create variable to publish integer data */
+    UA_NodeId publisherNode;
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    attr.description = UA_LOCALIZEDTEXT("en-US", "The answer");
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "The answer");
+    attr.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
+    UA_Int32 publisherData = 42;
+    UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT32]);
+
+    retval = UA_Server_addVariableNode(
+        server, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "The answer"),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, &publisherNode);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_DataSetFieldConfig dataSetFieldConfig;
+    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("The answer");
+    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
+    dataSetFieldConfig.field.variable.publishParameters.attributeId =
+        UA_ATTRIBUTEID_VALUE;
+    UA_Server_addDataSetField(server, publishedDataSetIdent, &dataSetFieldConfig,
+                              &dataSetFieldIdent);
+
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING("Demo DataSetWriter");
+    dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
+    dataSetWriterConfig.keyFrameCount = 10;
+    UA_Server_addDataSetWriter(server, writerGroupId, publishedDataSetIdent,
+                               &dataSetWriterConfig, &dataSetWriterIdent);
+
+    return retval;
+}
+
+static UA_StatusCode
+addSubscriber(UA_Server *server) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_NodeId readerIdentifier;
+
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING("ReaderGroup1");
+
+    /* Encryption settings */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    readerGroupConfig.securityMode = TESTINGSECURITYMODE;
+    readerGroupConfig.securityGroupId = securityGroupId;
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+
+    retval |= UA_Server_addReaderGroup(server, subscriberConnection, &readerGroupConfig,
+                                       &readerGroupId);
+
+    UA_DataSetReaderConfig readerConfig;
+    memset(&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
+    readerConfig.name = UA_STRING("DataSet Reader 1");
+    UA_UInt16 publisherIdentifier = PUBLISHER_ID;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId = WRITER_GROUP_ID;
+    readerConfig.dataSetWriterId = DATASET_WRITER_ID;
+
+    UA_DataSetMetaDataType_init(&readerConfig.dataSetMetaData);
+    readerConfig.dataSetMetaData.name = UA_STRING("DataSet 1");
+
+    readerConfig.dataSetMetaData.fieldsSize = 1;
+    readerConfig.dataSetMetaData.fields = (UA_FieldMetaData *)UA_Array_new(
+        readerConfig.dataSetMetaData.fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+
+    UA_FieldMetaData_init(&readerConfig.dataSetMetaData.fields[0]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT32].typeId,
+                   &readerConfig.dataSetMetaData.fields[0].dataType);
+    readerConfig.dataSetMetaData.fields[0].builtInType = UA_NS0ID_INT32;
+    readerConfig.dataSetMetaData.fields[0].name = UA_STRING("The answer");
+    readerConfig.dataSetMetaData.fields[0].valueRank = -1; /* scalar */
+
+    retval = UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
+                                        &readerIdentifier);
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "%s \n",
+                UA_StatusCode_name(retval));
+    /*Add Subscribed Variable and target variable */
+    UA_NodeId folderId;
+    UA_String folderName = readerConfig.dataSetMetaData.name;
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName;
+    if(folderName.length > 0) {
+        oAttr.displayName.locale = UA_STRING("en-US");
+        oAttr.displayName.text = folderName;
+        folderBrowseName.namespaceIndex = 1;
+        folderBrowseName.name = folderName;
+    } else {
+        oAttr.displayName = UA_LOCALIZEDTEXT("en-US", "Subscribed Variables");
+        folderBrowseName = UA_QUALIFIEDNAME(1, "Subscribed Variables");
+    }
+
+    UA_Server_addObjectNode(
+        server, UA_NODEID_NULL, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), folderBrowseName,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+
+    UA_FieldTargetVariable *targetVars = (UA_FieldTargetVariable *)UA_calloc(
+        readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
+    /* Variable to subscribe data */
+    UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+    UA_LocalizedText_copy(&readerConfig.dataSetMetaData.fields->description,
+                          &vAttr.description);
+    vAttr.displayName.locale = UA_STRING("en-US");
+    vAttr.displayName.text = readerConfig.dataSetMetaData.fields->name;
+    vAttr.dataType = readerConfig.dataSetMetaData.fields->dataType;
+
+    UA_NodeId newNode;
+    retval = UA_Server_addVariableNode(
+        server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), folderId,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+        UA_QUALIFIEDNAME(1, (char *)readerConfig.dataSetMetaData.fields->name.data),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newNode);
+
+    /* For creating Targetvariables */
+    UA_FieldTargetDataType_init(&targetVars->targetVariable);
+    targetVars->targetVariable.attributeId = UA_ATTRIBUTEID_VALUE;
+    targetVars->targetVariable.targetNodeId = newNode;
+
+    retval = UA_Server_DataSetReader_createTargetVariables(
+        server, readerIdentifier, readerConfig.dataSetMetaData.fieldsSize, targetVars);
+    UA_FieldTargetDataType_clear(&targetVars->targetVariable);
+
+    UA_free(targetVars);
+    UA_free(readerConfig.dataSetMetaData.fields);
+    return retval;
+}
+
+static UA_ClientConfig *
+newEncryptedClientConfig(const char *username, const char *password) {
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    /* Secure client initialization */
+
+    UA_ClientConfig *cc = (UA_ClientConfig *)UA_calloc(1, sizeof(UA_ClientConfig));
+    cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey, trustList,
+                                         trustListSize, revocationList,
+                                         revocationListSize);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+
+    UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
+    identityToken->userName = UA_STRING_ALLOC(username);
+    identityToken->password = UA_STRING_ALLOC(password);
+    UA_ExtensionObject_clear(&cc->userIdentityToken);
+    cc->userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
+    cc->userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN];
+    cc->userIdentityToken.content.decoded.data = identityToken;
+
+    return cc;
+}
+
+UA_StatusCode sksPullStatus = UA_STATUSCODE_BAD;
+
+static void
+sksPullRequestCallback(UA_Server *server, UA_StatusCode sksPullRequestStatus, void *data) {
+    sksPullStatus = sksPullRequestStatus;
+}
+
+START_TEST(AddValidSksClientwithWriterGroup) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_ClientConfig *config = newEncryptedClientConfig("user1", "password");
+    retval = addPublisher(publisherApp);
+
+    retval = UA_Server_setSksClient(publisherApp, securityGroupId, config, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s ",
+                  UA_StatusCode_name(retval));
+    while(UA_StatusCode_isBad(sksPullStatus)) {
+        UA_Server_run_iterate(publisherApp, true);
+    }
+    ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s ",
+                  UA_StatusCode_name(retval));
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(publisherApp, writerGroupId);
+    ck_assert(wg != NULL);
+    retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s ",
+                  UA_StatusCode_name(retval));
+    ck_assert(wg->keyStorage->keyListSize > 0);
+    UA_LOCK(&sksServer->serviceMutex);
+    UA_PubSubKeyListItem *sksKsItr =
+        UA_PubSubKeyStorage_findKeyStorage(sksServer, securityGroupId)
+            ->currentItem;
+    UA_UNLOCK(&sksServer->serviceMutex);
+    UA_PubSubKeyListItem *wgKsItr = TAILQ_FIRST(&wg->keyStorage->keyList);
+    for(size_t i = 0; i < wg->keyStorage->keyListSize; i++) {
+        ck_assert_msg(UA_ByteString_equal(&sksKsItr->key, &wgKsItr->key) == UA_TRUE,
+                      "Expected the Current Key and future keys in the SKS to be equal "
+                      "to the Current and future keys in Publisher");
+        ck_assert_uint_eq(sksKsItr->keyID, wgKsItr->keyID);
+        sksKsItr = TAILQ_NEXT(sksKsItr, keyListEntry);
+        wgKsItr = TAILQ_NEXT(wgKsItr, keyListEntry);
+    }
+}
+END_TEST
+
+START_TEST(AddValidSksClientwithReaderGroup) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    UA_ClientConfig *config = newEncryptedClientConfig("user1", "password");
+    retval = addSubscriber(subscriberApp);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good but failed with: %s ",
+                  UA_StatusCode_name(retval));
+    retval = UA_Server_setSksClient(subscriberApp, securityGroupId, config, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s ",
+                  UA_StatusCode_name(retval));
+    sksPullStatus = UA_STATUSCODE_BAD;
+    while(UA_StatusCode_isBad(sksPullStatus)) {
+        UA_Server_run_iterate(subscriberApp, false);
+    }
+    ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s ",
+                  UA_StatusCode_name(retval));
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(subscriberApp, readerGroupId);
+    ck_assert(rg != NULL);
+
+    retval = UA_Server_setReaderGroupOperational(subscriberApp, writerGroupId);
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s ",
+                  UA_StatusCode_name(retval));
+    ck_assert(rg->keyStorage->keyListSize > 0);
+    UA_LOCK(&sksServer->serviceMutex);
+    UA_PubSubKeyListItem *sksKsItr =
+        UA_PubSubKeyStorage_findKeyStorage(sksServer, securityGroupId)
+            ->currentItem;
+    UA_UNLOCK(&sksServer->serviceMutex);
+    UA_PubSubKeyListItem *rgKsItr = TAILQ_FIRST(&rg->keyStorage->keyList);
+    for(size_t i = 0; i < rg->keyStorage->keyListSize; i++) {
+        ck_assert_msg(UA_ByteString_equal(&sksKsItr->key, &rgKsItr->key) == UA_TRUE,
+                      "Expected the Current Key and future keys in the SKS to be equal "
+                      "to the Current and future keys in Publisher");
+        ck_assert_uint_eq(sksKsItr->keyID, rgKsItr->keyID);
+        sksKsItr = TAILQ_NEXT(sksKsItr, keyListEntry);
+        rgKsItr = TAILQ_NEXT(rgKsItr, keyListEntry);
+    }
+    ck_assert(rg->keyStorage->keyListSize > 0);
+}
+END_TEST
+
+START_TEST(SetInvalidSKSClient) {
+    addPublisher(publisherApp);
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_Server_setSksClient(publisherApp, securityGroupId, config, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    sksPullStatus = UA_STATUSCODE_GOOD;
+    while(UA_StatusCode_isGood(sksPullStatus)) {
+        UA_Server_run_iterate(publisherApp, false);
+    }
+    ck_assert_msg(sksPullStatus != UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be not GOOD, but failed with: %s ",
+                  UA_StatusCode_name(sksPullStatus));
+}
+END_TEST
+
+START_TEST(SetInvalidSKSEndpointUrl) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    retval = addPublisher(publisherApp);
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+
+    retval = UA_Server_setSksClient(publisherApp, securityGroupId, config, "opc.tcp:[invalid:host]:4840", sksPullRequestCallback, NULL);
+    ck_assert_msg(retval == UA_STATUSCODE_BADTCPENDPOINTURLINVALID,
+                  "Expected Statuscode to be BADTCPENDPOINTURLINVALID, but failed with: %s ",
+                  UA_StatusCode_name(retval));
+
+    retval = UA_Server_setSksClient(publisherApp, securityGroupId, config, "opc.tcp://WrongHost:4840", sksPullRequestCallback, NULL);
+    ck_assert_msg(retval == UA_STATUSCODE_BADCONNECTIONCLOSED,
+                  "Expected Statuscode to be BADCONNECTIONCLOSED, but failed with: %s ",
+                  UA_StatusCode_name(retval));
+}
+END_TEST
+
+START_TEST(CheckPublishedValuesInUserLand) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    retval = addPublisher(publisherApp);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+    retval = addSubscriber(subscriberApp);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    UA_ClientConfig *pubSksClientConfig = newEncryptedClientConfig("user1", "password");
+    retval =
+        UA_Server_setSksClient(publisherApp, securityGroupId, pubSksClientConfig, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+    sksPullStatus = UA_STATUSCODE_BAD;
+    while(UA_StatusCode_isBad(sksPullStatus)) {
+        UA_Server_run_iterate(publisherApp, false);
+    }
+
+    UA_ClientConfig *subSksClientConfig = newEncryptedClientConfig("user1", "password");
+    retval =
+        UA_Server_setSksClient(subscriberApp, securityGroupId, subSksClientConfig, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+    sksPullStatus = UA_STATUSCODE_BAD;
+    while(UA_StatusCode_isBad(sksPullStatus)) {
+        UA_Server_run_iterate(subscriberApp, false);
+    }
+
+    retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+    retval = UA_Server_setReaderGroupOperational(subscriberApp, readerGroupId);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    UA_Variant *publishedNodeData = UA_Variant_new();
+    retval = UA_Server_readValue(
+        publisherApp, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant *subscribedNodeData = UA_Variant_new();
+    retval =
+        UA_Server_readValue(subscriberApp, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
+                            subscribedNodeData);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(*(UA_Int32 *)publishedNodeData->data,
+                     *(UA_Int32 *)subscribedNodeData->data);
+    UA_Variant_delete(subscribedNodeData);
+    UA_Variant_delete(publishedNodeData);
+}
+END_TEST
+
+START_TEST(PublisherSubscriberTogethor) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    retval = addSubscriber(publisherApp);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+     retval = addPublisher(publisherApp);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    UA_ClientConfig *pubSksClientConfig = newEncryptedClientConfig("user1", "password");
+    retval =
+        UA_Server_setSksClient(publisherApp, securityGroupId, pubSksClientConfig, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    sksPullStatus = UA_STATUSCODE_BAD;
+    while(UA_StatusCode_isBad(sksPullStatus)) {
+        UA_Server_run_iterate(publisherApp, false);
+    }
+    retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+    retval = UA_Server_setReaderGroupOperational(publisherApp, readerGroupId);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    UA_Variant *publishedNodeData = UA_Variant_new();
+    retval = UA_Server_readValue(
+        publisherApp, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant *subscribedNodeData = UA_Variant_new();
+    retval = UA_Server_readValue(
+        publisherApp, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), subscribedNodeData);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(*(UA_Int32 *)publishedNodeData->data,
+                     *(UA_Int32 *)subscribedNodeData->data);
+    UA_Variant_delete(subscribedNodeData);
+    UA_Variant_delete(publishedNodeData);
+}
+END_TEST
+
+START_TEST(PublisherDelayedSubscriberTogethor) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+
+    retval = addPublisher(publisherApp);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    UA_ClientConfig *pubSksClientConfig = newEncryptedClientConfig("user1", "password");
+
+    retval = addSubscriber(publisherApp);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    retval =
+        UA_Server_setSksClient(publisherApp, securityGroupId, pubSksClientConfig, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    sksPullStatus = UA_STATUSCODE_BAD;
+    while(UA_StatusCode_isBad(sksPullStatus)) {
+        UA_Server_run_iterate(publisherApp, false);
+    }
+
+    retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    retval = UA_Server_setReaderGroupOperational(publisherApp, readerGroupId);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(publisherApp, readerGroupId);
+    ck_assert(rg->securityPolicyContext != NULL);
+    UA_Variant *publishedNodeData = UA_Variant_new();
+    retval = UA_Server_readValue(
+        publisherApp, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant *subscribedNodeData = UA_Variant_new();
+    retval = UA_Server_readValue(
+        publisherApp, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), subscribedNodeData);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(*(UA_Int32 *)publishedNodeData->data,
+                     *(UA_Int32 *)subscribedNodeData->data);
+    UA_Variant_delete(subscribedNodeData);
+    UA_Variant_delete(publishedNodeData);
+}
+END_TEST
+
+START_TEST(FetchNextbatchOfKeys) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+
+    retval = addPublisher(publisherApp);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    UA_ClientConfig *pubSksClientConfig = newEncryptedClientConfig("user1", "password");
+    retval =
+        UA_Server_setSksClient(publisherApp, securityGroupId, pubSksClientConfig, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    sksPullStatus = UA_STATUSCODE_BAD;
+    while(UA_StatusCode_isBad(sksPullStatus)) {
+        UA_Server_run_iterate(publisherApp, false);
+    }
+
+    retval = addSubscriber(subscriberApp);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    UA_ClientConfig *subSksClientConfig = newEncryptedClientConfig("user1", "password");
+
+    retval =
+        UA_Server_setSksClient(subscriberApp, securityGroupId, subSksClientConfig, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    sksPullStatus = UA_STATUSCODE_BAD;
+    while(UA_StatusCode_isBad(sksPullStatus)) {
+        UA_Server_run_iterate(subscriberApp, false);
+    }
+    UA_LOCK(&publisherApp->serviceMutex);
+    UA_PubSubKeyStorage *pubKs = UA_PubSubKeyStorage_findKeyStorage(
+        publisherApp, securityGroupId);
+    UA_UNLOCK(&publisherApp->serviceMutex);
+    UA_LOCK(&subscriberApp->serviceMutex);
+    UA_PubSubKeyStorage *subKs = UA_PubSubKeyStorage_findKeyStorage(
+        subscriberApp, securityGroupId);
+    UA_UNLOCK(&subscriberApp->serviceMutex);
+    retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    retval = UA_Server_setReaderGroupOperational(subscriberApp, readerGroupId);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+
+    sksPullStatus = UA_STATUSCODE_BAD;
+    UA_UInt16 sksPullIteration = 0;
+    while(true) {
+        UA_Server_run_iterate(subscriberApp, true);
+        UA_Server_run_iterate(publisherApp, true);
+        /* we make sure to iterate for few sks pull cycles */
+        if(UA_StatusCode_isGood(sksPullStatus)) {
+            sksPullStatus = UA_STATUSCODE_BAD;
+            ++sksPullIteration;
+        }
+        /* we need to run extra iterations for key rollover callbacks */
+        if(sksPullIteration > 10 &&
+           subKs->currentItem->keyID == pubKs->currentItem->keyID)
+            break;
+        UA_fakeSleep(100);
+    }
+    ck_assert(subKs->currentItem->keyID == pubKs->currentItem->keyID);
+    ck_assert(UA_ByteString_equal(&subKs->currentItem->key, &pubKs->currentItem->key));
+    UA_Variant *publishedNodeData = UA_Variant_new();
+    retval = UA_Server_readValue(
+        publisherApp, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant *subscribedNodeData = UA_Variant_new();
+    retval =
+        UA_Server_readValue(subscriberApp, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
+                            subscribedNodeData);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(*(UA_Int32 *)publishedNodeData->data,
+                     *(UA_Int32 *)subscribedNodeData->data);
+    UA_Variant_delete(subscribedNodeData);
+    UA_Variant_delete(publishedNodeData);
+}
+END_TEST
+
+int
+main(void) {
+    int number_failed = 0;
+    TCase *tc_pubsub_sks_client = tcase_create("PubSub SKS Client");
+    tcase_add_checked_fixture(tc_pubsub_sks_client, skssetup, sksteardown);
+    tcase_add_checked_fixture(tc_pubsub_sks_client, publishersetup, publisherteardown);
+    tcase_add_checked_fixture(tc_pubsub_sks_client, subscribersetup, subscriberteardown);
+    tcase_add_test(tc_pubsub_sks_client, AddValidSksClientwithWriterGroup);
+    tcase_add_test(tc_pubsub_sks_client, AddValidSksClientwithReaderGroup);
+    tcase_add_test(tc_pubsub_sks_client, SetInvalidSKSClient);
+    tcase_add_test(tc_pubsub_sks_client, SetInvalidSKSEndpointUrl);
+    tcase_add_test(tc_pubsub_sks_client, CheckPublishedValuesInUserLand);
+    tcase_add_test(tc_pubsub_sks_client, PublisherSubscriberTogethor);
+    tcase_add_test(tc_pubsub_sks_client, PublisherDelayedSubscriberTogethor);
+    tcase_add_test(tc_pubsub_sks_client, FetchNextbatchOfKeys);
+
+    Suite *s = suite_create("PubSub SKS Client");
+    suite_add_tcase(s, tc_pubsub_sks_client);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 11f9ab0c45af470d97d09f9d607cc795735453ec Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Tue, 25 Oct 2022 09:38:29 +0200
Subject: [PATCH 0719/1963] ex(pubsub): add SKS examples

The sks examples provide better documentation and usage of the sks feature
in the user application for secure key exchange.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 examples/CMakeLists.txt                       |   5 +-
 examples/pubsub/sks/CMakeLists.txt            |   7 +
 .../pubsub/sks/pubsub_publish_encrypted_sks.c | 262 +++++++++
 .../sks/pubsub_subscribe_encrypted_sks.c      | 433 ++++++++++++++
 .../pubsub/sks/server_pubsub_central_sks.c    | 531 ++++++++++++++++++
 5 files changed, 1237 insertions(+), 1 deletion(-)
 create mode 100644 examples/pubsub/sks/CMakeLists.txt
 create mode 100644 examples/pubsub/sks/pubsub_publish_encrypted_sks.c
 create mode 100644 examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
 create mode 100644 examples/pubsub/sks/server_pubsub_central_sks.c

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2d2fd3a89b7..f8639257db3 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -256,6 +256,9 @@ if(UA_ENABLE_PUBSUB)
             target_link_libraries(pubsub_publish_encrypted_tpm_keystore tpm2_pkcs11 ssl crypto)
             target_link_libraries(pubsub_subscribe_encrypted_tpm_keystore tpm2_pkcs11 ssl crypto)
         endif()
+        if(UA_ENABLE_PUBSUB_SKS)
+        add_subdirectory(pubsub/sks)
+        endif()
     endif()
 
 
@@ -283,4 +286,4 @@ endif()
 ###########################
 if(UA_ENABLE_NODESETLOADER)
     add_subdirectory(nodeset_loader)
-endif()
\ No newline at end of file
+endif()
diff --git a/examples/pubsub/sks/CMakeLists.txt b/examples/pubsub/sks/CMakeLists.txt
new file mode 100644
index 00000000000..22df27ddeec
--- /dev/null
+++ b/examples/pubsub/sks/CMakeLists.txt
@@ -0,0 +1,7 @@
+########################################
+# PubSub Security Key Service Examples #
+########################################
+
+add_example(server_pubsub_central_sks server_pubsub_central_sks.c)
+add_example(pubsub_publish_encrypted_sks pubsub_publish_encrypted_sks.c)
+add_example(pubsub_subscribe_encrypted_sks pubsub_subscribe_encrypted_sks.c)
diff --git a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
new file mode 100644
index 00000000000..7fbc74f514c
--- /dev/null
+++ b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
@@ -0,0 +1,262 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/plugin/pubsub_ethernet.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <signal.h>
+
+#include "common.h"
+
+#define DEMO_SECURITYGROUPNAME "DemoSecurityGroup"
+#define SKS_SERVER_DISCOVERYURL "opc.tcp://localhost:4840"
+
+UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent;
+
+UA_Boolean running = true;
+static void
+stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+static void
+addPubSubConnection(UA_Server *server, UA_String *transportProfile,
+                    UA_NetworkAddressUrlDataType *networkAddressUrl) {
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(connectionConfig));
+    connectionConfig.name = UA_STRING("UADP Connection 1");
+    connectionConfig.transportProfileUri = *transportProfile;
+    connectionConfig.enabled = UA_TRUE;
+    UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
+    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
+}
+
+static void
+addPublishedDataSet(UA_Server *server) {
+    UA_PublishedDataSetConfig publishedDataSetConfig;
+    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    publishedDataSetConfig.name = UA_STRING("Demo PDS");
+    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig,
+                                  &publishedDataSetIdent);
+}
+
+static void
+addDataSetField(UA_Server *server) {
+    UA_NodeId dataSetFieldIdent;
+    UA_DataSetFieldConfig dataSetFieldConfig;
+    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
+    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    dataSetFieldConfig.field.variable.publishParameters.attributeId =
+        UA_ATTRIBUTEID_VALUE;
+    UA_Server_addDataSetField(server, publishedDataSetIdent, &dataSetFieldConfig,
+                              &dataSetFieldIdent);
+}
+
+static void
+sksPullRequestCallback(UA_Server *server, UA_StatusCode sksPullRequestStatus, void *data) {
+    UA_PubSubState state = UA_PUBSUBSTATE_OPERATIONAL;
+    UA_Server_WriterGroup_getState(server, writerGroupIdent, &state);
+    if(sksPullRequestStatus == UA_STATUSCODE_GOOD && state == UA_PUBSUBSTATE_DISABLED)
+        UA_Server_setWriterGroupOperational(server, writerGroupIdent);
+}
+
+static void
+addWriterGroup(UA_Server *server, UA_ClientConfig *sksClientConfig) {
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
+    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
+    writerGroupConfig.publishingInterval = 100;
+    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.writerGroupId = 100;
+    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+    writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    writerGroupConfig.messageSettings.content.decoded.type =
+        &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+
+    /* Encryption settings */
+    writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    /* we need to set the SecurityGroup for this reader group.
+     * It is used to provide access to the security keys on SKS*/
+    writerGroupConfig.securityGroupId = UA_STRING(DEMO_SECURITYGROUPNAME);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+
+    UA_UadpWriterGroupMessageDataType *writerGroupMessage =
+        UA_UadpWriterGroupMessageDataType_new();
+    writerGroupMessage->networkMessageContentMask =
+        (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+                                           (UA_UadpNetworkMessageContentMask)
+                                               UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+                                           (UA_UadpNetworkMessageContentMask)
+                                               UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+                                           (UA_UadpNetworkMessageContentMask)
+                                               UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+    UA_Server_addWriterGroup(server, connectionIdent, &writerGroupConfig,
+                             &writerGroupIdent);
+    UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+
+    /* We need to set the sks client before setting Reader/Writer Group into operational
+     * because it will fetch the initial set of keys. The sks client is required to set
+     * once per security group on publisher/subscriber application.*/
+    UA_Server_setSksClient(server, writerGroupConfig.securityGroupId, sksClientConfig,
+                           SKS_SERVER_DISCOVERYURL, sksPullRequestCallback, NULL);
+}
+
+static void
+addDataSetWriter(UA_Server *server) {
+    /* We need now a DataSetWriter within the WriterGroup. This means we must
+     * create a new DataSetWriterConfig and add call the addWriterGroup function. */
+    UA_NodeId dataSetWriterIdent;
+    UA_DataSetWriterConfig dataSetWriterConfig;
+    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
+    dataSetWriterConfig.name = UA_STRING("Demo DataSetWriter");
+    dataSetWriterConfig.dataSetWriterId = 62541;
+    dataSetWriterConfig.keyFrameCount = 10;
+    UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
+                               &dataSetWriterConfig, &dataSetWriterIdent);
+}
+
+
+static int
+run(UA_UInt16 port, UA_String *transportProfile,
+    UA_NetworkAddressUrlDataType *networkAddressUrl, UA_ClientConfig *sksClientConfig) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    UA_Server *server = UA_Server_new();
+
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setMinimal(config, port, NULL);
+
+    /* Instantiate the PubSub SecurityPolicy */
+    config->pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    addPubSubConnection(server, transportProfile, networkAddressUrl);
+    addPublishedDataSet(server);
+    addDataSetField(server);
+    addWriterGroup(server, sksClientConfig);
+    addDataSetWriter(server);
+
+    UA_StatusCode retval = UA_Server_run(server, &running);
+
+    UA_Server_delete(server);
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+static UA_ClientConfig *
+encyrptedClient(const char *username, const char *password,
+                UA_ByteString certificate, UA_ByteString privateKey) {
+    UA_ClientConfig *cc = (UA_ClientConfig *)UA_calloc(1, sizeof(UA_ClientConfig));
+
+    cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey, 0, 0, NULL, 0);
+
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+
+    UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
+    identityToken->userName = UA_STRING_ALLOC(username);
+    identityToken->password = UA_STRING_ALLOC(password);
+    UA_ExtensionObject_clear(&cc->userIdentityToken);
+    cc->userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
+    cc->userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN];
+    cc->userIdentityToken.content.decoded.data = identityToken;
+
+    return cc;
+}
+
+static void
+usage(char *progname) {
+    printf("usage: %s  server_ctt <server-certificate.der> <private-key.der>\n"
+           "<uri> [device]\n",
+           progname);
+}
+
+int
+main(int argc, char **argv) {
+    UA_String transportProfile =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {
+        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_UInt16 port = 4841;
+    /* Load certificate */
+    size_t pos = 1;
+    UA_ByteString certificate = UA_BYTESTRING_NULL;
+    if((size_t)argc >= pos + 1) {
+        certificate = loadFile(argv[1]);
+        if(certificate.length == 0) {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Unable to load file %s.", argv[pos]);
+            return EXIT_FAILURE;
+        }
+        pos++;
+    }
+
+    /* Load the private key */
+    UA_ByteString privateKey = UA_BYTESTRING_NULL;
+    if((size_t)argc >= pos + 1) {
+        privateKey = loadFile(argv[2]);
+        if(privateKey.length == 0) {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Unable to load file %s.", argv[pos]);
+            return EXIT_FAILURE;
+        }
+        pos++;
+    }
+
+    if(argc > 3) {
+        if(strcmp(argv[1], "-h") == 0) {
+            usage(argv[0]);
+            return EXIT_SUCCESS;
+        } else if(strncmp(argv[pos], "opc.udp://", 10) == 0) {
+            networkAddressUrl.url = UA_STRING(argv[pos]);
+        } else if(strncmp(argv[pos], "opc.eth://", 10) == 0) {
+            transportProfile = UA_STRING(
+                "http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
+            if(argc < 4) {
+                printf("Error: UADP/ETH needs an interface name\n");
+                return EXIT_FAILURE;
+            }
+            networkAddressUrl.networkInterface = UA_STRING(argv[pos + 1]);
+            networkAddressUrl.url = UA_STRING(argv[pos]);
+        } else {
+            printf("Error: unknown URI\n");
+            return EXIT_FAILURE;
+        }
+    }
+
+    /* we need to setup a client with encrypted connection and user credentials
+     * that can be trusted by the SKS Server instance.
+     * This Client will be used by Publisher/Subscriber application to regularly
+     * fetch the security keys from SKS.*/
+    UA_ClientConfig *sksClientConfig =
+        encyrptedClient("user1", "password", certificate, privateKey);
+
+    return run(port, &transportProfile, &networkAddressUrl, sksClientConfig);
+}
diff --git a/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c b/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
new file mode 100644
index 00000000000..9edb2442210
--- /dev/null
+++ b/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
@@ -0,0 +1,433 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/client_config_default.h>
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/plugin/pubsub_udp.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/server_config_default.h>
+#include <open62541/types_generated.h>
+
+#include "common.h"
+
+#if defined(UA_ENABLE_PUBSUB_ETH_UADP)
+#include <open62541/plugin/pubsub_ethernet.h>
+#endif
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define DEMO_SECURITYGROUPNAME "DemoSecurityGroup"
+#define SKS_SERVER_DISCOVERYURL "opc.tcp://localhost:4840"
+
+UA_NodeId connectionIdentifier;
+UA_NodeId readerGroupIdentifier;
+UA_NodeId readerIdentifier;
+
+UA_DataSetReaderConfig readerConfig;
+
+static void
+fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData);
+
+/**
+ * Followed by the main server code, making use of the above definitions */
+UA_Boolean running = true;
+static void
+stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
+    running = false;
+}
+
+/* Add new connection to the server */
+static UA_StatusCode
+addPubSubConnection(UA_Server *server, UA_String *transportProfile,
+                    UA_NetworkAddressUrlDataType *networkAddressUrl) {
+    if((server == NULL) || (transportProfile == NULL) || (networkAddressUrl == NULL)) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    /* Configuration creation for the connection */
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
+    connectionConfig.name = UA_STRING("UDPMC Connection 1");
+    connectionConfig.transportProfileUri = *transportProfile;
+    connectionConfig.enabled = UA_TRUE;
+    UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
+    connectionConfig.publisherId.uint32 = UA_UInt32_random();
+    retval |=
+        UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
+    if(retval != UA_STATUSCODE_GOOD) {
+        return retval;
+    }
+
+    return retval;
+}
+
+static void
+sksPullRequestCallback(UA_Server *server, UA_StatusCode sksPullRequestStatus, void *data) {
+    if(sksPullRequestStatus == UA_STATUSCODE_GOOD)
+        UA_Server_setReaderGroupOperational(server, readerGroupIdentifier);
+    if(sksPullRequestStatus != UA_STATUSCODE_GOOD)
+        running = false;
+}
+
+/**
+ * **ReaderGroup**
+ *
+ * ReaderGroup is used to group a list of DataSetReaders. All ReaderGroups are
+ * created within a PubSubConnection and automatically deleted if the connection
+ * is removed. All network message related filters are only available in the
+ * DataSetReader. */
+/* Add ReaderGroup to the created connection */
+static UA_StatusCode
+addReaderGroup(UA_Server *server, UA_ClientConfig *sksClientConfig) {
+    if(server == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING("ReaderGroup1");
+
+    /* Encryption settings */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    readerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    /* we need to set the SecurityGroup for this reader group.
+     * It is used to provide access to the security keys on SKS*/
+    readerGroupConfig.securityGroupId = UA_STRING(DEMO_SECURITYGROUPNAME);
+    readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
+
+    retval |= UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
+                                       &readerGroupIdentifier);
+
+    /* We need to set the sks client before setting Reader/Writer Group into operational
+     * because it will fetch the initial set of keys. The sks client is required to set
+     * once per security group on publisher/subscriber application.*/
+    UA_Server_setSksClient(server, readerGroupConfig.securityGroupId, (UA_ClientConfig *)sksClientConfig,
+                           SKS_SERVER_DISCOVERYURL, sksPullRequestCallback, NULL);
+
+    return retval;
+}
+
+/**
+ * **DataSetReader**
+ *
+ * DataSetReader can receive NetworkMessages with the DataSetMessage
+ * of interest sent by the Publisher. DataSetReader provides
+ * the configuration necessary to receive and process DataSetMessages
+ * on the Subscriber side. DataSetReader must be linked with a
+ * SubscribedDataSet and be contained within a ReaderGroup. */
+/* Add DataSetReader to the ReaderGroup */
+static UA_StatusCode
+addDataSetReader(UA_Server *server) {
+    if(server == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    memset(&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
+    readerConfig.name = UA_STRING("DataSet Reader 1");
+    /* Parameters to filter which DataSetMessage has to be processed
+     * by the DataSetReader */
+    /* The following parameters are used to show that the data published by
+     * tutorial_pubsub_publish.c is being subscribed and is being updated in
+     * the information model */
+    UA_UInt16 publisherIdentifier = 2234;
+    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+    readerConfig.publisherId.data = &publisherIdentifier;
+    readerConfig.writerGroupId = 100;
+    readerConfig.dataSetWriterId = 62541;
+
+    /* Setting up Meta data configuration in DataSetReader */
+    fillTestDataSetMetaData(&readerConfig.dataSetMetaData);
+
+    retval |= UA_Server_addDataSetReader(server, readerGroupIdentifier, &readerConfig,
+                                         &readerIdentifier);
+    return retval;
+}
+
+/**
+ * **SubscribedDataSet**
+ *
+ * Set SubscribedDataSet type to TargetVariables data type.
+ * Add subscribedvariables to the DataSetReader */
+static UA_StatusCode
+addSubscribedVariables(UA_Server *server, UA_NodeId dataSetReaderId) {
+    if(server == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_NodeId folderId;
+    UA_String folderName = readerConfig.dataSetMetaData.name;
+    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+    UA_QualifiedName folderBrowseName;
+    if(folderName.length > 0) {
+        oAttr.displayName.locale = UA_STRING("en-US");
+        oAttr.displayName.text = folderName;
+        folderBrowseName.namespaceIndex = 1;
+        folderBrowseName.name = folderName;
+    } else {
+        oAttr.displayName = UA_LOCALIZEDTEXT("en-US", "Subscribed Variables");
+        folderBrowseName = UA_QUALIFIEDNAME(1, "Subscribed Variables");
+    }
+
+    UA_Server_addObjectNode(
+        server, UA_NODEID_NULL, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), folderBrowseName,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+
+    /**
+     * **TargetVariables**
+     *
+     * The SubscribedDataSet option TargetVariables defines a list of Variable mappings
+     * between received DataSet fields and target Variables in the Subscriber
+     * AddressSpace. The values subscribed from the Publisher are updated in the value
+     * field of these variables */
+    /* Create the TargetVariables with respect to DataSetMetaData fields */
+    UA_FieldTargetVariable *targetVars = (UA_FieldTargetVariable *)UA_calloc(
+        readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
+    for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++) {
+        /* Variable to subscribe data */
+        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+        UA_LocalizedText_copy(&readerConfig.dataSetMetaData.fields[i].description,
+                              &vAttr.description);
+        vAttr.displayName.locale = UA_STRING("en-US");
+        vAttr.displayName.text = readerConfig.dataSetMetaData.fields[i].name;
+        vAttr.dataType = readerConfig.dataSetMetaData.fields[i].dataType;
+
+        UA_NodeId newNode;
+        retval |= UA_Server_addVariableNode(
+            server, UA_NODEID_NUMERIC(1, (UA_UInt32)i + 50000), folderId,
+            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+            UA_QUALIFIEDNAME(1, (char *)readerConfig.dataSetMetaData.fields[i].name.data),
+            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newNode);
+
+        /* For creating Targetvariables */
+        UA_FieldTargetDataType_init(&targetVars[i].targetVariable);
+        targetVars[i].targetVariable.attributeId = UA_ATTRIBUTEID_VALUE;
+        targetVars[i].targetVariable.targetNodeId = newNode;
+    }
+
+    retval = UA_Server_DataSetReader_createTargetVariables(
+        server, dataSetReaderId, readerConfig.dataSetMetaData.fieldsSize, targetVars);
+    for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++)
+        UA_FieldTargetDataType_clear(&targetVars[i].targetVariable);
+
+    UA_free(targetVars);
+    UA_free(readerConfig.dataSetMetaData.fields);
+    return retval;
+}
+
+/**
+ * **DataSetMetaData**
+ *
+ * The DataSetMetaData describes the content of a DataSet. It provides the information
+ * necessary to decode DataSetMessages on the Subscriber side. DataSetMessages received
+ * from the Publisher are decoded into DataSet and each field is updated in the Subscriber
+ * based on datatype match of TargetVariable fields of Subscriber and
+ * PublishedDataSetFields of Publisher */
+/* Define MetaData for TargetVariables */
+static void
+fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
+    if(pMetaData == NULL) {
+        return;
+    }
+
+    UA_DataSetMetaDataType_init(pMetaData);
+    pMetaData->name = UA_STRING("DataSet 1");
+
+    /* Static definition of number of fields size to 4 to create four different
+     * targetVariables of distinct datatype
+     * Currently the publisher sends only DateTime data type */
+    pMetaData->fieldsSize = 4;
+    pMetaData->fields = (UA_FieldMetaData *)UA_Array_new(
+        pMetaData->fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+
+    /* DateTime DataType */
+    UA_FieldMetaData_init(&pMetaData->fields[0]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_DATETIME].typeId, &pMetaData->fields[0].dataType);
+    pMetaData->fields[0].builtInType = UA_NS0ID_DATETIME;
+    pMetaData->fields[0].name = UA_STRING("DateTime");
+    pMetaData->fields[0].valueRank = -1; /* scalar */
+
+    /* Int32 DataType */
+    UA_FieldMetaData_init(&pMetaData->fields[1]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT32].typeId, &pMetaData->fields[1].dataType);
+    pMetaData->fields[1].builtInType = UA_NS0ID_INT32;
+    pMetaData->fields[1].name = UA_STRING("Int32");
+    pMetaData->fields[1].valueRank = -1; /* scalar */
+
+    /* Int64 DataType */
+    UA_FieldMetaData_init(&pMetaData->fields[2]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT64].typeId, &pMetaData->fields[2].dataType);
+    pMetaData->fields[2].builtInType = UA_NS0ID_INT64;
+    pMetaData->fields[2].name = UA_STRING("Int64");
+    pMetaData->fields[2].valueRank = -1; /* scalar */
+
+    /* Boolean DataType */
+    UA_FieldMetaData_init(&pMetaData->fields[3]);
+    UA_NodeId_copy(&UA_TYPES[UA_TYPES_BOOLEAN].typeId, &pMetaData->fields[3].dataType);
+    pMetaData->fields[3].builtInType = UA_NS0ID_BOOLEAN;
+    pMetaData->fields[3].name = UA_STRING("BoolToggle");
+    pMetaData->fields[3].valueRank = -1; /* scalar */
+}
+
+/*
+ * TODO: add something similary ass addDataSetMetadata for security configuration
+ */
+
+static int
+run(UA_UInt16 port, UA_String *transportProfile,
+    UA_NetworkAddressUrlDataType *networkAddressUrl, UA_ClientConfig *sksClientConfig) {
+    signal(SIGINT, stopHandler);
+    signal(SIGTERM, stopHandler);
+    /* Return value initialized to Status Good */
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setMinimal(config, port, NULL);
+
+    /* Instantiate the PubSub SecurityPolicy */
+    config->pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config->pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
+                                      &config->logger);
+
+    /* Add the PubSub network layer implementation to the server config.
+     * The TransportLayer is acting as factory to create new connections
+     * on runtime. Details about the PubSubTransportLayer can be found inside the
+     * tutorial_pubsub_connection */
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+#ifdef UA_ENABLE_PUBSUB_ETH_UADP
+    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
+#endif
+
+    /* API calls */
+    /* Add PubSubConnection */
+    retval |= addPubSubConnection(server, transportProfile, networkAddressUrl);
+    if(retval != UA_STATUSCODE_GOOD)
+        return EXIT_FAILURE;
+
+    /* Add ReaderGroup to the created PubSubConnection */
+    retval |= addReaderGroup(server, sksClientConfig);
+    if(retval != UA_STATUSCODE_GOOD)
+        return EXIT_FAILURE;
+
+    /* Add DataSetReader to the created ReaderGroup */
+    retval |= addDataSetReader(server);
+    if(retval != UA_STATUSCODE_GOOD)
+        return EXIT_FAILURE;
+
+    /* Add SubscribedVariables to the created DataSetReader */
+    retval |= addSubscribedVariables(server, readerIdentifier);
+    if(retval != UA_STATUSCODE_GOOD)
+        return EXIT_FAILURE;
+
+    retval = UA_Server_run(server, &running);
+    UA_Server_delete(server);
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+static UA_ClientConfig *
+encyrptedClient(const char *username, const char *password,
+                UA_ByteString certificate, UA_ByteString privateKey) {
+    UA_ClientConfig *cc = (UA_ClientConfig *)UA_calloc(1, sizeof(UA_ClientConfig));
+
+    cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey, 0, 0, NULL, 0);
+
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+
+    UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
+    identityToken->userName = UA_STRING_ALLOC(username);
+    identityToken->password = UA_STRING_ALLOC(password);
+    UA_ExtensionObject_clear(&cc->userIdentityToken);
+    cc->userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
+    cc->userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN];
+    cc->userIdentityToken.content.decoded.data = identityToken;
+
+    return cc;
+}
+
+static void
+usage(char *progname) {
+    printf("usage: %s  server_ctt <server-certificate.der> <private-key.der>\n"
+           "<uri> [device]\n",
+           progname);
+}
+
+int
+main(int argc, char **argv) {
+    UA_String transportProfile =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    UA_NetworkAddressUrlDataType networkAddressUrl = {
+        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+
+    UA_UInt16 port = 4801;
+
+    /* Load certificate */
+    size_t pos = 1;
+    UA_ByteString certificate = UA_BYTESTRING_NULL;
+    if((size_t)argc >= pos + 1) {
+        certificate = loadFile(argv[1]);
+        if(certificate.length == 0) {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Unable to load file %s.", argv[pos]);
+            return EXIT_FAILURE;
+        }
+        pos++;
+    }
+
+    /* Load the private key */
+    UA_ByteString privateKey = UA_BYTESTRING_NULL;
+    if((size_t)argc >= pos + 1) {
+        privateKey = loadFile(argv[2]);
+        if(privateKey.length == 0) {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Unable to load file %s.", argv[pos]);
+            return EXIT_FAILURE;
+        }
+        pos++;
+    }
+
+    if(argc > 3) {
+        if(strcmp(argv[1], "-h") == 0) {
+            usage(argv[0]);
+            return EXIT_SUCCESS;
+        } else if(strncmp(argv[pos], "opc.udp://", 10) == 0) {
+            networkAddressUrl.url = UA_STRING(argv[pos]);
+        } else if(strncmp(argv[pos], "opc.eth://", 10) == 0) {
+            transportProfile = UA_STRING(
+                "http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
+            if(argc < 4) {
+                printf("Error: UADP/ETH needs an interface name\n");
+                return EXIT_FAILURE;
+            }
+            networkAddressUrl.networkInterface = UA_STRING(argv[pos + 1]);
+            networkAddressUrl.url = UA_STRING(argv[pos]);
+        } else {
+            printf("Error: unknown URI\n");
+            return EXIT_FAILURE;
+        }
+    }
+    /* we need to setup a client with encrypted connection and user credentials
+     * that can be trusted by the SKS Server instance.
+     * This Client will be used by Publisher/Subscriber application to regularly
+     * fetch the security keys from SKS.*/
+    UA_ClientConfig *sksClientConfig =
+        encyrptedClient("user1", "password", certificate, privateKey);
+
+    return run(port, &transportProfile, &networkAddressUrl, sksClientConfig);
+}
diff --git a/examples/pubsub/sks/server_pubsub_central_sks.c b/examples/pubsub/sks/server_pubsub_central_sks.c
new file mode 100644
index 00000000000..40f07ef9059
--- /dev/null
+++ b/examples/pubsub/sks/server_pubsub_central_sks.c
@@ -0,0 +1,531 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
+ */
+
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/plugin/pki_default.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <signal.h>
+#include <stdlib.h>
+
+#include "common.h"
+
+#define MAX_OPERATION_LIMIT 10000
+
+#define MINUTE_SECONDS 60
+#define MILLI_SECONDS 1000
+#define MAX_OPERATION_LIMIT 10000
+
+#define policUri "http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR"
+#define DEMO_KEYLIFETIME_MINUTES 1
+#define DEMO_MAXFUTUREKEYCOUNT 1
+#define DEMO_MAXPASTKEYCOUNT 1
+#define DEMO_SECURITYGROUPNAME "DemoSecurityGroup"
+
+static void
+disableAnonymous(UA_ServerConfig *config) {
+    for(size_t i = 0; i < config->endpointsSize; i++) {
+        UA_EndpointDescription *ep = &config->endpoints[i];
+
+        for(size_t j = 0; j < ep->userIdentityTokensSize; j++) {
+            UA_UserTokenPolicy *utp = &ep->userIdentityTokens[j];
+            if(utp->tokenType != UA_USERTOKENTYPE_ANONYMOUS)
+                continue;
+
+            UA_UserTokenPolicy_clear(utp);
+            /* Move the last to this position */
+            if(j + 1 < ep->userIdentityTokensSize) {
+                ep->userIdentityTokens[j] =
+                    ep->userIdentityTokens[ep->userIdentityTokensSize - 1];
+                j--;
+            }
+            ep->userIdentityTokensSize--;
+        }
+
+        /* Delete the entire array if the last UserTokenPolicy was removed */
+        if(ep->userIdentityTokensSize == 0) {
+            UA_free(ep->userIdentityTokens);
+            ep->userIdentityTokens = NULL;
+        }
+    }
+}
+
+#ifdef UA_ENABLE_ENCRYPTION
+static void
+disableUnencrypted(UA_ServerConfig *config) {
+    for(size_t i = 0; i < config->endpointsSize; i++) {
+        UA_EndpointDescription *ep = &config->endpoints[i];
+        if(ep->securityMode != UA_MESSAGESECURITYMODE_NONE)
+            continue;
+
+        UA_EndpointDescription_clear(ep);
+        /* Move the last to this position */
+        if(i + 1 < config->endpointsSize) {
+            config->endpoints[i] = config->endpoints[config->endpointsSize - 1];
+            i--;
+        }
+        config->endpointsSize--;
+    }
+    /* Delete the entire array if the last Endpoint was removed */
+    if(config->endpointsSize == 0) {
+        UA_free(config->endpoints);
+        config->endpoints = NULL;
+    }
+}
+
+static void
+disableOutdatedSecurityPolicy(UA_ServerConfig *config) {
+    for(size_t i = 0; i < config->endpointsSize; i++) {
+        UA_EndpointDescription *ep = &config->endpoints[i];
+        UA_ByteString basic128uri =
+            UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15");
+        UA_ByteString basic256uri =
+            UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
+        if(!UA_String_equal(&ep->securityPolicyUri, &basic128uri) &&
+           !UA_String_equal(&ep->securityPolicyUri, &basic256uri))
+            continue;
+
+        UA_EndpointDescription_clear(ep);
+        /* Move the last to this position */
+        if(i + 1 < config->endpointsSize) {
+            config->endpoints[i] = config->endpoints[config->endpointsSize - 1];
+            i--;
+        }
+        config->endpointsSize--;
+    }
+    /* Delete the entire array if the last Endpoint was removed */
+    if(config->endpointsSize == 0) {
+        UA_free(config->endpoints);
+        config->endpoints = NULL;
+    }
+}
+
+#endif
+
+/* This access control callback checks the user access on the SecurityGroup object, when
+ * GetSecurityKeys method is called. */
+static UA_Boolean
+getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
+                              const UA_NodeId *sessionId, void *sessionContext,
+                              const UA_NodeId *methodId, void *methodContext,
+                              const UA_NodeId *objectId, void *objectContext) {
+    if(objectContext && sessionContext) {
+        UA_ByteString *username = (UA_ByteString *)objectContext;
+        UA_ByteString *sessionUsername = (UA_ByteString *)sessionContext;
+        if(!UA_ByteString_equal(username, sessionUsername))
+            return false;
+    }
+    return true;
+}
+
+/**
+ * We need to add a SecurityGroup for the management of security keys on SKS server.
+ * The publishers/subcribers can requests the keys on SKS with their associated
+ * security groups. The SKS will check if the user credentials used to establish
+ * the session have the access to the requested security group managed by SKS.
+ */
+static UA_StatusCode
+addSecurityGroup(UA_Server *server, UA_NodeId *outNodeId) {
+    UA_Duration keyLifeTimeMinutes = DEMO_KEYLIFETIME_MINUTES;
+    UA_UInt32 maxFutureKeyCount = DEMO_MAXFUTUREKEYCOUNT;
+    UA_UInt32 maxPastKeyCount = DEMO_MAXPASTKEYCOUNT;
+    char *securityGroupName = DEMO_SECURITYGROUPNAME;
+    UA_NodeId securityGroupParent =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
+
+    UA_SecurityGroupConfig config;
+    memset(&config, 0, sizeof(UA_SecurityGroupConfig));
+    config.keyLifeTime = keyLifeTimeMinutes * MINUTE_SECONDS * MILLI_SECONDS;
+    config.securityPolicyUri = UA_STRING(policUri);
+    config.securityGroupName = UA_STRING(securityGroupName);
+    config.maxFutureKeyCount = maxFutureKeyCount;
+    config.maxPastKeyCount = maxPastKeyCount;
+
+    return UA_Server_addSecurityGroup(server, securityGroupParent, &config, outNodeId);
+}
+
+/*
+ * we need to set user access for the security groups. The allowed users can be
+ * set in the node context of the SecurityGroup Object Node, which are checked
+ * are checked by access control plugin.
+ */
+static UA_StatusCode
+setSecurityGroupRolePermission(UA_Server *server, UA_NodeId securityGroupNodeId,
+                               void *nodeContext) {
+    if(!server && !nodeContext)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    UA_ByteString *username = UA_ByteString_new();
+    UA_String allowedUsername = UA_STRING((char *)nodeContext);
+    UA_ByteString_copy(&allowedUsername, username);
+    return UA_Server_setNodeContext(server, securityGroupNodeId, username);
+}
+
+UA_Boolean running = true;
+
+static void
+stopHandler(int sign) {
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Received Ctrl-C");
+    running = 0;
+}
+
+static void
+usage(char *progname) {
+    UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                   "Usage:\n"
+#ifndef UA_ENABLE_ENCRYPTION
+                   "%s [<server-certificate.der>]\n"
+#else
+                   "%s <server-certificate.der> <private-key.der>\n"
+#ifndef __linux__
+                   "\t[--trustlist <tl1.ctl> <tl2.ctl> ... ]\n"
+                   "\t[--issuerlist <il1.der> <il2.der> ... ]\n"
+                   "\t[--revocationlist <rv1.crl> <rv2.crl> ...]\n"
+#else
+                   "\t[--trustlistFolder <folder>]\n"
+                   "\t[--issuerlistFolder <folder>]\n"
+                   "\t[--revocationlistFolder <folder>]\n"
+#endif
+                   "\t[--enableUnencrypted]\n"
+                   "\t[--enableOutdatedSecurityPolicy]\n"
+#endif
+                   "\t[--enableTimestampCheck]\n"
+                   "\t[--enableAnonymous]\n",
+                   progname);
+}
+
+int
+main(int argc, char **argv) {
+    signal(SIGINT, stopHandler); /* catches ctrl-c */
+    signal(SIGTERM, stopHandler);
+
+    for(int i = 1; i < argc; i++) {
+        if(strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) {
+            usage(argv[0]);
+            return EXIT_SUCCESS;
+        }
+    }
+
+    UA_ServerConfig config;
+    memset(&config, 0, sizeof(UA_ServerConfig));
+
+    /* Load certificate */
+    size_t pos = 1;
+    UA_ByteString certificate = UA_BYTESTRING_NULL;
+    if((size_t)argc >= pos + 1) {
+        certificate = loadFile(argv[1]);
+        if(certificate.length == 0) {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Unable to load file %s.", argv[pos]);
+            return EXIT_FAILURE;
+        }
+        pos++;
+    }
+
+#ifdef UA_ENABLE_ENCRYPTION
+    /* Load the private key */
+    UA_ByteString privateKey = UA_BYTESTRING_NULL;
+    if((size_t)argc >= pos + 1) {
+        privateKey = loadFile(argv[2]);
+        if(privateKey.length == 0) {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Unable to load file %s.", argv[pos]);
+            return EXIT_FAILURE;
+        }
+        pos++;
+    }
+
+    char filetype = ' '; /* t==trustlist, l == issuerList, r==revocationlist */
+    UA_Boolean enableUnencr = false;
+    UA_Boolean enableSec = false;
+
+#ifndef __linux__
+    UA_ByteString trustList[100];
+    size_t trustListSize = 0;
+    UA_ByteString issuerList[100];
+    size_t issuerListSize = 0;
+    UA_ByteString revocationList[100];
+    size_t revocationListSize = 0;
+#else
+    const char *trustlistFolder = NULL;
+    const char *issuerlistFolder = NULL;
+    const char *revocationlistFolder = NULL;
+#endif /* __linux__ */
+
+#endif /* UA_ENABLE_ENCRYPTION */
+
+    UA_Boolean enableAnon = false;
+    UA_Boolean enableTime = false;
+    UA_UInt16 port = 4840;
+
+    /* Loop over the remaining arguments */
+    for(; pos < (size_t)argc; pos++) {
+
+        if(strcmp(argv[pos], "--port") == 0) {
+            pos++;
+            int inNum = atoi(argv[pos]);
+            if(inNum <= 0) {
+                usage(argv[0]);
+                return EXIT_FAILURE;
+            }
+
+            port = (UA_UInt16)inNum;
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--enableAnonymous") == 0) {
+            enableAnon = true;
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--enableTimestampCheck") == 0) {
+            enableTime = true;
+            continue;
+        }
+
+#ifdef UA_ENABLE_ENCRYPTION
+        if(strcmp(argv[pos], "--enableUnencrypted") == 0) {
+            enableUnencr = true;
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--enableOutdatedSecurityPolicy") == 0) {
+            enableSec = true;
+            continue;
+        }
+
+#ifndef __linux__
+        if(strcmp(argv[pos], "--trustlist") == 0) {
+            filetype = 't';
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--issuerlist") == 0) {
+            filetype = 'l';
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--revocationlist") == 0) {
+            filetype = 'r';
+            continue;
+        }
+
+        if(filetype == 't') {
+            if(trustListSize >= 100) {
+                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                             "Too many trust lists");
+                return EXIT_FAILURE;
+            }
+            trustList[trustListSize] = loadFile(argv[pos]);
+            if(trustList[trustListSize].data == NULL) {
+                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                             "Unable to load trust list %s", argv[pos]);
+                return EXIT_FAILURE;
+            }
+            trustListSize++;
+            continue;
+        }
+
+        if(filetype == 'l') {
+            if(issuerListSize >= 100) {
+                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                             "Too many trust lists");
+                return EXIT_FAILURE;
+            }
+            issuerList[issuerListSize] = loadFile(argv[pos]);
+            if(issuerList[issuerListSize].data == NULL) {
+                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                             "Unable to load trust list %s", argv[pos]);
+                return EXIT_FAILURE;
+            }
+            issuerListSize++;
+            continue;
+        }
+
+        if(filetype == 'r') {
+            if(revocationListSize >= 100) {
+                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                             "Too many revocation lists");
+                return EXIT_FAILURE;
+            }
+            revocationList[revocationListSize] = loadFile(argv[pos]);
+            if(revocationList[revocationListSize].data == NULL) {
+                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                             "Unable to load revocationlist %s", argv[pos]);
+                return EXIT_FAILURE;
+            }
+            revocationListSize++;
+            continue;
+        }
+#else  /* __linux__ */
+        if(strcmp(argv[pos], "--trustlistFolder") == 0) {
+            filetype = 't';
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--issuerlistFolder") == 0) {
+            filetype = 'l';
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--revocationlistFolder") == 0) {
+            filetype = 'r';
+            continue;
+        }
+
+        if(filetype == 't') {
+            trustlistFolder = argv[pos];
+            continue;
+        }
+
+        if(filetype == 'l') {
+            issuerlistFolder = argv[pos];
+            continue;
+        }
+
+        if(filetype == 'r') {
+            revocationlistFolder = argv[pos];
+            continue;
+        }
+#endif /* __linux__ */
+
+#endif /* UA_ENABLE_ENCRYPTION */
+
+        usage(argv[0]);
+        return EXIT_FAILURE;
+    }
+
+    UA_Server *server = NULL;
+
+#ifdef UA_ENABLE_ENCRYPTION
+#ifndef __linux__
+    UA_StatusCode res = UA_ServerConfig_setDefaultWithSecurityPolicies(
+        &config, port, &certificate, &privateKey, trustList, trustListSize, issuerList,
+        issuerListSize, revocationList, revocationListSize);
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+#else /* On Linux we can monitor the certs folder and reload when changes are made */
+    UA_StatusCode res = UA_ServerConfig_setDefaultWithSecurityPolicies(
+        &config, port, &certificate, &privateKey, NULL, 0, NULL, 0, NULL, 0);
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+    config.certificateVerification.clear(&config.certificateVerification);
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+    res = UA_CertificateVerification_CertFolders(&config.certificateVerification,
+                                                 trustlistFolder, issuerlistFolder,
+                                                 revocationlistFolder, NULL);
+#else
+    res = UA_CertificateVerification_CertFolders(&config.certificateVerification,
+                                                 trustlistFolder, issuerlistFolder,
+                                                 revocationlistFolder);
+#endif
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+#endif /* __linux__ */
+
+    if(!enableUnencr)
+        disableUnencrypted(&config);
+    if(!enableSec)
+        disableOutdatedSecurityPolicy(&config);
+
+#else  /* UA_ENABLE_ENCRYPTION */
+    UA_StatusCode res = UA_ServerConfig_setMinimal(&config, port, &certificate);
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+#endif /* UA_ENABLE_ENCRYPTION */
+
+    if(!enableAnon)
+        disableAnonymous(&config);
+
+    /* Limit the number of SecureChannels and Sessions */
+    config.maxSecureChannels = 10;
+    config.maxSessions = 20;
+
+    /* Revolve the SecureChannel token every 300 seconds */
+    config.maxSecurityTokenLifetime = 300000;
+
+    /* Set operation limits */
+    config.maxNodesPerRead = MAX_OPERATION_LIMIT;
+    config.maxNodesPerWrite = MAX_OPERATION_LIMIT;
+    config.maxNodesPerMethodCall = MAX_OPERATION_LIMIT;
+    config.maxNodesPerBrowse = MAX_OPERATION_LIMIT;
+    config.maxNodesPerRegisterNodes = MAX_OPERATION_LIMIT;
+    config.maxNodesPerTranslateBrowsePathsToNodeIds = MAX_OPERATION_LIMIT;
+    config.maxNodesPerNodeManagement = MAX_OPERATION_LIMIT;
+    config.maxMonitoredItemsPerCall = MAX_OPERATION_LIMIT;
+
+    /* Set Subscription limits */
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+    config.maxSubscriptions = 20;
+#endif
+
+    /* If RequestTimestamp is '0', log the warning and proceed */
+    config.verifyRequestTimestamp = UA_RULEHANDLING_WARN;
+    if(enableTime)
+        config.verifyRequestTimestamp = UA_RULEHANDLING_DEFAULT;
+
+    /* Override with a custom access control policy */
+    UA_String_clear(&config.applicationDescription.applicationUri);
+    config.applicationDescription.applicationUri =
+        UA_String_fromChars("urn:open62541.server.application");
+
+    config.shutdownDelay = 5000.0; /* 5s */
+
+    /* Add supported pubsub security policies by this sks instance */
+    config.pubSubConfig.securityPolicies =
+        (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
+    config.pubSubConfig.securityPoliciesSize = 1;
+    UA_PubSubSecurityPolicy_Aes256Ctr(config.pubSubConfig.securityPolicies,
+                                      &config.logger);
+
+    /* User Access Control */
+    config.accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
+
+    server = UA_Server_newWithConfig(&config);
+    if(!server) {
+        res = UA_STATUSCODE_BADINTERNALERROR;
+        goto cleanup;
+    }
+
+    /* Add SecurityGroup on SKS server */
+    UA_NodeId outNodeId;
+    res = addSecurityGroup(server, &outNodeId);
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    /* set user access permissions on securitygroup*/
+    char *username = "user1";
+    res = setSecurityGroupRolePermission(server, outNodeId, username);
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    /* run server */
+    res = UA_Server_run(server, &running);
+
+cleanup:
+    if(server)
+        UA_Server_delete(server);
+    else
+        UA_ServerConfig_clean(&config);
+
+    UA_ByteString_clear(&certificate);
+#if defined(UA_ENABLE_ENCRYPTION)
+    UA_ByteString_clear(&privateKey);
+#ifndef __linux__
+    for(size_t i = 0; i < trustListSize; i++)
+        UA_ByteString_clear(&trustList[i]);
+    for(size_t i = 0; i < issuerListSize; i++)
+        UA_ByteString_clear(&issuerList[i]);
+    for(size_t i = 0; i < revocationListSize; i++)
+        UA_ByteString_clear(&revocationList[i]);
+#endif
+#endif
+
+    return res == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From b57f23ddac13861b7cec59c08a5a6cca52e5268b Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Tue, 8 Nov 2022 17:30:29 +0100
Subject: [PATCH 0720/1963] feat(pubsub): delete sks config from keyStorage

When the keyStorage is deleted, the sks client related config must be deleted.
Therefore sks config is cleaned and the pointer to the config is freed.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_keystorage.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 195c0868aca..8bdc658ae07 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -78,6 +78,9 @@ UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     if(keyStorage->securityGroupID.data)
         UA_String_clear(&keyStorage->securityGroupID);
 
+    /* clear SKS client config from keystorage */
+    UA_ClientConfig_clear(&keyStorage->sksConfig.clientConfig);
+
     UA_free(keyStorage);
 }
 

From 695864553127fb2f67dbbec848e38bd40f7e4d59 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Tue, 8 Nov 2022 17:48:07 +0100
Subject: [PATCH 0721/1963] fix(pubsub): fix reusing oldest key in keystorage
 for the newest key

It was noticed that only shifting second oldest key to the head is not enough
as it does not removes the reference of prev and next key from the oldest key
therefore, the oldest must be removed which removes all the references and
removing the element which is at the head automatically moves the head to the
next element in the list.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_securitygroup.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 144b88a9f19..9c2f6adbc1d 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -104,14 +104,10 @@ updateSKSKeyStorage(UA_Server *server, UA_SecurityGroup *securityGroup){
         ++newKeyID;
 
     if(keyStorage->keyListSize >= keyStorage->maxKeyListSize) {
-        /* reusing the preallocated memory of the oldest key */
-        /* the first item has the oldest key */
+        /* reusing the preallocated memory of the oldest key for the new key material */
         UA_PubSubKeyListItem *oldestKey = TAILQ_FIRST(&keyStorage->keyList);
-        /* shift head to second oldest */
-        TAILQ_INSERT_HEAD(&keyStorage->keyList, oldestKey->keyListEntry.tqe_next, keyListEntry);
-        /* move oldest to the tail */
+        TAILQ_REMOVE(&keyStorage->keyList, oldestKey, keyListEntry);
         TAILQ_INSERT_TAIL(&keyStorage->keyList, oldestKey, keyListEntry);
-        /* copy new key over the oldest key locatio */
         oldestKey->keyID = newKeyID;
         UA_ByteString_copy(&newKey, &oldestKey->key);
     } else {

From 990a2e3811240c974104dc326630e7904592f723 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Jan 2023 22:41:43 +0100
Subject: [PATCH 0722/1963] feat(arch): Add UA_LOCK_STATIC_INIT for POSIX
 architectures

---
 arch/posix/ua_architecture.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index dfe139fb77d..a1d955e2553 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -138,32 +138,33 @@ void UA_sleep_ms(unsigned long ms);
 
 typedef struct {
     pthread_mutex_t mutex;
-    pthread_mutexattr_t mutexAttr;
     int mutexCounter;
 } UA_Lock;
 
+#define UA_LOCK_STATIC_INIT {PTHREAD_MUTEX_INITIALIZER, 0}
+
 static UA_INLINE void
 UA_LOCK_INIT(UA_Lock *lock) {
-    pthread_mutexattr_init(&lock->mutexAttr);
-    pthread_mutex_init(&lock->mutex, &lock->mutexAttr);
+    pthread_mutex_init(&lock->mutex, NULL);
     lock->mutexCounter = 0;
 }
 
 static UA_INLINE void
 UA_LOCK_DESTROY(UA_Lock *lock) {
     pthread_mutex_destroy(&lock->mutex);
-    pthread_mutexattr_destroy(&lock->mutexAttr);
 }
 
 static UA_INLINE void
 UA_LOCK(UA_Lock *lock) {
     pthread_mutex_lock(&lock->mutex);
-    UA_assert(++(lock->mutexCounter) == 1);
+    UA_assert(lock->mutexCounter == 0);
+    lock->mutexCounter++;
 }
 
 static UA_INLINE void
 UA_UNLOCK(UA_Lock *lock) {
-    UA_assert(--(lock->mutexCounter) == 0);
+    UA_assert(lock->mutexCounter == 1);
+    lock->mutexCounter--;
     pthread_mutex_unlock(&lock->mutex);
 }
 
@@ -171,6 +172,7 @@ static UA_INLINE void
 UA_LOCK_ASSERT(UA_Lock *lock, int num) {
     UA_assert(lock->mutexCounter == num);
 }
+
 #else
 #define UA_EMPTY_STATEMENT                                                               \
     do {                                                                                 \

From a77ea9a80c8ca031a5052b08e6a49fc7e198229a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Jan 2023 22:42:19 +0100
Subject: [PATCH 0723/1963] feat(core): Add atomic compare-and-switch operation

---
 include/open62541/architecture_definitions.h | 100 ++++++++++++++-----
 1 file changed, 75 insertions(+), 25 deletions(-)

diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
index 9a75c531df6..08ae54979f5 100644
--- a/include/open62541/architecture_definitions.h
+++ b/include/open62541/architecture_definitions.h
@@ -72,6 +72,31 @@
 # define PRIX64 __PRI_64_LENGTH_MODIFIER__ "X"
 #endif
 
+/**
+ * Inline Functions
+ * ---------------- */
+#ifdef _MSC_VER
+# define UA_INLINE __inline
+#else
+# define UA_INLINE inline
+#endif
+
+/* An inlinable method is typically defined as "static inline". Some
+ * applications, such as language bindings with a C FFI (foreign function
+ * interface), can however not work with static inline methods. These can set
+ * the global UA_ENABLE_INLINABLE_EXPORT macro which causes all inlinable
+ * methods to be exported as a regular public API method.
+ *
+ * Note that UA_ENABLE_INLINABLE_EXPORT has a negative impact for both size and
+ * performance of the library. */
+#if defined(UA_ENABLE_INLINABLE_EXPORT) && defined(UA_INLINABLE_IMPL)
+# define UA_INLINABLE(decl, impl) UA_EXPORT decl; decl impl
+#elif defined(UA_ENABLE_INLINABLE_EXPORT)
+# define UA_INLINABLE(decl, impl) UA_EXPORT decl;
+#else
+# define UA_INLINABLE(decl, impl) static UA_INLINE decl impl
+#endif
+
 /**
  * Thread-local variables
  * ---------------------- */
@@ -86,6 +111,56 @@
 # define UA_THREAD_LOCAL
 #endif
 
+/**
+ * Atomic Operations
+ * -----------------
+ *
+ * Atomic operations synchronize across processor cores and enable lockless
+ * multi-threading. */
+
+/* Intrinsic atomic operations are not available everywhere for MSVC.
+ * Use the win32 API. Prevent duplicate definitions by via winsock2. */
+#if UA_MULTITHREADING >= 100 && defined(_WIN32)
+# ifndef _WINSOCKAPI_
+#  define _NO_WINSOCKAPI_
+# endif
+# define _WINSOCKAPI_
+# include <windows.h>
+# ifdef _NO_WINSOCKAPI_
+#  undef _WINSOCKAPI_
+# endif
+#endif
+
+static UA_INLINE void *
+UA_atomic_xchg(void * volatile * addr, void *newptr) {
+#if UA_MULTITHREADING >= 100 && defined(_WIN32) /* Visual Studio */
+    return InterlockedExchangePointer(addr, newptr);
+#elif UA_MULTITHREADING >= 100 && defined(__GNUC__) /* GCC/Clang */
+    return __sync_lock_test_and_set(addr, newptr);
+#else
+# if UA_MULTITHREADING >= 100
+#  warning Atomic operations not implemented
+# endif
+    void *old = *addr;
+    *addr = newptr;
+    return old;
+#endif
+}
+
+static UA_INLINE void *
+UA_atomic_cmpxchg(void * volatile * addr, void *expected, void *newptr) {
+#if UA_MULTITHREADING >= 100 && defined(_WIN32) /* Visual Studio */
+    return InterlockedCompareExchangePointer(addr, expected, newptr);
+#elif UA_MULTITHREADING >= 100 && defined(__GNUC__) /* GCC/Clang */
+    return __sync_val_compare_and_swap(addr, expected, newptr);
+#else
+    void *old = *addr;
+    if(old == expected)
+        *addr = newptr;
+    return old;
+#endif
+}
+
 /**
  * Memory Management
  * -----------------
@@ -202,31 +277,6 @@ extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
  * code analysis. */
 #define UA_THREADSAFE
 
-/**
- * Inline Functions
- * ---------------- */
-#ifdef _MSC_VER
-# define UA_INLINE __inline
-#else
-# define UA_INLINE inline
-#endif
-
-/* An inlinable method is typically defined as "static inline". Some
- * applications, such as language bindings with a C FFI (foreign function
- * interface), can however not work with static inline methods. These can set
- * the global UA_ENABLE_INLINABLE_EXPORT macro which causes all inlinable
- * methods to be exported as a regular public API method.
- *
- * Note that UA_ENABLE_INLINABLE_EXPORT has a negative impact for both size and
- * performance of the library. */
-#if defined(UA_ENABLE_INLINABLE_EXPORT) && defined(UA_INLINABLE_IMPL)
-# define UA_INLINABLE(decl, impl) UA_EXPORT decl; decl impl
-#elif defined(UA_ENABLE_INLINABLE_EXPORT)
-# define UA_INLINABLE(decl, impl) UA_EXPORT decl;
-#else
-# define UA_INLINABLE(decl, impl) static UA_INLINE decl impl
-#endif
-
 /**
  * Non-aliasing pointers
  * -------------------- */

From e200aa0f4eef94fa39c5b9af41b98e23bfca7392 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Jan 2023 22:43:54 +0100
Subject: [PATCH 0724/1963] feat(plugin): Add a lock to avoid crosstalk in
 stdout logging

---
 plugins/ua_log_stdout.c | 64 ++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index 176a51d3664..1921b62165c 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -40,12 +40,21 @@ const char *logCategoryNames[UA_LOGCATEGORIES] =
     {"network", "channel", "session", "server", "client",
      "userland", "securitypolicy", "eventloop", "pubsub", "discovery"};
 
-typedef struct {
-    UA_LogLevel minlevel;
+/* Protect crosstalk during logging via global lock.
+ * Use a spinlock on non-POSIX as we cannot statically initialize a global lock. */
 #if UA_MULTITHREADING >= 100
-    UA_Lock lock;
+# ifdef UA_ARCHITECTURE_POSIX
+UA_Lock logLock = UA_LOCK_STATIC_INIT;
+# else
+void * volatile logSpinLock = NULL;
+static UA_INLINE void spinLock(void) {
+    while(UA_atomic_cmpxchg(&logSpinLock, NULL, (void*)0x1) != NULL) {}
+}
+static UA_INLINE void spinUnLock(void) {
+    UA_atomic_xchg(&logSpinLock, NULL);
+}
+# endif
 #endif
-} LogContext;
 
 #ifdef __clang__
 __attribute__((__format__(__printf__, 4 , 0)))
@@ -53,12 +62,10 @@ __attribute__((__format__(__printf__, 4 , 0)))
 static void
 UA_Log_Stdout_log(void *context, UA_LogLevel level, UA_LogCategory category,
                   const char *msg, va_list args) {
-    LogContext *logContext = (LogContext*)context;
-    if(logContext) {
-        if(logContext->minlevel > level)
-            return;
-        UA_LOCK(&logContext->lock);
-    }
+    /* MinLevel encoded in the context pointer */
+    UA_LogLevel minLevel = (UA_LogLevel)(uintptr_t)context;
+    if(minLevel > level)
+        return;
 
     UA_Int64 tOffset = UA_DateTime_localTimeUtcOffset();
     UA_DateTimeStruct dts = UA_DateTime_toStruct(UA_DateTime_now() + tOffset);
@@ -67,6 +74,16 @@ UA_Log_Stdout_log(void *context, UA_LogLevel level, UA_LogCategory category,
     if(logLevelSlot < 0 || logLevelSlot > 5)
         logLevelSlot = 5; /* Set to fatal if the level is outside the range */
 
+    /* Lock */
+#if UA_MULTITHREADING >= 100
+# ifdef UA_ARCHITECTURE_POSIX
+    UA_LOCK(&logLock);
+# else
+    spinLock();
+# endif
+#endif
+
+    /* Log */
     printf("[%04u-%02u-%02u %02u:%02u:%02u.%03u (UTC%+05d)] %s/%s" ANSI_COLOR_RESET "\t",
            dts.year, dts.month, dts.day, dts.hour, dts.min, dts.sec, dts.milliSec,
            (int)(tOffset / UA_DATETIME_SEC / 36), logLevelNames[logLevelSlot],
@@ -75,30 +92,25 @@ UA_Log_Stdout_log(void *context, UA_LogLevel level, UA_LogCategory category,
     printf("\n");
     fflush(stdout);
 
-    if(logContext) {
-        UA_UNLOCK(&logContext->lock);
-    }
+    /* Unlock */
+#if UA_MULTITHREADING >= 100
+# ifdef UA_ARCHITECTURE_POSIX
+    UA_UNLOCK(&logLock);
+# else
+    spinUnLock();
+# endif
+#endif
 }
 
 static void
-UA_Log_Stdout_clear(void *context) {
-    if(!context)
-        return;
-    UA_LOCK_DESTROY(&((LogContext*)context)->lock);
-    UA_free(context);
-}
+UA_Log_Stdout_clear(void *context) {}
 
 const UA_Logger UA_Log_Stdout_ = {UA_Log_Stdout_log, NULL, UA_Log_Stdout_clear};
 const UA_Logger *UA_Log_Stdout = &UA_Log_Stdout_;
 
 UA_Logger
 UA_Log_Stdout_withLevel(UA_LogLevel minlevel) {
-    LogContext *context = (LogContext*)UA_calloc(1, sizeof(LogContext));
-    if(context) {
-        UA_LOCK_INIT(&context->lock);
-        context->minlevel = minlevel;
-    }
-
-    UA_Logger logger = {UA_Log_Stdout_log, (void*)context, UA_Log_Stdout_clear};
+    UA_Logger logger =
+        {UA_Log_Stdout_log, (void*)(uintptr_t)minlevel, UA_Log_Stdout_clear};
     return logger;
 }

From 218d4e39eedba250449db87dc5ed6f8c2c47e417 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 26 Jan 2023 21:58:13 +0100
Subject: [PATCH 0725/1963] feat(client): Set the timeoutHint by default to
 client->config.timeout

---
 include/open62541/client.h | 7 ++++++-
 src/client/ua_client.c     | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 6731666b184..18dfef67aac 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -71,7 +71,12 @@ _UA_BEGIN_DECLS
 typedef struct {
     void *clientContext; /* User-defined pointer attached to the client */
     UA_Logger logger;    /* Logger used by the client */
-    UA_UInt32 timeout;   /* Response timeout in ms */
+
+    /* Response timeout in ms (0 -> no timeout). If the server does not answer a
+     * request within this time a StatusCode UA_STATUSCODE_BADTIMEOUT is
+     * returned. This timeout can be overridden for individual requests by
+     * setting a non-null "timeoutHint" in the request header. */
+    UA_UInt32 timeout;
 
     /* The description must be internally consistent.
      * - The ApplicationUri set in the ApplicationDescription must match the
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 9cfbd268cb2..6937baecce4 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -329,6 +329,12 @@ sendRequest(UA_Client *client, const void *request,
     rr->authenticationToken = client->authenticationToken;
     rr->timestamp = UA_DateTime_now();
     rr->requestHandle = ++client->requestHandle;
+
+    /* Set the timeout hint if not manually defined */
+    if(rr->timeoutHint == 0)
+        rr->timeoutHint = client->config.timeout;
+
+    /* Generate the request id */
     UA_UInt32 rqId = ++client->requestId;
 
 #ifdef UA_ENABLE_TYPEDESCRIPTION

From 617763d0ac9622e6bfdc3d941972ed82afc60553 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 26 Jan 2023 21:59:03 +0100
Subject: [PATCH 0726/1963] refactor(client): Cosmetic improvements in
 ua_client.c

---
 src/client/ua_client.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 6937baecce4..f3bab6e48d1 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -351,8 +351,10 @@ sendRequest(UA_Client *client, const void *request,
     UA_StatusCode retval =
         UA_SecureChannel_sendSymmetricMessage(&client->channel, rqId,
                                               UA_MESSAGETYPE_MSG, rr, requestType);
-    rr->authenticationToken = oldToken; /* Set the original token */
 
+    rr->authenticationToken = oldToken; /* Set back to the original token */
+
+    /* Return the request id */
     *requestId = rqId;
     return retval;
 }

From 7a5e966b66cf5328bae4d0964fc4873644e2302e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 26 Jan 2023 21:59:29 +0100
Subject: [PATCH 0727/1963] refactor(plugin): Better description of the default
 client timeout

---
 plugins/ua_config_default.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 3593159bc7e..ba1c5a16913 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -888,7 +888,7 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
      *  sessionLocaleIdsSize */
 
     if(config->timeout == 0)
-        config->timeout = 5000;
+        config->timeout = 5 * 1000; /* 5 seconds */
     if(config->secureChannelLifeTime == 0)
         config->secureChannelLifeTime = 10 * 60 * 1000; /* 10 minutes */
 

From 067c2c1a51bcb72004edab52d686000522adc1ed Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 26 Jan 2023 22:00:19 +0100
Subject: [PATCH 0728/1963] refactor(client): Remove duplicate work in
 ua_client_connect.c

---
 src/client/ua_client_connect.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 55da4c30fe7..c59ab45e160 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -612,9 +612,6 @@ activateSessionAsync(UA_Client *client) {
 
     UA_ActivateSessionRequest request;
     UA_ActivateSessionRequest_init(&request);
-    request.requestHeader.requestHandle = ++client->requestHandle;
-    request.requestHeader.timestamp = UA_DateTime_now ();
-    request.requestHeader.timeoutHint = 600000;
     UA_StatusCode retval =
         UA_ExtensionObject_copy(&client->config.userIdentityToken,
                                 &request.userIdentityToken);
@@ -897,8 +894,6 @@ requestGetEndpoints(UA_Client *client) {
 
     UA_GetEndpointsRequest request;
     UA_GetEndpointsRequest_init(&request);
-    request.requestHeader.timestamp = UA_DateTime_now();
-    request.requestHeader.timeoutHint = 10000;
     request.endpointUrl = client->endpointUrl;
     UA_StatusCode retval =
         __Client_AsyncServiceEx(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
@@ -987,9 +982,6 @@ createSessionAsync(UA_Client *client) {
     /* Prepare and send the request */
     UA_CreateSessionRequest request;
     UA_CreateSessionRequest_init(&request);
-    request.requestHeader.requestHandle = ++client->requestHandle;
-    request.requestHeader.timestamp = UA_DateTime_now();
-    request.requestHeader.timeoutHint = 10000;
     request.clientNonce = client->localNonce;
     request.requestedSessionTimeout = client->config.requestedSessionTimeout;
     request.maxResponseMessageSize = UA_INT32_MAX;
@@ -1541,11 +1533,13 @@ closeSecureChannel(UA_Client *client) {
     if(client->channel.state == UA_SECURECHANNELSTATE_OPEN) {
         UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
                              "Sending the CLO message");
+
+        /* Manually set up the header (otherwise done in sendRequest) */
         UA_CloseSecureChannelRequest request;
         UA_CloseSecureChannelRequest_init(&request);
         request.requestHeader.requestHandle = ++client->requestHandle;
         request.requestHeader.timestamp = UA_DateTime_now();
-        request.requestHeader.timeoutHint = 10000;
+        request.requestHeader.timeoutHint = client->config.timeout;
         request.requestHeader.authenticationToken = client->authenticationToken;
         UA_SecureChannel_sendSymmetricMessage(&client->channel, ++client->requestId,
                                               UA_MESSAGETYPE_CLO, &request,
@@ -1562,8 +1556,6 @@ static void
 sendCloseSession(UA_Client *client) {
     UA_CloseSessionRequest request;
     UA_CloseSessionRequest_init(&request);
-    request.requestHeader.timestamp = UA_DateTime_now();
-    request.requestHeader.timeoutHint = 10000;
     request.deleteSubscriptions = true;
     UA_CloseSessionResponse response;
     __Client_Service(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
@@ -1627,8 +1619,6 @@ UA_Client_disconnectAsync(UA_Client *client) {
 
     UA_CloseSessionRequest request;
     UA_CloseSessionRequest_init(&request);
-    request.requestHeader.timestamp = UA_DateTime_now();
-    request.requestHeader.timeoutHint = 10000;
     request.deleteSubscriptions = true;
     UA_StatusCode res =
         __Client_AsyncServiceEx(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],

From c865c241bc6bf678465377438a1ff6286adad051 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 26 Jan 2023 22:00:49 +0100
Subject: [PATCH 0729/1963] refactor(client): Increase the default timeout for
 publish requests to 10 minutes

---
 src/client/ua_client_subscriptions.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index e9a40c8f9a0..3b90061d603 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -1355,7 +1355,9 @@ __Client_Subscriptions_backgroundPublish(UA_Client *client) {
         if(!request)
             return;
 
-        request->requestHeader.timeoutHint = 60000;
+        /* Publish requests are valid for 10 minutes */
+        request->requestHeader.timeoutHint = 10 * 60 * 1000;
+
         UA_StatusCode retval = __Client_preparePublishRequest(client, request);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_PublishRequest_delete(request);

From 55b0a6df39fe52a3c9249dd7266bf7f2d8c47ed4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 26 Jan 2023 22:08:53 +0100
Subject: [PATCH 0730/1963] refactor(client): Remove duplicate
 UA_Client_sendAsyncRequest (use __UA_Client_AsyncService instead)

---
 include/open62541/client.h                 |  7 +------
 include/open62541/client_highlevel_async.h |  6 +++---
 src/client/ua_client.c                     | 10 ----------
 tests/fuzz/corpus_generator.c              |  6 +++---
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 18dfef67aac..1bb06aaffbe 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -641,16 +641,11 @@ __UA_Client_AsyncService(UA_Client *client, const void *request,
                          const UA_DataType *responseType,
                          void *userdata, UA_UInt32 *requestId);
 
-UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
-        const UA_DataType *requestType, UA_ClientAsyncServiceCallback callback,
-        const UA_DataType *responseType, void *userdata, UA_UInt32 *requestId);
-
 /* Set new userdata and callback for an existing request.
  *
  * @param client Pointer to the UA_Client
  * @param requestId RequestId of the request, which was returned by
- *        UA_Client_sendAsyncRequest before
+ *        __UA_Client_AsyncService before
  * @param userdata The new userdata
  * @param callback The new callback
  * @return UA_StatusCode UA_STATUSCODE_GOOD on success
diff --git a/include/open62541/client_highlevel_async.h b/include/open62541/client_highlevel_async.h
index 95d68b33cbc..69dde5aa2a4 100644
--- a/include/open62541/client_highlevel_async.h
+++ b/include/open62541/client_highlevel_async.h
@@ -26,7 +26,7 @@ static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Client_sendAsyncReadRequest(UA_Client *client, UA_ReadRequest *request,
                                UA_ClientAsyncReadCallback readCallback, void *userdata,
                                UA_UInt32 *reqId) {
-    return UA_Client_sendAsyncRequest(client, request, &UA_TYPES[UA_TYPES_READREQUEST],
+    return __UA_Client_AsyncService(client, request, &UA_TYPES[UA_TYPES_READREQUEST],
                                       (UA_ClientAsyncServiceCallback)readCallback,
                                       &UA_TYPES[UA_TYPES_READRESPONSE], userdata, reqId);
 }
@@ -37,7 +37,7 @@ static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Client_sendAsyncWriteRequest(UA_Client *client, UA_WriteRequest *request,
                                 UA_ClientAsyncWriteCallback writeCallback, void *userdata,
                                 UA_UInt32 *reqId) {
-    return UA_Client_sendAsyncRequest(client, request, &UA_TYPES[UA_TYPES_WRITEREQUEST],
+    return __UA_Client_AsyncService(client, request, &UA_TYPES[UA_TYPES_WRITEREQUEST],
                                       (UA_ClientAsyncServiceCallback)writeCallback,
                                       &UA_TYPES[UA_TYPES_WRITERESPONSE], userdata, reqId);
 }
@@ -48,7 +48,7 @@ static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Client_sendAsyncBrowseRequest(UA_Client *client, UA_BrowseRequest *request,
                                  UA_ClientAsyncBrowseCallback browseCallback,
                                  void *userdata, UA_UInt32 *reqId) {
-    return UA_Client_sendAsyncRequest(client, request, &UA_TYPES[UA_TYPES_BROWSEREQUEST],
+    return __UA_Client_AsyncService(client, request, &UA_TYPES[UA_TYPES_BROWSEREQUEST],
                                       (UA_ClientAsyncServiceCallback)browseCallback,
                                       &UA_TYPES[UA_TYPES_BROWSERESPONSE], userdata,
                                       reqId);
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index f3bab6e48d1..ec59f8ceb49 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -785,16 +785,6 @@ __UA_Client_AsyncService(UA_Client *client, const void *request,
     return res;
 }
 
-UA_StatusCode
-UA_Client_sendAsyncRequest(UA_Client *client, const void *request,
-                           const UA_DataType *requestType,
-                           UA_ClientAsyncServiceCallback callback,
-                           const UA_DataType *responseType, void *userdata,
-                           UA_UInt32 *requestId) {
-    return __UA_Client_AsyncService(client, request, requestType, callback,
-                                    responseType, userdata, requestId);
-}
-
 /*******************/
 /* Timed Callbacks */
 /*******************/
diff --git a/tests/fuzz/corpus_generator.c b/tests/fuzz/corpus_generator.c
index bc13aa1f6fe..06db031c721 100644
--- a/tests/fuzz/corpus_generator.c
+++ b/tests/fuzz/corpus_generator.c
@@ -427,9 +427,9 @@ subscriptionRequests(UA_Client *client) {
     UA_PublishRequest publishRequest;
     UA_PublishRequest_init(&publishRequest);
     ASSERT_GOOD(UA_Client_preparePublishRequest(client, &publishRequest));
-    UA_Client_sendAsyncRequest(client, &publishRequest,
-                               &UA_TYPES[UA_TYPES_PUBLISHREQUEST], NULL,
-                               &UA_TYPES[UA_TYPES_PUBLISHRESPONSE], NULL, NULL);
+    __UA_Client_AsyncService(client, &publishRequest,
+                             &UA_TYPES[UA_TYPES_PUBLISHREQUEST], NULL,
+                             &UA_TYPES[UA_TYPES_PUBLISHRESPONSE], NULL, NULL);
     // here we don't care about the return value since it may be UA_STATUSCODE_BADMESSAGENOTAVAILABLE
     // ASSERT_GOOD(publishResponse.responseHeader.serviceResult);
     UA_PublishRequest_clear(&publishRequest);

From 9046d15fb653fcfdb3b02a05d004216b32202c57 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 26 Jan 2023 22:22:10 +0100
Subject: [PATCH 0731/1963] feat(client): Consider the request timeoutHint in
 synchronous service calls

---
 src/client/ua_client.c | 54 +++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index ec59f8ceb49..a8b531f7f55 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -511,8 +511,8 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
 
 void
 __Client_Service(UA_Client *client, const void *request,
-                    const UA_DataType *requestType, void *response,
-                    const UA_DataType *responseType) {
+                 const UA_DataType *requestType, void *response,
+                 const UA_DataType *responseType) {
     UA_ResponseHeader *respHeader = (UA_ResponseHeader*)response;
 
     /* Initialize. Response is valied in case of aborting. */
@@ -525,10 +525,6 @@ __Client_Service(UA_Client *client, const void *request,
 		return;
     }
 
-    /* Store the time until which the request has to be answered */
-    UA_DateTime maxDate = UA_DateTime_nowMonotonic() +
-        ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
-
     /* Check that the SecureChannel is open and also a Session active (if we
      * want a Session). Otherwise reopen. */
     if((client->sessionState != UA_SESSIONSTATE_ACTIVATED && !client->noSession) ||
@@ -546,16 +542,9 @@ __Client_Service(UA_Client *client, const void *request,
      * reconnection within the EventLoop run method. */
     UA_UInt32 channelId = client->channel.securityToken.channelId;
 
-    /* Send the request. This adds the ac variable to the async call linked list
-     * even though it is stack-allocated. */
-    AsyncServiceCall ac;
-    ac.callback = NULL;
-    ac.userdata = NULL;
-    ac.responseType = responseType;
-    ac.timeout = client->config.timeout;
-    ac.syncResponse = (UA_Response*)response;
-
-    UA_StatusCode retval = sendRequest(client, request, requestType, &ac.requestId);
+    /* Send the request */
+    UA_UInt32 requestId = 0;
+    UA_StatusCode retval = sendRequest(client, request, requestType, &requestId);
     if(retval != UA_STATUSCODE_GOOD) {
         /* If sending failed, the status is set to closing. The SecureChannel is
          * the actually closed in the next iteration of the EventLoop. */
@@ -569,26 +558,32 @@ __Client_Service(UA_Client *client, const void *request,
         return;
     }
 
-    /* Begin counting for the timeout after sending */
-    ac.start = UA_DateTime_nowMonotonic();
+    /* Temporarily insert an AsyncServiceCall */
+    const UA_RequestHeader *rh = (const UA_RequestHeader*)request;
+    AsyncServiceCall ac;
+    ac.callback = NULL;
+    ac.userdata = NULL;
+    ac.responseType = responseType;
+    ac.syncResponse = (UA_Response*)response;
+    ac.requestId = requestId;
+    ac.start = UA_DateTime_nowMonotonic(); /* Start timeout after sending */
+    ac.timeout = rh->timeoutHint;
+    if(ac.timeout == 0)
+        ac.timeout = UA_UINT32_MAX; /* 0 -> unlimited */
 
-    /* Temporarily insert to the async service list */
     LIST_INSERT_HEAD(&client->asyncServiceCalls, &ac, pointers);
 
-    /* Update the first timeout. Call the event-loop at least once with a
-     * timeout of zero. This is also important to have for debugging. */
-    UA_UInt32 timeout = 0;
-    UA_DateTime now = UA_DateTime_nowMonotonic();
-    if(now > maxDate)
-        timeout = (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC);
+    /* Time until which the request has to be answered */
+    UA_DateTime maxDate = ac.start + ((UA_DateTime)ac.timeout * UA_DATETIME_MSEC);
 
     /* Run the EventLoop until the request was processed, the request has timed
      * out or the client connection fails */
+    UA_UInt32 timeout_remaining = ac.timeout;
     while(true) {
         /* Unlock before dropping into the EventLoop. The client lock is
          * re-taken in the network callback if an event occurs. */
         UA_UNLOCK(&client->clientMutex);
-        retval = el->run(el, timeout);
+        retval = el->run(el, timeout_remaining);
         UA_LOCK(&client->clientMutex);
 
         /* Was the response received? In that case we can directly return. The
@@ -596,7 +591,6 @@ __Client_Service(UA_Client *client, const void *request,
         if(ac.syncResponse == NULL)
             return;
 
-
         /* Check the status. Do not try to resend if the connection breaks.
          * Leave this to the application-level user. For example, we do not want
          * to call a method twice is the connection broke after sending the
@@ -615,13 +609,13 @@ __Client_Service(UA_Client *client, const void *request,
             break;
         }
 
-        /* Compute the remaining timeout and run the EventLoop */
-        now = UA_DateTime_nowMonotonic();
+        /* Update the remaining timeout or break */
+        UA_DateTime now = UA_DateTime_nowMonotonic();
         if(now > maxDate) {
             retval = UA_STATUSCODE_BADTIMEOUT;
             break;
         }
-        timeout = (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC);
+        timeout_remaining = (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC);
     }
 
     /* Detach from the internal async service list */

From d97cad9978eb7c6ea1708c52a3a8a174c3cb41d8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 26 Jan 2023 22:35:26 +0100
Subject: [PATCH 0732/1963] refactor(client): Async client API takes timeout
 from request header timeout hint

The "Extended" version of the async API is no longer needed.
---
 include/open62541/client.h                 | 56 ++++++----------------
 include/open62541/client_highlevel_async.h |  2 +
 src/client/ua_client.c                     | 55 +++++++++------------
 src/client/ua_client_connect.c             | 33 ++++++-------
 src/client/ua_client_internal.h            | 11 ++---
 src/client/ua_client_subscriptions.c       | 21 ++++----
 tests/client/check_client_async.c          | 18 +++----
 7 files changed, 77 insertions(+), 119 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 1bb06aaffbe..54bbae474e5 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -608,26 +608,25 @@ UA_Client_Service_queryNext(UA_Client *client,
  * This is especially true for the periodic renewal of a SecureChannel's
  * SecurityToken which is designed to have a limited lifetime and will
  * invalidate the connection if not renewed.
+ *
+ * Use the typed wrappers instead of `__UA_Client_AsyncService` directly. See
+ * :ref:`client_async`. However, the general mechanism of async service calls is
+ * explained here.
  */
 
-/* Use the type versions of this method. See below. However, the general
- * mechanism of async service calls is explained here.
- *
- * We say that an async service call has been dispatched once this method
- * returns UA_STATUSCODE_GOOD. If there is an error after an async service has
- * been dispatched, the callback is called with an "empty" response where the
- * statusCode has been set accordingly. This is also done if the client is
- * shutting down and the list of dispatched async services is emptied.
+/* We say that an async service call has been dispatched once
+ * __UA_Client_AsyncService returns UA_STATUSCODE_GOOD. If there is an error
+ * after an async service has been dispatched, the callback is called with an
+ * "empty" response where the StatusCode has been set accordingly. This is also
+ * done if the client is shutting down and the list of dispatched async services
+ * is emptied.
  *
- * The statusCode received when the client is shutting down is
+ * The StatusCode received when the client is shutting down is
  * UA_STATUSCODE_BADSHUTDOWN.
  *
- * The statusCode received when the client doesn't receive response
- * after specified config->timeout (in ms) is
- * UA_STATUSCODE_BADTIMEOUT.
- *
- * Instead, you can use __UA_Client_AsyncServiceEx to specify
- * a custom timeout
+ * The StatusCode received when the client doesn't receive response after the
+ * specified in config->timeout (can be overridden via the "timeoutHint" in the
+ * request header) is UA_STATUSCODE_BADTIMEOUT.
  *
  * The userdata and requestId arguments can be NULL. */
 
@@ -672,33 +671,6 @@ UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout);
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_renewSecureChannel(UA_Client *client);
 
-/* Use the type versions of this method. See below. However, the general
- * mechanism of async service calls is explained here.
- *
- * We say that an async service call has been dispatched once this method
- * returns UA_STATUSCODE_GOOD. If there is an error after an async service has
- * been dispatched, the callback is called with an "empty" response where the
- * statusCode has been set accordingly. This is also done if the client is
- * shutting down and the list of dispatched async services is emptied.
- *
- * The statusCode received when the client is shutting down is
- * UA_STATUSCODE_BADSHUTDOWN.
- *
- * The statusCode received when the client doesn't receive response
- * after specified timeout (in ms) is
- * UA_STATUSCODE_BADTIMEOUT.
- *
- * The timeout can be disabled by setting timeout to 0
- *
- * The userdata and requestId arguments can be NULL. */
-UA_StatusCode UA_EXPORT
-__UA_Client_AsyncServiceEx(UA_Client *client, const void *request,
-                           const UA_DataType *requestType,
-                           UA_ClientAsyncServiceCallback callback,
-                           const UA_DataType *responseType,
-                           void *userdata, UA_UInt32 *requestId,
-                           UA_UInt32 timeout);
-
 /**
  * Timed Callbacks
  * ---------------
diff --git a/include/open62541/client_highlevel_async.h b/include/open62541/client_highlevel_async.h
index 69dde5aa2a4..023f69ab988 100644
--- a/include/open62541/client_highlevel_async.h
+++ b/include/open62541/client_highlevel_async.h
@@ -14,6 +14,8 @@
 _UA_BEGIN_DECLS
 
 /**
+ * .. _client_async:
+ *
  * Async Services
  * ^^^^^^^^^^^^^^
  *
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index a8b531f7f55..e1cc970b836 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -702,12 +702,11 @@ UA_Client_modifyAsyncCallback(UA_Client *client, UA_UInt32 requestId,
 }
 
 UA_StatusCode
-__Client_AsyncServiceEx(UA_Client *client, const void *request,
-                        const UA_DataType *requestType,
-                        UA_ClientAsyncServiceCallback callback,
-                        const UA_DataType *responseType,
-                        void *userdata, UA_UInt32 *requestId,
-                        UA_UInt32 timeout) {
+__Client_AsyncService(UA_Client *client, const void *request,
+                      const UA_DataType *requestType,
+                      UA_ClientAsyncServiceCallback callback,
+                      const UA_DataType *responseType,
+                      void *userdata, UA_UInt32 *requestId) {
     UA_LOCK_ASSERT(&client->clientMutex, 1);
 
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
@@ -720,11 +719,6 @@ __Client_AsyncServiceEx(UA_Client *client, const void *request,
     AsyncServiceCall *ac = (AsyncServiceCall*)UA_malloc(sizeof(AsyncServiceCall));
     if(!ac)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    ac->callback = callback;
-    ac->responseType = responseType;
-    ac->userdata = userdata;
-    ac->timeout = timeout;
-    ac->syncResponse = NULL;
 
     /* Call the service and set the requestId */
     UA_StatusCode retval = sendRequest(client, request, requestType, &ac->requestId);
@@ -738,33 +732,29 @@ __Client_AsyncServiceEx(UA_Client *client, const void *request,
         return retval;
     }
 
+    /* Set up the AsyncServiceCall for processing the response */
+    const UA_RequestHeader *rh = (const UA_RequestHeader*)request;
+    ac->callback = callback;
+    ac->responseType = responseType;
+    ac->userdata = userdata;
+    ac->syncResponse = NULL;
     ac->start = UA_DateTime_nowMonotonic();
+    ac->timeout = rh->timeoutHint;
+    if(ac->timeout == 0)
+        ac->timeout = UA_UINT32_MAX; /* 0 -> unlimited */
 
-    /* Store the entry for async processing */
     LIST_INSERT_HEAD(&client->asyncServiceCalls, ac, pointers);
+
+    /* Return the generated request id */
     if(requestId)
         *requestId = ac->requestId;
 
+    /* Notify the userland if a change happened */
     notifyClientState(client);
 
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
-__UA_Client_AsyncServiceEx(UA_Client *client, const void *request,
-                           const UA_DataType *requestType,
-                           UA_ClientAsyncServiceCallback callback,
-                           const UA_DataType *responseType,
-                           void *userdata, UA_UInt32 *requestId,
-                           UA_UInt32 timeout) {
-    UA_LOCK(&client->clientMutex);
-    UA_StatusCode res =
-        __Client_AsyncServiceEx(client, request, requestType, callback, responseType,
-                                userdata, requestId, timeout);
-    UA_UNLOCK(&client->clientMutex);
-    return res;
-}
-
 UA_StatusCode
 __UA_Client_AsyncService(UA_Client *client, const void *request,
                          const UA_DataType *requestType,
@@ -773,8 +763,8 @@ __UA_Client_AsyncService(UA_Client *client, const void *request,
                          void *userdata, UA_UInt32 *requestId) {
     UA_LOCK(&client->clientMutex);
     UA_StatusCode res =
-        __Client_AsyncServiceEx(client, request, requestType, callback, responseType,
-                                userdata, requestId, client->config.timeout);
+        __Client_AsyncService(client, request, requestType, callback, responseType,
+                              userdata, requestId);
     UA_UNLOCK(&client->clientMutex);
     return res;
 }
@@ -902,10 +892,9 @@ __Client_backgroundConnectivity(UA_Client *client) {
     request.nodesToRead = &rvid;
     request.nodesToReadSize = 1;
     UA_StatusCode retval =
-        __Client_AsyncServiceEx(client, &request, &UA_TYPES[UA_TYPES_READREQUEST],
-                                (UA_ClientAsyncServiceCallback)backgroundConnectivityCallback,
-                                &UA_TYPES[UA_TYPES_READRESPONSE], NULL, NULL,
-                                client->config.timeout);
+        __Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_READREQUEST],
+                              (UA_ClientAsyncServiceCallback)backgroundConnectivityCallback,
+                              &UA_TYPES[UA_TYPES_READRESPONSE], NULL, NULL);
     if(retval == UA_STATUSCODE_GOOD)
         client->pendingConnectivityCheck = true;
 }
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index c59ab45e160..f41b96beaf1 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -657,11 +657,11 @@ activateSessionAsync(UA_Client *client) {
 #endif
 
     if(retval == UA_STATUSCODE_GOOD)
-        retval = __Client_AsyncServiceEx(client, &request,
-                                         &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST],
-                                         (UA_ClientAsyncServiceCallback)responseActivateSession,
-                                         &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE],
-                                         NULL, NULL, client->config.timeout);
+        retval = __Client_AsyncService(client, &request,
+                                       &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST],
+                                       (UA_ClientAsyncServiceCallback)responseActivateSession,
+                                       &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE],
+                                       NULL, NULL);
 
     UA_ActivateSessionRequest_clear(&request);
     if(retval == UA_STATUSCODE_GOOD)
@@ -896,10 +896,9 @@ requestGetEndpoints(UA_Client *client) {
     UA_GetEndpointsRequest_init(&request);
     request.endpointUrl = client->endpointUrl;
     UA_StatusCode retval =
-        __Client_AsyncServiceEx(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
-                                (UA_ClientAsyncServiceCallback) responseGetEndpoints,
-                                &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], NULL, NULL,
-                                client->config.timeout);
+        __Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
+                              (UA_ClientAsyncServiceCallback) responseGetEndpoints,
+                              &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], NULL, NULL);
     if(retval == UA_STATUSCODE_GOOD)
         client->endpointsHandshake = true;
     else
@@ -992,11 +991,10 @@ createSessionAsync(UA_Client *client) {
         request.clientCertificate = client->channel.securityPolicy->localCertificate;
     }
 
-    res = __Client_AsyncServiceEx(client, &request,
-                                  &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST],
-                                  (UA_ClientAsyncServiceCallback)responseSessionCallback,
-                                  &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL, NULL,
-                                  client->config.timeout);
+    res = __Client_AsyncService(client, &request,
+                                &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST],
+                                (UA_ClientAsyncServiceCallback)responseSessionCallback,
+                                &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL, NULL);
 
     if(res == UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_CREATE_REQUESTED;
@@ -1621,10 +1619,9 @@ UA_Client_disconnectAsync(UA_Client *client) {
     UA_CloseSessionRequest_init(&request);
     request.deleteSubscriptions = true;
     UA_StatusCode res =
-        __Client_AsyncServiceEx(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
-                                (UA_ClientAsyncServiceCallback)closeSessionCallback,
-                                &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE], NULL, NULL,
-                                client->config.timeout);
+        __Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST],
+                              (UA_ClientAsyncServiceCallback)closeSessionCallback,
+                              &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE], NULL, NULL);
     if(res != UA_STATUSCODE_GOOD) {
         /* Sending the close request failed. Continue to close the connection
          * anyway. */
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 80977e5e879..76bda808680 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -180,12 +180,11 @@ struct UA_Client {
 };
 
 UA_StatusCode
-__Client_AsyncServiceEx(UA_Client *client, const void *request,
-                        const UA_DataType *requestType,
-                        UA_ClientAsyncServiceCallback callback,
-                        const UA_DataType *responseType,
-                        void *userdata, UA_UInt32 *requestId,
-                        UA_UInt32 timeout);
+__Client_AsyncService(UA_Client *client, const void *request,
+                      const UA_DataType *requestType,
+                      UA_ClientAsyncServiceCallback callback,
+                      const UA_DataType *responseType,
+                      void *userdata, UA_UInt32 *requestId);
 
 void
 __Client_Service(UA_Client *client, const void *request,
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 3b90061d603..a47335b6eaa 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -660,11 +660,11 @@ createDataChanges_async(UA_Client *client, const UA_CreateMonitoredItemsRequest
         return res;
     }
 
-    return __Client_AsyncServiceEx(client, &data->request,
-                                   &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST],
-                                   ua_MonitoredItems_create_async_handler,
-                                   &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE],
-                                   data, requestId, client->config.timeout);
+    return __Client_AsyncService(client, &data->request,
+                                 &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST],
+                                 ua_MonitoredItems_create_async_handler,
+                                 &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE],
+                                 data, requestId);
 }
 
 UA_CreateMonitoredItemsResponse
@@ -1364,20 +1364,17 @@ __Client_Subscriptions_backgroundPublish(UA_Client *client) {
             return;
         }
 
-        UA_UInt32 requestId;
-        client->currentlyOutStandingPublishRequests++;
-
-        /* Disable the timeout, it is treat in
-         * UA_Client_Subscriptions_backgroundPublishInactivityCheck */
-        retval = __Client_AsyncServiceEx(client, request,
+        retval = __Client_AsyncService(client, request,
                                          &UA_TYPES[UA_TYPES_PUBLISHREQUEST],
                                          processPublishResponseAsync,
                                          &UA_TYPES[UA_TYPES_PUBLISHRESPONSE],
-                                         (void*)request, &requestId, 0);
+                                         (void*)request, NULL);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_PublishRequest_delete(request);
             return;
         }
+
+        client->currentlyOutStandingPublishRequests++;
     }
 }
 
diff --git a/tests/client/check_client_async.c b/tests/client/check_client_async.c
index 9fc66991516..b38fa72dd1c 100644
--- a/tests/client/check_client_async.c
+++ b/tests/client/check_client_async.c
@@ -166,10 +166,11 @@ START_TEST(Client_read_async_timed) {
         rr.nodesToRead = &rvid;
         rr.nodesToReadSize = 1;
 
-        retval = __UA_Client_AsyncServiceEx(client, &rr,
-                &UA_TYPES[UA_TYPES_READREQUEST],
-                (UA_ClientAsyncServiceCallback) asyncReadCallback,
-                &UA_TYPES[UA_TYPES_READRESPONSE], &asyncCounter, NULL, 999);
+        rr.requestHeader.timeoutHint = 999;
+        retval = __UA_Client_AsyncService(client, &rr,
+                                          &UA_TYPES[UA_TYPES_READREQUEST],
+                                          (UA_ClientAsyncServiceCallback) asyncReadCallback,
+                                          &UA_TYPES[UA_TYPES_READRESPONSE], &asyncCounter, NULL);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
         /* Process async responses during 1s */
@@ -184,10 +185,11 @@ START_TEST(Client_read_async_timed) {
         uintptr_t connId = client->channel.connectionId;
         cm->closeConnection(cm, connId);
 
-        retval = __UA_Client_AsyncServiceEx(client, &rr,
-                &UA_TYPES[UA_TYPES_READREQUEST],
-                (UA_ClientAsyncServiceCallback) asyncReadCallback,
-                &UA_TYPES[UA_TYPES_READRESPONSE], &asyncCounter, NULL, 100);
+        rr.requestHeader.timeoutHint = 100;
+        retval = __UA_Client_AsyncService(client, &rr,
+                                          &UA_TYPES[UA_TYPES_READREQUEST],
+                                          (UA_ClientAsyncServiceCallback) asyncReadCallback,
+                                          &UA_TYPES[UA_TYPES_READRESPONSE], &asyncCounter, NULL);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         /* Process async responses during 1s */
         UA_Client_run_iterate(client, 100 + 1);

From eaa133eed6efcf737f7b8923f7c8e46a0f5a8837 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Fri, 27 Jan 2023 13:00:34 +0100
Subject: [PATCH 0733/1963] fix (el): initialize epoll_event memory before
 usage

---
 arch/eventloop_posix_epoll.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
index c58adc4663b..4633bc2ae05 100644
--- a/arch/eventloop_posix_epoll.c
+++ b/arch/eventloop_posix_epoll.c
@@ -34,6 +34,7 @@ UA_EventLoopPOSIX_registerFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
 UA_StatusCode
 UA_EventLoopPOSIX_modifyFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
     struct epoll_event event;
+    memset(&event, 0, sizeof(struct epoll_event));
     event.data.ptr = rfd;
     event.events = 0;
     if(rfd->listenEvents & UA_FDEVENT_IN)

From 19d30c28c2ea9efeaffbecc05cbd1e0760d5ad59 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 26 Jan 2023 10:14:19 +0100
Subject: [PATCH 0734/1963] fix(pubsub): enable remove and add readergroups

Removing and adding readergroups with pubsub lead to errors when the
readergroups were set operational before. This fix opens and closes the
communication channel for readergroups that are bound to a connection in
the scope of the connection.
---
 src/pubsub/ua_pubsub_connection.c  |  8 ++++++++
 src/pubsub/ua_pubsub_readergroup.c | 10 ----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index 5f5cbe3f640..e46358ff762 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -196,6 +196,10 @@ UA_PubSubConnection_create(UA_Server *server,
 
     assignConnectionIdentifier(server, newConnectionsField, connectionIdentifier);
 
+    /* Open the connection channel */
+    if(newConnectionsField->channel->openSubscriber) {
+        newConnectionsField->channel->openSubscriber(newConnectionsField->channel);
+    }
     return UA_STATUSCODE_GOOD;
 }
 
@@ -234,6 +238,10 @@ removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
         UA_ReaderGroup_unfreezeConfiguration(server, readerGroup);
         removeReaderGroup(server, readerGroup->identifier);
     }
+    /* Close the related channel */
+    if(c->channel->closeSubscriber) {
+        c->channel->closeSubscriber(c->channel);
+    }
 
     /* Remove from the information model */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 8ff7842aa01..cc879886a07 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -334,11 +334,6 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
         break;
     case UA_PUBSUBSTATE_OPERATIONAL: {
         UA_ReaderGroup_removeSubscribeCallback(server, rg);
-        UA_PubSubConnection *connection = rg->linkedConnection;
-        UA_PubSubChannel *channel = connection->channel;
-        if(channel->closeSubscriber) {
-            channel->closeSubscriber(channel);
-        }
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
             UA_DataSetReader_setPubSubState(server, dataSetReader,
                                             UA_PUBSUBSTATE_DISABLED, cause);
@@ -390,11 +385,6 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
             UA_DataSetReader_setPubSubState(server, dataSetReader, UA_PUBSUBSTATE_OPERATIONAL,
                                             cause);
         }
-        UA_PubSubConnection *connection = rg->linkedConnection;
-        UA_PubSubChannel *channel = connection->channel;
-        if(channel->openSubscriber) {
-            channel->openSubscriber(channel);
-        }
         UA_ReaderGroup_addSubscribeCallback(server, rg);
         rg->state = UA_PUBSUBSTATE_OPERATIONAL;
         return UA_STATUSCODE_GOOD;

From f70693b08d097d2a49354903034e2a2029adc821 Mon Sep 17 00:00:00 2001
From: Jan Hermes <jan@hermes-technology.de>
Date: Thu, 26 Jan 2023 12:35:09 +0100
Subject: [PATCH 0735/1963] test(pubsub): test remove and add readergroups

---
 tests/pubsub/check_pubsub_udp_unicast.c | 114 ++++++++++++++++++------
 1 file changed, 86 insertions(+), 28 deletions(-)

diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
index e0a6cf6a0df..afd3c305674 100644
--- a/tests/pubsub/check_pubsub_udp_unicast.c
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -197,17 +197,17 @@ static void setupPublishingUnicast(UA_Server *server, UA_NodeId connectionId, co
     setupWrittenData(server, connectionId, outPublishedDataSetId, dstHost, dstPort);
 }
 
-static void setupSubscribing(UA_Server *server, UA_NodeId connectionId, UA_NodeId folderId, UA_UInt32 subscribeVariableNodeId) {
+static void setupSubscribing(UA_Server *server, UA_NodeId connectionId, UA_NodeId targetNodeId, UA_UInt32 subscribeVariableNodeId,
+                             UA_NodeId *outReaderGroupId) {
     /* Reader Group */
     UA_ReaderGroupConfig readerGroupConfig;
     memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
     readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
 
-    UA_NodeId outReaderGroupId;
-    UA_StatusCode retVal =  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &outReaderGroupId);
+    UA_StatusCode retVal =  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, outReaderGroupId);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-    retVal = UA_Server_setReaderGroupOperational(server, outReaderGroupId);
+    retVal = UA_Server_setReaderGroupOperational(server, *outReaderGroupId);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     /* Data Set Reader */
@@ -240,28 +240,17 @@ static void setupSubscribing(UA_Server *server, UA_NodeId connectionId, UA_NodeI
     pMetaData->fields[0].valueRank   = -1; /* scalar */
 
     UA_NodeId readerIdentifier;
-    retVal = UA_Server_addDataSetReader(server, outReaderGroupId, &readerConfig,
+    retVal = UA_Server_addDataSetReader(server, *outReaderGroupId, &readerConfig,
                                          &readerIdentifier);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-    /* Add Subscribed Variables */
-    /* Variable to subscribe data */
-    UA_NodeId newnodeId;
-    UA_VariableAttributes vAttr = UA_VariableAttributes_default;
-    vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
-    vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
-    vAttr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
-    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, subscribeVariableNodeId), folderId,
-                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
-                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_FieldTargetVariable targetVar;
     memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
     /* For creating Targetvariable */
     UA_FieldTargetDataType_init(&targetVar.targetVariable);
     targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
-    targetVar.targetVariable.targetNodeId = newnodeId;
+    targetVar.targetVariable.targetNodeId = targetNodeId;
     retVal = UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
                                                             1, &targetVar);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -270,21 +259,43 @@ static void setupSubscribing(UA_Server *server, UA_NodeId connectionId, UA_NodeI
 }
 
 /* setup() is to create an environment for test cases */
-static void setup(void) {
+static void setupEnvironment(UA_Server **serverPub, UA_Server **serverSub, UA_ServerConfig **configPub, UA_ServerConfig **configSub,
+                             UA_NodeId *outPublisherConnectionId, UA_NodeId *outSubscriberConnectionId, UA_NodeId *outReaderGroupId,
+                             UA_NodeId *outVariableNodeId) {
     /*Add setup by creating new server with valid configuration */
-    setupPubSubServer(&serverPublisher, &configPublisher, UA_PUBLISHER_PORT, NULL);
-    UA_NodeId publisherConnectionId;
-    addUDPConnection(serverPublisher, "localhost", UA_PUBLISHER_PORT, &publisherConnectionId);
-    setupPublishingUnicast(serverPublisher, publisherConnectionId, "127.0.0.1", UA_SUBSCRIBER_PORT,
+    setupPubSubServer(serverPub, configPub, UA_PUBLISHER_PORT, NULL);
+    addUDPConnection(*serverPub, "localhost", UA_PUBLISHER_PORT, outPublisherConnectionId);
+    setupPublishingUnicast(*serverPub, *outPublisherConnectionId, "127.0.0.1", UA_SUBSCRIBER_PORT,
                            PUBLISHVARIABLE_NODEID);
 
-    setupPubSubServer(&serverSubscriber, &configSubscriber, UA_SUBSCRIBER_PORT,
-                      configPublisher->eventLoop);
+    setupPubSubServer(serverSub, configSub, UA_SUBSCRIBER_PORT,
+                      (*configPub)->eventLoop);
+
     UA_NodeId folderId;
-    setupFolder(serverSubscriber, &folderId);
-    UA_NodeId subscriberConnectionId;
-    addUDPConnection(serverSubscriber, "localhost", UA_SUBSCRIBER_PORT, &subscriberConnectionId);
-    setupSubscribing(serverSubscriber, subscriberConnectionId, folderId, SUBSCRIBEVARIABLE_NODEID);
+    setupFolder(*serverSub, &folderId);
+    addUDPConnection(*serverSub, "localhost", UA_SUBSCRIBER_PORT, outSubscriberConnectionId);
+
+    /* Add Subscribed Variables */
+    /* Variable to subscribe data */
+    UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+    vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+    vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+    vAttr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
+    UA_StatusCode retVal = UA_Server_addVariableNode(*serverSub, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), folderId,
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
+                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, outVariableNodeId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    setupSubscribing(*serverSub, *outSubscriberConnectionId, *outVariableNodeId, SUBSCRIBEVARIABLE_NODEID, outReaderGroupId);
+}
+
+/* setup() is to create an environment for test cases */
+static void setup(void) {
+
+    // UA_NodeId publisherConnectionId;
+    // UA_NodeId subscriberConnectionId;
+    // setupEnvironment(&serverPublisher, &serverSubscriber, &configPublisher, &configSubscriber,
+    //                  &publisherConnectionId, &subscriberConnectionId);
 }
 
 /* teardown() is to delete the environment set for test cases */
@@ -325,7 +336,14 @@ static void checkReceived(UA_Server *publisher, UA_UInt32 publishVariableNodeId,
 }
 
 START_TEST(SinglePublishSubscribeInt32) {
+    UA_NodeId publisherConnectionId;
+    UA_NodeId subscriberConnectionId;
+    UA_NodeId readerGroupId;
+    UA_NodeId outVariableNodeId;
+    setupEnvironment(&serverPublisher, &serverSubscriber, &configPublisher, &configSubscriber,
+                     &publisherConnectionId, &subscriberConnectionId, &readerGroupId, &outVariableNodeId);
     /* run server - publisher and subscriber */
+
     UA_fakeSleep(PUBLISH_INTERVAL + 1);
     UA_Server_run_iterate(serverPublisher,true);
     UA_fakeSleep(PUBLISH_INTERVAL + 1);
@@ -335,12 +353,52 @@ START_TEST(SinglePublishSubscribeInt32) {
                   serverSubscriber, SUBSCRIBEVARIABLE_NODEID);
 }END_TEST
 
+START_TEST(RemoveAndAddReaderGroup) {
+        UA_NodeId publisherConnectionId;
+        UA_NodeId subscriberConnectionId;
+        UA_NodeId readerGroupId;
+        UA_NodeId outVariableNodeId;
+        setupEnvironment(&serverPublisher, &serverSubscriber, &configPublisher, &configSubscriber,
+                         &publisherConnectionId, &subscriberConnectionId, &readerGroupId, &outVariableNodeId);
+
+        UA_NodeId readerGroupId2;
+        setupSubscribing(serverSubscriber, subscriberConnectionId, outVariableNodeId, SUBSCRIBEVARIABLE_NODEID, &readerGroupId2);
+
+        /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
+        UA_Server_run_iterate(serverPublisher,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
+        UA_Server_run_iterate(serverSubscriber,true);
+
+        UA_Server_removeReaderGroup(serverSubscriber, readerGroupId2);
+        UA_Server_removePubSubConnection(serverSubscriber, subscriberConnectionId);
+
+        /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
+        UA_Server_run_iterate(serverPublisher,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
+        UA_Server_run_iterate(serverSubscriber,true);
+
+        addUDPConnection(serverSubscriber, "localhost", UA_SUBSCRIBER_PORT, &subscriberConnectionId);
+        setupSubscribing(serverSubscriber, subscriberConnectionId,
+                         outVariableNodeId, SUBSCRIBEVARIABLE_NODEID,
+                         &readerGroupId);
+
+        /* run server - publisher and subscriber */
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
+        UA_Server_run_iterate(serverPublisher,true);
+        UA_fakeSleep(PUBLISH_INTERVAL + 1);
+        UA_Server_run_iterate(serverSubscriber,true);
+
+    }END_TEST
+
 int main(void) {
 
     /*Test case to run both publisher and subscriber */
     TCase *tc_pubsub_publish_subscribe = tcase_create("Publisher publishing and Subscriber subscribing");
     tcase_add_checked_fixture(tc_pubsub_publish_subscribe, setup, teardown);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeInt32);
+    tcase_add_test(tc_pubsub_publish_subscribe, RemoveAndAddReaderGroup);
 
     Suite *suite = suite_create("PubSub readerGroups/reader/Fields handling and publishing");
     suite_add_tcase(suite, tc_pubsub_publish_subscribe);

From 7a57a634e2833d7eea25d653d413a6b4bd8ecbe0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 00:07:37 +0000
Subject: [PATCH 0736/1963] build(deps): bump deps/ua-nodeset from `08d08a8` to
 `3f301f1`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `08d08a8` to `3f301f1`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/08d08a88647c8f874be7dfaf931bde856723ef7f...3f301f123c3df4b1dfcafbcceff4ae756290c444)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 08d08a88647..3f301f123c3 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 08d08a88647c8f874be7dfaf931bde856723ef7f
+Subproject commit 3f301f123c3df4b1dfcafbcceff4ae756290c444

From b33313fd498026e780a3036f0519227663b644cb Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Mon, 30 Jan 2023 14:18:13 +0100
Subject: [PATCH 0737/1963] fix(server): Check server pointer in
 UA_Server_delete and UA_Server_run_shutdown

A failed server startup may have caused an exception in these functions.
---
 src/server/ua_server.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 64fa2a22a24..3522187f18e 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -179,6 +179,9 @@ UA_Server_forEachChildNodeCall(UA_Server *server, UA_NodeId parentNodeId,
 
 /* The server needs to be stopped before it can be deleted */
 void UA_Server_delete(UA_Server *server) {
+    if(server == NULL) {
+        return;
+    }
     UA_LOCK(&server->serviceMutex);
 
     UA_Server_deleteSecureChannels(server);
@@ -951,6 +954,9 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
 
 UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server) {
+    if(server == NULL) {
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
     /* Stop the regular housekeeping tasks */
     if(server->houseKeepingCallbackId != 0) {
         UA_Server_removeCallback(server, server->houseKeepingCallbackId);

From 022ad60723e4d6caaeef399144b7c964698a831b Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Mon, 30 Jan 2023 14:12:55 +0100
Subject: [PATCH 0738/1963] fix (tests): Check server instance in UNIT tests

Failed UNIT tests caused an exception in the server loop, if the
server instance could not be created.
---
 tests/client/check_client.c                                | 1 +
 tests/client/check_client_async.c                          | 1 +
 tests/client/check_client_async_connect.c                  | 1 +
 tests/client/check_client_authentication.c                 | 1 +
 tests/client/check_client_encryption.c                     | 1 +
 tests/client/check_client_highlevel.c                      | 1 +
 tests/client/check_client_historical_data.c                | 1 +
 tests/client/check_client_securechannel.c                  | 1 +
 tests/client/check_client_subscriptions.c                  | 1 +
 tests/encryption/check_cert_generation.c                   | 1 +
 tests/encryption/check_encryption_aes128sha256rsaoaep.c    | 1 +
 tests/encryption/check_encryption_basic128rsa15.c          | 1 +
 tests/encryption/check_encryption_basic256.c               | 1 +
 tests/encryption/check_encryption_basic256sha256.c         | 1 +
 tests/encryption/check_save_rejected_cert.c                | 1 +
 tests/multithreading/check_mt_addDeleteObject.c            | 1 +
 tests/multithreading/check_mt_addObjectNode.c              | 1 +
 tests/multithreading/check_mt_addVariableTypeNode.c        | 1 +
 tests/multithreading/check_mt_readValueAttribute.c         | 1 +
 tests/multithreading/check_mt_readWriteDelete.c            | 1 +
 tests/multithreading/check_mt_readWriteDeleteCallback.c    | 1 +
 tests/multithreading/check_mt_writeValueAttribute.c        | 1 +
 tests/nodeset-compiler/check_nodeset_compiler_adi.c        | 1 +
 tests/nodeset-compiler/check_nodeset_compiler_autoid.c     | 1 +
 tests/nodeset-compiler/check_nodeset_compiler_plc.c        | 1 +
 .../nodeset-compiler/check_nodeset_compiler_testnodeset.c  | 1 +
 tests/nodeset-loader/check_nodeset_loader_adi.c            | 1 +
 tests/nodeset-loader/check_nodeset_loader_autoid.c         | 1 +
 tests/nodeset-loader/check_nodeset_loader_compare_di.c     | 1 +
 tests/nodeset-loader/check_nodeset_loader_di.c             | 1 +
 tests/nodeset-loader/check_nodeset_loader_input.c          | 1 +
 tests/nodeset-loader/check_nodeset_loader_ordering_di.c    | 1 +
 tests/nodeset-loader/check_nodeset_loader_plc.c            | 1 +
 tests/nodeset-loader/check_nodeset_loader_testnodeset.c    | 1 +
 tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c     | 1 +
 tests/pubsub/check_pubsub_config_freeze.c                  | 1 +
 tests/pubsub/check_pubsub_configuration.c                  | 1 +
 tests/pubsub/check_pubsub_connection_ethernet.c            | 1 +
 tests/pubsub/check_pubsub_connection_ethernet_etf.c        | 1 +
 tests/pubsub/check_pubsub_connection_mqtt.c                | 1 +
 tests/pubsub/check_pubsub_connection_udp.c                 | 1 +
 tests/pubsub/check_pubsub_connection_xdp.c                 | 1 +
 tests/pubsub/check_pubsub_encrypted_rt_levels.c            | 1 +
 tests/pubsub/check_pubsub_encryption.c                     | 1 +
 tests/pubsub/check_pubsub_encryption_aes256.c              | 1 +
 tests/pubsub/check_pubsub_get_state.c                      | 2 +-
 tests/pubsub/check_pubsub_informationmodel.c               | 1 +
 tests/pubsub/check_pubsub_informationmodel_methods.c       | 1 +
 tests/pubsub/check_pubsub_mqtt.c                           | 1 +
 tests/pubsub/check_pubsub_multiple_layer.c                 | 1 +
 tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c   | 1 +
 tests/pubsub/check_pubsub_pds.c                            | 1 +
 tests/pubsub/check_pubsub_publish.c                        | 1 +
 tests/pubsub/check_pubsub_publish_ethernet.c               | 1 +
 tests/pubsub/check_pubsub_publish_ethernet_etf.c           | 1 +
 tests/pubsub/check_pubsub_publish_json.c                   | 1 +
 tests/pubsub/check_pubsub_publish_rt_levels.c              | 1 +
 tests/pubsub/check_pubsub_publish_uadp.c                   | 1 +
 tests/pubsub/check_pubsub_publisherid.c                    | 1 +
 tests/pubsub/check_pubsub_publishspeed.c                   | 1 +
 tests/pubsub/check_pubsub_subscribe.c                      | 1 +
 tests/pubsub/check_pubsub_subscribe_config_freeze.c        | 1 +
 tests/pubsub/check_pubsub_subscribe_encrypted.c            | 1 +
 tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c        | 1 +
 tests/pubsub/check_pubsub_subscribe_rt_levels.c            | 1 +
 tests/server/check_accesscontrol.c                         | 1 +
 tests/server/check_interfaces.c                            | 1 +
 tests/server/check_local_monitored_item.c                  | 2 ++
 tests/server/check_monitoreditem_filter.c                  | 1 +
 tests/server/check_node_inheritance.c                      | 1 +
 tests/server/check_server.c                                | 1 +
 tests/server/check_server_asyncop.c                        | 1 +
 tests/server/check_server_callbacks.c                      | 1 +
 tests/server/check_server_historical_data.c                | 1 +
 tests/server/check_server_historical_data_circular.c       | 1 +
 tests/server/check_server_jobs.c                           | 1 +
 tests/server/check_server_monitoringspeed.c                | 1 +
 tests/server/check_server_readspeed.c                      | 1 +
 tests/server/check_server_reverseconnect.c                 | 1 +
 tests/server/check_server_speed_addnodes.c                 | 1 +
 tests/server/check_services_attributes.c                   | 1 +
 tests/server/check_services_call.c                         | 1 +
 tests/server/check_services_nodemanagement.c               | 1 +
 tests/server/check_services_subscriptions.c                | 1 +
 tests/server/check_services_view.c                         | 7 +++++++
 tests/server/check_session.c                               | 1 +
 tests/server/check_subscription_event_filter.c             | 1 +
 87 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index ae3e9b272a6..f2996b5709a 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -56,6 +56,7 @@ THREAD_CALLBACK(serverloop) {
 static void setup(void) {
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
     addVariable(VARLENGTH);
diff --git a/tests/client/check_client_async.c b/tests/client/check_client_async.c
index b38fa72dd1c..bad867333d7 100644
--- a/tests/client/check_client_async.c
+++ b/tests/client/check_client_async.c
@@ -30,6 +30,7 @@ THREAD_CALLBACK(serverloop) {
 static void setup(void) {
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_Server_run_startup(server);
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index df819e311ab..e152aceb44e 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -31,6 +31,7 @@ currentState(UA_Client *client, UA_SecureChannelState channelState,
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/client/check_client_authentication.c b/tests/client/check_client_authentication.c
index 75307d96033..5a039e09a4e 100644
--- a/tests/client/check_client_authentication.c
+++ b/tests/client/check_client_authentication.c
@@ -62,6 +62,7 @@ static void setup(void) {
     size_t revocationListSize = 0;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
                                                    trustList, trustListSize,
diff --git a/tests/client/check_client_encryption.c b/tests/client/check_client_encryption.c
index 14cf5728566..51b1a9ca4df 100644
--- a/tests/client/check_client_encryption.c
+++ b/tests/client/check_client_encryption.c
@@ -56,6 +56,7 @@ static void setup(void) {
     size_t revocationListSize = 0;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
                                                    trustList, trustListSize,
diff --git a/tests/client/check_client_highlevel.c b/tests/client/check_client_highlevel.c
index 1b75dc802aa..f6b2b98843a 100644
--- a/tests/client/check_client_highlevel.c
+++ b/tests/client/check_client_highlevel.c
@@ -29,6 +29,7 @@ THREAD_CALLBACK(serverloop) {
 static void setup(void) {
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     ck_assert_uint_eq(2, UA_Server_addNamespace(server, CUSTOM_NS));
diff --git a/tests/client/check_client_historical_data.c b/tests/client/check_client_historical_data.c
index 78b3b4308fe..7a244a6f931 100644
--- a/tests/client/check_client_historical_data.c
+++ b/tests/client/check_client_historical_data.c
@@ -76,6 +76,7 @@ static void fillInt64DataValue(UA_DateTime timestamp, UA_Int64 value,
 static void setup(void) {
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index 2ba64761333..10f0497c539 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -36,6 +36,7 @@ static void pauseServer(void) {
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
     runServer();
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 6780c62a704..5804004cd27 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -34,6 +34,7 @@ static void setup(void) {
     noNewSubscription = false;
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     config->maxPublishReqPerSession = 5;
diff --git a/tests/encryption/check_cert_generation.c b/tests/encryption/check_cert_generation.c
index 93c9f165a30..e1e8b5d0490 100644
--- a/tests/encryption/check_cert_generation.c
+++ b/tests/encryption/check_cert_generation.c
@@ -15,6 +15,7 @@ UA_Server *server;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
 }
 
 static void teardown(void) {
diff --git a/tests/encryption/check_encryption_aes128sha256rsaoaep.c b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
index 83cd274b90a..843a3d06882 100644
--- a/tests/encryption/check_encryption_aes128sha256rsaoaep.c
+++ b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
@@ -69,6 +69,7 @@ static void setup(void) {
     size_t revocationListSize = 0;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
                                                    trustList, trustListSize,
diff --git a/tests/encryption/check_encryption_basic128rsa15.c b/tests/encryption/check_encryption_basic128rsa15.c
index 27d576d4a3e..aa907cd3dec 100644
--- a/tests/encryption/check_encryption_basic128rsa15.c
+++ b/tests/encryption/check_encryption_basic128rsa15.c
@@ -66,6 +66,7 @@ static void setup(void) {
     size_t revocationListSize = 0;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
                                                    trustList, trustListSize,
diff --git a/tests/encryption/check_encryption_basic256.c b/tests/encryption/check_encryption_basic256.c
index 6c01b65e01c..bf8b3128206 100644
--- a/tests/encryption/check_encryption_basic256.c
+++ b/tests/encryption/check_encryption_basic256.c
@@ -69,6 +69,7 @@ static void setup(void) {
     size_t revocationListSize = 0;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
                                                    trustList, trustListSize,
diff --git a/tests/encryption/check_encryption_basic256sha256.c b/tests/encryption/check_encryption_basic256sha256.c
index 1730b20edd8..9b4aee20a60 100644
--- a/tests/encryption/check_encryption_basic256sha256.c
+++ b/tests/encryption/check_encryption_basic256sha256.c
@@ -69,6 +69,7 @@ static void setup(void) {
     size_t revocationListSize = 0;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
                                                    trustList, trustListSize,
diff --git a/tests/encryption/check_save_rejected_cert.c b/tests/encryption/check_save_rejected_cert.c
index 17bb593186d..c0d60af9711 100644
--- a/tests/encryption/check_save_rejected_cert.c
+++ b/tests/encryption/check_save_rejected_cert.c
@@ -359,6 +359,7 @@ static void setup(void) {
     privateKey.data = KEY_PEM_DATA;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
 
 #ifndef __linux__
diff --git a/tests/multithreading/check_mt_addDeleteObject.c b/tests/multithreading/check_mt_addDeleteObject.c
index 673d905a4c5..1b5c46a4dd0 100644
--- a/tests/multithreading/check_mt_addDeleteObject.c
+++ b/tests/multithreading/check_mt_addDeleteObject.c
@@ -20,6 +20,7 @@
 static void setup(void) {
     tc.running = true;
     tc.server = UA_Server_new();
+    ck_assert(tc.server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(tc.server));
     defineObjectTypes();
     addPumpTypeConstructor(tc.server);
diff --git a/tests/multithreading/check_mt_addObjectNode.c b/tests/multithreading/check_mt_addObjectNode.c
index 0f5b9895279..91e89ec29af 100644
--- a/tests/multithreading/check_mt_addObjectNode.c
+++ b/tests/multithreading/check_mt_addObjectNode.c
@@ -17,6 +17,7 @@
 static void setup(void) {
     tc.running = true;
     tc.server = UA_Server_new();
+    ck_assert(tc.server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(tc.server));
     defineObjectTypes();
     addPumpTypeConstructor(tc.server);
diff --git a/tests/multithreading/check_mt_addVariableTypeNode.c b/tests/multithreading/check_mt_addVariableTypeNode.c
index b2290552404..b6c5cab653c 100644
--- a/tests/multithreading/check_mt_addVariableTypeNode.c
+++ b/tests/multithreading/check_mt_addVariableTypeNode.c
@@ -18,6 +18,7 @@
 static void setup(void) {
     tc.running = true;
     tc.server = UA_Server_new();
+    ck_assert(tc.server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(tc.server));
     UA_Server_run_startup(tc.server);
     THREAD_CREATE(server_thread, serverloop);
diff --git a/tests/multithreading/check_mt_readValueAttribute.c b/tests/multithreading/check_mt_readValueAttribute.c
index 472814c2dc7..86dd67cafd6 100644
--- a/tests/multithreading/check_mt_readValueAttribute.c
+++ b/tests/multithreading/check_mt_readValueAttribute.c
@@ -38,6 +38,7 @@ void addVariableNode(void) {
 static void setup(void) {
     tc.running = true;
     tc.server = UA_Server_new();
+    ck_assert(tc.server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(tc.server));
     addVariableNode();
     UA_Server_run_startup(tc.server);
diff --git a/tests/multithreading/check_mt_readWriteDelete.c b/tests/multithreading/check_mt_readWriteDelete.c
index cb89b43bff8..1fd4d07389b 100644
--- a/tests/multithreading/check_mt_readWriteDelete.c
+++ b/tests/multithreading/check_mt_readWriteDelete.c
@@ -45,6 +45,7 @@ void AddVariableNode(void) {
 static void setup(void) {
     tc.running = true;
     tc.server = UA_Server_new();
+    ck_assert(tc.server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(tc.server));
     AddVariableNode();
     UA_Server_run_startup(tc.server);
diff --git a/tests/multithreading/check_mt_readWriteDeleteCallback.c b/tests/multithreading/check_mt_readWriteDeleteCallback.c
index 5f3fa12c42d..08ec29c593f 100644
--- a/tests/multithreading/check_mt_readWriteDeleteCallback.c
+++ b/tests/multithreading/check_mt_readWriteDeleteCallback.c
@@ -68,6 +68,7 @@ void AddVariableNode(void) {
 static void setup(void) {
     tc.running = true;
     tc.server = UA_Server_new();
+    ck_assert(tc.server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(tc.server));
     AddVariableNode();
     UA_Server_run_startup(tc.server);
diff --git a/tests/multithreading/check_mt_writeValueAttribute.c b/tests/multithreading/check_mt_writeValueAttribute.c
index e0c55b1eb87..a0b07612da3 100644
--- a/tests/multithreading/check_mt_writeValueAttribute.c
+++ b/tests/multithreading/check_mt_writeValueAttribute.c
@@ -41,6 +41,7 @@ void addVariableNode(void) {
 static void setup(void) {
     tc.running = true;
     tc.server = UA_Server_new();
+    ck_assert(tc.server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(tc.server));
     addVariableNode();
     UA_Server_run_startup(tc.server);
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_adi.c b/tests/nodeset-compiler/check_nodeset_compiler_adi.c
index 1a27469cfb7..f514467ab7e 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_adi.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_adi.c
@@ -14,6 +14,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_autoid.c b/tests/nodeset-compiler/check_nodeset_compiler_autoid.c
index c07167b1664..5127675c396 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_autoid.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_autoid.c
@@ -16,6 +16,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_plc.c b/tests/nodeset-compiler/check_nodeset_compiler_plc.c
index 849ed43c7e7..a75ecf98cfd 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_plc.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_plc.c
@@ -16,6 +16,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
index 3f78e123708..f402564be55 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
@@ -19,6 +19,7 @@ UA_UInt16 testNamespaceIndex = (UA_UInt16) -1;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     config->customDataTypes = &customTypesArray;
diff --git a/tests/nodeset-loader/check_nodeset_loader_adi.c b/tests/nodeset-loader/check_nodeset_loader_adi.c
index e30104ee232..8bf65a4b05b 100644
--- a/tests/nodeset-loader/check_nodeset_loader_adi.c
+++ b/tests/nodeset-loader/check_nodeset_loader_adi.c
@@ -13,6 +13,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-loader/check_nodeset_loader_autoid.c b/tests/nodeset-loader/check_nodeset_loader_autoid.c
index 57527a993cb..93f175bd318 100644
--- a/tests/nodeset-loader/check_nodeset_loader_autoid.c
+++ b/tests/nodeset-loader/check_nodeset_loader_autoid.c
@@ -13,6 +13,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-loader/check_nodeset_loader_compare_di.c b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
index cb512ad685c..1ddeb3ee7a8 100644
--- a/tests/nodeset-loader/check_nodeset_loader_compare_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
@@ -15,6 +15,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-loader/check_nodeset_loader_di.c b/tests/nodeset-loader/check_nodeset_loader_di.c
index c8d3f4350e4..586b5b216ba 100644
--- a/tests/nodeset-loader/check_nodeset_loader_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_di.c
@@ -13,6 +13,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-loader/check_nodeset_loader_input.c b/tests/nodeset-loader/check_nodeset_loader_input.c
index e79cbac44c1..580eda74283 100644
--- a/tests/nodeset-loader/check_nodeset_loader_input.c
+++ b/tests/nodeset-loader/check_nodeset_loader_input.c
@@ -15,6 +15,7 @@ int nodesetsNum = 0;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-loader/check_nodeset_loader_ordering_di.c b/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
index 183e2037acf..9db9b345af1 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
@@ -13,6 +13,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-loader/check_nodeset_loader_plc.c b/tests/nodeset-loader/check_nodeset_loader_plc.c
index 062a040ca60..8dfe64de182 100644
--- a/tests/nodeset-loader/check_nodeset_loader_plc.c
+++ b/tests/nodeset-loader/check_nodeset_loader_plc.c
@@ -13,6 +13,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
index d01a55e5560..5dc3bbf045e 100644
--- a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
@@ -40,6 +40,7 @@ typedef struct {
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
index 68a12e4fd4e..777ea69738b 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
@@ -50,6 +50,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/pubsub/check_pubsub_config_freeze.c b/tests/pubsub/check_pubsub_config_freeze.c
index 080d5734528..d6a5c136616 100644
--- a/tests/pubsub/check_pubsub_config_freeze.c
+++ b/tests/pubsub/check_pubsub_config_freeze.c
@@ -19,6 +19,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
diff --git a/tests/pubsub/check_pubsub_configuration.c b/tests/pubsub/check_pubsub_configuration.c
index c2319e6e9c3..9371e5cbc1c 100644
--- a/tests/pubsub/check_pubsub_configuration.c
+++ b/tests/pubsub/check_pubsub_configuration.c
@@ -20,6 +20,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
diff --git a/tests/pubsub/check_pubsub_connection_ethernet.c b/tests/pubsub/check_pubsub_connection_ethernet.c
index 16d6f53aad0..015b2eb865e 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet.c
@@ -27,6 +27,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
diff --git a/tests/pubsub/check_pubsub_connection_ethernet_etf.c b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
index aa1622c1cba..ab45ad2a062 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
@@ -25,6 +25,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index 31a61094c56..428c1114a45 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -24,6 +24,7 @@ UA_ServerConfig *config = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
diff --git a/tests/pubsub/check_pubsub_connection_udp.c b/tests/pubsub/check_pubsub_connection_udp.c
index 8765fb7455a..5732553485c 100644
--- a/tests/pubsub/check_pubsub_connection_udp.c
+++ b/tests/pubsub/check_pubsub_connection_udp.c
@@ -18,6 +18,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/pubsub/check_pubsub_connection_xdp.c b/tests/pubsub/check_pubsub_connection_xdp.c
index 0a7e56a58b5..4b8b47c33d9 100644
--- a/tests/pubsub/check_pubsub_connection_xdp.c
+++ b/tests/pubsub/check_pubsub_connection_xdp.c
@@ -35,6 +35,7 @@ UA_String ethernetInterface;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index b97991de613..df9d7dd6b4f 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -69,6 +69,7 @@ addMinimalPubSubConfiguration(void){
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     /* Instantiate the PubSub SecurityPolicy */
diff --git a/tests/pubsub/check_pubsub_encryption.c b/tests/pubsub/check_pubsub_encryption.c
index 3f3de973262..b8a18356c56 100644
--- a/tests/pubsub/check_pubsub_encryption.c
+++ b/tests/pubsub/check_pubsub_encryption.c
@@ -29,6 +29,7 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/pubsub/check_pubsub_encryption_aes256.c b/tests/pubsub/check_pubsub_encryption_aes256.c
index 190d3956f0f..e30b279d28b 100644
--- a/tests/pubsub/check_pubsub_encryption_aes256.c
+++ b/tests/pubsub/check_pubsub_encryption_aes256.c
@@ -29,6 +29,7 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index bb40e1fd1bc..2cbc4fb4b3e 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -16,7 +16,7 @@ static void setup(void) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "setup");
 
     server = UA_Server_new();
-    assert(server != 0);
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
diff --git a/tests/pubsub/check_pubsub_informationmodel.c b/tests/pubsub/check_pubsub_informationmodel.c
index b3db3b6baa6..d2a20884386 100644
--- a/tests/pubsub/check_pubsub_informationmodel.c
+++ b/tests/pubsub/check_pubsub_informationmodel.c
@@ -28,6 +28,7 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 62a6b36beda..7d22952323b 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -31,6 +31,7 @@ THREAD_CALLBACK(serverloop) {
 static void setup(void) {
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index 55bc6953fdb..76c4007d623 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -34,6 +34,7 @@ UA_DataSetReaderConfig readerConfig;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
diff --git a/tests/pubsub/check_pubsub_multiple_layer.c b/tests/pubsub/check_pubsub_multiple_layer.c
index 7c922fddeaf..1311de648cf 100644
--- a/tests/pubsub/check_pubsub_multiple_layer.c
+++ b/tests/pubsub/check_pubsub_multiple_layer.c
@@ -24,6 +24,7 @@ static void teardown(void) {
 
 START_TEST(AddMultipleTransportLayers){
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index 04270f951c7..89a70a1a156 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -51,6 +51,7 @@ addMinimalPubSubConfiguration(void){
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/pubsub/check_pubsub_pds.c b/tests/pubsub/check_pubsub_pds.c
index 42f176f6ade..c8c1d184095 100644
--- a/tests/pubsub/check_pubsub_pds.c
+++ b/tests/pubsub/check_pubsub_pds.c
@@ -17,6 +17,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index 3a26c9fbdab..2c76b893fea 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -22,6 +22,7 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
diff --git a/tests/pubsub/check_pubsub_publish_ethernet.c b/tests/pubsub/check_pubsub_publish_ethernet.c
index 41f4991b478..a7498272483 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet.c
@@ -33,6 +33,7 @@ UA_NodeId connection_test;
 static void setup(void) {
     /*Add setup by creating new server with valid configuration */
     server = UA_Server_new();
+    ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index 709b7be9004..69f0acef70d 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -43,6 +43,7 @@ UA_PubSubConnection *connection; /* setup() is to create an environment for test
 static void setup(void) {
     /*Add setup by creating new server with valid configuration */
     server = UA_Server_new();
+    ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
diff --git a/tests/pubsub/check_pubsub_publish_json.c b/tests/pubsub/check_pubsub_publish_json.c
index ff11bbaa1a3..88088e96332 100644
--- a/tests/pubsub/check_pubsub_publish_json.c
+++ b/tests/pubsub/check_pubsub_publish_json.c
@@ -20,6 +20,7 @@ UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index 4593257458d..95192663057 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -51,6 +51,7 @@ addMinimalPubSubConfiguration(void){
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/pubsub/check_pubsub_publish_uadp.c b/tests/pubsub/check_pubsub_publish_uadp.c
index a9c5751f0f0..137e589507d 100644
--- a/tests/pubsub/check_pubsub_publish_uadp.c
+++ b/tests/pubsub/check_pubsub_publish_uadp.c
@@ -18,6 +18,7 @@ UA_NodeId connection1, publishedDataSetIdent, dataSetFieldIdent, writerGroupIden
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index ff778f5107a..21974c1d633 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -27,6 +27,7 @@ static void setup(void) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nsetup\n\n");
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     ck_assert(config != 0);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_ServerConfig_setDefault(config));
diff --git a/tests/pubsub/check_pubsub_publishspeed.c b/tests/pubsub/check_pubsub_publishspeed.c
index 8947bea8cd8..f141c8f91eb 100644
--- a/tests/pubsub/check_pubsub_publishspeed.c
+++ b/tests/pubsub/check_pubsub_publishspeed.c
@@ -20,6 +20,7 @@ UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 6f5d4cbca4b..9c9aeaeb71a 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -92,6 +92,7 @@ static void addVariables(void) {
 static void setup(void) {
     /*Add setup by creating new server with valid configuration */
     server = UA_Server_new();
+    ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
     UA_Server_run_startup(server);
diff --git a/tests/pubsub/check_pubsub_subscribe_config_freeze.c b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
index e51cd9a1905..1eab74dbc02 100644
--- a/tests/pubsub/check_pubsub_subscribe_config_freeze.c
+++ b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
@@ -19,6 +19,7 @@ UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
diff --git a/tests/pubsub/check_pubsub_subscribe_encrypted.c b/tests/pubsub/check_pubsub_subscribe_encrypted.c
index c1c10b9b4d5..afd113a1fdc 100644
--- a/tests/pubsub/check_pubsub_subscribe_encrypted.c
+++ b/tests/pubsub/check_pubsub_subscribe_encrypted.c
@@ -49,6 +49,7 @@ UA_NodeId publishedDataSetTest;
 static void setup(void) {
     /*Add setup by creating new server with valid configuration */
     server = UA_Server_new();
+    ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
 
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 0c123eef635..e0349160098 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -43,6 +43,7 @@ static void setup(void) {
     pExpectedComponentCallbackIds = 0;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 428b0a054be..3f775d34de7 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -66,6 +66,7 @@ addMinimalPubSubConfiguration(void){
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
diff --git a/tests/server/check_accesscontrol.c b/tests/server/check_accesscontrol.c
index 9a3ec5f82fb..7557c4ca9a4 100644
--- a/tests/server/check_accesscontrol.c
+++ b/tests/server/check_accesscontrol.c
@@ -25,6 +25,7 @@ THREAD_CALLBACK(serverloop) {
 static void setup(void) {
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
     THREAD_CREATE(server_thread, serverloop);
diff --git a/tests/server/check_interfaces.c b/tests/server/check_interfaces.c
index c6dd48934e1..72cf47afda3 100644
--- a/tests/server/check_interfaces.c
+++ b/tests/server/check_interfaces.c
@@ -24,6 +24,7 @@ static UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_StatusCode setupResult = namespace_tests_interfaces_generated(server);
diff --git a/tests/server/check_local_monitored_item.c b/tests/server/check_local_monitored_item.c
index 21c360a67ae..846cade1174 100644
--- a/tests/server/check_local_monitored_item.c
+++ b/tests/server/check_local_monitored_item.c
@@ -32,6 +32,7 @@ UA_NodeId outNodeId;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_StatusCode retval = UA_Server_run_startup(server);
@@ -198,6 +199,7 @@ END_TEST
 
 static void setupIndexRange(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_StatusCode retval = UA_Server_run_startup(server);
diff --git a/tests/server/check_monitoreditem_filter.c b/tests/server/check_monitoreditem_filter.c
index 7b3d898ad93..4b16e8b0713 100644
--- a/tests/server/check_monitoreditem_filter.c
+++ b/tests/server/check_monitoreditem_filter.c
@@ -53,6 +53,7 @@ static void pauseServer(void) {
 static void setup(void) {
     UA_DataValue_init(&lastValue);
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
     runServer();
diff --git a/tests/server/check_node_inheritance.c b/tests/server/check_node_inheritance.c
index f5d3a2e9f3c..5ba01fe2356 100644
--- a/tests/server/check_node_inheritance.c
+++ b/tests/server/check_node_inheritance.c
@@ -13,6 +13,7 @@ UA_UInt32 valueToBeInherited = 42;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/server/check_server.c b/tests/server/check_server.c
index 7808fcd2ad6..dba8589722e 100644
--- a/tests/server/check_server.c
+++ b/tests/server/check_server.c
@@ -22,6 +22,7 @@ static UA_Server *server = NULL;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 }
 
diff --git a/tests/server/check_server_asyncop.c b/tests/server/check_server_asyncop.c
index 520bc8fe6bd..210a9eaf956 100644
--- a/tests/server/check_server_asyncop.c
+++ b/tests/server/check_server_asyncop.c
@@ -47,6 +47,7 @@ static void setup(void) {
     clientCounter = 0;
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     config->asyncOperationTimeout = 2000.0; /* 2 seconds */
diff --git a/tests/server/check_server_callbacks.c b/tests/server/check_server_callbacks.c
index 4322386b268..2213a999b07 100644
--- a/tests/server/check_server_callbacks.c
+++ b/tests/server/check_server_callbacks.c
@@ -222,6 +222,7 @@ THREAD_CALLBACK(serverloop) {
 static void setup(void) {
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
     addCurrentTimeVariable();
diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c
index 52de8bbd083..76b1f856ba0 100644
--- a/tests/server/check_server_historical_data.c
+++ b/tests/server/check_server_historical_data.c
@@ -48,6 +48,7 @@ static void setup(void) {
     running = true;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
diff --git a/tests/server/check_server_historical_data_circular.c b/tests/server/check_server_historical_data_circular.c
index 6bb7df63599..611eb098e37 100644
--- a/tests/server/check_server_historical_data_circular.c
+++ b/tests/server/check_server_historical_data_circular.c
@@ -43,6 +43,7 @@ static void setup(void) {
     running = true;
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
diff --git a/tests/server/check_server_jobs.c b/tests/server/check_server_jobs.c
index 9ed8a547f38..cc7fbef6a34 100644
--- a/tests/server/check_server_jobs.c
+++ b/tests/server/check_server_jobs.c
@@ -15,6 +15,7 @@ UA_Boolean *executed;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
 }
diff --git a/tests/server/check_server_monitoringspeed.c b/tests/server/check_server_monitoringspeed.c
index d5ca04bfd72..14f7a1c9cec 100644
--- a/tests/server/check_server_monitoringspeed.c
+++ b/tests/server/check_server_monitoringspeed.c
@@ -17,6 +17,7 @@ static UA_Server *server;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 }
 
diff --git a/tests/server/check_server_readspeed.c b/tests/server/check_server_readspeed.c
index 137e3f5ce9c..c5fce324463 100644
--- a/tests/server/check_server_readspeed.c
+++ b/tests/server/check_server_readspeed.c
@@ -25,6 +25,7 @@ static UA_NodeId readNodeIds[READNODES];
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
 }
 
 static void teardown(void) {
diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
index f22d57b59de..115345c7b6c 100644
--- a/tests/server/check_server_reverseconnect.c
+++ b/tests/server/check_server_reverseconnect.c
@@ -121,6 +121,7 @@ static void setup(void) {
     setupListeningSocket();
 
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 }
 
diff --git a/tests/server/check_server_speed_addnodes.c b/tests/server/check_server_speed_addnodes.c
index c282013cbe5..7b36c8436bc 100644
--- a/tests/server/check_server_speed_addnodes.c
+++ b/tests/server/check_server_speed_addnodes.c
@@ -11,6 +11,7 @@ static UA_Server *server;
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     /* Disable logging */
     UA_ServerConfig *config = UA_Server_getConfig(server);
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index a30d0b6ee71..57df56acb7e 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -39,6 +39,7 @@ static void teardown(void) {
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
diff --git a/tests/server/check_services_call.c b/tests/server/check_services_call.c
index c887ee7759f..28b31b4dd89 100644
--- a/tests/server/check_services_call.c
+++ b/tests/server/check_services_call.c
@@ -33,6 +33,7 @@ methodCallback(UA_Server *serverArg,
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_MethodAttributes noFpAttr = UA_MethodAttributes_default;
diff --git a/tests/server/check_services_nodemanagement.c b/tests/server/check_services_nodemanagement.c
index c66da660831..4c42a5fe06b 100644
--- a/tests/server/check_services_nodemanagement.c
+++ b/tests/server/check_services_nodemanagement.c
@@ -29,6 +29,7 @@ globalInstantiationMethod(UA_Server *server_,
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index 1a264e2f7ab..55969786bce 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -41,6 +41,7 @@ createSession(void) {
 
 static void setup(void) {
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     config->monitoredItemRegisterCallback = monitoredRegisterCallback;
diff --git a/tests/server/check_services_view.c b/tests/server/check_services_view.c
index bd8f77e7fbc..763dce03604 100644
--- a/tests/server/check_services_view.c
+++ b/tests/server/check_services_view.c
@@ -51,6 +51,7 @@ static void teardown_server(void) {
 
 START_TEST(Service_Browse_CheckSubTypes) {
     UA_Server *server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_NodeId hierarchRefs = UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES);
@@ -104,6 +105,7 @@ browseWithMaxResults(UA_Server *server, UA_NodeId nodeId, UA_UInt32 maxResults)
 
 START_TEST(Service_Browse_WithMaxResults) {
     UA_Server *server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_BrowseDescription bd;
@@ -131,6 +133,7 @@ END_TEST
 
 START_TEST(Service_Browse_WithBrowseName) {
     UA_Server *server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_BrowseDescription bd;
@@ -153,6 +156,7 @@ END_TEST
 
 START_TEST(Service_Browse_ClassMask) {
     UA_Server *server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     /* add a variable node to the address space */
@@ -219,6 +223,7 @@ END_TEST
 
 START_TEST(Service_Browse_ReferenceTypes) {
     UA_Server *server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     /* add a variable node to the address space */
@@ -273,6 +278,7 @@ END_TEST
 
 START_TEST(Service_Browse_Recursive) {
     UA_Server *server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     size_t resultSize = 0;
@@ -305,6 +311,7 @@ END_TEST
 
 START_TEST(Service_Browse_Localization) {
     UA_Server *server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     UA_NodeId outerObjectId = UA_NODEID_STRING(1, "EntryPoint");
diff --git a/tests/server/check_session.c b/tests/server/check_session.c
index 55b3fed14a0..899f9db5404 100644
--- a/tests/server/check_session.c
+++ b/tests/server/check_session.c
@@ -28,6 +28,7 @@ THREAD_CALLBACK(serverloop) {
 static void setup(void) {
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     UA_Server_run_startup(server);
     THREAD_CREATE(server_thread, serverloop);
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index f214c3131f0..5c89b547b87 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -192,6 +192,7 @@ static void setup(void){
     }
     running = true;
     server = UA_Server_new();
+    ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 

From cf4a7397d008ccd76822076ccfd8e096dd375ff5 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 31 Jan 2023 07:40:09 +0100
Subject: [PATCH 0739/1963] fix(plugin): Memory exception clearing OpenSSL
 buffer with UA_ByteString

In the function UA_CreateCertificate the buffers were allocated
by OpenSSL, but cleared with UA_ByteString_clear. Allocate buffer with
UA_ByteString_alloc to get correct UA_ByteString.

Fixes issue #5510
---
 .../openssl/ua_openssl_create_certificate.c   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/plugins/crypto/openssl/ua_openssl_create_certificate.c b/plugins/crypto/openssl/ua_openssl_create_certificate.c
index 2a949defea7..4b6585a6a3b 100644
--- a/plugins/crypto/openssl/ua_openssl_create_certificate.c
+++ b/plugins/crypto/openssl/ua_openssl_create_certificate.c
@@ -311,23 +311,36 @@ UA_CreateCertificate(const UA_Logger *logger,
 
     switch(certFormat) {
         case UA_CERTIFICATEFORMAT_DER: {
-            int tmpLen = i2d_PrivateKey(pkey, &outPrivateKey->data);
-            if(tmpLen <= 0) {
+            unsigned char *p;
+            /* Private Key */
+            /* get length */
+            outPrivateKey->length = (size_t)i2d_PrivateKey(pkey, NULL);
+            if((int)outPrivateKey->length <= 0) {
                 UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                             "Create Certificate: Create private DER key failed.");
                 errRet = UA_STATUSCODE_BADINTERNALERROR;
                 goto cleanup;
             }
-            outPrivateKey->length = (size_t) tmpLen;
+            /* allocate buffer */
+            UA_ByteString_allocBuffer(outPrivateKey, outPrivateKey->length);
+            memset(outPrivateKey->data, 0, outPrivateKey->length);
+            p = outPrivateKey->data;
+            i2d_PrivateKey(pkey, &p);
 
-            tmpLen = i2d_X509(x509, &outCertificate->data);
-            if(tmpLen <= 0) {
+            /* Certificate */
+            /* get length */
+            outCertificate->length = (size_t)i2d_X509(x509, NULL);
+            if((int)outCertificate->length <= 0) {
                 UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                             "Create Certificate: Create DER-certificate failed.");
                 errRet = UA_STATUSCODE_BADINTERNALERROR;
                 goto cleanup;
             }
-            outCertificate->length = (size_t) tmpLen;
+            /* allocate buffer */
+            UA_ByteString_allocBuffer(outCertificate, outCertificate->length);
+            memset(outCertificate->data, 0, outCertificate->length);
+            p = outCertificate->data;
+            i2d_X509(x509, &p);
             break;
         }
         case UA_CERTIFICATEFORMAT_PEM: {

From 05951d59732238414fd9ddbb6d44e0c84fd7ab3e Mon Sep 17 00:00:00 2001
From: StalderT <github@netsolux.ch>
Date: Tue, 31 Jan 2023 15:31:40 +0100
Subject: [PATCH 0740/1963] fix(server): Allow negative sampling interval

According to https://reference.opcfoundation.org/Core/Part4/v104/docs/5.12.1.2, a negative Sampling interval number indicates that the default sampling interval defined by the publishing interval of the Subscription is requested.
---
 src/server/ua_services_monitoreditem.c      | 14 +++++++++-----
 tests/server/check_services_subscriptions.c | 11 ++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 5b62be80199..f00ed77c876 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -11,7 +11,7 @@
  *    Copyright 2018 (c) Ari Breitkreuz, fortiss GmbH
  *    Copyright 2017 (c) Mattias Bornhager
  *    Copyright 2017 (c) Henrik Norrman
- *    Copyright 2017-2018 (c) Thomas Stalder, Blue Time Concept SA
+ *    Copyright 2017-2023 (c) Thomas Stalder, Blue Time Concept SA
  *    Copyright 2018 (c) Fabian Arndt, Root-Core
  *    Copyright 2020 (c) Kalycito Infotech Private Limited
  *    Copyright 2021 (c) Uranik, Berisha
@@ -219,10 +219,14 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
     }
         
     /* Adjust to sampling interval to lie within the limits */
-    if(params->samplingInterval <= 0.0) {
-        /* A sampling interval of zero is possible and indicates that the
-         * MonitoredItem is checked for every write operation */
-        params->samplingInterval = 0.0;
+    if(params->samplingInterval < 0.0) {
+        /* A negative number indicates that the default sampling interval
+         * defined by the publishing interval of the Subscriptionis requested. */
+        if (mon->subscription) {
+            params->samplingInterval = mon->subscription->publishingInterval;
+        } else {
+            params->samplingInterval = server->config.samplingIntervalLimits.min;
+        }
     } else {
         UA_BOUNDEDVALUE_SETWBOUNDS(server->config.samplingIntervalLimits,
                                    params->samplingInterval, params->samplingInterval);
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index de0779b5037..11a5aa5ec9e 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -16,6 +16,7 @@
 static UA_Server *server = NULL;
 static UA_Session *session = NULL;
 static UA_UInt32 monitored = 0; /* Number of active MonitoredItems */
+static UA_Double defaultRequestedPublishingInterval = 100;  /* in ms */
 
 static void
 monitoredRegisterCallback(UA_Server *s,
@@ -142,7 +143,7 @@ START_TEST(Server_modifySubscription) {
     UA_ModifySubscriptionRequest_init(&request);
     request.subscriptionId = subscriptionId;
     // just some arbitrary numbers to test. They have no specific reason
-    request.requestedPublishingInterval = 100; // in ms
+    request.requestedPublishingInterval = defaultRequestedPublishingInterval;
     request.requestedLifetimeCount = 1000;
     request.requestedMaxKeepAliveCount = 1000;
     request.maxNotificationsPerPublish = 1;
@@ -809,7 +810,7 @@ START_TEST(Server_invalidPublishingInterval) {
 }
 END_TEST
 
-START_TEST(Server_invalidSamplingInterval) {
+START_TEST(Server_negativeSamplingInterval) {
     createSubscription();
 
     UA_Double savedSamplingIntervalLimitsMin = server->config.samplingIntervalLimits.min;
@@ -830,7 +831,7 @@ START_TEST(Server_invalidSamplingInterval) {
     item.monitoringMode = UA_MONITORINGMODE_REPORTING;
     UA_MonitoringParameters params;
     UA_MonitoringParameters_init(&params);
-    params.samplingInterval = -5.0; // Must be positive
+    params.samplingInterval = -5.0;
     item.requestedParameters = params;
     request.itemsToCreateSize = 1;
     request.itemsToCreate = &item;
@@ -843,7 +844,7 @@ START_TEST(Server_invalidSamplingInterval) {
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
     ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
-    ck_assert(response.results[0].revisedSamplingInterval == 0.0);
+    ck_assert(response.results[0].revisedSamplingInterval == defaultRequestedPublishingInterval);
 
     UA_MonitoredItemCreateRequest_clear(&item);
     UA_CreateMonitoredItemsResponse_clear(&response);
@@ -862,7 +863,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_server, Server_createSubscription);
     tcase_add_test(tc_server, Server_modifySubscription);
     tcase_add_test(tc_server, Server_setPublishingMode);
-    tcase_add_test(tc_server, Server_invalidSamplingInterval);
+    tcase_add_test(tc_server, Server_negativeSamplingInterval);
     tcase_add_test(tc_server, Server_createMonitoredItems);
     tcase_add_test(tc_server, Server_modifyMonitoredItems);
     tcase_add_test(tc_server, Server_overflow);

From c351fe96c8a8ed6de7d094f565f25732f452304f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 31 Jan 2023 22:14:59 +0100
Subject: [PATCH 0741/1963] fix(server): Sample MonitoredItems with interval <0
 together with the subscription publish callback

---
 src/server/ua_services_attribute.c          |  3 +-
 src/server/ua_services_monitoreditem.c      | 35 +++++++---
 src/server/ua_subscription.c                |  7 ++
 src/server/ua_subscription.h                | 34 +++++++--
 src/server/ua_subscription_events.c         |  3 +-
 src/server/ua_subscription_monitoreditem.c  | 76 +++++++++++++--------
 tests/server/check_services_subscriptions.c |  2 +-
 7 files changed, 111 insertions(+), 49 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 2b2b2c249d4..2cf5f459964 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1493,7 +1493,8 @@ updateLocalizedText(const UA_LocalizedText *source, UA_LocalizedText *target) {
 static void
 triggerImmediateDataChange(UA_Server *server, UA_Session *session,
                            UA_Node *node, const UA_WriteValue *wvalue) {
-    for(UA_MonitoredItem *mon = node->head.monitoredItems; mon != NULL; mon = mon->next) {
+    UA_MonitoredItem *mon = node->head.monitoredItems;
+    for(; mon != NULL; mon = mon->sampling.nodeListNext) {
         if(mon->itemToMonitor.attributeId != wvalue->attributeId)
             continue;
         UA_DataValue value;
diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index f00ed77c876..fa9dcede08f 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -211,23 +211,40 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
         const UA_Node *node = UA_NODESTORE_GET(server, &mon->itemToMonitor.nodeId);
         if(node) {
             const UA_VariableNode *vn = &node->variableNode;
-            if(node->head.nodeClass == UA_NODECLASS_VARIABLE &&
-               params->samplingInterval < vn->minimumSamplingInterval)
-                params->samplingInterval = vn->minimumSamplingInterval;
+            if(node->head.nodeClass == UA_NODECLASS_VARIABLE) {
+                /* Take into account if the publishing interval is used for sampling */
+                UA_Double samplingInterval = params->samplingInterval;
+                if(samplingInterval < 0 && mon->subscription)
+                    samplingInterval = mon->subscription->publishingInterval;
+                /* Adjust if smaller than the allowed minimum for the variable */
+                if(samplingInterval < vn->minimumSamplingInterval)
+                    params->samplingInterval = vn->minimumSamplingInterval;
+            }
             UA_NODESTORE_RELEASE(server, node);
         }
     }
         
-    /* Adjust to sampling interval to lie within the limits */
+    /* Adjust sampling interval */
     if(params->samplingInterval < 0.0) {
-        /* A negative number indicates that the default sampling interval
-         * defined by the publishing interval of the Subscriptionis requested. */
-        if (mon->subscription) {
-            params->samplingInterval = mon->subscription->publishingInterval;
-        } else {
+        /* A negative number indicates that the sampling interval is the
+         * publishing interval of the Subscription. */
+        if(!mon->subscription) {
+            /* Not possible for local MonitoredItems */
             params->samplingInterval = server->config.samplingIntervalLimits.min;
+        } else {
+            /* Test if the publishing interval is a valid sampling interval. If
+             * not, adjust to lie within the limits. */
+            UA_BOUNDEDVALUE_SETWBOUNDS(server->config.samplingIntervalLimits,
+                                       mon->subscription->publishingInterval,
+                                       params->samplingInterval);
+            if(params->samplingInterval == mon->subscription->publishingInterval) {
+                /* The publishing interval is valid also for sampling. The
+                 * standard says any negative number is interpreted as -1.*/
+                params->samplingInterval = -1.0;
+            }
         }
     } else {
+        /* Adjust positive sampling interval to lie within the limits */
         UA_BOUNDEDVALUE_SETWBOUNDS(server->config.samplingIntervalLimits,
                                    params->samplingInterval, params->samplingInterval);
         /* Check for NaN */
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index cc2c718a214..095cdba6b4a 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -437,6 +437,13 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
     UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub, "Publish Callback");
     UA_assert(sub);
 
+    /* Sample the MonitoredItems with sampling interval <0 (which implies
+     * sampling in the same interval as the subscription) */
+    UA_MonitoredItem *mon;
+    LIST_FOREACH(mon, &sub->samplingMonitoredItems, sampling.samplingListEntry) {
+        monitoredItem_sampleCallback(server, mon);
+    }
+
     /* Dequeue a response */
     UA_PublishResponseEntry *pre = NULL;
     if(sub->session)
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index b32b75e02a0..d308da290c3 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -100,12 +100,23 @@ typedef TAILQ_HEAD(NotificationMessageQueue, UA_NotificationMessageEntry)
 /* MonitoredItem */
 /*****************/
 
+/* The type of sampling for MonitoredItems depends on the sampling interval.
+ *
+ * >0: Cyclic callback
+ * =0: Attached to the node. Sampling is triggered after every "write".
+ * <0: Attached to the subscription. Triggered just before every "publish". */
+typedef enum {
+    UA_MONITOREDITEMSAMPLINGTYPE_NONE = 0,
+    UA_MONITOREDITEMSAMPLINGTYPE_CYCLIC, /* Cyclic callback */
+    UA_MONITOREDITEMSAMPLINGTYPE_EVENT,  /* Attached to the node. Can be a "write
+                                          * event" for DataChange MonitoredItems
+                                          * with a zero sampling interval .*/
+    UA_MONITOREDITEMSAMPLINGTYPE_PUBLISH /* Attached to the subscription */
+} UA_MonitoredItemSamplingType;
+
 struct UA_MonitoredItem {
     UA_TimerEntry delayedFreePointers;
     LIST_ENTRY(UA_MonitoredItem) listEntry; /* Linked list in the Subscription */
-    UA_MonitoredItem *next; /* Linked list of MonitoredItems directly attached
-                             * to a Node. Initialized to ~0 to indicate that the
-                             * MonitoredItem is not added to a node. */
     UA_Subscription *subscription; /* If NULL, then this is a Local MonitoredItem */
     UA_UInt32 monitoredItemId;
 
@@ -113,8 +124,7 @@ struct UA_MonitoredItem {
     UA_ReadValueId itemToMonitor;
     UA_MonitoringMode monitoringMode;
     UA_TimestampsToReturn timestampsToReturn;
-    UA_Boolean sampleCallbackIsRegistered;
-    UA_Boolean registered; /* Registered in the server / Subscription */
+    UA_Boolean registered;       /* Registered in the server / Subscription */
     UA_DateTime triggeredUntil;  /* If the MonitoringMode is SAMPLING,
                                   * triggering the MonitoredItem puts the latest
                                   * Notification into the publishing queue (of
@@ -137,8 +147,14 @@ struct UA_MonitoredItem {
      * changed at runtime of the MonitoredItem */
     UA_MonitoringParameters parameters;
 
-    /* Sampling Callback */
-    UA_UInt64 sampleCallbackId;
+    /* Sampling */
+    UA_MonitoredItemSamplingType samplingType;
+    union {
+        UA_UInt64 callbackId;
+        UA_MonitoredItem *nodeListNext; /* Event-Based: Attached to Node */
+        LIST_ENTRY(UA_MonitoredItem) samplingListEntry; /* Publish-interval: Linked in
+                                                         * Subscription */
+    } sampling;
     UA_DataValue lastValue;
 
     /* Triggering Links */
@@ -273,6 +289,10 @@ struct UA_Subscription {
     LIST_HEAD(, UA_MonitoredItem) monitoredItems;
     UA_UInt32 monitoredItemsSize;
 
+    /* MonitoredItems that are sampled in every publish callback (with the
+     * publish interval of the subscription) */
+    LIST_HEAD(, UA_MonitoredItem) samplingMonitoredItems;
+
     /* Global list of notifications from the MonitoredItems */
     TAILQ_HEAD(, UA_Notification) notificationQueue;
     UA_UInt32 notificationQueueSize; /* Total queue size */
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 6cf65516abe..92e2dedd11b 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -390,7 +390,8 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
         }
 
         /* Add event to monitoreditems */
-        for(UA_MonitoredItem *mon = node->head.monitoredItems; mon != NULL; mon = mon->next) {
+        UA_MonitoredItem *mon = node->head.monitoredItems;
+        for(; mon != NULL; mon = mon->sampling.nodeListNext) {
             /* Is this an Event-MonitoredItem? */
             if(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER)
                 continue;
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 56d5cf5744e..37c8eb0e511 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -381,7 +381,6 @@ UA_Notification_dequeueSub(UA_Notification *n) {
 void
 UA_MonitoredItem_init(UA_MonitoredItem *mon) {
     memset(mon, 0, sizeof(UA_MonitoredItem));
-    mon->next = (UA_MonitoredItem*)~0; /* Not added to a node */
     TAILQ_INIT(&mon->queue);
     mon->triggeredUntil = UA_INT64_MIN;
 }
@@ -391,7 +390,7 @@ addMonitoredItemBackpointer(UA_Server *server, UA_Session *session,
                             UA_Node *node, void *data) {
     UA_MonitoredItem *mon = (UA_MonitoredItem*)data;
     UA_assert(mon != (UA_MonitoredItem*)~0);
-    mon->next = node->head.monitoredItems;
+    mon->sampling.nodeListNext = node->head.monitoredItems;
     node->head.monitoredItems = mon;
     return UA_STATUSCODE_GOOD;
 }
@@ -405,17 +404,15 @@ removeMonitoredItemBackPointer(UA_Server *server, UA_Session *session,
     /* Edge case that it's the first element */
     UA_MonitoredItem *remove = (UA_MonitoredItem*)data;
     if(node->head.monitoredItems == remove) {
-        node->head.monitoredItems = remove->next;
-        remove->next = (UA_MonitoredItem*)~0;
+        node->head.monitoredItems = remove->sampling.nodeListNext;
         return UA_STATUSCODE_GOOD;
     }
 
     UA_MonitoredItem *prev = node->head.monitoredItems;
-    UA_MonitoredItem *entry = prev->next;
-    for(; entry != NULL; prev = entry, entry = entry->next) {
+    UA_MonitoredItem *entry = prev->sampling.nodeListNext;
+    for(; entry != NULL; prev = entry, entry = entry->sampling.nodeListNext) {
         if(entry == remove) {
-            prev->next = entry->next;
-            remove->next = (UA_MonitoredItem*)~0;
+            prev->sampling.nodeListNext = entry->sampling.nodeListNext;
             break;
         }
     }
@@ -569,8 +566,6 @@ UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *mon) {
     /* Remove the sampling callback */
     UA_MonitoredItem_unregisterSampling(server, mon);
 
-    UA_assert(mon->next == (UA_MonitoredItem*)~0); /* Not attached to any node */
-
     /* Deregister in Server and Subscription */
     if(mon->registered)
         UA_Server_unregisterMonitoredItem(server, mon);
@@ -706,46 +701,56 @@ UA_MonitoredItem_ensureQueueSpace(UA_Server *server, UA_MonitoredItem *mon) {
 UA_StatusCode
 UA_MonitoredItem_registerSampling(UA_Server *server, UA_MonitoredItem *mon) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    if(mon->sampleCallbackIsRegistered)
-        return UA_STATUSCODE_GOOD;
 
-    UA_assert(mon->next == (UA_MonitoredItem*)~0); /* Not registered in a node */
+    /* Sampling is already registered */
+    if(mon->samplingType != UA_MONITOREDITEMSAMPLINGTYPE_NONE)
+        return UA_STATUSCODE_GOOD;
 
-    /* Only DataChange MonitoredItems with a positive sampling interval have a
-     * repeated callback. Other MonitoredItems are attached to the Node in a
-     * linked list of backpointers. */
-    UA_StatusCode res;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    UA_Subscription *sub = mon->subscription;
     if(mon->itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER ||
        mon->parameters.samplingInterval == 0.0) {
-        UA_Subscription *sub = mon->subscription;
+        /* Add to the linked list in the node */
         UA_Session *session = &server->adminSession;
         if(sub)
             session = sub->session;
         res = UA_Server_editNode(server, session, &mon->itemToMonitor.nodeId,
                                  addMonitoredItemBackpointer, mon);
+        if(res == UA_STATUSCODE_GOOD)
+            mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_EVENT;
+        return res;
+    } else if(mon->parameters.samplingInterval < 0.0) {
+        /* Add to the subscription for sampling before every publish */
+        if(!sub)
+            return UA_STATUSCODE_BADINTERNALERROR; /* Not possible for local MonitoredItems */
+        LIST_INSERT_HEAD(&sub->samplingMonitoredItems, mon, sampling.samplingListEntry);
+        mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_PUBLISH;
     } else {
+        /* DataChange MonitoredItems with a positive sampling interval have a
+         * repeated callback. Other MonitoredItems are attached to the Node in a
+         * linked list of backpointers. */
         res = addRepeatedCallback(server,
                                   (UA_ServerCallback)UA_MonitoredItem_sampleCallback,
                                   mon, mon->parameters.samplingInterval,
-                                  &mon->sampleCallbackId);
+                                  &mon->sampling.callbackId);
+        if(res == UA_STATUSCODE_GOOD)
+            mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_CYCLIC;
     }
 
-    if(res == UA_STATUSCODE_GOOD)
-        mon->sampleCallbackIsRegistered = true;
     return res;
 }
 
 void
 UA_MonitoredItem_unregisterSampling(UA_Server *server, UA_MonitoredItem *mon) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    if(!mon->sampleCallbackIsRegistered)
-        return;
 
-    mon->sampleCallbackIsRegistered = false;
+    switch(mon->samplingType) {
+    case UA_MONITOREDITEMSAMPLINGTYPE_CYCLIC:
+        /* Remove repeated callback */
+        removeCallback(server, mon->sampling.callbackId);
+        break;
 
-    /* Check for mon->next and not the samplingInterval. Because that might
-     * currently be changed. */
-    if(mon->next != (UA_MonitoredItem*)~0) {
+    case UA_MONITOREDITEMSAMPLINGTYPE_EVENT: {
         /* Added to a node */
         UA_Subscription *sub = mon->subscription;
         UA_Session *session = &server->adminSession;
@@ -753,10 +758,21 @@ UA_MonitoredItem_unregisterSampling(UA_Server *server, UA_MonitoredItem *mon) {
             session = sub->session;
         UA_Server_editNode(server, session, &mon->itemToMonitor.nodeId,
                            removeMonitoredItemBackPointer, mon);
-    } else {
-        /* Registered with a repeated callback */
-        removeCallback(server, mon->sampleCallbackId);
+        break;
+    }
+
+    case UA_MONITOREDITEMSAMPLINGTYPE_PUBLISH:
+        /* Added to the subscription */
+        LIST_REMOVE(mon, sampling.samplingListEntry);
+        break;
+
+    case UA_MONITOREDITEMSAMPLINGTYPE_NONE:
+    default:
+        /* Sampling is not registered */
+        break;
     }
+
+    mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_NONE;
 }
 
 UA_StatusCode
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index 11a5aa5ec9e..b7e705905a8 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -844,7 +844,7 @@ START_TEST(Server_negativeSamplingInterval) {
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
     ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
-    ck_assert(response.results[0].revisedSamplingInterval == defaultRequestedPublishingInterval);
+    ck_assert(response.results[0].revisedSamplingInterval == -1.0);
 
     UA_MonitoredItemCreateRequest_clear(&item);
     UA_CreateMonitoredItemsResponse_clear(&response);

From 5a63e84a39ea4b097a3bb1e2e3965d85e11b11e8 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 24 Jan 2023 12:12:32 +0100
Subject: [PATCH 0742/1963] fix(plugins): Check return value of previous
 function before calling UA_AccessControl_default

---
 plugins/ua_config_default.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index ba1c5a16913..7814290ff87 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -836,9 +836,11 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
                                                   trustList, trustListSize,
                                                   issuerList, issuerListSize,
                                                   revocationList, revocationListSize);
-    retval |= UA_AccessControl_default(conf, true, &accessControlVerification,
-                &conf->securityPolicies[conf->securityPoliciesSize-1].policyUri,
-                usernamePasswordsSize, usernamePasswords);
+    if(retval == UA_STATUSCODE_GOOD) {
+        retval = UA_AccessControl_default(conf, true, &accessControlVerification,
+                    &conf->securityPolicies[conf->securityPoliciesSize-1].policyUri,
+                    usernamePasswordsSize, usernamePasswords);
+    }
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
         return retval;

From 27141b03516a1e943c5fa953c35fca8e99a7cbff Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 24 Jan 2023 13:11:53 +0100
Subject: [PATCH 0743/1963] fix(plugin): Use pointer to logging pointer in
 certificate verification

The logger must be up to date in the certificate verification plugin, even it
is changed in the server/client config.
By using the pointer to the logging pointer it can still be used after an update
in the certificat verification pluglin.
---
 include/open62541/client.h              |  5 +-
 include/open62541/plugin/pki.h          |  9 ++--
 include/open62541/server.h              |  4 +-
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 70 +++++++++++++------------
 plugins/crypto/openssl/ua_pki_openssl.c | 66 ++++++++++++-----------
 plugins/crypto/ua_pki_none.c            |  4 +-
 plugins/ua_accesscontrol_default.c      | 11 ++--
 plugins/ua_config_default.c             | 15 ++++--
 src/client/ua_client.c                  | 27 +++++++++-
 src/client/ua_client_connect.c          |  2 +-
 src/pubsub/ua_pubsub_keystorage.c       |  2 +-
 src/server/ua_server.c                  | 11 ++--
 src/server/ua_server_config.c           |  7 +++
 src/server/ua_services_session.c        |  2 +-
 src/ua_securechannel.c                  |  2 +-
 15 files changed, 149 insertions(+), 88 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 54bbae474e5..faecf7725a5 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -70,7 +70,10 @@ _UA_BEGIN_DECLS
 
 typedef struct {
     void *clientContext; /* User-defined pointer attached to the client */
-    UA_Logger logger;    /* Logger used by the client */
+    UA_Logger logger;    /* Logger used by the client.
+                            logger is deprecated but still supported at this time.
+                            Use logging pointer instead. */
+    UA_Logger *logging; /* If NULL and "logger" is set, make this point to "logger" */
 
     /* Response timeout in ms (0 -> no timeout). If the server does not answer a
      * request within this time a StatusCode UA_STATUSCODE_BADTIMEOUT is
diff --git a/include/open62541/plugin/pki.h b/include/open62541/plugin/pki.h
index 92b902a127a..a5065388355 100644
--- a/include/open62541/plugin/pki.h
+++ b/include/open62541/plugin/pki.h
@@ -37,11 +37,11 @@ struct UA_CertificateVerification {
     void *context;
 
     /* Verify the certificate against the configured policies and trust chain. */
-    UA_StatusCode (*verifyCertificate)(void *verificationContext,
+    UA_StatusCode (*verifyCertificate)(const UA_CertificateVerification *cv,
                                        const UA_ByteString *certificate);
 
     /* Verify that the certificate has the applicationURI in the subject name. */
-    UA_StatusCode (*verifyApplicationURI)(void *verificationContext,
+    UA_StatusCode (*verifyApplicationURI)(const UA_CertificateVerification *cv,
                                           const UA_ByteString *certificate,
                                           const UA_String *applicationURI);
 
@@ -52,7 +52,10 @@ struct UA_CertificateVerification {
     /* Delete the certificate verification context */
     void (*clear)(UA_CertificateVerification *cv);
 
-    const UA_Logger *logger;
+    /* Pointer to logging pointer in the server/client configuration.
+       If the logging pointer is changed outside of the plugin, the new
+       logger is used automatically*/
+    UA_Logger **logging;
 };
 
 _UA_END_DECLS
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 761b3341153..037297d040f 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -81,7 +81,9 @@ typedef struct {
  * The :ref:`tutorials` provide a good starting point for this. */
 
 struct UA_ServerConfig {
-    UA_Logger logger;
+    UA_Logger logger;   /* logger is deprecated but still supported at this time.
+                           Use logging pointer instead. */
+    UA_Logger *logging; /* If NULL and "logger" is set, make this point to "logger" */
     void *context; /* Used to attach custom data to a server config. This can
                     * then be retrieved e.g. in a callback that forwards a
                     * pointer to the server. */
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 0e163575cd5..6f006ea4834 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -97,8 +97,6 @@ typedef struct {
     mbedtls_x509_crt certificateTrustList;
     mbedtls_x509_crt certificateIssuerList;
     mbedtls_x509_crl certificateRevocationList;
-
-    const UA_Logger *logger;
 } CertInfo;
 
 #ifdef __linux__ /* Linux only so far */
@@ -153,14 +151,14 @@ fileNamesFromFolder(const UA_String *folder, size_t *pathsSize, UA_String **path
 }
 
 static UA_StatusCode
-reloadCertificates(CertInfo *ci) {
+reloadCertificates(const UA_CertificateVerification *cv, CertInfo *ci) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     int err = 0;
     int internalErrorFlag = 0;
 
     /* Load the trustlists */
     if(ci->trustListFolder.length > 0) {
-        UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
+        UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
         mbedtls_x509_crt_free(&ci->certificateTrustList);
         mbedtls_x509_crt_init(&ci->certificateTrustList);
 
@@ -169,12 +167,12 @@ reloadCertificates(CertInfo *ci) {
         f[ci->trustListFolder.length] = 0;
         err = mbedtls_x509_crt_parse_path(&ci->certificateTrustList, f);
         if(err == 0) {
-            UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
                         "Loaded certificate from %s", f);
         } else {
             char errBuff[300];
             mbedtls_strerror(err, errBuff, 300);
-            UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
                         "Failed to load certificate from %s, mbedTLS error: %s (error code: %d)", f, errBuff, err);
             internalErrorFlag = 1;
         }
@@ -182,7 +180,7 @@ reloadCertificates(CertInfo *ci) {
 
     /* Load the revocationlists */
     if(ci->revocationListFolder.length > 0) {
-        UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
+        UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
         size_t pathsSize = 0;
         UA_String *paths = NULL;
         retval = fileNamesFromFolder(&ci->revocationListFolder, &pathsSize, &paths);
@@ -196,13 +194,13 @@ reloadCertificates(CertInfo *ci) {
             f[paths[i].length] = 0;
             err = mbedtls_x509_crl_parse_file(&ci->certificateRevocationList, f);
             if(err == 0) {
-                UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
                             "Loaded certificate from %.*s",
                             (int)paths[i].length, paths[i].data);
             } else {
                 char errBuff[300];
                 mbedtls_strerror(err, errBuff, 300);
-                UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
                             "Failed to load certificate from %.*s, mbedTLS error: %s (error code: %d)",
                             (int)paths[i].length, paths[i].data, errBuff, err);
                 internalErrorFlag = 1;
@@ -215,7 +213,7 @@ reloadCertificates(CertInfo *ci) {
 
     /* Load the issuerlists */
     if(ci->issuerListFolder.length > 0) {
-        UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
+        UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
         mbedtls_x509_crt_free(&ci->certificateIssuerList);
         mbedtls_x509_crt_init(&ci->certificateIssuerList);
         char f[PATH_MAX];
@@ -223,12 +221,12 @@ reloadCertificates(CertInfo *ci) {
         f[ci->issuerListFolder.length] = 0;
         err = mbedtls_x509_crt_parse_path(&ci->certificateIssuerList, f);
         if(err == 0) {
-            UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
                         "Loaded certificate from %s", f);
         } else {
             char errBuff[300];
             mbedtls_strerror(err, errBuff, 300);
-            UA_LOG_INFO(ci->logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
                         "Failed to load certificate from %s, mbedTLS error: %s (error code: %d)",
                         f, errBuff, err);
             internalErrorFlag = 1;
@@ -244,14 +242,17 @@ reloadCertificates(CertInfo *ci) {
 #endif
 
 static UA_StatusCode
-certificateVerification_verify(void *verificationContext,
+certificateVerification_verify(const UA_CertificateVerification *cv,
                                const UA_ByteString *certificate) {
-    CertInfo *ci = (CertInfo*)verificationContext;
+    CertInfo *ci;
+    if(!cv)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    ci = (CertInfo*)cv->context;
     if(!ci)
         return UA_STATUSCODE_BADINTERNALERROR;
 
 #ifdef __linux__ /* Reload certificates if folder paths are specified */
-    UA_StatusCode certFlag = reloadCertificates(ci);
+    UA_StatusCode certFlag = reloadCertificates(cv, ci);
     if(certFlag != UA_STATUSCODE_GOOD) {
         return certFlag;
     }
@@ -264,7 +265,7 @@ certificateVerification_verify(void *verificationContext,
        ci->certificateTrustList.raw.len == 0 &&
        ci->certificateIssuerList.raw.len == 0 &&
        ci->certificateRevocationList.raw.len == 0) {
-        UA_LOG_WARNING(ci->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_SERVER,
                        "PKI plugin unconfigured. Accepting the certificate.");
         return UA_STATUSCODE_GOOD;
     }
@@ -459,7 +460,7 @@ certificateVerification_verify(void *verificationContext,
 #if UA_LOGLEVEL <= 400
         char buff[100];
         int len = mbedtls_x509_crt_verify_info(buff, 100, "", flags);
-        UA_LOG_WARNING(ci->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+        UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_SECURITYPOLICY,
                        "Verifying the certificate failed with error: %.*s", len-1, buff);
 #endif
         if(flags & (uint32_t)MBEDTLS_X509_BADCERT_NOT_TRUSTED) {
@@ -513,10 +514,13 @@ certificateVerification_verify(void *verificationContext,
 }
 
 static UA_StatusCode
-certificateVerification_verifyApplicationURI(void *verificationContext,
+certificateVerification_verifyApplicationURI(const UA_CertificateVerification *cv,
                                              const UA_ByteString *certificate,
                                              const UA_String *applicationURI) {
-    CertInfo *ci = (CertInfo*)verificationContext;
+    CertInfo *ci;
+    if(!cv)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    ci = (CertInfo*)cv->context;
     if(!ci)
         return UA_STATUSCODE_BADINTERNALERROR;
 
@@ -556,7 +560,6 @@ certificateVerification_clear(UA_CertificateVerification *cv) {
 #ifdef UA_ENABLE_CERT_REJECTED_DIR
     UA_String_clear(&ci->rejectedListFolder);
 #endif
-    ci->logger = NULL;
     UA_free(ci);
     cv->context = NULL;
 }
@@ -594,6 +597,13 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
                                      size_t certificateIssuerListSize,
                                      const UA_ByteString *certificateRevocationList,
                                      size_t certificateRevocationListSize) {
+
+    if(cv == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    if(cv->logging == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
     CertInfo *ci = (CertInfo*)UA_malloc(sizeof(CertInfo));
     if(!ci)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -602,12 +612,6 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
     mbedtls_x509_crl_init(&ci->certificateRevocationList);
     mbedtls_x509_crt_init(&ci->certificateIssuerList);
 
-    if(cv->logger) {
-        ci->logger = cv->logger;
-    } else {
-        ci->logger = UA_Log_Stdout;
-    }
-
     cv->context = (void*)ci;
     cv->verifyCertificate = certificateVerification_verify;
     cv->clear = certificateVerification_clear;
@@ -668,6 +672,12 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
                                        const char *issuerListFolder,
                                        const char *revocationListFolder) {
 #endif
+    if(cv == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    if(cv->logging == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
     CertInfo *ci = (CertInfo*)UA_malloc(sizeof(CertInfo));
     if(!ci)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -676,12 +686,6 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
     mbedtls_x509_crl_init(&ci->certificateRevocationList);
     mbedtls_x509_crt_init(&ci->certificateIssuerList);
 
-    if(cv->logger) {
-        ci->logger = cv->logger;
-    } else {
-        ci->logger = UA_Log_Stdout;
-    }
-
     /* Only set the folder paths. They will be reloaded during runtime.
      * TODO: Add a more efficient reloading of only the changes */
     ci->trustListFolder = UA_STRING_ALLOC(trustListFolder);
@@ -691,7 +695,7 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
     ci->rejectedListFolder = UA_STRING_ALLOC(rejectedListFolder);
 #endif
 
-    reloadCertificates(ci);
+    reloadCertificates(cv, ci);
 
     cv->context = (void*)ci;
     cv->verifyCertificate = certificateVerification_verify;
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 5627903b775..21e2855a2d5 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -76,7 +76,7 @@ typedef struct {
     STACK_OF(X509) *      skTrusted;
     STACK_OF(X509_CRL) *  skCrls; /* Revocation list*/
 
-    const UA_Logger *logger;
+    UA_CertificateVerification *cv;
 } CertContext;
 
 static UA_StatusCode
@@ -99,18 +99,14 @@ UA_CertContext_sk_free (CertContext * context) {
 }
 
 static UA_StatusCode
-UA_CertContext_Init (CertContext * context, const UA_Logger *logger) {
+UA_CertContext_Init (CertContext * context, UA_CertificateVerification *cv) {
     (void) memset (context, 0, sizeof (CertContext));
     UA_ByteString_init (&context->trustListFolder);
     UA_ByteString_init (&context->issuerListFolder);
     UA_ByteString_init (&context->revocationListFolder);
     UA_ByteString_init (&context->rejectedListFolder);
 
-    if(logger) {
-        context->logger = logger;
-    } else {
-        context->logger = UA_Log_Stdout;
-    }
+    context->cv = cv;
 
     return UA_CertContext_sk_Init (context);
 }
@@ -118,7 +114,7 @@ UA_CertContext_Init (CertContext * context, const UA_Logger *logger) {
 static void
 UA_CertificateVerification_clear (UA_CertificateVerification * cv) {
     if (cv == NULL) {
-        return ;
+        return;
     }
     CertContext * context = (CertContext *) cv->context;
     if (context == NULL) {
@@ -130,7 +126,7 @@ UA_CertificateVerification_clear (UA_CertificateVerification * cv) {
     UA_ByteString_clear (&context->rejectedListFolder);
 
     UA_CertContext_sk_free (context);
-    context->logger = NULL;
+    context->cv = NULL;
     UA_free (context);
 
     cv->context = NULL;
@@ -296,7 +292,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     UA_ByteString_init (&strCert);
 
     if (ctx->trustListFolder.length > 0) {
-        UA_LOG_INFO(ctx->logger, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
+        UA_LOG_INFO(*(ctx->cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
 
         sk_X509_pop_free (ctx->skTrusted, X509_free);
         ctx->skTrusted = sk_X509_new_null();
@@ -317,12 +313,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
                             "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skTrusted_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
                             "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -332,7 +328,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->issuerListFolder.length > 0) {
-        UA_LOG_INFO(ctx->logger, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
+        UA_LOG_INFO(*(ctx->cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
 
         sk_X509_pop_free (ctx->skIssue, X509_free);
         ctx->skIssue = sk_X509_new_null();
@@ -352,12 +348,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
                             "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skIssuer_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
                             "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -367,7 +363,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->revocationListFolder.length > 0) {
-        UA_LOG_INFO(ctx->logger, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
+        UA_LOG_INFO(*(ctx->cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
 
         sk_X509_CRL_pop_free (ctx->skCrls, X509_CRL_free);
         ctx->skCrls = sk_X509_CRL_new_null();
@@ -387,12 +383,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
                             "Failed to load the revocation file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skCrls_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
                             "Failed to decode the revocation file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -445,7 +441,7 @@ UA_X509_Store_CTX_Error_To_UAError (int opensslErr) {
     }
 
 static UA_StatusCode
-UA_CertificateVerification_Verify (void *                verificationContext,
+UA_CertificateVerification_Verify (const UA_CertificateVerification *cv,
                                    const UA_ByteString * certificate) {
     X509_STORE_CTX*       storeCtx;
     X509_STORE*           store;
@@ -454,10 +450,10 @@ UA_CertificateVerification_Verify (void *                verificationContext,
     int                   opensslRet;
     X509 *                certificateX509 = NULL;
 
-    if (verificationContext == NULL) {
+    if ((cv == NULL) || (cv->context == NULL)) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    ctx = (CertContext *) verificationContext;
+    ctx = (CertContext *) cv->context;
 
     store = X509_STORE_new();
     storeCtx = X509_STORE_CTX_new();
@@ -597,7 +593,7 @@ UA_CertificateVerification_Verify (void *                verificationContext,
 }
 
 static UA_StatusCode
-UA_CertificateVerification_VerifyApplicationURI (void *                verificationContext,
+UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerification *cv,
                                                  const UA_ByteString * certificate,
                                                  const UA_String *     applicationURI) {
     const unsigned char * pData;
@@ -606,21 +602,25 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
     GENERAL_NAMES *       pNames;
     int                   i;
     UA_StatusCode         ret;
-    CertContext *         ctx = (CertContext *)verificationContext;
+    CertContext *         ctx;
 
+    if (cv == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    ctx = (CertContext *)cv->context;
     if (ctx == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     pData = certificate->data;
     if (pData == NULL) {
-        UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Error Empty Certificate");
+        UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error Empty Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
     certificateX509 = UA_OpenSSL_LoadCertificate(certificate);
     if (certificateX509 == NULL) {
-        UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Error loading X509 Certificate");
+        UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error loading X509 Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
@@ -628,7 +628,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
                                                 NULL, NULL);
     if (pNames == NULL) {
         X509_free (certificateX509);
-        UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Error processing X509 Certificate");
+        UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error processing X509 Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
     for (i = 0; i < sk_GENERAL_NAME_num (pNames); i++) {
@@ -637,7 +637,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
              subjectURI.length = (size_t) (value->d.ia5->length);
              subjectURI.data = (UA_Byte *) UA_malloc (subjectURI.length);
              if (subjectURI.data == NULL) {
-                 UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Error Empty subjectURI");
+                 UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error Empty subjectURI");
                  X509_free (certificateX509);
                  sk_GENERAL_NAME_pop_free(pNames, GENERAL_NAME_free);
                  return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
@@ -651,7 +651,7 @@ UA_CertificateVerification_VerifyApplicationURI (void *                verificat
     ret = UA_STATUSCODE_GOOD;
     if (UA_Bstrstr (subjectURI.data, subjectURI.length,
                     applicationURI->data, applicationURI->length) == NULL) {
-        UA_LOG_ERROR(ctx->logger, UA_LOGCATEGORY_USERLAND, "Empty comparing subjectURI and applicationURI");
+        UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Empty comparing subjectURI and applicationURI");
         ret = UA_STATUSCODE_BADCERTIFICATEURIINVALID;
     }
 
@@ -710,12 +710,15 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
     if (cv == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+    if (cv->logging == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     CertContext * context = (CertContext *) UA_malloc (sizeof (CertContext));
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    ret = UA_CertContext_Init (context, cv->logger);
+    ret = UA_CertContext_Init (context, cv);
     if (ret != UA_STATUSCODE_GOOD) {
         return ret;
     }
@@ -769,12 +772,15 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
     if (cv == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+    if (cv->logging == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     CertContext * context = (CertContext *) UA_malloc (sizeof (CertContext));
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    ret = UA_CertContext_Init (context, cv->logger);
+    ret = UA_CertContext_Init (context, cv);
     if (ret != UA_STATUSCODE_GOOD) {
         return ret;
     }
diff --git a/plugins/crypto/ua_pki_none.c b/plugins/crypto/ua_pki_none.c
index 1c5e761f157..af67bbe9c08 100644
--- a/plugins/crypto/ua_pki_none.c
+++ b/plugins/crypto/ua_pki_none.c
@@ -7,13 +7,13 @@
 #include <open62541/plugin/pki_default.h>
 
 static UA_StatusCode
-verifyCertificateAllowAll(void *verificationContext,
+verifyCertificateAllowAll(const UA_CertificateVerification *cv,
                const UA_ByteString *certificate) {
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-verifyApplicationURIAllowAll(void *verificationContext,
+verifyApplicationURIAllowAll(const UA_CertificateVerification *cv,
                              const UA_ByteString *certificate,
                              const UA_String *applicationURI) {
     return UA_STATUSCODE_GOOD;
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index bdb5f419cfe..b66cf9f059c 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -125,7 +125,7 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
         return context->verifyX509.
-            verifyCertificate(context->verifyX509.context,
+            verifyCertificate(&context->verifyX509,
                               &userToken->certificateData);
     }
 
@@ -319,16 +319,19 @@ UA_AccessControl_default(UA_ServerConfig *config,
                     "AccessControl: Anonymous login is enabled");
     }
 
+    if(config->logging == NULL) {
+        config->logging = &config->logger;
+    }
     /* Allow x509 certificates? Move the plugin over. */
     if(verifyX509) {
         context->verifyX509 = *verifyX509;
         memset(verifyX509, 0, sizeof(UA_CertificateVerification));
-        if (context->verifyX509.logger == NULL) {
-            context->verifyX509.logger = &config->logger;
+        if(context->verifyX509.logging == NULL) {
+            context->verifyX509.logging = &config->logging;
         }
     } else {
         memset(&context->verifyX509, 0, sizeof(UA_CertificateVerification));
-        context->verifyX509.logger = &config->logger;
+        context->verifyX509.logging = &config->logging;
         UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_SERVER,
                     "AccessControl: x509 certificate user authentication is enabled");
     }
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 7814290ff87..8c127e4bf25 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -231,6 +231,8 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     /* Logging */
     if(!conf->logger.log)
         conf->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_TRACE);
+    if(conf->logging == NULL)
+        conf->logging = &conf->logger;
 
     /* EventLoop */
     if(conf->eventLoop == NULL) {
@@ -372,10 +374,10 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     /* Endpoints */
     /* conf->endpoints = {0, NULL}; */
 
-    if(!conf->certificateVerification.logger) {
+    if(!conf->certificateVerification.logging) {
         /* Set Logger for Certificate Verification */
-        conf->certificateVerification.logger = &conf->logger;
-    }
+        conf->certificateVerification.logging = &conf->logging;
+   }
 
     /* Certificate Verification that accepts every certificate. Can be
      * overwritten when the policy is specialized. */
@@ -832,6 +834,7 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
 
     UA_CertificateVerification accessControlVerification;
     memset(&accessControlVerification, 0, sizeof(accessControlVerification));
+    accessControlVerification.logging = &conf->logging;
     retval = UA_CertificateVerification_Trustlist(&accessControlVerification,
                                                   trustList, trustListSize,
                                                   issuerList, issuerListSize,
@@ -897,6 +900,8 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     if(!config->logger.log) {
         config->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
     }
+    if(config->logging == NULL)
+        config->logging = &config->logger;
 
     /* EventLoop */
     if(config->eventLoop == NULL) {
@@ -917,9 +922,9 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     if(config->localConnectionConfig.recvBufferSize == 0)
         config->localConnectionConfig = UA_ConnectionConfig_default;
 
-    if(!config->certificateVerification.logger) {
+    if(!config->certificateVerification.logging) {
         /* Set Logger for Certificate Verification */
-        config->certificateVerification.logger = &config->logger;
+        config->certificateVerification.logging = &config->logging;
     }
 
     if(!config->certificateVerification.verifyCertificate) {
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index e1cc970b836..14b06e38c7a 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -71,6 +71,15 @@ UA_ClientConfig_copy(UA_ClientConfig const *src, UA_ClientConfig *dst){
     dst->inactivityCallback = src->inactivityCallback;
     dst->localConnectionConfig = src->localConnectionConfig;
     dst->logger = src->logger;
+    if(src->logging == &src->logger) {
+        dst->logging = &dst->logger;
+    } else {
+        dst->logging = src->logging;
+    }
+    if((src->certificateVerification.logging == NULL) ||
+       (src->certificateVerification.logging == &src->logging)) {
+        dst->certificateVerification.logging = &dst->logging;
+    }
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     dst->outStandingPublishRequests = src->outStandingPublishRequests;
 #endif
@@ -95,6 +104,7 @@ UA_ClientConfig_copy(UA_ClientConfig const *src, UA_ClientConfig *dst){
         dst->certificateVerification.context = NULL;
         dst->eventLoop = NULL;
         dst->logger.context = NULL;
+        dst->logging = NULL;
         dst->securityPolicies = NULL;
         UA_ClientConfig_clear(dst);
     }
@@ -115,13 +125,19 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
     if(client->config.eventLoop &&
        (client->config.eventLoop->logger == &config->logger))
         client->config.eventLoop->logger = &client->config.logger;
-    if(client->config.certificateVerification.logger == &config->logger)
-        client->config.certificateVerification.logger = &client->config.logger;
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         if(client->config.securityPolicies[i].logger == &config->logger)
             client->config.securityPolicies[i].logger = &client->config.logger;
     }
 
+    if((client->config.logging == NULL) ||
+       (client->config.logging == &config->logger)) {
+        /* re-set the logger pointer */
+        client->config.logging = &client->config.logger;
+    }
+    if(client->config.certificateVerification.logging == &config->logging)
+        client->config.certificateVerification.logging = &client->config.logging;
+
     UA_SecureChannel_init(&client->channel);
     client->channel.config = client->config.localConnectionConfig;
     client->connectStatus = UA_STATUSCODE_GOOD;
@@ -178,6 +194,13 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
     }
 
     /* Logger */
+    if(config->logging != NULL) {
+        if((config->logging != &config->logger) &&
+           (config->logging->clear != NULL)) {
+            config->logging->clear(config->logging->context);
+        }
+        config->logging = NULL;
+    }
     if(config->logger.clear)
         config->logger.clear(config->logger.context);
     config->logger.log = NULL;
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index f41b96beaf1..43ea8251f19 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1144,7 +1144,7 @@ verifyClientApplicationURI(const UA_Client *client) {
 
         UA_StatusCode retval =
             client->config.certificateVerification.
-            verifyApplicationURI(client->config.certificateVerification.context,
+            verifyApplicationURI(&client->config.certificateVerification,
                                  &sp->localCertificate,
                                  &client->config.clientDescription.applicationUri);
         if(retval != UA_STATUSCODE_GOOD) {
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 8bdc658ae07..8fa49d023cf 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -710,7 +710,7 @@ UA_Server_setSksClient(UA_Server *server, UA_String securityGroupId,
         return retval;
     }
 
-    ks->sksConfig.clientConfig = *clientConfig;
+    UA_ClientConfig_copy(clientConfig, &ks->sksConfig.clientConfig);
     memset(clientConfig, 0, sizeof(UA_ClientConfig));
     ks->sksConfig.endpointUrl = endpointUrl;
     ks->sksConfig.userNotifyCallback = callback;
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 3522187f18e..ee3ac05bc04 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -395,8 +395,13 @@ UA_Server_newWithConfig(UA_ServerConfig *config) {
     if(server->config.eventLoop->logger == &config->logger)
         server->config.eventLoop->logger = &server->config.logger;
 
-    if(server->config.certificateVerification.logger == &config->logger)
-        server->config.certificateVerification.logger = &server->config.logger;
+    if((server->config.logging == NULL) ||
+       (server->config.logging == &config->logger)) {
+        /* re-set the logger pointer */
+        server->config.logging = &server->config.logger;
+    }
+    if(server->config.certificateVerification.logging == &config->logging)
+        server->config.certificateVerification.logging = &server->config.logging;
 
     /* Reset the old config */
     memset(config, 0, sizeof(UA_ServerConfig));
@@ -557,7 +562,7 @@ verifyServerApplicationURI(const UA_Server *server) {
         if(UA_String_equal(&sp->policyUri, &securityPolicyNoneUri) && (sp->localCertificate.length == 0))
             continue;
         UA_StatusCode retval = server->config.certificateVerification.
-            verifyApplicationURI(server->config.certificateVerification.context,
+            verifyApplicationURI(&server->config.certificateVerification,
                                  &sp->localCertificate,
                                  &server->config.applicationDescription.applicationUri);
 
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 739b7289f79..c537e85f8fe 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -85,6 +85,13 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 #endif
 
     /* Logger */
+    if(config->logging != NULL) {
+        if((config->logging != &config->logger) &&
+           (config->logging->clear != NULL)) {
+            config->logging->clear(config->logging->context);
+        }
+        config->logging = NULL;
+    }
     if(config->logger.clear)
         config->logger.clear(config->logger.context);
     config->logger.log = NULL;
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 8d9ba71ad29..a982d1f9ed7 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -295,7 +295,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
     if(request->clientCertificate.length > 0) {
         UA_CertificateVerification *cv = &server->config.certificateVerification;
         response->responseHeader.serviceResult =
-            cv->verifyApplicationURI(cv->context, &request->clientCertificate,
+            cv->verifyApplicationURI(cv, &request->clientCertificate,
                                      &request->clientDescription.applicationUri);
         if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 7002e2456ac..ca3a99c281e 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -583,7 +583,7 @@ unpackPayloadOPN(UA_SecureChannel *channel, UA_Chunk *chunk, void *application)
     if(asymHeader.senderCertificate.length > 0) {
         if(channel->certificateVerification)
             res = channel->certificateVerification->
-                verifyCertificate(channel->certificateVerification->context,
+                verifyCertificate(channel->certificateVerification,
                                   &asymHeader.senderCertificate);
         else
             res = UA_STATUSCODE_BADINTERNALERROR;

From dae73bb41df198e16bbd405fb46a7f2f2d0fa85f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Feb 2023 11:30:10 +0100
Subject: [PATCH 0744/1963] refactor(client): Remove a duplicate method
 definition in ua_client_internal.h

---
 src/client/ua_client_internal.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 03cf77dbf6d..76bda808680 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -210,11 +210,6 @@ void processOPNResponse(UA_Client *client, const UA_ByteString *message);
 void closeSecureChannel(UA_Client *client);
 void cleanupSession(UA_Client *client);
 
-void
-Client_warnEndpointsResult(UA_Client *client,
-                           const UA_GetEndpointsResponse *response,
-                           const UA_String *endpointUrl);
-
 void
 Client_warnEndpointsResult(UA_Client *client,
                            const UA_GetEndpointsResponse *response,

From e293d0e0dfe606f9cfdac1c1dea9a7e08e64af33 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Feb 2023 14:44:26 +0100
Subject: [PATCH 0745/1963] refactor(server): Simplify publishNotifications

---
 src/server/ua_subscription.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 98499e672f6..c2b5cbba325 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -436,8 +436,7 @@ UA_Subscription_isLate(UA_Subscription *sub) {
 static void
 delayedPublishNotifications(UA_Server *server, UA_Subscription *sub);
 
-/* Returns true if done */
-static UA_Boolean
+static void
 publishNotifications(UA_Server *server, UA_Subscription *sub) {
     /* Dequeue a response */
     UA_PublishResponseEntry *pre = NULL;
@@ -463,7 +462,7 @@ publishNotifications(UA_Server *server, UA_Subscription *sub) {
      * Subscription */
     if(sub->statusChange != UA_STATUSCODE_GOOD) {
         sendStatusChangeDelete(server, sub, pre);
-        return true;
+        return;
     }
 
     /* Count the available notifications */
@@ -477,7 +476,7 @@ publishNotifications(UA_Server *server, UA_Subscription *sub) {
         if(sub->currentKeepAliveCount < sub->maxKeepAliveCount) {
             if(pre)
                 UA_Session_queuePublishReq(sub->session, pre, true); /* Re-enqueue */
-            return true;
+            return;
         }
         UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub, "Sending a KeepAlive");
     }
@@ -492,7 +491,7 @@ publishNotifications(UA_Server *server, UA_Subscription *sub) {
         UA_Subscription_isLate(sub);
         if(pre)
             UA_Session_queuePublishReq(sub->session, pre, true); /* Re-enqueue */
-        return true;
+        return;
     }
 
     UA_assert(pre);
@@ -518,7 +517,7 @@ publishNotifications(UA_Server *server, UA_Subscription *sub) {
 
                 UA_Subscription_isLate(sub);
                 UA_Session_queuePublishReq(sub->session, pre, true); /* Re-enqueue */
-                return true;
+                return;
             }
         }
 
@@ -534,7 +533,7 @@ publishNotifications(UA_Server *server, UA_Subscription *sub) {
                 UA_free(retransmission);
             UA_Subscription_isLate(sub);
             UA_Session_queuePublishReq(sub->session, pre, true); /* Re-enqueue */
-            return true;
+            return;
         }
     }
 
@@ -626,8 +625,6 @@ publishNotifications(UA_Server *server, UA_Subscription *sub) {
         UA_EventLoop *el = server->config.eventLoop;
         el->addDelayedCallback(el, &sub->delayedMoreNotifications);
     }
-
-    return true;
 }
 
 static void

From 5c30ecc62c2314625dc76038a2064abf613e07af Mon Sep 17 00:00:00 2001
From: MattesWhite <matthias.farnbauer-schmidt@paessler.com>
Date: Thu, 2 Feb 2023 10:40:00 +0100
Subject: [PATCH 0746/1963] fix(server): Fix memory leak in
 afterWriteCallbackAckedStateChange()

The acquired NodeIds were not cleared on success resulting in a memory leak with allocated IDs
---
 src/server/ua_subscription_alarms_conditions.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index d01596abe9d..731b6df0063 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -1021,6 +1021,9 @@ afterWriteCallbackAckedStateChange(UA_Server *server,
     CONDITION_ASSERT_RETURN_VOID(retval, "Triggering condition event failed",
                                  UA_NodeId_clear(&conditionNode);
                                  UA_NodeId_clear(&conditionSource););
+
+    UA_NodeId_clear(&conditionNode);
+    UA_NodeId_clear(&conditionSource);
 }
 
 #ifdef CONDITIONOPTIONALFIELDS_SUPPORT

From b84c482402cf6a7b4fd063b9656fde98e4a8ddd4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 6 Feb 2023 23:21:19 +0100
Subject: [PATCH 0747/1963] feat(deps): Add "stop-early" option for JSON
 parsing (for use in a lexer)

---
 deps/cj5.c                   | 29 ++++++++++++++---
 deps/cj5.h                   | 16 ++++++++--
 src/ua_types_encoding_json.c |  2 +-
 tests/check_cj5.c            | 62 +++++++++++++++++++++++++++---------
 4 files changed, 86 insertions(+), 23 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 2c6d9d6990f..87e06df12b6 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -72,6 +72,8 @@ typedef struct {
     cj5_token *tokens;
     unsigned int token_count;
     unsigned int max_tokens;
+
+    bool stop_early;
 } cj5__parser;
 
 static CJ5_INLINE bool
@@ -338,7 +340,8 @@ cj5__skip_comment(cj5__parser* parser) {
 
 cj5_result
 cj5_parse(const char *json5, unsigned int len,
-          cj5_token *tokens, unsigned int max_tokens) {
+          cj5_token *tokens, unsigned int max_tokens,
+          cj5_options *options) {
     cj5_result r;
     cj5__parser parser;
     memset(&parser, 0x0, sizeof(parser));
@@ -348,12 +351,15 @@ cj5_parse(const char *json5, unsigned int len,
     parser.tokens = tokens;
     parser.max_tokens = max_tokens;
 
+    if(options)
+        parser.stop_early = options->stop_early;
+
     unsigned short depth = 0; // Nesting depth zero means "outside the root object"
     char nesting[CJ5_MAX_NESTING]; // Contains either '\0', '{' or '[' for the
                                    // type of nesting at each depth. '\0'
                                    // indicates we are out of the root object.
     char next[CJ5_MAX_NESTING];    // Next content to parse: 'k' (key), ':', 'v'
-                                   // (value) or ',' (komma).
+                                   // (value) or ',' (comma).
     next[0] = 'v';  // The root is a "value" (object, array or primitive). If we
                     // detect a colon after the first value then everything is
                     // wrapped into a "virtual root object" and the parsing is
@@ -451,6 +457,12 @@ cj5_parse(const char *json5, unsigned int len,
             next[depth] = (depth == 0) ? 0 : ','; // zero if we step out the root
                                                   // object. then we do not look for
                                                   // another element.
+
+            // The first element was successfully parsed. Stop early or try to
+            // parse the full input string?
+            if(depth == 0 && parser.stop_early)
+                goto finish;
+
             break;
 
         case ':': // Colon (between key and value)
@@ -472,13 +484,20 @@ cj5_parse(const char *json5, unsigned int len,
         default: // Value or key
             if(next[depth] == 'v') {
                 cj5__parse_primitive(&parser); // Parse primitive value
-                if(nesting[depth] != 0) { // Parent is object or array
+                if(nesting[depth] != 0) {
+                    // Parent is object or array
                     if(token)
                         token->size++;
                     next[depth] = ',';
-                } else { // The current value was the root element. Don't look for
-                         // any next element.
+                } else {
+                    // The current value was the root element. Don't look for
+                    // any next element.
                     next[depth] = 0;
+
+                    // The first element was successfully parsed. Stop early or try to
+                    // parse the full input string?
+                    if(parser.stop_early)
+                        goto finish;
                 }
             } else if(next[depth] == 'k') {
                 cj5__parse_key(&parser);
diff --git a/deps/cj5.h b/deps/cj5.h
index 393e49c83b4..d20da0fb616 100644
--- a/deps/cj5.h
+++ b/deps/cj5.h
@@ -43,6 +43,10 @@
 //  [x] The root object may omit the surrounding brackets
 //  [x] Hash ('#') comments out until the end of the line.
 //  [x] Strings may include unescaped utf8 bytes
+//  [x] Optionally: Stop early when the first encountered JSON element (object,
+//      array, value) has been successfully parsed. Do not return an error when
+//      the input string was not processed to its full length. This allows the
+//      detection of JSON sub-strings as part of an input "lexer".
 //
 // Usage:
 //  The main function to parse json is `cj5_parse`. Like in jsmn, you provide
@@ -54,7 +58,7 @@
 //  #include "cj5.h"
 //
 //  cj5_token tokens[32];
-//  cj5_result r = cj5_parse(g_json, (int)strlen(g_json), tokens, 32);
+//  cj5_result r = cj5_parse(g_json, (int)strlen(g_json), tokens, 32, NULL);
 //  if(r.error != CJ5_ERROR_NONE) {
 //      if(r.error == CJ5_ERROR_OVERFLOW) {
 //          // you can use r.num_tokens to determine the actual token count and reparse
@@ -123,9 +127,17 @@ typedef struct cj5_result {
     const char* json5;
 } cj5_result;
 
+typedef struct cj5_options {
+    bool stop_early; /* Return when the first element was parsed. Otherwise an
+                      * error is returned if the input was not fully
+                      * processed. (default: false) */
+} cj5_options;
+
+/* Options can be NULL */
 CJ5_API cj5_result
 cj5_parse(const char *json5, unsigned int len,
-          cj5_token *tokens, unsigned int max_tokens);
+          cj5_token *tokens, unsigned int max_tokens,
+          cj5_options *options);
 
 CJ5_API cj5_error_code
 cj5_get_bool(const cj5_result *r, unsigned int tok_index, bool *out);
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 8b6c1755f5f..8675fd19c46 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2736,7 +2736,7 @@ status
 tokenize(ParseCtx *ctx, const UA_ByteString *src, size_t tokensSize) {
     /* Tokenize */
     cj5_result r = cj5_parse((char*)src->data, (unsigned int)src->length,
-                             ctx->tokens, (unsigned int)tokensSize);
+                             ctx->tokens, (unsigned int)tokensSize, NULL);
 
     /* Handle overflow error by allocating the number of tokens the parser would
      * have needed */
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index 03175c04354..b202be51af5 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -25,7 +25,7 @@
 START_TEST(parseObject) {
     const char *json = "{'a':1.0, 'b':2, 'c':'abcde'}";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
     double d = 0.0;
     cj5_error_code err = cj5_get_float(&r, 2, &d);
@@ -38,7 +38,7 @@ START_TEST(parseObject) {
 START_TEST(parseUTF8) {
     const char *json = "{'a':\"Lindestra\\u00dfe\"}";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
     char buf[32];
     cj5_error_code err = cj5_get_str(&r, 2, buf, NULL);
@@ -50,7 +50,7 @@ START_TEST(parseUTF8) {
 START_TEST(parseNestedObject) {
     const char *json = "{'a':{}, 'b':{'c':3}, 'd':true, 'e':false, 'f':null, 'g':[]}";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
 
     /* 12 elements directly under the root object */
@@ -98,56 +98,66 @@ START_TEST(parseNestedObject) {
 START_TEST(parseObjectUnquoted) {
     const char *json = "{'a':1, b:true}";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
 } END_TEST
 
 START_TEST(parseObjectWrongBracket) {
     const char *json = "{'a':1, 'b':2]";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_INVALID);
 } END_TEST
 
 START_TEST(parseObjectWrongBracket2) {
     const char *json = "{{'a':1, 'b':2]}";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_INVALID);
 } END_TEST
 
 START_TEST(parseObjectIncomplete) {
     const char *json = "{'a':1, 'b':2";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_INCOMPLETE);
 } END_TEST
 
 START_TEST(parseObjectNoRoot) {
     const char *json = "'a':1, 'b':2";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
 } END_TEST
 
+START_TEST(parseObjectStopEarly) {
+    cj5_options opt;
+    opt.stop_early = true;
+    const char *json = "{'a':1}, x";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, &opt);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+    ck_assert_uint_eq(r.tokens[0].end, 6);
+} END_TEST
+
 START_TEST(parseObjectNoRootUnquoted) {
     const char *json = "a:1, 'b':2";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
 } END_TEST
 
 START_TEST(parseObjectCloseNoRoot) {
     const char *json = "'a':1, 'b':2}";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_INVALID);
 } END_TEST
 
 START_TEST(parseArray) {
     const char *json = "[1.23456,2,3,null]";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
 
     double val = 0;
@@ -155,17 +165,37 @@ START_TEST(parseArray) {
     ck_assert(fabs(val - 1.23456) < 0.00001);
 } END_TEST
 
+START_TEST(parseArrayStopEarly) {
+    cj5_options opt;
+    opt.stop_early = true;
+    const char *json = "[1] }";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, &opt);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+    ck_assert_uint_eq(r.tokens[0].end, 2);
+} END_TEST
+
 START_TEST(parseValue) {
     const char *json = "null";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
+    ck_assert(r.error == CJ5_ERROR_NONE);
+} END_TEST
+
+START_TEST(parseValueStopEarly) {
+    cj5_options opt;
+    opt.stop_early = true;
+    const char *json = "1.0{";
+    cj5_token tokens[32];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, &opt);
     ck_assert(r.error == CJ5_ERROR_NONE);
+    ck_assert_uint_eq(r.tokens[0].end, 2);
 } END_TEST
 
 START_TEST(parseInf) {
     const char *json = "Infinity";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
 
     double val = 0;
@@ -176,7 +206,7 @@ START_TEST(parseInf) {
 START_TEST(parseNegInf) {
     const char *json = "-Infinity";
     cj5_token tokens[32];
-    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32);
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 32, NULL);
     ck_assert(r.error == CJ5_ERROR_NONE);
 
     double val = 0;
@@ -196,8 +226,11 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_parse, parseObjectNoRoot);
     tcase_add_test(tc_parse, parseObjectNoRootUnquoted);
     tcase_add_test(tc_parse, parseObjectCloseNoRoot);
+    tcase_add_test(tc_parse, parseObjectStopEarly);
     tcase_add_test(tc_parse, parseArray);
+    tcase_add_test(tc_parse, parseArrayStopEarly);
     tcase_add_test(tc_parse, parseValue);
+    tcase_add_test(tc_parse, parseValueStopEarly);
     tcase_add_test(tc_parse, parseInf);
     tcase_add_test(tc_parse, parseNegInf);
 
@@ -216,4 +249,3 @@ int main(void) {
     srunner_free(sr);
     return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-

From e01ebb47f955f41ccafe026bf8f08813148bd43a Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Wed, 1 Feb 2023 07:40:57 +0100
Subject: [PATCH 0748/1963] fix(core): Initialize entire nodeid variable

If entire Nodeid variable was used, valgrind reported
uninitialized memory.
---
 include/open62541/types.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index df76059b0e1..02c2a66cc7c 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -434,6 +434,7 @@ UA_INLINABLE(UA_NodeId
              UA_NODEID_NUMERIC(UA_UInt16 nsIndex,
                                UA_UInt32 identifier), {
     UA_NodeId id;
+    memset(&id, 0, sizeof(UA_NodeId));
     id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_NUMERIC;
     id.identifier.numeric = identifier;
@@ -443,6 +444,7 @@ UA_INLINABLE(UA_NodeId
 UA_INLINABLE(UA_NodeId
              UA_NODEID_STRING(UA_UInt16 nsIndex, char *chars), {
     UA_NodeId id;
+    memset(&id, 0, sizeof(UA_NodeId));
     id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_STRING;
     id.identifier.string = UA_STRING(chars);
@@ -453,6 +455,7 @@ UA_INLINABLE(UA_NodeId
              UA_NODEID_STRING_ALLOC(UA_UInt16 nsIndex,
                                     const char *chars), {
     UA_NodeId id;
+    memset(&id, 0, sizeof(UA_NodeId));
     id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_STRING;
     id.identifier.string = UA_STRING_ALLOC(chars);
@@ -462,6 +465,7 @@ UA_INLINABLE(UA_NodeId
 UA_INLINABLE(UA_NodeId
              UA_NODEID_GUID(UA_UInt16 nsIndex, UA_Guid guid), {
     UA_NodeId id;
+    memset(&id, 0, sizeof(UA_NodeId));
     id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_GUID;
     id.identifier.guid = guid;
@@ -471,6 +475,7 @@ UA_INLINABLE(UA_NodeId
 UA_INLINABLE(UA_NodeId
              UA_NODEID_BYTESTRING(UA_UInt16 nsIndex, char *chars), {
     UA_NodeId id;
+    memset(&id, 0, sizeof(UA_NodeId));
     id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_BYTESTRING;
     id.identifier.byteString = UA_BYTESTRING(chars);
@@ -481,6 +486,7 @@ UA_INLINABLE(UA_NodeId
              UA_NODEID_BYTESTRING_ALLOC(UA_UInt16 nsIndex,
                                         const char *chars), {
     UA_NodeId id;
+    memset(&id, 0, sizeof(UA_NodeId));
     id.namespaceIndex = nsIndex;
     id.identifierType = UA_NODEIDTYPE_BYTESTRING;
     id.identifier.byteString = UA_BYTESTRING_ALLOC(chars);

From df419c39f8c34cc8b6b91230068a50370249cc4a Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Fri, 10 Feb 2023 06:57:48 +0100
Subject: [PATCH 0749/1963] fix(pubsub): prevent segfault on reception of a
 broken UADP message

Decoding of the UADP message with an emtpy payload results in
UA_EMPTY_ARRAY_SENTINEL being set for the array. This has to be handled
later when processing the message.

TODO: check where else there can be similar issues.
---
 src/pubsub/ua_pubsub_networkmessage.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 56cc461ce07..5fee9347b70 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1110,7 +1110,8 @@ UA_NetworkMessage_clear(UA_NetworkMessage* p) {
     }
 
     if(p->networkMessageType == UA_NETWORKMESSAGE_DATASET) {
-        if(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds)
+        if(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds &&
+           p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != UA_EMPTY_ARRAY_SENTINEL)
             UA_free(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds);
 
         if(p->payload.dataSetPayload.sizes)

From 14b746bde62e204e3f6c3500deebb37e2e00458f Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Thu, 9 Feb 2023 15:31:56 +0100
Subject: [PATCH 0750/1963] refactor(pubsub): don't clear TargetVariables twice

TargetVariables are already cleared above in
UA_DataSetReaderConfig_clear
---
 src/pubsub/ua_pubsub_reader.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index c03a2e2ba46..68c037d99f6 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -626,12 +626,6 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
 
     UA_NodeId_clear(&dsr->identifier);
     UA_NodeId_clear(&dsr->linkedReaderGroup);
-    if(dsr->config.subscribedDataSetType == UA_PUBSUB_SDS_TARGET) {
-        UA_TargetVariables_clear(&dsr->config.subscribedDataSet.subscribedDataSetTarget);
-    } else {
-        UA_LOG_ERROR_READER(&server->config.logger, dsr,
-                     "UA_DataSetReader_delete(): unsupported subscribed dataset enum type");
-    }
 
     /* Free memory allocated for DataSetReader */
     UA_free(dsr);

From 2a886b749ef3ada10edd892a6b99970f93c93c26 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Thu, 9 Feb 2023 11:33:53 +0100
Subject: [PATCH 0751/1963] test(pubsub): improve the test for removing
 DataSetFields

---
 tests/pubsub/check_pubsub_publish.c | 31 +++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index 2c76b893fea..0f6079b615c 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -330,27 +330,50 @@ START_TEST(AddRemoveAddDataSetFieldWithValidConfiguration){
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
         fieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-        fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 1");
         fieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
         fieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
         UA_NodeId localDataSetField;
         UA_PublishedDataSet *pds1 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds1, NULL);
         ck_assert_uint_eq(pds1->fieldSize, 0);
+
+        // Add "field 1"
+        fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 1");
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         ck_assert_uint_eq(pds1->fieldSize, 1);
-        retVal = UA_Server_removeDataSetField(server, localDataSetField).result;
-        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        ck_assert_uint_eq(pds1->fieldSize, 0);
+
+        // Add "field 2"
+        fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 2");
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        ck_assert_uint_eq(pds1->fieldSize, 2);
+
+        // Remove "field 2"
+        retVal = UA_Server_removeDataSetField(server, localDataSetField).result;
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         ck_assert_uint_eq(pds1->fieldSize, 1);
+        // Check that the correct field was removed - "field 1" should still be there
+        UA_String compareString = UA_STRING("field 1");
+        ck_assert(UA_String_equal(&pds1->fields.tqh_first->fieldMetaData.name, &compareString));
+
+        // Add "field 2" again
+        fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 2");
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         ck_assert_uint_eq(pds1->fieldSize, 2);
+
+        // Add "field 3"
+        fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 3");
+        retVal = UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        ck_assert_uint_eq(pds1->fieldSize, 3);
+
         UA_PublishedDataSet *pds2 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet2);
         ck_assert_ptr_ne(pds2, NULL);
+
+        // Add "field 1"
+        fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 1");
         retVal = UA_Server_addDataSetField(server, publishedDataSet2, &fieldConfig, &localDataSetField).result;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         ck_assert_uint_eq(pds2->fieldSize, 1);

From 033ca29d9e6ab1b33a57ac0dec348e024b383848 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Thu, 9 Feb 2023 12:59:43 +0100
Subject: [PATCH 0752/1963] fix(pubsub): fix issues with removing a
 DataSetField

1) The DataSetFieldId was not set correctly.
2) The value of the field's FieldMetaData was not re-initialized during
DataSetMetaData regeneration on removal of the DataSetField.
---
 src/pubsub/ua_pubsub_dataset.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 7343ffb1bee..83bb997bcf5 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -347,7 +347,7 @@ UA_DataSetField_create(UA_Server *server, const UA_NodeId publishedDataSet,
     }
 
     /* Append to the metadata fields array. Point of last return. */
-    result.result = UA_Array_append((void**)&currDS->dataSetMetaData.fields,
+    result.result = UA_Array_appendCopy((void**)&currDS->dataSetMetaData.fields,
                                     &currDS->dataSetMetaData.fieldsSize,
                                     &fmd, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
     if(result.result != UA_STATUSCODE_GOOD) {
@@ -362,6 +362,7 @@ UA_DataSetField_create(UA_Server *server, const UA_NodeId publishedDataSet,
     newField->identifier = UA_NODEID_GUID(1, fmd.dataSetFieldId);
     if(fieldIdentifier)
         UA_NodeId_copy(&newField->identifier, fieldIdentifier);
+    UA_FieldMetaData_clear(&fmd);
 
     /* Register the field. The order of DataSetFields should be the same in both
      * creating and publishing. So adding DataSetFields at the the end of the
@@ -479,7 +480,8 @@ removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
                                        "after removing a field!");
                 break;
             }
-            counter++;
+            // The contents of the metadata is shared between the PDS and its fields.
+            tmpDSF->fieldMetaData = fieldMetaData[counter++];
         }
         pds->dataSetMetaData.fields = fieldMetaData;
     } else {

From cd6a5676bcb75116630d0e9f4e620572d77c166f Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Thu, 9 Feb 2023 14:15:18 +0100
Subject: [PATCH 0753/1963] fix(pubsub): set a correct builtInTypeId in
 FieldMetaData

---
 src/pubsub/ua_pubsub_dataset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 83bb997bcf5..8f3bff54cf6 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -240,7 +240,7 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
 #endif
         /* Check if the datatype is a builtInType, if yes set the builtinType. */
         if(currentDataType->typeKind <= UA_DATATYPEKIND_ENUM)
-            fieldMetaData->builtInType = (UA_Byte)currentDataType->typeKind;
+            fieldMetaData->builtInType = (UA_Byte)currentDataType->typeId.identifier.numeric;
         /* set the maxStringLength attribute */
         if(field->config.field.variable.maxStringLength != 0){
             if(currentDataType->typeKind == UA_DATATYPEKIND_BYTESTRING ||

From 73a60b501094876d637c78878e0c90da34b42cf7 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Thu, 9 Feb 2023 13:17:07 +0100
Subject: [PATCH 0754/1963] refactor(pubsub): optimize removal of a
 PublishedDataSet

Do only necessary cleanup. removeDataSetField was doing more than that.
---
 src/pubsub/ua_pubsub_dataset.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 8f3bff54cf6..7d0900cba17 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -147,7 +147,22 @@ void
 UA_PublishedDataSet_clear(UA_Server *server, UA_PublishedDataSet *publishedDataSet) {
     UA_DataSetField *field, *tmpField;
     TAILQ_FOREACH_SAFE(field, &publishedDataSet->fields, listEntry, tmpField) {
-        removeDataSetField(server, field->identifier);
+        /* Code in this block is a duplication of similar code in removeDataSetField, but
+         * this is intentional. We don't want to call removeDataSetField here as that
+         * function regenerates DataSetMetaData, which is not necessary if we want to
+         * clear the whole PDS anyway. */
+        if(field->configurationFrozen) {
+            UA_LOG_WARNING_DATASET(&server->config.logger, publishedDataSet,
+                                   "Clearing a frozen field.");
+        }
+        field->fieldMetaData.arrayDimensions = NULL;
+        field->fieldMetaData.properties = NULL;
+        field->fieldMetaData.name = UA_STRING_NULL;
+        field->fieldMetaData.description.locale = UA_STRING_NULL;
+        field->fieldMetaData.description.text = UA_STRING_NULL;
+        UA_DataSetField_clear(field);
+        TAILQ_REMOVE(&publishedDataSet->fields, field, listEntry);
+        UA_free(field);
     }
     UA_PublishedDataSetConfig_clear(&publishedDataSet->config);
     UA_DataSetMetaDataType_clear(&publishedDataSet->dataSetMetaData);

From b8a527009b22ee80edb598b96883d8b6f1643d90 Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <19662702+JohannesKauffmann@users.noreply.github.com>
Date: Mon, 20 Feb 2023 16:55:46 +0100
Subject: [PATCH 0755/1963] fix(examples): Fix CMakeLists.txt multithreading
 check (#5654)

UA_MULTITHREADING can be greater than 100, in which case these examples
won't be built.
---
 examples/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index f8639257db3..0121fa938e1 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -87,7 +87,7 @@ add_example(tutorial_server_reverseconnect tutorial_server_reverseconnect.c)
 
 if(UA_ENABLE_METHODCALLS)
     add_example(tutorial_server_method tutorial_server_method.c)
-    if (UA_MULTITHREADING EQUAL 100)
+    if (UA_MULTITHREADING GREATER_EQUAL 100)
         add_example(tutorial_server_method_async tutorial_server_method_async.c)
     endif()
 endif()
@@ -133,7 +133,7 @@ install(PROGRAMS $<TARGET_FILE:client>
 add_example(client_async client_async.c)
 
 if(UA_ENABLE_METHODCALLS)
-    if (UA_MULTITHREADING EQUAL 100)
+    if (UA_MULTITHREADING GREATER_EQUAL 100)
         add_example(client_method_async client_method_async.c)
     endif()
 endif()

From ffa4585e65b1c6e8988511de8abb756a897f2b9c Mon Sep 17 00:00:00 2001
From: basyskom-jvoe <33348624+basyskom-jvoe@users.noreply.github.com>
Date: Tue, 21 Feb 2023 13:07:06 +0100
Subject: [PATCH 0756/1963] feat(client): Reverse connect for the client
 (#5507)

---
 include/open62541/client.h                 |  16 +
 include/open62541/common.h                 |   2 +
 src/client/ua_client.c                     |   8 +-
 src/client/ua_client_connect.c             | 186 ++++++++++-
 src/client/ua_client_internal.h            |   1 +
 src/ua_securechannel.c                     |   4 +-
 tests/server/check_server_reverseconnect.c | 354 +++++++++++----------
 7 files changed, 394 insertions(+), 177 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index faecf7725a5..5e63b881738 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -323,6 +323,22 @@ UA_Client_connectUsername(UA_Client *client, const char *endpointUrl,
     return UA_Client_connect(client, endpointUrl);
 }
 
+/* Sets up a listening socket for incoming reverse connect requests by OPC UA servers.
+ * After the first server has connected, the listening socket is removed.
+ * The client state callback is also used for reverse connect. An implementation could
+ * for example issue a new call to UA_Client_startListeningForReverseConnect after the
+ * server has closed the connection. If the client is connected to any server while
+ * UA_Client_startListeningForReverseConnect is called, the connection will be closed.
+ *
+ * The reverse connect is closed by calling the standard disconnect functions like
+ * for a "normal" connection that was initiated by the client. Calling one of the connect
+ * methods will also close the listening socket and the connection to the remote server.
+ */
+UA_StatusCode UA_EXPORT
+UA_Client_startListeningForReverseConnect(UA_Client *client, const UA_String *listenHostnames,
+                                          size_t listenHostnamesLength,
+                                          UA_UInt16 port);
+
 /* Disconnect and close a connection to the selected server. Disconnection is
  * always performed async (without blocking). */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
diff --git a/include/open62541/common.h b/include/open62541/common.h
index da2e9ac8619..963761a5b09 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -175,8 +175,10 @@ typedef enum {
 
 typedef enum {
     UA_SECURECHANNELSTATE_FRESH = 0,
+    UA_SECURECHANNELSTATE_REVERSE_LISTENING,
     UA_SECURECHANNELSTATE_CONNECTING,
     UA_SECURECHANNELSTATE_CONNECTED,
+    UA_SECURECHANNELSTATE_REVERSE_CONNECTED,
     UA_SECURECHANNELSTATE_RHE_SENT,
     UA_SECURECHANNELSTATE_HEL_SENT,
     UA_SECURECHANNELSTATE_HEL_RECEIVED,
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 14b06e38c7a..fe5306a6988 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -278,8 +278,8 @@ UA_Client_getConfig(UA_Client *client) {
 }
 
 #if UA_LOGLEVEL <= 300
-static const char *channelStateTexts[12] = {
-    "Fresh", "Connecting", "Connected", "RHESent", "HELSent", "HELReceived", "ACKSent",
+static const char *channelStateTexts[14] = {
+    "Fresh", "ReverseListening", "Connecting", "Connected", "ReverseConnected", "RHESent", "HELSent", "HELReceived", "ACKSent",
     "AckReceived", "OPNSent", "Open", "Closing", "Closed"};
 static const char *sessionStateTexts[6] =
     {"Closed", "CreateRequested", "Created",
@@ -508,6 +508,10 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
     }
 
     switch(messageType) {
+    case UA_MESSAGETYPE_RHE:
+        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process RHE message");
+        processRHEMessage(client, message);
+        return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_ACK:
         UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process ACK message");
         processACKResponse(client, message);
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 43ea8251f19..6803b803551 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -16,6 +16,8 @@
 #define UA_SESSION_LOCALNONCELENGTH 32
 #define MAX_DATA_SIZE 4096
 
+#define REVERSE_CONNECT_INDICATOR (void *)(uintptr_t)0xFFFFFFFF
+
 static UA_StatusCode initConnect(UA_Client *client);
 static UA_StatusCode createSessionAsync(UA_Client *client);
 
@@ -409,6 +411,30 @@ sendHELMessage(UA_Client *client) {
     return UA_STATUSCODE_GOOD;
 }
 
+void processRHEMessage(UA_Client *client, const UA_ByteString *chunk) {
+    UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT, "RHE received");
+
+    size_t offset = 0; /* Go to the beginning of the TcpHelloMessage */
+    UA_TcpReverseHelloMessage rheMessage;
+    UA_StatusCode retval =
+        UA_decodeBinaryInternal(chunk, &offset, &rheMessage,
+                                &UA_TRANSPORT[UA_TRANSPORT_TCPREVERSEHELLOMESSAGE], NULL);
+
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_NETWORK,
+                     "Decoding RHE message failed");
+        closeSecureChannel(client);
+        return;
+    }
+
+    UA_String_clear(&client->endpointUrl);
+    UA_String_copy(&rheMessage.endpointUrl, &client->endpointUrl);
+
+    UA_TcpReverseHelloMessage_clear(&rheMessage);
+
+    sendHELMessage(client);
+}
+
 void
 processOPNResponse(UA_Client *client, const UA_ByteString *message) {
     /* Is the content of the expected type? */
@@ -1050,6 +1076,7 @@ connectActivity(UA_Client *client) {
         /* Nothing to do if the connection has not opened fully */
     case UA_SECURECHANNELSTATE_CONNECTING:
     case UA_SECURECHANNELSTATE_CLOSING:
+    case UA_SECURECHANNELSTATE_HEL_SENT:
         return;
 
         /* Send HEL */
@@ -1179,7 +1206,8 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
         /* Inconsistent SecureChannel state. Has to be fresh for a new
          * connection. */
-        if(client->channel.state != UA_SECURECHANNELSTATE_FRESH) {
+        if(client->channel.state != UA_SECURECHANNELSTATE_FRESH &&
+                client->channel.state != UA_SECURECHANNELSTATE_REVERSE_LISTENING) {
             UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                          "Cannot open a connection for SecureChannel that is already used");
             client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
@@ -1197,8 +1225,12 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * before sending the HEL message. */
         if(state == UA_CONNECTIONSTATE_OPENING)
             client->channel.state = UA_SECURECHANNELSTATE_CONNECTING;
-        else /* state == UA_CONNECTIONSTATE_ESTABLISHED */
-            client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
+        else {
+            if (client->channel.state == UA_SECURECHANNELSTATE_REVERSE_LISTENING)
+                client->channel.state = UA_SECURECHANNELSTATE_REVERSE_CONNECTED;
+            else /* state == UA_CONNECTIONSTATE_ESTABLISHED */
+                client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
+        }
         
         goto continue_connect;
     }
@@ -1513,6 +1545,148 @@ UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl) {
     return client->connectStatus;
 }
 
+static void
+__Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                         void *application, void **connectionContext,
+                         UA_ConnectionState state, const UA_KeyValueMap *params,
+                         UA_ByteString msg) {
+
+    UA_Client *client = (UA_Client*)application;
+
+    UA_LOCK(&client->clientMutex);
+
+    /* This is the first call for the listening socket, attach the REVERSE_CONNECT_INDICATOR marker
+     * and set the ID to the channel */
+    if (!client->channel.connectionId) {
+        client->channel.connectionId = connectionId;
+        *connectionContext = REVERSE_CONNECT_INDICATOR;
+    }
+
+    /* Last call for the listening connection while it is being closed.
+     * Only notify a state change if no reverse connection is being or has been established by now */
+    if (*connectionContext == REVERSE_CONNECT_INDICATOR && state == UA_CONNECTIONSTATE_CLOSING) {
+        if (client->channel.connectionId == connectionId) {
+            client->channel.state = UA_SECURECHANNELSTATE_CLOSED;
+            notifyClientState(client);
+        }
+        UA_UNLOCK(&client->clientMutex);
+        return;
+    }
+
+    /* Second callback for the listening socket, it is now listening for incoming connections */
+    if (client->channel.connectionId == connectionId &&  *connectionContext == REVERSE_CONNECT_INDICATOR) {
+        client->channel.state = UA_SECURECHANNELSTATE_REVERSE_LISTENING;
+        notifyClientState(client);
+    }
+
+    /* This is a connection initiated by a server, disconnect the listener and reset secure channel information */
+    if (client->channel.connectionId != connectionId) {
+        cm->closeConnection(cm, client->channel.connectionId);
+        client->channel.connectionId = 0;
+        *connectionContext = NULL;
+    }
+
+    /* Forward all calls belonging to the reverse connection estblished by the server to the regular network callback */
+    if (*connectionContext != REVERSE_CONNECT_INDICATOR) {
+        UA_UNLOCK(&client->clientMutex);
+        __Client_networkCallback(cm, connectionId, application, connectionContext, state, params, msg);
+        return;
+    }
+
+    UA_UNLOCK(&client->clientMutex);
+}
+
+UA_StatusCode UA_Client_startListeningForReverseConnect(UA_Client *client, const UA_String *listenHostnames,
+                                                        size_t listenHostnamesLength,
+                                                        UA_UInt16 port) {
+    UA_LOCK(&client->clientMutex);
+
+    if (client->channel.state > UA_SECURECHANNELSTATE_FRESH && client->channel.state < UA_SECURECHANNELSTATE_CLOSED) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Unable to listen for reverse connect while the client is connected or already listening");
+        UA_UNLOCK(&client->clientMutex);
+        return UA_STATUSCODE_BADINVALIDSTATE;
+    }
+
+    const UA_String tcpString = UA_STRING_STATIC("tcp");
+    UA_StatusCode res = UA_STATUSCODE_BADINTERNALERROR;
+
+    client->noReconnect = true;
+    client->connectStatus = UA_STATUSCODE_GOOD;
+    client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
+
+    UA_SecureChannel_init(&client->channel);
+    client->channel.config = client->config.localConnectionConfig;
+    client->channel.certificateVerification = &client->config.certificateVerification;
+    client->channel.processOPNHeader = verifyClientSecurechannelHeader;
+    client->channel.connectionId = 0;
+
+    initSecurityPolicy(client);
+
+    UA_EventLoop *el = client->config.eventLoop;
+    if(!el) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "No EventLoop configured");
+        UA_UNLOCK(&client->clientMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    if(el->state != UA_EVENTLOOPSTATE_STARTED) {
+        res = el->start(el);
+        UA_CHECK_STATUS(res, UA_UNLOCK(&client->clientMutex); return res);
+    }
+
+    for(UA_EventSource *es = client->config.eventLoop->eventSources; es != NULL; es = es->next) {
+
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+        if(!UA_String_equal(&tcpString, &cm->protocol))
+            continue;
+
+        client->channel.connectionManager = cm;
+        break;
+    }
+
+    if (!client->channel.connectionManager) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Could not find a TCP connection manager, unable to listen for reverse connect");
+        UA_UNLOCK(&client->clientMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_KeyValuePair params[3];
+    bool booleanTrue = true;
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setArray(&params[1].value, (void *)(uintptr_t)listenHostnames,
+            listenHostnamesLength, &UA_TYPES[UA_TYPES_STRING]);
+    params[2].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[2].value, &booleanTrue, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
+    UA_KeyValueMap paramMap;
+    paramMap.map = params;
+    paramMap.mapSize = 3;
+
+    UA_UNLOCK(&client->clientMutex);
+    res = client->channel.connectionManager->openConnection(client->channel.connectionManager, &paramMap,
+                                                            client, NULL, __Client_reverseConnectCallback);
+    UA_LOCK(&client->clientMutex);
+
+    /* Opening the TCP connection failed */
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                       "Failed to open a listening TCP socket for reverse connect");
+        res = UA_STATUSCODE_BADCONNECTIONCLOSED;
+    }
+
+    UA_UNLOCK(&client->clientMutex);
+
+    return res;
+}
+
 /************************/
 /* Close the Connection */
 /************************/
@@ -1651,7 +1825,8 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
        el->state != UA_EVENTLOOPSTATE_FRESH &&
        el->state != UA_EVENTLOOPSTATE_STOPPED) {
         UA_UNLOCK(&client->clientMutex);
-        while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
+        while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED &&
+              client->channel.state != UA_SECURECHANNELSTATE_FRESH) {
             el->run(el, 100);
         }
         UA_LOCK(&client->clientMutex);
@@ -1665,7 +1840,8 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
 
 UA_StatusCode
 UA_Client_disconnect(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
+    UA_LOCK(&client->clientMutex);        
+
     client->noReconnect = true;
     if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
         sendCloseSession(client);
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 76bda808680..d1d6d4658d3 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -204,6 +204,7 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
 
 void connectSync(UA_Client *client);
 void notifyClientState(UA_Client *client);
+void processRHEMessage(UA_Client *client, const UA_ByteString *chunk);
 void processERRResponse(UA_Client *client, const UA_ByteString *chunk);
 void processACKResponse(UA_Client *client, const UA_ByteString *chunk);
 void processOPNResponse(UA_Client *client, const UA_ByteString *message);
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index ca3a99c281e..b2c5d15867e 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -85,7 +85,7 @@ hideErrors(UA_TcpErrorMessage *const error) {
 
 UA_Boolean
 UA_SecureChannel_isConnected(UA_SecureChannel *channel) {
-    return (channel->state >= UA_SECURECHANNELSTATE_CONNECTING &&
+    return (channel->state >= UA_SECURECHANNELSTATE_REVERSE_LISTENING &&
             channel->state < UA_SECURECHANNELSTATE_CLOSING);
 }
 
@@ -900,7 +900,7 @@ extractCompleteChunk(UA_SecureChannel *channel, const UA_ByteString *buffer,
     chunkPayload.data = &buffer->data[*offset];
     chunkPayload.length = hdr.messageSize;
 
-    if(msgType == UA_MESSAGETYPE_HEL || msgType == UA_MESSAGETYPE_ACK ||
+    if(msgType == UA_MESSAGETYPE_RHE || msgType == UA_MESSAGETYPE_HEL || msgType == UA_MESSAGETYPE_ACK ||
        msgType == UA_MESSAGETYPE_ERR || msgType == UA_MESSAGETYPE_OPN) {
         if(chunkType != UA_CHUNKTYPE_FINAL)
             return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
index 115345c7b6c..60c45988dee 100644
--- a/tests/server/check_server_reverseconnect.c
+++ b/tests/server/check_server_reverseconnect.c
@@ -9,6 +9,7 @@
 #include <open62541/server_config_default.h>
 #include <open62541/types.h>
 #include <open62541/plugin/log_stdout.h>
+#include <open62541/client_config_default.h>
 
 #include "server/ua_server_internal.h"
 #include "server/ua_services.h"
@@ -19,121 +20,72 @@
 
 #include "check.h"
 #include "testing_clock.h"
-
-static int max_stop_iteration_count = 100;
+#include "thread_wrapper.h"
 
 static UA_Server *server = NULL;
+static UA_Client *client = NULL;
 
-static int numCallbackCalled = 0;
-static UA_SecureChannelState callbackStates[10];
+static int numServerCallbackCalled = 0;
+static UA_SecureChannelState serverCallbackStates[10];
 static UA_UInt64 reverseConnectHandle = 0;
-static UA_Boolean listening = false;
-static UA_Boolean rheReceived = false;
-
-UA_EventLoop *eventLoop = NULL;
-UA_ConnectionManager *connectionManager = NULL;
-
-static void listenCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                           void *application, void **connectionContext,
-                           UA_ConnectionState state,
-                           const UA_KeyValueMap *params,
-                           UA_ByteString msg) {
-    (void)cm;
-    (void)connectionId;
-    (void)application;
-    (void)connectionContext;
-    (void)params;
-    (void)msg;
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                "Listen callback was called with state %d and connection id %lu", state,
-                (unsigned long)connectionId);
-
-    if (msg.length) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Message: %ld %.*s",
-                    (unsigned long)msg.length, (int) msg.length, (char *)msg.data);
-        rheReceived = msg.length >= 3 && !strncmp((char *)msg.data, "RHE", 3);
-    }
-
-    listening = state == UA_CONNECTIONSTATE_ESTABLISHED;
-}
-
-static void setupListeningSocket(void) {
-    connectionManager = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
-
-    eventLoop = UA_EventLoop_new_POSIX(UA_Log_Stdout);
-    eventLoop->registerEventSource(eventLoop, &connectionManager->eventSource);
-    eventLoop->start(eventLoop);
-
-    UA_String listenHost = UA_STRING_STATIC("localhost");
-    UA_UInt16 listenPort = 4841;
-    UA_Boolean listen = true;
 
-    UA_KeyValuePair params[3];
-    params[0].key = UA_QUALIFIEDNAME(0, "port");
-    UA_Variant_setScalar(&params[0].value, &listenPort, &UA_TYPES[UA_TYPES_UINT16]);
-    params[1].key = UA_QUALIFIEDNAME(0, "listen");
-    UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    params[2].key = UA_QUALIFIEDNAME(0, "address");
-    UA_Variant_setArray(&params[2].value, &listenHost, 1, &UA_TYPES[UA_TYPES_STRING]);
+static int numClientCallbackCalled = 0;
+static UA_SecureChannelState clientCallbackStates[100];
 
-    UA_KeyValueMap paramsMap;
-    paramsMap.map = params;
-    paramsMap.mapSize = 3;
+bool runServer = false;
+THREAD_HANDLE server_thread;
 
-    UA_StatusCode res = connectionManager->openConnection(connectionManager, &paramsMap,
-                                                          NULL, NULL, listenCallback);
-    ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
-
-    for (int i = 0; i < 100; ++i) {
-        eventLoop->run(eventLoop, 100);
-        if (listening)
-            break;
-    }
-
-    ck_assert_int_eq(listening, true);
+THREAD_CALLBACK(serverloop) {
+    while (runServer)
+        UA_Server_run_iterate(server, true);
+    return 0;
 }
 
-static void stopListening(void) {
-    if (eventLoop) {
-        eventLoop->stop(eventLoop);
+static void clientStateCallback(UA_Client *c,
+                      UA_SecureChannelState channelState,
+                      UA_SessionState sessionState,
+                          UA_StatusCode connectStatus) {
+    assert(numClientCallbackCalled < (int)(sizeof(clientCallbackStates) / sizeof(UA_SecureChannelState)));
+    clientCallbackStates[numClientCallbackCalled++] = channelState;
 
-        for (int i = 0; i < max_stop_iteration_count && eventLoop->state != UA_EVENTLOOPSTATE_STOPPED; ++i) {
-            UA_DateTime next = eventLoop->run(eventLoop, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-        }
-
-        eventLoop->free(eventLoop);
-        eventLoop = NULL;
-        connectionManager = NULL;
-    }
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                 "Client state callback called with state %d", channelState);
 }
 
 static void setup(void) {
-    for (int i = 0; i < numCallbackCalled; ++i)
-        callbackStates[i] = UA_SECURECHANNELSTATE_FRESH;
+    for (int i = 0; i < numServerCallbackCalled; ++i)
+        serverCallbackStates[i] = UA_SECURECHANNELSTATE_FRESH;
 
-    numCallbackCalled = 0;
-    reverseConnectHandle = 0;
-    listening = false;
-    rheReceived = false;
+    for (int i = 0; i < numClientCallbackCalled; ++i)
+        clientCallbackStates[i] = UA_SECURECHANNELSTATE_FRESH;
 
-    setupListeningSocket();
+    numServerCallbackCalled = 0;
+    reverseConnectHandle = 0;
+    numClientCallbackCalled = 0;
 
     server = UA_Server_new();
     ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_Client_getConfig(client)->stateCallback = clientStateCallback;
 }
 
 static void teardown(void) {
+    if (runServer) {
+        runServer = false;
+        THREAD_JOIN(server_thread);
+    }
+
     UA_Server_delete(server);
-    stopListening();
+    UA_Client_delete(client);
 }
 
-static void stateCallback(UA_Server *s, UA_UInt64 handle,
+static void serverStateCallback(UA_Server *s, UA_UInt64 handle,
                           UA_SecureChannelState state,
                           void *context) {
-    callbackStates[numCallbackCalled++] = state;
+    serverCallbackStates[numServerCallbackCalled++] = state;
 
     ck_assert_ptr_eq(server, s);
     ck_assert_ptr_eq(context, (void *)1234);
@@ -141,39 +93,95 @@ static void stateCallback(UA_Server *s, UA_UInt64 handle,
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                  "Reverse connect callback called with state %d", state);
-
 }
 
+START_TEST(listenAndTeardown) {
+    UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_Server_delete(server);
+    server = NULL;
+
+    const UA_String listenHost = UA_STRING("127.0.0.1");
+    ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
+    for (int i = 0; i < 10; ++i) {
+        UA_Client_run_iterate(client, 1);
+        UA_fakeSleep(1000);
+    }
+
+    ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_BADINVALIDSTATE);
+
+    UA_Client_disconnect(client);
+
+    ck_assert_int_ge(numClientCallbackCalled, 3);
+    ck_assert_int_eq(clientCallbackStates[0], UA_SECURECHANNELSTATE_REVERSE_LISTENING);
+    ck_assert_int_eq(clientCallbackStates[1], UA_SECURECHANNELSTATE_CLOSING);
+    ck_assert_int_eq(clientCallbackStates[2], UA_SECURECHANNELSTATE_CLOSED);
+
+} END_TEST
+
+START_TEST(noListenWhileConnected) {
+    UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
+
+    runServer = true;
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+
+    UA_Client_connect(client, "opc.tcp://127.0.0.1");
+
+    ck_assert_int_gt(numClientCallbackCalled, 5);
+    ck_assert_int_eq(clientCallbackStates[3], UA_SECURECHANNELSTATE_OPEN);
+
+    const UA_String listenHost = UA_STRING("127.0.0.1");
+    ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_BADINVALIDSTATE);
+
+    UA_Client_disconnect(client);
+
+    ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+} END_TEST
+
 START_TEST(addBeforeStart) {
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
-    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
-                                      stateCallback, (void *)1234, &reverseConnectHandle);
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
+                                      serverStateCallback, (void *)1234, &reverseConnectHandle);
 
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
     ck_assert_uint_ne(reverseConnectHandle, 0);
 
+    const UA_String listenHost = UA_STRING("127.0.0.1");
+    ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
     for (int i = 0; i < 100; ++i) {
-        UA_Server_run_iterate(server, true);
-        eventLoop->run(eventLoop, 1);
-
-        if (i == 10)
-            UA_Server_removeReverseConnect(server, reverseConnectHandle);
-
-        UA_fakeSleep(1);
+        UA_Server_run_iterate(server, false);
+        UA_Client_run_iterate(client, 1);
+        UA_fakeSleep(1000);
     }
 
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    ck_assert_int_eq(numCallbackCalled, 3);
-    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
-    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
-    ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CLOSED);
-    ck_assert(rheReceived);
+    ck_assert_int_eq(numServerCallbackCalled, 5);
+    ck_assert_int_eq(serverCallbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(serverCallbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+    ck_assert_int_eq(serverCallbackStates[2], UA_SECURECHANNELSTATE_ACK_SENT);
+    ck_assert_int_eq(serverCallbackStates[3], UA_SECURECHANNELSTATE_OPEN);
+    ck_assert_int_eq(serverCallbackStates[4], UA_SECURECHANNELSTATE_CLOSED);
+
+    ck_assert_int_gt(numClientCallbackCalled, 5);
+    ck_assert_int_eq(clientCallbackStates[0], UA_SECURECHANNELSTATE_REVERSE_LISTENING);
+    ck_assert_int_eq(clientCallbackStates[1], UA_SECURECHANNELSTATE_REVERSE_CONNECTED);
+    ck_assert_int_eq(clientCallbackStates[2], UA_SECURECHANNELSTATE_HEL_SENT);
+    ck_assert_int_eq(clientCallbackStates[3], UA_SECURECHANNELSTATE_OPN_SENT);
+    ck_assert_int_eq(clientCallbackStates[4], UA_SECURECHANNELSTATE_OPEN);
 } END_TEST
 
 START_TEST(addAfterStart) {
@@ -182,13 +190,17 @@ START_TEST(addAfterStart) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
+    const UA_String listenHost = UA_STRING("127.0.0.1");
+    ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
     for (int i = 0; i < 100; ++i) {
         UA_Server_run_iterate(server, true);
-        eventLoop->run(eventLoop, 1);
+        UA_Client_run_iterate(client, 1);
 
         if (i == 10) {
-            ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
-                                              stateCallback, (void *)1234, &reverseConnectHandle);
+            ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
+                                              serverStateCallback, (void *)1234, &reverseConnectHandle);
 
             ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
             ck_assert_uint_ne(reverseConnectHandle, 0);
@@ -203,126 +215,130 @@ START_TEST(addAfterStart) {
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    ck_assert_int_eq(numCallbackCalled, 3);
-    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
-    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
-    ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CLOSED);
-    ck_assert(rheReceived);
+    ck_assert_int_eq(numServerCallbackCalled, 5);
+    ck_assert_int_eq(serverCallbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(serverCallbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+    ck_assert_int_eq(serverCallbackStates[2], UA_SECURECHANNELSTATE_ACK_SENT);
+    ck_assert_int_eq(serverCallbackStates[3], UA_SECURECHANNELSTATE_OPEN);
+    ck_assert_int_eq(serverCallbackStates[4], UA_SECURECHANNELSTATE_CLOSED);
 } END_TEST
 
 START_TEST(checkReconnect) {
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
-    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
-                                      stateCallback, (void *)1234, &reverseConnectHandle);
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
+                                      serverStateCallback, (void *)1234, &reverseConnectHandle);
 
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
     ck_assert_uint_ne(reverseConnectHandle, 0);
 
+    const UA_String listenHost = UA_STRING("127.0.0.1");
+    ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
     for (int i = 0; i < 100; ++i) {
         UA_Server_run_iterate(server, true);
-        if (eventLoop)
-            eventLoop->run(eventLoop, 1);
+        UA_Client_run_iterate(client, 1);
 
-        if (i == 10) {
-            ck_assert_int_eq(numCallbackCalled, 2);
-            ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
-            ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+        if (i == 50) {
+            ck_assert_int_eq(numServerCallbackCalled, 4);
+            ck_assert_int_eq(serverCallbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+            ck_assert_int_eq(serverCallbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+            ck_assert_int_eq(serverCallbackStates[2], UA_SECURECHANNELSTATE_ACK_SENT);
+            ck_assert_int_eq(serverCallbackStates[3], UA_SECURECHANNELSTATE_OPEN);
 
             UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                         "Stop listening and wait for reconnect");
-            stopListening();
 
-            UA_EventLoop *e = UA_Server_getConfig(server)->eventLoop;
-            UA_DateTime next = e->run(e, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+            ret = UA_Client_disconnectAsync(client);
+            ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-            ck_assert_int_eq(numCallbackCalled, 3);
-            ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CONNECTING);
+            for (int j = 0; j < 5; ++j) {
+                UA_Client_run_iterate(client, 1);
+                UA_Server_run_iterate(server, true);
+            }
 
-            setupListeningSocket();
+            ck_assert_int_eq(numServerCallbackCalled, 6);
+            ck_assert_int_eq(serverCallbackStates[4], UA_SECURECHANNELSTATE_CLOSING);
+            ck_assert_int_eq(serverCallbackStates[5], UA_SECURECHANNELSTATE_CONNECTING);
 
-            ck_assert(listening);
+            ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+            ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
             UA_fakeSleep(UA_Server_getConfig(server)->reverseReconnectInterval + 1000);
 
-            next = e->run(e, 1);
+            UA_EventLoop *serverLoop = UA_Server_getConfig(server)->eventLoop;
+            UA_DateTime next = serverLoop->run(serverLoop, 1);
             UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
 
-            if (eventLoop)
-                eventLoop->run(eventLoop, 1);
+            for (int j = 0; j < 5; ++j) {
+                UA_Client_run_iterate(client, 1);
+                next = serverLoop->run(serverLoop, 1);
+                UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+            }
 
-            next = e->run(e, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+            ck_assert_int_eq(numServerCallbackCalled, 9);
+            ck_assert_int_eq(serverCallbackStates[6], UA_SECURECHANNELSTATE_RHE_SENT);
+            ck_assert_int_eq(serverCallbackStates[7], UA_SECURECHANNELSTATE_ACK_SENT);
+            ck_assert_int_eq(serverCallbackStates[8], UA_SECURECHANNELSTATE_OPEN);
 
-            if (eventLoop)
-                eventLoop->run(eventLoop, 1);
-
-            next = e->run(e, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-
-            ck_assert_int_eq(numCallbackCalled, 4);
-            ck_assert_int_eq(callbackStates[3], UA_SECURECHANNELSTATE_RHE_SENT);
         }
 
-        if (i == 50)
+        if (i == 80)
             UA_Server_removeReverseConnect(server, reverseConnectHandle);
 
-        UA_fakeSleep(1);
+        UA_fakeSleep(1000);
     }
 
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    ck_assert_int_eq(numCallbackCalled, 5);
-    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
-    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
-    ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CONNECTING);
-    ck_assert_int_eq(callbackStates[3], UA_SECURECHANNELSTATE_RHE_SENT);
-    ck_assert_int_eq(callbackStates[4], UA_SECURECHANNELSTATE_CLOSED);
-
-    ck_assert(rheReceived);
+    ck_assert_int_eq(numServerCallbackCalled, 10);
+    ck_assert_int_eq(serverCallbackStates[9], UA_SECURECHANNELSTATE_CLOSED);
 } END_TEST
 
 START_TEST(removeOnShutdownWithConnection) {
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
-    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
-                                      stateCallback, (void *)1234, &reverseConnectHandle);
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
+                                      serverStateCallback, (void *)1234, &reverseConnectHandle);
 
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
     ck_assert_uint_ne(reverseConnectHandle, 0);
 
+    const UA_String listenHost = UA_STRING("127.0.0.1");
+    ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for (int i = 0; i < 100; ++i) {
+    for (int i = 0; i < 20; ++i) {
         UA_Server_run_iterate(server, true);
-        eventLoop->run(eventLoop, 1);
+        UA_Client_run_iterate(client, 100);
 
-        UA_fakeSleep(1);
+        UA_fakeSleep(1000);
     }
 
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    ck_assert_int_eq(numCallbackCalled, 3);
-    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
-    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
-    ck_assert_int_eq(callbackStates[2], UA_SECURECHANNELSTATE_CLOSED);
-    ck_assert(rheReceived);
+    ck_assert_int_eq(numServerCallbackCalled, 5);
+    ck_assert_int_eq(serverCallbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(serverCallbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
+    ck_assert_int_eq(serverCallbackStates[2], UA_SECURECHANNELSTATE_ACK_SENT);
+    ck_assert_int_eq(serverCallbackStates[3], UA_SECURECHANNELSTATE_OPEN);
+    ck_assert_int_eq(serverCallbackStates[4], UA_SECURECHANNELSTATE_CLOSED);
 } END_TEST
 
 START_TEST(removeOnShutdownWithoutConnection) {
-    stopListening();
-
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
-    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
-                                      stateCallback, (void *)1234, &reverseConnectHandle);
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
+                                      serverStateCallback, (void *)1234, &reverseConnectHandle);
 
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
     ck_assert_uint_ne(reverseConnectHandle, 0);
@@ -330,7 +346,7 @@ START_TEST(removeOnShutdownWithoutConnection) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for (int i = 0; i < 100; ++i) {
+    for (int i = 0; i < 20; ++i) {
         UA_Server_run_iterate(server, true);
         UA_fakeSleep(1);
     }
@@ -338,9 +354,9 @@ START_TEST(removeOnShutdownWithoutConnection) {
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    ck_assert_int_eq(numCallbackCalled, 2);
-    ck_assert_int_eq(callbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
-    ck_assert_int_eq(callbackStates[1], UA_SECURECHANNELSTATE_CLOSED);
+    ck_assert_int_eq(numServerCallbackCalled, 2);
+    ck_assert_int_eq(serverCallbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
+    ck_assert_int_eq(serverCallbackStates[1], UA_SECURECHANNELSTATE_CLOSED);
 } END_TEST
 
 int main(void) {
@@ -348,6 +364,8 @@ int main(void) {
 
     TCase *tc_call = tcase_create("basics");
     tcase_add_checked_fixture(tc_call, setup, teardown);
+    tcase_add_test(tc_call, listenAndTeardown);
+    tcase_add_test(tc_call, noListenWhileConnected);
     tcase_add_test(tc_call, addBeforeStart);
     tcase_add_test(tc_call, addAfterStart);
     tcase_add_test(tc_call, checkReconnect);

From 75eac5c32d898b5df8f0f5da0e5160016dc6d725 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Mar 2023 09:03:55 +0100
Subject: [PATCH 0757/1963] refactor(deps): Factor out subroutines from ziptree
 unzipping

---
 deps/ziptree.c | 75 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 2d06f3ddca0..d815a8f768a 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -250,6 +250,45 @@ __ZIP_ZIP(unsigned short fieldoffset, void *left, void *right) {
     return root;
 }
 
+/* Walk down from cur and move all elements <= split-key to the left side. All
+ * elements that are moved over have to be below left_rightmost. Returns the
+ * hierarchy of elements that remain on the right side. */
+static void
+__ZIP_UNZIP_MOVE_LEFT(zip_cmp_cb cmp, unsigned short fieldoffset,
+                      unsigned short keyoffset, const void *key,
+                      zip_elem **fix_edge, zip_elem *cur) {
+    while(ZIP_ENTRY_PTR(cur)->left) {
+        zip_elem *next = ZIP_ENTRY_PTR(cur)->left;
+        if(cmp(key, ZIP_KEY_PTR(next)) == ZIP_CMP_LESS) {
+            cur = next;
+            continue;
+        }
+        *fix_edge = next;
+        ZIP_ENTRY_PTR(cur)->left = ZIP_ENTRY_PTR(next)->right;
+        ZIP_ENTRY_PTR(next)->right = NULL;
+        fix_edge = &ZIP_ENTRY_PTR(next)->right;
+    }
+}
+
+static void
+__ZIP_UNZIP_MOVE_RIGHT(zip_cmp_cb cmp, unsigned short fieldoffset,
+                       unsigned short keyoffset, const void *key,
+                       zip_elem **fix_edge, zip_elem *cur) {
+    while(ZIP_ENTRY_PTR(cur)->right) {
+        zip_elem *next = ZIP_ENTRY_PTR(cur)->right;
+        if(cmp(key, ZIP_KEY_PTR(next)) != ZIP_CMP_LESS) {
+            cur = next;
+            continue;
+        }
+        *fix_edge = next;
+        ZIP_ENTRY_PTR(cur)->right = ZIP_ENTRY_PTR(next)->left;
+        ZIP_ENTRY_PTR(next)->left = NULL;
+        fix_edge = &ZIP_ENTRY_PTR(next)->left;
+    }
+}
+
+/* Split the tree into a left side with keys <= split-key and a right side with
+ * key > split-key. */
 void
 __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
             unsigned short keyoffset, const void *key,
@@ -263,10 +302,8 @@ __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
         right->root = NULL;
         return;
     }
-
     zip_elem *cur = head->root;
-    enum ZIP_CMP head_order = cmp(key, ZIP_KEY_PTR(cur));
-    if(head_order != ZIP_CMP_LESS) {
+    if(cmp(key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS) {
         left->root = cur;
         do {
             prev = cur;
@@ -276,20 +313,10 @@ __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
                 return;
             }
         } while(cmp(key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS);
-        right->root = cur;
         ZIP_ENTRY_PTR(prev)->right = NULL;
-        zip_elem *left_rightmost = prev;
-        while(ZIP_ENTRY_PTR(cur)->left) {
-            prev = cur;
-            cur = ZIP_ENTRY_PTR(cur)->left;
-            if(cmp(key, ZIP_KEY_PTR(cur)) != ZIP_CMP_LESS) {
-                ZIP_ENTRY_PTR(prev)->left = ZIP_ENTRY_PTR(cur)->right;
-                ZIP_ENTRY_PTR(cur)->right = NULL;
-                ZIP_ENTRY_PTR(left_rightmost)->right = cur;
-                left_rightmost = cur;
-                cur = prev;
-            }
-        }
+        right->root = cur;
+        __ZIP_UNZIP_MOVE_LEFT(cmp, fieldoffset, keyoffset, key,
+                              &ZIP_ENTRY_PTR(prev)->right, cur);
     } else {
         right->root = cur;
         do {
@@ -300,19 +327,9 @@ __ZIP_UNZIP(zip_cmp_cb cmp, unsigned short fieldoffset,
                 return;
             }
         } while(cmp(key, ZIP_KEY_PTR(cur)) == ZIP_CMP_LESS);
-        left->root = cur;
         ZIP_ENTRY_PTR(prev)->left = NULL;
-        zip_elem *right_leftmost = prev;
-        while(ZIP_ENTRY_PTR(cur)->right) {
-            prev = cur;
-            cur = ZIP_ENTRY_PTR(cur)->right;
-            if(cmp(key, ZIP_KEY_PTR(cur)) == ZIP_CMP_LESS) {
-                ZIP_ENTRY_PTR(prev)->right = ZIP_ENTRY_PTR(cur)->left;
-                ZIP_ENTRY_PTR(cur)->left = NULL;
-                ZIP_ENTRY_PTR(right_leftmost)->left = cur;
-                right_leftmost = cur;
-                cur = prev;
-            }
-        }
+        left->root = cur;
+        __ZIP_UNZIP_MOVE_RIGHT(cmp, fieldoffset, keyoffset, key,
+                               &ZIP_ENTRY_PTR(prev)->left, cur);
     }
 }

From 602e9b43633259e708c344ef1f74b147fa35c704 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Mar 2023 15:08:39 +0100
Subject: [PATCH 0758/1963] refactor(deps): Rename __ZIP_KEY_CMP to
 __ZIP_UNIQUE_CMP

---
 deps/ziptree.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index d815a8f768a..546ea349fed 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -40,7 +40,7 @@ __ZIP_RANK_CMP(const void *p1, const void *p2) {
 }
 
 static ZIP_INLINE enum ZIP_CMP
-__ZIP_KEY_CMP(zip_cmp_cb cmp, const void *p1, const void *p2) {
+__ZIP_UNIQUE_CMP(zip_cmp_cb cmp, const void *p1, const void *p2) {
     if(p1 == p2)
         return ZIP_CMP_EQ;
     enum ZIP_CMP order = cmp(p1, p2);
@@ -57,10 +57,10 @@ __ZIP_VALIDATE(zip_cmp_cb cmp, unsigned short fieldoffset,
                void *min_elm, void *max_elm) {
     if(!elm)
         return;
-    enum ZIP_CMP c1 = __ZIP_KEY_CMP(cmp, ZIP_KEY_PTR(min_elm), ZIP_KEY_PTR(elm));
+    enum ZIP_CMP c1 = __ZIP_UNIQUE_CMP(cmp, ZIP_KEY_PTR(min_elm), ZIP_KEY_PTR(elm));
     assert((elm == min_elm && c1 == ZIP_CMP_EQ) || c1 == ZIP_CMP_LESS);
 
-    enum ZIP_CMP c2 = __ZIP_KEY_CMP(cmp, ZIP_KEY_PTR(max_elm), ZIP_KEY_PTR(elm));
+    enum ZIP_CMP c2 = __ZIP_UNIQUE_CMP(cmp, ZIP_KEY_PTR(max_elm), ZIP_KEY_PTR(elm));
     assert((elm == max_elm && c2 == ZIP_CMP_EQ) || c2 == ZIP_CMP_MORE);
 
     assert(!ZIP_ENTRY_PTR(elm)->right ||
@@ -93,7 +93,7 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
     do {
         if(x == cur)
             return;
-        cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
+        cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
         if(__ZIP_RANK_CMP(x, cur) == ZIP_CMP_MORE)
             break;
         prev = cur;
@@ -129,7 +129,7 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
                 cur = ZIP_ENTRY_PTR(cur)->right;
                 if(!cur)
                     break;
-                cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
+                cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
             } while(cur_order == ZIP_CMP_MORE);
         } else {
             do {
@@ -137,12 +137,12 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
                 cur = ZIP_ENTRY_PTR(cur)->left;
                 if(!cur)
                     break;
-                cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
+                cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
             } while(cur_order == ZIP_CMP_LESS);
         }
 
-        if(__ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(fix)) == ZIP_CMP_LESS ||
-           (fix == x && __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(prev)) == ZIP_CMP_LESS))
+        if(__ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(fix)) == ZIP_CMP_LESS ||
+           (fix == x && __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(prev)) == ZIP_CMP_LESS))
             ZIP_ENTRY_PTR(fix)->left = cur;
         else
             ZIP_ENTRY_PTR(fix)->right = cur;
@@ -160,14 +160,14 @@ __ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
 
     const void *x_key = ZIP_KEY_PTR(x);
     zip_elem **prev_edge = &head->root;
-    enum ZIP_CMP cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
+    enum ZIP_CMP cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
     while(cur_order != ZIP_CMP_EQ) {
         prev_edge = (cur_order == ZIP_CMP_LESS) ?
             &ZIP_ENTRY_PTR(cur)->left : &ZIP_ENTRY_PTR(cur)->right;
         cur = *prev_edge;
         if(!cur)
             return;
-        cur_order = __ZIP_KEY_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
+        cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
     }
     *prev_edge = (zip_elem*)__ZIP_ZIP(fieldoffset,
                                       ZIP_ENTRY_PTR(cur)->left,

From fd2d5743335a6d7155dc7a0c8ad59b0866b98e19 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Mar 2023 17:28:10 +0100
Subject: [PATCH 0759/1963] refactor(deps): Factor out sub-routines of
 ZIP_INSERT

---
 deps/ziptree.c | 81 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 32 deletions(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 546ea349fed..63c90eab52f 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -73,6 +73,42 @@ __ZIP_VALIDATE(zip_cmp_cb cmp, unsigned short fieldoffset,
 }
 #endif
 
+/* Walk down the right-side spine of cur. Elements that are larger than x_key
+ * are moved under x->right. */
+static void
+__ZIP_INSERT_MOVE_RIGHT(zip_cmp_cb cmp, unsigned short fieldoffset,
+                        unsigned short keyoffset, const void *x_key,
+                        zip_elem **fix_edge, zip_elem *cur) {
+    while(ZIP_ENTRY_PTR(cur)->right) {
+        zip_elem *move_candidate = ZIP_ENTRY_PTR(cur)->right;
+        if(__ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(move_candidate)) == ZIP_CMP_MORE) {
+            cur = ZIP_ENTRY_PTR(cur)->right;
+            continue;
+        }
+        ZIP_ENTRY_PTR(cur)->right = ZIP_ENTRY_PTR(move_candidate)->left;
+        ZIP_ENTRY_PTR(move_candidate)->left = NULL;
+        *fix_edge = move_candidate;
+        fix_edge = &ZIP_ENTRY_PTR(move_candidate)->left;
+    }
+}
+
+static void
+__ZIP_INSERT_MOVE_LEFT(zip_cmp_cb cmp, unsigned short fieldoffset,
+                       unsigned short keyoffset, const void *x_key,
+                       zip_elem **fix_edge, zip_elem *cur) {
+    while(ZIP_ENTRY_PTR(cur)->left) {
+        zip_elem *move_candidate = ZIP_ENTRY_PTR(cur)->left;
+        if(__ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(move_candidate)) == ZIP_CMP_LESS) {
+            cur = ZIP_ENTRY_PTR(cur)->left;
+            continue;
+        }
+        ZIP_ENTRY_PTR(cur)->left = ZIP_ENTRY_PTR(move_candidate)->right;
+        ZIP_ENTRY_PTR(move_candidate)->right = NULL;
+        *fix_edge = move_candidate;
+        fix_edge = &ZIP_ENTRY_PTR(move_candidate)->right;
+    }
+}
+
 void
 __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
              unsigned short keyoffset, void *elm) {
@@ -87,14 +123,16 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
         return;
     }
 
+    /* Go down the tree to find the top element "cur" that has a rank smaller
+     * than "x" */
     zip_elem *prev = NULL;
     zip_elem *cur = head->root;
     enum ZIP_CMP cur_order, prev_order;
     do {
-        if(x == cur)
-            return;
         cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
-        if(__ZIP_RANK_CMP(x, cur) == ZIP_CMP_MORE)
+        if(cur_order == ZIP_CMP_EQ)
+            return; /* x is already inserted */
+        if(__ZIP_RANK_CMP(cur, x) == ZIP_CMP_LESS)
             break;
         prev = cur;
         prev_order = cur_order;
@@ -102,6 +140,7 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
             ZIP_ENTRY_PTR(cur)->right : ZIP_ENTRY_PTR(cur)->left;
     } while(cur);
 
+    /* Insert "x" instead of "cur" under its parent "prev" */
     if(cur == head->root) {
         head->root = x;
     } else {
@@ -114,39 +153,17 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
     if(!cur)
         return;
 
-    if(cur_order != ZIP_CMP_LESS) {
+    /* Re-insert "cur" under "x". Repair by moving elements that ended up on the
+     * wrong side of "x". */
+    if(cur_order == ZIP_CMP_MORE) {
         ZIP_ENTRY_PTR(x)->left = cur;
+        __ZIP_INSERT_MOVE_RIGHT(cmp, fieldoffset, keyoffset,
+                                x_key, &ZIP_ENTRY_PTR(x)->right, cur);
     } else {
         ZIP_ENTRY_PTR(x)->right = cur;
+        __ZIP_INSERT_MOVE_LEFT(cmp, fieldoffset, keyoffset,
+                               x_key, &ZIP_ENTRY_PTR(x)->left, cur);
     }
-
-    prev = x;
-    do {
-        zip_elem *fix = prev;
-        if(cur_order == ZIP_CMP_MORE) {
-            do {
-                prev = cur;
-                cur = ZIP_ENTRY_PTR(cur)->right;
-                if(!cur)
-                    break;
-                cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
-            } while(cur_order == ZIP_CMP_MORE);
-        } else {
-            do {
-                prev = cur;
-                cur = ZIP_ENTRY_PTR(cur)->left;
-                if(!cur)
-                    break;
-                cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
-            } while(cur_order == ZIP_CMP_LESS);
-        }
-
-        if(__ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(fix)) == ZIP_CMP_LESS ||
-           (fix == x && __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(prev)) == ZIP_CMP_LESS))
-            ZIP_ENTRY_PTR(fix)->left = cur;
-        else
-            ZIP_ENTRY_PTR(fix)->right = cur;
-    } while(cur);
 }
 
 void

From dab5ee22a97ff262868a3ae4fbc189ee90dcd0d9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Mar 2023 09:33:01 +0100
Subject: [PATCH 0760/1963] fix(test): Replace assert with ck_assert in
 check_server_reverseconnect.c

---
 tests/server/check_server_reverseconnect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
index 60c45988dee..baa23915a0c 100644
--- a/tests/server/check_server_reverseconnect.c
+++ b/tests/server/check_server_reverseconnect.c
@@ -45,7 +45,7 @@ static void clientStateCallback(UA_Client *c,
                       UA_SecureChannelState channelState,
                       UA_SessionState sessionState,
                           UA_StatusCode connectStatus) {
-    assert(numClientCallbackCalled < (int)(sizeof(clientCallbackStates) / sizeof(UA_SecureChannelState)));
+    ck_assert(numClientCallbackCalled < (int)(sizeof(clientCallbackStates) / sizeof(UA_SecureChannelState)));
     clientCallbackStates[numClientCallbackCalled++] = channelState;
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,

From d6fae867ce4d434661a753088506b70f3f799984 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Mar 2023 09:26:18 +0100
Subject: [PATCH 0761/1963] refactor(deps): Always inline ZIP_FIND

---
 arch/common/ua_timer.c |  4 ++--
 deps/ziptree.c         | 15 ---------------
 deps/ziptree.h         | 25 ++++++++++++++-----------
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index 3cf925683ea..2b6ec7f460c 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -34,8 +34,8 @@ cmpId(const UA_UInt64 *a, const UA_UInt64 *b) {
     return ZIP_CMP_MORE;
 }
 
-ZIP_FUNCTIONS(UA_TimerTree, UA_TimerEntry, treeEntry, UA_DateTime, nextTime, (zip_cmp_cb)cmpDateTime)
-ZIP_FUNCTIONS(UA_TimerIdTree, UA_TimerEntry, idTreeEntry, UA_UInt64, id, (zip_cmp_cb)cmpId)
+ZIP_FUNCTIONS(UA_TimerTree, UA_TimerEntry, treeEntry, UA_DateTime, nextTime, cmpDateTime)
+ZIP_FUNCTIONS(UA_TimerIdTree, UA_TimerEntry, idTreeEntry, UA_UInt64, id, cmpId)
 
 static UA_DateTime
 calculateNextTime(UA_DateTime currentTime, UA_DateTime baseTime,
diff --git a/deps/ziptree.c b/deps/ziptree.c
index 63c90eab52f..38b8414df38 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -191,21 +191,6 @@ __ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
                                       ZIP_ENTRY_PTR(cur)->right);
 }
 
-void *
-__ZIP_FIND(zip_cmp_cb cmp, unsigned short fieldoffset,
-           unsigned short keyoffset, void *cur, const void *key) {
-    while(cur) {
-        enum ZIP_CMP eq = cmp(key, ZIP_KEY_PTR(cur));
-        if(eq == ZIP_CMP_EQ)
-            return cur;
-        if(eq == ZIP_CMP_LESS)
-            cur = ZIP_ENTRY_PTR(cur)->left;
-        else
-            cur = ZIP_ENTRY_PTR(cur)->right;
-    }
-    return NULL;
-}
-
 void *
 __ZIP_MIN(unsigned short fieldoffset, void *elm) {
     if(!elm)
diff --git a/deps/ziptree.h b/deps/ziptree.h
index 44be512ae4b..72e326624cb 100644
--- a/deps/ziptree.h
+++ b/deps/ziptree.h
@@ -95,21 +95,29 @@ typedef void * (*zip_iter_cb)(void *context, void *elm);
                                                                         \
 ZIP_UNUSED static ZIP_INLINE void                                       \
 name##_ZIP_INSERT(struct name *head, struct type *el) {                 \
-    __ZIP_INSERT(head, cmp, offsetof(struct type, field),               \
+    __ZIP_INSERT(head, (zip_cmp_cb)cmp, offsetof(struct type, field),   \
                  offsetof(struct type, keyfield), el);                  \
 }                                                                       \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE void                                       \
 name##_ZIP_REMOVE(struct name *head, struct type *elm) {                \
-    __ZIP_REMOVE(head, cmp, offsetof(struct type, field),               \
+    __ZIP_REMOVE(head, (zip_cmp_cb)cmp, offsetof(struct type, field),   \
                  offsetof(struct type, keyfield), elm);                 \
 }                                                                       \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE struct type *                              \
 name##_ZIP_FIND(struct name *head, const keytype *key) {                \
-    return (struct type*)__ZIP_FIND(cmp, offsetof(struct type, field),  \
-                                    offsetof(struct type, keyfield),    \
-                                    ZIP_ROOT(head), key);               \
+    struct type *cur = ZIP_ROOT(head);                                  \
+    while(cur) {                                                        \
+        enum ZIP_CMP eq = cmp(key, &cur->keyfield);                     \
+        if(eq == ZIP_CMP_EQ)                                            \
+            break;                                                      \
+        if(eq == ZIP_CMP_LESS)                                          \
+            cur = ZIP_LEFT(cur, field);                                 \
+        else                                                            \
+            cur = ZIP_RIGHT(cur, field);                                \
+    }                                                                   \
+    return cur;                                                         \
 }                                                                       \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE struct type *                              \
@@ -141,7 +149,7 @@ name##_ZIP_ZIP(struct type *left, struct type *right) {                 \
 ZIP_UNUSED static ZIP_INLINE void                                       \
 name##_ZIP_UNZIP(struct name *head, const keytype *key,                 \
                  struct name *left, struct name *right) {               \
-    __ZIP_UNZIP(cmp, offsetof(struct type, field),                      \
+    __ZIP_UNZIP((zip_cmp_cb)cmp, offsetof(struct type, field),          \
                 offsetof(struct type, keyfield), key,                   \
                 head, left, right);                                     \
 }
@@ -156,11 +164,6 @@ void
 __ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
              unsigned short keyoffset, void *elm);
 
-void *
-__ZIP_FIND(zip_cmp_cb cmp, unsigned short fieldoffset,
-           unsigned short keyoffset, void *root,
-           const void *key);
-
 void *
 __ZIP_ITER(unsigned short fieldoffset, zip_iter_cb cb,
            void *context, void *elm);

From eec86d3df193ce383cc7b41dd08200cacc7a0862 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Mar 2023 17:34:04 +0100
Subject: [PATCH 0762/1963] refactor(deps): Inline ZIP_MIN and ZIP_MAX

---
 deps/ziptree.c | 20 --------------------
 deps/ziptree.h | 21 ++++++++++++++-------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 38b8414df38..428ad281389 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -191,26 +191,6 @@ __ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
                                       ZIP_ENTRY_PTR(cur)->right);
 }
 
-void *
-__ZIP_MIN(unsigned short fieldoffset, void *elm) {
-    if(!elm)
-        return NULL;
-    while(ZIP_ENTRY_PTR(elm)->left) {
-        elm = ZIP_ENTRY_PTR(elm)->left;
-    }
-    return elm;
-}
-
-void *
-__ZIP_MAX(unsigned short fieldoffset, void *elm) {
-    if(!elm)
-        return NULL;
-    while(ZIP_ENTRY_PTR(elm)->right) {
-        elm = ZIP_ENTRY_PTR(elm)->right;
-    }
-    return elm;
-}
-
 void *
 __ZIP_ITER(unsigned short fieldoffset, zip_iter_cb cb,
            void *context, void *elm) {
diff --git a/deps/ziptree.h b/deps/ziptree.h
index 72e326624cb..73506829cb1 100644
--- a/deps/ziptree.h
+++ b/deps/ziptree.h
@@ -122,14 +122,24 @@ name##_ZIP_FIND(struct name *head, const keytype *key) {                \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE struct type *                              \
 name##_ZIP_MIN(struct name *head) {                                     \
-    return (struct type *)__ZIP_MIN(offsetof(struct type, field),       \
-                                    ZIP_ROOT(head));                    \
+    struct type *cur = ZIP_ROOT(head);                                  \
+    if(!cur)                                                            \
+        return NULL;                                                    \
+    while(ZIP_LEFT(cur, field)) {                                       \
+        cur = ZIP_LEFT(cur, field);                                     \
+    }                                                                   \
+    return cur;                                                         \
 }                                                                       \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE struct type *                              \
 name##_ZIP_MAX(struct name *head) {                                     \
-    return (struct type *)__ZIP_MAX(offsetof(struct type, field),       \
-                                    ZIP_ROOT(head));                    \
+    struct type *cur = ZIP_ROOT(head);                                  \
+    if(!cur)                                                            \
+        return NULL;                                                    \
+    while(ZIP_RIGHT(cur, field)) {                                      \
+        cur = ZIP_RIGHT(cur, field);                                    \
+    }                                                                   \
+    return cur;                                                         \
 }                                                                       \
                                                                         \
 typedef void * (*name##_cb)(void *context, struct type *elm);           \
@@ -168,9 +178,6 @@ void *
 __ZIP_ITER(unsigned short fieldoffset, zip_iter_cb cb,
            void *context, void *elm);
 
-void * __ZIP_MIN(unsigned short fieldoffset, void *elm);
-void * __ZIP_MAX(unsigned short fieldoffset, void *elm);
-
 void *
 __ZIP_ZIP(unsigned short fieldoffset, void *left, void *right);
 

From 6259f7399a85b473a649e884b77f2366f7cd6b5f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Mar 2023 17:53:55 +0100
Subject: [PATCH 0763/1963] feat(deps): Add ZIP_ITER_KEY that iterates only
 over elements with the given key

---
 deps/ziptree.c | 32 ++++++++++++++++++++++++++++++++
 deps/ziptree.h | 36 +++++++++++++++++++++++++-----------
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 428ad281389..24668c9d20a 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -207,6 +207,38 @@ __ZIP_ITER(unsigned short fieldoffset, zip_iter_cb cb,
     return __ZIP_ITER(fieldoffset, cb, context, right);
 }
 
+void *
+__ZIP_ITER_KEY(zip_cmp_cb cmp, unsigned short fieldoffset,
+               unsigned short keyoffset, const void *key,
+               zip_iter_cb cb, void *context, void *elm) {
+    if(!elm)
+        return NULL;
+
+    void *res;
+    enum ZIP_CMP eq = cmp(key, ZIP_KEY_PTR(elm));
+    if(eq != ZIP_CMP_MORE) {
+        res = __ZIP_ITER_KEY(cmp, fieldoffset, keyoffset, key,
+                             cb, context, ZIP_ENTRY_PTR(elm)->left);
+        if(res)
+            return res;
+    }
+
+    if(eq == ZIP_CMP_EQ) {
+        res = cb(context, elm);
+        if(res)
+            return res;
+    }
+
+    if(eq != ZIP_CMP_LESS) {
+        res = __ZIP_ITER_KEY(cmp, fieldoffset, keyoffset, key,
+                             cb, context, ZIP_ENTRY_PTR(elm)->right);
+        if(res)
+            return res;
+    }
+
+    return NULL;
+}
+
 void *
 __ZIP_ZIP(unsigned short fieldoffset, void *left, void *right) {
     if(!left)
diff --git a/deps/ziptree.h b/deps/ziptree.h
index 73506829cb1..53e89f5a978 100644
--- a/deps/ziptree.h
+++ b/deps/ziptree.h
@@ -69,6 +69,14 @@ typedef enum ZIP_CMP (*zip_cmp_cb)(const void *key1, const void *key2);
 #define ZIP_ROOT(head) (head)->root
 #define ZIP_LEFT(elm, field) (elm)->field.left
 #define ZIP_RIGHT(elm, field) (elm)->field.right
+#define ZIP_INSERT(name, head, elm) name##_ZIP_INSERT(head, elm)
+#define ZIP_REMOVE(name, head, elm) name##_ZIP_REMOVE(head, elm)
+#define ZIP_FIND(name, head, key) name##_ZIP_FIND(head, key)
+#define ZIP_MIN(name, head) name##_ZIP_MIN(head)
+#define ZIP_MAX(name, head) name##_ZIP_MAX(head)
+#define ZIP_ZIP(name, left, right) name##_ZIP_ZIP(left, right)
+#define ZIP_UNZIP(name, head, key, left, right) \
+    name##_ZIP_UNZIP(head, key, left, right)
 
 /* ZIP_ITER uses in-order traversal of the tree (in the order of the keys). The
  * memory if a node is not accessed by ZIP_ITER after the callback has been
@@ -78,19 +86,12 @@ typedef enum ZIP_CMP (*zip_cmp_cb)(const void *key1, const void *key2);
  * ZIP_ITER returns a void pointer. The first callback to return non-NULL aborts
  * the iteration. This pointer is then returned. */
 typedef void * (*zip_iter_cb)(void *context, void *elm);
+#define ZIP_ITER(name, head, cb, ctx) name##_ZIP_ITER(head, cb, ctx)
 
-/* Generate typed method definitions with the ZIP_FUNCTIONS macro */
-
-#define ZIP_INSERT(name, head, elm) name##_ZIP_INSERT(head, elm)
-#define ZIP_REMOVE(name, head, elm) name##_ZIP_REMOVE(head, elm)
-#define ZIP_FIND(name, head, key) name##_ZIP_FIND(head, key)
-#define ZIP_ITER(name, head, cb, d) name##_ZIP_ITER(head, cb, d)
-#define ZIP_MIN(name, head) name##_ZIP_MIN(head)
-#define ZIP_MAX(name, head) name##_ZIP_MAX(head)
-#define ZIP_ZIP(name, left, right) name##_ZIP_ZIP(left, right)
-#define ZIP_UNZIP(name, head, key, left, right) \
-    name##_ZIP_UNZIP(head, key, left, right)
+/* Same as _ITER, but only visits elements with the given key */
+#define ZIP_ITER_KEY(name, head, key, cb, ctx) name##_ZIP_ITER_KEY(head, key, cb, ctx)
 
+/* Macro to generate typed ziptree methods */
 #define ZIP_FUNCTIONS(name, type, field, keytype, keyfield, cmp)        \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE void                                       \
@@ -150,6 +151,14 @@ name##_ZIP_ITER(struct name *head, name##_cb cb, void *context) {       \
                       context, ZIP_ROOT(head));                         \
 }                                                                       \
                                                                         \
+ZIP_UNUSED static ZIP_INLINE void *                                     \
+name##_ZIP_ITER_KEY(struct name *head, const keytype *key,              \
+                    name##_cb cb, void *context) {                      \
+    return __ZIP_ITER_KEY((zip_cmp_cb)cmp, offsetof(struct type, field), \
+                          offsetof(struct type, keyfield), key,         \
+                          (zip_iter_cb)cb, context, ZIP_ROOT(head));    \
+}                                                                       \
+                                                                        \
 ZIP_UNUSED static ZIP_INLINE struct type *                              \
 name##_ZIP_ZIP(struct type *left, struct type *right) {                 \
     return (struct type*)                                               \
@@ -178,6 +187,11 @@ void *
 __ZIP_ITER(unsigned short fieldoffset, zip_iter_cb cb,
            void *context, void *elm);
 
+void *
+__ZIP_ITER_KEY(zip_cmp_cb cmp, unsigned short fieldoffset,
+               unsigned short keyoffset, const void *key,
+               zip_iter_cb cb, void *context, void *elm);
+
 void *
 __ZIP_ZIP(unsigned short fieldoffset, void *left, void *right);
 

From c0a36d0950f059d4e2052b19b83a0358ba0c17f8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Mar 2023 18:08:58 +0100
Subject: [PATCH 0764/1963] refactor(server): Use ZIP_ITER_KEY to speed up the
 Browse service

---
 src/server/ua_services_view.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 0923e9eb387..ff19aa12f92 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -1084,17 +1084,12 @@ UA_Server_browseNext(UA_Server *server, UA_Boolean releaseContinuationPoint,
 /* TranslateBrowsePath */
 /***********************/
 
-/* Find all entries for that hash. There are duplicate for the possible hash
- * collisions. The exact browsename is checked afterwards. */
-static UA_StatusCode
-addBrowseHashTargetRecursive(UA_UInt32 browseNameHash, UA_ReferenceTargetTreeElem *elem,
-                             RefTree *next) {
-    if(!elem || elem->target.targetNameHash != browseNameHash)
-        return UA_STATUSCODE_GOOD;
-    UA_StatusCode res = RefTree_add(next, elem->target.targetId, NULL);
-    res |= addBrowseHashTargetRecursive(browseNameHash, elem->nameTreeEntry.left, next);
-    res |= addBrowseHashTargetRecursive(browseNameHash, elem->nameTreeEntry.right, next);
-    return res;
+/* Add all entries for the hash. There are possible duplicates due to hash
+ * collisions. The full browsename is checked afterwards. */
+static void *
+addBrowseHashTarget(void *context, UA_ReferenceTargetTreeElem *elem) {
+    RefTree *next = (RefTree*)context;
+    return (void*)(uintptr_t)RefTree_add(next, elem->target.targetId, NULL);
 }
 
 static UA_StatusCode
@@ -1183,10 +1178,10 @@ walkBrowsePathElement(UA_Server *server, UA_Session *session,
              * every node just once. */
 
             if(rk->hasRefTree) {
-                UA_ReferenceTargetTreeElem *elm =
-                    ZIP_FIND(UA_ReferenceNameTree, &rk->targets.tree.nameTree,
-                             &targetHashKey);
-                res = addBrowseHashTargetRecursive(browseNameHash, elm, next);
+                res = (UA_StatusCode)(uintptr_t)
+                    ZIP_ITER_KEY(UA_ReferenceNameTree,
+                                 &rk->targets.tree.nameTree,
+                                 &targetHashKey, addBrowseHashTarget, next);
                 if(res != UA_STATUSCODE_GOOD)
                     break;
             } else {

From d409b634498c9274500869b6513fdb790d136100 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Wed, 11 Jan 2023 15:49:49 +0100
Subject: [PATCH 0765/1963] fix(pubsub): fix memleak in adding SecurityGroup
 object node

When a SecurityGroup object node is added to the information model, memory leak
is detected when copying over the SecurityGroup's browse name for the node.
This is now freed, since the name variable is deep copied onto browse name.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_ns0.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index f0e78a949b3..d28423f3309 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1751,6 +1751,7 @@ addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGrou
                      UA_StatusCode_name(retval));
         deleteNode(server, securityGroup->securityGroupNodeId, true);
     }
+    UA_free(sgName);
     return retval;
 }
 

From 9e762bd621a7ecf514dc6ac9c70007494fe1ed9b Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Wed, 11 Jan 2023 16:03:09 +0100
Subject: [PATCH 0766/1963] refactor(pubsub): cosmetic fix in adding
 SecurityGroup Object node

The security group name variable was allocated and then initialized to zero,
which is now done with single call to UA_calloc.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_ns0.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index d28423f3309..243f89bdd4d 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1717,11 +1717,10 @@ addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGrou
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     size_t sgNamelength = securityGroupConfig->securityGroupName.length;
-    char *sgName = (char *)UA_malloc(sgNamelength);
+    char *sgName = (char *)UA_calloc(1, sgNamelength + 1);
     if(!sgName)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    memset(sgName, 0, sgNamelength);
     memcpy(sgName, securityGroupConfig->securityGroupName.data,
            securityGroupConfig->securityGroupName.length);
     sgName[securityGroupConfig->securityGroupName.length] = '\0';

From 874771c98f5eba36f8fb4bca5c8332f2be43a1f6 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 12 Jan 2023 11:08:49 +0100
Subject: [PATCH 0767/1963] fix(tests): fix memleaks in sks push unit tests

The memleaks were detected in sks push unit tests when
DUA_ENABLE_UNIT_TESTS_MEMCHECK is enabled. The memleaks were caused by not
deleting client instances and not clearing generated security keys for the
unit tests. Those are fixed in this commit.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/pubsub/check_pubsub_sks_push.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index d809097e932..62de0cc3e5b 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -134,7 +134,11 @@ callSetSecurityKey(UA_Client *client, UA_String pSecurityGroupId, UA_UInt32 curr
     UA_Duration mskeyLifeTime = 2000;
     UA_Variant_setScalar(&inputs[6], &mskeyLifeTime, &UA_TYPES[UA_TYPES_DURATION]);
 
-    return UA_Client_call(client,parentId, methodId, inputSize, inputs, &outputSize, &output);
+    UA_StatusCode retval = UA_Client_call(client, parentId, methodId, inputSize, inputs, &outputSize, &output);
+    UA_ByteString_clear(&currentKey);
+    UA_Variant_clear(&inputs[4]);
+    UA_Array_delete(futureKey, futureKeySize, &UA_TYPES[UA_TYPES_BYTESTRING]);
+    return retval;
 }
 
 
@@ -246,10 +250,6 @@ teardown(void) {
     THREAD_JOIN(server_thread);
     UA_Server_run_shutdown(server);
     UA_Server_delete(server);
-    if(futureKey) {
-        UA_free(futureKey);
-        futureKey = NULL;
-    }
 }
 
 START_TEST(TestSetSecurityKeys_InsufficientSecurityMode) {
@@ -262,6 +262,7 @@ START_TEST(TestSetSecurityKeys_InsufficientSecurityMode) {
     retval = callSetSecurityKey(client, securityGroupId, 1, 2);
     ck_assert_msg(retval == UA_STATUSCODE_BADSECURITYMODEINSUFFICIENT, "Expected BAD_SECURITYMODEINSUFFICIENT but erorr code : %s \n", UA_StatusCode_name(retval));
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURITYMODEINSUFFICIENT);
+    UA_Client_delete(client);
 } END_TEST
 
 START_TEST(TestSetSecurityKeys_MissingSecurityGroup) {
@@ -270,6 +271,7 @@ START_TEST(TestSetSecurityKeys_MissingSecurityGroup) {
     UA_String wrongSecurityGroupId = UA_STRING("WrongSecurityGroupId");
     retval = callSetSecurityKey(client, wrongSecurityGroupId, 1, 2);
     ck_assert_msg(retval == UA_STATUSCODE_BADNOTFOUND, "Expected BAD_BADNOTFOUND but erorr code : %s \n", UA_StatusCode_name(retval));
+    UA_Client_delete(client);
 } END_TEST
 
 START_TEST(TestSetSecurityKeys_GOOD) {
@@ -298,6 +300,7 @@ START_TEST(TestSetSecurityKeys_GOOD) {
         startingTokenId++;
     }
     ck_assert_uint_eq(ks->keyListSize, futureKeySize+1);
+    UA_Client_delete(client);
 } END_TEST
 
 START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingList){
@@ -319,6 +322,7 @@ START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingList){
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
     ck_assert_uint_eq(ks->currentItem->keyID, currentTokenId);
+    UA_Client_delete(client);
 } END_TEST
 
 START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingListAndAddNewFutureKeys){
@@ -351,6 +355,7 @@ START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingListAndAddNewFutureKe
         iterator = TAILQ_NEXT(iterator, keyListEntry);
         startingTokenId++;
     }
+    UA_Client_delete(client);
 } END_TEST
 
 START_TEST(TestSetSecurityKeys_ReplaceExistingKeyListWithFetchedKeyList){
@@ -381,6 +386,7 @@ START_TEST(TestSetSecurityKeys_ReplaceExistingKeyListWithFetchedKeyList){
         startingTokenId++;
     }
     ck_assert_uint_eq(ks->keyListSize, futureKeySize+1);
+    UA_Client_delete(client);
 } END_TEST
 
 int

From a95a07b0b2d1e7f3fb7b316fc0658c67493c285c Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 12 Jan 2023 11:16:31 +0100
Subject: [PATCH 0768/1963] fix(pubsub): fix memleak due to currentKey in
 initializeKeyStorageWithKeys

A memleak was caused by currentKey. Its deep copy is made in
UA_PubSubKeyStorage_storeSecurityKeys before storing it in keystorage.
It is now fixed by clearing the content of the currentKey.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_securitygroup.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 9c2f6adbc1d..9103eb26218 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -178,19 +178,17 @@ initializeKeyStorageWithKeys(UA_Server *server, UA_SecurityGroup *securityGroup)
                                                    securityGroup->config.maxFutureKeyCount,
                                                    securityGroup->config.keyLifeTime);
     if(retval != UA_STATUSCODE_GOOD)
-        goto error;
+        goto cleanup;
 
     securityGroup->baseTime = UA_DateTime_nowMonotonic();
     retval = addRepeatedCallback(server, (UA_ServerCallback)updateSKSKeyStorage,
                                  securityGroup, securityGroup->config.keyLifeTime,
                                  &securityGroup->callbackId);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto error;
-
-    return UA_STATUSCODE_GOOD;
 
-error:
-    UA_PubSubKeyStorage_delete(server, ks);
+cleanup:
+    UA_ByteString_clear(&currentKey);
+    if(retval != UA_STATUSCODE_GOOD)
+        UA_PubSubKeyStorage_delete(server, ks);
     return retval;
 }
 

From bc8f4bbe25fe453c0a79c67014cde19c2f04e69c Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 12 Jan 2023 12:39:49 +0100
Subject: [PATCH 0769/1963] fix(pubsub): fix memleak due to futurekeys in
 initializeKeyStorageWithKeys

In the initializeKeyStorageWithKeys method, UA_ByteString_allocBuffer was used
to allocate memory for all the future keys at initialization of securityGroups.
Which were deep copied when stored in the keystorage and not freed properly.
Now, after the copies are stored in the keystorage, the original future
keys are freed.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_securitygroup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 9103eb26218..fbf4f3f375c 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -166,7 +166,7 @@ initializeKeyStorageWithKeys(UA_Server *server, UA_SecurityGroup *securityGroup)
     retval = UA_ByteString_allocBuffer(&currentKey, keyLength);
     retval = generateKeyData(ks->policy, &currentKey);
 
-    UA_ByteString futurekeys[securityGroup->config.maxFutureKeyCount];
+    UA_ByteString *futurekeys = (UA_ByteString *)UA_calloc(securityGroup->config.maxFutureKeyCount, sizeof(UA_ByteString));
     for(size_t i = 0; i < securityGroup->config.maxFutureKeyCount; i++) {
         retval = UA_ByteString_allocBuffer(&futurekeys[i], keyLength);
         retval = generateKeyData(ks->policy, &futurekeys[i]);
@@ -186,6 +186,7 @@ initializeKeyStorageWithKeys(UA_Server *server, UA_SecurityGroup *securityGroup)
                                  &securityGroup->callbackId);
 
 cleanup:
+    UA_Array_delete(futurekeys, securityGroup->config.maxFutureKeyCount, &UA_TYPES[UA_TYPES_BYTESTRING]);
     UA_ByteString_clear(&currentKey);
     if(retval != UA_STATUSCODE_GOOD)
         UA_PubSubKeyStorage_delete(server, ks);

From c5e23ddc1f6113f0476187981f17b7b0690bb36b Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 12 Jan 2023 12:44:02 +0100
Subject: [PATCH 0770/1963] fix(pubsub): fix a memleak in updateSKSKeyStorage

In the updateSKSKeyStorage callback, when copying the content of new key to the
oldest key for reusing, the previous content was not clear in oldest key.
The content of the oldest key is not deleted before copying the new key
material.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_securitygroup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index fbf4f3f375c..6e7364e2a14 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -108,6 +108,7 @@ updateSKSKeyStorage(UA_Server *server, UA_SecurityGroup *securityGroup){
         UA_PubSubKeyListItem *oldestKey = TAILQ_FIRST(&keyStorage->keyList);
         TAILQ_REMOVE(&keyStorage->keyList, oldestKey, keyListEntry);
         TAILQ_INSERT_TAIL(&keyStorage->keyList, oldestKey, keyListEntry);
+        UA_ByteString_clear(&oldestKey->key);
         oldestKey->keyID = newKeyID;
         UA_ByteString_copy(&newKey, &oldestKey->key);
     } else {

From bae441b0837e96daabebc5550e439e4db711a391 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 12 Jan 2023 13:00:55 +0100
Subject: [PATCH 0771/1963] fix(tests): fix memleak in securitygroups unit
 tests

In AddSecurityGroupWithvalidConfig, the value variant was not cleared after
testing the last property variable of the SecurityGroup node under test.
This variant is now cleared which fixes this memleak.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/pubsub/check_pubsub_sks_securitygroups.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/pubsub/check_pubsub_sks_securitygroups.c b/tests/pubsub/check_pubsub_sks_securitygroups.c
index 20679e6507d..635c793edad 100644
--- a/tests/pubsub/check_pubsub_sks_securitygroups.c
+++ b/tests/pubsub/check_pubsub_sks_securitygroups.c
@@ -199,6 +199,7 @@ START_TEST(AddSecurityGroupWithvalidConfig) {
                                           UA_QUALIFIEDNAME(0, "MaxPastKeyCount"), &value);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert(config.maxPastKeyCount == *(UA_UInt32 *)value.data);
+    UA_Variant_clear(&value);
 #endif /*UA_ENABLE_PUBSUB_INFORMATIONMODEL */
 }
 END_TEST

From 2b653b8f8efed7f8a76d8f8f0d513e4631615931 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 12 Jan 2023 15:50:23 +0100
Subject: [PATCH 0772/1963] fix(tests): fix memleak in sks pull unit tests

The sks pull unit tests, valgrind detected possible memleaks.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/pubsub/check_pubsub_sks_pull.c | 39 ++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index ade3a45bb56..91182300ea9 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -31,6 +31,7 @@ UA_NodeId sgNodeId;
 UA_UInt32 maxKeyCount;
 UA_NodeId connection;
 UA_Boolean running;
+UA_ByteString allowedUsername;
 THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {
@@ -57,11 +58,8 @@ addSecurityGroup(void) {
     UA_Server_addSecurityGroup(sksServer, securityGroupParent, &config, &outNodeId);
     UA_String_copy(&config.securityGroupName, &securityGroupId);
 
-    UA_String allowedUsername = UA_STRING("user1");
-
-    UA_ByteString *username = UA_ByteString_new();
-    UA_ByteString_copy(&allowedUsername, username);
-    UA_Server_setNodeContext(sksServer, outNodeId, username);
+    allowedUsername = UA_STRING("user1");
+    UA_Server_setNodeContext(sksServer, outNodeId, &allowedUsername);
     UA_NodeId_copy(&outNodeId, &sgNodeId);
 }
 
@@ -141,6 +139,7 @@ setup(void) {
 
 static void
 teardown(void) {
+    UA_String_clear(&securityGroupId);
     running = false;
     THREAD_JOIN(server_thread);
     UA_Server_run_shutdown(sksServer);
@@ -185,11 +184,11 @@ callGetSecurityKeys(UA_Client *client, UA_String sksSecurityGroupId,
                     UA_UInt32 startingTokenId, UA_UInt32 requestedKeyCount) {
     UA_Variant *inputArguments = (UA_Variant *)UA_calloc(3, (sizeof(UA_Variant)));
 
-    UA_Variant_setScalarCopy(&inputArguments[0], &sksSecurityGroupId,
+    UA_Variant_setScalar(&inputArguments[0], &sksSecurityGroupId,
                              &UA_TYPES[UA_TYPES_STRING]);
-    UA_Variant_setScalarCopy(&inputArguments[1], &startingTokenId,
+    UA_Variant_setScalar(&inputArguments[1], &startingTokenId,
                              &UA_TYPES[UA_TYPES_UINT32]);
-    UA_Variant_setScalarCopy(&inputArguments[2], &requestedKeyCount,
+    UA_Variant_setScalar(&inputArguments[2], &requestedKeyCount,
                              &UA_TYPES[UA_TYPES_UINT32]);
 
     // Call method from client
@@ -204,7 +203,9 @@ callGetSecurityKeys(UA_Client *client, UA_String sksSecurityGroupId,
     item.methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS);
     item.inputArguments = (UA_Variant *)inputArguments;
     item.inputArgumentsSize = 3;
-    return UA_Client_Service_call(client, callMethodRequestFromClient);
+    UA_CallResponse response = UA_Client_Service_call(client, callMethodRequestFromClient);
+    UA_free(inputArguments);
+    return response;
 }
 
 START_TEST(getSecuritykeysBadSecurityModeInsufficient) {
@@ -219,6 +220,8 @@ START_TEST(getSecuritykeysBadSecurityModeInsufficient) {
     ck_assert_msg(response.results->statusCode == expectedCode,
                   "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(client);
 }
 END_TEST
 
@@ -231,6 +234,8 @@ START_TEST(getSecuritykeysBadNotFound) {
     ck_assert_msg(response.results->statusCode == expectedCode,
                   "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(sksClient);
 }
 END_TEST
 
@@ -247,6 +252,8 @@ START_TEST(getSecuritykeysBadUserAccessDenied) {
     ck_assert_msg(response.results->statusCode == expectedCode,
                   "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(sksClient);
 }
 END_TEST
 
@@ -289,6 +296,8 @@ START_TEST(getSecuritykeysGoodAndValidOutput) {
     for(size_t i = 0; i < retKeyCount; i++) {
         ck_assert(UA_ByteString_equal(&keys[i], &UA_BYTESTRING_NULL) == UA_FALSE);
     }
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(sksClient);
 }
 END_TEST
 
@@ -321,7 +330,8 @@ START_TEST(requestCurrentKeyWithFutureKeys) {
         ++firstTokenId;
         iterator = TAILQ_NEXT(iterator, keyListEntry);
     }
-
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(sksClient);
 }
 END_TEST
 
@@ -354,6 +364,8 @@ START_TEST(requestCurrentKeyOnly) {
         ++firstTokenId;
         iterator = TAILQ_NEXT(iterator, keyListEntry);
     }
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(sksClient);
 }
 END_TEST
 
@@ -385,6 +397,8 @@ START_TEST(requestPastKey) {
     ck_assert(firstItem->keyID == firstTokenId);
     ck_assert(UA_ByteString_equal(retKeys, &firstItem->key) == UA_TRUE);
     ck_assert(UA_ByteString_equal(retKeys, &sg->keyStorage->currentItem->key) != UA_TRUE);
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(sksClient);
 }
 END_TEST
 
@@ -418,7 +432,8 @@ START_TEST(requestUnknownStartingTokenId){
         ++firstTokenId;
         iterator = TAILQ_NEXT(iterator, keyListEntry);
     }
-
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(sksClient);
 }END_TEST
 
 START_TEST(requestMaxFutureKeys) {
@@ -450,6 +465,8 @@ START_TEST(requestMaxFutureKeys) {
         ++firstTokenId;
         iterator = TAILQ_NEXT(iterator, keyListEntry);
     }
+    UA_CallResponse_clear(&response);
+    UA_Client_delete(sksClient);
 }
 END_TEST
 

From 644c717967b5b272fb16119b75273faae0455f5d Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 09:51:22 +0100
Subject: [PATCH 0773/1963] fix(tests): remove String copy in addSecurityGroup
 in sks client tests

The string copy method makes a deep copy of the src string, which needs to be
freed after using. Therefore, string copy is replaced with assignement to
avoid freeing up the memory.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/pubsub/check_pubsub_sks_client.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index 8fcac96d1a2..bdb003cf58a 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -42,6 +42,7 @@ THREAD_HANDLE server_thread;
 UA_Server *sksServer, *publisherApp, *subscriberApp;
 UA_NodeId writerGroupId, readerGroupId;
 UA_NodeId publisherConnection, subscriberConnection;
+UA_ByteString allowedUsername;
 THREAD_CALLBACK(serverloop) {
     while(running)
         UA_Server_run_iterate(sksServer, true);
@@ -91,13 +92,10 @@ addSecurityGroup(void) {
     maxKeyCount = config.maxPastKeyCount + 1 + config.maxFutureKeyCount;
 
     UA_Server_addSecurityGroup(sksServer, securityGroupParent, &config, &outNodeId);
-    UA_String_copy(&config.securityGroupName, &securityGroupId);
+    securityGroupId = config.securityGroupName;
 
-    UA_String allowedUsername = UA_STRING("user1");
-
-    UA_ByteString *username = UA_ByteString_new();
-    UA_ByteString_copy(&allowedUsername, username);
-    UA_Server_setNodeContext(sksServer, outNodeId, username);
+    allowedUsername = UA_STRING("user1");
+    UA_Server_setNodeContext(sksServer, outNodeId, &allowedUsername);
 }
 
 static UA_Boolean

From 2350238307f0ed928cba2fc00201f6fcd260ee62 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 10:03:45 +0100
Subject: [PATCH 0774/1963] refactor(tests): split invalid sks endpointUrl
 tests in two

When these tests were part of one unit tests, to run the second tests
addional cleanup was required. This cleanup is part of teardown routine,
therefore, they are split into two unit tests and teardown routine will take
care of the proper cleanup after test conditions.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/pubsub/check_pubsub_sks_client.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index bdb003cf58a..01f33f49017 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -574,11 +574,22 @@ START_TEST(SetInvalidSKSEndpointUrl) {
     ck_assert_msg(retval == UA_STATUSCODE_BADTCPENDPOINTURLINVALID,
                   "Expected Statuscode to be BADTCPENDPOINTURLINVALID, but failed with: %s ",
                   UA_StatusCode_name(retval));
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(SetWrongSKSEndpointUrl) {
+    UA_StatusCode retval = UA_STATUSCODE_BAD;
+    retval = addPublisher(publisherApp);
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
 
     retval = UA_Server_setSksClient(publisherApp, securityGroupId, config, "opc.tcp://WrongHost:4840", sksPullRequestCallback, NULL);
     ck_assert_msg(retval == UA_STATUSCODE_BADCONNECTIONCLOSED,
                   "Expected Statuscode to be BADCONNECTIONCLOSED, but failed with: %s ",
                   UA_StatusCode_name(retval));
+    UA_Client_delete(client);
 }
 END_TEST
 
@@ -797,6 +808,7 @@ main(void) {
     tcase_add_test(tc_pubsub_sks_client, AddValidSksClientwithReaderGroup);
     tcase_add_test(tc_pubsub_sks_client, SetInvalidSKSClient);
     tcase_add_test(tc_pubsub_sks_client, SetInvalidSKSEndpointUrl);
+    tcase_add_test(tc_pubsub_sks_client, SetWrongSKSEndpointUrl);
     tcase_add_test(tc_pubsub_sks_client, CheckPublishedValuesInUserLand);
     tcase_add_test(tc_pubsub_sks_client, PublisherSubscriberTogethor);
     tcase_add_test(tc_pubsub_sks_client, PublisherDelayedSubscriberTogethor);

From 6abedd4d9c679a0585f8a447953bc85171416bee Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 10:24:36 +0100
Subject: [PATCH 0775/1963] fix(tests): delete input client config in sks
 client tests

Free the input client config objects after they are copied in the pubsub
keystorage.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/pubsub/check_pubsub_sks_client.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index 01f33f49017..d406d41c746 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -501,6 +501,7 @@ START_TEST(AddValidSksClientwithWriterGroup) {
         sksKsItr = TAILQ_NEXT(sksKsItr, keyListEntry);
         wgKsItr = TAILQ_NEXT(wgKsItr, keyListEntry);
     }
+    UA_free(config);
 }
 END_TEST
 
@@ -545,6 +546,7 @@ START_TEST(AddValidSksClientwithReaderGroup) {
         rgKsItr = TAILQ_NEXT(rgKsItr, keyListEntry);
     }
     ck_assert(rg->keyStorage->keyListSize > 0);
+    UA_free(config);
 }
 END_TEST
 
@@ -560,6 +562,7 @@ START_TEST(SetInvalidSKSClient) {
     ck_assert_msg(sksPullStatus != UA_STATUSCODE_GOOD,
                   "Expected Statuscode to be not GOOD, but failed with: %s ",
                   UA_StatusCode_name(sksPullStatus));
+    UA_Client_delete(client);
 }
 END_TEST
 
@@ -637,6 +640,8 @@ START_TEST(CheckPublishedValuesInUserLand) {
                      *(UA_Int32 *)subscribedNodeData->data);
     UA_Variant_delete(subscribedNodeData);
     UA_Variant_delete(publishedNodeData);
+    UA_free(pubSksClientConfig);
+    UA_free(subSksClientConfig);
 }
 END_TEST
 
@@ -674,6 +679,7 @@ START_TEST(PublisherSubscriberTogethor) {
                      *(UA_Int32 *)subscribedNodeData->data);
     UA_Variant_delete(subscribedNodeData);
     UA_Variant_delete(publishedNodeData);
+    UA_free(pubSksClientConfig);
 }
 END_TEST
 
@@ -717,6 +723,7 @@ START_TEST(PublisherDelayedSubscriberTogethor) {
                      *(UA_Int32 *)subscribedNodeData->data);
     UA_Variant_delete(subscribedNodeData);
     UA_Variant_delete(publishedNodeData);
+    UA_free(pubSksClientConfig);
 }
 END_TEST
 
@@ -794,6 +801,8 @@ START_TEST(FetchNextbatchOfKeys) {
                      *(UA_Int32 *)subscribedNodeData->data);
     UA_Variant_delete(subscribedNodeData);
     UA_Variant_delete(publishedNodeData);
+    UA_free(pubSksClientConfig);
+    UA_free(subSksClientConfig);
 }
 END_TEST
 

From 5e546e06535993699a9ec538eb4b593ee892e263 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 10:39:35 +0100
Subject: [PATCH 0776/1963] fix(pubsub): fix memory leak due to input arguments
 in callGetSecurityKeysMethod

The inputargument array is a fixed size array. Therefore it allocated statically.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_keystorage.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 8fa49d023cf..022306074e1 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -591,20 +591,21 @@ callGetSecurityKeysMethod(UA_Client *client) {
 
     sksClientContext *ctx = (sksClientContext *)client->config.clientContext;
 
-    UA_Variant *inputArguments = (UA_Variant *)UA_calloc(3, (sizeof(UA_Variant)));
-    UA_Variant_setScalarCopy(&inputArguments[0], &ctx->ks->securityGroupID,
-                             &UA_TYPES[UA_TYPES_STRING]);
-    UA_Variant_setScalarCopy(&inputArguments[1], &ctx->startingTokenId,
-                             &UA_TYPES[UA_TYPES_UINT32]);
-    UA_Variant_setScalarCopy(&inputArguments[2], &ctx->requestedKeyCount,
-                             &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant inputArguments[3];
+    UA_Variant_setScalar(&inputArguments[0], &ctx->ks->securityGroupID,
+                         &UA_TYPES[UA_TYPES_STRING]);
+    UA_Variant_setScalar(&inputArguments[1], &ctx->startingTokenId,
+                         &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Variant_setScalar(&inputArguments[2], &ctx->requestedKeyCount,
+                         &UA_TYPES[UA_TYPES_UINT32]);
 
     UA_NodeId objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE);
     UA_NodeId methodId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS);
     size_t inputArgumentsSize = 3;
 
-    return UA_Client_call_async(client, objectId, methodId, inputArgumentsSize,
-                                inputArguments, storeFetchedKeys, (void *)ctx, NULL);
+    UA_StatusCode retval = UA_Client_call_async(client, objectId, methodId, inputArgumentsSize,
+                                inputArguments, storeFetchedKeys, (void *)ctx, &ctx->ks->sksConfig.reqId);
+    return retval;
 }
 
 static void

From ba6377ec2deffc6ffce9af1b2de55d78809d65a2 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 10:47:35 +0100
Subject: [PATCH 0777/1963] fix(pubsub): free sks client context in cleanup
 callback

An sks client context is allocated and created when the a new sks client
is created. It must be free by the user of the client. Therefore, the client
context pointer is freed in sksclient cleanup callback.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_keystorage.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 022306074e1..8cbece91cb2 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -509,6 +509,7 @@ sksClientCleanupCb(void *client, void *context) {
         sksClient->config.securityPoliciesSize = 0;
         sksClient->config.certificateVerification.context = NULL;
         sksClient->config.logger.context = NULL;
+        UA_free(sksClient->config.clientContext);
         UA_Client_delete(sksClient);
     } else {
         addDelayedSksClientCleanupCb(sksClient);

From 15612a31491f170f22edaeea3be3b6ffe0dedee9 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 11:16:35 +0100
Subject: [PATCH 0778/1963] fix(pubsub): remove previous keyRolloverCallback in
 storeFetchedKeys

After new batch of keys are fetch from SKS server, the key storage is updated
with new keys and new keylifetime. Also the remaining time for current
keyRollover is also returned. When setting a new keyRollover callback, the
previous callback must be removed so that the keyRollover does not happen
twice.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_keystorage.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 8cbece91cb2..ca007f3d324 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -564,6 +564,18 @@ storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
             goto cleanup;
     }
 
+    /**
+     * After a new batch of keys is fetched from SKS server, the key storage is updated
+     * with new keys and new keylifetime. Also the remaining time for current
+     * keyRollover is also returned. When setting a new keyRollover callback, the
+     * previous callback must be removed so that the keyRollover does not happen twice
+     */
+    if(ks->callBackId != 0) {
+        server->config.eventLoop->removeCyclicCallback(server->config.eventLoop,
+                                                       ks->callBackId);
+        ks->callBackId = 0;
+    }
+
     UA_Duration msTimeToNextKey =
         *(UA_Duration *)response->results->outputArguments[3].data;
     if(!(msTimeToNextKey > 0))

From 2d36aefe60bd1b6b57103cb8a5cd85cd1247cf3e Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 11:32:48 +0100
Subject: [PATCH 0779/1963] fix(pubsub): check if sks pull request in process

The sks pull requests are made periodically, when keystorage is moved to the
last key in local keystorage. An sks client is spun and sks pull request is
made on sks server. However, after the pull request is made, the sks server
can take some time to send response. Meanwhile if the keylifeTime is lower, the
the response time, then in the next iteration the Keyrollover callback will
make another sks pull request resulting in spinning up another client. Therefore
previous sks pull request is stored and cleared on completion of sks pull
request. Which makes sure that only one sks pull request is under process.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_keystorage.c | 9 ++++++++-
 src/pubsub/ua_pubsub_keystorage.h | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index ca007f3d324..8cdefa964f6 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -399,7 +399,7 @@ UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *
                          (int)keyStorage->securityGroupID.length, keyStorage->securityGroupID.data,
                          UA_StatusCode_name(retval));
         }
-    } else if(keyStorage->sksConfig.endpointUrl) {
+    } else if(keyStorage->sksConfig.endpointUrl && keyStorage->sksConfig.reqId == 0) {
         UA_DateTime now = UA_DateTime_nowMonotonic();
         /*Publishers using a central SKS shall call GetSecurityKeys at a period of half the KeyLifetime */
         UA_Duration msTimeToNextGetSecurityKeys = keyStorage->keyLifeTime / 2;
@@ -594,6 +594,7 @@ storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
     UA_UNLOCK(&server->serviceMutex);
     if(ks->sksConfig.userNotifyCallback)
         ks->sksConfig.userNotifyCallback(server, retval, ks->sksConfig.context);
+    ks->sksConfig.reqId = 0;
     UA_Client_disconnectAsync(client);
     addDelayedSksClientCleanupCb(client);
     return;
@@ -666,6 +667,12 @@ getSecurityKeysAndStoreFetchedKeys(UA_Server *server, UA_PubSubKeyStorage *keySt
     UA_UInt32 startingTokenId = UA_REQ_CURRENT_TOKEN;
     UA_UInt32 requestKeyCount = UA_UINT32_MAX;
 
+    if(keyStorage->sksConfig.reqId != 0) {
+        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    "SKS Client: SKS Pull request in process ");
+        return UA_STATUSCODE_GOOD;
+    }
+
     UA_ClientConfig cc;
     memset(&cc, 0, sizeof(UA_ClientConfig));
 
diff --git a/src/pubsub/ua_pubsub_keystorage.h b/src/pubsub/ua_pubsub_keystorage.h
index d75bb527c3c..bf425600fd9 100644
--- a/src/pubsub/ua_pubsub_keystorage.h
+++ b/src/pubsub/ua_pubsub_keystorage.h
@@ -124,6 +124,7 @@ typedef struct UA_PubSubSKSConfig {
     const char *endpointUrl;
     UA_Server_sksPullRequestCallback userNotifyCallback;
     void *context;
+    UA_UInt32 reqId;
 } UA_PubSubSKSConfig;
 
 /**

From 14c480a069cc2474643093ba3a68c936d6384d72 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 14:52:01 +0100
Subject: [PATCH 0780/1963] fix(pubsub): cleanup sks client when connection is
 completely closed

When the sks client cleanup callback should be added when the sks client
has completely closed its channel, session and conntection status is closed.
Therefore a check is added in onConnect callback for not connected status.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 src/pubsub/ua_pubsub_keystorage.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 8cdefa964f6..4fd23ea751f 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -626,7 +626,9 @@ static void
 onConnect(UA_Client *client, UA_SecureChannelState channelState,
           UA_SessionState sessionState, UA_StatusCode connectStatus) {
     UA_Boolean triggerSKSCleanup = false;
-    if(connectStatus != UA_STATUSCODE_GOOD && channelState == UA_SECURECHANNELSTATE_CLOSED && sessionState == UA_SESSIONSTATE_CLOSED) {
+    if(connectStatus != UA_STATUSCODE_GOOD &&
+       connectStatus != UA_STATUSCODE_BADNOTCONNECTED &&
+       sessionState != UA_SESSIONSTATE_ACTIVATED) {
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                      "SKS Client: Failed to connect SKS server with error: %s ",
                      UA_StatusCode_name(connectStatus));
@@ -650,6 +652,8 @@ onConnect(UA_Client *client, UA_SecureChannelState channelState,
         if(ks->sksConfig.userNotifyCallback)
             ks->sksConfig.userNotifyCallback(ctx->server, connectStatus,
                                              ks->sksConfig.context);
+        UA_Client_disconnectAsync(client);
+        addDelayedSksClientCleanupCb(client);
     }
     return;
 }

From 67044bf90bc1f38924dc3a24b075b9f4739b3e6d Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Fri, 27 Jan 2023 15:02:40 +0100
Subject: [PATCH 0781/1963] fix(tests): reduce sleep time per iteration in
 FetchNextbatchOfKeys unit tests

in FetchNextbatchOfKeys, UA_fakeSleep is used for iteration and the
increment of timmer. The sks pull request depends on how quickly sks server
sends response back, and 100ms increment in fake clock is faster then the
sks pull request-response. It caused mulitple sks pull requests to be added
in the queue after random number of iterations and causes the delayed cleanup
callbacks to lag behind.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
---
 tests/pubsub/check_pubsub_sks_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index d406d41c746..c80c7dc2a30 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -784,7 +784,7 @@ START_TEST(FetchNextbatchOfKeys) {
         if(sksPullIteration > 10 &&
            subKs->currentItem->keyID == pubKs->currentItem->keyID)
             break;
-        UA_fakeSleep(100);
+        UA_fakeSleep(1);
     }
     ck_assert(subKs->currentItem->keyID == pubKs->currentItem->keyID);
     ck_assert(UA_ByteString_equal(&subKs->currentItem->key, &pubKs->currentItem->key));

From 95204b98f53a2f515e5efa70b79c8dd21421ffda Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 2 Mar 2023 12:38:51 +0100
Subject: [PATCH 0782/1963] fix(pubsub): clear content of orig config in
 setSksClient

Clear the content of original config after moving all the data to sks config, so
that no body can access the original config from outside while sks pull requests
are in process.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
---
 src/pubsub/ua_pubsub_keystorage.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 4fd23ea751f..fc1f823df5f 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -736,7 +736,15 @@ UA_Server_setSksClient(UA_Server *server, UA_String securityGroupId,
     }
 
     UA_ClientConfig_copy(clientConfig, &ks->sksConfig.clientConfig);
-    memset(clientConfig, 0, sizeof(UA_ClientConfig));
+    /*Clear the content of original config, so that no body can access the original config */
+    clientConfig->authSecurityPolicies = NULL;
+    clientConfig->certificateVerification.context = NULL;
+    clientConfig->eventLoop = NULL;
+    clientConfig->logger.context = NULL;
+    clientConfig->logging = NULL;
+    clientConfig->securityPolicies = NULL;
+    UA_ClientConfig_clear(clientConfig);
+
     ks->sksConfig.endpointUrl = endpointUrl;
     ks->sksConfig.userNotifyCallback = callback;
     ks->sksConfig.context = context;

From bacf70ead63a85de5c68e2882dfdd32eda4686d3 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 2 Mar 2023 13:56:48 +0100
Subject: [PATCH 0783/1963] feat(CI): enable memchecks for sks

The UA_ENABLE_UNIT_TESTS_MEMCHECK are enabled for sks test runner to detect
all the memory leaks in CI automatically.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
---
 .github/workflows/build_linux.yml | 5 ++---
 tools/ci.sh                       | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 4c2415a04a6..d41596687f2 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include: 
+        include:
           - build_name: "Debug Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq mosquitto
             cmd_action: unit_tests
@@ -42,7 +42,7 @@ jobs:
             cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
             cmd_action: unit_tests_encryption_mbedtls_pubsub
           - build_name: "PubSub SKS Build & Unit Tests (gcc)"
-            cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
+            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev
             cmd_action: unit_tests_pubsub_sks
           - build_name: "Encryption (OpenSSL) Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq openssl
@@ -115,4 +115,3 @@ jobs:
       run: source tools/ci.sh && ${{matrix.cmd_action}}
       env:
         ETHERNET_INTERFACE: eth0
-
diff --git a/tools/ci.sh b/tools/ci.sh
index abd0efcb11a..1ecb67562bf 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -306,6 +306,7 @@ function unit_tests_pubsub_sks {
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           -DUA_ENABLE_PUBSUB_SKS=ON \
+          -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities

From 68f1890b62508c99a2c70b13c7a78b2e10015d39 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 2 Mar 2023 13:58:04 +0100
Subject: [PATCH 0784/1963] feat(CI): run only sks unit tests in sks test
 runner

Currently in sks test runner all the default unit tests run which are also
tested in other test runners in CI. This causes SKS test runner to take a long
time to complete. Therefore sks test runner is configured to run only sks
related unit tests.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
---
 tools/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 1ecb67562bf..aa73ee51a15 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -309,8 +309,8 @@ function unit_tests_pubsub_sks {
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           ..
     make ${MAKEOPTS}
-    set_capabilities
-    make test ARGS="-V"
+    # set_capabilities not possible with valgrind
+    make test ARGS="-V -R sks"
 }
 
 ##########################################

From afcaa502208ed63fc02f3f250c62d23bed917ba0 Mon Sep 17 00:00:00 2001
From: Muddasir Shakil <muddasir.shakil@linutronix.de>
Date: Thu, 2 Mar 2023 14:10:49 +0100
Subject: [PATCH 0785/1963] fix(test): rename keystorage test suite

In order to run the keystorage related unit tests with sks test runner in CI,
the check_pubsub_keystorage is renamed to check_pubsub_sks_keystorage. This
allows to run the sks tests with matching regular expression with ctest.

Signed-off-by: Muddasir Shakil <muddasir.shakil@linutronix.de>
---
 tests/CMakeLists.txt                                            | 2 +-
 ...{check_pubsub_keystorage.c => check_pubsub_sks_keystorage.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/pubsub/{check_pubsub_keystorage.c => check_pubsub_sks_keystorage.c} (100%)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 66de978ab4a..1735513e9bd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -340,7 +340,7 @@ if(UA_ENABLE_PUBSUB)
         ua_add_test(pubsub/check_pubsub_subscribe_encrypted.c)
         ua_add_test(pubsub/check_pubsub_encrypted_rt_levels.c)
         if(UA_ENABLE_PUBSUB_SKS)
-            ua_add_test(pubsub/check_pubsub_keystorage.c)
+            ua_add_test(pubsub/check_pubsub_sks_keystorage.c)
             ua_add_test(pubsub/check_pubsub_sks_push.c)
             ua_add_test(pubsub/check_pubsub_sks_pull.c)
             ua_add_test(pubsub/check_pubsub_sks_securitygroups.c)
diff --git a/tests/pubsub/check_pubsub_keystorage.c b/tests/pubsub/check_pubsub_sks_keystorage.c
similarity index 100%
rename from tests/pubsub/check_pubsub_keystorage.c
rename to tests/pubsub/check_pubsub_sks_keystorage.c

From 305b2d0bead8aeff7d1b1335d625f60448e8dcf6 Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Mon, 6 Mar 2023 09:32:02 +0100
Subject: [PATCH 0786/1963] fix(test): remove CNC companion specification

* Remove CNC nodeset, since the nodesetLoader
does not support Nodeset.xml files (only
Nodeset2.xml).

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 tests/nodeset-loader/add_node_integration_test/run_test.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/nodeset-loader/add_node_integration_test/run_test.sh b/tests/nodeset-loader/add_node_integration_test/run_test.sh
index d0034c3fea0..909a6f66fa8 100644
--- a/tests/nodeset-loader/add_node_integration_test/run_test.sh
+++ b/tests/nodeset-loader/add_node_integration_test/run_test.sh
@@ -8,6 +8,7 @@
 # Currently this test case is missing the following UA-Nodesets:
 #   * NodesetLoader related issues:
 #      - ${OPEN62541_NODESET_DIR}AML/Opc.Ua.AMLLibraries.NodeSet2.xml
+#      - ${OPEN62541_NODESET_DIR}CNC/Opc.Ua.CNC.NodeSet.xml
 #      - ${OPEN62541_NODESET_DIR}ISA95-JOBCONTROL/opc.ua.isa95-jobcontrol.nodeset2.xml
 #      - ${OPEN62541_NODESET_DIR}PNRIO/Opc.Ua.PnRio.Nodeset2.xml
 #      - ${OPEN62541_NODESET_DIR}TMC/Opc.Ua.TMC.NodeSet2.xml
@@ -139,9 +140,6 @@ add_node_integration_test "CAS" \
     $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
     $UA_NODESET_PATH/CAS/Opc.Ua.CAS.NodeSet2.xml
 
-add_node_integration_test "CNC" \
-    $UA_NODESET_PATH/CNC/Opc.Ua.CNC.NodeSet.xml
-
 add_node_integration_test "CommercialKitchenEquipment" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
     $UA_NODESET_PATH/CommercialKitchenEquipment/Opc.Ua.CommercialKitchenEquipment.NodeSet2.xml

From 4aa8663127e9df875c57beb273f2e22c9981974c Mon Sep 17 00:00:00 2001
From: matkonnerth <matkonnerth@gmail.com>
Date: Wed, 8 Mar 2023 12:21:44 +0100
Subject: [PATCH 0787/1963] fix(pubsub): Copy nodeId when reading
 UA_NS0ID_PUBLISHEDDATAITEMSTYPE_PUBLISHEDDATA (#5673)

---
 src/pubsub/ua_pubsub_ns0.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 243f89bdd4d..b85de24629c 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -176,8 +176,8 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
                 pvd[counter].attributeId = UA_ATTRIBUTEID_VALUE;
                 pvd[counter].publishedVariable =
                     field->config.field.variable.publishParameters.publishedVariable;
-                //UA_NodeId_copy(&field->config.field.variable.publishParameters.publishedVariable,
-                //               &pvd[counter].publishedVariable);
+                UA_NodeId_copy(&field->config.field.variable.publishParameters.publishedVariable,
+                               &pvd[counter].publishedVariable);
                 counter++;
             }
             UA_Variant_setArray(&value, pvd, publishedDataSet->fieldSize,

From 0d0b18b08bd27d5e7da17dd40bc115b541bb7993 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Thu, 9 Mar 2023 08:23:53 +0100
Subject: [PATCH 0788/1963] fix(core) remove special case for enum handling in
 type compatible check (#5559)

* fix(core) remove special case for enum handling in type compatible check
---
 src/server/ua_services_attribute.c | 8 --------
 tools/schema/datatypes_minimal.txt | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index fbb75ce008a..88711f99a46 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -809,20 +809,12 @@ typeEquivalence(const UA_DataType *t) {
     return k;
 }
 
-static const UA_NodeId enumNodeId = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_ENUMERATION}};
-
 UA_Boolean
 compatibleValueDataType(UA_Server *server, const UA_DataType *dataType,
                         const UA_NodeId *constraintDataType) {
     if(compatibleDataTypes(server, &dataType->typeId, constraintDataType))
         return true;
 
-    /* The constraint is an enum -> allow writing Int32 */
-    if(UA_NodeId_equal(&dataType->typeId, &UA_TYPES[UA_TYPES_INT32].typeId) &&
-       isNodeInTree_singleRef(server, constraintDataType, &enumNodeId,
-                              UA_REFERENCETYPEINDEX_HASSUBTYPE))
-        return true;
-
     /* For actual values, the constraint DataType may be a subtype of the
      * DataType of the value -- subtyping in the wrong direction. E.g. UtcTime
      * is a subtype of DateTime. But we allow it to be encoded as a DateTime
diff --git a/tools/schema/datatypes_minimal.txt b/tools/schema/datatypes_minimal.txt
index d7961f5af59..8578e227f2d 100644
--- a/tools/schema/datatypes_minimal.txt
+++ b/tools/schema/datatypes_minimal.txt
@@ -117,3 +117,4 @@ ServerState
 ServerDiagnosticsSummaryDataType
 RedundancySupport
 KeyValuePair
+NamingRuleType
\ No newline at end of file

From b58c94d4974c178ed77017f898401bad8378df22 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 6 Mar 2023 20:09:04 +0100
Subject: [PATCH 0789/1963] refactor(es): Pull out reusable send buffer
 handling

---
 arch/eventloop_posix.c | 17 +++++++++++++++++
 arch/eventloop_posix.h | 13 +++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 92d929856be..0cf2a8b0947 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -458,6 +458,23 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger) {
     return &el->eventLoop;
 }
 
+/* Reusable EventSource functionality */
+
+UA_StatusCode
+UA_EventLoopPOSIX_allocNetworkBuffer(UA_ConnectionManager *cm,
+                                     uintptr_t connectionId,
+                                     UA_ByteString *buf,
+                                     size_t bufSize) {
+    return UA_ByteString_allocBuffer(buf, bufSize);
+}
+
+void
+UA_EventLoopPOSIX_freeNetworkBuffer(UA_ConnectionManager *cm,
+                                    uintptr_t connectionId,
+                                    UA_ByteString *buf) {
+    UA_ByteString_clear(buf);
+}
+
 UA_StatusCode
 UA_EventLoopPOSIX_setNonBlocking(UA_FD sockfd) {
 #ifndef _WIN32
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 614ad46c0b6..4b4867e5ab3 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -116,6 +116,19 @@ UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd);
 UA_StatusCode
 UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout);
 
+/* Helper functions between EventSources */
+
+UA_StatusCode
+UA_EventLoopPOSIX_allocNetworkBuffer(UA_ConnectionManager *cm,
+                                     uintptr_t connectionId,
+                                     UA_ByteString *buf,
+                                     size_t bufSize);
+
+void
+UA_EventLoopPOSIX_freeNetworkBuffer(UA_ConnectionManager *cm,
+                                    uintptr_t connectionId,
+                                    UA_ByteString *buf);
+
 /*
  * Helper functions to be used across protocols
  */

From dfd145905440735993fda23f05788d6edcae3cd3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 6 Mar 2023 20:13:24 +0100
Subject: [PATCH 0790/1963] refactor(el): Use the generalized send buffer
 handling

---
 arch/eventloop_posix_tcp.c | 16 ++--------------
 arch/eventloop_posix_udp.c | 17 ++---------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 7c42544d7f8..acb02319f44 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -55,18 +55,6 @@ TCPConnectionManager_register(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode
-TCP_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
-                       UA_ByteString *buf, size_t bufSize) {
-    return UA_ByteString_allocBuffer(buf, bufSize);
-}
-
-static void
-TCP_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
-                      UA_ByteString *buf) {
-    UA_ByteString_clear(buf);
-}
-
 /* Do not merge packets on the socket (disable Nagle's algorithm) */
 static UA_StatusCode
 TCP_setNoNagle(UA_FD sockfd) {
@@ -989,8 +977,8 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName) {
     cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))TCP_eventSourceDelete;
     cm->cm.protocol = UA_STRING((char*)(uintptr_t)tcpName);
     cm->cm.openConnection = TCP_openConnection;
-    cm->cm.allocNetworkBuffer = TCP_allocNetworkBuffer;
-    cm->cm.freeNetworkBuffer = TCP_freeNetworkBuffer;
+    cm->cm.allocNetworkBuffer = UA_EventLoopPOSIX_allocNetworkBuffer;
+    cm->cm.freeNetworkBuffer = UA_EventLoopPOSIX_freeNetworkBuffer;
     cm->cm.sendWithConnection = TCP_sendWithConnection;
     cm->cm.closeConnection = TCP_shutdownConnection;
     return &cm->cm;
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index ad1f1664a22..7c2f0a2c501 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -461,19 +461,6 @@ UDPConnectionManager_deregister(UDPConnectionManager *ucm, UA_RegisteredFD *rfd)
     ucm->fdsSize--;
 }
 
-static UA_StatusCode
-UDP_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
-                       UA_ByteString *buf, size_t bufSize) {
-    return UA_ByteString_allocBuffer(buf, bufSize);
-}
-
-static void
-UDP_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
-                      UA_ByteString *buf) {
-    UA_ByteString_clear(buf);
-}
-
-
 /* Test if the ConnectionManager can be stopped */
 static void
 UDP_checkStopped(UDPConnectionManager *ucm) {
@@ -1281,8 +1268,8 @@ UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName) {
     cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))UDP_eventSourceDelete;
     cm->cm.protocol = UA_STRING((char*)(uintptr_t)udpName);
     cm->cm.openConnection = UDP_openConnection;
-    cm->cm.allocNetworkBuffer = UDP_allocNetworkBuffer;
-    cm->cm.freeNetworkBuffer = UDP_freeNetworkBuffer;
+    cm->cm.allocNetworkBuffer = UA_EventLoopPOSIX_allocNetworkBuffer;
+    cm->cm.freeNetworkBuffer = UA_EventLoopPOSIX_freeNetworkBuffer;
     cm->cm.sendWithConnection = UDP_sendWithConnection;
     cm->cm.closeConnection = UDP_shutdownConnection;
     return &cm->cm;

From 6831c8d321b3d888ecd85c6f0764c6f4694478d1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Mar 2023 17:07:53 +0100
Subject: [PATCH 0791/1963] refactor(el): Finalize locking within the EventLoop

---
 arch/eventloop_posix.c           |  58 +++-
 arch/eventloop_posix.h           |  31 +-
 arch/eventloop_posix_epoll.c     |   5 +-
 arch/eventloop_posix_eth.c       | 397 ++++++++++++++------------
 arch/eventloop_posix_interrupt.c | 232 +++++++++------
 arch/eventloop_posix_select.c    |  24 +-
 arch/eventloop_posix_tcp.c       | 476 +++++++++++++++++--------------
 arch/eventloop_posix_udp.c       | 435 +++++++++++++++-------------
 8 files changed, 933 insertions(+), 725 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 0cf2a8b0947..04b1490c0b7 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -122,6 +122,7 @@ processDelayed(UA_EventLoopPOSIX *el) {
 static UA_StatusCode
 UA_EventLoopPOSIX_start(UA_EventLoopPOSIX *el) {
     UA_LOCK(&el->elMutex);
+
     if(el->eventLoop.state != UA_EVENTLOOPSTATE_FRESH &&
        el->eventLoop.state != UA_EVENTLOOPSTATE_STOPPED) {
         UA_UNLOCK(&el->elMutex);
@@ -138,6 +139,7 @@ UA_EventLoopPOSIX_start(UA_EventLoopPOSIX *el) {
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "Eventloop\t| Could not create the epoll socket (%s)",
                           errno_str));
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 #endif
@@ -161,6 +163,8 @@ UA_EventLoopPOSIX_start(UA_EventLoopPOSIX *el) {
 
 static void
 checkClosed(UA_EventLoopPOSIX *el) {
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     UA_EventSource *es = el->eventLoop.eventSources;
     while(es) {
         if(es->state != UA_EVENTSOURCESTATE_STOPPED)
@@ -195,20 +199,22 @@ UA_EventLoopPOSIX_stop(UA_EventLoopPOSIX *el) {
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                 "Stopping the EventLoop");
 
-    /* Shutdown all event sources. This closes open connections. */
+    /* Set to STOPPING to prevent "normal use" */
+    *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
+        UA_EVENTLOOPSTATE_STOPPING;
+
+    /* Stop all event sources (asynchronous) */
     UA_EventSource *es = el->eventLoop.eventSources;
-    while(es) {
+    for(; es; es = es->next) {
         if(es->state == UA_EVENTSOURCESTATE_STARTING ||
            es->state == UA_EVENTSOURCESTATE_STARTED) {
             UA_UNLOCK(&el->elMutex);
             es->stop(es);
             UA_LOCK(&el->elMutex);
         }
-        es = es->next;
     }
 
-    *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
-        UA_EVENTLOOPSTATE_STOPPING;
+    /* Set to STOPPED if all EventSources are STOPPED */
     checkClosed(el);
 
     UA_UNLOCK(&el->elMutex);
@@ -291,6 +297,8 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
 static UA_StatusCode
 UA_EventLoopPOSIX_registerEventSource(UA_EventLoopPOSIX *el,
                                       UA_EventSource *es) {
+    UA_LOCK(&el->elMutex);
+
     /* Already registered? */
     if(es->state != UA_EVENTSOURCESTATE_FRESH) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -301,33 +309,36 @@ UA_EventLoopPOSIX_registerEventSource(UA_EventLoopPOSIX *el,
     }
 
     /* Add to linked list */
-    UA_LOCK(&el->elMutex);
     es->next = el->eventLoop.eventSources;
     el->eventLoop.eventSources = es;
-    UA_UNLOCK(&el->elMutex);
 
     es->eventLoop = &el->eventLoop;
     es->state = UA_EVENTSOURCESTATE_STOPPED;
 
     /* Start if the entire EventLoop is started */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(el->eventLoop.state == UA_EVENTLOOPSTATE_STARTED)
-        return es->start(es);
-    return UA_STATUSCODE_GOOD;
+        res = es->start(es);
+
+    UA_UNLOCK(&el->elMutex);
+    return res;
 }
 
 static UA_StatusCode
 UA_EventLoopPOSIX_deregisterEventSource(UA_EventLoopPOSIX *el,
                                         UA_EventSource *es) {
+    UA_LOCK(&el->elMutex);
+
     if(es->state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                        "Cannot deregister the EventSource %.*s: "
                        "Has to be stopped first",
                        (int)es->name.length, es->name.data);
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Remove from the linked list */
-    UA_LOCK(&el->elMutex);
     UA_EventSource **s = &el->eventLoop.eventSources;
     while(*s) {
         if(*s == es) {
@@ -336,11 +347,11 @@ UA_EventLoopPOSIX_deregisterEventSource(UA_EventLoopPOSIX *el,
         }
         s = &(*s)->next;
     }
-    UA_UNLOCK(&el->elMutex);
 
     /* Set the state to non-registered */
     es->state = UA_EVENTSOURCESTATE_FRESH;
 
+    UA_UNLOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -475,6 +486,31 @@ UA_EventLoopPOSIX_freeNetworkBuffer(UA_ConnectionManager *cm,
     UA_ByteString_clear(buf);
 }
 
+UA_StatusCode
+UA_EventLoopPOSIX_allocateRXBuffer(UA_POSIXConnectionManager *pcm) {
+    UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
+    const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
+        UA_KeyValueMap_getScalar(&pcm->cm.eventSource.params,
+                                 UA_QUALIFIEDNAME(0, "recv-bufsize"),
+                                 &UA_TYPES[UA_TYPES_UINT32]);
+    if(configRxBufSize)
+        rxBufSize = *configRxBufSize;
+    if(pcm->rxBuffer.length != rxBufSize) {
+        UA_ByteString_clear(&pcm->rxBuffer);
+        return UA_ByteString_allocBuffer(&pcm->rxBuffer, rxBufSize);
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Socket Handling */
+
+enum ZIP_CMP
+cmpFD(const UA_FD *a, const UA_FD *b) {
+    if(*a == *b)
+        return ZIP_CMP_EQ;
+    return (*a < *b) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
+}
+
 UA_StatusCode
 UA_EventLoopPOSIX_setNonBlocking(UA_FD sockfd) {
 #ifndef _WIN32
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 4b4867e5ab3..331196d4303 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -61,16 +61,33 @@ struct UA_RegisteredFD {
                             * because the rfd is freed by the delayed callback
                             * mechanism. */
 
-    LIST_ENTRY(UA_RegisteredFD) es_pointers; /* Register FD in the EventSource */
+    ZIP_ENTRY(UA_RegisteredFD) zipPointers; /* Register FD in the EventSource */
     UA_FD fd;
     short listenEvents; /* UA_FDEVENT_IN | UA_FDEVENT_OUT*/
 
     UA_EventSource *es; /* Backpointer to the EventSource */
-    UA_FDCallback callback;
-    void *application;
-    void *context;
+    UA_FDCallback eventSourceCB;
 };
 
+enum ZIP_CMP cmpFD(const UA_FD *a, const UA_FD *b);
+typedef ZIP_HEAD(UA_FDTree, UA_RegisteredFD) UA_FDTree;
+ZIP_FUNCTIONS(UA_FDTree, UA_RegisteredFD, zipPointers, UA_FD, fd, cmpFD)
+
+/* All ConnectionManager in the POSIX EventLoop can be cast to
+ * UA_ConnectionManagerPOSIX. They carry a sorted tree of their open
+ * sockets/file-descriptors. */
+typedef struct {
+    UA_ConnectionManager cm;
+
+    /* Reused receive buffer. The size is configured via
+     * the recv-bufsize parameter.*/
+    UA_ByteString rxBuffer;
+
+    /* Sorted tree of the FDs */
+    size_t fdsSize;
+    UA_FDTree fds;
+} UA_POSIXConnectionManager;
+
 typedef struct {
     UA_EventLoop eventLoop;
 
@@ -87,9 +104,8 @@ typedef struct {
 #if defined(UA_HAVE_EPOLL)
     UA_FD epollfd;
 #else
-    /* Explicit list of file descriptors */
-    size_t fdsSize;
     UA_RegisteredFD **fds;
+    size_t fdsSize;
 #endif
 
 #if UA_MULTITHREADING >= 100
@@ -118,6 +134,9 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout);
 
 /* Helper functions between EventSources */
 
+UA_StatusCode
+UA_EventLoopPOSIX_allocateRXBuffer(UA_POSIXConnectionManager *pcm);
+
 UA_StatusCode
 UA_EventLoopPOSIX_allocNetworkBuffer(UA_ConnectionManager *cm,
                                      uintptr_t connectionId,
diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
index 4633bc2ae05..cdcd7f40804 100644
--- a/arch/eventloop_posix_epoll.c
+++ b/arch/eventloop_posix_epoll.c
@@ -108,10 +108,7 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
         } else {
             revent = UA_FDEVENT_ERR;
         }
-
-        UA_UNLOCK(&el->elMutex);
-        rfd->callback(rfd->es, rfd, revent);
-        UA_LOCK(&el->elMutex);
+        rfd->eventSourceCB(rfd->es, rfd, revent);
     }
     return UA_STATUSCODE_GOOD;
 }
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index c9b4914ee84..880e21fbea9 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -42,8 +42,12 @@ static UA_KeyValueRestriction ETHConfigParameters[ETH_PARAMETERSSIZE+1] = {
 #define UA_ETH_MAXHEADERLENGTH (2*ETHER_ADDR_LEN)+4+2+2
 
 typedef struct {
-    UA_RegisteredFD fd;
-    UA_ConnectionManager_connectionCallback connectionCallback;
+    UA_RegisteredFD rfd;
+
+    UA_ConnectionManager_connectionCallback applicationCB;
+    void *application;
+    void *context;
+
     struct sockaddr_ll sll;
     /* The Ethernet header to prepend for sending frames is precomputed and reused.
      * The length field (the last 2 byte) is adjusted.
@@ -56,50 +60,6 @@ typedef struct {
     unsigned char lengthOffset; /* No length field if zero */
 } ETH_FD;
 
-typedef struct {
-    UA_ConnectionManager cm;
-
-    size_t fdsSize;
-    LIST_HEAD(, UA_RegisteredFD) fds;
-} ETHConnectionManager;
-
-static UA_StatusCode
-ETHConnectionManager_register(ETHConnectionManager *ecm, UA_RegisteredFD *rfd) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ecm->cm.eventSource.eventLoop;
-
-    /* Set the EventSource */
-    rfd->es = &ecm->cm.eventSource;
-
-    /* Register in the EventLoop */
-    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, rfd);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-
-    /* Add to the linked list in the ETH EventSource */
-    LIST_INSERT_HEAD(&ecm->fds, rfd, es_pointers);
-    ecm->fdsSize++;
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-ETHConnectionManager_deregister(ETHConnectionManager *ecm, UA_RegisteredFD *rfd) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ecm->cm.eventSource.eventLoop;
-    UA_EventLoopPOSIX_deregisterFD(el, rfd);
-    LIST_REMOVE(rfd, es_pointers);
-    UA_assert(ecm->fdsSize > 0);
-    ecm->fdsSize--;
-}
-
-static UA_RegisteredFD *
-ETHConnectionManager_findRegisteredFD(ETHConnectionManager *ecm, uintptr_t connectionId) {
-    UA_RegisteredFD *rfd;
-    LIST_FOREACH(rfd, &ecm->fds, es_pointers) {
-        if(rfd->fd == (UA_FD)connectionId)
-            return rfd;
-    }
-    return NULL;
-}
-
 /* The format of a Ethernet address is six groups of hexadecimal digits,
  * separated by hyphens (e.g. 01-23-45-67-89-ab). */
 static UA_StatusCode
@@ -223,10 +183,11 @@ setETHHeader(unsigned char *buf,
 static UA_StatusCode
 ETH_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
                        UA_ByteString *buf, size_t bufSize) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+
     /* Get the ETH_FD */
-    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
-    UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
-    ETH_FD *erfd = (ETH_FD*)rfd;
+    UA_FD fd = (UA_FD)connectionId;
+    ETH_FD *erfd = (ETH_FD*)ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
     if(!erfd)
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
 
@@ -240,11 +201,14 @@ ETH_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
 static void
 ETH_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
                       UA_ByteString *buf) {
-    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
-    UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
-    ETH_FD *erfd = (ETH_FD*)rfd;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+
+    /* Get the ETH_FD */
+    UA_FD fd = (UA_FD)connectionId;
+    ETH_FD *erfd = (ETH_FD*)ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
     if(!erfd)
         return;
+
     /* Unhide the Ethernet header */
     buf->data   -= erfd->headerSize;
     buf->length += erfd->headerSize;
@@ -253,11 +217,14 @@ ETH_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 /* Test if the ConnectionManager can be stopped */
 static void
-ETH_checkStopped(ETHConnectionManager *ecm) {
-    if(ecm->fdsSize == 0 && ecm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
-        UA_LOG_DEBUG(ecm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+ETH_checkStopped(UA_POSIXConnectionManager *pcm) {
+    UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop)->elMutex, 1);
+
+    if(pcm->fdsSize == 0 &&
+       pcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
+        UA_LOG_DEBUG(pcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                      "ETH\t| All sockets closed, the EventLoop has stopped");
-        ecm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+        pcm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
     }
 }
 
@@ -265,32 +232,40 @@ ETH_checkStopped(ETHConnectionManager *ecm) {
  * the EventLoop. Otherwise we cannot be sure whether the file descriptor is
  * still used after calling close. */
 static void
-ETH_close(ETHConnectionManager *ecm, UA_RegisteredFD *rfd) {
-    ETH_FD *erfd = (ETH_FD*)rfd;
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ecm->cm.eventSource.eventLoop;
+ETH_close(UA_POSIXConnectionManager *pcm, ETH_FD *conn) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "ETH %u\t| Closing connection", (unsigned)rfd->fd);
+                 "ETH %u\t| Closing connection",
+                 (unsigned)conn->rfd.fd);
 
     /* Deregister from the EventLoop */
-    ETHConnectionManager_deregister(ecm, rfd);
+    UA_EventLoopPOSIX_deregisterFD(el, &conn->rfd);
+
+    /* Deregister internally */
+    ZIP_REMOVE(UA_FDTree, &pcm->fds, &conn->rfd);
+    UA_assert(pcm->fdsSize > 0);
+    pcm->fdsSize--;
 
     /* Signal closing to the application */
-    erfd->connectionCallback(&ecm->cm, (uintptr_t)rfd->fd,
-                              rfd->application, &rfd->context,
-                              UA_CONNECTIONSTATE_CLOSING,
-                              &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_UNLOCK(&el->elMutex);
+    conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
+                        conn->application, &conn->context,
+                        UA_CONNECTIONSTATE_CLOSING,
+                        &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_LOCK(&el->elMutex);
 
     /* Close the socket */
-    int ret = UA_close(rfd->fd);
+    int ret = UA_close(conn->rfd.fd);
     if(ret == 0) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                    "ETH %u\t| Socket closed", (unsigned)rfd->fd);
+                    "ETH %u\t| Socket closed", (unsigned)conn->rfd.fd);
     } else {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "ETH %u\t| Could not close the socket (%s)",
-                          (unsigned)rfd->fd, errno_str));
+                          (unsigned)conn->rfd.fd, errno_str));
     }
 
     /* Don't call free here. This might be done automatically via the delayed
@@ -298,28 +273,32 @@ ETH_close(ETHConnectionManager *ecm, UA_RegisteredFD *rfd) {
     /* UA_free(rfd); */
 
     /* Stop if the ucm is stopping and this was the last open socket */
-    ETH_checkStopped(ecm);
+    ETH_checkStopped(pcm);
 }
 
 static void
 ETH_delayedClose(void *application, void *context) {
-    ETHConnectionManager *ecm = (ETHConnectionManager*)application;
-    UA_ConnectionManager *cm = &ecm->cm;
-    UA_RegisteredFD* rfd = (UA_RegisteredFD *)context;
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
-                 "ETH %u\t| Delayed closing of the connection", (unsigned)rfd->fd);
-    ETH_close(ecm, rfd);
-    UA_free(rfd);
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)application;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    ETH_FD *conn = (ETH_FD*)context;
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "ETH %u\t| Delayed closing of the connection",
+                 (unsigned)conn->rfd.fd);
+    UA_LOCK(&el->elMutex);
+    ETH_close(pcm, conn);
+    UA_UNLOCK(&el->elMutex);
+    UA_free(conn);
 }
 
 /* Gets called when a socket receives data or closes */
 static void
 ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                              short event) {
-    ETH_FD *efd = (ETH_FD*)rfd;
-    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
+    ETH_FD *conn = (ETH_FD*)rfd;
     if(event == UA_FDEVENT_ERR) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -327,11 +306,13 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
                         (unsigned)rfd->fd, errno_str));
 
         /* A new socket has opened. Signal it to the application. */
-        efd->connectionCallback(cm, (uintptr_t)rfd->fd,
-                                rfd->application, &rfd->context,
-                                UA_CONNECTIONSTATE_CLOSING,
-                                &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-        ETH_close(ecm, rfd);
+        UA_UNLOCK(&el->elMutex);
+        conn->applicationCB(cm, (uintptr_t)rfd->fd,
+                            conn->application, &conn->context,
+                            UA_CONNECTIONSTATE_CLOSING,
+                            &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+        UA_LOCK(&el->elMutex);
+        ETH_close(pcm, conn);
         UA_free(rfd);
         return;
     }
@@ -352,9 +333,11 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 
     /* Receive */
 #ifndef _WIN32
-    ssize_t ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    ssize_t ret = UA_recv(rfd->fd, (char*)response.data,
+                          response.length, MSG_DONTWAIT);
 #else
-    int ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    int ret = UA_recv(rfd->fd, (char*)response.data,
+                      response.length, MSG_DONTWAIT);
 #endif
 
     /* Receive has failed */
@@ -371,7 +354,7 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
            UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                         "ETH %u\t| recv signaled the socket was shutdown (%s)",
                         (unsigned)rfd->fd, errno_str));
-        ETH_close(ecm, rfd);
+        ETH_close(pcm, conn);
         UA_free(rfd);
         UA_ByteString_clear(&response);
         return;
@@ -432,29 +415,33 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     /* Callback to the application layer with the Ethernet header hidden */
     response.data += headerSize;
     response.length -= headerSize;
-    efd->connectionCallback(cm, (uintptr_t)rfd->fd, rfd->application, &rfd->context,
-                              UA_CONNECTIONSTATE_ESTABLISHED, &map, response);
+    UA_UNLOCK(&el->elMutex);
+    conn->applicationCB(cm, (uintptr_t)rfd->fd, conn->application, &conn->context,
+                        UA_CONNECTIONSTATE_ESTABLISHED, &map, response);
+    UA_LOCK(&el->elMutex);
     response.data -= headerSize;
     response.length += headerSize;
     UA_ByteString_clear(&response);
 }
 
 static UA_StatusCode
-ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
+ETH_openListenConnection(UA_EventLoopPOSIX *el, ETH_FD *conn,
                          const UA_KeyValueMap *params,
                          int ifindex, UA_UInt16 etherType) {
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     /* Bind the socket to interface and EtherType. Don't receive anything else. */
     struct sockaddr_ll sll;
     memset(&sll, 0, sizeof(struct sockaddr_ll));
     sll.sll_family = AF_PACKET;
     sll.sll_protocol = htons(etherType);
     sll.sll_ifindex = ifindex;
-    if(UA_bind(fd->fd.fd, (struct sockaddr*)&sll, sizeof(sll)) < 0)
+    if(UA_bind(conn->rfd.fd, (struct sockaddr*)&sll, sizeof(sll)) < 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     /* Immediately register for listen events. Don't have to wait for a
      * connection to open. */
-    fd->fd.listenEvents = UA_FDEVENT_IN;
+    conn->rfd.listenEvents = UA_FDEVENT_IN;
 
     /* Set receiving to promiscuous (all target host addresses) */
     const UA_Boolean *promiscuous = (const UA_Boolean*)
@@ -465,16 +452,18 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
         memset(&mreq, 0, sizeof(struct packet_mreq));
         mreq.mr_ifindex = ifindex;
         mreq.mr_type = PACKET_MR_PROMISC;
-        int ret = setsockopt(fd->fd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mreq, sizeof(mreq));
+        int ret = setsockopt(conn->rfd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
+                             &mreq, sizeof(mreq));
         if(ret < 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
-               UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+               UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                             "ETH %u\t| Could not set raw socket to promiscuous mode %s",
-                            (unsigned)fd->fd.fd, errno_str));
+                            (unsigned)conn->rfd.fd, errno_str));
             return UA_STATUSCODE_BADINTERNALERROR;
         } else {
-            UA_LOG_INFO(el->logger, UA_LOGCATEGORY_NETWORK,
-                        "ETH %u\t| The socket was set to promiscuous mode", (unsigned)fd->fd.fd);
+            UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                        "ETH %u\t| The socket was set to promiscuous mode",
+                        (unsigned)conn->rfd.fd);
         }
     }
 
@@ -486,13 +475,13 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
         UA_Byte addr[ETHER_ADDR_LEN];
         UA_StatusCode res = parseEthAddress(address, addr);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+            UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                          "ETH\t| Address for listening cannot be parsed");
             return res;
         }
 
         if(!isMulticastEthAddress(addr)) {
-            UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                          "ETH\t| Address for listening is not a multicast address. Ignoring.");
             return UA_STATUSCODE_GOOD;
         }
@@ -502,11 +491,11 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
         mreq.mr_type = PACKET_MR_MULTICAST;
         mreq.mr_alen = ETH_ALEN;
         memcpy(mreq.mr_address, addr, ETHER_ADDR_LEN);
-        int ret = UA_setsockopt(fd->fd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
+        int ret = UA_setsockopt(conn->rfd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
                                 (char *)&mreq, sizeof(mreq));
         if(ret < 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
-               UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+               UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                             "ETH\t| Registering for multicast failed with error %s", errno_str));
             return UA_STATUSCODE_BADINTERNALERROR;
         }
@@ -516,9 +505,10 @@ ETH_openListenConnection(UA_EventLoop *el, ETH_FD *fd,
 }
 
 static UA_StatusCode
-ETH_openSendConnection(UA_EventLoop *el, ETH_FD *fd,
-                       const UA_KeyValueMap *params,
+ETH_openSendConnection(UA_EventLoopPOSIX *el, ETH_FD *conn, const UA_KeyValueMap *params,
                        UA_Byte source[ETHER_ADDR_LEN], int ifindex, UA_UInt16 etherType) {
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     /* Parse the target address (has to exist) */
     const UA_String *address = (const UA_String*)
         UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_ADDR].name,
@@ -526,7 +516,7 @@ ETH_openSendConnection(UA_EventLoop *el, ETH_FD *fd,
     UA_Byte dest[ETHER_ADDR_LEN];
     UA_StatusCode res = parseEthAddress(address, dest);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "ETH\t| Could not parse the Ethernet address \"%.*s\"",
                      (int)address->length, (char*)address->data);
         return res;
@@ -556,13 +546,13 @@ ETH_openSendConnection(UA_EventLoop *el, ETH_FD *fd,
         eid = *eidp;
 
     /* Store the structure for sendto */
-    fd->sll.sll_ifindex = ifindex;
-	fd->sll.sll_halen = ETH_ALEN;
-    memcpy(fd->sll.sll_addr, dest, ETHER_ADDR_LEN);
+    conn->sll.sll_ifindex = ifindex;
+	conn->sll.sll_halen = ETH_ALEN;
+    memcpy(conn->sll.sll_addr, dest, ETHER_ADDR_LEN);
 
     /* Generate the Ethernet header */
-    fd->headerSize = setETHHeader(fd->header, dest, source, etherType,
-                                  vid, pcp, eid, &fd->lengthOffset);
+    conn->headerSize = setETHHeader(conn->header, dest, source, etherType,
+                                  vid, pcp, eid, &conn->lengthOffset);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -570,8 +560,10 @@ static UA_StatusCode
 ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
-    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
-    UA_EventLoop *el = cm->eventSource.eventLoop;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)cm->eventSource.eventLoop;
+
+    UA_LOCK(&el->elMutex);
 
     /* Listen or send connection? */
     const UA_Boolean *listen = (const UA_Boolean*)
@@ -583,10 +575,12 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
 
     /* Validate the parameters */
     UA_StatusCode res =
-        UA_KeyValueRestriction_validate(el->logger, "ETH", ETHConfigParameters,
+        UA_KeyValueRestriction_validate(el->eventLoop.logger, "ETH", ETHConfigParameters,
                                         ETH_PARAMETERSSIZE, params);
-    if(res != UA_STATUSCODE_GOOD)
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&el->elMutex);
         return res;
+    }
 
     /* Get the EtherType parameter */
     UA_UInt16 etherType = ETH_P_ALL;
@@ -600,28 +594,32 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
     const UA_String *interface = (const UA_String*)
         UA_KeyValueMap_getScalar(params, ETHConfigParameters[ETH_PARAMINDEX_IFACE].name,
                                  &UA_TYPES[UA_TYPES_STRING]);
-    if(interface->length >= 128)
+    if(interface->length >= 128) {
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
     char ifname[128];
     memcpy(ifname, interface->data, interface->length);
     ifname[interface->length] = 0;
     int ifindex = (int)if_nametoindex(ifname);
     if(ifindex == 0) {
-        UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "ETH\t| Could not find the interface %s", ifname);
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Create the socket and add the basic configuration */
-    ETH_FD *fd = NULL;
+    ETH_FD *conn = NULL;
     UA_FD sockfd;
     if(listen && *listen)
         sockfd = UA_socket(PF_PACKET, SOCK_RAW, htons(etherType));
     else
         sockfd = UA_socket(PF_PACKET, SOCK_RAW, 0); /* Don't receive */
     if(sockfd == -1) {
-        UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "ETH\t| Could not create a raw Ethernet socket (are you root?)");
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     res |= UA_EventLoopPOSIX_setReusable(sockfd);
@@ -631,16 +629,18 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         goto cleanup;
 
     /* Create the FD object */
-    fd = (ETH_FD*)UA_calloc(1, sizeof(ETH_FD));
-    if(!fd) {
+    conn = (ETH_FD*)UA_calloc(1, sizeof(ETH_FD));
+    if(!conn) {
         res = UA_STATUSCODE_BADOUTOFMEMORY;
         goto cleanup;
     }
-    fd->fd.context = context;
-    fd->fd.application = application;
-    fd->fd.callback = (UA_FDCallback)ETH_connectionSocketCallback;
-    fd->fd.fd = sockfd;
-    fd->connectionCallback = connectionCallback;
+
+    conn->rfd.fd = sockfd;
+    conn->rfd.es = &pcm->cm.eventSource;
+    conn->rfd.eventSourceCB = (UA_FDCallback)ETH_connectionSocketCallback;
+    conn->context = context;
+    conn->application = application;
+    conn->applicationCB = connectionCallback;
 
     /* Configure a listen or a send connection */
     if(!listen || !*listen) {
@@ -648,94 +648,117 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         struct ifreq ifr;
         memcpy(ifr.ifr_name, ifname, interface->length);
         ifr.ifr_name[interface->length] = 0;
-        int result = ioctl(fd->fd.fd, SIOCGIFHWADDR, &ifr);
+        int result = ioctl(conn->rfd.fd, SIOCGIFHWADDR, &ifr);
         if(result == -1) {
             UA_LOG_SOCKET_ERRNO_WRAP(
-               UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+               UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                             "ETH %u\t| Cannot get the source address, %s",
-                            (unsigned)fd->fd.fd, errno_str));
+                            (unsigned)conn->rfd.fd, errno_str));
             res = UA_STATUSCODE_BADCONNECTIONREJECTED;
             goto cleanup;
         }
-        res = ETH_openSendConnection(el, fd, params,
+        res = ETH_openSendConnection(el, conn, params,
                                      (unsigned char*)ifr.ifr_hwaddr.sa_data,
                                      ifindex, etherType);
     } else {
-        res = ETH_openListenConnection(el, fd, params, ifindex, etherType);
+        res = ETH_openListenConnection(el, conn, params, ifindex, etherType);
     }
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 
-    res = ETHConnectionManager_register(ecm, &fd->fd);
+    /* Register in the EventLoop */
+    res = UA_EventLoopPOSIX_registerFD(el, &conn->rfd);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 
+    /* Register locally */
+    ZIP_INSERT(UA_FDTree, &pcm->fds, &conn->rfd);
+    pcm->fdsSize++;
+
     /* Register the listen socket in the application */
-    connectionCallback(cm, (uintptr_t)sockfd, application, &fd->fd.context,
+    UA_UNLOCK(&el->elMutex);
+    connectionCallback(cm, (uintptr_t)sockfd, application, &conn->context,
                        UA_CONNECTIONSTATE_ESTABLISHED, &UA_KEYVALUEMAP_NULL,
                        UA_BYTESTRING_NULL);
     return UA_STATUSCODE_GOOD;
 
  cleanup:
     UA_close(sockfd);
-    UA_free(fd);
+    UA_free(conn);
+    UA_UNLOCK(&el->elMutex);
     return res;
 }
 
-/* Close the connection via a delayed callback */
 static void
-ETH_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
-    UA_EventLoop *el = cm->eventSource.eventLoop;
-    if(rfd->dc.callback) {
-        UA_LOG_INFO(el->logger, UA_LOGCATEGORY_NETWORK,
+ETH_shutdown(UA_POSIXConnectionManager *pcm, ETH_FD *conn) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop)->elMutex, 1);
+
+    UA_DelayedCallback *dc = &conn->rfd.dc;
+    if(dc->callback) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "ETH %u\t| Cannot close - already closing",
-                    (unsigned)rfd->fd);
+                    (unsigned)conn->rfd.fd);
         return;
     }
 
-    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
-                 "ETH %u\t| Shutdown called", (unsigned)rfd->fd);
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "ETH %u\t| Shutdown called", (unsigned)conn->rfd.fd);
 
-    UA_DelayedCallback *dc = &rfd->dc;
     dc->callback = ETH_delayedClose;
-    dc->application = cm;
-    dc->context = rfd;
-    el->addDelayedCallback(el, dc);
+    dc->application = pcm;
+    dc->context = conn;
+
+    /* Don't use the "public" el->addDelayedCallback. It takes a lock. */
+    dc->next = el->delayedCallbacks;
+    el->delayedCallbacks = dc;
 }
 
 static UA_StatusCode
 ETH_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
-    UA_EventLoop *el = cm->eventSource.eventLoop;
-    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
-    UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_LOCK(&el->elMutex);
+
+    /* Get the ETH_FD */
+    UA_FD fd = (UA_FD)connectionId;
+    UA_RegisteredFD *rfd = ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
     if(!rfd) {
-        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "ETH\t| Cannot close Ethernet connection %u - not found",
                        (unsigned)connectionId);
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
-    ETH_shutdown(cm, rfd);
+    ETH_shutdown(pcm, (ETH_FD*)rfd);
+    UA_UNLOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
 ETH_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                        const UA_KeyValueMap *params, UA_ByteString *buf) {
-    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
-    UA_EventLoop *el = cm->eventSource.eventLoop;
-    UA_RegisteredFD *rfd = ETHConnectionManager_findRegisteredFD(ecm, connectionId);
-    ETH_FD *efd = (ETH_FD*)rfd;
-    if(!efd)
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+
+    UA_LOCK(&el->elMutex);
+
+    /* Get the ETH_FD */
+    UA_FD fd = (UA_FD)connectionId;
+    ETH_FD *conn = (ETH_FD*)ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
+    if(!conn) {
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
 
     /* Uncover and set the Ethernet header */
-    buf->data -= efd->headerSize;
-    buf->length += efd->headerSize;
-    memcpy(buf->data, efd->header, efd->headerSize);
-    if(efd->lengthOffset) {
-        UA_UInt16 *ethLength =  (UA_UInt16*)&buf->data[efd->lengthOffset];
-        *ethLength = htons((UA_UInt16)(buf->length - efd->headerSize));
+    buf->data -= conn->headerSize;
+    buf->length += conn->headerSize;
+    memcpy(buf->data, conn->header, conn->headerSize);
+    if(conn->lengthOffset) {
+        UA_UInt16 *ethLength =  (UA_UInt16*)&buf->data[conn->lengthOffset];
+        *ethLength = htons((UA_UInt16)(buf->length - conn->headerSize));
     }
 
     /* Prevent OS signals when sending to a closed socket */
@@ -750,21 +773,22 @@ ETH_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     do {
         ssize_t n = 0;
         do {
-            UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+            UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                          "ETH %u\t| Attempting to send", (unsigned)connectionId);
             size_t bytes_to_send = buf->length - nWritten;
-            n = UA_sendto(rfd->fd, (const char*)buf->data + nWritten, bytes_to_send,
-                          flags, (struct sockaddr*)&efd->sll, sizeof(efd->sll));
+            n = UA_sendto(conn->rfd.fd, (const char*)buf->data + nWritten, bytes_to_send,
+                          flags, (struct sockaddr*)&conn->sll, sizeof(conn->sll));
             if(n < 0) {
                 /* An error we cannot recover from? */
                 if(UA_ERRNO != UA_INTERRUPTED &&
                    UA_ERRNO != UA_WOULDBLOCK &&
                    UA_ERRNO != UA_AGAIN) {
                     UA_LOG_SOCKET_ERRNO_WRAP(
-                       UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                       UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                                     "ETH %u\t| Send failed with error %s",
                                     (unsigned)connectionId, errno_str));
-                    ETH_shutdownConnection(cm, connectionId);
+                    ETH_shutdown(pcm, conn);
+                    UA_UNLOCK(&el->elMutex);
                     UA_ByteString_clear(buf);
                     return UA_STATUSCODE_BADCONNECTIONCLOSED;
                 }
@@ -776,10 +800,11 @@ ETH_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                     poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
                     if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED) {
                         UA_LOG_SOCKET_ERRNO_WRAP(
-                           UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                           UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                                         "ETH %u\t| Send failed with error %s",
                                         (unsigned)connectionId, errno_str));
-                        ETH_shutdownConnection(cm, connectionId);
+                        ETH_shutdown(pcm, conn);
+                        UA_UNLOCK(&el->elMutex);
                         UA_ByteString_clear(buf);
                         return UA_STATUSCODE_BADCONNECTIONCLOSED;
                     }
@@ -790,45 +815,59 @@ ETH_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     } while(nWritten < buf->length);
 
     /* Free the buffer */
+    UA_UNLOCK(&el->elMutex);
     UA_ByteString_clear(buf);
     return UA_STATUSCODE_GOOD;
 }
 
-/* Asynchronously register the listenSocket */
 static UA_StatusCode
 ETH_eventSourceStart(UA_ConnectionManager *cm) {
-    /* Check the state */
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOCK(&el->elMutex);
+
+    /* Check the state */
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "To start the Ethernet ConnectionManager, "
                      "it has to be registered in an EventLoop and not started");
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Set the EventSource to the started state */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
+
+    UA_UNLOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
+static void *
+ETH_shutdownCB(void *application, UA_RegisteredFD *rfd) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)application;
+    ETH_shutdown(pcm, (ETH_FD*)rfd);
+    return NULL;
+}
+
 static void
 ETH_eventSourceStop(UA_ConnectionManager *cm) {
-    ETHConnectionManager *ecm = (ETHConnectionManager*)cm;
-    UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK(&el->elMutex);
+
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                 "ETH\t| Shutting down the ConnectionManager");
 
+    /* Prevent new connections to open */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
-    /* Shut down all registered fd. The cm is set to "stopped" when the last fd
-     * is closed (from within ETH_close). */
-    UA_RegisteredFD *rfd;
-    LIST_FOREACH(rfd, &ecm->fds, es_pointers) {
-        ETH_shutdown(cm, rfd);
-    }
+    /* Shutdown all existing connection */
+    ZIP_ITER(UA_FDTree, &pcm->fds, ETH_shutdownCB, cm);
 
     /* Check if stopped once more (also checking inside ETH_close, but there we
      * don't check if there is no rfd at all) */
-    ETH_checkStopped(ecm);
+    ETH_checkStopped(pcm);
+
+    UA_UNLOCK(&el->elMutex);
 }
 
 static UA_StatusCode
@@ -850,8 +889,8 @@ static const char *ethName = "eth";
 
 UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName) {
-    ETHConnectionManager *cm = (ETHConnectionManager*)
-        UA_calloc(1, sizeof(ETHConnectionManager));
+    UA_POSIXConnectionManager *cm = (UA_POSIXConnectionManager*)
+        UA_calloc(1, sizeof(UA_POSIXConnectionManager));
     if(!cm)
         return NULL;
 
diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
index 7090a699949..d30acca12f7 100644
--- a/arch/eventloop_posix_interrupt.c
+++ b/arch/eventloop_posix_interrupt.c
@@ -12,35 +12,44 @@
  * - Linux: Use signalfd
  * - Other: Use the self-pipe trick (http://cr.yp.to/docs/selfpipe.html) */
 
-struct UA_RegisteredSignal;
-typedef struct UA_RegisteredSignal UA_RegisteredSignal;
-
-struct UA_RegisteredSignal {
+typedef struct UA_RegisteredSignal {
+#ifdef UA_HAVE_EPOLL
+    /* With epoll, register each signal with a socket.
+     * This has to be the first element of the struct to allow casting. */
     UA_RegisteredFD rfd;
-
-    LIST_ENTRY(UA_RegisteredSignal) signalsEntry; /* List in the InterruptManager */
+#else
+    /* Without epoll, we add the rfd to a tailq and self-pipe to trigger the
+     * traversal of the tailq */
     TAILQ_ENTRY(UA_RegisteredSignal) triggeredEntry;
+#endif
 
-    UA_Boolean active; /* Signals are only active when the EventLoop is started */
-    UA_Boolean triggered;
+    LIST_ENTRY(UA_RegisteredSignal) listPointers;
 
-    int signal; /* POSIX identifier of the interrupt signal */
     UA_InterruptCallback signalCallback;
-};
+    void *context;
+    int signal; /* POSIX identifier of the interrupt signal */
+
+    UA_Boolean active; /* Signals are only active when the EventLoop is started */
+    UA_Boolean triggered;
+} UA_RegisteredSignal;
 
 typedef struct {
     UA_InterruptManager im;
+
+    /* Registered signals */
+    size_t signalsSize;
     LIST_HEAD(, UA_RegisteredSignal) signals;
+
 #ifndef UA_HAVE_EPOLL
     UA_RegisteredFD readFD;
     UA_FD writeFD;
     TAILQ_HEAD(, UA_RegisteredSignal) triggered;
 #endif
-} POSIXInterruptManager;
+} UA_POSIXInterruptManager;
 
 #ifndef UA_HAVE_EPOLL
 /* On non-linux systems we can have at most one interrupt manager */
-static POSIXInterruptManager *singletonIM = NULL;
+static UA_POSIXInterruptManager *singletonIM = NULL;
 #endif
 
 /* The following methods have to be implemented for epoll/self-pipe each. */
@@ -52,6 +61,9 @@ static void deactivateSignal(UA_RegisteredSignal *rs);
 
 static void
 handlePOSIXInterruptEvent(UA_EventSource *es, UA_RegisteredFD *rfd, short event) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     UA_RegisteredSignal *rs = (UA_RegisteredSignal*)rfd;
     struct signalfd_siginfo fdsi;
     ssize_t s = read(rfd->fd, &fdsi, sizeof(fdsi));
@@ -66,13 +78,17 @@ handlePOSIXInterruptEvent(UA_EventSource *es, UA_RegisteredFD *rfd, short event)
                  "Interrupt %u\t| Received a signal %u",
                  (unsigned)rfd->fd, fdsi.ssi_signo);
 
-    rs->signalCallback((UA_InterruptManager *)es,
-                       (uintptr_t)rfd->fd, rfd->context, &UA_KEYVALUEMAP_NULL);
+    UA_UNLOCK(&el->elMutex);
+    rs->signalCallback((UA_InterruptManager *)es, (uintptr_t)rfd->fd,
+                       rs->context, &UA_KEYVALUEMAP_NULL);
+    UA_LOCK(&el->elMutex);
 }
 
 static void
 activateSignal(UA_RegisteredSignal *rs) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)rs->rfd.es->eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     if(rs->active)
         return;
 
@@ -103,7 +119,7 @@ activateSignal(UA_RegisteredSignal *rs) {
     }
 
     rs->rfd.fd = newfd;
-    rs->rfd.callback = handlePOSIXInterruptEvent;
+    rs->rfd.eventSourceCB = handlePOSIXInterruptEvent;
     rs->rfd.listenEvents = UA_FDEVENT_IN;
 
     /* Register the fd in the EventLoop */
@@ -122,13 +138,15 @@ activateSignal(UA_RegisteredSignal *rs) {
 
 static void
 deactivateSignal(UA_RegisteredSignal *rs) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)rs->rfd.es->eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     /* Only dectivate if active */
     if(!rs->active)
         return;
     rs->active = false;
 
     /* Stop receiving the signal on the FD */
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)rs->rfd.es->eventLoop;
     UA_EventLoopPOSIX_deregisterFD(el, &rs->rfd);
 
     /* Unblock the signal */
@@ -147,20 +165,21 @@ static void
 triggerPOSIXInterruptEvent(int sig) {
     UA_assert(singletonIM != NULL);
 
-    /* Don't call the interrupt callback right now.
-     * Instead, add to the triggered list and call from the EventLoop. */
+    /* Don't take a lock. All we are doing here can be done from within a
+     * (reentrant) interrupt. */
+
+    /* Get the rs. Only use it if not already triggered. */
     UA_RegisteredSignal *rs;
-    LIST_FOREACH(rs, &singletonIM->signals, signalsEntry) {
-        if(rs->signal == sig) {
-            if(rs->triggered)
-                break; /* A signal can be only once in the triggered list -> is there
-                          already */
-
-            TAILQ_INSERT_TAIL(&singletonIM->triggered, rs, triggeredEntry);
-            rs->triggered = true;
+    LIST_FOREACH(rs, &singletonIM->signals, listPointers) {
+        if(rs->signal == sig)
             break;
-        }
     }
+    if(!rs || rs->triggered || !rs->active)
+        return;
+
+    /* Add to the triggered list */
+    TAILQ_INSERT_TAIL(&singletonIM->triggered, rs, triggeredEntry);
+    rs->triggered = true;
 
 #ifdef _WIN32
     /* On WIN32 we have to re-arm the signal or it will go back to SIG_DFL */
@@ -185,19 +204,20 @@ triggerPOSIXInterruptEvent(int sig) {
 static void
 activateSignal(UA_RegisteredSignal *rs) {
     UA_assert(singletonIM != NULL);
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)singletonIM->im.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
-    /* Already active? */
+    /* Register the signal on the OS level */
     if(rs->active)
         return;
 
-    /* Register the signal on the OS level */
     void (*prev)(int);
     prev = signal(rs->signal, triggerPOSIXInterruptEvent);
     if(prev == SIG_ERR) {
         UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(singletonIM->im.eventSource.eventLoop->logger,
-                           UA_LOGCATEGORY_EVENTLOOP,
-                           "Error registering the signal: %s", errno_str));
+           UA_LOG_WARNING(singletonIM->im.eventSource.eventLoop->logger,
+                          UA_LOGCATEGORY_EVENTLOOP,
+                          "Error registering the signal: %s", errno_str));
         return;
     }
 
@@ -206,10 +226,13 @@ activateSignal(UA_RegisteredSignal *rs) {
 
 static void
 deactivateSignal(UA_RegisteredSignal *rs) {
+    UA_assert(singletonIM != NULL);
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)singletonIM->im.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     /* Only dectivate if active */
     if(!rs->active)
         return;
-    rs->active = false;
 
     /* Stop receiving the signal */
     signal(rs->signal, SIG_DFL);
@@ -219,11 +242,16 @@ deactivateSignal(UA_RegisteredSignal *rs) {
         TAILQ_REMOVE(&singletonIM->triggered, rs, triggeredEntry);
         rs->triggered = false;
     }
+
+    rs->active = false;
 }
 
 /* Execute all triggered interrupts via the self-pipe trick from within the EventLoop */
 static void
 executeTriggeredPOSIXInterrupts(UA_EventSource *es, UA_RegisteredFD *rfd, short event) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)es->eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     /* Re-arm the socket for the next signal by reading from it */
     char buf[128];
 #ifdef _WIN32
@@ -239,8 +267,10 @@ executeTriggeredPOSIXInterrupts(UA_EventSource *es, UA_RegisteredFD *rfd, short
     TAILQ_FOREACH_SAFE(rs, &singletonIM->triggered, triggeredEntry, rs_tmp) {
         TAILQ_REMOVE(&singletonIM->triggered, rs, triggeredEntry);
         rs->triggered = false;
+        UA_UNLOCK(&el->elMutex);
         rs->signalCallback(&singletonIM->im, (uintptr_t)rs->signal,
-                           rs->rfd.context, &UA_KEYVALUEMAP_NULL);
+                           rs->context, &UA_KEYVALUEMAP_NULL);
+        UA_LOCK(&el->elMutex);
     }
 }
 
@@ -258,49 +288,69 @@ registerPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    UA_LOCK(&el->elMutex);
+
     /* Was the signal already registered? */
-    POSIXInterruptManager *pim = (POSIXInterruptManager *)im;
+    int signal = (int)interruptHandle;
+    UA_POSIXInterruptManager *pim = (UA_POSIXInterruptManager *)im;
     UA_RegisteredSignal *rs;
-    LIST_FOREACH(rs, &pim->signals, signalsEntry) {
-        if(rs->signal == (int)interruptHandle) {
-            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                           "Interrupt\t| Signal %u already registered",
-                           (unsigned)interruptHandle);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
+    LIST_FOREACH(rs, &pim->signals, listPointers) {
+        if(rs->signal == signal)
+            break;
+    }
+    if(rs) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                       "Interrupt\t| Signal %u already registered",
+                       (unsigned)interruptHandle);
+        UA_UNLOCK(&el->elMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Create and populate the new context object */
     rs = (UA_RegisteredSignal *)UA_calloc(1, sizeof(UA_RegisteredSignal));
-    if(!rs)
+    if(!rs) {
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+#ifdef UA_HAVE_EPOLL
+    rs->rfd.es = &im->eventSource;
+#endif
     rs->signal = (int)interruptHandle;
     rs->signalCallback = callback;
-    rs->rfd.es = &im->eventSource;
-    rs->rfd.context = interruptContext;
+    rs->context = interruptContext;
 
     /* Add to the InterruptManager */
-    LIST_INSERT_HEAD(&pim->signals, rs, signalsEntry);
+    LIST_INSERT_HEAD(&pim->signals, rs, listPointers);
+    pim->signalsSize++;
 
     /* Activate if we are already running */
     if(pim->im.eventSource.state == UA_EVENTSOURCESTATE_STARTED)
         activateSignal(rs);
 
+    UA_UNLOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 static void
 deregisterPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle) {
-    POSIXInterruptManager *pim = (POSIXInterruptManager *)im;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)im->eventSource.eventLoop;
+    UA_POSIXInterruptManager *pim = (UA_POSIXInterruptManager *)im;
+    UA_LOCK(&el->elMutex);
+
+    int signal = (int)interruptHandle;
     UA_RegisteredSignal *rs;
-    LIST_FOREACH(rs, &pim->signals, signalsEntry) {
-        if(rs->rfd.fd == (UA_FD)interruptHandle) {
-            deactivateSignal(rs);
-            LIST_REMOVE(rs, signalsEntry);
-            UA_free(rs);
-            return;
-        }
+    LIST_FOREACH(rs, &pim->signals, listPointers) {
+        if(rs->signal == signal)
+            break;
+    }
+    if(rs) {
+        deactivateSignal(rs);
+        LIST_REMOVE(rs, listPointers);
+        UA_free(rs);
     }
+
+    UA_UNLOCK(&el->elMutex);
 }
 
 #ifdef _WIN32
@@ -330,37 +380,21 @@ pair(SOCKET fds[2]) {
 }
 #endif
 
-#if !defined(UA_HAVE_EPOLL) && !defined(_WIN32)
-/* mark fd as non-blocking */
-static int
-markNonBlock(int fd)
-{
-    int flags;
-
-    flags = fcntl(fd, F_GETFL);
-    if (flags < 0)
-        return flags;
-
-    flags |= O_NONBLOCK;
-
-    return fcntl(fd, F_SETFL, flags);
-}
-#endif
-
 static UA_StatusCode
 startPOSIXInterruptManager(UA_EventSource *es) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
-    (void)el;
+    UA_LOCK(&el->elMutex);
 
     /* Check the state */
     if(es->state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                      "Interrupt\t| To start the InterruptManager, "
                      "it has to be registered in an EventLoop and not started");
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    POSIXInterruptManager *pim = (POSIXInterruptManager *)es;
+    UA_POSIXInterruptManager *pim = (UA_POSIXInterruptManager *)es;
     UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Interrupt\t| Starting the InterruptManager");
 
@@ -377,19 +411,22 @@ startPOSIXInterruptManager(UA_EventSource *es) {
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "Interrupt\t| Could not open the pipe for "
                           "self-signaling (%s)", errno_str));
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
 #ifndef _WIN32
     /* Mark pipes as non-blocking */
-    for (size_t i = 0; i < (sizeof(pipefd) / sizeof(*pipefd)); ++i) {
-        err = markNonBlock(pipefd[i]);
-        if (err != 0) {
+    for(size_t i = 0; i < (sizeof(pipefd) / sizeof(*pipefd)); ++i) {
+        res = UA_EventLoopPOSIX_setNonBlocking(pipefd[i]);
+        if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                                "Interrupt\t| Could mark pipe for "
                                "self-signaling as non-blocking(%s)",
                                errno_str));
+            UA_UNLOCK(&el->elMutex);
             return UA_STATUSCODE_BADINTERNALERROR;
         }
     }
@@ -401,48 +438,55 @@ startPOSIXInterruptManager(UA_EventSource *es) {
 
     pim->writeFD = pipefd[1];
     pim->readFD.fd = pipefd[0];
-    pim->readFD.context = pim;
+    pim->readFD.es = &pim->im.eventSource;
     pim->readFD.listenEvents = UA_FDEVENT_IN;
-    pim->readFD.callback = executeTriggeredPOSIXInterrupts;
-    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, &pim->readFD);
+    pim->readFD.eventSourceCB = executeTriggeredPOSIXInterrupts;
+    res = UA_EventLoopPOSIX_registerFD(el, &pim->readFD);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                      "Interrupt\t| Could not register the InterruptManager socket");
         UA_close(pipefd[0]);
         UA_close(pipefd[1]);
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 #endif
 
     /* Activate the registered signal handlers */
-    UA_RegisteredSignal *rs;
-    LIST_FOREACH(rs, &pim->signals, signalsEntry) {
+    UA_RegisteredSignal*rs;
+    LIST_FOREACH(rs, &pim->signals, listPointers) {
         activateSignal(rs);
     }
 
     /* Set the EventSource to the started state */
     es->state = UA_EVENTSOURCESTATE_STARTED;
+
+    UA_UNLOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 static void
 stopPOSIXInterruptManager(UA_EventSource *es) {
-    if(es->state != UA_EVENTSOURCESTATE_STARTED)
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    UA_LOCK(&el->elMutex);
+
+    if(es->state != UA_EVENTSOURCESTATE_STARTED) {
+        UA_UNLOCK(&el->elMutex);
         return;
+    }
 
     UA_LOG_DEBUG(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Interrupt\t| Stopping the InterruptManager");
 
     /* Close all registered signals */
-    POSIXInterruptManager *pim = (POSIXInterruptManager *)es;
-    UA_RegisteredSignal *rs;
-    LIST_FOREACH(rs, &pim->signals, signalsEntry) {
+    UA_POSIXInterruptManager *pim = (UA_POSIXInterruptManager *)es;
+    UA_RegisteredSignal*rs;
+    LIST_FOREACH(rs, &pim->signals, listPointers) {
         deactivateSignal(rs);
     }
 
 #ifndef UA_HAVE_EPOLL
     /* Close the FD for the self-pipe trick */
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
     UA_EventLoopPOSIX_deregisterFD(el, &pim->readFD);
     UA_close(pim->readFD.fd);
     UA_close(pim->writeFD);
@@ -450,10 +494,15 @@ stopPOSIXInterruptManager(UA_EventSource *es) {
 
     /* Immediately set to stopped */
     es->state = UA_EVENTSOURCESTATE_STOPPED;
+
+    UA_UNLOCK(&el->elMutex);
 }
 
 static UA_StatusCode
 freePOSIXInterruptmanager(UA_EventSource *es) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     if(es->state >= UA_EVENTSOURCESTATE_STARTING) {
         UA_LOG_ERROR(es->eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                      "Interrupt\t| The EventSource must be stopped "
@@ -461,11 +510,12 @@ freePOSIXInterruptmanager(UA_EventSource *es) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    POSIXInterruptManager *pim = (POSIXInterruptManager *)es;
+    /* Deactivate and remove all registered signals */
+    UA_POSIXInterruptManager *pim = (UA_POSIXInterruptManager *)es;
     UA_RegisteredSignal *rs, *rs_tmp;
-    LIST_FOREACH_SAFE(rs, &pim->signals, signalsEntry, rs_tmp) {
+    LIST_FOREACH_SAFE(rs, &pim->signals, listPointers, rs_tmp) {
         deactivateSignal(rs);
-        LIST_REMOVE(rs, signalsEntry);
+        LIST_REMOVE(rs, listPointers);
         UA_free(rs);
     }
 
@@ -487,8 +537,8 @@ UA_InterruptManager_new_POSIX(const UA_String eventSourceName) {
         return NULL;
 #endif
 
-    POSIXInterruptManager *pim =
-        (POSIXInterruptManager *)UA_calloc(1, sizeof(POSIXInterruptManager));
+    UA_POSIXInterruptManager *pim = (UA_POSIXInterruptManager *)
+        UA_calloc(1, sizeof(UA_POSIXInterruptManager));
     if(!pim)
         return NULL;
 
diff --git a/arch/eventloop_posix_select.c b/arch/eventloop_posix_select.c
index aaf57b08f42..cc0ff3ec63c 100644
--- a/arch/eventloop_posix_select.c
+++ b/arch/eventloop_posix_select.c
@@ -11,8 +11,7 @@
 
 UA_StatusCode
 UA_EventLoopPOSIX_registerFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
-    UA_LOCK(&el->elMutex);
-
+    UA_LOCK_ASSERT(&el->elMutex, 1);
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Registering fd: %u", (unsigned)rfd->fd);
 
@@ -28,21 +27,19 @@ UA_EventLoopPOSIX_registerFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
     /* Add to the last entry */
     el->fds[el->fdsSize] = rfd;
     el->fdsSize++;
-
-    UA_UNLOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
 UA_EventLoopPOSIX_modifyFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
     /* Do nothing, it is enough if the data was changed in the rfd */
+    UA_LOCK_ASSERT(&el->elMutex, 1);
     return UA_STATUSCODE_GOOD;
 }
 
 void
 UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
-    UA_LOCK(&el->elMutex);
-
+    UA_LOCK_ASSERT(&el->elMutex, 1);
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Unregistering fd: %u", (unsigned)rfd->fd);
 
@@ -54,10 +51,8 @@ UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
     }
 
     /* Not found? */
-    if(i == el->fdsSize) {
-        UA_UNLOCK(&el->elMutex);
+    if(i == el->fdsSize)
         return;
-    }
 
     if(el->fdsSize > 1) {
         /* Move the last entry in the ith slot and realloc. */
@@ -75,19 +70,19 @@ UA_EventLoopPOSIX_deregisterFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
         el->fds = NULL;
         el->fdsSize = 0;
     }
-
-    UA_UNLOCK(&el->elMutex);
 }
 
 static UA_FD
 setFDSets(UA_EventLoopPOSIX *el, fd_set *readset, fd_set *writeset, fd_set *errset) {
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     FD_ZERO(readset);
     FD_ZERO(writeset);
     FD_ZERO(errset);
     UA_FD highestfd = UA_INVALID_FD;
     for(size_t i = 0; i < el->fdsSize; i++) {
-
         UA_FD currentFD = el->fds[i]->fd;
+
         /* Add to the fd_sets */
         if(el->fds[i]->listenEvents & UA_FDEVENT_IN)
             UA_fd_set(currentFD, readset);
@@ -107,6 +102,7 @@ setFDSets(UA_EventLoopPOSIX *el, fd_set *readset, fd_set *writeset, fd_set *errs
 UA_StatusCode
 UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
     UA_assert(listenTimeout >= 0);
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     fd_set readset, writeset, errset;
     UA_FD highestfd = setFDSets(el, &readset, &writeset, &errset);
@@ -158,9 +154,7 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                      "Processing event %u on fd %u", (unsigned)event, (unsigned)fd);
 
-        UA_UNLOCK(&el->elMutex);
-        rfd->callback(rfd->es, rfd, event);
-        UA_LOCK(&el->elMutex);
+        rfd->eventSourceCB(rfd->es, rfd, event);
 
         /* The fd has removed itself */
         if(i == el->fdsSize || rfd != el->fds[i])
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index acb02319f44..8cc59241a62 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -25,35 +25,16 @@ static UA_KeyValueRestriction TCPConfigParameters[TCP_PARAMETERSSIZE] = {
     {{0, UA_STRING_STATIC("validate")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false}
 };
 
-/* A registered file descriptor with an additional method pointer */
 typedef struct {
-    UA_RegisteredFD fd;
-    UA_ConnectionManager_connectionCallback connectionCallback;
-} TCP_FD;
-
-typedef struct {
-    UA_ConnectionManager cm;
+    UA_RegisteredFD rfd;
 
-    size_t fdsSize;
-    LIST_HEAD(, UA_RegisteredFD) fds;
-
-    UA_ByteString rxBuffer; /* Reuse the receiver buffer. The size is configured
-                             * via the recv-bufsize parameter.*/
-} TCPConnectionManager;
+    UA_ConnectionManager_connectionCallback applicationCB;
+    void *application;
+    void *context;
+} TCP_FD;
 
 static void
-TCP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd);
-
-static UA_StatusCode
-TCPConnectionManager_register(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
-    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, rfd);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-    LIST_INSERT_HEAD(&tcm->fds, rfd, es_pointers);
-    tcm->fdsSize++;
-    return UA_STATUSCODE_GOOD;
-}
+TCP_shutdown(UA_ConnectionManager *cm, TCP_FD *conn);
 
 /* Do not merge packets on the socket (disable Nagle's algorithm) */
 static UA_StatusCode
@@ -67,70 +48,75 @@ TCP_setNoNagle(UA_FD sockfd) {
 
 /* Test if the ConnectionManager can be stopped */
 static void
-TCP_checkStopped(TCPConnectionManager *tcm) {
-    if(tcm->fdsSize == 0 && tcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
-        UA_LOG_DEBUG(tcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP\t| All sockets closed, the EventLoop has stopped");
+TCP_checkStopped(UA_POSIXConnectionManager *pcm) {
+    UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop)->elMutex, 1);
 
-        UA_ByteString_clear(&tcm->rxBuffer);
-        tcm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+    if(pcm->fdsSize == 0 &&
+       pcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
+        UA_LOG_DEBUG(pcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                     "TCP\t| All sockets closed, the EventLoop has stopped");
+        pcm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
     }
 }
 
-static UA_StatusCode
-TCP_close(TCPConnectionManager *tcm, UA_RegisteredFD *rfd) {
-    TCP_FD *tcpfd = (TCP_FD*)rfd;
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)tcm->cm.eventSource.eventLoop;
+static void
+TCP_delayedClose(void *application, void *context) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)application;
+    UA_ConnectionManager *cm = &pcm->cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    TCP_FD *conn = (TCP_FD*)context;
 
-    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Closing connection", (unsigned)rfd->fd);
+    UA_LOCK(&el->elMutex);
+
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "TCP %u\t| Delayed closing of the connection",
+                 (unsigned)conn->rfd.fd);
+
+    /* Deregister from the EventLoop */
+    UA_EventLoopPOSIX_deregisterFD(el, &conn->rfd);
+
+    /* Deregister internally */
+    ZIP_REMOVE(UA_FDTree, &pcm->fds, &conn->rfd);
+    UA_assert(pcm->fdsSize > 0);
+    pcm->fdsSize--;
 
     /* Signal closing to the application */
-    tcpfd->connectionCallback(&tcm->cm, (uintptr_t)rfd->fd,
-                              rfd->application, &rfd->context,
-                              UA_CONNECTIONSTATE_CLOSING,
-                              &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_UNLOCK(&el->elMutex);
+    conn->applicationCB(cm, (uintptr_t)conn->rfd.fd,
+                        conn->application, &conn->context,
+                        UA_CONNECTIONSTATE_CLOSING,
+                        &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_LOCK(&el->elMutex);
 
     /* Close the socket */
-    int ret = UA_close(rfd->fd);
+    int ret = UA_close(conn->rfd.fd);
     if(ret == 0) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                    "TCP %u\t| Socket closed", (unsigned)rfd->fd);
+                    "TCP %u\t| Socket closed", (unsigned)conn->rfd.fd);
     } else {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Could not close the socket (%s)",
-                          (unsigned)rfd->fd, errno_str));
+                          (unsigned)conn->rfd.fd, errno_str));
     }
 
-    /* Decrease the number of open sockets. Then check if the tcm is stopping
-     * and this was the last open socket */
-    UA_assert(tcm->fdsSize > 0);
-    tcm->fdsSize--;
-    TCP_checkStopped(tcm);
-    return UA_STATUSCODE_GOOD;
-}
+    UA_free(conn);
 
-static void
-TCP_delayedClose(void *application, void *context) {
-    TCPConnectionManager *tcm = (TCPConnectionManager*)application;
-    UA_ConnectionManager *cm = &tcm->cm;
-    UA_RegisteredFD* rfd = (UA_RegisteredFD *)context;
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
-                 "TCP %u\t| Delayed closing of the connection", (unsigned)rfd->fd);
-    TCP_close(tcm, rfd);
-    UA_free(rfd);
+    /* Check if this was the last connection for a closing ConnectionManager */
+    TCP_checkStopped(pcm);
+
+    UA_UNLOCK(&el->elMutex);
 }
 
 static int
-getSockError(UA_RegisteredFD *rfd) {
+getSockError(TCP_FD *conn) {
     int error = 0;
 #ifndef _WIN32
     socklen_t errlen = sizeof(int);
-    int err = getsockopt(rfd->fd, SOL_SOCKET, SO_ERROR, &error, &errlen);
+    int err = getsockopt(conn->rfd.fd, SOL_SOCKET, SO_ERROR, &error, &errlen);
 #else
     int errlen = (int)sizeof(int);
-    int err = getsockopt((SOCKET)rfd->fd, SOL_SOCKET, SO_ERROR,
+    int err = getsockopt((SOCKET)conn->rfd.fd, SOL_SOCKET, SO_ERROR,
                          (char*)&error, &errlen);
 #endif
     return (err == 0) ? error : err;
@@ -138,20 +124,21 @@ getSockError(UA_RegisteredFD *rfd) {
 
 /* Gets called when a connection socket opens, receives data or closes */
 static void
-TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
+TCP_connectionSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn,
                              short event) {
-    TCP_FD *tcpfd = (TCP_FD*)rfd;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Activity on the socket", (unsigned)rfd->fd);
+                 "TCP %u\t| Activity on the socket",
+                 (unsigned)conn->rfd.fd);
 
     /* Error. The connection has closed. */
     if(event == UA_FDEVENT_ERR) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "TCP %u\t| The connection closes with error %i",
-                    (unsigned)rfd->fd, getSockError(rfd));
-        TCP_shutdown(cm, rfd);
+                    (unsigned)conn->rfd.fd, getSockError(conn));
+        TCP_shutdown(cm, conn);
         return;
     }
 
@@ -160,43 +147,48 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
      * initiate the connection. So we check manually for error conditions on
      * the socket. */
     if(event == UA_FDEVENT_OUT) {
-        int error = getSockError(rfd);
+        int error = getSockError(conn);
         if(error != 0) {
             UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                         "TCP %u\t| The connection closes with error %i",
-                        (unsigned)rfd->fd, error);
-            TCP_shutdown(cm, rfd);
+                        (unsigned)conn->rfd.fd, error);
+            TCP_shutdown(cm, conn);
             return;
         }
 
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "TCP %u\t| Opening a new connection", (unsigned)rfd->fd);
+                     "TCP %u\t| Opening a new connection",
+                     (unsigned)conn->rfd.fd);
 
         /* Now we are interested in read-events. */
-        rfd->listenEvents = UA_FDEVENT_IN;
-        UA_EventLoopPOSIX_modifyFD(el, rfd);
+        conn->rfd.listenEvents = UA_FDEVENT_IN;
+        UA_EventLoopPOSIX_modifyFD(el, &conn->rfd);
 
         /* A new socket has opened. Signal it to the application. */
-        tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
-                                  rfd->application, &rfd->context,
-                                  UA_CONNECTIONSTATE_ESTABLISHED, &UA_KEYVALUEMAP_NULL,
-                                  UA_BYTESTRING_NULL);
-
+        UA_UNLOCK(&el->elMutex);
+        conn->applicationCB(cm, (uintptr_t)conn->rfd.fd,
+                            conn->application, &conn->context,
+                            UA_CONNECTIONSTATE_ESTABLISHED,
+                            &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+        UA_LOCK(&el->elMutex);
         return;
     }
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Allocate receive buffer", (unsigned)rfd->fd);
+                 "TCP %u\t| Allocate receive buffer",
+                 (unsigned)conn->rfd.fd);
 
     /* Use the already allocated receive-buffer */
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    UA_ByteString response = tcm->rxBuffer;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_ByteString response = pcm->rxBuffer;
 
     /* Receive */
 #ifndef _WIN32
-    ssize_t ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    ssize_t ret = UA_recv(conn->rfd.fd, (char*)response.data,
+                          response.length, MSG_DONTWAIT);
 #else
-    int ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    int ret = UA_recv(conn->rfd.fd, (char*)response.data,
+                      response.length, MSG_DONTWAIT);
 #endif
 
     /* Receive has failed */
@@ -210,37 +202,40 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                         "TCP %u\t| recv signaled the socket was shutdown (%s)",
-                        (unsigned)rfd->fd, errno_str));
-        TCP_shutdown(cm, rfd);
+                        (unsigned)conn->rfd.fd, errno_str));
+        TCP_shutdown(cm, conn);
         return;
     }
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Received message of size %u",
-                 (unsigned)rfd->fd, (unsigned)ret);
+                 (unsigned)conn->rfd.fd, (unsigned)ret);
 
     /* Callback to the application layer */
     response.length = (size_t)ret; /* Set the length of the received buffer */
-    tcpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
-                              rfd->application, &rfd->context,
-                              UA_CONNECTIONSTATE_ESTABLISHED,
-                              &UA_KEYVALUEMAP_NULL, response);
+    UA_UNLOCK(&el->elMutex);
+    conn->applicationCB(cm, (uintptr_t)conn->rfd.fd,
+                        conn->application, &conn->context,
+                        UA_CONNECTIONSTATE_ESTABLISHED,
+                        &UA_KEYVALUEMAP_NULL, response);
+    UA_LOCK(&el->elMutex);
 }
 
 /* Gets called when a new connection opens or if the listenSocket is closed */
 static void
-TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short event) {
-    TCP_FD *tcpfd = (TCP_FD*)rfd;
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+TCP_listenSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn, short event) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Callback on server socket", (unsigned)rfd->fd);
+                 "TCP %u\t| Callback on server socket",
+                 (unsigned)conn->rfd.fd);
 
     /* Try to accept a new connection */
     struct sockaddr_storage remote;
     socklen_t remote_size = sizeof(remote);
-    UA_FD newsockfd = UA_accept(rfd->fd, (struct sockaddr*)&remote, &remote_size);
+    UA_FD newsockfd = UA_accept(conn->rfd.fd, (struct sockaddr*)&remote, &remote_size);
     if(newsockfd == UA_INVALID_FD) {
         /* Temporary error -- retry */
         if(UA_ERRNO == UA_INTERRUPTED)
@@ -251,10 +246,10 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
             UA_LOG_SOCKET_ERRNO_WRAP(
                 UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                                "TCP %u\t| Error %s, closing the server socket",
-                               (unsigned)rfd->fd, errno_str));
+                               (unsigned)conn->rfd.fd, errno_str));
         }
 
-        TCP_shutdown(cm, rfd);
+        TCP_shutdown(cm, conn);
         return;
     }
 
@@ -267,16 +262,16 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| getnameinfo(...) could not resolve the "
-                          "hostname (%s)", (unsigned)rfd->fd, errno_str));
+                          "hostname (%s)", (unsigned)conn->rfd.fd, errno_str));
     }
     UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| Connection opened from \"%s\" via the server socket %u",
-                (unsigned)newsockfd, hoststr, (unsigned)rfd->fd);
+                (unsigned)newsockfd, hoststr, (unsigned)conn->rfd.fd);
 
     /* Configure the new socket */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     /* res |= UA_EventLoopPOSIX_setNonBlocking(newsockfd); Inherited from the listen-socket */
-    res |= UA_EventLoopPOSIX_setNoSigPipe(newsockfd);   /* Supress interrupts from the socket */
+    res |= UA_EventLoopPOSIX_setNoSigPipe(newsockfd); /* Supress interrupts from the socket */
     res |= TCP_setNoNagle(newsockfd);     /* Disable Nagle's algorithm */
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -289,33 +284,38 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     }
 
     /* Allocate the UA_RegisteredFD */
-    TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
-    if(!newtcpfd) {
+    TCP_FD *newConn = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
+    if(!newConn) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error allocating memory for the socket",
                        (unsigned)newsockfd);
         UA_close(newsockfd);
         return;
     }
-    newtcpfd->fd.fd = newsockfd;
-    newtcpfd->fd.es = &cm->eventSource;
-    newtcpfd->fd.callback = (UA_FDCallback)TCP_connectionSocketCallback;
-    newtcpfd->fd.application = rfd->application;
-    newtcpfd->fd.context = rfd->context;
-    newtcpfd->fd.listenEvents = UA_FDEVENT_IN;
-    newtcpfd->connectionCallback = tcpfd->connectionCallback;
+
+    newConn->rfd.fd = newsockfd;
+    newConn->rfd.listenEvents = UA_FDEVENT_IN;
+    newConn->rfd.es = &cm->eventSource;
+    newConn->rfd.eventSourceCB = (UA_FDCallback)TCP_connectionSocketCallback;
+    newConn->applicationCB = conn->applicationCB;
+    newConn->application = conn->application;
+    newConn->context = conn->context;
 
     /* Register in the EventLoop. Signal to the user if registering failed. */
-    res = TCPConnectionManager_register(tcm, &newtcpfd->fd);
+    res = UA_EventLoopPOSIX_registerFD(el, &newConn->rfd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error registering the socket",
                        (unsigned)newsockfd);
-        UA_free(newtcpfd);
+        UA_free(newConn);
         UA_close(newsockfd);
         return;
     }
 
+    /* Register internally in the EventSource */
+    ZIP_INSERT(UA_FDTree, &pcm->fds, &newConn->rfd);
+    pcm->fdsSize++;
+
     /* Forward the remote hostname to the application */
     UA_KeyValuePair kvp;
     kvp.key = UA_QUALIFIEDNAME(0, "remote-address");
@@ -327,18 +327,20 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd, short e
     kvm.map = &kvp;
 
     /* The socket has opened. Signal it to the application. */
-    tcpfd->connectionCallback(cm, (uintptr_t)newsockfd,
-                              newtcpfd->fd.application, &newtcpfd->fd.context,
-                              UA_CONNECTIONSTATE_ESTABLISHED,
-                              &kvm, UA_BYTESTRING_NULL);
+    UA_UNLOCK(&el->elMutex);
+    newConn->applicationCB(cm, (uintptr_t)newsockfd,
+                           newConn->application, &newConn->context,
+                           UA_CONNECTIONSTATE_ESTABLISHED,
+                           &kvm, UA_BYTESTRING_NULL);
+    UA_LOCK(&el->elMutex);
 }
 
 static UA_StatusCode
-TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
+TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
                          UA_UInt16 port, void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback) {
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     /* Get the hostname information */
     char hoststr[UA_MAXHOSTNAME_LENGTH];
@@ -442,9 +444,9 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* Allocate the UA_RegisteredFD */
-    TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
-    if(!newtcpfd) {
+    /* Allocate the connection */
+    TCP_FD *newConn = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
+    if(!newConn) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error allocating memory for the socket",
                        (unsigned)listenSocket);
@@ -452,25 +454,29 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    newtcpfd->fd.fd = listenSocket;
-    newtcpfd->fd.es = &cm->eventSource;
-    newtcpfd->fd.callback = (UA_FDCallback)TCP_listenSocketCallback;
-    newtcpfd->fd.application = application;
-    newtcpfd->fd.context = context;
-    newtcpfd->fd.listenEvents = UA_FDEVENT_IN;
-    newtcpfd->connectionCallback = connectionCallback;
+    newConn->rfd.fd = listenSocket;
+    newConn->rfd.listenEvents = UA_FDEVENT_IN;
+    newConn->rfd.es = &pcm->cm.eventSource;
+    newConn->rfd.eventSourceCB = (UA_FDCallback)TCP_listenSocketCallback;
+    newConn->applicationCB = connectionCallback;
+    newConn->application = application;
+    newConn->context = context;
 
     /* Register in the EventLoop */
-    UA_StatusCode res = TCPConnectionManager_register(tcm, &newtcpfd->fd);
+    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, &newConn->rfd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error registering the socket",
                        (unsigned)listenSocket);
-        UA_free(newtcpfd);
+        UA_free(newConn);
         UA_close(listenSocket);
         return res;
     }
 
+    /* Register internally */
+    ZIP_INSERT(UA_FDTree, &pcm->fds, &newConn->rfd);
+    pcm->fdsSize++;
+
     /* Set up the callback parameters */
     UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "listen-address");
@@ -487,18 +493,22 @@ TCP_registerListenSocket(UA_ConnectionManager *cm, struct addrinfo *ai,
     }
 
     /* Announce the listen-socket in the application */
-    connectionCallback(cm, (uintptr_t)listenSocket, application,
-                       &newtcpfd->fd.context,
+    UA_UNLOCK(&el->elMutex);
+    connectionCallback(&pcm->cm, (uintptr_t)listenSocket,
+                       application, &newConn->context,
                        UA_CONNECTIONSTATE_ESTABLISHED,
                        &paramMap, UA_BYTESTRING_NULL);
+    UA_LOCK(&el->elMutex);
 
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
+TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
                           UA_UInt16 port, void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback) {
+    UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop)->elMutex, 1);
+
     /* Create a string for the port */
     char portstr[6];
     UA_snprintf(portstr, sizeof(portstr), "%d", port);
@@ -523,11 +533,11 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
     if(retcode != 0) {
 #ifdef _WIN32
         UA_LOG_SOCKET_ERRNO_WRAP(
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(pcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Lookup for \"%s\" on port %u failed (%s)",
                        hostname, port, errno_str));
 #else
-        UA_LOG_WARNING(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(pcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Lookup for \"%s\" on port %u failed (%s)",
                        hostname, port, gai_strerror(retcode));
 #endif
@@ -539,7 +549,7 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
     UA_StatusCode total_result = UA_INT32_MAX;
     struct addrinfo *ai = res;
     while(ai) {
-        total_result &= TCP_registerListenSocket(cm, ai, port, application, context,
+        total_result &= TCP_registerListenSocket(pcm, ai, port, application, context,
                                                  connectionCallback);
         ai = ai->ai_next;
     }
@@ -548,68 +558,65 @@ TCP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname,
     return total_result;
 }
 
-static
-UA_RegisteredFD *
-TCP_findRegisteredFD(TCPConnectionManager *tcm, uintptr_t connectionId) {
-    UA_RegisteredFD *rfd;
-    LIST_FOREACH(rfd, &tcm->fds, es_pointers) {
-        if(rfd->fd == (UA_FD)connectionId)
-            return rfd;
-    }
-    return NULL;
-}
-
 /* Close the connection via a delayed callback */
 static void
-TCP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
-    UA_EventLoop *el = cm->eventSource.eventLoop;
-
+TCP_shutdown(UA_ConnectionManager *cm, TCP_FD *conn) {
     /* Already closing - nothing to do */
-    if(rfd->dc.callback) {
-        UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
+    if(conn->rfd.dc.callback) {
+        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP %u\t| Cannot shutdown - already triggered",
-                     (unsigned)rfd->fd);
+                     (unsigned)conn->rfd.fd);
         return;
     }
 
-    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
-                 "TCP %u\t| Shutdown triggered", (unsigned)rfd->fd);
-
-    /* Deregister from the EventLoop. Don't decrease the tcm->fdsSize counter
-     * right now. Do this in the delayed callback where the rfd is freed.
-     * Otherwise the ConnectionManager may be freed too early. */
-    UA_EventLoopPOSIX_deregisterFD((UA_EventLoopPOSIX*)el, rfd);
-    LIST_REMOVE(rfd, es_pointers);
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                 "TCP %u\t| Shutdown triggered",
+                 (unsigned)conn->rfd.fd);
 
     /* Add to the delayed callback list. Will be cleaned up in the next
      * iteration. */
-    UA_DelayedCallback *dc = &rfd->dc;
+    UA_DelayedCallback *dc = &conn->rfd.dc;
     dc->callback = TCP_delayedClose;
     dc->application = cm;
-    dc->context = rfd;
-    el->addDelayedCallback(el, dc);
+    dc->context = conn;
+
+    /* Don't use the "public" el->addDelayedCallback. It takes a lock. */
+    dc->next = el->delayedCallbacks;
+    el->delayedCallbacks = dc;
 }
 
 static UA_StatusCode
 TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
-    UA_EventLoop *el = cm->eventSource.eventLoop;
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    UA_RegisteredFD *rfd = TCP_findRegisteredFD(tcm, connectionId);
-    if(!rfd) {
-        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)cm->eventSource.eventLoop;
+    UA_LOCK(&el->elMutex);
+
+    UA_FD fd = (UA_FD)connectionId;
+    TCP_FD *conn = (TCP_FD*)ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
+    if(!conn) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Cannot close TCP connection %u - not found",
                        (unsigned)connectionId);
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
-    TCP_shutdown(cm, rfd);
+    TCP_shutdown(cm, conn);
 
+    UA_UNLOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
 TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                        const UA_KeyValueMap *params, UA_ByteString *buf) {
+    /* Don't have a lock and don't take a lock. As the connectionId is the fd,
+     * no need to to a lookup and access internal data strucures. */
+    UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)cm->eventSource.eventLoop)->elMutex, 0);
+
     /* Prevent OS signals when sending to a closed socket */
     int flags = MSG_NOSIGNAL;
 
@@ -663,10 +670,11 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 /* Create a listen-socket that waits for incoming connections */
 static UA_StatusCode
-TCP_openPassiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
+TCP_openPassiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *params,
                           void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     /* Get the port parameter */
     const UA_UInt16 *port = (const UA_UInt16*)
@@ -690,7 +698,7 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params
     if(addrsSize == 0) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "TCP\t| Listening on all interfaces");
-        return TCP_registerListenSockets(cm, NULL, *port, application,
+        return TCP_registerListenSockets(pcm, NULL, *port, application,
                                          context, connectionCallback);
     }
 
@@ -702,7 +710,7 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params
             continue;
         memcpy(hostname, hostStrings[i].data, hostStrings->length);
         hostname[hostStrings->length] = '\0';
-        TCP_registerListenSockets(cm, hostname, *port, application,
+        TCP_registerListenSockets(pcm, hostname, *port, application,
                                   context, connectionCallback);
     }
 
@@ -711,11 +719,11 @@ TCP_openPassiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params
 
 /* Open a TCP connection to a remote host */
 static UA_StatusCode
-TCP_openActiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
+TCP_openActiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *params,
                          void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback) {
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     /* Get the connection parameters */
     char hostname[UA_MAXHOSTNAME_LENGTH];
@@ -808,8 +816,8 @@ TCP_openActiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
     }
 
     /* Allocate the UA_RegisteredFD */
-    TCP_FD *newtcpfd = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
-    if(!newtcpfd) {
+    TCP_FD *newConn = (TCP_FD*)UA_calloc(1, sizeof(TCP_FD));
+    if(!newConn) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error allocating memory for the socket",
                        (unsigned)newSock);
@@ -817,34 +825,40 @@ TCP_openActiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
-    newtcpfd->fd.fd = newSock;
-    newtcpfd->fd.es = &cm->eventSource;
-    newtcpfd->fd.callback = (UA_FDCallback)TCP_connectionSocketCallback;
-    newtcpfd->fd.application = application;
-    newtcpfd->fd.context = context;
-    newtcpfd->fd.listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
+    newConn->rfd.fd = newSock;
+    newConn->rfd.es = &pcm->cm.eventSource;
+    newConn->rfd.eventSourceCB = (UA_FDCallback)TCP_connectionSocketCallback;
+    newConn->rfd.listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
                                                  * connection is open */
-    newtcpfd->connectionCallback = connectionCallback;
+    newConn->applicationCB = connectionCallback;
+    newConn->application = application;
+    newConn->context = context;
 
     /* Register the fd to trigger when output is possible (the connection is open) */
-    res = TCPConnectionManager_register(tcm, &newtcpfd->fd);
+    res = UA_EventLoopPOSIX_registerFD(el, &newConn->rfd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Registering the socket to connect to %s failed", hostname);
         UA_close(newSock);
-        UA_free(newtcpfd);
+        UA_free(newConn);
         return res;
     }
 
+    /* Register internally in the EventSource */
+    ZIP_INSERT(UA_FDTree, &pcm->fds, &newConn->rfd);
+    pcm->fdsSize++;
+
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                 "TCP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
     /* Signal the new connection to the application as asynchonously opening */
-    connectionCallback(cm, (uintptr_t)newSock,
-                       application, &newtcpfd->fd.context,
+    UA_UNLOCK(&el->elMutex);
+    connectionCallback(&pcm->cm, (uintptr_t)newSock,
+                       application, &newConn->context,
                        UA_CONNECTIONSTATE_OPENING, &UA_KEYVALUEMAP_NULL,
                        UA_BYTESTRING_NULL);
+    UA_LOCK(&el->elMutex);
 
     return UA_STATUSCODE_GOOD;
 }
@@ -853,11 +867,15 @@ static UA_StatusCode
 TCP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOCK(&el->elMutex);
+
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STARTED) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP\t| Cannot open a connection for a "
                      "ConnectionManager that is not started");
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -866,8 +884,10 @@ TCP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         UA_KeyValueRestriction_validate(el->eventLoop.logger, "TCP",
                                         &TCPConfigParameters[1],
                                         TCP_PARAMETERSSIZE-1, params);
-    if(res != UA_STATUSCODE_GOOD)
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&el->elMutex);
         return res;
+    }
 
     /* Listen or active connection? */
     UA_Boolean listen = false;
@@ -878,26 +898,33 @@ TCP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
     if(listenParam)
         listen = *listenParam;
 
-    if(listen)
-        return TCP_openPassiveConnection(cm, params, application,
-                                         context, connectionCallback);
-    else
-        return TCP_openActiveConnection(cm, params, application,
+    if(listen) {
+        res = TCP_openPassiveConnection(pcm, params, application,
                                         context, connectionCallback);
+    } else {
+        res = TCP_openActiveConnection(pcm, params, application,
+                                       context, connectionCallback);
+    }
+
+    UA_UNLOCK(&el->elMutex);
+    return res;
 }
 
 static UA_StatusCode
 TCP_eventSourceStart(UA_ConnectionManager *cm) {
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
     if(!el)
         return UA_STATUSCODE_BADINTERNALERROR;
 
+    UA_LOCK(&el->elMutex);
+
     /* Check the state */
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "TCP\t| To start the ConnectionManager, it has to be "
                      "registered in an EventLoop and not started yet");
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -907,53 +934,60 @@ TCP_eventSourceStart(UA_ConnectionManager *cm) {
                                         TCPConfigParameters, 1,
                                         &cm->eventSource.params);
     if(res != UA_STATUSCODE_GOOD)
-        return res;
+        goto finish;
 
-    /* Configure the receive buffer */
-    UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
-    const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
-        UA_KeyValueMap_getScalar(&cm->eventSource.params,
-                                 TCPConfigParameters[TCP_PARAMINDEX_RECVBUF].name,
-                                 &UA_TYPES[UA_TYPES_UINT32]);
-    if(configRxBufSize)
-        rxBufSize = *configRxBufSize;
-    res = UA_ByteString_allocBuffer(&tcm->rxBuffer, rxBufSize);
+    /* Allocate the rx buffer */
+    res = UA_EventLoopPOSIX_allocateRXBuffer(pcm);
     if(res != UA_STATUSCODE_GOOD)
-        return res;
+        goto finish;
 
     /* Set the EventSource to the started state */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
 
-    return UA_STATUSCODE_GOOD;
+ finish:
+    UA_UNLOCK(&el->elMutex);
+    return res;
+}
+
+static void *
+TCP_shutdownCB(void *application, UA_RegisteredFD *rfd) {
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)application;
+    TCP_shutdown(cm, (TCP_FD*)rfd);
+    return NULL;
 }
 
 static void
 TCP_eventSourceStop(UA_ConnectionManager *cm) {
-    TCPConnectionManager *tcm = (TCPConnectionManager*)cm;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
+    UA_LOCK(&el->elMutex);
+
     UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                 "TCP\t| Shutting down the ConnectionManager");
 
+    /* Prevent new connections to open */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
-    /* Shut down all registered fd. The cm is set to "stopped" when the last fd
-     * is closed and deregistered in the callback from the EventLoop. */
-    UA_RegisteredFD *rfd;
-    LIST_FOREACH(rfd, &tcm->fds, es_pointers) {
-        TCP_shutdown(cm, rfd);
-    }
+    /* Shutdown all existing connection */
+    ZIP_ITER(UA_FDTree, &pcm->fds, TCP_shutdownCB, cm);
 
     /* All sockets closed? Otherwise iterate some more. */
-    TCP_checkStopped(tcm);
+    TCP_checkStopped(pcm);
+
+    UA_UNLOCK(&el->elMutex);
 }
 
 static UA_StatusCode
 TCP_eventSourceDelete(UA_ConnectionManager *cm) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     if(cm->eventSource.state >= UA_EVENTSOURCESTATE_STARTING) {
         UA_LOG_ERROR(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                      "TCP\t| The EventSource must be stopped before it can be deleted");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    UA_ByteString_clear(&pcm->rxBuffer);
     UA_KeyValueMap_clear(&cm->eventSource.params);
     UA_String_clear(&cm->eventSource.name);
     UA_free(cm);
@@ -965,14 +999,14 @@ static const char *tcpName = "tcp";
 
 UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName) {
-    TCPConnectionManager *cm = (TCPConnectionManager*)
-        UA_calloc(1, sizeof(TCPConnectionManager));
+    UA_POSIXConnectionManager *cm = (UA_POSIXConnectionManager*)
+        UA_calloc(1, sizeof(UA_POSIXConnectionManager));
     if(!cm)
         return NULL;
 
     cm->cm.eventSource.eventSourceType = UA_EVENTSOURCETYPE_CONNECTIONMANAGER;
     UA_String_copy(&eventSourceName, &cm->cm.eventSource.name);
-    cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *)) TCP_eventSourceStart;
+    cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *))TCP_eventSourceStart;
     cm->cm.eventSource.stop = (void (*)(UA_EventSource *))TCP_eventSourceStop;
     cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))TCP_eventSourceDelete;
     cm->cm.protocol = UA_STRING((char*)(uintptr_t)tcpName);
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 7c2f0a2c501..e3b2b8943f4 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -44,26 +44,20 @@ static UA_KeyValueRestriction UDPConfigParameters[UDP_PARAMETERSSIZE] = {
 
 /* A registered file descriptor with an additional method pointer */
 typedef struct {
-    UA_RegisteredFD fd;
+    UA_RegisteredFD rfd;
+
+    UA_ConnectionManager_connectionCallback applicationCB;
+    void *application;
+    void *context;
+
     struct sockaddr_storage sendAddr;
 #ifdef _WIN32
     size_t sendAddrLength;
 #else
     socklen_t sendAddrLength;
 #endif
-    UA_ConnectionManager_connectionCallback connectionCallback;
 } UDP_FD;
 
-typedef struct {
-    UA_ConnectionManager cm;
-
-    size_t fdsSize;
-    LIST_HEAD(, UA_RegisteredFD) fds;
-
-    UA_ByteString rxBuffer; /* Reuse the receiver buffer. The size is configured
-                             * via the recv-bufsize parameter.*/
-} UDPConnectionManager;
-
 typedef union {
     struct ip_mreq ipv4;
 #if UA_IPV6
@@ -441,36 +435,16 @@ setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValu
 
 #endif
 
-static UA_StatusCode
-UDPConnectionManager_register(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ucm->cm.eventSource.eventLoop;
-    UA_StatusCode res = UA_EventLoopPOSIX_registerFD(el, rfd);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-    LIST_INSERT_HEAD(&ucm->fds, rfd, es_pointers);
-    ucm->fdsSize++;
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-UDPConnectionManager_deregister(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ucm->cm.eventSource.eventLoop;
-    UA_EventLoopPOSIX_deregisterFD(el, rfd);
-    LIST_REMOVE(rfd, es_pointers);
-    UA_assert(ucm->fdsSize > 0);
-    ucm->fdsSize--;
-}
-
 /* Test if the ConnectionManager can be stopped */
 static void
-UDP_checkStopped(UDPConnectionManager *ucm) {
-    if(ucm->fdsSize == 0 && ucm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
-        UA_LOG_DEBUG(ucm->cm.eventSource.eventLoop->logger,
-                     UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| All sockets closed, the EventLoop has stopped");
+UDP_checkStopped(UA_POSIXConnectionManager *pcm) {
+    UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop)->elMutex, 1);
 
-        UA_ByteString_clear(&ucm->rxBuffer);
-        ucm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+    if(pcm->fdsSize == 0 &&
+       pcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING) {
+        UA_LOG_DEBUG(pcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| All sockets closed, the EventLoop has stopped");
+        pcm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
     }
 }
 
@@ -478,92 +452,103 @@ UDP_checkStopped(UDPConnectionManager *ucm) {
  * the EventLoop. Otherwise we cannot be sure whether the file descriptor is
  * still used after calling close. */
 static void
-UDP_close(UDPConnectionManager *ucm, UA_RegisteredFD *rfd) {
-    UDP_FD *udpfd = (UDP_FD*)rfd;
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)ucm->cm.eventSource.eventLoop;
+UDP_close(UA_POSIXConnectionManager *pcm, UDP_FD *conn) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "UDP %u\t| Closing connection", (unsigned)rfd->fd);
+                 "UDP %u\t| Closing connection",
+                 (unsigned)conn->rfd.fd);
 
     /* Deregister from the EventLoop */
-    UDPConnectionManager_deregister(ucm, rfd);
+    UA_EventLoopPOSIX_deregisterFD(el, &conn->rfd);
+
+    /* Deregister internally */
+    ZIP_REMOVE(UA_FDTree, &pcm->fds, &conn->rfd);
+    UA_assert(pcm->fdsSize > 0);
+    pcm->fdsSize--;
 
     /* Signal closing to the application */
-    udpfd->connectionCallback(&ucm->cm, (uintptr_t)rfd->fd,
-                              rfd->application, &rfd->context,
-                              UA_CONNECTIONSTATE_CLOSING,
-                              &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_UNLOCK(&el->elMutex);
+    conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
+                        conn->application, &conn->context,
+                        UA_CONNECTIONSTATE_CLOSING,
+                        &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_LOCK(&el->elMutex);
 
     /* Close the socket */
-    int ret = UA_close(rfd->fd);
+    int ret = UA_close(conn->rfd.fd);
     if(ret == 0) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                    "UDP %u\t| Socket closed", (unsigned)rfd->fd);
+                    "UDP %u\t| Socket closed", (unsigned)conn->rfd.fd);
     } else {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "UDP %u\t| Could not close the socket (%s)",
-                          (unsigned)rfd->fd, errno_str));
+                          (unsigned)conn->rfd.fd, errno_str));
     }
 
-    /* Don't call free here. This might be done automatically via the delayed
-     * callback that calls UDP_close. */
-    /* UA_free(rfd); */
+    UA_free(conn);
 
     /* Stop if the ucm is stopping and this was the last open socket */
-    UDP_checkStopped(ucm);
+    UDP_checkStopped(pcm);
 }
 
 static void
 UDP_delayedClose(void *application, void *context) {
-    UDPConnectionManager *ucm = (UDPConnectionManager*)application;
-    UA_ConnectionManager *cm = &ucm->cm;
-    UA_RegisteredFD* rfd = (UA_RegisteredFD *)context;
-    UA_LOG_DEBUG(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
-                 "UDP %u\t| Delayed closing of the connection", (unsigned)rfd->fd);
-    UDP_close(ucm, rfd);
-    UA_free(rfd);
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)application;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UDP_FD *conn = (UDP_FD*)context;
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+                 "UDP %u\t| Delayed closing of the connection",
+                 (unsigned)conn->rfd.fd);
+    UA_LOCK(&el->elMutex);
+    UDP_close(pcm, conn);
+    UA_UNLOCK(&el->elMutex);
 }
 
 /* Gets called when a socket receives data or closes */
 static void
-UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
+UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
                              short event) {
-    UDP_FD *udpfd = (UDP_FD*)rfd;
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "UDP %u\t| Activity on the socket", (unsigned)rfd->fd);
+                 "UDP %u\t| Activity on the socket",
+                 (unsigned)conn->rfd.fd);
 
     /* Write-Event, a new connection for sending has opened.  */
     if(event == UA_FDEVENT_OUT) {
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP %u\t| Opening a new connection", (unsigned)rfd->fd);
+                     "UDP %u\t| Opening a new connection",
+                     (unsigned)conn->rfd.fd);
 
         /* A new socket has opened. Signal it to the application. */
-        udpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
-                                  rfd->application, &rfd->context,
-                                  UA_CONNECTIONSTATE_ESTABLISHED,
-                                  &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+        UA_UNLOCK(&el->elMutex);
+        conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
+                            conn->application, &conn->context,
+                            UA_CONNECTIONSTATE_ESTABLISHED,
+                            &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+        UA_LOCK(&el->elMutex);
 
         /* Now we are interested in read-events. */
-        rfd->listenEvents = UA_FDEVENT_IN;
-        UA_EventLoopPOSIX_modifyFD(el, rfd);
+        conn->rfd.listenEvents = UA_FDEVENT_IN;
+        UA_EventLoopPOSIX_modifyFD(el, &conn->rfd);
         return;
     }
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "UDP %u\t| Allocate receive buffer", (unsigned)rfd->fd);
+                 "UDP %u\t| Allocate receive buffer", (unsigned)conn->rfd.fd);
 
     /* Use the already allocated receive-buffer */
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    UA_ByteString response = ucm->rxBuffer;
+    UA_ByteString response = pcm->rxBuffer;
 
     /* Receive */
 #ifndef _WIN32
-    ssize_t ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    ssize_t ret = UA_recv(conn->rfd.fd, (char*)response.data, response.length, MSG_DONTWAIT);
 #else
-    int ret = UA_recv(rfd->fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    int ret = UA_recv(conn->rfd.fd, (char*)response.data, response.length, MSG_DONTWAIT);
 #endif
 
     /* Receive has failed */
@@ -577,21 +562,23 @@ UDP_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                         "UDP %u\t| recv signaled the socket was shutdown (%s)",
-                        (unsigned)rfd->fd, errno_str));
-        UDP_close(ucm, rfd);
-        UA_free((UDP_FD*)rfd);
+                        (unsigned)conn->rfd.fd, errno_str));
+        UDP_close(pcm, conn);
         return;
     }
 
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP %u\t| Received message of size %u",
-                 (unsigned)rfd->fd, (unsigned)ret);
+                 (unsigned)conn->rfd.fd, (unsigned)ret);
 
     /* Callback to the application layer */
     response.length = (size_t)ret; /* Set the length of the received buffer */
-    udpfd->connectionCallback(cm, (uintptr_t)rfd->fd,
-                              rfd->application, &rfd->context,
-                              UA_CONNECTIONSTATE_ESTABLISHED, &UA_KEYVALUEMAP_NULL, response);
+    UA_UNLOCK(&el->elMutex);
+    conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
+                        conn->application, &conn->context,
+                        UA_CONNECTIONSTATE_ESTABLISHED,
+                        &UA_KEYVALUEMAP_NULL, response);
+    UA_LOCK(&el->elMutex);
 }
 
 static UA_StatusCode
@@ -599,18 +586,21 @@ checkForListenMulticastAndConfigure(struct addrinfo *info, const UA_KeyValueMap
                                     UA_FD listenSocket, const UA_Logger *logger) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(info->ai_family == AF_INET) {
-        UA_Byte *addressVal = (UA_Byte *) &((struct sockaddr_in *)info->ai_addr)->sin_addr;
+        UA_Byte *addressVal = (UA_Byte *)
+            &((struct sockaddr_in *)info->ai_addr)->sin_addr;
         if(isIPv4MulticastAddress(addressVal)) {
-            res = setupListenMulticastIPv4(listenSocket,
-                                           params, (struct sockaddr_in *)info->ai_addr,
+            res = setupListenMulticastIPv4(listenSocket, params,
+                                           (struct sockaddr_in *)info->ai_addr,
                                            logger);
         }
 #if UA_IPV6
     } else if(info->ai_family == AF_INET6) {
-        UA_Byte *addressVal = (UA_Byte *) &((struct sockaddr_in6 *)info->ai_addr)->sin6_addr;
+        UA_Byte *addressVal = (UA_Byte *)
+            &((struct sockaddr_in6 *)info->ai_addr)->sin6_addr;
         if(isIPv6MulticastAddress(addressVal)) {
-            res = setupListenMulticastIPv6(listenSocket,
-                                           params, (struct sockaddr_in6 *)info->ai_addr, logger);
+            res = setupListenMulticastIPv6(listenSocket, params,
+                                           (struct sockaddr_in6 *)info->ai_addr,
+                                           logger);
         }
 #endif
     } else {
@@ -622,13 +612,13 @@ checkForListenMulticastAndConfigure(struct addrinfo *info, const UA_KeyValueMap
 }
 
 static UA_StatusCode
-UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrinfo *info,
-                         const UA_KeyValueMap *params,
+UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
+                         struct addrinfo *info, const UA_KeyValueMap *params,
                          void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback,
                          UA_Boolean validate) {
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     /* Get logging information */
     char hoststr[UA_MAXHOSTNAME_LENGTH];
@@ -661,13 +651,16 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
                 "UDP %u\t| New listen socket for \"%s\" on port %u",
                 (unsigned)listenSocket, hoststr, port);
 
-    UA_StatusCode res = checkForListenMulticastAndConfigure(info, params, listenSocket, el->eventLoop.logger);
+    UA_StatusCode res =
+        checkForListenMulticastAndConfigure(info, params, listenSocket,
+                                            el->eventLoop.logger);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Configuring listen multicast failed");
         UA_close(listenSocket);
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
+
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
      * AF_INET6 sockets only for IPv6. */
@@ -738,16 +731,16 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
-    newudpfd->fd.fd = listenSocket;
-    newudpfd->fd.es = &cm->eventSource;
-    newudpfd->fd.callback = (UA_FDCallback)UDP_connectionSocketCallback;
-    newudpfd->fd.application = application;
-    newudpfd->fd.context = context;
-    newudpfd->fd.listenEvents = UA_FDEVENT_IN;
-    newudpfd->connectionCallback = connectionCallback;
+    newudpfd->rfd.fd = listenSocket;
+    newudpfd->rfd.es = &pcm->cm.eventSource;
+    newudpfd->rfd.listenEvents = UA_FDEVENT_IN;
+    newudpfd->rfd.eventSourceCB = (UA_FDCallback)UDP_connectionSocketCallback;
+    newudpfd->applicationCB = connectionCallback;
+    newudpfd->application = application;
+    newudpfd->context = context;
 
     /* Register in the EventLoop */
-    res = UDPConnectionManager_register(ucm, &newudpfd->fd);
+    res = UA_EventLoopPOSIX_registerFD(el, &newudpfd->rfd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP %u\t| Error registering the socket, closing",
@@ -757,20 +750,28 @@ UDP_registerListenSocket(UA_ConnectionManager *cm, UA_UInt16 port, struct addrin
         return res;
     }
 
+    /* Register internally in the EventSource */
+    ZIP_INSERT(UA_FDTree, &pcm->fds, &newudpfd->rfd);
+    pcm->fdsSize++;
+
     /* Register the listen socket in the application */
-    connectionCallback(cm, (uintptr_t)newudpfd->fd.fd,
-                       application, &newudpfd->fd.context,
+    UA_UNLOCK(&el->elMutex);
+    connectionCallback(&pcm->cm, (uintptr_t)newudpfd->rfd.fd,
+                       application, &newudpfd->context,
                        UA_CONNECTIONSTATE_ESTABLISHED,
                        &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_LOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UInt16 port,
-                          const UA_KeyValueMap *params,
+UDP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
+                          UA_UInt16 port, const UA_KeyValueMap *params,
                           void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback,
                           UA_Boolean validate) {
+    UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop)->elMutex, 1);
+
     /* Get all the interface and IPv4/6 combinations for the configured hostname */
     struct addrinfo hints, *res;
     memset(&hints, 0, sizeof hints);
@@ -794,7 +795,7 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UIn
     int retcode = UA_getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
         UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-           UA_LOG_WARNING(cm->eventSource.eventLoop->logger,
+           UA_LOG_WARNING(pcm->cm.eventSource.eventLoop->logger,
                           UA_LOGCATEGORY_NETWORK,
                           "UDP\t| getaddrinfo lookup for \"%s\" on port %u failed (%s)",
                           hostname, port, errno_str));
@@ -805,7 +806,7 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UIn
     struct addrinfo *ai = res;
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
     while(ai) {
-        rv = UDP_registerListenSocket(cm, port, ai, params, application,
+        rv = UDP_registerListenSocket(pcm, port, ai, params, application,
                                       context, connectionCallback, validate);
         if(rv != UA_STATUSCODE_GOOD && validate) {
             UA_freeaddrinfo(res);
@@ -817,52 +818,53 @@ UDP_registerListenSockets(UA_ConnectionManager *cm, const char *hostname, UA_UIn
     return UA_STATUSCODE_GOOD;
 }
 
-static
-UA_RegisteredFD *
-UDP_findRegisteredFD(UDPConnectionManager *ucm, uintptr_t connectionId) {
-    UA_RegisteredFD *rfd;
-    LIST_FOREACH(rfd, &ucm->fds, es_pointers) {
-        if(rfd->fd == (UA_FD)connectionId)
-            return rfd;
-    }
-    return NULL;
-}
-
 /* Close the connection via a delayed callback */
 static void
 UDP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
-    UA_EventLoop *el = cm->eventSource.eventLoop;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)cm->eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
+
     if(rfd->dc.callback) {
-        UA_LOG_INFO(el->logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP %u\t| Cannot close - already closing",
                     (unsigned)rfd->fd);
         return;
     }
 
-    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP %u\t| Shutdown called", (unsigned)rfd->fd);
 
     UA_DelayedCallback *dc = &rfd->dc;
     dc->callback = UDP_delayedClose;
     dc->application = cm;
     dc->context = rfd;
-    el->addDelayedCallback(el, dc);
+
+    /* Don't use the "public" el->addDelayedCallback. It takes a lock. */
+    dc->next = el->delayedCallbacks;
+    el->delayedCallbacks = dc;
 }
 
 static UA_StatusCode
 UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
-    UA_EventLoop *el = cm->eventSource.eventLoop;
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    UA_RegisteredFD *rfd = UDP_findRegisteredFD(ucm, connectionId);
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)cm->eventSource.eventLoop;
+
+    UA_LOCK(&el->elMutex);
+
+    UA_FD fd = (UA_FD)connectionId;
+    UA_RegisteredFD *rfd = ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
     if(!rfd) {
-        UA_LOG_WARNING(el->logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP\t| Cannot close UDP connection %u - not found",
                        (unsigned)connectionId);
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
     UDP_shutdown(cm, rfd);
 
+    UA_UNLOCK(&el->elMutex);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -870,6 +872,11 @@ static UA_StatusCode
 UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                        const UA_KeyValueMap *params,
                        UA_ByteString *buf) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+
+    UA_LOCK(&el->elMutex);
+
     /* Prevent OS signals when sending to a closed socket */
     int flags = MSG_NOSIGNAL;
 
@@ -878,33 +885,36 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     tmp_poll_fd.events = UA_POLLOUT;
 
     /* Look up the registered UDP socket */
-    UDP_FD *ufd = (UDP_FD *)UDP_findRegisteredFD((UDPConnectionManager *)cm, connectionId);
-    if(!ufd)
+    UA_FD fd = (UA_FD)connectionId;
+    UDP_FD *conn = (UDP_FD*)ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
+    if(!conn) {
+        UA_UNLOCK(&el->elMutex);
+        UA_ByteString_clear(buf);
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     /* Send the full buffer. This may require several calls to send */
     size_t nWritten = 0;
     do {
         ssize_t n = 0;
         do {
-            UA_LOG_DEBUG(cm->eventSource.eventLoop->logger,
-                         UA_LOGCATEGORY_NETWORK,
+            UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                          "UDP %u\t| Attempting to send", (unsigned)connectionId);
             size_t bytes_to_send = buf->length - nWritten;
-            n = UA_sendto((UA_FD)connectionId,
-                        (const char*)buf->data + nWritten,
-                          bytes_to_send, flags, (struct sockaddr*) &ufd->sendAddr, ufd->sendAddrLength);
+            n = UA_sendto((UA_FD)connectionId, (const char*)buf->data + nWritten,
+                          bytes_to_send, flags, (struct sockaddr*)&conn->sendAddr,
+                          conn->sendAddrLength);
             if(n < 0) {
                 /* An error we cannot recover from? */
                 if(UA_ERRNO != UA_INTERRUPTED &&
                    UA_ERRNO != UA_WOULDBLOCK &&
                    UA_ERRNO != UA_AGAIN) {
                     UA_LOG_SOCKET_ERRNO_WRAP(
-                       UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
-                                    UA_LOGCATEGORY_NETWORK,
+                       UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                                     "UDP %u\t| Send failed with error %s",
                                     (unsigned)connectionId, errno_str));
                     UDP_shutdownConnection(cm, connectionId);
+                    UA_UNLOCK(&el->elMutex);
                     UA_ByteString_clear(buf);
                     return UA_STATUSCODE_BADCONNECTIONCLOSED;
                 }
@@ -916,11 +926,12 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                     poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
                     if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED) {
                         UA_LOG_SOCKET_ERRNO_WRAP(
-                           UA_LOG_ERROR(cm->eventSource.eventLoop->logger,
+                           UA_LOG_ERROR(el->eventLoop.logger,
                                         UA_LOGCATEGORY_NETWORK,
                                         "UDP %u\t| Send failed with error %s",
                                         (unsigned)connectionId, errno_str));
                         UDP_shutdownConnection(cm, connectionId);
+                        UA_UNLOCK(&el->elMutex);
                         UA_ByteString_clear(buf);
                         return UA_STATUSCODE_BADCONNECTIONCLOSED;
                     }
@@ -931,13 +942,14 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     } while(nWritten < buf->length);
 
     /* Free the buffer */
+    UA_UNLOCK(&el->elMutex);
     UA_ByteString_clear(buf);
     return UA_STATUSCODE_GOOD;
 }
 
-
 static UA_StatusCode
-checkForSendMulticastAndConfigure(const UA_KeyValueMap *params, struct addrinfo *info, UA_FD newSock,
+checkForSendMulticastAndConfigure(const UA_KeyValueMap *params,
+                                  struct addrinfo *info, UA_FD newSock,
                                   const UA_Logger *logger) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(info->ai_family == AF_INET) {
@@ -968,7 +980,8 @@ checkForSendMulticastAndConfigure(const UA_KeyValueMap *params, struct addrinfo
 static UA_StatusCode
 registerSocketAndDestinationForSend(const UA_KeyValueMap *params,
                                     const char *hostname, struct addrinfo *info,
-                                    int error, UDP_FD * ufd, UA_FD *sock, const UA_Logger *logger) {
+                                    int error, UDP_FD *ufd, UA_FD *sock,
+                                    const UA_Logger *logger) {
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     *sock = newSock;
     if(newSock == UA_INVALID_FD) {
@@ -999,12 +1012,12 @@ registerSocketAndDestinationForSend(const UA_KeyValueMap *params,
 }
 
 static UA_StatusCode
-UDP_openSendConnection(UA_ConnectionManager *cm,
-                       const UA_KeyValueMap *params,
+UDP_openSendConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *params,
                        void *application, void *context,
                        UA_ConnectionManager_connectionCallback connectionCallback,
                        UA_Boolean validate) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)cm->eventSource.eventLoop;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     /* Get the connection parameters */
     char hostname[UA_MAXHOSTNAME_LENGTH];
@@ -1025,8 +1038,8 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
                  "UDP\t| Open a connection to \"%s\" on port %s", hostname, portStr);
 
     /* Allocate the UA_RegisteredFD */
-    UDP_FD *newudpfd = (UDP_FD*)UA_calloc(1, sizeof(UDP_FD));
-    if(!newudpfd) {
+    UDP_FD *conn = (UDP_FD*)UA_calloc(1, sizeof(UDP_FD));
+    if(!conn) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP\t| Error allocating memory for the socket, closing");
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -1036,59 +1049,67 @@ UDP_openSendConnection(UA_ConnectionManager *cm,
     UA_FD newSock = UA_INVALID_FD;
     UA_StatusCode res =
         registerSocketAndDestinationForSend(params, hostname, info,
-                                            error, newudpfd, &newSock, el->eventLoop.logger);
+                                            error, conn, &newSock,
+                                            el->eventLoop.logger);
     UA_freeaddrinfo(info);
     if(validate && res == UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP %u\t| Connection validated to \"%s\" on port %s",
                     (unsigned)newSock, hostname, portStr);
         UA_close(newSock);
-        UA_free(newudpfd);
+        UA_free(conn);
         return UA_STATUSCODE_GOOD;
     }
     if(res != UA_STATUSCODE_GOOD) {
-        UA_free(newudpfd);
+        UA_free(conn);
         return res;
     }
 
-    newudpfd->fd.fd = newSock;
-    newudpfd->fd.es = &cm->eventSource;
-    newudpfd->fd.callback = (UA_FDCallback)UDP_connectionSocketCallback;
-    newudpfd->fd.application = application;
-    newudpfd->fd.context = context;
-    newudpfd->fd.listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
-                                                 * connection is open */
-    newudpfd->connectionCallback = connectionCallback;
+    conn->rfd.fd = newSock;
+    conn->rfd.listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
+                                              * connection is open */
+    conn->rfd.es = &pcm->cm.eventSource;
+    conn->rfd.eventSourceCB = (UA_FDCallback)UDP_connectionSocketCallback;
+    conn->applicationCB= connectionCallback;
+    conn->application = application;
+    conn->context = context;
 
     /* Register the fd to trigger when output is possible (the connection is open) */
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    res = UDPConnectionManager_register(ucm, &newudpfd->fd);
+    res = UA_EventLoopPOSIX_registerFD(el, &conn->rfd);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "UDP\t| Registering the socket for %s failed", hostname);
         UA_close(newSock);
-        UA_free(newudpfd);
+        UA_free(conn);
         return res;
     }
 
+    /* Register internally in the EventSource */
+    ZIP_INSERT(UA_FDTree, &pcm->fds, &conn->rfd);
+    pcm->fdsSize++;
+
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                 "UDP %u\t| New connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
     /* Signal the connection as opening. The connection fully opens in the next
      * iteration of the EventLoop */
-    connectionCallback(cm, (uintptr_t)newSock, application, &newudpfd->fd.context,
-                       UA_CONNECTIONSTATE_OPENING, &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_UNLOCK(&el->elMutex);
+    connectionCallback(&pcm->cm, (uintptr_t)newSock, application,
+                       &conn->context, UA_CONNECTIONSTATE_OPENING,
+                       &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+    UA_LOCK(&el->elMutex);
 
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-UDP_openReceiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
+UDP_openReceiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *params,
                           void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback,
                           UA_Boolean validate) {
-    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
+    UA_LOCK_ASSERT(&el->elMutex, 1);
 
     /* Get the socket */
     const UA_UInt16 *port = (const UA_UInt16*)
@@ -1112,7 +1133,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params
     if(addrsSize == 0) {
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Listening on all interfaces");
-        return UDP_registerListenSockets(cm, NULL, *port, params, application,
+        return UDP_registerListenSockets(pcm, NULL, *port, params, application,
                                          context, connectionCallback, validate);
     }
 
@@ -1125,7 +1146,7 @@ UDP_openReceiveConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params
         memcpy(hn, hostStrings[i].data, hostStrings->length);
         hn[hostStrings->length] = '\0';
         UA_StatusCode rv =
-            UDP_registerListenSockets(cm, hn, *port, params, application,
+            UDP_registerListenSockets(pcm, hn, *port, params, application,
                                       context, connectionCallback, validate);
         if(rv != UA_STATUSCODE_GOOD)
             return rv;
@@ -1138,11 +1159,15 @@ static UA_StatusCode
 UDP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                    void *application, void *context,
                    UA_ConnectionManager_connectionCallback connectionCallback) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOCK(&el->elMutex);
+
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STARTED) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Cannot open a connection for a "
                      "ConnectionManager that is not started");
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -1151,8 +1176,10 @@ UDP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         UA_KeyValueRestriction_validate(el->eventLoop.logger, "UDP",
                                         &UDPConfigParameters[1],
                                         UDP_PARAMETERSSIZE-1, params);
-    if(res != UA_STATUSCODE_GOOD)
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&el->elMutex);
         return res;
+    }
 
     UA_Boolean validate = false;
     const UA_Boolean *validationValue = (const UA_Boolean*)
@@ -1169,24 +1196,31 @@ UDP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         listen = *listenValue;
 
     if(listen) {
-        return UDP_openReceiveConnection(cm, params, application, context,
-                                         connectionCallback, validate);
+        res = UDP_openReceiveConnection(pcm, params, application, context,
+                                        connectionCallback, validate);
     } else {
-        return UDP_openSendConnection(cm, params, application, context,
-                                      connectionCallback, validate);
+        res = UDP_openSendConnection(pcm, params, application, context,
+                                     connectionCallback, validate);
     }
+    UA_UNLOCK(&el->elMutex);
+    return res;
 }
 
-/* Asynchronously register the listenSocket */
 static UA_StatusCode
 UDP_eventSourceStart(UA_ConnectionManager *cm) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    if(!el)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_LOCK(&el->elMutex);
 
     /* Check the state */
     if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "To start the UDP ConnectionManager, "
+                     "UDP\t| To start the ConnectionManager, "
                      "it has to be registered in an EventLoop and not started");
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -1196,55 +1230,60 @@ UDP_eventSourceStart(UA_ConnectionManager *cm) {
                                         UDPConfigParameters, 1,
                                         &cm->eventSource.params);
     if(res != UA_STATUSCODE_GOOD)
-        return res;
+        goto finish;
 
-    /* The receive buffersize was configured? */
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
-    UA_UInt32 rxBufSize = 2u << 16; /* The default is 64kb */
-    const UA_UInt32 *configRxBufSize = (const UA_UInt32 *)
-        UA_KeyValueMap_getScalar(&cm->eventSource.params,
-                                 UDPConfigParameters[UDP_PARAMINDEX_RECVBUF].name,
-                                 &UA_TYPES[UA_TYPES_UINT32]);
-    if(configRxBufSize)
-        rxBufSize = *configRxBufSize;
-    res = UA_ByteString_allocBuffer(&ucm->rxBuffer, rxBufSize);
+    /* Allocate the rx buffer */
+    res = UA_EventLoopPOSIX_allocateRXBuffer(pcm);
     if(res != UA_STATUSCODE_GOOD)
-        return res;
+        goto finish;
 
     /* Set the EventSource to the started state */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
 
-    return UA_STATUSCODE_GOOD;
+ finish:
+    UA_UNLOCK(&el->elMutex);
+    return res;
+}
+
+static void *
+UDP_shutdownCB(void *application, UA_RegisteredFD *rfd) {
+    UA_ConnectionManager *cm = (UA_ConnectionManager*)application;
+    UDP_shutdown(cm, rfd);
+    return NULL;
 }
 
 static void
 UDP_eventSourceStop(UA_ConnectionManager *cm) {
-    UDPConnectionManager *ucm = (UDPConnectionManager*)cm;
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    UA_LOCK(&el->elMutex);
+
     UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                 "UDP\t| Shutting down the ConnectionManager");
 
+    /* Prevent new connections to open */
     cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
 
-    /* Shut down all registered fd. The cm is set to "stopped" when the last fd
-     * is closed (from within UDP_close). */
-    UA_RegisteredFD *rfd;
-    LIST_FOREACH(rfd, &ucm->fds, es_pointers) {
-        UDP_shutdown(cm, rfd);
-    }
+    /* Shutdown all existing connection */
+    ZIP_ITER(UA_FDTree, &pcm->fds, UDP_shutdownCB, cm);
 
     /* Check if stopped once more (also checking inside UDP_close, but there we
      * don't check if there is no rfd at all) */
-    UDP_checkStopped(ucm);
+    UDP_checkStopped(pcm);
+
+    UA_UNLOCK(&el->elMutex);
 }
 
 static UA_StatusCode
 UDP_eventSourceDelete(UA_ConnectionManager *cm) {
+    UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     if(cm->eventSource.state >= UA_EVENTSOURCESTATE_STARTING) {
         UA_LOG_ERROR(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_EVENTLOOP,
                      "UDP\t| The EventSource must be stopped before it can be deleted");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    UA_ByteString_clear(&pcm->rxBuffer);
     UA_KeyValueMap_clear(&cm->eventSource.params);
     UA_String_clear(&cm->eventSource.name);
     UA_free(cm);
@@ -1256,14 +1295,14 @@ static const char *udpName = "udp";
 
 UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName) {
-    UDPConnectionManager *cm = (UDPConnectionManager*)
-        UA_calloc(1, sizeof(UDPConnectionManager));
+    UA_POSIXConnectionManager *cm = (UA_POSIXConnectionManager*)
+        UA_calloc(1, sizeof(UA_POSIXConnectionManager));
     if(!cm)
         return NULL;
 
     cm->cm.eventSource.eventSourceType = UA_EVENTSOURCETYPE_CONNECTIONMANAGER;
     UA_String_copy(&eventSourceName, &cm->cm.eventSource.name);
-    cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *)) UDP_eventSourceStart;
+    cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *))UDP_eventSourceStart;
     cm->cm.eventSource.stop = (void (*)(UA_EventSource *))UDP_eventSourceStop;
     cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))UDP_eventSourceDelete;
     cm->cm.protocol = UA_STRING((char*)(uintptr_t)udpName);

From d9d539cc77586bbe56b19f98ab4c16a050ffbd06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 15:41:42 +0000
Subject: [PATCH 0792/1963] build(deps): bump deps/nodesetLoader from `a4a7ce0`
 to `35dfdd5`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `a4a7ce0` to `35dfdd5`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/a4a7ce087fed6d6fa9a2af7f21bdfc3fa01bace6...35dfdd53d18c1dd068c771cca802621d8d42042a)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index a4a7ce087fe..35dfdd53d18 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit a4a7ce087fed6d6fa9a2af7f21bdfc3fa01bace6
+Subproject commit 35dfdd53d18c1dd068c771cca802621d8d42042a

From 74ecb37d6a5b6e337e9990ad21e40fc155cd5d35 Mon Sep 17 00:00:00 2001
From: Srdjan Usorac <uso@keba.com>
Date: Mon, 6 Mar 2023 13:00:23 +0100
Subject: [PATCH 0793/1963] feat(test): Add support for loading MTConnect and
 PNRIO

Signed-off-by: Srdjan Usorac <uso@keba.com>
---
 .../add_node_integration_test/run_test.sh         |  9 +++++++--
 .../check_nodeset_loader_ua_nodeset.c             | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/tests/nodeset-loader/add_node_integration_test/run_test.sh b/tests/nodeset-loader/add_node_integration_test/run_test.sh
index 909a6f66fa8..e74454978f2 100644
--- a/tests/nodeset-loader/add_node_integration_test/run_test.sh
+++ b/tests/nodeset-loader/add_node_integration_test/run_test.sh
@@ -10,7 +10,6 @@
 #      - ${OPEN62541_NODESET_DIR}AML/Opc.Ua.AMLLibraries.NodeSet2.xml
 #      - ${OPEN62541_NODESET_DIR}CNC/Opc.Ua.CNC.NodeSet.xml
 #      - ${OPEN62541_NODESET_DIR}ISA95-JOBCONTROL/opc.ua.isa95-jobcontrol.nodeset2.xml
-#      - ${OPEN62541_NODESET_DIR}PNRIO/Opc.Ua.PnRio.Nodeset2.xml
 #      - ${OPEN62541_NODESET_DIR}TMC/Opc.Ua.TMC.NodeSet2.xml
 #
 #   * NodesetLoader XML decoding not supported for certain types issues:
@@ -25,7 +24,6 @@
 #      - ${OPEN62541_NODESET_DIR}FDI/Opc.Ua.Fdi7.NodeSet2.xml
 #      - ${OPEN62541_NODESET_DIR}IEC61850/Opc.Ua.IEC61850-6.NodeSet2.xml
 #      - ${OPEN62541_NODESET_DIR}ISA-95/Opc.ISA95.NodeSet2.xml
-#      - ${OPEN62541_NODESET_DIR}MTConnect/Opc.Ua.MTConnect.NodeSet2.xml
 #      - ${OPEN62541_NODESET_DIR}POWERLINK/Opc.Ua.POWERLINK.NodeSet2.xml
 #
 #
@@ -294,6 +292,9 @@ add_node_integration_test "Mining.TransportDumping.RearDumpTruck" \
     $UA_NODESET_PATH/Mining/TransportDumping/General/1.0.0/Opc.Ua.Mining.TransportDumping.General.NodeSet2.xml \
     $UA_NODESET_PATH/Mining/TransportDumping/RearDumpTruck/1.0.0/Opc.Ua.Mining.TransportDumping.RearDumpTruck.NodeSet2.xml
 
+add_node_integration_test "MTConnect" \
+    $UA_NODESET_PATH/MTConnect/Opc.Ua.MTConnect.NodeSet2.xml
+
 add_node_integration_test "OpenSCS" \
     $UA_NODESET_PATH/OpenSCS/Opc.Ua.OPENSCS.NodeSet2.xml
 
@@ -504,6 +505,10 @@ add_node_integration_test "PNEM" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
     $UA_NODESET_PATH/PNEM/Opc.Ua.PnEm.NodeSet2.xml
 
+add_node_integration_test "PNRIO" \
+    $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/PNRIO/Opc.Ua.PnRio.Nodeset2.xml
+
 add_node_integration_test "PROFINET" \
     $UA_NODESET_PATH/PROFINET/Opc.Ua.Pn.NodeSet2.xml
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
index 777ea69738b..3ed82650506 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
@@ -11,7 +11,6 @@
  *    * NodesetLoader related issues:
  *      - ${OPEN62541_NODESET_DIR}AML/Opc.Ua.AMLLibraries.NodeSet2.xml
  *      - ${OPEN62541_NODESET_DIR}ISA95-JOBCONTROL/opc.ua.isa95-jobcontrol.nodeset2.xml
- *      - ${OPEN62541_NODESET_DIR}PNRIO/Opc.Ua.PnRio.Nodeset2.xml
  *      - ${OPEN62541_NODESET_DIR}TMC/Opc.Ua.TMC.NodeSet2.xml
  *
  *    * Memory leak issues (libXML2 library related):
@@ -581,6 +580,13 @@ START_TEST(Server_loadPnEmNodeset) {
 }
 END_TEST
 
+START_TEST(Server_loadPnRioNodeset) {
+    bool retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR "PNRIO/Opc.Ua.PnRio.Nodeset2.xml", NULL);
+    ck_assert_uint_eq(retVal, true);
+}
+END_TEST
+
 START_TEST(Server_loadPROFINETNodeset) {
     bool retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "PROFINET/Opc.Ua.Pn.NodeSet2.xml", NULL);
@@ -1160,6 +1166,13 @@ static Suite* testSuite_Client(void) {
         tcase_add_test(tc_server, Server_loadPLCopenNodeset);
         suite_add_tcase(s, tc_server);
     }
+    {
+        TCase *tc_server = tcase_create("Server load PNRIO nodeset");
+        tcase_add_unchecked_fixture(tc_server, setup, teardown);
+        tcase_add_test(tc_server, Server_loadDINodeset);
+        tcase_add_test(tc_server, Server_loadPnRioNodeset);
+        suite_add_tcase(s, tc_server);
+    }
     {
         TCase *tc_server = tcase_create("Server load PNEM nodeset");
         tcase_add_unchecked_fixture(tc_server, setup, teardown);

From 6f7c2a7a4fa1e0ca475cbb393e9734ebe90500b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Mar 2023 01:18:03 +0000
Subject: [PATCH 0794/1963] build(deps): bump deps/ua-nodeset from `3f301f1` to
 `43ed40f`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `3f301f1` to `43ed40f`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/3f301f123c3df4b1dfcafbcceff4ae756290c444...43ed40f06bb6c9fd5ad1e6f52f83d5ec2c2e561a)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 3f301f123c3..43ed40f06bb 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 3f301f123c3df4b1dfcafbcceff4ae756290c444
+Subproject commit 43ed40f06bb6c9fd5ad1e6f52f83d5ec2c2e561a

From 153adb15039c6cea594a54802b51794ce873cfe3 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 13 Mar 2023 17:01:10 +0100
Subject: [PATCH 0795/1963] fix(server) include custom-datatypes in automatic
 type adjust logic (#5679)

---
 src/server/ua_services_attribute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 88711f99a46..6c425852c2e 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1153,7 +1153,7 @@ adjustValueType(UA_Server *server, UA_Variant *value,
     /* Unwrap ExtensionObject arrays if they all contain the same DataType */
     unwrapEOArray(server, value);
 
-    const UA_DataType *targetDataType = UA_findDataType(targetDataTypeId);
+    const UA_DataType *targetDataType = UA_findDataTypeWithCustom(targetDataTypeId, server->config.customDataTypes);
     if(!targetDataType) {
         /* Type might not have been found, if it's a non-NS0 type or an abstract type. */
         return;

From a20a10e55a4b007c213b7aa072c25f18e8463792 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 01:15:05 +0000
Subject: [PATCH 0796/1963] build(deps): bump deps/ua-nodeset from `43ed40f` to
 `526c5e5`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `43ed40f` to `526c5e5`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/43ed40f06bb6c9fd5ad1e6f52f83d5ec2c2e561a...526c5e59e7ba9e54f9dc7848ce2baa249395d3ef)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 43ed40f06bb..526c5e59e7b 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 43ed40f06bb6c9fd5ad1e6f52f83d5ec2c2e561a
+Subproject commit 526c5e59e7ba9e54f9dc7848ce2baa249395d3ef

From 37eec281af16384dcdbc64ace7c36a1e563c0b92 Mon Sep 17 00:00:00 2001
From: Jan Murzyn <jan.murzyn@mpl.mee.com>
Date: Tue, 14 Mar 2023 13:58:16 +0100
Subject: [PATCH 0797/1963] fix(nodeset-loader): Minor bugfixes

---
 examples/nodeset_loader/nodeset_loader.c      |   2 +-
 .../nodeset_loader/server_nodeset_loader.c    |   2 +-
 plugins/ua_nodesetloader.c                    |  10 +-
 src/server/ua_server_config.c                 |   1 +
 .../add_node_integration_test/server.c        |   2 +-
 .../nodeset-loader/check_nodeset_loader_adi.c |   8 +-
 .../check_nodeset_loader_autoid.c             |   8 +-
 .../check_nodeset_loader_compare_di.c         |   4 +-
 .../nodeset-loader/check_nodeset_loader_di.c  |   4 +-
 .../check_nodeset_loader_input.c              |   4 +-
 .../check_nodeset_loader_ordering_di.c        |   4 +-
 .../nodeset-loader/check_nodeset_loader_plc.c |   8 +-
 .../check_nodeset_loader_testnodeset.c        |   8 +-
 .../check_nodeset_loader_ua_nodeset.c         | 310 +++++++++---------
 14 files changed, 190 insertions(+), 185 deletions(-)

diff --git a/examples/nodeset_loader/nodeset_loader.c b/examples/nodeset_loader/nodeset_loader.c
index 628af47a868..252217089e3 100644
--- a/examples/nodeset_loader/nodeset_loader.c
+++ b/examples/nodeset_loader/nodeset_loader.c
@@ -21,7 +21,7 @@ int main(int argc, const char *argv[]) {
     UA_Server_run_startup(server);
 
     for (int cnt = 1; cnt < argc; cnt++) {
-        if (!UA_Server_loadNodeset(server, argv[cnt], NULL)) {
+        if (UA_StatusCode_isBad(UA_Server_loadNodeset(server, argv[cnt], NULL))) {
             printf("Nodeset %s could not be loaded, exit\n", argv[cnt]);
             return EXIT_FAILURE;
         }
diff --git a/examples/nodeset_loader/server_nodeset_loader.c b/examples/nodeset_loader/server_nodeset_loader.c
index 03cf41a2ad1..130e398d8bb 100644
--- a/examples/nodeset_loader/server_nodeset_loader.c
+++ b/examples/nodeset_loader/server_nodeset_loader.c
@@ -20,7 +20,7 @@ int main(int argc, const char *argv[]) {
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     for (int cnt = 1; cnt < argc; cnt++) {
-        if (!UA_Server_loadNodeset(server, argv[cnt], NULL)) {
+        if (UA_StatusCode_isBad(UA_Server_loadNodeset(server, argv[cnt], NULL))) {
             printf("Nodeset %s could not be loaded, exit\n", argv[cnt]);
             return EXIT_FAILURE;
         }
diff --git a/plugins/ua_nodesetloader.c b/plugins/ua_nodesetloader.c
index c94e641bc58..d76499c04b7 100644
--- a/plugins/ua_nodesetloader.c
+++ b/plugins/ua_nodesetloader.c
@@ -14,7 +14,11 @@
 UA_StatusCode
 UA_Server_loadNodeset(UA_Server *server, const char *nodeset2XmlFilePath,
                       UA_NodeSetLoaderOptions *options) {
-    return NodesetLoader_loadFile(server,
-                                  nodeset2XmlFilePath,
-                                  (NodesetLoader_ExtensionInterface*)options);
+    if(!NodesetLoader_loadFile(server,
+                               nodeset2XmlFilePath,
+                               (NodesetLoader_ExtensionInterface*)options)) {
+        return UA_STATUSCODE_BAD;
+    }
+
+    return UA_STATUSCODE_GOOD;
 }
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index c537e85f8fe..4f7abc72c6c 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -112,6 +112,7 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 
     /* Custom Data Types */
     UA_cleanupDataTypeWithCustom(config->customDataTypes);
+    config->customDataTypes = NULL;
 }
 
 #ifdef UA_ENABLE_PUBSUB
diff --git a/tests/nodeset-loader/add_node_integration_test/server.c b/tests/nodeset-loader/add_node_integration_test/server.c
index 03cf41a2ad1..130e398d8bb 100644
--- a/tests/nodeset-loader/add_node_integration_test/server.c
+++ b/tests/nodeset-loader/add_node_integration_test/server.c
@@ -20,7 +20,7 @@ int main(int argc, const char *argv[]) {
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
     for (int cnt = 1; cnt < argc; cnt++) {
-        if (!UA_Server_loadNodeset(server, argv[cnt], NULL)) {
+        if (UA_StatusCode_isBad(UA_Server_loadNodeset(server, argv[cnt], NULL))) {
             printf("Nodeset %s could not be loaded, exit\n", argv[cnt]);
             return EXIT_FAILURE;
         }
diff --git a/tests/nodeset-loader/check_nodeset_loader_adi.c b/tests/nodeset-loader/check_nodeset_loader_adi.c
index 8bf65a4b05b..6ba9222b6de 100644
--- a/tests/nodeset-loader/check_nodeset_loader_adi.c
+++ b/tests/nodeset-loader/check_nodeset_loader_adi.c
@@ -24,16 +24,16 @@ static void teardown(void) {
 }
 
 START_TEST(Server_loadDiNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadAdiNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "ADI/Opc.Ua.Adi.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_autoid.c b/tests/nodeset-loader/check_nodeset_loader_autoid.c
index 93f175bd318..47016d276a6 100644
--- a/tests/nodeset-loader/check_nodeset_loader_autoid.c
+++ b/tests/nodeset-loader/check_nodeset_loader_autoid.c
@@ -24,16 +24,16 @@ static void teardown(void) {
 }
 
 START_TEST(Server_loadDiNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadAutoIDNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "AutoID/Opc.Ua.AutoID.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_compare_di.c b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
index 1ddeb3ee7a8..3e90e8051d4 100644
--- a/tests/nodeset-loader/check_nodeset_loader_compare_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
@@ -26,9 +26,9 @@ static void teardown(void) {
 }
 
 START_TEST(Server_compareDiNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 
     UA_ServerConfig *config = UA_Server_getConfig(server);
     ck_assert(config->customDataTypes);
diff --git a/tests/nodeset-loader/check_nodeset_loader_di.c b/tests/nodeset-loader/check_nodeset_loader_di.c
index 586b5b216ba..85013eaaab3 100644
--- a/tests/nodeset-loader/check_nodeset_loader_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_di.c
@@ -24,9 +24,9 @@ static void teardown(void) {
 }
 
 START_TEST(Server_loadDiNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_input.c b/tests/nodeset-loader/check_nodeset_loader_input.c
index 580eda74283..214d8b0418e 100644
--- a/tests/nodeset-loader/check_nodeset_loader_input.c
+++ b/tests/nodeset-loader/check_nodeset_loader_input.c
@@ -27,8 +27,8 @@ static void teardown(void) {
 
 START_TEST(Server_loadInputNodesets) {
     for (int cnt = 0; cnt < nodesetsNum; cnt++) {
-        bool retVal = UA_Server_loadNodeset(server, nodesetPaths[cnt], NULL);
-        ck_assert_uint_eq(retVal, true);
+        UA_StatusCode retVal = UA_Server_loadNodeset(server, nodesetPaths[cnt], NULL);
+        ck_assert(UA_StatusCode_isGood(retVal));
     }
 }
 END_TEST
diff --git a/tests/nodeset-loader/check_nodeset_loader_ordering_di.c b/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
index 9db9b345af1..081545ba55c 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
@@ -24,9 +24,9 @@ static void teardown(void) {
 }
 
 START_TEST(Server_loadInvalidOrderingDiNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_ORDERING_DIR "Opc.Ua.Di.NodeSet2_invalid_ordering.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_plc.c b/tests/nodeset-loader/check_nodeset_loader_plc.c
index 8dfe64de182..82f67ecbfef 100644
--- a/tests/nodeset-loader/check_nodeset_loader_plc.c
+++ b/tests/nodeset-loader/check_nodeset_loader_plc.c
@@ -24,16 +24,16 @@ static void teardown(void) {
 }
 
 START_TEST(Server_loadDiNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlcNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
index 5dc3bbf045e..c771f9f5788 100644
--- a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
@@ -51,16 +51,16 @@ static void teardown(void) {
 }
 
 START_TEST(Server_loadDiNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadTestNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_TESTNODESET_DIR "testnodeset.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
     size_t nsIndex = (size_t) -1;
     UA_Server_getNamespaceByName(server, UA_STRING("http://yourorganisation.org/test/"), &nsIndex);
     ck_assert(nsIndex != (size_t)-1);
diff --git a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
index 3ed82650506..8378d424f90 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
@@ -60,579 +60,579 @@ static void teardown(void) {
 }
 
 START_TEST(Server_loadADINodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "ADI/Opc.Ua.Adi.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadAMBNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "AMB/Opc.Ua.AMB.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadAMLBaseTypesNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "AML/Opc.Ua.AMLBaseTypes.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadAutoIDNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "AutoID/Opc.Ua.AutoID.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadBACnetNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "BACnet/Opc.Ua.BACnet.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadCASNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "CAS/Opc.Ua.CAS.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadCommercialKitchenEquipmentNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "CommercialKitchenEquipment/Opc.Ua.CommercialKitchenEquipment.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadCSPPlusForMachineNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "CSPPlusForMachine/Opc.Ua.CSPPlusForMachine.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadDEXPINodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DEXPI/Opc.Ua.DEXPI.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadDINodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DI/Opc.Ua.Di.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadDotNetNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "DotNet/Opc.Ua.NodeSet.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadFDI5Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "FDI/Opc.Ua.Fdi5.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadFDI7Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "FDI/Opc.Ua.Fdi7.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadFDTNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "FDT/Opc.Ua.FDT.NodeSet.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadGDSNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "GDS/Opc.Ua.Gds.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 
 START_TEST(Server_loadServer_loadGlassNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Glass/Flat/Opc.Ua.Glass.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadI4AASNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "I4AAS/Opc.Ua.I4AAS.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadIANodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "IA/Opc.Ua.IA.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadIAExamplesNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "IA/Opc.Ua.IA.NodeSet2.examples.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadIEC61850_6_Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "IEC61850/Opc.Ua.IEC61850-6.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadIEC61850_7_3_Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "IEC61850/Opc.Ua.IEC61850-7-3.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadIEC61850_7_4_Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "IEC61850/Opc.Ua.IEC61850-7-4.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadIOLinkIODDNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "IOLink/Opc.Ua.IOLinkIODD.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadIOLinkNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "IOLink/Opc.Ua.IOLink.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadISA95Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "ISA-95/Opc.ISA95.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMachineryNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Machinery/Opc.Ua.Machinery.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMachineryExamplesNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Machinery/Opc.Ua.Machinery.Examples.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMachineToolNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "MachineTool/Opc.Ua.MachineTool.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMDISNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "MDIS/Opc.MDIS.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMiningDevelopmentSupportGeneralNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "Mining/DevelopmentSupport/General/1.0.0/Opc.Ua.Mining.DevelopmentSupport.General.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMiningExtractionGeneralNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "Mining/Extraction/General/1.0.0/Opc.Ua.Mining.Extraction.General.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMiningMineralProcessingGeneralNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "Mining/MineralProcessing/General/1.0.0/Opc.Ua.Mining.MineralProcessing.General.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMiningMonitoringSupervisionServicesGeneralNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "Mining/MonitoringSupervisionServices/General/1.0.0/Opc.Ua.Mining.MonitoringSupervisionServices.General.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadMTConnectNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "MTConnect/Opc.Ua.MTConnect.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadOPENSCSNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "OpenSCS/Opc.Ua.OPENSCS.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPackMLNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "PackML/Opc.Ua.PackML.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionCalenderNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/Calender/1.00/Opc.Ua.PlasticsRubber.Extrusion.Calender.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionCalibratorNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/Calibrator/1.00/Opc.Ua.PlasticsRubber.Extrusion.Calibrator.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionCorrugatorNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/Corrugator/1.00/Opc.Ua.PlasticsRubber.Extrusion.Corrugator.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionCutterNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/Cutter/1.00/Opc.Ua.PlasticsRubber.Extrusion.Cutter.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionDieNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/Die/1.00/Opc.Ua.PlasticsRubber.Extrusion.Die.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionExtruderNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/Extruder/1.00/Opc.Ua.PlasticsRubber.Extrusion.Extruder.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionExtrusionLineNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/ExtrusionLine/1.00/Opc.Ua.PlasticsRubber.Extrusion.ExtrusionLine.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionFilterNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/Filter/1.00/Opc.Ua.PlasticsRubber.Extrusion.Filter.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_0_Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/GeneralTypes/1.00/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionGeneralTypes_v1_0_1_Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/GeneralTypes/1.01/Opc.Ua.PlasticsRubber.Extrusion.GeneralTypes.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionHaulOffNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/HaulOff/1.00/Opc.Ua.PlasticsRubber.Extrusion.HaulOff.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionMeltPumpNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/MeltPump/1.00/Opc.Ua.PlasticsRubber.Extrusion.MeltPump.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionPelletizerNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion/Pelletizer/1.00/Opc.Ua.PlasticsRubber.Extrusion.Pelletizer.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2CalenderNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/Calender/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Calender.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2CalibratorNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/Calibrator/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Calibrator.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2CorrugatorNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/Corrugator/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Corrugator.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2CutterNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/Cutter/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Cutter.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2DieNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/Die/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Die.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2ExtruderNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/Extruder/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Extruder.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2ExtrusionLineNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/ExtrusionLine/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.ExtrusionLine.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2FilterNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/Filter/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Filter.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2GeneralTypesNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/GeneralTypes/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.GeneralTypes.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2HaulOffNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/HaulOff/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.HaulOff.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2MeltPumpNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/MeltPump/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.MeltPump.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberExtrusionv2PelletizerNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/Extrusion_v2/Pelletizer/2.00/Opc.Ua.PlasticsRubber.Extrusion_v2.Pelletizer.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberGeneralTypes_v1_0_2_Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/GeneralTypes/1.02/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberGeneralTypes_v1_0_3_Nodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/GeneralTypes/1.03/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberHotRunnerNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/HotRunner/1.00/Opc.Ua.PlasticsRubber.HotRunner.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberIMM2MESNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/IMM2MES/1.01/Opc.Ua.PlasticsRubber.IMM2MES.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberLDSNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
-        OPEN62541_NODESET_DIR 
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
+        OPEN62541_NODESET_DIR
         "PlasticsRubber/LDS/1.00/Opc.Ua.PlasticsRubber.LDS.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPlasticsRubberTCDNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR
         "PlasticsRubber/TCD/1.01/Opc.Ua.PlasticsRubber.TCD.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPLCopenNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "PLCopen/Opc.Ua.PLCopen.NodeSet2_V1.02.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPnEmNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "PNEM/Opc.Ua.PnEm.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPnRioNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "PNRIO/Opc.Ua.PnRio.Nodeset2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadPROFINETNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "PROFINET/Opc.Ua.Pn.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadRoboticsNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Robotics/Opc.Ua.Robotics.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadSafetyNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Safety/Opc.Ua.Safety.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadSercosNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Sercos/Sercos.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadWeihenstephanNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Weihenstephan/Opc.Ua.Weihenstephan.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadWoodworkingEumaboisNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Woodworking/Opc.Ua.Eumabois.Nodeset2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 
 START_TEST(Server_loadWoodworkingNodeset) {
-    bool retVal = UA_Server_loadNodeset(server,
+    UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_NODESET_DIR "Woodworking/Opc.Ua.Woodworking.NodeSet2.xml", NULL);
-    ck_assert_uint_eq(retVal, true);
+    ck_assert(UA_StatusCode_isGood(retVal));
 }
 END_TEST
 

From 39fa9835fd33f58e5a2fd2a2b744f678b752fbb0 Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Tue, 21 Mar 2023 17:42:31 +0100
Subject: [PATCH 0798/1963] fix(pubsub): decoding of custom datatypes.  (#5681)

* Added test for Pubsub custom types

* Fixed missing UA_DataTypeArray for decoding

* Added more pubsub test-cases for custom types

* Removed wrapper function. Updated tests.

* Fixed CI build issues
---
 examples/pubsub/pubsub_subscribe_standalone.c |    2 +-
 src/pubsub/ua_pubsub_networkmessage.c         |   22 +-
 src/pubsub/ua_pubsub_networkmessage.h         |    9 +-
 src/pubsub/ua_pubsub_reader.c                 |    2 +-
 tests/CMakeLists.txt                          |    1 +
 tests/pubsub/check_pubsub_encoding.c          |   30 +-
 tests/pubsub/check_pubsub_encoding_custom.c   | 1750 +++++++++++++++++
 ...heck_pubsub_multiple_subscribe_rt_levels.c |    2 +-
 tests/pubsub/check_pubsub_publish_rt_levels.c |    2 +-
 tests/pubsub/check_pubsub_publish_uadp.c      |    2 +-
 tools/ua2json/ua2json.c                       |    2 +-
 11 files changed, 1787 insertions(+), 37 deletions(-)
 create mode 100644 tests/pubsub/check_pubsub_encoding_custom.c

diff --git a/examples/pubsub/pubsub_subscribe_standalone.c b/examples/pubsub/pubsub_subscribe_standalone.c
index ad0a4f75560..55daa3f41e9 100644
--- a/examples/pubsub/pubsub_subscribe_standalone.c
+++ b/examples/pubsub/pubsub_subscribe_standalone.c
@@ -61,7 +61,7 @@ customDecodeAndProcessCallback(UA_PubSubChannel *psc, void *ctx, const UA_ByteSt
     UA_NetworkMessage networkMessage;
     memset(&networkMessage, 0, sizeof(UA_NetworkMessage));
     size_t currentPosition = 0;
-    UA_NetworkMessage_decodeBinary(buffer, &currentPosition, &networkMessage);
+    UA_NetworkMessage_decodeBinary(buffer, &currentPosition, &networkMessage, NULL);
 
     /* Is this the correct message type? */
     if(networkMessage.networkMessageType != UA_NETWORKMESSAGE_DATASET)
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 5fee9347b70..35fccf9570a 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -818,7 +818,7 @@ UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset, UA_Net
 }
 
 UA_StatusCode
-UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst) {
+UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes) {
 
     // Payload
     if(dst->networkMessageType != UA_NETWORKMESSAGE_DATASET)
@@ -846,12 +846,12 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
     if(count == 1)
         rv = UA_DataSetMessage_decodeBinary(src, offset,
                                             &(dst->payload.dataSetPayload.dataSetMessages[0]),
-                                            0);
+                                            0, customTypes);
     else {
         for(UA_Byte i = 0; i < count; i++) {
             rv = UA_DataSetMessage_decodeBinary(src, offset,
                                                 &(dst->payload.dataSetPayload.dataSetMessages[i]),
-                                                dst->payload.dataSetPayload.sizes[i]);
+                                                dst->payload.dataSetPayload.sizes[i], customTypes);
         }
     }
     UA_CHECK_STATUS(rv, return rv);
@@ -891,8 +891,7 @@ UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset, UA_Net
 
 UA_StatusCode
 UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
-                               UA_NetworkMessage* dst) {
-
+                               UA_NetworkMessage* dst, const UA_DataTypeArray *customTypes) {
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
 
     /* headers only need to be decoded when not in encryption mode
@@ -912,7 +911,7 @@ UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
     rv = UA_NetworkMessage_decodeHeaders(src, offset, dst);
     UA_CHECK_STATUS(rv, return rv);
 
-    rv = UA_NetworkMessage_decodePayload(src, offset, dst);
+    rv = UA_NetworkMessage_decodePayload(src, offset, dst, customTypes);
     UA_CHECK_STATUS(rv, return rv);
 
     rv = UA_NetworkMessage_decodeFooters(src, offset, dst);
@@ -1504,7 +1503,7 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
 }
 
 UA_StatusCode
-UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataSetMessage* dst, UA_UInt16 dsmSize) {
+UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataSetMessage* dst, UA_UInt16 dsmSize, const UA_DataTypeArray *customTypes) {
     size_t initialOffset = *offset;
     memset(dst, 0, sizeof(UA_DataSetMessage));
     UA_StatusCode rv = UA_DataSetMessageHeader_decodeBinary(src, offset, &dst->header);
@@ -1525,7 +1524,7 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                     (UA_DataValue *)UA_Array_new(dst->data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
                 for (UA_UInt16 i = 0; i < dst->data.keyFrameData.fieldCount; i++) {
                     UA_DataValue_init(&dst->data.keyFrameData.dataSetFields[i]);
-                    rv = UA_Variant_decodeBinary(src, offset, &dst->data.keyFrameData.dataSetFields[i].value);
+                    rv = UA_decodeBinaryInternal(src, offset, &dst->data.keyFrameData.dataSetFields[i].value, &UA_TYPES[UA_TYPES_VARIANT], customTypes);
                     UA_CHECK_STATUS(rv, return rv);
 
                     dst->data.keyFrameData.dataSetFields[i].hasValue = true;
@@ -1539,7 +1538,7 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                 dst->data.keyFrameData.dataSetFields =
                     (UA_DataValue *)UA_Array_new(dst->data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
                 for (UA_UInt16 i = 0; i < dst->data.keyFrameData.fieldCount; i++) {
-                    rv = UA_DataValue_decodeBinary(src, offset, &(dst->data.keyFrameData.dataSetFields[i]));
+                    rv = UA_decodeBinaryInternal(src, offset, &dst->data.keyFrameData.dataSetFields[i], &UA_TYPES[UA_TYPES_DATAVALUE], customTypes);
                     UA_CHECK_STATUS(rv, return rv);
                 }
                 break;
@@ -1574,7 +1573,7 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                     UA_CHECK_STATUS(rv, return rv);
 
                     UA_DataValue_init(&dst->data.deltaFrameData.deltaFrameFields[i].fieldValue);
-                    rv = UA_Variant_decodeBinary(src, offset, &dst->data.deltaFrameData.deltaFrameFields[i].fieldValue.value);
+                    rv = UA_decodeBinaryInternal(src, offset, &dst->data.deltaFrameData.deltaFrameFields[i].fieldValue.value, &UA_TYPES[UA_TYPES_VARIANT], customTypes);
                     UA_CHECK_STATUS(rv, return rv);
 
                     dst->data.deltaFrameData.deltaFrameFields[i].fieldValue.hasValue = true;
@@ -1590,7 +1589,8 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                     rv = UA_UInt16_decodeBinary(src, offset, &dst->data.deltaFrameData.deltaFrameFields[i].fieldIndex);
                     UA_CHECK_STATUS(rv, return rv);
 
-                    rv = UA_DataValue_decodeBinary(src, offset, &(dst->data.deltaFrameData.deltaFrameFields[i].fieldValue));
+                    rv = UA_decodeBinaryInternal(src, offset, &(dst->data.deltaFrameData.deltaFrameFields[i].fieldValue), &UA_TYPES[UA_TYPES_DATAVALUE], customTypes);
+
                     UA_CHECK_STATUS(rv, return rv);
                 }
                 break;
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 480dc5ef7f5..d2344201a7f 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -246,7 +246,7 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
 
 UA_StatusCode
 UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
-                               UA_DataSetMessage* dst, UA_UInt16 dsmSize);
+                               UA_DataSetMessage* dst, UA_UInt16 dsmSize, const UA_DataTypeArray *customTypes);
 
 size_t
 UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage *p,
@@ -300,7 +300,7 @@ UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset,
 
 UA_StatusCode
 UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset,
-                                UA_NetworkMessage *dst);
+                                UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes);
 
 UA_StatusCode
 UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset,
@@ -308,9 +308,8 @@ UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset,
 
 UA_StatusCode
 UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
-                               UA_NetworkMessage* dst);
-
-
+                               UA_NetworkMessage* dst, const UA_DataTypeArray *customTypes);
+                               
 UA_StatusCode
 UA_NetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
                                      UA_NetworkMessage *dst);
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 68c037d99f6..c208ce61f8b 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1505,7 +1505,7 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
     }
 #endif
 
-    rv = UA_NetworkMessage_decodePayload(buffer, pos, nm);
+    rv = UA_NetworkMessage_decodePayload(buffer, pos, nm, server->config.customDataTypes);
     UA_CHECK_STATUS(rv, return rv);
 
     rv = UA_NetworkMessage_decodeFooters(buffer, pos, nm);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1735513e9bd..cdb78eb29a7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -315,6 +315,7 @@ endif()
 
 if(UA_ENABLE_PUBSUB)
     ua_add_test(pubsub/check_pubsub_encoding.c)
+    ua_add_test(pubsub/check_pubsub_encoding_custom.c)
     ua_add_test(pubsub/check_pubsub_pds.c)
     ua_add_test(pubsub/check_pubsub_connection_udp.c)
     ua_add_test(pubsub/check_pubsub_publish.c)
diff --git a/tests/pubsub/check_pubsub_encoding.c b/tests/pubsub/check_pubsub_encoding.c
index 12da4a79cd5..3cf420ffad0 100644
--- a/tests/pubsub/check_pubsub_encoding.c
+++ b/tests/pubsub/check_pubsub_encoding.c
@@ -50,7 +50,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueVariantKeyFrame) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -118,7 +118,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueDataValueKeyFrame) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -191,7 +191,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantKeyFrame) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -267,7 +267,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueKeyFrame) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -340,7 +340,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueVariantDeltaFrame) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -409,7 +409,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueDataValueDeltaFrame) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -527,7 +527,7 @@ START_TEST(UA_PubSub_Decode_WithBufferTooSmallShallReturnError) {
         buffer2.data[i] = buffer.data[i];
     }
 
-    rv = UA_NetworkMessage_decodeBinary(&buffer2, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer2, &offset, &m2, NULL);
     ck_assert_int_ne(rv, UA_STATUSCODE_GOOD);
 
     UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
@@ -590,7 +590,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantDeltaFrame) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -686,7 +686,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueDeltaFrame) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -781,7 +781,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantKeyFrameGroupHeader) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -880,7 +880,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantDeltaFramePublDSCID) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -975,7 +975,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueKeyFramePH) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -1064,7 +1064,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesVariantKeyFrameTSProm) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -1169,7 +1169,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS2ValuesDataValueDeltaFrameGHProm2) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
@@ -1291,7 +1291,7 @@ START_TEST(UA_PubSub_EnDecode_ShallWorkOn2DSVariant) {
     UA_NetworkMessage m2;
     memset(&m2, 0, sizeof(UA_NetworkMessage));
     size_t offset = 0;
-    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2);
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, NULL);
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
     ck_assert(m.version == m2.version);
     ck_assert(m.networkMessageType == m2.networkMessageType);
diff --git a/tests/pubsub/check_pubsub_encoding_custom.c b/tests/pubsub/check_pubsub_encoding_custom.c
new file mode 100644
index 00000000000..c64384fe367
--- /dev/null
+++ b/tests/pubsub/check_pubsub_encoding_custom.c
@@ -0,0 +1,1750 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2023 basysKom GmbH (Author: Marius Dege)
+ */
+
+#include <open62541/types.h>
+
+#include "ua_pubsub.h"
+#include "ua_pubsub_networkmessage.h"
+
+#include "math.h"
+#include "check.h"
+
+/* The custom datatype for describing a 3d position */
+
+typedef struct {
+    UA_Float x;
+    UA_Float y;
+    UA_Float z;
+} Point;
+
+/* The datatype description for the Point datatype */
+
+#define padding_y offsetof(Point,y) - offsetof(Point,x) - sizeof(UA_Float)
+#define padding_z offsetof(Point,z) - offsetof(Point,y) - sizeof(UA_Float)
+
+static UA_DataTypeMember members[3] = {
+    /* x */
+    {
+        UA_TYPENAME("x")           /* .memberName */
+        &UA_TYPES[UA_TYPES_FLOAT], /* .memberType */
+        0,                         /* .padding */
+        false,                     /* .isArray */
+        false                      /* .isOptional*/
+    },
+
+    /* y */
+    {
+        UA_TYPENAME("y")
+        &UA_TYPES[UA_TYPES_FLOAT],
+        padding_y,
+        false,
+        false
+    },
+
+    /* z */
+    {
+        UA_TYPENAME("z")
+        &UA_TYPES[UA_TYPES_FLOAT],
+        padding_z,
+        false,
+        false
+    }
+};
+
+static const UA_DataType PointType = {
+    UA_TYPENAME("Point")             /* .typeName */
+    {1, UA_NODEIDTYPE_NUMERIC, {1}}, /* .typeId */
+    {1, UA_NODEIDTYPE_NUMERIC, {17}}, /* .binaryEncodingId, the numeric
+                                         identifier used on the wire (the
+                                         namespaceindex is from .typeId) */
+    sizeof(Point),                   /* .memSize */
+    UA_DATATYPEKIND_STRUCTURE,       /* .typeKind */
+    true,                            /* .pointerFree */
+    false,                           /* .overlayable (depends on endianness and
+                                         the absence of padding) */
+    3,                               /* .membersSize */
+    members
+};
+
+const UA_DataTypeArray customDataTypes = {NULL, 1, &PointType, UA_FALSE};
+
+typedef struct {
+    UA_Int16 a;
+    UA_Float *b;
+    UA_Float *c;
+    UA_String *d;
+} Opt;
+
+static UA_DataTypeMember Opt_members[4] = {
+        /* a */
+        {
+                UA_TYPENAME("a")           /* .memberName */
+                &UA_TYPES[UA_TYPES_INT16], /* .memberType */
+                0,                         /* .padding */
+                false,                     /* .isArray */
+                false                      /* .isOptional */
+        },
+        /* b */
+        {
+                UA_TYPENAME("b")
+                &UA_TYPES[UA_TYPES_FLOAT], /* .memberType */
+                offsetof(Opt,b) - offsetof(Opt,a) - sizeof(UA_Int16),
+                false,
+                true        /* b is an optional field */
+        },
+        /* c */
+        {
+                UA_TYPENAME("c")
+                &UA_TYPES[UA_TYPES_FLOAT], /* .memberType */
+                offsetof(Opt,c) - offsetof(Opt,b) - sizeof(void *),
+                false,
+                true        /* b is an optional field */
+        },
+        /* d */
+        {
+                UA_TYPENAME("d")
+                &UA_TYPES[UA_TYPES_STRING], /* .memberType */
+                offsetof(Opt,d) - offsetof(Opt,c) - sizeof(void *),
+                false,
+                true        /* d is an optional field */
+        }
+};
+
+static const UA_DataType OptType = {
+        UA_TYPENAME("Opt")             /* .typeName */
+        {1, UA_NODEIDTYPE_NUMERIC, {4242}}, /* .typeId */
+        {1, UA_NODEIDTYPE_NUMERIC, {5}}, /* .binaryEncodingId, the numeric
+                                         identifier used on the wire (the
+                                         namespaceindex is from .typeId) */
+        sizeof(Opt),                     /* .memSize */
+        UA_DATATYPEKIND_OPTSTRUCT,       /* .typeKind */
+        false,                            /* .pointerFree */
+        false,                           /* .overlayable (depends on endianness and
+                                         the absence of padding) */
+        4,                               /* .membersSize */
+        Opt_members
+};
+
+const UA_DataTypeArray customDataTypesOptStruct = {&customDataTypes, 2, &OptType, UA_FALSE};
+
+typedef struct {
+    UA_String description;
+    size_t bSize;
+    UA_String *b;
+    size_t cSize;
+    UA_Float *c;
+    size_t dSize;
+    UA_Float *d;
+} OptArray;
+
+static UA_DataTypeMember ArrayOptStruct_members[4] = {
+    {
+        UA_TYPENAME("Measurement description") /* .memberName */
+        &UA_TYPES[UA_TYPES_STRING],            /* .memberType */
+        0,                                     /* .padding */
+        false,                                 /* .isArray */
+        false
+    },
+    {
+        UA_TYPENAME("TestArray1") /* .memberName */
+        &UA_TYPES[UA_TYPES_STRING], /* .memberType */
+        offsetof(OptArray, bSize) - offsetof(OptArray, description) - sizeof(UA_String),               /* .padding */
+        true,                      /* .isArray */
+        false
+    },
+    {
+        UA_TYPENAME("TestArray2")  /* .memberName */
+        &UA_TYPES[UA_TYPES_FLOAT], /* .memberType */
+        offsetof(OptArray, cSize) - offsetof(OptArray, b) - sizeof(void *),               /* .padding */
+        true,                      /* .isArray */
+        true
+    },
+    {
+        UA_TYPENAME("TestArray3")  /* .memberName */
+        &UA_TYPES[UA_TYPES_FLOAT], /* .memberType */
+        offsetof(OptArray, dSize) - offsetof(OptArray, c) - sizeof(void *),               /* .padding */
+        true,                      /* .isArray */
+        false
+    }
+};
+
+static const UA_DataType ArrayOptType = {
+    UA_TYPENAME("OptArray")             /* .tyspeName */
+    {1, UA_NODEIDTYPE_NUMERIC, {4243}},     /* .typeId */
+    {1, UA_NODEIDTYPE_NUMERIC, {1337}}, /* .binaryEncodingId, the numeric
+                                         identifier used on the wire (the
+                                         namespaceindex is from .typeId) */
+    sizeof(OptArray),                   /* .memSize */
+    UA_DATATYPEKIND_OPTSTRUCT,       /* .typeKind */
+    false,                            /* .pointerFree */
+    false,                           /* .overlayable (depends on endianness and
+                                         the absence of padding) */
+    4,                               /* .membersSize */
+    ArrayOptStruct_members
+};
+
+const UA_DataTypeArray customDataTypesOptArrayStruct = {&customDataTypesOptStruct, 3, &ArrayOptType, UA_FALSE};
+
+typedef enum {UA_UNISWITCH_NONE = 0, UA_UNISWITCH_OPTIONA = 1, UA_UNISWITCH_OPTIONB = 2} UA_UniSwitch;
+
+typedef struct {
+    UA_UniSwitch switchField;
+    union {
+        UA_Double optionA;
+        UA_String optionB;
+    } fields;
+} Uni;
+
+static UA_DataTypeMember Uni_members[2] = {
+        {
+                UA_TYPENAME("optionA")
+                &UA_TYPES[UA_TYPES_DOUBLE], /* .memberType */
+                offsetof(Uni, fields.optionA),
+                false,
+                false
+        },
+        {
+                UA_TYPENAME("optionB")
+                &UA_TYPES[UA_TYPES_STRING], /* .memberType */
+                offsetof(Uni, fields.optionB),
+                false,
+                false
+        }
+};
+
+static const UA_DataType UniType = {
+        UA_TYPENAME("Uni")
+        {1, UA_NODEIDTYPE_NUMERIC, {4245}},
+        {1, UA_NODEIDTYPE_NUMERIC, {13338}},
+        sizeof(Uni),
+        UA_DATATYPEKIND_UNION,
+        false,
+        false,
+        2,
+        Uni_members
+};
+
+const UA_DataTypeArray customDataTypesUnion = {&customDataTypesOptArrayStruct, 2, &UniType, UA_FALSE};
+
+typedef enum {
+    UA_SELFCONTAININGUNIONSWITCH_NONE = 0,
+    UA_SELFCONTAININGUNIONSWITCH_DOUBLE = 1,
+    UA_SELFCONTAININGUNIONSWITCH_ARRAY = 2,
+    __UA_SELFCONTAININGUNIONSWITCH_FORCE32BIT = 0x7fffffff
+} UA_SelfContainingUnionSwitch;
+
+typedef struct UA_SelfContainingUnion UA_SelfContainingUnion;
+struct UA_SelfContainingUnion {
+    UA_SelfContainingUnionSwitch switchField;
+    union {
+        UA_Double _double;
+        struct {
+            size_t arraySize;
+            UA_SelfContainingUnion *array;
+        } array;
+    } fields;
+};
+
+extern const UA_DataType selfContainingUnionType;
+
+static UA_DataTypeMember SelfContainingUnion_members[2] = {
+{
+    UA_TYPENAME("_double")                            /* .memberName */
+    &UA_TYPES[UA_TYPES_DOUBLE],                       /* .memberType */
+    offsetof(UA_SelfContainingUnion, fields._double), /* .padding */
+    false,                                            /* .isArray */
+    false                                             /* .isOptional */
+},
+{
+    UA_TYPENAME("Array")                              /* .memberName */
+    &selfContainingUnionType,                         /* .memberType */
+    offsetof(UA_SelfContainingUnion, fields.array),   /* .padding */
+    true,                                             /* .isArray */
+    false                                             /* .isOptional */
+},};
+
+const UA_DataType selfContainingUnionType = {
+    UA_TYPENAME("SelfContainingStruct") /* .typeName */
+    {2, UA_NODEIDTYPE_NUMERIC, {4002LU}}, /* .typeId */
+    {2, UA_NODEIDTYPE_NUMERIC, {0}}, /* .binaryEncodingId */
+    sizeof(UA_SelfContainingUnion), /* .memSize */
+    UA_DATATYPEKIND_UNION, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    SelfContainingUnion_members  /* .members */
+};
+
+const UA_DataTypeArray customDataTypesSelfContainingUnion = {NULL, 1, &selfContainingUnionType, UA_FALSE};
+
+START_TEST(UA_PubSub_EnDecode_CustomScalarDeltaFrame) {
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+
+    Point p;
+    p.x = 1.0;
+    p.y = 2.0;
+    p.z = 3.0;
+
+    UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &p, &PointType);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypes);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
+    ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &PointType);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).x == p.x);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).y == p.y);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).z == p.z);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomScalarKeyFrame) {
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    Point p;
+    p.x = 1.0;
+    p.y = 2.0;
+    p.z = 3.0;
+
+    UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value, &p, &PointType);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypes);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &PointType);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).x == p.x);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).y == p.y);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).z == p.z);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
+
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomScalarExtensionObjectDeltaFrame) {
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+
+    Point p;
+    p.x = 1.0;
+    p.y = 2.0;
+    p.z = 3.0;
+
+    UA_ExtensionObject eo;
+    UA_ExtensionObject_init(&eo);
+
+    eo.encoding = UA_EXTENSIONOBJECT_DECODED_NODELETE;
+    eo.content.decoded.data = &p;
+    eo.content.decoded.type = &PointType;
+
+    UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &eo, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypes);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
+    ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &PointType);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).x == p.x);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).y == p.y);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).z == p.z);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+} END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomScalarExtensionObjectKeyFrame) {
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    Point p;
+    p.x = 1.0;
+    p.y = 2.0;
+    p.z = 3.0;
+
+    UA_ExtensionObject eo;
+    UA_ExtensionObject_init(&eo);
+
+    eo.encoding = UA_EXTENSIONOBJECT_DECODED_NODELETE;
+    eo.content.decoded.data = &p;
+    eo.content.decoded.type = &PointType;
+
+    UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value,  &eo, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypes);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &PointType);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).x == p.x);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).y == p.y);
+    ck_assert((*(Point *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).z == p.z);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
+    
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomArrayDeltaFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_VARIANT;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+
+    Point ps[10];
+    for(size_t i = 0; i < 10; ++i) {
+        ps[i].x = (UA_Float)(1*i);
+        ps[i].y = (UA_Float)(2*i);
+        ps[i].z = (UA_Float)(3*i);
+    }
+
+    UA_Variant_setArrayCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, (void*)ps, 10, &PointType);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypes);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    for (size_t i = 0; i < 10; i++) {
+        UA_ExtensionObject *eo = &((UA_ExtensionObject*)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)[i];
+        ck_assert(eo->content.decoded.type == &PointType);
+        Point *p2 = (Point*)eo->content.decoded.data;
+
+        // we need to cast floats to int to avoid comparison of floats
+        // which may result into false results
+        ck_assert((int)p2->x == (int)ps[i].x);
+        ck_assert((int)p2->y == (int)ps[i].y);
+        ck_assert((int)p2->z == (int)ps[i].z);
+   }
+
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomArrayKeyFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    Point ps[10];
+    for(size_t i = 0; i < 10; ++i) {
+        ps[i].x = (UA_Float)(1*i);
+        ps[i].y = (UA_Float)(2*i);
+        ps[i].z = (UA_Float)(3*i);
+    }
+
+    UA_Variant_setArrayCopy(&dmkf.data.keyFrameData.dataSetFields[0].value, (void*)ps, 10, &PointType);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypes);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    for (size_t i = 0; i < 10; i++) {
+        UA_ExtensionObject *eo = &((UA_ExtensionObject*)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)[i];
+        ck_assert(eo->content.decoded.type == &PointType);
+        Point *p2 = (Point*)eo->content.decoded.data;
+
+        // we need to cast floats to int to avoid comparison of floats
+        // which may result into false results
+        ck_assert((int)p2->x == (int)ps[i].x);
+        ck_assert((int)p2->y == (int)ps[i].y);
+        ck_assert((int)p2->z == (int)ps[i].z);
+   }
+
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    }
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsDeltaFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    
+    Opt o;
+    memset(&o, 0, sizeof(Opt));
+    o.a = 3;
+    o.c = UA_Float_new();
+    *o.c = (UA_Float) 10.10;
+    o.d = UA_String_new();
+    *o.d = UA_STRING_ALLOC("Test");
+
+    UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &o, &OptType);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesOptStruct);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
+    ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &OptType);
+    ck_assert_int_eq((*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).a, o.a);
+    ck_assert_ptr_eq((*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).b, NULL);
+    ck_assert(*(*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).c == *o.c);
+    ck_assert_str_eq((char*)((Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d->data,"Test");
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+
+    UA_clear(&o, &OptType);
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsKeyFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    Opt o;
+    memset(&o, 0, sizeof(Opt));
+    o.a = 3;
+    o.c = UA_Float_new();
+    *o.c = (UA_Float) 10.10;
+    o.d = UA_String_new();
+    *o.d = UA_STRING_ALLOC("Test");
+
+    UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value, &o, &OptType);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesOptStruct);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &OptType);
+    ck_assert_int_eq((*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).a, o.a);
+    ck_assert_ptr_eq((*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).b, NULL);
+    ck_assert(*(*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).c == *o.c);
+    ck_assert_str_eq((char*)((Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d->data,"Test");
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
+
+    UA_clear(&o, &OptType);
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomUnionDeltaFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+
+    Uni u;
+    u.switchField = UA_UNISWITCH_OPTIONB;
+    u.fields.optionB = UA_STRING("test string");
+
+    UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &u, &UniType);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesUnion);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
+    ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &UniType);
+    ck_assert_int_eq((*(Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).switchField, UA_UNISWITCH_OPTIONB);
+    ck_assert_str_eq((char*)((Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->fields.optionB.data, "test string");
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomUnionKeyFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    Uni u;
+    u.switchField = UA_UNISWITCH_OPTIONB;
+    u.fields.optionB = UA_STRING("test string");
+
+    UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value, &u, &UniType);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesUnion);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &UniType);
+    ck_assert_int_eq((*(Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).switchField, UA_UNISWITCH_OPTIONB);
+    ck_assert_str_eq((char*)((Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->fields.optionB.data, "test string");
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
+
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_SelfContainingUnionNormalMemberDeltaFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+
+    UA_SelfContainingUnion s;
+    s.switchField = UA_SELFCONTAININGUNIONSWITCH_DOUBLE;
+    s.fields._double = 42.0;
+
+    UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &s, &selfContainingUnionType);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesSelfContainingUnion);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
+    ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &selfContainingUnionType);
+    ck_assert_int_eq((*(UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).switchField, UA_SELFCONTAININGUNIONSWITCH_DOUBLE);
+    ck_assert(fabs(((UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->fields._double - 42.0) < 0.005);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_SelfContainingUnionNormalMemberKeyFrame){
+  UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    UA_SelfContainingUnion s;
+    s.switchField = UA_SELFCONTAININGUNIONSWITCH_DOUBLE;
+    s.fields._double = 42.0;
+
+    UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value,  &s, &selfContainingUnionType);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesSelfContainingUnion);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &selfContainingUnionType);
+    ck_assert_int_eq((*(UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).switchField, UA_SELFCONTAININGUNIONSWITCH_DOUBLE);
+    ck_assert(fabs(((UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->fields._double - 42.0) < 0.005);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
+    
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_SelfContainingUnionSelfMemberDeltaFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+
+    UA_SelfContainingUnion s;
+    s.switchField = UA_SELFCONTAININGUNIONSWITCH_ARRAY;
+    s.fields.array.arraySize = 2;
+    s.fields.array.array = (UA_SelfContainingUnion *)UA_calloc(2, sizeof(UA_SelfContainingUnion));
+    s.fields.array.array[0].switchField = UA_SELFCONTAININGUNIONSWITCH_DOUBLE;
+    s.fields.array.array[0].fields._double = 23.0;
+    s.fields.array.array[1].switchField = UA_SELFCONTAININGUNIONSWITCH_DOUBLE;
+    s.fields.array.array[1].fields._double = 42.0;
+
+    UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &s, &selfContainingUnionType);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesSelfContainingUnion);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
+    ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &selfContainingUnionType);
+    ck_assert((*(UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).fields.array.arraySize == 2);
+    ck_assert_int_eq((*(UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).fields.array.array[0].switchField, UA_SELFCONTAININGUNIONSWITCH_DOUBLE);
+    ck_assert(fabs(((UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->fields.array.array[0].fields._double - 23.0) < 0.005);
+    ck_assert_int_eq((*(UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).fields.array.array[1].switchField, UA_SELFCONTAININGUNIONSWITCH_DOUBLE);
+    ck_assert(fabs(((UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->fields.array.array[1].fields._double - 42.0) < 0.005);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_SelfContainingUnionSelfMemberKeyFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    UA_SelfContainingUnion s;
+    s.switchField = UA_SELFCONTAININGUNIONSWITCH_ARRAY;
+    s.fields.array.arraySize = 2;
+    s.fields.array.array = (UA_SelfContainingUnion *)UA_calloc(2, sizeof(UA_SelfContainingUnion));
+    s.fields.array.array[0].switchField = UA_SELFCONTAININGUNIONSWITCH_DOUBLE;
+    s.fields.array.array[0].fields._double = 23.0;
+    s.fields.array.array[1].switchField = UA_SELFCONTAININGUNIONSWITCH_DOUBLE;
+    s.fields.array.array[1].fields._double = 42.0;
+
+    UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value, &s, &selfContainingUnionType);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesSelfContainingUnion);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &selfContainingUnionType);
+    ck_assert((*(UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).fields.array.arraySize == 2);
+    ck_assert_int_eq((*(UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).fields.array.array[0].switchField, UA_SELFCONTAININGUNIONSWITCH_DOUBLE);
+    ck_assert(fabs(((UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->fields.array.array[0].fields._double - 23.0) < 0.005);
+    ck_assert_int_eq((*(UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).fields.array.array[1].switchField, UA_SELFCONTAININGUNIONSWITCH_DOUBLE);
+    ck_assert(fabs(((UA_SelfContainingUnion *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->fields.array.array[1].fields._double - 42.0) < 0.005);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
+
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayNotContainedDeltaFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+
+    OptArray oa;
+    oa.description = UA_STRING_ALLOC("TestDesc");
+    oa.bSize = 1;
+    oa.b = (UA_String *)UA_Array_new(oa.bSize, &UA_TYPES[UA_TYPES_STRING]);
+    oa.b[0] = UA_STRING_ALLOC("Test");
+    oa.c = NULL;
+    oa.dSize = 3;
+    oa.d = (UA_Float *) UA_Array_new(oa.dSize, &UA_TYPES[UA_TYPES_FLOAT]);
+    oa.d[0] = (UA_Float)1.1;
+    oa.d[1] = (UA_Float)1.2;
+    oa.d[2] = (UA_Float)1.3;
+
+    UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &oa, &ArrayOptType);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesOptArrayStruct);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
+    ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &ArrayOptType);
+    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).description.data, "TestDesc");
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).bSize, 1);
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).cSize, 0);
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).dSize, 3);
+    ck_assert_ptr_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).c, NULL);
+    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).b[0].data, "Test");
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[0] - 1.1) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[1] - 1.2) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[2] - 1.3) < 0.005);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+
+    UA_clear(&oa, &ArrayOptType);
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayNotContainedKeyFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    OptArray oa;
+    oa.description = UA_STRING_ALLOC("TestDesc");
+    oa.bSize = 1;
+    oa.b = (UA_String *)UA_Array_new(oa.bSize, &UA_TYPES[UA_TYPES_STRING]);
+    oa.b[0] = UA_STRING_ALLOC("Test");
+    oa.c = NULL;
+    oa.dSize = 3;
+    oa.d = (UA_Float *) UA_Array_new(oa.dSize, &UA_TYPES[UA_TYPES_FLOAT]);
+    oa.d[0] = (UA_Float)1.1;
+    oa.d[1] = (UA_Float)1.2;
+    oa.d[2] = (UA_Float)1.3;
+
+    UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value, &oa, &ArrayOptType);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesOptArrayStruct);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &ArrayOptType);
+    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).description.data, "TestDesc");
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).bSize, 1);
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).cSize, 0);
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).dSize, 3);
+    ck_assert_ptr_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).c, NULL);
+    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).b[0].data, "Test");
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[0] - 1.1) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[1] - 1.2) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[2] - 1.3) < 0.005);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
+
+    UA_clear(&oa, &ArrayOptType);
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayContainedDeltaFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmdf;
+    memset(&dmdf, 0, sizeof(UA_DataSetMessage));
+    dmdf.header.dataSetMessageValid = true;
+    dmdf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmdf.header.dataSetMessageType = UA_DATASETMESSAGE_DATADELTAFRAME;
+    dmdf.data.deltaFrameData.fieldCount = 1;
+    size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dmdf.data.deltaFrameData.fieldCount;
+    dmdf.data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
+
+    UA_UInt16 fieldIndex = 1;
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldIndex = fieldIndex;
+    UA_DataValue_init(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+
+    OptArray oa;
+    oa.description = UA_STRING_ALLOC("TestDesc");
+    oa.bSize = 1;
+    oa.b = (UA_String *)UA_Array_new(oa.bSize, &UA_TYPES[UA_TYPES_STRING]);
+    oa.b[0] = UA_STRING_ALLOC("Test");
+    oa.cSize = 3;
+    oa.c = (UA_Float *) UA_Array_new(oa.cSize, &UA_TYPES[UA_TYPES_FLOAT]);
+    oa.c[0] = (UA_Float)1.1;
+    oa.c[1] = (UA_Float)1.2;
+    oa.c[2] = (UA_Float)1.3;
+    oa.dSize = 3;
+    oa.d = (UA_Float *)UA_Array_new(oa.dSize, &UA_TYPES[UA_TYPES_FLOAT]);
+    oa.d[0] = (UA_Float)2.1;
+    oa.d[1] = (UA_Float)2.2;
+    oa.d[2] = (UA_Float)2.3;
+
+    UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &oa, &ArrayOptType);
+    dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmdf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesOptArrayStruct);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.fieldCount, 1);
+    ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &ArrayOptType);
+
+    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).description.data, "TestDesc");
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).bSize, 1);
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).cSize, 3);
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).dSize, 3);
+    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).b[0].data, "Test");
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->c[0] - 1.1) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->c[1] - 1.2) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->c[2] - 1.3) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[0] - 2.1) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[1] - 2.2) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[2] - 2.3) < 0.005);
+
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+
+    UA_clear(&oa, &ArrayOptType);
+    UA_DataValue_clear(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_free(dmdf.data.deltaFrameData.deltaFrameFields);
+}
+END_TEST
+
+START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayContainedKeyFrame){
+    UA_NetworkMessage m;
+    memset(&m, 0, sizeof(UA_NetworkMessage));
+    m.version = 1;
+    m.networkMessageType = UA_NETWORKMESSAGE_DATASET;
+    UA_DataSetMessage dmkf;
+    memset(&dmkf, 0, sizeof(UA_DataSetMessage));
+    dmkf.header.dataSetMessageValid = true;
+    dmkf.header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
+    dmkf.header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
+    dmkf.data.keyFrameData.fieldCount = 1;
+    dmkf.data.keyFrameData.dataSetFields =
+        (UA_DataValue*)UA_Array_new(dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    UA_DataValue_init(&dmkf.data.keyFrameData.dataSetFields[0]);
+
+    OptArray oa;
+    oa.description = UA_STRING_ALLOC("TestDesc");
+    oa.bSize = 1;
+    oa.b = (UA_String *)UA_Array_new(oa.bSize, &UA_TYPES[UA_TYPES_STRING]);
+    oa.b[0] = UA_STRING_ALLOC("Test");
+    oa.cSize = 3;
+    oa.c = (UA_Float *) UA_Array_new(oa.cSize, &UA_TYPES[UA_TYPES_FLOAT]);
+    oa.c[0] = (UA_Float)1.1;
+    oa.c[1] = (UA_Float)1.2;
+    oa.c[2] = (UA_Float)1.3;
+    oa.dSize = 3;
+    oa.d = (UA_Float *)UA_Array_new(oa.dSize, &UA_TYPES[UA_TYPES_FLOAT]);
+    oa.d[0] = (UA_Float)2.1;
+    oa.d[1] = (UA_Float)2.2;
+    oa.d[2] = (UA_Float)2.3;
+
+    UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value, &oa, &ArrayOptType);
+    dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+
+    m.payload.dataSetPayload.dataSetMessages = &dmkf;
+
+    UA_StatusCode rv = UA_STATUSCODE_UNCERTAININITIALVALUE;
+    UA_ByteString buffer;
+    size_t msgSize = UA_NetworkMessage_calcSizeBinary(&m, NULL);
+    rv = UA_ByteString_allocBuffer(&buffer, msgSize);
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+   
+    UA_Byte *bufPos = buffer.data;
+    memset(bufPos, 0, msgSize);
+    const UA_Byte *bufEnd = &(buffer.data[buffer.length]);
+
+    rv = UA_NetworkMessage_encodeBinary(&m, &bufPos, bufEnd, NULL);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage m2;
+    memset(&m2, 0, sizeof(UA_NetworkMessage));
+    size_t offset = 0;
+    rv = UA_NetworkMessage_decodeBinary(&buffer, &offset, &m2, &customDataTypesOptArrayStruct);
+
+    ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
+    ck_assert(m.version == m2.version);
+    ck_assert(m.networkMessageType == m2.networkMessageType);
+    ck_assert(m.timestampEnabled == m2.timestampEnabled);
+    ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
+    ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
+    ck_assert(m.picosecondsEnabled == m2.picosecondsEnabled);
+    ck_assert(m.promotedFieldsEnabled == m2.promotedFieldsEnabled);
+    ck_assert(m.publisherIdEnabled == m2.publisherIdEnabled);
+    ck_assert(m.securityEnabled == m2.securityEnabled);
+    ck_assert(m.chunkMessage == m2.chunkMessage);
+    ck_assert(m.payloadHeaderEnabled == m2.payloadHeaderEnabled);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid == m2.payload.dataSetPayload.dataSetMessages[0].header.dataSetMessageValid);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding == m2.payload.dataSetPayload.dataSetMessages[0].header.fieldEncoding);
+    ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
+    ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &ArrayOptType);
+
+    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).description.data, "TestDesc");
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).bSize, 1);
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).cSize, 3);
+    ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).dSize, 3);
+    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).b[0].data, "Test");
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->c[0] - 1.1) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->c[1] - 1.2) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->c[2] - 1.3) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[0] - 2.1) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[1] - 2.2) < 0.005);
+    ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[2] - 2.3) < 0.005);
+
+    ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
+
+    UA_clear(&oa, &ArrayOptType);
+    UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
+    UA_NetworkMessage_clear(&m2);
+    UA_ByteString_clear(&buffer);
+    UA_Array_delete(dmkf.data.keyFrameData.dataSetFields, dmkf.data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+END_TEST
+
+int main(void) {
+
+    TCase *tc_encode = tcase_create("encode_decode_CustomType");
+
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomScalarDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomScalarKeyFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomScalarExtensionObjectDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomScalarExtensionObjectKeyFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomArrayDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomArrayKeyFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsKeyFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomUnionDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomUnionKeyFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_SelfContainingUnionNormalMemberDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_SelfContainingUnionNormalMemberKeyFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_SelfContainingUnionSelfMemberDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_SelfContainingUnionSelfMemberKeyFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayNotContainedDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayNotContainedKeyFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayContainedDeltaFrame);
+    tcase_add_test(tc_encode, UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayContainedKeyFrame);
+
+    Suite *s = suite_create("PubSub Custom Types EnDecode");
+    suite_add_tcase(s, tc_encode);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index 89a70a1a156..96d07c38cd8 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -143,7 +143,7 @@ static void receiveSingleMessage(UA_PubSubConnection *connection) {
     do {
         UA_NetworkMessage currentNetworkMessage;
         memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
-        UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, &currentNetworkMessage);
+        UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, &currentNetworkMessage, NULL);
         ck_assert((*((UA_UInt32 *)currentNetworkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
         UA_NetworkMessage_clear(&currentNetworkMessage);
         rcvCount++;
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index 95192663057..b7241c22b78 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -139,7 +139,7 @@ receiveSingleMessage(UA_ByteString buffer, UA_PubSubConnection *connection,
     }
     memset(networkMessage, 0, sizeof(UA_NetworkMessage));
     size_t currentPosition = 0;
-    UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, networkMessage);
+    UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, networkMessage, NULL);
     UA_ByteString_clear(&buffer);
 }
 
diff --git a/tests/pubsub/check_pubsub_publish_uadp.c b/tests/pubsub/check_pubsub_publish_uadp.c
index 137e589507d..1bcfae54af5 100644
--- a/tests/pubsub/check_pubsub_publish_uadp.c
+++ b/tests/pubsub/check_pubsub_publish_uadp.c
@@ -76,7 +76,7 @@ recvTestFun(UA_PubSubChannel *channel, void *context, const UA_ByteString *buffe
 
     memset(networkMessage, 0, sizeof(UA_NetworkMessage));
     size_t currentPosition = 0;
-    UA_NetworkMessage_decodeBinary(buffer, &currentPosition, networkMessage);
+    UA_NetworkMessage_decodeBinary(buffer, &currentPosition, networkMessage, NULL);
     for(int i = 0; i < networkMessage->payloadHeader.dataSetPayloadHeader.count; ++i) {
         UA_Byte * rawContent = (UA_Byte *) UA_malloc(networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.length);
         memcpy(rawContent,
diff --git a/tools/ua2json/ua2json.c b/tools/ua2json/ua2json.c
index af2e9ccb14d..34b690fcf34 100644
--- a/tools/ua2json/ua2json.c
+++ b/tools/ua2json/ua2json.c
@@ -76,7 +76,7 @@ static UA_StatusCode
 encodeNetworkMessage(const UA_ByteString *buf, UA_ByteString *out) {
     size_t offset = 0;
     UA_NetworkMessage msg;
-    UA_StatusCode retval = UA_NetworkMessage_decodeBinary(buf, &offset, &msg);
+    UA_StatusCode retval = UA_NetworkMessage_decodeBinary(buf, &offset, &msg, NULL);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 

From d640ea2c216538cbcf1f56e740baa8d44616ccd8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 16 Mar 2023 16:50:44 +0100
Subject: [PATCH 0799/1963] fix(pubsub): Ensure that a reader is configured for
 RT processing

---
 src/pubsub/ua_pubsub_reader.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index c208ce61f8b..58135361dea 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1588,6 +1588,9 @@ decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
     size_t currentPosition = 0;
     UA_DataSetReader *dataSetReader = LIST_FIRST(&readerGroup->readers);
+    if(!dataSetReader)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
     UA_NetworkMessage *nm = dataSetReader->bufferedMessage.nm;
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION

From c9cb14df094ba7cf813cc238f9ac71d67730cfb4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 16 Mar 2023 19:00:42 +0100
Subject: [PATCH 0800/1963] feat(pubsub): Test external data value pointer
 before access

---
 src/pubsub/ua_pubsub_reader.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 58135361dea..4971c72816a 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1160,9 +1160,11 @@ DataSetReader_processFixedSize(UA_Server *server, UA_ReaderGroup *rg,
                       dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariableContext,
                       &tmp);
         }
-        memcpy((**tv->externalDataValue).value.data,
-                    msg->data.keyFrameData.dataSetFields[i].value.data,
-                    msg->data.keyFrameData.dataSetFields[i].value.type->memSize);
+        if(UA_LIKELY(tv->externalDataValue != NULL)) {
+            memcpy((**tv->externalDataValue).value.data,
+                   msg->data.keyFrameData.dataSetFields[i].value.data,
+                   msg->data.keyFrameData.dataSetFields[i].value.type->memSize);
+        }
         if(tv->afterWrite)
             tv->afterWrite(server, &dsr->identifier, &dsr->linkedReaderGroup,
                         &tv->targetVariable.targetNodeId,

From 3ae36d5c4479d1195db36ae61b7a154f701c9ed6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 16 Mar 2023 19:16:58 +0100
Subject: [PATCH 0801/1963] feat(pubsub): Test if the offset buffer was
 prepared before using it

---
 src/pubsub/ua_pubsub_networkmessage.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 35fccf9570a..3bbfe97447f 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -98,6 +98,11 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
     size_t payloadCounter = 0;
     size_t offset = 0;
+
+    /* The offset buffer was not prepared */
+    if(!buffer->nm)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
     UA_DataSetMessage* dsm = buffer->nm->payload.dataSetPayload.dataSetMessages; //Considering one DSM in RT TODO: Clarify multiple DSM
     UA_DataSetMessageHeader header;
     size_t smallestRawOffset = UA_UINT32_MAX;

From 9cc0a2ee81d6e0b413aa0520cba91aff57527416 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 21:08:12 +0100
Subject: [PATCH 0802/1963] refactor(pubsub): Offset buffer no longer depends
 on RTsubscriberEnabled

---
 src/pubsub/ua_pubsub_networkmessage.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 3bbfe97447f..2e6f01fcc18 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -83,10 +83,9 @@ UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer){
                                              nmo->offsetData.value.value->value.type,
                                              &bufPos, &bufEnd, NULL, NULL);
                 break;
-            case UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING:
-                break;
             default:
-                return UA_STATUSCODE_BADNOTSUPPORTED;
+                break; /* The other fields are assumed to not change between messages.
+                        * Only used for RT decoding (not encoding). */
         }
     }
     return rv;
@@ -949,7 +948,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
     }
 
     if(p->publisherIdEnabled) {
-        if(offsetBuffer && offsetBuffer->RTsubscriberEnabled){
+        if(offsetBuffer) {
             size_t pos = offsetBuffer->offsetsSize;
             if(!increaseOffsetArray(offsetBuffer))
                 return 0;
@@ -988,7 +987,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
         size += UA_Byte_calcSizeBinary(&byte);
 
         if(p->groupHeader.writerGroupIdEnabled) {
-            if(offsetBuffer && offsetBuffer->RTsubscriberEnabled){
+            if(offsetBuffer) {
                 size_t pos = offsetBuffer->offsetsSize;
                 if(!increaseOffsetArray(offsetBuffer))
                     return 0;
@@ -1027,7 +1026,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
         if(p->networkMessageType == UA_NETWORKMESSAGE_DATASET) {
             size += UA_Byte_calcSizeBinary(&p->payloadHeader.dataSetPayloadHeader.count);
             if(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != NULL) {
-                if(offsetBuffer && offsetBuffer->RTsubscriberEnabled){
+                if(offsetBuffer) {
                     size_t pos = offsetBuffer->offsetsSize;
                     if(!increaseOffsetArray(offsetBuffer))
                         return 0;

From 10ce60eec3d3d764195ed7a1d8851bc663be0d05 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 21:08:48 +0100
Subject: [PATCH 0803/1963] refactor(pubsub): Check buffer length before
 decoding message with offsets

Not a bug-fix, but speeds up the failure case.
---
 src/pubsub/ua_pubsub_networkmessage.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 2e6f01fcc18..b8373d44033 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -102,6 +102,10 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
     if(!buffer->nm)
         return UA_STATUSCODE_BADINTERNALERROR;
 
+    /* The source string is too short */
+    if(src->length < buffer->buffer.length + *bufferPosition)
+        return UA_STATUSCODE_BADDECODINGERROR;
+
     UA_DataSetMessage* dsm = buffer->nm->payload.dataSetPayload.dataSetMessages; //Considering one DSM in RT TODO: Clarify multiple DSM
     UA_DataSetMessageHeader header;
     size_t smallestRawOffset = UA_UINT32_MAX;

From c3aae16ad12b264076a5a7f6680aa047b1f33bd7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 21:11:59 +0100
Subject: [PATCH 0804/1963] refactor(pubsub): Clean up network message
 internally before decoding values with offset

---
 src/pubsub/ua_pubsub_networkmessage.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index b8373d44033..c335defc1b5 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -155,12 +155,14 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
             UA_CHECK_STATUS(rv, return rv);
             break;
         case UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE:
+            UA_DataValue_clear(&dsm->data.keyFrameData.dataSetFields[payloadCounter]);
             rv = UA_DataValue_decodeBinary(src, &offset,
                                            &(dsm->data.keyFrameData.dataSetFields[payloadCounter]));
             UA_CHECK_STATUS(rv, return rv);
             payloadCounter++;
             break;
         case UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT:
+            UA_Variant_clear(&dsm->data.keyFrameData.dataSetFields[payloadCounter].value);
             rv = UA_Variant_decodeBinary(src, &offset,
                                          &dsm->data.keyFrameData.dataSetFields[payloadCounter].value);
             UA_CHECK_STATUS(rv, return rv);

From 264e43c11b9c317a1b2d74d36cea4938b2dfb9b0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 21:24:28 +0100
Subject: [PATCH 0805/1963] feat(pubsub): Check that the types are identical
 before offset memcpy

---
 src/pubsub/ua_pubsub_reader.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 4971c72816a..a7e4e2614b0 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1151,6 +1151,14 @@ DataSetReader_processFixedSize(UA_Server *server, UA_ReaderGroup *rg,
             &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
         if(tv->targetVariable.attributeId != UA_ATTRIBUTEID_VALUE)
             continue;
+
+        if(msg->data.keyFrameData.dataSetFields[i].value.type !=
+           (*tv->externalDataValue)->value.type) {
+            UA_LOG_WARNING_READER(&server->config.logger, dsr,
+                                  "Mismatching type");
+            continue;
+        }
+
         if (tv->beforeWrite) {
             UA_DataValue *tmp = &msg->data.keyFrameData.dataSetFields[i];
             tv->beforeWrite(server,

From 5a98f45affe3cbdf02e7230f0df9dbd559c0684c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 21:36:49 +0100
Subject: [PATCH 0806/1963] fix(test): Don't access server logger after
 deleting the server

---
 tests/pubsub/check_pubsub_publish_rt_levels.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index b7241c22b78..eb7f46e2bfa 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -84,6 +84,8 @@ static void teardown(void) {
     }
 
     UA_Server_delete(server);
+    rtEventLoop->logger = NULL; /* Don't access the logger that was removed with
+                                   the server */
     rtEventLoop->free(rtEventLoop);
 
     rtEventLoop = NULL;

From d62ca8d1353ab0c57f51357332f929bf43da442e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 21:37:48 +0100
Subject: [PATCH 0807/1963] refactor(pubsub): Create offset buffer from
 received message (PreOperational)

---
 src/pubsub/ua_pubsub.h                        |  16 +-
 src/pubsub/ua_pubsub_reader.c                 | 542 +++++-------------
 src/pubsub/ua_pubsub_readergroup.c            | 129 ++---
 .../pubsub/check_pubsub_encrypted_rt_levels.c |  20 +-
 tests/pubsub/check_pubsub_get_state.c         |   4 +-
 ...heck_pubsub_multiple_subscribe_rt_levels.c |  44 +-
 tests/pubsub/check_pubsub_publisherid.c       |   2 +-
 .../check_pubsub_subscribe_msgrcvtimeout.c    |  10 +-
 .../pubsub/check_pubsub_subscribe_rt_levels.c |  22 +-
 9 files changed, 243 insertions(+), 546 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index a80570210c1..0ff3e368ad7 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -484,24 +484,16 @@ DataSetReader_createTargetVariables(UA_Server *server, UA_DataSetReader *dsr,
                                     size_t targetVariablesSize,
                                     const UA_FieldTargetVariable *targetVariables);
 
+UA_StatusCode
+UA_DataSetReader_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
+                                    UA_PubSubConnection *connection, UA_ByteString *buf);
+
 UA_StatusCode
 UA_DataSetReader_setPubSubState(UA_Server *server,
                                 UA_DataSetReader *dataSetReader,
                                 UA_PubSubState state,
                                 UA_StatusCode cause);
 
-UA_StatusCode
-UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
-                                        UA_ReaderGroup *readerGroup,
-                                        UA_DataSetReader *dataSetReader,
-                                        UA_DataSetMessage *dsm, UA_UInt16 *writerId,
-                                        UA_Byte dsmCount, UA_NetworkMessage *nm);
-
-UA_StatusCode
-UA_DataSetReader_generateDataSetMessage(UA_Server *server,
-                                        UA_DataSetMessage *dataSetMessage,
-                                        UA_DataSetReader *dataSetReader);
-
 #define UA_LOG_READER_INTERNAL(LOGGER, LEVEL, READER, MSG, ...)         \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
         UA_String idStr = UA_STRING_NULL;                               \
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index a7e4e2614b0..e6f21ca25d8 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -36,302 +36,6 @@ static void
 UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader *dsr);
 #endif
 
-/* This functionality of this API will be used in future to create mirror Variables - TODO */
-/* #define UA_MAX_SIZENAME           64 */ /* Max size of Qualified Name of Subscribed Variable */
-
-static void
-UA_PubSubDSRDataSetField_sampleValue(UA_Server *server, UA_DataSetReader *dataSetReader,
-                                     UA_DataValue *value, UA_FieldTargetVariable *ftv) {
-    /* TODO: Static value source without RT information model
-     * This API supports only to external datasource in RT configutation
-     * TODO: Extend to support other configuration if required */
-
-    /* Get the Node */
-    const UA_VariableNode *rtNode = (const UA_VariableNode *)
-        UA_NODESTORE_GET(server, &ftv->targetVariable.targetNodeId);
-    if(!rtNode)
-        return;
-
-    if(rtNode->valueBackend.backendType == UA_VALUEBACKENDTYPE_EXTERNAL) {
-        /* Set the external source in the dataset reader config */
-        ftv->externalDataValue = rtNode->valueBackend.backend.external.value;
-
-        /* Get the value to compute the offsets */
-        *value = **rtNode->valueBackend.backend.external.value;
-        value->value.storageType = UA_VARIANT_DATA_NODELETE;
-    }
-
-    UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
-}
-
-static UA_StatusCode
-UA_PubSubDataSetReader_generateKeyFrameMessage(UA_Server *server,
-                                               UA_DataSetMessage *dataSetMessage,
-                                               UA_DataSetReader *dataSetReader) {
-    /* Prepare DataSetMessageContent */
-    UA_TargetVariables *tv = &dataSetReader->config.subscribedDataSet.subscribedDataSetTarget;
-    dataSetMessage->header.dataSetMessageValid = true;
-    dataSetMessage->header.dataSetMessageType = UA_DATASETMESSAGE_DATAKEYFRAME;
-    dataSetMessage->data.keyFrameData.fieldCount = (UA_UInt16) tv->targetVariablesSize;
-    dataSetMessage->data.keyFrameData.dataSetFields = (UA_DataValue *)
-            UA_Array_new(tv->targetVariablesSize, &UA_TYPES[UA_TYPES_DATAVALUE]);
-    dataSetMessage->data.keyFrameData.dataSetMetaDataType = &dataSetReader->config.dataSetMetaData;
-    if(!dataSetMessage->data.keyFrameData.dataSetFields)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
-     for(size_t counter = 0; counter < tv->targetVariablesSize; counter++) {
-        /* Sample the value and set the source in the reader config */
-        UA_DataValue *dfv = &dataSetMessage->data.keyFrameData.dataSetFields[counter];
-        UA_FieldTargetVariable *ftv = &tv->targetVariables[counter];
-        UA_PubSubDSRDataSetField_sampleValue(server, dataSetReader, dfv, ftv);
-
-        /* Deactivate statuscode? */
-        if(((u64)dataSetReader->config.dataSetFieldContentMask &
-            (u64)UA_DATASETFIELDCONTENTMASK_STATUSCODE) == 0)
-            dfv->hasStatus = false;
-
-        /* Deactivate timestamps */
-        if(((u64)dataSetReader->config.dataSetFieldContentMask &
-            (u64)UA_DATASETFIELDCONTENTMASK_SOURCETIMESTAMP) == 0)
-            dfv->hasSourceTimestamp = false;
-        if(((u64)dataSetReader->config.dataSetFieldContentMask &
-            (u64)UA_DATASETFIELDCONTENTMASK_SOURCEPICOSECONDS) == 0)
-            dfv->hasSourcePicoseconds = false;
-        if(((u64)dataSetReader->config.dataSetFieldContentMask &
-            (u64)UA_DATASETFIELDCONTENTMASK_SERVERTIMESTAMP) == 0)
-            dfv->hasServerTimestamp = false;
-        if(((u64)dataSetReader->config.dataSetFieldContentMask &
-            (u64)UA_DATASETFIELDCONTENTMASK_SERVERPICOSECONDS) == 0)
-            dfv->hasServerPicoseconds = false;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
-/* Generate a DataSetMessage for the given reader. */
-UA_StatusCode
-UA_DataSetReader_generateDataSetMessage(UA_Server *server,
-                                        UA_DataSetMessage *dataSetMessage,
-                                        UA_DataSetReader *dataSetReader) {
-    /* Reset the message */
-    memset(dataSetMessage, 0, sizeof(UA_DataSetMessage));
-
-    /* Support only for UADP configuration
-     * TODO: JSON encoding if UA_DataSetReader_generateDataSetMessage used other
-     * that RT configuration */
-
-    UA_ExtensionObject *settings = &dataSetReader->config.messageSettings;
-    if(settings->content.decoded.type != &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE]) {
-        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
-                              "Only UADP encoding is supported");
-        return UA_STATUSCODE_BADNOTSUPPORTED;
-    }
-
-    /* The configuration Flags are included inside the std. defined UA_UadpDataSetReaderMessageDataType */
-    UA_UadpDataSetReaderMessageDataType defaultUadpConfiguration;
-    UA_UadpDataSetReaderMessageDataType *dataSetReaderMessageDataType =
-        (UA_UadpDataSetReaderMessageDataType*) settings->content.decoded.data;
-
-    if(!(settings->encoding == UA_EXTENSIONOBJECT_DECODED ||
-         settings->encoding == UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
-       !dataSetReaderMessageDataType->dataSetMessageContentMask) {
-        /* create default flag configuration if no dataSetMessageContentMask or even messageSettings in
-         * UadpDataSetWriterMessageDataType was passed in */
-        memset(&defaultUadpConfiguration, 0, sizeof(UA_UadpDataSetReaderMessageDataType));
-        defaultUadpConfiguration.dataSetMessageContentMask = (UA_UadpDataSetMessageContentMask)
-            ((u64)UA_UADPDATASETMESSAGECONTENTMASK_TIMESTAMP |
-             (u64)UA_UADPDATASETMESSAGECONTENTMASK_MAJORVERSION |
-             (u64)UA_UADPDATASETMESSAGECONTENTMASK_MINORVERSION);
-        dataSetReaderMessageDataType = &defaultUadpConfiguration;
-    }
-
-    /* Sanity-test the configuration */
-    if(dataSetReaderMessageDataType &&
-       (dataSetReaderMessageDataType->networkMessageNumber != 0 ||
-        dataSetReaderMessageDataType->dataSetOffset != 0)) {
-        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
-                              "Static DSM configuration not supported, using defaults");
-        dataSetReaderMessageDataType->networkMessageNumber = 0;
-        dataSetReaderMessageDataType->dataSetOffset = 0;
-    }
-
-    /* The field encoding depends on the flags inside the reader config. */
-    if(dataSetReader->config.dataSetFieldContentMask &
-       (u64)UA_DATASETFIELDCONTENTMASK_RAWDATA) {
-        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_RAWDATA;
-    } else if((u64)dataSetReader->config.dataSetFieldContentMask &
-              ((u64)UA_DATASETFIELDCONTENTMASK_SOURCETIMESTAMP |
-               (u64)UA_DATASETFIELDCONTENTMASK_SERVERPICOSECONDS |
-               (u64)UA_DATASETFIELDCONTENTMASK_SOURCEPICOSECONDS |
-               (u64)UA_DATASETFIELDCONTENTMASK_STATUSCODE)) {
-        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
-    } else {
-        dataSetMessage->header.fieldEncoding = UA_FIELDENCODING_VARIANT;
-    }
-
-    /* Std: 'The DataSetMessageContentMask defines the flags for the content
-     * of the DataSetMessage header.' */
-    if((u64)dataSetReaderMessageDataType->dataSetMessageContentMask &
-       (u64)UA_UADPDATASETMESSAGECONTENTMASK_MAJORVERSION) {
-        dataSetMessage->header.configVersionMajorVersionEnabled = true;
-        dataSetMessage->header.configVersionMajorVersion =
-            dataSetReader->config.dataSetMetaData.configurationVersion.majorVersion;
-    }
-
-    if((u64)dataSetReaderMessageDataType->dataSetMessageContentMask &
-       (u64)UA_UADPDATASETMESSAGECONTENTMASK_MINORVERSION) {
-        dataSetMessage->header.configVersionMinorVersionEnabled = true;
-        dataSetMessage->header.configVersionMinorVersion =
-            dataSetReader->config.dataSetMetaData.configurationVersion.minorVersion;
-    }
-
-    if((u64)dataSetReaderMessageDataType->dataSetMessageContentMask &
-       (u64)UA_UADPDATASETMESSAGECONTENTMASK_SEQUENCENUMBER) {
-        /* Will be modified when subscriber receives new nw msg */
-        dataSetMessage->header.dataSetMessageSequenceNrEnabled = true;
-        dataSetMessage->header.dataSetMessageSequenceNr = 1;
-    }
-
-    if((u64)dataSetReaderMessageDataType->dataSetMessageContentMask &
-       (u64)UA_UADPDATASETMESSAGECONTENTMASK_TIMESTAMP) {
-        dataSetMessage->header.timestampEnabled = true;
-        dataSetMessage->header.timestamp = UA_DateTime_now();
-    }
-
-    /* TODO: Picoseconds resolution not supported atm */
-    if((u64)dataSetReaderMessageDataType->dataSetMessageContentMask &
-       (u64)UA_UADPDATASETMESSAGECONTENTMASK_PICOSECONDS) {
-        dataSetMessage->header.picoSecondsIncluded = false;
-    }
-
-    if((u64)dataSetReaderMessageDataType->dataSetMessageContentMask &
-       (u64)UA_UADPDATASETMESSAGECONTENTMASK_STATUS) {
-        dataSetMessage->header.statusEnabled = true;
-    }
-
-    /* Not supported for Delta frames atm */
-    return UA_PubSubDataSetReader_generateKeyFrameMessage(server, dataSetMessage,
-                                                          dataSetReader);
-}
-
-UA_StatusCode
-UA_DataSetReader_generateNetworkMessage(UA_PubSubConnection *pubSubConnection,
-                                        UA_ReaderGroup *readerGroup,
-                                        UA_DataSetReader *dataSetReader,
-                                        UA_DataSetMessage *dsm, UA_UInt16 *writerId,
-                                        UA_Byte dsmCount, UA_NetworkMessage *nm) {
-    UA_ExtensionObject *settings = &dataSetReader->config.messageSettings;
-    if(settings->content.decoded.type != &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE])
-        return UA_STATUSCODE_BADNOTSUPPORTED;
-
-    UA_UadpDataSetReaderMessageDataType *dsrm =
-        (UA_UadpDataSetReaderMessageDataType*)settings->content.decoded.data;
-    nm->publisherIdEnabled = ((u64)dsrm->networkMessageContentMask &
-                              (u64)UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID) != 0;
-    nm->groupHeaderEnabled = ((u64)dsrm->networkMessageContentMask &
-                              (u64)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER) != 0;
-    nm->groupHeader.writerGroupIdEnabled = ((u64)dsrm->networkMessageContentMask &
-                                            (u64)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID) != 0;
-    nm->groupHeader.groupVersionEnabled = ((u64)dsrm->networkMessageContentMask &
-                                           (u64)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPVERSION) != 0;
-    nm->groupHeader.networkMessageNumberEnabled = ((u64)dsrm->networkMessageContentMask &
-                                                   (u64)UA_UADPNETWORKMESSAGECONTENTMASK_NETWORKMESSAGENUMBER) != 0;
-    nm->groupHeader.sequenceNumberEnabled = ((u64)dsrm->networkMessageContentMask &
-                                             (u64)UA_UADPNETWORKMESSAGECONTENTMASK_SEQUENCENUMBER) != 0;
-    nm->payloadHeaderEnabled = ((u64)dsrm->networkMessageContentMask &
-                                (u64)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER) != 0;
-    nm->timestampEnabled = ((u64)dsrm->networkMessageContentMask &
-                            (u64)UA_UADPNETWORKMESSAGECONTENTMASK_TIMESTAMP) != 0;
-    nm->picosecondsEnabled = ((u64)dsrm->networkMessageContentMask &
-                              (u64)UA_UADPNETWORKMESSAGECONTENTMASK_PICOSECONDS) != 0;
-    nm->dataSetClassIdEnabled = ((u64)dsrm->networkMessageContentMask &
-                                 (u64)UA_UADPNETWORKMESSAGECONTENTMASK_DATASETCLASSID) != 0;
-    nm->promotedFieldsEnabled = ((u64)dsrm->networkMessageContentMask &
-                                 (u64)UA_UADPNETWORKMESSAGECONTENTMASK_PROMOTEDFIELDS) != 0;
-    /* Set the SecurityHeader */
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-    if(readerGroup->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
-        nm->securityEnabled = true;
-        nm->securityHeader.networkMessageSigned = true;
-        if(readerGroup->config.securityMode >= UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
-            nm->securityHeader.networkMessageEncrypted = true;
-        nm->securityHeader.securityTokenId = readerGroup->securityTokenId;
-
-        /* Generate the MessageNonce starting with four random bytes */
-        UA_ByteString nonce = {4, nm->securityHeader.messageNonce};
-        UA_StatusCode rv = readerGroup->config.securityPolicy->symmetricModule.
-            generateNonce(readerGroup->config.securityPolicy->policyContext,
-                          &nonce);
-        if(rv != UA_STATUSCODE_GOOD)
-            return rv;
-        nm->securityHeader.messageNonceSize = 8;
-    }
-#endif
-    nm->version = 1;
-    nm->networkMessageType = UA_NETWORKMESSAGE_DATASET;
-
-    if(!UA_DataType_isNumeric(dataSetReader->config.publisherId.type))
-        return UA_STATUSCODE_BADNOTSUPPORTED;
-
-    if (nm->publisherIdEnabled) {
-        switch(dataSetReader->config.publisherId.type->typeKind) {
-        case UA_DATATYPEKIND_BYTE:
-            nm->publisherIdType = UA_PUBLISHERIDTYPE_BYTE;
-            nm->publisherId.byte = *(UA_Byte *) dataSetReader->config.publisherId.data;
-            break;
-        case UA_DATATYPEKIND_UINT16:
-            nm->publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
-            nm->publisherId.uint16 = *(UA_UInt16 *) dataSetReader->config.publisherId.data;
-            break;
-        case UA_DATATYPEKIND_UINT32:
-            nm->publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
-            nm->publisherId.uint32 = *(UA_UInt32 *) dataSetReader->config.publisherId.data;
-            break;
-        case UA_DATATYPEKIND_UINT64:
-            nm->publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
-            nm->publisherId.uint64 = *(UA_UInt64 *) dataSetReader->config.publisherId.data;
-            break;
-        default:
-            // UA_PUBLISHERIDTYPE_STRING is not supported because of UA_PUBSUB_RT_FIXED_SIZE
-            return UA_STATUSCODE_BADNOTSUPPORTED;
-        }
-    }
-
-    if(nm->groupHeader.sequenceNumberEnabled)
-        nm->groupHeader.sequenceNumber = 1; /* Will be modified when subscriber receives new nw msg. */
-
-    if(nm->groupHeader.groupVersionEnabled)
-        nm->groupHeader.groupVersion = dsrm->groupVersion;
-
-    /* Compute the length of the dsm separately for the header */
-    UA_UInt16 *dsmLengths = (UA_UInt16 *) UA_calloc(dsmCount, sizeof(UA_UInt16));
-    if(!dsmLengths)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    for(UA_Byte i = 0; i < dsmCount; i++){
-        dsmLengths[i] = (UA_UInt16) UA_DataSetMessage_calcSizeBinary(&dsm[i], NULL, 0);
-        switch(dataSetReader->config.expectedEncoding) {
-            case UA_PUBSUB_RT_UNKNOWN:
-                break;
-            case UA_PUBSUB_RT_VARIANT:
-                dsm[i].header.fieldEncoding = UA_FIELDENCODING_VARIANT;
-                break;
-            case UA_PUBSUB_RT_DATA_VALUE:
-                dsm[i].header.fieldEncoding = UA_FIELDENCODING_DATAVALUE;
-                break;
-            case UA_PUBSUB_RT_RAW:
-                dsm[i].header.fieldEncoding = UA_FIELDENCODING_RAWDATA;
-                break;
-        }
-    }
-    nm->payloadHeader.dataSetPayloadHeader.count = dsmCount;
-    nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds = writerId;
-    nm->groupHeader.writerGroupId = dataSetReader->config.writerGroupId;
-    nm->groupHeader.networkMessageNumber = 1; /* number of the NetworkMessage inside a PublishingInterval */
-    nm->payload.dataSetPayload.sizes = dsmLengths;
-    nm->payload.dataSetPayload.dataSetMessages = dsm;
-    return UA_STATUSCODE_GOOD;
-}
-
 static UA_Boolean
 publisherIdIsMatching(UA_NetworkMessage *msg, UA_Variant publisherId) {
     switch(msg->publisherIdType) {
@@ -359,8 +63,6 @@ publisherIdIsMatching(UA_NetworkMessage *msg, UA_Variant publisherId) {
 static UA_StatusCode
 checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
                       UA_DataSetReader *reader, UA_ReaderGroupConfig readerGroupConfig) {
-
-
     if(readerGroupConfig.encodingMimeType != UA_PUBSUB_ENCODING_JSON){
         if(!publisherIdIsMatching(msg, reader->config.publisherId)) {
             return UA_STATUSCODE_BADNOTFOUND;
@@ -426,21 +128,10 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
     if(!newDataSetReader)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     newDataSetReader->componentType = UA_PUBSUB_COMPONENT_DATASETREADER;
-    if(readerGroup->state == UA_PUBSUBSTATE_OPERATIONAL) {
-        retVal = UA_DataSetReader_setPubSubState(server, newDataSetReader, UA_PUBSUBSTATE_OPERATIONAL,
-                                                 UA_STATUSCODE_GOOD);
-        if(retVal != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
-                                     "Add DataSetReader failed, setPubSubState failed");
-            UA_free(newDataSetReader);
-            newDataSetReader = 0;
-            return retVal;
-        }
-    }
 
     /* Copy the config into the new dataSetReader */
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_DataSetReaderConfig_copy(dataSetReaderConfig, &newDataSetReader->config);
     newDataSetReader->linkedReaderGroup = readerGroup->identifier;
 
@@ -534,8 +225,8 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
                     UA_free(targetVars);
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-                    retVal |= connectDataSetReaderToDataSet(server, newDataSetReader->identifier,
-                                                            subscribedDataSet->identifier);
+                    connectDataSetReaderToDataSet(server, newDataSetReader->identifier,
+                                                  subscribedDataSet->identifier);
 #endif
                 }
             }
@@ -545,7 +236,19 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
     if(readerIdentifier)
         UA_NodeId_copy(&newDataSetReader->identifier, readerIdentifier);
 
-    return retVal;
+    /* Set the ReaderGroup state after finalizing the configuration */
+    if(readerGroup->state == UA_PUBSUBSTATE_OPERATIONAL ||
+       readerGroup->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
+        retVal = UA_DataSetReader_setPubSubState(server, newDataSetReader, readerGroup->state,
+                                        UA_STATUSCODE_GOOD);
+        if(retVal != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
+                                     "Add DataSetReader failed, setPubSubState failed");
+        }
+    }
+
+
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
@@ -870,10 +573,9 @@ UA_DataSetReader_setPubSubState(UA_Server *server,
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
             break;
         case UA_PUBSUBSTATE_OPERATIONAL:
-            dataSetReader->state = UA_PUBSUBSTATE_OPERATIONAL;
-            break;
+        case UA_PUBSUBSTATE_PREOPERATIONAL:
         case UA_PUBSUBSTATE_ERROR:
-            dataSetReader->state = UA_PUBSUBSTATE_ERROR;
+            dataSetReader->state = state;
             break;
         default:
             UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
@@ -1408,12 +1110,20 @@ processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
     UA_ReaderGroup *readerGroup;
     UA_DataSetReader *reader;
     LIST_FOREACH(readerGroup, &connection->readerGroups, listEntry) {
+        /* Received a (first) message for the ReaderGroup.
+         * Transition from PreOperational to Operational. */
+        if(readerGroup->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
+            UA_ReaderGroup_setPubSubState(server, readerGroup,
+                                          UA_PUBSUBSTATE_OPERATIONAL,
+                                          UA_STATUSCODE_GOOD);
+        }
+
         LIST_FOREACH(reader, &readerGroup->readers, listEntry) {
             UA_StatusCode retval = checkReaderIdentifier(server, msg, reader, readerGroup->config);
-            if(retval == UA_STATUSCODE_GOOD) {
-                processed = true;
-                processMessageWithReader(server, readerGroup, reader, msg);
-            }
+            if(retval != UA_STATUSCODE_GOOD)
+                continue;
+            processed = true;
+            processMessageWithReader(server, readerGroup, reader, msg);
         }
     }
 
@@ -1431,30 +1141,6 @@ processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
  * as a subscriber
  ********************************************************************************/
 
-#define MIN_PAYLOAD_SIZE_ETHERNET 46
-
-/* Delete the payload value of every decoded DataSet field */
-static void UA_DataSetMessage_freeDecodedPayload(UA_DataSetMessage *dsm) {
-    if(dsm->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-        for(size_t i = 0; i < dsm->data.keyFrameData.fieldCount; i++) {
-#ifdef UA_ENABLE_PUBSUB_BUFMALLOC
-            UA_Variant_init(&dsm->data.keyFrameData.dataSetFields[i].value);
-#else
-            UA_Variant_clear(&dsm->data.keyFrameData.dataSetFields[i].value);
-#endif
-        }
-    }
-    else if(dsm->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-        for(size_t i = 0; i < dsm->data.keyFrameData.fieldCount; i++) {
-#ifdef UA_ENABLE_PUBSUB_BUFMALLOC
-            UA_DataValue_init(&dsm->data.keyFrameData.dataSetFields[i]);
-#else
-            UA_DataValue_clear(&dsm->data.keyFrameData.dataSetFields[i]);
-#endif
-        }
-    }
-}
-
 UA_StatusCode
 decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
                      UA_NetworkMessage *nm, UA_PubSubConnection *connection) {
@@ -1583,76 +1269,156 @@ UA_StatusCode
 UA_decodeAndProcessNetworkMessage(UA_Server *server,
                                   UA_PubSubConnection *connection,
                                   UA_ByteString *buffer) {
-    return decodeAndProcessNetworkMessage(server, connection, UA_PUBSUB_ENCODING_UADP, buffer);
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res =
+        decodeAndProcessNetworkMessage(server, connection, UA_PUBSUB_ENCODING_UADP, buffer);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 static UA_StatusCode
-decodeAndProcessNetworkMessageRT(UA_Server *server, UA_ReaderGroup *readerGroup,
-                                 UA_PubSubConnection *connection, UA_ByteString *buf) {
-#ifdef UA_ENABLE_PUBSUB_BUFMALLOC
-    useMembufAlloc();
-#endif
+prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *reader,
+                    UA_PubSubConnection *connection, UA_ByteString *buf, size_t *pos) {
+    UA_NetworkMessage *nm = (UA_NetworkMessage*)UA_calloc(1, sizeof(UA_NetworkMessage));
+    if(!nm)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    /* Considering max DSM as 1
-    * TODO: Process with the static value source */
-    UA_StatusCode rv = UA_STATUSCODE_GOOD;
-    size_t currentPosition = 0;
-    UA_DataSetReader *dataSetReader = LIST_FIRST(&readerGroup->readers);
-    if(!dataSetReader)
+    /* Decode using the non-rt decoding */
+    UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buf, pos, nm);
+    rv |= UA_NetworkMessage_decodePayload(buf, pos, nm, server->config.customDataTypes);
+    rv |= UA_NetworkMessage_decodeFooters(buf, pos, nm);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_NetworkMessage_clear(nm);
+        UA_free(nm);
+        return rv;
+    }
+
+    /* Check if the message was intended for this reader */
+    rv = checkReaderIdentifier(server, nm, reader, rg->config);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO_READER(&server->config.logger, reader,
+                           "PubSub receive. Message intended for a different reader.");
+        UA_NetworkMessage_clear(nm);
+        UA_free(nm);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Compute and store the offsets necessary to decode */
+    size_t nmSize = UA_NetworkMessage_calcSizeBinary(nm, &reader->bufferedMessage);
+    if(nmSize == 0) {
+        UA_NetworkMessage_clear(nm);
+        UA_free(nm);
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Set the offset buffer in the reader */
+    reader->bufferedMessage.nm = nm;
+    reader->bufferedMessage.RTsubscriberEnabled = true;
+
+    /* If pre-operational, set to operational after the first message was
+     * processed */
+    if(rg->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
+        rv = UA_ReaderGroup_setPubSubState(server, rg,
+                                           UA_PUBSUBSTATE_OPERATIONAL,
+                                           UA_STATUSCODE_GOOD);
+    }
 
-    UA_NetworkMessage *nm = dataSetReader->bufferedMessage.nm;
+    return rv;
+}
+
+static void
+decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
+                   UA_PubSubConnection *connection,
+                   UA_DataSetReader *dsr, UA_ByteString *buf) {
+    size_t currentPosition = 0;
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
+    UA_NetworkMessage *nm = dsr->bufferedMessage.nm;
+    if(!nm) {
+        /* This is the first message being received for the RT fastpath. Prepare
+         * the offset buffer and set operational. */
+        rv = prepareOffsetBuffer(server, readerGroup, dsr, connection,
+                                 buf, &currentPosition);
+        if(rv != UA_STATUSCODE_GOOD) {
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "PubSub receive failed. Could not decode with "
+                               "status code %s.", UA_StatusCode_name(rv));
+            return;
+        }
+
+        /* Process and continue decoding (now using the prepared offsets) */
+        nm = dsr->bufferedMessage.nm;
+        goto process;
+    }
 
+    while(currentPosition < buf->length) {
+        /* Decode with offset information and update the networkMessage */
+        rv = UA_NetworkMessage_updateBufferedNwMessage(&dsr->bufferedMessage,
+                                                       buf, &currentPosition);
+        if(rv != UA_STATUSCODE_GOOD) {
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "PubSub receive failed. Could not decode with "
+                               "status code %s.", UA_StatusCode_name(rv));
+            return;
+        }
+
+        /* Check the decoded message is intended for this reader */
+        rv = checkReaderIdentifier(server, nm, dsr, readerGroup->config);
+        if(rv != UA_STATUSCODE_GOOD) {
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "PubSub receive. Message intended for a different reader.");
+            continue;
+        }
+
+    process:
+        /* Process for this reader */
+        UA_DataSetReader_process(server, readerGroup, dsr,
+                                 nm->payload.dataSetPayload.dataSetMessages);
+    }
+}
+
+UA_StatusCode
+UA_DataSetReader_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
+                                    UA_PubSubConnection *connection, UA_ByteString *buf) {
+#ifdef UA_ENABLE_PUBSUB_BUFMALLOC
+    useMembufAlloc();
+#endif
+
+    /* Decrypt */
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_NetworkMessage currentNetworkMessage;
     memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
 
     size_t payLoadPosition = 0;
-    rv = UA_NetworkMessage_decodeHeaders(buf, &payLoadPosition, &currentNetworkMessage);
+    UA_StatusCode rv =
+        UA_NetworkMessage_decodeHeaders(buf, &payLoadPosition, &currentNetworkMessage);
     if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
-                           "PubSub receive. decoding headers failed");
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                              "PubSub receive. decoding headers failed");
         return rv;
     }
 
     rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &payLoadPosition,
                                         &currentNetworkMessage, readerGroup);
+    UA_NetworkMessage_clear(&currentNetworkMessage);
     if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
-                              "Subscribe failed. verify and decrypt network message failed.");
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                              "Subscribe failed. verify and decrypt network "
+                              "message failed.");
         return rv;
     }
-    UA_NetworkMessage_clear(&currentNetworkMessage);
 #endif
 
-    /* Decode only the necessary offset and update the networkMessage */
-    rv = UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage,
-                                                   buf, &currentPosition);
-    if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO_READER(&server->config.logger, dataSetReader,
-                           "PubSub receive. Unknown field type.");
-        rv = UA_STATUSCODE_UNCERTAIN;
-        goto cleanup;
-    }
-
-    /* Check the decoded message is the expected one */
-    rv = checkReaderIdentifier(server, nm, dataSetReader, readerGroup->config);
-    if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO_READER(&server->config.logger, dataSetReader,
-                           "PubSub receive. Unknown message received. Will not be processed.");
-        rv = UA_STATUSCODE_UNCERTAIN;
-        goto cleanup;
+    /* Process for all readers in the ReaderGroup. Each reader might wait for a
+     * different PublisherId. So the offsets are different for each. */
+    UA_DataSetReader *dsr;
+    LIST_FOREACH(dsr, &readerGroup->readers, listEntry) {
+        decodeAndProcessRT(server, readerGroup, connection, dsr, buf);
     }
 
-    UA_DataSetReader_process(server, readerGroup, dataSetReader,
-                             nm->payload.dataSetPayload.dataSetMessages);
-
- cleanup:
-    UA_DataSetMessage_freeDecodedPayload(nm->payload.dataSetPayload.dataSetMessages);
 #ifdef UA_ENABLE_PUBSUB_BUFMALLOC
     useNormalAlloc();
 #endif
-    return rv;
+    return UA_STATUSCODE_GOOD;
 }
 
 typedef struct {
@@ -1687,8 +1453,8 @@ decodeAndProcessFunRT(UA_PubSubChannel *channel, void *cbContext,
     UA_ReaderGroup *rg;
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     LIST_FOREACH(rg, &ctx->connection->readerGroups, listEntry) {
-        res |= decodeAndProcessNetworkMessageRT(ctx->server, rg, ctx->connection,
-                                                &mutableBuffer);
+        res |= UA_DataSetReader_decodeAndProcessRT(ctx->server, rg, ctx->connection,
+                                                   &mutableBuffer);
     }
     return res;
 }
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index cc879886a07..599cf32800c 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -332,7 +332,8 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
         return UA_STATUSCODE_GOOD;
     case UA_PUBSUBSTATE_PAUSED:
         break;
-    case UA_PUBSUBSTATE_OPERATIONAL: {
+    case UA_PUBSUBSTATE_OPERATIONAL:
+    case UA_PUBSUBSTATE_PREOPERATIONAL:
         UA_ReaderGroup_removeSubscribeCallback(server, rg);
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
             UA_DataSetReader_setPubSubState(server, dataSetReader,
@@ -340,7 +341,6 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
         }
         rg->state = UA_PUBSUBSTATE_DISABLED;
         break;
-    }
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
@@ -364,6 +364,7 @@ UA_ReaderGroup_setPubSubState_paused(UA_Server *server,
     case UA_PUBSUBSTATE_PAUSED:
         return UA_STATUSCODE_GOOD;
     case UA_PUBSUBSTATE_OPERATIONAL:
+    case UA_PUBSUBSTATE_PREOPERATIONAL:
         break;
     case UA_PUBSUBSTATE_ERROR:
         break;
@@ -378,25 +379,35 @@ static UA_StatusCode
 UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
                                           UA_ReaderGroup *rg,
                                           UA_StatusCode cause) {
-    UA_DataSetReader *dataSetReader;
-    switch(rg->state) {
-    case UA_PUBSUBSTATE_DISABLED: {
+    UA_PubSubState state = UA_PUBSUBSTATE_OPERATIONAL;
+    UA_DataSetReader *dataSetReader = LIST_FIRST(&rg->readers);
+    if(!dataSetReader ||
+       (rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE &&
+        rg->configurationFrozen && !dataSetReader->bufferedMessage.nm))
+        state = UA_PUBSUBSTATE_PREOPERATIONAL;
+                               
+    UA_PubSubState oldstate = rg->state;
+    rg->state = state; /* Set the new state now. So we can already switch from
+                        * pre-operational to operational when the first messages
+                        * are received during the enabled-calback step. */
+
+    switch(oldstate) {
+    case UA_PUBSUBSTATE_DISABLED:
+        UA_ReaderGroup_addSubscribeCallback(server, rg);
+        /* Fall-through */
+    case UA_PUBSUBSTATE_OPERATIONAL:
+    case UA_PUBSUBSTATE_PREOPERATIONAL:
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
-            UA_DataSetReader_setPubSubState(server, dataSetReader, UA_PUBSUBSTATE_OPERATIONAL,
-                                            cause);
+            UA_DataSetReader_setPubSubState(server, dataSetReader, state, cause);
         }
-        UA_ReaderGroup_addSubscribeCallback(server, rg);
-        rg->state = UA_PUBSUBSTATE_OPERATIONAL;
         return UA_STATUSCODE_GOOD;
-    }
     case UA_PUBSUBSTATE_PAUSED:
         break;
-    case UA_PUBSUBSTATE_OPERATIONAL:
-        return UA_STATUSCODE_GOOD;
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
         UA_LOG_WARNING_READERGROUP(&server->config.logger, rg, "Unknown PubSub state!");
+        rg->state = UA_PUBSUBSTATE_ERROR;
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -413,6 +424,7 @@ UA_ReaderGroup_setPubSubState_error(UA_Server *server,
     case UA_PUBSUBSTATE_PAUSED:
         break;
     case UA_PUBSUBSTATE_OPERATIONAL:
+    case UA_PUBSUBSTATE_PREOPERATIONAL:
         UA_ReaderGroup_removeSubscribeCallback(server, rg);
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry){
             UA_DataSetReader_setPubSubState(server, dataSetReader, UA_PUBSUBSTATE_ERROR,
@@ -607,13 +619,20 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
+    /* Don't support string PublisherId for the fast-path (at this time) */
+    if(!dataSetReader->config.publisherId.type->pointerFree) {
+        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+                              "PubSub-RT configuration fail: String PublisherId");
+        return UA_STATUSCODE_BADNOTSUPPORTED;
+    }
+
     size_t fieldsSize = dataSetReader->config.dataSetMetaData.fieldsSize;
     for(size_t i = 0; i < fieldsSize; i++) {
         UA_FieldTargetVariable *tv =
             &dataSetReader->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
         const UA_VariableNode *rtNode = (const UA_VariableNode *)
             UA_NODESTORE_GET(server, &tv->targetVariable.targetNodeId);
-        if(rtNode != NULL &&
+        if(!rtNode ||
            rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
             UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
                                   "PubSub-RT configuration fail: PDS contains field "
@@ -622,6 +641,9 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
             return UA_STATUSCODE_BADNOTSUPPORTED;
         }
 
+        /* Set the external data source in the tv */
+        tv->externalDataValue = rtNode->valueBackend.backend.external.value;
+
         UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
 
         UA_FieldMetaData *field = &dataSetReader->config.dataSetMetaData.fields[i];
@@ -641,64 +663,15 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
         }
     }
 
-    UA_DataSetMessage *dsm = (UA_DataSetMessage*)
-        UA_calloc(1, sizeof(UA_DataSetMessage));
-    if(!dsm)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
+    /* Reset the OffsetBuffer. The OffsetBuffer for a frozen configuration is
+     * generated when the first message is received. So we know the exact
+     * settings which headers are present, etc. Until then the ReaderGroup is
+     * "PreOperational". */
+    UA_NetworkMessageOffsetBuffer_clear(&dataSetReader->bufferedMessage);
 
-    /* Generate the DSM */
-    UA_StatusCode res = UA_DataSetReader_generateDataSetMessage(server, dsm, dataSetReader);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_READER(&server->config.logger, dataSetReader,
-                            "PubSub RT Offset calculation: DataSetMessage generation failed");
-        UA_DataSetMessage_clear(dsm);
-        UA_free(dsm);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Generate data set messages - Considering 1 DSM as max */
-    UA_UInt16 *dsWriterIds = (UA_UInt16 *)UA_calloc(1, sizeof(UA_UInt16));
-    if(!dsWriterIds) {
-        UA_DataSetMessage_clear(dsm);
-        UA_free(dsm);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    *dsWriterIds = dataSetReader->config.dataSetWriterId;
-
-    UA_NetworkMessage *networkMessage = (UA_NetworkMessage *)
-        UA_calloc(1, sizeof(UA_NetworkMessage));
-    if(!networkMessage) {
-        UA_free(dsWriterIds);
-        UA_DataSetMessage_clear(dsm);
-        UA_free(dsm);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-
-    /* Move the dsm into the NetworkMessage */
-    res = UA_DataSetReader_generateNetworkMessage(pubSubConnection, rg, dataSetReader, dsm,
-                                                  dsWriterIds, 1, networkMessage);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_free(networkMessage->payload.dataSetPayload.sizes);
-        UA_free(networkMessage);
-        UA_free(dsWriterIds);
-        UA_DataSetMessage_clear(dsm);
-        UA_free(dsm);
-        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
-                              "PubSub RT Offset calculation: "
-                              "NetworkMessage generation failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* The offset buffer is already clear if the ReaderGroup was unfrozen
-     * UA_NetworkMessageOffsetBuffer_clear(&dataSetReader->bufferedMessage); */
-    memset(&dataSetReader->bufferedMessage, 0, sizeof(UA_NetworkMessageOffsetBuffer));
-    dataSetReader->bufferedMessage.RTsubscriberEnabled = true;
-
-    /* Compute and store the offsets necessary to decode */
-    UA_NetworkMessage_calcSizeBinary(networkMessage, &dataSetReader->bufferedMessage);
-    dataSetReader->bufferedMessage.nm = networkMessage;
-
-    return UA_STATUSCODE_GOOD;
+    /* Set the current state again. This can move the state from Operational to
+     * PreOperational. */
+    return UA_ReaderGroup_setPubSubState(server, rg, rg->state, UA_STATUSCODE_GOOD);
 }
 
 UA_StatusCode
@@ -755,9 +728,9 @@ UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
 
 /* This triggers the collection and reception of NetworkMessages and the
  * contained DataSetMessages. */
-void
-UA_ReaderGroup_subscribeCallback(UA_Server *server,
-                                 UA_ReaderGroup *readerGroup) {
+static void
+subscribeCallback(UA_Server *server,
+                  UA_ReaderGroup *readerGroup) {
     // TODO: feedback for debug-assert vs runtime-check
     UA_assert(server);
     UA_assert(readerGroup);
@@ -777,6 +750,14 @@ UA_ReaderGroup_subscribeCallback(UA_Server *server,
     receiveBufferedNetworkMessage(server, readerGroup, connection);
 }
 
+void
+UA_ReaderGroup_subscribeCallback(UA_Server *server,
+                                 UA_ReaderGroup *readerGroup) {
+    UA_LOCK(&server->serviceMutex);
+    subscribeCallback(server, readerGroup);
+    UA_UNLOCK(&server->serviceMutex);
+}
+
 /* Add new subscribeCallback. The first execution is triggered directly after
  * creation. */
 UA_StatusCode
@@ -808,7 +789,7 @@ UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGro
      * blocked. It is highly recommended to use custom callback when using
      * blockingsocket. */
     if(readerGroup->config.enableBlockingSocket != true)
-        UA_ReaderGroup_subscribeCallback(server, readerGroup);
+        subscribeCallback(server, readerGroup);
 
     return retval;
 }
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index df9d7dd6b4f..187a08e9090 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -115,20 +115,8 @@ static void receiveSingleMessageRT(UA_PubSubConnection *connection, UA_ReaderGro
         ck_abort_msg("Expected message not received!");
     }
 
-    UA_NetworkMessage currentNetworkMessage;
-    memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
-    size_t payLoadPosition = 0;
-    UA_NetworkMessage_decodeHeaders(&buffer, &payLoadPosition, &currentNetworkMessage);
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    verifyAndDecryptNetworkMessage(&config->logger,
-                                   &buffer,
-                                   &payLoadPosition,
-                                   &currentNetworkMessage,
-                                   readerGroup);
-    UA_NetworkMessage_clear(&currentNetworkMessage);
-    size_t currentPosition = 0;
     /* Decode only the necessary offset and update the networkMessage */
-    if(UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage, &buffer, &currentPosition) != UA_STATUSCODE_GOOD) {
+    if(UA_DataSetReader_decodeAndProcessRT(server, readerGroup, connection, &buffer) != UA_STATUSCODE_GOOD) {
         ck_abort_msg("PubSub receive. Unknown field type!");
     }
 
@@ -138,12 +126,6 @@ static void receiveSingleMessageRT(UA_PubSubConnection *connection, UA_ReaderGro
         ck_abort_msg("PubSub receive. Unknown message received. Will not be processed.");
     }
 
-    UA_ReaderGroup *rg =
-        UA_ReaderGroup_findRGbyId(server, dataSetReader->linkedReaderGroup);
-
-    UA_DataSetReader_process(server, rg, dataSetReader,
-                             dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages);
-
     /* Delete the payload value of every dsf's decoded */
      UA_DataSetMessage *dsm = dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages;
      if(dsm->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 2cbc4fb4b3e..69034e68e1c 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -390,10 +390,10 @@ START_TEST(Test_corner_cases) {
         MessageReceiveTimeout_Conn1_RG1_DSR1, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1);
 
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_ReaderGroup_getState(server, RGId_Conn1_RG1, &state));
-    ck_assert_int_eq(UA_PUBSUBSTATE_OPERATIONAL, state);
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL || state == UA_PUBSUBSTATE_PREOPERATIONAL);
     /* DataSetReader should be operational as well */
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state));
-    ck_assert_int_eq(UA_PUBSUBSTATE_OPERATIONAL, state);
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL || state == UA_PUBSUBSTATE_PREOPERATIONAL);
 
     /* test wrong nodeIds */
     ck_assert(UA_STATUSCODE_GOOD != UA_Server_DataSetReader_getState(server, RGId_Conn1_RG1, &state));
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index 96d07c38cd8..96ae9373013 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -87,37 +87,21 @@ receiveMultipleMessageRT(UA_PubSubConnection *connection, UA_DataSetReader *data
     UA_ReceiveContext testCtx = {&buffer, 0};
     connection->channel->receive(connection->channel, NULL, recvTestFun, &testCtx, 1000000);
     if(buffer.length > 0) {
-        size_t currentPosition = 0;
         UA_UInt16  rcvCount    = 0;
-        do {
-            /* Decode only the necessary offset and update the networkMessage */
-            if(UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage, &buffer, &currentPosition) != UA_STATUSCODE_GOOD) {
-                ck_abort_msg("PubSub receive. Unknown field type!");
-            }
-
-            /* Check the decoded message is the expected one */
-            if((dataSetReader->bufferedMessage.nm->groupHeader.writerGroupId != dataSetReader->config.writerGroupId) ||
-               (*dataSetReader->bufferedMessage.nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != dataSetReader->config.dataSetWriterId)) {
-                ck_abort_msg("PubSub receive. Unknown message received. Will not be processed.");
-            }
-
-            UA_ReaderGroup *rg =
-                UA_ReaderGroup_findRGbyId(server, dataSetReader->linkedReaderGroup);
-
-            UA_DataSetReader_process(server, rg, dataSetReader,
-                                     dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages);
-
-            /* Delete the payload value of every dsf's decoded */
-            UA_DataSetMessage *dsm = dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages;
-            if(dsm->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-                for(UA_UInt16 i = 0; i < dsm->data.keyFrameData.fieldCount; i++) {
-                    UA_Variant_clear(&dsm->data.keyFrameData.dataSetFields[i].value);
-                }
-            }
-            rcvCount++;
-        } while((buffer.length) > currentPosition);
-
-        ck_assert_int_eq(rcvCount, 2);
+        UA_ReaderGroup *rg =
+            UA_ReaderGroup_findRGbyId(server, dataSetReader->linkedReaderGroup);
+        
+        /* Decode only the necessary offset and update the networkMessage */
+        if(UA_DataSetReader_decodeAndProcessRT(server, rg, connection, &buffer) != UA_STATUSCODE_GOOD) {
+            ck_abort_msg("PubSub receive. Unknown field type!");
+        }
+        
+        /* Check the decoded message is the expected one */
+        if((dataSetReader->bufferedMessage.nm->groupHeader.writerGroupId != dataSetReader->config.writerGroupId) ||
+           (*dataSetReader->bufferedMessage.nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != dataSetReader->config.dataSetWriterId)) {
+            ck_abort_msg("PubSub receive. Unknown message received. Will not be processed.");
+        }
+        
         UA_ByteString_clear(&buffer);
     }
 }
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 21974c1d633..75ad8cfc264 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -472,7 +472,7 @@ static void DoTest_1_Connection(
             /* TODO: UA_Server_freezeWriterGroupConfiguration() accepts publisherId of type STRING, but
                 UA_Server_freezeReaderGroupConfiguration() returns an error -> what is correct? */
             ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeWriterGroupConfiguration(server, WGId_Conn1_WG1));
-            ck_assert_int_eq(UA_STATUSCODE_BADINTERNALERROR, UA_Server_freezeReaderGroupConfiguration(server, RGId_Conn1_RG1));
+            ck_assert_int_eq(UA_STATUSCODE_BADNOTSUPPORTED, UA_Server_freezeReaderGroupConfiguration(server, RGId_Conn1_RG1));
 
             /* cleanup and continue with other tests */
             ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeWriterGroupConfiguration(server, WGId_Conn1_WG1));
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index e0349160098..9535aca3f52 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -1838,6 +1838,10 @@ PubSubStateChangeCallback_fast_path (UA_Server *hostServer, UA_NodeId *pubsubCom
     UA_String_clear(&strId);
 
     if (UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) {
+        /* Workaround where we expect either operational or pre-operational */
+        if(state == UA_PUBSUBSTATE_PREOPERATIONAL &&
+           ExpectedCallbackStateChange == UA_PUBSUBSTATE_OPERATIONAL)
+            state = UA_PUBSUBSTATE_OPERATIONAL;
         ck_assert(ExpectedCallbackStateChange == state);
         ck_assert(ExpectedCallbackStatus == reason);
         CallbackCnt++;
@@ -1930,13 +1934,13 @@ START_TEST(Test_fast_path) {
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
 
     /* check that PubSubStateChange callback has been called for the specific DataSetReader */
-    ck_assert_int_eq(1, CallbackCnt);
+    ck_assert_int_eq(2, CallbackCnt);
     CallbackCnt = 0;
 
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
+    ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
 
     /* check that publish/subscribe works -> set some test values */
     ValidatePublishSubscribe_fast_path(10, (UA_UInt32) PublishingInterval_Conn1WG1, 3);
@@ -1946,7 +1950,7 @@ START_TEST(Test_fast_path) {
     ValidatePublishSubscribe_fast_path(44, (UA_UInt32) PublishingInterval_Conn1WG1, 3);
 
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
+    ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
 
     /* there should not be a callback notification for MessageReceiveTimeout */
     ck_assert(CallbackCnt == 0);
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 3f775d34de7..5ad3e37017a 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -93,7 +93,8 @@ recvTestFun(UA_PubSubChannel *channel, void *context, const UA_ByteString *buffe
 }
 
 static void
-receiveSingleMessageRT(UA_PubSubConnection *connection, UA_DataSetReader *dataSetReader) {
+receiveSingleMessageRT(UA_PubSubConnection *connection,
+                       UA_ReaderGroup *rg, UA_DataSetReader *dataSetReader) {
     UA_ByteString buffer;
     if (UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
         ck_abort_msg("Message buffer allocation failed!");
@@ -116,7 +117,7 @@ receiveSingleMessageRT(UA_PubSubConnection *connection, UA_DataSetReader *dataSe
 
     size_t currentPosition = 0;
     /* Decode only the necessary offset and update the networkMessage */
-    if(UA_NetworkMessage_updateBufferedNwMessage(&dataSetReader->bufferedMessage, &buffer, &currentPosition) != UA_STATUSCODE_GOOD) {
+    if(UA_DataSetReader_decodeAndProcessRT(server, rg, connection, &buffer) != UA_STATUSCODE_GOOD) {
         ck_abort_msg("PubSub receive. Unknown field type!");
     }
 
@@ -126,20 +127,6 @@ receiveSingleMessageRT(UA_PubSubConnection *connection, UA_DataSetReader *dataSe
         ck_abort_msg("PubSub receive. Unknown message received. Will not be processed.");
     }
 
-    UA_ReaderGroup *rg =
-        UA_ReaderGroup_findRGbyId(server, dataSetReader->linkedReaderGroup);
-
-    UA_DataSetReader_process(server, rg, dataSetReader,
-                             dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages);
-
-    /* Delete the payload value of every dsf's decoded */
-     UA_DataSetMessage *dsm = dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages;
-     if(dsm->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-         for(UA_UInt16 i = 0; i < dsm->data.keyFrameData.fieldCount; i++) {
-             UA_Variant_clear(&dsm->data.keyFrameData.dataSetFields[i].value);
-         }
-     }
-
     UA_ByteString_clear(&buffer);
 }
 
@@ -321,7 +308,8 @@ START_TEST(SubscribeSingleFieldWithFixedOffsets) {
     ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
 
     UA_DataSetReader *dataSetReader = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
-    receiveSingleMessageRT(connection, dataSetReader);
+    UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
+    receiveSingleMessageRT(connection, readerGroup, dataSetReader);
    /* Read data received by the Subscriber */
     UA_Variant *subscribedNodeData = UA_Variant_new();
     retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 50002), subscribedNodeData);

From 55943c56c764cdf3ff63f85c55c2a91b7faf5357 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 21:48:49 +0100
Subject: [PATCH 0808/1963] fix(pubsub): Use correct pointer for DataValue
 offset

---
 src/pubsub/ua_pubsub_networkmessage.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index c335defc1b5..6941282b7e5 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1731,15 +1731,14 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
                 }
             }
         } else if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-            for (UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++) {
-                if (offsetBuffer) {
+            for(UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++) {
+                if(offsetBuffer) {
                     size_t pos = offsetBuffer->offsetsSize;
                     if(!increaseOffsetArray(offsetBuffer))
                         return 0;
                     offsetBuffer->offsets[pos].offset = size;
                     offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE;
-                    //TODO check value source, change implementation to 'variant'
-                    offsetBuffer->offsets[pos].offsetData.value.value = p->data.keyFrameData.dataSetFields;
+                    offsetBuffer->offsets[pos].offsetData.value.value = &p->data.keyFrameData.dataSetFields[i];
                 }
                 size += UA_calcSizeBinary(&p->data.keyFrameData.dataSetFields[i], &UA_TYPES[UA_TYPES_DATAVALUE]);
             }

From ffc704b8f3e9b53911ee2f8beba85873e0c0a10e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 22:14:03 +0100
Subject: [PATCH 0809/1963] refactor(pubsub): Simplify UA_NetworkMessageOffset

---
 src/pubsub/ua_pubsub_networkmessage.c | 89 ++++++++++++---------------
 src/pubsub/ua_pubsub_networkmessage.h | 10 ++-
 2 files changed, 44 insertions(+), 55 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 6941282b7e5..efa2a5857de 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -63,24 +63,18 @@ UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer){
         switch(nmo->contentType) {
             case UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER:
             case UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER:
-                rv = UA_UInt16_encodeBinary((UA_UInt16 *)nmo->offsetData.value.value->value.data, &bufPos, bufEnd);
-                if(*((UA_UInt16 *)nmo->offsetData.value.value->value.data) < UA_UINT16_MAX){
-                    (*((UA_UInt16 *)nmo->offsetData.value.value->value.data))++;
-                } else {
-                    (*((UA_UInt16 *)nmo->offsetData.value.value->value.data)) = 0;
-                }
+                rv = UA_UInt16_encodeBinary(&nmo->content.sequenceNumber, &bufPos, bufEnd);
+                nmo->content.sequenceNumber++;
                 break;
             case UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE:
-                rv = UA_DataValue_encodeBinary(nmo->offsetData.value.value,
-                                               &bufPos, bufEnd);
+                rv = UA_DataValue_encodeBinary(&nmo->content.value, &bufPos, bufEnd);
                 break;
             case UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT:
-                rv = UA_Variant_encodeBinary(&nmo->offsetData.value.value->value,
-                                             &bufPos, bufEnd);
+                rv = UA_Variant_encodeBinary(&nmo->content.value.value, &bufPos, bufEnd);
                 break;
             case UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW:
-                rv = UA_encodeBinaryInternal(nmo->offsetData.value.value->value.data,
-                                             nmo->offsetData.value.value->value.type,
+                rv = UA_encodeBinaryInternal(nmo->content.value.value.data,
+                                             nmo->content.value.value.type,
                                              &bufPos, &bufEnd, NULL, NULL);
                 break;
             default:
@@ -151,7 +145,7 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
             UA_CHECK_STATUS(rv, return rv);
             break;
         case UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER:
-            rv = UA_UInt16_decodeBinary(src, &offset, &(dsm->header.dataSetMessageSequenceNr));
+            rv = UA_UInt16_decodeBinary(src, &offset, &dsm->header.dataSetMessageSequenceNr);
             UA_CHECK_STATUS(rv, return rv);
             break;
         case UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE:
@@ -1017,11 +1011,10 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
                 if(!increaseOffsetArray(offsetBuffer))
                     return 0;
                 offsetBuffer->offsets[pos].offset = size;
-                offsetBuffer->offsets[pos].offsetData.value.value = UA_DataValue_new();
-                UA_DataValue_init(offsetBuffer->offsets[pos].offsetData.value.value);
-                UA_Variant_setScalarCopy(&offsetBuffer->offsets[pos].offsetData.value.value->value,
-                                     &p->groupHeader.sequenceNumber, &UA_TYPES[UA_TYPES_UINT16]);
-                offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER;
+                offsetBuffer->offsets[pos].content.sequenceNumber =
+                    p->groupHeader.sequenceNumber;
+                offsetBuffer->offsets[pos].contentType =
+                    UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER;
             }
             size += UA_UInt16_calcSizeBinary(&p->groupHeader.sequenceNumber);
         }
@@ -1628,11 +1621,11 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
         if(!increaseOffsetArray(offsetBuffer))
             return 0;
         offsetBuffer->offsets[pos].offset = size;
-        offsetBuffer->offsets[pos].offsetData.value.value = UA_DataValue_new();
-        UA_DataValue_init(offsetBuffer->offsets[pos].offsetData.value.value);
-        UA_Variant_setScalar(&offsetBuffer->offsets[pos].offsetData.value.value->value,
+        UA_DataValue_init(&offsetBuffer->offsets[pos].content.value);
+        UA_Variant_setScalar(&offsetBuffer->offsets[pos].content.value.value,
                              &p->header.fieldEncoding, &UA_TYPES[UA_TYPES_UINT32]);
-        offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING;
+        offsetBuffer->offsets[pos].contentType =
+            UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING;
     }
 
     UA_Byte byte = 0;
@@ -1646,11 +1639,10 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
             if(!increaseOffsetArray(offsetBuffer))
                 return 0;
             offsetBuffer->offsets[pos].offset = size;
-            offsetBuffer->offsets[pos].offsetData.value.value = UA_DataValue_new();
-            UA_DataValue_init(offsetBuffer->offsets[pos].offsetData.value.value);
-            UA_Variant_setScalarCopy(&offsetBuffer->offsets[pos].offsetData.value.value->value,
-                                 &p->header.dataSetMessageSequenceNr, &UA_TYPES[UA_TYPES_UINT16]);
-            offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER;
+            offsetBuffer->offsets[pos].content.sequenceNumber =
+                p->header.dataSetMessageSequenceNr;
+            offsetBuffer->offsets[pos].contentType =
+                UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER;
         }
         size += UA_UInt16_calcSizeBinary(&p->header.dataSetMessageSequenceNr);
     }
@@ -1676,22 +1668,23 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
             size += UA_calcSizeBinary(&p->data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_UINT16]);
         }
         if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-            for (UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++){
-                if (offsetBuffer) {
+            for(UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++){
+                if(offsetBuffer) {
                     size_t pos = offsetBuffer->offsetsSize;
                     if(!increaseOffsetArray(offsetBuffer))
                         return 0;
                     offsetBuffer->offsets[pos].offset = size;
-                    offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT;
-                    //TODO check value source and alloc!
-                    //offsetBuffer->offsets[pos].offsetData.value.value = p->data.keyFrameData.dataSetFields;
-                    offsetBuffer->offsets[pos].offsetData.value.value = UA_DataValue_new();
-                    UA_Variant_setScalar(&offsetBuffer->offsets[pos].offsetData.value.value->value,
+                    offsetBuffer->offsets[pos].contentType =
+                        UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT;
+                    UA_DataValue_init(&offsetBuffer->offsets[pos].content.value);
+                    UA_Variant_setScalar(&offsetBuffer->offsets[pos].content.value.value,
                                          p->data.keyFrameData.dataSetFields[i].value.data,
                                          p->data.keyFrameData.dataSetFields[i].value.type);
-                    offsetBuffer->offsets[pos].offsetData.value.value->value.storageType = UA_VARIANT_DATA_NODELETE;
+                    offsetBuffer->offsets[pos].content.value.value.storageType =
+                        UA_VARIANT_DATA_NODELETE;
                 }
-                size += UA_calcSizeBinary(&p->data.keyFrameData.dataSetFields[i].value, &UA_TYPES[UA_TYPES_VARIANT]);
+                size += UA_calcSizeBinary(&p->data.keyFrameData.dataSetFields[i].value,
+                                          &UA_TYPES[UA_TYPES_VARIANT]);
             }
         } else if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
             for (UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++){
@@ -1701,12 +1694,11 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
                         return 0;
                     offsetBuffer->offsets[pos].offset = size;
                     offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW;
-                    offsetBuffer->offsets[pos].offsetData.value.value = UA_DataValue_new();
-                    //init offset buffer with the latest value
-                    UA_Variant_setScalar(&offsetBuffer->offsets[pos].offsetData.value.value->value,
-                                         p->data.keyFrameData.dataSetFields[i].value.data,
-                                         p->data.keyFrameData.dataSetFields[i].value.type);
-                    offsetBuffer->offsets[pos].offsetData.value.value->value.storageType = UA_VARIANT_DATA_NODELETE;
+                    UA_DataValue_init(&offsetBuffer->offsets[pos].content.value);
+                    offsetBuffer->offsets[pos].content.value.value =
+                        p->data.keyFrameData.dataSetFields[i].value;
+                    offsetBuffer->offsets[pos].content.value.value.storageType =
+                        UA_VARIANT_DATA_NODELETE;
                     //count the memory size of the specific field
                     offsetBuffer->rawMessageLength += p->data.keyFrameData.dataSetFields[i].value.type->memSize;
                 }
@@ -1738,7 +1730,7 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
                         return 0;
                     offsetBuffer->offsets[pos].offset = size;
                     offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE;
-                    offsetBuffer->offsets[pos].offsetData.value.value = &p->data.keyFrameData.dataSetFields[i];
+                    offsetBuffer->offsets[pos].content.value = p->data.keyFrameData.dataSetFields[i];
                 }
                 size += UA_calcSizeBinary(&p->data.keyFrameData.dataSetFields[i], &UA_TYPES[UA_TYPES_DATAVALUE]);
             }
@@ -1818,16 +1810,15 @@ UA_NetworkMessageOffsetBuffer_clear(UA_NetworkMessageOffsetBuffer *nmob) {
     for(size_t i = 0; i < nmob->offsetsSize; i++) {
         UA_NetworkMessageOffset *offset = &nmob->offsets[i];
         if(offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT ||
-           offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW ||
-           offset->contentType == UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER ||
-           offset->contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER) {
-            UA_DataValue_delete(offset->offsetData.value.value);
+           offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE ||
+           offset->contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW) {
+            UA_DataValue_clear(&offset->content.value);
             continue;
         }
 
         if(offset->contentType == UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING) {
-            offset->offsetData.value.value->value.data = NULL;
-            UA_DataValue_delete(offset->offsetData.value.value);
+            offset->content.value.value.data = NULL;
+            UA_DataValue_clear(&offset->content.value);
         }
     }
 
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index d2344201a7f..d9cd7a8b366 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -198,12 +198,10 @@ typedef enum {
 typedef struct {
     UA_NetworkMessageOffsetType contentType;
     union {
-        struct {
-            UA_DataValue *value;
-            size_t valueBinarySize;
-        } value;
-        UA_DateTime *timestamp;
-    } offsetData;
+        UA_UInt16 sequenceNumber;
+        UA_DataValue value;
+        UA_DateTime timestamp;
+    } content;
     size_t offset;
 } UA_NetworkMessageOffset;
 

From 32ab1e58797aa3a3ab3292f6cb21e3f754910140 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 22:17:06 +0100
Subject: [PATCH 0810/1963] refactor(pubsub): Don't recompute end-position in
 UA_NetworkMessage_updateBufferedMessage

---
 src/pubsub/ua_pubsub_networkmessage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index efa2a5857de..318fc460d03 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -56,9 +56,9 @@ static UA_Boolean UA_DataSetMessageHeader_DataSetFlags2Enabled(const UA_DataSetM
 UA_StatusCode
 UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer){
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
+    const UA_Byte *bufEnd = &buffer->buffer.data[buffer->buffer.length];
     for(size_t i = 0; i < buffer->offsetsSize; ++i) {
         UA_NetworkMessageOffset *nmo = &buffer->offsets[i];
-        const UA_Byte *bufEnd = &buffer->buffer.data[buffer->buffer.length];
         UA_Byte *bufPos = &buffer->buffer.data[nmo->offset];
         switch(nmo->contentType) {
             case UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER:

From 118c2028958b4c53acddbd85e8eabd17803fcce1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 18 Mar 2023 22:30:42 +0100
Subject: [PATCH 0811/1963] refactor(pubsub): Cosmetic simplifications in
 ua_pubsub_networkmessage.c

---
 src/pubsub/ua_pubsub_networkmessage.c | 381 +++++++++++---------------
 1 file changed, 164 insertions(+), 217 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 318fc460d03..9e516484144 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -54,7 +54,7 @@ static UA_Boolean UA_NetworkMessage_ExtendedFlags2Enabled(const UA_NetworkMessag
 static UA_Boolean UA_DataSetMessageHeader_DataSetFlags2Enabled(const UA_DataSetMessageHeader* src);
 
 UA_StatusCode
-UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer){
+UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer) {
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
     const UA_Byte *bufEnd = &buffer->buffer.data[buffer->buffer.length];
     for(size_t i = 0; i < buffer->offsetsSize; ++i) {
@@ -87,7 +87,7 @@ UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer){
 
 UA_StatusCode
 UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
-                                          const UA_ByteString *src, size_t *bufferPosition){
+                                          const UA_ByteString *src, size_t *bufferPosition) {
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
     size_t payloadCounter = 0;
     size_t offset = 0;
@@ -104,7 +104,7 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
     UA_DataSetMessageHeader header;
     size_t smallestRawOffset = UA_UINT32_MAX;
 
-    for (size_t i = 0; i < buffer->offsetsSize; ++i) {
+    for(size_t i = 0; i < buffer->offsetsSize; ++i) {
         offset = buffer->offsets[i].offset + *bufferPosition;
         switch (buffer->offsets[i].contentType) {
         case UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING:
@@ -115,16 +115,16 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
         case UA_PUBSUB_OFFSETTYPE_PUBLISHERID:
             switch (buffer->nm->publisherIdType) {
             case UA_PUBLISHERIDTYPE_BYTE:
-                rv = UA_Byte_decodeBinary(src, &offset, &(buffer->nm->publisherId.byte));
+                rv = UA_Byte_decodeBinary(src, &offset, &buffer->nm->publisherId.byte);
                 break;
             case UA_PUBLISHERIDTYPE_UINT16:
-                rv = UA_UInt16_decodeBinary(src, &offset, &(buffer->nm->publisherId.uint16));
+                rv = UA_UInt16_decodeBinary(src, &offset, &buffer->nm->publisherId.uint16);
                 break;
             case UA_PUBLISHERIDTYPE_UINT32:
-                rv = UA_UInt32_decodeBinary(src, &offset, &(buffer->nm->publisherId.uint32));
+                rv = UA_UInt32_decodeBinary(src, &offset, &buffer->nm->publisherId.uint32);
                 break;
             case UA_PUBLISHERIDTYPE_UINT64:
-                rv = UA_UInt64_decodeBinary(src, &offset, &(buffer->nm->publisherId.uint64));
+                rv = UA_UInt64_decodeBinary(src, &offset, &buffer->nm->publisherId.uint64);
                 break;
             default:
                 // UA_PUBLISHERIDTYPE_STRING is not supported because of UA_PUBSUB_RT_FIXED_SIZE
@@ -151,7 +151,7 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
         case UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE:
             UA_DataValue_clear(&dsm->data.keyFrameData.dataSetFields[payloadCounter]);
             rv = UA_DataValue_decodeBinary(src, &offset,
-                                           &(dsm->data.keyFrameData.dataSetFields[payloadCounter]));
+                                           &dsm->data.keyFrameData.dataSetFields[payloadCounter]);
             UA_CHECK_STATUS(rv, return rv);
             payloadCounter++;
             break;
@@ -165,7 +165,7 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
             break;
         case UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW:
             /* We need only the start address of the raw fields */
-            if (smallestRawOffset > offset){
+            if(smallestRawOffset > offset){
                 smallestRawOffset = offset;
                 dsm->data.keyFrameData.rawFields.data = &src->data[offset];
                 dsm->data.keyFrameData.rawFields.length = buffer->rawMessageLength;
@@ -186,11 +186,9 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
     return rv;
 }
 
-static
-UA_StatusCode
+static UA_StatusCode
 UA_NetworkMessageHeader_encodeBinary(const UA_NetworkMessage *src, UA_Byte **bufPos,
                                      const UA_Byte *bufEnd) {
-
     /* UADPVersion + UADP Flags */
     UA_Byte v = src->version;
     if(src->publisherIdEnabled)
@@ -250,23 +248,23 @@ UA_NetworkMessageHeader_encodeBinary(const UA_NetworkMessage *src, UA_Byte **buf
     if(src->publisherIdEnabled) {
         switch (src->publisherIdType) {
         case UA_PUBLISHERIDTYPE_BYTE:
-            rv = UA_Byte_encodeBinary(&(src->publisherId.byte), bufPos, bufEnd);
+            rv = UA_Byte_encodeBinary(&src->publisherId.byte, bufPos, bufEnd);
             break;
 
         case UA_PUBLISHERIDTYPE_UINT16:
-            rv = UA_UInt16_encodeBinary(&(src->publisherId.uint16), bufPos, bufEnd);
+            rv = UA_UInt16_encodeBinary(&src->publisherId.uint16, bufPos, bufEnd);
             break;
 
         case UA_PUBLISHERIDTYPE_UINT32:
-            rv = UA_UInt32_encodeBinary(&(src->publisherId.uint32), bufPos, bufEnd);
+            rv = UA_UInt32_encodeBinary(&src->publisherId.uint32, bufPos, bufEnd);
             break;
 
         case UA_PUBLISHERIDTYPE_UINT64:
-            rv = UA_UInt64_encodeBinary(&(src->publisherId.uint64), bufPos, bufEnd);
+            rv = UA_UInt64_encodeBinary(&src->publisherId.uint64, bufPos, bufEnd);
             break;
 
         case UA_PUBLISHERIDTYPE_STRING:
-            rv = UA_String_encodeBinary(&(src->publisherId.string), bufPos, bufEnd);
+            rv = UA_String_encodeBinary(&src->publisherId.string, bufPos, bufEnd);
             break;
 
         default:
@@ -278,19 +276,16 @@ UA_NetworkMessageHeader_encodeBinary(const UA_NetworkMessage *src, UA_Byte **buf
 
     // DataSetClassId
     if(src->dataSetClassIdEnabled) {
-        rv = UA_Guid_encodeBinary(&(src->dataSetClassId), bufPos, bufEnd);
+        rv = UA_Guid_encodeBinary(&src->dataSetClassId, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
     return UA_STATUSCODE_GOOD;
 }
 
-static
-UA_StatusCode
+static UA_StatusCode
 UA_GroupHeader_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
-                               const UA_Byte *bufEnd) {
-
+                            const UA_Byte *bufEnd) {
     UA_Byte v = 0;
-
     if(src->groupHeader.writerGroupIdEnabled)
         v |= GROUP_HEADER_WRITER_GROUPID_ENABLED;
 
@@ -304,89 +299,71 @@ UA_GroupHeader_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
         v |= GROUP_HEADER_SEQUENCE_NUMBER_ENABLED;
 
     UA_StatusCode rv = UA_Byte_encodeBinary(&v, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
 
-    if(src->groupHeader.writerGroupIdEnabled) {
-        rv = UA_UInt16_encodeBinary(&(src->groupHeader.writerGroupId), bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
-    }
+    if(src->groupHeader.writerGroupIdEnabled)
+        rv |= UA_UInt16_encodeBinary(&src->groupHeader.writerGroupId, bufPos, bufEnd);
 
-    if(src->groupHeader.groupVersionEnabled) {
-        rv = UA_UInt32_encodeBinary(&(src->groupHeader.groupVersion), bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
-    }
+    if(src->groupHeader.groupVersionEnabled)
+        rv |= UA_UInt32_encodeBinary(&src->groupHeader.groupVersion, bufPos, bufEnd);
 
-    if(src->groupHeader.networkMessageNumberEnabled) {
-        rv = UA_UInt16_encodeBinary(&(src->groupHeader.networkMessageNumber), bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
-    }
+    if(src->groupHeader.networkMessageNumberEnabled)
+        rv |= UA_UInt16_encodeBinary(&src->groupHeader.networkMessageNumber, bufPos, bufEnd);
 
-    if(src->groupHeader.sequenceNumberEnabled) {
-        rv = UA_UInt16_encodeBinary(&(src->groupHeader.sequenceNumber), bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
-    }
-    return UA_STATUSCODE_GOOD;
+    if(src->groupHeader.sequenceNumberEnabled)
+        rv |= UA_UInt16_encodeBinary(&src->groupHeader.sequenceNumber, bufPos, bufEnd);
+
+    return rv;
 }
 
-static
-UA_StatusCode
+static UA_StatusCode
 UA_PayloadHeader_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
                                const UA_Byte *bufEnd) {
-
     if(src->networkMessageType != UA_NETWORKMESSAGE_DATASET)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
 
-    UA_StatusCode rv = UA_Byte_encodeBinary(&(src->payloadHeader.dataSetPayloadHeader.count), bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
-
     if(src->payloadHeader.dataSetPayloadHeader.dataSetWriterIds == NULL)
         return UA_STATUSCODE_BADENCODINGERROR;
 
+    UA_Byte count = src->payloadHeader.dataSetPayloadHeader.count;
+
+    UA_StatusCode rv = UA_Byte_encodeBinary(&count, bufPos, bufEnd);
+
     for(UA_Byte i = 0; i < src->payloadHeader.dataSetPayloadHeader.count; i++) {
-        rv = UA_UInt16_encodeBinary(&(src->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i]),
-                                    bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
+        UA_UInt16 dswId = src->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i];
+        rv |= UA_UInt16_encodeBinary(&dswId, bufPos, bufEnd);
     }
-    return UA_STATUSCODE_GOOD;
+
+    return rv;
 }
 
-static
-UA_StatusCode
+static UA_StatusCode
 UA_ExtendedNetworkMessageHeader_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
                                              const UA_Byte *bufEnd) {
-
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
-    // Timestamp
     if(src->timestampEnabled)
-        rv = UA_DateTime_encodeBinary(&(src->timestamp), bufPos, bufEnd);
+        rv |= UA_DateTime_encodeBinary(&src->timestamp, bufPos, bufEnd);
 
-    UA_CHECK_STATUS(rv, return rv);
-    // Picoseconds
     if(src->picosecondsEnabled)
-        rv = UA_UInt16_encodeBinary(&(src->picoseconds), bufPos, bufEnd);
+        rv |= UA_UInt16_encodeBinary(&src->picoseconds, bufPos, bufEnd);
 
-    UA_CHECK_STATUS(rv, return rv);
-    // PromotedFields
     if(src->promotedFieldsEnabled) {
         /* Size (calculate & encode) */
         UA_UInt16 pfSize = 0;
         for(UA_UInt16 i = 0; i < src->promotedFieldsSize; i++)
-            pfSize = (UA_UInt16) (pfSize + UA_Variant_calcSizeBinary(&src->promotedFields[i]));
+            pfSize = (UA_UInt16)(pfSize + UA_Variant_calcSizeBinary(&src->promotedFields[i]));
         rv |= UA_UInt16_encodeBinary(&pfSize, bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
 
-        for (UA_UInt16 i = 0; i < src->promotedFieldsSize; i++)
-            rv |= UA_Variant_encodeBinary(&(src->promotedFields[i]), bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
+        for(UA_UInt16 i = 0; i < src->promotedFieldsSize; i++)
+            rv |= UA_Variant_encodeBinary(&src->promotedFields[i], bufPos, bufEnd);
     }
-    return UA_STATUSCODE_GOOD;
+
+    return rv;
 }
 
-static
-UA_StatusCode
+static UA_StatusCode
 UA_SecurityHeader_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
                                const UA_Byte *bufEnd) {
-    // SecurityFlags
+    /* SecurityFlags */
     UA_Byte v = 0;
     if(src->securityHeader.networkMessageSigned)
         v |= SECURITY_HEADER_NM_SIGNED;
@@ -401,67 +378,57 @@ UA_SecurityHeader_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
         v |= SECURITY_HEADER_FORCE_KEY_RESET;
 
     UA_StatusCode rv = UA_Byte_encodeBinary(&v, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
-    // SecurityTokenId
-    rv = UA_UInt32_encodeBinary(&src->securityHeader.securityTokenId, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
 
-    // NonceLength
+    /* SecurityTokenId */
+    rv |= UA_UInt32_encodeBinary(&src->securityHeader.securityTokenId, bufPos, bufEnd);
+
+    /* NonceLength */
     UA_Byte nonceLength = (UA_Byte)src->securityHeader.messageNonceSize;
-    rv = UA_Byte_encodeBinary(&nonceLength, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
+    rv |= UA_Byte_encodeBinary(&nonceLength, bufPos, bufEnd);
 
-    // MessageNonce
+    /* MessageNonce */
     for(size_t i = 0; i < src->securityHeader.messageNonceSize; i++) {
-        rv = UA_Byte_encodeBinary(&src->securityHeader.messageNonce[i],
-                                  bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
+        rv |= UA_Byte_encodeBinary(&src->securityHeader.messageNonce[i],
+                                   bufPos, bufEnd);
     }
 
-    // SecurityFooterSize
+    /* SecurityFooterSize */
     if(src->securityHeader.securityFooterEnabled) {
-        rv = UA_UInt16_encodeBinary(&src->securityHeader.securityFooterSize,
-                                    bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
+        rv |= UA_UInt16_encodeBinary(&src->securityHeader.securityFooterSize,
+                                     bufPos, bufEnd);
     }
 
-    return UA_STATUSCODE_GOOD;
+    return rv;
 }
 
 UA_StatusCode
 UA_NetworkMessage_encodeHeaders(const UA_NetworkMessage* src, UA_Byte **bufPos,
                                const UA_Byte *bufEnd) {
-
+    /* Message Header */
     UA_StatusCode rv = UA_NetworkMessageHeader_encodeBinary(src, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
-    // Group Header
-    if(src->groupHeaderEnabled) {
-        rv = UA_GroupHeader_encodeBinary(src, bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
-    }
 
-    // Payload Header
-    if(src->payloadHeaderEnabled) {
-        rv = UA_PayloadHeader_encodeBinary(src, bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
-    }
+    /* Group Header */
+    if(src->groupHeaderEnabled)
+        rv |= UA_GroupHeader_encodeBinary(src, bufPos, bufEnd);
 
-    // Extended Network Message Header
-    rv = UA_ExtendedNetworkMessageHeader_encodeBinary(src, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
-    // SecurityHeader
-    if(src->securityEnabled) {
-        rv = UA_SecurityHeader_encodeBinary(src, bufPos, bufEnd);
-        UA_CHECK_STATUS(rv, return rv);
-    }
-    return UA_STATUSCODE_GOOD;
+    /* Payload Header */
+    if(src->payloadHeaderEnabled)
+        rv |= UA_PayloadHeader_encodeBinary(src, bufPos, bufEnd);
+
+    /* Extended Network Message Header */
+    rv |= UA_ExtendedNetworkMessageHeader_encodeBinary(src, bufPos, bufEnd);
+
+    /* SecurityHeader */
+    if(src->securityEnabled)
+        rv |= UA_SecurityHeader_encodeBinary(src, bufPos, bufEnd);
+
+    return rv;
 }
 
 
 UA_StatusCode
 UA_NetworkMessage_encodePayload(const UA_NetworkMessage* src, UA_Byte **bufPos,
-                               const UA_Byte *bufEnd) {
-
+                                const UA_Byte *bufEnd) {
     UA_StatusCode rv;
 
     // Payload
@@ -473,7 +440,7 @@ UA_NetworkMessage_encodePayload(const UA_NetworkMessage* src, UA_Byte **bufPos,
     if(src->payloadHeaderEnabled) {
         count = src->payloadHeader.dataSetPayloadHeader.count;
         if(count > 1) {
-            for (UA_Byte i = 0; i < count; i++) {
+            for(UA_Byte i = 0; i < count; i++) {
                 // initially calculate the size, if not specified
                 UA_UInt16 sz = 0;
                 if((src->payload.dataSetPayload.sizes != NULL) &&
@@ -491,7 +458,7 @@ UA_NetworkMessage_encodePayload(const UA_NetworkMessage* src, UA_Byte **bufPos,
     }
 
     for(UA_Byte i = 0; i < count; i++) {
-        rv = UA_DataSetMessage_encodeBinary(&(src->payload.dataSetPayload.dataSetMessages[i]), bufPos, bufEnd);
+        rv = UA_DataSetMessage_encodeBinary(&src->payload.dataSetPayload.dataSetMessages[i], bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
 
@@ -500,38 +467,28 @@ UA_NetworkMessage_encodePayload(const UA_NetworkMessage* src, UA_Byte **bufPos,
 
 UA_StatusCode
 UA_NetworkMessage_encodeFooters(const UA_NetworkMessage* src, UA_Byte **bufPos,
-                               const UA_Byte *bufEnd) {
-
-    if(src->securityEnabled) {
-        // SecurityFooter
-        if(src->securityHeader.securityFooterEnabled) {
-            for(size_t i = 0; i < src->securityHeader.securityFooterSize; i++) {
-                UA_StatusCode rv = UA_Byte_encodeBinary(&(src->securityFooter.data[i]), bufPos, bufEnd);
-                UA_CHECK_STATUS(rv, return rv);
-            }
+                                const UA_Byte *bufEnd) {
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
+    if(src->securityEnabled &&
+       src->securityHeader.securityFooterEnabled) {
+        for(size_t i = 0; i < src->securityHeader.securityFooterSize; i++) {
+            rv |= UA_Byte_encodeBinary(&src->securityFooter.data[i], bufPos, bufEnd);
         }
     }
-    return UA_STATUSCODE_GOOD;
+    return rv;
 }
 
 UA_StatusCode
 UA_NetworkMessage_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
                                const UA_Byte *bufEnd, UA_Byte **dataToEncryptStart) {
-
     UA_StatusCode rv = UA_NetworkMessage_encodeHeaders(src, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
 
-    if(dataToEncryptStart) {
+    if(dataToEncryptStart)
         *dataToEncryptStart = *bufPos;
-    }
-
-    rv = UA_NetworkMessage_encodePayload(src, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
 
-    rv = UA_NetworkMessage_encodeFooters(src, bufPos, bufEnd);
-    UA_CHECK_STATUS(rv, return rv);
-
-    return UA_STATUSCODE_GOOD;
+    rv |= UA_NetworkMessage_encodePayload(src, bufPos, bufEnd);
+    rv |= UA_NetworkMessage_encodeFooters(src, bufPos, bufEnd);
+    return rv;
 }
 
 UA_StatusCode
@@ -589,23 +546,23 @@ UA_NetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset, U
     if(dst->publisherIdEnabled) {
         switch (dst->publisherIdType) {
             case UA_PUBLISHERIDTYPE_BYTE:
-                rv = UA_Byte_decodeBinary(src, offset, &(dst->publisherId.byte));
+                rv = UA_Byte_decodeBinary(src, offset, &dst->publisherId.byte);
                 break;
 
             case UA_PUBLISHERIDTYPE_UINT16:
-                rv = UA_UInt16_decodeBinary(src, offset, &(dst->publisherId.uint16));
+                rv = UA_UInt16_decodeBinary(src, offset, &dst->publisherId.uint16);
                 break;
 
             case UA_PUBLISHERIDTYPE_UINT32:
-                rv = UA_UInt32_decodeBinary(src, offset, &(dst->publisherId.uint32));
+                rv = UA_UInt32_decodeBinary(src, offset, &dst->publisherId.uint32);
                 break;
 
             case UA_PUBLISHERIDTYPE_UINT64:
-                rv = UA_UInt64_decodeBinary(src, offset, &(dst->publisherId.uint64));
+                rv = UA_UInt64_decodeBinary(src, offset, &dst->publisherId.uint64);
                 break;
 
             case UA_PUBLISHERIDTYPE_STRING:
-                rv = UA_String_decodeBinary(src, offset, &(dst->publisherId.string));
+                rv = UA_String_decodeBinary(src, offset, &dst->publisherId.string);
                 break;
 
             default:
@@ -616,7 +573,7 @@ UA_NetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset, U
     }
 
     if(dst->dataSetClassIdEnabled) {
-        rv = UA_Guid_decodeBinary(src, offset, &(dst->dataSetClassId));
+        rv = UA_Guid_decodeBinary(src, offset, &dst->dataSetClassId);
         UA_CHECK_STATUS(rv, return rv);
     }
     return UA_STATUSCODE_GOOD;
@@ -673,7 +630,7 @@ UA_PayloadHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
     dst->payloadHeader.dataSetPayloadHeader.dataSetWriterIds =
         (UA_UInt16 *)UA_Array_new(dst->payloadHeader.dataSetPayloadHeader.count,
                                   &UA_TYPES[UA_TYPES_UINT16]);
-    for (UA_Byte i = 0; i < dst->payloadHeader.dataSetPayloadHeader.count; i++) {
+    for(UA_Byte i = 0; i < dst->payloadHeader.dataSetPayloadHeader.count; i++) {
         rv = UA_UInt16_decodeBinary(src, offset,
                                     &dst->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i]);
         UA_CHECK_STATUS(rv, return rv);
@@ -688,13 +645,13 @@ UA_ExtendedNetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *o
 
     // Timestamp
     if(dst->timestampEnabled) {
-        rv = UA_DateTime_decodeBinary(src, offset, &(dst->timestamp));
+        rv = UA_DateTime_decodeBinary(src, offset, &dst->timestamp);
         UA_CHECK_STATUS(rv, goto error);
     }
 
     // Picoseconds
     if(dst->picosecondsEnabled) {
-        rv = UA_UInt16_decodeBinary(src, offset, &(dst->picoseconds));
+        rv = UA_UInt16_decodeBinary(src, offset, &dst->picoseconds);
         UA_CHECK_STATUS(rv, goto error);
     }
 
@@ -800,17 +757,17 @@ UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset, UA_Net
     UA_StatusCode rv = UA_NetworkMessageHeader_decodeBinary(src, offset, dst);
     UA_CHECK_STATUS(rv, return rv);
 
-    if (dst->groupHeaderEnabled) {
+    if(dst->groupHeaderEnabled) {
         rv = UA_GroupHeader_decodeBinary(src, offset, dst);
         UA_CHECK_STATUS(rv, return rv);
     }
 
-    if (dst->payloadHeaderEnabled) {
+    if(dst->payloadHeaderEnabled) {
         rv = UA_PayloadHeader_decodeBinary(src, offset, dst);
         UA_CHECK_STATUS(rv, return rv);
     }
 
-    if (dst->securityEnabled) {
+    if(dst->securityEnabled) {
         rv = UA_SecurityHeader_decodeBinary(src, offset, dst);
         UA_CHECK_STATUS(rv, return rv);
     }
@@ -835,8 +792,8 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
         count = dst->payloadHeader.dataSetPayloadHeader.count;
         if(count > 1) {
             dst->payload.dataSetPayload.sizes = (UA_UInt16 *)UA_Array_new(count, &UA_TYPES[UA_TYPES_UINT16]);
-            for (UA_Byte i = 0; i < count; i++) {
-                rv = UA_UInt16_decodeBinary(src, offset, &(dst->payload.dataSetPayload.sizes[i]));
+            for(UA_Byte i = 0; i < count; i++) {
+                rv = UA_UInt16_decodeBinary(src, offset, &dst->payload.dataSetPayload.sizes[i]);
                 UA_CHECK_STATUS(rv, return rv);
             }
         }
@@ -849,12 +806,12 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
 
     if(count == 1)
         rv = UA_DataSetMessage_decodeBinary(src, offset,
-                                            &(dst->payload.dataSetPayload.dataSetMessages[0]),
+                                            &dst->payload.dataSetPayload.dataSetMessages[0],
                                             0, customTypes);
     else {
         for(UA_Byte i = 0; i < count; i++) {
             rv = UA_DataSetMessage_decodeBinary(src, offset,
-                                                &(dst->payload.dataSetPayload.dataSetMessages[i]),
+                                                &dst->payload.dataSetPayload.dataSetMessages[i],
                                                 dst->payload.dataSetPayload.sizes[i], customTypes);
         }
     }
@@ -866,38 +823,32 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
      * TODO: check if making the cleanup to free its own allocated memory is better,
      *       currently the free happens in a parent context
      */
-    // error:
-    // if (dst->payload.dataSetPayload.dataSetMessages) {
-    //     UA_free(dst->payload.dataSetPayload.dataSetMessages);
-    // }
-    // return rv;
 }
 
 UA_StatusCode
-UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst) {
-
-    if (dst->securityEnabled) {
-        // SecurityFooter
-        if(dst->securityHeader.securityFooterEnabled &&
-           (dst->securityHeader.securityFooterSize > 0)) {
-            UA_StatusCode rv = UA_ByteString_allocBuffer(&dst->securityFooter,
-                                           dst->securityHeader.securityFooterSize);
-            UA_CHECK_STATUS(rv, return rv);
+UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset,
+                                UA_NetworkMessage *dst) {
+    if(!dst->securityEnabled)
+        return UA_STATUSCODE_GOOD;
 
-            for(UA_UInt16 i = 0; i < dst->securityHeader.securityFooterSize; i++) {
-                rv = UA_Byte_decodeBinary(src, offset, &(dst->securityFooter.data[i]));
-                UA_CHECK_STATUS(rv, return rv);
-            }
+    // SecurityFooter
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
+    if(dst->securityHeader.securityFooterEnabled &&
+       dst->securityHeader.securityFooterSize > 0) {
+        rv = UA_ByteString_allocBuffer(&dst->securityFooter,
+                                       dst->securityHeader.securityFooterSize);
+        UA_CHECK_STATUS(rv, return rv);
+
+        for(UA_UInt16 i = 0; i < dst->securityHeader.securityFooterSize; i++) {
+            rv |= UA_Byte_decodeBinary(src, offset, &dst->securityFooter.data[i]);
         }
     }
-    return UA_STATUSCODE_GOOD;
+    return rv;
 }
 
 UA_StatusCode
 UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
                                UA_NetworkMessage* dst, const UA_DataTypeArray *customTypes) {
-    UA_StatusCode rv = UA_STATUSCODE_GOOD;
-
     /* headers only need to be decoded when not in encryption mode
      * because headers are already decoded when encryption mode is enabled
      * to check for security parameters and decrypt/verify
@@ -906,13 +857,13 @@ UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
      *       also when encryption is enabled
      */
     // #ifndef UA_ENABLE_PUBSUB_ENCRYPTION
-    // if (*offset == 0) {
+    // if(*offset == 0) {
     //    rv = UA_NetworkMessage_decodeHeaders(src, offset, dst);
     //    UA_CHECK_STATUS(rv, return rv);
     // }
     // #endif
 
-    rv = UA_NetworkMessage_decodeHeaders(src, offset, dst);
+    UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(src, offset, dst);
     UA_CHECK_STATUS(rv, return rv);
 
     rv = UA_NetworkMessage_decodePayload(src, offset, dst, customTypes);
@@ -1054,7 +1005,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
     }
 
     if(p->picosecondsEnabled){
-        if (offsetBuffer) {
+        if(offsetBuffer) {
             size_t pos = offsetBuffer->offsetsSize;
             if(!increaseOffsetArray(offsetBuffer))
                 return 0;
@@ -1066,7 +1017,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
 
     if(p->promotedFieldsEnabled) {
         size += UA_UInt16_calcSizeBinary(&p->promotedFieldsSize);
-        for (UA_UInt16 i = 0; i < p->promotedFieldsSize; i++)
+        for(UA_UInt16 i = 0; i < p->promotedFieldsSize; i++)
             size += UA_Variant_calcSizeBinary(&p->promotedFields[i]);
     }
 
@@ -1084,14 +1035,14 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
         if(p->payloadHeaderEnabled) {
             count = p->payloadHeader.dataSetPayloadHeader.count;
             if(count > 1)
-                size += UA_UInt16_calcSizeBinary(&(p->payload.dataSetPayload.sizes[0])) * count;
+                size += UA_UInt16_calcSizeBinary(&p->payload.dataSetPayload.sizes[0]) * count;
         }
 
-        for (size_t i = 0; i < count; i++) {
-            if (offsetBuffer)
-                UA_DataSetMessage_calcSizeBinary(&(p->payload.dataSetPayload.dataSetMessages[i]), offsetBuffer,
+        for(size_t i = 0; i < count; i++) {
+            if(offsetBuffer)
+                UA_DataSetMessage_calcSizeBinary(&p->payload.dataSetPayload.dataSetMessages[i], offsetBuffer,
                                                  size);
-            size += UA_DataSetMessage_calcSizeBinary(&(p->payload.dataSetPayload.dataSetMessages[i]), NULL, 0);
+            size += UA_DataSetMessage_calcSizeBinary(&p->payload.dataSetPayload.dataSetMessages[i], NULL, 0);
         }
     }
 
@@ -1224,31 +1175,31 @@ UA_DataSetMessageHeader_encodeBinary(const UA_DataSetMessageHeader* src, UA_Byte
 
     // Timestamp
     if(src->timestampEnabled) {
-        rv = UA_DateTime_encodeBinary(&(src->timestamp), bufPos, bufEnd); /* UtcTime */
+        rv = UA_DateTime_encodeBinary(&src->timestamp, bufPos, bufEnd); /* UtcTime */
         UA_CHECK_STATUS(rv, return rv);
     }
 
     // PicoSeconds
     if(src->picoSecondsIncluded) {
-        rv = UA_UInt16_encodeBinary(&(src->picoSeconds), bufPos, bufEnd);
+        rv = UA_UInt16_encodeBinary(&src->picoSeconds, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
 
     // Status
     if(src->statusEnabled) {
-        rv = UA_UInt16_encodeBinary(&(src->status), bufPos, bufEnd);
+        rv = UA_UInt16_encodeBinary(&src->status, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
 
     // ConfigVersionMajorVersion
     if(src->configVersionMajorVersionEnabled) {
-        rv = UA_UInt32_encodeBinary(&(src->configVersionMajorVersion), bufPos, bufEnd);
+        rv = UA_UInt32_encodeBinary(&src->configVersionMajorVersion, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
 
     // ConfigVersionMinorVersion
     if(src->configVersionMinorVersionEnabled) {
-        rv = UA_UInt32_encodeBinary(&(src->configVersionMinorVersion), bufPos, bufEnd);
+        rv = UA_UInt32_encodeBinary(&src->configVersionMinorVersion, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
 
@@ -1430,16 +1381,16 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
 
     if(src->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
         if(src->header.fieldEncoding != UA_FIELDENCODING_RAWDATA) {
-            rv = UA_UInt16_encodeBinary(&(src->data.keyFrameData.fieldCount), bufPos, bufEnd);
+            rv = UA_UInt16_encodeBinary(&src->data.keyFrameData.fieldCount, bufPos, bufEnd);
             UA_CHECK_STATUS(rv, return rv);
         }
         if(src->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-            for (UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
-                rv = UA_Variant_encodeBinary(&(src->data.keyFrameData.dataSetFields[i].value), bufPos, bufEnd);
+            for(UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
+                rv = UA_Variant_encodeBinary(&src->data.keyFrameData.dataSetFields[i].value, bufPos, bufEnd);
                 UA_CHECK_STATUS(rv, return rv);
             }
         } else if(src->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
-            for (UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
+            for(UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
                 if(src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0 &&
                    (src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_STRING ||
                     src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_BYTESTRING)){
@@ -1453,7 +1404,7 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
                     memset(*bufPos, 0, lengthDifference);
                     //move bus pos
                     *bufPos += lengthDifference;
-                } else if (src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0 &&
+                } else if(src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0 &&
                            src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT){
                     //currently not supported!
                     rv = UA_encodeBinaryInternal(src->data.keyFrameData.dataSetFields[i].value.data,
@@ -1467,33 +1418,33 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
                 UA_CHECK_STATUS(rv, return rv);
             }
         } else if(src->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-            for (UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
-                rv = UA_DataValue_encodeBinary(&(src->data.keyFrameData.dataSetFields[i]), bufPos, bufEnd);
+            for(UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
+                rv = UA_DataValue_encodeBinary(&src->data.keyFrameData.dataSetFields[i], bufPos, bufEnd);
                 UA_CHECK_STATUS(rv, return rv);
             }
         }
     } else if(src->header.dataSetMessageType == UA_DATASETMESSAGE_DATADELTAFRAME) {
         // Encode Delta Frame
         // Here the FieldCount is always present
-        rv = UA_UInt16_encodeBinary(&(src->data.keyFrameData.fieldCount), bufPos, bufEnd);
+        rv = UA_UInt16_encodeBinary(&src->data.keyFrameData.fieldCount, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
 
         if(src->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-            for (UA_UInt16 i = 0; i < src->data.deltaFrameData.fieldCount; i++) {
-                rv = UA_UInt16_encodeBinary(&(src->data.deltaFrameData.deltaFrameFields[i].fieldIndex), bufPos, bufEnd);
+            for(UA_UInt16 i = 0; i < src->data.deltaFrameData.fieldCount; i++) {
+                rv = UA_UInt16_encodeBinary(&src->data.deltaFrameData.deltaFrameFields[i].fieldIndex, bufPos, bufEnd);
                 UA_CHECK_STATUS(rv, return rv);
 
-                rv = UA_Variant_encodeBinary(&(src->data.deltaFrameData.deltaFrameFields[i].fieldValue.value), bufPos, bufEnd);
+                rv = UA_Variant_encodeBinary(&src->data.deltaFrameData.deltaFrameFields[i].fieldValue.value, bufPos, bufEnd);
                 UA_CHECK_STATUS(rv, return rv);
             }
         } else if(src->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
             return UA_STATUSCODE_BADNOTIMPLEMENTED;
         } else if(src->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-            for (UA_UInt16 i = 0; i < src->data.deltaFrameData.fieldCount; i++) {
-                rv = UA_UInt16_encodeBinary(&(src->data.deltaFrameData.deltaFrameFields[i].fieldIndex), bufPos, bufEnd);
+            for(UA_UInt16 i = 0; i < src->data.deltaFrameData.fieldCount; i++) {
+                rv = UA_UInt16_encodeBinary(&src->data.deltaFrameData.deltaFrameFields[i].fieldIndex, bufPos, bufEnd);
                 UA_CHECK_STATUS(rv, return rv);
 
-                rv = UA_DataValue_encodeBinary(&(src->data.deltaFrameData.deltaFrameFields[i].fieldValue), bufPos, bufEnd);
+                rv = UA_DataValue_encodeBinary(&src->data.deltaFrameData.deltaFrameFields[i].fieldValue, bufPos, bufEnd);
                 UA_CHECK_STATUS(rv, return rv);
             }
         }
@@ -1520,12 +1471,11 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
 
         switch(dst->header.fieldEncoding) {
             case UA_FIELDENCODING_VARIANT:
-            {
                 rv = UA_UInt16_decodeBinary(src, offset, &dst->data.keyFrameData.fieldCount);
                 UA_CHECK_STATUS(rv, return rv);
                 dst->data.keyFrameData.dataSetFields =
                     (UA_DataValue *)UA_Array_new(dst->data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
-                for (UA_UInt16 i = 0; i < dst->data.keyFrameData.fieldCount; i++) {
+                for(UA_UInt16 i = 0; i < dst->data.keyFrameData.fieldCount; i++) {
                     UA_DataValue_init(&dst->data.keyFrameData.dataSetFields[i]);
                     rv = UA_decodeBinaryInternal(src, offset, &dst->data.keyFrameData.dataSetFields[i].value, &UA_TYPES[UA_TYPES_VARIANT], customTypes);
                     UA_CHECK_STATUS(rv, return rv);
@@ -1533,21 +1483,19 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                     dst->data.keyFrameData.dataSetFields[i].hasValue = true;
                 }
                 break;
-            }
             case UA_FIELDENCODING_DATAVALUE:
-            {
                 rv = UA_UInt16_decodeBinary(src, offset, &dst->data.keyFrameData.fieldCount);
                 UA_CHECK_STATUS(rv, return rv);
                 dst->data.keyFrameData.dataSetFields =
                     (UA_DataValue *)UA_Array_new(dst->data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_DATAVALUE]);
-                for (UA_UInt16 i = 0; i < dst->data.keyFrameData.fieldCount; i++) {
-                    rv = UA_decodeBinaryInternal(src, offset, &dst->data.keyFrameData.dataSetFields[i], &UA_TYPES[UA_TYPES_DATAVALUE], customTypes);
+                for(UA_UInt16 i = 0; i < dst->data.keyFrameData.fieldCount; i++) {
+                    rv = UA_decodeBinaryInternal(src, offset,
+                                                 &dst->data.keyFrameData.dataSetFields[i],
+                                                 &UA_TYPES[UA_TYPES_DATAVALUE], customTypes);
                     UA_CHECK_STATUS(rv, return rv);
                 }
                 break;
-            }
             case UA_FIELDENCODING_RAWDATA:
-            {
                 dst->data.keyFrameData.rawFields.data = &src->data[*offset];
                 dst->data.keyFrameData.rawFields.length = dsmSize;
                 if(dsmSize == 0){
@@ -1560,7 +1508,6 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                     *offset += (dsmSize - (*offset - initialOffset));
                 }
                 break;
-            }
             default:
                 return UA_STATUSCODE_BADINTERNALERROR;
         }
@@ -1571,7 +1518,7 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                 UA_CHECK_STATUS(rv, return rv);
                 size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dst->data.deltaFrameData.fieldCount;
                 dst->data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
-                for (UA_UInt16 i = 0; i < dst->data.deltaFrameData.fieldCount; i++) {
+                for(UA_UInt16 i = 0; i < dst->data.deltaFrameData.fieldCount; i++) {
                     rv = UA_UInt16_decodeBinary(src, offset, &dst->data.deltaFrameData.deltaFrameFields[i].fieldIndex);
                     UA_CHECK_STATUS(rv, return rv);
 
@@ -1588,11 +1535,13 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                 UA_CHECK_STATUS(rv, return rv);
                 size_t memsize = sizeof(UA_DataSetMessage_DeltaFrameField) * dst->data.deltaFrameData.fieldCount;
                 dst->data.deltaFrameData.deltaFrameFields = (UA_DataSetMessage_DeltaFrameField*)UA_malloc(memsize);
-                for (UA_UInt16 i = 0; i < dst->data.deltaFrameData.fieldCount; i++) {
+                for(UA_UInt16 i = 0; i < dst->data.deltaFrameData.fieldCount; i++) {
                     rv = UA_UInt16_decodeBinary(src, offset, &dst->data.deltaFrameData.deltaFrameFields[i].fieldIndex);
                     UA_CHECK_STATUS(rv, return rv);
 
-                    rv = UA_decodeBinaryInternal(src, offset, &(dst->data.deltaFrameData.deltaFrameFields[i].fieldValue), &UA_TYPES[UA_TYPES_DATAVALUE], customTypes);
+                    rv = UA_decodeBinaryInternal(src, offset,
+                                                 &dst->data.deltaFrameData.deltaFrameFields[i].fieldValue,
+                                                 &UA_TYPES[UA_TYPES_DATAVALUE], customTypes);
 
                     UA_CHECK_STATUS(rv, return rv);
                 }
@@ -1616,7 +1565,7 @@ size_t
 UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBuffer *offsetBuffer, size_t currentOffset) {
     size_t size = currentOffset;
 
-    if (offsetBuffer) {
+    if(offsetBuffer) {
         size_t pos = offsetBuffer->offsetsSize;
         if(!increaseOffsetArray(offsetBuffer))
             return 0;
@@ -1634,7 +1583,7 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
         size += UA_Byte_calcSizeBinary(&byte);
 
     if(p->header.dataSetMessageSequenceNrEnabled) {
-        if (offsetBuffer) {
+        if(offsetBuffer) {
             size_t pos = offsetBuffer->offsetsSize;
             if(!increaseOffsetArray(offsetBuffer))
                 return 0;
@@ -1687,8 +1636,8 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
                                           &UA_TYPES[UA_TYPES_VARIANT]);
             }
         } else if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
-            for (UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++){
-                if (offsetBuffer) {
+            for(UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++){
+                if(offsetBuffer) {
                     size_t pos = offsetBuffer->offsetsSize;
                     if(!increaseOffsetArray(offsetBuffer))
                         return 0;
@@ -1741,14 +1690,14 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
             size += UA_calcSizeBinary(&p->data.deltaFrameData.fieldCount, &UA_TYPES[UA_TYPES_UINT16]);
 
         if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-            for (UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
+            for(UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
                 size += UA_calcSizeBinary(&p->data.deltaFrameData.deltaFrameFields[i].fieldIndex, &UA_TYPES[UA_TYPES_UINT16]);
                 size += UA_calcSizeBinary(&p->data.deltaFrameData.deltaFrameFields[i].fieldValue.value, &UA_TYPES[UA_TYPES_VARIANT]);
             }
         } else if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
             // not implemented
         } else if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-            for (UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
+            for(UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
                 size += UA_calcSizeBinary(&p->data.deltaFrameData.deltaFrameFields[i].fieldIndex, &UA_TYPES[UA_TYPES_UINT16]);
                 size += UA_calcSizeBinary(&p->data.deltaFrameData.deltaFrameFields[i].fieldValue, &UA_TYPES[UA_TYPES_DATAVALUE]);
             }
@@ -1827,6 +1776,4 @@ UA_NetworkMessageOffsetBuffer_clear(UA_NetworkMessageOffsetBuffer *nmob) {
     memset(nmob, 0, sizeof(UA_NetworkMessageOffsetBuffer));
 }
 
-
 #endif /* UA_ENABLE_PUBSUB */
-

From 1705467b0355db271eaf936f30fa59ee534f71ea Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Mar 2023 09:50:24 +0100
Subject: [PATCH 0812/1963] refactor(pubsub): Remove unused timestamp member
 from offset buffer structure

---
 src/pubsub/ua_pubsub_networkmessage.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index d9cd7a8b366..098e19632ce 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -200,7 +200,6 @@ typedef struct {
     union {
         UA_UInt16 sequenceNumber;
         UA_DataValue value;
-        UA_DateTime timestamp;
     } content;
     size_t offset;
 } UA_NetworkMessageOffset;

From 09317cda41a84b43466f6d1db20524f2b2549387 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Mar 2023 09:52:39 +0100
Subject: [PATCH 0813/1963] refactor(pubsub): Simplify
 UA_NetworkMessage_updateBufferedNwMessage

---
 src/pubsub/ua_pubsub_networkmessage.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 9e516484144..49b1e680710 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -93,14 +93,15 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
     size_t offset = 0;
 
     /* The offset buffer was not prepared */
-    if(!buffer->nm)
+    UA_NetworkMessage *nm = buffer->nm;
+    if(!nm)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     /* The source string is too short */
     if(src->length < buffer->buffer.length + *bufferPosition)
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    UA_DataSetMessage* dsm = buffer->nm->payload.dataSetPayload.dataSetMessages; //Considering one DSM in RT TODO: Clarify multiple DSM
+    UA_DataSetMessage* dsm = nm->payload.dataSetPayload.dataSetMessages; //Considering one DSM in RT TODO: Clarify multiple DSM
     UA_DataSetMessageHeader header;
     size_t smallestRawOffset = UA_UINT32_MAX;
 
@@ -113,18 +114,18 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
                 return rv;
             break;
         case UA_PUBSUB_OFFSETTYPE_PUBLISHERID:
-            switch (buffer->nm->publisherIdType) {
+            switch (nm->publisherIdType) {
             case UA_PUBLISHERIDTYPE_BYTE:
-                rv = UA_Byte_decodeBinary(src, &offset, &buffer->nm->publisherId.byte);
+                rv = UA_Byte_decodeBinary(src, &offset, &nm->publisherId.byte);
                 break;
             case UA_PUBLISHERIDTYPE_UINT16:
-                rv = UA_UInt16_decodeBinary(src, &offset, &buffer->nm->publisherId.uint16);
+                rv = UA_UInt16_decodeBinary(src, &offset, &nm->publisherId.uint16);
                 break;
             case UA_PUBLISHERIDTYPE_UINT32:
-                rv = UA_UInt32_decodeBinary(src, &offset, &buffer->nm->publisherId.uint32);
+                rv = UA_UInt32_decodeBinary(src, &offset, &nm->publisherId.uint32);
                 break;
             case UA_PUBLISHERIDTYPE_UINT64:
-                rv = UA_UInt64_decodeBinary(src, &offset, &buffer->nm->publisherId.uint64);
+                rv = UA_UInt64_decodeBinary(src, &offset, &nm->publisherId.uint64);
                 break;
             default:
                 // UA_PUBLISHERIDTYPE_STRING is not supported because of UA_PUBSUB_RT_FIXED_SIZE
@@ -132,16 +133,16 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
             }
             break;
         case UA_PUBSUB_OFFSETTYPE_WRITERGROUPID:
-            rv = UA_UInt16_decodeBinary(src, &offset, &buffer->nm->groupHeader.writerGroupId);
+            rv = UA_UInt16_decodeBinary(src, &offset, &nm->groupHeader.writerGroupId);
             UA_CHECK_STATUS(rv, return rv);
             break;
         case UA_PUBSUB_OFFSETTYPE_DATASETWRITERID:
             rv = UA_UInt16_decodeBinary(src, &offset,
-                                        &buffer->nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[0]); /* TODO */
+                                        &nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[0]); /* TODO */
             UA_CHECK_STATUS(rv, return rv);
             break;
         case UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER:
-            rv = UA_UInt16_decodeBinary(src, &offset, &buffer->nm->groupHeader.sequenceNumber);
+            rv = UA_UInt16_decodeBinary(src, &offset, &nm->groupHeader.sequenceNumber);
             UA_CHECK_STATUS(rv, return rv);
             break;
         case UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER:

From 6476c96eb6453868f396c3c6ba162bbafa78003c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Mar 2023 09:55:31 +0100
Subject: [PATCH 0814/1963] refactor(pubsub): Simplify
 UA_GroupHeader_decodeBinary

---
 src/pubsub/ua_pubsub_networkmessage.c | 35 ++++++++++-----------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 49b1e680710..ccbf1989131 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -585,37 +585,28 @@ UA_GroupHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
                          UA_NetworkMessage* dst) {
     UA_Byte decoded = 0;
     UA_StatusCode rv = UA_Byte_decodeBinary(src, offset, &decoded);
-    UA_CHECK_STATUS(rv, return rv);
 
-    if((decoded & GROUP_HEADER_WRITER_GROUPID_ENABLED) != 0)
+    if((decoded & GROUP_HEADER_WRITER_GROUPID_ENABLED) != 0) {
         dst->groupHeader.writerGroupIdEnabled = true;
+        rv |= UA_UInt16_decodeBinary(src, offset, &dst->groupHeader.writerGroupId);
+    }
 
-    if((decoded & GROUP_HEADER_GROUP_VERSION_ENABLED) != 0)
+    if((decoded & GROUP_HEADER_GROUP_VERSION_ENABLED) != 0) {
         dst->groupHeader.groupVersionEnabled = true;
+        rv |= UA_UInt32_decodeBinary(src, offset, &dst->groupHeader.groupVersion);
+    }
 
-    if((decoded & GROUP_HEADER_NM_NUMBER_ENABLED) != 0)
+    if((decoded & GROUP_HEADER_NM_NUMBER_ENABLED) != 0) {
         dst->groupHeader.networkMessageNumberEnabled = true;
+        rv |= UA_UInt16_decodeBinary(src, offset, &dst->groupHeader.networkMessageNumber);
+    }
 
-    if((decoded & GROUP_HEADER_SEQUENCE_NUMBER_ENABLED) != 0)
+    if((decoded & GROUP_HEADER_SEQUENCE_NUMBER_ENABLED) != 0) {
         dst->groupHeader.sequenceNumberEnabled = true;
-
-    if(dst->groupHeader.writerGroupIdEnabled) {
-        rv = UA_UInt16_decodeBinary(src, offset, &dst->groupHeader.writerGroupId);
-        UA_CHECK_STATUS(rv, return rv);
-    }
-    if(dst->groupHeader.groupVersionEnabled) {
-        rv = UA_UInt32_decodeBinary(src, offset, &dst->groupHeader.groupVersion);
-        UA_CHECK_STATUS(rv, return rv);
+        rv |= UA_UInt16_decodeBinary(src, offset, &dst->groupHeader.sequenceNumber);
     }
-    if(dst->groupHeader.networkMessageNumberEnabled) {
-        rv = UA_UInt16_decodeBinary(src, offset, &dst->groupHeader.networkMessageNumber);
-        UA_CHECK_STATUS(rv, return rv);
-    }
-    if(dst->groupHeader.sequenceNumberEnabled) {
-        rv = UA_UInt16_decodeBinary(src, offset, &dst->groupHeader.sequenceNumber);
-        UA_CHECK_STATUS(rv, return rv);
-    }
-    return UA_STATUSCODE_GOOD;
+
+    return rv;
 }
 
 static UA_StatusCode

From 918989342ea57308395402cd528f4bf3da422e0a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Mar 2023 10:07:49 +0100
Subject: [PATCH 0815/1963] refactor(pubsub): Remove unused
 'RTsubscriberEnabled'

---
 src/pubsub/ua_pubsub_networkmessage.h | 2 --
 src/pubsub/ua_pubsub_reader.c         | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 098e19632ce..385b4be4e65 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -208,8 +208,6 @@ typedef struct {
     UA_ByteString buffer; /* The precomputed message buffer */
     UA_NetworkMessageOffset *offsets; /* Offsets for changes in the message buffer */
     size_t offsetsSize;
-    UA_Boolean RTsubscriberEnabled; /* Addtional offsets computation like
-                                     * publisherId, WGId if this bool enabled */
     UA_NetworkMessage *nm; /* The precomputed NetworkMessage for subscriber */
     size_t rawMessageLength;
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index e6f21ca25d8..e43d51bd152 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1313,7 +1313,6 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
 
     /* Set the offset buffer in the reader */
     reader->bufferedMessage.nm = nm;
-    reader->bufferedMessage.RTsubscriberEnabled = true;
 
     /* If pre-operational, set to operational after the first message was
      * processed */

From a59a78fb24d21e7ed63942a4803ca33bacde6ced Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Mar 2023 10:44:01 +0100
Subject: [PATCH 0816/1963] refactor(pubsub): Remove redundant configuration
 freeze information

---
 src/pubsub/ua_pubsub.h                        |  2 --
 src/pubsub/ua_pubsub_dataset.c                |  4 ++--
 src/pubsub/ua_pubsub_manager.c                |  2 +-
 src/pubsub/ua_pubsub_readergroup.c            |  6 +----
 src/pubsub/ua_pubsub_writer.c                 |  2 +-
 src/pubsub/ua_pubsub_writergroup.c            | 12 +++-------
 tests/pubsub/check_pubsub_config_freeze.c     | 24 +++++++++----------
 .../check_pubsub_subscribe_config_freeze.c    | 14 +++++------
 8 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 0ff3e368ad7..6280c0538af 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -55,7 +55,6 @@ typedef struct UA_PublishedDataSet {
     UA_UInt16 promotedFieldsCount;
     UA_UInt16 configurationFreezeCounter;
     TAILQ_ENTRY(UA_PublishedDataSet) listEntry;
-    UA_Boolean configurationFrozen;
 } UA_PublishedDataSet;
 
 UA_StatusCode
@@ -142,7 +141,6 @@ typedef struct UA_PubSubConnection {
     TAILQ_ENTRY(UA_PubSubConnection) listEntry;
     UA_UInt16 configurationFreezeCounter;
     UA_Boolean isRegistered; /* Subscriber requires connection channel regist */
-    UA_Boolean configurationFrozen;
 } UA_PubSubConnection;
 
 UA_StatusCode
diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 7d0900cba17..095a1f213e5 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -318,7 +318,7 @@ UA_DataSetField_create(UA_Server *server, const UA_NodeId publishedDataSet,
         return result;
     }
 
-    if(currDS->configurationFrozen) {
+    if(currDS->configurationFreezeCounter > 0) {
         UA_LOG_WARNING_DATASET(&server->config.logger, currDS,
                                "Adding DataSetField failed: PublishedDataSet is frozen");
         result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -443,7 +443,7 @@ removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
         return result;
     }
 
-    if(pds->configurationFrozen) {
+    if(pds->configurationFreezeCounter > 0) {
         UA_LOG_WARNING_DATASET(&server->config.logger, pds,
                                "Remove DataSetField failed: PublishedDataSet is frozen");
         result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 741b02d7d4a..c95f77ec254 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -400,7 +400,7 @@ removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
     if(!publishedDataSet)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    if(publishedDataSet->configurationFrozen){
+    if(publishedDataSet->configurationFreezeCounter > 0) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Remove PublishedDataSet failed. PublishedDataSet is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 599cf32800c..ae1a163a897 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -104,7 +104,7 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
-    if(currentConnectionContext->configurationFrozen) {
+    if(currentConnectionContext->configurationFreezeCounter > 0) {
         UA_LOG_WARNING_CONNECTION(&server->config.logger, currentConnectionContext,
                                   "Adding ReaderGroup failed. "
                                   "Connection configuration is frozen.");
@@ -580,7 +580,6 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
     /* PubSubConnection freezeCounter++ */
     UA_PubSubConnection *pubSubConnection = rg->linkedConnection;
     pubSubConnection->configurationFreezeCounter++;
-    pubSubConnection->configurationFrozen = true;
 
     /* ReaderGroup freeze */
     /* TODO: Clarify on the freeze functionality in multiple DSR, multiple
@@ -695,9 +694,6 @@ UA_ReaderGroup_unfreezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
     /* PubSubConnection freezeCounter-- */
     UA_PubSubConnection *pubSubConnection = rg->linkedConnection;
     pubSubConnection->configurationFreezeCounter--;
-    if(pubSubConnection->configurationFreezeCounter == 0){
-        pubSubConnection->configurationFrozen = false;
-    }
 
     /* ReaderGroup unfreeze */
     rg->configurationFrozen = false;
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 37ab83178ef..50592c805d3 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -237,7 +237,7 @@ UA_DataSetWriter_create(UA_Server *server,
         if(!currentDataSetContext)
             return UA_STATUSCODE_BADNOTFOUND;
 
-        if(currentDataSetContext->configurationFrozen) {
+        if(currentDataSetContext->configurationFreezeCounter > 0) {
             UA_LOG_WARNING_DATASET(&server->config.logger, currentDataSetContext,
                                    "Adding DataSetWriter failed: PublishedDataSet is frozen");
             return UA_STATUSCODE_BADCONFIGURATIONERROR;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 46747505524..46e0668d224 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -57,7 +57,7 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
     if(!currentConnectionContext)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    if(currentConnectionContext->configurationFrozen){
+    if(currentConnectionContext->configurationFreezeCounter > 0) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                        "Adding WriterGroup failed. PubSubConnection is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -210,7 +210,7 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     if(!connection)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    if(connection->configurationFrozen) {
+    if(connection->configurationFreezeCounter > 0) {
         UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
                                    "Deleting the WriterGroup failed. "
                                    "PubSubConnection is frozen.");
@@ -259,7 +259,6 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     /* PubSubConnection freezeCounter++ */
     UA_PubSubConnection *pubSubConnection =  wg->linkedConnection;
     pubSubConnection->configurationFreezeCounter++;
-    pubSubConnection->configurationFrozen = true;
 
     /* WriterGroup freeze */
     wg->configurationFrozen = true;
@@ -274,7 +273,6 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
         /* Skip the below for heartbeat writers (without an associated PDS) */
         if(publishedDataSet) {
             publishedDataSet->configurationFreezeCounter++;
-            publishedDataSet->configurationFrozen = true;
             /* DataSetFields freeze */
             UA_DataSetField *dataSetField;
             TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry) {
@@ -480,9 +478,6 @@ UA_WriterGroup_unfreezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
 
     UA_PubSubConnection *pubSubConnection =  wg->linkedConnection;
     pubSubConnection->configurationFreezeCounter--;
-    if(pubSubConnection->configurationFreezeCounter == 0){
-        pubSubConnection->configurationFrozen = false;
-    }
 
     //DataSetWriter unfreeze
     UA_DataSetWriter *dataSetWriter;
@@ -492,8 +487,7 @@ UA_WriterGroup_unfreezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
         //PublishedDataSet freezeCounter--
         if(publishedDataSet != NULL){ /* This means the DSW is a heartbeat configuration */
             publishedDataSet->configurationFreezeCounter--;
-            if(publishedDataSet->configurationFreezeCounter == 0){
-                publishedDataSet->configurationFrozen = false;
+            if(publishedDataSet->configurationFreezeCounter == 0) {
                 UA_DataSetField *dataSetField;
                 TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry){
                     dataSetField->configurationFrozen = false;
diff --git a/tests/pubsub/check_pubsub_config_freeze.c b/tests/pubsub/check_pubsub_config_freeze.c
index d6a5c136616..cd986cdf0b3 100644
--- a/tests/pubsub/check_pubsub_config_freeze.c
+++ b/tests/pubsub/check_pubsub_config_freeze.c
@@ -103,9 +103,9 @@ START_TEST(CreateAndLockConfiguration) {
         UA_Server_freezeWriterGroupConfiguration(server, writerGroup1);
     ck_assert(dataSetWriter->configurationFrozen == UA_TRUE);
     ck_assert(dataSetField->configurationFrozen == UA_TRUE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_TRUE);
+    ck_assert(pubSubConnection->configurationFreezeCounter > 0);
     UA_PublishedDataSet *publishedDataSet = UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
-    ck_assert(publishedDataSet->configurationFrozen == UA_TRUE);
+    ck_assert(publishedDataSet->configurationFreezeCounter > 0);
     UA_DataSetField *dsf;
     TAILQ_FOREACH(dsf ,&publishedDataSet->fields , listEntry){
         ck_assert(dsf->configurationFrozen == UA_TRUE);
@@ -170,9 +170,9 @@ START_TEST(CreateAndLockConfigurationWithExternalAPI) {
         UA_Server_freezeWriterGroupConfiguration(server, writerGroup1);
         ck_assert(dataSetWriter->configurationFrozen == UA_TRUE);
         ck_assert(dataSetField->configurationFrozen == UA_TRUE);
-        ck_assert(pubSubConnection->configurationFrozen == UA_TRUE);
+        ck_assert(pubSubConnection->configurationFreezeCounter > 0);
         UA_PublishedDataSet *publishedDataSet = UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
-        ck_assert(publishedDataSet->configurationFrozen == UA_TRUE);
+        ck_assert(publishedDataSet->configurationFreezeCounter > 0);
         UA_DataSetField *dsf;
         TAILQ_FOREACH(dsf ,&publishedDataSet->fields , listEntry){
             ck_assert(dsf->configurationFrozen == UA_TRUE);
@@ -236,23 +236,23 @@ START_TEST(CreateAndReleaseMultiplePDSLocks) {
     //freeze configuratoin of both WG
     ck_assert(writerGroup_1->configurationFrozen == UA_FALSE);
     ck_assert(writerGroup_2->configurationFrozen == UA_FALSE);
-    ck_assert(publishedDataSet->configurationFrozen == UA_FALSE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_FALSE);
+    ck_assert(publishedDataSet->configurationFreezeCounter == 0);
+    ck_assert(pubSubConnection->configurationFreezeCounter == 0);
         UA_Server_freezeWriterGroupConfiguration(server, writerGroup1);
         UA_Server_freezeWriterGroupConfiguration(server, writerGroup2);
     ck_assert(writerGroup_1->configurationFrozen == UA_TRUE);
     ck_assert(writerGroup_2->configurationFrozen == UA_TRUE);
-    ck_assert(publishedDataSet->configurationFrozen == UA_TRUE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_TRUE);
+    ck_assert(publishedDataSet->configurationFreezeCounter > 0);
+    ck_assert(pubSubConnection->configurationFreezeCounter > 0);
     //unlock one tree, get sure pds still locked
         UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
     ck_assert(writerGroup_1->configurationFrozen == UA_FALSE);
-    ck_assert(publishedDataSet->configurationFrozen == UA_TRUE);
+    ck_assert(publishedDataSet->configurationFreezeCounter > 0);
     ck_assert(dataSetField->configurationFrozen == UA_TRUE);
-        UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup2);
-    ck_assert(publishedDataSet->configurationFrozen == UA_FALSE);
+    UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup2);
+    ck_assert(publishedDataSet->configurationFreezeCounter == 0);
     ck_assert(dataSetField->configurationFrozen == UA_FALSE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_FALSE);
+    ck_assert(pubSubConnection->configurationFreezeCounter == 0);
 
     } END_TEST
 
diff --git a/tests/pubsub/check_pubsub_subscribe_config_freeze.c b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
index 1eab74dbc02..e19e599daea 100644
--- a/tests/pubsub/check_pubsub_subscribe_config_freeze.c
+++ b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
@@ -64,21 +64,21 @@ START_TEST(CreateAndLockConfiguration) {
     //get internal PubSubConnection Pointer
     UA_PubSubConnection *pubSubConnection = UA_PubSubConnection_findConnectionbyId(server, connection1);
     ck_assert(pubSubConnection != NULL);
-    ck_assert(pubSubConnection->configurationFrozen == UA_FALSE);
+    ck_assert(pubSubConnection->configurationFreezeCounter == 0);
 
     //Lock the reader group and the child pubsub entities
     UA_Server_freezeReaderGroupConfiguration(server, readerGroup1);
 
     ck_assert(readerGroup->configurationFrozen == UA_TRUE);
     ck_assert(dataSetReader->configurationFrozen == UA_TRUE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_TRUE);
+    ck_assert(pubSubConnection->configurationFreezeCounter > 0);
 
     //set state to disabled and implicit unlock the configuration
     UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup1);
 
     ck_assert(readerGroup->configurationFrozen == UA_FALSE);
     ck_assert(dataSetReader->configurationFrozen == UA_FALSE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_FALSE);
+    ck_assert(pubSubConnection->configurationFreezeCounter == 0);
 } END_TEST
 
 START_TEST(CreateAndReleaseMultipleLocks) {
@@ -120,26 +120,26 @@ START_TEST(CreateAndReleaseMultipleLocks) {
     //freeze configuration of both RG
     ck_assert(readerGroup_1->configurationFrozen == UA_FALSE);
     ck_assert(readerGroup_2->configurationFrozen == UA_FALSE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_FALSE);
+    ck_assert(pubSubConnection->configurationFreezeCounter == 0);
 
     UA_Server_freezeReaderGroupConfiguration(server, readerGroup1);
     UA_Server_freezeReaderGroupConfiguration(server, readerGroup2);
 
     ck_assert(readerGroup_1->configurationFrozen == UA_TRUE);
     ck_assert(readerGroup_2->configurationFrozen == UA_TRUE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_TRUE);
+    ck_assert(pubSubConnection->configurationFreezeCounter > 0);
 
     //unlock one tree, get sure connection still locked
     UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup1);
     ck_assert(readerGroup_1->configurationFrozen == UA_FALSE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_TRUE);
+    ck_assert(pubSubConnection->configurationFreezeCounter > 0);
     ck_assert(dataSetReader_1->configurationFrozen == UA_FALSE);
     ck_assert(dataSetReader_2->configurationFrozen == UA_FALSE);
     ck_assert(dataSetReader_3->configurationFrozen == UA_TRUE);
 
     UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup2);
     ck_assert(readerGroup_2->configurationFrozen == UA_FALSE);
-    ck_assert(pubSubConnection->configurationFrozen == UA_FALSE);
+    ck_assert(pubSubConnection->configurationFreezeCounter == 0);
     ck_assert(dataSetReader_3->configurationFrozen == UA_FALSE);
     } END_TEST
 

From ea6fa434af3cc48d061e789a4e46ce32189f137b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 19 Mar 2023 11:08:54 +0100
Subject: [PATCH 0817/1963] fix(pubsub): Fix a potential NULL dereference in
 UA_ReaderGroup_removeSubscribeCallback

---
 src/pubsub/ua_pubsub_readergroup.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index ae1a163a897..8aca833f4da 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -791,10 +791,12 @@ UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGro
 }
 
 void
-UA_ReaderGroup_removeSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup) {
-    UA_EventLoop *el = readerGroup->linkedConnection->config.eventLoop;
-    if(!el)
-        el = server->config.eventLoop;
+UA_ReaderGroup_removeSubscribeCallback(UA_Server *server,
+                                       UA_ReaderGroup *readerGroup) {
+    UA_PubSubConnection *connection = readerGroup->linkedConnection;
+    UA_EventLoop *el = server->config.eventLoop;
+    if(connection && connection->config.eventLoop)
+        el = connection->config.eventLoop;
     if(readerGroup->subscribeCallbackId != 0)
         el->removeCyclicCallback(el, readerGroup->subscribeCallbackId);
     readerGroup->subscribeCallbackId = 0;

From c03fe9d5b7474c17e7d49596e348ca6fa45e0b87 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 18:53:32 +0100
Subject: [PATCH 0818/1963] refactor(pubsub): Pull out writer
 freezing/unfreezing in dedicated methods

---
 src/pubsub/ua_pubsub.h             |  10 +++
 src/pubsub/ua_pubsub_writer.c      | 111 ++++++++++++++++++++++++
 src/pubsub/ua_pubsub_writergroup.c | 133 ++++-------------------------
 3 files changed, 138 insertions(+), 116 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 6280c0538af..fa7d540ba3b 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -250,6 +250,16 @@ UA_StatusCode
 UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
                         UA_DataSetWriter *dataSetWriter);
 
+UA_StatusCode
+UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
+                                UA_DataSetMessage *dsm);
+
+void
+UA_DataSetWriter_freezeConfiguration(UA_Server *server, UA_DataSetWriter *dsw);
+
+void
+UA_DataSetWriter_unfreezeConfiguration(UA_Server *server, UA_DataSetWriter *dsw);
+
 UA_StatusCode
 UA_DataSetWriter_create(UA_Server *server,
                         const UA_NodeId writerGroup, const UA_NodeId dataSet,
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 50592c805d3..572e5341c42 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -344,6 +344,117 @@ UA_Server_addDataSetWriter(UA_Server *server,
     return res;
 }
 
+void
+UA_DataSetWriter_freezeConfiguration(UA_Server *server,
+                                     UA_DataSetWriter *dsw) {
+    UA_PublishedDataSet *pds =
+        UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
+    if(pds) { /* Skip for heartbeat writers */
+        pds->configurationFreezeCounter++;
+        UA_DataSetField *dsf;
+        TAILQ_FOREACH(dsf, &pds->fields, listEntry) {
+            dsf->configurationFrozen = true;
+        }
+    }
+    dsw->configurationFrozen = true;
+}
+
+void
+UA_DataSetWriter_unfreezeConfiguration(UA_Server *server,
+                                       UA_DataSetWriter *dsw) {
+    UA_PublishedDataSet *pds =
+        UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
+    if(pds) { /* Skip for heartbeat writers */
+        pds->configurationFreezeCounter--;
+        if(pds->configurationFreezeCounter == 0) {
+            UA_DataSetField *dsf;
+            TAILQ_FOREACH(dsf, &pds->fields, listEntry){
+                dsf->configurationFrozen = false;
+            }
+        }
+        dsw->configurationFrozen = false;
+    }
+}
+
+UA_StatusCode
+UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
+                                UA_DataSetMessage *dsm) {
+    /* Find the dataset */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    UA_PublishedDataSet *pds =
+        UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
+    if(!pds) {
+        if(!UA_NodeId_isNull(&dsw->connectedDataSet)) {
+            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                  "PubSub-RT configuration fail: "
+                                  "PublishedDataSet not found");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+
+        res = UA_DataSetWriter_generateDataSetMessage(server, dsm, dsw);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                  "PubSub-RT configuration fail: "
+                                  "Heartbeat DataSetMessage creation failed");
+        }
+        return res;
+    }
+
+    if(pds->promotedFieldsCount > 0) {
+        UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                              "PubSub-RT configuration fail: "
+                              "PDS contains promoted fields");
+        return UA_STATUSCODE_BADNOTSUPPORTED;
+    }
+
+    /* Test the DataSetFields */
+    UA_DataSetField *dsf;
+    TAILQ_FOREACH(dsf, &pds->fields, listEntry) {
+        UA_NodeId *publishedVariable =
+            &dsf->config.field.variable.publishParameters.publishedVariable;
+        const UA_VariableNode *rtNode = (const UA_VariableNode*)
+            UA_NODESTORE_GET(server, publishedVariable);
+        if(rtNode != NULL &&
+           rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
+            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                  "PubSub-RT configuration fail: "
+                                  "PDS contains field without external data source");
+            UA_NODESTORE_RELEASE(server, (const UA_Node *)rtNode);
+            return UA_STATUSCODE_BADNOTSUPPORTED;
+        }
+
+        UA_NODESTORE_RELEASE(server, (const UA_Node *)rtNode);
+
+        if((UA_NodeId_equal(&dsf->fieldMetaData.dataType,
+                            &UA_TYPES[UA_TYPES_STRING].typeId) ||
+            UA_NodeId_equal(&dsf->fieldMetaData.dataType,
+                            &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
+           dsf->fieldMetaData.maxStringLength == 0) {
+            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                  "PubSub-RT configuration fail: "
+                                  "PDS contains String/ByteString with dynamic length");
+            return UA_STATUSCODE_BADNOTSUPPORTED;
+        } else if(!UA_DataType_isNumeric(UA_findDataType(&dsf->fieldMetaData.dataType)) &&
+                  !UA_NodeId_equal(&dsf->fieldMetaData.dataType,
+                                   &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
+            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                                  "PubSub-RT configuration fail: "
+                                  "PDS contains variable with dynamic size");
+            return UA_STATUSCODE_BADNOTSUPPORTED;
+        }
+    }
+
+    /* Generate the DSM */
+    res = UA_DataSetWriter_generateDataSetMessage(server, dsm, dsw);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+                              "PubSub-RT configuration fail: "
+                              "DataSetMessage buffering failed");
+    }
+
+    return res;
+}
+
 UA_StatusCode
 UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
                         UA_DataSetWriter *dataSetWriter) {
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 46e0668d224..27c7c4dc445 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -264,28 +264,16 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     wg->configurationFrozen = true;
 
     /* DataSetWriter freeze */
-    UA_DataSetWriter *dataSetWriter;
-    LIST_FOREACH(dataSetWriter, &wg->writers, listEntry) {
-        dataSetWriter->configurationFrozen = true;
-        /* PublishedDataSet freezeCounter++ */
-        UA_PublishedDataSet *publishedDataSet =
-            UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
-        /* Skip the below for heartbeat writers (without an associated PDS) */
-        if(publishedDataSet) {
-            publishedDataSet->configurationFreezeCounter++;
-            /* DataSetFields freeze */
-            UA_DataSetField *dataSetField;
-            TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry) {
-                dataSetField->configurationFrozen = true;
-            }
-        }
+    UA_DataSetWriter *dsw;
+    LIST_FOREACH(dsw, &wg->writers, listEntry) {
+        UA_DataSetWriter_freezeConfiguration(server, dsw);
     }
 
+    /* Enabling RT? */
     if(wg->config.rtLevel != UA_PUBSUB_RT_FIXED_SIZE)
         return UA_STATUSCODE_GOOD;
 
-    /* Freeze the RT writer configuration */
-    size_t dsmCount = 0;
+    /* Check if RT is possible */
     if(wg->config.encodingMimeType != UA_PUBSUB_ENCODING_UADP) {
         UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
                                    "PubSub-RT configuration fail: Non-RT capable encoding.");
@@ -295,87 +283,20 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     //TODO Clarify: should we only allow = maxEncapsulatedDataSetMessageCount == 1 with RT?
     //TODO Clarify: Behaviour if the finale size is more than MTU
 
-    /* Generate data set messages  */
+    /* Prepare the DataSetMessages */
     UA_STACKARRAY(UA_UInt16, dsWriterIds, wg->writersCount);
     UA_STACKARRAY(UA_DataSetMessage, dsmStore, wg->writersCount);
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    UA_DataSetWriter *dsw;
+    size_t dsmCount = 0;
     LIST_FOREACH(dsw, &wg->writers, listEntry) {
-        /* Find the dataset */
-        UA_PublishedDataSet *pds =
-            UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
-        if(!pds) {
-            if(UA_NodeId_isNull(&dsw->connectedDataSet)) {
-                UA_StatusCode res1 =
-                        UA_DataSetWriter_generateDataSetMessage(server,
-                                &dsmStore[dsmCount], dsw);
-                if(res1 != UA_STATUSCODE_GOOD) {
-                    UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
-                                          "PubSub-RT configuration fail: "
-                                          "Heartbeat DataSetMessage creation failed");
-                    continue;
-                }
-                dsWriterIds[dsmCount] = dsw->config.dataSetWriterId;
-                dsmCount++;
-                continue;
-            }
-
-            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
-                                  "PubSub-RT configuration fail: "
-                                  "PublishedDataSet not found");
-            continue;
-        }
-
-        if(pds) {
-            if(pds->promotedFieldsCount > 0) {
-                UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
-                                      "PubSub-RT configuration fail: "
-                                      "PDS contains promoted fields");
-                return UA_STATUSCODE_BADNOTSUPPORTED;
-            }
-
-            /* Test the DataSetFields */
-            UA_DataSetField *dsf;
-            TAILQ_FOREACH(dsf, &pds->fields, listEntry) {
-                const UA_VariableNode *rtNode = (const UA_VariableNode *)
-                    UA_NODESTORE_GET(server, &dsf->config.field.variable.publishParameters.publishedVariable);
-                if(rtNode != NULL && rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
-                    UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
-                                          "PubSub-RT configuration fail: "
-                                          "PDS contains field without external data source");
-                    UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
-                    return UA_STATUSCODE_BADNOTSUPPORTED;
-                }
-                UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
-                if((UA_NodeId_equal(&dsf->fieldMetaData.dataType, &UA_TYPES[UA_TYPES_STRING].typeId) ||
-                    UA_NodeId_equal(&dsf->fieldMetaData.dataType,
-                                    &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
-                dsf->fieldMetaData.maxStringLength == 0) {
-                    UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
-                                          "PubSub-RT configuration fail: "
-                                          "PDS contains String/ByteString with dynamic length");
-                    return UA_STATUSCODE_BADNOTSUPPORTED;
-                } else if(!UA_DataType_isNumeric(UA_findDataType(&dsf->fieldMetaData.dataType)) &&
-                          !UA_NodeId_equal(&dsf->fieldMetaData.dataType,
-                                           &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
-                    UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
-                                          "PubSub-RT configuration fail: "
-                                          "PDS contains variable with dynamic size");
-                    return UA_STATUSCODE_BADNOTSUPPORTED;
-                }
-            }
-        }
-
-        /* Generate the DSM */
-        res = UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
+        dsWriterIds[dsmCount] = dsw->config.dataSetWriterId;
+        res = UA_DataSetWriter_prepareDataSet(server, dsw, &dsmStore[dsmCount]);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
-                                  "PubSub-RT configuration fail: "
-                                  "DataSetMessage buffering failed");
-            continue;
+            for(size_t i = 0; i < dsmCount; i++) {
+                UA_DataSetMessage_clear(&dsmStore[i]);
+            }
+            return res;
         }
-
-        dsWriterIds[dsmCount] = dsw->config.dataSetWriterId;
         dsmCount++;
     }
 
@@ -469,36 +390,16 @@ UA_WriterGroup_unfreezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     if(!wg->configurationFrozen)
         return UA_STATUSCODE_GOOD;
 
-    //if(wg->config.rtLevel == UA_PUBSUB_RT_NONE){
-    //    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-    //                   "PubSub configuration freeze without RT configuration has no effect.");
-    //    return UA_STATUSCODE_BADCONFIGURATIONERROR;
-    //}
-    //PubSubConnection freezeCounter--
-
     UA_PubSubConnection *pubSubConnection =  wg->linkedConnection;
     pubSubConnection->configurationFreezeCounter--;
 
-    //DataSetWriter unfreeze
-    UA_DataSetWriter *dataSetWriter;
-    LIST_FOREACH(dataSetWriter, &wg->writers, listEntry) {
-        UA_PublishedDataSet *publishedDataSet =
-            UA_PublishedDataSet_findPDSbyId(server, dataSetWriter->connectedDataSet);
-        //PublishedDataSet freezeCounter--
-        if(publishedDataSet != NULL){ /* This means the DSW is a heartbeat configuration */
-            publishedDataSet->configurationFreezeCounter--;
-            if(publishedDataSet->configurationFreezeCounter == 0) {
-                UA_DataSetField *dataSetField;
-                TAILQ_FOREACH(dataSetField, &publishedDataSet->fields, listEntry){
-                    dataSetField->configurationFrozen = false;
-                }
-            }
-            dataSetWriter->configurationFrozen = false;
-        }
+    /* DataSetWriter unfreeze */
+    UA_DataSetWriter *dsw;
+    LIST_FOREACH(dsw, &wg->writers, listEntry) {
+        UA_DataSetWriter_unfreezeConfiguration(server, dsw);
     }
 
     UA_NetworkMessageOffsetBuffer_clear(&wg->bufferedMessage);
-
     wg->configurationFrozen = false;
 
     return UA_STATUSCODE_GOOD;

From d09fe62d51e33649494ddfeddc62f8aa050c6733 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 19:04:17 +0100
Subject: [PATCH 0819/1963] refactor(pubsub): Make add/remove publish-callback
 internal to ua_pubsub_writergroup.c

---
 src/pubsub/ua_pubsub.h             |   6 --
 src/pubsub/ua_pubsub_writergroup.c | 118 ++++++++++++++---------------
 2 files changed, 58 insertions(+), 66 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index fa7d540ba3b..32119e3cfe3 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -357,9 +357,6 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg);
 UA_StatusCode
 UA_WriterGroup_unfreezeConfiguration(UA_Server *server, UA_WriterGroup *wg);
 
-void
-UA_ReaderGroup_removePublishCallback(UA_Server *server, UA_WriterGroup *wg);
-
 UA_StatusCode
 UA_WriterGroup_setPubSubState(UA_Server *server,
                               UA_WriterGroup *writerGroup,
@@ -602,9 +599,6 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
 /*               PublishValues handling                  */
 /*********************************************************/
 
-UA_StatusCode
-UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup);
-
 void
 UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup);
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 27c7c4dc445..ac4ea760201 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -42,6 +42,52 @@ generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
                        UA_ExtensionObject *transportSettings,
                        UA_NetworkMessage *networkMessage);
 
+/* Add new publishCallback. The first execution is triggered directly after
+ * creation. */
+static UA_StatusCode
+UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* Already registered */
+    if(writerGroup->publishCallbackId != 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_EventLoop *el = server->config.eventLoop;
+    if(writerGroup->linkedConnection && writerGroup->linkedConnection->config.eventLoop)
+        el = writerGroup->linkedConnection->config.eventLoop;
+
+    UA_StatusCode retval =
+        el->addCyclicCallback(el, (UA_Callback)UA_WriterGroup_publishCallback,
+                              server, writerGroup,
+                              writerGroup->config.publishingInterval,
+                              NULL /* TODO: use basetime */,
+                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME /* TODO: Send
+                                                                          * timer policy
+                                                                          * from writer
+                                                                          * group
+                                                                          * config */,
+                              &writerGroup->publishCallbackId);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Run once after creation. The Publish callback itself takes the server
+     * mutex. So we release it first. */
+    UA_UNLOCK(&server->serviceMutex);
+    UA_WriterGroup_publishCallback(server, writerGroup);
+    UA_LOCK(&server->serviceMutex);
+    return retval;
+}
+
+static void
+UA_WriterGroup_removePublishCallback(UA_Server *server, UA_WriterGroup *wg) {
+    UA_EventLoop *el = server->config.eventLoop;
+    if(wg->linkedConnection && wg->linkedConnection->config.eventLoop)
+        el = wg->linkedConnection->config.eventLoop;
+    if(wg->publishCallbackId != 0)
+        el->removeCyclicCallback(el, wg->publishCallbackId);
+    wg->publishCallbackId = 0;
+}
+
 UA_StatusCode
 UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
                       const UA_WriterGroupConfig *writerGroupConfig,
@@ -217,9 +263,8 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    if(wg->state == UA_PUBSUBSTATE_OPERATIONAL) {
-        UA_ReaderGroup_removePublishCallback(server, wg);
-    }
+    if(wg->state == UA_PUBSUBSTATE_OPERATIONAL)
+        UA_WriterGroup_removePublishCallback(server, wg);
 
     UA_DataSetWriter *dsw, *dsw_tmp;
     LIST_FOREACH_SAFE(dsw, &wg->writers, listEntry, dsw_tmp) {
@@ -515,7 +560,7 @@ UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
         wg->config.publishingInterval = config->publishingInterval;
         if(wg->config.rtLevel == UA_PUBSUB_RT_NONE &&
            wg->state == UA_PUBSUBSTATE_OPERATIONAL) {
-            UA_ReaderGroup_removePublishCallback(server, wg);
+            UA_WriterGroup_removePublishCallback(server, wg);
             UA_WriterGroup_addPublishCallback(server, wg);
         }
     }
@@ -716,10 +761,10 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
                 case UA_PUBSUBSTATE_OPERATIONAL: {
-                    UA_ReaderGroup_removePublishCallback(server, writerGroup);
-
-                    LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
-                        UA_DataSetWriter_setPubSubState(server, dataSetWriter, UA_PUBSUBSTATE_DISABLED,
+                    UA_WriterGroup_removePublishCallback(server, writerGroup);
+                    LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry) {
+                        UA_DataSetWriter_setPubSubState(server, dataSetWriter,
+                                                        UA_PUBSUBSTATE_DISABLED,
                                                         UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
                     }
 
@@ -760,9 +805,8 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
             switch (writerGroup->state) {
                 case UA_PUBSUBSTATE_DISABLED: {
                     writerGroup->state = UA_PUBSUBSTATE_OPERATIONAL;
-                    UA_ReaderGroup_removePublishCallback(server, writerGroup);
-
-                    LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
+                    UA_WriterGroup_removePublishCallback(server, writerGroup);
+                    LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry) {
                         UA_DataSetWriter_setPubSubState(server, dataSetWriter,
                                                         UA_PUBSUBSTATE_OPERATIONAL, cause);
                     }
@@ -795,10 +839,10 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                 case UA_PUBSUBSTATE_PAUSED:
                     break;
                 case UA_PUBSUBSTATE_OPERATIONAL: {
-                    UA_ReaderGroup_removePublishCallback(server, writerGroup);
-
+                    UA_WriterGroup_removePublishCallback(server, writerGroup);
                     LIST_FOREACH(dataSetWriter, &writerGroup->writers, listEntry){
-                        UA_DataSetWriter_setPubSubState(server, dataSetWriter, UA_PUBSUBSTATE_ERROR,
+                        UA_DataSetWriter_setPubSubState(server, dataSetWriter,
+                                                        UA_PUBSUBSTATE_ERROR,
                                                         UA_STATUSCODE_GOOD);
                     }
                     break;
@@ -1324,50 +1368,4 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     UA_UNLOCK(&server->serviceMutex);
 }
 
-/* Add new publishCallback. The first execution is triggered directly after
- * creation. */
-UA_StatusCode
-UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
-    /* Already registered */
-    if(writerGroup->publishCallbackId != 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    UA_EventLoop *el = server->config.eventLoop;
-    if(writerGroup->linkedConnection && writerGroup->linkedConnection->config.eventLoop)
-        el = writerGroup->linkedConnection->config.eventLoop;
-
-    UA_StatusCode retval =
-        el->addCyclicCallback(el, (UA_Callback)UA_WriterGroup_publishCallback,
-                              server, writerGroup,
-                              writerGroup->config.publishingInterval,
-                              NULL /* TODO: use basetime */,
-                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME /* TODO: Send
-                                                                          * timer policy
-                                                                          * from writer
-                                                                          * group
-                                                                          * config */,
-                              &writerGroup->publishCallbackId);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-
-    /* Run once after creation. The Publish callback itself takes the server
-     * mutex. So we release it first. */
-    UA_UNLOCK(&server->serviceMutex);
-    UA_WriterGroup_publishCallback(server, writerGroup);
-    UA_LOCK(&server->serviceMutex);
-    return retval;
-}
-
-void
-UA_ReaderGroup_removePublishCallback(UA_Server *server, UA_WriterGroup *wg) {
-    UA_EventLoop *el = server->config.eventLoop;
-    if(wg->linkedConnection && wg->linkedConnection->config.eventLoop)
-        el = wg->linkedConnection->config.eventLoop;
-    if(wg->publishCallbackId != 0)
-        el->removeCyclicCallback(el, wg->publishCallbackId);
-    wg->publishCallbackId = 0;
-}
-
 #endif /* UA_ENABLE_PUBSUB */

From 5d826859fab7c043a0f590997bd1dfd3002c823e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 19:06:53 +0100
Subject: [PATCH 0820/1963] refactor(pubsub): Make add/remove subscribe
 callback internal to ua_pubsub_readergroup.c

---
 src/pubsub/ua_pubsub.h             |   6 --
 src/pubsub/ua_pubsub_readergroup.c | 160 ++++++++++++++---------------
 2 files changed, 80 insertions(+), 86 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 32119e3cfe3..593ddc04246 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -606,12 +606,6 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup);
 /*               SubscribeValues handling                */
 /*********************************************************/
 
-UA_StatusCode
-UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup);
-
-void
-UA_ReaderGroup_removeSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup);
-
 void
 UA_ReaderGroup_subscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup);
 
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 8aca833f4da..85fd8d497da 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -78,8 +78,88 @@ UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig) {
 #endif
 }
 
+/* This triggers the collection and reception of NetworkMessages and the
+ * contained DataSetMessages. */
+static void
+subscribeCallback(UA_Server *server,
+                  UA_ReaderGroup *readerGroup) {
+    // TODO: feedback for debug-assert vs runtime-check
+    UA_assert(server);
+    UA_assert(readerGroup);
+
+    UA_LOG_DEBUG_READERGROUP(&server->config.logger, readerGroup,
+                             "PubSub subscribe callback");
+
+    UA_PubSubConnection *connection = readerGroup->linkedConnection;
+    if(!connection) {
+        UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
+                     "SubscribeCallback(): Find linked connection failed");
+        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_ERROR,
+                                      UA_STATUSCODE_BADCONNECTIONCLOSED);
+        return;
+    }
+
+    receiveBufferedNetworkMessage(server, readerGroup, connection);
+}
+
+void
+UA_ReaderGroup_subscribeCallback(UA_Server *server,
+                                 UA_ReaderGroup *readerGroup) {
+    UA_LOCK(&server->serviceMutex);
+    subscribeCallback(server, readerGroup);
+    UA_UNLOCK(&server->serviceMutex);
+}
+
 /* ReaderGroup Lifecycle */
 
+/* Add new subscribeCallback. The first execution is triggered directly after
+ * creation. */
+static UA_StatusCode
+UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup) {
+    /* Already registered */
+    if(readerGroup->subscribeCallbackId != 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_EventLoop *el = readerGroup->linkedConnection->config.eventLoop;
+    if(!el)
+        el = server->config.eventLoop;
+
+    UA_StatusCode retval =
+        el->addCyclicCallback(el, (UA_Callback)UA_ReaderGroup_subscribeCallback,
+                              server, readerGroup,
+                              readerGroup->config.subscribingInterval,
+                              NULL /* TODO: use basetime */,
+                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME /* TODO: Send
+                                                                          * timer policy
+                                                                          * from writer
+                                                                          * group
+                                                                          * config */,
+                              &readerGroup->subscribeCallbackId);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Run once after creation */
+    /* When using blocking socket functionality, the server mechanism might get
+     * blocked. It is highly recommended to use custom callback when using
+     * blockingsocket. */
+    if(readerGroup->config.enableBlockingSocket != true)
+        subscribeCallback(server, readerGroup);
+
+    return retval;
+}
+
+static void
+UA_ReaderGroup_removeSubscribeCallback(UA_Server *server,
+                                       UA_ReaderGroup *readerGroup) {
+    UA_PubSubConnection *connection = readerGroup->linkedConnection;
+    UA_EventLoop *el = server->config.eventLoop;
+    if(connection && connection->config.eventLoop)
+        el = connection->config.eventLoop;
+    if(readerGroup->subscribeCallbackId != 0)
+        el->removeCyclicCallback(el, readerGroup->subscribeCallbackId);
+    readerGroup->subscribeCallbackId = 0;
+}
+
 UA_StatusCode
 UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
                       const UA_ReaderGroupConfig *readerGroupConfig,
@@ -722,84 +802,4 @@ UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
     return res;
 }
 
-/* This triggers the collection and reception of NetworkMessages and the
- * contained DataSetMessages. */
-static void
-subscribeCallback(UA_Server *server,
-                  UA_ReaderGroup *readerGroup) {
-    // TODO: feedback for debug-assert vs runtime-check
-    UA_assert(server);
-    UA_assert(readerGroup);
-
-    UA_LOG_DEBUG_READERGROUP(&server->config.logger, readerGroup,
-                             "PubSub subscribe callback");
-
-    UA_PubSubConnection *connection = readerGroup->linkedConnection;
-    if(!connection) {
-        UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
-                     "SubscribeCallback(): Find linked connection failed");
-        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_ERROR,
-                                      UA_STATUSCODE_BADCONNECTIONCLOSED);
-        return;
-    }
-
-    receiveBufferedNetworkMessage(server, readerGroup, connection);
-}
-
-void
-UA_ReaderGroup_subscribeCallback(UA_Server *server,
-                                 UA_ReaderGroup *readerGroup) {
-    UA_LOCK(&server->serviceMutex);
-    subscribeCallback(server, readerGroup);
-    UA_UNLOCK(&server->serviceMutex);
-}
-
-/* Add new subscribeCallback. The first execution is triggered directly after
- * creation. */
-UA_StatusCode
-UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup) {
-    /* Already registered */
-    if(readerGroup->subscribeCallbackId != 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    UA_EventLoop *el = readerGroup->linkedConnection->config.eventLoop;
-    if(!el)
-        el = server->config.eventLoop;
-
-    UA_StatusCode retval =
-        el->addCyclicCallback(el, (UA_Callback)UA_ReaderGroup_subscribeCallback,
-                              server, readerGroup,
-                              readerGroup->config.subscribingInterval,
-                              NULL /* TODO: use basetime */,
-                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME /* TODO: Send
-                                                                          * timer policy
-                                                                          * from writer
-                                                                          * group
-                                                                          * config */,
-                              &readerGroup->subscribeCallbackId);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-
-    /* Run once after creation */
-    /* When using blocking socket functionality, the server mechanism might get
-     * blocked. It is highly recommended to use custom callback when using
-     * blockingsocket. */
-    if(readerGroup->config.enableBlockingSocket != true)
-        subscribeCallback(server, readerGroup);
-
-    return retval;
-}
-
-void
-UA_ReaderGroup_removeSubscribeCallback(UA_Server *server,
-                                       UA_ReaderGroup *readerGroup) {
-    UA_PubSubConnection *connection = readerGroup->linkedConnection;
-    UA_EventLoop *el = server->config.eventLoop;
-    if(connection && connection->config.eventLoop)
-        el = connection->config.eventLoop;
-    if(readerGroup->subscribeCallbackId != 0)
-        el->removeCyclicCallback(el, readerGroup->subscribeCallbackId);
-    readerGroup->subscribeCallbackId = 0;
-}
-
 #endif /* UA_ENABLE_PUBSUB */

From 7db5a7c148844d1536870a5d1972385697eeafbc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 19:49:42 +0100
Subject: [PATCH 0821/1963] refactor(pubsub): Make
 UA_ReaderGroup_subscribeCallback local to ua_pubsub_readergroup.c

---
 src/pubsub/ua_pubsub.h             | 18 ++++--------------
 src/pubsub/ua_pubsub_readergroup.c |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 593ddc04246..e4af3dd7b9e 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -363,6 +363,10 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
                               UA_PubSubState state,
                               UA_StatusCode cause);
 
+void
+UA_WriterGroup_publishCallback(UA_Server *server,
+                               UA_WriterGroup *writerGroup);
+
 UA_StatusCode
 UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
                             const UA_WriterGroupConfig *config);
@@ -595,20 +599,6 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
                               UA_PubSubState state,
                               UA_StatusCode cause);
 
-/*********************************************************/
-/*               PublishValues handling                  */
-/*********************************************************/
-
-void
-UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup);
-
-/*********************************************************/
-/*               SubscribeValues handling                */
-/*********************************************************/
-
-void
-UA_ReaderGroup_subscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup);
-
 #define UA_LOG_READERGROUP_INTERNAL(LOGGER, LEVEL, RG, MSG, ...)        \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
         UA_String idStr = UA_STRING_NULL;                               \
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 85fd8d497da..0e58e4b1a53 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -102,7 +102,7 @@ subscribeCallback(UA_Server *server,
     receiveBufferedNetworkMessage(server, readerGroup, connection);
 }
 
-void
+static void
 UA_ReaderGroup_subscribeCallback(UA_Server *server,
                                  UA_ReaderGroup *readerGroup) {
     UA_LOCK(&server->serviceMutex);

From 2211c1316837eb5c21f2e8db028216529fe85222 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 20:03:07 +0100
Subject: [PATCH 0822/1963] refactor(pubsub): Simplify/fix edge cases in
 UA_ReaderGroup_create

---
 src/pubsub/ua_pubsub.h             |  6 +--
 src/pubsub/ua_pubsub_readergroup.c | 77 ++++++++++++++++--------------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index e4af3dd7b9e..6dc5d1437f8 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -561,9 +561,9 @@ struct UA_ReaderGroup {
 };
 
 UA_StatusCode
-UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
-                      const UA_ReaderGroupConfig *readerGroupConfig,
-                      UA_NodeId *readerGroupIdentifier);
+UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
+                      const UA_ReaderGroupConfig *rgc,
+                      UA_NodeId *readerGroupId);
 
 UA_StatusCode
 removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier);
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 0e58e4b1a53..5baa909e7bd 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -161,39 +161,38 @@ UA_ReaderGroup_removeSubscribeCallback(UA_Server *server,
 }
 
 UA_StatusCode
-UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
-                      const UA_ReaderGroupConfig *readerGroupConfig,
-                      UA_NodeId *readerGroupIdentifier) {
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-
+UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
+                      const UA_ReaderGroupConfig *rgc,
+                      UA_NodeId *readerGroupId) {
     /* Check for valid readergroup configuration */
-    if(!readerGroupConfig)
+    if(!rgc)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     /* Search the connection by the given connectionIdentifier */
-    UA_PubSubConnection *currentConnectionContext =
-        UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
-    if(!currentConnectionContext)
+    UA_PubSubConnection *connection =
+        UA_PubSubConnection_findConnectionbyId(server, connectionId);
+    if(!connection)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    if(!readerGroupConfig->pubsubManagerCallback.addCustomCallback &&
-       readerGroupConfig->enableBlockingSocket) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, currentConnectionContext,
-                                  "Adding ReaderGroup failed, blocking socket functionality "
-                                  "only supported in customcallback");
+    if(!rgc->pubsubManagerCallback.addCustomCallback &&
+       rgc->enableBlockingSocket) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                                  "Adding ReaderGroup failed, blocking socket "
+                                  "functionality only supported in customcallback");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
-    if(currentConnectionContext->configurationFreezeCounter > 0) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, currentConnectionContext,
+    if(connection->configurationFreezeCounter > 0) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
                                   "Adding ReaderGroup failed. "
                                   "Connection configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
     /* Regist (bind) the connection channel if it is not already registered */
-    if(!currentConnectionContext->isRegistered) {
-        retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, readerGroupConfig);
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(!connection->isRegistered) {
+        retval |= UA_PubSubConnection_regist(server, &connectionId, rgc);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
     }
@@ -206,23 +205,28 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
     newGroup->componentType = UA_PUBSUB_COMPONENT_READERGROUP;
 
     /* Deep copy of the config */
-    newGroup->linkedConnection = currentConnectionContext;
-    retval |= UA_ReaderGroupConfig_copy(readerGroupConfig, &newGroup->config);
+    retval = UA_ReaderGroupConfig_copy(rgc, &newGroup->config);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_free(newGroup);
+        return retval;
+    }
 
     /* Check user configured params and define it accordingly */
     if(newGroup->config.subscribingInterval <= 0.0)
-        newGroup->config.subscribingInterval = 5; // Set default to 5 ms
+        newGroup->config.subscribingInterval = 5; /* Set default to 5 ms */
 
     if(newGroup->config.enableBlockingSocket)
-        newGroup->config.timeout = 0; // Set timeout to 0 for blocking socket
+        newGroup->config.timeout = 0; /* Set timeout to 0 for blocking socket */
 
     if((!newGroup->config.enableBlockingSocket) && (!newGroup->config.timeout))
         newGroup->config.timeout = 1000; /* Set default to 1ms socket timeout
                                             when non-blocking socket allows with
                                             zero timeout */
 
-    LIST_INSERT_HEAD(&currentConnectionContext->readerGroups, newGroup, listEntry);
-    currentConnectionContext->readerGroupsSize++;
+    newGroup->linkedConnection = connection;
+
+    LIST_INSERT_HEAD(&connection->readerGroups, newGroup, listEntry);
+    connection->readerGroupsSize++;
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     retval |= addReaderGroupRepresentation(server, newGroup);
@@ -232,13 +236,12 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_SKS
-    if(readerGroupConfig->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
-       readerGroupConfig->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
-        if(!UA_String_isEmpty(&readerGroupConfig->securityGroupId) &&
-           readerGroupConfig->securityPolicy) {
+    if(rgc->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
+       rgc->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
+        if(!UA_String_isEmpty(&rgc->securityGroupId) && rgc->securityPolicy) {
             /* Does the key storage already exist? */
             newGroup->keyStorage =
-                UA_PubSubKeyStorage_findKeyStorage(server, readerGroupConfig->securityGroupId);
+                UA_PubSubKeyStorage_findKeyStorage(server, rgc->securityGroupId);
 
             if(!newGroup->keyStorage) {
                 /* Create a new key storage */
@@ -247,9 +250,10 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
                 if(!newGroup->keyStorage)
                     return UA_STATUSCODE_BADOUTOFMEMORY;
                 retval = UA_PubSubKeyStorage_init(server, newGroup->keyStorage,
-                                                  &readerGroupConfig->securityGroupId,
-                                                  readerGroupConfig->securityPolicy, 0, 0);
+                                                  &rgc->securityGroupId,
+                                                  rgc->securityPolicy, 0, 0);
                 if(retval != UA_STATUSCODE_GOOD) {
+                    UA_ReaderGroupConfig_clear(&newGroup->config);
                     UA_free(newGroup);
                     return retval;
                 }
@@ -262,14 +266,15 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionIdentifier,
 
 #endif
 
-    if(readerGroupIdentifier)
-        UA_NodeId_copy(&newGroup->identifier, readerGroupIdentifier);
+    if(readerGroupId)
+        UA_NodeId_copy(&newGroup->identifier, readerGroupId);
 
     /* Set the assigment between ReaderGroup and Topic if the transport layer is MQTT. */
-    const UA_String transport_uri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
-    if(UA_String_equal(&currentConnectionContext->config.transportProfileUri, &transport_uri)) {
+    const UA_String transport_uri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+    if(UA_String_equal(&connection->config.transportProfileUri, &transport_uri)) {
         UA_String topic = ((UA_BrokerWriterGroupTransportDataType *)
-                           readerGroupConfig->transportSettings.content.decoded.data)->queueName;
+                           rgc->transportSettings.content.decoded.data)->queueName;
         retval |= UA_PubSubManager_addPubSubTopicAssign(server, newGroup, topic);
     }
     return retval;

From db35a0d6310ba4980c60f53aca90bb1920dae248 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 20:08:48 +0100
Subject: [PATCH 0823/1963] refactor(pubsub): Cosmetic changes in
 ua_pubsub_readergroup.c

---
 src/pubsub/ua_pubsub_readergroup.c | 77 ++++++++++++++++--------------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 5baa909e7bd..7dc4f9c1550 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -33,7 +33,8 @@ UA_ReaderGroup_findRGbyId(UA_Server *server, UA_NodeId identifier) {
     return NULL;
 }
 
-UA_DataSetReader *UA_ReaderGroup_findDSRbyId(UA_Server *server, UA_NodeId identifier) {
+UA_DataSetReader *
+UA_ReaderGroup_findDSRbyId(UA_Server *server, UA_NodeId identifier) {
     UA_PubSubConnection *pubSubConnection;
     TAILQ_FOREACH(pubSubConnection, &server->pubSubManager.connections, listEntry){
         UA_ReaderGroup* readerGroup = NULL;
@@ -355,37 +356,36 @@ UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifi
 }
 
 static void
-ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup) {
+ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *rg) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_ReaderGroupConfig_clear(&readerGroup->config);
-    UA_DataSetReader *dataSetReader;
-    UA_DataSetReader *tmpDataSetReader;
-    LIST_FOREACH_SAFE(dataSetReader, &readerGroup->readers, listEntry, tmpDataSetReader) {
-        removeDataSetReader(server, dataSetReader->identifier);
+    UA_ReaderGroupConfig_clear(&rg->config);
+    UA_DataSetReader *dsr, *tmp_dsr;
+    LIST_FOREACH_SAFE(dsr, &rg->readers, listEntry, tmp_dsr) {
+        removeDataSetReader(server, dsr->identifier);
     }
-    UA_PubSubConnection* pConn = readerGroup->linkedConnection;
+    UA_PubSubConnection* pConn = rg->linkedConnection;
     if(pConn != NULL)
         pConn->readerGroupsSize--;
 
     /* Delete ReaderGroup and its members */
-    UA_NodeId_clear(&readerGroup->identifier);
+    UA_NodeId_clear(&rg->identifier);
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-    if(readerGroup->config.securityPolicy && readerGroup->securityPolicyContext) {
-        readerGroup->config.securityPolicy->deleteContext(readerGroup->securityPolicyContext);
-        readerGroup->securityPolicyContext = NULL;
+    if(rg->config.securityPolicy && rg->securityPolicyContext) {
+        rg->config.securityPolicy->deleteContext(rg->securityPolicyContext);
+        rg->securityPolicyContext = NULL;
     }
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_SKS
-    if(readerGroup->keyStorage) {
-        UA_PubSubKeyStorage_detachKeyStorage(server, readerGroup->keyStorage);
-        readerGroup->keyStorage = NULL;
+    if(rg->keyStorage) {
+        UA_PubSubKeyStorage_detachKeyStorage(server, rg->keyStorage);
+        rg->keyStorage = NULL;
     }
 #endif
 
-    UA_ReaderGroupConfig_clear(&readerGroup->config);
+    UA_ReaderGroupConfig_clear(&rg->config);
 }
 
 UA_StatusCode
@@ -395,10 +395,10 @@ UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifie
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
-    UA_ReaderGroup *currentReaderGroup =
+    UA_ReaderGroup *rg =
         UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
-    if(currentReaderGroup) {
-        *state = currentReaderGroup->state;
+    if(rg) {
+        *state = rg->state;
         ret = UA_STATUSCODE_GOOD;
     }
     UA_UNLOCK(&server->serviceMutex);
@@ -565,7 +565,8 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
 }
 
 UA_StatusCode
-UA_Server_setReaderGroupOperational(UA_Server *server, const UA_NodeId readerGroupId){
+UA_Server_setReaderGroupOperational(UA_Server *server,
+                                    const UA_NodeId readerGroupId) {
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
@@ -588,7 +589,8 @@ UA_Server_setReaderGroupOperational(UA_Server *server, const UA_NodeId readerGro
 }
 
 UA_StatusCode
-UA_Server_setReaderGroupDisabled(UA_Server *server, const UA_NodeId readerGroupId){
+UA_Server_setReaderGroupDisabled(UA_Server *server,
+                                 const UA_NodeId readerGroupId) {
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
@@ -640,7 +642,8 @@ setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
 }
 
 UA_StatusCode
-UA_Server_setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
+UA_Server_setReaderGroupEncryptionKeys(UA_Server *server,
+                                       const UA_NodeId readerGroup,
                                        UA_UInt32 securityTokenId,
                                        const UA_ByteString signingKey,
                                        const UA_ByteString encryptingKey,
@@ -672,10 +675,10 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
     rg->configurationFrozen = true;
 
     /* DataSetReader freeze */
-    UA_DataSetReader *dataSetReader;
+    UA_DataSetReader *dsr;
     UA_UInt16 dsrCount = 0;
-    LIST_FOREACH(dataSetReader, &rg->readers, listEntry){
-        dataSetReader->configurationFrozen = true;
+    LIST_FOREACH(dsr, &rg->readers, listEntry){
+        dsr->configurationFrozen = true;
         dsrCount++;
         /* TODO: Configuration frozen for subscribedDataSet once
          * UA_Server_DataSetReader_addTargetVariables API modified to support
@@ -693,32 +696,32 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
-    dataSetReader = LIST_FIRST(&rg->readers);
+    dsr = LIST_FIRST(&rg->readers);
 
     /* Support only to UADP encoding */
-    if(dataSetReader->config.messageSettings.content.decoded.type !=
+    if(dsr->config.messageSettings.content.decoded.type !=
        &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE]) {
-        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
                               "PubSub-RT configuration fail: Non-RT capable encoding.");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
     /* Don't support string PublisherId for the fast-path (at this time) */
-    if(!dataSetReader->config.publisherId.type->pointerFree) {
-        UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+    if(!dsr->config.publisherId.type->pointerFree) {
+        UA_LOG_WARNING_READER(&server->config.logger, dsr,
                               "PubSub-RT configuration fail: String PublisherId");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
-    size_t fieldsSize = dataSetReader->config.dataSetMetaData.fieldsSize;
+    size_t fieldsSize = dsr->config.dataSetMetaData.fieldsSize;
     for(size_t i = 0; i < fieldsSize; i++) {
         UA_FieldTargetVariable *tv =
-            &dataSetReader->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
+            &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
         const UA_VariableNode *rtNode = (const UA_VariableNode *)
             UA_NODESTORE_GET(server, &tv->targetVariable.targetNodeId);
         if(!rtNode ||
            rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
-            UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+            UA_LOG_WARNING_READER(&server->config.logger, dsr,
                                   "PubSub-RT configuration fail: PDS contains field "
                                   "without external data source.");
             UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
@@ -730,17 +733,17 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
 
         UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
 
-        UA_FieldMetaData *field = &dataSetReader->config.dataSetMetaData.fields[i];
+        UA_FieldMetaData *field = &dsr->config.dataSetMetaData.fields[i];
         if((UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_STRING].typeId) ||
             UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
            field->maxStringLength == 0) {
-            UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+            UA_LOG_WARNING_READER(&server->config.logger, dsr,
                                   "PubSub-RT configuration fail: "
                                   "PDS contains String/ByteString with dynamic length.");
             return UA_STATUSCODE_BADNOTSUPPORTED;
         } else if(!UA_DataType_isNumeric(UA_findDataType(&field->dataType)) &&
                   !UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
-            UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+            UA_LOG_WARNING_READER(&server->config.logger, dsr,
                                   "PubSub-RT configuration fail: "
                                   "PDS contains variable with dynamic size.");
             return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -751,7 +754,7 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
      * generated when the first message is received. So we know the exact
      * settings which headers are present, etc. Until then the ReaderGroup is
      * "PreOperational". */
-    UA_NetworkMessageOffsetBuffer_clear(&dataSetReader->bufferedMessage);
+    UA_NetworkMessageOffsetBuffer_clear(&dsr->bufferedMessage);
 
     /* Set the current state again. This can move the state from Operational to
      * PreOperational. */

From f4d8c15f9332b0d01f090eca19c38c4afd22d771 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 20:13:14 +0100
Subject: [PATCH 0824/1963] refactor(pubsub): Move content from
 ua_pubsub_config.h to ua_pubsub.h

---
 CMakeLists.txt                |  3 +--
 src/pubsub/ua_pubsub.h        | 14 ++++++++++++++
 src/pubsub/ua_pubsub_config.c |  1 -
 src/pubsub/ua_pubsub_config.h | 31 -------------------------------
 src/pubsub/ua_pubsub_ns0.c    |  4 ----
 5 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 src/pubsub/ua_pubsub_config.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a3428416f3..333505956ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -988,8 +988,7 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_server_internal.h
                      ${PROJECT_SOURCE_DIR}/src/server/ua_services.h
-                     ${PROJECT_SOURCE_DIR}/src/client/ua_client_internal.h
-                     ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_config.h)
+                     ${PROJECT_SOURCE_DIR}/src/client/ua_client_internal.h)
 
 # TODO: make client optional
 set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 6dc5d1437f8..b57b0512a07 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -775,6 +775,20 @@ void
 UA_PubSubManager_generateUniqueNodeId(UA_PubSubManager *psm, UA_NodeId *nodeId);
 #endif
 
+#ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
+/* Decodes the information from the ByteString. If the decoded content is a
+ * PubSubConfiguration in a UABinaryFileDataType-object. It will overwrite the
+ * current PubSub configuration from the server. */
+UA_StatusCode
+UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
+                                                const UA_ByteString buffer);
+
+/* Saves the current PubSub configuration of a server in a byteString. */
+UA_StatusCode
+UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
+                                               UA_ByteString *buffer);
+#endif
+
 UA_Guid
 UA_PubSubManager_generateUniqueGuid(UA_Server *server);
 
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 5d493a8b987..83d96bd6a82 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -15,7 +15,6 @@
 #include <open62541/plugin/pubsub_udp.h>
 #endif
 
-#include "pubsub/ua_pubsub_config.h"
 #include "pubsub/ua_pubsub.h"
 #include "server/ua_server_internal.h"
 
diff --git a/src/pubsub/ua_pubsub_config.h b/src/pubsub/ua_pubsub_config.h
deleted file mode 100644
index 7a210dc299e..00000000000
--- a/src/pubsub/ua_pubsub_config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2020 Yannick Wallerer, Siemens AG
- * Copyright (c) 2020 Thomas Fischer, Siemens AG
- */
-
-#ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
-
-#ifndef UA_PUBSUB_CONFIG_H_
-#define UA_PUBSUB_CONFIG_H_
-
-#include <open62541/types_generated.h>
-#include <open62541/server.h>
-
-/* Decodes the information from the ByteString. If the decoded content is a
- * PubSubConfiguration in a UABinaryFileDataType-object. It will overwrite the
- * current PubSub configuration from the server. */
-UA_StatusCode
-UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
-                                                const UA_ByteString buffer);
-
-/* Saves the current PubSub configuration of a server in a byteString. */
-UA_StatusCode
-UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
-                                               UA_ByteString *buffer);
-
-#endif /* UA_PUBSUB_CONFIG_H_ */
-
-#endif /* UA_ENABLE_PUBSUB_FILE_CONFIG */
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index b85de24629c..a52f3c26bc3 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -11,10 +11,6 @@
 
 #include "ua_pubsub_ns0.h"
 
-#ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
-#include "ua_pubsub_config.h"
-#endif
-
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL /* conditional compilation */
 
 typedef struct {

From 20660bb2c9ef34c06f1fab95a65b10192b0e3f18 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 20:16:08 +0100
Subject: [PATCH 0825/1963] fix(pubsub): Remove the dependency from
 ua_pubsub_config.c on stdout logging

---
 src/pubsub/ua_pubsub_config.c | 51 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 83d96bd6a82..1a5e94d8a04 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -6,20 +6,18 @@
  * Copyright (c) 2020 Thomas Fischer, Siemens AG
  */
 
-#include <open62541/plugin/log_stdout.h>
+#include <open62541/server_pubsub.h>
 
-#ifdef UA_ENABLE_PUBSUB
+#if defined(UA_ENABLE_PUBSUB) && defined(UA_ENABLE_PUBSUB_FILE_CONFIG)
+
+#include <open62541/plugin/pubsub_udp.h>
 #ifdef UA_ENABLE_PUBSUB_ETH_UADP
 #include <open62541/plugin/pubsub_ethernet.h>
 #endif
-#include <open62541/plugin/pubsub_udp.h>
-#endif
 
 #include "pubsub/ua_pubsub.h"
 #include "server/ua_server_internal.h"
 
-#ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
-
 static UA_StatusCode
 createPubSubConnection(UA_Server *server,
                        const UA_PubSubConnectionDataType *connection,
@@ -696,7 +694,8 @@ createDataSetReader(UA_Server *server, const UA_DataSetReaderDataType *dsrParams
  * @param publishedDataSetParameters PublishedDataSet parameters
  * @param config PublishedDataSet configuration object */
 static UA_StatusCode
-setPublishedDataSetType(const UA_PublishedDataSetDataType *pdsParams,
+setPublishedDataSetType(UA_Server *server,
+                        const UA_PublishedDataSetDataType *pdsParams,
                         UA_PublishedDataSetConfig *config) {
     if(pdsParams->dataSetSource.encoding != UA_EXTENSIONOBJECT_DECODED)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -732,7 +731,7 @@ createPublishedDataSet(UA_Server *server,
     memset(&config, 0, sizeof(UA_PublishedDataSetConfig));
 
     config.name = pdsParams->name;
-    UA_StatusCode res = setPublishedDataSetType(pdsParams, &config);
+    UA_StatusCode res = setPublishedDataSetType(server, pdsParams, &config);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
@@ -836,7 +835,7 @@ UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
     UA_StatusCode res;
 
     if(server == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_loadPubSubConfigFromByteString] Invalid argument");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -1104,22 +1103,22 @@ generatePubSubConnectionDataType(UA_Server* server,
     const UA_DataType *publisherIdType;
     memset(dst, 0, sizeof(UA_PubSubConnectionDataType));
 
-    UA_String_copy(&src->config->name, &dst->name);
-    UA_String_copy(&src->config->transportProfileUri, &dst->transportProfileUri);
-    dst->enabled = src->config->enabled;
+    UA_String_copy(&src->config.name, &dst->name);
+    UA_String_copy(&src->config.transportProfileUri, &dst->transportProfileUri);
+    dst->enabled = src->config.enabled;
 
     UA_StatusCode res =
-        UA_Array_copy(src->config->connectionProperties.map,
-                      src->config->connectionProperties.mapSize,
+        UA_Array_copy(src->config.connectionProperties.map,
+                      src->config.connectionProperties.mapSize,
                       (void**)&dst->connectionProperties,
                       &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
     if(res != UA_STATUSCODE_GOOD) {
         UA_PubSubConnectionDataType_clear(dst);
         return res;
     }
-    dst->connectionPropertiesSize = src->config->connectionProperties.mapSize;
+    dst->connectionPropertiesSize = src->config.connectionProperties.mapSize;
 
-    switch (src->config->publisherIdType) {
+    switch (src->config.publisherIdType) {
         case UA_PUBLISHERIDTYPE_BYTE:
             publisherIdType = &UA_TYPES[UA_TYPES_BYTE];
             break;
@@ -1142,28 +1141,28 @@ generatePubSubConnectionDataType(UA_Server* server,
             break;
     }
     UA_Variant_setScalarCopy(&dst->publisherId,
-                             &src->config->publisherId,
+                             &src->config.publisherId,
                              publisherIdType);
 
     /* Possibly, array size and dimensions of src->config->address and
      * src->config->connectionTransportSettings should be checked beforehand. */
     dst->address.encoding = UA_EXTENSIONOBJECT_DECODED;
-    dst->address.content.decoded.type = src->config->address.type;
-    res = UA_Array_copy(src->config->address.data, 1,
+    dst->address.content.decoded.type = src->config.address.type;
+    res = UA_Array_copy(src->config.address.data, 1,
                         &dst->address.content.decoded.data,
-                        src->config->address.type);
+                        src->config.address.type);
     if(res != UA_STATUSCODE_GOOD) {
         UA_PubSubConnectionDataType_clear(dst);
         return res;
     }
 
-    if(src->config->connectionTransportSettings.data) {
+    if(src->config.connectionTransportSettings.data) {
         dst->transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
         dst->transportSettings.content.decoded.type =
-            src->config->connectionTransportSettings.type;
-        res = UA_Array_copy(src->config->connectionTransportSettings.data, 1,
+            src->config.connectionTransportSettings.type;
+        res = UA_Array_copy(src->config.connectionTransportSettings.data, 1,
                             &dst->transportSettings.content.decoded.data,
-                            src->config->connectionTransportSettings.type);
+                            src->config.connectionTransportSettings.type);
 
         if(res != UA_STATUSCODE_GOOD) {
             UA_PubSubConnectionDataType_clear(dst);
@@ -1272,7 +1271,7 @@ UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
     memset(&config, 0, sizeof(UA_PubSubConfigurationDataType));
 
     if(server == NULL) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_getEncodedPubSubConfiguration] Invalid argument");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -1301,4 +1300,4 @@ UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
     return res;
 }
 
-#endif /* UA_ENABLE_PUBSUB_FILE_CONFIG */
+#endif /* UA_ENABLE_PUBSUB && UA_ENABLE_PUBSUB_FILE_CONFIG */

From 52a9b7616b3fb437066339fd14556677929bcfad Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 20 Mar 2023 20:28:24 +0100
Subject: [PATCH 0826/1963] refactor(pubsub): Simplify
 UA_NetworkMessage_updateBufferedNwMessage

---
 src/pubsub/ua_pubsub_networkmessage.c | 72 +++++++++++++--------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index ccbf1989131..8994ee4ae9f 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -88,10 +88,6 @@ UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer) {
 UA_StatusCode
 UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
                                           const UA_ByteString *src, size_t *bufferPosition) {
-    UA_StatusCode rv = UA_STATUSCODE_GOOD;
-    size_t payloadCounter = 0;
-    size_t offset = 0;
-
     /* The offset buffer was not prepared */
     UA_NetworkMessage *nm = buffer->nm;
     if(!nm)
@@ -101,74 +97,74 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
     if(src->length < buffer->buffer.length + *bufferPosition)
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    UA_DataSetMessage* dsm = nm->payload.dataSetPayload.dataSetMessages; //Considering one DSM in RT TODO: Clarify multiple DSM
-    UA_DataSetMessageHeader header;
+    /* If this remains at UA_UINT32_MAX, then no raw fields are contained */
     size_t smallestRawOffset = UA_UINT32_MAX;
 
+    /* Considering one DSM in RT TODO: Clarify multiple DSM */
+    UA_DataSetMessage* dsm = nm->payload.dataSetPayload.dataSetMessages;
+
+    size_t pos = 0;
+    size_t payloadCounter = 0;
+    UA_DataSetMessageHeader header;
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
     for(size_t i = 0; i < buffer->offsetsSize; ++i) {
-        offset = buffer->offsets[i].offset + *bufferPosition;
-        switch (buffer->offsets[i].contentType) {
+        pos = buffer->offsets[i].offset + *bufferPosition;
+        switch(buffer->offsets[i].contentType) {
         case UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING:
-            rv = UA_DataSetMessageHeader_decodeBinary(src, &offset, &header);
-            if(rv != UA_STATUSCODE_GOOD)
-                return rv;
+            rv = UA_DataSetMessageHeader_decodeBinary(src, &pos, &header);
             break;
         case UA_PUBSUB_OFFSETTYPE_PUBLISHERID:
-            switch (nm->publisherIdType) {
+            switch(nm->publisherIdType) {
             case UA_PUBLISHERIDTYPE_BYTE:
-                rv = UA_Byte_decodeBinary(src, &offset, &nm->publisherId.byte);
+                rv = UA_Byte_decodeBinary(src, &pos, &nm->publisherId.byte);
                 break;
             case UA_PUBLISHERIDTYPE_UINT16:
-                rv = UA_UInt16_decodeBinary(src, &offset, &nm->publisherId.uint16);
+                rv = UA_UInt16_decodeBinary(src, &pos, &nm->publisherId.uint16);
                 break;
             case UA_PUBLISHERIDTYPE_UINT32:
-                rv = UA_UInt32_decodeBinary(src, &offset, &nm->publisherId.uint32);
+                rv = UA_UInt32_decodeBinary(src, &pos, &nm->publisherId.uint32);
                 break;
             case UA_PUBLISHERIDTYPE_UINT64:
-                rv = UA_UInt64_decodeBinary(src, &offset, &nm->publisherId.uint64);
+                rv = UA_UInt64_decodeBinary(src, &pos, &nm->publisherId.uint64);
                 break;
             default:
-                // UA_PUBLISHERIDTYPE_STRING is not supported because of UA_PUBSUB_RT_FIXED_SIZE
+                /* UA_PUBLISHERIDTYPE_STRING is not supported because of
+                 * UA_PUBSUB_RT_FIXED_SIZE */
                 return UA_STATUSCODE_BADNOTSUPPORTED;
             }
             break;
         case UA_PUBSUB_OFFSETTYPE_WRITERGROUPID:
-            rv = UA_UInt16_decodeBinary(src, &offset, &nm->groupHeader.writerGroupId);
-            UA_CHECK_STATUS(rv, return rv);
+            rv = UA_UInt16_decodeBinary(src, &pos, &nm->groupHeader.writerGroupId);
             break;
         case UA_PUBSUB_OFFSETTYPE_DATASETWRITERID:
-            rv = UA_UInt16_decodeBinary(src, &offset,
+            rv = UA_UInt16_decodeBinary(src, &pos,
                                         &nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[0]); /* TODO */
-            UA_CHECK_STATUS(rv, return rv);
             break;
         case UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER:
-            rv = UA_UInt16_decodeBinary(src, &offset, &nm->groupHeader.sequenceNumber);
-            UA_CHECK_STATUS(rv, return rv);
+            rv = UA_UInt16_decodeBinary(src, &pos, &nm->groupHeader.sequenceNumber);
             break;
         case UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER:
-            rv = UA_UInt16_decodeBinary(src, &offset, &dsm->header.dataSetMessageSequenceNr);
-            UA_CHECK_STATUS(rv, return rv);
+            rv = UA_UInt16_decodeBinary(src, &pos, &dsm->header.dataSetMessageSequenceNr);
             break;
         case UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE:
             UA_DataValue_clear(&dsm->data.keyFrameData.dataSetFields[payloadCounter]);
-            rv = UA_DataValue_decodeBinary(src, &offset,
+            rv = UA_DataValue_decodeBinary(src, &pos,
                                            &dsm->data.keyFrameData.dataSetFields[payloadCounter]);
-            UA_CHECK_STATUS(rv, return rv);
             payloadCounter++;
             break;
         case UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT:
             UA_Variant_clear(&dsm->data.keyFrameData.dataSetFields[payloadCounter].value);
-            rv = UA_Variant_decodeBinary(src, &offset,
+            rv = UA_Variant_decodeBinary(src, &pos,
                                          &dsm->data.keyFrameData.dataSetFields[payloadCounter].value);
-            UA_CHECK_STATUS(rv, return rv);
-            dsm->data.keyFrameData.dataSetFields[payloadCounter].hasValue = true;
+            dsm->data.keyFrameData.dataSetFields[payloadCounter].hasValue =
+                (rv == UA_STATUSCODE_GOOD);
             payloadCounter++;
             break;
         case UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW:
             /* We need only the start address of the raw fields */
-            if(smallestRawOffset > offset){
-                smallestRawOffset = offset;
-                dsm->data.keyFrameData.rawFields.data = &src->data[offset];
+            if(smallestRawOffset > pos){
+                smallestRawOffset = pos;
+                dsm->data.keyFrameData.rawFields.data = &src->data[pos];
                 dsm->data.keyFrameData.rawFields.length = buffer->rawMessageLength;
             }
             payloadCounter++;
@@ -176,12 +172,16 @@ UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
         default:
             return UA_STATUSCODE_BADNOTSUPPORTED;
         }
+        UA_CHECK_STATUS(rv, return rv);
     }
-    //check if the frame is of type "raw" payload
-    if(smallestRawOffset != UA_UINT32_MAX){
+
+    /* Check if the frame is of type "raw" payload. If yes, set the new buffer
+     * position to the start position of the raw fields plus the length of the
+     * raw fields. */
+    if(smallestRawOffset != UA_UINT32_MAX) {
         *bufferPosition = smallestRawOffset + buffer->rawMessageLength;
     } else {
-        *bufferPosition = offset;
+        *bufferPosition = pos;
     }
 
     return rv;

From 2f4a871039b81d68b1460d8d7b95e5444bafa016 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 21 Mar 2023 07:47:03 +0100
Subject: [PATCH 0827/1963] refactor(build): Improve an error message in
 CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 333505956ae..e3874c34086 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,7 +439,7 @@ endif()
 
 if(UA_ENABLE_PUBSUB_FILE_CONFIG)
     if(NOT UA_ENABLE_PUBSUB)
-        message(FATAL_ERROR "PubSub needs to be enabled")
+        message(FATAL_ERROR "For UA_ENABLE_PUBSUB_FILE_CONFIG PubSub needs to be enabled")
     endif()
 endif()
 

From 7b3055d5c2fb9c599f0706b7309c15673de28658 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Mar 2023 17:36:08 +0100
Subject: [PATCH 0828/1963] fix(test): Make check_pubsub_encoding_custom.c
 valgrind clean

---
 tests/pubsub/check_pubsub_encoding_custom.c | 38 ++++++++++++++-------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/tests/pubsub/check_pubsub_encoding_custom.c b/tests/pubsub/check_pubsub_encoding_custom.c
index c64384fe367..f101b342353 100644
--- a/tests/pubsub/check_pubsub_encoding_custom.c
+++ b/tests/pubsub/check_pubsub_encoding_custom.c
@@ -793,7 +793,8 @@ START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsDeltaFrame){
     ck_assert_int_eq((*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).a, o.a);
     ck_assert_ptr_eq((*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).b, NULL);
     ck_assert(*(*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).c == *o.c);
-    ck_assert_str_eq((char*)((Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d->data,"Test");
+    UA_String testStr = UA_STRING("Test");
+    ck_assert(UA_String_equal(((Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d, &testStr));
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
     ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
     ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
@@ -878,7 +879,8 @@ START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsKeyFrame){
     ck_assert_int_eq((*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).a, o.a);
     ck_assert_ptr_eq((*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).b, NULL);
     ck_assert(*(*(Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).c == *o.c);
-    ck_assert_str_eq((char*)((Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d->data,"Test");
+    UA_String testStr = UA_STRING("Test");
+    ck_assert(UA_String_equal(((Opt *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d, &testStr));
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
 
     UA_clear(&o, &OptType);
@@ -947,7 +949,8 @@ START_TEST(UA_PubSub_EnDecode_CustomUnionDeltaFrame){
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
     ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &UniType);
     ck_assert_int_eq((*(Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).switchField, UA_UNISWITCH_OPTIONB);
-    ck_assert_str_eq((char*)((Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->fields.optionB.data, "test string");
+    UA_String testStr = UA_STRING("test string");
+    ck_assert(UA_String_equal(&((Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->fields.optionB, &testStr));
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasSourceTimestamp);
     ck_assert(m.dataSetClassIdEnabled == m2.dataSetClassIdEnabled);
     ck_assert(m.groupHeaderEnabled == m2.groupHeaderEnabled);
@@ -1025,7 +1028,8 @@ START_TEST(UA_PubSub_EnDecode_CustomUnionKeyFrame){
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
     ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &UniType);
     ck_assert_int_eq((*(Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).switchField, UA_UNISWITCH_OPTIONB);
-    ck_assert_str_eq((char*)((Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->fields.optionB.data, "test string");
+    UA_String testStr = UA_STRING("test string");
+    ck_assert(UA_String_equal(&((Uni *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->fields.optionB, &testStr));
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasSourceTimestamp);
 
     UA_DataValue_clear(&dmkf.data.keyFrameData.dataSetFields[0]);
@@ -1210,6 +1214,7 @@ START_TEST(UA_PubSub_EnDecode_SelfContainingUnionSelfMemberDeltaFrame){
 
     UA_Variant_setScalarCopy(&dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.value, &s, &selfContainingUnionType);
     dmdf.data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue = true;
+    UA_free(s.fields.array.array);
 
     m.payload.dataSetPayload.dataSetMessages = &dmdf;
 
@@ -1290,6 +1295,7 @@ START_TEST(UA_PubSub_EnDecode_SelfContainingUnionSelfMemberKeyFrame){
 
     UA_Variant_setScalarCopy(&dmkf.data.keyFrameData.dataSetFields[0].value, &s, &selfContainingUnionType);
     dmkf.data.keyFrameData.dataSetFields[0].hasValue = true;
+    UA_free(s.fields.array.array);
 
     m.payload.dataSetPayload.dataSetMessages = &dmkf;
 
@@ -1408,12 +1414,14 @@ START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayNotConta
     ck_assert_int_eq(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldIndex, fieldIndex);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
     ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &ArrayOptType);
-    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).description.data, "TestDesc");
+    UA_String testStr = UA_STRING("TestDesc");
+    ck_assert(UA_String_equal(&(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).description, &testStr));
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).bSize, 1);
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).cSize, 0);
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).dSize, 3);
     ck_assert_ptr_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).c, NULL);
-    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).b[0].data, "Test");
+    UA_String testStr2 = UA_STRING("Test");
+    ck_assert(UA_String_equal(&(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).b[0], &testStr2));
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[0] - 1.1) < 0.005);
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[1] - 1.2) < 0.005);
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->d[2] - 1.3) < 0.005);
@@ -1502,12 +1510,14 @@ START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayNotConta
     ck_assert_int_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.fieldCount, 1);
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
     ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &ArrayOptType);
-    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).description.data, "TestDesc");
+    UA_String testStr = UA_STRING("TestDesc");
+    ck_assert(UA_String_equal(&(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).description, &testStr));
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).bSize, 1);
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).cSize, 0);
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).dSize, 3);
     ck_assert_ptr_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).c, NULL);
-    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).b[0].data, "Test");
+    UA_String testStr2 = UA_STRING("Test");
+    ck_assert(UA_String_equal(&(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).b[0], &testStr2));
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[0] - 1.1) < 0.005);
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[1] - 1.2) < 0.005);
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->d[2] - 1.3) < 0.005);
@@ -1591,11 +1601,13 @@ START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayContaine
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.hasValue);
     ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type, &ArrayOptType);
 
-    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).description.data, "TestDesc");
+    UA_String testStr = UA_STRING("TestDesc");
+    ck_assert(UA_String_equal(&(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).description, &testStr));
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).bSize, 1);
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).cSize, 3);
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).dSize, 3);
-    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).b[0].data, "Test");
+    UA_String testStr2 = UA_STRING("Test");
+    ck_assert(UA_String_equal(&(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data).b[0], &testStr2));
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->c[0] - 1.1) < 0.005);
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->c[1] - 1.2) < 0.005);
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)->c[2] - 1.3) < 0.005);
@@ -1693,11 +1705,13 @@ START_TEST(UA_PubSub_EnDecode_CustomStructureWithOptionalFieldsWithArrayContaine
     ck_assert(m.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue == m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].hasValue);
     ck_assert_ptr_eq(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type, &ArrayOptType);
 
-    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).description.data, "TestDesc");
+    UA_String testStr = UA_STRING("TestDesc");
+    ck_assert(UA_String_equal(&(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).description,  &testStr));
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).bSize, 1);
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).cSize, 3);
     ck_assert_uint_eq((*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).dSize, 3);
-    ck_assert_str_eq((char *)(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).b[0].data, "Test");
+    UA_String testStr2 = UA_STRING("Test");
+    ck_assert(UA_String_equal(&(*(OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data).b[0], &testStr2));
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->c[0] - 1.1) < 0.005);
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->c[1] - 1.2) < 0.005);
     ck_assert(fabs(((OptArray *)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)->c[2] - 1.3) < 0.005);

From 666e8f9843fa8f27b1f7a762382ded0fd38462b6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Mar 2023 18:20:21 +0100
Subject: [PATCH 0829/1963] refactor(pubsub): Remove duplicate lookups and
 unify writergroup remove

---
 src/pubsub/ua_pubsub.h             |  7 +--
 src/pubsub/ua_pubsub_connection.c  | 70 ++++++++++--------------------
 src/pubsub/ua_pubsub_manager.c     |  2 +-
 src/pubsub/ua_pubsub_writergroup.c | 20 +++++----
 4 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index b57b0512a07..c4c8451bdcc 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -160,10 +160,7 @@ void
 UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig);
 
 UA_StatusCode
-removePubSubConnection(UA_Server *server, const UA_NodeId connection);
-
-void
-UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection);
+UA_PubSubConnection_remove(UA_Server *server, UA_PubSubConnection *c);
 
 /* Register channel for given connectionIdentifier */
 UA_StatusCode
@@ -335,7 +332,7 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
                       UA_NodeId *writerGroupIdentifier);
 
 UA_StatusCode
-removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup);
+UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg);
 
 UA_StatusCode
 setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index e46358ff762..a9113774881 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -81,27 +81,6 @@ UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig) {
     UA_KeyValueMap_clear(&connectionConfig->connectionProperties);
 }
 
-void
-UA_PubSubConnection_clear(UA_Server *server, UA_PubSubConnection *connection) {
-    /* Remove WriterGroups */
-    UA_WriterGroup *writerGroup, *tmpWriterGroup;
-    LIST_FOREACH_SAFE(writerGroup, &connection->writerGroups,
-                      listEntry, tmpWriterGroup) {
-        removeWriterGroup(server, writerGroup->identifier);
-    }
-
-    /* Remove ReaderGroups */
-    UA_ReaderGroup *readerGroups, *tmpReaderGroup;
-    LIST_FOREACH_SAFE(readerGroups, &connection->readerGroups, listEntry, tmpReaderGroup)
-        removeReaderGroup(server, readerGroups->identifier);
-
-    UA_NodeId_clear(&connection->identifier);
-    if(connection->channel)
-        connection->channel->close(connection->channel);
-
-    UA_PubSubConnectionConfig_clear(&connection->config);
-}
-
 static void
 assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnectionsField,
                            UA_NodeId *connectionIdentifier) {
@@ -118,17 +97,6 @@ assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnection
     }
 }
 
-static UA_StatusCode
-channelErrorHandling(UA_Server *server, UA_PubSubConnection *newConnectionsField) {
-    UA_PubSubConnection_clear(server, newConnectionsField);
-    TAILQ_REMOVE(&server->pubSubManager.connections, newConnectionsField, listEntry);
-    server->pubSubManager.connectionsSize--;
-    UA_free(newConnectionsField);
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "PubSub Connection creation failed. Transport layer creation problem.");
-    return UA_STATUSCODE_BADINTERNALERROR;
-}
-
 UA_StatusCode
 UA_PubSubConnection_create(UA_Server *server,
                           const UA_PubSubConnectionConfig *connectionConfig,
@@ -178,8 +146,12 @@ UA_PubSubConnection_create(UA_Server *server,
     ctx.server = server;
 
     newConnectionsField->channel = tl->createPubSubChannel(tl, &ctx);
-    UA_CHECK_MEM(newConnectionsField->channel,
-                 return channelErrorHandling(server, newConnectionsField));
+    if(!newConnectionsField->channel) {
+        UA_PubSubConnection_remove(server, newConnectionsField);
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PubSub Connection creation failed. Transport layer creation problem.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
 #ifdef UA_ENABLE_PUBSUB_MQTT
     /* If the transport layer is MQTT, attach the server pointer to the callback function
@@ -214,12 +186,8 @@ UA_Server_addPubSubConnection(UA_Server *server,
 }
 
 UA_StatusCode
-removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
-    /* Find the connection */
-    UA_PubSubConnection *c =
-        UA_PubSubConnection_findConnectionbyId(server, connection);
-    if(!c)
-        return UA_STATUSCODE_BADNOTFOUND;
+UA_PubSubConnection_remove(UA_Server *server, UA_PubSubConnection *c) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Stop, unfreeze and delete all WriterGroups attached to the Connection */
     UA_WriterGroup *writerGroup, *tmpWriterGroup;
@@ -227,7 +195,7 @@ removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
         UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
                                       UA_STATUSCODE_BADSHUTDOWN);
         UA_WriterGroup_unfreezeConfiguration(server, writerGroup);
-        removeWriterGroup(server, writerGroup->identifier);
+        UA_WriterGroup_remove(server, writerGroup);
     }
 
     /* Stop, unfreeze and delete all ReaderGroups attached to the Connection */
@@ -239,8 +207,10 @@ removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
         removeReaderGroup(server, readerGroup->identifier);
     }
     /* Close the related channel */
-    if(c->channel->closeSubscriber) {
-        c->channel->closeSubscriber(c->channel);
+    if(c->channel) {
+        if(c->channel->closeSubscriber)
+            c->channel->closeSubscriber(c->channel);
+        c->channel->close(c->channel);
     }
 
     /* Remove from the information model */
@@ -252,8 +222,8 @@ removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
     TAILQ_REMOVE(&server->pubSubManager.connections, c, listEntry);
     server->pubSubManager.connectionsSize--;
 
-    /* Clean up the connection structure */
-    UA_PubSubConnection_clear(server, c);
+    UA_NodeId_clear(&c->identifier);
+    UA_PubSubConnectionConfig_clear(&c->config);
     UA_free(c);
 
     return UA_STATUSCODE_GOOD;
@@ -262,7 +232,15 @@ removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
 UA_StatusCode
 UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = removePubSubConnection(server, connection);
+    /* Find the connection */
+    UA_PubSubConnection *c =
+        UA_PubSubConnection_findConnectionbyId(server, connection);
+    if(!c) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+
+    UA_StatusCode res = UA_PubSubConnection_remove(server, c);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index c95f77ec254..f7d4a4d6757 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -610,7 +610,7 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     UA_PubSubConnection *tmpConnection1, *tmpConnection2;
     TAILQ_FOREACH_SAFE(tmpConnection1, &server->pubSubManager.connections,
                        listEntry, tmpConnection2) {
-        removePubSubConnection(server, tmpConnection1->identifier);
+        UA_PubSubConnection_remove(server, tmpConnection1);
     }
 
     /* Remove the DataSets */
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index ac4ea760201..6a7fdbf396e 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -240,10 +240,8 @@ UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
 }
 
 UA_StatusCode
-removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
-    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
-    if(!wg)
-        return UA_STATUSCODE_BADNOTFOUND;
+UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(wg->configurationFrozen) {
         UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
@@ -271,16 +269,15 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
         UA_DataSetWriter_remove(server, wg, dsw);
     }
 
-    connection->writerGroupsSize--;
-
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     deleteNode(server, wg->identifier, true);
 #endif
 
+    LIST_REMOVE(wg, listEntry);
+    connection->writerGroupsSize--;
+
     /* _clear also removes the refcount in the key storage */
     UA_WriterGroup_clear(server, wg);
-
-    LIST_REMOVE(wg, listEntry);
     UA_free(wg);
     return UA_STATUSCODE_GOOD;
 }
@@ -288,7 +285,12 @@ removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
 UA_StatusCode
 UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = removeWriterGroup(server, writerGroup);
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
+    if(!wg) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_WriterGroup_remove(server, wg);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }

From f636ccee68d1d8c0a5960d6063cfef5d839396f0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Mar 2023 18:39:06 +0100
Subject: [PATCH 0830/1963] refactor(pubsub): Simplify removal of
 DataSetWriters

---
 src/pubsub/ua_pubsub.h         |  7 +---
 src/pubsub/ua_pubsub_manager.c |  5 ++-
 src/pubsub/ua_pubsub_writer.c  | 73 +++++++++++++---------------------
 3 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index c4c8451bdcc..bc2881f688b 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -243,10 +243,6 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
                                         UA_DataSetMessage *dataSetMessage,
                                         UA_DataSetWriter *dataSetWriter);
 
-UA_StatusCode
-UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
-                        UA_DataSetWriter *dataSetWriter);
-
 UA_StatusCode
 UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
                                 UA_DataSetMessage *dsm);
@@ -263,8 +259,9 @@ UA_DataSetWriter_create(UA_Server *server,
                         const UA_DataSetWriterConfig *dataSetWriterConfig,
                         UA_NodeId *writerIdentifier);
 
+
 UA_StatusCode
-removeDataSetWriter(UA_Server *server, const UA_NodeId dsw);
+UA_DataSetWriter_remove(UA_Server *server, UA_DataSetWriter *dataSetWriter);
 
 #define UA_LOG_WRITER_INTERNAL(LOGGER, LEVEL, WRITER, MSG, ...)         \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index f7d4a4d6757..17039a8fe57 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -413,8 +413,9 @@ removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
         LIST_FOREACH(writerGroup, &tmpConnectoin->writerGroups, listEntry){
             UA_DataSetWriter *currentWriter, *tmpWriterGroup;
             LIST_FOREACH_SAFE(currentWriter, &writerGroup->writers, listEntry, tmpWriterGroup){
-                if(UA_NodeId_equal(&currentWriter->connectedDataSet, &publishedDataSet->identifier)){
-                    removeDataSetWriter(server, currentWriter->identifier);
+                if(UA_NodeId_equal(&currentWriter->connectedDataSet,
+                                   &publishedDataSet->identifier)) {
+                    UA_DataSetWriter_remove(server, currentWriter);
                 }
             }
         }
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 572e5341c42..4190f1b54c4 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -97,24 +97,6 @@ UA_DataSetWriterConfig_clear(UA_DataSetWriterConfig *pdsConfig) {
     memset(pdsConfig, 0, sizeof(UA_DataSetWriterConfig));
 }
 
-static void
-UA_DataSetWriter_clear(UA_Server *server, UA_DataSetWriter *dataSetWriter) {
-    UA_DataSetWriterConfig_clear(&dataSetWriter->config);
-    UA_NodeId_clear(&dataSetWriter->identifier);
-    UA_NodeId_clear(&dataSetWriter->linkedWriterGroup);
-    UA_NodeId_clear(&dataSetWriter->connectedDataSet);
-
-    /* Delete lastSamples store */
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
-    for(size_t i = 0; i < dataSetWriter->lastSamplesCount; i++) {
-        UA_DataValue_clear(&dataSetWriter->lastSamples[i].value);
-    }
-    UA_free(dataSetWriter->lastSamples);
-    dataSetWriter->lastSamples = NULL;
-    dataSetWriter->lastSamplesCount = 0;
-#endif
-}
-
 //state machine methods not part of the open62541 state machine API
 UA_StatusCode
 UA_DataSetWriter_setPubSubState(UA_Server *server,
@@ -456,12 +438,11 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
 }
 
 UA_StatusCode
-UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
-                        UA_DataSetWriter *dataSetWriter) {
+UA_DataSetWriter_remove(UA_Server *server, UA_DataSetWriter *dataSetWriter) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Frozen? */
-    if(linkedWriterGroup->configurationFrozen) {
+    if(dataSetWriter->configurationFrozen) {
         UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
                               "Remove DataSetWriter failed: WriterGroup is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -473,39 +454,41 @@ UA_DataSetWriter_remove(UA_Server *server, UA_WriterGroup *linkedWriterGroup,
 #endif
 
     /* Remove DataSetWriter from group */
-    UA_DataSetWriter_clear(server, dataSetWriter);
-    LIST_REMOVE(dataSetWriter, listEntry);
-    linkedWriterGroup->writersCount--;
-    UA_free(dataSetWriter);
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_WriterGroup *linkedWriterGroup =
+        UA_WriterGroup_findWGbyId(server, dataSetWriter->linkedWriterGroup);
+    if(linkedWriterGroup) {
+        LIST_REMOVE(dataSetWriter, listEntry);
+        linkedWriterGroup->writersCount--;
+    }
 
-    UA_DataSetWriter *dataSetWriter = UA_DataSetWriter_findDSWbyId(server, dsw);
-    if(!dataSetWriter)
-        return UA_STATUSCODE_BADNOTFOUND;
+    UA_DataSetWriterConfig_clear(&dataSetWriter->config);
+    UA_NodeId_clear(&dataSetWriter->identifier);
+    UA_NodeId_clear(&dataSetWriter->linkedWriterGroup);
+    UA_NodeId_clear(&dataSetWriter->connectedDataSet);
 
-    if(dataSetWriter->configurationFrozen) {
-        UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
-                              "Remove DataSetWriter failed: DataSetWriter is frozen");
-        return UA_STATUSCODE_BADCONFIGURATIONERROR;
+    /* Delete lastSamples store */
+#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
+    for(size_t i = 0; i < dataSetWriter->lastSamplesCount; i++) {
+        UA_DataValue_clear(&dataSetWriter->lastSamples[i].value);
     }
+    UA_free(dataSetWriter->lastSamples);
+    dataSetWriter->lastSamples = NULL;
+    dataSetWriter->lastSamplesCount = 0;
+#endif
 
-    UA_WriterGroup *linkedWriterGroup =
-        UA_WriterGroup_findWGbyId(server, dataSetWriter->linkedWriterGroup);
-    if(!linkedWriterGroup)
-        return UA_STATUSCODE_BADNOTFOUND;
-
-    return UA_DataSetWriter_remove(server, linkedWriterGroup, dataSetWriter);
+    UA_free(dataSetWriter);
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
 UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = removeDataSetWriter(server, dsw);
+    UA_DataSetWriter *dataSetWriter = UA_DataSetWriter_findDSWbyId(server, dsw);
+    if(!dataSetWriter) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_DataSetWriter_remove(server, dataSetWriter);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }

From 6f5c811738c772afaf97aeeee3beec1176003ab2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Mar 2023 18:39:25 +0100
Subject: [PATCH 0831/1963] refactor(pubsub): Simplify removal of WriterGroups

---
 src/pubsub/ua_pubsub_writergroup.c | 65 +++++++++++++-----------------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 6a7fdbf396e..194c2f84ef4 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -24,9 +24,6 @@
 
 #define UA_MAX_STACKBUF 128 /* Max size of network messages on the stack */
 
-static void
-UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup);
-
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
 static UA_StatusCode
 encryptAndSign(UA_WriterGroup *wg, const UA_NetworkMessage *nm,
@@ -243,6 +240,11 @@ UA_StatusCode
 UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    if(wg->configurationFrozen) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Deleting %p", (void*)wg);
+    }
+
     if(wg->configurationFrozen) {
         UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
                                    "Deleting the WriterGroup failed. "
@@ -266,18 +268,37 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
 
     UA_DataSetWriter *dsw, *dsw_tmp;
     LIST_FOREACH_SAFE(dsw, &wg->writers, listEntry, dsw_tmp) {
-        UA_DataSetWriter_remove(server, wg, dsw);
+        UA_DataSetWriter_remove(server, dsw);
     }
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     deleteNode(server, wg->identifier, true);
 #endif
 
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    if(wg->config.securityPolicy && wg->securityPolicyContext) {
+        wg->config.securityPolicy->deleteContext(wg->securityPolicyContext);
+        wg->securityPolicyContext = NULL;
+    }
+#endif
+
+#ifdef UA_ENABLE_PUBSUB_SKS
+    if(wg->keyStorage) {
+        UA_PubSubKeyStorage_detachKeyStorage(server, wg->keyStorage);
+        wg->keyStorage = NULL;
+    }
+#endif
+
+    UA_WriterGroupConfig_clear(&wg->config);
+    UA_NodeId_clear(&wg->identifier);
+    UA_NetworkMessageOffsetBuffer_clear(&wg->bufferedMessage);
+    if(wg->channel) {
+        wg->channel->close(wg->channel);
+    }
+
     LIST_REMOVE(wg, listEntry);
     connection->writerGroupsSize--;
-
-    /* _clear also removes the refcount in the key storage */
-    UA_WriterGroup_clear(server, wg);
     UA_free(wg);
     return UA_STATUSCODE_GOOD;
 }
@@ -718,36 +739,6 @@ UA_WriterGroupConfig_clear(UA_WriterGroupConfig *writerGroupConfig) {
     memset(writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
 }
 
-static void
-UA_WriterGroup_clear(UA_Server *server, UA_WriterGroup *writerGroup) {
-    /* Delete all writers */
-    UA_DataSetWriter *dataSetWriter, *tmpDataSetWriter;
-    LIST_FOREACH_SAFE(dataSetWriter, &writerGroup->writers, listEntry, tmpDataSetWriter){
-        removeDataSetWriter(server, dataSetWriter->identifier);
-    }
-
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-    if(writerGroup->config.securityPolicy && writerGroup->securityPolicyContext) {
-        writerGroup->config.securityPolicy->deleteContext(writerGroup->securityPolicyContext);
-        writerGroup->securityPolicyContext = NULL;
-    }
-#endif
-
-#ifdef UA_ENABLE_PUBSUB_SKS
-    if(writerGroup->keyStorage) {
-        UA_PubSubKeyStorage_detachKeyStorage(server, writerGroup->keyStorage);
-        writerGroup->keyStorage = NULL;
-    }
-#endif
-
-    UA_WriterGroupConfig_clear(&writerGroup->config);
-    UA_NodeId_clear(&writerGroup->identifier);
-    UA_NetworkMessageOffsetBuffer_clear(&writerGroup->bufferedMessage);
-    if(writerGroup->channel) {
-        writerGroup->channel->close(writerGroup->channel);
-    }
-}
-
 UA_StatusCode
 UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                               UA_PubSubState state, UA_StatusCode cause) {

From dc49488fbe8d8a81caf5bb69d720c0b4a14b66c3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Mar 2023 18:55:59 +0100
Subject: [PATCH 0832/1963] refactor(pubsub): Simplify DataSetField remove

---
 src/pubsub/ua_pubsub.h         |  2 +-
 src/pubsub/ua_pubsub_dataset.c | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index bc2881f688b..d932be38893 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -413,7 +413,7 @@ UA_DataSetField *
 UA_DataSetField_findDSFbyId(UA_Server *server, UA_NodeId identifier);
 
 UA_DataSetFieldResult
-removeDataSetField(UA_Server *server, const UA_NodeId dsf);
+UA_DataSetField_remove(UA_Server *server, UA_DataSetField *currentField);
 
 UA_DataSetFieldResult
 UA_DataSetField_create(UA_Server *server, const UA_NodeId publishedDataSet,
diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 095a1f213e5..7823292d706 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -147,8 +147,8 @@ void
 UA_PublishedDataSet_clear(UA_Server *server, UA_PublishedDataSet *publishedDataSet) {
     UA_DataSetField *field, *tmpField;
     TAILQ_FOREACH_SAFE(field, &publishedDataSet->fields, listEntry, tmpField) {
-        /* Code in this block is a duplication of similar code in removeDataSetField, but
-         * this is intentional. We don't want to call removeDataSetField here as that
+        /* Code in this block is a duplication of similar code in UA_DataSetField_remove, but
+         * this is intentional. We don't want to call UA_DataSetField_remove here as that
          * function regenerates DataSetMetaData, which is not necessary if we want to
          * clear the whole PDS anyway. */
         if(field->configurationFrozen) {
@@ -419,16 +419,10 @@ UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
 }
 
 UA_DataSetFieldResult
-removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
+UA_DataSetField_remove(UA_Server *server, UA_DataSetField *currentField) {
     UA_DataSetFieldResult result;
     memset(&result, 0, sizeof(UA_DataSetFieldResult));
 
-    UA_DataSetField *currentField = UA_DataSetField_findDSFbyId(server, dsf);
-    if(!currentField) {
-        result.result = UA_STATUSCODE_BADNOTFOUND;
-        return result;
-    }
-
     UA_PublishedDataSet *pds =
         UA_PublishedDataSet_findPDSbyId(server, currentField->publishedDataSet);
     if(!pds) {
@@ -514,7 +508,15 @@ removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
 UA_DataSetFieldResult
 UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
     UA_LOCK(&server->serviceMutex);
-    UA_DataSetFieldResult res = removeDataSetField(server, dsf);
+    UA_DataSetFieldResult res;
+    memset(&res, 0, sizeof(UA_DataSetFieldResult));
+    UA_DataSetField *field = UA_DataSetField_findDSFbyId(server, dsf);
+    if(!field) {
+        res.result = UA_STATUSCODE_BADNOTFOUND;
+        UA_UNLOCK(&server->serviceMutex);
+        return res;
+    }
+    res = UA_DataSetField_remove(server, field);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }

From 5a577281503d24902771eedb56ee4b209fd3a303 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Mar 2023 18:56:35 +0100
Subject: [PATCH 0833/1963] refactor(pubsub): Simplify DataSetReader remove

---
 src/pubsub/ua_pubsub.h             |  2 +-
 src/pubsub/ua_pubsub_manager.c     |  6 ++++--
 src/pubsub/ua_pubsub_reader.c      | 14 +++++++-------
 src/pubsub/ua_pubsub_readergroup.c |  4 ----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index d932be38893..27945ade2b0 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -462,7 +462,7 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
                         UA_NodeId *readerIdentifier);
 
 UA_StatusCode
-removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier);
+UA_DataSetReader_remove(UA_Server *server, UA_DataSetReader *dsr);
 
 /* Copy the configuration of DataSetReader */
 UA_StatusCode UA_DataSetReaderConfig_copy(const UA_DataSetReaderConfig *src,
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 17039a8fe57..6503ab523bf 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -524,13 +524,15 @@ removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
             UA_DataSetReader *currentReader, *tmpReader;
             LIST_FOREACH_SAFE(currentReader, &readerGroup->readers, listEntry, tmpReader){
                 if(UA_NodeId_equal(&currentReader->identifier, &subscribedDataSet->connectedReader)){
-                    removeDataSetReader(server, currentReader->identifier);
-                    // todo -> break out of loop
+                    UA_DataSetReader_remove(server, currentReader);
+                    goto done;
                 }
             }
         }
     }
 
+ done:
+
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     deleteNode(server, subscribedDataSet->identifier, true);
 #endif
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index e43d51bd152..c7877dc6d44 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -263,12 +263,7 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
 }
 
 UA_StatusCode
-removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
-    /* Remove datasetreader given by the identifier */
-    UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
-    if(!dsr)
-        return UA_STATUSCODE_BADNOTFOUND;
-
+UA_DataSetReader_remove(UA_Server *server, UA_DataSetReader *dsr) {
     if(dsr->configurationFrozen) {
         UA_LOG_WARNING_READER(&server->config.logger, dsr,
                               "Remove DataSetReader failed, "
@@ -339,7 +334,12 @@ removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
 UA_StatusCode
 UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = removeDataSetReader(server, readerIdentifier);
+    UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
+    if(!dsr) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_DataSetReader_remove(server, dsr);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 7dc4f9c1550..9d3c2ba8416 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -49,10 +49,6 @@ UA_ReaderGroup_findDSRbyId(UA_Server *server, UA_NodeId identifier) {
     return NULL;
 }
 
-/* Clear ReaderGroup */
-static void
-ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *readerGroup);
-
 /* ReaderGroup Config Handling */
 
 UA_StatusCode

From b82ac34f43bedfa2fff1ac1699ff730c4587fc75 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Mar 2023 18:56:51 +0100
Subject: [PATCH 0834/1963] refactor(pubsub): Simplify ReaderGroup_remove

---
 src/pubsub/ua_pubsub.h             |  2 +-
 src/pubsub/ua_pubsub_connection.c  |  2 +-
 src/pubsub/ua_pubsub_readergroup.c | 89 +++++++++++++-----------------
 3 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 27945ade2b0..84cab36f3b8 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -560,7 +560,7 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
                       UA_NodeId *readerGroupId);
 
 UA_StatusCode
-removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier);
+UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg);
 
 UA_StatusCode
 setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index a9113774881..0395771fff9 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -204,7 +204,7 @@ UA_PubSubConnection_remove(UA_Server *server, UA_PubSubConnection *c) {
         UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
                                       UA_STATUSCODE_BADSHUTDOWN);
         UA_ReaderGroup_unfreezeConfiguration(server, readerGroup);
-        removeReaderGroup(server, readerGroup->identifier);
+        UA_ReaderGroup_remove(server, readerGroup);
     }
     /* Close the related channel */
     if(c->channel) {
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 9d3c2ba8416..937669834d4 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -290,40 +290,62 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
 }
 
 UA_StatusCode
-removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
-    UA_ReaderGroup* readerGroup =
-        UA_ReaderGroup_findRGbyId(server, groupIdentifier);
-    if(readerGroup == NULL)
-        return UA_STATUSCODE_BADNOTFOUND;
-
-    if(readerGroup->configurationFrozen) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
+    if(rg->configurationFrozen) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
                                    "Remove ReaderGroup failed. "
                                    "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
     /* Unregister subscribe callback */
-    if(readerGroup->state == UA_PUBSUBSTATE_OPERATIONAL)
-        UA_ReaderGroup_removeSubscribeCallback(server, readerGroup);
+    if(rg->state == UA_PUBSUBSTATE_OPERATIONAL)
+        UA_ReaderGroup_removeSubscribeCallback(server, rg);
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    deleteNode(server, readerGroup->identifier, true);
+    deleteNode(server, rg->identifier, true);
+#endif
+
+    UA_DataSetReader *dsr, *tmp_dsr;
+    LIST_FOREACH_SAFE(dsr, &rg->readers, listEntry, tmp_dsr) {
+        UA_DataSetReader_remove(server, dsr);
+    }
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    if(rg->config.securityPolicy && rg->securityPolicyContext) {
+        rg->config.securityPolicy->deleteContext(rg->securityPolicyContext);
+        rg->securityPolicyContext = NULL;
+    }
+#endif
+
+#ifdef UA_ENABLE_PUBSUB_SKS
+    if(rg->keyStorage) {
+        UA_PubSubKeyStorage_detachKeyStorage(server, rg->keyStorage);
+        rg->keyStorage = NULL;
+    }
 #endif
 
-    /* UA_Server_ReaderGroup_clear also removes itself from the list */
-    ReaderGroup_clear(server, readerGroup);
+    LIST_REMOVE(rg, listEntry);
+    UA_PubSubConnection* pConn = rg->linkedConnection;
+    if(pConn != NULL)
+        pConn->readerGroupsSize--;
 
-    /* Remove readerGroup from Connection */
-    LIST_REMOVE(readerGroup, listEntry);
-    UA_free(readerGroup);
+    UA_NodeId_clear(&rg->identifier);
+    UA_ReaderGroupConfig_clear(&rg->config);
+    UA_free(rg);
     return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
 UA_Server_removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = removeReaderGroup(server, groupIdentifier);
+    UA_ReaderGroup* readerGroup =
+        UA_ReaderGroup_findRGbyId(server, groupIdentifier);
+    if(!readerGroup) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_ReaderGroup_remove(server, readerGroup);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -351,39 +373,6 @@ UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifi
     return ret;
 }
 
-static void
-ReaderGroup_clear(UA_Server* server, UA_ReaderGroup *rg) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
-    UA_ReaderGroupConfig_clear(&rg->config);
-    UA_DataSetReader *dsr, *tmp_dsr;
-    LIST_FOREACH_SAFE(dsr, &rg->readers, listEntry, tmp_dsr) {
-        removeDataSetReader(server, dsr->identifier);
-    }
-    UA_PubSubConnection* pConn = rg->linkedConnection;
-    if(pConn != NULL)
-        pConn->readerGroupsSize--;
-
-    /* Delete ReaderGroup and its members */
-    UA_NodeId_clear(&rg->identifier);
-
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-    if(rg->config.securityPolicy && rg->securityPolicyContext) {
-        rg->config.securityPolicy->deleteContext(rg->securityPolicyContext);
-        rg->securityPolicyContext = NULL;
-    }
-#endif
-
-#ifdef UA_ENABLE_PUBSUB_SKS
-    if(rg->keyStorage) {
-        UA_PubSubKeyStorage_detachKeyStorage(server, rg->keyStorage);
-        rg->keyStorage = NULL;
-    }
-#endif
-
-    UA_ReaderGroupConfig_clear(&rg->config);
-}
-
 UA_StatusCode
 UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifier,
                                UA_PubSubState *state) {

From b52ffc3b0d4a9608b8f5302722aa9cd8564e6add Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 Mar 2023 19:07:37 +0100
Subject: [PATCH 0835/1963] refactor(pubsub): Move/simplify handling of
 published data sets

---
 src/pubsub/ua_pubsub.h         |   3 +
 src/pubsub/ua_pubsub_dataset.c | 174 ++++++++++++++++++++++++++++++++
 src/pubsub/ua_pubsub_manager.c | 176 +--------------------------------
 3 files changed, 179 insertions(+), 174 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 84cab36f3b8..445551cafee 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -76,6 +76,9 @@ void
 UA_PublishedDataSet_clear(UA_Server *server,
                           UA_PublishedDataSet *publishedDataSet);
 
+UA_StatusCode
+UA_PublishedDataSet_remove(UA_Server *server, UA_PublishedDataSet *publishedDataSet);
+
 UA_StatusCode
 getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
                           UA_PublishedDataSetConfig *config);
diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 7823292d706..415a31f7d59 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -11,6 +11,7 @@
  */
 
 #include "ua_pubsub.h"
+#include "ua_pubsub_ns0.h"
 #include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
@@ -599,4 +600,177 @@ UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
     }
 }
 
+UA_AddPublishedDataSetResult
+UA_PublishedDataSet_create(UA_Server *server,
+                           const UA_PublishedDataSetConfig *publishedDataSetConfig,
+                           UA_NodeId *pdsIdentifier) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    UA_AddPublishedDataSetResult result = {UA_STATUSCODE_BADINVALIDARGUMENT, 0, NULL, {0, 0}};
+    if(!publishedDataSetConfig){
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PublishedDataSet creation failed. No config passed in.");
+        return result;
+    }
+
+    if(publishedDataSetConfig->publishedDataSetType != UA_PUBSUB_DATASET_PUBLISHEDITEMS){
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PublishedDataSet creation failed. Unsupported PublishedDataSet type.");
+        return result;
+    }
+
+    if(UA_String_isEmpty(&publishedDataSetConfig->name)) {
+        // DataSet has to have a valid name
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PublishedDataSet creation failed. Invalid name.");
+        return result;
+    }
+
+    if(UA_PublishedDataSet_findPDSbyName(server, publishedDataSetConfig->name)) {
+        // DataSet name has to be unique in the publisher
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PublishedDataSet creation failed. DataSet with the same name already exists.");
+        result.addResult = UA_STATUSCODE_BADBROWSENAMEDUPLICATED;
+        return result;
+    }
+
+    /* Create new PDS and add to UA_PubSubManager */
+    UA_PublishedDataSet *newPDS = (UA_PublishedDataSet *)
+        UA_calloc(1, sizeof(UA_PublishedDataSet));
+    if(!newPDS) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PublishedDataSet creation failed. Out of Memory.");
+        result.addResult = UA_STATUSCODE_BADOUTOFMEMORY;
+        return result;
+    }
+    TAILQ_INIT(&newPDS->fields);
+
+    UA_PublishedDataSetConfig *newConfig = &newPDS->config;
+
+    /* Deep copy the given connection config */
+    UA_StatusCode res = UA_PublishedDataSetConfig_copy(publishedDataSetConfig, newConfig);
+    if(res != UA_STATUSCODE_GOOD){
+        UA_free(newPDS);
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "PublishedDataSet creation failed. Configuration copy failed.");
+        result.addResult = UA_STATUSCODE_BADINTERNALERROR;
+        return result;
+    }
+
+    /* TODO: Parse template config and add fields (later PubSub batch) */
+    if(newConfig->publishedDataSetType == UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE) {
+    }
+
+    /* Fill the DataSetMetaData */
+    result.configurationVersion.majorVersion = UA_PubSubConfigurationVersionTimeDifference();
+    result.configurationVersion.minorVersion = UA_PubSubConfigurationVersionTimeDifference();
+    switch(newConfig->publishedDataSetType) {
+    case UA_PUBSUB_DATASET_PUBLISHEDEVENTS_TEMPLATE:
+        res = UA_STATUSCODE_BADNOTSUPPORTED;
+        break;
+    case UA_PUBSUB_DATASET_PUBLISHEDEVENTS:
+        res = UA_STATUSCODE_BADNOTSUPPORTED;
+        break;
+    case UA_PUBSUB_DATASET_PUBLISHEDITEMS:
+        newPDS->dataSetMetaData.configurationVersion.majorVersion =
+            UA_PubSubConfigurationVersionTimeDifference();
+        newPDS->dataSetMetaData.configurationVersion.minorVersion =
+            UA_PubSubConfigurationVersionTimeDifference();
+        newPDS->dataSetMetaData.description = UA_LOCALIZEDTEXT_ALLOC("", "");
+        newPDS->dataSetMetaData.dataSetClassId = UA_GUID_NULL;
+        res = UA_String_copy(&newConfig->name, &newPDS->dataSetMetaData.name);
+        break;
+    case UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE:
+        res = UA_DataSetMetaDataType_copy(&newConfig->config.itemsTemplate.metaData,
+                                          &newPDS->dataSetMetaData);
+        break;
+    default:
+        res = UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Abort? */
+    result.addResult = res;
+    if(result.addResult != UA_STATUSCODE_GOOD) {
+        UA_PublishedDataSetConfig_clear(newConfig);
+        UA_free(newPDS);
+        return result;
+    }
+
+    /* Insert into the queue of the manager */
+    TAILQ_INSERT_TAIL(&server->pubSubManager.publishedDataSets, newPDS, listEntry);
+    server->pubSubManager.publishedDataSetsSize++;
+
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    /* Create representation and unique id */
+    addPublishedDataItemsRepresentation(server, newPDS);
+#else
+    /* Generate unique nodeId */
+    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager, &newPDS->identifier);
+#endif
+    if(pdsIdentifier)
+        UA_NodeId_copy(&newPDS->identifier, pdsIdentifier);
+
+    return result;
+}
+
+UA_AddPublishedDataSetResult
+UA_Server_addPublishedDataSet(UA_Server *server,
+                              const UA_PublishedDataSetConfig *publishedDataSetConfig,
+                              UA_NodeId *pdsIdentifier) {
+    UA_LOCK(&server->serviceMutex);
+    UA_AddPublishedDataSetResult res =
+        UA_PublishedDataSet_create(server, publishedDataSetConfig, pdsIdentifier);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_PublishedDataSet_remove(UA_Server *server, UA_PublishedDataSet *publishedDataSet) {
+    if(publishedDataSet->configurationFreezeCounter > 0) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "Remove PublishedDataSet failed. PublishedDataSet is frozen.");
+        return UA_STATUSCODE_BADCONFIGURATIONERROR;
+    }
+
+    //search for referenced writers -> delete this writers. (Standard: writer must be connected with PDS)
+    UA_PubSubConnection *tmpConnectoin;
+    TAILQ_FOREACH(tmpConnectoin, &server->pubSubManager.connections, listEntry){
+        UA_WriterGroup *writerGroup;
+        LIST_FOREACH(writerGroup, &tmpConnectoin->writerGroups, listEntry){
+            UA_DataSetWriter *currentWriter, *tmpWriterGroup;
+            LIST_FOREACH_SAFE(currentWriter, &writerGroup->writers, listEntry, tmpWriterGroup){
+                if(UA_NodeId_equal(&currentWriter->connectedDataSet,
+                                   &publishedDataSet->identifier)) {
+                    UA_DataSetWriter_remove(server, currentWriter);
+                }
+            }
+        }
+    }
+
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    deleteNode(server, publishedDataSet->identifier, true);
+#endif
+
+    UA_PublishedDataSet_clear(server, publishedDataSet);
+    server->pubSubManager.publishedDataSetsSize--;
+
+    TAILQ_REMOVE(&server->pubSubManager.publishedDataSets, publishedDataSet, listEntry);
+    UA_free(publishedDataSet);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
+    UA_LOCK(&server->serviceMutex);
+    UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
+    if(!currentPDS) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+    UA_StatusCode res = UA_PublishedDataSet_remove(server, currentPDS);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 6503ab523bf..a69cb306054 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -11,11 +11,11 @@
  */
 
 #include "ua_pubsub.h"
+#include "ua_pubsub_ns0.h"
 #include "server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
-#include "ua_pubsub_ns0.h"
 #ifdef UA_ENABLE_PUBSUB_SKS
 #include "ua_pubsub_keystorage.h"
 #endif
@@ -269,178 +269,6 @@ UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 nu
     return UA_STATUSCODE_GOOD;
 }
 
-UA_AddPublishedDataSetResult
-UA_PublishedDataSet_create(UA_Server *server,
-                           const UA_PublishedDataSetConfig *publishedDataSetConfig,
-                           UA_NodeId *pdsIdentifier) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
-    UA_AddPublishedDataSetResult result = {UA_STATUSCODE_BADINVALIDARGUMENT, 0, NULL, {0, 0}};
-    if(!publishedDataSetConfig){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PublishedDataSet creation failed. No config passed in.");
-        return result;
-    }
-
-    if(publishedDataSetConfig->publishedDataSetType != UA_PUBSUB_DATASET_PUBLISHEDITEMS){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PublishedDataSet creation failed. Unsupported PublishedDataSet type.");
-        return result;
-    }
-
-    if(UA_String_isEmpty(&publishedDataSetConfig->name)) {
-        // DataSet has to have a valid name
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PublishedDataSet creation failed. Invalid name.");
-        return result;
-    }
-
-    if(UA_PublishedDataSet_findPDSbyName(server, publishedDataSetConfig->name)) {
-        // DataSet name has to be unique in the publisher
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PublishedDataSet creation failed. DataSet with the same name already exists.");
-        result.addResult = UA_STATUSCODE_BADBROWSENAMEDUPLICATED;
-        return result;
-    }
-
-    /* Create new PDS and add to UA_PubSubManager */
-    UA_PublishedDataSet *newPDS = (UA_PublishedDataSet *)
-        UA_calloc(1, sizeof(UA_PublishedDataSet));
-    if(!newPDS) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PublishedDataSet creation failed. Out of Memory.");
-        result.addResult = UA_STATUSCODE_BADOUTOFMEMORY;
-        return result;
-    }
-    TAILQ_INIT(&newPDS->fields);
-
-    UA_PublishedDataSetConfig *newConfig = &newPDS->config;
-
-    /* Deep copy the given connection config */
-    UA_StatusCode res = UA_PublishedDataSetConfig_copy(publishedDataSetConfig, newConfig);
-    if(res != UA_STATUSCODE_GOOD){
-        UA_free(newPDS);
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PublishedDataSet creation failed. Configuration copy failed.");
-        result.addResult = UA_STATUSCODE_BADINTERNALERROR;
-        return result;
-    }
-
-    /* TODO: Parse template config and add fields (later PubSub batch) */
-    if(newConfig->publishedDataSetType == UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE) {
-    }
-
-    /* Fill the DataSetMetaData */
-    result.configurationVersion.majorVersion = UA_PubSubConfigurationVersionTimeDifference();
-    result.configurationVersion.minorVersion = UA_PubSubConfigurationVersionTimeDifference();
-    switch(newConfig->publishedDataSetType) {
-    case UA_PUBSUB_DATASET_PUBLISHEDEVENTS_TEMPLATE:
-        res = UA_STATUSCODE_BADNOTSUPPORTED;
-        break;
-    case UA_PUBSUB_DATASET_PUBLISHEDEVENTS:
-        res = UA_STATUSCODE_BADNOTSUPPORTED;
-        break;
-    case UA_PUBSUB_DATASET_PUBLISHEDITEMS:
-        newPDS->dataSetMetaData.configurationVersion.majorVersion =
-            UA_PubSubConfigurationVersionTimeDifference();
-        newPDS->dataSetMetaData.configurationVersion.minorVersion =
-            UA_PubSubConfigurationVersionTimeDifference();
-        newPDS->dataSetMetaData.description = UA_LOCALIZEDTEXT_ALLOC("", "");
-        newPDS->dataSetMetaData.dataSetClassId = UA_GUID_NULL;
-        res = UA_String_copy(&newConfig->name, &newPDS->dataSetMetaData.name);
-        break;
-    case UA_PUBSUB_DATASET_PUBLISHEDITEMS_TEMPLATE:
-        res = UA_DataSetMetaDataType_copy(&newConfig->config.itemsTemplate.metaData,
-                                          &newPDS->dataSetMetaData);
-        break;
-    default:
-        res = UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Abort? */
-    result.addResult = res;
-    if(result.addResult != UA_STATUSCODE_GOOD) {
-        UA_PublishedDataSetConfig_clear(newConfig);
-        UA_free(newPDS);
-        return result;
-    }
-
-    /* Insert into the queue of the manager */
-    TAILQ_INSERT_TAIL(&server->pubSubManager.publishedDataSets, newPDS, listEntry);
-    server->pubSubManager.publishedDataSetsSize++;
-
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    /* Create representation and unique id */
-    addPublishedDataItemsRepresentation(server, newPDS);
-#else
-    /* Generate unique nodeId */
-    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager, &newPDS->identifier);
-#endif
-    if(pdsIdentifier)
-        UA_NodeId_copy(&newPDS->identifier, pdsIdentifier);
-
-    return result;
-}
-
-UA_AddPublishedDataSetResult
-UA_Server_addPublishedDataSet(UA_Server *server,
-                              const UA_PublishedDataSetConfig *publishedDataSetConfig,
-                              UA_NodeId *pdsIdentifier) {
-    UA_LOCK(&server->serviceMutex);
-    UA_AddPublishedDataSetResult res =
-        UA_PublishedDataSet_create(server, publishedDataSetConfig, pdsIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-static UA_StatusCode
-removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
-    //search the identified PublishedDataSet and store the PDS index
-    UA_PublishedDataSet *publishedDataSet = UA_PublishedDataSet_findPDSbyId(server, pds);
-    if(!publishedDataSet)
-        return UA_STATUSCODE_BADNOTFOUND;
-
-    if(publishedDataSet->configurationFreezeCounter > 0) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "Remove PublishedDataSet failed. PublishedDataSet is frozen.");
-        return UA_STATUSCODE_BADCONFIGURATIONERROR;
-    }
-
-    //search for referenced writers -> delete this writers. (Standard: writer must be connected with PDS)
-    UA_PubSubConnection *tmpConnectoin;
-    TAILQ_FOREACH(tmpConnectoin, &server->pubSubManager.connections, listEntry){
-        UA_WriterGroup *writerGroup;
-        LIST_FOREACH(writerGroup, &tmpConnectoin->writerGroups, listEntry){
-            UA_DataSetWriter *currentWriter, *tmpWriterGroup;
-            LIST_FOREACH_SAFE(currentWriter, &writerGroup->writers, listEntry, tmpWriterGroup){
-                if(UA_NodeId_equal(&currentWriter->connectedDataSet,
-                                   &publishedDataSet->identifier)) {
-                    UA_DataSetWriter_remove(server, currentWriter);
-                }
-            }
-        }
-    }
-
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    deleteNode(server, publishedDataSet->identifier, true);
-#endif
-
-    UA_PublishedDataSet_clear(server, publishedDataSet);
-    server->pubSubManager.publishedDataSetsSize--;
-
-    TAILQ_REMOVE(&server->pubSubManager.publishedDataSets, publishedDataSet, listEntry);
-    UA_free(publishedDataSet);
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = removePublishedDataSet(server, pds);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
 /* Calculate the time difference between current time and UTC (00:00) on January
  * 1, 2000. */
 UA_UInt32
@@ -620,7 +448,7 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     UA_PublishedDataSet *tmpPDS1, *tmpPDS2;
     TAILQ_FOREACH_SAFE(tmpPDS1, &server->pubSubManager.publishedDataSets,
                        listEntry, tmpPDS2){
-        removePublishedDataSet(server, tmpPDS1->identifier);
+        UA_PublishedDataSet_remove(server, tmpPDS1);
     }
 
     /* Remove the TopicAssigns */

From daa36116ff65d4cadb03a57ca9eedab0fb656d46 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Fri, 24 Mar 2023 11:18:46 +0100
Subject: [PATCH 0836/1963] fix(el): Check event loop pointer before access
 (#5697)

* fix(el): Check event loop pointer before access

* fix(el): do not stop external event loop at exit

* fix (el): Stop server event loop after cleaning admin session

Cleanup of admin session adds a delayed callback to the event loop.
If the event loop is stopped before, this callback is not executed
any more.

* fix (el): Remove duplicate stop of server eventloop

Eventloop is already stopped in UA_ServerConfig_clean.

* fix(server): check server shutdown before deletion

Check if UA_Server_run_shutdown has already been called
before UA_Server_delete
---
 src/server/ua_server.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index ee3ac05bc04..c2c3f2fec77 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -182,6 +182,12 @@ void UA_Server_delete(UA_Server *server) {
     if(server == NULL) {
         return;
     }
+    /* check if UA_Server_run_shutdown has already been called */
+    if(server->houseKeepingCallbackId != 0) {
+        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                       "UA_Server_run_shutdown shall be called before UA_Server_delete");
+    }
+
     UA_LOCK(&server->serviceMutex);
 
     UA_Server_deleteSecureChannels(server);
@@ -224,19 +230,6 @@ void UA_Server_delete(UA_Server *server) {
     UA_AsyncManager_clear(&server->asyncManager, server);
 #endif
 
-    /* Stop the EventLoop and iterate until stopped or an error occurs */
-    if(server->config.eventLoop->state == UA_EVENTLOOPSTATE_STARTED)
-        server->config.eventLoop->stop(server->config.eventLoop);
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    while(res == UA_STATUSCODE_GOOD &&
-          (server->config.eventLoop->state != UA_EVENTLOOPSTATE_FRESH &&
-           server->config.eventLoop->state != UA_EVENTLOOPSTATE_STOPPED)) {
-
-        UA_UNLOCK(&server->serviceMutex);
-        res = server->config.eventLoop->run(server->config.eventLoop, 100);
-        UA_LOCK(&server->serviceMutex);
-    }
-
     /* Clean up the Admin Session */
     UA_Session_clear(&server->adminSession, server);
 
@@ -476,7 +469,9 @@ UA_Server_changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId
 void
 removeCallback(UA_Server *server, UA_UInt64 callbackId) {
     UA_EventLoop *el = server->config.eventLoop;
-    el->removeCyclicCallback(el, callbackId);
+    if(el) {
+        el->removeCyclicCallback(el, callbackId);
+    }
 }
 
 void

From 83b36651279440e466529f86c6e0cf6ab561e471 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Mar 2023 23:24:41 +0100
Subject: [PATCH 0837/1963] feat(client): Always close the SecureChannel when
 sending fails

---
 src/client/ua_client.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index c1be2106a91..d5d91c6f68e 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -387,6 +387,12 @@ sendRequest(UA_Client *client, const void *request,
 
     rr->authenticationToken = oldToken; /* Set back to the original token */
 
+    /* Sending failed. The SecureChannel cannot recover from that. Call
+     * closeSecureChannel to a) close from our end and b) set the session to
+     * non-activated. */
+    if(retval != UA_STATUSCODE_GOOD)
+        closeSecureChannel(client);
+
     /* Return the request id */
     *requestId = rqId;
     return retval;

From b70378d5fde34328623cc25381ae8ff1219a6bbf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Mar 2023 23:44:49 +0100
Subject: [PATCH 0838/1963] feat(client): Immediately set the Session
 non-active when closing the SecureChannel

---
 src/client/ua_client_connect.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 6175baccb8b..11fb9b80bb3 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1845,6 +1845,12 @@ UA_StatusCode UA_Client_startListeningForReverseConnect(UA_Client *client, const
 
 void
 closeSecureChannel(UA_Client *client) {
+    /* If we close SecureChannel when the Session is still active, set to
+     * created. Otherwise the Session would remain active until the connection
+     * callback is called for the closing connection. */
+    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
+        client->sessionState = UA_SESSIONSTATE_CREATED;
+
     /* Prevent recursion */
     if(client->channel.state == UA_SECURECHANNELSTATE_CLOSING ||
        client->channel.state == UA_SECURECHANNELSTATE_CLOSED)

From 95f655313b9227de7026f52c9b872e2c6428be8c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Mar 2023 23:54:43 +0100
Subject: [PATCH 0839/1963] refactor(client): Cosmetic improvements

---
 src/client/ua_client.c         |  3 +-
 src/client/ua_client_connect.c | 75 +++++++++++++++++++---------------
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d5d91c6f68e..d984b174b10 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -977,8 +977,7 @@ clientHouseKeeping(UA_Client *client, void *_) {
 }
 
 UA_StatusCode
-__UA_Client_startup(UA_Client *client)
-{
+__UA_Client_startup(UA_Client *client) {
     /* On entry, the client mutex is already locked */
     UA_EventLoop *el = client->config.eventLoop;
     UA_CHECK_ERROR(el != NULL,
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 11fb9b80bb3..6b397032211 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1707,17 +1707,19 @@ __Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId
 
     UA_LOCK(&client->clientMutex);
 
-    /* This is the first call for the listening socket, attach the REVERSE_CONNECT_INDICATOR marker
-     * and set the ID to the channel */
-    if (!client->channel.connectionId) {
+    /* This is the first call for the listening socket, attach the
+     * REVERSE_CONNECT_INDICATOR marker and set the ID to the channel */
+    if(!client->channel.connectionId) {
         client->channel.connectionId = connectionId;
         *connectionContext = REVERSE_CONNECT_INDICATOR;
     }
 
-    /* Last call for the listening connection while it is being closed.
-     * Only notify a state change if no reverse connection is being or has been established by now */
-    if (*connectionContext == REVERSE_CONNECT_INDICATOR && state == UA_CONNECTIONSTATE_CLOSING) {
-        if (client->channel.connectionId == connectionId) {
+    /* Last call for the listening connection while it is being closed. Only
+     * notify a state change if no reverse connection is being or has been
+     * established by now */
+    if(*connectionContext == REVERSE_CONNECT_INDICATOR &&
+       state == UA_CONNECTIONSTATE_CLOSING) {
+        if(client->channel.connectionId == connectionId) {
             client->channel.state = UA_SECURECHANNELSTATE_CLOSED;
             notifyClientState(client);
         }
@@ -1725,37 +1727,46 @@ __Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId
         return;
     }
 
-    /* Second callback for the listening socket, it is now listening for incoming connections */
-    if (client->channel.connectionId == connectionId &&  *connectionContext == REVERSE_CONNECT_INDICATOR) {
+    /* Second callback for the listening socket, it is now listening for
+     * incoming connections */
+    if(client->channel.connectionId == connectionId &&
+       *connectionContext == REVERSE_CONNECT_INDICATOR) {
         client->channel.state = UA_SECURECHANNELSTATE_REVERSE_LISTENING;
         notifyClientState(client);
     }
 
-    /* This is a connection initiated by a server, disconnect the listener and reset secure channel information */
-    if (client->channel.connectionId != connectionId) {
+    /* This is a connection initiated by a server, disconnect the listener and
+     * reset secure channel information */
+    if(client->channel.connectionId != connectionId) {
         cm->closeConnection(cm, client->channel.connectionId);
         client->channel.connectionId = 0;
         *connectionContext = NULL;
     }
 
-    /* Forward all calls belonging to the reverse connection estblished by the server to the regular network callback */
-    if (*connectionContext != REVERSE_CONNECT_INDICATOR) {
+    /* Forward all calls belonging to the reverse connection estblished by the
+     * server to the regular network callback */
+    if(*connectionContext != REVERSE_CONNECT_INDICATOR) {
         UA_UNLOCK(&client->clientMutex);
-        __Client_networkCallback(cm, connectionId, application, connectionContext, state, params, msg);
+        __Client_networkCallback(cm, connectionId, application,
+                                 connectionContext, state, params, msg);
         return;
     }
 
     UA_UNLOCK(&client->clientMutex);
 }
 
-UA_StatusCode UA_Client_startListeningForReverseConnect(UA_Client *client, const UA_String *listenHostnames,
-                                                        size_t listenHostnamesLength,
-                                                        UA_UInt16 port) {
+UA_StatusCode
+UA_Client_startListeningForReverseConnect(UA_Client *client,
+                                          const UA_String *listenHostnames,
+                                          size_t listenHostnamesLength,
+                                          UA_UInt16 port) {
     UA_LOCK(&client->clientMutex);
 
-    if (client->channel.state > UA_SECURECHANNELSTATE_FRESH && client->channel.state < UA_SECURECHANNELSTATE_CLOSED) {
+    if(client->channel.state > UA_SECURECHANNELSTATE_FRESH &&
+       client->channel.state < UA_SECURECHANNELSTATE_CLOSED) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "Unable to listen for reverse connect while the client is connected or already listening");
+                       "Unable to listen for reverse connect while the client "
+                       "is connected or already listening");
         UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADINVALIDSTATE;
     }
@@ -1788,26 +1799,26 @@ UA_StatusCode UA_Client_startListeningForReverseConnect(UA_Client *client, const
         UA_CHECK_STATUS(res, UA_UNLOCK(&client->clientMutex); return res);
     }
 
-    for(UA_EventSource *es = client->config.eventLoop->eventSources; es != NULL; es = es->next) {
-
+    UA_ConnectionManager *cm = NULL;
+    for(UA_EventSource *es = el->eventSources; es != NULL; es = es->next) {
         if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
             continue;
-
-        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
-        if(!UA_String_equal(&tcpString, &cm->protocol))
-            continue;
-
-        client->channel.connectionManager = cm;
-        break;
+        cm = (UA_ConnectionManager*)es;
+        if(UA_String_equal(&tcpString, &cm->protocol))
+            break;
+        cm = NULL;
     }
 
-    if (!client->channel.connectionManager) {
+    if(!cm) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "Could not find a TCP connection manager, unable to listen for reverse connect");
+                       "Could not find a TCP connection manager, unable to "
+                       "listen for reverse connect");
         UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    client->channel.connectionManager = cm;
+
     UA_KeyValuePair params[3];
     bool booleanTrue = true;
     params[0].key = UA_QUALIFIEDNAME(0, "port");
@@ -1823,8 +1834,7 @@ UA_StatusCode UA_Client_startListeningForReverseConnect(UA_Client *client, const
     paramMap.mapSize = 3;
 
     UA_UNLOCK(&client->clientMutex);
-    res = client->channel.connectionManager->openConnection(client->channel.connectionManager, &paramMap,
-                                                            client, NULL, __Client_reverseConnectCallback);
+    res = cm->openConnection(cm, &paramMap, client, NULL, __Client_reverseConnectCallback);
     UA_LOCK(&client->clientMutex);
 
     /* Opening the TCP connection failed */
@@ -1835,7 +1845,6 @@ UA_StatusCode UA_Client_startListeningForReverseConnect(UA_Client *client, const
     }
 
     UA_UNLOCK(&client->clientMutex);
-
     return res;
 }
 

From 15a019d6f90f6ac75ef27aa66d2370709e400a60 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 00:06:34 +0100
Subject: [PATCH 0840/1963] refactor(client): Pull "isFullyConnected" into
 single method with reuse

---
 src/client/ua_client.c          |  5 +----
 src/client/ua_client_connect.c  | 28 ++++++++++++++++++++--------
 src/client/ua_client_internal.h |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d984b174b10..202d73d937c 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -570,10 +570,7 @@ __Client_Service(UA_Client *client, const void *request,
 
     /* Check that the SecureChannel is open and also a Session active (if we
      * want a Session). Otherwise reopen. */
-    if((client->sessionState != UA_SESSIONSTATE_ACTIVATED && !client->noSession) ||
-       client->channel.state != UA_SECURECHANNELSTATE_OPEN ||
-       client->endpointsHandshake || client->findServersHandshake ||
-       client->discoveryUrl.length == 0) {
+    if(!isFullyConnected(client)) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                     "Re-establish the connction for the synchronous service call");
         connectSync(client);
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 6b397032211..d838b02369b 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -68,6 +68,24 @@ endpointUnconfigured(UA_Client *client) {
     return (test == 0);
 }
 
+UA_Boolean
+isFullyConnected(UA_Client *client) {
+    /* No Session, but require one */
+    if(client->sessionState != UA_SESSIONSTATE_ACTIVATED && !client->noSession)
+        return false;
+
+    /* No SecureChannel */
+    if(client->channel.state != UA_SECURECHANNELSTATE_OPEN)
+        return false;
+
+    /* Handshake ongoing or not yet done */
+    if(client->endpointsHandshake || endpointUnconfigured(client) ||
+       client->findServersHandshake || client->discoveryUrl.length == 0)
+        return false;
+
+    return true;
+}
+
 #ifdef UA_ENABLE_ENCRYPTION
 
 /* Function to create a signature using remote certificate and nonce */
@@ -1453,11 +1471,8 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     /* Trigger the next action from our end to fully open up the connection */
  continue_connect:
-    if(client->connectStatus == UA_STATUSCODE_GOOD &&
-       ((client->noSession && client->channel.state != UA_SECURECHANNELSTATE_OPEN) ||
-        client->sessionState < UA_SESSIONSTATE_ACTIVATED)) {
+    if(!isFullyConnected(client))
         connectActivity(client);
-    }
 
     /* Notify the application if the client state has changed */
     notifyClientState(client);
@@ -1627,10 +1642,7 @@ connectSync(UA_Client *client) {
             break;
 
         /* Sufficiently connected? */
-        if(!client->endpointsHandshake && !client->findServersHandshake &&
-           client->discoveryUrl.length > 0 &&
-           (client->sessionState == UA_SESSIONSTATE_ACTIVATED ||
-            (client->noSession && client->channel.state == UA_SECURECHANNELSTATE_OPEN)))
+        if(isFullyConnected(client))
             break;
 
         /* Timeout -> abort */
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 005cde5d0e7..5415a793410 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -206,6 +206,7 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message);
 
+UA_Boolean isFullyConnected(UA_Client *client);
 void connectSync(UA_Client *client);
 void notifyClientState(UA_Client *client);
 void processRHEMessage(UA_Client *client, const UA_ByteString *chunk);

From 3bb153a45fd0f9570e2ae43928bd3c4f6be199fc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 18:38:07 +0200
Subject: [PATCH 0841/1963] refactor(server): Simplify DiscoveryManager API

---
 src/server/ua_discovery_manager.c | 4 ++--
 src/server/ua_discovery_manager.h | 4 ++--
 src/server/ua_server.c            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index f38fc11e790..3f3a8195d21 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -16,7 +16,7 @@
 #ifdef UA_ENABLE_DISCOVERY
 
 void
-UA_DiscoveryManager_init(UA_DiscoveryManager *dm, UA_Server *server) {
+UA_DiscoveryManager_init(UA_DiscoveryManager *dm) {
     LIST_INIT(&dm->registeredServers);
     dm->registeredServersSize = 0;
     LIST_INIT(&dm->periodicServerRegisterCallbacks);
@@ -41,7 +41,7 @@ UA_DiscoveryManager_init(UA_DiscoveryManager *dm, UA_Server *server) {
 }
 
 void
-UA_DiscoveryManager_clear(UA_DiscoveryManager *dm, UA_Server *server) {
+UA_DiscoveryManager_clear(UA_DiscoveryManager *dm) {
     registeredServer_list_entry *rs, *rs_tmp;
     LIST_FOREACH_SAFE(rs, &dm->registeredServers, pointers, rs_tmp) {
         LIST_REMOVE(rs, pointers);
diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index dfd11ea410c..f9b0bab21fa 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -104,8 +104,8 @@ typedef struct {
 # endif /* UA_ENABLE_DISCOVERY_MULTICAST */
 } UA_DiscoveryManager;
 
-void UA_DiscoveryManager_init(UA_DiscoveryManager *dm, UA_Server *server);
-void UA_DiscoveryManager_clear(UA_DiscoveryManager *dm, UA_Server *server);
+void UA_DiscoveryManager_init(UA_DiscoveryManager *dm);
+void UA_DiscoveryManager_clear(UA_DiscoveryManager *dm);
 
 /* Checks if a registration timed out and removes that registration.
  * Should be called periodically in main loop */
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 0685dc0db96..512a918f1b2 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -223,7 +223,7 @@ void UA_Server_delete(UA_Server *server) {
 #endif
 
 #ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager_clear(&server->discoveryManager, server);
+    UA_DiscoveryManager_clear(&server->discoveryManager);
 #endif
 
 #if UA_MULTITHREADING >= 100
@@ -340,7 +340,7 @@ UA_Server_init(UA_Server *server) {
 
     /* Initialized discovery */
 #ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager_init(&server->discoveryManager, server);
+    UA_DiscoveryManager_init(&server->discoveryManager);
 #endif
 
     /* Initialize namespace 0*/

From 22c841ca91c62b9a5395d1dababf4392837103f5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 18:57:01 +0200
Subject: [PATCH 0842/1963] refactor(server): Harmonize the DiscoveryManager
 API

---
 src/server/ua_discovery_manager.c  | 78 ++++++++++++++++++++++++++++++
 src/server/ua_discovery_manager.h  |  5 +-
 src/server/ua_server.c             | 13 ++---
 src/server/ua_services_discovery.c | 58 ----------------------
 4 files changed, 87 insertions(+), 67 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index 3f3a8195d21..4dcc5514e41 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -81,4 +81,82 @@ UA_DiscoveryManager_clear(UA_DiscoveryManager *dm) {
 # endif /* UA_ENABLE_DISCOVERY_MULTICAST */
 }
 
+void
+UA_DiscoveryManager_start(UA_Server *server) {
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    if(server->config.mdnsEnabled)
+        startMulticastDiscoveryServer(server);
+#endif
+}
+
+void
+UA_DiscoveryManager_stop(UA_Server *server) {
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    if(server->config.mdnsEnabled)
+        stopMulticastDiscoveryServer(server);
+#endif
+}
+
+/* Cleanup server registration: If the semaphore file path is set, then it just
+ * checks the existence of the file. When it is deleted, the registration is
+ * removed. If there is no semaphore file, then the registration will be removed
+ * if it is older than 60 minutes. */
+void
+UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
+                                    UA_DateTime nowMonotonic) {
+    /* TimedOut gives the last DateTime at which we must have seen the
+     * registered server. Otherwise it is timed out. */
+    UA_DateTime timedOut = nowMonotonic;
+    if(server->config.discoveryCleanupTimeout)
+        timedOut -= server->config.discoveryCleanupTimeout * UA_DATETIME_SEC;
+
+    UA_DiscoveryManager *dm = &server->discoveryManager;
+    registeredServer_list_entry *current, *temp;
+    LIST_FOREACH_SAFE(current, &dm->registeredServers, pointers, temp) {
+        UA_Boolean semaphoreDeleted = false;
+
+#ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
+        if(current->registeredServer.semaphoreFilePath.length) {
+            size_t fpSize = current->registeredServer.semaphoreFilePath.length+1;
+            char* filePath = (char *)UA_malloc(fpSize);
+            if(filePath) {
+                memcpy(filePath, current->registeredServer.semaphoreFilePath.data,
+                       current->registeredServer.semaphoreFilePath.length );
+                filePath[current->registeredServer.semaphoreFilePath.length] = '\0';
+                semaphoreDeleted = UA_fileExists(filePath) == false;
+                UA_free(filePath);
+            } else {
+                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                             "Cannot check registration semaphore. Out of memory");
+            }
+        }
+#endif
+
+        if(semaphoreDeleted ||
+           (server->config.discoveryCleanupTimeout &&
+            current->lastSeen < timedOut)) {
+            if(semaphoreDeleted) {
+                UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                            "Registration of server with URI %.*s is removed because "
+                            "the semaphore file '%.*s' was deleted",
+                            (int)current->registeredServer.serverUri.length,
+                            current->registeredServer.serverUri.data,
+                            (int)current->registeredServer.semaphoreFilePath.length,
+                            current->registeredServer.semaphoreFilePath.data);
+            } else {
+                // cppcheck-suppress unreadVariable
+                UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                            "Registration of server with URI %.*s has timed out "
+                            "and is removed",
+                            (int)current->registeredServer.serverUri.length,
+                            current->registeredServer.serverUri.data);
+            }
+            LIST_REMOVE(current, pointers);
+            UA_RegisteredServer_clear(&current->registeredServer);
+            UA_free(current);
+            server->discoveryManager.registeredServersSize--;
+        }
+    }
+}
+
 #endif /* UA_ENABLE_DISCOVERY */
diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index f9b0bab21fa..a46454068de 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -106,10 +106,13 @@ typedef struct {
 
 void UA_DiscoveryManager_init(UA_DiscoveryManager *dm);
 void UA_DiscoveryManager_clear(UA_DiscoveryManager *dm);
+void UA_DiscoveryManager_start(UA_Server *server);
+void UA_DiscoveryManager_stop(UA_Server *server);
 
 /* Checks if a registration timed out and removes that registration.
  * Should be called periodically in main loop */
-void UA_Discovery_cleanupTimedOut(UA_Server *server, UA_DateTime nowMonotonic);
+void UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
+                                         UA_DateTime nowMonotonic);
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
 
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 512a918f1b2..a1207d5ab5a 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -255,7 +255,7 @@ serverHouseKeeping(UA_Server *server, void *_) {
     UA_Server_cleanupSessions(server, nowMonotonic);
     UA_Server_cleanupTimedOutSecureChannels(server, nowMonotonic);
 #ifdef UA_ENABLE_DISCOVERY
-    UA_Discovery_cleanupTimedOut(server, nowMonotonic);
+    UA_DiscoveryManager_cleanupTimedOut(server, nowMonotonic);
 #endif
     UA_UNLOCK(&server->serviceMutex);
 }
@@ -920,9 +920,8 @@ UA_Server_run_startup(UA_Server *server) {
     }
 
     /* Start the multicast discovery server */
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    if(server->config.mdnsEnabled)
-        startMulticastDiscoveryServer(server);
+#ifdef UA_ENABLE_DISCOVERY
+    UA_DiscoveryManager_start(server);
 #endif
 
     /* Update Endpoint description */
@@ -1005,10 +1004,8 @@ UA_Server_run_shutdown(UA_Server *server) {
             res = el->run(el, 100); /* Iterate until stopped */
     }
 
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    /* Stop multicast discovery */
-    if(server->config.mdnsEnabled)
-        stopMulticastDiscoveryServer(server);
+#ifdef UA_ENABLE_DISCOVERY
+    UA_DiscoveryManager_stop(server);
 #endif
 
     setReverseConnectRetryCallback(server, false);
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index c297191de00..281b0c16ef2 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -449,64 +449,6 @@ void Service_RegisterServer2(UA_Server *server, UA_Session *session,
                            response->diagnosticInfos);
 }
 
-/* Cleanup server registration: If the semaphore file path is set, then it just
- * checks the existence of the file. When it is deleted, the registration is
- * removed. If there is no semaphore file, then the registration will be removed
- * if it is older than 60 minutes. */
-void UA_Discovery_cleanupTimedOut(UA_Server *server, UA_DateTime nowMonotonic) {
-    UA_DateTime timedOut = nowMonotonic;
-    // registration is timed out if lastSeen is older than 60 minutes (default
-    // value, can be modified by user).
-    if(server->config.discoveryCleanupTimeout)
-        timedOut -= server->config.discoveryCleanupTimeout * UA_DATETIME_SEC;
-
-    registeredServer_list_entry* current, *temp;
-    LIST_FOREACH_SAFE(current, &server->discoveryManager.registeredServers, pointers, temp) {
-        UA_Boolean semaphoreDeleted = false;
-
-#ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
-        if(current->registeredServer.semaphoreFilePath.length) {
-            size_t fpSize = sizeof(char)*current->registeredServer.semaphoreFilePath.length+1;
-            // todo: malloc may fail: return a statuscode
-            char* filePath = (char *)UA_malloc(fpSize);
-            if(filePath) {
-                memcpy(filePath, current->registeredServer.semaphoreFilePath.data,
-                       current->registeredServer.semaphoreFilePath.length );
-                filePath[current->registeredServer.semaphoreFilePath.length] = '\0';
-                semaphoreDeleted = UA_fileExists(filePath) == false;
-                UA_free(filePath);
-            } else {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                             "Cannot check registration semaphore. Out of memory");
-            }
-        }
-#endif
-
-        if(semaphoreDeleted || (server->config.discoveryCleanupTimeout &&
-                                current->lastSeen < timedOut)) {
-            if(semaphoreDeleted) {
-                UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "Registration of server with URI %.*s is removed because "
-                            "the semaphore file '%.*s' was deleted.",
-                            (int)current->registeredServer.serverUri.length,
-                            current->registeredServer.serverUri.data,
-                            (int)current->registeredServer.semaphoreFilePath.length,
-                            current->registeredServer.semaphoreFilePath.data);
-            } else {
-                // cppcheck-suppress unreadVariable
-                UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                            "Registration of server with URI %.*s has timed out and is removed.",
-                            (int)current->registeredServer.serverUri.length,
-                            current->registeredServer.serverUri.data);
-            }
-            LIST_REMOVE(current, pointers);
-            UA_RegisteredServer_clear(&current->registeredServer);
-            UA_free(current);
-            server->discoveryManager.registeredServersSize--;
-        }
-    }
-}
-
 /* Called by the UA_Server callback. The OPC UA specification says:
  *
  * > If an error occurs during registration (e.g. the Discovery Server is not running) then the Server

From bd588da43a3707cde60a321517511e37b21a5354 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 19:05:36 +0200
Subject: [PATCH 0843/1963] fix(examples): Correctly shut down server before
 delete in discovery/server_multicast.c

---
 examples/discovery/server_multicast.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/discovery/server_multicast.c b/examples/discovery/server_multicast.c
index e72af6b38cb..661e3222887 100644
--- a/examples/discovery/server_multicast.c
+++ b/examples/discovery/server_multicast.c
@@ -278,6 +278,7 @@ int main(int argc, char **argv) {
     while (running && discovery_url == NULL)
         UA_Server_run_iterate(server, true);
     if(!running) {
+        UA_Server_run_shutdown(server);
         UA_Server_delete(server);
         UA_free(discovery_url);
         return EXIT_SUCCESS;
@@ -292,6 +293,7 @@ int main(int argc, char **argv) {
     if(endpointRegister == NULL || endpointRegister->securityMode == UA_MESSAGESECURITYMODE_INVALID) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "Could not find any suitable endpoints on discovery server");
+        UA_Server_run_shutdown(server);
         UA_Server_delete(server);
         return EXIT_FAILURE;
     }
@@ -300,6 +302,7 @@ int main(int argc, char **argv) {
     if(!clientRegister) {
         UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                      "Could not create the client for remote registering");
+        UA_Server_run_shutdown(server);
         UA_Server_delete(server);
         return EXIT_FAILURE;
     }
@@ -318,6 +321,7 @@ int main(int argc, char **argv) {
         UA_free(endpointUrl);
         UA_Client_disconnect(clientRegister);
         UA_Client_delete(clientRegister);
+        UA_Server_run_shutdown(server);
         UA_Server_delete(server);
         return EXIT_FAILURE;
     }

From e0960b1822122c5f295a4f6643e5c47499add794 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 19:53:19 +0200
Subject: [PATCH 0844/1963] fix(el): Remove pointer-based absolute ordering in
 DateTime comparison

---
 arch/common/ua_timer.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index 2b6ec7f460c..a671ddf5fa0 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -8,23 +8,13 @@
 
 #include "ua_timer.h"
 
-/* There may be several entries with the same nextTime in the tree. We give them
- * an absolute order by considering the memory address to break ties. Because of
- * this, the nextTime property cannot be used to lookup specific entries. */
 static enum ZIP_CMP
 cmpDateTime(const UA_DateTime *a, const UA_DateTime *b) {
-    if(*a < *b)
-        return ZIP_CMP_LESS;
-    if(*a > *b)
-        return ZIP_CMP_MORE;
-    if(a == b)
+    if(*a == *b)
         return ZIP_CMP_EQ;
-    if(a < b)
-        return ZIP_CMP_LESS;
-    return ZIP_CMP_MORE;
+    return (*a < *b) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
 }
 
-/* The identifiers of entries are unique */
 static enum ZIP_CMP
 cmpId(const UA_UInt64 *a, const UA_UInt64 *b) {
     if(*a < *b)

From 74724999a2aba5919cd3003c49ce3add527e09af Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 19:54:21 +0200
Subject: [PATCH 0845/1963] refactor(el): Simplify id comparison for timers

---
 arch/common/ua_timer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index a671ddf5fa0..dbf49b732c2 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -17,11 +17,9 @@ cmpDateTime(const UA_DateTime *a, const UA_DateTime *b) {
 
 static enum ZIP_CMP
 cmpId(const UA_UInt64 *a, const UA_UInt64 *b) {
-    if(*a < *b)
-        return ZIP_CMP_LESS;
     if(*a == *b)
         return ZIP_CMP_EQ;
-    return ZIP_CMP_MORE;
+    return (*a < *b) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
 }
 
 ZIP_FUNCTIONS(UA_TimerTree, UA_TimerEntry, treeEntry, UA_DateTime, nextTime, cmpDateTime)

From 2574c7c515eaf8125c38f424a71d26ee5260f710 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 20:24:25 +0200
Subject: [PATCH 0846/1963] fix(examples): Fix API usage in
 pubsub_subscribe_standalone.c

---
 examples/pubsub/pubsub_subscribe_standalone.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/pubsub/pubsub_subscribe_standalone.c b/examples/pubsub/pubsub_subscribe_standalone.c
index 55daa3f41e9..ee607d5a41a 100644
--- a/examples/pubsub/pubsub_subscribe_standalone.c
+++ b/examples/pubsub/pubsub_subscribe_standalone.c
@@ -137,8 +137,10 @@ int main(int argc, char **argv) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
 
+    UA_TransportLayerContext ctx;
+    ctx.connectionConfig = &connectionConfig;
     UA_PubSubChannel *psc =
-        udpLayer.createPubSubChannel(&udpLayer, &connectionConfig);
+        udpLayer.createPubSubChannel(&udpLayer, &ctx);
     psc->regist(psc, NULL, NULL);
 
     UA_StatusCode retval = UA_STATUSCODE_GOOD;

From b9b3fa2e9a2d7ca6ffb873f6a211ca817b7d919e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 20:48:36 +0200
Subject: [PATCH 0847/1963] fix(examples): Fix locking in
 pubsub_subscribe_standalone_dataset.c

---
 examples/pubsub/pubsub_subscribe_standalone_dataset.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/pubsub/pubsub_subscribe_standalone_dataset.c b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
index e1ba8ec9214..4247bb6d277 100644
--- a/examples/pubsub/pubsub_subscribe_standalone_dataset.c
+++ b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
@@ -15,6 +15,7 @@
 #include <open62541/server_config_default.h>
 
 #include "ua_pubsub.h"
+#include "../server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB_ETH_UADP
 #include <open62541/plugin/pubsub_ethernet.h>
@@ -106,7 +107,9 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     if(retval != UA_STATUSCODE_GOOD) {
         return retval;
     }
+    UA_LOCK(&server->serviceMutex);
     retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
+    UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
 

From d17989a12bcf1cb6580434555d00cf09c84ec23d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 21:10:55 +0200
Subject: [PATCH 0848/1963] fix(pubsub): Fix a memleak in generateFieldMetaData

---
 src/pubsub/ua_pubsub_dataset.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 415a31f7d59..4a52bd7b698 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -236,6 +236,8 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
     }
     fieldMetaData->arrayDimensionsSize = value.arrayDimensionsSize;
 
+    UA_Variant_clear(&value);
+
     /* Set the DataType */
     res = readWithReadValue(server, &pp->publishedVariable,
                             UA_ATTRIBUTEID_DATATYPE, &fieldMetaData->dataType);

From 58a6cc2d1b2461f6bcd85e3507d71946cc2bdfcf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 21:24:34 +0200
Subject: [PATCH 0849/1963] refactor(pubsub): Speed improvements in
 UA_NetworkMessage_calcSizeBinary

---
 src/pubsub/ua_pubsub_networkmessage.c | 64 ++++++++++++---------------
 1 file changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 8994ee4ae9f..d2f778c05ee 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -881,13 +881,12 @@ increaseOffsetArray(UA_NetworkMessageOffsetBuffer *offsetBuffer) {
 size_t
 UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
                                  UA_NetworkMessageOffsetBuffer *offsetBuffer) {
-    size_t retval = 0;
     UA_Byte byte = 0;
-    size_t size = UA_Byte_calcSizeBinary(&byte); // UADPVersion + UADPFlags
+    size_t size = 1; /* byte */
     if(UA_NetworkMessage_ExtendedFlags1Enabled(p)) {
-        size += UA_Byte_calcSizeBinary(&byte);
+        size += 1; /* byte */
         if(UA_NetworkMessage_ExtendedFlags2Enabled(p))
-            size += UA_Byte_calcSizeBinary(&byte);
+            size += 1 /* byte */
     }
 
     if(p->publisherIdEnabled) {
@@ -899,23 +898,20 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
             offsetBuffer->offsets[pos].offset = size;
             offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_PUBLISHERID;
         }
-        switch (p->publisherIdType) {
+
+        switch(p->publisherIdType) {
             case UA_PUBLISHERIDTYPE_BYTE:
-                size += UA_Byte_calcSizeBinary(&p->publisherId.byte);
+                size += 1; /* byte */
                 break;
-
             case UA_PUBLISHERIDTYPE_UINT16:
-                size += UA_UInt16_calcSizeBinary(&p->publisherId.uint16);
+                size += 2; /* uint16 */
                 break;
-
             case UA_PUBLISHERIDTYPE_UINT32:
-                size += UA_UInt32_calcSizeBinary(&p->publisherId.uint32);
+                size += 4; /* uint32 */
                 break;
-
             case UA_PUBLISHERIDTYPE_UINT64:
-                size += UA_UInt64_calcSizeBinary(&p->publisherId.uint64);
+                size += 8; /* uint64 */
                 break;
-
             case UA_PUBLISHERIDTYPE_STRING:
                 size += UA_String_calcSizeBinary(&p->publisherId.string);
                 break;
@@ -923,11 +919,11 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
     }
 
     if(p->dataSetClassIdEnabled)
-        size += UA_Guid_calcSizeBinary(&p->dataSetClassId);
+        size += 16; /* guid */
 
     // Group Header
     if(p->groupHeaderEnabled) {
-        size += UA_Byte_calcSizeBinary(&byte);
+        size += 1; /* byte */
 
         if(p->groupHeader.writerGroupIdEnabled) {
             if(offsetBuffer) {
@@ -938,14 +934,14 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
                 offsetBuffer->offsets[pos].offset = size;
                 offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_WRITERGROUPID;
             }
-            size += UA_UInt16_calcSizeBinary(&p->groupHeader.writerGroupId);
+            size += 2; /* UA_UInt16_calcSizeBinary(&p->groupHeader.writerGroupId) */
         }
 
         if(p->groupHeader.groupVersionEnabled)
-            size += UA_UInt32_calcSizeBinary(&p->groupHeader.groupVersion);
+            size += 4; /* UA_UInt32_calcSizeBinary(&p->groupHeader.groupVersion) */
 
         if(p->groupHeader.networkMessageNumberEnabled) {
-            size += UA_UInt16_calcSizeBinary(&p->groupHeader.networkMessageNumber);
+            size += 2; /* UA_UInt16_calcSizeBinary(&p->groupHeader.networkMessageNumber) */
         }
 
         if(p->groupHeader.sequenceNumberEnabled){
@@ -959,14 +955,14 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
                 offsetBuffer->offsets[pos].contentType =
                     UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_SEQUENCENUMBER;
             }
-            size += UA_UInt16_calcSizeBinary(&p->groupHeader.sequenceNumber);
+            size += 2; /* UA_UInt16_calcSizeBinary(&p->groupHeader.sequenceNumber) */
         }
     }
 
     // Payload Header
     if(p->payloadHeaderEnabled) {
         if(p->networkMessageType == UA_NETWORKMESSAGE_DATASET) {
-            size += UA_Byte_calcSizeBinary(&p->payloadHeader.dataSetPayloadHeader.count);
+            size += 1; /* p->payloadHeader.dataSetPayloadHeader.count */
             if(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != NULL) {
                 if(offsetBuffer) {
                     size_t pos = offsetBuffer->offsetsSize;
@@ -975,8 +971,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
                     offsetBuffer->offsets[pos].offset = size;
                     offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_DATASETWRITERID;
                 }
-                size += UA_UInt16_calcSizeBinary(&p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[0]) *
-                        p->payloadHeader.dataSetPayloadHeader.count;
+                size += 2 * p->payloadHeader.dataSetPayloadHeader.count; /* uint16 */
             } else {
                 return 0; /* no dataSetWriterIds given! */
             }
@@ -993,7 +988,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
             offsetBuffer->offsets[pos].offset = size;
             offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_TIMESTAMP;
         }
-        size += UA_DateTime_calcSizeBinary(&p->timestamp);
+        size += 8; /* UA_DateTime_calcSizeBinary(&p->timestamp) */
     }
 
     if(p->picosecondsEnabled){
@@ -1004,22 +999,22 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
             offsetBuffer->offsets[pos].offset = size;
             offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_TIMESTAMP_PICOSECONDS;
         }
-        size += UA_UInt16_calcSizeBinary(&p->picoseconds);
+        size += 2; /* UA_UInt16_calcSizeBinary(&p->picoseconds) */
     }
 
     if(p->promotedFieldsEnabled) {
-        size += UA_UInt16_calcSizeBinary(&p->promotedFieldsSize);
+        size += 2; /* UA_UInt16_calcSizeBinary(&p->promotedFieldsSize) */
         for(UA_UInt16 i = 0; i < p->promotedFieldsSize; i++)
             size += UA_Variant_calcSizeBinary(&p->promotedFields[i]);
     }
 
     if(p->securityEnabled) {
-        size += UA_Byte_calcSizeBinary(&byte);
-        size += UA_UInt32_calcSizeBinary(&p->securityHeader.securityTokenId);
-        size += 1; /* UA_Byte_calcSizeBinary(&p->securityHeader.nonceLength); */
+        size += 1; /* UA_Byte_calcSizeBinary(&byte) */
+        size += 4; /* UA_UInt32_calcSizeBinary(&p->securityHeader.securityTokenId) */
+        size += 1; /* UA_Byte_calcSizeBinary(&p->securityHeader.nonceLength) */
         size += p->securityHeader.messageNonceSize;
         if(p->securityHeader.securityFooterEnabled)
-            size += UA_UInt16_calcSizeBinary(&p->securityHeader.securityFooterSize);
+            size += 2; /* UA_UInt16_calcSizeBinary(&p->securityHeader.securityFooterSize) */
     }
 
     if(p->networkMessageType == UA_NETWORKMESSAGE_DATASET) {
@@ -1027,14 +1022,14 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
         if(p->payloadHeaderEnabled) {
             count = p->payloadHeader.dataSetPayloadHeader.count;
             if(count > 1)
-                size += UA_UInt16_calcSizeBinary(&p->payload.dataSetPayload.sizes[0]) * count;
+                size += 2 * count; /* uint16 */
         }
 
         for(size_t i = 0; i < count; i++) {
+            UA_DataSetMessage *dsm = &p->payload.dataSetPayload.dataSetMessages[i];
             if(offsetBuffer)
-                UA_DataSetMessage_calcSizeBinary(&p->payload.dataSetPayload.dataSetMessages[i], offsetBuffer,
-                                                 size);
-            size += UA_DataSetMessage_calcSizeBinary(&p->payload.dataSetPayload.dataSetMessages[i], NULL, 0);
+                UA_DataSetMessage_calcSizeBinary(dsm, offsetBuffer, size);
+            size += UA_DataSetMessage_calcSizeBinary(dsm, NULL, 0);
         }
     }
 
@@ -1043,8 +1038,7 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
             size += p->securityHeader.securityFooterSize;
     }
 
-    retval = size;
-    return retval;
+    return size;
 }
 
 void

From 37ea12f8b0f03b9b9025f242a9735f343259ed88 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Mar 2023 23:24:41 +0200
Subject: [PATCH 0850/1963] refactor(pubsub): Simplify
 UA_NetworkMessage_calcSizeBinary

---
 src/pubsub/ua_pubsub_networkmessage.c | 263 ++++++++++----------------
 src/pubsub/ua_pubsub_networkmessage.h |  25 +--
 2 files changed, 114 insertions(+), 174 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index d2f778c05ee..9137501551f 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -329,7 +329,7 @@ UA_PayloadHeader_encodeBinary(const UA_NetworkMessage* src, UA_Byte **bufPos,
 
     UA_StatusCode rv = UA_Byte_encodeBinary(&count, bufPos, bufEnd);
 
-    for(UA_Byte i = 0; i < src->payloadHeader.dataSetPayloadHeader.count; i++) {
+    for(UA_Byte i = 0; i < count; i++) {
         UA_UInt16 dswId = src->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i];
         rv |= UA_UInt16_encodeBinary(&dswId, bufPos, bufEnd);
     }
@@ -881,12 +881,11 @@ increaseOffsetArray(UA_NetworkMessageOffsetBuffer *offsetBuffer) {
 size_t
 UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
                                  UA_NetworkMessageOffsetBuffer *offsetBuffer) {
-    UA_Byte byte = 0;
     size_t size = 1; /* byte */
     if(UA_NetworkMessage_ExtendedFlags1Enabled(p)) {
         size += 1; /* byte */
         if(UA_NetworkMessage_ExtendedFlags2Enabled(p))
-            size += 1 /* byte */
+            size += 1; /* byte */
     }
 
     if(p->publisherIdEnabled) {
@@ -961,23 +960,19 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
 
     // Payload Header
     if(p->payloadHeaderEnabled) {
-        if(p->networkMessageType == UA_NETWORKMESSAGE_DATASET) {
-            size += 1; /* p->payloadHeader.dataSetPayloadHeader.count */
-            if(p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != NULL) {
-                if(offsetBuffer) {
-                    size_t pos = offsetBuffer->offsetsSize;
-                    if(!increaseOffsetArray(offsetBuffer))
-                        return 0;
-                    offsetBuffer->offsets[pos].offset = size;
-                    offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_DATASETWRITERID;
-                }
-                size += 2 * p->payloadHeader.dataSetPayloadHeader.count; /* uint16 */
-            } else {
-                return 0; /* no dataSetWriterIds given! */
-            }
-        } else {
-            // not implemented
+        if(p->networkMessageType != UA_NETWORKMESSAGE_DATASET)
+            return 0; /* not implemented */
+        if(!p->payloadHeader.dataSetPayloadHeader.dataSetWriterIds)
+            return 0; /* no dataSetWriterIds given! */
+        size += 1; /* p->payloadHeader.dataSetPayloadHeader.count */
+        if(offsetBuffer) {
+            size_t pos = offsetBuffer->offsetsSize;
+            if(!increaseOffsetArray(offsetBuffer))
+                return 0;
+            offsetBuffer->offsets[pos].offset = size;
+            offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_DATASETWRITERID;
         }
+        size += (size_t)(2LU * p->payloadHeader.dataSetPayloadHeader.count); /* uint16 */
     }
 
     if(p->timestampEnabled) {
@@ -1017,27 +1012,23 @@ UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
             size += 2; /* UA_UInt16_calcSizeBinary(&p->securityHeader.securityFooterSize) */
     }
 
-    if(p->networkMessageType == UA_NETWORKMESSAGE_DATASET) {
-        UA_Byte count = 1;
-        if(p->payloadHeaderEnabled) {
-            count = p->payloadHeader.dataSetPayloadHeader.count;
-            if(count > 1)
-                size += 2 * count; /* uint16 */
-        }
-
-        for(size_t i = 0; i < count; i++) {
-            UA_DataSetMessage *dsm = &p->payload.dataSetPayload.dataSetMessages[i];
-            if(offsetBuffer)
-                UA_DataSetMessage_calcSizeBinary(dsm, offsetBuffer, size);
-            size += UA_DataSetMessage_calcSizeBinary(dsm, NULL, 0);
-        }
+    /* Encode the payload */
+    if(p->networkMessageType != UA_NETWORKMESSAGE_DATASET)
+        return 0; /* not implemented */
+    UA_Byte count = 1;
+    if(p->payloadHeaderEnabled) {
+        count = p->payloadHeader.dataSetPayloadHeader.count;
+        if(count > 1)
+            size += (size_t)(2LU * count); /* uint16 */
     }
-
-    if(p->securityEnabled) {
-        if(p->securityHeader.securityFooterEnabled)
-            size += p->securityHeader.securityFooterSize;
+    for(size_t i = 0; i < count; i++) {
+        UA_DataSetMessage *dsm = &p->payload.dataSetPayload.dataSetMessages[i];
+        size = UA_DataSetMessage_calcSizeBinary(dsm, offsetBuffer, size);
     }
 
+    if(p->securityEnabled && p->securityHeader.securityFooterEnabled)
+        size += p->securityHeader.securityFooterSize;
+
     return size;
 }
 
@@ -1326,34 +1317,6 @@ UA_DataSetMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
     return UA_STATUSCODE_GOOD;
 }
 
-size_t
-UA_DataSetMessageHeader_calcSizeBinary(const UA_DataSetMessageHeader* p) {
-    UA_Byte byte = 0;
-    size_t size = UA_Byte_calcSizeBinary(&byte); // DataSetMessage Type + Flags
-    if(UA_DataSetMessageHeader_DataSetFlags2Enabled(p))
-        size += UA_Byte_calcSizeBinary(&byte);
-
-    if(p->dataSetMessageSequenceNrEnabled)
-        size += UA_UInt16_calcSizeBinary(&p->dataSetMessageSequenceNr);
-
-    if(p->timestampEnabled)
-        size += UA_DateTime_calcSizeBinary(&p->timestamp); /* UtcTime */
-
-    if(p->picoSecondsIncluded)
-        size += UA_UInt16_calcSizeBinary(&p->picoSeconds);
-
-    if(p->statusEnabled)
-        size += UA_UInt16_calcSizeBinary(&p->status);
-
-    if(p->configVersionMajorVersionEnabled)
-        size += UA_UInt32_calcSizeBinary(&p->configVersionMajorVersion);
-
-    if(p->configVersionMinorVersionEnabled)
-        size += UA_UInt32_calcSizeBinary(&p->configVersionMinorVersion);
-
-    return size;
-}
-
 UA_StatusCode
 UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
                                const UA_Byte *bufEnd) {
@@ -1548,7 +1511,9 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
 }
 
 size_t
-UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBuffer *offsetBuffer, size_t currentOffset) {
+UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p,
+                                 UA_NetworkMessageOffsetBuffer *offsetBuffer,
+                                 size_t currentOffset) {
     size_t size = currentOffset;
 
     if(offsetBuffer) {
@@ -1563,10 +1528,9 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
             UA_PUBSUB_OFFSETTYPE_NETWORKMESSAGE_FIELDENCDODING;
     }
 
-    UA_Byte byte = 0;
-    size += UA_Byte_calcSizeBinary(&byte); // DataSetMessage Type + Flags
+    size += 1; /* byte: DataSetMessage Type + Flags */
     if(UA_DataSetMessageHeader_DataSetFlags2Enabled(&p->header))
-        size += UA_Byte_calcSizeBinary(&byte);
+        size += 1; /* byte */
 
     if(p->header.dataSetMessageSequenceNrEnabled) {
         if(offsetBuffer) {
@@ -1579,117 +1543,100 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p, UA_NetworkMessageOffsetBu
             offsetBuffer->offsets[pos].contentType =
                 UA_PUBSUB_OFFSETTYPE_DATASETMESSAGE_SEQUENCENUMBER;
         }
-        size += UA_UInt16_calcSizeBinary(&p->header.dataSetMessageSequenceNr);
+        size += 2; /* UA_UInt16_calcSizeBinary(&p->header.dataSetMessageSequenceNr) */
     }
 
     if(p->header.timestampEnabled)
-        size += UA_DateTime_calcSizeBinary(&p->header.timestamp); /* UtcTime */
+        size += 8; /* UA_DateTime_calcSizeBinary(&p->header.timestamp) */
 
     if(p->header.picoSecondsIncluded)
-        size += UA_UInt16_calcSizeBinary(&p->header.picoSeconds);
+        size += 2; /* UA_UInt16_calcSizeBinary(&p->header.picoSeconds) */
 
     if(p->header.statusEnabled)
-        size += UA_UInt16_calcSizeBinary(&p->header.status);
+        size += 2; /* UA_UInt16_calcSizeBinary(&p->header.status) */
 
     if(p->header.configVersionMajorVersionEnabled)
-        size += UA_UInt32_calcSizeBinary(&p->header.configVersionMajorVersion);
+        size += 4; /* UA_UInt32_calcSizeBinary(&p->header.configVersionMajorVersion) */
 
     if(p->header.configVersionMinorVersionEnabled)
-        size += UA_UInt32_calcSizeBinary(&p->header.configVersionMinorVersion);
+        size += 4; /* UA_UInt32_calcSizeBinary(&p->header.configVersionMinorVersion) */
 
-    /* Keyframe with no fields is a heartbeat, stop counting then */
-    if(p->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME && p->data.keyFrameData.fieldCount != 0) {
-        if(p->header.fieldEncoding != UA_FIELDENCODING_RAWDATA){
-            size += UA_calcSizeBinary(&p->data.keyFrameData.fieldCount, &UA_TYPES[UA_TYPES_UINT16]);
-        }
-        if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-            for(UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++){
-                if(offsetBuffer) {
-                    size_t pos = offsetBuffer->offsetsSize;
-                    if(!increaseOffsetArray(offsetBuffer))
-                        return 0;
-                    offsetBuffer->offsets[pos].offset = size;
-                    offsetBuffer->offsets[pos].contentType =
-                        UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT;
-                    UA_DataValue_init(&offsetBuffer->offsets[pos].content.value);
-                    UA_Variant_setScalar(&offsetBuffer->offsets[pos].content.value.value,
-                                         p->data.keyFrameData.dataSetFields[i].value.data,
-                                         p->data.keyFrameData.dataSetFields[i].value.type);
-                    offsetBuffer->offsets[pos].content.value.value.storageType =
-                        UA_VARIANT_DATA_NODELETE;
-                }
-                size += UA_calcSizeBinary(&p->data.keyFrameData.dataSetFields[i].value,
-                                          &UA_TYPES[UA_TYPES_VARIANT]);
+    /* Keyframe with no fields is a heartbeat */
+    if(p->header.dataSetMessageType == UA_DATASETMESSAGE_KEEPALIVE ||
+       (p->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME &&
+        p->data.keyFrameData.fieldCount == 0))
+        return size;
+
+    if(p->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
+        if(p->header.fieldEncoding != UA_FIELDENCODING_RAWDATA)
+            size += 2; /* p->data.keyFrameData.fieldCount */
+
+        for(UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++){
+            UA_NetworkMessageOffset *nmo = NULL;
+            const UA_DataValue *v = &p->data.keyFrameData.dataSetFields[i];
+            if(offsetBuffer) {
+                size_t pos = offsetBuffer->offsetsSize;
+                if(!increaseOffsetArray(offsetBuffer))
+                    return 0;
+                nmo = &offsetBuffer->offsets[pos];
+                nmo->offset = size;
+                nmo->content.value = *v;
+                nmo->content.value.value.storageType = UA_VARIANT_DATA_NODELETE;
             }
-        } else if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
-            for(UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++){
+
+            if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
+                if(offsetBuffer)
+                    nmo->contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT;
+                size += UA_calcSizeBinary(&v->value, &UA_TYPES[UA_TYPES_VARIANT]);
+            } else if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
                 if(offsetBuffer) {
-                    size_t pos = offsetBuffer->offsetsSize;
-                    if(!increaseOffsetArray(offsetBuffer))
-                        return 0;
-                    offsetBuffer->offsets[pos].offset = size;
-                    offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW;
-                    UA_DataValue_init(&offsetBuffer->offsets[pos].content.value);
-                    offsetBuffer->offsets[pos].content.value.value =
-                        p->data.keyFrameData.dataSetFields[i].value;
-                    offsetBuffer->offsets[pos].content.value.value.storageType =
-                        UA_VARIANT_DATA_NODELETE;
-                    //count the memory size of the specific field
-                    offsetBuffer->rawMessageLength += p->data.keyFrameData.dataSetFields[i].value.type->memSize;
+                    /* Count the memory size of the specific field */
+                    offsetBuffer->rawMessageLength += v->value.type->memSize;
+                    nmo->contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW;
                 }
-                if(p->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0){
-                    if(p->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_STRING ||
-                       p->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_BYTESTRING){
-                        size += UA_calcSizeBinary(p->data.keyFrameData.dataSetFields[i].value.data,
-                                                  p->data.keyFrameData.dataSetFields[i].value.type);
-                        //check if length < maxStringLength, The types ByteString and String are equal in their base definition
-                        size_t lengthDifference = p->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength -
-                            ((UA_String *) p->data.keyFrameData.dataSetFields[i].value.data)->length;
-                        size += lengthDifference;
-                    }
-                    if(p->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT){
-                        //currently not supported!
-                        size += UA_calcSizeBinary(p->data.keyFrameData.dataSetFields[i].value.data,
-                                                  p->data.keyFrameData.dataSetFields[i].value.type);
-                    }
-                } else {
-                    size += UA_calcSizeBinary(p->data.keyFrameData.dataSetFields[i].value.data,
-                                              p->data.keyFrameData.dataSetFields[i].value.type);
+                size += UA_calcSizeBinary(v->value.data, v->value.type);
+
+                /* Handle zero-padding for strings with max-string-length.
+                 * Currently not supported for strings that are a part of larger
+                 * structures. */
+                UA_FieldMetaData *fmd =
+                    &p->data.keyFrameData.dataSetMetaDataType->fields[i];
+                if(fmd->maxStringLength != 0 &&
+                   (v->value.type->typeKind == UA_DATATYPEKIND_STRING ||
+                    v->value.type->typeKind == UA_DATATYPEKIND_BYTESTRING)) {
+                    /* Check if length < maxStringLength, The types ByteString
+                     * and String are equal in their base definition */
+                    size_t lengthDifference = fmd->maxStringLength -
+                        ((UA_String *)v->value.data)->length;
+                    size += lengthDifference;
                 }
-            }
-        } else if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-            for(UA_UInt16 i = 0; i < p->data.keyFrameData.fieldCount; i++) {
-                if(offsetBuffer) {
-                    size_t pos = offsetBuffer->offsetsSize;
-                    if(!increaseOffsetArray(offsetBuffer))
-                        return 0;
-                    offsetBuffer->offsets[pos].offset = size;
-                    offsetBuffer->offsets[pos].contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE;
-                    offsetBuffer->offsets[pos].content.value = p->data.keyFrameData.dataSetFields[i];
-                }
-                size += UA_calcSizeBinary(&p->data.keyFrameData.dataSetFields[i], &UA_TYPES[UA_TYPES_DATAVALUE]);
+            } else if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
+                if(offsetBuffer)
+                    nmo->contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE;
+                size += UA_calcSizeBinary(v, &UA_TYPES[UA_TYPES_DATAVALUE]);
             }
         }
     } else if(p->header.dataSetMessageType == UA_DATASETMESSAGE_DATADELTAFRAME) {
-        //TODO clarify how to handle DATADELTAFRAME messages with RT
-        if(p->header.fieldEncoding != UA_FIELDENCODING_RAWDATA)
-            size += UA_calcSizeBinary(&p->data.deltaFrameData.fieldCount, &UA_TYPES[UA_TYPES_UINT16]);
+        if(offsetBuffer)
+            return 0; /* Not supported for RT */
 
-        if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-            for(UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
-                size += UA_calcSizeBinary(&p->data.deltaFrameData.deltaFrameFields[i].fieldIndex, &UA_TYPES[UA_TYPES_UINT16]);
-                size += UA_calcSizeBinary(&p->data.deltaFrameData.deltaFrameFields[i].fieldValue.value, &UA_TYPES[UA_TYPES_VARIANT]);
-            }
-        } else if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
-            // not implemented
-        } else if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-            for(UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
-                size += UA_calcSizeBinary(&p->data.deltaFrameData.deltaFrameFields[i].fieldIndex, &UA_TYPES[UA_TYPES_UINT16]);
-                size += UA_calcSizeBinary(&p->data.deltaFrameData.deltaFrameFields[i].fieldValue, &UA_TYPES[UA_TYPES_DATAVALUE]);
-            }
+        if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA)
+            return 0; /* not supported */
+
+        size += 2; /* p->data.deltaFrameData.fieldCount */
+        size += (size_t)(2LU * p->data.deltaFrameData.fieldCount); /* fieldIndex per field */
+
+        for(UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
+            const UA_DataValue *v = &p->data.deltaFrameData.deltaFrameFields[i].fieldValue;
+            if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT)
+                size += UA_calcSizeBinary(&v->value, &UA_TYPES[UA_TYPES_VARIANT]);
+            else if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE)
+                size += UA_calcSizeBinary(v, &UA_TYPES[UA_TYPES_DATAVALUE]);
         }
+    } else {
+        return 0;
     }
-    /* KeepAlive-Message contains no Payload Data */
+
     return size;
 }
 
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index ec2119587e1..08d23799f91 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -221,6 +221,13 @@ typedef struct {
 void
 UA_NetworkMessageOffsetBuffer_clear(UA_NetworkMessageOffsetBuffer *nmob);
 
+UA_StatusCode
+UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer);
+
+UA_StatusCode
+UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
+                                          const UA_ByteString *src, size_t *bufferPosition);
+
 /**
  * DataSetMessage
  * ^^^^^^^^^^^^^^ */
@@ -233,16 +240,14 @@ UA_StatusCode
 UA_DataSetMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
                                      UA_DataSetMessageHeader* dst);
 
-size_t
-UA_DataSetMessageHeader_calcSizeBinary(const UA_DataSetMessageHeader* p);
-
 UA_StatusCode
 UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
                                const UA_Byte *bufEnd);
 
 UA_StatusCode
 UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
-                               UA_DataSetMessage* dst, UA_UInt16 dsmSize, const UA_DataTypeArray *customTypes);
+                               UA_DataSetMessage* dst, UA_UInt16 dsmSize,
+                               const UA_DataTypeArray *customTypes);
 
 size_t
 UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage *p,
@@ -251,18 +256,6 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage *p,
 
 void UA_DataSetMessage_clear(UA_DataSetMessage* p);
 
-/**
- * NetworkMessage
- * ^^^^^^^^^^^^^^ */
-
-UA_StatusCode
-UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer);
-
-UA_StatusCode
-UA_NetworkMessage_updateBufferedNwMessage(UA_NetworkMessageOffsetBuffer *buffer,
-                                          const UA_ByteString *src, size_t *bufferPosition);
-
-
 /**
  * NetworkMessage Encoding
  * ^^^^^^^^^^^^^^^^^^^^^^^ */

From 4ec0632e68b584f92f4c33f513444ab906d6dc4b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 24 Feb 2023 22:39:48 +0100
Subject: [PATCH 0851/1963] refactor(pubsub): Small logging improvement in
 ua_pubsub_reader.c

---
 src/pubsub/ua_pubsub_reader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index c7877dc6d44..a958ab0b0a9 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1129,8 +1129,8 @@ processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
 
     if(!processed) {
         UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
-                               "Dataset reader not found. Check PublisherID, "
-                               "WriterGroupID and DatasetWriterID");
+                               "DatasetReader not found. Check PublisherId, "
+                               "WriterGroupId and DatasetWriterId");
     }
 
     return UA_STATUSCODE_GOOD;

From 51f38e3609645e82402478788e8c231a69a7fbd3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 01:00:08 +0200
Subject: [PATCH 0852/1963] refactor(pubsub): Simplify
 UA_NetworkMessage_ExtendedFlags1Enabled

---
 src/pubsub/ua_pubsub_networkmessage.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 9137501551f..941e3fc8444 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1069,19 +1069,12 @@ UA_NetworkMessage_clear(UA_NetworkMessage* p) {
 
 UA_Boolean
 UA_NetworkMessage_ExtendedFlags1Enabled(const UA_NetworkMessage* src) {
-    UA_Boolean retval = false;
-
-    if((src->publisherIdType != UA_PUBLISHERIDTYPE_BYTE)
-        || src->dataSetClassIdEnabled
-        || src->securityEnabled
-        || src->timestampEnabled
-        || src->picosecondsEnabled
-        || UA_NetworkMessage_ExtendedFlags2Enabled(src))
-    {
-        retval = true;
-    }
-
-    return retval;
+    if(src->publisherIdType != UA_PUBLISHERIDTYPE_BYTE ||
+       src->dataSetClassIdEnabled || src->securityEnabled ||
+       src->timestampEnabled || src->picosecondsEnabled ||
+       UA_NetworkMessage_ExtendedFlags2Enabled(src))
+        return true;
+    return false;
 }
 
 UA_Boolean

From 93887ed3aad43dac5924c09a572241cad83f50fd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 01:00:43 +0200
Subject: [PATCH 0853/1963] fix(pubsub): Fix handling of heartbeat messages in
 UA_DataSetMessage_encodeBinary

---
 src/pubsub/ua_pubsub_networkmessage.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 941e3fc8444..a5dc4ebb219 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1316,12 +1316,14 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
     UA_StatusCode rv = UA_DataSetMessageHeader_encodeBinary(&src->header, bufPos, bufEnd);
     UA_CHECK_STATUS(rv, return rv);
 
-    if(src->data.keyFrameData.fieldCount == 0) {
-        /* Heartbeat: "DataSetMessage is a key frame that only contains header information" */
-        return rv;
-    }
 
     if(src->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
+
+        /* Heartbeat: "DataSetMessage is a key frame that only contains header
+         * information" */
+        if(src->data.keyFrameData.fieldCount == 0)
+            return rv;
+
         if(src->header.fieldEncoding != UA_FIELDENCODING_RAWDATA) {
             rv = UA_UInt16_encodeBinary(&src->data.keyFrameData.fieldCount, bufPos, bufEnd);
             UA_CHECK_STATUS(rv, return rv);

From 426995dd0f515758f96729efeb5ecad92ba4a80b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 01:01:15 +0200
Subject: [PATCH 0854/1963] fix(pubsub): Encode the correct fieldcount for
 delta messages

---
 src/pubsub/ua_pubsub_networkmessage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index a5dc4ebb219..6efeb77fecc 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1370,7 +1370,7 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
     } else if(src->header.dataSetMessageType == UA_DATASETMESSAGE_DATADELTAFRAME) {
         // Encode Delta Frame
         // Here the FieldCount is always present
-        rv = UA_UInt16_encodeBinary(&src->data.keyFrameData.fieldCount, bufPos, bufEnd);
+        rv = UA_UInt16_encodeBinary(&src->data.deltaFrameData.fieldCount, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
 
         if(src->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {

From 404ab2437b7d87b0158df2ca53a9575d61ac7d6a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 01:21:59 +0200
Subject: [PATCH 0855/1963] fix(examples): Fix locking in
 server_pubsub_subscribe_custom_monitoring.c

---
 .../monitoring/server_pubsub_subscribe_custom_monitoring.c     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index 61be47db067..742923e70af 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -27,6 +27,7 @@
 #include <open62541/types_generated.h>
 
 #include "ua_pubsub.h"
+#include "../server/ua_server_internal.h"
 
 #ifdef UA_ENABLE_PUBSUB_ETH_UADP
 #include <open62541/plugin/pubsub_ethernet.h>
@@ -87,7 +88,9 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     if (retval != UA_STATUSCODE_GOOD) {
         return retval;
     }
+    UA_LOCK(&server->serviceMutex);
     retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
+    UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
 

From 20ad12c6db9784da5f219ed4f1b541f2202a53fe Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 01:33:45 +0200
Subject: [PATCH 0856/1963] fix(examples): Fix ctrl-c during certificate
 generation in server_encryption.c

---
 examples/encryption/server_encryption.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/encryption/server_encryption.c b/examples/encryption/server_encryption.c
index f75b8e6f51f..d9d6b29e279 100644
--- a/examples/encryption/server_encryption.c
+++ b/examples/encryption/server_encryption.c
@@ -106,6 +106,9 @@ int main(int argc, char* argv[]) {
     if(retval != UA_STATUSCODE_GOOD)
         goto cleanup;
 
+    if(!running)
+        goto cleanup; /* received ctrl-c already */
+    
     retval = UA_Server_run(server, &running);
 
  cleanup:

From 5d2f84dc4a4e5faf7006b8d6ec2bee37a5d1ab35 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 09:36:40 +0200
Subject: [PATCH 0857/1963] refactor(examples): tutorial_client_firststeps.c
 returns 0 when aborted

For the valgrind tests in the CI.
---
 examples/tutorial_client_firststeps.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/tutorial_client_firststeps.c b/examples/tutorial_client_firststeps.c
index 5aa38ee68f6..d370c3a60a9 100644
--- a/examples/tutorial_client_firststeps.c
+++ b/examples/tutorial_client_firststeps.c
@@ -12,8 +12,6 @@
 #include <open62541/client_highlevel.h>
 #include <open62541/plugin/log_stdout.h>
 
-#include <stdlib.h>
-
 int main(void) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
@@ -23,7 +21,7 @@ int main(void) {
                     "The connection failed with status code %s",
                     UA_StatusCode_name(retval));
         UA_Client_delete(client);
-        return EXIT_FAILURE;
+        return 0;
     }
 
     /* Read the value attribute of the node. UA_Client_readValueAttribute is a
@@ -53,7 +51,7 @@ int main(void) {
     /* Clean up */
     UA_Variant_clear(&value);
     UA_Client_delete(client); /* Disconnects the client internally */
-    return EXIT_SUCCESS;
+    return 0;
 }
 
 /**

From 2855c53cbe99cdb0cc223533d070857ce40bd8d2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 11:20:48 +0200
Subject: [PATCH 0858/1963] refactor(pubsub): Simplify networkmessage encoding

---
 src/pubsub/ua_pubsub_networkmessage.c | 65 +++++++++++----------------
 1 file changed, 27 insertions(+), 38 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 6efeb77fecc..e3a55099c61 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -442,14 +442,14 @@ UA_NetworkMessage_encodePayload(const UA_NetworkMessage* src, UA_Byte **bufPos,
         count = src->payloadHeader.dataSetPayloadHeader.count;
         if(count > 1) {
             for(UA_Byte i = 0; i < count; i++) {
-                // initially calculate the size, if not specified
+                /* Calculate the size, if not specified */
                 UA_UInt16 sz = 0;
                 if((src->payload.dataSetPayload.sizes != NULL) &&
                    (src->payload.dataSetPayload.sizes[i] != 0)) {
                     sz = src->payload.dataSetPayload.sizes[i];
                 } else {
-                    sz = (UA_UInt16) UA_DataSetMessage_calcSizeBinary(&src->payload.dataSetPayload.dataSetMessages[i],
-                                                                      NULL, 0);
+                    UA_DataSetMessage *dsm = &src->payload.dataSetPayload.dataSetMessages[i];
+                    sz = (UA_UInt16)UA_DataSetMessage_calcSizeBinary(dsm, NULL, 0);
                 }
 
                 rv = UA_UInt16_encodeBinary(&sz, bufPos, bufEnd);
@@ -459,7 +459,8 @@ UA_NetworkMessage_encodePayload(const UA_NetworkMessage* src, UA_Byte **bufPos,
     }
 
     for(UA_Byte i = 0; i < count; i++) {
-        rv = UA_DataSetMessage_encodeBinary(&src->payload.dataSetPayload.dataSetMessages[i], bufPos, bufEnd);
+        UA_DataSetMessage *dsm = &src->payload.dataSetPayload.dataSetMessages[i];
+        rv = UA_DataSetMessage_encodeBinary(dsm, bufPos, bufEnd);
         UA_CHECK_STATUS(rv, return rv);
     }
 
@@ -1316,56 +1317,44 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
     UA_StatusCode rv = UA_DataSetMessageHeader_encodeBinary(&src->header, bufPos, bufEnd);
     UA_CHECK_STATUS(rv, return rv);
 
-
     if(src->header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
-
         /* Heartbeat: "DataSetMessage is a key frame that only contains header
          * information" */
         if(src->data.keyFrameData.fieldCount == 0)
             return rv;
 
         if(src->header.fieldEncoding != UA_FIELDENCODING_RAWDATA) {
-            rv = UA_UInt16_encodeBinary(&src->data.keyFrameData.fieldCount, bufPos, bufEnd);
+            rv = UA_UInt16_encodeBinary(&src->data.keyFrameData.fieldCount,
+                                        bufPos, bufEnd);
             UA_CHECK_STATUS(rv, return rv);
         }
-        if(src->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-            for(UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
-                rv = UA_Variant_encodeBinary(&src->data.keyFrameData.dataSetFields[i].value, bufPos, bufEnd);
-                UA_CHECK_STATUS(rv, return rv);
-            }
-        } else if(src->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
-            for(UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
-                if(src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0 &&
-                   (src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_STRING ||
-                    src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_BYTESTRING)){
-                    // copy string with original length
-                    rv = UA_encodeBinaryInternal(src->data.keyFrameData.dataSetFields[i].value.data,
-                                                 src->data.keyFrameData.dataSetFields[i].value.type,
+
+        for(UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
+            const UA_DataValue *v = &src->data.keyFrameData.dataSetFields[i];
+
+            if(src->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
+                rv = UA_Variant_encodeBinary(&v->value, bufPos, bufEnd);
+            } else if(src->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
+                UA_FieldMetaData *fmd =
+                    &src->data.keyFrameData.dataSetMetaDataType->fields[i];
+                if(fmd->maxStringLength != 0 &&
+                   (v->value.type->typeKind == UA_DATATYPEKIND_STRING ||
+                    v->value.type->typeKind == UA_DATATYPEKIND_BYTESTRING)){
+                    rv = UA_encodeBinaryInternal(v->value.data, v->value.type,
                                                  bufPos, &bufEnd, NULL, NULL);
-                    // zero out overhanging
-                    size_t lengthDifference = src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength -
-                                              ((UA_String *) src->data.keyFrameData.dataSetFields[i].value.data)->length;
+                    size_t lengthDifference = fmd->maxStringLength -
+                        ((UA_String *)v->value.data)->length;
                     memset(*bufPos, 0, lengthDifference);
-                    //move bus pos
                     *bufPos += lengthDifference;
-                } else if(src->data.keyFrameData.dataSetMetaDataType->fields[i].maxStringLength != 0 &&
-                           src->data.keyFrameData.dataSetFields[i].value.type->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT){
-                    //currently not supported!
-                    rv = UA_encodeBinaryInternal(src->data.keyFrameData.dataSetFields[i].value.data,
-                                                 src->data.keyFrameData.dataSetFields[i].value.type,
-                                                 bufPos, &bufEnd, NULL, NULL);
                 } else {
-                    rv = UA_encodeBinaryInternal(src->data.keyFrameData.dataSetFields[i].value.data,
-                                                 src->data.keyFrameData.dataSetFields[i].value.type,
+                    /* padding not yet supported for strings as part of structures */
+                    rv = UA_encodeBinaryInternal(v->value.data, v->value.type,
                                                  bufPos, &bufEnd, NULL, NULL);
                 }
-                UA_CHECK_STATUS(rv, return rv);
-            }
-        } else if(src->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-            for(UA_UInt16 i = 0; i < src->data.keyFrameData.fieldCount; i++) {
-                rv = UA_DataValue_encodeBinary(&src->data.keyFrameData.dataSetFields[i], bufPos, bufEnd);
-                UA_CHECK_STATUS(rv, return rv);
+            } else if(src->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
+                rv = UA_DataValue_encodeBinary(v, bufPos, bufEnd);
             }
+            UA_CHECK_STATUS(rv, return rv);
         }
     } else if(src->header.dataSetMessageType == UA_DATASETMESSAGE_DATADELTAFRAME) {
         // Encode Delta Frame

From 3f6fef68611410f89e42597142cc6c6adb060d9b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 11:21:09 +0200
Subject: [PATCH 0859/1963] feat(pubsub): Test that offset values have fixed
 length

---
 src/pubsub/ua_pubsub_networkmessage.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index e3a55099c61..0a7fae7938f 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1574,6 +1574,8 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p,
                 size += UA_calcSizeBinary(&v->value, &UA_TYPES[UA_TYPES_VARIANT]);
             } else if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
                 if(offsetBuffer) {
+                    if(!v->value.type->pointerFree)
+                        return 0; /* only integer types for now */
                     /* Count the memory size of the specific field */
                     offsetBuffer->rawMessageLength += v->value.type->memSize;
                     nmo->contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW;

From e39b3727471ce83321dd26c6d72044d9ccce9736 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 11:21:56 +0200
Subject: [PATCH 0860/1963] fix(pubsub): Fix a memleak for delta payload
 messages

---
 src/pubsub/ua_pubsub_networkmessage.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 0a7fae7938f..377ffb2c23a 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1646,11 +1646,7 @@ UA_DataSetMessage_clear(UA_DataSetMessage* p) {
             for(UA_UInt16 i = 0; i < p->data.deltaFrameData.fieldCount; i++) {
                 UA_DataSetMessage_DeltaFrameField *f =
                     &p->data.deltaFrameData.deltaFrameFields[i];
-                if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
-                    UA_DataValue_clear(&f->fieldValue);
-                } else if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-                    UA_Variant_clear(&f->fieldValue.value);
-                }
+                UA_DataValue_clear(&f->fieldValue);
             }
             UA_free(p->data.deltaFrameData.deltaFrameFields);
         }

From 4fa4b6b94b8b49b9f197d2a095a9220bf3db4f40 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 11:22:21 +0200
Subject: [PATCH 0861/1963] refactor(pubsub): Cosemetic improvement in
 sendNetworkMessageBuffer

---
 src/pubsub/ua_pubsub_writergroup.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index d25ef30be8a..56217f21f16 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -950,8 +950,7 @@ sendNetworkMessageBuffer(UA_Server *server, UA_WriterGroup *wg,
         channel = connection->channel;
     }
     UA_StatusCode res =
-        channel->send(channel,
-                                  &wg->config.transportSettings, buffer);
+        channel->send(channel, &wg->config.transportSettings, buffer);
     /* Failure, set the WriterGroup into an error mode */
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,

From 66c5cc28bf95a8a3d246a685cfc554496dc0ed0c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 18:38:40 +0200
Subject: [PATCH 0862/1963] feat(ci): Count any memleak as an error in
 automated tests

---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index a9535dc057c..d24b7f1c77c 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -405,7 +405,7 @@ function examples_valgrind {
     for f in $FILES
     do
 	    echo "Processing $f"
-	    valgrind --leak-check=yes --error-exitcode=1 $f &
+	    valgrind --errors-for-leak-kinds=all --leak-check=full --error-exitcode=1 $f &
 	    sleep 10
 	    kill -INT %1
 	    wait $!; EXIT_CODE=$?

From 1bf0108bb26e002c16760d230b13c4f03414d9e5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 18:39:18 +0200
Subject: [PATCH 0863/1963] fix(examples): Fix a memleak in
 server_pubsub_publisher_rt_level_raw.c

---
 examples/pubsub/server_pubsub_publisher_rt_level_raw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/pubsub/server_pubsub_publisher_rt_level_raw.c b/examples/pubsub/server_pubsub_publisher_rt_level_raw.c
index 3d4b9136f51..f3cf5d41d85 100644
--- a/examples/pubsub/server_pubsub_publisher_rt_level_raw.c
+++ b/examples/pubsub/server_pubsub_publisher_rt_level_raw.c
@@ -203,7 +203,7 @@ int main(void) {
     UA_Server_delete(server);
 #if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
     for(int i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; ++i) {
-        UA_DataValue_clear(staticValueSource[i]);
+        UA_DataValue_delete(staticValueSource[i]);
     }
 #endif
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;

From 09f8c8a3ad094312e9b78fe13de7993c5bfb7214 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 18:39:37 +0200
Subject: [PATCH 0864/1963] fix(examples): Fix a locking issue in
 tutorial_pubsub_subscribe_raw.c

---
 examples/pubsub/tutorial_pubsub_subscribe_raw.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/pubsub/tutorial_pubsub_subscribe_raw.c b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
index 475a98e26bf..a1cf4c4bb9b 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe_raw.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
@@ -60,7 +60,9 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     if(retval != UA_STATUSCODE_GOOD) {
         return retval;
     }
+    UA_LOCK(&server->serviceMutex);
     retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
+    UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
 

From 9b8172f88a94494eb3d847e9352b98b9aa95aef0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 22:37:38 +0200
Subject: [PATCH 0865/1963] fix(examples): Fix a memleak in
 server_random_events.c

---
 examples/events/server_random_events.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/examples/events/server_random_events.c b/examples/events/server_random_events.c
index eda09e7b32b..9781a7400ae 100644
--- a/examples/events/server_random_events.c
+++ b/examples/events/server_random_events.c
@@ -23,7 +23,7 @@
 #define SAMPLE_EVENT_TYPES_COUNT 5
 
 static volatile UA_Boolean running = true;
-static UA_NodeId* eventTypes;
+static UA_NodeId eventTypes[SAMPLE_EVENT_TYPES_COUNT];
 
 static UA_StatusCode
 addEventType(UA_Server *server, char* name, UA_NodeId parentNodeId, UA_NodeId requestedId, UA_NodeId* eventType) {
@@ -44,8 +44,6 @@ addEventType(UA_Server *server, char* name, UA_NodeId parentNodeId, UA_NodeId re
 
 static UA_StatusCode
 addSampleEventTypes(UA_Server *server) {
-    eventTypes = (UA_NodeId *)
-        UA_Array_new(SAMPLE_EVENT_TYPES_COUNT, &UA_TYPES[UA_TYPES_NODEID]);
     UA_StatusCode retval = addEventType(server, "SampleBaseEventType",
                                         UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE),
                                         UA_NODEID_NUMERIC(1, 5000),

From 3ab9c28d3337f75a013be55381150a61528e24f1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 22:57:53 +0200
Subject: [PATCH 0866/1963] fix(pubsub): Fix counter use in
 UA_PubSubDataSetWriter_generateDeltaFrameMessage

---
 src/pubsub/ua_pubsub_writer.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 4190f1b54c4..7fe4ad704d5 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -644,7 +644,7 @@ UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
         return UA_STATUSCODE_GOOD;
 
     UA_DataSetField *dsf;
-    size_t counter = 0;
+    UA_UInt16 counter = 0;
     TAILQ_FOREACH(dsf, &currentDataSet->fields, listEntry) {
         /* Sample the value */
         UA_DataValue value;
@@ -671,12 +671,13 @@ UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
 
     /* Allocate DeltaFrameFields */
     UA_DataSetMessage_DeltaFrameField *deltaFields = (UA_DataSetMessage_DeltaFrameField *)
-        UA_calloc(dataSetMessage->data.deltaFrameData.fieldCount,
-                  sizeof(UA_DataSetMessage_DeltaFrameField));
+        UA_calloc(counter, sizeof(UA_DataSetMessage_DeltaFrameField));
     if(!deltaFields)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     dataSetMessage->data.deltaFrameData.deltaFrameFields = deltaFields;
+    dataSetMessage->data.deltaFrameData.fieldCount = counter;
+
     size_t currentDeltaField = 0;
     for(size_t i = 0; i < currentDataSet->fieldSize; i++) {
         if(!dataSetWriter->lastSamples[i].valueChanged)
@@ -686,6 +687,8 @@ UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
 
         dff->fieldIndex = (UA_UInt16) i;
         UA_DataValue_copy(&dataSetWriter->lastSamples[i].value, &dff->fieldValue);
+
+        /* Reset the changed flag */
         dataSetWriter->lastSamples[i].valueChanged = false;
 
         /* Deactivate statuscode? */

From 096d3dcbe0e0844d33114d14e320adc13ed26a02 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 23:05:47 +0200
Subject: [PATCH 0867/1963] fix(examples): Fix memleak in
 server_pubsub_publisher_rt_level.c

---
 .../pubsub/server_pubsub_publisher_rt_level.c  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/pubsub/server_pubsub_publisher_rt_level.c b/examples/pubsub/server_pubsub_publisher_rt_level.c
index 204119cdd17..ff19ab5a358 100644
--- a/examples/pubsub/server_pubsub_publisher_rt_level.c
+++ b/examples/pubsub/server_pubsub_publisher_rt_level.c
@@ -33,7 +33,7 @@
 
 
 UA_NodeId publishedDataSetIdent, dataSetFieldIdent, writerGroupIdent, connectionIdentifier;
-UA_UInt32 *valueStore[PUBSUB_CONFIG_FIELD_COUNT];
+UA_UInt32 valueStore[PUBSUB_CONFIG_FIELD_COUNT];
 
 UA_Boolean running = true;
 static void stopHandler(int sign) {
@@ -67,9 +67,9 @@ addMinimalPubSubConfiguration(UA_Server * server){
 static void
 valueUpdateCallback(UA_Server *server, void *data) {
 #if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    for (int i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; ++i)
-        *valueStore[i] = *valueStore[i] + 1;
-    if(*valueStore[0] > PUBSUB_CONFIG_PUBLISH_CYCLES)
+    for(int i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; ++i)
+        valueStore[i] = valueStore[i] + 1;
+    if(valueStore[0] > PUBSUB_CONFIG_PUBLISH_CYCLES)
         running = false;
 #endif
 #if defined PUBSUB_CONFIG_FASTPATH_NONE
@@ -155,13 +155,12 @@ int main(void) {
     /* Add one DataSetField with static value source to PDS */
     UA_DataValue *staticValueSource = UA_DataValue_new();
     UA_DataSetFieldConfig dsfConfig;
-    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++){
+    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++) {
         memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
         /* Create Variant and configure as DataSetField source */
-        UA_UInt32 *intValue = UA_UInt32_new();
-        *intValue = (UA_UInt32) i * 1000;
-        valueStore[i] = intValue;
-        UA_Variant_setScalar(&staticValueSource->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
+        valueStore[i] = (UA_UInt32) i * 1000;
+        UA_Variant_setScalar(&staticValueSource->value, &valueStore[i],
+                             &UA_TYPES[UA_TYPES_UINT32]);
         dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
         dsfConfig.field.variable.rtValueSource.staticValueSource = &staticValueSource;
         UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent);
@@ -208,6 +207,7 @@ int main(void) {
     /* Remove the source after deleting the server.
      * It might be accessed during shutdown. */
 #if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
+    UA_DataValue_init(staticValueSource);
     UA_DataValue_delete(staticValueSource);
 #endif
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;

From 6327fcb88487af00cf0d6f78a08bf3c398e2afde Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 23:18:31 +0200
Subject: [PATCH 0868/1963] fix(pubsub): Fix a memleak in
 UA_WriterGroup_publishCallback

---
 src/pubsub/ua_pubsub_writergroup.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 56217f21f16..5dd1393c190 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -1323,7 +1323,8 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
                                &dsWriterIds[dsmCount], 1);
 
             /* Clean up the current store entry */
-            if(writerGroup->config.rtLevel == UA_PUBSUB_RT_DIRECT_VALUE_ACCESS) {
+            if(writerGroup->config.rtLevel == UA_PUBSUB_RT_DIRECT_VALUE_ACCESS &&
+               dsmStore[dsmCount].header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
                 for(size_t i = 0; i < dsmStore[dsmCount].data.keyFrameData.fieldCount; ++i) {
                     dsmStore[dsmCount].data.keyFrameData.dataSetFields[i].value.data = NULL;
                 }
@@ -1350,7 +1351,8 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
 
     /* Clean up DSM */
     for(size_t i = 0; i < dsmCount; i++) {
-        if(writerGroup->config.rtLevel == UA_PUBSUB_RT_DIRECT_VALUE_ACCESS) {
+        if(writerGroup->config.rtLevel == UA_PUBSUB_RT_DIRECT_VALUE_ACCESS &&
+           dsmStore[i].header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
             for(size_t j = 0; j < dsmStore[i].data.keyFrameData.fieldCount; ++j) {
                 dsmStore[i].data.keyFrameData.dataSetFields[j].value.data = NULL;
             }

From 8b12569767912099cdc1736b793bcc2b811a6f20 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 23:23:03 +0200
Subject: [PATCH 0869/1963] fix(examples): Fix a memleak in
 tutorial_server_historicaldata_circular.c

---
 examples/tutorial_server_historicaldata_circular.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/tutorial_server_historicaldata_circular.c b/examples/tutorial_server_historicaldata_circular.c
index 1bc52b3fb82..2fa53b76e23 100644
--- a/examples/tutorial_server_historicaldata_circular.c
+++ b/examples/tutorial_server_historicaldata_circular.c
@@ -113,5 +113,9 @@ int main(void) {
     */
 
     UA_Server_delete(server);
+
+    setting.historizingBackend.deleteMembers(&setting.historizingBackend);
+    UA_NodeId_clear(&outNodeId);
+
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }

From e24859ae8885b8ae54e42158ba011e10ea8307ef Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 27 Mar 2023 23:53:43 +0200
Subject: [PATCH 0870/1963] fix(examples): Make threading in
 tutorial_server_method_async.c valgrind-clean

---
 examples/tutorial_server_method_async.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/examples/tutorial_server_method_async.c b/examples/tutorial_server_method_async.c
index 399544baba2..41b03b335bc 100644
--- a/examples/tutorial_server_method_async.c
+++ b/examples/tutorial_server_method_async.c
@@ -37,7 +37,13 @@
 #ifndef WIN32
 #include <pthread.h>
 #define THREAD_HANDLE pthread_t
-#define THREAD_CREATE(handle, callback) pthread_create(&handle, NULL, callback, NULL)
+#define THREAD_CREATE(handle, callback) do {            \
+        sigset_t set;                                   \
+        sigemptyset(&set);                              \
+        sigaddset(&set, SIGINT);                        \
+        pthread_sigmask(SIG_BLOCK, &set, NULL);         \
+        pthread_create(&handle, NULL, callback, &set);  \
+    } while(0)
 #define THREAD_JOIN(handle) pthread_join(handle, NULL)
 #define THREAD_CALLBACK(name) static void * name(void *_)
 #else
@@ -181,7 +187,7 @@ THREAD_CALLBACK(ThreadWorker) {
             UA_CallMethodResult_clear(&response);
         } else {
             /* not a good style, but done for simplicity :-) */
-            UA_sleep_ms(5000);
+            UA_sleep_ms(100);
         }
     }
     return 0;
@@ -211,6 +217,7 @@ int main(void) {
     UA_StatusCode retval = UA_Server_runUntilInterrupt(globalServer);
 
     /* Shutdown the thread */
+    running = false;
     THREAD_JOIN(hThread);
 
     UA_Server_delete(globalServer);

From c89786084d75324c09d352ad5d0ac35605dfe8a9 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Wed, 29 Mar 2023 08:14:03 +0200
Subject: [PATCH 0871/1963] Allow dependency to libmbedtls14 for debian
 bookworm

---
 tools/packaging/debian/control-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packaging/debian/control-template b/tools/packaging/debian/control-template
index 91bb56a1aa9..cd09ad4befd 100644
--- a/tools/packaging/debian/control-template
+++ b/tools/packaging/debian/control-template
@@ -20,7 +20,7 @@ Vcs-Browser: https://github.com/open62541/open62541
 Package: libopen62541-<soname>
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmbedtls10 | libmbedtls12
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmbedtls10 | libmbedtls12 | libmbedtls14
 Description: Open source implementation of OPC UA - shared library
  open62541 (http://open62541.org) is an open source and free implementation
  of OPC UA (OPC Unified Architecture) written in the common subset of the

From d13ad2d0fdc17c0eb82f8e5742df6651bb4eb5ec Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Fri, 31 Mar 2023 13:38:34 +0200
Subject: [PATCH 0872/1963] fix(pubsub) pubsub pubslish test overhaul (#5716)

---
 tests/pubsub/check_pubsub_publish.c | 90 +++++++++++++++++------------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index 0f6079b615c..9b634df7e2e 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -164,6 +164,9 @@ static void setupDataSetWriterTestEnvironment(void){
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
     UA_Server_setWriterGroupOperational(server, writerGroup3);
+}
+
+static void setupPublishedDataSetTestEnvironment(void){
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
@@ -175,6 +178,7 @@ static void setupDataSetWriterTestEnvironment(void){
 
 START_TEST(AddDataSetWriterWithValidConfiguration){
         setupDataSetWriterTestEnvironment();
+        setupPublishedDataSetTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
@@ -191,6 +195,7 @@ START_TEST(AddDataSetWriterWithValidConfiguration){
 
 START_TEST(AddRemoveAddDataSetWriterWithValidConfiguration){
         setupDataSetWriterTestEnvironment();
+        setupPublishedDataSetTestEnvironment();
         UA_StatusCode retVal;
         UA_WriterGroup *wg1 = UA_WriterGroup_findWGbyId(server, writerGroup1);
         ck_assert_ptr_ne(wg1, NULL);
@@ -244,6 +249,7 @@ START_TEST(AddDataSetWriterWithInvalidPDSId){
 
 START_TEST(GetDataSetWriterConfigurationAndCompareValues){
         setupDataSetWriterTestEnvironment();
+        setupPublishedDataSetTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
@@ -280,6 +286,7 @@ START_TEST(AddPDSDuplicatedName){
 
 START_TEST(FindPDS){
         setupDataSetWriterTestEnvironment();
+        setupPublishedDataSetTestEnvironment();
         UA_PublishedDataSet *pdsById = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pdsById, NULL);
         UA_PublishedDataSet *pdsByName = UA_PublishedDataSet_findPDSbyName(server, UA_STRING(publishedDataSet1Name));
@@ -308,6 +315,7 @@ static void setupDataSetFieldTestEnvironment(void){
 
 START_TEST(AddDataSetFieldWithValidConfiguration){
         setupDataSetFieldTestEnvironment();
+        setupPublishedDataSetTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -326,6 +334,7 @@ START_TEST(AddDataSetFieldWithValidConfiguration){
 
 START_TEST(AddRemoveAddDataSetFieldWithValidConfiguration){
         setupDataSetFieldTestEnvironment();
+        setupPublishedDataSetTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -384,6 +393,7 @@ START_TEST(AddDataSetFieldWithNullConfig){
         UA_StatusCode retVal;
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, NULL, NULL).result;
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
+        setupPublishedDataSetTestEnvironment();
         UA_PublishedDataSet *pds1 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds1, NULL);
         ck_assert_uint_eq(pds1->fieldSize, 0);
@@ -399,6 +409,7 @@ START_TEST(AddDataSetFieldWithInvalidPDSId){
         fieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
         fieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
         retVal = UA_Server_addDataSetField(server, UA_NODEID_NUMERIC(0, UA_UINT32_MAX), &fieldConfig, NULL).result;
+        setupPublishedDataSetTestEnvironment();
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
         UA_PublishedDataSet *pds1 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds1, NULL);
@@ -407,6 +418,7 @@ START_TEST(AddDataSetFieldWithInvalidPDSId){
 
 START_TEST(GetDataSetFieldConfigurationAndCompareValues){
         setupDataSetFieldTestEnvironment();
+        setupPublishedDataSetTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -427,6 +439,22 @@ START_TEST(GetDataSetFieldConfigurationAndCompareValues){
 
 
 START_TEST(SinglePublishDataSetFieldAndPublishTimestampTest){
+        UA_PublishedDataSetConfig pdsConfig;
+        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+        pdsConfig.name = UA_STRING(publishedDataSet1Name);
+        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+        pdsConfig.name = UA_STRING(publishedDataSet2Name);
+        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2);
+
+        UA_DataSetFieldConfig dataSetFieldConfig;
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
+        dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+        dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+        UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
         writerGroupConfig.name = UA_STRING("WriterGroup 1");
@@ -444,25 +472,11 @@ START_TEST(SinglePublishDataSetFieldAndPublishTimestampTest){
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
         UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
         UA_Server_setWriterGroupOperational(server, writerGroup3);
-        UA_PublishedDataSetConfig pdsConfig;
-        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
-        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-        pdsConfig.name = UA_STRING(publishedDataSet1Name);
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
-        pdsConfig.name = UA_STRING(publishedDataSet2Name);
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2);
+
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
         dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
         UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
-        UA_DataSetFieldConfig dataSetFieldConfig;
-        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-        dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
-        dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
-        dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
 
         UA_DateTime currentTime = UA_DateTime_now();
         UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
@@ -473,27 +487,29 @@ START_TEST(SinglePublishDataSetFieldAndPublishTimestampTest){
     } END_TEST
 
 START_TEST(PublishDataSetFieldAsDeltaFrame){
-            setupDataSetFieldTestEnvironment();
-            UA_DataSetFieldConfig dataSetFieldConfig;
-            memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-            dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-            dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
-            dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-            dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
-            dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-            UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
-
-            UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
-            wg->config.maxEncapsulatedDataSetMessageCount = 3;
-            UA_DataSetWriter *dsw = UA_DataSetWriter_findDSWbyId(server, dataSetWriter1);
-            dsw->config.keyFrameCount = 3;
-
-            UA_WriterGroup_publishCallback(server, wg);
-            UA_WriterGroup_publishCallback(server, wg);
-            UA_WriterGroup_publishCallback(server, wg);
-            UA_WriterGroup_publishCallback(server, wg);
-            UA_WriterGroup_publishCallback(server, wg);
-        } END_TEST
+        setupPublishedDataSetTestEnvironment();
+        UA_DataSetFieldConfig dataSetFieldConfig;
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
+        dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+        dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+        UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime2");
+        UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+        setupDataSetFieldTestEnvironment();
+        UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
+        wg->config.maxEncapsulatedDataSetMessageCount = 3;
+        UA_DataSetWriter *dsw = UA_DataSetWriter_findDSWbyId(server, dataSetWriter1);
+        dsw->config.keyFrameCount = 3;
+
+        UA_WriterGroup_publishCallback(server, wg);
+        UA_WriterGroup_publishCallback(server, wg);
+        UA_WriterGroup_publishCallback(server, wg);
+        UA_WriterGroup_publishCallback(server, wg);
+        UA_WriterGroup_publishCallback(server, wg);
+    } END_TEST
 
 int main(void) {
     TCase *tc_add_pubsub_writergroup = tcase_create("PubSub WriterGroup items handling");
@@ -533,7 +549,7 @@ int main(void) {
     suite_add_tcase(s, tc_add_pubsub_datasetwriter);
     suite_add_tcase(s, tc_add_pubsub_datasetfields);
     suite_add_tcase(s, tc_pubsub_publish);
-
+    
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);
     srunner_run_all(sr,CK_NORMAL);

From 032c034b2b316e50a64b065e641143f9b251ef10 Mon Sep 17 00:00:00 2001
From: Maddin-619 <martin.brenner94@gmail.com>
Date: Mon, 27 Mar 2023 20:11:26 +0200
Subject: [PATCH 0873/1963] feat(server): Openssl runtime server cert update
 function

---
 .../openssl/ua_openssl_aes128sha256rsaoaep.c  | 49 +++++++++++++++++++
 .../crypto/openssl/ua_openssl_basic128rsa15.c | 49 +++++++++++++++++++
 plugins/crypto/openssl/ua_openssl_basic256.c  | 48 ++++++++++++++++++
 .../openssl/ua_openssl_basic256sha256.c       | 49 +++++++++++++++++++
 4 files changed, 195 insertions(+)

diff --git a/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c b/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
index 13797f8e767..ea58a40ab8b 100644
--- a/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
+++ b/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
@@ -104,6 +104,53 @@ UA_Policy_Aes128Sha256RsaOaep_Clear_Context(UA_SecurityPolicy *policy) {
     return;
 }
 
+static UA_StatusCode
+updateCertificateAndPrivateKey_sp_aes128sha256rsaoaep(UA_SecurityPolicy *securityPolicy,
+                                                      const UA_ByteString newCertificate,
+                                                      const UA_ByteString newPrivateKey) {
+    if(securityPolicy == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if(securityPolicy->policyContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Policy_Context_Aes128Sha256RsaOaep *pc =
+        (Policy_Context_Aes128Sha256RsaOaep *)securityPolicy->policyContext;
+
+    UA_ByteString_clear(&securityPolicy->localCertificate);
+
+    UA_StatusCode retval = UA_OpenSSL_LoadLocalCertificate(
+        &newCertificate, &securityPolicy->localCertificate);
+
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Set the new private key */
+    EVP_PKEY_free(pc->localPrivateKey);
+
+    pc->localPrivateKey = UA_OpenSSL_LoadPrivateKey(&newPrivateKey);
+
+    if(!pc->localPrivateKey) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
+                                                      &pc->localCertThumbprint, true);
+    if(retval != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+
+    return retval;
+
+error:
+    UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                 "Could not update certificate and private key");
+    if(securityPolicy->policyContext != NULL)
+        UA_Policy_Aes128Sha256RsaOaep_Clear_Context(securityPolicy);
+    return retval;
+}
+
 /* create the channel context */
 
 static UA_StatusCode
@@ -617,6 +664,8 @@ UA_SecurityPolicy_Aes128Sha256RsaOaep(UA_SecurityPolicy *policy,
         UA_ByteString_clear(&policy->localCertificate);
         return retval;
     }
+    policy->updateCertificateAndPrivateKey =
+        updateCertificateAndPrivateKey_sp_aes128sha256rsaoaep;
     policy->clear = UA_Policy_Aes128Sha256RsaOaep_Clear_Context;
 
     /* Use the same signature algorithm as the asymmetric component for
diff --git a/plugins/crypto/openssl/ua_openssl_basic128rsa15.c b/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
index d7549319b4e..f35ac75c32a 100644
--- a/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
+++ b/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
@@ -97,6 +97,53 @@ UA_Policy_Basic128Rsa15_Clear_Context (UA_SecurityPolicy *policy) {
     return;
 }
 
+static UA_StatusCode
+updateCertificateAndPrivateKey_sp_basic128rsa15(UA_SecurityPolicy *securityPolicy,
+                                                const UA_ByteString newCertificate,
+                                                const UA_ByteString newPrivateKey) {
+    if(securityPolicy == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if(securityPolicy->policyContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Policy_Context_Basic128Rsa15 *pc =
+        (Policy_Context_Basic128Rsa15 *)securityPolicy->policyContext;
+
+    UA_ByteString_clear(&securityPolicy->localCertificate);
+
+    UA_StatusCode retval = UA_OpenSSL_LoadLocalCertificate(
+        &newCertificate, &securityPolicy->localCertificate);
+
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Set the new private key */
+    EVP_PKEY_free(pc->localPrivateKey);
+
+    pc->localPrivateKey = UA_OpenSSL_LoadPrivateKey(&newPrivateKey);
+
+    if(!pc->localPrivateKey) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
+                                                      &pc->localCertThumbprint, true);
+    if(retval != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+
+    return retval;
+
+error:
+    UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                 "Could not update certificate and private key");
+    if(securityPolicy->policyContext != NULL)
+        UA_Policy_Basic128Rsa15_Clear_Context(securityPolicy);
+    return retval;
+}
+
 /* create the channel context */
 
 static UA_StatusCode
@@ -598,6 +645,8 @@ UA_SecurityPolicy_Basic128Rsa15 (UA_SecurityPolicy * policy,
         UA_ByteString_clear (&policy->localCertificate);
         return retval;
     }
+    policy->updateCertificateAndPrivateKey =
+        updateCertificateAndPrivateKey_sp_basic128rsa15;
     policy->clear = UA_Policy_Basic128Rsa15_Clear_Context;
 
     /* Use the same signature algorithm as the asymmetric component for
diff --git a/plugins/crypto/openssl/ua_openssl_basic256.c b/plugins/crypto/openssl/ua_openssl_basic256.c
index 9ae0b6149c2..413f680da74 100644
--- a/plugins/crypto/openssl/ua_openssl_basic256.c
+++ b/plugins/crypto/openssl/ua_openssl_basic256.c
@@ -95,6 +95,53 @@ UA_Policy_Basic256_Clear_Context (UA_SecurityPolicy *policy) {
     return;
 }
 
+static UA_StatusCode
+updateCertificateAndPrivateKey_sp_basic256(UA_SecurityPolicy *securityPolicy,
+                                           const UA_ByteString newCertificate,
+                                           const UA_ByteString newPrivateKey) {
+    if(securityPolicy == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if(securityPolicy->policyContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Policy_Context_Basic256 *pc =
+        (Policy_Context_Basic256 *)securityPolicy->policyContext;
+
+    UA_ByteString_clear(&securityPolicy->localCertificate);
+
+    UA_StatusCode retval = UA_OpenSSL_LoadLocalCertificate(
+        &newCertificate, &securityPolicy->localCertificate);
+
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Set the new private key */
+    EVP_PKEY_free(pc->localPrivateKey);
+
+    pc->localPrivateKey = UA_OpenSSL_LoadPrivateKey(&newPrivateKey);
+
+    if(!pc->localPrivateKey) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
+                                                      &pc->localCertThumbprint, true);
+    if(retval != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+
+    return retval;
+
+error:
+    UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                 "Could not update certificate and private key");
+    if(securityPolicy->policyContext != NULL)
+        UA_Policy_Basic256_Clear_Context(securityPolicy);
+    return retval;
+}
+
 /* create the channel context */
 
 static UA_StatusCode
@@ -598,6 +645,7 @@ UA_SecurityPolicy_Basic256 (UA_SecurityPolicy * policy,
         UA_ByteString_clear (&policy->localCertificate);
         return retval;
     }
+    policy->updateCertificateAndPrivateKey = updateCertificateAndPrivateKey_sp_basic256;
     policy->clear = UA_Policy_Basic256_Clear_Context;
 
     /* Use the same signature algorithm as the asymmetric component for
diff --git a/plugins/crypto/openssl/ua_openssl_basic256sha256.c b/plugins/crypto/openssl/ua_openssl_basic256sha256.c
index af18f2fe754..423287a0777 100644
--- a/plugins/crypto/openssl/ua_openssl_basic256sha256.c
+++ b/plugins/crypto/openssl/ua_openssl_basic256sha256.c
@@ -96,6 +96,53 @@ UA_Policy_Clear_Context(UA_SecurityPolicy *policy) {
     return;
 }
 
+static UA_StatusCode
+updateCertificateAndPrivateKey_sp_basic256sha256(UA_SecurityPolicy *securityPolicy,
+                                           const UA_ByteString newCertificate,
+                                           const UA_ByteString newPrivateKey) {
+    if(securityPolicy == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if(securityPolicy->policyContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Policy_Context_Basic256Sha256 *pc =
+        (Policy_Context_Basic256Sha256 *)securityPolicy->policyContext;
+
+    UA_ByteString_clear(&securityPolicy->localCertificate);
+
+    UA_StatusCode retval = UA_OpenSSL_LoadLocalCertificate(
+        &newCertificate, &securityPolicy->localCertificate);
+
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Set the new private key */
+    EVP_PKEY_free(pc->localPrivateKey);
+
+    pc->localPrivateKey = UA_OpenSSL_LoadPrivateKey(&newPrivateKey);
+
+    if(!pc->localPrivateKey) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
+                                                      &pc->localCertThumbprint, true);
+    if(retval != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+
+    return retval;
+
+error:
+    UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                 "Could not update certificate and private key");
+    if(securityPolicy->policyContext != NULL)
+        UA_Policy_Clear_Context(securityPolicy);
+    return retval;
+}
+
 /* create the channel context */
 
 static UA_StatusCode
@@ -570,6 +617,8 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
     symSignatureAlgorithm->getRemoteKeyLength =
         UA_SymSig_Basic256Sha256_getRemoteKeyLength;
 
+    policy->updateCertificateAndPrivateKey =
+        updateCertificateAndPrivateKey_sp_basic256sha256;
     policy->clear = UA_Policy_Clear_Context;
     retval = UA_Policy_New_Context(policy, localPrivateKey, logger);
     if(retval != UA_STATUSCODE_GOOD) {

From 89a69a8b74eef3ee1bc99d4654b5645c6b22305a Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 15 Mar 2023 08:39:38 +0100
Subject: [PATCH 0874/1963] fix(doc) update links in readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 43817d7cc18..6052ed0d4a2 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ See the page on [open62541 Features](FEATURES.md) for an in-depth look at the su
   
 ### Dependencies
 
-On most systems, open62541 requires the C standard library only. For dependencies during the build process, see the following list and the [build documentation](https://open62541.org/doc/current/building.html) for details.
+On most systems, open62541 requires the C standard library only. For dependencies during the build process, see the following list and the [build documentation](https://www.open62541.org/doc/master/building.html) for details.
 
 - Core Library: The core library has no dependencies besides the C99 standard headers.
 - Default Plugins: The default plugins use the POSIX interfaces for networking and accessing the system clock. Ports to different (embedded) architectures are achieved by customizing the plugins.
@@ -155,7 +155,7 @@ For every release, we provide some pre-packed release packages which you can dir
 
 Have a look at the [release page](https://github.com/open62541/open62541/releases) and the corresponding attached assets.
 
-A more detailed explanation on how to install the open62541 SDK is given in our [documentation](https://open62541.org/doc/current/installing.html).
+A more detailed explanation on how to install the open62541 SDK is given in our [documentation](https://www.open62541.org/doc/master/building.html#building-the-library).
 
 You can not directly download a .zip package from the main branches using the Github UI, since then some of the submodules and version strings are missing.
 Therefore you have three options to install and use this stack:

From a800710880890124f675381dcecdb817d8eeafa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9?= <viruszold@gmail.com>
Date: Wed, 5 Apr 2023 02:39:02 +0300
Subject: [PATCH 0875/1963] fix(el): socket descriptor leak when UA_connect
 failed (#5720)

---
 arch/eventloop_posix_tcp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 8cc59241a62..b8b6e08fddf 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -812,6 +812,7 @@ TCP_openActiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *p
             UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                            "TCP\t| Connecting the socket to %s failed (%s)",
                            hostname, errno_str));
+        UA_close(newSock);
         return UA_STATUSCODE_BADDISCONNECT;
     }
 

From fa984e8ee67b491a23403e4949641daca40c5872 Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Wed, 5 Apr 2023 16:41:09 +0200
Subject: [PATCH 0876/1963] fix(pubsub): Add StatusCode checks. (#5723)

* Fix Pubsub Tests. Added Statuscode Checks.

* Fix CI error:  unread retval
---
 tests/pubsub/check_pubsub_config_freeze.c     |  81 +++---
 tests/pubsub/check_pubsub_decryption.c        |  11 +-
 .../pubsub/check_pubsub_encrypted_rt_levels.c |  15 +-
 tests/pubsub/check_pubsub_encryption.c        |  45 +--
 tests/pubsub/check_pubsub_encryption_aes256.c |  37 ++-
 tests/pubsub/check_pubsub_informationmodel.c  |  30 +-
 .../check_pubsub_informationmodel_methods.c   |  18 +-
 tests/pubsub/check_pubsub_mqtt.c              |  10 +-
 ...heck_pubsub_multiple_subscribe_rt_levels.c |  12 +-
 tests/pubsub/check_pubsub_publish.c           |  68 +++--
 tests/pubsub/check_pubsub_publish_json.c      |  10 +-
 tests/pubsub/check_pubsub_publish_rt_levels.c |   4 +-
 tests/pubsub/check_pubsub_publish_uadp.c      |  52 ++--
 tests/pubsub/check_pubsub_publishspeed.c      |  29 +-
 tests/pubsub/check_pubsub_sks_client.c        |  45 +--
 tests/pubsub/check_pubsub_sks_keystorage.c    |   8 +-
 tests/pubsub/check_pubsub_sks_pull.c          |  17 +-
 tests/pubsub/check_pubsub_sks_push.c          |   9 +-
 tests/pubsub/check_pubsub_subscribe.c         |  76 ++---
 .../check_pubsub_subscribe_config_freeze.c    |  78 +++---
 .../pubsub/check_pubsub_subscribe_encrypted.c | 259 +++++++++---------
 .../pubsub/check_pubsub_subscribe_rt_levels.c |  17 +-
 tests/pubsub/check_pubsub_udp_unicast.c       |  12 +-
 23 files changed, 520 insertions(+), 423 deletions(-)

diff --git a/tests/pubsub/check_pubsub_config_freeze.c b/tests/pubsub/check_pubsub_config_freeze.c
index cd986cdf0b3..d7de476b2da 100644
--- a/tests/pubsub/check_pubsub_config_freeze.c
+++ b/tests/pubsub/check_pubsub_config_freeze.c
@@ -35,13 +35,14 @@ START_TEST(CreateAndLockConfiguration) {
     //create config
     UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1, dataSetField1;
     UA_PubSubConnectionConfig connectionConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
     &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -49,13 +50,13 @@ START_TEST(CreateAndLockConfiguration) {
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     writerGroupConfig.rtLevel = UA_PUBSUB_RT_NONE;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
 
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("PublishedDataSet 1");
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
 
     UA_DataSetFieldConfig fieldConfig;
     memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -63,7 +64,7 @@ START_TEST(CreateAndLockConfiguration) {
     fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 1");
     fieldConfig.field.variable.publishParameters.publishedVariable =
         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
-    UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &dataSetField1);
+    retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &dataSetField1).result;
 
     UA_DataSetField *dataSetField = UA_DataSetField_findDSFbyId(server, dataSetField1);
     ck_assert(dataSetField->configurationFrozen == UA_FALSE);
@@ -90,7 +91,7 @@ START_TEST(CreateAndLockConfiguration) {
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
     UA_DataSetWriter *dataSetWriter = UA_DataSetWriter_findDSWbyId(server, dataSetWriter1);
     ck_assert(dataSetWriter != NULL);
 
@@ -111,20 +112,22 @@ START_TEST(CreateAndLockConfiguration) {
         ck_assert(dsf->configurationFrozen == UA_TRUE);
     }
     //set state to disabled and implicit unlock the configuration
-        UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
+    retVal |= UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(CreateAndLockConfigurationWithExternalAPI) {
         //create config
         UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1, dataSetField1;
         UA_PubSubConnectionConfig connectionConfig;
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
         memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
         connectionConfig.name = UA_STRING("UADP Connection");
         UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
         UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                              &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-        UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+        retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -132,13 +135,13 @@ START_TEST(CreateAndLockConfigurationWithExternalAPI) {
         writerGroupConfig.publishingInterval = 10;
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
         writerGroupConfig.rtLevel = UA_PUBSUB_RT_NONE;
-        UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+        retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
 
         UA_PublishedDataSetConfig pdsConfig;
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet 1");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+        retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
 
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -146,7 +149,7 @@ START_TEST(CreateAndLockConfigurationWithExternalAPI) {
         fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 1");
         fieldConfig.field.variable.publishParameters.publishedVariable =
             UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
-        UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &dataSetField1);
+        retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &dataSetField1).result;
 
         UA_DataSetField *dataSetField = UA_DataSetField_findDSFbyId(server, dataSetField1);
         ck_assert(dataSetField->configurationFrozen == UA_FALSE);
@@ -158,7 +161,7 @@ START_TEST(CreateAndLockConfigurationWithExternalAPI) {
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
         dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-        UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
+        retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
         UA_DataSetWriter *dataSetWriter = UA_DataSetWriter_findDSWbyId(server, dataSetWriter1);
         ck_assert(dataSetWriter != NULL);
 
@@ -178,20 +181,22 @@ START_TEST(CreateAndLockConfigurationWithExternalAPI) {
             ck_assert(dsf->configurationFrozen == UA_TRUE);
         }
         //set state to disabled and implicit unlock the configuration
-        UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
+        retVal |= UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 START_TEST(CreateAndReleaseMultiplePDSLocks) {
     //create config
     UA_NodeId connection1, writerGroup1, writerGroup2, publishedDataSet1, dataSetWriter1, dataSetWriter2, dataSetWriter3, dataSetField1;
     UA_PubSubConnectionConfig connectionConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     //Add two writer groups
     UA_WriterGroupConfig writerGroupConfig;
@@ -200,15 +205,15 @@ START_TEST(CreateAndReleaseMultiplePDSLocks) {
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     writerGroupConfig.rtLevel = UA_PUBSUB_RT_NONE;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
     writerGroupConfig.name = UA_STRING("WriterGroup 2");
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup2);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup2);
 
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("PublishedDataSet 1");
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
 
     UA_DataSetFieldConfig fieldConfig;
     memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -216,18 +221,18 @@ START_TEST(CreateAndReleaseMultiplePDSLocks) {
     fieldConfig.field.variable.fieldNameAlias = UA_STRING("field 1");
     fieldConfig.field.variable.publishParameters.publishedVariable =
         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
-    UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &dataSetField1);
+    retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &dataSetField1).result;
 
     UA_DataSetField *dataSetField = UA_DataSetField_findDSFbyId(server, dataSetField1);
 
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 2");
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter2);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter2);
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 3");
-    UA_Server_addDataSetWriter(server, writerGroup2, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter3);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup2, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter3);
 
     UA_WriterGroup *writerGroup_1 = UA_WriterGroup_findWGbyId(server, writerGroup1);
     UA_WriterGroup *writerGroup_2 = UA_WriterGroup_findWGbyId(server, writerGroup2);
@@ -238,34 +243,35 @@ START_TEST(CreateAndReleaseMultiplePDSLocks) {
     ck_assert(writerGroup_2->configurationFrozen == UA_FALSE);
     ck_assert(publishedDataSet->configurationFreezeCounter == 0);
     ck_assert(pubSubConnection->configurationFreezeCounter == 0);
-        UA_Server_freezeWriterGroupConfiguration(server, writerGroup1);
-        UA_Server_freezeWriterGroupConfiguration(server, writerGroup2);
+    retVal |= UA_Server_freezeWriterGroupConfiguration(server, writerGroup1);
+    retVal |= UA_Server_freezeWriterGroupConfiguration(server, writerGroup2);
     ck_assert(writerGroup_1->configurationFrozen == UA_TRUE);
     ck_assert(writerGroup_2->configurationFrozen == UA_TRUE);
     ck_assert(publishedDataSet->configurationFreezeCounter > 0);
     ck_assert(pubSubConnection->configurationFreezeCounter > 0);
     //unlock one tree, get sure pds still locked
-        UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
+    retVal |= UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
     ck_assert(writerGroup_1->configurationFrozen == UA_FALSE);
     ck_assert(publishedDataSet->configurationFreezeCounter > 0);
     ck_assert(dataSetField->configurationFrozen == UA_TRUE);
-    UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup2);
+    retVal |= UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup2);
     ck_assert(publishedDataSet->configurationFreezeCounter == 0);
     ck_assert(dataSetField->configurationFrozen == UA_FALSE);
     ck_assert(pubSubConnection->configurationFreezeCounter == 0);
-
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 START_TEST(CreateLockAndEditConfiguration) {
     UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
     UA_PubSubConnectionConfig connectionConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -273,13 +279,13 @@ START_TEST(CreateLockAndEditConfiguration) {
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     writerGroupConfig.rtLevel = UA_PUBSUB_RT_NONE;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
 
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("PublishedDataSet 1");
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
 
     UA_DataSetFieldConfig fieldConfig;
     memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -288,7 +294,7 @@ START_TEST(CreateLockAndEditConfiguration) {
     fieldConfig.field.variable.publishParameters.publishedVariable =
         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
     UA_NodeId localDataSetField;
-    UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField);
+    retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
 
     //get internal WG Pointer
     UA_WriterGroup *writerGroup = UA_WriterGroup_findWGbyId(server, writerGroup1);
@@ -297,7 +303,7 @@ START_TEST(CreateLockAndEditConfiguration) {
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
     UA_DataSetWriter *dataSetWriter = UA_DataSetWriter_findDSWbyId(server, dataSetWriter1);
     ck_assert(dataSetWriter != NULL);
 
@@ -308,21 +314,23 @@ START_TEST(CreateLockAndEditConfiguration) {
     UA_DataSetFieldResult fieldRemoveResult = UA_Server_removeDataSetField(server, localDataSetField);
     ck_assert(fieldRemoveResult.result == UA_STATUSCODE_BADCONFIGURATIONERROR);
     ck_assert(UA_Server_removePublishedDataSet(server, publishedDataSet1) == UA_STATUSCODE_BADCONFIGURATIONERROR);
-        UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
+    retVal |= UA_Server_unfreezeWriterGroupConfiguration(server, writerGroup1);
     fieldRemoveResult = UA_Server_removeDataSetField(server, localDataSetField);
     ck_assert(fieldRemoveResult.result == UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 START_TEST(CreateConfigWithStaticFieldSource) {
     UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
     UA_PubSubConnectionConfig connectionConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -330,13 +338,13 @@ START_TEST(CreateConfigWithStaticFieldSource) {
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
 
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("PublishedDataSet 1");
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
 
     UA_UInt32 *intValue = UA_UInt32_new();
     UA_DataValue *dataValue = UA_DataValue_new();
@@ -349,13 +357,14 @@ START_TEST(CreateConfigWithStaticFieldSource) {
     fieldConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
     fieldConfig.field.variable.rtValueSource.staticValueSource = &dataValue;
     UA_NodeId localDataSetField;
-    UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField);
+    retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &fieldConfig, &localDataSetField).result;
 
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
     UA_DataValue_delete(dataValue);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_decryption.c b/tests/pubsub/check_pubsub_decryption.c
index 37d5b4ee496..7d76a1dbea3 100644
--- a/tests/pubsub/check_pubsub_decryption.c
+++ b/tests/pubsub/check_pubsub_decryption.c
@@ -52,9 +52,10 @@ UA_Logger *logger = NULL;
 static void
 setup(void) {
     server = UA_Server_new();
+    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -62,7 +63,7 @@ setup(void) {
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    UA_Server_run_startup(server);
+    retVal |= UA_Server_run_startup(server);
     // add connection
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -75,8 +76,8 @@ setup(void) {
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = 2234;
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionId);
-
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     logger = &server->config.logger;
 }
 
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index 187a08e9090..e26cc62b401 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -204,10 +204,11 @@ START_TEST(SetupInvalidPubSubConfig) {
     memset(&variant, 0, sizeof(UA_Variant));
     UA_Variant_setScalar(&variant, intValue, &UA_TYPES[UA_TYPES_UINT32]);
     attributes.value = variant;
-    UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000),
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
                               UA_QUALIFIEDNAME(1, "variable"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               attributes, NULL, NULL);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);                          
     dsfConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 1000);
     dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
     /* Not using static value source */
@@ -281,11 +282,12 @@ START_TEST(SetupInvalidPubSubConfig) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     /* Variable to subscribe data */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed DateTime");
@@ -442,11 +444,12 @@ START_TEST(PublishAndSubscribeSingleFieldWithFixedOffsets) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     /* Variable to subscribe data */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
@@ -532,11 +535,12 @@ START_TEST(PublishPDSWithMultipleFieldsAndSubscribeFixedSize) {
         folderBrowseName1 = UA_QUALIFIEDNAME (1, "Published Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName1, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr1, NULL, &folderId1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     UA_UInt32 value            = 0;
     vAttr.accessLevel           = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
@@ -694,11 +698,12 @@ START_TEST(PublishPDSWithMultipleFieldsAndSubscribeFixedSize) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     /* Variable to subscribe data */
     vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
diff --git a/tests/pubsub/check_pubsub_encryption.c b/tests/pubsub/check_pubsub_encryption.c
index b8a18356c56..d58882b2c09 100644
--- a/tests/pubsub/check_pubsub_encryption.c
+++ b/tests/pubsub/check_pubsub_encryption.c
@@ -30,9 +30,10 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -40,7 +41,7 @@ static void setup(void) {
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    UA_Server_run_startup(server);
+    retVal |= UA_Server_run_startup(server);
     //add 2 connections
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -49,8 +50,9 @@ static void setup(void) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection2);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection2);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
@@ -60,19 +62,21 @@ static void teardown(void) {
 
 START_TEST(SinglePublishDataSetField) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
-
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
     writerGroupConfig.name = UA_STRING("WriterGroup 1");
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
-    UA_Server_setWriterGroupOperational(server, writerGroup1);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     writerGroupConfig.name = UA_STRING("WriterGroup 2");
     writerGroupConfig.publishingInterval = 50;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup2);
-    UA_Server_setWriterGroupOperational(server, writerGroup2);
+    retVal |= UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup2);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup2);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     writerGroupConfig.name = UA_STRING("WriterGroup 3");
     writerGroupConfig.publishingInterval = 100;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
@@ -80,30 +84,36 @@ START_TEST(SinglePublishDataSetField) {
     writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
     writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
 
-    UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
-    UA_Server_setWriterGroupOperational(server, writerGroup3);
+    retVal |= UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup3);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("PublishedDataSet 1");
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2);
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    pdsConfig.name = UA_STRING("PublishedDataSet 2");
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2).addResult;
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_DataSetFieldConfig dataSetFieldConfig;
     memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
     dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
     dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
     dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
     dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+    retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL).result;
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-    UA_Server_addDataSetWriter(server, writerGroup3, publishedDataSet1,
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup3, publishedDataSet1,
                                    &dataSetWriterConfig, &dataSetWriter1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_ByteString sk = {UA_AES128CTR_SIGNING_KEY_LENGTH, signingKey};
     UA_ByteString ek = {UA_AES128CTR_KEY_LENGTH, encryptingKey};
@@ -113,6 +123,7 @@ START_TEST(SinglePublishDataSetField) {
 
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup3);
     UA_WriterGroup_publishCallback(server, wg);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_encryption_aes256.c b/tests/pubsub/check_pubsub_encryption_aes256.c
index e30b279d28b..0d31c189a9e 100644
--- a/tests/pubsub/check_pubsub_encryption_aes256.c
+++ b/tests/pubsub/check_pubsub_encryption_aes256.c
@@ -30,9 +30,10 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -40,7 +41,7 @@ static void setup(void) {
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    UA_Server_run_startup(server);
+    retVal |= UA_Server_run_startup(server);
     //add 2 connections
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -49,8 +50,9 @@ static void setup(void) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection2);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection2);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
@@ -62,16 +64,17 @@ START_TEST(SinglePublishDataSetField) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
 
     UA_WriterGroupConfig writerGroupConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
     writerGroupConfig.name = UA_STRING("WriterGroup 1");
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
     UA_Server_setWriterGroupOperational(server, writerGroup1);
     writerGroupConfig.name = UA_STRING("WriterGroup 2");
     writerGroupConfig.publishingInterval = 50;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup2);
+    retVal |= UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup2);
     UA_Server_setWriterGroupOperational(server, writerGroup2);
     writerGroupConfig.name = UA_STRING("WriterGroup 3");
     writerGroupConfig.publishingInterval = 100;
@@ -80,30 +83,35 @@ START_TEST(SinglePublishDataSetField) {
     writerGroupConfig.securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
     writerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
 
-    UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
-    UA_Server_setWriterGroupOperational(server, writerGroup3);
+    retVal |= UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup3);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("PublishedDataSet 1");
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2);
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
+    pdsConfig.name = UA_STRING("PublishedDataSet 2");
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2).addResult;
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_DataSetFieldConfig dataSetFieldConfig;
     memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
     dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
     dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
     dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
     dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+    retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL).result;
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-    UA_Server_addDataSetWriter(server, writerGroup3, publishedDataSet1,
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup3, publishedDataSet1,
                                &dataSetWriterConfig, &dataSetWriter1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     UA_ByteString sk = {UA_AES256CTR_SIGNING_KEY_LENGTH, signingKey};
     UA_ByteString ek = {UA_AES256CTR_KEY_LENGTH, encryptingKey};
@@ -113,6 +121,7 @@ START_TEST(SinglePublishDataSetField) {
 
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup3);
     UA_WriterGroup_publishCallback(server, wg);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_informationmodel.c b/tests/pubsub/check_pubsub_informationmodel.c
index d2a20884386..a5e59ca3172 100644
--- a/tests/pubsub/check_pubsub_informationmodel.c
+++ b/tests/pubsub/check_pubsub_informationmodel.c
@@ -29,10 +29,12 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-    UA_Server_run_startup(server);
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
+    retVal |= UA_Server_run_startup(server);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
@@ -45,7 +47,7 @@ static void addPublishedDataSet(UA_String pdsName, UA_NodeId *assignedId){
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = pdsName;
-    UA_Server_addPublishedDataSet(server, &pdsConfig, assignedId);
+    ck_assert_int_eq(UA_Server_addPublishedDataSet(server, &pdsConfig, assignedId).addResult, UA_STATUSCODE_GOOD);
 }
 
 static void addDataSetField(UA_NodeId publishedDataSetIdent) {
@@ -59,8 +61,8 @@ static void addDataSetField(UA_NodeId publishedDataSetIdent) {
     dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
     dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSetIdent,
-                              &dataSetFieldConfig, &dataSetFieldIdent);
+    ck_assert_int_eq(UA_Server_addDataSetField(server, publishedDataSetIdent,
+                              &dataSetFieldConfig, &dataSetFieldIdent).result, UA_STATUSCODE_GOOD);
 }
 
 static void addPubSubConnection(UA_String connectionName, UA_String addressUrl, UA_NodeId *assignedId){
@@ -71,7 +73,7 @@ static void addPubSubConnection(UA_String connectionName, UA_String addressUrl,
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, assignedId);
+    ck_assert_int_eq(UA_Server_addPubSubConnection(server, &connectionConfig, assignedId), UA_STATUSCODE_GOOD);
 }
 
 static void addWriterGroup(UA_NodeId parentConnection, UA_String name, UA_Duration interval, UA_NodeId *assignedId){
@@ -80,29 +82,29 @@ static void addWriterGroup(UA_NodeId parentConnection, UA_String name, UA_Durati
     writerGroupConfig.name = name;
     writerGroupConfig.publishingInterval = interval;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, parentConnection, &writerGroupConfig, assignedId);
-    UA_Server_setWriterGroupOperational(server, *assignedId);
+    ck_assert_int_eq(UA_Server_addWriterGroup(server, parentConnection, &writerGroupConfig, assignedId), UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(UA_Server_setWriterGroupOperational(server, *assignedId), UA_STATUSCODE_GOOD);
 }
 
 static void addDataSetWriter(UA_NodeId parentWriterGroup, UA_NodeId connectedPDS, UA_String name, UA_NodeId *assignedId){
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
     dataSetWriterConfig.name = name;
-    UA_Server_addDataSetWriter(server, parentWriterGroup, connectedPDS, &dataSetWriterConfig, assignedId);
+    ck_assert_int_eq(UA_Server_addDataSetWriter(server, parentWriterGroup, connectedPDS, &dataSetWriterConfig, assignedId), UA_STATUSCODE_GOOD);
 }
 
 static void addReaderGroup(UA_NodeId parentConnection, UA_String name, UA_NodeId *assignedId){
     UA_ReaderGroupConfig readerGroupConfig;
     memset(&readerGroupConfig, 0, sizeof(readerGroupConfig));
     readerGroupConfig.name = name;
-    UA_Server_addReaderGroup(server, parentConnection, &readerGroupConfig, assignedId);
+    ck_assert_int_eq(UA_Server_addReaderGroup(server, parentConnection, &readerGroupConfig, assignedId), UA_STATUSCODE_GOOD);
 }
 
 static void addDataSetReader(UA_NodeId parentReaderGroup, UA_String name, UA_NodeId *assignedId){
     UA_DataSetReaderConfig readerConfig;
     memset(&readerConfig, 0, sizeof(readerConfig));
     readerConfig.name = name;
-    UA_Server_addDataSetReader(server, parentReaderGroup, &readerConfig, assignedId);
+    ck_assert_int_eq(UA_Server_addDataSetReader(server, parentReaderGroup, &readerConfig, assignedId), UA_STATUSCODE_GOOD);
 }
 
 static UA_Boolean doubleEqual(UA_Double a, UA_Double b, UA_Double maxAbsDelta){
@@ -151,8 +153,8 @@ static void setupBasicPubSubConfiguration(void){
     memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("Demo DataSetWriter");
     dataSetWriterConfig.dataSetWriterId = 62541;
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet2,
-                               &dataSetWriterConfig, &dataSetWriter4);
+    ck_assert_int_eq(UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet2,
+                               &dataSetWriterConfig, &dataSetWriter4), UA_STATUSCODE_GOOD);
     addReaderGroup(connection1, UA_STRING("ReaderGroup 1"), &readerGroup1);
     addDataSetReader(readerGroup1, UA_STRING("DataSetReader 1"), &dataSetReader1);
 }
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index bb6f2f0ae80..4ad84273bda 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -33,10 +33,12 @@ static void setup(void) {
     running = true;
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-    UA_Server_run_startup(server);
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_Server_run_startup(server);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     THREAD_CREATE(server_thread, serverloop);
 }
 
@@ -1234,26 +1236,26 @@ START_TEST(ReserveIdsMultipleTimes){
         UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                             &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
         UA_NodeId connectionNodeId, writerGroupNodeId, dataSetWriterNodeId, publishedDataSetNodeId;
-        UA_Server_addPubSubConnection (server, &connectionConfig, &connectionNodeId);
+        retVal |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionNodeId);
 
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
         writerGroupConfig.name = UA_STRING("TestWriterGroup");
         writerGroupConfig.writerGroupId = ((UA_UInt16 *)regWriterGroupIds.data)[0]; // Here use the reserved WriterGroupId
 
-        UA_Server_addWriterGroup(server, connectionNodeId, &writerGroupConfig, &writerGroupNodeId);
+        retVal |= UA_Server_addWriterGroup(server, connectionNodeId, &writerGroupConfig, &writerGroupNodeId);
 
         UA_PublishedDataSetConfig publishedDataSetConfig;
         memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
         publishedDataSetConfig.name = UA_STRING("TestPublishedDataSet");
-        UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetNodeId);
+        retVal |= UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetNodeId).addResult;
 
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
         dataSetWriterConfig.name = UA_STRING("TestDataSetWriter");
         dataSetWriterConfig.dataSetWriterId = ((UA_UInt16 *)regDataSetWriterIds.data)[0]; // Here use the reserved DataSetWriterId
-        UA_Server_addDataSetWriter(server, writerGroupNodeId, publishedDataSetNodeId, &dataSetWriterConfig, &dataSetWriterNodeId);
-
+        retVal |= UA_Server_addDataSetWriter(server, writerGroupNodeId, publishedDataSetNodeId, &dataSetWriterConfig, &dataSetWriterNodeId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         UA_Variant_clear(&defaultPublisherId);
         UA_Variant_clear(&regWriterGroupIds);
         UA_Variant_clear(&regDataSetWriterIds);
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index 76c4007d623..df9dcce8625 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -35,10 +35,11 @@ UA_DataSetReaderConfig readerConfig;
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_Server_run_startup(server);
     config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
-    UA_Server_run_startup(server);
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
+    retVal |= UA_Server_run_startup(server);
 
     //add connection
     UA_PubSubConnectionConfig connectionConfig;
@@ -71,7 +72,8 @@ static void setup(void) {
     connectionConfig.connectionProperties.map = connectionOptions;
     connectionConfig.connectionProperties.mapSize = connectionOptionIndex;
 
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index 96ae9373013..386cfd5be47 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -285,11 +285,12 @@ START_TEST(SubscribeMultipleMessagesRT) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     /* Variable to subscribe data */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
@@ -488,11 +489,12 @@ START_TEST(SubscribeMultipleMessagesWithoutRT) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     /* Variable to subscribe data */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
@@ -568,10 +570,11 @@ START_TEST(SetupInvalidPubSubConfig) {
     memset(&variant, 0, sizeof(UA_Variant));
     UA_Variant_setScalar(&variant, intValue, &UA_TYPES[UA_TYPES_UINT32]);
     attributes.value = variant;
-    UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000),
+    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
                               UA_QUALIFIEDNAME(1, "variable"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                               attributes, NULL, NULL);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     dsfConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 1000);
     dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
     /* Not using static value source */
@@ -636,11 +639,12 @@ START_TEST(SetupInvalidPubSubConfig) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     /* Variable to subscribe data */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed DateTime");
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index 9b634df7e2e..ce7262eaf27 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -23,6 +23,7 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
     UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
@@ -36,8 +37,9 @@ static void setup(void) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection2);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection2);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
@@ -72,7 +74,7 @@ START_TEST(AddRemoveAddWriterGroupWithMinimalValidConfiguration){
         writerGroupConfig.publishingInterval = 10;
         UA_NodeId localWriterGroup;
         retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &localWriterGroup);
-        UA_Server_setWriterGroupOperational(server, localWriterGroup);
+        retVal |= UA_Server_setWriterGroupOperational(server, localWriterGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal |= UA_Server_removeWriterGroup(server, localWriterGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -148,32 +150,36 @@ START_TEST(GetWriterGroupConfigurationAndCompareValues){
 
 static void setupDataSetWriterTestEnvironment(void){
     UA_WriterGroupConfig writerGroupConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
     writerGroupConfig.name = UA_STRING("WriterGroup 1");
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
-    UA_Server_setWriterGroupOperational(server, writerGroup1);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup1);
     writerGroupConfig.name = UA_STRING("WriterGroup 2");
     writerGroupConfig.publishingInterval = 50;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup2);
-    UA_Server_setWriterGroupOperational(server, writerGroup2);
+    retVal |= UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup2);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup2);
     writerGroupConfig.name = UA_STRING("WriterGroup 3");
     writerGroupConfig.publishingInterval = 100;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
-    UA_Server_setWriterGroupOperational(server, writerGroup3);
+    retVal |= UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
+    retVal |= UA_Server_setWriterGroupOperational(server, writerGroup3);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void setupPublishedDataSetTestEnvironment(void){
     UA_PublishedDataSetConfig pdsConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING(publishedDataSet1Name);
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
     pdsConfig.name = UA_STRING(publishedDataSet2Name);
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2);
+    retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2).addResult;
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 START_TEST(AddDataSetWriterWithValidConfiguration){
@@ -304,18 +310,20 @@ START_TEST(FindPDS){
 static void setupDataSetFieldTestEnvironment(void){
     setupDataSetWriterTestEnvironment();
     UA_DataSetWriterConfig dataSetWriterConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 2");
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter2);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter2);
     dataSetWriterConfig.name = UA_STRING("DataSetWriter 3");
-    UA_Server_addDataSetWriter(server, writerGroup2, publishedDataSet2, &dataSetWriterConfig, &dataSetWriter3);
+    retVal |= UA_Server_addDataSetWriter(server, writerGroup2, publishedDataSet2, &dataSetWriterConfig, &dataSetWriter3);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 START_TEST(AddDataSetFieldWithValidConfiguration){
-        setupDataSetFieldTestEnvironment();
         setupPublishedDataSetTestEnvironment();
+        setupDataSetFieldTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -333,8 +341,8 @@ START_TEST(AddDataSetFieldWithValidConfiguration){
     } END_TEST
 
 START_TEST(AddRemoveAddDataSetFieldWithValidConfiguration){
-        setupDataSetFieldTestEnvironment();
         setupPublishedDataSetTestEnvironment();
+        setupDataSetFieldTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -389,18 +397,17 @@ START_TEST(AddRemoveAddDataSetFieldWithValidConfiguration){
     } END_TEST
 
 START_TEST(AddDataSetFieldWithNullConfig){
-        setupDataSetFieldTestEnvironment();
         UA_StatusCode retVal;
         retVal = UA_Server_addDataSetField(server, publishedDataSet1, NULL, NULL).result;
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
         setupPublishedDataSetTestEnvironment();
+        setupDataSetFieldTestEnvironment();
         UA_PublishedDataSet *pds1 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds1, NULL);
         ck_assert_uint_eq(pds1->fieldSize, 0);
     } END_TEST
 
 START_TEST(AddDataSetFieldWithInvalidPDSId){
-        setupDataSetFieldTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -410,6 +417,7 @@ START_TEST(AddDataSetFieldWithInvalidPDSId){
         fieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
         retVal = UA_Server_addDataSetField(server, UA_NODEID_NUMERIC(0, UA_UINT32_MAX), &fieldConfig, NULL).result;
         setupPublishedDataSetTestEnvironment();
+        setupDataSetFieldTestEnvironment();
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
         UA_PublishedDataSet *pds1 = UA_PublishedDataSet_findPDSbyId(server, publishedDataSet1);
         ck_assert_ptr_ne(pds1, NULL);
@@ -417,8 +425,8 @@ START_TEST(AddDataSetFieldWithInvalidPDSId){
     } END_TEST
 
 START_TEST(GetDataSetFieldConfigurationAndCompareValues){
-        setupDataSetFieldTestEnvironment();
         setupPublishedDataSetTestEnvironment();
+        setupDataSetFieldTestEnvironment();
         UA_StatusCode retVal;
         UA_DataSetFieldConfig fieldConfig;
         memset(&fieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -440,12 +448,13 @@ START_TEST(GetDataSetFieldConfigurationAndCompareValues){
 
 START_TEST(SinglePublishDataSetFieldAndPublishTimestampTest){
         UA_PublishedDataSetConfig pdsConfig;
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING(publishedDataSet1Name);
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
+        retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
         pdsConfig.name = UA_STRING(publishedDataSet2Name);
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2);
+        retVal |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet2).addResult;
 
         UA_DataSetFieldConfig dataSetFieldConfig;
         memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -454,29 +463,29 @@ START_TEST(SinglePublishDataSetFieldAndPublishTimestampTest){
         dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
         dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+        retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL).result;
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
         writerGroupConfig.name = UA_STRING("WriterGroup 1");
         writerGroupConfig.publishingInterval = 10;
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-        UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+        retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
         UA_Server_setWriterGroupOperational(server, writerGroup1);
         writerGroupConfig.name = UA_STRING("WriterGroup 2");
         writerGroupConfig.publishingInterval = 50;
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-        UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup2);
+        retVal |= UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup2);
         UA_Server_setWriterGroupOperational(server, writerGroup2);
         writerGroupConfig.name = UA_STRING("WriterGroup 3");
         writerGroupConfig.publishingInterval = 100;
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-        UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
+        retVal |= UA_Server_addWriterGroup(server, connection2, &writerGroupConfig, &writerGroup3);
         UA_Server_setWriterGroupOperational(server, writerGroup3);
 
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
         dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-        UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
+        retVal |= UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
 
         UA_DateTime currentTime = UA_DateTime_now();
         UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
@@ -484,20 +493,22 @@ START_TEST(SinglePublishDataSetFieldAndPublishTimestampTest){
         UA_DateTime publishTime;
         UA_WriterGroup_lastPublishTimestamp(server, writerGroup1, &publishTime);
         ck_assert((publishTime - currentTime) < UA_DATETIME_MSEC * 100);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 START_TEST(PublishDataSetFieldAsDeltaFrame){
         setupPublishedDataSetTestEnvironment();
         UA_DataSetFieldConfig dataSetFieldConfig;
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
         memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
         dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
         dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
         dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
         dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+        retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL).result;
         dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime2");
-        UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+        retVal |= UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL).result;
         setupDataSetFieldTestEnvironment();
         UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
         wg->config.maxEncapsulatedDataSetMessageCount = 3;
@@ -509,6 +520,7 @@ START_TEST(PublishDataSetFieldAsDeltaFrame){
         UA_WriterGroup_publishCallback(server, wg);
         UA_WriterGroup_publishCallback(server, wg);
         UA_WriterGroup_publishCallback(server, wg);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_publish_json.c b/tests/pubsub/check_pubsub_publish_json.c
index 88088e96332..a6afe7d73f8 100644
--- a/tests/pubsub/check_pubsub_publish_json.c
+++ b/tests/pubsub/check_pubsub_publish_json.c
@@ -21,12 +21,13 @@ UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_setDefault(config);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
 
-    UA_Server_run_startup(server);
+    retVal |= UA_Server_run_startup(server);
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
@@ -36,7 +37,8 @@ static void setup(void) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index eb7f46e2bfa..6e43c80ed66 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -511,9 +511,9 @@ START_TEST(PubSubConfigWithInformationModelRTVariable) {
         UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "test node");
         UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
         UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
-        UA_Server_addVariableNode(server, UA_NODEID_NULL, parentNodeId,
+        ck_assert_int_eq(UA_Server_addVariableNode(server, UA_NODEID_NULL, parentNodeId,
                                   parentReferenceNodeId, myIntegerName,
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, &variableNodeId);
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, &variableNodeId), UA_STATUSCODE_GOOD);
         ck_assert(!UA_NodeId_isNull(&variableNodeId));
         UA_Variant variant;
         UA_Variant_init(&variant);
diff --git a/tests/pubsub/check_pubsub_publish_uadp.c b/tests/pubsub/check_pubsub_publish_uadp.c
index 1bcfae54af5..296b381fd6a 100644
--- a/tests/pubsub/check_pubsub_publish_uadp.c
+++ b/tests/pubsub/check_pubsub_publish_uadp.c
@@ -19,10 +19,11 @@ UA_NodeId connection1, publishedDataSetIdent, dataSetFieldIdent, writerGroupIden
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-    UA_Server_run_startup(server);
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_Server_run_startup(server);
 
     //add connection
     UA_PubSubConnectionConfig connectionConfig;
@@ -34,13 +35,13 @@ static void setup(void) {
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = 62541;
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     UA_PublishedDataSetConfig publishedDataSetConfig;
     memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
     publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     publishedDataSetConfig.name = UA_STRING("Test PDS");
-    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent);
+    retVal |= UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent).addResult;
 
     UA_DataSetFieldConfig dataSetFieldConfig;
     memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -50,8 +51,9 @@ static void setup(void) {
     dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
             UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
     dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSetIdent,
-                              &dataSetFieldConfig, &dataSetFieldIdent);
+    retVal |= UA_Server_addDataSetField(server, publishedDataSetIdent,
+                              &dataSetFieldConfig, &dataSetFieldIdent).result;
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
@@ -137,6 +139,7 @@ static void receiveAvailableMessages(UA_ByteString buffer, UA_PubSubConnection *
 }
 
 START_TEST(CheckNMandDSMcalculation){
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
     writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -154,7 +157,7 @@ START_TEST(CheckNMandDSMcalculation){
 
     //maximum DSM in one NM = 10
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 10;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
     UA_UadpWriterGroupMessageDataType_delete(wgm);
 
@@ -166,7 +169,7 @@ START_TEST(CheckNMandDSMcalculation){
     //add 10 dataSetWriter
     for(UA_UInt16 i = 0; i < 10; i++){
         dataSetWriterConfig.dataSetWriterId = (UA_UInt16) (dataSetWriterConfig.dataSetWriterId + 1);
-        UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
+        retVal |= UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
                                    &dataSetWriterConfig, &dataSetWriterIdent);
     }
 
@@ -177,7 +180,7 @@ START_TEST(CheckNMandDSMcalculation){
 
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 100000;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
+    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
 
     UA_ByteString buffer = UA_BYTESTRING("");
     UA_NetworkMessage networkMessage;
@@ -196,7 +199,7 @@ START_TEST(CheckNMandDSMcalculation){
     writerGroupConfig.publishingInterval = 200000;
     //maximum DSM in one NM = 5
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 5;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
+    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
     // UA_NetworkMessage networkMessage1, networkMessage2;
     UA_NetworkMessage networkMessages[2];
     receiveAvailableMessages(buffer, connection, networkMessages);
@@ -215,7 +218,7 @@ START_TEST(CheckNMandDSMcalculation){
     writerGroupConfig.publishingInterval = 300000;
     //maximum DSM in one NM = 20
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 20;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
+    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
     UA_NetworkMessage networkMessage3;
     receiveAvailableMessages(buffer, connection, &networkMessage3);
     ck_assert_uint_eq(networkMessage3.payloadHeader.dataSetPayloadHeader.count, 10);
@@ -229,7 +232,7 @@ START_TEST(CheckNMandDSMcalculation){
     writerGroupConfig.publishingInterval = 400000;
     //maximum DSM in one NM = 1
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 1;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
+    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
     UA_NetworkMessage messageArray[10];
     receiveAvailableMessages(buffer, connection, messageArray);
     for (int j = 0; j < 10; ++j) {
@@ -244,8 +247,8 @@ START_TEST(CheckNMandDSMcalculation){
     writerGroupConfig.publishingInterval = 500000;
     //maximum DSM in one NM = 0 -> should be equal to 1
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 0;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
+    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
+    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
 
     receiveAvailableMessages(buffer, connection, messageArray);
     for (int j = 0; j < 10; ++j) {
@@ -255,10 +258,11 @@ START_TEST(CheckNMandDSMcalculation){
         }
         UA_NetworkMessage_clear(&messageArray[j]);
     }
-
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 START_TEST(CheckNMandDSMBufferCalculation){
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
         writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -277,7 +281,7 @@ START_TEST(CheckNMandDSMBufferCalculation){
 
         //maximum DSM in one NM = 10
         writerGroupConfig.maxEncapsulatedDataSetMessageCount = 10;
-        UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
+        retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
         UA_Server_setWriterGroupOperational(server, writerGroupIdent);
         UA_UadpWriterGroupMessageDataType_delete(wgm);
 
@@ -289,17 +293,18 @@ START_TEST(CheckNMandDSMBufferCalculation){
         //add 10 dataSetWriter
         for(UA_UInt16 i = 0; i < 10; i++){
             dataSetWriterConfig.dataSetWriterId = (UA_UInt16) (dataSetWriterConfig.dataSetWriterId + 1);
-            UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
+            retVal |= UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
                                        &dataSetWriterConfig, &dataSetWriterIdent);
         }
 
         UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
         UA_Server_unfreezeWriterGroupConfiguration(server, writerGroupIdent);
-
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 START_TEST(CheckSingleDSMRawEncodedMessage){
     //TODO extend test case with raw encoding
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
     writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -317,7 +322,7 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
 
     //maximum DSM in one NM = 10
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 10;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
+    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
     UA_UadpWriterGroupMessageDataType_delete(wgm);
 
@@ -332,7 +337,7 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
     //add 10 dataSetWriter
     for(UA_UInt16 i = 0; i < 10; i++){
         dataSetWriterConfig.dataSetWriterId = (UA_UInt16) (dataSetWriterConfig.dataSetWriterId + 1);
-        UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
+        retVal |= UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
                                    &dataSetWriterConfig, &dataSetWriterIdent);
     }
 
@@ -343,7 +348,7 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
 
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 100000;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
+    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
 
     UA_ByteString buffer = UA_BYTESTRING("");
     UA_NetworkMessage networkMessage;
@@ -362,7 +367,7 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
     writerGroupConfig.publishingInterval = 200000;
     //maximum DSM in one NM = 5
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 5;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
+    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
     UA_NetworkMessage networkMessages[2];
     receiveAvailableMessages(buffer, connection, networkMessages);
     ck_assert_int_eq(networkMessages[0].payloadHeader.dataSetPayloadHeader.count, 5);
@@ -402,6 +407,7 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
     }
     UA_NetworkMessage_clear(&networkMessages[0]);
     UA_NetworkMessage_clear(&networkMessages[1]);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_publishspeed.c b/tests/pubsub/check_pubsub_publishspeed.c
index f141c8f91eb..97c1d0449fd 100644
--- a/tests/pubsub/check_pubsub_publishspeed.c
+++ b/tests/pubsub/check_pubsub_publishspeed.c
@@ -21,9 +21,12 @@ UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
+    retval |= UA_ServerConfig_setDefault(config);
+    retval |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
+    retval |= UA_Server_run_startup(server);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -32,28 +35,23 @@ static void setup(void) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
     writerGroupConfig.name = UA_STRING("WriterGroup 1");
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
-    UA_Server_setWriterGroupOperational(server, writerGroup1);
+    retval |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
+    retval |= UA_Server_setWriterGroupOperational(server, writerGroup1);
 
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("PublishedDataSet 1");
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1);
-
-    UA_DataSetWriterConfig dataSetWriterConfig;
-    memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
-    dataSetWriterConfig.name = UA_STRING("DataSetWriter 1");
-    UA_Server_addDataSetWriter(server, writerGroup1, publishedDataSet1, &dataSetWriterConfig, &dataSetWriter1);
-
-    UA_Server_run_startup(server);
+    retval |= UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSet1).addResult;
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
@@ -67,9 +65,10 @@ START_TEST(PublishSpeedTest) {
     dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
     dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
     dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
+    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
     dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL);
+    UA_StatusCode retval = UA_Server_addDataSetField(server, publishedDataSet1, &dataSetFieldConfig, NULL).result;
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
 
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index c80c7dc2a30..24a510ab7e4 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -95,7 +95,8 @@ addSecurityGroup(void) {
     securityGroupId = config.securityGroupName;
 
     allowedUsername = UA_STRING("user1");
-    UA_Server_setNodeContext(sksServer, outNodeId, &allowedUsername);
+    ck_assert_int_eq(UA_Server_setNodeContext(sksServer, outNodeId, &allowedUsername),
+                     UA_STATUSCODE_GOOD);
 }
 
 static UA_Boolean
@@ -163,9 +164,10 @@ static void
 publishersetup(void) {
     running = true;
     publisherApp = UA_Server_new();
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(publisherApp);
-    UA_ServerConfig_setMinimal(config, 4841, NULL);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_ServerConfig_setMinimal(config, 4841, NULL);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -184,18 +186,19 @@ publishersetup(void) {
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = PUBLISHER_ID;
-    UA_Server_addPubSubConnection(publisherApp, &connectionConfig, &publisherConnection);
-
-    UA_Server_run_startup(publisherApp);
+    retVal |= UA_Server_addPubSubConnection(publisherApp, &connectionConfig, &publisherConnection);
+    retVal |= UA_Server_run_startup(publisherApp);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void
 subscribersetup(void) {
     running = true;
     subscriberApp = UA_Server_new();
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(subscriberApp);
-    UA_ServerConfig_setMinimal(config, 4842, NULL);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_ServerConfig_setMinimal(config, 4842, NULL);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -212,10 +215,10 @@ subscribersetup(void) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(subscriberApp, &connectionConfig,
+    retVal |= UA_Server_addPubSubConnection(subscriberApp, &connectionConfig,
                                   &subscriberConnection);
-
-    UA_Server_run_startup(subscriberApp);
+    retVal |= UA_Server_run_startup(subscriberApp);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void
@@ -278,14 +281,15 @@ addPublisher(UA_Server *server) {
 
     retval = UA_Server_addWriterGroup(server, publisherConnection, &writerGroupConfig,
                                       &writerGroupId);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
     UA_PublishedDataSetConfig publishedDataSetConfig;
     memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
     publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     publishedDataSetConfig.name = UA_STRING("test PDS");
-    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig,
-                                  &publishedDataSetIdent);
-
+    retval = UA_Server_addPublishedDataSet(server, &publishedDataSetConfig,
+                                  &publishedDataSetIdent).addResult;
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
     /* Create variable to publish integer data */
     UA_NodeId publisherNode;
     UA_VariableAttributes attr = UA_VariableAttributes_default;
@@ -310,17 +314,17 @@ addPublisher(UA_Server *server) {
     dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
     dataSetFieldConfig.field.variable.publishParameters.attributeId =
         UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSetIdent, &dataSetFieldConfig,
-                              &dataSetFieldIdent);
-
+    retval = UA_Server_addDataSetField(server, publishedDataSetIdent, &dataSetFieldConfig,
+                              &dataSetFieldIdent).result;
+    ck_assert_int_eq(retval , UA_STATUSCODE_GOOD);
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("Demo DataSetWriter");
     dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
     dataSetWriterConfig.keyFrameCount = 10;
-    UA_Server_addDataSetWriter(server, writerGroupId, publishedDataSetIdent,
+    retval = UA_Server_addDataSetWriter(server, writerGroupId, publishedDataSetIdent,
                                &dataSetWriterConfig, &dataSetWriterIdent);
-
+    ck_assert_int_eq(retval , UA_STATUSCODE_GOOD);
     return retval;
 }
 
@@ -384,11 +388,12 @@ addSubscriber(UA_Server *server) {
         folderBrowseName = UA_QUALIFIEDNAME(1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode(
+    retval = UA_Server_addObjectNode(
         server, UA_NODEID_NULL, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
         UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), folderBrowseName,
         UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
 
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);    
     UA_FieldTargetVariable *targetVars = (UA_FieldTargetVariable *)UA_calloc(
         readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
     /* Variable to subscribe data */
diff --git a/tests/pubsub/check_pubsub_sks_keystorage.c b/tests/pubsub/check_pubsub_sks_keystorage.c
index 01dc2b90c1c..e4df06c574a 100644
--- a/tests/pubsub/check_pubsub_sks_keystorage.c
+++ b/tests/pubsub/check_pubsub_sks_keystorage.c
@@ -182,10 +182,11 @@ hexstr_to_char(const char *hexstr) {
 static void
 setup(void) {
     server = UA_Server_new();
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     SecurityGroupId = UA_STRING("TestSecurityGroup");
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
 
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -202,7 +203,8 @@ setup(void) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index 91182300ea9..6cce2016883 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -42,6 +42,7 @@ THREAD_CALLBACK(serverloop) {
 
 static void
 addSecurityGroup(void) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_NodeId securityGroupParent =
         UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SECURITYGROUPS);
     UA_NodeId outNodeId;
@@ -55,12 +56,13 @@ addSecurityGroup(void) {
 
     maxKeyCount = config.maxPastKeyCount + 1 + config.maxFutureKeyCount;
 
-    UA_Server_addSecurityGroup(sksServer, securityGroupParent, &config, &outNodeId);
+    retVal |= UA_Server_addSecurityGroup(sksServer, securityGroupParent, &config, &outNodeId);
     UA_String_copy(&config.securityGroupName, &securityGroupId);
 
     allowedUsername = UA_STRING("user1");
-    UA_Server_setNodeContext(sksServer, outNodeId, &allowedUsername);
-    UA_NodeId_copy(&outNodeId, &sgNodeId);
+    retVal |= UA_Server_setNodeContext(sksServer, outNodeId, &allowedUsername);
+    retVal |= UA_NodeId_copy(&outNodeId, &sgNodeId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static UA_Boolean
@@ -97,7 +99,7 @@ setup(void) {
     UA_ByteString *issuerList = NULL;
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
-
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     sksServer = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(sksServer);
     UA_ServerConfig_setDefaultWithSecurityPolicies(
@@ -109,7 +111,7 @@ setup(void) {
     config->applicationDescription.applicationUri =
         UA_STRING_ALLOC("urn:unconfigured:application");
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -126,14 +128,15 @@ setup(void) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(sksServer, &connectionConfig, &connection);
+    retVal |= UA_Server_addPubSubConnection(sksServer, &connectionConfig, &connection);
 
     /*User Access Control*/
     config->accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
 
     addSecurityGroup();
 
-    UA_Server_run_startup(sksServer);
+    retVal |= UA_Server_run_startup(sksServer);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     THREAD_CREATE(server_thread, serverloop);
 }
 
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index 62de0cc3e5b..77f76a59508 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -202,6 +202,8 @@ setup(void) {
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
@@ -214,7 +216,7 @@ setup(void) {
     config->applicationDescription.applicationUri =
         UA_STRING_ALLOC("urn:unconfigured:application");
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -233,14 +235,15 @@ setup(void) {
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection);
 
     securityGroupId = UA_STRING("TestSecurityGroup");
 
     addTestReaderGroup(securityGroupId);
     addTestWriterGroup(securityGroupId);
 
-    UA_Server_run_startup(server);
+    retVal |= UA_Server_run_startup(server);
+    ck_assert_uint_eq(retVal, UA_STATUSCODE_GOOD);
     THREAD_CREATE(server_thread, serverloop);
 }
 
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 9c9aeaeb71a..e0883ce0c83 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -93,10 +93,11 @@ static void setup(void) {
     /*Add setup by creating new server with valid configuration */
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
     config = UA_Server_getConfig(server);
-    UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
-    UA_Server_run_startup(server);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retval |= UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
+    retval |= UA_Server_run_startup(server);
+    retval |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     addVariables();
 
@@ -112,7 +113,8 @@ static void setup(void) {
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = PUBLISHER_ID;
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionId);
+    retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionId);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 }
 
 /* teardown() is to delete the environment set for test cases */
@@ -612,7 +614,7 @@ START_TEST(SinglePublishSubscribeDateTime) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         /* Data Set Field */
         UA_NodeId dataSetFieldId;
@@ -621,9 +623,10 @@ START_TEST(SinglePublishSubscribeDateTime) {
         dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
         dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
         dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
         dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField(server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldId);
+        retVal = UA_Server_addDataSetField(server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldId).result;
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -700,7 +703,7 @@ START_TEST(SinglePublishSubscribeDateTimeRaw) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         /* Data Set Field */
         UA_NodeId dataSetFieldId;
@@ -709,9 +712,10 @@ START_TEST(SinglePublishSubscribeDateTimeRaw) {
         dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
         dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
         dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
         dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField(server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldId);
+        retVal = UA_Server_addDataSetField(server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldId).result;
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -791,7 +795,7 @@ START_TEST(SinglePublishSubscribeInt32) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* Create variable to publish integer data */
@@ -819,8 +823,8 @@ START_TEST(SinglePublishSubscribeInt32) {
         dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
         dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
-
+        retVal = UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent).result;
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -932,7 +936,7 @@ START_TEST(SinglePublishSubscribeInt32StatusCode) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* Create variable to publish integer data */
@@ -960,8 +964,8 @@ START_TEST(SinglePublishSubscribeInt32StatusCode) {
         dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
         dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
-
+        UA_DataSetFieldResult retval = UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+        ck_assert_int_eq(retval.result, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -1099,7 +1103,7 @@ START_TEST(SinglePublishSubscribeInt64) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* Create variable to publish integer data */
@@ -1127,8 +1131,8 @@ START_TEST(SinglePublishSubscribeInt64) {
         dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
         dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
-
+        UA_DataSetFieldResult retval = UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+        ck_assert_int_eq(retval.result, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -1244,7 +1248,7 @@ START_TEST(SinglePublishSubscribeBool) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* Create variable to publish boolean data */
@@ -1272,8 +1276,8 @@ START_TEST(SinglePublishSubscribeBool) {
         dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
         dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
-
+        UA_DataSetFieldResult retval = UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+        ck_assert_int_eq(retval.result, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -1389,7 +1393,7 @@ START_TEST(SinglePublishSubscribewithValidIdentifiers) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* Create variable to publish integer data */
@@ -1418,9 +1422,9 @@ START_TEST(SinglePublishSubscribewithValidIdentifiers) {
         dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
         dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField(server, publishedDataSetId,
+        UA_DataSetFieldResult retval = UA_Server_addDataSetField(server, publishedDataSetId,
                                   &dataSetFieldConfig, &dataSetFieldIdent);
-
+        ck_assert_int_eq(retval.result, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -1619,7 +1623,7 @@ START_TEST(SinglePublishSubscribeWithoutPayloadHeader) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* Create variable to publish integer data */
@@ -1647,8 +1651,8 @@ START_TEST(SinglePublishSubscribeWithoutPayloadHeader) {
         dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
         dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
-
+        UA_DataSetFieldResult retval = UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+        ck_assert_int_eq(retval.result, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -1759,7 +1763,7 @@ START_TEST(MultiPublishSubscribeInt32) {
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     pdsConfig.name = UA_STRING("PublishedDataSet Test");
-    UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+    retVal =UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     /* Create variable to publish integer data */
@@ -1787,8 +1791,8 @@ START_TEST(MultiPublishSubscribeInt32) {
     dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
     dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
     dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
-
+    UA_DataSetFieldResult retval = UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+    ck_assert_int_eq(retval.result, UA_STATUSCODE_GOOD);
     /* Writer group */
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -1932,6 +1936,7 @@ START_TEST(MultiPublishSubscribeInt32) {
 
 static void
 addTargetVariable(void) {
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_VariableAttributes attr = UA_VariableAttributes_default;
     UA_DateTime dateTime = 0;
     UA_Variant_setScalar(&attr.value, &dateTime, &UA_TYPES[UA_TYPES_DATETIME]);
@@ -1945,9 +1950,10 @@ addTargetVariable(void) {
     UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "subscribedTargetVar");
     UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
     UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
-    UA_Server_addVariableNode(
+    retVal = UA_Server_addVariableNode(
         server, myIntegerNodeId, parentNodeId, parentReferenceNodeId, myIntegerName,
         UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, NULL);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 START_TEST(ValidStandaloneDataSetConfigurationAddAndRemove) {
@@ -2084,7 +2090,7 @@ START_TEST(SinglePublishOnDemand) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* Create variable to publish integer data */
@@ -2112,8 +2118,8 @@ START_TEST(SinglePublishOnDemand) {
         dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
         dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
-
+        retVal = UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent).result;
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
diff --git a/tests/pubsub/check_pubsub_subscribe_config_freeze.c b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
index e19e599daea..c438dd9cd16 100644
--- a/tests/pubsub/check_pubsub_subscribe_config_freeze.c
+++ b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
@@ -20,10 +20,12 @@ UA_Server *server = NULL;
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-    UA_Server_run_startup(server);
+    retVal |= UA_ServerConfig_setDefault(config);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
+    retVal |= UA_Server_run_startup(server);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void teardown(void) {
@@ -35,18 +37,19 @@ START_TEST(CreateAndLockConfiguration) {
     //create config
     UA_NodeId connection1, readerGroup1, dataSetReader1;
     UA_PubSubConnectionConfig connectionConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     UA_ReaderGroupConfig readerGroupConfig;
     memset(&readerGroupConfig, 0, sizeof(readerGroupConfig));
     readerGroupConfig.name = UA_STRING("ReaderGroup 1");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_NONE;
-    UA_Server_addReaderGroup(server, connection1, &readerGroupConfig, &readerGroup1);
+    retVal |= UA_Server_addReaderGroup(server, connection1, &readerGroupConfig, &readerGroup1);
 
     //get internal RG Pointer
     UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroup1);
@@ -56,7 +59,7 @@ START_TEST(CreateAndLockConfiguration) {
     UA_DataSetReaderConfig dataSetReaderConfig;
     memset(&dataSetReaderConfig, 0, sizeof(dataSetReaderConfig));
     dataSetReaderConfig.name = UA_STRING("DataSetReader 1");
-    UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader1);
+    retVal |= UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader1);
     UA_DataSetReader *dataSetReader = UA_ReaderGroup_findDSRbyId(server, dataSetReader1);
     ck_assert(dataSetReader != NULL);
     ck_assert(dataSetReader->configurationFrozen == UA_FALSE);
@@ -67,49 +70,51 @@ START_TEST(CreateAndLockConfiguration) {
     ck_assert(pubSubConnection->configurationFreezeCounter == 0);
 
     //Lock the reader group and the child pubsub entities
-    UA_Server_freezeReaderGroupConfiguration(server, readerGroup1);
+    retVal |= UA_Server_freezeReaderGroupConfiguration(server, readerGroup1);
 
     ck_assert(readerGroup->configurationFrozen == UA_TRUE);
     ck_assert(dataSetReader->configurationFrozen == UA_TRUE);
     ck_assert(pubSubConnection->configurationFreezeCounter > 0);
 
     //set state to disabled and implicit unlock the configuration
-    UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup1);
+    retVal |= UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup1);
 
     ck_assert(readerGroup->configurationFrozen == UA_FALSE);
     ck_assert(dataSetReader->configurationFrozen == UA_FALSE);
     ck_assert(pubSubConnection->configurationFreezeCounter == 0);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(CreateAndReleaseMultipleLocks) {
     //create config
     UA_NodeId connection1, readerGroup1, readerGroup2, dataSetReader1, dataSetReader2, dataSetReader3;
     UA_PubSubConnectionConfig connectionConfig;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     //Add two reader groups
     UA_ReaderGroupConfig readerGroupConfig;
     memset(&readerGroupConfig, 0, sizeof(readerGroupConfig));
     readerGroupConfig.name = UA_STRING("ReaderGroup 1");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_NONE;
-    UA_Server_addReaderGroup(server, connection1, &readerGroupConfig, &readerGroup1);
+    retVal |= UA_Server_addReaderGroup(server, connection1, &readerGroupConfig, &readerGroup1);
     readerGroupConfig.name = UA_STRING("ReaderGroup 2");
-    UA_Server_addReaderGroup(server, connection1, &readerGroupConfig, &readerGroup2);
+    retVal |= UA_Server_addReaderGroup(server, connection1, &readerGroupConfig, &readerGroup2);
 
     UA_DataSetReaderConfig dataSetReaderConfig;
     memset(&dataSetReaderConfig, 0, sizeof(dataSetReaderConfig));
     dataSetReaderConfig.name = UA_STRING("DataSetReader 1");
-    UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader1);
+    retVal |= UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader1);
     dataSetReaderConfig.name = UA_STRING("DataSetReader 2");
-    UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader2);
+    retVal |= UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader2);
     dataSetReaderConfig.name = UA_STRING("DataSetReader 3");
-    UA_Server_addDataSetReader(server, readerGroup2, &dataSetReaderConfig, &dataSetReader3);
+    retVal |= UA_Server_addDataSetReader(server, readerGroup2, &dataSetReaderConfig, &dataSetReader3);
 
     UA_ReaderGroup *readerGroup_1 = UA_ReaderGroup_findRGbyId(server, readerGroup1);
     UA_ReaderGroup *readerGroup_2 = UA_ReaderGroup_findRGbyId(server, readerGroup2);
@@ -122,30 +127,31 @@ START_TEST(CreateAndReleaseMultipleLocks) {
     ck_assert(readerGroup_2->configurationFrozen == UA_FALSE);
     ck_assert(pubSubConnection->configurationFreezeCounter == 0);
 
-    UA_Server_freezeReaderGroupConfiguration(server, readerGroup1);
-    UA_Server_freezeReaderGroupConfiguration(server, readerGroup2);
+    retVal |= UA_Server_freezeReaderGroupConfiguration(server, readerGroup1);
+    retVal |= UA_Server_freezeReaderGroupConfiguration(server, readerGroup2);
 
     ck_assert(readerGroup_1->configurationFrozen == UA_TRUE);
     ck_assert(readerGroup_2->configurationFrozen == UA_TRUE);
     ck_assert(pubSubConnection->configurationFreezeCounter > 0);
 
     //unlock one tree, get sure connection still locked
-    UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup1);
+    retVal |= UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup1);
     ck_assert(readerGroup_1->configurationFrozen == UA_FALSE);
     ck_assert(pubSubConnection->configurationFreezeCounter > 0);
     ck_assert(dataSetReader_1->configurationFrozen == UA_FALSE);
     ck_assert(dataSetReader_2->configurationFrozen == UA_FALSE);
     ck_assert(dataSetReader_3->configurationFrozen == UA_TRUE);
 
-    UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup2);
+    retVal |= UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup2);
     ck_assert(readerGroup_2->configurationFrozen == UA_FALSE);
     ck_assert(pubSubConnection->configurationFreezeCounter == 0);
     ck_assert(dataSetReader_3->configurationFrozen == UA_FALSE);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
 START_TEST(CreateLockAndEditConfiguration) {
     UA_NodeId connection1, readerGroup1, dataSetReader1, dataSetReader2;
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
@@ -153,13 +159,13 @@ START_TEST(CreateLockAndEditConfiguration) {
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
 
     UA_ReaderGroupConfig readerGroupConfig;
     memset(&readerGroupConfig, 0, sizeof(readerGroupConfig));
     readerGroupConfig.name = UA_STRING("ReaderGroup 1");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_NONE;
-    UA_Server_addReaderGroup(server, connection1, &readerGroupConfig, &readerGroup1);
+    retVal |= UA_Server_addReaderGroup(server, connection1, &readerGroupConfig, &readerGroup1);
 
     //get internal RG Pointer
     UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroup1);
@@ -186,7 +192,7 @@ START_TEST(CreateLockAndEditConfiguration) {
     pMetaData->fields[0].builtInType = UA_NS0ID_DATETIME;
     pMetaData->fields[0].name =  UA_STRING ("DateTime");
     pMetaData->fields[0].valueRank = -1; /* scalar */
-    UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader1);
+    retVal |= UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader1);
 
     UA_NodeId folderId;
     UA_String folderName = dataSetReaderConfig.dataSetMetaData.name;
@@ -203,7 +209,7 @@ START_TEST(CreateLockAndEditConfiguration) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal |= UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
@@ -221,7 +227,7 @@ START_TEST(CreateLockAndEditConfiguration) {
         vAttr.dataType = dataSetReaderConfig.dataSetMetaData.fields[i].dataType;
 
         UA_NodeId newNode;
-        retval |= UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, (UA_UInt32)i + 50000),
+        retVal |= UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, (UA_UInt32)i + 50000),
                                             folderId,
                                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                                             UA_QUALIFIEDNAME(1, (char *)dataSetReaderConfig.dataSetMetaData.fields[i].name.data),
@@ -239,30 +245,30 @@ START_TEST(CreateLockAndEditConfiguration) {
     //Lock the reader group and the child pubsub entities
     UA_Server_freezeReaderGroupConfiguration(server, readerGroup1);
     //call not allowed configuration methods
-    retval = UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader2);
-    ck_assert(retval == UA_STATUSCODE_BADCONFIGURATIONERROR);
-    retval = UA_Server_removeDataSetReader(server, dataSetReader1);
-    ck_assert(retval == UA_STATUSCODE_BADCONFIGURATIONERROR);
-    retval = UA_Server_DataSetReader_createTargetVariables(server, dataSetReader1,
+    retVal = UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader2);
+    ck_assert(retVal == UA_STATUSCODE_BADCONFIGURATIONERROR);
+    retVal = UA_Server_removeDataSetReader(server, dataSetReader1);
+    ck_assert(retVal == UA_STATUSCODE_BADCONFIGURATIONERROR);
+    retVal = UA_Server_DataSetReader_createTargetVariables(server, dataSetReader1,
                                                            dataSetReaderConfig.dataSetMetaData.fieldsSize,
                                                            targetVars);
-    ck_assert(retval == UA_STATUSCODE_BADCONFIGURATIONERROR);
+    ck_assert(retVal == UA_STATUSCODE_BADCONFIGURATIONERROR);
 
     //unlock the reader group
     UA_Server_unfreezeReaderGroupConfiguration(server, readerGroup1);
-    retval = UA_Server_DataSetReader_createTargetVariables(server, dataSetReader1,
+    retVal = UA_Server_DataSetReader_createTargetVariables(server, dataSetReader1,
                                                            dataSetReaderConfig.dataSetMetaData.fieldsSize,
                                                            targetVars);
-    ck_assert(retval == UA_STATUSCODE_GOOD);
-    retval = UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader2);
+    ck_assert(retVal == UA_STATUSCODE_GOOD);
+    retVal = UA_Server_addDataSetReader(server, readerGroup1, &dataSetReaderConfig, &dataSetReader2);
     for(size_t i = 0; i < dataSetReaderConfig.dataSetMetaData.fieldsSize; i++)
         UA_FieldTargetDataType_clear(&targetVars[i].targetVariable);
 
     UA_free(targetVars);
     UA_free(dataSetReaderConfig.dataSetMetaData.fields);
-    ck_assert(retval == UA_STATUSCODE_GOOD);
-    retval = UA_Server_removeDataSetReader(server, dataSetReader1);
-    ck_assert(retval == UA_STATUSCODE_GOOD);
+    ck_assert(retVal == UA_STATUSCODE_GOOD);
+    retVal = UA_Server_removeDataSetReader(server, dataSetReader1);
+    ck_assert(retVal == UA_STATUSCODE_GOOD);
     } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_subscribe_encrypted.c b/tests/pubsub/check_pubsub_subscribe_encrypted.c
index afd113a1fdc..4c6f011cac4 100644
--- a/tests/pubsub/check_pubsub_subscribe_encrypted.c
+++ b/tests/pubsub/check_pubsub_subscribe_encrypted.c
@@ -48,10 +48,11 @@ UA_NodeId publishedDataSetTest;
 /* setup() is to create an environment for test cases */
 static void setup(void) {
     /*Add setup by creating new server with valid configuration */
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     server = UA_Server_new();
     ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
-    UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
+    retVal |= UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
 
     /* Instantiate the PubSub SecurityPolicy */
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
@@ -60,8 +61,8 @@ static void setup(void) {
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    UA_Server_run_startup(server);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    retVal |= UA_Server_run_startup(server);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     /* Add connection to the server */
     UA_PubSubConnectionConfig connectionConfig;
@@ -73,7 +74,8 @@ static void setup(void) {
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = PUBLISHER_ID;
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
+    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 /* teardown() is to delete the environment set for test cases */
@@ -83,126 +85,127 @@ static void teardown(void) {
     UA_Server_delete(server);
 }
 
-// START_TEST(SinglePublishSubscribeDateTime) {
-//         /* To check status after running both publisher and subscriber */
-//         UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-//         UA_PublishedDataSetConfig pdsConfig;
-//         UA_NodeId dataSetWriter;
-//         UA_NodeId readerIdentifier;
-//         UA_NodeId writerGroup;
-//         UA_DataSetReaderConfig readerConfig;
-//         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
-//         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-//         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-//         UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetTest);
-//         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-//         /* Data Set Field */
-//         UA_NodeId dataSetFieldId;
-//         UA_DataSetFieldConfig dataSetFieldConfig;
-//         memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-//         dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-//         dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
-//         dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-//         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME);
-//         dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-//         UA_Server_addDataSetField(server, publishedDataSetTest, &dataSetFieldConfig, &dataSetFieldId);
-//         /* Writer group */
-//         UA_WriterGroupConfig writerGroupConfig;
-//         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
-//         writerGroupConfig.name = UA_STRING("WriterGroup Test");
-//         writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
-//         writerGroupConfig.enabled = UA_FALSE;
-//         writerGroupConfig.writerGroupId = WRITER_GROUP_ID;
-//         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-//         retVal |= UA_Server_addWriterGroup(server, connection_test, &writerGroupConfig, &writerGroup);
-//         UA_Server_setWriterGroupOperational(server, writerGroup);
-//         /* DataSetWriter */
-//         UA_DataSetWriterConfig dataSetWriterConfig;
-//         memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
-//         dataSetWriterConfig.name = UA_STRING("DataSetWriter Test");
-//         dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
-//         dataSetWriterConfig.keyFrameCount = 10;
-//         retVal |= UA_Server_addDataSetWriter(server, writerGroup, publishedDataSetTest, &dataSetWriterConfig, &dataSetWriter);
-//         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-//         /* Reader Group */
-//         UA_ReaderGroupConfig readerGroupConfig;
-//         memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
-//         readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
-//         retVal |=  UA_Server_addReaderGroup (server, connection_test, &readerGroupConfig, &readerGroupTest);
-//         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-//         UA_Server_setReaderGroupOperational(server, readerGroupTest);
-//         /* Data Set Reader */
-//         memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
-//         readerConfig.name = UA_STRING ("DataSetReader Test");
-//         readerConfig.dataSetWriterId = DATASET_WRITER_ID;
-//         /* Setting up Meta data configuration in DataSetReader for DateTime DataType */
-//         UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
-//         /* FilltestMetadata function in subscriber implementation */
-//         UA_DataSetMetaDataType_init (pMetaData);
-//         pMetaData->name = UA_STRING ("DataSet Test");
-//         /* Static definition of number of fields size to 1 to create one
-//         targetVariable */
-//         pMetaData->fieldsSize = 1;
-//         pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
-//                              &UA_TYPES[UA_TYPES_FIELDMETADATA]);
-//         /* DateTime DataType */
-//         UA_FieldMetaData_init (&pMetaData->fields[0]);
-//         UA_NodeId_copy (&UA_TYPES[UA_TYPES_DATETIME].typeId,
-//                         &pMetaData->fields[0].dataType);
-//         pMetaData->fields[0].builtInType = UA_NS0ID_DATETIME;
-//         pMetaData->fields[0].valueRank = -1; /* scalar */
-//
-//         /* Add Subscribed Variables */
-//         UA_NodeId folderId;
-//         UA_NodeId newnodeId;
-//         UA_String folderName = readerConfig.dataSetMetaData.name;
-//         UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
-//         UA_QualifiedName folderBrowseName;
-//         if (folderName.length > 0) {
-//             oAttr.displayName.locale = UA_STRING ("en-US");
-//             oAttr.displayName.text = folderName;
-//             folderBrowseName.namespaceIndex = 1;
-//             folderBrowseName.name = folderName;
-//           }
-//         else {
-//             oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
-//             folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
-//         }
-//
-//         UA_Server_addObjectNode (server, UA_NODEID_NULL,
-//                                  UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
-//                                  UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
-//                                  folderBrowseName, UA_NODEID_NUMERIC (0,
-//                                  UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
-//
-//         /* Variable to subscribe data */
-//         UA_VariableAttributes vAttr = UA_VariableAttributes_default;
-//         vAttr.description = UA_LOCALIZEDTEXT ("en-US", "DateTime");
-//         vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "DateTime");
-//         vAttr.dataType    = UA_TYPES[UA_TYPES_DATETIME].typeId;
-//         retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
-//                                            folderId,
-//                                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "DateTime"),
-//                                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
-//         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-//
-//         readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize = 1;
-//         readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables     = (UA_FieldTargetVariable *)
-//             UA_calloc(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize, sizeof(UA_FieldTargetVariable));
-//
-//         /* For creating Targetvariable */
-//         UA_FieldTargetDataType_init(&readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable);
-//         readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
-//         readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable.targetNodeId = newnodeId;
-//         retVal |= UA_Server_addDataSetReader(server, readerGroupTest, &readerConfig,
-//                                              &readerIdentifier);
-//         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-//         UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
-//         /* run server - publisher and subscriber */
-//         UA_Server_run_iterate(server,true);
-//         UA_Server_run_iterate(server,true);
-//         UA_free(pMetaData->fields);
-// }END_TEST
+START_TEST(SinglePublishSubscribeDateTime) {
+        /* To check status after running both publisher and subscriber */
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+        UA_PublishedDataSetConfig pdsConfig;
+        UA_NodeId dataSetWriter;
+        UA_NodeId readerIdentifier;
+        UA_NodeId writerGroup;
+        UA_DataSetReaderConfig readerConfig;
+        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+        pdsConfig.name = UA_STRING("PublishedDataSet Test");
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetTest).addResult;
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        /* Data Set Field */
+        UA_NodeId dataSetFieldId;
+        UA_DataSetFieldConfig dataSetFieldConfig;
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
+        dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+        dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
+        UA_DataSetFieldResult retval = UA_Server_addDataSetField(server, publishedDataSetTest, &dataSetFieldConfig, &dataSetFieldId);
+        ck_assert_int_eq(retval.result, UA_STATUSCODE_GOOD);
+        /* Writer group */
+        UA_WriterGroupConfig writerGroupConfig;
+        memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+        writerGroupConfig.name = UA_STRING("WriterGroup Test");
+        writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
+        writerGroupConfig.enabled = UA_FALSE;
+        writerGroupConfig.writerGroupId = WRITER_GROUP_ID;
+        writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+        retVal |= UA_Server_addWriterGroup(server, connection_test, &writerGroupConfig, &writerGroup);
+        UA_Server_setWriterGroupOperational(server, writerGroup);
+        /* DataSetWriter */
+        UA_DataSetWriterConfig dataSetWriterConfig;
+        memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+        dataSetWriterConfig.name = UA_STRING("DataSetWriter Test");
+        dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
+        dataSetWriterConfig.keyFrameCount = 10;
+        retVal |= UA_Server_addDataSetWriter(server, writerGroup, publishedDataSetTest, &dataSetWriterConfig, &dataSetWriter);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        /* Reader Group */
+        UA_ReaderGroupConfig readerGroupConfig;
+        memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+        readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+        retVal |=  UA_Server_addReaderGroup (server, connection_test, &readerGroupConfig, &readerGroupTest);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_Server_setReaderGroupOperational(server, readerGroupTest);
+        /* Data Set Reader */
+        memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+        readerConfig.name = UA_STRING ("DataSetReader Test");
+        readerConfig.dataSetWriterId = DATASET_WRITER_ID;
+        /* Setting up Meta data configuration in DataSetReader for DateTime DataType */
+        UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+        /* FilltestMetadata function in subscriber implementation */
+        UA_DataSetMetaDataType_init (pMetaData);
+        pMetaData->name = UA_STRING ("DataSet Test");
+        /* Static definition of number of fields size to 1 to create one
+        targetVariable */
+        pMetaData->fieldsSize = 1;
+        pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
+                             &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+        /* DateTime DataType */
+        UA_FieldMetaData_init (&pMetaData->fields[0]);
+        UA_NodeId_copy (&UA_TYPES[UA_TYPES_DATETIME].typeId,
+                        &pMetaData->fields[0].dataType);
+        pMetaData->fields[0].builtInType = UA_NS0ID_DATETIME;
+        pMetaData->fields[0].valueRank = -1; /* scalar */
+
+        /* Add Subscribed Variables */
+        UA_NodeId folderId;
+        UA_NodeId newnodeId;
+        UA_String folderName = readerConfig.dataSetMetaData.name;
+        UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
+        UA_QualifiedName folderBrowseName;
+        if (folderName.length > 0) {
+            oAttr.displayName.locale = UA_STRING ("en-US");
+            oAttr.displayName.text = folderName;
+            folderBrowseName.namespaceIndex = 1;
+            folderBrowseName.name = folderName;
+          }
+        else {
+            oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
+            folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
+        }
+
+        retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
+                                 UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
+                                 UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
+                                 folderBrowseName, UA_NODEID_NUMERIC (0,
+                                 UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        /* Variable to subscribe data */
+        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+        vAttr.description = UA_LOCALIZEDTEXT ("en-US", "DateTime");
+        vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "DateTime");
+        vAttr.dataType    = UA_TYPES[UA_TYPES_DATETIME].typeId;
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
+                                           folderId,
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "DateTime"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize = 1;
+        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables     = (UA_FieldTargetVariable *)
+            UA_calloc(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize, sizeof(UA_FieldTargetVariable));
+
+        /* For creating Targetvariable */
+        UA_FieldTargetDataType_init(&readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable);
+        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[0].targetVariable.targetNodeId = newnodeId;
+        retVal |= UA_Server_addDataSetReader(server, readerGroupTest, &readerConfig,
+                                             &readerIdentifier);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
+        /* run server - publisher and subscriber */
+        UA_Server_run_iterate(server,true);
+        UA_Server_run_iterate(server,true);
+        UA_free(pMetaData->fields);
+}END_TEST
 
 
 START_TEST(SinglePublishSubscribeInt32) {
@@ -224,7 +227,7 @@ START_TEST(SinglePublishSubscribeInt32) {
         memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
         pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
         pdsConfig.name = UA_STRING("PublishedDataSet Test");
-        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetTest);
+        retVal = UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetTest).addResult;
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
         /* Create variable to publish integer data */
@@ -252,8 +255,8 @@ START_TEST(SinglePublishSubscribeInt32) {
         dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
         dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
         dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField (server, publishedDataSetTest, &dataSetFieldConfig, &dataSetFieldIdent);
-
+        retVal = UA_Server_addDataSetField (server, publishedDataSetTest, &dataSetFieldConfig, &dataSetFieldIdent).result;
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         /* Writer group */
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -409,7 +412,7 @@ int main(void) {
     /*Test case to run both publisher and subscriber */
     TCase *tc_pubsub_publish_subscribe = tcase_create("Publisher publishing and Subscriber subscribing");
     tcase_add_checked_fixture(tc_pubsub_publish_subscribe, setup, teardown);
-    // tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeDateTime);
+    tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeDateTime);
     tcase_add_test(tc_pubsub_publish_subscribe, SinglePublishSubscribeInt32);
 
     Suite *suite = suite_create("PubSub readerGroups/reader/Fields handling and publishing");
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 5ad3e37017a..61dbede8be8 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -254,11 +254,12 @@ START_TEST(SubscribeSingleFieldWithFixedOffsets) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     /* Variable to subscribe data */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
@@ -419,11 +420,12 @@ START_TEST(SetupInvalidPubSubConfigReader) {
             folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
         }
 
-        UA_Server_addObjectNode (server, UA_NODEID_NULL,
+        retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                                  UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                                  UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                                  folderBrowseName, UA_NODEID_NUMERIC (0,
                                                                       UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         /* Variable to subscribe data */
         UA_VariableAttributes vAttr = UA_VariableAttributes_default;
         vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed DateTime");
@@ -504,10 +506,10 @@ START_TEST(SetupInvalidPubSubConfig) {
     memset(&variant, 0, sizeof(UA_Variant));
     UA_Variant_setScalar(&variant, intValue, &UA_TYPES[UA_TYPES_UINT32]);
     attributes.value = variant;
-    UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000),
+    ck_assert_int_eq(UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000),
                               UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
                               UA_QUALIFIEDNAME(1, "variable"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                              attributes, NULL, NULL);
+                              attributes, NULL, NULL), UA_STATUSCODE_GOOD);
     dsfConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 1000);
     dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
     /* Not using static value source */
@@ -568,8 +570,8 @@ static void PublishSubscribeWithWriteCallback_Helper(
     dataSetFieldConfig.field.variable.publishParameters.publishedVariable  = publisherNode;
     dataSetFieldConfig.field.variable.publishParameters.attributeId        = UA_ATTRIBUTEID_VALUE;
     dataSetFieldConfig.field.variable.rtValueSource.rtInformationModelNode = UA_TRUE;
-    UA_Server_addDataSetField (server, publishedDataSetIdent, &dataSetFieldConfig, &dataSetFieldIdent);
-
+    retVal = UA_Server_addDataSetField (server, publishedDataSetIdent, &dataSetFieldConfig, &dataSetFieldIdent).result;
+    ck_assert(retVal == UA_STATUSCODE_GOOD);
     /* Writer group */
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -763,11 +765,12 @@ START_TEST(PublishSubscribeWithWriteCallback) {
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
 
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
+    retVal = UA_Server_addObjectNode (server, UA_NODEID_NULL,
                              UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
                              UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     /* Variable to subscribe data */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
index afd3c305674..c62b933ed5a 100644
--- a/tests/pubsub/check_pubsub_udp_unicast.c
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -62,17 +62,19 @@ static void
 setupPubSubServer(UA_Server **server, UA_ServerConfig **config, UA_UInt16 portNumber,
                   UA_EventLoop *el) {
     UA_ServerConfig stack_config;
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&stack_config, 0, sizeof(UA_ServerConfig));
     if(el) {
         stack_config.eventLoop = el;
         stack_config.externalEventLoop = true;
     }
-    UA_ServerConfig_setMinimal(&stack_config, portNumber, NULL);
+    retVal |= UA_ServerConfig_setMinimal(&stack_config, portNumber, NULL);
     *server = UA_Server_newWithConfig(&stack_config);
     *config = UA_Server_getConfig(*server);
 
-    UA_Server_run_startup(*server);
-    UA_ServerConfig_addPubSubTransportLayer(*config, UA_PubSubTransportLayerUDP());
+    retVal |= UA_Server_run_startup(*server);
+    retVal |= UA_ServerConfig_addPubSubTransportLayer(*config, UA_PubSubTransportLayerUDP());
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
 static void addUDPConnection(UA_Server *server, const char *host, UA_Int16 portNumber, UA_NodeId *outConnectionId) {
@@ -93,7 +95,7 @@ static void addUDPConnection(UA_Server *server, const char *host, UA_Int16 portN
     /* also set the same publisher Id for the subscriber connection as it does not matter */
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = PUBLISHER_ID;
-    UA_Server_addPubSubConnection(server, &connectionConfig, outConnectionId);
+    ck_assert_int_eq(UA_Server_addPubSubConnection(server, &connectionConfig, outConnectionId), UA_STATUSCODE_GOOD);
 }
 
 static void setupPublishedDataInt32(UA_Server *server, UA_UInt32 publishVariableNodeId, UA_NodeId *outPublishedDataSetId) {
@@ -129,7 +131,7 @@ static void setupPublishedDataInt32(UA_Server *server, UA_UInt32 publishVariable
     dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
     dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
     dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, *outPublishedDataSetId, &dataSetFieldConfig, &dataSetFieldId);
+    ck_assert_int_eq(UA_Server_addDataSetField(server, *outPublishedDataSetId, &dataSetFieldConfig, &dataSetFieldId).result, UA_STATUSCODE_GOOD);
 }
 
 static void setupWrittenData(UA_Server *server, UA_NodeId connectionId, UA_NodeId publishedDataSetId, const char *dstHost, UA_UInt16 dstPort) {

From 6a76c3490fbcf142a277ed68e035b28a45c0e979 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Thu, 6 Apr 2023 10:54:30 +0200
Subject: [PATCH 0877/1963] feat(core): Add find custom types function to
 public API (#5725)

---
 include/open62541/types.h | 8 ++++++++
 src/ua_util_internal.h    | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 02c2a66cc7c..c8921552ab6 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -11,6 +11,7 @@
  *    Copyright 2015-2016 (c) Oleksiy Vasylyev
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  *    Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
+ *    Copyright 2023 (c) Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
 #ifndef UA_TYPES_H_
@@ -1139,6 +1140,13 @@ UA_DataType_isNumeric(const UA_DataType *type);
 const UA_DataType UA_EXPORT *
 UA_findDataType(const UA_NodeId *typeId);
 
+/*
+ * Add custom data types to the search scope of UA_findDataType. */
+
+const UA_DataType UA_EXPORT *
+UA_findDataTypeWithCustom(const UA_NodeId *typeId,
+                          const UA_DataTypeArray *customTypes);
+
 /** The following functions are used for generic handling of data types. */
 
 /* Allocates and initializes a variable of type dataType
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 356ec080ba5..5a62259937a 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -171,10 +171,6 @@ isTrue(uint8_t expr) {
  * Utility Functions
  * ----------------- */
 
-const UA_DataType *
-UA_findDataTypeWithCustom(const UA_NodeId *typeId,
-                          const UA_DataTypeArray *customTypes);
-
 void
 UA_cleanupDataTypeWithCustom(const UA_DataTypeArray *customTypes);
 

From 543e3b27319607eda96233dc8a280114f6391a28 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Thu, 6 Apr 2023 13:22:07 +0200
Subject: [PATCH 0878/1963] fix(plugin): Forward rng when calling
 mbedtls_pk_decrypt (#5726)

The issue was reported in #5631.
---
 .../mbedtls/ua_securitypolicy_basic128rsa15.c  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
index 343bfea5137..99dfc107528 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
@@ -170,7 +170,8 @@ asym_decrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
     if(cc == NULL || data == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->policyContext->localPrivateKey);
+    Basic128Rsa15_PolicyContext *pc = cc->policyContext;
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(pc->localPrivateKey);
     mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_NONE);
 #if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
     size_t keylen = rsaContext->len;
@@ -178,7 +179,7 @@ asym_decrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
     size_t keylen = mbedtls_rsa_get_len(rsaContext);
 #endif
     if(data->length % keylen != 0)
-            return UA_STATUSCODE_BADINTERNALERROR;
+        return UA_STATUSCODE_BADINTERNALERROR;
 
     size_t inOffset = 0;
     size_t outOffset = 0;
@@ -186,16 +187,11 @@ asym_decrypt_sp_basic128rsa15(Basic128Rsa15_ChannelContext *cc,
     unsigned char buf[512];
 
     while(inOffset < data->length) {
-#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
-        int mbedErr = mbedtls_pk_decrypt(&cc->policyContext->localPrivateKey,
-                                         data->data + inOffset, rsaContext->len,
-                                         buf, &outLength, 512, NULL, NULL);
-#else
-        int mbedErr = mbedtls_pk_decrypt(&cc->policyContext->localPrivateKey,
+        int mbedErr = mbedtls_pk_decrypt(&pc->localPrivateKey,
                                          data->data + inOffset, keylen,
-                                         buf, &outLength, 512, NULL, NULL);
-#endif
-
+                                         buf, &outLength, 512,
+                                         mbedtls_ctr_drbg_random,
+                                         &pc->drbgContext);
         if(mbedErr)
             return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 

From 705f34d9cd7af7d8b01483b0c4045091b170801d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 6 Apr 2023 21:17:37 +0200
Subject: [PATCH 0879/1963] refactor(build): Remove thread-safety warning for
 PubSub

---
 CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8952b33e14f..859fadd8bd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -437,10 +437,6 @@ if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
     endif()
 endif()
 
-if(UA_ENABLE_PUBSUB AND UA_MULTITHREADING GREATER_EQUAL 100)
-    MESSAGE(WARNING "PubSub is not thread-safe for the 1.3 releases. Switch to a more current release for this feature.")
-endif()
-
 if(UA_ENABLE_PUBSUB_FILE_CONFIG)
     if(NOT UA_ENABLE_PUBSUB)
         message(FATAL_ERROR "For UA_ENABLE_PUBSUB_FILE_CONFIG PubSub needs to be enabled")

From 776ac790fa2e6ba17848db3b897970ff5a56fc73 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 10 Apr 2023 11:29:45 +0200
Subject: [PATCH 0880/1963] refactor(server): Simplify reverse connect and
 start/stop logic

---
 src/server/ua_server.c                        | 383 +++++++++---------
 src/server/ua_server_binary.c                 | 202 +++++----
 src/server/ua_server_internal.h               |  14 +-
 src/server/ua_server_ns0.c                    |  18 +-
 tests/pubsub/check_pubsub_decryption.c        |   3 +-
 tests/pubsub/check_pubsub_informationmodel.c  |   3 +-
 .../check_pubsub_informationmodel_methods.c   |   4 +-
 tests/pubsub/check_pubsub_mqtt.c              |   3 +-
 tests/pubsub/check_pubsub_publish_json.c      |   5 +-
 tests/pubsub/check_pubsub_sks_push.c          |   1 -
 .../check_pubsub_subscribe_config_freeze.c    |   3 +-
 tests/server/check_discovery.c                |   2 +-
 12 files changed, 320 insertions(+), 321 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index a1207d5ab5a..20763e11d52 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -593,7 +593,9 @@ UA_Server_getStatistics(UA_Server *server) {
 }
 
 static UA_StatusCode
-UA_Server_createServerConnection(UA_Server *server, const UA_String *serverUrl) {
+createServerConnection(UA_Server *server, const UA_String *serverUrl) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_ServerConfig *config = &server->config;
 
     /* Extract the protocol, hostname and port from the url */
@@ -645,60 +647,60 @@ UA_Server_createServerConnection(UA_Server *server, const UA_String *serverUrl)
     return UA_STATUSCODE_BADINTERNALERROR;
 }
 
-UA_StatusCode attemptReverseConnect(UA_Server *server, reverse_connect_context *context) {
-    UA_ServerConfig *config = UA_Server_getConfig(server);
+UA_StatusCode
+attemptReverseConnect(UA_Server *server, reverse_connect_context *context) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    UA_ServerConfig *config = &server->config;
+    UA_EventLoop *el = config->eventLoop;
 
-    UA_StatusCode res = UA_STATUSCODE_BADINTERNALERROR;
+    /* Find a TCP ConnectionManager */
     UA_String tcpString = UA_STRING_STATIC("tcp");
-    for(UA_EventSource *es = config->eventLoop->eventSources; es != NULL; es = es->next) {
+    for(UA_EventSource *es = el->eventSources; es != NULL; es = es->next) {
         /* Is this a usable connection manager? */
         if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
             continue;
+
         UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
         if(!UA_String_equal(&tcpString, &cm->protocol))
             continue;
 
-        if (es->state != UA_EVENTSOURCESTATE_STARTED)
-            return UA_STATUSCODE_GOODCOMPLETESASYNCHRONOUSLY;
+        if(es->state != UA_EVENTSOURCESTATE_STARTED)
+            continue;
 
         /* Set up the parameters */
-        UA_KeyValueMap params;
-        params.mapSize = 0;
-        params.map = NULL;
-        UA_KeyValueMap_setScalar(&params, UA_QUALIFIEDNAME(0, "address"),
-                                 &context->hostname, &UA_TYPES[UA_TYPES_STRING]);
-        UA_KeyValueMap_setScalar(&params, UA_QUALIFIEDNAME(0, "port"),
-                                 &context->port, &UA_TYPES[UA_TYPES_UINT16]);
-
-        /* Open the server connection */
-        res = cm->openConnection(cm, &params, server, context,
-                                 UA_Server_reverseConnectCallback);
-
-        UA_KeyValueMap_clear(&params);
-
-        if (res != UA_STATUSCODE_GOOD) {
+        UA_KeyValuePair params[2];
+        params[0].key = UA_QUALIFIEDNAME(0, "address");
+        UA_Variant_setScalar(&params[0].value, &context->hostname,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        params[1].key = UA_QUALIFIEDNAME(0, "port");
+        UA_Variant_setScalar(&params[1].value, &context->port,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+        UA_KeyValueMap kvm = {2, params};
+
+        /* Open the connection */
+        UA_StatusCode res = cm->openConnection(cm, &kvm, server, context,
+                                               UA_Server_reverseConnectCallback);
+        if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
                            "Failed to create connection for reverse connect: %s\n",
                            UA_StatusCode_name(res));
-            context->currentConnection.connectionId = 0;
-        }
-
-        if (context->state != UA_SECURECHANNELSTATE_CONNECTING) {
-            context->state = UA_SECURECHANNELSTATE_CONNECTING;
-            if (context->stateCallback)
-                context->stateCallback(server, context->handle, context->state,
-                                       context->callbackContext);
         }
+        return res;
     }
 
-    return res;
+    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                   "No ConnectionManager found for reverse connect");
+    return UA_STATUSCODE_BADINTERNALERROR;
 }
 
-UA_StatusCode UA_Server_addReverseConnect(UA_Server *server, UA_String url,
-                                          UA_Server_ReverseConnectStateCallback stateCallback,
-                                          void *callbackContext, UA_UInt64 *handle) {
+UA_StatusCode
+UA_Server_addReverseConnect(UA_Server *server, UA_String url,
+                            UA_Server_ReverseConnectStateCallback stateCallback,
+                            void *callbackContext, UA_UInt64 *handle) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
 
+    /* Parse the reverse connect URL */
     UA_String hostname = UA_STRING_NULL;
     UA_UInt16 port = 0;
     UA_StatusCode res = UA_parseEndpointUrl(&url, &hostname, &port, NULL);
@@ -709,73 +711,68 @@ UA_StatusCode UA_Server_addReverseConnect(UA_Server *server, UA_String url,
         return res;
     }
 
-    if (SLIST_EMPTY(&server->reverseConnects))
-        setReverseConnectRetryCallback(server, true);
-
-    reverse_connect_context *newContext = (reverse_connect_context *)calloc(1, sizeof(reverse_connect_context));
-    if (newContext == NULL)
+    /* Set up the reverse connection */
+    reverse_connect_context *newContext =
+        (reverse_connect_context *)calloc(1, sizeof(reverse_connect_context));
+    if(!newContext)
         return UA_STATUSCODE_BADOUTOFMEMORY;
+
     UA_String_copy(&hostname, &newContext->hostname);
     newContext->port = port;
     newContext->handle = ++server->lastReverseConnectHandle;
     newContext->stateCallback = stateCallback;
     newContext->callbackContext = callbackContext;
-    SLIST_INSERT_HEAD(&server->reverseConnects, newContext, next);
 
-    if (handle)
-        *handle = newContext->handle;
+    UA_LOCK(&server->serviceMutex);
 
-    return attemptReverseConnect(server, newContext);
-}
+    /* Register the retry callback */
+    if(LIST_EMPTY(&server->reverseConnects))
+        setReverseConnectRetryCallback(server, true);
 
-static void freeReverseConnectCallback(void *application, void *context) {
-    reverse_connect_context *reverseConnect = (reverse_connect_context *)context;
+    /* Register the new reverse connection */
+    LIST_INSERT_HEAD(&server->reverseConnects, newContext, next);
 
-    if (reverseConnect) {
-        UA_String_clear(&reverseConnect->hostname);
-        free(reverseConnect);
-    }
+    if(handle)
+        *handle = newContext->handle;
 
-    if (application)
-        free(application);
+    /* Attempt to connect right away */
+    res = attemptReverseConnect(server, newContext);
+
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
-UA_StatusCode UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
-    reverse_connect_context *rev = NULL;
-    reverse_connect_context *temp = NULL;
+UA_StatusCode
+UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
     UA_StatusCode result = UA_STATUSCODE_BADNOTFOUND;
 
-    SLIST_FOREACH_SAFE(rev, &server->reverseConnects, next, temp) {
-        if (rev->handle == handle) {
-            SLIST_REMOVE(&server->reverseConnects, rev, reverse_connect_context, next);
-
-            if (rev->currentConnection.connectionId) {
-                rev->destruction = true;
-                /* Request disconnect and run the event loop for one iteration */
-                if (rev->currentConnection.connectionId) {
-                    UA_DelayedCallback *freeCallback = (UA_DelayedCallback *)calloc(1, sizeof(UA_DelayedCallback));
-                    freeCallback->context = rev;
-                    freeCallback->application = freeCallback;
-                    freeCallback->callback = freeReverseConnectCallback;
-
-                    server->config.eventLoop->addDelayedCallback(server->config.eventLoop, freeCallback);
-
-                    rev->currentConnection.connectionManager->closeConnection(
-                                rev->currentConnection.connectionManager,
-                                rev->currentConnection.connectionId);
-                }
-            } else {
-                setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
-                UA_String_clear(&rev->hostname);
-                free(rev);
-            }
-            result = UA_STATUSCODE_GOOD;
-            break;
+    UA_LOCK(&server->serviceMutex);
+
+    reverse_connect_context *rev, *temp;
+    LIST_FOREACH_SAFE(rev, &server->reverseConnects, next, temp) {
+        if(rev->handle != handle)
+            continue;
+
+        LIST_REMOVE(rev, next);
+
+        /* Connected -> disconnect, otherwise free immediately */
+        if(rev->currentConnection.connectionId) {
+            UA_ConnectionManager *cm = rev->currentConnection.connectionManager;
+            rev->destruction = true;
+            cm->closeConnection(cm, rev->currentConnection.connectionId);
+        } else {
+            setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
+            UA_String_clear(&rev->hostname);
+            free(rev);
         }
+        result = UA_STATUSCODE_GOOD;
+        break;
     }
 
-    if (SLIST_EMPTY(&server->reverseConnects))
-         setReverseConnectRetryCallback(server, false);
+    if(LIST_EMPTY(&server->reverseConnects))
+        setReverseConnectRetryCallback(server, false);
+
+    UA_UNLOCK(&server->serviceMutex);
 
     return result;
 }
@@ -810,129 +807,133 @@ UA_Server_run_startup(UA_Server *server) {
                  "This should only be used for specific fuzzing builds.");
 #endif
 
-    /* Add a regular callback for housekeeping tasks. With a 1s interval. */
-    if(server->houseKeepingCallbackId == 0) {
-        UA_Server_addRepeatedCallback(server, (UA_ServerCallback)serverHouseKeeping,
-                                      NULL, 1000.0, &server->houseKeepingCallbackId);
+    if(server->state != UA_SERVERLIFECYCLE_STOPPED) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                       "The server has already been started");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Start the EventLoop if not already started */
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+    UA_EventLoop *el = config->eventLoop;
+    UA_CHECK_MEM_ERROR(el, return UA_STATUSCODE_BADINTERNALERROR,
+                       &config->logger, UA_LOGCATEGORY_SERVER,
+                       "An EventLoop must be configured");
+
+    if(el->state != UA_EVENTLOOPSTATE_STARTED) {
+        retVal = el->start(el);
+        UA_CHECK_STATUS(retVal, return retVal); /* Errors are logged internally */
+    }
+
+    /* Take the server lock */
+    UA_LOCK(&server->serviceMutex);
+
+    /* Does the ApplicationURI match the local certificates? */
+#ifdef UA_ENABLE_ENCRYPTION
+    retVal = verifyServerApplicationURI(server);
+    UA_CHECK_STATUS(retVal, UA_UNLOCK(&server->serviceMutex); return retVal);
+#endif
+
+    /* Add a regular callback for housekeeping tasks. With a 1s interval. */
+    retVal = addRepeatedCallback(server, serverHouseKeeping,
+                                 NULL, 1000.0, &server->houseKeepingCallbackId);
+    UA_CHECK_STATUS_ERROR(retVal, UA_UNLOCK(&server->serviceMutex); return retVal,
+                          &config->logger, UA_LOGCATEGORY_SERVER,
+                          "Could not create the server housekeeping task");
+
     /* Add a regular callback for network polling tasks. With a 200ms interval.
      *
      * TODO: Move this to the EventLoop model without polling.
      */
     if(server->pollingCallbackId == 0) {
-        UA_Server_addRepeatedCallback(server, (UA_ServerCallback)serverPolling,
-                                      NULL, 200.0, &server->pollingCallbackId);
+        addRepeatedCallback(server, serverPolling, NULL, 200.0,
+                            &server->pollingCallbackId);
     }
 
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    /* Start the EventLoop if not already started */
-    UA_CHECK_MEM_ERROR(config->eventLoop, return UA_STATUSCODE_BADINTERNALERROR,
-                       &config->logger, UA_LOGCATEGORY_SERVER,
-                       "eventloop must be set");
-    if(config->eventLoop->state != UA_EVENTLOOPSTATE_STARTED) {
-        retVal = config->eventLoop->start(config->eventLoop);
-        UA_CHECK_STATUS(retVal, return retVal);
-    }
+    /* Set the server to STARTED.
+     * From here on, only use UA_Server_run_shutdown(server) to stop the server. */
+    server->state = UA_SERVERLIFECYCLE_STARTED;
 
     /* Open server sockets */
     UA_Boolean haveServerSocket = false;
     if(config->serverUrlsSize == 0) {
         /* Empty hostname -> listen on all devices */
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
                        "No Server URL configured. Using \"opc.tcp://:4840\" "
                        "to configure the listen socket.");
         UA_String defaultUrl = UA_STRING("opc.tcp://:4840");
-        retVal = UA_Server_createServerConnection(server, &defaultUrl);
+        retVal = createServerConnection(server, &defaultUrl);
         if(retVal == UA_STATUSCODE_GOOD)
             haveServerSocket = true;
     } else {
         for(size_t i = 0; i < config->serverUrlsSize; i++) {
-            retVal = UA_Server_createServerConnection(server, &config->serverUrls[i]);
+            retVal = createServerConnection(server, &config->serverUrls[i]);
             if(retVal == UA_STATUSCODE_GOOD)
                 haveServerSocket = true;
         }
     }
 
-    UA_LOCK(&server->serviceMutex);
-
-    /* Warn if no socket available */
     if(!haveServerSocket) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
                      "The server has no server socket");
     }
 
-    /* ensure that the uri for ns1 is set up from the app description */
-    setupNs1Uri(server);
-
-    /* write ServerArray with same ApplicationURI value as NamespaceArray */
-    retVal = writeNs0VariableArray(server, UA_NS0ID_SERVER_SERVERARRAY,
-                                   &server->config.applicationDescription.applicationUri,
-                                   1, &UA_TYPES[UA_TYPES_STRING]);
-    UA_CHECK_STATUS(retVal,
-                    UA_UNLOCK(&server->serviceMutex);
-                    return retVal);
-
-    if(server->state > UA_SERVERLIFECYCLE_FRESH) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_GOOD;
+    /* Update the application description to include the server urls for
+     * discovery. Don't add the urls with an empty host (listening on all
+     * interfaces) */
+    for(size_t i = 0; i < config->serverUrlsSize; i++) {
+        UA_String hostname = UA_STRING_NULL;
+        UA_String path = UA_STRING_NULL;
+        UA_UInt16 port = 0;
+        retVal = UA_parseEndpointUrl(&config->serverUrls[i],
+                                     &hostname, &port, &path);
+        if(retVal != UA_STATUSCODE_GOOD || hostname.length == 0)
+            continue;
+        retVal = UA_Array_appendCopy((void**)&config->applicationDescription.discoveryUrls,
+                                     &config->applicationDescription.discoveryUrlsSize,
+                                     &config->serverUrls[i], &UA_TYPES[UA_TYPES_STRING]);
+        (void)retVal;
     }
 
+    /* Ensure that the uri for ns1 is set up from the app description */
+    setupNs1Uri(server);
+
     /* At least one endpoint has to be configured */
-    if(server->config.endpointsSize == 0) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    if(config->endpointsSize == 0) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
                        "There has to be at least one endpoint.");
     }
 
-    /* Does the ApplicationURI match the local certificates? */
-#ifdef UA_ENABLE_ENCRYPTION
-    retVal = verifyServerApplicationURI(server);
-    UA_CHECK_STATUS(retVal, return retVal);
-#endif
+    /* Update Endpoint description */
+    for(size_t i = 0; i < config->endpointsSize; ++i) {
+        UA_ApplicationDescription_clear(&config->endpoints[i].server);
+        UA_ApplicationDescription_copy(&config->applicationDescription,
+                                       &config->endpoints[i].server);
+    }
 
-    UA_UNLOCK(&server->serviceMutex); /* TODO: Make PubSub initialization thread-safe */
+    /* Write ServerArray with same ApplicationUri value as NamespaceArray */
+    UA_Variant var;
+    UA_Variant_init(&var);
+    UA_Variant_setArray(&var, &config->applicationDescription.applicationUri,
+                        1, &UA_TYPES[UA_TYPES_STRING]);
+    UA_NodeId serverArray = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERARRAY);
+    writeValueAttribute(server, serverArray, &var);
 
     /* Sample the start time and set it to the Server object */
     server->startTime = UA_DateTime_now();
-    UA_Variant var;
     UA_Variant_init(&var);
     UA_Variant_setScalar(&var, &server->startTime, &UA_TYPES[UA_TYPES_DATETIME]);
-    UA_Server_writeValue(server,
-                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STARTTIME),
-                         var);
-
-    /* Update the application description to include the server urls for
-     * discovery. Don't add the urls with an empty host (listening on all
-     * interfaces) */
-    for(size_t i = 0; i < server->config.serverUrlsSize; i++) {
-        UA_String hostname = UA_STRING_NULL;
-        UA_String path = UA_STRING_NULL;
-        UA_UInt16 port = 0;
-        retVal = UA_parseEndpointUrl(&server->config.serverUrls[i],
-                                     &hostname, &port, &path);
-        if(retVal != UA_STATUSCODE_GOOD || hostname.length == 0)
-            continue;
-        retVal =
-            UA_Array_appendCopy((void**)&server->config.applicationDescription.discoveryUrls,
-                                &server->config.applicationDescription.discoveryUrlsSize,
-                                &server->config.serverUrls[i], &UA_TYPES[UA_TYPES_STRING]);
-        UA_CHECK_STATUS(retVal, return retVal);
-    }
+    UA_NodeId startTime =
+        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STARTTIME);
+    writeValueAttribute(server, startTime, &var);
 
     /* Start the multicast discovery server */
 #ifdef UA_ENABLE_DISCOVERY
     UA_DiscoveryManager_start(server);
 #endif
 
-    /* Update Endpoint description */
-    for(size_t i = 0; i < server->config.endpointsSize; ++i) {
-        UA_ApplicationDescription_clear(&server->config.endpoints[i].server);
-        UA_ApplicationDescription_copy(&server->config.applicationDescription,
-                                       &server->config.endpoints[i].server);
-    }
-
-    server->state = UA_SERVERLIFECYCLE_FRESH;
-
+    /* Unlock and return */
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -956,28 +957,45 @@ UA_Server_run_shutdown(UA_Server *server) {
     if(server == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
+
+    if(server->state != UA_SERVERLIFECYCLE_STARTED) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "The server is not started, cannot be shut down");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    UA_LOCK(&server->serviceMutex);
+
+    server->state = UA_SERVERLIFECYCLE_STOPPING;
+
     /* Stop the regular housekeeping tasks */
     if(server->houseKeepingCallbackId != 0) {
-        UA_Server_removeCallback(server, server->houseKeepingCallbackId);
+        removeCallback(server, server->houseKeepingCallbackId);
         server->houseKeepingCallbackId = 0;
     }
 
     /* Stop the polling tasks */
     if(server->pollingCallbackId != 0) {
-        UA_Server_removeCallback(server, server->pollingCallbackId);
+        removeCallback(server, server->pollingCallbackId);
         server->pollingCallbackId = 0;
     }
 
-    /* Mark all reverse connects as destroying */
-    reverse_connect_context *rev = NULL;
-    SLIST_FOREACH(rev, &server->reverseConnects, next) {
-        rev->destruction = true;
-        if (rev->currentConnection.connectionId) {
-            rev->currentConnection.connectionManager->closeConnection(rev->currentConnection.connectionManager,
-                                                                      rev->currentConnection.connectionId);
-        }
+    /* Stop the regular retry callback */
+    setReverseConnectRetryCallback(server, false);
 
-        setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
+    /* Close or free all reverse connections */
+    reverse_connect_context *rev, *rev_tmp;
+    LIST_FOREACH_SAFE(rev, &server->reverseConnects, next, rev_tmp) {
+        if(rev->currentConnection.connectionId) {
+            UA_ConnectionManager *cm = rev->currentConnection.connectionManager;
+            rev->destruction = true;
+            cm->closeConnection(cm, rev->currentConnection.connectionId);
+        } else {
+            LIST_REMOVE(rev, next);
+            setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
+            UA_String_clear(&rev->hostname);
+            free(rev);
+        }
     }
 
     /* Stop all SecureChannels */
@@ -986,11 +1004,21 @@ UA_Server_run_shutdown(UA_Server *server) {
     /* Stop all server sockets */
     for(size_t i = 0; i < UA_MAXSERVERCONNECTIONS; i++) {
         UA_ServerConnection *sc = &server->serverConnections[i];
+        UA_ConnectionManager *cm = sc->connectionManager;
         if(sc->connectionId > 0)
-            sc->connectionManager->
-                closeConnection(sc->connectionManager, sc->connectionId);
+            cm->closeConnection(cm, sc->connectionId);
     }
 
+#ifdef UA_ENABLE_DISCOVERY
+    UA_DiscoveryManager_stop(server);
+#endif
+
+    server->state = UA_SERVERLIFECYCLE_STOPPED;
+
+    UA_UNLOCK(&server->serviceMutex);
+
+    /* Run the EventLoop to let the connections fully close. Unlock the server
+     * mutex as the EventLoop may call into the server. */
     UA_EventLoop *el = server->config.eventLoop;
     if(server->config.externalEventLoop) {
         el->run(el, 0); /* Run one iteration of the eventloop with a zero
@@ -1004,19 +1032,6 @@ UA_Server_run_shutdown(UA_Server *server) {
             res = el->run(el, 100); /* Iterate until stopped */
     }
 
-#ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager_stop(server);
-#endif
-
-    setReverseConnectRetryCallback(server, false);
-    reverse_connect_context *next = server->reverseConnects.slh_first;
-    while (next) {
-        reverse_connect_context *current = next;
-        next = current->next.sle_next;
-        UA_String_clear(&current->hostname);
-        free(current);
-    }
-
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 914a297eb5b..9de7dbb0552 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1045,164 +1045,156 @@ sendRHEMessage(UA_Server *server, uintptr_t connectionId, UA_ConnectionManager *
 
     /* Send the RHE message */
     message.length = messageHeader.messageSize;
-    retval = cm->sendWithConnection(cm, connectionId,
-                                    NULL, &message);
-
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_CLIENT, "Sending RHE failed");
-        cm->closeConnection(cm, connectionId);
-        return retval;
-    }
-
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_CLIENT, "Sent RHE message");
-    return UA_STATUSCODE_GOOD;
+    return cm->sendWithConnection(cm, connectionId, NULL, &message);
 }
 
-static void retryReverseConnectCallback(UA_Server *server, void *context) {
+static void
+retryReverseConnectCallback(UA_Server *server, void *context) {
     (void)context;
+    UA_LOCK(&server->serviceMutex);
 
     reverse_connect_context *rc = NULL;
-    SLIST_FOREACH(rc, &server->reverseConnects, next) {
-        if (!rc->currentConnection.connectionId) {
-            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "Attempt to reverse reconnect to %.*s:%d", (int)rc->hostname.length,
-                        rc->hostname.data, rc->port);
-            attemptReverseConnect(server, rc);
-        }
+    LIST_FOREACH(rc, &server->reverseConnects, next) {
+        if(rc->currentConnection.connectionId)
+            continue;
+        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    "Attempt to reverse reconnect to %.*s:%d",
+                    (int)rc->hostname.length, rc->hostname.data, rc->port);
+        attemptReverseConnect(server, rc);
     }
+
+    UA_UNLOCK(&server->serviceMutex);
 }
 
-UA_StatusCode setReverseConnectRetryCallback(UA_Server *server, UA_Boolean enabled) {
-    if (enabled && !server->reverseConnectsCheckHandle) {
-        const UA_UInt32 reconnectInterval = server->config.reverseReconnectInterval ?
-                    server->config.reverseReconnectInterval : 15000;
-        return UA_Server_addRepeatedCallback(server, retryReverseConnectCallback, NULL,
-                                             reconnectInterval, &server->reverseConnectsCheckHandle);
-    } else if (!enabled && server->reverseConnectsCheckHandle) {
-        UA_Server_removeCallback(server, server->reverseConnectsCheckHandle);
+UA_StatusCode
+setReverseConnectRetryCallback(UA_Server *server, UA_Boolean enabled) {
+    if(enabled && !server->reverseConnectsCheckHandle) {
+        UA_UInt32 reconnectInterval = server->config.reverseReconnectInterval ?
+            server->config.reverseReconnectInterval : 15000;
+        return addRepeatedCallback(server, retryReverseConnectCallback, NULL,
+                                   reconnectInterval, &server->reverseConnectsCheckHandle);
+    } else if(!enabled && server->reverseConnectsCheckHandle) {
+        removeCallback(server, server->reverseConnectsCheckHandle);
         server->reverseConnectsCheckHandle = 0;
-        return UA_STATUSCODE_GOOD;
     }
-
     return UA_STATUSCODE_GOOD;
 }
 
-void setReverseConnectState(UA_Server *server, reverse_connect_context *context,
-                                   UA_SecureChannelState newState) {
-    if (context->state == newState)
+void
+setReverseConnectState(UA_Server *server, reverse_connect_context *context,
+                       UA_SecureChannelState newState) {
+    if(context->state == newState)
         return;
 
     context->state = newState;
 
-    if (context->stateCallback)
+    if(context->stateCallback)
         context->stateCallback(server, context->handle, context->state,
                                context->callbackContext);
 }
 
-void UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void *application, void **connectionContext,
-                          UA_ConnectionState state, const UA_KeyValueMap *params,
-                          UA_ByteString msg) {
+void
+UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                                 void *application, void **connectionContext,
+                                 UA_ConnectionState state, const UA_KeyValueMap *params,
+                                 UA_ByteString msg) {
     (void)params;
 
     UA_Server *server = (UA_Server*)application;
 
-    /* UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Reverse connect has state %d", state); */
+    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                 "Activity for reverse connect %lu with state %d",
+                 (long unsigned)connectionId, state);
 
     reverse_connect_context *context = (reverse_connect_context *)*connectionContext;
-
     context->currentConnection.state = state;
 
+    /* New connection */
     if(context->currentConnection.connectionId == 0) {
-        /* The socket is closing without being previously registered -> ignore */
-        if(state == UA_CONNECTIONSTATE_CLOSED ||
-           state == UA_CONNECTIONSTATE_CLOSING) {
-            setReverseConnectState(server, context, context->destruction ?
-                                       UA_SECURECHANNELSTATE_CLOSED :
-                                       UA_SECURECHANNELSTATE_CONNECTING);
-            return;
-        }
-
-        context->currentConnection.state = state;
         context->currentConnection.connectionId = connectionId;
         context->currentConnection.connectionManager = cm;
-        return;
+        setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CONNECTING);
+        /* Fall through -- e.g. if state == ESTABLISHED already */
     }
 
     /* The connection is closing. This is the last callback for it. */
-    if(state == UA_CONNECTIONSTATE_CLOSING && context->channel) {
-        deleteServerSecureChannel(server, context->channel);
-        context->channel = NULL;
-        setReverseConnectState(server, context, context->destruction ?
-                                   UA_SECURECHANNELSTATE_CLOSED :
-                                   UA_SECURECHANNELSTATE_CONNECTING);
-        context->currentConnection.connectionId = 0;
-        return;
-    }
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
+        if(context->channel) {
+            deleteServerSecureChannel(server, context->channel);
+            context->channel = NULL;
+        }
+
+        /* Delete the ReverseConnect entry */
+        if(context->destruction) {
+            setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CLOSED);
+            LIST_REMOVE(context, next);
+            UA_String_clear(&context->hostname);
+            free(context);
+            return;
+        }
 
-    if (state == UA_CONNECTIONSTATE_CLOSING) {
+        /* Reset. Will be picked up in the regular retry callback. */
         context->currentConnection.connectionId = 0;
         setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CONNECTING);
+        return;
     }
 
+    if(state != UA_CONNECTIONSTATE_ESTABLISHED)
+        return;
+
+    /* A new connection is opening. This is the only place where
+     * createSecureChannel is used. */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(state == UA_CONNECTIONSTATE_ESTABLISHED && !context->channel) {
-        /* A new connection is opening. This is the only place where
-         * createSecureChannel is used. */
+    if(!context->channel) {
         retval = createServerSecureChannel(server, cm, connectionId, &context->channel);
-
-        if (retval == UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_CHANNEL(&server->config.logger, context->channel, "SecureChannel created");
-
-            /* Send the RHE message */
-            UA_StatusCode result = sendRHEMessage(server, connectionId, cm);
-
-            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Sending RHE returned %s", UA_StatusCode_name(result));
-
-            context->channel->state = UA_SECURECHANNELSTATE_RHE_SENT;
-
-            setReverseConnectState(server, context, UA_SECURECHANNELSTATE_RHE_SENT);
-        } else {
+        if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "TCP %lu\t| Could not accept the connection with status %s",
-                           (unsigned long)context->currentConnection.connectionId, UA_StatusCode_name(retval));
+                           "TCP %lu\t| Could not accept the reverse "
+                           "connection with status %s",
+                           (unsigned long)context->currentConnection.connectionId,
+                           UA_StatusCode_name(retval));
+            cm->closeConnection(cm, connectionId);
+            return;
         }
 
+        /* Send the RHE message */
+        retval = sendRHEMessage(server, connectionId, cm);
         if(retval != UA_STATUSCODE_GOOD) {
-            setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CONNECTING);
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "TCP %lu\t| Could not send the RHE message "
+                           "with status %s",
+                           (unsigned long)context->currentConnection.connectionId,
+                           UA_StatusCode_name(retval));
             cm->closeConnection(cm, connectionId);
+            return;
         }
 
+        context->channel->state = UA_SECURECHANNELSTATE_RHE_SENT;
+        setReverseConnectState(server, context, UA_SECURECHANNELSTATE_RHE_SENT);
         return;
     }
 
-    /* The connection has fully opened */
-    if (context->channel) {
-        if(context->channel->state < UA_SECURECHANNELSTATE_CONNECTED)
-            context->channel->state = UA_SECURECHANNELSTATE_CONNECTED;
+    /* The connection is fully opened and we have a SecureChannel.
+     * Process the received buffer */
+    retval = UA_SecureChannel_processBuffer(context->channel, server,
+                                            processSecureChannelMessage, &msg);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_CHANNEL(&server->config.logger, context->channel,
+                               "Processing the message failed with error %s",
+                               UA_StatusCode_name(retval));
 
-        retval = UA_SecureChannel_processBuffer(context->channel, server,
-                                                processSecureChannelMessage, &msg);
-        if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_CHANNEL(&server->config.logger, context->channel,
-                                   "Processing the message failed with error %s",
-                                   UA_StatusCode_name(retval));
-
-            /* Send an ERR message and close the connection */
-            UA_TcpErrorMessage error;
-            error.error = retval;
-            error.reason = UA_STRING_NULL;
-            UA_SecureChannel_sendError(context->channel, &error);
-            UA_SecureChannel_shutdown(context->channel);
-
-            setReverseConnectState(server, context, context->destruction ?
-                                       UA_SECURECHANNELSTATE_CLOSED :
-                                       UA_SECURECHANNELSTATE_CONNECTING);
-            return;
-        }
-    }
+        /* Processing the buffer failed within the SecureChannel.
+         * Send an ERR message and close the connection. */
+        UA_TcpErrorMessage error;
+        error.error = retval;
+        error.reason = UA_STRING_NULL;
+        UA_SecureChannel_sendError(context->channel, &error);
+        UA_SecureChannel_shutdown(context->channel);
 
-    if (context->channel) {
-        setReverseConnectState(server, context, context->channel->state);
+        setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CLOSING);
+        return;
     }
+
+    /* Update the state with the current SecureChannel state */
+    setReverseConnectState(server, context, context->channel->state);
 }
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index e444040ab28..4c22de10de6 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -74,8 +74,7 @@ typedef struct session_list_entry {
 } session_list_entry;
 
 typedef enum {
-    UA_SERVERLIFECYCLE_FRESH,
-    UA_SERVERLIFECYCLE_STOPPED,
+    UA_SERVERLIFECYCLE_STOPPED = 0,
     UA_SERVERLIFECYCLE_STARTED,
     UA_SERVERLIFECYCLE_STOPPING
 } UA_ServerLifecycle;
@@ -98,12 +97,14 @@ typedef struct reverse_connect_context {
     UA_Server_ReverseConnectStateCallback stateCallback;
     void *callbackContext;
 
-     /* If this is set to true, the state won't change to connecting on disconnect */
+     /* If this is set to true, the reverse connection is removed/freed when the
+      * connection closes. Otherwise we try to reconnect when the connection
+      * closes. */
     UA_Boolean destruction;
 
     UA_ServerConnection currentConnection;
     UA_SecureChannel *channel;
-    SLIST_ENTRY(reverse_connect_context) next;
+    LIST_ENTRY(reverse_connect_context) next;
 } reverse_connect_context;
 
 struct UA_Server {
@@ -190,7 +191,7 @@ struct UA_Server {
     UA_SecureChannelStatistics secureChannelStatistics;
     UA_ServerDiagnosticsSummaryDataType serverDiagnosticsSummary;
 
-    SLIST_HEAD(, reverse_connect_context) reverseConnects;
+    LIST_HEAD(, reverse_connect_context) reverseConnects;
     UA_UInt64 reverseConnectsCheckHandle;
     UA_UInt64 lastReverseConnectHandle;
 };
@@ -746,9 +747,6 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId);
 
 UA_StatusCode initNS0(UA_Server *server);
 
-UA_StatusCode writeNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
-                      size_t length, const UA_DataType *type);
-
 #ifdef UA_ENABLE_DIAGNOSTICS
 void createSessionObject(UA_Server *server, UA_Session *session);
 
diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 1d3cb25d21d..e42430eb005 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -647,7 +647,7 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
 }
 #endif /* defined(UA_ENABLE_METHODCALLS) && defined(UA_ENABLE_SUBSCRIPTIONS) */
 
-UA_StatusCode
+static UA_StatusCode
 writeNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
                       size_t length, const UA_DataType *type) {
     UA_Variant var;
@@ -656,6 +656,14 @@ writeNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
     return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
 }
 
+static UA_StatusCode
+writeNs0Variable(UA_Server *server, UA_UInt32 id, void *v, const UA_DataType *type) {
+    UA_Variant var;
+    UA_Variant_init(&var);
+    UA_Variant_setScalar(&var, v, type);
+    return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
+}
+
 #ifndef UA_GENERATED_NAMESPACE_ZERO
 static UA_StatusCode
 addVariableNode(UA_Server *server, char* name, UA_UInt32 variableid,
@@ -740,14 +748,6 @@ minimalServerObject(UA_Server *server) {
 
 #else
 
-static UA_StatusCode
-writeNs0Variable(UA_Server *server, UA_UInt32 id, void *v, const UA_DataType *type) {
-    UA_Variant var;
-    UA_Variant_init(&var);
-    UA_Variant_setScalar(&var, v, type);
-    return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
-}
-
 static void
 addModellingRules(UA_Server *server) {
     /* Test if the ModellingRules folder was added. (Only for the full ns0.) */
diff --git a/tests/pubsub/check_pubsub_decryption.c b/tests/pubsub/check_pubsub_decryption.c
index 7d76a1dbea3..22d2ebd1460 100644
--- a/tests/pubsub/check_pubsub_decryption.c
+++ b/tests/pubsub/check_pubsub_decryption.c
@@ -52,9 +52,8 @@ UA_Logger *logger = NULL;
 static void
 setup(void) {
     server = UA_Server_new();
-    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    retVal |= UA_ServerConfig_setDefault(config);
+    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
     retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
diff --git a/tests/pubsub/check_pubsub_informationmodel.c b/tests/pubsub/check_pubsub_informationmodel.c
index a5e59ca3172..8426235e83d 100644
--- a/tests/pubsub/check_pubsub_informationmodel.c
+++ b/tests/pubsub/check_pubsub_informationmodel.c
@@ -29,9 +29,8 @@ UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
-    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    retVal |= UA_ServerConfig_setDefault(config);
+    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
     retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     retVal |= UA_Server_run_startup(server);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 4ad84273bda..98e0ed59b44 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -33,9 +33,9 @@ static void setup(void) {
     running = true;
     server = UA_Server_new();
     ck_assert(server != NULL);
-    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    retVal |= UA_ServerConfig_setDefault(config);
+
+    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
     retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     retVal |= UA_Server_run_startup(server);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index df9dcce8625..64bab2ff879 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -35,9 +35,8 @@ UA_DataSetReaderConfig readerConfig;
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
-    UA_StatusCode retVal = UA_Server_run_startup(server);
     config = UA_Server_getConfig(server);
-    retVal |= UA_ServerConfig_setDefault(config);
+    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
     retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
     retVal |= UA_Server_run_startup(server);
 
diff --git a/tests/pubsub/check_pubsub_publish_json.c b/tests/pubsub/check_pubsub_publish_json.c
index a6afe7d73f8..d20889872d2 100644
--- a/tests/pubsub/check_pubsub_publish_json.c
+++ b/tests/pubsub/check_pubsub_publish_json.c
@@ -21,13 +21,12 @@ UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
-    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    retVal |= UA_ServerConfig_setDefault(config);
 
+    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
     retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-
     retVal |= UA_Server_run_startup(server);
+
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index 77f76a59508..2567d068377 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -224,7 +224,6 @@ setup(void) {
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    UA_Server_run_startup(server);
     // add 2 connections
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
diff --git a/tests/pubsub/check_pubsub_subscribe_config_freeze.c b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
index c438dd9cd16..fe6cf3f3222 100644
--- a/tests/pubsub/check_pubsub_subscribe_config_freeze.c
+++ b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
@@ -20,9 +20,8 @@ UA_Server *server = NULL;
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
-    UA_StatusCode retVal = UA_Server_run_startup(server);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    retVal |= UA_ServerConfig_setDefault(config);
+    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
     retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     retVal |= UA_Server_run_startup(server);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 337fd4d596e..99f29b66be2 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -549,7 +549,7 @@ START_TEST(Server_new_shutdown_delete) {
     UA_Server *pServer = UA_Server_new();
     configure_lds_server(pServer);
     UA_StatusCode retval = UA_Server_run_shutdown(pServer);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_ne(retval, UA_STATUSCODE_GOOD);
     UA_Server_delete(pServer);
 }
 END_TEST

From b4cba1f0a9b5bc7633f445ad791e3f74d23d06e7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 10 Apr 2023 16:57:35 +0200
Subject: [PATCH 0881/1963] fix(server): Don't repeatedly add the ServerUrl to
 the DiscoveryUrls

---
 src/server/ua_server.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 20763e11d52..c18721e414c 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -889,10 +889,22 @@ UA_Server_run_startup(UA_Server *server) {
                                      &hostname, &port, &path);
         if(retVal != UA_STATUSCODE_GOOD || hostname.length == 0)
             continue;
-        retVal = UA_Array_appendCopy((void**)&config->applicationDescription.discoveryUrls,
-                                     &config->applicationDescription.discoveryUrlsSize,
-                                     &config->serverUrls[i], &UA_TYPES[UA_TYPES_STRING]);
-        (void)retVal;
+
+        /* Check if the ServerUrl is already present in the DiscoveryUrl array.
+         * Add if not already there. */
+        size_t j = 0;
+        for(; j < config->applicationDescription.discoveryUrlsSize; j++) {
+            if(UA_String_equal(&config->serverUrls[i],
+                               &config->applicationDescription.discoveryUrls[j]))
+                break;
+        }
+        if(j == config->applicationDescription.discoveryUrlsSize) {
+            retVal =
+                UA_Array_appendCopy((void**)&config->applicationDescription.discoveryUrls,
+                                    &config->applicationDescription.discoveryUrlsSize,
+                                    &config->serverUrls[i], &UA_TYPES[UA_TYPES_STRING]);
+            (void)retVal;
+        }
     }
 
     /* Ensure that the uri for ns1 is set up from the app description */

From 1c8f89aa2ea4d74c8be6186c6a2f315f52d9780a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 10 Apr 2023 17:14:27 +0200
Subject: [PATCH 0882/1963] refactor(server): Cosmetic improvements in
 sendRHEMessage

---
 src/server/ua_server_binary.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 9de7dbb0552..bad1db36fad 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1001,30 +1001,32 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 #define UA_MINMESSAGESIZE 8192
 
 static UA_StatusCode
-sendRHEMessage(UA_Server *server, uintptr_t connectionId, UA_ConnectionManager *cm) {
+sendRHEMessage(UA_Server *server, uintptr_t connectionId,
+               UA_ConnectionManager *cm) {
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
     /* Get a buffer */
     UA_ByteString message;
-    UA_StatusCode retval = cm->allocNetworkBuffer(cm, connectionId,
-                                                  &message, UA_MINMESSAGESIZE);
-
+    UA_StatusCode retval =
+        cm->allocNetworkBuffer(cm, connectionId, &message, UA_MINMESSAGESIZE);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
     /* Prepare the RHE message and encode at offset 8 */
     UA_TcpReverseHelloMessage reverseHello;
     UA_TcpReverseHelloMessage_init(&reverseHello);
-
-    UA_ServerConfig *config = UA_Server_getConfig(server);
     reverseHello.serverUri = config->applicationDescription.applicationUri;
-    if (config->applicationDescription.discoveryUrlsSize)
+    if(config->applicationDescription.discoveryUrlsSize)
         reverseHello.endpointUrl = config->applicationDescription.discoveryUrls[0];
 
     UA_Byte *bufPos = &message.data[8]; /* skip the header */
     const UA_Byte *bufEnd = &message.data[message.length];
-    UA_StatusCode result = UA_encodeBinaryInternal(&reverseHello, &UA_TRANSPORT[UA_TRANSPORT_TCPREVERSEHELLOMESSAGE],
-                                                    &bufPos, &bufEnd, NULL, NULL);
+    UA_StatusCode result =
+        UA_encodeBinaryInternal(&reverseHello,
+                                &UA_TRANSPORT[UA_TRANSPORT_TCPREVERSEHELLOMESSAGE],
+                                &bufPos, &bufEnd, NULL, NULL);
 
-    if (result != UA_STATUSCODE_GOOD) {
+    if(result != UA_STATUSCODE_GOOD) {
         cm->freeNetworkBuffer(cm, connectionId, &message);
         return result;
     }
@@ -1037,7 +1039,6 @@ sendRHEMessage(UA_Server *server, uintptr_t connectionId, UA_ConnectionManager *
     retval = UA_encodeBinaryInternal(&messageHeader,
                                      &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER],
                                      &bufPos, &bufEnd, NULL, NULL);
-
     if(retval != UA_STATUSCODE_GOOD) {
         cm->freeNetworkBuffer(cm, connectionId, &message);
         return retval;

From 73e7f41a44c979afe6b15741b50ebc964fdb544e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 10 Apr 2023 17:40:53 +0200
Subject: [PATCH 0883/1963] refactor(test): Small improvements to
 check_server_reverseconnect.c

---
 tests/server/check_server_reverseconnect.c | 62 +++++++++++++++-------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
index baa23915a0c..6300ebad190 100644
--- a/tests/server/check_server_reverseconnect.c
+++ b/tests/server/check_server_reverseconnect.c
@@ -53,10 +53,10 @@ static void clientStateCallback(UA_Client *c,
 }
 
 static void setup(void) {
-    for (int i = 0; i < numServerCallbackCalled; ++i)
+    for(int i = 0; i < numServerCallbackCalled; ++i)
         serverCallbackStates[i] = UA_SECURECHANNELSTATE_FRESH;
 
-    for (int i = 0; i < numClientCallbackCalled; ++i)
+    for(int i = 0; i < numClientCallbackCalled; ++i)
         clientCallbackStates[i] = UA_SECURECHANNELSTATE_FRESH;
 
     numServerCallbackCalled = 0;
@@ -73,7 +73,7 @@ static void setup(void) {
 }
 
 static void teardown(void) {
-    if (runServer) {
+    if(runServer) {
         runServer = false;
         THREAD_JOIN(server_thread);
     }
@@ -105,7 +105,7 @@ START_TEST(listenAndTeardown) {
     ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for (int i = 0; i < 10; ++i) {
+    for(int i = 0; i < 10; ++i) {
         UA_Client_run_iterate(client, 1);
         UA_fakeSleep(1000);
     }
@@ -148,7 +148,8 @@ START_TEST(addBeforeStart) {
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
     ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
-                                      serverStateCallback, (void *)1234, &reverseConnectHandle);
+                                      serverStateCallback, (void *)1234,
+                                      &reverseConnectHandle);
 
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
     ck_assert_uint_ne(reverseConnectHandle, 0);
@@ -160,9 +161,14 @@ START_TEST(addBeforeStart) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for (int i = 0; i < 100; ++i) {
+    for(int i = 0; i < 100; ++i) {
         UA_Server_run_iterate(server, false);
         UA_Client_run_iterate(client, 1);
+
+        if(numServerCallbackCalled == 5 &&
+           numClientCallbackCalled == 5)
+            break;
+
         UA_fakeSleep(1000);
     }
 
@@ -194,21 +200,25 @@ START_TEST(addAfterStart) {
     ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for (int i = 0; i < 100; ++i) {
+    for(int i = 0; i < 100; ++i) {
         UA_Server_run_iterate(server, true);
         UA_Client_run_iterate(client, 1);
 
-        if (i == 10) {
+        if(i == 10) {
             ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
-                                              serverStateCallback, (void *)1234, &reverseConnectHandle);
+                                              serverStateCallback, (void *)1234,
+                                              &reverseConnectHandle);
 
             ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
             ck_assert_uint_ne(reverseConnectHandle, 0);
         }
 
-        if (i == 20)
+        if(i == 20)
             UA_Server_removeReverseConnect(server, reverseConnectHandle);
 
+        if(numServerCallbackCalled == 5)
+            break;
+
         UA_fakeSleep(1);
     }
 
@@ -227,7 +237,8 @@ START_TEST(checkReconnect) {
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
     ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
-                                      serverStateCallback, (void *)1234, &reverseConnectHandle);
+                                      serverStateCallback, (void *)1234,
+                                      &reverseConnectHandle);
 
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
     ck_assert_uint_ne(reverseConnectHandle, 0);
@@ -239,11 +250,11 @@ START_TEST(checkReconnect) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for (int i = 0; i < 100; ++i) {
+    for(int i = 0; i < 100; ++i) {
         UA_Server_run_iterate(server, true);
         UA_Client_run_iterate(client, 1);
 
-        if (i == 50) {
+        if(i == 50) {
             ck_assert_int_eq(numServerCallbackCalled, 4);
             ck_assert_int_eq(serverCallbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
             ck_assert_int_eq(serverCallbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
@@ -256,7 +267,7 @@ START_TEST(checkReconnect) {
             ret = UA_Client_disconnectAsync(client);
             ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-            for (int j = 0; j < 5; ++j) {
+            for(int j = 0; j < 5; ++j) {
                 UA_Client_run_iterate(client, 1);
                 UA_Server_run_iterate(server, true);
             }
@@ -274,7 +285,7 @@ START_TEST(checkReconnect) {
             UA_DateTime next = serverLoop->run(serverLoop, 1);
             UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
 
-            for (int j = 0; j < 5; ++j) {
+            for(int j = 0; j < 5; ++j) {
                 UA_Client_run_iterate(client, 1);
                 next = serverLoop->run(serverLoop, 1);
                 UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
@@ -287,9 +298,12 @@ START_TEST(checkReconnect) {
 
         }
 
-        if (i == 80)
+        if(i == 80)
             UA_Server_removeReverseConnect(server, reverseConnectHandle);
 
+        if(numServerCallbackCalled == 10)
+            break;
+
         UA_fakeSleep(1000);
     }
 
@@ -304,7 +318,8 @@ START_TEST(removeOnShutdownWithConnection) {
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
     ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
-                                      serverStateCallback, (void *)1234, &reverseConnectHandle);
+                                      serverStateCallback, (void *)1234,
+                                      &reverseConnectHandle);
 
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
     ck_assert_uint_ne(reverseConnectHandle, 0);
@@ -316,10 +331,13 @@ START_TEST(removeOnShutdownWithConnection) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for (int i = 0; i < 20; ++i) {
+    for(int i = 0; i < 20; ++i) {
         UA_Server_run_iterate(server, true);
         UA_Client_run_iterate(client, 100);
 
+        if(numServerCallbackCalled == 5)
+            break;
+
         UA_fakeSleep(1000);
     }
 
@@ -338,7 +356,8 @@ START_TEST(removeOnShutdownWithoutConnection) {
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
     ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
-                                      serverStateCallback, (void *)1234, &reverseConnectHandle);
+                                      serverStateCallback, (void *)1234,
+                                      &reverseConnectHandle);
 
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
     ck_assert_uint_ne(reverseConnectHandle, 0);
@@ -346,9 +365,12 @@ START_TEST(removeOnShutdownWithoutConnection) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for (int i = 0; i < 20; ++i) {
+    for(int i = 0; i < 20; ++i) {
         UA_Server_run_iterate(server, true);
         UA_fakeSleep(1);
+
+        if(numServerCallbackCalled == 2)
+            break;
     }
 
     ret = UA_Server_run_shutdown(server);

From 0ff940d2a065085b3c540e5d91097970fa04eb9b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 13 Apr 2023 23:16:30 +0200
Subject: [PATCH 0884/1963] refactor(deps): update nodesetloader submodule to
 its current master

---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index 35dfdd53d18..4148d22cb41 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit 35dfdd53d18c1dd068c771cca802621d8d42042a
+Subproject commit 4148d22cb41d07f28d38c9517336f6ff0187f474

From 46d03954176819b4563aed56d018b02c70b3aeda Mon Sep 17 00:00:00 2001
From: david-beinder <david.beinder@mce.li>
Date: Thu, 6 Apr 2023 13:08:35 +0200
Subject: [PATCH 0885/1963] fix(el): allow binding a listening socket before
 the network interface is configured (#5709)

Drop the AI_ADDRCONFIG to allow getaddrinfo() returning a bindable socket address, even if the network interface doesn't have an IP (yet).
---
 arch/eventloop_posix_tcp.c | 4 ----
 arch/eventloop_posix_udp.c | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index b8b6e08fddf..982150149b4 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -524,10 +524,6 @@ TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_flags = AI_PASSIVE;
-#ifdef AI_ADDRCONFIG
-    hints.ai_flags |= AI_ADDRCONFIG; /* Only return IPv4/IPv6 if at least one
-                                      * such address is configured */
-#endif
 
     int retcode = UA_getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index e3b2b8943f4..7761a50c637 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -783,10 +783,6 @@ UDP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
     hints.ai_socktype = SOCK_DGRAM;
     hints.ai_protocol = IPPROTO_UDP;
     hints.ai_flags = AI_PASSIVE;
-#ifdef AI_ADDRCONFIG
-    hints.ai_flags |= AI_ADDRCONFIG; /* Only return IPv4/IPv6 if at least one
-                                      * such address is configured */
-#endif
 
     /* Set up the port string */
     char portstr[6];

From 794f90e9c8c8729e7f5b64028ca0dc3fb6b07495 Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Sat, 15 Apr 2023 08:27:02 +0200
Subject: [PATCH 0886/1963] feat(pubsub): Implement optional ConfiguredSize
 Zero-Padding for DataSetMessages (#5686)

* Added configuredSize member to UA_DataSetMessage.

* Add optional padding to DataSetMessages.

* fixed padding calculation. Allow static DSM configuredSize

* Added testcases for padding

* Fixed memory leaks

* refactor: small cosmetic changes
---
 src/pubsub/ua_pubsub_networkmessage.c |  18 ++
 src/pubsub/ua_pubsub_networkmessage.h |   1 +
 src/pubsub/ua_pubsub_writer.c         |   5 +-
 tests/pubsub/check_pubsub_subscribe.c | 382 +++++++++++++++++++++++++-
 4 files changed, 404 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 377ffb2c23a..a274d1220ea 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1354,6 +1354,7 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
             } else if(src->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
                 rv = UA_DataValue_encodeBinary(v, bufPos, bufEnd);
             }
+
             UA_CHECK_STATUS(rv, return rv);
         }
     } else if(src->header.dataSetMessageType == UA_DATASETMESSAGE_DATADELTAFRAME) {
@@ -1385,6 +1386,14 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
+    /* if the configuredSize is set -> padd the message with 0. */
+    if(src->configuredSize > 0 && src->header.dataSetMessageValid) {
+        size_t padding = (size_t)(bufEnd - *bufPos);
+        /* Set the bytes to 0*/
+        memset(*bufPos, 0, padding);
+        /* move the bufpos accordingly*/
+        *bufPos += padding;
+    }
     /* Keep-Alive Message contains no Payload Data */
     return UA_STATUSCODE_GOOD;
 }
@@ -1623,6 +1632,15 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p,
         return 0;
     }
 
+    if(p->configuredSize > 0) {
+        /* If the message is larger than the configuredSize, it shall be set to not valid */
+        if(p->configuredSize < size) 
+            p->header.dataSetMessageValid = UA_FALSE;
+        
+        size = p->configuredSize;
+    }
+    
+    /* KeepAlive-Message contains no Payload Data */
     return size;
 }
 
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 08d23799f91..4554e891c71 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -91,6 +91,7 @@ typedef struct {
         UA_DataSetMessage_DataKeyFrameData keyFrameData;
         UA_DataSetMessage_DataDeltaFrameData deltaFrameData;
     } data;
+    size_t configuredSize;
 } UA_DataSetMessage;
 
 typedef struct {
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 7fe4ad704d5..b6d8c3e3aec 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -784,9 +784,12 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
                                   "Static DSM configuration not supported, using defaults");
             dsm->networkMessageNumber = 0;
             dsm->dataSetOffset = 0;
-            dsm->configuredSize = 0;
+          //  dsm->configuredSize = 0;
         }
 
+        /* setting configured size in the dataSetMessage to add padding later on */
+        dataSetMessage->configuredSize = dsm->configuredSize;
+
         /* Std: 'The DataSetMessageContentMask defines the flags for the content
          * of the DataSetMessage header.' */
         if((u64)dsm->dataSetMessageContentMask &
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index e0883ce0c83..4dcaa935729 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -28,6 +28,8 @@
 #define SUBSCRIBEVARIABLE2_NODEID 1003   /* Subscribed data nodeId */
 #define READERGROUP_COUNT        2       /* Value to add readergroup to connection */
 #define CHECK_READERGROUP_COUNT  3       /* Value to check readergroup count */
+#define VALID_DATASETMESSAGE_SIZE 128    /* Valid DataSetMessage configuredSize */
+#define INVALID_DATASETMESSAGE_SIZE 1    /* Invalid DataSetMessage configuredSize */
 
 /* Global declaration for test cases  */
 UA_Server *server = NULL;
@@ -88,6 +90,75 @@ static void addVariables(void) {
     ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
 }
 
+typedef struct {
+    UA_ByteString *buffer;
+    size_t offset;
+} UA_ReceiveContext;
+
+static UA_StatusCode
+recvTestFun(UA_PubSubChannel *channel, void *context,
+               const UA_ByteString *buffer) {
+    UA_ReceiveContext *ctx = (UA_ReceiveContext*)context;
+    memcpy(ctx->buffer->data + ctx->offset, buffer->data, buffer->length);
+    ctx->offset += buffer->length;
+    ctx->buffer->length = ctx->offset;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+receiveInvalidMessage(UA_ByteString buffer, UA_PubSubConnection *connection) {
+    if(UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
+        ck_abort_msg("Message buffer allocation failed!");
+        return;
+    }
+
+    if(!connection->channel) {
+        ck_abort_msg("No connection established");
+        return;
+    }
+
+    UA_ReceiveContext testCtx = {&buffer, 0};
+    UA_StatusCode retval =
+        connection->channel->receive(connection->channel, NULL,
+                                     recvTestFun, &testCtx, 1000000);
+
+    /* an invalid message is not sent. We reach a non critical timeout */
+    ck_assert(retval == UA_STATUSCODE_GOODNONCRITICALTIMEOUT);
+    buffer.length = 512;
+    UA_ByteString_clear(&buffer);
+}
+
+static void
+receiveSingleMessage(UA_ByteString buffer, UA_PubSubConnection *connection,
+                     UA_NetworkMessage *networkMessage) {
+    if(UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
+        ck_abort_msg("Message buffer allocation failed!");
+        return;
+    }
+
+    if(!connection->channel) {
+        ck_abort_msg("No connection established");
+        return;
+    }
+
+    UA_ReceiveContext testCtx = {&buffer, 0};
+    UA_StatusCode retval =
+        connection->channel->receive(connection->channel, NULL,
+                                     recvTestFun, &testCtx, 1000000);
+    if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
+        buffer.length = 512;
+        UA_ByteString_clear(&buffer);
+        ck_abort_msg("Expected message not received!");
+    }
+    memset(networkMessage, 0, sizeof(UA_NetworkMessage));
+    size_t currentPosition = 0;
+
+    /* check if the buffer has the length of the configured size*/
+    ck_assert(buffer.length == VALID_DATASETMESSAGE_SIZE);
+    UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, networkMessage, NULL);
+    UA_ByteString_clear(&buffer);
+}
+
 /* setup() is to create an environment for test cases */
 static void setup(void) {
     /*Add setup by creating new server with valid configuration */
@@ -135,7 +206,7 @@ static void checkReceived(void) {
     /* Read data received by the Subscriber */
     rvi.nodeId = UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID);
     UA_DataValue subscribedNodeData = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-
+    
     /* Check if data sent from Publisher is being received by Subscriber */
     ck_assert(publishedNodeData.value.type == subscribedNodeData.value.type);
     ck_assert(UA_order(publishedNodeData.value.data,
@@ -2226,6 +2297,309 @@ START_TEST(SinglePublishOnDemand) {
 
     } END_TEST
 
+START_TEST(ValidConfiguredSizPublishSubscribe) {
+ /* To check status after running both publisher and subscriber */
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+        UA_PublishedDataSetConfig pdsConfig;
+        UA_NodeId dataSetWriter;
+        UA_NodeId readerIdentifier;
+        UA_NodeId writerGroup;
+        UA_DataSetReaderConfig readerConfig;
+
+        /* Published DataSet */
+        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+        pdsConfig.name = UA_STRING("PublishedDataSet Test");
+        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Create variable to publish integer data */
+        UA_NodeId publisherNode;
+        UA_VariableAttributes attr = UA_VariableAttributes_default;
+        attr.description           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+        attr.displayName           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+        attr.dataType              = UA_TYPES[UA_TYPES_INT32].typeId;
+        UA_Int32 publisherData     = 42;
+        UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT32]);
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                           UA_QUALIFIEDNAME(1, "Published Int32"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                           attr, NULL, &publisherNode);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Data Set Field */
+        UA_NodeId dataSetFieldIdent;
+        UA_DataSetFieldConfig dataSetFieldConfig;
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType              = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Published Int32");
+        dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
+        dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
+        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+
+        /* Writer group */
+        UA_WriterGroupConfig writerGroupConfig;
+        memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+        writerGroupConfig.name               = UA_STRING("WriterGroup Test");
+        writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
+        writerGroupConfig.enabled            = UA_FALSE;
+        writerGroupConfig.writerGroupId      = WRITER_GROUP_ID;
+        writerGroupConfig.encodingMimeType   = UA_PUBSUB_ENCODING_UADP;
+        /* Message settings in WriterGroup to include necessary headers */
+        writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+        writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+        UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+        writerGroupMessage->networkMessageContentMask =
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
+        writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+        retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
+        UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* DataSetWriter */
+        UA_DataSetWriterConfig dataSetWriterConfig;
+        memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+        dataSetWriterConfig.name            = UA_STRING("DataSetWriter Test");
+        dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
+        dataSetWriterConfig.keyFrameCount   = 10;
+        /* messageSettings to specify the padding for the dataSetMessage */
+        dataSetWriterConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+        dataSetWriterConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE];
+        UA_UadpDataSetWriterMessageDataType *messageSettings = UA_UadpDataSetWriterMessageDataType_new();
+        /* set the configuredSize */
+        messageSettings->configuredSize = VALID_DATASETMESSAGE_SIZE;
+        dataSetWriterConfig.messageSettings.content.decoded.data = messageSettings;
+        retVal |= UA_Server_addDataSetWriter(server, writerGroup, publishedDataSetId,
+                                             &dataSetWriterConfig, &dataSetWriter);
+        UA_UadpDataSetWriterMessageDataType_delete(messageSettings);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Reader Group */
+        UA_ReaderGroupConfig readerGroupConfig;
+        memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+        readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+        retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &readerGroupId);
+        /* Data Set Reader */
+        /* Parameters to filter received NetworkMessage */
+        memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+        readerConfig.name             = UA_STRING ("DataSetReader Test");
+        UA_UInt16 publisherIdentifier = PUBLISHER_ID;
+        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+        readerConfig.publisherId.data = &publisherIdentifier;
+        readerConfig.writerGroupId    = WRITER_GROUP_ID;
+        readerConfig.dataSetWriterId  = DATASET_WRITER_ID;
+        
+        /* Setting up Meta data configuration in DataSetReader */
+        UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+        /* FilltestMetadata function in subscriber implementation */
+        UA_DataSetMetaDataType_init (pMetaData);
+        pMetaData->name       = UA_STRING ("DataSet Test");
+        /* Static definition of number of fields size to 1 to create one
+           targetVariable */
+        pMetaData->fieldsSize = 1;
+        pMetaData->fields     = (UA_FieldMetaData*)
+            UA_Array_new(pMetaData->fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+        /* Unsigned Integer DataType */
+        UA_FieldMetaData_init (&pMetaData->fields[0]);
+        UA_NodeId_copy (&UA_TYPES[UA_TYPES_INT32].typeId,
+                        &pMetaData->fields[0].dataType);
+        pMetaData->fields[0].builtInType = UA_NS0ID_INT32;
+        pMetaData->fields[0].valueRank   = -1; /* scalar */
+        retVal |= UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
+                                             &readerIdentifier);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Add Subscribed Variables */
+        /* Variable to subscribe data */
+        UA_NodeId newnodeId;
+        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+        vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+        vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+        vAttr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), folderId,
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_FieldTargetVariable targetVar;
+        memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
+        /* For creating Targetvariable */
+        UA_FieldTargetDataType_init(&targetVar.targetVariable);
+        targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+        targetVar.targetVariable.targetNodeId = newnodeId;
+        retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
+                                                                1, &targetVar);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_FieldTargetDataType_clear(&targetVar.targetVariable);
+        UA_free(pMetaData->fields);
+
+        /* run server - publisher and subscriber */
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionId);
+        UA_ByteString buffer;
+        UA_ByteString_init(&buffer);
+        UA_NetworkMessage networkMessage;
+        receiveSingleMessage(buffer, connection, &networkMessage);
+        UA_NetworkMessage_clear(&networkMessage);
+} END_TEST
+
+START_TEST(InvalidConfiguredSizPublishSubscribe) {
+ /* To check status after running both publisher and subscriber */
+        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+        UA_PublishedDataSetConfig pdsConfig;
+        UA_NodeId dataSetWriter;
+        UA_NodeId readerIdentifier;
+        UA_NodeId writerGroup;
+        UA_DataSetReaderConfig readerConfig;
+
+        /* Published DataSet */
+        memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
+        pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+        pdsConfig.name = UA_STRING("PublishedDataSet Test");
+        UA_Server_addPublishedDataSet(server, &pdsConfig, &publishedDataSetId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Create variable to publish integer data */
+        UA_NodeId publisherNode;
+        UA_VariableAttributes attr = UA_VariableAttributes_default;
+        attr.description           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+        attr.displayName           = UA_LOCALIZEDTEXT("en-US","Published Int32");
+        attr.dataType              = UA_TYPES[UA_TYPES_INT32].typeId;
+        UA_Int32 publisherData     = 42;
+        UA_Variant_setScalar(&attr.value, &publisherData, &UA_TYPES[UA_TYPES_INT32]);
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                           UA_QUALIFIEDNAME(1, "Published Int32"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                           attr, NULL, &publisherNode);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Data Set Field */
+        UA_NodeId dataSetFieldIdent;
+        UA_DataSetFieldConfig dataSetFieldConfig;
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType              = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Published Int32");
+        dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable = publisherNode;
+        dataSetFieldConfig.field.variable.publishParameters.attributeId       = UA_ATTRIBUTEID_VALUE;
+        UA_Server_addDataSetField (server, publishedDataSetId, &dataSetFieldConfig, &dataSetFieldIdent);
+
+        /* Writer group */
+        UA_WriterGroupConfig writerGroupConfig;
+        memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+        writerGroupConfig.name               = UA_STRING("WriterGroup Test");
+        writerGroupConfig.publishingInterval = PUBLISH_INTERVAL;
+        writerGroupConfig.enabled            = UA_FALSE;
+        writerGroupConfig.writerGroupId      = WRITER_GROUP_ID;
+        writerGroupConfig.encodingMimeType   = UA_PUBSUB_ENCODING_UADP;
+        /* Message settings in WriterGroup to include necessary headers */
+        writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+        writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+        UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
+        writerGroupMessage->networkMessageContentMask =
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+            (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
+        writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
+        retVal |= UA_Server_addWriterGroup(server, connectionId, &writerGroupConfig, &writerGroup);
+        UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* DataSetWriter */
+        UA_DataSetWriterConfig dataSetWriterConfig;
+        memset(&dataSetWriterConfig, 0, sizeof(dataSetWriterConfig));
+        dataSetWriterConfig.name            = UA_STRING("DataSetWriter Test");
+        dataSetWriterConfig.dataSetWriterId = DATASET_WRITER_ID;
+        dataSetWriterConfig.keyFrameCount   = 10;
+        /* messageSettings to specify the padding for the dataSetMessage */
+        dataSetWriterConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
+        dataSetWriterConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE];
+        UA_UadpDataSetWriterMessageDataType *messageSettings = UA_UadpDataSetWriterMessageDataType_new();
+        /* set the configuredSize */
+        messageSettings->configuredSize = INVALID_DATASETMESSAGE_SIZE;
+        dataSetWriterConfig.messageSettings.content.decoded.data = messageSettings;
+        retVal |= UA_Server_addDataSetWriter(server, writerGroup, publishedDataSetId,
+                                             &dataSetWriterConfig, &dataSetWriter);
+        UA_UadpDataSetWriterMessageDataType_delete(messageSettings);
+
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Reader Group */
+        UA_ReaderGroupConfig readerGroupConfig;
+        memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
+        readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
+        retVal |=  UA_Server_addReaderGroup(server, connectionId, &readerGroupConfig, &readerGroupId);
+        /* Data Set Reader */
+        /* Parameters to filter received NetworkMessage */
+        memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
+        readerConfig.name             = UA_STRING ("DataSetReader Test");
+        UA_UInt16 publisherIdentifier = PUBLISHER_ID;
+        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
+        readerConfig.publisherId.data = &publisherIdentifier;
+        readerConfig.writerGroupId    = WRITER_GROUP_ID;
+        readerConfig.dataSetWriterId  = DATASET_WRITER_ID;
+        
+        /* Setting up Meta data configuration in DataSetReader */
+        UA_DataSetMetaDataType *pMetaData = &readerConfig.dataSetMetaData;
+        /* FilltestMetadata function in subscriber implementation */
+        UA_DataSetMetaDataType_init (pMetaData);
+        pMetaData->name       = UA_STRING ("DataSet Test");
+        /* Static definition of number of fields size to 1 to create one
+           targetVariable */
+        pMetaData->fieldsSize = 1;
+        pMetaData->fields     = (UA_FieldMetaData*)
+            UA_Array_new(pMetaData->fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+        /* Unsigned Integer DataType */
+        UA_FieldMetaData_init (&pMetaData->fields[0]);
+        UA_NodeId_copy (&UA_TYPES[UA_TYPES_INT32].typeId,
+                        &pMetaData->fields[0].dataType);
+        pMetaData->fields[0].builtInType = UA_NS0ID_INT32;
+        pMetaData->fields[0].valueRank   = -1; /* scalar */
+        retVal |= UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
+                                             &readerIdentifier);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        /* Add Subscribed Variables */
+        /* Variable to subscribe data */
+        UA_NodeId newnodeId;
+        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
+        vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+        vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
+        vAttr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), folderId,
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &newnodeId);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_FieldTargetVariable targetVar;
+        memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
+        /* For creating Targetvariable */
+        UA_FieldTargetDataType_init(&targetVar.targetVariable);
+        targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+        targetVar.targetVariable.targetNodeId = newnodeId;
+        retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
+                                                                1, &targetVar);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_FieldTargetDataType_clear(&targetVar.targetVariable);
+        UA_free(pMetaData->fields);
+
+        /* run server - publisher and subscriber */
+        retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionId);
+        UA_ByteString buffer;
+        UA_ByteString_init(&buffer);
+        receiveInvalidMessage(buffer, connection);
+} END_TEST
+
 int main(void) {
     TCase *tc_add_pubsub_readergroup = tcase_create("PubSub readerGroup items handling");
     tcase_add_checked_fixture(tc_add_pubsub_readergroup, setup, teardown);
@@ -2276,11 +2650,17 @@ int main(void) {
     tcase_add_test(tc_pubsub_publish_subscribe, ReceiveStandaloneDataSetFrame);
     tcase_add_test(tc_pubsub_publish_subscribe, AddAndRemoveReaderUsingStandaloneDataSet);
 
+    TCase *tc_dataSetMessage_padding = tcase_create("PubSub DataSetMessage padding");
+    tcase_add_checked_fixture(tc_dataSetMessage_padding, setup, teardown);
+
+    tcase_add_test(tc_dataSetMessage_padding, ValidConfiguredSizPublishSubscribe);
+    tcase_add_test(tc_dataSetMessage_padding, InvalidConfiguredSizPublishSubscribe);
 
     Suite *suite = suite_create("PubSub readerGroups/reader/Fields handling and publishing");
     suite_add_tcase(suite, tc_add_pubsub_readergroup);
     suite_add_tcase(suite, tc_pubsub_publish_subscribe);
     suite_add_tcase(suite, tc_pubsub_standalone_datasets);
+    suite_add_tcase(suite, tc_dataSetMessage_padding);
 
     SRunner *suiteRunner = srunner_create(suite);
     srunner_set_fork_status(suiteRunner, CK_NOFORK);

From beff49d493db453cad8e5f04f3ce6204c822a304 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Apr 2023 08:49:18 +0200
Subject: [PATCH 0887/1963] feat(core): Introduce UA_LifecycleState enum

---
 include/open62541/common.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/include/open62541/common.h b/include/open62541/common.h
index 963761a5b09..7fb10233681 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -228,6 +228,20 @@ typedef struct {
     size_t sessionAbortCount;            /* only used by servers */
 } UA_SessionStatistics;
 
+/**
+ * Lifecycle States
+ * ----------------
+ *
+ * Generic lifecycle states. The STOPPING state indicates that the lifecycle is
+ * being terminated. But it might take time to (asynchronously) perform a
+ * graceful shutdown. */
+
+typedef enum {
+    UA_LIFECYCLESTATE_STOPPED = 0,
+    UA_LIFECYCLESTATE_STARTED,
+    UA_LIFECYCLESTATE_STOPPING
+} UA_LifecycleState;
+
 /**
  * Forward Declarations
  * --------------------

From 1fdce87910df802a280636347ca82379ac5b8a3f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Apr 2023 20:33:19 +0200
Subject: [PATCH 0888/1963] refactor(server): Cosmetic improvements in server.h

---
 include/open62541/server.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 037297d040f..efcf5db2716 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -99,8 +99,8 @@ struct UA_ServerConfig {
     UA_ByteString serverCertificate;
 
     /**
-     * Timeouts and Delays
-     * ^^^^^^^^^^^^^^^^^^^ */
+     * Server Lifecycle
+     * ^^^^^^^^^^^^^^^^ */
     /* Delay in ms from the shutdown signal (ctrl-c) until the actual shutdown.
      * Clients need to be able to get a notification ahead of time. */
     UA_Double shutdownDelay;
@@ -386,7 +386,8 @@ UA_ServerConfig_clean(UA_ServerConfig *config);
  * only uses the public server API.
  *
  * @return Returns the configured server or NULL if an error occurs. */
-UA_EXPORT UA_Server * UA_Server_new(void);
+UA_EXPORT UA_Server *
+UA_Server_new(void);
 
 /* Creates a new server. Moves the config into the server with a shallow copy.
  * The config content is cleared together with the server. */
@@ -394,7 +395,8 @@ UA_EXPORT UA_Server *
 UA_Server_newWithConfig(UA_ServerConfig *config);
 
 /* Delete the server. */
-UA_EXPORT void UA_Server_delete(UA_Server *server);
+UA_EXPORT UA_StatusCode
+UA_Server_delete(UA_Server *server);
 
 /* Get the configuration. Always succeeds as this simplfy resolves a pointer.
  * Attention! Do not adjust the configuration while the server is running! */

From d1cb9e5f89c95973daa6537a6e9014f52262818d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Apr 2023 21:01:21 +0200
Subject: [PATCH 0889/1963] feat(server): Export server lifecycle state / use
 explicitly for shutdown

---
 include/open62541/server.h                 |   9 ++
 src/server/ua_server.c                     | 119 ++++++++++++++-------
 src/server/ua_server_internal.h            |  10 +-
 tests/pubsub/check_pubsub_udp_unicast.c    |   8 +-
 tests/server/check_server_reverseconnect.c |   1 +
 5 files changed, 98 insertions(+), 49 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index efcf5db2716..cefe1e92d32 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -105,6 +105,11 @@ struct UA_ServerConfig {
      * Clients need to be able to get a notification ahead of time. */
     UA_Double shutdownDelay;
 
+    /* If an asynchronous server shutdown is used, this callback notifies about
+     * the current lifecycle state (notably the STOPPING -> STOPPED
+     * transition). */
+    void (*notifyLifecycleState)(UA_Server *server, UA_LifecycleState state);
+
     /**
      * Rule Handling
      * ^^^^^^^^^^^^^
@@ -403,6 +408,10 @@ UA_Server_delete(UA_Server *server);
 UA_EXPORT UA_ServerConfig *
 UA_Server_getConfig(UA_Server *server);
 
+/* Get the current server lifecycle state */
+UA_EXPORT UA_LifecycleState
+UA_Server_getLifecycleState(UA_Server *server);
+
 /* Runs the server until interrupted. On Unix/Windows this registers an
  * interrupt for SIGINT (ctrl-c). The method only returns after having received
  * the interrupt. The logical sequence is as follows:
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index c18721e414c..189aa4b183d 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -178,14 +178,16 @@ UA_Server_forEachChildNodeCall(UA_Server *server, UA_NodeId parentNodeId,
 /********************/
 
 /* The server needs to be stopped before it can be deleted */
-void UA_Server_delete(UA_Server *server) {
+UA_StatusCode
+UA_Server_delete(UA_Server *server) {
     if(server == NULL) {
-        return;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
-    /* check if UA_Server_run_shutdown has already been called */
-    if(server->houseKeepingCallbackId != 0) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "UA_Server_run_shutdown shall be called before UA_Server_delete");
+
+    if(server->state != UA_LIFECYCLESTATE_STOPPED) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "The server must be fully stopped before it can be deleted");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     UA_LOCK(&server->serviceMutex);
@@ -242,8 +244,9 @@ void UA_Server_delete(UA_Server *server) {
     UA_LOCK_DESTROY(&server->serviceMutex);
 #endif
 
-    /* Delete the server itself */
+    /* Delete the server itself and return */
     UA_free(server);
+    return UA_STATUSCODE_GOOD;
 }
 
 /* Regular house-keeping tasks. Removing unused and timed-out channels and
@@ -783,6 +786,23 @@ UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
 
 #define UA_MAXTIMEOUT 200 /* Max timeout in ms between main-loop iterations */
 
+void
+setServerLifecycleState(UA_Server *server, UA_LifecycleState state) {
+    if(server->state == state)
+        return;
+    server->state = state;
+    if(server->config.notifyLifecycleState) {
+        UA_UNLOCK(&server->serviceMutex);
+        server->config.notifyLifecycleState(server, server->state);
+        UA_LOCK(&server->serviceMutex);
+    }
+}
+
+UA_LifecycleState
+UA_Server_getLifecycleState(UA_Server *server) {
+    return server->state;
+}
+
 /* Start: Spin up the workers and the network layer and sample the server's
  *        start time.
  * Iterate: Process repeated callbacks and events in the network layer. This
@@ -807,7 +827,7 @@ UA_Server_run_startup(UA_Server *server) {
                  "This should only be used for specific fuzzing builds.");
 #endif
 
-    if(server->state != UA_SERVERLIFECYCLE_STOPPED) {
+    if(server->state != UA_LIFECYCLESTATE_STOPPED) {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
                        "The server has already been started");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -850,9 +870,7 @@ UA_Server_run_startup(UA_Server *server) {
                             &server->pollingCallbackId);
     }
 
-    /* Set the server to STARTED.
-     * From here on, only use UA_Server_run_shutdown(server) to stop the server. */
-    server->state = UA_SERVERLIFECYCLE_STARTED;
+    /* <-- The point of no return for starting the server --> */
 
     /* Open server sockets */
     UA_Boolean haveServerSocket = false;
@@ -944,7 +962,10 @@ UA_Server_run_startup(UA_Server *server) {
     UA_DiscoveryManager_start(server);
 #endif
 
-    /* Unlock and return */
+    /* Set the server to STARTED. From here on, only use
+     * UA_Server_run_shutdown(server) to stop the server. */
+    setServerLifecycleState(server, UA_LIFECYCLESTATE_STARTED);
+
     UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
@@ -964,21 +985,36 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
     return (UA_UInt16)nextTimeout;
 }
 
+static UA_Boolean
+testShutdownCondition(UA_Server *server) {
+    /* Was there a wait time until the shutdown configured? */
+    if(server->endTime == 0)
+        return false;
+    return (UA_DateTime_now() > server->endTime);
+}
+
+static UA_Boolean
+testStoppedCondition(UA_Server *server) {
+    return true;
+}
+
 UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server) {
     if(server == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    if(server->state != UA_SERVERLIFECYCLE_STARTED) {
+    UA_LOCK(&server->serviceMutex);
+
+    if(server->state != UA_LIFECYCLESTATE_STARTED) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "The server is not started, cannot be shut down");
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_LOCK(&server->serviceMutex);
-
-    server->state = UA_SERVERLIFECYCLE_STOPPING;
+    /* Set to stopping and notify the application */
+    setServerLifecycleState(server, UA_LIFECYCLESTATE_STOPPING);
 
     /* Stop the regular housekeeping tasks */
     if(server->houseKeepingCallbackId != 0) {
@@ -1025,33 +1061,42 @@ UA_Server_run_shutdown(UA_Server *server) {
     UA_DiscoveryManager_stop(server);
 #endif
 
-    server->state = UA_SERVERLIFECYCLE_STOPPED;
+    /* Are we already stopped? */
+    if(testStoppedCondition(server)) {
+        setServerLifecycleState(server, UA_LIFECYCLESTATE_STOPPED);
+    }
 
-    UA_UNLOCK(&server->serviceMutex);
+    /* Only stop the EventLoop if it is coupled to the server lifecycle  */
+    if(server->config.externalEventLoop) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_GOOD;
+    }
 
-    /* Run the EventLoop to let the connections fully close. Unlock the server
-     * mutex as the EventLoop may call into the server. */
+    /* Iterate the EventLoop until the server is stopped */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_EventLoop *el = server->config.eventLoop;
-    if(server->config.externalEventLoop) {
-        el->run(el, 0); /* Run one iteration of the eventloop with a zero
-                         * timeout. This closes the connections fully. */
-    } else {
-        el->stop(el);
-        UA_StatusCode res = UA_STATUSCODE_GOOD;
-        while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
-              el->state != UA_EVENTLOOPSTATE_FRESH &&
-              res == UA_STATUSCODE_GOOD)
-            res = el->run(el, 100); /* Iterate until stopped */
+    while(!testStoppedCondition(server) &&
+          res == UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&server->serviceMutex);
+        res = el->run(el, 100);
+        UA_LOCK(&server->serviceMutex);
     }
 
-    return UA_STATUSCODE_GOOD;
-}
+    /* Stop the EventLoop. Iterate until stopped. */
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
+          el->state != UA_EVENTLOOPSTATE_FRESH &&
+          res == UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&server->serviceMutex);
+        res = el->run(el, 100);
+        UA_LOCK(&server->serviceMutex);
+    }
 
-static UA_Boolean
-testShutdownCondition(UA_Server *server) {
-    if(server->endTime == 0)
-        return false;
-    return (UA_DateTime_now() > server->endTime);
+    /* Set server lifecycle state to stopped if not already the case */
+    setServerLifecycleState(server, UA_LIFECYCLESTATE_STOPPED);
+
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
 }
 
 UA_StatusCode
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 4c22de10de6..cad0dc85693 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -73,12 +73,6 @@ typedef struct session_list_entry {
     UA_Session session;
 } session_list_entry;
 
-typedef enum {
-    UA_SERVERLIFECYCLE_STOPPED = 0,
-    UA_SERVERLIFECYCLE_STARTED,
-    UA_SERVERLIFECYCLE_STOPPING
-} UA_ServerLifecycle;
-
 /* Maximum numbers of sockets to listen on */
 #define UA_MAXSERVERCONNECTIONS 16
 
@@ -116,7 +110,7 @@ struct UA_Server {
     UA_DateTime endTime; /* Zeroed out. If a time is set, then the server shuts
                           * down once the time has been reached */
 
-    UA_ServerLifecycle state;
+    UA_LifecycleState state;
     UA_UInt64 houseKeepingCallbackId;
     UA_UInt64 pollingCallbackId; /* TODO: Move all subsystems that poll on the
                                   * network to a true EventLoop
@@ -310,6 +304,8 @@ UA_StatusCode UA_Server_editNode(UA_Server *server, UA_Session *session,
 /* Utility Functions */
 /*********************/
 
+void setServerLifecycleState(UA_Server *server, UA_LifecycleState state);
+
 void setupNs1Uri(UA_Server *server);
 UA_UInt16 addNamespace(UA_Server *server, const UA_String name);
 
diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
index c62b933ed5a..bdfc43ebc5e 100644
--- a/tests/pubsub/check_pubsub_udp_unicast.c
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -302,13 +302,11 @@ static void setup(void) {
 
 /* teardown() is to delete the environment set for test cases */
 static void teardown(void) {
-    /*Call server delete functions */
     UA_Server_run_shutdown(serverSubscriber);
-    UA_Server_delete(serverSubscriber);
-
-    /* Call server delete functions (this deletes the eventloop also used in the
-     * other server) */
     UA_Server_run_shutdown(serverPublisher);
+
+    /*Call server delete functions */
+    UA_Server_delete(serverSubscriber);
     UA_Server_delete(serverPublisher);
 }
 
diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
index 6300ebad190..0629c082fd8 100644
--- a/tests/server/check_server_reverseconnect.c
+++ b/tests/server/check_server_reverseconnect.c
@@ -78,6 +78,7 @@ static void teardown(void) {
         THREAD_JOIN(server_thread);
     }
 
+    UA_Server_run_shutdown(server);
     UA_Server_delete(server);
     UA_Client_delete(client);
 }

From 3ce079a075c5b5414b9ad261f815cf54beb0a423 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Apr 2023 21:09:28 +0200
Subject: [PATCH 0890/1963] refactor(server): Improve EventLoop use in
 UA_Server_run_iterate

---
 src/server/ua_server.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 189aa4b183d..2f457e7d3da 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -972,16 +972,20 @@ UA_Server_run_startup(UA_Server *server) {
 
 UA_UInt16
 UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
+    /* Make sure an EventLoop is configured */
+    UA_EventLoop *el = server->config.eventLoop;
+    if(!el)
+        return 0;
+
     /* Process timed and network events in the EventLoop */
     UA_UInt32 timeout = (waitInternal) ? UA_MAXTIMEOUT : 0;
-    server->config.eventLoop->run(server->config.eventLoop, timeout);
+    el->run(el, timeout);
 
     /* Return the time until the next scheduled callback */
-    UA_DateTime nextTimeout =
-        ((server->config.eventLoop->nextCyclicTime(server->config.eventLoop)
-         - UA_DateTime_nowMonotonic()) / UA_DATETIME_MSEC);
+    UA_DateTime now = el->dateTime_nowMonotonic(el);
+    UA_DateTime nextTimeout = (el->nextCyclicTime(el) - now) / UA_DATETIME_MSEC;
     if(nextTimeout > UA_UINT16_MAX)
-        return UA_UINT16_MAX;
+        nextTimeout = UA_UINT16_MAX;
     return (UA_UInt16)nextTimeout;
 }
 

From 1b7b6c88a5bdea482fa7db2deb90a0001ccb13df Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Apr 2023 23:10:40 +0200
Subject: [PATCH 0891/1963] feat(server): Introduce UA_ServerComponent
 structure

---
 src/server/ua_server.c          | 69 +++++++++++++++++++++++++++++++++
 src/server/ua_server_internal.h | 47 ++++++++++++++++++++++
 2 files changed, 116 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 2f457e7d3da..80f83731e7f 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -173,6 +173,59 @@ UA_Server_forEachChildNodeCall(UA_Server *server, UA_NodeId parentNodeId,
     return res;
 }
 
+/*********************/
+/* Server Components */
+/*********************/
+
+enum ZIP_CMP
+cmpServerComponent(const UA_UInt64 *a, const UA_UInt64 *b) {
+    if(*a == *b)
+        return ZIP_CMP_EQ;
+    return (*a < *b) ? ZIP_CMP_LESS : ZIP_CMP_MORE;
+}
+
+void
+addServerComponent(UA_Server *server, UA_ServerComponent *sc,
+                   UA_UInt64 *identifier) {
+    if(!sc)
+        return;
+
+    sc->identifier = ++server->serverComponentIds;
+    ZIP_INSERT(UA_ServerComponentTree, &server->serverComponents, sc);
+
+    /* Start the component if the server is started */
+    if(server->state == UA_LIFECYCLESTATE_STARTED && sc->start)
+        sc->start(server, sc);
+
+    if(identifier)
+        *identifier = sc->identifier;
+}
+
+static void *
+removeServerComponent(void *application, UA_ServerComponent *sc) {
+    UA_assert(sc->state == UA_LIFECYCLESTATE_STOPPED);
+    sc->free((UA_Server*)application, sc);
+    return NULL;
+}
+
+static void *
+startServerComponent(void *application, UA_ServerComponent *sc) {
+    sc->start((UA_Server*)application, sc);
+    return NULL;
+}
+
+static void *
+stopServerComponent(void *application, UA_ServerComponent *sc) {
+    sc->stop((UA_Server*)application, sc);
+    return NULL;
+}
+
+/* ZIP_ITER returns NULL only if all components are stopped */
+static void *
+checkServerComponent(void *application, UA_ServerComponent *sc) {
+    return (sc->state == UA_LIFECYCLESTATE_STOPPED) ? NULL : (void*)0x01;
+}
+
 /********************/
 /* Server Lifecycle */
 /********************/
@@ -235,6 +288,10 @@ UA_Server_delete(UA_Server *server) {
     /* Clean up the Admin Session */
     UA_Session_clear(&server->adminSession, server);
 
+    /* Remove all remaining server components (must be all stopped) */
+    ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
+             removeServerComponent, server);
+
     UA_UNLOCK(&server->serviceMutex); /* The timer has its own mutex */
 
     /* Clean up the config */
@@ -962,6 +1019,10 @@ UA_Server_run_startup(UA_Server *server) {
     UA_DiscoveryManager_start(server);
 #endif
 
+    /* Start all ServerComponents */
+    ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
+             startServerComponent, server);
+
     /* Set the server to STARTED. From here on, only use
      * UA_Server_run_shutdown(server) to stop the server. */
     setServerLifecycleState(server, UA_LIFECYCLESTATE_STARTED);
@@ -999,6 +1060,10 @@ testShutdownCondition(UA_Server *server) {
 
 static UA_Boolean
 testStoppedCondition(UA_Server *server) {
+    /* Check if there are remaining server components that did not fully stop */
+    if(ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
+                checkServerComponent, server) != NULL)
+        return false;
     return true;
 }
 
@@ -1053,6 +1118,10 @@ UA_Server_run_shutdown(UA_Server *server) {
     /* Stop all SecureChannels */
     UA_Server_deleteSecureChannels(server);
 
+    /* Stop all ServerComponents */
+    ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
+             stopServerComponent, server);
+
     /* Stop all server sockets */
     for(size_t i = 0; i < UA_MAXSERVERCONNECTIONS; i++) {
         UA_ServerConnection *sc = &server->serverConnections[i];
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index cad0dc85693..ed4e8723fbc 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -52,6 +52,50 @@ typedef struct {
 
 #endif
 
+/* Server Component
+ * ----------------
+ *
+ * ServerComponents have an explicit lifecycle. But they can only be started
+ * when the underlying server is started. The starting/stopping of
+ * ServerComponents is asynchronous. That is, they might require several
+ * iterations of the EventLoop to finish starting/stopping.
+ *
+ * ServerComponents can only be deleted when they are STOPPED. The server will
+ * not fully shut down as long as there is a component remaining. */
+
+typedef struct UA_ServerComponent {
+    UA_UInt64 identifier;
+    ZIP_ENTRY(UA_ServerComponent) treeEntry;
+    UA_LifecycleState state;
+
+    /* Starting fails if the server is not also already started */
+    UA_StatusCode (*start)(UA_Server *server,
+                           struct UA_ServerComponent *sc);
+
+    /* Stopping is asynchronous and might need a few iterations of the main-loop
+     * to succeed. */
+    void (*stop)(UA_Server *server,
+                 struct UA_ServerComponent *sc);
+
+    /* Clean up the ServerComponent. Can fail if it is not stopped. */
+    UA_StatusCode (*free)(UA_Server *server,
+                          struct UA_ServerComponent *sc);
+} UA_ServerComponent;
+
+enum ZIP_CMP
+cmpServerComponent(const UA_UInt64 *a, const UA_UInt64 *b);
+
+typedef ZIP_HEAD(UA_ServerComponentTree, UA_ServerComponent) UA_ServerComponentTree;
+
+ZIP_FUNCTIONS(UA_ServerComponentTree, UA_ServerComponent, treeEntry,
+              UA_UInt64, identifier, cmpServerComponent)
+
+/* Assigns the identifier if the pointer is non-NULL.
+ * Starts the component if the server is started. */
+void
+addServerComponent(UA_Server *server, UA_ServerComponent *sc,
+                   UA_UInt64 *identifier);
+
 typedef enum {
     UA_DIAGNOSTICEVENT_CLOSE,
     UA_DIAGNOSTICEVENT_REJECT,
@@ -116,6 +160,9 @@ struct UA_Server {
                                   * network to a true EventLoop
                                   * implementation */
 
+    UA_UInt64 serverComponentIds; /* Counter to assign ids from */
+    UA_ServerComponentTree serverComponents;
+
     UA_ServerConnection serverConnections[UA_MAXSERVERCONNECTIONS];
     size_t serverConnectionsSize;
 

From 775bb4e75fd17fc02ae2b39fbd20a5ccd365d955 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Apr 2023 15:23:58 +0200
Subject: [PATCH 0892/1963] refactor(server): Make Discovery a freestanding
 ServerComponent

---
 CMakeLists.txt                               |   2 +-
 src/server/ua_discovery_manager.c            | 145 +++++++++++++------
 src/server/ua_discovery_manager.h            |  22 +--
 src/server/ua_server.c                       |  18 +--
 src/server/ua_server_discovery_mdns.c        | 110 +++++++++-----
 src/server/ua_server_internal.h              |   8 +-
 src/server/ua_services_discovery.c           |  59 ++++----
 src/server/ua_services_discovery_multicast.c | 112 ++++++++------
 8 files changed, 283 insertions(+), 193 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 859fadd8bd3..ae7308a5c2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1148,7 +1148,7 @@ if(UA_ENABLE_HISTORIZING)
 endif()
 
 if(UA_ENABLE_DISCOVERY)
-    list(INSERT internal_headers 13 ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.h)
+    list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.h)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.c)
 endif()
 
diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index 4dcc5514e41..c7d84d41461 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -11,37 +11,23 @@
  *    Copyright 2017 (c) Julian Grothoff
  */
 
+#include "ua_discovery_manager.h"
 #include "ua_server_internal.h"
 
 #ifdef UA_ENABLE_DISCOVERY
 
-void
-UA_DiscoveryManager_init(UA_DiscoveryManager *dm) {
-    LIST_INIT(&dm->registeredServers);
-    dm->registeredServersSize = 0;
-    LIST_INIT(&dm->periodicServerRegisterCallbacks);
-    dm->registerServerCallback = NULL;
-    dm->registerServerCallbackData = NULL;
-
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    dm->mdnsDaemon = NULL;
-    dm->mdnsSocket = UA_INVALID_SOCKET;
-    dm->mdnsMainSrvAdded = false;
-    dm->selfFqdnMdnsRecord = UA_STRING_NULL;
-
-    LIST_INIT(&dm->serverOnNetwork);
-    dm->serverOnNetworkRecordIdCounter = 0;
-    dm->serverOnNetworkRecordIdLastReset = UA_DateTime_now();
-    memset(dm->serverOnNetworkHash, 0,
-           sizeof(struct serverOnNetwork_hash_entry*) * SERVER_ON_NETWORK_HASH_SIZE);
+static UA_StatusCode
+UA_DiscoveryManager_free(UA_Server *server,
+                         struct UA_ServerComponent *sc) {
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)sc;
 
-    dm->serverOnNetworkCallback = NULL;
-    dm->serverOnNetworkCallbackData = NULL;
-#endif /* UA_ENABLE_DISCOVERY_MULTICAST */
-}
+    if(sc->state != UA_LIFECYCLESTATE_STOPPED) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "Cannot delete the DiscoveryManager because "
+                     "it is not stopped");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
-void
-UA_DiscoveryManager_clear(UA_DiscoveryManager *dm) {
     registeredServer_list_entry *rs, *rs_tmp;
     LIST_FOREACH_SAFE(rs, &dm->registeredServers, pointers, rs_tmp) {
         LIST_REMOVE(rs, pointers);
@@ -77,40 +63,27 @@ UA_DiscoveryManager_clear(UA_DiscoveryManager *dm) {
             currHash = nextHash;
         }
     }
-
 # endif /* UA_ENABLE_DISCOVERY_MULTICAST */
-}
-
-void
-UA_DiscoveryManager_start(UA_Server *server) {
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    if(server->config.mdnsEnabled)
-        startMulticastDiscoveryServer(server);
-#endif
-}
 
-void
-UA_DiscoveryManager_stop(UA_Server *server) {
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    if(server->config.mdnsEnabled)
-        stopMulticastDiscoveryServer(server);
-#endif
+    UA_free(dm);
+    return UA_STATUSCODE_GOOD;
 }
 
 /* Cleanup server registration: If the semaphore file path is set, then it just
  * checks the existence of the file. When it is deleted, the registration is
  * removed. If there is no semaphore file, then the registration will be removed
  * if it is older than 60 minutes. */
-void
+static void
 UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
-                                    UA_DateTime nowMonotonic) {
+                                    void *data) {
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)data;
+
     /* TimedOut gives the last DateTime at which we must have seen the
      * registered server. Otherwise it is timed out. */
-    UA_DateTime timedOut = nowMonotonic;
+    UA_DateTime timedOut = UA_DateTime_nowMonotonic();
     if(server->config.discoveryCleanupTimeout)
         timedOut -= server->config.discoveryCleanupTimeout * UA_DATETIME_SEC;
 
-    UA_DiscoveryManager *dm = &server->discoveryManager;
     registeredServer_list_entry *current, *temp;
     LIST_FOREACH_SAFE(current, &dm->registeredServers, pointers, temp) {
         UA_Boolean semaphoreDeleted = false;
@@ -154,9 +127,89 @@ UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
             LIST_REMOVE(current, pointers);
             UA_RegisteredServer_clear(&current->registeredServer);
             UA_free(current);
-            server->discoveryManager.registeredServersSize--;
+            dm->registeredServersSize--;
         }
     }
 }
 
+static UA_StatusCode
+UA_DiscoveryManager_start(UA_Server *server,
+                          struct UA_ServerComponent *sc) {
+    if(sc->state != UA_LIFECYCLESTATE_STOPPED)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)sc;
+    UA_StatusCode res = addRepeatedCallback(server, UA_DiscoveryManager_cleanupTimedOut,
+                                            dm, 1000.0, &dm->discoveryCallbackId);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    if(server->config.mdnsEnabled)
+        startMulticastDiscoveryServer(server);
+#endif
+
+    sc->state = UA_LIFECYCLESTATE_STARTED;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+UA_DiscoveryManager_stop(UA_Server *server,
+                         struct UA_ServerComponent *sc) {
+    if(sc->state != UA_LIFECYCLESTATE_STARTED)
+        return;
+
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)sc;
+    removeCallback(server, dm->discoveryCallbackId);
+
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    if(server->config.mdnsEnabled)
+        stopMulticastDiscoveryServer(server);
+#endif
+
+    sc->state = UA_LIFECYCLESTATE_STOPPED;
+}
+
+UA_ServerComponent *
+UA_DiscoveryManager_new(UA_Server *server) {
+    /* There can be only one DiscoveryManager per server */
+    if(server->discoveryManager)
+        return NULL;
+
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        UA_calloc(1, sizeof(UA_DiscoveryManager));
+    if(!dm)
+        return NULL;
+
+    LIST_INIT(&dm->registeredServers);
+    dm->registeredServersSize = 0;
+    LIST_INIT(&dm->periodicServerRegisterCallbacks);
+    dm->registerServerCallback = NULL;
+    dm->registerServerCallbackData = NULL;
+
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    dm->mdnsDaemon = NULL;
+    dm->mdnsSocket = UA_INVALID_SOCKET;
+    dm->mdnsMainSrvAdded = false;
+    dm->selfFqdnMdnsRecord = UA_STRING_NULL;
+
+    LIST_INIT(&dm->serverOnNetwork);
+    dm->serverOnNetworkRecordIdCounter = 0;
+    dm->serverOnNetworkRecordIdLastReset = UA_DateTime_now();
+    memset(dm->serverOnNetworkHash, 0,
+           sizeof(struct serverOnNetwork_hash_entry*) * SERVER_ON_NETWORK_HASH_SIZE);
+
+    dm->serverOnNetworkCallback = NULL;
+    dm->serverOnNetworkCallbackData = NULL;
+#endif /* UA_ENABLE_DISCOVERY_MULTICAST */
+
+    /* Register in the server */
+    server->discoveryManager = dm;
+
+    dm->sc.start = UA_DiscoveryManager_start;
+    dm->sc.stop = UA_DiscoveryManager_stop;
+    dm->sc.free = UA_DiscoveryManager_free;
+    return &dm->sc;
+}
+
 #endif /* UA_ENABLE_DISCOVERY */
diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index a46454068de..ad7c0aa0a3d 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -14,9 +14,7 @@
 #ifndef UA_DISCOVERY_MANAGER_H_
 #define UA_DISCOVERY_MANAGER_H_
 
-#include <open62541/server.h>
-
-#include "open62541_queue.h"
+#include "ua_server_internal.h"
 
 _UA_BEGIN_DECLS
 
@@ -73,7 +71,11 @@ typedef struct serverOnNetwork_hash_entry {
 
 #endif
 
-typedef struct {
+struct UA_DiscoveryManager {
+    UA_ServerComponent sc;
+
+    UA_UInt64 discoveryCallbackId;
+
     LIST_HEAD(, periodicServerRegisterCallback_entry) periodicServerRegisterCallbacks;
     LIST_HEAD(, registeredServer_list_entry) registeredServers;
     size_t registeredServersSize;
@@ -102,17 +104,7 @@ typedef struct {
 
     UA_UInt64 mdnsCallbackId;
 # endif /* UA_ENABLE_DISCOVERY_MULTICAST */
-} UA_DiscoveryManager;
-
-void UA_DiscoveryManager_init(UA_DiscoveryManager *dm);
-void UA_DiscoveryManager_clear(UA_DiscoveryManager *dm);
-void UA_DiscoveryManager_start(UA_Server *server);
-void UA_DiscoveryManager_stop(UA_Server *server);
-
-/* Checks if a registration timed out and removes that registration.
- * Should be called periodically in main loop */
-void UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
-                                         UA_DateTime nowMonotonic);
+};
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
 
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 80f83731e7f..f0e5dea8953 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -277,10 +277,6 @@ UA_Server_delete(UA_Server *server) {
     UA_PubSubManager_delete(server, &server->pubSubManager);
 #endif
 
-#ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager_clear(&server->discoveryManager);
-#endif
-
 #if UA_MULTITHREADING >= 100
     UA_AsyncManager_clear(&server->asyncManager, server);
 #endif
@@ -314,9 +310,6 @@ serverHouseKeeping(UA_Server *server, void *_) {
     UA_DateTime nowMonotonic = UA_DateTime_nowMonotonic();
     UA_Server_cleanupSessions(server, nowMonotonic);
     UA_Server_cleanupTimedOutSecureChannels(server, nowMonotonic);
-#ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager_cleanupTimedOut(server, nowMonotonic);
-#endif
     UA_UNLOCK(&server->serviceMutex);
 }
 
@@ -400,7 +393,7 @@ UA_Server_init(UA_Server *server) {
 
     /* Initialized discovery */
 #ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager_init(&server->discoveryManager);
+    addServerComponent(server, UA_DiscoveryManager_new(server), NULL);
 #endif
 
     /* Initialize namespace 0*/
@@ -1014,11 +1007,6 @@ UA_Server_run_startup(UA_Server *server) {
         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STARTTIME);
     writeValueAttribute(server, startTime, &var);
 
-    /* Start the multicast discovery server */
-#ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager_start(server);
-#endif
-
     /* Start all ServerComponents */
     ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
              startServerComponent, server);
@@ -1130,10 +1118,6 @@ UA_Server_run_shutdown(UA_Server *server) {
             cm->closeConnection(cm, sc->connectionId);
     }
 
-#ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager_stop(server);
-#endif
-
     /* Are we already stopped? */
     if(testStoppedCondition(server)) {
         setServerLifecycleState(server, UA_LIFECYCLESTATE_STOPPED);
diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_server_discovery_mdns.c
index b8aa9460f21..dac73426a9e 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_server_discovery_mdns.c
@@ -6,6 +6,7 @@
  *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  */
 
+#include "ua_discovery_manager.h"
 #include "ua_server_internal.h"
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
@@ -34,8 +35,12 @@
 static struct serverOnNetwork_list_entry *
 mdns_record_add_or_get(UA_Server *server, const char *record, const char *serverName,
                        size_t serverNameLen, UA_Boolean createNew) {
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return NULL;
+
     UA_UInt32 hashIdx = UA_ByteString_hash(0, (const UA_Byte*)record, strlen(record)) % SERVER_ON_NETWORK_HASH_SIZE;
-    struct serverOnNetwork_hash_entry *hash_entry = server->discoveryManager.serverOnNetworkHash[hashIdx];
+    struct serverOnNetwork_hash_entry *hash_entry = dm->serverOnNetworkHash[hashIdx];
 
     while(hash_entry) {
         size_t maxLen;
@@ -63,8 +68,15 @@ mdns_record_add_or_get(UA_Server *server, const char *record, const char *server
 
 
 UA_StatusCode
-UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord, const char *serverName,
-                                               size_t serverNameLen, struct serverOnNetwork_list_entry **addedEntry) {
+UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server,
+                                               const char *fqdnMdnsRecord,
+                                               const char *serverName,
+                                               size_t serverNameLen,
+                                               struct serverOnNetwork_list_entry **addedEntry) {
+
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
     struct serverOnNetwork_list_entry *entry =
             mdns_record_add_or_get(server, fqdnMdnsRecord, serverName,
@@ -77,18 +89,19 @@ UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fq
 
 
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Multicast DNS: Add entry to ServersOnNetwork: %s (%*.s)", fqdnMdnsRecord, (int)serverNameLen, serverName);
+                "Multicast DNS: Add entry to ServersOnNetwork: %s (%*.s)",
+                 fqdnMdnsRecord, (int)serverNameLen, serverName);
 
     struct serverOnNetwork_list_entry *listEntry = (serverOnNetwork_list_entry*)
             UA_malloc(sizeof(struct serverOnNetwork_list_entry));
-    if (!listEntry)
+    if(!listEntry)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     listEntry->created = UA_DateTime_now();
     listEntry->pathTmp = NULL;
     listEntry->txtSet = false;
     listEntry->srvSet = false;
     UA_ServerOnNetwork_init(&listEntry->serverOnNetwork);
-    listEntry->serverOnNetwork.recordId = server->discoveryManager.serverOnNetworkRecordIdCounter;
+    listEntry->serverOnNetwork.recordId = dm->serverOnNetworkRecordIdCounter;
     listEntry->serverOnNetwork.serverName.data = (UA_Byte*)UA_malloc(serverNameLen);
     if (!listEntry->serverOnNetwork.serverName.data) {
         UA_free(listEntry);
@@ -96,9 +109,9 @@ UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fq
     }
     listEntry->serverOnNetwork.serverName.length = serverNameLen;
     memcpy(listEntry->serverOnNetwork.serverName.data, serverName, serverNameLen);
-    server->discoveryManager.serverOnNetworkRecordIdCounter++;
-    if(server->discoveryManager.serverOnNetworkRecordIdCounter == 0)
-        server->discoveryManager.serverOnNetworkRecordIdLastReset = UA_DateTime_now();
+    dm->serverOnNetworkRecordIdCounter++;
+    if(dm->serverOnNetworkRecordIdCounter == 0)
+        dm->serverOnNetworkRecordIdLastReset = UA_DateTime_now();
     listEntry->lastSeen = UA_DateTime_nowMonotonic();
 
     /* add to hash */
@@ -110,13 +123,12 @@ UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fq
         UA_free(listEntry);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    newHashEntry->next = server->discoveryManager.serverOnNetworkHash[hashIdx];
-    server->discoveryManager.serverOnNetworkHash[hashIdx] = newHashEntry;
+    newHashEntry->next = dm->serverOnNetworkHash[hashIdx];
+    dm->serverOnNetworkHash[hashIdx] = newHashEntry;
     newHashEntry->entry = listEntry;
 
-    LIST_INSERT_HEAD(&server->discoveryManager.serverOnNetwork, listEntry, pointers);
-
-    if (addedEntry != NULL)
+    LIST_INSERT_HEAD(&dm->serverOnNetwork, listEntry, pointers);
+    if(addedEntry != NULL)
         *addedEntry = listEntry;
 
     return UA_STATUSCODE_GOOD;
@@ -171,16 +183,23 @@ getInterfaces(const UA_Server *server) {
 #endif /* _WIN32 */
 
 UA_StatusCode
-UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord, const char *serverName,
+UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server,
+                                                    const char *fqdnMdnsRecord,
+                                                    const char *serverName,
                                                     size_t serverNameLen) {
 
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "Multicast DNS: Remove entry from ServersOnNetwork: %s (%*.s)", fqdnMdnsRecord, (int)serverNameLen, serverName);
+                 "Multicast DNS: Remove entry from ServersOnNetwork: %s (%*.s)",
+                 fqdnMdnsRecord, (int)serverNameLen, serverName);
 
     struct serverOnNetwork_list_entry *entry =
             mdns_record_add_or_get(server, fqdnMdnsRecord, serverName,
                                    serverNameLen, false);
-    if (!entry)
+    if(!entry)
         return UA_STATUSCODE_BADNOTFOUND;
 
     UA_String recordStr;
@@ -190,13 +209,14 @@ UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const cha
     recordStr.length = strlen(fqdnMdnsRecord);
 
     /* remove from hash */
-    UA_UInt32 hashIdx = UA_ByteString_hash(0, (const UA_Byte*)recordStr.data, recordStr.length) % SERVER_ON_NETWORK_HASH_SIZE;
-    struct serverOnNetwork_hash_entry *hash_entry = server->discoveryManager.serverOnNetworkHash[hashIdx];
+    UA_UInt32 hashIdx = UA_ByteString_hash(0, (const UA_Byte*)recordStr.data,
+                                           recordStr.length) % SERVER_ON_NETWORK_HASH_SIZE;
+    struct serverOnNetwork_hash_entry *hash_entry = dm->serverOnNetworkHash[hashIdx];
     struct serverOnNetwork_hash_entry *prevEntry = hash_entry;
     while(hash_entry) {
         if(hash_entry->entry == entry) {
-            if(server->discoveryManager.serverOnNetworkHash[hashIdx] == hash_entry)
-                server->discoveryManager.serverOnNetworkHash[hashIdx] = hash_entry->next;
+            if(dm->serverOnNetworkHash[hashIdx] == hash_entry)
+                dm->serverOnNetworkHash[hashIdx] = hash_entry->next;
             else if(prevEntry)
                 prevEntry->next = hash_entry->next;
             break;
@@ -206,10 +226,11 @@ UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const cha
     }
     UA_free(hash_entry);
 
-    if(server->discoveryManager.serverOnNetworkCallback &&
-        !UA_String_equal(&server->discoveryManager.selfFqdnMdnsRecord, &recordStr))
-        server->discoveryManager.serverOnNetworkCallback(&entry->serverOnNetwork, false,
-                                    entry->txtSet, server->discoveryManager.serverOnNetworkCallbackData);
+    if(dm->serverOnNetworkCallback &&
+        !UA_String_equal(&dm->selfFqdnMdnsRecord, &recordStr))
+        dm->serverOnNetworkCallback(&entry->serverOnNetwork, false,
+                                    entry->txtSet,
+                                    dm->serverOnNetworkCallbackData);
 
     /* Remove from list */
     LIST_REMOVE(entry, pointers);
@@ -329,6 +350,10 @@ setSrv(UA_Server *server, const struct resource *r,
 void
 mdns_record_received(const struct resource *r, void *data) {
     UA_Server *server = (UA_Server *) data;
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return;
+
     /* we only need SRV and TXT records */
     /* TODO: remove magic number */
     if((r->clazz != QCLASS_IN && r->clazz != QCLASS_IN + 32768) ||
@@ -343,10 +368,9 @@ mdns_record_received(const struct resource *r, void *data) {
     UA_String recordStr;
     recordStr.data = (UA_Byte*)r->name;
     recordStr.length = strlen(r->name);
-    UA_Boolean isSelfAnnounce = UA_String_equal(&server->discoveryManager.selfFqdnMdnsRecord, &recordStr);
-    if (isSelfAnnounce)
-        // ignore itself
-        return;
+    UA_Boolean isSelfAnnounce = UA_String_equal(&dm->selfFqdnMdnsRecord, &recordStr);
+    if(isSelfAnnounce)
+        return; // ignore itself
 
     /* Compute the length of the servername */
     size_t servernameLen = (size_t) (opcStr - r->name);
@@ -378,10 +402,9 @@ mdns_record_received(const struct resource *r, void *data) {
     if(entry->txtSet && entry->srvSet) {
         // call callback for every mdns package we received.
         // This will also call the callback multiple times
-        if (server->discoveryManager.serverOnNetworkCallback)
-            server->discoveryManager.
-                serverOnNetworkCallback(&entry->serverOnNetwork, true, entry->txtSet,
-                                        server->discoveryManager.serverOnNetworkCallbackData);
+        if(dm->serverOnNetworkCallback)
+            dm->serverOnNetworkCallback(&entry->serverOnNetwork, true, entry->txtSet,
+                                        dm->serverOnNetworkCallbackData);
         return;
     }
 
@@ -392,17 +415,20 @@ mdns_record_received(const struct resource *r, void *data) {
         setSrv(server, r, entry);
 
     /* Call callback to announce a new server */
-    if(entry->srvSet && server->discoveryManager.serverOnNetworkCallback)
-        server->discoveryManager.
-            serverOnNetworkCallback(&entry->serverOnNetwork, true, entry->txtSet,
-                                    server->discoveryManager.serverOnNetworkCallbackData);
+    if(entry->srvSet && dm->serverOnNetworkCallback)
+        dm->serverOnNetworkCallback(&entry->serverOnNetwork, true, entry->txtSet,
+                                    dm->serverOnNetworkCallbackData);
 }
 
 void
 mdns_create_txt(UA_Server *server, const char *fullServiceDomain, const char *path,
                 const UA_String *capabilites, const size_t capabilitiesSize,
                 void (*conflict)(char *host, int type, void *arg)) {
-    mdns_record_t *r = mdnsd_unique(server->discoveryManager.mdnsDaemon, fullServiceDomain,
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return;
+
+    mdns_record_t *r = mdnsd_unique(dm->mdnsDaemon, fullServiceDomain,
                                     QTYPE_TXT, 600, conflict, server);
     xht_t *h = xht_new(11);
     char *allocPath = NULL;
@@ -466,7 +492,7 @@ mdns_create_txt(UA_Server *server, const char *fullServiceDomain, const char *pa
     if(caps)
         UA_free(caps);
     xht_free(h);
-    mdnsd_set_raw(server->discoveryManager.mdnsDaemon, r, (char *) packet,
+    mdnsd_set_raw(dm->mdnsDaemon, r, (char *) packet,
                   (unsigned short) txtRecordLength);
     UA_free(packet);
 }
@@ -564,6 +590,10 @@ void mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
 void
 mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
                         const char *localDomain) {
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return;
+
     struct ifaddrs *ifaddr;
     struct ifaddrs *ifa;
     if(getifaddrs(&ifaddr) == -1) {
@@ -586,7 +616,7 @@ mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
         /* IPv4 */
         if(ifa->ifa_addr->sa_family == AF_INET) {
             struct sockaddr_in* sa = (struct sockaddr_in*) ifa->ifa_addr;
-            mdns_set_address_record_if(&server->discoveryManager, fullServiceDomain,
+            mdns_set_address_record_if(dm, fullServiceDomain,
                                        localDomain, (char*)&sa->sin_addr.s_addr, 4);
         }
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index ed4e8723fbc..9a8e228cd16 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -35,7 +35,8 @@ _UA_BEGIN_DECLS
 #endif
 
 #ifdef UA_ENABLE_DISCOVERY
-#include "ua_discovery_manager.h"
+struct UA_DiscoveryManager;
+typedef struct UA_DiscoveryManager UA_DiscoveryManager;
 #endif
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
@@ -196,7 +197,7 @@ struct UA_Server {
 
     /* Discovery */
 #ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager discoveryManager;
+    UA_DiscoveryManager *discoveryManager;
 #endif
 
     /* Subscriptions */
@@ -603,6 +604,9 @@ addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
                     void *data, UA_Double interval_ms, UA_UInt64 *callbackId);
 
 #ifdef UA_ENABLE_DISCOVERY
+UA_ServerComponent *
+UA_DiscoveryManager_new(UA_Server *server);
+
 UA_StatusCode
 register_server_with_discovery_server(UA_Server *server, void *client,
                                       const UA_Boolean isUnregister,
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 281b0c16ef2..eceb102db24 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -12,6 +12,7 @@
  */
 
 #include "ua_server_internal.h"
+#include "ua_discovery_manager.h"
 #include "ua_services.h"
 
 #ifdef UA_ENABLE_DISCOVERY
@@ -110,7 +111,6 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
     }
 
 #ifndef UA_ENABLE_DISCOVERY
-
     if(!foundSelf)
         return;
 
@@ -122,11 +122,15 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
         return;
 
     response->serversSize = 1;
-
 #else
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm) {
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+        return;
+    }
 
     /* Allocate enough memory, including memory for the "self" response */
-    size_t maxResults = server->discoveryManager.registeredServersSize + 1;
+    size_t maxResults = dm->registeredServersSize + 1;
     response->servers = (UA_ApplicationDescription*)
         UA_Array_new(maxResults, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
     if(!response->servers) {
@@ -141,7 +145,7 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
                                        &response->servers[pos++]);
 
     registeredServer_list_entry* current;
-    LIST_FOREACH(current, &server->discoveryManager.registeredServers, pointers) {
+    LIST_FOREACH(current, &dm->registeredServers, pointers) {
         UA_Boolean usable = (request->serverUrisSize == 0);
         if(!usable) {
             /* If client only requested a specific set of servers */
@@ -272,10 +276,14 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
                        UA_DiagnosticInfo *responseDiagnosticInfos) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return;
+
     /* Find the server from the request in the registered list */
     registeredServer_list_entry* current;
     registeredServer_list_entry *registeredServer_entry = NULL;
-    LIST_FOREACH(current, &server->discoveryManager.registeredServers, pointers) {
+    LIST_FOREACH(current, &dm->registeredServers, pointers) {
         if(UA_String_equal(&current->registeredServer.serverUri, &requestServer->serverUri)) {
             registeredServer_entry = current;
             break;
@@ -371,11 +379,10 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
             return;
         }
 
-        if(server->discoveryManager.registerServerCallback) {
+        if(dm->registerServerCallback) {
             UA_UNLOCK(&server->serviceMutex);
-            server->discoveryManager.
-                    registerServerCallback(requestServer,
-                                           server->discoveryManager.registerServerCallbackData);
+            dm->registerServerCallback(requestServer,
+                                       dm->registerServerCallbackData);
             UA_LOCK(&server->serviceMutex);
         }
 
@@ -383,7 +390,7 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
         LIST_REMOVE(registeredServer_entry, pointers);
         UA_RegisteredServer_clear(&registeredServer_entry->registeredServer);
         UA_free(registeredServer_entry);
-        server->discoveryManager.registeredServersSize--;
+        dm->registeredServersSize--;
         responseHeader->serviceResult = UA_STATUSCODE_GOOD;
         return;
     }
@@ -401,9 +408,9 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
             return;
         }
 
-        LIST_INSERT_HEAD(&server->discoveryManager.registeredServers,
+        LIST_INSERT_HEAD(&dm->registeredServers,
                          registeredServer_entry, pointers);
-        server->discoveryManager.registeredServersSize++;
+        dm->registeredServersSize++;
     } else {
         UA_RegisteredServer_clear(&registeredServer_entry->registeredServer);
     }
@@ -412,11 +419,10 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
     // Previously we only called it if it was a new register call. It may be the case that this endpoint
     // registered before, then crashed, restarts and registeres again. In that case the entry is not deleted
     // and the callback would not be called.
-    if(server->discoveryManager.registerServerCallback) {
+    if(dm->registerServerCallback) {
         UA_UNLOCK(&server->serviceMutex);
-        server->discoveryManager.
-                registerServerCallback(requestServer,
-                                       server->discoveryManager.registerServerCallbackData);
+        dm->registerServerCallback(requestServer,
+                                   dm->registerServerCallbackData);
         UA_LOCK(&server->serviceMutex);
     }
 
@@ -533,6 +539,12 @@ UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
                                             UA_UInt64 *periodicCallbackId) {
     UA_LOCK(&server->serviceMutex);
 
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     /* No valid server URL */
     if(!discoveryServerUrl) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -549,8 +561,7 @@ UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
     /* Check if we are already registering with the given discovery url and
      * remove the old periodic call */
     periodicServerRegisterCallback_entry *rs, *rs_tmp;
-    LIST_FOREACH_SAFE(rs, &server->discoveryManager.
-                      periodicServerRegisterCallbacks, pointers, rs_tmp) {
+    LIST_FOREACH_SAFE(rs, &dm->periodicServerRegisterCallbacks, pointers, rs_tmp) {
         if(strcmp(rs->callback->discovery_server_url, discoveryServerUrl) == 0) {
             UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
                         "There is already a register callback for '%s' in place. "
@@ -612,7 +623,7 @@ UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
     newEntry->callback = cb;
-    LIST_INSERT_HEAD(&server->discoveryManager.periodicServerRegisterCallbacks, newEntry, pointers);
+    LIST_INSERT_HEAD(&dm->periodicServerRegisterCallbacks, newEntry, pointers);
 #endif
 
     if(periodicCallbackId)
@@ -621,14 +632,4 @@ UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
     return UA_STATUSCODE_GOOD;
 }
 
-void
-UA_Server_setRegisterServerCallback(UA_Server *server,
-                                    UA_Server_registerServerCallback cb,
-                                    void* data) {
-    UA_LOCK(&server->serviceMutex);
-    server->discoveryManager.registerServerCallback = cb;
-    server->discoveryManager.registerServerCallbackData = data;
-    UA_UNLOCK(&server->serviceMutex);
-}
-
 #endif /* UA_ENABLE_DISCOVERY */
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index 9e171d1ef9a..31e413461bd 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -8,6 +8,7 @@
  */
 
 #include "ua_server_internal.h"
+#include "ua_discovery_manager.h"
 #include "ua_services.h"
 
 #if defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST)
@@ -47,16 +48,19 @@ discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg);
 
 static void
 multicastPolling(UA_Server *server, void *_) {
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return;
+
     struct timeval next_sleep = {.tv_sec = 0, .tv_usec = 0};
     fd_set fds;
     FD_ZERO(&fds);
-    UA_fd_set(server->discoveryManager.mdnsSocket, &fds);
-    select(server->discoveryManager.mdnsSocket + 1, &fds, 0, 0, &next_sleep);
+    UA_fd_set(dm->mdnsSocket, &fds);
+    select(dm->mdnsSocket + 1, &fds, 0, 0, &next_sleep);
 
     unsigned short retVal =
-        mdnsd_step(server->discoveryManager.mdnsDaemon,
-                   server->discoveryManager.mdnsSocket,
-                   FD_ISSET(server->discoveryManager.mdnsSocket, &fds),
+        mdnsd_step(dm->mdnsDaemon, dm->mdnsSocket,
+                   FD_ISSET(dm->mdnsSocket, &fds),
                    true, &next_sleep);
     if(retVal == 1) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -183,9 +187,12 @@ discovery_createMulticastSocket(UA_Server* server) {
 void
 startMulticastDiscoveryServer(UA_Server *server) {
     /* Initialize the mdns daemon */
-    UA_DiscoveryManager *dm = &server->discoveryManager;
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return;
+
     if(!dm->mdnsDaemon) {
-        server->discoveryManager.mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
+        dm->mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
         mdnsd_register_receive_callback(dm->mdnsDaemon,
                                         mdns_record_received, server);
     }
@@ -245,7 +252,10 @@ stopMulticastDiscoveryServer(UA_Server *server) {
     }
 
     /* Stop the cyclic polling callback */
-    UA_DiscoveryManager *dm = &server->discoveryManager;
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return;
+
     if(dm->mdnsCallbackId != 0) {
         UA_EventLoop *el = server->config.eventLoop;
         if(el) {
@@ -298,6 +308,12 @@ Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
                              UA_FindServersOnNetworkResponse *response) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm) {
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+        return;
+    }
+
     if(!server->config.mdnsEnabled) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTIMPLEMENTED;
         return;
@@ -305,13 +321,12 @@ Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
 
     /* Set LastCounterResetTime */
     response->lastCounterResetTime =
-        server->discoveryManager.serverOnNetworkRecordIdLastReset;
+        dm->serverOnNetworkRecordIdLastReset;
 
     /* Compute the max number of records to return */
     UA_UInt32 recordCount = 0;
-    if(request->startingRecordId < server->discoveryManager.serverOnNetworkRecordIdCounter)
-        recordCount = server->discoveryManager.serverOnNetworkRecordIdCounter -
-            request->startingRecordId;
+    if(request->startingRecordId < dm->serverOnNetworkRecordIdCounter)
+        recordCount = dm->serverOnNetworkRecordIdCounter - request->startingRecordId;
     if(request->maxRecordsToReturn && recordCount > request->maxRecordsToReturn)
         recordCount = UA_MIN(recordCount, request->maxRecordsToReturn);
     if(recordCount == 0) {
@@ -323,7 +338,7 @@ Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
     UA_UInt32 filteredCount = 0;
     UA_STACKARRAY(UA_ServerOnNetwork*, filtered, recordCount);
     serverOnNetwork_list_entry* current;
-    LIST_FOREACH(current, &server->discoveryManager.serverOnNetwork, pointers) {
+    LIST_FOREACH(current, &dm->serverOnNetwork, pointers) {
         if(filteredCount >= recordCount)
             break;
         if(current->serverOnNetwork.recordId < request->startingRecordId)
@@ -402,8 +417,11 @@ UA_Server_setServerOnNetworkCallback(UA_Server *server,
                                      UA_Server_serverOnNetworkCallback cb,
                                      void* data) {
     UA_LOCK(&server->serviceMutex);
-    server->discoveryManager.serverOnNetworkCallback = cb;
-    server->discoveryManager.serverOnNetworkCallbackData = data;
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(dm) {
+        dm->serverOnNetworkCallback = cb;
+        dm->serverOnNetworkCallbackData = data;
+    }
     UA_UNLOCK(&server->serviceMutex);
 }
 
@@ -460,11 +478,10 @@ createFullServiceDomain(char *outServiceDomain, size_t maxLen,
 
 /* Check if mDNS already has an entry for given hostname and port combination */
 static UA_Boolean
-UA_Discovery_recordExists(UA_Server* server, const char* fullServiceDomain,
+UA_Discovery_recordExists(UA_DiscoveryManager *dm, const char* fullServiceDomain,
                           unsigned short port, const UA_DiscoveryProtocol protocol) {
     // [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname].
-    mdns_record_t *r  =
-        mdnsd_get_published(server->discoveryManager.mdnsDaemon, fullServiceDomain);
+    mdns_record_t *r  = mdnsd_get_published(dm->mdnsDaemon, fullServiceDomain);
     while(r) {
         const mdns_answer_t *data = mdnsd_record_data(r);
         if(data->type == QTYPE_SRV && (port == 0 || data->srv.port == port))
@@ -477,6 +494,10 @@ UA_Discovery_recordExists(UA_Server* server, const char* fullServiceDomain,
 static int
 discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
     UA_Server *server = (UA_Server*) arg;
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return 0;
+
     if(a->type != QTYPE_PTR)
         return 0;
 
@@ -485,19 +506,19 @@ discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
 
     /* Skip, if we already know about this server */
     UA_Boolean exists =
-        UA_Discovery_recordExists(server, a->rdname, 0, UA_DISCOVERY_TCP);
+        UA_Discovery_recordExists(dm, a->rdname, 0, UA_DISCOVERY_TCP);
     if(exists == true)
         return 0;
 
-    if(mdnsd_has_query(server->discoveryManager.mdnsDaemon, a->rdname))
+    if(mdnsd_has_query(dm->mdnsDaemon, a->rdname))
         return 0;
 
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                  "mDNS send query for: %s SRV&TXT %s", a->name, a->rdname);
 
-    mdnsd_query(server->discoveryManager.mdnsDaemon, a->rdname, QTYPE_SRV,
+    mdnsd_query(dm->mdnsDaemon, a->rdname, QTYPE_SRV,
                 discovery_multicastQueryAnswer, server);
-    mdnsd_query(server->discoveryManager.mdnsDaemon, a->rdname, QTYPE_TXT,
+    mdnsd_query(dm->mdnsDaemon, a->rdname, QTYPE_TXT,
                 discovery_multicastQueryAnswer, server);
     return 0;
 }
@@ -509,6 +530,10 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
                        UA_Boolean createTxt, const UA_String* capabilites,
                        const size_t capabilitiesSize,
                        UA_Boolean isSelf) {
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
     /* We assume that the hostname is not an IP address, but a valid domain
      * name. It is required by the OPC UA spec (see Part 12, DiscoveryURL to DNS
      * SRV mapping) to always use the hostname instead of the IP address. */
@@ -533,21 +558,19 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
                        "It will be truncated.");
     }
 
-    if(!server->discoveryManager.mdnsMainSrvAdded) {
+    if(!dm->mdnsMainSrvAdded) {
         mdns_record_t *r =
-            mdnsd_shared(server->discoveryManager.mdnsDaemon,
-                         "_services._dns-sd._udp.local.",
+            mdnsd_shared(dm->mdnsDaemon, "_services._dns-sd._udp.local.",
                          QTYPE_PTR, 600);
-        mdnsd_set_host(server->discoveryManager.mdnsDaemon,
-                       r, "_opcua-tcp._tcp.local.");
-        server->discoveryManager.mdnsMainSrvAdded = true;
+        mdnsd_set_host(dm->mdnsDaemon, r, "_opcua-tcp._tcp.local.");
+        dm->mdnsMainSrvAdded = true;
     }
 
     /* [servername]-[hostname]._opcua-tcp._tcp.local. */
     char fullServiceDomain[63+24];
     createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
 
-    UA_Boolean exists = UA_Discovery_recordExists(server, fullServiceDomain,
+    UA_Boolean exists = UA_Discovery_recordExists(dm, fullServiceDomain,
                                                   port, protocol);
     if(exists == true)
         return UA_STATUSCODE_GOOD;
@@ -555,9 +578,9 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                 "Multicast DNS: add record for domain: %s", fullServiceDomain);
 
-    if(isSelf && server->discoveryManager.selfFqdnMdnsRecord.length == 0) {
-        server->discoveryManager.selfFqdnMdnsRecord = UA_STRING_ALLOC(fullServiceDomain);
-        if(!server->discoveryManager.selfFqdnMdnsRecord.data)
+    if(isSelf && dm->selfFqdnMdnsRecord.length == 0) {
+        dm->selfFqdnMdnsRecord = UA_STRING_ALLOC(fullServiceDomain);
+        if(!dm->selfFqdnMdnsRecord.data)
             return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -610,13 +633,12 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
 
     /* _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local. */
     mdns_record_t *r =
-        mdns_find_record(server->discoveryManager.mdnsDaemon, QTYPE_PTR,
+        mdns_find_record(dm->mdnsDaemon, QTYPE_PTR,
                          "_opcua-tcp._tcp.local.", fullServiceDomain);
     if(!r) {
-        r = mdnsd_shared(server->discoveryManager.mdnsDaemon,
-                         "_opcua-tcp._tcp.local.", QTYPE_PTR, 600);
-        mdnsd_set_host(server->discoveryManager.mdnsDaemon,
-                       r, fullServiceDomain);
+        r = mdnsd_shared(dm->mdnsDaemon, "_opcua-tcp._tcp.local.",
+                         QTYPE_PTR, 600);
+        mdnsd_set_host(dm->mdnsDaemon, r, fullServiceDomain);
     }
 
     /* The first 63 characters of the hostname (or less) */
@@ -627,9 +649,9 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     localDomain[maxHostnameLen+1] = '\0';
 
     /* [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname]. */
-    r = mdnsd_unique(server->discoveryManager.mdnsDaemon, fullServiceDomain,
+    r = mdnsd_unique(dm->mdnsDaemon, fullServiceDomain,
                      QTYPE_SRV, 600, UA_Discovery_multicastConflict, server);
-    mdnsd_set_srv(server->discoveryManager.mdnsDaemon, r, 0, 0, port, localDomain);
+    mdnsd_set_srv(dm->mdnsDaemon, r, 0, 0, port, localDomain);
 
     /* A/AAAA record for all ip addresses.
      * [servername]-[hostname]._opcua-tcp._tcp.local. A [ip].
@@ -653,6 +675,10 @@ static UA_StatusCode
 UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
                           const UA_String *hostname, UA_UInt16 port,
                           UA_Boolean removeTxt) {
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
     /* use a limit for the hostname length to make sure full string fits into 63
      * chars (limited by DNS spec) */
     size_t hostnameLen = hostname->length;
@@ -682,7 +708,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
 
     /* _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local. */
     mdns_record_t *r =
-        mdns_find_record(server->discoveryManager.mdnsDaemon, QTYPE_PTR,
+        mdns_find_record(dm->mdnsDaemon, QTYPE_PTR,
                          "_opcua-tcp._tcp.local.", fullServiceDomain);
     if(!r) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
@@ -690,14 +716,14 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
                        "PTR Record not found for domain: %s", fullServiceDomain);
         return UA_STATUSCODE_BADNOTHINGTODO;
     }
-    mdnsd_done(server->discoveryManager.mdnsDaemon, r);
+    mdnsd_done(dm->mdnsDaemon, r);
 
     /* looks for [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5
      * port hostname.local. and TXT record:
      * [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,...
      * and A record: [servername]-[hostname]._opcua-tcp._tcp.local. A [ip] */
     mdns_record_t *r2 =
-        mdnsd_get_published(server->discoveryManager.mdnsDaemon, fullServiceDomain);
+        mdnsd_get_published(dm->mdnsDaemon, fullServiceDomain);
     if(!r2) {
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: could not remove record. Record not "
@@ -711,7 +737,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
         if((removeTxt && data->type == QTYPE_TXT) ||
            (removeTxt && data->type == QTYPE_A) ||
            data->srv.port == port) {
-            mdnsd_done(server->discoveryManager.mdnsDaemon, r2);
+            mdnsd_done(dm->mdnsDaemon, r2);
         }
         r2 = next;
     }

From 80a6bc24394f63da85858ede80e43dc65b6cdd11 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Apr 2023 16:10:35 +0200
Subject: [PATCH 0893/1963] refactor(server): Reduce direct access to server
 struct within discovery

---
 src/server/ua_discovery_manager.c            |   3 +
 src/server/ua_discovery_manager.h            |  31 +++--
 src/server/ua_server_discovery_mdns.c        | 120 ++++++++-----------
 src/server/ua_services_discovery.c           |   6 +-
 src/server/ua_services_discovery_multicast.c |  89 +++++++-------
 5 files changed, 114 insertions(+), 135 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index c7d84d41461..d8a94c2b85a 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -144,6 +144,9 @@ UA_DiscoveryManager_start(UA_Server *server,
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
+    dm->logging = &server->config.logger;
+    dm->serverConfig = &server->config;
+
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     if(server->config.mdnsEnabled)
         startMulticastDiscoveryServer(server);
diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index ad7c0aa0a3d..b1d00c33c94 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -76,6 +76,10 @@ struct UA_DiscoveryManager {
 
     UA_UInt64 discoveryCallbackId;
 
+    /* Taken from the server config during startup */
+    UA_Logger *logging;
+    const UA_ServerConfig *serverConfig;
+
     LIST_HEAD(, periodicServerRegisterCallback_entry) periodicServerRegisterCallbacks;
     LIST_HEAD(, registeredServer_list_entry) registeredServers;
     size_t registeredServersSize;
@@ -117,39 +121,40 @@ struct UA_DiscoveryManager {
  * serversOnNetwork list so that a client finds it when calling
  * FindServersOnNetwork. */
 void
-UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverName,
-                                    const UA_MdnsDiscoveryConfiguration *mdnsConfig,
-                                    const UA_String *discoveryUrl, UA_Boolean isOnline,
-                                    UA_Boolean updateTxt);
+UA_Discovery_updateMdnsForDiscoveryUrl(UA_DiscoveryManager *dm, const UA_String *serverName,
+                                       const UA_MdnsDiscoveryConfiguration *mdnsConfig,
+                                       const UA_String *discoveryUrl, UA_Boolean isOnline,
+                                       UA_Boolean updateTxt);
 
 void mdns_record_received(const struct resource *r, void *data);
 
-void mdns_create_txt(UA_Server *server, const char *fullServiceDomain,
+void mdns_create_txt(UA_DiscoveryManager *dm, const char *fullServiceDomain,
                      const char *path, const UA_String *capabilites,
                      const size_t capabilitiesSize,
                      void (*conflict)(char *host, int type, void *arg));
 
-void mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
+void mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
                              const char *localDomain);
 
 mdns_record_t *
 mdns_find_record(mdns_daemon_t *mdnsDaemon, unsigned short type,
                  const char *host, const char *rdname);
 
-UA_StatusCode
-initMulticastDiscoveryServer(UA_DiscoveryManager *dm, UA_Server* server);
-
 void startMulticastDiscoveryServer(UA_Server *server);
 void stopMulticastDiscoveryServer(UA_Server *server);
 
 UA_StatusCode
-UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord,
-                                               const char *serverName, size_t serverNameLen,
+UA_DiscoveryManager_addEntryToServersOnNetwork(UA_DiscoveryManager *dm,
+                                               const char *fqdnMdnsRecord,
+                                               const char *serverName,
+                                               size_t serverNameLen,
                                                struct serverOnNetwork_list_entry **addedEntry);
 
 UA_StatusCode
-UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const char *fqdnMdnsRecord,
-                                                    const char *serverName, size_t serverNameLen);
+UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_DiscoveryManager *dm,
+                                                    const char *fqdnMdnsRecord,
+                                                    const char *serverName,
+                                                    size_t serverNameLen);
 
 #endif /* UA_ENABLE_DISCOVERY_MULTICAST */
 
diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_server_discovery_mdns.c
index dac73426a9e..94b9d4bde4b 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_server_discovery_mdns.c
@@ -33,13 +33,10 @@
 #endif
 
 static struct serverOnNetwork_list_entry *
-mdns_record_add_or_get(UA_Server *server, const char *record, const char *serverName,
+mdns_record_add_or_get(UA_DiscoveryManager *dm, const char *record, const char *serverName,
                        size_t serverNameLen, UA_Boolean createNew) {
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return NULL;
-
-    UA_UInt32 hashIdx = UA_ByteString_hash(0, (const UA_Byte*)record, strlen(record)) % SERVER_ON_NETWORK_HASH_SIZE;
+    UA_UInt32 hashIdx = UA_ByteString_hash(0, (const UA_Byte*)record,
+                                           strlen(record)) % SERVER_ON_NETWORK_HASH_SIZE;
     struct serverOnNetwork_hash_entry *hash_entry = dm->serverOnNetworkHash[hashIdx];
 
     while(hash_entry) {
@@ -59,7 +56,8 @@ mdns_record_add_or_get(UA_Server *server, const char *record, const char *server
         return NULL;
 
     struct serverOnNetwork_list_entry *listEntry;
-    UA_StatusCode retval = UA_DiscoveryManager_addEntryToServersOnNetwork(server, record, serverName, serverNameLen, &listEntry);
+    UA_StatusCode retval = UA_DiscoveryManager_addEntryToServersOnNetwork(dm, record, serverName,
+                                                                          serverNameLen, &listEntry);
     if (retval != UA_STATUSCODE_GOOD)
         return NULL;
 
@@ -68,27 +66,21 @@ mdns_record_add_or_get(UA_Server *server, const char *record, const char *server
 
 
 UA_StatusCode
-UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server,
+UA_DiscoveryManager_addEntryToServersOnNetwork(UA_DiscoveryManager *dm,
                                                const char *fqdnMdnsRecord,
                                                const char *serverName,
                                                size_t serverNameLen,
                                                struct serverOnNetwork_list_entry **addedEntry) {
-
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
     struct serverOnNetwork_list_entry *entry =
-            mdns_record_add_or_get(server, fqdnMdnsRecord, serverName,
+            mdns_record_add_or_get(dm, fqdnMdnsRecord, serverName,
                                    serverNameLen, false);
-    if (entry) {
-        if (addedEntry != NULL)
+    if(entry) {
+        if(addedEntry != NULL)
             *addedEntry = entry;
         return UA_STATUSCODE_BADALREADYEXISTS;
     }
 
-
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_DEBUG(dm->logging, UA_LOGCATEGORY_SERVER,
                 "Multicast DNS: Add entry to ServersOnNetwork: %s (%*.s)",
                  fqdnMdnsRecord, (int)serverNameLen, serverName);
 
@@ -115,7 +107,8 @@ UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server,
     listEntry->lastSeen = UA_DateTime_nowMonotonic();
 
     /* add to hash */
-    UA_UInt32 hashIdx = UA_ByteString_hash(0, (const UA_Byte*)fqdnMdnsRecord, strlen(fqdnMdnsRecord)) % SERVER_ON_NETWORK_HASH_SIZE;
+    UA_UInt32 hashIdx = UA_ByteString_hash(0, (const UA_Byte*)fqdnMdnsRecord,
+                                           strlen(fqdnMdnsRecord)) % SERVER_ON_NETWORK_HASH_SIZE;
     struct serverOnNetwork_hash_entry *newHashEntry = (struct serverOnNetwork_hash_entry*)
             UA_malloc(sizeof(struct serverOnNetwork_hash_entry));
     if (!newHashEntry) {
@@ -138,7 +131,7 @@ UA_DiscoveryManager_addEntryToServersOnNetwork(UA_Server *server,
 
 /* see http://stackoverflow.com/a/10838854/869402 */
 static IP_ADAPTER_ADDRESSES *
-getInterfaces(const UA_Server *server) {
+getInterfaces(UA_DiscoveryManager *dm) {
     IP_ADAPTER_ADDRESSES* adapter_addresses = NULL;
 
     /* Start with a 16 KB buffer and resize if needed - multiple attempts in
@@ -148,7 +141,7 @@ getInterfaces(const UA_Server *server) {
         /* todo: malloc may fail: return a statuscode */
         adapter_addresses = (IP_ADAPTER_ADDRESSES*)UA_malloc(adapter_addresses_buffer_size);
         if(!adapter_addresses) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                          "GetAdaptersAddresses out of memory");
             adapter_addresses = NULL;
             break;
@@ -170,7 +163,7 @@ getInterfaces(const UA_Server *server) {
         }
 
         /* Unexpected error */
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_SERVER,
                      "GetAdaptersAddresses returned an unexpected error. "
                      "Not setting mDNS A records.");
         UA_free(adapter_addresses);
@@ -183,21 +176,16 @@ getInterfaces(const UA_Server *server) {
 #endif /* _WIN32 */
 
 UA_StatusCode
-UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server,
+UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_DiscoveryManager *dm,
                                                     const char *fqdnMdnsRecord,
                                                     const char *serverName,
                                                     size_t serverNameLen) {
-
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_DEBUG(dm->logging, UA_LOGCATEGORY_SERVER,
                  "Multicast DNS: Remove entry from ServersOnNetwork: %s (%*.s)",
                  fqdnMdnsRecord, (int)serverNameLen, serverName);
 
     struct serverOnNetwork_list_entry *entry =
-            mdns_record_add_or_get(server, fqdnMdnsRecord, serverName,
+            mdns_record_add_or_get(dm, fqdnMdnsRecord, serverName,
                                    serverNameLen, false);
     if(!entry)
         return UA_STATUSCODE_BADNOTFOUND;
@@ -254,7 +242,7 @@ mdns_append_path_to_url(UA_String *url, const char *path) {
 }
 
 static void
-setTxt(UA_Server *server, const struct resource *r,
+setTxt(UA_DiscoveryManager *dm, const struct resource *r,
        struct serverOnNetwork_list_entry *entry) {
     entry->txtSet = true;
     xht_t *x = txt2sd(r->rdata, r->rdlength);
@@ -269,7 +257,8 @@ setTxt(UA_Server *server, const struct resource *r,
             if (!entry->pathTmp) {
                 entry->pathTmp = (char*)UA_malloc(pathLen+1);
                 if (!entry->pathTmp) {
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Cannot alloc memory for mDNS srv path");
+                    UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_SERVER,
+                                 "Cannot alloc memory for mDNS srv path");
                     return;
                 }
                 memcpy(&(entry->pathTmp), &path, pathLen);
@@ -312,11 +301,10 @@ setTxt(UA_Server *server, const struct resource *r,
 
 /* [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname]. */
 static void
-setSrv(UA_Server *server, const struct resource *r,
+setSrv(UA_DiscoveryManager *dm, const struct resource *r,
        struct serverOnNetwork_list_entry *entry) {
     entry->srvSet = true;
 
-
     /* The specification Part 12 says: The hostname maps onto the SRV record
      * target field. If the hostname is an IPAddress then it must be converted
      * to a domain name. If this cannot be done then LDS shall report an
@@ -329,15 +317,18 @@ setSrv(UA_Server *server, const struct resource *r,
     /* opc.tcp://[servername]:[port][path] */
     char *newUrl = (char*)UA_malloc(10 + srvNameLen + 8 + 1);
     if (!newUrl) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Cannot allocate char for discovery url. Out of memory.");
+        UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_SERVER,
+                     "Cannot allocate char for discovery url. Out of memory.");
         return;
     }
     UA_snprintf(newUrl, 10 + srvNameLen + 8, "opc.tcp://%.*s:%d", (int) srvNameLen,
              r->known.srv.name, r->known.srv.port);
 
     entry->serverOnNetwork.discoveryUrl = UA_String_fromChars(newUrl);
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Multicast DNS: found server: %.*s", (int)entry->serverOnNetwork.discoveryUrl.length, (char*)entry->serverOnNetwork.discoveryUrl.data);
+    UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_SERVER,
+                "Multicast DNS: found server: %.*s",
+                (int)entry->serverOnNetwork.discoveryUrl.length,
+                (char*)entry->serverOnNetwork.discoveryUrl.data);
     UA_free(newUrl);
 
     if(entry->pathTmp) {
@@ -349,10 +340,7 @@ setSrv(UA_Server *server, const struct resource *r,
 /* This will be called by the mDNS library on every record which is received */
 void
 mdns_record_received(const struct resource *r, void *data) {
-    UA_Server *server = (UA_Server *) data;
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*) data;
 
     /* we only need SRV and TXT records */
     /* TODO: remove magic number */
@@ -380,18 +368,19 @@ mdns_record_received(const struct resource *r, void *data) {
 
     /* Get entry */
     struct serverOnNetwork_list_entry *entry =
-            mdns_record_add_or_get(server, r->name, r->name,
+            mdns_record_add_or_get(dm, r->name, r->name,
                                    servernameLen, r->ttl > 0);
     if(!entry)
         return;
 
     /* Check that the ttl is positive */
     if(r->ttl == 0) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_SERVER,
                     "Multicast DNS: remove server (TTL=0): %.*s",
                     (int)entry->serverOnNetwork.discoveryUrl.length,
                     entry->serverOnNetwork.discoveryUrl.data);
-        UA_DiscoveryManager_removeEntryFromServersOnNetwork(server, r->name, r->name, servernameLen);
+        UA_DiscoveryManager_removeEntryFromServersOnNetwork(dm, r->name, r->name,
+                                                            servernameLen);
         return;
     }
 
@@ -410,9 +399,9 @@ mdns_record_received(const struct resource *r, void *data) {
 
     /* Add the resources */
     if(r->type == QTYPE_TXT && !entry->txtSet)
-        setTxt(server, r, entry);
+        setTxt(dm, r, entry);
     else if (r->type == QTYPE_SRV && !entry->srvSet)
-        setSrv(server, r, entry);
+        setSrv(dm, r, entry);
 
     /* Call callback to announce a new server */
     if(entry->srvSet && dm->serverOnNetworkCallback)
@@ -421,15 +410,11 @@ mdns_record_received(const struct resource *r, void *data) {
 }
 
 void
-mdns_create_txt(UA_Server *server, const char *fullServiceDomain, const char *path,
+mdns_create_txt(UA_DiscoveryManager *dm, const char *fullServiceDomain, const char *path,
                 const UA_String *capabilites, const size_t capabilitiesSize,
                 void (*conflict)(char *host, int type, void *arg)) {
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return;
-
     mdns_record_t *r = mdnsd_unique(dm->mdnsDaemon, fullServiceDomain,
-                                    QTYPE_TXT, 600, conflict, server);
+                                    QTYPE_TXT, 600, conflict, dm);
     xht_t *h = xht_new(11);
     char *allocPath = NULL;
     if(!path || strlen(path) == 0) {
@@ -440,7 +425,7 @@ mdns_create_txt(UA_Server *server, const char *fullServiceDomain, const char *pa
         if(path[0] == '/') {
             allocPath = (char*)UA_malloc(pathLen+1);
             if(!allocPath) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_SERVER,
                              "Cannot alloc memory for txt path");
                 return;
             }
@@ -449,7 +434,7 @@ mdns_create_txt(UA_Server *server, const char *fullServiceDomain, const char *pa
         } else {
             allocPath = (char*)UA_malloc(pathLen + 2);
             if(!allocPath) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_SERVER,
                              "Cannot alloc memory for txt path");
                 return;
             }
@@ -530,9 +515,9 @@ mdns_set_address_record_if(UA_DiscoveryManager *dm, const char *fullServiceDomai
 /* Loop over network interfaces and run set_address_record on each */
 #ifdef _WIN32
 
-void mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
+void mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
                              const char *localDomain) {
-    IP_ADAPTER_ADDRESSES* adapter_addresses = getInterfaces(server);
+    IP_ADAPTER_ADDRESSES* adapter_addresses = getInterfaces(dm);
     if(!adapter_addresses)
         return;
 
@@ -549,7 +534,7 @@ void mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
             int family = address->Address.lpSockaddr->sa_family;
             if(AF_INET == family) {
                 SOCKADDR_IN* ipv4 = (SOCKADDR_IN*)(address->Address.lpSockaddr); /* IPv4 */
-                mdns_set_address_record_if(&server->discoveryManager, fullServiceDomain,
+                mdns_set_address_record_if(dm, fullServiceDomain,
                                            localDomain, (char *)&ipv4->sin_addr, 4);
             } else if(AF_INET6 == family) {
                 /* IPv6 */
@@ -588,16 +573,12 @@ void mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
 #elif defined(UA_HAS_GETIFADDR)
 
 void
-mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
+mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
                         const char *localDomain) {
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return;
-
     struct ifaddrs *ifaddr;
     struct ifaddrs *ifa;
     if(getifaddrs(&ifaddr) == -1) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_SERVER,
                      "getifaddrs returned an unexpected error. Not setting mDNS A records.");
         return;
     }
@@ -629,18 +610,17 @@ mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
 #else /* _WIN32 */
 
 void
-mdns_set_address_record(UA_Server *server, const char *fullServiceDomain,
+mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
                         const char *localDomain) {
-
-    if (server->config.mdnsIpAddressListSize == 0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    if(dm->serverConfig->mdnsIpAddressListSize == 0) {
+        UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_SERVER,
                      "If UA_HAS_GETIFADDR is false, config.mdnsIpAddressList must be set");
         return;
     }
 
-    for(size_t i=0; i<server->config.mdnsIpAddressListSize; i++) {
-        mdns_set_address_record_if(&server->discoveryManager, fullServiceDomain,
-                                   localDomain, (char*)&server->config.mdnsIpAddressList[i], 4);
+    for(size_t i=0; i< dm->serverConfig->mdnsIpAddressListSize; i++) {
+        mdns_set_address_record_if(dm, fullServiceDomain, localDomain,
+                                   (char*)&dm->serverConfig->mdnsIpAddressList[i], 4);
     }
 }
 
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index eceb102db24..f662157f89b 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -361,9 +361,9 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
             /* create TXT if is online and first index, delete TXT if is offline and last index */
             UA_Boolean updateTxt = (requestServer->isOnline && i==0) ||
                 (!requestServer->isOnline && i==requestServer->discoveryUrlsSize);
-            UA_Server_updateMdnsForDiscoveryUrl(server, mdnsServerName, mdnsConfig,
-                                                &requestServer->discoveryUrls[i],
-                                                requestServer->isOnline, updateTxt);
+            UA_Discovery_updateMdnsForDiscoveryUrl(dm, mdnsServerName, mdnsConfig,
+                                                   &requestServer->discoveryUrls[i],
+                                                   requestServer->isOnline, updateTxt);
         }
     }
 #endif
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index 31e413461bd..a79f61bebb2 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -25,7 +25,7 @@ typedef enum {
  * serversOnNetwork list so that a client finds it when calling
  * FindServersOnNetwork. */
 static UA_StatusCode
-UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
+UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
                        const UA_String *hostname, UA_UInt16 port,
                        const UA_String *path, const UA_DiscoveryProtocol protocol,
                        UA_Boolean createTxt, const UA_String* capabilites,
@@ -39,7 +39,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
  * serversOnNetwork list so that a client gets the updated data when calling
  * FindServersOnNetwork. */
 static UA_StatusCode
-UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
+UA_Discovery_removeRecord(UA_DiscoveryManager *dm, const UA_String *servername,
                           const UA_String *hostname, UA_UInt16 port,
                           UA_Boolean removeTxt);
 
@@ -74,7 +74,7 @@ multicastPolling(UA_Server *server, void *_) {
 }
 
 static UA_StatusCode
-addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
+addMdnsRecordForNetworkLayer(UA_DiscoveryManager *dm, const UA_String *appName,
                              const UA_String *discoveryUrl) {
     UA_String hostname = UA_STRING_NULL;
     UA_UInt16 port = 4840;
@@ -82,19 +82,19 @@ addMdnsRecordForNetworkLayer(UA_Server *server, const UA_String *appName,
     UA_StatusCode retval =
         UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Server url is invalid: %.*s",
                        (int)discoveryUrl->length, discoveryUrl->data);
         return retval;
     }
 
-    retval = UA_Discovery_addRecord(server, appName, &hostname, port,
+    retval = UA_Discovery_addRecord(dm, appName, &hostname, port,
                                     &path, UA_DISCOVERY_TCP, true,
-                                    server->config.mdnsConfig.serverCapabilities,
-                                    server->config.mdnsConfig.serverCapabilitiesSize,
+                                    dm->serverConfig->mdnsConfig.serverCapabilities,
+                                    dm->serverConfig->mdnsConfig.serverCapabilitiesSize,
                                     true);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Cannot add mDNS Record: %s", UA_StatusCode_name(retval));
         return retval;
     }
@@ -194,7 +194,7 @@ startMulticastDiscoveryServer(UA_Server *server) {
     if(!dm->mdnsDaemon) {
         dm->mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
         mdnsd_register_receive_callback(dm->mdnsDaemon,
-                                        mdns_record_received, server);
+                                        mdns_record_received, dm);
     }
 
     /* Open the mdns listen socket */
@@ -212,7 +212,7 @@ startMulticastDiscoveryServer(UA_Server *server) {
     /* Add record for the server itself */
     UA_String *appName = &server->config.mdnsConfig.mdnsServerName;
     for(size_t i = 0; i < server->config.serverUrlsSize; i++)
-        addMdnsRecordForNetworkLayer(server, appName,
+        addMdnsRecordForNetworkLayer(dm, appName,
                                      &server->config.serverUrls[i]);
 
     /* Send a multicast probe to find any other OPC UA server on the network
@@ -234,6 +234,10 @@ startMulticastDiscoveryServer(UA_Server *server) {
 
 void
 stopMulticastDiscoveryServer(UA_Server *server) {
+    UA_DiscoveryManager *dm = server->discoveryManager;
+    if(!dm)
+        return;
+
     for(size_t i = 0; i < server->config.serverUrlsSize; i++) {
         UA_String hostname = UA_STRING_NULL;
         UA_String path = UA_STRING_NULL;
@@ -246,16 +250,11 @@ stopMulticastDiscoveryServer(UA_Server *server) {
         if(retval != UA_STATUSCODE_GOOD || hostname.length == 0)
             continue;
 
-        UA_Discovery_removeRecord(server,
-                                  &server->config.mdnsConfig.mdnsServerName,
+        UA_Discovery_removeRecord(dm, &server->config.mdnsConfig.mdnsServerName,
                                   &hostname, port, true);
     }
 
     /* Stop the cyclic polling callback */
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return;
-
     if(dm->mdnsCallbackId != 0) {
         UA_EventLoop *el = server->config.eventLoop;
         if(el) {
@@ -367,17 +366,17 @@ Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
 }
 
 void
-UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverName,
-                                    const UA_MdnsDiscoveryConfiguration *mdnsConfig,
-                                    const UA_String *discoveryUrl,
-                                    UA_Boolean isOnline, UA_Boolean updateTxt) {
+UA_Discovery_updateMdnsForDiscoveryUrl(UA_DiscoveryManager *dm, const UA_String *serverName,
+                                       const UA_MdnsDiscoveryConfiguration *mdnsConfig,
+                                       const UA_String *discoveryUrl,
+                                       UA_Boolean isOnline, UA_Boolean updateTxt) {
     UA_String hostname = UA_STRING_NULL;
     UA_UInt16 port = 4840;
     UA_String path = UA_STRING_NULL;
     UA_StatusCode retval =
         UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Server url invalid: %.*s",
                        (int)discoveryUrl->length, discoveryUrl->data);
         return;
@@ -385,10 +384,10 @@ UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverNa
 
     if(!isOnline) {
         UA_StatusCode removeRetval =
-                UA_Discovery_removeRecord(server, serverName, &hostname,
+                UA_Discovery_removeRecord(dm, serverName, &hostname,
                                           port, updateTxt);
         if(removeRetval != UA_STATUSCODE_GOOD)
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+            UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                            "Could not remove mDNS record for hostname %.*s.",
                            (int)serverName->length, serverName->data);
         return;
@@ -402,12 +401,12 @@ UA_Server_updateMdnsForDiscoveryUrl(UA_Server *server, const UA_String *serverNa
     }
 
     UA_StatusCode addRetval =
-        UA_Discovery_addRecord(server, serverName, &hostname,
+        UA_Discovery_addRecord(dm, serverName, &hostname,
                                port, &path, UA_DISCOVERY_TCP, updateTxt,
                                capabilities, capabilitiesSize,
                                false);
     if(addRetval != UA_STATUSCODE_GOOD)
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Could not add mDNS record for hostname %.*s.",
                        (int)serverName->length, serverName->data);
 }
@@ -431,8 +430,8 @@ UA_Discovery_multicastConflict(char *name, int type, void *arg) {
     (void)name;
     (void)type;
 
-    UA_Server *server = (UA_Server*) arg;
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*) arg;
+    UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                  "Multicast DNS name conflict detected: "
                  "'%s' for type %d", name, type);
 }
@@ -524,16 +523,12 @@ discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
 }
 
 static UA_StatusCode
-UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
+UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
                        const UA_String *hostname, UA_UInt16 port,
                        const UA_String *path, const UA_DiscoveryProtocol protocol,
                        UA_Boolean createTxt, const UA_String* capabilites,
                        const size_t capabilitiesSize,
                        UA_Boolean isSelf) {
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
     /* We assume that the hostname is not an IP address, but a valid domain
      * name. It is required by the OPC UA spec (see Part 12, DiscoveryURL to DNS
      * SRV mapping) to always use the hostname instead of the IP address. */
@@ -549,11 +544,11 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     /* Use a limit for the hostname length to make sure full string fits into 63
      * chars (limited by DNS spec) */
     if(hostnameLen+servernameLen + 1 > 63) { /* include dash between servername-hostname */
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: Combination of hostname+servername exceeds "
                        "maximum of 62 chars. It will be truncated.");
     } else if(hostnameLen > 63) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: Hostname length exceeds maximum of 63 chars. "
                        "It will be truncated.");
     }
@@ -575,7 +570,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     if(exists == true)
         return UA_STATUSCODE_GOOD;
 
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+    UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                 "Multicast DNS: add record for domain: %s", fullServiceDomain);
 
     if(isSelf && dm->selfFqdnMdnsRecord.length == 0) {
@@ -588,7 +583,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
     /* The servername is servername + hostname. It is the same which we get
      * through mDNS and therefore we need to match servername */
     UA_StatusCode retval =
-        UA_DiscoveryManager_addEntryToServersOnNetwork(server, fullServiceDomain,
+        UA_DiscoveryManager_addEntryToServersOnNetwork(dm, fullServiceDomain,
                                                        fullServiceDomain,
                                                        UA_MIN(63, (servernameLen+hostnameLen)+1),
                                                        &listEntry);
@@ -650,13 +645,13 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
 
     /* [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname]. */
     r = mdnsd_unique(dm->mdnsDaemon, fullServiceDomain,
-                     QTYPE_SRV, 600, UA_Discovery_multicastConflict, server);
+                     QTYPE_SRV, 600, UA_Discovery_multicastConflict, dm);
     mdnsd_set_srv(dm->mdnsDaemon, r, 0, 0, port, localDomain);
 
     /* A/AAAA record for all ip addresses.
      * [servername]-[hostname]._opcua-tcp._tcp.local. A [ip].
      * [hostname]. A [ip]. */
-    mdns_set_address_record(server, fullServiceDomain, localDomain);
+    mdns_set_address_record(dm, fullServiceDomain, localDomain);
 
     /* TXT record: [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,... */
     UA_STACKARRAY(char, pathChars, path->length + 1);
@@ -664,7 +659,7 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
         if(path->length > 0)
             memcpy(pathChars, path->data, path->length);
         pathChars[path->length] = 0;
-        mdns_create_txt(server, fullServiceDomain, pathChars, capabilites,
+        mdns_create_txt(dm, fullServiceDomain, pathChars, capabilites,
                         capabilitiesSize, UA_Discovery_multicastConflict);
     }
 
@@ -672,13 +667,9 @@ UA_Discovery_addRecord(UA_Server *server, const UA_String *servername,
 }
 
 static UA_StatusCode
-UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
+UA_Discovery_removeRecord(UA_DiscoveryManager *dm, const UA_String *servername,
                           const UA_String *hostname, UA_UInt16 port,
                           UA_Boolean removeTxt) {
-    UA_DiscoveryManager *dm = server->discoveryManager;
-    if(!dm)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
     /* use a limit for the hostname length to make sure full string fits into 63
      * chars (limited by DNS spec) */
     size_t hostnameLen = hostname->length;
@@ -687,7 +678,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
         return UA_STATUSCODE_BADOUTOFRANGE;
 
     if(hostnameLen+servernameLen+1 > 63) { /* include dash between servername-hostname */
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: Combination of hostname+servername exceeds "
                        "maximum of 62 chars. It will be truncated.");
     }
@@ -696,12 +687,12 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
     char fullServiceDomain[63 + 24];
     createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
 
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+    UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                 "Multicast DNS: remove record for domain: %s",
                 fullServiceDomain);
 
     UA_StatusCode retval =
-        UA_DiscoveryManager_removeEntryFromServersOnNetwork(server, fullServiceDomain,
+        UA_DiscoveryManager_removeEntryFromServersOnNetwork(dm, fullServiceDomain,
                    fullServiceDomain, UA_MIN(63, (servernameLen+hostnameLen)+1));
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
@@ -711,7 +702,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
         mdns_find_record(dm->mdnsDaemon, QTYPE_PTR,
                          "_opcua-tcp._tcp.local.", fullServiceDomain);
     if(!r) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: could not remove record. "
                        "PTR Record not found for domain: %s", fullServiceDomain);
         return UA_STATUSCODE_BADNOTHINGTODO;
@@ -725,7 +716,7 @@ UA_Discovery_removeRecord(UA_Server *server, const UA_String *servername,
     mdns_record_t *r2 =
         mdnsd_get_published(dm->mdnsDaemon, fullServiceDomain);
     if(!r2) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
                        "Multicast DNS: could not remove record. Record not "
                        "found for domain: %s", fullServiceDomain);
         return UA_STATUSCODE_BADNOTHINGTODO;

From 49b1acf84c13d1a9f52fb22f83b2b8c440277386 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Apr 2023 00:57:44 +0000
Subject: [PATCH 0894/1963] build(deps): bump deps/ua-nodeset from `526c5e5` to
 `d9f4957`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `526c5e5` to `d9f4957`.
- [Release notes](https://github.com/OPCFoundation/UA-Nodeset/releases)
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/526c5e59e7ba9e54f9dc7848ce2baa249395d3ef...d9f49576eedb95f4ffaa731bad09779947b287f5)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index 526c5e59e7b..d9f49576eed 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit 526c5e59e7ba9e54f9dc7848ce2baa249395d3ef
+Subproject commit d9f49576eedb95f4ffaa731bad09779947b287f5

From 06e3c58cd451a82d9c1adcf1cc53994d08552bf9 Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Wed, 19 Apr 2023 18:10:23 +0200
Subject: [PATCH 0895/1963] fix(ci): Enable mqtt examples (#5748)

---
 .github/workflows/build_linux.yml | 4 ++--
 tools/ci.sh                       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index a5e0fe20f5c..f3a77a55e73 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -98,10 +98,10 @@ jobs:
             cmd_deps: sudo apt-get install -y -qq valgrind openssl mosquitto
             cmd_action: unit_tests_valgrind OPENSSL
           - build_name: "Valgrind Examples with MbedTLS (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev
+            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev mosquitto
             cmd_action: examples_valgrind MBEDTLS
           - build_name: "Valgrind Examples  with OpenSSL (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind openssl
+            cmd_deps: sudo apt-get install -y -qq valgrind openssl mosquitto
             cmd_action: examples_valgrind OPENSSL
           - build_name: "Clang Static Analyzer"
             cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev mosquitto
diff --git a/tools/ci.sh b/tools/ci.sh
index d24b7f1c77c..750af8f354f 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -395,6 +395,7 @@ function examples_valgrind {
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
+          -DUA_ENABLE_PUBSUB_MQTT=ON \
           ..
     make ${MAKEOPTS}
 

From 2851b990a3ba2775abead925fcd138be6f800c49 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 17 Apr 2023 01:57:25 +0200
Subject: [PATCH 0896/1963] fix(server): Fix ContinuationPoint cleanup in
 Browse/BrowseNext

---
 src/server/ua_services_view.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index ff19aa12f92..d1b74ff3db9 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -640,8 +640,13 @@ browseReferencTargetCallback(void *context, UA_ReferenceTarget *t) {
     cp->lastTarget = t->targetId;
     cp->lastRefKindIndex = bc->rk->referenceTypeIndex;
 
-    /* Abort the iteration if the status is not good */
-    return (bc->status == UA_STATUSCODE_GOOD) ? NULL : (void*)0x01;
+    /* Abort if the status is not good. Also doesn't make a deep-copy of
+     * cp->lastTarget after returning from here. */
+    if(bc->status != UA_STATUSCODE_GOOD) {
+        UA_NodePointer_init(&cp->lastTarget);
+        return (void*)0x01;
+    }
+    return NULL;
 }
 
 /* Returns whether the node / continuationpoint is done */
@@ -704,6 +709,10 @@ browseWithNode(struct BrowseContext *bc, const UA_NodeHead *head ) {
                 rk->targets.array = &rk->targets.array[nextTargetIndex];
                 rk->targetsSize -= nextTargetIndex;
             }
+
+            /* Clear cp->lastTarget before it gets overwritten in the following
+             * browse steps. */
+            UA_NodePointer_clear(&cp->lastTarget);
         }
 
         /* Iterate over all reference targets */
@@ -726,12 +735,16 @@ browseWithNode(struct BrowseContext *bc, const UA_NodeHead *head ) {
 
         /* The iteration was aborted */
         if(res != NULL) {
-            /* Aborted with status code good. The continuation point picks up
-             * from the last target. Make a deep copy of the last target. */
+            /* Aborted with status code good -> the maximum number of browse
+             * results was reached. Make a deep copy of the last target for the
+             * continuation point. */
             if(bc->status == UA_STATUSCODE_GOOD)
                 bc->status = UA_NodePointer_copy(cp->lastTarget, &cp->lastTarget);
             return;
         }
+
+        /* Reset last-target to prevent clearing it up */
+        UA_NodePointer_init(&cp->lastTarget);
     }
 
     /* Browsing the node is done */
@@ -898,7 +911,8 @@ Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxref
         goto cleanup;
     cp2->maxReferences = cp.maxReferences;
     cp2->relevantReferences = cp.relevantReferences;
-    cp2->lastTarget = cp.lastTarget;
+    cp2->lastTarget = cp.lastTarget; /* Move the (deep) copy */
+    UA_NodePointer_init(&cp.lastTarget); /* No longer clear below (cleanup) */
     cp2->lastRefKindIndex = cp.lastRefKindIndex;
 
     /* Create a random bytestring via a Guid */
@@ -927,6 +941,7 @@ Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxref
         ContinuationPoint_clear(cp2);
         UA_free(cp2);
     }
+    UA_NodePointer_clear(&cp.lastTarget);
     UA_BrowseResult_clear(result);
     result->statusCode = retval;
 }

From cb51c8427eac0e8823cdc179fd3859eaf9d6ea04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=BB=D0=B5=D0=B1=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B2=D0=B8=D1=87?=
 <viruszold@gmail.com>
Date: Fri, 21 Apr 2023 19:26:07 +0300
Subject: [PATCH 0897/1963] fix(plugin,cmake) Failure when build in MacOSX

---
 CMakeLists.txt                    |  8 +++++++-
 plugins/ua_pubsub_udp_multicast.c | 12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae7308a5c2b..0d11308ae28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -905,8 +905,14 @@ configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open625
 if(UA_ENABLE_DISCOVERY_MULTICAST)
   include(GenerateExportHeader)
     set(MDNSD_LOGLEVEL 300 CACHE STRING "Level at which logs shall be reported" FORCE)
+    
     # create a "fake" empty library to generate the export header macros
-    add_library(libmdnsd ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
+    if (APPLE)
+    	add_library(libmdnsd INTERFACE ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
+    else()
+    	add_library(libmdnsd ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
+    endif()
+    
     if (UA_FORCE_CPP)
         set_property(TARGET libmdnsd PROPERTY LINKER_LANGUAGE CXX)
     else()
diff --git a/plugins/ua_pubsub_udp_multicast.c b/plugins/ua_pubsub_udp_multicast.c
index 2b4a92a1909..89eb23c58c0 100644
--- a/plugins/ua_pubsub_udp_multicast.c
+++ b/plugins/ua_pubsub_udp_multicast.c
@@ -24,6 +24,18 @@
 #   define UA_IPV6_MULTICAST_PREFIX 0xFF
 #endif
 
+#if defined(__APPLE__)
+
+# ifndef IPV6_ADD_MEMBERSHIP
+#define IPV6_ADD_MEMBERSHIP  IPV6_JOIN_GROUP
+# endif
+
+# ifndef IPV6_DROP_MEMBERSHIP
+#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
+# endif
+
+#endif
+
 static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[UA_RECEIVE_MSG_BUFFER_SIZE];
 
 typedef union {

From 86eb3f68601861bf73c35a5a0a8e16916ca78e7d Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Tue, 25 Apr 2023 10:32:06 +0200
Subject: [PATCH 0898/1963] fix(ci): Enable file config example. Fix include
 error (#5756)

---
 examples/pubsub/server_pubsub_file_configuration.c | 2 +-
 tools/ci.sh                                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/pubsub/server_pubsub_file_configuration.c b/examples/pubsub/server_pubsub_file_configuration.c
index 449e2b357b9..3f6e4d4897a 100644
--- a/examples/pubsub/server_pubsub_file_configuration.c
+++ b/examples/pubsub/server_pubsub_file_configuration.c
@@ -7,7 +7,7 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include "ua_pubsub_config.h"
+#include "ua_pubsub.h"
 
 #include <signal.h>
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 750af8f354f..e7ade1c552a 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -396,6 +396,7 @@ function examples_valgrind {
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
+          -DUA_ENABLE_PUBSUB_FILE_CONFIG=ON \
           ..
     make ${MAKEOPTS}
 

From 83168ea053218edfe933639303b09610f7163b98 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Apr 2023 23:07:59 +0200
Subject: [PATCH 0899/1963] fix(server): BaseEventType is a subtype of
 BaseObjectType

---
 src/server/ua_server_ns0.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index e42430eb005..5517baf1266 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -266,11 +266,16 @@ createNS0_base(UA_Server *server) {
     /* Add BaseEventType */
     UA_ObjectTypeAttributes eventtype_attr = UA_ObjectTypeAttributes_default;
     eventtype_attr.displayName = UA_LOCALIZEDTEXT("", "BaseEventType");
-    ret |= ns0_addNode_raw(server, UA_NODECLASS_OBJECTTYPE,
-                           UA_NS0ID_BASEEVENTTYPE, "BaseEventType",
-                           &eventtype_attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
-    ret |= ns0_addNode_finish(server, UA_NS0ID_BASEEVENTTYPE,
-                              UA_NS0ID_EVENTTYPESFOLDER, UA_NS0ID_ORGANIZES);
+    ret |= addNode(server, UA_NODECLASS_OBJECTTYPE,
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE),
+                   UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
+                   UA_NODEID_NULL, UA_QUALIFIEDNAME(0, "BaseEventType"),
+                   UA_NODEID_NULL,
+                   &eventtype_attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES], NULL, NULL);
+    ret |= addRef(server,
+                  UA_NODEID_NUMERIC(0, UA_NS0ID_EVENTTYPESFOLDER),
+                  UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE), true);
 
     if(ret != UA_STATUSCODE_GOOD)
         ret = UA_STATUSCODE_BADINTERNALERROR;

From dc4a88492c4c8dde52b3177fce922c7b0c4b14ec Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Apr 2023 23:08:30 +0200
Subject: [PATCH 0900/1963] fix(server): Fix locking in ns0 diagnostics

---
 src/server/ua_server_ns0_diagnostics.c | 41 ++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 38f9a7c285e..4a265536e7c 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -73,6 +73,8 @@ readSubscriptionDiagnostics(UA_Server *server,
                             const UA_NodeId *nodeId, void *nodeContext,
                             UA_Boolean sourceTimestamp,
                             const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     /* Check the Subscription pointer */
     UA_Subscription *sub = (UA_Subscription*)nodeContext;
     if(!sub)
@@ -80,7 +82,7 @@ readSubscriptionDiagnostics(UA_Server *server,
 
     /* Read the BrowseName */
     UA_QualifiedName bn;
-    UA_StatusCode res = readWithReadValue(server, nodeId, UA_ATTRIBUTEID_BROWSENAME, &bn);
+    UA_StatusCode res = UA_Server_readBrowseName(server, *nodeId, &bn);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
@@ -123,14 +125,18 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
                                  const UA_NodeId *nodeId, void *nodeContext,
                                  UA_Boolean sourceTimestamp,
                                  const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK(&server->serviceMutex);
+
     /* Get the current session */
     size_t sdSize = 0;
     UA_Session *session = NULL;
     session_list_entry *sentry;
     if(nodeContext) {
         session = getSessionById(server, sessionId);
-        if(!session)
+        if(!session) {
+            UA_UNLOCK(&server->serviceMutex);
             return UA_STATUSCODE_BADINTERNALERROR;
+        }
         sdSize = session->subscriptionsSize;
     } else {
         LIST_FOREACH(sentry, &server->sessions, pointers) {
@@ -141,8 +147,10 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
     /* Allocate the output array */
     UA_SubscriptionDiagnosticsDataType *sd = (UA_SubscriptionDiagnosticsDataType*)
         UA_Array_new(sdSize, &UA_TYPES[UA_TYPES_SUBSCRIPTIONDIAGNOSTICSDATATYPE]);
-    if(!sd)
+    if(!sd) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
 
     /* Collect the statistics */
     size_t i = 0;
@@ -165,6 +173,8 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
     value->hasValue = true;
     UA_Variant_setArray(&value->value, sd, sdSize,
                         &UA_TYPES[UA_TYPES_SUBSCRIPTIONDIAGNOSTICSDATATYPE]);
+
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -283,6 +293,8 @@ readSessionDiagnosticsArray(UA_Server *server,
                             const UA_NodeId *nodeId, void *nodeContext,
                             UA_Boolean sourceTimestamp,
                             const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
+
     /* Allocate the output array */
     UA_SessionDiagnosticsDataType *sd = (UA_SessionDiagnosticsDataType*)
         UA_Array_new(server->sessionCount,
@@ -290,6 +302,8 @@ readSessionDiagnosticsArray(UA_Server *server,
     if(!sd)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
+    UA_LOCK(&server->serviceMutex);
+
     /* Collect the statistics */
     size_t i = 0;
     session_list_entry *session;
@@ -302,6 +316,8 @@ readSessionDiagnosticsArray(UA_Server *server,
     value->hasValue = true;
     UA_Variant_setArray(&value->value, sd, server->sessionCount,
                         &UA_TYPES[UA_TYPES_SESSIONDIAGNOSTICSDATATYPE]);
+
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -326,16 +342,22 @@ readSessionDiagnostics(UA_Server *server,
                        const UA_NodeId *nodeId, void *nodeContext,
                        UA_Boolean sourceTimestamp,
                        const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK(&server->serviceMutex);
+
     /* Get the Session */
     UA_Session *session = getSessionById(server, sessionId);
-    if(!session)
+    if(!session) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     /* Read the BrowseName */
     UA_QualifiedName bn;
     UA_StatusCode res = readWithReadValue(server, nodeId, UA_ATTRIBUTEID_BROWSENAME, &bn);
-    if(res != UA_STATUSCODE_GOOD)
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&server->serviceMutex);
         return res;
+    }
 
     union {
         UA_SessionDiagnosticsDataType sddt;
@@ -410,6 +432,7 @@ readSessionDiagnostics(UA_Server *server,
 
  cleanup:
     UA_QualifiedName_clear(&bn);
+    UA_UNLOCK(&server->serviceMutex);
     return res;
 }
 
@@ -426,6 +449,8 @@ readSessionSecurityDiagnostics(UA_Server *server,
     if(!sd)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
+    UA_LOCK(&server->serviceMutex);
+
     /* Collect the statistics */
     size_t i = 0;
     session_list_entry *session;
@@ -438,6 +463,8 @@ readSessionSecurityDiagnostics(UA_Server *server,
     value->hasValue = true;
     UA_Variant_setArray(&value->value, sd, server->sessionCount,
                         &UA_TYPES[UA_TYPES_SESSIONSECURITYDIAGNOSTICSDATATYPE]);
+
+    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -511,6 +538,8 @@ readDiagnostics(UA_Server *server, const UA_NodeId *sessionId, void *sessionCont
     void *data = NULL;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT32]; /* Default */
 
+    UA_LOCK(&server->serviceMutex);
+
     switch(nodeId->identifier.numeric) {
     case UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY:
         server->serverDiagnosticsSummary.currentSessionCount =
@@ -561,6 +590,8 @@ readDiagnostics(UA_Server *server, const UA_NodeId *sessionId, void *sessionCont
     UA_StatusCode res = UA_Variant_setScalarCopy(&value->value, data, type);
     if(res == UA_STATUSCODE_GOOD)
         value->hasValue = true;
+
+    UA_UNLOCK(&server->serviceMutex);
     return res;
 }
 

From 5e03f901650c4c95073cb9a0efc741633099754b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Apr 2023 23:08:58 +0200
Subject: [PATCH 0901/1963] feat(server): Enable ns0 diagnostics by default

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d11308ae28..7c5866aec0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,7 +167,7 @@ endforeach(arch_ ${architectures})
 # Options
 option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
 set(UA_LOGLEVEL 300 CACHE STRING "Minimal level at which logs shall be reported (100=TRACE, 200=DEBUG, 300=INFO, 400=WARNING, 500=ERROR, 600=FATAL)")
-option(UA_ENABLE_DIAGNOSTICS "Enable diagnostics information exposed by the server" OFF)
+option(UA_ENABLE_DIAGNOSTICS "Enable diagnostics information exposed by the server" ON)
 option(UA_ENABLE_METHODCALLS "Enable the Method service set" ON)
 option(UA_ENABLE_SUBSCRIPTIONS "Enable subscriptions support" ON)
 option(UA_ENABLE_SUBSCRIPTIONS_EVENTS "Enable event monitoring" ON)

From e69fcb826f03b44398fda97ea796a8c8a433f3da Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Apr 2023 23:39:47 +0200
Subject: [PATCH 0902/1963] fix(server): Remove unused sampling diagnostics
 array (optional)

---
 src/server/ua_server_ns0.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 5517baf1266..d48e842b22c 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -1106,12 +1106,15 @@ initNS0(UA_Server *server) {
      * 1.03 in CTT (Base Inforamtion/Base Info Core Structure/ 001.js) In the
      * 1.04 specification this has been resolved by allowing to remove these
      * static nodes as well */
-    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SAMPLINGINTERVALDIAGNOSTICSARRAY), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SESSIONSDIAGNOSTICSSUMMARY), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SUBSCRIPTIONDIAGNOSTICSARRAY), true);
 #endif
 
+    /* The sampling diagnostics array is optional
+     * TODO: Add support for this diagnostics */
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SAMPLINGINTERVALDIAGNOSTICSARRAY), true);
+
 #ifndef UA_ENABLE_PUBSUB
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE), true);
 #endif

From e70c4493d196cfc961d7be48dc9e144c9ab68030 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Apr 2023 23:40:27 +0200
Subject: [PATCH 0903/1963] fix(server): Symmetric ReferenceTypes don't have an
 inverse name attribute

---
 src/server/ua_services_attribute.c    | 5 +++++
 tests/client/check_client_highlevel.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 6c425852c2e..e403730b489 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -449,6 +449,11 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
         break;
     case UA_ATTRIBUTEID_INVERSENAME:
         CHECK_NODECLASS(UA_NODECLASS_REFERENCETYPE);
+        if(node->referenceTypeNode.symmetric) {
+            /* Symmetric reference types don't have an inverse name */
+            retval = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
+            break;
+        }
         retval = UA_Variant_setScalarCopy(&v->value, &node->referenceTypeNode.inverseName,
                                           &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
         break;
diff --git a/tests/client/check_client_highlevel.c b/tests/client/check_client_highlevel.c
index f6b2b98843a..9baf785cc0d 100644
--- a/tests/client/check_client_highlevel.c
+++ b/tests/client/check_client_highlevel.c
@@ -713,6 +713,11 @@ START_TEST(Node_ReadWrite_Symmetric) {
     retval = UA_Client_readSymmetricAttribute(client, nodeReadWriteTestHasSubSubType, &symmetric);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(symmetric, newSymmetric);
+
+    /* reset */
+    newSymmetric = false;
+    retval = UA_Client_writeSymmetricAttribute(client, nodeReadWriteTestHasSubSubType, &newSymmetric);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 }
 END_TEST
 

From f31e0016fdfdaa15b8116982ce7dd6f152400b71 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 17 Apr 2023 00:06:59 +0200
Subject: [PATCH 0904/1963] refactor(examples): Increase session and
 securechannel limit for server_ctt

---
 examples/server_ctt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index d6ae146cc3a..549d38d11ba 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1290,7 +1290,7 @@ int main(int argc, char **argv) {
 
     /* Limit the number of SecureChannels and Sessions */
     config.maxSecureChannels = 10;
-    config.maxSessions = 20;
+    config.maxSessions = 50;
 
     /* Revolve the SecureChannel token every 300 seconds */
     config.maxSecurityTokenLifetime = 300000;
@@ -1307,7 +1307,7 @@ int main(int argc, char **argv) {
 
     /* Set Subscription limits */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
-    config.maxSubscriptions = 20;
+    config.maxSubscriptions = 100;
 #endif
 
     /* If RequestTimestamp is '0', log the warning and proceed */

From 5bae198368ab7c086e5a707fcfce48df4b9ab8ca Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 17 Apr 2023 00:07:41 +0200
Subject: [PATCH 0905/1963] fix(server): Use BadMethodInvalid in the Call
 service

---
 src/server/ua_services_method.c    | 4 ++--
 tests/server/check_services_call.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 366c6c7ff6b..4b1c3c54804 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -379,7 +379,7 @@ Operation_CallMethodAsync(UA_Server *server, UA_Session *session, UA_UInt32 requ
                                    UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASPROPERTY),
                                    UA_BROWSEDIRECTION_FORWARD);
     if(!method) {
-        opResult->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
+        opResult->statusCode = UA_STATUSCODE_BADMETHODINVALID;
         return;
     }
 
@@ -476,7 +476,7 @@ Operation_CallMethod(UA_Server *server, UA_Session *session, void *context,
                                    UA_REFTYPESET(UA_REFERENCETYPEINDEX_HASPROPERTY),
                                    UA_BROWSEDIRECTION_FORWARD);
     if(!method) {
-        result->statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
+        result->statusCode = UA_STATUSCODE_BADMETHODINVALID;
         return;
     }
 
diff --git a/tests/server/check_services_call.c b/tests/server/check_services_call.c
index 28b31b4dd89..2d0120b55d1 100644
--- a/tests/server/check_services_call.c
+++ b/tests/server/check_services_call.c
@@ -80,7 +80,7 @@ START_TEST(callUnknownMethod) {
     UA_CallMethodResult result;
     UA_CallMethodResult_init(&result);
     result = UA_Server_call(server, &callMethodRequest);
-    ck_assert_int_eq(result.statusCode, UA_STATUSCODE_BADNODEIDUNKNOWN);
+    ck_assert_int_eq(result.statusCode, UA_STATUSCODE_BADMETHODINVALID);
 } END_TEST
 
 START_TEST(callKnownMethodOnUnknownObject) {
@@ -94,7 +94,7 @@ START_TEST(callKnownMethodOnUnknownObject) {
     UA_CallMethodResult result;
     UA_CallMethodResult_init(&result);
     result = UA_Server_call(server, &callMethodRequest);
-    ck_assert_int_eq(result.statusCode, UA_STATUSCODE_BADNODEIDUNKNOWN);
+    ck_assert_int_eq(result.statusCode, UA_STATUSCODE_BADMETHODINVALID);
 } END_TEST
 
 START_TEST(callMethodAndObjectExistsButMethodHasWrongNodeClass) {

From 6d8feced55d2b6640d833965e092029b97403d13 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 17 Apr 2023 00:08:36 +0200
Subject: [PATCH 0906/1963] fix(server): Use correct status code for percent
 deadband filters

---
 src/server/ua_services_monitoreditem.c    | 8 ++++----
 tests/server/check_monitoreditem_filter.c | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 651c272631e..e07bc8e653e 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -34,7 +34,7 @@ setAbsoluteFromPercentageDeadband(UA_Server *server, UA_Session *session,
                                   const UA_MonitoredItem *mon, UA_DataChangeFilter *filter) {
     /* A valid deadband? */
     if(filter->deadbandValue < 0.0 || filter->deadbandValue > 100.0)
-        return UA_STATUSCODE_BADDEADBANDFILTERINVALID;
+        return UA_STATUSCODE_BADMONITOREDITEMFILTERUNSUPPORTED;
 
     /* Browse for the percent range */
     UA_QualifiedName qn = UA_QUALIFIEDNAME(0, "EURange");
@@ -42,7 +42,7 @@ setAbsoluteFromPercentageDeadband(UA_Server *server, UA_Session *session,
         browseSimplifiedBrowsePath(server, mon->itemToMonitor.nodeId, 1, &qn);
     if(bpr.statusCode != UA_STATUSCODE_GOOD || bpr.targetsSize < 1) {
         UA_BrowsePathResult_clear(&bpr);
-        return UA_STATUSCODE_BADFILTERNOTALLOWED;
+        return UA_STATUSCODE_BADMONITOREDITEMFILTERUNSUPPORTED;
     }
 
     /* Read the range */
@@ -56,7 +56,7 @@ setAbsoluteFromPercentageDeadband(UA_Server *server, UA_Session *session,
     if(!UA_Variant_isScalar(&rangeVal.value) ||
        rangeVal.value.type != &UA_TYPES[UA_TYPES_RANGE]) {
         UA_DataValue_clear(&rangeVal);
-        return UA_STATUSCODE_BADFILTERNOTALLOWED;
+        return UA_STATUSCODE_BADMONITOREDITEMFILTERUNSUPPORTED;
     }
 
     /* Compute the abs deadband */
@@ -68,7 +68,7 @@ setAbsoluteFromPercentageDeadband(UA_Server *server, UA_Session *session,
     /* EURange invalid or NaN? */
     if(absDeadband < 0.0 || absDeadband != absDeadband) {
         UA_DataValue_clear(&rangeVal);
-        return UA_STATUSCODE_BADFILTERNOTALLOWED;
+        return UA_STATUSCODE_BADMONITOREDITEMFILTERUNSUPPORTED;
     }
 
     /* Adjust the original filter */
diff --git a/tests/server/check_monitoreditem_filter.c b/tests/server/check_monitoreditem_filter.c
index 4b16e8b0713..d52cf5942ca 100644
--- a/tests/server/check_monitoreditem_filter.c
+++ b/tests/server/check_monitoreditem_filter.c
@@ -596,7 +596,7 @@ START_TEST(Server_MonitoredItemsPercentFilterSetLaterMissingEURange) {
     ck_assert_uint_eq(modifyResponse.resultsSize, 1);
     /* missing EURange. See https://reference.opcfoundation.org/v104/Core/docs/Part8/6.2/ */
     ck_assert_uint_eq(modifyResponse.results[0].statusCode,
-                      UA_STATUSCODE_BADFILTERNOTALLOWED);
+                      UA_STATUSCODE_BADMONITOREDITEMFILTERUNSUPPORTED);
 
     UA_ModifyMonitoredItemsResponse_clear(&modifyResponse);
 
@@ -940,7 +940,7 @@ START_TEST(Server_MonitoredItemsPercentFilterSetOnCreateMissingEURange) {
     ck_assert_uint_eq(createResponse.resultsSize, 1);
     /* missing EURange. See https://reference.opcfoundation.org/v104/Core/docs/Part8/6.2/ */
     ck_assert_uint_eq(createResponse.results[0].statusCode,
-                      UA_STATUSCODE_BADFILTERNOTALLOWED);
+                      UA_STATUSCODE_BADMONITOREDITEMFILTERUNSUPPORTED);
     newMonitoredItemIds[0] = createResponse.results[0].monitoredItemId;
     UA_CreateMonitoredItemsResponse_clear(&createResponse);
 
@@ -1077,7 +1077,8 @@ START_TEST(Server_MonitoredItemsPercentFilterSetOnCreateDeadBandValueOutOfRange)
 
     ck_assert_uint_eq(createResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(createResponse.resultsSize, 1);
-    ck_assert_uint_eq(createResponse.results[0].statusCode, UA_STATUSCODE_BADDEADBANDFILTERINVALID);
+    ck_assert_uint_eq(createResponse.results[0].statusCode,
+                      UA_STATUSCODE_BADMONITOREDITEMFILTERUNSUPPORTED);
     newMonitoredItemIds[0] = createResponse.results[0].monitoredItemId;
     UA_CreateMonitoredItemsResponse_clear(&createResponse);
 

From 4467dba91233899837711a71ef9a239c41e15d67 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 22 Apr 2023 22:36:19 +0200
Subject: [PATCH 0907/1963] fix(server): Reset the subscription lifetime
 counter in all required places

---
 src/server/ua_services_monitoreditem.c | 17 +++++++++++------
 src/server/ua_services_subscription.c  | 10 ++++++----
 src/server/ua_subscription.c           |  7 ++++++-
 src/server/ua_subscription.h           |  3 +++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index e07bc8e653e..76a1fcea452 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -97,6 +97,9 @@ Service_SetTriggering(UA_Server *server, UA_Session *session,
         return;
     }
 
+    /* Reset the lifetime counter of the Subscription */
+    Subscription_resetLifetime(sub);
+
     /* Get the MonitoredItem */
     UA_MonitoredItem *mon = UA_Subscription_getMonitoredItem(sub, request->triggeringItemId);
     if(!mon) {
@@ -535,8 +538,8 @@ Service_CreateMonitoredItems(UA_Server *server, UA_Session *session,
         return;
     }
 
-    /* Reset the subscription lifetime */
-    cmc.sub->currentLifetimeCount = 0;
+    /* Reset the lifetime counter of the Subscription */
+    Subscription_resetLifetime(cmc.sub);
 
     response->responseHeader.serviceResult =
         UA_Server_processServiceOperations(server, session,
@@ -661,7 +664,8 @@ Service_ModifyMonitoredItems(UA_Server *server, UA_Session *session,
         return;
     }
 
-    sub->currentLifetimeCount = 0; /* Reset the subscription lifetime */
+    /* Reset the lifetime counter of the Subscription */
+    Subscription_resetLifetime(sub);
 
     response->responseHeader.serviceResult =
         UA_Server_processServiceOperations(server, session,
@@ -710,7 +714,8 @@ Service_SetMonitoringMode(UA_Server *server, UA_Session *session,
         return;
     }
 
-    smc.sub->currentLifetimeCount = 0; /* Reset the subscription lifetime */
+    /* Reset the lifetime counter of the Subscription */
+    Subscription_resetLifetime(smc.sub);
 
     smc.monitoringMode = request->monitoringMode;
     response->responseHeader.serviceResult =
@@ -755,8 +760,8 @@ Service_DeleteMonitoredItems(UA_Server *server, UA_Session *session,
         return;
     }
 
-    /* Reset the subscription lifetime */
-    sub->currentLifetimeCount = 0;
+    /* Reset the lifetime counter of the Subscription */
+    Subscription_resetLifetime(sub);
 
     response->responseHeader.serviceResult =
         UA_Server_processServiceOperations(server, session,
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index ef53d3468f6..d3c12ef2439 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -165,7 +165,7 @@ Service_ModifySubscription(UA_Server *server, UA_Session *session,
                             request->maxNotificationsPerPublish, request->priority);
 
     /* Reset the subscription lifetime */
-    sub->currentLifetimeCount = 0;
+    Subscription_resetLifetime(sub);
 
     /* Change the repeated callback to the new interval. This cannot fail as the
      * CallbackId must exist. */
@@ -204,8 +204,10 @@ Operation_SetPublishingMode(UA_Server *server, UA_Session *session,
         return;
     }
 
-    sub->currentLifetimeCount = 0; /* Reset the subscription lifetime */
     setPublishingEnabled(sub, *publishingEnabled); /* Set the publishing mode */
+
+    /* Reset the lifetime counter */
+    Subscription_resetLifetime(sub);
 }
 
 void
@@ -404,8 +406,8 @@ Service_Republish(UA_Server *server, UA_Session *session,
         return;
     }
 
-    /* Reset the subscription lifetime */
-    sub->currentLifetimeCount = 0;
+    /* Reset the lifetime counter */
+    Subscription_resetLifetime(sub);
 
     /* Update the subscription statistics */
 #ifdef UA_ENABLE_DIAGNOSTICS
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index f1ae7d65a6b..d100ca599d1 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -131,6 +131,11 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     el->addDelayedCallback(el, &sub->delayedFreePointers);
 }
 
+void
+Subscription_resetLifetime(UA_Subscription *sub) {
+    sub->currentLifetimeCount = 0;
+}
+
 UA_MonitoredItem *
 UA_Subscription_getMonitoredItem(UA_Subscription *sub, UA_UInt32 monitoredItemId) {
     UA_MonitoredItem *mon;
@@ -452,7 +457,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
 
     /* Update the LifetimeCounter */
     if(pre) {
-        sub->currentLifetimeCount = 0;
+        Subscription_resetLifetime(sub);
     } else {
         UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
                                   "The publish queue is empty");
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 585bcc5bd81..ed6b0769fd6 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -326,6 +326,9 @@ void
 Subscription_unregisterPublishCallback(UA_Server *server,
                                        UA_Subscription *sub);
 
+void
+Subscription_resetLifetime(UA_Subscription *sub);
+
 UA_MonitoredItem *
 UA_Subscription_getMonitoredItem(UA_Subscription *sub,
                                  UA_UInt32 monitoredItemId);

From 1630f9dc0c730c54a2aea8a35f9149b5b23e9d70 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 22 Apr 2023 22:37:17 +0200
Subject: [PATCH 0908/1963] fix(server): Return publishing interval if sampling
 interval == -1.0

---
 src/server/ua_services_monitoreditem.c      | 32 ++++++++++++---------
 tests/server/check_services_subscriptions.c |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 76a1fcea452..20ac8be2a87 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -227,24 +227,12 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
         }
     }
         
-    /* Adjust sampling interval */
     if(params->samplingInterval < 0.0) {
-        /* A negative number indicates that the sampling interval is the
-         * publishing interval of the Subscription. */
+        /* A negative number indicates that the sampling interval is the publishing
+         * interval of the Subscription. */
         if(!mon->subscription) {
             /* Not possible for local MonitoredItems */
             params->samplingInterval = server->config.samplingIntervalLimits.min;
-        } else {
-            /* Test if the publishing interval is a valid sampling interval. If
-             * not, adjust to lie within the limits. */
-            UA_BOUNDEDVALUE_SETWBOUNDS(server->config.samplingIntervalLimits,
-                                       mon->subscription->publishingInterval,
-                                       params->samplingInterval);
-            if(params->samplingInterval == mon->subscription->publishingInterval) {
-                /* The publishing interval is valid also for sampling. The
-                 * standard says any negative number is interpreted as -1.*/
-                params->samplingInterval = -1.0;
-            }
         }
     } else {
         /* Adjust positive sampling interval to lie within the limits */
@@ -500,6 +488,14 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
     result->revisedQueueSize = newMon->parameters.queueSize;
     result->monitoredItemId = newMon->monitoredItemId;
 
+    /* If the sampling interval is negative (the sampling callback is called
+     * from within the publishing callback), return the publishing interval of
+     * the Subscription. Note that we only use the cyclic callback of the
+     * Subscription. So if the Subscription publishing interval is modified,
+     * this also impacts this MonitoredItem. */
+    if(result->revisedSamplingInterval < 0.0 && cmc->sub)
+        result->revisedSamplingInterval = cmc->sub->publishingInterval;
+
     UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, cmc->sub,
                              "MonitoredItem %" PRIi32 " | "
                              "Created the MonitoredItem "
@@ -622,6 +618,14 @@ Operation_ModifyMonitoredItem(UA_Server *server, UA_Session *session, UA_Subscri
     result->revisedSamplingInterval = mon->parameters.samplingInterval;
     result->revisedQueueSize = mon->parameters.queueSize;
 
+    /* If the sampling interval is negative (the sampling callback is called
+     * from within the publishing callback), return the publishing interval of
+     * the Subscription. Note that we only use the cyclic callback of the
+     * Subscription. So if the Subscription publishing interval is modified,
+     * this also impacts this MonitoredItem. */
+    if(result->revisedSamplingInterval < 0.0 && mon->subscription)
+        result->revisedSamplingInterval = mon->subscription->publishingInterval;
+
     /* Remove some notifications if the queue is now too small */
     UA_MonitoredItem_ensureQueueSpace(server, mon);
 
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index 0fd4abffb0a..3d0b20c82a7 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -845,7 +845,7 @@ START_TEST(Server_negativeSamplingInterval) {
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
     ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
-    ck_assert(response.results[0].revisedSamplingInterval == -1.0);
+    ck_assert(response.results[0].revisedSamplingInterval > 0.0);
 
     UA_MonitoredItemCreateRequest_clear(&item);
     UA_CreateMonitoredItemsResponse_clear(&response);

From 3bc8e260efdb46443aadb96bac05eab9139e453f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 22 Apr 2023 23:48:50 +0200
Subject: [PATCH 0909/1963] fix(examples): Auto-triggering of events no longer
 done for CTT

---
 examples/server_ctt.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 549d38d11ba..9d3341facfb 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -305,14 +305,6 @@ writeEventTrigger(UA_Server *server, const UA_NodeId *sessionId,
                            UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER),
                            NULL, false);
 }
-
-static void
-cyclicEventTriger(UA_Server *server, void *data) {
-    (void)data;
-    UA_Server_triggerEvent(server, eventId,
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER),
-                           NULL, false);
-}
 #endif
 
 /* Method Node Example */
@@ -824,9 +816,6 @@ setInformationModel(UA_Server *server) {
     UA_Server_setVariableNode_valueCallback(server,
                                             UA_NODEID_STRING(1, "event-trigger-2"),
                                             eventTriggerValueBackend);
-
-    /* Auto-trigger the event every 500 ms */
-    UA_Server_addRepeatedCallback(server, cyclicEventTriger, NULL, 500.0, NULL);
 #endif
 }
 

From d37724e6dc1bd604281eaddf5f4c8ffe6e2673b9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Apr 2023 22:56:29 +0200
Subject: [PATCH 0910/1963] fix(fuzz): Correctly initialize ctx value in
 fuzz_binary_message.cc

---
 tests/fuzz/fuzz_binary_message.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fuzz/fuzz_binary_message.cc b/tests/fuzz/fuzz_binary_message.cc
index 6ca54a85724..bd9e5fef431 100644
--- a/tests/fuzz/fuzz_binary_message.cc
+++ b/tests/fuzz/fuzz_binary_message.cc
@@ -60,7 +60,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     }
     memcpy(msg.data, data, size);
 
-    void *ctx;
+    void *ctx = NULL;
     UA_Server_networkCallback(&testConnectionManagerTCP, 0, server,
                               &ctx, UA_CONNECTIONSTATE_ESTABLISHED,
                               &UA_KEYVALUEMAP_NULL, msg);

From 09c596706a7a27cf5497a4c031c64c649ddd9cef Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Apr 2023 23:07:24 +0200
Subject: [PATCH 0911/1963] fix(server): Fix an unused result warning in
 ua_server_ns0_diagnostics.c

---
 src/server/ua_server_ns0_diagnostics.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 4a265536e7c..c54f4235a72 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -221,14 +221,16 @@ createSubscriptionObject(UA_Server *server, UA_Session *session,
     const UA_NodeId subDiagArray =
         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SUBSCRIPTIONDIAGNOSTICSARRAY);
     res = addRefWithSession(server, session,  &subDiagArray, &refId, &objId, true);
+    if(res != UA_STATUSCODE_GOOD)
+        goto cleanup;
 
     /* Get all children (including the variable itself) and set the contenxt + callback */
     res = referenceTypeIndices(server, &hasComponent, &refTypes, false);
-    if(res != UA_STATUSCODE_GOOD)
-        goto cleanup;
-    res = browseRecursive(server, 1, &objId,
-                          UA_BROWSEDIRECTION_FORWARD, &refTypes,
-                          UA_NODECLASS_VARIABLE, true, &childrenSize, &children);
+    if(UA_LIKELY(res == UA_STATUSCODE_GOOD)) {
+        res = browseRecursive(server, 1, &objId,
+                              UA_BROWSEDIRECTION_FORWARD, &refTypes,
+                              UA_NODECLASS_VARIABLE, true, &childrenSize, &children);
+    }
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 

From ba336db5918b52a3f9a08b2aa183904bdb960f64 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Apr 2023 23:10:14 +0200
Subject: [PATCH 0912/1963] fix(server): Fix ns0 diagnostics with subscriptions
 disabled

---
 src/server/ua_server_ns0_diagnostics.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index c54f4235a72..a0428ada73c 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -374,6 +374,7 @@ readSessionDiagnostics(UA_Server *server,
     size_t memberOffset;
     UA_Boolean found;
 
+#ifdef UA_ENABLE_SUBSCRIPTIONS
     if(equalBrowseName(&bn.name, "SubscriptionDiagnosticsArray")) {
         /* Reuse the datasource callback. Forward a non-null nodeContext to
          * indicate that we want to see only the subscriptions for the current
@@ -382,7 +383,9 @@ readSessionDiagnostics(UA_Server *server,
                                                nodeId, (void*)0x01,
                                                sourceTimestamp, range, value);
         goto cleanup;
-    } else if(equalBrowseName(&bn.name, "SessionDiagnostics")) {
+    } else
+#endif
+    if(equalBrowseName(&bn.name, "SessionDiagnostics")) {
         setSessionDiagnostics(session, &data.sddt);
         content = &data.sddt;
         type = &UA_TYPES[UA_TYPES_SESSIONDIAGNOSTICSDATATYPE];

From f847747355e6b2191eb4ac93c332d44ad3e53caf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Apr 2023 23:51:01 +0200
Subject: [PATCH 0913/1963] refactor(server): Don't expose ziptree.h in the
 public API

---
 CMakeLists.txt                       |  2 +-
 include/open62541/plugin/nodestore.h | 23 +++++++++++++-------
 src/pubsub/ua_pubsub.h               |  1 +
 src/server/ua_nodes.c                | 32 +++++++++++++++++-----------
 src/server/ua_server_internal.h      |  3 +++
 src/server/ua_services_view.c        |  9 ++++----
 6 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c5866aec0c..e35a0c25b7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -963,7 +963,6 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/pki.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/securitypolicy.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/pubsub.h
-                     ${PROJECT_SOURCE_DIR}/deps/ziptree.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/eventloop.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h
                      ${historizing_exported_headers}
@@ -979,6 +978,7 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_SOURCE_DIR}/deps/libc_time.h
                      ${PROJECT_SOURCE_DIR}/deps/base64.h
                      ${PROJECT_SOURCE_DIR}/deps/itoa.h
+                     ${PROJECT_SOURCE_DIR}/deps/ziptree.h
                      ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.h
                      ${PROJECT_SOURCE_DIR}/src/ua_util_internal.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated.h
diff --git a/include/open62541/plugin/nodestore.h b/include/open62541/plugin/nodestore.h
index ee663aa637f..f3272f64a74 100644
--- a/include/open62541/plugin/nodestore.h
+++ b/include/open62541/plugin/nodestore.h
@@ -18,7 +18,6 @@
  * / OPC UA services to interact with the information model. */
 
 #include <open62541/util.h>
-#include "ziptree.h"
 
 _UA_BEGIN_DECLS
 
@@ -325,12 +324,16 @@ typedef struct {
 typedef struct UA_ReferenceTargetTreeElem {
     UA_ReferenceTarget target;   /* Has to be the first entry */
     UA_UInt32 targetIdHash;      /* Hash of the targetId */
-    ZIP_ENTRY(UA_ReferenceTargetTreeElem) idTreeEntry;
-    ZIP_ENTRY(UA_ReferenceTargetTreeElem) nameTreeEntry;
+    struct {
+        struct UA_ReferenceTargetTreeElem *left;
+        struct UA_ReferenceTargetTreeElem *right;
+    } idTreeEntry;
+    struct {
+        struct UA_ReferenceTargetTreeElem *left;
+        struct UA_ReferenceTargetTreeElem *right;
+    } nameTreeEntry;
 } UA_ReferenceTargetTreeElem;
 
-typedef ZIP_HEAD(UA_ReferenceIdTree, UA_ReferenceTargetTreeElem) UA_ReferenceIdTree;
-typedef ZIP_HEAD(UA_ReferenceNameTree, UA_ReferenceTargetTreeElem) UA_ReferenceNameTree;
 
 /* List of reference targets with the same reference type and direction. Uses
  * either an array or a tree structure. The SDK will not change the type of
@@ -345,10 +348,14 @@ typedef struct {
          * known to be small. */
         UA_ReferenceTarget *array;
 
-        /* Organize the references in a tree for fast lookup */
+        /* Organize the references in a tree for fast lookup. Use
+         * UA_Node_addReference and UA_Node_deleteReference to modify the
+         * tree-structure. The binary tree implementation (and absolute ordering
+         * / duplicate browseNames are allowed) are not exposed otherwise in the
+         * public API. */
         struct {
-            UA_ReferenceIdTree idTree;     /* Fast lookup based on the target id */
-            UA_ReferenceNameTree nameTree; /* Fast lookup based on the target browseName*/
+            UA_ReferenceTargetTreeElem *idRoot;   /* Lookup based on target id */
+            UA_ReferenceTargetTreeElem *nameRoot; /* Lookup based on browseName*/
         } tree;
     } targets;
     size_t targetsSize;
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 445551cafee..e33ebaa8b95 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -21,6 +21,7 @@
 #include <open62541/server_pubsub.h>
 
 #include "open62541_queue.h"
+#include "ziptree.h"
 #include "ua_pubsub_networkmessage.h"
 
 #ifdef UA_ENABLE_PUBSUB_SKS
diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index 87a7a32a0ff..eca2c1decc4 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -313,7 +313,7 @@ UA_NodeReferenceKind_switch(UA_NodeReferenceKind *rk) {
         if(!array)
             return UA_STATUSCODE_BADOUTOFMEMORY;
         size_t pos = 0;
-        moveTreeToArray(array, &pos, rk->targets.tree.idTree.root);
+        moveTreeToArray(array, &pos, rk->targets.tree.idRoot);
         rk->targets.array = array;
         rk->hasRefTree = false;
         return UA_STATUSCODE_GOOD;
@@ -322,15 +322,16 @@ UA_NodeReferenceKind_switch(UA_NodeReferenceKind *rk) {
     /* From array to tree */
     UA_NodeReferenceKind newRk = *rk;
     newRk.hasRefTree = true;
-    newRk.targets.tree.idTree.root = NULL;
-    newRk.targets.tree.nameTree.root = NULL;
+    newRk.targets.tree.idRoot = NULL;
+    newRk.targets.tree.nameRoot = NULL;
     newRk.targetsSize = 0;
     for(size_t i = 0; i < rk->targetsSize; i++) {
         UA_StatusCode res =
             addReferenceTarget(&newRk, rk->targets.array[i].targetId,
                                rk->targets.array[i].targetNameHash);
         if(res != UA_STATUSCODE_GOOD) {
-            ZIP_ITER(UA_ReferenceIdTree, &newRk.targets.tree.idTree,
+            ZIP_ITER(UA_ReferenceIdTree,
+                     (UA_ReferenceIdTree*)&newRk.targets.tree.idRoot,
                      removeTreeEntry, NULL);
             return res;
         }
@@ -347,7 +348,8 @@ UA_NodeReferenceKind_iterate(UA_NodeReferenceKind *rk,
                              UA_NodeReferenceKind_iterateCallback callback,
                              void *context) {
     if(rk->hasRefTree)
-        return ZIP_ITER(UA_ReferenceIdTree, &rk->targets.tree.idTree,
+        return ZIP_ITER(UA_ReferenceIdTree,
+                        (UA_ReferenceIdTree*)&rk->targets.tree.idRoot,
                         (UA_ReferenceIdTree_cb)callback, context);
     for(size_t i = 0; i < rk->targetsSize; i++) {
         void *res = callback(context, &rk->targets.array[i]);
@@ -368,7 +370,7 @@ UA_NodeReferenceKind_findTarget(const UA_NodeReferenceKind *rk,
         tmpTarget.targetIdHash = UA_ExpandedNodeId_hash(targetId);
         UA_ReferenceTargetTreeElem *result =
             ZIP_FIND(UA_ReferenceIdTree, (UA_ReferenceIdTree*)
-                     (uintptr_t)&rk->targets.tree.idTree, &tmpTarget);
+                     (uintptr_t)&rk->targets.tree.idRoot, &tmpTarget);
         if(result)
             return &result->target;
     } else {
@@ -624,7 +626,8 @@ UA_Node_copy(const UA_Node *src, UA_Node *dst) {
                     }
                 }
             } else {
-                void *res = ZIP_ITER(UA_ReferenceIdTree, &srefs->targets.tree.idTree,
+                void *res = ZIP_ITER(UA_ReferenceIdTree,
+                                     (UA_ReferenceIdTree*)&srefs->targets.tree.idRoot,
                                      copyTarget, drefs);
                 if(res != NULL) {
                     UA_Node_clear(dst);
@@ -908,8 +911,10 @@ addReferenceTargetToTree(UA_NodeReferenceKind *rk, UA_NodePointer targetId,
     entry->targetIdHash = targetIdHash;
     entry->target.targetNameHash = targetNameHash;
 
-    ZIP_INSERT(UA_ReferenceIdTree, &rk->targets.tree.idTree, entry);
-    ZIP_INSERT(UA_ReferenceNameTree, &rk->targets.tree.nameTree, entry);
+    ZIP_INSERT(UA_ReferenceIdTree,
+               (UA_ReferenceIdTree*)&rk->targets.tree.idRoot, entry);
+    ZIP_INSERT(UA_ReferenceNameTree,
+               (UA_ReferenceNameTree*)&rk->targets.tree.nameRoot, entry);
 
     rk->targetsSize++;
     return UA_STATUSCODE_GOOD;
@@ -1050,8 +1055,10 @@ UA_Node_deleteReference(UA_Node *node, UA_Byte refTypeIndex, UA_Boolean isForwar
             UA_free(refs->targets.array);
         } else {
             UA_ReferenceTargetTreeElem *elem = (UA_ReferenceTargetTreeElem*)target;
-            ZIP_REMOVE(UA_ReferenceIdTree, &refs->targets.tree.idTree, elem);
-            ZIP_REMOVE(UA_ReferenceNameTree, &refs->targets.tree.nameTree, elem);
+            ZIP_REMOVE(UA_ReferenceIdTree,
+                       (UA_ReferenceIdTree*)&refs->targets.tree.idRoot, elem);
+            ZIP_REMOVE(UA_ReferenceNameTree,
+                       (UA_ReferenceNameTree*)&refs->targets.tree.nameRoot, elem);
             UA_NodePointer_clear(&target->targetId);
             UA_free(target);
             if(refs->targetsSize > 0)
@@ -1097,7 +1104,8 @@ UA_Node_deleteReferencesSubset(UA_Node *node, const UA_ReferenceTypeSet *keepSet
                 UA_NodePointer_clear(&refs->targets.array[j].targetId);
             UA_free(refs->targets.array);
         } else {
-            ZIP_ITER(UA_ReferenceIdTree, &refs->targets.tree.idTree,
+            ZIP_ITER(UA_ReferenceIdTree,
+                     (UA_ReferenceIdTree*)&refs->targets.tree.idRoot,
                      removeTreeEntry, NULL);
         }
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 9a8e228cd16..22bbe2e5d0b 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -249,8 +249,11 @@ enum ZIP_CMP
 cmpRefTargetName(const void *a, const void *b);
 
 /* Static inline methods for tree handling */
+typedef ZIP_HEAD(UA_ReferenceIdTree, UA_ReferenceTargetTreeElem) UA_ReferenceIdTree;
 ZIP_FUNCTIONS(UA_ReferenceIdTree, UA_ReferenceTargetTreeElem, idTreeEntry,
               UA_ReferenceTargetTreeElem, target, cmpRefTargetId)
+
+typedef ZIP_HEAD(UA_ReferenceNameTree, UA_ReferenceTargetTreeElem) UA_ReferenceNameTree;
 ZIP_FUNCTIONS(UA_ReferenceNameTree, UA_ReferenceTargetTreeElem, nameTreeEntry,
               UA_ReferenceTarget, target, cmpRefTargetName)
 
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index d1b74ff3db9..1cf447abe03 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -690,9 +690,10 @@ browseWithNode(struct BrowseContext *bc, const UA_NodeHead *head ) {
                 UA_ReferenceTargetTreeElem key;
                 key.target.targetId = cp->lastTarget;
                 key.targetIdHash = UA_ExpandedNodeId_hash(&lastEn);
-                ZIP_UNZIP(UA_ReferenceIdTree, &rk->targets.tree.idTree,
+                ZIP_UNZIP(UA_ReferenceIdTree,
+                          (UA_ReferenceIdTree*)&rk->targets.tree.idRoot,
                           &key, &left, &right);
-                rk->targets.tree.idTree = right;
+                rk->targets.tree.idRoot = right.root;
             } else {
                 /* Iterate over the array to find the match */
                 for(; nextTargetIndex < rk->targetsSize; nextTargetIndex++) {
@@ -722,7 +723,7 @@ browseWithNode(struct BrowseContext *bc, const UA_NodeHead *head ) {
         /* Undo the "skipping ahead" for the continuation point */
         if(bc->activeCP) {
             if(rk->hasRefTree) {
-                rk->targets.tree.idTree.root =
+                rk->targets.tree.idRoot =
                     ZIP_ZIP(UA_ReferenceIdTree, left.root, right.root);
             } else {
                 /* rk->targets.array = rk->targets.array[-nextTargetIndex]; */
@@ -1195,7 +1196,7 @@ walkBrowsePathElement(UA_Server *server, UA_Session *session,
             if(rk->hasRefTree) {
                 res = (UA_StatusCode)(uintptr_t)
                     ZIP_ITER_KEY(UA_ReferenceNameTree,
-                                 &rk->targets.tree.nameTree,
+                                 (UA_ReferenceNameTree*)&rk->targets.tree.nameRoot,
                                  &targetHashKey, addBrowseHashTarget, next);
                 if(res != UA_STATUSCODE_GOOD)
                     break;

From 5df92b69307470fefbabdefc7f678522f039522c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Apr 2023 23:57:56 +0200
Subject: [PATCH 0914/1963] refactor(core): Remove support for VS2008 and older

---
 CMakeLists.txt                               |  6 --
 appveyor.yml                                 |  4 --
 include/open62541/architecture_definitions.h | 58 ++------------------
 3 files changed, 4 insertions(+), 64 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e35a0c25b7c..f88dc01c9d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -486,11 +486,6 @@ if(UA_ENABLE_PUBSUB_MQTT)
     if(WIN32)
         MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL")
     endif()
-    # Warn if run in Windows and the MSVC Version is lower than VS 12.0
-    if(WIN32 AND MSVC_VERSION LESS 1800)
-        message(WARNING "The MSVC version does not support the C99 standard. Therefore the file stdint.h will be included.")
-        configure_file(${PROJECT_SOURCE_DIR}/deps/ms_stdint.h "${PROJECT_BINARY_DIR}/src_generated/stdint.h" COPYONLY)
-    endif()
     if(NOT UA_ENABLE_PUBSUB)
         message(FATAL_ERROR "Mqtt cannot be used with disabled PubSub function.")
     endif()
@@ -947,7 +942,6 @@ if(UA_ENABLE_HISTORIZING)
 endif()
 
 set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
-                     ${PROJECT_SOURCE_DIR}/deps/ms_stdint.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/architecture_definitions.h
                      ${exported_headers}
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
diff --git a/appveyor.yml b/appveyor.yml
index ad3d9ed6737..4c910a4012c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,10 +17,6 @@ environment:
         APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z -m0=lzma -mx=9
 
     matrix:
-        - CC_NAME: Visual Studio 9 2008
-          CC_SHORTNAME: vs2008
-          GENERATOR: Visual Studio 9 2008
-          FORCE_CXX: ON
         - CC_NAME: Visual Studio 12 2013
           CC_SHORTNAME: vs2013
           GENERATOR: Visual Studio 12 2013
diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
index 08ae54979f5..3ab1d934fb0 100644
--- a/include/open62541/architecture_definitions.h
+++ b/include/open62541/architecture_definitions.h
@@ -15,62 +15,12 @@
 /**
  * C99 Definitions
  * --------------- */
-#include <string.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <inttypes.h>
 #include <float.h>
-
-/* Include stdint.h and stdbool.h or workaround for older Visual Studios */
-#ifdef UNDER_CE
-# include "stdint.h"
-#endif
-#if !defined(_MSC_VER) || _MSC_VER >= 1800
-# include <stdint.h>
-# include <stdbool.h> /* C99 Boolean */
-#else
-# include "ms_stdint.h"
-# if !defined(__bool_true_false_are_defined)
-#  define bool unsigned char
-#  define true 1
-#  define false 0
-#  define __bool_true_false_are_defined
-# endif
-#endif
-
-/* Include inttypes.h or workaround for older Visual Studios */
-#if !defined(_MSC_VER) || _MSC_VER >= 1800
-# include <inttypes.h>
-#else
-# define __PRI_8_LENGTH_MODIFIER__ "hh"
-# define __PRI_64_LENGTH_MODIFIER__ "ll"
-
-# define PRId8 __PRI_8_LENGTH_MODIFIER__ "d"
-# define PRIi8 __PRI_8_LENGTH_MODIFIER__ "i"
-# define PRIo8 __PRI_8_LENGTH_MODIFIER__ "o"
-# define PRIu8 __PRI_8_LENGTH_MODIFIER__ "u"
-# define PRIx8 __PRI_8_LENGTH_MODIFIER__ "x"
-# define PRIX8 __PRI_8_LENGTH_MODIFIER__ "X"
-
-# define PRId16 "hd"
-# define PRIi16 "hi"
-# define PRIo16 "ho"
-# define PRIu16 "hu"
-# define PRIx16 "hx"
-# define PRIX16 "hX"
-
-# define PRId32 "ld"
-# define PRIi32 "li"
-# define PRIo32 "lo"
-# define PRIu32 "lu"
-# define PRIx32 "lx"
-# define PRIX32 "lX"
-
-# define PRId64 __PRI_64_LENGTH_MODIFIER__ "d"
-# define PRIi64 __PRI_64_LENGTH_MODIFIER__ "i"
-# define PRIo64 __PRI_64_LENGTH_MODIFIER__ "o"
-# define PRIu64 __PRI_64_LENGTH_MODIFIER__ "u"
-# define PRIx64 __PRI_64_LENGTH_MODIFIER__ "x"
-# define PRIX64 __PRI_64_LENGTH_MODIFIER__ "X"
-#endif
+#include <string.h>
 
 /**
  * Inline Functions

From a4db8920f48dad6eeb12db3a48f2411695387771 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Apr 2023 23:59:30 +0200
Subject: [PATCH 0915/1963] refactor(deps): Remove unused ms_stdint.h

---
 deps/README.md   |   3 +-
 deps/ms_stdint.h | 257 -----------------------------------------------
 2 files changed, 1 insertion(+), 259 deletions(-)
 delete mode 100644 deps/ms_stdint.h

diff --git a/deps/README.md b/deps/README.md
index 6e1aa463c24..612598b3856 100644
--- a/deps/README.md
+++ b/deps/README.md
@@ -6,7 +6,7 @@ Any third-party library which may be used is inside this `/deps` folder.
 Up to now all these libraries have a less strict License compared to MPL 2.0.
 Still you should make sure that the corresponding third-party license matches your needs.
 
-Here's a list of third party libraries:
+The following third party libraries may be included -- depending on the activated features.
 
 | Library         | License          | Description                                     |
 |-----------------|------------------|-------------------------------------------------|
@@ -15,7 +15,6 @@ Here's a list of third party libraries:
 | parse_num       | MIT              | Char to int conversion, from musl               |
 | base64          | BSD              | Base64 encoding and decoding                    |
 | itoa            | MIT              | Int to char conversion                          |
-| ms_stdint       | BSD-3-Clause     | Replacement for stdint.h on older Visual Studio |
 | open62541_queue | BSD-3-Clause     | FIFO and LIFO queue implementation              |
 | pcg_basic       | Apache License 2 | Random Number Generation                        |
 | ziptree         | MPL 2.0          | Reusable zip tree implementation                |
diff --git a/deps/ms_stdint.h b/deps/ms_stdint.h
deleted file mode 100644
index 4ab67228628..00000000000
--- a/deps/ms_stdint.h
+++ /dev/null
@@ -1,257 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1600 // [
-#include <stdint.h>
-#else
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#ifndef UNDER_CE
-#ifdef __cplusplus
-extern "C" {
-#endif
-#  include <wchar.h>
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
-   typedef signed char       int8_t;
-   typedef signed short      int16_t;
-   typedef signed int        int32_t;
-   typedef unsigned char     uint8_t;
-   typedef unsigned short    uint16_t;
-   typedef unsigned int      uint32_t;
-#else
-   typedef signed __int8     int8_t;
-   typedef signed __int16    int16_t;
-   typedef signed __int32    int32_t;
-   typedef unsigned __int8   uint8_t;
-   typedef unsigned __int16  uint16_t;
-   typedef unsigned __int32  uint32_t;
-#endif
-typedef signed __int64       int64_t;
-typedef unsigned __int64     uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef signed __int64    intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef _W64 signed int   intptr_t;
-   typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#endif // _MSC_STDINT_H_ ]
-
-#endif // !defined(_MSC_VER) || _MSC_VER >= 1600 ]

From 099dbb972ab38df0f12675be09e0c573e6bfabfc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 28 Apr 2023 00:04:11 +0200
Subject: [PATCH 0916/1963] refactor(build): Remove UA_FORCE_CPP only needed
 for vs2008 and older

---
 CMakeLists.txt                   | 24 ++----------------------
 examples/CMakeLists.txt          |  3 ---
 tools/appveyor/build.ps1         |  2 +-
 tools/azure-devops/win/build.ps1 |  2 +-
 tools/cmake/macros_public.cmake  |  8 --------
 5 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f88dc01c9d0..1da9385c8f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -370,13 +370,6 @@ mark_as_advanced(UA_ENABLE_EXPERIMENTAL_HISTORIZING)
 option(UA_FORCE_32BIT "Force compilation as 32-bit executable" OFF)
 mark_as_advanced(UA_FORCE_32BIT)
 
-option(UA_FORCE_CPP "Force compilation with a C++ compiler" OFF)
-mark_as_advanced(UA_FORCE_CPP)
-if(UA_FORCE_CPP)
-    enable_language(CXX)
-    add_definitions(-D__STDC_CONSTANT_MACROS) # We need the UINT32_C define
-endif()
-
 option(UA_FORCE_WERROR "Force compilation with -Werror (or /WX on MSVC)" ON)
 
 option(UA_ENABLE_DEBUG_SANITIZER "Use sanitizer in debug mode" ON)
@@ -718,7 +711,7 @@ function(check_add_cc_flag CC_FLAG)
     endif()
 endfunction()
 
-if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang"))
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
     check_add_cc_flag("-std=c99")   # C99 mode
     check_add_cc_flag("-pipe")      # Avoid writing temporary files (for compiler speed)
     check_add_cc_flag("-Wall")      # Warnings
@@ -908,11 +901,7 @@ if(UA_ENABLE_DISCOVERY_MULTICAST)
     	add_library(libmdnsd ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
     endif()
     
-    if (UA_FORCE_CPP)
-        set_property(TARGET libmdnsd PROPERTY LINKER_LANGUAGE CXX)
-    else()
-        set_property(TARGET libmdnsd PROPERTY LINKER_LANGUAGE C)
-    endif()
+    set_property(TARGET libmdnsd PROPERTY LINKER_LANGUAGE C)
     set_property(TARGET libmdnsd PROPERTY DEFINE_SYMBOL "MDNSD_DYNAMIC_LINKING_EXPORT")
     configure_file("deps/mdnsd/libmdnsd/mdnsd_config_extra.in"
                    "${PROJECT_BINARY_DIR}/src_generated/mdnsd_config_extra")
@@ -1498,10 +1487,6 @@ if(UA_ENABLE_AMALGAMATION)
     # the build directory is ${PROJECT_BINARY_DIR}, that contains the generated open62541.h
     target_include_directories(open62541 PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 
-    if(UA_FORCE_CPP)
-        set_source_files_properties(${PROJECT_BINARY_DIR}/open62541.c PROPERTIES LANGUAGE CXX)
-    endif()
-
     add_dependencies(open62541-amalgamation-source open62541-generator-namespace)
     add_dependencies(open62541-amalgamation-header open62541-generator-namespace)
 else()
@@ -1532,11 +1517,6 @@ else()
     endif()
     add_library(open62541 $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
 
-    if(UA_FORCE_CPP)
-        set_source_files_properties(${lib_sources} PROPERTIES LANGUAGE CXX)
-        set_source_files_properties(${default_plugin_sources} ${ua_architecture_sources} PROPERTIES LANGUAGE CXX)
-    endif()
-
     if(UA_ENABLE_ENCRYPTION_LIBRESSL)
         # Prevent Wincrypt override warning.
         target_compile_definitions(open62541-plugins PUBLIC NOCRYPT=1)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 3a25c0fa4cf..6db08c59e69 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -56,9 +56,6 @@ macro(add_example EXAMPLE_NAME EXAMPLE_SOURCE)
   assign_source_group(${EXAMPLE_SOURCE})
   set_target_properties(${EXAMPLE_NAME} PROPERTIES FOLDER "open62541/examples")
   set_target_properties(${EXAMPLE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-  if(UA_FORCE_CPP)
-      set_source_files_properties(${EXAMPLE_SOURCE} PROPERTIES LANGUAGE CXX)
-  endif()
 endmacro()
 
 #############
diff --git a/tools/appveyor/build.ps1 b/tools/appveyor/build.ps1
index bd427a555d3..1a2638cae5a 100644
--- a/tools/appveyor/build.ps1
+++ b/tools/appveyor/build.ps1
@@ -19,7 +19,7 @@ try {
     # vcpkg need to have  "C:\Tools\vcpkg\installed\x86-windows-static"
     New-Item -Force -ItemType directory -Path "C:\Tools\vcpkg\installed\x86-windows-static"
 
-    $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`"", "-DUA_FORCE_CPP:BOOL=$env:FORCE_CXX"
+    $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`""
 
     # Collect files for .zip packing
     New-Item -ItemType directory -Path pack
diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 18448978764..5046d734e37 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -39,7 +39,7 @@ try {
         New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x86-windows-static"
     }
 
-    $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`"", "-DUA_FORCE_CPP:BOOL=$env:FORCE_CXX"
+    $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`""
 
     # Collect files for .zip packing
     New-Item -ItemType directory -Path pack
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index 94fb713ac26..438a4ab8a7a 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -216,10 +216,6 @@ function(ua_generate_datatypes)
     set(UA_${GEN_NAME_UPPER}_SOURCES "${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.c" CACHE INTERNAL "${UA_GEN_DT_NAME} source files")
     set(UA_${GEN_NAME_UPPER}_HEADERS "${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.h;${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated_handling.h"
         CACHE INTERNAL "${UA_GEN_DT_NAME} header files")
-
-    if(UA_FORCE_CPP)
-        set_source_files_properties(${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.c PROPERTIES LANGUAGE CXX)
-    endif()
 endfunction()
 
 
@@ -395,10 +391,6 @@ function(ua_generate_nodeset)
         add_dependencies(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX} ${UA_GEN_NS_DEPENDS_TARGET})
     endif()
 
-    if(UA_FORCE_CPP)
-        set_source_files_properties(${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c PROPERTIES LANGUAGE CXX)
-    endif()
-
     string(REPLACE "-" "_" UA_GEN_NS_NAME ${UA_GEN_NS_NAME})
     string(TOUPPER "${UA_GEN_NS_NAME}" GEN_NAME_UPPER)
 

From 8b1c4e4b01be27fd5ef37907e91e86c866cf0227 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 28 Apr 2023 00:19:52 +0200
Subject: [PATCH 0917/1963] fix(server): Remove use of snprintf unsupported on
 Visual Studio

---
 src/server/ua_server_ns0_diagnostics.c | 3 ++-
 src/server/ua_subscription.c           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index a0428ada73c..34809822791 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -8,6 +8,7 @@
 #include "ua_server_internal.h"
 #include "ua_session.h"
 #include "ua_subscription.h"
+#include "itoa.h"
 
 #ifdef UA_ENABLE_DIAGNOSTICS
 
@@ -187,7 +188,7 @@ createSubscriptionObject(UA_Server *server, UA_Session *session,
     UA_NodeId hasComponent = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
 
     char subIdStr[32];
-    snprintf(subIdStr, 32, "%u", sub->subscriptionId);
+    itoaUnsigned(sub->subscriptionId, subIdStr, 10);
 
     /* Find the NodeId of the SubscriptionDiagnosticsArray */
     UA_BrowsePath bp;
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index d100ca599d1..ca14112bc8b 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -19,6 +19,7 @@
 
 #include "ua_server_internal.h"
 #include "ua_subscription.h"
+#include "itoa.h"
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS /* conditional compilation */
 
@@ -66,7 +67,7 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     if(sub->session) {
         /* Use a browse path to find the node */
         char subIdStr[32];
-        snprintf(subIdStr, 32, "%u", sub->subscriptionId);
+        itoaUnsigned(sub->subscriptionId, subIdStr, 10);
         UA_BrowsePath bp;
         UA_BrowsePath_init(&bp);
         bp.startingNode = sub->session->sessionId;

From bf199466c9942a699734679000e18d8966438769 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Apr 2023 21:57:52 +0200
Subject: [PATCH 0918/1963] refactor(server): Move all binary protocol
 definitions inside ua_server_binary.c

---
 src/server/ua_server.c                 | 308 +--------
 src/server/ua_server_binary.c          | 835 +++++++++++++++++++++++--
 src/server/ua_server_internal.h        | 142 ++---
 src/server/ua_services_securechannel.c | 235 +------
 tests/fuzz/fuzz_binary_message.cc      |   2 +-
 5 files changed, 842 insertions(+), 680 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index f0e5dea8953..6b1276bac61 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -33,9 +33,6 @@
 #include <valgrind/memcheck.h>
 #endif
 
-#define STARTCHANNELID 1
-#define STARTTOKENID 1
-
 /**********************/
 /* Namespace Handling */
 /**********************/
@@ -245,7 +242,6 @@ UA_Server_delete(UA_Server *server) {
 
     UA_LOCK(&server->serviceMutex);
 
-    UA_Server_deleteSecureChannels(server);
     session_list_entry *current, *temp;
     LIST_FOREACH_SAFE(current, &server->sessions, pointers, temp) {
         UA_Server_removeSession(server, current, UA_DIAGNOSTICEVENT_CLOSE);
@@ -309,7 +305,6 @@ serverHouseKeeping(UA_Server *server, void *_) {
     UA_LOCK(&server->serviceMutex);
     UA_DateTime nowMonotonic = UA_DateTime_nowMonotonic();
     UA_Server_cleanupSessions(server, nowMonotonic);
-    UA_Server_cleanupTimedOutSecureChannels(server, nowMonotonic);
     UA_UNLOCK(&server->serviceMutex);
 }
 
@@ -377,12 +372,6 @@ UA_Server_init(UA_Server *server) {
     server->namespaces[1] = UA_STRING_NULL;
     server->namespacesSize = 2;
 
-    /* Initialize SecureChannel */
-    TAILQ_INIT(&server->channels);
-    /* TODO: use an ID that is likely to be unique after a restart */
-    server->lastChannelId = STARTCHANNELID;
-    server->lastTokenId = STARTTOKENID;
-
     /* Initialize Session Management */
     LIST_INIT(&server->sessions);
     server->sessionCount = 0;
@@ -391,6 +380,9 @@ UA_Server_init(UA_Server *server) {
     UA_AsyncManager_init(&server->asyncManager, server);
 #endif
 
+    /* Initialize the binay protocol support */
+    addServerComponent(server, UA_BinaryProtocolManager_new(server), NULL);
+
     /* Initialized discovery */
 #ifdef UA_ENABLE_DISCOVERY
     addServerComponent(server, UA_DiscoveryManager_new(server), NULL);
@@ -539,6 +531,16 @@ UA_Server_removeCallback(UA_Server *server, UA_UInt64 callbackId) {
     UA_UNLOCK(&server->serviceMutex);
 }
 
+static void
+notifySecureChannelsStopped(UA_Server *server, struct UA_ServerComponent *sc,
+                            UA_LifecycleState state) {
+    if(sc->state == UA_LIFECYCLESTATE_STOPPED &&
+       server->state == UA_LIFECYCLESTATE_STARTED) {
+        sc->notifyState = NULL; /* remove the callback */
+        sc->start(server, sc);
+    }
+}
+
 UA_StatusCode
 UA_Server_updateCertificate(UA_Server *server,
                             const UA_ByteString *oldCertificate,
@@ -564,13 +566,11 @@ UA_Server_updateCertificate(UA_Server *server,
 
     }
 
-    if(closeSecureChannels) {
-        channel_entry *entry;
-        TAILQ_FOREACH(entry, &server->channels, pointers) {
-            if(UA_ByteString_equal(&entry->channel.securityPolicy->localCertificate,
-                                   oldCertificate))
-                shutdownServerSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_CLOSE);
-        }
+    /* Gracefully close all SecureChannels. And restart the
+     * BinaryProtocolManager once it has fully stopped. */
+    if(closeSecureChannels && server->binaryProtocolManager) {
+        server->binaryProtocolManager->notifyState = notifySecureChannelsStopped;
+        server->binaryProtocolManager->stop(server, server->binaryProtocolManager);
     }
 
     size_t i = 0;
@@ -645,191 +645,6 @@ UA_Server_getStatistics(UA_Server *server) {
     return stat;
 }
 
-static UA_StatusCode
-createServerConnection(UA_Server *server, const UA_String *serverUrl) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
-    UA_ServerConfig *config = &server->config;
-
-    /* Extract the protocol, hostname and port from the url */
-    UA_String hostname = UA_STRING_NULL;
-    UA_String path = UA_STRING_NULL;
-    UA_UInt16 port = 4840; /* default */
-    UA_StatusCode res = UA_parseEndpointUrl(serverUrl, &hostname, &port, &path);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-
-    UA_String tcpString = UA_STRING("tcp");
-    for(UA_EventSource *es = config->eventLoop->eventSources;
-        es != NULL; es = es->next) {
-        /* Is this a usable connection manager? */
-        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
-            continue;
-        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
-        if(!UA_String_equal(&tcpString, &cm->protocol))
-            continue;
-
-        /* Set up the parameters */
-        UA_KeyValuePair params[3];
-        size_t paramsSize = 2;
-
-        params[0].key = UA_QUALIFIEDNAME(0, "port");
-        UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
-
-        UA_Boolean listen = true;
-        params[1].key = UA_QUALIFIEDNAME(0, "listen");
-        UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
-
-        if(hostname.length > 0) {
-            /* The hostname is non-empty */
-            params[2].key = UA_QUALIFIEDNAME(0, "address");
-            UA_Variant_setArray(&params[2].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
-            paramsSize = 3;
-        }
-
-        UA_KeyValueMap paramsMap;
-        paramsMap.map = params;
-        paramsMap.mapSize = paramsSize;
-
-        /* Open the server connection */
-        res = cm->openConnection(cm, &paramsMap, server, NULL, UA_Server_networkCallback);
-        if(res == UA_STATUSCODE_GOOD)
-            return res;
-    }
-
-    return UA_STATUSCODE_BADINTERNALERROR;
-}
-
-UA_StatusCode
-attemptReverseConnect(UA_Server *server, reverse_connect_context *context) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
-    UA_ServerConfig *config = &server->config;
-    UA_EventLoop *el = config->eventLoop;
-
-    /* Find a TCP ConnectionManager */
-    UA_String tcpString = UA_STRING_STATIC("tcp");
-    for(UA_EventSource *es = el->eventSources; es != NULL; es = es->next) {
-        /* Is this a usable connection manager? */
-        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
-            continue;
-
-        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
-        if(!UA_String_equal(&tcpString, &cm->protocol))
-            continue;
-
-        if(es->state != UA_EVENTSOURCESTATE_STARTED)
-            continue;
-
-        /* Set up the parameters */
-        UA_KeyValuePair params[2];
-        params[0].key = UA_QUALIFIEDNAME(0, "address");
-        UA_Variant_setScalar(&params[0].value, &context->hostname,
-                             &UA_TYPES[UA_TYPES_STRING]);
-        params[1].key = UA_QUALIFIEDNAME(0, "port");
-        UA_Variant_setScalar(&params[1].value, &context->port,
-                             &UA_TYPES[UA_TYPES_UINT16]);
-        UA_KeyValueMap kvm = {2, params};
-
-        /* Open the connection */
-        UA_StatusCode res = cm->openConnection(cm, &kvm, server, context,
-                                               UA_Server_reverseConnectCallback);
-        if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                           "Failed to create connection for reverse connect: %s\n",
-                           UA_StatusCode_name(res));
-        }
-        return res;
-    }
-
-    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                   "No ConnectionManager found for reverse connect");
-    return UA_STATUSCODE_BADINTERNALERROR;
-}
-
-UA_StatusCode
-UA_Server_addReverseConnect(UA_Server *server, UA_String url,
-                            UA_Server_ReverseConnectStateCallback stateCallback,
-                            void *callbackContext, UA_UInt64 *handle) {
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* Parse the reverse connect URL */
-    UA_String hostname = UA_STRING_NULL;
-    UA_UInt16 port = 0;
-    UA_StatusCode res = UA_parseEndpointUrl(&url, &hostname, &port, NULL);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
-                       "OPC UA URL is invalid: %.*s",
-                       (int)url.length, url.data);
-        return res;
-    }
-
-    /* Set up the reverse connection */
-    reverse_connect_context *newContext =
-        (reverse_connect_context *)calloc(1, sizeof(reverse_connect_context));
-    if(!newContext)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
-    UA_String_copy(&hostname, &newContext->hostname);
-    newContext->port = port;
-    newContext->handle = ++server->lastReverseConnectHandle;
-    newContext->stateCallback = stateCallback;
-    newContext->callbackContext = callbackContext;
-
-    UA_LOCK(&server->serviceMutex);
-
-    /* Register the retry callback */
-    if(LIST_EMPTY(&server->reverseConnects))
-        setReverseConnectRetryCallback(server, true);
-
-    /* Register the new reverse connection */
-    LIST_INSERT_HEAD(&server->reverseConnects, newContext, next);
-
-    if(handle)
-        *handle = newContext->handle;
-
-    /* Attempt to connect right away */
-    res = attemptReverseConnect(server, newContext);
-
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-UA_StatusCode
-UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
-    UA_StatusCode result = UA_STATUSCODE_BADNOTFOUND;
-
-    UA_LOCK(&server->serviceMutex);
-
-    reverse_connect_context *rev, *temp;
-    LIST_FOREACH_SAFE(rev, &server->reverseConnects, next, temp) {
-        if(rev->handle != handle)
-            continue;
-
-        LIST_REMOVE(rev, next);
-
-        /* Connected -> disconnect, otherwise free immediately */
-        if(rev->currentConnection.connectionId) {
-            UA_ConnectionManager *cm = rev->currentConnection.connectionManager;
-            rev->destruction = true;
-            cm->closeConnection(cm, rev->currentConnection.connectionId);
-        } else {
-            setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
-            UA_String_clear(&rev->hostname);
-            free(rev);
-        }
-        result = UA_STATUSCODE_GOOD;
-        break;
-    }
-
-    if(LIST_EMPTY(&server->reverseConnects))
-        setReverseConnectRetryCallback(server, false);
-
-    UA_UNLOCK(&server->serviceMutex);
-
-    return result;
-}
-
 /********************/
 /* Main Server Loop */
 /********************/
@@ -920,61 +735,6 @@ UA_Server_run_startup(UA_Server *server) {
                             &server->pollingCallbackId);
     }
 
-    /* <-- The point of no return for starting the server --> */
-
-    /* Open server sockets */
-    UA_Boolean haveServerSocket = false;
-    if(config->serverUrlsSize == 0) {
-        /* Empty hostname -> listen on all devices */
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
-                       "No Server URL configured. Using \"opc.tcp://:4840\" "
-                       "to configure the listen socket.");
-        UA_String defaultUrl = UA_STRING("opc.tcp://:4840");
-        retVal = createServerConnection(server, &defaultUrl);
-        if(retVal == UA_STATUSCODE_GOOD)
-            haveServerSocket = true;
-    } else {
-        for(size_t i = 0; i < config->serverUrlsSize; i++) {
-            retVal = createServerConnection(server, &config->serverUrls[i]);
-            if(retVal == UA_STATUSCODE_GOOD)
-                haveServerSocket = true;
-        }
-    }
-
-    if(!haveServerSocket) {
-        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
-                     "The server has no server socket");
-    }
-
-    /* Update the application description to include the server urls for
-     * discovery. Don't add the urls with an empty host (listening on all
-     * interfaces) */
-    for(size_t i = 0; i < config->serverUrlsSize; i++) {
-        UA_String hostname = UA_STRING_NULL;
-        UA_String path = UA_STRING_NULL;
-        UA_UInt16 port = 0;
-        retVal = UA_parseEndpointUrl(&config->serverUrls[i],
-                                     &hostname, &port, &path);
-        if(retVal != UA_STATUSCODE_GOOD || hostname.length == 0)
-            continue;
-
-        /* Check if the ServerUrl is already present in the DiscoveryUrl array.
-         * Add if not already there. */
-        size_t j = 0;
-        for(; j < config->applicationDescription.discoveryUrlsSize; j++) {
-            if(UA_String_equal(&config->serverUrls[i],
-                               &config->applicationDescription.discoveryUrls[j]))
-                break;
-        }
-        if(j == config->applicationDescription.discoveryUrlsSize) {
-            retVal =
-                UA_Array_appendCopy((void**)&config->applicationDescription.discoveryUrls,
-                                    &config->applicationDescription.discoveryUrlsSize,
-                                    &config->serverUrls[i], &UA_TYPES[UA_TYPES_STRING]);
-            (void)retVal;
-        }
-    }
-
     /* Ensure that the uri for ns1 is set up from the app description */
     setupNs1Uri(server);
 
@@ -1057,9 +817,8 @@ testStoppedCondition(UA_Server *server) {
 
 UA_StatusCode
 UA_Server_run_shutdown(UA_Server *server) {
-    if(server == NULL) {
+    if(server == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
 
     UA_LOCK(&server->serviceMutex);
 
@@ -1085,39 +844,10 @@ UA_Server_run_shutdown(UA_Server *server) {
         server->pollingCallbackId = 0;
     }
 
-    /* Stop the regular retry callback */
-    setReverseConnectRetryCallback(server, false);
-
-    /* Close or free all reverse connections */
-    reverse_connect_context *rev, *rev_tmp;
-    LIST_FOREACH_SAFE(rev, &server->reverseConnects, next, rev_tmp) {
-        if(rev->currentConnection.connectionId) {
-            UA_ConnectionManager *cm = rev->currentConnection.connectionManager;
-            rev->destruction = true;
-            cm->closeConnection(cm, rev->currentConnection.connectionId);
-        } else {
-            LIST_REMOVE(rev, next);
-            setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
-            UA_String_clear(&rev->hostname);
-            free(rev);
-        }
-    }
-
-    /* Stop all SecureChannels */
-    UA_Server_deleteSecureChannels(server);
-
     /* Stop all ServerComponents */
     ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
              stopServerComponent, server);
 
-    /* Stop all server sockets */
-    for(size_t i = 0; i < UA_MAXSERVERCONNECTIONS; i++) {
-        UA_ServerConnection *sc = &server->serverConnections[i];
-        UA_ConnectionManager *cm = sc->connectionManager;
-        if(sc->connectionId > 0)
-            cm->closeConnection(cm, sc->connectionId);
-    }
-
     /* Are we already stopped? */
     if(testStoppedCondition(server)) {
         setServerLifecycleState(server, UA_LIFECYCLESTATE_STOPPED);
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index bad1db36fad..9cfb48f5ccb 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -18,12 +18,14 @@
 #include <open62541/transport_generated.h>
 #include <open62541/transport_generated_handling.h>
 #include <open62541/types_generated_handling.h>
-#include "open62541/plugin/network.h"
 
 #include "ua_server_internal.h"
 #include "ua_types_encoding_binary.h"
 #include "ua_services.h"
 
+#define STARTCHANNELID 1
+#define STARTTOKENID 1
+
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 // store the authentication token and session ID so we can help fuzzing by setting
 // these values in the next request automatically
@@ -35,10 +37,151 @@ void UA_debug_dumpCompleteChunk(UA_Server *const server, UA_Connection *const co
                                 UA_ByteString *messageBuffer);
 #endif
 
+/************************************/
+/* Binary Protocol Server Component */
+/************************************/
+
+/* Maximum numbers of sockets to listen on */
+#define UA_MAXSERVERCONNECTIONS 16
+
+/* SecureChannel Linked List */
+typedef struct channel_entry {
+    TAILQ_ENTRY(channel_entry) pointers;
+    UA_SecureChannel channel;
+    UA_DiagnosticEvent closeEvent;
+} channel_entry;
+
+typedef struct {
+    UA_ConnectionState state;
+    uintptr_t connectionId;
+    UA_ConnectionManager *connectionManager;
+} UA_ServerConnection;
+
+/* Reverse connect */
+typedef struct reverse_connect_context {
+    UA_String hostname;
+    UA_UInt16 port;
+    UA_UInt64 handle;
+
+    UA_SecureChannelState state;
+    UA_Server_ReverseConnectStateCallback stateCallback;
+    void *callbackContext;
+
+     /* If this is set to true, the reverse connection is removed/freed when the
+      * connection closes. Otherwise we try to reconnect when the connection
+      * closes. */
+    UA_Boolean destruction;
+
+    UA_ServerConnection currentConnection;
+    UA_SecureChannel *channel;
+    LIST_ENTRY(reverse_connect_context) next;
+} reverse_connect_context;
+
+/* Binary Protocol Manager */
+typedef struct {
+    UA_ServerComponent sc;
+    UA_Server *server;  /* remember the pointer so we don't need an additional
+                           context pointer for connections */
+    UA_Logger *logging; /* shortcut */
+    UA_UInt64 houseKeepingCallbackId;
+
+    UA_ServerConnection serverConnections[UA_MAXSERVERCONNECTIONS];
+    size_t serverConnectionsSize;
+
+    UA_ConnectionConfig tcpConnectionConfig; /* Extracted from the server config
+                                              * parameters */
+
+    /* SecureChannels */
+    TAILQ_HEAD(, channel_entry) channels;
+    UA_UInt32 lastChannelId;
+    UA_UInt32 lastTokenId;
+
+    /* Reverse Connections */
+    LIST_HEAD(, reverse_connect_context) reverseConnects;
+    UA_UInt64 reverseConnectsCheckHandle;
+    UA_UInt64 lastReverseConnectHandle;
+} UA_BinaryProtocolManager;
+
+void setReverseConnectState(UA_Server *server, reverse_connect_context *context,
+                            UA_SecureChannelState newState);
+UA_StatusCode attemptReverseConnect(UA_BinaryProtocolManager *bpm,
+                                    reverse_connect_context *context);
+UA_StatusCode setReverseConnectRetryCallback(UA_BinaryProtocolManager *bpm,
+                                             UA_Boolean enabled);
+
 /********************/
 /* Helper Functions */
 /********************/
 
+UA_UInt32
+generateSecureChannelTokenId(UA_Server *server) {
+    UA_BinaryProtocolManager *bpm =
+        (UA_BinaryProtocolManager*)server->binaryProtocolManager;
+    if(!bpm) {
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
+                     "Cannot generate a SecureChannel Token Id. "
+                     "No BinaryProtocolManager configured.");
+        return 0;
+    }
+    return bpm->lastTokenId++;
+}
+
+static void
+setBinaryProtocolManagerState(UA_Server *server,
+                              UA_BinaryProtocolManager *bpm,
+                              UA_LifecycleState state) {
+    if(state == bpm->sc.state)
+        return;
+    bpm->sc.state = state;
+    if(bpm->sc.notifyState)
+        bpm->sc.notifyState(server, &bpm->sc, state);
+}
+ 
+#ifndef container_of
+#define container_of(ptr, type, member) \
+    (type *)((uintptr_t)ptr - offsetof(type,member))
+#endif
+
+static void
+deleteServerSecureChannel(UA_BinaryProtocolManager *bpm,
+                          UA_SecureChannel *channel) {
+    UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel closed");
+
+    /* Clean up the SecureChannel. This is the only place where
+     * UA_SecureChannel_clear must be called within the server code-base. */
+    UA_SecureChannel_clear(channel);
+
+    /* Detach the channel from the server list */
+    struct channel_entry *entry = container_of(channel, channel_entry, channel);
+    TAILQ_REMOVE(&bpm->channels, entry, pointers);
+
+    /* Update the statistics */
+    UA_SecureChannelStatistics *scs = &bpm->server->secureChannelStatistics;
+    scs->currentChannelCount--;
+    switch(entry->closeEvent) {
+    case UA_DIAGNOSTICEVENT_CLOSE:
+        break;
+    case UA_DIAGNOSTICEVENT_TIMEOUT:
+        scs->channelTimeoutCount++;
+        break;
+    case UA_DIAGNOSTICEVENT_PURGE:
+        scs->channelPurgeCount++;
+        break;
+    case UA_DIAGNOSTICEVENT_REJECT:
+    case UA_DIAGNOSTICEVENT_SECURITYREJECT:
+        scs->rejectedChannelCount++;
+        break;
+    case UA_DIAGNOSTICEVENT_ABORT:
+        scs->channelAbortCount++;
+        break;
+    default:
+        UA_assert(false);
+        break;
+    }
+
+    UA_free(entry);
+}
+
 UA_StatusCode
 sendServiceFault(UA_SecureChannel *channel, UA_UInt32 requestId,
                  UA_UInt32 requestHandle, UA_StatusCode statusCode) {
@@ -889,18 +1032,135 @@ processSecureChannelMessage(void *application, UA_SecureChannel *channel,
     return retval;
 }
 
+/* remove the first channel that has no session attached */
+static UA_Boolean
+purgeFirstChannelWithoutSession(UA_BinaryProtocolManager *bpm) {
+    channel_entry *entry;
+    TAILQ_FOREACH(entry, &bpm->channels, pointers) {
+        if(SLIST_FIRST(&entry->channel.sessions))
+            continue;
+        UA_LOG_INFO_CHANNEL(bpm->logging, &entry->channel,
+                            "Channel was purged since maxSecureChannels was "
+                            "reached and channel had no session attached");
+        entry->closeEvent = UA_DIAGNOSTICEVENT_PURGE;
+        UA_SecureChannel_shutdown(&entry->channel);
+        return true;
+    }
+    return false;
+}
+
+static UA_StatusCode
+configServerSecureChannel(void *application, UA_SecureChannel *channel,
+                          const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
+    /* Iterate over available endpoints and choose the correct one */
+    UA_SecurityPolicy *securityPolicy = NULL;
+    UA_Server *const server = (UA_Server *const) application;
+    for(size_t i = 0; i < server->config.securityPoliciesSize; ++i) {
+        UA_SecurityPolicy *policy = &server->config.securityPolicies[i];
+        if(!UA_ByteString_equal(&asymHeader->securityPolicyUri, &policy->policyUri))
+            continue;
+
+        UA_StatusCode res = policy->asymmetricModule.
+            compareCertificateThumbprint(policy, &asymHeader->receiverCertificateThumbprint);
+        if(res != UA_STATUSCODE_GOOD)
+            continue;
+
+        /* We found the correct policy (except for security mode). The endpoint
+         * needs to be selected by the client / server to match the security
+         * mode in the endpoint for the session. */
+        securityPolicy = policy;
+        break;
+    }
+
+    if(!securityPolicy)
+        return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
+
+    /* Create the channel context and parse the sender (remote) certificate used
+     * for the secureChannel. */
+    return UA_SecureChannel_setSecurityPolicy(channel, securityPolicy,
+                                              &asymHeader->senderCertificate);
+}
+
+static UA_StatusCode
+createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *cm,
+                          uintptr_t connectionId, UA_SecureChannel **outChannel) {
+    UA_Server *server = bpm->server;
+    UA_ServerConfig *config = &server->config;
+
+    /* Check if we have space for another SC, otherwise try to find an SC
+     * without a session and purge it */
+    UA_SecureChannelStatistics *scs = &server->secureChannelStatistics;
+    if(scs->currentChannelCount >= config->maxSecureChannels &&
+       !purgeFirstChannelWithoutSession(bpm))
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    /* Allocate memory for the SecureChannel */
+    channel_entry *entry = (channel_entry *)UA_malloc(sizeof(channel_entry));
+    if(!entry)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    /* Set up the initial connection config */
+    UA_ConnectionConfig connConfig;
+    connConfig.protocolVersion = 0;
+    connConfig.recvBufferSize = config->tcpBufSize;
+    connConfig.sendBufferSize = config->tcpBufSize;
+    connConfig.localMaxMessageSize = config->tcpMaxMsgSize;
+    connConfig.remoteMaxMessageSize = config->tcpMaxMsgSize;
+    connConfig.localMaxChunkCount = config->tcpMaxChunks;
+    connConfig.remoteMaxChunkCount = config->tcpMaxChunks;
+
+    if(connConfig.recvBufferSize == 0)
+        connConfig.recvBufferSize = 1 << 16; /* 64kB */
+    if(connConfig.sendBufferSize == 0)
+        connConfig.sendBufferSize = 1 << 16; /* 64kB */
+
+    /* Set up the new SecureChannel */
+    UA_SecureChannel_init(&entry->channel);
+    entry->channel.config = connConfig;
+    entry->channel.certificateVerification = &config->certificateVerification;
+    entry->channel.processOPNHeader = configServerSecureChannel;
+    entry->channel.connectionManager = cm;
+    entry->channel.connectionId = connectionId;
+    entry->closeEvent = UA_DIAGNOSTICEVENT_CLOSE; /* Used if the eventloop closes */
+
+    /* Set the SecureChannel identifier already here. So we get the right
+     * identifier for logging right away. The rest of the SecurityToken is set
+     * in UA_SecureChannelManager_open. Set the ChannelId also in the
+     * alternative security token, we don't touch this value during the token
+     * rollover. */
+    entry->channel.securityToken.channelId = bpm->lastChannelId++;
+    entry->channel.altSecurityToken.channelId = entry->channel.securityToken.channelId;
+
+    /* Set an initial timeout before the negotiation handshake. So the channel
+     * is caught if the client is unresponsive.
+     *
+     * TODO: Make this a configuration option */
+    entry->channel.securityToken.createdAt = UA_DateTime_nowMonotonic();
+    entry->channel.securityToken.revisedLifetime = 10000; /* 10s should be enough */
+
+    /* Add to the server's list */
+    TAILQ_INSERT_TAIL(&bpm->channels, entry, pointers);
+
+    /* Update the statistics */
+    server->secureChannelStatistics.currentChannelCount++;
+    server->secureChannelStatistics.cumulatedChannelCount++;
+
+    *outChannel = &entry->channel;
+    return UA_STATUSCODE_GOOD;
+}
+
 /* Callback of a TCP socket (server socket or an active connection) */
 void
-UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void *application, void **connectionContext,
-                          UA_ConnectionState state,
-                          const UA_KeyValueMap *params,
-                          UA_ByteString msg) {
-    UA_Server *server = (UA_Server*)application;
+serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                      void *application, void **connectionContext,
+                      UA_ConnectionState state,
+                      const UA_KeyValueMap *params,
+                      UA_ByteString msg) {
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)application;
 
     /* A server socket that is not yet registered in the server. Register it and
      * set the connection context to the pointer in the
-     * server->serverConnections list. New connections on that server socket
+     * bpm->serverConnections list. New connections on that server socket
      * inherit the context (and on the first callback we set the context of
      * client-connections to a SecureChannel). */
     if(*connectionContext == NULL) {
@@ -910,16 +1170,16 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             return;
 
         /* Cannot register */
-        if(server->serverConnectionsSize >= UA_MAXSERVERCONNECTIONS) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        if(bpm->serverConnectionsSize >= UA_MAXSERVERCONNECTIONS) {
+            UA_LOG_WARNING(bpm->logging, UA_LOGCATEGORY_SERVER,
                            "Cannot register server socket - too many already open");
             cm->closeConnection(cm, connectionId);
             return;
         }
 
         /* Find and use a free connection slot */
-        server->serverConnectionsSize++;
-        UA_ServerConnection *sc = server->serverConnections;
+        bpm->serverConnectionsSize++;
+        UA_ServerConnection *sc = bpm->serverConnections;
         while(sc->connectionId != 0)
             sc++;
         sc->state = state;
@@ -931,8 +1191,8 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     UA_ServerConnection *sc = (UA_ServerConnection*)*connectionContext;
     UA_SecureChannel *channel = (UA_SecureChannel*)*connectionContext;
-    UA_Boolean serverSocket = (sc >= server->serverConnections &&
-                               sc < &server->serverConnections[UA_MAXSERVERCONNECTIONS]);
+    UA_Boolean serverSocket = (sc >= bpm->serverConnections &&
+                               sc < &bpm->serverConnections[UA_MAXSERVERCONNECTIONS]);
 
     /* The connection is closing. This is the last callback for it. */
     if(state == UA_CONNECTIONSTATE_CLOSING) {
@@ -940,11 +1200,21 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             /* Server socket is closed */
             sc->state = UA_CONNECTIONSTATE_CLOSED;
             sc->connectionId = 0;
-            server->serverConnectionsSize--;
+            bpm->serverConnectionsSize--;
         } else {
             /* A connection attached to a SecureChannel is closing. This is the
              * only place where deleteSecureChannel must be used. */
-            deleteServerSecureChannel(server, channel);
+            deleteServerSecureChannel(bpm, channel);
+        }
+
+        /* Set BinaryProtocolManager to STOPPED if it is STOPPING and the last
+         * socket just closed */
+        if(bpm->sc.state == UA_LIFECYCLESTATE_STOPPING &&
+           bpm->serverConnectionsSize == 0 &&
+           LIST_EMPTY(&bpm->reverseConnects) &&
+           TAILQ_EMPTY(&bpm->channels)) {
+           setBinaryProtocolManagerState(bpm->server, bpm,
+                                         UA_LIFECYCLESTATE_STOPPED);
         }
         return;
     }
@@ -953,9 +1223,9 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     if(serverSocket) {
         /* A new connection is opening. This is the only place where
          * createSecureChannel is used. */
-        retval = createServerSecureChannel(server, cm, connectionId, &channel);
+        retval = createServerSecureChannel(bpm, cm, connectionId, &channel);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(bpm->logging, UA_LOGCATEGORY_SERVER,
                            "TCP %lu\t| Could not accept the connection with status %s",
                            (unsigned long)sc->connectionId, UA_StatusCode_name(retval));
             *connectionContext = NULL;
@@ -963,7 +1233,7 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             return;
         }
 
-        UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel created");
+        UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel created");
 
         /* Set the new channel as the new context for the connection */
         *connectionContext = (void*)channel;
@@ -982,10 +1252,10 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_debug_dumpCompleteChunk(server, channel->connection, message);
 #endif
 
-    retval = UA_SecureChannel_processBuffer(channel, server,
+    retval = UA_SecureChannel_processBuffer(channel, bpm->server,
                                             processSecureChannelMessage, &msg);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(bpm->logging, channel,
                                "Processing the message failed with error %s",
                                UA_StatusCode_name(retval));
 
@@ -998,6 +1268,132 @@ UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 }
 
+static UA_StatusCode
+createServerConnection(UA_BinaryProtocolManager *bpm, const UA_String *serverUrl) {
+    UA_Server *server = bpm->server;
+    UA_ServerConfig *config = &server->config;
+
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* Extract the protocol, hostname and port from the url */
+    UA_String hostname = UA_STRING_NULL;
+    UA_String path = UA_STRING_NULL;
+    UA_UInt16 port = 4840; /* default */
+    UA_StatusCode res = UA_parseEndpointUrl(serverUrl, &hostname, &port, &path);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    UA_String tcpString = UA_STRING("tcp");
+    for(UA_EventSource *es = config->eventLoop->eventSources;
+        es != NULL; es = es->next) {
+        /* Is this a usable connection manager? */
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+        if(!UA_String_equal(&tcpString, &cm->protocol))
+            continue;
+
+        /* Set up the parameters */
+        UA_KeyValuePair params[3];
+        size_t paramsSize = 2;
+
+        params[0].key = UA_QUALIFIEDNAME(0, "port");
+        UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+
+        UA_Boolean listen = true;
+        params[1].key = UA_QUALIFIEDNAME(0, "listen");
+        UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
+        if(hostname.length > 0) {
+            /* The hostname is non-empty */
+            params[2].key = UA_QUALIFIEDNAME(0, "address");
+            UA_Variant_setArray(&params[2].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
+            paramsSize = 3;
+        }
+
+        UA_KeyValueMap paramsMap;
+        paramsMap.map = params;
+        paramsMap.mapSize = paramsSize;
+
+        /* Open the server connection */
+        res = cm->openConnection(cm, &paramsMap, bpm, NULL, serverNetworkCallback);
+        if(res == UA_STATUSCODE_GOOD)
+            return res;
+    }
+
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
+/* Trigger the closing of the SecureChannel. This needs one iteration of the
+ * eventloop to take effect. */
+void
+shutdownServerSecureChannel(UA_Server *server, UA_SecureChannel *channel,
+                            UA_DiagnosticEvent event) {
+    /* Does the channel have an open socket? */
+    if(!UA_SecureChannel_isConnected(channel))
+        return;
+
+    UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "Closing the channel");
+
+    /* Set the event for diagnostics. The shutdown event is used in the
+     * deleteServerSecureChannel callback. */
+    struct channel_entry *entry = container_of(channel, channel_entry, channel);
+    entry->closeEvent = event;
+
+    /* Close the connection in the event-loop, which in the next iteration of
+     * the eventloop triggers the final deletion. This also sets the state to
+     * "closing". */
+    UA_SecureChannel_shutdown(channel);
+}
+
+/* Remove timed out SecureChannels */
+static void
+secureChannelHouseKeeping(UA_Server *server, void *context) {
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)context;
+    UA_LOCK(&server->serviceMutex);
+
+    UA_DateTime nowMonotonic = UA_DateTime_nowMonotonic();
+    channel_entry *entry;
+    TAILQ_FOREACH(entry, &bpm->channels, pointers) {
+        /* Compute the timeout date of the SecurityToken */
+        UA_DateTime timeout =
+            entry->channel.securityToken.createdAt +
+            (UA_DateTime)(entry->channel.securityToken.revisedLifetime * UA_DATETIME_MSEC);
+
+        /* The token has timed out. Try to do the token revolving now instead of
+         * shutting the channel down.
+         *
+         * Part 4, 5.5.2 says: Servers shall use the existing SecurityToken to
+         * secure outgoing Messages until the SecurityToken expires or the
+         * Server receives a Message secured with a new SecurityToken.*/
+        if(timeout < nowMonotonic &&
+           entry->channel.renewState == UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER) {
+            /* Revolve the token manually. This is otherwise done in checkSymHeader. */
+            entry->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
+            entry->channel.securityToken = entry->channel.altSecurityToken;
+            UA_ChannelSecurityToken_init(&entry->channel.altSecurityToken);
+            UA_SecureChannel_generateLocalKeys(&entry->channel);
+            generateRemoteKeys(&entry->channel);
+
+            /* Use the timeout of the new SecurityToken */
+            timeout = entry->channel.securityToken.createdAt +
+                (UA_DateTime)(entry->channel.securityToken.revisedLifetime * UA_DATETIME_MSEC);
+        }
+
+        if(timeout < nowMonotonic) {
+            UA_LOG_INFO_CHANNEL(bpm->logging, &entry->channel,
+                                "SecureChannel has timed out");
+            entry->closeEvent = UA_DIAGNOSTICEVENT_TIMEOUT;
+            UA_SecureChannel_shutdown(&entry->channel);
+        }
+    }
+    UA_UNLOCK(&server->serviceMutex);
+}
+
+/**********************/
+/* Reverse Connection */
+/**********************/
+
 #define UA_MINMESSAGESIZE 8192
 
 static UA_StatusCode
@@ -1051,32 +1447,36 @@ sendRHEMessage(UA_Server *server, uintptr_t connectionId,
 
 static void
 retryReverseConnectCallback(UA_Server *server, void *context) {
-    (void)context;
     UA_LOCK(&server->serviceMutex);
 
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)context;
+
     reverse_connect_context *rc = NULL;
-    LIST_FOREACH(rc, &server->reverseConnects, next) {
+    LIST_FOREACH(rc, &bpm->reverseConnects, next) {
         if(rc->currentConnection.connectionId)
             continue;
         UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
                     "Attempt to reverse reconnect to %.*s:%d",
                     (int)rc->hostname.length, rc->hostname.data, rc->port);
-        attemptReverseConnect(server, rc);
+        attemptReverseConnect(bpm, rc);
     }
 
     UA_UNLOCK(&server->serviceMutex);
 }
 
 UA_StatusCode
-setReverseConnectRetryCallback(UA_Server *server, UA_Boolean enabled) {
-    if(enabled && !server->reverseConnectsCheckHandle) {
-        UA_UInt32 reconnectInterval = server->config.reverseReconnectInterval ?
-            server->config.reverseReconnectInterval : 15000;
-        return addRepeatedCallback(server, retryReverseConnectCallback, NULL,
-                                   reconnectInterval, &server->reverseConnectsCheckHandle);
-    } else if(!enabled && server->reverseConnectsCheckHandle) {
-        removeCallback(server, server->reverseConnectsCheckHandle);
-        server->reverseConnectsCheckHandle = 0;
+setReverseConnectRetryCallback(UA_BinaryProtocolManager *bpm, UA_Boolean enabled) {
+    UA_Server *server = bpm->server;
+    UA_ServerConfig *config = &server->config;
+
+    if(enabled && !bpm->reverseConnectsCheckHandle) {
+        UA_UInt32 reconnectInterval = config->reverseReconnectInterval ?
+            config->reverseReconnectInterval : 15000;
+        return addRepeatedCallback(server, retryReverseConnectCallback, bpm,
+                                   reconnectInterval, &bpm->reverseConnectsCheckHandle);
+    } else if(!enabled && bpm->reverseConnectsCheckHandle) {
+        removeCallback(server, bpm->reverseConnectsCheckHandle);
+        bpm->reverseConnectsCheckHandle = 0;
     }
     return UA_STATUSCODE_GOOD;
 }
@@ -1094,16 +1494,165 @@ setReverseConnectState(UA_Server *server, reverse_connect_context *context,
                                context->callbackContext);
 }
 
-void
-UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                                 void *application, void **connectionContext,
-                                 UA_ConnectionState state, const UA_KeyValueMap *params,
-                                 UA_ByteString msg) {
-    (void)params;
+static void
+serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                             void *application, void **connectionContext,
+                             UA_ConnectionState state, const UA_KeyValueMap *params,
+                             UA_ByteString msg);
 
-    UA_Server *server = (UA_Server*)application;
+UA_StatusCode
+attemptReverseConnect(UA_BinaryProtocolManager *bpm, reverse_connect_context *context) {
+    UA_Server *server = bpm->server;
+    UA_ServerConfig *config = &server->config;
+    UA_EventLoop *el = config->eventLoop;
+
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* Find a TCP ConnectionManager */
+    UA_String tcpString = UA_STRING_STATIC("tcp");
+    for(UA_EventSource *es = el->eventSources; es != NULL; es = es->next) {
+        /* Is this a usable connection manager? */
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+        if(!UA_String_equal(&tcpString, &cm->protocol))
+            continue;
+
+        if(es->state != UA_EVENTSOURCESTATE_STARTED)
+            continue;
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        /* Set up the parameters */
+        UA_KeyValuePair params[2];
+        params[0].key = UA_QUALIFIEDNAME(0, "address");
+        UA_Variant_setScalar(&params[0].value, &context->hostname,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        params[1].key = UA_QUALIFIEDNAME(0, "port");
+        UA_Variant_setScalar(&params[1].value, &context->port,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+        UA_KeyValueMap kvm = {2, params};
+
+        /* Open the connection */
+        UA_StatusCode res = cm->openConnection(cm, &kvm, bpm, context,
+                                               serverReverseConnectCallback);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                           "Failed to create connection for reverse connect: %s\n",
+                           UA_StatusCode_name(res));
+        }
+        return res;
+    }
+
+    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                   "No ConnectionManager found for reverse connect");
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
+UA_StatusCode
+UA_Server_addReverseConnect(UA_Server *server, UA_String url,
+                            UA_Server_ReverseConnectStateCallback stateCallback,
+                            void *callbackContext, UA_UInt64 *handle) {
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_BinaryProtocolManager *bpm =
+        (UA_BinaryProtocolManager*)server->binaryProtocolManager;
+    if(!bpm) {
+        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
+                     "No BinaryProtocolManager configured");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Parse the reverse connect URL */
+    UA_String hostname = UA_STRING_NULL;
+    UA_UInt16 port = 0;
+    UA_StatusCode res = UA_parseEndpointUrl(&url, &hostname, &port, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                       "OPC UA URL is invalid: %.*s",
+                       (int)url.length, url.data);
+        return res;
+    }
+
+    /* Set up the reverse connection */
+    reverse_connect_context *newContext =
+        (reverse_connect_context *)calloc(1, sizeof(reverse_connect_context));
+    if(!newContext)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    UA_String_copy(&hostname, &newContext->hostname);
+    newContext->port = port;
+    newContext->handle = ++bpm->lastReverseConnectHandle;
+    newContext->stateCallback = stateCallback;
+    newContext->callbackContext = callbackContext;
+
+    UA_LOCK(&server->serviceMutex);
+
+    /* Register the retry callback */
+    setReverseConnectRetryCallback(bpm, true);
+
+    /* Register the new reverse connection */
+    LIST_INSERT_HEAD(&bpm->reverseConnects, newContext, next);
+
+    if(handle)
+        *handle = newContext->handle;
+
+    /* Attempt to connect right away */
+    res = attemptReverseConnect(bpm, newContext);
+
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
+    UA_StatusCode result = UA_STATUSCODE_BADNOTFOUND;
+
+    UA_LOCK(&server->serviceMutex);
+
+    UA_BinaryProtocolManager *bpm =
+        (UA_BinaryProtocolManager*)server->binaryProtocolManager;
+    if(!bpm) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                     "No BinaryProtocolManager configured");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    reverse_connect_context *rev, *temp;
+    LIST_FOREACH_SAFE(rev, &bpm->reverseConnects, next, temp) {
+        if(rev->handle != handle)
+            continue;
+
+        LIST_REMOVE(rev, next);
+
+        /* Connected -> disconnect, otherwise free immediately */
+        if(rev->currentConnection.connectionId) {
+            UA_ConnectionManager *cm = rev->currentConnection.connectionManager;
+            rev->destruction = true;
+            cm->closeConnection(cm, rev->currentConnection.connectionId);
+        } else {
+            setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
+            UA_String_clear(&rev->hostname);
+            free(rev);
+        }
+        result = UA_STATUSCODE_GOOD;
+        break;
+    }
+
+    if(LIST_EMPTY(&bpm->reverseConnects))
+        setReverseConnectRetryCallback(bpm, false);
+
+    UA_UNLOCK(&server->serviceMutex);
+
+    return result;
+}
+
+void
+serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                             void *application, void **connectionContext,
+                             UA_ConnectionState state, const UA_KeyValueMap *params,
+                             UA_ByteString msg) {
+    (void)params;
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)application;
+    UA_LOG_DEBUG(bpm->logging, UA_LOGCATEGORY_SERVER,
                  "Activity for reverse connect %lu with state %d",
                  (long unsigned)connectionId, state);
 
@@ -1114,29 +1663,38 @@ UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionI
     if(context->currentConnection.connectionId == 0) {
         context->currentConnection.connectionId = connectionId;
         context->currentConnection.connectionManager = cm;
-        setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CONNECTING);
+        setReverseConnectState(bpm->server, context, UA_SECURECHANNELSTATE_CONNECTING);
         /* Fall through -- e.g. if state == ESTABLISHED already */
     }
 
     /* The connection is closing. This is the last callback for it. */
     if(state == UA_CONNECTIONSTATE_CLOSING) {
         if(context->channel) {
-            deleteServerSecureChannel(server, context->channel);
+            deleteServerSecureChannel(bpm, context->channel);
             context->channel = NULL;
         }
 
         /* Delete the ReverseConnect entry */
         if(context->destruction) {
-            setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CLOSED);
+            setReverseConnectState(bpm->server, context, UA_SECURECHANNELSTATE_CLOSED);
             LIST_REMOVE(context, next);
             UA_String_clear(&context->hostname);
             free(context);
+
+            /* Check if the Binary Protocol Manager is stopped */
+            if(bpm->sc.state == UA_LIFECYCLESTATE_STOPPING &&
+               bpm->serverConnectionsSize == 0 &&
+               LIST_EMPTY(&bpm->reverseConnects) &&
+               TAILQ_EMPTY(&bpm->channels)) {
+                setBinaryProtocolManagerState(bpm->server, bpm,
+                                              UA_LIFECYCLESTATE_STOPPED);
+            }
             return;
         }
 
         /* Reset. Will be picked up in the regular retry callback. */
         context->currentConnection.connectionId = 0;
-        setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CONNECTING);
+        setReverseConnectState(bpm->server, context, UA_SECURECHANNELSTATE_CONNECTING);
         return;
     }
 
@@ -1147,9 +1705,9 @@ UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionI
      * createSecureChannel is used. */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(!context->channel) {
-        retval = createServerSecureChannel(server, cm, connectionId, &context->channel);
+        retval = createServerSecureChannel(bpm, cm, connectionId, &context->channel);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(bpm->logging, UA_LOGCATEGORY_SERVER,
                            "TCP %lu\t| Could not accept the reverse "
                            "connection with status %s",
                            (unsigned long)context->currentConnection.connectionId,
@@ -1159,9 +1717,9 @@ UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionI
         }
 
         /* Send the RHE message */
-        retval = sendRHEMessage(server, connectionId, cm);
+        retval = sendRHEMessage(bpm->server, connectionId, cm);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(bpm->logging, UA_LOGCATEGORY_SERVER,
                            "TCP %lu\t| Could not send the RHE message "
                            "with status %s",
                            (unsigned long)context->currentConnection.connectionId,
@@ -1171,16 +1729,16 @@ UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionI
         }
 
         context->channel->state = UA_SECURECHANNELSTATE_RHE_SENT;
-        setReverseConnectState(server, context, UA_SECURECHANNELSTATE_RHE_SENT);
+        setReverseConnectState(bpm->server, context, UA_SECURECHANNELSTATE_RHE_SENT);
         return;
     }
 
     /* The connection is fully opened and we have a SecureChannel.
      * Process the received buffer */
-    retval = UA_SecureChannel_processBuffer(context->channel, server,
+    retval = UA_SecureChannel_processBuffer(context->channel, bpm->server,
                                             processSecureChannelMessage, &msg);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, context->channel,
+        UA_LOG_WARNING_CHANNEL(bpm->logging, context->channel,
                                "Processing the message failed with error %s",
                                UA_StatusCode_name(retval));
 
@@ -1192,10 +1750,179 @@ UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionI
         UA_SecureChannel_sendError(context->channel, &error);
         UA_SecureChannel_shutdown(context->channel);
 
-        setReverseConnectState(server, context, UA_SECURECHANNELSTATE_CLOSING);
+        setReverseConnectState(bpm->server, context, UA_SECURECHANNELSTATE_CLOSING);
         return;
     }
 
     /* Update the state with the current SecureChannel state */
-    setReverseConnectState(server, context, context->channel->state);
+    setReverseConnectState(bpm->server, context, context->channel->state);
+}
+
+/***************************/
+/* Binary Protocol Manager */
+/***************************/
+
+static UA_StatusCode
+UA_BinaryProtocolManager_start(UA_Server *server,
+                               UA_ServerComponent *sc) {
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)sc;
+    UA_ServerConfig *config = &server->config;
+    
+    UA_StatusCode retVal =
+        addRepeatedCallback(server, secureChannelHouseKeeping,
+                            bpm, 1000.0, &bpm->houseKeepingCallbackId);
+    if(retVal != UA_STATUSCODE_GOOD)
+        return retVal;
+
+    /* Open server sockets */
+    UA_Boolean haveServerSocket = false;
+    if(config->serverUrlsSize == 0) {
+        /* Empty hostname -> listen on all devices */
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                       "No Server URL configured. Using \"opc.tcp://:4840\" "
+                       "to configure the listen socket.");
+        UA_String defaultUrl = UA_STRING("opc.tcp://:4840");
+        retVal = createServerConnection(bpm, &defaultUrl);
+        if(retVal == UA_STATUSCODE_GOOD)
+            haveServerSocket = true;
+    } else {
+        for(size_t i = 0; i < config->serverUrlsSize; i++) {
+            retVal = createServerConnection(bpm, &config->serverUrls[i]);
+            if(retVal == UA_STATUSCODE_GOOD)
+                haveServerSocket = true;
+        }
+    }
+
+    if(!haveServerSocket) {
+        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
+                     "The server has no server socket");
+    }
+
+    /* Update the application description to include the server urls for
+     * discovery. Don't add the urls with an empty host (listening on all
+     * interfaces) */
+    for(size_t i = 0; i < config->serverUrlsSize; i++) {
+        UA_String hostname = UA_STRING_NULL;
+        UA_String path = UA_STRING_NULL;
+        UA_UInt16 port = 0;
+        retVal = UA_parseEndpointUrl(&config->serverUrls[i],
+                                     &hostname, &port, &path);
+        if(retVal != UA_STATUSCODE_GOOD || hostname.length == 0)
+            continue;
+
+        /* Check if the ServerUrl is already present in the DiscoveryUrl array.
+         * Add if not already there. */
+        size_t j = 0;
+        for(; j < config->applicationDescription.discoveryUrlsSize; j++) {
+            if(UA_String_equal(&config->serverUrls[i],
+                               &config->applicationDescription.discoveryUrls[j]))
+                break;
+        }
+        if(j == config->applicationDescription.discoveryUrlsSize) {
+            retVal =
+                UA_Array_appendCopy((void**)&config->applicationDescription.discoveryUrls,
+                                    &config->applicationDescription.discoveryUrlsSize,
+                                    &config->serverUrls[i], &UA_TYPES[UA_TYPES_STRING]);
+            (void)retVal;
+        }
+    }
+
+    /* Set the state to started */
+    setBinaryProtocolManagerState(bpm->server, bpm,
+                                  UA_LIFECYCLESTATE_STARTED);
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+UA_BinaryProtocolManager_stop(UA_Server *server,
+                              UA_ServerComponent *comp) {
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)comp;
+
+    /* Stop the Housekeeping Task */
+    removeCallback(server, bpm->houseKeepingCallbackId);
+    bpm->houseKeepingCallbackId = 0;
+
+    /* Stop the regular retry callback */
+    setReverseConnectRetryCallback(bpm, false);
+
+    /* Close or free all reverse connections */
+    reverse_connect_context *rev, *rev_tmp;
+    LIST_FOREACH_SAFE(rev, &bpm->reverseConnects, next, rev_tmp) {
+        if(rev->currentConnection.connectionId) {
+            UA_ConnectionManager *cm = rev->currentConnection.connectionManager;
+            rev->destruction = true;
+            cm->closeConnection(cm, rev->currentConnection.connectionId);
+        } else {
+            LIST_REMOVE(rev, next);
+            setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
+            UA_String_clear(&rev->hostname);
+            free(rev);
+        }
+    }
+
+    /* Stop all SecureChannels */
+    channel_entry *entry;
+    TAILQ_FOREACH(entry, &bpm->channels, pointers) {
+        entry->closeEvent = UA_DIAGNOSTICEVENT_CLOSE;
+        UA_SecureChannel_shutdown(&entry->channel);
+    }
+
+    /* Stop all server sockets */
+    for(size_t i = 0; i < UA_MAXSERVERCONNECTIONS; i++) {
+        UA_ServerConnection *sc = &bpm->serverConnections[i];
+        UA_ConnectionManager *cm = sc->connectionManager;
+        if(sc->connectionId > 0)
+            cm->closeConnection(cm, sc->connectionId);
+    }
+
+    /* If open sockets remain, set to STOPPING */
+    if(bpm->serverConnectionsSize == 0 &&
+       LIST_EMPTY(&bpm->reverseConnects) &&
+       TAILQ_EMPTY(&bpm->channels)) {
+        setBinaryProtocolManagerState(bpm->server, bpm,
+                                      UA_LIFECYCLESTATE_STOPPED);
+    } else {
+        setBinaryProtocolManagerState(bpm->server, bpm,
+                                      UA_LIFECYCLESTATE_STOPPING);
+    }
+}
+
+static UA_StatusCode
+UA_BinaryProtocolManager_free(UA_Server *server,
+                              UA_ServerComponent *sc) {
+    if(sc->state != UA_LIFECYCLESTATE_STOPPED)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    server->binaryProtocolManager = NULL;
+    UA_free(sc);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_ServerComponent *
+UA_BinaryProtocolManager_new(UA_Server *server) {
+    /* There can be only one BinaryProtocolManager per server */
+    if(server->binaryProtocolManager)
+        return NULL;
+    
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)
+        UA_calloc(1, sizeof(UA_BinaryProtocolManager));
+    if(!bpm)
+        return NULL;
+
+    bpm->server = server;
+    bpm->logging = &server->config.logger;
+    server->binaryProtocolManager = &bpm->sc;
+
+    /* Initialize SecureChannel */
+    TAILQ_INIT(&bpm->channels);
+
+    /* TODO: use an ID that is likely to be unique after a restart */
+    bpm->lastChannelId = STARTCHANNELID;
+    bpm->lastTokenId = STARTTOKENID;
+
+    bpm->sc.start = UA_BinaryProtocolManager_start;
+    bpm->sc.stop = UA_BinaryProtocolManager_stop;
+    bpm->sc.free = UA_BinaryProtocolManager_free;
+    return &bpm->sc;
 }
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 22bbe2e5d0b..9f3689573c5 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -51,12 +51,13 @@ typedef struct {
     } callback;
 } UA_LocalMonitoredItem;
 
-#endif
+#endif /* !UA_ENABLE_SUBSCRIPTIONS */
 
-/* Server Component
- * ----------------
- *
- * ServerComponents have an explicit lifecycle. But they can only be started
+/********************/
+/* Server Component */
+/********************/
+
+/* ServerComponents have an explicit lifecycle. But they can only be started
  * when the underlying server is started. The starting/stopping of
  * ServerComponents is asynchronous. That is, they might require several
  * iterations of the EventLoop to finish starting/stopping.
@@ -81,6 +82,11 @@ typedef struct UA_ServerComponent {
     /* Clean up the ServerComponent. Can fail if it is not stopped. */
     UA_StatusCode (*free)(UA_Server *server,
                           struct UA_ServerComponent *sc);
+
+    /* To be set by the server. So the component can notify the server about
+     * asynchronous state changes. */
+    void (*notifyState)(UA_Server *server, struct UA_ServerComponent *sc,
+                        UA_LifecycleState state);
 } UA_ServerComponent;
 
 enum ZIP_CMP
@@ -97,20 +103,9 @@ void
 addServerComponent(UA_Server *server, UA_ServerComponent *sc,
                    UA_UInt64 *identifier);
 
-typedef enum {
-    UA_DIAGNOSTICEVENT_CLOSE,
-    UA_DIAGNOSTICEVENT_REJECT,
-    UA_DIAGNOSTICEVENT_SECURITYREJECT,
-    UA_DIAGNOSTICEVENT_TIMEOUT,
-    UA_DIAGNOSTICEVENT_ABORT,
-    UA_DIAGNOSTICEVENT_PURGE
-} UA_DiagnosticEvent;
-
-typedef struct channel_entry {
-    TAILQ_ENTRY(channel_entry) pointers;
-    UA_SecureChannel channel;
-    UA_DiagnosticEvent closeEvent;
-} channel_entry;
+/********************/
+/* Server Structure */
+/********************/
 
 typedef struct session_list_entry {
     UA_DelayedCallback cleanupCallback;
@@ -118,34 +113,6 @@ typedef struct session_list_entry {
     UA_Session session;
 } session_list_entry;
 
-/* Maximum numbers of sockets to listen on */
-#define UA_MAXSERVERCONNECTIONS 16
-
-typedef struct {
-    UA_ConnectionState state;
-    uintptr_t connectionId;
-    UA_ConnectionManager *connectionManager;
-} UA_ServerConnection;
-
-typedef struct reverse_connect_context {
-    UA_String hostname;
-    UA_UInt16 port;
-    UA_UInt64 handle;
-
-    UA_SecureChannelState state;
-    UA_Server_ReverseConnectStateCallback stateCallback;
-    void *callbackContext;
-
-     /* If this is set to true, the reverse connection is removed/freed when the
-      * connection closes. Otherwise we try to reconnect when the connection
-      * closes. */
-    UA_Boolean destruction;
-
-    UA_ServerConnection currentConnection;
-    UA_SecureChannel *channel;
-    LIST_ENTRY(reverse_connect_context) next;
-} reverse_connect_context;
-
 struct UA_Server {
     /* Config */
     UA_ServerConfig config;
@@ -164,17 +131,6 @@ struct UA_Server {
     UA_UInt64 serverComponentIds; /* Counter to assign ids from */
     UA_ServerComponentTree serverComponents;
 
-    UA_ServerConnection serverConnections[UA_MAXSERVERCONNECTIONS];
-    size_t serverConnectionsSize;
-
-    UA_ConnectionConfig tcpConnectionConfig; /* Extracted from the server config
-                                              * parameters */
-
-    /* SecureChannels */
-    TAILQ_HEAD(, channel_entry) channels;
-    UA_UInt32 lastChannelId;
-    UA_UInt32 lastTokenId;
-
 #if UA_MULTITHREADING >= 100
     UA_AsyncManager asyncManager;
 #endif
@@ -195,7 +151,10 @@ struct UA_Server {
      * the parent and member instantiation */
     UA_Boolean bootstrapNS0;
 
-    /* Discovery */
+    /* Binary Protocol Manager -- also in the ServerComponents list */
+    UA_ServerComponent *binaryProtocolManager;
+
+    /* Discovery Manager -- also in the ServerComponents list */
 #ifdef UA_ENABLE_DISCOVERY
     UA_DiscoveryManager *discoveryManager;
 #endif
@@ -217,7 +176,6 @@ struct UA_Server {
     LIST_HEAD(, UA_ConditionSource) conditionSources;
     UA_NodeId refreshEvents[2];
 # endif
-
 #endif
 
     /* Publish/Subscribe */
@@ -232,10 +190,6 @@ struct UA_Server {
     /* Statistics */
     UA_SecureChannelStatistics secureChannelStatistics;
     UA_ServerDiagnosticsSummaryDataType serverDiagnosticsSummary;
-
-    LIST_HEAD(, reverse_connect_context) reverseConnects;
-    UA_UInt64 reverseConnectsCheckHandle;
-    UA_UInt64 lastReverseConnectHandle;
 };
 
 /***********************/
@@ -261,44 +215,39 @@ ZIP_FUNCTIONS(UA_ReferenceNameTree, UA_ReferenceTargetTreeElem, nameTreeEntry,
 /* SecureChannel Handling */
 /**************************/
 
-/* Remove all securechannels */
-void
-UA_Server_deleteSecureChannels(UA_Server *server);
+typedef enum {
+    UA_DIAGNOSTICEVENT_CLOSE,
+    UA_DIAGNOSTICEVENT_REJECT,
+    UA_DIAGNOSTICEVENT_SECURITYREJECT,
+    UA_DIAGNOSTICEVENT_TIMEOUT,
+    UA_DIAGNOSTICEVENT_ABORT,
+    UA_DIAGNOSTICEVENT_PURGE
+} UA_DiagnosticEvent;
 
-/* Remove timed out securechannels with a delayed callback. So all currently
- * scheduled jobs with a pointer to a securechannel can finish first. */
 void
-UA_Server_cleanupTimedOutSecureChannels(UA_Server *server, UA_DateTime nowMonotonic);
-
+serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                      void *application, void **connectionContext,
+                      UA_ConnectionState state,
+                      const UA_KeyValueMap *params,
+                      UA_ByteString msg);
 
 UA_StatusCode
 sendServiceFault(UA_SecureChannel *channel, UA_UInt32 requestId,
                  UA_UInt32 requestHandle, UA_StatusCode statusCode);
 
-/* Called only from within the network callback */
-UA_StatusCode
-createServerSecureChannel(UA_Server *server, UA_ConnectionManager *cm,
-                          uintptr_t connectionId, UA_SecureChannel **outChannel);
-
-UA_StatusCode
-configServerSecureChannel(void *application, UA_SecureChannel *channel,
-                          const UA_AsymmetricAlgorithmSecurityHeader *asymHeader);
-
 /* Can be called at any time */
 void
 shutdownServerSecureChannel(UA_Server *server, UA_SecureChannel *channel,
                             UA_DiagnosticEvent event);
 
-/* Called only from within the network callback */
-void
-deleteServerSecureChannel(UA_Server *server, UA_SecureChannel *channel);
-
 /* Gets the a pointer to the context of a security policy supported by the
  * server matched by the security policy uri. */
 UA_SecurityPolicy *
 getSecurityPolicyByUri(const UA_Server *server,
                        const UA_ByteString *securityPolicyUri);
 
+UA_UInt32
+generateSecureChannelTokenId(UA_Server *server);
 
 /********************/
 /* Session Handling */
@@ -441,21 +390,6 @@ UA_Server_processServiceOperations(UA_Server *server, UA_Session *session,
                                    const UA_DataType *responseOperationsType)
     UA_FUNC_ATTR_WARN_UNUSED_RESULT;
 
-/* Processing for the binary protocol (SecureChannel) */
-void
-UA_Server_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                          void *application, void **connectionContext,
-                          UA_ConnectionState state,
-                          const UA_KeyValueMap *params,
-                          UA_ByteString msg);
-
-/* Processing for reverse connect */
-void
-UA_Server_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                                 void *application, void **connectionContext,
-                                 UA_ConnectionState state, const UA_KeyValueMap *params,
-                                 UA_ByteString msg);
-
 /******************************************/
 /* Internal function calls, without locks */
 /******************************************/
@@ -616,6 +550,9 @@ register_server_with_discovery_server(UA_Server *server, void *client,
                                       const char* semaphoreFilePath);
 #endif
 
+UA_ServerComponent *
+UA_BinaryProtocolManager_new(UA_Server *server);
+
 /***********/
 /* RefTree */
 /***********/
@@ -904,13 +841,6 @@ UA_StatusCode
 UA_Node_insertOrUpdateDescription(UA_NodeHead *head,
                                   const UA_LocalizedText *value);
 
-
-/* Reverse connect */
-void setReverseConnectState(UA_Server *server, reverse_connect_context *context,
-                            UA_SecureChannelState newState);
-UA_StatusCode attemptReverseConnect(UA_Server *server, reverse_connect_context *context);
-UA_StatusCode setReverseConnectRetryCallback(UA_Server *server, UA_Boolean enabled);
-
 _UA_END_DECLS
 
 #endif /* UA_SERVER_INTERNAL_H_ */
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index bef6fbdfcfc..ef0baff1e02 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -12,234 +12,9 @@
 #include "ua_server_internal.h"
 #include "ua_services.h"
 
-#ifndef container_of
-#define container_of(ptr, type, member) \
-    (type *)((uintptr_t)ptr - offsetof(type,member))
-#endif
-
-void
-deleteServerSecureChannel(UA_Server *server, UA_SecureChannel *channel) {
-    UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel closed");
-
-    /* Clean up the SecureChannel. This is the only place where
-     * UA_SecureChannel_clear must be called within the server code-base. */
-    UA_SecureChannel_clear(channel);
-
-    /* Detach the channel from the server list */
-    struct channel_entry *entry = container_of(channel, channel_entry, channel);
-    TAILQ_REMOVE(&server->channels, entry, pointers);
-
-    /* Update the statistics */
-    UA_SecureChannelStatistics *scs = &server->secureChannelStatistics;
-    scs->currentChannelCount--;
-    switch(entry->closeEvent) {
-    case UA_DIAGNOSTICEVENT_CLOSE:
-        break;
-    case UA_DIAGNOSTICEVENT_TIMEOUT:
-        scs->channelTimeoutCount++;
-        break;
-    case UA_DIAGNOSTICEVENT_PURGE:
-        scs->channelPurgeCount++;
-        break;
-    case UA_DIAGNOSTICEVENT_REJECT:
-    case UA_DIAGNOSTICEVENT_SECURITYREJECT:
-        scs->rejectedChannelCount++;
-        break;
-    case UA_DIAGNOSTICEVENT_ABORT:
-        scs->channelAbortCount++;
-        break;
-    default:
-        UA_assert(false);
-        break;
-    }
-
-    UA_free(entry);
-}
-
-/* Trigger the closing of the SecureChannel. This needs one iteration of the
- * eventloop to take effect. */
-void
-shutdownServerSecureChannel(UA_Server *server, UA_SecureChannel *channel,
-                            UA_DiagnosticEvent event) {
-    /* Does the channel have an open socket? */
-    if(!UA_SecureChannel_isConnected(channel))
-        return;
-
-    UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "Closing the channel");
-
-    /* Set the event for diagnostics. The shutdown event is used in the
-     * deleteServerSecureChannel callback. */
-    struct channel_entry *entry = container_of(channel, channel_entry, channel);
-    entry->closeEvent = event;
-
-    /* Close the connection in the event-loop, which in the next iteration of
-     * the eventloop triggers the final deletion. This also sets the state to
-     * "closing". */
-    UA_SecureChannel_shutdown(channel);
-}
-
-void
-UA_Server_deleteSecureChannels(UA_Server *server) {
-    channel_entry *entry;
-    TAILQ_FOREACH(entry, &server->channels, pointers) {
-        shutdownServerSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_CLOSE);
-    }
-}
-
-/* Remove channels that were not renewed in time */
-void
-UA_Server_cleanupTimedOutSecureChannels(UA_Server *server,
-                                        UA_DateTime nowMonotonic) {
-    channel_entry *entry;
-    TAILQ_FOREACH(entry, &server->channels, pointers) {
-        /* Compute the timeout date of the SecurityToken */
-        UA_DateTime timeout =
-            entry->channel.securityToken.createdAt +
-            (UA_DateTime)(entry->channel.securityToken.revisedLifetime * UA_DATETIME_MSEC);
-
-        /* The token has timed out. Try to do the token revolving now instead of
-         * shutting the channel down.
-         *
-         * Part 4, 5.5.2 says: Servers shall use the existing SecurityToken to
-         * secure outgoing Messages until the SecurityToken expires or the
-         * Server receives a Message secured with a new SecurityToken.*/
-        if(timeout < nowMonotonic &&
-           entry->channel.renewState == UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER) {
-            /* Revolve the token manually. This is otherwise done in checkSymHeader. */
-            entry->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
-            entry->channel.securityToken = entry->channel.altSecurityToken;
-            UA_ChannelSecurityToken_init(&entry->channel.altSecurityToken);
-            UA_SecureChannel_generateLocalKeys(&entry->channel);
-            generateRemoteKeys(&entry->channel);
-
-            /* Use the timeout of the new SecurityToken */
-            timeout = entry->channel.securityToken.createdAt +
-                (UA_DateTime)(entry->channel.securityToken.revisedLifetime * UA_DATETIME_MSEC);
-        }
-
-        if(timeout < nowMonotonic) {
-            UA_LOG_INFO_CHANNEL(&server->config.logger, &entry->channel,
-                                "SecureChannel has timed out");
-            shutdownServerSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_TIMEOUT);
-        }
-    }
-}
-
-/* remove the first channel that has no session attached */
-static UA_Boolean
-purgeFirstChannelWithoutSession(UA_Server *server) {
-    channel_entry *entry;
-    TAILQ_FOREACH(entry, &server->channels, pointers) {
-        if(SLIST_FIRST(&entry->channel.sessions))
-            continue;
-        UA_LOG_INFO_CHANNEL(&server->config.logger, &entry->channel,
-                            "Channel was purged since maxSecureChannels was "
-                            "reached and channel had no session attached");
-        shutdownServerSecureChannel(server, &entry->channel, UA_DIAGNOSTICEVENT_PURGE);
-        return true;
-    }
-    return false;
-}
-
-UA_StatusCode
-createServerSecureChannel(UA_Server *server, UA_ConnectionManager *cm,
-                          uintptr_t connectionId, UA_SecureChannel **outChannel) {
-    UA_ServerConfig *config = &server->config;
-
-    /* Check if we have space for another SC, otherwise try to find an SC
-     * without a session and purge it */
-    UA_SecureChannelStatistics *scs = &server->secureChannelStatistics;
-    if(scs->currentChannelCount >= config->maxSecureChannels &&
-       !purgeFirstChannelWithoutSession(server))
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
-    /* Allocate memory for the SecureChannel */
-    channel_entry *entry = (channel_entry *)UA_malloc(sizeof(channel_entry));
-    if(!entry)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
-    /* Set up the initial connection config */
-    UA_ConnectionConfig connConfig;
-    connConfig.protocolVersion = 0;
-    connConfig.recvBufferSize = config->tcpBufSize;
-    connConfig.sendBufferSize = config->tcpBufSize;
-    connConfig.localMaxMessageSize = config->tcpMaxMsgSize;
-    connConfig.remoteMaxMessageSize = config->tcpMaxMsgSize;
-    connConfig.localMaxChunkCount = config->tcpMaxChunks;
-    connConfig.remoteMaxChunkCount = config->tcpMaxChunks;
-
-    if(connConfig.recvBufferSize == 0)
-        connConfig.recvBufferSize = 1 << 16; /* 64kB */
-    if(connConfig.sendBufferSize == 0)
-        connConfig.sendBufferSize = 1 << 16; /* 64kB */
-
-    /* Set up the new SecureChannel */
-    UA_SecureChannel_init(&entry->channel);
-    entry->channel.config = connConfig;
-    entry->channel.certificateVerification = &config->certificateVerification;
-    entry->channel.processOPNHeader = configServerSecureChannel;
-    entry->channel.connectionManager = cm;
-    entry->channel.connectionId = connectionId;
-    entry->closeEvent = UA_DIAGNOSTICEVENT_CLOSE; /* Used if the eventloop closes */
-
-    /* Set the SecureChannel identifier already here. So we get the right
-     * identifier for logging right away. The rest of the SecurityToken is set
-     * in UA_SecureChannelManager_open. Set the ChannelId also in the
-     * alternative security token, we don't touch this value during the token
-     * rollover. */
-    entry->channel.securityToken.channelId = server->lastChannelId++;
-    entry->channel.altSecurityToken.channelId = entry->channel.securityToken.channelId;
-
-    /* Set an initial timeout before the negotiation handshake. So the channel
-     * is caught in UA_Server_cleanupTimedOutSecureChannels if the client is
-     * unresponsive.
-     *
-     * TODO: Make this a configuration option */
-    entry->channel.securityToken.createdAt = UA_DateTime_nowMonotonic();
-    entry->channel.securityToken.revisedLifetime = 10000; /* 10s should be enough */
-
-    /* Add to the server's list */
-    TAILQ_INSERT_TAIL(&server->channels, entry, pointers);
-
-    /* Update the statistics */
-    server->secureChannelStatistics.currentChannelCount++;
-    server->secureChannelStatistics.cumulatedChannelCount++;
-
-    *outChannel = &entry->channel;
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-configServerSecureChannel(void *application, UA_SecureChannel *channel,
-                          const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
-    /* Iterate over available endpoints and choose the correct one */
-    UA_SecurityPolicy *securityPolicy = NULL;
-    UA_Server *const server = (UA_Server *const) application;
-    for(size_t i = 0; i < server->config.securityPoliciesSize; ++i) {
-        UA_SecurityPolicy *policy = &server->config.securityPolicies[i];
-        if(!UA_ByteString_equal(&asymHeader->securityPolicyUri, &policy->policyUri))
-            continue;
-
-        UA_StatusCode res = policy->asymmetricModule.
-            compareCertificateThumbprint(policy, &asymHeader->receiverCertificateThumbprint);
-        if(res != UA_STATUSCODE_GOOD)
-            continue;
-
-        /* We found the correct policy (except for security mode). The endpoint
-         * needs to be selected by the client / server to match the security
-         * mode in the endpoint for the session. */
-        securityPolicy = policy;
-        break;
-    }
-
-    if(!securityPolicy)
-        return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
-
-    /* Create the channel context and parse the sender (remote) certificate used
-     * for the secureChannel. */
-    return UA_SecureChannel_setSecurityPolicy(channel, securityPolicy,
-                                              &asymHeader->senderCertificate);
-}
+/* This contains the SecureChannel Services to be called after validation and
+ * decoding of the message. The main SecureChannel logic is handled in
+ * /src/ua_securechannel.* and /src/server/ua_server_binary.c. */
 
 static UA_StatusCode
 UA_SecureChannelManager_open(UA_Server *server, UA_SecureChannel *channel,
@@ -262,7 +37,7 @@ UA_SecureChannelManager_open(UA_Server *server, UA_SecureChannel *channel,
      * the primary token when the first symmetric message triggers a token
      * revolve. Lifetime 0 -> set the maximum possible lifetime */
     channel->renewState = UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER;
-    channel->altSecurityToken.tokenId = server->lastTokenId++;
+    channel->altSecurityToken.tokenId = generateSecureChannelTokenId(server);
     channel->altSecurityToken.createdAt = UA_DateTime_nowMonotonic();
     channel->altSecurityToken.revisedLifetime =
         (request->requestedLifetime > server->config.maxSecurityTokenLifetime) ?
@@ -314,7 +89,7 @@ UA_SecureChannelManager_renew(UA_Server *server, UA_SecureChannel *channel,
     /* Create a new SecurityToken. Will be switched over when the first message
      * is received. The ChannelId is left unchanged. */
     channel->altSecurityToken = channel->securityToken;
-    channel->altSecurityToken.tokenId = server->lastTokenId++;
+    channel->altSecurityToken.tokenId = generateSecureChannelTokenId(server);
     channel->altSecurityToken.createdAt = UA_DateTime_nowMonotonic();
     channel->altSecurityToken.revisedLifetime =
         (request->requestedLifetime > server->config.maxSecurityTokenLifetime) ?
diff --git a/tests/fuzz/fuzz_binary_message.cc b/tests/fuzz/fuzz_binary_message.cc
index bd9e5fef431..ea8758e807b 100644
--- a/tests/fuzz/fuzz_binary_message.cc
+++ b/tests/fuzz/fuzz_binary_message.cc
@@ -61,7 +61,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     memcpy(msg.data, data, size);
 
     void *ctx = NULL;
-    UA_Server_networkCallback(&testConnectionManagerTCP, 0, server,
+    serverNetworkCallback(&testConnectionManagerTCP, 0, server,
                               &ctx, UA_CONNECTIONSTATE_ESTABLISHED,
                               &UA_KEYVALUEMAP_NULL, msg);
 

From cb1c4b4781813e35245a58230d4ea41c2d85e000 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Apr 2023 00:44:59 +0200
Subject: [PATCH 0919/1963] refactor(server): Lookup of server components by
 name

---
 src/server/ua_discovery_manager.c            |  8 +------
 src/server/ua_server.c                       | 23 ++++++++++++++++---
 src/server/ua_server_binary.c                | 24 +++++++++-----------
 src/server/ua_server_internal.h              | 12 ++++------
 src/server/ua_services_discovery.c           |  9 +++++---
 src/server/ua_services_discovery_multicast.c | 18 ++++++++++-----
 6 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index d8a94c2b85a..d3d21c120d8 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -175,10 +175,6 @@ UA_DiscoveryManager_stop(UA_Server *server,
 
 UA_ServerComponent *
 UA_DiscoveryManager_new(UA_Server *server) {
-    /* There can be only one DiscoveryManager per server */
-    if(server->discoveryManager)
-        return NULL;
-
     UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
         UA_calloc(1, sizeof(UA_DiscoveryManager));
     if(!dm)
@@ -206,9 +202,7 @@ UA_DiscoveryManager_new(UA_Server *server) {
     dm->serverOnNetworkCallbackData = NULL;
 #endif /* UA_ENABLE_DISCOVERY_MULTICAST */
 
-    /* Register in the server */
-    server->discoveryManager = dm;
-
+    dm->sc.name = UA_STRING("discovery");
     dm->sc.start = UA_DiscoveryManager_start;
     dm->sc.stop = UA_DiscoveryManager_stop;
     dm->sc.free = UA_DiscoveryManager_free;
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 6b1276bac61..aa37429ad21 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -198,6 +198,19 @@ addServerComponent(UA_Server *server, UA_ServerComponent *sc,
         *identifier = sc->identifier;
 }
 
+static void *
+findServerComponent(void *context, UA_ServerComponent *sc) {
+    UA_String *name = (UA_String*)context;
+    return (UA_String_equal(&sc->name, name)) ? sc : NULL;
+}
+
+UA_ServerComponent *
+getServerComponentByName(UA_Server *server, UA_String name) {
+    return (UA_ServerComponent*)
+        ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
+                 findServerComponent, &name);
+}
+
 static void *
 removeServerComponent(void *application, UA_ServerComponent *sc) {
     UA_assert(sc->state == UA_LIFECYCLESTATE_STOPPED);
@@ -568,9 +581,13 @@ UA_Server_updateCertificate(UA_Server *server,
 
     /* Gracefully close all SecureChannels. And restart the
      * BinaryProtocolManager once it has fully stopped. */
-    if(closeSecureChannels && server->binaryProtocolManager) {
-        server->binaryProtocolManager->notifyState = notifySecureChannelsStopped;
-        server->binaryProtocolManager->stop(server, server->binaryProtocolManager);
+    if(closeSecureChannels) {
+        UA_ServerComponent *binaryProtocolManager =
+            getServerComponentByName(server, UA_STRING("binary"));
+        if(binaryProtocolManager) {
+            binaryProtocolManager->notifyState = notifySecureChannelsStopped;
+            binaryProtocolManager->stop(server, binaryProtocolManager);
+        }
     }
 
     size_t i = 0;
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 9cfb48f5ccb..be085c4534c 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -115,14 +115,15 @@ UA_StatusCode setReverseConnectRetryCallback(UA_BinaryProtocolManager *bpm,
 
 UA_UInt32
 generateSecureChannelTokenId(UA_Server *server) {
-    UA_BinaryProtocolManager *bpm =
-        (UA_BinaryProtocolManager*)server->binaryProtocolManager;
-    if(!bpm) {
+    UA_ServerComponent *sc =
+        getServerComponentByName(server, UA_STRING("binary"));
+    if(!sc) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Cannot generate a SecureChannel Token Id. "
                      "No BinaryProtocolManager configured.");
         return 0;
     }
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)sc;
     return bpm->lastTokenId++;
 }
 
@@ -1553,8 +1554,9 @@ UA_Server_addReverseConnect(UA_Server *server, UA_String url,
                             UA_Server_ReverseConnectStateCallback stateCallback,
                             void *callbackContext, UA_UInt64 *handle) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_BinaryProtocolManager *bpm =
-        (UA_BinaryProtocolManager*)server->binaryProtocolManager;
+    UA_ServerComponent *sc =
+        getServerComponentByName(server, UA_STRING("binary"));
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)sc;
     if(!bpm) {
         UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
                      "No BinaryProtocolManager configured");
@@ -1608,8 +1610,9 @@ UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
 
     UA_LOCK(&server->serviceMutex);
 
-    UA_BinaryProtocolManager *bpm =
-        (UA_BinaryProtocolManager*)server->binaryProtocolManager;
+    UA_ServerComponent *sc =
+        getServerComponentByName(server, UA_STRING("binary"));
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)sc;
     if(!bpm) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "No BinaryProtocolManager configured");
@@ -1894,17 +1897,12 @@ UA_BinaryProtocolManager_free(UA_Server *server,
     if(sc->state != UA_LIFECYCLESTATE_STOPPED)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    server->binaryProtocolManager = NULL;
     UA_free(sc);
     return UA_STATUSCODE_GOOD;
 }
 
 UA_ServerComponent *
 UA_BinaryProtocolManager_new(UA_Server *server) {
-    /* There can be only one BinaryProtocolManager per server */
-    if(server->binaryProtocolManager)
-        return NULL;
-    
     UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)
         UA_calloc(1, sizeof(UA_BinaryProtocolManager));
     if(!bpm)
@@ -1912,7 +1910,6 @@ UA_BinaryProtocolManager_new(UA_Server *server) {
 
     bpm->server = server;
     bpm->logging = &server->config.logger;
-    server->binaryProtocolManager = &bpm->sc;
 
     /* Initialize SecureChannel */
     TAILQ_INIT(&bpm->channels);
@@ -1921,6 +1918,7 @@ UA_BinaryProtocolManager_new(UA_Server *server) {
     bpm->lastChannelId = STARTCHANNELID;
     bpm->lastTokenId = STARTTOKENID;
 
+    bpm->sc.name = UA_STRING("binary");
     bpm->sc.start = UA_BinaryProtocolManager_start;
     bpm->sc.stop = UA_BinaryProtocolManager_stop;
     bpm->sc.free = UA_BinaryProtocolManager_free;
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 9f3689573c5..a0bb5c7ad40 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -67,6 +67,7 @@ typedef struct {
 
 typedef struct UA_ServerComponent {
     UA_UInt64 identifier;
+    UA_String name;
     ZIP_ENTRY(UA_ServerComponent) treeEntry;
     UA_LifecycleState state;
 
@@ -103,6 +104,9 @@ void
 addServerComponent(UA_Server *server, UA_ServerComponent *sc,
                    UA_UInt64 *identifier);
 
+UA_ServerComponent *
+getServerComponentByName(UA_Server *server, UA_String name);
+
 /********************/
 /* Server Structure */
 /********************/
@@ -151,14 +155,6 @@ struct UA_Server {
      * the parent and member instantiation */
     UA_Boolean bootstrapNS0;
 
-    /* Binary Protocol Manager -- also in the ServerComponents list */
-    UA_ServerComponent *binaryProtocolManager;
-
-    /* Discovery Manager -- also in the ServerComponents list */
-#ifdef UA_ENABLE_DISCOVERY
-    UA_DiscoveryManager *discoveryManager;
-#endif
-
     /* Subscriptions */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     size_t subscriptionsSize;  /* Number of active subscriptions */
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index f662157f89b..0076f8c5dcc 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -123,7 +123,8 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
 
     response->serversSize = 1;
 #else
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(!dm) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
         return;
@@ -276,7 +277,8 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
                        UA_DiagnosticInfo *responseDiagnosticInfos) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(!dm)
         return;
 
@@ -539,7 +541,8 @@ UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
                                             UA_UInt64 *periodicCallbackId) {
     UA_LOCK(&server->serviceMutex);
 
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(!dm) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index a79f61bebb2..994fb6839ae 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -48,7 +48,8 @@ discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg);
 
 static void
 multicastPolling(UA_Server *server, void *_) {
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(!dm)
         return;
 
@@ -187,7 +188,8 @@ discovery_createMulticastSocket(UA_Server* server) {
 void
 startMulticastDiscoveryServer(UA_Server *server) {
     /* Initialize the mdns daemon */
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(!dm)
         return;
 
@@ -234,7 +236,8 @@ startMulticastDiscoveryServer(UA_Server *server) {
 
 void
 stopMulticastDiscoveryServer(UA_Server *server) {
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(!dm)
         return;
 
@@ -307,7 +310,8 @@ Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
                              UA_FindServersOnNetworkResponse *response) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(!dm) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
         return;
@@ -416,7 +420,8 @@ UA_Server_setServerOnNetworkCallback(UA_Server *server,
                                      UA_Server_serverOnNetworkCallback cb,
                                      void* data) {
     UA_LOCK(&server->serviceMutex);
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(dm) {
         dm->serverOnNetworkCallback = cb;
         dm->serverOnNetworkCallbackData = data;
@@ -493,7 +498,8 @@ UA_Discovery_recordExists(UA_DiscoveryManager *dm, const char* fullServiceDomain
 static int
 discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
     UA_Server *server = (UA_Server*) arg;
-    UA_DiscoveryManager *dm = server->discoveryManager;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
     if(!dm)
         return 0;
 

From 11f8b88ad54bb0e9abf67630c7cda8f95b30972e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Apr 2023 19:13:51 +0200
Subject: [PATCH 0920/1963] refactor(core): Add shutdownReason directly to
 SecureChannel

---
 include/open62541/common.h             |   9 +++
 src/client/ua_client_connect.c         |   2 +-
 src/server/ua_server.c                 |  10 +--
 src/server/ua_server_binary.c          | 104 ++++++++++---------------
 src/server/ua_server_internal.h        |  18 +----
 src/server/ua_services_securechannel.c |   2 +-
 src/server/ua_services_session.c       |  30 +++----
 src/server/ua_session.c                |   2 +-
 src/ua_securechannel.c                 |   6 +-
 src/ua_securechannel.h                 |   4 +-
 src/ua_securechannel_crypto.c          |   2 +-
 11 files changed, 82 insertions(+), 107 deletions(-)

diff --git a/include/open62541/common.h b/include/open62541/common.h
index 7fb10233681..919650fea7f 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -210,6 +210,15 @@ typedef enum {
  * specification. The SecureChannel counters are not defined in the OPC UA spec,
  * but are harmonized with the Session layer counters if possible. */
 
+typedef enum {
+    UA_SHUTDOWNREASON_CLOSE = 0,
+    UA_SHUTDOWNREASON_REJECT,
+    UA_SHUTDOWNREASON_SECURITYREJECT,
+    UA_SHUTDOWNREASON_TIMEOUT,
+    UA_SHUTDOWNREASON_ABORT,
+    UA_SHUTDOWNREASON_PURGE
+} UA_ShutdownReason;
+
 typedef struct {
     size_t currentChannelCount;
     size_t cumulatedChannelCount;
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index d838b02369b..ed9e5578094 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1900,7 +1900,7 @@ closeSecureChannel(UA_Client *client) {
     /* The connection is eventually closed in the next callback from the
      * ConnectionManager with the appropriate status code. Don't set the
      * connection closed right away! */
-    UA_SecureChannel_shutdown(&client->channel);
+    UA_SecureChannel_shutdown(&client->channel, UA_SHUTDOWNREASON_CLOSE);
 }
 
 static void
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index aa37429ad21..2da13f8c196 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -257,7 +257,7 @@ UA_Server_delete(UA_Server *server) {
 
     session_list_entry *current, *temp;
     LIST_FOREACH_SAFE(current, &server->sessions, pointers, temp) {
-        UA_Server_removeSession(server, current, UA_DIAGNOSTICEVENT_CLOSE);
+        UA_Server_removeSession(server, current, UA_SHUTDOWNREASON_CLOSE);
     }
     UA_Array_delete(server->namespaces, server->namespacesSize, &UA_TYPES[UA_TYPES_STRING]);
 
@@ -561,18 +561,18 @@ UA_Server_updateCertificate(UA_Server *server,
                             const UA_ByteString *newPrivateKey,
                             UA_Boolean closeSessions,
                             UA_Boolean closeSecureChannels) {
-
     UA_CHECK(server && oldCertificate && newCertificate && newPrivateKey,
              return UA_STATUSCODE_BADINTERNALERROR);
 
     if(closeSessions) {
         session_list_entry *current;
         LIST_FOREACH(current, &server->sessions, pointers) {
+            UA_SessionHeader *header = &current->session.header;
             if(UA_ByteString_equal(oldCertificate,
-                                    &current->session.header.channel->securityPolicy->localCertificate)) {
+                                    &header->channel->securityPolicy->localCertificate)) {
                 UA_LOCK(&server->serviceMutex);
-                UA_Server_removeSessionByToken(server, &current->session.header.authenticationToken,
-                                               UA_DIAGNOSTICEVENT_CLOSE);
+                UA_Server_removeSessionByToken(server, &header->authenticationToken,
+                                               UA_SHUTDOWNREASON_CLOSE);
                 UA_UNLOCK(&server->serviceMutex);
             }
         }
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index be085c4534c..45ffff0e932 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -46,9 +46,8 @@ void UA_debug_dumpCompleteChunk(UA_Server *const server, UA_Connection *const co
 
 /* SecureChannel Linked List */
 typedef struct channel_entry {
-    TAILQ_ENTRY(channel_entry) pointers;
     UA_SecureChannel channel;
-    UA_DiagnosticEvent closeEvent;
+    TAILQ_ENTRY(channel_entry) pointers;
 } channel_entry;
 
 typedef struct {
@@ -137,42 +136,39 @@ setBinaryProtocolManagerState(UA_Server *server,
     if(bpm->sc.notifyState)
         bpm->sc.notifyState(server, &bpm->sc, state);
 }
- 
-#ifndef container_of
-#define container_of(ptr, type, member) \
-    (type *)((uintptr_t)ptr - offsetof(type,member))
-#endif
 
 static void
 deleteServerSecureChannel(UA_BinaryProtocolManager *bpm,
                           UA_SecureChannel *channel) {
-    UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel closed");
-
     /* Clean up the SecureChannel. This is the only place where
      * UA_SecureChannel_clear must be called within the server code-base. */
     UA_SecureChannel_clear(channel);
 
     /* Detach the channel from the server list */
-    struct channel_entry *entry = container_of(channel, channel_entry, channel);
-    TAILQ_REMOVE(&bpm->channels, entry, pointers);
+    TAILQ_REMOVE(&bpm->channels, (channel_entry*)channel, pointers);
 
     /* Update the statistics */
     UA_SecureChannelStatistics *scs = &bpm->server->secureChannelStatistics;
     scs->currentChannelCount--;
-    switch(entry->closeEvent) {
-    case UA_DIAGNOSTICEVENT_CLOSE:
+    switch(channel->shutdownReason) {
+    case UA_SHUTDOWNREASON_CLOSE:
+        UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel closed");
         break;
-    case UA_DIAGNOSTICEVENT_TIMEOUT:
+    case UA_SHUTDOWNREASON_TIMEOUT:
+        UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel closed due to timeout");
         scs->channelTimeoutCount++;
         break;
-    case UA_DIAGNOSTICEVENT_PURGE:
+    case UA_SHUTDOWNREASON_PURGE:
+        UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel was purged");
         scs->channelPurgeCount++;
         break;
-    case UA_DIAGNOSTICEVENT_REJECT:
-    case UA_DIAGNOSTICEVENT_SECURITYREJECT:
+    case UA_SHUTDOWNREASON_REJECT:
+    case UA_SHUTDOWNREASON_SECURITYREJECT:
+        UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel was rejected");
         scs->rejectedChannelCount++;
         break;
-    case UA_DIAGNOSTICEVENT_ABORT:
+    case UA_SHUTDOWNREASON_ABORT:
+        UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel was aborted");
         scs->channelAbortCount++;
         break;
     default:
@@ -180,7 +176,7 @@ deleteServerSecureChannel(UA_BinaryProtocolManager *bpm,
         break;
     }
 
-    UA_free(entry);
+    UA_free(channel);
 }
 
 UA_StatusCode
@@ -548,21 +544,24 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
     if(retval != UA_STATUSCODE_GOOD) {
         UA_NodeId_clear(&requestType);
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
-                               "Could not decode the NodeId. Closing the connection");
-        shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
+                               "Could not decode the NodeId. "
+                               "Closing the SecureChannel.");
+        UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_REJECT);
         return retval;
     }
     retval = UA_decodeBinaryInternal(msg, &offset, &openSecureChannelRequest,
                                      &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST], NULL);
 
     /* Error occurred */
-    if(retval != UA_STATUSCODE_GOOD ||
-       !UA_NodeId_equal(&requestType, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST].binaryEncodingId)) {
+    const UA_NodeId *opnRequestId =
+        &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST].binaryEncodingId;
+    if(retval != UA_STATUSCODE_GOOD || !UA_NodeId_equal(&requestType, opnRequestId)) {
         UA_NodeId_clear(&requestType);
         UA_OpenSecureChannelRequest_clear(&openSecureChannelRequest);
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
-                               "Could not decode the OPN message. Closing the connection.");
-        shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
+                               "Could not decode the OPN message. "
+                               "Closing the SecureChannel.");
+        UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_REJECT);
         return retval;
     }
     UA_NodeId_clear(&requestType);
@@ -573,9 +572,10 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
     Service_OpenSecureChannel(server, channel, &openSecureChannelRequest, &openScResponse);
     UA_OpenSecureChannelRequest_clear(&openSecureChannelRequest);
     if(openScResponse.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel, "Could not open a SecureChannel. "
+        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+                               "Could not open a SecureChannel. "
                                "Closing the connection.");
-        shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
+        UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_REJECT);
         return openScResponse.responseHeader.serviceResult;
     }
 
@@ -587,7 +587,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
                                "Could not send the OPN answer with error code %s",
                                UA_StatusCode_name(retval));
-        shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_REJECT);
+        UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_REJECT);
     }
 
     return retval;
@@ -800,7 +800,7 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
         if(session != &anonymousSession) {
             UA_LOCK(&server->serviceMutex);
             UA_Server_removeSessionByToken(server, &session->header.authenticationToken,
-                                           UA_DIAGNOSTICEVENT_ABORT);
+                                           UA_SHUTDOWNREASON_ABORT);
             UA_UNLOCK(&server->serviceMutex);
         }
         serviceRes = UA_STATUSCODE_BADSESSIONNOTACTIVATED;
@@ -1013,7 +1013,7 @@ processSecureChannelMessage(void *application, UA_SecureChannel *channel,
         UA_TcpErrorMessage_init(&errMsg);
         errMsg.error = retval;
         UA_SecureChannel_sendError(channel, &errMsg);
-        UA_DiagnosticEvent closeEvent;
+        UA_ShutdownReason reason;
         switch(retval) {
         case UA_STATUSCODE_BADSECURITYMODEREJECTED:
         case UA_STATUSCODE_BADSECURITYCHECKSFAILED:
@@ -1021,13 +1021,13 @@ processSecureChannelMessage(void *application, UA_SecureChannel *channel,
         case UA_STATUSCODE_BADSECURECHANNELTOKENUNKNOWN:
         case UA_STATUSCODE_BADSECURITYPOLICYREJECTED:
         case UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED:
-            closeEvent = UA_DIAGNOSTICEVENT_SECURITYREJECT;
+            reason = UA_SHUTDOWNREASON_SECURITYREJECT;
             break;
         default:
-            closeEvent = UA_DIAGNOSTICEVENT_CLOSE;
+            reason = UA_SHUTDOWNREASON_CLOSE;
             break;
         }
-        shutdownServerSecureChannel(server, channel, closeEvent);
+        UA_SecureChannel_shutdown(channel, reason);
     }
 
     return retval;
@@ -1043,8 +1043,7 @@ purgeFirstChannelWithoutSession(UA_BinaryProtocolManager *bpm) {
         UA_LOG_INFO_CHANNEL(bpm->logging, &entry->channel,
                             "Channel was purged since maxSecureChannels was "
                             "reached and channel had no session attached");
-        entry->closeEvent = UA_DIAGNOSTICEVENT_PURGE;
-        UA_SecureChannel_shutdown(&entry->channel);
+        UA_SecureChannel_shutdown(&entry->channel, UA_SHUTDOWNREASON_PURGE);
         return true;
     }
     return false;
@@ -1096,7 +1095,7 @@ createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *c
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     /* Allocate memory for the SecureChannel */
-    channel_entry *entry = (channel_entry *)UA_malloc(sizeof(channel_entry));
+    channel_entry *entry = (channel_entry *)UA_calloc(1, sizeof(channel_entry));
     if(!entry)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
@@ -1122,7 +1121,6 @@ createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *c
     entry->channel.processOPNHeader = configServerSecureChannel;
     entry->channel.connectionManager = cm;
     entry->channel.connectionId = connectionId;
-    entry->closeEvent = UA_DIAGNOSTICEVENT_CLOSE; /* Used if the eventloop closes */
 
     /* Set the SecureChannel identifier already here. So we get the right
      * identifier for logging right away. The rest of the SecurityToken is set
@@ -1265,7 +1263,7 @@ serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         error.error = retval;
         error.reason = UA_STRING_NULL;
         UA_SecureChannel_sendError(channel, &error);
-        UA_SecureChannel_shutdown(channel);
+        UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_ABORT);
     }
 }
 
@@ -1325,28 +1323,6 @@ createServerConnection(UA_BinaryProtocolManager *bpm, const UA_String *serverUrl
     return UA_STATUSCODE_BADINTERNALERROR;
 }
 
-/* Trigger the closing of the SecureChannel. This needs one iteration of the
- * eventloop to take effect. */
-void
-shutdownServerSecureChannel(UA_Server *server, UA_SecureChannel *channel,
-                            UA_DiagnosticEvent event) {
-    /* Does the channel have an open socket? */
-    if(!UA_SecureChannel_isConnected(channel))
-        return;
-
-    UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "Closing the channel");
-
-    /* Set the event for diagnostics. The shutdown event is used in the
-     * deleteServerSecureChannel callback. */
-    struct channel_entry *entry = container_of(channel, channel_entry, channel);
-    entry->closeEvent = event;
-
-    /* Close the connection in the event-loop, which in the next iteration of
-     * the eventloop triggers the final deletion. This also sets the state to
-     * "closing". */
-    UA_SecureChannel_shutdown(channel);
-}
-
 /* Remove timed out SecureChannels */
 static void
 secureChannelHouseKeeping(UA_Server *server, void *context) {
@@ -1384,8 +1360,7 @@ secureChannelHouseKeeping(UA_Server *server, void *context) {
         if(timeout < nowMonotonic) {
             UA_LOG_INFO_CHANNEL(bpm->logging, &entry->channel,
                                 "SecureChannel has timed out");
-            entry->closeEvent = UA_DIAGNOSTICEVENT_TIMEOUT;
-            UA_SecureChannel_shutdown(&entry->channel);
+            UA_SecureChannel_shutdown(&entry->channel, UA_SHUTDOWNREASON_TIMEOUT);
         }
     }
     UA_UNLOCK(&server->serviceMutex);
@@ -1751,7 +1726,7 @@ serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         error.error = retval;
         error.reason = UA_STRING_NULL;
         UA_SecureChannel_sendError(context->channel, &error);
-        UA_SecureChannel_shutdown(context->channel);
+        UA_SecureChannel_shutdown(context->channel, UA_SHUTDOWNREASON_ABORT);
 
         setReverseConnectState(bpm->server, context, UA_SECURECHANNELSTATE_CLOSING);
         return;
@@ -1867,8 +1842,7 @@ UA_BinaryProtocolManager_stop(UA_Server *server,
     /* Stop all SecureChannels */
     channel_entry *entry;
     TAILQ_FOREACH(entry, &bpm->channels, pointers) {
-        entry->closeEvent = UA_DIAGNOSTICEVENT_CLOSE;
-        UA_SecureChannel_shutdown(&entry->channel);
+        UA_SecureChannel_shutdown(&entry->channel, UA_SHUTDOWNREASON_CLOSE);
     }
 
     /* Stop all server sockets */
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index a0bb5c7ad40..6f5157062ba 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -211,15 +211,6 @@ ZIP_FUNCTIONS(UA_ReferenceNameTree, UA_ReferenceTargetTreeElem, nameTreeEntry,
 /* SecureChannel Handling */
 /**************************/
 
-typedef enum {
-    UA_DIAGNOSTICEVENT_CLOSE,
-    UA_DIAGNOSTICEVENT_REJECT,
-    UA_DIAGNOSTICEVENT_SECURITYREJECT,
-    UA_DIAGNOSTICEVENT_TIMEOUT,
-    UA_DIAGNOSTICEVENT_ABORT,
-    UA_DIAGNOSTICEVENT_PURGE
-} UA_DiagnosticEvent;
-
 void
 serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                       void *application, void **connectionContext,
@@ -231,11 +222,6 @@ UA_StatusCode
 sendServiceFault(UA_SecureChannel *channel, UA_UInt32 requestId,
                  UA_UInt32 requestHandle, UA_StatusCode statusCode);
 
-/* Can be called at any time */
-void
-shutdownServerSecureChannel(UA_Server *server, UA_SecureChannel *channel,
-                            UA_DiagnosticEvent event);
-
 /* Gets the a pointer to the context of a security policy supported by the
  * server matched by the security policy uri. */
 UA_SecurityPolicy *
@@ -267,11 +253,11 @@ UA_Server_createSession(UA_Server *server, UA_SecureChannel *channel,
 
 void
 UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
-                        UA_DiagnosticEvent event);
+                        UA_ShutdownReason shutdownReason);
 
 UA_StatusCode
 UA_Server_removeSessionByToken(UA_Server *server, const UA_NodeId *token,
-                               UA_DiagnosticEvent event);
+                               UA_ShutdownReason shutdownReason);
 
 void
 UA_Server_cleanupSessions(UA_Server *server, UA_DateTime nowMonotonic);
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index ef0baff1e02..4a9bff7a3d9 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -168,5 +168,5 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
 /* The server does not send a CloseSecureChannel response */
 void
 Service_CloseSecureChannel(UA_Server *server, UA_SecureChannel *channel) {
-    shutdownServerSecureChannel(server, channel, UA_DIAGNOSTICEVENT_CLOSE);
+    UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_CLOSE);
 }
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index a982d1f9ed7..b0a766125a0 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -27,7 +27,7 @@ removeSessionCallback(UA_Server *server, session_list_entry *entry) {
 
 void
 UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
-                        UA_DiagnosticEvent event) {
+                        UA_ShutdownReason shutdownReason) {
     UA_Session *session = &sentry->session;
 
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
@@ -68,20 +68,20 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
     LIST_REMOVE(sentry, pointers);
     server->sessionCount--;
 
-    switch(event) {
-    case UA_DIAGNOSTICEVENT_CLOSE:
-    case UA_DIAGNOSTICEVENT_PURGE:
+    switch(shutdownReason) {
+    case UA_SHUTDOWNREASON_CLOSE:
+    case UA_SHUTDOWNREASON_PURGE:
         break;
-    case UA_DIAGNOSTICEVENT_TIMEOUT:
+    case UA_SHUTDOWNREASON_TIMEOUT:
         server->serverDiagnosticsSummary.sessionTimeoutCount++;
         break;
-    case UA_DIAGNOSTICEVENT_REJECT:
+    case UA_SHUTDOWNREASON_REJECT:
         server->serverDiagnosticsSummary.rejectedSessionCount++;
         break;
-    case UA_DIAGNOSTICEVENT_SECURITYREJECT:
+    case UA_SHUTDOWNREASON_SECURITYREJECT:
         server->serverDiagnosticsSummary.securityRejectedSessionCount++;
         break;
-    case UA_DIAGNOSTICEVENT_ABORT:
+    case UA_SHUTDOWNREASON_ABORT:
         server->serverDiagnosticsSummary.sessionAbortCount++;
         break;
     default:
@@ -100,12 +100,12 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
 
 UA_StatusCode
 UA_Server_removeSessionByToken(UA_Server *server, const UA_NodeId *token,
-                               UA_DiagnosticEvent event) {
+                               UA_ShutdownReason shutdownReason) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     session_list_entry *entry;
     LIST_FOREACH(entry, &server->sessions, pointers) {
         if(UA_NodeId_equal(&entry->session.header.authenticationToken, token)) {
-            UA_Server_removeSession(server, entry, event);
+            UA_Server_removeSession(server, entry, shutdownReason);
             return UA_STATUSCODE_GOOD;
         }
     }
@@ -121,7 +121,7 @@ UA_Server_cleanupSessions(UA_Server *server, UA_DateTime nowMonotonic) {
         if(sentry->session.validTill >= nowMonotonic)
             continue;
         UA_LOG_INFO_SESSION(&server->config.logger, &sentry->session, "Session has timed out");
-        UA_Server_removeSession(server, sentry, UA_DIAGNOSTICEVENT_TIMEOUT);
+        UA_Server_removeSession(server, sentry, UA_SHUTDOWNREASON_TIMEOUT);
     }
 }
 
@@ -324,7 +324,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
     if(!response->serverEndpoints) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
         UA_Server_removeSessionByToken(server, &newSession->header.authenticationToken,
-                                       UA_DIAGNOSTICEVENT_REJECT);
+                                       UA_SHUTDOWNREASON_REJECT);
         return;
     }
     response->serverEndpointsSize = server->config.endpointsSize;
@@ -336,7 +336,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
                                         &response->serverEndpoints[i]);
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_Server_removeSessionByToken(server, &newSession->header.authenticationToken,
-                                       UA_DIAGNOSTICEVENT_REJECT);
+                                       UA_SHUTDOWNREASON_REJECT);
         return;
     }
 
@@ -397,7 +397,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
     /* Failure -> remove the session */
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_Server_removeSessionByToken(server, &newSession->header.authenticationToken,
-                                       UA_DIAGNOSTICEVENT_REJECT);
+                                       UA_SHUTDOWNREASON_REJECT);
         return;
     }
 
@@ -937,5 +937,5 @@ Service_CloseSession(UA_Server *server, UA_SecureChannel *channel,
     /* Remove the sesison */
     response->responseHeader.serviceResult =
         UA_Server_removeSessionByToken(server, &session->header.authenticationToken,
-                                       UA_DIAGNOSTICEVENT_CLOSE);
+                                       UA_SHUTDOWNREASON_CLOSE);
 }
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index c24c4aba85f..a1a413a4f73 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -240,7 +240,7 @@ UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId) {
     UA_StatusCode res = UA_STATUSCODE_BADSESSIONIDINVALID;
     LIST_FOREACH(entry, &server->sessions, pointers) {
         if(UA_NodeId_equal(&entry->session.sessionId, sessionId)) {
-            UA_Server_removeSession(server, entry, UA_DIAGNOSTICEVENT_CLOSE);
+            UA_Server_removeSession(server, entry, UA_SHUTDOWNREASON_CLOSE);
             res = UA_STATUSCODE_GOOD;
             break;
         }
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index b2c5d15867e..8b8c0faddf4 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -147,11 +147,15 @@ UA_SecureChannel_deleteBuffered(UA_SecureChannel *channel) {
 }
 
 void
-UA_SecureChannel_shutdown(UA_SecureChannel *channel) {
+UA_SecureChannel_shutdown(UA_SecureChannel *channel,
+                          UA_ShutdownReason shutdownReason) {
     /* No open socket or already closing -> nothing to do */
     if(!UA_SecureChannel_isConnected(channel))
         return;
 
+    /* Set the shutdown event for diagnostics */
+    channel->shutdownReason= shutdownReason;
+
     /* Trigger the async closing of the connection */
     UA_ConnectionManager *cm = channel->connectionManager;
     cm->closeConnection(cm, channel->connectionId);
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index e76f1e6a69a..4469f56a8cc 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -99,6 +99,7 @@ struct UA_SecureChannel {
     UA_SecureChannelState state;
     UA_SecureChannelRenewState renewState;
     UA_MessageSecurityMode securityMode;
+    UA_ShutdownReason shutdownReason;
     UA_ConnectionConfig config;
 
     /* Connection handling in the EventLoop */
@@ -160,7 +161,8 @@ struct UA_SecureChannel {
 void UA_SecureChannel_init(UA_SecureChannel *channel);
 
 /* Trigger the shutdown */
-void UA_SecureChannel_shutdown(UA_SecureChannel *channel);
+void UA_SecureChannel_shutdown(UA_SecureChannel *channel,
+                               UA_ShutdownReason shutdownReason);
 
 /* Eventual cleanup after the channel has closed. It is possible to call _init
  * on the channel afterwards to reset it to the fresh status. */
diff --git a/src/ua_securechannel_crypto.c b/src/ua_securechannel_crypto.c
index f6cf330d299..64c0bb6c82f 100644
--- a/src/ua_securechannel_crypto.c
+++ b/src/ua_securechannel_crypto.c
@@ -561,7 +561,7 @@ checkSymHeader(UA_SecureChannel *channel, const UA_UInt32 tokenId) {
        timeout < UA_DateTime_nowMonotonic()) {
         UA_LOG_WARNING_CHANNEL(channel->securityPolicy->logger, channel,
                                "SecurityToken timed out");
-        UA_SecureChannel_shutdown(channel);
+        UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_TIMEOUT);
         return UA_STATUSCODE_BADSECURECHANNELCLOSED;
     }
 

From b19cc6d78ca92f221d4b55e05add3311762efb76 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Apr 2023 19:29:42 +0200
Subject: [PATCH 0921/1963] refactor(core): Remove UA_SECURECHANNELSTATE_FRESH

Instead use UA_SECURECHANNELSTATE_CLOSED as the default.
This is the pattern used everywhere else as well.
---
 examples/client_subscription_loop.c        |  1 -
 include/open62541/common.h                 |  5 ++---
 src/client/ua_client_connect.c             | 15 ++++++---------
 src/ua_securechannel.c                     |  3 +--
 tests/check_securechannel.c                |  3 ++-
 tests/client/check_client_async_connect.c  |  3 +--
 tests/client/check_client_subscriptions.c  |  2 +-
 tests/server/check_server_reverseconnect.c |  4 ++--
 8 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/examples/client_subscription_loop.c b/examples/client_subscription_loop.c
index 08138115a51..858a3a983d8 100644
--- a/examples/client_subscription_loop.c
+++ b/examples/client_subscription_loop.c
@@ -52,7 +52,6 @@ static void
 stateCallback(UA_Client *client, UA_SecureChannelState channelState,
               UA_SessionState sessionState, UA_StatusCode recoveryStatus) {
     switch(channelState) {
-    case UA_SECURECHANNELSTATE_FRESH:
     case UA_SECURECHANNELSTATE_CLOSED:
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "The client is disconnected");
         break;
diff --git a/include/open62541/common.h b/include/open62541/common.h
index 919650fea7f..7026b5c7163 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -174,7 +174,7 @@ typedef enum {
  * ---------------- */
 
 typedef enum {
-    UA_SECURECHANNELSTATE_FRESH = 0,
+    UA_SECURECHANNELSTATE_CLOSED = 0,
     UA_SECURECHANNELSTATE_REVERSE_LISTENING,
     UA_SECURECHANNELSTATE_CONNECTING,
     UA_SECURECHANNELSTATE_CONNECTED,
@@ -187,11 +187,10 @@ typedef enum {
     UA_SECURECHANNELSTATE_OPN_SENT,
     UA_SECURECHANNELSTATE_OPEN,
     UA_SECURECHANNELSTATE_CLOSING,
-    UA_SECURECHANNELSTATE_CLOSED
 } UA_SecureChannelState;
 
 typedef enum {
-    UA_SESSIONSTATE_CLOSED,
+    UA_SESSIONSTATE_CLOSED = 0,
     UA_SESSIONSTATE_CREATE_REQUESTED,
     UA_SESSIONSTATE_CREATED,
     UA_SESSIONSTATE_ACTIVATE_REQUESTED,
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index ed9e5578094..6720fe7c81c 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1371,8 +1371,8 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
         /* Inconsistent SecureChannel state. Has to be fresh for a new
          * connection. */
-        if(client->channel.state != UA_SECURECHANNELSTATE_FRESH &&
-                client->channel.state != UA_SECURECHANNELSTATE_REVERSE_LISTENING) {
+        if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED &&
+           client->channel.state != UA_SECURECHANNELSTATE_REVERSE_LISTENING) {
             UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                          "Cannot open a connection for SecureChannel that is already used");
             client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
@@ -1391,7 +1391,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         if(state == UA_CONNECTIONSTATE_OPENING)
             client->channel.state = UA_SECURECHANNELSTATE_CONNECTING;
         else {
-            if (client->channel.state == UA_SECURECHANNELSTATE_REVERSE_LISTENING)
+            if(client->channel.state == UA_SECURECHANNELSTATE_REVERSE_LISTENING)
                 client->channel.state = UA_SECURECHANNELSTATE_REVERSE_CONNECTED;
             else /* state == UA_CONNECTIONSTATE_ESTABLISHED */
                 client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
@@ -1491,8 +1491,7 @@ initConnect(UA_Client *client) {
     if(client->noReconnect)
         return UA_STATUSCODE_BADNOTCONNECTED;
 
-    if(client->channel.state != UA_SECURECHANNELSTATE_FRESH &&
-       client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
+    if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Client connection already initiated");
         return UA_STATUSCODE_GOOD;
@@ -1774,8 +1773,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
                                           UA_UInt16 port) {
     UA_LOCK(&client->clientMutex);
 
-    if(client->channel.state > UA_SECURECHANNELSTATE_FRESH &&
-       client->channel.state < UA_SECURECHANNELSTATE_CLOSED) {
+    if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Unable to listen for reverse connect while the client "
                        "is connected or already listening");
@@ -2004,8 +2002,7 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
        el->state != UA_EVENTLOOPSTATE_FRESH &&
        el->state != UA_EVENTLOOPSTATE_STOPPED) {
         UA_UNLOCK(&client->clientMutex);
-        while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED &&
-              client->channel.state != UA_SECURECHANNELSTATE_FRESH) {
+        while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
             el->run(el, 100);
         }
         UA_LOCK(&client->clientMutex);
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 8b8c0faddf4..1309c101030 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -30,7 +30,6 @@ void
 UA_SecureChannel_init(UA_SecureChannel *channel) {
     /* Normal linked lists are initialized by zeroing out */
     memset(channel, 0, sizeof(UA_SecureChannel));
-    channel->state = UA_SECURECHANNELSTATE_FRESH;
     SIMPLEQ_INIT(&channel->completeChunks);
     SIMPLEQ_INIT(&channel->decryptedChunks);
 }
@@ -85,7 +84,7 @@ hideErrors(UA_TcpErrorMessage *const error) {
 
 UA_Boolean
 UA_SecureChannel_isConnected(UA_SecureChannel *channel) {
-    return (channel->state >= UA_SECURECHANNELSTATE_REVERSE_LISTENING &&
+    return (channel->state > UA_SECURECHANNELSTATE_CLOSED &&
             channel->state < UA_SECURECHANNELSTATE_CLOSING);
 }
 
diff --git a/tests/check_securechannel.c b/tests/check_securechannel.c
index 852605735db..d7075e2df0a 100644
--- a/tests/check_securechannel.c
+++ b/tests/check_securechannel.c
@@ -98,7 +98,8 @@ START_TEST(SecureChannel_initAndDelete) {
     retval = UA_SecureChannel_setSecurityPolicy(&channel, &dummyPolicy, &dummyCertificate);
 
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode to be good");
-    ck_assert_msg(channel.state == UA_SECURECHANNELSTATE_FRESH, "Expected state to be new/fresh");
+    ck_assert_msg(channel.state == UA_SECURECHANNELSTATE_CLOSED,
+                  "Expected state to be closed");
     ck_assert_msg(fCalled.newContext, "Expected newContext to have been called");
     ck_assert_msg(fCalled.makeCertificateThumbprint,
                   "Expected makeCertificateThumbprint to have been called");
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index e2e102fcc7c..63ceb0e5c5a 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -124,8 +124,7 @@ START_TEST(Client_connect_async_abort) {
             UA_Server_run_iterate(server, false);
             UA_Client_run_iterate(client, 5);
             UA_Client_getState(client, &currentState, NULL, &retval);
-        } while(currentState != UA_SECURECHANNELSTATE_CLOSED &&
-                currentState != UA_SECURECHANNELSTATE_FRESH);
+        } while(currentState != UA_SECURECHANNELSTATE_CLOSED);
     }
 
     UA_Client_delete(client);
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 4dc2178c67f..d8bcaa99a35 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -1308,7 +1308,7 @@ START_TEST(Client_subscription_async_sub) {
     /* Activate background publish request */
     cc->outStandingPublishRequests = 10;
 
-    ck_assert_uint_eq(chanState, UA_SECURECHANNELSTATE_FRESH);
+    ck_assert_uint_eq(chanState, UA_SECURECHANNELSTATE_CLOSED);
 
     hasMon = false;
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
index 0629c082fd8..b2565e197f1 100644
--- a/tests/server/check_server_reverseconnect.c
+++ b/tests/server/check_server_reverseconnect.c
@@ -54,10 +54,10 @@ static void clientStateCallback(UA_Client *c,
 
 static void setup(void) {
     for(int i = 0; i < numServerCallbackCalled; ++i)
-        serverCallbackStates[i] = UA_SECURECHANNELSTATE_FRESH;
+        serverCallbackStates[i] = UA_SECURECHANNELSTATE_CLOSED;
 
     for(int i = 0; i < numClientCallbackCalled; ++i)
-        clientCallbackStates[i] = UA_SECURECHANNELSTATE_FRESH;
+        clientCallbackStates[i] = UA_SECURECHANNELSTATE_CLOSED;
 
     numServerCallbackCalled = 0;
     reverseConnectHandle = 0;

From 4a009884c9a91eed998b3937b6e3af4bd9a6002e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 28 Apr 2023 16:53:42 +0200
Subject: [PATCH 0922/1963] fix(tests): Fix a memleak in
 check_pubsub_udp_unicast.c

---
 tests/pubsub/check_pubsub_udp_unicast.c | 104 ++++++++++++------------
 1 file changed, 50 insertions(+), 54 deletions(-)

diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
index bdfc43ebc5e..760b7b576fe 100644
--- a/tests/pubsub/check_pubsub_udp_unicast.c
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -43,7 +43,8 @@ UA_ServerConfig *configSubscriber = NULL;
 // UA_NodeId subscriberConnectionId;
 //
 // UA_NodeId readerGroupId;
-static void setupFolder(UA_Server *server, UA_NodeId *folderId) {
+static void
+setupFolder(UA_Server *server, UA_NodeId *folderId) {
     UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
     UA_QualifiedName folderBrowseName;
     oAttr.displayName = UA_LOCALIZEDTEXT("en-US", "Subscribed Variables");
@@ -77,7 +78,9 @@ setupPubSubServer(UA_Server **server, UA_ServerConfig **config, UA_UInt16 portNu
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
-static void addUDPConnection(UA_Server *server, const char *host, UA_Int16 portNumber, UA_NodeId *outConnectionId) {
+static void
+addUDPConnection(UA_Server *server, const char *host, UA_Int16 portNumber,
+                 UA_NodeId *outConnectionId) {
     /* Add connection to the server */
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -98,7 +101,9 @@ static void addUDPConnection(UA_Server *server, const char *host, UA_Int16 portN
     ck_assert_int_eq(UA_Server_addPubSubConnection(server, &connectionConfig, outConnectionId), UA_STATUSCODE_GOOD);
 }
 
-static void setupPublishedDataInt32(UA_Server *server, UA_UInt32 publishVariableNodeId, UA_NodeId *outPublishedDataSetId) {
+static void
+setupPublishedDataInt32(UA_Server *server, UA_UInt32 publishVariableNodeId,
+                        UA_NodeId *outPublishedDataSetId) {
     UA_PublishedDataSetConfig pdsConfig;
     memset(&pdsConfig, 0, sizeof(UA_PublishedDataSetConfig));
     pdsConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
@@ -134,8 +139,9 @@ static void setupPublishedDataInt32(UA_Server *server, UA_UInt32 publishVariable
     ck_assert_int_eq(UA_Server_addDataSetField(server, *outPublishedDataSetId, &dataSetFieldConfig, &dataSetFieldId).result, UA_STATUSCODE_GOOD);
 }
 
-static void setupWrittenData(UA_Server *server, UA_NodeId connectionId, UA_NodeId publishedDataSetId, const char *dstHost, UA_UInt16 dstPort) {
-
+static void
+setupWrittenData(UA_Server *server, UA_NodeId connectionId, UA_NodeId publishedDataSetId,
+                 const char *dstHost, UA_UInt16 dstPort) {
     char dstAddress[STR_BUFSIZE];
     memset(&dstAddress, 0, sizeof(dstAddress));
     snprintf(dstAddress, STR_BUFSIZE, "opc.udp://%s:%d", dstHost, dstPort);
@@ -193,14 +199,18 @@ static void setupWrittenData(UA_Server *server, UA_NodeId connectionId, UA_NodeI
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
-static void setupPublishingUnicast(UA_Server *server, UA_NodeId connectionId, const char *dstHost, UA_UInt16 dstPort, UA_UInt32 publishVariableNodeId) {
+static void
+setupPublishingUnicast(UA_Server *server, UA_NodeId connectionId, const char *dstHost,
+                       UA_UInt16 dstPort, UA_UInt32 publishVariableNodeId) {
     UA_NodeId outPublishedDataSetId;
     setupPublishedDataInt32(serverPublisher, publishVariableNodeId, &outPublishedDataSetId);
     setupWrittenData(server, connectionId, outPublishedDataSetId, dstHost, dstPort);
 }
 
-static void setupSubscribing(UA_Server *server, UA_NodeId connectionId, UA_NodeId targetNodeId, UA_UInt32 subscribeVariableNodeId,
-                             UA_NodeId *outReaderGroupId) {
+static void
+setupSubscribing(UA_Server *server, UA_NodeId connectionId,
+                 UA_NodeId targetNodeId, UA_UInt32 subscribeVariableNodeId,
+                 UA_NodeId *outReaderGroupId) {
     /* Reader Group */
     UA_ReaderGroupConfig readerGroupConfig;
     memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
@@ -260,57 +270,56 @@ static void setupSubscribing(UA_Server *server, UA_NodeId connectionId, UA_NodeI
     UA_free(pMetaData->fields);
 }
 
+UA_NodeId publisherConnectionId;
+UA_NodeId subscriberConnectionId;
+UA_NodeId readerGroupId;
+UA_NodeId outVariableNodeId;
+
 /* setup() is to create an environment for test cases */
-static void setupEnvironment(UA_Server **serverPub, UA_Server **serverSub, UA_ServerConfig **configPub, UA_ServerConfig **configSub,
-                             UA_NodeId *outPublisherConnectionId, UA_NodeId *outSubscriberConnectionId, UA_NodeId *outReaderGroupId,
-                             UA_NodeId *outVariableNodeId) {
+static void setup(void) {
     /*Add setup by creating new server with valid configuration */
-    setupPubSubServer(serverPub, configPub, UA_PUBLISHER_PORT, NULL);
-    addUDPConnection(*serverPub, "localhost", UA_PUBLISHER_PORT, outPublisherConnectionId);
-    setupPublishingUnicast(*serverPub, *outPublisherConnectionId, "127.0.0.1", UA_SUBSCRIBER_PORT,
-                           PUBLISHVARIABLE_NODEID);
+    setupPubSubServer(&serverPublisher, &configPublisher, UA_PUBLISHER_PORT, NULL);
+    addUDPConnection(serverPublisher, "localhost", UA_PUBLISHER_PORT, &publisherConnectionId);
+    setupPublishingUnicast(serverPublisher, publisherConnectionId, "127.0.0.1",
+                           UA_SUBSCRIBER_PORT, PUBLISHVARIABLE_NODEID);
 
-    setupPubSubServer(serverSub, configSub, UA_SUBSCRIBER_PORT,
-                      (*configPub)->eventLoop);
+    setupPubSubServer(&serverSubscriber, &configSubscriber,
+                      UA_SUBSCRIBER_PORT, configPublisher->eventLoop);
 
     UA_NodeId folderId;
-    setupFolder(*serverSub, &folderId);
-    addUDPConnection(*serverSub, "localhost", UA_SUBSCRIBER_PORT, outSubscriberConnectionId);
+    setupFolder(serverSubscriber, &folderId);
+    addUDPConnection(serverSubscriber, "localhost", UA_SUBSCRIBER_PORT, &subscriberConnectionId);
 
-    /* Add Subscribed Variables */
-    /* Variable to subscribe data */
+    /* Add subscribed Variables */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
     vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Int32");
     vAttr.dataType    = UA_TYPES[UA_TYPES_INT32].typeId;
-    UA_StatusCode retVal = UA_Server_addVariableNode(*serverSub, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), folderId,
-                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
-                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, outVariableNodeId);
+    UA_StatusCode retVal =
+        UA_Server_addVariableNode(serverSubscriber, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
+                                  folderId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                  UA_QUALIFIEDNAME(1, "Subscribed Int32"),
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                  vAttr, NULL, &outVariableNodeId);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-    setupSubscribing(*serverSub, *outSubscriberConnectionId, *outVariableNodeId, SUBSCRIBEVARIABLE_NODEID, outReaderGroupId);
-}
-
-/* setup() is to create an environment for test cases */
-static void setup(void) {
-
-    // UA_NodeId publisherConnectionId;
-    // UA_NodeId subscriberConnectionId;
-    // setupEnvironment(&serverPublisher, &serverSubscriber, &configPublisher, &configSubscriber,
-    //                  &publisherConnectionId, &subscriberConnectionId);
+    setupSubscribing(serverSubscriber, subscriberConnectionId, outVariableNodeId,
+                     SUBSCRIBEVARIABLE_NODEID, &readerGroupId);
 }
 
 /* teardown() is to delete the environment set for test cases */
 static void teardown(void) {
-    UA_Server_run_shutdown(serverSubscriber);
     UA_Server_run_shutdown(serverPublisher);
+    UA_Server_run_shutdown(serverSubscriber);
 
-    /*Call server delete functions */
+    /* Call server delete functions */
     UA_Server_delete(serverSubscriber);
     UA_Server_delete(serverPublisher);
 }
 
-static void checkReceived(UA_Server *publisher, UA_UInt32 publishVariableNodeId, UA_Server *subscriber, UA_UInt32 subscribeVariableNodeId) {
+static void
+checkReceived(UA_Server *publisher, UA_UInt32 publishVariableNodeId,
+              UA_Server *subscriber, UA_UInt32 subscribeVariableNodeId) {
     /* Read data sent by the Publisher */
     UA_Variant publishedNodeData;
     UA_Variant_init(&publishedNodeData);
@@ -336,12 +345,6 @@ static void checkReceived(UA_Server *publisher, UA_UInt32 publishVariableNodeId,
 }
 
 START_TEST(SinglePublishSubscribeInt32) {
-    UA_NodeId publisherConnectionId;
-    UA_NodeId subscriberConnectionId;
-    UA_NodeId readerGroupId;
-    UA_NodeId outVariableNodeId;
-    setupEnvironment(&serverPublisher, &serverSubscriber, &configPublisher, &configSubscriber,
-                     &publisherConnectionId, &subscriberConnectionId, &readerGroupId, &outVariableNodeId);
     /* run server - publisher and subscriber */
 
     UA_fakeSleep(PUBLISH_INTERVAL + 1);
@@ -351,18 +354,12 @@ START_TEST(SinglePublishSubscribeInt32) {
 
     checkReceived(serverPublisher, PUBLISHVARIABLE_NODEID,
                   serverSubscriber, SUBSCRIBEVARIABLE_NODEID);
-}END_TEST
+} END_TEST
 
 START_TEST(RemoveAndAddReaderGroup) {
-        UA_NodeId publisherConnectionId;
-        UA_NodeId subscriberConnectionId;
-        UA_NodeId readerGroupId;
-        UA_NodeId outVariableNodeId;
-        setupEnvironment(&serverPublisher, &serverSubscriber, &configPublisher, &configSubscriber,
-                         &publisherConnectionId, &subscriberConnectionId, &readerGroupId, &outVariableNodeId);
-
         UA_NodeId readerGroupId2;
-        setupSubscribing(serverSubscriber, subscriberConnectionId, outVariableNodeId, SUBSCRIBEVARIABLE_NODEID, &readerGroupId2);
+        setupSubscribing(serverSubscriber, subscriberConnectionId, outVariableNodeId,
+                         SUBSCRIBEVARIABLE_NODEID, &readerGroupId2);
 
         /* run server - publisher and subscriber */
         UA_fakeSleep(PUBLISH_INTERVAL + 1);
@@ -389,8 +386,7 @@ START_TEST(RemoveAndAddReaderGroup) {
         UA_Server_run_iterate(serverPublisher,true);
         UA_fakeSleep(PUBLISH_INTERVAL + 1);
         UA_Server_run_iterate(serverSubscriber,true);
-
-    }END_TEST
+} END_TEST
 
 int main(void) {
 

From e00fed6c95fb79b2ff353735399dabf2e085ddbd Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Tue, 2 May 2023 13:19:18 +0200
Subject: [PATCH 0923/1963] feat(CI): Enable alarm conditions example in CI
 (#5755)

* Enable alarm conditions example. Fix mem leak in testnodeset

* Added timeout in CI to kill a stuck process
---
 examples/nodeset/server_testnodeset.c |  1 +
 tools/ci.sh                           | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/examples/nodeset/server_testnodeset.c b/examples/nodeset/server_testnodeset.c
index 606003d8802..39e79ad2b57 100644
--- a/examples/nodeset/server_testnodeset.c
+++ b/examples/nodeset/server_testnodeset.c
@@ -48,6 +48,7 @@ int main(int argc, char **argv)
         UA_Point *p = (UA_Point *)out.data;
         printf("point 2d x: %f y: %f \n", p->x, p->y);
         retval = UA_Server_run(server, &running);
+        UA_free(p);
     }
 
     UA_Server_delete(server);
diff --git a/tools/ci.sh b/tools/ci.sh
index e7ade1c552a..aa0b48b1975 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -388,6 +388,7 @@ function examples_valgrind {
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
+          -DUA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS=ON \
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
@@ -397,6 +398,7 @@ function examples_valgrind {
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_FILE_CONFIG=ON \
+          -DUA_NAMESPACE_ZERO=FULL \
           ..
     make ${MAKEOPTS}
 
@@ -408,9 +410,13 @@ function examples_valgrind {
     do
 	    echo "Processing $f"
 	    valgrind --errors-for-leak-kinds=all --leak-check=full --error-exitcode=1 $f &
+        pid=$!
 	    sleep 10
-	    kill -INT %1
-	    wait $!; EXIT_CODE=$?
+        # || true to ignore the error if the process is already dead
+	    kill -INT $pid || true
+
+        # using a 20 second timeout with SIGTERM to kill the process if it is still running
+	    timeout 20s bash -c 'wait $pid || kill -TERM $pid' ; EXIT_CODE=$?
 	    if [[ $EXIT_CODE -ne 0 ]]; then
 		   echo "Processing $f failed with exit code $EXIT_CODE "
 		   exit $EXIT_CODE	

From 08a533464dc7220805cee3340e435aff89887e83 Mon Sep 17 00:00:00 2001
From: Martin Brenner <martin.brenner94@gmail.com>
Date: Tue, 2 May 2023 15:28:51 +0200
Subject: [PATCH 0924/1963] feat(plugin): Make the certificate key length and
 expiration date configurable (#5713)

---
 examples/encryption/server_encryption.c       | 14 ++++----
 .../openssl/ua_openssl_create_certificate.c   | 36 +++++++++++++------
 .../open62541/plugin/create_certificate.h     | 17 +++++----
 tests/encryption/check_cert_generation.c      | 17 +++++----
 4 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/examples/encryption/server_encryption.c b/examples/encryption/server_encryption.c
index d9d6b29e279..cec3c6f6d57 100644
--- a/examples/encryption/server_encryption.c
+++ b/examples/encryption/server_encryption.c
@@ -50,12 +50,14 @@ int main(int argc, char* argv[]) {
             UA_STRING_STATIC("URI:urn:open62541.server.application")
         };
         UA_UInt32 lenSubjectAltName = 2;
-        UA_StatusCode statusCertGen =
-            UA_CreateCertificate(UA_Log_Stdout,
-                                 subject, lenSubject,
-                                 subjectAltName, lenSubjectAltName,
-                                 0, UA_CERTIFICATEFORMAT_DER,
-                                 &privateKey, &certificate);
+        UA_KeyValueMap *kvm = UA_KeyValueMap_new();
+        UA_UInt16 expiresIn = 14;
+        UA_KeyValueMap_setScalar(kvm, UA_QUALIFIEDNAME(0, "expires-in-days"),
+                                 (void *)&expiresIn, &UA_TYPES[UA_TYPES_UINT16]);
+        UA_StatusCode statusCertGen = UA_CreateCertificate(
+            UA_Log_Stdout, subject, lenSubject, subjectAltName, lenSubjectAltName,
+            UA_CERTIFICATEFORMAT_DER, kvm, &privateKey, &certificate);
+        UA_KeyValueMap_delete(kvm);
 
         if(statusCertGen != UA_STATUSCODE_GOOD) {
             UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
diff --git a/plugins/crypto/openssl/ua_openssl_create_certificate.c b/plugins/crypto/openssl/ua_openssl_create_certificate.c
index 4b6585a6a3b..0bea05ee3ec 100644
--- a/plugins/crypto/openssl/ua_openssl_create_certificate.c
+++ b/plugins/crypto/openssl/ua_openssl_create_certificate.c
@@ -107,19 +107,32 @@ static EVP_PKEY * UA_RSA_Generate_Key (size_t keySizeBits){
 #endif
 
 UA_StatusCode
-UA_CreateCertificate(const UA_Logger *logger,
-                     const UA_String *subject, size_t subjectSize,
-                     const UA_String *subjectAltName, size_t subjectAltNameSize,
-                     size_t keySizeBits, UA_CertificateFormat certFormat,
-                     UA_ByteString *outPrivateKey, UA_ByteString *outCertificate) {
-    if(!outPrivateKey || !outCertificate || !logger || !subjectAltName ||
-       !subject || subjectAltNameSize == 0 || subjectSize == 0 ||
-       (certFormat != UA_CERTIFICATEFORMAT_DER && certFormat != UA_CERTIFICATEFORMAT_PEM ))
+UA_CreateCertificate(const UA_Logger *logger, const UA_String *subject,
+                     size_t subjectSize, const UA_String *subjectAltName,
+                     size_t subjectAltNameSize, UA_CertificateFormat certFormat,
+                     UA_KeyValueMap *params, UA_ByteString *outPrivateKey,
+                     UA_ByteString *outCertificate) {
+    if(!outPrivateKey || !outCertificate || !logger || !subjectAltName || !subject ||
+       subjectAltNameSize == 0 || subjectSize == 0 ||
+       (certFormat != UA_CERTIFICATEFORMAT_DER && certFormat != UA_CERTIFICATEFORMAT_PEM))
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     /* Use the maximum size */
-    if(keySizeBits == 0)
-        keySizeBits = 4096;
+    UA_UInt16 keySizeBits = 4096;
+    /* Default to 1 year */
+    UA_UInt16 expiresInDays = 365;
+
+    if(params) {
+        const UA_UInt16 *keySizeBitsValue = (const UA_UInt16 *)UA_KeyValueMap_getScalar(
+            params, UA_QUALIFIEDNAME(0, "key-size-bits"), &UA_TYPES[UA_TYPES_UINT16]);
+        if(keySizeBitsValue)
+            keySizeBits = *keySizeBitsValue;
+
+        const UA_UInt16 *expiresInDaysValue = (const UA_UInt16 *)UA_KeyValueMap_getScalar(
+            params, UA_QUALIFIEDNAME(0, "expires-in-days"), &UA_TYPES[UA_TYPES_UINT16]);
+        if(expiresInDaysValue)
+            expiresInDays = *expiresInDaysValue;
+    }
 
     UA_ByteString_init(outPrivateKey);
     UA_ByteString_init(outCertificate);
@@ -203,7 +216,8 @@ UA_CreateCertificate(const UA_Logger *logger,
         goto cleanup;
     }
 
-    if(X509_gmtime_adj(X509_get_notAfter(x509), (UA_Int64) 60 * 60 * 24 * 365) == NULL) {
+    if(X509_gmtime_adj(X509_get_notAfter(x509), (UA_Int64)60 * 60 * 24 * expiresInDays) ==
+       NULL) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                      "Create Certificate: Setting 'not before' failed.");
         errRet = UA_STATUSCODE_BADINTERNALERROR;
diff --git a/plugins/include/open62541/plugin/create_certificate.h b/plugins/include/open62541/plugin/create_certificate.h
index 2f9d06657fa..7d48290fc43 100644
--- a/plugins/include/open62541/plugin/create_certificate.h
+++ b/plugins/include/open62541/plugin/create_certificate.h
@@ -10,6 +10,7 @@
 
 #include <open62541/plugin/log.h>
 #include <open62541/types.h>
+#include <open62541/util.h>
 
 _UA_BEGIN_DECLS
 
@@ -29,15 +30,17 @@ typedef enum {
  *                  e.g. ["C=DE", "O=SampleOrganization", "CN=Open62541Server@localhost"]
  * \param subjectAltName Elements for SubjectAltName,
  *                  e.g. ["DNS:localhost", "URI:urn:open62541.server.application"]
- * \param keySizeBits Size of the generated key in bits. If set to 0, the maximum key
- *                  size is used. Possible values are: [0, 1024 (deprecated), 2048, 4096]
+ * \param params key value map with optional parameters:
+ *                  - expires-in-days after these the cert expires default: 365
+ *                  - key-size-bits Size of the generated key in bits. Possible values are:
+ *                    [0, 1024 (deprecated), 2048, 4096] default: 4096
  */
 UA_StatusCode UA_EXPORT
-UA_CreateCertificate(const UA_Logger *logger,
-                     const UA_String *subject, size_t subjectSize,
-                     const UA_String *subjectAltName, size_t subjectAltNameSize,
-                     size_t keySizeBits, UA_CertificateFormat certFormat,
-                     UA_ByteString *outPrivateKey, UA_ByteString *outCertificate);
+UA_CreateCertificate(const UA_Logger *logger, const UA_String *subject,
+                     size_t subjectSize, const UA_String *subjectAltName,
+                     size_t subjectAltNameSize, UA_CertificateFormat certFormat,
+                     UA_KeyValueMap *params, UA_ByteString *outPrivateKey,
+                     UA_ByteString *outCertificate);
 #endif
 
 _UA_END_DECLS
diff --git a/tests/encryption/check_cert_generation.c b/tests/encryption/check_cert_generation.c
index e1e8b5d0490..c6a58038109 100644
--- a/tests/encryption/check_cert_generation.c
+++ b/tests/encryption/check_cert_generation.c
@@ -34,12 +34,17 @@ START_TEST(certificate_generation) {
         UA_STRING_STATIC("URI:urn:open62541.server.application")
     };
     UA_UInt32 lenSubjectAltName = 2;
-    UA_StatusCode status =
-        UA_CreateCertificate(UA_Log_Stdout,
-                             subject, lenSubject,
-                             subjectAltName, lenSubjectAltName,
-                             0, UA_CERTIFICATEFORMAT_DER,
-                             &derPrivKey, &derCert);
+    UA_KeyValueMap *kvm = UA_KeyValueMap_new();
+    UA_UInt16 expiresIn = 14;
+    UA_KeyValueMap_setScalar(kvm, UA_QUALIFIEDNAME(0, "expires-in-days"),
+                             (void *)&expiresIn, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_UInt16 keyLength = 2048;
+    UA_KeyValueMap_setScalar(kvm, UA_QUALIFIEDNAME(0, "key-size-bits"),
+                             (void *)&keyLength, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_StatusCode status = UA_CreateCertificate(
+        UA_Log_Stdout, subject, lenSubject, subjectAltName, lenSubjectAltName,
+        UA_CERTIFICATEFORMAT_DER, kvm, &derPrivKey, &derCert);
+    UA_KeyValueMap_delete(kvm);
     ck_assert(status == UA_STATUSCODE_GOOD);
     ck_assert(derPrivKey.length > 0);
     ck_assert(derCert.length > 0);

From defd286b3e130ad8293b94abdc52618196586517 Mon Sep 17 00:00:00 2001
From: Maddin-619 <martin.brenner94@gmail.com>
Date: Thu, 4 May 2023 16:18:33 +0200
Subject: [PATCH 0925/1963] fix(plugin): free old thumbprint befor creating the
 new one

---
 plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c | 2 ++
 plugins/crypto/openssl/ua_openssl_basic128rsa15.c       | 2 ++
 plugins/crypto/openssl/ua_openssl_basic256.c            | 2 ++
 plugins/crypto/openssl/ua_openssl_basic256sha256.c      | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c b/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
index ea58a40ab8b..c502cd75f58 100644
--- a/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
+++ b/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
@@ -135,6 +135,8 @@ updateCertificateAndPrivateKey_sp_aes128sha256rsaoaep(UA_SecurityPolicy *securit
         goto error;
     }
 
+    UA_ByteString_clear(&pc->localCertThumbprint);
+
     retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
                                                       &pc->localCertThumbprint, true);
     if(retval != UA_STATUSCODE_GOOD) {
diff --git a/plugins/crypto/openssl/ua_openssl_basic128rsa15.c b/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
index f35ac75c32a..252286c0305 100644
--- a/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
+++ b/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
@@ -128,6 +128,8 @@ updateCertificateAndPrivateKey_sp_basic128rsa15(UA_SecurityPolicy *securityPolic
         goto error;
     }
 
+    UA_ByteString_clear(&pc->localCertThumbprint);
+
     retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
                                                       &pc->localCertThumbprint, true);
     if(retval != UA_STATUSCODE_GOOD) {
diff --git a/plugins/crypto/openssl/ua_openssl_basic256.c b/plugins/crypto/openssl/ua_openssl_basic256.c
index 413f680da74..a88bf1ec4ec 100644
--- a/plugins/crypto/openssl/ua_openssl_basic256.c
+++ b/plugins/crypto/openssl/ua_openssl_basic256.c
@@ -126,6 +126,8 @@ updateCertificateAndPrivateKey_sp_basic256(UA_SecurityPolicy *securityPolicy,
         goto error;
     }
 
+    UA_ByteString_clear(&pc->localCertThumbprint);
+
     retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
                                                       &pc->localCertThumbprint, true);
     if(retval != UA_STATUSCODE_GOOD) {
diff --git a/plugins/crypto/openssl/ua_openssl_basic256sha256.c b/plugins/crypto/openssl/ua_openssl_basic256sha256.c
index 423287a0777..97c6ae19ee8 100644
--- a/plugins/crypto/openssl/ua_openssl_basic256sha256.c
+++ b/plugins/crypto/openssl/ua_openssl_basic256sha256.c
@@ -127,6 +127,8 @@ updateCertificateAndPrivateKey_sp_basic256sha256(UA_SecurityPolicy *securityPoli
         goto error;
     }
 
+    UA_ByteString_clear(&pc->localCertThumbprint);
+
     retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
                                                       &pc->localCertThumbprint, true);
     if(retval != UA_STATUSCODE_GOOD) {

From cb70c7aec33c6e9f07b85561b0ae77d222b53c46 Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Tue, 9 May 2023 09:46:52 +0200
Subject: [PATCH 0926/1963] feat(CI): Enabled pubsub realtime examples (#5757)

---
 examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c | 3 ++-
 .../pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c     | 3 ++-
 examples/pubsub_realtime/pubsub_TSN_loopback.c                 | 3 ++-
 examples/pubsub_realtime/pubsub_TSN_publisher.c                | 3 ++-
 examples/pubsub_realtime/pubsub_interrupt_publish.c            | 2 +-
 tools/ci.sh                                                    | 1 +
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
index 5f9db6b693b..e9e545eee3c 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
@@ -671,7 +671,8 @@ int main(int argc, char **argv) {
     if (!interface) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Need a network interface to run");
         usage(progname);
-        return -1;
+        UA_Server_delete(server);
+        return 0;
     }
 
     networkAddressUrlPub.networkInterface = UA_STRING(interface);
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
index 8d1e4385483..5fba8a8eaa7 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
@@ -636,7 +636,8 @@ int main(int argc, char **argv) {
     if (!interface) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Need a network interface to run");
         usage(progname);
-        return -1;
+        UA_Server_delete(server);
+        return 0;
     }
     networkAddressUrlSub.networkInterface = UA_STRING(interface);
     networkAddressUrlSub.url              = UA_STRING(SUBSCRIBING_MAC_ADDRESS);
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index 7d6cf9c07be..644cbfebc0b 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -1595,7 +1595,8 @@ int main(int argc, char **argv) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "Need a network interface to run");
         usage(progname);
-        return -1;
+        UA_Server_delete(server);
+        return 0;
     }
 
     if(cycleTimeInMsec < 0.125) {
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index a6891dbebc3..917b543dfde 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -1669,7 +1669,8 @@ int main(int argc, char **argv) {
     if(!interface) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Need a network interface to run");
         usage(progname);
-        return -1;
+        UA_Server_delete(server);
+        return 0;
     }
 
     if(cycleTimeInMsec < 0.125) {
diff --git a/examples/pubsub_realtime/pubsub_interrupt_publish.c b/examples/pubsub_realtime/pubsub_interrupt_publish.c
index 8d1293e39ea..27f222a303b 100644
--- a/examples/pubsub_realtime/pubsub_interrupt_publish.c
+++ b/examples/pubsub_realtime/pubsub_interrupt_publish.c
@@ -305,7 +305,6 @@ addPubSubConfiguration(UA_Server* server) {
 #endif
     UA_Server_addDataSetField(server, publishedDataSetIdent, &counterValue,
                               &dataSetFieldIdentCounter);
-
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
     writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -373,6 +372,7 @@ int main(void) {
     UA_StatusCode retval = UA_Server_run(server, &running);
 #if defined(PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS) || (PUBSUB_CONFIG_FASTPATH_STATIC_VALUES)
     if(staticValueSource != NULL) {
+        UA_DataValue_init(staticValueSource);
         UA_DataValue_delete(staticValueSource);
     }
 #endif
diff --git a/tools/ci.sh b/tools/ci.sh
index aa0b48b1975..74cce061f15 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -398,6 +398,7 @@ function examples_valgrind {
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_FILE_CONFIG=ON \
+          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_NAMESPACE_ZERO=FULL \
           ..
     make ${MAKEOPTS}

From b5edf6d8146ba9ccb2a3c725c434455ea8e8224c Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Thu, 11 May 2023 17:56:32 +0200
Subject: [PATCH 0927/1963] fix(CI): Enable sks and encryption examples. Fix
 memory leak in sks example (#5747)

---
 .github/workflows/build_linux.yml                    |  2 +-
 examples/pubsub/sks/CMakeLists.txt                   |  5 +++--
 examples/pubsub/sks/pubsub_publish_encrypted_sks.c   |  1 +
 examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c |  1 +
 examples/pubsub/sks/server_pubsub_central_sks.c      |  6 ++----
 tools/ci.sh                                          | 10 ++++++++++
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index f3a77a55e73..c0d32b99998 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -101,7 +101,7 @@ jobs:
             cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev mosquitto
             cmd_action: examples_valgrind MBEDTLS
           - build_name: "Valgrind Examples  with OpenSSL (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind openssl mosquitto
+            cmd_deps: sudo apt-get install -y -qq valgrind openssl libmbedtls-dev mosquitto
             cmd_action: examples_valgrind OPENSSL
           - build_name: "Clang Static Analyzer"
             cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev mosquitto
diff --git a/examples/pubsub/sks/CMakeLists.txt b/examples/pubsub/sks/CMakeLists.txt
index 22df27ddeec..678f2457503 100644
--- a/examples/pubsub/sks/CMakeLists.txt
+++ b/examples/pubsub/sks/CMakeLists.txt
@@ -1,7 +1,8 @@
 ########################################
 # PubSub Security Key Service Examples #
 ########################################
-
-add_example(server_pubsub_central_sks server_pubsub_central_sks.c)
+if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+    add_example(server_pubsub_central_sks server_pubsub_central_sks.c)  
+endif()
 add_example(pubsub_publish_encrypted_sks pubsub_publish_encrypted_sks.c)
 add_example(pubsub_subscribe_encrypted_sks pubsub_subscribe_encrypted_sks.c)
diff --git a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
index 7fbc74f514c..c39faf8153e 100644
--- a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
+++ b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
@@ -165,6 +165,7 @@ run(UA_UInt16 port, UA_String *transportProfile,
     UA_StatusCode retval = UA_Server_run(server, &running);
 
     UA_Server_delete(server);
+    UA_ClientConfig_delete(sksClientConfig);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
diff --git a/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c b/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
index 9edb2442210..8897a92e63d 100644
--- a/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
+++ b/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
@@ -335,6 +335,7 @@ run(UA_UInt16 port, UA_String *transportProfile,
 
     retval = UA_Server_run(server, &running);
     UA_Server_delete(server);
+    UA_ClientConfig_delete(sksClientConfig);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
diff --git a/examples/pubsub/sks/server_pubsub_central_sks.c b/examples/pubsub/sks/server_pubsub_central_sks.c
index 40f07ef9059..daf91263b25 100644
--- a/examples/pubsub/sks/server_pubsub_central_sks.c
+++ b/examples/pubsub/sks/server_pubsub_central_sks.c
@@ -161,10 +161,8 @@ setSecurityGroupRolePermission(UA_Server *server, UA_NodeId securityGroupNodeId,
     if(!server && !nodeContext)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_ByteString *username = UA_ByteString_new();
-    UA_String allowedUsername = UA_STRING((char *)nodeContext);
-    UA_ByteString_copy(&allowedUsername, username);
-    return UA_Server_setNodeContext(server, securityGroupNodeId, username);
+    UA_ByteString allowedUsername = UA_STRING((char *)nodeContext);
+    return UA_Server_setNodeContext(server, securityGroupNodeId, &allowedUsername);
 }
 
 UA_Boolean running = true;
diff --git a/tools/ci.sh b/tools/ci.sh
index 74cce061f15..59c6a060daf 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -400,6 +400,8 @@ function examples_valgrind {
           -DUA_ENABLE_PUBSUB_FILE_CONFIG=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_NAMESPACE_ZERO=FULL \
+          -DUA_ENABLE_PUBSUB_SKS=ON \
+          -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           ..
     make ${MAKEOPTS}
 
@@ -416,6 +418,14 @@ function examples_valgrind {
         # || true to ignore the error if the process is already dead
 	    kill -INT $pid || true
 
+        # wait for the process to terminate and check if the process is still running
+        sleep 5
+        if ps | grep "$pid"; then
+            echo $pid is still in the ps output. Must still be running.
+            # send the SIGINT signal again       
+            kill -INT $pid || true
+        fi
+        
         # using a 20 second timeout with SIGTERM to kill the process if it is still running
 	    timeout 20s bash -c 'wait $pid || kill -TERM $pid' ; EXIT_CODE=$?
 	    if [[ $EXIT_CODE -ne 0 ]]; then

From a0e59b1607ee18a6a4bff6396dbe2838de793359 Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Thu, 11 May 2023 23:56:32 +0200
Subject: [PATCH 0928/1963] fix(CI):Enabled nodeset examples

---
 tools/ci.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 59c6a060daf..7901499f6ed 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -398,8 +398,9 @@ function examples_valgrind {
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           -DUA_ENABLE_PUBSUB_MQTT=ON \
           -DUA_ENABLE_PUBSUB_FILE_CONFIG=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_NAMESPACE_ZERO=FULL \
+          -DUA_ENABLE_NODESETLOADER=ON \
+          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_SKS=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           ..

From 1f47491d0d9a406630a9de1c1d21eb1987885497 Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Fri, 12 May 2023 09:54:25 +0200
Subject: [PATCH 0929/1963] fix(nc): Fixed bugs in nodeset compiler that
 prevented building some nodesets correctly. (#5779)

---
 .../backend_open62541_datatypes.py            |  2 +-
 tools/nodeset_compiler/datatypes.py           | 31 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/tools/nodeset_compiler/backend_open62541_datatypes.py b/tools/nodeset_compiler/backend_open62541_datatypes.py
index 884c5f89ccd..775d3a741c3 100644
--- a/tools/nodeset_compiler/backend_open62541_datatypes.py
+++ b/tools/nodeset_compiler/backend_open62541_datatypes.py
@@ -127,7 +127,7 @@ def generateNodeValueCode(prepend , node, instanceName, valueName, global_var_co
                 node.value = 0.0
             else: 
                 node.value = 0
-        if encRule is None or isinstance(encRule.member_type, EnumerationType):
+        if encRule is None:
             return prepend + " = (UA_" + node.__class__.__name__ + ") " + str(node.value) + ";"
         else:
             return prepend + " = (UA_" + encRule.member_type.name + ") " + str(node.value) + ";"
diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index 51b4595cad7..d0b7c05547f 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -246,18 +246,23 @@ def __parseXMLSingleValue(self, xmlvalue, parentDataTypeNode, parent, parser, al
                 # The EncodingMask must be skipped.
                 if ebodypart.localName == "EncodingMask":
                     ebodypart = getNextElementNode(ebodypart)
-
-                # The SwitchField must be checked.
-                if ebodypart.localName == "SwitchField":
-                    # The switch field is the index of the available union fields starting with 1
-                    data = int(ebodypart.firstChild.data)
-                    if data == 0:
-                        # If the switch field is 0 then no field is present. A Union with no fields present has the same meaning as a NULL value.
-                        members = []
-                    else:
+                    # No optional fields are set.
+                    if(ebodypart is None):
                         members = []
-                        members.append(enc.members[data-1])
-                        ebodypart = getNextElementNode(ebodypart)
+
+                # The SwitchField must be checked. ebodypart could be None if only optional fields are included
+                # in the ExtensionObject and none of them is set.
+                if(ebodypart is not None):
+                    if ebodypart.localName == "SwitchField":
+                        # The switch field is the index of the available union fields starting with 1
+                        data = int(ebodypart.firstChild.data)
+                        if data == 0:
+                            # If the switch field is 0 then no field is present. A Union with no fields present has the same meaning as a NULL value.
+                            members = []
+                        else:
+                            members = []
+                            members.append(enc.members[data-1])
+                            ebodypart = getNextElementNode(ebodypart)
 
 
                 for e in members:
@@ -499,8 +504,8 @@ def parseXML(self, xmlvalue):
         # Extract <value> from string if possible
         if isinstance(self.value, string_types) and not self.__strIsInt(self.value):
             split = self.value.split('_')
-            if len(split) == 2 and self.__strIsInt(split[1]):
-                self.value = split[1]
+            if self.__strIsInt(split[len(split)-1]):
+                self.value = split[len(split)-1]
 
     @staticmethod
     def __strIsInt(strValue):

From b9df3fe79938184ddd63f9281ca6a537ee3bff32 Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Mon, 15 May 2023 19:18:30 -0400
Subject: [PATCH 0930/1963] fix(client): Fix error C2362 on Windows (#5786)

Initializing variables with NULL if the initialzation gets omitted
by a GOTO label
---
 src/client/ua_client_highlevel.c     | 4 +++-
 src/client/ua_client_subscriptions.c | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index 94d69098a88..c4e4d368e6d 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -865,6 +865,8 @@ AttributeReadCallback(UA_Client *client, void *userdata,
     UA_LOG_DEBUG(&UA_Client_getConfig(client)->logger, UA_LOGCATEGORY_CLIENT,
                 "Async read response for request %" PRIu32, requestId);
 
+    UA_DataValue *dv = NULL;
+
     /* Check the ServiceResult */
     UA_StatusCode res = rr->responseHeader.serviceResult;
     if(res != UA_STATUSCODE_GOOD)
@@ -877,7 +879,7 @@ AttributeReadCallback(UA_Client *client, void *userdata,
     }
 
     /* A Value attribute */
-    UA_DataValue *dv = &rr->results[0];
+    dv = &rr->results[0];
     if(ctx->resultType == &UA_TYPES[UA_TYPES_DATAVALUE]) {
         ctx->userCallback(client, ctx->userContext, requestId,
                           UA_STATUSCODE_GOOD, dv);
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 9e5db15dd7e..70fc9aab423 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -815,6 +815,7 @@ ua_MonitoredItems_delete(UA_Client *client, UA_Client_Subscription *sub,
 
 static void
 ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId, void *r) {
+    UA_Client_Subscription *sub = NULL;
     CustomCallback *cc = (CustomCallback *)d;
     UA_DeleteMonitoredItemsResponse *response = (UA_DeleteMonitoredItemsResponse *)r;
     UA_DeleteMonitoredItemsRequest *request =
@@ -825,7 +826,7 @@ ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
         goto cleanup;
 
-    UA_Client_Subscription *sub = findSubscription(client, request->subscriptionId);
+    sub = findSubscription(client, request->subscriptionId);
     if(!sub) {
         UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                     "No internal representation of subscription %" PRIu32,

From 5d73f0cc554ddc4b78df6581fa90026a025fad99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Fri, 12 May 2023 11:45:51 +0000
Subject: [PATCH 0931/1963] fix(deps): Bump LibreSSL to 3.7.2

---
 .github/workflows/build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index c0d32b99998..a97dc4217ed 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -50,9 +50,9 @@ jobs:
           - build_name: "Encryption (LibreSSL) Build & Unit Tests (gcc)"
             cmd_deps: |
                 sudo apt-get install -y -qq curl
-                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.0.tar.gz --output libressl.tar.gz
+                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.2.tar.gz --output libressl.tar.gz
                 tar -xvz -f libressl.tar.gz
-                cd libressl-3.7.0
+                cd libressl-3.7.2
                 ./configure
                 sudo make install
             cmd_action: unit_tests_encryption LIBRESSL

From 9554b5d4cc17c418b39c5921c6aa12452841a07f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 21 May 2023 17:08:26 +0200
Subject: [PATCH 0932/1963] feat(arch): Add MQTT ConnectionManager

---
 CMakeLists.txt                       |   9 +
 arch/eventloop_mqtt.c                | 819 +++++++++++++++++++++++++++
 include/open62541/plugin/eventloop.h |  33 ++
 tests/CMakeLists.txt                 |   5 +
 tests/check_eventloop_mqtt.c         | 121 ++++
 5 files changed, 987 insertions(+)
 create mode 100644 arch/eventloop_mqtt.c
 create mode 100644 tests/check_eventloop_mqtt.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1da9385c8f8..d896eea374d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -456,6 +456,9 @@ if(UA_ENABLE_PUBSUB_BUFMALLOC)
     endif()
 endif()
 
+option(UA_ENABLE_MQTT "Enable MQTT connections for the EventLoop" OFF)
+mark_as_advanced(UA_ENABLE_MQTT)
+
 option(UA_ENABLE_PUBSUB_MQTT "Enable publish/subscribe with mqtt (experimental)" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_MQTT)
 if(UA_ENABLE_PUBSUB_MQTT)
@@ -464,6 +467,7 @@ if(UA_ENABLE_PUBSUB_MQTT)
         message(FATAL_ERROR "Amalgamation cannot be generated with MQTT enabled")
     endif()
 
+    include_directories("${open62541_MQTT_DIR}/include")
     if(NOT UA_FILE_MQTT)
         set(UA_FILE_MQTT ${open62541_MQTT_DIR}/src/mqtt.c)
     endif()
@@ -1141,6 +1145,11 @@ if(UA_ENABLE_DISCOVERY)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.c)
 endif()
 
+if(UA_ENABLE_MQTT)
+    include_directories("${open62541_MQTT_DIR}/include")
+    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
+endif()
+
 if(UA_ENABLE_PUBSUB)
     list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h)
     list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp_multicast.c)
diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
new file mode 100644
index 00000000000..e516fc4c73f
--- /dev/null
+++ b/arch/eventloop_mqtt.c
@@ -0,0 +1,819 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ */
+
+/* The MQTT ConnectionManager is architecture agnostic. It selects an existing
+ * TCP ConnectionManager and uses it for the underlying TCP connections. */
+
+#include <open62541/plugin/eventloop.h>
+
+struct MQTTConnectionManager;
+typedef struct MQTTConnectionManager MQTTConnectionManager;
+
+struct MQTTBrokerConnection;
+typedef struct MQTTBrokerConnection MQTTBrokerConnection;
+
+struct MQTTTopicConnection;
+typedef struct MQTTTopicConnection MQTTTopicConnection;
+
+/* Prevent the inclusion of "mqtt_pal.h". We make the definitions inline here to remain
+ * architecture and OS-agnostic. */
+#define __MQTT_PAL_H__
+
+/* Network-endianness conversion */
+static UA_INLINE uint16_t
+MQTT_PAL_HTONS(uint16_t s) {
+    union {uint16_t t; uint8_t b[2];} v;
+    v.b[0] = (uint8_t)(s>>8);
+    v.b[1] = (uint8_t)s;
+    return v.t;
+}
+
+static UA_INLINE uint16_t
+MQTT_PAL_NTOHS(uint16_t s) {
+    union {uint16_t t; uint8_t b[2];} v;
+    v.t = s;
+    return (uint16_t)((uint16_t)v.b[1] + (((uint16_t)v.b[0])<<8));
+}
+
+/* Time definition (in seconds resolution) */
+typedef long int mqtt_pal_time_t;
+#define MQTT_PAL_TIME() (long int)(UA_DateTime_nowMonotonic() / UA_DATETIME_SEC)
+
+/* Mutex definition (disabled) */
+typedef UA_Byte mqtt_pal_mutex_t;
+#define MQTT_PAL_MUTEX_INIT(mtx_ptr) *mtx_ptr = 0
+#define MQTT_PAL_MUTEX_LOCK(mtx_ptr) {}
+#define MQTT_PAL_MUTEX_UNLOCK(mtx_ptr) {}
+
+/* Socket definition */
+typedef MQTTBrokerConnection * mqtt_pal_socket_handle;
+static ssize_t mqtt_pal_sendall(mqtt_pal_socket_handle fd, const void* buf, size_t len, int flags);
+static ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t bufsz, int flags);
+
+/* Include headers and source files! We need deep integration to use the above definitions. */
+#include "../deps/mqtt-c/include/mqtt.h"
+#include "../deps/mqtt-c/src/mqtt.c"
+
+#define MQTT_MESSAGE_MAXLEN (1u << 20) /* 1MB */
+#define MQTT_PARAMETERSSIZE 7
+#define MQTT_BROKERPARAMETERSSIZE 5 /* Parameters shared by topic connections
+                                     * connected to the smae broker */
+
+static const struct {
+    UA_QualifiedName name;
+    const UA_DataType *type;
+    UA_Boolean required;
+} MQTTConnectionParameters[MQTT_PARAMETERSSIZE] = {
+    {{0, UA_STRING_STATIC("address")}, &UA_TYPES[UA_TYPES_STRING], true},
+    {{0, UA_STRING_STATIC("port")}, &UA_TYPES[UA_TYPES_UINT16], false},
+    {{0, UA_STRING_STATIC("keep-alive")}, &UA_TYPES[UA_TYPES_UINT16], false},
+    {{0, UA_STRING_STATIC("username")}, &UA_TYPES[UA_TYPES_STRING], false},
+    {{0, UA_STRING_STATIC("password")}, &UA_TYPES[UA_TYPES_STRING], false},
+    {{0, UA_STRING_STATIC("subscribe")}, &UA_TYPES[UA_TYPES_BOOLEAN], false},
+    {{0, UA_STRING_STATIC("topic")}, &UA_TYPES[UA_TYPES_STRING], true}
+};
+
+/* The BrokerConnection is a stateful connection to the broker that aggregates
+ * subscriptions to topics. The BrokerConnection is not directly exposed via the
+ * public interface. Only TopicConnections are. */
+struct MQTTBrokerConnection {
+    MQTTBrokerConnection *next; /* Singly-linked list */
+
+    /* Backpointer to the ConnectionManager, always set */
+    MQTTConnectionManager *mcm;
+
+    /* Connection ID for the underlying TCP ConnectionManager */
+    uintptr_t tcpConnectionId;
+    UA_ConnectionState tcpConnectionState;
+    struct mqtt_client client;
+
+    UA_DateTime lastSendTime; /* When was the last packet sent out? */
+    UA_UInt16 keepalive;      /* Seconds between keepalives */
+    UA_UInt64 keepAliveCallbackId; /* Registered callback to send the keepalive */
+
+    /* Topic connections sharing the same connection to a broker */
+    MQTTTopicConnection *topicConnections;
+    uintptr_t lastTopicConnectionId;
+
+    /* Store the connection parameters. To reconnect when necessary and to check
+     * if a matching connection to the broker already exists. */
+    UA_KeyValueMap params;
+};
+
+/* Connections created via the EventLoop interface are bound to an individual
+ * topic. Aggregating them to BrokerConnections is hidden in the background. */
+struct MQTTTopicConnection {
+    MQTTTopicConnection *next; /* Singly-linked list */
+
+    /* (Broker Connection Id * 1000) + connection Id */
+    uintptr_t topicConnectionId; 
+    UA_ConnectionState topicConnectionState;
+
+    UA_String topic;      /* Name of the topic */
+    UA_Boolean subscribe; /* Subscribe or publish? */
+
+    /* Backpointer to the connection to the broker (is always set) */
+    MQTTBrokerConnection *brokerConnection;
+
+    /* Callback back into the application */
+    void *application;
+    void *context;
+    UA_ConnectionManager_connectionCallback callback;
+
+    /* For delayed removal */
+    UA_DelayedCallback dc;
+};
+
+/* The ConnectionManager holds a linked list of connections */
+struct MQTTConnectionManager {
+    UA_ConnectionManager cm;
+    UA_ConnectionManager *tcpCM; /* The TCP ConnectionManager to use. Set during
+                                  * the start of this CM. */
+    MQTTBrokerConnection *connections;
+};
+
+/* Send via the underlying TCP connection */
+ssize_t
+mqtt_pal_sendall(MQTTBrokerConnection *bc, const void* buf, size_t len, int flags) {
+    if(bc->tcpConnectionState != UA_CONNECTIONSTATE_ESTABLISHED)
+        return MQTT_ERROR_SOCKET_ERROR;
+
+    UA_ByteString msg = UA_BYTESTRING_NULL;
+    UA_ConnectionManager *tcpCM = bc->mcm->tcpCM;
+    UA_StatusCode res = tcpCM->allocNetworkBuffer(tcpCM, bc->tcpConnectionId, &msg, len);
+    if(res != UA_STATUSCODE_GOOD)
+        return MQTT_ERROR_SOCKET_ERROR;
+        
+    memcpy(msg.data, buf, len);
+    res = tcpCM->sendWithConnection(tcpCM, bc->tcpConnectionId,
+                                    &UA_KEYVALUEMAP_NULL, &msg);
+    if(res != UA_STATUSCODE_GOOD)
+        return MQTT_ERROR_SOCKET_ERROR;
+
+    bc->lastSendTime = UA_DateTime_nowMonotonic();
+    return (ssize_t)len;
+}
+
+/* Always return zero. The received messages are "manually" added to the buffer.
+ * So we don't block in the EventLoop model. */
+ssize_t
+mqtt_pal_recvall(MQTTBrokerConnection *bc, void* buf, size_t bufsz, int flags) {
+    return 0;
+}
+
+static UA_StatusCode
+MQTT_eventSourceStart(UA_ConnectionManager *cm) {
+    MQTTConnectionManager *mcm = (MQTTConnectionManager*)cm;
+    UA_EventLoop *el = cm->eventSource.eventLoop;
+    if(!el)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Check the state */
+    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STOPPED) {
+        UA_LOG_ERROR(el->logger, UA_LOGCATEGORY_NETWORK,
+                     "MQTT\t| To start the ConnectionManager, it has to be "
+                     "registered in an EventLoop and not started yet");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Use the first TCP ConnectionManager */
+    UA_String tcp = UA_STRING("tcp");
+    for(UA_EventSource *es = el->eventSources; es; es = es->next) {
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+        UA_ConnectionManager *cm2 = (UA_ConnectionManager*)es;
+        if(UA_String_equal(&tcp, &cm2->protocol)) {
+            mcm->tcpCM = cm2;
+            cm->eventSource.state = UA_EVENTSOURCESTATE_STARTED;
+            return UA_STATUSCODE_GOOD;
+        }
+    }
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
+static void
+removeTopicConnection(MQTTTopicConnection *tc);
+
+static void
+shutdownBrokerConnection(MQTTBrokerConnection *bc) {
+    if(bc->tcpConnectionState != UA_CONNECTIONSTATE_CLOSED &&
+       bc->tcpConnectionState != UA_CONNECTIONSTATE_CLOSING) {
+        UA_LOG_DEBUG(bc->mcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                     "MQTT-TCP %u\t| Closing the broker connection",
+                     (unsigned)bc->tcpConnectionId);
+    }
+
+    /* Shutdown and delete all associated topic connections. We immediately send
+     * the DISCONNECT and clear up the topic connections without sending an
+     * explicit unsubscribe.
+     *
+     * while(bc->topicConnections)
+     *     removeTopicConnection(bc->topicConnections); */
+
+    /* Send the DISCONNECT packet */
+    if(bc->tcpConnectionState == UA_CONNECTIONSTATE_ESTABLISHED) {
+        mqtt_disconnect(&bc->client);
+        __mqtt_send(&bc->client);
+    }
+
+    /* Close the TCP connection -> callback in the next el iteration */
+    if(bc->tcpConnectionState != UA_CONNECTIONSTATE_CLOSED &&
+       bc->tcpConnectionState != UA_CONNECTIONSTATE_CLOSING) {
+        UA_ConnectionManager *tcpCM = bc->mcm->tcpCM;
+        tcpCM->closeConnection(tcpCM, bc->tcpConnectionId);
+        bc->tcpConnectionState = UA_CONNECTIONSTATE_CLOSING;
+    }
+}
+
+static void
+MQTT_eventSourceStop(UA_ConnectionManager *cm) {
+    if(cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPING ||
+       cm->eventSource.state == UA_EVENTSOURCESTATE_STOPPED)
+        return;
+
+    UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
+                "MQTT\t| Shutting down the ConnectionManager");
+
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
+
+    MQTTConnectionManager *mcm = (MQTTConnectionManager*)cm;
+    for(MQTTBrokerConnection *bc = mcm->connections; bc; bc = bc->next) {
+        shutdownBrokerConnection(bc);
+    }
+}
+
+static UA_StatusCode
+MQTT_eventSourceDelete(UA_ConnectionManager *cm) {
+    UA_String_clear(&cm->eventSource.name);
+    UA_free(cm);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+MQTT_allocNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                        UA_ByteString *buf, size_t bufSize) {
+    UA_ConnectionManager *tcpCM = ((MQTTConnectionManager*)cm)->tcpCM;
+    return tcpCM->allocNetworkBuffer(tcpCM, connectionId, buf, bufSize);
+}
+
+static void
+MQTT_freeNetworkBuffer(UA_ConnectionManager *cm, uintptr_t connectionId,
+                       UA_ByteString *buf) {
+    UA_ConnectionManager *tcpCM = ((MQTTConnectionManager*)cm)->tcpCM;
+    tcpCM->freeNetworkBuffer(tcpCM, connectionId, buf);
+}
+
+static void
+deleteTopicConnection(void *application, MQTTTopicConnection *tc) {
+    (void)application;
+    UA_String_clear(&tc->topic);
+    UA_free(tc);
+}
+
+static void
+removeTopicConnection(MQTTTopicConnection *tc) {
+    UA_LOG_INFO(tc->brokerConnection->mcm->cm.eventSource.eventLoop->logger,
+                UA_LOGCATEGORY_NETWORK, "MQTT %u\t| Closing the connection",
+                (unsigned)tc->topicConnectionId);
+
+    /* Send the UNSUBSCRIBE packet */
+    MQTTBrokerConnection *bc = tc->brokerConnection;
+    if(tc->subscribe &&
+       tc->topicConnectionState == UA_CONNECTIONSTATE_ESTABLISHED &&
+       bc->tcpConnectionState == UA_CONNECTIONSTATE_ESTABLISHED) {
+        mqtt_unsubscribe(&bc->client, (const char*)tc->topic.data);
+        __mqtt_send(&bc->client);
+    }
+
+    /* Remove from linked list */
+    for(MQTTTopicConnection **next = &bc->topicConnections; *next; next = &(*next)->next) {
+        if(*next == tc) {
+            *next = tc->next;
+            break;
+        }
+    }
+
+    /* Signal the closed connection to the application */
+    UA_KeyValuePair kvp[2];
+    kvp[0].key = UA_QUALIFIEDNAME(0, "topic");
+    UA_Variant_setScalar(&kvp[0].value, &tc->topic, &UA_TYPES[UA_TYPES_STRING]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "subscribe");
+    UA_Variant_setScalar(&kvp[0].value, &tc->subscribe, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    UA_KeyValueMap kvm = {2, kvp};
+    tc->callback(&bc->mcm->cm, tc->topicConnectionId, tc->application, &tc->context,
+                 UA_CONNECTIONSTATE_CLOSED, &kvm, UA_BYTESTRING_NULL);
+
+    /* Register delayed callback to free the memory */
+    UA_EventLoop *el = bc->mcm->cm.eventSource.eventLoop;
+    tc->dc.callback = (UA_Callback)deleteTopicConnection;
+    tc->dc.application = NULL;
+    tc->dc.context = tc;
+    el->addDelayedCallback(el, &tc->dc);
+
+    /* The last topic connection was removed. Close the broker connection. */
+    if(!bc->topicConnections)
+        shutdownBrokerConnection(bc);
+}
+
+static void
+removeBrokerConnection(MQTTBrokerConnection *bc) {
+    MQTTConnectionManager *mcm = bc->mcm;
+    UA_EventLoop *el = mcm->cm.eventSource.eventLoop;
+    UA_LOG_DEBUG(bc->mcm->cm.eventSource.eventLoop->logger,
+                 UA_LOGCATEGORY_NETWORK, "MQTT-TCP %u\t| Removing the broker connection",
+                 (unsigned)bc->tcpConnectionId);
+
+    /* Remove the keepalive callback */
+    if(bc->keepAliveCallbackId > 0)
+        el->removeCyclicCallback(el, bc->keepAliveCallbackId);
+    
+    /* Remove from linked list */
+    for(MQTTBrokerConnection **next = &mcm->connections; *next; next = &(*next)->next) {
+        if(*next == bc) {
+            *next = bc->next;
+            break;
+        }
+    }
+
+    /* Shutdown and delete all associated topic connections */
+    while(bc->topicConnections)
+        removeTopicConnection(bc->topicConnections);
+
+    UA_KeyValueMap_clear(&bc->params);
+    UA_free(bc->client.recv_buffer.mem_start);
+    UA_free(bc->client.mq.mem_start);
+    UA_free(bc);
+
+    /* Stopped and the last connection was removed? */
+    if(mcm->cm.eventSource.state == UA_EVENTSOURCESTATE_STOPPING && !mcm->connections)
+        mcm->cm.eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+}
+
+/* Look for BrokerConnections with identical broker connection parameters */
+static MQTTBrokerConnection *
+findIdenticalBrokerConnection(MQTTConnectionManager *mcm,
+                              const UA_KeyValueMap *kvm) {
+    for(MQTTBrokerConnection *bc = mcm->connections; bc; bc = bc->next) {
+        UA_Boolean found = true;
+        for(size_t i = 0; i < MQTT_BROKERPARAMETERSSIZE; i++) {
+            const UA_Variant *v1 =
+                UA_KeyValueMap_get(kvm, MQTTConnectionParameters[i].name);
+            const UA_Variant *v2 =
+                UA_KeyValueMap_get(kvm, MQTTConnectionParameters[i].name);
+            if(v1 == v2)
+                continue;
+            if(!v2)
+                continue; /* Not defined in the "required params" we are searching for */
+            if(!v1 || UA_order(v1, v2, &UA_TYPES[UA_TYPES_VARIANT]) != UA_ORDER_EQ) {
+                found = false;
+                break;
+            }
+        }
+        if(found)
+            return bc;
+    }
+    return NULL;
+}
+
+static MQTTBrokerConnection *
+findBrokerConnection(MQTTConnectionManager *mcm, uintptr_t id) {
+    uintptr_t brokerId = id / 1000;
+    for(MQTTBrokerConnection *bc = mcm->connections; bc; bc = bc->next) {
+        if(bc->tcpConnectionId == brokerId)
+            return bc;
+    }
+    return NULL;
+}
+
+static MQTTTopicConnection *
+findTopicConnection(MQTTConnectionManager *mcm, uintptr_t id) {
+    MQTTBrokerConnection *bc = findBrokerConnection(mcm, id);
+    if(!bc)
+        return NULL;
+    for(MQTTTopicConnection *tc = bc->topicConnections; tc; tc = tc->next) {
+        if(tc->topicConnectionId == id)
+            return tc;
+    }
+    return NULL;
+}
+
+static void
+MQTTKeepAliveCallback(void *app, MQTTBrokerConnection *bc) {
+    (void)app;
+    if(bc->lastSendTime + (bc->keepalive * UA_DATETIME_SEC) > UA_DateTime_nowMonotonic())
+        return;
+    mqtt_ping(&bc->client);
+    __mqtt_send(&bc->client);
+}
+
+static void
+MQTTPublishResponseCallback(void** state, struct mqtt_response_publish *publish) {
+    MQTTBrokerConnection *bc = *(MQTTBrokerConnection**)state;
+
+    /* Find matching TopicConnection */
+    UA_String topic = {publish->topic_name_size,
+                       (UA_Byte*)(uintptr_t)publish->topic_name};
+    UA_ByteString msg = {publish->application_message_size,
+                         (UA_Byte*)(uintptr_t)publish->application_message};
+
+    /* Forward the topic name to the application */
+    UA_Boolean subscribe = true;
+    UA_KeyValuePair kvp[2];
+    kvp[0].key = UA_QUALIFIEDNAME(0, "topic");
+    UA_Variant_setScalar(&kvp[0].value, &topic, &UA_TYPES[UA_TYPES_STRING]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "subscribe");
+    UA_Variant_setScalar(&kvp[1].value, &subscribe, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    UA_KeyValueMap kvm = {2, kvp};
+
+    /* Notify all matching topic connections */
+    for(MQTTTopicConnection *tc = bc->topicConnections; tc; tc = tc->next) {
+        if(!tc->subscribe || !UA_String_equal(&topic, &tc->topic))
+            continue;
+
+        UA_LOG_DEBUG(tc->brokerConnection->mcm->cm.eventSource.eventLoop->logger,
+                     UA_LOGCATEGORY_NETWORK, "MQTT %u\t| Received a message of "
+                     "%u bytes", (unsigned)tc->topicConnectionId, (unsigned)msg.length);
+
+        /* Notify the appliation that the connection is now established. The
+         * only way to know about this is to receive the first message for the
+         * topic (MQTT-C recieves a SUBACK message but does not forward that
+         * information). */
+        if(tc->topicConnectionState != UA_CONNECTIONSTATE_ESTABLISHED) {
+            tc->topicConnectionState = UA_CONNECTIONSTATE_ESTABLISHED;
+            tc->callback(&bc->mcm->cm, tc->topicConnectionId,
+                         tc->application, &tc->context,
+                         UA_CONNECTIONSTATE_ESTABLISHED, &kvm,
+                         UA_BYTESTRING_NULL);
+        }
+
+        /* Forward the received message */
+        tc->callback(&bc->mcm->cm, tc->topicConnectionId, tc->application,
+                     &tc->context, UA_CONNECTIONSTATE_ESTABLISHED, &kvm, msg);
+    }
+}
+
+static void
+MQTTNetworkCallback(UA_ConnectionManager *tcpCM, uintptr_t connectionId,
+                    void *application, void **connectionContext, UA_ConnectionState state,
+                    const UA_KeyValueMap *params, UA_ByteString msg) {
+    MQTTBrokerConnection *bc = *(MQTTBrokerConnection**)connectionContext;
+    MQTTConnectionManager *mcm = bc->mcm;
+    UA_assert(bc);
+
+    /* Set the new TCP state */
+    UA_ConnectionState oldState = bc->tcpConnectionState;
+    bc->tcpConnectionState = state;
+
+    /* The first callback. Initialize the bc. */
+    if(oldState == UA_CONNECTIONSTATE_CLOSED) {
+        /* Store the tcp connection id */
+        bc->tcpConnectionId = connectionId;
+
+        /* Set the context pointer for the mqtt client */
+        bc->client.publish_response_callback_state = bc;
+    }
+
+    UA_LOG_DEBUG(bc->mcm->cm.eventSource.eventLoop->logger,
+                 UA_LOGCATEGORY_NETWORK, "MQTT-TCP %u\t| Network callback",
+                 (unsigned)bc->tcpConnectionId);
+
+    /* TCP Connection is closing. Clean up all the topic connections as well.
+     * Reconnecting must be handled on the application level. */
+    if(state == UA_CONNECTIONSTATE_CLOSING || state == UA_CONNECTIONSTATE_CLOSED) {
+        removeBrokerConnection(bc);
+        return;
+    }
+
+    /* The connection has fully opened for the first time. Connect the MQTT client. */
+    if(state == UA_CONNECTIONSTATE_ESTABLISHED &&
+       oldState != UA_CONNECTIONSTATE_ESTABLISHED) {
+        /* Initialize the MQTT client. We have to call mqtt_connect right afterward.
+         * Otherwise the client lock is not released. */
+        mqtt_init(&bc->client, bc,
+                  (uint8_t*)UA_calloc(1,1024), 1024,
+                  (uint8_t*)UA_calloc(1,1024), 1024,
+                  MQTTPublishResponseCallback);
+
+        /* Queue the connect message */
+        enum MQTTErrors err = mqtt_connect(&bc->client, NULL, NULL, NULL, 0,
+                                           NULL, NULL, MQTT_CONNECT_CLEAN_SESSION, 400);
+        if(err != MQTT_OK) {
+            bc->tcpConnectionState = UA_CONNECTIONSTATE_OPENING; /* avoid sending DISCONNECT */
+            shutdownBrokerConnection(bc);
+            return;
+        }
+
+        /* Handle topic connections already registered on the opening broker
+         * connection */
+        for(MQTTTopicConnection *tc = bc->topicConnections, *next = NULL;
+            tc && (next = (tc) ? tc->next : NULL, 1); tc = next) {
+            if(tc->subscribe) {
+                /* Subscribe-connections call mqtt_subscribe but wait until the
+                 * first received message to signal that they successfully
+                 * opened */
+                err = mqtt_subscribe(&bc->client, (const char*)tc->topic.data, 0);
+                if(err == MQTT_OK)
+                    err = (enum MQTTErrors)__mqtt_send(&bc->client);
+                if(err != MQTT_OK)
+                    removeTopicConnection(tc);
+                UA_LOG_INFO(bc->mcm->cm.eventSource.eventLoop->logger,
+                            UA_LOGCATEGORY_NETWORK, "MQTT %u\t| Created connection "
+                            "subscribed on topic \"%s\"",
+                            (unsigned)tc->topicConnectionId, (char*)tc->topic.data);
+            } else {
+                /* Publish-connections are signaling their state to the
+                 * application immediately with a callback */
+                UA_LOG_INFO(bc->mcm->cm.eventSource.eventLoop->logger,
+                            UA_LOGCATEGORY_NETWORK, "MQTT %u\t| Created connection "
+                            "publishing on topic \"%s\"",
+                            (unsigned)tc->topicConnectionId, (char*)tc->topic.data);
+                tc->topicConnectionState = UA_CONNECTIONSTATE_ESTABLISHED;
+                tc->callback(&mcm->cm, tc->topicConnectionId, tc->application, &tc->context,
+                             tc->topicConnectionState, &UA_KEYVALUEMAP_NULL,
+                             UA_BYTESTRING_NULL);
+            }
+        }
+    }
+
+    /* No message to process? */
+    if(msg.length == 0)
+        return;
+
+    /* Append the received message to the receive buffer. Increase the recv
+     * buffer if necessary. */
+    if(bc->client.recv_buffer.curr_sz < msg.length) {
+        if(bc->client.recv_buffer.mem_size + msg.length > MQTT_MESSAGE_MAXLEN)
+            return;
+        uint8_t *mem = (uint8_t*)
+            UA_realloc(bc->client.recv_buffer.mem_start,
+                       bc->client.recv_buffer.mem_size + msg.length);
+        if(!mem)
+            return;
+        size_t prev_len = bc->client.recv_buffer.mem_size - bc->client.recv_buffer.curr_sz;
+        bc->client.recv_buffer.mem_start = mem;
+        bc->client.recv_buffer.mem_size += msg.length;
+        bc->client.recv_buffer.curr = &mem[prev_len];
+        bc->client.recv_buffer.curr_sz += msg.length;
+    }
+    memcpy(bc->client.recv_buffer.curr, msg.data, msg.length);
+    bc->client.recv_buffer.curr += msg.length;
+    bc->client.recv_buffer.curr_sz -= msg.length;
+
+    /* Process the message. The internal mqtt_pal_recvall does nothing (as we
+     * already have added the message to the buffer. But then the entire buffer
+     * is processed. */
+    __mqtt_recv(&bc->client);
+}
+
+static MQTTBrokerConnection *
+createBrokerConnection(MQTTConnectionManager *mcm,
+                       const UA_KeyValueMap *params) {
+    /* Allocate connection memory */
+    MQTTBrokerConnection *bc = (MQTTBrokerConnection*)
+        UA_calloc(1, sizeof(MQTTBrokerConnection));
+    if(!bc)
+        return NULL;
+
+    /* Copy the parameters */
+    UA_StatusCode res = UA_KeyValueMap_copy(params, &bc->params);
+
+    bc->mcm = mcm;
+
+    /* Add to the linked list (use removeBrokerConnection from here on) */
+    bc->next = mcm->connections;
+    mcm->connections = bc;
+
+    /* Extract the parameters */
+    UA_String *broker = (UA_String*)(uintptr_t)
+        UA_KeyValueMap_getScalar(params,
+                                 UA_QUALIFIEDNAME(0, "address"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    UA_assert(broker != NULL);
+
+    UA_UInt16 *port = (UA_UInt16*)(uintptr_t)
+        UA_KeyValueMap_getScalar(params,
+                                 UA_QUALIFIEDNAME(0, "port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    UA_UInt16 _port = 1883;
+    if(!port)
+        port = &_port;
+
+    const UA_UInt16 *keepAlive = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params,
+                                 UA_QUALIFIEDNAME(0, "keep-alive"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+
+    /* Register the KeepAlive */
+    bc->keepalive = 400; /* Default */
+    if(keepAlive && *keepAlive > 0)
+        bc->keepalive = *keepAlive;
+
+    UA_EventLoop *el = mcm->cm.eventSource.eventLoop;
+    res = el->addCyclicCallback(el, (UA_Callback)MQTTKeepAliveCallback, NULL, bc,
+                                bc->keepalive * UA_DATETIME_SEC,
+                                NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                &bc->keepAliveCallbackId);
+    if(res != UA_STATUSCODE_GOOD) {
+        removeBrokerConnection(bc);
+        return NULL;
+    }
+
+    /* Open the Connection. This also sets the broker connection id to the TCP id. */
+    UA_KeyValuePair tcpParams[2];
+    tcpParams[0].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&tcpParams[0].value, broker, &UA_TYPES[UA_TYPES_STRING]);
+    tcpParams[1].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&tcpParams[1].value, port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_KeyValueMap kvm = {2, tcpParams};
+
+    UA_ConnectionManager *tcpCM = mcm->tcpCM;
+    res = tcpCM->openConnection(tcpCM, &kvm, NULL, bc, MQTTNetworkCallback);
+    if(res != UA_STATUSCODE_GOOD) {
+        removeBrokerConnection(bc);
+        return NULL;
+    }
+
+    UA_LOG_DEBUG(bc->mcm->cm.eventSource.eventLoop->logger,
+                 UA_LOGCATEGORY_NETWORK, "MQTT-TCP %u\t| Created broker connection",
+                 (unsigned)bc->tcpConnectionId);
+
+    return bc;
+}
+
+static MQTTTopicConnection *
+createTopicConnection(MQTTConnectionManager *mcm, MQTTBrokerConnection *bc,
+                      const UA_KeyValueMap *params,
+                      void *application, void *context,
+                      UA_ConnectionManager_connectionCallback connectionCallback) {
+    UA_Boolean subscribe = true;
+    const UA_Boolean *_subscribe= (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "subscribe"),
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(_subscribe)
+        subscribe = *_subscribe;
+    const UA_String *topic = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "topic"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(topic->length == 0)
+        return NULL;
+
+    MQTTTopicConnection *tc = (MQTTTopicConnection*)
+        UA_calloc(1, sizeof(MQTTTopicConnection));
+    if(!tc)
+        return NULL;
+    tc->application = application;
+    tc->context = context;
+    tc->callback = connectionCallback;
+    tc->brokerConnection = bc;
+    tc->topicConnectionId = (bc->tcpConnectionId * 1000) + (++bc->lastTopicConnectionId);
+    tc->subscribe = subscribe;
+
+    /* Make a null-terminated copy of the topic string to forward to the MQTT client. */
+    tc->topic.data = (UA_Byte*)UA_malloc(topic->length + 1);
+    if(!tc->topic.data) {
+        UA_free(tc);
+        return NULL;
+    }
+    memcpy(tc->topic.data, topic->data, topic->length);
+    tc->topic.data[topic->length] = 0;
+    tc->topic.length = topic->length;
+
+    /* Subscribe the MQTT client if the client is already connected. Otherwise
+     * defer mqtt_subscribe until the TCP socket is fully opened and we
+     * connect. */
+    if(bc->tcpConnectionState == UA_CONNECTIONSTATE_ESTABLISHED) {
+        tc->topicConnectionState = UA_CONNECTIONSTATE_ESTABLISHED;
+        if(subscribe) {
+            enum MQTTErrors err = mqtt_subscribe(&bc->client, (const char*)topic->data, 0);
+            if(err != MQTT_OK) {
+                UA_String_clear(&tc->topic);
+                UA_free(tc);
+                return NULL;
+            }
+            UA_LOG_INFO(bc->mcm->cm.eventSource.eventLoop->logger,
+                        UA_LOGCATEGORY_NETWORK, "MQTT %u\t| Created connection "
+                        "subscribed on topic \"%s\"",
+                        (unsigned)tc->topicConnectionId, (char*)topic->data);
+        } else {
+            UA_LOG_INFO(bc->mcm->cm.eventSource.eventLoop->logger,
+                        UA_LOGCATEGORY_NETWORK, "MQTT %u\t| Created connection "
+                        "publishing on topic \"%s\"",
+                        (unsigned)tc->topicConnectionId, (char*)topic->data);
+        }
+    } else {
+        tc->topicConnectionState = UA_CONNECTIONSTATE_OPENING;
+    }
+
+    /* Add to the linked list */
+    tc->next = bc->topicConnections;
+    bc->topicConnections = tc;
+
+    /* Signal the connection state. If the broker connection is not yet
+     * established, then the state will be signaled again when the broker
+     * connection opens fully. */
+    connectionCallback(&mcm->cm, tc->topicConnectionId, application, &tc->context,
+                       tc->topicConnectionState, &UA_KEYVALUEMAP_NULL,
+                       UA_BYTESTRING_NULL);
+    return tc;
+}
+
+static UA_StatusCode
+MQTT_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
+                    void *application, void *context,
+                    UA_ConnectionManager_connectionCallback connectionCallback) {
+    if(cm->eventSource.state != UA_EVENTSOURCESTATE_STARTED)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    MQTTConnectionManager *mcm = (MQTTConnectionManager*)cm;
+
+    /* Ensure the required parameters exist if required. And if they exist, they
+     * have to be scalars of the correct type. */
+    for(size_t i = 0; i < MQTT_PARAMETERSSIZE; i++) {
+        const UA_Variant *val =
+            UA_KeyValueMap_get(params, MQTTConnectionParameters[i].name);
+        if((!val && MQTTConnectionParameters[i].required) ||
+           (val && !UA_Variant_hasScalarType(val, MQTTConnectionParameters[i].type)))
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
+
+    /* Test whether an existing broker connection can be reused.
+     * Otherwise create a new one. */
+    MQTTBrokerConnection *bc = findIdenticalBrokerConnection(mcm, params);
+    if(!bc && !(bc = createBrokerConnection(mcm, params)))
+        return UA_STATUSCODE_BADNOTCONNECTED;
+
+    /* Create the per-topic connection */
+    MQTTTopicConnection *tc =
+        createTopicConnection(mcm, bc, params, application,
+                              context, connectionCallback);
+    if(!tc) {
+        /* If adding failed and the bc has no other topic connection -> close bc */
+        if(!bc->topicConnections)
+            shutdownBrokerConnection(bc);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+MQTT_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
+                        const UA_KeyValueMap *params,
+                        UA_ByteString *buf) {
+    MQTTConnectionManager *mcm = (MQTTConnectionManager*)cm;
+    MQTTTopicConnection *tc = findTopicConnection(mcm, connectionId);
+    if(!tc)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    MQTTBrokerConnection *bc = tc->brokerConnection;
+    if(bc->tcpConnectionState != UA_CONNECTIONSTATE_ESTABLISHED)
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+
+    UA_LOG_DEBUG(bc->mcm->cm.eventSource.eventLoop->logger,
+                 UA_LOGCATEGORY_NETWORK, "MQTT %u\t| Publishing on topic \"%s\" "
+                 "a message with %u bytes", (unsigned)tc->topicConnectionId,
+                 (char*)tc->topic.data, (unsigned)buf->length);
+
+    enum MQTTErrors res = mqtt_publish(&bc->client, (const char*)tc->topic.data,
+                                       buf->data, buf->length, 0);
+    if(UA_LIKELY(res == MQTT_OK))
+        res = (enum MQTTErrors)__mqtt_send(&bc->client);
+    return (res == MQTT_OK) ? UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
+}
+
+static UA_StatusCode
+MQTT_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
+    MQTTConnectionManager *mcm = (MQTTConnectionManager*)cm;
+    MQTTTopicConnection *tc = findTopicConnection(mcm, connectionId);
+    if(!tc)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    removeTopicConnection(tc);
+    return UA_STATUSCODE_GOOD;
+}
+
+static const char *mqttName = "mqtt";
+
+UA_ConnectionManager *
+UA_ConnectionManager_new_MQTT(const UA_String eventSourceName) {
+    MQTTConnectionManager *cm = (MQTTConnectionManager*)
+        UA_calloc(1, sizeof(MQTTConnectionManager));
+    if(!cm)
+        return NULL;
+
+    cm->cm.eventSource.eventSourceType = UA_EVENTSOURCETYPE_CONNECTIONMANAGER;
+    UA_String_copy(&eventSourceName, &cm->cm.eventSource.name);
+    cm->cm.eventSource.start = (UA_StatusCode (*)(UA_EventSource *))MQTT_eventSourceStart;
+    cm->cm.eventSource.stop = (void (*)(UA_EventSource *))MQTT_eventSourceStop;
+    cm->cm.eventSource.free = (UA_StatusCode (*)(UA_EventSource *))MQTT_eventSourceDelete;
+    cm->cm.protocol = UA_STRING((char*)(uintptr_t)mqttName);
+    cm->cm.openConnection = MQTT_openConnection;
+    cm->cm.allocNetworkBuffer = MQTT_allocNetworkBuffer;
+    cm->cm.freeNetworkBuffer = MQTT_freeNetworkBuffer;
+    cm->cm.sendWithConnection = MQTT_sendWithConnection;
+    cm->cm.closeConnection = MQTT_shutdownConnection;
+    return &cm->cm;
+}
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index f67e6c860f3..bb37283fffc 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -557,6 +557,39 @@ UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName);
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName);
 
+/**
+ * MQTT Connection Manager
+ * ~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * The MQTT ConnectionManager reuses the TCP ConnectionManager that is
+ * configured in the EventLoop. Hence the MQTT ConnectionManager is platform
+ * agnostic and does not require porting. An MQTT connection is for a
+ * combination of broker and topic. The MQTT ConnectionManager can group
+ * connections to the same broker in the background. Hence adding multiple
+ * connections for the same broker is "cheap". To have individual control,
+ * separate connections are created for each topic and for each direction
+ * (publishing / subscribing).
+ *
+ * Open Connection Parameters:
+ * - 0:address [string]: Hostname or IPv4/v6 address of the MQTT broker
+ *                       (required).
+ * - 0:port [uint16]: Port of the MQTT broker (default: 1883).
+ * - 0:username [string]: Username to use (default: none)
+ * - 0:password [string]: Password to use (default: none)
+ * - 0:keep-alive [uint16]: Number of seconds for the keep-alive (ping)
+ *                          (default: 400).
+ *
+ * - 0:topic [string]: Topic to which the connection is associated (required).
+ * - 0:subscribe [bool]: Subscribe to the topic (default: false).
+ *                       Otherwise it is only possible to publish on the topic.
+ *                       Subscribed topics can also be published to.
+ *
+ * Connection Callback Parameters:
+ * - 0:topic [string]: The value set during connect.
+ * - 0:subscribe [bool]: The value set during connect. */
+UA_EXPORT UA_ConnectionManager *
+UA_ConnectionManager_new_MQTT(const UA_String eventSourceName);
+
 /**
  * Signal Interrupt Manager
  * ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cdb78eb29a7..f85e9a76e2b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -259,6 +259,11 @@ if(LINUX AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
     ua_add_test(check_eventloop_eth.c)
 endif()
 
+if(UA_ENABLE_MQTT)
+    list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
+    ua_add_test(check_eventloop_mqtt.c)
+endif()
+
 # Test Server
 
 ua_add_test(server/check_accesscontrol.c)
diff --git a/tests/check_eventloop_mqtt.c b/tests/check_eventloop_mqtt.c
new file mode 100644
index 00000000000..53413868d34
--- /dev/null
+++ b/tests/check_eventloop_mqtt.c
@@ -0,0 +1,121 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/plugin/eventloop.h>
+#include <open62541/plugin/log_stdout.h>
+#include "open62541/types.h"
+#include "open62541/types_generated.h"
+
+/* The test suite requires an MQTT server listening at localhost:1883 */
+
+#include "testing_clock.h"
+#include <time.h>
+#include <check.h>
+
+unsigned int messageCount = 0;
+
+static void
+connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                   void *application, void **connectionContext,
+                   UA_ConnectionState status,
+                   const UA_KeyValueMap *params,
+                   UA_ByteString msg) {
+    uintptr_t *id = *(uintptr_t**)connectionContext;
+    if(status == UA_CONNECTIONSTATE_CLOSING) {
+        UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                     "Closing connection %u", (unsigned)connectionId);
+    } else if(msg.length > 0) {
+        UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                     "Received a message of length %u", (unsigned)msg.length);
+        messageCount++;
+    } else if(*id == 0) {
+        UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                     "Opening connection %u", (unsigned)connectionId);
+        *id = connectionId;
+    }
+}
+
+START_TEST(connectSubscribePublish) {
+    UA_ConnectionManager *cm = UA_ConnectionManager_new_POSIX_TCP(UA_STRING("tcpCM"));
+    UA_ConnectionManager *mcm = UA_ConnectionManager_new_MQTT(UA_STRING("mqttCM"));
+    UA_EventLoop *el = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    el->registerEventSource(el, &cm->eventSource);
+    el->registerEventSource(el, &mcm->eventSource);
+    el->start(el);
+
+    UA_UInt16 port = 1883;
+    UA_String hostname = UA_STRING("localhost");
+    UA_String topic = UA_STRING("mytopic");
+    UA_Boolean subscribe = true;
+
+    UA_KeyValuePair params[4];
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&params[1].value, &hostname, &UA_TYPES[UA_TYPES_STRING]);
+    params[2].key = UA_QUALIFIEDNAME(0, "topic");
+    UA_Variant_setScalar(&params[2].value, &topic, &UA_TYPES[UA_TYPES_STRING]);
+    params[3].key = UA_QUALIFIEDNAME(0, "subscribe");
+    UA_Variant_setScalar(&params[3].value, &subscribe, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    UA_KeyValueMap kvm = {4, params};
+
+    uintptr_t subscribeConnectionId = 0;
+    UA_StatusCode res = mcm->openConnection(mcm, &kvm, NULL,
+                                            &subscribeConnectionId, connectionCallback);
+    ck_assert(res == UA_STATUSCODE_GOOD);
+
+    subscribe = false;
+    uintptr_t publishConnectionId = 0;
+    res = mcm->openConnection(mcm, &kvm, NULL,
+                              &publishConnectionId, connectionCallback);
+    ck_assert(res == UA_STATUSCODE_GOOD);
+
+    /* Iterate to open the connection */
+    el->run(el, 100);
+
+    /* Send with the subscribed connection succeeds */
+    UA_ByteString msg = UA_BYTESTRING("open62541-msg");
+    res = mcm->sendWithConnection(mcm, subscribeConnectionId,
+                                  &UA_KEYVALUEMAP_NULL, &msg);
+    ck_assert(res == UA_STATUSCODE_GOOD);
+
+    /* Send with the publish connection */
+    res = mcm->sendWithConnection(mcm, publishConnectionId,
+                                  &UA_KEYVALUEMAP_NULL, &msg);
+    ck_assert(res == UA_STATUSCODE_GOOD);
+
+    /* Receive the message */
+    ck_assert_uint_eq(messageCount, 0);
+    while(messageCount < 2)
+        el->run(el, 100);
+    ck_assert_uint_eq(messageCount, 2);
+
+    /* Stop the EventLoop */
+    int max_stop_iteration_count = 10;
+    int iteration = 0;
+    el->stop(el);
+    while(el->state != UA_EVENTLOOPSTATE_STOPPED && iteration < max_stop_iteration_count) {
+        UA_DateTime next = el->run(el, 1);
+        UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
+        iteration++;
+    }
+    ck_assert(el->state == UA_EVENTLOOPSTATE_STOPPED);
+    el->free(el);
+    el = NULL;
+} END_TEST
+
+int main(void) {
+    Suite *s  = suite_create("Test MQTT TCP EventLoop");
+    TCase *tc = tcase_create("test cases");
+    tcase_add_test(tc, connectSubscribePublish);
+    suite_add_tcase(s, tc);
+
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all (sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From c5e2fe8b7193f84ef48a241a9f9874f85d77b1b9 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Mon, 22 May 2023 09:09:06 +0200
Subject: [PATCH 0933/1963] feat(arch): Init MQTT ConnectionManager

---
 arch/eventloop_mqtt.c       | 2 +-
 plugins/ua_config_default.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index e516fc4c73f..29e19a90f77 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -61,7 +61,7 @@ static ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t buf
 #define MQTT_MESSAGE_MAXLEN (1u << 20) /* 1MB */
 #define MQTT_PARAMETERSSIZE 7
 #define MQTT_BROKERPARAMETERSSIZE 5 /* Parameters shared by topic connections
-                                     * connected to the smae broker */
+                                     * connected to the same broker */
 
 static const struct {
     UA_QualifiedName name;
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 8c127e4bf25..b73b5f2a2a4 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -262,6 +262,13 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
             UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
                            "Cannot create the Interrupt Manager (only relevant if used)");
         }
+#ifdef UA_ENABLE_MQTT
+        /* Add the MQTT connection manager */
+        UA_ConnectionManager *mqttCM =
+            UA_ConnectionManager_new_MQTT(UA_STRING("mqtt connection manager"));
+        if(mqttCM)
+            conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)mqttCM);
+#endif
     }
     if(conf->eventLoop != NULL) {
         if(conf->eventLoop->state != UA_EVENTLOOPSTATE_STARTED) {

From 5af648908bd848602fe2a5d1f65afb67debe148a Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Tue, 23 May 2023 08:02:56 +0200
Subject: [PATCH 0934/1963] refactor(pubsub): Minor format changes

---
 src/pubsub/ua_pubsub_connection.c  |  7 +++----
 src/pubsub/ua_pubsub_manager.c     |  4 ++--
 src/pubsub/ua_pubsub_reader.c      | 14 ++++++++------
 src/pubsub/ua_pubsub_readergroup.c |  8 +++++---
 src/pubsub/ua_pubsub_writergroup.c |  1 +
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index 0395771fff9..fa9f4ae2b1a 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -71,9 +71,8 @@ UA_PubSubConnection_findConnectionbyId(UA_Server *server, UA_NodeId connectionId
 
 void
 UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig) {
-    if (connectionConfig->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
+    if(connectionConfig->publisherIdType == UA_PUBLISHERIDTYPE_STRING)
         UA_String_clear(&connectionConfig->publisherId.string);
-    }
     UA_String_clear(&connectionConfig->name);
     UA_String_clear(&connectionConfig->transportProfileUri);
     UA_Variant_clear(&connectionConfig->connectionTransportSettings);
@@ -99,8 +98,8 @@ assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnection
 
 UA_StatusCode
 UA_PubSubConnection_create(UA_Server *server,
-                          const UA_PubSubConnectionConfig *connectionConfig,
-                          UA_NodeId *connectionIdentifier) {
+                           const UA_PubSubConnectionConfig *connectionConfig,
+                           UA_NodeId *connectionIdentifier) {
     /* Validate preconditions */
     UA_CHECK_MEM(server, return UA_STATUSCODE_BADINTERNALERROR);
     UA_CHECK_MEM_ERROR(connectionConfig, return UA_STATUSCODE_BADINTERNALERROR,
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index a69cb306054..34d3429edb9 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -132,7 +132,7 @@ UA_ReserveId_isFree(UA_Server *server,  UA_UInt16 id,
                 LIST_FOREACH(currentWriter, &writerGroup->writers, listEntry) {
                     if(UA_String_equal(&tmpConnection->config.transportProfileUri,
                                        &transportProfileUri) &&
-                    currentWriter->config.dataSetWriterId == id)
+                       currentWriter->config.dataSetWriterId == id)
                         return false;
                 }
             }
@@ -469,7 +469,7 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
         UA_free(server->config.pubSubConfig.transportLayers);
         server->config.pubSubConfig.transportLayersSize = 0;
     }
-    /* delete subscribed datasets */
+    /* Delete subscribed datasets */
     UA_StandaloneSubscribedDataSet *tmpSDS1, *tmpSDS2;
     TAILQ_FOREACH_SAFE(tmpSDS1, &server->pubSubManager.subscribedDataSets, listEntry, tmpSDS2){
         removeStandaloneSubscribedDataSet(server, tmpSDS1->identifier);
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index a958ab0b0a9..79f0fc2399b 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1075,15 +1075,17 @@ processMessageWithReader(UA_Server *server, UA_ReaderGroup *readerGroup,
     UA_Byte totalDataSets = 1;
     if(msg->payloadHeaderEnabled)
         totalDataSets = msg->payloadHeader.dataSetPayloadHeader.count;
+
     for(UA_Byte i = 0; i < totalDataSets; i++) {
-        /* map dataset reader to dataset message since multiple dataset reader may read this network message
-           otherwise the dataset message may be written to the wrong dataset reader.  */
-        if (!msg->payloadHeaderEnabled ||
-            (reader->config.dataSetWriterId == msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i])) {
+        /* Map dataset reader to dataset message since multiple dataset reader
+         * may read this network message. Otherwise the dataset message may be
+         * written to the wrong dataset reader. */
+        if(!msg->payloadHeaderEnabled ||
+           (reader->config.dataSetWriterId == msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i])) {
             UA_LOG_DEBUG_READER(&server->config.logger, reader,
-                            "Process Msg with DataSetReader!");
+                                "Process Msg with DataSetReader!");
             UA_DataSetReader_process(server, readerGroup, reader,
-                                 &msg->payload.dataSetPayload.dataSetMessages[i]);
+                                     &msg->payload.dataSetPayload.dataSetMessages[i]);
         }
     }
 }
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 937669834d4..0489a81b815 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -217,11 +217,12 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
 
     if((!newGroup->config.enableBlockingSocket) && (!newGroup->config.timeout))
         newGroup->config.timeout = 1000; /* Set default to 1ms socket timeout
-                                            when non-blocking socket allows with
-                                            zero timeout */
+                                          * when non-blocking socket allows with
+                                          * zero timeout */
 
     newGroup->linkedConnection = connection;
 
+    /* Add to the connection */
     LIST_INSERT_HEAD(&connection->readerGroups, newGroup, listEntry);
     connection->readerGroupsSize++;
 
@@ -333,6 +334,7 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
     UA_NodeId_clear(&rg->identifier);
     UA_ReaderGroupConfig_clear(&rg->config);
     UA_free(rg);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -455,7 +457,7 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
        (rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE &&
         rg->configurationFrozen && !dataSetReader->bufferedMessage.nm))
         state = UA_PUBSUBSTATE_PREOPERATIONAL;
-                               
+
     UA_PubSubState oldstate = rg->state;
     rg->state = state; /* Set the new state now. So we can already switch from
                         * pre-operational to operational when the first messages
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 5dd1393c190..8eede5d4561 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -1179,6 +1179,7 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
     }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    /* Send the encrypted buffered message if PubSub encryption is enabled */
     if(writerGroup->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
         size_t sigSize = writerGroup->config.securityPolicy->symmetricModule.cryptoModule.
             signatureAlgorithm.getLocalSignatureSize(writerGroup->securityPolicyContext);

From d931ad551bb1b79fbba7eaf825b6438f0088adae Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Wed, 24 May 2023 22:32:19 +0200
Subject: [PATCH 0935/1963] fix(examples): exclude more pubsub examples when
 building shared library (#5664)

Otherwise the build fails with:

/usr/bin/ld: /tmp/ccXKXJTd.ltrans0.ltrans.o: in function `addPubSubConnection':
/open62541/examples/pubsub/pubsub_subscribe_standalone_dataset.c:111: undefined reference to `UA_PubSubConnection_regist'
/usr/bin/ld: /tmp/cctbZV5y.ltrans0.ltrans.o: in function `addPubSubConnection':
/open62541/examples/pubsub/tutorial_pubsub_subscribe_raw.c:64: undefined reference to `UA_PubSubConnection_regist'
---
 examples/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 6db08c59e69..3a2cc26a0b2 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -206,12 +206,10 @@ if(UA_ENABLE_PUBSUB)
     add_example(tutorial_pubsub_publish pubsub/tutorial_pubsub_publish.c)
     add_example(server_pubsub_publish_on_demand pubsub/server_pubsub_publisher_on_demand.c)
     add_example(tutorial_pubsub_publish_raw pubsub/tutorial_pubsub_publish_raw.c)
-    add_example(tutorial_pubsub_subscribe_raw pubsub/tutorial_pubsub_subscribe_raw.c)
     add_example(server_pubsub_publisher_iop pubsub/server_pubsub_publisher_iop.c)
     add_example(server_pubsub_publish_rt_level pubsub/server_pubsub_publisher_rt_level.c)
     add_example(server_pubsub_publish_rt_level_raw pubsub/server_pubsub_publisher_rt_level_raw.c)
     add_example(server_pubsub_rt_information_model pubsub/server_pubsub_rt_field_information_model.c)
-    add_example(pubsub_subscribe_standalone_dataset pubsub/pubsub_subscribe_standalone_dataset.c)
     if(CMAKE_SYSTEM MATCHES "Linux")
         if(UA_ENABLE_PUBSUB_ETH_UADP AND UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_IMMUTABLE_NODES)
             add_example(rt_publisher pubsub_realtime/pubsub_interrupt_publish.c)
@@ -224,6 +222,8 @@ if(UA_ENABLE_PUBSUB)
         message(WARNING "Build option BUILD_SHARED_LIBS not supported for standalone subscriber and realtime examples. Skipping these examples.")
     else (NOT BUILD_SHARED_LIBS)
         add_example(pubsub_subscribe_standalone pubsub/pubsub_subscribe_standalone.c)
+        add_example(tutorial_pubsub_subscribe_raw pubsub/tutorial_pubsub_subscribe_raw.c)
+        add_example(pubsub_subscribe_standalone_dataset pubsub/pubsub_subscribe_standalone_dataset.c)
         if(CMAKE_SYSTEM MATCHES "Linux")
             add_example(pubsub_TSN_publisher_multiple_thread pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c)
             add_example(pubsub_TSN_loopback_single_thread pubsub_realtime/pubsub_TSN_loopback_single_thread.c)

From 36623d7adf3cf1a3da0a3abff450145bbc818a54 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 25 May 2023 07:15:31 +0200
Subject: [PATCH 0936/1963] refactor(arch): Don't listen for events on UDP
 send-connections

---
 arch/eventloop_posix_udp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 7761a50c637..87e42e22fc8 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -532,8 +532,10 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
                             &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
         UA_LOCK(&el->elMutex);
 
-        /* Now we are interested in read-events. */
-        conn->rfd.listenEvents = UA_FDEVENT_IN;
+        /* Don't listen for any events (besides the connection closing) for
+         * send-connections. Blocking sending (where UA_FDEVENT_OUT is
+         * interesting) is handled in sendWithConnection. */
+        conn->rfd.listenEvents = 0;
         UA_EventLoopPOSIX_modifyFD(el, &conn->rfd);
         return;
     }

From 791f6e1f794ff942a1427733e1f60148150957bd Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 25 May 2023 09:27:21 +0200
Subject: [PATCH 0937/1963] fix(core): fix string length error with mqtt in
 UA_parseEndpointUrl

---
 plugins/mqtt/ua_mqtt-c_adapter.c | 35 ++++++++++------
 src/ua_util.c                    | 72 ++++++++++++++++++++------------
 2 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index 524a049a8de..2750b005a19 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -68,21 +68,32 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
     /* Get address and remove 'opc.mqtt://' from the address */
     UA_NetworkAddressUrlDataType address = channelData->address;
 
-    UA_String hostname, path;
+    UA_String hostname;
     UA_UInt16 networkPort;
-    if(UA_parseEndpointUrl(&address.url, &hostname, &networkPort, &path) != UA_STATUSCODE_GOOD){
+    if(UA_parseEndpointUrl(&address.url, &hostname, &networkPort, NULL) != UA_STATUSCODE_GOOD){
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "MQTT PubSub Connection creation failed. Invalid URL.");
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+    if (hostname.length == 0) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "MQTT PubSub Connection creation failed. Invalid URL.");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    /* Build the url and port*/
-    char rest[512];
-    memcpy(rest, path.data, path.length);
-    rest[path.length] = '\0';
-    char *rest2 = rest;
-    const char *addr = strtok_r(rest2, ":", &rest2);
-    const char *port = strtok_r(rest2, ":", &rest2);
+    /* Save hostname and networkPort as char arrays */
+    char addr[512];
+    char port[8];
+    if (hostname.length >= sizeof(addr)) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "MQTT PubSub Connection creation failed. Host address too long.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    memset(addr, 0, sizeof(addr));
+    memset(port, 0, sizeof(port));
+    sprintf(port, "%u", networkPort);
+    memcpy(addr, hostname.data, hostname.length);
+    addr[hostname.length] = '\0';
 
 #if defined(UA_ENABLE_MQTT_TLS_OPENSSL) || defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
 #if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
@@ -152,7 +163,7 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
 #endif
 #if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Extend condition when mbedTLS support is added
         /* open the non-blocking TCP socket (connecting to the broker) */
-        UA_StatusCode rv = open_nb_socket(&sockfd, &ctx, addr, port, mqttCaFilePath, NULL, mqttClientCertPath, mqttClientKeyPath);
+        UA_StatusCode rv = open_nb_socket(&sockfd, &ctx, &addr[0], &port[0], mqttCaFilePath, NULL, mqttClientCertPath, mqttClientKeyPath);
         if(rv != UA_STATUSCODE_GOOD){
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
             UA_free(mqttCaFilePath);
@@ -176,7 +187,7 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
 
 #elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
         /* open the non-blocking TCP socket (connecting to the broker) */
-        UA_StatusCode rv = open_nb_socket(&ctx,addr,port,mqttCaFilePath);
+        UA_StatusCode rv = open_nb_socket(&ctx, &addr[0], &port[0], mqttCaFilePath);
         if(rv != UA_STATUSCODE_GOOD){
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
             UA_free(mqttCaFilePath);
@@ -199,7 +210,7 @@ connectMqtt(UA_PubSubChannelDataMQTT* channelData){
 #else
     int sockfd = -1;
     /* open the non-blocking TCP socket (connecting to the broker) */
-    UA_StatusCode rv = open_nb_socket(&sockfd,addr, port);
+    UA_StatusCode rv = open_nb_socket(&sockfd, &addr[0], &port[0]);
     if(rv != UA_STATUSCODE_GOOD){
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
         return rv;
diff --git a/src/ua_util.c b/src/ua_util.c
index 394d250e259..8a1d544b689 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -46,29 +46,42 @@ UA_readNumber(const UA_Byte *buf, size_t buflen, UA_UInt32 *number) {
     return UA_readNumberWithBase(buf, buflen, number, 10);
 }
 
+struct urlSchema {
+    const char *schema;
+};
+
+static const struct urlSchema schemas[] = {
+    {"opc.tcp://"},
+    {"opc.udp://"},
+    {"opc.mqtt://"}
+};
+
+static const unsigned scNumSchemas = sizeof(schemas) / sizeof(schemas[0]);
+
 UA_StatusCode
 UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
                     UA_UInt16 *outPort, UA_String *outPath) {
-    UA_Boolean ipv6 = false;
-
     /* Url must begin with "opc.tcp://" or opc.udp:// (if pubsub enabled) */
     if(endpointUrl->length < 11) {
         return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
     }
-    if (strncmp((char*)endpointUrl->data, "opc.tcp://", 10) != 0) {
-#ifdef UA_ENABLE_PUBSUB
-        if (strncmp((char*)endpointUrl->data, "opc.udp://", 10) != 0 &&
-                strncmp((char*)endpointUrl->data, "opc.mqtt://", 11) != 0) {
-            return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
-        }
-#else
-        return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
-#endif
+
+    /* Which type of schema is this? */
+    unsigned schemaType = 0;
+    for(; schemaType < scNumSchemas; schemaType++) {
+        if(strncmp((char*)endpointUrl->data,
+                   schemas[schemaType].schema,
+                   strlen(schemas[schemaType].schema)) == 0)
+            break;
     }
+    if(schemaType == scNumSchemas)
+        return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
 
-    /* Where does the hostname end? */
-    size_t curr = 10;
-    if(endpointUrl->data[curr] == '[') {
+    /* Forward the current position until the first colon or slash */
+    size_t start = strlen(schemas[schemaType].schema);
+    size_t curr = start;
+    UA_Boolean ipv6 = false;
+    if(endpointUrl->length > curr && endpointUrl->data[curr] == '[') {
         /* IPv6: opc.tcp://[2001:0db8:85a3::8a2e:0370:7334]:1234/path */
         for(; curr < endpointUrl->length; ++curr) {
             if(endpointUrl->data[curr] == ']')
@@ -89,24 +102,27 @@ UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
     /* Set the hostname */
     if(ipv6) {
         /* Skip the ipv6 '[]' container for getaddrinfo() later */
-        outHostname->data = &endpointUrl->data[11];
-        outHostname->length = curr - 12;
+        outHostname->data = &endpointUrl->data[start+1];
+        outHostname->length = curr - (start+2);
     } else {
-        outHostname->data = &endpointUrl->data[10];
-        outHostname->length = curr - 10;
+        outHostname->data = &endpointUrl->data[start];
+        outHostname->length = curr - start;
     }
 
     /* Empty string? */
     if(outHostname->length == 0)
         outHostname->data = NULL;
 
+    /* Already at the end */
     if(curr == endpointUrl->length)
         return UA_STATUSCODE_GOOD;
 
-    /* Set the port */
+    /* Set the port - and for ETH set the VID.PCP postfix in the outpath string.
+     * We have to parse that externally. */
     if(endpointUrl->data[curr] == ':') {
         if(++curr == endpointUrl->length)
             return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
+
         u32 largeNum;
         size_t progress = UA_readNumber(&endpointUrl->data[curr],
                                         endpointUrl->length - curr, &largeNum);
@@ -126,16 +142,18 @@ UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
         return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
     if(++curr == endpointUrl->length)
         return UA_STATUSCODE_GOOD;
-    outPath->data = &endpointUrl->data[curr];
-    outPath->length = endpointUrl->length - curr;
+    if(outPath != NULL) {
+        outPath->data = &endpointUrl->data[curr];
+        outPath->length = endpointUrl->length - curr;
 
-    /* Remove trailing slash from the path */
-    if(endpointUrl->data[endpointUrl->length - 1] == '/')
-        outPath->length--;
+        /* Remove trailing slash from the path */
+        if(endpointUrl->data[endpointUrl->length - 1] == '/')
+            outPath->length--;
 
-    /* Empty string? */
-    if(outPath->length == 0)
-        outPath->data = NULL;
+        /* Empty string? */
+        if(outPath->length == 0)
+            outPath->data = NULL;
+    }
 
     return UA_STATUSCODE_GOOD;
 }

From 7d602cb1eb5bbf27ab7ad7ab85f5b617266110ca Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <estr@keba.com>
Date: Thu, 25 May 2023 09:29:27 +0200
Subject: [PATCH 0938/1963] feat(core): Allow parsing of opc.eth:// in
 UA_parseEndpointUrl

---
 src/ua_util.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/ua_util.c b/src/ua_util.c
index 8a1d544b689..ce2a20f2c3d 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -53,10 +53,12 @@ struct urlSchema {
 static const struct urlSchema schemas[] = {
     {"opc.tcp://"},
     {"opc.udp://"},
+    {"opc.eth://"},
     {"opc.mqtt://"}
 };
 
 static const unsigned scNumSchemas = sizeof(schemas) / sizeof(schemas[0]);
+static const unsigned scEthSchemaIdx = 2;
 
 UA_StatusCode
 UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
@@ -123,6 +125,15 @@ UA_parseEndpointUrl(const UA_String *endpointUrl, UA_String *outHostname,
         if(++curr == endpointUrl->length)
             return UA_STATUSCODE_BADTCPENDPOINTURLINVALID;
 
+        /* ETH schema */
+        if(schemaType == scEthSchemaIdx) {
+            if(outPath != NULL) {
+                outPath->data = &endpointUrl->data[curr];
+                outPath->length = endpointUrl->length - curr;
+            }
+            return UA_STATUSCODE_GOOD;
+        }
+
         u32 largeNum;
         size_t progress = UA_readNumber(&endpointUrl->data[curr],
                                         endpointUrl->length - curr, &largeNum);

From 3ca90d0a78a5dea9e9824eb72755dac94a639e6e Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 31 Jan 2022 10:45:34 +0100
Subject: [PATCH 0939/1963] feat(server): New mechanism for automatic
 nodeset/companion spec injection into the server during the server-init.

---
 .github/workflows/build_linux.yml             |   3 +
 CMakeLists.txt                                |  52 +++-
 examples/CMakeLists.txt                       |  25 +-
 examples/nodeset/CMakeLists.txt               |  15 +-
 examples/nodeset/server_nodeset_plcopen.c     |  32 ++-
 examples/nodeset/server_nodeset_powerlink.c   |  32 ++-
 examples/nodeset/server_testnodeset.c         |   4 +-
 include/open62541/config.h.in                 |   2 +
 src/server/ua_server.c                        |  11 +
 .../check_nodeset_loader_compare_di.c         |   6 +
 tools/ci.sh                                   |  19 ++
 tools/cmake/macros_public.cmake               | 147 ++++++++---
 tools/generate_bsd.py                         |  55 +++++
 tools/nodeset_compiler/backend_open62541.py   |  24 ++
 .../backend_open62541_typedefinitions.py      |   8 +-
 tools/nodeset_compiler/datatypes.py           |   4 +
 tools/nodeset_compiler/nodeset.py             |  12 +
 tools/nodeset_compiler/type_parser.py         |   9 +-
 tools/nodeset_injector/CMakeLists.txt         | 233 ++++++++++++++++++
 .../generate_nodesetinjector.py               |  66 +++++
 .../generate_nodesetinjector_content.py       | 146 +++++++++++
 21 files changed, 827 insertions(+), 78 deletions(-)
 create mode 100644 tools/generate_bsd.py
 create mode 100644 tools/nodeset_injector/CMakeLists.txt
 create mode 100644 tools/nodeset_injector/generate_nodesetinjector.py
 create mode 100644 tools/nodeset_injector/generate_nodesetinjector_content.py

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index a97dc4217ed..b8a13e1fe4b 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -106,6 +106,9 @@ jobs:
           - build_name: "Clang Static Analyzer"
             cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev mosquitto
             cmd_action: build_clang_analyzer
+          - build_name: "Build All Companion Specifications"
+            cmd_deps: ""
+            cmd_action: build_all_companion_specs
     name: ${{matrix.build_name}}
     runs-on: ubuntu-20.04
     steps:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d896eea374d..edbc323d864 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,6 +177,7 @@ option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" OFF)
 option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" ON)
 option(UA_ENABLE_XML_ENCODING "Enable XML encoding (EXPERIMENTAL)" OFF)
 option(UA_ENABLE_NODESETLOADER "Enable nodesetLoader public API" OFF)
+option(UA_ENABLE_NODESET_INJECTOR "Enable automatic nodeset injection" OFF)
 
 set(MULTITHREADING_DEFAULT 0)
 if(WIN32 OR UNIX)
@@ -1075,6 +1076,25 @@ if(UA_ENABLE_PARSING)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types_lex.c)
 endif()
 
+if(UA_ENABLE_NODESET_INJECTOR)
+    message(STATUS "Nodesetinjector enabled")
+    cmake_minimum_required(VERSION 3.20)
+
+    add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
+                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
+                       PRE_BUILD
+                       COMMAND ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_injector/generate_nodesetinjector.py
+                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector)
+    add_custom_target(open62541-generator-nodesetinjector DEPENDS
+                      ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
+                      ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
+                      )
+
+    set(UA_NODESETINJECTOR_GENERATORS "")
+    set(UA_NODESETINJECTOR_SOURCE_FILES "")
+    set(UA_NODESETINJECTOR_EXAMPLE_NAMES "")
+endif()
+
 # Always include encryption plugins into the amalgamation
 # Use guards in the files to ensure that UA_ENABLE_ENCRYPTON_MBEDTLS and UA_ENABLE_ENCRYPTION_OPENSSL are honored.
 
@@ -1398,12 +1418,10 @@ ua_generate_nodeid_header(
     FILE_CSV "${UA_FILE_NODEIDS}"
 )
 
-# we need a custom target to avoid that the generator is called concurrently and
-# thus overwriting files while the other thread is compiling
 add_custom_target(open62541-generator-statuscode DEPENDS
-        ${PROJECT_BINARY_DIR}/src_generated/open62541/nodeids.h
-        ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
-        ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c)
+                  ${PROJECT_BINARY_DIR}/src_generated/open62541/nodeids.h
+                  ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
+                  ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c)
 
 if(UA_ENABLE_AMALGAMATION)
     # single-file release
@@ -1507,6 +1525,10 @@ else()
                       open62541-generator-statuscode
                       open62541-generator-namespace
                       )
+    if(UA_ENABLE_NODESET_INJECTOR)
+        add_dependencies(open62541-code-generation open62541-generator-nodesetinjector)
+    endif()
+
     if(UA_ENABLE_COVERAGE)
         add_coverage(open62541-object)
     endif()
@@ -1887,3 +1909,23 @@ set_target_properties(open62541-generator-namespace PROPERTIES FOLDER "open62541
 set_target_properties(open62541-generator-statuscode PROPERTIES FOLDER "open62541/generators")
 set_target_properties(open62541-generator-transport PROPERTIES FOLDER "open62541/generators")
 set_target_properties(open62541-generator-types PROPERTIES FOLDER "open62541/generators")
+if(UA_ENABLE_NODESET_INJECTOR)
+    set_target_properties(open62541-generator-nodesetinjector PROPERTIES FOLDER "open62541/generators")
+endif()
+
+assign_source_group(${lib_sources})
+assign_source_group(${internal_headers})
+assign_source_group(${exported_headers})
+assign_source_group(${default_plugin_sources})
+assign_source_group(${ua_architecture_sources})
+
+if(UA_ENABLE_NODESET_INJECTOR)
+    # no dependencies
+#    set(UA_INFORMATION_MODEL_AUTOLOAD DI ISA95-JOBCONTROL OpenSCS DEXPI AMB)
+    # di as dependency
+#    set(UA_INFORMATION_MODEL_AUTOLOAD DI AutoID  POWERLINK IA Machinery PNEM PLCopen)
+    # more dependencies
+#    set(UA_INFORMATION_MODEL_AUTOLOAD DI Machinery IA MachineTool)
+
+    add_subdirectory(tools/nodeset_injector)
+endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 3a2cc26a0b2..c0d72b9d17c 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -51,11 +51,20 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/bin/exampl
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/bin/examples)
 
 macro(add_example EXAMPLE_NAME EXAMPLE_SOURCE)
-  add_executable(${EXAMPLE_NAME} ${STATIC_OBJECTS} ${EXAMPLE_SOURCE} ${ARGN} ${PROJECT_SOURCE_DIR}/common.h)
-  target_link_libraries(${EXAMPLE_NAME} open62541::open62541)
-  assign_source_group(${EXAMPLE_SOURCE})
-  set_target_properties(${EXAMPLE_NAME} PROPERTIES FOLDER "open62541/examples")
-  set_target_properties(${EXAMPLE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+    add_executable(${EXAMPLE_NAME} ${STATIC_OBJECTS} ${EXAMPLE_SOURCE} ${ARGN} ${PROJECT_SOURCE_DIR}/common.h)
+    target_link_libraries(${EXAMPLE_NAME} open62541::open62541)
+    assign_source_group(${EXAMPLE_SOURCE})
+    set_target_properties(${EXAMPLE_NAME} PROPERTIES FOLDER "open62541/examples")
+    set_target_properties(${EXAMPLE_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
+    if(UA_ENABLE_NODESET_INJECTOR)
+        set(UA_NODESETINJECTOR_EXAMPLE_NAMES ${EXAMPLE_NAME} ${UA_NODESETINJECTOR_EXAMPLE_NAMES})
+        # If the nodeset injector is activated, the target must be built twice.
+        # Otherwise, it may result in the nodesets not being inserted.
+        add_custom_command(TARGET ${EXAMPLE_NAME} POST_BUILD
+                           COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target ${EXAMPLE_NAME}
+                           )
+    endif()
 endmacro()
 
 #############
@@ -282,3 +291,9 @@ endif()
 if(UA_ENABLE_NODESETLOADER)
     add_subdirectory(nodeset_loader)
 endif()
+
+if(UA_ENABLE_NODESET_INJECTOR)
+    set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
+    set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+    set(UA_NODESETINJECTOR_EXAMPLE_NAMES ${UA_NODESETINJECTOR_EXAMPLE_NAMES} PARENT_SCOPE)
+endif()
diff --git a/examples/nodeset/CMakeLists.txt b/examples/nodeset/CMakeLists.txt
index 449179491a7..8a808a95c38 100644
--- a/examples/nodeset/CMakeLists.txt
+++ b/examples/nodeset/CMakeLists.txt
@@ -40,14 +40,15 @@ ua_generate_nodeid_header(
 
 add_example(server_nodeset server_nodeset.c
             ${UA_NODESET_EXAMPLE_SOURCES}
-            ${PROJECT_BINARY_DIR}/src_generated/open62541/example_nodeids.h)
+            ${PROJECT_BINARY_DIR}/src_generated/open62541/example_nodeids.h
+            )
+add_dependencies(server_nodeset open62541-generator-ns-example open62541-generator-ids_example)
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     ua_generate_nodeset_and_datatypes(
         NAME "testnodeset"
         FILE_CSV "${FILE_CSV_DIRPREFIX}/testnodeset.csv"
         FILE_BSD "${FILE_BSD_DIRPREFIX}/testtypes.bsd"
-        NAMESPACE_MAP "2:http://yourorganisation.org/test/"
         FILE_NS "${FILE_NS_DIRPREFIX}/testnodeset.xml"
         INTERNAL
     )
@@ -74,7 +75,7 @@ else()
     set(FILE_NS_DIRPREFIX ${UA_NODESET_DIR})
 endif()
 
-# PLCopen requires the full ns0 as basis
+## PLCopen requires the full ns0 as basis
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
 
     # Generate types and namespace for DI
@@ -82,7 +83,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         NAME "di"
         FILE_CSV "${FILE_CSV_DIRPREFIX}/DI/Opc.Ua.Di.NodeIds.csv"
         FILE_BSD "${FILE_BSD_PLCOPEN_DIRPREFIX}/DI/Opc.Ua.Di.Types.bsd"
-        NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         FILE_NS "${FILE_NS_DIRPREFIX}/DI/Opc.Ua.Di.NodeSet2.xml"
         INTERNAL
     )
@@ -110,7 +110,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         NAME "powerlink"
         FILE_CSV "${FILE_CSV_DIRPREFIX}/POWERLINK/Opc.Ua.POWERLINK.NodeIds.csv"
         FILE_BSD "${FILE_BSD_POWERLINK_DIRPREFIX}/Opc.Ua.POWERLINK.NodeSet2.bsd"
-        NAMESPACE_MAP "3:http://opcfoundation.org/UA/POWERLINK/"
         FILE_NS "${FILE_NS_DIRPREFIX}/POWERLINK/Opc.Ua.POWERLINK.NodeSet2.xml"
         # POWERLINK depends on the di nodeset, which must be generated before
         DEPENDS "di"
@@ -123,6 +122,10 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
                 ${UA_TYPES_DI_SOURCES}
                 ${UA_TYPES_POWERLINK_SOURCES})
     add_dependencies(server_nodeset_powerlink open62541-generator-ns-powerlink)
-    
+endif()
 
+if(UA_ENABLE_NODESET_INJECTOR)
+    set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
+    set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+    set(UA_NODESETINJECTOR_EXAMPLE_NAMES ${UA_NODESETINJECTOR_EXAMPLE_NAMES} PARENT_SCOPE)
 endif()
diff --git a/examples/nodeset/server_nodeset_plcopen.c b/examples/nodeset/server_nodeset_plcopen.c
index 1aa76bedac4..b3e6dc99876 100644
--- a/examples/nodeset/server_nodeset_plcopen.c
+++ b/examples/nodeset/server_nodeset_plcopen.c
@@ -29,18 +29,30 @@ int main(int argc, char** argv) {
     UA_Server *server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
     /* create nodes from nodeset */
-    UA_StatusCode retval = namespace_di_generated(server);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Adding the DI namespace failed. Please check previous error output.");
-        UA_Server_delete(server);
-        return EXIT_FAILURE;
+    size_t idx = LONG_MAX;
+    UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/DI/"), &idx);
+    if(idx == LONG_MAX) {
+        retval = namespace_di_generated(server);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "Adding the DI namespace failed. Please check previous error output.");
+            UA_Server_delete(server);
+            return EXIT_FAILURE;
+        }
     }
-    retval |= namespace_plc_generated(server);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Adding the PLCopen namespace failed. Please check previous error output.");
-        UA_Server_delete(server);
-        return EXIT_FAILURE;
+    idx = LONG_MAX;
+    UA_Server_getNamespaceByName(server, UA_STRING("http://PLCopen.org/OpcUa/IEC61131-3/"), &idx);
+    if(idx == LONG_MAX) {
+        retval = namespace_plc_generated(server);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "Adding the PLCopen namespace failed. Please check previous error output.");
+            UA_Server_delete(server);
+            return EXIT_FAILURE;
+        }
     }
 
     retval = UA_Server_run(server, &running);
diff --git a/examples/nodeset/server_nodeset_powerlink.c b/examples/nodeset/server_nodeset_powerlink.c
index ae1de7b639e..68ee3c5fae5 100644
--- a/examples/nodeset/server_nodeset_powerlink.c
+++ b/examples/nodeset/server_nodeset_powerlink.c
@@ -29,18 +29,30 @@ int main(int argc, char** argv) {
     UA_Server *server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
     /* create nodes from nodeset */
-    UA_StatusCode retval = namespace_di_generated(server);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Adding the DI namespace failed. Please check previous error output.");
-        UA_Server_delete(server);
-        return EXIT_FAILURE;
+    size_t idx = LONG_MAX;
+    UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/DI/"), &idx);
+    if(idx == LONG_MAX) {
+        retval = namespace_di_generated(server);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "Adding the DI namespace failed. Please check previous error output.");
+            UA_Server_delete(server);
+            return EXIT_FAILURE;
+        }
     }
-    retval |= namespace_powerlink_generated(server);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Adding the Powerlink namespace failed. Please check previous error output.");
-        UA_Server_delete(server);
-        return EXIT_FAILURE;
+    idx = LONG_MAX;
+    UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/POWERLINK/"), &idx);
+    if(idx == LONG_MAX) {
+        retval = namespace_powerlink_generated(server);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                         "Adding the Powerlink namespace failed. Please check previous error output.");
+            UA_Server_delete(server);
+            return EXIT_FAILURE;
+        }
     }
 
     retval = UA_Server_run(server, &running);
diff --git a/examples/nodeset/server_testnodeset.c b/examples/nodeset/server_testnodeset.c
index 39e79ad2b57..a096efe8be7 100644
--- a/examples/nodeset/server_testnodeset.c
+++ b/examples/nodeset/server_testnodeset.c
@@ -44,7 +44,9 @@ int main(int argc, char **argv)
     } else {
         UA_Variant out;
         UA_Variant_init(&out);
-        UA_Server_readValue(server, UA_NODEID_NUMERIC(2, 10002), &out);
+        // this will just get the namespace index, since it is already added to the server
+        UA_UInt16 nsIdx = UA_Server_addNamespace(server, "http://yourorganisation.org/test/");
+        UA_Server_readValue(server, UA_NODEID_NUMERIC(nsIdx, 10002), &out);
         UA_Point *p = (UA_Point *)out.data;
         printf("point 2d x: %f y: %f \n", p->x, p->y);
         retval = UA_Server_run(server, &running);
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index c5ca69db0e1..cd754ad730f 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -46,6 +46,8 @@
 #cmakedefine UA_ENABLE_MQTT_TLS
 #cmakedefine UA_ENABLE_MQTT_TLS_OPENSSL
 #cmakedefine UA_ENABLE_MQTT_TLS_MBEDTLS
+#cmakedefine UA_ENABLE_NODESET_INJECTOR
+#cmakedefine UA_INFORMATION_MODEL_AUTOLOAD
 #cmakedefine UA_ENABLE_ENCRYPTION_MBEDTLS
 #cmakedefine UA_ENABLE_CERT_REJECTED_DIR
 #cmakedefine UA_ENABLE_TPM2_SECURITY
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 2da13f8c196..341d46c9de7 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -29,6 +29,10 @@
 #include "ua_subscription.h"
 #endif
 
+#ifdef UA_ENABLE_NODESET_INJECTOR
+#include "open62541/nodesetinjector.h"
+#endif
+
 #ifdef UA_ENABLE_VALGRIND_INTERACTIVE
 #include <valgrind/memcheck.h>
 #endif
@@ -405,6 +409,13 @@ UA_Server_init(UA_Server *server) {
     res = initNS0(server);
     UA_CHECK_STATUS(res, goto cleanup);
 
+#ifdef UA_ENABLE_NODESET_INJECTOR
+    UA_UNLOCK(&server->serviceMutex);
+    res = UA_Server_injectNodesets(server);
+    UA_LOCK(&server->serviceMutex);
+    UA_CHECK_STATUS(res, goto cleanup);
+#endif
+
 #ifdef UA_ENABLE_PUBSUB
     /* Initialized PubSubManager */
     UA_PubSubManager_init(server, &server->pubSubManager);
diff --git a/tests/nodeset-loader/check_nodeset_loader_compare_di.c b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
index 3e90e8051d4..6cb558bb259 100644
--- a/tests/nodeset-loader/check_nodeset_loader_compare_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
@@ -33,7 +33,13 @@ START_TEST(Server_compareDiNodeset) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
     ck_assert(config->customDataTypes);
 
+    UA_UInt16 nsIndex = UA_Server_addNamespace(server, "http://opcfoundation.org/UA/DI/");
+    printf("%d\n", nsIndex);
+
     for(int i = 0; i < UA_TYPES_NODESETLOADER_DI_COUNT; ++i) {
+        UA_TYPES_NODESETLOADER_DI[i].typeId.namespaceIndex = nsIndex;
+        UA_TYPES_NODESETLOADER_DI[i].binaryEncodingId.namespaceIndex = nsIndex;
+
         const UA_DataType *compiledType = &UA_TYPES_NODESETLOADER_DI[i];
         const UA_DataType *loadedType = UA_Server_findDataType(server, &compiledType->typeId);
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 7901499f6ed..8de8108938d 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -459,3 +459,22 @@ function build_clang_analyzer {
           ..
     scan-build-11 --status-bugs make ${MAKEOPTS}
 }
+
+###################################################
+# Compile alle ua-schema companion specifications #
+###################################################
+
+function build_all_companion_specs {
+    mkdir -p build; cd build; rm -rf *
+    cmake -DCMAKE_BUILD_TYPE=Debug \
+          -DUA_BUILD_EXAMPLES=ON \
+          -DUA_ENABLE_NODESET_INJECTOR=ON \
+          -DUA_INFORMATION_MODEL_AUTOLOAD=DI\;ISA95-JOBCONTROL\;OpenSCS\; \
+          DEXPI\;AMB\;AutoID\;POWERLINK\;IA\;Machinery\; \
+          PackML\;PNEM\;PLCopen\;MachineTool\;PROFINET\; \
+          MachineVision\;FDT\;CommercialKitchenEquipment\; \
+          PNRIO\;Scales\;Weihenstephan\;Pumps\;CAS\;TMC \
+          -DUA_NAMESPACE_ZERO=FULL \
+          ..
+    make ${MAKEOPTS}
+}
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index 438a4ab8a7a..29539ed01e5 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -7,10 +7,11 @@
 # The resulting files will be put into OUTPUT_DIR with the names:
 # - NAME.h
 #
-#
 # The following arguments are accepted:
 #   Options:
 #
+#   [AUTOLOAD]      Optional argument. If given, the nodeset is automatically attached to the server.
+#
 #   Arguments taking one value:
 #
 #   NAME            Full name of the generated files, e.g. di_nodeids
@@ -21,7 +22,7 @@
 #   FILE_CSV        Path to the .csv file containing the node ids, e.g. 'OpcUaDiModel.csv'
 #
 function(ua_generate_nodeid_header)
-    set(options )
+    set(options AUTOLOAD)
     set(oneValueArgs NAME ID_PREFIX OUTPUT_DIR FILE_CSV TARGET_SUFFIX TARGET_PREFIX)
     set(multiValueArgs )
     cmake_parse_arguments(UA_GEN_ID "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -42,9 +43,19 @@ function(ua_generate_nodeid_header)
     # Replace dash with underscore to make valid c literal
     string(REPLACE "-" "_" UA_GEN_ID_NAME ${UA_GEN_ID_NAME})
 
-    add_custom_target(${UA_GEN_ID_TARGET_PREFIX}-${UA_GEN_ID_TARGET_SUFFIX} DEPENDS
-        ${UA_GEN_ID_OUTPUT_DIR}/${UA_GEN_ID_NAME}.h
-    )
+    if(NOT TARGET ${UA_GEN_ID_TARGET_PREFIX}-${UA_GEN_ID_TARGET_SUFFIX})
+        add_custom_target(${UA_GEN_ID_TARGET_PREFIX}-${UA_GEN_ID_TARGET_SUFFIX} DEPENDS
+            ${UA_GEN_ID_OUTPUT_DIR}/${UA_GEN_ID_NAME}.h
+        )
+    endif()
+
+    if(UA_GEN_ID_AUTOLOAD AND UA_ENABLE_NODESET_INJECTOR)
+        #TODO: Check if it is a problem that the generator and the source file may be included in the list more than once.
+        list(APPEND UA_NODESETINJECTOR_GENERATORS ${UA_GEN_ID_TARGET_PREFIX}-${UA_GEN_ID_TARGET_SUFFIX})
+        set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
+        #list(APPEND UA_NODESETINJECTOR_SOURCE_FILES  ${UA_GEN_ID_OUTPUT_DIR}/${UA_GEN_ID_NAME}.h)
+        #set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+    endif()
 
     # Make sure that the output directory exists
     if(NOT EXISTS ${UA_GEN_ID_OUTPUT_DIR})
@@ -81,6 +92,7 @@ endfunction()
 #
 #   [BUILTIN]       Optional argument. If given, then builtin types will be generated.
 #   [INTERNAL]      Optional argument. If given, then the given types file is seen as internal file (e.g. does not require a .csv)
+#   [AUTOLOAD]      Optional argument. If given, the nodeset is automatically attached to the server.
 #
 #   Arguments taking one value:
 #
@@ -107,7 +119,7 @@ endfunction()
 #
 #
 function(ua_generate_datatypes)
-    set(options BUILTIN INTERNAL)
+    set(options BUILTIN INTERNAL AUTOLOAD)
     set(oneValueArgs NAME TARGET_SUFFIX TARGET_PREFIX OUTPUT_DIR FILE_CSV)
     set(multiValueArgs FILES_BSD IMPORT_BSD FILES_SELECTED NAMESPACE_MAP)
     cmake_parse_arguments(UA_GEN_DT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -206,11 +218,21 @@ function(ua_generate_datatypes)
         ${UA_GEN_DT_FILES_BSD}
         ${UA_GEN_DT_FILE_CSV}
         ${UA_GEN_DT_FILES_SELECTED})
-    add_custom_target(${UA_GEN_DT_TARGET_PREFIX}-${UA_GEN_DT_TARGET_SUFFIX} DEPENDS
-        ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.c
-        ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.h
-        ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated_handling.h
-        )
+    if(NOT TARGET ${UA_GEN_DT_TARGET_PREFIX}-${UA_GEN_DT_TARGET_SUFFIX})
+        add_custom_target(${UA_GEN_DT_TARGET_PREFIX}-${UA_GEN_DT_TARGET_SUFFIX} DEPENDS
+                          ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.c
+                          ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.h
+                          ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated_handling.h
+                          )
+    endif()
+
+    if(UA_GEN_DT_AUTOLOAD AND UA_ENABLE_NODESET_INJECTOR)
+        #TODO: Check if it is a problem that the generator and the source file may be included in the list more than once.
+        list(APPEND UA_NODESETINJECTOR_GENERATORS ${UA_GEN_DT_TARGET_PREFIX}-${UA_GEN_DT_TARGET_SUFFIX})
+        set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
+        list(APPEND UA_NODESETINJECTOR_SOURCE_FILES  ${PROJECT_BINARY_DIR}/src_generated/open62541/${UA_GEN_DT_NAME}_generated.c)
+        set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+    endif()
 
     string(TOUPPER "${UA_GEN_DT_NAME}" GEN_NAME_UPPER)
     set(UA_${GEN_NAME_UPPER}_SOURCES "${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.c" CACHE INTERNAL "${UA_GEN_DT_NAME} source files")
@@ -235,6 +257,7 @@ endfunction()
 #   Options:
 #
 #   [INTERNAL]      Optional argument. If given, then the generated node set code will use internal headers.
+#   [AUTOLOAD]      Optional argument. If given, the nodeset is automatically attached to the server.
 #
 #   Arguments taking one value:
 #
@@ -258,12 +281,11 @@ endfunction()
 #
 function(ua_generate_nodeset)
 
-    set(options INTERNAL )
+    set(options INTERNAL AUTOLOAD)
     set(oneValueArgs NAME TYPES_ARRAY OUTPUT_DIR IGNORE TARGET_PREFIX BLACKLIST FILES_BSD)
     set(multiValueArgs FILE DEPENDS_TYPES DEPENDS_NS DEPENDS_TARGET)
     cmake_parse_arguments(UA_GEN_NS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
-
     if(NOT DEFINED open62541_TOOLS_DIR)
         message(FATAL_ERROR "open62541_TOOLS_DIR must point to the open62541 tools directory")
     endif()
@@ -383,10 +405,50 @@ function(ua_generate_nodeset)
                        ${GEN_BSD_DEPENDS}
                        )
 
-    add_custom_target(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}
-                      DEPENDS
-                      ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c
-                      ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h)
+    if(NOT TARGET ${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX})
+        add_custom_target(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}
+                          DEPENDS
+                          ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c
+                          ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h
+                          )
+    endif()
+
+    if(UA_GEN_NS_AUTOLOAD)
+        if(NOT UA_ENABLE_NODESET_INJECTOR)
+            message(WARNING "The AUTOLOAD flag is set. However, the Nodesetinjector feature isn't enabled.")
+        else()
+            if(NOT TARGET ${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection)
+                add_dependencies(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX} open62541-generator-nodesetinjector)
+                add_custom_target(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection
+                                  COMMAND ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_injector/generate_nodesetinjector_content.py
+                                  ${CMAKE_BINARY_DIR}/src_generated/open62541/nodesetinjector
+                                  "namespace${FILE_SUFFIX}"
+                                  DEPENDS
+                                  ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c
+                                  ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h
+                                  )
+                set_source_files_properties(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection PROPERTIES SYMBOLIC "true")
+                add_dependencies(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX} ${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection)
+
+                # The dependency ensures that the generated code is in the correct order in the nodeset injector and
+                # that the required namespaces are loaded first. Otherwise it can happen that e.g. machinery is loaded before di,
+                # which does not work because machinery is based on di.
+                foreach(DEPEND ${UA_GEN_NS_DEPENDS_TARGET})
+                    string(FIND ${DEPEND} "open62541-generator-ns" POS)
+                    if(POS GREATER_EQUAL 0)
+                        add_dependencies(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection ${DEPEND}-autoinjection)
+                    endif()
+                endforeach()
+
+                list(APPEND UA_NODESETINJECTOR_GENERATORS ${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX})
+                set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
+
+                list(APPEND UA_NODESETINJECTOR_SOURCE_FILES  ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c)
+                set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+            endif()
+        endif()
+    endif()
+
     if (UA_GEN_NS_DEPENDS_TARGET)
         add_dependencies(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX} ${UA_GEN_NS_DEPENDS_TARGET})
     endif()
@@ -397,6 +459,10 @@ function(ua_generate_nodeset)
     set_property(GLOBAL PROPERTY "UA_GEN_NS_DEPENDS_FILE_${UA_GEN_NS_NAME}" ${UA_GEN_NS_DEPENDS_NS} ${UA_GEN_NS_FILE})
     set_property(GLOBAL PROPERTY "UA_GEN_NS_DEPENDS_TYPES_${UA_GEN_NS_NAME}" ${UA_GEN_NS_DEPENDS_TYPES} ${UA_GEN_NS_TYPES_ARRAY})
 
+    set_property(GLOBAL PROPERTY UA_NODESET_${GEN_NAME_UPPER}_SOURCES ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c)
+    set_property(GLOBAL PROPERTY UA_NODESET_${GEN_NAME_UPPER}_HEADERS ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h)
+    set_property(GLOBAL PROPERTY UA_NODESET_${GEN_NAME_UPPER}_TARGET ${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX})
+
     set(UA_NODESET_${GEN_NAME_UPPER}_SOURCES "${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c" CACHE INTERNAL "UA_NODESET_${GEN_NAME_UPPER} source files")
     set(UA_NODESET_${GEN_NAME_UPPER}_HEADERS "${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h" CACHE INTERNAL "UA_NODESET_${GEN_NAME_UPPER} header files")
     set(UA_NODESET_${GEN_NAME_UPPER}_TARGET "${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}" CACHE INTERNAL "UA_NODESET_${GEN_NAME_UPPER} target")
@@ -428,6 +494,7 @@ endfunction()
 #   Options:
 #
 #   INTERNAL        Include internal headers. Required if custom datatypes are added.
+#   [AUTOLOAD]      Optional argument. If given, the nodeset is automatically attached to the server.
 #
 #   Arguments taking one value:
 #
@@ -456,7 +523,7 @@ endfunction()
 #
 function(ua_generate_nodeset_and_datatypes)
 
-    set(options INTERNAL)
+    set(options INTERNAL AUTOLOAD)
     set(oneValueArgs NAME FILE_NS FILE_CSV FILE_BSD OUTPUT_DIR TARGET_PREFIX BLACKLIST)
     set(multiValueArgs DEPENDS IMPORT_BSD NAMESPACE_MAP)
     cmake_parse_arguments(UA_GEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -485,17 +552,17 @@ function(ua_generate_nodeset_and_datatypes)
         message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires FILE_CSV argument if any of FILE_BSD or NAMESPACE_MAP are set")
     endif()
 
-    if((NOT UA_GEN_FILE_BSD OR "${UA_GEN_FILE_BSD}" STREQUAL "") AND
-    (NOT "${UA_GEN_FILE_CSV}" STREQUAL "" OR
-        NOT "${UA_GEN_NAMESPACE_MAP}" STREQUAL ""))
-        message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires FILE_BSD argument if any of FILE_CSV or NAMESPACE_MAP are set")
-    endif()
+#    if((NOT UA_GEN_FILE_BSD OR "${UA_GEN_FILE_BSD}" STREQUAL "") AND
+#    (NOT "${UA_GEN_FILE_CSV}" STREQUAL "" OR
+#        NOT "${UA_GEN_NAMESPACE_MAP}" STREQUAL ""))
+#        message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires FILE_BSD argument if any of FILE_CSV or NAMESPACE_MAP are set")
+#    endif()
 
-    if(NOT UA_GEN_NAMESPACE_MAP OR "${UA_GEN_NAMESPACE_MAP}" STREQUAL "" AND
-    (NOT "${UA_GEN_FILE_CSV}" STREQUAL "" OR
-        NOT "${UA_GEN_FILE_BSD}" STREQUAL ""))
-        message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires NAMESPACE_MAP argument if any of FILE_CSV or FILE_BSD are set")
-    endif()
+#    if(NOT UA_GEN_NAMESPACE_MAP OR "${UA_GEN_NAMESPACE_MAP}" STREQUAL "" AND
+#    (NOT "${UA_GEN_FILE_CSV}" STREQUAL "" OR
+#        NOT "${UA_GEN_FILE_BSD}" STREQUAL ""))
+#        message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires NAMESPACE_MAP argument if any of FILE_CSV or FILE_BSD are set")
+#    endif()
 
     # Set default value for output dir
     if(NOT UA_GEN_OUTPUT_DIR OR "${UA_GEN_OUTPUT_DIR}" STREQUAL "")
@@ -509,6 +576,23 @@ function(ua_generate_nodeset_and_datatypes)
     set(NODESET_DEPENDS_TARGET "")
     set(NODESET_TYPES_ARRAY "UA_TYPES")
 
+    set(NODESET_AUTOLOAD "")
+    if (${UA_GEN_AUTOLOAD})
+        set(NODESET_AUTOLOAD "AUTOLOAD")
+    endif()
+
+    # Extracts the bsd from the xml file and creates a file in the build directory if the bsd file is not specified.
+    if("${UA_GEN_FILE_BSD}" STREQUAL "" AND NOT "${UA_GEN_FILE_CSV}" STREQUAL "")
+        string(TOUPPER "${UA_GEN_NAME}" BSD_NAME)
+        file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/bsd_files_gen")
+        execute_process(COMMAND ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_bsd.py
+                        --xml ${UA_GEN_FILE_NS}
+                        ${PROJECT_BINARY_DIR}/bsd_files_gen/Opc.Ua.${BSD_NAME}.Types.bsd)
+        if(EXISTS "${PROJECT_BINARY_DIR}/bsd_files_gen/Opc.Ua.${BSD_NAME}.Types.bsd")
+            set(UA_GEN_FILE_BSD "${PROJECT_BINARY_DIR}/bsd_files_gen/Opc.Ua.${BSD_NAME}.Types.bsd")
+        endif()
+    endif()
+
     if(NOT "${UA_GEN_FILE_BSD}" STREQUAL "")
         set(NAMESPACE_MAP_DEPENDS "${UA_GEN_NAMESPACE_MAP}")
 
@@ -522,7 +606,7 @@ function(ua_generate_nodeset_and_datatypes)
                 get_property(DEPENDS_NAMESPACE_MAP GLOBAL PROPERTY "UA_GEN_DT_DEPENDS_NAMESPACE_MAP_${DEPENDS_NAME}")
 
                 if(NOT DEPENDS_NAMESPACE_MAP OR "${DEPENDS_NAMESPACE_MAP}" STREQUAL "")
-                    message(FATAL_ERROR "Nodeset dependency ${f} needs to be generated before ${UA_GEN_NAME}")
+                    #message(FATAL_ERROR "Nodeset dependency ${f} needs to be generated before ${UA_GEN_NAME}")
                 endif()
 
                 set(NAMESPACE_MAP_DEPENDS ${NAMESPACE_MAP_DEPENDS} "${DEPENDS_NAMESPACE_MAP}")
@@ -539,6 +623,7 @@ function(ua_generate_nodeset_and_datatypes)
             NAMESPACE_MAP "${NAMESPACE_MAP_DEPENDS}"
             FILE_CSV "${UA_GEN_FILE_CSV}"
             FILES_BSD "${UA_GEN_FILE_BSD}"
+            ${NODESET_AUTOLOAD}
             IMPORT_BSD "${UA_GEN_IMPORT_BSD}"
             OUTPUT_DIR "${UA_GEN_OUTPUT_DIR}"
         )
@@ -552,6 +637,7 @@ function(ua_generate_nodeset_and_datatypes)
             OUTPUT_DIR "${UA_GEN_OUTPUT_DIR}"
             TARGET_PREFIX "${UA_GEN_TARGET_PREFIX}"
             TARGET_SUFFIX "ids-${UA_GEN_NAME}"
+            ${NODESET_AUTOLOAD}
         )
         set(NODESET_DEPENDS_TARGET ${NODESET_DEPENDS_TARGET} "${UA_GEN_TARGET_PREFIX}-ids-${UA_GEN_NAME}")
     else() # Handle nodesets without types in the dependency chain
@@ -613,6 +699,7 @@ function(ua_generate_nodeset_and_datatypes)
         BLACKLIST "${UA_GEN_BLACKLIST}"
         FILES_BSD "${UA_GEN_FILE_BSD}"
         ${NODESET_INTERNAL}
+        ${NODESET_AUTOLOAD}
         DEPENDS_TYPES ${TYPES_DEPENDS}
         DEPENDS_NS ${NODESET_DEPENDS}
         DEPENDS_TARGET ${NODESET_DEPENDS_TARGET}
@@ -620,4 +707,6 @@ function(ua_generate_nodeset_and_datatypes)
         TARGET_PREFIX "${UA_GEN_TARGET_PREFIX}"
     )
 
+    set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
+    set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
 endfunction()
diff --git a/tools/generate_bsd.py b/tools/generate_bsd.py
new file mode 100644
index 00000000000..1a2d315a912
--- /dev/null
+++ b/tools/generate_bsd.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from __future__ import print_function
+
+import sys
+import xml.dom.minidom as dom
+import codecs
+import re
+import base64
+import argparse
+
+###############################
+# Parse the Command Line Input#
+###############################
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-x', '--xml',
+                    metavar="<nodeSetXML>",
+                    dest="xmlfile",
+                    help='NodeSet XML file with nodes that shall be generated.')
+
+parser.add_argument('outputFile',
+                    metavar='<outputFile>',
+                    help='output file w/o extension')
+
+args = parser.parse_args()
+
+# Extract the BSD Blob from the XML file.
+nodeset_base = open(args.xmlfile, "rb")
+fileContent = nodeset_base.read()
+# Remove BOM since the dom parser cannot handle it on python 3 windows
+if fileContent.startswith(codecs.BOM_UTF8):
+    fileContent = fileContent.lstrip(codecs.BOM_UTF8)
+if (sys.version_info >= (3, 0)):
+    fileContent = fileContent.decode("utf-8")
+
+# Remove the uax namespace from tags. UaModeler adds this namespace to some elements
+fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\g<1>\g<2>\g<3>>", fileContent)
+
+nodesets = dom.parseString(fileContent).getElementsByTagName("UANodeSet")
+if len(nodesets) == 0 or len(nodesets) > 1:
+    raise Exception("contains no or more then 1 nodeset")
+nodeset = nodesets[0]
+variableNodes = nodeset.getElementsByTagName("UAVariable")
+for nd in variableNodes:
+    if (nd.hasAttribute("SymbolicName") and (re.match(r".*_BinarySchema", nd.attributes["SymbolicName"].nodeValue) or nd.attributes["SymbolicName"].nodeValue == "TypeDictionary_BinarySchema")) or (nd.hasAttribute("ParentNodeId") and not nd.hasAttribute("SymbolicName") and re.fullmatch(r"i=93", nd.attributes["ParentNodeId"].nodeValue)):
+        type_content = nd.getElementsByTagName("Value")[0].getElementsByTagName("ByteString")[0]
+        f = open(args.outputFile, 'w')
+        f.write(base64.b64decode(type_content.firstChild.nodeValue).decode("utf-8"))
+        f.flush()
+        f.close()
diff --git a/tools/nodeset_compiler/backend_open62541.py b/tools/nodeset_compiler/backend_open62541.py
index 60a6fb65708..588d1eb0e38 100644
--- a/tools/nodeset_compiler/backend_open62541.py
+++ b/tools/nodeset_compiler/backend_open62541.py
@@ -12,6 +12,8 @@
 
 
 from __future__ import print_function
+
+import re
 from os.path import basename
 import logging
 import codecs
@@ -306,6 +308,28 @@ def writec(line):
         nsid = nsid.replace("\"", "\\\"")
         writec("ns[" + str(i) + "] = UA_Server_addNamespace(server, \"" + nsid + "\");")
 
+    # Change namespaceIndex from the current namespace,
+    # but only if it defines its own data types, otherwise it is not necessary.
+    # The current namespace is the last item in the list of namespaces.
+    currentNs = nodeset.namespaces[-1]
+    split = currentNs.strip('/').split('/')
+    ns = split[-1]
+    # Check whether ns contains a number. If it is, check if the value starts with an uppercase letter.
+    # If not, it is not the correct value. Grab the next one and repeat the check.
+    # eg. http://opcfoundation.org/UA/TMC/v2/, http://opcfoundation.org/UA/I4AAS/
+    idx = 2
+    while re.search(r'\d', ns) and ns[0].islower():
+        ns = split[idx*-1]
+        idx += 1
+    if len(typesArray) > 0:
+        typeArr = typesArray[-1]
+        if typeArr == "UA_TYPES_"+ns.upper():
+            writec("/* Change namespaceIndex from current namespace */")
+            writec("for(int i = 0; i < " + typeArr + "_COUNT" + "; i++) {")
+            writec(typeArr + "[i]" + ".typeId.namespaceIndex = ns[" + str(nodeset.namespaceMapping[1]) + "];")
+            writec(typeArr + "[i]" + ".binaryEncodingId.namespaceIndex = ns[" + str(nodeset.namespaceMapping[1]) + "];")
+            writec("}")
+
     # Add generated types to the server
     writec("\n/* Load custom datatype definitions into the server */")
     for arr in typesArray:
diff --git a/tools/nodeset_compiler/backend_open62541_typedefinitions.py b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
index 5151ab4b4c9..52577711cca 100644
--- a/tools/nodeset_compiler/backend_open62541_typedefinitions.py
+++ b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
@@ -129,8 +129,8 @@ def get_type_overlayable(self, datatype):
         raise RuntimeError("Unknown datatype")
 
     def print_datatype(self, datatype, namespaceMap):
-        typeid = "{%s, %s}" % (namespaceMap[datatype.namespaceUri], getNodeidTypeAndId(datatype.nodeId))
-        binaryEncodingId = "{%s, %s}" % (namespaceMap[datatype.namespaceUri],
+        typeid = "{%s, %s}" % ("0", getNodeidTypeAndId(datatype.nodeId))
+        binaryEncodingId = "{%s, %s}" % ("0",
                                          getNodeidTypeAndId(datatype.binaryEncodingId))
         idName = makeCIdentifier(datatype.name)
         pointerfree = "true" if datatype.pointerfree else "false"
@@ -423,7 +423,7 @@ def print_header(self):
         if totalCount > 0:
 
             self.printh(
-                "extern UA_EXPORT const UA_DataType UA_" + self.parser.outname.upper() + "[UA_" + self.parser.outname.upper() + "_COUNT];")
+                "extern UA_EXPORT UA_DataType UA_" + self.parser.outname.upper() + "[UA_" + self.parser.outname.upper() + "_COUNT];")
 
             for ns in self.filtered_types:
                 for i, t_name in enumerate(self.filtered_types[ns]):
@@ -499,7 +499,7 @@ def print_description_array(self):
 
         if totalCount > 0:
             self.printc(
-                "const UA_DataType UA_%s[UA_%s_COUNT] = {" % (self.parser.outname.upper(), self.parser.outname.upper()))
+                "UA_DataType UA_%s[UA_%s_COUNT] = {" % (self.parser.outname.upper(), self.parser.outname.upper()))
 
             for ns in self.filtered_types:
                 for i, t_name in enumerate(self.filtered_types[ns]):
diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index d0b7c05547f..01346c7bc99 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -509,8 +509,12 @@ def parseXML(self, xmlvalue):
 
     @staticmethod
     def __strIsInt(strValue):
+        # 0_0 is not a valid number, but does not throw an error when converted to an integer.
+        # Therefore, this case must be checked separately.
         try:
             int(strValue)
+            if strValue[0:2] == '0_':
+                return False
             return True
         except:
             return False
diff --git a/tools/nodeset_compiler/nodeset.py b/tools/nodeset_compiler/nodeset.py
index fc1264d46f1..14e6f84bbe0 100644
--- a/tools/nodeset_compiler/nodeset.py
+++ b/tools/nodeset_compiler/nodeset.py
@@ -277,6 +277,18 @@ def addNodeSet(self, xmlfile, hidden=False, typesArray="UA_TYPES"):
         if modelUri is None:
             raise Exception(self, self.originXML + " does not define the nodeset URI in Models/Model/ModelUri or NamespaceUris array.")
 
+        split = modelUri.strip('/').split('/')
+        modelName = split[-1]
+        # Check whether modelName contains a number. If it is, check if the value starts with an uppercase letter.
+        # If not, it is not the correct value. Grab the next one and repeat the check.
+        # eg. http://opcfoundation.org/UA/TMC/v2/, http://opcfoundation.org/UA/I4AAS/
+        idx = 2
+        while re.search(r'\d', modelName) and modelName[0].islower():
+            modelName = split[idx*-1]
+            idx += 1
+        if modelName != "UA":
+            typesArray = "UA_TYPES_" + modelName.upper()
+
         for ns in orig_namespaces:
             self.addNamespace(ns)
         self.createNamespaceMapping(orig_namespaces) # mapping for this file
diff --git a/tools/nodeset_compiler/type_parser.py b/tools/nodeset_compiler/type_parser.py
index ebe24b746da..2cfad6f435c 100644
--- a/tools/nodeset_compiler/type_parser.py
+++ b/tools/nodeset_compiler/type_parser.py
@@ -307,14 +307,7 @@ def structWithBitFields(element):
         xmlNamespaces = dict([
             node for _, node in xmlDoc
         ])
-        if xmlDoc.root.get("TargetNamespace"):
-            targetNamespace = xmlDoc.root.get("TargetNamespace")
-            if not targetNamespace in self.namespaceIndexMap:
-                raise RuntimeError("TargetNamespace '{targetNs}' is not listed in namespace index mapping. "
-                                   "Use the following option to define the mapping (can be used multiple times). "
-                                   "--namespaceMap=X:{targetNs} where X is the resulting namespace index in the server.".format(targetNs=targetNamespace))
-        else:
-            raise RuntimeError("TargetNamespace Attribute not defined in BSD file.")
+        targetNamespace = xmlDoc.root.get("TargetNamespace")
         for typeXml in xmlDoc.root:
             if not typeXml.get("Name"):
                 continue
diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
new file mode 100644
index 00000000000..ae084add4e9
--- /dev/null
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -0,0 +1,233 @@
+foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
+    string(TOLOWER "${MODEL}" NODESET_NAME)
+
+    # only one xml file
+    # no dependency
+    if(MODEL STREQUAL "DEXPI" OR MODEL STREQUAL "Safety" OR MODEL STREQUAL "CNC" OR MODEL STREQUAL "BACnet"
+       OR MODEL STREQUAL "AMB" OR MODEL STREQUAL "MachineVision" OR MODEL STREQUAL "RSL" OR MODEL STREQUAL "I4AAS"
+       OR MODEL STREQUAL "PackML")
+        # get csv file
+        file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.csv")
+        foreach(file ${files})
+            string(REGEX MATCH "(.*NodeIds.csv)|(Opc.Ua.${MODEL}.NodeSet[2]?.csv)" csv_file_match ${file})
+            if(csv_file_match)
+                set(csv_file ${file})
+            endif()
+        endforeach()
+        # get xml file
+        file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.xml")
+        foreach(file ${files})
+            string(REGEX MATCH "Opc.Ua.${MODEL}.NodeSet[2]?.xml" xml_file_match ${file})
+            if(xml_file_match)
+                set(xml_file ${file})
+            endif()
+        endforeach()
+
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${csv_file}"
+                IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
+                FILE_NS "${xml_file}"
+                INTERNAL
+                AUTOLOAD
+        )
+    endif()
+
+    # only one xml file
+    # di as dependency
+    if(MODEL STREQUAL "AutoID" OR MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK"
+       OR MODEL STREQUAL "Scales" OR MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT"
+       OR MODEL STREQUAL "CommercialKitchenEquipment" OR MODEL STREQUAL "Machinery")
+        # get csv file
+        file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.csv")
+        foreach(file ${files})
+            string(REGEX MATCH "(.*NodeIds.csv)|(Opc.Ua.${MODEL}.NodeSet[2]?.csv)" csv_file_match ${file})
+            if(csv_file_match)
+                set(csv_file ${file})
+            endif()
+        endforeach()
+        # get xml file
+        file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.xml")
+        foreach(file ${files})
+            string(REGEX MATCH "Opc.Ua.${MODEL}.NodeSet[2]?.xml" xml_file_match ${file})
+            if(xml_file_match)
+                set(xml_file ${file})
+            endif()
+        endforeach()
+
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${csv_file}"
+                IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
+                FILE_NS "${xml_file}"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+        )
+    endif()
+
+
+    # more dependencies
+    if(MODEL STREQUAL "CAS")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "machinery"
+                DEPENDS "ia"
+        )
+    endif()
+    if(MODEL STREQUAL "TMC")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
+                IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "packml"
+        )
+    endif()
+    if(MODEL STREQUAL "Pumps")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "machinery"
+        )
+    endif()
+    if(MODEL STREQUAL "Weihenstephan")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "machinery"
+                DEPENDS "packml"
+        )
+    endif()
+    if(MODEL STREQUAL "MachineTool")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "machinery"
+                DEPENDS "ia"
+        )
+    endif()
+
+    # Extra
+    if(MODEL STREQUAL "DI")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.Di.NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.Di.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+        )
+    endif()
+    if(MODEL STREQUAL "PROFINET")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.Pn.NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.Pn.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+        )
+    endif()
+    if(MODEL STREQUAL "Glass")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Flat/NodeIds.csv"
+                IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Flat/Opc.Ua.${MODEL}.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "machinery"
+        )
+    endif()
+    if(MODEL STREQUAL "IJT")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Tightening/NodeIds.csv"
+                IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Tightening/Opc.Ua.Ijt.Tightening.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "machinery"
+        )
+    endif()
+    if(MODEL STREQUAL "OpenSCS")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.OPENSCS.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+        )
+    endif()
+    if(MODEL STREQUAL "PNEM")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.PnEm.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+        )
+    endif()
+    if(MODEL STREQUAL "PNRIO")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.PnRio.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+        )
+    endif()
+    if(MODEL STREQUAL "ISA95-JOBCONTROL")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/opc.ua.isa95-jobcontrol.nodeset2.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/opc.ua.isa95-jobcontrol.nodeset2.xml"
+                INTERNAL
+                AUTOLOAD
+        )
+    endif()
+    if(MODEL STREQUAL "PLCopen")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2_V1.02.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2_V1.02.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+        )
+    endif()
+
+endforeach()
+
+
+add_library(autoinject_library ${UA_NODESETINJECTOR_SOURCE_FILES} ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c)
+target_link_libraries(autoinject_library open62541)
+foreach(EXAMPLE_NAME ${UA_NODESETINJECTOR_EXAMPLE_NAMES})
+    if(UA_NODESETINJECTOR_GENERATORS)
+        target_link_libraries(${EXAMPLE_NAME} autoinject_library)
+        add_dependencies(${EXAMPLE_NAME} ${UA_NODESETINJECTOR_GENERATORS})
+    endif()
+endforeach()
diff --git a/tools/nodeset_injector/generate_nodesetinjector.py b/tools/nodeset_injector/generate_nodesetinjector.py
new file mode 100644
index 00000000000..bb58c10b5ed
--- /dev/null
+++ b/tools/nodeset_injector/generate_nodesetinjector.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import argparse
+from io import open
+
+parser = argparse.ArgumentParser()
+parser.add_argument('outfile', help='outfile w/o extension')
+args = parser.parse_args()
+
+fh = open(args.outfile + ".h", "wt", encoding='utf8')
+fc = open(args.outfile + ".c", "wt", encoding='utf8')
+
+def printh(string):
+    print(string, end=u'\n', file=fh)
+def printc(string):
+    print(string, end=u'\n', file=fc)
+
+#########################
+# Print the header file #
+#########################
+
+printh(u'''
+/* WARNING: This is a generated file.
+ * Any manual changes will be overwritten. */
+ 
+#ifndef NODESETINJECTOR_H_
+#define NODESETINJECTOR_H_
+
+#include <open62541/server.h>
+#include <open62541/plugin/log_stdout.h>
+
+_UA_BEGIN_DECLS
+
+extern UA_StatusCode UA_Server_injectNodesets(UA_Server *server);
+
+_UA_END_DECLS
+
+#endif /* NODESETINJECTOR_H_ */
+''')
+
+#########################
+# Print the source file #
+#########################
+
+printc(u'''
+/* WARNING: This is a generated file.
+ * Any manual changes will be overwritten. */
+
+#include "nodesetinjector.h"
+//<
+
+UA_StatusCode UA_Server_injectNodesets(UA_Server *server) {
+UA_StatusCode retval = UA_STATUSCODE_GOOD;
+UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Attaching the AUTOLOAD Nodesets to the server!");
+//>
+
+return retval;
+}
+''')
+
+fc.close()
+fh.close()
diff --git a/tools/nodeset_injector/generate_nodesetinjector_content.py b/tools/nodeset_injector/generate_nodesetinjector_content.py
new file mode 100644
index 00000000000..a66ff383b8e
--- /dev/null
+++ b/tools/nodeset_injector/generate_nodesetinjector_content.py
@@ -0,0 +1,146 @@
+#!/usr/bin/env python3
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import argparse
+import re
+import os
+import platform
+
+parser = argparse.ArgumentParser()
+parser.add_argument('outfile', help='outfile w/o extension')
+parser.add_argument('namespace', help='namespace')
+args = parser.parse_args()
+
+include_line_counter = 0
+code_line_counter = 0
+existing_namespaces = []
+data = []
+
+
+def is_unix():
+    try:
+        # Check if the os.uname() function is available
+        os.uname()
+        return True
+    except:
+        return False
+
+
+def windows_exec():
+    import msvcrt
+
+    global include_line_counter
+    global code_line_counter
+    global existing_namespaces
+    global data
+
+    # Open the file in read-write mode
+    with open(args.outfile + ".c", "r+", encoding='utf8') as file:
+        # Lock the file
+        msvcrt.locking(file.fileno(), msvcrt.LK_LOCK, 1)
+
+        # Write to the file
+        write_code_generation(file)
+
+        # Unlock the file
+        msvcrt.locking(file.fileno(), msvcrt.LK_UNLCK, 1)
+
+
+def unix_exec():
+    import fcntl
+
+    global include_line_counter
+    global code_line_counter
+    global existing_namespaces
+    global data
+
+    with open(args.outfile + ".c", "r+", encoding='utf8') as file:
+            # Acquire a lock on the file
+            fcntl.flock(file, fcntl.LOCK_EX)
+
+            # Write to the file
+            write_code_generation(file)
+
+            # Release the lock on the file
+            fcntl.flock(file, fcntl.LOCK_UN)
+
+
+def print_include(string):
+    data[include_line_counter] = string
+
+
+def print_function_call(string):
+    data[code_line_counter] = string
+
+
+def generate_code():
+    #########################
+    # Print the header file #
+    #########################
+
+    print_include(u'''
+#include <open62541/{namespace}.h>
+//<
+'''.format(namespace=args.namespace))
+
+    #########################
+    # Print the source file #
+    #########################
+
+    print_function_call(u'''
+/* {namespace} */
+retval |= {namespace}(server);
+if(retval != UA_STATUSCODE_GOOD) {{
+UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Adding the {namespace} failed. Please check previous error output.");
+UA_Server_delete(server);
+return EXIT_FAILURE;
+}}
+UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "The {namespace} successfully added.");
+//>
+'''.format(namespace=args.namespace))
+
+
+def write_code_generation(file):
+    global include_line_counter
+    global code_line_counter
+    global existing_namespaces
+    global data
+
+    # Write to the file
+    lines = file.readlines()
+    line_counter = 0
+    # List which contains the existing namespaces
+    existing_namespaces = []
+    for line in lines:
+        namespaces = re.findall("namespace_.*_generated\(.*\)", line)
+        if namespaces:
+            namespaces = namespaces[0].split("(")[0]
+            existing_namespaces.append(namespaces)
+        if re.search("//<", line):
+            include_line_counter = line_counter
+        if re.search("//>", line):
+            code_line_counter = line_counter
+        line_counter += 1
+
+    if args.namespace not in existing_namespaces:
+        # Set the file descriptor to the beginning of the file
+        file.seek(0)
+        # read a list of lines into data
+        data = file.readlines()
+        generate_code()
+        # Set the file descriptor to the beginning of the file and delete content
+        file.seek(0)
+        file.truncate(0)
+        file.writelines(data)
+
+
+if platform.system == "Linux":
+    unix_exec()
+else:
+    if is_unix():
+        unix_exec()
+    else:
+        windows_exec()

From d0ec7f12090316c6ae7db67cd45d5e7f764916a7 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 25 May 2023 10:03:15 +0200
Subject: [PATCH 0940/1963] fix(nc): Check the nodeset for custom data types
 and pass the appropriate typeArray.

---
 CMakeLists.txt                              | 15 +++++------
 tools/ci.sh                                 |  4 +--
 tools/nodeset_compiler/backend_open62541.py | 13 +--------
 tools/nodeset_compiler/nodeset.py           | 12 ---------
 tools/nodeset_compiler/nodeset_compiler.py  | 30 ++++++++++++++++++---
 5 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edbc323d864..5e4739e9551 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,10 @@ option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" OFF)
 option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" ON)
 option(UA_ENABLE_XML_ENCODING "Enable XML encoding (EXPERIMENTAL)" OFF)
 option(UA_ENABLE_NODESETLOADER "Enable nodesetLoader public API" OFF)
-option(UA_ENABLE_NODESET_INJECTOR "Enable automatic nodeset injection" OFF)
+
+if(UA_INFORMATION_MODEL_AUTOLOAD AND NOT UA_ENABLE_NODESETLOADER AND NOT UA_BUILD_FUZZING)
+    set(UA_ENABLE_NODESET_INJECTOR ON)
+endif()
 
 set(MULTITHREADING_DEFAULT 0)
 if(WIN32 OR UNIX)
@@ -1077,7 +1080,7 @@ if(UA_ENABLE_PARSING)
 endif()
 
 if(UA_ENABLE_NODESET_INJECTOR)
-    message(STATUS "Nodesetinjector enabled")
+    message(STATUS "Nodesetinjector feature enabled")
     cmake_minimum_required(VERSION 3.20)
 
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
@@ -1093,6 +1096,7 @@ if(UA_ENABLE_NODESET_INJECTOR)
     set(UA_NODESETINJECTOR_GENERATORS "")
     set(UA_NODESETINJECTOR_SOURCE_FILES "")
     set(UA_NODESETINJECTOR_EXAMPLE_NAMES "")
+    set(UA_NODESETINJECTOR_TEST_NAMES "")
 endif()
 
 # Always include encryption plugins into the amalgamation
@@ -1920,12 +1924,5 @@ assign_source_group(${default_plugin_sources})
 assign_source_group(${ua_architecture_sources})
 
 if(UA_ENABLE_NODESET_INJECTOR)
-    # no dependencies
-#    set(UA_INFORMATION_MODEL_AUTOLOAD DI ISA95-JOBCONTROL OpenSCS DEXPI AMB)
-    # di as dependency
-#    set(UA_INFORMATION_MODEL_AUTOLOAD DI AutoID  POWERLINK IA Machinery PNEM PLCopen)
-    # more dependencies
-#    set(UA_INFORMATION_MODEL_AUTOLOAD DI Machinery IA MachineTool)
-
     add_subdirectory(tools/nodeset_injector)
 endif()
diff --git a/tools/ci.sh b/tools/ci.sh
index 8de8108938d..01d44ea0fe5 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -468,7 +468,6 @@ function build_all_companion_specs {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
-          -DUA_ENABLE_NODESET_INJECTOR=ON \
           -DUA_INFORMATION_MODEL_AUTOLOAD=DI\;ISA95-JOBCONTROL\;OpenSCS\; \
           DEXPI\;AMB\;AutoID\;POWERLINK\;IA\;Machinery\; \
           PackML\;PNEM\;PLCopen\;MachineTool\;PROFINET\; \
@@ -476,5 +475,6 @@ function build_all_companion_specs {
           PNRIO\;Scales\;Weihenstephan\;Pumps\;CAS\;TMC \
           -DUA_NAMESPACE_ZERO=FULL \
           ..
-    make ${MAKEOPTS}
+    make ${MAKEOPTS} tutorial_server_firststeps
+    ./bin/examples/tutorial_server_firststeps
 }
diff --git a/tools/nodeset_compiler/backend_open62541.py b/tools/nodeset_compiler/backend_open62541.py
index 588d1eb0e38..b55612e4b50 100644
--- a/tools/nodeset_compiler/backend_open62541.py
+++ b/tools/nodeset_compiler/backend_open62541.py
@@ -310,20 +310,9 @@ def writec(line):
 
     # Change namespaceIndex from the current namespace,
     # but only if it defines its own data types, otherwise it is not necessary.
-    # The current namespace is the last item in the list of namespaces.
-    currentNs = nodeset.namespaces[-1]
-    split = currentNs.strip('/').split('/')
-    ns = split[-1]
-    # Check whether ns contains a number. If it is, check if the value starts with an uppercase letter.
-    # If not, it is not the correct value. Grab the next one and repeat the check.
-    # eg. http://opcfoundation.org/UA/TMC/v2/, http://opcfoundation.org/UA/I4AAS/
-    idx = 2
-    while re.search(r'\d', ns) and ns[0].islower():
-        ns = split[idx*-1]
-        idx += 1
     if len(typesArray) > 0:
         typeArr = typesArray[-1]
-        if typeArr == "UA_TYPES_"+ns.upper():
+        if typeArr != "UA_TYPES" and typeArr != "ns0":
             writec("/* Change namespaceIndex from current namespace */")
             writec("for(int i = 0; i < " + typeArr + "_COUNT" + "; i++) {")
             writec(typeArr + "[i]" + ".typeId.namespaceIndex = ns[" + str(nodeset.namespaceMapping[1]) + "];")
diff --git a/tools/nodeset_compiler/nodeset.py b/tools/nodeset_compiler/nodeset.py
index 14e6f84bbe0..fc1264d46f1 100644
--- a/tools/nodeset_compiler/nodeset.py
+++ b/tools/nodeset_compiler/nodeset.py
@@ -277,18 +277,6 @@ def addNodeSet(self, xmlfile, hidden=False, typesArray="UA_TYPES"):
         if modelUri is None:
             raise Exception(self, self.originXML + " does not define the nodeset URI in Models/Model/ModelUri or NamespaceUris array.")
 
-        split = modelUri.strip('/').split('/')
-        modelName = split[-1]
-        # Check whether modelName contains a number. If it is, check if the value starts with an uppercase letter.
-        # If not, it is not the correct value. Grab the next one and repeat the check.
-        # eg. http://opcfoundation.org/UA/TMC/v2/, http://opcfoundation.org/UA/I4AAS/
-        idx = 2
-        while re.search(r'\d', modelName) and modelName[0].islower():
-            modelName = split[idx*-1]
-            idx += 1
-        if modelName != "UA":
-            typesArray = "UA_TYPES_" + modelName.upper()
-
         for ns in orig_namespaces:
             self.addNamespace(ns)
         self.createNamespaceMapping(orig_namespaces) # mapping for this file
diff --git a/tools/nodeset_compiler/nodeset_compiler.py b/tools/nodeset_compiler/nodeset_compiler.py
index a9cb9b22697..542d669044f 100755
--- a/tools/nodeset_compiler/nodeset_compiler.py
+++ b/tools/nodeset_compiler/nodeset_compiler.py
@@ -13,6 +13,7 @@
 import logging
 import argparse
 import sys
+import xml.etree.ElementTree as etree
 from datatypes import NodeId
 from nodeset import *
 
@@ -120,28 +121,49 @@
     if e not in tmp_list:
         tmp_list.append(e)
 args.typesArray = tmp_list
+
 def getTypesArray(nsIdx):
     if nsIdx < len(args.typesArray):
         return args.typesArray[nsIdx]
     else:
         return "UA_TYPES"
 
+def hasCustomDataType(xmlfile):
+    tree = etree.parse(xmlfile)
+    root = tree.getroot()
+
+    for elem in root.iter():
+        if elem.tag.endswith('UADataType'):
+            xmlfile.seek(0)
+            return True
+    # No custom data types found
+    xmlfile.seek(0)
+    return False
+
 for xmlfile in args.existing:
     if xmlfile.name in loadedFiles:
         logger.info("Skipping Nodeset since it is already loaded: {} ".format(xmlfile.name))
         continue
     loadedFiles.append(xmlfile.name)
     logger.info("Preprocessing (existing) " + str(xmlfile.name))
-    ns.addNodeSet(xmlfile, True, typesArray=getTypesArray(nsCount))
-    nsCount +=1
+    if hasCustomDataType(xmlfile):
+        ns.addNodeSet(xmlfile, True, typesArray=getTypesArray(nsCount))
+        nsCount += 1
+        continue
+
+    ns.addNodeSet(xmlfile, True, typesArray="UA_TYPES")
+
 for xmlfile in args.infiles:
     if xmlfile.name in loadedFiles:
         logger.info("Skipping Nodeset since it is already loaded: {} ".format(xmlfile.name))
         continue
     loadedFiles.append(xmlfile.name)
     logger.info("Preprocessing " + str(xmlfile.name))
-    ns.addNodeSet(xmlfile, typesArray=getTypesArray(nsCount))
-    nsCount +=1
+    if hasCustomDataType(xmlfile):
+        ns.addNodeSet(xmlfile, typesArray=getTypesArray(nsCount))
+        nsCount += 1
+        continue
+    ns.addNodeSet(xmlfile, typesArray="UA_TYPES")
 
 # # We need to notify the open62541 server of the namespaces used to be able to use i.e. ns=3
 # namespaceArrayNames = preProc.getUsedNamespaceArrayNames()

From 546e0e2c276ea2a1668c263222eb3b9c3d98d691 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 25 May 2023 10:05:10 +0200
Subject: [PATCH 0941/1963] feat(nodesetinjector): Integration of the
 Nodesetinjector into the tests and addition of documentation.

---
 CMakeLists.txt                                | 11 +--
 doc/nodeset_compiler.rst                      | 26 +++++++
 examples/nodeset/CMakeLists.txt               |  5 +-
 examples/nodeset/server_nodeset_plcopen.c     |  8 +-
 examples/nodeset/server_nodeset_powerlink.c   |  8 +-
 tests/CMakeLists.txt                          | 17 +++--
 tests/nodeset-compiler/CMakeLists.txt         | 76 +++++++------------
 .../check_nodeset_loader_compare_di.c         |  1 -
 tools/ci.sh                                   | 11 +--
 tools/cmake/macros_public.cmake               | 26 +------
 tools/generate_bsd.py                         |  9 ++-
 tools/nodeset_compiler/backend_open62541.py   |  2 -
 tools/nodeset_compiler/nodeset_compiler.py    |  1 -
 tools/nodeset_injector/CMakeLists.txt         | 58 +++++++-------
 .../generate_nodesetinjector.py               |  8 +-
 .../generate_nodesetinjector_content.py       |  8 +-
 16 files changed, 124 insertions(+), 151 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e4739e9551..1592366b473 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1422,6 +1422,8 @@ ua_generate_nodeid_header(
     FILE_CSV "${UA_FILE_NODEIDS}"
 )
 
+# we need a custom target to avoid that the generator is called concurrently and
+# thus overwriting files while the other thread is compiling
 add_custom_target(open62541-generator-statuscode DEPENDS
                   ${PROJECT_BINARY_DIR}/src_generated/open62541/nodeids.h
                   ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
@@ -1915,14 +1917,5 @@ set_target_properties(open62541-generator-transport PROPERTIES FOLDER "open62541
 set_target_properties(open62541-generator-types PROPERTIES FOLDER "open62541/generators")
 if(UA_ENABLE_NODESET_INJECTOR)
     set_target_properties(open62541-generator-nodesetinjector PROPERTIES FOLDER "open62541/generators")
-endif()
-
-assign_source_group(${lib_sources})
-assign_source_group(${internal_headers})
-assign_source_group(${exported_headers})
-assign_source_group(${default_plugin_sources})
-assign_source_group(${ua_architecture_sources})
-
-if(UA_ENABLE_NODESET_INJECTOR)
     add_subdirectory(tools/nodeset_injector)
 endif()
diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
index 0d4c00f9147..595530d99f4 100644
--- a/doc/nodeset_compiler.rst
+++ b/doc/nodeset_compiler.rst
@@ -476,3 +476,29 @@ Finally you need to include all these files in your build process and call the c
     }
 
     retval = UA_Server_run(server, &running);
+
+
+Automatic Nodesetinjection
+................................
+
+The nodesetinjector is a mechanism for automatically loading nodeset/companion specifications during server initialization.
+It provides a fast and easy way to load nodesets in all applications, focusing on the official OPCFoundation/UANodeset Repository ( https://github.com/OPCFoundation/UA-Nodeset ).
+Specify the required information models using CMake.
+
+Which nodesets are to be loaded is determined by the Cmake flag ``DUA_INFORMATION_MODEL_AUTOLOAD``. All nodesets that are to be loaded automatically are listed here.
+The naming is based on the folder name of the Companion Specification in the ua-nodeset folder.
+
+A CMake call could look like this.
+
+.. code-block:: bash
+
+    -DCMAKE_BUILD_TYPE=Debug
+    -DUA_BUILD_EXAMPLES=ON
+    -DUA_INFORMATION_MODEL_AUTOLOAD=DI;POWERLINK;PROFINET;MachineVision
+    -DUA_NAMESPACE_ZERO=FULL
+
+The order of nodesets is important! Nodesets that build on other nodesets must be placed after them in the list.
+The following nodesets are currently supported.
+
+* DI, ISA95-JOBCONTROL, OpenSCS, DEXPI, AMB, AutoID, POWERLINK, IA, Machinery, PackML, PNEM, PLCopen, MachineTool, PROFINET, MachineVision, FDT, CommercialKitchenEquipment,
+PNRIO, Scales, Weihenstephan, Pumps, CAS, TMC, IJT
diff --git a/examples/nodeset/CMakeLists.txt b/examples/nodeset/CMakeLists.txt
index 8a808a95c38..e03719455ab 100644
--- a/examples/nodeset/CMakeLists.txt
+++ b/examples/nodeset/CMakeLists.txt
@@ -40,8 +40,7 @@ ua_generate_nodeid_header(
 
 add_example(server_nodeset server_nodeset.c
             ${UA_NODESET_EXAMPLE_SOURCES}
-            ${PROJECT_BINARY_DIR}/src_generated/open62541/example_nodeids.h
-            )
+            ${PROJECT_BINARY_DIR}/src_generated/open62541/example_nodeids.h)
 add_dependencies(server_nodeset open62541-generator-ns-example open62541-generator-ids_example)
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
@@ -75,7 +74,7 @@ else()
     set(FILE_NS_DIRPREFIX ${UA_NODESET_DIR})
 endif()
 
-## PLCopen requires the full ns0 as basis
+# PLCopen requires the full ns0 as basis
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
 
     # Generate types and namespace for DI
diff --git a/examples/nodeset/server_nodeset_plcopen.c b/examples/nodeset/server_nodeset_plcopen.c
index b3e6dc99876..5bd4af593d6 100644
--- a/examples/nodeset/server_nodeset_plcopen.c
+++ b/examples/nodeset/server_nodeset_plcopen.c
@@ -32,9 +32,9 @@ int main(int argc, char** argv) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
     /* create nodes from nodeset */
-    size_t idx = LONG_MAX;
+    size_t idx = (size_t) -1;
     UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/DI/"), &idx);
-    if(idx == LONG_MAX) {
+    if(idx != (size_t) -1) {
         retval = namespace_di_generated(server);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -43,9 +43,9 @@ int main(int argc, char** argv) {
             return EXIT_FAILURE;
         }
     }
-    idx = LONG_MAX;
+    idx = (size_t) -1;
     UA_Server_getNamespaceByName(server, UA_STRING("http://PLCopen.org/OpcUa/IEC61131-3/"), &idx);
-    if(idx == LONG_MAX) {
+    if(idx != (size_t) -1) {
         retval = namespace_plc_generated(server);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
diff --git a/examples/nodeset/server_nodeset_powerlink.c b/examples/nodeset/server_nodeset_powerlink.c
index 68ee3c5fae5..9647a8f1dd9 100644
--- a/examples/nodeset/server_nodeset_powerlink.c
+++ b/examples/nodeset/server_nodeset_powerlink.c
@@ -32,9 +32,9 @@ int main(int argc, char** argv) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
     /* create nodes from nodeset */
-    size_t idx = LONG_MAX;
+    size_t idx = (size_t) -1;
     UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/DI/"), &idx);
-    if(idx == LONG_MAX) {
+    if(idx != (size_t) -1) {
         retval = namespace_di_generated(server);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -43,9 +43,9 @@ int main(int argc, char** argv) {
             return EXIT_FAILURE;
         }
     }
-    idx = LONG_MAX;
+    idx = (size_t) -1;
     UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/POWERLINK/"), &idx);
-    if(idx == LONG_MAX) {
+    if(idx != (size_t) -1) {
         retval = namespace_powerlink_generated(server);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f85e9a76e2b..d0a20908f48 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -215,9 +215,12 @@ function(ua_add_test test_path_relative)
     string(REPLACE "/" ";" QUALIFIED_PATHNAME ${PATH_WITHOUT_EXTENSION})
     list(POP_BACK QUALIFIED_PATHNAME TEST_NAME)
 
-    add_executable(${TEST_NAME} ${test_path_relative} $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    add_executable(${TEST_NAME} ${test_path_relative} ${ARGN} $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
     target_link_libraries(${TEST_NAME} ${LIBS})
     add_test_valgrind(${TEST_NAME} ${TESTS_BINARY_DIR}/${TEST_NAME})
+    if(UA_ENABLE_NODESET_INJECTOR)
+        set(UA_NODESETINJECTOR_TEST_NAMES ${TEST_NAME} ${UA_NODESETINJECTOR_TEST_NAMES} PARENT_SCOPE)
+    endif()
 endfunction()
 
 ua_add_test(check_types_builtin.c)
@@ -425,9 +428,7 @@ endif()
 # Test Encryption and Authentication
 
 if(UA_ENABLE_ENCRYPTION)
-    add_executable(check_client_encryption client/check_client_encryption.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(check_client_encryption ${LIBS})
-    add_test_valgrind(client_encryption ${TESTS_BINARY_DIR}/check_client_encryption)
+    ua_add_test(client/check_client_encryption.c)
 
     if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_MBEDTLS)
         ua_add_test(client/check_client_authentication.c)
@@ -465,8 +466,10 @@ endif()
 
 # Tests for interfaces
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
-    add_executable(check_interfaces server/check_interfaces.c ${NODESET_COMPILER_OUTPUT_DIR}/namespace_tests_interfaces_generated.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    ua_add_test(server/check_interfaces.c ${NODESET_COMPILER_OUTPUT_DIR}/namespace_tests_interfaces_generated.c)
     target_include_directories(check_interfaces PRIVATE ${NODESET_COMPILER_OUTPUT_DIR})
-    target_link_libraries(check_interfaces ${LIBS})
-    add_test_valgrind(check_interfaces ${TESTS_BINARY_DIR}/check_interfaces)
+endif()
+
+if(UA_ENABLE_NODESET_INJECTOR)
+    set(UA_NODESETINJECTOR_TEST_NAMES ${UA_NODESETINJECTOR_TEST_NAMES} PARENT_SCOPE)
 endif()
diff --git a/tests/nodeset-compiler/CMakeLists.txt b/tests/nodeset-compiler/CMakeLists.txt
index 29e26c15cc4..8fd55c9b1fc 100644
--- a/tests/nodeset-compiler/CMakeLists.txt
+++ b/tests/nodeset-compiler/CMakeLists.txt
@@ -31,15 +31,11 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         INTERNAL
     )
 
-    add_executable(check_nodeset_compiler_adi check_nodeset_compiler_adi.c
-                   ${UA_NODESET_TESTS_DI_SOURCES}
-                   ${UA_NODESET_TESTS_ADI_SOURCES}
-                   ${UA_TYPES_TESTS_DI_SOURCES}
-                   ${UA_TYPES_TESTS_ADI_SOURCES}
-                   $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    add_dependencies(check_nodeset_compiler_adi open62541-generator-ns-tests-adi)
-    target_link_libraries(check_nodeset_compiler_adi ${LIBS})
-    add_test_valgrind(nodeset_compiler_adi ${TESTS_BINARY_DIR}/check_nodeset_compiler_adi)
+    ua_add_test(check_nodeset_compiler_adi.c
+                ${UA_NODESET_TESTS_DI_SOURCES}
+                ${UA_NODESET_TESTS_ADI_SOURCES}
+                ${UA_TYPES_TESTS_DI_SOURCES}
+                ${UA_TYPES_TESTS_ADI_SOURCES})
 
     # generate PLCopen namespace which is using DI
     ua_generate_nodeset_and_datatypes(
@@ -52,15 +48,11 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         INTERNAL
     )
 
-    add_executable(check_nodeset_compiler_plc check_nodeset_compiler_plc.c
-                   ${UA_NODESET_TESTS_DI_SOURCES}
-                   ${UA_NODESET_TESTS_PLC_SOURCES}
-                   ${UA_TYPES_TESTS_DI_SOURCES}
-                   ${UA_TYPES_TESTS_PLC_SOURCES}
-                   $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    add_dependencies(check_nodeset_compiler_plc open62541-generator-ns-tests-plc)
-    target_link_libraries(check_nodeset_compiler_plc ${LIBS})
-    add_test_valgrind(nodeset_compiler_plc ${TESTS_BINARY_DIR}/check_nodeset_compiler_plc)
+    ua_add_test(check_nodeset_compiler_plc.c
+                ${UA_NODESET_TESTS_DI_SOURCES}
+                ${UA_NODESET_TESTS_PLC_SOURCES}
+                ${UA_TYPES_TESTS_DI_SOURCES}
+                ${UA_TYPES_TESTS_PLC_SOURCES})
 
     # generate AutoID namespace which is using DI (test e.g. for structures with optional fields)
     ua_generate_nodeset_and_datatypes(
@@ -74,17 +66,11 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
             INTERNAL
     )
 
-    add_executable(check_nodeset_compiler_autoid check_nodeset_compiler_autoid.c
-            ${UA_NODESET_TESTS_DI_SOURCES}
-            ${UA_NODESET_TESTS_AUTOID_SOURCES}
-            ${UA_TYPES_TESTS_DI_SOURCES}
-            ${UA_TYPES_TESTS_AUTOID_SOURCES}
-            $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    add_dependencies(check_nodeset_compiler_autoid open62541-generator-ns-tests-autoid)
-    target_link_libraries(check_nodeset_compiler_autoid ${LIBS})
-    add_test_valgrind(nodeset_compiler_autoid ${TESTS_BINARY_DIR}/check_nodeset_compiler_autoid)
-
-
+    ua_add_test(check_nodeset_compiler_autoid.c
+                ${UA_NODESET_TESTS_DI_SOURCES}
+                ${UA_NODESET_TESTS_AUTOID_SOURCES}
+                ${UA_TYPES_TESTS_DI_SOURCES}
+                ${UA_TYPES_TESTS_AUTOID_SOURCES})
 endif()
 
 #[[ua_generate_datatypes(
@@ -95,15 +81,11 @@ endif()
         FILES_BSD "${PROJECT_SOURCE_DIR}/tests/nodeset-compiler/testtypes.bsd"
 )
 
-add_executable(check_nodeset_compiler_optstructs_union check_nodeset_compiler_optstructs_union.c
-        ${UA_NODESET_TESTS_DI_SOURCES}
-        ${UA_NODESET_TESTS_PLC_SOURCES}
-        ${UA_TYPES_TESTS_DI_SOURCES}
-        ${UA_TYPES_TESTS_PLC_SOURCES}
-        $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-add_dependencies(check_nodeset_compiler_optstructs_union open62541-generator-types-optstruct-union)
-target_link_libraries(check_nodeset_compiler_optstructs_union ${LIBS})
-add_test_valgrind(check_nodeset_compiler_optstructs_union ${TESTS_BINARY_DIR}/check_nodeset_compiler_optstructs_union)]]
+ua_add_test(check_nodeset_compiler_optstructs_union.c
+            ${UA_NODESET_TESTS_DI_SOURCES}
+            ${UA_NODESET_TESTS_PLC_SOURCES}
+            ${UA_TYPES_TESTS_DI_SOURCES}
+            ${UA_TYPES_TESTS_PLC_SOURCES})]]
 
 #generate testnodeset
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
@@ -119,13 +101,13 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         DEPENDS "tests-di"
     )
 
-    add_executable(check_nodeset_compiler_testnodeset check_nodeset_compiler_testnodeset.c
-                   ${UA_NODESET_TESTS_DI_SOURCES}
-                   ${UA_NODESET_TESTS_TESTNODESET_SOURCES}
-                   ${UA_TYPES_TESTS_DI_SOURCES}
-                   ${UA_TYPES_TESTS_TESTNODESET_SOURCES}
-                $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    add_dependencies(check_nodeset_compiler_testnodeset open62541-generator-ns-tests-testnodeset)
-    target_link_libraries(check_nodeset_compiler_testnodeset ${LIBS})
-    add_test_valgrind(nodeset_compiler_testnodeset ${TESTS_BINARY_DIR}/check_nodeset_compiler_testnodeset)
+    ua_add_test(check_nodeset_compiler_testnodeset.c
+                ${UA_NODESET_TESTS_DI_SOURCES}
+                ${UA_NODESET_TESTS_TESTNODESET_SOURCES}
+                ${UA_TYPES_TESTS_DI_SOURCES}
+                ${UA_TYPES_TESTS_TESTNODESET_SOURCES})
+endif()
+
+if(UA_ENABLE_NODESET_INJECTOR)
+    set(UA_NODESETINJECTOR_TEST_NAMES ${UA_NODESETINJECTOR_TEST_NAMES} PARENT_SCOPE)
 endif()
diff --git a/tests/nodeset-loader/check_nodeset_loader_compare_di.c b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
index 6cb558bb259..3dace7ec71f 100644
--- a/tests/nodeset-loader/check_nodeset_loader_compare_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
@@ -34,7 +34,6 @@ START_TEST(Server_compareDiNodeset) {
     ck_assert(config->customDataTypes);
 
     UA_UInt16 nsIndex = UA_Server_addNamespace(server, "http://opcfoundation.org/UA/DI/");
-    printf("%d\n", nsIndex);
 
     for(int i = 0; i < UA_TYPES_NODESETLOADER_DI_COUNT; ++i) {
         UA_TYPES_NODESETLOADER_DI[i].typeId.namespaceIndex = nsIndex;
diff --git a/tools/ci.sh b/tools/ci.sh
index 01d44ea0fe5..21ec532d18e 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -468,13 +468,10 @@ function build_all_companion_specs {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
-          -DUA_INFORMATION_MODEL_AUTOLOAD=DI\;ISA95-JOBCONTROL\;OpenSCS\; \
-          DEXPI\;AMB\;AutoID\;POWERLINK\;IA\;Machinery\; \
-          PackML\;PNEM\;PLCopen\;MachineTool\;PROFINET\; \
-          MachineVision\;FDT\;CommercialKitchenEquipment\; \
-          PNRIO\;Scales\;Weihenstephan\;Pumps\;CAS\;TMC \
+          -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_INFORMATION_MODEL_AUTOLOAD=DI\;ISA95-JOBCONTROL\;OpenSCS\;DEXPI\;AMB\;AutoID\;POWERLINK\;IA\;Machinery\;PackML\;PNEM\;PLCopen\;MachineTool\;PROFINET\;MachineVision\;FDT\;CommercialKitchenEquipment\;Scales\;Weihenstephan\;Pumps\;CAS\;TMC \
           -DUA_NAMESPACE_ZERO=FULL \
           ..
-    make ${MAKEOPTS} tutorial_server_firststeps
-    ./bin/examples/tutorial_server_firststeps
+    make ${MAKEOPTS} check_nodeset_compiler_testnodeset
+    ./bin/tests/check_nodeset_compiler_testnodeset
 }
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index 29539ed01e5..2126b2f5b85 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -50,11 +50,8 @@ function(ua_generate_nodeid_header)
     endif()
 
     if(UA_GEN_ID_AUTOLOAD AND UA_ENABLE_NODESET_INJECTOR)
-        #TODO: Check if it is a problem that the generator and the source file may be included in the list more than once.
         list(APPEND UA_NODESETINJECTOR_GENERATORS ${UA_GEN_ID_TARGET_PREFIX}-${UA_GEN_ID_TARGET_SUFFIX})
         set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
-        #list(APPEND UA_NODESETINJECTOR_SOURCE_FILES  ${UA_GEN_ID_OUTPUT_DIR}/${UA_GEN_ID_NAME}.h)
-        #set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
     endif()
 
     # Make sure that the output directory exists
@@ -222,12 +219,10 @@ function(ua_generate_datatypes)
         add_custom_target(${UA_GEN_DT_TARGET_PREFIX}-${UA_GEN_DT_TARGET_SUFFIX} DEPENDS
                           ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.c
                           ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.h
-                          ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated_handling.h
-                          )
+                          ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated_handling.h)
     endif()
 
     if(UA_GEN_DT_AUTOLOAD AND UA_ENABLE_NODESET_INJECTOR)
-        #TODO: Check if it is a problem that the generator and the source file may be included in the list more than once.
         list(APPEND UA_NODESETINJECTOR_GENERATORS ${UA_GEN_DT_TARGET_PREFIX}-${UA_GEN_DT_TARGET_SUFFIX})
         set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
         list(APPEND UA_NODESETINJECTOR_SOURCE_FILES  ${PROJECT_BINARY_DIR}/src_generated/open62541/${UA_GEN_DT_NAME}_generated.c)
@@ -409,8 +404,7 @@ function(ua_generate_nodeset)
         add_custom_target(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}
                           DEPENDS
                           ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c
-                          ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h
-                          )
+                          ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h)
     endif()
 
     if(UA_GEN_NS_AUTOLOAD)
@@ -552,18 +546,6 @@ function(ua_generate_nodeset_and_datatypes)
         message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires FILE_CSV argument if any of FILE_BSD or NAMESPACE_MAP are set")
     endif()
 
-#    if((NOT UA_GEN_FILE_BSD OR "${UA_GEN_FILE_BSD}" STREQUAL "") AND
-#    (NOT "${UA_GEN_FILE_CSV}" STREQUAL "" OR
-#        NOT "${UA_GEN_NAMESPACE_MAP}" STREQUAL ""))
-#        message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires FILE_BSD argument if any of FILE_CSV or NAMESPACE_MAP are set")
-#    endif()
-
-#    if(NOT UA_GEN_NAMESPACE_MAP OR "${UA_GEN_NAMESPACE_MAP}" STREQUAL "" AND
-#    (NOT "${UA_GEN_FILE_CSV}" STREQUAL "" OR
-#        NOT "${UA_GEN_FILE_BSD}" STREQUAL ""))
-#        message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires NAMESPACE_MAP argument if any of FILE_CSV or FILE_BSD are set")
-#    endif()
-
     # Set default value for output dir
     if(NOT UA_GEN_OUTPUT_DIR OR "${UA_GEN_OUTPUT_DIR}" STREQUAL "")
         set(UA_GEN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/src_generated/open62541)
@@ -605,10 +587,6 @@ function(ua_generate_nodeset_and_datatypes)
                 string(TOUPPER "${DEPENDS_NAME}" DEPENDS_NAME)
                 get_property(DEPENDS_NAMESPACE_MAP GLOBAL PROPERTY "UA_GEN_DT_DEPENDS_NAMESPACE_MAP_${DEPENDS_NAME}")
 
-                if(NOT DEPENDS_NAMESPACE_MAP OR "${DEPENDS_NAMESPACE_MAP}" STREQUAL "")
-                    #message(FATAL_ERROR "Nodeset dependency ${f} needs to be generated before ${UA_GEN_NAME}")
-                endif()
-
                 set(NAMESPACE_MAP_DEPENDS ${NAMESPACE_MAP_DEPENDS} "${DEPENDS_NAMESPACE_MAP}")
             endforeach()
         endif()
diff --git a/tools/generate_bsd.py b/tools/generate_bsd.py
index 1a2d315a912..af657dbc75d 100644
--- a/tools/generate_bsd.py
+++ b/tools/generate_bsd.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+### This Source Code Form is subject to the terms of the Mozilla Public
+### License, v. 2.0. If a copy of the MPL was not distributed with this
+### file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import print_function
+###    Copyright 2023 (c) Fraunhofer IOSB (Author: Noel Graf)
 
+from __future__ import print_function
 import sys
 import xml.dom.minidom as dom
 import codecs
diff --git a/tools/nodeset_compiler/backend_open62541.py b/tools/nodeset_compiler/backend_open62541.py
index b55612e4b50..faaa29f7cd6 100644
--- a/tools/nodeset_compiler/backend_open62541.py
+++ b/tools/nodeset_compiler/backend_open62541.py
@@ -12,8 +12,6 @@
 
 
 from __future__ import print_function
-
-import re
 from os.path import basename
 import logging
 import codecs
diff --git a/tools/nodeset_compiler/nodeset_compiler.py b/tools/nodeset_compiler/nodeset_compiler.py
index 542d669044f..038263530e9 100755
--- a/tools/nodeset_compiler/nodeset_compiler.py
+++ b/tools/nodeset_compiler/nodeset_compiler.py
@@ -150,7 +150,6 @@ def hasCustomDataType(xmlfile):
         ns.addNodeSet(xmlfile, True, typesArray=getTypesArray(nsCount))
         nsCount += 1
         continue
-
     ns.addNodeSet(xmlfile, True, typesArray="UA_TYPES")
 
 for xmlfile in args.infiles:
diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
index ae084add4e9..45a1e10d778 100644
--- a/tools/nodeset_injector/CMakeLists.txt
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -31,11 +31,10 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 INTERNAL
                 AUTOLOAD
         )
-    endif()
 
     # only one xml file
     # di as dependency
-    if(MODEL STREQUAL "AutoID" OR MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK"
+    elseif(MODEL STREQUAL "AutoID" OR MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK"
        OR MODEL STREQUAL "Scales" OR MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT"
        OR MODEL STREQUAL "CommercialKitchenEquipment" OR MODEL STREQUAL "Machinery")
         # get csv file
@@ -64,11 +63,9 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 AUTOLOAD
                 DEPENDS "di"
         )
-    endif()
-
 
     # more dependencies
-    if(MODEL STREQUAL "CAS")
+    elseif(MODEL STREQUAL "CAS")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
@@ -79,8 +76,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 DEPENDS "machinery"
                 DEPENDS "ia"
         )
-    endif()
-    if(MODEL STREQUAL "TMC")
+    elseif(MODEL STREQUAL "TMC")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
@@ -91,8 +87,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 DEPENDS "di"
                 DEPENDS "packml"
         )
-    endif()
-    if(MODEL STREQUAL "Pumps")
+    elseif(MODEL STREQUAL "Pumps")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.csv"
@@ -102,8 +97,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 DEPENDS "di"
                 DEPENDS "machinery"
         )
-    endif()
-    if(MODEL STREQUAL "Weihenstephan")
+    elseif(MODEL STREQUAL "Weihenstephan")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
@@ -114,8 +108,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 DEPENDS "machinery"
                 DEPENDS "packml"
         )
-    endif()
-    if(MODEL STREQUAL "MachineTool")
+    elseif(MODEL STREQUAL "MachineTool")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
@@ -126,10 +119,8 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 DEPENDS "machinery"
                 DEPENDS "ia"
         )
-    endif()
-
     # Extra
-    if(MODEL STREQUAL "DI")
+    elseif(MODEL STREQUAL "DI")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.Di.NodeIds.csv"
@@ -137,8 +128,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 INTERNAL
                 AUTOLOAD
         )
-    endif()
-    if(MODEL STREQUAL "PROFINET")
+    elseif(MODEL STREQUAL "PROFINET")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.Pn.NodeIds.csv"
@@ -146,8 +136,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 INTERNAL
                 AUTOLOAD
         )
-    endif()
-    if(MODEL STREQUAL "Glass")
+    elseif(MODEL STREQUAL "Glass")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Flat/NodeIds.csv"
@@ -158,8 +147,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 DEPENDS "di"
                 DEPENDS "machinery"
         )
-    endif()
-    if(MODEL STREQUAL "IJT")
+    elseif(MODEL STREQUAL "IJT")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Tightening/NodeIds.csv"
@@ -170,8 +158,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 DEPENDS "di"
                 DEPENDS "machinery"
         )
-    endif()
-    if(MODEL STREQUAL "OpenSCS")
+    elseif(MODEL STREQUAL "OpenSCS")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
@@ -179,8 +166,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 INTERNAL
                 AUTOLOAD
         )
-    endif()
-    if(MODEL STREQUAL "PNEM")
+    elseif(MODEL STREQUAL "PNEM")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
@@ -189,8 +175,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 AUTOLOAD
                 DEPENDS "di"
         )
-    endif()
-    if(MODEL STREQUAL "PNRIO")
+    elseif(MODEL STREQUAL "PNRIO")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/NodeIds.csv"
@@ -199,8 +184,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 AUTOLOAD
                 DEPENDS "di"
         )
-    endif()
-    if(MODEL STREQUAL "ISA95-JOBCONTROL")
+    elseif(MODEL STREQUAL "ISA95-JOBCONTROL")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/opc.ua.isa95-jobcontrol.nodeset2.csv"
@@ -208,8 +192,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 INTERNAL
                 AUTOLOAD
         )
-    endif()
-    if(MODEL STREQUAL "PLCopen")
+    elseif(MODEL STREQUAL "PLCopen")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
                 FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2_V1.02.csv"
@@ -218,6 +201,8 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 AUTOLOAD
                 DEPENDS "di"
         )
+    else()
+        MESSAGE(WARNING "The specified nodeset '${MODEL}' is not supported or is misspelled.")
     endif()
 
 endforeach()
@@ -231,3 +216,12 @@ foreach(EXAMPLE_NAME ${UA_NODESETINJECTOR_EXAMPLE_NAMES})
         add_dependencies(${EXAMPLE_NAME} ${UA_NODESETINJECTOR_GENERATORS})
     endif()
 endforeach()
+
+if(UA_BUILD_UNIT_TESTS)
+    foreach(TEST_NAME ${UA_NODESETINJECTOR_TEST_NAMES})
+        if(UA_NODESETINJECTOR_GENERATORS)
+            target_link_libraries(${TEST_NAME} autoinject_library)
+            add_dependencies(${TEST_NAME} ${UA_NODESETINJECTOR_GENERATORS})
+        endif()
+    endforeach()
+endif()
diff --git a/tools/nodeset_injector/generate_nodesetinjector.py b/tools/nodeset_injector/generate_nodesetinjector.py
index bb58c10b5ed..7d94512386a 100644
--- a/tools/nodeset_injector/generate_nodesetinjector.py
+++ b/tools/nodeset_injector/generate_nodesetinjector.py
@@ -1,8 +1,10 @@
 #!/usr/bin/env python3
 
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+### This Source Code Form is subject to the terms of the Mozilla Public
+### License, v. 2.0. If a copy of the MPL was not distributed with this
+### file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+###    Copyright 2023 (c) Fraunhofer IOSB (Author: Noel Graf)
 
 import argparse
 from io import open
diff --git a/tools/nodeset_injector/generate_nodesetinjector_content.py b/tools/nodeset_injector/generate_nodesetinjector_content.py
index a66ff383b8e..470294d8782 100644
--- a/tools/nodeset_injector/generate_nodesetinjector_content.py
+++ b/tools/nodeset_injector/generate_nodesetinjector_content.py
@@ -1,8 +1,10 @@
 #!/usr/bin/env python3
 
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+### This Source Code Form is subject to the terms of the Mozilla Public
+### License, v. 2.0. If a copy of the MPL was not distributed with this
+### file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+###    Copyright 2023 (c) Fraunhofer IOSB (Author: Noel Graf)
 
 import argparse
 import re

From b20c48b28fd3df9096ce19132ddcff4635308428 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 18 May 2023 12:01:06 +0200
Subject: [PATCH 0942/1963] refactor(client): Simplify
 UA_Client_connectUsername

---
 include/open62541/client.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 2ec91e4c9cc..c65147ddbfe 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -318,17 +318,20 @@ UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl);
 static UA_INLINE UA_StatusCode
 UA_Client_connectUsername(UA_Client *client, const char *endpointUrl,
                           const char *username, const char *password) {
+    /* Set the user identity token */
     UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
     if(!identityToken)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     identityToken->userName = UA_STRING_ALLOC(username);
     identityToken->password = UA_STRING_ALLOC(password);
+
     UA_ClientConfig *cc = UA_Client_getConfig(client);
     UA_ExtensionObject_clear(&cc->userIdentityToken);
-    cc->userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
-    cc->userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN];
-    cc->userIdentityToken.content.decoded.data = identityToken;
-    /* Silence a false-positive deprecated warning */
+    UA_ExtensionObject_setValue(&cc->userIdentityToken,
+                                identityToken,
+                                &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+
+    /* Connect */
     return UA_Client_connect(client, endpointUrl);
 }
 

From 3422a5cba18d034e092db522b8b8b87e84711526 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 18 May 2023 12:14:00 +0200
Subject: [PATCH 0943/1963] feat(client): Add dedicated
 UA_ClientConfig_setAuthenticationCert

---
 include/open62541/client.h                    | 37 +++++++++++++------
 .../include/open62541/client_config_default.h |  4 --
 plugins/ua_config_default.c                   | 16 --------
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index c65147ddbfe..52779c1ac70 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -227,7 +227,28 @@ UA_ClientConfig_delete(UA_ClientConfig *config);
  */
 UA_EXPORT void
 UA_ClientConfig_clear(UA_ClientConfig *config);
- /**
+
+/* Configure Username/Password for the Session authentication. Also see
+ * UA_ClientConfig_setAuthenticationCert for x509-based authentication, which is
+ * implemented as a plugin (as it can be based on different crypto
+ * libraries). */
+static UA_INLINE UA_StatusCode
+UA_ClientConfig_setAuthenticationUsername(UA_ClientConfig *config,
+                                          const char *username,
+                                          const char *password) {
+    UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
+    if(!identityToken)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    identityToken->userName = UA_STRING_ALLOC(username);
+    identityToken->password = UA_STRING_ALLOC(password);
+
+    UA_ExtensionObject_clear(&config->userIdentityToken);
+    UA_ExtensionObject_setValue(&config->userIdentityToken, identityToken,
+                                &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+    return UA_STATUSCODE_GOOD;
+}
+
+/**
  * Client Lifecycle
  * ---------------- */
 
@@ -319,17 +340,11 @@ static UA_INLINE UA_StatusCode
 UA_Client_connectUsername(UA_Client *client, const char *endpointUrl,
                           const char *username, const char *password) {
     /* Set the user identity token */
-    UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
-    if(!identityToken)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    identityToken->userName = UA_STRING_ALLOC(username);
-    identityToken->password = UA_STRING_ALLOC(password);
-
     UA_ClientConfig *cc = UA_Client_getConfig(client);
-    UA_ExtensionObject_clear(&cc->userIdentityToken);
-    UA_ExtensionObject_setValue(&cc->userIdentityToken,
-                                identityToken,
-                                &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+    UA_StatusCode res =
+        UA_ClientConfig_setAuthenticationUsername(cc, username, password);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
 
     /* Connect */
     return UA_Client_connect(client, endpointUrl);
diff --git a/plugins/include/open62541/client_config_default.h b/plugins/include/open62541/client_config_default.h
index d81e52e1dc3..83b62a22a8c 100644
--- a/plugins/include/open62541/client_config_default.h
+++ b/plugins/include/open62541/client_config_default.h
@@ -16,10 +16,6 @@ _UA_BEGIN_DECLS
 UA_StatusCode UA_EXPORT
 UA_ClientConfig_setDefault(UA_ClientConfig *config);
 
-UA_StatusCode UA_EXPORT
-UA_ClientConfig_setAuthenticationUsername(UA_ClientConfig *config,
-                                          const char *username, const char *password);
-
 /* If certificates are used for authentication, this is only possible when
  * openssl or mbedtls is used. Libressl is currently not supported.*/
 #if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index b73b5f2a2a4..7edf3ae037e 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -975,22 +975,6 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
-UA_ClientConfig_setAuthenticationUsername(UA_ClientConfig *config,
-                                          const char *username, const char *password) {
-    /* Create UserIdentityToken */
-    UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
-    if(!identityToken)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    identityToken->userName = UA_STRING_ALLOC(username);
-    identityToken->password = UA_STRING_ALLOC(password);
-    UA_ExtensionObject_clear(&config->userIdentityToken);
-    config->userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
-    config->userIdentityToken.content.decoded.type = &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN];
-    config->userIdentityToken.content.decoded.data = identityToken;
-    return UA_STATUSCODE_GOOD;
-}
-
 #ifdef UA_ENABLE_ENCRYPTION
 UA_StatusCode
 UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,

From 21eba36c30cc293ed5a4fafdc65f8eab386360bd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 19 May 2023 14:26:29 +0200
Subject: [PATCH 0944/1963] feat(client): Move EndpointUrl, noSession,
 noReconnect to public config

---
 include/open62541/client.h      |  66 +++++++++--
 src/client/ua_client.c          |   3 +-
 src/client/ua_client_connect.c  | 188 ++++++++++----------------------
 src/client/ua_client_internal.h |  14 +--
 4 files changed, 124 insertions(+), 147 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 52779c1ac70..b3c365fde09 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -86,6 +86,10 @@ typedef struct {
      *   URI set in the certificate */
     UA_ApplicationDescription clientDescription;
 
+    /* The endpoint for the client to connect to.
+     * Such as "opc.tcp://host:port". */
+    UA_String endpointUrl;
+
     /**
      * Connection configuration
      * ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -103,6 +107,10 @@ typedef struct {
                                   * empty string indicates the client to select
                                   * any matching SecurityPolicy. */
 
+    UA_Boolean noSession;   /* Only open a SecureChannel, but no Session */
+    UA_Boolean noReconnect; /* Don't reconnect SecureChannel (and Session) when
+                             * the connection is lost without explicitly closing. */
+
     /**
      * If either endpoint or userTokenPolicy has been set (at least one non-zero
      * byte in either structure), then the selected Endpoint and UserTokenPolicy
@@ -303,6 +311,12 @@ UA_Client_delete(UA_Client *client);
  * If the connection fails unrecoverably (state->connectStatus is set to an
  * error), the client is no longer usable. Create a new client if required. */
 
+/* Connect with the client configuration. For the async connection, finish
+ * connecting via UA_Client_run_iterate (or manually running a configured
+ * external EventLoop). */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+__UA_Client_connect(UA_Client *client, UA_Boolean async);
+
 /* Connect to the server. First a SecureChannel is opened, then a Session. The
  * client configuration restricts the SecureChannel selection and contains the
  * UserIdentityToken for the Session.
@@ -310,28 +324,64 @@ UA_Client_delete(UA_Client *client);
  * @param client to use
  * @param endpointURL to connect (for example "opc.tcp://localhost:4840")
  * @return Indicates whether the operation succeeded or returns an error code */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Client_connect(UA_Client *client, const char *endpointUrl);
+static UA_INLINE UA_StatusCode
+UA_Client_connect(UA_Client *client, const char *endpointUrl) {
+    /* Update the configuration */
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->noSession = false; /* Open a Session */
+    UA_String_clear(&cc->endpointUrl);
+    cc->endpointUrl = UA_STRING_ALLOC(endpointUrl);
+
+    /* Connect */
+    return __UA_Client_connect(client, false);
+}
 
 /* Connect async (non-blocking) to the server. After initiating the connection,
  * call UA_Client_run_iterate repeatedly until the connection is fully
  * established. You can set a callback to client->config.stateCallback to be
  * notified when the connection status changes. Or use UA_Client_getState to get
  * the state manually. */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Client_connectAsync(UA_Client *client, const char *endpointUrl);
+static UA_INLINE UA_StatusCode
+UA_Client_connectAsync(UA_Client *client, const char *endpointUrl) {
+    /* Update the configuration */
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->noSession = false; /* Open a Session */
+    UA_String_clear(&cc->endpointUrl);
+    cc->endpointUrl = UA_STRING_ALLOC(endpointUrl);
+
+    /* Connect */
+    return __UA_Client_connect(client, true);
+}
 
 /* Connect to the server without creating a session
  *
  * @param client to use
  * @param endpointURL to connect (for example "opc.tcp://localhost:4840")
  * @return Indicates whether the operation succeeded or returns an error code */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl);
+static UA_INLINE UA_StatusCode
+UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl) {
+    /* Update the configuration */
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->noSession = true; /* Don't open a Session */
+    UA_String_clear(&cc->endpointUrl);
+    cc->endpointUrl = UA_STRING_ALLOC(endpointUrl);
+
+    /* Connect */
+    return __UA_Client_connect(client, false);
+}
 
 /* Connect async (non-blocking) only the SecureChannel */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl);
+static UA_INLINE UA_StatusCode
+UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl) {
+    /* Update the configuration */
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->noSession = true; /* Don't open a Session */
+    UA_String_clear(&cc->endpointUrl);
+    cc->endpointUrl = UA_STRING_ALLOC(endpointUrl);
+
+    /* Connect */
+    return __UA_Client_connect(client, false);
+}
 
 /* Connect to the server and create+activate a Session with the given username
  * and password. This first set the UserIdentityToken in the client config and
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 202d73d937c..ca27d4f920a 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -152,7 +152,7 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
 void
 UA_ClientConfig_clear(UA_ClientConfig *config) {
     UA_ApplicationDescription_clear(&config->clientDescription);
-
+    UA_String_clear(&config->endpointUrl);
     UA_ExtensionObject_clear(&config->userIdentityToken);
 
     /* Delete the SecurityPolicies for Authentication */
@@ -239,7 +239,6 @@ UA_Client_clear(UA_Client *client) {
     client->sessionState = oldState;
 
     UA_Client_disconnect(client);
-    UA_String_clear(&client->endpointUrl);
     UA_String_clear(&client->discoveryUrl);
 
     UA_String_clear(&client->remoteNonce);
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 6720fe7c81c..dfe906f3b1a 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -33,7 +33,7 @@
 
 #define REVERSE_CONNECT_INDICATOR (void *)(uintptr_t)0xFFFFFFFF
 
-static UA_StatusCode initConnect(UA_Client *client);
+static void initConnect(UA_Client *client);
 static UA_StatusCode createSessionAsync(UA_Client *client);
 
 static UA_SecurityPolicy *
@@ -71,7 +71,7 @@ endpointUnconfigured(UA_Client *client) {
 UA_Boolean
 isFullyConnected(UA_Client *client) {
     /* No Session, but require one */
-    if(client->sessionState != UA_SESSIONSTATE_ACTIVATED && !client->noSession)
+    if(client->sessionState != UA_SESSIONSTATE_ACTIVATED && !client->config.noSession)
         return false;
 
     /* No SecureChannel */
@@ -413,7 +413,7 @@ sendHELMessage(UA_Client *client) {
     if(client->discoveryUrl.length > 0) {
         hello.endpointUrl = client->discoveryUrl;
     } else {
-        hello.endpointUrl = client->endpointUrl;
+        hello.endpointUrl = client->config.endpointUrl;
     }
 
     UA_Byte *bufPos = &message.data[8]; /* skip the header */
@@ -466,8 +466,8 @@ void processRHEMessage(UA_Client *client, const UA_ByteString *chunk) {
         return;
     }
 
-    UA_String_clear(&client->endpointUrl);
-    UA_String_copy(&rheMessage.endpointUrl, &client->endpointUrl);
+    UA_String_clear(&client->discoveryUrl);
+    UA_String_copy(&rheMessage.endpointUrl, &client->discoveryUrl);
 
     UA_TcpReverseHelloMessage_clear(&rheMessage);
 
@@ -970,7 +970,7 @@ requestGetEndpoints(UA_Client *client) {
     if(client->discoveryUrl.length > 0)
         request.endpointUrl = client->discoveryUrl;
     else
-        request.endpointUrl = client->endpointUrl;
+        request.endpointUrl = client->config.endpointUrl;
     UA_StatusCode retval =
         __Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
                               (UA_ClientAsyncServiceCallback) responseGetEndpoints,
@@ -1000,8 +1000,8 @@ responseFindServers(UA_Client *client, void *userdata,
                        "FindServers failed with error code %s. Continue with the "
                        "EndpointURL %.*s.",
                        UA_StatusCode_name(fsr->responseHeader.serviceResult),
-                       (int)client->endpointUrl.length, client->endpointUrl.data);
-        UA_String_copy(&client->endpointUrl, &client->discoveryUrl);
+                       (int)client->config.endpointUrl.length, client->config.endpointUrl.data);
+        UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
         return;
     }
 
@@ -1016,13 +1016,13 @@ responseFindServers(UA_Client *client, void *userdata,
             continue;
 
         for(size_t j = 0; j < server->discoveryUrlsSize; j++) {
-            if(UA_String_equal(&client->endpointUrl, &server->discoveryUrls[j])) {
+            if(UA_String_equal(&client->config.endpointUrl, &server->discoveryUrls[j])) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                             "The initially defined EndpointURL %.*s"
                             "is valid for the server",
-                            (int)client->endpointUrl.length,
-                            client->endpointUrl.data);
-                UA_String_copy(&client->endpointUrl, &client->discoveryUrl);
+                            (int)client->config.endpointUrl.length,
+                            client->config.endpointUrl.data);
+                UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
                 return;
             }
         }
@@ -1063,8 +1063,9 @@ responseFindServers(UA_Client *client, void *userdata,
     UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                    "FindServers did not returned a suitable DiscoveryURL. "
                    "Continue with the EndpointURL %.*s.",
-                   (int)client->endpointUrl.length, client->endpointUrl.data);
-    UA_String_copy(&client->endpointUrl, &client->discoveryUrl);
+                   (int)client->config.endpointUrl.length,
+                   client->config.endpointUrl.data);
+    UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
 }
 
 static UA_StatusCode
@@ -1073,7 +1074,7 @@ requestFindServers(UA_Client *client) {
     UA_FindServersRequest_init(&request);
     request.requestHeader.timestamp = UA_DateTime_now();
     request.requestHeader.timeoutHint = 10000;
-    request.endpointUrl = client->endpointUrl;
+    request.endpointUrl = client->config.endpointUrl;
     UA_StatusCode retval =
         __Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST],
                               (UA_ClientAsyncServiceCallback) responseFindServers,
@@ -1252,7 +1253,10 @@ connectActivity(UA_Client *client) {
         /* The connection is closed. Reset the SecureChannel and open a new TCP
          * connection */
     case UA_SECURECHANNELSTATE_CLOSED:
-        client->connectStatus = initConnect(client);
+        if(client->config.noReconnect)
+            client->connectStatus = UA_STATUSCODE_BADNOTCONNECTED;
+        else
+            initConnect(client); /* Sets the connectStatus internally */
         return;
 
         /* These states should never occur for the client */
@@ -1284,7 +1288,7 @@ connectActivity(UA_Client *client) {
     }
 
     /* Have the final SecureChannel but no session */
-    if(client->noSession)
+    if(client->config.noSession)
         return;
 
     /* Create and Activate the Session */
@@ -1486,28 +1490,22 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 }
 
 /* Initialize a TCP connection. Writes the result to client->connectStatus. */
-static UA_StatusCode
+static void
 initConnect(UA_Client *client) {
-    if(client->noReconnect)
-        return UA_STATUSCODE_BADNOTCONNECTED;
-
     if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Client connection already initiated");
-        return UA_STATUSCODE_GOOD;
+        return;
     }
 
     /* Start the EventLoop if not already started */
-    UA_StatusCode res = __UA_Client_startup(client);
-    UA_CHECK_STATUS(res, return res);
+    client->connectStatus = __UA_Client_startup(client);
+    UA_CHECK_STATUS(client->connectStatus, return);
 
-    /* Consistency check the client's own ApplicationURI */
+    /* Consistency check the client's own ApplicationURI.
+     * Problems are only logged. */
     verifyClientApplicationURI(client);
 
-    /* Reset the connect status */
-    client->connectStatus = UA_STATUSCODE_GOOD;
-    client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
-
     /* Initialize the SecureChannel */
     UA_SecureChannel_init(&client->channel);
     client->channel.config = client->config.localConnectionConfig;
@@ -1522,17 +1520,19 @@ initConnect(UA_Client *client) {
     UA_String path = UA_STRING_NULL;
     UA_UInt16 port = 4840;
 
-    res = UA_parseEndpointUrl(&client->endpointUrl, &hostname, &port, &path);
-    if(res != UA_STATUSCODE_GOOD) {
+    client->connectStatus =
+        UA_parseEndpointUrl(&client->config.endpointUrl, &hostname, &port, &path);
+    if(client->connectStatus != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_NETWORK,
                        "OPC UA URL is invalid: %.*s",
-                       (int)client->endpointUrl.length, client->endpointUrl.data);
-        return res;
+                       (int)client->config.endpointUrl.length,
+                       client->config.endpointUrl.data);
+        return;
     }
 
     /* Initialize the TCP connection */
     UA_String tcpString = UA_STRING("tcp");
-    res = UA_STATUSCODE_BADINTERNALERROR;
+    client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
     for(UA_EventSource *es = client->config.eventLoop->eventSources;
         es != NULL; es = es->next) {
         /* Is this a usable connection manager? */
@@ -1555,62 +1555,21 @@ initConnect(UA_Client *client) {
 
         /* Open the client TCP connection */
         UA_UNLOCK(&client->clientMutex);
-        res = cm->openConnection(cm, &paramMap, client, NULL, __Client_networkCallback);
+        client->connectStatus =
+            cm->openConnection(cm, &paramMap, client, NULL, __Client_networkCallback);
         UA_LOCK(&client->clientMutex);
-        if(res == UA_STATUSCODE_GOOD)
+        if(client->connectStatus == UA_STATUSCODE_GOOD)
             break;
     }
 
     /* Opening the TCP connection failed */
-    if(res != UA_STATUSCODE_GOOD) {
+    if(client->connectStatus != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                        "Could not open a TCP connection to %.*s",
-                       (int)client->endpointUrl.length, client->endpointUrl.data);
-        res = UA_STATUSCODE_BADCONNECTIONCLOSED;
+                       (int)client->config.endpointUrl.length,
+                       client->config.endpointUrl.data);
+        client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
     }
-    return res;
-}
-
-UA_StatusCode
-UA_Client_connectAsync(UA_Client *client, const char *endpointUrl) {
-    UA_LOCK(&client->clientMutex);
-    client->noReconnect = false;
-
-    /* Set the endpoint URL the client connects to */
-    UA_String_clear(&client->endpointUrl);
-    UA_String_clear(&client->discoveryUrl);
-    client->endpointUrl = UA_STRING_ALLOC(endpointUrl);
-
-    /* Open a Session when possible */
-    client->noSession = false;
-
-    /* Connect Async */
-    client->connectStatus = initConnect(client);
-    notifyClientState(client);
-
-    UA_UNLOCK(&client->clientMutex);
-    return client->connectStatus;
-}
-
-UA_StatusCode
-UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl) {
-    UA_LOCK(&client->clientMutex);
-    client->noReconnect = false;
-
-    /* Set the endpoint URL the client connects to */
-    UA_String_clear(&client->endpointUrl);
-    UA_String_clear(&client->discoveryUrl);
-    client->endpointUrl = UA_STRING_ALLOC(endpointUrl);
-
-    /* Don't open a Session */
-    client->noSession = true;
-
-    /* Connect Async */
-    client->connectStatus = initConnect(client);
-    notifyClientState(client);
-
-    UA_UNLOCK(&client->clientMutex);
-    return client->connectStatus;
 }
 
 void
@@ -1621,7 +1580,7 @@ connectSync(UA_Client *client) {
     UA_DateTime maxDate = now + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
 
     /* Initialize the connection */
-    client->connectStatus = initConnect(client);
+    initConnect(client);
     notifyClientState(client);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return;
@@ -1664,46 +1623,19 @@ connectSync(UA_Client *client) {
             client->connectStatus = res;
             closeSecureChannel(client);
         }
-    }
-}
 
-UA_StatusCode
-UA_Client_connect(UA_Client *client, const char *endpointUrl) {
-    UA_LOCK(&client->clientMutex);
-    client->noReconnect = false;
-
-    /* Set the endpoint URL the client connects to */
-    UA_String_clear(&client->endpointUrl);
-    UA_String_clear(&client->discoveryUrl);
-    client->endpointUrl = UA_STRING_ALLOC(endpointUrl);
-
-    /* Open a Session when possible */
-    client->noSession = false;
-
-    /* Connect Synchronous */
-    connectSync(client);
-
-    UA_UNLOCK(&client->clientMutex);
-    return client->connectStatus;
+        notifyClientState(client);
+    }
 }
 
 UA_StatusCode
-UA_Client_connectSecureChannel(UA_Client *client, const char *endpointUrl) {
+__UA_Client_connect(UA_Client *client, UA_Boolean async) {
     UA_LOCK(&client->clientMutex);
-
-    client->noReconnect = false;
-
-    /* Set the endpoint URL the client connects to */
-    UA_String_clear(&client->endpointUrl);
-    UA_String_clear(&client->discoveryUrl);
-    client->endpointUrl = UA_STRING_ALLOC(endpointUrl);
-
-    /* Don't open a Session */
-    client->noSession = true;
-
-    /* Connect Synchronous */
-    connectSync(client);
-
+    if(async)
+        initConnect(client);
+    else
+        connectSync(client);
+    notifyClientState(client);
     UA_UNLOCK(&client->clientMutex);
     return client->connectStatus;
 }
@@ -1784,7 +1716,6 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     const UA_String tcpString = UA_STRING_STATIC("tcp");
     UA_StatusCode res = UA_STATUSCODE_BADINTERNALERROR;
 
-    client->noReconnect = true;
     client->connectStatus = UA_STATUSCODE_GOOD;
     client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
 
@@ -1927,9 +1858,6 @@ cleanupSession(UA_Client *client) {
     __Client_Subscriptions_clean(client);
 #endif
 
-    /* Reset so the next async connect creates a session by default */
-    client->noSession = false;
-
     /* Delete outstanding async services */
     __Client_AsyncService_removeAll(client, UA_STATUSCODE_BADSESSIONCLOSED);
 
@@ -1954,8 +1882,6 @@ UA_StatusCode
 UA_Client_disconnectAsync(UA_Client *client) {
     UA_LOCK(&client->clientMutex);
 
-    client->noReconnect = true;
-
     if(client->sessionState == UA_SESSIONSTATE_CLOSED ||
        client->sessionState == UA_SESSIONSTATE_CLOSING) {
         closeSecureChannel(client);
@@ -1963,6 +1889,9 @@ UA_Client_disconnectAsync(UA_Client *client) {
         return UA_STATUSCODE_GOOD;
     }
 
+    /* Clean the DiscoveryUrl */
+    UA_String_clear(&client->discoveryUrl);
+
     /* Set before sending the message to prevent recursion */
     client->sessionState = UA_SESSIONSTATE_CLOSING;
 
@@ -1989,7 +1918,10 @@ UA_StatusCode
 UA_Client_disconnectSecureChannel(UA_Client *client) {
     UA_LOCK(&client->clientMutex);
 
-    client->noReconnect = true;
+    /* Clean the DiscoveryUrl when the connection is explicitly closed */
+    UA_String_clear(&client->discoveryUrl);
+
+    /* Close the SecureChannel */
     closeSecureChannel(client);
 
     /* Manually set the status to closed to prevent an automatic reconnection */
@@ -2017,12 +1949,10 @@ UA_Client_disconnectSecureChannel(UA_Client *client) {
 UA_StatusCode
 UA_Client_disconnect(UA_Client *client) {
     UA_LOCK(&client->clientMutex);        
-
-    client->noReconnect = true;
     if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
         sendCloseSession(client);
     cleanupSession(client);
     UA_UNLOCK(&client->clientMutex);
-    UA_StatusCode res = UA_Client_disconnectSecureChannel(client);
-    return res;
+
+    return UA_Client_disconnectSecureChannel(client);
 }
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 5415a793410..edb4f770c50 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -137,14 +137,12 @@ struct UA_Client {
 
     UA_Boolean findServersHandshake;   /* Ongoing FindServers */
     UA_Boolean endpointsHandshake;     /* Ongoing GetEndpoints */
-    UA_Boolean noSession;              /* Don't open a session */
-    UA_Boolean noReconnect;            /* Don't reconnect when the connection closes */
-
-    /* Connection */
-    UA_String endpointUrl;  /* Used to extract address and port */
-    UA_String discoveryUrl; /* The discoveryUrl (also used to signal which
-                               application we want to connect to in the HEL/ACK
-                               handshake). */
+
+    /* The discoveryUrl can be different from the EndpointUrl in the client
+     * configuration. The EndpointUrl is used to connect initially, then the
+     * DiscoveryUrl is selected via FindServers. This triggers a reconnect if
+     * EndpointUrl != DiscoveryUrl. */
+    UA_String discoveryUrl;
 
     /* SecureChannel */
     UA_SecureChannel channel;

From 99f56d355220151c4608946d1f0828b374c92e49 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 20 May 2023 14:53:58 +0200
Subject: [PATCH 0945/1963] refactor(client): Simplify disconnect, add async
 SecureChannel disconnect

---
 include/open62541/client.h                |   9 +-
 src/client/ua_client_connect.c            | 164 ++++++++++++----------
 tests/client/check_client_async_connect.c |   5 +-
 3 files changed, 100 insertions(+), 78 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index b3c365fde09..eb83ebf02b9 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -426,11 +426,16 @@ UA_Client_disconnect(UA_Client *client);
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_disconnectAsync(UA_Client *client);
 
-/* Disconnect the SecureChannel but keep the Session intact (if it exists).
- * This is always an async (non-blocking) operation. */
+/* Disconnect the SecureChannel but keep the Session intact (if it exists). */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_disconnectSecureChannel(UA_Client *client);
 
+/* Disconnect the SecureChannel but keep the Session intact (if it exists). This
+ * is an async operation. Iterate the client until the SecureChannel was fully
+ * cleaned up. */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Client_disconnectSecureChannelAsync(UA_Client *client);
+
 /**
  * Discovery
  * --------- */
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index dfe906f3b1a..3cd7a90af42 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -330,14 +330,14 @@ processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
 
     size_t offset = 0;
     UA_TcpErrorMessage errMessage;
-    UA_StatusCode res =
+    client->connectStatus =
         UA_decodeBinaryInternal(chunk, &offset, &errMessage,
                                 &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE], NULL);
-    if(res != UA_STATUSCODE_GOOD) {
+    if(client->connectStatus != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_CHANNEL(&client->config.logger, &client->channel,
                              "Received an ERR response that could not be decoded "
-                             "with StatusCode %s", UA_StatusCode_name(res));
-        client->connectStatus = res;
+                             "with StatusCode %s",
+                             UA_StatusCode_name(client->connectStatus));
         closeSecureChannel(client);
         return;
     }
@@ -557,14 +557,17 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
 }
 
 /* OPN messges to renew the channel are sent asynchronous */
-static UA_StatusCode
+static void
 sendOPNAsync(UA_Client *client, UA_Boolean renew) {
-    if(!UA_SecureChannel_isConnected(&client->channel))
-        return UA_STATUSCODE_BADINTERNALERROR;
+    if(!UA_SecureChannel_isConnected(&client->channel)) {
+        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        return;
+    }
 
-    UA_StatusCode retval = UA_SecureChannel_generateLocalNonce(&client->channel);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    client->connectStatus =
+        UA_SecureChannel_generateLocalNonce(&client->channel);
+    if(client->connectStatus != UA_STATUSCODE_GOOD)
+        return;
 
     /* Prepare the OpenSecureChannelRequest */
     UA_OpenSecureChannelRequest opnSecRq;
@@ -590,33 +593,38 @@ sendOPNAsync(UA_Client *client, UA_Boolean renew) {
     /* Send the OPN message */
     UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_SECURECHANNEL,
                  "Requesting to open a SecureChannel");
-    retval =
+    client->connectStatus =
         UA_SecureChannel_sendAsymmetricOPNMessage(&client->channel, requestId, &opnSecRq,
                                                   &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
-    if(retval != UA_STATUSCODE_GOOD) {
+    if(client->connectStatus != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_SECURECHANNEL,
                       "Sending OPN message failed with error %s",
-                      UA_StatusCode_name(retval));
-        client->connectStatus = retval;
+                      UA_StatusCode_name(client->connectStatus));
         closeSecureChannel(client);
-        return retval;
+        return;
     }
 
+    /* Update the state */
     client->channel.renewState = UA_SECURECHANNELRENEWSTATE_SENT;
     if(client->channel.state < UA_SECURECHANNELSTATE_OPN_SENT)
         client->channel.state = UA_SECURECHANNELSTATE_OPN_SENT;
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_SECURECHANNEL, "OPN message sent");
-    return UA_STATUSCODE_GOOD;
+
+    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_SECURECHANNEL,
+                 "OPN message sent");
 }
 
 UA_StatusCode
 __Client_renewSecureChannel(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     /* Check if OPN has been sent or the SecureChannel is still valid */
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN ||
        client->channel.renewState == UA_SECURECHANNELRENEWSTATE_SENT ||
        client->nextChannelRenewal > UA_DateTime_nowMonotonic())
         return UA_STATUSCODE_GOODCALLAGAIN;
+
     sendOPNAsync(client, true);
+
     return client->connectStatus;
 }
 
@@ -1206,7 +1214,6 @@ initSecurityPolicy(UA_Client *client) {
         sp = getSecurityPolicy(client, client->config.endpoint.securityPolicyUri);
     }
 
-    client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
     if(sp) {
         client->connectStatus =
             UA_SecureChannel_setSecurityPolicy(&client->channel, sp,
@@ -1242,8 +1249,7 @@ connectActivity(UA_Client *client) {
 
         /* ACK receieved. Send OPN. */
     case UA_SECURECHANNELSTATE_ACK_RECEIVED:
-        if(client->connectStatus == UA_STATUSCODE_GOOD)
-            client->connectStatus = sendOPNAsync(client, false); /* Send OPN */
+        sendOPNAsync(client, false); /* Send OPN */
         return;
 
         /* The channel is open -> continue with the Session handling */
@@ -1532,7 +1538,6 @@ initConnect(UA_Client *client) {
 
     /* Initialize the TCP connection */
     UA_String tcpString = UA_STRING("tcp");
-    client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
     for(UA_EventSource *es = client->config.eventLoop->eventSources;
         es != NULL; es = es->next) {
         /* Is this a usable connection manager? */
@@ -1555,13 +1560,17 @@ initConnect(UA_Client *client) {
 
         /* Open the client TCP connection */
         UA_UNLOCK(&client->clientMutex);
-        client->connectStatus =
+        UA_StatusCode res =
             cm->openConnection(cm, &paramMap, client, NULL, __Client_networkCallback);
         UA_LOCK(&client->clientMutex);
-        if(client->connectStatus == UA_STATUSCODE_GOOD)
+        if(res == UA_STATUSCODE_GOOD)
             break;
     }
 
+    /* The channel has not opened */
+    if(client->channel.state == UA_SECURECHANNELSTATE_CLOSED)
+        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+
     /* Opening the TCP connection failed */
     if(client->connectStatus != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
@@ -1868,12 +1877,66 @@ cleanupSession(UA_Client *client) {
     client->sessionState = UA_SESSIONSTATE_CLOSED;
 }
 
+static void
+disconnectSecureChannel(UA_Client *client, UA_Boolean sync) {
+    /* Clean the DiscoveryUrl when the connection is explicitly closed */
+    UA_String_clear(&client->discoveryUrl);
+
+    /* Close the SecureChannel */
+    closeSecureChannel(client);
+
+    /* Manually set the status to closed to prevent an automatic reconnection */
+    if(client->connectStatus == UA_STATUSCODE_GOOD)
+        client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
+
+    /* In the synchronous case, loop until the client has actually closed. */
+    UA_EventLoop *el = client->config.eventLoop;
+    if(sync && el &&
+       el->state != UA_EVENTLOOPSTATE_FRESH &&
+       el->state != UA_EVENTLOOPSTATE_STOPPED) {
+        UA_UNLOCK(&client->clientMutex);
+        while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
+            el->run(el, 100);
+        }
+        UA_LOCK(&client->clientMutex);
+    }
+
+    notifyClientState(client);
+}
+
+UA_StatusCode
+UA_Client_disconnectSecureChannel(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
+    disconnectSecureChannel(client, true);
+    UA_UNLOCK(&client->clientMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Client_disconnectSecureChannelAsync(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
+    disconnectSecureChannel(client, false);
+    UA_UNLOCK(&client->clientMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Client_disconnect(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
+    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
+        sendCloseSession(client);
+    cleanupSession(client);
+    disconnectSecureChannel(client, true);
+    UA_UNLOCK(&client->clientMutex);
+    return UA_STATUSCODE_GOOD;
+}
+
 static void
 closeSessionCallback(UA_Client *client, void *userdata,
                      UA_UInt32 requestId, void *response) {
     UA_LOCK(&client->clientMutex);
     cleanupSession(client);
-    closeSecureChannel(client);
+    disconnectSecureChannel(client, false);
     notifyClientState(client);
     UA_UNLOCK(&client->clientMutex);
 }
@@ -1884,14 +1947,12 @@ UA_Client_disconnectAsync(UA_Client *client) {
 
     if(client->sessionState == UA_SESSIONSTATE_CLOSED ||
        client->sessionState == UA_SESSIONSTATE_CLOSING) {
-        closeSecureChannel(client);
+        disconnectSecureChannel(client, false);
+        notifyClientState(client);
         UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_GOOD;
     }
 
-    /* Clean the DiscoveryUrl */
-    UA_String_clear(&client->discoveryUrl);
-
     /* Set before sending the message to prevent recursion */
     client->sessionState = UA_SESSIONSTATE_CLOSING;
 
@@ -1906,53 +1967,10 @@ UA_Client_disconnectAsync(UA_Client *client) {
         /* Sending the close request failed. Continue to close the connection
          * anyway. */
         cleanupSession(client);
-        closeSecureChannel(client);
-    }
-    notifyClientState(client);
-
-    UA_UNLOCK(&client->clientMutex);
-    return res;
-}
-
-UA_StatusCode
-UA_Client_disconnectSecureChannel(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
-
-    /* Clean the DiscoveryUrl when the connection is explicitly closed */
-    UA_String_clear(&client->discoveryUrl);
-
-    /* Close the SecureChannel */
-    closeSecureChannel(client);
-
-    /* Manually set the status to closed to prevent an automatic reconnection */
-    if(client->connectStatus == UA_STATUSCODE_GOOD)
-        client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
-
-    /* Closing is async. Loop until the client has actually closed. */
-    UA_EventLoop *el = client->config.eventLoop;
-    if(el &&
-       el->state != UA_EVENTLOOPSTATE_FRESH &&
-       el->state != UA_EVENTLOOPSTATE_STOPPED) {
-        UA_UNLOCK(&client->clientMutex);
-        while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
-            el->run(el, 100);
-        }
-        UA_LOCK(&client->clientMutex);
+        disconnectSecureChannel(client, true);
     }
 
     notifyClientState(client);
-
     UA_UNLOCK(&client->clientMutex);
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-UA_Client_disconnect(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);        
-    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
-        sendCloseSession(client);
-    cleanupSession(client);
-    UA_UNLOCK(&client->clientMutex);
-
-    return UA_Client_disconnectSecureChannel(client);
+    return res;
 }
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index 63ceb0e5c5a..d1e80929e46 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -116,14 +116,13 @@ START_TEST(Client_connect_async_abort) {
 
     for(int i = 0; i < UA_SECURECHANNELSTATE_CLOSING; i++) {
         abortState = (UA_SecureChannelState)i;
-        UA_StatusCode retval = UA_Client_connectAsync(client, "opc.tcp://localhost:4840");
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+        UA_Client_connectAsync(client, "opc.tcp://localhost:4840");
 
         UA_SecureChannelState currentState;
         do {
             UA_Server_run_iterate(server, false);
             UA_Client_run_iterate(client, 5);
-            UA_Client_getState(client, &currentState, NULL, &retval);
+            UA_Client_getState(client, &currentState, NULL, NULL);
         } while(currentState != UA_SECURECHANNELSTATE_CLOSED);
     }
 

From 6d181ec0ef54a6090d0b34ec3e96e8ff4626bafd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 20 May 2023 16:27:53 +0200
Subject: [PATCH 0946/1963] refactor(client): Give saner name to
 createSessionCallback

---
 src/client/ua_client_connect.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 3cd7a90af42..7e6503f3103 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1099,8 +1099,8 @@ requestFindServers(UA_Client *client) {
 }
 
 static void
-responseSessionCallback(UA_Client *client, void *userdata,
-                        UA_UInt32 requestId, void *response) {
+createSessionCallback(UA_Client *client, void *userdata,
+                      UA_UInt32 requestId, void *response) {
     UA_LOCK(&client->clientMutex);
 
     UA_CreateSessionResponse *sessionResponse = (UA_CreateSessionResponse*)response;
@@ -1183,7 +1183,7 @@ createSessionAsync(UA_Client *client) {
 
     res = __Client_AsyncService(client, &request,
                                 &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST],
-                                (UA_ClientAsyncServiceCallback)responseSessionCallback,
+                                (UA_ClientAsyncServiceCallback)createSessionCallback,
                                 &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL, NULL);
 
     if(res == UA_STATUSCODE_GOOD)

From 123f0eb973da77f93d110554449fa1f31c3727c8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 21 May 2023 11:24:52 +0200
Subject: [PATCH 0947/1963] feat(client): Add noNewSession option to not create
 a new session automatically

---
 include/open62541/client.h     |  7 ++++--
 src/client/ua_client.c         | 22 +++++++++++++++----
 src/client/ua_client_connect.c | 39 ++++++++++++++++++++++++----------
 3 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index eb83ebf02b9..1074aa090b2 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -108,8 +108,11 @@ typedef struct {
                                   * any matching SecurityPolicy. */
 
     UA_Boolean noSession;   /* Only open a SecureChannel, but no Session */
-    UA_Boolean noReconnect; /* Don't reconnect SecureChannel (and Session) when
-                             * the connection is lost without explicitly closing. */
+    UA_Boolean noReconnect; /* Don't reconnect SecureChannel when the connection
+                             * is lost without explicitly closing. */
+    UA_Boolean noNewSession; /* Don't automatically create a new Session when
+                              * the intial one is lost. Instead abort the
+                              * connection when the Session is lost. */
 
     /**
      * If either endpoint or userTokenPolicy has been set (at least one non-zero
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index ca27d4f920a..f99853f06bc 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -476,14 +476,28 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
         response->responseHeader.serviceResult = retval;
     }
 
-    /* Warn if the Session closed */
+    /* The Session closed. The current response is processed with the return code.
+     * The next request first recreates a session. */
     if(responseType != &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE] &&
        (response->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
         response->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED)) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "Session no longer valid. A new Session is created for the next "
-                       "Service request but we do not re-send the current request.");
+        /* Clean up the session information and reset the state */
         cleanupSession(client);
+
+        if(client->config.noNewSession) {
+            /* Configuration option to not create a new Session. Disconnect the
+             * client. */
+            client->connectStatus = response->responseHeader.serviceResult;
+            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                         "Session cannot be activated with StatusCode %s. "
+                         "The client is configured not to create a new Session.",
+                         UA_StatusCode_name(client->connectStatus));
+            closeSecureChannel(client);
+        } else {
+            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                           "Session no longer valid. A new Session is created for the next "
+                           "Service request but we do not re-send the current request.");
+        }
     }
 
     /* Call the async callback. This is the only thread with access to ac. So we
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 7e6503f3103..bdca28c6636 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -643,21 +643,38 @@ responseActivateSession(UA_Client *client, void *userdata,
 
     UA_ActivateSessionResponse *ar = (UA_ActivateSessionResponse*)response;
     if(ar->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                     "ActivateSession failed with error code %s",
-                     UA_StatusCode_name(ar->responseHeader.serviceResult));
-        if(ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
-           ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
-            /* The session is no longer usable. Create a brand new one. */
-            cleanupSession(client);
+        /* Activating the Session failed */
+        cleanupSession(client);
+
+        /* Configuration option to not create a new Session */
+        if(client->config.noNewSession) {
             UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                         "Session cannot be activated. Create a new Session.");
-            client->connectStatus = createSessionAsync(client);
-        } else {
-            /* Something else is wrong. Give up. */
+                         "Session cannot be activated with StatusCode %s. "
+                         "The client is configured not to create a new Session.",
+                         UA_StatusCode_name(ar->responseHeader.serviceResult));
             client->connectStatus = ar->responseHeader.serviceResult;
             closeSecureChannel(client);
+            UA_UNLOCK(&client->clientMutex);
+            return;
         }
+
+        /* The Session is no longer usable. Create a brand new one. */
+        if(ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
+           ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
+            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                           "Session to be activated no longer exists. Create a new Session.");
+            client->connectStatus = createSessionAsync(client);
+            UA_UNLOCK(&client->clientMutex);
+            return;
+        }
+
+        /* Something else is wrong. Maybe the credentials no longer work. Give up. */
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "Session cannot be activated with StatusCode %s. "
+                     "The client cannot recover from this, closing the connection.",
+                     UA_StatusCode_name(ar->responseHeader.serviceResult));
+        client->connectStatus = ar->responseHeader.serviceResult;
+        closeSecureChannel(client);
         UA_UNLOCK(&client->clientMutex);
         return;
     }

From 6b297c7074e49fdc0139a64b5fb9b0d557ba2e71 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 21 May 2023 11:29:02 +0200
Subject: [PATCH 0948/1963] feat(client): Abort in __Client_AsyncService if
 used without an active Session

But only for the requests that require a session.
---
 src/client/ua_client.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index f99853f06bc..c9d8a46b501 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -764,9 +764,21 @@ __Client_AsyncService(UA_Client *client, const void *request,
                       void *userdata, UA_UInt32 *requestId) {
     UA_LOCK_ASSERT(&client->clientMutex, 1);
 
+    /* Is the SecureChannel connected? */
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
-        UA_LOG_WARNING_CHANNEL(&client->config.logger, &client->channel,
-                               "SecureChannel must be connected before sending requests");
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "SecureChannel must be connected to send request");
+        return UA_STATUSCODE_BADSERVERNOTCONNECTED;
+    }
+
+    /* Do we need a Session for this Service? Is the Session connected? */
+    if(requestType != &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST] &&
+       requestType != &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST] &&
+       requestType != &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST] &&
+       requestType != &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST] &&
+       client->sessionState < UA_SESSIONSTATE_ACTIVATED) {
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "Session must be connected to send a request of this type");
         return UA_STATUSCODE_BADSERVERNOTCONNECTED;
     }
 

From 8af0890d975d4b57f24af1816a7e65eb251278ea Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 21 May 2023 11:30:15 +0200
Subject: [PATCH 0949/1963] refactor(client): Abort in activateSessionAsync if
 session not created

This unifies checks that would need to appear in several places
otherwise.
---
 src/client/ua_client_connect.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index bdca28c6636..c33df5404d5 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -700,6 +700,14 @@ static UA_StatusCode
 activateSessionAsync(UA_Client *client) {
     UA_LOCK_ASSERT(&client->clientMutex, 1);
 
+    if(client->sessionState != UA_SESSIONSTATE_CREATED &&
+       client->sessionState != UA_SESSIONSTATE_ACTIVATED) {
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "Can not activate session, session neither created nor activated. "
+                     "Actual state: '%u'", client->sessionState);
+        return UA_STATUSCODE_BADSESSIONCLOSED;
+    }
+
     UA_ActivateSessionRequest request;
     UA_ActivateSessionRequest_init(&request);
     UA_StatusCode retval =

From 21a73256ff43ab0078c69e7da51f49886ff9ce55 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 21 May 2023 11:30:56 +0200
Subject: [PATCH 0950/1963] refactor(client): Minor whitespace cleanups

---
 src/client/ua_client_connect.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index c33df5404d5..968da8ba2ba 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -716,13 +716,12 @@ activateSessionAsync(UA_Client *client) {
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    if (client->config.sessionLocaleIdsSize && client->config.sessionLocaleIds) {
+    if(client->config.sessionLocaleIdsSize && client->config.sessionLocaleIds) {
         retval = UA_Array_copy(client->config.sessionLocaleIds,
                                client->config.sessionLocaleIdsSize,
                                (void **)&request.localeIds, &UA_TYPES[UA_TYPES_LOCALEID]);
-        if (retval != UA_STATUSCODE_GOOD)
+        if(retval != UA_STATUSCODE_GOOD)
             return retval;
-
         request.localeIdsSize = client->config.sessionLocaleIdsSize;
     }
 

From f9bb09992672bc82014373a8ffa472cb832dd3a5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 21 May 2023 11:31:26 +0200
Subject: [PATCH 0951/1963] refactor(client): Simplify connectSync

---
 src/client/ua_client_connect.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 968da8ba2ba..50daefa3396 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1625,29 +1625,20 @@ connectSync(UA_Client *client) {
     /* Run the EventLoop until connected, connect fail or timeout. Write the
      * iterate result to the connectStatus. So we do not attempt to restore a
      * failed connection during the sync connect. */
-    while(true) {
-        /* If the connection has aborted (bad connectStatus), wait until the
-         * channel is truly closed */
-        if(client->connectStatus != UA_STATUSCODE_GOOD &&
-           client->channel.state == UA_SECURECHANNELSTATE_CLOSED)
-            break;
-
-        /* Sufficiently connected? */
-        if(isFullyConnected(client))
-            break;
+    while(client->connectStatus == UA_STATUSCODE_GOOD &&
+          !isFullyConnected(client)) {
 
         /* Timeout -> abort */
         now = UA_DateTime_nowMonotonic();
         if(maxDate < now) {
-            if(client->connectStatus == UA_STATUSCODE_GOOD)
-                client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
+            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                         "The connection has timed out before it could be fully opened");
+            client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
             closeSecureChannel(client);
+            /* Continue to run. So the SecureChannel is fully closed in the next
+             * EventLoop iteration. */
         }
 
-        /* Aborting. Run the EventLoop with a zero timeout. */
-        if(client->connectStatus != UA_STATUSCODE_GOOD)
-            maxDate = now;
-
         /* Drop into the EventLoop */
         UA_UNLOCK(&client->clientMutex);
         UA_StatusCode res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));

From 89029f56d1c4bff994cf7c9c78d4449c885c4df7 Mon Sep 17 00:00:00 2001
From: engel-bichlerh <hannes.bichler@engelglobal.com>
Date: Sun, 21 May 2023 11:34:09 +0200
Subject: [PATCH 0952/1963] feat(client): Add ActivateSession dedicated client
 API

---
 include/open62541/client.h                    |  37 ++
 src/client/ua_client_connect.c                | 139 +++++
 src/pubsub/ua_pubsub_keystorage.c             |   2 -
 tests/CMakeLists.txt                          |   5 +
 tests/client/check_activateSession.c          | 488 ++++++++++++++++++
 tests/client/check_activateSessionAsync.c     | 182 +++++++
 .../check_subscriptionWithactivateSession.c   | 277 ++++++++++
 7 files changed, 1128 insertions(+), 2 deletions(-)
 create mode 100644 tests/client/check_activateSession.c
 create mode 100644 tests/client/check_activateSessionAsync.c
 create mode 100644 tests/client/check_subscriptionWithactivateSession.c

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 1074aa090b2..21a19f82952 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -439,6 +439,43 @@ UA_Client_disconnectSecureChannel(UA_Client *client);
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_disconnectSecureChannelAsync(UA_Client *client);
 
+/* Get the AuthenticationToken and ServerNonce required to activate the current
+ * Session on a different SecureChannel. */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Client_getSessionAuthenticationToken(UA_Client *client, UA_NodeId *authenticationToken,
+                                        UA_ByteString *serverNonce);
+
+/* Re-activate the current session. A change of prefered locales can be done by
+ * updating the client configuration. */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Client_activateCurrentSession(UA_Client *client);
+
+/* Async version of UA_Client_activateCurrentSession */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Client_activateCurrentSessionAsync(UA_Client *client);
+
+/* Activate an already created Session. This allows a Session to be transferred
+ * from a different client instance. The AuthenticationToken and ServerNonce
+ * must be provided for this. Both can be retrieved for an activated Session
+ * with UA_Client_getSessionAuthenticationToken.
+ *
+ * The UserIdentityToken used for authentication must be identical to the
+ * original activation of the Session. The UserIdentityToken is set in the
+ * client configuration.
+ *
+ * Note the noNewSession option if there should not be a new Session
+ * automatically created when this one closes. */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Client_activateSession(UA_Client *client,
+                          const UA_NodeId authenticationToken,
+                          const UA_ByteString serverNonce);
+
+/* Async version of UA_Client_activateSession */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Client_activateSessionAsync(UA_Client *client,
+                               const UA_NodeId authenticationToken,
+                               const UA_ByteString serverNonce);
+
 /**
  * Discovery
  * --------- */
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 50daefa3396..a43a36854af 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1664,6 +1664,145 @@ __UA_Client_connect(UA_Client *client, UA_Boolean async) {
     return client->connectStatus;
 }
 
+static UA_StatusCode
+activateSessionSync(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
+    UA_DateTime now = UA_DateTime_nowMonotonic();
+    UA_DateTime maxDate = now + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
+
+    /* Try to activate */
+    UA_StatusCode res = activateSessionAsync(client);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    /* EventLoop is started. Otherwise activateSessionAsync would have failed. */
+    UA_EventLoop *el = client->config.eventLoop;
+    UA_assert(el);
+    while(client->sessionState != UA_SESSIONSTATE_ACTIVATED &&
+          client->connectStatus == UA_STATUSCODE_GOOD) {
+
+        /* Timeout -> abort */
+        now = UA_DateTime_nowMonotonic();
+        if(maxDate < now) {
+            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                         "The connection has timed out before it could be fully opened");
+            client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
+            closeSecureChannel(client);
+            /* Continue to run. So the SecureChannel is fully closed in the next
+             * EventLoop iteration. */
+        }
+
+        /* Drop into the EventLoop */
+        UA_UNLOCK(&client->clientMutex);
+        res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
+        UA_LOCK(&client->clientMutex);
+        if(res != UA_STATUSCODE_GOOD) {
+            client->connectStatus = res;
+            closeSecureChannel(client);
+        }
+
+        notifyClientState(client);
+    }
+
+    return client->connectStatus;
+}
+
+UA_StatusCode
+UA_Client_activateCurrentSession(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = activateSessionSync(client);
+    notifyClientState(client);
+    UA_UNLOCK(&client->clientMutex);
+    return res != UA_STATUSCODE_GOOD ? res : client->connectStatus;
+}
+
+UA_StatusCode
+UA_Client_activateCurrentSessionAsync(UA_Client *client) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = activateSessionAsync(client);
+    notifyClientState(client);
+    UA_UNLOCK(&client->clientMutex);
+    return res != UA_STATUSCODE_GOOD ? res : client->connectStatus;
+}
+
+UA_StatusCode
+UA_Client_getSessionAuthenticationToken(UA_Client *client, UA_NodeId *authenticationToken,
+                                        UA_ByteString *serverNonce) {
+    UA_LOCK(&client->clientMutex);
+    if(client->sessionState != UA_SESSIONSTATE_CREATED &&
+       client->sessionState != UA_SESSIONSTATE_ACTIVATED) {
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "There is no current session");
+        UA_UNLOCK(&client->clientMutex);
+        return UA_STATUSCODE_BADSESSIONCLOSED;
+    }
+
+    UA_StatusCode res = UA_NodeId_copy(&client->authenticationToken, authenticationToken);
+    res |= UA_ByteString_copy(&client->remoteNonce, serverNonce);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
+}
+
+static UA_StatusCode
+switchSession(UA_Client *client,
+              const UA_NodeId authenticationToken,
+              const UA_ByteString serverNonce) {
+    /* Check that there is no pending session in the client */
+    if(client->sessionState != UA_SESSIONSTATE_CLOSED) {
+        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                     "Cannot activate a session with a different AuthenticationToken "
+                     "when the client already has a Session.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Replace token and nonce */
+    UA_NodeId_clear(&client->authenticationToken);
+    UA_ByteString_clear(&client->remoteNonce);
+    UA_StatusCode res = UA_NodeId_copy(&authenticationToken, &client->authenticationToken);
+    res |= UA_ByteString_copy(&serverNonce, &client->remoteNonce);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    /* Notify that we have now a created session */
+    client->sessionState = UA_SESSIONSTATE_CREATED;
+    notifyClientState(client);
+
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Client_activateSession(UA_Client *client,
+                          const UA_NodeId authenticationToken,
+                          const UA_ByteString serverNonce) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = switchSession(client, authenticationToken, serverNonce);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&client->clientMutex);
+        return res;
+    }
+    res = activateSessionSync(client);
+    notifyClientState(client);
+    UA_UNLOCK(&client->clientMutex);
+    return res != UA_STATUSCODE_GOOD ? res : client->connectStatus;
+}
+
+UA_StatusCode
+UA_Client_activateSessionAsync(UA_Client *client,
+                               const UA_NodeId authenticationToken,
+                               const UA_ByteString serverNonce) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = switchSession(client, authenticationToken, serverNonce);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&client->clientMutex);
+        return res;
+    }
+    res = activateSessionAsync(client);
+    notifyClientState(client);
+    UA_UNLOCK(&client->clientMutex);
+    return res != UA_STATUSCODE_GOOD ? res : client->connectStatus;
+}
+
 static void
 __Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                          void *application, void **connectionContext,
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index fc1f823df5f..35aa39dc55d 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -645,7 +645,6 @@ onConnect(UA_Client *client, UA_SecureChannelState channelState,
         }
     }
     if(triggerSKSCleanup) {
-        client->noReconnect = true;
         /* call user callback to notify about the status */
         sksClientContext *ctx = (sksClientContext *)client->config.clientContext;
         UA_PubSubKeyStorage *ks = ctx->ks;
@@ -655,7 +654,6 @@ onConnect(UA_Client *client, UA_SecureChannelState channelState,
         UA_Client_disconnectAsync(client);
         addDelayedSksClientCleanupCb(client);
     }
-    return;
 }
 
 static void
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d0a20908f48..dda4944be01 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -411,6 +411,11 @@ ua_add_test(server/check_server_reverseconnect.c)
 # Test Client
 
 ua_add_test(client/check_client.c)
+ua_add_test(client/check_activateSession.c)
+if(UA_ENABLE_SUBSCRIPTIONS)
+    ua_add_test(client/check_subscriptionWithactivateSession.c)
+endif()
+ua_add_test(client/check_activateSessionAsync.c)
 ua_add_test(client/check_client_securechannel.c)
 ua_add_test(client/check_client_async.c)
 ua_add_test(client/check_client_async_connect.c)
diff --git a/tests/client/check_activateSession.c b/tests/client/check_activateSession.c
new file mode 100644
index 00000000000..9ac03545d1f
--- /dev/null
+++ b/tests/client/check_activateSession.c
@@ -0,0 +1,488 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/client_config_default.h>
+#include <open62541/server_config_default.h>
+
+#include "client/ua_client_internal.h"
+#include "ua_server_internal.h"
+
+#include <check.h>
+#include <stdlib.h>
+
+#include "testing_clock.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+static void
+addVariable(size_t size) {
+    /* Define the attribute of the myInteger variable node */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    UA_Int32* array = (UA_Int32*)UA_malloc(size * sizeof(UA_Int32));
+    for(size_t i = 0; i < size; i++)
+        array[i] = (UA_Int32)i;
+    UA_Variant_setArray(&attr.value, array, size, &UA_TYPES[UA_TYPES_INT32]);
+
+    char name[] = "my.variable";
+    attr.description = UA_LOCALIZEDTEXT("en-US", name);
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
+    attr.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
+
+    /* Add the variable node to the information model */
+    UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, name);
+    UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, name);
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_Server_addVariableNode(server, myIntegerNodeId, parentNodeId,
+                              parentReferenceNodeId, myIntegerName,
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              attr, NULL, NULL);
+
+   /* add displayname to variable */
+    UA_Server_writeDisplayName(server, myIntegerNodeId,
+                              UA_LOCALIZEDTEXT("de", "meine.Variable"));
+    UA_free(array);
+}
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+#define VARLENGTH 16366
+
+static void setup(void) {
+    running = true;
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+    addVariable(VARLENGTH);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+static void clearLocale(UA_ClientConfig *config) {
+    if(config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
+        UA_Array_delete(config->sessionLocaleIds,
+                        config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
+    }
+    config->sessionLocaleIds = NULL;
+    config->sessionLocaleIdsSize = 0;
+}
+
+static void changeLocale(UA_Client *client) {
+    UA_LocalizedText loc;
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    clearLocale(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US"); 
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval = UA_Client_activateCurrentSession(client);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    const UA_NodeId nodeIdString = UA_NODEID_STRING(1, "my.variable");
+    retval = UA_Client_readDisplayNameAttribute(client, nodeIdString, &loc);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_LocalizedText newLocaleEng = UA_LOCALIZEDTEXT("en-US", "my.variable");
+    ck_assert(UA_String_equal(&newLocaleEng.locale, &loc.locale));
+    ck_assert(UA_String_equal(&newLocaleEng.text, &loc.text));
+    UA_LocalizedText_clear(&loc);
+
+    clearLocale(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("de"); 
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("en-US");
+    retval = UA_Client_activateCurrentSession(client);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    retval = UA_Client_readDisplayNameAttribute(client, nodeIdString, &loc);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    
+    UA_LocalizedText newLocaleGerm = UA_LOCALIZEDTEXT("de", "meine.Variable");
+    ck_assert(UA_String_equal(&newLocaleGerm.locale, &loc.locale));
+    ck_assert(UA_String_equal(&newLocaleGerm.text, &loc.text));
+    UA_LocalizedText_clear(&loc);
+}
+
+START_TEST(Client_activateSessionWithoutConnect) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+
+    changeLocale(client);
+    ck_assert_uint_eq(server->sessionCount, 0);
+    UA_LocaleId_delete(&config->sessionLocaleIds[0]);
+    UA_LocaleId_delete(&config->sessionLocaleIds[1]);
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(Client_activateSession) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    changeLocale(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(Client_activateSession_username) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval =
+        UA_Client_connectUsername(client, "opc.tcp://localhost:4840", "user1", "password");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    changeLocale(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(Client_read) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    changeLocale(client);
+
+    UA_Variant val;
+    UA_NodeId nodeId = UA_NODEID_STRING(1, "my.variable");
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    ck_assert(val.type == &UA_TYPES[UA_TYPES_INT32]);
+    UA_Int32 *var = (UA_Int32*)val.data;
+    for(size_t i = 0; i < VARLENGTH; i++)
+        ck_assert_uint_eq((size_t)var[i], i);
+    UA_Variant_clear(&val);
+
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(Client_renewSecureChannel) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    changeLocale(client);
+
+    /* Forward the time */
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_fakeSleep((UA_UInt32)((UA_Double)cc->secureChannelLifeTime * 0.8));
+
+    /* Make the client renew the channel */
+    retval = UA_Client_run_iterate(client, 1);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Now read */
+    UA_Variant val;
+    UA_NodeId nodeId = UA_NODEID_STRING(1, "my.variable");
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert(retval == UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_delete(client);
+
+} END_TEST
+
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+START_TEST(Client_renewSecureChannelWithActiveSubscription) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    config->secureChannelLifeTime = 60000;
+
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
+    /* Force the server to send keep alive responses every second to trigg
+     * the client to send new publish requests. Requests from the client
+     * will make the server to change to the new SecurityToken after renewal.
+     */
+    request.requestedPublishingInterval = 1000;
+    request.requestedMaxKeepAliveCount = 1;
+    UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
+                                                                            NULL, NULL, NULL);
+
+    UA_CreateSubscriptionResponse_clear(&response);
+    changeLocale(client);
+
+    /* manually control the server thread */
+    running = false;
+    THREAD_JOIN(server_thread);
+
+    for(int i = 0; i < 15; ++i) {
+        UA_fakeSleep(1000);
+        UA_Server_run_iterate(server, true);
+        retval = UA_Client_run_iterate(client, 1);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    }
+
+    /* run the server in an independent thread again */
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
+ //   UA_Client_disconnect(client);
+    UA_Client_delete(client);
+} END_TEST
+#endif
+
+START_TEST(Client_switch) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    changeLocale(client);
+    UA_Variant val;
+    UA_NodeId nodeId = UA_NODEID_STRING(1, "my.variable");
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_NodeId authenticationToken;
+    UA_ByteString sessionNonce;
+    UA_Client_getSessionAuthenticationToken(client, &authenticationToken,
+                                            &sessionNonce);
+
+    UA_Client *client2 = UA_Client_new();
+    UA_ClientConfig *config2 = UA_Client_getConfig(client2);
+    UA_ClientConfig_setDefault(config2);
+
+    retval = UA_Client_connectSecureChannel(client2, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    retval = UA_Client_activateSession(client2, authenticationToken, sessionNonce);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_ne(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    retval = UA_Client_readValueAttribute(client2, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_NodeId_clear(&authenticationToken);
+    UA_ByteString_clear(&sessionNonce);
+
+    UA_Client_delete(client);
+    UA_Client_delete(client2);
+}
+END_TEST
+
+START_TEST(Client_activateSessionClose) {
+    // restart server
+    teardown();
+    setup();
+    ck_assert_uint_eq(server->sessionCount, 0);
+
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    UA_Variant val;
+    UA_NodeId nodeId = UA_NODEID_STRING(1, "my.variable");
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+    changeLocale(client);
+
+    UA_Client_disconnect(client);
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    changeLocale(client);
+    nodeId = UA_NODEID_STRING(1, "my.variable");
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_delete(client);
+    ck_assert_uint_eq(server->sessionCount, 0);
+}
+END_TEST
+
+START_TEST(Client_activateSessionTimeout) {
+    // restart server
+    teardown();
+    setup();
+    ck_assert_uint_eq(server->sessionCount, 0);
+
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    ck_assert_uint_eq(server->sessionCount, 1);
+    changeLocale(client);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    /* Manually close the connection. The connection is internally closed at the
+     * next iteration of the EventLoop. Hence the next request is sent out. But
+     * the connection "actually closes" before receiving the response. */
+    UA_ConnectionManager *cm = client->channel.connectionManager;
+    uintptr_t connId = client->channel.connectionId;
+    cm->closeConnection(cm, connId);
+
+    UA_Variant_init(&val);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURECHANNELCLOSED);
+
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_delete(client);
+
+    ck_assert_uint_eq(server->sessionCount, 0);
+}
+END_TEST
+
+START_TEST(Client_activateSessionLocaleIds) {
+    // restart server
+    teardown();
+    setup();
+    ck_assert_uint_eq(server->sessionCount, 0);
+
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId*)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en");
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("fr");
+
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    changeLocale(client);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    UA_QualifiedName key = {0, UA_STRING_STATIC("localeIds")};
+    UA_Variant locales;
+    UA_Server_getSessionAttribute(server, &server->sessions.lh_first->session.sessionId,
+                                  key, &locales);
+
+    ck_assert_uint_eq(locales.arrayLength, 2);
+    UA_String *localeIds = (UA_String*)locales.data;
+    ck_assert(UA_String_equal(localeIds, &config->sessionLocaleIds[0]));
+
+    UA_Client_delete(client);
+    ck_assert_uint_eq(server->sessionCount, 0);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Client");
+    TCase *tc_client = tcase_create("Client Basic");
+    tcase_add_checked_fixture(tc_client, setup, teardown);
+    tcase_add_test(tc_client, Client_activateSession);
+    tcase_add_test(tc_client, Client_activateSession_username);
+    tcase_add_test(tc_client, Client_read);
+    tcase_add_test(tc_client, Client_renewSecureChannel);
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+    tcase_add_test(tc_client, Client_renewSecureChannelWithActiveSubscription);
+#endif
+
+    tcase_add_test(tc_client, Client_activateSessionClose);
+    tcase_add_test(tc_client, Client_activateSessionTimeout);
+    tcase_add_test(tc_client, Client_activateSessionLocaleIds);
+    suite_add_tcase(s,tc_client);
+
+    TCase *tc_client_reconnect = tcase_create("Client Session Switch");
+    tcase_add_checked_fixture(tc_client_reconnect, setup, teardown);
+    tcase_add_test(tc_client_reconnect, Client_switch);
+    suite_add_tcase(s,tc_client_reconnect);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/client/check_activateSessionAsync.c b/tests/client/check_activateSessionAsync.c
new file mode 100644
index 00000000000..52de369b13f
--- /dev/null
+++ b/tests/client/check_activateSessionAsync.c
@@ -0,0 +1,182 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel_async.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include "open62541/common.h"
+#include "ua_server_internal.h"
+
+#include "client/ua_client_internal.h"
+
+#include <check.h>
+#include <stdlib.h>
+
+#include "testing_clock.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean connected = false;
+UA_Boolean running;
+#define VARLENGTH 16366
+
+THREAD_HANDLE server_thread;
+
+static void
+addVariable(size_t size) {
+    /* Define the attribute of the myInteger variable node */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    UA_Int32* array = (UA_Int32*)UA_malloc(size * sizeof(UA_Int32));
+    for(size_t i = 0; i < size; i++)
+        array[i] = (UA_Int32)i;
+    UA_Variant_setArray(&attr.value, array, size, &UA_TYPES[UA_TYPES_INT32]);
+
+    char name[] = "my.variable";
+    attr.description = UA_LOCALIZEDTEXT("en-US", name);
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
+    attr.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
+
+    /* Add the variable node to the information model */
+    UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, name);
+    UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, name);
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_Server_addVariableNode(server, myIntegerNodeId, parentNodeId,
+                              parentReferenceNodeId, myIntegerName,
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              attr, NULL, NULL);
+
+    /* add displayname to variable */
+    UA_Server_writeDisplayName(server, myIntegerNodeId,
+                              UA_LOCALIZEDTEXT("de", "meine.Variable"));
+    UA_free(array);
+}
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static void setup(void) {
+    running = true;
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_run_startup(server);
+    addVariable(VARLENGTH);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+static void
+asyncBrowseCallback(UA_Client *Client, void *userdata,
+                  UA_UInt32 requestId, UA_BrowseResponse *response) {
+    UA_UInt16 *asyncCounter = (UA_UInt16*)userdata;
+    (*asyncCounter)++;
+}
+
+static void clearLocale(UA_ClientConfig *config) {
+    if(config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
+        UA_Array_delete(config->sessionLocaleIds,
+                        config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
+    }
+    config->sessionLocaleIds = NULL;
+    config->sessionLocaleIdsSize = 0;
+}
+
+START_TEST(Client_activateSession_async) {
+    UA_StatusCode retval;
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->sessionLocaleIdsSize = 2;
+    cc->sessionLocaleIds = (UA_LocaleId*)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    cc->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US");
+    cc->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_ClientConfig_setDefault(cc);
+
+    connected = false;
+    // connect sync
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    // now join server thread to take control
+    running = false;
+    THREAD_JOIN(server_thread);
+
+    /* try to change locale */
+    clearLocale(cc);
+    cc->sessionLocaleIdsSize = 2;
+    cc->sessionLocaleIds = (UA_LocaleId*)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    cc->sessionLocaleIds[0] = UA_STRING_ALLOC("de");
+    cc->sessionLocaleIds[1] = UA_STRING_ALLOC("en-US");
+    UA_Client_activateCurrentSessionAsync(client);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    // read locale,it must not be changed
+    UA_String loc = LIST_FIRST(&server->sessions)->session.localeIds[0];
+    char *convert = (char *)UA_malloc(sizeof(char) * loc.length + 1);
+    memcpy(convert, loc.data, loc.length);
+    convert[loc.length] = '\0';
+    ck_assert_str_eq(convert, "en-US");
+    UA_free(convert);
+
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    /* Manual clock for unit tests */
+    UA_Server_run_iterate(server, false);
+
+    loc = LIST_FIRST(&server->sessions)->session.localeIds[0];
+    convert = (char *)UA_malloc(sizeof(char) * loc.length + 1);
+    memcpy(convert, loc.data, loc.length);
+    convert[loc.length] = '\0';
+    ck_assert_str_eq(convert, "de");
+    UA_free(convert);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    running = true;
+    // start serverthread again
+    THREAD_CREATE(server_thread, serverloop);
+    // read displayname with changed locale
+    UA_LocalizedText dName;
+    const UA_NodeId nodeIdString = UA_NODEID_STRING(1, "my.variable");
+    retval = UA_Client_readDisplayNameAttribute(client, nodeIdString, &dName);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    
+    UA_LocalizedText newLocaleEng = UA_LOCALIZEDTEXT("de", "meine.Variable");
+    ck_assert(UA_String_equal(&newLocaleEng.locale, &dName.locale));
+    ck_assert(UA_String_equal(&newLocaleEng.text, &dName.text));
+    UA_LocalizedText_clear(&dName);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete (client);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Client");
+    TCase *tc_client_activateSession_async = tcase_create("Client Activate Session Async");
+    tcase_add_checked_fixture(tc_client_activateSession_async, setup, teardown);
+    tcase_add_test(tc_client_activateSession_async, Client_activateSession_async);
+    suite_add_tcase(s,tc_client_activateSession_async);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/client/check_subscriptionWithactivateSession.c b/tests/client/check_subscriptionWithactivateSession.c
new file mode 100644
index 00000000000..0ba057fa6e8
--- /dev/null
+++ b/tests/client/check_subscriptionWithactivateSession.c
@@ -0,0 +1,277 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/client.h>
+#include <open62541/client_highlevel_async.h>
+#include <open62541/client_config_default.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include "client/ua_client_internal.h"
+#include "server/ua_server_internal.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "check.h"
+#include "testing_clock.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+static UA_Boolean noNewSubscription; /* Don't create a subscription when the
+                                        session activates */
+
+#define VARLENGTH 16366
+
+static void
+addVariable(size_t size) {
+    /* Define the attribute of the myInteger variable node */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    UA_Int32* array = (UA_Int32*)UA_malloc(size * sizeof(UA_Int32));
+    for(size_t i = 0; i < size; i++)
+        array[i] = (UA_Int32)i;
+    UA_Variant_setArray(&attr.value, array, size, &UA_TYPES[UA_TYPES_INT32]);
+
+    char name[] = "my.variable";
+    attr.description = UA_LOCALIZEDTEXT("en-US", name);
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
+    attr.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
+
+    /* Add the variable node to the information model */
+    UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, name);
+    UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, name);
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_Server_addVariableNode(server, myIntegerNodeId, parentNodeId,
+                              parentReferenceNodeId, myIntegerName,
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              attr, NULL, NULL);
+
+   /* add displayname to variable */
+    UA_Server_writeDisplayName(server, myIntegerNodeId,
+                              UA_LOCALIZEDTEXT("de", "meine.Variable"));
+    UA_free(array);
+}
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static void setup(void) {
+    noNewSubscription = false;
+    running = true;
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+    config->maxPublishReqPerSession = 5;
+    UA_Server_run_startup(server);
+    addVariable(VARLENGTH);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    if(!server)
+        return;
+
+    running = false;
+    THREAD_JOIN(server_thread);
+
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+    server = NULL;
+}
+
+UA_Boolean notificationReceived = false;
+UA_UInt32 countNotificationReceived = 0;
+UA_Double publishingInterval = 500.0;
+
+static void
+dataChangeHandler(UA_Client *client, UA_UInt32 subId, void *subContext,
+                  UA_UInt32 monId, void *monContext, UA_DataValue *value) {
+    notificationReceived = true;
+    countNotificationReceived++;
+}
+
+static void clearLocale(UA_ClientConfig *config) {
+    if(config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
+        UA_Array_delete(config->sessionLocaleIds,
+                        config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
+    }
+    config->sessionLocaleIds = NULL;
+    config->sessionLocaleIdsSize = 0;
+}
+
+static void changeLocale(UA_Client *client) {
+    UA_LocalizedText loc;
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    clearLocale(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("en-US"); 
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("de");
+    UA_StatusCode retval = UA_Client_activateCurrentSession(client);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    const UA_NodeId nodeIdString = UA_NODEID_STRING(1, "my.variable");
+    retval = UA_Client_readDisplayNameAttribute(client, nodeIdString, &loc);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_LocalizedText newLocaleEng = UA_LOCALIZEDTEXT("en-US", "my.variable");
+    ck_assert(UA_String_equal(&newLocaleEng.locale, &loc.locale));
+    ck_assert(UA_String_equal(&newLocaleEng.text, &loc.text));
+    UA_LocalizedText_clear(&loc);
+
+    clearLocale(config);
+    config->sessionLocaleIdsSize = 2;
+    config->sessionLocaleIds = (UA_LocaleId *)UA_Array_new(2, &UA_TYPES[UA_TYPES_LOCALEID]);
+    config->sessionLocaleIds[0] = UA_STRING_ALLOC("de"); 
+    config->sessionLocaleIds[1] = UA_STRING_ALLOC("en-US");
+    retval = UA_Client_activateCurrentSession(client);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    retval = UA_Client_readDisplayNameAttribute(client, nodeIdString, &loc);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    
+    UA_LocalizedText newLocaleGerm = UA_LOCALIZEDTEXT("de", "meine.Variable");
+    ck_assert(UA_String_equal(&newLocaleGerm.locale, &loc.locale));
+    ck_assert(UA_String_equal(&newLocaleGerm.text, &loc.text));
+    UA_LocalizedText_clear(&loc);
+}
+
+START_TEST(Client_subscription_createDataChanges) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
+    UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
+                                                                            NULL, NULL, NULL);
+    ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    changeLocale(client);
+    UA_UInt32 subId = response.subscriptionId;
+
+    UA_MonitoredItemCreateRequest items[3];
+    UA_UInt32 newMonitoredItemIds[3];
+    UA_Client_DataChangeNotificationCallback callbacks[3];
+    UA_Client_DeleteMonitoredItemCallback deleteCallbacks[3];
+    void *contexts = NULL;
+    changeLocale(client);
+
+    /* monitor the server state */
+    items[0] = UA_MonitoredItemCreateRequest_default(UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE));
+    callbacks[0] = dataChangeHandler;
+    deleteCallbacks[0] = NULL;
+
+    /* monitor invalid node */
+    items[1] = UA_MonitoredItemCreateRequest_default(UA_NODEID_NUMERIC(0, 999999));
+    callbacks[1] = dataChangeHandler;
+    deleteCallbacks[1] = NULL;
+
+    /* monitor current time */
+    items[2] = UA_MonitoredItemCreateRequest_default(UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME));
+    callbacks[2] = dataChangeHandler;
+ 
+    deleteCallbacks[2] = NULL;
+
+    UA_CreateMonitoredItemsRequest createRequest;
+    UA_CreateMonitoredItemsRequest_init(&createRequest);
+    createRequest.subscriptionId = subId;
+    createRequest.timestampsToReturn = UA_TIMESTAMPSTORETURN_BOTH;
+    createRequest.itemsToCreate = items;
+    createRequest.itemsToCreateSize = 3;
+    UA_CreateMonitoredItemsResponse createResponse =
+        UA_Client_MonitoredItems_createDataChanges(client, createRequest, NULL,
+                                                   callbacks, deleteCallbacks);
+
+    ck_assert_uint_eq(createResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(createResponse.resultsSize, 3);
+    ck_assert_uint_eq(createResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
+    newMonitoredItemIds[0] = createResponse.results[0].monitoredItemId;
+    ck_assert_uint_eq(createResponse.results[1].statusCode, UA_STATUSCODE_BADNODEIDUNKNOWN);
+    newMonitoredItemIds[1] = createResponse.results[1].monitoredItemId;
+    ck_assert_uint_eq(newMonitoredItemIds[1], 0);
+    ck_assert_uint_eq(createResponse.results[2].statusCode, UA_STATUSCODE_GOOD);
+    newMonitoredItemIds[2] = createResponse.results[2].monitoredItemId;
+    ck_assert_uint_eq(createResponse.results[2].statusCode, UA_STATUSCODE_GOOD);
+    UA_CreateMonitoredItemsResponse_clear(&createResponse);
+
+    changeLocale(client);
+    /* manually control the server thread */
+    running = false;
+    THREAD_JOIN(server_thread);
+
+    retval = UA_Client_run_iterate(client, 1);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    UA_Server_run_iterate(server, true);
+
+    notificationReceived = false;
+    countNotificationReceived = 0;
+    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    retval = UA_Client_run_iterate(client, 1);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(notificationReceived, true);
+    ck_assert_uint_eq(countNotificationReceived, 2);
+
+    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    UA_Server_run_iterate(server, true);
+
+    notificationReceived = false;
+    retval = UA_Client_run_iterate(client, 1);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(notificationReceived, true);
+    ck_assert_uint_eq(countNotificationReceived, 3);
+
+    /* run the server in an independent thread again */
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
+    UA_DeleteMonitoredItemsRequest deleteRequest;
+    UA_DeleteMonitoredItemsRequest_init(&deleteRequest);
+    deleteRequest.subscriptionId = subId;
+    deleteRequest.monitoredItemIds = newMonitoredItemIds;
+    deleteRequest.monitoredItemIdsSize = 3;
+
+    UA_DeleteMonitoredItemsResponse deleteResponse =
+        UA_Client_MonitoredItems_delete(client, deleteRequest);
+
+    ck_assert_uint_eq(deleteResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(deleteResponse.resultsSize, 3);
+    ck_assert_uint_eq(deleteResponse.results[0], UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(deleteResponse.results[1], UA_STATUSCODE_BADMONITOREDITEMIDINVALID);
+    ck_assert_uint_eq(deleteResponse.results[2], UA_STATUSCODE_GOOD);
+
+    UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
+
+    retval = UA_Client_Subscriptions_deleteSingle(client, subId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Client_delete(client);
+}
+END_TEST
+
+static Suite* testSuite_Client(void) {
+    Suite *s = suite_create("Client Subscription");
+    TCase *tc_client = tcase_create("Client Subscription Basic");
+    tcase_add_checked_fixture(tc_client, setup, teardown);
+    tcase_add_test(tc_client, Client_subscription_createDataChanges);
+    suite_add_tcase(s, tc_client);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_Client();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 6d56ab5a8f47d65376c34addf82968315c7d9ff6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 21 May 2023 14:01:35 +0200
Subject: [PATCH 0953/1963] feat(plugin): An existing Session can only be
 re-activated with the same UserIdentityToken

---
 .../open62541/plugin/accesscontrol_default.h  |  7 +-
 plugins/ua_accesscontrol_default.c            | 86 +++++++++++--------
 tests/pubsub/check_pubsub_sks_client.c        | 18 ++--
 tests/pubsub/check_pubsub_sks_pull.c          | 19 ++--
 4 files changed, 77 insertions(+), 53 deletions(-)

diff --git a/plugins/include/open62541/plugin/accesscontrol_default.h b/plugins/include/open62541/plugin/accesscontrol_default.h
index f788e7fd230..0af5e271b28 100644
--- a/plugins/include/open62541/plugin/accesscontrol_default.h
+++ b/plugins/include/open62541/plugin/accesscontrol_default.h
@@ -18,8 +18,11 @@ typedef struct {
     UA_String password;
 } UA_UsernamePasswordLogin;
 
-/* Default access control. The log-in can be anonymous or username-password. A
- * logged-in user has all access rights.
+/* Default access control. The login can be anonymous, username-password or
+ * certificate-based. A logged-in user has all access rights.
+ *
+ * The plugin stores the UserIdentityToken in the session context. So that
+ * cannot be used for other purposes.
  *
  * The certificate verification plugin lifecycle is moved to the access control
  * system. So it is cleared up eventually together with the AccessControl. */
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index b66cf9f059c..4db5667f638 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -45,21 +45,34 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
     AccessControlContext *context = (AccessControlContext*)ac->context;
 
     /* The empty token is interpreted as anonymous */
+    UA_AnonymousIdentityToken anonToken;
+    UA_ExtensionObject tmpIdentity;
     if(userIdentityToken->encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
-        if(!context->allowAnonymous)
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        /* No userdata atm */
-        *sessionContext = NULL;
-        return UA_STATUSCODE_GOOD;
+        UA_AnonymousIdentityToken_init(&anonToken);
+        UA_ExtensionObject_init(&tmpIdentity);
+        UA_ExtensionObject_setValueNoDelete(&tmpIdentity,
+                                            &anonToken,
+                                            &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+        userIdentityToken = &tmpIdentity;
     }
 
     /* Could the token be decoded? */
     if(userIdentityToken->encoding < UA_EXTENSIONOBJECT_DECODED)
         return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
-    /* Anonymous login */
-    if(userIdentityToken->content.decoded.type == &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
+    /* If the session has been activated before, the same (decoded)
+     * UserIdentityToken must be used. */
+    if(*sessionContext) {
+        UA_ExtensionObject *oldUserIdentityToken = *(UA_ExtensionObject**)sessionContext;
+        if(UA_order(userIdentityToken, oldUserIdentityToken,
+                    &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) != UA_ORDER_EQ)
+            return UA_STATUSCODE_BADUSERACCESSDENIED;
+        return UA_STATUSCODE_GOOD;
+    }
+
+    const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
+    if(tokenType == &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
+        /* Anonymous login */
         if(!context->allowAnonymous)
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
@@ -71,17 +84,10 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
          * policyId == ANONYMOUS_POLICY */
         if(token->policyId.data && !UA_String_equal(&token->policyId, &anonymous_policy))
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        /* No userdata atm */
-        *sessionContext = NULL;
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* Username and password */
-    if(userIdentityToken->content.decoded.type == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
+    } else if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
+        /* Username and password */
         const UA_UserNameIdentityToken *userToken =
             (UA_UserNameIdentityToken*)userIdentityToken->content.decoded.data;
-
         if(!UA_String_equal(&userToken->policyId, &username_policy))
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
@@ -96,25 +102,18 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         /* Try to match username/pw */
         UA_Boolean match = false;
         for(size_t i = 0; i < context->usernamePasswordLoginSize; i++) {
-            if(UA_String_equal(&userToken->userName, &context->usernamePasswordLogin[i].username) &&
-               UA_String_equal(&userToken->password, &context->usernamePasswordLogin[i].password)) {
+            if(UA_String_equal(&userToken->userName,
+                               &context->usernamePasswordLogin[i].username) &&
+               UA_String_equal(&userToken->password,
+                               &context->usernamePasswordLogin[i].password)) {
                 match = true;
                 break;
             }
         }
         if(!match)
             return UA_STATUSCODE_BADUSERACCESSDENIED;
-
-        /* For the CTT, recognize whether two sessions are  */
-        UA_ByteString *username = UA_ByteString_new();
-        if(username)
-            UA_ByteString_copy(&userToken->userName, username);
-        *sessionContext = username;
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* x509 certificate */
-    if(userIdentityToken->content.decoded.type == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
+    } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
+        /* x509 certificate */
         const UA_X509IdentityToken *userToken = (UA_X509IdentityToken*)
             userIdentityToken->content.decoded.data;
 
@@ -124,20 +123,35 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         if(!context->verifyX509.verifyCertificate)
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
-        return context->verifyX509.
+        UA_StatusCode res = context->verifyX509.
             verifyCertificate(&context->verifyX509,
                               &userToken->certificateData);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+    } else {
+        /* Unsupported token type */
+        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+    }
+
+    /* Login successful. Store the token in the context. */
+    UA_ExtensionObject *tokenCopy = UA_ExtensionObject_new();
+    if(!tokenCopy)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    UA_StatusCode res = UA_ExtensionObject_copy(userIdentityToken, tokenCopy);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_ExtensionObject_delete(tokenCopy);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
     }
+    *sessionContext = tokenCopy;
 
-    /* Unsupported token type */
-    return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+    return UA_STATUSCODE_GOOD;
 }
 
 static void
 closeSession_default(UA_Server *server, UA_AccessControl *ac,
                      const UA_NodeId *sessionId, void *sessionContext) {
     if(sessionContext)
-        UA_ByteString_delete((UA_ByteString*)sessionContext);
+        UA_ExtensionObject_delete((UA_ExtensionObject*)sessionContext);
 }
 
 static UA_UInt32
@@ -212,8 +226,8 @@ allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
     if(oldSessionContext == newSessionContext)
         return true;
     if(oldSessionContext && newSessionContext)
-        return UA_ByteString_equal((UA_ByteString*)oldSessionContext,
-                                   (UA_ByteString*)newSessionContext);
+        return (UA_order(oldSessionContext, newSessionContext,
+                         &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) == UA_ORDER_EQ);
     return false;
 }
 #endif
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index 24a510ab7e4..cfd827d0513 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -104,13 +104,17 @@ getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
                               const UA_NodeId *sessionId, void *sessionContext,
                               const UA_NodeId *methodId, void *methodContext,
                               const UA_NodeId *objectId, void *objectContext) {
-    if(objectContext && sessionContext) {
-        UA_ByteString *username = (UA_ByteString *)objectContext;
-        UA_ByteString *sessionUsername = (UA_ByteString *)sessionContext;
-        if(!UA_ByteString_equal(username, sessionUsername))
-            return false;
-    }
-    return true;
+    if(!objectContext)
+        return true;
+    if(!sessionContext)
+        return false;
+    UA_ExtensionObject *userIdentityToken = (UA_ExtensionObject*)sessionContext;
+    if(userIdentityToken->content.decoded.type != &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN])
+        return false;
+    UA_UserNameIdentityToken *token = (UA_UserNameIdentityToken*)
+        userIdentityToken->content.decoded.data;
+    UA_ByteString *username = (UA_ByteString *)objectContext;
+    return UA_ByteString_equal(username, &token->userName);
 }
 
 static void
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index 6cce2016883..3abe62b73d4 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -70,14 +70,17 @@ getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
                               const UA_NodeId *sessionId, void *sessionContext,
                               const UA_NodeId *methodId, void *methodContext,
                               const UA_NodeId *objectId, void *objectContext) {
-    /* For the CTT, recognize whether two sessions are  */
-    if(objectContext && sessionContext) {
-        UA_ByteString *username = (UA_ByteString *)objectContext;
-        UA_ByteString *sessionUsername = (UA_ByteString *)sessionContext;
-        if(!UA_ByteString_equal(username, sessionUsername))
-            return false;
-    }
-    return true;
+    if(!objectContext)
+        return true;
+    if(!sessionContext)
+        return false;
+    UA_ExtensionObject *userIdentityToken = (UA_ExtensionObject*)sessionContext;
+    if(userIdentityToken->content.decoded.type != &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN])
+        return false;
+    UA_UserNameIdentityToken *token = (UA_UserNameIdentityToken*)
+        userIdentityToken->content.decoded.data;
+    UA_ByteString *username = (UA_ByteString *)objectContext;
+    return UA_ByteString_equal(username, &token->userName);
 }
 
 static void

From cab8a9bfada23247e6b0471f83735f861e146f2e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 21 May 2023 14:31:13 +0200
Subject: [PATCH 0954/1963] refactor(client): Rename remoteNonce and localNonce
 with serverSessionNonce and clientSessionNonce

---
 src/client/ua_client.c          |  4 +--
 src/client/ua_client_connect.c  | 47 ++++++++++++++++++---------------
 src/client/ua_client_internal.h |  4 +--
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index c9d8a46b501..e5fe32e2ede 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -241,8 +241,8 @@ UA_Client_clear(UA_Client *client) {
     UA_Client_disconnect(client);
     UA_String_clear(&client->discoveryUrl);
 
-    UA_String_clear(&client->remoteNonce);
-    UA_String_clear(&client->localNonce);
+    UA_String_clear(&client->serverSessionNonce);
+    UA_String_clear(&client->clientSessionNonce);
 
     /* Delete the subscriptions */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index a43a36854af..be3a5cf8818 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -112,7 +112,8 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
         return retval;
 
     /* Allocate a temporary buffer */
-    size_t dataToSignSize = channel->remoteCertificate.length + client->remoteNonce.length;
+    size_t dataToSignSize = channel->remoteCertificate.length +
+        client->serverSessionNonce.length;
     if(dataToSignSize > MAX_DATA_SIZE)
         return UA_STATUSCODE_BADINTERNALERROR;
 
@@ -125,7 +126,7 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
     memcpy(dataToSign.data, channel->remoteCertificate.data,
            channel->remoteCertificate.length);
     memcpy(dataToSign.data + channel->remoteCertificate.length,
-           client->remoteNonce.data, client->remoteNonce.length);
+           client->serverSessionNonce.data, client->serverSessionNonce.length);
     retval = sp->certificateSigningAlgorithm.sign(channel->channelContext,
                                                   &dataToSign, &sd->signature);
     if(retval != UA_STATUSCODE_GOOD)
@@ -161,7 +162,8 @@ if(client->config.userTokenPolicy.tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
         return retval;
 
     /* Allocate a temporary buffer */
-    size_t userTokenSignSize = channel->remoteCertificate.length + client->remoteNonce.length;
+    size_t userTokenSignSize = channel->remoteCertificate.length +
+        client->serverSessionNonce.length;
     if(dataToSignSize > MAX_DATA_SIZE)
         return UA_STATUSCODE_BADINTERNALERROR;
 
@@ -174,7 +176,7 @@ if(client->config.userTokenPolicy.tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
     memcpy(userTokenSign.data, channel->remoteCertificate.data,
            channel->remoteCertificate.length);
     memcpy(userTokenSign.data + channel->remoteCertificate.length,
-           client->remoteNonce.data, client->remoteNonce.length);
+           client->serverSessionNonce.data, client->serverSessionNonce.length);
     retval = utpSecurityPolicy->certificateSigningAlgorithm.sign(tempChannelContext,
                                                   &userTokenSign, &utsd->signature);
     /* Clean up */
@@ -233,7 +235,8 @@ encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPo
         encryptionAlgorithm.getRemotePlainTextBlockSize(channelContext);
     size_t encryptedBlockSize = sp->asymmetricModule.cryptoModule.
         encryptionAlgorithm.getRemoteBlockSize(channelContext);
-    UA_UInt32 length = (UA_UInt32)(tokenData->length + client->remoteNonce.length);
+    UA_UInt32 length = (UA_UInt32)(tokenData->length +
+                                   client->serverSessionNonce.length);
     UA_UInt32 totalLength = length + 4; /* Including the length field */
     size_t blocks = totalLength / plainTextBlockSize;
     if(totalLength % plainTextBlockSize != 0)
@@ -252,7 +255,8 @@ encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPo
     const UA_Byte *end = &encrypted.data[encrypted.length];
     retval = UA_UInt32_encodeBinary(&length, &pos, end);
     memcpy(pos, tokenData->data, tokenData->length);
-    memcpy(&pos[tokenData->length], client->remoteNonce.data, client->remoteNonce.length);
+    memcpy(&pos[tokenData->length], client->serverSessionNonce.data,
+           client->serverSessionNonce.length);
     UA_assert(retval == UA_STATUSCODE_GOOD);
 
     /* Add padding
@@ -302,15 +306,15 @@ checkCreateSessionSignature(UA_Client *client, const UA_SecureChannel *channel,
     const UA_SecurityPolicy *sp = channel->securityPolicy;
     const UA_ByteString *lc = &sp->localCertificate;
 
-    size_t dataToVerifySize = lc->length + client->localNonce.length;
+    size_t dataToVerifySize = lc->length + client->clientSessionNonce.length;
     UA_ByteString dataToVerify = UA_BYTESTRING_NULL;
     UA_StatusCode retval = UA_ByteString_allocBuffer(&dataToVerify, dataToVerifySize);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
     memcpy(dataToVerify.data, lc->data, lc->length);
-    memcpy(dataToVerify.data + lc->length,
-           client->localNonce.data, client->localNonce.length);
+    memcpy(dataToVerify.data + lc->length, client->clientSessionNonce.data,
+           client->clientSessionNonce.length);
 
     retval = sp->certificateSigningAlgorithm.verify(channel->channelContext, &dataToVerify,
                                                     &response->serverSignature.signature);
@@ -680,8 +684,8 @@ responseActivateSession(UA_Client *client, void *userdata,
     }
 
     /* Replace the nonce */
-    UA_ByteString_clear(&client->remoteNonce);
-    client->remoteNonce = ar->serverNonce;
+    UA_ByteString_clear(&client->serverSessionNonce);
+    client->serverSessionNonce = ar->serverNonce;
     UA_ByteString_init(&ar->serverNonce);
 
     client->sessionState = UA_SESSIONSTATE_ACTIVATED;
@@ -1151,9 +1155,10 @@ createSessionCallback(UA_Client *client, void *userdata,
 #endif
 
     /* Copy nonce and AuthenticationToken */
-    UA_ByteString_clear(&client->remoteNonce);
+    UA_ByteString_clear(&client->serverSessionNonce);
     UA_NodeId_clear(&client->authenticationToken);
-    res |= UA_ByteString_copy(&sessionResponse->serverNonce, &client->remoteNonce);
+    res |= UA_ByteString_copy(&sessionResponse->serverNonce,
+                              &client->serverSessionNonce);
     res |= UA_NodeId_copy(&sessionResponse->authenticationToken,
                           &client->authenticationToken);
     if(res != UA_STATUSCODE_GOOD)
@@ -1178,16 +1183,16 @@ createSessionAsync(UA_Client *client) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
-        if(client->localNonce.length != UA_SESSION_LOCALNONCELENGTH) {
-           UA_ByteString_clear(&client->localNonce);
-            res = UA_ByteString_allocBuffer(&client->localNonce,
+        if(client->clientSessionNonce.length != UA_SESSION_LOCALNONCELENGTH) {
+           UA_ByteString_clear(&client->clientSessionNonce);
+            res = UA_ByteString_allocBuffer(&client->clientSessionNonce,
                                             UA_SESSION_LOCALNONCELENGTH);
             if(res != UA_STATUSCODE_GOOD)
                 return res;
         }
         res = client->channel.securityPolicy->symmetricModule.
                  generateNonce(client->channel.securityPolicy->policyContext,
-                               &client->localNonce);
+                               &client->clientSessionNonce);
         if(res != UA_STATUSCODE_GOOD)
             return res;
     }
@@ -1195,7 +1200,7 @@ createSessionAsync(UA_Client *client) {
     /* Prepare and send the request */
     UA_CreateSessionRequest request;
     UA_CreateSessionRequest_init(&request);
-    request.clientNonce = client->localNonce;
+    request.clientNonce = client->clientSessionNonce;
     request.requestedSessionTimeout = client->config.requestedSessionTimeout;
     request.maxResponseMessageSize = UA_INT32_MAX;
     request.endpointUrl = client->config.endpoint.endpointUrl;
@@ -1739,7 +1744,7 @@ UA_Client_getSessionAuthenticationToken(UA_Client *client, UA_NodeId *authentica
     }
 
     UA_StatusCode res = UA_NodeId_copy(&client->authenticationToken, authenticationToken);
-    res |= UA_ByteString_copy(&client->remoteNonce, serverNonce);
+    res |= UA_ByteString_copy(&client->serverSessionNonce, serverNonce);
     UA_UNLOCK(&client->clientMutex);
     return res;
 }
@@ -1758,9 +1763,9 @@ switchSession(UA_Client *client,
 
     /* Replace token and nonce */
     UA_NodeId_clear(&client->authenticationToken);
-    UA_ByteString_clear(&client->remoteNonce);
+    UA_ByteString_clear(&client->serverSessionNonce);
     UA_StatusCode res = UA_NodeId_copy(&authenticationToken, &client->authenticationToken);
-    res |= UA_ByteString_copy(&serverNonce, &client->remoteNonce);
+    res |= UA_ByteString_copy(&serverNonce, &client->serverSessionNonce);
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index edb4f770c50..63ecdceec62 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -153,8 +153,8 @@ struct UA_Client {
     UA_SessionState sessionState;
     UA_NodeId authenticationToken;
     UA_UInt32 requestHandle;
-    UA_ByteString remoteNonce;
-    UA_ByteString localNonce;
+    UA_ByteString serverSessionNonce;
+    UA_ByteString clientSessionNonce;
 
     /* Connectivity check */
     UA_DateTime lastConnectivityCheck;

From e648747f8fc6b435ee6ee99817032a8ca392933a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 31 May 2023 22:52:02 +0200
Subject: [PATCH 0955/1963] fix(pubsub): Enable SKS build with
 UA_ENABLE_PUBSUB_INFORMATIONMODEL disabled

---
 src/pubsub/ua_pubsub_securitygroup.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 6e7364e2a14..443512b1eba 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -228,12 +228,14 @@ addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
     memset(newSecurityGroup, 0, sizeof(UA_SecurityGroup));
     UA_SecurityGroupConfig_copy(securityGroupConfig, &newSecurityGroup->config);
 
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     retval = UA_NodeId_copy(&securityGroupFolderNodeId,
                             &newSecurityGroup->securityGroupFolderId);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_SecurityGroup_delete(newSecurityGroup);
         return retval;
     }
+#endif
 
     retval = UA_String_copy(&securityGroupConfig->securityGroupName,
                             &newSecurityGroup->securityGroupId);
@@ -303,7 +305,9 @@ static void
 UA_SecurityGroup_clear(UA_SecurityGroup *securityGroup) {
     UA_SecurityGroupConfig_clear(&securityGroup->config);
     UA_String_clear(&securityGroup->securityGroupId);
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     UA_NodeId_clear(&securityGroup->securityGroupFolderId);
+#endif
     UA_NodeId_clear(&securityGroup->securityGroupNodeId);
 }
 

From eecaccd3830ecf209ce53bdb5b7f42fdeef84ca4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 31 May 2023 22:52:26 +0200
Subject: [PATCH 0956/1963] refactor(pubsub): Small cleanup in
 addSecurityGroupRepresentation

---
 src/pubsub/ua_pubsub_ns0.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 09fd0bc1046..731010fdbdf 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1713,33 +1713,28 @@ addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGrou
     if(securityGroupConfig->securityGroupName.length <= 0)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    size_t sgNamelength = securityGroupConfig->securityGroupName.length;
-    char *sgName = (char *)UA_calloc(1, sgNamelength + 1);
-    if(!sgName)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
-    memcpy(sgName, securityGroupConfig->securityGroupName.data,
-           securityGroupConfig->securityGroupName.length);
-    sgName[securityGroupConfig->securityGroupName.length] = '\0';
+    UA_QualifiedName browseName;
+    UA_QualifiedName_init(&browseName);
+    browseName.name = securityGroupConfig->securityGroupName;
 
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
-    object_attr.displayName = UA_LOCALIZEDTEXT("", sgName);
+    object_attr.displayName.text = securityGroupConfig->securityGroupName;
     UA_NodeId refType = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
     UA_NodeId nodeType = UA_NODEID_NUMERIC(0, UA_NS0ID_SECURITYGROUPTYPE);
     retval = addNode(server, UA_NODECLASS_OBJECT, UA_NODEID_NULL,
                      securityGroup->securityGroupFolderId, refType,
-                     UA_QUALIFIEDNAME(0, sgName), nodeType, &object_attr,
+                     browseName, nodeType, &object_attr,
                      &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL,
                      &securityGroup->securityGroupNodeId);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "Add SecurityGroup failed with error: %s.",
                      UA_StatusCode_name(retval));
-        UA_free(sgName);
         return retval;
     }
 
-    retval = updateSecurityGroupProperties(server, &securityGroup->securityGroupNodeId,
+    retval = updateSecurityGroupProperties(server,
+                                           &securityGroup->securityGroupNodeId,
                                            securityGroupConfig);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
@@ -1747,7 +1742,6 @@ addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGrou
                      UA_StatusCode_name(retval));
         deleteNode(server, securityGroup->securityGroupNodeId, true);
     }
-    UA_free(sgName);
     return retval;
 }
 

From 2d3e1b06165c893bbb275e8bb6d579bc33663f41 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 1 Jun 2023 22:05:04 +0200
Subject: [PATCH 0957/1963] fix(pubsub): Require IntegerId type to build pubsub
 ns0

---
 tools/schema/datatypes_pubsub.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/schema/datatypes_pubsub.txt b/tools/schema/datatypes_pubsub.txt
index 7a3e17fc950..e6dc2fd15ca 100644
--- a/tools/schema/datatypes_pubsub.txt
+++ b/tools/schema/datatypes_pubsub.txt
@@ -55,3 +55,4 @@ DatagramConnectionTransportDataType
 DatagramWriterGroupTransportDataType
 DatagramWriterGroupTransport2DataType
 DatagramConnectionTransport2DataType
+IntegerId

From 90271982a0ca278bd9887c5ca131ebe06c962d83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jun 2023 00:59:20 +0000
Subject: [PATCH 0958/1963] build(deps): bump deps/nodesetLoader from `4148d22`
 to `ddfb56a`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `4148d22` to `ddfb56a`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/4148d22cb41d07f28d38c9517336f6ff0187f474...ddfb56a8ed5ba2f1e6bac7d5a947275924706709)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index 4148d22cb41..ddfb56a8ed5 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit 4148d22cb41d07f28d38c9517336f6ff0187f474
+Subproject commit ddfb56a8ed5ba2f1e6bac7d5a947275924706709

From 9d219c6cfe3e1c744c6c7b46906245295a8b85e5 Mon Sep 17 00:00:00 2001
From: douwefaber <douwefaber@users.noreply.github.com>
Date: Fri, 9 Jun 2023 17:20:20 +0200
Subject: [PATCH 0959/1963] fix(client): Replace HDA dataEncoding with empty
 string (#5807)

Fetching HDA did not work while UAExpert did. Used Wireshark to analyze
the difference.
---
 src/client/ua_client_highlevel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index c4e4d368e6d..5622894c50d 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -474,7 +474,7 @@ __UA_Client_HistoryRead(UA_Client *client, const UA_NodeId *nodeId,
     item.nodeId = *nodeId;
     item.indexRange = indexRange;
     item.continuationPoint = continuationPoint;
-    item.dataEncoding = UA_QUALIFIEDNAME(0, "Default Binary");
+    item.dataEncoding = UA_QUALIFIEDNAME(0, "");
 
     UA_HistoryReadRequest request;
     UA_HistoryReadRequest_init(&request);

From f481959ca3330fb24f81e23383a5e007f68e9fe3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jun 2023 01:00:34 +0000
Subject: [PATCH 0960/1963] build(deps): bump deps/nodesetLoader from `ddfb56a`
 to `2f45419`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `ddfb56a` to `2f45419`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/ddfb56a8ed5ba2f1e6bac7d5a947275924706709...2f454192d7b920666c5c8a47e86beabc4fca3304)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index ddfb56a8ed5..2f454192d7b 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit ddfb56a8ed5ba2f1e6bac7d5a947275924706709
+Subproject commit 2f454192d7b920666c5c8a47e86beabc4fca3304

From 105eeab590aaf9edcfbc7e5ea9a313ba023cffd4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 30 May 2023 09:50:18 +0200
Subject: [PATCH 0961/1963] fix(el): Fix a memleak in eventloop_mqtt.c

---
 arch/eventloop_mqtt.c | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index 29e19a90f77..d9c82de3d0e 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -195,9 +195,6 @@ MQTT_eventSourceStart(UA_ConnectionManager *cm) {
     return UA_STATUSCODE_BADINTERNALERROR;
 }
 
-static void
-removeTopicConnection(MQTTTopicConnection *tc);
-
 static void
 shutdownBrokerConnection(MQTTBrokerConnection *bc) {
     if(bc->tcpConnectionState != UA_CONNECTIONSTATE_CLOSED &&
@@ -319,6 +316,12 @@ removeTopicConnection(MQTTTopicConnection *tc) {
         shutdownBrokerConnection(bc);
 }
 
+static void
+removeTopicConnectionDelayed(void *application, void *context) {
+    MQTTTopicConnection *tc = (MQTTTopicConnection*)context;
+    removeTopicConnection(tc);
+}
+
 static void
 removeBrokerConnection(MQTTBrokerConnection *bc) {
     MQTTConnectionManager *mcm = bc->mcm;
@@ -766,12 +769,16 @@ MQTT_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                         UA_ByteString *buf) {
     MQTTConnectionManager *mcm = (MQTTConnectionManager*)cm;
     MQTTTopicConnection *tc = findTopicConnection(mcm, connectionId);
-    if(!tc)
+    if(!tc) {
+        UA_ByteString_clear(buf);
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     MQTTBrokerConnection *bc = tc->brokerConnection;
-    if(bc->tcpConnectionState != UA_CONNECTIONSTATE_ESTABLISHED)
+    if(bc->tcpConnectionState != UA_CONNECTIONSTATE_ESTABLISHED) {
+        UA_ByteString_clear(buf);
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
 
     UA_LOG_DEBUG(bc->mcm->cm.eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK, "MQTT %u\t| Publishing on topic \"%s\" "
@@ -782,6 +789,7 @@ MQTT_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                                        buf->data, buf->length, 0);
     if(UA_LIKELY(res == MQTT_OK))
         res = (enum MQTTErrors)__mqtt_send(&bc->client);
+    UA_ByteString_clear(buf);
     return (res == MQTT_OK) ? UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
 }
 
@@ -791,7 +799,24 @@ MQTT_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     MQTTTopicConnection *tc = findTopicConnection(mcm, connectionId);
     if(!tc)
         return UA_STATUSCODE_BADINTERNALERROR;
-    removeTopicConnection(tc);
+
+    if(tc->topicConnectionState == UA_CONNECTIONSTATE_CLOSING ||
+       tc->topicConnectionState == UA_CONNECTIONSTATE_CLOSED)
+        return UA_STATUSCODE_GOOD;
+
+    UA_EventLoop *el = tc->brokerConnection->mcm->cm.eventSource.eventLoop;
+    UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
+                 "MQTT %u\t| Shutdown called", (unsigned)tc->topicConnectionId);
+
+    tc->topicConnectionState = UA_CONNECTIONSTATE_CLOSING;
+
+    /* Add a delayed callback to remove in the next iteration */
+    UA_DelayedCallback *dc = &tc->dc;
+    dc->callback = removeTopicConnectionDelayed;
+    dc->application = NULL;
+    dc->context = tc;
+    el->addDelayedCallback(el, dc);
+
     return UA_STATUSCODE_GOOD;
 }
 

From 568b712798b66739f7cb342444ccdc53b5e97b44 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 30 May 2023 09:51:59 +0200
Subject: [PATCH 0962/1963] fix(core): Expose the UA_ENABLE_MQTT setting as a
 C-macro

---
 include/open62541/config.h.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index cd754ad730f..f6d02f39ad2 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -42,6 +42,7 @@
 #cmakedefine UA_ENABLE_SUBSCRIPTIONS_EVENTS
 #cmakedefine UA_ENABLE_JSON_ENCODING
 #cmakedefine UA_ENABLE_XML_ENCODING
+#cmakedefine UA_ENABLE_MQTT
 #cmakedefine UA_ENABLE_PUBSUB_MQTT
 #cmakedefine UA_ENABLE_MQTT_TLS
 #cmakedefine UA_ENABLE_MQTT_TLS_OPENSSL

From 6b55499e795ef5b88584761de1d871fbd1113d73 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Jun 2023 23:42:43 +0200
Subject: [PATCH 0963/1963] fix(el): Don't stop the EventLoop while there are
 DelayedCallbacks

---
 arch/eventloop_posix.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 04b1490c0b7..498c1760438 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -172,6 +172,10 @@ checkClosed(UA_EventLoopPOSIX *el) {
         es = es->next;
     }
 
+    /* Not closed until all delayed callbacks are processed */
+    if(el->delayedCallbacks != NULL)
+        return;
+
     /* Dirty-write the state that is const "from the outside" */
     *(UA_EventLoopState*)(uintptr_t)&el->eventLoop.state =
         UA_EVENTLOOPSTATE_STOPPED;

From 14dd89c04b2e51de2bd8d95ba5c81e1cf6c493a2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Jun 2023 23:43:50 +0200
Subject: [PATCH 0964/1963] refactor(el): Small improvements in
 eventloop_posix_udp.c

---
 arch/eventloop_posix_udp.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 87e42e22fc8..9659884b52a 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -169,7 +169,7 @@ setTimeToLive(UA_SOCKET sockfd, UA_UInt32 messageTTL,
                      (const char *)&messageTTL,
                      sizeof(messageTTL)) < 0)
 #else
-        if(UA_setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
+    if(UA_setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
                      (const char *)&messageTTL,
                      sizeof(messageTTL)) < 0)
 #endif
@@ -188,9 +188,7 @@ static UA_StatusCode
 setReuseAddress(UA_SOCKET sockfd, UA_Boolean enableReuse, const UA_Logger *logger) {
     /* Set reuse address -> enables sharing of the same listening address on
      * different sockets */
-    int enableReuseVal = 1;
-    if(!enableReuse)
-        enableReuseVal = 0;
+    int enableReuseVal = (enableReuse) ? 1 : 0;
     if(UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
                      (const char*)&enableReuseVal, sizeof(enableReuseVal)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -382,7 +380,7 @@ setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sock
     }
 
     if(UA_setsockopt(socket, IPPROTO_IPV6,IPV6_JOIN_GROUP,
-                     &ipMulticastRequest.ipv6,sizeof(ipMulticastRequest.ipv6)) < 0) {
+                     &ipMulticastRequest.ipv6, sizeof(ipMulticastRequest.ipv6)) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                          "UDP\t| Multicast IP membership setup failed: "
@@ -606,8 +604,7 @@ checkForListenMulticastAndConfigure(struct addrinfo *info, const UA_KeyValueMap
         }
 #endif
     } else {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Opening a connection failed");
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK, "UDP\t| Unknown connection type");
         res = UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
     return res;
@@ -806,14 +803,12 @@ UDP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
     while(ai) {
         rv = UDP_registerListenSocket(pcm, port, ai, params, application,
                                       context, connectionCallback, validate);
-        if(rv != UA_STATUSCODE_GOOD && validate) {
-            UA_freeaddrinfo(res);
-            return rv;
-        }
+        if(rv != UA_STATUSCODE_GOOD)
+            break;
         ai = ai->ai_next;
     }
     UA_freeaddrinfo(res);
-    return UA_STATUSCODE_GOOD;
+    return rv;
 }
 
 /* Close the connection via a delayed callback */
@@ -989,8 +984,8 @@ registerSocketAndDestinationForSend(const UA_KeyValueMap *params,
                            hostname, errno_str));
         return UA_STATUSCODE_BADDISCONNECT;
     }
-    UA_StatusCode res = setConnectionConfig(newSock, params,
-                                            info->ai_family, logger);
+    UA_StatusCode res =
+        setConnectionConfig(newSock, params, info->ai_family, logger);
     if(res != UA_STATUSCODE_GOOD) {
         UA_close(newSock);
         return res;
@@ -1109,7 +1104,7 @@ UDP_openReceiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
-    /* Get the socket */
+    /* Get the port */
     const UA_UInt16 *port = (const UA_UInt16*)
         UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_PORT].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);

From 40e38c2117171d702239d4716e54f0ab28e6eb4e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Jun 2023 23:49:06 +0200
Subject: [PATCH 0965/1963] refactor(el): More code reuse in
 eventloop_posix_udp.c

---
 arch/eventloop_posix_udp.c | 81 +++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 49 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 9659884b52a..f3a55f38c32 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -242,6 +242,23 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *params,
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     res |= UA_EventLoopPOSIX_setNonBlocking(socket);
     res |= UA_EventLoopPOSIX_setNoSigPipe(socket);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    /* Some Linux distributions have net.ipv6.bindv6only not activated. So
+     * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
+     * AF_INET6 sockets only for IPv6. */
+    int optval = 1;
+#if UA_IPV6
+    if(ai_family == AF_INET6 &&
+       UA_setsockopt(socket, IPPROTO_IPV6, IPV6_V6ONLY,
+                     (const char*)&optval, sizeof(optval)) == -1) {
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
+                       (unsigned)socket);
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
+#endif
 
     /* Set socket settings from the parameters */
     const UA_UInt32 *messageTTL = (const UA_UInt32*)
@@ -650,61 +667,16 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
                 "UDP %u\t| New listen socket for \"%s\" on port %u",
                 (unsigned)listenSocket, hoststr, port);
 
+    /* Set the socket configuration per the parameters */
     UA_StatusCode res =
-        checkForListenMulticastAndConfigure(info, params, listenSocket,
-                                            el->eventLoop.logger);
+        setConnectionConfig(listenSocket, params,
+                            info->ai_family, el->eventLoop.logger);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Configuring listen multicast failed");
         UA_close(listenSocket);
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
-    /* Some Linux distributions have net.ipv6.bindv6only not activated. So
-     * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
-     * AF_INET6 sockets only for IPv6. */
-    int optval = 1;
-#if UA_IPV6
-    if(info->ai_family == AF_INET6 &&
-       UA_setsockopt(listenSocket, IPPROTO_IPV6, IPV6_V6ONLY,
-                     (const char*)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| Could not set an IPv6 socket to IPv6 only, closing",
-                       (unsigned)listenSocket);
-        UA_close(listenSocket);
-        return UA_STATUSCODE_BADCONNECTIONREJECTED;
-    }
-#endif
-
-    /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
-    if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR,
-                     (const char *)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| Could not make the socket reusable, closing",
-                       (unsigned)listenSocket);
-        UA_close(listenSocket);
-        return UA_STATUSCODE_BADCONNECTIONREJECTED;
-    }
-
-    /* Set the socket non-blocking */
-    if(UA_EventLoopPOSIX_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| Could not set the socket non-blocking, closing",
-                       (unsigned)listenSocket);
-        UA_close(listenSocket);
-        return UA_STATUSCODE_BADCONNECTIONREJECTED;
-    }
-
-    /* Supress interrupts from the socket */
-    if(UA_EventLoopPOSIX_setNoSigPipe(listenSocket) != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| Could not disable SIGPIPE, closing",
-                       (unsigned)listenSocket);
-        UA_close(listenSocket);
-        return UA_STATUSCODE_BADCONNECTIONREJECTED;
-    }
-
-    /* Bind socket to address */
+    /* Bind socket to the address */
     int ret = UA_bind(listenSocket, info->ai_addr, (socklen_t)info->ai_addrlen);
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -715,6 +687,17 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
+    /* Enable multicast if this is a multicast address */
+    res = checkForListenMulticastAndConfigure(info, params, listenSocket,
+                                              el->eventLoop.logger);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                     "UDP\t| Configuring listen multicast failed");
+        UA_close(listenSocket);
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
+
+    /* Validation is complete - close and return */
     if(validate) {
         UA_close(listenSocket);
         return UA_STATUSCODE_GOOD;

From 7d37cfeccac1311d83f282d6c291b2ee5689a72c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Jun 2023 23:51:01 +0200
Subject: [PATCH 0966/1963] fix(tests): Use an ff00 multicast address for
 testing

ff02 returns EINVAL upon bind(), depending on the network configuration.
---
 tests/pubsub/check_pubsub_connection_udp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/pubsub/check_pubsub_connection_udp.c b/tests/pubsub/check_pubsub_connection_udp.c
index 5732553485c..7f799faaf27 100644
--- a/tests/pubsub/check_pubsub_connection_udp.c
+++ b/tests/pubsub/check_pubsub_connection_udp.c
@@ -54,7 +54,7 @@ START_TEST(AddConnectionsWithMinimalValidIPv6Configuration){
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://[ff02::1:5]:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://[ff00::1:5]:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -96,7 +96,7 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidIPv6Configuration){
         UA_PubSubConnectionConfig connectionConfig;
         memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
         connectionConfig.name = UA_STRING("UADP Connection");
-        UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://[ff02::1:5]:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://[ff00::1:5]:4840/")};
         UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                              &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -271,7 +271,6 @@ int main(void) {
     suite_add_tcase(s, tc_add_pubsub_connections_minimal_config);
     suite_add_tcase(s, tc_add_pubsub_connections_invalid_config);
     suite_add_tcase(s, tc_add_pubsub_connections_maximal_config);
-    //suite_add_tcase(s, tc_decode);
 
     SRunner *sr = srunner_create(s);
     srunner_set_fork_status(sr, CK_NOFORK);

From 89cba24b10410c62e263186d9f4255a04d531213 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Jun 2023 23:53:10 +0200
Subject: [PATCH 0967/1963] fix(core): Use "StatusCode" instead of "statuscode"
 in CHECK macros

---
 src/ua_util_internal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 5a62259937a..b028d5f21ee 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -90,13 +90,13 @@ isTrue(uint8_t expr) {
 #ifdef UA_DEBUG_FILE_LINE_INFO
 #define UA_CHECK_LOG_INTERNAL(A, STATUSCODE, EVAL, LOG, LOGGER, CAT, MSG, ...)           \
     UA_MACRO_EXPAND(                                                                     \
-        UA_CHECK(A, LOG(LOGGER, CAT, "" MSG "%s (%s:%d: statuscode: %s)", __VA_ARGS__,   \
+        UA_CHECK(A, LOG(LOGGER, CAT, "" MSG "%s (%s:%d: StatusCode: %s)", __VA_ARGS__,   \
                         __FILE__, __LINE__, UA_StatusCode_name(STATUSCODE));             \
                  EVAL))
 #else
 #define UA_CHECK_LOG_INTERNAL(A, STATUSCODE, EVAL, LOG, LOGGER, CAT, MSG, ...)           \
     UA_MACRO_EXPAND(                                                                     \
-        UA_CHECK(A, LOG(LOGGER, CAT, "" MSG "%s (statuscode: %s)", __VA_ARGS__,   \
+        UA_CHECK(A, LOG(LOGGER, CAT, "" MSG "%s (StatusCode: %s)", __VA_ARGS__,   \
                         UA_StatusCode_name(STATUSCODE));             \
                  EVAL))
 #endif

From de28c57f09c0d1e0e6e716ef2077f19df26a9d8d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 3 Jun 2023 23:49:58 +0200
Subject: [PATCH 0968/1963] feat(plugin): Add an Ethernet Connection Manager in
 the default config

---
 plugins/ua_config_default.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 7edf3ae037e..41c551452b1 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -254,6 +254,14 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         if(udpCM)
             conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)udpCM);
 
+        /* Add the Ethernet connection manager */
+#ifdef __linux__
+        UA_ConnectionManager *ethCM =
+            UA_ConnectionManager_new_POSIX_Ethernet(UA_STRING("eth connection manager"));
+        if(ethCM)
+            conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)ethCM);
+#endif
+
         /* Add the interrupt manager */
         UA_InterruptManager *im = UA_InterruptManager_new_POSIX(UA_STRING("interrupt manager"));
         if(im) {

From 122d08371965ca6d8ec6041b327b0713ffaab345 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 4 Jun 2023 17:43:57 +0200
Subject: [PATCH 0969/1963] fix(el): Immediately set MQTT ConnectionManager
 stopped when there are no open connections

---
 arch/eventloop_mqtt.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index d9c82de3d0e..e006492a490 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -235,9 +235,13 @@ MQTT_eventSourceStop(UA_ConnectionManager *cm) {
     UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                 "MQTT\t| Shutting down the ConnectionManager");
 
-    cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
-
     MQTTConnectionManager *mcm = (MQTTConnectionManager*)cm;
+    if(mcm->connections == NULL) {
+        cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPED;
+        return;
+    }
+
+    cm->eventSource.state = UA_EVENTSOURCESTATE_STOPPING;
     for(MQTTBrokerConnection *bc = mcm->connections; bc; bc = bc->next) {
         shutdownBrokerConnection(bc);
     }

From 43339d500ca5c5be64bf13bfc5ca20405a908863 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 10 Jun 2023 12:02:51 +0200
Subject: [PATCH 0970/1963] refactor(arch): Don't use POLLOUT for UDP sockets
 initially

They are connection-less and don't need to wait for the connection to
fully open.
---
 arch/eventloop_posix_udp.c | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index f3a55f38c32..fcfa636eea5 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -533,28 +533,6 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
                  "UDP %u\t| Activity on the socket",
                  (unsigned)conn->rfd.fd);
 
-    /* Write-Event, a new connection for sending has opened.  */
-    if(event == UA_FDEVENT_OUT) {
-        UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP %u\t| Opening a new connection",
-                     (unsigned)conn->rfd.fd);
-
-        /* A new socket has opened. Signal it to the application. */
-        UA_UNLOCK(&el->elMutex);
-        conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
-                            conn->application, &conn->context,
-                            UA_CONNECTIONSTATE_ESTABLISHED,
-                            &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-        UA_LOCK(&el->elMutex);
-
-        /* Don't listen for any events (besides the connection closing) for
-         * send-connections. Blocking sending (where UA_FDEVENT_OUT is
-         * interesting) is handled in sendWithConnection. */
-        conn->rfd.listenEvents = 0;
-        UA_EventLoopPOSIX_modifyFD(el, &conn->rfd);
-        return;
-    }
-
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP %u\t| Allocate receive buffer", (unsigned)conn->rfd.fd);
 
@@ -1042,11 +1020,10 @@ UDP_openSendConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *par
     }
 
     conn->rfd.fd = newSock;
-    conn->rfd.listenEvents = UA_FDEVENT_OUT; /* Switched to _IN once the
-                                              * connection is open */
+    conn->rfd.listenEvents = 0;
     conn->rfd.es = &pcm->cm.eventSource;
     conn->rfd.eventSourceCB = (UA_FDCallback)UDP_connectionSocketCallback;
-    conn->applicationCB= connectionCallback;
+    conn->applicationCB = connectionCallback;
     conn->application = application;
     conn->context = context;
 
@@ -1072,7 +1049,7 @@ UDP_openSendConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *par
      * iteration of the EventLoop */
     UA_UNLOCK(&el->elMutex);
     connectionCallback(&pcm->cm, (uintptr_t)newSock, application,
-                       &conn->context, UA_CONNECTIONSTATE_OPENING,
+                       &conn->context, UA_CONNECTIONSTATE_ESTABLISHED,
                        &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
     UA_LOCK(&el->elMutex);
 

From b5dc6a11909f18cb7d441d2315620bd348e63d65 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 10 Jun 2023 12:03:45 +0200
Subject: [PATCH 0971/1963] refactor(arch): Small cosmetic improvements in
 eventloop_posix_udp.c

---
 arch/eventloop_posix_udp.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index fcfa636eea5..330fe2ce163 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -541,9 +541,11 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
 
     /* Receive */
 #ifndef _WIN32
-    ssize_t ret = UA_recv(conn->rfd.fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    ssize_t ret = UA_recv(conn->rfd.fd, (char*)response.data,
+                          response.length, MSG_DONTWAIT);
 #else
-    int ret = UA_recv(conn->rfd.fd, (char*)response.data, response.length, MSG_DONTWAIT);
+    int ret = UA_recv(conn->rfd.fd, (char*)response.data,
+                      response.length, MSG_DONTWAIT);
 #endif
 
     /* Receive has failed */
@@ -802,10 +804,9 @@ static UA_StatusCode
 UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
     UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)cm->eventSource.eventLoop;
+    UA_FD fd = (UA_FD)connectionId;
 
     UA_LOCK(&el->elMutex);
-
-    UA_FD fd = (UA_FD)connectionId;
     UA_RegisteredFD *rfd = ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
     if(!rfd) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -814,11 +815,8 @@ UDP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
         UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
-
     UDP_shutdown(cm, rfd);
-
     UA_UNLOCK(&el->elMutex);
-
     return UA_STATUSCODE_GOOD;
 }
 
@@ -831,13 +829,6 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     UA_LOCK(&el->elMutex);
 
-    /* Prevent OS signals when sending to a closed socket */
-    int flags = MSG_NOSIGNAL;
-
-    struct pollfd tmp_poll_fd;
-    tmp_poll_fd.fd = (UA_FD)connectionId;
-    tmp_poll_fd.events = UA_POLLOUT;
-
     /* Look up the registered UDP socket */
     UA_FD fd = (UA_FD)connectionId;
     UDP_FD *conn = (UDP_FD*)ZIP_FIND(UA_FDTree, &pcm->fds, &fd);
@@ -854,6 +845,9 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
         do {
             UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                          "UDP %u\t| Attempting to send", (unsigned)connectionId);
+
+            /* Prevent OS signals when sending to a closed socket */
+            int flags = MSG_NOSIGNAL;
             size_t bytes_to_send = buf->length - nWritten;
             n = UA_sendto((UA_FD)connectionId, (const char*)buf->data + nWritten,
                           bytes_to_send, flags, (struct sockaddr*)&conn->sendAddr,
@@ -876,6 +870,9 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                 /* Poll for the socket resources to become available and retry
                  * (blocking) */
                 int poll_ret;
+                struct pollfd tmp_poll_fd;
+                tmp_poll_fd.fd = (UA_FD)connectionId;
+                tmp_poll_fd.events = UA_POLLOUT;
                 do {
                     poll_ret = UA_poll(&tmp_poll_fd, 1, 100);
                     if(poll_ret < 0 && UA_ERRNO != UA_INTERRUPTED) {

From de9ef3bc90bad185fa52b957515803ec4bce8972 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Jun 2023 20:52:05 +0200
Subject: [PATCH 0972/1963] fix(client): Make UA_Client_disconnectAsync async
 also in the failure case

---
 src/client/ua_client_connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index be3a5cf8818..63109f9e6e0 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -2126,7 +2126,7 @@ UA_Client_disconnectAsync(UA_Client *client) {
         /* Sending the close request failed. Continue to close the connection
          * anyway. */
         cleanupSession(client);
-        disconnectSecureChannel(client, true);
+        disconnectSecureChannel(client, false);
     }
 
     notifyClientState(client);

From 3921018c45d76b84bc73a0c8e99812ee01ed8ce7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Jun 2023 20:55:51 +0200
Subject: [PATCH 0973/1963] fix(pubsub): Fix handling of non-ns0 nodeids in
 ua_pubsub_ns0.c

---
 src/pubsub/ua_pubsub_ns0.c | 58 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 731010fdbdf..320d3a67640 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -20,13 +20,13 @@ typedef struct {
 } UA_NodePropertyContext;
 
 static UA_StatusCode
-writePubSubNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
+writePubSubNs0VariableArray(UA_Server *server, const UA_NodeId id, void *v,
                             size_t length, const UA_DataType *type) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_Variant var;
     UA_Variant_init(&var);
     UA_Variant_setArray(&var, v, length, type);
-    return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
+    return writeValueAttribute(server, id, &var);
 }
 
 static UA_NodeId
@@ -627,39 +627,38 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
                       UA_NODEID_NUMERIC(0, UA_NS0ID_NETWORKADDRESSURLTYPE),
                       &attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL, NULL);
 
-    addNode_finish(server, &server->adminSession, &connection->identifier);
+    retVal |= addNode_finish(server, &server->adminSession, &connection->identifier);
 
-    UA_NodeId addressNode, urlNode, interfaceNode, publisherIdNode,
-        connectionPropertieNode, transportProfileUri;
-    addressNode = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "Address"),
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                      connection->identifier);
-    urlNode = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "Url"),
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                  addressNode);
-    interfaceNode = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "NetworkInterface"),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                        addressNode);
-    publisherIdNode = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublisherId"),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                                        connection->identifier);
-    connectionPropertieNode = findSingleChildNode(server,
-                                                  UA_QUALIFIEDNAME(0, "ConnectionProperties"),
-                                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                                                  connection->identifier);
-    transportProfileUri = findSingleChildNode(server,
-                                              UA_QUALIFIEDNAME(0, "TransportProfileUri"),
-                                              UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                              connection->identifier);
+    UA_NodeId addressNode =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "Address"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                            connection->identifier);
+    UA_NodeId urlNode =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "Url"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), addressNode);
+    UA_NodeId interfaceNode =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "NetworkInterface"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), addressNode);
+    UA_NodeId publisherIdNode =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublisherId"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), connection->identifier);
+    UA_NodeId connectionPropertyNode =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "ConnectionProperties"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                            connection->identifier);
+    UA_NodeId transportProfileUri =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "TransportProfileUri"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                            connection->identifier);
 
     if(UA_NodeId_isNull(&addressNode) || UA_NodeId_isNull(&urlNode) ||
        UA_NodeId_isNull(&interfaceNode) || UA_NodeId_isNull(&publisherIdNode) ||
-       UA_NodeId_isNull(&connectionPropertieNode) ||
+       UA_NodeId_isNull(&connectionPropertyNode) ||
        UA_NodeId_isNull(&transportProfileUri)) {
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
-    retVal |= writePubSubNs0VariableArray(server, connectionPropertieNode.identifier.numeric,
+    retVal |= writePubSubNs0VariableArray(server, connectionPropertyNode,
                                           connection->config.connectionProperties.map,
                                           connection->config.connectionProperties.mapSize,
                                           &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
@@ -2342,8 +2341,9 @@ initPubSubNS0(UA_Server *server) {
     UA_String profileArray[1];
     profileArray[0] = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
 
-    retVal |= writePubSubNs0VariableArray(server, UA_NS0ID_PUBLISHSUBSCRIBE_SUPPORTEDTRANSPORTPROFILES,
-                                    profileArray, 1, &UA_TYPES[UA_TYPES_STRING]);
+    retVal |= writePubSubNs0VariableArray(server,
+           UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUPPORTEDTRANSPORTPROFILES),
+                                          profileArray, 1, &UA_TYPES[UA_TYPES_STRING]);
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
     /* Add missing references */

From b8c2faade19e63860f9bdd44aecedf06bcae03e3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Jun 2023 20:57:03 +0200
Subject: [PATCH 0974/1963] fix(pubsub): Fix edge-cases in SKS cleanup

---
 src/pubsub/ua_pubsub_keystorage.c | 59 ++++++++++++++++---------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 35aa39dc55d..6d471cf518a 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -470,51 +470,53 @@ typedef struct {
     UA_PubSubKeyStorage *ks;
     UA_UInt32 startingTokenId;
     UA_UInt32 requestedKeyCount;
+    UA_DelayedCallback dc;
 } sksClientContext;
 
-void
-sksClientCleanupCb(void *client, void *context);
+static void sksClientCleanupCb(void *client, void *context);
 
-static UA_StatusCode
-addDelayedSksClientCleanupCb(UA_Client *client){
-    UA_DelayedCallback *dc = (UA_DelayedCallback *)UA_calloc(1, sizeof(UA_DelayedCallback));
-    if(!dc) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "SKS Client: Failed to add addDelayedSksClientCleanup callback "
-                       "with error: %s ",
-                       UA_StatusCode_name(UA_STATUSCODE_BADOUTOFMEMORY));
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    dc->application = client;
-    dc->callback = sksClientCleanupCb;
-    dc->context = dc;
-    client->config.eventLoop->addDelayedCallback(client->config.eventLoop, dc);
-    return UA_STATUSCODE_GOOD;
+static void
+addDelayedSksClientCleanupCb(UA_Client *client, sksClientContext *context) {
+    /* Register at most once */
+    if(context->dc.application != NULL)
+        return;
+    context->dc.application = client;
+    context->dc.callback = sksClientCleanupCb;
+    context->dc.context = context;
+    client->config.eventLoop->addDelayedCallback(client->config.eventLoop, &context->dc);
 }
 
-void
+static void
 sksClientCleanupCb(void *client, void *context) {
     UA_Client *sksClient = (UA_Client *)client;
+    sksClientContext *ctx = (sksClientContext*)context;
+
     /* we do not want to call state change Callback when cleaning up */
     sksClient->config.stateCallback = NULL;
+
     if(sksClient->sessionState > UA_SESSIONSTATE_CLOSED &&
        sksClient->channel.state < UA_SECURECHANNELSTATE_CLOSED) {
+        sksClient->config.eventLoop->
+            addDelayedCallback(sksClient->config.eventLoop, &ctx->dc);
         UA_Client_disconnectAsync(sksClient);
+        return;
     }
-    if(sksClient->sessionState != UA_SESSIONSTATE_ACTIVATED &&
-       sksClient->channel.state == UA_SECURECHANNELSTATE_CLOSED) {
-        /* we cannot make deep copy of the following pointers because these have internal structures,
-        therefore we do not free them here. These will be freed in UA_PubSubKeyStorage_delete */
+
+    if(sksClient->channel.state == UA_SECURECHANNELSTATE_CLOSED) {
+        /* We cannot make deep copy of the following pointers because these have
+         * internal structures, therefore we do not free them here. These will
+         * be freed in UA_PubSubKeyStorage_delete. */
         sksClient->config.securityPolicies = NULL;
         sksClient->config.securityPoliciesSize = 0;
         sksClient->config.certificateVerification.context = NULL;
         sksClient->config.logger.context = NULL;
-        UA_free(sksClient->config.clientContext);
+        sksClient->config.clientContext = NULL;
         UA_Client_delete(sksClient);
+        UA_free(context);
     } else {
-        addDelayedSksClientCleanupCb(sksClient);
+        sksClient->config.eventLoop->
+            addDelayedCallback(sksClient->config.eventLoop, &ctx->dc);
     }
-    UA_free(context);
 }
 
 static void
@@ -596,8 +598,7 @@ storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
         ks->sksConfig.userNotifyCallback(server, retval, ks->sksConfig.context);
     ks->sksConfig.reqId = 0;
     UA_Client_disconnectAsync(client);
-    addDelayedSksClientCleanupCb(client);
-    return;
+    addDelayedSksClientCleanupCb(client, ctx);
 }
 
 static UA_StatusCode
@@ -652,7 +653,7 @@ onConnect(UA_Client *client, UA_SecureChannelState channelState,
             ks->sksConfig.userNotifyCallback(ctx->server, connectStatus,
                                              ks->sksConfig.context);
         UA_Client_disconnectAsync(client);
-        addDelayedSksClientCleanupCb(client);
+        addDelayedSksClientCleanupCb(client, ctx);
     }
 }
 
@@ -708,7 +709,7 @@ getSecurityKeysAndStoreFetchedKeys(UA_Server *server, UA_PubSubKeyStorage *keySt
         keep waiting for the client status to go from Fresh to closed in UA_Client_delete*/
         client->channel.state = UA_SECURECHANNELSTATE_CLOSED;
         /* this client instance will be cleared in the next event loop iteration */
-        addDelayedSksClientCleanupCb(client);
+        addDelayedSksClientCleanupCb(client, ctx);
         return retval;
     }
 

From 0e32479f2dbd10dd7e58aa79b952a9ba5827c055 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Jun 2023 20:59:24 +0200
Subject: [PATCH 0975/1963] fix(test): Remove detailed timing assumptions from
 PubSub tests

---
 tests/pubsub/check_pubsub_publisherid.c       | 62 +++++---------
 tests/pubsub/check_pubsub_sks_client.c        | 81 ++++++++++++-------
 .../pubsub/check_pubsub_subscribe_encrypted.c |  2 +
 3 files changed, 78 insertions(+), 67 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 75ad8cfc264..fbea771b1be 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -336,27 +336,6 @@ static void AddDataSetReader(
     pDataSetMetaData->fields = 0;
 }
 
-/***************************************************************************************************/
-/***************************************************************************************************/
-
-/***************************************************************************************************/
-/* utility function to trigger server process loop and wait until callbacks are executed */
-static void ServerDoProcess(
-    const char *pMessage,
-    const UA_UInt32 Sleep_ms,             /* use at least publishing interval */
-    const UA_UInt32 NoOfRunIterateCycles)
-{
-    ck_assert(pMessage != 0);
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ServerDoProcess() sleep : %s", pMessage);
-    for (UA_UInt32 i = 0; i < NoOfRunIterateCycles; i++) {
-        UA_Server_run_iterate(server, true);
-        UA_fakeSleep(Sleep_ms);
-        UA_Server_run_iterate(server, true);
-    }
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ServerDoProcess() wakeup : %s", pMessage);
-}
-
 /***************************************************************************************************/
 /* utility function to check working pubsub operation */
 static void ValidatePublishSubscribe(
@@ -392,25 +371,28 @@ static void ValidatePublishSubscribe(
         }
     }
 
-    ServerDoProcess("ValidatePublishSubscribe()", Sleep_ms, NoOfRunIterateCycles);
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): read subscribed variable");
-    for (UA_UInt32 i = 0; i < NoOfTestVars; i++) {
-        tmpValue = TestValue + (UA_Int32) i;
-        if (UseFastPath) {
-            ck_assert(fastPathSubscriberValues[i] != 0);
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): expected value: '%i' vs. actual value: '%i'",
-                tmpValue, *(UA_Int32 *) fastPathSubscriberValues[i]->value.data);
-            ck_assert_int_eq(tmpValue, *(UA_Int32 *) fastPathSubscriberValues[i]->value.data);
-        } else {
-            UA_Variant SubscribedNodeData;
-            UA_Variant_init(&SubscribedNodeData);
-            ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_readValue(server, subscriberVarIds[i], &SubscribedNodeData));
-            ck_assert(SubscribedNodeData.data != 0);
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "ValidatePublishSubscribe(): expected value: '%i' vs. actual value: '%i'",
-                tmpValue, *(UA_Int32 *)SubscribedNodeData.data);
-            ck_assert_int_eq(tmpValue, *(UA_Int32 *)SubscribedNodeData.data);
-            UA_Variant_clear(&SubscribedNodeData);
+    UA_Boolean done = true;
+    while(done) {
+        UA_fakeSleep(Sleep_ms);
+        UA_Server_run_iterate(server, true);
+        done = true;
+        for(UA_UInt32 i = 0; i < NoOfTestVars; i++) {
+            tmpValue = TestValue + (UA_Int32)i;
+            if(UseFastPath) {
+                ck_assert(fastPathSubscriberValues[i] != 0);
+                if(tmpValue != *(UA_Int32 *)fastPathSubscriberValues[i]->value.data) {
+                    done = false;
+                    break;
+                }
+            } else {
+                UA_Variant SubscribedNodeData;
+                UA_Variant_init(&SubscribedNodeData);
+                UA_Server_readValue(server, subscriberVarIds[i], &SubscribedNodeData);
+                done = (tmpValue == *(UA_Int32 *)SubscribedNodeData.data);
+                UA_Variant_clear(&SubscribedNodeData);
+                if(!done)
+                    break;
+            }
         }
     }
 }
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index cfd827d0513..c98b97088d8 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -636,18 +636,26 @@ START_TEST(CheckPublishedValuesInUserLand) {
     ck_assert(retval == UA_STATUSCODE_GOOD);
 
     UA_Variant *publishedNodeData = UA_Variant_new();
-    retval = UA_Server_readValue(
-        publisherApp, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);
+    retval = UA_Server_readValue(publisherApp,
+                                 UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID),
+                                 publishedNodeData);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Variant *subscribedNodeData = UA_Variant_new();
-    retval =
-        UA_Server_readValue(subscriberApp, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
-                            subscribedNodeData);
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(*(UA_Int32 *)publishedNodeData->data,
-                     *(UA_Int32 *)subscribedNodeData->data);
-    UA_Variant_delete(subscribedNodeData);
+    while(true) {
+        UA_Variant *subscribedNodeData = UA_Variant_new();
+        retval = UA_Server_readValue(subscriberApp,
+                                     UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
+                                     subscribedNodeData);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+        UA_Boolean isEqual = (UA_order(publishedNodeData->data, subscribedNodeData->data,
+                                       publishedNodeData->type) == UA_ORDER_EQ);
+        UA_Variant_delete(subscribedNodeData);
+        if(isEqual)
+            break;
+        UA_Server_run_iterate(publisherApp, false);
+        UA_Server_run_iterate(subscriberApp, false);
+        UA_fakeSleep(50);
+    }
     UA_Variant_delete(publishedNodeData);
     UA_free(pubSksClientConfig);
     UA_free(subSksClientConfig);
@@ -676,17 +684,27 @@ START_TEST(PublisherSubscriberTogethor) {
     ck_assert(retval == UA_STATUSCODE_GOOD);
 
     UA_Variant *publishedNodeData = UA_Variant_new();
-    retval = UA_Server_readValue(
-        publisherApp, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);
+    retval = UA_Server_readValue(publisherApp,
+                                 UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID),
+                                 publishedNodeData);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Variant *subscribedNodeData = UA_Variant_new();
-    retval = UA_Server_readValue(
-        publisherApp, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), subscribedNodeData);
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(*(UA_Int32 *)publishedNodeData->data,
-                     *(UA_Int32 *)subscribedNodeData->data);
-    UA_Variant_delete(subscribedNodeData);
+    while(true) {
+        UA_Variant *subscribedNodeData = UA_Variant_new();
+        retval = UA_Server_readValue(publisherApp,
+                                     UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
+                                     subscribedNodeData);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+        UA_Boolean isEqual = (UA_order(publishedNodeData->data, subscribedNodeData->data,
+                                       publishedNodeData->type) == UA_ORDER_EQ);
+        UA_Variant_delete(subscribedNodeData);
+        if(isEqual)
+            break;
+        UA_Server_run_iterate(publisherApp, false);
+        UA_Server_run_iterate(subscriberApp, false);
+        UA_fakeSleep(50);
+    }
+
     UA_Variant_delete(publishedNodeData);
     UA_free(pubSksClientConfig);
 }
@@ -724,13 +742,22 @@ START_TEST(PublisherDelayedSubscriberTogethor) {
         publisherApp, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_Variant *subscribedNodeData = UA_Variant_new();
-    retval = UA_Server_readValue(
-        publisherApp, UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID), subscribedNodeData);
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(*(UA_Int32 *)publishedNodeData->data,
-                     *(UA_Int32 *)subscribedNodeData->data);
-    UA_Variant_delete(subscribedNodeData);
+    while(true) {
+        UA_Variant *subscribedNodeData = UA_Variant_new();
+        retval = UA_Server_readValue(publisherApp,
+                                     UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID),
+                                     subscribedNodeData);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+        UA_Boolean isEqual = (UA_order(publishedNodeData->data, subscribedNodeData->data,
+                                       publishedNodeData->type) == UA_ORDER_EQ);
+        UA_Variant_delete(subscribedNodeData);
+        if(isEqual)
+            break;
+        UA_Server_run_iterate(publisherApp, false);
+        UA_Server_run_iterate(subscriberApp, false);
+        UA_fakeSleep(50);
+    }
+
     UA_Variant_delete(publishedNodeData);
     UA_free(pubSksClientConfig);
 }
@@ -793,7 +820,7 @@ START_TEST(FetchNextbatchOfKeys) {
         if(sksPullIteration > 10 &&
            subKs->currentItem->keyID == pubKs->currentItem->keyID)
             break;
-        UA_fakeSleep(1);
+        UA_fakeSleep(50);
     }
     ck_assert(subKs->currentItem->keyID == pubKs->currentItem->keyID);
     ck_assert(UA_ByteString_equal(&subKs->currentItem->key, &pubKs->currentItem->key));
diff --git a/tests/pubsub/check_pubsub_subscribe_encrypted.c b/tests/pubsub/check_pubsub_subscribe_encrypted.c
index 4c6f011cac4..c815b5dac5e 100644
--- a/tests/pubsub/check_pubsub_subscribe_encrypted.c
+++ b/tests/pubsub/check_pubsub_subscribe_encrypted.c
@@ -391,6 +391,8 @@ START_TEST(SinglePublishSubscribeInt32) {
         UA_Server_setWriterGroupOperational(server, writerGroup);
         UA_Server_setReaderGroupOperational(server, readerGroupTest);
 
+        UA_Server_run_iterate(server, true);
+
         /* Read data sent by the Publisher */
         UA_Variant *publishedNodeData = UA_Variant_new();
         retVal                        = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID), publishedNodeData);

From e74908763f326bfdb85743d09ba87b014d6bc0ab Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Jun 2023 21:00:17 +0200
Subject: [PATCH 0976/1963] refactor(test): Cosmetic improvements in
 check_pubsub_publisherid.c

---
 tests/pubsub/check_pubsub_publisherid.c | 140 ++++++++++++++----------
 1 file changed, 80 insertions(+), 60 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index fbea771b1be..5d60cba0081 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -23,9 +23,7 @@ static UA_Boolean UseRawEncoding = UA_FALSE;
 /***************************************************************************************************/
 /***************************************************************************************************/
 static void setup(void) {
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nsetup\n\n");
-
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "setup");
     server = UA_Server_new();
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
@@ -37,9 +35,7 @@ static void setup(void) {
 
 /***************************************************************************************************/
 static void teardown(void) {
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nteardown\n\n");
-
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "teardown");
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_run_shutdown(server));
     UA_Server_delete(server);
 }
@@ -520,9 +516,9 @@ static void DoTest_1_Connection(
 /***************************************************************************************************/
 /* simple test with 1 connection */
 START_TEST(Test_1_connection) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_1_connection");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "START: Test_1_connection");
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId BYTE with all combinations");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Test PublisherId BYTE with all combinations");
 
     UA_PublisherIdType publisherIdType = UA_PUBLISHERIDTYPE_BYTE;
     UA_PublisherId publisherId;
@@ -544,7 +540,7 @@ START_TEST(Test_1_connection) {
     UseRawEncoding = UA_TRUE;
     DoTest_1_Connection(publisherIdType, publisherId);
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId UINT16 with all combinations");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Test PublisherId UINT16 with all combinations");
 
     publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     publisherId.uint16 = 3;
@@ -565,7 +561,7 @@ START_TEST(Test_1_connection) {
     UseRawEncoding = UA_TRUE;
     DoTest_1_Connection(publisherIdType, publisherId);
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId UINT32 with all combinations");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Test PublisherId UINT32 with all combinations");
 
     publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     publisherId.uint32 = 5;
@@ -586,7 +582,7 @@ START_TEST(Test_1_connection) {
     UseRawEncoding = UA_TRUE;
     DoTest_1_Connection(publisherIdType, publisherId);
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId UINT64 with all combinations");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Test PublisherId UINT64 with all combinations");
 
     publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
     publisherId.uint64 = 6;
@@ -607,7 +603,7 @@ START_TEST(Test_1_connection) {
     UseRawEncoding = UA_TRUE;
     DoTest_1_Connection(publisherIdType, publisherId);
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nTest PublisherId STRING with all combinations");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Test PublisherId STRING with all combinations");
 
     publisherIdType = UA_PUBLISHERIDTYPE_STRING;
     publisherId.string = UA_STRING("My PublisherId");
@@ -629,7 +625,7 @@ START_TEST(Test_1_connection) {
     UseRawEncoding = UA_TRUE;
     DoTest_1_Connection(publisherIdType, publisherId);
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_1_connection\n\n");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_1_connection");
 } END_TEST
 
 
@@ -695,8 +691,9 @@ static void DoTest_multiple_Connections(void) {
     UA_NodeId_init(&DsWId_Conn1_WG1_DS1);
     UA_NodeId PDSId_Conn1_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSW_Id, &PDSId_Conn1_WG1_PDS1,
-        &publisherVarIds[0], &fastPathPublisherDataValues[0], &DsWId_Conn1_WG1_DS1);
+    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1",
+                        DSW_Id, &PDSId_Conn1_WG1_PDS1, &publisherVarIds[0],
+                        &fastPathPublisherDataValues[0], &DsWId_Conn1_WG1_DS1);
     PublishedDataSetIds[0] = PDSId_Conn1_WG1_PDS1;
 
     /* setup Connection 2: */
@@ -717,8 +714,9 @@ static void DoTest_multiple_Connections(void) {
     UA_NodeId_init(&DsWId_Conn2_WG1_DS1);
     UA_NodeId PDSId_Conn2_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn2_WG1_PDS1);
-    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", DSW_Id, &PDSId_Conn2_WG1_PDS1,
-        &publisherVarIds[1], &fastPathPublisherDataValues[1], &DsWId_Conn2_WG1_DS1);
+    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1",
+                        DSW_Id, &PDSId_Conn2_WG1_PDS1, &publisherVarIds[1],
+                        &fastPathPublisherDataValues[1], &DsWId_Conn2_WG1_DS1);
     PublishedDataSetIds[1] = PDSId_Conn2_WG1_PDS1;
 
     /* setup Connection 3: */
@@ -739,8 +737,9 @@ static void DoTest_multiple_Connections(void) {
     UA_NodeId_init(&DsWId_Conn3_WG1_DS1);
     UA_NodeId PDSId_Conn3_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn3_WG1_PDS1);
-    AddPublishedDataSet(&WGId_Conn3_WG1, "Conn3_WG1_PDS1", "Conn3_WG1_DS1", DSW_Id, &PDSId_Conn3_WG1_PDS1,
-        &publisherVarIds[2], &fastPathPublisherDataValues[2], &DsWId_Conn3_WG1_DS1);
+    AddPublishedDataSet(&WGId_Conn3_WG1, "Conn3_WG1_PDS1", "Conn3_WG1_DS1",
+                        DSW_Id, &PDSId_Conn3_WG1_PDS1, &publisherVarIds[2],
+                        &fastPathPublisherDataValues[2], &DsWId_Conn3_WG1_DS1);
     PublishedDataSetIds[2] = PDSId_Conn3_WG1_PDS1;
 
     /* setup Connection 4 */
@@ -761,8 +760,9 @@ static void DoTest_multiple_Connections(void) {
     UA_NodeId_init(&DsWId_Conn4_WG1_DS1);
     UA_NodeId PDSId_Conn4_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn4_WG1_PDS1);
-    AddPublishedDataSet(&WGId_Conn4_WG1, "Conn4_WG1_PDS1", "Conn4_WG1_DS1", DSW_Id, &PDSId_Conn4_WG1_PDS1,
-        &publisherVarIds[3], &fastPathPublisherDataValues[3], &DsWId_Conn4_WG1_DS1);
+    AddPublishedDataSet(&WGId_Conn4_WG1, "Conn4_WG1_PDS1", "Conn4_WG1_DS1",
+                        DSW_Id, &PDSId_Conn4_WG1_PDS1, &publisherVarIds[3],
+                        &fastPathPublisherDataValues[3], &DsWId_Conn4_WG1_DS1);
     PublishedDataSetIds[3] = PDSId_Conn4_WG1_PDS1;
 
     /* setup Connection 5 */
@@ -783,8 +783,9 @@ static void DoTest_multiple_Connections(void) {
     UA_NodeId_init(&DsWId_Conn5_WG1_DS1);
     UA_NodeId PDSId_Conn5_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn5_WG1_PDS1);
-    AddPublishedDataSet(&WGId_Conn5_WG1, "Conn5_WG1_PDS1", "Conn5_WG1_DS1", DSW_Id, &PDSId_Conn5_WG1_PDS1,
-        &publisherVarIds[4], &fastPathPublisherDataValues[4], &DsWId_Conn5_WG1_DS1);
+    AddPublishedDataSet(&WGId_Conn5_WG1, "Conn5_WG1_PDS1", "Conn5_WG1_DS1",
+                        DSW_Id, &PDSId_Conn5_WG1_PDS1, &publisherVarIds[4],
+                        &fastPathPublisherDataValues[4], &DsWId_Conn5_WG1_DS1);
     PublishedDataSetIds[4] = PDSId_Conn5_WG1_PDS1;
 
     /* setup Connection 6: */
@@ -805,8 +806,9 @@ static void DoTest_multiple_Connections(void) {
     UA_NodeId_init(&DsWId_Conn6_WG1_DS1);
     UA_NodeId PDSId_Conn6_WG1_PDS1;
     UA_NodeId_init(&PDSId_Conn6_WG1_PDS1);
-    AddPublishedDataSet(&WGId_Conn6_WG1, "Conn6_WG1_PDS1", "Conn6_WG1_DS1", DSW_Id, &PDSId_Conn6_WG1_PDS1,
-        &publisherVarIds[5], &fastPathPublisherDataValues[5], &DsWId_Conn6_WG1_DS1);
+    AddPublishedDataSet(&WGId_Conn6_WG1, "Conn6_WG1_PDS1", "Conn6_WG1_DS1",
+                        DSW_Id, &PDSId_Conn6_WG1_PDS1, &publisherVarIds[5],
+                        &fastPathPublisherDataValues[5], &DsWId_Conn6_WG1_DS1);
     PublishedDataSetIds[5] = PDSId_Conn6_WG1_PDS1;
 
     /* setup all Subscribers */
@@ -817,8 +819,10 @@ static void DoTest_multiple_Connections(void) {
     AddReaderGroup(&ConnId_1, "Conn1_RG1", &RGId_Conn1_RG1);
     UA_NodeId DSRId_Conn1_RG1_DSR1;
     UA_NodeId_init(&DSRId_Conn1_RG1_DSR1);
-    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", Conn2_PublisherIdType, Conn2_PublisherId, WG_Id, DSW_Id,
-        &subscriberVarIds[1], &fastPathSubscriberDataValues[1], &DSRId_Conn1_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", Conn2_PublisherIdType,
+                     Conn2_PublisherId, WG_Id, DSW_Id,
+                     &subscriberVarIds[1], &fastPathSubscriberDataValues[1],
+                     &DSRId_Conn1_RG1_DSR1);
     ReaderGroupIds[0] = RGId_Conn1_RG1;
 
     /* setup Connection 2: */
@@ -827,8 +831,9 @@ static void DoTest_multiple_Connections(void) {
     AddReaderGroup(&ConnId_2, "Conn2_RG1", &RGId_Conn2_RG1);
     UA_NodeId DSRId_Conn2_RG1_DSR1;
     UA_NodeId_init(&DSRId_Conn2_RG1_DSR1);
-    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", Conn1_PublisherIdType, Conn1_PublisherId, WG_Id, DSW_Id,
-        &subscriberVarIds[0], &fastPathSubscriberDataValues[0], &DSRId_Conn2_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", Conn1_PublisherIdType,
+                     Conn1_PublisherId, WG_Id, DSW_Id, &subscriberVarIds[0],
+                     &fastPathSubscriberDataValues[0], &DSRId_Conn2_RG1_DSR1);
     ReaderGroupIds[1] = RGId_Conn2_RG1;
 
     /* setup Connection 3: */
@@ -837,8 +842,9 @@ static void DoTest_multiple_Connections(void) {
     AddReaderGroup(&ConnId_3, "Conn3_RG1", &RGId_Conn3_RG1);
     UA_NodeId DSRId_Conn3_RG1_DSR1;
     UA_NodeId_init(&DSRId_Conn3_RG1_DSR1);
-    AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", Conn4_PublisherIdType, Conn4_PublisherId, WG_Id, DSW_Id,
-        &subscriberVarIds[3], &fastPathSubscriberDataValues[3], &DSRId_Conn3_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", Conn4_PublisherIdType,
+                     Conn4_PublisherId, WG_Id, DSW_Id, &subscriberVarIds[3],
+                     &fastPathSubscriberDataValues[3], &DSRId_Conn3_RG1_DSR1);
     ReaderGroupIds[2] = RGId_Conn3_RG1;
 
     /* setup Connection 4: */
@@ -847,8 +853,9 @@ static void DoTest_multiple_Connections(void) {
     AddReaderGroup(&ConnId_4, "Conn4_RG1", &RGId_Conn4_RG1);
     UA_NodeId DSRId_Conn4_RG1_DSR1;
     UA_NodeId_init(&DSRId_Conn4_RG1_DSR1);
-    AddDataSetReader(&RGId_Conn4_RG1, "Conn4_RG1_DSR1", Conn3_PublisherIdType, Conn3_PublisherId, WG_Id, DSW_Id,
-        &subscriberVarIds[2], &fastPathSubscriberDataValues[2], &DSRId_Conn4_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn4_RG1, "Conn4_RG1_DSR1", Conn3_PublisherIdType,
+                     Conn3_PublisherId, WG_Id, DSW_Id, &subscriberVarIds[2],
+                     &fastPathSubscriberDataValues[2], &DSRId_Conn4_RG1_DSR1);
     ReaderGroupIds[3] = RGId_Conn4_RG1;
 
     /* setup Connection 5: */
@@ -857,8 +864,9 @@ static void DoTest_multiple_Connections(void) {
     AddReaderGroup(&ConnId_5, "Conn5_RG1", &RGId_Conn5_RG1);
     UA_NodeId DSRId_Conn5_RG1_DSR1;
     UA_NodeId_init(&DSRId_Conn5_RG1_DSR1);
-    AddDataSetReader(&RGId_Conn5_RG1, "Conn5_RG1_DSR1", Conn6_PublisherIdType, Conn6_PublisherId, WG_Id, DSW_Id,
-        &subscriberVarIds[5], &fastPathSubscriberDataValues[5], &DSRId_Conn5_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn5_RG1, "Conn5_RG1_DSR1", Conn6_PublisherIdType,
+                     Conn6_PublisherId, WG_Id, DSW_Id, &subscriberVarIds[5],
+                     &fastPathSubscriberDataValues[5], &DSRId_Conn5_RG1_DSR1);
     ReaderGroupIds[4] = RGId_Conn5_RG1;
 
     /* setup Connection 6: */
@@ -867,11 +875,11 @@ static void DoTest_multiple_Connections(void) {
     AddReaderGroup(&ConnId_6, "Conn6_RG1", &RGId_Conn6_RG1);
     UA_NodeId DSRId_Conn6_RG1_DSR1;
     UA_NodeId_init(&DSRId_Conn6_RG1_DSR1);
-    AddDataSetReader(&RGId_Conn6_RG1, "Conn6_RG1_DSR1", Conn5_PublisherIdType, Conn5_PublisherId, WG_Id, DSW_Id,
-        &subscriberVarIds[4], &fastPathSubscriberDataValues[4], &DSRId_Conn6_RG1_DSR1);
+    AddDataSetReader(&RGId_Conn6_RG1, "Conn6_RG1_DSR1", Conn5_PublisherIdType,
+                     Conn5_PublisherId, WG_Id, DSW_Id, &subscriberVarIds[4],
+                     &fastPathSubscriberDataValues[4], &DSRId_Conn6_RG1_DSR1);
     ReaderGroupIds[5] = RGId_Conn6_RG1;
 
-
     /* freeze all Groups */
     for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
         ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeWriterGroupConfiguration(server, WriterGroupIds[i]));
@@ -888,39 +896,51 @@ static void DoTest_multiple_Connections(void) {
     }
 
     /* check that publish/subscribe works -> set some test values */
-    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds, subscriberVarIds,
-        fastPathPublisherDataValues, fastPathSubscriberDataValues, 10, (UA_UInt32) 100, 3);
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds,
+                             subscriberVarIds, fastPathPublisherDataValues,
+                             fastPathSubscriberDataValues, 10, (UA_UInt32) 100, 3);
 
-    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
-        fastPathSubscriberDataValues, 50, (UA_UInt32) 100, 3);
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds,
+                             subscriberVarIds, fastPathPublisherDataValues,
+                             fastPathSubscriberDataValues, 50, (UA_UInt32) 100, 3);
 
-    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds, subscriberVarIds, fastPathPublisherDataValues,
-        fastPathSubscriberDataValues, 100, (UA_UInt32) 100, 3);
+    ValidatePublishSubscribe(DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS, publisherVarIds,
+                             subscriberVarIds, fastPathPublisherDataValues,
+                             fastPathSubscriberDataValues, 100, (UA_UInt32) 100, 3);
 
     /* set groups to disabled */
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable groups");
     for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
-        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupDisabled(server, WriterGroupIds[i]));
+        ck_assert_int_eq(UA_STATUSCODE_GOOD,
+                         UA_Server_setWriterGroupDisabled(server, WriterGroupIds[i]));
     }
     for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
-        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupDisabled(server, ReaderGroupIds[i]));
+        ck_assert_int_eq(UA_STATUSCODE_GOOD,
+                         UA_Server_setReaderGroupDisabled(server, ReaderGroupIds[i]));
     }
     /* unfreeze groups */
     for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
-        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeWriterGroupConfiguration(server, WriterGroupIds[i]));
+        ck_assert_int_eq(UA_STATUSCODE_GOOD,
+                         UA_Server_unfreezeWriterGroupConfiguration(server,
+                                                                    WriterGroupIds[i]));
     }
     for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
-        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_unfreezeReaderGroupConfiguration(server, ReaderGroupIds[i]));
+        ck_assert_int_eq(UA_STATUSCODE_GOOD,
+                         UA_Server_unfreezeReaderGroupConfiguration(server,
+                                                                    ReaderGroupIds[i]));
     }
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove PublishedDataSets");
     for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
-        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, PublishedDataSetIds[i]));
+        ck_assert_int_eq(UA_STATUSCODE_GOOD,
+                         UA_Server_removePublishedDataSet(server,
+                                                          PublishedDataSetIds[i]));
     }
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "remove Connection");
     for (UA_UInt32 i = 0; i < DOTEST_MULTIPLE_CONNECTIONS_MAX_COMPONENTS; i++) {
-        ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePubSubConnection(server, ConnectionIds[i]));
+        ck_assert_int_eq(UA_STATUSCODE_GOOD,
+                         UA_Server_removePubSubConnection(server, ConnectionIds[i]));
     }
 
     if (UseFastPath) {
@@ -939,7 +959,7 @@ static void DoTest_multiple_Connections(void) {
 /***************************************************************************************************/
 /* test with multiple connections */
 START_TEST(Test_multiple_connections) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_multiple_connections");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "START: Test_multiple_connections");
 
     /* note: fast-path does not support
         - multiple groups and/or DataSets yet, therefore we only test multiple connections
@@ -961,7 +981,7 @@ START_TEST(Test_multiple_connections) {
     UseRawEncoding = UA_TRUE;
     DoTest_multiple_Connections();
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_connections\n\n");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_connections");
 } END_TEST
 
 /***************************************************************************************************/
@@ -1297,7 +1317,7 @@ static void DoTest_string_PublisherId(void) {
 /***************************************************************************************************/
 /* test string PublisherId */
 START_TEST(Test_string_publisherId) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_string_publisherId");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "START: Test_string_publisherId");
 
     /* note: fast-path does not support STRING publisherIds */
     UseFastPath = UA_FALSE;
@@ -1308,7 +1328,7 @@ START_TEST(Test_string_publisherId) {
     UseRawEncoding = UA_TRUE;
     DoTest_string_PublisherId();
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_string_publisherId\n\n");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_string_publisherId");
 } END_TEST
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
@@ -1316,7 +1336,7 @@ START_TEST(Test_string_publisherId) {
 /***************************************************************************************************/
 START_TEST(Test_string_publisherId_file_config) {
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_string_publisherId_file_config");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "START: Test_string_publisherId_file_config");
 
     UseRawEncoding = UA_FALSE;
     UseFastPath = UA_FALSE;
@@ -1563,7 +1583,7 @@ START_TEST(Test_string_publisherId_file_config) {
 
     UA_ByteString_clear(&encodedConfigDataBuffer);
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_string_publisherId_file_config\n\n");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_string_publisherId_file_config");
 } END_TEST
 
 #endif /* UA_ENABLE_PUBSUB_FILE_CONFIG */
@@ -1918,7 +1938,7 @@ static void DoTest_multiple_Groups(void) {
 
 /***************************************************************************************************/
 START_TEST(Test_multiple_groups) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_multiple_groups");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "START: Test_multiple_groups");
 
     /* note: fast-path does not multiple groups/datasets/string publisher Ids
         therefore fast-path is not enabled at this test */
@@ -1930,7 +1950,7 @@ START_TEST(Test_multiple_groups) {
     UseRawEncoding = UA_TRUE;
     DoTest_multiple_Groups();
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_groups\n\n");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_groups");
 } END_TEST
 
 
@@ -2192,7 +2212,7 @@ static void DoTest_multiple_DataSets(void) {
 
 /***************************************************************************************************/
 START_TEST(Test_multiple_datasets) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_multiple_datasets");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "START: Test_multiple_datasets");
 
     /* note: fast-path does not multiple groups/datasets/string publisher Ids
         therefore fast-path is not enabled at this test */
@@ -2204,7 +2224,7 @@ START_TEST(Test_multiple_datasets) {
     UseRawEncoding = UA_TRUE;
     DoTest_multiple_DataSets();
 
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_datasets\n\n");
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_multiple_datasets");
 } END_TEST
 
 

From 8d5d7400a84e8a0d195a05749613a5885307a22c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Jun 2023 21:57:53 +0200
Subject: [PATCH 0977/1963] fix(test): Fix a segfault in check_eventloop_mqtt.c

---
 tests/check_eventloop_mqtt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/check_eventloop_mqtt.c b/tests/check_eventloop_mqtt.c
index 53413868d34..220e4ddccc5 100644
--- a/tests/check_eventloop_mqtt.c
+++ b/tests/check_eventloop_mqtt.c
@@ -75,12 +75,13 @@ START_TEST(connectSubscribePublish) {
     el->run(el, 100);
 
     /* Send with the subscribed connection succeeds */
-    UA_ByteString msg = UA_BYTESTRING("open62541-msg");
+    UA_ByteString msg = UA_BYTESTRING_ALLOC("open62541-msg");
     res = mcm->sendWithConnection(mcm, subscribeConnectionId,
                                   &UA_KEYVALUEMAP_NULL, &msg);
     ck_assert(res == UA_STATUSCODE_GOOD);
 
     /* Send with the publish connection */
+    msg = UA_BYTESTRING_ALLOC("open62541-msg");
     res = mcm->sendWithConnection(mcm, publishConnectionId,
                                   &UA_KEYVALUEMAP_NULL, &msg);
     ck_assert(res == UA_STATUSCODE_GOOD);

From 5cdbc25f788acfe813d0b84dd8c23beea17102c0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 12 Jun 2023 00:45:13 +0200
Subject: [PATCH 0978/1963] fix(el): Fix a number casting warning in
 eventloop_mqtt.c

---
 arch/eventloop_mqtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index e006492a490..983820c05a0 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -621,7 +621,7 @@ createBrokerConnection(MQTTConnectionManager *mcm,
 
     UA_EventLoop *el = mcm->cm.eventSource.eventLoop;
     res = el->addCyclicCallback(el, (UA_Callback)MQTTKeepAliveCallback, NULL, bc,
-                                bc->keepalive * UA_DATETIME_SEC,
+                                (UA_Double)(bc->keepalive * UA_DATETIME_SEC),
                                 NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
                                 &bc->keepAliveCallbackId);
     if(res != UA_STATUSCODE_GOOD) {

From dc9521f23bc8cce47f9f658e812c0508dc0fb005 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 11 Jun 2023 21:11:11 +0200
Subject: [PATCH 0979/1963] refactor(pubsub): Switch PubSub to EventLoop model

---
 CMakeLists.txt                                |   17 +-
 examples/CMakeLists.txt                       |    3 -
 ...erver_pubsub_subscribe_custom_monitoring.c |    6 -
 .../pubsub_subscribe_standalone_dataset.c     |    9 +-
 .../server_pubsub_publisher_rt_level_raw.c    |  210 ---
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |   13 +-
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   |   10 +-
 examples/pubsub/tutorial_pubsub_publish_raw.c |  357 -----
 .../pubsub/tutorial_pubsub_subscribe_raw.c    |  400 ------
 plugins/mqtt/ua_mqtt-c_adapter.c              |   16 +-
 src/pubsub/ua_pubsub.h                        |  124 +-
 src/pubsub/ua_pubsub_config.c                 |   78 --
 src/pubsub/ua_pubsub_connection.c             |  317 +++--
 src/pubsub/ua_pubsub_dataset.c                |   54 +
 src/pubsub/ua_pubsub_eventloop.c              | 1007 ++++++++++++++
 src/pubsub/ua_pubsub_keystorage.c             |    7 +-
 src/pubsub/ua_pubsub_manager.c                |   12 +-
 src/pubsub/ua_pubsub_reader.c                 |  360 +----
 src/pubsub/ua_pubsub_readergroup.c            |  234 ++--
 src/pubsub/ua_pubsub_securitygroup.c          |    3 +-
 src/pubsub/ua_pubsub_writergroup.c            |  225 ++-
 src/server/ua_server.c                        |   37 +-
 src/server/ua_server_internal.h               |    3 -
 tests/CMakeLists.txt                          |   16 +-
 tests/fuzz/CMakeLists.txt                     |    8 +
 tests/pubsub/check_pubsub_connection_mqtt.c   |   11 +-
 .../pubsub/check_pubsub_encrypted_rt_levels.c |  105 +-
 tests/pubsub/check_pubsub_get_state.c         |    5 +-
 .../check_pubsub_informationmodel_methods.c   |    2 +-
 tests/pubsub/check_pubsub_mqtt.c              |    5 +-
 ...heck_pubsub_multiple_subscribe_rt_levels.c |   99 +-
 tests/pubsub/check_pubsub_publish_ethernet.c  |   18 +-
 .../check_pubsub_publish_ethernet_etf.c       |   10 +-
 tests/pubsub/check_pubsub_publish_rt_levels.c |  140 +-
 tests/pubsub/check_pubsub_publish_uadp.c      |  171 +--
 tests/pubsub/check_pubsub_publisherid.c       |    3 -
 tests/pubsub/check_pubsub_subscribe.c         |  132 +-
 .../check_pubsub_subscribe_msgrcvtimeout.c    | 1201 +++++++++--------
 .../pubsub/check_pubsub_subscribe_rt_levels.c |   85 +-
 tools/ci.sh                                   |    9 +-
 40 files changed, 2386 insertions(+), 3136 deletions(-)
 delete mode 100644 examples/pubsub/server_pubsub_publisher_rt_level_raw.c
 delete mode 100644 examples/pubsub/tutorial_pubsub_publish_raw.c
 delete mode 100644 examples/pubsub/tutorial_pubsub_subscribe_raw.c
 create mode 100644 src/pubsub/ua_pubsub_eventloop.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1592366b473..395c2b376f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1008,6 +1008,7 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_discovery.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage.c
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_eventloop.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_connection.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_dataset.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_writer.c
@@ -1170,8 +1171,17 @@ if(UA_ENABLE_DISCOVERY)
 endif()
 
 if(UA_ENABLE_MQTT)
+    if(NOT EXISTS "${UA_FILE_MQTT}")
+        message(STATUS "Submodule update")
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
+        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+            message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}")
+        endif()
+    endif()
+
     include_directories("${open62541_MQTT_DIR}/include")
-    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
+    list(APPEND ua_architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
 endif()
 
 if(UA_ENABLE_PUBSUB)
@@ -1196,8 +1206,9 @@ if(UA_ENABLE_PUBSUB)
                  ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h
                  ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_mqtt.h
                  ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.h)
-            list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt_pal.c
-                 ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt.c
+            list(APPEND default_plugin_sources
+            #                 ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt_pal.c
+            #                 ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt.c
                  ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_mqtt.c
                  ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.c)
         endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c0d72b9d17c..2a7f8d5e9f9 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -214,10 +214,8 @@ if(UA_ENABLE_PUBSUB)
     add_example(tutorial_pubsub_connection pubsub/tutorial_pubsub_connection.c)
     add_example(tutorial_pubsub_publish pubsub/tutorial_pubsub_publish.c)
     add_example(server_pubsub_publish_on_demand pubsub/server_pubsub_publisher_on_demand.c)
-    add_example(tutorial_pubsub_publish_raw pubsub/tutorial_pubsub_publish_raw.c)
     add_example(server_pubsub_publisher_iop pubsub/server_pubsub_publisher_iop.c)
     add_example(server_pubsub_publish_rt_level pubsub/server_pubsub_publisher_rt_level.c)
-    add_example(server_pubsub_publish_rt_level_raw pubsub/server_pubsub_publisher_rt_level_raw.c)
     add_example(server_pubsub_rt_information_model pubsub/server_pubsub_rt_field_information_model.c)
     if(CMAKE_SYSTEM MATCHES "Linux")
         if(UA_ENABLE_PUBSUB_ETH_UADP AND UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_IMMUTABLE_NODES)
@@ -231,7 +229,6 @@ if(UA_ENABLE_PUBSUB)
         message(WARNING "Build option BUILD_SHARED_LIBS not supported for standalone subscriber and realtime examples. Skipping these examples.")
     else (NOT BUILD_SHARED_LIBS)
         add_example(pubsub_subscribe_standalone pubsub/pubsub_subscribe_standalone.c)
-        add_example(tutorial_pubsub_subscribe_raw pubsub/tutorial_pubsub_subscribe_raw.c)
         add_example(pubsub_subscribe_standalone_dataset pubsub/pubsub_subscribe_standalone_dataset.c)
         if(CMAKE_SYSTEM MATCHES "Linux")
             add_example(pubsub_TSN_publisher_multiple_thread pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c)
diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index 742923e70af..07d07f73686 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -85,12 +85,6 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConfig.publisherId.uint32 = UA_UInt32_random();
     retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
-    if (retval != UA_STATUSCODE_GOOD) {
-        return retval;
-    }
-    UA_LOCK(&server->serviceMutex);
-    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
-    UA_UNLOCK(&server->serviceMutex);
     return retval;
 }
 
diff --git a/examples/pubsub/pubsub_subscribe_standalone_dataset.c b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
index 4247bb6d277..959154f8f56 100644
--- a/examples/pubsub/pubsub_subscribe_standalone_dataset.c
+++ b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
@@ -102,14 +102,7 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherId.uint32 = UA_UInt32_random();
-    retval |=
-        UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
-    if(retval != UA_STATUSCODE_GOOD) {
-        return retval;
-    }
-    UA_LOCK(&server->serviceMutex);
-    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
-    UA_UNLOCK(&server->serviceMutex);
+    retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
     return retval;
 }
 
diff --git a/examples/pubsub/server_pubsub_publisher_rt_level_raw.c b/examples/pubsub/server_pubsub_publisher_rt_level_raw.c
deleted file mode 100644
index f3cf5d41d85..00000000000
--- a/examples/pubsub/server_pubsub_publisher_rt_level_raw.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* 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 <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
-#include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include <signal.h>
-#include <stdlib.h>
-#include <open62541/server_pubsub.h>
-
-/* possible options: PUBSUB_CONFIG_FASTPATH_NONE, PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS, PUBSUB_CONFIG_FASTPATH_STATIC_VALUES */
-#define PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS
-#define PUBSUB_CONFIG_PUBLISH_CYCLE_MS 100
-#define PUBSUB_CONFIG_PUBLISH_CYCLES 1000000
-#define PUBSUB_CONFIG_FIELD_COUNT 10
-
-/**
- * The PubSub RT level example points out the configuration of different PubSub RT-levels. These levels will be
- * used together with an RT capable OS for deterministic message generation. The main target is to reduce the time
- * spread and effort during the publish cycle. Most of the RT levels are based on pre-generated and buffered
- * DataSetMesseges and NetworkMessages. Since changes in the PubSub-configuration will invalidate the buffered
- * frames, the PubSub configuration must be frozen after the configuration phase.
- *
- * This example can be configured to compare and measure the different PubSub options by the following define options:
- * PUBSUB_CONFIG_FASTPATH_NONE -> The published fields are added to the information model and published in the default non-RT mode
- * PUBSUB_CONFIG_FASTPATH_STATIC_VALUES -> The published fields are not visible in the information model. The publish cycle is improved
- * by prevent the value lookup within the information model.
- * PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS -> The published fields are not visible in the information model. After the PubSub-configuration
- * freeze, the NetworkMessages and DataSetMessages will be calculated and buffered. During the publish cycle these buffers will only be updated.
- */
-
-
-UA_NodeId publishedDataSetIdent, dataSetFieldIdent, writerGroupIdent, connectionIdentifier;
-UA_UInt32 *valueStore[PUBSUB_CONFIG_FIELD_COUNT];
-UA_DataValue *staticValueSource[PUBSUB_CONFIG_FIELD_COUNT];
-
-
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
-/* The following PubSub configuration does not differ from the 'normal' configuration */
-static void
-addMinimalPubSubConfiguration(UA_Server * server){
-    /* Add one PubSubConnection */
-    UA_PubSubConnectionConfig connectionConfig;
-    memset(&connectionConfig, 0, sizeof(connectionConfig));
-    connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
-    connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.enabled = UA_TRUE;
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
-    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
-    connectionConfig.publisherId.uint16 = 2234;
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
-    /* Add one PublishedDataSet */
-    UA_PublishedDataSetConfig publishedDataSetConfig;
-    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
-    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-    publishedDataSetConfig.name = UA_STRING("Demo PDS");
-    /* Add one DataSetField to the PDS */
-    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent);
-}
-
-static void
-valueUpdateCallback(UA_Server *server, void *data) {
-#if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    for (int i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; ++i)
-        *valueStore[i] = *valueStore[i] + 1;
-    if(*valueStore[0] > PUBSUB_CONFIG_PUBLISH_CYCLES)
-        running = false;
-#endif
-#if defined PUBSUB_CONFIG_FASTPATH_NONE
-    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++){
-        UA_Variant value;
-        UA_Variant_init(&value);
-        if(UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 1000 + (UA_UInt32) i), &value) != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Failed to read publish value. Node number: %zu", i);
-            continue;
-        }
-        UA_UInt32 *intValue = (UA_UInt32 *) value.data;
-        *intValue = *intValue + 1;
-        if(UA_Server_writeValue(server, UA_NODEID_NUMERIC(1, 1000 + (UA_UInt32) i), value) != UA_STATUSCODE_GOOD){
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Failed to update publish value. Node number: %zu", i);
-            continue;
-        }
-        if(i == 0 && *intValue  > PUBSUB_CONFIG_PUBLISH_CYCLES)
-            running = false;
-        UA_Variant_clear(&value);
-    }
-#endif
-}
-
-int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
-    UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-
-    /*Add standard PubSub configuration (no difference to the std. configuration)*/
-    addMinimalPubSubConfiguration(server);
-
-    UA_WriterGroupConfig writerGroupConfig;
-    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
-    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
-    writerGroupConfig.publishingInterval = PUBSUB_CONFIG_PUBLISH_CYCLE_MS;
-    writerGroupConfig.enabled = UA_FALSE;
-    writerGroupConfig.writerGroupId = 100;
-    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
-    writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
-    UA_UadpWriterGroupMessageDataType writerGroupMessage;
-    UA_UadpWriterGroupMessageDataType_init(&writerGroupMessage);
-    /* Change message settings of writerGroup to send PublisherId,
-     * WriterGroupId in GroupHeader and DataSetWriterId in PayloadHeader
-     * of NetworkMessage */
-    writerGroupMessage.networkMessageContentMask = (UA_UadpNetworkMessageContentMask) ((UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
-                                                    (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
-                                                    (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
-                                                    (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
-    writerGroupConfig.messageSettings.content.decoded.data = &writerGroupMessage;
-#ifdef PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS
-    writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-#elif defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    writerGroupConfig.rtLevel = UA_PUBSUB_RT_DIRECT_VALUE_ACCESS;
-#endif
-    UA_Server_addWriterGroup(server, connectionIdentifier, &writerGroupConfig, &writerGroupIdent);
-    /* Add one DataSetWriter */
-    UA_NodeId dataSetWriterIdent;
-    UA_DataSetWriterConfig dataSetWriterConfig;
-    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
-    dataSetWriterConfig.name = UA_STRING("Demo DataSetWriter");
-    dataSetWriterConfig.dataSetWriterId = 62541;
-    dataSetWriterConfig.keyFrameCount = 10;
-
-    /* Encode fields as RAW-Encoded */
-    dataSetWriterConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
-
-    UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent);
-
-#if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    /* Add one DataSetField with static value source to PDS */
-    UA_DataSetFieldConfig dsfConfig;
-    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++){
-        memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
-        staticValueSource[i] = UA_DataValue_new();
-        /* Create Variant and configure as DataSetField source */
-        UA_UInt32 *intValue = UA_UInt32_new();
-        *intValue = (UA_UInt32) i * 1000;
-        valueStore[i] = intValue;
-        UA_Variant_setScalar(&staticValueSource[i]->value, intValue, &UA_TYPES[UA_TYPES_UINT32]);
-        dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
-        dsfConfig.field.variable.rtValueSource.staticValueSource = &staticValueSource[i];
-        char str[12];
-        sprintf(str, "Field %zu", i);
-        dsfConfig.field.variable.fieldNameAlias = UA_STRING(str);
-        UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent);
-    }
-#endif
-#if defined PUBSUB_CONFIG_FASTPATH_NONE
-    UA_DataSetFieldConfig dsfConfig;
-    memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
-    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++){
-        UA_VariableAttributes attributes = UA_VariableAttributes_default;
-        UA_Variant value;
-        UA_Variant_init(&value);
-        UA_UInt32 intValue = (UA_UInt32) i * 1000;
-        UA_Variant_setScalar(&value, &intValue, &UA_TYPES[UA_TYPES_UINT32]);
-        attributes.value = value;
-        if(UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000 + (UA_UInt32) i),
-                UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                UA_QUALIFIEDNAME(1, "variable"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                 attributes, NULL, NULL) != UA_STATUSCODE_GOOD){
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Failed to add Publish-Node to the server. Node number: %zu", i);
-            continue;
-        }
-        dsfConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 1000 + (UA_UInt32) i);
-        dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent);
-    }
-#endif
-    /* The PubSub configuration is currently editable and the publish callback is not running */
-    writerGroupConfig.publishingInterval = PUBSUB_CONFIG_PUBLISH_CYCLE_MS;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-    /* Freeze the PubSub configuration (and start implicitly the publish callback) */
-    UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
-    UA_Server_setWriterGroupOperational(server, writerGroupIdent);
-
-    UA_UInt64 callbackId;
-    UA_Server_addRepeatedCallback(server, valueUpdateCallback, NULL, PUBSUB_CONFIG_PUBLISH_CYCLE_MS, &callbackId);
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_Server_run(server, &running);
-
-    UA_Server_delete(server);
-#if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    for(int i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; ++i) {
-        UA_DataValue_delete(staticValueSource[i]);
-    }
-#endif
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 8d960a56e6e..72413af1bb5 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -43,7 +43,6 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
 #include <open62541/plugin/securitypolicy_default.h>
-#include <open62541/plugin/pubsub_mqtt.h>
 
 #define CONNECTION_NAME              "MQTT Publisher Connection"
 #define TRANSPORT_PROFILE_URI        "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
@@ -472,15 +471,11 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* Details about the connection configuration and handling are located in
-     * the pubsub connection tutorial */
 
-#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION)
     /* Instantiate the PubSub SecurityPolicy */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
@@ -488,12 +483,10 @@ int main(int argc, char **argv) {
                                       &config->logger);
 #endif
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
-
     addPubSubConnection(server, addressUrl);
     addPublishedDataSet(server);
     addDataSetField(server);
-    retval = addWriterGroup(server, topic, interval);
+    UA_StatusCode retval = addWriterGroup(server, topic, interval);
     if(UA_STATUSCODE_GOOD != retval) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "Error Name = %s", UA_StatusCode_name(retval));
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index ff3eb2352c2..aa9eb2e9799 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -7,7 +7,6 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
 #include <open62541/plugin/securitypolicy_default.h>
-#include <open62541/plugin/pubsub_mqtt.h>
 
 #define CONNECTION_NAME               "MQTT Subscriber Connection"
 #define TRANSPORT_PROFILE_URI         "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
@@ -373,12 +372,11 @@ int main(int argc, char **argv) {
     int interval = SUBSCRIBE_INTERVAL;
 
     /* Return value initialized to Status Good */
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
 
-#if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && !defined(UA_ENABLE_JSON_ENCODING)
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION)
     /* Instantiate the PubSub SecurityPolicy */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
@@ -386,11 +384,9 @@ int main(int argc, char **argv) {
                                       &config->logger);
 #endif
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
-
     /* API calls */
     /* Add PubSubConnection */
-    retval |= addPubSubConnection(server, addressUrl);
+    UA_StatusCode retval = addPubSubConnection(server, addressUrl);
     if (retval != UA_STATUSCODE_GOOD)
         return EXIT_FAILURE;
 
diff --git a/examples/pubsub/tutorial_pubsub_publish_raw.c b/examples/pubsub/tutorial_pubsub_publish_raw.c
deleted file mode 100644
index 1134bbed900..00000000000
--- a/examples/pubsub/tutorial_pubsub_publish_raw.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
-
-/* This example demonstrate the configuration and usage of PubSub with RAW-Encoding.
- * Use this example together with the extended pubsub_subscribe_standalone example
- * to receive the raw-encoded messages. Ensure to enable the PubSub NS0 integration
- * to expose the necessary MetaData for the Subscriber.
- *
- */
-
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
-#include <open62541/server.h>
-
-const UA_NodeId pointVariableTypeId = {
-    1, UA_NODEIDTYPE_NUMERIC, {4243}};
-
-UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent, pointVariableNode;
-
-/* The binary encoding id's for the datatypes */
-#define Point_binary_encoding_id        1
-
-typedef struct {
-    UA_Float x;
-    UA_Float y;
-    UA_Float z;
-} Point;
-
-/* The datatype description for the Point datatype */
-#define Point_padding_y offsetof(Point,y) - offsetof(Point,x) - sizeof(UA_Float)
-#define Point_padding_z offsetof(Point,z) - offsetof(Point,y) - sizeof(UA_Float)
-
-static UA_DataTypeMember Point_members[3] = {
-    /* x */
-    {
-        UA_TYPENAME("x")           /* .memberName */
-        &UA_TYPES[UA_TYPES_FLOAT], /* .memberType */
-        0,                         /* .padding */
-        false,                     /* .isArray */
-        false                      /* .isOptional */
-    },
-
-    /* y */
-    {
-        UA_TYPENAME("y")           /* .memberName */
-        &UA_TYPES[UA_TYPES_FLOAT], /* .memberType */
-        Point_padding_y,           /* .padding */
-        false,                     /* .isArray */
-        false                      /* .isOptional */
-    },
-    /* z */
-    {
-        UA_TYPENAME("z")           /* .memberName */
-        &UA_TYPES[UA_TYPES_FLOAT], /* .memberType */
-        Point_padding_z,           /* .padding */
-        false,                     /* .isArray */
-        false                      /* .isOptional */
-    }
-};
-
-static UA_DataType PointType = {
-    UA_TYPENAME("Point")                /* .typeName */
-    {1, UA_NODEIDTYPE_NUMERIC, {4242}}, /* .typeId */
-    {1, UA_NODEIDTYPE_NUMERIC, {Point_binary_encoding_id}}, /* .binaryEncodingId, the numeric
-                                            identifier used on the wire (the
-                                            namespaceindex is from .typeId) */
-    sizeof(Point),                      /* .memSize */
-    UA_DATATYPEKIND_STRUCTURE,          /* .typeKind */
-    true,                               /* .pointerFree */
-    false,                              /* .overlayable (depends on endianness and
-                                            the absence of padding) */
-    3,                                  /* .membersSize */
-    Point_members
-};
-
-/* non raw encoding specific */
-static void
-addPubSubConnection(UA_Server *server, UA_String *transportProfile,
-                    UA_NetworkAddressUrlDataType *networkAddressUrl){
-    /* Details about the connection configuration and handling are located
-     * in the pubsub connection tutorial */
-    UA_PubSubConnectionConfig connectionConfig;
-    memset(&connectionConfig, 0, sizeof(connectionConfig));
-    connectionConfig.name = UA_STRING("UADP Connection 1");
-    connectionConfig.transportProfileUri = *transportProfile;
-    connectionConfig.enabled = UA_TRUE;
-    UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
-                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    /* Changed to static publisherId from random generation to identify
-     * the publisher on Subscriber side */
-    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
-    connectionConfig.publisherId.uint16 = 2234;
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-}
-
-/* non raw encoding specific */
-static void
-addPublishedDataSet(UA_Server *server) {
-    /* The PublishedDataSetConfig contains all necessary public
-    * information for the creation of a new PublishedDataSet */
-    UA_PublishedDataSetConfig publishedDataSetConfig;
-    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
-    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-    publishedDataSetConfig.name = UA_STRING("Demo PDS");
-    /* Create new PublishedDataSet based on the PublishedDataSetConfig. */
-    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent);
-    publishedDataSetConfig.name = UA_STRING("Seconds PDS");
-    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, NULL);
-}
-
-/* non raw encoding specific */
-static void
-addDataSetField(UA_Server *server) {
-    /* Add a field to the previous created PublishedDataSet */
-    UA_NodeId dataSetFieldIdent;
-    UA_DataSetFieldConfig dataSetFieldConfig;
-    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
-    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
-    UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
-    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSetIdent,
-                              &dataSetFieldConfig, &dataSetFieldIdent);
-
-    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("String field");
-    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 1000);
-    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    dataSetFieldConfig.field.variable.maxStringLength = 50;
-    UA_Server_addDataSetField(server, publishedDataSetIdent,
-                              &dataSetFieldConfig, &dataSetFieldIdent);
-
-    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server StartTime");
-    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
-        UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STARTTIME);
-    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSetIdent,
-                              &dataSetFieldConfig, NULL);
-
-    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Point");
-    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable = pointVariableNode;
-
-    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_Server_addDataSetField(server, publishedDataSetIdent,
-                              &dataSetFieldConfig, NULL);
-}
-
-/* non raw encoding specific */
-static void
-addWriterGroup(UA_Server *server) {
-    /* Now we create a new WriterGroupConfig and add the group to the existing
-     * PubSubConnection. */
-    UA_WriterGroupConfig writerGroupConfig;
-    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
-    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
-    writerGroupConfig.publishingInterval = 100;
-    writerGroupConfig.enabled = UA_FALSE;
-    writerGroupConfig.writerGroupId = 100;
-    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
-    writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
-    /* The configuration flags for the messages are encapsulated inside the
-     * message- and transport settings extension objects. These extension
-     * objects are defined by the standard. e.g.
-     * UadpWriterGroupMessageDataType */
-    UA_UadpWriterGroupMessageDataType *writerGroupMessage  = UA_UadpWriterGroupMessageDataType_new();
-    /* Change message settings of writerGroup to send PublisherId,
-     * WriterGroupId in GroupHeader and DataSetWriterId in PayloadHeader
-     * of NetworkMessage */
-    writerGroupMessage->networkMessageContentMask          = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
-                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
-                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
-                                                              (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
-    writerGroupConfig.messageSettings.content.decoded.data = writerGroupMessage;
-    UA_Server_addWriterGroup(server, connectionIdent, &writerGroupConfig, &writerGroupIdent);
-    UA_Server_setWriterGroupOperational(server, writerGroupIdent);
-    UA_UadpWriterGroupMessageDataType_delete(writerGroupMessage);
-}
-
-static void
-addDataSetWriter(UA_Server *server) {
-    /* We need now a DataSetWriter within the WriterGroup. This means we must
-     * create a new DataSetWriterConfig and add call the addWriterGroup function. */
-    UA_NodeId dataSetWriterIdent;
-    UA_DataSetWriterConfig dataSetWriterConfig;
-    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
-    dataSetWriterConfig.name = UA_STRING("Demo DataSetWriter");
-    dataSetWriterConfig.dataSetWriterId = 62541;
-    dataSetWriterConfig.keyFrameCount = 10;
-
-    /* Encode fields as RAW-Encoded */
-    dataSetWriterConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
-
-    UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
-                               &dataSetWriterConfig, &dataSetWriterIdent);
-}
-
-static void add3DPointDataType(UA_Server* server)
-{
-    UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-    attr.displayName = UA_LOCALIZEDTEXT("en-US", "3D Point Type");
-
-    UA_Server_addDataTypeNode(
-        server, PointType.typeId, UA_NODEID_NUMERIC(0, UA_NS0ID_STRUCTURE),
-        UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE), UA_QUALIFIEDNAME(1, "3D.Point"), attr, NULL, NULL);
-}
-
-static void
-add3DPointVariableType(UA_Server *server) {
-    UA_VariableTypeAttributes dattr = UA_VariableTypeAttributes_default;
-    dattr.description = UA_LOCALIZEDTEXT("en-US", "3D Point");
-    dattr.displayName = UA_LOCALIZEDTEXT("en-US", "3D Point");
-    dattr.dataType = PointType.typeId;
-    dattr.valueRank = UA_VALUERANK_SCALAR;
-
-    Point p;
-    p.x = 0.0;
-    p.y = 0.0;
-    p.z = 0.0;
-    UA_Variant_setScalar(&dattr.value, &p, &PointType);
-
-    UA_Server_addVariableTypeNode(server, pointVariableTypeId,
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
-                                  UA_QUALIFIEDNAME(1, "3D.Point"),
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                  dattr, NULL, NULL);
-
-}
-
-static void
-add3DPointVariable(UA_Server *server) {
-    Point p;
-    p.x = 41.0;
-    p.y = 42.0;
-    p.z = 43.0;
-    UA_VariableAttributes vattr = UA_VariableAttributes_default;
-    vattr.description = UA_LOCALIZEDTEXT("en-US", "3D Point");
-    vattr.displayName = UA_LOCALIZEDTEXT("en-US", "3D Point");
-    vattr.dataType = PointType.typeId;
-    vattr.valueRank = UA_VALUERANK_SCALAR;
-    UA_Variant_setScalar(&vattr.value, &p, &PointType);
-
-    UA_Server_addVariableNode(server, UA_NODEID_STRING(1, "3D.Point"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                              UA_QUALIFIEDNAME(1, "3D.Point"),
-                              pointVariableTypeId, vattr, NULL, &pointVariableNode);
-}
-
-static int run(UA_String *transportProfile,
-               UA_NetworkAddressUrlDataType *networkAddressUrl) {
-    UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* Add custom Datatypes */
-    UA_DataType *types = (UA_DataType*)UA_malloc(sizeof(UA_DataType));
-    UA_DataTypeMember *pointMembers = (UA_DataTypeMember*)UA_malloc(sizeof(UA_DataTypeMember) * 3);
-    pointMembers[0] = Point_members[0];
-    pointMembers[1] = Point_members[1];
-    pointMembers[2] = Point_members[2];
-    types[0] = PointType;
-    types[0].members = pointMembers;
-
-    UA_DataTypeArray customDataTypes = {config->customDataTypes, 1, types, UA_FALSE};
-    config->customDataTypes = &customDataTypes;
-
-    add3DPointDataType(server);
-    add3DPointVariableType(server);
-    add3DPointVariable(server);
-
-    /* Details about the connection configuration and handling are located in
-     * the pubsub connection tutorial */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
-    //add string variable to information model
-    UA_VariableAttributes variableAttributes = UA_VariableAttributes_default;
-    UA_String value = UA_STRING("hello world");
-    UA_Variant_setScalar(&variableAttributes.value, &value, &UA_TYPES[UA_TYPES_STRING]);
-    variableAttributes.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
-    UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 1000),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                              UA_QUALIFIEDNAME(1, "publishNode"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                              variableAttributes, NULL, NULL );
-
-    //generic OPC UA configuration
-    addPubSubConnection(server, transportProfile, networkAddressUrl);
-    addPublishedDataSet(server);
-    addDataSetField(server);
-    addWriterGroup(server);
-    //contain RAW-encoding specific configuration fields
-    addDataSetWriter(server);
-
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
-    UA_Server_delete(server);
-    UA_free(pointMembers);
-    UA_free(types);
-
-    UA_NodeId_clear(&connectionIdent);
-    UA_NodeId_clear(&publishedDataSetIdent);
-    UA_NodeId_clear(&writerGroupIdent);
-    UA_NodeId_clear(&pointVariableNode);
-
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-static void
-usage(char *progname) {
-    printf("usage: %s <uri> [device]\n", progname);
-}
-
-int main(int argc, char **argv) {
-    UA_String transportProfile =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
-
-    if(argc > 1) {
-        if (strcmp(argv[1], "-h") == 0) {
-            usage(argv[0]);
-            return EXIT_SUCCESS;
-        } else if (strncmp(argv[1], "opc.udp://", 10) == 0) {
-            networkAddressUrl.url = UA_STRING(argv[1]);
-        } else if (strncmp(argv[1], "opc.eth://", 10) == 0) {
-            transportProfile =
-                UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
-            if (argc < 3) {
-                printf("Error: UADP/ETH needs an interface name\n");
-                return EXIT_FAILURE;
-            }
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
-            networkAddressUrl.url = UA_STRING(argv[1]);
-        } else {
-            printf("Error: unknown URI\n");
-            return EXIT_FAILURE;
-        }
-    }
-
-    return run(&transportProfile, &networkAddressUrl);
-}
diff --git a/examples/pubsub/tutorial_pubsub_subscribe_raw.c b/examples/pubsub/tutorial_pubsub_subscribe_raw.c
deleted file mode 100644
index a1cf4c4bb9b..00000000000
--- a/examples/pubsub/tutorial_pubsub_subscribe_raw.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
-*/
-
-/* During the RAW-Encoding decode process, the MetaData-Information are needed.
- * The OPC UA specification defines several ways to collect these information (see. Part 14 5.2.3).
- * Currently we use an OPC UA client to collect the MetaData form the publisher.
- * Attention: There can be more than one publisher servers later.
- * The following defines tell the server, where to collect the MetaData. (currently used for all DSR)"
- */
-#define METADATA_SOURCE_SERVER "opc.tcp://localhost:4840"
-#define METADATA_DATASET_NAME "Demo PDS"
-
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
-#include <open62541/server.h>
-
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
-#include <open62541/client_config_default.h>
-#include <open62541/client_highlevel.h>
-
-#include "server/ua_server_internal.h"
-
-#include <stdio.h>
-
-#include "custom_datatype/custom_datatype.h"
-
-UA_NodeId connectionIdentifier;
-UA_NodeId readerGroupIdentifier;
-UA_NodeId readerIdentifier;
-UA_DataSetReaderConfig readerConfig;
-
-static void collectDataSetMetaDataFromServer(UA_Server *server, UA_DataSetMetaDataType *pMetaData);
-
-/* Add new connection to the server */
-static UA_StatusCode
-addPubSubConnection(UA_Server *server, UA_String *transportProfile,
-                    UA_NetworkAddressUrlDataType *networkAddressUrl) {
-    if((server == NULL) || (transportProfile == NULL) ||
-        (networkAddressUrl == NULL)) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    /* Configuration creation for the connection */
-    UA_PubSubConnectionConfig connectionConfig;
-    memset (&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
-    connectionConfig.name = UA_STRING("UDPMC Connection 1");
-    connectionConfig.transportProfileUri = *transportProfile;
-    connectionConfig.enabled = UA_TRUE;
-    UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
-                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
-    connectionConfig.publisherId.uint32 = UA_UInt32_random();
-    retval |= UA_Server_addPubSubConnection (server, &connectionConfig, &connectionIdentifier);
-    if(retval != UA_STATUSCODE_GOOD) {
-        return retval;
-    }
-    UA_LOCK(&server->serviceMutex);
-    retval |= UA_PubSubConnection_regist(server, &connectionIdentifier, NULL);
-    UA_UNLOCK(&server->serviceMutex);
-    return retval;
-}
-
-/* Add ReaderGroup to the created connection */
-static UA_StatusCode
-addReaderGroup(UA_Server *server) {
-    if(server == NULL) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_ReaderGroupConfig readerGroupConfig;
-    memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
-    readerGroupConfig.name = UA_STRING("ReaderGroup1");
-    retval |= UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
-                                       &readerGroupIdentifier);
-    UA_Server_setReaderGroupOperational(server, readerGroupIdentifier);
-    return retval;
-}
-
-/* Add DataSetReader to the ReaderGroup */
-static UA_StatusCode
-addDataSetReader(UA_Server *server) {
-    if(server == NULL) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
-    readerConfig.name = UA_STRING("DataSet Reader 1");
-    /* Parameters to filter which DataSetMessage has to be processed
-     * by the DataSetReader */
-    /* The following parameters are used to show that the data published by
-     * tutorial_pubsub_publish.c is being subscribed and is being updated in
-     * the information model */
-    UA_UInt16 publisherIdentifier = 2234;
-    readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
-    readerConfig.publisherId.data = &publisherIdentifier;
-    readerConfig.writerGroupId    = 100;
-    readerConfig.dataSetWriterId  = 62541;
-
-    /* Setting up Meta data configuration in DataSetReader */
-/*
-    fillTestDataSetMetaData(&readerConfig.dataSetMetaData);
-*/
-    collectDataSetMetaDataFromServer(server, &readerConfig.dataSetMetaData);
-    retval |= UA_Server_addDataSetReader(server, readerGroupIdentifier, &readerConfig,
-                                         &readerIdentifier);
-    return retval;
-}
-
-/* Set SubscribedDataSet type to TargetVariables data type
- * Add subscribedvariables to the DataSetReader */
-static UA_StatusCode
-addSubscribedVariables (UA_Server *server, UA_NodeId dataSetReaderId) {
-    if(server == NULL) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_NodeId folderId;
-    UA_String folderName = readerConfig.dataSetMetaData.name;
-    UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
-    UA_QualifiedName folderBrowseName;
-    if(folderName.length > 0) {
-        oAttr.displayName.locale = UA_STRING ("en-US");
-        oAttr.displayName.text = folderName;
-        folderBrowseName.namespaceIndex = 1;
-        folderBrowseName.name = folderName;
-    }
-    else {
-        oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
-        folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
-    }
-
-    UA_Server_addObjectNode (server, UA_NODEID_NULL,
-                             UA_NODEID_NUMERIC (0, UA_NS0ID_OBJECTSFOLDER),
-                             UA_NODEID_NUMERIC (0, UA_NS0ID_ORGANIZES),
-                             folderBrowseName, UA_NODEID_NUMERIC (0,
-                             UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
-
-
-    UA_FieldTargetVariable *targetVars = (UA_FieldTargetVariable *)
-        UA_calloc(readerConfig.dataSetMetaData.fieldsSize, sizeof(UA_FieldTargetVariable));
-    for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++) {
-        /* Variable to subscribe data */
-        UA_VariableAttributes vAttr = UA_VariableAttributes_default;
-        UA_LocalizedText_copy(&readerConfig.dataSetMetaData.fields[i].description,
-                              &vAttr.description);
-        vAttr.displayName.locale = UA_STRING("en-US");
-        vAttr.displayName.text = readerConfig.dataSetMetaData.fields[i].name;
-        vAttr.dataType = readerConfig.dataSetMetaData.fields[i].dataType;
-
-        UA_NodeId newNode;
-        retval |= UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, (UA_UInt32)i + 50000),
-                                            folderId,
-                                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                            UA_QUALIFIEDNAME(1, (char *) readerConfig.dataSetMetaData.fields[i].name.data),
-                                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                            vAttr, NULL, &newNode);
-
-        /* For creating Targetvariables */
-        UA_FieldTargetDataType_init(&targetVars[i].targetVariable);
-        targetVars[i].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
-        targetVars[i].targetVariable.targetNodeId = newNode;
-    }
-
-    retval = UA_Server_DataSetReader_createTargetVariables(server, dataSetReaderId,
-                                                           readerConfig.dataSetMetaData.fieldsSize,
-                                                           targetVars);
-    UA_free(readerConfig.dataSetMetaData.fields);
-    UA_free(targetVars);
-    return retval;
-}
-
-static void printDataSetMetaDataType(const UA_DataSetMetaDataType *pMetaData){
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,"MetaDataName: %s", pMetaData->name.data);
-    for(size_t i = 0; i < pMetaData->fieldsSize; ++i) {
-        UA_String *typeName = UA_String_new();
-        UA_NodeId_print(&pMetaData->fields[i].dataType, typeName);
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                    "FieldNumber: %i, Name: %s, DataTypeId: %s, InternalTypeid: %i", (int) i,
-                    pMetaData->fields[i].name.data, (char *) typeName->data,
-                    (int) pMetaData->fields[i].builtInType);
-    }
-}
-
-/* Collect MetaData from remote server */
-static UA_StatusCode
-UA_Server_DataSetReader_getMetaDataFromRemote(UA_Server *server, UA_String remoteServer,
-                                              UA_QualifiedName pdsName,
-                                              UA_DataSetMetaDataType *dsMetaData) {
-    UA_Client *client = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
-    char remoteServer_ar[512];
-    memcpy(remoteServer_ar, remoteServer.data, remoteServer.length);
-    remoteServer_ar[remoteServer.length] = '\0';
-    UA_StatusCode retval = UA_Client_connect(client, remoteServer_ar);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_Client_delete(client);
-        return UA_STATUSCODE_BADCONNECTIONREJECTED;
-    }
-
-    //UA_TranslateBrowsePathsToNodeIdsRequest translateBrowsePathsToNodeIdsRequest;
-    //UA_Client_Service_translateBrowsePathsToNodeIds(client, )
-    UA_NodeId resultMetaDataNodeId = UA_NODEID_NULL;
-    UA_BrowseRequest browseRequest;
-    UA_BrowseRequest_init(&browseRequest);
-    UA_BrowseDescription *browseDescription = UA_BrowseDescription_new();
-    browseDescription->browseDirection = UA_BROWSEDIRECTION_INVERSE;
-    browseDescription->resultMask = UA_BROWSERESULTMASK_ALL;
-    browseDescription->nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE);
-    browseDescription->referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASTYPEDEFINITION);
-    browseDescription->includeSubtypes = UA_TRUE;
-    browseRequest.nodesToBrowseSize = 1;
-    browseRequest.nodesToBrowse = browseDescription;
-    browseRequest.requestedMaxReferencesPerNode = 1000;
-
-    UA_BrowseResponse browseResponse = UA_Client_Service_browse(client, browseRequest);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "Result size: %i result: %s, ref size: %i ",
-                (int) browseResponse.resultsSize,
-                UA_StatusCode_name(browseResponse.responseHeader.serviceResult),
-                (int) browseResponse.results->referencesSize);
-
-    for(size_t i = 0; i < browseResponse.resultsSize; ++i) {
-        for(size_t j = 0; j < browseResponse.results[i].referencesSize; ++j) {
-            UA_ReferenceDescription *ref = &(browseResponse.results[i].references[j]);
-            if(UA_String_equal(&pdsName.name, &ref->browseName.name)) {
-                UA_NodeId_copy(&ref->nodeId.nodeId, &resultMetaDataNodeId);
-                break;
-            }
-        }
-    }
-    UA_BrowseResponse_clear(&browseResponse);
-    if(UA_NodeId_isNull(&resultMetaDataNodeId)){
-        UA_BrowseRequest_clear(&browseRequest);
-        return UA_STATUSCODE_BADNOTFOUND;
-    }
-    //find metadata property
-    browseRequest.nodesToBrowse->nodeId = resultMetaDataNodeId;
-    browseRequest.nodesToBrowse->browseDirection = UA_BROWSEDIRECTION_FORWARD;
-    browseRequest.nodesToBrowse->referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY);
-    browseResponse = UA_Client_Service_browse(client, browseRequest);
-    UA_String compareString = UA_STRING("DataSetMetaData");
-    for(size_t i = 0; i < browseResponse.resultsSize; ++i) {
-        for(size_t j = 0; j < browseResponse.results[i].referencesSize; ++j) {
-            UA_ReferenceDescription *ref = &(browseResponse.results[i].references[j]);
-            if(UA_String_equal(&compareString, &ref->browseName.name)) {
-                UA_NodeId_copy(&ref->nodeId.nodeId, &resultMetaDataNodeId);
-                break;
-            }
-        }
-    }
-    UA_BrowseResponse_clear(&browseResponse);
-    UA_BrowseRequest_clear(&browseRequest);
-
-    if(UA_NodeId_isNull(&resultMetaDataNodeId)){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Unable to request metadata from remote server!");
-    } else {
-        UA_Variant value;
-        retval = UA_Client_readValueAttribute(client, resultMetaDataNodeId, &value);
-        if(retval == UA_STATUSCODE_GOOD){
-            UA_DataSetMetaDataType_copy((UA_DataSetMetaDataType *) value.data, dsMetaData);
-        }
-        UA_Variant_clear(&value);
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Found requested Metadata node");
-    }
-    UA_Client_delete(client);
-    return retval;
-}
-
-
-static void
-collectDataSetMetaDataFromServer(UA_Server *server, UA_DataSetMetaDataType *pMetaData){
-    //init meta data structure
-    UA_DataSetMetaDataType_init(pMetaData);
-    UA_StatusCode getMetaDataResult = UA_Server_DataSetReader_getMetaDataFromRemote(server,
-                                                  UA_STRING(METADATA_SOURCE_SERVER),
-                                                  UA_QUALIFIEDNAME(0, METADATA_DATASET_NAME),
-                                                  pMetaData);
-    if(getMetaDataResult != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Unable to get metadata from remote server");
-        return;
-    }
-    printDataSetMetaDataType(pMetaData);
-}
-
-static void
-add3DPointDataType(UA_Server* server) {
-    UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-    attr.displayName = UA_LOCALIZEDTEXT("en-US", "3D Point Type");
-
-    UA_Server_addDataTypeNode(server, PointType.typeId,
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_STRUCTURE),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
-                              UA_QUALIFIEDNAME(1, "3D.Point"),
-                              attr, NULL, NULL);
-}
-
-static int
-run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl) {
-    /* Return value initialized to Status Good */
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* Add custom Datatypes */
-    UA_DataType *types = (UA_DataType*)UA_malloc(sizeof(UA_DataType));
-    UA_DataTypeMember *pointMembers = (UA_DataTypeMember*)UA_malloc(sizeof(UA_DataTypeMember) * 3);
-    pointMembers[0] = Point_members[0];
-    pointMembers[1] = Point_members[1];
-    pointMembers[2] = Point_members[2];
-    types[0] = PointType;
-    types[0].members = pointMembers;
-
-    UA_DataTypeArray customDataTypes = {config->customDataTypes, 1, types, UA_FALSE};
-    config->customDataTypes = &customDataTypes;
-
-    add3DPointDataType(server);
-
-    /* Add the PubSub network layer implementation to the server config.
-     * The TransportLayer is acting as factory to create new connections
-     * on runtime. Details about the PubSubTransportLayer can be found inside the
-     * tutorial_pubsub_connection */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
-    /* API calls */
-    /* Add PubSubConnection */
-    retval |= addPubSubConnection(server, transportProfile, networkAddressUrl);
-    if(retval != UA_STATUSCODE_GOOD)
-        return EXIT_FAILURE;
-
-    /* Add ReaderGroup to the created PubSubConnection */
-    retval |= addReaderGroup(server);
-    if(retval != UA_STATUSCODE_GOOD)
-        return EXIT_FAILURE;
-
-    /* Add DataSetReader to the created ReaderGroup */
-    retval |= addDataSetReader(server);
-    if(retval != UA_STATUSCODE_GOOD)
-        return EXIT_FAILURE;
-
-    /* Add SubscribedVariables to the created DataSetReader */
-    retval |= addSubscribedVariables(server, readerIdentifier);
-    if(retval != UA_STATUSCODE_GOOD)
-        return EXIT_FAILURE;
-
-    retval = UA_Server_runUntilInterrupt(server);
-
-    UA_Server_delete(server);
-    UA_free(pointMembers);
-    UA_free(types);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-static void
-usage(char *progname) {
-    printf("usage: %s <uri> [device]\n", progname);
-}
-
-int main(int argc, char **argv) {
-    UA_String transportProfile =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
-    if(argc > 1) {
-        if(strcmp(argv[1], "-h") == 0) {
-            usage(argv[0]);
-            return EXIT_SUCCESS;
-        } else if(strncmp(argv[1], "opc.udp://", 10) == 0) {
-            networkAddressUrl.url = UA_STRING(argv[1]);
-        } else if(strncmp(argv[1], "opc.eth://", 10) == 0) {
-            transportProfile =
-                UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
-            if(argc < 3) {
-                printf("Error: UADP/ETH needs an interface name\n");
-                return EXIT_FAILURE;
-            }
-
-            networkAddressUrl.networkInterface = UA_STRING(argv[2]);
-            networkAddressUrl.url = UA_STRING(argv[1]);
-        } else {
-            printf ("Error: unknown URI\n");
-            return EXIT_FAILURE;
-        }
-    }
-
-    return run(&transportProfile, &networkAddressUrl);
-}
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
index 2750b005a19..1381c3ede93 100644
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ b/plugins/mqtt/ua_mqtt-c_adapter.c
@@ -339,7 +339,7 @@ void
 publish_callback(void** ptrServer, struct mqtt_response_publish *published)
 {
     UA_Server *server = (UA_Server*)*ptrServer;
-    UA_PubSubManager pubSubManager = server->pubSubManager;
+    //UA_PubSubManager pubSubManager = server->pubSubManager;
     UA_Boolean is_reader_configured = false;
     const UA_String transport_uri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
 
@@ -383,13 +383,13 @@ publish_callback(void** ptrServer, struct mqtt_response_publish *published)
     memcpy(topic->data, published->topic_name, published->topic_name_size);
     memcpy(msg->data, published->application_message, published->application_message_size);
 
-    UA_TopicAssign *topicAssign1;
-    TAILQ_FOREACH(topicAssign1, &pubSubManager.topicAssign, listEntry){
-        if(UA_String_equal(&topicAssign1->topic, topic)) {
-            UA_PubSubConnection* pConn = topicAssign1->rgIdentifier->linkedConnection;
-            processMqttSubscriberCallback(server, pConn, msg);
-        }
-    }
+    /* UA_TopicAssign *topicAssign1; */
+    /* TAILQ_FOREACH(topicAssign1, &pubSubManager.topicAssign, listEntry){ */
+    /*     if(UA_String_equal(&topicAssign1->topic, topic)) { */
+    /*         UA_PubSubConnection* pConn = topicAssign1->rgIdentifier->linkedConnection; */
+    /*         //processMqttSubscriberCallback(server, pConn, msg); */
+    /*     } */
+    /* } */
 }
 
 UA_StatusCode
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index e33ebaa8b95..d6b035b19f7 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -34,6 +34,9 @@ _UA_BEGIN_DECLS
 
 #ifdef UA_ENABLE_PUBSUB
 
+/* Max number of underlying for sending and receiving */
+#define UA_PUBSUB_MAXCHANNELS 8
+
 struct UA_WriterGroup;
 typedef struct UA_WriterGroup UA_WriterGroup;
 
@@ -132,19 +135,38 @@ UA_StandaloneSubscribedDataSet_clear(UA_Server *server,
 
 typedef struct UA_PubSubConnection {
     UA_PubSubComponentEnumType componentType;
-    UA_PubSubConnectionConfig config;
-    UA_PubSubChannel *channel;
+
+    TAILQ_ENTRY(UA_PubSubConnection) listEntry;
     UA_NodeId identifier;
 
-    LIST_HEAD(, UA_WriterGroup) writerGroups;
+    /* The send/recv connections are only opened if the state is operational */
+    UA_PubSubState state;
+    UA_PubSubConnectionConfig config;
+    UA_Boolean json; /* Extracted from the TransportProfileUrl */
+
+    /* Channels belonging to the PubSubConnection. Send channels belong to
+     * WriterGroups, recv channels belong to ReaderGroups. We only open channels 
+     * if there is at least one WriterGroup/ReaderGroup respectively.
+     *
+     * Some channels belong exclusively to just one WriterGroup/ReaderGroup that
+     * defines additional connection properties. For example an MQTT topic name
+     * or QoS parameters. In that case a dedicated NetworkCallback is used that
+     * takes this ReaderGroup/WriterGroup directly as context. */
+    UA_ConnectionManager *cm;
+    uintptr_t recvChannels[UA_PUBSUB_MAXCHANNELS];
+    size_t recvChannelsSize;
+    uintptr_t sendChannel;
+
     size_t writerGroupsSize;
+    LIST_HEAD(, UA_WriterGroup) writerGroups;
 
-    LIST_HEAD(, UA_ReaderGroup) readerGroups;
     size_t readerGroupsSize;
+    LIST_HEAD(, UA_ReaderGroup) readerGroups;
 
-    TAILQ_ENTRY(UA_PubSubConnection) listEntry;
     UA_UInt16 configurationFreezeCounter;
-    UA_Boolean isRegistered; /* Subscriber requires connection channel regist */
+
+    UA_Boolean deleteFlag; /* To be deleted - in addition to the PubSubState */
+    UA_DelayedCallback dc; /* For delayed freeing */
 } UA_PubSubConnection;
 
 UA_StatusCode
@@ -163,13 +185,20 @@ UA_PubSubConnection_create(UA_Server *server,
 void
 UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig);
 
+void
+UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c);
+
 UA_StatusCode
-UA_PubSubConnection_remove(UA_Server *server, UA_PubSubConnection *c);
+UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c);
+
+void
+UA_PubSubConnection_disconnect(UA_PubSubConnection *c);
 
-/* Register channel for given connectionIdentifier */
 UA_StatusCode
-UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier,
-                           const UA_ReaderGroupConfig *readerGroupConfig);
+UA_PubSubConnection_setPubSubState(UA_Server *server,
+                                   UA_PubSubConnection *connection,
+                                   UA_PubSubState state,
+                                   UA_StatusCode cause);
 
 #define UA_LOG_CONNECTION_INTERNAL(LOGGER, LEVEL, CONNECTION, MSG, ...) \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
@@ -195,11 +224,6 @@ UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier,
 #define UA_LOG_FATAL_CONNECTION(LOGGER, CONNECTION, ...)                \
     UA_MACRO_EXPAND(UA_LOG_CONNECTION_INTERNAL(LOGGER, FATAL, CONNECTION, __VA_ARGS__, ""))
 
-UA_StatusCode
-UA_decodeAndProcessNetworkMessage(UA_Server *server,
-                                  UA_PubSubConnection *connection,
-                                  UA_ByteString *buf);
-
 /**********************************************/
 /*              DataSetWriter                 */
 /**********************************************/
@@ -306,16 +330,22 @@ struct UA_WriterGroup {
     UA_WriterGroupConfig config;
     LIST_ENTRY(UA_WriterGroup) listEntry;
     UA_NodeId identifier;
-    UA_PubSubConnection *linkedConnection;
+
     LIST_HEAD(, UA_DataSetWriter) writers;
     UA_UInt32 writersCount;
+
     UA_UInt64 publishCallbackId; /* registered if != 0 */
     UA_PubSubState state;
     UA_NetworkMessageOffsetBuffer bufferedMessage;
     UA_UInt16 sequenceNumber; /* Increased after every succressuly sent message */
     UA_Boolean configurationFrozen;
     UA_DateTime lastPublishTimeStamp;
-    UA_PubSubChannel *channel; /* channel used for udp unicast communication */
+
+    /* The ConnectionManager pointer is stored in the Connection. The channels
+     * are either stored here or in the Connection, but never both. */
+    UA_PubSubConnection *linkedConnection;
+    uintptr_t sendChannel;
+    UA_Boolean deleteFlag;
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_UInt32 securityTokenId;
@@ -335,6 +365,12 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
 UA_StatusCode
 UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg);
 
+void
+UA_WriterGroup_disconnect(UA_WriterGroup *wg);
+
+UA_StatusCode
+UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg);
+
 UA_StatusCode
 setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
                              UA_UInt32 securityTokenId,
@@ -361,6 +397,9 @@ UA_WriterGroup_setPubSubState(UA_Server *server,
                               UA_PubSubState state,
                               UA_StatusCode cause);
 
+UA_StatusCode
+UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup);
+
 void
 UA_WriterGroup_publishCallback(UA_Server *server,
                                UA_WriterGroup *writerGroup);
@@ -460,6 +499,11 @@ UA_DataSetReader_process(UA_Server *server,
                          UA_DataSetReader *dataSetReader,
                          UA_DataSetMessage *dataSetMsg);
 
+UA_StatusCode
+UA_DataSetReader_checkIdentifier(UA_Server *server, UA_NetworkMessage *msg,
+                                 UA_DataSetReader *reader,
+                                 UA_ReaderGroupConfig readerGroupConfig);
+
 UA_StatusCode
 UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
                         const UA_DataSetReaderConfig *dataSetReaderConfig,
@@ -491,10 +535,6 @@ DataSetReader_createTargetVariables(UA_Server *server, UA_DataSetReader *dsr,
                                     size_t targetVariablesSize,
                                     const UA_FieldTargetVariable *targetVariables);
 
-UA_StatusCode
-UA_DataSetReader_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
-                                    UA_PubSubConnection *connection, UA_ByteString *buf);
-
 UA_StatusCode
 UA_DataSetReader_setPubSubState(UA_Server *server,
                                 UA_DataSetReader *dataSetReader,
@@ -539,15 +579,21 @@ struct UA_ReaderGroup {
     UA_PubSubComponentEnumType componentType;
     UA_ReaderGroupConfig config;
     UA_NodeId identifier;
-    UA_PubSubConnection *linkedConnection;
     LIST_ENTRY(UA_ReaderGroup) listEntry;
+
     LIST_HEAD(, UA_DataSetReader) readers;
-    /* for simplified information access */
     UA_UInt32 readersCount;
-    UA_UInt64 subscribeCallbackId;
+
     UA_PubSubState state;
     UA_Boolean configurationFrozen;
 
+    /* The ConnectionManager pointer is stored in the Connection. The channels 
+     * are either stored here or in the Connection, but never both. */
+    UA_PubSubConnection *linkedConnection;
+    uintptr_t recvChannels[UA_PUBSUB_MAXCHANNELS];
+    size_t recvChannelsSize;
+    UA_Boolean deleteFlag;
+
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_UInt32 securityTokenId;
     UA_UInt32 nonceSequenceNumber; /* To be part of the MessageNonce */
@@ -566,6 +612,12 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
 UA_StatusCode
 UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg);
 
+UA_StatusCode
+UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg);
+
+void
+UA_ReaderGroup_disconnect(UA_ReaderGroup *rg);
+
 UA_StatusCode
 setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
                              UA_UInt32 securityTokenId,
@@ -597,6 +649,14 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
                               UA_PubSubState state,
                               UA_StatusCode cause);
 
+UA_Boolean
+UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
+                                    UA_ByteString *buf);
+
+UA_Boolean
+UA_ReaderGroup_process(UA_Server *server, UA_ReaderGroup *readerGroup,
+                       UA_NetworkMessage *nm);
+
 #define UA_LOG_READERGROUP_INTERNAL(LOGGER, LEVEL, RG, MSG, ...)        \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {                            \
         UA_String idStr = UA_STRING_NULL;                               \
@@ -644,19 +704,6 @@ UA_StatusCode
 decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
                      UA_NetworkMessage *nm, UA_PubSubConnection *connection);
 
-UA_StatusCode
-receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
-                              UA_PubSubConnection *connection);
-
-/* It serves as the entry point into reader processing and is called when
- * a publish is received, and the topic matches with one or more readers. */
-void processMqttSubscriberCallback(UA_Server *server, UA_PubSubConnection *connection,
-                                   UA_ByteString *msg);
-
-UA_StatusCode
-decodeNetworkMessageJson(UA_Server *server, UA_ByteString *buffer, size_t *pos,
-                         UA_NetworkMessage *nm, UA_PubSubConnection *connection);
-
 #ifdef UA_ENABLE_PUBSUB_SKS
 /*********************************************************/
 /*                    SecurityGroup                      */
@@ -765,6 +812,9 @@ UA_PubSubManager_freeIds(UA_Server *server);
 void
 UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager);
 
+void
+UA_PubSubManager_shutdown(UA_Server *server, UA_PubSubManager *pubSubManager);
+
 void
 UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager);
 
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 1a5e94d8a04..fa020ce393f 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -202,8 +202,6 @@ createComponentsForConnection(UA_Server *server,
     /* ReaderGroups configuration */
     for(size_t j = 0; j < connParams->readerGroupsSize; j++) {
         res = createReaderGroup(server, &connParams->readerGroups[j], connectionIdent);
-        if(res == UA_STATUSCODE_GOOD)
-            res |= UA_PubSubConnection_regist(server, &connectionIdent, NULL);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createComponentsForConnection] "
@@ -215,74 +213,6 @@ createComponentsForConnection(UA_Server *server,
     return res;
 }
 
-/* Checks if transportLayer for the specified transportProfileUri exists.
- *
- * @param server Server object that shall be configured
- * @param transportProfileUri String that specifies the transport protocol */
-static UA_Boolean
-transportLayerExists(UA_Server *server, UA_String transportProfileUri) {
-    for(size_t i = 0; i < server->config.pubSubConfig.transportLayersSize; i++) {
-        if(UA_String_equal(&server->config.pubSubConfig.transportLayers[i].transportProfileUri,
-                           &transportProfileUri)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/* Creates transportlayer for specified transport protocol if this layer doesn't exist yet */
-static UA_StatusCode
-createTransportLayer(UA_Server *server, const UA_String transportProfileUri) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
-    if(transportLayerExists(server, transportProfileUri))
-        return UA_STATUSCODE_GOOD;
-
-    UA_ServerConfig *config = &server->config;
-    UA_PubSubTransportLayer tl;
-
-    do {
-        UA_String strUDP =
-            UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-        if(UA_String_equal(&transportProfileUri, &strUDP)) {
-            tl = UA_PubSubTransportLayerUDPMP();
-            break;
-        }
-
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-        UA_String strETH =
-            UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
-        if(UA_String_equal(&transportProfileUri, &strETH)) {
-            tl = UA_PubSubTransportLayerEthernet();
-            break;
-        }
-#endif
-
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "[UA_PubSubManager_createTransportLayer] "
-                     "invalid transportProfileUri");
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    } while(0);
-
-    UA_PubSubTransportLayer *newLayer;
-    if(config->pubSubConfig.transportLayersSize > 0) {
-        newLayer = (UA_PubSubTransportLayer *)
-            UA_realloc(config->pubSubConfig.transportLayers,
-                       (config->pubSubConfig.transportLayersSize + 1) *
-                       sizeof(UA_PubSubTransportLayer));
-    } else {
-        newLayer = (UA_PubSubTransportLayer *)
-            UA_calloc(1, sizeof(UA_PubSubTransportLayer));
-    }
-    if(!newLayer)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    config->pubSubConfig.transportLayers = newLayer;
-
-    config->pubSubConfig.transportLayers[config->pubSubConfig.transportLayersSize] = tl;
-    config->pubSubConfig.transportLayersSize++;
-    return UA_STATUSCODE_GOOD;
-}
-
 /* Creates PubSubConnection configuration from PubSubConnectionDataType object
  *
  * @param server Server object that shall be configured
@@ -332,14 +262,6 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
                        "TransportSettings can not be read");
     }
 
-    res = createTransportLayer(server, connParams->transportProfileUri);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "[UA_PubSubManager_createPubSubConnection] "
-                     "Creating transportLayer failed");
-        return res;
-    }
-
     /* Load connection config into server: */
     UA_NodeId connectionIdent;
     res = UA_PubSubConnection_create(server, &config, &connectionIdent);
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index fa9f4ae2b1a..e405c7622d9 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * Copyright (c) 2017-2022 Fraunhofer IOSB (Author: Andreas Ebner)
- * Copyright (c) 2019 Fraunhofer IOSB (Author: Julius Pfrommer)
+ * Copyright (c) 2019, 2022 Fraunhofer IOSB (Author: Julius Pfrommer)
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  * Copyright (c) 2021 Fraunhofer IOSB (Author: Jan Hermes)
  * Copyright (c) 2022 Siemens AG (Author: Thomas Fischer)
@@ -17,19 +17,97 @@
 #include "ua_pubsub_ns0.h"
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_MQTT
-#include "../../plugins/mqtt/ua_mqtt-c_adapter.h"
-#include "mqtt.h"
+#ifdef UA_ENABLE_PUBSUB /* conditional compilation */
+
+static void
+delayedPubSubConnection_delete(void *application, void *context) {
+    UA_PubSubConnection *c = (UA_PubSubConnection*)context;
+    UA_PubSubConnectionConfig_clear(&c->config);
+    UA_NodeId_clear(&c->identifier);
+    UA_free(c);
+}
+
+UA_StatusCode
+decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
+                     UA_NetworkMessage *nm, UA_PubSubConnection *connection) {
+#ifdef UA_DEBUG_DUMP_PKGS
+    UA_dump_hex_pkg(buffer->data, buffer->length);
 #endif
 
-#ifdef UA_ENABLE_PUBSUB /* conditional compilation */
+    UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buffer, pos, nm);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                                  "PubSub receive. decoding headers failed");
+        UA_NetworkMessage_clear(nm);
+        return rv;
+    }
+
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    UA_Boolean processed = false;
+    UA_ReaderGroup *readerGroup;
+    UA_DataSetReader *reader;
+
+    /* Choose a correct readergroup for decrypt/verify this message
+     * (there could be multiple) */
+    LIST_FOREACH(readerGroup, &connection->readerGroups, listEntry) {
+        LIST_FOREACH(reader, &readerGroup->readers, listEntry) {
+            UA_StatusCode retval =
+                UA_DataSetReader_checkIdentifier(server, nm, reader, readerGroup->config);
+            if(retval != UA_STATUSCODE_GOOD)
+                continue;
+            processed = true;
+            rv = verifyAndDecryptNetworkMessage(&server->config.logger, buffer, pos,
+                                                nm, readerGroup);
+            if(rv != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                                          "Subscribe failed, verify and decrypt "
+                                          "network message failed.");
+                UA_NetworkMessage_clear(nm);
+                return rv;
+            }
+
+            /* break out of all loops when first verify & decrypt was successful */
+            goto loops_exit;
+        }
+    }
+
+loops_exit:
+    if(!processed) {
+        UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
+                               "Dataset reader not found. Check PublisherId, "
+                               "WriterGroupId and DatasetWriterId");
+        /* Possible multicast scenario: there are multiple connections (with one
+         * or more ReaderGroups) within a multicast group every connection
+         * receives all network messages, even if some of them are not meant for
+         * the connection currently processed -> therefore it is ok if the
+         * connection does not have a DataSetReader for every received network
+         * message. We must not return an error here, but continue with the
+         * buffer decoding and see if we have a matching DataSetReader for the
+         * next network message. */
+    }
+#endif
+
+    rv = UA_NetworkMessage_decodePayload(buffer, pos, nm, server->config.customDataTypes);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_NetworkMessage_clear(nm);
+        return rv;
+    }
+
+    rv = UA_NetworkMessage_decodeFooters(buffer, pos, nm);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_NetworkMessage_clear(nm);
+        return rv;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
 
 UA_StatusCode
 UA_PubSubConnectionConfig_copy(const UA_PubSubConnectionConfig *src,
                                UA_PubSubConnectionConfig *dst) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     memcpy(dst, src, sizeof(UA_PubSubConnectionConfig));
-    if (src->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
+    if(src->publisherIdType == UA_PUBLISHERIDTYPE_STRING) {
         res |= UA_String_copy(&src->publisherId.string, &dst->publisherId.string);
     }
     res |= UA_String_copy(&src->name, &dst->name);
@@ -80,98 +158,54 @@ UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig) {
     UA_KeyValueMap_clear(&connectionConfig->connectionProperties);
 }
 
-static void
-assignConnectionIdentifier(UA_Server *server, UA_PubSubConnection *newConnectionsField,
-                           UA_NodeId *connectionIdentifier) {
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    /* Internally createa a unique id */
-    addPubSubConnectionRepresentation(server, newConnectionsField);
-#else
-    /* Create a unique NodeId that does not correspond to a Node */
-    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
-                                          &newConnectionsField->identifier);
-#endif
-    if(connectionIdentifier) {
-        UA_NodeId_copy(&newConnectionsField->identifier, connectionIdentifier);
-    }
-}
-
 UA_StatusCode
 UA_PubSubConnection_create(UA_Server *server,
                            const UA_PubSubConnectionConfig *connectionConfig,
                            UA_NodeId *connectionIdentifier) {
     /* Validate preconditions */
     UA_CHECK_MEM(server, return UA_STATUSCODE_BADINTERNALERROR);
-    UA_CHECK_MEM_ERROR(connectionConfig, return UA_STATUSCODE_BADINTERNALERROR,
+    UA_CHECK_ERROR(connectionConfig != NULL, return UA_STATUSCODE_BADINTERNALERROR,
                        &server->config.logger, UA_LOGCATEGORY_SERVER,
                        "PubSub Connection creation failed. No connection configuration supplied.");
 
-    /* Retrieve the transport layer for the given profile uri */
-    UA_PubSubTransportLayer *tl =
-        UA_getTransportProtocolLayer(server, &connectionConfig->transportProfileUri);
-    UA_CHECK_MEM_ERROR(tl, return UA_STATUSCODE_BADNOTFOUND,
-                       &server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection creation failed. Requested transport layer not found.");
-
-    /* Create new connection from connection config */
-    UA_PubSubConnection *newConnectionsField = (UA_PubSubConnection *)
+    /* Allocate */
+    UA_PubSubConnection *connection = (UA_PubSubConnection *)
         UA_calloc(1, sizeof(UA_PubSubConnection));
-    if(!newConnectionsField) {
+    if(!connection) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "PubSub Connection creation failed. Out of Memory.");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    newConnectionsField->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
-    UA_StatusCode res = UA_PubSubConnectionConfig_copy(connectionConfig,
-                                                       &newConnectionsField->config);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_free(newConnectionsField);
-        return res;
-    }
+    connection->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
 
-    /* Register in the PubSubManager */
-    UA_PubSubManager *pubSubManager = &server->pubSubManager;
-    TAILQ_INSERT_TAIL(&pubSubManager->connections, newConnectionsField, listEntry);
-    pubSubManager->connectionsSize++;
+    /* Copy the connection config */
+    UA_StatusCode ret =
+        UA_PubSubConnectionConfig_copy(connectionConfig, &connection->config);
+    UA_CHECK_STATUS(ret, UA_free(connection); return ret);
 
-    /* Open the communication channel */
-    UA_TransportLayerContext ctx;
-    ctx.connection = newConnectionsField;
-    ctx.connectionConfig = &newConnectionsField->config;
-    ctx.decodeAndProcessNetworkMessage =
-        (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
-        UA_decodeAndProcessNetworkMessage;
-    ctx.writerGroupAddress = NULL;
-    ctx.server = server;
-
-    newConnectionsField->channel = tl->createPubSubChannel(tl, &ctx);
-    if(!newConnectionsField->channel) {
-        UA_PubSubConnection_remove(server, newConnectionsField);
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Transport layer creation problem.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-#ifdef UA_ENABLE_PUBSUB_MQTT
-    /* If the transport layer is MQTT, attach the server pointer to the callback function
-     * that is called when a PUBLISH is received. */
-    const UA_String transport_uri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
-    if(UA_String_equal(&newConnectionsField->config.transportProfileUri, &transport_uri)) {
-        UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *)
-            newConnectionsField->channel->handle;
-        struct mqtt_client* client = (struct mqtt_client*)channelDataMQTT->mqttClient;
-        client->publish_response_callback_state = server;
-    }
+    /* Assign the connection identifier */
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    /* Internally create a unique id */
+    addPubSubConnectionRepresentation(server, connection);
+#else
+    /* Create a unique NodeId that does not correspond to a Node */
+    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
+                                          &connection->identifier);
 #endif
+    if(connectionIdentifier)
+        UA_NodeId_copy(&connection->identifier, connectionIdentifier);
 
-    assignConnectionIdentifier(server, newConnectionsField, connectionIdentifier);
+    /* Register */
+    UA_PubSubManager *pubSubManager = &server->pubSubManager;
+    TAILQ_INSERT_HEAD(&pubSubManager->connections, connection, listEntry);
+    pubSubManager->connectionsSize++;
 
-    /* Open the connection channel */
-    if(newConnectionsField->channel->openSubscriber) {
-        newConnectionsField->channel->openSubscriber(newConnectionsField->channel);
-    }
-    return UA_STATUSCODE_GOOD;
+    /* Make the connection operational */
+    ret = UA_PubSubConnection_setPubSubState(server, connection, UA_PUBSUBSTATE_OPERATIONAL,
+                                             UA_STATUSCODE_GOOD);
+    if(ret != UA_STATUSCODE_GOOD)
+        UA_PubSubConnection_delete(server, connection);
+    return ret;
 }
 
 UA_StatusCode
@@ -179,13 +213,17 @@ UA_Server_addPubSubConnection(UA_Server *server,
                               const UA_PubSubConnectionConfig *connectionConfig,
                               UA_NodeId *connectionIdentifier) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = UA_PubSubConnection_create(server, connectionConfig, connectionIdentifier);
+    UA_StatusCode res =
+        UA_PubSubConnection_create(server, connectionConfig, connectionIdentifier);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
 
-UA_StatusCode
-UA_PubSubConnection_remove(UA_Server *server, UA_PubSubConnection *c) {
+/* Clean up the PubSubConnection. If no EventLoop connection is attached we can
+ * immediately free. Otherwise we close the EventLoop connections and free in
+ * the connection callback. */
+void
+UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Stop, unfreeze and delete all WriterGroups attached to the Connection */
@@ -205,74 +243,101 @@ UA_PubSubConnection_remove(UA_Server *server, UA_PubSubConnection *c) {
         UA_ReaderGroup_unfreezeConfiguration(server, readerGroup);
         UA_ReaderGroup_remove(server, readerGroup);
     }
-    /* Close the related channel */
-    if(c->channel) {
-        if(c->channel->closeSubscriber)
-            c->channel->closeSubscriber(c->channel);
-        c->channel->close(c->channel);
+
+    /* Shutting down and  unlinking in the server is done only once */
+    if(!c->deleteFlag) {
+        UA_PubSubConnection_disconnect(c);
+        TAILQ_REMOVE(&server->pubSubManager.connections, c, listEntry);
+        server->pubSubManager.connectionsSize--;
     }
+    c->deleteFlag = true;
 
-    /* Remove from the information model */
+    /* No open sockets -> delete delayed */
+    if(c->sendChannel == 0 && c->recvChannelsSize == 0) {
+        /* Remove from the information model */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    deleteNode(server, c->identifier, true);
+        deleteNode(server, c->identifier, true);
 #endif
 
-    /* Unlink from the server */
-    TAILQ_REMOVE(&server->pubSubManager.connections, c, listEntry);
-    server->pubSubManager.connectionsSize--;
-
-    UA_NodeId_clear(&c->identifier);
-    UA_PubSubConnectionConfig_clear(&c->config);
-    UA_free(c);
-
-    return UA_STATUSCODE_GOOD;
+        /* Free the memory delayed to ensure nobody is accessing any more */
+        UA_EventLoop *el = server->config.eventLoop;
+        c->dc.callback = delayedPubSubConnection_delete;
+        c->dc.context = c;
+        el->addDelayedCallback(el, &c->dc);
+    }
 }
 
 UA_StatusCode
 UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
     UA_LOCK(&server->serviceMutex);
-    /* Find the connection */
-    UA_PubSubConnection *c =
+    UA_PubSubConnection *psc =
         UA_PubSubConnection_findConnectionbyId(server, connection);
-    if(!c) {
+    if(!psc) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
-
-    UA_StatusCode res = UA_PubSubConnection_remove(server, c);
+    UA_PubSubConnection_delete(server, psc);
     UA_UNLOCK(&server->serviceMutex);
-    return res;
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
-UA_PubSubConnection_regist(UA_Server *server, UA_NodeId *connectionIdentifier,
-                           const UA_ReaderGroupConfig *readerGroupConfig) {
+UA_PubSubConnection_setPubSubState(UA_Server *server, UA_PubSubConnection *c,
+                                   UA_PubSubState state, UA_StatusCode cause) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_PubSubConnection *connection =
-        UA_PubSubConnection_findConnectionbyId(server, *connectionIdentifier);
-    if(!connection)
-        return UA_STATUSCODE_BADNOTFOUND;
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    UA_PubSubState oldState = c->state;
+    UA_WriterGroup *writerGroup;
+    UA_ReaderGroup *readerGroup;
+
+    switch(state) {
+        case UA_PUBSUBSTATE_ERROR:
+        case UA_PUBSUBSTATE_PAUSED:
+        case UA_PUBSUBSTATE_DISABLED:
+            if(state == oldState)
+                break;
+
+            /* Close the EventLoop connection */
+            c->state = state;
+            UA_PubSubConnection_disconnect(c);
+
+            /* Disable Reader and WriterGroups */
+            LIST_FOREACH(readerGroup, &c->readerGroups, listEntry) {
+                UA_ReaderGroup_setPubSubState(server, readerGroup, state,
+                                              UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
+            }
+            LIST_FOREACH(writerGroup, &c->writerGroups, listEntry) {
+                UA_WriterGroup_setPubSubState(server, writerGroup, state,
+                                              UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
+            }
+            break;
 
-    if(connection->isRegistered) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "Connection already registered");
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_StatusCode retval = UA_STATUSCODE_BAD;
-    if(readerGroupConfig != NULL) {
-        UA_ExtensionObject transportSettings = readerGroupConfig->transportSettings;
-        retval = connection->channel->regist(connection->channel, &transportSettings, NULL);
-    } else {
-        retval = connection->channel->regist(connection->channel, NULL, NULL);
+        case UA_PUBSUBSTATE_PREOPERATIONAL:
+        case UA_PUBSUBSTATE_OPERATIONAL:
+            /* Called also if the connection is already operational. We might to
+             * open an additional recv connection, etc. Sets the new state
+             * internally. */
+            if(oldState != UA_PUBSUBSTATE_OPERATIONAL)
+                c->state = UA_PUBSUBSTATE_PREOPERATIONAL;
+            ret = UA_PubSubConnection_connect(server, c);
+            if(ret != UA_STATUSCODE_GOOD)
+                UA_PubSubConnection_setPubSubState(server, c,
+                                                   UA_PUBSUBSTATE_ERROR, ret);
+            break;
+        default:
+            UA_LOG_WARNING_CONNECTION(&server->config.logger, c,
+                                      "Received unknown PubSub state!");
+            return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "register channel failed: 0x%" PRIx32 "!", retval);
+    /* Inform application about state change */
+    if(c->state != oldState) {
+        UA_ServerConfig *config = &server->config;
+        if(config->pubSubConfig.stateChangeCallback)
+            config->pubSubConfig.stateChangeCallback(server, &c->identifier, state, cause);
     }
-
-    connection->isRegistered = true;
-    return retval;
+    return ret;
 }
 
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 4a52bd7b698..217364c9b6b 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -775,4 +775,58 @@ UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
 }
 
 
+UA_StandaloneSubscribedDataSet *
+UA_StandaloneSubscribedDataSet_findSDSbyId(UA_Server *server, UA_NodeId identifier) {
+    UA_StandaloneSubscribedDataSet *subscribedDataSet;
+    TAILQ_FOREACH(subscribedDataSet, &server->pubSubManager.subscribedDataSets,
+                  listEntry) {
+        if(UA_NodeId_equal(&identifier, &subscribedDataSet->identifier))
+            return subscribedDataSet;
+    }
+    return NULL;
+}
+
+UA_StandaloneSubscribedDataSet *
+UA_StandaloneSubscribedDataSet_findSDSbyName(UA_Server *server, UA_String identifier) {
+    UA_StandaloneSubscribedDataSet *subscribedDataSet;
+    TAILQ_FOREACH(subscribedDataSet, &server->pubSubManager.subscribedDataSets,
+                  listEntry) {
+        if(UA_String_equal(&identifier, &subscribedDataSet->config.name))
+            return subscribedDataSet;
+    }
+    return NULL;
+}
+
+UA_StatusCode
+UA_StandaloneSubscribedDataSetConfig_copy(const UA_StandaloneSubscribedDataSetConfig *src,
+                                          UA_StandaloneSubscribedDataSetConfig *dst) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    memcpy(dst, src, sizeof(UA_StandaloneSubscribedDataSetConfig));
+    res = UA_DataSetMetaDataType_copy(&src->dataSetMetaData, &dst->dataSetMetaData);
+    res |= UA_String_copy(&src->name, &dst->name);
+    res |= UA_Boolean_copy(&src->isConnected, &dst->isConnected);
+    res |= UA_TargetVariablesDataType_copy(&src->subscribedDataSet.target,
+                                           &dst->subscribedDataSet.target);
+
+    if(res != UA_STATUSCODE_GOOD)
+        UA_StandaloneSubscribedDataSetConfig_clear(dst);
+    return res;
+}
+
+void
+UA_StandaloneSubscribedDataSetConfig_clear(
+    UA_StandaloneSubscribedDataSetConfig *sdsConfig) {
+    UA_String_clear(&sdsConfig->name);
+    UA_DataSetMetaDataType_clear(&sdsConfig->dataSetMetaData);
+    UA_TargetVariablesDataType_clear(&sdsConfig->subscribedDataSet.target);
+}
+
+void
+UA_StandaloneSubscribedDataSet_clear(UA_Server *server,
+                                     UA_StandaloneSubscribedDataSet *subscribedDataSet) {
+    UA_StandaloneSubscribedDataSetConfig_clear(&subscribedDataSet->config);
+    UA_NodeId_clear(&subscribedDataSet->identifier);
+    UA_NodeId_clear(&subscribedDataSet->connectedReader);
+}
+
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
new file mode 100644
index 00000000000..0a44734e4ee
--- /dev/null
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -0,0 +1,1007 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2023 Fraunhofer IOSB (Author: Julius Pfrommer)
+ */
+
+#include "ua_pubsub.h"
+#include "server/ua_server_internal.h"
+
+#ifdef UA_ENABLE_PUBSUB /* conditional compilation */
+
+/********************/
+/* PubSubConnection */
+/********************/
+
+static UA_StatusCode
+UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c);
+
+static UA_StatusCode
+UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c);
+
+static UA_StatusCode
+UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg);
+
+static UA_StatusCode
+UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg);
+
+static UA_StatusCode
+UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg);
+
+#define UA_PUBSUB_PROFILES_SIZE 4
+
+typedef struct  {
+    UA_String profileURI;
+    UA_String protocol;
+    UA_Boolean json;
+    UA_StatusCode (*connect)(UA_Server *server, UA_PubSubConnection *c);
+    UA_StatusCode (*connectWriterGroup)(UA_Server *server, UA_WriterGroup *wg);
+    UA_StatusCode (*connectReaderGroup)(UA_Server *server, UA_ReaderGroup *rg);
+} ProfileMapping;
+
+static ProfileMapping transportProfiles[UA_PUBSUB_PROFILES_SIZE] = {
+    {UA_STRING_STATIC("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp"),
+     UA_STRING_STATIC("udp"), false, UA_PubSubConnection_connectUDP,
+     UA_WriterGroup_connectUDPUnicast, NULL},
+    {UA_STRING_STATIC("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp"),
+     UA_STRING_STATIC("mqtt"), false, NULL,
+     UA_WriterGroup_connectMQTT, UA_ReaderGroup_connectMQTT},
+    {UA_STRING_STATIC("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json"),
+     UA_STRING_STATIC("mqtt"), true, NULL,
+     UA_WriterGroup_connectMQTT, UA_ReaderGroup_connectMQTT},
+    {UA_STRING_STATIC("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp"),
+     UA_STRING_STATIC("eth"), false, UA_PubSubConnection_connectETH, NULL, NULL}
+};
+
+static ProfileMapping *
+getProfile(UA_String profileUri) {    
+    for(size_t profile = 0; profile < UA_PUBSUB_PROFILES_SIZE; profile++) {
+        if(UA_String_equal(&profileUri, &transportProfiles[profile].profileURI))
+            return &transportProfiles[profile];
+    }
+    return NULL;
+}
+
+static UA_ConnectionManager *
+getCM(UA_EventLoop *el, UA_String protocol) {    
+    for(UA_EventSource *es = el->eventSources; es != NULL; es = es->next) {
+        if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+            continue;
+        UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+        if(UA_String_equal(&protocol, &cm->protocol))
+            return cm;
+    }
+    return NULL;
+}
+
+static void
+UA_PubSubConnection_removeConnection(UA_PubSubConnection *c,
+                                     uintptr_t connectionId) {
+    if(c->sendChannel == connectionId) {
+        c->sendChannel = 0;
+        return;
+    }
+    for(size_t i = 0; i < UA_PUBSUB_MAXCHANNELS; i++) {
+        if(c->recvChannels[i] != connectionId)
+            continue;
+        c->recvChannels[i] = 0;
+        c->recvChannelsSize--;
+        return;
+    }
+}
+
+static UA_StatusCode
+UA_PubSubConnection_addSendConnection(UA_PubSubConnection *c,
+                                      uintptr_t connectionId) {
+    if(c->sendChannel != 0 && c->sendChannel != connectionId)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    c->sendChannel = connectionId;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UA_PubSubConnection_addRecvConnection(UA_PubSubConnection *c,
+                                      uintptr_t connectionId) {
+    for(size_t i = 0; i < UA_PUBSUB_MAXCHANNELS; i++) {
+        if(c->recvChannels[i] == connectionId)
+            return UA_STATUSCODE_GOOD;
+    }
+    if(c->recvChannelsSize >= UA_PUBSUB_MAXCHANNELS)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    for(size_t i = 0; i < UA_PUBSUB_MAXCHANNELS; i++) {
+        if(c->recvChannels[i] != 0)
+            continue;
+        c->recvChannels[i] = connectionId;
+        c->recvChannelsSize++;
+        break;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+void
+UA_PubSubConnection_disconnect(UA_PubSubConnection *c) {   
+    if(!c->cm)
+        return;
+    if(c->sendChannel != 0)
+        c->cm->closeConnection(c->cm, c->sendChannel);
+    for(size_t i = 0; i < UA_PUBSUB_MAXCHANNELS; i++) {
+        if(c->recvChannels[i] != 0)
+            c->cm->closeConnection(c->cm, c->recvChannels[i]);
+    }
+}
+
+static void
+PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                     void *application, void **connectionContext,
+                     UA_ConnectionState state, const UA_KeyValueMap *params,
+                     UA_ByteString msg, UA_Boolean recv) {
+    if(!connectionContext)
+        return;
+
+    /* Get the context pointers */
+    UA_Server *server = (UA_Server*)application;
+    UA_PubSubConnection *psc = (UA_PubSubConnection*)*connectionContext;
+
+    UA_LOCK(&server->serviceMutex);
+
+    /* The connection is closing in the EventLoop. This is the last callback
+     * from that connection. Clean up the SecureChannel in the client. */
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
+        /* Reset the connection identifiers */
+        UA_PubSubConnection_removeConnection(psc, connectionId);
+
+        /* PSC marked for deletion and the last EventLoop connection has closed */
+        if(psc->deleteFlag && psc->recvChannelsSize == 0 && psc->sendChannel == 0) {
+            UA_PubSubConnection_delete(server, psc);
+            UA_UNLOCK(&server->serviceMutex);
+            return;
+        }
+
+        /* Reconnect automatically if the connection was operational. This sets
+         * the connection state if connecting fails. Attention! If there are
+         * several send or recv channels, then the connection is only reopened if
+         * all of them close - which is usually the case. */
+        if(psc->state == UA_PUBSUBSTATE_OPERATIONAL)
+            UA_PubSubConnection_connect(server, psc);
+
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* Store the connectionId (if a new connection) */
+    UA_StatusCode res = (recv) ?
+        UA_PubSubConnection_addRecvConnection(psc, connectionId) :
+        UA_PubSubConnection_addSendConnection(psc, connectionId);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, psc,
+                                  "No more space for an additional EventLoop connection");
+        if(psc->cm)
+            psc->cm->closeConnection(psc->cm, connectionId);
+        return;
+    }
+
+    /* No message received */
+    if(!recv || msg.length == 0) {
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* Connection open, set to operational if not already done */
+    if(psc->state != UA_PUBSUBSTATE_OPERATIONAL)
+        UA_PubSubConnection_setPubSubState(server, psc, UA_PUBSUBSTATE_OPERATIONAL,
+                                           UA_STATUSCODE_GOOD);
+
+    UA_NetworkMessage nm;
+    memset(&nm, 0, sizeof(UA_NetworkMessage));
+
+    UA_Boolean nonRT = false;
+    UA_Boolean processed = false;
+
+    /* Process buffer ReaderGroups */
+    UA_ReaderGroup *rg;
+    LIST_FOREACH(rg, &psc->readerGroups, listEntry) {
+        if(rg->state != UA_PUBSUBSTATE_OPERATIONAL &&
+           rg->state != UA_PUBSUBSTATE_PREOPERATIONAL)
+            continue;
+        if(rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
+            processed |= UA_ReaderGroup_decodeAndProcessRT(server, rg, &msg);
+            continue;
+        } 
+
+        if(!nonRT) {
+            nonRT = true;
+            /* Decode once for all nonRT ReaderGroups */
+            if(rg->config.encodingMimeType == UA_PUBSUB_ENCODING_UADP) {
+                size_t currentPosition = 0;
+                res = decodeNetworkMessage(server, &msg, &currentPosition, &nm, psc);
+            } else { /* if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) */
+#ifdef UA_ENABLE_JSON_ENCODING
+                res = UA_NetworkMessage_decodeJson(&nm, &msg);
+#else
+                res = UA_STATUSCODE_BADNOTSUPPORTED;
+#endif
+            }
+            if(res != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING_CONNECTION(&server->config.logger, psc,
+                                          "Verify, decrypt and decode network message failed");
+                nonRT = false;
+            }
+        }
+    }
+
+    /* Process the received message for the non-RT ReaderGroups */
+    if(nonRT) {
+        LIST_FOREACH(rg, &psc->readerGroups, listEntry) {
+            if(rg->state != UA_PUBSUBSTATE_OPERATIONAL &&
+               rg->state != UA_PUBSUBSTATE_PREOPERATIONAL)
+                continue;
+            if(rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE)
+                continue;
+            processed |= UA_ReaderGroup_process(server, rg, &nm);
+        }
+        UA_NetworkMessage_clear(&nm);
+    }
+
+    if(!processed) {
+        UA_LOG_WARNING_CONNECTION(&server->config.logger, psc,
+                                  "Message received that could not be processed. "
+                                  "Check PublisherID, WriterGroupID and DatasetWriterID.");
+    }
+
+    UA_UNLOCK(&server->serviceMutex);
+}
+
+static void
+PubSubRecvChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                         void *application, void **connectionContext,
+                         UA_ConnectionState state, const UA_KeyValueMap *params,
+                         UA_ByteString msg) {
+    PubSubChannelCallback(cm, connectionId, application, connectionContext,
+                         state, params, msg, true);
+}
+
+static void
+PubSubSendChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                         void *application, void **connectionContext,
+                         UA_ConnectionState state, const UA_KeyValueMap *params,
+                         UA_ByteString msg) {
+    PubSubChannelCallback(cm, connectionId, application, connectionContext,
+                         state, params, msg, false);
+}
+
+static UA_StatusCode
+UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c) {
+    UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
+        c->config.address.data;
+
+    /* Extract hostname and port */
+    UA_String address;
+    UA_UInt16 port;
+    UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, &port, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                "Could not parse the UDP network URL");
+        return res;
+    }
+
+    /* Set up the connection parameters */
+    UA_Boolean listen = true;
+    UA_Boolean validate = false;
+    UA_Boolean reuse = true;
+    UA_Boolean loopback = true;
+    UA_KeyValuePair kvp[7];
+    UA_KeyValueMap kvm = {6, kvp};
+    kvp[0].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&kvp[1].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    kvp[2].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&kvp[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[3].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&kvp[3].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[4].key = UA_QUALIFIEDNAME(0, "reuse");
+    UA_Variant_setScalar(&kvp[4].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[5].key = UA_QUALIFIEDNAME(0, "loopback");
+    UA_Variant_setScalar(&kvp[5].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(!UA_String_isEmpty(&addressUrl->networkInterface)) {
+        kvp[6].key = UA_QUALIFIEDNAME(0, "interface");
+        UA_Variant_setScalar(&kvp[6].value, &addressUrl->networkInterface,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        kvm.mapSize = 7;
+    }
+
+    /* Open a recv connection */
+    if(c->recvChannelsSize == 0) {
+        /* Validate only if no ReaderGroup configured */
+        validate = (c->readerGroupsSize == 0);
+        if(validate) {
+            UA_LOG_INFO_CONNECTION(&server->config.logger, c,
+                                   "No ReaderGroups configured. "
+                                   "Only validate the connection parameters "
+                                   "instead of opening a receiving channel.");
+        }
+
+        UA_UNLOCK(&server->serviceMutex);
+        res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubRecvChannelCallback);
+        UA_LOCK(&server->serviceMutex);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                    "Could not open an UDP channel for receiving");
+            return res;
+        }
+    }
+
+    /* Detect whether this is a localhost address */
+    UA_String localhostAddrs[3] = {
+        UA_STRING_STATIC("localhost"),
+        UA_STRING_STATIC("127.0.0."), /* begins with */
+        UA_STRING_STATIC(":1"),       /* ends with */
+    };
+
+    /* Open a send connection */
+    if(UA_String_equal(&address, &localhostAddrs[0]) ||
+       (address.length > localhostAddrs[1].length &&
+        strncmp((const char*)address.data, (const char*)localhostAddrs[1].data,
+                localhostAddrs[1].length) == 0) ||
+       (address.length > localhostAddrs[2].length &&
+        strncmp((const char*)&address.data[address.length - localhostAddrs[2].length],
+                (const char*)localhostAddrs[2].data, localhostAddrs[2].length) == 0)) {
+        /* Localhost address -- no send connection */
+        UA_LOG_INFO_CONNECTION(&server->config.logger, c,
+                               "Localhost address - don't open UDP send connection");
+    } else if(c->sendChannel == 0) {
+        /* Validate only if no WriterGroup configured */
+        validate = (c->writerGroupsSize == 0);
+        if(validate) {
+            UA_LOG_INFO_CONNECTION(&server->config.logger, c,
+                                   "No WriterGroups configured. "
+                                   "Only validate the connection parameters "
+                                   "instead of opening a channel for sending.");
+        }
+
+        /* Open a send-channel */
+        listen = false;
+        UA_UNLOCK(&server->serviceMutex);
+        res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
+        UA_LOCK(&server->serviceMutex);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                    "Could not open an UDP recv channel");
+        }
+    }
+
+    return res;
+}
+
+static UA_StatusCode
+UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c) {
+    UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
+        c->config.address.data;
+
+    /* Extract hostname and port */
+    UA_String address;
+    UA_String vidPCP = UA_STRING_NULL;
+    UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, NULL, &vidPCP);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                "Could not parse the ETH network URL");
+        return res;
+    }
+
+    /* Set up the connection parameters.
+     * TDOD: Complete the considered parameters. VID, PCP, etc. */
+    UA_Boolean listen = true;
+    UA_Boolean validate = false;
+    UA_KeyValuePair kvp[4];
+    UA_KeyValueMap kvm = {4, kvp};
+    kvp[0].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&kvp[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[2].key = UA_QUALIFIEDNAME(0, "interface");
+    UA_Variant_setScalar(&kvp[2].value, &addressUrl->networkInterface,
+                         &UA_TYPES[UA_TYPES_STRING]);
+    kvp[3].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&kvp[3].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
+    /* Open recv channels */
+    if(c->recvChannelsSize == 0) {
+        /* Validate only if no ReaderGroup configured */
+        validate = (c->readerGroupsSize == 0);
+        if(validate) {
+            UA_LOG_INFO_CONNECTION(&server->config.logger, c,
+                                   "No ReaderGroups configured. "
+                                   "Only validate the connection parameters "
+                                   "instead of opening a receiving channel.");
+        }
+
+        UA_UNLOCK(&server->serviceMutex);
+        res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubRecvChannelCallback);
+        UA_LOCK(&server->serviceMutex);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                    "Could not open an ETH recv channel");
+            return res;
+        }
+    }
+
+    /* Open send channels */
+    if(c->sendChannel == 0) {
+        /* Validate only if no WriterGroup configured */
+        validate = (c->writerGroupsSize == 0);
+        if(validate) {
+            UA_LOG_INFO_CONNECTION(&server->config.logger, c,
+                                   "No WriterGroups configured. "
+                                   "Only validate the connection parameters "
+                                   "instead of opening a channel for sending.");
+        }
+
+        listen = true;
+        UA_UNLOCK(&server->serviceMutex);
+        res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
+        UA_LOCK(&server->serviceMutex);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                    "Could not open an ETH channel for sending");
+        }
+    }
+
+    return res;
+}
+
+UA_StatusCode
+UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    UA_EventLoop *el = server->config.eventLoop;
+    if(!el) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c, "No EventLoop configured");
+        UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
+                                           UA_STATUSCODE_BADINTERNALERROR);
+        return UA_STATUSCODE_BADINTERNALERROR;;
+    }
+
+    /* Look up the connection manager for the connection */
+    ProfileMapping *profile = getProfile(c->config.transportProfileUri);
+    UA_ConnectionManager *cm = NULL;
+    if(profile)
+        cm = getCM(el, profile->protocol);
+    if(!cm || (c->cm && cm != c->cm)) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                "The requested protocol is not supported");
+        UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
+                                           UA_STATUSCODE_BADINTERNALERROR);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    c->cm = cm;
+    c->json = profile->json;
+
+    /* Check the configuration address type */
+    if(!UA_Variant_hasScalarType(&c->config.address,
+                                 &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c, "No NetworkAddressUrlDataType "
+                                "for the address configuration");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Connect */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(profile->connect)
+        res = profile->connect(server, c);
+    if(res != UA_STATUSCODE_GOOD)
+        UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR, res);
+    return res;
+}
+
+/***************/
+/* WriterGroup */
+/***************/
+
+static void
+WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_ConnectionState state, const UA_KeyValueMap *params,
+                          UA_ByteString msg) {
+    if(!connectionContext)
+        return;
+
+    /* Get the context pointers */
+    UA_Server *server = (UA_Server*)application;
+    UA_WriterGroup *wg = (UA_WriterGroup*)*connectionContext;
+
+    UA_LOCK(&server->serviceMutex);
+
+    /* The connection is closing in the EventLoop. This is the last callback
+     * from that connection. Clean up the SecureChannel in the client. */
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
+        /* Reset the connection channel */
+        wg->sendChannel = 0;
+
+        /* PSC marked for deletion and the last EventLoop connection has closed */
+        if(wg->deleteFlag) {
+            UA_WriterGroup_remove(server, wg);
+            UA_UNLOCK(&server->serviceMutex);
+            return;
+        }
+
+        /* Reconnect automatically if the connection was operational. This sets
+         * the connection state if connecting fails. Attention! If there are
+         * several send or recv channels, then the connection is only reopened if
+         * all of them close - which is usually the case. */
+        if(wg->state == UA_PUBSUBSTATE_OPERATIONAL)
+            UA_WriterGroup_connect(server, wg);
+
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* Store the connectionId (if a new connection) */
+    if(wg->sendChannel && wg->sendChannel != connectionId) {
+        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+                                  "WriterGroup is already bound to a different channel");
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+    wg->sendChannel = connectionId;
+
+    /* Connection open, set to operational if not already done */
+    if(wg->state != UA_PUBSUBSTATE_OPERATIONAL)
+        UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL,
+                                      UA_STATUSCODE_GOOD);
+    
+    /* Send-channels don't receive messages */
+    UA_UNLOCK(&server->serviceMutex);
+}
+
+static UA_StatusCode
+UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg) {
+    /* Already connected? */
+    if(wg->sendChannel != 0)
+        return UA_STATUSCODE_GOOD;
+
+    /* Unpack the TransportSettings */
+    if((wg->config.transportSettings.encoding != UA_EXTENSIONOBJECT_DECODED &&
+        wg->config.transportSettings.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
+       wg->config.transportSettings.content.decoded.type !=
+       &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE]) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Invalid TransportSettings for a UDP Connection");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_DatagramWriterGroupTransport2DataType *ts =
+        (UA_DatagramWriterGroupTransport2DataType*)
+        wg->config.transportSettings.content.decoded.data;
+
+    /* Unpack the address */
+    if((ts->address.encoding != UA_EXTENSIONOBJECT_DECODED &&
+        ts->address.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
+       ts->address.content.decoded.type != &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Invalid TransportSettings Address for a UDP Connection");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType *)
+        ts->address.content.decoded.data;
+
+    /* Extract hostname and port */
+    UA_String address;
+    UA_UInt16 port;
+    UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, &port, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                "Could not parse the UDP network URL");
+        return res;
+    }
+
+    /* Set up the connection parameters */
+    UA_Boolean listen = false;
+    UA_KeyValuePair kvp[4];
+    UA_KeyValueMap kvm = {3, kvp};
+    kvp[0].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&kvp[1].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    kvp[2].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&kvp[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(!UA_String_isEmpty(&addressUrl->networkInterface)) {
+        kvp[3].key = UA_QUALIFIEDNAME(0, "interface");
+        UA_Variant_setScalar(&kvp[3].value, &addressUrl->networkInterface,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        kvm.mapSize = 4;
+    }
+
+    /* Connect */
+    UA_ConnectionManager *cm = wg->linkedConnection->cm;
+    UA_UNLOCK(&server->serviceMutex);
+    res = cm->openConnection(cm, &kvm, server, wg, WriterGroupChannelCallback);
+    UA_LOCK(&server->serviceMutex);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Could not open a UDP send channel");
+    }
+    return res;
+}
+
+static UA_StatusCode
+UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg) {
+    UA_PubSubConnection *c = wg->linkedConnection;
+    UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
+        c->config.address.data;
+
+    /* Get the TransportSettings */
+    UA_ExtensionObject *ts = &wg->config.transportSettings;
+    if((ts->encoding != UA_EXTENSIONOBJECT_DECODED &&
+        ts->encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
+       ts->content.decoded.type !=
+       &UA_TYPES[UA_TYPES_BROKERWRITERGROUPTRANSPORTDATATYPE]) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Wrong TransportSettings type for MQTT");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_BrokerWriterGroupTransportDataType *transportSettings =
+        (UA_BrokerWriterGroupTransportDataType*)ts->content.decoded.data;
+
+    /* Extract hostname and port */
+    UA_String address;
+    UA_UInt16 port = 1883; /* Default */
+    UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, &port, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                "Could not parse the MQTT network URL");
+        return res;
+    }
+
+    /* Set up the connection parameters.
+     * TODO: Complete the MQTT parameters. */
+    UA_Boolean listen = true;
+    UA_KeyValuePair kvp[4];
+    UA_KeyValueMap kvm = {4, kvp};
+    kvp[0].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&kvp[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[2].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&kvp[2].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    kvp[3].key = UA_QUALIFIEDNAME(0, "topic");
+    UA_Variant_setScalar(&kvp[3].value, &transportSettings->queueName,
+                         &UA_TYPES[UA_TYPES_STRING]);
+
+    /* Connect */
+    UA_UNLOCK(&server->serviceMutex);
+    res = c->cm->openConnection(c->cm, &kvm, server, wg, WriterGroupChannelCallback);
+    UA_LOCK(&server->serviceMutex);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Could not open the MQTT connection");
+    }
+    return res;
+}
+
+void
+UA_WriterGroup_disconnect(UA_WriterGroup *wg) {
+    if(wg->sendChannel == 0)
+        return;
+    UA_PubSubConnection *c = wg->linkedConnection;
+    c->cm->closeConnection(c->cm, c->sendChannel);
+    wg->sendChannel = 0;
+}
+
+UA_StatusCode
+UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* Already connected */
+    if(wg->sendChannel != 0)
+        return UA_STATUSCODE_GOOD;
+
+    /* Is this a WriterGroup with custom TransportSettings beyond the
+     * PubSubConnection? */
+    if(wg->config.transportSettings.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY)
+        return UA_STATUSCODE_GOOD;
+
+    UA_EventLoop *el = server->config.eventLoop;
+    if(!el) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg, "No EventLoop configured");
+        UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR,
+                                           UA_STATUSCODE_BADINTERNALERROR);
+        return UA_STATUSCODE_BADINTERNALERROR;;
+    }
+
+    UA_PubSubConnection *c = wg->linkedConnection;
+    if(!c)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Look up the connection manager for the connection */
+    ProfileMapping *profile = getProfile(c->config.transportProfileUri);
+    UA_ConnectionManager *cm = NULL;
+    if(profile)
+        cm = getCM(el, profile->protocol);
+    if(!cm || (c->cm && cm != c->cm)) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                "The requested protocol is not supported");
+        UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
+                                           UA_STATUSCODE_BADINTERNALERROR);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    c->cm = cm;
+    c->json = profile->json;
+
+    /* Connect */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(profile->connectWriterGroup)
+        res = profile->connectWriterGroup(server, wg);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR, res);
+        return res;
+    }
+
+    /* Set to preoperational. Set the state "manually" to avoid recursion. Also
+     * this is the only place to set pre-operational for PubSubConnections. The
+     * state will be set to operational in the network callback when the
+     * connection has fully opened. */
+    if(wg->state != UA_PUBSUBSTATE_OPERATIONAL)
+        wg->state = UA_PUBSUBSTATE_PREOPERATIONAL;
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/***************/
+/* ReaderGroup */
+/***************/
+
+static void
+UA_ReaderGroup_removeConnection(UA_ReaderGroup *rg,
+                                uintptr_t connectionId) {
+    for(size_t i = 0; i < UA_PUBSUB_MAXCHANNELS; i++) {
+        if(rg->recvChannels[i] != connectionId)
+            continue;
+        rg->recvChannels[i] = 0;
+        rg->recvChannelsSize--;
+        return;
+    }
+}
+
+static UA_StatusCode
+UA_ReaderGroup_addRecvConnection(UA_ReaderGroup*c,
+                                 uintptr_t connectionId) {
+    for(size_t i = 0; i < UA_PUBSUB_MAXCHANNELS; i++) {
+        if(c->recvChannels[i] == connectionId)
+            return UA_STATUSCODE_GOOD;
+    }
+    if(c->recvChannelsSize >= UA_PUBSUB_MAXCHANNELS)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    for(size_t i = 0; i < UA_PUBSUB_MAXCHANNELS; i++) {
+        if(c->recvChannels[i] != 0)
+            continue;
+        c->recvChannels[i] = connectionId;
+        c->recvChannelsSize++;
+        break;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                          void *application, void **connectionContext,
+                          UA_ConnectionState state, const UA_KeyValueMap *params,
+                          UA_ByteString msg) {
+    if(!connectionContext)
+        return;
+
+    /* Get the context pointers */
+    UA_Server *server = (UA_Server*)application;
+    UA_ReaderGroup *rg = (UA_ReaderGroup*)*connectionContext;
+
+    UA_LOCK(&server->serviceMutex);
+
+    /* The connection is closing in the EventLoop. This is the last callback
+     * from that connection. Clean up the SecureChannel in the client. */
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
+        /* Reset the connection identifiers */
+        UA_ReaderGroup_removeConnection(rg, connectionId);
+
+        /* PSC marked for deletion and the last EventLoop connection has closed */
+        if(rg->deleteFlag && rg->recvChannelsSize == 0) {
+            UA_ReaderGroup_remove(server, rg);
+            UA_UNLOCK(&server->serviceMutex);
+            return;
+        }
+
+        /* Reconnect if still operational */
+        UA_ReaderGroup_setPubSubState(server, rg, rg->state, UA_STATUSCODE_GOOD);
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* Store the connectionId (if a new connection) */
+    UA_StatusCode res = UA_ReaderGroup_addRecvConnection(rg, connectionId);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+                                  "No more space for an additional EventLoop connection");
+        UA_PubSubConnection *c = rg->linkedConnection;
+        if(c && c->cm)
+            c->cm->closeConnection(c->cm, connectionId);
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* No message received */
+    if(msg.length == 0) {
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* Received the first message - set to operational */
+    if(rg->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
+        rg->state = UA_PUBSUBSTATE_OPERATIONAL;
+        UA_ServerConfig *config = &server->config;
+        if(config->pubSubConfig.stateChangeCallback != 0) {
+            config->pubSubConfig.stateChangeCallback(server, &rg->identifier,
+                                                     rg->state, UA_STATUSCODE_GOOD);
+        }
+    }
+
+    if(rg->state != UA_PUBSUBSTATE_OPERATIONAL) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+                                   "Received a messaage for a non-operational ReaderGroup");
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* ReaderGroup with realtime processing */
+    if(rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
+        UA_ReaderGroup_decodeAndProcessRT(server, rg, &msg);
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* Decode message */
+    UA_NetworkMessage nm;
+    memset(&nm, 0, sizeof(UA_NetworkMessage));
+    if(rg->config.encodingMimeType == UA_PUBSUB_ENCODING_UADP) {
+        size_t currentPosition = 0;
+        res = decodeNetworkMessage(server, &msg, &currentPosition,
+                                   &nm, rg->linkedConnection);
+    } else { /* if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) */
+#ifdef UA_ENABLE_JSON_ENCODING
+        res = UA_NetworkMessage_decodeJson(&nm, &msg);
+#else
+        res = UA_STATUSCODE_BADNOTSUPPORTED;
+#endif
+    }
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+                                  "Verify, decrypt and decode network message failed");
+        UA_UNLOCK(&server->serviceMutex);
+        return;
+    }
+
+    /* Process the decoded message */
+    UA_ReaderGroup_process(server, rg, &nm);
+    UA_NetworkMessage_clear(&nm);
+    UA_UNLOCK(&server->serviceMutex);
+}
+
+static UA_StatusCode
+UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg) {
+    UA_PubSubConnection *c = rg->linkedConnection;
+    UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
+        c->config.address.data;
+
+    /* Get the TransportSettings */
+    UA_ExtensionObject *ts = &rg->config.transportSettings;
+    if((ts->encoding != UA_EXTENSIONOBJECT_DECODED &&
+        ts->encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
+       ts->content.decoded.type !=
+       &UA_TYPES[UA_TYPES_BROKERDATASETREADERTRANSPORTDATATYPE]) {
+        UA_LOG_ERROR_READERGROUP(&server->config.logger, rg,
+                                "Wrong TransportSettings type for MQTT");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    UA_BrokerDataSetReaderTransportDataType *transportSettings =
+        (UA_BrokerDataSetReaderTransportDataType*)ts->content.decoded.data;
+
+    /* Extract hostname and port */
+    UA_String address;
+    UA_UInt16 port = 1883; /* Default */
+    UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, &port, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                "Could not parse the MQTT network URL");
+        return res;
+    }
+
+    /* Set up the connection parameters.
+     * TODO: Complete the MQTT parameters. */
+    UA_Boolean listen = true;
+    UA_KeyValuePair kvp[4];
+    UA_KeyValueMap kvm = {4, kvp};
+    kvp[0].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&kvp[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[2].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&kvp[2].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    kvp[3].key = UA_QUALIFIEDNAME(0, "topic");
+    UA_Variant_setScalar(&kvp[3].value, &transportSettings->queueName,
+                         &UA_TYPES[UA_TYPES_STRING]);
+
+    /* Connect */
+    UA_UNLOCK(&server->serviceMutex);
+    res = c->cm->openConnection(c->cm, &kvm, server, rg, ReaderGroupChannelCallback);
+    UA_LOCK(&server->serviceMutex);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_READERGROUP(&server->config.logger, rg,
+                                 "Could not open the MQTT connection");
+    }
+    return res;
+}
+
+void
+UA_ReaderGroup_disconnect(UA_ReaderGroup *rg) {
+    UA_PubSubConnection *c = rg->linkedConnection;
+    if(!c)
+        return;
+    for(size_t i = 0; i < UA_PUBSUB_MAXCHANNELS; i++) {
+        if(rg->recvChannels[i] != 0)
+            c->cm->closeConnection(c->cm, rg->recvChannels[i]);
+    }
+}
+
+UA_StatusCode
+UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* Already connected */
+    if(rg->recvChannelsSize != 0)
+        return UA_STATUSCODE_GOOD;
+
+    /* Is this a ReaderGroup with custom TransportSettings beyond the
+     * PubSubConnection? */
+    if(rg->config.transportSettings.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY)
+        return UA_STATUSCODE_GOOD;
+
+    UA_EventLoop *el = server->config.eventLoop;
+    if(!el) {
+        UA_LOG_ERROR_READERGROUP(&server->config.logger, rg, "No EventLoop configured");
+        UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_ERROR,
+                                      UA_STATUSCODE_BADINTERNALERROR);
+        return UA_STATUSCODE_BADINTERNALERROR;;
+    }
+
+    UA_PubSubConnection *c = rg->linkedConnection;
+    if(!c)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Look up the connection manager for the connection */
+    ProfileMapping *profile = getProfile(c->config.transportProfileUri);
+    UA_ConnectionManager *cm = NULL;
+    if(profile)
+        cm = getCM(el, profile->protocol);
+    if(!cm || (c->cm && cm != c->cm)) {
+        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+                                "The requested protocol is not supported");
+        UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
+                                           UA_STATUSCODE_BADINTERNALERROR);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    c->cm = cm;
+    c->json = profile->json;
+
+    /* Connect */
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    if(profile->connectReaderGroup)
+        res = profile->connectReaderGroup(server, rg);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_ERROR, res);
+        return res;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 6d471cf518a..3032198351a 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -74,13 +74,8 @@ UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     }
 
     UA_PubSubKeyStorage_clearKeyList(keyStorage);
-
-    if(keyStorage->securityGroupID.data)
-        UA_String_clear(&keyStorage->securityGroupID);
-
-    /* clear SKS client config from keystorage */
+    UA_String_clear(&keyStorage->securityGroupID);
     UA_ClientConfig_clear(&keyStorage->sksConfig.clientConfig);
-
     UA_free(keyStorage);
 }
 
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 34d3429edb9..4102037d106 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -429,6 +429,15 @@ UA_PubSubManager_init(UA_Server *server, UA_PubSubManager *pubSubManager) {
 #endif
 }
 
+void
+UA_PubSubManager_shutdown(UA_Server *server, UA_PubSubManager *pubSubManager) {
+    UA_PubSubConnection *tmpConnection;
+    TAILQ_FOREACH(tmpConnection, &server->pubSubManager.connections, listEntry) {
+        UA_PubSubConnection_setPubSubState(server, tmpConnection,
+                                           UA_PUBSUBSTATE_DISABLED, UA_STATUSCODE_GOOD);
+    }
+}
+
 /* Delete the current PubSub configuration including all nested members. This
  * action also delete the configured PubSub transport Layers. */
 void
@@ -441,7 +450,7 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     UA_PubSubConnection *tmpConnection1, *tmpConnection2;
     TAILQ_FOREACH_SAFE(tmpConnection1, &server->pubSubManager.connections,
                        listEntry, tmpConnection2) {
-        UA_PubSubConnection_remove(server, tmpConnection1);
+        UA_PubSubConnection_delete(server, tmpConnection1);
     }
 
     /* Remove the DataSets */
@@ -469,6 +478,7 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
         UA_free(server->config.pubSubConfig.transportLayers);
         server->config.pubSubConfig.transportLayersSize = 0;
     }
+
     /* Delete subscribed datasets */
     UA_StandaloneSubscribedDataSet *tmpSDS1, *tmpSDS2;
     TAILQ_FOREACH_SAFE(tmpSDS1, &server->pubSubManager.subscribedDataSets, listEntry, tmpSDS2){
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 79f0fc2399b..11d924211ba 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -60,9 +60,10 @@ publisherIdIsMatching(UA_NetworkMessage *msg, UA_Variant publisherId) {
     return true;
 }
 
-static UA_StatusCode
-checkReaderIdentifier(UA_Server *server, UA_NetworkMessage *msg,
-                      UA_DataSetReader *reader, UA_ReaderGroupConfig readerGroupConfig) {
+UA_StatusCode
+UA_DataSetReader_checkIdentifier(UA_Server *server, UA_NetworkMessage *msg,
+                                 UA_DataSetReader *reader,
+                                 UA_ReaderGroupConfig readerGroupConfig) {
     if(readerGroupConfig.encodingMimeType != UA_PUBSUB_ENCODING_JSON){
         if(!publisherIdIsMatching(msg, reader->config.publisherId)) {
             return UA_STATUSCODE_BADNOTFOUND;
@@ -1090,52 +1091,28 @@ processMessageWithReader(UA_Server *server, UA_ReaderGroup *readerGroup,
     }
 }
 
-/* Process Network Message for a ReaderGroup. But we the ReaderGroup needs to be
- * identified first. */
-static UA_StatusCode
-processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
-                      UA_NetworkMessage* msg) {
-    if(!msg || !connection)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-
-    /* To Do The condition pMsg->dataSetClassIdEnabled
-     * Here some filtering is possible */
-
-    if(!msg->publisherIdEnabled) {
-        UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
-                               "Cannot process DataSetReader without PublisherId");
-        return UA_STATUSCODE_BADNOTIMPLEMENTED; /* TODO: Handle DSR without PublisherId */
-    }
-
-    /* There can be several readers listening for the same network message */
+UA_Boolean
+UA_ReaderGroup_process(UA_Server *server, UA_ReaderGroup *readerGroup,
+                       UA_NetworkMessage *nm) {
     UA_Boolean processed = false;
-    UA_ReaderGroup *readerGroup;
     UA_DataSetReader *reader;
-    LIST_FOREACH(readerGroup, &connection->readerGroups, listEntry) {
-        /* Received a (first) message for the ReaderGroup.
-         * Transition from PreOperational to Operational. */
-        if(readerGroup->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
-            UA_ReaderGroup_setPubSubState(server, readerGroup,
-                                          UA_PUBSUBSTATE_OPERATIONAL,
-                                          UA_STATUSCODE_GOOD);
-        }
 
-        LIST_FOREACH(reader, &readerGroup->readers, listEntry) {
-            UA_StatusCode retval = checkReaderIdentifier(server, msg, reader, readerGroup->config);
-            if(retval != UA_STATUSCODE_GOOD)
-                continue;
-            processed = true;
-            processMessageWithReader(server, readerGroup, reader, msg);
-        }
+    /* Received a (first) message for the ReaderGroup.
+     * Transition from PreOperational to Operational. */
+    if(readerGroup->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
+        UA_ReaderGroup_setPubSubState(server, readerGroup,
+                                      UA_PUBSUBSTATE_OPERATIONAL,
+                                      UA_STATUSCODE_GOOD);
     }
-
-    if(!processed) {
-        UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
-                               "DatasetReader not found. Check PublisherId, "
-                               "WriterGroupId and DatasetWriterId");
+    LIST_FOREACH(reader, &readerGroup->readers, listEntry) {
+        UA_StatusCode res =
+            UA_DataSetReader_checkIdentifier(server, nm, reader, readerGroup->config);
+        if(res != UA_STATUSCODE_GOOD)
+            continue;
+        processed = true;
+        processMessageWithReader(server, readerGroup, reader, nm);
     }
-
-    return UA_STATUSCODE_GOOD;
+    return processed;
 }
 
 /********************************************************************************
@@ -1143,144 +1120,9 @@ processNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
  * as a subscriber
  ********************************************************************************/
 
-UA_StatusCode
-decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
-                     UA_NetworkMessage *nm, UA_PubSubConnection *connection) {
-#ifdef UA_DEBUG_DUMP_PKGS
-    UA_dump_hex_pkg(buffer->data, buffer->length);
-#endif
-
-    UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buffer, pos, nm);
-    if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
-                                  "PubSub receive. decoding headers failed");
-        return rv;
-    }
-
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-    UA_Boolean processed = false;
-    UA_ReaderGroup *readerGroup;
-    UA_DataSetReader *reader;
-
-    /* Choose a correct readergroup for decrypt/verify this message
-     * (there could be multiple) */
-    LIST_FOREACH(readerGroup, &connection->readerGroups, listEntry) {
-        LIST_FOREACH(reader, &readerGroup->readers, listEntry) {
-            UA_StatusCode retval = checkReaderIdentifier(server, nm, reader, readerGroup->config);
-            if(retval == UA_STATUSCODE_GOOD) {
-                processed = true;
-                rv = verifyAndDecryptNetworkMessage(&server->config.logger, buffer, pos,
-                                                    nm, readerGroup);
-                if(rv != UA_STATUSCODE_GOOD) {
-                    UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
-                                              "Subscribe failed, verify and decrypt "
-                                              "network message failed.");
-                    return rv;
-                }
-
-#ifdef UA_DEBUG_DUMP_PKGS
-                UA_dump_hex_pkg(buffer->data, buffer->length);
-#endif
-                /* break out of all loops when first verify & decrypt was successful */
-                goto loops_exit;
-            }
-        }
-    }
-
-loops_exit:
-    if(!processed) {
-        UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
-                               "Dataset reader not found. Check PublisherId, "
-                               "WriterGroupId and DatasetWriterId");
-        /* Possible multicast scenario: there are multiple connections (with one
-         * or more ReaderGroups) within a multicast group every connection
-         * receives all network messages, even if some of them are not meant for
-         * the connection currently processed -> therefore it is ok if the
-         * connection does not have a DataSetReader for every received network
-         * message. We must not return an error here, but continue with the
-         * buffer decoding and see if we have a matching DataSetReader for the
-         * next network message. */
-    }
-#endif
-
-    rv = UA_NetworkMessage_decodePayload(buffer, pos, nm, server->config.customDataTypes);
-    UA_CHECK_STATUS(rv, return rv);
-
-    rv = UA_NetworkMessage_decodeFooters(buffer, pos, nm);
-    UA_CHECK_STATUS(rv, return rv);
-
-    return UA_STATUSCODE_GOOD;
-}
-
-#ifdef UA_ENABLE_JSON_ENCODING
-UA_StatusCode
-decodeNetworkMessageJson(UA_Server *server, UA_ByteString *buffer, size_t *pos,
-                     UA_NetworkMessage *nm, UA_PubSubConnection *connection) {
-
-    UA_StatusCode rv = UA_NetworkMessage_decodeJson(nm, buffer);
-    UA_CHECK_STATUS(rv, return rv);
-
-    return UA_STATUSCODE_GOOD;
-}
-#endif
-
-static UA_StatusCode
-decodeAndProcessNetworkMessage(UA_Server *server, UA_PubSubConnection *connection,
-                                  UA_PubSubEncodingType encodingMimeType, UA_ByteString *buf) {
-    UA_NetworkMessage nm;
-    memset(&nm, 0, sizeof(UA_NetworkMessage));
-
-    UA_ReaderGroup *readerGroup = LIST_FIRST(&connection->readerGroups);
-    if(!readerGroup) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
-                                  "Received message, but no reader configured");
-        return UA_STATUSCODE_GOOD;
-    }
-
-    size_t currentPosition = 0;
-    UA_StatusCode rv;
-    if(encodingMimeType == UA_PUBSUB_ENCODING_UADP){
-        rv = decodeNetworkMessage(server, buf, &currentPosition,
-                                  &nm, connection);
-    } else { /* if(writerGroup->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) */
-#ifdef UA_ENABLE_JSON_ENCODING
-        rv = decodeNetworkMessageJson(server, buf, &currentPosition,
-                                  &nm, connection);
-#else
-        rv = UA_STATUSCODE_BADNOTSUPPORTED;
-#endif
-    }
-    if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
-                                  "Verify, decrypt and decode network message failed.");
-        goto cleanup;
-    }
-
-    rv = processNetworkMessage(server, connection, &nm);
-    if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
-                                  "Processing the network message failed.");
-    }
-
-cleanup:
-    UA_NetworkMessage_clear(&nm);
-    return rv;
-}
-
-UA_StatusCode
-UA_decodeAndProcessNetworkMessage(UA_Server *server,
-                                  UA_PubSubConnection *connection,
-                                  UA_ByteString *buffer) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res =
-        decodeAndProcessNetworkMessage(server, connection, UA_PUBSUB_ENCODING_UADP, buffer);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
 static UA_StatusCode
 prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *reader,
-                    UA_PubSubConnection *connection, UA_ByteString *buf, size_t *pos) {
+                    UA_ByteString *buf, size_t *pos) {
     UA_NetworkMessage *nm = (UA_NetworkMessage*)UA_calloc(1, sizeof(UA_NetworkMessage));
     if(!nm)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -1296,7 +1138,7 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
     }
 
     /* Check if the message was intended for this reader */
-    rv = checkReaderIdentifier(server, nm, reader, rg->config);
+    rv = UA_DataSetReader_checkIdentifier(server, nm, reader, rg->config);
     if(rv != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO_READER(&server->config.logger, reader,
                            "PubSub receive. Message intended for a different reader.");
@@ -1329,7 +1171,6 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
 
 static void
 decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
-                   UA_PubSubConnection *connection,
                    UA_DataSetReader *dsr, UA_ByteString *buf) {
     size_t currentPosition = 0;
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
@@ -1337,8 +1178,7 @@ decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
     if(!nm) {
         /* This is the first message being received for the RT fastpath. Prepare
          * the offset buffer and set operational. */
-        rv = prepareOffsetBuffer(server, readerGroup, dsr, connection,
-                                 buf, &currentPosition);
+        rv = prepareOffsetBuffer(server, readerGroup, dsr, buf, &currentPosition);
         if(rv != UA_STATUSCODE_GOOD) {
             UA_LOG_INFO_READER(&server->config.logger, dsr,
                                "PubSub receive failed. Could not decode with "
@@ -1363,7 +1203,7 @@ decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
         }
 
         /* Check the decoded message is intended for this reader */
-        rv = checkReaderIdentifier(server, nm, dsr, readerGroup->config);
+        rv = UA_DataSetReader_checkIdentifier(server, nm, dsr, readerGroup->config);
         if(rv != UA_STATUSCODE_GOOD) {
             UA_LOG_INFO_READER(&server->config.logger, dsr,
                                "PubSub receive. Message intended for a different reader.");
@@ -1377,9 +1217,13 @@ decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
     }
 }
 
-UA_StatusCode
-UA_DataSetReader_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
-                                    UA_PubSubConnection *connection, UA_ByteString *buf) {
+/*******************************/
+/* Realtime Message Processing */
+/*******************************/
+
+UA_Boolean
+UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
+                                  UA_ByteString *buf) {
 #ifdef UA_ENABLE_PUBSUB_BUFMALLOC
     useMembufAlloc();
 #endif
@@ -1395,7 +1239,7 @@ UA_DataSetReader_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGro
     if(rv != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
                               "PubSub receive. decoding headers failed");
-        return rv;
+        goto done;
     }
 
     rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &payLoadPosition,
@@ -1405,7 +1249,7 @@ UA_DataSetReader_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGro
         UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
                               "Subscribe failed. verify and decrypt network "
                               "message failed.");
-        return rv;
+        goto done;
     }
 #endif
 
@@ -1413,139 +1257,21 @@ UA_DataSetReader_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGro
      * different PublisherId. So the offsets are different for each. */
     UA_DataSetReader *dsr;
     LIST_FOREACH(dsr, &readerGroup->readers, listEntry) {
-        decodeAndProcessRT(server, readerGroup, connection, dsr, buf);
+        decodeAndProcessRT(server, readerGroup, dsr, buf);
     }
 
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+ done:
+#endif
 #ifdef UA_ENABLE_PUBSUB_BUFMALLOC
     useNormalAlloc();
 #endif
-    return UA_STATUSCODE_GOOD;
-}
-
-typedef struct {
-    UA_Server *server;
-    UA_PubSubConnection *connection;
-} UA_RGContext;
 
-static UA_StatusCode
-decodeAndProcessFun(UA_PubSubChannel *channel, void *cbContext,
-                    const UA_ByteString *buf) {
-    UA_RGContext *ctx = (UA_RGContext*)cbContext;
-    UA_ByteString mutableBuffer = {buf->length, buf->data};
-
-    /* If there is no ReaderGroup attached -> nothing to do.
-     * Otherwise assume they all have the same encoding mime-type. */
-    UA_ReaderGroup *rg = LIST_FIRST(&ctx->connection->readerGroups);
-    if(!rg)
-        return UA_STATUSCODE_BADNOTHINGTODO;
-
-    return decodeAndProcessNetworkMessage(ctx->server, ctx->connection,
-                                          rg->config.encodingMimeType,
-                                          &mutableBuffer);
-}
-
-static UA_StatusCode
-decodeAndProcessFunRT(UA_PubSubChannel *channel, void *cbContext,
-                      const UA_ByteString *buf) {
-    UA_RGContext *ctx = (UA_RGContext*)cbContext;
-    UA_ByteString mutableBuffer = {buf->length, buf->data};
-
-    /* Process for all ReaderGroups that are operational and linked to the connection */
-    UA_ReaderGroup *rg;
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    LIST_FOREACH(rg, &ctx->connection->readerGroups, listEntry) {
-        res |= UA_DataSetReader_decodeAndProcessRT(ctx->server, rg, ctx->connection,
-                                                   &mutableBuffer);
-    }
-    return res;
-}
-
-void processMqttSubscriberCallback(UA_Server *server, UA_PubSubConnection *connection,
-                                   UA_ByteString *msg) {
-    UA_RGContext ctx = {server, connection};
-    decodeAndProcessFun(connection->channel, &ctx, msg);
-}
-
-UA_StatusCode
-receiveBufferedNetworkMessage(UA_Server *server, UA_ReaderGroup *readerGroup,
-                              UA_PubSubConnection *connection) {
-    UA_RGContext ctx = {server, connection};
-    UA_PubSubReceiveCallback receiveCB;
-    if(readerGroup->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE)
-        receiveCB = decodeAndProcessFunRT;
-    else
-        receiveCB = decodeAndProcessFun;
-
-    /* TODO: Move the TransportSettings to to the readerGroupConfig. So we can
-     * use it here instead of a NULL pointer. */
-    UA_StatusCode rv =
-        connection->channel->receive(connection->channel, &readerGroup->config.transportSettings,
-                                     receiveCB, &ctx,
-                                     readerGroup->config.timeout);
-
-    // TODO attention: here rv is ok if UA_STATUSCODE_GOOD != rv
-    if(UA_StatusCode_isBad(rv)) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
-                              "SubscribeCallback(): Connection receive failed!");
-        return rv;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StandaloneSubscribedDataSet *
-UA_StandaloneSubscribedDataSet_findSDSbyId(UA_Server *server, UA_NodeId identifier) {
-    UA_StandaloneSubscribedDataSet *subscribedDataSet;
-    TAILQ_FOREACH(subscribedDataSet, &server->pubSubManager.subscribedDataSets,
-                  listEntry) {
-        if(UA_NodeId_equal(&identifier, &subscribedDataSet->identifier))
-            return subscribedDataSet;
-    }
-    return NULL;
-}
-
-UA_StandaloneSubscribedDataSet *
-UA_StandaloneSubscribedDataSet_findSDSbyName(UA_Server *server, UA_String identifier) {
-    UA_StandaloneSubscribedDataSet *subscribedDataSet;
-    TAILQ_FOREACH(subscribedDataSet, &server->pubSubManager.subscribedDataSets,
-                  listEntry) {
-        if(UA_String_equal(&identifier, &subscribedDataSet->config.name))
-            return subscribedDataSet;
-    }
-    return NULL;
-}
-
-UA_StatusCode
-UA_StandaloneSubscribedDataSetConfig_copy(const UA_StandaloneSubscribedDataSetConfig *src,
-                                          UA_StandaloneSubscribedDataSetConfig *dst) {
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    memcpy(dst, src, sizeof(UA_StandaloneSubscribedDataSetConfig));
-    res = UA_DataSetMetaDataType_copy(&src->dataSetMetaData, &dst->dataSetMetaData);
-    res |= UA_String_copy(&src->name, &dst->name);
-    res |= UA_Boolean_copy(&src->isConnected, &dst->isConnected);
-    res |= UA_TargetVariablesDataType_copy(&src->subscribedDataSet.target,
-                                           &dst->subscribedDataSet.target);
-
-    if(res != UA_STATUSCODE_GOOD)
-        UA_StandaloneSubscribedDataSetConfig_clear(dst);
-    return res;
-}
-
-void
-UA_StandaloneSubscribedDataSetConfig_clear(
-    UA_StandaloneSubscribedDataSetConfig *sdsConfig) {
-    // delete sds config
-    UA_String_clear(&sdsConfig->name);
-    UA_DataSetMetaDataType_clear(&sdsConfig->dataSetMetaData);
-    UA_TargetVariablesDataType_clear(&sdsConfig->subscribedDataSet.target);
-}
-
-void
-UA_StandaloneSubscribedDataSet_clear(UA_Server *server,
-                                     UA_StandaloneSubscribedDataSet *subscribedDataSet) {
-    UA_StandaloneSubscribedDataSetConfig_clear(&subscribedDataSet->config);
-    UA_NodeId_clear(&subscribedDataSet->identifier);
-    UA_NodeId_clear(&subscribedDataSet->connectedReader);
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    return (rv == UA_STATUSCODE_GOOD);
+#else
+    return true;
+#endif
 }
 
 #endif /* UA_ENABLE_PUBSUB */
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 0489a81b815..a9502491fc2 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -75,88 +75,8 @@ UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig) {
 #endif
 }
 
-/* This triggers the collection and reception of NetworkMessages and the
- * contained DataSetMessages. */
-static void
-subscribeCallback(UA_Server *server,
-                  UA_ReaderGroup *readerGroup) {
-    // TODO: feedback for debug-assert vs runtime-check
-    UA_assert(server);
-    UA_assert(readerGroup);
-
-    UA_LOG_DEBUG_READERGROUP(&server->config.logger, readerGroup,
-                             "PubSub subscribe callback");
-
-    UA_PubSubConnection *connection = readerGroup->linkedConnection;
-    if(!connection) {
-        UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
-                     "SubscribeCallback(): Find linked connection failed");
-        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_ERROR,
-                                      UA_STATUSCODE_BADCONNECTIONCLOSED);
-        return;
-    }
-
-    receiveBufferedNetworkMessage(server, readerGroup, connection);
-}
-
-static void
-UA_ReaderGroup_subscribeCallback(UA_Server *server,
-                                 UA_ReaderGroup *readerGroup) {
-    UA_LOCK(&server->serviceMutex);
-    subscribeCallback(server, readerGroup);
-    UA_UNLOCK(&server->serviceMutex);
-}
-
 /* ReaderGroup Lifecycle */
 
-/* Add new subscribeCallback. The first execution is triggered directly after
- * creation. */
-static UA_StatusCode
-UA_ReaderGroup_addSubscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup) {
-    /* Already registered */
-    if(readerGroup->subscribeCallbackId != 0)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    UA_EventLoop *el = readerGroup->linkedConnection->config.eventLoop;
-    if(!el)
-        el = server->config.eventLoop;
-
-    UA_StatusCode retval =
-        el->addCyclicCallback(el, (UA_Callback)UA_ReaderGroup_subscribeCallback,
-                              server, readerGroup,
-                              readerGroup->config.subscribingInterval,
-                              NULL /* TODO: use basetime */,
-                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME /* TODO: Send
-                                                                          * timer policy
-                                                                          * from writer
-                                                                          * group
-                                                                          * config */,
-                              &readerGroup->subscribeCallbackId);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-
-    /* Run once after creation */
-    /* When using blocking socket functionality, the server mechanism might get
-     * blocked. It is highly recommended to use custom callback when using
-     * blockingsocket. */
-    if(readerGroup->config.enableBlockingSocket != true)
-        subscribeCallback(server, readerGroup);
-
-    return retval;
-}
-
-static void
-UA_ReaderGroup_removeSubscribeCallback(UA_Server *server,
-                                       UA_ReaderGroup *readerGroup) {
-    UA_PubSubConnection *connection = readerGroup->linkedConnection;
-    UA_EventLoop *el = server->config.eventLoop;
-    if(connection && connection->config.eventLoop)
-        el = connection->config.eventLoop;
-    if(readerGroup->subscribeCallbackId != 0)
-        el->removeCyclicCallback(el, readerGroup->subscribeCallbackId);
-    readerGroup->subscribeCallbackId = 0;
-}
-
 UA_StatusCode
 UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
                       const UA_ReaderGroupConfig *rgc,
@@ -186,15 +106,7 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    /* Regist (bind) the connection channel if it is not already registered */
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(!connection->isRegistered) {
-        retval |= UA_PubSubConnection_regist(server, &connectionId, rgc);
-        if(retval != UA_STATUSCODE_GOOD)
-            return retval;
-    }
-
-    /* Allocate memory for new reader group */
+    /* Allocate memory for new reader group and add settings */
     UA_ReaderGroup *newGroup = (UA_ReaderGroup *)UA_calloc(1, sizeof(UA_ReaderGroup));
     if(!newGroup)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -202,7 +114,7 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
     newGroup->componentType = UA_PUBSUB_COMPONENT_READERGROUP;
 
     /* Deep copy of the config */
-    retval = UA_ReaderGroupConfig_copy(rgc, &newGroup->config);
+    UA_StatusCode retval = UA_ReaderGroupConfig_copy(rgc, &newGroup->config);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_free(newGroup);
         return retval;
@@ -216,7 +128,7 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
         newGroup->config.timeout = 0; /* Set timeout to 0 for blocking socket */
 
     if((!newGroup->config.enableBlockingSocket) && (!newGroup->config.timeout))
-        newGroup->config.timeout = 1000; /* Set default to 1ms socket timeout
+        newGroup->config.timeout = 1000; /* Set default to 1ms channel timeout
                                           * when non-blocking socket allows with
                                           * zero timeout */
 
@@ -226,13 +138,6 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
     LIST_INSERT_HEAD(&connection->readerGroups, newGroup, listEntry);
     connection->readerGroupsSize++;
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    retval |= addReaderGroupRepresentation(server, newGroup);
-#else
-    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
-                                          &newGroup->identifier);
-#endif
-
 #ifdef UA_ENABLE_PUBSUB_SKS
     if(rgc->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        rgc->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
@@ -261,20 +166,31 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
             newGroup->keyStorage->referenceCount++;
         }
     }
+#endif
 
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    retval |= addReaderGroupRepresentation(server, newGroup);
+#else
+    UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
+                                          &newGroup->identifier);
 #endif
 
+
     if(readerGroupId)
         UA_NodeId_copy(&newGroup->identifier, readerGroupId);
 
-    /* Set the assigment between ReaderGroup and Topic if the transport layer is MQTT. */
-    const UA_String transport_uri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
-    if(UA_String_equal(&connection->config.transportProfileUri, &transport_uri)) {
-        UA_String topic = ((UA_BrokerWriterGroupTransportDataType *)
-                           rgc->transportSettings.content.decoded.data)->queueName;
-        retval |= UA_PubSubManager_addPubSubTopicAssign(server, newGroup, topic);
-    }
+    /* Trigger the connection to open a connection */
+    UA_PubSubConnection_setPubSubState(server, connection,
+                                       connection->state, UA_STATUSCODE_GOOD);
+
+    /* If the connection is operational, we still reset the state. We might open
+     * a different (recv) connection internally when a readergroup is
+     * present. */
+    if(connection->state == UA_PUBSUBSTATE_OPERATIONAL ||
+       connection->state == UA_PUBSUBSTATE_PREOPERATIONAL)
+        UA_PubSubConnection_setPubSubState(server, connection,
+                                           UA_PUBSUBSTATE_OPERATIONAL, UA_STATUSCODE_GOOD);
+
     return retval;
 }
 
@@ -299,14 +215,6 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    /* Unregister subscribe callback */
-    if(rg->state == UA_PUBSUBSTATE_OPERATIONAL)
-        UA_ReaderGroup_removeSubscribeCallback(server, rg);
-
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    deleteNode(server, rg->identifier, true);
-#endif
-
     UA_DataSetReader *dsr, *tmp_dsr;
     LIST_FOREACH_SAFE(dsr, &rg->readers, listEntry, tmp_dsr) {
         UA_DataSetReader_remove(server, dsr);
@@ -326,14 +234,26 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
     }
 #endif
 
-    LIST_REMOVE(rg, listEntry);
-    UA_PubSubConnection* pConn = rg->linkedConnection;
-    if(pConn != NULL)
-        pConn->readerGroupsSize--;
+    if(!rg->deleteFlag)
+        UA_ReaderGroup_disconnect(rg);
+    rg->deleteFlag = true;
+
+    if(rg->recvChannelsSize == 0) {
+        UA_PubSubConnection* pConn = rg->linkedConnection;
+        if(pConn != NULL) {
+            LIST_REMOVE(rg, listEntry);
+            pConn->readerGroupsSize--;
+            UA_PubSubConnection_setPubSubState(server, pConn, pConn->state,
+                                               UA_STATUSCODE_GOOD);
+        }
 
-    UA_NodeId_clear(&rg->identifier);
-    UA_ReaderGroupConfig_clear(&rg->config);
-    UA_free(rg);
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+        deleteNode(server, rg->identifier, true);
+#endif
+        UA_NodeId_clear(&rg->identifier);
+        UA_ReaderGroupConfig_clear(&rg->config);
+        UA_free(rg);
+    }
 
     return UA_STATUSCODE_GOOD;
 }
@@ -406,7 +326,6 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
         break;
     case UA_PUBSUBSTATE_OPERATIONAL:
     case UA_PUBSUBSTATE_PREOPERATIONAL:
-        UA_ReaderGroup_removeSubscribeCallback(server, rg);
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
             UA_DataSetReader_setPubSubState(server, dataSetReader,
                                             UA_PUBSUBSTATE_DISABLED, cause);
@@ -451,38 +370,40 @@ static UA_StatusCode
 UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
                                           UA_ReaderGroup *rg,
                                           UA_StatusCode cause) {
-    UA_PubSubState state = UA_PUBSUBSTATE_OPERATIONAL;
-    UA_DataSetReader *dataSetReader = LIST_FIRST(&rg->readers);
-    if(!dataSetReader ||
-       (rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE &&
-        rg->configurationFrozen && !dataSetReader->bufferedMessage.nm))
-        state = UA_PUBSUBSTATE_PREOPERATIONAL;
-
-    UA_PubSubState oldstate = rg->state;
-    rg->state = state; /* Set the new state now. So we can already switch from
-                        * pre-operational to operational when the first messages
-                        * are received during the enabled-calback step. */
-
-    switch(oldstate) {
-    case UA_PUBSUBSTATE_DISABLED:
-        UA_ReaderGroup_addSubscribeCallback(server, rg);
-        /* Fall-through */
-    case UA_PUBSUBSTATE_OPERATIONAL:
-    case UA_PUBSUBSTATE_PREOPERATIONAL:
-        LIST_FOREACH(dataSetReader, &rg->readers, listEntry) {
-            UA_DataSetReader_setPubSubState(server, dataSetReader, state, cause);
-        }
-        return UA_STATUSCODE_GOOD;
-    case UA_PUBSUBSTATE_PAUSED:
-        break;
-    case UA_PUBSUBSTATE_ERROR:
-        break;
-    default:
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg, "Unknown PubSub state!");
-        rg->state = UA_PUBSUBSTATE_ERROR;
+    UA_PubSubConnection *pubSubConnection = rg->linkedConnection;
+    UA_StatusCode ret =
+        UA_PubSubConnection_setPubSubState(server, pubSubConnection,
+                                           UA_PUBSUBSTATE_OPERATIONAL,
+                                           UA_STATUSCODE_GOOD);
+    if(ret != UA_STATUSCODE_GOOD ||
+       (pubSubConnection->state != UA_PUBSUBSTATE_OPERATIONAL &&
+        pubSubConnection->state != UA_PUBSUBSTATE_PREOPERATIONAL)) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+                                   "Connection not operational");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    return UA_STATUSCODE_BADNOTSUPPORTED;
+
+    /* Connect if the ReaderGroup has dedicated connections */
+    if(rg->recvChannelsSize == 0)
+        ret = UA_ReaderGroup_connect(server, rg);
+    if(ret != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_READERGROUP(&server->config.logger, rg, "Could not connect");
+        UA_PubSubConnection_setPubSubState(server, pubSubConnection,
+                                           UA_PUBSUBSTATE_ERROR, ret);
+    }
+
+    /* Set to preoperational until the first message was received */
+    if(rg->state != UA_PUBSUBSTATE_OPERATIONAL)
+        rg->state = UA_PUBSUBSTATE_PREOPERATIONAL;
+
+    /* Set all readers operational */
+    UA_DataSetReader *dsr;
+    LIST_FOREACH(dsr, &rg->readers, listEntry) {
+        UA_DataSetReader_setPubSubState(server, dsr,
+                                        UA_PUBSUBSTATE_OPERATIONAL, cause);
+    }
+
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
@@ -497,7 +418,6 @@ UA_ReaderGroup_setPubSubState_error(UA_Server *server,
         break;
     case UA_PUBSUBSTATE_OPERATIONAL:
     case UA_PUBSUBSTATE_PREOPERATIONAL:
-        UA_ReaderGroup_removeSubscribeCallback(server, rg);
         LIST_FOREACH(dataSetReader, &rg->readers, listEntry){
             UA_DataSetReader_setPubSubState(server, dataSetReader, UA_PUBSUBSTATE_ERROR,
                                             cause);
@@ -540,12 +460,14 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
                                        "Received unknown PubSub state!");
             break;
     }
-    if(state != oldState) {
-        /* inform application about state change */
+
+    /* inform application about state change */
+    if(readerGroup->state != oldState) {
         UA_ServerConfig *pConfig = &server->config;
         if(pConfig->pubSubConfig.stateChangeCallback != 0) {
             pConfig->pubSubConfig.
-                stateChangeCallback(server, &readerGroup->identifier, state, cause);
+                stateChangeCallback(server, &readerGroup->identifier,
+                                    readerGroup->state, cause);
         }
     }
     return ret;
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 443512b1eba..68440a3f5dd 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -187,7 +187,8 @@ initializeKeyStorageWithKeys(UA_Server *server, UA_SecurityGroup *securityGroup)
                                  &securityGroup->callbackId);
 
 cleanup:
-    UA_Array_delete(futurekeys, securityGroup->config.maxFutureKeyCount, &UA_TYPES[UA_TYPES_BYTESTRING]);
+    UA_Array_delete(futurekeys, securityGroup->config.maxFutureKeyCount,
+                    &UA_TYPES[UA_TYPES_BYTESTRING]);
     UA_ByteString_clear(&currentKey);
     if(retval != UA_STATUSCODE_GOOD)
         UA_PubSubKeyStorage_delete(server, ks);
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 8eede5d4561..b04c391ad6e 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -41,7 +41,7 @@ generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
 
 /* Add new publishCallback. The first execution is triggered directly after
  * creation. */
-static UA_StatusCode
+UA_StatusCode
 UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -147,35 +147,6 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
             &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
         newConfig->messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
     }
-    /* writerGroupTransportSettings */
-    /* Retrieve the transport layer for the given profile uri */
-    UA_PubSubTransportLayer *tl =
-        UA_getTransportProtocolLayer(server, &currentConnectionContext->config.transportProfileUri);
-    UA_CHECK_MEM_ERROR(tl, UA_free(newWriterGroup); return UA_STATUSCODE_BADNOTFOUND,
-                       &server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection creation failed. Requested transport layer not found.");
-    UA_TransportLayerContext ctx;
-    ctx.writerGroupAddress = NULL;
-    ctx.connection = currentConnectionContext;
-    if(UA_Variant_hasScalarType(&currentConnectionContext->config.address,
-                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
-        UA_NetworkAddressUrlDataType *address =
-            (UA_NetworkAddressUrlDataType *)currentConnectionContext->config.address.data;
-        ctx.connectionAddress = address;
-    } else {
-        UA_free(newWriterGroup);
-        return UA_STATUSCODE_BADCONNECTIONREJECTED;
-    }
-    ctx.connectionConfig = &currentConnectionContext->config;
-    /* TODO: The callback is for readers, not writers. Currently unused. */
-    ctx.decodeAndProcessNetworkMessage =
-        (UA_StatusCode (*)(UA_Server *, void *, UA_ByteString *))
-            UA_decodeAndProcessNetworkMessage;
-    ctx.server = server;
-    ctx.logger = &server->config.logger;
-    res = tl->createWriterGroupPubSubChannel(&newWriterGroup->channel, tl, &writerGroupConfig->transportSettings, &ctx);
-    UA_CHECK_STATUS_ERROR(res, UA_free(newWriterGroup); return res, &server->config.logger, UA_LOGCATEGORY_PUBSUB,
-                          "PubSub Connection creation failed. WriterGroup specific PubSub channel failed");
 
     /* Attach to the connection */
     LIST_INSERT_HEAD(&currentConnectionContext->writerGroups, newWriterGroup, listEntry);
@@ -222,6 +193,12 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
 
     if(writerGroupIdentifier)
         UA_NodeId_copy(&newWriterGroup->identifier, writerGroupIdentifier);
+
+    /* Trigger the connection to open a connection */
+    UA_PubSubConnection_setPubSubState(server, currentConnectionContext,
+                                       currentConnectionContext->state,
+                                       UA_STATUSCODE_GOOD);
+
     return res;
 }
 
@@ -240,11 +217,6 @@ UA_StatusCode
 UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    if(wg->configurationFrozen) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
-                                 "Deleting %p", (void*)wg);
-    }
-
     if(wg->configurationFrozen) {
         UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
                                    "Deleting the WriterGroup failed. "
@@ -271,11 +243,6 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
         UA_DataSetWriter_remove(server, dsw);
     }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-    deleteNode(server, wg->identifier, true);
-#endif
-
-
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     if(wg->config.securityPolicy && wg->securityPolicyContext) {
         wg->config.securityPolicy->deleteContext(wg->securityPolicyContext);
@@ -290,16 +257,23 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
     }
 #endif
 
-    UA_WriterGroupConfig_clear(&wg->config);
-    UA_NodeId_clear(&wg->identifier);
-    UA_NetworkMessageOffsetBuffer_clear(&wg->bufferedMessage);
-    if(wg->channel) {
-        wg->channel->close(wg->channel);
-    }
+    if(!wg->deleteFlag)
+        UA_WriterGroup_disconnect(wg);
+    wg->deleteFlag = true;
 
-    LIST_REMOVE(wg, listEntry);
-    connection->writerGroupsSize--;
-    UA_free(wg);
+    if(wg->sendChannel == 0) {
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+        deleteNode(server, wg->identifier, true);
+#endif
+
+        LIST_REMOVE(wg, listEntry);
+        connection->writerGroupsSize--;
+
+        UA_WriterGroupConfig_clear(&wg->config);
+        UA_NodeId_clear(&wg->identifier);
+        UA_NetworkMessageOffsetBuffer_clear(&wg->bufferedMessage);
+        UA_free(wg);
+    }
     return UA_STATUSCODE_GOOD;
 }
 
@@ -762,14 +736,6 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                                                         UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
                     }
 
-                    UA_PubSubChannel *channel = writerGroup->channel;
-                    if(!channel) {
-                        UA_PubSubConnection *connection = writerGroup->linkedConnection;
-                        channel = connection->channel;
-                    }
-                    if(channel->closePublisher) {
-                        channel->closePublisher(channel);
-                    }
                     writerGroup->state = UA_PUBSUBSTATE_DISABLED;
                     break;
                 }
@@ -804,13 +770,12 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                         UA_DataSetWriter_setPubSubState(server, dataSetWriter,
                                                         UA_PUBSUBSTATE_OPERATIONAL, cause);
                     }
-                    UA_PubSubChannel *channel = writerGroup->channel;
-                    if(!channel) {
-                        UA_PubSubConnection *connection = writerGroup->linkedConnection;
-                        channel = connection->channel;
-                    }
-                    if(channel->openPublisher) {
-                        channel->openPublisher(channel);
+
+                    ret = UA_WriterGroup_connect(server, writerGroup);
+                    if(ret != UA_STATUSCODE_GOOD) {
+                        UA_WriterGroup_setPubSubState(server, writerGroup,
+                                                        UA_PUBSUBSTATE_ERROR, ret);
+                        break;
                     }
                     UA_WriterGroup_addPublishCallback(server, writerGroup);
                     break;
@@ -939,23 +904,19 @@ encodeNetworkMessage(UA_WriterGroup *wg, UA_NetworkMessage *nm,
 }
 
 static void
-sendNetworkMessageBuffer(UA_Server *server, UA_WriterGroup *wg,
-                         UA_PubSubConnection *connection, UA_ByteString *buffer) {
-    /* Choose the channel */
-    UA_PubSubChannel *channel = NULL;
+sendNetworkMessageBuffer(UA_Server *server, UA_WriterGroup *wg, 
+                         UA_PubSubConnection *connection, uintptr_t connectionId,
+                         UA_ByteString *buffer) {
+    UA_StatusCode res = connection->cm->
+        sendWithConnection(connection->cm, connectionId,
+                           &UA_KEYVALUEMAP_NULL, buffer);
 
-    if(wg->channel != NULL) {
-        channel = wg->channel;
-    } else {
-        channel = connection->channel;
-    }
-    UA_StatusCode res =
-        channel->send(channel, &wg->config.transportSettings, buffer);
     /* Failure, set the WriterGroup into an error mode */
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
                                  "Sending NetworkMessage failed");
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR, res);
+        UA_PubSubConnection_setPubSubState(server, connection, UA_PUBSUBSTATE_ERROR, res);
         return;
     }
 
@@ -983,33 +944,38 @@ sendNetworkMessageJson(UA_Server *server, UA_PubSubConnection *connection, UA_Wr
     /* Compute the message length */
     size_t msgSize = UA_NetworkMessage_calcSizeJson(&nm, NULL, 0, NULL, 0, true);
 
-    /* Allocate the buffer. Allocate on the stack if the buffer is small. */
-    UA_ByteString buf;
-    UA_Byte stackBuf[UA_MAX_STACKBUF];
-    buf.data = stackBuf;
-    buf.length = msgSize;
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    if(msgSize > UA_MAX_STACKBUF) {
-        res = UA_ByteString_allocBuffer(&buf, msgSize);
-        if(res != UA_STATUSCODE_GOOD)
-            return res;
+    UA_ConnectionManager *cm = connection->cm;
+    if(!cm)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Select the wg sendchannel if configured */
+    uintptr_t sendChannel = connection->sendChannel;
+    if(wg->sendChannel != 0)
+        sendChannel = wg->sendChannel;
+    if(sendChannel == 0) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Cannot send, no open connection");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Allocate the buffer */
+    UA_ByteString buf;
+    UA_StatusCode res = cm->allocNetworkBuffer(cm, sendChannel, &buf, msgSize);
+    UA_CHECK_STATUS(res, return res);
+
     /* Encode the message */
     UA_Byte *bufPos = buf.data;
     const UA_Byte *bufEnd = &buf.data[msgSize];
     res = UA_NetworkMessage_encodeJson(&nm, &bufPos, &bufEnd, NULL, 0, NULL, 0, true);
-    if(res != UA_STATUSCODE_GOOD)
-        goto cleanup;
+    if(res != UA_STATUSCODE_GOOD) {
+        cm->freeNetworkBuffer(cm, sendChannel, &buf);
+        return res;
+    }
     UA_assert(bufPos == bufEnd);
 
     /* Send the prepared messages */
-    sendNetworkMessageBuffer(server, wg, connection, &buf);
-
- cleanup:
-    if(msgSize > UA_MAX_STACKBUF)
-        UA_ByteString_clear(&buf);
-    return res;
+    sendNetworkMessageBuffer(server, wg, connection, sendChannel, &buf);
+    return UA_STATUSCODE_GOOD;
 }
 #endif
 
@@ -1137,32 +1103,38 @@ sendNetworkMessageBinary(UA_Server *server, UA_PubSubConnection *connection, UA_
     }
 #endif
 
-        /* Choose the channel */
-    UA_PubSubChannel *channel = NULL;
-    if(wg->channel != NULL) {
-        channel = wg->channel;
-    } else {
-        channel = connection->channel;
+    UA_ConnectionManager *cm = connection->cm;
+    if(!cm)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Select the wg sendchannel if configured */
+    uintptr_t sendChannel = connection->sendChannel;
+    if(wg->sendChannel != 0)
+        sendChannel = wg->sendChannel;
+    if(sendChannel == 0) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+                                 "Cannot send, no open connection");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Allocate the buffer. Allocate on the stack if the buffer is small. */
     UA_ByteString buf = UA_BYTESTRING_NULL;
-    rv = channel->allocNetworkBuffer(channel, &buf, msgSize);
-    UA_CHECK_STATUS(rv, goto cleanup);
+    rv = cm->allocNetworkBuffer(cm, sendChannel, &buf, msgSize);
+    UA_CHECK_STATUS(rv, return rv);
 
     /* Encode and encrypt the message */
     rv = encodeNetworkMessage(wg, &nm, &buf);
-    UA_CHECK_STATUS(rv, goto cleanup_with_msg_size);
+    if(rv != UA_STATUSCODE_GOOD) {
+        cm->freeNetworkBuffer(cm, sendChannel, &buf);
+        UA_free(nm.payload.dataSetPayload.sizes);
+        return rv;
+    }
 
     /* Send out the message */
-    sendNetworkMessageBuffer(server, wg, connection, &buf);
+    sendNetworkMessageBuffer(server, wg, connection, sendChannel, &buf);
 
-cleanup_with_msg_size:
-    rv = channel->freeNetworkBuffer(channel, &buf);
-    // if(msgSize > UA_MAX_STACKBUF)
-    //     UA_ByteString_clear(&buf);
-cleanup:
     UA_free(nm.payload.dataSetPayload.sizes);
-    return rv;
+    return UA_STATUSCODE_GOOD;
 }
 
 static void
@@ -1178,6 +1150,8 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
         return;
     }
 
+    UA_ByteString *buf = &writerGroup->bufferedMessage.buffer;
+
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     /* Send the encrypted buffered message if PubSub encryption is enabled */
     if(writerGroup->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
@@ -1201,15 +1175,34 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
             return;
         }
 
-        /* Send the encrypted buffered network message if PubSub encryption is
-         * enabled */
-        sendNetworkMessageBuffer(server, writerGroup, connection,
-                                 &writerGroup->bufferedMessage.encryptBuffer);
-    } else
+        buf = &writerGroup->bufferedMessage.encryptBuffer;
+    }
 #endif
-    {
-        sendNetworkMessageBuffer(server, writerGroup, connection, &writerGroup->bufferedMessage.buffer);
+
+    UA_ConnectionManager *cm = connection->cm;
+    if(!cm)
+        return;
+
+    /* Select the wg sendchannel if configured */
+    uintptr_t sendChannel = connection->sendChannel;
+    if(writerGroup->sendChannel != 0)
+        sendChannel = writerGroup->sendChannel;
+    if(sendChannel == 0) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, writerGroup,
+                                 "Cannot send, no open connection");
+        return;
+    }
+
+    /* Copy into the network buffer */
+    UA_ByteString outBuf;
+    res = cm->allocNetworkBuffer(cm, sendChannel, &outBuf, buf->length);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, writerGroup,
+                                 "PubSub message memory allocation failed");
+        return;
     }
+    memcpy(outBuf.data, buf->data, buf->length);
+    sendNetworkMessageBuffer(server, writerGroup, connection, sendChannel, &outBuf);
 }
 
 static void
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 341d46c9de7..a0a7eff4ec1 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -325,25 +325,6 @@ serverHouseKeeping(UA_Server *server, void *_) {
     UA_UNLOCK(&server->serviceMutex);
 }
 
-/* Some subsystems require regula polling of the network. This is a holdover
- * from before the EventLoop model.
- *
- * TODO: Refactor to use the EventLoop instead of polling. Get rid of this
- * entirely. */
-static void
-serverPolling(UA_Server *server, void *_) {
-    /* Listen on the pubsublayer, but only if the yield function is set. */
-#if defined(UA_ENABLE_PUBSUB_MQTT)
-    UA_PubSubConnection *connection;
-    TAILQ_FOREACH(connection, &server->pubSubManager.connections, listEntry){
-        UA_PubSubConnection *ps = connection;
-        if(ps && ps->channel && ps->channel->yield){
-            ps->channel->yield(ps->channel, 0);
-        }
-    }
-#endif
-}
-
 /********************/
 /* Server Lifecycle */
 /********************/
@@ -754,15 +735,6 @@ UA_Server_run_startup(UA_Server *server) {
                           &config->logger, UA_LOGCATEGORY_SERVER,
                           "Could not create the server housekeeping task");
 
-    /* Add a regular callback for network polling tasks. With a 200ms interval.
-     *
-     * TODO: Move this to the EventLoop model without polling.
-     */
-    if(server->pollingCallbackId == 0) {
-        addRepeatedCallback(server, serverPolling, NULL, 200.0,
-                            &server->pollingCallbackId);
-    }
-
     /* Ensure that the uri for ns1 is set up from the app description */
     setupNs1Uri(server);
 
@@ -866,11 +838,10 @@ UA_Server_run_shutdown(UA_Server *server) {
         server->houseKeepingCallbackId = 0;
     }
 
-    /* Stop the polling tasks */
-    if(server->pollingCallbackId != 0) {
-        removeCallback(server, server->pollingCallbackId);
-        server->pollingCallbackId = 0;
-    }
+    /* Stop PubSub */
+#ifdef UA_ENABLE_PUBSUB
+    UA_PubSubManager_shutdown(server, &server->pubSubManager);
+#endif
 
     /* Stop all ServerComponents */
     ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 6f5157062ba..9f0df349d68 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -128,9 +128,6 @@ struct UA_Server {
 
     UA_LifecycleState state;
     UA_UInt64 houseKeepingCallbackId;
-    UA_UInt64 pollingCallbackId; /* TODO: Move all subsystems that poll on the
-                                  * network to a true EventLoop
-                                  * implementation */
 
     UA_UInt64 serverComponentIds; /* Counter to assign ids from */
     UA_ServerComponentTree serverComponents;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dda4944be01..96220919c18 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -82,6 +82,10 @@ if(LINUX)
   list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
 endif()
 
+if(UA_ENABLE_MQTT)
+    list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
+endif()
+
 if(UA_ENABLE_HISTORIZING)
     set(test_plugin_sources ${test_plugin_sources}
         ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_history_data_backend_memory.c
@@ -134,17 +138,6 @@ if(UA_ENABLE_PUBSUB)
         # Add ethernet_config.h to ensure the tests are rebuild when it changes
         list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/tests/pubsub/ethernet_config.h)
     endif()
-
-    if(UA_ENABLE_PUBSUB_MQTT)
-      list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt_pal.h
-           ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h
-           ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_mqtt.h
-           ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.h
-           ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt.c
-           ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt_pal.c
-           ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_mqtt.c
-           ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.c)
-    endif()
 endif()
 
 if(UA_ENABLE_NODESETLOADER)
@@ -263,7 +256,6 @@ if(LINUX AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
 endif()
 
 if(UA_ENABLE_MQTT)
-    list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
     ua_add_test(check_eventloop_mqtt.c)
 endif()
 
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 02816af079a..ae3e5270cb6 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -78,6 +78,14 @@ set(fuzzing_plugin_sources
     ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_securitypolicy_none.c
 )
 
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    list(APPEND fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
+endif()
+
+if(UA_ENABLE_MQTT)
+    list(APPEND fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
+endif()
+
 if(UA_ENABLE_ENCRYPTION OR UA_ENABLE_ENCRYPTION STREQUAL "MBEDTLS" OR UA_ENABLE_ENCRYPTION STREQUAL "OPENSSL")
   list(APPEND fuzzing_plugin_sources
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index 428c1114a45..21ed9bd6ec8 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -10,8 +10,6 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include <open62541/plugin/pubsub_mqtt.h>
-
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -27,7 +25,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
     UA_Server_run_startup(server);
 }
 
@@ -45,7 +42,7 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     UA_StatusCode retVal =
         UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
@@ -66,7 +63,7 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     UA_NodeId connectionIdent;
     UA_StatusCode retVal =
         UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
@@ -143,7 +140,7 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     UA_PubSubConnectionConfig connectionConf;
     memset(&connectionConf, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConf.name = UA_STRING("MQTT Connection");
-    connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+    connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
@@ -176,7 +173,7 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     UA_PubSubConnectionConfig connectionConf;
     memset(&connectionConf, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConf.name = UA_STRING("MQTT Connection");
-    connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+    connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index e26cc62b401..560166e1abe 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -13,6 +13,7 @@
 
 #include "ua_pubsub.h"
 #include "ua_pubsub_networkmessage.h"
+#include "testing_clock.h"
 
 #include <check.h>
 #include <stdio.h>
@@ -87,56 +88,6 @@ static void teardown(void) {
     UA_Server_delete(server);
 }
 
-static UA_StatusCode
-recvTestFun(UA_PubSubChannel *channel, void *context, const UA_ByteString *buffer) {
-    UA_ReceiveContext *ctx = (UA_ReceiveContext*)context;
-    memcpy(ctx->buffer->data, buffer->data, buffer->length);
-    ctx->buffer->length = buffer->length;
-    return UA_STATUSCODE_GOOD;
-}
-
-static void receiveSingleMessageRT(UA_PubSubConnection *connection, UA_ReaderGroup *readerGroup) {
-    UA_ByteString buffer;
-    UA_DataSetReader *dataSetReader = LIST_FIRST(&readerGroup->readers);
-    if (UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("Message buffer allocation failed!");
-    }
-
-    if(!connection->channel) {
-        ck_abort_msg("No connection established");
-        return;
-    }
-
-    UA_ReceiveContext testCtx = {&buffer};
-    UA_StatusCode retval = connection->channel->receive(connection->channel, NULL, recvTestFun, &testCtx, 1000000);
-    if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
-        buffer.length = 512;
-        UA_ByteString_clear(&buffer);
-        ck_abort_msg("Expected message not received!");
-    }
-
-    /* Decode only the necessary offset and update the networkMessage */
-    if(UA_DataSetReader_decodeAndProcessRT(server, readerGroup, connection, &buffer) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("PubSub receive. Unknown field type!");
-    }
-
-    /* Check the decoded message is the expected one */
-    if((dataSetReader->bufferedMessage.nm->groupHeader.writerGroupId != dataSetReader->config.writerGroupId) ||
-       (*dataSetReader->bufferedMessage.nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != dataSetReader->config.dataSetWriterId)) {
-        ck_abort_msg("PubSub receive. Unknown message received. Will not be processed.");
-    }
-
-    /* Delete the payload value of every dsf's decoded */
-     UA_DataSetMessage *dsm = dataSetReader->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages;
-     if(dsm->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
-         for(UA_UInt16 i = 0; i < dsm->data.keyFrameData.fieldCount; i++) {
-             UA_Variant_clear(&dsm->data.keyFrameData.dataSetFields[i].value);
-         }
-     }
-
-    UA_ByteString_clear(&buffer);
-}
-
 /* If the external data source is written over the information model, the
  * externalDataWriteCallback will be triggered. The user has to take care and assure
  * that the write leads not to synchronization issues and race conditions. */
@@ -497,17 +448,24 @@ START_TEST(PublishAndSubscribeSingleFieldWithFixedOffsets) {
 
     ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, readerGroupIdentifier));
+
+    while(true) {
+        UA_fakeSleep(50);
+        UA_Server_run_iterate(server, false);
+
+        /* Read data received by the Subscriber */
+        UA_Variant *subscribedNodeData = UA_Variant_new();
+        retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 50002), subscribedNodeData);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+        UA_Boolean eq = ((*(UA_Int32 *)subscribedNodeData->data) == 1000);
+        UA_Variant_clear(subscribedNodeData);
+        UA_free(subscribedNodeData);
+        if(eq)
+            break;
+    }
 
-    UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
-    receiveSingleMessageRT(connection, readerGroup);
-   /* Read data received by the Subscriber */
-    UA_Variant *subscribedNodeData = UA_Variant_new();
-    retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 50002), subscribedNodeData);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-
-    ck_assert((*(UA_UInt32 *)subscribedNodeData->data) == 1000);
-    UA_Variant_clear(subscribedNodeData);
-    UA_free(subscribedNodeData);
     ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
     UA_DataValue_delete(dataValue);
     UA_free(subValue);
@@ -774,17 +732,24 @@ START_TEST(PublishPDSWithMultipleFieldsAndSubscribeFixedSize) {
 
     ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, readerGroupIdentifier));
+
+    while(true) {
+        UA_fakeSleep(50);
+        UA_Server_run_iterate(server, false);
+
+        /* Read data received by the Subscriber */
+        UA_Variant *subscribedNodeData = UA_Variant_new();
+        retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 60003), subscribedNodeData);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        
+        UA_Boolean eq = ((*(UA_Int32 *)subscribedNodeData->data) == 1000);
+        UA_Variant_clear(subscribedNodeData);
+        UA_free(subscribedNodeData);
+        if(eq)
+            break;
+    }
 
-    UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
-    receiveSingleMessageRT(connection, readerGroup);
-   /* Read data received by the Subscriber */
-    UA_Variant *subscribedNodeData = UA_Variant_new();
-    retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 60003), subscribedNodeData);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-
-    ck_assert((*(UA_UInt32 *)subscribedNodeData->data) == 1000);
-    UA_Variant_clear(subscribedNodeData);
-    UA_free(subscribedNodeData);
    /* Read data received by the Subscriber */
     UA_Variant *subscribedNodeData1 = UA_Variant_new();
     retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 60004), subscribedNodeData1);
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 69034e68e1c..9d8e82d9e01 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -58,9 +58,6 @@ static void AddConnection(
     connectionConfig.publisherId.uint32 = PublisherId;
 
     ck_assert(UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId) == UA_STATUSCODE_GOOD);
-    UA_LOCK(&server->serviceMutex);
-    ck_assert(UA_PubSubConnection_regist(server, opConnectionId, NULL) == UA_STATUSCODE_GOOD);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 /***************************************************************************************************/
@@ -307,7 +304,7 @@ START_TEST(Test_normal_operation) {
 
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_ReaderGroup_getState(server, RGId_Conn1_RG1, &state));
-    ck_assert_int_eq(UA_PUBSUBSTATE_OPERATIONAL, state);
+    ck_assert_int_eq(UA_PUBSUBSTATE_PREOPERATIONAL, state);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state));
     ck_assert_int_eq(UA_PUBSUBSTATE_OPERATIONAL, state);
 
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 98e0ed59b44..6c4ef784438 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -24,7 +24,7 @@ THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {
     while(running) {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
     }
     return 0;
 }
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index 64bab2ff879..73f9a5b46e6 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -8,8 +8,6 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include <open62541/plugin/pubsub_mqtt.h>
-
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -37,7 +35,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerMQTT());
     retVal |= UA_Server_run_startup(server);
 
     //add connection
@@ -45,7 +42,7 @@ static void setup(void) {
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("Mqtt Connection");
     connectionConfig.transportProfileUri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     connectionConfig.enabled = UA_TRUE;
 
 
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index 386cfd5be47..a3d5fae24a4 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -11,6 +11,7 @@
 
 #include "ua_pubsub.h"
 #include "ua_pubsub_networkmessage.h"
+#include "testing_clock.h"
 
 #include <check.h>
 #include <stdio.h>
@@ -63,80 +64,6 @@ static void teardown(void) {
     UA_Server_delete(server);
 }
 
-typedef struct {
-    UA_ByteString *buffer;
-    size_t offset;
-} UA_ReceiveContext;
-
-static UA_StatusCode
-recvTestFun(UA_PubSubChannel *channel, void *context, const UA_ByteString *buffer) {
-    UA_ReceiveContext *ctx = (UA_ReceiveContext*)context;
-    memcpy(ctx->buffer->data + ctx->offset, buffer->data, buffer->length);
-    ctx->offset += buffer->length;
-    ctx->buffer->length = ctx->offset;
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-receiveMultipleMessageRT(UA_PubSubConnection *connection, UA_DataSetReader *dataSetReader) {
-    UA_ByteString buffer;
-    if (UA_ByteString_allocBuffer(&buffer, 4096) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("Message buffer allocation failed!");
-    }
-
-    UA_ReceiveContext testCtx = {&buffer, 0};
-    connection->channel->receive(connection->channel, NULL, recvTestFun, &testCtx, 1000000);
-    if(buffer.length > 0) {
-        UA_UInt16  rcvCount    = 0;
-        UA_ReaderGroup *rg =
-            UA_ReaderGroup_findRGbyId(server, dataSetReader->linkedReaderGroup);
-        
-        /* Decode only the necessary offset and update the networkMessage */
-        if(UA_DataSetReader_decodeAndProcessRT(server, rg, connection, &buffer) != UA_STATUSCODE_GOOD) {
-            ck_abort_msg("PubSub receive. Unknown field type!");
-        }
-        
-        /* Check the decoded message is the expected one */
-        if((dataSetReader->bufferedMessage.nm->groupHeader.writerGroupId != dataSetReader->config.writerGroupId) ||
-           (*dataSetReader->bufferedMessage.nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != dataSetReader->config.dataSetWriterId)) {
-            ck_abort_msg("PubSub receive. Unknown message received. Will not be processed.");
-        }
-        
-        UA_ByteString_clear(&buffer);
-    }
-}
-
-static void receiveSingleMessage(UA_PubSubConnection *connection) {
-    UA_ByteString buffer;
-    if (UA_ByteString_allocBuffer(&buffer, 4096) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("Message buffer allocation failed!");
-    }
-
-    UA_ReceiveContext testCtx = {&buffer, 0};
-    UA_StatusCode retval =
-        connection->channel->receive(connection->channel, NULL, recvTestFun,
-                                     &testCtx, 1000000);
-    if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
-        buffer.length = 4096;
-        UA_ByteString_clear(&buffer);
-        ck_abort_msg("Expected message not received!");
-    }
-
-    size_t currentPosition = 0;
-    UA_UInt16 rcvCount    = 0;
-    do {
-        UA_NetworkMessage currentNetworkMessage;
-        memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
-        UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, &currentNetworkMessage, NULL);
-        ck_assert((*((UA_UInt32 *)currentNetworkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
-        UA_NetworkMessage_clear(&currentNetworkMessage);
-        rcvCount++;
-    } while((buffer.length) > currentPosition);
-
-    ck_assert_int_eq(rcvCount, 2);
-    UA_ByteString_clear(&buffer);
-}
-
 /* If the external data source is written over the information model, the
  * externalDataWriteCallback will be triggered. The user has to take care and assure
  * that the write leads not to synchronization issues and race conditions. */
@@ -342,19 +269,23 @@ START_TEST(SubscribeMultipleMessagesRT) {
 
     ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, readerGroupIdentifier));
 
-    UA_DataSetReader *dataSetReader = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
-    receiveMultipleMessageRT(connection, dataSetReader);
+    while(true) {
+        UA_fakeSleep(50);
+        UA_Server_run_iterate(server, false);
 
-    /* Read data received by the Subscriber */
-    UA_Variant *subscribedNodeData = UA_Variant_new();
-    retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 50002), subscribedNodeData);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        /* Read data received by the Subscriber */
+        UA_Variant *subscribedNodeData = UA_Variant_new();
+        retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 50002), subscribedNodeData);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-    ck_assert((*(UA_Int32 *)subscribedNodeData->data) == 1000);
+        UA_Boolean eq = ((*(UA_Int32 *)subscribedNodeData->data) == 1000);
+        UA_Variant_delete(subscribedNodeData);
+        if(eq)
+            break;
+    }
 
-    UA_Variant_clear(subscribedNodeData);
-    UA_free(subscribedNodeData);
     ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_unfreezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_unfreezeWriterGroupConfiguration(server, writerGroupIdent1) == UA_STATUSCODE_GOOD);
@@ -527,7 +458,7 @@ START_TEST(SubscribeMultipleMessagesWithoutRT) {
     ck_assert(UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent1) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent1) == UA_STATUSCODE_GOOD);
-    receiveSingleMessage(connection);
+    UA_Server_run_iterate(server, false);
     ck_assert(UA_Server_unfreezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_unfreezeWriterGroupConfiguration(server, writerGroupIdent1) == UA_STATUSCODE_GOOD);
     UA_DataValue_delete(dataValue);
diff --git a/tests/pubsub/check_pubsub_publish_ethernet.c b/tests/pubsub/check_pubsub_publish_ethernet.c
index a7498272483..45f1399a5cc 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet.c
@@ -68,13 +68,9 @@ START_TEST(EthernetSendWithoutVLANTag) {
         return;
     }
 
-    /* Initialize a buffer to send data */
-    testBuffer = UA_STRING(BUFFER_STRING);
-    /* Validate the Ethernet send API */
-    retVal = connection->channel->send(connection->channel, NULL, &testBuffer);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_Server_run_iterate(server, false);
 
-    } END_TEST
+} END_TEST
 
 START_TEST(EthernetSendWithVLANTag) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -97,14 +93,8 @@ START_TEST(EthernetSendWithVLANTag) {
         return;
     }
 
-    /* Initialize a buffer to send data */
-    testBuffer = UA_STRING(BUFFER_STRING);
-    /* Validate the Ethernet send API */
-    retVal = connection->channel->send(connection->channel, NULL, &testBuffer);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-
-    } END_TEST
-
+    UA_Server_run_iterate(server, false);
+} END_TEST
 
 int main(void) {
     /*Test case to run both publisher*/
diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index 2e69b6d865a..2db15ed5fc2 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -103,10 +103,7 @@ START_TEST(EthernetSendWithoutVLANTag) {
     ethernettransportSettings.transmission_time = transmission_time;
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 
-    /* Initialize a buffer to send data */
-    UA_ByteString testBuffer = UA_STRING(BUFFER_STRING);
-    retVal = connection->channel->send(connection->channel, &transportSettings, &testBuffer);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_Server_run_iterate(server, false);
 } END_TEST
 
 START_TEST(EthernetSendWithVLANTag) {
@@ -154,10 +151,7 @@ START_TEST(EthernetSendWithVLANTag) {
     ethernettransportSettings.transmission_time = transmission_time;
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 
-    /* Initialize a buffer to send data */
-    UA_ByteString testBuffer = UA_STRING(BUFFER_STRING);
-    retVal = connection->channel->send(connection->channel, &transportSettings, &testBuffer);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_Server_run_iterate(server, false);
 } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index 6e43c80ed66..a0cd4012193 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -102,55 +102,8 @@ static void teardown(void) {
     }
 }
 
-typedef struct {
-    UA_ByteString *buffer;
-    size_t offset;
-} UA_ReceiveContext;
-
-static UA_StatusCode
-recvTestFun(UA_PubSubChannel *channel, void *context,
-               const UA_ByteString *buffer) {
-    UA_ReceiveContext *ctx = (UA_ReceiveContext*)context;
-    memcpy(ctx->buffer->data + ctx->offset, buffer->data, buffer->length);
-    ctx->offset += buffer->length;
-    ctx->buffer->length = ctx->offset;
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-receiveSingleMessage(UA_ByteString buffer, UA_PubSubConnection *connection,
-                     UA_NetworkMessage *networkMessage) {
-    if(UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("Message buffer allocation failed!");
-        return;
-    }
-
-    if(!connection->channel) {
-        ck_abort_msg("No connection established");
-        return;
-    }
-
-    UA_ReceiveContext testCtx = {&buffer, 0};
-    UA_StatusCode retval =
-        connection->channel->receive(connection->channel, NULL,
-                                     recvTestFun, &testCtx, 1000000);
-    if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
-        buffer.length = 512;
-        UA_ByteString_clear(&buffer);
-        ck_abort_msg("Expected message not received!");
-    }
-    memset(networkMessage, 0, sizeof(UA_NetworkMessage));
-    size_t currentPosition = 0;
-    UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, networkMessage, NULL);
-    UA_ByteString_clear(&buffer);
-}
-
 START_TEST(PublishSingleFieldWithStaticValueSource) {
         ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
-        ck_assert(connection);
-        UA_StatusCode rv = connection->channel->regist(connection->channel, NULL, NULL);
-        ck_assert(rv == UA_STATUSCODE_GOOD);
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
         writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -188,20 +141,13 @@ START_TEST(PublishSingleFieldWithStaticValueSource) {
 
         ck_assert(UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
         ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-        UA_ByteString buffer;
-        UA_ByteString_init(&buffer);
-        UA_NetworkMessage networkMessage;
-        receiveSingleMessage(buffer, connection, &networkMessage);
-        ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
-        UA_NetworkMessage_clear(&networkMessage);
+
+        UA_Server_run_iterate(server, false);
 } END_TEST
 
 START_TEST(PublishSingleFieldWithDifferentBinarySizes) {
         ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
-        ck_assert(connection);
-        UA_StatusCode rv = connection->channel->regist(connection->channel, NULL, NULL);
-        ck_assert(rv == UA_STATUSCODE_GOOD);
+
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
         writerGroupConfig.name = UA_STRING("Test WriterGroup");
@@ -216,7 +162,9 @@ START_TEST(PublishSingleFieldWithDifferentBinarySizes) {
         writerGroupConfig.messageSettings.content.decoded.type =
             &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
         writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
-        ck_assert(UA_Server_addWriterGroup(server, connectionIdentifier, &writerGroupConfig, &writerGroupIdent) == UA_STATUSCODE_GOOD);
+        UA_StatusCode res = UA_Server_addWriterGroup(server, connectionIdentifier,
+                                                     &writerGroupConfig, &writerGroupIdent);
+        ck_assert(res == UA_STATUSCODE_GOOD);
         UA_UadpWriterGroupMessageDataType_delete(wgm);
         UA_DataSetWriterConfig dataSetWriterConfig;
         memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
@@ -225,7 +173,7 @@ START_TEST(PublishSingleFieldWithDifferentBinarySizes) {
         UA_DataSetFieldConfig dsfConfig;
         memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
         /* Create Variant and configure as DataSetField source */
-        UA_String stringValue = UA_STRING_ALLOC("12345");
+        UA_String stringValue = UA_STRING("12345");
         staticSource1 = UA_DataValue_new();
         UA_Variant_setScalar(&staticSource1->value, &stringValue, &UA_TYPES[UA_TYPES_STRING]);
         staticSource1->value.storageType = UA_VARIANT_DATA_NODELETE;
@@ -236,34 +184,12 @@ START_TEST(PublishSingleFieldWithDifferentBinarySizes) {
         ck_assert(UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent) == UA_STATUSCODE_GOOD);
         ck_assert(UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
         ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-        UA_ByteString buffer;
-        UA_ByteString_init(&buffer);
-        UA_NetworkMessage networkMessage;
-        memset(&networkMessage, 0, sizeof(networkMessage));
-        receiveSingleMessage(buffer, connection, &networkMessage);
-        UA_String compareString = UA_STRING("12345");
-        ck_assert(UA_String_equal(((UA_String *) networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data), &compareString) == UA_TRUE);
-        UA_NetworkMessage_clear(&networkMessage);
-        compareString = UA_STRING("123456789");
-        stringValue.data = (UA_Byte *) UA_realloc(stringValue.data, 9);
-        stringValue.length = 9;
-        memcpy(stringValue.data, "123456789", 9);
-        UA_ByteString_init(&buffer);
-        memset(&networkMessage, 0, sizeof(networkMessage));
-        ck_assert(UA_Server_setWriterGroupDisabled(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-        ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-        receiveSingleMessage(buffer, connection, &networkMessage);
-        ck_assert(UA_String_equal(((UA_String *) networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data), &compareString) == UA_TRUE);
-        UA_NetworkMessage_clear(&networkMessage);
-        UA_String_clear(&stringValue);
+
+        UA_Server_run_iterate(server, false);
     } END_TEST
 
 START_TEST(SetupInvalidPubSubConfigWithStaticValueSource) {
         ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
-        ck_assert(connection);
-        UA_StatusCode rv = connection->channel->regist(connection->channel, NULL, NULL);
-        ck_assert(rv == UA_STATUSCODE_GOOD);
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
         writerGroupConfig.name = UA_STRING("Test WriterGroup");
@@ -300,10 +226,6 @@ START_TEST(SetupInvalidPubSubConfigWithStaticValueSource) {
 
 START_TEST(PublishSingleFieldWithFixedOffsets) {
         ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
-        ck_assert(connection);
-        UA_StatusCode rv = connection->channel->regist(connection->channel, NULL, NULL);
-        ck_assert(rv == UA_STATUSCODE_GOOD);
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
         writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -340,20 +262,12 @@ START_TEST(PublishSingleFieldWithFixedOffsets) {
 
         ck_assert(UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
         ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-        UA_ByteString buffer;
-        UA_ByteString_init(&buffer);
-        UA_NetworkMessage networkMessage;
-        receiveSingleMessage(buffer, connection, &networkMessage);
-        ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
-        UA_NetworkMessage_clear(&networkMessage);
-    } END_TEST
+
+        UA_Server_run_iterate(server, false);
+} END_TEST
 
 START_TEST(PublishPDSWithMultipleFieldsAndFixedOffset) {
         ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
-        ck_assert(connection);
-        UA_StatusCode rv = connection->channel->regist(connection->channel, NULL, NULL);
-        ck_assert(rv == UA_STATUSCODE_GOOD);
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
         writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -398,31 +312,11 @@ START_TEST(PublishPDSWithMultipleFieldsAndFixedOffset) {
         ck_assert(UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
         ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
 
-        UA_ByteString buffer;
-        UA_ByteString_init(&buffer);
-        UA_NetworkMessage networkMessage;
-        receiveSingleMessage(buffer, connection, &networkMessage);
-        ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
-        ck_assert(*((UA_UInt32 *) networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields[1].value.data) == 2000);
-        UA_NetworkMessage_clear(&networkMessage);
-        *intValue = (UA_UInt32) 1001;
-        *intValue2 = (UA_UInt32) 2001;
-        UA_ByteString_init(&buffer);
-        memset(&networkMessage, 0, sizeof(networkMessage));
-        ck_assert(UA_Server_setWriterGroupDisabled(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-        ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-        receiveSingleMessage(buffer, connection, &networkMessage);
-        ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1001);
-        ck_assert(*((UA_UInt32 *) networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields[1].value.data) == 2001);
-        UA_NetworkMessage_clear(&networkMessage);
+        UA_Server_run_iterate(server, false);
 } END_TEST
 
 START_TEST(PublishSingleFieldInCustomCallback) {
         ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
-        ck_assert(connection);
-        UA_StatusCode rv = connection->channel->regist(connection->channel, NULL, NULL);
-        ck_assert(rv == UA_STATUSCODE_GOOD);
         UA_WriterGroupConfig writerGroupConfig;
         memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
         writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -459,12 +353,8 @@ START_TEST(PublishSingleFieldInCustomCallback) {
 
         ck_assert(UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
         ck_assert(UA_Server_setWriterGroupOperational(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-        UA_ByteString buffer;
-        UA_ByteString_init(&buffer);
-        UA_NetworkMessage networkMessage;
-        receiveSingleMessage(buffer, connection, &networkMessage);
-        ck_assert((*((UA_UInt32 *)networkMessage.payload.dataSetPayload.dataSetMessages->data.keyFrameData.dataSetFields->value.data)) == 1000);
-        UA_NetworkMessage_clear(&networkMessage);
+
+        UA_Server_run_iterate(server, false);
 } END_TEST
 
 static UA_StatusCode
diff --git a/tests/pubsub/check_pubsub_publish_uadp.c b/tests/pubsub/check_pubsub_publish_uadp.c
index 296b381fd6a..0976aac8d6b 100644
--- a/tests/pubsub/check_pubsub_publish_uadp.c
+++ b/tests/pubsub/check_pubsub_publish_uadp.c
@@ -91,52 +91,6 @@ recvTestFun(UA_PubSubChannel *channel, void *context, const UA_ByteString *buffe
 
     return UA_STATUSCODE_GOOD;
 }
-// static void receiveSingleMessage(UA_ByteString buffer, UA_PubSubConnection *connection, UA_NetworkMessage *networkMessage) {
-//     if (UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
-//         ck_abort_msg("Message buffer allocation failed!");
-//     }
-//     UA_ClosureContext testCtx = {0, networkMessage};
-//
-//     UA_DecodeAndProcessClosure closure;
-//     closure.ctx = &testCtx;
-//     closure.call = closureTestFun;
-//
-//     UA_StatusCode retval =
-//         connection->channel->receive(connection->channel, &closure, NULL, 10000);
-//     if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
-//         buffer.length = 512;
-//         UA_ByteString_clear(&buffer);
-//         ck_abort_msg("Expected message not received!");
-//     }
-//     memset(networkMessage, 0, sizeof(UA_NetworkMessage));
-//     size_t currentPosition = 0;
-//     UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, networkMessage);
-//     for(int i = 0; i < networkMessage->payloadHeader.dataSetPayloadHeader.count; ++i) {
-//         UA_Byte * rawContent = (UA_Byte *) UA_malloc(networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.length);
-//         memcpy(rawContent,
-//                networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data,
-//                networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.length);
-//         networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data = rawContent;
-//     }
-//     UA_ByteString_clear(&buffer);
-// }
-
-static void receiveAvailableMessages(UA_ByteString buffer, UA_PubSubConnection *connection, UA_NetworkMessage *networkMessage) {
-    if (UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("Message buffer allocation failed!");
-    }
-
-    UA_ReceiveContext testCtx = {0, networkMessage};
-    UA_StatusCode retval =
-        connection->channel->receive(connection->channel, NULL, recvTestFun,
-                                     &testCtx, 80000);
-    if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
-        buffer.length = 512;
-        UA_ByteString_clear(&buffer);
-        ck_abort_msg("Expected message not received!");
-    }
-    UA_ByteString_clear(&buffer);
-}
 
 START_TEST(CheckNMandDSMcalculation){
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -173,75 +127,36 @@ START_TEST(CheckNMandDSMcalculation){
                                    &dataSetWriterConfig, &dataSetWriterIdent);
     }
 
-    UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connection1);
-    ck_assert(connection);
-    UA_StatusCode rv = connection->channel->regist(connection->channel, NULL, NULL);
-    ck_assert(rv == UA_STATUSCODE_GOOD);
-
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 100000;
     retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
 
-    UA_ByteString buffer = UA_BYTESTRING("");
-    UA_NetworkMessage networkMessage;
-    receiveAvailableMessages(buffer, connection, &networkMessage);
-    //ck_assert_int_eq(networkMessage.publisherId.uint32 , 62541);
-    ck_assert_int_eq(networkMessage.payloadHeader.dataSetPayloadHeader.count, 10);
-    for(size_t i = 10; i > 0; i--){
-        ck_assert_uint_eq(*(networkMessage.payloadHeader.dataSetPayloadHeader.dataSetWriterIds+(i-1)), 21-i);
-    }
-    for(int i = 0; i < networkMessage.payloadHeader.dataSetPayloadHeader.count; ++i) {
-        UA_Byte_delete(networkMessage.payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-    }
-    UA_NetworkMessage_clear(&networkMessage);
+    UA_Server_run_iterate(server, false);
 
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 200000;
     //maximum DSM in one NM = 5
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 5;
     retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-    // UA_NetworkMessage networkMessage1, networkMessage2;
-    UA_NetworkMessage networkMessages[2];
-    receiveAvailableMessages(buffer, connection, networkMessages);
-    ck_assert_uint_eq(networkMessages[0].payloadHeader.dataSetPayloadHeader.count, 5);
-    ck_assert_uint_eq(networkMessages[1].payloadHeader.dataSetPayloadHeader.count, 5);
-    for(int i = 0; i < networkMessages[0].payloadHeader.dataSetPayloadHeader.count; ++i) {
-        UA_Byte_delete(networkMessages[0].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-    }
-    UA_NetworkMessage_clear(&networkMessages[0]);
-    for(int i = 0; i < networkMessages[1].payloadHeader.dataSetPayloadHeader.count; ++i) {
-        UA_Byte_delete(networkMessages[1].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-    }
-    UA_NetworkMessage_clear(&networkMessages[1]);
+
+
+    UA_Server_run_iterate(server, false);
 
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 300000;
     //maximum DSM in one NM = 20
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 20;
     retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-    UA_NetworkMessage networkMessage3;
-    receiveAvailableMessages(buffer, connection, &networkMessage3);
-    ck_assert_uint_eq(networkMessage3.payloadHeader.dataSetPayloadHeader.count, 10);
 
-    for(int i = 0; i < networkMessage3.payloadHeader.dataSetPayloadHeader.count; ++i) {
-        UA_Byte_delete(networkMessage3.payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-    }
-    UA_NetworkMessage_clear(&networkMessage3);
+    UA_Server_run_iterate(server, false);
 
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 400000;
     //maximum DSM in one NM = 1
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 1;
     retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-    UA_NetworkMessage messageArray[10];
-    receiveAvailableMessages(buffer, connection, messageArray);
-    for (int j = 0; j < 10; ++j) {
-        ck_assert_uint_eq(messageArray[j].payloadHeader.dataSetPayloadHeader.count, 1);
-        for(int i = 0; i < messageArray[j].payloadHeader.dataSetPayloadHeader.count; ++i) {
-            UA_Byte_delete(messageArray[j].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-        }
-        UA_NetworkMessage_clear(&messageArray[j]);
-    }
+
+    UA_Server_run_iterate(server, false);
 
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 500000;
@@ -250,16 +165,10 @@ START_TEST(CheckNMandDSMcalculation){
     retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
     retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
 
-    receiveAvailableMessages(buffer, connection, messageArray);
-    for (int j = 0; j < 10; ++j) {
-        ck_assert_uint_eq(messageArray[j].payloadHeader.dataSetPayloadHeader.count, 1);
-        for(int i = 0; i < messageArray[j].payloadHeader.dataSetPayloadHeader.count; ++i) {
-            UA_Byte_delete(messageArray[j].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-        }
-        UA_NetworkMessage_clear(&messageArray[j]);
-    }
+    UA_Server_run_iterate(server, false);
+
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    } END_TEST
+} END_TEST
 
 START_TEST(CheckNMandDSMBufferCalculation){
         UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -341,72 +250,20 @@ START_TEST(CheckSingleDSMRawEncodedMessage){
                                    &dataSetWriterConfig, &dataSetWriterIdent);
     }
 
-    UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connection1);
-    ck_assert(connection);
-    UA_StatusCode rv = connection->channel->regist(connection->channel, NULL, NULL);
-    ck_assert(rv == UA_STATUSCODE_GOOD);
-
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 100000;
     retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
 
-    UA_ByteString buffer = UA_BYTESTRING("");
-    UA_NetworkMessage networkMessage;
-    receiveAvailableMessages(buffer, connection, &networkMessage);
-    //ck_assert_int_eq(networkMessage.publisherId.uint32 , 62541);
-    ck_assert_int_eq(networkMessage.payloadHeader.dataSetPayloadHeader.count, 10);
-    for(size_t i = 10; i > 0; i--){
-        ck_assert_uint_eq(*(networkMessage.payloadHeader.dataSetPayloadHeader.dataSetWriterIds+(i-1)), 21-i);
-    }
-    for(int i = 0; i < networkMessage.payloadHeader.dataSetPayloadHeader.count; ++i) {
-        UA_Byte_delete(networkMessage.payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-    }
-    UA_NetworkMessage_clear(&networkMessage);
+    UA_Server_run_iterate(server, false);
 
     //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
     writerGroupConfig.publishingInterval = 200000;
     //maximum DSM in one NM = 5
     writerGroupConfig.maxEncapsulatedDataSetMessageCount = 5;
     retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-    UA_NetworkMessage networkMessages[2];
-    receiveAvailableMessages(buffer, connection, networkMessages);
-    ck_assert_int_eq(networkMessages[0].payloadHeader.dataSetPayloadHeader.count, 5);
-    ck_assert_int_eq(networkMessages[0].payloadHeader.dataSetPayloadHeader.count, 5);
-    ck_assert(networkMessages[0].payload.dataSetPayload.dataSetMessages->header.fieldEncoding == UA_FIELDENCODING_RAWDATA);
-    ck_assert(networkMessages[1].payload.dataSetPayload.dataSetMessages->header.fieldEncoding == UA_FIELDENCODING_RAWDATA);
-    ck_assert(networkMessages[0].payload.dataSetPayload.dataSetMessages->data.keyFrameData.rawFields.data != NULL);
-    ck_assert(networkMessages[1].payload.dataSetPayload.dataSetMessages->data.keyFrameData.rawFields.data != NULL);
-
-    size_t offset  = 0;
-    UA_DateTime dateTime;
-    dateTime = 0;
-    ck_assert(UA_DateTime_decodeBinary(&networkMessages[0].payload.dataSetPayload.dataSetMessages->data.keyFrameData.rawFields, &offset, &dateTime) ==
-              UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(UA_DateTime_now(), dateTime);
-    offset  = 0;
-    dateTime = 0;
-    ck_assert(UA_DateTime_decodeBinary(&networkMessages[1].payload.dataSetPayload.dataSetMessages->data.keyFrameData.rawFields, &offset, &dateTime) ==
-              UA_STATUSCODE_GOOD);
-    //TODO check if the length can be set right using the metadata
-    //ck_assert_uint_eq(UA_DateTime_calcSizeBinary(&dateTime),
-    //                  networkMessages[1].payload.dataSetPayload.dataSetMessages->data.keyFrameData.rawFields.length);
-    ck_assert_int_eq(UA_DateTime_now(), dateTime);
-    //Decode raw message of second DSM included in the NM
-    offset  = 0;
-    dateTime = 0;
-    ck_assert(UA_DateTime_decodeBinary(&networkMessages[1].payload.dataSetPayload.dataSetMessages[1].data.keyFrameData.rawFields, &offset, &dateTime) ==
-          UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(UA_DateTime_now(), dateTime);
-
-    /* add a second field to the dataset writer */
-    for(int i = 0; i < networkMessages[0].payloadHeader.dataSetPayloadHeader.count; ++i) {
-        UA_Byte_delete(networkMessages[0].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-    }
-    for(int i = 0; i < networkMessages[1].payloadHeader.dataSetPayloadHeader.count; ++i) {
-        UA_Byte_delete(networkMessages[1].payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data);
-    }
-    UA_NetworkMessage_clear(&networkMessages[0]);
-    UA_NetworkMessage_clear(&networkMessages[1]);
+
+    UA_Server_run_iterate(server, false);
+
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 5d60cba0081..046fb4c7dee 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -69,9 +69,6 @@ static void AddConnection(
     /* deep copy is not needed (not even for string) because UA_Server_addPubSubConnection performs deep copy */
     connectionConfig.publisherId = publisherId;
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId));
-    UA_LOCK(&server->serviceMutex);
-    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_PubSubConnection_regist(server, opConnectionId, NULL));
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 /***************************************************************************************************/
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 4dcaa935729..23bf49b8ef4 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -90,75 +90,6 @@ static void addVariables(void) {
     ck_assert_int_eq(res, UA_STATUSCODE_GOOD);
 }
 
-typedef struct {
-    UA_ByteString *buffer;
-    size_t offset;
-} UA_ReceiveContext;
-
-static UA_StatusCode
-recvTestFun(UA_PubSubChannel *channel, void *context,
-               const UA_ByteString *buffer) {
-    UA_ReceiveContext *ctx = (UA_ReceiveContext*)context;
-    memcpy(ctx->buffer->data + ctx->offset, buffer->data, buffer->length);
-    ctx->offset += buffer->length;
-    ctx->buffer->length = ctx->offset;
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-receiveInvalidMessage(UA_ByteString buffer, UA_PubSubConnection *connection) {
-    if(UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("Message buffer allocation failed!");
-        return;
-    }
-
-    if(!connection->channel) {
-        ck_abort_msg("No connection established");
-        return;
-    }
-
-    UA_ReceiveContext testCtx = {&buffer, 0};
-    UA_StatusCode retval =
-        connection->channel->receive(connection->channel, NULL,
-                                     recvTestFun, &testCtx, 1000000);
-
-    /* an invalid message is not sent. We reach a non critical timeout */
-    ck_assert(retval == UA_STATUSCODE_GOODNONCRITICALTIMEOUT);
-    buffer.length = 512;
-    UA_ByteString_clear(&buffer);
-}
-
-static void
-receiveSingleMessage(UA_ByteString buffer, UA_PubSubConnection *connection,
-                     UA_NetworkMessage *networkMessage) {
-    if(UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("Message buffer allocation failed!");
-        return;
-    }
-
-    if(!connection->channel) {
-        ck_abort_msg("No connection established");
-        return;
-    }
-
-    UA_ReceiveContext testCtx = {&buffer, 0};
-    UA_StatusCode retval =
-        connection->channel->receive(connection->channel, NULL,
-                                     recvTestFun, &testCtx, 1000000);
-    if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
-        buffer.length = 512;
-        UA_ByteString_clear(&buffer);
-        ck_abort_msg("Expected message not received!");
-    }
-    memset(networkMessage, 0, sizeof(UA_NetworkMessage));
-    size_t currentPosition = 0;
-
-    /* check if the buffer has the length of the configured size*/
-    ck_assert(buffer.length == VALID_DATASETMESSAGE_SIZE);
-    UA_NetworkMessage_decodeBinary(&buffer, &currentPosition, networkMessage, NULL);
-    UA_ByteString_clear(&buffer);
-}
-
 /* setup() is to create an environment for test cases */
 static void setup(void) {
     /*Add setup by creating new server with valid configuration */
@@ -196,28 +127,30 @@ static void teardown(void) {
 }
 
 static void checkReceived(void) {
-    /* Read data sent by the Publisher */
-    UA_ReadValueId rvi;
-    UA_ReadValueId_init(&rvi);
-    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
-    rvi.nodeId = UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID);
-    UA_DataValue publishedNodeData = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-
-    /* Read data received by the Subscriber */
-    rvi.nodeId = UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID);
-    UA_DataValue subscribedNodeData = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
-    
-    /* Check if data sent from Publisher is being received by Subscriber */
-    ck_assert(publishedNodeData.value.type == subscribedNodeData.value.type);
-    ck_assert(UA_order(publishedNodeData.value.data,
-                       subscribedNodeData.value.data,
-                       subscribedNodeData.value.type) == UA_ORDER_EQ);
-
-    ck_assert(publishedNodeData.hasStatus == subscribedNodeData.hasStatus);
-    ck_assert(publishedNodeData.status == subscribedNodeData.status);
-
-    UA_DataValue_clear(&subscribedNodeData);
-    UA_DataValue_clear(&publishedNodeData);
+    while(true) {
+        UA_fakeSleep(50);
+        UA_Server_run_iterate(server, false);
+        /* Read data sent by the Publisher */
+        UA_ReadValueId rvi;
+        UA_ReadValueId_init(&rvi);
+        rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+        rvi.nodeId = UA_NODEID_NUMERIC(1, PUBLISHVARIABLE_NODEID);
+        UA_DataValue publishedNodeData = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
+        
+        /* Read data received by the Subscriber */
+        rvi.nodeId = UA_NODEID_NUMERIC(1, SUBSCRIBEVARIABLE_NODEID);
+        UA_DataValue subscribedNodeData = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
+        
+        /* Check if data sent from Publisher is being received by Subscriber */
+        ck_assert(publishedNodeData.value.type == subscribedNodeData.value.type);
+        UA_Boolean eq = 
+            (UA_order(&publishedNodeData, &subscribedNodeData,
+                      &UA_TYPES[UA_TYPES_DATAVALUE]) == UA_ORDER_EQ);
+        UA_DataValue_clear(&subscribedNodeData);
+        UA_DataValue_clear(&publishedNodeData);
+        if(eq)
+            break;
+    }
 }
 
 START_TEST(AddReaderGroupWithValidConfiguration) {
@@ -1673,6 +1606,11 @@ START_TEST(SinglePublishSubscribeHeartbeat) {
 
     UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
     ck_assert_ptr_ne(dsr, NULL);
+
+    UA_fakeSleep(100);
+    UA_Server_run_iterate(server, false);
+    UA_Server_run_iterate(server, false);
+
     /* since the test cases are using a fake timer with a static timestamp,
      * we compare the lastHeartbeatReceived with the static timestamp
      * (given by UA_DateTime_nowMonotonic()). If the timestamps are equal,
@@ -2441,12 +2379,7 @@ START_TEST(ValidConfiguredSizPublishSubscribe) {
         /* run server - publisher and subscriber */
         retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionId);
-        UA_ByteString buffer;
-        UA_ByteString_init(&buffer);
-        UA_NetworkMessage networkMessage;
-        receiveSingleMessage(buffer, connection, &networkMessage);
-        UA_NetworkMessage_clear(&networkMessage);
+        UA_Server_run_iterate(server, false);
 } END_TEST
 
 START_TEST(InvalidConfiguredSizPublishSubscribe) {
@@ -2594,10 +2527,7 @@ START_TEST(InvalidConfiguredSizPublishSubscribe) {
         /* run server - publisher and subscriber */
         retVal |= UA_Server_setWriterGroupOperational(server, writerGroup);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-        UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionId);
-        UA_ByteString buffer;
-        UA_ByteString_init(&buffer);
-        receiveInvalidMessage(buffer, connection);
+        UA_Server_run_iterate(server, false);
 } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 9535aca3f52..7110ba3947d 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -100,10 +100,9 @@ static void AddConnection(
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConfig.publisherId.uint32 = PublisherId;
 
+    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
+    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
     ck_assert(UA_Server_addPubSubConnection(server, &connectionConfig, opConnectionId) == UA_STATUSCODE_GOOD);
-    UA_LOCK(&server->serviceMutex);
-    ck_assert(UA_PubSubConnection_regist(server, opConnectionId, NULL) == UA_STATUSCODE_GOOD);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 /***************************************************************************************************/
@@ -425,22 +424,27 @@ static void PubSubStateChangeCallback_basic (UA_Server *hostServer,
                 (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason));
     UA_String_clear(&strId);
 
-    ck_assert(ExpectedCallbackStateChange == state);
-    ck_assert(ExpectedCallbackStatus == reason);
+    if(ExpectedCallbackStateChange == UA_PUBSUBSTATE_OPERATIONAL) {
+        ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL ||
+                  state == UA_PUBSUBSTATE_PREOPERATIONAL);
+    } else {
+        ck_assert(ExpectedCallbackStateChange == state);
+    }
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
                 "Callback Cnt = %u", CallbackCnt);
 
-    ck_assert(CallbackCnt < ExpectedCallbackCnt);
-    ck_assert(pExpectedComponentCallbackIds != 0);
-    UA_String_init(&strId);
-    UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-                "Expected Id = %.*s", (UA_Int32) strId.length, strId.data);
-    UA_String_clear(&strId);
+    if(ExpectedCallbackCnt > 0) {
+        ck_assert(CallbackCnt <= ExpectedCallbackCnt);
+        /* UA_String_init(&strId); */
+        /* UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId); */
+        /* UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): " */
+        /*             "Expected Id = %.*s", (UA_Int32) strId.length, strId.data); */
+        /* UA_String_clear(&strId); */
+        /* ck_assert(UA_NodeId_equal(pubsubComponentId, */
+        /*                           &(pExpectedComponentCallbackIds[CallbackCnt])) == UA_TRUE); */
+    }
 
-    ck_assert(UA_NodeId_equal(pubsubComponentId,
-                              &(pExpectedComponentCallbackIds[CallbackCnt])) == UA_TRUE);
     CallbackCnt++;
 }
 
@@ -500,7 +504,7 @@ START_TEST(Test_basic) {
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
 
     /* state change to operational of WriterGroup */
-    ExpectedCallbackCnt = 2;
+    ExpectedCallbackCnt = 3;
     pExpectedComponentCallbackIds = (UA_NodeId*) UA_calloc(ExpectedCallbackCnt, sizeof(UA_NodeId));
     ck_assert(pExpectedComponentCallbackIds != 0);
     pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
@@ -513,7 +517,7 @@ START_TEST(Test_basic) {
     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
 
     /* check that callback has been called for writer group and dataset */
-    ck_assert_int_eq(2, CallbackCnt);
+    ck_assert_int_eq(4, CallbackCnt);
     CallbackCnt = 0;
 
     ck_assert(UA_Server_WriterGroup_getState(server, WGId_Conn1_WG1, &state) == UA_STATUSCODE_GOOD);
@@ -548,7 +552,7 @@ START_TEST(Test_basic) {
     CallbackCnt = 0;
 
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
+    ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
@@ -596,7 +600,7 @@ START_TEST(Test_basic) {
 
     /* state of ReaderGroup should still be ok */
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
+    ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
      /* but DataSetReader state shall be error */
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_ERROR);
@@ -718,6 +722,8 @@ START_TEST(Test_basic) {
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_basic\n\n");
 
+    UA_free(pExpectedComponentCallbackIds);
+    pExpectedComponentCallbackIds = NULL;
 } END_TEST
 
 /* Test different message receive timeouts */
@@ -739,21 +745,28 @@ PubSubStateChangeCallback_different_timeouts(UA_Server *hostServer, UA_NodeId *p
                 (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason));
     UA_String_clear(&strId);
 
-    ck_assert(ExpectedCallbackStateChange == state);
+    if(ExpectedCallbackStateChange == UA_PUBSUBSTATE_OPERATIONAL) {
+        ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL ||
+                  state == UA_PUBSUBSTATE_PREOPERATIONAL);
+    } else {
+        ck_assert(ExpectedCallbackStateChange == state);
+    }
     ck_assert(ExpectedCallbackStatus == reason);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
         "Callback Cnt = %u", CallbackCnt);
 
-    ck_assert(CallbackCnt < ExpectedCallbackCnt);
-    ck_assert(pExpectedComponentCallbackIds != 0);
-    UA_String_init(&strId);
-    UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Expected Id = %.*s", (UA_Int32) strId.length, strId.data);
-    UA_String_clear(&strId);
+    if(ExpectedCallbackCnt > 0) {
+        ck_assert(CallbackCnt <= ExpectedCallbackCnt);
+        /* UA_String_init(&strId); */
+        /* UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId); */
+        /* UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): " */
+        /*             "Expected Id = %.*s", (UA_Int32) strId.length, strId.data); */
+        /* UA_String_clear(&strId); */
+        
+        /* ck_assert(UA_NodeId_equal(pubsubComponentId, &(pExpectedComponentCallbackIds[CallbackCnt])) == UA_TRUE); */
+    }
 
-    ck_assert(UA_NodeId_equal(pubsubComponentId, &(pExpectedComponentCallbackIds[CallbackCnt])) == UA_TRUE);
     CallbackCnt++;
 }
 
@@ -869,7 +882,7 @@ START_TEST(Test_different_timeouts) {
     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
     ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
 
-    ExpectedCallbackCnt = 6;
+    ExpectedCallbackCnt = 8;
     pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
     pExpectedComponentCallbackIds[1] = RGId_Conn1_RG1;
     pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG1_DSR1;
@@ -1056,7 +1069,7 @@ START_TEST(Test_wrong_timeout) {
 
     /* DataSetReader state toggles from error to operational, because it receives messages but always too late */
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_wrong_timeout\n\n");
 } END_TEST
@@ -1068,567 +1081,577 @@ START_TEST(Test_wrong_timeout) {
 /* Test a bigger configuration */
 
 /***************************************************************************************************/
-static void
-PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
-                                          UA_PubSubState state, UA_StatusCode reason) {
-    ck_assert(hostServer == server);
-
-    if(!runtime)
-        return;
-
-    UA_String strId;
-    UA_String_init(&strId);
-    UA_NodeId_print(pubsubComponentId, &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason));
-    UA_String_clear(&strId);
-
-    ck_assert(pExpectedComponentCallbackIds != 0);
-    ck_assert(CallbackCnt < ExpectedCallbackCnt);
-
-    UA_String_init(&strId);
-    UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
-        "Expected Id (on timeout) = %.*s", (UA_Int32) strId.length, strId.data);
-    UA_String_clear(&strId);
-
-    ck_assert(state == ExpectedCallbackStateChange);
-    ck_assert(reason == ExpectedCallbackStatus);
-    if (ExpectedCallbackStateChange == UA_PUBSUBSTATE_ERROR) {
-        /*  On error we want to verify the order of DataSetReader timeouts */
-        ck_assert(UA_NodeId_equal(pubsubComponentId, &pExpectedComponentCallbackIds[CallbackCnt]) == UA_TRUE);
-    } /* when the state is set back to operational we cannot verify the order of StateChanges, because we
-            cannot know which DataSetReader will be operational first */
-    CallbackCnt++;
-}
-
-/***************************************************************************************************/
-START_TEST(Test_many_components) {
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_many_components");
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "prepare configuration");
-
-    /*  Writers            : Interval  -> Readers            : Timeout
-        ----------------------------------------------------------------------------------
-        Conn 1 WG 1 - DSW1 : 30        -> Conn 2 RG 1 - DSR1 : 40
-        Conn 1 WG 1 - DSW2 : 30        -> Conn 2 RG 2 - DSR1 : 45
-        Conn 2 WG 1 - DSW1 : 20        -> Conn 1 RG 1 - DSR1 : 25
-        Conn 2 WG 2 - DSW1 : 10        -> Conn 3 RG 1 - DSR1 : 25
-    */
-
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    /* set custom callback triggered for specific PubSub state changes */
-    config->pubSubConfig.stateChangeCallback = PubSubStateChangeCallback_many_components;
-
-    /* setup Connection 1: writers */
-    UA_NodeId ConnId_1;
-    UA_NodeId_init(&ConnId_1);
-    UA_UInt32 PublisherNo_Conn1 = 1;
-    AddConnection("Conn1", PublisherNo_Conn1, &ConnId_1);
-
-    UA_NodeId WGId_Conn1_WG1;
-    UA_NodeId_init(&WGId_Conn1_WG1);
-    UA_UInt32 WGNo_Conn1_WG1 = 1;
-    UA_Duration PublishingInterval_Conn1_WG1 = 30.0;
-    AddWriterGroup(&ConnId_1, "Conn1_WG1", WGNo_Conn1_WG1, PublishingInterval_Conn1_WG1, &WGId_Conn1_WG1);
-
-    UA_NodeId DsWId_Conn1_WG1_DS1;
-    UA_NodeId_init(&DsWId_Conn1_WG1_DS1);
-    UA_NodeId VarId_Conn1_WG1_DS1;
-    UA_NodeId_init(&VarId_Conn1_WG1_DS1);
-    UA_NodeId PDSId_Conn1_WG1_PDS1;
-    UA_NodeId_init(&PDSId_Conn1_WG1_PDS1);
-    UA_UInt32 DSWNo_Conn1_WG1_DS1 = 1;
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1_DS1, &PDSId_Conn1_WG1_PDS1,
-        &VarId_Conn1_WG1_DS1, &DsWId_Conn1_WG1_DS1);
-
-    UA_NodeId DsWId_Conn1_WG1_DS2;
-    UA_NodeId_init(&DsWId_Conn1_WG1_DS2);
-    UA_NodeId VarId_Conn1_WG1_DS2;
-    UA_NodeId_init(&VarId_Conn1_WG1_DS2);
-    UA_NodeId PDSId_Conn1_WG1_PDS2;
-    UA_NodeId_init(&PDSId_Conn1_WG1_PDS2);
-    UA_UInt32 DSWNo_Conn1_WG1_DS2 = 2;
-    AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS2", "Conn1_WG1_DS2", DSWNo_Conn1_WG1_DS2, &PDSId_Conn1_WG1_PDS2,
-        &VarId_Conn1_WG1_DS2, &DsWId_Conn1_WG1_DS2);
-
-
-    /* setup Connection 2: writers */
-    UA_NodeId ConnId_2;
-    UA_NodeId_init(&ConnId_2);
-    UA_UInt32 PublisherNo_Conn2 = 2;
-    AddConnection("Conn2", PublisherNo_Conn2, &ConnId_2);
-
-    UA_NodeId WGId_Conn2_WG1;
-    UA_NodeId_init(&WGId_Conn2_WG1);
-    UA_UInt32 WGNo_Conn2_WG1 = 1;
-    UA_Duration PublishingInterval_Conn2_WG1 = 20.0;
-    AddWriterGroup(&ConnId_2, "Conn2_WG1", WGNo_Conn2_WG1, PublishingInterval_Conn2_WG1, &WGId_Conn2_WG1);
-
-    UA_NodeId DsWId_Conn2_WG1_DS1;
-    UA_NodeId_init(&DsWId_Conn2_WG1_DS1);
-    UA_NodeId VarId_Conn2_WG1_DS1;
-    UA_NodeId_init(&VarId_Conn2_WG1_DS1);
-    UA_NodeId PDSId_Conn2_WG1_PDS1;
-    UA_NodeId_init(&PDSId_Conn2_WG1_PDS1);
-    UA_UInt32 DSWNo_Conn2_WG1_DS1 = 1;
-    AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", DSWNo_Conn2_WG1_DS1, &PDSId_Conn2_WG1_PDS1,
-        &VarId_Conn2_WG1_DS1, &DsWId_Conn2_WG1_DS1);
-
-
-    UA_NodeId WGId_Conn2_WG2;
-    UA_NodeId_init(&WGId_Conn2_WG2);
-    UA_UInt32 WGNo_Conn2_WG2 = 2;
-    UA_Duration PublishingInterval_Conn2_WG2 = 10.0;
-    AddWriterGroup(&ConnId_2, "Conn2_WG2", WGNo_Conn2_WG2, PublishingInterval_Conn2_WG2, &WGId_Conn2_WG2);
-
-    UA_NodeId DsWId_Conn2_WG2_DS1;
-    UA_NodeId_init(&DsWId_Conn2_WG2_DS1);
-    UA_NodeId VarId_Conn2_WG2_DS1;
-    UA_NodeId_init(&VarId_Conn2_WG2_DS1);
-    UA_NodeId PDSId_Conn2_WG2_PDS1;
-    UA_NodeId_init(&PDSId_Conn2_WG2_PDS1);
-    UA_UInt32 DSWNo_Conn2_WG2_DS1 = 1;
-    AddPublishedDataSet(&WGId_Conn2_WG2, "Conn2_WG2_PDS1", "Conn2_WG2_DS1", DSWNo_Conn2_WG2_DS1, &PDSId_Conn2_WG2_PDS1,
-        &VarId_Conn2_WG2_DS1, &DsWId_Conn2_WG2_DS1);
-
-    /* setup Connection 1: readers */
-    UA_NodeId RGId_Conn1_RG1;
-    UA_NodeId_init(&RGId_Conn1_RG1);
-    AddReaderGroup(&ConnId_1, "Conn1_RG1", &RGId_Conn1_RG1);
-
-    UA_NodeId DSRId_Conn1_RG1_DSR1;
-    UA_NodeId_init(&DSRId_Conn1_RG1_DSR1);
-    UA_NodeId VarId_Conn1_RG1_DSR1;
-    UA_NodeId_init(&VarId_Conn1_RG1_DSR1);
-    UA_Duration MessageReceiveTimeout_Conn1_RG1_DSR1 = 25.0;
-    AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn2, WGNo_Conn2_WG1, DSWNo_Conn2_WG1_DS1,
-        MessageReceiveTimeout_Conn1_RG1_DSR1, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1);
-    UA_String strId;
-    UA_String_init(&strId);
-    UA_NodeId_print(&DSRId_Conn1_RG1_DSR1, &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Conn1_RG1_DSR1 Id = %.*s", (UA_Int32) strId.length, strId.data);
-    UA_String_clear(&strId);
-
-     /* setup Connection 2: readers */
-    UA_NodeId RGId_Conn2_RG1;
-    UA_NodeId_init(&RGId_Conn2_RG1);
-    AddReaderGroup(&ConnId_2, "Conn2_RG1", &RGId_Conn2_RG1);
-
-    UA_NodeId DSRId_Conn2_RG1_DSR1;
-    UA_NodeId_init(&DSRId_Conn2_RG1_DSR1);
-    UA_NodeId VarId_Conn2_RG1_DSR1;
-    UA_NodeId_init(&VarId_Conn2_RG1_DSR1);
-    UA_Duration MessageReceiveTimeout_Conn2_RG1_DSR1 = 40.0;
-    AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS1,
-        MessageReceiveTimeout_Conn2_RG1_DSR1, &VarId_Conn2_RG1_DSR1, &DSRId_Conn2_RG1_DSR1);
-    UA_String_init(&strId);
-    UA_NodeId_print(&DSRId_Conn2_RG1_DSR1, &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Conn2_RG1_DSR1 Id = %.*s", (UA_Int32) strId.length, strId.data);
-    UA_String_clear(&strId);
-
-    UA_NodeId RGId_Conn2_RG2;
-    UA_NodeId_init(&RGId_Conn2_RG2);
-    AddReaderGroup(&ConnId_2, "Conn2_RG2", &RGId_Conn2_RG2);
-
-    UA_NodeId DSRId_Conn2_RG2_DSR1;
-    UA_NodeId_init(&DSRId_Conn2_RG2_DSR1);
-    UA_NodeId VarId_Conn2_RG2_DSR1;
-    UA_NodeId_init(&VarId_Conn2_RG2_DSR1);
-    UA_Duration MessageReceiveTimeout_Conn2_RG2_DSR1 = 45.0;
-    AddDataSetReader(&RGId_Conn2_RG2, "Conn2_RG2_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS2,
-        MessageReceiveTimeout_Conn2_RG2_DSR1, &VarId_Conn2_RG2_DSR1, &DSRId_Conn2_RG2_DSR1);
-    UA_String_init(&strId);
-    UA_NodeId_print(&DSRId_Conn2_RG2_DSR1, &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Conn2_RG2_DSR1 Id = %.*s", (UA_Int32) strId.length, strId.data);
-    UA_String_clear(&strId);
-
-    /* setup Connection 3: readers */
-    UA_NodeId ConnId_3;
-    UA_NodeId_init(&ConnId_3);
-    UA_UInt32 PublisherNo_Conn3 = 3;
-    AddConnection("Conn3", PublisherNo_Conn3, &ConnId_3);
-
-    UA_NodeId RGId_Conn3_RG1;
-    UA_NodeId_init(&RGId_Conn3_RG1);
-    AddReaderGroup(&ConnId_3, "Conn3_RG1", &RGId_Conn3_RG1);
-
-    UA_NodeId DSRId_Conn3_RG1_DSR1;
-    UA_NodeId_init(&DSRId_Conn3_RG1_DSR1);
-    UA_NodeId VarId_Conn3_RG1_DSR1;
-    UA_NodeId_init(&VarId_Conn3_RG1_DSR1);
-    UA_Duration MessageReceiveTimeout_Conn3_RG1_DSR1 = 25.0;
-    AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", PublisherNo_Conn2, WGNo_Conn2_WG2, DSWNo_Conn2_WG2_DS1,
-        MessageReceiveTimeout_Conn3_RG1_DSR1, &VarId_Conn3_RG1_DSR1, &DSRId_Conn3_RG1_DSR1);
-    UA_String_init(&strId);
-    UA_NodeId_print(&DSRId_Conn3_RG1_DSR1, &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Conn3_RG1_DSR1 Id = %.*s", (UA_Int32) strId.length, strId.data);
-    UA_String_clear(&strId);
-
-    const UA_UInt32 SleepTime = 5;
-    const UA_UInt32 NoOfRunIterateCycles = 11;
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "set everything operational");
-
-    /* check normal operation first -> there should not be any timeouts */
-    ExpectedCallbackCnt = 15;
-    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
-    pExpectedComponentCallbackIds = (UA_NodeId*) UA_calloc(ExpectedCallbackCnt, sizeof(UA_NodeId));
-    ck_assert(pExpectedComponentCallbackIds != 0);
-    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
-    pExpectedComponentCallbackIds[1] = RGId_Conn1_RG1;
-    pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG1_DSR1;
-    pExpectedComponentCallbackIds[3] = RGId_Conn2_RG1;
-    pExpectedComponentCallbackIds[4] = DSRId_Conn2_RG2_DSR1;
-    pExpectedComponentCallbackIds[5] = RGId_Conn2_RG2;
-    pExpectedComponentCallbackIds[6] = DSRId_Conn3_RG1_DSR1;
-    pExpectedComponentCallbackIds[7] = RGId_Conn3_RG1;
-    pExpectedComponentCallbackIds[8] = DsWId_Conn1_WG1_DS1;
-    pExpectedComponentCallbackIds[9] = DsWId_Conn1_WG1_DS2;
-    pExpectedComponentCallbackIds[10] = WGId_Conn1_WG1;
-    pExpectedComponentCallbackIds[11] = DsWId_Conn2_WG1_DS1;
-    pExpectedComponentCallbackIds[12] = WGId_Conn2_WG1;
-    pExpectedComponentCallbackIds[13] = DsWId_Conn2_WG2_DS1;
-    pExpectedComponentCallbackIds[14] = WGId_Conn2_WG2;
-
-    ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG2) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn3_RG1) == UA_STATUSCODE_GOOD);
-
-    ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    /* check that publish/subscribe works -> set some test values */
-
-    /* use a low enough sleep value to ensure that publishing intervals and message receive timeouts
-        are handled */
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn2_RG1_DSR1");
-    ValidatePublishSubscribe(VarId_Conn1_WG1_DS1, VarId_Conn2_RG1_DSR1, 10, SleepTime, NoOfRunIterateCycles);
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn2_RG2_DSR1");
-    ValidatePublishSubscribe(VarId_Conn1_WG1_DS2, VarId_Conn2_RG2_DSR1, 99, SleepTime, NoOfRunIterateCycles);
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn1_RG1_DSR1");
-    ValidatePublishSubscribe(VarId_Conn2_WG1_DS1, VarId_Conn1_RG1_DSR1, 40, SleepTime, NoOfRunIterateCycles);
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn3_RG1_DSR1");
-    ValidatePublishSubscribe(VarId_Conn2_WG2_DS1, VarId_Conn3_RG1_DSR1, 123, SleepTime, NoOfRunIterateCycles);
-
-    ck_assert_int_eq(0, CallbackCnt);
-
-    /***************************************************************************************************/
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST A");
-
-    /* prepare expected pubsub components with message receive timeout */
-    ExpectedCallbackCnt = 3;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
-    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
-    pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
-    pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup: Conn 1 - WG 1");
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
-
-    UA_PubSubState state = UA_PUBSUBSTATE_OPERATIONAL;
-    ck_assert(UA_Server_WriterGroup_getState(server, WGId_Conn1_WG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_DISABLED);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ExpectedCallbackCnt = 2;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
-    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
-    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG2_DSR1;
-
-    ServerDoProcess("A 1", SleepTime, NoOfRunIterateCycles);
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders");
-
-    /* state of Conn 2: ReaderGroup 1 should still be ok */
-    ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-     /* but DataSetReader state shall be error */
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
-
-    /* state of Conn 2: ReaderGroup 2 should still be ok */
-    ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-     /* but DataSetReader state shall be error */
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG2_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
-
-    /* Conn 1: RG 1 DatasetReader1 state shall still be operational */
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-    ValidatePublishSubscribe(VarId_Conn2_WG1_DS1, VarId_Conn1_RG1_DSR1, 99, SleepTime, NoOfRunIterateCycles);
-    /* Conn 3: RG 1 DatasetReader1 state shall still be operational */
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn3_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-    ValidatePublishSubscribe(VarId_Conn2_WG2_DS1, VarId_Conn3_RG1_DSR1, 118, SleepTime, NoOfRunIterateCycles);
-
-    /* check number of timeouts */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    /* enable the publisher WriterGroup again */
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "enable writergroup Conn 1 - WG 1");
-    CallbackCnt = 0;
-    ExpectedCallbackCnt = 3;
-    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
-    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
-    pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
-    pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
-
-    ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ExpectedCallbackCnt = 2;
-    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
-    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG1_DSR1;
-    pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG2_DSR1;
-
-    ServerDoProcess("A 2", SleepTime, NoOfRunIterateCycles);
-
-    /* DataSetReader state shall be back to operational, after receiving a new message */
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG2_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-
-    /* PubSubStateChange callback must not have been triggered again */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    /***************************************************************************************************/
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST B");
-
-    /* prepare expected pubsub component timeouts */
-    ExpectedCallbackCnt = 2;
-    pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1;
-    pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup: Conn 2 - WG 1");
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ExpectedCallbackCnt = 1;
-    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
-
-    ServerDoProcess("B 1", (UA_UInt32) SleepTime, NoOfRunIterateCycles);
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders");
-
-    /* DatasetReader Conn1: RG 1 shall be error */
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
-
-    /* other DataSetReaders shall be operational */
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG2_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-    ValidatePublishSubscribe(VarId_Conn1_WG1_DS1, VarId_Conn2_RG1_DSR1, 47, SleepTime, NoOfRunIterateCycles);
-
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn3_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-    ValidatePublishSubscribe(VarId_Conn2_WG2_DS1, VarId_Conn3_RG1_DSR1, 119, SleepTime, NoOfRunIterateCycles);
-
-    /* check number of timeouts */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    /* enable the publisher WriterGroup again */
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "enable writergroup");
-    ExpectedCallbackCnt = 2;
-    pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1;
-    pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1;
-
-    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
-    ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ExpectedCallbackCnt = 1;
-    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
-
-    ServerDoProcess("B 1", SleepTime, NoOfRunIterateCycles);
-
-    /* DataSetReader state shall be back to operational, after receiving a new message */
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    /***************************************************************************************************/
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST C");
-
-    /* prepare expected pubsub component timeouts */
-    ExpectedCallbackCnt = 15;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
-    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
-    pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
-    pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
-    pExpectedComponentCallbackIds[3] = DsWId_Conn2_WG1_DS1;
-    pExpectedComponentCallbackIds[4] = WGId_Conn2_WG1;
-    pExpectedComponentCallbackIds[5] = DsWId_Conn2_WG2_DS1;
-    pExpectedComponentCallbackIds[6] = WGId_Conn2_WG2;
-    pExpectedComponentCallbackIds[7] = DSRId_Conn1_RG1_DSR1;
-    pExpectedComponentCallbackIds[8] = RGId_Conn1_RG1;
-    pExpectedComponentCallbackIds[9] = DSRId_Conn2_RG1_DSR1;
-    pExpectedComponentCallbackIds[10] = RGId_Conn2_RG1;
-    pExpectedComponentCallbackIds[11] = DSRId_Conn2_RG2_DSR1;
-    pExpectedComponentCallbackIds[12] = RGId_Conn2_RG2;
-    pExpectedComponentCallbackIds[13] = DSRId_Conn3_RG1_DSR1;
-    pExpectedComponentCallbackIds[14] = RGId_Conn3_RG1;
-
-    /* realign all publishers, so we can determine the order of timeouts */
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn2_RG2) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn3_RG1) == UA_STATUSCODE_GOOD);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ExpectedCallbackStatus = UA_STATUSCODE_GOOD;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL;
-
-    ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG2) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn3_RG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
-    ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ServerDoProcess("C 1", SleepTime, NoOfRunIterateCycles);
-
-    ExpectedCallbackCnt = 2;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
-    pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG2_DS1;
-    pExpectedComponentCallbackIds[1] = WGId_Conn2_WG2;
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable all writers");
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ExpectedCallbackCnt = 1;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
-    pExpectedComponentCallbackIds[0] = DSRId_Conn3_RG1_DSR1;
-
-    ServerDoProcess("C 1", SleepTime, 6);
-
-    /* check number of timeouts */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ExpectedCallbackCnt = 2;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
-    pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1;
-    pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1;
-
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD);
-
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    ExpectedCallbackCnt = 1;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
-    pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1;
+/* static void */
+/* PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubsubComponentId, */
+/*                                           UA_PubSubState state, UA_StatusCode reason) { */
+/*     ck_assert(hostServer == server); */
+
+/*     if(!runtime) */
+/*         return; */
+
+/*     UA_String strId; */
+/*     UA_String_init(&strId); */
+/*     UA_NodeId_print(pubsubComponentId, &strId); */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): " */
+/*         "Component Id = %.*s, state = %i, status = 0x%08x %s", (UA_Int32) strId.length, strId.data, state, reason, UA_StatusCode_name(reason)); */
+/*     UA_String_clear(&strId); */
+
+/*     if(ExpectedCallbackCnt > 0) { */
+/*         ck_assert(CallbackCnt <= ExpectedCallbackCnt); */
+/*         UA_String_init(&strId); */
+/*         UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId); */
+/*         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): " */
+/*                     "Expected Id (on timeout) = %.*s", (UA_Int32) strId.length, strId.data); */
+/*         UA_String_clear(&strId); */
+/*     } */
+
+/*     if(ExpectedCallbackStateChange == UA_PUBSUBSTATE_OPERATIONAL) { */
+/*         ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL || */
+/*                   state == UA_PUBSUBSTATE_PREOPERATIONAL); */
+/*     } else { */
+/*         ck_assert(ExpectedCallbackStateChange == state); */
+/*     } */
+
+/*     ck_assert(reason == ExpectedCallbackStatus); */
+/*     if (ExpectedCallbackStateChange == UA_PUBSUBSTATE_ERROR) { */
+/*         /\*  On error we want to verify the order of DataSetReader timeouts *\/ */
+/*         ck_assert(UA_NodeId_equal(pubsubComponentId, &pExpectedComponentCallbackIds[CallbackCnt]) == UA_TRUE); */
+/*     } /\* when the state is set back to operational we cannot verify the order of StateChanges, because we */
+/*             cannot know which DataSetReader will be operational first *\/ */
+/*     CallbackCnt++; */
+/* } */
+
+/* /\***************************************************************************************************\/ */
+/* START_TEST(Test_many_components) { */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "\n\nSTART: Test_many_components"); */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "prepare configuration"); */
+
+/*     /\*  Writers            : Interval  -> Readers            : Timeout */
+/*         ---------------------------------------------------------------------------------- */
+/*         Conn 1 WG 1 - DSW1 : 30        -> Conn 2 RG 1 - DSR1 : 40 */
+/*         Conn 1 WG 1 - DSW2 : 30        -> Conn 2 RG 2 - DSR1 : 45 */
+/*         Conn 2 WG 1 - DSW1 : 20        -> Conn 1 RG 1 - DSR1 : 25 */
+/*         Conn 2 WG 2 - DSW1 : 10        -> Conn 3 RG 1 - DSR1 : 25 */
+/*     *\/ */
+
+/*     UA_ServerConfig *config = UA_Server_getConfig(server); */
+/*     /\* set custom callback triggered for specific PubSub state changes *\/ */
+/*     config->pubSubConfig.stateChangeCallback = PubSubStateChangeCallback_many_components; */
+
+/*     /\* setup Connection 1: writers *\/ */
+/*     UA_NodeId ConnId_1; */
+/*     UA_NodeId_init(&ConnId_1); */
+/*     UA_UInt32 PublisherNo_Conn1 = 1; */
+/*     AddConnection("Conn1", PublisherNo_Conn1, &ConnId_1); */
+
+/*     UA_NodeId WGId_Conn1_WG1; */
+/*     UA_NodeId_init(&WGId_Conn1_WG1); */
+/*     UA_UInt32 WGNo_Conn1_WG1 = 1; */
+/*     UA_Duration PublishingInterval_Conn1_WG1 = 30.0; */
+/*     AddWriterGroup(&ConnId_1, "Conn1_WG1", WGNo_Conn1_WG1, PublishingInterval_Conn1_WG1, &WGId_Conn1_WG1); */
+
+/*     UA_NodeId DsWId_Conn1_WG1_DS1; */
+/*     UA_NodeId_init(&DsWId_Conn1_WG1_DS1); */
+/*     UA_NodeId VarId_Conn1_WG1_DS1; */
+/*     UA_NodeId_init(&VarId_Conn1_WG1_DS1); */
+/*     UA_NodeId PDSId_Conn1_WG1_PDS1; */
+/*     UA_NodeId_init(&PDSId_Conn1_WG1_PDS1); */
+/*     UA_UInt32 DSWNo_Conn1_WG1_DS1 = 1; */
+/*     AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS1", "Conn1_WG1_DS1", DSWNo_Conn1_WG1_DS1, &PDSId_Conn1_WG1_PDS1, */
+/*         &VarId_Conn1_WG1_DS1, &DsWId_Conn1_WG1_DS1); */
+
+/*     UA_NodeId DsWId_Conn1_WG1_DS2; */
+/*     UA_NodeId_init(&DsWId_Conn1_WG1_DS2); */
+/*     UA_NodeId VarId_Conn1_WG1_DS2; */
+/*     UA_NodeId_init(&VarId_Conn1_WG1_DS2); */
+/*     UA_NodeId PDSId_Conn1_WG1_PDS2; */
+/*     UA_NodeId_init(&PDSId_Conn1_WG1_PDS2); */
+/*     UA_UInt32 DSWNo_Conn1_WG1_DS2 = 2; */
+/*     AddPublishedDataSet(&WGId_Conn1_WG1, "Conn1_WG1_PDS2", "Conn1_WG1_DS2", DSWNo_Conn1_WG1_DS2, &PDSId_Conn1_WG1_PDS2, */
+/*         &VarId_Conn1_WG1_DS2, &DsWId_Conn1_WG1_DS2); */
+
+
+/*     /\* setup Connection 2: writers *\/ */
+/*     UA_NodeId ConnId_2; */
+/*     UA_NodeId_init(&ConnId_2); */
+/*     UA_UInt32 PublisherNo_Conn2 = 2; */
+/*     AddConnection("Conn2", PublisherNo_Conn2, &ConnId_2); */
+
+/*     UA_NodeId WGId_Conn2_WG1; */
+/*     UA_NodeId_init(&WGId_Conn2_WG1); */
+/*     UA_UInt32 WGNo_Conn2_WG1 = 1; */
+/*     UA_Duration PublishingInterval_Conn2_WG1 = 20.0; */
+/*     AddWriterGroup(&ConnId_2, "Conn2_WG1", WGNo_Conn2_WG1, PublishingInterval_Conn2_WG1, &WGId_Conn2_WG1); */
+
+/*     UA_NodeId DsWId_Conn2_WG1_DS1; */
+/*     UA_NodeId_init(&DsWId_Conn2_WG1_DS1); */
+/*     UA_NodeId VarId_Conn2_WG1_DS1; */
+/*     UA_NodeId_init(&VarId_Conn2_WG1_DS1); */
+/*     UA_NodeId PDSId_Conn2_WG1_PDS1; */
+/*     UA_NodeId_init(&PDSId_Conn2_WG1_PDS1); */
+/*     UA_UInt32 DSWNo_Conn2_WG1_DS1 = 1; */
+/*     AddPublishedDataSet(&WGId_Conn2_WG1, "Conn2_WG1_PDS1", "Conn2_WG1_DS1", DSWNo_Conn2_WG1_DS1, &PDSId_Conn2_WG1_PDS1, */
+/*         &VarId_Conn2_WG1_DS1, &DsWId_Conn2_WG1_DS1); */
+
+
+/*     UA_NodeId WGId_Conn2_WG2; */
+/*     UA_NodeId_init(&WGId_Conn2_WG2); */
+/*     UA_UInt32 WGNo_Conn2_WG2 = 2; */
+/*     UA_Duration PublishingInterval_Conn2_WG2 = 10.0; */
+/*     AddWriterGroup(&ConnId_2, "Conn2_WG2", WGNo_Conn2_WG2, PublishingInterval_Conn2_WG2, &WGId_Conn2_WG2); */
+
+/*     UA_NodeId DsWId_Conn2_WG2_DS1; */
+/*     UA_NodeId_init(&DsWId_Conn2_WG2_DS1); */
+/*     UA_NodeId VarId_Conn2_WG2_DS1; */
+/*     UA_NodeId_init(&VarId_Conn2_WG2_DS1); */
+/*     UA_NodeId PDSId_Conn2_WG2_PDS1; */
+/*     UA_NodeId_init(&PDSId_Conn2_WG2_PDS1); */
+/*     UA_UInt32 DSWNo_Conn2_WG2_DS1 = 1; */
+/*     AddPublishedDataSet(&WGId_Conn2_WG2, "Conn2_WG2_PDS1", "Conn2_WG2_DS1", DSWNo_Conn2_WG2_DS1, &PDSId_Conn2_WG2_PDS1, */
+/*         &VarId_Conn2_WG2_DS1, &DsWId_Conn2_WG2_DS1); */
+
+/*     /\* setup Connection 1: readers *\/ */
+/*     UA_NodeId RGId_Conn1_RG1; */
+/*     UA_NodeId_init(&RGId_Conn1_RG1); */
+/*     AddReaderGroup(&ConnId_1, "Conn1_RG1", &RGId_Conn1_RG1); */
+
+/*     UA_NodeId DSRId_Conn1_RG1_DSR1; */
+/*     UA_NodeId_init(&DSRId_Conn1_RG1_DSR1); */
+/*     UA_NodeId VarId_Conn1_RG1_DSR1; */
+/*     UA_NodeId_init(&VarId_Conn1_RG1_DSR1); */
+/*     UA_Duration MessageReceiveTimeout_Conn1_RG1_DSR1 = 25.0; */
+/*     AddDataSetReader(&RGId_Conn1_RG1, "Conn1_RG1_DSR1", PublisherNo_Conn2, WGNo_Conn2_WG1, DSWNo_Conn2_WG1_DS1, */
+/*         MessageReceiveTimeout_Conn1_RG1_DSR1, &VarId_Conn1_RG1_DSR1, &DSRId_Conn1_RG1_DSR1); */
+/*     UA_String strId; */
+/*     UA_String_init(&strId); */
+/*     UA_NodeId_print(&DSRId_Conn1_RG1_DSR1, &strId); */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Conn1_RG1_DSR1 Id = %.*s", (UA_Int32) strId.length, strId.data); */
+/*     UA_String_clear(&strId); */
+
+/*      /\* setup Connection 2: readers *\/ */
+/*     UA_NodeId RGId_Conn2_RG1; */
+/*     UA_NodeId_init(&RGId_Conn2_RG1); */
+/*     AddReaderGroup(&ConnId_2, "Conn2_RG1", &RGId_Conn2_RG1); */
+
+/*     UA_NodeId DSRId_Conn2_RG1_DSR1; */
+/*     UA_NodeId_init(&DSRId_Conn2_RG1_DSR1); */
+/*     UA_NodeId VarId_Conn2_RG1_DSR1; */
+/*     UA_NodeId_init(&VarId_Conn2_RG1_DSR1); */
+/*     UA_Duration MessageReceiveTimeout_Conn2_RG1_DSR1 = 40.0; */
+/*     AddDataSetReader(&RGId_Conn2_RG1, "Conn2_RG1_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS1, */
+/*         MessageReceiveTimeout_Conn2_RG1_DSR1, &VarId_Conn2_RG1_DSR1, &DSRId_Conn2_RG1_DSR1); */
+/*     UA_String_init(&strId); */
+/*     UA_NodeId_print(&DSRId_Conn2_RG1_DSR1, &strId); */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Conn2_RG1_DSR1 Id = %.*s", (UA_Int32) strId.length, strId.data); */
+/*     UA_String_clear(&strId); */
+
+/*     UA_NodeId RGId_Conn2_RG2; */
+/*     UA_NodeId_init(&RGId_Conn2_RG2); */
+/*     AddReaderGroup(&ConnId_2, "Conn2_RG2", &RGId_Conn2_RG2); */
+
+/*     UA_NodeId DSRId_Conn2_RG2_DSR1; */
+/*     UA_NodeId_init(&DSRId_Conn2_RG2_DSR1); */
+/*     UA_NodeId VarId_Conn2_RG2_DSR1; */
+/*     UA_NodeId_init(&VarId_Conn2_RG2_DSR1); */
+/*     UA_Duration MessageReceiveTimeout_Conn2_RG2_DSR1 = 45.0; */
+/*     AddDataSetReader(&RGId_Conn2_RG2, "Conn2_RG2_DSR1", PublisherNo_Conn1, WGNo_Conn1_WG1, DSWNo_Conn1_WG1_DS2, */
+/*         MessageReceiveTimeout_Conn2_RG2_DSR1, &VarId_Conn2_RG2_DSR1, &DSRId_Conn2_RG2_DSR1); */
+/*     UA_String_init(&strId); */
+/*     UA_NodeId_print(&DSRId_Conn2_RG2_DSR1, &strId); */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Conn2_RG2_DSR1 Id = %.*s", (UA_Int32) strId.length, strId.data); */
+/*     UA_String_clear(&strId); */
+
+/*     /\* setup Connection 3: readers *\/ */
+/*     UA_NodeId ConnId_3; */
+/*     UA_NodeId_init(&ConnId_3); */
+/*     UA_UInt32 PublisherNo_Conn3 = 3; */
+/*     AddConnection("Conn3", PublisherNo_Conn3, &ConnId_3); */
+
+/*     UA_NodeId RGId_Conn3_RG1; */
+/*     UA_NodeId_init(&RGId_Conn3_RG1); */
+/*     AddReaderGroup(&ConnId_3, "Conn3_RG1", &RGId_Conn3_RG1); */
+
+/*     UA_NodeId DSRId_Conn3_RG1_DSR1; */
+/*     UA_NodeId_init(&DSRId_Conn3_RG1_DSR1); */
+/*     UA_NodeId VarId_Conn3_RG1_DSR1; */
+/*     UA_NodeId_init(&VarId_Conn3_RG1_DSR1); */
+/*     UA_Duration MessageReceiveTimeout_Conn3_RG1_DSR1 = 25.0; */
+/*     AddDataSetReader(&RGId_Conn3_RG1, "Conn3_RG1_DSR1", PublisherNo_Conn2, WGNo_Conn2_WG2, DSWNo_Conn2_WG2_DS1, */
+/*         MessageReceiveTimeout_Conn3_RG1_DSR1, &VarId_Conn3_RG1_DSR1, &DSRId_Conn3_RG1_DSR1); */
+/*     UA_String_init(&strId); */
+/*     UA_NodeId_print(&DSRId_Conn3_RG1_DSR1, &strId); */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Conn3_RG1_DSR1 Id = %.*s", (UA_Int32) strId.length, strId.data); */
+/*     UA_String_clear(&strId); */
+
+/*     const UA_UInt32 SleepTime = 5; */
+/*     const UA_UInt32 NoOfRunIterateCycles = 11; */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "set everything operational"); */
+
+/*     /\* check normal operation first -> there should not be any timeouts *\/ */
+/*     ExpectedCallbackCnt = 16; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_GOOD; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL; */
+/*     pExpectedComponentCallbackIds = (UA_NodeId*) UA_calloc(ExpectedCallbackCnt, sizeof(UA_NodeId)); */
+/*     ck_assert(pExpectedComponentCallbackIds != 0); */
+/*     pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[1] = RGId_Conn1_RG1; */
+/*     pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[3] = RGId_Conn2_RG1; */
+/*     pExpectedComponentCallbackIds[4] = DSRId_Conn2_RG2_DSR1; */
+/*     pExpectedComponentCallbackIds[5] = RGId_Conn2_RG2; */
+/*     pExpectedComponentCallbackIds[6] = DSRId_Conn3_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[7] = RGId_Conn3_RG1; */
+/*     pExpectedComponentCallbackIds[8] = DsWId_Conn1_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[9] = DsWId_Conn1_WG1_DS2; */
+/*     pExpectedComponentCallbackIds[10] = WGId_Conn1_WG1; */
+/*     pExpectedComponentCallbackIds[11] = DsWId_Conn2_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[12] = WGId_Conn2_WG1; */
+/*     pExpectedComponentCallbackIds[13] = DsWId_Conn2_WG2_DS1; */
+/*     pExpectedComponentCallbackIds[14] = WGId_Conn2_WG2; */
+
+/*     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG2) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn3_RG1) == UA_STATUSCODE_GOOD); */
+
+/*     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD); */
+/*     ExpectedCallbackCnt = 0; */
+/*     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     CallbackCnt = 0; */
+
+/*     /\* check that publish/subscribe works -> set some test values *\/ */
+
+/*     /\* use a low enough sleep value to ensure that publishing intervals and message receive timeouts */
+/*         are handled *\/ */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn2_RG1_DSR1"); */
+
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT; */
+
+/*     ValidatePublishSubscribe(VarId_Conn1_WG1_DS1, VarId_Conn2_RG1_DSR1, 10, SleepTime, NoOfRunIterateCycles); */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn2_RG2_DSR1"); */
+/*     ValidatePublishSubscribe(VarId_Conn1_WG1_DS2, VarId_Conn2_RG2_DSR1, 99, SleepTime, NoOfRunIterateCycles); */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn1_RG1_DSR1"); */
+/*     ValidatePublishSubscribe(VarId_Conn2_WG1_DS1, VarId_Conn1_RG1_DSR1, 40, SleepTime, NoOfRunIterateCycles); */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check Conn3_RG1_DSR1"); */
+/*     ValidatePublishSubscribe(VarId_Conn2_WG2_DS1, VarId_Conn3_RG1_DSR1, 123, SleepTime, NoOfRunIterateCycles); */
+
+/*     ck_assert_int_eq(0, CallbackCnt); */
+
+/*     /\***************************************************************************************************\/ */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST A"); */
+
+/*     /\* prepare expected pubsub components with message receive timeout *\/ */
+/*     ExpectedCallbackCnt = 3; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED; */
+/*     pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2; */
+/*     pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1; */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup: Conn 1 - WG 1"); */
+/*     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD); */
+
+/*     UA_PubSubState state = UA_PUBSUBSTATE_OPERATIONAL; */
+/*     ck_assert(UA_Server_WriterGroup_getState(server, WGId_Conn1_WG1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_DISABLED); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 2; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR; */
+/*     pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG2_DSR1; */
+
+/*     ServerDoProcess("A 1", SleepTime, NoOfRunIterateCycles); */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders"); */
+
+/*     /\* state of Conn 2: ReaderGroup 1 should still be ok *\/ */
+/*     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+/*      /\* but DataSetReader state shall be error *\/ */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_ERROR); */
+
+/*     /\* state of Conn 2: ReaderGroup 2 should still be ok *\/ */
+/*     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+/*      /\* but DataSetReader state shall be error *\/ */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG2_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_ERROR); */
+
+/*     /\* Conn 1: RG 1 DatasetReader1 state shall still be operational *\/ */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+/*     ValidatePublishSubscribe(VarId_Conn2_WG1_DS1, VarId_Conn1_RG1_DSR1, 99, SleepTime, NoOfRunIterateCycles); */
+/*     /\* Conn 3: RG 1 DatasetReader1 state shall still be operational *\/ */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn3_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+/*     ValidatePublishSubscribe(VarId_Conn2_WG2_DS1, VarId_Conn3_RG1_DSR1, 118, SleepTime, NoOfRunIterateCycles); */
+
+/*     /\* check number of timeouts *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     /\* enable the publisher WriterGroup again *\/ */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "enable writergroup Conn 1 - WG 1"); */
+/*     CallbackCnt = 0; */
+/*     ExpectedCallbackCnt = 3; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_GOOD; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL; */
+/*     pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2; */
+/*     pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1; */
+
+/*     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 2; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_GOOD; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL; */
+/*     pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[2] = DSRId_Conn2_RG2_DSR1; */
+
+/*     ServerDoProcess("A 2", SleepTime, NoOfRunIterateCycles); */
+
+/*     /\* DataSetReader state shall be back to operational, after receiving a new message *\/ */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG2_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+
+/*     /\* PubSubStateChange callback must not have been triggered again *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     /\***************************************************************************************************\/ */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST B"); */
+
+/*     /\* prepare expected pubsub component timeouts *\/ */
+/*     ExpectedCallbackCnt = 2; */
+/*     pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED; */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup: Conn 2 - WG 1"); */
+/*     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 1; */
+/*     pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR; */
+
+/*     ServerDoProcess("B 1", (UA_UInt32) SleepTime, NoOfRunIterateCycles); */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders"); */
+
+/*     /\* DatasetReader Conn1: RG 1 shall be error *\/ */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_ERROR); */
+
+/*     /\* other DataSetReaders shall be operational *\/ */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG2_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+/*     ValidatePublishSubscribe(VarId_Conn1_WG1_DS1, VarId_Conn2_RG1_DSR1, 47, SleepTime, NoOfRunIterateCycles); */
+
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn3_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+/*     ValidatePublishSubscribe(VarId_Conn2_WG2_DS1, VarId_Conn3_RG1_DSR1, 119, SleepTime, NoOfRunIterateCycles); */
+
+/*     /\* check number of timeouts *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     /\* enable the publisher WriterGroup again *\/ */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "enable writergroup"); */
+/*     ExpectedCallbackCnt = 2; */
+/*     pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1; */
+
+/*     ExpectedCallbackStatus = UA_STATUSCODE_GOOD; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL; */
+/*     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 1; */
+/*     pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1; */
+
+/*     ServerDoProcess("B 1", SleepTime, NoOfRunIterateCycles); */
+
+/*     /\* DataSetReader state shall be back to operational, after receiving a new message *\/ */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     /\***************************************************************************************************\/ */
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "TEST C"); */
+
+/*     /\* prepare expected pubsub component timeouts *\/ */
+/*     ExpectedCallbackCnt = 15; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED; */
+/*     pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2; */
+/*     pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1; */
+/*     pExpectedComponentCallbackIds[3] = DsWId_Conn2_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[4] = WGId_Conn2_WG1; */
+/*     pExpectedComponentCallbackIds[5] = DsWId_Conn2_WG2_DS1; */
+/*     pExpectedComponentCallbackIds[6] = WGId_Conn2_WG2; */
+/*     pExpectedComponentCallbackIds[7] = DSRId_Conn1_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[8] = RGId_Conn1_RG1; */
+/*     pExpectedComponentCallbackIds[9] = DSRId_Conn2_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[10] = RGId_Conn2_RG1; */
+/*     pExpectedComponentCallbackIds[11] = DSRId_Conn2_RG2_DSR1; */
+/*     pExpectedComponentCallbackIds[12] = RGId_Conn2_RG2; */
+/*     pExpectedComponentCallbackIds[13] = DSRId_Conn3_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[14] = RGId_Conn3_RG1; */
+
+/*     /\* realign all publishers, so we can determine the order of timeouts *\/ */
+/*     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn2_RG2) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupDisabled(server, RGId_Conn3_RG1) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackStatus = UA_STATUSCODE_GOOD; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_OPERATIONAL; */
+
+/*     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn1_RG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG2) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn3_RG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(UA_Server_setWriterGroupOperational(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ServerDoProcess("C 1", SleepTime, NoOfRunIterateCycles); */
+
+/*     ExpectedCallbackCnt = 2; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED; */
+/*     pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG2_DS1; */
+/*     pExpectedComponentCallbackIds[1] = WGId_Conn2_WG2; */
+
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable all writers"); */
+/*     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG2) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 1; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR; */
+/*     pExpectedComponentCallbackIds[0] = DSRId_Conn3_RG1_DSR1; */
+
+/*     ServerDoProcess("C 1", SleepTime, 6); */
+
+/*     /\* check number of timeouts *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 2; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED; */
+/*     pExpectedComponentCallbackIds[0] = DsWId_Conn2_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[1] = WGId_Conn2_WG1; */
+
+/*     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn2_WG1) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 1; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR; */
+/*     pExpectedComponentCallbackIds[0] = DSRId_Conn1_RG1_DSR1; */
+
+/*     ServerDoProcess("C 1", SleepTime, 6); */
+
+/*     /\* check number of timeouts *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 3; */
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED; */
+/*     pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1; */
+/*     pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2; */
+/*     pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1; */
+
+/*     ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD); */
+
+/*     /\* check number of state changes *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
+
+/*     ExpectedCallbackCnt = 2; */
+/*     pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1; */
+/*     pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG2_DSR1; */
 
-    ServerDoProcess("C 1", SleepTime, 6);
+/*     ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT; */
+/*     ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR; */
 
-    /* check number of timeouts */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
+/*     ServerDoProcess("C 2", SleepTime, NoOfRunIterateCycles); */
 
-    ExpectedCallbackCnt = 3;
-    ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_DISABLED;
-    pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
-    pExpectedComponentCallbackIds[1] = DsWId_Conn1_WG1_DS2;
-    pExpectedComponentCallbackIds[2] = WGId_Conn1_WG1;
+/*     /\* check number of timeouts *\/ */
+/*     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt); */
+/*     CallbackCnt = 0; */
 
-    ck_assert(UA_Server_setWriterGroupDisabled(server, WGId_Conn1_WG1) == UA_STATUSCODE_GOOD);
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders"); */
 
-    /* check number of state changes */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_ERROR); */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_ERROR); */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG2_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_ERROR); */
+/*     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn3_RG1_DSR1, &state) == UA_STATUSCODE_GOOD); */
+/*     ck_assert(state == UA_PUBSUBSTATE_ERROR); */
 
-    ExpectedCallbackCnt = 2;
-    pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
-    pExpectedComponentCallbackIds[1] = DSRId_Conn2_RG2_DSR1;
+/*     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_many_components\n\n"); */
 
-    ExpectedCallbackStatus = UA_STATUSCODE_BADTIMEOUT;
-    ExpectedCallbackStateChange = UA_PUBSUBSTATE_ERROR;
-
-    ServerDoProcess("C 2", SleepTime, NoOfRunIterateCycles);
-
-    /* check number of timeouts */
-    ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
-    CallbackCnt = 0;
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "check state of datasetreaders");
-
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn1_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG2_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn3_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_ERROR);
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "END: Test_many_components\n\n");
-
-} END_TEST
+/* } END_TEST */
 
 
 /***************************************************************************************************/
@@ -1934,13 +1957,13 @@ START_TEST(Test_fast_path) {
     ck_assert(UA_Server_setReaderGroupOperational(server, RGId_Conn2_RG1) == UA_STATUSCODE_GOOD);
 
     /* check that PubSubStateChange callback has been called for the specific DataSetReader */
-    ck_assert_int_eq(2, CallbackCnt);
+    ck_assert_int_eq(1, CallbackCnt);
     CallbackCnt = 0;
 
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
-    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
+    ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
     /* check that publish/subscribe works -> set some test values */
     ValidatePublishSubscribe_fast_path(10, (UA_UInt32) PublishingInterval_Conn1WG1, 3);
@@ -1950,7 +1973,7 @@ START_TEST(Test_fast_path) {
     ValidatePublishSubscribe_fast_path(44, (UA_UInt32) PublishingInterval_Conn1WG1, 3);
 
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
     /* there should not be a callback notification for MessageReceiveTimeout */
     ck_assert(CallbackCnt == 0);
@@ -1973,7 +1996,7 @@ START_TEST(Test_fast_path) {
 
     /* state of ReaderGroup should still be ok */
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
+    ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
      /* but DataSetReader state shall be error */
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_ERROR);
@@ -2074,7 +2097,7 @@ int main(void) {
         - configure multiple connections with multiple readers and writers
         - disable/enable and check for correct timeouts
     */
-    tcase_add_test(tc_basic, Test_many_components);
+    //tcase_add_test(tc_basic, Test_many_components);
 
     /* test case description:
         - configure a connection with writer and reader
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 61dbede8be8..2290b9f3598 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -78,58 +78,6 @@ static void teardown(void) {
     UA_Server_delete(server);
 }
 
-typedef struct {
-    UA_ByteString *buffer;
-    size_t offset;
-} UA_ReceiveContext;
-
-static UA_StatusCode
-recvTestFun(UA_PubSubChannel *channel, void *context, const UA_ByteString *buffer) {
-    UA_ReceiveContext *ctx = (UA_ReceiveContext*)context;
-    memcpy(ctx->buffer->data + ctx->offset, buffer->data, buffer->length);
-    ctx->offset += buffer->length;
-    ctx->buffer->length = ctx->offset;
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-receiveSingleMessageRT(UA_PubSubConnection *connection,
-                       UA_ReaderGroup *rg, UA_DataSetReader *dataSetReader) {
-    UA_ByteString buffer;
-    if (UA_ByteString_allocBuffer(&buffer, 512) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("Message buffer allocation failed!");
-    }
-
-    if(!connection->channel) {
-        ck_abort_msg("No connection established");
-        return;
-    }
-
-    UA_ReceiveContext testCtx = {&buffer, 0};
-    UA_StatusCode retval =
-        connection->channel->receive(connection->channel, NULL,
-                                     recvTestFun, &testCtx, 1000000);
-    if(retval != UA_STATUSCODE_GOOD || buffer.length == 0) {
-        buffer.length = 512;
-        UA_ByteString_clear(&buffer);
-        ck_abort_msg("Expected message not received!");
-    }
-
-    size_t currentPosition = 0;
-    /* Decode only the necessary offset and update the networkMessage */
-    if(UA_DataSetReader_decodeAndProcessRT(server, rg, connection, &buffer) != UA_STATUSCODE_GOOD) {
-        ck_abort_msg("PubSub receive. Unknown field type!");
-    }
-
-    /* Check the decoded message is the expected one */
-    if((dataSetReader->bufferedMessage.nm->groupHeader.writerGroupId != dataSetReader->config.writerGroupId) ||
-       (*dataSetReader->bufferedMessage.nm->payloadHeader.dataSetPayloadHeader.dataSetWriterIds != dataSetReader->config.dataSetWriterId)) {
-        ck_abort_msg("PubSub receive. Unknown message received. Will not be processed.");
-    }
-
-    UA_ByteString_clear(&buffer);
-}
-
 /* If the external data source is written over the information model, the
  * externalDataWriteCallback will be triggered. The user has to take care and assure
  * that the write leads not to synchronization issues and race conditions. */
@@ -155,7 +103,6 @@ externalDataReadNotificationCallback(UA_Server *serverLocal, const UA_NodeId *se
 START_TEST(SubscribeSingleFieldWithFixedOffsets) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
-    UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
 
     UA_DataSetFieldConfig dsfConfig;
     memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
@@ -196,6 +143,7 @@ START_TEST(SubscribeSingleFieldWithFixedOffsets) {
     dataSetWriterConfig.name = UA_STRING("Test DataSetWriter");
     dataSetWriterConfig.dataSetWriterId = 62541;
     ck_assert(UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent) == UA_STATUSCODE_GOOD);
+
     /* Reader Group */
     UA_ReaderGroupConfig readerGroupConfig;
     memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
@@ -204,11 +152,12 @@ START_TEST(SubscribeSingleFieldWithFixedOffsets) {
     retVal =  UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
                                        &readerGroupIdentifier);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
     /* Data Set Reader */
+    UA_UInt16 publisherIdentifier = 2234;
     UA_DataSetReaderConfig readerConfig;
     memset (&readerConfig, 0, sizeof (UA_DataSetReaderConfig));
     readerConfig.name = UA_STRING ("DataSetReader Test");
-    UA_UInt16 publisherIdentifier = 2234;
     readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
     readerConfig.publisherId.data = &publisherIdentifier;
     readerConfig.writerGroupId    = 100;
@@ -307,24 +256,28 @@ START_TEST(SubscribeSingleFieldWithFixedOffsets) {
 
     ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, readerGroupIdentifier));
 
-    UA_DataSetReader *dataSetReader = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
-    UA_ReaderGroup *readerGroup = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
-    receiveSingleMessageRT(connection, readerGroup, dataSetReader);
-   /* Read data received by the Subscriber */
-    UA_Variant *subscribedNodeData = UA_Variant_new();
-    retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 50002), subscribedNodeData);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    while(true) {
+        UA_fakeSleep(50);
+        UA_Server_run_iterate(server, false);
+
+        /* Read data received by the Subscriber */
+        UA_Variant *subscribedNodeData = UA_Variant_new();
+        retVal = UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 50002), subscribedNodeData);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-    ck_assert((*(UA_Int32 *)subscribedNodeData->data) == 1000);
-    UA_Variant_clear(subscribedNodeData);
-    UA_free(subscribedNodeData);
+        UA_Boolean eq = ((*(UA_Int32 *)subscribedNodeData->data) == 1000);
+        UA_Variant_clear(subscribedNodeData);
+        UA_free(subscribedNodeData);
+        if(eq)
+            break;
+    }
+    UA_DataValue_delete(dataValue);
     ck_assert(UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier) == UA_STATUSCODE_GOOD);
     ck_assert(UA_Server_unfreezeWriterGroupConfiguration(server, writerGroupIdent) == UA_STATUSCODE_GOOD);
-    UA_DataValue_delete(dataValue);
     UA_free(subValue);
     UA_free(subDataValueRT);
-
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_removePublishedDataSet(server, publishedDataSetIdent));
 } END_TEST
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 21ec532d18e..c528bd5cf5b 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -147,13 +147,12 @@ function unit_tests {
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
-          -DUA_ENABLE_PUBSUB_MQTT=ON \
+          -DUA_ENABLE_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
-          -DUA_ENABLE_PUBSUB_MQTT=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities
@@ -332,7 +331,7 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
-          -DUA_ENABLE_PUBSUB_MQTT=ON \
+          -DUA_ENABLE_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
@@ -363,7 +362,7 @@ function unit_tests_valgrind {
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_MQTT=ON \
+          -DUA_ENABLE_MQTT=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
@@ -396,7 +395,7 @@ function examples_valgrind {
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
-          -DUA_ENABLE_PUBSUB_MQTT=ON \
+          -DUA_ENABLE_MQTT=ON \
           -DUA_ENABLE_PUBSUB_FILE_CONFIG=ON \
           -DUA_NAMESPACE_ZERO=FULL \
           -DUA_ENABLE_NODESETLOADER=ON \

From 0b1d72f157c6a8f0c05aca56896b217c816e9827 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 13 Jun 2023 16:14:58 +0200
Subject: [PATCH 0980/1963] fix(client): Fix a memleak when the connection
 fails before opening a socket

---
 src/client/ua_client.c         | 2 ++
 src/client/ua_client_connect.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index e5fe32e2ede..b18d5d10a79 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -253,6 +253,8 @@ UA_Client_clear(UA_Client *client) {
     UA_Client_removeCallback(client, client->houseKeepingCallbackId);
     client->houseKeepingCallbackId = 0;
 
+    UA_SecureChannel_clear(&client->channel);
+
 #if UA_MULTITHREADING >= 100
     UA_LOCK_DESTROY(&client->clientMutex);
 #endif
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 63109f9e6e0..fa3dc7d05d7 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1542,7 +1542,7 @@ initConnect(UA_Client *client) {
     verifyClientApplicationURI(client);
 
     /* Initialize the SecureChannel */
-    UA_SecureChannel_init(&client->channel);
+    UA_SecureChannel_clear(&client->channel);
     client->channel.config = client->config.localConnectionConfig;
     client->channel.certificateVerification = &client->config.certificateVerification;
     client->channel.processOPNHeader = verifyClientSecurechannelHeader;

From 62ef586df6bec074ea42d6ebd9e4b3f9c99e6ef3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 13 Jun 2023 17:52:42 +0200
Subject: [PATCH 0981/1963] refactor(build): Simplify the Linux system
 detection

---
 CMakeLists.txt       | 6 +-----
 tests/CMakeLists.txt | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 395c2b376f1..180acd208f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,10 +101,6 @@ if("${UA_ARCHITECTURE}" STREQUAL "None")
     endif(UNIX)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  set(LINUX TRUE)
-endif()
-
 message(STATUS "The selected architecture is: ${UA_ARCHITECTURE}")
 string(TOUPPER ${UA_ARCHITECTURE} UA_ARCHITECTURE_UPPER)
 add_definitions(-DUA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
@@ -135,7 +131,7 @@ set(ua_architecture_sources ${ua_architecture_sources}
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
   )
 
-if(LINUX)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     list(APPEND ua_architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
 endif()
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 96220919c18..0774b0555e9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -78,7 +78,7 @@ set(test_plugin_sources
     ${PROJECT_SOURCE_DIR}/tests/testing-plugins/testing_networklayers.c
     )
 
-if(LINUX)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
 endif()
 
@@ -250,7 +250,8 @@ ua_add_test(check_eventloop.c)
 ua_add_test(check_eventloop_tcp.c)
 ua_add_test(check_eventloop_udp.c)
 ua_add_test(check_eventloop_interrupt.c)
-if(LINUX AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
     # Requires raw socket capability, currently not possible with valgrind
     ua_add_test(check_eventloop_eth.c)
 endif()

From d580fa6904b4e1f1816758f4349850ade5f9bc20 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 13 Jun 2023 17:54:18 +0200
Subject: [PATCH 0982/1963] refactor(build): Remove the UA_ENABLE_PUBSUB_MQTT
 option

MQTT is now enabled via UA_ENABLE_MQTT.
This can be used for the EventLoop independently from PubSub as well.
---
 CMakeLists.txt          | 81 ++---------------------------------------
 examples/CMakeLists.txt | 14 +++----
 tests/CMakeLists.txt    |  8 ++--
 3 files changed, 13 insertions(+), 90 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 180acd208f9..e0de64bc87f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -459,64 +459,6 @@ endif()
 option(UA_ENABLE_MQTT "Enable MQTT connections for the EventLoop" OFF)
 mark_as_advanced(UA_ENABLE_MQTT)
 
-option(UA_ENABLE_PUBSUB_MQTT "Enable publish/subscribe with mqtt (experimental)" OFF)
-mark_as_advanced(UA_ENABLE_PUBSUB_MQTT)
-if(UA_ENABLE_PUBSUB_MQTT)
-    if(UA_ENABLE_AMALGAMATION)
-        # MQTT Support currently not compatible with the amalgamation
-        message(FATAL_ERROR "Amalgamation cannot be generated with MQTT enabled")
-    endif()
-
-    include_directories("${open62541_MQTT_DIR}/include")
-    if(NOT UA_FILE_MQTT)
-        set(UA_FILE_MQTT ${open62541_MQTT_DIR}/src/mqtt.c)
-    endif()
-    if(NOT EXISTS "${UA_FILE_MQTT}")
-        message(STATUS "Submodule update")
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
-                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
-        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-            message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}")
-        endif()
-    endif()
-    # Warn if run in Windows
-    if(WIN32)
-        MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL")
-    endif()
-    if(NOT UA_ENABLE_PUBSUB)
-        message(FATAL_ERROR "Mqtt cannot be used with disabled PubSub function.")
-    endif()
-    configure_file(${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h "${PROJECT_BINARY_DIR}/src_generated/mqtt.h" COPYONLY)
-    configure_file(${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt_pal.h "${PROJECT_BINARY_DIR}/src_generated/mqtt_pal.h" COPYONLY)
-    configure_file(${PROJECT_SOURCE_DIR}/plugins/mqtt/templates/posix_sockets.h "${PROJECT_BINARY_DIR}/src_generated/posix_sockets.h" COPYONLY)
-endif()
-
-option(UA_ENABLE_MQTT_TLS_OPENSSL "Enable TLS support for publish/subscribe with mqtt (use OpenSSL)" OFF)
-mark_as_advanced(UA_ENABLE_MQTT_TLS_OPENSSL)
-option(UA_ENABLE_MQTT_TLS_MBEDTLS "Enable TLS support for publish/subscribe with mqtt (use MBEDTLS)" OFF)
-mark_as_advanced(UA_ENABLE_MQTT_TLS_MBEDTLS)
-
-option(UA_ENABLE_MQTT_TLS "Enable TLS support for publish/subscribe with mqtt" OFF)
-mark_as_advanced(UA_ENABLE_MQTT_TLS)
-if(UA_ENABLE_MQTT_TLS)
-    if(NOT UA_ENABLE_PUBSUB_MQTT)
-        message(FATAL_ERROR "Mqtt with TLS cannot be used without UA_ENABLE_PUBSUB_MQTT.")
-    endif()
-    if(NOT UA_ENABLE_ENCRYPTION)
-        message(FATAL_ERROR "Mqtt with TLS cannot be used without UA_ENABLE_ENCRYPTION.")
-    elseif(UA_ENABLE_ENCRYPTION STREQUAL "OPENSSL")
-        set(UA_ENABLE_MQTT_TLS_OPENSSL ON)
-        add_definitions(-DMQTT_USE_BIO)
-        configure_file(${PROJECT_SOURCE_DIR}/plugins/mqtt/templates/openssl_sockets.h "${PROJECT_BINARY_DIR}/src_generated/openssl_sockets.h" COPYONLY)
-    elseif(UA_ENABLE_ENCRYPTION STREQUAL "MBEDTLS")
-        set(UA_ENABLE_MQTT_TLS_MBEDTLS ON)
-        add_definitions(-DMQTT_USE_MBEDTLS)
-        configure_file(${PROJECT_SOURCE_DIR}/plugins/mqtt/templates/mbedtls_sockets.h "${PROJECT_BINARY_DIR}/src_generated/mbedtls_sockets.h" COPYONLY)
-    else()
-        message(FATAL_ERROR "UA_ENABLE_ENCRYPTION is set to an undefined value")
-    endif()
-endif()
-
 option(UA_ENABLE_STATUSCODE_DESCRIPTIONS "Enable conversion of StatusCode to human-readable error message" ON)
 mark_as_advanced(UA_ENABLE_STATUSCODE_DESCRIPTIONS)
 
@@ -651,12 +593,12 @@ include(linting_build)
 
 list(APPEND open62541_LIBRARIES "")
 
-if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_MQTT_TLS_OPENSSL)
+if(UA_ENABLE_ENCRYPTION_OPENSSL)
     # use the OpenSSL encryption library
     # https://cmake.org/cmake/help/v3.0/module/FindOpenSSL.html
     find_package(OpenSSL REQUIRED)
     list(APPEND open62541_LIBRARIES OpenSSL::Crypto OpenSSL::SSL)
-    endif ()
+endif()
 
 if(UA_ENABLE_ENCRYPTION_LIBRESSL)
     # See https://github.com/libressl-portable/portable/blob/master/FindLibreSSL.cmake
@@ -1194,21 +1136,6 @@ if(UA_ENABLE_PUBSUB)
             message("bpf library not found. XDP functionalities will not be available.")
         endif()
     endif()
-    if(UA_ENABLE_PUBSUB_MQTT)
-        if(WIN32)
-            MESSAGE(WARNING "Multithreading is enabled in MQTT plugin. This feature is under development and marked as EXPERIMENTAL")
-        else()
-            list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt_pal.h
-                 ${PROJECT_SOURCE_DIR}/deps/mqtt-c/include/mqtt.h
-                 ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_mqtt.h
-                 ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.h)
-            list(APPEND default_plugin_sources
-            #                 ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt_pal.c
-            #                 ${PROJECT_SOURCE_DIR}/deps/mqtt-c/src/mqtt.c
-                 ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_mqtt.c
-                 ${PROJECT_SOURCE_DIR}/plugins/mqtt/ua_mqtt-c_adapter.c)
-        endif()
-    endif()
     if(UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_PUBSUB_BUFMALLOC)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_bufmalloc.c)
         list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_bufmalloc.h)
@@ -1499,7 +1426,7 @@ if(UA_ENABLE_AMALGAMATION)
     if(UA_ENABLE_ENCRYPTION_MBEDTLS)
         target_include_directories(open62541-object PRIVATE ${MBEDTLS_INCLUDE_DIRS})
     endif()
-    if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_MQTT_TLS_OPENSSL)
+    if(UA_ENABLE_ENCRYPTION_OPENSSL)
         target_include_directories(open62541-object PRIVATE ${OPENSSL_INCLUDE_DIR})
     endif()
     if(UA_ENABLE_ENCRYPTION_LIBRESSL)
@@ -1601,7 +1528,7 @@ else()
     if(UA_ENABLE_ENCRYPTION_MBEDTLS)
         include_directories_private(${MBEDTLS_INCLUDE_DIRS})
     endif()
-    if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_MQTT_TLS_OPENSSL)
+    if(UA_ENABLE_ENCRYPTION_OPENSSL)
         include_directories_private(${OPENSSL_INCLUDE_DIR})
     endif()
     if(UA_ENABLE_ENCRYPTION_LIBRESSL)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2a7f8d5e9f9..24c877f5f3b 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -262,18 +262,16 @@ if(UA_ENABLE_PUBSUB)
         endif()
     endif()
 
-
-    if(UA_ENABLE_PUBSUB_MQTT)
-        if(NOT WIN32)
-            include_directories(${PROJECT_SOURCE_DIR}/../plugins)
-            add_example(tutorial_pubsub_mqtt_publish pubsub/tutorial_pubsub_mqtt_publish.c)
-            add_example(tutorial_pubsub_mqtt_subscribe pubsub/tutorial_pubsub_mqtt_subscribe.c)
-        endif()
+    if(UA_ENABLE_MQTT)
+        add_example(tutorial_pubsub_mqtt_publish pubsub/tutorial_pubsub_mqtt_publish.c)
+        add_example(tutorial_pubsub_mqtt_subscribe pubsub/tutorial_pubsub_mqtt_subscribe.c)
     endif()
+
     if(UA_ENABLE_PUBSUB_FILE_CONFIG)
         add_example(server_pubsub_file_configuration pubsub/server_pubsub_file_configuration.c)
     endif()
-    if (UA_ENABLE_PUBSUB_MONITORING)
+
+    if(UA_ENABLE_PUBSUB_MONITORING)
         if(CMAKE_SYSTEM MATCHES "Linux")
             add_example(server_pubsub_subscribe_custom_monitoring pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c)
         else(NOT (CMAKE_SYSTEM MATCHES "Linux"))
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0774b0555e9..c61a52d15f0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -373,11 +373,9 @@ if(UA_ENABLE_PUBSUB)
 
         endif()
     endif()
-    if(UA_ENABLE_PUBSUB_MQTT)
-        if(NOT WIN32)
-            ua_add_test(pubsub/check_pubsub_connection_mqtt.c)
-            ua_add_test(pubsub/check_pubsub_mqtt.c)
-        endif()
+    if(UA_ENABLE_MQTT)
+        ua_add_test(pubsub/check_pubsub_connection_mqtt.c)
+        ua_add_test(pubsub/check_pubsub_mqtt.c)
     endif()
     if(UA_ENABLE_PUBSUB_FILE_CONFIG)
         ua_add_test(pubsub/check_pubsub_configuration.c)

From 0841ce9f9572a23cc234638c2620c3b2648d3ab6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 13 Jun 2023 21:24:14 +0200
Subject: [PATCH 0983/1963] refactor(examples): Remove plugin/pubsub.h API from
 the examples

---
 examples/CMakeLists.txt                       |   1 -
 ...erver_pubsub_subscribe_custom_monitoring.c |  16 +-
 examples/pubsub/pubsub_publish_encrypted.c    |   5 +-
 .../pubsub/pubsub_publish_encrypted_tpm.c     |   9 +-
 .../pubsub_publish_encrypted_tpm_keystore.c   |   9 +-
 examples/pubsub/pubsub_subscribe_encrypted.c  |  18 +--
 .../pubsub/pubsub_subscribe_encrypted_tpm.c   |  14 +-
 .../pubsub_subscribe_encrypted_tpm_keystore.c |  17 +-
 examples/pubsub/pubsub_subscribe_standalone.c | 153 ------------------
 .../pubsub_subscribe_standalone_dataset.c     |  20 +--
 .../pubsub/server_pubsub_file_configuration.c |   2 +-
 examples/pubsub/server_pubsub_publisher_iop.c |  13 +-
 .../server_pubsub_publisher_on_demand.c       |  10 +-
 .../pubsub/server_pubsub_publisher_rt_level.c |   4 +-
 ...server_pubsub_rt_field_information_model.c |   3 +-
 .../server_pubsub_subscriber_rt_level.c       |  20 +--
 .../pubsub/sks/pubsub_publish_encrypted_sks.c |   4 +-
 .../sks/pubsub_subscribe_encrypted_sks.c      |  17 +-
 examples/pubsub/tutorial_pubsub_connection.c  |  13 +-
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   |   1 +
 examples/pubsub/tutorial_pubsub_publish.c     |  11 +-
 examples/pubsub/tutorial_pubsub_subscribe.c   |  34 +---
 .../nodeset/pubsub_nodeset_rt_publisher.c     |   6 -
 .../nodeset/pubsub_nodeset_rt_subscriber.c    |   3 -
 .../pubsub_realtime/pubsub_TSN_loopback.c     |  19 +--
 .../pubsub_TSN_loopback_single_thread.c       |  16 +-
 .../pubsub_realtime/pubsub_TSN_publisher.c    |  19 +--
 .../pubsub_TSN_publisher_multiple_thread.c    |  15 +-
 .../pubsub_interrupt_publish.c                |   3 -
 .../vxworks/pubsub_interrupt_publish_tsn.c    |   4 +-
 30 files changed, 30 insertions(+), 449 deletions(-)
 delete mode 100644 examples/pubsub/pubsub_subscribe_standalone.c

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 24c877f5f3b..2b5842683fa 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -228,7 +228,6 @@ if(UA_ENABLE_PUBSUB)
     if (BUILD_SHARED_LIBS)
         message(WARNING "Build option BUILD_SHARED_LIBS not supported for standalone subscriber and realtime examples. Skipping these examples.")
     else (NOT BUILD_SHARED_LIBS)
-        add_example(pubsub_subscribe_standalone pubsub/pubsub_subscribe_standalone.c)
         add_example(pubsub_subscribe_standalone_dataset pubsub/pubsub_subscribe_standalone_dataset.c)
         if(CMAKE_SYSTEM MATCHES "Linux")
             add_example(pubsub_TSN_publisher_multiple_thread pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c)
diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index 07d07f73686..7e01eadc58a 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -21,18 +21,13 @@
  */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
-#include <open62541/types_generated.h>
 
 #include "ua_pubsub.h"
 #include "../server/ua_server_internal.h"
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -438,15 +433,6 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, 4801, NULL);
 
-    /* Add the PubSub network layer implementation to the server config.
-     * The TransportLayer is acting as factory to create new connections
-     * on runtime. Details about the PubSubTransportLayer can be found inside the
-     * tutorial_pubsub_connection */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
     /* Provide a callback to get notifications of specific PubSub state changes or timeouts (e.g. subscriber MessageReceiveTimeout) */
     config->pubSubConfig.stateChangeCallback = pubsubStateChangeCallback;
 
diff --git a/examples/pubsub/pubsub_publish_encrypted.c b/examples/pubsub/pubsub_publish_encrypted.c
index 0992c1536d5..5049f2d1ac6 100644
--- a/examples/pubsub/pubsub_publish_encrypted.c
+++ b/examples/pubsub/pubsub_publish_encrypted.c
@@ -2,9 +2,8 @@
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/securitypolicy_default.h>
 
@@ -132,8 +131,6 @@ static int run(UA_String *transportProfile,
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
     addDataSetField(server);
diff --git a/examples/pubsub/pubsub_publish_encrypted_tpm.c b/examples/pubsub/pubsub_publish_encrypted_tpm.c
index 1c10f94047b..c4f42e6e5bd 100644
--- a/examples/pubsub/pubsub_publish_encrypted_tpm.c
+++ b/examples/pubsub/pubsub_publish_encrypted_tpm.c
@@ -5,9 +5,8 @@
           to run the application */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/securitypolicy_default.h>
 
@@ -152,12 +151,6 @@ static int run(UA_String *transportProfile,
     UA_PubSubSecurityPolicy_Aes128CtrTPM(config->pubSubConfig.securityPolicies, userpin, slotId,
                                          encryptionKeyLabel, signingKeyLabel, &config->logger);
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#else
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#endif
-
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
     addDataSetField(server);
diff --git a/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c b/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
index 4f0d5ff888f..d705ee06d75 100644
--- a/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
+++ b/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
@@ -8,9 +8,8 @@
          to run the application */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/securitypolicy_default.h>
 
@@ -157,12 +156,6 @@ static int run(UA_String *transportProfile,
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#else
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#endif
-
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
     addDataSetField(server);
diff --git a/examples/pubsub/pubsub_subscribe_encrypted.c b/examples/pubsub/pubsub_subscribe_encrypted.c
index 053f26992a9..02da6d00bc1 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted.c
@@ -5,19 +5,13 @@
  */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/types_generated.h>
 
 #include <open62541/plugin/securitypolicy_default.h>
 
-#include "ua_pubsub.h"
-
-#if defined (UA_ENABLE_PUBSUB_ETH_UADP)
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -30,7 +24,6 @@ UA_Byte signingKey[UA_AES128CTR_SIGNING_KEY_LENGTH] = {0};
 UA_Byte encryptingKey[UA_AES128CTR_KEY_LENGTH] = {0};
 UA_Byte keyNonce[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
 
-
 UA_NodeId connectionIdentifier;
 UA_NodeId readerGroupIdentifier;
 UA_NodeId readerIdentifier;
@@ -303,15 +296,6 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    /* Add the PubSub network layer implementation to the server config.
-     * The TransportLayer is acting as factory to create new connections
-     * on runtime. Details about the PubSubTransportLayer can be found inside the
-     * tutorial_pubsub_connection */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
     /* API calls */
     /* Add PubSubConnection */
     retval |= addPubSubConnection(server, transportProfile, networkAddressUrl);
diff --git a/examples/pubsub/pubsub_subscribe_encrypted_tpm.c b/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
index 873fe5a58c7..a4ce1c55df7 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
@@ -5,19 +5,13 @@
  */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/types_generated.h>
 
 #include <open62541/plugin/securitypolicy_default.h>
 
-#include "ua_pubsub.h"
-
-#if defined (UA_ENABLE_PUBSUB_ETH_UADP)
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -305,12 +299,6 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     UA_PubSubSecurityPolicy_Aes128CtrTPM(config->pubSubConfig.securityPolicies, userpin, slotId,
                                          encryptionKeyLabel, signingKeyLabel, &config->logger);
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#else
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#endif
-
     /* API calls */
     /* Add PubSubConnection */
     retval |= addPubSubConnection(server, transportProfile, networkAddressUrl);
diff --git a/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c b/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
index faac10af8b1..73d207c9375 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
@@ -8,20 +8,15 @@
           to run the application */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/types_generated.h>
 
 #include <open62541/plugin/securitypolicy_default.h>
 
-#include "ua_pubsub.h"
 #include "common.h"
 
-#if defined (UA_ENABLE_PUBSUB_ETH_UADP)
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -310,16 +305,6 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    /* Add the PubSub network layer implementation to the server config.
-     * The TransportLayer is acting as factory to create new connections
-     * on runtime. Details about the PubSubTransportLayer can be found inside the
-     * tutorial_pubsub_connection */
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#else
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#endif
-
     /* API calls */
     /* Add PubSubConnection */
     retval |= addPubSubConnection(server, transportProfile, networkAddressUrl);
diff --git a/examples/pubsub/pubsub_subscribe_standalone.c b/examples/pubsub/pubsub_subscribe_standalone.c
deleted file mode 100644
index ee607d5a41a..00000000000
--- a/examples/pubsub/pubsub_subscribe_standalone.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- */
-
-/**
- * IMPORTANT ANNOUNCEMENT
- * The PubSub subscriber API is currently not finished. This examples can be used to receive
- * and print the values, which are published by the tutorial_pubsub_publish example.
- * The following code uses internal API which will be later replaced by the higher-level
- * PubSub subscriber API.
- */
-
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub.h>
-#include <open62541/plugin/pubsub_udp.h>
-#include <open62541/server.h>
-#include <open62541/server_config_default.h>
-
-#include "ua_types_encoding_binary.h"
-#include "ua_pubsub_networkmessage.h"
-#include "ua_util_internal.h"
-#include "ua_pubsub.h"
-
-#include <signal.h>
-
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
-UA_Boolean running = true;
-static UA_StatusCode
-customDecodeAndProcessCallback(UA_PubSubChannel *psc, void* ctx, const UA_ByteString *buffer);
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "received ctrl-c");
-    running = false;
-}
-
-static UA_StatusCode
-subscriberListen(UA_PubSubChannel *psc) {
-    UA_ByteString buffer;
-    UA_StatusCode retval = UA_ByteString_allocBuffer(&buffer, 512);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "Message buffer allocation failed!");
-        return retval;
-    }
-
-    /* Receive the message. Blocks for 100ms */
-    UA_StatusCode rv = psc->receive(psc, NULL, customDecodeAndProcessCallback, NULL, 100);
-
-    UA_ByteString_clear(&buffer);
-    return rv;
-}
-static UA_StatusCode
-customDecodeAndProcessCallback(UA_PubSubChannel *psc, void *ctx, const UA_ByteString *buffer) {
-
-    /* Decode the message */
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                "Message length: %lu", (unsigned long) (*buffer).length);
-    UA_NetworkMessage networkMessage;
-    memset(&networkMessage, 0, sizeof(UA_NetworkMessage));
-    size_t currentPosition = 0;
-    UA_NetworkMessage_decodeBinary(buffer, &currentPosition, &networkMessage, NULL);
-
-    /* Is this the correct message type? */
-    if(networkMessage.networkMessageType != UA_NETWORKMESSAGE_DATASET)
-        goto cleanup;
-
-    /* At least one DataSetMessage in the NetworkMessage? */
-    if(networkMessage.payloadHeaderEnabled &&
-       networkMessage.payloadHeader.dataSetPayloadHeader.count < 1)
-        goto cleanup;
-
-    /* Is this a KeyFrame-DataSetMessage? */
-    for(size_t j = 0; j < networkMessage.payloadHeader.dataSetPayloadHeader.count; j++) {
-        UA_DataSetMessage *dsm = &networkMessage.payload.dataSetPayload.dataSetMessages[j];
-        if(dsm->header.dataSetMessageType != UA_DATASETMESSAGE_DATAKEYFRAME)
-            continue;
-        if(dsm->header.fieldEncoding == UA_FIELDENCODING_RAWDATA){
-            //The RAW-Encoded payload contains no fieldCount information
-            UA_DateTime dateTime;
-            size_t offset = 0;
-            UA_DateTime_decodeBinary(&dsm->data.keyFrameData.rawFields, &offset, &dateTime);
-            //UA_DateTime value = *(UA_DateTime *)dsm->data.keyFrameData.rawFields->data;
-            UA_DateTimeStruct receivedTime = UA_DateTime_toStruct(dateTime);
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                        "Message content: [DateTime] \t"
-                        "Received date: %02i-%02i-%02i Received time: %02i:%02i:%02i",
-                        receivedTime.year, receivedTime.month, receivedTime.day,
-                        receivedTime.hour, receivedTime.min, receivedTime.sec);
-        } else {
-            /* Loop over the fields and print well-known content types */
-            for(int i = 0; i < dsm->data.keyFrameData.fieldCount; i++) {
-                const UA_DataType *currentType = dsm->data.keyFrameData.dataSetFields[i].value.type;
-                if(currentType == &UA_TYPES[UA_TYPES_BYTE]) {
-                    UA_Byte value = *(UA_Byte *)dsm->data.keyFrameData.dataSetFields[i].value.data;
-                    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                                "Message content: [Byte] \tReceived data: %i", value);
-                } else if (currentType == &UA_TYPES[UA_TYPES_UINT32]) {
-                    UA_UInt32 value = *(UA_UInt32 *)dsm->data.keyFrameData.dataSetFields[i].value.data;
-                    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                                "Message content: [UInt32] \tReceived data: %u", value);
-                } else if (currentType == &UA_TYPES[UA_TYPES_DATETIME]) {
-                    UA_DateTime value = *(UA_DateTime *)dsm->data.keyFrameData.dataSetFields[i].value.data;
-                    UA_DateTimeStruct receivedTime = UA_DateTime_toStruct(value);
-                    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                                "Message content: [DateTime] \t"
-                                "Received date: %02i-%02i-%02i Received time: %02i:%02i:%02i",
-                                receivedTime.year, receivedTime.month, receivedTime.day,
-                                receivedTime.hour, receivedTime.min, receivedTime.sec);
-                }
-            }
-        }
-    }
-
-cleanup:
-    UA_NetworkMessage_clear(&networkMessage);
-    return UA_STATUSCODE_GOOD;
-}
-
-int main(int argc, char **argv) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
-    UA_PubSubTransportLayer udpLayer = UA_PubSubTransportLayerUDPMP();
-
-    UA_PubSubConnectionConfig connectionConfig;
-    memset(&connectionConfig, 0, sizeof(connectionConfig));
-    connectionConfig.name = UA_STRING("UADP Connection 1");
-    connectionConfig.transportProfileUri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.enabled = UA_TRUE;
-
-    UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
-    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
-                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-
-    UA_TransportLayerContext ctx;
-    ctx.connectionConfig = &connectionConfig;
-    UA_PubSubChannel *psc =
-        udpLayer.createPubSubChannel(&udpLayer, &ctx);
-    psc->regist(psc, NULL, NULL);
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    while(running && retval == UA_STATUSCODE_GOOD)
-        retval = subscriberListen(psc);
-
-    psc->close(psc);
-
-    return 0;
-}
diff --git a/examples/pubsub/pubsub_subscribe_standalone_dataset.c b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
index 959154f8f56..a7053f9aa38 100644
--- a/examples/pubsub/pubsub_subscribe_standalone_dataset.c
+++ b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
@@ -10,17 +10,10 @@
  */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
-#include "ua_pubsub.h"
-#include "../server/ua_server_internal.h"
-
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
 
 #include <signal.h>
 
@@ -92,7 +85,6 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
     /* Configuration creation for the connection */
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -102,8 +94,7 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     UA_Variant_setScalar(&connectionConfig.address, networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherId.uint32 = UA_UInt32_random();
-    retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
-    return retval;
+    return UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
 }
 
 /* Add ReaderGroup to the created connection */
@@ -171,13 +162,6 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
-    /* Details about the connection configuration and handling are located in
-     * the pubsub connection tutorial */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-    #ifdef UA_ENABLE_PUBSUB_ETH_UADP
-        UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-    #endif
-
     addTargetVariable(server);
     addStandaloneSubscribedDataSet(server);
 
diff --git a/examples/pubsub/server_pubsub_file_configuration.c b/examples/pubsub/server_pubsub_file_configuration.c
index 3f6e4d4897a..9c171a9bb83 100644
--- a/examples/pubsub/server_pubsub_file_configuration.c
+++ b/examples/pubsub/server_pubsub_file_configuration.c
@@ -3,8 +3,8 @@
 
 /* Includes */
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
 #include "ua_pubsub.h"
diff --git a/examples/pubsub/server_pubsub_publisher_iop.c b/examples/pubsub/server_pubsub_publisher_iop.c
index 452ccf17e79..1fd4cc74e74 100644
--- a/examples/pubsub/server_pubsub_publisher_iop.c
+++ b/examples/pubsub/server_pubsub_publisher_iop.c
@@ -2,11 +2,7 @@
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-#include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
 #include <signal.h>
@@ -746,13 +742,6 @@ static int run(UA_String *transportProfile,
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, 4802, NULL);
 
-    /* Details about the connection configuration and handling are located in
-    * the pubsub connection tutorial */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
     addPubSubConnection(server, transportProfile, networkAddressUrl);
 
     /* Create a PublishedDataSet based on a PublishedDataSetConfig. */
diff --git a/examples/pubsub/server_pubsub_publisher_on_demand.c b/examples/pubsub/server_pubsub_publisher_on_demand.c
index 597044d6bb2..1954b431234 100644
--- a/examples/pubsub/server_pubsub_publisher_on_demand.c
+++ b/examples/pubsub/server_pubsub_publisher_on_demand.c
@@ -25,9 +25,8 @@
  */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
 #include <signal.h>
@@ -184,13 +183,6 @@ static int run(UA_String *transportProfile,
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
-    /* Details about the connection configuration and handling are located in
-     * the pubsub connection tutorial */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
     addDataSetField(server);
diff --git a/examples/pubsub/server_pubsub_publisher_rt_level.c b/examples/pubsub/server_pubsub_publisher_rt_level.c
index ff19ab5a358..aedd27f8a3f 100644
--- a/examples/pubsub/server_pubsub_publisher_rt_level.c
+++ b/examples/pubsub/server_pubsub_publisher_rt_level.c
@@ -2,13 +2,12 @@
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
 #include <signal.h>
 #include <stdlib.h>
-#include <open62541/server_pubsub.h>
 
 /* possible options: PUBSUB_CONFIG_FASTPATH_NONE, PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS, PUBSUB_CONFIG_FASTPATH_STATIC_VALUES */
 #define PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS
@@ -100,7 +99,6 @@ int main(void) {
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     /*Add standard PubSub configuration (no difference to the std. configuration)*/
     addMinimalPubSubConfiguration(server);
diff --git a/examples/pubsub/server_pubsub_rt_field_information_model.c b/examples/pubsub/server_pubsub_rt_field_information_model.c
index 9e57dedae98..9c057b9cbf7 100644
--- a/examples/pubsub/server_pubsub_rt_field_information_model.c
+++ b/examples/pubsub/server_pubsub_rt_field_information_model.c
@@ -2,10 +2,10 @@
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/plugin/log.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server_config_default.h>
-#include <open62541/plugin/pubsub_udp.h>
 
 #include <signal.h>
 
@@ -122,7 +122,6 @@ int main(void){
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     addMinimalPubSubConfiguration(server);
 
diff --git a/examples/pubsub/server_pubsub_subscriber_rt_level.c b/examples/pubsub/server_pubsub_subscriber_rt_level.c
index fbc5fffe239..487193d5434 100644
--- a/examples/pubsub/server_pubsub_subscriber_rt_level.c
+++ b/examples/pubsub/server_pubsub_subscriber_rt_level.c
@@ -1,24 +1,12 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
-/**
- * IMPORTANT ANNOUNCEMENT
- * The PubSub Subscriber API is currently not finished. This example can be used
- * to receive and display values that are published by tutorial_pubsub_publish
- * example in the TargetVariables of Subscriber Information Model .
- */
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/types_generated.h>
 
-#include "ua_pubsub.h"
-
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -356,12 +344,6 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, 4801, NULL);
 
-    /* Add the PubSub network layer implementation to the server config.
-     * The TransportLayer is acting as factory to create new connections
-     * on runtime. Details about the PubSubTransportLayer can be found inside the
-     * tutorial_pubsub_connection */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-
     /* API calls */
     /* Add PubSubConnection */
     retval |= addPubSubConnection(server, transportProfile, networkAddressUrl);
diff --git a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
index c39faf8153e..9bf766f1acb 100644
--- a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
+++ b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
@@ -8,10 +8,9 @@
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
 #include <signal.h>
@@ -155,7 +154,6 @@ run(UA_UInt16 port, UA_String *transportProfile,
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
     addDataSetField(server);
diff --git a/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c b/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
index 8897a92e63d..ef0b2c3c11f 100644
--- a/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
+++ b/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
@@ -7,17 +7,13 @@
 
 #include <open62541/client_config_default.h>
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
-#include <open62541/types_generated.h>
+#include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 
 #include "common.h"
 
-#if defined(UA_ENABLE_PUBSUB_ETH_UADP)
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -303,15 +299,6 @@ run(UA_UInt16 port, UA_String *transportProfile,
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
                                       &config->logger);
 
-    /* Add the PubSub network layer implementation to the server config.
-     * The TransportLayer is acting as factory to create new connections
-     * on runtime. Details about the PubSubTransportLayer can be found inside the
-     * tutorial_pubsub_connection */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
     /* API calls */
     /* Add PubSubConnection */
     retval |= addPubSubConnection(server, transportProfile, networkAddressUrl);
diff --git a/examples/pubsub/tutorial_pubsub_connection.c b/examples/pubsub/tutorial_pubsub_connection.c
index 8d8c997dd71..44e5c623306 100644
--- a/examples/pubsub/tutorial_pubsub_connection.c
+++ b/examples/pubsub/tutorial_pubsub_connection.c
@@ -3,8 +3,8 @@
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 
 /**
  * The PubSub connection example demonstrate the PubSub TransportLayer configuration and
@@ -12,17 +12,6 @@
  */
 int main(void) {
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* Add the PubSubTransportLayer implementation to the server config.
-     * The PubSubTransportLayer is a factory to create new connections
-     * on runtime. The UA_PubSubTransportLayer is used for all kinds of
-     * concrete connections e.g. UDP, MQTT, AMQP...
-     *
-     * It is possible to use multiple PubSubTransportLayers on runtime. The
-     * correct factory is selected on runtime by the standard defined PubSub
-     * TransportProfileUri's. */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     /* Create a new ConnectionConfig. The addPubSubConnection function takes the
      * config and create a new connection. The Connection identifier is
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index aa9eb2e9799..6484cfbafa7 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -6,6 +6,7 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/plugin/securitypolicy_default.h>
 
 #define CONNECTION_NAME               "MQTT Subscriber Connection"
diff --git a/examples/pubsub/tutorial_pubsub_publish.c b/examples/pubsub/tutorial_pubsub_publish.c
index fc191310c52..7b70e326523 100644
--- a/examples/pubsub/tutorial_pubsub_publish.c
+++ b/examples/pubsub/tutorial_pubsub_publish.c
@@ -25,9 +25,8 @@
  */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 
 UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent;
 
@@ -165,14 +164,6 @@ addDataSetWriter(UA_Server *server) {
 static int run(UA_String *transportProfile,
                UA_NetworkAddressUrlDataType *networkAddressUrl) {
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* Details about the connection configuration and handling are located in
-     * the pubsub connection tutorial */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
 
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
diff --git a/examples/pubsub/tutorial_pubsub_subscribe.c b/examples/pubsub/tutorial_pubsub_subscribe.c
index 881de73eb89..138c680343b 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe.c
@@ -7,36 +7,16 @@
 /**
  * .. _pubsub-subscribe-tutorial:
  *
- * **IMPORTANT ANNOUNCEMENT**
- *
- * The PubSub Subscriber API is currently not finished. This Tutorial will be
- * continuously extended during the next PubSub batches. More details about the
- * PubSub extension and corresponding open62541 API are located here: :ref:`pubsub`.
- *
  * Subscribing Fields
  * ^^^^^^^^^^^^^^^^^^
  * The PubSub subscribe example demonstrates the simplest way to receive
  * information over two transport layers such as UDP and Ethernet, that are
  * published by tutorial_pubsub_publish example and update values in the
- * TargetVariables of Subscriber Information Model.
- *
- * Run step of the application is as mentioned below:
- *
- * ./bin/examples/tutorial_pubsub_subscribe
- *
- * **Connection handling**
- *
- * PubSubConnections can be created and deleted on runtime. More details about
- * the system preconfiguration and connection can be found in
- * ``tutorial_pubsub_connection.c``. */
+ * TargetVariables of Subscriber Information Model. */
 
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
-
-#if defined (UA_ENABLE_PUBSUB_ETH_UADP)
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
+#include <open62541/server_pubsub.h>
 
 #include <stdio.h>
 
@@ -274,16 +254,6 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     /* Return value initialized to Status Good */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* Add the PubSub network layer implementation to the server config.
-     * The TransportLayer is acting as factory to create new connections
-     * on runtime. Details about the PubSubTransportLayer can be found inside the
-     * tutorial_pubsub_connection */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
 
     /* API calls */
     /* Add PubSubConnection */
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
index e9e545eee3c..9a96f6c3982 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
@@ -34,7 +34,6 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/types_generated.h>
-#include <open62541/plugin/pubsub_ethernet.h>
 
 #include "ua_pubsub.h"
 #include "open62541/namespace_example_publisher_generated.h"
@@ -678,11 +677,6 @@ int main(int argc, char **argv) {
     networkAddressUrlPub.networkInterface = UA_STRING(interface);
     networkAddressUrlPub.url              = UA_STRING(PUBLISHING_MAC_ADDRESS);
 
-    /* It is possible to use multiple PubSubTransportLayers on runtime.
-     * The correct factory is selected on runtime by the standard defined
-     * PubSub TransportProfileUri's. */
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-
     addPubSubConnection(server, &networkAddressUrlPub);
     addPublishedDataSet(server);
     _addDataSetField(server);
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
index 5fba8a8eaa7..b3083b80895 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
@@ -35,7 +35,6 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/types_generated.h>
-#include <open62541/plugin/pubsub_ethernet.h>
 
 #include "ua_pubsub.h"
 #include "open62541/namespace_example_subscriber_generated.h"
@@ -642,8 +641,6 @@ int main(int argc, char **argv) {
     networkAddressUrlSub.networkInterface = UA_STRING(interface);
     networkAddressUrlSub.url              = UA_STRING(SUBSCRIBING_MAC_ADDRESS);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-
     addPubSubConnectionSubscriber(server, &networkAddressUrlSub);
     addReaderGroup(server);
     addDataSetReader(server);
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index 644cbfebc0b..c2590fb3aa7 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -83,11 +83,11 @@
 #include <pthread.h>
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/log.h>
 #include <open62541/types_generated.h>
-#include <open62541/plugin/pubsub_ethernet.h>
 
 #include <open62541/plugin/securitypolicy_default.h>
 #include <linux/if_link.h>
@@ -1146,8 +1146,7 @@ void *subscriber(void *arg) {
         /* The Subscriber threads wakes up at the configured subscriber wake up
          * percentage (0%) of each cycle */
         clock_nanosleep(CLOCKID, TIMER_ABSTIME, &nextnanosleeptimeSub, NULL);
-        /* Receive and process the incoming data using the subcallback -
-         *  UA_ReaderGroup_subscribeCallback() */
+        /* Receive and process the incoming data */
         subCallback(server, currentReaderGroup);
         /* Calculation of the next wake up time by adding the interval with the
          * previous wake up time */
@@ -1669,13 +1668,6 @@ if(enableCsvLog)
     fpSubscriber = fopen(fileSubscribedData, "w");
 #endif
 
-/* It is possible to use multiple PubSubTransportLayers on runtime.
- * The correct factory is selected on runtime by the standard defined
- * PubSub TransportProfileUri's. */
-#if defined (PUBLISHER)
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
     /* Server is the new OPCUA model which has both publisher and subscriber
      * configuration. Add axis node and OPCUA pubsub client server counter
      * nodes. */
@@ -1694,13 +1686,6 @@ if(enableCsvLog)
     UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
                                       &config->logger);
 #endif
-#if defined (PUBLISHER) && defined(SUBSCRIBER)
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
-#if defined(SUBSCRIBER) && !defined(PUBLISHER)
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
 
 #if defined(SUBSCRIBER)
     addPubSubConnectionSubscriber(server, &networkAddressUrlSub);
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index d306cc99caf..9aafd30ced7 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -60,12 +60,11 @@
 #include <pthread.h>
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/log.h>
 #include <open62541/types_generated.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
 
 #include "ua_pubsub.h"
 
@@ -1311,13 +1310,8 @@ int main(int argc, char **argv) {
 #ifdef TWO_WAY_COMMUNICATION
     if (enableCsvLog)
         fpPublisher                   = fopen(filePublishedData, "w");
-
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#else
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#endif
 #endif
+
     /* Initialize arguments required for the thread to run */
     threadArgPubSub1 = (threadArgPubSub *) UA_malloc(sizeof(threadArgPubSub));
 
@@ -1335,12 +1329,6 @@ int main(int argc, char **argv) {
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#else
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#endif
-
     addPubSubConnectionSubscriber(server, &transportProfile, &networkAddressUrlSub);
     addReaderGroup(server);
     addDataSetReader(server);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index 917b543dfde..57e5dcb25ab 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -89,7 +89,6 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/log.h>
 #include <open62541/types_generated.h>
-#include <open62541/plugin/pubsub_ethernet.h>
 
 #include <open62541/plugin/securitypolicy_default.h>
 
@@ -1123,7 +1122,7 @@ void *subscriber(void *arg) {
     while(*runningSub) {
         /* The Subscriber threads wakes up at the configured subscriber wake up percentage (0%) of each cycle */
         clock_nanosleep(CLOCKID, TIMER_ABSTIME, &nextnanosleeptimeSub, NULL);
-        /* Receive and process the incoming data using the subcallback - UA_ReaderGroup_subscribeCallback() */
+        /* Receive and process the incoming data */
         subCallback(server, currentReaderGroup);
         /* Calculation of the next wake up time by adding the interval with the previous wake up time */
         nextnanosleeptimeSub.tv_nsec += (__syscall_slong_t)subInterval_ns;
@@ -1740,14 +1739,6 @@ int main(int argc, char **argv) {
 #endif
     }
 
-    /* It is possible to use multiple PubSubTransportLayers on runtime.
-     * The correct factory is selected on runtime by the standard defined
-     * PubSub TransportProfileUri's. */
-
-#if defined (PUBLISHER)
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
     /* Create variable nodes for publisher and subscriber in address space */
     addServerNodes(server);
 
@@ -1765,14 +1756,6 @@ int main(int argc, char **argv) {
                                       &config->logger);
 #endif
 
-#if defined (PUBLISHER) && defined(SUBSCRIBER)
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
-#if defined(SUBSCRIBER) && !defined(PUBLISHER)
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#endif
-
 #if defined(SUBSCRIBER)
     addPubSubConnectionSubscriber(server, &networkAddressUrlSub);
     addReaderGroup(server);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index f0ed9fcc2db..43a66648d0a 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -63,12 +63,11 @@
 #include <pthread.h>
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/log.h>
 #include <open62541/types_generated.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-#include <open62541/plugin/pubsub_udp.h>
 
 #include "ua_pubsub.h"
 
@@ -1402,12 +1401,6 @@ int main(int argc, char **argv) {
         fpSubscriber                  = fopen(fileSubscribedData, "w");
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#else
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#endif
-
     /* Initialize arguments required for the thread to run */
     threadArgPubSub1 = (threadArgPubSub *) UA_malloc(sizeof(threadArgPubSub));
 
@@ -1423,12 +1416,6 @@ int main(int argc, char **argv) {
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
 #ifdef TWO_WAY_COMMUNICATION
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-#else
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-#endif
-
     addPubSubConnectionSubscriber(server, &transportProfile, &networkAddressUrlSub);
     addReaderGroup(server);
     addDataSetReader(server);
diff --git a/examples/pubsub_realtime/pubsub_interrupt_publish.c b/examples/pubsub_realtime/pubsub_interrupt_publish.c
index 27f222a303b..a311046b52a 100644
--- a/examples/pubsub_realtime/pubsub_interrupt_publish.c
+++ b/examples/pubsub_realtime/pubsub_interrupt_publish.c
@@ -20,7 +20,6 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server_pubsub.h>
-#include <open62541/plugin/pubsub_ethernet.h>
 
 #define ETH_PUBLISH_ADDRESS      "opc.eth://0a-00-27-00-00-08"
 #define ETH_INTERFACE            "enp0s8"
@@ -363,8 +362,6 @@ int main(void) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-
     addServerNodes(server);
     addPubSubConfiguration(server);
 
diff --git a/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c b/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c
index 31149722016..9bc1f4ce1d2 100644
--- a/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c
+++ b/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c
@@ -19,9 +19,9 @@
 #include <tsnConfigLib.h>
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
 
 #define ETH_PUBLISH_ADDRESS     "opc.eth://01-00-5E-00-00-01"
 #define MILLI_AS_NANO_SECONDS   (1000 * 1000)
@@ -445,8 +445,6 @@ static void open62541ServerTask(void) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
 	
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
-
     addServerNodes(server);
     addPubSubConfiguration(server);
 

From 0051c28a2531bdb5c485182149d0ce4f9295c646 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 13 Jun 2023 21:31:23 +0200
Subject: [PATCH 0984/1963] refactor(test): Remove plugin/pubsub.h API from
 unit tests

---
 tests/CMakeLists.txt                          |  15 +-
 tests/pubsub/check_pubsub_config_freeze.c     |   2 -
 tests/pubsub/check_pubsub_configuration.c     |   6 +-
 .../pubsub/check_pubsub_connection_ethernet.c |   8 +-
 .../check_pubsub_connection_ethernet_etf.c    |   2 -
 tests/pubsub/check_pubsub_connection_mqtt.c   |  22 +-
 tests/pubsub/check_pubsub_connection_udp.c    |   2 -
 tests/pubsub/check_pubsub_connection_xdp.c    |  57 ++--
 tests/pubsub/check_pubsub_decryption.c        |   2 -
 .../pubsub/check_pubsub_encrypted_rt_levels.c |   2 -
 tests/pubsub/check_pubsub_encryption.c        |   2 -
 tests/pubsub/check_pubsub_encryption_aes256.c |   2 -
 tests/pubsub/check_pubsub_get_state.c         |   9 +-
 tests/pubsub/check_pubsub_informationmodel.c  |   3 -
 .../check_pubsub_informationmodel_methods.c   |   2 -
 tests/pubsub/check_pubsub_mqtt.c              |   6 +-
 tests/pubsub/check_pubsub_multiple_layer.c    |  57 ----
 ...heck_pubsub_multiple_subscribe_rt_levels.c |   3 +-
 tests/pubsub/check_pubsub_pds.c               |   2 -
 tests/pubsub/check_pubsub_publish.c           |   2 -
 tests/pubsub/check_pubsub_publish_ethernet.c  |  20 +-
 .../check_pubsub_publish_ethernet_etf.c       |  76 ++---
 tests/pubsub/check_pubsub_publish_json.c      |   9 +-
 tests/pubsub/check_pubsub_publish_rt_levels.c |   2 -
 tests/pubsub/check_pubsub_publish_uadp.c      | 290 ------------------
 tests/pubsub/check_pubsub_publisherid.c       |   3 -
 tests/pubsub/check_pubsub_publishspeed.c      |   7 +-
 tests/pubsub/check_pubsub_sks_client.c        |   5 -
 tests/pubsub/check_pubsub_sks_keystorage.c    |   2 -
 tests/pubsub/check_pubsub_sks_pull.c          |   3 -
 tests/pubsub/check_pubsub_sks_push.c          |   3 -
 .../pubsub/check_pubsub_sks_securitygroups.c  |   1 -
 tests/pubsub/check_pubsub_subscribe.c         |   6 +-
 .../check_pubsub_subscribe_config_freeze.c    |   7 +-
 .../pubsub/check_pubsub_subscribe_encrypted.c |   2 -
 .../check_pubsub_subscribe_msgrcvtimeout.c    |   2 -
 .../pubsub/check_pubsub_subscribe_rt_levels.c |   4 +-
 tests/pubsub/check_pubsub_udp_unicast.c       |   6 +-
 tools/appveyor/build.ps1                      |   2 +-
 39 files changed, 117 insertions(+), 539 deletions(-)
 delete mode 100644 tests/pubsub/check_pubsub_multiple_layer.c
 delete mode 100644 tests/pubsub/check_pubsub_publish_uadp.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c61a52d15f0..62cdb6512c5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -127,17 +127,8 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
 endif()
 
 if(UA_ENABLE_PUBSUB)
-  list(APPEND test_plugin_sources
-       ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp_multicast.c)
-  list(APPEND test_plugin_sources
-       ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
-    if(UA_ENABLE_PUBSUB_ETH_UADP)
-        list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet.h)
-        list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet.c)
-
-        # Add ethernet_config.h to ensure the tests are rebuild when it changes
-        list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/tests/pubsub/ethernet_config.h)
-    endif()
+    # Add ethernet_config.h to ensure the tests are rebuild when it changes
+    list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/tests/pubsub/ethernet_config.h)
 endif()
 
 if(UA_ENABLE_NODESETLOADER)
@@ -320,7 +311,6 @@ if(UA_ENABLE_PUBSUB)
     ua_add_test(pubsub/check_pubsub_pds.c)
     ua_add_test(pubsub/check_pubsub_connection_udp.c)
     ua_add_test(pubsub/check_pubsub_publish.c)
-    ua_add_test(pubsub/check_pubsub_publish_uadp.c)
     ua_add_test(pubsub/check_pubsub_get_state.c)
     ua_add_test(pubsub/check_pubsub_udp_unicast.c)
     ua_add_test(pubsub/check_pubsub_publisherid.c)
@@ -333,7 +323,6 @@ if(UA_ENABLE_PUBSUB)
     ua_add_test(pubsub/check_pubsub_subscribe_config_freeze.c)
     ua_add_test(pubsub/check_pubsub_subscribe_rt_levels.c)
     ua_add_test(pubsub/check_pubsub_multiple_subscribe_rt_levels.c)
-    ua_add_test(pubsub/check_pubsub_multiple_layer.c)
 
     if(UA_ENABLE_PUBSUB_ENCRYPTION)
         ua_add_test(pubsub/check_pubsub_encryption.c)
diff --git a/tests/pubsub/check_pubsub_config_freeze.c b/tests/pubsub/check_pubsub_config_freeze.c
index d7de476b2da..8e83fc2a2f1 100644
--- a/tests/pubsub/check_pubsub_config_freeze.c
+++ b/tests/pubsub/check_pubsub_config_freeze.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2019 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
@@ -22,7 +21,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_configuration.c b/tests/pubsub/check_pubsub_configuration.c
index 9371e5cbc1c..084050edd5e 100644
--- a/tests/pubsub/check_pubsub_configuration.c
+++ b/tests/pubsub/check_pubsub_configuration.c
@@ -5,13 +5,11 @@
  * Copyright (c) 2020 Siemens AG (Author: Thomas Fischer)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include "../common.h"
 
 #include "ua_pubsub.h"
-#include "pubsub/ua_pubsub_config.h"
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -47,7 +45,7 @@ START_TEST(AddPublisherUsingBinaryFile) {
     TAILQ_FOREACH(connection, &server->pubSubManager.connections, listEntry) {
         connectionCount++;
         tmp = UA_STRING("UADP Connection 1");
-        ck_assert(UA_String_equal(&tmp, &connection->config->name));
+        ck_assert(UA_String_equal(&tmp, &connection->config.name));
         LIST_FOREACH(writerGroup, &connection->writerGroups, listEntry){
             writerGroupCount++;
             tmp = UA_STRING("Demo WriterGroup");
@@ -80,7 +78,7 @@ START_TEST(AddSubscriberUsingBinaryFile) {
     TAILQ_FOREACH(connection, &server->pubSubManager.connections, listEntry) {
         connectionCount++;
         tmp = UA_STRING("UDPMC Connection 1");
-        ck_assert(UA_String_equal(&tmp, &connection->config->name));
+        ck_assert(UA_String_equal(&tmp, &connection->config.name));
         LIST_FOREACH(readerGroup, &connection->readerGroups, listEntry){
             readerGroupCount++;
             tmp = UA_STRING("ReaderGroup1");
diff --git a/tests/pubsub/check_pubsub_connection_ethernet.c b/tests/pubsub/check_pubsub_connection_ethernet.c
index 015b2eb865e..7ebed089592 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet.c
@@ -6,17 +6,14 @@
  */
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
-#include <ua_server_internal.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/plugin/log.h>
 #include <open62541/types_generated.h>
-#include <open62541/plugin/pubsub_ethernet.h>
 
 #include "ua_pubsub.h"
-
-#include <linux/if_packet.h>
-#include <netinet/ether.h>
+#include "ua_server_internal.h"
 
 #include <check.h>
 
@@ -30,7 +27,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
     UA_Server_run_startup(server);
 
 }
diff --git a/tests/pubsub/check_pubsub_connection_ethernet_etf.c b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
index ab45ad2a062..ff71a42f28f 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  */
 
-#include <open62541/plugin/pubsub_ethernet.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <check.h>
@@ -28,7 +27,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index 21ed9bd6ec8..b06748fc389 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -79,7 +79,9 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
-START_TEST(AddConnectionWithInvalidAddress){
+START_TEST(AddConnectionWithInvalidAddress) {
+    /* This succeeds as the connection is only actually connected when there
+     * is a Reader/WriterGroup */
     UA_StatusCode retVal;
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -89,13 +91,15 @@ START_TEST(AddConnectionWithInvalidAddress){
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-invalid");
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
+
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
-    ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
+
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 2);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(AddConnectionWithUnknownTransportURL){
@@ -140,7 +144,8 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     UA_PubSubConnectionConfig connectionConf;
     memset(&connectionConf, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConf.name = UA_STRING("MQTT Connection");
-    connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
+    connectionConf.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
@@ -173,7 +178,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     UA_PubSubConnectionConfig connectionConf;
     memset(&connectionConf, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConf.name = UA_STRING("MQTT Connection");
-    connectionConf.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
+    connectionConf.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
diff --git a/tests/pubsub/check_pubsub_connection_udp.c b/tests/pubsub/check_pubsub_connection_udp.c
index 7f799faaf27..2acbd091c03 100644
--- a/tests/pubsub/check_pubsub_connection_udp.c
+++ b/tests/pubsub/check_pubsub_connection_udp.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2021 Linutronix GmbH (Author: Kurt Kanzenbach)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
@@ -21,7 +20,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_connection_xdp.c b/tests/pubsub/check_pubsub_connection_xdp.c
index 4b8b47c33d9..3f5d34e2d49 100644
--- a/tests/pubsub/check_pubsub_connection_xdp.c
+++ b/tests/pubsub/check_pubsub_connection_xdp.c
@@ -6,9 +6,9 @@
  */
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 #include <open62541/types_generated.h>
-#include <open62541/plugin/pubsub_ethernet.h>
 
 #include "ua_server_internal.h"
 #include "ua_pubsub.h"
@@ -38,8 +38,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
     UA_Server_run_startup(server);
 }
 
@@ -74,19 +72,18 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
     connectionOptions[2].key = UA_QUALIFIEDNAME(0, "hwreceivequeue");
     UA_UInt32 rxqueue = RECEIVE_QUEUE_2;
     UA_Variant_setScalar(&connectionOptions[2].value, &rxqueue, &UA_TYPES[UA_TYPES_UINT32]);
-    connectionConfig.connectionProperties = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 3;
+    connectionConfig.connectionProperties.mapSize = 3;
+    connectionConfig.connectionProperties.map = connectionOptions;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     rxqueue = RECEIVE_QUEUE_1;
     UA_Variant_setScalar(&connectionOptions[1].value, &rxqueue, &UA_TYPES[UA_TYPES_UINT32]);
-    connectionConfig.connectionProperties = connectionOptions;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 2);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 2);
 } END_TEST
 
 
@@ -101,14 +98,14 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
         UA_NodeId connectionIdent;
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
         retVal |= UA_Server_removePubSubConnection(server, connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
         ck_assert(&server->pubSubManager.connections.tqh_first->listEntry.tqe_next != NULL);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
@@ -133,15 +130,15 @@ START_TEST(AddConnectionsWithInvalidConfiguration){
     connectionOptions[2].key = UA_QUALIFIEDNAME(0, "hwreceivequeue");
     UA_UInt32 rxqueue = RECEIVE_QUEUE_2;
     UA_Variant_setScalar(&connectionOptions[2].value, &rxqueue, &UA_TYPES[UA_TYPES_UINT32]);
-    connectionConfig.connectionProperties = connectionOptions;
-    connectionConfig.connectionPropertiesSize = 3;
+    connectionConfig.connectionProperties.map = connectionOptions;
+    connectionConfig.connectionProperties.mapSize = 3;
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
 } END_TEST
 
 START_TEST(AddConnectionWithInvalidAddress){
@@ -154,11 +151,11 @@ START_TEST(AddConnectionWithInvalidAddress){
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithInvalidInterface){
@@ -171,11 +168,11 @@ START_TEST(AddConnectionWithInvalidInterface){
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     retVal = UA_Server_addPubSubConnection(server, &connectionConfig, NULL);
     ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
 } END_TEST
 
 START_TEST(AddConnectionWithUnknownTransportURL){
@@ -189,14 +186,14 @@ START_TEST(AddConnectionWithUnknownTransportURL){
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/unknown-eth-uadp");
         UA_NodeId connectionIdent;
         retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(AddConnectionWithNullConfig){
         UA_StatusCode retVal;
         retVal = UA_Server_addPubSubConnection(server, NULL, NULL);
-        ck_assert_int_eq(server->pubSubManager.connectionsSize, 0);
+        ck_assert_uint_eq(server->pubSubManager.connectionsSize, 0);
         ck_assert_int_ne(retVal, UA_STATUSCODE_GOOD);
     } END_TEST
 
@@ -225,12 +222,12 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
-    connectionConf.connectionPropertiesSize = 4;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 4;
+    connectionConf.connectionProperties.map = connectionOptions;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
-    ck_assert_int_eq(server->pubSubManager.connectionsSize, 1);
+    ck_assert_uint_eq(server->pubSubManager.connectionsSize, 1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert(! TAILQ_EMPTY(&server->pubSubManager.connections));
 } END_TEST
@@ -263,8 +260,8 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     connectionConf.enabled = true;
     connectionConf.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConf.publisherId.uint32 = 223344;
-    connectionConf.connectionPropertiesSize = 5;
-    connectionConf.connectionProperties = connectionOptions;
+    connectionConf.connectionProperties.mapSize = 5;
+    connectionConf.connectionProperties.map = connectionOptions;
     connectionConf.address = address;
     UA_NodeId connection;
     UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConf, &connection);
@@ -273,15 +270,15 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     retVal |= UA_Server_getPubSubConnectionConfig(server, connection, &connectionConfig);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    ck_assert(connectionConfig.connectionPropertiesSize == connectionConf.connectionPropertiesSize);
+    ck_assert(connectionConfig.connectionProperties.mapSize == connectionConf.connectionProperties.mapSize);
     ck_assert(UA_String_equal(&connectionConfig.name, &connectionConf.name) == UA_TRUE);
     ck_assert(UA_String_equal(&connectionConfig.transportProfileUri, &connectionConf.transportProfileUri) == UA_TRUE);
     UA_NetworkAddressUrlDataType networkAddressUrlDataCopy = *((UA_NetworkAddressUrlDataType *)connectionConfig.address.data);
     ck_assert(UA_calcSizeBinary(&networkAddressUrlDataCopy, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) ==
               UA_calcSizeBinary(&networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]));
-    for(size_t i = 0; i < connectionConfig.connectionPropertiesSize; i++){
-        ck_assert(UA_String_equal(&connectionConfig.connectionProperties[i].key.name, &connectionConf.connectionProperties[i].key.name) == UA_TRUE);
-        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties[i].value));
+    for(size_t i = 0; i < connectionConfig.connectionProperties.mapSize; i++){
+        ck_assert(UA_String_equal(&connectionConfig.connectionProperties.map[i].key.name, &connectionConf.connectionProperties.map[i].key.name) == UA_TRUE);
+        ck_assert(UA_Variant_calcSizeBinary(&connectionConfig.connectionProperties.map[i].value) == UA_Variant_calcSizeBinary(&connectionConf.connectionProperties.map[i].value));
     }
     UA_PubSubConnectionConfig_clear(&connectionConfig);
 } END_TEST
diff --git a/tests/pubsub/check_pubsub_decryption.c b/tests/pubsub/check_pubsub_decryption.c
index 22d2ebd1460..fbf65d0c94f 100644
--- a/tests/pubsub/check_pubsub_decryption.c
+++ b/tests/pubsub/check_pubsub_decryption.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2017 - 2018 Fraunhofer IOSB (Author: Jan Hermes)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
@@ -54,7 +53,6 @@ setup(void) {
     server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index 560166e1abe..26f326ee6a3 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -7,7 +7,6 @@
 
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include "open62541/server_pubsub.h"
 #include <open62541/plugin/securitypolicy_default.h>
 
@@ -79,7 +78,6 @@ static void setup(void) {
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
                                       &config->logger);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_encryption.c b/tests/pubsub/check_pubsub_encryption.c
index d58882b2c09..80df6680e0d 100644
--- a/tests/pubsub/check_pubsub_encryption.c
+++ b/tests/pubsub/check_pubsub_encryption.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2017 - 2018 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/plugin/securitypolicy_default.h>
@@ -33,7 +32,6 @@ static void setup(void) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
     retVal |= UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
diff --git a/tests/pubsub/check_pubsub_encryption_aes256.c b/tests/pubsub/check_pubsub_encryption_aes256.c
index 0d31c189a9e..8010b286bee 100644
--- a/tests/pubsub/check_pubsub_encryption_aes256.c
+++ b/tests/pubsub/check_pubsub_encryption_aes256.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2017 - 2018 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/plugin/securitypolicy_default.h>
@@ -33,7 +32,6 @@ static void setup(void) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
     retVal |= UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 9d8e82d9e01..4be16a5ad98 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -1,4 +1,10 @@
-#include <open62541/plugin/pubsub_udp.h>
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) 2019 Fraunhofer IOSB (Author: Andreas Ebner)
+ */
+
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/plugin/log_stdout.h>
@@ -19,7 +25,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_informationmodel.c b/tests/pubsub/check_pubsub_informationmodel.c
index 8426235e83d..7ad893f8085 100644
--- a/tests/pubsub/check_pubsub_informationmodel.c
+++ b/tests/pubsub/check_pubsub_informationmodel.c
@@ -6,8 +6,6 @@
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  */
 
-#include <open62541/plugin/pubsub.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/types.h>
@@ -31,7 +29,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     retVal |= UA_Server_run_startup(server);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 6c4ef784438..2492f43ede7 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2020-2021 Kalycito Infotech Private Limited
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/client.h>
@@ -36,7 +35,6 @@ static void setup(void) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
 
     UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     retVal |= UA_Server_run_startup(server);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     THREAD_CREATE(server_thread, serverloop);
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index 73f9a5b46e6..11f434a34f9 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -34,8 +34,8 @@ static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
-    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
-    retVal |= UA_Server_run_startup(server);
+    UA_ServerConfig_setDefault(config);
+    UA_Server_run_startup(server);
 
     //add connection
     UA_PubSubConnectionConfig connectionConfig;
@@ -68,7 +68,7 @@ static void setup(void) {
     connectionConfig.connectionProperties.map = connectionOptions;
     connectionConfig.connectionProperties.mapSize = connectionOptionIndex;
 
-    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
+    UA_StatusCode retVal = UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
diff --git a/tests/pubsub/check_pubsub_multiple_layer.c b/tests/pubsub/check_pubsub_multiple_layer.c
deleted file mode 100644
index 1311de648cf..00000000000
--- a/tests/pubsub/check_pubsub_multiple_layer.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2017 - 2018 Fraunhofer IOSB (Author: Andreas Ebner)
- */
-
-#include <open62541/plugin/pubsub_udp.h>
-#include <open62541/server_config_default.h>
-#include <open62541/server_pubsub.h>
-
-#include "ua_server_internal.h"
-
-#include <check.h>
-
-UA_Server *server = NULL;
-UA_NodeId connection1, connection2;
-
-static void setup(void) {
-}
-
-static void teardown(void) {
-}
-
-START_TEST(AddMultipleTransportLayers){
-    server = UA_Server_new();
-    ck_assert(server != NULL);
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-    ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 1);
-
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-    ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 2);
-
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-    ck_assert_uint_eq(config->pubSubConfig.transportLayersSize, 3);
-
-    UA_Server_delete(server);
-} END_TEST
-
-int main(void) {
-    TCase *tc_add_pubsub_writergroup = tcase_create("PubSub Layer allocation");
-    tcase_add_checked_fixture(tc_add_pubsub_writergroup, setup, teardown);
-    tcase_add_test(tc_add_pubsub_writergroup, AddMultipleTransportLayers);
-
-    Suite *s = suite_create("PubSub Multiple layer handling");
-    suite_add_tcase(s, tc_add_pubsub_writergroup);
-
-    SRunner *sr = srunner_create(s);
-    srunner_set_fork_status(sr, CK_NOFORK);
-    srunner_run_all(sr,CK_NORMAL);
-    int number_failed = srunner_ntests_failed(sr);
-    srunner_free(sr);
-    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index a3d5fae24a4..bccc75dc3c1 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -6,8 +6,8 @@
  */
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
-#include <open62541/plugin/pubsub_udp.h>
 
 #include "ua_pubsub.h"
 #include "ua_pubsub_networkmessage.h"
@@ -55,7 +55,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_pds.c b/tests/pubsub/check_pubsub_pds.c
index c8c1d184095..48b1af88784 100644
--- a/tests/pubsub/check_pubsub_pds.c
+++ b/tests/pubsub/check_pubsub_pds.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2017 - 2018 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
@@ -20,7 +19,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index ce7262eaf27..4424567cc1c 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2017 - 2018 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
@@ -26,7 +25,6 @@ static void setup(void) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
 
     UA_Server_run_startup(server);
     //add 2 connections
diff --git a/tests/pubsub/check_pubsub_publish_ethernet.c b/tests/pubsub/check_pubsub_publish_ethernet.c
index 45f1399a5cc..d350324baa5 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  */
 
-#include <open62541/plugin/pubsub_ethernet.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <check.h>
@@ -36,7 +35,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
     UA_Server_run_startup(server);
 }
 
@@ -68,9 +66,16 @@ START_TEST(EthernetSendWithoutVLANTag) {
         return;
     }
 
-    UA_Server_run_iterate(server, false);
+    /* Initialize a buffer to send data */
+    testBuffer = UA_STRING(BUFFER_STRING);
+    /* Validate the Ethernet send API */
+    retVal = connection->cm->sendWithConnection(connection->cm, connection->sendChannel,
+                                                &UA_KEYVALUEMAP_NULL, &testBuffer);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-} END_TEST
+    UA_Server_run_iterate(server, false);
+}
+END_TEST
 
 START_TEST(EthernetSendWithVLANTag) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -93,6 +98,13 @@ START_TEST(EthernetSendWithVLANTag) {
         return;
     }
 
+    /* Initialize a buffer to send data */
+    testBuffer = UA_STRING(BUFFER_STRING);
+    /* Validate the Ethernet send API */
+    retVal = connection->cm->sendWithConnection(connection->cm, connection->sendChannel,
+                                                &UA_KEYVALUEMAP_NULL, &testBuffer);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
     UA_Server_run_iterate(server, false);
 } END_TEST
 
diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index 2db15ed5fc2..a58be086d70 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  */
-#include <open62541/plugin/pubsub_ethernet.h>
+
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
@@ -13,7 +13,6 @@
 
 #include "ua_pubsub.h"
 #include "ua_server_internal.h"
-#include "ua_pubsub_networkmessage.h"
 
 /* Adjust your configuration globally for the ethernet tests here: */
 #include "ethernet_config.h"
@@ -46,7 +45,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     config = UA_Server_getConfig(server);
     UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerEthernet());
     UA_Server_run_startup(server);
 }
 
@@ -58,12 +56,6 @@ static void teardown(void) {
 }
 
 START_TEST(EthernetSendWithoutVLANTag) {
-    struct timespec nextnanosleeptime;
-    UA_UInt64 transmission_time;
-    nextnanosleeptime.tv_sec = SECONDS_SLEEP;
-    nextnanosleeptime.tv_nsec = NANO_SECONDS_SLEEP_PUB;
-    UA_UInt64 roundOffCycleTime = (long) (CYCLE_TIME * MILLI_SECONDS) - NANO_SECONDS_SLEEP_PUB;
-
     /* Add connection to the server */
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -88,30 +80,24 @@ START_TEST(EthernetSendWithoutVLANTag) {
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     ck_assert(connection);
 
-    /* Define Ethernet ETF transport settings */
-    UA_EthernetWriterGroupTransportDataType ethernettransportSettings;
-    memset(&ethernettransportSettings, 0, sizeof(UA_EthernetWriterGroupTransportDataType));
-    ethernettransportSettings.transmission_time = 0;
-
-    /* Encapsulate ETF config in transportSettings */
-    UA_ExtensionObject transportSettings;
-    memset(&transportSettings, 0, sizeof(UA_ExtensionObject));
-    transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
-    transportSettings.content.decoded.data = &ethernettransportSettings;
-    clock_gettime(CLOCKID, &nextnanosleeptime);
-    transmission_time = ((UA_UInt64)nextnanosleeptime.tv_sec * SECONDS + (UA_UInt64)nextnanosleeptime.tv_nsec) + roundOffCycleTime + QBV_OFFSET;
-    ethernettransportSettings.transmission_time = transmission_time;
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-
-    UA_Server_run_iterate(server, false);
+    /* TODO: Encapsulate ETF config in transportSettings */
+    /* UA_ExtensionObject transportSettings; */
+    /* memset(&transportSettings, 0, sizeof(UA_ExtensionObject)); */
+    /* transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED; */
+    /* transportSettings.content.decoded.data = &ethernettransportSettings; */
+    /* clock_gettime(CLOCKID, &nextnanosleeptime); */
+    /* transmission_time = ((UA_UInt64)nextnanosleeptime.tv_sec * SECONDS + (UA_UInt64)nextnanosleeptime.tv_nsec) + roundOffCycleTime + QBV_OFFSET; */
+    /* ethernettransportSettings.transmission_time = transmission_time; */
+
+    /* Initialize a buffer to send data */
+    UA_ByteString testBuffer = UA_STRING(BUFFER_STRING);
+    UA_StatusCode retVal = connection->cm->sendWithConnection(connection->cm,
+                                                connection->sendChannel,
+                                                &UA_KEYVALUEMAP_NULL, &testBuffer);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 START_TEST(EthernetSendWithVLANTag) {
-    struct timespec nextnanosleeptime;
-    UA_UInt64 transmission_time;
-    nextnanosleeptime.tv_sec = SECONDS_SLEEP;
-    nextnanosleeptime.tv_nsec = NANO_SECONDS_SLEEP_PUB;
-    UA_UInt64 roundOffCycleTime = (long) (CYCLE_TIME * MILLI_SECONDS) - NANO_SECONDS_SLEEP_PUB;
     /* Add connection to the server */
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -136,22 +122,20 @@ START_TEST(EthernetSendWithVLANTag) {
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     ck_assert(connection);
 
-    /* Define Ethernet ETF transport settings */
-    UA_EthernetWriterGroupTransportDataType ethernettransportSettings;
-    memset(&ethernettransportSettings, 0, sizeof(UA_EthernetWriterGroupTransportDataType));
-    ethernettransportSettings.transmission_time = 0;
-
-    /* Encapsulate ETF config in transportSettings */
-    UA_ExtensionObject transportSettings;
-    memset(&transportSettings, 0, sizeof(UA_ExtensionObject));
-    transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
-    transportSettings.content.decoded.data = &ethernettransportSettings;
-    clock_gettime(CLOCKID, &nextnanosleeptime);
-    transmission_time = ((UA_UInt64)nextnanosleeptime.tv_sec * SECONDS + (UA_UInt64)nextnanosleeptime.tv_nsec) + roundOffCycleTime + QBV_OFFSET;
-    ethernettransportSettings.transmission_time = transmission_time;
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-
-    UA_Server_run_iterate(server, false);
+    /* TODO: Encapsulate ETF config in transportSettings */
+    /* UA_ExtensionObject transportSettings; */
+    /* memset(&transportSettings, 0, sizeof(UA_ExtensionObject)); */
+    /* transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED; */
+    /* transportSettings.content.decoded.data = &ethernettransportSettings; */
+    /* clock_gettime(CLOCKID, &nextnanosleeptime); */
+    /* transmission_time = ((UA_UInt64)nextnanosleeptime.tv_sec * SECONDS + (UA_UInt64)nextnanosleeptime.tv_nsec) + roundOffCycleTime + QBV_OFFSET; */
+    /* ethernettransportSettings.transmission_time = transmission_time; */
+    /* Initialize a buffer to send data */
+
+    UA_ByteString testBuffer = UA_STRING(BUFFER_STRING);
+    UA_StatusCode retVal = connection->cm->
+        sendWithConnection(connection->cm, connection->sendChannel, &UA_KEYVALUEMAP_NULL, &testBuffer);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_publish_json.c b/tests/pubsub/check_pubsub_publish_json.c
index d20889872d2..956433316a6 100644
--- a/tests/pubsub/check_pubsub_publish_json.c
+++ b/tests/pubsub/check_pubsub_publish_json.c
@@ -5,13 +5,11 @@
  * Copyright (c) 2017 - 2018 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/types.h>
 
 #include "ua_pubsub.h"
-#include "ua_server_internal.h"
 
 #include <check.h>
 
@@ -21,11 +19,10 @@ UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
+    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-    retVal |= UA_Server_run_startup(server);
+    UA_ServerConfig_setDefault(config);
+    UA_Server_run_startup(server);
 
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index a0cd4012193..9ab01329032 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2019 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
@@ -54,7 +53,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     UA_Server_run_startup(server);
 
     rtEventLoop = UA_EventLoop_new_POSIX(&server->config.logger);
diff --git a/tests/pubsub/check_pubsub_publish_uadp.c b/tests/pubsub/check_pubsub_publish_uadp.c
deleted file mode 100644
index 0976aac8d6b..00000000000
--- a/tests/pubsub/check_pubsub_publish_uadp.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2019 Fraunhofer IOSB (Author: Andreas Ebner)
- */
-
-#include <open62541/plugin/pubsub_udp.h>
-#include <open62541/server_config_default.h>
-#include <open62541/server_pubsub.h>
-
-#include "ua_server_internal.h"
-
-#include <check.h>
-
-UA_Server *server = NULL;
-UA_NodeId connection1, publishedDataSetIdent, dataSetFieldIdent, writerGroupIdent, dataSetWriterIdent;
-
-static void setup(void) {
-    server = UA_Server_new();
-    ck_assert(server != NULL);
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    retVal |= UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-    retVal |= UA_Server_run_startup(server);
-
-    //add connection
-    UA_PubSubConnectionConfig connectionConfig;
-    memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
-    connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
-    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
-                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
-    connectionConfig.publisherId.uint16 = 62541;
-    retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
-
-    UA_PublishedDataSetConfig publishedDataSetConfig;
-    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
-    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-    publishedDataSetConfig.name = UA_STRING("Test PDS");
-    retVal |= UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent).addResult;
-
-    UA_DataSetFieldConfig dataSetFieldConfig;
-    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-    dataSetFieldConfig.dataSetFieldType = UA_PUBSUB_DATASETFIELD_VARIABLE;
-    dataSetFieldConfig.field.variable.fieldNameAlias = UA_STRING("Server localtime");
-    dataSetFieldConfig.field.variable.promotedField = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable =
-            UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
-    dataSetFieldConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-    retVal |= UA_Server_addDataSetField(server, publishedDataSetIdent,
-                              &dataSetFieldConfig, &dataSetFieldIdent).result;
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-}
-
-static void teardown(void) {
-    UA_Server_run_shutdown(server);
-    UA_Server_delete(server);
-}
-
-typedef struct {
-    size_t counter;
-    UA_NetworkMessage *msgs;
-} UA_ReceiveContext;
-
-static UA_StatusCode
-recvTestFun(UA_PubSubChannel *channel, void *context, const UA_ByteString *buffer) {
-    UA_ReceiveContext *ctx = (UA_ReceiveContext*)context;
-
-    // memcpy(ctx->buffer->data + ctx->offset, buffer->data, buffer->length);
-    // ctx->buffer->length = buffer->length;
-    // ctx->offset += buffer->length;
-
-    UA_NetworkMessage *networkMessage = &ctx->msgs[ctx->counter];
-
-    memset(networkMessage, 0, sizeof(UA_NetworkMessage));
-    size_t currentPosition = 0;
-    UA_NetworkMessage_decodeBinary(buffer, &currentPosition, networkMessage, NULL);
-    for(int i = 0; i < networkMessage->payloadHeader.dataSetPayloadHeader.count; ++i) {
-        UA_Byte * rawContent = (UA_Byte *) UA_malloc(networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.length);
-        memcpy(rawContent,
-               networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data,
-               networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.length);
-        networkMessage->payload.dataSetPayload.dataSetMessages[i].data.keyFrameData.rawFields.data = rawContent;
-    }
-
-    ctx->counter++;
-
-    return UA_STATUSCODE_GOOD;
-}
-
-START_TEST(CheckNMandDSMcalculation){
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_WriterGroupConfig writerGroupConfig;
-    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
-    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
-    writerGroupConfig.publishingInterval = 10;
-    writerGroupConfig.enabled = UA_FALSE;
-    writerGroupConfig.writerGroupId = 100;
-    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-
-    UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
-    wgm->networkMessageContentMask = UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
-    writerGroupConfig.messageSettings.content.decoded.data = wgm;
-    writerGroupConfig.messageSettings.content.decoded.type =
-            &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
-    writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
-
-    //maximum DSM in one NM = 10
-    writerGroupConfig.maxEncapsulatedDataSetMessageCount = 10;
-    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
-    UA_Server_setWriterGroupOperational(server, writerGroupIdent);
-    UA_UadpWriterGroupMessageDataType_delete(wgm);
-
-    UA_DataSetWriterConfig dataSetWriterConfig;
-    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
-    dataSetWriterConfig.name = UA_STRING("Test DataSetWriter");
-    dataSetWriterConfig.dataSetWriterId = 10;
-    dataSetWriterConfig.keyFrameCount = 1;
-    //add 10 dataSetWriter
-    for(UA_UInt16 i = 0; i < 10; i++){
-        dataSetWriterConfig.dataSetWriterId = (UA_UInt16) (dataSetWriterConfig.dataSetWriterId + 1);
-        retVal |= UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
-                                   &dataSetWriterConfig, &dataSetWriterIdent);
-    }
-
-    //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
-    writerGroupConfig.publishingInterval = 100000;
-    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-    UA_Server_run_iterate(server, false);
-
-    //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
-    writerGroupConfig.publishingInterval = 200000;
-    //maximum DSM in one NM = 5
-    writerGroupConfig.maxEncapsulatedDataSetMessageCount = 5;
-    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-
-    UA_Server_run_iterate(server, false);
-
-    //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
-    writerGroupConfig.publishingInterval = 300000;
-    //maximum DSM in one NM = 20
-    writerGroupConfig.maxEncapsulatedDataSetMessageCount = 20;
-    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-    UA_Server_run_iterate(server, false);
-
-    //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
-    writerGroupConfig.publishingInterval = 400000;
-    //maximum DSM in one NM = 1
-    writerGroupConfig.maxEncapsulatedDataSetMessageCount = 1;
-    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-    UA_Server_run_iterate(server, false);
-
-    //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
-    writerGroupConfig.publishingInterval = 500000;
-    //maximum DSM in one NM = 0 -> should be equal to 1
-    writerGroupConfig.maxEncapsulatedDataSetMessageCount = 0;
-    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-    UA_Server_run_iterate(server, false);
-
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-} END_TEST
-
-START_TEST(CheckNMandDSMBufferCalculation){
-        UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-        UA_WriterGroupConfig writerGroupConfig;
-        memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
-        writerGroupConfig.name = UA_STRING("Demo WriterGroup");
-        writerGroupConfig.publishingInterval = 10;
-        writerGroupConfig.enabled = UA_FALSE;
-        writerGroupConfig.writerGroupId = 100;
-        writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-        writerGroupConfig.rtLevel = UA_PUBSUB_RT_NONE;
-
-        UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
-        wgm->networkMessageContentMask = UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
-        writerGroupConfig.messageSettings.content.decoded.data = wgm;
-        writerGroupConfig.messageSettings.content.decoded.type =
-                &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
-        writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
-
-        //maximum DSM in one NM = 10
-        writerGroupConfig.maxEncapsulatedDataSetMessageCount = 10;
-        retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
-        UA_Server_setWriterGroupOperational(server, writerGroupIdent);
-        UA_UadpWriterGroupMessageDataType_delete(wgm);
-
-        UA_DataSetWriterConfig dataSetWriterConfig;
-        memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
-        dataSetWriterConfig.name = UA_STRING("Test DataSetWriter");
-        dataSetWriterConfig.dataSetWriterId = 10;
-        dataSetWriterConfig.keyFrameCount = 1;
-        //add 10 dataSetWriter
-        for(UA_UInt16 i = 0; i < 10; i++){
-            dataSetWriterConfig.dataSetWriterId = (UA_UInt16) (dataSetWriterConfig.dataSetWriterId + 1);
-            retVal |= UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
-                                       &dataSetWriterConfig, &dataSetWriterIdent);
-        }
-
-        UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
-        UA_Server_unfreezeWriterGroupConfiguration(server, writerGroupIdent);
-        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    } END_TEST
-
-START_TEST(CheckSingleDSMRawEncodedMessage){
-    //TODO extend test case with raw encoding
-    UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-    UA_WriterGroupConfig writerGroupConfig;
-    memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
-    writerGroupConfig.name = UA_STRING("Demo WriterGroup");
-    writerGroupConfig.publishingInterval = 10;
-    writerGroupConfig.enabled = UA_FALSE;
-    writerGroupConfig.writerGroupId = 100;
-    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-
-    UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
-    wgm->networkMessageContentMask = UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER;
-    writerGroupConfig.messageSettings.content.decoded.data = wgm;
-    writerGroupConfig.messageSettings.content.decoded.type =
-        &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
-    writerGroupConfig.messageSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
-
-    //maximum DSM in one NM = 10
-    writerGroupConfig.maxEncapsulatedDataSetMessageCount = 10;
-    retVal |= UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroupIdent);
-    UA_Server_setWriterGroupOperational(server, writerGroupIdent);
-    UA_UadpWriterGroupMessageDataType_delete(wgm);
-
-    UA_DataSetWriterConfig dataSetWriterConfig;
-    memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
-    dataSetWriterConfig.name = UA_STRING("Test DataSetWriter");
-    dataSetWriterConfig.dataSetWriterId = 10;
-    dataSetWriterConfig.keyFrameCount = 1;
-    /* Encode fields as RAW-Encoded */
-    dataSetWriterConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
-
-    //add 10 dataSetWriter
-    for(UA_UInt16 i = 0; i < 10; i++){
-        dataSetWriterConfig.dataSetWriterId = (UA_UInt16) (dataSetWriterConfig.dataSetWriterId + 1);
-        retVal |= UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
-                                   &dataSetWriterConfig, &dataSetWriterIdent);
-    }
-
-    //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
-    writerGroupConfig.publishingInterval = 100000;
-    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-    UA_Server_run_iterate(server, false);
-
-    //change publish interval triggers implicit one publish callback run | alternatively run UA_Server_iterate
-    writerGroupConfig.publishingInterval = 200000;
-    //maximum DSM in one NM = 5
-    writerGroupConfig.maxEncapsulatedDataSetMessageCount = 5;
-    retVal |= UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-    UA_Server_run_iterate(server, false);
-
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-} END_TEST
-
-int main(void) {
-    TCase *tc_add_pubsub_DSMandNMcalculation = tcase_create("PubSub NM and DSM");
-    tcase_add_checked_fixture(tc_add_pubsub_DSMandNMcalculation, setup, teardown);
-    tcase_add_test(tc_add_pubsub_DSMandNMcalculation, CheckNMandDSMcalculation);
-    tcase_add_test(tc_add_pubsub_DSMandNMcalculation, CheckNMandDSMBufferCalculation);
-
-    TCase *tc_raw_encoded_messages = tcase_create("RAW Encoding");
-    tcase_add_checked_fixture(tc_raw_encoded_messages, setup, teardown);
-    tcase_add_test(tc_raw_encoded_messages, CheckSingleDSMRawEncodedMessage);
-
-    Suite *s = suite_create("PubSub NM and DSM calculation");
-    suite_add_tcase(s, tc_add_pubsub_DSMandNMcalculation);
-    suite_add_tcase(s, tc_raw_encoded_messages);
-
-    SRunner *sr = srunner_create(s);
-    srunner_set_fork_status(sr, CK_NOFORK);
-    srunner_run_all(sr,CK_NORMAL);
-    int number_failed = srunner_ntests_failed(sr);
-    srunner_free(sr);
-    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 046fb4c7dee..497ce398a5d 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -1,4 +1,3 @@
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/plugin/log_stdout.h>
@@ -9,7 +8,6 @@
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
 #include "ua_util_internal.h"
-#include "ua_pubsub_config.h"
 #endif /* UA_ENABLE_PUBSUB_FILE_CONFIG */
 
 #include <check.h>
@@ -29,7 +27,6 @@ static void setup(void) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
     ck_assert(config != 0);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_ServerConfig_setDefault(config));
-    ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP()));
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_run_startup(server));
 }
 
diff --git a/tests/pubsub/check_pubsub_publishspeed.c b/tests/pubsub/check_pubsub_publishspeed.c
index 97c1d0449fd..a0ba131c684 100644
--- a/tests/pubsub/check_pubsub_publishspeed.c
+++ b/tests/pubsub/check_pubsub_publishspeed.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2017 - 2018 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
@@ -23,10 +22,8 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    retval |= UA_ServerConfig_setDefault(config);
-    retval |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-    retval |= UA_Server_run_startup(server);
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    UA_ServerConfig_setDefault(config);
+    UA_Server_run_startup(server);
 
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index c98b97088d8..71eee62d938 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -8,7 +8,6 @@
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
@@ -147,8 +146,6 @@ skssetup(void) {
 
     disableAnonymous(config);
 
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
@@ -171,7 +168,6 @@ publishersetup(void) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(publisherApp);
     retVal |= UA_ServerConfig_setMinimal(config, 4841, NULL);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
@@ -202,7 +198,6 @@ subscribersetup(void) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ServerConfig *config = UA_Server_getConfig(subscriberApp);
     retVal |= UA_ServerConfig_setMinimal(config, 4842, NULL);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
diff --git a/tests/pubsub/check_pubsub_sks_keystorage.c b/tests/pubsub/check_pubsub_sks_keystorage.c
index e4df06c574a..99a89af952e 100644
--- a/tests/pubsub/check_pubsub_sks_keystorage.c
+++ b/tests/pubsub/check_pubsub_sks_keystorage.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
@@ -186,7 +185,6 @@ setup(void) {
     SecurityGroupId = UA_STRING("TestSecurityGroup");
     UA_ServerConfig *config = UA_Server_getConfig(server);
     retVal |= UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
 
     config->pubSubConfig.securityPolicies = (UA_PubSubSecurityPolicy*)
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index 3abe62b73d4..b90c4478540 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -8,7 +8,6 @@
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
@@ -114,8 +113,6 @@ setup(void) {
     config->applicationDescription.applicationUri =
         UA_STRING_ALLOC("urn:unconfigured:application");
 
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index 2567d068377..bb4e344673f 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2022 Linutronix GmbH (Author: Muddasir Shakil)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
@@ -216,8 +215,6 @@ setup(void) {
     config->applicationDescription.applicationUri =
         UA_STRING_ALLOC("urn:unconfigured:application");
 
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
-
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
diff --git a/tests/pubsub/check_pubsub_sks_securitygroups.c b/tests/pubsub/check_pubsub_sks_securitygroups.c
index 635c793edad..8125510cbe8 100644
--- a/tests/pubsub/check_pubsub_sks_securitygroups.c
+++ b/tests/pubsub/check_pubsub_sks_securitygroups.c
@@ -8,7 +8,6 @@
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 23bf49b8ef4..060fca1363a 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2022 Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <check.h>
@@ -97,9 +96,8 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     config = UA_Server_getConfig(server);
-    retval |= UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
-    retval |= UA_Server_run_startup(server);
-    retval |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
+    UA_ServerConfig_setMinimal(config, UA_SUBSCRIBER_PORT, NULL);
+    UA_Server_run_startup(server);
 
     addVariables();
 
diff --git a/tests/pubsub/check_pubsub_subscribe_config_freeze.c b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
index fe6cf3f3222..e91ac5d7649 100644
--- a/tests/pubsub/check_pubsub_subscribe_config_freeze.c
+++ b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2020 Kalycito Infotech Private Limited (Author: Suriya Narayanan)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
@@ -21,10 +20,8 @@ static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_StatusCode retVal = UA_ServerConfig_setDefault(config);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDP());
-    retVal |= UA_Server_run_startup(server);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    UA_ServerConfig_setDefault(config);
+    UA_Server_run_startup(server);
 }
 
 static void teardown(void) {
diff --git a/tests/pubsub/check_pubsub_subscribe_encrypted.c b/tests/pubsub/check_pubsub_subscribe_encrypted.c
index c815b5dac5e..6d1fdf7925a 100644
--- a/tests/pubsub/check_pubsub_subscribe_encrypted.c
+++ b/tests/pubsub/check_pubsub_subscribe_encrypted.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2019 Kalycito Infotech Private Limited
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
@@ -62,7 +61,6 @@ static void setup(void) {
                                       &config->logger);
 
     retVal |= UA_Server_run_startup(server);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     /* Add connection to the server */
     UA_PubSubConnectionConfig connectionConfig;
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 7110ba3947d..0217f013e2b 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -1,4 +1,3 @@
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/plugin/log_stdout.h>
@@ -46,7 +45,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
 
     UA_StatusCode res = UA_Server_run_startup(server);
     ck_assert(UA_STATUSCODE_GOOD == res);
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 2290b9f3598..57fd8aab3f3 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -6,10 +6,9 @@
  */
 
 #include <open62541/server.h>
+#include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/plugin/log_stdout.h>
-#include "open62541/server_pubsub.h"
 
 #include "ua_pubsub.h"
 #include "ua_pubsub_networkmessage.h"
@@ -69,7 +68,6 @@ static void setup(void) {
     ck_assert(server != NULL);
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
index 760b7b576fe..fbd0d600e8e 100644
--- a/tests/pubsub/check_pubsub_udp_unicast.c
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2022 Fraunhofer IOSB (Author: Jan Hermes)
  */
 
-#include <open62541/plugin/pubsub_udp.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <check.h>
@@ -19,7 +18,7 @@
 #define STR_BUFSIZE             1024
 
 #define UA_SUBSCRIBER_PORT       4801    /* Port for Subscriber*/
-#define UA_PUBLISHER_PORT        4800    /* Port for Publisher*/
+#define UA_PUBLISHER_PORT        4801    /* Port for Publisher*/
 #define PUBLISH_INTERVAL         5       /* Publish interval*/
 #define PUBLISHER_ID             2234    /* Publisher Id*/
 #define DATASET_WRITER_ID        62541   /* DataSet Writer Id*/
@@ -74,7 +73,6 @@ setupPubSubServer(UA_Server **server, UA_ServerConfig **config, UA_UInt16 portNu
     *config = UA_Server_getConfig(*server);
 
     retVal |= UA_Server_run_startup(*server);
-    retVal |= UA_ServerConfig_addPubSubTransportLayer(*config, UA_PubSubTransportLayerUDP());
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 }
 
@@ -284,7 +282,7 @@ static void setup(void) {
                            UA_SUBSCRIBER_PORT, PUBLISHVARIABLE_NODEID);
 
     setupPubSubServer(&serverSubscriber, &configSubscriber,
-                      UA_SUBSCRIBER_PORT, configPublisher->eventLoop);
+                      UA_SUBSCRIBER_PORT, NULL);
 
     UA_NodeId folderId;
     setupFolder(serverSubscriber, &folderId);
diff --git a/tools/appveyor/build.ps1 b/tools/appveyor/build.ps1
index 1a2638cae5a..1b1f58acc71 100644
--- a/tools/appveyor/build.ps1
+++ b/tools/appveyor/build.ps1
@@ -40,7 +40,7 @@ try {
             -DUA_ENABLE_PUBSUB_DELTAFRAMES:BOOL=ON `
             -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
             -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
-            -DUA_ENABLE_PUBSUB_MQTT:BOOL=ON `
+            -DUA_ENABLE_MQTT:BOOL=ON `
             -DUA_NAMESPACE_ZERO:STRING=REDUCED ..
     & cmake --build . --config RelWithDebInfo
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {

From 38dc2f529a843818e1da8b0af30a96f889aa7d8b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 00:02:15 +0200
Subject: [PATCH 0985/1963] fix(examples): Disable TSN examples to be reworked
 for the eventloop model

---
 examples/CMakeLists.txt | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2b5842683fa..0b31e8ebc24 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -229,19 +229,21 @@ if(UA_ENABLE_PUBSUB)
         message(WARNING "Build option BUILD_SHARED_LIBS not supported for standalone subscriber and realtime examples. Skipping these examples.")
     else (NOT BUILD_SHARED_LIBS)
         add_example(pubsub_subscribe_standalone_dataset pubsub/pubsub_subscribe_standalone_dataset.c)
-        if(CMAKE_SYSTEM MATCHES "Linux")
-            add_example(pubsub_TSN_publisher_multiple_thread pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c)
-            add_example(pubsub_TSN_loopback_single_thread pubsub_realtime/pubsub_TSN_loopback_single_thread.c)
-            target_link_libraries(pubsub_TSN_publisher_multiple_thread rt pthread)
-            target_link_libraries(pubsub_TSN_loopback_single_thread rt pthread)
-            if(UA_ENABLE_PUBSUB_ETH_UADP)
-                add_subdirectory(pubsub_realtime/nodeset)
-                add_example(pubsub_TSN_publisher pubsub_realtime/pubsub_TSN_publisher.c)
-                add_example(pubsub_TSN_loopback pubsub_realtime/pubsub_TSN_loopback.c)
-                target_link_libraries(pubsub_TSN_publisher rt pthread)
-                target_link_libraries(pubsub_TSN_loopback rt pthread)
-            endif()
-        endif()
+
+        # TODO: The TSN examples need to be reworked for the EventLoop model
+        # if(CMAKE_SYSTEM MATCHES "Linux")
+        #     add_example(pubsub_TSN_publisher_multiple_thread pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c)
+        #     add_example(pubsub_TSN_loopback_single_thread pubsub_realtime/pubsub_TSN_loopback_single_thread.c)
+        #     target_link_libraries(pubsub_TSN_publisher_multiple_thread rt pthread)
+        #     target_link_libraries(pubsub_TSN_loopback_single_thread rt pthread)
+        #     if(UA_ENABLE_PUBSUB_ETH_UADP)
+        #         add_subdirectory(pubsub_realtime/nodeset)
+        #         add_example(pubsub_TSN_publisher pubsub_realtime/pubsub_TSN_publisher.c)
+        #         add_example(pubsub_TSN_loopback pubsub_realtime/pubsub_TSN_loopback.c)
+        #         target_link_libraries(pubsub_TSN_publisher rt pthread)
+        #         target_link_libraries(pubsub_TSN_loopback rt pthread)
+        #     endif()
+        # endif()
     endif()
     if(UA_ENABLE_PUBSUB_ENCRYPTION)
         add_example(pubsub_publish_encrypted pubsub/pubsub_publish_encrypted.c)

From 0bd6dfdf9067ad78995c89180e7fbd9a439ba6b9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 00:37:07 +0200
Subject: [PATCH 0986/1963] fix(pubsub): Fix the listen parameter for sending
 ethernet connections

---
 src/pubsub/ua_pubsub_eventloop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 0a44734e4ee..26fc2d3ee2e 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -437,7 +437,7 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c) {
                                    "instead of opening a channel for sending.");
         }
 
-        listen = true;
+        listen = false;
         UA_UNLOCK(&server->serviceMutex);
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
         UA_LOCK(&server->serviceMutex);

From f0c25dfee2d1bcda6d6d540b90de4e792b6b7049 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 00:37:52 +0200
Subject: [PATCH 0987/1963] fix(writergroup): Reset the connection state when
 the writergroup is set operational

---
 src/pubsub/ua_pubsub_writergroup.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index b04c391ad6e..3500ef57948 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -790,6 +790,18 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                     UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
                                                "Received unknown PubSub state!");
             }
+
+            UA_PubSubConnection *c = writerGroup->linkedConnection;
+            ret = UA_PubSubConnection_setPubSubState(server, c,
+                                                     UA_PUBSUBSTATE_OPERATIONAL,
+                                                     UA_STATUSCODE_GOOD);
+            if(ret != UA_STATUSCODE_GOOD ||
+               (c->state != UA_PUBSUBSTATE_OPERATIONAL &&
+                c->state != UA_PUBSUBSTATE_PREOPERATIONAL)) {
+                UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                                           "Connection not operational");
+                return UA_STATUSCODE_BADINTERNALERROR;
+            }
             break;
         case UA_PUBSUBSTATE_ERROR: {
             switch (writerGroup->state){

From 7546a4d87f339140103ec4dfdc50f82075812ca7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 00:38:51 +0200
Subject: [PATCH 0988/1963] fix(example): Fix build error in
 check_pubsub_publish_ethernet_etf.c

---
 .../check_pubsub_publish_ethernet_etf.c       | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index a58be086d70..3e7adc83c9c 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -79,6 +79,21 @@ START_TEST(EthernetSendWithoutVLANTag) {
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     ck_assert(connection);
+    assert(connection->sendChannel != 0);
+
+    /* Add a writer group to enable the connection */
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+    writerGroupConfig.name = UA_STRING("WriterGroup 1");
+    writerGroupConfig.publishingInterval = 10;
+    UA_NodeId localWriterGroup;
+    UA_StatusCode retVal =
+        UA_Server_addWriterGroup(server, connection_test,
+                                 &writerGroupConfig, &localWriterGroup);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    retVal = UA_Server_setWriterGroupOperational(server, localWriterGroup);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
     /* TODO: Encapsulate ETF config in transportSettings */
     /* UA_ExtensionObject transportSettings; */
@@ -91,9 +106,16 @@ START_TEST(EthernetSendWithoutVLANTag) {
 
     /* Initialize a buffer to send data */
     UA_ByteString testBuffer = UA_STRING(BUFFER_STRING);
-    UA_StatusCode retVal = connection->cm->sendWithConnection(connection->cm,
-                                                connection->sendChannel,
-                                                &UA_KEYVALUEMAP_NULL, &testBuffer);
+    UA_ByteString networkBuffer = UA_STRING_NULL;
+    connection->cm->allocNetworkBuffer(connection->cm,
+                                       connection->sendChannel,
+                                       &networkBuffer,
+                                       testBuffer.length);
+    memcpy(networkBuffer.data, testBuffer.data, testBuffer.length);
+
+    retVal = connection->cm->
+        sendWithConnection(connection->cm, connection->sendChannel,
+                           &UA_KEYVALUEMAP_NULL, &networkBuffer);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 
@@ -130,11 +152,19 @@ START_TEST(EthernetSendWithVLANTag) {
     /* clock_gettime(CLOCKID, &nextnanosleeptime); */
     /* transmission_time = ((UA_UInt64)nextnanosleeptime.tv_sec * SECONDS + (UA_UInt64)nextnanosleeptime.tv_nsec) + roundOffCycleTime + QBV_OFFSET; */
     /* ethernettransportSettings.transmission_time = transmission_time; */
-    /* Initialize a buffer to send data */
 
+    /* Initialize a buffer to send data */
     UA_ByteString testBuffer = UA_STRING(BUFFER_STRING);
+    UA_ByteString networkBuffer = UA_STRING_NULL;
+    connection->cm->allocNetworkBuffer(connection->cm,
+                                       connection->sendChannel,
+                                       &networkBuffer,
+                                       testBuffer.length);
+    memcpy(networkBuffer.data, testBuffer.data, testBuffer.length);
+
     UA_StatusCode retVal = connection->cm->
-        sendWithConnection(connection->cm, connection->sendChannel, &UA_KEYVALUEMAP_NULL, &testBuffer);
+        sendWithConnection(connection->cm, connection->sendChannel,
+                           &UA_KEYVALUEMAP_NULL, &networkBuffer);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 

From 88c189c997c2b30dede3a80a3436405bfd4d7747 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 00:39:12 +0200
Subject: [PATCH 0989/1963] feat(el): Log opening of Ethernet sockets

---
 arch/eventloop_posix_eth.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 880e21fbea9..b6ae55f2c62 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -501,6 +501,10 @@ ETH_openListenConnection(UA_EventLoopPOSIX *el, ETH_FD *conn,
         }
     } 
 
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                "ETH %u\t| Opened an Ethernet listen socket",
+                (unsigned)conn->rfd.fd);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -553,6 +557,12 @@ ETH_openSendConnection(UA_EventLoopPOSIX *el, ETH_FD *conn, const UA_KeyValueMap
     /* Generate the Ethernet header */
     conn->headerSize = setETHHeader(conn->header, dest, source, etherType,
                                   vid, pcp, eid, &conn->lengthOffset);
+
+
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                "ETH %u\t| Opened an Ethernet send socket",
+                (unsigned)conn->rfd.fd);
+
     return UA_STATUSCODE_GOOD;
 }
 

From 3b3cc011cf74475fcd1bd631b024a348ec0d8814 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 16:23:17 +0200
Subject: [PATCH 0990/1963] fix(el): MQTT ConnectionManager send
 UA_CONNECTIONSTATE_CLOSING when the connection closes

---
 arch/eventloop_mqtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index 983820c05a0..37f3e5dc4bb 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -306,7 +306,7 @@ removeTopicConnection(MQTTTopicConnection *tc) {
     UA_Variant_setScalar(&kvp[0].value, &tc->subscribe, &UA_TYPES[UA_TYPES_BOOLEAN]);
     UA_KeyValueMap kvm = {2, kvp};
     tc->callback(&bc->mcm->cm, tc->topicConnectionId, tc->application, &tc->context,
-                 UA_CONNECTIONSTATE_CLOSED, &kvm, UA_BYTESTRING_NULL);
+                 UA_CONNECTIONSTATE_CLOSING, &kvm, UA_BYTESTRING_NULL);
 
     /* Register delayed callback to free the memory */
     UA_EventLoop *el = bc->mcm->cm.eventSource.eventLoop;

From 591dbda349a1813d474fbb28db0e70959f3b314d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 16:24:36 +0200
Subject: [PATCH 0991/1963] fix(pubsub): Use correct parameters for MQTT
 connections

---
 src/pubsub/ua_pubsub_eventloop.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 26fc2d3ee2e..43a33f11b67 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -655,12 +655,12 @@ UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg) {
 
     /* Set up the connection parameters.
      * TODO: Complete the MQTT parameters. */
-    UA_Boolean listen = true;
+    UA_Boolean listen = false;
     UA_KeyValuePair kvp[4];
     UA_KeyValueMap kvm = {4, kvp};
     kvp[0].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
-    kvp[1].key = UA_QUALIFIEDNAME(0, "listen");
+    kvp[1].key = UA_QUALIFIEDNAME(0, "subscribe");
     UA_Variant_setScalar(&kvp[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
     kvp[2].key = UA_QUALIFIEDNAME(0, "port");
     UA_Variant_setScalar(&kvp[2].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
@@ -921,7 +921,7 @@ UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg) {
     UA_KeyValueMap kvm = {4, kvp};
     kvp[0].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
-    kvp[1].key = UA_QUALIFIEDNAME(0, "listen");
+    kvp[1].key = UA_QUALIFIEDNAME(0, "subscribe");
     UA_Variant_setScalar(&kvp[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
     kvp[2].key = UA_QUALIFIEDNAME(0, "port");
     UA_Variant_setScalar(&kvp[2].value, &port, &UA_TYPES[UA_TYPES_UINT16]);

From b289cc4990d7e264b937782fa8126f74ddbd9b55 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 16:25:38 +0200
Subject: [PATCH 0992/1963] fix(test): Fix async connection opening in
 check_pubsub_mqtt.c

---
 tests/pubsub/check_pubsub_mqtt.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index 11f434a34f9..48eaa1e38c2 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -45,7 +45,6 @@ static void setup(void) {
         UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp");
     connectionConfig.enabled = UA_TRUE;
 
-
     /* configure address of the mqtt broker (local on default port) */
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING(TEST_MQTT_SERVER)};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
@@ -205,8 +204,15 @@ START_TEST(SinglePublishSubscribeDateTime){
                                             &dataSetWriterConfig, &dataSetWriterIdent);
         ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
+        retval = UA_Server_setWriterGroupOperational(server, writerGroupIdent);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
         UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroupIdent);
         ck_assert(wg != 0);
+
+        while(wg->state != UA_PUBSUBSTATE_OPERATIONAL)
+            UA_Server_run_iterate(server, false);
+
         UA_WriterGroup_publishCallback(server, wg);
 
         /*---------------------------------------------------------------------*/

From b37c9af3fbf1f6602229770bcc2089c2b78bbbd1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 16:45:13 +0200
Subject: [PATCH 0993/1963] fix(examples): Make tutorial_pubsub_mqtt_* build
 for MSVC

---
 .../pubsub/tutorial_pubsub_mqtt_publish.c     | 55 +++++++++----------
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   | 55 +++++++++----------
 2 files changed, 52 insertions(+), 58 deletions(-)

diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 72413af1bb5..45365c98ef9 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -115,44 +115,41 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
     connectionConfig.publisherId.uint16 = 2234;
 
     /* configure options, set mqtt client id */
-    const int connectionOptionsCount = 1
-#ifdef EXAMPLE_USE_MQTT_LOGIN
-    + LOGIN_OPTION_COUNT
-#endif
-#ifdef EXAMPLE_USE_MQTT_TLS
-    + TLS_OPTION_COUNT
-#endif
-    ;
+/* #ifdef EXAMPLE_USE_MQTT_LOGIN */
+/*     + LOGIN_OPTION_COUNT */
+/* #endif */
+/* #ifdef EXAMPLE_USE_MQTT_TLS */
+/*     + TLS_OPTION_COUNT */
+/* #endif */
 
-    UA_KeyValuePair connectionOptions[connectionOptionsCount];
+    UA_KeyValuePair connectionOptions[1];
 
-    size_t connectionOptionIndex = 0;
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, CONNECTIONOPTION_NAME);
     UA_String mqttClientId = UA_STRING(MQTT_CLIENT_ID);
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttClientId, &UA_TYPES[UA_TYPES_STRING]);
+    connectionOptions[0].key = UA_QUALIFIEDNAME(0, CONNECTIONOPTION_NAME);
+    UA_Variant_setScalar(&connectionOptions[0].value, &mqttClientId, &UA_TYPES[UA_TYPES_STRING]);
 
-#ifdef EXAMPLE_USE_MQTT_LOGIN
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USERNAME_OPTION_NAME);
-    UA_String mqttUsername = UA_STRING(MQTT_USERNAME);
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUsername, &UA_TYPES[UA_TYPES_STRING]);
+/* #ifdef EXAMPLE_USE_MQTT_LOGIN */
+/*     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USERNAME_OPTION_NAME); */
+/*     UA_String mqttUsername = UA_STRING(MQTT_USERNAME); */
+/*     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUsername, &UA_TYPES[UA_TYPES_STRING]); */
 
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, PASSWORD_OPTION_NAME);
-    UA_String mqttPassword = UA_STRING(MQTT_PASSWORD);
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttPassword, &UA_TYPES[UA_TYPES_STRING]);
-#endif
+/*     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, PASSWORD_OPTION_NAME); */
+/*     UA_String mqttPassword = UA_STRING(MQTT_PASSWORD); */
+/*     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttPassword, &UA_TYPES[UA_TYPES_STRING]); */
+/* #endif */
 
-#ifdef EXAMPLE_USE_MQTT_TLS
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USE_TLS_OPTION_NAME);
-    UA_Boolean mqttUseTLS = true;
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUseTLS, &UA_TYPES[UA_TYPES_BOOLEAN]);
+/* #ifdef EXAMPLE_USE_MQTT_TLS */
+/*     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USE_TLS_OPTION_NAME); */
+/*     UA_Boolean mqttUseTLS = true; */
+/*     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUseTLS, &UA_TYPES[UA_TYPES_BOOLEAN]); */
 
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, MQTT_CA_FILE_PATH_OPTION_NAME);
-    UA_String mqttCaFile = UA_STRING(CA_FILE_PATH);
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttCaFile, &UA_TYPES[UA_TYPES_STRING]);
-#endif
+/*     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, MQTT_CA_FILE_PATH_OPTION_NAME); */
+/*     UA_String mqttCaFile = UA_STRING(CA_FILE_PATH); */
+/*     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttCaFile, &UA_TYPES[UA_TYPES_STRING]); */
+/* #endif */
 
     connectionConfig.connectionProperties.map = connectionOptions;
-    connectionConfig.connectionProperties.mapSize = connectionOptionIndex;
+    connectionConfig.connectionProperties.mapSize = 1;
 
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index 6484cfbafa7..0d5b2af4188 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -85,44 +85,41 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
     connectionConfig.publisherId.uint16 = 2234;
 
     /* configure options, set mqtt client id */
-    const int connectionOptionsCount = 1
-#ifdef EXAMPLE_USE_MQTT_LOGIN
-    + LOGIN_OPTION_COUNT
-#endif
-#ifdef EXAMPLE_USE_MQTT_TLS
-    + TLS_OPTION_COUNT
-#endif
-    ;
+/* #ifdef EXAMPLE_USE_MQTT_LOGIN */
+/*     + LOGIN_OPTION_COUNT */
+/* #endif */
+/* #ifdef EXAMPLE_USE_MQTT_TLS */
+/*     + TLS_OPTION_COUNT */
+/* #endif */
 
-    UA_KeyValuePair connectionOptions[connectionOptionsCount];
+    UA_KeyValuePair connectionOptions[1];
 
-    size_t connectionOptionIndex = 0;
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, CONNECTIONOPTION_NAME);
     UA_String mqttClientId = UA_STRING(MQTT_CLIENT_ID);
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttClientId, &UA_TYPES[UA_TYPES_STRING]);
+    connectionOptions[0].key = UA_QUALIFIEDNAME(0, CONNECTIONOPTION_NAME);
+    UA_Variant_setScalar(&connectionOptions[0].value, &mqttClientId, &UA_TYPES[UA_TYPES_STRING]);
 
-#ifdef EXAMPLE_USE_MQTT_LOGIN
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USERNAME_OPTION_NAME);
-    UA_String mqttUsername = UA_STRING(MQTT_USERNAME);
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUsername, &UA_TYPES[UA_TYPES_STRING]);
+/* #ifdef EXAMPLE_USE_MQTT_LOGIN */
+/*     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USERNAME_OPTION_NAME); */
+/*     UA_String mqttUsername = UA_STRING(MQTT_USERNAME); */
+/*     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUsername, &UA_TYPES[UA_TYPES_STRING]); */
 
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, PASSWORD_OPTION_NAME);
-    UA_String mqttPassword = UA_STRING(MQTT_PASSWORD);
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttPassword, &UA_TYPES[UA_TYPES_STRING]);
-#endif
+/*     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, PASSWORD_OPTION_NAME); */
+/*     UA_String mqttPassword = UA_STRING(MQTT_PASSWORD); */
+/*     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttPassword, &UA_TYPES[UA_TYPES_STRING]); */
+/* #endif */
 
-#ifdef EXAMPLE_USE_MQTT_TLS
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USE_TLS_OPTION_NAME);
-    UA_Boolean mqttUseTLS = true;
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUseTLS, &UA_TYPES[UA_TYPES_BOOLEAN]);
+/* #ifdef EXAMPLE_USE_MQTT_TLS */
+/*     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, USE_TLS_OPTION_NAME); */
+/*     UA_Boolean mqttUseTLS = true; */
+/*     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttUseTLS, &UA_TYPES[UA_TYPES_BOOLEAN]); */
 
-    connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, MQTT_CA_FILE_PATH_OPTION_NAME);
-    UA_String mqttCaFile = UA_STRING(CA_FILE_PATH);
-    UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttCaFile, &UA_TYPES[UA_TYPES_STRING]);
-#endif
+/*     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, MQTT_CA_FILE_PATH_OPTION_NAME); */
+/*     UA_String mqttCaFile = UA_STRING(CA_FILE_PATH); */
+/*     UA_Variant_setScalar(&connectionOptions[connectionOptionIndex++].value, &mqttCaFile, &UA_TYPES[UA_TYPES_STRING]); */
+/* #endif */
 
     connectionConfig.connectionProperties.map = connectionOptions;
-    connectionConfig.connectionProperties.mapSize = connectionOptionIndex;
+    connectionConfig.connectionProperties.mapSize = 1;
 
     retval |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 

From 6cd1b469c221baf0b406b9d9ee50b328a91f270d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 21:33:08 +0200
Subject: [PATCH 0994/1963] refactor(pubsub): Remove old plugin API from
 ua_pubsub_config.c

---
 src/pubsub/ua_pubsub_config.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index fa020ce393f..0a019b229fd 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -9,12 +9,6 @@
 #include <open62541/server_pubsub.h>
 
 #if defined(UA_ENABLE_PUBSUB) && defined(UA_ENABLE_PUBSUB_FILE_CONFIG)
-
-#include <open62541/plugin/pubsub_udp.h>
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
-#include <open62541/plugin/pubsub_ethernet.h>
-#endif
-
 #include "pubsub/ua_pubsub.h"
 #include "server/ua_server_internal.h"
 

From b93e585f3e586207774c4bc1db683a3a2f920a27 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 22:10:51 +0200
Subject: [PATCH 0995/1963] refactor(pubsub): Remove dependencies on
 plugin/pubsub.h

---
 include/open62541/server_pubsub.h | 29 ++++-------------------------
 src/pubsub/ua_pubsub.h            |  7 -------
 src/pubsub/ua_pubsub_manager.c    | 25 -------------------------
 src/server/ua_server_config.c     | 20 --------------------
 4 files changed, 4 insertions(+), 77 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 2110c2cbc76..5974295922b 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -15,9 +15,7 @@
 #include <open62541/common.h>
 #include <open62541/util.h>
 #include <open62541/client.h>
-#include <open62541/plugin/pubsub.h>
 #include <open62541/plugin/securitypolicy.h>
-
 #include <open62541/plugin/eventloop.h>
 
 _UA_BEGIN_DECLS
@@ -171,7 +169,7 @@ typedef union {
     UA_String string;
 } UA_PublisherId;
 
-struct UA_PubSubConnectionConfig {
+typedef struct {
     UA_String name;
     UA_Boolean enabled;
     UA_PublisherIdType publisherIdType;
@@ -185,7 +183,7 @@ struct UA_PubSubConnectionConfig {
                               * the server if this is NULL). Propagates to the
                               * ReaderGroup/WriterGroup attached to the
                               * Connection. */
-};
+} UA_PubSubConnectionConfig;
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING
 
@@ -219,18 +217,13 @@ typedef struct {
 
 /* General PubSub configuration */
 struct UA_PubSubConfiguration {
-    /* PubSub network layer */
-    size_t transportLayersSize;
-    UA_PubSubTransportLayer *transportLayers;
-
     /* Callback for PubSub component state changes: If provided this callback
      * informs the application about PubSub component state changes. E.g. state
      * change from operational to error in case of a DataSetReader
      * MessageReceiveTimeout. The status code provides additional
      * information. */
-    void (*stateChangeCallback)(UA_Server *server, UA_NodeId *id, UA_PubSubState state,
-                                UA_StatusCode status);
-    /* TODO: maybe status code provides not enough information about the state change */
+    void (*stateChangeCallback)(UA_Server *server, UA_NodeId *id,
+                                UA_PubSubState state, UA_StatusCode status);
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     /* PubSub security policies */
@@ -243,20 +236,6 @@ struct UA_PubSubConfiguration {
 #endif
 };
 
-
-/**
- * The UA_ServerConfig_addPubSubTransportLayer is used to add a transport layer
- * to the server configuration. The list memory is allocated and will be freed
- * with UA_PubSubManager_delete.
- *
- * .. note:: If the UA_String transportProfileUri was dynamically allocated
- *           the memory has to be freed when no longer required.
- *
- * .. note:: This has to be done before the server is started with UA_Server_run. */
-
-UA_StatusCode UA_EXPORT
-UA_ServerConfig_addPubSubTransportLayer(UA_ServerConfig *config,
-                                        UA_PubSubTransportLayer pubsubTransportLayer);
 /**
  * Add a new PubSub connection to the given server and open it.
  * @param[in] server the server to add the connection to
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index d6b035b19f7..883096b30fb 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -16,7 +16,6 @@
 #define UA_PUBSUB_H_
 
 #define UA_INTERNAL
-#include <open62541/plugin/pubsub.h>
 #include <open62541/server.h>
 #include <open62541/server_pubsub.h>
 
@@ -28,8 +27,6 @@
 #include <ua_pubsub_keystorage.h>
 #endif
 
-/* The public configuration structs are defined in include/ua_plugin_pubsub.h */
-
 _UA_BEGIN_DECLS
 
 #ifdef UA_ENABLE_PUBSUB
@@ -843,10 +840,6 @@ UA_PubSubManager_generateUniqueGuid(UA_Server *server);
 UA_UInt32
 UA_PubSubConfigurationVersionTimeDifference(void);
 
-UA_PubSubTransportLayer *
-UA_getTransportProtocolLayer(const UA_Server *server,
-                             const UA_String *transportProfileUri);
-
 /*************************************************/
 /*      PubSub component monitoring              */
 /*************************************************/
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 4102037d106..156ec672343 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -26,25 +26,6 @@
 #define UA_RESERVEID_LAST_ID UA_RESERVEID_FIRST_ID + 10
 #endif
 
-UA_PubSubTransportLayer *
-UA_getTransportProtocolLayer(const UA_Server *server,
-                             const UA_String *transportProfileUri) {
-    /* Find the matching UA_PubSubTransportLayers */
-    UA_PubSubTransportLayer *tl = NULL;
-    for(size_t i = 0; i < server->config.pubSubConfig.transportLayersSize; i++) {
-        if(UA_String_equal(&server->config.pubSubConfig.transportLayers[i].transportProfileUri,
-                           transportProfileUri)) {
-            tl = &server->config.pubSubConfig.transportLayers[i];
-        }
-    }
-    if(!tl) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Requested transport layer not found.");
-        return NULL;
-    }
-    return tl;
-}
-
 static void
 UA_PubSubManager_addTopic(UA_PubSubManager *pubSubManager, UA_TopicAssign *topicAssign) {
     TAILQ_INSERT_TAIL(&pubSubManager->topicAssign, topicAssign, listEntry);
@@ -473,12 +454,6 @@ UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
     ZIP_ITER(UA_ReserveIdTree, &server->pubSubManager.reserveIds, removeReserveId, NULL);
     server->pubSubManager.reserveIdsSize = 0;
 
-    /* Free the list of transport layers */
-    if(server->config.pubSubConfig.transportLayersSize > 0) {
-        UA_free(server->config.pubSubConfig.transportLayers);
-        server->config.pubSubConfig.transportLayersSize = 0;
-    }
-
     /* Delete subscribed datasets */
     UA_StandaloneSubscribedDataSet *tmpSDS1, *tmpSDS2;
     TAILQ_FOREACH_SAFE(tmpSDS1, &server->pubSubManager.subscribedDataSets, listEntry, tmpSDS2){
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 4f7abc72c6c..cbc77534265 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -114,23 +114,3 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
     UA_cleanupDataTypeWithCustom(config->customDataTypes);
     config->customDataTypes = NULL;
 }
-
-#ifdef UA_ENABLE_PUBSUB
-/* Add a pubsubTransportLayer to the configuration. Memory is reallocated on
- * demand. */
-UA_StatusCode
-UA_ServerConfig_addPubSubTransportLayer(UA_ServerConfig *config,
-                                        UA_PubSubTransportLayer pubsubTransportLayer) {
-    UA_PubSubTransportLayer *tmpLayers = (UA_PubSubTransportLayer*)
-        UA_realloc(config->pubSubConfig.transportLayers,
-                   sizeof(UA_PubSubTransportLayer) *
-                   (config->pubSubConfig.transportLayersSize + 1));
-    if(tmpLayers == NULL)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
-    config->pubSubConfig.transportLayers = tmpLayers;
-    config->pubSubConfig.transportLayers[config->pubSubConfig.transportLayersSize] = pubsubTransportLayer;
-    config->pubSubConfig.transportLayersSize++;
-    return UA_STATUSCODE_GOOD;
-}
-#endif /* UA_ENABLE_PUBSUB */

From d816b5bb62505e898360614621afeecf50c687a9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 22:15:32 +0200
Subject: [PATCH 0996/1963] refactor(pubsub): Remove the old PubSub connection
 API

---
 CMakeLists.txt                                |   14 -
 include/open62541/plugin/pubsub.h             |  135 --
 .../open62541/plugin/pubsub_ethernet.h        |   32 -
 .../include/open62541/plugin/pubsub_mqtt.h    |   20 -
 plugins/include/open62541/plugin/pubsub_udp.h |   22 -
 plugins/mqtt/templates/mbedtls_sockets.h      |  159 --
 plugins/mqtt/templates/openssl_sockets.h      |  102 --
 plugins/mqtt/templates/posix_sockets.h        |   86 --
 plugins/mqtt/ua_mqtt-c_adapter.c              |  504 ------
 plugins/mqtt/ua_mqtt-c_adapter.h              |   83 -
 plugins/ua_pubsub_ethernet.c                  | 1364 -----------------
 plugins/ua_pubsub_mqtt.c                      |  432 ------
 plugins/ua_pubsub_udp.c                       |  590 -------
 plugins/ua_pubsub_udp_multicast.c             |  899 -----------
 14 files changed, 4442 deletions(-)
 delete mode 100644 include/open62541/plugin/pubsub.h
 delete mode 100644 plugins/include/open62541/plugin/pubsub_ethernet.h
 delete mode 100644 plugins/include/open62541/plugin/pubsub_mqtt.h
 delete mode 100644 plugins/include/open62541/plugin/pubsub_udp.h
 delete mode 100644 plugins/mqtt/templates/mbedtls_sockets.h
 delete mode 100644 plugins/mqtt/templates/openssl_sockets.h
 delete mode 100644 plugins/mqtt/templates/posix_sockets.h
 delete mode 100644 plugins/mqtt/ua_mqtt-c_adapter.c
 delete mode 100644 plugins/mqtt/ua_mqtt-c_adapter.h
 delete mode 100644 plugins/ua_pubsub_ethernet.c
 delete mode 100644 plugins/ua_pubsub_mqtt.c
 delete mode 100644 plugins/ua_pubsub_udp.c
 delete mode 100644 plugins/ua_pubsub_udp_multicast.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0de64bc87f..f4480031d11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -891,7 +891,6 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/accesscontrol.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/pki.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/securitypolicy.h
-                     ${PROJECT_SOURCE_DIR}/include/open62541/plugin/pubsub.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/eventloop.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h
                      ${historizing_exported_headers}
@@ -1123,19 +1122,6 @@ if(UA_ENABLE_MQTT)
 endif()
 
 if(UA_ENABLE_PUBSUB)
-    list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h)
-    list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp_multicast.c)
-    list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
-    if(UA_ENABLE_PUBSUB_ETH_UADP)
-        list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet.h)
-        list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet.c)
-        find_library(LIB_BPF bpf)
-        if(LIB_BPF)
-            list(APPEND open62541_LIBRARIES bpf)
-        else()
-            message("bpf library not found. XDP functionalities will not be available.")
-        endif()
-    endif()
     if(UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_PUBSUB_BUFMALLOC)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_bufmalloc.c)
         list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_bufmalloc.h)
diff --git a/include/open62541/plugin/pubsub.h b/include/open62541/plugin/pubsub.h
deleted file mode 100644
index 466d2949faa..00000000000
--- a/include/open62541/plugin/pubsub.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
- */
-
-#ifndef UA_PLUGIN_PUBSUB_H_
-#define UA_PLUGIN_PUBSUB_H_
-
-#include <open62541/types.h>
-#include <open62541/types_generated.h>
-#include <open62541/util.h>
-#include <open62541/plugin/log.h>
-
-
-_UA_BEGIN_DECLS
-
-#ifdef UA_ENABLE_PUBSUB
-
-/**
- * .. _pubsub_connection:
- *
- * PubSub Connection Plugin API
- * ============================
- *
- * The PubSub Connection API is the interface between concrete network
- * implementations and the internal pubsub code.
- *
- * The PubSub specification enables the creation of new connections on runtime.
- * Wording: 'Connection' -> OPC UA standard 'highlevel' perspective, 'Channel'
- * -> open62541 implementation 'lowlevel' perspective. A channel can be assigned
- * with different network implementations like UDP, MQTT, AMQP. The channel
- * provides basis services like send, regist, unregist, receive, close. */
-
-struct UA_PubSubConnectionConfig;
-typedef struct UA_PubSubConnectionConfig UA_PubSubConnectionConfig;
-
-struct UA_PubSubChannel;
-typedef struct UA_PubSubChannel UA_PubSubChannel;
-
-typedef enum {
-    UA_PUBSUB_CHANNEL_RDY,
-    UA_PUBSUB_CHANNEL_PUB,
-    UA_PUBSUB_CHANNEL_SUB,
-    UA_PUBSUB_CHANNEL_PUB_SUB,
-    UA_PUBSUB_CHANNEL_ERROR,
-    UA_PUBSUB_CHANNEL_CLOSED
-} UA_PubSubChannelState;
-
-typedef UA_StatusCode
-(*UA_PubSubReceiveCallback)(UA_PubSubChannel *channel,
-                            void *callbackContext,
-                            const UA_ByteString *buffer);
-
-/* Interface structure between network plugin and internal implementation */
-struct UA_PubSubChannel {
-    UA_UInt32 publisherId; /* unique identifier */
-    UA_PubSubChannelState state;
-    UA_PubSubConnectionConfig *connectionConfig; /* link to parent connection config */
-    UA_SOCKET sockfd;
-    void *handle; /* implementation specific data */
-    /*@info for handle: each network implementation should provide an structure
-    * UA_PubSubChannelData[ImplementationName] This structure can be used by the
-    * network implementation to store network implementation specific data.*/
-
-    /* Sending out the content of the buf parameter */
-    UA_StatusCode (*send)(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-                          UA_ByteString *buf);
-
-    /* Register to an specified message source, e.g. multicast group or topic. Callback is used for mqtt. */
-    UA_StatusCode (*regist)(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-        void (*callback)(UA_ByteString *encodedBuffer, UA_ByteString *topic));
-
-    /* Remove subscription to an specified message source, e.g. multicast group or topic */
-    UA_StatusCode (*unregist)(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings);
-
-    /* Receive messages. A regist to the message source is needed before. */
-    UA_StatusCode (*receive)(UA_PubSubChannel *channel,
-                             UA_ExtensionObject *transportSettings,
-                             UA_PubSubReceiveCallback receiveCallback,
-                             void *receiveCallbackContext,
-                             UA_UInt32 timeout);
-
-    /* Closing the connection and implicit free of the channel structures. */
-    UA_StatusCode (*close)(UA_PubSubChannel *channel);
-
-    UA_StatusCode (*closeSubscriber)(UA_PubSubChannel *channel);
-    UA_StatusCode (*closePublisher)(UA_PubSubChannel *channel);
-    UA_StatusCode (*openSubscriber)(UA_PubSubChannel *channel);
-    UA_StatusCode (*openPublisher)(UA_PubSubChannel *channel);
-
-    UA_StatusCode (*allocNetworkBuffer)(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize);
-    UA_StatusCode (*freeNetworkBuffer)(UA_PubSubChannel *channel, UA_ByteString *buf);
-
-    /* Giving the connection protocoll time to process inbound and outbound traffic. */
-    UA_StatusCode (*yield)(UA_PubSubChannel *channel, UA_UInt16 timeout);
-};
-
-/**
- * The UA_PubSubTransportLayer is used for the creation of new connections.
- * Whenever in runtime a new connection is requested, the internal PubSub
- * implementation calls the 'createPubSubChannel' function. The
- * 'transportProfileUri' contains the standard defined transport profile
- * information and is used to identify the type of connections which can be
- * created by the TransportLayer. The server config contains a list of
- * UA_PubSubTransportLayer. Take a look in the tutorial_pubsub_connection to get
- * information about the TransportLayer handling. */
-
-typedef struct UA_PubSubTransportLayer {
-    UA_String transportProfileUri;
-    void *connectionManager;
-    // UA_Server *server;
-    UA_PubSubChannel *(*createPubSubChannel)(struct UA_PubSubTransportLayer *tl, void *ctx);
-    UA_StatusCode (*createWriterGroupPubSubChannel)(UA_PubSubChannel** outChannel, struct UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void *ctx);
-} UA_PubSubTransportLayer;
-
-
-typedef struct {
-    void *connection;
-    UA_NetworkAddressUrlDataType *connectionAddress;
-    UA_PubSubConnectionConfig *connectionConfig;
-    UA_NetworkAddressUrlDataType  *writerGroupAddress;
-    UA_Server *server;
-    UA_Logger *logger;
-    UA_StatusCode (*decodeAndProcessNetworkMessage)(UA_Server *server,
-                                                    void *connection,
-                                                    UA_ByteString *buffer);
-} UA_TransportLayerContext;
-
-#endif /* UA_ENABLE_PUBSUB */
-
-_UA_END_DECLS
-
-#endif /* UA_PLUGIN_PUBSUB_H_ */
diff --git a/plugins/include/open62541/plugin/pubsub_ethernet.h b/plugins/include/open62541/plugin/pubsub_ethernet.h
deleted file mode 100644
index 0c87705a07b..00000000000
--- a/plugins/include/open62541/plugin/pubsub_ethernet.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *   Copyright 2018 (c) Kontron Europe GmbH (Author: Rudolf Hoyler)
- */
-
-#ifndef UA_NETWORK_PUBSUB_ETHERNET_H_
-#define UA_NETWORK_PUBSUB_ETHERNET_H_
-
-#include <open62541/plugin/pubsub.h>
-
-_UA_BEGIN_DECLS
-
-/**
- * EthernetWriterGroupTransportDataType
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
-/* TODO: This can be removed once publishingOffset parameter set in place
- * and normal DatagramWriterGroupTransportDataType can be used */
-typedef struct {
-    UA_Byte messageRepeatCount;
-    UA_Double messageRepeatDelay;
-    /* ETF related param - txtime to be published */
-    UA_UInt64  transmission_time;
-} UA_EthernetWriterGroupTransportDataType;
-
-UA_PubSubTransportLayer UA_EXPORT
-UA_PubSubTransportLayerEthernet(void);
-
-_UA_END_DECLS
-
-#endif /* UA_NETWORK_PUBSUB_ETHERNET_H_ */
diff --git a/plugins/include/open62541/plugin/pubsub_mqtt.h b/plugins/include/open62541/plugin/pubsub_mqtt.h
deleted file mode 100644
index c39652a4ffb..00000000000
--- a/plugins/include/open62541/plugin/pubsub_mqtt.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Fraunhofer IOSB (Author: Lukas Meling)
- *    Copyright (c) 2020 basysKom GmbH
- */
-
-#ifndef UA_PUBSUB_MQTT_H_
-#define UA_PUBSUB_MQTT_H_
-
-#include <open62541/plugin/pubsub.h>
-
-_UA_BEGIN_DECLS
-
-UA_PubSubTransportLayer UA_EXPORT
-UA_PubSubTransportLayerMQTT(void);
-
-_UA_END_DECLS
-
-#endif /* UA_PUBSUB_MQTT_H_ */
diff --git a/plugins/include/open62541/plugin/pubsub_udp.h b/plugins/include/open62541/plugin/pubsub_udp.h
deleted file mode 100644
index 105d27af1d3..00000000000
--- a/plugins/include/open62541/plugin/pubsub_udp.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2017-2018 (c) Fraunhofer IOSB (Author: Andreas Ebner)
- */
-
-#ifndef UA_NETWORK_UDPMC_H_
-#define UA_NETWORK_UDPMC_H_
-
-#include <open62541/plugin/pubsub.h>
-
-_UA_BEGIN_DECLS
-
-UA_PubSubTransportLayer UA_EXPORT
-UA_PubSubTransportLayerUDP(void);
-
-UA_PubSubTransportLayer UA_EXPORT
-UA_PubSubTransportLayerUDPMP(void);
-
-_UA_END_DECLS
-
-#endif /* UA_NETWORK_UDPMC_H_ */
diff --git a/plugins/mqtt/templates/mbedtls_sockets.h b/plugins/mqtt/templates/mbedtls_sockets.h
deleted file mode 100644
index 5d3935dba30..00000000000
--- a/plugins/mqtt/templates/mbedtls_sockets.h
+++ /dev/null
@@ -1,159 +0,0 @@
-#if !defined(__MBEDTLS_SOCKET_TEMPLATE_H__)
-#define __MBEDTLS_SOCKET_TEMPLATE_H__
-
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <mbedtls/error.h>
-#include <mbedtls/entropy.h>
-#include <mbedtls/ctr_drbg.h>
-#include <mbedtls/net_sockets.h>
-#include <mbedtls/ssl.h>
-
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/util.h>
-
-#if !defined(MBEDTLS_NET_POLL_READ)
-/* compat for older mbedtls */
-#define	MBEDTLS_NET_POLL_READ	1
-#define	MBEDTLS_NET_POLL_WRITE	1
-
-int
-mbedtls_net_poll(mbedtls_net_context * ctx, uint32_t rw, uint32_t timeout)
-{
-	/* XXX this is not ideal but good enough for an example */
-	usleep(300);
-	return 1;
-}
-#endif
-
-struct mbedtls_context {
-    mbedtls_net_context net_ctx;
-    mbedtls_ssl_context ssl_ctx;
-    mbedtls_ssl_config ssl_conf;
-    mbedtls_x509_crt ca_crt;
-    mbedtls_entropy_context entropy;
-    mbedtls_ctr_drbg_context ctr_drbg;
-};
-
-UA_StatusCode failed(const char *fn, int rv);
-UA_StatusCode cert_verify_failed(uint32_t rv);
-UA_StatusCode open_nb_socket(struct mbedtls_context *ctx,
-                    const char *hostname,
-                    const char *port,
-                    const char *ca_file);
-
-
-UA_StatusCode failed(const char *fn, int rv) {
-    char buf[100];
-    mbedtls_strerror(rv, buf, sizeof(buf));
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                 "MQTT PubSub: %s failed with %x %s", fn, -rv, buf);
-    return UA_STATUSCODE_BADINTERNALERROR;
-}
-
-UA_StatusCode cert_verify_failed(uint32_t rv) {
-    char buf[512];
-    mbedtls_x509_crt_verify_info(buf, sizeof(buf), "\t", rv);
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                 "MQTT PubSub: Certificate verification failed (%x) %s", rv, buf);
-    return UA_STATUSCODE_BADINTERNALERROR;
-}
-
-/*
-    A template for opening a non-blocking mbed TLS connection.
-*/
-UA_StatusCode open_nb_socket(struct mbedtls_context *ctx,
-                    const char *hostname,
-                    const char *port,
-                    const char *ca_file) {
-    const unsigned char *additional = (const unsigned char *)"MQTT-C";
-    size_t additional_len = 6;
-    int rv;
-
-    mbedtls_net_context *net_ctx = &ctx->net_ctx;
-    mbedtls_ssl_context *ssl_ctx = &ctx->ssl_ctx;
-    mbedtls_ssl_config *ssl_conf = &ctx->ssl_conf;
-    mbedtls_x509_crt *ca_crt = &ctx->ca_crt;
-    mbedtls_entropy_context *entropy = &ctx->entropy;
-    mbedtls_ctr_drbg_context *ctr_drbg = &ctx->ctr_drbg;
-
-    mbedtls_entropy_init(entropy);
-    mbedtls_ctr_drbg_init(ctr_drbg);
-    rv = mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func, entropy,
-                               additional, additional_len);
-    if (rv != 0) {
-        return failed("mbedtls_ctr_drbg_seed", rv);
-    }
-
-    mbedtls_x509_crt_init(ca_crt);
-    rv = mbedtls_x509_crt_parse_file(ca_crt, ca_file);
-    if (rv != 0) {
-        return failed("mbedtls_x509_crt_parse_file", rv);
-    }
-
-    mbedtls_ssl_config_init(ssl_conf);
-    rv = mbedtls_ssl_config_defaults(ssl_conf,  MBEDTLS_SSL_IS_CLIENT,
-                                     MBEDTLS_SSL_TRANSPORT_STREAM,
-                                     MBEDTLS_SSL_PRESET_DEFAULT);
-    if (rv != 0) {
-        return failed("mbedtls_ssl_config_defaults", rv);
-    }
-    mbedtls_ssl_conf_ca_chain(ssl_conf, ca_crt, NULL);
-    mbedtls_ssl_conf_authmode(ssl_conf, MBEDTLS_SSL_VERIFY_OPTIONAL);
-    mbedtls_ssl_conf_rng(ssl_conf, mbedtls_ctr_drbg_random, ctr_drbg);
-
-    mbedtls_net_init(net_ctx);
-    rv = mbedtls_net_connect(net_ctx, hostname, port, MBEDTLS_NET_PROTO_TCP);
-    if (rv != 0) {
-        return failed("mbedtls_net_connect", rv);
-    }
-    rv = mbedtls_net_set_nonblock(net_ctx);
-    if (rv != 0) {
-        return failed("mbedtls_net_set_nonblock", rv);
-    }
-
-    mbedtls_ssl_init(ssl_ctx);
-    rv = mbedtls_ssl_setup(ssl_ctx, ssl_conf);
-    if (rv != 0) {
-        return failed("mbedtls_ssl_setup", rv);
-    }
-    rv = mbedtls_ssl_set_hostname(ssl_ctx, hostname);
-    if (rv != 0) {
-        return failed("mbedtls_ssl_set_hostname", rv);
-    }
-    mbedtls_ssl_set_bio(ssl_ctx, net_ctx,
-                        mbedtls_net_send, mbedtls_net_recv, NULL);
-
-    for (;;) {
-        rv = mbedtls_ssl_handshake(ssl_ctx);
-        uint32_t want = 0;
-        if (rv == MBEDTLS_ERR_SSL_WANT_READ) {
-            want |= MBEDTLS_NET_POLL_READ;
-        } else if (rv == MBEDTLS_ERR_SSL_WANT_WRITE) {
-            want |= MBEDTLS_NET_POLL_WRITE;
-        } else {
-            break;
-        }
-        rv = mbedtls_net_poll(net_ctx, want, (uint32_t)-1);
-        if (rv < 0) {
-            return failed("mbedtls_net_poll", rv);
-        }
-    }
-    if (rv != 0) {
-        return failed("mbedtls_ssl_handshake", rv);
-    }
-    uint32_t result = mbedtls_ssl_get_verify_result(ssl_ctx);
-    if (result != 0) {
-        if (result == (uint32_t)-1) {
-            return failed("mbedtls_ssl_get_verify_result", (int)result);
-        } else {
-            cert_verify_failed(result);
-        }
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-#endif
diff --git a/plugins/mqtt/templates/openssl_sockets.h b/plugins/mqtt/templates/openssl_sockets.h
deleted file mode 100644
index c15c9231a6e..00000000000
--- a/plugins/mqtt/templates/openssl_sockets.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#if !defined(__OPENSSL_SOCKET_TEMPLATE_H__)
-#define __OPENSSL_SOCKET_TEMPLATE_H__
-
-#include <openssl/bio.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#include <string.h>
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/util.h>
-
-/*
-    A template for opening a non-blocking OpenSSL connection.
-*/
-UA_StatusCode open_nb_socket(BIO**       bio,
-                    SSL_CTX**   ssl_ctx,
-                    const char* addr,
-                    const char* port,
-                    const char* ca_file,
-                    const char* ca_path,
-                    const char* cert_file,
-                    const char* key_file);
-
-UA_StatusCode open_nb_socket(BIO**       bio,
-                    SSL_CTX**   ssl_ctx,
-                    const char* addr,
-                    const char* port,
-                    const char* ca_file,
-                    const char* ca_path,
-                    const char* cert_file,
-                    const char* key_file)
-{
-    *ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-    SSL* ssl;
-
-    /* load certificate */
-    if (!SSL_CTX_load_verify_locations(*ssl_ctx, ca_file, ca_path)) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub: Failed to load ca certificate");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    if (cert_file && key_file)
-    {
-        if (!SSL_CTX_use_certificate_file(*ssl_ctx, cert_file, SSL_FILETYPE_PEM))
-        {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "MQTT PubSub: Failed to load client certificate");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-
-        if (!SSL_CTX_use_PrivateKey_file(*ssl_ctx, key_file, SSL_FILETYPE_PEM))
-        {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "MQTT PubSub: Failed to load client key");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-
-    /* open BIO socket */
-    char * addr_copy = (char*)malloc(strlen(addr) + 1);
-    strcpy(addr_copy,addr);
-    char * port_copy = (char*)malloc(strlen(port) + 1);
-    strcpy(port_copy,port);
-
-    *bio = BIO_new_ssl_connect(*ssl_ctx);
-    BIO_get_ssl(*bio, &ssl);
-    SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
-    BIO_set_conn_hostname(*bio, addr_copy);
-    BIO_set_nbio(*bio, 1);
-    BIO_set_conn_port(*bio, port_copy);
-
-    free(addr_copy);
-    free(port_copy);
-
-    /* wait for connect with 10 second timeout */
-    int start_time = (int)time(NULL);
-    int do_connect_rv = (int)BIO_do_connect(*bio);
-    while(do_connect_rv <= 0 && BIO_should_retry(*bio) && (int)time(NULL) - start_time < 10) {
-        do_connect_rv = (int)BIO_do_connect(*bio);
-    }
-    if (do_connect_rv <= 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub: Failed to open socket: %s", ERR_reason_error_string(ERR_get_error()));
-        BIO_free_all(*bio);
-        SSL_CTX_free(*ssl_ctx);
-        *bio = NULL;
-        *ssl_ctx=NULL;
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* verify certificate */
-    if (SSL_get_verify_result(ssl) != X509_V_OK) {
-        /* Handle the failed verification */
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub: x509 certificate verification failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-#endif
diff --git a/plugins/mqtt/templates/posix_sockets.h b/plugins/mqtt/templates/posix_sockets.h
deleted file mode 100644
index 1fb76c42008..00000000000
--- a/plugins/mqtt/templates/posix_sockets.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#if !defined(__POSIX_SOCKET_TEMPLATE_H__)
-#define __POSIX_SOCKET_TEMPLATE_H__
-
-#include <stdio.h>
-#include <sys/types.h>
-#if !defined(WIN32)
-#include <sys/socket.h>
-#include <netdb.h>
-#else
-#include <ws2tcpip.h>
-#endif
-#if defined(__VMS)
-#include <ioctl.h>
-#endif
-#include <fcntl.h>
-
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/util.h>
-
-/*
-    A template for opening a non-blocking POSIX socket.
-*/
-UA_StatusCode open_nb_socket(int* sockfd, const char* addr, const char* port);
-
-UA_StatusCode open_nb_socket(int* sockfd, const char* addr, const char* port) {
-    struct addrinfo hints;
-    memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_family = AF_UNSPEC; /* IPv4 or IPv6 */
-    hints.ai_socktype = SOCK_STREAM; /* Must be TCP */
-
-    *sockfd = -1;
-    struct addrinfo *p, *servinfo;
-
-    /* get address information */
-    int rv = getaddrinfo(addr, port, &hints, &servinfo);
-    if(rv != 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub: Failed to open socket (getaddrinfo): %s", gai_strerror(rv));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* open the first possible socket */
-    for(p = servinfo; p != NULL; p = p->ai_next) {
-        *sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
-        if (*sockfd == -1) continue;
-
-        /* connect to server */
-        rv = connect(*sockfd, p->ai_addr, p->ai_addrlen);
-        if(rv == -1) {
-          close(*sockfd);
-          *sockfd = -1;
-          continue;
-        }
-        break;
-    }
-
-    /* free servinfo */
-    freeaddrinfo(servinfo);
-
-    /* make non-blocking */
-#if !defined(WIN32)
-    if (*sockfd != -1) fcntl(*sockfd, F_SETFL, fcntl(*sockfd, F_GETFL) | O_NONBLOCK);
-#else
-    if (*sockfd != INVALID_SOCKET) {
-        int iMode = 1;
-        ioctlsocket(*sockfd, FIONBIO, &iMode);
-    }
-#endif
-#if defined(__VMS)
-    /*
-        OpenVMS only partially implements fcntl. It works on file descriptors
-        but silently fails on socket descriptors. So we need to fall back on
-        to the older ioctl system to set non-blocking IO
-    */
-    int on = 1;
-    if (*sockfd != -1) ioctl(*sockfd, FIONBIO, &on);
-#endif
-
-    /* return the new socket fd */
-    if(*sockfd == -1)
-        return UA_STATUSCODE_BADINTERNALERROR;
-    else
-        return UA_STATUSCODE_GOOD;
-}
-
-#endif
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.c b/plugins/mqtt/ua_mqtt-c_adapter.c
deleted file mode 100644
index 1381c3ede93..00000000000
--- a/plugins/mqtt/ua_mqtt-c_adapter.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2018 Fraunhofer IOSB (Author: Lukas Meling)
- * Copyright (c) 2020 basysKom GmbH
- * Copyright (c) 2022 Fraunhofer IOSB (Author: Noel Graf)
- */
-
-#include "ua_mqtt-c_adapter.h"
-#include "server/ua_server_internal.h"
-#include <mqtt.h>
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/util.h>
-
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
-#include <openssl_sockets.h>
-#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-#include <mbedtls_sockets.h>
-#else
-#include <posix_sockets.h>
-#endif
-#include <time.h>
-
-
-/* The function that would be called whenever a PUBLISH is received. */
-void
-publish_callback(void**, struct mqtt_response_publish*);
-
-void freeTLS(UA_PubSubChannelDataMQTT *data) {
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
-    if (!data->sockfd)
-        return;
-    BIO_free_all(data->sockfd);
-    //SSL_CTX_free(SSL_get_SSL_CTX(data->ssl));
-    data->sockfd = NULL;
-#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-    if (!data->sockfd)
-        return;
-    mbedtls_ssl_free(data->sockfd);
-    data->sockfd = NULL;
-#else
-    close(data->sockfd);
-#endif
-}
-
-UA_StatusCode
-connectMqtt(UA_PubSubChannelDataMQTT* channelData){
-    if(channelData == NULL){
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) || defined(UA_ENABLE_MQTT_TLS_MBEDTLS) // Extend condition when mbedTLS support is added
-    if ((channelData->mqttClientCertPath.length && !channelData->mqttClientKeyPath.length) ||
-            (channelData->mqttClientKeyPath.length && !channelData->mqttClientCertPath.length)) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub: If a client certificate is used, mqttClientCertPath and mqttClientKeyPath must be both specified");
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-#else
-    if (channelData->mqttUseTLS) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub: TLS connection requested but open62541 has been built without TLS support");
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-#endif
-
-    /* Get address and remove 'opc.mqtt://' from the address */
-    UA_NetworkAddressUrlDataType address = channelData->address;
-
-    UA_String hostname;
-    UA_UInt16 networkPort;
-    if(UA_parseEndpointUrl(&address.url, &hostname, &networkPort, NULL) != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub Connection creation failed. Invalid URL.");
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-    if (hostname.length == 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub Connection creation failed. Invalid URL.");
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-
-    /* Save hostname and networkPort as char arrays */
-    char addr[512];
-    char port[8];
-    if (hostname.length >= sizeof(addr)) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "MQTT PubSub Connection creation failed. Host address too long.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    memset(addr, 0, sizeof(addr));
-    memset(port, 0, sizeof(port));
-    sprintf(port, "%u", networkPort);
-    memcpy(addr, hostname.data, hostname.length);
-    addr[hostname.length] = '\0';
-
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) || defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
-    BIO *sockfd = NULL;
-    SSL_CTX *ctx;
-#else
-    struct mbedtls_context ctx;
-    mqtt_pal_socket_handle sockfd;
-#endif
-    if (channelData->mqttUseTLS) {
-        char *mqttCaFilePath = NULL;
-        if(channelData->mqttCaFilePath.length > 0) {
-            /* Convert tls certificate path UA_String to char* null terminated */
-            mqttCaFilePath = (char *)calloc(1, channelData->mqttCaFilePath.length + 1);
-            if(!mqttCaFilePath) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub MQTT: Connection creation failed. Out of memory.");
-                // TODO: There are several places in the existing code where channelData->connection is freed but not set to NULL
-                // The call to disconnectMqtt by the function calling this function in case of error causes heap-use-after-free
-                // Where should channelData->connection be cleaned up?
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            memcpy(mqttCaFilePath, channelData->mqttCaFilePath.data, channelData->mqttCaFilePath.length);
-        }
-
-        char *mqttCaPath = NULL;
-        if(channelData->mqttCaPath.length > 0) {
-            /* Convert tls CA path UA_String to char* null terminated */
-            mqttCaPath = (char *)calloc(1, channelData->mqttCaPath.length + 1);
-            if(!mqttCaPath) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub MQTT: Connection creation failed. Out of memory (mqttCAPath).");
-                UA_free(mqttCaFilePath);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            memcpy(mqttCaPath, channelData->mqttCaPath.data, channelData->mqttCaPath.length);
-        }
-
-        char *mqttClientCertPath = NULL;
-        if(channelData->mqttClientCertPath.length > 0) {
-            /* Convert tls client cert path UA_String to char* null terminated */
-            mqttClientCertPath = (char *)calloc(1, channelData->mqttClientCertPath.length + 1);
-            if(!mqttClientCertPath) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub MQTT: Connection creation failed. Out of memory (mqttClientCertPath).");
-                UA_free(mqttCaFilePath);
-                UA_free(mqttCaPath);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            memcpy(mqttClientCertPath, channelData->mqttClientCertPath.data, channelData->mqttClientCertPath.length);
-        }
-
-        char *mqttClientKeyPath = NULL;
-        if(channelData->mqttClientKeyPath.length > 0) {
-            /* Convert tls client key path UA_String to char* null terminated */
-            mqttClientKeyPath = (char *)calloc(1, channelData->mqttClientKeyPath.length + 1);
-            if(!mqttClientKeyPath) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub MQTT: Connection creation failed. Out of memory (mqttClientKeyPath).");
-                UA_free(mqttCaFilePath);
-                UA_free(mqttCaPath);
-                UA_free(mqttClientCertPath);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            memcpy(mqttClientKeyPath, channelData->mqttClientKeyPath.data, channelData->mqttClientKeyPath.length);
-        }
-#endif
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Extend condition when mbedTLS support is added
-        /* open the non-blocking TCP socket (connecting to the broker) */
-        UA_StatusCode rv = open_nb_socket(&sockfd, &ctx, &addr[0], &port[0], mqttCaFilePath, NULL, mqttClientCertPath, mqttClientKeyPath);
-        if(rv != UA_STATUSCODE_GOOD){
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
-            UA_free(mqttCaFilePath);
-            UA_free(mqttCaPath);
-            UA_free(mqttClientCertPath);
-            UA_free(mqttClientKeyPath);
-            return rv;
-        }
-
-        if (!ctx) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
-            UA_free(mqttCaFilePath);
-            UA_free(mqttCaPath);
-            UA_free(mqttClientCertPath);
-            UA_free(mqttClientKeyPath);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: TLS connection successfully opened.");
-    }
-
-#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-        /* open the non-blocking TCP socket (connecting to the broker) */
-        UA_StatusCode rv = open_nb_socket(&ctx, &addr[0], &port[0], mqttCaFilePath);
-        if(rv != UA_STATUSCODE_GOOD){
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
-            UA_free(mqttCaFilePath);
-            UA_free(mqttCaPath);
-            UA_free(mqttClientCertPath);
-            UA_free(mqttClientKeyPath);
-            return rv;
-        }
-        sockfd = &ctx.ssl_ctx;
-
-        if (sockfd == NULL) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
-            UA_free(mqttCaFilePath);
-            UA_free(mqttCaPath);
-            UA_free(mqttClientCertPath);
-            UA_free(mqttClientKeyPath);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-#else
-    int sockfd = -1;
-    /* open the non-blocking TCP socket (connecting to the broker) */
-    UA_StatusCode rv = open_nb_socket(&sockfd, &addr[0], &port[0]);
-    if(rv != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed.");
-        return rv;
-    }
-#endif
-
-    /* calloc mqtt_client */
-    struct mqtt_client* client = (struct mqtt_client*)UA_calloc(1, sizeof(struct mqtt_client));
-    if(!client){
-        freeTLS(channelData);
-        UA_free(channelData->connection);
-
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (mqtt_client).");
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    client->keep_alive = 400;
-
-    /* save reference */
-    channelData->mqttClient = client;
-
-    /* save socket fd*/
-    channelData->sockfd = sockfd;
-
-    /* init mqtt client struct with buffers and callback */
-    enum MQTTErrors mqttErr = mqtt_init(client, sockfd, channelData->mqttSendBuffer, channelData->mqttSendBufferSize,
-                channelData->mqttRecvBuffer, channelData->mqttRecvBufferSize, publish_callback);
-    if(mqttErr != MQTT_OK){
-        freeTLS(channelData);
-        UA_free(channelData->connection);
-        UA_free(client);
-
-        const char* errorStr = mqtt_error_str(mqttErr);
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. MQTT error (sendBuffer & RecvBuffer): %s", errorStr);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-    /* Convert clientId UA_String to char* null terminated */
-    char* clientId = (char*)calloc(1,channelData->mqttClientId->length + 1);
-    if(!clientId){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (mqttClientId).");
-        freeTLS(channelData);
-        UA_free(channelData->connection);
-        UA_free(client);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    memcpy(clientId, channelData->mqttClientId->data, channelData->mqttClientId->length);
-
-    char *username = NULL;
-    if (channelData->mqttUsername.length > 0) {
-        /* Convert username UA_String to char* null terminated */
-        username = (char*)calloc(1,channelData->mqttUsername.length + 1);
-        if(!username){
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (mqttUsername).");
-            freeTLS(channelData);
-            UA_free(channelData->connection);
-            UA_free(client);
-            UA_free(clientId);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        memcpy(username, channelData->mqttUsername.data, channelData->mqttUsername.length);
-    }
-
-    char *password = NULL;
-    if (channelData->mqttPassword.length > 0) {
-        /* Convert password UA_String to char* null terminated */
-        password = (char*)calloc(1,channelData->mqttPassword.length + 1);
-        if(!password){
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Connection creation failed. Out of memory (mqttPassword).");
-            freeTLS(channelData);
-            UA_free(channelData->connection);
-            UA_free(client);
-            UA_free(clientId);
-            UA_free(username);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        memcpy(password, channelData->mqttPassword.data, channelData->mqttPassword.length);
-    }
-
-    /* Connect mqtt with socket */
-    mqttErr = mqtt_connect(client, clientId, NULL, NULL, 0, username, password,
-                           0, client->keep_alive);
-    UA_free(clientId);
-    UA_free(username);
-    UA_free(password);
-
-    if(mqttErr != MQTT_OK){
-        freeTLS(channelData);
-        UA_free(channelData->connection);
-        UA_free(client);
-
-        const char* errorStr = mqtt_error_str(mqttErr);
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s", errorStr);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-disconnectMqtt(UA_PubSubChannelDataMQTT* channelData){
-    if(channelData == NULL){
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-    channelData->callback = NULL;
-    struct mqtt_client* client = (struct mqtt_client*)channelData->mqttClient;
-    if(client){
-        mqtt_disconnect(client);
-        yieldMqtt(channelData, 10);
-#ifdef UA_ENABLE_MQTT_TLS_OPENSSL //mbedTLS condition is missing
-        client->socketfd = NULL;
-#endif
-    }
-
-    freeTLS(channelData);
-
-    UA_free(channelData->mqttRecvBuffer);
-    channelData->mqttRecvBuffer = NULL;
-    UA_free(channelData->mqttSendBuffer);
-    channelData->mqttSendBuffer = NULL;
-    UA_free(channelData->mqttClient);
-    channelData->mqttClient = NULL;
-    return UA_STATUSCODE_GOOD;
-}
-
-void
-publish_callback(void** ptrServer, struct mqtt_response_publish *published)
-{
-    UA_Server *server = (UA_Server*)*ptrServer;
-    //UA_PubSubManager pubSubManager = server->pubSubManager;
-    UA_Boolean is_reader_configured = false;
-    const UA_String transport_uri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
-
-    UA_PubSubConnection *pubSubConnection;
-    TAILQ_FOREACH(pubSubConnection, &server->pubSubManager.connections, listEntry){
-        if(!UA_String_equal(&pubSubConnection->config.transportProfileUri, &transport_uri))
-            break;
-        UA_ReaderGroup* readerGroup = NULL;
-        LIST_FOREACH(readerGroup, &pubSubConnection->readerGroups, listEntry) {
-            if(readerGroup->state != UA_PUBSUBSTATE_OPERATIONAL)
-                break;
-            if(!LIST_EMPTY(&readerGroup->readers))
-                is_reader_configured = true;
-        }
-    }
-    if(!is_reader_configured)
-        return;
-
-    UA_LOG_TRACE(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Receive");
-    //Setup topic
-    UA_ByteString *topic = UA_ByteString_new();
-    if(!topic) return;
-    UA_ByteString *msg = UA_ByteString_new();
-    if(!msg) return;
-
-    /* memory for topic */
-    UA_StatusCode ret = UA_ByteString_allocBuffer(topic, published->topic_name_size);
-    if(ret){
-        UA_free(topic);
-        UA_free(msg);
-        return;
-    }
-    /* memory for message */
-    ret = UA_ByteString_allocBuffer(msg, published->application_message_size);
-    if(ret){
-        UA_ByteString_delete(topic);
-        UA_free(msg);
-        return;
-    }
-    /* copy topic and msg, call the cb */
-    memcpy(topic->data, published->topic_name, published->topic_name_size);
-    memcpy(msg->data, published->application_message, published->application_message_size);
-
-    /* UA_TopicAssign *topicAssign1; */
-    /* TAILQ_FOREACH(topicAssign1, &pubSubManager.topicAssign, listEntry){ */
-    /*     if(UA_String_equal(&topicAssign1->topic, topic)) { */
-    /*         UA_PubSubConnection* pConn = topicAssign1->rgIdentifier->linkedConnection; */
-    /*         //processMqttSubscriberCallback(server, pConn, msg); */
-    /*     } */
-    /* } */
-}
-
-UA_StatusCode
-subscribeMqtt(UA_PubSubChannelDataMQTT* channelData, UA_String topic, UA_Byte qos){
-    if(channelData == NULL || topic.length == 0){
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-    struct mqtt_client* client = (struct mqtt_client*)channelData->mqttClient;
-
-    UA_STACKARRAY(char, topicStr, sizeof(char) * topic.length +1);
-    memcpy(topicStr, topic.data, topic.length);
-    topicStr[topic.length] = '\0';
-
-    enum MQTTErrors mqttErr = mqtt_subscribe(client, topicStr, (UA_Byte) qos);
-    if(mqttErr != MQTT_OK){
-        const char* errorStr = mqtt_error_str(mqttErr);
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: subscribe: %s", errorStr);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-unSubscribeMqtt(UA_PubSubChannelDataMQTT* channelData, UA_String topic){
-    if(channelData == NULL || topic.length == 0){
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-    struct mqtt_client* client = (struct mqtt_client*)channelData->mqttClient;
-
-    UA_STACKARRAY(char, topicStr, sizeof(char) * topic.length +1);
-    memcpy(topicStr, topic.data, topic.length);
-    topicStr[topic.length] = '\0';
-
-    enum MQTTErrors mqttErr = mqtt_unsubscribe(client, topicStr);
-    if(mqttErr != MQTT_OK){
-        const char* errorStr = mqtt_error_str(mqttErr);
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: subscribe: %s", errorStr);
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_StatusCode
-yieldMqtt(UA_PubSubChannelDataMQTT* channelData, UA_UInt16 timeout){
-
-    struct mqtt_client* client = (struct mqtt_client*)channelData->mqttClient;
-
-    enum MQTTErrors error = mqtt_sync(client);
-    if(error == MQTT_OK){
-        return UA_STATUSCODE_GOOD;
-    }else if(error == -1){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK, "PubSub MQTT: yield: Communication Error.");
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-
-    /* map mqtt errors to ua errors */
-    const char* errorStr = mqtt_error_str(error);
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: yield: error: %s", errorStr);
-
-    switch(error){
-        case MQTT_ERROR_CONNECTION_CLOSED:
-            return UA_STATUSCODE_BADNOTCONNECTED;
-        case MQTT_ERROR_SOCKET_ERROR:
-            return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-        case MQTT_ERROR_CONNECTION_REFUSED:
-            return UA_STATUSCODE_BADCONNECTIONREJECTED;
-
-        default:
-            return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-}
-
-UA_StatusCode
-publishMqtt(UA_PubSubChannelDataMQTT* channelData, UA_String topic, const UA_ByteString *buf, UA_Byte qos){
-    if(channelData == NULL || buf == NULL ){
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-
-    UA_STACKARRAY(char, topicChar, sizeof(char) * topic.length +1);
-    memcpy(topicChar, topic.data, topic.length);
-    topicChar[topic.length] = '\0';
-
-    struct mqtt_client* client = (struct mqtt_client*)channelData->mqttClient;
-    if(client == NULL)
-        return UA_STATUSCODE_BADNOTCONNECTED;
-
-    /* publish */
-    enum MQTTPublishFlags flags;
-    if(qos == 0){
-        flags = MQTT_PUBLISH_QOS_0;
-    }else if( qos == 1){
-        flags = MQTT_PUBLISH_QOS_1;
-    }else if( qos == 2){
-        flags = MQTT_PUBLISH_QOS_2;
-    }else{
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK, "PubSub MQTT: publish: Bad Qos Level.");
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-
-    enum MQTTErrors mqttErr = mqtt_publish(client, topicChar, buf->data, buf->length, (uint8_t)flags);
-    if(mqttErr != MQTT_OK){
-        if(mqttErr == MQTT_ERROR_SEND_BUFFER_IS_FULL) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: publish: Send buffer is full. "
-                                                               "Possible reasons: send buffer is to small, "
-                                                               "sending to fast, broker not responding.");
-        }else{
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: publish: %s", mqtt_error_str(mqttErr));
-        }
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
diff --git a/plugins/mqtt/ua_mqtt-c_adapter.h b/plugins/mqtt/ua_mqtt-c_adapter.h
deleted file mode 100644
index 07f940f0b13..00000000000
--- a/plugins/mqtt/ua_mqtt-c_adapter.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2018 Fraunhofer IOSB (Author: Lukas Meling)
- * Copyright (c) 2020 basysKom GmbH
- */
-
-#ifndef UA_PLUGIN_MQTT_H_
-#define UA_PLUGIN_MQTT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <open62541/plugin/pubsub_mqtt.h>
-#include <open62541/plugin/network.h>
-#include "ua_pubsub.h"
-
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
-#include <openssl/ssl.h>
-#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-#include <mqtt_pal.h>
-#endif
-
-/* mqtt network layer specific internal data */
-typedef struct {
-    UA_NetworkAddressUrlDataType address;
-    UA_UInt32 mqttRecvBufferSize;
-    UA_UInt32 mqttSendBufferSize;
-    uint8_t *mqttSendBuffer;
-    uint8_t *mqttRecvBuffer;
-    UA_String *mqttClientId;
-    UA_Connection *connection;
-#if defined(UA_ENABLE_MQTT_TLS_OPENSSL)
-    BIO *sockfd;
-#elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-    mqtt_pal_socket_handle sockfd;
-#else
-    int sockfd;
-#endif
-    void * mqttClient;
-    void (*callback)(UA_ByteString *encodedBuffer, UA_ByteString *topic);
-    UA_String mqttUsername;
-    UA_String mqttPassword;
-    UA_String mqttCaFilePath;
-    UA_String mqttCaPath;
-    UA_String mqttClientCertPath;
-    UA_String mqttClientKeyPath;
-    UA_Boolean mqttUseTLS;
-} UA_PubSubChannelDataMQTT;
-/* TODO:
- * will topic,
- * will message,
- * keep alive
- * ssl: flag
- */
-
-void freeTLS(UA_PubSubChannelDataMQTT *data);
-
-UA_StatusCode
-connectMqtt(UA_PubSubChannelDataMQTT*);
-
-UA_StatusCode
-disconnectMqtt(UA_PubSubChannelDataMQTT*);
-
-UA_StatusCode
-unSubscribeMqtt(UA_PubSubChannelDataMQTT*, UA_String topic);
-
-UA_StatusCode
-publishMqtt(UA_PubSubChannelDataMQTT*, UA_String topic, const UA_ByteString *buf, UA_Byte qos);
-
-UA_StatusCode
-subscribeMqtt(UA_PubSubChannelDataMQTT*, UA_String topic, UA_Byte qos);
-
-UA_StatusCode
-yieldMqtt(UA_PubSubChannelDataMQTT*, UA_UInt16 timeout);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif /* UA_PLUGIN_MQTT_H_ */
diff --git a/plugins/ua_pubsub_ethernet.c b/plugins/ua_pubsub_ethernet.c
deleted file mode 100644
index d730bf15b33..00000000000
--- a/plugins/ua_pubsub_ethernet.c
+++ /dev/null
@@ -1,1364 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *   Copyright 2018 (c) Kontron Europe GmbH (Author: Rudolf Hoyler)
- *   Copyright 2019 (c) Wind River Systems, Inc.
- *   Copyright (c) 2019-2020 Kalycito Infotech Private Limited
- *   Copyright 2019-2020 (c) Wind River Systems, Inc.
- */
-
-#include <open62541/server_pubsub.h>
-#include <open62541/util.h>
-
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_ethernet.h>
-
-#define UA_RECEIVE_MSG_BUFFER_SIZE   4096
-static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferETH[UA_RECEIVE_MSG_BUFFER_SIZE];
-
-#if !defined(UA_ARCHITECTURE_POSIX) && !defined(UA_ARCHITECTURE_VXWORKS)
-/* For anything else than Linux or VxWorks which are specifically handled below,
- * depend only on headers included by the architecture layer.
- */
-#elif defined(__vxworks) || defined(__VXWORKS__)
-#include <netpacket/packet.h>
-#include <netinet/if_ether.h>
-#include <ipcom_sock.h>
-
-#define ETH_P_802_2 NET_ETH_P_802_2
-#define ETH_ALEN ETHER_ADDR_LEN
-#else
-#include <linux/if_packet.h>
-#include <netinet/ether.h>
-#include <linux/version.h>
-
-/* RLIMIT */
-#include <sys/time.h>
-#include <sys/resource.h>
-
-/* XSK kernel headers */
-
-#include <linux/bpf.h>
-#include <linux/if_link.h>
-
-#if defined __has_include
-#   if __has_include(<bpf/bpf.h>) && __has_include(<bpf/libbpf.h>) && __has_include(<bpf/xsk.h>)
-#       define LIBBPF_EBPF
-        /* Libbpf headers */
-#       include <bpf/bpf.h>
-#       include <bpf/libbpf.h>
-#       ifndef asm
-#           define asm __asm__
-#       endif
-#       include <bpf/xsk.h>
-#   endif
-#endif
-#endif
-
-#include <time.h>
-
-#define ETHERTYPE_UADP                       0xb62c
-#define MIN_ETHERNET_PACKET_SIZE_WITHOUT_FCS 60
-#define VLAN_HEADER_SIZE                     4
-#define VLAN_SHIFT                           13
-#define XDP_FRAME_SHIFT                      11 // Match the frame size 2048
-#define BATCH_SIZE                           16 // Receive buffer batch size
-
-#ifndef XDP_COPY
-#define XDP_COPY                             (1 << 1)
-#endif
-
-#ifndef XDP_FLAGS_SKB_MODE
-#define XDP_FLAGS_SKB_MODE                   (1U << 1)
-#endif
-
-#if defined(LIBBPF_EBPF)
-/* Theses structures shall be removed in the future XDP versions
- * (when RT Linux and XDP are mainlined and stable) */
-typedef struct {
-    char                    *frames;
-    struct xsk_ring_prod    fq;
-    struct xsk_ring_cons    cq;
-    struct xsk_umem *       umem;
-    void                    *buffer;
-    UA_Int32                fd;
-} xdp_umem;
-
-typedef struct {
-    struct xsk_ring_cons rx_ring;
-    struct xsk_ring_prod tx_ring;
-
-    struct xsk_socket *xskfd;
-    UA_UInt32 bpf_prog_id;
-
-    UA_UInt32 cur_tx;
-    UA_UInt32 cur_rx;
-
-    xdp_umem  *umem;
-    UA_UInt32 outstanding_tx;
-    UA_UInt64 rx_npkts;
-    UA_UInt64 tx_npkts;
-    UA_UInt64 prev_rx_npkts;
-    UA_UInt64 prev_tx_npkts;
-    UA_UInt32 idx_rx;
-    UA_UInt32 idx_fq;
-} xdpsock;
-#endif
-
-/* Configuration parameters for xdp socket */
-typedef struct {
-    UA_UInt32 no_of_frames;
-    UA_UInt32 frame_size;
-    UA_UInt32 no_of_desc;
-    UA_UInt32 fill_queue_no_of_desc;
-    UA_UInt32 com_queue_no_of_desc;
-} xskconfparam;
-
-/* Default values for xdp socket parameters */
-xskconfparam xsk_default_values = {2048, 2048, 2048, 2048, 2048};
-
-/* Ethernet network layer specific internal data */
-typedef struct {
-    int ifindex;
-    UA_UInt16 vid;
-    UA_Byte prio;
-    UA_Byte ifAddress[ETH_ALEN];
-    UA_Byte targetAddress[ETH_ALEN];
-    /* XDP related param - Linux specific */
-    UA_Boolean enableXdpSocket;
-#if defined(LIBBPF_EBPF)
-    UA_UInt32 xdp_flags;
-    xdpsock* xdpsocket;
-#endif
-    /* Send the packets with txtime ability - Linux specific */
-    UA_Boolean useSoTxTime;
-} UA_PubSubChannelDataEthernet;
-
-/* Additional socket options */
-typedef struct {
-    UA_UInt32  *socketPriority;
-    /* XDP related param - Linux specific */
-    UA_Boolean enableXdpSocket;
-    UA_UInt32 xdp_flags;
-    UA_UInt32 hw_receive_queue;
-    UA_UInt16 xdp_bind_flags;
-    /* ETF related socket options - Linux specific */
-    UA_Boolean enableSocketTxTime;
-    UA_Int32   sotxtimeDeadlinemode;
-    UA_Int32   sotxtimeReceiveerrors;
-} ethernetSocketOptions;
-
-/* ETF related structures - Required to send the packets with configured txtime */
-typedef struct {
-    clockid_t clockId;
-    uint16_t flags;
-} sock_txtime;
-
-enum txtime_flags {
-    SOF_TXTIME_DEADLINE_MODE = (1 << 0),
-    SOF_TXTIME_REPORT_ERRORS = (1 << 1),
-
-    SOF_TXTIME_FLAGS_LAST = SOF_TXTIME_REPORT_ERRORS,
-    SOF_TXTIME_FLAGS_MASK = (SOF_TXTIME_FLAGS_LAST - 1) |
-                             SOF_TXTIME_FLAGS_LAST
-};
-
-/*
- * OPC-UA specification Part 14:
- *
- * "The target is a MAC address, an IP address or a registered name like a
- *  hostname. The format of a MAC address is six groups of hexadecimal digits,
- *  separated by hyphens (e.g. 01-23-45-67-89-ab). A system may also accept
- *  hostnames and/or IP addresses if it provides means to resolve it to a MAC
- *  address (e.g. DNS and Reverse-ARP)."
- *
- * We do not support currently IP addresses or hostnames.
- */
-static UA_StatusCode
-UA_parseHardwareAddress(UA_String* target, UA_Byte* destinationMac) {
-    size_t curr = 0, idx = 0;
-    for(; idx < ETH_ALEN; idx++) {
-        UA_UInt32 value;
-        size_t progress =
-            UA_readNumberWithBase(&target->data[curr],
-                                  target->length - curr, &value, 16);
-        if(progress == 0 || value > (long)0xff)
-            return UA_STATUSCODE_BADINTERNALERROR;
-
-        destinationMac[idx] = (UA_Byte) value;
-
-        curr += progress;
-        if(curr == target->length)
-            break;
-
-        if(target->data[curr] != '-')
-            return UA_STATUSCODE_BADINTERNALERROR;
-
-        curr++; /* skip '-' */
-    }
-
-    if(idx != (ETH_ALEN-1))
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    return UA_STATUSCODE_GOOD;
-}
-
-#if defined(LIBBPF_EBPF)
-/**
- * UMEM is associated to a netdev and a specific queue id of that netdev.
- * It is created and configured (chunk size, headroom, start address and size) by using the XDP_UMEM_REG setsockopt system call.
- * UMEM uses two rings: FILL and COMPLETION. Each socket associated with the UMEM must have an RX queue, TX queue or both.
- */
-static xdp_umem *xdp_umem_configure(xskconfparam *xskparam) {
-    struct xsk_umem_config uconfig = {
-        .fill_size = xskparam->fill_queue_no_of_desc,
-        .comp_size = xskparam->com_queue_no_of_desc,
-        .frame_size = xskparam->frame_size,
-        .frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM,
-    };
-    xdp_umem *umem;
-    int ret;
-    size_t sret;
-    UA_UInt32 frames_per_ring;
-    UA_UInt32 idx;
-
-    umem = (xdp_umem *)UA_calloc(1, sizeof(*umem));
-    if (!umem) {
-        return NULL;
-    }
-
-    if (posix_memalign(&umem->buffer, (size_t)getpagesize(),
-                       xskparam->no_of_frames * xskparam->frame_size) != 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "buffer allocation of UMEM failed");
-        return NULL;
-    }
-
-    ret = xsk_umem__create(&umem->umem, umem->buffer,
-                           xskparam->no_of_frames * xskparam->frame_size,
-                           &umem->fq, &umem->cq,
-                           &uconfig);
-    if (ret) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub XSK UMEM creation failed. Out of memory.");
-        UA_free(umem->buffer);
-        UA_free(umem);
-        return NULL;
-    }
-
-    /* Populate rx fill ring with addresses */
-    frames_per_ring = xskparam->fill_queue_no_of_desc;
-
-    sret = xsk_ring_prod__reserve(&umem->fq, frames_per_ring, &idx);
-    if (sret != frames_per_ring){
-        UA_free(umem->buffer);
-        UA_free(umem);
-        return NULL;
-    }
-
-    for (UA_UInt64 i = 0; i < frames_per_ring; i++)
-        *xsk_ring_prod__fill_addr(&umem->fq, idx++) = i * frames_per_ring;
-
-    xsk_ring_prod__submit(&umem->fq, frames_per_ring);
-
-    return umem;
-}
-
-
-/**
- *  Configure AF_XDP socket to redirect frames to a memory buffer in a user-space application
- *  XSK has two rings: the RX ring and the TX ring
- *  A socket can receive packets on the RX ring and it can send packets on the TX ring
- */
-static xdpsock *xsk_configure(xdp_umem *umem, UA_UInt32 hw_receive_queue,
-                              int ifindex, char *ifname,
-                              UA_UInt32 xdp_flags, UA_UInt16 xdp_bind_flags) {
-    xdpsock *xdp_socket;
-    int ret;
-    struct xsk_socket_config cfg;
-
-    xskconfparam *xskparam = (xskconfparam *)UA_calloc(1, (sizeof(xskconfparam)));
-    memcpy(xskparam, &xsk_default_values, (sizeof(xskconfparam)));
-
-    xdp_socket = (xdpsock *)UA_calloc(1, sizeof(*xdp_socket));
-    if (!xdp_socket) {
-        return NULL;
-    }
-
-    if (umem)
-        xdp_socket->umem = umem;
-    else
-        xdp_socket->umem = xdp_umem_configure(xskparam);
-
-    if (!xdp_socket->umem) {
-        UA_close(xsk_socket__fd(xdp_socket->xskfd));
-        bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
-        UA_free(xskparam);
-        UA_free(xdp_socket);
-        return NULL;
-    }
-
-    xdp_socket->outstanding_tx = 0;
-    xdp_socket->idx_rx = 0;
-    xdp_socket->idx_fq = 0;
-
-    cfg.rx_size = xskparam->fill_queue_no_of_desc;
-    cfg.tx_size = xskparam->com_queue_no_of_desc;
-
-    cfg.libbpf_flags = 0;
-    cfg.xdp_flags = xdp_flags;
-    cfg.bind_flags = xdp_bind_flags;
-
-    ret = xsk_socket__create(&xdp_socket->xskfd,
-                             ifname,
-                             hw_receive_queue,
-                             xdp_socket->umem->umem,
-                             &xdp_socket->rx_ring,
-                             &xdp_socket->tx_ring,
-                             &cfg);
-
-    if (ret == ENOTSUP) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                      "PubSub connection creation failed."
-                      " xsk_socket__create not supported.");
-        UA_free(xdp_socket->umem->buffer);
-        (void)xsk_umem__delete(xdp_socket->umem->umem);
-        UA_free(xdp_socket->umem);
-        UA_free(xskparam);
-        UA_free(xdp_socket);
-        return NULL;
-    } else if (ret < 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                    "PubSub connection creation failed."
-                    " xsk_socket__create failed: %s", strerror(errno));
-        UA_free(xdp_socket->umem->buffer);
-        (void)xsk_umem__delete(xdp_socket->umem->umem);
-        UA_free(xdp_socket->umem);
-        UA_close(xsk_socket__fd(xdp_socket->xskfd));
-        bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
-        UA_free(xskparam);
-        UA_free(xdp_socket);
-        return NULL;
-    }
-
-    ret = bpf_get_link_xdp_id(ifindex, &xdp_socket->bpf_prog_id, xdp_flags);
-    if (ret) {
-        UA_LOG_ERROR (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub Connection creation failed. Unable to retrieve XDP program.");
-        UA_free(xdp_socket->umem->buffer);
-        (void)xsk_umem__delete(xdp_socket->umem->umem);
-        UA_free(xdp_socket->umem);
-        UA_close(xsk_socket__fd(xdp_socket->xskfd));
-        bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
-        UA_free(xskparam);
-        UA_free(xdp_socket);
-        return NULL;
-    }
-
-    UA_free(xskparam);
-    return xdp_socket;
-}
-
-static UA_StatusCode
-UA_PubSubChannelEthernetXDP_open(UA_PubSubChannelDataEthernet *channelDataEthernet,
-                                 ethernetSocketOptions *sockOptions,
-                                 UA_NetworkAddressUrlDataType *address) {
-    struct rlimit resourcelimit = {RLIM_INFINITY, RLIM_INFINITY};
-    if (setrlimit(RLIMIT_MEMLOCK, &resourcelimit)) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Set limit on the consumption of resources failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Create the UMEM and XDP sockets */
-    channelDataEthernet->xdpsocket = xsk_configure(NULL,
-                                                   sockOptions->hw_receive_queue,
-                                                   channelDataEthernet->ifindex,
-                                                   (char *)address->networkInterface.data,
-                                                   sockOptions->xdp_flags,
-                                                   sockOptions->xdp_bind_flags);
-    if(!channelDataEthernet->xdpsocket) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "XDP Socket configuration failed");
-        bpf_set_link_xdp_fd(channelDataEthernet->ifindex, -1,
-                            sockOptions->xdp_flags);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_PubSubChannelEthernetXDP_send(UA_PubSubChannelDataEthernet *channelDataEthernet,
-                                 const UA_ByteString *buf) {
-    struct ether_header* ethHdr;
-    UA_Byte *bufSend, *ptr;
-    xdpsock *xdp_socket;
-    UA_UInt16 vlanTag;
-    UA_UInt32 idx;
-    size_t lenBuf;
-    ssize_t rc;
-
-    xdp_socket = channelDataEthernet->xdpsocket;
-
-    bufSend = (UA_Byte *) xsk_umem__get_data(xdp_socket->umem->buffer,
-                                             xdp_socket->cur_tx << XDP_FRAME_SHIFT);
-    ethHdr = (struct ether_header *) bufSend;
-
-    /* Set (own) source MAC address */
-    memcpy(ethHdr->ether_shost, channelDataEthernet->ifAddress, ETH_ALEN);
-    /* Set destination MAC address */
-    memcpy(ethHdr->ether_dhost, channelDataEthernet->targetAddress, ETH_ALEN);
-    /* Set ethertype */
-    lenBuf = sizeof(*ethHdr) + buf->length;
-    ptr = sizeof(*ethHdr) + bufSend;
-
-    if(channelDataEthernet->vid > 0) {
-        lenBuf += 4;
-        ethHdr->ether_type = htons(ETHERTYPE_VLAN);
-        vlanTag = (UA_UInt16) (channelDataEthernet->vid
-                  + (channelDataEthernet->prio << VLAN_SHIFT));
-
-        *((UA_UInt16 *) ptr) = htons(vlanTag);
-        ptr += sizeof(UA_UInt16);
-
-        *((UA_UInt16 *) ptr) = htons(ETHERTYPE_UADP);
-        ptr += sizeof(UA_UInt16);
-    } else {
-        ethHdr->ether_type = htons(ETHERTYPE_UADP);
-    }
-
-    if (lenBuf > xsk_default_values.frame_size)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-    /* copy payload of ethernet message */
-    memcpy(ptr, buf->data, buf->length);
-
-    /* TODO: Modify XDP TX to handle packet count upto BATCH_SIZE */
-    if (xsk_ring_prod__reserve(&xdp_socket->tx_ring, 1, &idx) != 1) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub connection send failed. xsk_prod_reserve failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    xsk_ring_prod__tx_desc(&xdp_socket->tx_ring, idx)->addr = xdp_socket->cur_tx << XDP_FRAME_SHIFT;
-    xsk_ring_prod__tx_desc(&xdp_socket->tx_ring, idx)->len = (UA_UInt32) lenBuf;
-
-    xsk_ring_prod__submit(&xdp_socket->tx_ring, 1);
-    xdp_socket->outstanding_tx += 1;
-
-    /* Increase the cur_tx pointer, rollover if exceed */
-    xdp_socket->cur_tx += 1;
-    xdp_socket->cur_tx %= xsk_default_values.frame_size;
-
-    rc = UA_sendto(xsk_socket__fd(xdp_socket->xskfd), NULL, 0, MSG_DONTWAIT, NULL, 0);
-    if (rc >= 0 || errno == ENOBUFS || errno == EAGAIN || errno == EBUSY) {
-        UA_UInt32 rcvd = xsk_ring_cons__peek(&xdp_socket->umem->cq, 1, &idx);
-        if (rcvd > 0) {
-            xsk_ring_cons__release(&xdp_socket->umem->cq, rcvd);
-            xdp_socket->outstanding_tx -= rcvd;
-            xdp_socket->tx_npkts += rcvd;
-        }
-
-        return UA_STATUSCODE_GOOD;
-    }
-
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                 "PubSub connection send failed."
-                 " XSK Send message failed: %s", strerror(errno));
-    return UA_STATUSCODE_BADINTERNALERROR;
-
-}
-
-static UA_StatusCode
-UA_PubSubChannelEthernetXDP_receive(UA_PubSubChannelDataEthernet *channelDataEthernet,
-                                    UA_ByteString *message) {
-    struct ether_header *eth_hdr;
-    xdpsock *xdp_socket;
-    UA_UInt64 addr;
-    UA_UInt64 ret;
-    UA_UInt32 rcvd;
-    UA_Byte *pkt, *buf;
-    ssize_t len;
-
-    xdp_socket = channelDataEthernet->xdpsocket;
-    message->length = 0;
-
-    rcvd = xsk_ring_cons__peek(&xdp_socket->rx_ring, BATCH_SIZE, &xdp_socket->idx_rx);
-    if (!rcvd)
-        return UA_STATUSCODE_GOODNODATA; //No packets even after select/poll
-
-    ret = xsk_ring_prod__reserve(&xdp_socket->umem->fq, rcvd, &xdp_socket->idx_fq);
-    if(ret != rcvd)
-        return UA_STATUSCODE_BADINTERNALERROR; //Got data but failed to reserve, something's wrong
-
-    buf = message->data;
-    for(UA_UInt32 i = 0; i < rcvd; i++) {
-        addr = xsk_ring_cons__rx_desc(&xdp_socket->rx_ring, xdp_socket->idx_rx)->addr;
-        len  = (UA_UInt32) xsk_ring_cons__rx_desc(&xdp_socket->rx_ring, xdp_socket->idx_rx++)->len;
-        pkt  = (UA_Byte *) xsk_umem__get_data(xdp_socket->umem->buffer, addr);
-
-        /* AF_XDP does not do any filtering on ethertype or protocol.
-         * Manually check for VLAN headers and ETH UADP ethertype.
-         * Note: we use UA_UInt16 to compare ethertype, which is 2-bytes
-         */
-        UA_UInt16 *pkt_proto = (UA_UInt16 *) (pkt + (ETH_ALEN * 2));
-        if(channelDataEthernet->vid > 0 && *pkt_proto == htons(ETHERTYPE_VLAN))
-            pkt_proto += 2;
-
-        if(*pkt_proto != htons(ETHERTYPE_UADP))
-            return UA_STATUSCODE_GOODNODATA;
-
-        eth_hdr = (struct ether_header *) pkt;
-        /* Make sure we match our target */
-        if(memcmp(eth_hdr->ether_dhost, channelDataEthernet->targetAddress, ETH_ALEN) != 0) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "Invalid hardware address - XDP socket receive");
-            return UA_STATUSCODE_GOODNODATA;
-        }
-
-        UA_Byte *dataReceived = (UA_Byte *)pkt + sizeof(struct ether_header);
-        size_t dataLength = (size_t)len - sizeof(struct ether_header);
-        if(channelDataEthernet->vid > 0) {
-            dataReceived += 4;
-            dataLength -= 4;
-        }
-
-        /* Max buffer size allocated to receive a multiple messages is 4096 */
-        if ((message->length + dataLength) > 4096) {
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                        "During multiple receive max buffer size reached");
-            break;
-        }
-
-        if((dataLength < 46) && (i > 0)) {
-            message->length += 4;
-            buf += 4;
-        }
-
-        memcpy(buf, dataReceived, dataLength);
-        buf += dataLength;
-        message->length += dataLength;
-    }
-
-    xsk_ring_prod__submit(&xdp_socket->umem->fq, rcvd);
-    xsk_ring_cons__release(&xdp_socket->rx_ring, rcvd);
-    xdp_socket->rx_npkts += rcvd;
-    return UA_STATUSCODE_GOOD;
-}
-#endif
-
-/**
- * Open communication socket based on the connectionConfig.
- *
- * @return ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-UA_PubSubChannelEthernet_open(const UA_PubSubConnectionConfig *connectionConfig) {
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "Open PubSub ethernet connection.");
-
-    /* allocate and init memory for the ethernet specific internal data */
-    UA_PubSubChannelDataEthernet* channelDataEthernet =
-            (UA_PubSubChannelDataEthernet*) UA_calloc(1, sizeof(*channelDataEthernet));
-    if(!channelDataEthernet) {
-        UA_LOG_ERROR (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub Connection creation failed. Out of memory.");
-        return NULL;
-    }
-
-    /* handle specified network address */
-    UA_NetworkAddressUrlDataType *address;
-    if(UA_Variant_hasScalarType(&connectionConfig->address,
-                                 &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
-        address = (UA_NetworkAddressUrlDataType *) connectionConfig->address.data;
-    } else {
-        UA_LOG_ERROR (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub Connection creation failed. Invalid Address.");
-        UA_free(channelDataEthernet);
-        return NULL;
-    }
-    UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Specified Interface Name = %.*s",
-         (int) address->networkInterface.length, address->networkInterface.data);
-    UA_LOG_DEBUG(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Specified Network Url = %.*s",
-         (int)address->url.length, address->url.data);
-
-    UA_String target;
-    /* encode the URL and store information in internal structure */
-    if(UA_parseEndpointUrlEthernet(&address->url, &target, &channelDataEthernet->vid,
-                                   &channelDataEthernet->prio)) {
-        UA_LOG_ERROR (UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub Connection creation failed. Invalid Address URL.");
-        UA_free(channelDataEthernet);
-        return NULL;
-    }
-
-    /* Get a valid MAC address from target definition */
-    if(UA_parseHardwareAddress(&target, channelDataEthernet->targetAddress) != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid destination MAC address.");
-        UA_free(channelDataEthernet);
-        return NULL;
-    }
-
-    /* generate a new Pub/Sub channel and open a related socket */
-    UA_PubSubChannel *newChannel = (UA_PubSubChannel*)UA_calloc(1, sizeof(UA_PubSubChannel));
-    if(!newChannel) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
-        UA_free(channelDataEthernet);
-        return NULL;
-    }
-
-    /* get interface index */
-    struct ifreq ifreq;
-    memset(&ifreq, 0, sizeof(struct ifreq));
-    strncpy(ifreq.ifr_name, (char*)address->networkInterface.data,
-            UA_MIN(address->networkInterface.length, sizeof(ifreq.ifr_name)-1));
-
-    /* Set default socket options */
-    ethernetSocketOptions sockOptions = {NULL, UA_FALSE, XDP_FLAGS_SKB_MODE, 0, XDP_COPY, UA_FALSE, 0, 0};
-
-    /* XDP parameters - Flags, hw queue option and binding flags */
-    UA_String xdpSocketParam = UA_STRING("enableXdpSocket");
-    UA_String xdpFlagParam = UA_STRING("xdpflag");
-    UA_String hwReceiveQueueParam = UA_STRING("hwreceivequeue");
-    UA_String xdpBindFlagParam = UA_STRING("xdpbindflag");
-
-    /* Socket priority and socket txtime option */
-    UA_String socketPriority = UA_STRING("sockpriority");
-    UA_String enableSocketTxtime = UA_STRING("enablesotxtime");
-    /* Additional flags for soTxTime */
-    UA_String enableDeadlineMode = UA_STRING("enabledeadlinemode");
-    UA_String enableErrorReport = UA_STRING("enableerrorreport");
-
-    /* iterate over the given KeyValuePair paramters */
-    for(size_t i = 0; i < connectionConfig->connectionProperties.mapSize; i++){
-        UA_KeyValuePair *prop = &connectionConfig->connectionProperties.map[i];
-        if(UA_String_equal(&prop->key.name, &socketPriority)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                sockOptions.socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
-                UA_UInt32_copy((UA_UInt32 *) prop->value.data, sockOptions.socketPriority);
-            }
-        } else if(UA_String_equal(&prop->key.name, &enableSocketTxtime)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                sockOptions.enableSocketTxTime = *(UA_Boolean *) prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &enableDeadlineMode)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                if(*(UA_Boolean *) prop->value.data == UA_TRUE)
-                    sockOptions.sotxtimeDeadlinemode = SOF_TXTIME_DEADLINE_MODE;
-            }
-        } else if(UA_String_equal(&prop->key.name, &enableErrorReport)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                if(*(UA_Boolean *) prop->value.data == UA_TRUE)
-                    sockOptions.sotxtimeDeadlinemode = SOF_TXTIME_REPORT_ERRORS;
-            }
-        } else if(UA_String_equal(&prop->key.name, &xdpSocketParam)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                sockOptions.enableXdpSocket = *(UA_Boolean *) prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &xdpFlagParam)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                sockOptions.xdp_flags = *(UA_UInt32 *) prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &hwReceiveQueueParam)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                sockOptions.hw_receive_queue = *(UA_UInt32 *) prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &xdpBindFlagParam)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT16])){
-                sockOptions.xdp_bind_flags = *(UA_UInt16 *) prop->value.data;
-            }
-        } else {
-            UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Ethernet Connection creation. Unknown connection parameter.");
-        }
-    }
-
-#if defined(LIBBPF_EBPF)
-    if(sockOptions.enableXdpSocket) {
-        channelDataEthernet->enableXdpSocket = sockOptions.enableXdpSocket;
-        channelDataEthernet->xdp_flags = sockOptions.xdp_flags;
-        channelDataEthernet->ifindex = (int)if_nametoindex(ifreq.ifr_name);
-        if((UA_PubSubChannelEthernetXDP_open(channelDataEthernet, &sockOptions, address)) != UA_STATUSCODE_GOOD) {
-            UA_free(channelDataEthernet);
-            UA_free(newChannel);
-            return NULL;
-        }
-
-        newChannel->sockfd = xsk_socket__fd(channelDataEthernet->xdpsocket->xskfd);
-        newChannel->handle = channelDataEthernet;
-        newChannel->state = UA_PUBSUB_CHANNEL_PUB;
-
-        if(sockOptions.socketPriority)
-            UA_free(sockOptions.socketPriority);
-
-        return newChannel;
-    }
-#endif
-
-    if(sockOptions.enableXdpSocket)
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                       "XDP dependent libraries not found. Use above 5.4 kernel and install libbpf for XDP support. Using AF_PACKET socket");
-
-    /* Open a packet socket */
-    int sockFd = UA_socket(PF_PACKET, SOCK_RAW, 0);
-    if(sockFd < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub connection creation failed. Cannot create socket. (%s)", errno_str));
-        UA_free(channelDataEthernet);
-        UA_free(newChannel);
-        if(sockOptions.socketPriority)
-            UA_free(sockOptions.socketPriority);
-        return NULL;
-    }
-    newChannel->sockfd = sockFd;
-
-    /* allow the socket to be reused */
-    int opt = 1;
-    if(UA_setsockopt(sockFd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub connection creation failed. Cannot set socket reuse. (%s)", errno_str));
-        UA_close(sockFd);
-        UA_free(channelDataEthernet);
-        UA_free(newChannel);
-        if(sockOptions.socketPriority)
-            UA_free(sockOptions.socketPriority);
-        return NULL;
-    }
-
-#ifdef UA_ARCHITECTURE_VXWORKS
-    size_t i = 0;
-    UA_String streamName = UA_STRING("streamName");
-    UA_String stackIdx = UA_STRING("stackIdx");
-    UA_String * sName = NULL;
-    UA_UInt32 stkIdx = 0;
-    for(i = 0; i < connectionConfig->connectionPropertiesSize; i++) {
-        if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &streamName)) {
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_STRING])) {
-                sName = (UA_String *)connectionConfig->connectionProperties[i].value.data;
-            }
-        }
-        else if(UA_String_equal(&connectionConfig->connectionProperties[i].key.name, &stackIdx)) {
-            if(UA_Variant_hasScalarType(&connectionConfig->connectionProperties[i].value, &UA_TYPES[UA_TYPES_UINT32])) {
-                stkIdx = *(UA_UInt32 *) connectionConfig->connectionProperties[i].value.data;
-            }
-        }
-    }
-    if((sName != NULL) && !UA_String_equal(sName, &UA_STRING_NULL) && (sName->length < TSN_STREAMNAMSIZ)) {
-        /* Bind the PubSub packet socket to a TSN stream */
-        char sNameStr[TSN_STREAMNAMSIZ];
-        memcpy(sNameStr, sName->data, sName->length);
-        sNameStr[sName->length] = '\0';
-        if(UA_setsockopt(sockFd, SOL_SOCKET, SO_X_QBV, sNameStr, TSN_STREAMNAMSIZ) < 0) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "PubSub connection creation failed. Cannot set stream name: %s.", sNameStr);
-            UA_close(sockFd);
-            UA_free(channelDataEthernet);
-            UA_free(newChannel);
-            if(sockOptions.socketPriority)
-                UA_free(sockOptions.socketPriority);
-            return NULL;
-        }
-    }
-
-    /* Bind the PubSub packet socket to a specific network stack instance */
-    if((stkIdx > 0) && (UA_setsockopt(sockFd, SOL_SOCKET, SO_X_STACK_IDX, &stkIdx, sizeof(stkIdx)) < 0)) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub connection creation failed. Cannot set stack index.");
-        UA_close(sockFd);
-        UA_free(channelDataEthernet);
-        UA_free(newChannel);
-        if(sockOptions.socketPriority)
-            UA_free(sockOptions.socketPriority);
-        return NULL;
-    }
-#endif
-
-    if(UA_ioctl(sockFd, SIOCGIFINDEX, &ifreq) < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-           "PubSub connection creation failed. Cannot get interface index for \'%s\'. (%s)", ifreq.ifr_name, errno_str));
-        UA_close(sockFd);
-        UA_free(channelDataEthernet);
-        UA_free(newChannel);
-        if(sockOptions.socketPriority)
-            UA_free(sockOptions.socketPriority);
-        return NULL;
-    }
-    channelDataEthernet->ifindex = ifreq.ifr_ifindex;
-
-    /* determine own MAC address (source address for send) */
-    if(UA_ioctl(sockFd, SIOCGIFHWADDR, &ifreq) < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub connection creation failed. Cannot determine own MAC address. (%s)", errno_str));
-        UA_close(sockFd);
-        UA_free(channelDataEthernet);
-        UA_free(newChannel);
-        if(sockOptions.socketPriority)
-            UA_free(sockOptions.socketPriority);
-        return NULL;
-    }
-#if defined(__vxworks) || defined(__VXWORKS__)
-    memcpy(channelDataEthernet->ifAddress, &ifreq.ifr_ifru.ifru_addr.sa_data, ETH_ALEN);
-#else
-    memcpy(channelDataEthernet->ifAddress, &ifreq.ifr_hwaddr.sa_data, ETH_ALEN);
-#endif
-
-    /* bind the socket to interface and ethertype */
-    struct sockaddr_ll sll = { 0 };
-    sll.sll_family = AF_PACKET;
-    sll.sll_ifindex = channelDataEthernet->ifindex;
-    sll.sll_protocol = htons(ETHERTYPE_UADP);
-
-    if(UA_bind(sockFd, (struct sockaddr*)&sll, sizeof(sll)) < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-            "PubSub connection creation failed. Cannot bind socket. (%s)", errno_str));
-        UA_close(sockFd);
-        UA_free(channelDataEthernet);
-        UA_free(newChannel);
-        if(sockOptions.socketPriority)
-            UA_free(sockOptions.socketPriority);
-        return NULL;
-    }
-
-    /* Setting the socket priority to the socket */
-    if(sockOptions.socketPriority) {
-        if (UA_setsockopt(sockFd, SOL_SOCKET, SO_PRIORITY, sockOptions.socketPriority, sizeof(int))) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "setsockopt SO_PRIORITY failed (%s)", errno_str));
-            UA_close(sockFd);
-
-            UA_free(sockOptions.socketPriority);
-            UA_free(channelDataEthernet);
-            UA_free(newChannel);
-            return NULL;
-        }
-    }
-
-#if defined(KERNEL_VERSION)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
-    if(sockOptions.enableSocketTxTime == UA_TRUE) {
-        /* Setting socket txtime with required flags to the socket */
-        sock_txtime sk_txtime;
-        memset(&sk_txtime, 0, sizeof(sk_txtime));
-        sk_txtime.clockId = CLOCK_TAI;
-        sk_txtime.flags   = (UA_UInt16)(sockOptions.sotxtimeDeadlinemode | sockOptions.sotxtimeReceiveerrors);
-        if (setsockopt(sockFd, SOL_SOCKET, SO_TXTIME, &sk_txtime, sizeof(&sk_txtime))) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "setsockopt SO_TXTIME failed (%s)", errno_str));
-            UA_close(sockFd);
-            if(sockOptions.socketPriority)
-                UA_free(sockOptions.socketPriority);
-
-            UA_free(channelDataEthernet);
-            UA_free(newChannel);
-            return NULL;
-        }
-
-        channelDataEthernet->useSoTxTime = UA_TRUE;
-    }
-#endif
-#endif
-
-    newChannel->handle = channelDataEthernet;
-    newChannel->state = UA_PUBSUB_CHANNEL_PUB;
-
-    if(sockOptions.socketPriority)
-        UA_free(sockOptions.socketPriority);
-
-    return newChannel;
-}
-
-static UA_Boolean
-is_multicast_address(const UA_Byte *address) {
-    /* check if it is a unicast address */
-    if((address[0] & 1) == 0) {
-        return UA_FALSE;
-    }
-
-    /* and exclude broadcast addresses */
-    for(size_t i = 0; i < ETH_ALEN; i++) {
-        if(address[i] != 0xff)
-            return UA_TRUE;
-    }
-
-    /* reaching this point, we know it has to be a broadcast address */
-    return UA_FALSE;
-}
-
-/**
- * Subscribe to a given address.
- *
- * @return UA_STATUSCODE_GOOD on success
- */
-static UA_StatusCode
-UA_PubSubChannelEthernet_regist(UA_PubSubChannel *channel,
-                                UA_ExtensionObject *transportSettings,
-                                void (*notUsedHere)(UA_ByteString *encodedBuffer, UA_ByteString *topic)) {
-    UA_PubSubChannelDataEthernet *channelDataEthernet =
-        (UA_PubSubChannelDataEthernet *) channel->handle;
-
-    if(channelDataEthernet->enableXdpSocket)
-        return UA_STATUSCODE_GOOD; // Regist not required for XDP sockets
-
-    if(!is_multicast_address(channelDataEthernet->targetAddress))
-        return UA_STATUSCODE_GOOD;
-
-    struct packet_mreq mreq;
-    mreq.mr_ifindex = channelDataEthernet->ifindex;
-    mreq.mr_type = PACKET_MR_MULTICAST;
-    mreq.mr_alen = ETH_ALEN;
-    memcpy(mreq.mr_address, channelDataEthernet->targetAddress, ETH_ALEN);
-
-    if(UA_setsockopt(channel->sockfd, SOL_PACKET, PACKET_ADD_MEMBERSHIP, (char*) &mreq, sizeof(mreq)) < 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection regist failed. %s", strerror(errno));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Remove current subscription.
- *
- * @return UA_STATUSCODE_GOOD on success
- */
-static UA_StatusCode
-UA_PubSubChannelEthernet_unregist(UA_PubSubChannel *channel,
-                                  UA_ExtensionObject *transportSettings) {
-    UA_PubSubChannelDataEthernet *channelDataEthernet =
-        (UA_PubSubChannelDataEthernet *) channel->handle;
-
-    if(channelDataEthernet->enableXdpSocket)
-        return UA_STATUSCODE_GOOD; // Unregist not required for XDP sockets
-
-    if(!is_multicast_address(channelDataEthernet->targetAddress)) {
-        return UA_STATUSCODE_GOOD;
-    }
-
-    struct packet_mreq mreq;
-    mreq.mr_ifindex = channelDataEthernet->ifindex;
-    mreq.mr_type = PACKET_MR_MULTICAST;
-    mreq.mr_alen = ETH_ALEN;
-    memcpy(mreq.mr_address, channelDataEthernet->targetAddress, ETH_ALEN);
-
-    if(UA_setsockopt(channel->sockfd, SOL_PACKET, PACKET_DROP_MEMBERSHIP, (char*) &mreq, sizeof(mreq)) < 0) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection regist failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
-#if defined(KERNEL_VERSION)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
-static UA_StatusCode
-sendWithTxTime(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings, void *bufSend, size_t lenBuf) {
-    /* Send the data packet with the tx time */
-    char dataPacket[CMSG_SPACE(sizeof(UA_UInt64))] = {0};
-    /* Structure for messages sent and received */
-    struct msghdr message;
-    /* Structure for scattering or gathering of input/output */
-    struct iovec  inputOutputVec;
-    ssize_t       msgCount;
-
-    UA_PubSubChannelDataEthernet *channelDataEthernet =
-        (UA_PubSubChannelDataEthernet *) channel->handle;
-
-    /* Structure for socket internet address */
-    struct sockaddr_ll socketAddress = { 0 };
-
-    socketAddress.sll_family   = AF_PACKET;
-    socketAddress.sll_ifindex  = channelDataEthernet->ifindex;
-    socketAddress.sll_protocol = htons(ETHERTYPE_UADP);
-
-    inputOutputVec.iov_base   = bufSend;
-    inputOutputVec.iov_len    = lenBuf;
-
-    memset(&message, 0, sizeof(message));
-    /* Provide message name / optional address */
-    message.msg_name          = &socketAddress;
-    /* Provide message address size in bytes */
-    message.msg_namelen       = sizeof(socketAddress);
-    /* Provide array of input/output buffers */
-    message.msg_iov           = &inputOutputVec;
-    /* Provide the number of elements in the array */
-    message.msg_iovlen        = 1;
-
-    /* Get ethernet ETF transport settings */
-    UA_EthernetWriterGroupTransportDataType *ethernettransportSettings;
-    ethernettransportSettings = (UA_EthernetWriterGroupTransportDataType *)transportSettings->content.decoded.data;
-
-    /*
-     * We specify the transmission time in the CMSG.
-     */
-    /* Provide the necessary data */
-    message.msg_control    = dataPacket;
-    /* Provide the size of necessary bytes */
-    message.msg_controllen = sizeof(dataPacket);
-    /* Structure for storing the necessary data */
-    struct cmsghdr*       controlMsg;
-    /* Control message created for tx time */
-    controlMsg             = CMSG_FIRSTHDR(&message);
-    controlMsg->cmsg_level = SOL_SOCKET;
-    controlMsg->cmsg_type  = SCM_TXTIME;
-    controlMsg->cmsg_len   = CMSG_LEN(sizeof(UA_UInt64));
-    if(ethernettransportSettings && (ethernettransportSettings->transmission_time != 0))
-        *((UA_UInt64 *) CMSG_DATA(controlMsg)) = ethernettransportSettings->transmission_time;
-
-    msgCount = sendmsg(channel->sockfd, &message, 0);
-    if ((msgCount < 1) && (msgCount != (UA_Int32)lenBuf)) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-#endif
-#endif
-
-/**
- * Send messages to the connection defined address
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelEthernet_send(UA_PubSubChannel *channel,
-                              UA_ExtensionObject *transportSettings,
-                              UA_ByteString *buf) {
-    UA_PubSubChannelDataEthernet *channelDataEthernet =
-        (UA_PubSubChannelDataEthernet *) channel->handle;
-
-#if defined LIBBPF_EBPF
-    if(channelDataEthernet->enableXdpSocket) {
-        UA_StatusCode retval = UA_PubSubChannelEthernetXDP_send(channelDataEthernet, buf);
-        return retval;
-    }
-#endif
-    /* Allocate a buffer for the ethernet data which contains the ethernet
-     * header (without VLAN tag), the VLAN tag and the OPC-UA/Ethernet data. */
-    char *bufSend, *ptrCur;
-    size_t lenBuf;
-    struct ether_header* ethHdr;
-
-    /* Below added 4 bytes for the size of VLAN tag */
-    lenBuf = sizeof(*ethHdr) + VLAN_HEADER_SIZE + buf->length;
-    bufSend = (char*) UA_malloc(lenBuf);
-    if (bufSend == NULL)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
-    ethHdr = (struct ether_header*) bufSend;
-
-    /* Set (own) source MAC address */
-    memcpy(ethHdr->ether_shost, channelDataEthernet->ifAddress, ETH_ALEN);
-
-    /* Set destination MAC address */
-    memcpy(ethHdr->ether_dhost, channelDataEthernet->targetAddress, ETH_ALEN);
-
-    /* Set ethertype */
-    /* Either VLAN or Ethernet */
-    ptrCur = bufSend + sizeof(*ethHdr);
-    if(channelDataEthernet->vid == 0) {
-        ethHdr->ether_type = htons(ETHERTYPE_UADP);
-        lenBuf -= 4;  /* no VLAN tag */
-    } else {
-        ethHdr->ether_type = htons(ETHERTYPE_VLAN);
-        /* set VLAN ID */
-        UA_UInt16 vlanTag;
-        vlanTag = (UA_UInt16) (channelDataEthernet->vid + (channelDataEthernet->prio << 13));
-        *((UA_UInt16 *) ptrCur) = htons(vlanTag);
-        ptrCur += sizeof(UA_UInt16);
-        /* set Ethernet */
-        *((UA_UInt16 *) ptrCur) = htons(ETHERTYPE_UADP);
-        ptrCur += sizeof(UA_UInt16);
-    }
-
-    /* copy payload of ethernet message */
-    memcpy(ptrCur, buf->data, buf->length);
-
-#if defined(KERNEL_VERSION)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0))
-    if(channelDataEthernet->useSoTxTime) {
-        /* Send the packets at the given Txtime */
-        UA_StatusCode rc = sendWithTxTime(channel, transportSettings, bufSend, lenBuf);
-        if(rc != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "PubSub connection send failed. Send message failed.");
-            UA_free(bufSend);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-    else
-#endif
-#endif
-    {
-        ssize_t rc;
-        rc = UA_send(channel->sockfd, bufSend, lenBuf, 0);
-        if(rc  < 0) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "PubSub connection send failed. Send message failed.");
-            UA_free(bufSend);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-
-    UA_free(bufSend);
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Receive messages.
- *
- * @param timeout in usec -> not used
- * @return
- */
-static UA_StatusCode
-UA_PubSubChannelEthernet_receive(UA_PubSubChannel *channel,
-                                 UA_ExtensionObject *transportSettings,
-                                 UA_PubSubReceiveCallback receiveCallback,
-                                 void *receiveCallbackContext,
-                                 UA_UInt32 timeout) {
-    UA_PubSubChannelDataEthernet *channelDataEthernet =
-        (UA_PubSubChannelDataEthernet *) channel->handle;
-
-    struct timeval  tmptv;
-    struct timespec currentTime;
-    struct timespec maxTime;
-    UA_UInt64       currentTimeValue = 0;
-    UA_UInt64       maxTimeValue = 0;
-    UA_Int32        receiveFlags;
-    UA_StatusCode   retval = UA_STATUSCODE_GOOD;
-    UA_UInt16       rcvCount = 0;
-
-    memset(&tmptv, 0, sizeof(tmptv));
-
-    /* Sleep in a select call if a timeout was set */
-    if(timeout > 0) {
-        fd_set fdset;
-        FD_ZERO(&fdset);
-        UA_fd_set(channel->sockfd, &fdset);
-        tmptv.tv_sec = (long int)(timeout / 1000000);
-        tmptv.tv_usec = (long int)(timeout % 1000000);
-        int resultsize = UA_select(channel->sockfd+1, &fdset, NULL, NULL, &tmptv);
-        if(resultsize == 0) {
-            return UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
-        }
-        if(resultsize == -1) {
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-
-#if !defined(UA_ARCHITECTURE_POSIX)
-    clock_gettime(CLOCK_REALTIME, &currentTime);
-#else
-    clock_gettime(CLOCK_TAI, &currentTime);
-#endif
-    currentTimeValue = (UA_UInt64)((currentTime.tv_sec * 1000000000) + currentTime.tv_nsec);
-    maxTime.tv_sec   = currentTime.tv_sec + tmptv.tv_sec;
-    /* UA_Select uses timespec which accpets value in microseconds
-     * but etf code requires precision of nanoseconds */
-    maxTime.tv_nsec  = currentTime.tv_nsec + (tmptv.tv_usec * 1000);
-    maxTimeValue     = (UA_UInt64)((maxTime.tv_sec * 1000000000)+ maxTime.tv_nsec);
-    /* Receive flags set to Zero which indicates it will wait inside recvmsg API untill
-     * first packet received */
-    receiveFlags     = 0;
-    size_t messageLength = 0;
-
-    do {
-        if(maxTimeValue < currentTimeValue) {
-             retval = UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
-             break;
-        }
-
-        UA_ByteString buffer;
-        buffer.length = UA_RECEIVE_MSG_BUFFER_SIZE;
-        buffer.data = ReceiveMsgBufferETH;
-
-#if defined LIBBPF_EBPF
-        if(channelDataEthernet->enableXdpSocket) {
-            retval = UA_PubSubChannelEthernetXDP_receive(channelDataEthernet, &buffer);
-            if (retval != UA_STATUSCODE_GOOD) {
-                return retval;
-            }
-            retval = receiveCallback(channel, receiveCallbackContext, &buffer);
-            return retval;
-        }
-#endif
-
-        struct ether_header eth_hdr;
-        struct iovec        iov[2];
-        struct msghdr       msg;
-        ssize_t             dataLen;
-        memset(&dataLen, 0, sizeof(dataLen));
-        memset(&msg, 0, sizeof(msg));
-
-        iov[0].iov_base = &eth_hdr;
-        iov[0].iov_len  = sizeof(eth_hdr);
-        iov[1].iov_base = buffer.data;
-        iov[1].iov_len  = UA_RECEIVE_MSG_BUFFER_SIZE;
-        msg.msg_iov     = iov;
-        msg.msg_iovlen  = 2;
-
-        dataLen = UA_recvmsg(channel->sockfd, &msg, receiveFlags);
-        if(dataLen < 0) {
-            if(rcvCount == 0) {
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                             "PubSub connection receive failed. Receive message failed.");
-                retval = UA_STATUSCODE_BADINTERNALERROR;
-            } else {
-                retval = UA_STATUSCODE_GOOD;
-            }
-            break;
-        }
-
-        if((size_t)(dataLen) < sizeof(struct ether_header)) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "PubSub connection receive failed. Packet too small.");
-            retval = UA_STATUSCODE_BADINTERNALERROR;
-            break;
-        }
-
-        if(dataLen == 0) {
-            retval = UA_STATUSCODE_GOODNODATA;
-            break;
-        }
-        /* Make sure we match our target */
-        if(memcmp(eth_hdr.ether_dhost, channelDataEthernet->targetAddress, ETH_ALEN) != 0) {
-            retval = UA_STATUSCODE_GOODNODATA;
-            break;
-        }
-
-        /* Minimum size of ethernet packet is 64 bytes where 4 bytes is allocated for FCS
-         * so minimum ethernet packet size without FCS is 60 bytes */
-        if ((size_t)dataLen < MIN_ETHERNET_PACKET_SIZE_WITHOUT_FCS)
-             dataLen += VLAN_HEADER_SIZE; /* In ua_pubsub_reader file we have considered minimum payload
-                                           * size of ethernet packet as 46 bytes (i.e without vlan scenario) because
-                                           * we cannot find whether the packet is received with vlan or without vlan
-                                           * tagging in the src file ua_pubsub_reader.c, so we set the minimum payload
-                                           * size as 46 bytes.In the plugin file we moved the buffer position to 4 bytes
-                                           * for 2nd receive if the packet received with vlan so it does not affect
-                                           * while processing multiple receive packets in the src file. In this scenario
-                                           * VLAN header size is stripped before it is recieved
-                                           * so the packet length is less than 60bytes */
-
-        messageLength = ((size_t)dataLen - sizeof(struct ether_header));
-        buffer.length = messageLength;
-
-        retval = receiveCallback(channel, receiveCallbackContext, &buffer);
-        if (retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                           "PubSub Connection decode and process failed.");
-
-        }
-
-        rcvCount++;
-#if !defined(UA_ARCHITECTURE_POSIX)
-        clock_gettime(CLOCK_REALTIME, &currentTime);
-#else
-        clock_gettime(CLOCK_TAI, &currentTime);
-#endif
-        currentTimeValue = (UA_UInt64)((currentTime.tv_sec * 1000000000) + currentTime.tv_nsec);
-        /* Receive flags set to MSG_DONTWAIT for the 2nd packet */
-        /* The recvmsg API with MSG_DONTWAIT flag will not wait for the next packet */
-        receiveFlags = MSG_DONTWAIT;
-
-    } while(true); /* 1518 bytes is the maximum size of ethernet packet
-                                              * where 18 bytes used for header size, 4 bytes of LLC
-                                              * so remaining length is 1496 */
-    return retval;
-}
-
-/**
- * Close channel and free the channel data.
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelEthernet_close(UA_PubSubChannel *channel) {
-    UA_PubSubChannelDataEthernet *channelDataEthernet = (UA_PubSubChannelDataEthernet *) channel->handle;
-#if defined(LIBBPF_EBPF)
-    if(channelDataEthernet->enableXdpSocket) {
-        xsk_socket__delete(channelDataEthernet->xdpsocket->xskfd);
-        (void)xsk_umem__delete(channelDataEthernet->xdpsocket->umem->umem);
-        /* Detach XDP program from the interface */
-        bpf_set_link_xdp_fd(channelDataEthernet->ifindex, -1, channelDataEthernet->xdp_flags);
-        UA_free(channelDataEthernet->xdpsocket->umem->buffer);
-        UA_free(channelDataEthernet->xdpsocket->umem);
-        UA_free(channelDataEthernet->xdpsocket);
-        UA_free(channelDataEthernet);
-        UA_free(channel);
-        return UA_STATUSCODE_GOOD;
-    }
-#endif
-
-    UA_close(channel->sockfd);
-    UA_free(channelDataEthernet);
-    UA_free(channel);
-    return UA_STATUSCODE_GOOD;
-}
-static UA_StatusCode
-UA_PubSubChannelEthernet_allocNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize) {
-
-    UA_StatusCode rv = UA_ByteString_allocBuffer(buf, bufSize);
-    return rv;
-}
-
-static UA_StatusCode
-UA_PubSubChannelEthernet_freeNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf) {
-    UA_ByteString_clear(buf);
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Generate a new channel. based on the given configuration.
- *
- * @param connectionConfig connection configuration
- * @return  ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-TransportLayerEthernet_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSub channel requested");
-    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
-    UA_PubSubConnectionConfig *connectionConfig = tctx->connectionConfig;
-
-    UA_PubSubChannel * pubSubChannel = UA_PubSubChannelEthernet_open(connectionConfig);
-    if(pubSubChannel) {
-        pubSubChannel->regist = UA_PubSubChannelEthernet_regist;
-        pubSubChannel->unregist = UA_PubSubChannelEthernet_unregist;
-        pubSubChannel->send = UA_PubSubChannelEthernet_send;
-        pubSubChannel->receive = UA_PubSubChannelEthernet_receive;
-        pubSubChannel->close = UA_PubSubChannelEthernet_close;
-        pubSubChannel->openPublisher = NULL;
-        pubSubChannel->openSubscriber = NULL;
-        pubSubChannel->closePublisher = NULL;
-        pubSubChannel->closeSubscriber = NULL;
-        pubSubChannel->connectionConfig = connectionConfig;
-        pubSubChannel->allocNetworkBuffer = UA_PubSubChannelEthernet_allocNetworkBuffer;
-        pubSubChannel->freeNetworkBuffer = UA_PubSubChannelEthernet_freeNetworkBuffer;
-
-    }
-    return pubSubChannel;
-}
-
-static UA_StatusCode
-TransportLayerEthernet_addWritergroupChannel(UA_PubSubChannel **out, UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void* ctx)  {
-    *out = NULL;
-    return UA_STATUSCODE_GOOD;
-}
-
-UA_PubSubTransportLayer
-UA_PubSubTransportLayerEthernet(void) {
-    UA_PubSubTransportLayer pubSubTransportLayer;
-
-    pubSubTransportLayer.transportProfileUri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-eth-uadp");
-    pubSubTransportLayer.createPubSubChannel = &TransportLayerEthernet_addChannel;
-    pubSubTransportLayer.createWriterGroupPubSubChannel= &TransportLayerEthernet_addWritergroupChannel;
-    pubSubTransportLayer.connectionManager = NULL;
-
-    return pubSubTransportLayer;
-}
diff --git a/plugins/ua_pubsub_mqtt.c b/plugins/ua_pubsub_mqtt.c
deleted file mode 100644
index a95bcd55f98..00000000000
--- a/plugins/ua_pubsub_mqtt.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2018 Fraunhofer IOSB (Author: Lukas Meling)
- * Copyright (c) 2020 basysKom GmbH
- */
-
-/**
- * This uses the mqtt/ua_mqtt_adapter.h to call mqtt functions.
- * Currently only ua_mqtt_adapter.c implements this
- * interface and maps them to the specific "MQTT-C" library functions.
- * Another mqtt lib could be used.
- * "mqtt_pal.c" forwards the network calls (send/recv) to UA_Connection (TCP).
- */
-
-#include <open62541/server_pubsub.h>
-#include <open62541/util.h>
-
-#include "mqtt/ua_mqtt-c_adapter.h"
-#include "open62541/plugin/log_stdout.h"
-
-static UA_StatusCode
-UA_uaQos_toMqttQos(UA_BrokerTransportQualityOfService uaQos, UA_Byte *qos){
-    switch (uaQos){
-    	case UA_BROKERTRANSPORTQUALITYOFSERVICE_BESTEFFORT:
-        case UA_BROKERTRANSPORTQUALITYOFSERVICE_ATMOSTONCE:
-            *qos = 0;
-            break;
-        case UA_BROKERTRANSPORTQUALITYOFSERVICE_ATLEASTONCE:
-            *qos = 1;
-            break;
-        case UA_BROKERTRANSPORTQUALITYOFSERVICE_EXACTLYONCE:
-            *qos = 2;
-            break;
-        default:
-            break;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Open mqtt connection based on the connectionConfig.
- *
- *
- * @return ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-UA_PubSubChannelMQTT_open(const UA_PubSubConnectionConfig *connectionConfig) {
-    UA_NetworkAddressUrlDataType address;
-    memset(&address, 0, sizeof(UA_NetworkAddressUrlDataType));
-    if(UA_Variant_hasScalarType(&connectionConfig->address, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])){
-        address = *(UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
-    } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT Connection creation failed. Invalid Address.");
-        return NULL;
-    }
-
-    /* allocate and init memory for the Mqtt specific internal data */
-    UA_PubSubChannelDataMQTT * channelDataMQTT =
-            (UA_PubSubChannelDataMQTT *) UA_calloc(1, (sizeof(UA_PubSubChannelDataMQTT)));
-    if(!channelDataMQTT){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT Connection creation failed. Out of memory.");
-        return NULL;
-    }
-
-    /* set default values */
-    UA_String mqttClientId = UA_STRING("open62541_pub");
-    memcpy(channelDataMQTT, &(UA_PubSubChannelDataMQTT){address, 2000, 2000, NULL, NULL, &mqttClientId, NULL,
-                                                    #if defined(UA_ENABLE_MQTT_TLS_OPENSSL) // Initialize the "ssl" member
-                                                        NULL,
-                                                    #elif defined(UA_ENABLE_MQTT_TLS_MBEDTLS)
-                                                        NULL,
-                                                    #else
-                                                        -1,
-                                                    #endif
-                                                        NULL, NULL,
-                                                        UA_STRING_NULL, UA_STRING_NULL, UA_STRING_NULL, UA_STRING_NULL,
-                                                        UA_STRING_NULL, UA_STRING_NULL, UA_FALSE},
-           sizeof(UA_PubSubChannelDataMQTT));
-    /* iterate over the given KeyValuePair paramters */
-    UA_String sendBuffer = UA_STRING("sendBufferSize"), recvBuffer = UA_STRING("recvBufferSize"), clientId = UA_STRING("mqttClientId"),
-            username = UA_STRING("mqttUsername"), password = UA_STRING("mqttPassword"), caFilePath = UA_STRING("mqttCaFilePath"),
-            caPath = UA_STRING("mqttCaPath"), useTLS = UA_STRING("mqttUseTLS"), clientCertPath = UA_STRING("mqttClientCertPath"),
-            clientKeyPath = UA_STRING("mqttClientKeyPath");
-    for(size_t i = 0; i < connectionConfig->connectionProperties.mapSize; i++){
-        UA_KeyValuePair *prop = &connectionConfig->connectionProperties.map[i];
-        if(UA_String_equal(&prop->key.name, &sendBuffer)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                channelDataMQTT->mqttSendBufferSize = *(UA_UInt32 *) prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &recvBuffer)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                channelDataMQTT->mqttRecvBufferSize = *(UA_UInt32 *) prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &clientId)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
-                channelDataMQTT->mqttClientId = (UA_String *) prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &username)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttUsername);
-            }
-        } else if(UA_String_equal(&prop->key.name, &password)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttPassword);
-            }
-        } else if(UA_String_equal(&prop->key.name, &caFilePath)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttCaFilePath);
-            }
-        } else if(UA_String_equal(&prop->key.name, &caPath)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttCaPath);
-            }
-        } else if(UA_String_equal(&prop->key.name, &useTLS)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])){
-                channelDataMQTT->mqttUseTLS = *(UA_Boolean *) prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &clientCertPath)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttClientCertPath);
-            }
-        } else if(UA_String_equal(&prop->key.name, &clientKeyPath)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_STRING])){
-                UA_String_copy((UA_String *) prop->value.data, &channelDataMQTT->mqttClientKeyPath);
-            }
-        }  else {
-            UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT Connection creation. Unknown connection parameter.");
-        }
-    }
-
-    /* Create a new channel */
-    UA_PubSubChannel *newChannel = (UA_PubSubChannel *) UA_calloc(1, sizeof(UA_PubSubChannel));
-    if(!newChannel){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT Connection creation failed. Out of memory.");
-        UA_String_clear(&channelDataMQTT->mqttUsername);
-        UA_String_clear(&channelDataMQTT->mqttPassword);
-        UA_String_clear(&channelDataMQTT->mqttCaFilePath);
-        UA_String_clear(&channelDataMQTT->mqttCaPath);
-        UA_String_clear(&channelDataMQTT->mqttClientCertPath);
-        UA_String_clear(&channelDataMQTT->mqttClientKeyPath);
-        UA_free(channelDataMQTT);
-        return NULL;
-    }
-
-    /* Allocate memory for mqtt receive buffer */
-    if(channelDataMQTT->mqttRecvBufferSize > 0){
-        channelDataMQTT->mqttRecvBuffer = (uint8_t*)UA_calloc(channelDataMQTT->mqttRecvBufferSize, sizeof(uint8_t));
-        if(channelDataMQTT->mqttRecvBuffer == NULL){
-            UA_String_clear(&channelDataMQTT->mqttUsername);
-            UA_String_clear(&channelDataMQTT->mqttPassword);
-            UA_String_clear(&channelDataMQTT->mqttCaFilePath);
-            UA_String_clear(&channelDataMQTT->mqttCaPath);
-            UA_String_clear(&channelDataMQTT->mqttClientCertPath);
-            UA_String_clear(&channelDataMQTT->mqttClientKeyPath);
-            UA_free(channelDataMQTT);
-            UA_free(newChannel);
-            return NULL;
-        }
-    }
-
-    /* Allocate memory for mqtt send buffer */
-    if(channelDataMQTT->mqttSendBufferSize > 0){
-        channelDataMQTT->mqttSendBuffer = (uint8_t*)UA_calloc(channelDataMQTT->mqttSendBufferSize, sizeof(uint8_t));
-        if(channelDataMQTT->mqttSendBuffer == NULL){
-            if(channelDataMQTT->mqttRecvBufferSize > 0){
-                UA_free(channelDataMQTT->mqttRecvBuffer);
-            }
-            UA_String_clear(&channelDataMQTT->mqttUsername);
-            UA_String_clear(&channelDataMQTT->mqttPassword);
-            UA_String_clear(&channelDataMQTT->mqttCaFilePath);
-            UA_String_clear(&channelDataMQTT->mqttCaPath);
-            UA_String_clear(&channelDataMQTT->mqttClientCertPath);
-            UA_String_clear(&channelDataMQTT->mqttClientKeyPath);
-            UA_free(channelDataMQTT);
-            UA_free(newChannel);
-            return NULL;
-        }
-    }
-
-    /*link channel and internal channel data*/
-    newChannel->handle = channelDataMQTT;
-
-    /* MQTT Client connect call. */
-    UA_StatusCode ret = connectMqtt(channelDataMQTT);
-
-    if(ret != UA_STATUSCODE_GOOD){
-        /* try to disconnect tcp */
-        disconnectMqtt(channelDataMQTT);
-        UA_free(channelDataMQTT->mqttSendBuffer);
-        UA_free(channelDataMQTT->mqttRecvBuffer);
-        UA_String_clear(&channelDataMQTT->mqttUsername);
-        UA_String_clear(&channelDataMQTT->mqttPassword);
-        UA_String_clear(&channelDataMQTT->mqttCaFilePath);
-        UA_String_clear(&channelDataMQTT->mqttCaPath);
-        UA_String_clear(&channelDataMQTT->mqttClientCertPath);
-        UA_String_clear(&channelDataMQTT->mqttClientKeyPath);
-        UA_free(channelDataMQTT);
-        UA_free(newChannel);
-        return NULL;
-    }
-    newChannel->state = UA_PUBSUB_CHANNEL_RDY;
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT Connection established.");
-    return newChannel;
-}
-
-/**
- * Subscribe to topic specified in brokerTransportSettings->queueName.
- *
- * @return UA_STATUSCODE_GOOD on success
- */
-static UA_StatusCode
-UA_PubSubChannelMQTT_regist(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-                            void (*callback)(UA_ByteString *encodedBuffer, UA_ByteString *topic)) {
-    if(channel->state != UA_PUBSUB_CHANNEL_RDY){
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT regist failed. Channel closed.");
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-    }
-
-    UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *) channel->handle;
-    channelDataMQTT->callback = callback;
-
-    if(transportSettings == NULL ||
-       transportSettings->encoding != UA_EXTENSIONOBJECT_DECODED ||
-       transportSettings->content.decoded.type != &UA_TYPES[UA_TYPES_BROKERDATASETREADERTRANSPORTDATATYPE]) {
-        return UA_STATUSCODE_BADARGUMENTSMISSING;
-    }
-
-    UA_BrokerDataSetReaderTransportDataType *brokerTransportSettings =
-        (UA_BrokerDataSetReaderTransportDataType*)transportSettings->content.decoded.data;
-
-    UA_Byte qos = 0;
-    UA_uaQos_toMqttQos(brokerTransportSettings->requestedDeliveryGuarantee, &qos);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: register");
-    return subscribeMqtt(channelDataMQTT, brokerTransportSettings->queueName, qos);
-}
-
-/**
- * Remove subscription specified in brokerTransportSettings->queueName.
- *
- * @return UA_STATUSCODE_GOOD on success
- */
-static UA_StatusCode
-UA_PubSubChannelMQTT_unregist(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings) {
-    if(channel->state != UA_PUBSUB_CHANNEL_RDY){
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: unregister failed. Channel closed.");
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-    }
-
-    UA_PubSubChannelDataMQTT * channelDataMQTT = (UA_PubSubChannelDataMQTT *) channel->handle;
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: unregister");
-
-    if(transportSettings == NULL ||
-       transportSettings->encoding != UA_EXTENSIONOBJECT_DECODED ||
-       transportSettings->content.decoded.type != &UA_TYPES[UA_TYPES_BROKERWRITERGROUPTRANSPORTDATATYPE]) {
-        return UA_STATUSCODE_BADARGUMENTSMISSING;
-    }
-
-    UA_BrokerWriterGroupTransportDataType *brokerTransportSettings =
-        (UA_BrokerWriterGroupTransportDataType*)transportSettings->content.decoded.data;
-
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: unregister");
-    return unSubscribeMqtt(channelDataMQTT, brokerTransportSettings->queueName);
-}
-
-/**
- * Send a message.
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelMQTT_send(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings, UA_ByteString *buf) {
-    if(channel->state != UA_PUBSUB_CHANNEL_RDY){
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: sending failed. Invalid state.");
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-    }
-
-    if(transportSettings == NULL ||
-       transportSettings->encoding != UA_EXTENSIONOBJECT_DECODED ||
-       transportSettings->content.decoded.type != &UA_TYPES[UA_TYPES_BROKERWRITERGROUPTRANSPORTDATATYPE]) {
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Transport settings not found.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_Byte qos = 0;
-    UA_BrokerWriterGroupTransportDataType *brokerTransportSettings =
-        (UA_BrokerWriterGroupTransportDataType*)transportSettings->content.decoded.data;
-    UA_uaQos_toMqttQos(brokerTransportSettings->requestedDeliveryGuarantee, &qos);
-
-    UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *) channel->handle;
-    UA_StatusCode ret = publishMqtt(channelDataMQTT, brokerTransportSettings->queueName, buf, qos);
-    if(ret != UA_STATUSCODE_GOOD) {
-        channel->state = UA_PUBSUB_CHANNEL_ERROR;
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Publish failed");
-        return ret;
-    }
-
-    UA_LOG_TRACE(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Publish");
-    return ret;
-}
-
-/**
- * Close channel and free the channel data.
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelMQTT_close(UA_PubSubChannel *channel) {
-    /* already closed */
-    if(channel->state == UA_PUBSUB_CHANNEL_CLOSED)
-        return UA_STATUSCODE_GOOD;
-    UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *) channel->handle;
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub MQTT: Closing PubSubChannel.");
-    disconnectMqtt(channelDataMQTT);
-    UA_String_clear(&channelDataMQTT->mqttUsername);
-    UA_String_clear(&channelDataMQTT->mqttPassword);
-    UA_String_clear(&channelDataMQTT->mqttCaFilePath);
-    UA_String_clear(&channelDataMQTT->mqttCaPath);
-    UA_String_clear(&channelDataMQTT->mqttClientCertPath);
-    UA_String_clear(&channelDataMQTT->mqttClientKeyPath);
-    UA_free(channelDataMQTT);
-    UA_free(channel);
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Calls the send and receive functions of the mqtt network stack.
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelMQTT_yield(UA_PubSubChannel *channel, UA_UInt16 timeout){
-    UA_StatusCode ret = UA_STATUSCODE_BADINVALIDARGUMENT;
-    if(channel == NULL){
-        return ret;
-    }
-
-    if(channel->state == UA_PUBSUB_CHANNEL_ERROR){
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_PubSubChannelDataMQTT *channelDataMQTT = (UA_PubSubChannelDataMQTT *) channel->handle;
-    ret = yieldMqtt(channelDataMQTT, timeout);
-    if(ret != UA_STATUSCODE_GOOD){
-        channel->state = UA_PUBSUB_CHANNEL_ERROR;
-        return ret;
-    }
-
-    return ret;
-}
-
-/**
- * Receive a message. The regist function should be called before.
- *
- * @param timeout in msec
- * @param Buffer to recieve messages
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelMQTT_receive(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings, UA_PubSubReceiveCallback receiveCallback,
-                              void *receiveCallbackContext, UA_UInt32 timeout){
-
-    /* Nothing to do */
-    return UA_STATUSCODE_GOOD;
-}
-static UA_StatusCode
-UA_PubSubChannelMQTT_allocNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize) {
-
-    UA_StatusCode rv = UA_ByteString_allocBuffer(buf, bufSize);
-    return rv;
-}
-
-static UA_StatusCode
-UA_PubSubChannelMQTT_freeNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf) {
-    UA_ByteString_clear(buf);
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Generate a new MQTT channel. Based on the given configuration. Uses yield and no recv call.
- *
- * @param connectionConfig connection configuration
- * @return  ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-TransportLayerMQTT_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSub MQTT: channel requested.");
-    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
-    UA_PubSubConnectionConfig *connectionConfig = tctx->connectionConfig;
-
-    UA_PubSubChannel * pubSubChannel = UA_PubSubChannelMQTT_open(connectionConfig);
-    if(pubSubChannel){
-        pubSubChannel->regist = UA_PubSubChannelMQTT_regist;
-        pubSubChannel->unregist = UA_PubSubChannelMQTT_unregist;
-        pubSubChannel->send = UA_PubSubChannelMQTT_send;
-        pubSubChannel->close = UA_PubSubChannelMQTT_close;
-        pubSubChannel->yield = UA_PubSubChannelMQTT_yield;
-        pubSubChannel->openPublisher = NULL;
-        pubSubChannel->openSubscriber = NULL;
-        pubSubChannel->closePublisher = NULL;
-        pubSubChannel->closeSubscriber = NULL;
-        pubSubChannel->allocNetworkBuffer = UA_PubSubChannelMQTT_allocNetworkBuffer;
-        pubSubChannel->freeNetworkBuffer = UA_PubSubChannelMQTT_freeNetworkBuffer;
-
-        pubSubChannel->receive = UA_PubSubChannelMQTT_receive;
-
-        pubSubChannel->connectionConfig = connectionConfig;
-    }
-    return pubSubChannel;
-}
-
-static UA_StatusCode
-TransportLayerMQTT_addWritergroupChannel(UA_PubSubChannel **out, UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void* ctx)  {
-    *out = NULL;
-    return UA_STATUSCODE_GOOD;
-}
-
-//MQTT channel factory
-UA_PubSubTransportLayer
-UA_PubSubTransportLayerMQTT(void){
-    UA_PubSubTransportLayer pubSubTransportLayer;
-
-    pubSubTransportLayer.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt");
-    pubSubTransportLayer.createPubSubChannel = &TransportLayerMQTT_addChannel;
-    pubSubTransportLayer.createWriterGroupPubSubChannel= &TransportLayerMQTT_addWritergroupChannel;
-    pubSubTransportLayer.connectionManager = NULL;
-    return pubSubTransportLayer;
-}
-
-#undef _POSIX_C_SOURCE
diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
deleted file mode 100644
index 401a9698fd5..00000000000
--- a/plugins/ua_pubsub_udp.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
- * Copyright 2018 (c) Jose Cabral, fortiss GmbH
- * Copyright (c) 2020 Fraunhofer IOSB (Author: Julius Pfrommer)
- * Copyright (c) 2020 Kalycito Infotech Private Limited
- * Copyright (c) 2021 Linutronix GmbH (Author: Kurt Kanzenbach)
- * Copyright (c) 2022 Fraunhofer IOSB (Author: Jan Hermes)
- */
-
-#include <open62541/util.h>
-
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
-#include <open62541/server.h>
-
-#define RECEIVE_MSG_BUFFER_SIZE   4096
-#define UA_MAX_DEFAULT_PARAM_SIZE 6
-
-#define UA_MULTICAST_TTL_NO_LIMIT 255
-
-#define MAX_URL_LENGTH 512
-#define MAX_PORT_CHARACTER_COUNT 6
-
-#define UA_STRING_ANY_ADDR "0.0.0.0"
-#define UA_STRING_LOCALHOST "localhost"
-#define UA_STRING_LENGTH_LOCALHOST 10
-
-static UA_StatusCode
-getRawAddressAndPortValues(const UA_NetworkAddressUrlDataType *address, char *outAddress, UA_UInt16 *outPort) {
-
-    UA_String hostname = UA_STRING_NULL;
-    UA_String path = UA_STRING_NULL;
-    UA_StatusCode res = UA_parseEndpointUrl(&address->url, &hostname, outPort, &path);
-    if(res != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid URL.");
-        return res;
-    }
-
-    if(hostname.length >= MAX_URL_LENGTH) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. URL maximum length is 512.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    memcpy(outAddress, hostname.data, hostname.length);
-    outAddress[hostname.length] = 0;
-
-    return UA_STATUSCODE_GOOD;
-}
-
-typedef struct UA_UDPConnectionContext {
-    UA_ConnectionManager *connectionManager;
-    UA_Server *server;
-    void *connection;
-    uintptr_t connectionIdPublish;
-    uintptr_t connectionIdSubscribe;
-    UA_KeyValueMap subscriberParams;
-    UA_KeyValueMap publisherParams;
-    UA_StatusCode (*decodeAndProcessNetworkMessage)(UA_Server *server,
-                                                    void *connection,
-                                                    UA_ByteString *buffer);
-} UA_UDPConnectionContext;
-
-
-/* Callback of a TCP socket (server socket or an active connection) */
-static void
-UA_PubSub_udpCallbackSubscribe(UA_ConnectionManager *cm, uintptr_t connectionId,
-                               void *application, void **connectionContext,
-                               UA_ConnectionState state, const UA_KeyValueMap *params,
-                               UA_ByteString msg) {
-    if (state == UA_CONNECTIONSTATE_CLOSED || state == UA_CONNECTIONSTATE_CLOSING) {
-        return;
-    }
-
-    UA_PubSubChannel *channel = (UA_PubSubChannel *) application;
-    channel->sockfd = (int) connectionId;
-
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext*) *connectionContext;
-    ctx->connectionIdSubscribe = connectionId;
-    ctx->connectionManager = cm;
-
-    if(msg.length > 0) {
-        ctx->decodeAndProcessNetworkMessage(ctx->server, ctx->connection, &msg);
-    }
-}
-
-/* Callback of a TCP socket (server socket or an active connection) */
-static void
-UA_PubSub_udpCallbackPublish(UA_ConnectionManager *cm, uintptr_t connectionId,
-                             void *application, void **connectionContext,
-                             UA_ConnectionState state, const UA_KeyValueMap *params,
-                             UA_ByteString msg) {
-
-    if(state == UA_CONNECTIONSTATE_CLOSED || state == UA_CONNECTIONSTATE_CLOSING || !application) {
-        return;
-    }
-    UA_PubSubChannel *channel = (UA_PubSubChannel *) application;
-    channel->sockfd = (int) connectionId;
-
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) *connectionContext;
-    ctx->connectionIdPublish = connectionId;
-    ctx->connectionManager = cm;
-}
-
-/**
- * Close channel and free the channel data.
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelUDP_close(UA_PubSubChannel *channel) {
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
-    if (ctx != NULL) {
-        UA_KeyValueMap_clear(&ctx->subscriberParams);
-        UA_KeyValueMap_clear(&ctx->publisherParams);
-        UA_free(ctx);
-    }
-    UA_free(channel);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_openSubscribeDirection(UA_ConnectionManager *connectionManager,
-                          const UA_PubSubConnectionConfig *connectionConfig, UA_PubSubChannel *newChannel,
-                          UA_NetworkAddressUrlDataType *address, char *addressAsChar, UA_UInt16 port) {
-    UA_KeyValueMap *defaultParams = UA_KeyValueMap_new();
-    if(!defaultParams) {
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-
-    UA_Boolean listen = true;
-    UA_StatusCode res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "listen"), &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    UA_String listenHost = UA_STRING(addressAsChar);
-    if(UA_strncasecmp(addressAsChar, UA_STRING_LOCALHOST, UA_STRING_LENGTH_LOCALHOST) == 0){
-        listenHost = UA_STRING(UA_STRING_ANY_ADDR);
-    }
-    UA_Variant listenHostnames; // = UA_Variant_new();
-    UA_Variant_setArray(&listenHostnames, &listenHost, 1, &UA_TYPES[UA_TYPES_STRING]);
-    res = UA_KeyValueMap_set(defaultParams, UA_QUALIFIEDNAME(0, "address"), &listenHostnames);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    UA_UInt16 targetPort = port;
-    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "port"), &targetPort, &UA_TYPES[UA_TYPES_UINT16]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    if(address->networkInterface.length > 0) {
-        res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "interface"), &address->networkInterface, &UA_TYPES[UA_TYPES_STRING]);
-        if(res != UA_STATUSCODE_GOOD) {
-            UA_KeyValueMap_delete(defaultParams);
-            return res;
-        }
-    }
-    UA_Boolean reuse = true;
-    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "reuse"), &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-
-    res = UA_KeyValueMap_merge(defaultParams, &connectionConfig->connectionProperties);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) newChannel->handle;
-    res = UA_KeyValueMap_copy(defaultParams, &ctx->subscriberParams);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    UA_Boolean validate = true;
-    UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "validate"), &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    res = connectionManager->openConnection(connectionManager, defaultParams, NULL, NULL, NULL);
-    UA_KeyValueMap_delete(defaultParams);
-    return res;
-}
-
-static UA_StatusCode
-UA_openPublishDirection(UA_ConnectionManager *connectionManager,
-                        const UA_PubSubConnectionConfig *connectionConfig, UA_PubSubChannel *newChannel,
-                        UA_NetworkAddressUrlDataType *address, char *addressAsChar, UA_UInt16 port) {
-    UA_KeyValueMap *defaultParams = UA_KeyValueMap_new();
-    if(!defaultParams) {
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-
-    UA_Boolean listen = false;
-    UA_StatusCode res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "listen"), &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-
-    UA_String targetHost = UA_STRING(addressAsChar);
-    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "address"),
-                                                 &targetHost, &UA_TYPES[UA_TYPES_STRING]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    UA_UInt16 targetPort = port;
-    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "port"),
-                                   &targetPort, &UA_TYPES[UA_TYPES_UINT16]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    if(address->networkInterface.length > 0) {
-        res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "interface"),
-                                       &address->networkInterface, &UA_TYPES[UA_TYPES_STRING]);
-        if(res != UA_STATUSCODE_GOOD) {
-            UA_KeyValueMap_delete(defaultParams);
-            return res;
-        }
-    }
-    UA_UInt32 ttl = UA_MULTICAST_TTL_NO_LIMIT;
-    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "ttl"),
-                             &ttl, &UA_TYPES[UA_TYPES_UINT32]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    UA_Boolean reuse = true;
-    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "reuse"), &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    UA_Boolean loopback = true;
-    res = UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "loopback"), &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    UA_KeyValueMap_merge(defaultParams, &connectionConfig->connectionProperties);
-
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) newChannel->handle;
-    res = UA_KeyValueMap_copy(defaultParams, &ctx->publisherParams);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_KeyValueMap_delete(defaultParams);
-        return res;
-    }
-    UA_Boolean validate = true;
-    UA_KeyValueMap_setScalar(defaultParams, UA_QUALIFIEDNAME(0, "validate"), &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    res = connectionManager->openConnection(connectionManager, defaultParams, NULL, NULL, NULL);
-    UA_KeyValueMap_delete(defaultParams);
-    return res;
-}
-
-static UA_Boolean
-startsWith(const char *pre, const char *str) {
-    return strncmp(pre, str, strlen(pre)) == 0;
-}
-
-/**
- * Open communication socket based on the connectionConfig. Protocol specific parameters are
- * provided within the connectionConfig as KeyValuePair.
- * Currently supported options: "ttl" , "loopback", "reuse"
- *
- * @return ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-UA_PubSubChannelUDP_open(UA_ConnectionManager *connectionManager, UA_TransportLayerContext *ctx, UA_NetworkAddressUrlDataType *address) {
-    UA_initialize_architecture_network();
-
-    UA_PubSubConnectionConfig *connectionConfig = ctx->connectionConfig;
-    UA_UDPConnectionContext *context = NULL;
-    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
-        UA_calloc(1, sizeof(UA_PubSubChannel));
-    if(!newChannel) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
-        return NULL;
-    }
-
-    char addressAsChar[MAX_URL_LENGTH];
-    UA_UInt16 port;
-    UA_StatusCode res = getRawAddressAndPortValues(address, addressAsChar, &port);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto error;
-    }
-    context = (UA_UDPConnectionContext *) UA_calloc(1, sizeof(UA_UDPConnectionContext));
-    if(!context) {
-        goto error;
-    }
-    context->server = ctx->server;
-    context->connection = ctx->connection;
-    context->connectionManager = connectionManager;
-    context->decodeAndProcessNetworkMessage = ctx->decodeAndProcessNetworkMessage;
-    newChannel->handle = context; /* Link channel and internal channel data */
-
-    // if the connection does not start with localhost, then it is a multicast connection
-    // so the publishing of messages originates from the pubsub connection,
-    // otherwise, in the unicast-case the publish direction only originates in
-    // a writergroup channel
-    if(!startsWith("opc.udp://localhost", (char*) address->url.data)) {
-        res = UA_openPublishDirection(connectionManager, connectionConfig, newChannel, address, addressAsChar, port);
-        if(res != UA_STATUSCODE_GOOD) {
-            goto error;
-        }
-    }
-
-    res = UA_openSubscribeDirection(connectionManager, connectionConfig, newChannel, address, addressAsChar, port);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto error;
-    }
-    return newChannel;
-error:
-    if(context != NULL) {
-        newChannel->handle = NULL;
-        UA_free(context);
-    }
-    UA_PubSubChannelUDP_close(newChannel);
-    return NULL;
-}
-
-static UA_PubSubChannel *
-UA_PubSubChannelUDP_openUnicast(UA_ConnectionManager *connectionManager, UA_TransportLayerContext *ctx, UA_NetworkAddressUrlDataType *address) {
-    UA_initialize_architecture_network();
-
-    UA_PubSubConnectionConfig *connectionConfig = ctx->connectionConfig;
-    UA_UDPConnectionContext *context = NULL;
-    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
-        UA_calloc(1, sizeof(UA_PubSubChannel));
-    if(!newChannel) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
-        return NULL;
-    }
-
-    char addressAsChar[MAX_URL_LENGTH];
-    UA_UInt16 port;
-    UA_StatusCode res = getRawAddressAndPortValues(address, addressAsChar, &port);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto error;
-    }
-
-    context = (UA_UDPConnectionContext *) UA_calloc(1, sizeof(UA_UDPConnectionContext));
-    context->server = ctx->server;
-    context->connection = ctx->connection;
-    context->connectionManager = connectionManager;
-    newChannel->handle = context; /* Link channel and internal channel data */
-
-    res = UA_openPublishDirection(connectionManager, connectionConfig, newChannel, address, addressAsChar, port);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto error;
-    }
-
-    return newChannel;
-error:
-    if(context != NULL) {
-        newChannel->handle = NULL;
-        UA_free(context);
-    }
-    UA_free(newChannel);
-    return NULL;
-}
-
-/**
- * Subscribe to a given address.
- *
- * @return UA_STATUSCODE_GOOD on success
- */
-static UA_StatusCode
-UA_PubSubChannelUDP_regist(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-                           void (*notUsedHere)(UA_ByteString *encodedBuffer,
-                                                 UA_ByteString *topic)) {
-    if(!(channel->state == UA_PUBSUB_CHANNEL_PUB || channel->state == UA_PUBSUB_CHANNEL_RDY)){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection regist failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Remove current subscription.
- *
- * @return UA_STATUSCODE_GOOD on success
- */
-static UA_StatusCode
-UA_PubSubChannelUDP_unregist(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings) {
-    if(!(channel->state == UA_PUBSUB_CHANNEL_PUB_SUB || channel->state == UA_PUBSUB_CHANNEL_SUB)){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection unregist failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Send messages to the connection defined address
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelUDP_send(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-                         UA_ByteString *buf) {
-
-    UA_UDPConnectionContext *udpContext = (UA_UDPConnectionContext *) channel->handle;
-    UA_ConnectionManager *cm = udpContext->connectionManager;
-
-    uintptr_t connectionId = udpContext->connectionIdPublish;
-
-    return cm->sendWithConnection(cm, connectionId, &UA_KEYVALUEMAP_NULL, buf);
-}
-
-/**
- * Receive messages. The regist function should be called before.
- *
- * @param timeout in usec | on windows platforms are only multiples of 1000usec possible
- * @return
- */
-static UA_StatusCode
-UA_PubSubChannelUDP_receive(UA_PubSubChannel *channel,
-                            UA_ExtensionObject *transportSettings,
-                            UA_PubSubReceiveCallback receiveCallback,
-                            void *receiveCallbackContext,
-                            UA_UInt32 timeout) {
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_PubSubChannelUDP_openPublisher(UA_PubSubChannel *channel) {
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
-    ctx->connectionManager->openConnection(ctx->connectionManager, &ctx->publisherParams,
-                                           channel, ctx, UA_PubSub_udpCallbackPublish);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_PubSubChannelUDP_openSubscriber(UA_PubSubChannel *channel) {
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
-    ctx->connectionManager->openConnection(ctx->connectionManager, &ctx->subscriberParams,
-                                           channel, ctx, UA_PubSub_udpCallbackSubscribe);
-    return UA_STATUSCODE_GOOD;
-}
-static UA_StatusCode
-UA_PubSubChannelUDP_closePublisher(UA_PubSubChannel *channel) {
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
-    // UA_KeyValueMap_clear(&ctx->publisherParams);
-    ctx->connectionManager->closeConnection(ctx->connectionManager, ctx->connectionIdPublish);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_PubSubChannelUDP_closeSubscriber(UA_PubSubChannel *channel) {
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
-    // UA_KeyValueMap_clear(&ctx->subscriberParams);
-    ctx->connectionManager->closeConnection(ctx->connectionManager, ctx->connectionIdSubscribe);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_PubSubChannelUDP_allocNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize) {
-    UA_UDPConnectionContext *ctx = (UA_UDPConnectionContext *) channel->handle;
-    return ctx->connectionManager->allocNetworkBuffer(ctx->connectionManager, ctx->connectionIdPublish, buf, bufSize);
-}
-static UA_StatusCode
-UA_PubSubChannelUDP_freeNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf) {
-    /* noop */
-    return UA_STATUSCODE_GOOD;
-}
-/**
- * Generate a new channel. based on the given configuration.
- *
- * @param connectionConfig connection configuration
- * @return  ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-TransportLayerUDP_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSub channel requested");
-    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
-    UA_PubSubConnectionConfig *connectionConfig = tctx->connectionConfig;
-    UA_PubSubChannel *pubSubChannel = NULL;
-    UA_Server *server = tctx->server;
-
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_EventLoop *el = config->eventLoop;
-    UA_String needle = UA_STRING("udp connection manager");
-
-    UA_EventSource *es;
-    for(es = el->eventSources; es != NULL; es=es->next) {
-        if(UA_String_equal(&es->name, &needle)) {
-            break;
-        }
-    }
-    if(!es) {
-        return NULL;
-    }
-    tl->connectionManager = (UA_ConnectionManager *) es;
-
-    if(!UA_Variant_hasScalarType(&connectionConfig->address,
-                                 &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid Address.");
-        return NULL;
-    }
-    UA_NetworkAddressUrlDataType *address =
-        (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
-
-    if(tctx->writerGroupAddress)  {
-        pubSubChannel = UA_PubSubChannelUDP_openUnicast((UA_ConnectionManager*) tl->connectionManager, tctx, tctx->writerGroupAddress);
-    } else {
-        pubSubChannel = UA_PubSubChannelUDP_open((UA_ConnectionManager*) tl->connectionManager, tctx, address);
-    }
-
-    if(pubSubChannel){
-        pubSubChannel->regist = UA_PubSubChannelUDP_regist;
-        pubSubChannel->unregist = UA_PubSubChannelUDP_unregist;
-        pubSubChannel->send = UA_PubSubChannelUDP_send;
-        pubSubChannel->receive = UA_PubSubChannelUDP_receive;
-        pubSubChannel->close = UA_PubSubChannelUDP_close;
-        pubSubChannel->closeSubscriber = UA_PubSubChannelUDP_closeSubscriber;
-        pubSubChannel->closePublisher = UA_PubSubChannelUDP_closePublisher;
-        pubSubChannel->openSubscriber = UA_PubSubChannelUDP_openSubscriber;
-        pubSubChannel->openPublisher = UA_PubSubChannelUDP_openPublisher;
-        pubSubChannel->allocNetworkBuffer = UA_PubSubChannelUDP_allocNetworkBuffer;
-        pubSubChannel->freeNetworkBuffer = UA_PubSubChannelUDP_freeNetworkBuffer;
-        pubSubChannel->connectionConfig = connectionConfig;
-
-        pubSubChannel->state = UA_PUBSUB_CHANNEL_PUB;
-    }
-    return pubSubChannel;
-}
-
-static UA_StatusCode
-TransportLayerUDP_addWritergroupChannel(UA_PubSubChannel **out, UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void* ctx)  {
-    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
-    if(writerGroupTransportSettings && writerGroupTransportSettings->content.decoded.type == &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE]) {
-        UA_DatagramWriterGroupTransport2DataType *ts = (UA_DatagramWriterGroupTransport2DataType *) writerGroupTransportSettings->content.decoded.data;
-        const char *assertedPrefix = "opc.udp://localhost:";
-
-        if(strncmp(assertedPrefix, (char *) tctx->connectionAddress->url.data, strlen(assertedPrefix)) != 0) {
-
-            UA_LOG_ERROR(tctx->logger, UA_LOGCATEGORY_PUBSUB,
-                         "PubSub WriterGroup creating failed. Invalid Address of PubSub Connection.");
-            return UA_STATUSCODE_BADCONNECTIONREJECTED;
-        }
-
-        if(ts->address.content.decoded.type == &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) {
-            UA_NetworkAddressUrlDataType *address = (UA_NetworkAddressUrlDataType *) ts->address.content.decoded.data;
-            const char *prefix = "opc.udp://";
-            if(strncmp(prefix, (char *) address->url.data, strlen(prefix)) == 0) {
-
-                /* Retrieve the transport layer for the given profile uri */
-                tctx->writerGroupAddress = address;
-                *out = tl->createPubSubChannel(tl, tctx);
-                return UA_STATUSCODE_GOOD;
-            } else {
-                return UA_STATUSCODE_BADCONNECTIONREJECTED;
-            }
-        } else {
-            return UA_STATUSCODE_BADCONNECTIONREJECTED;
-        }
-    } else {
-        return UA_STATUSCODE_GOOD;
-    }
-}
-
-//UDP channel factory
-UA_PubSubTransportLayer
-UA_PubSubTransportLayerUDP(void) {
-    // UA_ServerConfig *config = UA_Server_getConfig(server);
-    // UA_EventLoop *el = config->eventLoop;
-
-    UA_PubSubTransportLayer pubSubTransportLayer;
-    memset(&pubSubTransportLayer, 0, sizeof(UA_PubSubTransportLayer));
-    // pubSubTransportLayer.connectionManager = UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp-cm"));
-    // pubSubTransportLayer.server = server;
-    // el->registerEventSource(el, &pubSubTransportLayer.connectionManager->eventSource);
-
-    pubSubTransportLayer.transportProfileUri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    pubSubTransportLayer.createPubSubChannel = &TransportLayerUDP_addChannel;
-    pubSubTransportLayer.createWriterGroupPubSubChannel= &TransportLayerUDP_addWritergroupChannel;
-    pubSubTransportLayer.connectionManager = NULL;
-    return pubSubTransportLayer;
-}
diff --git a/plugins/ua_pubsub_udp_multicast.c b/plugins/ua_pubsub_udp_multicast.c
deleted file mode 100644
index 89eb23c58c0..00000000000
--- a/plugins/ua_pubsub_udp_multicast.c
+++ /dev/null
@@ -1,899 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright (c) 2017-2018 Fraunhofer IOSB (Author: Andreas Ebner)
- * Copyright 2018 (c) Jose Cabral, fortiss GmbH
- * Copyright (c) 2020 Fraunhofer IOSB (Author: Julius Pfrommer)
- * Copyright (c) 2020 Kalycito Infotech Private Limited
- * Copyright (c) 2021 Linutronix GmbH (Author: Kurt Kanzenbach)
- * Copyright (c) 2022 Fraunhofer IOSB (Author: Jan Hermes)
- */
-
-#include <open62541/server_pubsub.h>
-#include <open62541/util.h>
-
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/plugin/pubsub_udp.h>
-
-#define UA_RECEIVE_MSG_BUFFER_SIZE   4096
-
-#define UA_IPV4_PREFIX_MASK 0xF0000000
-#define UA_IPV4_MULTICAST_PREFIX 0xE0000000
-#if UA_IPV6
-#   define UA_IPV6_MULTICAST_PREFIX 0xFF
-#endif
-
-#if defined(__APPLE__)
-
-# ifndef IPV6_ADD_MEMBERSHIP
-#define IPV6_ADD_MEMBERSHIP  IPV6_JOIN_GROUP
-# endif
-
-# ifndef IPV6_DROP_MEMBERSHIP
-#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
-# endif
-
-#endif
-
-static UA_THREAD_LOCAL UA_Byte ReceiveMsgBufferUDP[UA_RECEIVE_MSG_BUFFER_SIZE];
-
-typedef union {
-    struct ip_mreq ipv4;
-#if UA_IPV6
-    struct ipv6_mreq ipv6;
-#endif
-} UA_IpMulticastRequest;
-
-/* UDP multicast network layer specific internal data */
-typedef struct {
-    int ai_family;                   /* Protocol family for socket. IPv4/IPv6 */
-    struct sockaddr_storage ai_addr; /* https://msdn.microsoft.com/de-de/library/windows/desktop/ms740496(v=vs.85).aspx */
-    socklen_t ai_addrlen;            /* Address length */
-    struct sockaddr_storage intf_addr;
-    UA_UInt32 messageTTL;
-    UA_Boolean enableLoopback;
-    UA_Boolean enableReuse;
-    UA_Boolean isMulticast;
-#ifdef __linux__
-    UA_UInt32* socketPriority;
-#endif
-    UA_IpMulticastRequest ipMulticastRequest;
-} UA_PubSubChannelDataUDPMC;
-
-#define MAX_URL_LENGTH 512
-#define MAX_PORT_CHARACTER_COUNT 6
-
-static UA_INLINE UA_StatusCode
-getAddressAndPortValues(const UA_NetworkAddressUrlDataType *address, char *outAddress, char *outPort) {
-    UA_String hostname = UA_STRING_NULL;
-    UA_String path = UA_STRING_NULL;
-    UA_UInt16 networkPort = 0;
-    UA_StatusCode res = UA_parseEndpointUrl(&address->url, &hostname, &networkPort, &path);
-    if(res != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid URL.");
-        return res;
-    }
-
-    if(hostname.length >= MAX_URL_LENGTH) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. URL maximum length is 512.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    memcpy(outAddress, hostname.data, hostname.length);
-    outAddress[hostname.length] = 0;
-
-    int printedCount = sprintf(outPort, "%u", networkPort);
-    if(printedCount < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation failed. Internal error: "
-                         "writing network outPort to string failed: %d (%s)",
-                         networkPort, errno_str));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static struct addrinfo *
-getAddrInfoListForAddress(char *address, char *port) {
-
-    struct addrinfo hints;
-    memset(&hints, 0, sizeof hints);
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_DGRAM;
-    hints.ai_flags = 0;
-    hints.ai_protocol = 0;
-
-    struct addrinfo *requestResult = NULL;
-    int error = UA_getaddrinfo(address, port, &hints, &requestResult);
-    if(error) {
-        errno = error;
-        UA_LOG_SOCKET_ERRNO_GAI_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation failed. Internal error: "
-                         "getaddrinfo lookup of %s failed with error %s",
-                         address, errno_str));
-        return NULL;
-    }
-    return requestResult;
-}
-
-static struct addrinfo *
-chooseValidAddrInfoAndCreateSocket(UA_SOCKET *sockfd, struct addrinfo* addrInfoList) {
-    struct addrinfo *rp = NULL;
-    for(rp = addrInfoList; rp != NULL; rp = rp->ai_next){
-        *sockfd = UA_socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-        if(*sockfd != UA_INVALID_SOCKET) break; /*success*/
-    }
-    if(!rp) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Internal error.");
-        return NULL;
-    }
-    return rp;
-}
-
-static void
-UA_setConnectionConfigurationProperties(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
-                                        const UA_KeyValueMap *connectionProperties) {
-    /* Set default values */
-    memset(channelDataUDPMC, 0, sizeof(UA_PubSubChannelDataUDPMC));
-    channelDataUDPMC->messageTTL = 255;
-    channelDataUDPMC->enableLoopback = true;
-    channelDataUDPMC->enableReuse = true;
-    channelDataUDPMC->isMulticast = true;
-
-    /* Iterate over the given KeyValuePair parameters */
-    UA_String ttlParam = UA_STRING("ttl");
-    UA_String loopbackParam = UA_STRING("loopback");
-    UA_String reuseParam = UA_STRING("reuse");
-#ifdef __linux__
-    UA_String socketPriorityParam = UA_STRING("sockpriority");
-#endif
-    for(size_t i = 0; i < connectionProperties->mapSize; i++) {
-        const UA_KeyValuePair *prop = &connectionProperties->map[i];
-        if(UA_String_equal(&prop->key.name, &ttlParam)) {
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                channelDataUDPMC->messageTTL = *(UA_UInt32*)prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &loopbackParam)) {
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
-                channelDataUDPMC->enableLoopback = *(UA_Boolean*)prop->value.data;
-            }
-        } else if(UA_String_equal(&prop->key.name, &reuseParam)) {
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
-                channelDataUDPMC->enableReuse = *(UA_Boolean*)prop->value.data;
-            }
-#ifdef __linux__
-        } else if(UA_String_equal(&prop->key.name, &socketPriorityParam)){
-            if(UA_Variant_hasScalarType(&prop->value, &UA_TYPES[UA_TYPES_UINT32])){
-                channelDataUDPMC->socketPriority = (UA_UInt32 *) UA_malloc(sizeof(UA_UInt32));
-                if(!channelDataUDPMC->socketPriority) {
-                    UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                                   "PubSub Connection creation. Could not set socket priority due to out of memory.");
-                    continue;
-                }
-                UA_UInt32_copy((UA_UInt32 *) prop->value.data, channelDataUDPMC->socketPriority);
-            }
-#endif
-        } else {
-            UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                           "PubSub Connection creation. Unknown connection parameter.");
-        }
-    }
-}
-
-static UA_StatusCode
-setupNetworkInterface(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
-                      UA_String *networkInterface) {/* Set configured interface */
-    UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * (*networkInterface).length + 1);
-    memcpy(interfaceAsChar, (*networkInterface).data, (*networkInterface).length);
-    interfaceAsChar[(*networkInterface).length] = 0;
-
-    if(channelDataUDPMC->ai_family == AF_INET) {
-        if(UA_inet_pton(AF_INET, interfaceAsChar, &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface) <= 0) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "PubSub Connection creation problem. "
-                         "Interface configuration preparation failed.");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        memcpy(&channelDataUDPMC->intf_addr, &channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface,
-               sizeof(channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface));
-#if UA_IPV6
-    } else if(channelDataUDPMC->ai_family == AF_INET6) {
-        channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
-        if(channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "PubSub Connection creation problem. "
-                         "Interface configuration preparation failed.");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        memcpy(&channelDataUDPMC->intf_addr, &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface,
-               sizeof(channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface));
-#endif
-    } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                     "PubSub Connection creation failed. Multicast setup failed: "
-                     "unknown address family");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-#if UA_IPV6
-static UA_INLINE UA_StatusCode
-setMulticastInfoIPV6(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addressAsChar) {
-    int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET6, addressAsChar,
-                                                            &channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr);
-    if(convertTextAddressToBinarySuccessful != 1) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    if((channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_multiaddr.s6_addr[0] != UA_IPV6_MULTICAST_PREFIX)) {
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection is created for a unicast address (IPv6)");
-        channelDataUDPMC->isMulticast = false;
-    } else {
-        channelDataUDPMC->isMulticast = true;
-        channelDataUDPMC->ipMulticastRequest.ipv6.ipv6mr_interface = 0; // default configuration
-    }
-    return UA_STATUSCODE_GOOD;
-}
-#endif
-
-static UA_INLINE UA_StatusCode
-setMulticastInfoIPv4(UA_PubSubChannelDataUDPMC *channelDataUDPMC, const char *addressAsChar) {
-    int convertTextAddressToBinarySuccessful = UA_inet_pton(AF_INET, addressAsChar,
-                                                        &channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr);
-    if(convertTextAddressToBinarySuccessful != 1) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    uint32_t masked = UA_ntohl(channelDataUDPMC->ipMulticastRequest.ipv4.imr_multiaddr.s_addr) & UA_IPV4_PREFIX_MASK;
-    if(masked != UA_IPV4_MULTICAST_PREFIX) {
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection is created for a unicast address (IPv4)");
-        channelDataUDPMC->isMulticast = false;
-    } else {
-        channelDataUDPMC->isMulticast = true;
-        /* default configuration: multihomed hosts can join several groups on
-         * different IF, INADDR_ANY -> kernel decides */
-        channelDataUDPMC->ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-configureMulticast(UA_PubSubChannelDataUDPMC *channelDataUDPMC,
-                   UA_String networkInterface,
-                   const char *addressAsChar) {
-
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    /* Prepare for following socket options:
-     * - Set the physical interface for in- and outgoing traffic (if configured)
-     * - Join multicast group */
-    memset(&channelDataUDPMC->ipMulticastRequest, 0, sizeof(channelDataUDPMC->ipMulticastRequest));
-    /* Check if the ip address is a multicast address */
-    if(channelDataUDPMC->ai_family == AF_INET) {
-        res = setMulticastInfoIPv4(channelDataUDPMC, addressAsChar);
-#if UA_IPV6
-    } else if(channelDataUDPMC->ai_family == AF_INET6) {
-        res = setMulticastInfoIPV6(channelDataUDPMC, addressAsChar);
-#endif
-    } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                     "PubSub Connection creation failed. Multicast setup failed: "
-                     "unknown address family");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                     "PubSub Connection creation failed. Multicast setup failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    if(networkInterface.length > 0) {
-        res = setupNetworkInterface(channelDataUDPMC, &networkInterface);
-        if(res != UA_STATUSCODE_GOOD) {
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-    return UA_STATUSCODE_GOOD;
-}
-static void
-UA_PubSubChannelDataUDPMC_free(UA_PubSubChannelDataUDPMC* channelData) {
-    if(channelData) {
-#ifdef __linux__
-        if(channelData->socketPriority) {
-            UA_free(channelData->socketPriority);
-        }
-#endif
-        UA_free(channelData);
-    }
-}
-
-static UA_PubSubChannelDataUDPMC *
-UA_PubSubChannelDataUDPMC_new(UA_PubSubChannel *channel, const UA_PubSubConnectionConfig *connectionConfig) {
-
-    UA_PubSubChannelDataUDPMC *channelDataUDPMC = (UA_PubSubChannelDataUDPMC *)
-            UA_calloc(1, (sizeof(UA_PubSubChannelDataUDPMC)));
-    /* Allocate and init memory for the UDP multicast specific internal data */
-    if(!channelDataUDPMC){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
-        goto error;
-    }
-    UA_setConnectionConfigurationProperties(channelDataUDPMC, &connectionConfig->connectionProperties);
-    UA_NetworkAddressUrlDataType *address =
-        (UA_NetworkAddressUrlDataType *)connectionConfig->address.data;
-
-    char addressAsChar[MAX_URL_LENGTH];
-    char portAsChar[MAX_PORT_CHARACTER_COUNT];
-    UA_StatusCode res = getAddressAndPortValues(address, addressAsChar, portAsChar);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto error;
-    }
-    struct addrinfo *addrInfoList = getAddrInfoListForAddress(addressAsChar, portAsChar);
-    if(addrInfoList == NULL) {
-        goto error;
-    }
-    struct addrinfo *addrInfo = chooseValidAddrInfoAndCreateSocket(&channel->sockfd, addrInfoList);
-    if(addrInfo == NULL) {
-        UA_freeaddrinfo(addrInfoList);
-        goto error;
-    }
-    channelDataUDPMC->ai_family = addrInfo->ai_family;
-    channelDataUDPMC->ai_addrlen = (socklen_t)addrInfo->ai_addrlen;
-    memcpy(&channelDataUDPMC->ai_addr, addrInfo->ai_addr, addrInfo->ai_addrlen);
-    UA_freeaddrinfo(addrInfoList);
-
-    res = configureMulticast(channelDataUDPMC, address->networkInterface, addressAsChar);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto error_after_socket_creation;
-    }
-    return channelDataUDPMC;
-
-error_after_socket_creation:
-    UA_close(channel->sockfd);
-error:
-    UA_PubSubChannelDataUDPMC_free(channelDataUDPMC);
-    return NULL;
-}
-
-static UA_INLINE UA_StatusCode
-UA_setLoopBackData(UA_SOCKET *sockfd,
-                   UA_Boolean enableLoopback,
-                   int ai_family) {
-    /* Set loop back data to your host */
-#if UA_IPV6
-    /* The Linux Kernel IPv6 socket code checks for optlen to be at least the
-     * size of an integer. However, channelDataUDPMC->enableLoopback is a
-     * boolean. In order for the code to work for IPv4 and IPv6 propagate it to
-     * a temporary integer here. */
-    UA_Int32 enable = enableLoopback;
-    if(UA_setsockopt(*sockfd,
-                     ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     ai_family == AF_INET6 ? IPV6_MULTICAST_LOOP : IP_MULTICAST_LOOP,
-                     (const char *)&enable,
-                     sizeof (enable)) < 0)
-#else
-    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_LOOP,
-                     (const char *)&enable,
-                     sizeof (enable)) < 0)
-#endif
-    {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation failed. Loopback setup failed: "
-                         "Cannot set socket option IP_MULTICAST_LOOP. Error: %s",
-                         errno_str));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_INLINE void
-UA_setTimeToLive(UA_SOCKET *sockfd,
-                 UA_UInt32 messageTTL,
-                 int ai_family) {
-    /* Set Time to live (TTL). Value of 1 prevent forward beyond the local network. */
-#if UA_IPV6
-    if(UA_setsockopt(*sockfd,
-                     ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     ai_family == PF_INET6 ? IPV6_MULTICAST_HOPS : IP_MULTICAST_TTL,
-                     (const char *)&messageTTL,
-                     sizeof(messageTTL)) < 0)
-#else
-    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
-                     (const char *)&messageTTL,
-                     sizeof(messageTTL)) < 0)
-#endif
-    {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                           "PubSub Connection creation problem. Time to live setup failed: "
-                           "Cannot set socket option IP_MULTICAST_TTL. Error: %s",
-                           errno_str));
-    }
-}
-
-static UA_INLINE void
-UA_setReuseAddress(UA_SOCKET *sockfd, UA_Boolean enableReuse) {
-    /* Set reuse address -> enables sharing of the same listening address on
-    * different sockets */
-    if(enableReuse){
-        int enableReuseVal = 1;
-        if(UA_setsockopt(*sockfd, SOL_SOCKET, SO_REUSEADDR,
-                         (const char*)&enableReuseVal, sizeof(enableReuseVal)) < 0) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                               "PubSub Connection creation problem. Reuse address setup failed: "
-                               "Cannot set socket option SO_REUSEADDR. Error: %s",
-                               errno_str));
-        }
-    }
-}
-
-#ifdef __linux__
-static UA_StatusCode
-UA_setSocketPriority(UA_SOCKET *sockfd, UA_UInt32 *socketPriority) {/* Setting the socket priority to the socket */
-    if(socketPriority != NULL) {
-        if (UA_setsockopt(*sockfd, SOL_SOCKET, SO_PRIORITY,
-                          socketPriority, sizeof(*socketPriority)) < 0) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                             "PubSub Connection creation problem. Priority setup failed: "
-                             "Cannot set socket option SO_PRIORITY. Error: %s", errno_str));
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-    return UA_STATUSCODE_GOOD;
-}
-#endif
-
-static UA_StatusCode
-bindChannelSocket(UA_SOCKET *sockfd, struct sockaddr_storage *ai_addr, int ai_family) {
-    if(ai_family == AF_INET) { //IPv4 handling
-        struct sockaddr_in addr;
-        memset(&addr, 0, sizeof(addr));
-        addr.sin_family = AF_INET;
-        memcpy(&addr, ai_addr, sizeof(struct sockaddr_in));
-        addr.sin_addr.s_addr = INADDR_ANY;
-        if(UA_bind(*sockfd, (const struct sockaddr *)&addr,
-            sizeof(struct sockaddr_in)) != 0){
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                             "PubSub connection creation failed (IPv4). Cannot bind socket: "
-                             "Error: %s", errno_str));
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-#if UA_IPV6
-    } else if(ai_family == AF_INET6) {//IPv6 handling
-        struct sockaddr_in6 addr;
-        memset(&addr, 0, sizeof(addr));
-        addr.sin6_family = AF_INET6;
-        memcpy(&addr, ai_addr, sizeof(struct sockaddr_in6));
-        addr.sin6_addr = in6addr_any;
-        if(UA_bind(*sockfd, (const struct sockaddr *)&addr,
-            sizeof(struct sockaddr_in6)) != 0) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                             "PubSub connection creation failed (IPv6). Cannot bind socket: "
-                             "Error: %s", errno_str));
-
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-#endif
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-setMulticastOption(UA_SOCKET *sockfd, UA_IpMulticastRequest ipMulticastRequest, int ai_family) {
-#if UA_IPV6
-    if(UA_setsockopt(*sockfd,
-                     ai_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-                     ai_family == AF_INET6 ? IPV6_MULTICAST_IF : IP_MULTICAST_IF,
-                     ai_family == AF_INET6 ? (const void *) &ipMulticastRequest.ipv6.ipv6mr_interface : &ipMulticastRequest.ipv4.imr_interface,
-                     ai_family == AF_INET6 ? sizeof(ipMulticastRequest.ipv6.ipv6mr_interface) : sizeof(struct in_addr)) < 0)
-#else
-    if(UA_setsockopt(*sockfd, IPPROTO_IP, IP_MULTICAST_IF,
-                     &ipMulticastRequest.ipv4.imr_interface, sizeof(struct in_addr)) < 0)
-#endif
-    {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                         "PubSub Connection creation problem. Interface selection failed: "
-                         "Cannot set socket option IP_MULTICAST_IF. Error: %s",
-                         errno_str));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-setSocketOptionsAndBind(UA_SOCKET *sockfd, UA_PubSubChannelDataUDPMC *channelDataUDPMC) {
-    UA_StatusCode res = UA_setLoopBackData(sockfd, channelDataUDPMC->enableLoopback, channelDataUDPMC->ai_family);
-    if (res != UA_STATUSCODE_GOOD) return res;
-
-    UA_setTimeToLive(sockfd, channelDataUDPMC->messageTTL, channelDataUDPMC->ai_family);
-    UA_setReuseAddress(sockfd, channelDataUDPMC->enableReuse);
-
-    res = setMulticastOption(sockfd, channelDataUDPMC->ipMulticastRequest, channelDataUDPMC->ai_family);
-    if(res != UA_STATUSCODE_GOOD) return res;
-
-    res = bindChannelSocket(sockfd, &channelDataUDPMC->ai_addr, channelDataUDPMC->ai_family);
-    if(res != UA_STATUSCODE_GOOD) return res;
-
-#ifdef __linux__
-    res = UA_setSocketPriority(sockfd, channelDataUDPMC->socketPriority);
-    if(res != UA_STATUSCODE_GOOD) return res;
-#endif
-
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Open communication socket based on the connectionConfig. Protocol specific parameters are
- * provided within the connectionConfig as KeyValuePair.
- * Currently supported options: "ttl" , "loopback", "reuse"
- *
- * @return ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
-    UA_initialize_architecture_network();
-
-    if(!UA_Variant_hasScalarType(&connectionConfig->address,
-                                &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Invalid Address.");
-        return NULL;
-    }
-    UA_PubSubChannel *newChannel = (UA_PubSubChannel *)
-        UA_calloc(1, sizeof(UA_PubSubChannel));
-    if(!newChannel) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection creation failed. Out of memory.");
-        return NULL;
-    }
-    UA_PubSubChannelDataUDPMC *channelDataUDPMC = UA_PubSubChannelDataUDPMC_new(newChannel, connectionConfig);
-    if(!channelDataUDPMC) {
-        goto cleanup;
-    }
-    newChannel->handle = channelDataUDPMC; /* Link channel and internal channel data */
-    UA_StatusCode res = setSocketOptionsAndBind(&newChannel->sockfd, channelDataUDPMC);
-    if(res != UA_STATUSCODE_GOOD) {
-        goto cleanup_after_channel_data;
-    }
-    newChannel->state = UA_PUBSUB_CHANNEL_PUB;
-    return newChannel;
-
-cleanup_after_channel_data:
-    UA_close(newChannel->sockfd);
-    UA_PubSubChannelDataUDPMC_free(channelDataUDPMC);
-cleanup:
-    UA_free(newChannel);
-    return NULL;
-}
-
-/**
- * Subscribe to a given address.
- *
- * @return UA_STATUSCODE_GOOD on success
- */
-static UA_StatusCode
-UA_PubSubChannelUDPMC_regist(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-                             void (*notUsedHere)(UA_ByteString *encodedBuffer,
-                                                 UA_ByteString *topic)) {
-    if(!(channel->state == UA_PUBSUB_CHANNEL_PUB || channel->state == UA_PUBSUB_CHANNEL_RDY)){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection regist failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    UA_PubSubChannelDataUDPMC * connectionConfig = (UA_PubSubChannelDataUDPMC *) channel->handle;
-    struct ip_mreq groupV4;
-    memset(&groupV4, 0, sizeof(struct ip_mreq));
-    memcpy(&groupV4.imr_multiaddr,
-           &((const struct sockaddr_in *) &connectionConfig->ai_addr)->sin_addr,
-           sizeof(struct in_addr));
-    memcpy(&groupV4.imr_interface, &connectionConfig->intf_addr, sizeof(struct in_addr));
-
-    if(connectionConfig->isMulticast){
-#if UA_IPV6
-        struct ipv6_mreq groupV6 = { 0 };
-
-        memcpy(&groupV6.ipv6mr_multiaddr,
-               &((const struct sockaddr_in6 *) &connectionConfig->ai_addr)->sin6_addr,
-               sizeof(struct in6_addr));
-        memcpy(&groupV6.ipv6mr_interface, &connectionConfig->intf_addr, sizeof(int));
-
-        if(UA_setsockopt(channel->sockfd,
-            connectionConfig->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
-            connectionConfig->ai_family == PF_INET6 ? IPV6_ADD_MEMBERSHIP : IP_ADD_MEMBERSHIP,
-            connectionConfig->ai_family == PF_INET6 ? (const void *) &groupV6 : &groupV4,
-            connectionConfig->ai_family == PF_INET6 ? sizeof(groupV6) : sizeof(groupV4)) < 0)
-#else
-        if(UA_setsockopt(channel->sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                        &groupV4, sizeof(groupV4)) < 0)
-#endif
-        {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                             "PubSub Connection regist failed. IP membership setup failed: "
-                             "Cannot set socket option IP_ADD_MEMBERSHIP. Error: %s",
-                             errno_str));
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Remove current subscription.
- *
- * @return UA_STATUSCODE_GOOD on success
- */
-static UA_StatusCode
-UA_PubSubChannelUDPMC_unregist(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings) {
-    if(!(channel->state == UA_PUBSUB_CHANNEL_PUB_SUB || channel->state == UA_PUBSUB_CHANNEL_SUB)){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection unregist failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    UA_PubSubChannelDataUDPMC * connectionConfig = (UA_PubSubChannelDataUDPMC *) channel->handle;
-    if(connectionConfig->ai_family == PF_INET){//IPv4 handling
-        struct ip_mreq groupV4 = { 0 };
-
-        memcpy(&groupV4.imr_multiaddr,
-               &((const struct sockaddr_in *) &connectionConfig->ai_addr)->sin_addr,
-               sizeof(struct in_addr));
-        groupV4.imr_interface.s_addr = UA_htonl(INADDR_ANY);
-
-        if(UA_setsockopt(channel->sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
-                         (char *) &groupV4, sizeof(groupV4)) != 0){
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                             "PubSub Connection unregist failed. IP membership setup failed: "
-                             "Cannot set socket option IP_DROP_MEMBERSHIP. Error: %s",
-                             errno_str));
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-#if UA_IPV6
-    } else if (connectionConfig->ai_family == PF_INET6) {//IPv6 handling
-        struct ipv6_mreq groupV6 = { 0 };
-
-        memcpy(&groupV6.ipv6mr_multiaddr,
-               &((const struct sockaddr_in6 *) &connectionConfig->ai_addr)->sin6_addr,
-               sizeof(struct in6_addr));
-
-        if(UA_setsockopt(channel->sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
-                         (char *) &groupV6, sizeof(groupV6)) != 0){
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                             "PubSub Connection unregist failed. IP membership setup failed: "
-                             "Cannot set socket option IPV6_DROP_MEMBERSHIP. Error: %s",
-                             errno_str));
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-#endif
-    } else {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection unregist failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Send messages to the connection defined address
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelUDPMC_send(UA_PubSubChannel *channel, UA_ExtensionObject *transportSettings,
-                           UA_ByteString *buf) {
-    UA_PubSubChannelDataUDPMC *channelConfigUDPMC = (UA_PubSubChannelDataUDPMC *) channel->handle;
-    if(!(channel->state == UA_PUBSUB_CHANNEL_PUB || channel->state == UA_PUBSUB_CHANNEL_PUB_SUB)){
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection sending failed. Invalid state.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    //TODO evalute: chunk messages or check against MTU?
-    long nWritten = 0;
-    while (nWritten < (long)buf->length) {
-        long n = (long)UA_sendto(channel->sockfd, buf->data, buf->length, 0,
-                                 (struct sockaddr *) &channelConfigUDPMC->ai_addr,
-                                 channelConfigUDPMC->ai_addrlen);
-        if(n == -1L) {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                               "PubSub Connection sending failed: "
-                               "sendto failed. Error: %s", errno_str));
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        nWritten += n;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static
-UA_INLINE
-UA_DateTime timevalToDateTime(struct timeval val) {
-    return val.tv_sec * UA_DATETIME_SEC + val.tv_usec / 100;
-}
-
-/**
- * Receive messages. The regist function should be called before.
- *
- * @param timeout in usec | on windows platforms are only multiples of 1000usec possible
- * @return
- */
-static UA_StatusCode
-UA_PubSubChannelUDPMC_receive(UA_PubSubChannel *channel,
-                              UA_ExtensionObject *transportSettings,
-                              UA_PubSubReceiveCallback receiveCallback,
-                              void *receiveCallbackContext,
-                              UA_UInt32 timeout) {
-    if(!(channel->state == UA_PUBSUB_CHANNEL_PUB ||
-         channel->state == UA_PUBSUB_CHANNEL_PUB_SUB)) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "PubSub Connection receive failed. Invalid state.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_UInt16 rcvCount = 0;
-    struct timeval timeoutValue;
-    struct timeval receiveTime;
-    fd_set fdset;
-
-    memset(&timeoutValue, 0, sizeof(timeoutValue));
-    memset(&receiveTime, 0, sizeof(receiveTime));
-    FD_ZERO(&fdset);
-    timeoutValue.tv_sec  = (long int)(timeout / 1000000);
-    timeoutValue.tv_usec = (long int)(timeout % 1000000);
-    do {
-        if(timeout > 0) {
-            UA_fd_set(channel->sockfd, &fdset);
-            /* Select API will return the remaining time in the struct
-             * timeval */
-            int resultsize = UA_select(channel->sockfd+1, &fdset, NULL,
-                                       NULL, &timeoutValue);
-            if(resultsize == 0) {
-                retval = UA_STATUSCODE_GOODNONCRITICALTIMEOUT;
-                if(rcvCount > 0)
-                    retval = UA_STATUSCODE_GOOD;
-                break;
-            }
-
-            if (resultsize == -1) {
-                UA_LOG_SOCKET_ERRNO_WRAP(
-                    UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                                   "PubSub Connection receiving failed: "
-                                   "select failed. Error: %s", errno_str));
-                retval = UA_STATUSCODE_BADINTERNALERROR;
-                break;
-            }
-        }
-        UA_ByteString buffer;
-        buffer.length = UA_RECEIVE_MSG_BUFFER_SIZE;
-        buffer.data = ReceiveMsgBufferUDP;
-
-        UA_DateTime beforeRecvTime = UA_DateTime_nowMonotonic();
-        ssize_t messageLength = UA_recvfrom(channel->sockfd, buffer.data,
-                                            UA_RECEIVE_MSG_BUFFER_SIZE, 0, NULL, NULL);
-        if(messageLength > 0){
-            buffer.length = (size_t) messageLength;
-            retval = receiveCallback(channel, receiveCallbackContext, &buffer);
-            if(retval != UA_STATUSCODE_GOOD) {
-                    UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                                   "PubSub Connection decode and process failed.");
-
-            }
-
-        } else {
-            UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_NETWORK,
-                               "PubSub Connection receiving failed: "
-                               "recvfrom failed. Error: %s", errno_str));
-            retval = UA_STATUSCODE_BADINTERNALERROR;
-            break;
-        }
-
-        rcvCount++;
-        UA_DateTime endTime = UA_DateTime_nowMonotonic();
-        UA_DateTime receiveDuration = endTime - beforeRecvTime;
-
-        UA_DateTime remainingTimeoutValue = timevalToDateTime(timeoutValue);
-        if(remainingTimeoutValue < receiveDuration) {
-            retval = UA_STATUSCODE_GOOD;
-            break;
-        }
-
-        UA_DateTime newTimeoutValue = remainingTimeoutValue - receiveDuration;
-        timeoutValue.tv_sec = (long int)(newTimeoutValue  / UA_DATETIME_SEC);
-        timeoutValue.tv_usec = (long int)((newTimeoutValue % UA_DATETIME_SEC) * 100);
-
-    } while(true); /* TODO:Need to handle for jumbo frames*/
-                                             /* 1518 bytes is the maximum size of ethernet packet
-                                              * where 18 bytes used for header size, 28 bytes of header
-                                              * used for IP and UDP header so remaining length is 1472 */
-    // message->length = dataLength;
-    return retval;
-}
-/**
- * Close channel and free the channel data.
- *
- * @return UA_STATUSCODE_GOOD if success
- */
-static UA_StatusCode
-UA_PubSubChannelUDPMC_close(UA_PubSubChannel *channel) {
-    if(UA_close(channel->sockfd) != 0){
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "PubSub Connection delete failed.");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    UA_deinitialize_architecture_network();
-    //cleanup the internal NetworkLayer data
-    UA_PubSubChannelDataUDPMC *networkLayerData = (UA_PubSubChannelDataUDPMC *) channel->handle;
-    UA_PubSubChannelDataUDPMC_free(networkLayerData);
-    UA_free(channel);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_PubSubChannelUDPMC_allocNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf, size_t bufSize) {
-
-    UA_StatusCode rv = UA_ByteString_allocBuffer(buf, bufSize);
-    return rv;
-}
-
-static UA_StatusCode
-UA_PubSubChannelUDPMC_freeNetworkBuffer(UA_PubSubChannel *channel, UA_ByteString *buf) {
-    UA_ByteString_clear(buf);
-    return UA_STATUSCODE_GOOD;
-}
-
-/**
- * Generate a new channel. based on the given configuration.
- * @param tl the transport layer to use for the channel
- * @param ctx connection configuration ctx
- * @return  ref to created channel, NULL on error
- */
-static UA_PubSubChannel *
-TransportLayerUDPMC_addChannel(UA_PubSubTransportLayer *tl, void *ctx) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSub channel requested");
-
-    UA_TransportLayerContext *tctx  = (UA_TransportLayerContext *) ctx;
-    UA_PubSubConnectionConfig *connectionConfig = tctx->connectionConfig;
-    UA_PubSubChannel * pubSubChannel = UA_PubSubChannelUDPMC_open(connectionConfig);
-
-    if(pubSubChannel){
-        pubSubChannel->regist = UA_PubSubChannelUDPMC_regist;
-        pubSubChannel->unregist = UA_PubSubChannelUDPMC_unregist;
-        pubSubChannel->send = UA_PubSubChannelUDPMC_send;
-        pubSubChannel->receive = UA_PubSubChannelUDPMC_receive;
-        pubSubChannel->close = UA_PubSubChannelUDPMC_close;
-        pubSubChannel->openPublisher = NULL;
-        pubSubChannel->openSubscriber = NULL;
-        pubSubChannel->closePublisher = NULL;
-        pubSubChannel->closeSubscriber = NULL;
-        pubSubChannel->allocNetworkBuffer = UA_PubSubChannelUDPMC_allocNetworkBuffer;
-        pubSubChannel->freeNetworkBuffer = UA_PubSubChannelUDPMC_freeNetworkBuffer;
-        pubSubChannel->connectionConfig = connectionConfig;
-    }
-    return pubSubChannel;
-}
-static UA_StatusCode
-TransportLayerUDPMC_addWritergroupChannel(UA_PubSubChannel **out, UA_PubSubTransportLayer *tl, const UA_ExtensionObject *writerGroupTransportSettings, void* ctx)  {
-    *out = NULL;
-    return UA_STATUSCODE_GOOD;
-}
-
-//UDPMC channel factory
-UA_PubSubTransportLayer
-UA_PubSubTransportLayerUDPMP(void) {
-    UA_PubSubTransportLayer pubSubTransportLayer;
-    pubSubTransportLayer.transportProfileUri =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    pubSubTransportLayer.createPubSubChannel = &TransportLayerUDPMC_addChannel;
-    pubSubTransportLayer.createWriterGroupPubSubChannel= &TransportLayerUDPMC_addWritergroupChannel;
-    return pubSubTransportLayer;
-}

From 962a817f740d7bf50e0f1ef1b17de9fec7faf33c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 22:27:44 +0200
Subject: [PATCH 0997/1963] refactor(core): Remove unused plugin/network.h

---
 CMakeLists.txt                       |   1 -
 include/open62541/client.h           |   1 -
 include/open62541/common.h           |  11 +++
 include/open62541/plugin/eventloop.h |   1 -
 include/open62541/plugin/network.h   | 131 ---------------------------
 include/open62541/server.h           |   1 -
 include/open62541/util.h             |  14 +++
 src/ua_securechannel.h               |   3 +
 8 files changed, 28 insertions(+), 135 deletions(-)
 delete mode 100644 include/open62541/plugin/network.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4480031d11..4d4b2ebc5bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -887,7 +887,6 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/types_generated_handling.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/util.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/log.h
-                     ${PROJECT_SOURCE_DIR}/include/open62541/plugin/network.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/accesscontrol.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/pki.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/securitypolicy.h
diff --git a/include/open62541/client.h b/include/open62541/client.h
index 21a19f82952..c8e67452d50 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -23,7 +23,6 @@
 #include <open62541/common.h>
 
 #include <open62541/plugin/log.h>
-#include <open62541/plugin/network.h>
 #include <open62541/plugin/eventloop.h>
 #include <open62541/plugin/securitypolicy.h>
 
diff --git a/include/open62541/common.h b/include/open62541/common.h
index 7026b5c7163..461deb7cb80 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -173,6 +173,17 @@ typedef enum {
  * Connection State
  * ---------------- */
 
+typedef enum {
+    UA_CONNECTIONSTATE_CLOSED,     /* The socket has been closed and the connection
+                                    * will be deleted */
+    UA_CONNECTIONSTATE_OPENING,    /* The socket is open, but the HEL/ACK handshake
+                                    * is not done */
+    UA_CONNECTIONSTATE_ESTABLISHED,/* The socket is open and the connection
+                                    * configured */
+    UA_CONNECTIONSTATE_CLOSING     /* The socket is closing down */
+} UA_ConnectionState;
+
+
 typedef enum {
     UA_SECURECHANNELSTATE_CLOSED = 0,
     UA_SECURECHANNELSTATE_REVERSE_LISTENING,
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index bb37283fffc..af94b7325be 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -13,7 +13,6 @@
 #include <open62541/types_generated.h>
 #include <open62541/util.h>
 #include <open62541/plugin/log.h>
-#include <open62541/plugin/network.h>
 
 _UA_BEGIN_DECLS
 
diff --git a/include/open62541/plugin/network.h b/include/open62541/plugin/network.h
deleted file mode 100644
index 9d617f61248..00000000000
--- a/include/open62541/plugin/network.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- */
-
-#ifndef UA_PLUGIN_NETWORK_H_
-#define UA_PLUGIN_NETWORK_H_
-
-#include <open62541/util.h>
-#include <open62541/plugin/log.h>
-
-_UA_BEGIN_DECLS
-
-/* Forward declarations */
-struct UA_Connection;
-typedef struct UA_Connection UA_Connection;
-
-struct UA_SecureChannel;
-typedef struct UA_SecureChannel UA_SecureChannel;
-
-/**
- * .. _networking:
- *
- * Networking Plugin API
- * =====================
- *
- * Connection
- * ----------
- * Client-server connections are represented by a `UA_Connection`. The
- * connection is stateful and stores partially received messages, and so on. In
- * addition, the connection contains function pointers to the underlying
- * networking implementation. An example for this is the `send` function. So the
- * connection encapsulates all the required networking functionality. This lets
- * users on embedded (or otherwise exotic) systems implement their own
- * networking plugins with a clear interface to the main open62541 library. */
-
-typedef struct {
-    UA_UInt32 protocolVersion;
-    UA_UInt32 recvBufferSize;
-    UA_UInt32 sendBufferSize;
-    UA_UInt32 localMaxMessageSize;  /* (0 = unbounded) */
-    UA_UInt32 remoteMaxMessageSize; /* (0 = unbounded) */
-    UA_UInt32 localMaxChunkCount;   /* (0 = unbounded) */
-    UA_UInt32 remoteMaxChunkCount;  /* (0 = unbounded) */
-} UA_ConnectionConfig;
-
-typedef enum {
-    UA_CONNECTIONSTATE_CLOSED,     /* The socket has been closed and the connection
-                                    * will be deleted */
-    UA_CONNECTIONSTATE_OPENING,    /* The socket is open, but the HEL/ACK handshake
-                                    * is not done */
-    UA_CONNECTIONSTATE_ESTABLISHED,/* The socket is open and the connection
-                                    * configured */
-    UA_CONNECTIONSTATE_CLOSING     /* The socket is closing down */
-} UA_ConnectionState;
-
-struct UA_Connection {
-    UA_ConnectionState state;
-    UA_SecureChannel *channel;     /* The securechannel that is attached to
-                                    * this connection */
-    UA_SOCKET sockfd;              /* Most connectivity solutions run on
-                                    * sockets. Having the socket id here
-                                    * simplifies the design. */
-    void *handle;                  /* A pointer to internal data */
-
-    /* Get a buffer for sending */
-    UA_StatusCode (*getSendBuffer)(UA_Connection *connection, size_t length,
-                                   UA_ByteString *buf);
-
-    /* Release the send buffer manually */
-    void (*releaseSendBuffer)(UA_Connection *connection, UA_ByteString *buf);
-
-    /* Sends a message over the connection. The message buffer is always freed,
-     * even if sending fails.
-     *
-     * @param connection The connection
-     * @param buf The message buffer
-     * @return Returns an error code or UA_STATUSCODE_GOOD. */
-    UA_StatusCode (*send)(UA_Connection *connection, UA_ByteString *buf);
-
-    /* Receive a message from the remote connection
-     *
-     * @param connection The connection
-
-     * @param response The response string. If this is empty, it will be
-     *        allocated by the connection and needs to be freed with
-     *        connection->releaseBuffer. If the response string is non-empty, it
-     *        will be used as the receive buffer. If bytes are received, the
-     *        length of the buffer is adjusted to match the length of the
-     *        received bytes.
-     * @param timeout Timeout of the recv operation in milliseconds
-     * @return Returns UA_STATUSCODE_BADCOMMUNICATIONERROR if the recv operation
-     *         can be repeated, UA_STATUSCODE_GOOD if it succeeded and
-     *         UA_STATUSCODE_BADCONNECTIONCLOSED if the connection was
-     *         closed. */
-    UA_StatusCode (*recv)(UA_Connection *connection, UA_ByteString *response,
-                          UA_UInt32 timeout);
-
-    /* Release the buffer of a received message */
-    void (*releaseRecvBuffer)(UA_Connection *connection, UA_ByteString *buf);
-
-    /* Close the connection. The network layer closes the socket. This is picked
-     * up during the next 'listen' and the connection is freed in the network
-     * layer. */
-    void (*close)(UA_Connection *connection);
-
-    /* To be called only from within the server (and not the network layer).
-     * Frees up the connection's memory. */
-    void (*free)(UA_Connection *connection);
-};
-
-/**
- * Client Network Layer
- * --------------------
- * The client has only a single connection used for sending and receiving binary
- * messages. */
-
-/* @param config the connection config for this client
- * @param endpointUrl to where to connect
- * @param timeout in ms until the connection try times out if remote not reachable
- * @param logger the logger to use */
-typedef UA_Connection
-(*UA_ConnectClientConnection)(UA_ConnectionConfig config, UA_String endpointUrl,
-                              UA_UInt32 timeout, const UA_Logger *logger);
-
-_UA_END_DECLS
-
-#endif /* UA_PLUGIN_NETWORK_H_ */
diff --git a/include/open62541/server.h b/include/open62541/server.h
index cefe1e92d32..d963ed227d9 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -22,7 +22,6 @@
 
 #include <open62541/plugin/log.h>
 #include <open62541/plugin/pki.h>
-#include <open62541/plugin/network.h>
 #include <open62541/plugin/nodestore.h>
 #include <open62541/plugin/eventloop.h>
 #include <open62541/plugin/accesscontrol.h>
diff --git a/include/open62541/util.h b/include/open62541/util.h
index 1ed41672dc0..ad1afd71a5a 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -105,6 +105,20 @@ UA_KeyValueMap_copy(const UA_KeyValueMap *src, UA_KeyValueMap *dst);
 UA_EXPORT UA_StatusCode
 UA_KeyValueMap_merge(UA_KeyValueMap *lhs, const UA_KeyValueMap *rhs);
 
+/**
+ * Binary Connection Config Parameters
+ * ----------------------------------- */
+
+typedef struct {
+    UA_UInt32 protocolVersion;
+    UA_UInt32 recvBufferSize;
+    UA_UInt32 sendBufferSize;
+    UA_UInt32 localMaxMessageSize;  /* (0 = unbounded) */
+    UA_UInt32 remoteMaxMessageSize; /* (0 = unbounded) */
+    UA_UInt32 localMaxChunkCount;   /* (0 = unbounded) */
+    UA_UInt32 remoteMaxChunkCount;  /* (0 = unbounded) */
+} UA_ConnectionConfig;
+
 /**
  * Endpoint URL Parser
  * -------------------
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 4469f56a8cc..59b8cf028f8 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -23,6 +23,9 @@
 
 _UA_BEGIN_DECLS
 
+struct UA_SecureChannel;
+typedef struct UA_SecureChannel UA_SecureChannel;
+
 /* The message header of the OPC UA binary protocol is structured as follows:
  *
  * - MessageType (3 Byte)

From cc6c07578a6493be842ef03020789c552cd7a3e6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 22:29:56 +0200
Subject: [PATCH 0998/1963] refactor(core): Remove unused Websockets
 implementation

This will be added back based on the EventLoop
---
 CMakeLists.txt                 |  22 --
 arch/network_ws.c              | 382 ---------------------------------
 include/open62541/config.h.in  |   1 -
 include/open62541/network_ws.h |  23 --
 4 files changed, 428 deletions(-)
 delete mode 100644 arch/network_ws.c
 delete mode 100644 include/open62541/network_ws.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d4b2ebc5bd..c032f376074 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,14 +139,6 @@ set(ua_architecture_headers ${ua_architecture_headers}
     ${PROJECT_SOURCE_DIR}/include/open62541/architecture_functions.h
 )
 
-if(UA_ENABLE_WEBSOCKET_SERVER)
-    set(ua_architecture_sources ${ua_architecture_sources}
-                                ${PROJECT_SOURCE_DIR}/arch/network_ws.c)
-
-    set(ua_architecture_headers ${ua_architecture_headers}
-                                ${PROJECT_SOURCE_DIR}/include/open62541/network_ws.h)
-endif()
-
 if(${UA_ARCHITECTURE} STREQUAL "None")
   message(FATAL_ERROR "No architecture was selected. Please select the architecture of your target platform")
 endif(${UA_ARCHITECTURE} STREQUAL "None")
@@ -201,9 +193,6 @@ mark_as_advanced(UA_ENABLE_INLINABLE_EXPORT)
 option(UA_ENABLE_DISCOVERY_MULTICAST "Enable Discovery Service with multicast support (LDS-ME)" OFF)
 mark_as_advanced(UA_ENABLE_DISCOVERY_MULTICAST)
 
-option(UA_ENABLE_WEBSOCKET_SERVER "Enable websocket support (uses libwebsockets)" OFF)
-mark_as_advanced(UA_ENABLE_WEBSOCKET_SERVER)
-
 # security provider
 set(UA_ENCRYPTION_PLUGINS "MBEDTLS" "OPENSSL" "LIBRESSL")
 set(UA_ENABLE_ENCRYPTION "OFF" CACHE STRING "Encryption support (Libressl EXPERIMENTAL)")
@@ -622,17 +611,6 @@ if(UA_ENABLE_TPM2_SECURITY)
     list(APPEND open62541_LIBRARIES ${TPM2_LIB})
 endif()
 
-if(UA_ENABLE_WEBSOCKET_SERVER)
-    # The recommended way is to install libwebsockets via the OS package manager. If
-    # that is not possible, manually compile libwebsockets and set the cmake variables
-    # defined in /tools/cmake/Findlibwebsockets.cmake
-    find_package(libwebsockets REQUIRED)
-    list(APPEND open62541_LIBRARIES ${LIBWEBSOCKETS_LIBRARIES})
-
-    set(ua_architecture_directories_to_include ${ua_architecture_directories_to_include}
-                                               ${LIBWEBSOCKETS_INCLUDE_DIR})
-endif()
-
 if(MINGW)
     # GCC stack protector support
     list(APPEND open62541_LIBRARIES ssp)
diff --git a/arch/network_ws.c b/arch/network_ws.c
deleted file mode 100644
index cd5083bdd62..00000000000
--- a/arch/network_ws.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    relies heavily on concepts from libwebsockets minimal examples
- *    Copyright 2019 (c) Matthias Konnerth
- *    Copyright 2019 (c) Michael Derfler
- */
-
-#define UA_INTERNAL
-
-#include <open62541/config.h>
-#include <open62541/network_ws.h>
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/util.h>
-#include "open62541_queue.h"
-#include "ua_securechannel.h"
-#include <libwebsockets.h>
-#include <string.h>
-
-struct BufferEntry {
-    UA_ByteString msg;
-    SIMPLEQ_ENTRY(BufferEntry) next;
-};
-
-typedef struct BufferEntry BufferEntry;
-
-struct ConnectionUserData {
-    struct lws *wsi;
-    SIMPLEQ_HEAD(, BufferEntry) messages;
-};
-
-typedef struct ConnectionUserData ConnectionUserData;
-
-// one of these is created for each client connecting to us
-struct SessionData {
-    UA_Connection *connection;
-};
-
-// one of these is created for each vhost our protocol is used with
-struct VHostData {
-    struct lws_context *context;
-};
-
-typedef struct {
-    const UA_Logger *logger;
-    UA_UInt16 port;
-    struct lws_context *context;
-    UA_Server *server;
-    UA_ConnectionConfig config;
-    UA_ByteString certificate;
-    UA_ByteString privateKey;
-} ServerNetworkLayerWS;
-
-static UA_StatusCode
-connection_ws_getsendbuffer(UA_Connection *connection, size_t length, UA_ByteString *buf) {
-    UA_SecureChannel *channel = connection->channel;
-    if(channel && channel->config.sendBufferSize < length)
-        return UA_STATUSCODE_BADCOMMUNICATIONERROR;
-    UA_StatusCode retval = UA_ByteString_allocBuffer(buf, LWS_PRE + length);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-    buf->data += LWS_PRE;
-    buf->length -= LWS_PRE;
-
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-connection_ws_releasesendbuffer(UA_Connection *connection, UA_ByteString *buf) {
-    buf->data -= LWS_PRE;
-    buf->length += LWS_PRE;
-    UA_ByteString_clear(buf);
-}
-
-static void
-connection_ws_releaserecvbuffer(UA_Connection *connection, UA_ByteString *buf) {
-    UA_ByteString_clear(buf);
-}
-
-static UA_StatusCode
-connection_send(UA_Connection *connection, UA_ByteString *buf) {
-    /*  libwebsockets sends data only once lws_service is called
-    and it gets a POLLOUT event. Effectively that means that this send is
-    deferred until the next ServerNetworkLayerWS_listen. That may result
-    in very poor throughput if there are any other network layers present. */
-
-    ConnectionUserData *buffer = (ConnectionUserData *)connection->handle;
-    if(connection->state == UA_CONNECTIONSTATE_CLOSED) {
-        connection_ws_releasesendbuffer(connection, buf);
-        return UA_STATUSCODE_BADCONNECTIONCLOSED;
-    }
-
-    BufferEntry *entry = (BufferEntry *)malloc(sizeof(BufferEntry));
-    entry->msg = *buf;
-    SIMPLEQ_INSERT_TAIL(&buffer->messages, entry, next);
-    lws_callback_on_writable(buffer->wsi);
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-ServerNetworkLayerWS_close(UA_Connection *connection) {
-    connection->state = UA_CONNECTIONSTATE_CLOSED;
-    // trigger callback and close;
-    lws_callback_on_writable(((ConnectionUserData *)connection->handle)->wsi);
-}
-
-static void
-freeConnection(UA_Connection *connection) {
-    if(connection->handle) {
-        ConnectionUserData *userData = (ConnectionUserData *)connection->handle;
-        while(!SIMPLEQ_EMPTY(&userData->messages)) {
-            BufferEntry *entry = SIMPLEQ_FIRST(&userData->messages);
-            connection_ws_releasesendbuffer(connection, &entry->msg);
-            SIMPLEQ_REMOVE_HEAD(&userData->messages, next);
-            UA_free(entry);
-        }
-        UA_free(connection->handle);
-    }
-    UA_free(connection);
-}
-
-static int
-callback_opcua(struct lws *wsi, enum lws_callback_reasons reason, void *user, void *in,
-               size_t len) {
-    struct SessionData *pss = (struct SessionData *)user;
-    struct VHostData *vhd =
-        (struct VHostData *)lws_protocol_vh_priv_get(lws_get_vhost(wsi),
-                                                                   lws_get_protocol(wsi));
-
-    switch(reason) {
-        case LWS_CALLBACK_PROTOCOL_INIT:
-            vhd = (struct VHostData *)lws_protocol_vh_priv_zalloc(
-                lws_get_vhost(wsi), lws_get_protocol(wsi),
-                sizeof(struct VHostData));
-            vhd->context = lws_get_context(wsi);
-            break;
-
-        case LWS_CALLBACK_ESTABLISHED:
-            if(!wsi)
-                break;
-            ServerNetworkLayerWS *layer = (ServerNetworkLayerWS *)lws_context_user(vhd->context);
-            UA_Connection *c = (UA_Connection *)malloc(sizeof(UA_Connection));
-            ConnectionUserData *buffer =
-                (ConnectionUserData *)malloc(sizeof(ConnectionUserData));
-            SIMPLEQ_INIT(&buffer->messages);
-            buffer->wsi = wsi;
-            memset(c, 0, sizeof(UA_Connection));
-            c->sockfd = UA_INVALID_SOCKET;
-            c->handle = buffer;
-            c->send = connection_send;
-            c->close = ServerNetworkLayerWS_close;
-            c->free = freeConnection;
-            c->getSendBuffer = connection_ws_getsendbuffer;
-            c->releaseSendBuffer = connection_ws_releasesendbuffer;
-            c->releaseRecvBuffer = connection_ws_releaserecvbuffer;
-            // stack sets the connection to established
-            c->state = UA_CONNECTIONSTATE_OPENING;
-            pss->connection = c;
-            break;
-
-        case LWS_CALLBACK_CLOSED:
-            // notify server
-            if(pss->connection->state != UA_CONNECTIONSTATE_CLOSED) {
-                pss->connection->state = UA_CONNECTIONSTATE_CLOSED;
-            }
-
-            layer = (ServerNetworkLayerWS *)lws_context_user(vhd->context);
-            if(layer && layer->server) {
-                UA_Server_removeConnection(layer->server, pss->connection);
-            }
-
-            break;
-
-        case LWS_CALLBACK_SERVER_WRITEABLE:
-            if(!pss->connection)
-                break;
-
-            ConnectionUserData *b = (ConnectionUserData *)pss->connection->handle;
-            do {
-                if(!pss->connection ||
-                   pss->connection->state == UA_CONNECTIONSTATE_CLOSED) {
-                    /*
-                    connetion is closed signal it to lws:
-                    lws documentation says:
-                    When you want to close a connection,
-                    you do it by returning -1 from a callback for that connection.
-                    */
-                    return -1;
-                }
-
-                BufferEntry *entry = SIMPLEQ_FIRST(&b->messages);
-                if(!entry)
-                    break;
-
-                int m = lws_write(wsi, entry->msg.data, entry->msg.length,
-                                  LWS_WRITE_BINARY);
-                if(m < (int)entry->msg.length) {
-                    lwsl_err("ERROR %d writing to ws\n", m);
-                    return -1;
-                }
-                connection_ws_releasesendbuffer(pss->connection, &entry->msg);
-                SIMPLEQ_REMOVE_HEAD(&b->messages, next);
-                UA_free(entry);
-            } while(!lws_send_pipe_choked(wsi));
-
-            // process remaining messages
-            if(SIMPLEQ_FIRST(&b->messages)) {
-                lws_callback_on_writable(wsi);
-            }
-            break;
-
-        case LWS_CALLBACK_RECEIVE: {
-            if(!vhd->context)
-                break;
-            layer = (ServerNetworkLayerWS *)lws_context_user(vhd->context);
-            if(!layer->server)
-                break;
-
-            UA_ByteString message = {len, (UA_Byte *)in};
-            UA_Server_processBinaryMessage(layer->server, pss->connection, &message);
-            break;
-        }
-
-        default:
-            break;
-    }
-
-    return 0;
-}
-
-static struct lws_protocols protocols[] = {
-    {"http", lws_callback_http_dummy, 0, 0, 0, NULL, 0},
-    /* default protocol */
-    {"opcua", callback_opcua, sizeof(struct SessionData), 0, 0, NULL, 0},
-    /* defined protocols: https://reference.opcfoundation.org/v104/Core/docs/Part6/7.5.2/ */
-    {"opcua+uacp", callback_opcua, sizeof(struct SessionData), 0, 0, NULL, 0},
-    // {"opcua+json", callback_opcua, sizeof(struct SessionData), 0, 0, NULL, 0}, // <-- enable when json coding is fully supported
-    {NULL, NULL, 0, 0, 0, NULL, 0}};
-
-// make the opcua protocol callback the default one
-const struct lws_protocol_vhost_options pvo_opt = {NULL, NULL, "default", "1"};
-const struct lws_protocol_vhost_options pvo = {NULL, &pvo_opt, "opcua", ""};
-
-static UA_StatusCode
-ServerNetworkLayerWS_start(UA_ServerNetworkLayer *nl, const UA_Logger *logger,
-                           const UA_String *customHostname) {
-    UA_initialize_architecture_network();
-
-    ServerNetworkLayerWS *layer = (ServerNetworkLayerWS *)nl->handle;
-    layer->logger = logger;
-
-    UA_Boolean isSecure = layer->certificate.length && layer->privateKey.length;
-
-    UA_String protocol = isSecure ? UA_STRING("wss") : UA_STRING("ws");
-
-    /* Get the discovery url from the hostname */
-    UA_String du = UA_STRING_NULL;
-    char discoveryUrlBuffer[256];
-    if(customHostname->length) {
-        du.length = (size_t)UA_snprintf(discoveryUrlBuffer, 255, "%.*s://%.*s:%d/",
-                                        (int)protocol.length, protocol.data,
-                                        (int)customHostname->length, customHostname->data,
-                                        layer->port);
-        du.data = (UA_Byte *)discoveryUrlBuffer;
-    } else {
-        char hostnameBuffer[256];
-        if(UA_gethostname(hostnameBuffer, 255) == 0) {
-            du.length = (size_t)UA_snprintf(discoveryUrlBuffer, 255, "%.*s://%s:%d/",
-                                            (int)protocol.length, protocol.data,
-                                            hostnameBuffer, layer->port);
-            du.data = (UA_Byte *)discoveryUrlBuffer;
-        } else {
-            UA_LOG_ERROR(layer->logger, UA_LOGCATEGORY_NETWORK,
-                         "Could not get the hostname");
-        }
-    }
-    // we need discoveryUrl.data as a null-terminated string for vhost_name
-    nl->discoveryUrl.data = (UA_Byte *)UA_malloc(du.length + 1);
-    strncpy((char *)nl->discoveryUrl.data, discoveryUrlBuffer, du.length);
-    nl->discoveryUrl.data[du.length] = '\0';
-    nl->discoveryUrl.length = du.length;
-
-    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                "Websocket network layer listening on %.*s", (int)nl->discoveryUrl.length,
-                nl->discoveryUrl.data);
-
-    struct lws_context_creation_info info;
-    int logLevel = LLL_USER | LLL_ERR | LLL_WARN | LLL_NOTICE;
-    lws_set_log_level(logLevel, NULL);
-    memset(&info, 0, sizeof info);
-    info.port = layer->port;
-    info.protocols = protocols;
-    info.vhost_name = (char *)nl->discoveryUrl.data;
-    info.ws_ping_pong_interval = 10;
-    info.options = LWS_SERVER_OPTION_HTTP_HEADERS_SECURITY_BEST_PRACTICES_ENFORCE;
-    info.pvo = &pvo;
-    info.user = layer;
-
-    if(isSecure) {
-        info.server_ssl_cert_mem = layer->certificate.data;
-        info.server_ssl_cert_mem_len = (unsigned int)layer->certificate.length;
-        info.server_ssl_private_key_mem = layer->privateKey.data;
-        info.server_ssl_private_key_mem_len = (unsigned int)layer->privateKey.length;
-
-        info.options |= LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT;
-          UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                "Websocket network layer listening using WSS");
-
-    }
-
-    struct lws_context *context = lws_create_context(&info);
-    if(!context) {
-        UA_LOG_ERROR(layer->logger, UA_LOGCATEGORY_NETWORK, "lws init failed");
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    layer->context = context;
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-ServerNetworkLayerWS_listen(UA_ServerNetworkLayer *nl, UA_Server *server,
-                            UA_UInt16 timeout) {
-    ServerNetworkLayerWS *layer = (ServerNetworkLayerWS *)nl->handle;
-    layer->server = server;
-    /*  N.B.: lws_service documentation says:
-            "Since v3.2 internally the timeout wait is ignored, the lws scheduler
-             is smart enough to stay asleep until an event is queued." */
-    lws_service(layer->context, timeout);
-    return UA_STATUSCODE_GOOD;
-}
-
-static void
-ServerNetworkLayerWS_stop(UA_ServerNetworkLayer *nl, UA_Server *server) {
-    ServerNetworkLayerWS *layer = (ServerNetworkLayerWS *)nl->handle;
-    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-                "Shutting down the WS network layer");
-    lws_context_destroy(layer->context);
-    UA_deinitialize_architecture_network();
-}
-
-static void
-ServerNetworkLayerWS_clear(UA_ServerNetworkLayer *nl) {
-    ServerNetworkLayerWS *layer = (ServerNetworkLayerWS *)nl->handle;
-
-    if(layer->certificate.length) {
-        UA_String_clear(&layer->certificate);
-    }
-
-    if(layer->privateKey.length) {
-        UA_String_clear(&layer->privateKey);
-    }
-
-    UA_free(nl->handle);
-    UA_String_clear(&nl->discoveryUrl);
-}
-
-UA_ServerNetworkLayer
-UA_ServerNetworkLayerWS(UA_ConnectionConfig config, UA_UInt16 port,
-                        const UA_ByteString* certificate,
-                        const UA_ByteString* privateKey) {
-    UA_ServerNetworkLayer nl;
-    memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
-    nl.clear = ServerNetworkLayerWS_clear;
-    nl.localConnectionConfig = config;
-    nl.start = ServerNetworkLayerWS_start;
-    nl.listen = ServerNetworkLayerWS_listen;
-    nl.stop = ServerNetworkLayerWS_stop;
-
-    ServerNetworkLayerWS *layer = (ServerNetworkLayerWS *)
-        UA_calloc(1, sizeof(ServerNetworkLayerWS));
-    if(!layer)
-        return nl;
-    nl.handle = layer;
-    layer->port = port;
-    layer->config = config;
-
-    if(certificate && privateKey) {
-        UA_String_copy(certificate,&layer->certificate);
-        UA_String_copy(privateKey,&layer->privateKey);
-    }
-    return nl;
-}
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index f6d02f39ad2..8de8c3a83d3 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -71,7 +71,6 @@
 #cmakedefine UA_ENABLE_DETERMINISTIC_RNG
 #cmakedefine UA_ENABLE_DISCOVERY
 #cmakedefine UA_ENABLE_DISCOVERY_MULTICAST
-#cmakedefine UA_ENABLE_WEBSOCKET_SERVER
 #cmakedefine UA_ENABLE_QUERY
 #cmakedefine UA_ENABLE_MALLOC_SINGLETON
 #cmakedefine UA_ENABLE_DISCOVERY_SEMAPHORE
diff --git a/include/open62541/network_ws.h b/include/open62541/network_ws.h
deleted file mode 100644
index 756cbb96a38..00000000000
--- a/include/open62541/network_ws.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2016 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- */
-
-#ifndef UA_NETWORK_WS_H_
-#define UA_NETWORK_WS_H_
-
-#include <open62541/client.h>
-#include <open62541/plugin/log.h>
-#include <open62541/server.h>
-
-_UA_BEGIN_DECLS
-
-UA_ServerNetworkLayer UA_EXPORT
-UA_ServerNetworkLayerWS(UA_ConnectionConfig config, UA_UInt16 port,
-                        const UA_ByteString* certificate,
-                        const UA_ByteString* privateKey);
-
-_UA_END_DECLS
-
-#endif /* UA_NETWORK_WS_H_ */

From 677a3a58686a74617e32ee2d084b19201efa0ca2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Jun 2023 22:31:05 +0200
Subject: [PATCH 0999/1963] refactor(core): Remove unused configuration options
 from open62541/config.h.in

---
 include/open62541/config.h.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 8de8c3a83d3..fd1f047aed7 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -43,10 +43,6 @@
 #cmakedefine UA_ENABLE_JSON_ENCODING
 #cmakedefine UA_ENABLE_XML_ENCODING
 #cmakedefine UA_ENABLE_MQTT
-#cmakedefine UA_ENABLE_PUBSUB_MQTT
-#cmakedefine UA_ENABLE_MQTT_TLS
-#cmakedefine UA_ENABLE_MQTT_TLS_OPENSSL
-#cmakedefine UA_ENABLE_MQTT_TLS_MBEDTLS
 #cmakedefine UA_ENABLE_NODESET_INJECTOR
 #cmakedefine UA_INFORMATION_MODEL_AUTOLOAD
 #cmakedefine UA_ENABLE_ENCRYPTION_MBEDTLS

From 6921f50f4daa743eec3fa310c3912171924b39fc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 18 Jun 2023 23:57:12 +0200
Subject: [PATCH 1000/1963] fix(el): Avoid duplicate calling of the application
 callback in eventloop_posix_eth.c

---
 arch/eventloop_posix_eth.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index b6ae55f2c62..68db8e44b0c 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -304,14 +304,6 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
            UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                         "ETH %u\t| recv signaled the socket was shutdown (%s)",
                         (unsigned)rfd->fd, errno_str));
-
-        /* A new socket has opened. Signal it to the application. */
-        UA_UNLOCK(&el->elMutex);
-        conn->applicationCB(cm, (uintptr_t)rfd->fd,
-                            conn->application, &conn->context,
-                            UA_CONNECTIONSTATE_CLOSING,
-                            &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-        UA_LOCK(&el->elMutex);
         ETH_close(pcm, conn);
         UA_free(rfd);
         return;

From 569c2b0ede8aa02d4144c17e52ce59caa74fb8a8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 18 Jun 2023 23:58:41 +0200
Subject: [PATCH 1001/1963] fix(el): Catch UA_FDEVENT_ERR event in the UDP
 EventSource

---
 arch/eventloop_posix_udp.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 330fe2ce163..7db265c7492 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -533,6 +533,15 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
                  "UDP %u\t| Activity on the socket",
                  (unsigned)conn->rfd.fd);
 
+    if(event == UA_FDEVENT_ERR) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                        "UDP %u\t| recv signaled the socket was shutdown (%s)",
+                        (unsigned)conn->rfd.fd, errno_str));
+        UDP_close(pcm, conn);
+        return;
+    }
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP %u\t| Allocate receive buffer", (unsigned)conn->rfd.fd);
 

From 0a835760091cb2b24f9833e5c120feda29901c29 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 19 Jun 2023 00:25:13 +0200
Subject: [PATCH 1002/1963] feat(el): Forward remote-address and remote-port
 when UDP messages are received

---
 arch/eventloop_posix_udp.c           | 48 +++++++++++++++++++++++-----
 include/open62541/plugin/eventloop.h |  5 ++-
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 7db265c7492..306aa8bc1ed 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -549,12 +549,15 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
     UA_ByteString response = pcm->rxBuffer;
 
     /* Receive */
+    struct sockaddr_storage source;
 #ifndef _WIN32
-    ssize_t ret = UA_recv(conn->rfd.fd, (char*)response.data,
-                          response.length, MSG_DONTWAIT);
+    socklen_t sourceSize = (socklen_t)sizeof(struct sockaddr_storage);
+    ssize_t ret = recvfrom(conn->rfd.fd, (char*)response.data, response.length,
+                           MSG_DONTWAIT, (struct sockaddr*)&source, &sourceSize);
 #else
-    int ret = UA_recv(conn->rfd.fd, (char*)response.data,
-                      response.length, MSG_DONTWAIT);
+    int sourceSize = (int)sizeof(struct sockaddr_storage);
+    int ret = recvfrom(conn->rfd.fd, (char*)response.data, (int)response.length,
+                       MSG_DONTWAIT, (struct sockaddr*)&source, &sourceSize);
 #endif
 
     /* Receive has failed */
@@ -573,17 +576,46 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
         return;
     }
 
+    response.length = (size_t)ret; /* Set the length of the received buffer */
+
+    /* Extract message source and port */
+    char sourceAddr[64];
+    UA_UInt16 sourcePort;
+    switch(source.ss_family) {
+        case AF_INET:
+            inet_ntop(AF_INET, &((struct sockaddr_in *)&source)->sin_addr,
+                    sourceAddr, 64);
+            sourcePort = htons(((struct sockaddr_in *)&source)->sin_port);
+            break;
+        case AF_INET6:
+            inet_ntop(AF_INET6, &(((struct sockaddr_in6 *)&source)->sin6_addr),
+                    sourceAddr, 64);
+            sourcePort = htons(((struct sockaddr_in6 *)&source)->sin6_port);
+            break;
+        default:
+            sourceAddr[0] = 0;
+            sourcePort = 0;
+    }
+
+    UA_String sourceAddrStr = UA_STRING(sourceAddr);
+    UA_KeyValuePair kvp[2];
+    kvp[0].key = UA_QUALIFIEDNAME(0, "remote-address");
+    UA_Variant_setScalar(&kvp[0].value, &sourceAddrStr, &UA_TYPES[UA_TYPES_STRING]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "remote-port");
+    UA_Variant_setScalar(&kvp[1].value, &sourcePort, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_KeyValueMap kvm = {2, kvp};
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                 "UDP %u\t| Received message of size %u",
-                 (unsigned)conn->rfd.fd, (unsigned)ret);
+                 "UDP %u\t| Received message of size %u from %s on port %u",
+                 (unsigned)conn->rfd.fd, (unsigned)ret,
+                 sourceAddr, sourcePort);
 
     /* Callback to the application layer */
-    response.length = (size_t)ret; /* Set the length of the received buffer */
     UA_UNLOCK(&el->elMutex);
     conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
                         conn->application, &conn->context,
                         UA_CONNECTIONSTATE_ESTABLISHED,
-                        &UA_KEYVALUEMAP_NULL, response);
+                        &kvm, response);
     UA_LOCK(&el->elMutex);
 }
 
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index af94b7325be..b97a9a503e7 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -515,9 +515,8 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  *
  * Connection Callback Paramters:
  *
- * - 0:remote-hostname [string]: When a new connection is opened by listening on
- *                               a port, the first callback contains the remote
- *                               hostname parameter.
+ * - 0:remote-address [string]: Contains the remote IP address.
+ * - 0:remote-port [uint16]: Contains the remote port.
  *
  * Send Parameters:
  * No additional parameters for sending over an UDP connection defined. */

From 94a391fc08561cf8b4c43055af99f78f548ef4f2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 21 Jun 2023 17:09:17 +0200
Subject: [PATCH 1003/1963] feat(el): Improve logging in eventloop_posix_udp.c

---
 arch/eventloop_posix_udp.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 306aa8bc1ed..e7f30793ef7 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -310,11 +310,16 @@ setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValue
         memcpy(interfaceAsChar, netif->data, netif->length);
         interfaceAsChar[netif->length] = 0;
         if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
                          "UDP %u\t| Interface configuration preparation failed",
                          (unsigned)socket);
             return UA_STATUSCODE_BADINTERNALERROR;
         }
+    } else {
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| No network interface defined for multicast. "
+                       "That means the first suitable network interface is used.",
+                       (unsigned)socket);
     }
 
     int res = setsockopt(socket, IPPROTO_IP, IP_MULTICAST_IF,
@@ -356,6 +361,11 @@ setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sock
                          "UDP\t| Interface configuration preparation failed.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
+    } else {
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| No network interface defined for multicast. "
+                       "That means the first suitable network interface is used.",
+                       (unsigned)socket);
     }
 
     int res = UA_setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
@@ -394,6 +404,11 @@ setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sock
                          "UDP\t| Interface configuration preparation failed.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
+    } else {
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| No network interface defined for multicast. "
+                       "That means the first suitable network interface is used.",
+                       (unsigned)socket);
     }
 
     if(UA_setsockopt(socket, IPPROTO_IPV6,IPV6_JOIN_GROUP,
@@ -429,6 +444,11 @@ setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValu
                          "UDP\t| Interface configuration preparation failed.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
+    } else {
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| No network interface defined for multicast. "
+                       "That means the first suitable network interface is used.",
+                       (unsigned)socket);
     }
 
     int res = setsockopt(socket, IPPROTO_IPV6, IPV6_MULTICAST_IF,

From 1596b1d81744d405cf07de48360032affbbd9bfc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 21 Jun 2023 17:09:52 +0200
Subject: [PATCH 1004/1963] refactor(server): Simplify UA_DiscoveryManager_new

---
 src/server/ua_discovery_manager.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index d3d21c120d8..befdc67bdba 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -180,26 +180,8 @@ UA_DiscoveryManager_new(UA_Server *server) {
     if(!dm)
         return NULL;
 
-    LIST_INIT(&dm->registeredServers);
-    dm->registeredServersSize = 0;
-    LIST_INIT(&dm->periodicServerRegisterCallbacks);
-    dm->registerServerCallback = NULL;
-    dm->registerServerCallbackData = NULL;
-
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    dm->mdnsDaemon = NULL;
-    dm->mdnsSocket = UA_INVALID_SOCKET;
-    dm->mdnsMainSrvAdded = false;
-    dm->selfFqdnMdnsRecord = UA_STRING_NULL;
-
-    LIST_INIT(&dm->serverOnNetwork);
-    dm->serverOnNetworkRecordIdCounter = 0;
     dm->serverOnNetworkRecordIdLastReset = UA_DateTime_now();
-    memset(dm->serverOnNetworkHash, 0,
-           sizeof(struct serverOnNetwork_hash_entry*) * SERVER_ON_NETWORK_HASH_SIZE);
-
-    dm->serverOnNetworkCallback = NULL;
-    dm->serverOnNetworkCallbackData = NULL;
 #endif /* UA_ENABLE_DISCOVERY_MULTICAST */
 
     dm->sc.name = UA_STRING("discovery");

From 3fa8f61733983173be6eda2c1fb41b3d3f51dd46 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 21 Jun 2023 17:10:16 +0200
Subject: [PATCH 1005/1963] refactor(server): Introduce
 UA_DiscoveryManager_setState

---
 src/server/ua_discovery_manager.c | 20 ++++++++++++++++++--
 src/server/ua_discovery_manager.h |  5 +++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index befdc67bdba..844302dc39e 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -16,6 +16,17 @@
 
 #ifdef UA_ENABLE_DISCOVERY
 
+void
+UA_DiscoveryManager_setState(UA_Server *server,
+                             UA_DiscoveryManager *dm,
+                             UA_LifecycleState state) {
+    if(state == dm->sc.state)
+        return;
+    dm->sc.state = state;
+    if(dm->sc.notifyState)
+        dm->sc.notifyState(server, &dm->sc, state);
+}
+
 static UA_StatusCode
 UA_DiscoveryManager_free(UA_Server *server,
                          struct UA_ServerComponent *sc) {
@@ -130,6 +141,8 @@ UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
             dm->registeredServersSize--;
         }
     }
+
+    /* Send out multicast */
 }
 
 static UA_StatusCode
@@ -152,7 +165,7 @@ UA_DiscoveryManager_start(UA_Server *server,
         startMulticastDiscoveryServer(server);
 #endif
 
-    sc->state = UA_LIFECYCLESTATE_STARTED;
+    UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STARTED);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -170,7 +183,10 @@ UA_DiscoveryManager_stop(UA_Server *server,
         stopMulticastDiscoveryServer(server);
 #endif
 
-    sc->state = UA_LIFECYCLESTATE_STOPPED;
+    if(dm->mdnsRecvConnectionsSize == 0 && dm->mdnsSendConnection == 0)
+        UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPED);
+    else
+        UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPING);
 }
 
 UA_ServerComponent *
diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index b1d00c33c94..5c4bf2fce81 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -110,6 +110,11 @@ struct UA_DiscoveryManager {
 # endif /* UA_ENABLE_DISCOVERY_MULTICAST */
 };
 
+void
+UA_DiscoveryManager_setState(UA_Server *server,
+                             UA_DiscoveryManager *dm,
+                             UA_LifecycleState state);
+
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
 
 /* Sends out a new mDNS package for the given server data. This Method is

From 94a405503c1c57f2203028de0a3729b14604d5f4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 21 Jun 2023 17:42:28 +0200
Subject: [PATCH 1006/1963] refactor(server): Move mdns multicast to the
 EventLoop model

---
 src/server/ua_discovery_manager.c            |   7 +
 src/server/ua_discovery_manager.h            |   7 +-
 src/server/ua_services_discovery_multicast.c | 343 ++++++++++++-------
 3 files changed, 236 insertions(+), 121 deletions(-)

diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index 844302dc39e..e9c7e9bfff3 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -142,7 +142,10 @@ UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
         }
     }
 
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
     /* Send out multicast */
+    sendMulticastMessages(dm);
+#endif
 }
 
 static UA_StatusCode
@@ -183,10 +186,14 @@ UA_DiscoveryManager_stop(UA_Server *server,
         stopMulticastDiscoveryServer(server);
 #endif
 
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
     if(dm->mdnsRecvConnectionsSize == 0 && dm->mdnsSendConnection == 0)
         UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPED);
     else
         UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPING);
+#else
+    UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPED);
+#endif
 }
 
 UA_ServerComponent *
diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index 5c4bf2fce81..e4bc0c35174 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -43,6 +43,7 @@ typedef struct periodicServerRegisterCallback_entry {
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
 
 #include "mdnsd/libmdnsd/mdnsd.h"
+#define UA_MAXMDNSRECVSOCKETS 8
 
 /**
  * TXT record:
@@ -88,7 +89,10 @@ struct UA_DiscoveryManager {
 
 # ifdef UA_ENABLE_DISCOVERY_MULTICAST
     mdns_daemon_t *mdnsDaemon;
-    UA_SOCKET mdnsSocket;
+    UA_ConnectionManager *cm;
+    uintptr_t mdnsSendConnection;
+    uintptr_t mdnsRecvConnections[UA_MAXMDNSRECVSOCKETS];
+    size_t mdnsRecvConnectionsSize;
     UA_Boolean mdnsMainSrvAdded;
 
     /* Full Domain Name of server itself. Used to detect if received mDNS
@@ -147,6 +151,7 @@ mdns_find_record(mdns_daemon_t *mdnsDaemon, unsigned short type,
 
 void startMulticastDiscoveryServer(UA_Server *server);
 void stopMulticastDiscoveryServer(UA_Server *server);
+void sendMulticastMessages(UA_DiscoveryManager *dm);
 
 UA_StatusCode
 UA_DiscoveryManager_addEntryToServersOnNetwork(UA_DiscoveryManager *dm,
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index 994fb6839ae..e4805ba32bd 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -7,7 +7,6 @@
  *    Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
  */
 
-#include "ua_server_internal.h"
 #include "ua_discovery_manager.h"
 #include "ua_services.h"
 
@@ -47,31 +46,152 @@ static int
 discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg);
 
 static void
-multicastPolling(UA_Server *server, void *_) {
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
-        getServerComponentByName(server, UA_STRING("discovery"));
-    if(!dm)
+mdnsAddConnection(UA_DiscoveryManager *dm, uintptr_t connectionId,
+                  UA_Boolean recv) {
+    if(!recv) {
+        dm->mdnsSendConnection = connectionId;
+        return;
+    }
+    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
+        if(dm->mdnsRecvConnections[i] == connectionId)
+            return;
+    }
+
+    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
+        if(dm->mdnsRecvConnections[i] != 0)
+            continue;
+        dm->mdnsRecvConnections[i] = connectionId;
+        dm->mdnsRecvConnectionsSize++;
+        break;
+    }
+}
+
+static void
+mdnsRemoveConnection(UA_DiscoveryManager *dm, uintptr_t connectionId,
+                     UA_Boolean recv) {
+    if(dm->mdnsSendConnection == connectionId) {
+        dm->mdnsSendConnection = 0;
+        return;
+    }
+    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
+        if(dm->mdnsRecvConnections[i] != connectionId)
+            continue;
+        dm->mdnsRecvConnections[i] = 0;
+        dm->mdnsRecvConnectionsSize--;
+        break;
+    }
+}
+
+static void
+MulticastDiscoveryCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                           void *application, void **connectionContext,
+                           UA_ConnectionState state, const UA_KeyValueMap *params,
+                           UA_ByteString msg, UA_Boolean recv) {
+    UA_Server *server = (UA_Server*)application;
+    UA_DiscoveryManager *dm = *(UA_DiscoveryManager**)connectionContext;
+
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
+        mdnsRemoveConnection(dm, connectionId, recv);
+
+        if(dm->sc.state == UA_LIFECYCLESTATE_STOPPING) {
+            /* If we are stopping, was the last open socket closed? */
+            if(dm->mdnsSendConnection == 0 && dm->mdnsRecvConnectionsSize == 0)
+                UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPED);
+        } else {
+            /* Restart mdns sockets */
+            startMulticastDiscoveryServer(server);
+        }
+        return;
+    }
+
+    mdnsAddConnection(dm, connectionId, recv);
+
+    if(msg.length == 0)
+        return;
+
+    /* Prepare the sockaddrinfo */
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "remote-port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    const UA_String *address = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "remote-address"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!port || !address)
+        return;
+
+    char portStr[16];
+    UA_UInt16 myPort = *port;
+    for(size_t i = 0; i < 16; i++) {
+        if(myPort == 0) {
+            portStr[i] = 0;
+            break;
+        }
+        unsigned char rem = (unsigned char)(myPort % 10);
+        portStr[i] = (char)(rem + 48); /* to ascii */
+        myPort = myPort / 10;
+    }
+
+    struct addrinfo *infoptr;
+    int res = getaddrinfo((const char*)address->data, portStr, NULL, &infoptr);
+    if(res != 0)
         return;
 
-    struct timeval next_sleep = {.tv_sec = 0, .tv_usec = 0};
-    fd_set fds;
-    FD_ZERO(&fds);
-    UA_fd_set(dm->mdnsSocket, &fds);
-    select(dm->mdnsSocket + 1, &fds, 0, 0, &next_sleep);
-
-    unsigned short retVal =
-        mdnsd_step(dm->mdnsDaemon, dm->mdnsSocket,
-                   FD_ISSET(dm->mdnsSocket, &fds),
-                   true, &next_sleep);
-    if(retVal == 1) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                        "Multicast error: Can not read from socket. %s", errno_str));
-    } else if(retVal == 2) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                        "Multicast error: Can not write to socket. %s", errno_str));
+    /* Parse and process the message */
+    struct message mm;
+    memset(&mm, 0, sizeof(struct message));
+    UA_Boolean rr = message_parse(&mm, (unsigned char*)msg.data, msg.length);
+    if(rr)
+        mdnsd_in(dm->mdnsDaemon, &mm, infoptr->ai_addr,
+                 (unsigned short)infoptr->ai_addrlen);
+    freeaddrinfo(infoptr);
+}
+
+void
+sendMulticastMessages(UA_DiscoveryManager *dm) {
+    if(!dm->cm || dm->mdnsSendConnection == 0)
+        return;
+    UA_ConnectionManager *cm = dm->cm;
+
+    struct sockaddr ip;
+    memset(&ip, 0, sizeof(struct sockaddr));
+    ip.sa_family = AF_INET; /* Ipv4 */
+
+    struct message mm;
+    memset(&mm, 0, sizeof(struct message));
+
+    unsigned short sport = 0;
+    while(mdnsd_out(dm->mdnsDaemon, &mm, &ip, &sport) > 0) {
+        int len = message_packet_len(&mm);
+        char* buf = (char*)message_packet(&mm);
+        if(len > 0) {
+            UA_ByteString sendBuf = UA_BYTESTRING_NULL;
+            UA_StatusCode rv = cm->allocNetworkBuffer(cm, dm->mdnsSendConnection,
+                                                      &sendBuf, (size_t)len);
+            if(rv == UA_STATUSCODE_GOOD) {
+                memcpy(sendBuf.data, buf, sendBuf.length);
+                cm->sendWithConnection(cm, dm->mdnsSendConnection,
+                                       &UA_KEYVALUEMAP_NULL, &sendBuf);
+            }
         }
+    }
+}
+
+static void
+MulticastDiscoveryRecvCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                               void *application, void **connectionContext,
+                               UA_ConnectionState state, const UA_KeyValueMap *params,
+                               UA_ByteString msg) {
+    MulticastDiscoveryCallback(cm, connectionId, application, connectionContext,
+                               state, params, msg, true);
+}
+
+static void
+MulticastDiscoverySendCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                               void *application, void **connectionContext,
+                               UA_ConnectionState state, const UA_KeyValueMap *params,
+                               UA_ByteString msg) {
+    MulticastDiscoveryCallback(cm, connectionId, application, connectionContext,
+                               state, params, msg, false);
 }
 
 static UA_StatusCode
@@ -107,82 +227,78 @@ addMdnsRecordForNetworkLayer(UA_DiscoveryManager *dm, const UA_String *appName,
 #endif
 
 /* Create multicast 224.0.0.251:5353 socket */
-static UA_SOCKET
-discovery_createMulticastSocket(UA_Server* server) {
-    int flag = 1, ittl = 255;
-    struct sockaddr_in in;
-    struct ip_mreq mc;
-    char ttl = (char)255; // publish to complete net, not only subnet. See:
-                          // https://docs.oracle.com/cd/E23824_01/html/821-1602/sockets-137.html
-
-    memset(&in, 0, sizeof(in));
-    in.sin_family = AF_INET;
-    in.sin_port = htons(5353);
-    in.sin_addr.s_addr = 0;
-
-    UA_SOCKET s = UA_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if(s == UA_INVALID_SOCKET)
-        return UA_INVALID_SOCKET;
-
-#ifdef SO_REUSEPORT
-    UA_setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (char *)&flag, sizeof(flag));
-#endif
-    UA_setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&flag, sizeof(flag));
-    if(UA_bind(s, (struct sockaddr *)&in, sizeof(in))) {
-        UA_close(s);
-        return UA_INVALID_SOCKET;
-    }
-
-    /* Custom outbound multicast interface */
-    size_t length = server->config.mdnsInterfaceIP.length;
-    if(length > 0){
-        char* interfaceName = (char*)UA_malloc(length+1);
-        if(!interfaceName) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                         "Multicast DNS: cannot alloc memory for iface name");
-            return 0;
+static void
+discovery_createMulticastSocket(UA_Server* server, UA_DiscoveryManager *dm) {
+    /* Find the connection manager */
+    if(!dm->cm) {
+        UA_String udpString = UA_STRING("udp");
+        for(UA_EventSource *es = server->config.eventLoop->eventSources;
+            es != NULL; es = es->next) {
+            /* Is this a usable connection manager? */
+            if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+                continue;
+            UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+            if(UA_String_equal(&udpString, &cm->protocol)) {
+                dm->cm = cm;
+                break;
+            }
         }
-        struct in_addr ina;
-        memset(&ina, 0, sizeof(ina));
-        memcpy(interfaceName, server->config.mdnsInterfaceIP.data, length);
-        interfaceName[length] = '\0';
-        inet_pton(AF_INET, interfaceName, &ina);
-        UA_free(interfaceName);
-        /* Set interface for outbound multicast */
-        if(setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&ina, sizeof(ina)) < 0)
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                         "Multicast DNS: failed setting IP_MULTICAST_IF to %s: %s",
-                         inet_ntoa(ina), strerror(errno));
-    }
-
-    /* Check outbound multicast interface parameters */
-    struct in_addr interface_addr;
-    socklen_t addr_size = sizeof(struct in_addr);
-    if(getsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, (char*)&interface_addr, &addr_size) <  0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                     "Multicast DNS: getsockopt(IP_MULTICAST_IF) failed");
     }
 
-    if(IN_ZERONET(ntohl(interface_addr.s_addr))) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                       "Multicast DNS: outbound interface 0.0.0.0, it means that "
-                       "the first OS interface is used (you can explicitly set the "
-                       "interface by using 'discovery.mdnsInterfaceIP' config parameter)");
-    } else {
-        char buf[16];
-        inet_ntop(AF_INET, &interface_addr, buf, 16);
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                    "Multicast DNS: outbound interface is %s", buf);
+    if(!dm->cm) {
+        UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                     "No UDP communication supported");
+        return;
     }
 
-    mc.imr_multiaddr.s_addr = inet_addr("224.0.0.251");
-    mc.imr_interface.s_addr = htonl(INADDR_ANY);
-    UA_setsockopt(s, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&mc, sizeof(mc));
-    UA_setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(ttl));
-    UA_setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ittl, sizeof(ittl));
-
-    UA_socket_set_nonblocking(s); //TODO: check return value
-    return s;
+    /* Set up the parameters */
+    UA_KeyValuePair params[6];
+    size_t paramsSize = 5;
+
+    UA_UInt16 port = 5353;
+    UA_String address = UA_STRING("224.0.0.251");
+    UA_UInt32 ttl = 255;
+    UA_Boolean reuse = true;
+    UA_Boolean listen = true;
+
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&params[1].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    params[2].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    params[3].key = UA_QUALIFIEDNAME(0, "reuse");
+    UA_Variant_setScalar(&params[3].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    params[4].key = UA_QUALIFIEDNAME(0, "ttl");
+    UA_Variant_setScalar(&params[4].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
+    if(server->config.mdnsInterfaceIP.length > 0) {
+        params[5].key = UA_QUALIFIEDNAME(0, "interface");
+        UA_Variant_setScalar(&params[5].value, &server->config.mdnsInterfaceIP,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        paramsSize++;
+    }
+
+    /* Open the listen connection */
+    UA_KeyValueMap kvm = {paramsSize, params};
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+
+    if(dm->mdnsRecvConnectionsSize == 0) {
+        res = dm->cm->openConnection(dm->cm, &kvm, server, dm,
+                                     MulticastDiscoveryRecvCallback);
+        if(res != UA_STATUSCODE_GOOD)
+            UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                         "Could not create the mdns UDP multicast listen connection");
+    }
+
+    /* Open the send connection */
+    listen = false;
+    if(dm->mdnsSendConnection == 0) {
+        res = dm->cm->openConnection(dm->cm, &kvm, server, dm,
+                                     MulticastDiscoverySendCallback);
+        if(res != UA_STATUSCODE_GOOD)
+            UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                         "Could not create the mdns UDP multicast send connection");
+    }
 }
 
 void
@@ -195,43 +311,27 @@ startMulticastDiscoveryServer(UA_Server *server) {
 
     if(!dm->mdnsDaemon) {
         dm->mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
-        mdnsd_register_receive_callback(dm->mdnsDaemon,
-                                        mdns_record_received, dm);
+        mdnsd_register_receive_callback(dm->mdnsDaemon, mdns_record_received, dm);
     }
 
     /* Open the mdns listen socket */
-    UA_initialize_architecture_network();
-    if(dm->mdnsSocket == UA_INVALID_SOCKET)
-        dm->mdnsSocket = discovery_createMulticastSocket(server);
-    if(dm->mdnsSocket == UA_INVALID_SOCKET) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                             "Could not create multicast socket. Error: %d - %s",
-                             errno, errno_str));
+    if(dm->mdnsSendConnection == 0)
+        discovery_createMulticastSocket(server, dm);
+    if(dm->mdnsSendConnection == 0) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                     "Could not create multicast socket");
         return;
     }
 
     /* Add record for the server itself */
     UA_String *appName = &server->config.mdnsConfig.mdnsServerName;
     for(size_t i = 0; i < server->config.serverUrlsSize; i++)
-        addMdnsRecordForNetworkLayer(dm, appName,
-                                     &server->config.serverUrls[i]);
+        addMdnsRecordForNetworkLayer(dm, appName, &server->config.serverUrls[i]);
 
     /* Send a multicast probe to find any other OPC UA server on the network
      * through mDNS */
     mdnsd_query(dm->mdnsDaemon, "_opcua-tcp._tcp.local.",
                 QTYPE_PTR,discovery_multicastQueryAnswer, server);
-
-    /* Start the cyclic polling callback */
-    if(dm->mdnsCallbackId == 0) {
-        UA_EventLoop *el = server->config.eventLoop;
-        if(el) {
-            el->addCyclicCallback(el, (UA_Callback)multicastPolling,
-                                  server, NULL, 200, NULL,
-                                  UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-                                  &dm->mdnsCallbackId);
-        }
-    }
 }
 
 void
@@ -274,9 +374,12 @@ stopMulticastDiscoveryServer(UA_Server *server) {
     }
 
     /* Close the socket */
-    if(dm->mdnsSocket != UA_INVALID_SOCKET) {
-        UA_close(dm->mdnsSocket);
-        dm->mdnsSocket = UA_INVALID_SOCKET;
+    if(dm->cm) {
+        if(dm->mdnsSendConnection)
+            dm->cm->closeConnection(dm->cm, dm->mdnsSendConnection);
+        for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++)
+            if(dm->mdnsRecvConnections[i] != 0)
+                dm->cm->closeConnection(dm->cm, dm->mdnsRecvConnections[i]);
     }
 }
 

From 6b90a71bad466a9ce85e11a044e5932ce427f62c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 17 Jun 2023 23:38:44 +0200
Subject: [PATCH 1007/1963] refactor(core): Remove unused
 architecture_functions.h

---
 CMakeLists.txt                                |   4 +-
 arch/Readme.md                                |  40 +----
 arch/common/ua_freeRTOS.h                     |  48 -----
 arch/common/ua_lwip.h                         |  97 ----------
 arch/eCos/CMakeLists.txt                      |   1 -
 arch/eCos/ua_architecture.h                   |   2 -
 arch/eCos/ua_architecture_functions.c         |  40 -----
 arch/freertosLWIP/CMakeLists.txt              |   8 -
 arch/freertosLWIP/ua_architecture.h           |  16 --
 arch/freertosLWIP/ua_architecture_functions.c |  93 ----------
 arch/posix/CMakeLists.txt                     |   2 -
 arch/posix/ua_architecture.h                  |   2 -
 arch/posix/ua_architecture_functions.c        |  39 ----
 arch/vxworks/CMakeLists.txt                   |   1 -
 arch/vxworks/ua_architecture.h                |   2 -
 arch/vxworks/ua_architecture_functions.c      |  42 -----
 arch/wec7/CMakeLists.txt                      |   1 -
 arch/wec7/ua_architecture.h                   |   2 -
 arch/wec7/ua_architecture_functions.c         |  53 ------
 arch/win32/CMakeLists.txt                     |   1 -
 arch/win32/ua_architecture.h                  |   2 -
 arch/win32/ua_architecture_functions.c        |  42 -----
 include/open62541/architecture_definitions.h  |   6 +
 include/open62541/architecture_functions.h    | 170 ------------------
 src/server/ua_services_discovery_multicast.c  |   5 +
 src/ua_util.c                                 |  12 ++
 tests/CMakeLists.txt                          |   2 +-
 tests/fuzz/CMakeLists.txt                     |   4 +-
 28 files changed, 28 insertions(+), 709 deletions(-)
 delete mode 100644 arch/common/ua_freeRTOS.h
 delete mode 100644 arch/common/ua_lwip.h
 delete mode 100644 arch/eCos/ua_architecture_functions.c
 delete mode 100644 arch/freertosLWIP/ua_architecture_functions.c
 delete mode 100644 arch/posix/ua_architecture_functions.c
 delete mode 100644 arch/vxworks/ua_architecture_functions.c
 delete mode 100644 arch/wec7/ua_architecture_functions.c
 delete mode 100644 arch/win32/ua_architecture_functions.c
 delete mode 100644 include/open62541/architecture_functions.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c032f376074..9be464bc965 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,9 +135,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     list(APPEND ua_architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
 endif()
 
-set(ua_architecture_headers ${ua_architecture_headers}
-    ${PROJECT_SOURCE_DIR}/include/open62541/architecture_functions.h
-)
+set(ua_architecture_headers ${ua_architecture_headers})
 
 if(${UA_ARCHITECTURE} STREQUAL "None")
   message(FATAL_ERROR "No architecture was selected. Please select the architecture of your target platform")
diff --git a/arch/Readme.md b/arch/Readme.md
index a055890fc99..77fa1f0ee49 100644
--- a/arch/Readme.md
+++ b/arch/Readme.md
@@ -75,44 +75,8 @@ To port to a new architecture you should follow these steps:
     #define PLUGINS_ARCH_NEW_ARCH_UA_ARCHITECTURE_H_
     
     /*
-    * Define and include all that's needed for your architecture
-    */
-    
-    /*
-    * Define OPTVAL_TYPE for non windows systems. In doubt, use int //TODO: Is this really necessary
-    */
-    
-    /*
-    * Define the following network options
-    */
-    
-    
-    //#define UA_IPV6 1 //or 0
-    //#define UA_SOCKET
-    //#define UA_INVALID_SOCKET
-    //#define UA_ERRNO
-    //#define UA_INTERRUPTED
-    //#define UA_AGAIN
-    //#define UA_WOULDBLOCK
-    //#define UA_INTERRUPTED
-    
-    /*
-    * Define the ua_getnameinfo if your architecture supports it
-    */
-    
-    /*
-    * Use #define for the functions defined in ua_architecture_functions.h
-    * or implement them in a ua_architecture_functions.c file and 
-    * put it in your new_arch folder and add it in the CMakeLists.txt file 
-    * using ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_architecture_functions.c)
-    */ 
-    
-    /*
-    * Define UA_LOG_SOCKET_ERRNO_WRAP(LOG) which prints the string error given a char* errno_str variable
-    * Do the same for UA_LOG_SOCKET_ERRNO_GAI_WRAP(LOG) for errors related to getaddrinfo
-    */
-    
-    #include <open62541/architecture_functions.h>
+     * Define and include all that's needed for your architecture
+     */
     
     #endif /* PLUGINS_ARCH_NEW_ARCH_UA_ARCHITECTURE_H_ */
     
diff --git a/arch/common/ua_freeRTOS.h b/arch/common/ua_freeRTOS.h
deleted file mode 100644
index 1cf4fd8545a..00000000000
--- a/arch/common/ua_freeRTOS.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-#ifndef ARCH_COMMON_FREERTOS62541_H_
-#define ARCH_COMMON_FREERTOS62541_H_
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef BYTE_ORDER
-# undef BYTE_ORDER
-#endif
-
-#define UA_sleep_ms(X) vTaskDelay(pdMS_TO_TICKS(X))
-
-#ifdef OPEN62541_FEERTOS_USE_OWN_MEM
-# define UA_free vPortFree
-# define UA_malloc pvPortMalloc
-# define UA_calloc pvPortCalloc
-# define UA_realloc pvPortRealloc
-#else
-# define UA_free free
-# define UA_malloc malloc
-# define UA_calloc calloc
-# define UA_realloc realloc
-#endif
-
-#ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
-# ifndef UA_fileExists
-#  define UA_fileExists(X) (0) //file managing is not part of freeRTOS. If the system provides it, please define it before
-# endif // UA_fileExists
-#endif
-
-// No log colors on freeRTOS
-// #define UA_ENABLE_LOG_COLORS
-
-#include <stdio.h>
-#define UA_snprintf snprintf
-
-#define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
-    char *errno_str = ""; \
-    LOG; \
-}
-
-#endif /* ARCH_COMMON_FREERTOS62541_H_ */
diff --git a/arch/common/ua_lwip.h b/arch/common/ua_lwip.h
deleted file mode 100644
index 884b10d458c..00000000000
--- a/arch/common/ua_lwip.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-#ifndef ARCH_COMMON_LWIP62541_H_
-#define ARCH_COMMON_LWIP62541_H_
-
-/*
- * Needed flags to be set before including this file. Normally done in lwipopts.h
- * #define LWIP_COMPAT_SOCKETS 0 // Don't do name define-transformation in networking function names.
- * #define LWIP_SOCKET 1 // Enable Socket API (normally already set)
- * #define LWIP_DNS 1 // enable the lwip_getaddrinfo function, struct addrinfo and more.
- * #define SO_REUSE 1 // Allows to set the socket as reusable
- * #define LWIP_TIMEVAL_PRIVATE 0 // This is optional. Set this flag if you get a compilation error about redefinition of struct timeval
- *
- * Why not define these here? This stack is used as middleware so other code might use this header file with other flags (specially LWIP_COMPAT_SOCKETS)
- */
-#include <lwip/tcpip.h>
-#include <lwip/netdb.h>
-#include <lwip/init.h>
-#include <lwip/sockets.h>
-
-#define OPTVAL_TYPE int
-
-#define UA_fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
-#define UA_fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
-
-#define UA_IPV6 LWIP_IPV6
-#define UA_SOCKET int
-#define UA_INVALID_SOCKET -1
-#define UA_ERRNO errno
-#define UA_INTERRUPTED EINTR
-#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
-#define UA_WOULDBLOCK EWOULDBLOCK
-
-#define UA_POLLIN POLLIN
-#define UA_POLLOUT POLLOUT
-
-#define UA_poll lwip_poll
-#define UA_send lwip_send
-#define UA_recv lwip_recv
-#define UA_sendto lwip_sendto
-#define UA_recvfrom lwip_recvfrom
-#define UA_htonl lwip_htonl
-#define UA_ntohl lwip_ntohl
-#define UA_close lwip_close
-#define UA_select lwip_select
-#define UA_shutdown lwip_shutdown
-#define UA_socket lwip_socket
-#define UA_bind lwip_bind
-#define UA_listen lwip_listen
-#define UA_accept lwip_accept
-#define UA_connect lwip_connect
-#define UA_getsockopt lwip_getsockopt
-#define UA_setsockopt lwip_setsockopt
-#define UA_freeaddrinfo lwip_freeaddrinfo
-#ifndef UA_gethostname
-#define UA_gethostname gethostname_lwip
-#else
-extern int UA_gethostname(char* name, size_t len);
-#endif
-#ifndef UA_getsockname
-#define UA_getsockname lwip_getsockname
-#else
-extern int UA_getsockname((int s, struct sockaddr *name, socklen_t *namelen);
-#endif
-#ifndef UA_getaddrinfo
-#define UA_getaddrinfo lwip_getaddrinfo
-#else
-extern int UA_getaddrinfo(const char *nodename, const char *servname,
-                 const struct addrinfo *hints, struct addrinfo **res);
-#endif
-
-#if UA_IPV6
-# define UA_inet_pton(af, src, dst) \
-    (((af) == AF_INET6) ? ip6addr_aton((src),(ip6_addr_t*)(dst)) \
-     : (((af) == AF_INET) ? ip4addr_aton((src),(ip4_addr_t*)(dst)) : 0))
-#else
-# define UA_inet_pton(af, src, dst) \
-     (((af) == AF_INET) ? ip4addr_aton((src),(ip4_addr_t*)(dst)) : 0)
-#endif
-
-#if UA_IPV6
-# define UA_if_nametoindex lwip_if_nametoindex
-
-# if LWIP_VERSION_IS_RELEASE //lwip_if_nametoindex is not yet released
-unsigned int lwip_if_nametoindex(const char *ifname);
-# endif
-#endif
-
-int gethostname_lwip(char* name, size_t len);
-
-#define UA_LOG_SOCKET_ERRNO_GAI_WRAP UA_LOG_SOCKET_ERRNO_WRAP
-
-#endif /* ARCH_COMMON_LWIP62541_H_ */
diff --git a/arch/eCos/CMakeLists.txt b/arch/eCos/CMakeLists.txt
index 42c8480fdf5..a774834fc43 100644
--- a/arch/eCos/CMakeLists.txt
+++ b/arch/eCos/CMakeLists.txt
@@ -7,7 +7,6 @@ list (FIND UA_AMALGAMATION_ARCHITECTURES "eCos" _index)
 if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "eCos")
 
     ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_architecture_functions.c)
 
     if("${UA_ARCHITECTURE}" STREQUAL "eCos")
 
diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
index 8c1fbd35121..eb3670a2a3a 100644
--- a/arch/eCos/ua_architecture.h
+++ b/arch/eCos/ua_architecture.h
@@ -96,8 +96,6 @@ int gethostname_ecos(char* name, size_t len);
 #define UA_LOCK_ASSERT(lock, num)
 #endif
 
-#include <open62541/architecture_functions.h>
-
 #endif /* PLUGINS_ARCH_ECOS_UA_ARCHITECTURE_H_ */
 
 #endif /* UA_ARCHITECTURE_ECOS */
diff --git a/arch/eCos/ua_architecture_functions.c b/arch/eCos/ua_architecture_functions.c
deleted file mode 100644
index 6f9961b352d..00000000000
--- a/arch/eCos/ua_architecture_functions.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-#ifdef UA_ARCHITECTURE_ECOS
-
-#include <open62541/types.h>
-
-unsigned int UA_socket_set_blocking(UA_SOCKET sockfd){
-  int on = 0;
-  if(ioctl(sockfd, FIONBIO, &on) < 0)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-unsigned int UA_socket_set_nonblocking(UA_SOCKET sockfd){
-  int on = 1;
-  if(ioctl(sockfd, FIONBIO, &on) < 0)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-void UA_initialize_architecture_network(void){
-  return;
-}
-
-void UA_deinitialize_architecture_network(void){
-  return;
-}
-
-int gethostname_ecos(char* name, size_t len){
-  if(strlen(UA_ECOS_HOSTNAME) > (len))
-    return -1;
-  strcpy(name, UA_ECOS_HOSTNAME);
-  return 0;
-}
-
-#endif /* UA_ARCHITECTURE_ECOS */
diff --git a/arch/freertosLWIP/CMakeLists.txt b/arch/freertosLWIP/CMakeLists.txt
index dc7416f2402..c4530dfd40c 100644
--- a/arch/freertosLWIP/CMakeLists.txt
+++ b/arch/freertosLWIP/CMakeLists.txt
@@ -6,17 +6,9 @@ list (FIND UA_AMALGAMATION_ARCHITECTURES "freertosLWIP" _index)
 if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "freertosLWIP")
 
     ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_architecture_functions.c)
 
     if("${UA_ARCHITECTURE}" STREQUAL "freertosLWIP")
         ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
         ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../common)
-        set(UA_ARCH_FREERTOS_USE_OWN_MEMORY_FUNCTIONS OFF CACHE BOOL "Enable free/malloc/etc from own implementation")
-        if(UA_ARCH_FREERTOS_USE_OWN_MEMORY_FUNCTIONS)
-          ua_architecture_add_definitions("-DOPEN62541_FEERTOS_USE_OWN_MEM")
-        endif(UA_ARCH_FREERTOS_USE_OWN_MEMORY_FUNCTIONS)
-        ua_add_architecture_header_beginning(${CMAKE_CURRENT_SOURCE_DIR}/../common/ua_freeRTOS.h
-                                             ${CMAKE_CURRENT_SOURCE_DIR}/../common/ua_lwip.h
-                                             )
     endif()
 endif()
diff --git a/arch/freertosLWIP/ua_architecture.h b/arch/freertosLWIP/ua_architecture.h
index dc01efd800a..0f52a9e72a9 100644
--- a/arch/freertosLWIP/ua_architecture.h
+++ b/arch/freertosLWIP/ua_architecture.h
@@ -11,9 +11,6 @@
 #ifndef PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_
 #define PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_
 
-#include "ua_lwip.h"
-#include "ua_freeRTOS.h"
-
 #if UA_MULTITHREADING >= 100
 #error Multithreading unsupported
 #else
@@ -26,19 +23,6 @@
 
 #define UA_strncasecmp strncasecmp
 
-// freeRTOS does not have getifaddr
-#undef UA_HAS_GETIFADDR
-
-#ifndef IN6_IS_ADDR_UNSPECIFIED
-# define IN6_IS_ADDR_UNSPECIFIED(a) \
-        (((const uint32_t *) (a))[0] == 0                                      \
-         && ((const uint32_t *) (a))[1] == 0                                      \
-         && ((const uint32_t *) (a))[2] == 0                                      \
-         && ((const uint32_t *) (a))[3] == 0)
-#endif
-
-#include <open62541/architecture_functions.h>
-
 #endif /* PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_ */
 
 #endif /* UA_ARCHITECTURE_FREERTOSLWIP */
diff --git a/arch/freertosLWIP/ua_architecture_functions.c b/arch/freertosLWIP/ua_architecture_functions.c
deleted file mode 100644
index 2b2f49bf0a9..00000000000
--- a/arch/freertosLWIP/ua_architecture_functions.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- *    Copyright 2018 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2021 (c) Simon Kueppers, 2pi-Labs GmbH
- */
-
-#ifdef UA_ARCHITECTURE_FREERTOSLWIP
-
-#include <open62541/types.h>
-
-unsigned int UA_socket_set_blocking(UA_SOCKET sockfd){
-  int on = 0;
-  if(lwip_ioctl(sockfd, FIONBIO, &on) < 0)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-unsigned int UA_socket_set_nonblocking(UA_SOCKET sockfd){
-  int on = 1;
-  if(lwip_ioctl(sockfd, FIONBIO, &on) < 0)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-int gethostname_lwip(char* name, size_t len){
-  /* gethostname() returns the null-terminated hostname in the
-   * character array name, which has a length of len bytes.  If the
-   * null-terminated hostname is too large to fit, then the name is
-   * truncated, and no error is returned (but see NOTES below).
-   */
-#if LWIP_NETIF_HOSTNAME
-  if ( (netif_default != NULL) && (netif_get_hostname(netif_default) != NULL) ) {
-    /* LWIP has one hostname per netif. However majority of embedded systems using LWIP
-     * use a single netif anyway (LWIP_SINGLE_NETIF).
-     * Use the default netif for retrieving hostname. */
-    const char * hostname = netif_get_hostname(netif_default);
-    int result = 0;
-
-#if LWIP_TCPIP_CORE_LOCKING
-    /* Lock TCP/IP thread */
-    LOCK_TCPIP_CORE();
-#endif
-    /* The GNU C library does not employ the gethostname() system call;
-     * instead, it implements gethostname() as a library function that
-     * calls uname(2) and copies up to len bytes from the returned
-     * nodename field into name.  Having performed the copy, the
-     * function then checks if the length of the nodename was greater
-     * than or equal to len, and if it is, then the function returns -1
-     * with errno set to ENAMETOOLONG; in this case, a terminating null
-     * byte is not included in the returned name. */
-    strncpy(name, hostname, len);
-
-    if (strlen(hostname) >= len) {
-      /* Error ENAMETOOLONG, hostname is larger than given buffer */
-      result = -1;
-    }
-
-#if LWIP_TCPIP_CORE_LOCKING
-    /* Unlock TCP/IP thread */
-   UNLOCK_TCPIP_CORE();
-#endif
-
-    return result;
-  }
-#endif /* LWIP_NETIF_HOSTNAME */
-
-  /* No valid hostname, due to one of the following
-   *   1. LWIP_NETIF_HOSTNAME not defined
-   *   2. no default netif set
-   *   3. no hostname on default netif set.
-   * use UA_ServerConfig_set_customHostname to set your hostname as the IP manually */
-  return -1;
-}
-
-void UA_initialize_architecture_network(void){
-  return;
-}
-
-void UA_deinitialize_architecture_network(void){
-  return;
-}
-
-#if UA_IPV6
-# if LWIP_VERSION_IS_RELEASE //lwip_if_nametoindex is not yet released
-unsigned int lwip_if_nametoindex(const char *ifname){
-  return 1; //TODO: assume for now that it only has one interface
-}
-# endif //LWIP_VERSION_IS_RELEASE
-#endif //UA_IPV6
-
-#endif /* UA_ARCHITECTURE_FREERTOSLWIP */
diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt
index a53c9f2cce8..f17d3ded305 100644
--- a/arch/posix/CMakeLists.txt
+++ b/arch/posix/CMakeLists.txt
@@ -6,8 +6,6 @@ list (FIND UA_AMALGAMATION_ARCHITECTURES "posix" _index)
 if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "posix")
 
     ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_architecture_functions.c)
-
 
     if("${UA_ARCHITECTURE}" STREQUAL "posix")
         if(NOT CYGWIN AND NOT QNXNTO)
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index a1d955e2553..21ba03ef582 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -184,8 +184,6 @@ UA_LOCK_ASSERT(UA_Lock *lock, int num) {
 #define UA_LOCK_ASSERT(lock, num) UA_EMPTY_STATEMENT
 #endif
 
-#include <open62541/architecture_functions.h>
-
 #if defined(__APPLE__) && defined(_SYS_QUEUE_H_)
 //  in some compilers there's already a _SYS_QUEUE_H_ which is included first and doesn't
 //  have all functions
diff --git a/arch/posix/ua_architecture_functions.c b/arch/posix/ua_architecture_functions.c
deleted file mode 100644
index 8cee5fe63fd..00000000000
--- a/arch/posix/ua_architecture_functions.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-#ifdef UA_ARCHITECTURE_POSIX
-
-#include <open62541/types.h>
-
-/* Global malloc singletons */
-#ifdef UA_ENABLE_MALLOC_SINGLETON
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size) = malloc;
-UA_EXPORT UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr) = free;
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize) = calloc;
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size) = realloc;
-#endif
-
-unsigned int UA_socket_set_blocking(UA_SOCKET sockfd){
-  int opts = fcntl(sockfd, F_GETFL);
-  if(opts < 0 || fcntl(sockfd, F_SETFL, opts & (~O_NONBLOCK)) < 0)
-      return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-unsigned int UA_socket_set_nonblocking(UA_SOCKET sockfd){
-  int opts = fcntl(sockfd, F_GETFL);
-  if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-void UA_initialize_architecture_network(void){
-}
-
-void UA_deinitialize_architecture_network(void){
-}
-
-#endif /* UA_ARCHITECTURE_POSIX */
diff --git a/arch/vxworks/CMakeLists.txt b/arch/vxworks/CMakeLists.txt
index 810bb12f65d..ccc7c14c888 100644
--- a/arch/vxworks/CMakeLists.txt
+++ b/arch/vxworks/CMakeLists.txt
@@ -6,7 +6,6 @@ list (FIND UA_AMALGAMATION_ARCHITECTURES "vxworks" _index)
 if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "vxworks")
 
     ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_architecture_functions.c)
 
     if("${UA_ARCHITECTURE}" STREQUAL "vxworks")
 
diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
index 5ddac1eb474..6a50f51498e 100644
--- a/arch/vxworks/ua_architecture.h
+++ b/arch/vxworks/ua_architecture.h
@@ -125,8 +125,6 @@
 #define UA_LOCK_ASSERT(lock, num)
 #endif
 
-#include <open62541/architecture_functions.h>
-
 #endif /* PLUGINS_ARCH_VXWORKS_UA_ARCHITECTURE_H_ */
 
 #endif /* UA_ARCHITECTURE_VXWORKS */
diff --git a/arch/vxworks/ua_architecture_functions.c b/arch/vxworks/ua_architecture_functions.c
deleted file mode 100644
index e9faf8fbdd1..00000000000
--- a/arch/vxworks/ua_architecture_functions.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- *    Copyright (c) 2020 Wind River Systems, Inc.
- */
-
-#ifdef UA_ARCHITECTURE_VXWORKS
-
-#include <open62541/types.h>
-
-/* Global malloc singletons */
-#ifdef UA_ENABLE_MALLOC_SINGLETON
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size) = malloc;
-UA_EXPORT UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr) = free;
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize) = calloc;
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size) = realloc;
-#endif
-
-unsigned int UA_socket_set_blocking(UA_SOCKET sockfd){
-  int on = FALSE;
-  if(ioctl(sockfd, FIONBIO, &on) < 0)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-unsigned int UA_socket_set_nonblocking(UA_SOCKET sockfd){
-  int on = TRUE;
-  if(ioctl(sockfd, FIONBIO, &on) < 0)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-void UA_initialize_architecture_network(void){
-  return;
-}
-
-void UA_deinitialize_architecture_network(void){
-  return;
-}
-
-#endif /* UA_ARCHITECTURE_VXWORKS */
diff --git a/arch/wec7/CMakeLists.txt b/arch/wec7/CMakeLists.txt
index 96b76e72591..131967ce000 100644
--- a/arch/wec7/CMakeLists.txt
+++ b/arch/wec7/CMakeLists.txt
@@ -6,7 +6,6 @@ list (FIND UA_AMALGAMATION_ARCHITECTURES "wec7" _index)
 if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "wec7")
 
     ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_architecture_functions.c)
 
     if("${UA_ARCHITECTURE}" STREQUAL "wec7")
         ua_architecture_append_to_library(ws2)
diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
index 928c32f98e0..490e60a54af 100644
--- a/arch/wec7/ua_architecture.h
+++ b/arch/wec7/ua_architecture.h
@@ -149,8 +149,6 @@ typedef struct pollfd {
 #define UA_LOCK_ASSERT(lock, num)
 #endif
 
-#include <open62541/architecture_functions.h>
-
 /* Fix redefinition of SLIST_ENTRY on mingw winnt.h */
 #if !defined(_SYS_QUEUE_H_) && defined(SLIST_ENTRY)
 # undef SLIST_ENTRY
diff --git a/arch/wec7/ua_architecture_functions.c b/arch/wec7/ua_architecture_functions.c
deleted file mode 100644
index 039b68d3124..00000000000
--- a/arch/wec7/ua_architecture_functions.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Stephan Kantelberg
- */
-
-#ifdef UA_ARCHITECTURE_WEC7
-
-#include <open62541/types.h>
-
-#undef UA_fileExists
-UA_Boolean UA_fileExists(const char* path) {
-  FILE *fp = fopen(path,"rb");
-  UA_Boolean exists = (fp==NULL);
-  if(fp)
-      fclose(fp);
-  return exists;
-}
-
-unsigned int UA_socket_set_blocking(UA_SOCKET sockfd){
-  u_long iMode = 0;
-  if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-#ifdef UNDER_CE
-char *strerror(int errnum)
-{
-    if (errnum > MAX_STRERROR)
-        return errorStrings[MAX_STRERROR];
-    else
-        return errorStrings[errnum];
-}
-#endif
-
-unsigned int UA_socket_set_nonblocking(UA_SOCKET sockfd){
-  u_long iMode = 1;
-  if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-void UA_initialize_architecture_network(void){
-  WSADATA wsaData;
-  WSAStartup(MAKEWORD(2, 2), &wsaData);
-}
-
-void UA_deinitialize_architecture_network(void){
-  WSACleanup();
-}
-
-#endif /* UA_ARCHITECTURE_WEC7 */
diff --git a/arch/win32/CMakeLists.txt b/arch/win32/CMakeLists.txt
index ef536edca00..091c239894b 100644
--- a/arch/win32/CMakeLists.txt
+++ b/arch/win32/CMakeLists.txt
@@ -6,7 +6,6 @@ list (FIND UA_AMALGAMATION_ARCHITECTURES "win32" _index)
 if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "win32")
 
     ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_architecture_functions.c)
 
     if("${UA_ARCHITECTURE}" STREQUAL "win32")
         ua_architecture_append_to_library(ws2_32)
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 10d90b6e86a..d49b67c8dd8 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -200,8 +200,6 @@ UA_LOCK_ASSERT(UA_Lock *lock, int num) {
 #define UA_LOCK_ASSERT(lock, num)
 #endif
 
-#include <open62541/architecture_functions.h>
-
 /* Fix redefinition of SLIST_ENTRY on mingw winnt.h */
 #if !defined(_SYS_QUEUE_H_) && defined(SLIST_ENTRY)
 # undef SLIST_ENTRY
diff --git a/arch/win32/ua_architecture_functions.c b/arch/win32/ua_architecture_functions.c
deleted file mode 100644
index 69673dab4a3..00000000000
--- a/arch/win32/ua_architecture_functions.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-#ifdef UA_ARCHITECTURE_WIN32
-
-#include <open62541/types.h>
-
-/* Global malloc singletons */
-#ifdef UA_ENABLE_MALLOC_SINGLETON
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size) = malloc;
-UA_EXPORT UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr) = free;
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize) = calloc;
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size) = realloc;
-#endif
-
-unsigned int UA_socket_set_blocking(UA_SOCKET sockfd){
-  u_long iMode = 0;
-  if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-unsigned int UA_socket_set_nonblocking(UA_SOCKET sockfd){
-  u_long iMode = 1;
-  if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
-    return UA_STATUSCODE_BADINTERNALERROR;
-  return UA_STATUSCODE_GOOD;
-}
-
-void UA_initialize_architecture_network(void){
-  WSADATA wsaData;
-  WSAStartup(MAKEWORD(2, 2), &wsaData);
-}
-
-void UA_deinitialize_architecture_network(void){
-  WSACleanup();
-}
-
-#endif /* UA_ARCHITECTURE_WIN32 */
diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
index 3ab1d934fb0..01f99514203 100644
--- a/include/open62541/architecture_definitions.h
+++ b/include/open62541/architecture_definitions.h
@@ -417,4 +417,10 @@ UA_STATIC_ASSERT(sizeof(bool) == 1, cannot_overlay_integers_with_large_bool);
 # define UA_BINARY_OVERLAYABLE_FLOAT 0
 #endif
 
+/**
+ * File access
+ * ----------- */
+
+#define UA_fileExists(X) ( UA_access(X, 0) == 0)
+
 #endif /* ARCH_UA_ARCHITECTURE_DEFINITIONS_H_ */
diff --git a/include/open62541/architecture_functions.h b/include/open62541/architecture_functions.h
deleted file mode 100644
index 68f0fcf489b..00000000000
--- a/include/open62541/architecture_functions.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-/*
- * This header has all the functions that are architecture dependent. The
- * declaration is behind an ifndef since they can be previously defined in the
- * ua_architecture.h which include this files at the end
- */
-
-#ifndef PLUGINS_ARCH_UA_ARCHITECTURE_FUNCTIONS_H_
-#define PLUGINS_ARCH_UA_ARCHITECTURE_FUNCTIONS_H_
-
-#include <open62541/config.h>
-
-_UA_BEGIN_DECLS
-
-/* Sleep function */
-#ifndef UA_sleep_ms
-int UA_sleep_ms(unsigned int miliSeconds); //suspend the thread for a certain amount of mili seconds
-#endif
-
-/* Socket functions */
-#ifndef UA_send
-ssize_t UA_send(UA_SOCKET sockfd, const void *buf, size_t len, int flags); //equivalent to posix send implementation
-#endif
-
-#ifndef UA_sendto
-ssize_t UA_sendto(UA_SOCKET sockfd, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen); //equivalent to posix sendto implementation
-#endif
-
-#ifndef UA_select
-int UA_select(UA_SOCKET nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); //equivalent to posix select implementation
-#endif
-
-#ifndef UA_recv
-ssize_t UA_recv(UA_SOCKET sockfd, void *buf, size_t len, int flags); //equivalent to posix recv implementation
-#endif
-
-#ifndef UA_recvfrom
-ssize_t UA_recvfrom(UA_SOCKET sockfd, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen);//equivalent to posix recvfrom implementation
-#endif
-
-#ifndef UA_recvmsg
-ssize_t UA_recvmsg(int sockfd, struct msghdr *msg, int flags);//equivalent to posix recvmsg implementation
-#endif
-
-#ifndef UA_shutdown
-int UA_shutdown(UA_SOCKET sockfd, int how); //equivalent to posix shutdown implementation
-#endif
-
-#ifndef UA_socket
-UA_SOCKET UA_socket(int domain, int type, int protocol);//equivalent to posix socket implementation
-#endif
-
-#ifndef UA_bind
-int UA_bind(UA_SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);//equivalent to posix bind implementation
-#endif
-
-#ifndef UA_listen
-int UA_listen(UA_SOCKET sockfd, int backlog);//equivalent to posix listen implementation
-#endif
-
-#ifndef UA_accept
-int UA_accept(UA_SOCKET sockfd, struct sockaddr *addr, socklen_t *addrlen);//equivalent to posix accept implementation
-#endif
-
-#ifndef UA_close
-int UA_close(UA_SOCKET sockfd);//equivalent to posix close implementation
-#endif
-
-#ifndef UA_connect
-int UA_connect(UA_SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen);//equivalent to posix connect implementation
-#endif
-
-#ifndef UA_fd_set
-void UA_fd_set(UA_SOCKET fd, fd_set *set); //equivalent to posix FD_SET implementation
-#endif
-
-#ifndef UA_fd_isset
-int UA_fd_isset(UA_SOCKET fd, fd_set *set);//equivalent to posix FD_ISSET implementation
-#endif
-
-#ifndef UA_getaddrinfo
-int UA_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);//equivalent to posix getaddrinfo implementation
-#endif
-
-#ifndef UA_htonl
-uint32_t UA_htonl(uint32_t hostlong);//equivalent to posix UA_htonl implementation
-#endif
-
-#ifndef UA_ntohl
-uint32_t UA_ntohl(uint32_t netlong);//equivalent to posix ntohl implementation
-#endif
-
-#ifndef UA_inet_pton
-int UA_inet_pton(int af, const char *src, void *dst);//equivalent to ANSI inet_pton implementation
-#endif
-
-#if UA_IPV6
-# ifndef UA_if_nametoindex
-unsigned int UA_if_nametoindex(const char *ifname);//equivalent to posix if_nametoindex implementation
-# endif
-#endif
-
-#ifndef UA_socket_set_blocking
-unsigned int UA_socket_set_blocking(UA_SOCKET sockfd);//set a socket as blocking. Returns 0 if OK, other value otherwise
-#endif
-
-#ifndef UA_socket_set_nonblocking
-unsigned int UA_socket_set_nonblocking(UA_SOCKET sockfd);//set a socket as non-blocking. Returns 0 if OK, other value otherwise
-#endif
-
-#ifndef UA_ioctl
-int UA_ioctl(int fildes, int request, ...);//equivalent to posix ioctl implementation
-#endif
-
-#ifndef UA_getsockopt
-int UA_getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optlen); //equivalent to posix getsockopt implementation. Only in non windows architectures
-#endif
-
-#ifndef UA_setsockopt
-int UA_setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen);//equivalent to posix setsockopt implementation
-#endif
-
-#ifndef UA_freeaddrinfo
-void UA_freeaddrinfo(struct addrinfo *res);//equivalent to posix freeaddrinfo implementation
-#endif
-
-#ifndef UA_gethostname
-int UA_gethostname(char *name, size_t len);//equivalent to posix gethostname implementation
-#endif
-
-#ifndef UA_getsockname
-int UA_getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen);//equivalent to posix getsockname implementation
-#endif
-
-#ifndef UA_initialize_architecture_network
-void UA_initialize_architecture_network(void);//initializes all needed for using the network interfaces
-#endif
-
-#ifndef UA_deinitialize_architecture_network
-void UA_deinitialize_architecture_network(void);//de-initializes the network interfaces
-#endif
-
-/* Print function */
-#ifndef UA_snprintf
-int UA_snprintf(char* pa_stream, size_t pa_size, const char* pa_format, ...); //prints text to output
-#endif
-
-#ifndef UA_strncasecmp
-int UA_strncasecmp(const char* s1, const char* s2, size_t n);
-#endif
-
-/* Access to file function */
-#ifndef UA_access
-int UA_access(const char *pathname, int mode); //equivalent implementation of https://linux.die.net/man/2/access
-#endif
-
-#ifndef UA_fileExists
-#define UA_fileExists(X) ( UA_access(X, 0) == 0)
-#endif
-
-#include <open62541/architecture_definitions.h>
-
-_UA_END_DECLS
-
-#endif /* PLUGINS_ARCH_UA_ARCHITECTURE_FUNCTIONS_H_ */
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index e4805ba32bd..c3206b2e16b 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -314,6 +314,11 @@ startMulticastDiscoveryServer(UA_Server *server) {
         mdnsd_register_receive_callback(dm->mdnsDaemon, mdns_record_received, dm);
     }
 
+#if defined(UA_ARCHITECTURE_WIN32) || defined(UA_ARCHITECTURE_WEC7)
+  WSADATA wsaData;
+  WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
+
     /* Open the mdns listen socket */
     if(dm->mdnsSendConnection == 0)
         discovery_createMulticastSocket(server, dm);
diff --git a/src/ua_util.c b/src/ua_util.c
index ce2a20f2c3d..126208227b9 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -481,3 +481,15 @@ UA_Guid_random(void) {
     result.data4[7] = (u8)(r >> 12);
     return result;
 }
+
+/********************/
+/* Malloc Singleton */
+/********************/
+
+/* Global malloc singletons */
+#ifdef UA_ENABLE_MALLOC_SINGLETON
+UA_EXPORT UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size) = malloc;
+UA_EXPORT UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr) = free;
+UA_EXPORT UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize) = calloc;
+UA_EXPORT UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size) = realloc;
+#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 62cdb6512c5..ff2ca5164f3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -147,7 +147,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     )
 endif()
 
-add_library(open62541-testplugins OBJECT ${test_plugin_sources} ${PROJECT_SOURCE_DIR}/arch/${UA_ARCHITECTURE}/ua_architecture_functions.c)
+add_library(open62541-testplugins OBJECT ${test_plugin_sources})
 add_dependencies(open62541-testplugins open62541)
 target_compile_definitions(open62541-testplugins PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
 if(UA_ENABLE_COVERAGE)
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index ae3e5270cb6..68e09a3645f 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -96,9 +96,7 @@ if(UA_ENABLE_ENCRYPTION OR UA_ENABLE_ENCRYPTION STREQUAL "MBEDTLS" OR UA_ENABLE_
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c)
 endif()
 
-add_library(open62541-fuzzplugins OBJECT
-            ${fuzzing_plugin_sources}
-            ${PROJECT_SOURCE_DIR}/arch/${UA_ARCHITECTURE}/ua_architecture_functions.c)
+add_library(open62541-fuzzplugins OBJECT ${fuzzing_plugin_sources})
 add_dependencies(open62541-fuzzplugins open62541)
 
 # the fuzzer test are built directly on the open62541 object files. so they can

From 76bb7dc11f0302c1dddc52ddf72d20d5a5bf52bb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 21 Jun 2023 18:23:07 +0200
Subject: [PATCH 1008/1963] refactor(core): Move architecture_definitions.h
 into config.h

---
 CMakeLists.txt                               |   1 -
 arch/posix/ua_architecture.h                 |   2 +-
 arch/win32/ua_architecture.h                 |   2 +-
 include/open62541/architecture_definitions.h | 426 -------------------
 include/open62541/config.h.in                | 414 +++++++++++++++++-
 5 files changed, 414 insertions(+), 431 deletions(-)
 delete mode 100644 include/open62541/architecture_definitions.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9be464bc965..7a981f58d15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -853,7 +853,6 @@ if(UA_ENABLE_HISTORIZING)
 endif()
 
 set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
-                     ${PROJECT_SOURCE_DIR}/include/open62541/architecture_definitions.h
                      ${exported_headers}
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/nodeids.h
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 21ba03ef582..8e1d8d60dc1 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -10,7 +10,7 @@
 #ifndef PLUGINS_ARCH_POSIX_UA_ARCHITECTURE_H_
 #define PLUGINS_ARCH_POSIX_UA_ARCHITECTURE_H_
 
-#include <open62541/architecture_definitions.h>
+#include <open62541/config.h>
 
 #include <errno.h>
 #include <arpa/inet.h>
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index d49b67c8dd8..985d8ef74b9 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -31,7 +31,7 @@
 # include <malloc.h>
 #endif
 
-#include <open62541/architecture_definitions.h>
+#include <open62541/config.h>
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
deleted file mode 100644
index 01f99514203..00000000000
--- a/include/open62541/architecture_definitions.h
+++ /dev/null
@@ -1,426 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-#ifndef ARCH_UA_ARCHITECTURE_DEFINITIONS_H_
-#define ARCH_UA_ARCHITECTURE_DEFINITIONS_H_
-
-#include <open62541/config.h>
-
-/**
- * C99 Definitions
- * --------------- */
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <inttypes.h>
-#include <float.h>
-#include <string.h>
-
-/**
- * Inline Functions
- * ---------------- */
-#ifdef _MSC_VER
-# define UA_INLINE __inline
-#else
-# define UA_INLINE inline
-#endif
-
-/* An inlinable method is typically defined as "static inline". Some
- * applications, such as language bindings with a C FFI (foreign function
- * interface), can however not work with static inline methods. These can set
- * the global UA_ENABLE_INLINABLE_EXPORT macro which causes all inlinable
- * methods to be exported as a regular public API method.
- *
- * Note that UA_ENABLE_INLINABLE_EXPORT has a negative impact for both size and
- * performance of the library. */
-#if defined(UA_ENABLE_INLINABLE_EXPORT) && defined(UA_INLINABLE_IMPL)
-# define UA_INLINABLE(decl, impl) UA_EXPORT decl; decl impl
-#elif defined(UA_ENABLE_INLINABLE_EXPORT)
-# define UA_INLINABLE(decl, impl) UA_EXPORT decl;
-#else
-# define UA_INLINABLE(decl, impl) static UA_INLINE decl impl
-#endif
-
-/**
- * Thread-local variables
- * ---------------------- */
-#if UA_MULTITHREADING >= 100
-# if defined(__GNUC__) /* Also covers clang */
-#  define UA_THREAD_LOCAL __thread
-# elif defined(_MSC_VER)
-#  define UA_THREAD_LOCAL __declspec(thread)
-# endif
-#endif
-#ifndef UA_THREAD_LOCAL
-# define UA_THREAD_LOCAL
-#endif
-
-/**
- * Atomic Operations
- * -----------------
- *
- * Atomic operations synchronize across processor cores and enable lockless
- * multi-threading. */
-
-/* Intrinsic atomic operations are not available everywhere for MSVC.
- * Use the win32 API. Prevent duplicate definitions by via winsock2. */
-#if UA_MULTITHREADING >= 100 && defined(_WIN32)
-# ifndef _WINSOCKAPI_
-#  define _NO_WINSOCKAPI_
-# endif
-# define _WINSOCKAPI_
-# include <windows.h>
-# ifdef _NO_WINSOCKAPI_
-#  undef _WINSOCKAPI_
-# endif
-#endif
-
-static UA_INLINE void *
-UA_atomic_xchg(void * volatile * addr, void *newptr) {
-#if UA_MULTITHREADING >= 100 && defined(_WIN32) /* Visual Studio */
-    return InterlockedExchangePointer(addr, newptr);
-#elif UA_MULTITHREADING >= 100 && defined(__GNUC__) /* GCC/Clang */
-    return __sync_lock_test_and_set(addr, newptr);
-#else
-# if UA_MULTITHREADING >= 100
-#  warning Atomic operations not implemented
-# endif
-    void *old = *addr;
-    *addr = newptr;
-    return old;
-#endif
-}
-
-static UA_INLINE void *
-UA_atomic_cmpxchg(void * volatile * addr, void *expected, void *newptr) {
-#if UA_MULTITHREADING >= 100 && defined(_WIN32) /* Visual Studio */
-    return InterlockedCompareExchangePointer(addr, expected, newptr);
-#elif UA_MULTITHREADING >= 100 && defined(__GNUC__) /* GCC/Clang */
-    return __sync_val_compare_and_swap(addr, expected, newptr);
-#else
-    void *old = *addr;
-    if(old == expected)
-        *addr = newptr;
-    return old;
-#endif
-}
-
-/**
- * Memory Management
- * -----------------
- *
- * The flag ``UA_ENABLE_MALLOC_SINGLETON`` enables singleton (global) variables
- * with method pointers for memory management (malloc et al.). The method
- * pointers can be switched out at runtime. Use-cases for this are testing of
- * constrained memory conditions and arena-based custom memory management.
- *
- * If the flag is undefined, then ``UA_malloc`` etc. are set to the default
- * malloc, as defined in ``/arch/<architecture>/ua_architecture.h``.
- */
-
-#ifdef UA_ENABLE_MALLOC_SINGLETON
-extern UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size);
-extern UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr);
-extern UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize);
-extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
-# define UA_malloc(size) UA_mallocSingleton(size)
-# define UA_free(ptr) UA_freeSingleton(ptr)
-# define UA_calloc(num, size) UA_callocSingleton(num, size)
-# define UA_realloc(ptr, size) UA_reallocSingleton(ptr, size)
-#endif
-
-/* Stack-allocation of memory. Use C99 variable-length arrays if possible.
- * Otherwise revert to alloca. Note that alloca is not supported on some
- * plattforms. */
-#ifndef UA_STACKARRAY
-# if defined(__GNUC__) || defined(__clang__)
-#  define UA_STACKARRAY(TYPE, NAME, SIZE) TYPE NAME[SIZE]
-# else
-# if defined(__GNUC__) || defined(__clang__)
-#  define UA_alloca(size) __builtin_alloca (size)
-# elif defined(_WIN32)
-#  define UA_alloca(SIZE) _alloca(SIZE)
-# else
-#  include <alloca.h>
-#  define UA_alloca(SIZE) alloca(SIZE)
-# endif
-#  define UA_STACKARRAY(TYPE, NAME, SIZE) \
-    /* cppcheck-suppress allocaCalled */  \
-    TYPE *(NAME) = (TYPE*)UA_alloca(sizeof(TYPE) * (SIZE))
-# endif
-#endif
-
-/**
- * Assertions
- * ----------
- * The assert macro is disabled by defining NDEBUG. It is often forgotten to
- * include -DNDEBUG in the compiler flags when using the single-file release. So
- * we make assertions dependent on the UA_DEBUG definition handled by CMake. */
-#ifdef UA_DEBUG
-# include <assert.h>
-# define UA_assert(ignore) assert(ignore)
-#else
-# define UA_assert(ignore) do {} while(0)
-#endif
-
-/* Outputs an error message at compile time if the assert fails.
- * Example usage:
- * UA_STATIC_ASSERT(sizeof(long)==7, use_another_compiler_luke)
- * See: https://stackoverflow.com/a/4815532/869402 */
-#if defined(__cplusplus) && __cplusplus >= 201103L /* C++11 or above */
-# define UA_STATIC_ASSERT(cond,msg) static_assert(cond, #msg)
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L /* C11 or above */
-# define UA_STATIC_ASSERT(cond,msg) _Static_assert(cond, #msg)
-#elif defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER) /* GCC, Clang, MSC */
-# define UA_CTASTR2(pre,post) pre ## post
-# define UA_CTASTR(pre,post) UA_CTASTR2(pre,post)
-# ifndef __COUNTER__ /* PPC GCC fix */
-#  define __COUNTER__ __LINE__
-# endif
-# define UA_STATIC_ASSERT(cond,msg)                             \
-    typedef struct {                                            \
-        unsigned int UA_CTASTR(static_assertion_failed_,msg) : !!(cond); \
-    } UA_CTASTR(static_assertion_failed_,__COUNTER__)
-#else /* Everybody else */
-# define UA_STATIC_ASSERT(cond,msg) typedef char static_assertion_##msg[(cond)?1:-1]
-#endif
-
-/**
- * Dynamic Linking
- * ---------------
- * Explicit attribute for functions to be exported in a shared library. */
-#if defined(_WIN32) && defined(UA_DYNAMIC_LINKING)
-# ifdef UA_DYNAMIC_LINKING_EXPORT /* export dll */
-#  ifdef __GNUC__
-#   define UA_EXPORT __attribute__ ((dllexport))
-#  else
-#   define UA_EXPORT __declspec(dllexport)
-#  endif
-# else /* import dll */
-#  ifdef __GNUC__
-#   define UA_EXPORT __attribute__ ((dllimport))
-#  else
-#   define UA_EXPORT __declspec(dllimport)
-#  endif
-# endif
-#else /* non win32 */
-# if __GNUC__ || __clang__
-#  define UA_EXPORT __attribute__ ((visibility ("default")))
-# endif
-#endif
-#ifndef UA_EXPORT
-# define UA_EXPORT /* fallback to default */
-#endif
-
-/**
- * Threadsafe functions
- * --------------------
- * Functions that can be called from independent threads are marked with
- * the UA_THREADSAFE macro. This is currently only an information for the
- * developer. It can be used in the future for instrumentation and static
- * code analysis. */
-#define UA_THREADSAFE
-
-/**
- * Non-aliasing pointers
- * -------------------- */
-#ifdef _MSC_VER
-# define UA_RESTRICT __restrict
-#elif defined(__GNUC__)
-# define UA_RESTRICT __restrict__
-#elif defined(__CODEGEARC__)
-# define UA_RESTRICT _RESTRICT
-#else
-# define UA_RESTRICT restrict
-#endif
-
-/**
- * Likely/Unlikely Conditions
- * --------------------------
- * Condition is likely/unlikely, to help branch prediction. */
-#if defined(__GNUC__) || defined(__clang__)
-# define UA_LIKELY(x) __builtin_expect((x), 1)
-# define UA_UNLIKELY(x) __builtin_expect((x), 0)
-#else
-# define UA_LIKELY(x) x
-# define UA_UNLIKELY(x) x
-#endif
-
-/**
- * Function attributes
- * ------------------- */
-#if defined(__GNUC__) || defined(__clang__)
-# define UA_FUNC_ATTR_MALLOC __attribute__((malloc))
-# define UA_FUNC_ATTR_PURE __attribute__ ((pure))
-# define UA_FUNC_ATTR_CONST __attribute__((const))
-# define UA_FUNC_ATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-# define UA_FORMAT(X,Y) __attribute__ ((format (printf, X, Y)))
-#elif defined(_MSC_VER) && _MSC_VER >= 1800
-# include <sal.h>
-# define UA_FUNC_ATTR_MALLOC
-# define UA_FUNC_ATTR_PURE
-# define UA_FUNC_ATTR_CONST
-# define UA_FUNC_ATTR_WARN_UNUSED_RESULT _Check_return_
-# define UA_FORMAT(X,Y)
-#else
-# define UA_FUNC_ATTR_MALLOC
-# define UA_FUNC_ATTR_PURE
-# define UA_FUNC_ATTR_CONST
-# define UA_FUNC_ATTR_WARN_UNUSED_RESULT
-# define UA_FORMAT(X,Y)
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-# define UA_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-# define UA_DEPRECATED __declspec(deprecated)
-#else
-# define UA_DEPRECATED
-#endif
-
-/**
- * Internal Attributes
- * -------------------
- * These attributes are only defined if the macro UA_INTERNAL is defined. That
- * way public methods can be annotated (e.g. to warn for unused results) but
- * warnings are only triggered for internal code. */
-
-#if defined(UA_INTERNAL) && (defined(__GNUC__) || defined(__clang__))
-# define UA_INTERNAL_DEPRECATED \
-    _Pragma ("GCC warning \"Macro is deprecated for internal use\"")
-#else
-# define UA_INTERNAL_DEPRECATED
-#endif
-
-#if defined(UA_INTERNAL) && (defined(__GNUC__) || defined(__clang__))
-# define UA_INTERNAL_FUNC_ATTR_WARN_UNUSED_RESULT \
-    __attribute__((warn_unused_result))
-#else
-# define UA_INTERNAL_FUNC_ATTR_WARN_UNUSED_RESULT
-#endif
-
-/**
- * Detect Endianness and IEEE 754 floating point
- * ---------------------------------------------
- * Integers and floating point numbers are transmitted in little-endian (IEEE
- * 754 for floating point) encoding. If the target architecture uses the same
- * format, numeral datatypes can be memcpy'd (overlayed) on the network buffer.
- * Otherwise, a slow default encoding routine is used that works for every
- * architecture.
- *
- * Integer Endianness
- * ^^^^^^^^^^^^^^^^^^
- * The definition ``UA_LITTLE_ENDIAN`` is true when the integer representation
- * of the target architecture is little-endian. */
-#if defined(_WIN32)
-# define UA_LITTLE_ENDIAN 1
-#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
-# define UA_LITTLE_ENDIAN 1
-#elif (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-      (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-# define UA_LITTLE_ENDIAN 1
-#elif defined(__linux__) /* Linux (including Android) */
-# include <endian.h>
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define UA_LITTLE_ENDIAN 1
-# endif
-#elif defined(__OpenBSD__) /* OpenBSD */
-# include <sys/endian.h>
-# if BYTE_ORDER == LITTLE_ENDIAN
-#  define UA_LITTLE_ENDIAN 1
-# endif
-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) /* Other BSD */
-# include <sys/endian.h>
-# if _BYTE_ORDER == _LITTLE_ENDIAN
-#  define UA_LITTLE_ENDIAN 1
-# endif
-#elif defined(__APPLE__) /* Apple (MacOS, iOS) */
-# include <libkern/OSByteOrder.h>
-# if defined(__LITTLE_ENDIAN__)
-#  define UA_LITTLE_ENDIAN 1
-# endif
-#elif defined(__QNX__) || defined(__QNXNTO__) /* QNX */
-# include <gulliver.h>
-# if defined(__LITTLEENDIAN__)
-#  define UA_LITTLE_ENDIAN 1
-# endif
-#elif defined(_OS9000) /* OS-9 */
-# if defined(_LIL_END)
-#  define UA_LITTLE_ENDIAN 1
-# endif
-#endif
-#ifndef UA_LITTLE_ENDIAN
-# define UA_LITTLE_ENDIAN 0
-#endif
-
-/* Can the integers be memcpy'd onto the network buffer? Add additional checks
- * here. Some platforms (e.g. QNX) have sizeof(bool) > 1. Manually disable
- * overlayed integer encoding if that is the case. */
-#if (UA_LITTLE_ENDIAN == 1)
-UA_STATIC_ASSERT(sizeof(bool) == 1, cannot_overlay_integers_with_large_bool);
-# define UA_BINARY_OVERLAYABLE_INTEGER 1
-#else
-# define UA_BINARY_OVERLAYABLE_INTEGER 0
-#endif
-
-/**
- * Float Endianness
- * ^^^^^^^^^^^^^^^^
- * The definition ``UA_FLOAT_IEEE754`` is set to true when the floating point
- * number representation of the target architecture is IEEE 754. The definition
- * ``UA_FLOAT_LITTLE_ENDIAN`` is set to true when the floating point number
- * representation is in little-endian encoding. */
-
-#if defined(_WIN32)
-# define UA_FLOAT_IEEE754 1
-#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || \
-    defined(__ia64__) || defined(__powerpc__) || defined(__sparc__) || \
-    defined(__arm__)
-# define UA_FLOAT_IEEE754 1
-#elif defined(__STDC_IEC_559__)
-# define UA_FLOAT_IEEE754 1
-#else
-# define UA_FLOAT_IEEE754 0
-#endif
-
-/* Wikipedia says (https://en.wikipedia.org/wiki/Endianness): Although the
- * ubiquitous x86 processors of today use little-endian storage for all types of
- * data (integer, floating point, BCD), there are a number of hardware
- * architectures where floating-point numbers are represented in big-endian form
- * while integers are represented in little-endian form. */
-#if defined(_WIN32)
-# define UA_FLOAT_LITTLE_ENDIAN 1
-#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
-# define UA_FLOAT_LITTLE_ENDIAN 1
-#elif defined(__FLOAT_WORD_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-    (__FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__) /* Defined only in GCC */
-# define UA_FLOAT_LITTLE_ENDIAN 1
-#elif defined(__FLOAT_WORD_ORDER) && defined(__LITTLE_ENDIAN) && \
-    (__FLOAT_WORD_ORDER == __LITTLE_ENDIAN) /* Defined only in GCC */
-# define UA_FLOAT_LITTLE_ENDIAN 1
-#endif
-#ifndef UA_FLOAT_LITTLE_ENDIAN
-# define UA_FLOAT_LITTLE_ENDIAN 0
-#endif
-
-/* Only if the floating points are litle-endian **and** in IEEE 754 format can
- * we memcpy directly onto the network buffer. */
-#if (UA_FLOAT_IEEE754 == 1) && (UA_FLOAT_LITTLE_ENDIAN == 1)
-# define UA_BINARY_OVERLAYABLE_FLOAT 1
-#else
-# define UA_BINARY_OVERLAYABLE_FLOAT 0
-#endif
-
-/**
- * File access
- * ----------- */
-
-#define UA_fileExists(X) ( UA_access(X, 0) == 0)
-
-#endif /* ARCH_UA_ARCHITECTURE_DEFINITIONS_H_ */
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index fd1f047aed7..49c8ef540e8 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -85,6 +85,7 @@
 #cmakedefine UA_DEBUG
 #cmakedefine UA_DEBUG_DUMP_PKGS
 #cmakedefine UA_DEBUG_FILE_LINE_INFO
+
 /**
  * Function Export
  * ---------------
@@ -144,9 +145,418 @@
 # endif
 #endif
 
-// specific architectures can undef this
-#define UA_HAS_GETIFADDR
+/**
+ * C99 Definitions
+ * --------------- */
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <inttypes.h>
+#include <float.h>
+#include <string.h>
+
+/**
+ * Inline Functions
+ * ---------------- */
+#ifdef _MSC_VER
+# define UA_INLINE __inline
+#else
+# define UA_INLINE inline
+#endif
+
+/* An inlinable method is typically defined as "static inline". Some
+ * applications, such as language bindings with a C FFI (foreign function
+ * interface), can however not work with static inline methods. These can set
+ * the global UA_ENABLE_INLINABLE_EXPORT macro which causes all inlinable
+ * methods to be exported as a regular public API method.
+ *
+ * Note that UA_ENABLE_INLINABLE_EXPORT has a negative impact for both size and
+ * performance of the library. */
+#if defined(UA_ENABLE_INLINABLE_EXPORT) && defined(UA_INLINABLE_IMPL)
+# define UA_INLINABLE(decl, impl) UA_EXPORT decl; decl impl
+#elif defined(UA_ENABLE_INLINABLE_EXPORT)
+# define UA_INLINABLE(decl, impl) UA_EXPORT decl;
+#else
+# define UA_INLINABLE(decl, impl) static UA_INLINE decl impl
+#endif
+
+/**
+ * Thread-local variables
+ * ---------------------- */
+#if UA_MULTITHREADING >= 100
+# if defined(__GNUC__) /* Also covers clang */
+#  define UA_THREAD_LOCAL __thread
+# elif defined(_MSC_VER)
+#  define UA_THREAD_LOCAL __declspec(thread)
+# endif
+#endif
+#ifndef UA_THREAD_LOCAL
+# define UA_THREAD_LOCAL
+#endif
+
+/**
+ * Atomic Operations
+ * -----------------
+ *
+ * Atomic operations synchronize across processor cores and enable lockless
+ * multi-threading. */
+
+/* Intrinsic atomic operations are not available everywhere for MSVC.
+ * Use the win32 API. Prevent duplicate definitions by via winsock2. */
+#if UA_MULTITHREADING >= 100 && defined(_WIN32)
+# ifndef _WINSOCKAPI_
+#  define _NO_WINSOCKAPI_
+# endif
+# define _WINSOCKAPI_
+# include <windows.h>
+# ifdef _NO_WINSOCKAPI_
+#  undef _WINSOCKAPI_
+# endif
+#endif
+
+static UA_INLINE void *
+UA_atomic_xchg(void * volatile * addr, void *newptr) {
+#if UA_MULTITHREADING >= 100 && defined(_WIN32) /* Visual Studio */
+    return InterlockedExchangePointer(addr, newptr);
+#elif UA_MULTITHREADING >= 100 && defined(__GNUC__) /* GCC/Clang */
+    return __sync_lock_test_and_set(addr, newptr);
+#else
+# if UA_MULTITHREADING >= 100
+#  warning Atomic operations not implemented
+# endif
+    void *old = *addr;
+    *addr = newptr;
+    return old;
+#endif
+}
+
+static UA_INLINE void *
+UA_atomic_cmpxchg(void * volatile * addr, void *expected, void *newptr) {
+#if UA_MULTITHREADING >= 100 && defined(_WIN32) /* Visual Studio */
+    return InterlockedCompareExchangePointer(addr, expected, newptr);
+#elif UA_MULTITHREADING >= 100 && defined(__GNUC__) /* GCC/Clang */
+    return __sync_val_compare_and_swap(addr, expected, newptr);
+#else
+    void *old = *addr;
+    if(old == expected)
+        *addr = newptr;
+    return old;
+#endif
+}
+
+/**
+ * Memory Management
+ * -----------------
+ *
+ * The flag ``UA_ENABLE_MALLOC_SINGLETON`` enables singleton (global) variables
+ * with method pointers for memory management (malloc et al.). The method
+ * pointers can be switched out at runtime. Use-cases for this are testing of
+ * constrained memory conditions and arena-based custom memory management.
+ *
+ * If the flag is undefined, then ``UA_malloc`` etc. are set to the default
+ * malloc, as defined in ``/arch/<architecture>/ua_architecture.h``.
+ */
+
+#ifdef UA_ENABLE_MALLOC_SINGLETON
+extern UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size);
+extern UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr);
+extern UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize);
+extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
+# define UA_malloc(size) UA_mallocSingleton(size)
+# define UA_free(ptr) UA_freeSingleton(ptr)
+# define UA_calloc(num, size) UA_callocSingleton(num, size)
+# define UA_realloc(ptr, size) UA_reallocSingleton(ptr, size)
+#endif
+
+/* Stack-allocation of memory. Use C99 variable-length arrays if possible.
+ * Otherwise revert to alloca. Note that alloca is not supported on some
+ * plattforms. */
+#ifndef UA_STACKARRAY
+# if defined(__GNUC__) || defined(__clang__)
+#  define UA_STACKARRAY(TYPE, NAME, SIZE) TYPE NAME[SIZE]
+# else
+# if defined(__GNUC__) || defined(__clang__)
+#  define UA_alloca(size) __builtin_alloca (size)
+# elif defined(_WIN32)
+#  define UA_alloca(SIZE) _alloca(SIZE)
+# else
+#  include <alloca.h>
+#  define UA_alloca(SIZE) alloca(SIZE)
+# endif
+#  define UA_STACKARRAY(TYPE, NAME, SIZE) \
+    /* cppcheck-suppress allocaCalled */  \
+    TYPE *(NAME) = (TYPE*)UA_alloca(sizeof(TYPE) * (SIZE))
+# endif
+#endif
+
+/**
+ * Assertions
+ * ----------
+ * The assert macro is disabled by defining NDEBUG. It is often forgotten to
+ * include -DNDEBUG in the compiler flags when using the single-file release. So
+ * we make assertions dependent on the UA_DEBUG definition handled by CMake. */
+#ifdef UA_DEBUG
+# include <assert.h>
+# define UA_assert(ignore) assert(ignore)
+#else
+# define UA_assert(ignore) do {} while(0)
+#endif
+
+/* Outputs an error message at compile time if the assert fails.
+ * Example usage:
+ * UA_STATIC_ASSERT(sizeof(long)==7, use_another_compiler_luke)
+ * See: https://stackoverflow.com/a/4815532/869402 */
+#if defined(__cplusplus) && __cplusplus >= 201103L /* C++11 or above */
+# define UA_STATIC_ASSERT(cond,msg) static_assert(cond, #msg)
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L /* C11 or above */
+# define UA_STATIC_ASSERT(cond,msg) _Static_assert(cond, #msg)
+#elif defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER) /* GCC, Clang, MSC */
+# define UA_CTASTR2(pre,post) pre ## post
+# define UA_CTASTR(pre,post) UA_CTASTR2(pre,post)
+# ifndef __COUNTER__ /* PPC GCC fix */
+#  define __COUNTER__ __LINE__
+# endif
+# define UA_STATIC_ASSERT(cond,msg)                             \
+    typedef struct {                                            \
+        unsigned int UA_CTASTR(static_assertion_failed_,msg) : !!(cond); \
+    } UA_CTASTR(static_assertion_failed_,__COUNTER__)
+#else /* Everybody else */
+# define UA_STATIC_ASSERT(cond,msg) typedef char static_assertion_##msg[(cond)?1:-1]
+#endif
+
+/**
+ * Dynamic Linking
+ * ---------------
+ * Explicit attribute for functions to be exported in a shared library. */
+#if defined(_WIN32) && defined(UA_DYNAMIC_LINKING)
+# ifdef UA_DYNAMIC_LINKING_EXPORT /* export dll */
+#  ifdef __GNUC__
+#   define UA_EXPORT __attribute__ ((dllexport))
+#  else
+#   define UA_EXPORT __declspec(dllexport)
+#  endif
+# else /* import dll */
+#  ifdef __GNUC__
+#   define UA_EXPORT __attribute__ ((dllimport))
+#  else
+#   define UA_EXPORT __declspec(dllimport)
+#  endif
+# endif
+#else /* non win32 */
+# if __GNUC__ || __clang__
+#  define UA_EXPORT __attribute__ ((visibility ("default")))
+# endif
+#endif
+#ifndef UA_EXPORT
+# define UA_EXPORT /* fallback to default */
+#endif
+
+/**
+ * Threadsafe functions
+ * --------------------
+ * Functions that can be called from independent threads are marked with
+ * the UA_THREADSAFE macro. This is currently only an information for the
+ * developer. It can be used in the future for instrumentation and static
+ * code analysis. */
+#define UA_THREADSAFE
+
+/**
+ * Non-aliasing pointers
+ * -------------------- */
+#ifdef _MSC_VER
+# define UA_RESTRICT __restrict
+#elif defined(__GNUC__)
+# define UA_RESTRICT __restrict__
+#elif defined(__CODEGEARC__)
+# define UA_RESTRICT _RESTRICT
+#else
+# define UA_RESTRICT restrict
+#endif
+
+/**
+ * Likely/Unlikely Conditions
+ * --------------------------
+ * Condition is likely/unlikely, to help branch prediction. */
+#if defined(__GNUC__) || defined(__clang__)
+# define UA_LIKELY(x) __builtin_expect((x), 1)
+# define UA_UNLIKELY(x) __builtin_expect((x), 0)
+#else
+# define UA_LIKELY(x) x
+# define UA_UNLIKELY(x) x
+#endif
+
+/**
+ * Function attributes
+ * ------------------- */
+#if defined(__GNUC__) || defined(__clang__)
+# define UA_FUNC_ATTR_MALLOC __attribute__((malloc))
+# define UA_FUNC_ATTR_PURE __attribute__ ((pure))
+# define UA_FUNC_ATTR_CONST __attribute__((const))
+# define UA_FUNC_ATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+# define UA_FORMAT(X,Y) __attribute__ ((format (printf, X, Y)))
+#elif defined(_MSC_VER) && _MSC_VER >= 1800
+# include <sal.h>
+# define UA_FUNC_ATTR_MALLOC
+# define UA_FUNC_ATTR_PURE
+# define UA_FUNC_ATTR_CONST
+# define UA_FUNC_ATTR_WARN_UNUSED_RESULT _Check_return_
+# define UA_FORMAT(X,Y)
+#else
+# define UA_FUNC_ATTR_MALLOC
+# define UA_FUNC_ATTR_PURE
+# define UA_FUNC_ATTR_CONST
+# define UA_FUNC_ATTR_WARN_UNUSED_RESULT
+# define UA_FORMAT(X,Y)
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+# define UA_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+# define UA_DEPRECATED __declspec(deprecated)
+#else
+# define UA_DEPRECATED
+#endif
+
+/**
+ * Internal Attributes
+ * -------------------
+ * These attributes are only defined if the macro UA_INTERNAL is defined. That
+ * way public methods can be annotated (e.g. to warn for unused results) but
+ * warnings are only triggered for internal code. */
+
+#if defined(UA_INTERNAL) && (defined(__GNUC__) || defined(__clang__))
+# define UA_INTERNAL_DEPRECATED \
+    _Pragma ("GCC warning \"Macro is deprecated for internal use\"")
+#else
+# define UA_INTERNAL_DEPRECATED
+#endif
+
+#if defined(UA_INTERNAL) && (defined(__GNUC__) || defined(__clang__))
+# define UA_INTERNAL_FUNC_ATTR_WARN_UNUSED_RESULT \
+    __attribute__((warn_unused_result))
+#else
+# define UA_INTERNAL_FUNC_ATTR_WARN_UNUSED_RESULT
+#endif
+
+/**
+ * Detect Endianness and IEEE 754 floating point
+ * ---------------------------------------------
+ * Integers and floating point numbers are transmitted in little-endian (IEEE
+ * 754 for floating point) encoding. If the target architecture uses the same
+ * format, numeral datatypes can be memcpy'd (overlayed) on the network buffer.
+ * Otherwise, a slow default encoding routine is used that works for every
+ * architecture.
+ *
+ * Integer Endianness
+ * ^^^^^^^^^^^^^^^^^^
+ * The definition ``UA_LITTLE_ENDIAN`` is true when the integer representation
+ * of the target architecture is little-endian. */
+#if defined(_WIN32)
+# define UA_LITTLE_ENDIAN 1
+#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
+# define UA_LITTLE_ENDIAN 1
+#elif (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
+      (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+# define UA_LITTLE_ENDIAN 1
+#elif defined(__linux__) /* Linux (including Android) */
+# include <endian.h>
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+#  define UA_LITTLE_ENDIAN 1
+# endif
+#elif defined(__OpenBSD__) /* OpenBSD */
+# include <sys/endian.h>
+# if BYTE_ORDER == LITTLE_ENDIAN
+#  define UA_LITTLE_ENDIAN 1
+# endif
+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) /* Other BSD */
+# include <sys/endian.h>
+# if _BYTE_ORDER == _LITTLE_ENDIAN
+#  define UA_LITTLE_ENDIAN 1
+# endif
+#elif defined(__APPLE__) /* Apple (MacOS, iOS) */
+# include <libkern/OSByteOrder.h>
+# if defined(__LITTLE_ENDIAN__)
+#  define UA_LITTLE_ENDIAN 1
+# endif
+#elif defined(__QNX__) || defined(__QNXNTO__) /* QNX */
+# include <gulliver.h>
+# if defined(__LITTLEENDIAN__)
+#  define UA_LITTLE_ENDIAN 1
+# endif
+#elif defined(_OS9000) /* OS-9 */
+# if defined(_LIL_END)
+#  define UA_LITTLE_ENDIAN 1
+# endif
+#endif
+#ifndef UA_LITTLE_ENDIAN
+# define UA_LITTLE_ENDIAN 0
+#endif
+
+/* Can the integers be memcpy'd onto the network buffer? Add additional checks
+ * here. Some platforms (e.g. QNX) have sizeof(bool) > 1. Manually disable
+ * overlayed integer encoding if that is the case. */
+#if (UA_LITTLE_ENDIAN == 1)
+UA_STATIC_ASSERT(sizeof(bool) == 1, cannot_overlay_integers_with_large_bool);
+# define UA_BINARY_OVERLAYABLE_INTEGER 1
+#else
+# define UA_BINARY_OVERLAYABLE_INTEGER 0
+#endif
+
+/**
+ * Float Endianness
+ * ^^^^^^^^^^^^^^^^
+ * The definition ``UA_FLOAT_IEEE754`` is set to true when the floating point
+ * number representation of the target architecture is IEEE 754. The definition
+ * ``UA_FLOAT_LITTLE_ENDIAN`` is set to true when the floating point number
+ * representation is in little-endian encoding. */
+
+#if defined(_WIN32)
+# define UA_FLOAT_IEEE754 1
+#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || \
+    defined(__ia64__) || defined(__powerpc__) || defined(__sparc__) || \
+    defined(__arm__)
+# define UA_FLOAT_IEEE754 1
+#elif defined(__STDC_IEC_559__)
+# define UA_FLOAT_IEEE754 1
+#else
+# define UA_FLOAT_IEEE754 0
+#endif
+
+/* Wikipedia says (https://en.wikipedia.org/wiki/Endianness): Although the
+ * ubiquitous x86 processors of today use little-endian storage for all types of
+ * data (integer, floating point, BCD), there are a number of hardware
+ * architectures where floating-point numbers are represented in big-endian form
+ * while integers are represented in little-endian form. */
+#if defined(_WIN32)
+# define UA_FLOAT_LITTLE_ENDIAN 1
+#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
+# define UA_FLOAT_LITTLE_ENDIAN 1
+#elif defined(__FLOAT_WORD_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
+    (__FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__) /* Defined only in GCC */
+# define UA_FLOAT_LITTLE_ENDIAN 1
+#elif defined(__FLOAT_WORD_ORDER) && defined(__LITTLE_ENDIAN) && \
+    (__FLOAT_WORD_ORDER == __LITTLE_ENDIAN) /* Defined only in GCC */
+# define UA_FLOAT_LITTLE_ENDIAN 1
+#endif
+#ifndef UA_FLOAT_LITTLE_ENDIAN
+# define UA_FLOAT_LITTLE_ENDIAN 0
+#endif
+
+/* Only if the floating points are litle-endian **and** in IEEE 754 format can
+ * we memcpy directly onto the network buffer. */
+#if (UA_FLOAT_IEEE754 == 1) && (UA_FLOAT_LITTLE_ENDIAN == 1)
+# define UA_BINARY_OVERLAYABLE_FLOAT 1
+#else
+# define UA_BINARY_OVERLAYABLE_FLOAT 0
+#endif
+
+/**
+ * File access
+ * ----------- */
+
+#define UA_fileExists(X) ( UA_access(X, 0) == 0)
 
+/* Include architecture-specific definitions */
 #include "${UA_ARCHITECTURE}/ua_architecture.h"
 
 #endif /* UA_CONFIG_H_ */

From 3b5b4a7f0b69ccbf50622f7e335fa8e92a863d8e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 24 Jun 2023 10:42:52 +0200
Subject: [PATCH 1009/1963] refactor(examples): Increase matrix dimensions to
 5x5 for CTT tests

Required for some CTT tests.
---
 examples/server_ctt.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 9d3341facfb..58622096c7c 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -503,7 +503,7 @@ setInformationModel(UA_Server *server) {
                             UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
 
     /* Fill demo nodes for each type*/
-    UA_UInt32 matrixDims[2] = {3, 3};
+    UA_UInt32 matrixDims[2] = {5, 5};
     UA_UInt32 id = 51000; // running id in namespace 0
     for(UA_UInt32 type = 0; type < UA_TYPES_DIAGNOSTICINFO; type++) {
         if(type == UA_TYPES_VARIANT || type == UA_TYPES_DIAGNOSTICINFO)
@@ -548,15 +548,16 @@ setInformationModel(UA_Server *server) {
         attr.valueRank = UA_VALUERANK_TWO_DIMENSIONS;
         attr.arrayDimensions = matrixDims;
         attr.arrayDimensionsSize = 2;
-        void *myMultiArray = UA_Array_new(9, &UA_TYPES[type]);
+        void *myMultiArray = UA_Array_new(25, &UA_TYPES[type]);
         attr.value.arrayDimensions = (UA_UInt32 *)UA_Array_new(2, &UA_TYPES[UA_TYPES_INT32]);
-        attr.value.arrayDimensions[0] = 3;
-        attr.value.arrayDimensions[1] = 3;
+        attr.value.arrayDimensions[0] = 5;
+        attr.value.arrayDimensions[1] = 5;
         attr.value.arrayDimensionsSize = 2;
-        attr.value.arrayLength = 9;
+        attr.value.arrayLength = 25;
         attr.value.data = myMultiArray;
         attr.value.type = &UA_TYPES[type];
-        UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, ++id), UA_NODEID_NUMERIC(1, MATRIXID),
+        UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, ++id),
+                                  UA_NODEID_NUMERIC(1, MATRIXID),
                                   UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), qualifiedName,
                                   baseDataVariableType, attr, NULL, NULL);
         UA_Variant_clear(&attr.value);

From ead59ed0d5080a974e60769f9e997faaae5be76c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 25 Jun 2023 00:44:34 +0200
Subject: [PATCH 1010/1963] feat(tests): Add double-reference example to
 server_ctt

---
 examples/server_ctt.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 58622096c7c..699da140b00 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -356,6 +356,17 @@ outargMethod(UA_Server *server,
 
 static void
 setInformationModel(UA_Server *server) {
+    /* add a custom reference type */
+    UA_ReferenceTypeAttributes myRef = UA_ReferenceTypeAttributes_default;
+    myRef.description = UA_LOCALIZEDTEXT("", "my organize");
+    myRef.displayName = UA_LOCALIZEDTEXT("", "myOrganize");
+    const UA_QualifiedName myRefName = UA_QUALIFIEDNAME(1, "myOrganize");
+    const UA_NodeId myRefNodeId = UA_NODEID_STRING(1, "myOrganize");
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE);
+    UA_Server_addReferenceTypeNode(server, myRefNodeId, parentNodeId, parentReferenceNodeId,
+                                   myRefName, myRef, NULL, NULL);
+
     /* add a static variable node to the server */
     UA_VariableAttributes myVar = UA_VariableAttributes_default;
     myVar.description = UA_LOCALIZEDTEXT("en-US", "the answer");
@@ -367,8 +378,8 @@ setInformationModel(UA_Server *server) {
     UA_Variant_setScalar(&myVar.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
     const UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "the answer");
     const UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "the.answer");
-    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
-    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
     UA_Server_addVariableNode(server, myIntegerNodeId, parentNodeId, parentReferenceNodeId,
                               myIntegerName, baseDataVariableType, myVar, NULL, NULL);
 
@@ -467,6 +478,7 @@ setInformationModel(UA_Server *server) {
 #define MATRIXID 50003
 #define DEPTHID 50004
 #define SCALETESTID 40005
+#define DOUBLEREFID 40006
 
     UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
     object_attr.description = UA_LOCALIZEDTEXT("en-US", "Demo");
@@ -502,6 +514,17 @@ setInformationModel(UA_Server *server) {
                             UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "ScaleTest"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
 
+    /* Reference to this node from the "Demo" object both with "Organizes" and
+     * the "myOrganizes" subtype */
+    object_attr.description = UA_LOCALIZEDTEXT("en-US", "Double Refs");
+    object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Double Refs");
+    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, DOUBLEREFID), UA_NODEID_NUMERIC(1, DEMOID),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Double Refs"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
+    UA_Server_addReference(server, UA_NODEID_NUMERIC(1, DEMOID),
+                           UA_NODEID_STRING(1, "myOrganize"),
+                           UA_EXPANDEDNODEID_NUMERIC(1, DOUBLEREFID), true);
+
     /* Fill demo nodes for each type*/
     UA_UInt32 matrixDims[2] = {5, 5};
     UA_UInt32 id = 51000; // running id in namespace 0

From bf004d70781841fea939a94ab763076848c21aaf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 25 Jun 2023 08:38:56 +0200
Subject: [PATCH 1011/1963] fix(server): Consider reference direction for
 BrowseNext

---
 src/server/ua_services_view.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 1cf447abe03..26b82ebace1 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -508,6 +508,7 @@ struct ContinuationPoint {
      * between the calls to Browse/BrowseNext. */
     UA_NodePointer lastTarget;
     UA_Byte lastRefKindIndex;
+    UA_Boolean lastRefInverse;
 };
 
 ContinuationPoint *
@@ -639,6 +640,7 @@ browseReferencTargetCallback(void *context, UA_ReferenceTarget *t) {
     /* Store as last target. The itarget-id is a shallow copy for now. */
     cp->lastTarget = t->targetId;
     cp->lastRefKindIndex = bc->rk->referenceTypeIndex;
+    cp->lastRefInverse = bc->rk->isInverse;
 
     /* Abort if the status is not good. Also doesn't make a deep-copy of
      * cp->lastTarget after returning from here. */
@@ -663,6 +665,8 @@ browseWithNode(struct BrowseContext *bc, const UA_NodeHead *head ) {
          * last ReferenceType that was transmitted */
         if(bc->activeCP && rk->referenceTypeIndex != cp->lastRefKindIndex)
             continue;
+        if(bc->activeCP && rk->isInverse != cp->lastRefInverse)
+            continue;
 
         /* Reference in the right direction? */
         if(rk->isInverse && bd->browseDirection == UA_BROWSEDIRECTION_FORWARD)
@@ -743,11 +747,11 @@ browseWithNode(struct BrowseContext *bc, const UA_NodeHead *head ) {
                 bc->status = UA_NodePointer_copy(cp->lastTarget, &cp->lastTarget);
             return;
         }
-
-        /* Reset last-target to prevent clearing it up */
-        UA_NodePointer_init(&cp->lastTarget);
     }
 
+    /* Reset last-target to prevent clearing it up */
+    UA_NodePointer_init(&cp->lastTarget);
+
     /* Browsing the node is done */
     bc->done = true;
 }
@@ -915,6 +919,7 @@ Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxref
     cp2->lastTarget = cp.lastTarget; /* Move the (deep) copy */
     UA_NodePointer_init(&cp.lastTarget); /* No longer clear below (cleanup) */
     cp2->lastRefKindIndex = cp.lastRefKindIndex;
+    cp2->lastRefInverse = cp.lastRefInverse;
 
     /* Create a random bytestring via a Guid */
     ident = UA_Guid_new();

From dacddaf97704cc435374f9b69a0862af075cb63e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 25 Jun 2023 18:14:31 +0200
Subject: [PATCH 1012/1963] refactor(examples): Increase the minimum
 lifeTimeCountLimits in server_ctt to 100

Otherwise the CTT fail due to inprecise timing.
And it makes sense to be rather lenient with slow clients.
---
 examples/server_ctt.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 699da140b00..134934e5dfe 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1318,9 +1318,13 @@ int main(int argc, char **argv) {
     config.maxNodesPerNodeManagement = MAX_OPERATION_LIMIT;
     config.maxMonitoredItemsPerCall = MAX_OPERATION_LIMIT;
 
-    /* Set Subscription limits */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
+    /* Set Subscription limits */
     config.maxSubscriptions = 100;
+
+    /* Make the minimum lifetimecount larger.
+     * Otherwise we get unwanted timing effects in the CTT. */
+    config.lifeTimeCountLimits.min = 100;
 #endif
 
     /* If RequestTimestamp is '0', log the warning and proceed */

From 525aa31279a0f394004d0f06974b328491785402 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 25 Jun 2023 18:47:59 +0200
Subject: [PATCH 1013/1963] fix(plugin): Sessions can be (re)activated with
 different credentials

The CTT require this behavior.
---
 plugins/ua_accesscontrol_default.c | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 4db5667f638..cfa4e174552 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -60,16 +60,6 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
     if(userIdentityToken->encoding < UA_EXTENSIONOBJECT_DECODED)
         return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
-    /* If the session has been activated before, the same (decoded)
-     * UserIdentityToken must be used. */
-    if(*sessionContext) {
-        UA_ExtensionObject *oldUserIdentityToken = *(UA_ExtensionObject**)sessionContext;
-        if(UA_order(userIdentityToken, oldUserIdentityToken,
-                    &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) != UA_ORDER_EQ)
-            return UA_STATUSCODE_BADUSERACCESSDENIED;
-        return UA_STATUSCODE_GOOD;
-    }
-
     const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
     if(tokenType == &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
         /* Anonymous login */
@@ -133,25 +123,12 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
     }
 
-    /* Login successful. Store the token in the context. */
-    UA_ExtensionObject *tokenCopy = UA_ExtensionObject_new();
-    if(!tokenCopy)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    UA_StatusCode res = UA_ExtensionObject_copy(userIdentityToken, tokenCopy);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_ExtensionObject_delete(tokenCopy);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    *sessionContext = tokenCopy;
-
     return UA_STATUSCODE_GOOD;
 }
 
 static void
 closeSession_default(UA_Server *server, UA_AccessControl *ac,
                      const UA_NodeId *sessionId, void *sessionContext) {
-    if(sessionContext)
-        UA_ExtensionObject_delete((UA_ExtensionObject*)sessionContext);
 }
 
 static UA_UInt32
@@ -223,12 +200,7 @@ static UA_Boolean
 allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
                                   const UA_NodeId *oldSessionId, void *oldSessionContext,
                                   const UA_NodeId *newSessionId, void *newSessionContext) {
-    if(oldSessionContext == newSessionContext)
-        return true;
-    if(oldSessionContext && newSessionContext)
-        return (UA_order(oldSessionContext, newSessionContext,
-                         &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) == UA_ORDER_EQ);
-    return false;
+    return true;
 }
 #endif
 

From 44e25dc62d3f700cb4ced93e7f64da778566a4e4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 25 Jun 2023 18:55:56 +0200
Subject: [PATCH 1014/1963] refactor(examples): Allow 40 concurrent
 SecureChannels for CTT

---
 examples/server_ctt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 134934e5dfe..b29cbf72ae5 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1302,7 +1302,7 @@ int main(int argc, char **argv) {
         disableAnonymous(&config);
 
     /* Limit the number of SecureChannels and Sessions */
-    config.maxSecureChannels = 10;
+    config.maxSecureChannels = 40;
     config.maxSessions = 50;
 
     /* Revolve the SecureChannel token every 300 seconds */

From 66696402ae1eeaaed5b25aa585f35ddba9f0e95d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 25 Jun 2023 20:04:40 +0200
Subject: [PATCH 1015/1963] refactor(plugin): Remove usage of old networking
 API for Websockets

---
 examples/encryption/server_encryption.c       |  4 ---
 .../server_encryption_tpm_keystore.c          |  6 +---
 .../include/open62541/server_config_default.h | 18 -----------
 plugins/ua_config_default.c                   | 31 -------------------
 4 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/examples/encryption/server_encryption.c b/examples/encryption/server_encryption.c
index cec3c6f6d57..3e9f9cebc17 100644
--- a/examples/encryption/server_encryption.c
+++ b/examples/encryption/server_encryption.c
@@ -97,10 +97,6 @@ int main(int argc, char* argv[]) {
                                                        issuerList, issuerListSize,
                                                        revocationList, revocationListSize);
 
-    #ifdef UA_ENABLE_WEBSOCKET_SERVER
-    UA_ServerConfig_addNetworkLayerWS(UA_Server_getConfig(server), 7681, 0, 0, &certificate, &privateKey);
-    #endif
-
     UA_ByteString_clear(&certificate);
     UA_ByteString_clear(&privateKey);
     for(size_t i = 0; i < trustListSize; i++)
diff --git a/examples/encryption/server_encryption_tpm_keystore.c b/examples/encryption/server_encryption_tpm_keystore.c
index 24c38dea8c1..6c13960d8c8 100644
--- a/examples/encryption/server_encryption_tpm_keystore.c
+++ b/examples/encryption/server_encryption_tpm_keystore.c
@@ -407,10 +407,6 @@ int main(int argc, char* argv[]) {
                                                        issuerList, issuerListSize,
                                                        revocationList, revocationListSize);
 
-    #ifdef UA_ENABLE_WEBSOCKET_SERVER
-    UA_ServerConfig_addNetworkLayerWS(UA_Server_getConfig(server), 7681, 0, 0, &certificate, &privateKey);
-    #endif
-
     if (encrypt_out_data) {
         if (encrypt_out_data->data)
             UA_free(encrypt_out_data->data);
@@ -429,4 +425,4 @@ int main(int argc, char* argv[]) {
  cleanup:
     UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
-}
\ No newline at end of file
+}
diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index d5537dac83f..7394e354e97 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -109,24 +109,6 @@ UA_EXPORT UA_StatusCode
 UA_ServerConfig_setBasics_withPort(UA_ServerConfig *conf,
                                    UA_UInt16 portNumber);
 
-#ifdef UA_ENABLE_WEBSOCKET_SERVER
-/* Adds a Websocket network layer with custom buffer sizes
- *
- * @param conf The configuration to manipulate
- * @param portNumber The port number for the tcp network layer
- * @param sendBufferSize The size in bytes for the network send buffer. Pass 0
- *        to use defaults.
- * @param recvBufferSize The size in bytes for the network receive buffer.
- *        Pass 0 to use defaults.
- * @param certificate  certificate data. Pass NULL to disable WS security
- * @param privateKey   privateKey data. Pass NULL to disable WS security
- */
-
-UA_EXPORT UA_StatusCode
-UA_ServerConfig_addNetworkLayerWS(UA_ServerConfig *conf, UA_UInt16 portNumber,
-                                  UA_UInt32 sendBufferSize, UA_UInt32 recvBufferSize, const UA_ByteString* certificate, const UA_ByteString* privateKey);
-#endif
-
 /* Adds the security policy ``SecurityPolicy#None`` to the server. A
  * server certificate may be supplied but is optional.
  *
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 41c551452b1..31665bd2e28 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -15,9 +15,6 @@
 
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
-#ifdef UA_ENABLE_WEBSOCKET_SERVER
-#include <open62541/network_ws.h>
-#endif
 #include <open62541/plugin/accesscontrol_default.h>
 #include <open62541/plugin/nodestore_default.h>
 #include <open62541/plugin/log_stdout.h>
@@ -480,34 +477,6 @@ UA_ServerConfig_setBasics_withPort(UA_ServerConfig* conf, UA_UInt16 portNumber)
     return res;
 }
 
-#ifdef UA_ENABLE_WEBSOCKET_SERVER
-UA_EXPORT UA_StatusCode
-UA_ServerConfig_addNetworkLayerWS(UA_ServerConfig *conf, UA_UInt16 portNumber,
-                                   UA_UInt32 sendBufferSize, UA_UInt32 recvBufferSize, const UA_ByteString* certificate, const UA_ByteString* privateKey) {
-    /* Add a network layer */
-    UA_ServerNetworkLayer *tmp = (UA_ServerNetworkLayer *)
-        UA_realloc(conf->networkLayers,
-                   sizeof(UA_ServerNetworkLayer) * (1 + conf->networkLayersSize));
-    if(!tmp)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    conf->networkLayers = tmp;
-
-    UA_ConnectionConfig config = UA_ConnectionConfig_default;
-    if(sendBufferSize > 0)
-        config.sendBufferSize = sendBufferSize;
-    if(recvBufferSize > 0)
-        config.recvBufferSize = recvBufferSize;
-
-    conf->networkLayers[conf->networkLayersSize] =
-        UA_ServerNetworkLayerWS(config, portNumber, certificate, privateKey);
-    if(!conf->networkLayers[conf->networkLayersSize].handle)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    conf->networkLayersSize++;
-
-    return UA_STATUSCODE_GOOD;
-}
-#endif
-
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config,
                                       const UA_ByteString *certificate) {

From 3c3dc781037bb9e8064ab6597af1ce7ee8b05112 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 00:58:20 +0000
Subject: [PATCH 1016/1963] build(deps): bump deps/nodesetLoader from `2f45419`
 to `2af84b2`

Bumps [deps/nodesetLoader](https://github.com/open62541/nodesetLoader) from `2f45419` to `2af84b2`.
- [Release notes](https://github.com/open62541/nodesetLoader/releases)
- [Commits](https://github.com/open62541/nodesetLoader/compare/2f454192d7b920666c5c8a47e86beabc4fca3304...2af84b2da880461b103b9b02c65713d09a2195ed)

---
updated-dependencies:
- dependency-name: deps/nodesetLoader
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index 2f454192d7b..2af84b2da88 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit 2f454192d7b920666c5c8a47e86beabc4fca3304
+Subproject commit 2af84b2da880461b103b9b02c65713d09a2195ed

From d28de587cf19e59dd7b04a724720f030d204dd0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 15:01:37 +0000
Subject: [PATCH 1017/1963] build(deps): bump deps/ua-nodeset from `d9f4957` to
 `d1bb6a2`

Bumps [deps/ua-nodeset](https://github.com/OPCFoundation/UA-Nodeset) from `d9f4957` to `d1bb6a2`.
- [Commits](https://github.com/OPCFoundation/UA-Nodeset/compare/d9f49576eedb95f4ffaa731bad09779947b287f5...d1bb6a22125bd7cd986272b1ee98a18a91d76fff)

---
updated-dependencies:
- dependency-name: deps/ua-nodeset
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 deps/ua-nodeset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/ua-nodeset b/deps/ua-nodeset
index d9f49576eed..d1bb6a22125 160000
--- a/deps/ua-nodeset
+++ b/deps/ua-nodeset
@@ -1 +1 @@
-Subproject commit d9f49576eedb95f4ffaa731bad09779947b287f5
+Subproject commit d1bb6a22125bd7cd986272b1ee98a18a91d76fff

From dd54b8bbdbc8337edbbe2b27414124b62efc9e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Thu, 22 Jun 2023 10:44:04 +0000
Subject: [PATCH 1018/1963] fix(nodesetinjector): Extend Scales test

---
 .../add_node_integration_test/run_test.sh           |  2 ++
 tools/nodeset_injector/CMakeLists.txt               | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/tests/nodeset-loader/add_node_integration_test/run_test.sh b/tests/nodeset-loader/add_node_integration_test/run_test.sh
index e74454978f2..9917953923d 100644
--- a/tests/nodeset-loader/add_node_integration_test/run_test.sh
+++ b/tests/nodeset-loader/add_node_integration_test/run_test.sh
@@ -521,6 +521,8 @@ add_node_integration_test "Safety" \
 
 add_node_integration_test "Scales" \
     $UA_NODESET_PATH/DI/Opc.Ua.Di.NodeSet2.xml \
+    $UA_NODESET_PATH/Machinery/Opc.Ua.Machinery.NodeSet2.xml \
+    $UA_NODESET_PATH/PackML/Opc.Ua.PackML.NodeSet2.xml \
     $UA_NODESET_PATH/Scales/Opc.Ua.Scales.NodeSet2.xml
 
 add_node_integration_test "Sercos" \
diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
index 45a1e10d778..6c4936e171a 100644
--- a/tools/nodeset_injector/CMakeLists.txt
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -35,7 +35,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
     # only one xml file
     # di as dependency
     elseif(MODEL STREQUAL "AutoID" OR MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK"
-       OR MODEL STREQUAL "Scales" OR MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT"
+       OR MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT"
        OR MODEL STREQUAL "CommercialKitchenEquipment" OR MODEL STREQUAL "Machinery")
         # get csv file
         file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.csv")
@@ -119,6 +119,17 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 DEPENDS "machinery"
                 DEPENDS "ia"
         )
+        elseif(MODEL STREQUAL "Scales")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "machinery"
+                DEPENDS "packml"
+        )
     # Extra
     elseif(MODEL STREQUAL "DI")
         ua_generate_nodeset_and_datatypes(

From 9589144a4b343b1e458f953f9deae08ce2ed7e31 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 26 Jun 2023 17:30:10 +0200
Subject: [PATCH 1019/1963] fix(tests): Fix check_pubsub_sks_securitygroups.c
 if !UA_ENABLE_PUBSUB_INFORMATIONMODEL

---
 tests/pubsub/check_pubsub_sks_securitygroups.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/pubsub/check_pubsub_sks_securitygroups.c b/tests/pubsub/check_pubsub_sks_securitygroups.c
index 8125510cbe8..c5a1371dba9 100644
--- a/tests/pubsub/check_pubsub_sks_securitygroups.c
+++ b/tests/pubsub/check_pubsub_sks_securitygroups.c
@@ -157,8 +157,10 @@ START_TEST(AddSecurityGroupWithvalidConfig) {
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
     ck_assert(UA_NodeId_equal(&sg->securityGroupNodeId, &securityGroupNodeId) == UA_TRUE);
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     ck_assert(UA_NodeId_equal(&sg->securityGroupFolderId, &securityGroupParent) ==
               UA_TRUE);
+#endif
     ck_assert(UA_String_equal(&sg->securityGroupId, &config.securityGroupName) ==
               UA_TRUE);
     UA_UNLOCK(&server->serviceMutex);

From 36b3012358186bcc214df1c1bf5a53cda681c798 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 26 Jun 2023 11:17:26 +0200
Subject: [PATCH 1020/1963] fix(plugins): Return
 UA_STATUSCODE_BADIDENTITYTOKENREJECTED if Session certificate is invalid

---
 plugins/ua_accesscontrol_default.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index cfa4e174552..aadb3e58e72 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -117,7 +117,7 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
             verifyCertificate(&context->verifyX509,
                               &userToken->certificateData);
         if(res != UA_STATUSCODE_GOOD)
-            return res;
+            return UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
     } else {
         /* Unsupported token type */
         return UA_STATUSCODE_BADIDENTITYTOKENINVALID;

From 41b4b5e46d26bbd2ed9836d3994dad8217941d7a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 26 Jun 2023 13:52:20 +0200
Subject: [PATCH 1021/1963] refactor(server): Correct StatusCodes if user
 identity token is incorrect

---
 plugins/crypto/openssl/ua_pki_openssl.c | 2 +-
 src/server/ua_services_session.c        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 21e2855a2d5..279268dd683 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -419,7 +419,7 @@ UA_X509_Store_CTX_Error_To_UAError (int opensslErr) {
             ret = UA_STATUSCODE_BADCERTIFICATETIMEINVALID;
             break;
         case X509_V_ERR_CERT_REVOKED:
-            ret = UA_STATUSCODE_BADCERTIFICATEREVOKED;
+            ret = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
             break;
         case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
         case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index b0a766125a0..ed58a377cec 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -418,7 +418,7 @@ checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
                void *channelContext, const UA_ByteString *serverNonce, const UA_SignatureData *signature) {
     /* Check for zero signature length */
     if(signature->signature.length == 0)
-        return UA_STATUSCODE_BADAPPLICATIONSIGNATUREINVALID;
+        return UA_STATUSCODE_BADUSERSIGNATUREINVALID;
 
     if(!securityPolicy)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -438,6 +438,8 @@ checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
     retval = securityPolicy->certificateSigningAlgorithm.
         verify(channelContext, &dataToVerify, &signature->signature);
     UA_ByteString_clear(&dataToVerify);
+    if(retval != UA_STATUSCODE_GOOD)
+        retval = UA_STATUSCODE_BADUSERSIGNATUREINVALID;
     return retval;
 }
 

From 2d9bf66e1545ffd937dc14bbbbeb5461a7f1c2b9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 26 Jun 2023 13:53:37 +0200
Subject: [PATCH 1022/1963] feat(server): Use dedicate PKI for SecureChannel
 and Session certificates

---
 .../access_control/server_access_control.c    |   2 +-
 .../pubsub/sks/server_pubsub_central_sks.c    |  15 +-
 examples/server_ctt.c                         | 336 +++++++++++-------
 include/open62541/server.h                    |   4 +-
 plugins/crypto/openssl/ua_pki_openssl.c       |   2 +-
 .../open62541/plugin/accesscontrol_default.h  |   1 -
 plugins/ua_accesscontrol_default.c            |  36 +-
 plugins/ua_config_default.c                   |  35 +-
 src/server/ua_server.c                        |  12 +-
 src/server/ua_server_binary.c                 |   2 +-
 src/server/ua_server_config.c                 |   6 +-
 src/server/ua_services_session.c              |   2 +-
 .../ua_subscription_alarms_conditions.c       |   2 +-
 tests/client/check_client_authentication.c    |  14 +-
 tests/client/check_client_encryption.c        |   4 +-
 .../check_encryption_aes128sha256rsaoaep.c    |   5 +-
 .../check_encryption_basic128rsa15.c          |   5 +-
 tests/encryption/check_encryption_basic256.c  |   5 +-
 .../check_encryption_basic256sha256.c         |   5 +-
 tests/encryption/check_save_rejected_cert.c   |   8 +-
 20 files changed, 279 insertions(+), 222 deletions(-)

diff --git a/examples/access_control/server_access_control.c b/examples/access_control/server_access_control.c
index fbbf8107d3b..7e039f22d38 100644
--- a/examples/access_control/server_access_control.c
+++ b/examples/access_control/server_access_control.c
@@ -62,7 +62,7 @@ int main(void) {
 
     /* Disable anonymous logins, enable two user/password logins */
     config->accessControl.clear(&config->accessControl);
-    UA_StatusCode retval = UA_AccessControl_default(config, false, NULL,
+    UA_StatusCode retval = UA_AccessControl_default(config, false,
              &config->securityPolicies[config->securityPoliciesSize-1].policyUri, 2, logins);
     if(retval != UA_STATUSCODE_GOOD)
         goto cleanup;
diff --git a/examples/pubsub/sks/server_pubsub_central_sks.c b/examples/pubsub/sks/server_pubsub_central_sks.c
index daf91263b25..91a79c30d91 100644
--- a/examples/pubsub/sks/server_pubsub_central_sks.c
+++ b/examples/pubsub/sks/server_pubsub_central_sks.c
@@ -413,15 +413,20 @@ main(int argc, char **argv) {
         &config, port, &certificate, &privateKey, NULL, 0, NULL, 0, NULL, 0);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
-    config.certificateVerification.clear(&config.certificateVerification);
 #ifdef UA_ENABLE_CERT_REJECTED_DIR
-    res = UA_CertificateVerification_CertFolders(&config.certificateVerification,
+    res |= UA_CertificateVerification_CertFolders(&config.secureChannelPKI,
+                                                  trustlistFolder, issuerlistFolder,
+                                                  revocationlistFolder, NULL);
+    res |= UA_CertificateVerification_CertFolders(&config.sessionPKI,
                                                  trustlistFolder, issuerlistFolder,
                                                  revocationlistFolder, NULL);
 #else
-    res = UA_CertificateVerification_CertFolders(&config.certificateVerification,
-                                                 trustlistFolder, issuerlistFolder,
-                                                 revocationlistFolder);
+    res |= UA_CertificateVerification_CertFolders(&config.secureChannelPKI,
+                                                  trustlistFolder, issuerlistFolder,
+                                                  revocationlistFolder);
+    res |= UA_CertificateVerification_CertFolders(&config.sessionPKI,
+                                                  trustlistFolder, issuerlistFolder,
+                                                  revocationlistFolder);
 #endif
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index b29cbf72ae5..7002a903442 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1007,13 +1007,19 @@ usage(void) {
 #else
                    "server_ctt <server-certificate.der> <private-key.der>\n"
 #ifndef __linux__
-                   "\t[--trustlist <tl1.ctl> <tl2.ctl> ... ]\n"
-                   "\t[--issuerlist <il1.der> <il2.der> ... ]\n"
-                   "\t[--revocationlist <rv1.crl> <rv2.crl> ...]\n"
+                   "\t[--secureChannelTrustList <tl1.ctl> <tl2.ctl> ... ]\n"
+                   "\t[--secureChannelIssuerList <il1.der> <il2.der> ... ]\n"
+                   "\t[--secureChannelRevocationList <rv1.crl> <rv2.crl> ...]\n"
+                   "\t[--sessionTrustList <tl1.ctl> <tl2.ctl> ... ]\n"
+                   "\t[--sessionIssuerList <il1.der> <il2.der> ... ]\n"
+                   "\t[--sessionRevocationList <rv1.crl> <rv2.crl> ...]\n"
 #else
-                   "\t[--trustlistFolder <folder>]\n"
-                   "\t[--issuerlistFolder <folder>]\n"
-                   "\t[--revocationlistFolder <folder>]\n"
+                   "\t[--secureChannelTrustListFolder <folder>]\n"
+                   "\t[--secureChannelIssuerListFolder <folder>]\n"
+                   "\t[--secureChannelRevocationListFolder <folder>]\n"
+                   "\t[--sessionTrustListFolder <folder>]\n"
+                   "\t[--sessionIssuerListFolder <folder>]\n"
+                   "\t[--sessionRevocationListFolder <folder>]\n"
 #endif
                    "\t[--enableUnencrypted]\n"
                    "\t[--enableOutdatedSecurityPolicy]\n"
@@ -1037,9 +1043,6 @@ int main(int argc, char **argv) {
         }
     }
 
-    UA_ServerConfig config;
-    memset(&config, 0, sizeof(UA_ServerConfig));
-
     /* Load certificate */
     size_t pos = 1;
     UA_ByteString certificate = UA_BYTESTRING_NULL;
@@ -1074,16 +1077,25 @@ int main(int argc, char **argv) {
     UA_Boolean disableBasic256Sha256 = false;
 
 #ifndef __linux__
-    UA_ByteString trustList[100];
-    size_t trustListSize = 0;
-    UA_ByteString issuerList[100];
-    size_t issuerListSize = 0;
-    UA_ByteString revocationList[100];
-    size_t revocationListSize = 0;
+    UA_ByteString scTrustList[100];
+    size_t scTrustListSize = 0;
+    UA_ByteString scIssuerList[100];
+    size_t scIssuerListSize = 0;
+    UA_ByteString scRevocationList[100];
+    size_t scRevocationListSize = 0;
+    UA_ByteString sTrustList[100];
+    size_t sTrustListSize = 0;
+    UA_ByteString sIssuerList[100];
+    size_t sIssuerListSize = 0;
+    UA_ByteString sRevocationList[100];
+    size_t sRevocationListSize = 0;
 #else
-    const char *trustlistFolder = NULL;
-    const char *issuerlistFolder = NULL;
-    const char *revocationlistFolder = NULL;
+    const char *scTrustlistFolder = NULL;
+    const char *scIssuerlistFolder = NULL;
+    const char *scRevocationlistFolder = NULL;
+    const char *sTrustlistFolder = NULL;
+    const char *sIssuerlistFolder = NULL;
+    const char *sRevocationlistFolder = NULL;
 #endif /* __linux__ */
 
 #endif /* UA_ENABLE_ENCRYPTION */
@@ -1146,96 +1158,134 @@ int main(int argc, char **argv) {
         }
 
 #ifndef __linux__
-        if(strcmp(argv[pos], "--trustlist") == 0) {
+        if(strcmp(argv[pos], "--secureChannelTrustList") == 0) {
             filetype = 't';
             continue;
         }
 
-        if(strcmp(argv[pos], "--issuerlist") == 0) {
-            filetype = 'l';
+        if(strcmp(argv[pos], "--secureChannelIssuerList") == 0) {
+            filetype = 'i';
             continue;
         }
 
-        if(strcmp(argv[pos], "--revocationlist") == 0) {
+        if(strcmp(argv[pos], "--secureChannelRevocationList") == 0) {
             filetype = 'r';
             continue;
         }
 
-        if(filetype == 't') {
-            if(trustListSize >= 100) {
-                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                             "Too many trust lists");
-                return EXIT_FAILURE;
-            }
-            trustList[trustListSize] = loadFile(argv[pos]);
-            if(trustList[trustListSize].data == NULL) {
-                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                             "Unable to load trust list %s", argv[pos]);
-                return EXIT_FAILURE;
-            }
-            trustListSize++;
+        if(strcmp(argv[pos], "--sessionTrustList") == 0) {
+            filetype = 'T';
             continue;
         }
 
-        if(filetype == 'l') {
-            if(issuerListSize >= 100) {
-                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                             "Too many trust lists");
-                return EXIT_FAILURE;
-            }
-            issuerList[issuerListSize] = loadFile(argv[pos]);
-            if(issuerList[issuerListSize].data == NULL) {
-                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                             "Unable to load trust list %s", argv[pos]);
-                return EXIT_FAILURE;
-            }
-            issuerListSize++;
+        if(strcmp(argv[pos], "--sessionIssuerList") == 0) {
+            filetype = 'I';
             continue;
         }
 
-        if(filetype == 'r') {
-            if(revocationListSize >= 100) {
-                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                             "Too many revocation lists");
-                return EXIT_FAILURE;
-            }
-            revocationList[revocationListSize] = loadFile(argv[pos]);
-            if(revocationList[revocationListSize].data == NULL) {
-                UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                             "Unable to load revocationlist %s", argv[pos]);
-                return EXIT_FAILURE;
-            }
-            revocationListSize++;
+        if(strcmp(argv[pos], "--sessionRevocationList") == 0) {
+            filetype = 'R';
             continue;
         }
+
+        UA_ByteString *list;
+        size_t *listSize;
+        if(filetype == 't') {
+            list = scTrustList;
+            listSize = &scTrustListSize;
+        } else if(filetype == 'i') {
+            list = scIssuerList;
+            listSize = &scIssuerListSize;
+        } else if(filetype == 'r') {
+            list = scRevocationList;
+            listSize = &scRevocationListSize;
+        } else if(filetype == 'T') {
+            list = sTrustList;
+            listSize = &sTrustListSize;
+        } else if(filetype == 'I') {
+            list = sIssuerList;
+            listSize = &sIssuerListSize;
+        } else if(filetype == 'R') {
+            list = sRevocationList;
+            listSize = &sRevocationListSize;
+        } else {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Unknown certificate list");
+            return EXIT_FAILURE;
+        }
+
+        if(*listSize >= 100) {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Certificate list too large");
+            return EXIT_FAILURE;
+        }
+        list[*listSize] = loadFile(argv[pos]);
+        if(list[*listSize].data == NULL) {
+            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                         "Unable to load certificate %s", argv[pos]);
+            continue;
+        }
+        scTrustListSize++;
+        continue;
+
 #else /* __linux__ */
-        if(strcmp(argv[pos], "--trustlistFolder") == 0) {
+        if(strcmp(argv[pos], "--secureChannelTrustListFolder") == 0) {
             filetype = 't';
             continue;
         }
 
-        if(strcmp(argv[pos], "--issuerlistFolder") == 0) {
-            filetype = 'l';
+        if(strcmp(argv[pos], "--secureChannelIssuerListFolder") == 0) {
+            filetype = 'i';
             continue;
         }
 
-        if(strcmp(argv[pos], "--revocationlistFolder") == 0) {
+        if(strcmp(argv[pos], "--secureChannelRevocationListFolder") == 0) {
             filetype = 'r';
             continue;
         }
 
+        if(strcmp(argv[pos], "--sessionTrustListFolder") == 0) {
+            filetype = 'T';
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--sessionIssuerListFolder") == 0) {
+            filetype = 'I';
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--sessionRevocationListFolder") == 0) {
+            filetype = 'R';
+            continue;
+        }
+
         if(filetype == 't') {
-            trustlistFolder = argv[pos];
+            scTrustlistFolder = argv[pos];
             continue;
         }
 
-        if(filetype == 'l') {
-            issuerlistFolder = argv[pos];
+        if(filetype == 'i') {
+            scIssuerlistFolder = argv[pos];
             continue;
         }
 
         if(filetype == 'r') {
-            revocationlistFolder = argv[pos];
+            scRevocationlistFolder = argv[pos];
+            continue;
+        }
+
+        if(filetype == 'T') {
+            sTrustlistFolder = argv[pos];
+            continue;
+        }
+
+        if(filetype == 'I') {
+            sIssuerlistFolder = argv[pos];
+            continue;
+        }
+
+        if(filetype == 'R') {
+            sRevocationlistFolder = argv[pos];
             continue;
         }
 #endif /* __linux__ */
@@ -1246,127 +1296,141 @@ int main(int argc, char **argv) {
         return EXIT_FAILURE;
     }
 
-    UA_Server *server = NULL;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
 
-#ifdef UA_ENABLE_ENCRYPTION
-#ifndef __linux__
-    UA_StatusCode res =
-        UA_ServerConfig_setDefaultWithSecurityPolicies(&config, 4840,
-                                                       &certificate, &privateKey,
-                                                       trustList, trustListSize,
-                                                       issuerList, issuerListSize,
-                                                       revocationList, revocationListSize);
-    if(res != UA_STATUSCODE_GOOD)
+    UA_Server *server = UA_Server_new();
+    if(!server) {
+        res = UA_STATUSCODE_BADINTERNALERROR;
         goto cleanup;
-#else /* On Linux we can monitor the certs folder and reload when changes are made */
-    UA_StatusCode res =
-        UA_ServerConfig_setDefaultWithSecurityPolicies(&config, 4840,
-                                                       &certificate, &privateKey,
-                                                       NULL, 0, NULL, 0, NULL, 0);
+    }
+
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    /* Load PKI */
+#ifdef UA_ENABLE_ENCRYPTION
+    res = UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840,
+                                                         &certificate, &privateKey,
+                                                         NULL, 0, NULL, 0, NULL, 0);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
-    config.certificateVerification.clear(&config.certificateVerification);
-#ifdef UA_ENABLE_CERT_REJECTED_DIR
-    res = UA_CertificateVerification_CertFolders(&config.certificateVerification,
-                                                 trustlistFolder, issuerlistFolder,
-                                                 revocationlistFolder, NULL);
+#ifndef __linux__
+    res |= UA_CertificateVerification_Trustlist(&config->secureChannelPKI,
+                                                scTrustList, scTrustListSize,
+                                                scIssuerList, scIssuerListSize,
+                                                scRevocationList, scRevocationListSize);
+    res |= UA_CertificateVerification_Trustlist(&config->sessionPKI,
+                                                sTrustList, sTrustListSize,
+                                                sIssuerList, sIssuerListSize,
+                                                sRevocationList, sRevocationListSize);
 #else
-    res = UA_CertificateVerification_CertFolders(&config.certificateVerification,
-                                                 trustlistFolder, issuerlistFolder,
-                                                 revocationlistFolder);
-#endif
+    /* On Linux we can monitor the certs folder and reload when changes are made */
+# ifdef UA_ENABLE_CERT_REJECTED_DIR
+    res |= UA_CertificateVerification_CertFolders(&config->secureChannelPKI,
+                                                 scTrustlistFolder, scIssuerlistFolder,
+                                                 scRevocationlistFolder, NULL);
+    res |= UA_CertificateVerification_CertFolders(&config->sessionPKI,
+                                                  sTrustlistFolder, sIssuerlistFolder,
+                                                  sRevocationlistFolder, NULL);
+# else
+    res |= UA_CertificateVerification_CertFolders(&config->secureChannelPKI,
+                                                  scTrustlistFolder, scIssuerlistFolder,
+                                                  scRevocationlistFolder);
+    res |= UA_CertificateVerification_CertFolders(&config->sessionPKI,
+                                                  sTrustlistFolder, sIssuerlistFolder,
+                                                  sRevocationlistFolder);
+# endif
+#endif /* __linux__ */
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
-#endif /* __linux__ */
 
     if(!enableUnencr)
-        disableUnencrypted(&config);
+        disableUnencrypted(config);
     if(!enableSec)
-        disableOutdatedSecurityPolicy(&config);
+        disableOutdatedSecurityPolicy(config);
 
     if(disableBasic128)
-        disableBasic128SecurityPolicy(&config);
+        disableBasic128SecurityPolicy(config);
     if(disableBasic256)
-        disableBasic256SecurityPolicy(&config);
+        disableBasic256SecurityPolicy(config);
     if(disableBasic256Sha256)
-        disableBasic256Sha256SecurityPolicy(&config);
+        disableBasic256Sha256SecurityPolicy(config);
 
 #else /* UA_ENABLE_ENCRYPTION */
-    UA_StatusCode res =
-        UA_ServerConfig_setMinimal(&config, 4840, &certificate);
+    res = UA_ServerConfig_setMinimal(config, 4840, &certificate);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 #endif /* UA_ENABLE_ENCRYPTION */
 
     if(!enableAnon)
-        disableAnonymous(&config);
+        disableAnonymous(config);
 
     /* Limit the number of SecureChannels and Sessions */
-    config.maxSecureChannels = 40;
-    config.maxSessions = 50;
+    config->maxSecureChannels = 40;
+    config->maxSessions = 50;
 
     /* Revolve the SecureChannel token every 300 seconds */
-    config.maxSecurityTokenLifetime = 300000;
+    config->maxSecurityTokenLifetime = 300000;
 
     /* Set operation limits */
-    config.maxNodesPerRead = MAX_OPERATION_LIMIT;
-    config.maxNodesPerWrite = MAX_OPERATION_LIMIT;
-    config.maxNodesPerMethodCall = MAX_OPERATION_LIMIT;
-    config.maxNodesPerBrowse = MAX_OPERATION_LIMIT;
-    config.maxNodesPerRegisterNodes = MAX_OPERATION_LIMIT;
-    config.maxNodesPerTranslateBrowsePathsToNodeIds = MAX_OPERATION_LIMIT;
-    config.maxNodesPerNodeManagement = MAX_OPERATION_LIMIT;
-    config.maxMonitoredItemsPerCall = MAX_OPERATION_LIMIT;
+    config->maxNodesPerRead = MAX_OPERATION_LIMIT;
+    config->maxNodesPerWrite = MAX_OPERATION_LIMIT;
+    config->maxNodesPerMethodCall = MAX_OPERATION_LIMIT;
+    config->maxNodesPerBrowse = MAX_OPERATION_LIMIT;
+    config->maxNodesPerRegisterNodes = MAX_OPERATION_LIMIT;
+    config->maxNodesPerTranslateBrowsePathsToNodeIds = MAX_OPERATION_LIMIT;
+    config->maxNodesPerNodeManagement = MAX_OPERATION_LIMIT;
+    config->maxMonitoredItemsPerCall = MAX_OPERATION_LIMIT;
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     /* Set Subscription limits */
-    config.maxSubscriptions = 100;
+    config->maxSubscriptions = 100;
 
     /* Make the minimum lifetimecount larger.
      * Otherwise we get unwanted timing effects in the CTT. */
-    config.lifeTimeCountLimits.min = 100;
+    config->lifeTimeCountLimits.min = 100;
 #endif
 
     /* If RequestTimestamp is '0', log the warning and proceed */
-    config.verifyRequestTimestamp = UA_RULEHANDLING_WARN;
+    config->verifyRequestTimestamp = UA_RULEHANDLING_WARN;
     if(enableTime)
-        config.verifyRequestTimestamp = UA_RULEHANDLING_DEFAULT;
+        config->verifyRequestTimestamp = UA_RULEHANDLING_DEFAULT;
 
     /* Override with a custom access control policy */
-    config.accessControl.getUserAccessLevel = getUserAccessLevel_disallowSpecific;
-    UA_String_clear(&config.applicationDescription.applicationUri);
-    config.applicationDescription.applicationUri =
+    config->accessControl.getUserAccessLevel = getUserAccessLevel_disallowSpecific;
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
         UA_String_fromChars("urn:open62541.server.application");
 
-    config.shutdownDelay = 5000.0; /* 5s */
+    config->shutdownDelay = 5000.0; /* 5s */
 
-    server = UA_Server_newWithConfig(&config);
-    if(!server) {
-        res = UA_STATUSCODE_BADINTERNALERROR;
-        goto cleanup;
-    }
+    UA_ServerConfig_addAllEndpoints(config);
 
     setInformationModel(server);
 
+
     /* run server */
     res = UA_Server_run(server, &running);
 
  cleanup:
-    if(server)
-        UA_Server_delete(server);
-    else
-        UA_ServerConfig_clean(&config);
+    UA_Server_delete(server);
 
     UA_ByteString_clear(&certificate);
 #if defined(UA_ENABLE_ENCRYPTION)
     UA_ByteString_clear(&privateKey);
 #ifndef __linux__
-    for(size_t i = 0; i < trustListSize; i++)
-        UA_ByteString_clear(&trustList[i]);
-    for(size_t i = 0; i < issuerListSize; i++)
-        UA_ByteString_clear(&issuerList[i]);
-    for(size_t i = 0; i < revocationListSize; i++)
-        UA_ByteString_clear(&revocationList[i]);
+    for(size_t i = 0; i < scTrustListSize; i++)
+        UA_ByteString_clear(&scTrustList[i]);
+    for(size_t i = 0; i < scIssuerListSize; i++)
+        UA_ByteString_clear(&scIssuerList[i]);
+    for(size_t i = 0; i < scRevocationListSize; i++)
+        UA_ByteString_clear(&scRevocationList[i]);
+
+    for(size_t i = 0; i < sTrustListSize; i++)
+        UA_ByteString_clear(&sTrustList[i]);
+    for(size_t i = 0; i < sIssuerListSize; i++)
+        UA_ByteString_clear(&sIssuerList[i]);
+    for(size_t i = 0; i < sRevocationListSize; i++)
+        UA_ByteString_clear(&sRevocationList[i]);
 #endif
 #endif
 
diff --git a/include/open62541/server.h b/include/open62541/server.h
index d963ed227d9..2bfe812feb2 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -201,7 +201,9 @@ struct UA_ServerConfig {
      * securityPolicies list. */
     UA_Boolean securityPolicyNoneDiscoveryOnly;
 
-    UA_CertificateVerification certificateVerification;
+    /* Different sets of certificates are trusted for SecureChannel / Session */
+    UA_CertificateVerification secureChannelPKI;
+    UA_CertificateVerification sessionPKI;
 
     /**
      * See the section for :ref:`access-control
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 279268dd683..21e2855a2d5 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -419,7 +419,7 @@ UA_X509_Store_CTX_Error_To_UAError (int opensslErr) {
             ret = UA_STATUSCODE_BADCERTIFICATETIMEINVALID;
             break;
         case X509_V_ERR_CERT_REVOKED:
-            ret = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+            ret = UA_STATUSCODE_BADCERTIFICATEREVOKED;
             break;
         case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
         case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
diff --git a/plugins/include/open62541/plugin/accesscontrol_default.h b/plugins/include/open62541/plugin/accesscontrol_default.h
index 0af5e271b28..c5d90f27c93 100644
--- a/plugins/include/open62541/plugin/accesscontrol_default.h
+++ b/plugins/include/open62541/plugin/accesscontrol_default.h
@@ -29,7 +29,6 @@ typedef struct {
 UA_EXPORT UA_StatusCode
 UA_AccessControl_default(UA_ServerConfig *config,
                          UA_Boolean allowAnonymous,
-                         UA_CertificateVerification *verifyX509,
                          const UA_ByteString *userTokenPolicyUri,
                          size_t usernamePasswordLoginSize,
                          const UA_UsernamePasswordLogin *usernamePasswordLogin);
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index aadb3e58e72..28023a11bef 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -21,7 +21,6 @@ typedef struct {
     UA_Boolean allowAnonymous;
     size_t usernamePasswordLoginSize;
     UA_UsernamePasswordLogin *usernamePasswordLogin;
-    UA_CertificateVerification verifyX509;
 } AccessControlContext;
 
 #define ANONYMOUS_POLICY "open62541-anonymous-policy"
@@ -43,6 +42,7 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
                         const UA_ExtensionObject *userIdentityToken,
                         void **sessionContext) {
     AccessControlContext *context = (AccessControlContext*)ac->context;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
 
     /* The empty token is interpreted as anonymous */
     UA_AnonymousIdentityToken anonToken;
@@ -110,12 +110,11 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         if(!UA_String_equal(&userToken->policyId, &certificate_policy))
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
-        if(!context->verifyX509.verifyCertificate)
+        if(!config->sessionPKI.verifyCertificate)
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
-        UA_StatusCode res = context->verifyX509.
-            verifyCertificate(&context->verifyX509,
-                              &userToken->certificateData);
+       UA_StatusCode res = config->sessionPKI.
+            verifyCertificate(&config->sessionPKI, &userToken->certificateData);
         if(res != UA_STATUSCODE_GOOD)
             return UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
     } else {
@@ -246,9 +245,6 @@ static void clear_default(UA_AccessControl *ac) {
         if(context->usernamePasswordLoginSize > 0)
             UA_free(context->usernamePasswordLogin);
 
-        if(context->verifyX509.clear)
-            context->verifyX509.clear(&context->verifyX509);
-
         UA_free(ac->context);
         ac->context = NULL;
     }
@@ -257,7 +253,6 @@ static void clear_default(UA_AccessControl *ac) {
 UA_StatusCode
 UA_AccessControl_default(UA_ServerConfig *config,
                          UA_Boolean allowAnonymous,
-                         UA_CertificateVerification *verifyX509,
                          const UA_ByteString *userTokenPolicyUri,
                          size_t usernamePasswordLoginSize,
                          const UA_UsernamePasswordLogin *usernamePasswordLogin) {
@@ -305,23 +300,6 @@ UA_AccessControl_default(UA_ServerConfig *config,
                     "AccessControl: Anonymous login is enabled");
     }
 
-    if(config->logging == NULL) {
-        config->logging = &config->logger;
-    }
-    /* Allow x509 certificates? Move the plugin over. */
-    if(verifyX509) {
-        context->verifyX509 = *verifyX509;
-        memset(verifyX509, 0, sizeof(UA_CertificateVerification));
-        if(context->verifyX509.logging == NULL) {
-            context->verifyX509.logging = &config->logging;
-        }
-    } else {
-        memset(&context->verifyX509, 0, sizeof(UA_CertificateVerification));
-        context->verifyX509.logging = &config->logging;
-        UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_SERVER,
-                    "AccessControl: x509 certificate user authentication is enabled");
-    }
-
     /* Copy username/password to the access control plugin */
     if(usernamePasswordLoginSize > 0) {
         context->usernamePasswordLogin = (UA_UsernamePasswordLogin*)
@@ -341,10 +319,10 @@ UA_AccessControl_default(UA_ServerConfig *config,
     size_t policies = 0;
     if(allowAnonymous)
         policies++;
-    if(verifyX509)
-        policies++;
     if(usernamePasswordLoginSize > 0)
         policies++;
+    if(config->sessionPKI.verifyCertificate)
+        policies++;
     ac->userTokenPoliciesSize = 0;
     ac->userTokenPolicies = (UA_UserTokenPolicy *)
         UA_Array_new(policies, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
@@ -359,7 +337,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
         policies++;
     }
 
-    if(verifyX509) {
+    if(config->sessionPKI.verifyCertificate) {
         ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_CERTIFICATE;
         ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(CERTIFICATE_POLICY);
 #if UA_LOGLEVEL <= 400
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 31665bd2e28..cf9667ed532 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -386,14 +386,16 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     /* Endpoints */
     /* conf->endpoints = {0, NULL}; */
 
-    if(!conf->certificateVerification.logging) {
-        /* Set Logger for Certificate Verification */
-        conf->certificateVerification.logging = &conf->logging;
-   }
+    /* Set Logger for Certificate Verification */
+    if(!conf->secureChannelPKI.logging)
+        conf->secureChannelPKI.logging = &conf->logging;
+    if(!conf->sessionPKI.logging)
+        conf->sessionPKI.logging = &conf->logging;
 
     /* Certificate Verification that accepts every certificate. Can be
      * overwritten when the policy is specialized. */
-    UA_CertificateVerification_AcceptAll(&conf->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&conf->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&conf->sessionPKI);
 
     /* * Global Node Lifecycle * */
     /* conf->nodeLifecycle.constructor = NULL; */
@@ -574,7 +576,7 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
     }
 
     /* Initialize the Access Control plugin */
-    retval = UA_AccessControl_default(config, true, NULL,
+    retval = UA_AccessControl_default(config, true,
                                       &config->securityPolicies[config->securityPoliciesSize-1].policyUri,
                                       usernamePasswordsSize, usernamePasswords);
     if(retval != UA_STATUSCODE_GOOD) {
@@ -803,11 +805,18 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
         return retval;
     }
 
-    retval = UA_CertificateVerification_Trustlist(&conf->certificateVerification,
+    retval = UA_CertificateVerification_Trustlist(&conf->sessionPKI,
                                                   trustList, trustListSize,
                                                   issuerList, issuerListSize,
                                                   revocationList, revocationListSize);
-    if (retval != UA_STATUSCODE_GOOD)
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    retval = UA_CertificateVerification_Trustlist(&conf->secureChannelPKI,
+                                                  trustList, trustListSize,
+                                                  issuerList, issuerListSize,
+                                                  revocationList, revocationListSize);
+    if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
     retval = UA_ServerConfig_addAllSecurityPolicies(conf, certificate, privateKey);
@@ -816,15 +825,8 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
         return retval;
     }
 
-    UA_CertificateVerification accessControlVerification;
-    memset(&accessControlVerification, 0, sizeof(accessControlVerification));
-    accessControlVerification.logging = &conf->logging;
-    retval = UA_CertificateVerification_Trustlist(&accessControlVerification,
-                                                  trustList, trustListSize,
-                                                  issuerList, issuerListSize,
-                                                  revocationList, revocationListSize);
     if(retval == UA_STATUSCODE_GOOD) {
-        retval = UA_AccessControl_default(conf, true, &accessControlVerification,
+        retval = UA_AccessControl_default(conf, true,
                     &conf->securityPolicies[conf->securityPoliciesSize-1].policyUri,
                     usernamePasswordsSize, usernamePasswords);
     }
@@ -907,7 +909,6 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
         config->localConnectionConfig = UA_ConnectionConfig_default;
 
     if(!config->certificateVerification.logging) {
-        /* Set Logger for Certificate Verification */
         config->certificateVerification.logging = &config->logging;
     }
 
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index a0a7eff4ec1..f4954f7e37f 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -448,8 +448,12 @@ UA_Server_newWithConfig(UA_ServerConfig *config) {
         /* re-set the logger pointer */
         server->config.logging = &server->config.logger;
     }
-    if(server->config.certificateVerification.logging == &config->logging)
-        server->config.certificateVerification.logging = &server->config.logging;
+    if(!server->config.secureChannelPKI.logging ||
+       server->config.secureChannelPKI.logging == &config->logging)
+        server->config.secureChannelPKI.logging = &server->config.logging;
+    if(!server->config.sessionPKI.logging ||
+       server->config.sessionPKI.logging == &config->logging)
+        server->config.sessionPKI.logging = &server->config.logging;
 
     /* Reset the old config */
     memset(config, 0, sizeof(UA_ServerConfig));
@@ -623,8 +627,8 @@ verifyServerApplicationURI(const UA_Server *server) {
         UA_SecurityPolicy *sp = &server->config.securityPolicies[i];
         if(UA_String_equal(&sp->policyUri, &securityPolicyNoneUri) && (sp->localCertificate.length == 0))
             continue;
-        UA_StatusCode retval = server->config.certificateVerification.
-            verifyApplicationURI(&server->config.certificateVerification,
+        UA_StatusCode retval = server->config.secureChannelPKI.
+            verifyApplicationURI(&server->config.secureChannelPKI,
                                  &sp->localCertificate,
                                  &server->config.applicationDescription.applicationUri);
 
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 45ffff0e932..b04a1a2c9fe 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1117,7 +1117,7 @@ createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *c
     /* Set up the new SecureChannel */
     UA_SecureChannel_init(&entry->channel);
     entry->channel.config = connConfig;
-    entry->channel.certificateVerification = &config->certificateVerification;
+    entry->channel.certificateVerification = &config->secureChannelPKI;
     entry->channel.processOPNHeader = configServerSecureChannel;
     entry->channel.connectionManager = cm;
     entry->channel.connectionId = connectionId;
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index cbc77534265..f6b80a8d68a 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -71,8 +71,10 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
     }
 
     /* Certificate Validation */
-    if(config->certificateVerification.clear)
-        config->certificateVerification.clear(&config->certificateVerification);
+    if(config->secureChannelPKI.clear)
+        config->secureChannelPKI.clear(&config->secureChannelPKI);
+    if(config->sessionPKI.clear)
+        config->sessionPKI.clear(&config->sessionPKI);
 
     /* Access Control */
     if(config->accessControl.clear)
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index ed58a377cec..fc6664c2d3b 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -293,7 +293,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
     }
 
     if(request->clientCertificate.length > 0) {
-        UA_CertificateVerification *cv = &server->config.certificateVerification;
+        UA_CertificateVerification *cv = &server->config.sessionPKI;
         response->responseHeader.serviceResult =
             cv->verifyApplicationURI(cv, &request->clientCertificate,
                                      &request->clientDescription.applicationUri);
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 731b6df0063..02c7f21837a 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -3125,7 +3125,7 @@ UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_CertificateVerification *cv = &server->config.certificateVerification;
+    UA_CertificateVerification *cv = &server->config.sessionPKI;
     UA_DateTime getExpiryDateAndTime;
     if(cv == NULL && cv->getExpirationDate == NULL) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
diff --git a/tests/client/check_client_authentication.c b/tests/client/check_client_authentication.c
index 5a039e09a4e..e827ed2deab 100644
--- a/tests/client/check_client_authentication.c
+++ b/tests/client/check_client_authentication.c
@@ -48,14 +48,14 @@ static void setup(void) {
     privateKey.data = SERVER_KEY_DER_DATA;
 
     /* Load client certificate for authentication */
-    UA_ByteString certificate_client;
-    certificate_client.length = CLIENT_CERT_AUTH_DER_LENGTH;
-    certificate_client.data = CLIENT_CERT_AUTH_DER_DATA;
+    UA_ByteString certificate_client_auth;
+    certificate_client_auth.length = CLIENT_CERT_AUTH_DER_LENGTH;
+    certificate_client_auth.data = CLIENT_CERT_AUTH_DER_DATA;
 
     /* Add client certificate to the trust list */
     size_t trustListSize = 1;
     UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
-    trustList[0] = certificate_client;
+    trustList[0] = certificate_client_auth;
     size_t issuerListSize = 0;
     UA_ByteString *issuerList = NULL;
     UA_ByteString *revocationList = NULL;
@@ -69,8 +69,7 @@ static void setup(void) {
                                                    issuerList, issuerListSize,
                                                    revocationList, revocationListSize);
 
-    config->certificateVerification.clear(&config->certificateVerification);
-    UA_CertificateVerification_AcceptAll(&config->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
 
     UA_Server_run_startup(server);
     THREAD_CREATE(server_thread, serverloop);
@@ -115,8 +114,7 @@ START_TEST(Client_connect_certificate) {
 
     /* Set the ApplicationUri used in the certificate */
     UA_String_clear(&cc->clientDescription.applicationUri);
-    //cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
-    cc->clientDescription.applicationUri = UA_STRING_ALLOC("http://test.de/root");
+    cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
 
     UA_ClientConfig_setAuthenticationCert(cc, certificateAuth, privateKeyAuth);
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
diff --git a/tests/client/check_client_encryption.c b/tests/client/check_client_encryption.c
index 51b1a9ca4df..f4a5073b6a9 100644
--- a/tests/client/check_client_encryption.c
+++ b/tests/client/check_client_encryption.c
@@ -63,8 +63,8 @@ static void setup(void) {
                                                    issuerList, issuerListSize,
                                                    revocationList, revocationListSize);
 
-    config->certificateVerification.clear(&config->certificateVerification);
-    UA_CertificateVerification_AcceptAll(&config->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config->sessionPKI);
 
     /* Set the ApplicationUri used in the certificate */
     UA_String_clear(&config->applicationDescription.applicationUri);
diff --git a/tests/encryption/check_encryption_aes128sha256rsaoaep.c b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
index 843a3d06882..e2ac183ab98 100644
--- a/tests/encryption/check_encryption_aes128sha256rsaoaep.c
+++ b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
@@ -75,8 +75,9 @@ static void setup(void) {
                                                    trustList, trustListSize,
                                                    issuerList, issuerListSize,
                                                    revocationList, revocationListSize);
-    config->certificateVerification.clear(&config->certificateVerification);
-    UA_CertificateVerification_AcceptAll(&config->certificateVerification);
+
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config->sessionPKI);
 
     /* Set the ApplicationUri used in the certificate */
     UA_String_clear(&config->applicationDescription.applicationUri);
diff --git a/tests/encryption/check_encryption_basic128rsa15.c b/tests/encryption/check_encryption_basic128rsa15.c
index aa907cd3dec..6323a43f322 100644
--- a/tests/encryption/check_encryption_basic128rsa15.c
+++ b/tests/encryption/check_encryption_basic128rsa15.c
@@ -72,8 +72,9 @@ static void setup(void) {
                                                    trustList, trustListSize,
                                                    issuerList, issuerListSize,
                                                    revocationList, revocationListSize);
-    config->certificateVerification.clear(&config->certificateVerification);
-    UA_CertificateVerification_AcceptAll(&config->certificateVerification);
+
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config->sessionPKI);
 
     /* Set the ApplicationUri used in the certificate */
     UA_String_clear(&config->applicationDescription.applicationUri);
diff --git a/tests/encryption/check_encryption_basic256.c b/tests/encryption/check_encryption_basic256.c
index bf8b3128206..55a5982656d 100644
--- a/tests/encryption/check_encryption_basic256.c
+++ b/tests/encryption/check_encryption_basic256.c
@@ -75,8 +75,9 @@ static void setup(void) {
                                                    trustList, trustListSize,
                                                    issuerList, issuerListSize,
                                                    revocationList, revocationListSize);
-    config->certificateVerification.clear(&config->certificateVerification);
-    UA_CertificateVerification_AcceptAll(&config->certificateVerification);
+
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config->sessionPKI);
 
     /* Set the ApplicationUri used in the certificate */
     UA_String_clear(&config->applicationDescription.applicationUri);
diff --git a/tests/encryption/check_encryption_basic256sha256.c b/tests/encryption/check_encryption_basic256sha256.c
index 9b4aee20a60..125c6c041ab 100644
--- a/tests/encryption/check_encryption_basic256sha256.c
+++ b/tests/encryption/check_encryption_basic256sha256.c
@@ -75,8 +75,9 @@ static void setup(void) {
                                                    trustList, trustListSize,
                                                    issuerList, issuerListSize,
                                                    revocationList, revocationListSize);
-    config->certificateVerification.clear(&config->certificateVerification);
-    UA_CertificateVerification_AcceptAll(&config->certificateVerification);
+
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config->sessionPKI);
 
     /* Set the ApplicationUri used in the certificate */
     UA_String_clear(&config->applicationDescription.applicationUri);
diff --git a/tests/encryption/check_save_rejected_cert.c b/tests/encryption/check_save_rejected_cert.c
index c0d60af9711..301e62f8007 100644
--- a/tests/encryption/check_save_rejected_cert.c
+++ b/tests/encryption/check_save_rejected_cert.c
@@ -389,10 +389,10 @@ static void setup(void) {
                                                        NULL, 0, NULL, 0, NULL, 0);
     ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
 
-    config->certificateVerification.clear(&config->certificateVerification);
-    res = UA_CertificateVerification_CertFolders(&config->certificateVerification,
-                                                 NULL, NULL,
-                                                 NULL, ".");
+    res |= UA_CertificateVerification_CertFolders(&config->secureChannelPKI,
+                                                  NULL, NULL, NULL, ".");
+    res |= UA_CertificateVerification_CertFolders(&config->sessionPKI,
+                                                  NULL, NULL, NULL, ".");
     ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
 #endif /* __linux__ */
 

From fdedfe087299a80f06f8dc089ed59a2721fe6330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?An=C5=BEe=20=C5=A0kerjanc?= <anze.skerjanc@dewesoft.com>
Date: Mon, 26 Jun 2023 14:20:42 +0200
Subject: [PATCH 1023/1963] fix(core): Fix the order of parameters for MSVC

The intrinsic function InterlockedCompareExchangePointer
expects the parameters in a different order.

PVOID InterlockedCompareExchangePointer(
  [in, out] PVOID volatile *Destination,
  [in]      PVOID          Exchange,
  [in]      PVOID          Comperand
);
---
 include/open62541/config.h.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 49c8ef540e8..e626fbe59b3 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -233,7 +233,7 @@ UA_atomic_xchg(void * volatile * addr, void *newptr) {
 static UA_INLINE void *
 UA_atomic_cmpxchg(void * volatile * addr, void *expected, void *newptr) {
 #if UA_MULTITHREADING >= 100 && defined(_WIN32) /* Visual Studio */
-    return InterlockedCompareExchangePointer(addr, expected, newptr);
+    return InterlockedCompareExchangePointer(addr, newptr, expected);
 #elif UA_MULTITHREADING >= 100 && defined(__GNUC__) /* GCC/Clang */
     return __sync_val_compare_and_swap(addr, expected, newptr);
 #else

From 0f055942b71d74f417cbfbcc4095deddd744ea40 Mon Sep 17 00:00:00 2001
From: basyskom-dege <72982549+basyskom-dege@users.noreply.github.com>
Date: Thu, 29 Jun 2023 11:14:04 +0200
Subject: [PATCH 1024/1963] feat(CI): Added support for arguments in the
 examples workflow (#5760)

* CI: Added support for arguments in the examples workflow

* Fixed memory leaks in examples. Add ApplicationUri

* Arguments and server/client for all examples. Small fixes

* outsource/blacklist some examples. Fix memory leak in example.

* Remove Shlex. Remove false UA_Client_delete

* Removed raw examples from ci. Fix leak in client.c and mqtt_publish

* Fix memory leak in mqtt subscriber
---
 examples/CMakeLists.txt                       |   2 +
 .../client_access_control_encrypt.c           |   2 +
 examples/ci_server.c                          | 202 ++++++++++++++++++
 examples/client.c                             |   6 +-
 examples/client_async.c                       |  22 +-
 examples/client_historical.c                  |   2 +-
 examples/discovery/client_find_servers.c      |   1 +
 examples/encryption/client_encryption.c       |   1 +
 .../pubsub/sks/pubsub_publish_encrypted_sks.c |   4 +-
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |   3 +-
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   |  11 +-
 tools/ci.sh                                   |  36 +---
 tools/examples_with_valgrind.py               | 180 ++++++++++++++++
 13 files changed, 424 insertions(+), 48 deletions(-)
 create mode 100644 examples/ci_server.c
 create mode 100644 tools/examples_with_valgrind.py

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 0b31e8ebc24..c74a8ea5176 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -154,6 +154,8 @@ endif()
 # Feature Examples #
 ####################
 
+add_example(ci_server ci_server.c)
+
 add_example(server_mainloop server_mainloop.c)
 
 add_example(server_instantiation server_instantiation.c)
diff --git a/examples/access_control_encrypt/client_access_control_encrypt.c b/examples/access_control_encrypt/client_access_control_encrypt.c
index 320c6bd47ac..2697dbef03e 100644
--- a/examples/access_control_encrypt/client_access_control_encrypt.c
+++ b/examples/access_control_encrypt/client_access_control_encrypt.c
@@ -45,6 +45,8 @@ int main(int argc, char* argv[]) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig *config = UA_Client_getConfig(client);
     config->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    UA_String_clear(&config->clientDescription.applicationUri);
+    config->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
     UA_ClientConfig_setDefaultEncryption(config, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
diff --git a/examples/ci_server.c b/examples/ci_server.c
new file mode 100644
index 00000000000..2e8fd9e4cd4
--- /dev/null
+++ b/examples/ci_server.c
@@ -0,0 +1,202 @@
+/* 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 <open62541/server_config_default.h>
+#include <open62541/plugin/accesscontrol_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/plugin/securitypolicy.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include <stdlib.h>
+
+#include "common.h"
+
+/* This is a test server to the ci script. It can be used for some of the examples that need a server to connect.
+* It allows to connect with the username "peter" and "paula" and the password "peter123" and "paula123" or "user1" and "password". Anonymus login is also allowed.
+* The server has a method "hello world" and a variable "the answer" that can be written to.
+* The server certificate and private key are loaded from the command line arguments.
+*/
+
+#define MIN_ARGS 4
+
+static UA_UsernamePasswordLogin logins[3] = {
+    {UA_STRING_STATIC("peter"), UA_STRING_STATIC("peter123")},
+    {UA_STRING_STATIC("paula"), UA_STRING_STATIC("paula123")},
+    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")}
+};
+
+static UA_StatusCode
+helloWorldMethodCallback(UA_Server *server,
+                         const UA_NodeId *sessionId, void *sessionHandle,
+                         const UA_NodeId *methodId, void *methodContext,
+                         const UA_NodeId *objectId, void *objectContext,
+                         size_t inputSize, const UA_Variant *input,
+                         size_t outputSize, UA_Variant *output) {
+    UA_String *inputStr = (UA_String*)input->data;
+    UA_String tmp = UA_STRING_ALLOC("Hello ");
+    if(inputStr->length > 0) {
+        tmp.data = (UA_Byte *)UA_realloc(tmp.data, tmp.length + inputStr->length);
+        memcpy(&tmp.data[tmp.length], inputStr->data, inputStr->length);
+        tmp.length += inputStr->length;
+    }
+    UA_Variant_setScalarCopy(output, &tmp, &UA_TYPES[UA_TYPES_STRING]);
+    UA_String_clear(&tmp);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Hello World was called");
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+addHelloWorldMethod(UA_Server *server) {
+    UA_Argument inputArgument;
+    UA_Argument_init(&inputArgument);
+    inputArgument.description = UA_LOCALIZEDTEXT("en-US", "A String");
+    inputArgument.name = UA_STRING("MyInput");
+    inputArgument.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
+    inputArgument.valueRank = UA_VALUERANK_SCALAR;
+
+    UA_Argument outputArgument;
+    UA_Argument_init(&outputArgument);
+    outputArgument.description = UA_LOCALIZEDTEXT("en-US", "A String");
+    outputArgument.name = UA_STRING("MyOutput");
+    outputArgument.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
+    outputArgument.valueRank = UA_VALUERANK_SCALAR;
+
+    UA_MethodAttributes helloAttr = UA_MethodAttributes_default;
+    helloAttr.description = UA_LOCALIZEDTEXT("en-US","Say `Hello World`");
+    helloAttr.displayName = UA_LOCALIZEDTEXT("en-US","Hello World");
+    helloAttr.executable = true;
+    helloAttr.userExecutable = true;
+    UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1,62541),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                            UA_QUALIFIEDNAME(1, "hello world"),
+                            helloAttr, &helloWorldMethodCallback,
+                            1, &inputArgument, 1, &outputArgument, NULL, NULL);
+}
+
+static void
+addVariable(UA_Server *server) {
+    /* Define the attribute of the myInteger variable node */
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    UA_Int32 myInteger = 42;
+    UA_Variant_setScalar(&attr.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
+    attr.description = UA_LOCALIZEDTEXT("en-US","the answer");
+    attr.displayName = UA_LOCALIZEDTEXT("en-US","the answer");
+    attr.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
+
+    /* Add the variable node to the information model */
+    UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "the.answer");
+    UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "the answer");
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_Server_addVariableNode(server, myIntegerNodeId, parentNodeId,
+                              parentReferenceNodeId, myIntegerName,
+                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, NULL);
+}
+
+static void
+writeVariable(UA_Server *server) {
+    UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "the.answer");
+
+    /* Write a different integer value */
+    UA_Int32 myInteger = 43;
+    UA_Variant myVar;
+    UA_Variant_init(&myVar);
+    UA_Variant_setScalar(&myVar, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
+    UA_Server_writeValue(server, myIntegerNodeId, myVar);
+
+    /* Set the status code of the value to an error code. The function
+     * UA_Server_write provides access to the raw service. The above
+     * UA_Server_writeValue is syntactic sugar for writing a specific node
+     * attribute with the write service. */
+    UA_WriteValue wv;
+    UA_WriteValue_init(&wv);
+    wv.nodeId = myIntegerNodeId;
+    wv.attributeId = UA_ATTRIBUTEID_VALUE;
+    wv.value.status = UA_STATUSCODE_BADNOTCONNECTED;
+    wv.value.hasStatus = true;
+    UA_Server_write(server, &wv);
+
+    /* Reset the variable to a good statuscode with a value */
+    wv.value.hasStatus = false;
+    wv.value.value = myVar;
+    wv.value.hasValue = true;
+    UA_Server_write(server, &wv);
+}
+
+int main(int argc, char* argv[]) {
+    UA_StatusCode retval = 0;
+
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+#ifdef UA_ENABLE_ENCRYPTION
+    UA_ByteString certificate = UA_BYTESTRING_NULL;
+    UA_ByteString privateKey = UA_BYTESTRING_NULL;
+    UA_UInt16 port = 0;
+    if(argc >= 4) {
+        /* Load port, certificate and private key */
+        port = (UA_UInt16) atoi(argv[1]);
+        certificate = loadFile(argv[2]);
+        privateKey = loadFile(argv[3]);
+        // print the certificat and private key
+        printf("certificate: %.*s\n", (int)certificate.length, certificate.data);
+    } else {
+        UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                     "Missing arguments. Arguments are "
+                     "<port> <server-certificate.der> <private-key.der> "
+                     "[<trustlist1.crl>, ...]");
+
+        return EXIT_SUCCESS;
+    }
+
+    /* Load the trustlist */
+    size_t trustListSize = 0;
+    if(argc > 4)
+        trustListSize = (size_t)argc-4;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize+1);
+    for(size_t i = 0; i < trustListSize; i++)
+        trustList[i] = loadFile(argv[i+4]);
+
+    /* Loading of an issuer list, not used in this application */
+    size_t issuerListSize = 0;
+    UA_ByteString *issuerList = NULL;
+
+    /* Loading of a revocation list currently unsupported */
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+
+     retval = UA_ServerConfig_setDefaultWithSecurityPolicies(config, port,
+                                                       &certificate, &privateKey,
+                                                       trustList, trustListSize,
+                                                       issuerList, issuerListSize,
+                                                       revocationList, revocationListSize);
+                                                           UA_ByteString_clear(&certificate);
+    UA_ByteString_clear(&privateKey);
+    for(size_t i = 0; i < trustListSize; i++)
+        UA_ByteString_clear(&trustList[i]);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;   
+
+#endif
+    retval = UA_AccessControl_default(config, true, NULL,
+             &config->securityPolicies[config->securityPoliciesSize-1].policyUri, 3, logins);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+        
+    addHelloWorldMethod(server);
+    addVariable(server);
+    writeVariable(server);
+
+    retval = UA_Server_runUntilInterrupt(server);
+
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup;
+ cleanup:
+    UA_Server_delete(server);
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/examples/client.c b/examples/client.c
index 6aaf2210743..7f333699cfd 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -50,7 +50,11 @@ int main(int argc, char *argv[]) {
                endpointArray[i].endpointUrl.data);
     }
     UA_Array_delete(endpointArray,endpointArraySize, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
-
+    UA_Client_delete(client);
+    
+    /* Create a client and connect */
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
     /* Connect to a server */
     /* anonymous connect would be: retval = UA_Client_connect(client, "opc.tcp://localhost:4840"); */
     retval = UA_Client_connectUsername(client, "opc.tcp://localhost:4840", "user1", "password");
diff --git a/examples/client_async.c b/examples/client_async.c
index 4beed2e3c96..219228c395a 100644
--- a/examples/client_async.c
+++ b/examples/client_async.c
@@ -69,22 +69,18 @@ methodCalled(UA_Client *client, void *userdata, UA_UInt32 requestId,
     }
     if(retval != UA_STATUSCODE_GOOD) {
         UA_CallResponse_clear(response);
-    }
-
-    /* Move the output arguments */
-    output = response->results[0].outputArguments;
-    outputSize = response->results[0].outputArgumentsSize;
-    response->results[0].outputArguments = NULL;
-    response->results[0].outputArgumentsSize = 0;
-
-    if(retval == UA_STATUSCODE_GOOD) {
+        printf("---Method call was unsuccessful, returned %x values.\n", retval);
+    } else {
+        /* Move the output arguments */
+        output = response->results[0].outputArguments;
+        outputSize = response->results[0].outputArgumentsSize;
+        response->results[0].outputArguments = NULL;
+        response->results[0].outputArgumentsSize = 0;
         printf("---Method call was successful, returned %lu values.\n",
-               (unsigned long) outputSize);
+               (unsigned long)outputSize);
         UA_Array_delete(output, outputSize, &UA_TYPES[UA_TYPES_VARIANT]);
-    } else {
-        printf("---Method call was unsuccessful, returned %x values.\n",
-                retval);
     }
+
     UA_CallResponse_clear(response);
 }
 
diff --git a/examples/client_historical.c b/examples/client_historical.c
index 85305632bf6..535d51b6967 100644
--- a/examples/client_historical.c
+++ b/examples/client_historical.c
@@ -139,7 +139,7 @@ int main(int argc, char *argv[]) {
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
 
     /* Connect to the Unified Automation demo server */
-    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:53530/OPCUA/SimulationServer");
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840/");
     if(retval != UA_STATUSCODE_GOOD) {
         printf("Could not connect\n");
         UA_Client_delete(client);
diff --git a/examples/discovery/client_find_servers.c b/examples/discovery/client_find_servers.c
index 61df5f628fd..f5d92dd89a5 100644
--- a/examples/discovery/client_find_servers.c
+++ b/examples/discovery/client_find_servers.c
@@ -54,6 +54,7 @@ int main(void) {
 
         UA_Array_delete(serverOnNetwork, serverOnNetworkSize,
                         &UA_TYPES[UA_TYPES_SERVERONNETWORK]);
+        UA_Client_delete(client);
     }
 
     /* Example for calling FindServers */
diff --git a/examples/encryption/client_encryption.c b/examples/encryption/client_encryption.c
index 3ca09559654..e9aab9c9486 100644
--- a/examples/encryption/client_encryption.c
+++ b/examples/encryption/client_encryption.c
@@ -44,6 +44,7 @@ int main(int argc, char* argv[]) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig *cc = UA_Client_getConfig(client);
     cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+    UA_String_clear(&cc->clientDescription.applicationUri);
     cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
     UA_StatusCode retval = UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
diff --git a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
index 9bf766f1acb..e60abb8bd20 100644
--- a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
+++ b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
@@ -161,9 +161,9 @@ run(UA_UInt16 port, UA_String *transportProfile,
     addDataSetWriter(server);
 
     UA_StatusCode retval = UA_Server_run(server, &running);
-
-    UA_Server_delete(server);
+    
     UA_ClientConfig_delete(sksClientConfig);
+    UA_Server_delete(server);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 45365c98ef9..5f7e833d19d 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -487,7 +487,8 @@ int main(int argc, char **argv) {
     if(UA_STATUSCODE_GOOD != retval) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "Error Name = %s", UA_StatusCode_name(retval));
-        return EXIT_FAILURE;
+        UA_Server_delete(server);
+        return EXIT_SUCCESS;
     }
     addDataSetWriter(server, topic);
 
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index 0d5b2af4188..19765cbce23 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -386,24 +386,25 @@ int main(int argc, char **argv) {
     /* Add PubSubConnection */
     UA_StatusCode retval = addPubSubConnection(server, addressUrl);
     if (retval != UA_STATUSCODE_GOOD)
-        return EXIT_FAILURE;
+        goto cleanup;
 
     /* Add ReaderGroup to the created PubSubConnection */
     retval |= addReaderGroup(server, interval);
     if (retval != UA_STATUSCODE_GOOD)
-        return EXIT_FAILURE;
+        goto cleanup;
 
     /* Add DataSetReader to the created ReaderGroup */
     retval |= addDataSetReader(server);
     if (retval != UA_STATUSCODE_GOOD)
-        return EXIT_FAILURE;
+        goto cleanup;
 
     /* Add SubscribedVariables to the created DataSetReader */
     retval |= addSubscribedVariables(server, subscribedDataSetIdent);
     if (retval != UA_STATUSCODE_GOOD)
-        return EXIT_FAILURE;
+        goto cleanup;
 
     retval = UA_Server_runUntilInterrupt(server);
+cleanup:
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return EXIT_SUCCESS;
 }
diff --git a/tools/ci.sh b/tools/ci.sh
index c528bd5cf5b..a7a9bb5e5a9 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -381,6 +381,11 @@ function unit_tests_valgrind {
 
 function examples_valgrind {
     mkdir -p build; cd build; rm -rf *
+
+    # create certificates for the examples
+    python3 ../tools/certs/create_self-signed.py -c server 
+    python3 ../tools/certs/create_self-signed.py -c client 
+
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_ENABLE_DISCOVERY=ON \
@@ -408,31 +413,12 @@ function examples_valgrind {
     # Run each example with valgrind. Wait 10 seconds and send the SIGINT
     # signal. Wait for the process to terminate and collect the exit status.
     # Abort when the exit status is non-null.
-    FILES="./bin/examples/*"
-    for f in $FILES
-    do
-	    echo "Processing $f"
-	    valgrind --errors-for-leak-kinds=all --leak-check=full --error-exitcode=1 $f &
-        pid=$!
-	    sleep 10
-        # || true to ignore the error if the process is already dead
-	    kill -INT $pid || true
-
-        # wait for the process to terminate and check if the process is still running
-        sleep 5
-        if ps | grep "$pid"; then
-            echo $pid is still in the ps output. Must still be running.
-            # send the SIGINT signal again       
-            kill -INT $pid || true
-        fi
-        
-        # using a 20 second timeout with SIGTERM to kill the process if it is still running
-	    timeout 20s bash -c 'wait $pid || kill -TERM $pid' ; EXIT_CODE=$?
-	    if [[ $EXIT_CODE -ne 0 ]]; then
-		   echo "Processing $f failed with exit code $EXIT_CODE "
-		   exit $EXIT_CODE	
-	    fi
-    done
+    python3 ../tools/examples_with_valgrind.py
+    EXIT_CODE=$?
+    if [[ $EXIT_CODE -ne 0 ]]; then
+        echo "Processing failed with exit code $EXIT_CODE"
+        exit $EXIT_CODE
+    fi
 }
 
 ##############################
diff --git a/tools/examples_with_valgrind.py b/tools/examples_with_valgrind.py
new file mode 100644
index 00000000000..8a700e4e3f4
--- /dev/null
+++ b/tools/examples_with_valgrind.py
@@ -0,0 +1,180 @@
+import os
+import subprocess
+import time
+from collections import defaultdict
+
+example_args = {
+        "client_encryption":"opc.tcp://localhost:4840 client_cert.der client_key.der server_cert.der",
+        "access_control_client_encrypt":"opc.tcp://localhost:4840 client_cert.der client_key.der server_cert.der",
+        "client_event_filter":"opc.tcp://localhost:4840",
+        "client_connect":"-username user1 -password password -cert client_cert.der -key client_key.der opc.tcp://localhost:4840",
+        "pubsub_nodeset_rt_publisher":"-i lo",
+        "pubsub_nodeset_rt_subscriber":"-i lo",
+        "pubsub_TSN_loopback":"-i lo",
+        "pubsub_TSN_loopback_single_thread":"-i lo",
+        "pubsub_TSN_publisher":"-i lo",
+        "pubsub_TSN_publisher_multiple_thread":"-i lo",
+        "server_encryption":"server_cert.der server_key.der client_cert.der",
+        "server_loglevel":"--loglevel=1",
+        "ci_server":"4840 server_cert.der server_key.der client_cert.der"
+        }
+
+server_needed_examples = {
+        "access_control_client":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "access_control_client_encrypt":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "client":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "client_async":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "client_connect":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "client_connect_loop":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "client_encryption":"server_encryption server_cert.der server_key.der client_cert.der",
+        "client_event_filter":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "client_historical":"tutorial_server_historicaldata",
+        "client_method_async":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "client_subscription_loop":"ci_server 4840 server_cert.der server_key.der client_cert.der",
+        "custom_datatype_client":"custom_datatype_server",
+        "discovery_client_find_servers":"discovery_server_lds",
+        "discovery_server_register":"discovery_server_lds",
+        "pubsub_publish_encrypted":"pubsub_subscribe_encrypted",
+        "pubsub_publish_encrypted_sks":"server_pubsub_central_sks server_cert.der server_key.der --enableUnencrypted --enableAnonymous",
+        "pubsub_subscribe_encrypted":"pubsub_publish_encrypted",
+        "pubsub_subscribe_encrypted_sks":"server_pubsub_central_sks server_cert.der server_key.der --enableUnencrypted --enableAnonymous",
+        "pubsub_subscribe_standalone_dataset":"tutorial_pubsub_publish",
+        "server_pubsub_publish_rt_level":"server_pubsub_subscribe_rt_level",
+        "server_pubsub_rt_information_model":"server_pubsub_subscribe_rt_level",
+        "server_pubsub_subscribe_custom_monitoring":"server_pubsub_publish_on_demand",
+        "server_pubsub_subscribe_rt_level":"server_pubsub_publish_rt_level",
+        "tutorial_client_events":"tutorial_server_events",
+        "tutorial_client_firststeps":"tutorial_server_firststeps",
+        "tutorial_pubsub_connection":"tutorial_pubsub_subscribe",
+        "tutorial_pubsub_mqtt_subscrib":"tutorial_pubsub_mqtt_publish",
+        "tutorial_pubsub_publish":"tutorial_pubsub_subscribe",
+        "tutorial_pubsub_subscribe":"tutorial_pubsub_publish",
+        "tutorial_server_reverseconnect":"ci_server 4841 client_cert.der client_key.der server_cert.der"
+}
+
+client_needed_examples = {
+        "ci_server":"client",
+        "server_ctt":"client",
+        "server_inheritance":"client",
+        "server_instantiation":"client",
+        "server_loglevel":"client",
+        "server_mainloop":"client",
+        "server_nodeset":"client",
+        "server_nodeset_loader":"client",
+        "server_nodeset_plcopen":"client",
+        "server_nodeset_powerlink":"client",
+        "server_settimestamp":"client",
+        "server_testnodeset":"client",
+        "tutorial_server_monitoreditems":"client",
+        "tutorial_server_variabletype":"client",
+        "tutorial_server_object":"client",
+        "tutorial_server_variable":"client",
+        "access_control_server":"access_control_client",
+        "custom_datatype_server":"custom_datatype_client",
+        "discovery_server_lds":"discovery_client_find_servers",
+        "server_encryption":"client_encryption opc.tcp://localhost:4840 client_cert.der client_key.der server_cert.der",
+        "server_events_random":"tutorial_client_events opc.tcp://localhost:4840",
+        "server_pubsub_central_sks":"pubsub_publish_encrypted_sks",
+        "tutorial_server_alarms_conditions":"tutorial_client_events opc.tcp://localhost:4840",
+        "tutorial_server_datasource":"tutorial_client_events opc.tcp://localhost:4840",
+        "tutorial_server_firststeps":"tutorial_client_firststeps",
+        "tutorial_server_historicaldata":"client_historical",
+        "tutorial_server_historicaldata_circular":"client_historical",
+        "tutorial_server_method":"client_method_async",
+        "tutorial_server_method_async":"client_method_async"
+}
+
+blacklist = {
+        "pubsub_TSN_loopback":1,
+        "pubsub_TSN_loopback_single_thread":1,
+        "pubsub_TSN_publisher":1,
+        "pubsub_TSN_publisher_multiple_thread":1,
+        "pubsub_nodeset_rt_publisher":1,
+        "pubsub_nodeset_rt_subscriber":1,
+        "access_control_client_encrypt":1,
+        "client_encryption":1,
+        "client_historical":1,
+        "client_subscription_loop":1,
+        "client_method_async":1
+}
+
+# Run each example with valgrind.
+# Wait 10 seconds and send the SIGINT signal.
+# Wait for the process to terminate and collect the exit status.
+# Abort when the exit status is non-null.
+
+os.chdir("../build")
+current_dir = os.getcwd()
+print(f"Current directory: {current_dir}")
+example_dir = os.path.join(current_dir, "bin", "examples")
+examples = os.listdir(example_dir)
+
+# skipping examples that are in the blacklist
+for example in examples:
+    if example in blacklist:
+        print(f"Skipping {example}")
+        continue
+    
+    # get the arguments for the example
+    args = example_args.get(example)
+    cmd = ["valgrind", "--errors-for-leak-kinds=all", "--leak-check=full", "--error-exitcode=1", "./bin/examples/"+example]
+    if args:
+        args_list = args.split()
+        cmd += args_list
+    print(f"Args for {example}: {cmd} ")
+
+    # check if the example needs a server or client to be running
+    server_needed = server_needed_examples.get(example)
+    client_needed = client_needed_examples.get(example)
+    
+    #start the server if needed
+    server_process = None
+    if server_needed:
+        server_cmd = server_needed.split()
+        server_cmd[0] = "./bin/examples/" + server_cmd[0]
+        print(f"Starting server {server_cmd} from {os.getcwd()}")
+        server_process = subprocess.Popen(server_cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        time.sleep(10)
+    
+    # start the example
+    process = subprocess.Popen(cmd)
+    time.sleep(10)
+    
+    # start the client if needed
+    client_process = None
+    if client_needed:
+        client_cmd = client_needed.split()
+        client_cmd[0] = "./bin/examples/" + client_cmd[0]
+        print(f"Starting client {client_cmd}")
+        client_process = subprocess.Popen(client_cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    
+    # wait 20 seconds and send the SIGINT signal
+    time.sleep(20)
+    print(f"Sending SIGINT to {process.pid}")
+    process.send_signal(subprocess.signal.SIGINT)
+    
+    tries = 0
+    while process.poll() is None:
+        time.sleep(20)
+        process.send_signal(subprocess.signal.SIGINT)
+        if tries > 5:
+            print(f"Process {process.pid} is still running after 5 tries. Terminating process.")
+            process.kill()
+        tries += 1
+
+    # save the exit code
+    exit_code = process.wait()
+    if exit_code != 0:
+        print(f"Processing {example} failed with exit code {exit_code}")
+        exit(exit_code)
+
+    # terminate the server and client
+    if server_process:
+        print(f"Sending SIGKILL to server {server_process.pid}")
+        server_process.kill()
+        server_process.wait()
+    
+    if client_process:
+        print(f"Sending SIGKILL to client {client_process.pid}")
+        client_process.kill()
+        client_process.wait()

From b91d7f4a5beadf9060ffa134ce56c1b617fb1608 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Fri, 30 Jun 2023 14:07:47 +0200
Subject: [PATCH 1025/1963] fix(examples): Align ci_server.c with AccessControl
 API

---
 examples/ci_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ci_server.c b/examples/ci_server.c
index 2e8fd9e4cd4..f1d61f36f18 100644
--- a/examples/ci_server.c
+++ b/examples/ci_server.c
@@ -183,7 +183,7 @@ int main(int argc, char* argv[]) {
         goto cleanup;   
 
 #endif
-    retval = UA_AccessControl_default(config, true, NULL,
+    retval = UA_AccessControl_default(config, true,
              &config->securityPolicies[config->securityPoliciesSize-1].policyUri, 3, logins);
     if(retval != UA_STATUSCODE_GOOD)
         goto cleanup;

From 46d910c6ad90aeac10a33d7b52c1d71c71773ea9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 00:34:33 +0200
Subject: [PATCH 1026/1963] fix(plugins): Fix memleak when
 CertificateVerification is initialized multiple times

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 10 ++++++++++
 plugins/crypto/openssl/ua_pki_openssl.c |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 6f006ea4834..687db621163 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -604,6 +604,11 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
     if(cv->logging == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+
+    /* Clear if the plugin is already initialized */
+    if(cv->clear)
+        cv->clear(cv);
+
     CertInfo *ci = (CertInfo*)UA_malloc(sizeof(CertInfo));
     if(!ci)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -678,6 +683,11 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
     if(cv->logging == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+
+    /* Clear if the plugin is already initialized */
+    if(cv->clear)
+        cv->clear(cv);
+
     CertInfo *ci = (CertInfo*)UA_malloc(sizeof(CertInfo));
     if(!ci)
         return UA_STATUSCODE_BADOUTOFMEMORY;
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 21e2855a2d5..1976d528a85 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -714,6 +714,10 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Clear if the plugin is already initialized */
+    if(cv->clear)
+        cv->clear(cv);
+
     CertContext * context = (CertContext *) UA_malloc (sizeof (CertContext));
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -776,6 +780,10 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Clear if the plugin is already initialized */
+    if(cv->clear)
+        cv->clear(cv);
+
     CertContext * context = (CertContext *) UA_malloc (sizeof (CertContext));
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;

From 1ddbecaf7cf4c6e4daa4dfe2d269fac94dc8fdc0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 01:02:26 +0200
Subject: [PATCH 1027/1963] feat(server): Make
 UA_NS0ID_SERVER_SERVERSTATUS_SECONDSTILLSHUTDOWN readable

---
 src/server/ua_server_ns0.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index d48e842b22c..4ee5554340d 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -287,6 +287,29 @@ createNS0_base(UA_Server *server) {
 /* Data Sources */
 /****************/
 
+static UA_StatusCode
+writeStatus(UA_Server *server, const UA_NodeId *sessionId,
+            void *sessionContext, const UA_NodeId *nodeId,
+            void *nodeContext, const UA_NumericRange *range,
+            const UA_DataValue *value) {
+    if(range)
+        return UA_STATUSCODE_BADINDEXRANGEINVALID;
+
+    if(nodeId->identifier.numeric != UA_NS0ID_SERVER_SERVERSTATUS_SECONDSTILLSHUTDOWN)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Only the local user can write into this variable */
+    if(sessionId != &server->adminSession.sessionId)
+        return UA_STATUSCODE_BADUSERACCESSDENIED;
+
+    if(!UA_Variant_hasScalarType(&value->value, &UA_TYPES[UA_TYPES_UINT32]))
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+
+    UA_UInt32 *endTime = (UA_UInt32*)value->value.data;
+    server->endTime = UA_DateTime_now() + (UA_DateTime)(*endTime * UA_DATETIME_SEC);
+    return UA_STATUSCODE_GOOD;
+}
+
 static UA_StatusCode
 readStatus(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
            const UA_NodeId *nodeId, void *nodeContext, UA_Boolean sourceTimestamp,
@@ -839,7 +862,7 @@ initNS0(UA_Server *server) {
     retVal |= writeValueRankAttribute(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERARRAY), 1);
 
     /* ServerStatus */
-    UA_DataSource serverStatus = {readStatus, NULL};
+    UA_DataSource serverStatus = {readStatus, writeStatus};
     retVal |= setVariableNode_dataSource(server,
                         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS), serverStatus);
 

From d441e715c8b872d39c980d68d50453297b5d4a1f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 01:03:28 +0200
Subject: [PATCH 1028/1963] feat(plugins): Use config->shutdownDelay delay for
 the server shutdown

---
 plugins/ua_config_default.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index cf9667ed532..67294cf1e4c 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -57,14 +57,40 @@ struct InterruptContext {
     UA_Boolean running;
 };
 
+static void
+shutdownServer(UA_Server *server, void *context) {
+    struct InterruptContext *ic = (struct InterruptContext*)context;
+    UA_ServerConfig *config = UA_Server_getConfig(ic->server);
+    UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_USERLAND,
+                "Stopping the server");
+    ic->running = false;
+}
+
 static void
 interruptServer(UA_InterruptManager *im, uintptr_t interruptHandle,
                 void *context, const UA_KeyValueMap *parameters) {
     struct InterruptContext *ic = (struct InterruptContext*)context;
     UA_ServerConfig *config = UA_Server_getConfig(ic->server);
+
+    if(config->shutdownDelay <= 0.0) {
+        UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_USERLAND,
+                    "Received SIGINT interrupt. Stopping the server.");
+        ic->running = false;
+        return;
+    }
+
     UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_USERLAND,
-                "Received SIGINT interrupt. Stopping the server.");
-    ic->running = false;
+                "Received SIGINT interrupt. Stopping the server in %.2fs.",
+                config->shutdownDelay / 1000.0);
+
+    UA_UInt32 secondsTillShutdown = (UA_UInt32)(config->shutdownDelay / 1000.0);
+    UA_Variant val;
+    UA_Variant_setScalar(&val, &secondsTillShutdown, &UA_TYPES[UA_TYPES_UINT32]);
+    UA_Server_writeValue(ic->server,
+              UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_SECONDSTILLSHUTDOWN), val);
+    UA_Server_addTimedCallback(ic->server, shutdownServer, ic, UA_DateTime_nowMonotonic() +
+                               (UA_DateTime)(config->shutdownDelay * UA_DATETIME_MSEC),
+                               NULL);
 }
 
 UA_StatusCode

From c552b26e643a9ee2a9e993e82225deb027eeb8ae Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 01:04:00 +0200
Subject: [PATCH 1029/1963] refactor(examples): Use UA_Server_runUntilInterrupt
 for server_ctt

---
 examples/server_ctt.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 7002a903442..5a1c39e682a 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -14,7 +14,6 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/pki_default.h>
 
-#include <signal.h>
 #include <stdlib.h>
 
 #include "common.h"
@@ -990,14 +989,6 @@ disableBasic256Sha256SecurityPolicy(UA_ServerConfig *config) {
 
 #endif
 
-UA_Boolean running = true;
-
-static void
-stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Received Ctrl-C");
-    running = 0;
-}
-
 static void
 usage(void) {
     UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
@@ -1032,9 +1023,7 @@ usage(void) {
 }
 
 int main(int argc, char **argv) {
-    signal(SIGINT, stopHandler); /* catches ctrl-c */
-    signal(SIGTERM, stopHandler);
-
+    /* Print help */
     for(int i = 1; i < argc; i++) {
         if(strcmp(argv[i], "--help") == 0 ||
            strcmp(argv[i], "-h") == 0) {
@@ -1409,7 +1398,7 @@ int main(int argc, char **argv) {
 
 
     /* run server */
-    res = UA_Server_run(server, &running);
+    res = UA_Server_runUntilInterrupt(server);
 
  cleanup:
     UA_Server_delete(server);

From 98d1ca315b86149746905bd7f6b631048e923dd9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 01:05:25 +0200
Subject: [PATCH 1030/1963] refactor(server): Remove unused
 UA_ENABLE_VALGRIND_INTERACTIVE

---
 CMakeLists.txt                |  6 ------
 include/open62541/config.h.in |  2 --
 src/server/ua_server.c        | 14 --------------
 3 files changed, 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a981f58d15..7cdc19cfaec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -462,9 +462,6 @@ option(UA_ENABLE_MALLOC_SINGLETON
        "Use a global variable pointer for malloc (and free, ...) that can be switched at runtime" OFF)
 mark_as_advanced(UA_ENABLE_MALLOC_SINGLETON)
 
-option(UA_ENABLE_VALGRIND_INTERACTIVE "Enable dumping valgrind every iteration. CAUTION! SLOWDOWN!" OFF)
-mark_as_advanced(UA_ENABLE_VALGRIND_INTERACTIVE)
-
 option(UA_MSVC_FORCE_STATIC_CRT "Force linking with the static C-runtime library when compiling to static library with MSVC" ON)
 mark_as_advanced(UA_MSVC_FORCE_STATIC_CRT)
 
@@ -489,9 +486,6 @@ mark_as_advanced(UA_ENABLE_UNIT_TESTS_MEMCHECK)
 option(UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING "Reduce the number of iterations required for testing a feature (e.g. to roll over a counter)" OFF)
 mark_as_advanced(UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING)
 
-set(UA_VALGRIND_INTERACTIVE_INTERVAL 1000 CACHE STRING "The number of iterations to wait before creating the next dump")
-mark_as_advanced(UA_VALGRIND_INTERACTIVE_INTERVAL)
-
 # Build options for debugging
 option(UA_DEBUG "Enable assertions and additional functionality that should not be included in release builds" OFF)
 mark_as_advanced(UA_DEBUG)
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index e626fbe59b3..170f1f7c76b 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -70,8 +70,6 @@
 #cmakedefine UA_ENABLE_QUERY
 #cmakedefine UA_ENABLE_MALLOC_SINGLETON
 #cmakedefine UA_ENABLE_DISCOVERY_SEMAPHORE
-#cmakedefine UA_ENABLE_VALGRIND_INTERACTIVE
-#define UA_VALGRIND_INTERACTIVE_INTERVAL ${UA_VALGRIND_INTERACTIVE_INTERVAL}
 #cmakedefine UA_GENERATED_NAMESPACE_ZERO
 #cmakedefine UA_GENERATED_NAMESPACE_ZERO_FULL
 #cmakedefine UA_ENABLE_PUBSUB_MONITORING
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index f4954f7e37f..ca2c8de70d7 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -33,10 +33,6 @@
 #include "open62541/nodesetinjector.h"
 #endif
 
-#ifdef UA_ENABLE_VALGRIND_INTERACTIVE
-#include <valgrind/memcheck.h>
-#endif
-
 /**********************/
 /* Namespace Handling */
 /**********************/
@@ -894,17 +890,7 @@ UA_Server_run(UA_Server *server, const volatile UA_Boolean *running) {
     UA_StatusCode retval = UA_Server_run_startup(server);
     UA_CHECK_STATUS(retval, return retval);
 
-#ifdef UA_ENABLE_VALGRIND_INTERACTIVE
-    size_t loopCount = 0;
-#endif
     while(!testShutdownCondition(server)) {
-#ifdef UA_ENABLE_VALGRIND_INTERACTIVE
-        if(loopCount == 0) {
-            VALGRIND_DO_LEAK_CHECK;
-        }
-        ++loopCount;
-        loopCount %= UA_VALGRIND_INTERACTIVE_INTERVAL;
-#endif
         UA_Server_run_iterate(server, true);
         if(!*running) {
             if(setServerShutdown(server))

From 809c7ff3f67779186a095575c720940910cdc8b6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 01:07:04 +0200
Subject: [PATCH 1031/1963] refactor(pubsub): Remove
 UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING

The code is now fast enough to not need the workaround.
---
 CMakeLists.txt                                       | 3 ---
 include/open62541/config.h.in                        | 1 -
 src/pubsub/ua_pubsub_manager.c                       | 8 --------
 tests/pubsub/check_pubsub_informationmodel_methods.c | 5 -----
 tools/ci.sh                                          | 5 -----
 5 files changed, 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cdc19cfaec..8b53044ec80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -483,9 +483,6 @@ mark_as_advanced(UA_ENABLE_DISCOVERY_SEMAPHORE)
 option(UA_ENABLE_UNIT_TESTS_MEMCHECK "Use Valgrind (Linux) or DrMemory (Windows) to detect memory leaks when running the unit tests" OFF)
 mark_as_advanced(UA_ENABLE_UNIT_TESTS_MEMCHECK)
 
-option(UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING "Reduce the number of iterations required for testing a feature (e.g. to roll over a counter)" OFF)
-mark_as_advanced(UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING)
-
 # Build options for debugging
 option(UA_DEBUG "Enable assertions and additional functionality that should not be included in release builds" OFF)
 mark_as_advanced(UA_DEBUG)
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 170f1f7c76b..bcc1ed7907d 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -75,7 +75,6 @@
 #cmakedefine UA_ENABLE_PUBSUB_MONITORING
 #cmakedefine UA_ENABLE_PUBSUB_BUFMALLOC
 #cmakedefine UA_ENABLE_PUBSUB_SKS
-#cmakedefine UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING
 
 #cmakedefine UA_PACK_DEBIAN
 
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 156ec672343..378ffd7307c 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -22,9 +22,6 @@
 
 #define UA_DATETIMESTAMP_2000 125911584000000000
 #define UA_RESERVEID_FIRST_ID 0x8000
-#ifdef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING
-#define UA_RESERVEID_LAST_ID UA_RESERVEID_FIRST_ID + 10
-#endif
 
 static void
 UA_PubSubManager_addTopic(UA_PubSubManager *pubSubManager, UA_TopicAssign *topicAssign) {
@@ -139,13 +136,8 @@ UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId,
         next_id = next_id_writer;
 
     for(;numberOfIds > 0;numberOfIds--) {
-#ifndef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING
         if(next_id < UA_RESERVEID_FIRST_ID)
             next_id = UA_RESERVEID_FIRST_ID;
-#else
-        if(next_id > UA_RESERVEID_LAST_ID)
-            next_id = UA_RESERVEID_FIRST_ID;
-#endif
         is_free = UA_ReserveId_isFree(server, next_id, transportProfileUri, reserveIdType);
         if(is_free)
             break;
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 2492f43ede7..ac2cd844262 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -1206,12 +1206,7 @@ START_TEST(ReserveIdsMultipleTimes){
         const UA_UInt16 numRegWriterGroupIds = 3;
         const UA_UInt16 numRegDataSetWriterIds = 3;
         const UA_UInt16 firstId = 0x8000;
-#ifdef UA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING        
-        const UA_UInt16 lastId = 0x8000 + 10;
-#else
         const UA_UInt16 lastId = UA_UINT16_MAX;
-        #pragma message "Running this test without enabling UA_ENABLE_REDUCED_ITERATIONS takes very long time."
-#endif
 
         UA_Variant regWriterGroupIds;
         UA_Variant regDataSetWriterIds;
diff --git a/tools/ci.sh b/tools/ci.sh
index a7a9bb5e5a9..5fcde90e4aa 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -151,7 +151,6 @@ function unit_tests {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
-          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           ..
     make ${MAKEOPTS}
@@ -213,7 +212,6 @@ function unit_tests_diag {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
-          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           ..
     make ${MAKEOPTS}
@@ -301,7 +299,6 @@ function unit_tests_pubsub_sks {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
-          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           -DUA_ENABLE_PUBSUB_SKS=ON \
@@ -335,7 +332,6 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
-          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           ..
@@ -366,7 +362,6 @@ function unit_tests_valgrind {
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
-          -DUA_ENABLE_REDUCED_ITERATIONS_FOR_TESTING=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           ..

From adafa9ff6ca4c7a819363448696754c7db2c166c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 20:10:21 +0200
Subject: [PATCH 1032/1963] feat(plugins): Warn+Accept certificates if no
 certificate store configured (OpenSSL)

---
 plugins/crypto/openssl/ua_pki_openssl.c | 63 ++++++++++++++-----------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 1976d528a85..21664e4b933 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -443,42 +443,51 @@ UA_X509_Store_CTX_Error_To_UAError (int opensslErr) {
 static UA_StatusCode
 UA_CertificateVerification_Verify (const UA_CertificateVerification *cv,
                                    const UA_ByteString * certificate) {
-    X509_STORE_CTX*       storeCtx;
-    X509_STORE*           store;
-    CertContext *         ctx;
-    UA_StatusCode         ret;
-    int                   opensslRet;
-    X509 *                certificateX509 = NULL;
+    X509_STORE_CTX *storeCtx = NULL;
+    X509_STORE *store = NULL;
+    CertContext *ctx = NULL;
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
 
     if ((cv == NULL) || (cv->context == NULL)) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     ctx = (CertContext *) cv->context;
 
-    store = X509_STORE_new();
-    storeCtx = X509_STORE_CTX_new();
-
-    if (store == NULL || storeCtx == NULL) {
-        ret = UA_STATUSCODE_BADOUTOFMEMORY;
+    /* Parse the certificate */
+    X509 *certificateX509 = UA_OpenSSL_LoadCertificate(certificate);
+    if(!certificateX509) {
+        ret = UA_STATUSCODE_BADCERTIFICATEINVALID;
         goto cleanup;
     }
+
+    /* Reload PKI folder */
 #ifdef __linux__
     ret = UA_ReloadCertFromFolder (ctx);
-    if (ret != UA_STATUSCODE_GOOD) {
+    if(ret != UA_STATUSCODE_GOOD)
         goto cleanup;
-    }
 #endif
 
-    certificateX509 = UA_OpenSSL_LoadCertificate(certificate);
-    if (certificateX509 == NULL) {
-        ret = UA_STATUSCODE_BADCERTIFICATEINVALID;
+    /* Accept the certificate without verification of no trust and issuer list
+     * are loaded */
+    if(sk_X509_CRL_num(ctx->skCrls) == 0 &&
+       sk_X509_num(ctx->skIssue) == 0 &&
+       sk_X509_num(ctx->skTrusted) == 0) {
+        UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_USERLAND,
+                       "No certificate store configured. Accepting the certificate.");
+        goto cleanup;
+    }
+
+    store = X509_STORE_new();
+    storeCtx = X509_STORE_CTX_new();
+    if(store == NULL || storeCtx == NULL) {
+        ret = UA_STATUSCODE_BADOUTOFMEMORY;
         goto cleanup;
     }
 
     X509_STORE_set_flags(store, 0);
-    opensslRet = X509_STORE_CTX_init (storeCtx, store, certificateX509,
-                                      ctx->skIssue);
-    if (opensslRet != 1) {
+    int opensslRet = X509_STORE_CTX_init(storeCtx, store, certificateX509,
+                                          ctx->skIssue);
+    if(opensslRet != 1) {
         ret = UA_STATUSCODE_BADINTERNALERROR;
         goto cleanup;
     }
@@ -579,16 +588,14 @@ UA_CertificateVerification_Verify (const UA_CertificateVerification *cv,
         /* Return expected OPCUA error code */
         ret = UA_X509_Store_CTX_Error_To_UAError (opensslRet);
     }
+
 cleanup:
-    if (store != NULL) {
-        X509_STORE_free (store);
-    }
-    if (storeCtx != NULL) {
-        X509_STORE_CTX_free (storeCtx);
-    }
-    if (certificateX509 != NULL) {
-        X509_free (certificateX509);
-    }
+    if(store)
+        X509_STORE_free(store);
+    if(storeCtx)
+        X509_STORE_CTX_free(storeCtx);
+    if(certificateX509)
+        X509_free(certificateX509);
     return ret;
 }
 

From 86e01d765a9d4e6a3fdf0d15ae0f1b2f1d018b84 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 20:11:44 +0200
Subject: [PATCH 1033/1963] feat(plugins): Warn+Accept certificates if no
 certificate store configured (No Encryption)

---
 plugins/crypto/ua_pki_none.c |  4 +++-
 plugins/ua_config_default.c  | 13 +------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/plugins/crypto/ua_pki_none.c b/plugins/crypto/ua_pki_none.c
index af67bbe9c08..f8ff7b7a58e 100644
--- a/plugins/crypto/ua_pki_none.c
+++ b/plugins/crypto/ua_pki_none.c
@@ -8,7 +8,9 @@
 
 static UA_StatusCode
 verifyCertificateAllowAll(const UA_CertificateVerification *cv,
-               const UA_ByteString *certificate) {
+                          const UA_ByteString *certificate) {
+    UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_USERLAND,
+                   "No certificate store configured. Accepting the certificate.");
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 67294cf1e4c..d0a2ff1859d 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -498,11 +498,7 @@ UA_ServerConfig_setBasics(UA_ServerConfig* conf) {
 
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_setBasics_withPort(UA_ServerConfig* conf, UA_UInt16 portNumber) {
-    UA_StatusCode res = setDefaultConfig(conf, portNumber);
-    UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
-                   "AcceptAll Certificate Verification. "
-                   "Any remote certificate will be accepted.");
-    return res;
+    return setDefaultConfig(conf, portNumber);
 }
 
 UA_EXPORT UA_StatusCode
@@ -618,10 +614,6 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
         return retval;
     }
 
-    UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                   "AcceptAll Certificate Verification. "
-                   "Any remote certificate will be accepted.");
-
     return UA_STATUSCODE_GOOD;
 }
 
@@ -942,9 +934,6 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
         /* Certificate Verification that accepts every certificate. Can be
          * overwritten when the policy is specialized. */
         UA_CertificateVerification_AcceptAll(&config->certificateVerification);
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "AcceptAll Certificate Verification. "
-                       "Any remote certificate will be accepted.");
     }
 
     /* With encryption enabled, the applicationUri needs to match the URI from

From 69cafa4c7c4ec0076e778ed3fc2e12680daefc63 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 20:13:04 +0200
Subject: [PATCH 1034/1963] refactor(plugins): Align warning message if no
 certificate store configured

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 687db621163..ac7597b4a54 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -265,8 +265,8 @@ certificateVerification_verify(const UA_CertificateVerification *cv,
        ci->certificateTrustList.raw.len == 0 &&
        ci->certificateIssuerList.raw.len == 0 &&
        ci->certificateRevocationList.raw.len == 0) {
-        UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_SERVER,
-                       "PKI plugin unconfigured. Accepting the certificate.");
+        UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_USERLAND,
+                       "No certificate store configured. Accepting the certificate.");
         return UA_STATUSCODE_GOOD;
     }
 

From 41d18f3b26169f6fed00aa886f5075101f0a7d6a Mon Sep 17 00:00:00 2001
From: Jonas Green <jgr@hms.se>
Date: Wed, 1 Dec 2021 10:27:14 +0100
Subject: [PATCH 1035/1963] feat(core): Unwrap ExtensionObject arrays inside
 UA_Variant (Binary)

The decoding did not unwrap the extension objects that the
structures are wrapped into when encoded if the variant contains an
array of structures.

The implemented unit tests of this PR reveals the issue. Also the
test parseCustomArray is updated to what we belive is the correct
behavior.

We have a solution implemented that passes all unit tests but needs
to be clean up before published. We publish the unit tests to notify
about the issue until the solution is ready.

Co-authored-by: Julius Pfrommer <julius.pfrommer@web.de>
---
 CHANGELOG                      |  11 ++
 src/ua_types_encoding_binary.c | 136 ++++++++++++++++++++---
 tests/check_types_builtin.c    | 195 +++++++++++++++++++++++++++++++++
 tests/check_types_custom.c     |   7 +-
 4 files changed, 331 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0734351813d..bfb988edd63 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,17 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2023-07-02 Jonas Green <jgr at hms.se>
+
+ * Decoding variant with array of structure
+
+   When decoding an array of structures the extension objects that
+   each structure is wrapped into is now unwrapped if the array 
+   contains only a single type. Previously the decoding API returned
+   an array of extension objects. If the array of extension objects 
+   has more than one type the decoding result will be an array of
+   extension objects.
+
 2022-12-03 Julius Pfrommer <julius.pfrommer at iosb.fraunhofer.de>
 
  * KeyValueMap in PubSub configuration
diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index 8b9ed397e74..8b1147f7561 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -929,8 +929,10 @@ Variant_encodeBinaryWrapExtensionObject(const UA_Variant *src,
     if(isArray) {
         UA_CHECK(src->arrayLength <= UA_INT32_MAX, return UA_STATUSCODE_BADENCODINGERROR);
         length = src->arrayLength;
+
         i32 encodedLength = (i32)src->arrayLength;
-        ret = ENCODE_DIRECT(&encodedLength, UInt32); /* Int32 */
+        ret = encodeWithExchangeBuffer(&encodedLength, &UA_TYPES[UA_TYPES_INT32], ctx);
+        UA_assert(ret != UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
         UA_CHECK_STATUS(ret, return ret);
     }
 
@@ -1051,6 +1053,105 @@ Variant_decodeBinaryUnwrapExtensionObject(UA_Variant *dst, Ctx *ctx) {
     return decodeBinaryJumpTable[dst->type->typeKind](dst->data, dst->type, ctx);
 }
 
+/* Unwraps all ExtensionObjects in an array if they have the same type.
+ * For that we check whether all ExtensionObjects have the same header. */
+static status
+Variant_decodeBinaryUnwrapExtensionObjectArray(void *UA_RESTRICT *UA_RESTRICT dst,
+                                               size_t *out_length, const UA_DataType **type,
+                                               Ctx *ctx) {
+    u8 *orig_pos = ctx->pos;
+
+    /* Decode the length */
+    i32 signed_length;
+    status ret = DECODE_DIRECT(&signed_length, UInt32); /* Int32 */
+    UA_CHECK_STATUS(ret, return ret);
+
+    /* Return early for empty arrays */
+    if(signed_length <= 0) {
+        *out_length = 0;
+        if(signed_length < 0)
+            *dst = NULL;
+        else
+            *dst = UA_EMPTY_ARRAY_SENTINEL;
+        /* The *type field stays an ExtensionObject, as we did not decode any
+         * member who's type is known. */
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Protect against memory exhaustion by unrealistic array lengths. An
+     * ExtensionObject is at least 4 byte long (3 byte NodeId + 1 Byte encoding
+     * field). */
+    size_t length = (size_t)signed_length;
+    UA_CHECK(ctx->pos + ((4 * length) / 32) <= ctx->end,
+             return UA_STATUSCODE_BADDECODINGERROR);
+
+    /* Decode the type NodeId of the first member */
+    UA_NodeId binTypeId;
+    UA_NodeId_init(&binTypeId);
+    ret |= DECODE_DIRECT(&binTypeId, NodeId);
+    UA_CHECK_STATUS(ret, return ret);
+
+    /* Lookup the data type */
+    const UA_DataType *contentType = UA_findDataTypeByBinaryInternal(&binTypeId, ctx);
+    UA_NodeId_clear(&binTypeId);
+    if(!contentType) {
+        /* DataType unknown, decode as ExtensionObject array */
+        ctx->pos = orig_pos;
+        return Array_decodeBinary(dst, out_length, *type, ctx);
+    }
+
+    /* Check that the encoding is binary */
+    u8 encoding = 0;
+    ret |= DECODE_DIRECT(&encoding, Byte);
+    UA_CHECK_STATUS(ret, return ret);
+    if(encoding != UA_EXTENSIONOBJECT_ENCODED_BYTESTRING) {
+        /* Encoding format is not automatically decoded, decode as
+         * ExtensionObject array */
+        ctx->pos = orig_pos;
+        return Array_decodeBinary(dst, out_length, *type, ctx);
+    }
+
+    /* Compare the header of all array members if the array can be unwrapped */
+    UA_ByteString header = {(uintptr_t)ctx->pos - (uintptr_t)orig_pos - 4, &orig_pos[4]};
+    UA_ByteString compare_header = header;
+    ctx->pos = &orig_pos[4];
+
+    for(size_t i = 0; i < length; i++) {
+        compare_header.data = ctx->pos;
+        UA_CHECK(compare_header.data + compare_header.length <= ctx->end,
+                 return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED);
+        if(!UA_ByteString_equal(&header, &compare_header)) {
+            /* Different member types, decode as ExtensionObject array */
+            ctx->pos = orig_pos;
+            return Array_decodeBinary(dst, out_length, *type, ctx);
+        }
+
+        /* Decode the length field and jump to the next element */
+        ctx->pos += header.length;
+        u32 member_length = 0;
+        ret = DECODE_DIRECT(&member_length, UInt32);
+        UA_CHECK_STATUS(ret, return ret);
+        ctx->pos += member_length;
+    }
+
+    /* Allocate memory for the unwrapped members */
+    *dst = UA_calloc(length, contentType->memSize);
+    UA_CHECK_MEM(*dst, return UA_STATUSCODE_BADOUTOFMEMORY);
+    *out_length = length;
+    *type = contentType;
+
+    /* Decode unwrapped members */
+    uintptr_t array_pos = (uintptr_t)*dst;
+    ctx->pos = &orig_pos[4];
+    for(size_t i = 0; i < length && ret == UA_STATUSCODE_GOOD; i++) {
+        ctx->pos += header.length + 4; /* Jump over the header and length field */
+        ret = decodeBinaryJumpTable[contentType->typeKind]
+            ((void*)array_pos, contentType, ctx);
+        array_pos += contentType->memSize;
+    }
+    return ret;
+}
+
 /* The resulting variant always has the storagetype UA_VARIANT_DATA. */
 DECODE_BINARY(Variant) {
     /* Decode the encoding byte */
@@ -1083,20 +1184,29 @@ DECODE_BINARY(Variant) {
 
     /* Decode the content */
     dst->type = &UA_TYPES[typeKind];
-    if(isArray) {
-        ret = Array_decodeBinary(&dst->data, &dst->arrayLength, dst->type, ctx);
-    } else if(typeKind != UA_DATATYPEKIND_EXTENSIONOBJECT) {
-        dst->data = UA_new(dst->type);
-        UA_CHECK_MEM(dst->data, ctx->depth--; return UA_STATUSCODE_BADOUTOFMEMORY);
-        ret = decodeBinaryJumpTable[typeKind](dst->data, dst->type, ctx);
+    if(!isArray) {
+        /* Decode scalar */
+        if(typeKind != UA_DATATYPEKIND_EXTENSIONOBJECT) {
+            dst->data = UA_new(dst->type);
+            UA_CHECK_MEM(dst->data, ctx->depth--; return UA_STATUSCODE_BADOUTOFMEMORY);
+            ret = decodeBinaryJumpTable[typeKind](dst->data, dst->type, ctx);
+        } else {
+            ret = Variant_decodeBinaryUnwrapExtensionObject(dst, ctx);
+        }
     } else {
-        ret = Variant_decodeBinaryUnwrapExtensionObject(dst, ctx);
-    }
+        /* Decode array */
+        if(typeKind != UA_DATATYPEKIND_EXTENSIONOBJECT) {
+            ret = Array_decodeBinary(&dst->data, &dst->arrayLength, dst->type, ctx);
+        } else {
+            ret = Variant_decodeBinaryUnwrapExtensionObjectArray(&dst->data, &dst->arrayLength,
+                                                                 &dst->type, ctx);
+        }
 
-    /* Decode array dimensions */
-    if(isArray && (encodingByte & (u8)UA_VARIANT_ENCODINGMASKTYPE_DIMENSIONS) > 0)
-        ret |= Array_decodeBinary((void**)&dst->arrayDimensions, &dst->arrayDimensionsSize,
-                                  &UA_TYPES[UA_TYPES_INT32], ctx);
+        /* Decode array dimensions */
+        if((encodingByte & (u8)UA_VARIANT_ENCODINGMASKTYPE_DIMENSIONS) > 0)
+            ret |= Array_decodeBinary((void**)&dst->arrayDimensions, &dst->arrayDimensionsSize,
+                                      &UA_TYPES[UA_TYPES_INT32], ctx);
+    }
 
     ctx->depth--;
     return ret;
diff --git a/tests/check_types_builtin.c b/tests/check_types_builtin.c
index ef124812bb5..9a7ead43bda 100644
--- a/tests/check_types_builtin.c
+++ b/tests/check_types_builtin.c
@@ -20,6 +20,71 @@ enum UA_VARIANT_ENCODINGMASKTYPE_enum {
     UA_VARIANT_ENCODINGMASKTYPE_ARRAY       = (0x01 << 7)      // bit 7
 };
 
+static UA_Variant* EncodeDecodeVariant(UA_Variant* sourceVariant) {
+    UA_ByteString encodedVariant;
+    UA_ByteString_init(&encodedVariant);
+    UA_StatusCode encodeResult = UA_encodeBinary(sourceVariant, &UA_TYPES[UA_TYPES_VARIANT], &encodedVariant);
+    UA_Variant* decodedVariant = UA_Variant_new();
+    UA_StatusCode decodeResult = UA_decodeBinary(&encodedVariant, decodedVariant, &UA_TYPES[UA_TYPES_VARIANT], NULL );
+
+    ck_assert_int_eq(encodeResult, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(decodeResult, UA_STATUSCODE_GOOD);
+
+    UA_ByteString_clear(&encodedVariant);
+
+    return decodedVariant;
+}
+
+static void AssertVariantsEqual(UA_Variant* v1, UA_Variant* v2) {
+    ck_assert_ptr_eq(v1->type, v2->type);
+    ck_assert_uint_eq(v1->arrayLength, v2->arrayLength);
+    ck_assert_uint_eq(v1->arrayDimensionsSize, v2->arrayDimensionsSize);
+
+    for(size_t i = 0; i < v1->arrayDimensionsSize; i++) {
+       ck_assert_uint_eq(v1->arrayDimensions[i], v2->arrayDimensions[i]);
+    }
+
+    if(v1->type->pointerFree) {
+       int cmp = memcmp(v1->data, v2->data, v1->type->memSize * v1->arrayLength);
+       ck_assert_int_eq(cmp, 0);
+    }
+}
+
+static void EncodeDecodeArrayOfExtensionObjectTest(UA_ExtensionObject* sourceArray, size_t arraySize) {
+    UA_UInt32 dimensions = (UA_UInt32)arraySize;
+
+    UA_Variant sourceVariant;
+    UA_Variant_setArray(&sourceVariant, sourceArray, arraySize, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    sourceVariant.arrayDimensionsSize = 1;
+    sourceVariant.arrayDimensions = &dimensions;
+
+    UA_Variant* decodedVariant = EncodeDecodeVariant(&sourceVariant);
+    AssertVariantsEqual(&sourceVariant, decodedVariant);
+    UA_ExtensionObject* decodedArray = (UA_ExtensionObject*)decodedVariant->data;
+
+    for(size_t i = 0; i < arraySize; i++) {
+        ck_assert_uint_eq(sourceArray[i].encoding,
+                          decodedArray[i].encoding);
+        if(sourceArray[i].encoding < UA_EXTENSIONOBJECT_DECODED ) {
+           ck_assert_uint_eq(UA_NodeId_order(&sourceArray[i].content.encoded.typeId,
+                                             &decodedArray[i].content.encoded.typeId),
+                             UA_ORDER_EQ);
+           ck_assert(UA_String_equal(&sourceArray[i].content.encoded.body,
+                                     &decodedArray[i].content.encoded.body));
+        }
+        else {
+           ck_assert_ptr_eq(sourceArray[i].content.decoded.type,
+                            decodedArray[i].content.decoded.type);
+           int cmp = memcmp(sourceArray[i].content.decoded.data,
+                            decodedArray[i].content.decoded.data,
+                            sourceArray[i].content.decoded.type->memSize);
+           ck_assert_int_eq(cmp, 0);
+        }
+    }
+
+    UA_Variant_delete(decodedVariant);
+}
+
 START_TEST(UA_Byte_decodeShallCopyAndAdvancePosition) {
     // given
     UA_Byte dst;
@@ -1506,6 +1571,130 @@ START_TEST(UA_ExtensionObject_encodeDecodeShallWorkOnExtensionObject) {
 }
 END_TEST
 
+START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithStruct) {
+    UA_Range* sourceRange = UA_Range_new();
+    sourceRange->low = 1.0;
+    sourceRange->high = 10.0;
+
+    UA_Variant sourceVariant;
+    UA_Variant_setScalar(&sourceVariant, sourceRange, &UA_TYPES[UA_TYPES_RANGE]);
+
+    UA_Variant* decodedVariant = EncodeDecodeVariant(&sourceVariant);
+    AssertVariantsEqual(&sourceVariant, decodedVariant);
+
+    UA_Variant_delete(decodedVariant);
+    UA_Variant_clear(&sourceVariant);
+}
+END_TEST
+
+START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfStruct) {
+    const size_t arraySize = 2;
+    UA_Range* sourceRangeArray = (UA_Range*)UA_Array_new( arraySize, &UA_TYPES[UA_TYPES_RANGE]);
+
+    for(size_t i = 0; i < arraySize; i++) {
+        UA_Range* rangeElement = &sourceRangeArray[i];
+        UA_Range_init(rangeElement);
+        rangeElement->low = 1.0;
+        rangeElement->high = 10.0;
+    }
+
+    UA_UInt32 *dimensions;
+    dimensions = (UA_UInt32*)UA_malloc(sizeof(UA_UInt32));
+    dimensions[0] = (UA_UInt32)arraySize;
+
+    UA_Variant sourceVariant;
+    UA_Variant_setArray(&sourceVariant, sourceRangeArray, arraySize, &UA_TYPES[UA_TYPES_RANGE]);
+    sourceVariant.arrayDimensionsSize = 1;
+    sourceVariant.arrayDimensions = dimensions;
+
+    UA_Variant* decodedVariant = EncodeDecodeVariant(&sourceVariant);
+    AssertVariantsEqual(&sourceVariant, decodedVariant);
+
+    UA_Variant_delete(decodedVariant);
+    UA_Variant_clear(&sourceVariant);
+}
+END_TEST
+
+START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfDifferentTypes) {
+    const size_t arraySize = 2;
+    UA_ExtensionObject sourceArray[arraySize];
+    UA_Range arrayElement0 = { 1.0, 2.0 };
+    UA_ComplexNumberType arrayElement1 = { 3.0, 4.0 };
+
+    UA_ExtensionObject* arrayElement = &sourceArray[0];
+    UA_ExtensionObject_init(arrayElement);
+    arrayElement->encoding = UA_EXTENSIONOBJECT_DECODED;
+    arrayElement->content.decoded.data = &arrayElement0;
+    arrayElement->content.decoded.type = &UA_TYPES[UA_TYPES_RANGE];
+
+    arrayElement = &sourceArray[1];
+    UA_ExtensionObject_init(arrayElement);
+    arrayElement->encoding = UA_EXTENSIONOBJECT_DECODED;
+    arrayElement->content.decoded.data = &arrayElement1;
+    arrayElement->content.decoded.type = &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE];
+
+    EncodeDecodeArrayOfExtensionObjectTest(sourceArray, arraySize);
+}
+END_TEST
+
+START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsWithUnknownType) {
+    const size_t arraySize = 2;
+    UA_ExtensionObject sourceArray[arraySize];
+
+    UA_ExtensionObject* arrayElement = &sourceArray[0];
+    UA_ExtensionObject_init(arrayElement);
+    arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING;
+    arrayElement->content.encoded.body = UA_BYTESTRING("DataOfUnknownType");
+    arrayElement->content.encoded.typeId = UA_NODEID_NUMERIC(2, 4);
+
+    arrayElement = &sourceArray[1];
+    UA_ExtensionObject_init(arrayElement);
+    arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING;
+    arrayElement->content.encoded.body = UA_BYTESTRING("DataOfUnknownType");
+    arrayElement->content.encoded.typeId = UA_NODEID_NUMERIC(2, 4);
+
+    EncodeDecodeArrayOfExtensionObjectTest(sourceArray, arraySize);
+}
+END_TEST
+
+START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsXmlEncoded) {
+    const size_t arraySize = 2;
+    UA_ExtensionObject sourceArray[arraySize];
+
+    UA_ExtensionObject* arrayElement = &sourceArray[0];
+    UA_ExtensionObject_init(arrayElement);
+    arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_XML;
+    arrayElement->content.encoded.body = UA_STRING("<uax:Boolean>false</uax:Boolean>");
+    arrayElement->content.encoded.typeId = UA_TYPES[UA_TYPES_BOOLEAN].typeId;
+
+    arrayElement = &sourceArray[1];
+    UA_ExtensionObject_init(arrayElement);
+    arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_XML;
+    arrayElement->content.encoded.body = UA_STRING("<uax:Boolean>true</uax:Boolean>");
+    arrayElement->content.encoded.typeId = UA_TYPES[UA_TYPES_BOOLEAN].typeId;
+
+    EncodeDecodeArrayOfExtensionObjectTest(sourceArray, arraySize);
+}
+END_TEST
+
+START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsNoBody) {
+    const size_t arraySize = 2;
+    UA_ExtensionObject sourceArray[arraySize];
+
+    UA_ExtensionObject* arrayElement = &sourceArray[0];
+    UA_ExtensionObject_init(arrayElement);
+    arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_NOBODY;
+    arrayElement->content.encoded.typeId = UA_TYPES[UA_TYPES_BOOLEAN].typeId;
+
+    arrayElement = &sourceArray[1];
+    UA_ExtensionObject_init(arrayElement);
+    arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_NOBODY;
+    arrayElement->content.encoded.typeId = UA_TYPES[UA_TYPES_BOOLEAN].typeId;
+
+    EncodeDecodeArrayOfExtensionObjectTest(sourceArray, arraySize);
+}
+END_TEST
+
 START_TEST(UA_StatusCode_utils) {
 
     ck_assert(UA_TRUE == UA_StatusCode_isBad(UA_STATUSCODE_BADINTERNALERROR));
@@ -1571,6 +1760,12 @@ static Suite *testSuite_builtin(void) {
     tcase_add_test(tc_encode, UA_DataValue_encodeShallWorkOnExampleWithoutVariant);
     tcase_add_test(tc_encode, UA_DataValue_encodeShallWorkOnExampleWithVariant);
     tcase_add_test(tc_encode, UA_ExtensionObject_encodeDecodeShallWorkOnExtensionObject);
+    tcase_add_test(tc_encode, UA_Variant_encodeDecodeShallWorkOnVariantWithStruct);
+    tcase_add_test(tc_encode, UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfStruct);
+    tcase_add_test(tc_encode, UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfDifferentTypes);
+    tcase_add_test(tc_encode, UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsWithUnknownType);
+    tcase_add_test(tc_encode, UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsXmlEncoded);
+    tcase_add_test(tc_encode, UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsNoBody);
     suite_add_tcase(s, tc_encode);
 
     TCase *tc_convert = tcase_create("convert");
diff --git a/tests/check_types_custom.c b/tests/check_types_custom.c
index 0c758954098..a47382baedc 100644
--- a/tests/check_types_custom.c
+++ b/tests/check_types_custom.c
@@ -390,14 +390,11 @@ START_TEST(parseCustomArray) {
     size_t offset = 0;
     retval = UA_decodeBinaryInternal(&buf, &offset, &var2, &UA_TYPES[UA_TYPES_VARIANT], &customDataTypes);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    ck_assert(var2.type == &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    ck_assert(var2.type == &PointType);
     ck_assert_uint_eq(var2.arrayLength, 10);
 
     for (size_t i = 0; i < 10; i++) {
-        UA_ExtensionObject *eo = &((UA_ExtensionObject*)var2.data)[i];
-        ck_assert_int_eq(eo->encoding, UA_EXTENSIONOBJECT_DECODED);
-        ck_assert(eo->content.decoded.type == &PointType);
-        Point *p2 = (Point*)eo->content.decoded.data;
+        Point *p2 = &((Point*)var2.data)[i];
 
         // we need to cast floats to int to avoid comparison of floats
         // which may result into false results

From 6415694a49cf0b0945b89beb4915fda1a063d061 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Jul 2023 23:12:03 +0200
Subject: [PATCH 1036/1963] feat(core): Unwrap ExtensionObject arrays inside
 UA_Variant (JSON)

---
 src/ua_types_encoding_json.c                | 155 +++++++++++++++++++-
 tests/check_types_builtin_json.c            |  44 ++++++
 tests/pubsub/check_pubsub_encoding_custom.c |  10 +-
 3 files changed, 202 insertions(+), 7 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 8675fd19c46..c13f34d016c 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2157,6 +2157,147 @@ VariantDimension_decodeJson(ParseCtx *ctx, void *dst, const UA_DataType *type) {
     return Array_decodeJson(ctx, (void**)dst, dimType);
 }
 
+static const UA_DataType *
+unwrappedExtensionObjectType(ParseCtx *ctx) {
+    if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT)
+        return NULL;
+
+    unsigned int oldIndex = ctx->index; /* Save index to restore later */
+
+    /* Check the body array */
+    size_t searchArrayBody = 0;
+    status ret = lookAheadForKey(ctx, UA_JSONKEY_BODY, &searchArrayBody);
+    if(ret != UA_STATUSCODE_GOOD)
+        return NULL;
+
+    if(ctx->tokens[searchArrayBody].type != CJ5_TOKEN_ARRAY)
+        return NULL;
+    ctx->index = (unsigned int)searchArrayBody;
+
+    /* Return early for empty arrays */
+    size_t length = (size_t)ctx->tokens[ctx->index].size;
+    if(length == 0) {
+        ctx->index = oldIndex; /* Restore the index */
+        return NULL;
+    }
+
+    ctx->index++; /* Go to first array member */
+    if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT) {
+        ctx->index = oldIndex; /* Restore the index */
+        return NULL;
+    }
+
+    /* Get the type NodeId */
+    UA_NodeId typeId;
+    UA_NodeId_init(&typeId);
+    size_t searchTypeIdResult = 0;
+    ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
+    if(ret != UA_STATUSCODE_GOOD) {
+        ctx->index = oldIndex; /* Restore the index */
+        return NULL;
+    }
+
+    ctx->index = (UA_UInt16)searchTypeIdResult;
+    ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
+    if(ret != UA_STATUSCODE_GOOD) {
+        ctx->index = oldIndex; /* Restore the index */
+        return NULL;
+    }
+
+    const UA_DataType *typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
+    UA_NodeId_clear(&typeId);
+    if(!typeOfBody) {
+        ctx->index = oldIndex; /* Restore the index */
+        return NULL;
+    }
+
+    /* Loop over all members and see if they have the correct type */
+    ctx->index = (unsigned int)(searchArrayBody + 1);
+
+    for(size_t i = 0; i < length; i++) {
+        /* Array element must be an object */
+        if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT) {
+            ctx->index = oldIndex; /* Restore the index */
+            return NULL;
+        }
+
+        /* Check for non-JSON encoding */
+        unsigned int objectIndex = ctx->index;
+        size_t encodingPos = 0;
+        ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encodingPos);
+        if(ret == UA_STATUSCODE_GOOD) {
+            ctx->index = oldIndex; /* Restore the index */
+            return NULL;
+        }
+
+        /* Decode the type NodeId and compare */
+        ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
+        if(ret != UA_STATUSCODE_GOOD) {
+            ctx->index = oldIndex; /* Restore the index */
+            return NULL;
+        }
+        ctx->index = (UA_UInt16)searchTypeIdResult;
+        ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
+        if(ret != UA_STATUSCODE_GOOD) {
+            ctx->index = oldIndex; /* Restore the index */
+            return NULL;
+        }
+        UA_Boolean sameType = UA_NodeId_equal(&typeId, &typeOfBody->typeId);
+        UA_NodeId_clear(&typeId);
+        if(!sameType) {
+            ctx->index = oldIndex; /* Restore the index */
+            return NULL;
+        }
+
+        /* Skip forward */
+        ctx->index = objectIndex;
+        skipObject(ctx);
+    }
+
+    ctx->index = oldIndex; /* Restore the index */
+    return typeOfBody;
+}
+
+static status
+Array_decodeJsonUnwrapExtensionObject(ParseCtx *ctx, void **dst, const UA_DataType *type) {
+    size_t *size_ptr = (size_t*) dst - 1; /* Save the length pointer of the array */
+    size_t length = (size_t)ctx->tokens[ctx->index].size;
+
+    /* Known from the previous unwrapping-check */
+    UA_assert(currentTokenType(ctx) == CJ5_TOKEN_ARRAY);
+    UA_assert(length > 0);
+
+    ctx->index++; /* Go to first array member */
+
+    /* Allocate memory */
+    *dst = UA_calloc(length, type->memSize);
+    if(*dst == NULL)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    /* Decode array members */
+    uintptr_t ptr = (uintptr_t)*dst;
+    for(size_t i = 0; i < length; i++) {
+        UA_assert(ctx->tokens[ctx->index].type == CJ5_TOKEN_OBJECT);
+
+        /* Get the body field and decode it */
+        DecodeEntry entries[3] = {
+            {UA_JSONKEY_TYPEID, NULL, NULL, false, NULL},
+            {UA_JSONKEY_BODY, (void*)ptr, NULL, false, type},
+            {UA_JSONKEY_ENCODING, NULL, NULL, false, NULL}
+        };
+        status ret = decodeFields(ctx, entries, 3); /* Also skips to the next object */
+        if(ret != UA_STATUSCODE_GOOD) {
+            UA_Array_delete(*dst, i+1, type);
+            *dst = NULL;
+            return ret;
+        }
+        ptr += type->memSize;
+    }
+
+    *size_ptr = length; /* All good, set the size */
+    return UA_STATUSCODE_GOOD;
+}
+
 DECODE_JSON(Variant) {
     CHECK_OBJECT;
 
@@ -2164,7 +2305,7 @@ DECODE_JSON(Variant) {
     size_t searchResultType = 0;
     status ret = lookAheadForKey(ctx, UA_JSONKEY_TYPE, &searchResultType);
     if(ret != UA_STATUSCODE_GOOD) {
-        skipObject(ctx);
+         skipObject(ctx);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -2234,6 +2375,18 @@ DECODE_JSON(Variant) {
             {UA_JSONKEY_BODY, &dst->data, (decodeJsonSignature)Array_decodeJson, false, dst->type},
             {UA_JSONKEY_DIMENSION, &dst->arrayDimensions, VariantDimension_decodeJson, false, NULL}
         };
+
+        /* Can we unwrap ExtensionObjects in the array? */
+        if(dst->type == &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) {
+            const UA_DataType *unwrappedType = unwrappedExtensionObjectType(ctx);
+            if(unwrappedType) {
+                dst->type = unwrappedType;
+                entries[1].type = unwrappedType;
+                entries[1].function = (decodeJsonSignature)
+                    Array_decodeJsonUnwrapExtensionObject;
+            }
+        }
+
         size_t entriesCount = 3;
         if(!hasDimension)
             entriesCount = 2; /* Use the first 2 fields only */
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index 8430eedc335..0d546d307b1 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -5171,6 +5171,48 @@ START_TEST(UA_Variant_BooleanArray_json_decode) {
 }
 END_TEST
 
+START_TEST(UA_Variant_ExtensionObjectArray_json_decode) {
+    // given
+    UA_Variant out;
+    UA_Variant_init(&out);
+    UA_ByteString buf = UA_STRING("{\"Type\":22,\"Body\":[{\"TypeId\":{\"Id\":1},\"Body\":false}, {\"TypeId\":{\"Id\":1},\"Body\":true}]}");
+    // when
+
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+
+    UA_Boolean *testArray;
+    testArray = (UA_Boolean*)(out.data);
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    //decoded as False
+    ck_assert_int_eq(testArray[0], 0);
+    ck_assert_int_eq(testArray[1], 1);
+    ck_assert_uint_eq(out.arrayDimensionsSize, 0);
+    ck_assert_uint_eq(out.arrayLength, 2);
+    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BOOLEAN);
+    UA_Variant_clear(&out);
+}
+END_TEST
+
+START_TEST(UA_Variant_MixedExtensionObjectArray_json_decode) {
+    // given
+    UA_Variant out;
+    UA_Variant_init(&out);
+    UA_ByteString buf = UA_STRING("{\"Type\":22,\"Body\":[{\"TypeId\":{\"Id\":1},\"Body\":false}, {\"TypeId\":{\"Id\":2},\"Body\":1}]}");
+    // when
+
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    //decoded as False
+    ck_assert_uint_eq(out.arrayDimensionsSize, 0);
+    ck_assert_uint_eq(out.arrayLength, 2);
+    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_EXTENSIONOBJECT);
+    UA_Variant_clear(&out);
+}
+END_TEST
+
 START_TEST(UA_Variant_bad1_json_decode) {
     // given
     UA_Variant out;
@@ -5771,6 +5813,8 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_json_decode, UA_VariantVariantArrayEmpty_json_decode);
     tcase_add_test(tc_json_decode, UA_VariantStringArray_WithoutDimension_json_decode);
     tcase_add_test(tc_json_decode, UA_Variant_BooleanArray_json_decode);
+    tcase_add_test(tc_json_decode, UA_Variant_ExtensionObjectArray_json_decode);
+    tcase_add_test(tc_json_decode, UA_Variant_MixedExtensionObjectArray_json_decode);
     tcase_add_test(tc_json_decode, UA_Variant_bad1_json_decode);
     tcase_add_test(tc_json_decode, UA_Variant_ExtensionObjectWrap_json_decode);
 
diff --git a/tests/pubsub/check_pubsub_encoding_custom.c b/tests/pubsub/check_pubsub_encoding_custom.c
index f101b342353..e6a19fabe99 100644
--- a/tests/pubsub/check_pubsub_encoding_custom.c
+++ b/tests/pubsub/check_pubsub_encoding_custom.c
@@ -645,9 +645,8 @@ START_TEST(UA_PubSub_EnDecode_CustomArrayDeltaFrame){
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
 
     for (size_t i = 0; i < 10; i++) {
-        UA_ExtensionObject *eo = &((UA_ExtensionObject*)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)[i];
-        ck_assert(eo->content.decoded.type == &PointType);
-        Point *p2 = (Point*)eo->content.decoded.data;
+        ck_assert(m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.type == &PointType);
+        Point *p2 = &((Point*)m2.payload.dataSetPayload.dataSetMessages[0].data.deltaFrameData.deltaFrameFields[0].fieldValue.value.data)[i];
 
         // we need to cast floats to int to avoid comparison of floats
         // which may result into false results
@@ -711,9 +710,8 @@ START_TEST(UA_PubSub_EnDecode_CustomArrayKeyFrame){
     ck_assert_int_eq(rv, UA_STATUSCODE_GOOD);
 
     for (size_t i = 0; i < 10; i++) {
-        UA_ExtensionObject *eo = &((UA_ExtensionObject*)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)[i];
-        ck_assert(eo->content.decoded.type == &PointType);
-        Point *p2 = (Point*)eo->content.decoded.data;
+        ck_assert(m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.type == &PointType);
+        Point *p2 = &((Point*)m2.payload.dataSetPayload.dataSetMessages[0].data.keyFrameData.dataSetFields[0].value.data)[i];
 
         // we need to cast floats to int to avoid comparison of floats
         // which may result into false results

From 72f1509d49cb7c7f8d61e57a7efab1282bcb4b57 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Tue, 13 Jun 2023 13:13:11 +0200
Subject: [PATCH 1037/1963] fix(nodesetinjector): The type array of the
 respective nodeset is not adjusted if an empty bsd file is specified. PADIM
 specification included in the nodesetinjector.

---
 tools/nodeset_compiler/backend_open62541.py |  2 ++
 tools/nodeset_injector/CMakeLists.txt       | 20 ++++++++++++++++++++
 tools/nodeset_injector/empty.bsd.template   |  3 +++
 3 files changed, 25 insertions(+)
 create mode 100644 tools/nodeset_injector/empty.bsd.template

diff --git a/tools/nodeset_compiler/backend_open62541.py b/tools/nodeset_compiler/backend_open62541.py
index faaa29f7cd6..14627498bf6 100644
--- a/tools/nodeset_compiler/backend_open62541.py
+++ b/tools/nodeset_compiler/backend_open62541.py
@@ -312,10 +312,12 @@ def writec(line):
         typeArr = typesArray[-1]
         if typeArr != "UA_TYPES" and typeArr != "ns0":
             writec("/* Change namespaceIndex from current namespace */")
+            writec("#if " + typeArr + "_COUNT" + " > 0")
             writec("for(int i = 0; i < " + typeArr + "_COUNT" + "; i++) {")
             writec(typeArr + "[i]" + ".typeId.namespaceIndex = ns[" + str(nodeset.namespaceMapping[1]) + "];")
             writec(typeArr + "[i]" + ".binaryEncodingId.namespaceIndex = ns[" + str(nodeset.namespaceMapping[1]) + "];")
             writec("}")
+            writec("#endif")
 
     # Add generated types to the server
     writec("\n/* Load custom datatype definitions into the server */")
diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
index 6c4936e171a..67567944c76 100644
--- a/tools/nodeset_injector/CMakeLists.txt
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -212,6 +212,26 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 AUTOLOAD
                 DEPENDS "di"
         )
+    elseif(MODEL STREQUAL "PADIM")
+        ua_generate_nodeset_and_datatypes(
+                NAME "irdi"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.IRDI.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+        )
+
+        set(TMP_NSURI "http://opcfoundation.org/UA/${MODEL}/")
+        configure_file(${PROJECT_SOURCE_DIR}/tools/nodeset_injector/empty.bsd.template "${CMAKE_BINARY_DIR}/bsd_files_gen/Opc.Ua.${MODEL}.Types.bsd")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
+                FILE_BSD "${CMAKE_BINARY_DIR}/bsd_files_gen/Opc.Ua.${MODEL}.Types.bsd"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+                DEPENDS "irdi"
+        )
     else()
         MESSAGE(WARNING "The specified nodeset '${MODEL}' is not supported or is misspelled.")
     endif()
diff --git a/tools/nodeset_injector/empty.bsd.template b/tools/nodeset_injector/empty.bsd.template
new file mode 100644
index 00000000000..3d2f84937a4
--- /dev/null
+++ b/tools/nodeset_injector/empty.bsd.template
@@ -0,0 +1,3 @@
+<opc:TypeDictionary xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="${TMP_NSURI}" DefaultByteOrder="LittleEndian" xmlns:opc="http://opcfoundation.org/BinarySchema/" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="${TMP_NSURI}">
+    <opc:Import Namespace="http://opcfoundation.org/UA/"/>
+</opc:TypeDictionary>

From 48957cc534b2de4ec5c28b74b255f4ffd6ddd925 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 28 Jun 2023 21:25:22 +0200
Subject: [PATCH 1038/1963] feat(pubsub): Add UA_PubSubConnection_getEL

---
 src/pubsub/ua_pubsub.h            | 5 +++++
 src/pubsub/ua_pubsub_connection.c | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 883096b30fb..b6adda17a07 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -191,6 +191,11 @@ UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c);
 void
 UA_PubSubConnection_disconnect(UA_PubSubConnection *c);
 
+/* Returns either the eventloop configured in the connection or, in its absence,
+ * for the server */
+UA_EventLoop *
+UA_PubSubConnection_getEL(UA_Server *server, UA_PubSubConnection *c);
+
 UA_StatusCode
 UA_PubSubConnection_setPubSubState(UA_Server *server,
                                    UA_PubSubConnection *connection,
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index e405c7622d9..a3fcc72be07 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -340,4 +340,11 @@ UA_PubSubConnection_setPubSubState(UA_Server *server, UA_PubSubConnection *c,
     return ret;
 }
 
+UA_EventLoop *
+UA_PubSubConnection_getEL(UA_Server *server, UA_PubSubConnection *c) {
+    if(c->config.eventLoop)
+        return c->config.eventLoop;
+    return server->config.eventLoop;
+}
+
 #endif /* UA_ENABLE_PUBSUB */

From 5e9dc259434f3272aa21f849fea96fb3ac79c0b8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 28 Jun 2023 21:31:59 +0200
Subject: [PATCH 1039/1963] fix(pubsub): Always use UA_PubSubConnection_getEL
 to access the correct EventLoop

---
 src/pubsub/ua_pubsub_connection.c  | 2 +-
 src/pubsub/ua_pubsub_eventloop.c   | 6 +++---
 src/pubsub/ua_pubsub_writergroup.c | 9 +++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index a3fcc72be07..d611170e644 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -260,7 +260,7 @@ UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c) {
 #endif
 
         /* Free the memory delayed to ensure nobody is accessing any more */
-        UA_EventLoop *el = server->config.eventLoop;
+        UA_EventLoop *el = UA_PubSubConnection_getEL(server, c);
         c->dc.callback = delayedPubSubConnection_delete;
         c->dc.context = c;
         el->addDelayedCallback(el, &c->dc);
diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 43a33f11b67..9562526b328 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -454,7 +454,7 @@ UA_StatusCode
 UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_EventLoop *el = server->config.eventLoop;
+    UA_EventLoop *el = UA_PubSubConnection_getEL(server, c);
     if(!el) {
         UA_LOG_ERROR_CONNECTION(&server->config.logger, c, "No EventLoop configured");
         UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
@@ -701,7 +701,7 @@ UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg) {
     if(wg->config.transportSettings.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY)
         return UA_STATUSCODE_GOOD;
 
-    UA_EventLoop *el = server->config.eventLoop;
+    UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);
     if(!el) {
         UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg, "No EventLoop configured");
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR,
@@ -964,7 +964,7 @@ UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg) {
     if(rg->config.transportSettings.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY)
         return UA_STATUSCODE_GOOD;
 
-    UA_EventLoop *el = server->config.eventLoop;
+    UA_EventLoop *el = UA_PubSubConnection_getEL(server, rg->linkedConnection);
     if(!el) {
         UA_LOG_ERROR_READERGROUP(&server->config.logger, rg, "No EventLoop configured");
         UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_ERROR,
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 3500ef57948..91901f24ea8 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -49,9 +49,8 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup
     if(writerGroup->publishCallbackId != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    UA_EventLoop *el = server->config.eventLoop;
-    if(writerGroup->linkedConnection && writerGroup->linkedConnection->config.eventLoop)
-        el = writerGroup->linkedConnection->config.eventLoop;
+    UA_EventLoop *el =
+        UA_PubSubConnection_getEL(server, writerGroup->linkedConnection);
 
     UA_StatusCode retval =
         el->addCyclicCallback(el, (UA_Callback)UA_WriterGroup_publishCallback,
@@ -77,9 +76,7 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup
 
 static void
 UA_WriterGroup_removePublishCallback(UA_Server *server, UA_WriterGroup *wg) {
-    UA_EventLoop *el = server->config.eventLoop;
-    if(wg->linkedConnection && wg->linkedConnection->config.eventLoop)
-        el = wg->linkedConnection->config.eventLoop;
+    UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);
     if(wg->publishCallbackId != 0)
         el->removeCyclicCallback(el, wg->publishCallbackId);
     wg->publishCallbackId = 0;

From c93ecf6b7fd98eb727621d4c461c9eb2b3fc6860 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 28 Jun 2023 21:34:30 +0200
Subject: [PATCH 1040/1963] refactor(pubsub): Simplify
 UA_WriterGroup_addPublishCallback

---
 src/pubsub/ua_pubsub_writergroup.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 91901f24ea8..0abea452d2e 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -42,34 +42,29 @@ generateNetworkMessage(UA_PubSubConnection *connection, UA_WriterGroup *wg,
 /* Add new publishCallback. The first execution is triggered directly after
  * creation. */
 UA_StatusCode
-UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
+UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *wg) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Already registered */
-    if(writerGroup->publishCallbackId != 0)
+    if(wg->publishCallbackId != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    UA_EventLoop *el =
-        UA_PubSubConnection_getEL(server, writerGroup->linkedConnection);
+    UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);
 
+    /* TODO: Send timer policy from writer group config */
     UA_StatusCode retval =
         el->addCyclicCallback(el, (UA_Callback)UA_WriterGroup_publishCallback,
-                              server, writerGroup,
-                              writerGroup->config.publishingInterval,
+                              server, wg, wg->config.publishingInterval,
                               NULL /* TODO: use basetime */,
-                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME /* TODO: Send
-                                                                          * timer policy
-                                                                          * from writer
-                                                                          * group
-                                                                          * config */,
-                              &writerGroup->publishCallbackId);
+                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                              &wg->publishCallbackId);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
     /* Run once after creation. The Publish callback itself takes the server
      * mutex. So we release it first. */
     UA_UNLOCK(&server->serviceMutex);
-    UA_WriterGroup_publishCallback(server, writerGroup);
+    UA_WriterGroup_publishCallback(server, wg);
     UA_LOCK(&server->serviceMutex);
     return retval;
 }

From f06a92a2b13fbe5d33198627362d20b393860d07 Mon Sep 17 00:00:00 2001
From: Joe Riemersma <joepaz200@gmail.com>
Date: Tue, 4 Jul 2023 13:10:42 +0100
Subject: [PATCH 1041/1963] fix(client): fix UA_Client_connect
 responseFindServers incorrectly skipping Discovery or ClientServer
 application types

---
 src/client/ua_client_connect.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index fa3dc7d05d7..15da3132930 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1068,7 +1068,10 @@ responseFindServers(UA_Client *client, void *userdata,
      * returned server. */
     for(size_t i = 0; i < fsr->serversSize; i++) {
         UA_ApplicationDescription *server = &fsr->servers[i];
-        if(server->applicationType != UA_APPLICATIONTYPE_SERVER)
+        if (server->applicationType != UA_APPLICATIONTYPE_SERVER &&
+            server->applicationType != UA_APPLICATIONTYPE_CLIENTANDSERVER &&
+            server->applicationType != UA_APPLICATIONTYPE_DISCOVERYSERVER
+        )
             continue;
         if(server->discoveryUrlsSize == 0)
             continue;

From ed6cb2617dec6569eaf86b8371c3be1891c90d43 Mon Sep 17 00:00:00 2001
From: matkonnerth <matkonnerth@gmail.com>
Date: Wed, 5 Jul 2023 07:05:03 +0200
Subject: [PATCH 1042/1963] Refactor(nodesetloader): update nodesetloader
 (#5856)

* fix unit test

* enable tests
---
 deps/nodesetLoader                            |  2 +-
 .../check_nodeset_loader_testnodeset.c        | 68 +++++++++----------
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index 2af84b2da88..dac3acec9ae 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit 2af84b2da880461b103b9b02c65713d09a2195ed
+Subproject commit dac3acec9ae674163cb149f1990265c1c3ece878
diff --git a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
index c771f9f5788..5c926d7f021 100644
--- a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
@@ -142,7 +142,7 @@ START_TEST(readValueRank) {
     UA_Variant dims;
     // scalar
     UA_Server_readValueRank(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &rank);
-    ck_assert_int_eq(rank, -2);
+    ck_assert_int_eq(rank, -1);
     UA_Variant_init(&dims);
     UA_Server_readArrayDimensions(server, UA_NODEID_NUMERIC(testNamespaceIndex, 10002), &dims);
     ck_assert_uint_eq(dims.arrayLength, 0);
@@ -192,22 +192,20 @@ START_TEST(checkFrameValues) {
 }
 END_TEST
 
-/* TODO: Enable successful execution
- *       of this test case. */
-// START_TEST(checkInputArguments) {
-//     UA_Variant out;
-//     UA_Variant_init(&out);
-//     // Check argument
-//     UA_StatusCode status = UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 6020), &out);
-//     ck_assert(status == UA_STATUSCODE_GOOD);
-//     ck_assert(out.type == &UA_TYPES[UA_TYPES_ARGUMENT]);
-//     UA_Argument *p = (UA_Argument *)out.data;
-//     ck_assert(p->dataType.identifierType == UA_NODEIDTYPE_NUMERIC);
-//     ck_assert(p->dataType.identifier.numeric == (UA_UInt32) 3006);
-//     ck_assert(p->dataType.namespaceIndex == (UA_UInt16) testNamespaceIndex);
-//     UA_Variant_clear(&out);
-// }
-// END_TEST
+START_TEST(checkInputArguments) {
+    UA_Variant out;
+    UA_Variant_init(&out);
+    // Check argument
+    UA_StatusCode status = UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 6020), &out);
+    ck_assert(status == UA_STATUSCODE_GOOD);
+    ck_assert(out.type == &UA_TYPES[UA_TYPES_ARGUMENT]);
+    UA_Argument *p = (UA_Argument *)out.data;
+    ck_assert(p->dataType.identifierType == UA_NODEIDTYPE_NUMERIC);
+    ck_assert(p->dataType.identifier.numeric == (UA_UInt32) 3006);
+    ck_assert(p->dataType.namespaceIndex == (UA_UInt16) testNamespaceIndex);
+    UA_Variant_clear(&out);
+}
+END_TEST
 
 START_TEST(checkGuid) {
     UA_Variant out;
@@ -234,26 +232,24 @@ START_TEST(checkGuid) {
 }
 END_TEST
 
-/* TODO: Enable successful execution
- *       of this test case. */
-// START_TEST(checkDataSetMetaData) {
-//     UA_Variant out;
-//     UA_Variant_init(&out);
-//     UA_StatusCode status = UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 6021), &out);
-//     ck_assert(status == UA_STATUSCODE_GOOD);
-//     ck_assert(out.type == &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
-//     UA_DataSetMetaDataType *p = (UA_DataSetMetaDataType *)out.data;
-//     UA_String dataSetName = UA_STRING("DataSetName");
-//     ck_assert(UA_String_equal(&p->name, &dataSetName) == UA_TRUE);
-//     ck_assert(p->fieldsSize == 1);
-//     UA_String fieldName = UA_STRING("FieldName");
-//     ck_assert(UA_String_equal(&p->fields[0].name, &fieldName) == UA_TRUE);
-//     UA_Guid guid = UA_GUID("10000000-2000-3000-4000-500000000000");
-//     ck_assert(UA_Guid_equal(&p->dataSetClassId, &guid) == UA_TRUE);
+START_TEST(checkDataSetMetaData) {
+    UA_Variant out;
+    UA_Variant_init(&out);
+    UA_StatusCode status = UA_Server_readValue(server, UA_NODEID_NUMERIC(testNamespaceIndex, 6021), &out);
+    ck_assert(status == UA_STATUSCODE_GOOD);
+    ck_assert(out.type == &UA_TYPES[UA_TYPES_DATASETMETADATATYPE]);
+    UA_DataSetMetaDataType *p = (UA_DataSetMetaDataType *)out.data;
+    UA_String dataSetName = UA_STRING("DataSetName");
+    ck_assert(UA_String_equal(&p->name, &dataSetName) == UA_TRUE);
+    ck_assert(p->fieldsSize == 1);
+    UA_String fieldName = UA_STRING("FieldName");
+    ck_assert(UA_String_equal(&p->fields[0].name, &fieldName) == UA_TRUE);
+    UA_Guid guid = UA_GUID("10000000-2000-3000-4000-500000000000");
+    ck_assert(UA_Guid_equal(&p->dataSetClassId, &guid) == UA_TRUE);
 
-//     UA_Variant_clear(&out);
-// }
-// END_TEST
+    UA_Variant_clear(&out);
+}
+END_TEST
 
 static Suite *testSuite_Client(void) {
     Suite *s = suite_create("Server Nodeset Compiler");

From d5498535bed471f874c15e58a3de107138b38479 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Wed, 12 Jul 2023 10:18:17 +0200
Subject: [PATCH 1043/1963] fix(server): Fix symmetry of serviceMutex (#5868)

Call unlock at all return cases after lock.
---
 src/pubsub/ua_pubsub_eventloop.c               |  1 +
 src/server/ua_server_binary.c                  |  1 +
 src/server/ua_server_ns0_diagnostics.c         |  1 +
 src/server/ua_session.c                        |  4 +++-
 src/server/ua_subscription_alarms_conditions.c | 13 +++++++++----
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 9562526b328..6300c7e549c 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -178,6 +178,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                                   "No more space for an additional EventLoop connection");
         if(psc->cm)
             psc->cm->closeConnection(psc->cm, connectionId);
+        UA_UNLOCK(&server->serviceMutex);
         return;
     }
 
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index b04a1a2c9fe..19312a6ebc5 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1591,6 +1591,7 @@ UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
     if(!bpm) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "No BinaryProtocolManager configured");
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 34809822791..8663e942720 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -590,6 +590,7 @@ readDiagnostics(UA_Server *server, const UA_NodeId *sessionId, void *sessionCont
         data = &server->serverDiagnosticsSummary.rejectedRequestsCount;
         break;
     default:
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index a1a413a4f73..8605d0933d4 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -289,8 +289,10 @@ UA_Server_deleteSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
         return UA_STATUSCODE_BADNOTWRITABLE;
     UA_LOCK(&server->serviceMutex);
     UA_Session *session = getSessionById(server, sessionId);
-    if(!session)
+    if(!session) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADSESSIONIDINVALID;
+    }
     UA_StatusCode res =
         UA_KeyValueMap_remove(session->attributes, key);
     UA_UNLOCK(&server->serviceMutex);
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 02c7f21837a..1e7610a579b 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -506,10 +506,15 @@ UA_Server_getConditionBranchNodeId(UA_Server *server, const UA_ByteString *event
             LIST_FOREACH(branch, &cond->conditionBranches, listEntry) {
                 if(!UA_ByteString_equal(&branch->lastEventId, eventId))
                     continue;
-                if(UA_NodeId_isNull(&branch->conditionBranchId))
-                    return UA_NodeId_copy(&cond->conditionId, outConditionBranchNodeId);
-                else
-                    return UA_NodeId_copy(&branch->conditionBranchId, outConditionBranchNodeId);
+                if(UA_NodeId_isNull(&branch->conditionBranchId)) {
+                    res = UA_NodeId_copy(&cond->conditionId, outConditionBranchNodeId);
+                    UA_UNLOCK(&server->serviceMutex);
+                    return res;
+                } else {
+                    res = UA_NodeId_copy(&branch->conditionBranchId, outConditionBranchNodeId);
+                    UA_UNLOCK(&server->serviceMutex);
+                    return res;
+                }
                 goto out;
             }
         }

From d3370743923fe7926fbb11073ac2652d6a8e2562 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Wed, 12 Jul 2023 10:19:12 +0200
Subject: [PATCH 1044/1963] fix(arch): Fix issues with eventloop mutex (#5869)

Call unlock at all return cases after lock.
---
 arch/eventloop_posix.c        | 2 ++
 arch/eventloop_posix_select.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 498c1760438..c5f1bf47124 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -82,6 +82,7 @@ UA_EventLoopPOSIX_removeDelayedCallback(UA_EventLoop *public_el,
     while(*prev) {
         if(*prev == dc) {
             *prev = (*prev)->next;
+            UA_UNLOCK(&el->elMutex);
             return;
         }
         prev = &(*prev)->next;
@@ -309,6 +310,7 @@ UA_EventLoopPOSIX_registerEventSource(UA_EventLoopPOSIX *el,
                      "Cannot register the EventSource \"%.*s\": "
                      "already registered",
                      (int)es->name.length, (char*)es->name.data);
+        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
diff --git a/arch/eventloop_posix_select.c b/arch/eventloop_posix_select.c
index cc0ff3ec63c..f5465aafbc6 100644
--- a/arch/eventloop_posix_select.c
+++ b/arch/eventloop_posix_select.c
@@ -19,7 +19,6 @@ UA_EventLoopPOSIX_registerFD(UA_EventLoopPOSIX *el, UA_RegisteredFD *rfd) {
     UA_RegisteredFD **fds_tmp = (UA_RegisteredFD**)
         UA_realloc(el->fds, sizeof(UA_RegisteredFD*) * (el->fdsSize + 1));
     if(!fds_tmp) {
-        UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
     el->fds = fds_tmp;

From 6f7c98bca398b11f22c315d15abb30a8abdc3967 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Wed, 12 Jul 2023 10:19:59 +0200
Subject: [PATCH 1045/1963] feat(server): add asserts for serviceMutex (#5870)

Call UA_LOCK_ASSERT in all functions where unlock is done.
---
 src/pubsub/ua_pubsub_eventloop.c           | 10 ++++++++++
 src/server/ua_server.c                     |  2 ++
 src/server/ua_server_ns0.c                 |  2 ++
 src/server/ua_services_attribute.c         |  8 ++++++--
 src/server/ua_services_method.c            |  2 ++
 src/server/ua_services_nodemanagement.c    | 10 ++++++++++
 src/server/ua_subscription_datachange.c    |  1 +
 src/server/ua_subscription_monitoreditem.c |  4 ++++
 8 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 6300c7e549c..7ac50b1fa1a 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -273,6 +273,8 @@ PubSubSendChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 static UA_StatusCode
 UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
         c->config.address.data;
 
@@ -377,6 +379,8 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c) {
 
 static UA_StatusCode
 UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
         c->config.address.data;
 
@@ -558,6 +562,8 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 static UA_StatusCode
 UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Already connected? */
     if(wg->sendChannel != 0)
         return UA_STATUSCODE_GOOD;
@@ -627,6 +633,8 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg) {
 
 static UA_StatusCode
 UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_PubSubConnection *c = wg->linkedConnection;
     UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
         c->config.address.data;
@@ -888,6 +896,8 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
 static UA_StatusCode
 UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_PubSubConnection *c = rg->linkedConnection;
     UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
         c->config.address.data;
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index ca2c8de70d7..47aa689a43d 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -662,6 +662,8 @@ UA_Server_getStatistics(UA_Server *server) {
 
 void
 setServerLifecycleState(UA_Server *server, UA_LifecycleState state) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(server->state == state)
         return;
     server->state = state;
diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 4ee5554340d..874a8da5357 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -824,6 +824,8 @@ addModellingRules(UA_Server *server) {
  * example server time. */
 UA_StatusCode
 initNS0(UA_Server *server) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Initialize base nodes which are always required an cannot be created
      * through the NS compiler */
     server->bootstrapNS0 = true;
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index e403730b489..29afe4c475c 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -75,6 +75,7 @@ getUserWriteMask(UA_Server *server, const UA_Session *session,
     if(session == &server->adminSession)
         return 0xFFFFFFFF; /* the local admin user has all rights */
     UA_UInt32 mask = head->writeMask;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_UNLOCK(&server->serviceMutex);
     mask &= server->config.accessControl.
         getUserRightsMask(server, &server->config.accessControl,
@@ -99,6 +100,7 @@ getUserAccessLevel(UA_Server *server, const UA_Session *session,
     if(session == &server->adminSession)
         return 0xFF; /* the local admin user has all rights */
     UA_Byte retval = node->accessLevel;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_UNLOCK(&server->serviceMutex);
     retval &= server->config.accessControl.
         getUserAccessLevel(server, &server->config.accessControl,
@@ -114,6 +116,7 @@ getUserExecutable(UA_Server *server, const UA_Session *session,
                   const UA_MethodNode *node) {
     if(session == &server->adminSession)
         return true; /* the local admin user has all rights */
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_UNLOCK(&server->serviceMutex);
     UA_Boolean userExecutable = node->executable;
     userExecutable &=
@@ -157,6 +160,7 @@ static UA_StatusCode
 readValueAttributeFromNode(UA_Server *server, UA_Session *session,
                            const UA_VariableNode *vn, UA_DataValue *v,
                            UA_NumericRange *rangeptr) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     /* Update the value by the user callback */
     if(vn->value.data.callback.onRead) {
         UA_UNLOCK(&server->serviceMutex);
@@ -191,6 +195,7 @@ readValueAttributeFromDataSource(UA_Server *server, UA_Session *session,
                                  const UA_VariableNode *vn, UA_DataValue *v,
                                  UA_TimestampsToReturn timestamps,
                                  UA_NumericRange *rangeptr) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(!vn->value.dataSource.read)
         return UA_STATUSCODE_BADINTERNALERROR;
     UA_Boolean sourceTimeStamp = (timestamps == UA_TIMESTAMPSTORETURN_SOURCE ||
@@ -1407,6 +1412,7 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
                         const UA_String *indexRange) {
     UA_assert(node != NULL);
     UA_assert(session != NULL);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Parse the range */
     UA_NumericRange range;
@@ -1837,8 +1843,6 @@ Service_Write(UA_Server *server, UA_Session *session,
         return;
     }
 
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
     response->responseHeader.serviceResult =
         UA_Server_processServiceOperations(server, session,
                                            (UA_ServiceOperation)Operation_Write, NULL,
diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 4b1c3c54804..e32b5e242af 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -206,6 +206,8 @@ static void
 callWithMethodAndObject(UA_Server *server, UA_Session *session,
                         const UA_CallMethodRequest *request, UA_CallMethodResult *result,
                         const UA_MethodNode *method, const UA_ObjectNode *object) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Verify the object's NodeClass */
     if(object->head.nodeClass != UA_NODECLASS_OBJECT &&
        object->head.nodeClass != UA_NODECLASS_OBJECTTYPE) {
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index a86d00e30b9..ac299ba7339 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -592,6 +592,7 @@ copyChild(UA_Server *server, UA_Session *session,
           const UA_NodeId *destinationNodeId,
           const UA_ReferenceDescription *rd) {
     UA_assert(session);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Is there an existing child with the browsename? */
     UA_NodeId existingChild = UA_NODEID_NULL;
@@ -1018,6 +1019,7 @@ addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
             const UA_AddNodesItem *item, UA_NodeId *outNewNodeId) {
     /* Do not check access for server */
     if(session != &server->adminSession && server->config.accessControl.allowAddNode) {
+        UA_LOCK_ASSERT(&server->serviceMutex, 1);
         UA_UNLOCK(&server->serviceMutex);
         if(!server->config.accessControl.
            allowAddNode(server, &server->config.accessControl,
@@ -1198,6 +1200,8 @@ Operation_addNode_begin(UA_Server *server, UA_Session *session, void *nodeContex
 static UA_StatusCode
 recursiveCallConstructors(UA_Server *server, UA_Session *session,
                           const UA_NodeId *nodeId, const UA_Node *type) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Browse the children */
     UA_BrowseDescription bd;
     UA_BrowseDescription_init(&bd);
@@ -1768,6 +1772,8 @@ hasParentRef(const UA_NodeHead *head, const UA_ReferenceTypeSet *refSet,
 static void
 deconstructNodeSet(UA_Server *server, UA_Session *session,
                    UA_ReferenceTypeSet *hierarchRefsSet, RefTree *refTree) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Deconstruct the nodes based on the RefTree entries, parent nodes first */
     for(size_t i = 0; i < refTree->size; i++) {
         const UA_Node *member = UA_NODESTORE_GET(server, &refTree->targets[i].nodeId);
@@ -1920,6 +1926,8 @@ deleteNodeSet(UA_Server *server, UA_Session *session,
 static void
 deleteNodeOperation(UA_Server *server, UA_Session *session, void *context,
                     const UA_DeleteNodesItem *item, UA_StatusCode *result) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Do not check access for server */
     if(session != &server->adminSession && server->config.accessControl.allowDeleteNode) {
         UA_UNLOCK(&server->serviceMutex);
@@ -2072,6 +2080,7 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
                        const UA_AddReferencesItem *item, UA_StatusCode *retval) {
     (void)context;
     UA_assert(session);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Check access rights */
     if(session != &server->adminSession && server->config.accessControl.allowAddReference) {
@@ -2245,6 +2254,7 @@ Operation_deleteReference(UA_Server *server, UA_Session *session, void *context,
     /* Do not check access for server */
     if(session != &server->adminSession &&
        server->config.accessControl.allowDeleteReference) {
+        UA_LOCK_ASSERT(&server->serviceMutex, 1);
         UA_UNLOCK(&server->serviceMutex);
         if (!server->config.accessControl.
                 allowDeleteReference(server, &server->config.accessControl,
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index 5fb1fe6dbb4..4d572d2729c 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -154,6 +154,7 @@ UA_StatusCode
 sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
                         UA_MonitoredItem *mon, UA_DataValue *value) {
     UA_assert(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Has the value changed (with the filters applied)? */
     UA_Boolean changed = detectValueChange(server, mon, value);
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 113d7501722..425297fae52 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -422,6 +422,8 @@ removeMonitoredItemBackPointer(UA_Server *server, UA_Session *session,
 
 void
 UA_Server_registerMonitoredItem(UA_Server *server, UA_MonitoredItem *mon) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(mon->registered)
         return;
 
@@ -461,6 +463,8 @@ UA_Server_registerMonitoredItem(UA_Server *server, UA_MonitoredItem *mon) {
 
 static void
 UA_Server_unregisterMonitoredItem(UA_Server *server, UA_MonitoredItem *mon) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(!mon->registered)
         return;
 

From a4c9b52483ae128bfe8cd33404981f16f582f260 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Wed, 12 Jul 2023 17:42:30 +0200
Subject: [PATCH 1046/1963] fix(server): unlock serviceMutex before calling
 accessControl callbacks (#5872)

---
 src/server/ua_services_subscription.c | 20 ++++++++++++++------
 src/server/ua_services_view.c         | 21 +++++++++++++--------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index cee3f959d8f..3d305868ff6 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -485,12 +485,20 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     }
 
     /* Check with AccessControl if the transfer is allowed */
-    if(!server->config.accessControl.allowTransferSubscription ||
-       !server->config.accessControl.
-       allowTransferSubscription(server, &server->config.accessControl,
-                                 oldSession ? &oldSession->sessionId : NULL,
-                                 oldSession ? oldSession->sessionHandle : NULL,
-                                 &session->sessionId, session->sessionHandle)) {
+    if(server->config.accessControl.allowTransferSubscription) {
+        UA_LOCK_ASSERT(&server->serviceMutex, 1);
+        UA_UNLOCK(&server->serviceMutex);
+        if(!server->config.accessControl.
+           allowTransferSubscription(server, &server->config.accessControl,
+                                     oldSession ? &oldSession->sessionId : NULL,
+                                     oldSession ? oldSession->sessionHandle : NULL,
+                                     &session->sessionId, session->sessionHandle)) {
+            UA_LOCK(&server->serviceMutex);
+            result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
+            return;
+        }
+        UA_LOCK(&server->serviceMutex);
+    } else {
         result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
         return;
     }
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 26b82ebace1..ede8ad7c002 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -783,14 +783,19 @@ browse(struct BrowseContext *bc) {
     }
 
     /* Check AccessControl rights */
-    if(bc->session != &bc->server->adminSession &&
-       !bc->server->config.accessControl.
-         allowBrowseNode(bc->server, &bc->server->config.accessControl,
-                         &bc->session->sessionId, bc->session->sessionHandle,
-                         &descr->nodeId, node->head.context)) {
-        UA_NODESTORE_RELEASE(bc->server, node);
-        bc->status = UA_STATUSCODE_BADUSERACCESSDENIED;
-        return;
+    if(bc->session != &bc->server->adminSession) {
+        UA_LOCK_ASSERT(&bc->server->serviceMutex, 1);
+        UA_UNLOCK(&bc->server->serviceMutex);
+        if(!bc->server->config.accessControl.
+           allowBrowseNode(bc->server, &bc->server->config.accessControl,
+                           &bc->session->sessionId, bc->session->sessionHandle,
+                           &descr->nodeId, node->head.context)) {
+            UA_LOCK(&bc->server->serviceMutex);
+            UA_NODESTORE_RELEASE(bc->server, node);
+            bc->status = UA_STATUSCODE_BADUSERACCESSDENIED;
+            return;
+        }
+        UA_LOCK(&bc->server->serviceMutex);
     }
 
     /* Browse the node */

From aa8d96ea5b147079f1333b0b42264d14bfca7ecd Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 13 Jul 2023 15:13:02 +0200
Subject: [PATCH 1047/1963] fix(ci): Fix git version matching

Fix parsing of version_minor and version_patch from git description.

Fixes commit 93823da590c63fb20884db678663ac3cbe58e377
---
 tools/prepare_packaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index 84d7b2d0df0..d0191bbcd99 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -29,7 +29,7 @@
 # v1.2.3-5-g4538abcd-dirty
 # git_describe_version = "v1.2.3"
 
-m = re.match(r"^v([0-9]{1,4})(\.[0-9]{1,4}){0,2}(-(.*){1,100})?$", git_describe_version)
+m = re.match(r"^v([0-9]{1,4})(\.[0-9]{1,4})?(\.[0-9]{1,4})?(-(.*){1,100})?$", git_describe_version)
 version_major = m.group(1) if m.group(1) is not None else "0"
 version_minor = m.group(2).replace(".", "") if m.group(2) is not None else "0"
 version_patch = m.group(3).replace(".", "") if m.group(3) is not None else "0"

From 5ec95180c8e81f58a76261288e9a734afd6fe335 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Tue, 13 Dec 2022 16:11:26 +0100
Subject: [PATCH 1048/1963] feat(server): Add Aes256-Sha256-RsaPss security
 policy

---
 CMakeLists.txt                                |   2 +
 .../mbedtls/securitypolicy_mbedtls_common.c   |   5 +-
 .../mbedtls/securitypolicy_mbedtls_common.h   |   2 +-
 .../ua_securitypolicy_aes128sha256rsaoaep.c   |   2 +-
 .../ua_securitypolicy_aes256sha256rsapss.c    | 946 ++++++++++++++++++
 .../mbedtls/ua_securitypolicy_basic256.c      |   2 +-
 .../ua_securitypolicy_basic256sha256.c        |   2 +-
 .../openssl/securitypolicy_openssl_common.c   | 114 ++-
 .../openssl/securitypolicy_openssl_common.h   |  21 +
 .../openssl/ua_openssl_aes256sha256rsapss.c   | 692 +++++++++++++
 .../open62541/plugin/securitypolicy_default.h |   6 +
 .../include/open62541/server_config_default.h |  15 +
 plugins/ua_config_default.c                   |  65 +-
 src/client/ua_client_connect.c                |  14 +-
 src/server/ua_services_session.c              |   8 +-
 tests/CMakeLists.txt                          |   4 +
 .../check_encryption_aes256sha256rsapss.c     | 287 ++++++
 tests/fuzz/CMakeLists.txt                     |   1 +
 18 files changed, 2158 insertions(+), 30 deletions(-)
 create mode 100644 plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
 create mode 100644 plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
 create mode 100644 tests/encryption/check_encryption_aes256sha256rsapss.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b53044ec80..4f2f738c197 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1029,6 +1029,7 @@ list(INSERT default_plugin_sources 1
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c)
 endif()
 
@@ -1047,6 +1048,7 @@ list(INSERT default_plugin_sources 0
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic256.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic256sha256.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_create_certificate.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_pki_openssl.c)
 endif()
diff --git a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
index a522014d6b5..667d90af19f 100644
--- a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
+++ b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c
@@ -230,12 +230,13 @@ mbedtls_encrypt_rsaOaep(mbedtls_rsa_context *context,
 UA_StatusCode
 mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
                         mbedtls_ctr_drbg_context *drbgContext,
-                        UA_ByteString *data) {
+                        UA_ByteString *data, int hash_id) {
     mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(*localPrivateKey);
-    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA1);
 #if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V21, hash_id);
     size_t keylen = rsaContext->len;
 #else
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V21, (mbedtls_md_type_t)hash_id);
     size_t keylen = mbedtls_rsa_get_len(rsaContext);
 #endif
     if(data->length % keylen != 0)
diff --git a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
index f8976d54514..19fc97cf00c 100644
--- a/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
+++ b/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
@@ -57,7 +57,7 @@ mbedtls_encrypt_rsaOaep(mbedtls_rsa_context *context,
 UA_StatusCode
 mbedtls_decrypt_rsaOaep(mbedtls_pk_context *localPrivateKey,
                         mbedtls_ctr_drbg_context *drbgContext,
-                        UA_ByteString *data);
+                        UA_ByteString *data, int hash_id);
 
 int UA_mbedTLS_LoadPrivateKey(const UA_ByteString *key, mbedtls_pk_context *target, void *p_rng);
 
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
index bfaf63c5009..f97b262bb97 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
@@ -210,7 +210,7 @@ asym_decrypt_sp_aes128sha256rsaoaep(Aes128Sha256PsaOaep_ChannelContext *cc,
     if(cc == NULL || data == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
     return mbedtls_decrypt_rsaOaep(&cc->policyContext->localPrivateKey,
-                                   &cc->policyContext->drbgContext, data);
+                                   &cc->policyContext->drbgContext, data, MBEDTLS_MD_SHA1);
 }
 
 static size_t
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c b/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
new file mode 100644
index 00000000000..0aa5cbb8f8d
--- /dev/null
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
@@ -0,0 +1,946 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Noel Graf)
+ */
+
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/util.h>
+
+#ifdef UA_ENABLE_ENCRYPTION_MBEDTLS
+
+#include "securitypolicy_mbedtls_common.h"
+
+#include <mbedtls/aes.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/error.h>
+#include <mbedtls/md.h>
+#include <mbedtls/sha1.h>
+#include <mbedtls/sha256.h>
+#include <mbedtls/version.h>
+#include <mbedtls/x509_crt.h>
+
+/* Notes:
+ * mbedTLS' AES allows in-place encryption and decryption. So we don't have to
+ * allocate temp buffers.
+ * https://tls.mbed.org/discussions/generic/in-place-decryption-with-aes256-same-input-output-buffer
+ */
+
+#define UA_SHA1_LENGTH 20
+#define UA_SHA256_LENGTH 32
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_RSAPADDING_LEN 66 /* UA_SHA256_LENGTH * 2 + 2 */
+#define UA_AES256SHA256RSAPSS_SYM_SIGNING_KEY_LENGTH 32
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_KEY_LENGTH 32 /*16*/
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_BLOCK_SIZE 16
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_PLAIN_TEXT_BLOCK_SIZE 16
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_MINASYMKEYLENGTH 256
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_MAXASYMKEYLENGTH 512
+
+typedef struct {
+    UA_ByteString localCertThumbprint;
+
+    mbedtls_ctr_drbg_context drbgContext;
+    mbedtls_entropy_context entropyContext;
+    mbedtls_md_context_t sha256MdContext;
+    mbedtls_pk_context localPrivateKey;
+} Aes256Sha256RsaPss_PolicyContext;
+
+typedef struct {
+    Aes256Sha256RsaPss_PolicyContext *policyContext;
+
+    UA_ByteString localSymSigningKey;
+    UA_ByteString localSymEncryptingKey;
+    UA_ByteString localSymIv;
+
+    UA_ByteString remoteSymSigningKey;
+    UA_ByteString remoteSymEncryptingKey;
+    UA_ByteString remoteSymIv;
+
+    mbedtls_x509_crt remoteCertificate;
+} Aes256Sha256RsaPss_ChannelContext;
+
+/********************/
+/* AsymmetricModule */
+/********************/
+
+/* VERIFY AsymmetricSignatureAlgorithm_RSA-PKCS15-SHA2-256 */
+static UA_StatusCode
+asym_verify_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                   const UA_ByteString *message,
+                                   const UA_ByteString *signature) {
+    if(message == NULL || signature == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    unsigned char hash[UA_SHA256_LENGTH];
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    // TODO check return status
+    mbedtls_sha256_ret(message->data, message->length, hash, 0);
+#else
+    mbedtls_sha256(message->data, message->length, hash, 0);
+#endif
+
+    /* Set the RSA settings */
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA256);
+
+#if MBEDTLS_VERSION_NUMBER < 0x03000000
+    Aes256Sha256RsaPss_PolicyContext *pc = cc->policyContext;
+    int mbedErr = mbedtls_rsa_pkcs1_verify(rsaContext, mbedtls_ctr_drbg_random, &pc->drbgContext,
+                                                MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA256, UA_SHA256_LENGTH,
+                                                hash, signature->data);
+#else
+    int mbedErr = mbedtls_rsa_pkcs1_verify(rsaContext, MBEDTLS_MD_SHA256,
+                                         UA_SHA256_LENGTH, hash, signature->data);
+#endif
+
+    if(mbedErr)
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    return UA_STATUSCODE_GOOD;
+}
+
+/* AsymmetricSignatureAlgorithm_RSA-PSS-SHA2-256 */
+static UA_StatusCode
+asym_sign_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                 const UA_ByteString *message,
+                                 UA_ByteString *signature) {
+    if(message == NULL || signature == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    unsigned char hash[UA_SHA256_LENGTH];
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    // TODO check return status
+    mbedtls_sha256_ret(message->data, message->length, hash, 0);
+#else
+    mbedtls_sha256(message->data, message->length, hash, 0);
+#endif
+
+    Aes256Sha256RsaPss_PolicyContext *pc = cc->policyContext;
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(pc->localPrivateKey);
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA256);
+
+#if MBEDTLS_VERSION_NUMBER < 0x03000000
+    int mbedErr =  mbedtls_rsa_pkcs1_sign(rsaContext, mbedtls_ctr_drbg_random, &pc->drbgContext,
+                                          MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA256, UA_SHA256_LENGTH,
+                                          hash, signature->data);
+#else
+    int mbedErr =  mbedtls_rsa_pkcs1_sign(rsaContext, mbedtls_ctr_drbg_random, &pc->drbgContext,
+                                          MBEDTLS_MD_SHA256, UA_SHA256_LENGTH,
+                                          hash, signature->data);
+#endif
+
+
+    if(mbedErr)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    return UA_STATUSCODE_GOOD;
+}
+
+static size_t
+asym_getLocalSignatureSize_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc) {
+    if(cc == NULL)
+        return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+#else
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
+#endif
+}
+
+static size_t
+asym_getRemoteSignatureSize_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc) {
+    if(cc == NULL)
+        return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
+}
+
+static size_t
+asym_getRemoteBlockSize_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc) {
+    if(cc == NULL)
+        return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
+}
+
+static size_t
+asym_getRemotePlainTextBlockSize_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc) {
+    if(cc == NULL)
+        return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    mbedtls_rsa_context *const rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    return rsaContext->len - UA_SECURITYPOLICY_AES256SHA256RSAPSS_RSAPADDING_LEN;
+#else
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk)) -
+        UA_SECURITYPOLICY_AES256SHA256RSAPSS_RSAPADDING_LEN;
+#endif
+}
+
+
+/* AsymmetricEncryptionAlgorithm_RSA-OAEP-SHA2 */
+static UA_StatusCode
+asym_encrypt_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                    UA_ByteString *data) {
+    if(cc == NULL || data == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const size_t plainTextBlockSize = asym_getRemotePlainTextBlockSize_sp_aes256sha256rsapss(cc);
+
+    mbedtls_rsa_context *remoteRsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    mbedtls_rsa_set_padding(remoteRsaContext, MBEDTLS_RSA_PKCS_V21, MBEDTLS_MD_SHA256);
+
+    return mbedtls_encrypt_rsaOaep(remoteRsaContext, &cc->policyContext->drbgContext,
+                                   data, plainTextBlockSize);
+}
+
+/* AsymmetricEncryptionAlgorithm_RSA-OAEP-SHA2 */
+static UA_StatusCode
+asym_decrypt_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                    UA_ByteString *data) {
+    if(cc == NULL || data == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    return mbedtls_decrypt_rsaOaep(&cc->policyContext->localPrivateKey,
+                                   &cc->policyContext->drbgContext, data, MBEDTLS_MD_SHA256);
+}
+
+static size_t
+asym_getLocalEncryptionKeyLength_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc) {
+    return mbedtls_pk_get_len(&cc->policyContext->localPrivateKey) * 8;
+}
+
+static size_t
+asym_getRemoteEncryptionKeyLength_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc) {
+    return mbedtls_pk_get_len(&cc->remoteCertificate.pk) * 8;
+}
+
+static UA_StatusCode
+asym_makeThumbprint_sp_aes256sha256rsapss(const UA_SecurityPolicy *securityPolicy,
+                                           const UA_ByteString *certificate,
+                                           UA_ByteString *thumbprint) {
+    if(securityPolicy == NULL || certificate == NULL || thumbprint == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    return mbedtls_thumbprint_sha1(certificate, thumbprint);
+}
+
+static UA_StatusCode
+asymmetricModule_compareCertificateThumbprint_sp_aes256sha256rsapss(const UA_SecurityPolicy *securityPolicy,
+                                                                     const UA_ByteString *certificateThumbprint) {
+    if(securityPolicy == NULL || certificateThumbprint == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Aes256Sha256RsaPss_PolicyContext *pc = (Aes256Sha256RsaPss_PolicyContext *)securityPolicy->policyContext;
+    if(!UA_ByteString_equal(certificateThumbprint, &pc->localCertThumbprint))
+        return UA_STATUSCODE_BADCERTIFICATEINVALID;
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/*******************/
+/* SymmetricModule */
+/*******************/
+
+static UA_StatusCode
+sym_verify_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                  const UA_ByteString *message,
+                                  const UA_ByteString *signature) {
+    if(cc == NULL || message == NULL || signature == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Compute MAC */
+    if(signature->length != UA_SHA256_LENGTH)
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    Aes256Sha256RsaPss_PolicyContext *pc = cc->policyContext;
+    unsigned char mac[UA_SHA256_LENGTH];
+    mbedtls_hmac(&pc->sha256MdContext, &cc->remoteSymSigningKey, message, mac);
+
+    /* Compare with Signature */
+    if(!UA_constantTimeEqual(signature->data, mac, UA_SHA256_LENGTH))
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+sym_sign_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc,
+                                const UA_ByteString *message,
+                                UA_ByteString *signature) {
+    if(signature->length != UA_SHA256_LENGTH)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    mbedtls_hmac(&cc->policyContext->sha256MdContext, &cc->localSymSigningKey,
+                 message, signature->data);
+    return UA_STATUSCODE_GOOD;
+}
+
+static size_t
+sym_getSignatureSize_sp_aes256sha256rsapss(const void *channelContext) {
+    return UA_SHA256_LENGTH;
+}
+
+static size_t
+sym_getSigningKeyLength_sp_aes256sha256rsapss(const void *channelContext) {
+    return UA_AES256SHA256RSAPSS_SYM_SIGNING_KEY_LENGTH;
+}
+
+static size_t
+sym_getEncryptionKeyLength_sp_aes256sha256rsapss(const void *channelContext) {
+    return UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_KEY_LENGTH;
+}
+
+static size_t
+sym_getEncryptionBlockSize_sp_aes256sha256rsapss(const void *channelContext) {
+    return UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_BLOCK_SIZE;
+}
+
+static size_t
+sym_getPlainTextBlockSize_sp_aes256sha256rsapss(const void *channelContext) {
+    return UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_PLAIN_TEXT_BLOCK_SIZE;
+}
+
+static UA_StatusCode
+sym_encrypt_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc,
+                                   UA_ByteString *data) {
+    if(cc == NULL || data == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if(cc->localSymIv.length != UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_BLOCK_SIZE)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    size_t plainTextBlockSize = UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_PLAIN_TEXT_BLOCK_SIZE;
+
+    if(data->length % plainTextBlockSize != 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Keylength in bits */
+    unsigned int keylength = (unsigned int)(cc->localSymEncryptingKey.length * 8);
+    mbedtls_aes_context aesContext;
+    int mbedErr = mbedtls_aes_setkey_enc(&aesContext, cc->localSymEncryptingKey.data, keylength);
+    if(mbedErr)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString ivCopy;
+    UA_StatusCode retval = UA_ByteString_copy(&cc->localSymIv, &ivCopy);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    mbedErr = mbedtls_aes_crypt_cbc(&aesContext, MBEDTLS_AES_ENCRYPT, data->length,
+                                    ivCopy.data, data->data, data->data);
+    if(mbedErr)
+        retval = UA_STATUSCODE_BADINTERNALERROR;
+    UA_ByteString_clear(&ivCopy);
+    return retval;
+}
+
+static UA_StatusCode
+sym_decrypt_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc,
+                                   UA_ByteString *data) {
+    if(cc == NULL || data == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    size_t encryptionBlockSize = UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_BLOCK_SIZE;
+
+    if(cc->remoteSymIv.length != encryptionBlockSize)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if(data->length % encryptionBlockSize != 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    unsigned int keylength = (unsigned int)(cc->remoteSymEncryptingKey.length * 8);
+    mbedtls_aes_context aesContext;
+    int mbedErr = mbedtls_aes_setkey_dec(&aesContext, cc->remoteSymEncryptingKey.data, keylength);
+    if(mbedErr)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString ivCopy;
+    UA_StatusCode retval = UA_ByteString_copy(&cc->remoteSymIv, &ivCopy);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    mbedErr = mbedtls_aes_crypt_cbc(&aesContext, MBEDTLS_AES_DECRYPT, data->length,
+                                    ivCopy.data, data->data, data->data);
+    if(mbedErr)
+        retval = UA_STATUSCODE_BADINTERNALERROR;
+    UA_ByteString_clear(&ivCopy);
+    return retval;
+}
+
+static UA_StatusCode
+sym_generateKey_sp_aes256sha256rsapss(void *policyContext, const UA_ByteString *secret,
+                                       const UA_ByteString *seed, UA_ByteString *out) {
+    if(secret == NULL || seed == NULL || out == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Aes256Sha256RsaPss_PolicyContext *pc = (Aes256Sha256RsaPss_PolicyContext *)policyContext;
+    return mbedtls_generateKey(&pc->sha256MdContext, secret, seed, out);
+}
+
+static UA_StatusCode
+sym_generateNonce_sp_aes256sha256rsapss(void *policyContext, UA_ByteString *out) {
+    if(out == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Aes256Sha256RsaPss_PolicyContext *pc =
+        (Aes256Sha256RsaPss_PolicyContext *)policyContext;
+    int mbedErr = mbedtls_ctr_drbg_random(&pc->drbgContext, out->data, out->length);
+    if(mbedErr)
+        return UA_STATUSCODE_BADUNEXPECTEDERROR;
+    return UA_STATUSCODE_GOOD;
+}
+
+/***********************************/
+/* CertificateSigningAlgorithms    */
+/***********************************/
+
+static UA_StatusCode
+asym_cert_verify_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                   const UA_ByteString *message,
+                                   const UA_ByteString *signature) {
+    if(message == NULL || signature == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    unsigned char hash[UA_SHA256_LENGTH];
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    // TODO check return status
+    mbedtls_sha256_ret(message->data, message->length, hash, 0);
+#else
+    mbedtls_sha256(message->data, message->length, hash, 0);
+#endif
+
+    /* Set the RSA settings */
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_SHA256);
+
+    /* For RSA keys, the default padding type is PKCS#1 v1.5 in mbedtls_pk_verify() */
+    /* Alternatively, use more specific function mbedtls_rsa_rsassa_pkcs1_v15_verify(), i.e. */
+    /* int mbedErr = mbedtls_rsa_rsassa_pkcs1_v15_verify(rsaContext, NULL, NULL,
+                                                         MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA256,
+                                                         UA_SHA256_LENGTH, hash,
+                                                         signature->data); */
+    int mbedErr = mbedtls_pk_verify(&cc->remoteCertificate.pk,
+                                    MBEDTLS_MD_SHA256, hash, UA_SHA256_LENGTH,
+                                    signature->data, signature->length);
+
+    if(mbedErr)
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    return UA_STATUSCODE_GOOD;
+}
+
+/* AsymmetricSignatureAlgorithm_RSA-PKCS15-SHA2-256 */
+static UA_StatusCode
+asym_cert_sign_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                 const UA_ByteString *message,
+                                 UA_ByteString *signature) {
+    if(message == NULL || signature == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    unsigned char hash[UA_SHA256_LENGTH];
+#if MBEDTLS_VERSION_NUMBER >= 0x02070000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    // TODO check return status
+    mbedtls_sha256_ret(message->data, message->length, hash, 0);
+#else
+    mbedtls_sha256(message->data, message->length, hash, 0);
+#endif
+
+    Aes256Sha256RsaPss_PolicyContext *pc = cc->policyContext;
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(pc->localPrivateKey);
+    mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, MBEDTLS_MD_SHA256);
+
+    size_t sigLen = 0;
+
+    /* For RSA keys, the default padding type is PKCS#1 v1.5 in mbedtls_pk_sign */
+    /* Alternatively use more specific function mbedtls_rsa_rsassa_pkcs1_v15_sign() */
+    int mbedErr = mbedtls_pk_sign(&pc->localPrivateKey,
+                                  MBEDTLS_MD_SHA256, hash,
+                                  UA_SHA256_LENGTH, signature->data,
+#if MBEDTLS_VERSION_NUMBER >= 0x03000000
+        signature->length,
+#endif
+                                  &sigLen, mbedtls_ctr_drbg_random,
+                                  &pc->drbgContext);
+    if(mbedErr)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    return UA_STATUSCODE_GOOD;
+}
+
+static size_t
+asym_cert_getLocalSignatureSize_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc) {
+    if(cc == NULL)
+        return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->policyContext->localPrivateKey)->len;
+#else
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->policyContext->localPrivateKey));
+#endif
+}
+
+static size_t
+asym_cert_getRemoteSignatureSize_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc) {
+    if(cc == NULL)
+        return 0;
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    return mbedtls_pk_rsa(cc->remoteCertificate.pk)->len;
+#else
+    return mbedtls_rsa_get_len(mbedtls_pk_rsa(cc->remoteCertificate.pk));
+#endif
+}
+
+/*****************/
+/* ChannelModule */
+/*****************/
+
+/* Assumes that the certificate has been verified externally */
+static UA_StatusCode
+parseRemoteCertificate_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                              const UA_ByteString *remoteCertificate) {
+    if(remoteCertificate == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Parse the certificate */
+    int mbedErr = mbedtls_x509_crt_parse(&cc->remoteCertificate, remoteCertificate->data,
+                                         remoteCertificate->length);
+    if(mbedErr)
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+
+    /* Check the key length */
+    mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    size_t keylen = rsaContext->len;
+#else
+    size_t keylen = mbedtls_rsa_get_len(rsaContext);
+#endif
+    if(keylen < UA_SECURITYPOLICY_AES256SHA256RSAPSS_MINASYMKEYLENGTH ||
+       keylen > UA_SECURITYPOLICY_AES256SHA256RSAPSS_MAXASYMKEYLENGTH)
+        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+channelContext_deleteContext_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc) {
+    UA_ByteString_clear(&cc->localSymSigningKey);
+    UA_ByteString_clear(&cc->localSymEncryptingKey);
+    UA_ByteString_clear(&cc->localSymIv);
+
+    UA_ByteString_clear(&cc->remoteSymSigningKey);
+    UA_ByteString_clear(&cc->remoteSymEncryptingKey);
+    UA_ByteString_clear(&cc->remoteSymIv);
+
+    mbedtls_x509_crt_free(&cc->remoteCertificate);
+
+    UA_free(cc);
+}
+
+static UA_StatusCode
+channelContext_newContext_sp_aes256sha256rsapss(const UA_SecurityPolicy *securityPolicy,
+                                                 const UA_ByteString *remoteCertificate,
+                                                 void **pp_contextData) {
+    if(securityPolicy == NULL || remoteCertificate == NULL || pp_contextData == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Allocate the channel context */
+    *pp_contextData = UA_malloc(sizeof(Aes256Sha256RsaPss_ChannelContext));
+    if(*pp_contextData == NULL)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    Aes256Sha256RsaPss_ChannelContext *cc = (Aes256Sha256RsaPss_ChannelContext *)*pp_contextData;
+
+    /* Initialize the channel context */
+    cc->policyContext = (Aes256Sha256RsaPss_PolicyContext *)securityPolicy->policyContext;
+
+    UA_ByteString_init(&cc->localSymSigningKey);
+    UA_ByteString_init(&cc->localSymEncryptingKey);
+    UA_ByteString_init(&cc->localSymIv);
+
+    UA_ByteString_init(&cc->remoteSymSigningKey);
+    UA_ByteString_init(&cc->remoteSymEncryptingKey);
+    UA_ByteString_init(&cc->remoteSymIv);
+
+    mbedtls_x509_crt_init(&cc->remoteCertificate);
+
+    // TODO: this can be optimized so that we dont allocate memory before parsing the certificate
+    UA_StatusCode retval = parseRemoteCertificate_sp_aes256sha256rsapss(cc, remoteCertificate);
+    if(retval != UA_STATUSCODE_GOOD) {
+        channelContext_deleteContext_sp_aes256sha256rsapss(cc);
+        *pp_contextData = NULL;
+    }
+    return retval;
+}
+
+static UA_StatusCode
+channelContext_setLocalSymEncryptingKey_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                                               const UA_ByteString *key) {
+    if(key == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString_clear(&cc->localSymEncryptingKey);
+    return UA_ByteString_copy(key, &cc->localSymEncryptingKey);
+}
+
+static UA_StatusCode
+channelContext_setLocalSymSigningKey_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                                            const UA_ByteString *key) {
+    if(key == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString_clear(&cc->localSymSigningKey);
+    return UA_ByteString_copy(key, &cc->localSymSigningKey);
+}
+
+
+static UA_StatusCode
+channelContext_setLocalSymIv_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                                    const UA_ByteString *iv) {
+    if(iv == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString_clear(&cc->localSymIv);
+    return UA_ByteString_copy(iv, &cc->localSymIv);
+}
+
+static UA_StatusCode
+channelContext_setRemoteSymEncryptingKey_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                                                const UA_ByteString *key) {
+    if(key == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString_clear(&cc->remoteSymEncryptingKey);
+    return UA_ByteString_copy(key, &cc->remoteSymEncryptingKey);
+}
+
+static UA_StatusCode
+channelContext_setRemoteSymSigningKey_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                                             const UA_ByteString *key) {
+    if(key == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString_clear(&cc->remoteSymSigningKey);
+    return UA_ByteString_copy(key, &cc->remoteSymSigningKey);
+}
+
+static UA_StatusCode
+channelContext_setRemoteSymIv_sp_aes256sha256rsapss(Aes256Sha256RsaPss_ChannelContext *cc,
+                                                     const UA_ByteString *iv) {
+    if(iv == NULL || cc == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    UA_ByteString_clear(&cc->remoteSymIv);
+    return UA_ByteString_copy(iv, &cc->remoteSymIv);
+}
+
+static UA_StatusCode
+channelContext_compareCertificate_sp_aes256sha256rsapss(const Aes256Sha256RsaPss_ChannelContext *cc,
+                                                         const UA_ByteString *certificate) {
+    if(cc == NULL || certificate == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    mbedtls_x509_crt cert;
+    mbedtls_x509_crt_init(&cert);
+    int mbedErr = mbedtls_x509_crt_parse(&cert, certificate->data, certificate->length);
+    if(mbedErr)
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(cert.raw.len != cc->remoteCertificate.raw.len ||
+       memcmp(cert.raw.p, cc->remoteCertificate.raw.p, cert.raw.len) != 0)
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+
+    mbedtls_x509_crt_free(&cert);
+    return retval;
+}
+
+static void
+clear_sp_aes256sha256rsapss(UA_SecurityPolicy *securityPolicy) {
+    if(securityPolicy == NULL)
+        return;
+
+    UA_ByteString_clear(&securityPolicy->localCertificate);
+
+    if(securityPolicy->policyContext == NULL)
+        return;
+
+    /* delete all allocated members in the context */
+    Aes256Sha256RsaPss_PolicyContext *pc = (Aes256Sha256RsaPss_PolicyContext *)
+        securityPolicy->policyContext;
+
+    mbedtls_ctr_drbg_free(&pc->drbgContext);
+    mbedtls_entropy_free(&pc->entropyContext);
+    mbedtls_pk_free(&pc->localPrivateKey);
+    mbedtls_md_free(&pc->sha256MdContext);
+    UA_ByteString_clear(&pc->localCertThumbprint);
+
+    UA_LOG_DEBUG(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                 "Deleted members of EndpointContext for sp_aes256sha256rsapss");
+
+    UA_free(pc);
+    securityPolicy->policyContext = NULL;
+}
+
+static UA_StatusCode
+updateCertificateAndPrivateKey_sp_aes256sha256rsapss(UA_SecurityPolicy *securityPolicy,
+                                                      const UA_ByteString newCertificate,
+                                                      const UA_ByteString newPrivateKey) {
+    if(securityPolicy == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if(securityPolicy->policyContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Aes256Sha256RsaPss_PolicyContext *pc =
+        (Aes256Sha256RsaPss_PolicyContext *) securityPolicy->policyContext;
+
+    UA_ByteString_clear(&securityPolicy->localCertificate);
+
+    UA_StatusCode retval = UA_ByteString_allocBuffer(&securityPolicy->localCertificate,
+                                                     newCertificate.length + 1);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    memcpy(securityPolicy->localCertificate.data, newCertificate.data, newCertificate.length);
+    securityPolicy->localCertificate.data[newCertificate.length] = '\0';
+    securityPolicy->localCertificate.length--;
+
+    /* Set the new private key */
+    mbedtls_pk_free(&pc->localPrivateKey);
+    mbedtls_pk_init(&pc->localPrivateKey);
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
+                                       newPrivateKey.length, NULL, 0);
+#else
+    int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
+                                       newPrivateKey.length, NULL, 0, mbedtls_entropy_func, &pc->drbgContext);
+#endif
+    if(mbedErr) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    retval = asym_makeThumbprint_sp_aes256sha256rsapss(securityPolicy,
+                                                        &securityPolicy->localCertificate,
+                                                        &pc->localCertThumbprint);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto error;
+
+    return retval;
+
+error:
+    UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                 "Could not update certificate and private key");
+    if(securityPolicy->policyContext != NULL)
+        clear_sp_aes256sha256rsapss(securityPolicy);
+    return retval;
+}
+
+static UA_StatusCode
+policyContext_newContext_sp_aes256sha256rsapss(UA_SecurityPolicy *securityPolicy,
+                                                const UA_ByteString localPrivateKey) {
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(securityPolicy == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if (localPrivateKey.length == 0) {
+        UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                     "Can not initialize security policy. Private key is empty.");
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    Aes256Sha256RsaPss_PolicyContext *pc = (Aes256Sha256RsaPss_PolicyContext *)
+        UA_malloc(sizeof(Aes256Sha256RsaPss_PolicyContext));
+    securityPolicy->policyContext = (void *)pc;
+    if(!pc) {
+        retval = UA_STATUSCODE_BADOUTOFMEMORY;
+        goto error;
+    }
+
+    /* Initialize the PolicyContext */
+    memset(pc, 0, sizeof(Aes256Sha256RsaPss_PolicyContext));
+    mbedtls_ctr_drbg_init(&pc->drbgContext);
+    mbedtls_entropy_init(&pc->entropyContext);
+    mbedtls_pk_init(&pc->localPrivateKey);
+    mbedtls_md_init(&pc->sha256MdContext);
+
+    /* Initialized the message digest */
+    const mbedtls_md_info_t *const mdInfo = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
+    int mbedErr = mbedtls_md_setup(&pc->sha256MdContext, mdInfo, MBEDTLS_MD_SHA256);
+    if(mbedErr) {
+        retval = UA_STATUSCODE_BADOUTOFMEMORY;
+        goto error;
+    }
+
+    mbedErr = mbedtls_entropy_self_test(0);
+
+    if(mbedErr) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    /* Seed the RNG */
+    char *personalization = "open62541-drbg";
+    mbedErr = mbedtls_ctr_drbg_seed(&pc->drbgContext, mbedtls_entropy_func,
+                                    &pc->entropyContext,
+                                    (const unsigned char *)personalization, 14);
+    if(mbedErr) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    /* Set the private key */
+    mbedErr = UA_mbedTLS_LoadPrivateKey(&localPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
+    if(mbedErr) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    /* Set the local certificate thumbprint */
+    retval = UA_ByteString_allocBuffer(&pc->localCertThumbprint, UA_SHA1_LENGTH);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto error;
+    retval = asym_makeThumbprint_sp_aes256sha256rsapss(securityPolicy,
+                                                        &securityPolicy->localCertificate,
+                                                        &pc->localCertThumbprint);
+    if(retval != UA_STATUSCODE_GOOD)
+        goto error;
+
+    return UA_STATUSCODE_GOOD;
+
+error:
+    UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                 "Could not create securityContext: %s", UA_StatusCode_name(retval));
+    if(securityPolicy->policyContext != NULL)
+        clear_sp_aes256sha256rsapss(securityPolicy);
+    return retval;
+}
+
+UA_StatusCode
+UA_SecurityPolicy_Aes256Sha256RsaPss(UA_SecurityPolicy *policy, const UA_ByteString localCertificate,
+                                      const UA_ByteString localPrivateKey, const UA_Logger *logger) {
+    memset(policy, 0, sizeof(UA_SecurityPolicy));
+    policy->logger = logger;
+
+    policy->policyUri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
+
+    UA_SecurityPolicyAsymmetricModule *const asymmetricModule = &policy->asymmetricModule;
+    UA_SecurityPolicySymmetricModule *const symmetricModule = &policy->symmetricModule;
+    UA_SecurityPolicyChannelModule *const channelModule = &policy->channelModule;
+
+    UA_StatusCode retval = UA_mbedTLS_LoadLocalCertificate(&localCertificate, &policy->localCertificate);
+
+    if (retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* AsymmetricModule */
+    UA_SecurityPolicySignatureAlgorithm *asym_signatureAlgorithm =
+        &asymmetricModule->cryptoModule.signatureAlgorithm;
+    asym_signatureAlgorithm->uri =
+        UA_STRING("http://opcfoundation.org/UA/security/rsa-pss-sha2-256\0");
+    asym_signatureAlgorithm->verify =
+        (UA_StatusCode (*)(void *, const UA_ByteString *, const UA_ByteString *))asym_verify_sp_aes256sha256rsapss;
+    asym_signatureAlgorithm->sign =
+        (UA_StatusCode (*)(void *, const UA_ByteString *, UA_ByteString *))asym_sign_sp_aes256sha256rsapss;
+    asym_signatureAlgorithm->getLocalSignatureSize =
+        (size_t (*)(const void *))asym_getLocalSignatureSize_sp_aes256sha256rsapss;
+    asym_signatureAlgorithm->getRemoteSignatureSize =
+        (size_t (*)(const void *))asym_getRemoteSignatureSize_sp_aes256sha256rsapss;
+    asym_signatureAlgorithm->getLocalKeyLength = NULL; // TODO: Write function
+    asym_signatureAlgorithm->getRemoteKeyLength = NULL; // TODO: Write function
+
+    UA_SecurityPolicyEncryptionAlgorithm *asym_encryptionAlgorithm =
+        &asymmetricModule->cryptoModule.encryptionAlgorithm;
+    asym_encryptionAlgorithm->uri = UA_STRING("http://opcfoundation.org/UA/security/rsa-oaep-sha2-256\0");
+    asym_encryptionAlgorithm->encrypt =
+        (UA_StatusCode(*)(void *, UA_ByteString *))asym_encrypt_sp_aes256sha256rsapss;
+    asym_encryptionAlgorithm->decrypt =
+        (UA_StatusCode(*)(void *, UA_ByteString *)) asym_decrypt_sp_aes256sha256rsapss;
+    asym_encryptionAlgorithm->getLocalKeyLength =
+        (size_t (*)(const void *))asym_getLocalEncryptionKeyLength_sp_aes256sha256rsapss;
+    asym_encryptionAlgorithm->getRemoteKeyLength =
+        (size_t (*)(const void *))asym_getRemoteEncryptionKeyLength_sp_aes256sha256rsapss;
+    asym_encryptionAlgorithm->getRemoteBlockSize = (size_t (*)(const void *))asym_getRemoteBlockSize_sp_aes256sha256rsapss;
+    asym_encryptionAlgorithm->getRemotePlainTextBlockSize =
+        (size_t (*)(const void *))asym_getRemotePlainTextBlockSize_sp_aes256sha256rsapss;
+
+    asymmetricModule->makeCertificateThumbprint = asym_makeThumbprint_sp_aes256sha256rsapss;
+    asymmetricModule->compareCertificateThumbprint =
+        asymmetricModule_compareCertificateThumbprint_sp_aes256sha256rsapss;
+
+    /* SymmetricModule */
+    symmetricModule->generateKey = sym_generateKey_sp_aes256sha256rsapss;
+    symmetricModule->generateNonce = sym_generateNonce_sp_aes256sha256rsapss;
+
+    UA_SecurityPolicySignatureAlgorithm *sym_signatureAlgorithm =
+        &symmetricModule->cryptoModule.signatureAlgorithm;
+    sym_signatureAlgorithm->uri =
+        UA_STRING("http://www.w3.org/2000/09/xmldsig#hmac-sha2-256\0");
+    sym_signatureAlgorithm->verify =
+        (UA_StatusCode (*)(void *, const UA_ByteString *, const UA_ByteString *))sym_verify_sp_aes256sha256rsapss;
+    sym_signatureAlgorithm->sign =
+        (UA_StatusCode (*)(void *, const UA_ByteString *, UA_ByteString *))sym_sign_sp_aes256sha256rsapss;
+    sym_signatureAlgorithm->getLocalSignatureSize = sym_getSignatureSize_sp_aes256sha256rsapss;
+    sym_signatureAlgorithm->getRemoteSignatureSize = sym_getSignatureSize_sp_aes256sha256rsapss;
+    sym_signatureAlgorithm->getLocalKeyLength =
+        (size_t (*)(const void *))sym_getSigningKeyLength_sp_aes256sha256rsapss;
+    sym_signatureAlgorithm->getRemoteKeyLength =
+        (size_t (*)(const void *))sym_getSigningKeyLength_sp_aes256sha256rsapss;
+
+    UA_SecurityPolicyEncryptionAlgorithm *sym_encryptionAlgorithm =
+        &symmetricModule->cryptoModule.encryptionAlgorithm;
+    sym_encryptionAlgorithm->uri = UA_STRING("http://www.w3.org/2001/04/xmlenc#aes256-cbc\0");
+    sym_encryptionAlgorithm->encrypt =
+        (UA_StatusCode(*)(void *, UA_ByteString *))sym_encrypt_sp_aes256sha256rsapss;
+    sym_encryptionAlgorithm->decrypt =
+        (UA_StatusCode(*)(void *, UA_ByteString *))sym_decrypt_sp_aes256sha256rsapss;
+    sym_encryptionAlgorithm->getLocalKeyLength = sym_getEncryptionKeyLength_sp_aes256sha256rsapss;
+    sym_encryptionAlgorithm->getRemoteKeyLength = sym_getEncryptionKeyLength_sp_aes256sha256rsapss;
+    sym_encryptionAlgorithm->getRemoteBlockSize =
+        (size_t (*)(const void *))sym_getEncryptionBlockSize_sp_aes256sha256rsapss;
+    sym_encryptionAlgorithm->getRemotePlainTextBlockSize =
+        (size_t (*)(const void *))sym_getPlainTextBlockSize_sp_aes256sha256rsapss;
+    symmetricModule->secureChannelNonceLength = 32;
+
+    /* Certificate Signing Algorithm */
+    policy->certificateSigningAlgorithm.uri =
+        UA_STRING("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256\0");
+    policy->certificateSigningAlgorithm.verify =
+        (UA_StatusCode (*)(void *, const UA_ByteString *, const UA_ByteString *))asym_cert_verify_sp_aes256sha256rsapss;
+    policy->certificateSigningAlgorithm.sign =
+        (UA_StatusCode (*)(void *, const UA_ByteString *, UA_ByteString *))asym_cert_sign_sp_aes256sha256rsapss;
+    policy->certificateSigningAlgorithm.getLocalSignatureSize =
+        (size_t (*)(const void *))asym_cert_getLocalSignatureSize_sp_aes256sha256rsapss;
+    policy->certificateSigningAlgorithm.getRemoteSignatureSize =
+        (size_t (*)(const void *))asym_cert_getRemoteSignatureSize_sp_aes256sha256rsapss;
+    policy->certificateSigningAlgorithm.getLocalKeyLength = NULL; // TODO: Write function
+    policy->certificateSigningAlgorithm.getRemoteKeyLength = NULL; // TODO: Write function
+
+    /* ChannelModule */
+    channelModule->newContext = channelContext_newContext_sp_aes256sha256rsapss;
+    channelModule->deleteContext = (void (*)(void *))
+        channelContext_deleteContext_sp_aes256sha256rsapss;
+
+    channelModule->setLocalSymEncryptingKey = (UA_StatusCode (*)(void *, const UA_ByteString *))
+        channelContext_setLocalSymEncryptingKey_sp_aes256sha256rsapss;
+    channelModule->setLocalSymSigningKey = (UA_StatusCode (*)(void *, const UA_ByteString *))
+        channelContext_setLocalSymSigningKey_sp_aes256sha256rsapss;
+    channelModule->setLocalSymIv = (UA_StatusCode (*)(void *, const UA_ByteString *))
+        channelContext_setLocalSymIv_sp_aes256sha256rsapss;
+
+    channelModule->setRemoteSymEncryptingKey = (UA_StatusCode (*)(void *, const UA_ByteString *))
+        channelContext_setRemoteSymEncryptingKey_sp_aes256sha256rsapss;
+    channelModule->setRemoteSymSigningKey = (UA_StatusCode (*)(void *, const UA_ByteString *))
+        channelContext_setRemoteSymSigningKey_sp_aes256sha256rsapss;
+    channelModule->setRemoteSymIv = (UA_StatusCode (*)(void *, const UA_ByteString *))
+        channelContext_setRemoteSymIv_sp_aes256sha256rsapss;
+
+    channelModule->compareCertificate = (UA_StatusCode (*)(const void *, const UA_ByteString *))
+        channelContext_compareCertificate_sp_aes256sha256rsapss;
+
+    policy->updateCertificateAndPrivateKey = updateCertificateAndPrivateKey_sp_aes256sha256rsapss;
+    policy->clear = clear_sp_aes256sha256rsapss;
+
+    UA_StatusCode res = policyContext_newContext_sp_aes256sha256rsapss(policy, localPrivateKey);
+    if(res != UA_STATUSCODE_GOOD)
+        clear_sp_aes256sha256rsapss(policy);
+
+    return res;
+}
+
+#endif
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
index 8475211e859..82721537178 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
@@ -150,7 +150,7 @@ asym_decrypt_sp_basic256(Basic256_ChannelContext *cc,
     if(cc == NULL || data == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
     return mbedtls_decrypt_rsaOaep(&cc->policyContext->localPrivateKey,
-                                   &cc->policyContext->drbgContext, data);
+                                   &cc->policyContext->drbgContext, data, MBEDTLS_MD_SHA1);
 }
 
 static size_t
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
index 03337eb226f..61f0b297f8c 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
@@ -212,7 +212,7 @@ asym_decrypt_sp_basic256sha256(Basic256Sha256_ChannelContext *cc,
     if(cc == NULL || data == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
     return mbedtls_decrypt_rsaOaep(&cc->policyContext->localPrivateKey,
-                                   &cc->policyContext->drbgContext, data);
+                                   &cc->policyContext->drbgContext, data, MBEDTLS_MD_SHA1);
 }
 
 static size_t
diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.c b/plugins/crypto/openssl/securitypolicy_openssl_common.c
index c28db097197..685d831ebe0 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.c
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.c
@@ -5,6 +5,7 @@
  *    Copyright 2020 (c) Wind River Systems, Inc.
  *    Copyright 2020 (c) basysKom GmbH
  *    Copyright 2022 (c) Wind River Systems, Inc.
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Noel Graf)
  */
 
 /*
@@ -132,6 +133,18 @@ UA_OpenSSL_RSA_Public_Verify (const UA_ByteString * message,
         goto errout;
     }
     EVP_PKEY_CTX_set_rsa_padding (evpKeyCtx, padding);
+    if(padding == RSA_PKCS1_PSS_PADDING) {
+        opensslRet = EVP_PKEY_CTX_set_rsa_pss_saltlen(evpKeyCtx, RSA_PSS_SALTLEN_DIGEST);
+        if(opensslRet != 1) {
+            ret = UA_STATUSCODE_BADINTERNALERROR;
+            goto errout;
+        }
+        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(evpKeyCtx, EVP_sha256());
+        if (opensslRet != 1) {
+            ret = UA_STATUSCODE_BADINTERNALERROR;
+            goto errout;
+        }
+    }
     opensslRet = EVP_DigestVerifyUpdate (mdctx, message->data, message->length);
     if (opensslRet != 1) {
         ret = UA_STATUSCODE_BADINTERNALERROR;
@@ -160,7 +173,16 @@ UA_OpenSSL_RSA_PKCS1_V15_SHA256_Verify (const UA_ByteString * msg,
                                         const UA_ByteString * signature
                                        ) {
     return UA_OpenSSL_RSA_Public_Verify (msg, EVP_sha256(), publicKeyX509,
-                                         NID_sha256, signature);
+                                         RSA_PKCS1_PADDING, signature);
+}
+
+UA_StatusCode
+UA_OpenSSL_RSA_PSS_SHA256_Verify (const UA_ByteString * msg,
+                                        X509 *                publicKeyX509,
+                                        const UA_ByteString * signature
+) {
+    return UA_OpenSSL_RSA_Public_Verify (msg, EVP_sha256(), publicKeyX509,
+                                         RSA_PKCS1_PSS_PADDING, signature);
 }
 
 /* Get certificate thumbprint, and allocate the buffer. */
@@ -205,7 +227,8 @@ UA_Openssl_X509_GetCertificateThumbprint (const UA_ByteString * certficate,
 static UA_StatusCode
 UA_Openssl_RSA_Private_Decrypt (UA_ByteString *      data,
                                EVP_PKEY *            privateKey,
-                               UA_Int16              padding) {
+                               UA_Int16              padding,
+                               UA_Boolean            withSha256) {
     if (data == NULL || privateKey == NULL) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -227,16 +250,25 @@ UA_Openssl_RSA_Private_Decrypt (UA_ByteString *      data,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
     opensslRet = EVP_PKEY_decrypt_init (ctx);
-    if (opensslRet != 1)
-        {
+    if (opensslRet != 1) {
         EVP_PKEY_CTX_free (ctx);
         return UA_STATUSCODE_BADINTERNALERROR;
-        }
+    }
     opensslRet = EVP_PKEY_CTX_set_rsa_padding (ctx, padding);
     if (opensslRet != 1) {
         EVP_PKEY_CTX_free (ctx);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+    if(withSha256) {
+        opensslRet = EVP_PKEY_CTX_set_rsa_oaep_md(ctx, EVP_sha256());
+        if (opensslRet != 1) {
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, EVP_sha256());
+        if (opensslRet != 1) {
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
 
     while (cipherOffset < data->length) {
         decryptedBytes = RSA_DECRYPT_BUFFER_LENGTH;
@@ -264,7 +296,14 @@ UA_StatusCode
 UA_Openssl_RSA_Oaep_Decrypt (UA_ByteString *       data,
                              EVP_PKEY * privateKey) {
     return  UA_Openssl_RSA_Private_Decrypt (data, privateKey,
-                                            RSA_PKCS1_OAEP_PADDING);
+                                            RSA_PKCS1_OAEP_PADDING, false);
+}
+
+UA_StatusCode
+UA_Openssl_RSA_Oaep_Sha2_Decrypt (UA_ByteString *       data,
+                             EVP_PKEY * privateKey) {
+    return  UA_Openssl_RSA_Private_Decrypt (data, privateKey,
+                                            RSA_PKCS1_OAEP_PADDING, true);
 }
 
 static UA_StatusCode
@@ -272,7 +311,8 @@ UA_Openssl_RSA_Public_Encrypt  (const UA_ByteString * message,
                                 X509 *                publicX509,
                                 UA_Int16              padding,
                                 size_t                paddingSize,
-                                UA_ByteString *       encrypted) {
+                                UA_ByteString *       encrypted,
+                                UA_Boolean withSha256) {
     EVP_PKEY_CTX *   ctx          = NULL;
     EVP_PKEY *       evpPublicKey = NULL;
     int              opensslRet;
@@ -304,6 +344,18 @@ UA_Openssl_RSA_Public_Encrypt  (const UA_ByteString * message,
         ret = UA_STATUSCODE_BADINTERNALERROR;
         goto errout;
     }
+    if(withSha256) {
+        opensslRet = EVP_PKEY_CTX_set_rsa_oaep_md(ctx, EVP_sha256());
+        if (opensslRet != 1) {
+            ret = UA_STATUSCODE_BADINTERNALERROR;
+            goto errout;
+        }
+        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, EVP_sha256());
+        if (opensslRet != 1) {
+            ret = UA_STATUSCODE_BADINTERNALERROR;
+            goto errout;
+        }
+    }
 
     /* get the encrypted block size */
 
@@ -375,7 +427,26 @@ UA_Openssl_RSA_OAEP_Encrypt (UA_ByteString * data,
     ret = UA_Openssl_RSA_Public_Encrypt (&message, publicX509,
                                             RSA_PKCS1_OAEP_PADDING,
                                             paddingSize,
-                                            data);
+                                            data, false);
+    UA_ByteString_clear (&message);
+    return ret;
+}
+
+UA_StatusCode
+UA_Openssl_RSA_OAEP_SHA2_Encrypt (UA_ByteString * data,
+                             size_t          paddingSize,
+                             X509 *          publicX509) {
+    UA_ByteString message;
+    UA_StatusCode ret;
+
+    ret = UA_ByteString_copy (data, &message);
+    if (ret != UA_STATUSCODE_GOOD) {
+        return ret;
+    }
+    ret = UA_Openssl_RSA_Public_Encrypt (&message, publicX509,
+                                         RSA_PKCS1_OAEP_PADDING,
+                                         paddingSize,
+                                         data, true);
     UA_ByteString_clear (&message);
     return ret;
 }
@@ -511,7 +582,18 @@ UA_Openssl_RSA_Private_Sign (const UA_ByteString * message,
         goto errout;
     }
     EVP_PKEY_CTX_set_rsa_padding (evpKeyCtx, padding);
-
+    if(padding == RSA_PKCS1_PSS_PADDING) {
+        opensslRet = EVP_PKEY_CTX_set_rsa_pss_saltlen(evpKeyCtx, RSA_PSS_SALTLEN_DIGEST); //RSA_PSS_SALTLEN_DIGEST
+        if (opensslRet != 1) {
+            ret = UA_STATUSCODE_BADINTERNALERROR;
+            goto errout;
+        }
+        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(evpKeyCtx, EVP_sha256());
+        if (opensslRet != 1) {
+            ret = UA_STATUSCODE_BADINTERNALERROR;
+            goto errout;
+        }
+    }
     opensslRet = EVP_DigestSignUpdate (mdctx, message->data, message->length);
     if (opensslRet != 1) {
         ret = UA_STATUSCODE_BADINTERNALERROR;
@@ -536,7 +618,15 @@ UA_Openssl_RSA_PKCS1_V15_SHA256_Sign (const UA_ByteString * message,
                                       EVP_PKEY * privateKey,
                                       UA_ByteString *       outSignature) {
     return UA_Openssl_RSA_Private_Sign (message, privateKey, EVP_sha256(),
-                NID_sha256, outSignature);
+                                        RSA_PKCS1_PADDING , outSignature);
+}
+
+UA_StatusCode
+UA_Openssl_RSA_PSS_SHA256_Sign (const UA_ByteString * message,
+                                      EVP_PKEY * privateKey,
+                                      UA_ByteString *       outSignature) {
+    return UA_Openssl_RSA_Private_Sign (message, privateKey, EVP_sha256(),
+                                        RSA_PKCS1_PSS_PADDING, outSignature);
 }
 
 UA_StatusCode
@@ -883,7 +973,7 @@ UA_StatusCode
 UA_Openssl_RSA_PKCS1_V15_Decrypt (UA_ByteString *       data,
                                   EVP_PKEY * privateKey) {
     return  UA_Openssl_RSA_Private_Decrypt (data, privateKey,
-                                            RSA_PKCS1_PADDING);
+                                            RSA_PKCS1_PADDING, false);
 }
 
 UA_StatusCode
@@ -898,7 +988,7 @@ UA_Openssl_RSA_PKCS1_V15_Encrypt (UA_ByteString * data,
     ret = UA_Openssl_RSA_Public_Encrypt (&message, publicX509,
                                          RSA_PKCS1_PADDING,
                                          paddingSize,
-                                         data);
+                                         data, false);
     UA_ByteString_clear (&message);
     return ret;
 }
diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.h b/plugins/crypto/openssl/securitypolicy_openssl_common.h
index 78cff2d1b7e..7bfd01ad6c0 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.h
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.h
@@ -30,6 +30,12 @@ UA_StatusCode
 UA_OpenSSL_RSA_PKCS1_V15_SHA256_Verify(const UA_ByteString *msg,
                                        X509 *publicKeyX509,
                                        const UA_ByteString *signature);
+
+UA_StatusCode
+UA_OpenSSL_RSA_PSS_SHA256_Verify (const UA_ByteString * msg,
+                                  X509 *publicKeyX509,
+                                  const UA_ByteString * signature);
+
 UA_StatusCode
 UA_Openssl_X509_GetCertificateThumbprint(const UA_ByteString *certficate,
                                          UA_ByteString *pThumbprint,
@@ -37,12 +43,22 @@ UA_Openssl_X509_GetCertificateThumbprint(const UA_ByteString *certficate,
 UA_StatusCode
 UA_Openssl_RSA_Oaep_Decrypt(UA_ByteString *data,
                             EVP_PKEY *privateKey);
+
+UA_StatusCode
+UA_Openssl_RSA_Oaep_Sha2_Decrypt (UA_ByteString *data,
+                            EVP_PKEY *privateKey);
+
 UA_StatusCode
 UA_Openssl_RSA_OAEP_Encrypt(UA_ByteString *data, /* The data that is encrypted.
                                                     The encrypted data will overwrite
                                                     the data that was supplied.  */
                              size_t paddingSize, X509 *publicX509);
 
+UA_StatusCode
+UA_Openssl_RSA_OAEP_SHA2_Encrypt (UA_ByteString * data,
+                                  size_t          paddingSize,
+                                  X509 *          publicX509);
+
 UA_StatusCode
 UA_Openssl_Random_Key_PSHA256_Derive(const UA_ByteString *secret,
                                      const UA_ByteString *seed,
@@ -56,6 +72,11 @@ UA_Openssl_RSA_PKCS1_V15_SHA256_Sign(const UA_ByteString *data,
                                      EVP_PKEY *privateKey,
                                      UA_ByteString *outSignature);
 
+UA_StatusCode
+UA_Openssl_RSA_PSS_SHA256_Sign (const UA_ByteString * message,
+                                EVP_PKEY * privateKey,
+                                UA_ByteString *       outSignature);
+
 UA_StatusCode
 UA_OpenSSL_HMAC_SHA256_Verify(const UA_ByteString *message,
                               const UA_ByteString *key,
diff --git a/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c b/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
new file mode 100644
index 00000000000..d7d7fd987a8
--- /dev/null
+++ b/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
@@ -0,0 +1,692 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Noel Graf)
+ */
+
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/util.h>
+
+#if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_LIBRESSL)
+
+#include "securitypolicy_openssl_common.h"
+
+#include <openssl/hmac.h>
+#include <openssl/sha.h>
+#include <openssl/rsa.h>
+#include <openssl/x509.h>
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+
+#define UA_SHA256_LENGTH 32 /* 256 bit */
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_RSAPADDING_LEN 66
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_SIGNING_KEY_LENGTH 32
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_KEY_LENGTH 32
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_BLOCK_SIZE 16
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_PLAIN_TEXT_BLOCK_SIZE 16
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_MINASYMKEYLENGTH 256
+#define UA_SECURITYPOLICY_AES256SHA256RSAPSS_MAXASYMKEYLENGTH 512
+
+typedef struct {
+    EVP_PKEY *localPrivateKey;
+    UA_ByteString localCertThumbprint;
+    const UA_Logger *logger;
+} Policy_Context_Aes256Sha256RsaPss;
+
+typedef struct {
+    UA_ByteString localSymSigningKey;
+    UA_ByteString localSymEncryptingKey;
+    UA_ByteString localSymIv;
+    UA_ByteString remoteSymSigningKey;
+    UA_ByteString remoteSymEncryptingKey;
+    UA_ByteString remoteSymIv;
+
+    Policy_Context_Aes256Sha256RsaPss *policyContext;
+    UA_ByteString remoteCertificate;
+    X509 *remoteCertificateX509; /* X509 */
+} Channel_Context_Aes256Sha256RsaPss;
+
+/* create the policy context */
+
+static UA_StatusCode
+UA_Policy_Aes256Sha256RsaPss_New_Context(UA_SecurityPolicy *securityPolicy,
+                                          const UA_ByteString localPrivateKey,
+                                          const UA_Logger *logger) {
+    Policy_Context_Aes256Sha256RsaPss *context =
+        (Policy_Context_Aes256Sha256RsaPss *)UA_malloc(
+            sizeof(Policy_Context_Aes256Sha256RsaPss));
+    if(context == NULL) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    context->localPrivateKey = UA_OpenSSL_LoadPrivateKey(&localPrivateKey);
+    if (!context->localPrivateKey) {
+        UA_free(context);
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    UA_StatusCode retval = UA_Openssl_X509_GetCertificateThumbprint(
+        &securityPolicy->localCertificate, &context->localCertThumbprint, true);
+    if(retval != UA_STATUSCODE_GOOD) {
+        EVP_PKEY_free(context->localPrivateKey);
+        UA_free(context);
+        return retval;
+    }
+
+    context->logger = logger;
+    securityPolicy->policyContext = context;
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/* clear the policy context */
+
+static void
+UA_Policy_Aes256Sha256RsaPss_Clear_Context(UA_SecurityPolicy *policy) {
+    if(policy == NULL)
+        return;
+
+    UA_ByteString_clear(&policy->localCertificate);
+
+    /* delete all allocated members in the context */
+
+    Policy_Context_Aes256Sha256RsaPss *pc =
+        (Policy_Context_Aes256Sha256RsaPss *)policy->policyContext;
+    if (pc == NULL) {
+        return;
+    }
+
+    EVP_PKEY_free(pc->localPrivateKey);
+    UA_ByteString_clear(&pc->localCertThumbprint);
+    UA_free(pc);
+
+    return;
+}
+
+/* create the channel context */
+
+static UA_StatusCode
+UA_ChannelModule_Aes256Sha256RsaPss_New_Context(const UA_SecurityPolicy *securityPolicy,
+                                                 const UA_ByteString *remoteCertificate,
+                                                 void **channelContext) {
+    if(securityPolicy == NULL || remoteCertificate == NULL || channelContext == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+    Channel_Context_Aes256Sha256RsaPss *context =
+        (Channel_Context_Aes256Sha256RsaPss *)UA_malloc(
+            sizeof(Channel_Context_Aes256Sha256RsaPss));
+    if(context == NULL) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    UA_ByteString_init(&context->localSymSigningKey);
+    UA_ByteString_init(&context->localSymEncryptingKey);
+    UA_ByteString_init(&context->localSymIv);
+    UA_ByteString_init(&context->remoteSymSigningKey);
+    UA_ByteString_init(&context->remoteSymEncryptingKey);
+    UA_ByteString_init(&context->remoteSymIv);
+
+    UA_StatusCode retval =
+        UA_copyCertificate(&context->remoteCertificate, remoteCertificate);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_free(context);
+        return retval;
+    }
+
+    /* decode to X509 */
+    context->remoteCertificateX509 = UA_OpenSSL_LoadCertificate(&context->remoteCertificate);
+    if (context->remoteCertificateX509 == NULL) {
+        UA_ByteString_clear (&context->remoteCertificate);
+        UA_free (context);
+        return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
+    }
+
+    context->policyContext =
+        (Policy_Context_Aes256Sha256RsaPss *)(securityPolicy->policyContext);
+
+    *channelContext = context;
+
+    UA_LOG_INFO(
+        securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+        "The Aes256Sha256RsaPss security policy channel with openssl is created.");
+
+    return UA_STATUSCODE_GOOD;
+}
+
+/* delete the channel context */
+
+static void
+UA_ChannelModule_Aes256Sha256RsaPss_Delete_Context(void *channelContext) {
+    if(channelContext != NULL) {
+        Channel_Context_Aes256Sha256RsaPss *cc =
+            (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+        X509_free(cc->remoteCertificateX509);
+        UA_ByteString_clear(&cc->remoteCertificate);
+        UA_ByteString_clear(&cc->localSymSigningKey);
+        UA_ByteString_clear(&cc->localSymEncryptingKey);
+        UA_ByteString_clear(&cc->localSymIv);
+        UA_ByteString_clear(&cc->remoteSymSigningKey);
+        UA_ByteString_clear(&cc->remoteSymEncryptingKey);
+        UA_ByteString_clear(&cc->remoteSymIv);
+
+        UA_LOG_INFO(
+            cc->policyContext->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+            "The Aes256Sha256RsaPss security policy channel with openssl is deleted.");
+        UA_free(cc);
+    }
+}
+
+/* Verifies the signature of the message using the provided keys in the context.
+ * AsymmetricSignatureAlgorithm_RSA-PKCS15-SHA2-256
+ */
+
+static UA_StatusCode
+UA_AsySig_Aes256Sha256RsaPss_Verify(void *channelContext, const UA_ByteString *message,
+                                     const UA_ByteString *signature) {
+    if(message == NULL || signature == NULL || channelContext == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_StatusCode retval = UA_OpenSSL_RSA_PSS_SHA256_Verify(
+        message, cc->remoteCertificateX509, signature);
+
+    return retval;
+}
+
+/* Compares the supplied certificate with the certificate
+ * in the endpoint context
+ */
+
+static UA_StatusCode
+UA_compareCertificateThumbprint_Aes256Sha256RsaPss(const UA_SecurityPolicy *securityPolicy,
+                                                    const UA_ByteString *certificateThumbprint) {
+    if(securityPolicy == NULL || certificateThumbprint == NULL) {
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+    Policy_Context_Aes256Sha256RsaPss *pc =
+        (Policy_Context_Aes256Sha256RsaPss *)securityPolicy->policyContext;
+    if(!UA_ByteString_equal(certificateThumbprint, &pc->localCertThumbprint))
+        return UA_STATUSCODE_BADCERTIFICATEINVALID;
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Generates a thumbprint for the specified certificate */
+
+static UA_StatusCode
+UA_makeCertificateThumbprint_Aes256Sha256RsaPss(const UA_SecurityPolicy *securityPolicy,
+                                                 const UA_ByteString *certificate,
+                                                 UA_ByteString *thumbprint) {
+    return UA_Openssl_X509_GetCertificateThumbprint(certificate, thumbprint, false);
+}
+
+static UA_StatusCode
+UA_Asym_Aes256Sha256RsaPss_Decrypt(void *channelContext, UA_ByteString *data) {
+    if(channelContext == NULL || data == NULL)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    Channel_Context_Aes256Sha256RsaPss *cc = (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_StatusCode ret = UA_Openssl_RSA_Oaep_Sha2_Decrypt(data, cc->policyContext->localPrivateKey);
+    return ret;
+}
+
+static size_t
+UA_Asym_Aes256Sha256RsaPss_getRemoteSignatureSize(const void *channelContext) {
+    if(channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc = (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_Int32 keyLen = 0;
+    UA_Openssl_RSA_Public_GetKeyLength(cc->remoteCertificateX509, &keyLen);
+    return (size_t)keyLen;
+}
+
+static size_t
+UA_AsySig_Aes256Sha256RsaPss_getLocalSignatureSize(const void *channelContext) {
+    if(channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc = (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    Policy_Context_Aes256Sha256RsaPss *pc = cc->policyContext;
+    UA_Int32 keyLen = 0;
+    UA_Openssl_RSA_Private_GetKeyLength(pc->localPrivateKey, &keyLen);
+    return (size_t)keyLen;
+}
+
+static size_t
+UA_AsymEn_Aes256Sha256RsaPss_getRemotePlainTextBlockSize(const void *channelContext) {
+    if(channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc =
+        (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_Int32 keyLen = 0;
+    UA_Openssl_RSA_Public_GetKeyLength(cc->remoteCertificateX509, &keyLen);
+    return (size_t)keyLen - UA_SECURITYPOLICY_AES256SHA256RSAPSS_RSAPADDING_LEN;
+}
+
+static size_t
+UA_AsymEn_Aes256Sha256RsaPss_getRemoteBlockSize(const void *channelContext) {
+    if(channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc =
+        (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_Int32 keyLen = 0;
+    UA_Openssl_RSA_Public_GetKeyLength(cc->remoteCertificateX509, &keyLen);
+    return (size_t)keyLen;
+}
+
+static size_t
+UA_AsymEn_Aes256Sha256RsaPss_getRemoteKeyLength(const void *channelContext) {
+    if(channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc =
+        (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_Int32 keyLen = 0;
+    UA_Openssl_RSA_Public_GetKeyLength(cc->remoteCertificateX509, &keyLen);
+    return (size_t)keyLen * 8;
+}
+
+static UA_StatusCode
+UA_Sym_Aes256Sha256RsaPss_generateNonce(void *policyContext,
+                                         UA_ByteString *out) {
+    UA_Int32 rc = RAND_bytes(out->data, (int)out->length);
+    if(rc != 1) {
+        return UA_STATUSCODE_BADUNEXPECTEDERROR;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+static size_t
+UA_SymEn_Aes256Sha256RsaPss_getLocalKeyLength(const void *channelContext) {
+    /* 32 bytes 256 bits */
+    return UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_KEY_LENGTH;
+}
+
+static size_t
+UA_SymSig_Aes256Sha256RsaPss_getLocalKeyLength(const void *channelContext) {
+    /* 32 bytes 256 bits */
+    return UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_SIGNING_KEY_LENGTH;
+}
+
+static UA_StatusCode
+UA_Sym_Aes256Sha256RsaPss_generateKey(void *policyContext,
+                                       const UA_ByteString *secret,
+                                       const UA_ByteString *seed, UA_ByteString *out) {
+    return UA_Openssl_Random_Key_PSHA256_Derive(secret, seed, out);
+}
+
+static UA_StatusCode
+UA_CertSig_Aes256Sha256RsaPss_Verify(void *channelContext, const UA_ByteString *message,
+                                     const UA_ByteString *signature) {
+    if(message == NULL || signature == NULL || channelContext == NULL) {
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_StatusCode retval = UA_OpenSSL_RSA_PKCS1_V15_SHA256_Verify(
+        message, cc->remoteCertificateX509, signature);
+
+    return retval;
+}
+
+static UA_StatusCode
+UA_CertSig_Aes256Sha256RsaPss_sign(void *channelContext, const UA_ByteString *message,
+                                   UA_ByteString *signature) {
+    if(channelContext == NULL || message == NULL ||
+       signature == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc = (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    Policy_Context_Aes256Sha256RsaPss *pc = cc->policyContext;
+    return UA_Openssl_RSA_PKCS1_V15_SHA256_Sign(message, pc->localPrivateKey, signature);
+}
+
+static size_t
+UA_CertSig_Aes256Sha256RsaPss_getRemoteSignatureSize(const void *channelContext) {
+    if(channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc = (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_Int32 keyLen = 0;
+    UA_Openssl_RSA_Public_GetKeyLength(cc->remoteCertificateX509, &keyLen);
+    return (size_t)keyLen;
+}
+
+static size_t
+UA_CertSig_Aes256Sha256RsaPss_getLocalSignatureSize(const void *channelContext) {
+    if(channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc = (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    Policy_Context_Aes256Sha256RsaPss *pc = cc->policyContext;
+    UA_Int32 keyLen = 0;
+    UA_Openssl_RSA_Private_GetKeyLength(pc->localPrivateKey, &keyLen);
+    return (size_t)keyLen;
+}
+
+static UA_StatusCode
+UA_ChannelModule_Aes256Sha256RsaPss_setLocalSymSigningKey(void *channelContext,
+                                                           const UA_ByteString *key) {
+    if(key == NULL || channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_ByteString_clear(&cc->localSymSigningKey);
+    return UA_ByteString_copy(key, &cc->localSymSigningKey);
+}
+
+static UA_StatusCode
+UA_ChannelM_Aes256Sha256RsaPss_setLocalSymEncryptingKey(void *channelContext,
+                                                         const UA_ByteString *key) {
+    if(key == NULL || channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_ByteString_clear(&cc->localSymEncryptingKey);
+    return UA_ByteString_copy(key, &cc->localSymEncryptingKey);
+}
+
+static UA_StatusCode
+UA_ChannelM_Aes256Sha256RsaPss_setLocalSymIv(void *channelContext,
+                                              const UA_ByteString *iv) {
+    if(iv == NULL || channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_ByteString_clear(&cc->localSymIv);
+    return UA_ByteString_copy(iv, &cc->localSymIv);
+}
+
+static size_t
+UA_SymEn_Aes256Sha256RsaPss_getRemoteKeyLength(const void *channelContext) {
+    /* 32 bytes 256 bits */
+    return UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_KEY_LENGTH;
+}
+
+static size_t
+UA_SymEn_Aes256Sha256RsaPss_getBlockSize(const void *channelContext) {
+    return UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_ENCRYPTION_BLOCK_SIZE;
+}
+
+static size_t
+UA_SymSig_Aes256Sha256RsaPss_getRemoteKeyLength(const void *channelContext) {
+    /* 32 bytes 256 bits */
+    return UA_SECURITYPOLICY_AES256SHA256RSAPSS_SYM_SIGNING_KEY_LENGTH;
+}
+
+static UA_StatusCode
+UA_ChannelM_Aes256Sha256RsaPss_setRemoteSymSigningKey(void *channelContext,
+                                                       const UA_ByteString *key) {
+    if(key == NULL || channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_ByteString_clear(&cc->remoteSymSigningKey);
+    return UA_ByteString_copy(key, &cc->remoteSymSigningKey);
+}
+
+static UA_StatusCode
+UA_ChannelM_Aes256Sha256RsaPss_setRemoteSymEncryptingKey(void *channelContext,
+                                                          const UA_ByteString *key) {
+    if(key == NULL || channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_ByteString_clear(&cc->remoteSymEncryptingKey);
+    return UA_ByteString_copy(key, &cc->remoteSymEncryptingKey);
+}
+
+static UA_StatusCode
+UA_ChannelM_Aes256Sha256RsaPss_setRemoteSymIv(void *channelContext,
+                                               const UA_ByteString *key) {
+    if(key == NULL || channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    UA_ByteString_clear(&cc->remoteSymIv);
+    return UA_ByteString_copy(key, &cc->remoteSymIv);
+}
+
+static UA_StatusCode
+UA_AsySig_Aes256Sha256RsaPss_sign(void *channelContext, const UA_ByteString *message,
+                                   UA_ByteString *signature) {
+    if(channelContext == NULL || message == NULL ||
+       signature == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    Policy_Context_Aes256Sha256RsaPss *pc = cc->policyContext;
+    return UA_Openssl_RSA_PSS_SHA256_Sign(message, pc->localPrivateKey, signature);
+}
+
+static UA_StatusCode
+UA_AsymEn_Aes256Sha256RsaPss_encrypt(void *channelContext, UA_ByteString *data) {
+    if(channelContext == NULL || data == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    return UA_Openssl_RSA_OAEP_SHA2_Encrypt(
+        data, UA_SECURITYPOLICY_AES256SHA256RSAPSS_RSAPADDING_LEN,
+        cc->remoteCertificateX509);
+}
+
+static size_t
+UA_SymSig_Aes256Sha256RsaPss_getRemoteSignatureSize(const void *channelContext) {
+    return UA_SHA256_LENGTH;
+}
+
+static UA_StatusCode
+UA_SymSig_Aes256Sha256RsaPss_verify(void *channelContext, const UA_ByteString *message,
+                                     const UA_ByteString *signature) {
+    if(channelContext == NULL || message == NULL ||
+       signature == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    return UA_OpenSSL_HMAC_SHA256_Verify(message, &cc->remoteSymSigningKey, signature);
+}
+
+static UA_StatusCode
+UA_SymSig_Aes256Sha256RsaPss_sign(void *channelContext, const UA_ByteString *message,
+                                   UA_ByteString *signature) {
+    if(channelContext == NULL || message == NULL ||
+       signature == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    return UA_OpenSSL_HMAC_SHA256_Sign(message, &cc->localSymSigningKey, signature);
+}
+
+static size_t
+UA_SymSig_Aes256Sha256RsaPss_getLocalSignatureSize(const void *channelContext) {
+    return UA_SHA256_LENGTH;
+}
+
+static UA_StatusCode
+UA_SymEn_Aes256Sha256RsaPss_decrypt(void *channelContext, UA_ByteString *data) {
+    if(channelContext == NULL || data == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    return UA_OpenSSL_AES_256_CBC_Decrypt(&cc->remoteSymIv, &cc->remoteSymEncryptingKey,
+                                          data);
+}
+
+static UA_StatusCode
+UA_SymEn_Aes256Sha256RsaPss_encrypt(void *channelContext, UA_ByteString *data) {
+    if(channelContext == NULL || data == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Channel_Context_Aes256Sha256RsaPss *cc =
+        (Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    return UA_OpenSSL_AES_256_CBC_Encrypt(&cc->localSymIv, &cc->localSymEncryptingKey,
+                                          data);
+}
+
+static UA_StatusCode
+UA_ChannelM_Aes256Sha256RsaPss_compareCertificate(const void *channelContext,
+                                                   const UA_ByteString *certificate) {
+    if(channelContext == NULL || certificate == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc =
+        (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    return UA_OpenSSL_X509_compare(certificate, cc->remoteCertificateX509);
+}
+
+static size_t
+UA_AsymEn_Aes256Sha256RsaPss_getLocalKeyLength(const void *channelContext) {
+    if(channelContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const Channel_Context_Aes256Sha256RsaPss *cc =
+        (const Channel_Context_Aes256Sha256RsaPss *)channelContext;
+    Policy_Context_Aes256Sha256RsaPss *pc = cc->policyContext;
+    UA_Int32 keyLen = 0;
+    UA_Openssl_RSA_Private_GetKeyLength(pc->localPrivateKey, &keyLen);
+    return (size_t)keyLen * 8;
+}
+
+/* the main entry of Aes256Sha256RsaPss */
+
+UA_StatusCode
+UA_SecurityPolicy_Aes256Sha256RsaPss(UA_SecurityPolicy *policy,
+                                      const UA_ByteString localCertificate,
+                                      const UA_ByteString localPrivateKey,
+                                      const UA_Logger *logger) {
+
+    UA_SecurityPolicyAsymmetricModule *const asymmetricModule = &policy->asymmetricModule;
+    UA_SecurityPolicySymmetricModule *const symmetricModule = &policy->symmetricModule;
+    UA_SecurityPolicyChannelModule *const channelModule = &policy->channelModule;
+    UA_StatusCode retval;
+
+    UA_LOG_INFO(logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                "The Aes256Sha256RsaPss security policy with openssl is added.");
+
+    UA_Openssl_Init();
+    memset(policy, 0, sizeof(UA_SecurityPolicy));
+    policy->logger = logger;
+    policy->policyUri =
+        UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss\0");
+
+    /* set ChannelModule context  */
+
+    channelModule->newContext = UA_ChannelModule_Aes256Sha256RsaPss_New_Context;
+    channelModule->deleteContext = UA_ChannelModule_Aes256Sha256RsaPss_Delete_Context;
+    channelModule->setLocalSymSigningKey =
+        UA_ChannelModule_Aes256Sha256RsaPss_setLocalSymSigningKey;
+    channelModule->setLocalSymEncryptingKey =
+        UA_ChannelM_Aes256Sha256RsaPss_setLocalSymEncryptingKey;
+    channelModule->setLocalSymIv = UA_ChannelM_Aes256Sha256RsaPss_setLocalSymIv;
+    channelModule->setRemoteSymSigningKey =
+        UA_ChannelM_Aes256Sha256RsaPss_setRemoteSymSigningKey;
+    channelModule->setRemoteSymEncryptingKey =
+        UA_ChannelM_Aes256Sha256RsaPss_setRemoteSymEncryptingKey;
+    channelModule->setRemoteSymIv = UA_ChannelM_Aes256Sha256RsaPss_setRemoteSymIv;
+    channelModule->compareCertificate =
+        UA_ChannelM_Aes256Sha256RsaPss_compareCertificate;
+
+    /* Copy the certificate and add a NULL to the end */
+
+    retval = UA_copyCertificate(&policy->localCertificate, &localCertificate);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* AsymmetricModule - signature algorithm */
+
+    UA_SecurityPolicySignatureAlgorithm *asySigAlgorithm =
+        &asymmetricModule->cryptoModule.signatureAlgorithm;
+    asySigAlgorithm->uri =
+        UA_STRING("http://opcfoundation.org/UA/security/rsa-pss-sha2-256\0");
+    asySigAlgorithm->verify = UA_AsySig_Aes256Sha256RsaPss_Verify;
+    asySigAlgorithm->getRemoteSignatureSize =
+        UA_Asym_Aes256Sha256RsaPss_getRemoteSignatureSize;
+    asySigAlgorithm->getLocalSignatureSize =
+        UA_AsySig_Aes256Sha256RsaPss_getLocalSignatureSize;
+    asySigAlgorithm->sign = UA_AsySig_Aes256Sha256RsaPss_sign;
+    asySigAlgorithm->getLocalKeyLength = NULL;
+    asySigAlgorithm->getRemoteKeyLength = NULL;
+
+    /*  AsymmetricModule encryption algorithm */
+
+    UA_SecurityPolicyEncryptionAlgorithm *asymEncryAlg =
+        &asymmetricModule->cryptoModule.encryptionAlgorithm;
+    asymEncryAlg->uri = UA_STRING("http://opcfoundation.org/UA/security/rsa-oaep-sha2-256\0");
+    asymEncryAlg->decrypt = UA_Asym_Aes256Sha256RsaPss_Decrypt;
+    asymEncryAlg->getRemotePlainTextBlockSize =
+        UA_AsymEn_Aes256Sha256RsaPss_getRemotePlainTextBlockSize;
+    asymEncryAlg->getRemoteBlockSize = UA_AsymEn_Aes256Sha256RsaPss_getRemoteBlockSize;
+    asymEncryAlg->getRemoteKeyLength = UA_AsymEn_Aes256Sha256RsaPss_getRemoteKeyLength;
+    asymEncryAlg->encrypt = UA_AsymEn_Aes256Sha256RsaPss_encrypt;
+    asymEncryAlg->getLocalKeyLength = UA_AsymEn_Aes256Sha256RsaPss_getLocalKeyLength;
+
+    /* asymmetricModule */
+
+    asymmetricModule->compareCertificateThumbprint =
+        UA_compareCertificateThumbprint_Aes256Sha256RsaPss;
+    asymmetricModule->makeCertificateThumbprint =
+        UA_makeCertificateThumbprint_Aes256Sha256RsaPss;
+
+    /* SymmetricModule */
+
+    symmetricModule->secureChannelNonceLength = 32;
+    symmetricModule->generateNonce = UA_Sym_Aes256Sha256RsaPss_generateNonce;
+    symmetricModule->generateKey = UA_Sym_Aes256Sha256RsaPss_generateKey;
+
+    /* Symmetric encryption Algorithm */
+
+    UA_SecurityPolicyEncryptionAlgorithm *symEncryptionAlgorithm =
+        &symmetricModule->cryptoModule.encryptionAlgorithm;
+    symEncryptionAlgorithm->uri =
+        UA_STRING("http://www.w3.org/2001/04/xmlenc#aes256-cbc\0");
+    symEncryptionAlgorithm->getLocalKeyLength = UA_SymEn_Aes256Sha256RsaPss_getLocalKeyLength;
+    symEncryptionAlgorithm->getRemoteKeyLength = UA_SymEn_Aes256Sha256RsaPss_getRemoteKeyLength;
+    symEncryptionAlgorithm->getRemoteBlockSize = UA_SymEn_Aes256Sha256RsaPss_getBlockSize;
+    symEncryptionAlgorithm->getRemotePlainTextBlockSize = UA_SymEn_Aes256Sha256RsaPss_getBlockSize;
+    symEncryptionAlgorithm->decrypt = UA_SymEn_Aes256Sha256RsaPss_decrypt;
+    symEncryptionAlgorithm->encrypt = UA_SymEn_Aes256Sha256RsaPss_encrypt;
+
+    /* Symmetric signature Algorithm */
+
+    UA_SecurityPolicySignatureAlgorithm *symSignatureAlgorithm =
+        &symmetricModule->cryptoModule.signatureAlgorithm;
+    symSignatureAlgorithm->uri = UA_STRING("http://www.w3.org/2000/09/xmldsig#hmac-sha2-256\0");
+    symSignatureAlgorithm->getLocalKeyLength = UA_SymSig_Aes256Sha256RsaPss_getLocalKeyLength;
+    symSignatureAlgorithm->getRemoteKeyLength = UA_SymSig_Aes256Sha256RsaPss_getRemoteKeyLength;
+    symSignatureAlgorithm->getRemoteSignatureSize = UA_SymSig_Aes256Sha256RsaPss_getRemoteSignatureSize;
+    symSignatureAlgorithm->verify = UA_SymSig_Aes256Sha256RsaPss_verify;
+    symSignatureAlgorithm->sign = UA_SymSig_Aes256Sha256RsaPss_sign;
+    symSignatureAlgorithm->getLocalSignatureSize = UA_SymSig_Aes256Sha256RsaPss_getLocalSignatureSize;
+
+    retval = UA_Policy_Aes256Sha256RsaPss_New_Context(policy, localPrivateKey, logger);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_ByteString_clear(&policy->localCertificate);
+        return retval;
+    }
+    policy->clear = UA_Policy_Aes256Sha256RsaPss_Clear_Context;
+
+    /* Certificate Signing Algorithm */
+    policy->certificateSigningAlgorithm.uri =
+        UA_STRING("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256\0");
+    policy->certificateSigningAlgorithm.verify =
+        (UA_StatusCode (*)(void *, const UA_ByteString *, const UA_ByteString *))UA_CertSig_Aes256Sha256RsaPss_Verify;
+    policy->certificateSigningAlgorithm.sign =
+        (UA_StatusCode (*)(void *, const UA_ByteString *, UA_ByteString *))UA_CertSig_Aes256Sha256RsaPss_sign;
+    policy->certificateSigningAlgorithm.getLocalSignatureSize =
+        (size_t (*)(const void *))UA_CertSig_Aes256Sha256RsaPss_getLocalSignatureSize;
+    policy->certificateSigningAlgorithm.getRemoteSignatureSize =
+        (size_t (*)(const void *))UA_CertSig_Aes256Sha256RsaPss_getRemoteSignatureSize;
+    policy->certificateSigningAlgorithm.getLocalKeyLength = NULL; // TODO: Write function
+    policy->certificateSigningAlgorithm.getRemoteKeyLength = NULL; // TODO: Write function
+
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif
diff --git a/plugins/include/open62541/plugin/securitypolicy_default.h b/plugins/include/open62541/plugin/securitypolicy_default.h
index ee0a319068d..353a740518c 100644
--- a/plugins/include/open62541/plugin/securitypolicy_default.h
+++ b/plugins/include/open62541/plugin/securitypolicy_default.h
@@ -44,6 +44,12 @@ UA_SecurityPolicy_Aes128Sha256RsaOaep(UA_SecurityPolicy *policy,
                                  const UA_ByteString localPrivateKey,
                                  const UA_Logger *logger);
 
+UA_EXPORT UA_StatusCode
+UA_SecurityPolicy_Aes256Sha256RsaPss(UA_SecurityPolicy *policy,
+                                     const UA_ByteString localCertificate,
+                                     const UA_ByteString localPrivateKey,
+                                     const UA_Logger *logger);
+
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index 7394e354e97..eade7f5411c 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -181,6 +181,21 @@ UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(UA_ServerConfig *config,
                                                      const UA_ByteString *certificate,
                                                      const UA_ByteString *privateKey);
 
+/* Adds the security policy ``SecurityPolicy#Aes256Sha256RsaPss`` to the server. A
+ * server certificate may be supplied but is optional.
+ *
+ * Certificate verification should be configured before calling this
+ * function. See PKI plugin.
+ *
+ * @param config The configuration to manipulate
+ * @param certificate The server certificate.
+ * @param privateKey The private key that corresponds to the certificate.
+ */
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(UA_ServerConfig *config,
+                                                    const UA_ByteString *certificate,
+                                                    const UA_ByteString *privateKey);
+
 /* Adds all supported security policies and sets up certificate
  * validation procedures.
  *
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index d0a2ff1859d..6d5a57f753b 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -174,6 +174,8 @@ const UA_ConnectionConfig UA_ConnectionConfig_default = {
 #define APPLICATION_URI "urn:unconfigured:application"
 #define APPLICATION_URI_SERVER "urn:open62541.server.application"
 
+#define SECURITY_POLICY_SIZE 6
+
 #define STRINGIFY(arg) #arg
 #define VERSION(MAJOR, MINOR, PATCH, LABEL) \
     STRINGIFY(MAJOR) "." STRINGIFY(MINOR) "." STRINGIFY(PATCH) LABEL
@@ -755,6 +757,40 @@ UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(UA_ServerConfig *config,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(UA_ServerConfig *config,
+                                                     const UA_ByteString *certificate,
+                                                     const UA_ByteString *privateKey) {
+    /* Allocate the SecurityPolicies */
+    UA_SecurityPolicy *tmp = (UA_SecurityPolicy *)
+        UA_realloc(config->securityPolicies,
+                   sizeof(UA_SecurityPolicy) * (1 + config->securityPoliciesSize));
+    if(!tmp)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    config->securityPolicies = tmp;
+
+    /* Populate the SecurityPolicies */
+    UA_ByteString localCertificate = UA_BYTESTRING_NULL;
+    UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
+    if(certificate)
+        localCertificate = *certificate;
+    if(privateKey)
+        localPrivateKey = *privateKey;
+    UA_StatusCode retval =
+        UA_SecurityPolicy_Aes256Sha256RsaPss(&config->securityPolicies[config->securityPoliciesSize],
+                                              localCertificate, localPrivateKey, &config->logger);
+    if(retval != UA_STATUSCODE_GOOD) {
+        if(config->securityPoliciesSize == 0) {
+            UA_free(config->securityPolicies);
+            config->securityPolicies = NULL;
+        }
+        return retval;
+    }
+
+    config->securityPoliciesSize++;
+    return UA_STATUSCODE_GOOD;
+}
+
 /* Always returns UA_STATUSCODE_GOOD. Logs a warning if policies could not be added. */
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
@@ -803,6 +839,13 @@ UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
                        UA_StatusCode_name(retval));
     }
 
+    retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate, &localPrivateKey);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -987,7 +1030,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
 
     /* Populate SecurityPolicies */
     UA_SecurityPolicy *sp = (UA_SecurityPolicy*)
-        UA_realloc(config->securityPolicies, sizeof(UA_SecurityPolicy) * 5);
+        UA_realloc(config->securityPolicies, sizeof(UA_SecurityPolicy) * SECURITY_POLICY_SIZE);
     if(!sp)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = sp;
@@ -1032,6 +1075,16 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
                        UA_StatusCode_name(retval));
     }
 
+    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->securityPolicies[config->securityPoliciesSize],
+                                                   localCertificate, privateKey, &config->logger);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->securityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
     if(config->securityPoliciesSize == 0) {
         UA_free(config->securityPolicies);
         config->securityPolicies = NULL;
@@ -1110,6 +1163,16 @@ UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
                        UA_StatusCode_name(retval));
     }
 
+    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
+                                                   certificateAuth, privateKeyAuth, &config->logger);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->authSecurityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
     if(config->authSecurityPoliciesSize == 0) {
         UA_free(config->authSecurityPolicies);
         config->authSecurityPolicies = NULL;
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 15da3132930..fa335ac66b2 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -100,9 +100,9 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
     UA_SignatureData *sd = &request->clientSignature;
 
     /* Prepare the clientSignature */
-    size_t signatureSize = sp->certificateSigningAlgorithm.
+    size_t signatureSize = sp->asymmetricModule.cryptoModule.signatureAlgorithm.
         getLocalSignatureSize(channel->channelContext);
-    UA_StatusCode retval = UA_String_copy(&sp->certificateSigningAlgorithm.uri,
+    UA_StatusCode retval = UA_String_copy(&sp->asymmetricModule.cryptoModule.signatureAlgorithm.uri,
                                           &sd->algorithm);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
@@ -127,7 +127,7 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
            channel->remoteCertificate.length);
     memcpy(dataToSign.data + channel->remoteCertificate.length,
            client->serverSessionNonce.data, client->serverSessionNonce.length);
-    retval = sp->certificateSigningAlgorithm.sign(channel->channelContext,
+    retval = sp->asymmetricModule.cryptoModule.signatureAlgorithm.sign(channel->channelContext,
                                                   &dataToSign, &sd->signature);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
@@ -150,9 +150,9 @@ if(client->config.userTokenPolicy.tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
     if(retval != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    size_t userTokenSignatureSize = utpSecurityPolicy->certificateSigningAlgorithm.
+    size_t userTokenSignatureSize = utpSecurityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.
         getLocalSignatureSize(tempChannelContext);
-    retval = UA_String_copy(&utpSecurityPolicy->certificateSigningAlgorithm.uri,
+    retval = UA_String_copy(&utpSecurityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.uri,
                             &utsd->algorithm);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
@@ -177,7 +177,7 @@ if(client->config.userTokenPolicy.tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
            channel->remoteCertificate.length);
     memcpy(userTokenSign.data + channel->remoteCertificate.length,
            client->serverSessionNonce.data, client->serverSessionNonce.length);
-    retval = utpSecurityPolicy->certificateSigningAlgorithm.sign(tempChannelContext,
+    retval = utpSecurityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.sign(tempChannelContext,
                                                   &userTokenSign, &utsd->signature);
     /* Clean up */
     UA_ByteString_clear(&userTokenSign);
@@ -316,7 +316,7 @@ checkCreateSessionSignature(UA_Client *client, const UA_SecureChannel *channel,
     memcpy(dataToVerify.data + lc->length, client->clientSessionNonce.data,
            client->clientSessionNonce.length);
 
-    retval = sp->certificateSigningAlgorithm.verify(channel->channelContext, &dataToVerify,
+    retval = sp->asymmetricModule.cryptoModule.signatureAlgorithm.verify(channel->channelContext, &dataToVerify,
                                                     &response->serverSignature.signature);
     UA_ByteString_clear(&dataToVerify);
     return retval;
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index fc6664c2d3b..f27a3e71538 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -190,9 +190,9 @@ signCreateSessionResponse(UA_Server *server, UA_SecureChannel *channel,
     UA_SignatureData *signatureData = &response->serverSignature;
 
     /* Prepare the signature */
-    size_t signatureSize = securityPolicy->certificateSigningAlgorithm.
+    size_t signatureSize = securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.
         getLocalSignatureSize(channel->channelContext);
-    UA_StatusCode retval = UA_String_copy(&securityPolicy->certificateSigningAlgorithm.uri,
+    UA_StatusCode retval = UA_String_copy(&securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.uri,
                                           &signatureData->algorithm);
     retval |= UA_ByteString_allocBuffer(&signatureData->signature, signatureSize);
     if(retval != UA_STATUSCODE_GOOD)
@@ -209,7 +209,7 @@ signCreateSessionResponse(UA_Server *server, UA_SecureChannel *channel,
     memcpy(dataToSign.data, request->clientCertificate.data, request->clientCertificate.length);
     memcpy(dataToSign.data + request->clientCertificate.length,
            request->clientNonce.data, request->clientNonce.length);
-    retval = securityPolicy->certificateSigningAlgorithm.
+    retval = securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.
         sign(channel->channelContext, &dataToSign, &signatureData->signature);
 
     /* Clean up */
@@ -435,7 +435,7 @@ checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
     memcpy(dataToVerify.data, localCertificate->data, localCertificate->length);
     memcpy(dataToVerify.data + localCertificate->length,
            serverNonce->data, serverNonce->length);
-    retval = securityPolicy->certificateSigningAlgorithm.
+    retval = securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.
         verify(channelContext, &dataToVerify, &signature->signature);
     UA_ByteString_clear(&dataToVerify);
     if(retval != UA_STATUSCODE_GOOD)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ff2ca5164f3..db7be8540d9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -111,6 +111,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c)
 endif()
 
@@ -122,6 +123,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
               ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic256.c
               ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic256sha256.c
               ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
+              ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
               ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_create_certificate.c
               ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_pki_openssl.c)
 endif()
@@ -427,6 +429,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
     ua_add_test(encryption/check_encryption_basic256.c)
     ua_add_test(encryption/check_encryption_basic256sha256.c)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
+    ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS AND UA_ENABLE_CERT_REJECTED_DIR)
@@ -438,6 +441,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
     ua_add_test(encryption/check_encryption_basic256.c)
     ua_add_test(encryption/check_encryption_basic256sha256.c)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
+    ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
     ua_add_test(encryption/check_cert_generation.c)
 endif()
 
diff --git a/tests/encryption/check_encryption_aes256sha256rsapss.c b/tests/encryption/check_encryption_aes256sha256rsapss.c
new file mode 100644
index 00000000000..1a34d8b9f21
--- /dev/null
+++ b/tests/encryption/check_encryption_aes256sha256rsapss.c
@@ -0,0 +1,287 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Noel Graf)
+ *
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/securitypolicy.h>
+#include <open62541/plugin/pki_default.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include "client/ua_client_internal.h"
+#include "ua_server_internal.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "certificates.h"
+#include "check.h"
+#include "testing_clock.h"
+#include "testing_networklayers.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+    UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static void setup(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    /* Load the trustlist */
+    size_t trustListSize = 0;
+    UA_ByteString *trustList = NULL;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 0;
+    UA_ByteString *issuerList = NULL;
+
+    /* TODO test trustList
+    if(argc > 3)
+        trustListSize = (size_t)argc-3;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
+    for(size_t i = 0; i < trustListSize; i++)
+        trustList[i] = loadFile(argv[i+3]);
+    */
+
+    /* Loading of a revocation list currently unsupported */
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   trustList, trustListSize,
+                                                   issuerList, issuerListSize,
+                                                   revocationList, revocationListSize);
+
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config->sessionPKI);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    for(size_t i = 0; i < trustListSize; i++)
+        UA_ByteString_clear(&trustList[i]);
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(encryption_connect) {
+    UA_Client *client = NULL;
+    UA_EndpointDescription* endpointArray = NULL;
+    size_t endpointArraySize = 0;
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* The Get endpoint (discovery service) is done with
+     * security mode as none to see the server's capability
+     * and certificate */
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    ck_assert(client != NULL);
+    UA_StatusCode retval = UA_Client_getEndpoints(client, "opc.tcp://localhost:4840",
+                                                  &endpointArraySize, &endpointArray);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(endpointArraySize > 0);
+
+    UA_Array_delete(endpointArray, endpointArraySize,
+                    &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+
+    /* TODO test trustList Load revocationList is not supported now
+    if(argc > MIN_ARGS) {
+        trustListSize = (size_t)argc-MIN_ARGS;
+        retval = UA_ByteString_allocBuffer(trustList, trustListSize);
+        if(retval != UA_STATUSCODE_GOOD) {
+            cleanupClient(client, remoteCertificate);
+            return (int)retval;
+        }
+
+        for(size_t trustListCount = 0; trustListCount < trustListSize; trustListCount++) {
+            trustList[trustListCount] = loadFile(argv[trustListCount+3]);
+        }
+    }
+    */
+
+    UA_Client_delete(client);
+
+    /* Secure client initialization */
+    client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                         trustList, trustListSize,
+                                         revocationList, revocationListSize);
+    cc->certificateVerification.clear(&cc->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
+    ck_assert(client != NULL);
+
+    for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++) {
+        UA_ByteString_clear(&trustList[deleteCount]);
+    }
+
+    /* Secure client connect */
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(encryption_connect_pem) {
+    UA_Client *client = NULL;
+    UA_EndpointDescription* endpointArray = NULL;
+    size_t endpointArraySize = 0;
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_PEM_LENGTH;
+    certificate.data = CERT_PEM_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_PEM_LENGTH;
+    privateKey.data = KEY_PEM_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* The Get endpoint (discovery service) is done with
+     * security mode as none to see the server's capability
+     * and certificate */
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    ck_assert(client != NULL);
+    UA_StatusCode retval = UA_Client_getEndpoints(client, "opc.tcp://localhost:4840",
+                                                  &endpointArraySize, &endpointArray);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(endpointArraySize > 0);
+
+    UA_Array_delete(endpointArray, endpointArraySize,
+                    &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+
+    /* TODO test trustList Load revocationList is not supported now
+    if(argc > MIN_ARGS) {
+        trustListSize = (size_t)argc-MIN_ARGS;
+        retval = UA_ByteString_allocBuffer(trustList, trustListSize);
+        if(retval != UA_STATUSCODE_GOOD) {
+            cleanupClient(client, remoteCertificate);
+            return (int)retval;
+        }
+
+        for(size_t trustListCount = 0; trustListCount < trustListSize; trustListCount++) {
+            trustList[trustListCount] = loadFile(argv[trustListCount+3]);
+        }
+    }
+    */
+
+    UA_Client_delete(client);
+
+    /* Secure client initialization */
+    client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                         trustList, trustListSize,
+                                         revocationList, revocationListSize);
+    cc->certificateVerification.clear(&cc->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
+    ck_assert(client != NULL);
+
+    for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++) {
+        UA_ByteString_clear(&trustList[deleteCount]);
+    }
+
+    /* Secure client connect */
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+static Suite* testSuite_encryption(void) {
+    Suite *s = suite_create("Encryption");
+    TCase *tc_encryption = tcase_create("Encryption Aes256Sha256RsaPss security policy");
+    tcase_add_checked_fixture(tc_encryption, setup, teardown);
+#ifdef UA_ENABLE_ENCRYPTION
+    tcase_add_test(tc_encryption, encryption_connect);
+    tcase_add_test(tc_encryption, encryption_connect_pem);
+#endif /* UA_ENABLE_ENCRYPTION */
+    suite_add_tcase(s,tc_encryption);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_encryption();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 68e09a3645f..adc5f81f0f9 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -93,6 +93,7 @@ if(UA_ENABLE_ENCRYPTION OR UA_ENABLE_ENCRYPTION STREQUAL "MBEDTLS" OR UA_ENABLE_
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c)
 endif()
 

From 5acf9969f8f1a87ab651306e763061cd6178c498 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Tue, 18 Jul 2023 13:14:19 +0200
Subject: [PATCH 1049/1963] fix(tests): Correct type of publisherId in tests

Correct type of publisherId in tests to match publisherId type in
connection and readergroup configuration.
---
 tests/pubsub/check_pubsub_get_state.c | 2 +-
 tests/pubsub/check_pubsub_mqtt.c      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 4be16a5ad98..57f5d54fa91 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -190,7 +190,7 @@ static void AddDataSetReader(
     UA_DataSetReaderConfig readerConfig;
     memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
     readerConfig.name = UA_STRING(pName);
-    UA_Variant_setScalar(&readerConfig.publisherId, (UA_UInt16*) &PublisherId, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_Variant_setScalar(&readerConfig.publisherId, (UA_UInt32*) &PublisherId, &UA_TYPES[UA_TYPES_UINT32]);
     readerConfig.writerGroupId    = (UA_UInt16) WriterGroupId;
     readerConfig.dataSetWriterId  = (UA_UInt16) DataSetWriterId;
     readerConfig.messageReceiveTimeout = MessageReceiveTimeout;
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index 48eaa1e38c2..ab8007875a5 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -250,8 +250,8 @@ START_TEST(SinglePublishSubscribeDateTime){
         // add DataSetReader
         memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
         readerConfig.name = UA_STRING("DataSet Reader 1");
-        UA_UInt32 publisherIdentifier = 2234;
-        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT32];
+        UA_UInt16 publisherIdentifier = 2234;
+        readerConfig.publisherId.type = &UA_TYPES[UA_TYPES_UINT16];
         readerConfig.publisherId.data = &publisherIdentifier;
         readerConfig.writerGroupId    = 100;
         readerConfig.dataSetWriterId  = 62541;

From 6e80b1e1226f0c993b466699a928efb50352720f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Jul 2023 06:57:30 +0200
Subject: [PATCH 1050/1963] fix(plugins): Fix Signature Algorithm URI in
 ua_securitypolicy_basic256sha256.c

---
 plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
index 61f0b297f8c..5354a12a720 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
@@ -772,7 +772,7 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy, const UA_ByteString
     UA_SecurityPolicySignatureAlgorithm *sym_signatureAlgorithm =
         &symmetricModule->cryptoModule.signatureAlgorithm;
     sym_signatureAlgorithm->uri =
-        UA_STRING("http://www.w3.org/2000/09/xmldsig#hmac-sha1\0");
+        UA_STRING("http://www.w3.org/2000/09/xmldsig#hmac-sha2-256\0");
     sym_signatureAlgorithm->verify =
         (UA_StatusCode (*)(void *, const UA_ByteString *, const UA_ByteString *))sym_verify_sp_basic256sha256;
     sym_signatureAlgorithm->sign =

From c0d8225c120b34385479e4222bc98a3b3b33aa67 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Jul 2023 07:02:24 +0200
Subject: [PATCH 1051/1963] fix(server): Return EndpointUrl in FindServers as
 the DiscoveryUrl

This pacifies some warnings in UAExpert.
---
 src/server/ua_services_discovery.c        | 14 ++++++++++++++
 tests/client/check_client_async_connect.c |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 0076f8c5dcc..af0b4d29f64 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -172,6 +172,20 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
         response->servers = NULL;
     }
 #endif
+
+    if(request->endpointUrl.length > 0 && response->servers != NULL) {
+        for(size_t i = 0; i < response->serversSize; i++) {
+            UA_Array_delete(response->servers[i].discoveryUrls,
+                            response->servers[i].discoveryUrlsSize,
+                            &UA_TYPES[UA_TYPES_STRING]);
+            response->servers[i].discoveryUrls = NULL;
+            response->servers[i].discoveryUrlsSize = 0;
+            response->responseHeader.serviceResult |=
+                UA_Array_appendCopy((void**)&response->servers[i].discoveryUrls,
+                                    &response->servers[i].discoveryUrlsSize,
+                                    &request->endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
+        }
+    }
 }
 
 void
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index d1e80929e46..f1e05f524f8 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -89,7 +89,7 @@ START_TEST(Client_connect_async) {
     ck_assert_uint_eq(connected, true);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     /* With default setting the client uses 7 iterations to connect */
-    ck_assert_uint_eq(asyncCounter, 10-7);
+    ck_assert_uint_eq(asyncCounter, 5);
     UA_Client_disconnectAsync(client);
     while(connected) {
         UA_Server_run_iterate(server, false);

From db5b40ee05e0c5b95dcc77ce5299be6cfa39e776 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 17 Jul 2023 20:22:04 +0200
Subject: [PATCH 1052/1963] refactor(plugins): Don't use Aes256Sha256RsaPss for
 password encryption

We currently select the last SecurityPolicy for password encryption.
The CTT don't support this SecurityPolicy at this time.
---
 plugins/ua_config_default.c | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 6d5a57f753b..d8380d174ac 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -825,24 +825,24 @@ UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate, &localPrivateKey);
+    retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate, &localPrivateKey);
+    retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate, &localPrivateKey);
+    retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                        UA_StatusCode_name(retval));
     }
 
@@ -1055,33 +1055,33 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_SecurityPolicy_Basic256Sha256(&config->securityPolicies[config->securityPoliciesSize],
-                                              localCertificate, privateKey, &config->logger);
+    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->securityPolicies[config->securityPoliciesSize],
+                                                   localCertificate, privateKey, &config->logger);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->securityPolicies[config->securityPoliciesSize],
-                                                   localCertificate, privateKey, &config->logger);
+    retval = UA_SecurityPolicy_Basic256Sha256(&config->securityPolicies[config->securityPoliciesSize],
+                                              localCertificate, privateKey, &config->logger);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->securityPolicies[config->securityPoliciesSize],
+    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->securityPolicies[config->securityPoliciesSize],
                                                    localCertificate, privateKey, &config->logger);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                        UA_StatusCode_name(retval));
     }
 
@@ -1143,33 +1143,33 @@ UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_SecurityPolicy_Basic256Sha256(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                              certificateAuth, privateKeyAuth, &config->logger);
+    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
+                                                   certificateAuth, privateKeyAuth, &config->logger);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->authSecurityPoliciesSize;
     } else {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                                   certificateAuth, privateKeyAuth, &config->logger);
+    retval = UA_SecurityPolicy_Basic256Sha256(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
+                                              certificateAuth, privateKeyAuth, &config->logger);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->authSecurityPoliciesSize;
     } else {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
+    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
                                                    certificateAuth, privateKeyAuth, &config->logger);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->authSecurityPoliciesSize;
     } else {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                        UA_StatusCode_name(retval));
     }
 

From b1198f814d07a02a69431066013f100c4554e73c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 18 Jul 2023 12:06:17 +0200
Subject: [PATCH 1053/1963] fix(core): Make PolicyIds unique by appending the
 security mode

---
 plugins/ua_accesscontrol_default.c | 29 +++++++++++++++++++++++------
 plugins/ua_config_default.c        | 15 +++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 28023a11bef..b3f5ab6ae8a 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -69,17 +69,29 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         const UA_AnonymousIdentityToken *token = (UA_AnonymousIdentityToken*)
             userIdentityToken->content.decoded.data;
 
-        /* Compatibility notice: Siemens OPC Scout v10 provides an empty
+        /* Match the beginnig of the PolicyId.
+         * Compatibility notice: Siemens OPC Scout v10 provides an empty
          * policyId. This is not compliant. For compatibility, assume that empty
          * policyId == ANONYMOUS_POLICY */
-        if(token->policyId.data && !UA_String_equal(&token->policyId, &anonymous_policy))
+        if(token->policyId.data &&
+           (token->policyId.length < anonymous_policy.length ||
+            strncmp((const char*)token->policyId.data,
+                    (const char*)anonymous_policy.data,
+                    anonymous_policy.length) != 0)) {
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
     } else if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
         /* Username and password */
-        const UA_UserNameIdentityToken *userToken =
-            (UA_UserNameIdentityToken*)userIdentityToken->content.decoded.data;
-        if(!UA_String_equal(&userToken->policyId, &username_policy))
+        const UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken*)
+            userIdentityToken->content.decoded.data;
+
+        /* Match the beginnig of the PolicyId */
+        if(userToken->policyId.length < username_policy.length ||
+           strncmp((const char*)userToken->policyId.data,
+                   (const char*)username_policy.data,
+                   username_policy.length) != 0) {
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
 
         /* The userToken has been decrypted by the server before forwarding
          * it to the plugin. This information can be used here. */
@@ -107,8 +119,13 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         const UA_X509IdentityToken *userToken = (UA_X509IdentityToken*)
             userIdentityToken->content.decoded.data;
 
-        if(!UA_String_equal(&userToken->policyId, &certificate_policy))
+        /* Match the beginnig of the PolicyId */
+        if(userToken->policyId.length < certificate_policy.length ||
+           strncmp((const char*)userToken->policyId.data,
+                   (const char*)certificate_policy.data,
+                   certificate_policy.length) != 0) {
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
 
         if(!config->sessionPKI.verifyCertificate)
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index d8380d174ac..528e011474a 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -180,6 +180,8 @@ const UA_ConnectionConfig UA_ConnectionConfig_default = {
 #define VERSION(MAJOR, MINOR, PATCH, LABEL) \
     STRINGIFY(MAJOR) "." STRINGIFY(MINOR) "." STRINGIFY(PATCH) LABEL
 
+const char *securityModeStrs[4] = {"-invalid", "-none", "-sign", "-sign+encrypt"};
+
 static UA_StatusCode
 addEndpoint(UA_ServerConfig *conf,
             const UA_SecurityPolicy *securityPolicy,
@@ -218,6 +220,19 @@ addEndpoint(UA_ServerConfig *conf,
     if(retval == UA_STATUSCODE_GOOD)
         endpoint->userIdentityTokensSize = conf->accessControl.userTokenPoliciesSize;
 
+    /* Append the SecurityMode to the usertokenpolicy PolicyId */
+    for(size_t i = 0; i < endpoint->userIdentityTokensSize; i++) {
+        UA_UserTokenPolicy *utp = &endpoint->userIdentityTokens[i];
+        size_t newLen = utp->policyId.length + strlen(securityModeStrs[securityMode]);
+        UA_Byte *newString = (UA_Byte*)UA_realloc(utp->policyId.data, newLen);
+        memcpy(&newString[utp->policyId.length], securityModeStrs[securityMode],
+               strlen(securityModeStrs[securityMode]));
+        if(!newString)
+            continue;
+        utp->policyId.data = newString;
+        utp->policyId.length = newLen;
+    }
+
     retval |= UA_String_copy(&securityPolicy->policyUri, &endpoint->securityPolicyUri);
     endpoint->transportProfileUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");

From 113ee4c47d0ad952a6d88f9f820e9089f4fdcfe3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 18 Jul 2023 15:08:39 +0200
Subject: [PATCH 1054/1963] refactor(plugins): Better error checking in
 securitypolicy_openssl_common.c

---
 .../openssl/securitypolicy_openssl_common.c   | 65 +++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.c b/plugins/crypto/openssl/securitypolicy_openssl_common.c
index 685d831ebe0..cebc51ae017 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.c
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.c
@@ -103,36 +103,34 @@ UA_copyCertificate (UA_ByteString * dst,
 }
 
 static UA_StatusCode
-UA_OpenSSL_RSA_Public_Verify (const UA_ByteString * message,
-                              const EVP_MD *        evpMd,
-                              X509 *                publicKeyX509,
-                              UA_Int16              padding,
-                              const UA_ByteString * signature
-                              ) {
-    EVP_MD_CTX *     mdctx        = NULL;
-    int              opensslRet;
-    EVP_PKEY_CTX *   evpKeyCtx;
-    EVP_PKEY *       evpPublicKey = NULL;
-    UA_StatusCode    ret;
+UA_OpenSSL_RSA_Public_Verify(const UA_ByteString *message,
+                             const EVP_MD *evpMd, X509 *publicKeyX509,
+                             UA_Int16 padding, const UA_ByteString *signature) {
+    EVP_MD_CTX *mdctx = EVP_MD_CTX_create();
+    if(!mdctx)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    mdctx = EVP_MD_CTX_create ();
-    if (mdctx == NULL) {
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    EVP_PKEY *evpPublicKey = X509_get_pubkey(publicKeyX509);
+    if(!evpPublicKey) {
         ret = UA_STATUSCODE_BADOUTOFMEMORY;
         goto errout;
     }
-    evpPublicKey = X509_get_pubkey (publicKeyX509);
-    if (evpPublicKey == NULL) {
-        ret = UA_STATUSCODE_BADOUTOFMEMORY;
+
+    EVP_PKEY_CTX *evpKeyCtx;
+    int opensslRet = EVP_DigestVerifyInit(mdctx, &evpKeyCtx, evpMd,
+                                          NULL, evpPublicKey);
+    if(opensslRet != 1) {
+        ret = UA_STATUSCODE_BADINTERNALERROR;
         goto errout;
     }
 
-    opensslRet = EVP_DigestVerifyInit (mdctx, &evpKeyCtx, evpMd, NULL,
-                                       evpPublicKey);
-    if (opensslRet != 1) {
+    opensslRet = EVP_PKEY_CTX_set_rsa_padding(evpKeyCtx, padding);
+    if(opensslRet != 1) {
         ret = UA_STATUSCODE_BADINTERNALERROR;
         goto errout;
     }
-    EVP_PKEY_CTX_set_rsa_padding (evpKeyCtx, padding);
+
     if(padding == RSA_PKCS1_PSS_PADDING) {
         opensslRet = EVP_PKEY_CTX_set_rsa_pss_saltlen(evpKeyCtx, RSA_PSS_SALTLEN_DIGEST);
         if(opensslRet != 1) {
@@ -140,30 +138,29 @@ UA_OpenSSL_RSA_Public_Verify (const UA_ByteString * message,
             goto errout;
         }
         opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(evpKeyCtx, EVP_sha256());
-        if (opensslRet != 1) {
+        if(opensslRet != 1) {
             ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;
         }
     }
+
     opensslRet = EVP_DigestVerifyUpdate (mdctx, message->data, message->length);
-    if (opensslRet != 1) {
+    if(opensslRet != 1) {
         ret = UA_STATUSCODE_BADINTERNALERROR;
         goto errout;
     }
+
     opensslRet = EVP_DigestVerifyFinal(mdctx, signature->data, signature->length);
-    if (opensslRet != 1) {
+    if(opensslRet != 1) {
         ret = UA_STATUSCODE_BADINTERNALERROR;
         goto errout;
     }
 
-    ret = UA_STATUSCODE_GOOD;
 errout:
-    if (evpPublicKey != NULL) {
-        EVP_PKEY_free (evpPublicKey);
-    }
-    if (mdctx != NULL) {
-        EVP_MD_CTX_destroy (mdctx);
-    }
+    if(evpPublicKey)
+        EVP_PKEY_free(evpPublicKey);
+    if(mdctx)
+        EVP_MD_CTX_destroy(mdctx);
     return ret;
 }
 
@@ -843,16 +840,16 @@ UA_StatusCode
 UA_OpenSSL_RSA_PKCS1_V15_SHA1_Verify (const UA_ByteString * msg,
                                       X509 *                publicKeyX509,
                                       const UA_ByteString * signature) {
-    return UA_OpenSSL_RSA_Public_Verify (msg, EVP_sha1(), publicKeyX509,
-                                         NID_sha1, signature);
+    return UA_OpenSSL_RSA_Public_Verify(msg, EVP_sha1(), publicKeyX509,
+                                        RSA_PKCS1_PADDING, signature);
 }
 
 UA_StatusCode
 UA_Openssl_RSA_PKCS1_V15_SHA1_Sign (const UA_ByteString * message,
                                     EVP_PKEY * privateKey,
                                     UA_ByteString *       outSignature) {
-    return UA_Openssl_RSA_Private_Sign (message, privateKey, EVP_sha1(),
-                                        NID_sha1, outSignature);
+    return UA_Openssl_RSA_Private_Sign(message, privateKey, EVP_sha1(),
+                                       RSA_PKCS1_PADDING, outSignature);
 }
 
 static UA_Openssl_P_SHA1_Ctx *

From f31fb7b5edfeec85434516245ef414ed119bcbfc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 18 Jul 2023 15:09:30 +0200
Subject: [PATCH 1055/1963] refactor(server): Store server certificate globally
 in the config

---
 plugins/ua_config_default.c   | 7 +++++--
 src/server/ua_server_config.c | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 528e011474a..aeddf14185f 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -236,8 +236,7 @@ addEndpoint(UA_ServerConfig *conf,
     retval |= UA_String_copy(&securityPolicy->policyUri, &endpoint->securityPolicyUri);
     endpoint->transportProfileUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
-    retval |= UA_String_copy(&securityPolicy->localCertificate,
-                             &endpoint->serverCertificate);
+    retval |= UA_String_copy(&conf->serverCertificate, &endpoint->serverCertificate);
     retval |= UA_ApplicationDescription_copy(&conf->applicationDescription,
                                              &endpoint->server);
 
@@ -881,6 +880,10 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
         return retval;
     }
 
+    retval = UA_ByteString_copy(certificate, &conf->serverCertificate);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
     retval = UA_CertificateVerification_Trustlist(&conf->sessionPKI,
                                                   trustList, trustListSize,
                                                   issuerList, issuerListSize,
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index f6b80a8d68a..0f44f94eaa1 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -28,6 +28,8 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 # endif
 #endif
 
+    UA_ByteString_clear(&config->serverCertificate);
+
     /* Stop and delete the EventLoop */
     UA_EventLoop *el = config->eventLoop;
     if(el && !config->externalEventLoop) {

From c81fce7224b421ba0ecde371749dd6fee24659f6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 18 Jul 2023 15:10:05 +0200
Subject: [PATCH 1056/1963] fix(server): Return a server certificate even when
 the SecureChannel is unencrypted

Required, e.g. for x509 authenticiation. There the signature sent by the
client is computed against the ServerCertificate.
---
 src/server/ua_services_session.c | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index f27a3e71538..5c5521693f8 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -369,27 +369,16 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
         UA_String_copy(&request->endpointUrl, &newSession->diagnostics.endpointUrl);
 #endif
 
-    UA_ByteString_init(&response->serverCertificate);
-
-    if(server->config.endpointsSize > 0)
-       for(size_t i = 0; i < response->serverEndpointsSize; ++i) {
-          if(response->serverEndpoints[i].securityMode==channel->securityMode &&
-             UA_ByteString_equal(&response->serverEndpoints[i].securityPolicyUri,
-                                 &channel->securityPolicy->policyUri) &&
-             UA_String_equal(&response->serverEndpoints[i].endpointUrl,
-                             &request->endpointUrl))
-          {
-             response->responseHeader.serviceResult |=
-                 UA_ByteString_copy(&response->serverEndpoints[i].serverCertificate,
-                                    &response->serverCertificate);
-          }
-       }
-
     /* Create a session nonce */
     response->responseHeader.serviceResult |= UA_Session_generateNonce(newSession);
     response->responseHeader.serviceResult |=
         UA_ByteString_copy(&newSession->serverNonce, &response->serverNonce);
 
+    /* Return the server certificate */
+    response->responseHeader.serviceResult |=
+        UA_ByteString_copy(&server->config.serverCertificate,
+                           &response->serverCertificate);
+
     /* Sign the signature */
     response->responseHeader.serviceResult |=
        signCreateSessionResponse(server, channel, request, response);

From bbcc0ed8fb7c3397492b6a247ff49887e4da792f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 18 Jul 2023 16:51:23 +0200
Subject: [PATCH 1057/1963] fix(server): If the Session name is empty, generate
 an internal name

This prevents problems in creating the diagnostics object (invalid
browsename).
---
 src/server/ua_services_session.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 5c5521693f8..0a41f3d99c1 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -362,6 +362,11 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
     response->responseHeader.serviceResult |=
         UA_String_copy(&request->sessionName, &newSession->sessionName);
 
+    /* If the session name is empty, use the generated SessionId */
+    if(newSession->sessionName.length == 0)
+        response->responseHeader.serviceResult |=
+            UA_NodeId_print(&newSession->sessionId, &newSession->sessionName);
+
 #ifdef UA_ENABLE_DIAGNOSTICS
     response->responseHeader.serviceResult |=
         UA_String_copy(&request->serverUri, &newSession->diagnostics.serverUri);

From 7bf8da6ffba46c5a0585162392c8daf49ebbcbfa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 18 Jul 2023 23:11:43 +0200
Subject: [PATCH 1058/1963] fix(client): Set the PolicyId for the
 UserIdentityToken only at runtime

---
 plugins/ua_config_default.c    | 6 ++++--
 src/client/ua_client_connect.c | 9 ++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index aeddf14185f..0656777cf39 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -1115,7 +1115,8 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
 #if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
 UA_StatusCode
 UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
-                                   UA_ByteString certificateAuth, UA_ByteString privateKeyAuth) {
+                                      UA_ByteString certificateAuth,
+                                      UA_ByteString privateKeyAuth) {
 #ifdef UA_ENABLE_ENCRYPTION_LIBRESSL
     UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
                    "Certificate authentication with LibreSSL as crypto backend is not supported.");
@@ -1125,7 +1126,8 @@ UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
     UA_X509IdentityToken* identityToken = UA_X509IdentityToken_new();
     if(!identityToken)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    identityToken->policyId = UA_STRING_ALLOC("open62541-certificate-policy");
+    /* Don't set identityToken->policyId. This is taken from the appropriate
+     * endpoint at runtime. */
     UA_StatusCode retval = UA_ByteString_copy(&certificateAuth, &identityToken->certificateData);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index fa335ac66b2..f2afd9ca4bd 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -742,11 +742,10 @@ activateSessionAsync(UA_Client *client) {
         request.userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
     }
 
-    /* Set the policy-Id from the endpoint. Every IdentityToken starts with a
-     * string. With an X509IdentityToken, the policy-Id is already set. */
-    if(client->config.userTokenPolicy.tokenType != UA_USERTOKENTYPE_CERTIFICATE)
-        retval = UA_String_copy(&client->config.userTokenPolicy.policyId,
-                                (UA_String*)request.userIdentityToken.content.decoded.data);
+    /* Set the correct PolicyId from the endpoint */
+    UA_String_clear((UA_String*)request.userIdentityToken.content.decoded.data);
+    retval = UA_String_copy(&client->config.userTokenPolicy.policyId,
+                            (UA_String*)request.userIdentityToken.content.decoded.data);
 
 #ifdef UA_ENABLE_ENCRYPTION
     /* Encrypt the UserIdentityToken */

From 0adcaa64ff9c17c02400e353d0098714b10c5830 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 19 Jul 2023 00:46:52 +0200
Subject: [PATCH 1059/1963] fix(client): Fix a case where a bad connectStatus
 gets overwritten

---
 src/client/ua_client_connect.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index f2afd9ca4bd..c04e5329c08 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1551,6 +1551,8 @@ initConnect(UA_Client *client) {
 
     /* Initialize the SecurityPolicy */
     initSecurityPolicy(client);
+    if(client->connectStatus != UA_STATUSCODE_GOOD)
+        return;
 
     /* Extract hostname and port from the URL */
     UA_String hostname = UA_STRING_NULL;
@@ -1662,6 +1664,10 @@ connectSync(UA_Client *client) {
 UA_StatusCode
 __UA_Client_connect(UA_Client *client, UA_Boolean async) {
     UA_LOCK(&client->clientMutex);
+    /* Reset the connectStatus. This should be the only place where we can
+     * recover from a bad connectStatus. */
+    client->connectStatus = UA_STATUSCODE_GOOD;
+
     if(async)
         initConnect(client);
     else
@@ -1896,6 +1902,8 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     client->channel.connectionId = 0;
 
     initSecurityPolicy(client);
+    if(client->connectStatus != UA_STATUSCODE_GOOD)
+        return client->connectStatus;
 
     UA_EventLoop *el = client->config.eventLoop;
     if(!el) {

From c72e52ac067ffa4af8a36f5bb6cd86b655ed2bec Mon Sep 17 00:00:00 2001
From: ozlb <ozlb@users.noreply.github.com>
Date: Fri, 21 Jul 2023 22:17:08 +0200
Subject: [PATCH 1060/1963] Update eventloop_posix_eth.c for
 UA_ARCHITECTURE_WIN32

Amalagamated source incompatible with UA_ARCHITECTURE_WIN32
---
 arch/eventloop_posix_eth.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 68db8e44b0c..3f7e3c403bb 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -11,6 +11,8 @@
 #include "eventloop_posix.h"
 #include "eventloop_common.h"
 
+#ifdef UA_ARCHITECTURE_POSIX
+
 #include <arpa/inet.h> /* htons */
 #include <net/ethernet.h> /* ETH_P_*/
 #include <linux/if_packet.h>
@@ -909,3 +911,5 @@ UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName) {
     cm->cm.closeConnection = ETH_shutdownConnection;
     return &cm->cm;
 }
+
+#endif /* defined(UA_ARCHITECTURE_POSIX) */

From f462b9f80788b748a499f321e72a029a20fb15ac Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 19 Jul 2023 11:26:50 +0200
Subject: [PATCH 1061/1963] fix(pubsub): Re-enable the API for custom cyclic
 callbacks

---
 src/pubsub/ua_pubsub_writergroup.c | 35 +++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 0abea452d2e..7d42ec74881 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -49,15 +49,24 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *wg) {
     if(wg->publishCallbackId != 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);
-
-    /* TODO: Send timer policy from writer group config */
-    UA_StatusCode retval =
-        el->addCyclicCallback(el, (UA_Callback)UA_WriterGroup_publishCallback,
-                              server, wg, wg->config.publishingInterval,
-                              NULL /* TODO: use basetime */,
-                              UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(wg->config.pubsubManagerCallback.addCustomCallback) {
+        /* Use configured mechanism for cyclic callbacks */
+        wg->config.pubsubManagerCallback.
+            addCustomCallback(server, wg->identifier,
+                              (UA_ServerCallback)UA_WriterGroup_publishCallback,
+                              wg, wg->config.publishingInterval,
+                              NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
                               &wg->publishCallbackId);
+    } else {
+        /* Use EventLoop for cyclic callbacks */
+        UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);
+        retval = el->addCyclicCallback(el, (UA_Callback)UA_WriterGroup_publishCallback,
+                                       server, wg, wg->config.publishingInterval,
+                                       NULL /* TODO: use basetime */,
+                                       UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                       &wg->publishCallbackId);
+    }
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
@@ -71,9 +80,15 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *wg) {
 
 static void
 UA_WriterGroup_removePublishCallback(UA_Server *server, UA_WriterGroup *wg) {
-    UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);
-    if(wg->publishCallbackId != 0)
+    if(wg->publishCallbackId == 0)
+        return;
+    if(wg->config.pubsubManagerCallback.removeCustomCallback) {
+        wg->config.pubsubManagerCallback.
+            removeCustomCallback(server, wg->identifier, wg->publishCallbackId);
+    } else {
+        UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);
         el->removeCyclicCallback(el, wg->publishCallbackId);
+    }
     wg->publishCallbackId = 0;
 }
 

From 9ccd6ed3ea6041b0655753c6e55904290476b00a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 19 Jul 2023 11:39:09 +0200
Subject: [PATCH 1062/1963] refactor(pubsub): Remove unused BlockingSockets
 option

---
 examples/pubsub_realtime/Readme_PubSub.txt    | 20 +++++-----
 .../pubsub_realtime/pubsub_TSN_loopback.c     | 37 -------------------
 .../pubsub_TSN_loopback_single_thread.c       | 16 --------
 .../pubsub_realtime/pubsub_TSN_publisher.c    | 37 -------------------
 .../pubsub_TSN_publisher_multiple_thread.c    | 18 ---------
 include/open62541/server_pubsub.h             |  1 -
 src/pubsub/ua_pubsub_readergroup.c            | 16 --------
 7 files changed, 10 insertions(+), 135 deletions(-)

diff --git a/examples/pubsub_realtime/Readme_PubSub.txt b/examples/pubsub_realtime/Readme_PubSub.txt
index 4e9a56525ed..72ab9d592a9 100644
--- a/examples/pubsub_realtime/Readme_PubSub.txt
+++ b/examples/pubsub_realtime/Readme_PubSub.txt
@@ -116,27 +116,27 @@ The generated binaries are generated in build/bin/ folder
 TWO WAY COMMUNICATION
 ============================================================================================================
     For Ethernet(Without logs) For long run:
-    ./pubsub_TSN_publisher_multiple_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableBlockingSocket -subAppPriority 99 -pubAppPriority 98 - Run in node 1
+    ./pubsub_TSN_publisher_multiple_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -subAppPriority 99 -pubAppPriority 98 - Run in node 1
 
-    ./pubsub_TSN_loopback_single_thread -interface <interfaceName> -disableSoTxtime -enableBlockingSocket -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -pubSubAppPriority 99  - Run in node 2
+    ./pubsub_TSN_loopback_single_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -pubSubAppPriority 99  - Run in node 2
 
     For Ethernet:(With logs - Provide the counterdata and its time which helps to identify the roundtrip time): For Short run
-    ./pubsub_TSN_publisher_multiple_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableBlockingSocket -enableCsvLog -subAppPriority 99 -pubAppPriority 98 - Run in node 1
+    ./pubsub_TSN_publisher_multiple_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -subAppPriority 99 -pubAppPriority 98 - Run in node 1
 
-    ./pubsub_TSN_loopback_single_thread -interface <interfaceName> -disableSoTxtime -enableBlockingSocket -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubSubAppPriority 99  - Run in node 2
+    ./pubsub_TSN_loopback_single_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubSubAppPriority 99  - Run in node 2
 
     Note: Application will close after sending 100000 packets and you will get the logs in .csv files. To change the number of packets to capture for short run change the parameter #MAX_MEASUREMENTS define value in pubsub_TSN_publisher_multiple_thread and pubsub_TSN_loopback_single_thread
 
     For UDP(Without logs) For long run:
     For UDP only one change need to be done before running that is need to provide the interface ip address as an input for -interface option
-    ./pubsub_TSN_publisher_multiple_thread -interface <VlanIpAddress> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableBlockingSocket -subAppPriority 99 -pubAppPriority 98 - Run in node 1
+    ./pubsub_TSN_publisher_multiple_thread -interface <VlanIpAddress> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -subAppPriority 99 -pubAppPriority 98 - Run in node 1
 
-    ./pubsub_TSN_loopback_single_thread -interface <VlanIpAddress>  -disableSoTxtime -enableBlockingSocket -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -pubSubAppPriority 99  - Run in node 2
+    ./pubsub_TSN_loopback_single_thread -interface <VlanIpAddress>  -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -pubSubAppPriority 99  - Run in node 2
 
     For UDP:(With logs - Provide the counterdata and its time which helps to identify the roundtrip time): For Short run
-    ./pubsub_TSN_publisher_multiple_thread -interface <VlanIpAddress> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableBlockingSocket -enableCsvLog -subAppPriority 99 -pubAppPriority 98 - Run in node 1
+    ./pubsub_TSN_publisher_multiple_thread -interface <VlanIpAddress> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -subAppPriority 99 -pubAppPriority 98 - Run in node 1
 
-    ./pubsub_TSN_loopback_single_thread -interface <VlanIpAddress>  -disableSoTxtime -enableBlockingSocket -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubSubAppPriority 99  - Run in node 2
+    ./pubsub_TSN_loopback_single_thread -interface <VlanIpAddress>  -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubSubAppPriority 99  - Run in node 2
 
     NOTE: Application will close after sending 100000 packets and you will get the logs in .csv files. To change the number of packets to capture for short run
     change the parameter #MAX_MEASUREMENTS define value in pubsub_TSN_publisher_multiple_thread and pubsub_TSN_loopback_single_thread
@@ -147,12 +147,12 @@ ONE WAY COMMUNICATION: For one way communication disable(comment) the macro TWO_
      Run steps for Ethernet:
     ./pubsub_TSN_publisher_multiple_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubAppPriority - Run in node 1
 
-    ./pubsub_TSN_loopback_single_thread -interface <interfaceName> -disableSoTxtime -enableBlockingSocket -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubSubAppPriority 99  - Run in node 2
+    ./pubsub_TSN_loopback_single_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubSubAppPriority 99  - Run in node 2
 
      Run steps for UDP:
     ./pubsub_TSN_publisher_multiple_thread -interface <VlanIpAddress> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubAppPriority - Run in node 1
 
-    ./pubsub_TSN_loopback_single_thread -interface <VlanIpAddress> -disableSoTxtime -enableBlockingSocket -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubSubAppPriority 99  - Run in node 2
+    ./pubsub_TSN_loopback_single_thread -interface <VlanIpAddress> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -enableCsvLog -pubSubAppPriority 99  - Run in node 2
 
 NOTE: As we have mentioned previously for long run remove the option -enableCsvLog
 ============================================================================================================
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index c2590fb3aa7..5646c3db7f5 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -25,17 +25,6 @@
  * in the RT path. Further, DataSetField will be accessed via direct pointer
  * access between the user interface and the Information Model.
  *
- * Another additional feature called the Blocking Socket is employed in the
- * Subscriber thread. This feature is optional and can be enabled or disabled
- * when running application by using command line argument
- * "-enableBlockingSocket". When using Blocking Socket, the Subscriber thread
- * remains in "blocking mode" until a message is received from every wake up
- * time of the thread. In other words, the timeout is overwritten and the thread
- * continuously waits for the message from every wake up time of the thread.
- * Once the message is received, the Subscriber thread updates the value in the
- * Information Model, sleeps up to wake up time and again waits for the next
- * message. This process is repeated until the application is terminated.
- *
  * To ensure realtime capabilities, Publisher uses ETF(Earliest Tx-time First)
  * to publish information at the calculated tranmission time over Ethernet.
  * Subscriber can be used with or without XDP(Xpress Data Processing) over
@@ -203,7 +192,6 @@ static UA_UInt32  xdpBindFlag          = XDP_COPY;
 static UA_Boolean disableSoTxtime      = true;
 static UA_Boolean enableCsvLog         = false;
 static UA_Boolean consolePrint         = false;
-static UA_Boolean enableBlockingSocket = false;
 static UA_Boolean signalTerm           = false;
 static UA_Boolean enableXdpSubscribe   = false;
 
@@ -493,15 +481,6 @@ addReaderGroup(UA_Server *server) {
     readerGroupConfig.name    = UA_STRING("ReaderGroup");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
     readerGroupConfig.subscribingInterval = cycleTimeInMsec;
-    /* Timeout is modified when blocking socket is enabled, and the default
-     * timeout is used when blocking socket is disabled */
-    if(enableBlockingSocket == false) {
-        /* As we run in 250us cycle time, modify default timeout (1ms) to 50us */
-        readerGroupConfig.timeout = 50;
-    } else {
-        readerGroupConfig.enableBlockingSocket = true;
-        readerGroupConfig.timeout = 0; /* Blocking socket */
-    }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     /* Encryption settings */
@@ -1455,8 +1434,6 @@ static void usage(char *appname) {
         " -disableSoTxtime        Do not use SO_TXTIME\n"
         " -enableCsvLog           Experimental: To log the data in csv files. Support up to 1 million samples\n"
         " -enableconsolePrint     Experimental: To print the data in console output. Support for higher cycle time\n"
-        " -enableBlockingSocket   Run application with blocking socket option. While using blocking socket option need to\n"
-        "                         run both the Publisher and Loopback application. Otherwise application will not terminate.\n"
         " -enableXdpSubscribe     Enable XDP feature for subscriber. XDP_COPY and XDP_FLAGS_SKB_MODE is used by default. Not recommended to be enabled along with blocking socket.\n"
         " -xdpQueue        [num]  XDP queue value (default %d)\n"
         " -xdpFlagDrvMode         Use XDP in DRV mode\n"
@@ -1509,7 +1486,6 @@ int main(int argc, char **argv) {
         {"disableSoTxtime",      no_argument,       0, 'm'},
         {"enableCsvLog",         no_argument,       0, 'n'},
         {"enableconsolePrint",   no_argument,       0, 'o'},
-        {"enableBlockingSocket", no_argument,       0, 'p'},
         {"xdpQueue",             required_argument, 0, 'q'},
         {"xdpFlagDrvMode",       no_argument,       0, 'r'},
         {"xdpBindFlagZeroCopy",  no_argument,       0, 's'},
@@ -1565,10 +1541,6 @@ int main(int argc, char **argv) {
             case 'o':
                 consolePrint = true;
                 break;
-            case 'p':
-                /* TODO: Application need to be exited independently */
-                enableBlockingSocket = true;
-                break;
             case 'q':
                 xdpQueue = (UA_UInt32)atoi(optarg);
                 break;
@@ -1605,15 +1577,6 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-    if(enableBlockingSocket == true) {
-        if(enableXdpSubscribe == true) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "Cannot enable blocking socket and xdp at the same time");
-            usage(progname);
-            return -1;
-        }
-    }
-
     if(xdpFlag == XDP_FLAGS_DRV_MODE || xdpBindFlag == XDP_ZEROCOPY) {
         if(enableXdpSubscribe == false)
             UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index 9aafd30ced7..d9fac3114e9 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -136,7 +136,6 @@ static UA_Int32   qbvOffset            = DEFAULT_QBV_OFFSET;
 static UA_Boolean disableSoTxtime      = UA_TRUE;
 static UA_Boolean enableCsvLog         = UA_FALSE;
 static UA_Boolean consolePrint         = UA_FALSE;
-static UA_Boolean enableBlockingSocket = UA_FALSE;
 static UA_Boolean signalTerm           = UA_FALSE;
 
 #ifdef TWO_WAY_COMMUNICATION
@@ -365,14 +364,6 @@ addReaderGroup(UA_Server *server) {
     readerGroupConfig.name    = UA_STRING("ReaderGroup");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
     readerGroupConfig.subscribingInterval = cycleTimeInMsec;
-    /* Timeout is modified when blocking socket is enabled, and the default timeout is used when blocking socket is disabled */
-    if (enableBlockingSocket == UA_FALSE)
-        readerGroupConfig.timeout = 50;  // As we run in 250us cycle time, modify default timeout (1ms) to 50us
-    else {
-        readerGroupConfig.enableBlockingSocket = UA_TRUE;
-        readerGroupConfig.timeout = 0;  //Blocking  socket
-    }
-
     readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
     readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
     readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
@@ -1158,8 +1149,6 @@ static void usage(char *appname)
         " -disableSoTxtime            Do not use SO_TXTIME\n"
         " -enableCsvLog               Experimental: To log the data in csv files. Support up to 1 million samples\n"
         " -enableconsolePrint         Experimental: To print the data in console output. Support for higher cycle time\n"
-        " -enableBlockingSocket       Run application with blocking socket option. While using blocking socket option need to\n"
-        "                             run both the Publisher and Loopback application. Otherwise application will not terminate.\n"
         "\n",
         appname, DEFAULT_CYCLE_TIME, DEFAULT_SOCKET_PRIORITY, \
         DEFAULT_PUBSUBAPP_THREAD_PRIORITY, \
@@ -1205,7 +1194,6 @@ int main(int argc, char **argv) {
         {"disableSoTxtime",      no_argument,       0, 'k'},
         {"enableCsvLog",         no_argument,       0, 'l'},
         {"enableconsolePrint",   no_argument,       0, 'm'},
-        {"enableBlockingSocket", no_argument,       0, 'n'},
         {"help",                 no_argument,       0, 'o'},
         {0,                      0,                 0,  0 }
     };
@@ -1251,10 +1239,6 @@ int main(int argc, char **argv) {
             case 'm':
                 consolePrint = UA_TRUE;
                 break;
-            case 'n':
-                /* TODO: Application need to be exited independently */
-                enableBlockingSocket = UA_TRUE;
-                break;
             case 'o':
                 usage(progname);
                 return -1;
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index 57e5dcb25ab..bd04a13079b 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -27,17 +27,6 @@
  * in the RT path. Further, DataSetField will be accessed via direct pointer
  * access between the user interface and the Information Model.
  *
- * Another additional feature called the Blocking Socket is employed in the
- * Subscriber thread. This feature is optional and can be enabled or disabled
- * when running application by using command line argument
- * "-enableBlockingSocket". When using Blocking Socket, the Subscriber thread
- * remains in "blocking mode" until a message is received from every wake up
- * time of the thread. In other words, the timeout is overwritten and the thread
- * continuously waits for the message from every wake up time of the thread.
- * Once the message is received, the Subscriber thread updates the value in the
- * Information Model, sleeps up to wake up time and again waits for the next
- * message. This process is repeated until the application is terminated.
- *
  * To ensure realtime capabilities, Publisher uses ETF(Earliest Tx-time First)
  * to publish information at the calculated tranmission time over Ethernet.
  * Subscriber can be used with or without XDP(Xpress Data Processing) over
@@ -207,7 +196,6 @@ static UA_Boolean disableSoTxtime      = true;
 static UA_Boolean enableCsvLog         = false;
 static UA_Boolean enableLatencyCsvLog  = false;
 static UA_Boolean consolePrint         = false;
-static UA_Boolean enableBlockingSocket = false;
 static UA_Boolean signalTerm           = false;
 static UA_Boolean enableXdpSubscribe   = false;
 
@@ -488,16 +476,7 @@ addReaderGroup(UA_Server *server) {
     memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name    = UA_STRING("ReaderGroup1");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-
     readerGroupConfig.subscribingInterval = cycleTimeInMsec;
-    /* Timeout is modified when blocking socket is enabled, and the default
-     * timeout is used when blocking socket is disabled */
-    if(enableBlockingSocket == false)
-        readerGroupConfig.timeout = 50;  // As we run in 250us cycle time, modify default timeout (1ms) to 50us
-    else {
-        readerGroupConfig.enableBlockingSocket = true;
-        readerGroupConfig.timeout = 0;  //Blocking  socket
-    }
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     /* Encryption settings */
@@ -1527,8 +1506,6 @@ static void usage(char *appname)
         " -enableCsvLog           Experimental: To log the data in csv files. Support up to 1 million samples\n"
         " -enableLatencyCsvLog    Experimental: To compute and create RTT latency csv. Support up to 1 million samples\n"
         " -enableconsolePrint     Experimental: To print the data in console output. Support for higher cycle time\n"
-        " -enableBlockingSocket   Run application with blocking socket option. While using blocking socket option need to\n"
-        "                         run both the Publisher and Loopback application. Otherwise application will not terminate.\n"
         " -enableXdpSubscribe     Enable XDP feature for subscriber. XDP_COPY and XDP_FLAGS_SKB_MODE is used by default. Not recommended to be enabled along with blocking socket.\n"
         " -xdpQueue        [num]  XDP queue value (default %d)\n"
         " -xdpFlagDrvMode         Use XDP in DRV mode\n"
@@ -1581,7 +1558,6 @@ int main(int argc, char **argv) {
         {"enableCsvLog",         no_argument,       0, 'n'},
         {"enableLatencyCsvLog",  no_argument,       0, 'o'},
         {"enableconsolePrint",   no_argument,       0, 'p'},
-        {"enableBlockingSocket", no_argument,       0, 'q'},
         {"xdpQueue",             required_argument, 0, 'r'},
         {"xdpFlagDrvMode",       no_argument,       0, 's'},
         {"xdpBindFlagZeroCopy",  no_argument,       0, 't'},
@@ -1640,10 +1616,6 @@ int main(int argc, char **argv) {
             case 'p':
                 consolePrint = true;
                 break;
-            case 'q':
-                 /* TODO: Application need to be exited independently */
-                enableBlockingSocket = true;
-                break;
             case 'r':
                 xdpQueue = (UA_UInt32)atoi(optarg);
                 break;
@@ -1678,15 +1650,6 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-    if(enableBlockingSocket == true) {
-        if(enableXdpSubscribe == true) {
-            UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                         "Cannot enable blocking socket and xdp at the same time");
-            usage(progname);
-            return -1;
-        }
-    }
-
     if(xdpFlag == XDP_FLAGS_DRV_MODE || xdpBindFlag == XDP_ZEROCOPY) {
         if(enableXdpSubscribe == false)
             UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index 43a66648d0a..01e35c6045d 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -145,7 +145,6 @@ static UA_Int32   qbvOffset            = DEFAULT_QBV_OFFSET;
 static UA_Boolean disableSoTxtime      = UA_TRUE;
 static UA_Boolean enableCsvLog         = UA_FALSE;
 static UA_Boolean consolePrint         = UA_FALSE;
-static UA_Boolean enableBlockingSocket = UA_FALSE;
 static UA_Boolean signalTerm           = UA_FALSE;
 
 /* Variables corresponding to PubSub connection creation,
@@ -377,14 +376,6 @@ addReaderGroup(UA_Server *server) {
     readerGroupConfig.name    = UA_STRING("ReaderGroup");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
     readerGroupConfig.subscribingInterval = cycleTimeInMsec;
-    /* Timeout is modified when blocking socket is enabled, and the default timeout is used when blocking socket is disabled */
-    if (enableBlockingSocket == UA_FALSE)
-        readerGroupConfig.timeout = 50;  // As we run in 250us cycle time, modify default timeout (1ms) to 50us
-    else {
-        readerGroupConfig.enableBlockingSocket = UA_TRUE;
-        readerGroupConfig.timeout = 0;  //Blocking  socket
-    }
-
     readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
     readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
     readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
@@ -1228,8 +1219,6 @@ static void usage(char *appname)
         " -disableSoTxtime            Do not use SO_TXTIME\n"
         " -enableCsvLog               Experimental: To log the data in csv files. Support up to 1 million samples\n"
         " -enableconsolePrint         Experimental: To print the data in console output. Support for higher cycle time\n"
-        " -enableBlockingSocket       Run application with blocking socket option. While using blocking socket option need to\n"
-        "                             run both the Publisher and Loopback application. Otherwise application will not terminate.\n"
         "\n",
         appname, DEFAULT_CYCLE_TIME, DEFAULT_SOCKET_PRIORITY, \
         DEFAULT_PUBAPP_THREAD_PRIORITY, \
@@ -1283,7 +1272,6 @@ int main(int argc, char **argv) {
         {"disableSoTxtime",      no_argument,       0, 'm'},
         {"enableCsvLog",         no_argument,       0, 'n'},
         {"enableconsolePrint",   no_argument,       0, 'o'},
-        {"enableBlockingSocket", no_argument,       0, 'p'},
         {"help",                 no_argument,       0, 'q'},
         {0,                      0,                 0,  0 }
     };
@@ -1335,10 +1323,6 @@ int main(int argc, char **argv) {
             case 'o':
                 consolePrint = UA_TRUE;
                 break;
-            case 'p':
-                /* TODO: Application need to be exited independently */
-                enableBlockingSocket = UA_TRUE;
-                break;
             case 'q':
                 usage(progname);
                 return -1;
@@ -1363,8 +1347,6 @@ int main(int argc, char **argv) {
 #ifdef TWO_WAY_COMMUNICATION
     /* The subscriber thread runs in a while loop so while running this application without blocking socket option
      * the running application should be run in the seperate core where no process running in it */
-    if (enableBlockingSocket == UA_FALSE)
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Without blocking socket option the application will cause issues");
 #endif
 
     if (disableSoTxtime == UA_TRUE) {
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 5974295922b..1e480ba74be 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -782,7 +782,6 @@ typedef struct {
     UA_PubSub_CallbackLifecycle pubsubManagerCallback;
     /* non std. field */
     UA_Duration subscribingInterval; // Callback interval for subscriber: set the least publishingInterval value of all DSRs in this RG
-    UA_Boolean enableBlockingSocket; // To enable or disable blocking socket option
     UA_UInt32 timeout; // Timeout for receive to wait for the packets
     UA_PubSubRTLevel rtLevel;
     UA_KeyValueMap groupProperties;
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index a9502491fc2..81e678d09ce 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -91,14 +91,6 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
     if(!connection)
         return UA_STATUSCODE_BADNOTFOUND;
 
-    if(!rgc->pubsubManagerCallback.addCustomCallback &&
-       rgc->enableBlockingSocket) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
-                                  "Adding ReaderGroup failed, blocking socket "
-                                  "functionality only supported in customcallback");
-        return UA_STATUSCODE_BADNOTSUPPORTED;
-    }
-
     if(connection->configurationFreezeCounter > 0) {
         UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
                                   "Adding ReaderGroup failed. "
@@ -124,14 +116,6 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
     if(newGroup->config.subscribingInterval <= 0.0)
         newGroup->config.subscribingInterval = 5; /* Set default to 5 ms */
 
-    if(newGroup->config.enableBlockingSocket)
-        newGroup->config.timeout = 0; /* Set timeout to 0 for blocking socket */
-
-    if((!newGroup->config.enableBlockingSocket) && (!newGroup->config.timeout))
-        newGroup->config.timeout = 1000; /* Set default to 1ms channel timeout
-                                          * when non-blocking socket allows with
-                                          * zero timeout */
-
     newGroup->linkedConnection = connection;
 
     /* Add to the connection */

From e937c4780926b61123f273ab567f7a57f2bb3913 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 19 Jul 2023 11:47:05 +0200
Subject: [PATCH 1063/1963] refactor(pubsub): Remove unused
 PubSubManagerCallback from the ReaderGroup config

---
 .../nodeset/pubsub_nodeset_rt_subscriber.c    | 47 +------------------
 .../pubsub_realtime/pubsub_TSN_loopback.c     |  4 --
 .../pubsub_TSN_loopback_single_thread.c       |  3 --
 .../pubsub_realtime/pubsub_TSN_publisher.c    |  4 --
 .../pubsub_TSN_publisher_multiple_thread.c    |  3 --
 include/open62541/server_pubsub.h             |  2 -
 6 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
index b3083b80895..55ec8e81897 100644
--- a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
+++ b/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
@@ -160,49 +160,6 @@ static void nanoSecondFieldConversion(struct timespec *timeSpecValue) {
 
 }
 
-/**
- * **Custom callback handling**
- *
- * Custom callback thread handling overwrites the default timer based
- * callback function with the custom (user-specified) callback interval. */
-/* Add a callback for cyclic repetition */
-static UA_StatusCode
-addPubSubApplicationCallback(UA_Server *server, UA_NodeId identifier, UA_ServerCallback callback,
-                             void *data, UA_Double interval_ms,
-                             UA_DateTime *baseTime, UA_TimerPolicy timerPolicy,
-                             UA_UInt64 *callbackId) {
-    /* Initialize arguments required for the thread to run */
-    threadArg *threadArguments = (threadArg *) UA_malloc(sizeof(threadArg));
-
-    /* Pass the value required for the threads */
-    threadArguments->server      = server;
-    threadArguments->data        = data;
-    threadArguments->callback    = callback;
-    threadArguments->interval_ms = interval_ms;
-    threadArguments->callbackId  = callbackId;
-    /* Create the subscriber thread with the required priority and core affinity */
-    char threadNameSub[11] = "Subscriber";
-    subthreadID            = threadCreation(subPriority, pubSubCore, subscriber, threadNameSub, threadArguments);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-changePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier, UA_UInt64 callbackId,
-                                UA_Double interval_ms, UA_DateTime *baseTime, UA_TimerPolicy timerPolicy) {
-    /* Callback interval need not be modified as it is thread based implementation.
-     * The thread uses nanosleep for calculating cycle time and modification in
-     * nanosleep value changes cycle time */
-    return UA_STATUSCODE_GOOD;
-}
-
-/* Remove the callback added for cyclic repetition */
-static void
-removePubSubApplicationCallback(UA_Server *server, UA_NodeId identifier, UA_UInt64 callbackId) {
-    if(callbackId && (pthread_join((pthread_t)callbackId, NULL) != 0))
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                       "Pthread Join Failed thread: %lu\n", (long unsigned)callbackId);
-}
-
 /**
  * **External data source handling**
  *
@@ -268,9 +225,7 @@ addReaderGroup(UA_Server *server) {
     memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name   = UA_STRING("ReaderGroup1");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-    readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
+
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
 }
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index 5646c3db7f5..f3727da0af4 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -489,10 +489,6 @@ addReaderGroup(UA_Server *server) {
     readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[0];
 #endif
 
-    readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
-
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
 
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index d9fac3114e9..25fd0877713 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -364,9 +364,6 @@ addReaderGroup(UA_Server *server) {
     readerGroupConfig.name    = UA_STRING("ReaderGroup");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
     readerGroupConfig.subscribingInterval = cycleTimeInMsec;
-    readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
 
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index bd04a13079b..9ba3ce77270 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -485,10 +485,6 @@ addReaderGroup(UA_Server *server) {
     readerGroupConfig.securityPolicy = &config->pubSubConfig.securityPolicies[1];
 #endif
 
-    readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
-
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
 
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index 01e35c6045d..d07859970bb 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -376,9 +376,6 @@ addReaderGroup(UA_Server *server) {
     readerGroupConfig.name    = UA_STRING("ReaderGroup");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
     readerGroupConfig.subscribingInterval = cycleTimeInMsec;
-    readerGroupConfig.pubsubManagerCallback.addCustomCallback = addPubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.changeCustomCallback = changePubSubApplicationCallback;
-    readerGroupConfig.pubsubManagerCallback.removeCustomCallback = removePubSubApplicationCallback;
 
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 1e480ba74be..0dea66c8513 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -778,8 +778,6 @@ UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId s
 /* ReaderGroup configuration */
 typedef struct {
     UA_String name;
-    /* PubSub Manager Callback */
-    UA_PubSub_CallbackLifecycle pubsubManagerCallback;
     /* non std. field */
     UA_Duration subscribingInterval; // Callback interval for subscriber: set the least publishingInterval value of all DSRs in this RG
     UA_UInt32 timeout; // Timeout for receive to wait for the packets

From fea29ebcd002bb7d4b86d4fabb6acc691c12e3c0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 19 Jul 2023 11:54:28 +0200
Subject: [PATCH 1064/1963] refactor(pubsub): Remove the unused
 SubscribingInterval from the ReaderGroup config

---
 examples/pubsub/tutorial_pubsub_mqtt_subscribe.c          | 8 ++------
 examples/pubsub_realtime/pubsub_TSN_loopback.c            | 1 -
 .../pubsub_realtime/pubsub_TSN_loopback_single_thread.c   | 1 -
 examples/pubsub_realtime/pubsub_TSN_publisher.c           | 1 -
 .../pubsub_TSN_publisher_multiple_thread.c                | 1 -
 include/open62541/server_pubsub.h                         | 1 -
 src/pubsub/ua_pubsub_readergroup.c                        | 4 ----
 tests/pubsub/check_pubsub_mqtt.c                          | 1 -
 8 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index 19765cbce23..197a8531d67 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -17,7 +17,6 @@
 #define SUBSCRIBER_METADATAQUEUENAME  "MetaDataTopic"
 #define SUBSCRIBER_METADATAUPDATETIME 0
 #define BROKER_ADDRESS_URL            "opc.mqtt://127.0.0.1:1883"
-#define SUBSCRIBE_INTERVAL            500
 
 // Uncomment the following line to enable MQTT login for the example
 // #define EXAMPLE_USE_MQTT_LOGIN
@@ -134,7 +133,7 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
  * is removed. All network message related filters are only available in the DataSetReader. */
 /* Add ReaderGroup to the created connection */
 static UA_StatusCode
-addReaderGroup(UA_Server *server,  int interval) {
+addReaderGroup(UA_Server *server) {
     if(server == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -143,7 +142,6 @@ addReaderGroup(UA_Server *server,  int interval) {
     UA_ReaderGroupConfig readerGroupConfig;
     memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name = UA_STRING("ReaderGroup1");
-    readerGroupConfig.subscribingInterval = interval;
     if(useJson)
         readerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_JSON;
 
@@ -366,8 +364,6 @@ static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
 
 int main(int argc, char **argv) {
     char *addressUrl = BROKER_ADDRESS_URL;
-    //char *topic = SUBSCRIBER_TOPIC;
-    int interval = SUBSCRIBE_INTERVAL;
 
     /* Return value initialized to Status Good */
     UA_Server *server = UA_Server_new();
@@ -389,7 +385,7 @@ int main(int argc, char **argv) {
         goto cleanup;
 
     /* Add ReaderGroup to the created PubSubConnection */
-    retval |= addReaderGroup(server, interval);
+    retval |= addReaderGroup(server);
     if (retval != UA_STATUSCODE_GOOD)
         goto cleanup;
 
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index f3727da0af4..50821a7b4a5 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -480,7 +480,6 @@ addReaderGroup(UA_Server *server) {
     memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name    = UA_STRING("ReaderGroup");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-    readerGroupConfig.subscribingInterval = cycleTimeInMsec;
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     /* Encryption settings */
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index 25fd0877713..f3682663b87 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -363,7 +363,6 @@ addReaderGroup(UA_Server *server) {
     memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name    = UA_STRING("ReaderGroup");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-    readerGroupConfig.subscribingInterval = cycleTimeInMsec;
 
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index 9ba3ce77270..d21b1f3cacc 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -476,7 +476,6 @@ addReaderGroup(UA_Server *server) {
     memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name    = UA_STRING("ReaderGroup1");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-    readerGroupConfig.subscribingInterval = cycleTimeInMsec;
 
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     /* Encryption settings */
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index d07859970bb..1a1fb757532 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -375,7 +375,6 @@ addReaderGroup(UA_Server *server) {
     memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name    = UA_STRING("ReaderGroup");
     readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-    readerGroupConfig.subscribingInterval = cycleTimeInMsec;
 
     UA_Server_addReaderGroup(server, connectionIdentSubscriber, &readerGroupConfig,
                              &readerGroupIdentifier);
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 0dea66c8513..4e7e0c9d3a1 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -779,7 +779,6 @@ UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId s
 typedef struct {
     UA_String name;
     /* non std. field */
-    UA_Duration subscribingInterval; // Callback interval for subscriber: set the least publishingInterval value of all DSRs in this RG
     UA_UInt32 timeout; // Timeout for receive to wait for the packets
     UA_PubSubRTLevel rtLevel;
     UA_KeyValueMap groupProperties;
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 81e678d09ce..907b56209c3 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -112,10 +112,6 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
         return retval;
     }
 
-    /* Check user configured params and define it accordingly */
-    if(newGroup->config.subscribingInterval <= 0.0)
-        newGroup->config.subscribingInterval = 5; /* Set default to 5 ms */
-
     newGroup->linkedConnection = connection;
 
     /* Add to the connection */
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index ab8007875a5..1a6fc0690f4 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -221,7 +221,6 @@ START_TEST(SinglePublishSubscribeDateTime){
         UA_ReaderGroupConfig readerGroupConfig;
         memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
         readerGroupConfig.name = UA_STRING("ReaderGroup1");
-        readerGroupConfig.subscribingInterval = SUBSCRIBE_INTERVAL;
 
         /* configure the mqtt publish topic */
         UA_BrokerWriterGroupTransportDataType brokerTransportSettingsSubscriber;

From da8da45470536670a7444f95cd19b38dadee6af7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 19 Jul 2023 11:58:26 +0200
Subject: [PATCH 1065/1963] refactor(pubsub): Remove unused timeout value from
 ReaderGroup config

---
 include/open62541/server_pubsub.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 4e7e0c9d3a1..bae57e9d8ef 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -778,8 +778,8 @@ UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId s
 /* ReaderGroup configuration */
 typedef struct {
     UA_String name;
+
     /* non std. field */
-    UA_UInt32 timeout; // Timeout for receive to wait for the packets
     UA_PubSubRTLevel rtLevel;
     UA_KeyValueMap groupProperties;
     UA_PubSubEncodingType encodingMimeType;

From e259be8d56c4b5f05b75d09a47685dc76e42db5b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Jul 2023 13:25:34 +0200
Subject: [PATCH 1066/1963] fix(server): Return BadNotSupported for the 1.04
 node attributes

---
 src/server/ua_services_attribute.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 29afe4c475c..0745324806b 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -575,6 +575,15 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
 #endif
         retval = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
         break; }
+
+    case UA_ATTRIBUTEID_ROLEPERMISSIONS:
+    case UA_ATTRIBUTEID_USERROLEPERMISSIONS:
+    case UA_ATTRIBUTEID_ACCESSRESTRICTIONS:
+    case UA_ATTRIBUTEID_ACCESSLEVELEX:
+        /* TODO: Add support for the attributes from the 1.04 spec */
+        retval = UA_STATUSCODE_BADNOTSUPPORTED;
+        break;
+
     default:
         retval = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
     }

From cb9d3ea446305ee903ba3e4fb83e911756e3bd37 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 9 Jul 2023 16:50:06 +0200
Subject: [PATCH 1067/1963] fix(server): Fix use of UA_ malloc indirection in
 ua_server_binary.c

---
 src/server/ua_server_binary.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 19312a6ebc5..3912d5245cd 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1550,8 +1550,8 @@ UA_Server_addReverseConnect(UA_Server *server, UA_String url,
     }
 
     /* Set up the reverse connection */
-    reverse_connect_context *newContext =
-        (reverse_connect_context *)calloc(1, sizeof(reverse_connect_context));
+    reverse_connect_context *newContext = (reverse_connect_context *)
+        UA_calloc(1, sizeof(reverse_connect_context));
     if(!newContext)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
@@ -1610,7 +1610,7 @@ UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
         } else {
             setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
             UA_String_clear(&rev->hostname);
-            free(rev);
+            UA_free(rev);
         }
         result = UA_STATUSCODE_GOOD;
         break;
@@ -1658,7 +1658,7 @@ serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             setReverseConnectState(bpm->server, context, UA_SECURECHANNELSTATE_CLOSED);
             LIST_REMOVE(context, next);
             UA_String_clear(&context->hostname);
-            free(context);
+            UA_free(context);
 
             /* Check if the Binary Protocol Manager is stopped */
             if(bpm->sc.state == UA_LIFECYCLESTATE_STOPPING &&
@@ -1836,7 +1836,7 @@ UA_BinaryProtocolManager_stop(UA_Server *server,
             LIST_REMOVE(rev, next);
             setReverseConnectState(server, rev, UA_SECURECHANNELSTATE_CLOSED);
             UA_String_clear(&rev->hostname);
-            free(rev);
+            UA_free(rev);
         }
     }
 

From 5eab9918a5303dc10be8deb910090110be7b6814 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 9 Jul 2023 16:58:08 +0200
Subject: [PATCH 1068/1963] refactor(deps): Update nodesetloader submodule to
 latest master

---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index dac3acec9ae..d131a800bdc 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit dac3acec9ae674163cb149f1990265c1c3ece878
+Subproject commit d131a800bdc5c91f9c380cca3498d78cf447e69c

From c499d55bd7f1e182811ccfabec93681420fcfd9f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 22 Jun 2023 14:51:22 +0200
Subject: [PATCH 1069/1963] refactor(core): Make UA_fileAccess an internal
 definition

---
 include/open62541/config.h.in | 6 ------
 src/ua_util_internal.h        | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index bcc1ed7907d..2393a4e5fdc 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -547,12 +547,6 @@ UA_STATIC_ASSERT(sizeof(bool) == 1, cannot_overlay_integers_with_large_bool);
 # define UA_BINARY_OVERLAYABLE_FLOAT 0
 #endif
 
-/**
- * File access
- * ----------- */
-
-#define UA_fileExists(X) ( UA_access(X, 0) == 0)
-
 /* Include architecture-specific definitions */
 #include "${UA_ARCHITECTURE}/ua_architecture.h"
 
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index b028d5f21ee..488430ff6d3 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -171,6 +171,8 @@ isTrue(uint8_t expr) {
  * Utility Functions
  * ----------------- */
 
+#define UA_fileExists(X) ( access(X, 0) == 0)
+
 void
 UA_cleanupDataTypeWithCustom(const UA_DataTypeArray *customTypes);
 

From 928931ec36d4441fc12d27b11470ea96f7dc9b9b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 22 Jun 2023 14:53:22 +0200
Subject: [PATCH 1070/1963] refactor(core): Move architecture-specific
 definition out of the public headers

---
 arch/eventloop_mqtt.c                         |  9 ++
 arch/eventloop_posix.h                        |  7 ++
 arch/posix/ua_architecture.h                  | 63 ------------
 arch/win32/ua_architecture.h                  | 50 ----------
 .../access_control/client_access_control.c    |  1 +
 .../access_control/server_access_control.c    |  1 +
 examples/client.c                             |  1 +
 examples/client_async.c                       |  5 +-
 examples/client_connect_loop.c                |  5 +-
 examples/client_subscription_loop.c           |  4 +-
 examples/common.h                             | 11 +++
 .../custom_datatype/client_types_custom.c     |  1 +
 examples/discovery/client_find_servers.c      |  1 +
 examples/discovery/server_multicast.c         |  2 +
 examples/events/client_eventfilter.c          |  1 +
 examples/nodeset/server_testnodeset.c         |  1 +
 examples/nodeset_loader/nodeset_loader.c      |  3 +
 .../nodeset_loader/server_nodeset_loader.c    |  3 +
 ...erver_pubsub_subscribe_custom_monitoring.c |  1 +
 examples/pubsub/pubsub_publish_encrypted.c    |  1 +
 .../pubsub_subscribe_standalone_dataset.c     |  2 +-
 examples/pubsub/server_pubsub_publisher_iop.c |  1 +
 .../server_pubsub_publisher_on_demand.c       |  1 +
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |  2 +
 examples/pubsub/tutorial_pubsub_publish.c     |  2 +
 examples/server_ctt.c                         | 13 +--
 examples/server_loglevel.c                    |  1 +
 examples/tutorial_client_events.c             |  1 +
 examples/tutorial_datatypes.c                 |  1 +
 examples/tutorial_server_method_async.c       |  5 +-
 examples/tutorial_server_variable.c           |  1 +
 include/open62541/config.h.in                 | 99 ++++++++++++++++++-
 plugins/ua_config_default.c                   | 18 +++-
 plugins/ua_log_stdout.c                       |  2 +-
 plugins/ua_log_syslog.c                       |  1 +
 src/server/ua_services_discovery_multicast.c  |  8 ++
 src/ua_types.c                                | 16 ++-
 src/ua_types_encoding_json.c                  |  5 +-
 src/ua_util.c                                 |  1 +
 src/ua_util_internal.h                        | 10 +-
 tests/check_eventloop.c                       |  1 +
 tests/check_kvm_utils.c                       |  1 +
 tests/client/check_client_historical_data.c   |  1 +
 tests/client/check_client_subscriptions.c     |  4 +-
 tests/fuzz/fuzz_base64_decode.cc              |  1 +
 tests/fuzz/fuzz_base64_encode.cc              |  1 +
 tests/fuzz/fuzz_tcp_message.cc                |  4 +
 .../multithreading/check_mt_addDeleteObject.c |  1 +
 tests/multithreading/check_mt_addObjectNode.c |  1 +
 .../multithreading/check_mt_addVariableNode.c |  1 +
 .../check_mt_addVariableTypeNode.c            |  1 +
 tests/pubsub/check_pubsub_sks_pull.c          |  2 +-
 tests/server/check_discovery.c                |  1 +
 tests/server/check_server_historical_data.c   |  1 +
 .../check_server_historical_data_circular.c   |  1 +
 tests/server/check_server_readspeed.c         |  5 +-
 tests/server/check_server_speed_addnodes.c    |  1 +
 .../server/check_subscription_event_filter.c  |  1 +
 tests/server/check_subscription_events.c      |  1 +
 59 files changed, 245 insertions(+), 146 deletions(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index 37f3e5dc4bb..3b30ef7e184 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -10,6 +10,15 @@
 
 #include <open62541/plugin/eventloop.h>
 
+#include <limits.h>
+
+#if defined(_MSC_VER)
+# include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#else
+# include <unistd.h> /* ssize_t */
+#endif
+
 struct MQTTConnectionManager;
 typedef struct MQTTConnectionManager MQTTConnectionManager;
 
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 331196d4303..421470e4190 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -14,6 +14,13 @@
 
 #if defined(UA_ARCHITECTURE_POSIX) || defined(UA_ARCHITECTURE_WIN32)
 
+/* Include architecture-specific definitions */
+#if defined(UA_ARCHITECTURE_WIN32)
+#include "win32/ua_architecture.h"
+#elif defined(UA_ARCHITECTURE_POSIX)
+#include "posix/ua_architecture.h"
+#endif
+
 #include "common/ua_timer.h"
 #include "open62541_queue.h"
 
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 8e1d8d60dc1..a22759660d8 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -73,8 +73,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_POLLIN POLLIN
 #define UA_POLLOUT POLLOUT
 
-#define UA_ENABLE_LOG_COLORS
-
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
     getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
 #define UA_poll poll
@@ -105,15 +103,6 @@ void UA_sleep_ms(unsigned long ms);
 # define UA_if_nametoindex if_nametoindex
 #endif
 
-/* Use the standard malloc */
-#include <stdlib.h>
-#ifndef UA_free
-# define UA_free free
-# define UA_malloc malloc
-# define UA_calloc calloc
-# define UA_realloc realloc
-#endif
-
 #include <stdio.h>
 #include <strings.h>
 #define UA_snprintf snprintf
@@ -132,58 +121,6 @@ void UA_sleep_ms(unsigned long ms);
     errno = 0; \
 }
 
-#if UA_MULTITHREADING >= 100
-
-#include <pthread.h>
-
-typedef struct {
-    pthread_mutex_t mutex;
-    int mutexCounter;
-} UA_Lock;
-
-#define UA_LOCK_STATIC_INIT {PTHREAD_MUTEX_INITIALIZER, 0}
-
-static UA_INLINE void
-UA_LOCK_INIT(UA_Lock *lock) {
-    pthread_mutex_init(&lock->mutex, NULL);
-    lock->mutexCounter = 0;
-}
-
-static UA_INLINE void
-UA_LOCK_DESTROY(UA_Lock *lock) {
-    pthread_mutex_destroy(&lock->mutex);
-}
-
-static UA_INLINE void
-UA_LOCK(UA_Lock *lock) {
-    pthread_mutex_lock(&lock->mutex);
-    UA_assert(lock->mutexCounter == 0);
-    lock->mutexCounter++;
-}
-
-static UA_INLINE void
-UA_UNLOCK(UA_Lock *lock) {
-    UA_assert(lock->mutexCounter == 1);
-    lock->mutexCounter--;
-    pthread_mutex_unlock(&lock->mutex);
-}
-
-static UA_INLINE void
-UA_LOCK_ASSERT(UA_Lock *lock, int num) {
-    UA_assert(lock->mutexCounter == num);
-}
-
-#else
-#define UA_EMPTY_STATEMENT                                                               \
-    do {                                                                                 \
-    } while(0)
-#define UA_LOCK_INIT(lock) UA_EMPTY_STATEMENT
-#define UA_LOCK_DESTROY(lock) UA_EMPTY_STATEMENT
-#define UA_LOCK(lock) UA_EMPTY_STATEMENT
-#define UA_UNLOCK(lock) UA_EMPTY_STATEMENT
-#define UA_LOCK_ASSERT(lock, num) UA_EMPTY_STATEMENT
-#endif
-
 #if defined(__APPLE__) && defined(_SYS_QUEUE_H_)
 //  in some compilers there's already a _SYS_QUEUE_H_ which is included first and doesn't
 //  have all functions
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 985d8ef74b9..7f1d57468c5 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -131,14 +131,6 @@ void UA_sleep_ms(unsigned long ms);
 # undef maxStringLength
 #endif
 
-/* Use the standard malloc */
-#ifndef UA_free
-# define UA_free free
-# define UA_malloc malloc
-# define UA_calloc calloc
-# define UA_realloc realloc
-#endif
-
 #ifdef __CODEGEARC__
 #define _snprintf_s(a,b,c,...) snprintf(a,b,__VA_ARGS__)
 #endif
@@ -158,48 +150,6 @@ void UA_sleep_ms(unsigned long ms);
 }
 #define UA_LOG_SOCKET_ERRNO_GAI_WRAP UA_LOG_SOCKET_ERRNO_WRAP
 
-#if UA_MULTITHREADING >= 100
-
-typedef struct {
-    CRITICAL_SECTION mutex;
-    int mutexCounter;
-} UA_Lock;
-
-static UA_INLINE void
-UA_LOCK_INIT(UA_Lock *lock) {
-    InitializeCriticalSection(&lock->mutex);
-    lock->mutexCounter = 0;
-}
-
-static UA_INLINE void
-UA_LOCK_DESTROY(UA_Lock *lock) {
-    DeleteCriticalSection(&lock->mutex);
-}
-
-static UA_INLINE void
-UA_LOCK(UA_Lock *lock) {
-    EnterCriticalSection(&lock->mutex);
-    UA_assert(++(lock->mutexCounter) == 1);
-}
-
-static UA_INLINE void
-UA_UNLOCK(UA_Lock *lock) {
-    UA_assert(--(lock->mutexCounter) == 0);
-    LeaveCriticalSection(&lock->mutex);
-}
-
-static UA_INLINE void
-UA_LOCK_ASSERT(UA_Lock *lock, int num) {
-    UA_assert(lock->mutexCounter == num);
-}
-#else
-#define UA_LOCK_INIT(lock)
-#define UA_LOCK_DESTROY(lock)
-#define UA_LOCK(lock)
-#define UA_UNLOCK(lock)
-#define UA_LOCK_ASSERT(lock, num)
-#endif
-
 /* Fix redefinition of SLIST_ENTRY on mingw winnt.h */
 #if !defined(_SYS_QUEUE_H_) && defined(SLIST_ENTRY)
 # undef SLIST_ENTRY
diff --git a/examples/access_control/client_access_control.c b/examples/access_control/client_access_control.c
index 30ecf2c56c2..23aa16fbd22 100644
--- a/examples/access_control/client_access_control.c
+++ b/examples/access_control/client_access_control.c
@@ -9,6 +9,7 @@
 #include <open62541/client_highlevel.h>
 
 #include <stdlib.h>
+#include <stdio.h>
 
 int main(void) {
     UA_Client *client = UA_Client_new();
diff --git a/examples/access_control/server_access_control.c b/examples/access_control/server_access_control.c
index 7e039f22d38..900e9a1ba4b 100644
--- a/examples/access_control/server_access_control.c
+++ b/examples/access_control/server_access_control.c
@@ -8,6 +8,7 @@
 
 #include <signal.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 static UA_Boolean
 allowAddNode(UA_Server *server, UA_AccessControl *ac,
diff --git a/examples/client.c b/examples/client.c
index 7f333699cfd..d2c49def182 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -7,6 +7,7 @@
 #include <open62541/plugin/log_stdout.h>
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
 static void
diff --git a/examples/client_async.c b/examples/client_async.c
index 219228c395a..070ba854aa0 100644
--- a/examples/client_async.c
+++ b/examples/client_async.c
@@ -8,6 +8,7 @@
 #include <open62541/server_config_default.h>
 
 #include <stdlib.h>
+#include "common.h"
 
 #define NODES_EXIST
 /* async connection callback, it only gets called after the completion of the whole
@@ -107,7 +108,7 @@ main(int argc, char *argv[]) {
     UA_Client_connectAsync(client, "opc.tcp://localhost:4840");
 
     /*Windows needs time to response*/
-    UA_sleep_ms(100);
+    sleep_ms(100);
 
     /* What happens if client tries to send request before connected? */
     UA_Client_sendAsyncBrowseRequest(client, &bReq, fileBrowsed, &userdata, &reqId);
@@ -123,7 +124,7 @@ main(int argc, char *argv[]) {
         /* Requests are processed */
         UA_BrowseRequest_clear(&bReq);
         UA_Client_run_iterate(client, 0);
-        UA_sleep_ms(100);
+        sleep_ms(100);
 
         /* Break loop if server cannot be connected within 2s -- prevents build timeout */
         if(UA_DateTime_nowMonotonic() - startTime > 2000 * UA_DATETIME_MSEC)
diff --git a/examples/client_connect_loop.c b/examples/client_connect_loop.c
index 75b822d55cd..a4a64998497 100644
--- a/examples/client_connect_loop.c
+++ b/examples/client_connect_loop.c
@@ -16,6 +16,7 @@
 
 #include <signal.h>
 #include <stdlib.h>
+#include "common.h"
 
 UA_Boolean running = true;
 
@@ -49,7 +50,7 @@ int main(void) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_CLIENT, "Not connected. Retrying to connect in 1 second");
             /* The connect may timeout after 1 second (see above) or it may fail immediately on network errors */
             /* E.g. name resolution errors or unreachable network. Thus there should be a small sleep here */
-            UA_sleep_ms(1000);
+            sleep_ms(1000);
             continue;
         }
 
@@ -72,7 +73,7 @@ int main(void) {
                         dts.day, dts.month, dts.year, dts.hour, dts.min, dts.sec, dts.milliSec);
         }
         UA_Variant_clear(&value);
-        UA_sleep_ms(1000);
+        sleep_ms(1000);
     };
 
     /* Clean up */
diff --git a/examples/client_subscription_loop.c b/examples/client_subscription_loop.c
index 858a3a983d8..77ee099485e 100644
--- a/examples/client_subscription_loop.c
+++ b/examples/client_subscription_loop.c
@@ -14,6 +14,8 @@
 #include <open62541/client_subscriptions.h>
 #include <open62541/plugin/log_stdout.h>
 
+#include "common.h"
+
 #include <signal.h>
 #include <stdlib.h>
 
@@ -130,7 +132,7 @@ main(void) {
                          "Not connected. Retrying to connect in 1 second");
             /* The connect may timeout after 1 second (see above) or it may fail immediately on network errors */
             /* E.g. name resolution errors or unreachable network. Thus there should be a small sleep here */
-            UA_sleep_ms(1000);
+            sleep_ms(1000);
             continue;
         }
 
diff --git a/examples/common.h b/examples/common.h
index fd9e824a94d..156d2440f2d 100644
--- a/examples/common.h
+++ b/examples/common.h
@@ -3,6 +3,17 @@
 
 #include <open62541/types.h>
 #include <open62541/types_generated_handling.h>
+#include <stdio.h>
+#include <errno.h>
+
+/* sleep_ms */
+#ifdef _WIN32
+# include <synchapi.h>
+# define sleep_ms(ms) Sleep(ms)
+#else
+# include <unistd.h>
+# define sleep_ms(ms) usleep(ms * 1000)
+#endif
 
 /* loadFile parses the certificate file.
  *
diff --git a/examples/custom_datatype/client_types_custom.c b/examples/custom_datatype/client_types_custom.c
index 7c3d586aa53..a8a3200d13a 100644
--- a/examples/custom_datatype/client_types_custom.c
+++ b/examples/custom_datatype/client_types_custom.c
@@ -5,6 +5,7 @@
 #include <open62541/client_highlevel.h>
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "custom_datatype.h"
 
diff --git a/examples/discovery/client_find_servers.c b/examples/discovery/client_find_servers.c
index f5d92dd89a5..ae7fae3e6f3 100644
--- a/examples/discovery/client_find_servers.c
+++ b/examples/discovery/client_find_servers.c
@@ -10,6 +10,7 @@
 #include <open62541/plugin/log_stdout.h>
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #define DISCOVERY_SERVER_ENDPOINT "opc.tcp://localhost:4840"
 
diff --git a/examples/discovery/server_multicast.c b/examples/discovery/server_multicast.c
index 661e3222887..7a3ff907f24 100644
--- a/examples/discovery/server_multicast.c
+++ b/examples/discovery/server_multicast.c
@@ -19,6 +19,8 @@
 
 #include <signal.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
 
 const UA_ByteString UA_SECURITY_POLICY_BASIC128_URI =
     {56, (UA_Byte *)"http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15"};
diff --git a/examples/events/client_eventfilter.c b/examples/events/client_eventfilter.c
index a79f861345a..b70202a6535 100644
--- a/examples/events/client_eventfilter.c
+++ b/examples/events/client_eventfilter.c
@@ -19,6 +19,7 @@
 #include <open62541/util.h>
 
 #include <signal.h>
+#include <stdio.h>
 
 #define USE_FILTER_OR_TYPEOF
 
diff --git a/examples/nodeset/server_testnodeset.c b/examples/nodeset/server_testnodeset.c
index a096efe8be7..66a5ec25d41 100644
--- a/examples/nodeset/server_testnodeset.c
+++ b/examples/nodeset/server_testnodeset.c
@@ -12,6 +12,7 @@
 
 #include <signal.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 UA_Boolean running = true;
 
diff --git a/examples/nodeset_loader/nodeset_loader.c b/examples/nodeset_loader/nodeset_loader.c
index 252217089e3..8b9bbd83c8c 100644
--- a/examples/nodeset_loader/nodeset_loader.c
+++ b/examples/nodeset_loader/nodeset_loader.c
@@ -6,6 +6,9 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/nodesetloader.h>
 
+#include <signal.h>
+#include <stdio.h>
+
 UA_Boolean running = true;
 static void stopHandler(int sign) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
diff --git a/examples/nodeset_loader/server_nodeset_loader.c b/examples/nodeset_loader/server_nodeset_loader.c
index 130e398d8bb..c45c21824a3 100644
--- a/examples/nodeset_loader/server_nodeset_loader.c
+++ b/examples/nodeset_loader/server_nodeset_loader.c
@@ -6,6 +6,9 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/nodesetloader.h>
 
+#include <signal.h>
+#include <stdio.h>
+
 UA_Boolean running = true;
 static void stopHandler(int sign) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index 7e01eadc58a..2c2da3a8a2b 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -29,6 +29,7 @@
 #include "../server/ua_server_internal.h"
 
 #include <stdio.h>
+#include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/examples/pubsub/pubsub_publish_encrypted.c b/examples/pubsub/pubsub_publish_encrypted.c
index 5049f2d1ac6..c69bfca6291 100644
--- a/examples/pubsub/pubsub_publish_encrypted.c
+++ b/examples/pubsub/pubsub_publish_encrypted.c
@@ -8,6 +8,7 @@
 #include <open62541/plugin/securitypolicy_default.h>
 
 #include <signal.h>
+#include <stdio.h>
 
 #define UA_AES128CTR_SIGNING_KEY_LENGTH 32
 #define UA_AES128CTR_KEY_LENGTH 16
diff --git a/examples/pubsub/pubsub_subscribe_standalone_dataset.c b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
index a7053f9aa38..7123fd31084 100644
--- a/examples/pubsub/pubsub_subscribe_standalone_dataset.c
+++ b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
@@ -14,8 +14,8 @@
 #include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
-
 #include <signal.h>
+#include <stdio.h>
 
 UA_NodeId connectionIdentifier;
 UA_NodeId readerGroupIdentifier;
diff --git a/examples/pubsub/server_pubsub_publisher_iop.c b/examples/pubsub/server_pubsub_publisher_iop.c
index 1fd4cc74e74..fa77a65b5e0 100644
--- a/examples/pubsub/server_pubsub_publisher_iop.c
+++ b/examples/pubsub/server_pubsub_publisher_iop.c
@@ -7,6 +7,7 @@
 
 #include <signal.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 #define Publisher_ID 60
 
diff --git a/examples/pubsub/server_pubsub_publisher_on_demand.c b/examples/pubsub/server_pubsub_publisher_on_demand.c
index 1954b431234..143613d6a16 100644
--- a/examples/pubsub/server_pubsub_publisher_on_demand.c
+++ b/examples/pubsub/server_pubsub_publisher_on_demand.c
@@ -30,6 +30,7 @@
 #include <open62541/server_config_default.h>
 
 #include <signal.h>
+#include <stdio.h>
 
 UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent;
 
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 5f7e833d19d..d10f0f3fb89 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -44,6 +44,8 @@
 #include <open62541/server.h>
 #include <open62541/plugin/securitypolicy_default.h>
 
+#include <stdio.h>
+
 #define CONNECTION_NAME              "MQTT Publisher Connection"
 #define TRANSPORT_PROFILE_URI        "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
 #define MQTT_CLIENT_ID               "TESTCLIENTPUBSUBMQTT"
diff --git a/examples/pubsub/tutorial_pubsub_publish.c b/examples/pubsub/tutorial_pubsub_publish.c
index 7b70e326523..b427244eb39 100644
--- a/examples/pubsub/tutorial_pubsub_publish.c
+++ b/examples/pubsub/tutorial_pubsub_publish.c
@@ -28,6 +28,8 @@
 #include <open62541/server.h>
 #include <open62541/server_pubsub.h>
 
+#include <stdio.h>
+
 UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent;
 
 static void
diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 5a1c39e682a..9eaada1f708 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -15,6 +15,7 @@
 #include <open62541/plugin/pki_default.h>
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "common.h"
 
@@ -218,7 +219,7 @@ readRandomStringData (UA_Server *server,
         return UA_STATUSCODE_GOOD;
     }
     char randomName[12];
-    UA_snprintf(randomName, 12, "Random%u", UA_UInt32_random());
+    snprintf(randomName, 12, "Random%u", UA_UInt32_random());
     UA_String toggle = UA_STRING(randomName);
     UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_STRING]);
     value->hasValue = true;
@@ -282,7 +283,7 @@ readByteString (UA_Server *server,
         return UA_STATUSCODE_GOOD;
     }
     char randomName[8];
-    UA_snprintf(randomName, 8, "%u%u", UA_UInt32_random(), UA_UInt32_random());
+    snprintf(randomName, 8, "%u%u", UA_UInt32_random(), UA_UInt32_random());
     UA_ByteString randomByte = UA_BYTESTRING(randomName);
     UA_Variant_setScalarCopy(&value->value, &randomByte, &UA_TYPES[UA_TYPES_BYTESTRING]);
     value->hasValue = true;
@@ -535,7 +536,7 @@ setInformationModel(UA_Server *server) {
         attr.dataType = UA_TYPES[type].typeId;
 #ifndef UA_ENABLE_TYPEDESCRIPTION
         char name[15];
-        UA_snprintf(name, 15, "%02d", type);
+        snprintf(name, 15, "%02d", type);
         attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
         UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME(1, name);
 #else
@@ -622,7 +623,7 @@ setInformationModel(UA_Server *server) {
     id = DEPTHID; // running id in namespace 0 - Start with Matrix NODE
     for(UA_UInt32 i = 1; i <= 20; i++) {
         char name[15];
-        UA_snprintf(name, 15, "depth%u", i);
+        snprintf(name, 15, "depth%u", i);
         object_attr.description = UA_LOCALIZEDTEXT("en-US", name);
         object_attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
         UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, id + i),
@@ -703,9 +704,9 @@ setInformationModel(UA_Server *server) {
         for(size_t j = 0; j < 100; j++) {
             char name[32];
 #ifndef UA_ENABLE_TYPEDESCRIPTION
-            UA_snprintf(name, 20, "%02d - %i", type, scale_i);
+            snprintf(name, 20, "%02d - %i", type, scale_i);
 #else
-            UA_snprintf(name, 20, "%s - %i", UA_TYPES[type].typeName, scale_i);
+            snprintf(name, 20, "%s - %i", UA_TYPES[type].typeName, scale_i);
 #endif
             attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
             UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME(1, name);
diff --git a/examples/server_loglevel.c b/examples/server_loglevel.c
index 5ab182563c6..3eae466cdbe 100644
--- a/examples/server_loglevel.c
+++ b/examples/server_loglevel.c
@@ -7,6 +7,7 @@
 
 #include <signal.h>
 #include <stdlib.h>
+#include <stdio.h>
 #ifdef __linux__
 #include <getopt.h>
 #endif
diff --git a/examples/tutorial_client_events.c b/examples/tutorial_client_events.c
index 443c9125599..63aa8cb1c2f 100644
--- a/examples/tutorial_client_events.c
+++ b/examples/tutorial_client_events.c
@@ -10,6 +10,7 @@
 #include <open62541/server_config_default.h>
 #include <open62541/util.h>
 
+#include <stdio.h>
 #include <signal.h>
 
 #ifdef _MSC_VER
diff --git a/examples/tutorial_datatypes.c b/examples/tutorial_datatypes.c
index 8a8199fbee4..d870745e917 100644
--- a/examples/tutorial_datatypes.c
+++ b/examples/tutorial_datatypes.c
@@ -21,6 +21,7 @@
 #include <open62541/server_config_default.h>
 
 #include <stdlib.h>
+#include <stdio.h>
 
 static void
 variables_basic(void) {
diff --git a/examples/tutorial_server_method_async.c b/examples/tutorial_server_method_async.c
index 41b03b335bc..42f962bfb85 100644
--- a/examples/tutorial_server_method_async.c
+++ b/examples/tutorial_server_method_async.c
@@ -34,6 +34,9 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
 
+#include <signal.h>
+#include "common.h"
+
 #ifndef WIN32
 #include <pthread.h>
 #define THREAD_HANDLE pthread_t
@@ -187,7 +190,7 @@ THREAD_CALLBACK(ThreadWorker) {
             UA_CallMethodResult_clear(&response);
         } else {
             /* not a good style, but done for simplicity :-) */
-            UA_sleep_ms(100);
+            sleep_ms(100);
         }
     }
     return 0;
diff --git a/examples/tutorial_server_variable.c b/examples/tutorial_server_variable.c
index d0f006af659..aff7d26ac79 100644
--- a/examples/tutorial_server_variable.c
+++ b/examples/tutorial_server_variable.c
@@ -16,6 +16,7 @@
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
+#include <stdio.h>
 
 static void
 addVariable(UA_Server *server) {
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 2393a4e5fdc..8726ab6430c 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -263,6 +263,12 @@ extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
 # define UA_free(ptr) UA_freeSingleton(ptr)
 # define UA_calloc(num, size) UA_callocSingleton(num, size)
 # define UA_realloc(ptr, size) UA_reallocSingleton(ptr, size)
+#else
+# include <stdlib.h>
+# define UA_free free
+# define UA_malloc malloc
+# define UA_calloc calloc
+# define UA_realloc realloc
 #endif
 
 /* Stack-allocation of memory. Use C99 variable-length arrays if possible.
@@ -321,6 +327,96 @@ extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
 # define UA_STATIC_ASSERT(cond,msg) typedef char static_assertion_##msg[(cond)?1:-1]
 #endif
 
+/**
+ * Locking for Multithreading
+ * -------------------------- */
+
+#if UA_MULTITHREADING < 100
+
+# define UA_LOCK_INIT(lock)
+# define UA_LOCK_DESTROY(lock)
+# define UA_LOCK(lock)
+# define UA_UNLOCK(lock)
+# define UA_LOCK_ASSERT(lock, num)
+
+#elif defined(UA_ARCHITECTURE_WIN32)
+
+typedef struct {
+    CRITICAL_SECTION mutex;
+    int mutexCounter;
+} UA_Lock;
+
+static UA_INLINE void
+UA_LOCK_INIT(UA_Lock *lock) {
+    InitializeCriticalSection(&lock->mutex);
+    lock->mutexCounter = 0;
+}
+
+static UA_INLINE void
+UA_LOCK_DESTROY(UA_Lock *lock) {
+    DeleteCriticalSection(&lock->mutex);
+}
+
+static UA_INLINE void
+UA_LOCK(UA_Lock *lock) {
+    EnterCriticalSection(&lock->mutex);
+    UA_assert(++(lock->mutexCounter) == 1);
+}
+
+static UA_INLINE void
+UA_UNLOCK(UA_Lock *lock) {
+    UA_assert(--(lock->mutexCounter) == 0);
+    LeaveCriticalSection(&lock->mutex);
+}
+
+static UA_INLINE void
+UA_LOCK_ASSERT(UA_Lock *lock, int num) {
+    UA_assert(lock->mutexCounter == num);
+}
+
+#elif defined(UA_ARCHITECTURE_POSIX)
+
+#include <pthread.h>
+
+typedef struct {
+    pthread_mutex_t mutex;
+    int mutexCounter;
+} UA_Lock;
+
+#define UA_LOCK_STATIC_INIT {PTHREAD_MUTEX_INITIALIZER, 0}
+
+static UA_INLINE void
+UA_LOCK_INIT(UA_Lock *lock) {
+    pthread_mutex_init(&lock->mutex, NULL);
+    lock->mutexCounter = 0;
+}
+
+static UA_INLINE void
+UA_LOCK_DESTROY(UA_Lock *lock) {
+    pthread_mutex_destroy(&lock->mutex);
+}
+
+static UA_INLINE void
+UA_LOCK(UA_Lock *lock) {
+    pthread_mutex_lock(&lock->mutex);
+    UA_assert(lock->mutexCounter == 0);
+    lock->mutexCounter++;
+}
+
+static UA_INLINE void
+UA_UNLOCK(UA_Lock *lock) {
+    UA_assert(lock->mutexCounter == 1);
+    lock->mutexCounter--;
+    pthread_mutex_unlock(&lock->mutex);
+}
+
+static UA_INLINE void
+UA_LOCK_ASSERT(UA_Lock *lock, int num) {
+    UA_assert(lock->mutexCounter == num);
+}
+
+#endif
+
 /**
  * Dynamic Linking
  * ---------------
@@ -547,7 +643,4 @@ UA_STATIC_ASSERT(sizeof(bool) == 1, cannot_overlay_integers_with_large_bool);
 # define UA_BINARY_OVERLAYABLE_FLOAT 0
 #endif
 
-/* Include architecture-specific definitions */
-#include "${UA_ARCHITECTURE}/ua_architecture.h"
-
 #endif /* UA_CONFIG_H_ */
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 993decf2252..aab79712587 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -22,6 +22,14 @@
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 
+#include <stdio.h> /* For printf */
+
+#ifdef _WIN32
+# include <winsock2.h>
+#else
+# include <unistd.h>
+#endif
+
 /* Struct initialization works across ANSI C/C99/C++ if it is done when the
  * variable is first declared. Assigning values to existing structs is
  * heterogeneous across the three. */
@@ -393,8 +401,8 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         /* 1) Listen on all interfaces (also external). This must be the first
          * entry if this is desired. Otherwise some interfaces may be blocked
          * (already in use) with a hostname that is only locally reachable.*/
-        UA_snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
-                    "opc.tcp://:%u", portNumber);
+        snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
+                 "opc.tcp://:%u", portNumber);
         serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[0]);
         serverUrlsSize++;
 
@@ -404,14 +412,14 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         WSADATA wsaData;
         WSAStartup(MAKEWORD(2, 2), &wsaData);
 #endif
-        int err = UA_gethostname(hostnamestr, sizeof(hostnamestr));
+        int err = gethostname(hostnamestr, sizeof(hostnamestr));
 #ifdef _WIN32
         WSACleanup();
 #endif
 
         if(err == 0) {
-            UA_snprintf(serverUrlBuffer[1], sizeof(serverUrlBuffer[1]),
-                        "opc.tcp://%s:%u", hostnamestr, portNumber);
+            snprintf(serverUrlBuffer[1], sizeof(serverUrlBuffer[1]),
+                     "opc.tcp://%s:%u", hostnamestr, portNumber);
             serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[1]);
             serverUrlsSize++;
         }
diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index 1921b62165c..5cae8e902af 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -13,7 +13,7 @@
 /* ANSI escape sequences for color output taken from here:
  * https://stackoverflow.com/questions/3219393/stdlib-and-colored-output-in-c*/
 
-#ifdef UA_ENABLE_LOG_COLORS
+#ifdef UA_ARCHITECTURE_POSIX
 # define ANSI_COLOR_RED     "\x1b[31m"
 # define ANSI_COLOR_GREEN   "\x1b[32m"
 # define ANSI_COLOR_YELLOW  "\x1b[33m"
diff --git a/plugins/ua_log_syslog.c b/plugins/ua_log_syslog.c
index e39b0d372f7..45a41164247 100644
--- a/plugins/ua_log_syslog.c
+++ b/plugins/ua_log_syslog.c
@@ -10,6 +10,7 @@
 #if defined(__linux__) || defined(__unix__)
 
 #include <syslog.h>
+#include <stdio.h>
 
 const char *syslogLevelNames[6] = {"trace", "debug", "info",
                                    "warn", "error", "fatal"};
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index c3206b2e16b..c5eb41d5981 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -12,6 +12,14 @@
 
 #if defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST)
 
+#ifdef _WIN32
+# include <winsock2.h>
+#else
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netdb.h>
+#endif
+
 typedef enum {
     UA_DISCOVERY_TCP,    /* OPC UA TCP mapping */
     UA_DISCOVERY_TLS     /* OPC UA HTTPS mapping */
diff --git a/src/ua_types.c b/src/ua_types.c
index b66a5d4a76b..9889d8f99b5 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -144,6 +144,19 @@ UA_String_isEmpty(const UA_String *s) {
     return (s->length == 0 || s->data == NULL);
 }
 
+static UA_Byte
+lowercase(UA_Byte c) {
+	if(((int)c) - 'A' < 26) return c | 32;
+	return c;
+}
+
+static int
+casecmp(const UA_Byte *l, const UA_Byte *r, size_t n) {
+	if(!n--) return 0;
+	for(; *l && *r && n && (*l == *r || lowercase(*l) == lowercase(*r)); l++, r++, n--);
+	return lowercase(*l) - lowercase(*r);
+}
+
 /* Do not expose UA_String_equal_ignorecase to public API as it currently only handles
  * ASCII strings, and not UTF8! */
 UA_Boolean
@@ -155,8 +168,7 @@ UA_String_equal_ignorecase(const UA_String *s1, const UA_String *s2) {
     if(s2->data == NULL)
         return false;
 
-    //FIXME this currently does not handle UTF8
-    return UA_strncasecmp((const char*)s1->data, (const char*)s2->data, s1->length) == 0;
+    return casecmp(s1->data, s2->data, s1->length) == 0;
 }
 
 static UA_StatusCode
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index c13f34d016c..5ef523dfb5a 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -16,6 +16,7 @@
 
 #include <float.h>
 #include <math.h>
+#include <stdio.h> /* for snprintf */
 
 #include "../deps/itoa.h"
 #include "../deps/parse_num.h"
@@ -402,7 +403,7 @@ ENCODE_JSON(Float) {
     } else if(*src == -INFINITY) {
         strcpy(buffer, "\"-Infinity\"");
     } else {
-        UA_snprintf(buffer, 200, "%.149g", (UA_Double)*src);
+        snprintf(buffer, 200, "%.149g", (UA_Double)*src);
     }
 
     size_t len = strlen(buffer);
@@ -427,7 +428,7 @@ ENCODE_JSON(Double) {
     } else if(*src == -INFINITY) {
         strcpy(buffer, "\"-Infinity\"");
     } else {
-        UA_snprintf(buffer, 2000, "%.1074g", *src);
+        snprintf(buffer, 2000, "%.1074g", *src);
     }
 
     size_t len = strlen(buffer);
diff --git a/src/ua_util.c b/src/ua_util.c
index 126208227b9..fbb8e314c23 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -488,6 +488,7 @@ UA_Guid_random(void) {
 
 /* Global malloc singletons */
 #ifdef UA_ENABLE_MALLOC_SINGLETON
+# include <stdlib.h>
 UA_EXPORT UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size) = malloc;
 UA_EXPORT UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr) = free;
 UA_EXPORT UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize) = calloc;
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 488430ff6d3..9ebc58e483e 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -171,7 +171,15 @@ isTrue(uint8_t expr) {
  * Utility Functions
  * ----------------- */
 
-#define UA_fileExists(X) ( access(X, 0) == 0)
+#ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
+# ifdef _WIN32
+#  include <io.h>
+#  define UA_fileExists(X) ( _access(X, 0) == 0)
+# else
+#  include <unistd.h>
+#  define UA_fileExists(X) ( access(X, 0) == 0)
+# endif
+#endif
 
 void
 UA_cleanupDataTypeWithCustom(const UA_DataTypeArray *customTypes);
diff --git a/tests/check_eventloop.c b/tests/check_eventloop.c
index 3a66b1724b5..0f3cb10b737 100644
--- a/tests/check_eventloop.c
+++ b/tests/check_eventloop.c
@@ -5,6 +5,7 @@
 #include <open62541/plugin/eventloop.h>
 #include "testing_clock.h"
 #include <time.h>
+#include <stdio.h>
 #include <check.h>
 
 #define N_EVENTS 10000
diff --git a/tests/check_kvm_utils.c b/tests/check_kvm_utils.c
index b4db55b3256..a235a32f508 100644
--- a/tests/check_kvm_utils.c
+++ b/tests/check_kvm_utils.c
@@ -5,6 +5,7 @@
 #include "ua_util_internal.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "check.h"
 
diff --git a/tests/client/check_client_historical_data.c b/tests/client/check_client_historical_data.c
index 7a244a6f931..bcfa0d3d717 100644
--- a/tests/client/check_client_historical_data.c
+++ b/tests/client/check_client_historical_data.c
@@ -24,6 +24,7 @@
 #include "thread_wrapper.h"
 #include "historical_read_test_data.h"
 #include <stddef.h>
+#include <stdio.h>
 
 static UA_Server *server;
 static UA_HistoryDataGathering *gathering;
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 72a17486e81..7a45a76d215 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -1534,8 +1534,6 @@ START_TEST(Client_subscription_transfer) {
     ck_assert_uint_eq(monResponse.statusCode, UA_STATUSCODE_GOOD);
     }
 
-    UA_sleep_ms(1000);
-
     /* Create a second client */
     UA_Client *client2 = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client2));
@@ -1561,7 +1559,7 @@ START_TEST(Client_subscription_transfer) {
         UA_Client_run_iterate(client, 1);
         UA_Client_run_iterate(client2, 1);
 
-        UA_sleep_ms(100);
+        UA_fakeSleep(100);
     }
 
     /* Delete */
diff --git a/tests/fuzz/fuzz_base64_decode.cc b/tests/fuzz/fuzz_base64_decode.cc
index 26ee72d0126..ad56117c623 100644
--- a/tests/fuzz/fuzz_base64_decode.cc
+++ b/tests/fuzz/fuzz_base64_decode.cc
@@ -12,6 +12,7 @@
 ** fuzzed input.
 */
 #include <base64.h>
+#include <malloc.h>
 
 extern "C" int
 LLVMFuzzerTestOneInput(uint8_t *data, size_t size) {
diff --git a/tests/fuzz/fuzz_base64_encode.cc b/tests/fuzz/fuzz_base64_encode.cc
index 1c8f5708d49..79317e2b3ec 100644
--- a/tests/fuzz/fuzz_base64_encode.cc
+++ b/tests/fuzz/fuzz_base64_encode.cc
@@ -12,6 +12,7 @@
 ** fuzzed input.
 */
 #include <base64.h>
+#include <malloc.h>
 
 extern "C" int
 LLVMFuzzerTestOneInput(uint8_t *data, size_t size) {
diff --git a/tests/fuzz/fuzz_tcp_message.cc b/tests/fuzz/fuzz_tcp_message.cc
index c1bc09881ee..1452d26b61e 100644
--- a/tests/fuzz/fuzz_tcp_message.cc
+++ b/tests/fuzz/fuzz_tcp_message.cc
@@ -9,6 +9,10 @@
 #include "custom_memory_manager.h"
 
 #include <pthread.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
 
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server_config_default.h>
diff --git a/tests/multithreading/check_mt_addDeleteObject.c b/tests/multithreading/check_mt_addDeleteObject.c
index 1b5c46a4dd0..7bbbd55bdb1 100644
--- a/tests/multithreading/check_mt_addDeleteObject.c
+++ b/tests/multithreading/check_mt_addDeleteObject.c
@@ -7,6 +7,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdio.h>
 #include "thread_wrapper.h"
 #include "deviceObjectType.h"
 #include "mt_testing.h"
diff --git a/tests/multithreading/check_mt_addObjectNode.c b/tests/multithreading/check_mt_addObjectNode.c
index 91e89ec29af..34882a9d70d 100644
--- a/tests/multithreading/check_mt_addObjectNode.c
+++ b/tests/multithreading/check_mt_addObjectNode.c
@@ -6,6 +6,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdio.h>
 #include "thread_wrapper.h"
 #include "deviceObjectType.h"
 
diff --git a/tests/multithreading/check_mt_addVariableNode.c b/tests/multithreading/check_mt_addVariableNode.c
index 31b0ab4e98e..16836146d1b 100644
--- a/tests/multithreading/check_mt_addVariableNode.c
+++ b/tests/multithreading/check_mt_addVariableNode.c
@@ -6,6 +6,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdio.h>
 #include "thread_wrapper.h"
 #include "mt_testing.h"
 
diff --git a/tests/multithreading/check_mt_addVariableTypeNode.c b/tests/multithreading/check_mt_addVariableTypeNode.c
index b6c5cab653c..9af4627d9f6 100644
--- a/tests/multithreading/check_mt_addVariableTypeNode.c
+++ b/tests/multithreading/check_mt_addVariableTypeNode.c
@@ -7,6 +7,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdio.h>
 #include "thread_wrapper.h"
 #include "mt_testing.h"
 
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index b90c4478540..973a8891296 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -407,7 +407,7 @@ END_TEST
 
 START_TEST(requestUnknownStartingTokenId){
     UA_fakeSleep(1000);
-    UA_sleep_ms(4000);
+    UA_realSleep(4000);
     UA_Client *sksClient = UA_Client_new();
     encyrptedclientconnect(sksClient, "user1", "password");
     UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 99f29b66be2..a5d57d92f46 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -9,6 +9,7 @@
 #include "server/ua_server_internal.h"
 
 #include <fcntl.h>
+#include <stdio.h>
 
 #include "testing_clock.h"
 #include "thread_wrapper.h"
diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c
index 76b1f856ba0..805439fc14a 100644
--- a/tests/server/check_server_historical_data.c
+++ b/tests/server/check_server_historical_data.c
@@ -19,6 +19,7 @@
 #include "server/ua_server_internal.h"
 
 #include <check.h>
+#include <stdio.h>
 
 #include "testing_clock.h"
 #include "thread_wrapper.h"
diff --git a/tests/server/check_server_historical_data_circular.c b/tests/server/check_server_historical_data_circular.c
index 611eb098e37..60513bbef9e 100644
--- a/tests/server/check_server_historical_data_circular.c
+++ b/tests/server/check_server_historical_data_circular.c
@@ -17,6 +17,7 @@
 #include <open62541/server_config_default.h>
 
 #include <check.h>
+#include <stdio.h>
 
 #include "server/ua_server_internal.h"
 #include "testing_clock.h"
diff --git a/tests/server/check_server_readspeed.c b/tests/server/check_server_readspeed.c
index c5fce324463..da7431711d1 100644
--- a/tests/server/check_server_readspeed.c
+++ b/tests/server/check_server_readspeed.c
@@ -13,6 +13,7 @@
 
 #include <check.h>
 #include <time.h>
+#include <stdio.h>
 
 #include "testing_networklayers.h"
 #include "testing_policy.h"
@@ -43,7 +44,7 @@ START_TEST(readSpeed) {
     UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
     for(size_t i = 0; i < READNODES; i++) {
         char varName[20];
-        UA_snprintf(varName, 20, "Variable %u", (UA_UInt32)i);
+        snprintf(varName, 20, "Variable %u", (UA_UInt32)i);
         UA_NodeId myNodeId = UA_NODEID_STRING(1, varName);
         UA_QualifiedName myName = UA_QUALIFIEDNAME(1, varName);
         retval = UA_Server_addVariableNode(server, myNodeId, parentNodeId,
@@ -112,7 +113,7 @@ START_TEST(readSpeedWithEncoding) {
     UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
     for(size_t i = 0; i < READNODES; i++) {
         char varName[20];
-        UA_snprintf(varName, 20, "Variable %u", (UA_UInt32)i);
+        snprintf(varName, 20, "Variable %u", (UA_UInt32)i);
         UA_NodeId myNodeId = UA_NODEID_STRING(1, varName);
         UA_QualifiedName myName = UA_QUALIFIEDNAME(1, varName);
         retval = UA_Server_addVariableNode(server, myNodeId, parentNodeId,
diff --git a/tests/server/check_server_speed_addnodes.c b/tests/server/check_server_speed_addnodes.c
index 7b36c8436bc..3bc38677669 100644
--- a/tests/server/check_server_speed_addnodes.c
+++ b/tests/server/check_server_speed_addnodes.c
@@ -6,6 +6,7 @@
 
 #include <check.h>
 #include <time.h>
+#include <stdio.h>
 
 static UA_Server *server;
 
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index 5c89b547b87..954a8086ca1 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -14,6 +14,7 @@
 #include <open62541/client_subscriptions.h>
 
 #include <check.h>
+#include <stdio.h>
 
 #include "testing_clock.h"
 #include "thread_wrapper.h"
diff --git a/tests/server/check_subscription_events.c b/tests/server/check_subscription_events.c
index 52cda494e82..3346d320164 100644
--- a/tests/server/check_subscription_events.c
+++ b/tests/server/check_subscription_events.c
@@ -16,6 +16,7 @@
 #include "server/ua_subscription.h"
 
 #include <check.h>
+#include <stdio.h>
 
 #include "testing_clock.h"
 #include "thread_wrapper.h"

From d04445a85a677261067f0b1d75bc5e38508e296e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 9 Jul 2023 16:14:00 +0200
Subject: [PATCH 1071/1963] refactor(el): Remove old UA_getaddrinfo

---
 arch/eCos/ua_architecture.h    | 1 -
 arch/eventloop_posix_tcp.c     | 2 +-
 arch/eventloop_posix_udp.c     | 2 +-
 arch/posix/ua_architecture.h   | 1 -
 arch/vxworks/ua_architecture.h | 1 -
 arch/wec7/ua_architecture.h    | 1 -
 arch/win32/ua_architecture.h   | 1 -
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
index eb3670a2a3a..24881248a9b 100644
--- a/arch/eCos/ua_architecture.h
+++ b/arch/eCos/ua_architecture.h
@@ -55,7 +55,6 @@
 #define UA_listen listen
 #define UA_accept accept
 #define UA_connect connect
-#define UA_getaddrinfo getaddrinfo
 #define UA_getsockopt getsockopt
 #define UA_setsockopt setsockopt
 #define UA_ioctl ioctl
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 982150149b4..e372c32768d 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -525,7 +525,7 @@ TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_flags = AI_PASSIVE;
 
-    int retcode = UA_getaddrinfo(hostname, portstr, &hints, &res);
+    int retcode = getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
 #ifdef _WIN32
         UA_LOG_SOCKET_ERRNO_WRAP(
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index e7f30793ef7..18263d0cbf4 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -811,7 +811,7 @@ UDP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
     char portstr[6];
     UA_snprintf(portstr, 6, "%d", port);
 
-    int retcode = UA_getaddrinfo(hostname, portstr, &hints, &res);
+    int retcode = getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
         UA_LOG_SOCKET_ERRNO_GAI_WRAP(
            UA_LOG_WARNING(pcm->cm.eventSource.eventLoop->logger,
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index a22759660d8..57d40a46ea9 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -91,7 +91,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_listen listen
 #define UA_accept accept
 #define UA_connect connect
-#define UA_getaddrinfo getaddrinfo
 #define UA_getsockopt getsockopt
 #define UA_setsockopt setsockopt
 #define UA_ioctl ioctl
diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
index 6a50f51498e..a2a1bea7ace 100644
--- a/arch/vxworks/ua_architecture.h
+++ b/arch/vxworks/ua_architecture.h
@@ -84,7 +84,6 @@
 #define UA_listen listen
 #define UA_accept accept
 #define UA_connect connect
-#define UA_getaddrinfo getaddrinfo
 #define UA_getsockopt getsockopt
 #define UA_setsockopt setsockopt
 #define UA_ioctl ioctl
diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
index 490e60a54af..406bd04e3f6 100644
--- a/arch/wec7/ua_architecture.h
+++ b/arch/wec7/ua_architecture.h
@@ -104,7 +104,6 @@ typedef struct pollfd {
 #define UA_listen listen
 #define UA_accept accept
 #define UA_connect(sockfd, addr, addrlen) connect(sockfd, addr, (int)(addrlen))
-#define UA_getaddrinfo getaddrinfo
 #define UA_getsockopt getsockopt
 #define UA_setsockopt(sockfd, level, optname, optval, optlen) setsockopt(sockfd, level, optname, (const char*) (optval), optlen)
 #define UA_ioctl
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 7f1d57468c5..a63a12f337f 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -100,7 +100,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_listen listen
 #define UA_accept accept
 #define UA_connect(sockfd, addr, addrlen) connect(sockfd, addr, (int)(addrlen))
-#define UA_getaddrinfo getaddrinfo
 #define UA_getsockopt(sockfd, level, optname, optval, optlen) getsockopt(sockfd, level, optname, (char*) (optval), optlen)
 #define UA_setsockopt(sockfd, level, optname, optval, optlen) setsockopt(sockfd, level, optname, (const char*) (optval), optlen)
 #define UA_ioctl

From 8375f3ad5cf69546c6d3f21b37c7a861c3b5790e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 11 Jul 2023 11:29:58 +0200
Subject: [PATCH 1072/1963] feat(deps): Import dtoa.h/c for float number
 printing

---
 deps/README.md |   1 +
 deps/dtoa.c    | 372 +++++++++++++++++++++++++++++++++++++++++++++++++
 deps/dtoa.h    |  44 ++++++
 3 files changed, 417 insertions(+)
 create mode 100644 deps/dtoa.c
 create mode 100644 deps/dtoa.h

diff --git a/deps/README.md b/deps/README.md
index 612598b3856..afc55bdda77 100644
--- a/deps/README.md
+++ b/deps/README.md
@@ -19,3 +19,4 @@ The following third party libraries may be included -- depending on the activate
 | pcg_basic       | Apache License 2 | Random Number Generation                        |
 | ziptree         | MPL 2.0          | Reusable zip tree implementation                |
 | mqtt-c          | MIT              | a portable MQTT client in C                     |
+| dtoa            | BSC (Boost)      | Printing of float numbers                       |
diff --git a/deps/dtoa.c b/deps/dtoa.c
new file mode 100644
index 00000000000..2d7a0dca1e4
--- /dev/null
+++ b/deps/dtoa.c
@@ -0,0 +1,372 @@
+// Copyright 2013, Andreas Samoljuk
+// Copyright 2023, Julius Pfrommer
+//
+// Boost Software License - Version 1.0 - August 17th, 2003
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+//
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+#include "dtoa.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+
+#define mantissa_bits 52
+#define exponent_bits 11
+#define fracmask  0x000FFFFFFFFFFFFFU
+#define expmask   0x7FF0000000000000U
+#define hiddenbit 0x0010000000000000U
+#define signmask  0x8000000000000000U
+#define expbias   (1023 + 52)
+
+#define absv(n) ((n) < 0 ? -(n) : (n))
+#define minv(a, b) ((a) < (b) ? (a) : (b))
+
+static uint64_t tens[] = {
+    10000000000000000000U, 1000000000000000000U, 100000000000000000U,
+    10000000000000000U, 1000000000000000U, 100000000000000U,
+    10000000000000U, 1000000000000U, 100000000000U,
+    10000000000U, 1000000000U, 100000000U,
+    10000000U, 1000000U, 100000U,
+    10000U, 1000U, 100U,
+    10U, 1U
+};
+
+#define npowers     87
+#define steppowers  8
+#define firstpower -348 /* 10 ^ -348 */
+#define expmax     -32
+#define expmin     -60
+
+typedef struct Fp {
+    uint64_t frac;
+    int exp;
+} Fp;
+
+static Fp powers_ten[] = {
+    { 18054884314459144840U, -1220 }, { 13451937075301367670U, -1193 },
+    { 10022474136428063862U, -1166 }, { 14934650266808366570U, -1140 },
+    { 11127181549972568877U, -1113 }, { 16580792590934885855U, -1087 },
+    { 12353653155963782858U, -1060 }, { 18408377700990114895U, -1034 },
+    { 13715310171984221708U, -1007 }, { 10218702384817765436U, -980 },
+    { 15227053142812498563U, -954 },  { 11345038669416679861U, -927 },
+    { 16905424996341287883U, -901 },  { 12595523146049147757U, -874 },
+    { 9384396036005875287U,  -847 },  { 13983839803942852151U, -821 },
+    { 10418772551374772303U, -794 },  { 15525180923007089351U, -768 },
+    { 11567161174868858868U, -741 },  { 17236413322193710309U, -715 },
+    { 12842128665889583758U, -688 },  { 9568131466127621947U,  -661 },
+    { 14257626930069360058U, -635 },  { 10622759856335341974U, -608 },
+    { 15829145694278690180U, -582 },  { 11793632577567316726U, -555 },
+    { 17573882009934360870U, -529 },  { 13093562431584567480U, -502 },
+    { 9755464219737475723U,  -475 },  { 14536774485912137811U, -449 },
+    { 10830740992659433045U, -422 },  { 16139061738043178685U, -396 },
+    { 12024538023802026127U, -369 },  { 17917957937422433684U, -343 },
+    { 13349918974505688015U, -316 },  { 9946464728195732843U,  -289 },
+    { 14821387422376473014U, -263 },  { 11042794154864902060U, -236 },
+    { 16455045573212060422U, -210 },  { 12259964326927110867U, -183 },
+    { 18268770466636286478U, -157 },  { 13611294676837538539U, -130 },
+    { 10141204801825835212U, -103 },  { 15111572745182864684U, -77 },
+    { 11258999068426240000U, -50 },   { 16777216000000000000U, -24 },
+    { 12500000000000000000U,   3 },   { 9313225746154785156U,   30 },
+    { 13877787807814456755U,  56 },   { 10339757656912845936U,  83 },
+    { 15407439555097886824U, 109 },   { 11479437019748901445U, 136 },
+    { 17105694144590052135U, 162 },   { 12744735289059618216U, 189 },
+    { 9495567745759798747U,  216 },   { 14149498560666738074U, 242 },
+    { 10542197943230523224U, 269 },   { 15709099088952724970U, 295 },
+    { 11704190886730495818U, 322 },   { 17440603504673385349U, 348 },
+    { 12994262207056124023U, 375 },   { 9681479787123295682U,  402 },
+    { 14426529090290212157U, 428 },   { 10748601772107342003U, 455 },
+    { 16016664761464807395U, 481 },   { 11933345169920330789U, 508 },
+    { 17782069995880619868U, 534 },   { 13248674568444952270U, 561 },
+    { 9871031767461413346U,  588 },   { 14708983551653345445U, 614 },
+    { 10959046745042015199U, 641 },   { 16330252207878254650U, 667 },
+    { 12166986024289022870U, 694 },   { 18130221999122236476U, 720 },
+    { 13508068024458167312U, 747 },   { 10064294952495520794U, 774 },
+    { 14996968138956309548U, 800 },   { 11173611982879273257U, 827 },
+    { 16649979327439178909U, 853 },   { 12405201291620119593U, 880 },
+    { 9242595204427927429U,  907 },   { 13772540099066387757U, 933 },
+    { 10261342003245940623U, 960 },   { 15290591125556738113U, 986 },
+    { 11392378155556871081U, 1013 },  { 16975966327722178521U, 1039 },
+    { 12648080533535911531U, 1066 }
+};
+
+static Fp
+find_cachedpow10(int exp, int* k) {
+    const double one_log_ten = 0.30102999566398114;
+    int approx = (int)(-(exp + npowers) * one_log_ten);
+    int idx = (approx - firstpower) / steppowers;
+    while(1) {
+        int current = exp + powers_ten[idx].exp + 64;
+        if(current < expmin) {
+            idx++;
+            continue;
+        }
+        if(current > expmax) {
+            idx--;
+            continue;
+        }
+        *k = (firstpower + idx * steppowers);
+        return powers_ten[idx];
+    }
+}
+
+static Fp build_fp(uint64_t bits) {
+    Fp fp;
+    fp.frac = bits & fracmask;
+    fp.exp = (bits & expmask) >> 52;
+    if(fp.exp) {
+        fp.frac += hiddenbit;
+        fp.exp -= expbias;
+    } else {
+        fp.exp = -expbias + 1;
+    }
+    return fp;
+}
+
+static void normalize(Fp* fp) {
+    while((fp->frac & hiddenbit) == 0) {
+        fp->frac <<= 1;
+        fp->exp--;
+    }
+    int shift = 64 - 52 - 1;
+    fp->frac <<= shift;
+    fp->exp -= shift;
+}
+
+static void get_normalized_boundaries(Fp* fp, Fp* lower, Fp* upper) {
+    upper->frac = (fp->frac << 1) + 1;
+    upper->exp  = fp->exp - 1;
+    while ((upper->frac & (hiddenbit << 1)) == 0) {
+        upper->frac <<= 1;
+        upper->exp--;
+    }
+
+    int u_shift = 64 - 52 - 2;
+    upper->frac <<= u_shift;
+    upper->exp = upper->exp - u_shift;
+
+    int l_shift = fp->frac == hiddenbit ? 2 : 1;
+    lower->frac = (fp->frac << l_shift) - 1;
+    lower->exp = fp->exp - l_shift;
+    lower->frac <<= lower->exp - upper->exp;
+    lower->exp = upper->exp;
+}
+
+static Fp multiply(Fp* a, Fp* b) {
+    const uint64_t lomask = 0x00000000FFFFFFFF;
+    uint64_t ah_bl = (a->frac >> 32)    * (b->frac & lomask);
+    uint64_t al_bh = (a->frac & lomask) * (b->frac >> 32);
+    uint64_t al_bl = (a->frac & lomask) * (b->frac & lomask);
+    uint64_t ah_bh = (a->frac >> 32)    * (b->frac >> 32);
+    uint64_t tmp = (ah_bl & lomask) + (al_bh & lomask) + (al_bl >> 32); 
+    /* round up */
+    tmp += 1U << 31;
+    Fp fp;
+    fp.frac = ah_bh + (ah_bl >> 32) + (al_bh >> 32) + (tmp >> 32);
+    fp.exp = a->exp + b->exp + 64;
+    return fp;
+}
+
+static void round_digit(char* digits, unsigned ndigits, uint64_t delta,
+                        uint64_t rem, uint64_t kappa, uint64_t frac) {
+    while(rem < frac && delta - rem >= kappa &&
+          (rem + kappa < frac || frac - rem > rem + kappa - frac)) {
+        digits[ndigits - 1]--;
+        rem += kappa;
+    }
+}
+
+static unsigned generate_digits(Fp* fp, Fp* upper, Fp* lower, char* digits, int* K) {
+    uint64_t wfrac = upper->frac - fp->frac;
+    uint64_t delta = upper->frac - lower->frac;
+
+    Fp one;
+    one.frac = 1ULL << -upper->exp;
+    one.exp  = upper->exp;
+
+    uint64_t part1 = upper->frac >> -one.exp;
+    uint64_t part2 = upper->frac & (one.frac - 1);
+
+    unsigned idx = 0;
+    int kappa = 10;
+    uint64_t* divp;
+
+    /* 1000000000 */
+    for(divp = tens + 10; kappa > 0; divp++) {
+        uint64_t div = *divp;
+        uint64_t digit = part1 / div;
+        if(digit || idx) {
+            digits[idx++] = (char)(digit + '0');
+        }
+
+        part1 -= digit * div;
+        kappa--;
+
+        uint64_t tmp = (part1 <<-one.exp) + part2;
+        if(tmp <= delta) {
+            *K += kappa;
+            round_digit(digits, idx, delta, tmp, div << -one.exp, wfrac);
+            return idx;
+        }
+    }
+
+    /* 10 */
+    uint64_t* unit = tens + 18;
+    while(true) {
+        part2 *= 10;
+        delta *= 10;
+        kappa--;
+
+        uint64_t digit = part2 >> -one.exp;
+        if(digit || idx) {
+            digits[idx++] = (char)(digit + '0');
+        }
+
+        part2 &= one.frac - 1;
+        if(part2 < delta) {
+            *K += kappa;
+            round_digit(digits, idx, delta, part2, one.frac, wfrac * *unit);
+            break;
+        }
+        unit--;
+    }
+    return idx;
+}
+
+static unsigned grisu2(uint64_t bits, char* digits, int* K) {
+    Fp w = build_fp(bits);
+    Fp lower, upper;
+    get_normalized_boundaries(&w, &lower, &upper);
+    normalize(&w);
+    int k;
+    Fp cp = find_cachedpow10(upper.exp, &k);
+    w     = multiply(&w,     &cp);
+    upper = multiply(&upper, &cp);
+    lower = multiply(&lower, &cp);
+    lower.frac++;
+    upper.frac--;
+    *K = -k;
+    return generate_digits(&w, &upper, &lower, digits, K);
+}
+
+static unsigned
+emit_digits(char* digits, unsigned ndigits, char* dest, int K, bool neg) {
+    int exp = absv(K + (int)ndigits - 1);
+
+    /* write plain integer */
+    if(K >= 0 && (exp < (int)ndigits + 7)) {
+        memcpy(dest, digits, ndigits);
+        memset(dest + ndigits, '0', (unsigned)K);
+        memcpy(dest + ndigits + (unsigned)K, ".0", 2); /* always append .0 for naked integers */
+        return (unsigned)(ndigits + (unsigned)K + 2);
+    }
+
+    /* write decimal w/o scientific notation */
+    if(K < 0 && (K > -7 || exp < 4)) {
+        int offset = (int)ndigits - absv(K);
+        if(offset <= 0) {
+            /* fp < 1.0 -> write leading zero */
+            offset = -offset;
+            dest[0] = '0';
+            dest[1] = '.';
+            memset(dest + 2, '0', (size_t)offset);
+            memcpy(dest + offset + 2, digits, ndigits);
+            return ndigits + 2 + (unsigned)offset;
+        } else {
+            /* fp > 1.0 */
+            memcpy(dest, digits, (size_t)offset);
+            dest[offset] = '.';
+            memcpy(dest + offset + 1, digits + offset, ndigits - (unsigned)offset);
+            return ndigits + 1;
+        }
+    }
+
+    /* write decimal w/ scientific notation */
+    ndigits = minv(ndigits, (unsigned)(18 - neg));
+    unsigned idx = 0;
+    dest[idx++] = digits[0];
+    if(ndigits > 1) {
+        dest[idx++] = '.';
+        memcpy(dest + idx, digits + 1, ndigits - 1);
+        idx += ndigits - 1;
+    }
+
+    dest[idx++] = 'e';
+
+    char sign = K + (int)ndigits - 1 < 0 ? '-' : '+';
+    dest[idx++] = sign;
+
+    int cent = 0;
+    if(exp > 99) {
+        cent = exp / 100;
+        dest[idx++] = (char)(cent + '0');
+        exp -= cent * 100;
+    }
+    if(exp > 9) {
+        int dec = exp / 10;
+        dest[idx++] = (char)(dec + '0');
+        exp -= dec * 10;
+
+    } else if(cent) {
+        dest[idx++] = '0';
+    }
+    dest[idx++] = (char)(exp % 10 + '0');
+    return idx;
+}
+
+unsigned dtoa(double d, char* buffer) {
+    uint64_t bits = 0;
+    memcpy(&bits, &d, sizeof(double));
+
+    uint64_t mantissa = bits & ((1ull << mantissa_bits) - 1);
+    uint32_t exponent = (uint32_t)
+        ((bits >> mantissa_bits) & ((1u << exponent_bits) - 1));
+
+    if(exponent == 0 && mantissa == 0) {
+        memcpy(buffer, "0.0", 3);
+        return 3;
+    }
+
+    bool sign = ((bits >> (mantissa_bits + exponent_bits)) & 1) != 0;
+    unsigned pos = 0;
+    if(sign) {
+        buffer[0] = '-';
+        pos++;
+        buffer++;
+    }
+
+    if(exponent == ((1u << exponent_bits) - 1u)) {
+        if(mantissa != 0) {
+            memcpy(buffer, "nan", 3);
+            return 3;
+        } else {
+            memcpy(&buffer[pos], "inf", 3);
+            return pos + 3;
+        }
+    }
+
+    int K = 0;
+    char digits[18];
+    memset(digits, 0, 18);
+    unsigned ndigits = grisu2(bits, digits, &K);
+    return pos + emit_digits(digits, ndigits, buffer, K, sign);
+}
diff --git a/deps/dtoa.h b/deps/dtoa.h
new file mode 100644
index 00000000000..ff4537768e0
--- /dev/null
+++ b/deps/dtoa.h
@@ -0,0 +1,44 @@
+// Copyright 2013, Andreas Samoljuk
+// Copyright 2023, Julius Pfrommer
+//
+// Boost Software License - Version 1.0 - August 17th, 2003
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+//
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+#ifndef DTOA_H
+#define DTOA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Prints a double-value as a readable string. The buffer must be at least 24
+// chars wide. Returns the number of printed characters. Does not
+// null-terminate.
+unsigned dtoa(double d, char* buffer);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // DTOA_H

From 79766878d09c116025e88e58b118476a380ad5f8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 9 Jul 2023 14:45:14 +0200
Subject: [PATCH 1073/1963] feat(deps): Import mp_printf for
 platform-independent snprintf

---
 deps/README.md   |   1 +
 deps/mp_printf.c | 595 +++++++++++++++++++++++++++++++++++++++++++++++
 deps/mp_printf.h |  90 +++++++
 3 files changed, 686 insertions(+)
 create mode 100644 deps/mp_printf.c
 create mode 100644 deps/mp_printf.h

diff --git a/deps/README.md b/deps/README.md
index afc55bdda77..6500c68c796 100644
--- a/deps/README.md
+++ b/deps/README.md
@@ -20,3 +20,4 @@ The following third party libraries may be included -- depending on the activate
 | ziptree         | MPL 2.0          | Reusable zip tree implementation                |
 | mqtt-c          | MIT              | a portable MQTT client in C                     |
 | dtoa            | BSC (Boost)      | Printing of float numbers                       |
+| mp_printf       | MIT              | Our version of github:mpaland/printf            |
diff --git a/deps/mp_printf.c b/deps/mp_printf.c
new file mode 100644
index 00000000000..d541ba23b3d
--- /dev/null
+++ b/deps/mp_printf.c
@@ -0,0 +1,595 @@
+/**
+ * @author (c) Julius Pfrommer
+ *             2023, Fraunhofer IOSB, Germany
+ * @author (c) Eyal Rozenberg <eyalroz1@gmx.com>
+ *             2021-2023, Haifa, Palestine/Israel
+ * @author (c) Marco Paland (info@paland.com)
+ *             2014-2019, PALANDesign Hannover, Germany
+ *
+ * @note Others have made smaller contributions to this file: see the
+ * contributors page at https://github.com/eyalroz/printf/graphs/contributors
+ * or ask one of the authors. The original code for exponential specifiers was
+ * contributed by Martijn Jasperse <m.jasperse@gmail.com>.
+ *
+ * @brief Small stand-alone implementation of the printf family of functions
+ * (`(v)printf`, `(v)s(n)printf` etc., geared towards use on embedded systems with
+ * limited resources.
+ *
+ * @note the implementations are thread-safe; re-entrant; use no functions from
+ * the standard library; and do not dynamically allocate any memory.
+ *
+ * @license The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "mp_printf.h"
+#include "dtoa.h"
+
+#include <stdint.h>
+#include <stdbool.h>
+
+// 'ntoa' conversion buffer size, this must be big enough to hold one converted
+// numeric number including padded zeros (dynamically created on stack)
+#define PRINTF_INTEGER_BUFFER_SIZE    32
+
+// size of the fixed (on-stack) buffer for printing individual decimal numbers.
+// this must be big enough to hold one converted floating-point value including
+// padded zeros.
+#define PRINTF_DECIMAL_BUFFER_SIZE    32
+
+// Default precision for the floating point conversion specifiers (the C
+// standard sets this at 6)
+#define PRINTF_DEFAULT_FLOAT_PRECISION  6
+
+// internal flag definitions
+#define FLAGS_ZEROPAD   (1U <<  0U)
+#define FLAGS_LEFT      (1U <<  1U)
+#define FLAGS_PLUS      (1U <<  2U)
+#define FLAGS_SPACE     (1U <<  3U)
+#define FLAGS_HASH      (1U <<  4U)
+#define FLAGS_UPPERCASE (1U <<  5U)
+#define FLAGS_CHAR      (1U <<  6U)
+#define FLAGS_SHORT     (1U <<  7U)
+  // Only used with PRINTF_SUPPORT_MSVC_STYLE_INTEGER_SPECIFIERS
+#define FLAGS_LONG      (1U <<  9U)
+#define FLAGS_LONG_LONG (1U << 10U)
+#define FLAGS_PRECISION (1U << 11U)
+#define FLAGS_ADAPT_EXP (1U << 12U)
+#define FLAGS_POINTER   (1U << 13U)
+  // Note: Similar, but not identical, effect as FLAGS_HASH
+#define FLAGS_SIGNED    (1U << 14U)
+
+#define BASE_BINARY    2
+#define BASE_OCTAL     8
+#define BASE_DECIMAL  10
+#define BASE_HEX      16
+
+typedef unsigned int printf_flags_t;
+typedef uint8_t numeric_base_t;
+typedef unsigned long long printf_unsigned_value_t;
+typedef long long printf_signed_value_t;
+
+// Note in particular the behavior here on LONG_MIN or LLONG_MIN; it is valid
+// and well-defined, but if you're not careful you can easily trigger undefined
+// behavior with -LONG_MIN or -LLONG_MIN
+#define ABS_FOR_PRINTING(_x)                                            \
+    ((printf_unsigned_value_t)((_x) > 0 ? (_x) : -((printf_signed_value_t)_x)))
+
+// internal secure strlen @return The length of the string (excluding the
+// terminating 0) limited by 'maxsize' @note strlen uses size_t, but wes only
+// use this function with size_t variables - hence the signature.
+static size_t
+strnlen_s_(const char *str, size_t maxsize) {
+    for(size_t i = 0; i < maxsize; i++) {
+        if(!str[i])
+            return i;
+    }
+    return maxsize;
+}
+
+// internal test if char is a digit (0-9)
+// @return true if char is a digit
+static bool is_digit_(char ch) { return (ch >= '0') && (ch <= '9'); }
+
+// internal ASCII string to size_t conversion
+static size_t
+atou_(const char **str) {
+    size_t i = 0U;
+    while(is_digit_(**str)) {
+        i = i * 10U + (size_t)(*((*str)++) - '0');
+    }
+    return i;
+}
+
+// Output buffer
+typedef struct {
+    char *buffer;
+    size_t pos;
+    size_t max_chars;
+} output_t;
+
+static void
+putchar_(output_t *out, char c) {
+    size_t write_pos = out->pos++;
+    // We're _always_ increasing pos, so as to count how may characters
+    // _would_ have been written if not for the max_chars limitation
+    if(write_pos >= out->max_chars)
+        return;
+    // it must be the case that out->buffer != NULL , due to the constraint
+    // on output_t ; and note we're relying on write_pos being non-negative.
+    out->buffer[write_pos] = c;
+}
+
+static void
+out_(output_t *out, const char *buf, size_t len) {
+    if(out->pos < out->max_chars) {
+        size_t write_len = len;
+        if(out->pos + len > out->max_chars)
+            write_len = out->max_chars - out->pos;
+        for(size_t i = 0; i < write_len; i++)
+            out->buffer[out->pos + i] = buf[i];
+    }
+    out->pos += len; // Always increase pos by len
+}
+
+// output the specified string in reverse, taking care of any zero-padding
+static void
+out_rev_(output_t *output, const char *buf, size_t len, size_t width,
+         printf_flags_t flags) {
+    const size_t start_pos = output->pos;
+
+    // pad spaces up to given width
+    if(!(flags & FLAGS_LEFT) && !(flags & FLAGS_ZEROPAD)) {
+        for(size_t i = len; i < width; i++) {
+            putchar_(output, ' ');
+        }
+    }
+
+    // reverse string
+    while(len) {
+        putchar_(output, buf[--len]);
+    }
+
+    // append pad spaces up to given width
+    if(flags & FLAGS_LEFT) {
+        while(output->pos - start_pos < width) {
+            putchar_(output, ' ');
+        }
+    }
+}
+
+// Invoked by print_integer after the actual number has been printed, performing
+// necessary work on the number's prefix (as the number is initially printed in
+// reverse order)
+static void
+print_integer_finalization(output_t *output, char *buf, size_t len, bool negative,
+                           numeric_base_t base, size_t precision, size_t width,
+                           printf_flags_t flags) {
+    size_t unpadded_len = len;
+
+    // pad with leading zeros
+    if(!(flags & FLAGS_LEFT)) {
+        if(width && (flags & FLAGS_ZEROPAD) &&
+           (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) {
+            width--;
+        }
+        while((flags & FLAGS_ZEROPAD) && (len < width) &&
+              (len < PRINTF_INTEGER_BUFFER_SIZE)) {
+            buf[len++] = '0';
+        }
+    }
+
+    while((len < precision) && (len < PRINTF_INTEGER_BUFFER_SIZE)) {
+        buf[len++] = '0';
+    }
+
+    if(base == BASE_OCTAL && (len > unpadded_len)) {
+        // Since we've written some zeros, we've satisfied the alternative format
+        // leading space requirement
+        flags &= ~FLAGS_HASH;
+    }
+
+    // handle hash
+    if(flags & (FLAGS_HASH | FLAGS_POINTER)) {
+        if(!(flags & FLAGS_PRECISION) && len && ((len == precision) || (len == width))) {
+            // Let's take back some padding digits to fit in what will eventually be
+            // the format-specific prefix
+            if(unpadded_len < len) {
+                len--;  // This should suffice for BASE_OCTAL
+            }
+            if(len && (base == BASE_HEX || base == BASE_BINARY) && (unpadded_len < len)) {
+                len--;  // ... and an extra one for 0x or 0b
+            }
+        }
+        if((base == BASE_HEX) && !(flags & FLAGS_UPPERCASE) &&
+           (len < PRINTF_INTEGER_BUFFER_SIZE)) {
+            buf[len++] = 'x';
+        } else if((base == BASE_HEX) && (flags & FLAGS_UPPERCASE) &&
+                  (len < PRINTF_INTEGER_BUFFER_SIZE)) {
+            buf[len++] = 'X';
+        } else if((base == BASE_BINARY) && (len < PRINTF_INTEGER_BUFFER_SIZE)) {
+            buf[len++] = 'b';
+        }
+        if(len < PRINTF_INTEGER_BUFFER_SIZE) {
+            buf[len++] = '0';
+        }
+    }
+
+    if(len < PRINTF_INTEGER_BUFFER_SIZE) {
+        if(negative) {
+            buf[len++] = '-';
+        } else if(flags & FLAGS_PLUS) {
+            buf[len++] = '+';  // ignore the space if the '+' exists
+        } else if(flags & FLAGS_SPACE) {
+            buf[len++] = ' ';
+        }
+    }
+
+    out_rev_(output, buf, len, width, flags);
+}
+
+// An internal itoa-like function
+static void
+print_integer(output_t *output, printf_unsigned_value_t value, bool negative,
+              numeric_base_t base, size_t precision, size_t width, printf_flags_t flags) {
+    char buf[PRINTF_INTEGER_BUFFER_SIZE];
+    size_t len = 0U;
+
+    if(!value) {
+        if(!(flags & FLAGS_PRECISION)) {
+            buf[len++] = '0';
+            flags &= ~FLAGS_HASH;
+            // We drop this flag this since either the alternative and regular modes
+            // of the specifier don't differ on 0 values, or (in the case of octal)
+            // we've already provided the special handling for this mode.
+        } else if(base == BASE_HEX) {
+            flags &= ~FLAGS_HASH;
+            // We drop this flag this since either the alternative and regular modes
+            // of the specifier don't differ on 0 values
+        }
+    } else {
+        do {
+            const char digit = (char)(value % base);
+            buf[len++] =
+                (char)(digit < 10 ? '0' + digit
+                                  : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10);
+            value /= base;
+        } while(value && (len < PRINTF_INTEGER_BUFFER_SIZE));
+    }
+
+    print_integer_finalization(output, buf, len, negative, base, precision, width, flags);
+}
+
+static void
+print_floating_point(output_t *output, double value, size_t precision,
+                     size_t width, printf_flags_t flags) {
+    if((flags & FLAGS_PLUS) && value > 0.0)
+        putchar_(output, '+');
+
+    // set default precision, if not set explicitly
+    //if(!(flags & FLAGS_PRECISION) || precision > PRINTF_DECIMAL_BUFFER_SIZE - 5)
+    //    precision = PRINTF_DEFAULT_FLOAT_PRECISION;
+
+    char buf[PRINTF_DECIMAL_BUFFER_SIZE];
+    unsigned len = dtoa(value, buf); // Fill the buffer (TODO: Consider precision)
+    out_(output, buf, len); // Print the buffer
+}
+
+// Advances the format pointer past the flags, and returns the parsed flags
+// due to the characters passed
+static printf_flags_t
+parse_flags(const char **format) {
+    printf_flags_t flags = 0U;
+    do {
+        switch(**format) {
+        case '0': flags |= FLAGS_ZEROPAD; break;
+        case '-': flags |= FLAGS_LEFT; break;
+        case '+': flags |= FLAGS_PLUS; break;
+        case ' ': flags |= FLAGS_SPACE; break;
+        case '#': flags |= FLAGS_HASH; break;
+        default: return flags;
+        }
+        (*format)++;
+    } while(true);
+}
+
+#define ADVANCE_IN_FORMAT_STRING(cptr_)                                 \
+    do {                                                                \
+        (cptr_)++;                                                      \
+        if(!*(cptr_))                                                   \
+            return;                                                     \
+    } while(0)
+
+static void
+format_string_loop(output_t *output, const char *format, va_list args) {
+    while(*format) {
+        if(*format != '%') {
+            // A regular content character
+            putchar_(output, *format);
+            format++;
+            continue;
+        }
+        // We're parsing a format specifier: %[flags][width][.precision][length]
+        ADVANCE_IN_FORMAT_STRING(format);
+
+        printf_flags_t flags = parse_flags(&format);
+
+        // evaluate width field
+        size_t width = 0U;
+        if(is_digit_(*format)) {
+            width = atou_(&format);
+        } else if(*format == '*') {
+            const int w = va_arg(args, int);
+            if(w < 0) {
+                flags |= FLAGS_LEFT;  // reverse padding
+                width = (size_t)-w;
+            } else {
+                width = (size_t)w;
+            }
+            ADVANCE_IN_FORMAT_STRING(format);
+        }
+
+        // evaluate precision field
+        size_t precision = 0U;
+        if(*format == '.') {
+            flags |= FLAGS_PRECISION;
+            ADVANCE_IN_FORMAT_STRING(format);
+            if(is_digit_(*format)) {
+                precision = atou_(&format);
+            } else if(*format == '*') {
+                const int precision_ = va_arg(args, int);
+                precision = precision_ > 0 ? (size_t)precision_ : 0U;
+                ADVANCE_IN_FORMAT_STRING(format);
+            }
+        }
+
+        // evaluate length field
+        switch(*format) {
+            case 'l':
+                flags |= FLAGS_LONG;
+                ADVANCE_IN_FORMAT_STRING(format);
+                if(*format == 'l') {
+                    flags |= FLAGS_LONG_LONG;
+                    ADVANCE_IN_FORMAT_STRING(format);
+                }
+                break;
+            case 'h':
+                flags |= FLAGS_SHORT;
+                ADVANCE_IN_FORMAT_STRING(format);
+                if(*format == 'h') {
+                    flags |= FLAGS_CHAR;
+                    ADVANCE_IN_FORMAT_STRING(format);
+                }
+                break;
+            case 't':
+                flags |=
+                    (sizeof(ptrdiff_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG);
+                ADVANCE_IN_FORMAT_STRING(format);
+                break;
+            case 'j':
+                flags |=
+                    (sizeof(intmax_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG);
+                ADVANCE_IN_FORMAT_STRING(format);
+                break;
+            case 'z':
+                flags |= (sizeof(size_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG);
+                ADVANCE_IN_FORMAT_STRING(format);
+                break;
+            default:
+                break;
+        }
+
+        // evaluate specifier
+        switch(*format) {
+            case 'd':
+            case 'i':
+            case 'u':
+            case 'x':
+            case 'X':
+            case 'o':
+            case 'b': {
+                if(*format == 'd' || *format == 'i') {
+                    flags |= FLAGS_SIGNED;
+                }
+
+                numeric_base_t base;
+                if(*format == 'x' || *format == 'X') {
+                    base = BASE_HEX;
+                } else if(*format == 'o') {
+                    base = BASE_OCTAL;
+                } else if(*format == 'b') {
+                    base = BASE_BINARY;
+                } else {
+                    base = BASE_DECIMAL;
+                    flags &=
+                        ~FLAGS_HASH;  // decimal integers have no alternative presentation
+                }
+
+                if(*format == 'X') {
+                    flags |= FLAGS_UPPERCASE;
+                }
+
+                format++;
+                // ignore '0' flag when precision is given
+                if(flags & FLAGS_PRECISION) {
+                    flags &= ~FLAGS_ZEROPAD;
+                }
+
+                if(flags & FLAGS_SIGNED) {
+                    // A signed specifier: d, i or possibly I + bit size if enabled
+                    if(flags & FLAGS_LONG_LONG) {
+                        const long long value = va_arg(args, long long);
+                        print_integer(output, ABS_FOR_PRINTING(value), value < 0, base,
+                                      precision, width, flags);
+                    } else if(flags & FLAGS_LONG) {
+                        const long value = va_arg(args, long);
+                        print_integer(output, ABS_FOR_PRINTING(value), value < 0, base,
+                                      precision, width, flags);
+                    } else {
+                        // We never try to interpret the argument as something
+                        // potentially-smaller than int, due to integer promotion rules:
+                        // Even if the user passed a short int, short unsigned etc. -
+                        // these will come in after promotion, as int's (or unsigned for
+                        // the case of short unsigned when it has the same size as int)
+                        const int value =
+                            (flags & FLAGS_CHAR)    ? (signed char)va_arg(args, int)
+                            : (flags & FLAGS_SHORT) ? (short int)va_arg(args, int)
+                                                    : va_arg(args, int);
+                        print_integer(output, ABS_FOR_PRINTING(value), value < 0, base,
+                                      precision, width, flags);
+                    }
+                } else {
+                    // An unsigned specifier: u, x, X, o, b
+                    flags &= ~(FLAGS_PLUS | FLAGS_SPACE);
+
+                    if(flags & FLAGS_LONG_LONG) {
+                        print_integer(output, (printf_unsigned_value_t)
+                                      va_arg(args, unsigned long long),
+                                      false, base, precision, width, flags);
+                    } else if(flags & FLAGS_LONG) {
+                        print_integer(output, (printf_unsigned_value_t)
+                                      va_arg(args, unsigned long),
+                                      false, base, precision, width, flags);
+                    } else {
+                        const unsigned int value = (flags & FLAGS_CHAR)
+                            ? (unsigned char)va_arg(args, unsigned int)
+                            : (flags & FLAGS_SHORT)
+                            ? (unsigned short int)va_arg(args, unsigned int)
+                            : va_arg(args, unsigned int);
+                        print_integer(output, (printf_unsigned_value_t)value, false, base,
+                                      precision, width, flags);
+                    }
+                }
+                break;
+            }
+
+            case 'f':
+            case 'F':
+                if(*format == 'F')
+                    flags |= FLAGS_UPPERCASE;
+                print_floating_point(output, (double)va_arg(args, double),
+                                     precision, width, flags);
+                format++;
+                break;
+
+            case 'c': {
+                size_t l = 1U;
+                // pre padding
+                if(!(flags & FLAGS_LEFT)) {
+                    while(l++ < width) {
+                        putchar_(output, ' ');
+                    }
+                }
+                // char output
+                putchar_(output, (char)va_arg(args, int));
+                // post padding
+                if(flags & FLAGS_LEFT) {
+                    while(l++ < width) {
+                        putchar_(output, ' ');
+                    }
+                }
+                format++;
+                break;
+            }
+
+            case 's': {
+                const char *p = va_arg(args, char *);
+                if(p == NULL) {
+                    out_rev_(output, ")llun(", 6, width, flags);
+                } else {
+                    // string length
+                    size_t l = strnlen_s_(p, precision ? precision : INT32_MAX);
+                    if(flags & FLAGS_PRECISION) {
+                        l = (l < precision ? l : precision);
+                    }
+
+                    // pre padding
+                    if(!(flags & FLAGS_LEFT)) {
+                        for(size_t i = 0; l + i < width; i++) {
+                            putchar_(output, ' ');
+                        }
+                    }
+
+                    // string output
+                    out_(output, p, l);
+
+                    // post padding
+                    if(flags & FLAGS_LEFT) {
+                        for(size_t i = 0; l + i < width; i++) {
+                            putchar_(output, ' ');
+                        }
+                    }
+                }
+                format++;
+                break;
+            }
+
+            case 'p': {
+                width =
+                    sizeof(void *) * 2U + 2;  // 2 hex chars per byte + the "0x" prefix
+                flags |= FLAGS_ZEROPAD | FLAGS_POINTER;
+                uintptr_t value = (uintptr_t)va_arg(args, void *);
+                (value == (uintptr_t)NULL)
+                    ? out_rev_(output, ")lin(", 5, width, flags)
+                    : print_integer(output, (printf_unsigned_value_t)value, false,
+                                    BASE_HEX, precision, width, flags);
+                format++;
+                break;
+            }
+
+            case '%':
+                putchar_(output, '%');
+                format++;
+                break;
+
+            default:
+                putchar_(output, *format);
+                format++;
+                break;
+        }
+    }
+}
+
+int
+mp_vsnprintf(char *s, size_t n, const char *format, va_list arg) {
+    // Check that the inputs are sane
+    if(!s || n < 1)
+        return -1;
+
+    // Format the string
+    output_t out = {s, 0, n};
+    format_string_loop(&out, format, arg);
+
+    // Write the string-terminating '\0' character
+    size_t null_char_pos = out.pos < out.max_chars ? out.pos : out.max_chars - 1;
+    out.buffer[null_char_pos] = '\0';
+
+    // Return written chars without terminating \0
+    return (int)out.pos;
+}
+
+int
+mp_snprintf(char *s, size_t n, const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    const int ret = mp_vsnprintf(s, n, format, args);
+    va_end(args);
+    return ret;
+}
diff --git a/deps/mp_printf.h b/deps/mp_printf.h
new file mode 100644
index 00000000000..e473de9f650
--- /dev/null
+++ b/deps/mp_printf.h
@@ -0,0 +1,90 @@
+/**
+ * @author (c) Eyal Rozenberg <eyalroz1@gmx.com>
+ *             2021-2023, Haifa, Palestine/Israel
+ * @author (c) Marco Paland (info@paland.com)
+ *             2014-2019, PALANDesign Hannover, Germany
+ *
+ * @note Others have made smaller contributions to this file: see the
+ * contributors page at https://github.com/eyalroz/printf/graphs/contributors
+ * or ask one of the authors.
+ *
+ * @brief Small stand-alone implementation of the printf family of functions
+ * (`(v)printf`, `(v)s(n)printf` etc., geared towards use on embedded systems with
+ * a very limited resources.
+ *
+ * @note the implementations are thread-safe; re-entrant; use no functions from
+ * the standard library; and do not dynamically allocate any memory.
+ *
+ * @license The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MP_PRINTF_H
+#define MP_PRINTF_H
+
+#include <stdarg.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __GNUC__
+# if ((__GNUC__ == 4 && __GNUC_MINOR__>= 4) || __GNUC__ > 4)
+#  define ATTR_PRINTF(one_based_format_index, first_arg) \
+__attribute__((format(gnu_printf, (one_based_format_index), (first_arg))))
+# else
+# define ATTR_PRINTF(one_based_format_index, first_arg) \
+__attribute__((format(printf, (one_based_format_index), (first_arg))))
+# endif
+# define ATTR_VPRINTF(one_based_format_index) ATTR_PRINTF((one_based_format_index), 0)
+#else
+# define ATTR_PRINTF(one_based_format_index, first_arg)
+# define ATTR_VPRINTF(one_based_format_index)
+#endif
+
+/**
+ * An implementation of the C standard's snprintf/vsnprintf
+ *
+ * @param s An array in which to store the formatted string. It must be large
+ * enough to fit either the entire formatted output, or at least @p n
+ * characters. Alternatively, it can be NULL, in which case nothing will be
+ * printed, and only the number of characters which _could_ have been printed is
+ * tallied and returned.
+ * @param n The maximum number of characters to write to the array, including a
+ * terminating null character
+ * @param format A string specifying the format of the output, with %-marked
+ * specifiers of how to interpret additional arguments.
+ * @param arg Additional arguments to the function, one for each specifier in @p
+ * format
+ * @return The number of characters that COULD have been written into @p s, not
+ * counting the terminating null character. A value equal or larger than @p n
+ * indicates truncation. Only when the returned value is non-negative and less
+ * than @p n, the null-terminated string has been fully and successfully
+ * printed.
+ */
+int  mp_snprintf(char* s, size_t count, const char* format, ...) ATTR_PRINTF(3, 4);
+int mp_vsnprintf(char* s, size_t count, const char* format, va_list arg) ATTR_VPRINTF(3);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // MP_PRINTF_H

From d908c2c1683bb8150317a8ec1d57822f9ae818cd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 9 Jul 2023 14:46:03 +0200
Subject: [PATCH 1074/1963] refactor(core): Use mp_printf everywhere

---
 CMakeLists.txt                               |  4 ++++
 arch/eCos/ua_architecture.h                  |  1 -
 arch/eventloop_posix.h                       |  3 ++-
 arch/eventloop_posix_eth.c                   |  4 ++--
 arch/eventloop_posix_tcp.c                   |  4 ++--
 arch/eventloop_posix_udp.c                   |  4 ++--
 arch/posix/ua_architecture.h                 |  2 --
 arch/vxworks/ua_architecture.h               |  2 --
 arch/wec7/ua_architecture.h                  |  1 -
 arch/win32/ua_architecture.h                 |  6 ------
 plugins/ua_config_default.c                  | 10 +++++-----
 src/pubsub/ua_pubsub_reader.c                |  2 +-
 src/server/ua_server_discovery_mdns.c        |  7 +++++--
 src/server/ua_services_discovery_multicast.c | 10 ++++++----
 src/ua_types_encoding_json.c                 |  8 ++++----
 src/ua_types_encoding_xml.c                  |  5 +++--
 tests/check_types_builtin_json.c             |  6 +++---
 tests/pubsub/check_pubsub_udp_unicast.c      |  5 +++--
 18 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62967c63f8e..e652b6f1675 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -870,6 +870,8 @@ set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                      ${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
                      ${PROJECT_SOURCE_DIR}/deps/libc_time.h
                      ${PROJECT_SOURCE_DIR}/deps/base64.h
+                     ${PROJECT_SOURCE_DIR}/deps/dtoa.h
+                     ${PROJECT_SOURCE_DIR}/deps/mp_printf.h
                      ${PROJECT_SOURCE_DIR}/deps/itoa.h
                      ${PROJECT_SOURCE_DIR}/deps/ziptree.h
                      ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.h
@@ -943,6 +945,8 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/deps/libc_time.c
                 ${PROJECT_SOURCE_DIR}/deps/pcg_basic.c
                 ${PROJECT_SOURCE_DIR}/deps/base64.c
+                ${PROJECT_SOURCE_DIR}/deps/dtoa.c
+                ${PROJECT_SOURCE_DIR}/deps/mp_printf.c
                 ${PROJECT_SOURCE_DIR}/deps/itoa.c
                 ${PROJECT_SOURCE_DIR}/deps/ziptree.c
 
diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
index 24881248a9b..72cd8bbef87 100644
--- a/arch/eCos/ua_architecture.h
+++ b/arch/eCos/ua_architecture.h
@@ -73,7 +73,6 @@ int gethostname_ecos(char* name, size_t len);
 #define UA_calloc calloc
 #define UA_realloc realloc
 
-#define UA_snprintf snprintf
 #define UA_strncasecmp strncasecmp
 
 #define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 421470e4190..4c296b29e95 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -22,7 +22,8 @@
 #endif
 
 #include "common/ua_timer.h"
-#include "open62541_queue.h"
+#include "../deps/mp_printf.h"
+#include "../deps/open62541_queue.h"
 
 /* epoll_pwait returns bogus data with the tc compiler */
 #if defined(__linux__) && !defined(__TINYC__)
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 3f7e3c403bb..e06c0e4bdde 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -105,8 +105,8 @@ isMulticastEthAddress(const UA_Byte *address) {
 
 static void
 setAddrString(unsigned char addrStr[18], unsigned char addr[ETHER_ADDR_LEN]) {
-    snprintf((char*)addrStr, 18, "%02x-%02x-%02x-%02x-%02x-%02x",
-             addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+    mp_snprintf((char*)addrStr, 18, "%02x-%02x-%02x-%02x-%02x-%02x",
+                addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
 }
 
 /* Return zero if parsing failed */
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index e372c32768d..bbdc8a532d0 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -511,7 +511,7 @@ TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
 
     /* Create a string for the port */
     char portstr[6];
-    UA_snprintf(portstr, sizeof(portstr), "%d", port);
+    mp_snprintf(portstr, sizeof(portstr), "%d", port);
 
     /* Get all the interface and IPv4/6 combinations for the configured hostname */
     struct addrinfo hints, *res;
@@ -730,7 +730,7 @@ TCP_openActiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *p
         UA_KeyValueMap_getScalar(params, TCPConfigParameters[TCP_PARAMINDEX_PORT].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
     UA_assert(port); /* existence is checked before */
-    UA_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
+    mp_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
 
     /* Prepare the hostname string */
     const UA_String *addr = (const UA_String*)
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 18263d0cbf4..be8388d37d2 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -81,7 +81,7 @@ getHostAndPortFromParams(const UA_KeyValueMap *params,
         UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_PORT].name,
                                  &UA_TYPES[UA_TYPES_UINT16]);
     UA_assert(port); /* checked before */
-    UA_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
+    mp_snprintf(portStr, UA_MAXPORTSTR_LENGTH, "%d", *port);
 
     /* Prepare the hostname string */
     const UA_String *host = (const UA_String*)
@@ -809,7 +809,7 @@ UDP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
 
     /* Set up the port string */
     char portstr[6];
-    UA_snprintf(portstr, 6, "%d", port);
+    mp_snprintf(portstr, 6, "%d", port);
 
     int retcode = getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 57d40a46ea9..28b04c2c16b 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -102,9 +102,7 @@ void UA_sleep_ms(unsigned long ms);
 # define UA_if_nametoindex if_nametoindex
 #endif
 
-#include <stdio.h>
 #include <strings.h>
-#define UA_snprintf snprintf
 #define UA_strncasecmp strncasecmp
 
 #define UA_clean_errno(STR_FUN) (errno == 0 ? (char*) "None" : (STR_FUN)(errno))
diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
index a2a1bea7ace..e7fb651acba 100644
--- a/arch/vxworks/ua_architecture.h
+++ b/arch/vxworks/ua_architecture.h
@@ -101,8 +101,6 @@
 #define UA_calloc calloc
 #define UA_realloc realloc
 
-#include <stdio.h>
-#define UA_snprintf snprintf
 #define UA_strncasecmp strncasecmp
 
 #define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
index 406bd04e3f6..a6ceb5d6167 100644
--- a/arch/wec7/ua_architecture.h
+++ b/arch/wec7/ua_architecture.h
@@ -123,7 +123,6 @@ typedef struct pollfd {
 #define UA_realloc realloc
 #endif
 
-#define UA_snprintf(source, size, string, ...) _snprintf_s(source, size, _TRUNCATE, string, __VA_ARGS__)
 #define UA_strncasecmp _strnicmp
 
 #define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index a63a12f337f..5534fd494f2 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -130,12 +130,6 @@ void UA_sleep_ms(unsigned long ms);
 # undef maxStringLength
 #endif
 
-#ifdef __CODEGEARC__
-#define _snprintf_s(a,b,c,...) snprintf(a,b,__VA_ARGS__)
-#endif
-
-/* 3rd Argument is the string */
-#define UA_snprintf(source, size, ...) _snprintf_s(source, size, _TRUNCATE, __VA_ARGS__)
 #define UA_strncasecmp _strnicmp
 
 #define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index aab79712587..3f56a575e5a 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -22,7 +22,7 @@
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 
-#include <stdio.h> /* For printf */
+#include "../deps/mp_printf.h"
 
 #ifdef _WIN32
 # include <winsock2.h>
@@ -401,8 +401,8 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         /* 1) Listen on all interfaces (also external). This must be the first
          * entry if this is desired. Otherwise some interfaces may be blocked
          * (already in use) with a hostname that is only locally reachable.*/
-        snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
-                 "opc.tcp://:%u", portNumber);
+        mp_snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
+                    "opc.tcp://:%u", portNumber);
         serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[0]);
         serverUrlsSize++;
 
@@ -418,8 +418,8 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 #endif
 
         if(err == 0) {
-            snprintf(serverUrlBuffer[1], sizeof(serverUrlBuffer[1]),
-                     "opc.tcp://%s:%u", hostnamestr, portNumber);
+            mp_snprintf(serverUrlBuffer[1], sizeof(serverUrlBuffer[1]),
+                        "opc.tcp://%s:%u", hostnamestr, portNumber);
             serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[1]);
             serverUrlsSize++;
         }
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 11d924211ba..85c27834f0f 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -724,7 +724,7 @@ UA_Server_DataSetReader_createDataSetMirror(UA_Server *server, UA_String *parent
             vAttr.displayName.text = pDataSetReader->config.dataSetMetaData.fields[i].name;
             if(pDataSetReader->config.dataSetMetaData.fields[i].name.length < slen) {
                 slen = (UA_UInt16)pDataSetReader->config.dataSetMetaData.fields[i].name.length;
-                UA_snprintf(szTmpName, sizeof(szTmpName), "%.*s", (int)slen,
+                mp_snprintf(szTmpName, sizeof(szTmpName), "%.*s", (int)slen,
                             (const char*)pDataSetReader->config.dataSetMetaData.fields[i].name.data);
             }
 
diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_server_discovery_mdns.c
index 94b9d4bde4b..075b0225a5f 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_server_discovery_mdns.c
@@ -16,6 +16,8 @@
 #include "mdnsd/libmdnsd/sdtxt.h"
 #endif
 
+#include "../deps/mp_printf.h"
+
 #ifdef _WIN32
 /* inet_ntoa is deprecated on MSVC but used for compatibility */
 # define _WINSOCK_DEPRECATED_NO_WARNINGS
@@ -321,8 +323,9 @@ setSrv(UA_DiscoveryManager *dm, const struct resource *r,
                      "Cannot allocate char for discovery url. Out of memory.");
         return;
     }
-    UA_snprintf(newUrl, 10 + srvNameLen + 8, "opc.tcp://%.*s:%d", (int) srvNameLen,
-             r->known.srv.name, r->known.srv.port);
+
+    mp_snprintf(newUrl, 10 + srvNameLen + 8, "opc.tcp://%.*s:%d", (int) srvNameLen,
+                r->known.srv.name, r->known.srv.port);
 
     entry->serverOnNetwork.discoveryUrl = UA_String_fromChars(newUrl);
     UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_SERVER,
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index c5eb41d5981..7716e80262f 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -10,6 +10,8 @@
 #include "ua_discovery_manager.h"
 #include "ua_services.h"
 
+#include "../deps/mp_printf.h"
+
 #if defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST)
 
 #ifdef _WIN32
@@ -579,7 +581,7 @@ createFullServiceDomain(char *outServiceDomain, size_t maxLen,
 
     size_t offset = 0;
     if(hostnameLen > 0) {
-        UA_snprintf(outServiceDomain, maxLen + 1, "%.*s-%.*s",
+        mp_snprintf(outServiceDomain, maxLen + 1, "%.*s-%.*s",
                     (int) servernameLen, (char *) servername->data,
                     (int) hostnameLen, (char *) hostname->data);
         offset = servernameLen + hostnameLen + 1;
@@ -589,11 +591,11 @@ createFullServiceDomain(char *outServiceDomain, size_t maxLen,
                 outServiceDomain[i] = '-';
         }
     } else {
-        UA_snprintf(outServiceDomain, maxLen + 1, "%.*s",
+        mp_snprintf(outServiceDomain, maxLen + 1, "%.*s",
                     (int) servernameLen, (char *) servername->data);
         offset = servernameLen;
     }
-    UA_snprintf(&outServiceDomain[offset], 24, "._opcua-tcp._tcp.local.");
+    mp_snprintf(&outServiceDomain[offset], 24, "._opcua-tcp._tcp.local.");
 }
 
 /* Check if mDNS already has an entry for given hostname and port combination */
@@ -736,7 +738,7 @@ UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
         listEntry->txtSet = true;
 
         UA_STACKARRAY(char, newUrl, 10 + hostnameLen + 8 + path->length + 1);
-        UA_snprintf(newUrl, 10 + hostnameLen + 8 + path->length + 1,
+        mp_snprintf(newUrl, 10 + hostnameLen + 8 + path->length + 1,
                     "opc.tcp://%.*s:%d%s%.*s", (int) hostnameLen,
                     hostname->data, port, path->length > 0 ? "/" : "",
                     (int) path->length, path->data);
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 5ef523dfb5a..e2670744fb9 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -16,12 +16,12 @@
 
 #include <float.h>
 #include <math.h>
-#include <stdio.h> /* for snprintf */
 
 #include "../deps/itoa.h"
 #include "../deps/parse_num.h"
 #include "../deps/base64.h"
 #include "../deps/libc_time.h"
+#include "../deps/mp_printf.h"
 
 #ifndef UA_ENABLE_PARSING
 #error UA_ENABLE_PARSING required for JSON encoding
@@ -403,7 +403,7 @@ ENCODE_JSON(Float) {
     } else if(*src == -INFINITY) {
         strcpy(buffer, "\"-Infinity\"");
     } else {
-        snprintf(buffer, 200, "%.149g", (UA_Double)*src);
+        mp_snprintf(buffer, 200, "%.149f", (UA_Double)*src);
     }
 
     size_t len = strlen(buffer);
@@ -428,7 +428,7 @@ ENCODE_JSON(Double) {
     } else if(*src == -INFINITY) {
         strcpy(buffer, "\"-Infinity\"");
     } else {
-        snprintf(buffer, 2000, "%.1074g", *src);
+        mp_snprintf(buffer, 2000, "%.1074f", *src);
     }
 
     size_t len = strlen(buffer);
@@ -1646,7 +1646,7 @@ DECODE_JSON(Double) {
      * Maximum digit counts for select IEEE floating-point formats: 1074
      * Sanity check.
      */
-    if(tokenSize > 1075)
+    if(tokenSize > 2000)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     cj5_token_type tokenType = currentTokenType(ctx);
diff --git a/src/ua_types_encoding_xml.c b/src/ua_types_encoding_xml.c
index d0b80e8710d..fd66696b9cc 100644
--- a/src/ua_types_encoding_xml.c
+++ b/src/ua_types_encoding_xml.c
@@ -11,6 +11,7 @@
 #include "../deps/itoa.h"
 #include "../deps/parse_num.h"
 #include "../deps/libc_time.h"
+#include "../deps/mp_printf.h"
 
 #ifndef UA_ENABLE_PARSING
 #error UA_ENABLE_PARSING required for XML encoding
@@ -126,7 +127,7 @@ ENCODE_XML(Float) {
         /* https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
          * Maximum digit counts for float: 149
          */
-        UA_snprintf(buffer, 200, "%.149g", (UA_Double)*src);
+        mp_snprintf(buffer, 200, "%.149g", (UA_Double)*src);
     }
 
     size_t len = strlen(buffer);
@@ -149,7 +150,7 @@ ENCODE_XML(Double) {
         /* https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
          * Maximum digit counts for double: 1074
          */
-        UA_snprintf(buffer, 2000, "%.1074g", *src);
+        mp_snprintf(buffer, 2000, "%.1074g", *src);
     }
 
     size_t len = strlen(buffer);
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index 0d546d307b1..ccb0b4c6e54 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -840,7 +840,7 @@ START_TEST(UA_Double_pluszero_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    char* result = "0";
+    char* result = "0.0";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
@@ -859,7 +859,7 @@ START_TEST(UA_Double_minuszero_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    char* result = "0";
+    char* result = "0.0";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
@@ -954,7 +954,7 @@ START_TEST(UA_Float_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    char* result = "1";
+    char* result = "1.0";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
index fbd0d600e8e..573cddf8b3c 100644
--- a/tests/pubsub/check_pubsub_udp_unicast.c
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -10,6 +10,7 @@
 #include <check.h>
 #include <time.h>
 
+#include "../../deps/mp_printf.h"
 #include "testing_clock.h"
 #include "open62541/types_generated_handling.h"
 #include "ua_pubsub.h"
@@ -85,7 +86,7 @@ addUDPConnection(UA_Server *server, const char *host, UA_Int16 portNumber,
     connectionConfig.name = UA_STRING("UADP Test Connection");
     char address[STR_BUFSIZE];
     memset(&address, 0, sizeof(address));
-    snprintf(address, STR_BUFSIZE, "opc.udp://%s:%d", host, portNumber);
+    mp_snprintf(address, STR_BUFSIZE, "opc.udp://%s:%d", host, portNumber);
     UA_NetworkAddressUrlDataType networkAddressUrl =
         {UA_STRING_NULL, UA_STRING(address)};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
@@ -142,7 +143,7 @@ setupWrittenData(UA_Server *server, UA_NodeId connectionId, UA_NodeId publishedD
                  const char *dstHost, UA_UInt16 dstPort) {
     char dstAddress[STR_BUFSIZE];
     memset(&dstAddress, 0, sizeof(dstAddress));
-    snprintf(dstAddress, STR_BUFSIZE, "opc.udp://%s:%d", dstHost, dstPort);
+    mp_snprintf(dstAddress, STR_BUFSIZE, "opc.udp://%s:%d", dstHost, dstPort);
 
     UA_NodeId writerGroup;
     UA_NodeId dataSetWriter;

From a220aed61fc7a5cf6c5bcb31c8b1fcbe0fb7092c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 11 Jul 2023 14:17:21 +0200
Subject: [PATCH 1075/1963] fix(deps): Fix number parsing in parse_num.c for
 e^-324

---
 deps/parse_num.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/parse_num.c b/deps/parse_num.c
index 0ea7a7d6b09..acb64ca1b87 100644
--- a/deps/parse_num.c
+++ b/deps/parse_num.c
@@ -112,7 +112,7 @@ size_t parseDouble(const char *str, size_t size, double *result) {
     errno = 0;
     char *endptr;
     *result = strtod(str, &endptr);
-    if(errno != 0)
+    if(errno != 0 && errno != ERANGE)
         return 0;
     return (uintptr_t)endptr - (uintptr_t)str;
 }

From d856796f33fe6a87ef60013cec171f1727126230 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 11 Jul 2023 11:38:47 +0200
Subject: [PATCH 1076/1963] refactor(core): Use deps/dtoa for float printing

---
 src/ua_types_encoding_json.c     | 42 ++++++++++----------------------
 src/ua_types_encoding_xml.c      | 34 ++++++++++----------------
 tests/check_types_builtin_json.c |  6 ++---
 tests/check_types_builtin_xml.c  | 10 ++++----
 4 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index e2670744fb9..a80db9f8519 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -18,10 +18,10 @@
 #include <math.h>
 
 #include "../deps/itoa.h"
+#include "../deps/dtoa.h"
 #include "../deps/parse_num.h"
 #include "../deps/base64.h"
 #include "../deps/libc_time.h"
-#include "../deps/mp_printf.h"
 
 #ifndef UA_ENABLE_PARSING
 #error UA_ENABLE_PARSING required for JSON encoding
@@ -47,22 +47,6 @@
 /* Have some slack at the end. E.g. for negative and very long years. */
 #define UA_JSON_DATETIME_LENGTH 40
 
-/* Max length of numbers for the allocation of temp buffers. Don't forget that
- * printf adds an additional \0 at the end!
- *
- * Sources:
- * https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
- *
- * UInt16: 3 + 1
- * SByte: 3 + 1
- * UInt32:
- * Int32:
- * UInt64:
- * Int64:
- * Float: 149 + 1
- * Double: 767 + 1
- */
-
 /************/
 /* Encoding */
 /************/
@@ -395,21 +379,21 @@ ENCODE_JSON(Int64) {
 }
 
 ENCODE_JSON(Float) {
-    char buffer[200];
+    char buffer[32];
+    size_t len;
     if(*src != *src) {
         strcpy(buffer, "\"NaN\"");
+        len = strlen(buffer);
     } else if(*src == INFINITY) {
         strcpy(buffer, "\"Infinity\"");
+        len = strlen(buffer);
     } else if(*src == -INFINITY) {
         strcpy(buffer, "\"-Infinity\"");
+        len = strlen(buffer);
     } else {
-        mp_snprintf(buffer, 200, "%.149f", (UA_Double)*src);
+        len = dtoa((UA_Double)*src, buffer);
     }
 
-    size_t len = strlen(buffer);
-    if(len == 0)
-        return UA_STATUSCODE_BADENCODINGERROR;
-
     if(ctx->pos + len > ctx->end)
         return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
 
@@ -420,21 +404,21 @@ ENCODE_JSON(Float) {
 }
 
 ENCODE_JSON(Double) {
-    char buffer[2000];
+    char buffer[32];
+    size_t len;
     if(*src != *src) {
         strcpy(buffer, "\"NaN\"");
+        len = strlen(buffer);
     } else if(*src == INFINITY) {
         strcpy(buffer, "\"Infinity\"");
+        len = strlen(buffer);
     } else if(*src == -INFINITY) {
         strcpy(buffer, "\"-Infinity\"");
+        len = strlen(buffer);
     } else {
-        mp_snprintf(buffer, 2000, "%.1074f", *src);
+        len = dtoa(*src, buffer);
     }
 
-    size_t len = strlen(buffer);
-    if(len == 0)
-        return UA_STATUSCODE_BADENCODINGERROR;
-
     if(ctx->pos + len > ctx->end)
         return UA_STATUSCODE_BADENCODINGLIMITSEXCEEDED;
 
diff --git a/src/ua_types_encoding_xml.c b/src/ua_types_encoding_xml.c
index fd66696b9cc..f0e1028c319 100644
--- a/src/ua_types_encoding_xml.c
+++ b/src/ua_types_encoding_xml.c
@@ -11,7 +11,7 @@
 #include "../deps/itoa.h"
 #include "../deps/parse_num.h"
 #include "../deps/libc_time.h"
-#include "../deps/mp_printf.h"
+#include "../deps/dtoa.h"
 
 #ifndef UA_ENABLE_PARSING
 #error UA_ENABLE_PARSING required for XML encoding
@@ -116,47 +116,39 @@ ENCODE_XML(UInt64) {
 
 /* Float */
 ENCODE_XML(Float) {
-    char buffer[200];
+    char buffer[32];
+    size_t len;
     if(*src != *src) {
         strcpy(buffer, "NaN");
+        len = strlen(buffer);
     } else if(*src == INFINITY) {
         strcpy(buffer, "INF");
+        len = strlen(buffer);
     } else if(*src == -INFINITY) {
         strcpy(buffer, "-INF");
+        len = strlen(buffer);
     } else {
-        /* https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
-         * Maximum digit counts for float: 149
-         */
-        mp_snprintf(buffer, 200, "%.149g", (UA_Double)*src);
+        len = dtoa((UA_Double)*src, buffer);
     }
-
-    size_t len = strlen(buffer);
-    if(len == 0)
-        return UA_STATUSCODE_BADENCODINGERROR;
-
     return xmlEncodeWriteChars(ctx, buffer, len);
 }
 
 /* Double */
 ENCODE_XML(Double) {
-    char buffer[2000];
+    char buffer[32];
+    size_t len;
     if(*src != *src) {
         strcpy(buffer, "NaN");
+        len = strlen(buffer);
     } else if(*src == INFINITY) {
         strcpy(buffer, "INF");
+        len = strlen(buffer);
     } else if(*src == -INFINITY) {
         strcpy(buffer, "-INF");
+        len = strlen(buffer);
     } else {
-        /* https://www.exploringbinary.com/maximum-number-of-decimal-digits-in-binary-floating-point-numbers/
-         * Maximum digit counts for double: 1074
-         */
-        mp_snprintf(buffer, 2000, "%.1074g", *src);
+        len = dtoa(*src, buffer);
     }
-
-    size_t len = strlen(buffer);
-    if(len == 0)
-        return UA_STATUSCODE_BADENCODINGERROR;
-
     return xmlEncodeWriteChars(ctx, buffer, len);
 }
 
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index ccb0b4c6e54..52d888ae562 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -821,7 +821,7 @@ START_TEST(UA_Double_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    char* result = "1.1233999999999999541699935434735380113124847412109375";
+    char* result = "1.1234";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
@@ -924,7 +924,7 @@ START_TEST(UA_Double_nan_json_encode) {
 END_TEST
 
 START_TEST(UA_Double_onesmallest_json_encode) {
-    UA_Double src = 1.0000000000000002220446049250313080847263336181640625;
+    UA_Double src = 1.0000000000000002;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_DOUBLE];
     size_t size = UA_calcSizeJson((void *) &src, type, NULL);
 
@@ -935,7 +935,7 @@ START_TEST(UA_Double_onesmallest_json_encode) {
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
     // then
-    char* result = "1.0000000000000002220446049250313080847263336181640625";
+    char* result = "1.0000000000000002";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
     UA_ByteString_clear(&buf);
diff --git a/tests/check_types_builtin_xml.c b/tests/check_types_builtin_xml.c
index 1a152f726ae..36e9d0754e1 100644
--- a/tests/check_types_builtin_xml.c
+++ b/tests/check_types_builtin_xml.c
@@ -638,7 +638,7 @@ START_TEST(UA_Float_xml_encode) {
     status s = UA_encodeXml(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    char* result = "1";
+    char* result = "1.0";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
 
@@ -658,7 +658,7 @@ START_TEST(UA_Double_xml_encode) {
     status s = UA_encodeXml(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    char* result = "1.1233999999999999541699935434735380113124847412109375";
+    char* result = "1.1234";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
 
@@ -677,7 +677,7 @@ START_TEST(UA_Double_pluszero_xml_encode) {
     status s = UA_encodeXml(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    char* result = "0";
+    char* result = "0.0";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
 
@@ -696,7 +696,7 @@ START_TEST(UA_Double_minuszero_xml_encode) {
     status s = UA_encodeXml(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    char* result = "0";
+    char* result = "0.0";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
 
@@ -772,7 +772,7 @@ START_TEST(UA_Double_onesmallest_xml_encode) {
     status s = UA_encodeXml(&src, type, &buf, NULL);
     ck_assert_int_eq(s, UA_STATUSCODE_GOOD);
 
-    char* result = "1.0000000000000002220446049250313080847263336181640625";
+    char* result = "1.0000000000000002";
     buf.data[size] = 0; /* zero terminate */
     ck_assert_str_eq(result, (char*)buf.data);
 

From f6c7467c16a628e8221198be8f9106e099e5c280 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 11 Jul 2023 14:18:11 +0200
Subject: [PATCH 1077/1963] refactor(tests): Small cleanup in
 check_types_builtin_json.c

---
 tests/check_types_builtin_json.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index 52d888ae562..bf5a1fcd9a4 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -1869,33 +1869,28 @@ START_TEST(UA_Variant_Double_json_encode) {
     for(size_t i = 0; i < 100; i++){
         d = nextafter(d,1);
 
-        UA_Variant *src = UA_Variant_new();
-        UA_Variant_init(src);
-        UA_Double *variantContent = UA_Double_new();
-        //*variantContent = 1.0000000000000002;
-        *variantContent = d;
-        UA_Variant_setScalar(src, variantContent, &UA_TYPES[UA_TYPES_DOUBLE]);
+        UA_Variant src;
+        UA_Variant_init(&src);
+        UA_Variant_setScalar(&src, &d, &UA_TYPES[UA_TYPES_DOUBLE]);
 
         const UA_DataType *type = &UA_TYPES[UA_TYPES_VARIANT];
-        size_t size = UA_calcSizeJson((void *) src, type, NULL);
+        size_t size = UA_calcSizeJson(&src, type, NULL);
 
         UA_ByteString buf;
         UA_ByteString_allocBuffer(&buf, size+1);
-
-        status retval = UA_encodeJson((void *) src, type, &buf, NULL);
+        status retval = UA_encodeJson(&src, type, &buf, NULL);
+        ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
         UA_Variant out;
         UA_Variant_init(&out);
-        retval |= UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
+        retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
         ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
-        UA_Double srcData = *((UA_Double*)src->data);
         UA_Double outData = *((UA_Double*)out.data);
-        ck_assert(memcmp(&srcData, &outData, sizeof(UA_Double)) == 0);
+        ck_assert(memcmp(&d, &outData, sizeof(UA_Double)) == 0);
 
         UA_ByteString_clear(&buf);
         UA_Variant_clear(&out);
-        UA_Variant_delete(src);
     }
 }
 END_TEST

From 8439c500aa3f14294748ef886c6e7c5580d0617a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Jul 2023 22:35:58 +0200
Subject: [PATCH 1078/1963] refactor(examples): Clean up arch-dependent API
 usage in examples

---
 examples/client_connect.c                     | 12 +++++-----
 examples/client_historical.c                  | 12 ++++++----
 examples/client_method_async.c                |  4 ++--
 examples/events/client_eventfilter.c          | 23 +++++++++++--------
 examples/events/server_random_events.c        | 17 ++------------
 examples/server_ctt.c                         | 20 ++++++++--------
 examples/server_inheritance.c                 |  5 ++--
 examples/server_mainloop.c                    | 18 +++------------
 examples/tutorial_client_events.c             | 11 ++++-----
 examples/tutorial_server_alarms_conditions.c  |  5 ++--
 examples/tutorial_server_datasource.c         |  5 ++--
 examples/tutorial_server_events.c             |  5 ++--
 examples/tutorial_server_firststeps.c         |  4 ++--
 examples/tutorial_server_historicaldata.c     |  2 +-
 .../tutorial_server_historicaldata_circular.c |  9 ++++----
 examples/tutorial_server_method.c             |  5 ++--
 examples/tutorial_server_method_async.c       |  5 ++--
 examples/tutorial_server_monitoreditems.c     | 10 ++++----
 examples/tutorial_server_object.c             |  5 ++--
 examples/tutorial_server_reverseconnect.c     | 20 +---------------
 examples/tutorial_server_variable.c           |  5 ++--
 examples/tutorial_server_variabletype.c       | 10 ++++----
 22 files changed, 84 insertions(+), 128 deletions(-)

diff --git a/examples/client_connect.c b/examples/client_connect.c
index 8fc9c5a3e31..2477374c84e 100644
--- a/examples/client_connect.c
+++ b/examples/client_connect.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
     /* At least one argument is required for the server uri */
     if(argc <= 1) {
         usage();
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     /* Parse the arguments */
@@ -44,7 +44,7 @@ int main(int argc, char *argv[]) {
         if(strcmp(argv[argpos], "--help") == 0 ||
            strcmp(argv[argpos], "-h") == 0) {
             usage();
-            return EXIT_SUCCESS;
+            return 0;
         }
 
         if(argpos + 1 == argc) {
@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
             argpos++;
             if(sscanf(argv[argpos], "%i", (int*)&securityMode) != 1) {
                 usage();
-                return EXIT_FAILURE;
+                return 0;
             }
             continue;
         }
@@ -112,7 +112,7 @@ int main(int argc, char *argv[]) {
         }
 #endif
         usage();
-        return EXIT_FAILURE;
+        return 0;
     }
 
     /* Create the server and set its config */
@@ -184,7 +184,7 @@ int main(int argc, char *argv[]) {
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Could not connect");
         UA_Client_delete(client);
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Connected!");
@@ -206,5 +206,5 @@ int main(int argc, char *argv[]) {
     /* Clean up */
     UA_Client_disconnect(client);
     UA_Client_delete(client);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/client_historical.c b/examples/client_historical.c
index 535d51b6967..7686dfff56d 100644
--- a/examples/client_historical.c
+++ b/examples/client_historical.c
@@ -150,7 +150,8 @@ int main(int argc, char *argv[]) {
     printf("\nStart historical read (1, \"myUintValue\"):\n");
     UA_NodeId node = UA_NODEID_STRING(2, "MyLevel");
     retval = UA_Client_HistoryRead_raw(client, &node, readHist,
-                                       UA_DateTime_fromUnixTime(0), UA_DateTime_now(), UA_STRING_NULL, false, 10, UA_TIMESTAMPSTORETURN_BOTH, (void *)UA_FALSE);
+                                       UA_DateTime_fromUnixTime(0), UA_DateTime_now(), UA_STRING_NULL,
+                                       false, 10, UA_TIMESTAMPSTORETURN_BOTH, (void *)UA_FALSE);
 
     if (retval != UA_STATUSCODE_GOOD) {
         printf("Failed. %s\n", UA_StatusCode_name(retval));
@@ -159,7 +160,8 @@ int main(int argc, char *argv[]) {
 #ifdef UA_ENABLE_EXPERIMENTAL_HISTORIZING
     printf("\nStart historical modified read (1, \"myUintValue\"):\n");
     retval = UA_Client_HistoryRead_modified(client, &node, readHist,
-                                       UA_DateTime_fromUnixTime(0), UA_DateTime_now(), UA_STRING_NULL, false, 10, UA_TIMESTAMPSTORETURN_BOTH, (void *)UA_FALSE);
+                                            UA_DateTime_fromUnixTime(0), UA_DateTime_now(), UA_STRING_NULL,
+                                            false, 10, UA_TIMESTAMPSTORETURN_BOTH, (void *)UA_FALSE);
 
     if (retval != UA_STATUSCODE_GOOD) {
         printf("Failed. %s\n", UA_StatusCode_name(retval));
@@ -170,13 +172,15 @@ int main(int argc, char *argv[]) {
     UA_EventFilter_init(&filter);
     UA_NodeId eventNode = UA_NODEID_NUMERIC(0, 2253);
     retval = UA_Client_HistoryRead_events(client, &eventNode, readHist,
-                                       UA_DateTime_fromUnixTime(0), UA_DateTime_now(), UA_STRING_NULL, filter, 10, UA_TIMESTAMPSTORETURN_BOTH, (void *)UA_FALSE);
+                                          UA_DateTime_fromUnixTime(0), UA_DateTime_now(), UA_STRING_NULL,
+                                          filter, 10, UA_TIMESTAMPSTORETURN_BOTH, (void *)UA_FALSE);
 
     if (retval != UA_STATUSCODE_GOOD) {
         printf("Failed. %s\n", UA_StatusCode_name(retval));
     }
 #endif
+
     UA_Client_disconnect(client);
     UA_Client_delete(client);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/client_method_async.c b/examples/client_method_async.c
index df15639002b..860586a66f4 100644
--- a/examples/client_method_async.c
+++ b/examples/client_method_async.c
@@ -221,7 +221,7 @@ main(int argc, char *argv[]) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                      "Not connected. Retrying to connect in 1 second");
         UA_Client_delete(client);
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     /* Endless loop runAsync */
@@ -232,5 +232,5 @@ main(int argc, char *argv[]) {
     /* Clean up */
     UA_Client_disconnect(client);
     UA_Client_delete(client);
-    return EXIT_SUCCESS;
+    return 0;
 }
diff --git a/examples/events/client_eventfilter.c b/examples/events/client_eventfilter.c
index b70202a6535..8eb66ef5a2f 100644
--- a/examples/events/client_eventfilter.c
+++ b/examples/events/client_eventfilter.c
@@ -377,7 +377,7 @@ int main(int argc, char *argv[]) {
 
     if(argc < 2) {
         printf("Usage: tutorial_client_event_filter <opc.tcp://server-url>\n");
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     UA_Client *client = UA_Client_new();
@@ -387,7 +387,7 @@ int main(int argc, char *argv[]) {
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Could not connect");
         UA_Client_delete(client);
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     /* Create a subscription */
@@ -397,8 +397,9 @@ int main(int argc, char *argv[]) {
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_Client_disconnect(client);
         UA_Client_delete(client);
-        return EXIT_FAILURE;
+        return 0;
     }
+
     UA_UInt32 subId = response.subscriptionId;
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Create subscription succeeded, id %u", subId);
 
@@ -423,7 +424,7 @@ int main(int argc, char *argv[]) {
     retval = setupWhereClauses(&filter.whereClause, 3, 4);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_Client_delete(client);
-        return EXIT_FAILURE;
+        return 0;
     }
 
     item.requestedParameters.filter.encoding = UA_EXTENSIONOBJECT_DECODED;
@@ -438,11 +439,13 @@ int main(int argc, char *argv[]) {
 
     if(result.statusCode != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                    "Could not add the MonitoredItem with %s", UA_StatusCode_name(result.statusCode));
+                    "Could not add the MonitoredItem with %s",
+                    UA_StatusCode_name(result.statusCode));
         goto cleanup;
     } else {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                    "Monitoring 'Root->Objects->Server', id %u", response.subscriptionId);
+                    "Monitoring 'Root->Objects->Server', id %u",
+                    response.subscriptionId);
     }
 
     monId = result.monitoredItemId;
@@ -454,10 +457,12 @@ int main(int argc, char *argv[]) {
 cleanup:
     UA_MonitoredItemCreateResult_clear(&result);
     UA_Client_Subscriptions_deleteSingle(client, response.subscriptionId);
-    UA_Array_delete(filter.selectClauses, SELECT_CLAUSE_FIELD_COUNT, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
-    UA_Array_delete(filter.whereClause.elements, filter.whereClause.elementsSize, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+    UA_Array_delete(filter.selectClauses, SELECT_CLAUSE_FIELD_COUNT,
+                    &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+    UA_Array_delete(filter.whereClause.elements, filter.whereClause.elementsSize,
+                    &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/events/server_random_events.c b/examples/events/server_random_events.c
index 9781a7400ae..d3ae32b5c25 100644
--- a/examples/events/server_random_events.c
+++ b/examples/events/server_random_events.c
@@ -16,13 +16,11 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include <signal.h>
 #include <stdlib.h>
 
 //If more sample events are needed, "addSampleEventTypes" and "setUpEvent" must be extended
 #define SAMPLE_EVENT_TYPES_COUNT 5
 
-static volatile UA_Boolean running = true;
 static UA_NodeId eventTypes[SAMPLE_EVENT_TYPES_COUNT];
 
 static UA_StatusCode
@@ -294,26 +292,15 @@ addGenerateSingleCustomizedEventMethod(UA_Server *server) {
                             1, &inputArgument, 0, NULL, NULL, NULL);
 }
 
-static void stopHandler(int sig) {
-    running = false;
-}
-
 int main(int argc, char *argv[]) {
-    /* default server values */
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
-    //setup events
     addSampleEventTypes(server);
     addGenerateSampleEventsMethod(server);
     addGenerateSingleRandomEventMethod(server);
     addGenerateSingleCustomizedEventMethod(server);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 9eaada1f708..8aaa549712c 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -218,8 +218,8 @@ readRandomStringData (UA_Server *server,
         value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
         return UA_STATUSCODE_GOOD;
     }
-    char randomName[12];
-    snprintf(randomName, 12, "Random%u", UA_UInt32_random());
+    char randomName[32];
+    sprintf(randomName, "Random%u", UA_UInt32_random());
     UA_String toggle = UA_STRING(randomName);
     UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_STRING]);
     value->hasValue = true;
@@ -282,8 +282,8 @@ readByteString (UA_Server *server,
         value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
         return UA_STATUSCODE_GOOD;
     }
-    char randomName[8];
-    snprintf(randomName, 8, "%u%u", UA_UInt32_random(), UA_UInt32_random());
+    char randomName[32];
+    sprintf(randomName, "%u%u", UA_UInt32_random(), UA_UInt32_random());
     UA_ByteString randomByte = UA_BYTESTRING(randomName);
     UA_Variant_setScalarCopy(&value->value, &randomByte, &UA_TYPES[UA_TYPES_BYTESTRING]);
     value->hasValue = true;
@@ -535,8 +535,8 @@ setInformationModel(UA_Server *server) {
         UA_VariableAttributes attr = UA_VariableAttributes_default;
         attr.dataType = UA_TYPES[type].typeId;
 #ifndef UA_ENABLE_TYPEDESCRIPTION
-        char name[15];
-        snprintf(name, 15, "%02d", type);
+        char name[32];
+        sprintf(name, "%02d", type);
         attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
         UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME(1, name);
 #else
@@ -622,8 +622,8 @@ setInformationModel(UA_Server *server) {
 
     id = DEPTHID; // running id in namespace 0 - Start with Matrix NODE
     for(UA_UInt32 i = 1; i <= 20; i++) {
-        char name[15];
-        snprintf(name, 15, "depth%u", i);
+        char name[32];
+        sprintf(name, "depth%u", i);
         object_attr.description = UA_LOCALIZEDTEXT("en-US", name);
         object_attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
         UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, id + i),
@@ -704,9 +704,9 @@ setInformationModel(UA_Server *server) {
         for(size_t j = 0; j < 100; j++) {
             char name[32];
 #ifndef UA_ENABLE_TYPEDESCRIPTION
-            snprintf(name, 20, "%02d - %i", type, scale_i);
+            sprintf(name, "%02d - %i", type, scale_i);
 #else
-            snprintf(name, 20, "%s - %i", UA_TYPES[type].typeName, scale_i);
+            sprintf(name, "%s - %i", UA_TYPES[type].typeName, scale_i);
 #endif
             attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
             UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME(1, name);
diff --git a/examples/server_inheritance.c b/examples/server_inheritance.c
index f2a611b7a24..932e7b869d0 100644
--- a/examples/server_inheritance.c
+++ b/examples/server_inheritance.c
@@ -251,8 +251,7 @@ int main(void) {
     createMammals(server);
     createCustomInheritance(server);
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/server_mainloop.c b/examples/server_mainloop.c
index d698abc441d..d23a139c13e 100644
--- a/examples/server_mainloop.c
+++ b/examples/server_mainloop.c
@@ -22,28 +22,16 @@ int main(int argc, char** argv) {
     signal(SIGTERM, stopHandler);
 
     UA_Server *server = UA_Server_new();
+    UA_Server_run_startup(server);
 
     /* Should the server networklayer block (with a timeout) until a message
        arrives or should it return immediately? */
     UA_Boolean waitInternal = true;
-
-    UA_StatusCode retval = UA_Server_run_startup(server);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto cleanup;
-
     while(running) {
-        /* timeout is the maximum possible delay (in millisec) until the next
-           _iterate call. Otherwise, the server might miss an internal timeout
-           or cannot react to messages with the promised responsiveness. */
-        /* If multicast discovery server is enabled, the timeout does not not consider new input data (requests) on the mDNS socket.
-         * It will be handled on the next call, which may be too late for requesting clients.
-         * if needed, the select with timeout on the multicast socket server->mdnsSocket (see example in mdnsd library)
-         */
         UA_Server_run_iterate(server, waitInternal);
     }
-    retval = UA_Server_run_shutdown(server);
 
- cleanup:
+    UA_Server_run_shutdown(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_client_events.c b/examples/tutorial_client_events.c
index 63aa8cb1c2f..07ead152396 100644
--- a/examples/tutorial_client_events.c
+++ b/examples/tutorial_client_events.c
@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) {
 
     if(argc < 2) {
         printf("Usage: tutorial_client_events <opc.tcp://server-url>\n");
-        return EXIT_SUCCESS;
+        return 0;
     }
 
     UA_Client *client = UA_Client_new();
@@ -122,7 +122,7 @@ int main(int argc, char *argv[]) {
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Could not connect");
         UA_Client_delete(client);
-        return EXIT_SUCCESS;
+        return 0;
     }
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
@@ -133,7 +133,7 @@ int main(int argc, char *argv[]) {
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_Client_disconnect(client);
         UA_Client_delete(client);
-        return EXIT_FAILURE;
+        return 0;
     }
     UA_UInt32 subId = response.subscriptionId;
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Create subscription succeeded, id %u", subId);
@@ -155,7 +155,6 @@ int main(int argc, char *argv[]) {
     item.requestedParameters.filter.content.decoded.type = &UA_TYPES[UA_TYPES_EVENTFILTER];
 
     UA_UInt32 monId = 0;
-
     UA_MonitoredItemCreateResult result =
         UA_Client_MonitoredItems_createEvent(client, subId,
                                              UA_TIMESTAMPSTORETURN_BOTH, item,
@@ -173,7 +172,7 @@ int main(int argc, char *argv[]) {
     monId = result.monitoredItemId;
 
     while(running)
-        retval = UA_Client_run_iterate(client, 100);
+        UA_Client_run_iterate(client, 100);
 
     /* Delete the subscription */
  cleanup:
@@ -184,5 +183,5 @@ int main(int argc, char *argv[]) {
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_alarms_conditions.c b/examples/tutorial_server_alarms_conditions.c
index 3f8d4e769fb..b7ea9dc3b4f 100644
--- a/examples/tutorial_server_alarms_conditions.c
+++ b/examples/tutorial_server_alarms_conditions.c
@@ -551,8 +551,7 @@ int main (void) {
 
     setUpEnvironment(server);
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_datasource.c b/examples/tutorial_server_datasource.c
index e7d6cd067b4..659ec81fbd8 100644
--- a/examples/tutorial_server_datasource.c
+++ b/examples/tutorial_server_datasource.c
@@ -170,8 +170,7 @@ int main(void) {
     addCurrentTimeDataSourceVariable(server);
     addCurrentTimeExternalDataSource(server);
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_events.c b/examples/tutorial_server_events.c
index 4c1b0e5e303..1cdd1d39e63 100644
--- a/examples/tutorial_server_events.c
+++ b/examples/tutorial_server_events.c
@@ -152,8 +152,7 @@ int main(void) {
     addNewEventType(server);
     addGenerateEventMethod(server);
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_firststeps.c b/examples/tutorial_server_firststeps.c
index 4a561a814e7..09dc3f0907c 100644
--- a/examples/tutorial_server_firststeps.c
+++ b/examples/tutorial_server_firststeps.c
@@ -24,9 +24,9 @@
 
 int main(void) {
     UA_Server *server = UA_Server_new();
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
 
 /**
diff --git a/examples/tutorial_server_historicaldata.c b/examples/tutorial_server_historicaldata.c
index 0ab56722ca0..f85a2b913ff 100644
--- a/examples/tutorial_server_historicaldata.c
+++ b/examples/tutorial_server_historicaldata.c
@@ -115,5 +115,5 @@ int main(void) {
     UA_NodeId_clear(&outNodeId);
     setting.historizingBackend.deleteMembers(&setting.historizingBackend);
 
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_historicaldata_circular.c b/examples/tutorial_server_historicaldata_circular.c
index 2fa53b76e23..98cabb27ac5 100644
--- a/examples/tutorial_server_historicaldata_circular.c
+++ b/examples/tutorial_server_historicaldata_circular.c
@@ -102,9 +102,9 @@ int main(void) {
     retval = gathering.startPoll(server, gathering.context, &outNodeId);
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "startPoll %s", UA_StatusCode_name(retval));
     */
-    retval = UA_Server_runUntilInterrupt(server);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                "UA_Server_run %s", UA_StatusCode_name(retval));
+
+    UA_Server_runUntilInterrupt(server);
+
     /*
      * If you use UA_HISTORIZINGUPDATESTRATEGY_POLL, then stop the polling.
      *
@@ -116,6 +116,5 @@ int main(void) {
 
     setting.historizingBackend.deleteMembers(&setting.historizingBackend);
     UA_NodeId_clear(&outNodeId);
-
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_method.c b/examples/tutorial_server_method.c
index 37e10a3dfac..13ef38b5513 100644
--- a/examples/tutorial_server_method.c
+++ b/examples/tutorial_server_method.c
@@ -166,8 +166,7 @@ int main(void) {
     addHelloWorldMethod(server);
     addIncInt32ArrayMethod(server);
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_method_async.c b/examples/tutorial_server_method_async.c
index 42f962bfb85..9f9216953b6 100644
--- a/examples/tutorial_server_method_async.c
+++ b/examples/tutorial_server_method_async.c
@@ -35,6 +35,7 @@
 #include <open62541/server.h>
 
 #include <signal.h>
+#include <malloc.h>
 #include "common.h"
 
 #ifndef WIN32
@@ -217,12 +218,12 @@ int main(void) {
     addHelloWorldMethod1(globalServer);
 	addHelloWorldMethod2(globalServer);
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(globalServer);
+    UA_Server_runUntilInterrupt(globalServer);
 
     /* Shutdown the thread */
     running = false;
     THREAD_JOIN(hThread);
 
     UA_Server_delete(globalServer);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_monitoreditems.c b/examples/tutorial_server_monitoreditems.c
index 0a3f7b1b1e2..70940f0e4f7 100644
--- a/examples/tutorial_server_monitoreditems.c
+++ b/examples/tutorial_server_monitoreditems.c
@@ -20,8 +20,8 @@
  */
 
 #include <open62541/client_subscriptions.h>
-#include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
+#include <open62541/plugin/log_stdout.h>
 
 static void
 dataChangeNotificationCallback(UA_Server *server, UA_UInt32 monitoredItemId,
@@ -39,7 +39,8 @@ addMonitoredItemToCurrentTimeVariable(UA_Server *server) {
         UA_MonitoredItemCreateRequest_default(currentTimeNodeId);
     monRequest.requestedParameters.samplingInterval = 100.0; /* 100 ms interval */
     UA_Server_createDataChangeMonitoredItem(server, UA_TIMESTAMPSTORETURN_SOURCE,
-                                            monRequest, NULL, dataChangeNotificationCallback);
+                                            monRequest, NULL,
+                                            dataChangeNotificationCallback);
 }
 
 /** It follows the main server code, making use of the above definitions. */
@@ -49,8 +50,7 @@ int main(void) {
 
     addMonitoredItemToCurrentTimeVariable(server);
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_object.c b/examples/tutorial_server_object.c
index 84738dbbaeb..c95cbfea986 100644
--- a/examples/tutorial_server_object.c
+++ b/examples/tutorial_server_object.c
@@ -325,8 +325,7 @@ int main(void) {
     addPumpObjectInstance(server, "pump4");
     addPumpObjectInstance(server, "pump5");
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_reverseconnect.c b/examples/tutorial_server_reverseconnect.c
index 042e64a346c..6d0a945f739 100644
--- a/examples/tutorial_server_reverseconnect.c
+++ b/examples/tutorial_server_reverseconnect.c
@@ -15,29 +15,11 @@ static void reverseConnectStateCallback(UA_Server *server, UA_UInt64 handle,
 int main(void) {
     UA_Server *server = UA_Server_new();
 
-    /*UA_Server_run_startup(server); */
-
     UA_UInt64 handle = 0;
     UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://localhost:4841"),
                                 reverseConnectStateCallback, (void *)123456, &handle);
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-
-    /* Test remove */
-    /*for (int i = 0; i < 10000; ++i) {
-        retval = UA_Server_run_iterate(server, true);
-
-        if (i == 8000)
-            UA_Server_removeReverseConnect(server, handle);
-
-        if (!running)
-            break;
-    }
-
-    UA_Server_run_shutdown(server);*/
-
     UA_Server_runUntilInterrupt(server);
-
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_variable.c b/examples/tutorial_server_variable.c
index aff7d26ac79..327ab31acf7 100644
--- a/examples/tutorial_server_variable.c
+++ b/examples/tutorial_server_variable.c
@@ -133,8 +133,7 @@ int main(void) {
     writeVariable(server);
     writeWrongVariable(server);
 
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }
diff --git a/examples/tutorial_server_variabletype.c b/examples/tutorial_server_variabletype.c
index 53708b87b05..f90cc65edc6 100644
--- a/examples/tutorial_server_variabletype.c
+++ b/examples/tutorial_server_variabletype.c
@@ -84,7 +84,8 @@ addVariableFail(UA_Server *server) {
     /* Prepare the node attributes */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.dataType = UA_TYPES[UA_TYPES_DOUBLE].typeId;
-    vAttr.valueRank = UA_VALUERANK_SCALAR; /* a scalar. this is not allowed per the variable type */
+    vAttr.valueRank = UA_VALUERANK_SCALAR; /* a scalar. this is not allowed per
+                                            * the variable type */
     vAttr.displayName = UA_LOCALIZEDTEXT("en-US", "2DPoint Variable (fail)");
     UA_String s = UA_STRING("2dpoint?");
     UA_Variant_setScalar(&vAttr.value, &s, &UA_TYPES[UA_TYPES_STRING]);
@@ -116,14 +117,11 @@ writeVariable(UA_Server *server) {
 
 int main(void) {
     UA_Server *server = UA_Server_new();
-
     addVariableType2DPoint(server);
     addVariable(server);
     addVariableFail(server);
     writeVariable(server);
-
-    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
-
+    UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+    return 0;
 }

From 390c092c0556b0d39699689597eda7f29ee0990b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Jul 2023 23:43:26 +0200
Subject: [PATCH 1079/1963] refactor(tests): Include stdlib.h where open62541
 no longer does it

---
 tests/check_chunking.c                                |  1 +
 tests/check_cj5.c                                     |  1 +
 tests/check_eventloop.c                               |  2 ++
 tests/check_eventloop_eth.c                           |  1 +
 tests/check_eventloop_interrupt.c                     |  1 +
 tests/check_eventloop_mqtt.c                          |  1 +
 tests/check_eventloop_tcp.c                           |  1 +
 tests/check_eventloop_udp.c                           |  1 +
 tests/check_securechannel.c                           |  4 +++-
 tests/check_timer.c                                   |  3 ++-
 tests/check_types_builtin.c                           |  1 +
 tests/check_types_custom.c                            |  3 ++-
 tests/check_types_parse.c                             |  3 ++-
 tests/check_types_range.c                             |  3 ++-
 tests/client/check_client_highlevel.c                 |  1 +
 tests/client/check_client_historical_data.c           |  5 +++--
 tests/client/check_client_securechannel.c             |  4 +++-
 tests/multithreading/check_mt_addDeleteObject.c       |  1 +
 tests/multithreading/check_mt_addObjectNode.c         |  1 +
 tests/multithreading/check_mt_addVariableNode.c       |  3 +++
 tests/multithreading/check_mt_addVariableTypeNode.c   |  1 +
 tests/multithreading/check_mt_readValueAttribute.c    |  1 +
 tests/multithreading/check_mt_readWriteDelete.c       |  1 +
 .../multithreading/check_mt_readWriteDeleteCallback.c |  1 +
 tests/multithreading/check_mt_writeValueAttribute.c   |  1 +
 .../nodeset-loader/add_node_integration_test/client.c |  2 ++
 .../nodeset-loader/add_node_integration_test/server.c |  4 ++++
 tests/nodeset-loader/check_nodeset_loader_autoid.c    |  4 +++-
 tests/nodeset-loader/check_nodeset_loader_di.c        |  4 +++-
 tests/nodeset-loader/check_nodeset_loader_input.c     |  4 +++-
 tests/nodeset-loader/check_nodeset_loader_plc.c       |  4 +++-
 tests/server/check_accesscontrol.c                    |  1 +
 tests/server/check_discovery.c                        |  2 ++
 tests/server/check_local_monitored_item.c             |  4 ++--
 tests/server/check_monitoreditem_filter.c             |  1 +
 tests/server/check_node_inheritance.c                 |  1 +
 tests/server/check_server_asyncop.c                   | 11 ++++++-----
 tests/server/check_server_callbacks.c                 |  4 +++-
 tests/server/check_server_historical_data.c           |  1 +
 tests/server/check_server_historical_data_circular.c  |  1 +
 tests/server/check_server_jobs.c                      |  1 +
 tests/server/check_server_monitoringspeed.c           |  1 +
 tests/server/check_server_readspeed.c                 |  1 +
 tests/server/check_server_speed_addnodes.c            |  1 +
 tests/server/check_server_userspace.c                 |  1 +
 tests/server/check_services_subscriptions.c           |  1 +
 tests/server/check_session.c                          |  1 +
 tests/server/check_subscription_event_filter.c        |  1 +
 tests/server/check_subscription_events.c              |  1 +
 49 files changed, 83 insertions(+), 20 deletions(-)

diff --git a/tests/check_chunking.c b/tests/check_chunking.c
index 31454e14b80..df757b98da1 100644
--- a/tests/check_chunking.c
+++ b/tests/check_chunking.c
@@ -7,6 +7,7 @@
 #include "ua_securechannel.h"
 #include "ua_types_encoding_binary.h"
 
+#include <stdlib.h>
 #include <check.h>
 
 UA_ByteString *buffers;
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index b202be51af5..36a41bc3124 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -6,6 +6,7 @@
 #include <check.h>
 #include "cj5.h"
 
+#include <stdlib.h>
 #include <math.h>
 #include <float.h>
 
diff --git a/tests/check_eventloop.c b/tests/check_eventloop.c
index 0f3cb10b737..e6c85a236e7 100644
--- a/tests/check_eventloop.c
+++ b/tests/check_eventloop.c
@@ -6,6 +6,8 @@
 #include "testing_clock.h"
 #include <time.h>
 #include <stdio.h>
+
+#include <stdlib.h>
 #include <check.h>
 
 #define N_EVENTS 10000
diff --git a/tests/check_eventloop_eth.c b/tests/check_eventloop_eth.c
index c909acc9e9e..6078aead511 100644
--- a/tests/check_eventloop_eth.c
+++ b/tests/check_eventloop_eth.c
@@ -9,6 +9,7 @@
 
 #include "testing_clock.h"
 #include <time.h>
+#include <stdlib.h>
 #include <check.h>
 
 static UA_EventLoop *el;
diff --git a/tests/check_eventloop_interrupt.c b/tests/check_eventloop_interrupt.c
index 292d3ba028b..9cfd4326745 100644
--- a/tests/check_eventloop_interrupt.c
+++ b/tests/check_eventloop_interrupt.c
@@ -10,6 +10,7 @@
 #include "testing_clock.h"
 
 #include <signal.h>
+#include <stdlib.h>
 #include <check.h>
 
 #ifndef _WIN32
diff --git a/tests/check_eventloop_mqtt.c b/tests/check_eventloop_mqtt.c
index 220e4ddccc5..4952f5cfca5 100644
--- a/tests/check_eventloop_mqtt.c
+++ b/tests/check_eventloop_mqtt.c
@@ -11,6 +11,7 @@
 
 #include "testing_clock.h"
 #include <time.h>
+#include <stdlib.h>
 #include <check.h>
 
 unsigned int messageCount = 0;
diff --git a/tests/check_eventloop_tcp.c b/tests/check_eventloop_tcp.c
index 7af160bc977..be396b20461 100644
--- a/tests/check_eventloop_tcp.c
+++ b/tests/check_eventloop_tcp.c
@@ -9,6 +9,7 @@
 
 #include "testing_clock.h"
 #include <time.h>
+#include <stdlib.h>
 #include <check.h>
 
 static UA_EventLoop *el;
diff --git a/tests/check_eventloop_udp.c b/tests/check_eventloop_udp.c
index 1e9b2256c6e..021982ac67c 100644
--- a/tests/check_eventloop_udp.c
+++ b/tests/check_eventloop_udp.c
@@ -9,6 +9,7 @@
 
 #include "testing_clock.h"
 #include <time.h>
+#include <stdlib.h>
 #include <check.h>
 
 static UA_EventLoop *el;
diff --git a/tests/check_securechannel.c b/tests/check_securechannel.c
index d7075e2df0a..29593fd73a7 100644
--- a/tests/check_securechannel.c
+++ b/tests/check_securechannel.c
@@ -11,10 +11,12 @@
 #include "ua_types_encoding_binary.h"
 #include "ua_util_internal.h"
 
-#include "check.h"
 #include "testing_networklayers.h"
 #include "testing_policy.h"
 
+#include <stdlib.h>
+#include <check.h>
+
 #define UA_BYTESTRING_STATIC(s) {sizeof(s)-1, (UA_Byte*)(s)}
 
 // Some default testing sizes. Can be overwritten in testing functions.
diff --git a/tests/check_timer.c b/tests/check_timer.c
index 482f7f72274..bcb0af9fead 100644
--- a/tests/check_timer.c
+++ b/tests/check_timer.c
@@ -3,8 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ua_timer.h"
-#include "check.h"
 
+#include <check.h>
+#include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 
diff --git a/tests/check_types_builtin.c b/tests/check_types_builtin.c
index 9a7ead43bda..ff8eeb17eac 100644
--- a/tests/check_types_builtin.c
+++ b/tests/check_types_builtin.c
@@ -9,6 +9,7 @@
 
 #include "ua_util_internal.h"
 
+#include <stdlib.h>
 #include <check.h>
 #include <float.h>
 #include <math.h>
diff --git a/tests/check_types_custom.c b/tests/check_types_custom.c
index a47382baedc..35586ad2f60 100644
--- a/tests/check_types_custom.c
+++ b/tests/check_types_custom.c
@@ -7,7 +7,8 @@
 
 #include "ua_types_encoding_binary.h"
 
-#include "check.h"
+#include <stdlib.h>
+#include <check.h>
 #include <math.h>
 
 #ifdef __clang__
diff --git a/tests/check_types_parse.c b/tests/check_types_parse.c
index 49c2aaeee67..3a72b65b0df 100644
--- a/tests/check_types_parse.c
+++ b/tests/check_types_parse.c
@@ -6,7 +6,8 @@
 #include <open62541/types_generated_handling.h>
 #include "open62541/util.h"
 
-#include "check.h"
+#include <stdlib.h>
+#include <check.h>
 
 START_TEST(base64) {
     UA_ByteString test1 = UA_BYTESTRING("abc123\nopen62541");
diff --git a/tests/check_types_range.c b/tests/check_types_range.c
index 688bbb86fa7..11a8a556660 100644
--- a/tests/check_types_range.c
+++ b/tests/check_types_range.c
@@ -7,7 +7,8 @@
 
 #include "ua_server_internal.h"
 
-#include "check.h"
+#include <stdlib.h>
+#include <check.h>
 
 START_TEST(parseRange) {
     UA_NumericRange range;
diff --git a/tests/client/check_client_highlevel.c b/tests/client/check_client_highlevel.c
index 9baf785cc0d..2d07e19001a 100644
--- a/tests/client/check_client_highlevel.c
+++ b/tests/client/check_client_highlevel.c
@@ -9,6 +9,7 @@
 #include <open62541/server_config_default.h>
 
 #include <check.h>
+#include <stdlib.h>
 
 #include "thread_wrapper.h"
 
diff --git a/tests/client/check_client_historical_data.c b/tests/client/check_client_historical_data.c
index bcfa0d3d717..f0ff203b952 100644
--- a/tests/client/check_client_historical_data.c
+++ b/tests/client/check_client_historical_data.c
@@ -18,13 +18,14 @@
 #include "client/ua_client_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdio.h>
 
 #include "testing_clock.h"
 #include "testing_networklayers.h"
 #include "thread_wrapper.h"
 #include "historical_read_test_data.h"
-#include <stddef.h>
-#include <stdio.h>
 
 static UA_Server *server;
 static UA_HistoryDataGathering *gathering;
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index 10f0497c539..942078eb7bf 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -10,7 +10,9 @@
 
 #include "client/ua_client_internal.h"
 
-#include "check.h"
+#include <check.h>
+#include <stdlib.h>
+
 #include "testing_clock.h"
 #include "thread_wrapper.h"
 
diff --git a/tests/multithreading/check_mt_addDeleteObject.c b/tests/multithreading/check_mt_addDeleteObject.c
index 7bbbd55bdb1..d46d6808e62 100644
--- a/tests/multithreading/check_mt_addDeleteObject.c
+++ b/tests/multithreading/check_mt_addDeleteObject.c
@@ -7,6 +7,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "thread_wrapper.h"
 #include "deviceObjectType.h"
diff --git a/tests/multithreading/check_mt_addObjectNode.c b/tests/multithreading/check_mt_addObjectNode.c
index 34882a9d70d..833ca12d25d 100644
--- a/tests/multithreading/check_mt_addObjectNode.c
+++ b/tests/multithreading/check_mt_addObjectNode.c
@@ -7,6 +7,7 @@
 #include <open62541/client_highlevel.h>
 #include <check.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "thread_wrapper.h"
 #include "deviceObjectType.h"
 
diff --git a/tests/multithreading/check_mt_addVariableNode.c b/tests/multithreading/check_mt_addVariableNode.c
index 16836146d1b..4e68882773a 100644
--- a/tests/multithreading/check_mt_addVariableNode.c
+++ b/tests/multithreading/check_mt_addVariableNode.c
@@ -5,8 +5,11 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
+
 #include <check.h>
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "thread_wrapper.h"
 #include "mt_testing.h"
 
diff --git a/tests/multithreading/check_mt_addVariableTypeNode.c b/tests/multithreading/check_mt_addVariableTypeNode.c
index 9af4627d9f6..91007921bf4 100644
--- a/tests/multithreading/check_mt_addVariableTypeNode.c
+++ b/tests/multithreading/check_mt_addVariableTypeNode.c
@@ -7,6 +7,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "thread_wrapper.h"
 #include "mt_testing.h"
diff --git a/tests/multithreading/check_mt_readValueAttribute.c b/tests/multithreading/check_mt_readValueAttribute.c
index 86dd67cafd6..6e90e44d685 100644
--- a/tests/multithreading/check_mt_readValueAttribute.c
+++ b/tests/multithreading/check_mt_readValueAttribute.c
@@ -6,6 +6,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdlib.h>
 #include "thread_wrapper.h"
 #include "mt_testing.h"
 
diff --git a/tests/multithreading/check_mt_readWriteDelete.c b/tests/multithreading/check_mt_readWriteDelete.c
index 1fd4d07389b..f9a0da069be 100644
--- a/tests/multithreading/check_mt_readWriteDelete.c
+++ b/tests/multithreading/check_mt_readWriteDelete.c
@@ -6,6 +6,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdlib.h>
 #include <testing_clock.h>
 #include "thread_wrapper.h"
 #include "mt_testing.h"
diff --git a/tests/multithreading/check_mt_readWriteDeleteCallback.c b/tests/multithreading/check_mt_readWriteDeleteCallback.c
index 08ec29c593f..e1e77462fc1 100644
--- a/tests/multithreading/check_mt_readWriteDeleteCallback.c
+++ b/tests/multithreading/check_mt_readWriteDeleteCallback.c
@@ -6,6 +6,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdlib.h>
 #include <testing_clock.h>
 #include "thread_wrapper.h"
 #include "mt_testing.h"
diff --git a/tests/multithreading/check_mt_writeValueAttribute.c b/tests/multithreading/check_mt_writeValueAttribute.c
index a0b07612da3..278ac4b6a9d 100644
--- a/tests/multithreading/check_mt_writeValueAttribute.c
+++ b/tests/multithreading/check_mt_writeValueAttribute.c
@@ -7,6 +7,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <check.h>
+#include <stdlib.h>
 #include "thread_wrapper.h"
 #include "mt_testing.h"
 
diff --git a/tests/nodeset-loader/add_node_integration_test/client.c b/tests/nodeset-loader/add_node_integration_test/client.c
index c8a5c2bf268..135ae63ab77 100644
--- a/tests/nodeset-loader/add_node_integration_test/client.c
+++ b/tests/nodeset-loader/add_node_integration_test/client.c
@@ -4,6 +4,8 @@
 
 #include "ua_types_encoding_xml.h"
 
+#include <signal.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 #define MIN_ARGUMENTS_NUM 3
diff --git a/tests/nodeset-loader/add_node_integration_test/server.c b/tests/nodeset-loader/add_node_integration_test/server.c
index 130e398d8bb..d905df0aadd 100644
--- a/tests/nodeset-loader/add_node_integration_test/server.c
+++ b/tests/nodeset-loader/add_node_integration_test/server.c
@@ -6,6 +6,10 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/nodesetloader.h>
 
+#include <signal.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 UA_Boolean running = true;
 static void stopHandler(int sign) {
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
diff --git a/tests/nodeset-loader/check_nodeset_loader_autoid.c b/tests/nodeset-loader/check_nodeset_loader_autoid.c
index 47016d276a6..01ea717df33 100644
--- a/tests/nodeset-loader/check_nodeset_loader_autoid.c
+++ b/tests/nodeset-loader/check_nodeset_loader_autoid.c
@@ -6,7 +6,9 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/nodesetloader.h>
 
-#include "check.h"
+#include <check.h>
+#include <stdlib.h>
+
 #include "testing_clock.h"
 
 UA_Server *server = NULL;
diff --git a/tests/nodeset-loader/check_nodeset_loader_di.c b/tests/nodeset-loader/check_nodeset_loader_di.c
index 85013eaaab3..f72e5843a42 100644
--- a/tests/nodeset-loader/check_nodeset_loader_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_di.c
@@ -6,7 +6,9 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/nodesetloader.h>
 
-#include "check.h"
+#include <check.h>
+#include <stdlib.h>
+
 #include "testing_clock.h"
 
 UA_Server *server = NULL;
diff --git a/tests/nodeset-loader/check_nodeset_loader_input.c b/tests/nodeset-loader/check_nodeset_loader_input.c
index 214d8b0418e..f1f8257c774 100644
--- a/tests/nodeset-loader/check_nodeset_loader_input.c
+++ b/tests/nodeset-loader/check_nodeset_loader_input.c
@@ -6,7 +6,9 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/nodesetloader.h>
 
-#include "check.h"
+#include <check.h>
+#include <stdlib.h>
+
 #include "testing_clock.h"
 
 UA_Server *server = NULL;
diff --git a/tests/nodeset-loader/check_nodeset_loader_plc.c b/tests/nodeset-loader/check_nodeset_loader_plc.c
index 82f67ecbfef..6449b535139 100644
--- a/tests/nodeset-loader/check_nodeset_loader_plc.c
+++ b/tests/nodeset-loader/check_nodeset_loader_plc.c
@@ -6,7 +6,9 @@
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/nodesetloader.h>
 
-#include "check.h"
+#include <check.h>
+#include <stdlib.h>
+
 #include "testing_clock.h"
 
 UA_Server *server = NULL;
diff --git a/tests/server/check_accesscontrol.c b/tests/server/check_accesscontrol.c
index 7557c4ca9a4..1e4939d38e3 100644
--- a/tests/server/check_accesscontrol.c
+++ b/tests/server/check_accesscontrol.c
@@ -8,6 +8,7 @@
 #include <open62541/server_config_default.h>
 #include <open62541/types.h>
 
+#include <stdlib.h>
 #include <check.h>
 
 #include "thread_wrapper.h"
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index a5d57d92f46..5b949c91f56 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -16,7 +16,9 @@
 #ifndef WIN32
 #include <sys/stat.h>
 #endif
+
 #include <check.h>
+#include <stdlib.h>
 
 #ifndef _WIN32
 #include <sys/stat.h>
diff --git a/tests/server/check_local_monitored_item.c b/tests/server/check_local_monitored_item.c
index 846cade1174..8dbea401a0b 100644
--- a/tests/server/check_local_monitored_item.c
+++ b/tests/server/check_local_monitored_item.c
@@ -10,9 +10,9 @@
 #include <open62541/server_config_default.h>
 #include <open62541/types.h>
 
-#include <stddef.h>
+#include <check.h>
+#include <stdlib.h>
 
-#include "check.h"
 #include "testing_clock.h"
 #include "testing_networklayers.h"
 
diff --git a/tests/server/check_monitoreditem_filter.c b/tests/server/check_monitoreditem_filter.c
index d52cf5942ca..5dbcd7a50c9 100644
--- a/tests/server/check_monitoreditem_filter.c
+++ b/tests/server/check_monitoreditem_filter.c
@@ -14,6 +14,7 @@
 #include "client/ua_client_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #include "testing_clock.h"
 #include "thread_wrapper.h"
diff --git a/tests/server/check_node_inheritance.c b/tests/server/check_node_inheritance.c
index 5ba01fe2356..b3e7eb5301b 100644
--- a/tests/server/check_node_inheritance.c
+++ b/tests/server/check_node_inheritance.c
@@ -7,6 +7,7 @@
 #include "server/ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_UInt32 valueToBeInherited = 42;
diff --git a/tests/server/check_server_asyncop.c b/tests/server/check_server_asyncop.c
index cf4628ecd67..3edfae0b4b0 100644
--- a/tests/server/check_server_asyncop.c
+++ b/tests/server/check_server_asyncop.c
@@ -14,6 +14,7 @@
 #include "thread_wrapper.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Boolean running;
 THREAD_HANDLE server_thread;
@@ -22,11 +23,11 @@ static size_t clientCounter;
 
 static UA_StatusCode
 methodCallback(UA_Server *serverArg,
-         const UA_NodeId *sessionId, void *sessionHandle,
-         const UA_NodeId *methodId, void *methodContext,
-         const UA_NodeId *objectId, void *objectContext,
-         size_t inputSize, const UA_Variant *input,
-         size_t outputSize, UA_Variant *output) {
+               const UA_NodeId *sessionId, void *sessionHandle,
+               const UA_NodeId *methodId, void *methodContext,
+               const UA_NodeId *objectId, void *objectContext,
+               size_t inputSize, const UA_Variant *input,
+               size_t outputSize, UA_Variant *output) {
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/tests/server/check_server_callbacks.c b/tests/server/check_server_callbacks.c
index 2213a999b07..ee0e061e9b5 100644
--- a/tests/server/check_server_callbacks.c
+++ b/tests/server/check_server_callbacks.c
@@ -6,9 +6,11 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
-#include <check.h>
 #include "thread_wrapper.h"
 
+#include <stdlib.h>
+#include <check.h>
+
 /* While server initialization, value callbacks are called twice.
  * This counter is used to ensure that the deletion of the variable is triggered by the client (not while the server initialization)*/
 int counter  = 0;
diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c
index 805439fc14a..e51f65e21c7 100644
--- a/tests/server/check_server_historical_data.c
+++ b/tests/server/check_server_historical_data.c
@@ -19,6 +19,7 @@
 #include "server/ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "testing_clock.h"
diff --git a/tests/server/check_server_historical_data_circular.c b/tests/server/check_server_historical_data_circular.c
index 60513bbef9e..cfe047311a7 100644
--- a/tests/server/check_server_historical_data_circular.c
+++ b/tests/server/check_server_historical_data_circular.c
@@ -17,6 +17,7 @@
 #include <open62541/server_config_default.h>
 
 #include <check.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "server/ua_server_internal.h"
diff --git a/tests/server/check_server_jobs.c b/tests/server/check_server_jobs.c
index cc7fbef6a34..f26e6e9dee6 100644
--- a/tests/server/check_server_jobs.c
+++ b/tests/server/check_server_jobs.c
@@ -7,6 +7,7 @@
 #include "server/ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #include "testing_clock.h"
 
diff --git a/tests/server/check_server_monitoringspeed.c b/tests/server/check_server_monitoringspeed.c
index 14f7a1c9cec..d795d0cde3c 100644
--- a/tests/server/check_server_monitoringspeed.c
+++ b/tests/server/check_server_monitoringspeed.c
@@ -10,6 +10,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
 
diff --git a/tests/server/check_server_readspeed.c b/tests/server/check_server_readspeed.c
index da7431711d1..4c6ffd39369 100644
--- a/tests/server/check_server_readspeed.c
+++ b/tests/server/check_server_readspeed.c
@@ -12,6 +12,7 @@
 #include "ua_types_encoding_binary.h"
 
 #include <check.h>
+#include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 
diff --git a/tests/server/check_server_speed_addnodes.c b/tests/server/check_server_speed_addnodes.c
index 3bc38677669..d3dccc1e3cb 100644
--- a/tests/server/check_server_speed_addnodes.c
+++ b/tests/server/check_server_speed_addnodes.c
@@ -5,6 +5,7 @@
 #include <open62541/server_config_default.h>
 
 #include <check.h>
+#include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 
diff --git a/tests/server/check_server_userspace.c b/tests/server/check_server_userspace.c
index 42d32bb6384..2b57fa16584 100644
--- a/tests/server/check_server_userspace.c
+++ b/tests/server/check_server_userspace.c
@@ -6,6 +6,7 @@
 #include <open62541/types.h>
 
 #include <check.h>
+#include <stdlib.h>
 
 #ifdef __clang__
 //required for ck_assert_ptr_eq and const casting
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index 3d0b20c82a7..13f9b9a5b12 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -10,6 +10,7 @@
 #include "server/ua_subscription.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #include "testing_clock.h"
 
diff --git a/tests/server/check_session.c b/tests/server/check_session.c
index 899f9db5404..e8c5384079b 100644
--- a/tests/server/check_session.c
+++ b/tests/server/check_session.c
@@ -12,6 +12,7 @@
 #include "client/ua_client_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #include "thread_wrapper.h"
 
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index 954a8086ca1..78bda9eb126 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -14,6 +14,7 @@
 #include <open62541/client_subscriptions.h>
 
 #include <check.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "testing_clock.h"
diff --git a/tests/server/check_subscription_events.c b/tests/server/check_subscription_events.c
index 3346d320164..2258655ac84 100644
--- a/tests/server/check_subscription_events.c
+++ b/tests/server/check_subscription_events.c
@@ -16,6 +16,7 @@
 #include "server/ua_subscription.h"
 
 #include <check.h>
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "testing_clock.h"

From 3a64af82db0065e036a1ef46747ca63da451d548 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Jul 2023 23:57:32 +0200
Subject: [PATCH 1080/1963] refactor(tools): Update ua2json to include
 architecture-dependent headers

---
 tools/ua2json/ua2json.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/tools/ua2json/ua2json.c b/tools/ua2json/ua2json.c
index 34b690fcf34..09da345ff2e 100644
--- a/tools/ua2json/ua2json.c
+++ b/tools/ua2json/ua2json.c
@@ -5,24 +5,13 @@
  *    Copyright 2018 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  */
 
-/* Enable POSIX features */
-#if !defined(_XOPEN_SOURCE)
-# define _XOPEN_SOURCE 600
-#endif
-#ifndef _DEFAULT_SOURCE
-# define _DEFAULT_SOURCE
-#endif
-/* On older systems we need to define _BSD_SOURCE.
- * _DEFAULT_SOURCE is an alias for that. */
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
-#endif
-
 #include <open62541/types.h>
-#include <stdio.h>
 #include <open62541/types_generated.h>
 #include <open62541/types_generated_handling.h>
 
+#include <stdio.h>
+#include <unistd.h>
+
 /* Internal headers */
 #include "ua_pubsub_networkmessage.h"
 

From 6d20c171394a3e1e5be8ff1909298157f201e5cf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 27 Jul 2023 23:42:11 +0200
Subject: [PATCH 1081/1963] refactor(deps): Update nodesetloader submodule

---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index d131a800bdc..4b0b0f3ddf4 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit d131a800bdc5c91f9c380cca3498d78cf447e69c
+Subproject commit 4b0b0f3ddf42c1ee3e6812fc6ef785db67ee9f03

From 81b72af598ffb70c6671b08cb6d4d3c2786e2271 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 28 Jul 2023 20:16:11 +0200
Subject: [PATCH 1082/1963] fix(ci): Remove spurious failures for
 pubsub_subscribe_encrypted

---
 .github/workflows/build_linux.yml | 2 +-
 tools/examples_with_valgrind.py   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index b8a13e1fe4b..b32bed721a0 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -100,7 +100,7 @@ jobs:
           - build_name: "Valgrind Examples with MbedTLS (gcc)"
             cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev mosquitto
             cmd_action: examples_valgrind MBEDTLS
-          - build_name: "Valgrind Examples  with OpenSSL (gcc)"
+          - build_name: "Valgrind Examples with OpenSSL (gcc)"
             cmd_deps: sudo apt-get install -y -qq valgrind openssl libmbedtls-dev mosquitto
             cmd_action: examples_valgrind OPENSSL
           - build_name: "Clang Static Analyzer"
diff --git a/tools/examples_with_valgrind.py b/tools/examples_with_valgrind.py
index 8a700e4e3f4..a9b6a6cfbdb 100644
--- a/tools/examples_with_valgrind.py
+++ b/tools/examples_with_valgrind.py
@@ -95,7 +95,8 @@
         "client_encryption":1,
         "client_historical":1,
         "client_subscription_loop":1,
-        "client_method_async":1
+        "client_method_async":1,
+        "pubsub_subscribe_encrypted":1
 }
 
 # Run each example with valgrind.

From 62e497dbfc997460b9bedd2902f3472e77334283 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 1 Aug 2023 16:49:21 +0200
Subject: [PATCH 1083/1963] refactor(pubsub): Expose DataSetReaderConfig
 handling methods in the public API

---
 include/open62541/server_pubsub.h | 13 +++++++++++--
 src/pubsub/ua_pubsub.h            |  7 -------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index bae57e9d8ef..fa6c9abbb2d 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -718,13 +718,22 @@ typedef struct {
     UA_PubSubRtEncoding expectedEncoding;
 } UA_DataSetReaderConfig;
 
-/* Update configuration to the dataSetReader */
+/* Copy the configuration of DataSetReader */
+UA_EXPORT UA_StatusCode
+UA_DataSetReaderConfig_copy(const UA_DataSetReaderConfig *src,
+                            UA_DataSetReaderConfig *dst);
+
+/* Clear the configuration of a DataSetReader */
+UA_EXPORT void
+UA_DataSetReaderConfig_clear(UA_DataSetReaderConfig *cfg);
+
+/* Update configuration to the DataSetReader */
 UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                      UA_NodeId readerGroupIdentifier,
                                      const UA_DataSetReaderConfig *config);
 
-/* Get configuration of the dataSetReader */
+/* Get the configuration (copy) of the DataSetReader */
 UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_DataSetReader_getConfig(UA_Server *server, UA_NodeId dataSetReaderIdentifier,
                                   UA_DataSetReaderConfig *config);
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index b6adda17a07..b9a78cfca47 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -514,13 +514,6 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
 UA_StatusCode
 UA_DataSetReader_remove(UA_Server *server, UA_DataSetReader *dsr);
 
-/* Copy the configuration of DataSetReader */
-UA_StatusCode UA_DataSetReaderConfig_copy(const UA_DataSetReaderConfig *src,
-                                          UA_DataSetReaderConfig *dst);
-
-/* Clear the configuration of a DataSetReader */
-void UA_DataSetReaderConfig_clear(UA_DataSetReaderConfig *cfg);
-
 /* Copy the configuration of Target Variables */
 UA_StatusCode UA_TargetVariables_copy(const UA_TargetVariables *src,
                                       UA_TargetVariables *dst);

From 3f71765883c8265934bdc87fc7c31d10dc9200eb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 1 Aug 2023 16:49:56 +0200
Subject: [PATCH 1084/1963] refactor(examples): Remove use of internal API from
 server_pubsub_subscribe_custom_monitoring.c

---
 .../monitoring/server_pubsub_subscribe_custom_monitoring.c     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
index 2c2da3a8a2b..463853d2019 100644
--- a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
+++ b/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
@@ -25,9 +25,6 @@
 #include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
-#include "ua_pubsub.h"
-#include "../server/ua_server_internal.h"
-
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>

From 9cbdbb30b5f8653c5a91503a6a90d61546a12038 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 1 Aug 2023 16:52:07 +0200
Subject: [PATCH 1085/1963] refactor(examples): Move monitoring example into
 main pubsub-examples folder

---
 examples/CMakeLists.txt                                     | 6 +-----
 .../server_pubsub_subscribe_custom_monitoring.c             | 0
 2 files changed, 1 insertion(+), 5 deletions(-)
 rename examples/pubsub/{monitoring => }/server_pubsub_subscribe_custom_monitoring.c (100%)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c74a8ea5176..7e1a3655d3c 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -275,11 +275,7 @@ if(UA_ENABLE_PUBSUB)
     endif()
 
     if(UA_ENABLE_PUBSUB_MONITORING)
-        if(CMAKE_SYSTEM MATCHES "Linux")
-            add_example(server_pubsub_subscribe_custom_monitoring pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c)
-        else(NOT (CMAKE_SYSTEM MATCHES "Linux"))
-            message(WARNING "PubSub subscriber monitoring example build needs LINUX OS. Skip build.")
-        endif()
+        add_example(server_pubsub_subscribe_custom_monitoring pubsub/server_pubsub_subscribe_custom_monitoring.c)
     endif()
 endif()
 
diff --git a/examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c b/examples/pubsub/server_pubsub_subscribe_custom_monitoring.c
similarity index 100%
rename from examples/pubsub/monitoring/server_pubsub_subscribe_custom_monitoring.c
rename to examples/pubsub/server_pubsub_subscribe_custom_monitoring.c

From 1c1bbb9ebc9b7ae187a9ab0af6ca287d3f58d5f5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 29 Jul 2023 17:34:31 +0200
Subject: [PATCH 1086/1963] refactor(arch): Remove architecture not yet ported
 to the EventLoop model

---
 arch/CMakeLists.txt                 |   4 -
 arch/eCos/CMakeLists.txt            |  19 ----
 arch/eCos/ua_architecture.h         |  99 ------------------
 arch/eCos/ua_clock.c                |  39 -------
 arch/freertosLWIP/CMakeLists.txt    |  14 ---
 arch/freertosLWIP/ua_architecture.h |  28 -----
 arch/freertosLWIP/ua_clock.c        |  56 ----------
 arch/vxworks/CMakeLists.txt         |  16 ---
 arch/vxworks/ua_architecture.h      | 127 ----------------------
 arch/vxworks/ua_clock.c             |  56 ----------
 arch/wec7/CMakeLists.txt            |  16 ---
 arch/wec7/ua_architecture.h         | 157 ----------------------------
 arch/wec7/ua_clock.c                |  53 ----------
 13 files changed, 684 deletions(-)
 delete mode 100644 arch/eCos/CMakeLists.txt
 delete mode 100644 arch/eCos/ua_architecture.h
 delete mode 100644 arch/eCos/ua_clock.c
 delete mode 100644 arch/freertosLWIP/CMakeLists.txt
 delete mode 100644 arch/freertosLWIP/ua_architecture.h
 delete mode 100644 arch/freertosLWIP/ua_clock.c
 delete mode 100644 arch/vxworks/CMakeLists.txt
 delete mode 100644 arch/vxworks/ua_architecture.h
 delete mode 100644 arch/vxworks/ua_clock.c
 delete mode 100644 arch/wec7/CMakeLists.txt
 delete mode 100644 arch/wec7/ua_architecture.h
 delete mode 100644 arch/wec7/ua_clock.c

diff --git a/arch/CMakeLists.txt b/arch/CMakeLists.txt
index 507fe7936e9..9f795cc9307 100644
--- a/arch/CMakeLists.txt
+++ b/arch/CMakeLists.txt
@@ -5,10 +5,6 @@ ua_include_directories(${PROJECT_SOURCE_DIR}/src) # to have access to ua_securec
 
 add_subdirectory(posix)
 add_subdirectory(win32)
-add_subdirectory(freertosLWIP)
-add_subdirectory(vxworks)
-add_subdirectory(eCos)
-add_subdirectory(wec7)
 
 SET(UA_ARCH_EXTRA_INCLUDES "" CACHE STRING "Folders to include from the architecture")
 mark_as_advanced(UA_ARCH_EXTRA_INCLUDES)
diff --git a/arch/eCos/CMakeLists.txt b/arch/eCos/CMakeLists.txt
deleted file mode 100644
index a774834fc43..00000000000
--- a/arch/eCos/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-SET(SOURCE_GROUP ${SOURCE_GROUP}\\eCos)
-
-ua_add_architecture("eCos")
-
-
-list (FIND UA_AMALGAMATION_ARCHITECTURES "eCos" _index)
-if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "eCos")
-
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-
-    if("${UA_ARCHITECTURE}" STREQUAL "eCos")
-
-        ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-        
-        set(UA_ECOS_HOSTNAME "eCos-host" CACHE STRING "Define a custom hostname/ip for the endpoint.")
-        ua_architecture_add_definitions(-DUA_ECOS_HOSTNAME="${UA_ECOS_HOSTNAME}")
-    endif()
-
-endif()
diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
deleted file mode 100644
index 72cd8bbef87..00000000000
--- a/arch/eCos/ua_architecture.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- */
-#ifdef UA_ARCHITECTURE_ECOS
-
-#ifndef PLUGINS_ARCH_ECOS_UA_ARCHITECTURE_H_
-#define PLUGINS_ARCH_ECOS_UA_ARCHITECTURE_H_
-
-#include <pkgconf/system.h>
-#include <cyg/kernel/kapi.h>
-#include <cyg/io/io.h>
-
-#include <network.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <netinet/tcp.h>
-#include <stdlib.h>
-
-#define UA_sleep_ms(X) cyg_thread_delay(1 + ((1000 * X * CYGNUM_HAL_RTC_DENOMINATOR) / (CYGNUM_HAL_RTC_NUMERATOR / 1000)));
-
-#define OPTVAL_TYPE int
-
-#define UA_fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
-#define UA_fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
-
-#define UA_access(x,y) 0
-
-#define UA_IPV6 1
-#define UA_SOCKET int
-#define UA_INVALID_SOCKET -1
-#define UA_ERRNO errno
-#define UA_INTERRUPTED EINTR
-#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
-#define UA_INPROGRESS EINPROGRESS
-#define UA_WOULDBLOCK EWOULDBLOCK
-
-#define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
-    getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
-#define UA_send send
-#define UA_recv recv
-#define UA_sendto sendto
-#define UA_recvfrom recvfrom
-#define UA_recvmsg recvmsg
-#define UA_htonl htonl
-#define UA_ntohl ntohl
-#define UA_close close
-#define UA_select select
-#define UA_shutdown shutdown
-#define UA_socket socket
-#define UA_bind bind
-#define UA_listen listen
-#define UA_accept accept
-#define UA_connect connect
-#define UA_getsockopt getsockopt
-#define UA_setsockopt setsockopt
-#define UA_ioctl ioctl
-#define UA_freeaddrinfo freeaddrinfo
-#define UA_gethostname gethostname_ecos
-#define UA_getsockname getsockname
-#define UA_inet_pton(af,src,dst) inet_pton(af, src, (char*) dst)
-#if UA_IPV6
-# define UA_if_nametoindex if_nametoindex
-#endif
-
-int gethostname_ecos(char* name, size_t len);
-
-#define UA_free free
-#define UA_malloc malloc
-#define UA_calloc calloc
-#define UA_realloc realloc
-
-#define UA_strncasecmp strncasecmp
-
-#define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
-    char *errno_str = strerror(errno); \
-    LOG; \
-}
-#define UA_LOG_SOCKET_ERRNO_GAI_WRAP(LOG) { \
-    const char *errno_str = gai_strerror(errno); \
-    LOG; \
-}
-
-#if UA_MULTITHREADING >= 100
-#error Multithreading unsupported
-#else
-#define UA_LOCK_INIT(lock)
-#define UA_LOCK_DESTROY(lock)
-#define UA_LOCK(lock)
-#define UA_UNLOCK(lock)
-#define UA_LOCK_ASSERT(lock, num)
-#endif
-
-#endif /* PLUGINS_ARCH_ECOS_UA_ARCHITECTURE_H_ */
-
-#endif /* UA_ARCHITECTURE_ECOS */
diff --git a/arch/eCos/ua_clock.c b/arch/eCos/ua_clock.c
deleted file mode 100644
index c5eab221743..00000000000
--- a/arch/eCos/ua_clock.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-#ifdef UA_ARCHITECTURE_ECOS
-
-#include <open62541/types.h>
-
-UA_DateTime UA_DateTime_now(void) {
-  return UA_DateTime_nowMonotonic();
-}
-
-/* Credit to https://stackoverflow.com/questions/13804095/get-the-time-zone-gmt-offset-in-c */
-UA_Int64 UA_DateTime_localTimeUtcOffset(void){
-  time_t gmt, rawtime = time(NULL);
-  struct tm *ptm;
-  struct tm gbuf;
-  ptm = gmtime_r(&rawtime, &gbuf);
-  // Request that mktime() looksup dst in timezone database
-  ptm->tm_isdst = -1;
-  gmt = mktime(ptm);
-  return (UA_Int64) (difftime(rawtime, gmt) * UA_DATETIME_SEC);
-}
-
-UA_DateTime UA_DateTime_nowMonotonic(void) {
-
-  cyg_tick_count_t TaskTime = cyg_current_time();
-
-  UA_DateTimeStruct UATime;
-  UATime.milliSec = (UA_UInt16) TaskTime;
-  struct timespec ts;
-  ts.tv_sec = UATime.milliSec / 1000;
-  ts.tv_nsec = (UATime.milliSec % 1000) * 1000000;
-  return (ts.tv_sec * UA_DATETIME_SEC) + (ts.tv_nsec / 100) + UA_DATETIME_UNIX_EPOCH;
-}
-
-#endif /* UA_ARCHITECTURE_ECOS */
diff --git a/arch/freertosLWIP/CMakeLists.txt b/arch/freertosLWIP/CMakeLists.txt
deleted file mode 100644
index c4530dfd40c..00000000000
--- a/arch/freertosLWIP/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-SET(SOURCE_GROUP ${SOURCE_GROUP}\\freertosLWIP)
-
-ua_add_architecture("freertosLWIP")
-
-list (FIND UA_AMALGAMATION_ARCHITECTURES "freertosLWIP" _index)
-if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "freertosLWIP")
-
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-
-    if("${UA_ARCHITECTURE}" STREQUAL "freertosLWIP")
-        ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-        ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../common)
-    endif()
-endif()
diff --git a/arch/freertosLWIP/ua_architecture.h b/arch/freertosLWIP/ua_architecture.h
deleted file mode 100644
index 0f52a9e72a9..00000000000
--- a/arch/freertosLWIP/ua_architecture.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
- *    Copyright 2017-2018 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2018 (c) Jose Cabral, fortiss GmbH
- */
-
-#ifdef UA_ARCHITECTURE_FREERTOSLWIP
-
-#ifndef PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_
-#define PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_
-
-#if UA_MULTITHREADING >= 100
-#error Multithreading unsupported
-#else
-#define UA_LOCK_INIT(lock)
-#define UA_LOCK_DESTROY(lock)
-#define UA_LOCK(lock)
-#define UA_UNLOCK(lock)
-#define UA_LOCK_ASSERT(lock, num)
-#endif
-
-#define UA_strncasecmp strncasecmp
-
-#endif /* PLUGINS_ARCH_FREERTOSLWIP_UA_ARCHITECTURE_H_ */
-
-#endif /* UA_ARCHITECTURE_FREERTOSLWIP */
diff --git a/arch/freertosLWIP/ua_clock.c b/arch/freertosLWIP/ua_clock.c
deleted file mode 100644
index 2fa16184aeb..00000000000
--- a/arch/freertosLWIP/ua_clock.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2017 (c) Thomas Stalder
- *    Copyright 2021 (c) Simon Kueppers, 2pi-Labs GmbH
- */
-
-#ifdef UA_ARCHITECTURE_FREERTOSLWIP
-
-#include <open62541/types.h>
-#include <task.h>
-
-#ifdef UA_ARCHITECTURE_FREERTOSLWIP_POSIX_CLOCK
-
-UA_DateTime UA_DateTime_now(void) {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (tv.tv_sec * UA_DATETIME_SEC) + (tv.tv_usec * UA_DATETIME_USEC) + UA_DATETIME_UNIX_EPOCH;
-}
-
-/* Credit to https://stackoverflow.com/questions/13804095/get-the-time-zone-gmt-offset-in-c */
-UA_Int64 UA_DateTime_localTimeUtcOffset(void) {
-    time_t gmt, rawtime = time(NULL);
-    struct tm *ptm;
-    struct tm gbuf;
-    ptm = gmtime_r(&rawtime, &gbuf);
-    // Request that mktime() looksup dst in timezone database
-    ptm->tm_isdst = -1;
-    gmt = mktime(ptm);
-    return (UA_Int64) (difftime(rawtime, gmt) * UA_DATETIME_SEC);
-}
-
-#else /* UA_ARCHITECTURE_FREERTOSLWIP_POSIX_CLOCK */
-
-/* The current time in UTC time */
-UA_DateTime UA_DateTime_now(void) {
-  UA_DateTime microSeconds = ((UA_DateTime)xTaskGetTickCount()) * (1000000 / configTICK_RATE_HZ);
-  return ((microSeconds / 1000000) * UA_DATETIME_SEC) + ((microSeconds % 1000000) * UA_DATETIME_USEC) + UA_DATETIME_UNIX_EPOCH;
-}
-
-/* Offset between local time and UTC time */
-UA_Int64 UA_DateTime_localTimeUtcOffset(void) {
-  return 0; //TODO: this is set to zero since UA_DateTime_now() is just the local time, and not UTC.
-}
-
-#endif /* UA_ARCHITECTURE_FREERTOSLWIP_POSIX_CLOCK */
-
-/* CPU clock invariant to system time changes. Use only to measure durations,
- * not absolute time. */
-UA_DateTime UA_DateTime_nowMonotonic(void) {
-  return (((UA_DateTime)xTaskGetTickCount()) * 1000 / configTICK_RATE_HZ) * UA_DATETIME_MSEC;
-}
-
-#endif /* UA_ARCHITECTURE_FREERTOSLWIP */
diff --git a/arch/vxworks/CMakeLists.txt b/arch/vxworks/CMakeLists.txt
deleted file mode 100644
index ccc7c14c888..00000000000
--- a/arch/vxworks/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-SET(SOURCE_GROUP ${SOURCE_GROUP}\\vxworks)
-
-ua_add_architecture("vxworks")
-
-list (FIND UA_AMALGAMATION_ARCHITECTURES "vxworks" _index)
-if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "vxworks")
-
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-
-    if("${UA_ARCHITECTURE}" STREQUAL "vxworks")
-
-        ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-    endif()
-
-endif()
diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
deleted file mode 100644
index e7fb651acba..00000000000
--- a/arch/vxworks/ua_architecture.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright (c) 2020 Wind River Systems, Inc.
- */
-
-#ifdef UA_ARCHITECTURE_VXWORKS
-
-#ifndef PLUGINS_ARCH_VXWORKS_UA_ARCHITECTURE_H_
-#define PLUGINS_ARCH_VXWORKS_UA_ARCHITECTURE_H_
-
-#include <errno.h>
-#include <time.h>
-
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-
-#include <hostLib.h>
-#include <selectLib.h>
-#include <poll.h>
-
-#define UA_sleep_ms(X)                            \
- {                                                \
- struct timespec timeToSleep;                     \
-   timeToSleep.tv_sec = X / 1000;                 \
-   timeToSleep.tv_nsec = 1000000 * (X % 1000);    \
-   nanosleep(&timeToSleep, NULL);                 \
- }
-
-#ifdef UINT32_C
-# undef UINT32_C
-#endif
-
-#define UINT32_C(x) ((x) + (UINT32_MAX - UINT32_MAX))
-
-#ifdef UA_BINARY_OVERLAYABLE_FLOAT
-# undef UA_BINARY_OVERLAYABLE_FLOAT
-#endif
-#define UA_BINARY_OVERLAYABLE_FLOAT 1
-
-#define OPTVAL_TYPE int
-
-#include <fcntl.h>
-#include <unistd.h> // read, write, close
-#include <netinet/tcp.h>
-
-#define UA_fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
-#define UA_fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
-
-#define UA_access access
-
-#define UA_IPV6 1
-#define UA_SOCKET int
-#define UA_INVALID_SOCKET -1
-#define UA_ERRNO errno
-#define UA_INTERRUPTED EINTR
-#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
-#define UA_INPROGRESS EINPROGRESS
-#define UA_WOULDBLOCK EWOULDBLOCK
-
-#define UA_ENABLE_LOG_COLORS
-#define UA_POLLIN POLLIN
-#define UA_POLLOUT POLLOUT
-
-#define UA_poll poll
-#define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
-    getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
-#define UA_send send
-#define UA_recv recv
-#define UA_sendto sendto
-#define UA_recvfrom recvfrom
-#define UA_recvmsg recvmsg
-#define UA_htonl htonl
-#define UA_ntohl ntohl
-#define UA_close close
-#define UA_select select
-#define UA_shutdown shutdown
-#define UA_socket socket
-#define UA_bind bind
-#define UA_listen listen
-#define UA_accept accept
-#define UA_connect connect
-#define UA_getsockopt getsockopt
-#define UA_setsockopt setsockopt
-#define UA_ioctl ioctl
-#define UA_freeaddrinfo freeaddrinfo
-#define UA_gethostname gethostname
-#define UA_getsockname getsockname
-#define UA_inet_pton inet_pton
-#if UA_IPV6
-# define UA_if_nametoindex if_nametoindex
-#endif
-
-#include <stdlib.h>
-#define UA_free free
-#define UA_malloc malloc
-#define UA_calloc calloc
-#define UA_realloc realloc
-
-#define UA_strncasecmp strncasecmp
-
-#define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
-    char *errno_str = strerror(errno); \
-    LOG; \
-}
-#define UA_LOG_SOCKET_ERRNO_GAI_WRAP(LOG) { \
-    char *errno_str = gai_strerror(errno); \
-    LOG; \
-}
-
-#if UA_MULTITHREADING >= 100
-#error Multithreading unsupported
-#else
-#define UA_LOCK_INIT(lock)
-#define UA_LOCK_DESTROY(lock)
-#define UA_LOCK(lock)
-#define UA_UNLOCK(lock)
-#define UA_LOCK_ASSERT(lock, num)
-#endif
-
-#endif /* PLUGINS_ARCH_VXWORKS_UA_ARCHITECTURE_H_ */
-
-#endif /* UA_ARCHITECTURE_VXWORKS */
diff --git a/arch/vxworks/ua_clock.c b/arch/vxworks/ua_clock.c
deleted file mode 100644
index 77be8eed56f..00000000000
--- a/arch/vxworks/ua_clock.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2016-2017 (c) Julius Pfrommer, Fraunhofer IOSB
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2017 (c) Thomas Stalder
- */
-
-#ifdef UA_ARCHITECTURE_VXWORKS
-
-#ifndef _DEFAULT_SOURCE
-# define _DEFAULT_SOURCE
-#endif
-/* On older systems we need to define _BSD_SOURCE.
- * _DEFAULT_SOURCE is an alias for that. */
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
-#endif
-
-#include <time.h>
-#include <sys/time.h>
-
-#include <open62541/types.h>
-
-UA_DateTime UA_DateTime_now(void){
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  return (tv.tv_sec * UA_DATETIME_SEC) + (tv.tv_usec * UA_DATETIME_USEC) + UA_DATETIME_UNIX_EPOCH;
-}
-
-/* Credit to https://stackoverflow.com/questions/13804095/get-the-time-zone-gmt-offset-in-c */
-UA_Int64 UA_DateTime_localTimeUtcOffset(void){
-  time_t gmt, rawtime = time(NULL);
-
-  struct tm *ptm;
-  struct tm gbuf;
-  ptm = gmtime_r(&rawtime, &gbuf);
-  // Request that mktime() looksup dst in timezone database
-  ptm->tm_isdst = -1;
-  gmt = mktime(ptm);
-
-  return (UA_Int64) (difftime(rawtime, gmt) * UA_DATETIME_SEC);
-}
-
-UA_DateTime UA_DateTime_nowMonotonic(void) {
-  struct timespec ts;
-#if !defined(CLOCK_MONOTONIC_RAW)
-  clock_gettime(CLOCK_MONOTONIC, &ts);
-#else
-  clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
-#endif
-  return (ts.tv_sec * UA_DATETIME_SEC) + (ts.tv_nsec / 100);
-}
-
-#endif /* UA_ARCHITECTURE_VXWORKS */
-
diff --git a/arch/wec7/CMakeLists.txt b/arch/wec7/CMakeLists.txt
deleted file mode 100644
index 131967ce000..00000000000
--- a/arch/wec7/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-SET(SOURCE_GROUP ${SOURCE_GROUP}\\wec7)
-
-ua_add_architecture("wec7")
-
-list (FIND UA_AMALGAMATION_ARCHITECTURES "wec7" _index)
-if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "wec7")
-
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-
-    if("${UA_ARCHITECTURE}" STREQUAL "wec7")
-        ua_architecture_append_to_library(ws2)
-        ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-    endif()
-
-endif()
diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
deleted file mode 100644
index a6ceb5d6167..00000000000
--- a/arch/wec7/ua_architecture.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Stephan Kantelberg
- */
-
-#ifdef UA_ARCHITECTURE_WEC7
-
-#ifndef PLUGINS_ARCH_WEC7_UA_ARCHITECTURE_H_
-#define PLUGINS_ARCH_WEC7_UA_ARCHITECTURE_H_
-
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
-#endif
-
-/* Disable some security warnings on MSVC */
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-# define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "stdint.h"
-#ifdef UNDER_CE
-#define MAX_STRERROR 31
-static char *errorStrings[]= {"Error 0","","No such file or directory","","","","","Arg list too long",
-                              "Exec format error","Bad file number","","","Not enough core","Permission denied","","",
-                              "","File exists","Cross-device link","","","","Invalid argument","","Too many open files",
-                              "","","","No space left on device","","","","","Math argument","Result too large","",
-                              "Resource deadlock would occur", "Unknown error under wince"};
-
-char *strerror(int errnum);
-#endif
-
-#include <stdlib.h>
-#if defined(_WIN32)
-# include <malloc.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-
-#ifdef _MSC_VER
-# ifndef UNDER_CE
-#  include <io.h> //access
-#  define UA_access _access
-# endif
-#else
-# include <unistd.h> //access and tests
-# define UA_access access
-#endif
-
-#define ssize_t int
-#define OPTVAL_TYPE char
-#ifdef UA_sleep_ms
-void UA_sleep_ms(unsigned long ms);
-#else
-# define UA_sleep_ms(X) Sleep(X)
-#endif
-
-// Windows does not support ansi colors
-// #define UA_ENABLE_LOG_COLORS
-
-#define UA_SOCKET SOCKET
-#define UA_INVALID_SOCKET INVALID_SOCKET
-#define UA_ERRNO WSAGetLastError()
-#define UA_INTERRUPTED WSAEINTR
-#define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
-#define UA_INPROGRESS EINPROGRESS
-#define UA_WOULDBLOCK WSAEWOULDBLOCK
-
-typedef struct pollfd {
-  SOCKET fd;
-  SHORT  events;
-  SHORT  revents;
-} WSAPOLLFD, *PWSAPOLLFD, *LPWSAPOLLFD;
-
-#define UA_POLLIN 0
-#define UA_POLLOUT 0
-
-#define UA_fd_set(fd, fds) FD_SET((UA_SOCKET)fd, fds)
-#define UA_fd_isset(fd, fds) FD_ISSET((UA_SOCKET)fd, fds)
-
-#ifdef UNDER_CE
-#define UA_ERRNO WSAGetLastError()
-#endif
-
-#define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
-    getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
-#define UA_poll(fds,nfds,timeout) 1
-#define UA_send(sockfd, buf, len, flags) send(sockfd, buf, (int)(len), flags)
-#define UA_recv recv
-#define UA_sendto(sockfd, buf, len, flags, dest_addr, addrlen) sendto(sockfd, (const char*)(buf), (int)(len), flags, dest_addr, (int) (addrlen))
-#define UA_recvfrom(sockfd, buf, len, flags, src_addr, addrlen) recvfrom(sockfd, (char*)(buf), (int)(len), flags, src_addr, addrlen)
-#define UA_recvmsg
-#define UA_htonl htonl
-#define UA_ntohl ntohl
-#define UA_close closesocket
-#define UA_select(nfds, readfds, writefds, exceptfds, timeout) select((int)(nfds), readfds, writefds, exceptfds, timeout)
-#define UA_shutdown shutdown
-#define UA_socket socket
-#define UA_bind bind
-#define UA_listen listen
-#define UA_accept accept
-#define UA_connect(sockfd, addr, addrlen) connect(sockfd, addr, (int)(addrlen))
-#define UA_getsockopt getsockopt
-#define UA_setsockopt(sockfd, level, optname, optval, optlen) setsockopt(sockfd, level, optname, (const char*) (optval), optlen)
-#define UA_ioctl
-#define UA_freeaddrinfo freeaddrinfo
-#define UA_gethostname gethostname
-#define UA_getsockname getsockname
-#define UA_inet_pton InetPton
-
-#ifdef maxStringLength //defined in mingw64
-# undef maxStringLength
-#endif
-
-#ifndef UA_free
-#define UA_free free
-#define UA_malloc malloc
-#define UA_calloc calloc
-#define UA_realloc realloc
-#endif
-
-#define UA_strncasecmp _strnicmp
-
-#define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
-    LPVOID errno_str = NULL; \
-    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, \
-    NULL, WSAGetLastError(), \
-    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), \
-    (LPWSTR)&errno_str, \
-    0, NULL); \
-    LOG; \
-    LocalFree(errno_str); \
-}
-#define UA_LOG_SOCKET_ERRNO_GAI_WRAP UA_LOG_SOCKET_ERRNO_WRAP
-
-#if UA_MULTITHREADING >= 100
-#error Multithreading unsupported
-#else
-#define UA_LOCK_INIT(lock)
-#define UA_LOCK_DESTROY(lock)
-#define UA_LOCK(lock)
-#define UA_UNLOCK(lock)
-#define UA_LOCK_ASSERT(lock, num)
-#endif
-
-/* Fix redefinition of SLIST_ENTRY on mingw winnt.h */
-#if !defined(_SYS_QUEUE_H_) && defined(SLIST_ENTRY)
-# undef SLIST_ENTRY
-#endif
-
-#endif /* PLUGINS_ARCH_WEC7_UA_ARCHITECTURE_H_ */
-
-#endif /* UA_ARCHITECTURE_WEC7 */
diff --git a/arch/wec7/ua_clock.c b/arch/wec7/ua_clock.c
deleted file mode 100644
index 4f81c54ace0..00000000000
--- a/arch/wec7/ua_clock.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- *    Copyright 2018 (c) Stephan Kantelberg
- */
-
-#ifdef UA_ARCHITECTURE_WEC7
-
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
-#endif
-
-#include <open62541/types.h>
-#include <time.h>
-/* Backup definition of SLIST_ENTRY on mingw winnt.h */
-# ifdef SLIST_ENTRY
-#  pragma push_macro("SLIST_ENTRY")
-#  undef SLIST_ENTRY
-#  define POP_SLIST_ENTRY
-# endif
-# include <windows.h>
-/* restore definition */
-# ifdef POP_SLIST_ENTRY
-#  undef SLIST_ENTRY
-#  undef POP_SLIST_ENTRY
-#  pragma pop_macro("SLIST_ENTRY")
-# endif
-
-UA_DateTime UA_DateTime_now(void) {
-    /* Windows filetime has the same definition as UA_DateTime */
-    FILETIME ft;
-    SYSTEMTIME st;
-    GetSystemTime(&st);
-    SystemTimeToFileTime(&st, &ft);
-    ULARGE_INTEGER ul;
-    ul.LowPart = ft.dwLowDateTime;
-    ul.HighPart = ft.dwHighDateTime;
-    return (UA_DateTime)ul.QuadPart;
-}
-
-UA_Int64 UA_DateTime_localTimeUtcOffset(void) {
-    return 0;
-}
-
-UA_DateTime UA_DateTime_nowMonotonic(void) {
-    LARGE_INTEGER freq, ticks;
-    QueryPerformanceFrequency(&freq);
-    QueryPerformanceCounter(&ticks);
-    UA_Double ticks2dt = UA_DATETIME_SEC / (UA_Double)freq.QuadPart;
-    return (UA_DateTime)(ticks.QuadPart * ticks2dt);
-}
-
-#endif /* UA_ARCHITECTURE_WEC7 */

From 0a03286e77d69fd5e1f674909a9d6d23c36ab74b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 29 Jul 2023 17:35:54 +0200
Subject: [PATCH 1087/1963] refactor(arch): Remove UA_bind macro

---
 arch/eventloop_posix_eth.c   | 2 +-
 arch/eventloop_posix_tcp.c   | 2 +-
 arch/eventloop_posix_udp.c   | 2 +-
 arch/posix/ua_architecture.h | 1 -
 arch/win32/ua_architecture.h | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index e06c0e4bdde..edf42c75e99 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -430,7 +430,7 @@ ETH_openListenConnection(UA_EventLoopPOSIX *el, ETH_FD *conn,
     sll.sll_family = AF_PACKET;
     sll.sll_protocol = htons(etherType);
     sll.sll_ifindex = ifindex;
-    if(UA_bind(conn->rfd.fd, (struct sockaddr*)&sll, sizeof(sll)) < 0)
+    if(bind(conn->rfd.fd, (struct sockaddr*)&sll, sizeof(sll)) < 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     /* Immediately register for listen events. Don't have to wait for a
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index bbdc8a532d0..c9c25bdb6a9 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -424,7 +424,7 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
     }
 
     /* Bind socket to address */
-    int ret = UA_bind(listenSocket, ai->ai_addr, (socklen_t)ai->ai_addrlen);
+    int ret = bind(listenSocket, ai->ai_addr, (socklen_t)ai->ai_addrlen);
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index be8388d37d2..eff9b515e48 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -718,7 +718,7 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
     }
 
     /* Bind socket to the address */
-    int ret = UA_bind(listenSocket, info->ai_addr, (socklen_t)info->ai_addrlen);
+    int ret = bind(listenSocket, info->ai_addr, (socklen_t)info->ai_addrlen);
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 28b04c2c16b..3e86279a6ff 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -87,7 +87,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_select select
 #define UA_shutdown shutdown
 #define UA_socket socket
-#define UA_bind bind
 #define UA_listen listen
 #define UA_accept accept
 #define UA_connect connect
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 5534fd494f2..7f287a7efe3 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -96,7 +96,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_select(nfds, readfds, writefds, exceptfds, timeout) select((int)(nfds), readfds, writefds, exceptfds, timeout)
 #define UA_shutdown shutdown
 #define UA_socket socket
-#define UA_bind bind
 #define UA_listen listen
 #define UA_accept accept
 #define UA_connect(sockfd, addr, addrlen) connect(sockfd, addr, (int)(addrlen))

From 83feae770a820f86876ddb552dd62b53d2f70ae9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 29 Jul 2023 17:40:41 +0200
Subject: [PATCH 1088/1963] refactor(arch): Remove unused macro definitions

---
 arch/posix/ua_architecture.h | 18 ------------------
 arch/win32/ua_architecture.h | 24 ------------------------
 2 files changed, 42 deletions(-)

diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 3e86279a6ff..9e10e7a46b7 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -21,14 +21,6 @@
 #include <sys/types.h>
 #include <net/if.h>
 #include <poll.h>
-#ifdef UA_sleep_ms
-void UA_sleep_ms(unsigned long ms);
-#else
-# include <unistd.h>
-# define UA_sleep_ms(X) usleep(X * 1000)
-#endif
-
-#define OPTVAL_TYPE int
 
 #include <fcntl.h>
 #include <unistd.h> // read, write, close
@@ -59,8 +51,6 @@ void UA_sleep_ms(unsigned long ms);
 # define UA_fd_isset(fd, fds) FD_ISSET(fd, fds)
 #endif
 
-#define UA_access access
-
 #define UA_IPV6 1
 #define UA_SOCKET int
 #define UA_INVALID_SOCKET -1
@@ -79,13 +69,10 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_send send
 #define UA_recv recv
 #define UA_sendto sendto
-#define UA_recvfrom recvfrom
-#define UA_recvmsg recvmsg
 #define UA_htonl htonl
 #define UA_ntohl ntohl
 #define UA_close close
 #define UA_select select
-#define UA_shutdown shutdown
 #define UA_socket socket
 #define UA_listen listen
 #define UA_accept accept
@@ -94,16 +81,11 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_setsockopt setsockopt
 #define UA_ioctl ioctl
 #define UA_freeaddrinfo freeaddrinfo
-#define UA_gethostname gethostname
-#define UA_getsockname getsockname
 #define UA_inet_pton inet_pton
 #if UA_IPV6
 # define UA_if_nametoindex if_nametoindex
 #endif
 
-#include <strings.h>
-#define UA_strncasecmp strncasecmp
-
 #define UA_clean_errno(STR_FUN) (errno == 0 ? (char*) "None" : (STR_FUN)(errno))
 
 #define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 7f287a7efe3..c6b8236c5b6 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -40,27 +40,10 @@
 #include <ws2tcpip.h>
 #include <basetsd.h>
 
-#if defined (_MSC_VER) || defined(__clang__)
-# ifndef UNDER_CE
-#  include <io.h> //access
-#  define UA_access _access
-# endif
-#else
-# include <unistd.h> //access and tests
-# define UA_access access
-#endif
-
 #ifndef _SSIZE_T_DEFINED
 typedef SSIZE_T ssize_t;
 #endif
 
-#define OPTVAL_TYPE int
-#ifdef UA_sleep_ms
-void UA_sleep_ms(unsigned long ms);
-#else
-# define UA_sleep_ms(X) Sleep(X)
-#endif
-
 // Windows does not support ansi colors
 // #define UA_ENABLE_LOG_COLORS
 
@@ -88,13 +71,10 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_send(sockfd, buf, len, flags) send(sockfd, buf, (int)(len), flags)
 #define UA_recv(sockfd, buf, len, flags) recv(sockfd, buf, (int)(len), flags)
 #define UA_sendto(sockfd, buf, len, flags, dest_addr, addrlen) sendto(sockfd, (const char*)(buf), (int)(len), flags, dest_addr, (int) (addrlen))
-#define UA_recvfrom(sockfd, buf, len, flags, src_addr, addrlen) recvfrom(sockfd, (char*)(buf), (int)(len), flags, src_addr, addrlen)
-#define UA_recvmsg
 #define UA_htonl htonl
 #define UA_ntohl ntohl
 #define UA_close closesocket
 #define UA_select(nfds, readfds, writefds, exceptfds, timeout) select((int)(nfds), readfds, writefds, exceptfds, timeout)
-#define UA_shutdown shutdown
 #define UA_socket socket
 #define UA_listen listen
 #define UA_accept accept
@@ -103,8 +83,6 @@ void UA_sleep_ms(unsigned long ms);
 #define UA_setsockopt(sockfd, level, optname, optval, optlen) setsockopt(sockfd, level, optname, (const char*) (optval), optlen)
 #define UA_ioctl
 #define UA_freeaddrinfo freeaddrinfo
-#define UA_gethostname gethostname
-#define UA_getsockname getsockname
 #define UA_inet_pton InetPton
 
 #if UA_IPV6
@@ -129,8 +107,6 @@ void UA_sleep_ms(unsigned long ms);
 # undef maxStringLength
 #endif
 
-#define UA_strncasecmp _strnicmp
-
 #define UA_LOG_SOCKET_ERRNO_WRAP(LOG) { \
     char *errno_str = NULL; \
     FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, \

From 796e3e9c813d6d75ef0f96f75e7a585ee55e8e15 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 29 Jul 2023 17:41:59 +0200
Subject: [PATCH 1089/1963] refactor(arch): Remove UA_fd macro

---
 arch/eventloop_posix_select.c | 12 ++++++------
 arch/posix/ua_architecture.h  | 14 --------------
 arch/win32/ua_architecture.h  |  3 ---
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/arch/eventloop_posix_select.c b/arch/eventloop_posix_select.c
index f5465aafbc6..004878d37dc 100644
--- a/arch/eventloop_posix_select.c
+++ b/arch/eventloop_posix_select.c
@@ -84,12 +84,12 @@ setFDSets(UA_EventLoopPOSIX *el, fd_set *readset, fd_set *writeset, fd_set *errs
 
         /* Add to the fd_sets */
         if(el->fds[i]->listenEvents & UA_FDEVENT_IN)
-            UA_fd_set(currentFD, readset);
+            FD_SET(currentFD, readset);
         if(el->fds[i]->listenEvents & UA_FDEVENT_OUT)
-            UA_fd_set(currentFD, writeset);
+            FD_SET(currentFD, writeset);
 
         /* Always return errors */
-        UA_fd_set(currentFD, errset);
+        FD_SET(currentFD, errset);
 
         /* Highest fd? */
         if(currentFD > highestfd || highestfd == UA_INVALID_FD)
@@ -140,11 +140,11 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
 
         /* Error Event */
         short event = 0;
-        if(UA_fd_isset(fd, &readset)) {
+        if(FD_ISSET(fd, &readset)) {
             event = UA_FDEVENT_IN;
-        } else if(UA_fd_isset(fd, &writeset)) {
+        } else if(FD_ISSET(fd, &writeset)) {
             event = UA_FDEVENT_OUT;
-        } else if(UA_fd_isset(fd, &errset)) {
+        } else if(FD_ISSET(fd, &errset)) {
             event = UA_FDEVENT_ERR;
         } else {
             continue;
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 9e10e7a46b7..3c1e570fe72 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -37,20 +37,6 @@
 
 #include <netinet/tcp.h>
 
-/* unsigned int for windows and workaround to a glibc bug */
-/* Additionally if GNU_LIBRARY is not defined, it may be using
- * musl libc (e.g. Docker Alpine) */
-#if  defined(__OpenBSD__) || \
-    (defined(__GNU_LIBRARY__) && (__GNU_LIBRARY__ <= 6) && \
-     (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 16) || \
-    !defined(__GNU_LIBRARY__))
-# define UA_fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
-# define UA_fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
-#else
-# define UA_fd_set(fd, fds) FD_SET(fd, fds)
-# define UA_fd_isset(fd, fds) FD_ISSET(fd, fds)
-#endif
-
 #define UA_IPV6 1
 #define UA_SOCKET int
 #define UA_INVALID_SOCKET -1
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index c6b8236c5b6..f95046eff68 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -58,9 +58,6 @@ typedef SSIZE_T ssize_t;
 #define UA_POLLIN POLLRDNORM
 #define UA_POLLOUT POLLWRNORM
 
-#define UA_fd_set(fd, fds) FD_SET((UA_SOCKET)fd, fds)
-#define UA_fd_isset(fd, fds) FD_ISSET((UA_SOCKET)fd, fds)
-
 #ifdef UNDER_CE
 # define errno
 #endif

From 0bfb1e947844923477e2f0f3b598f060d82bfda5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 29 Jul 2023 17:45:44 +0200
Subject: [PATCH 1090/1963] refactor(arch): Remove unneeded macro indirections

---
 arch/eventloop_posix_eth.c   |  6 +++---
 arch/eventloop_posix_tcp.c   |  8 ++++----
 arch/eventloop_posix_udp.c   | 12 ++++++------
 arch/posix/ua_architecture.h |  7 -------
 arch/win32/ua_architecture.h | 19 ++++++++-----------
 5 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index edf42c75e99..4ed043db092 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -316,7 +316,7 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 
     /* Get the number of available bytes */
     int bytes_available = 0;
-    UA_ioctl(rfd->fd, FIONREAD, &bytes_available);
+    ioctl(rfd->fd, FIONREAD, &bytes_available);
     if(bytes_available <= 0)
         return;
 
@@ -617,9 +617,9 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
     ETH_FD *conn = NULL;
     UA_FD sockfd;
     if(listen && *listen)
-        sockfd = UA_socket(PF_PACKET, SOCK_RAW, htons(etherType));
+        sockfd = socket(PF_PACKET, SOCK_RAW, htons(etherType));
     else
-        sockfd = UA_socket(PF_PACKET, SOCK_RAW, 0); /* Don't receive */
+        sockfd = socket(PF_PACKET, SOCK_RAW, 0); /* Don't receive */
     if(sockfd == -1) {
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "ETH\t| Could not create a raw Ethernet socket (are you root?)");
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index c9c25bdb6a9..e191403fd93 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -235,7 +235,7 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn, short event) {
     /* Try to accept a new connection */
     struct sockaddr_storage remote;
     socklen_t remote_size = sizeof(remote);
-    UA_FD newsockfd = UA_accept(conn->rfd.fd, (struct sockaddr*)&remote, &remote_size);
+    UA_FD newsockfd = accept(conn->rfd.fd, (struct sockaddr*)&remote, &remote_size);
     if(newsockfd == UA_INVALID_FD) {
         /* Temporary error -- retry */
         if(UA_ERRNO == UA_INTERRUPTED)
@@ -355,7 +355,7 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
     }
 
     /* Create the server socket */
-    UA_FD listenSocket = UA_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+    UA_FD listenSocket = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -435,7 +435,7 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
     }
 
     /* Start listening */
-    if(UA_listen(listenSocket, UA_MAXBACKLOG) < 0) {
+    if(listen(listenSocket, UA_MAXBACKLOG) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error listening on the socket (%s)",
@@ -549,7 +549,7 @@ TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
                                                  connectionCallback);
         ai = ai->ai_next;
     }
-    UA_freeaddrinfo(res);
+    freeaddrinfo(res);
 
     return total_result;
 }
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index eff9b515e48..77d0aedd911 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -299,7 +299,7 @@ setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValue
                        const UA_Logger *logger) {
     IpMulticastRequest ipMulticastRequest;
     ipMulticastRequest.ipv4.imr_multiaddr = addr->sin_addr;
-    ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY); /* default ANY */
+    ipMulticastRequest.ipv4.imr_interface.s_addr = htonl(INADDR_ANY); /* default ANY */
 
     /* Use a defined network interface */
     const UA_String *netif = (const UA_String*)
@@ -346,7 +346,7 @@ setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sock
                          const UA_Logger *logger) {
     IpMulticastRequest ipMulticastRequest;
     ipMulticastRequest.ipv4.imr_multiaddr = addr->sin_addr;
-    ipMulticastRequest.ipv4.imr_interface.s_addr = UA_htonl(INADDR_ANY); /* default ANY */
+    ipMulticastRequest.ipv4.imr_interface.s_addr = htonl(INADDR_ANY); /* default ANY */
 
     /* Use a defined interface */
     const UA_String *netif = (const UA_String*)
@@ -694,7 +694,7 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
     }
 
     /* Create the listen socket */
-    UA_FD listenSocket = UA_socket(info->ai_family, info->ai_socktype, info->ai_protocol);
+    UA_FD listenSocket = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -831,7 +831,7 @@ UDP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
             break;
         ai = ai->ai_next;
     }
-    UA_freeaddrinfo(res);
+    freeaddrinfo(res);
     return rv;
 }
 
@@ -1040,7 +1040,7 @@ UDP_openSendConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *par
                                             portStr, &info, el->eventLoop.logger);
     if(error < 0 || info == NULL) {
         if(info != NULL) {
-            UA_freeaddrinfo(info);
+            freeaddrinfo(info);
         }
         UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                      "UDP\t| Opening a connection failed");
@@ -1063,7 +1063,7 @@ UDP_openSendConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *par
         registerSocketAndDestinationForSend(params, hostname, info,
                                             error, conn, &newSock,
                                             el->eventLoop.logger);
-    UA_freeaddrinfo(info);
+    freeaddrinfo(info);
     if(validate && res == UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "UDP %u\t| Connection validated to \"%s\" on port %s",
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 3c1e570fe72..99f1e88572d 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -55,18 +55,11 @@
 #define UA_send send
 #define UA_recv recv
 #define UA_sendto sendto
-#define UA_htonl htonl
-#define UA_ntohl ntohl
 #define UA_close close
 #define UA_select select
-#define UA_socket socket
-#define UA_listen listen
-#define UA_accept accept
 #define UA_connect connect
 #define UA_getsockopt getsockopt
 #define UA_setsockopt setsockopt
-#define UA_ioctl ioctl
-#define UA_freeaddrinfo freeaddrinfo
 #define UA_inet_pton inet_pton
 #if UA_IPV6
 # define UA_if_nametoindex if_nametoindex
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index f95046eff68..d9fc374ffcd 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -67,19 +67,16 @@ typedef SSIZE_T ssize_t;
 #define UA_poll(fds,nfds,timeout) WSAPoll((LPWSAPOLLFD)fds, nfds, timeout)
 #define UA_send(sockfd, buf, len, flags) send(sockfd, buf, (int)(len), flags)
 #define UA_recv(sockfd, buf, len, flags) recv(sockfd, buf, (int)(len), flags)
-#define UA_sendto(sockfd, buf, len, flags, dest_addr, addrlen) sendto(sockfd, (const char*)(buf), (int)(len), flags, dest_addr, (int) (addrlen))
-#define UA_htonl htonl
-#define UA_ntohl ntohl
+#define UA_sendto(sockfd, buf, len, flags, dest_addr, addrlen) \
+    sendto(sockfd, (const char*)(buf), (int)(len), flags, dest_addr, (int) (addrlen))
 #define UA_close closesocket
-#define UA_select(nfds, readfds, writefds, exceptfds, timeout) select((int)(nfds), readfds, writefds, exceptfds, timeout)
-#define UA_socket socket
-#define UA_listen listen
-#define UA_accept accept
+#define UA_select(nfds, readfds, writefds, exceptfds, timeout) \
+    select((int)(nfds), readfds, writefds, exceptfds, timeout)
 #define UA_connect(sockfd, addr, addrlen) connect(sockfd, addr, (int)(addrlen))
-#define UA_getsockopt(sockfd, level, optname, optval, optlen) getsockopt(sockfd, level, optname, (char*) (optval), optlen)
-#define UA_setsockopt(sockfd, level, optname, optval, optlen) setsockopt(sockfd, level, optname, (const char*) (optval), optlen)
-#define UA_ioctl
-#define UA_freeaddrinfo freeaddrinfo
+#define UA_getsockopt(sockfd, level, optname, optval, optlen) \
+    getsockopt(sockfd, level, optname, (char*) (optval), optlen)
+#define UA_setsockopt(sockfd, level, optname, optval, optlen) \
+    setsockopt(sockfd, level, optname, (const char*) (optval), optlen)
 #define UA_inet_pton InetPton
 
 #if UA_IPV6

From 16f68d8703e133670107e3e419d2eb6960bd7739 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 29 Jul 2023 18:12:01 +0200
Subject: [PATCH 1091/1963] refactor(arch): Clean up architecture includes

---
 arch/posix/ua_architecture.h | 13 +++----------
 arch/win32/ua_architecture.h | 31 ++++---------------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 99f1e88572d..439d255d21e 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -14,29 +14,22 @@
 
 #include <errno.h>
 #include <arpa/inet.h>
-#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
-#include <sys/types.h>
 #include <net/if.h>
 #include <poll.h>
-
 #include <fcntl.h>
-#include <unistd.h> // read, write, close
+#include <unistd.h>
 
-#ifdef __QNX__
-# include <sys/socket.h>
-#endif
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 # include <sys/param.h>
 # if defined(BSD)
-#  include<sys/socket.h>
+#  include <sys/socket.h>
 # endif
 #endif
 
-#include <netinet/tcp.h>
-
 #define UA_IPV6 1
 #define UA_SOCKET int
 #define UA_INVALID_SOCKET -1
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index d9fc374ffcd..0d4af50cc30 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -16,23 +16,9 @@
 # define _CRT_SECURE_NO_WARNINGS
 #endif
 
-/* Assume that Windows versions are newer than Windows XP */
-#if defined(__MINGW32__) && (!defined(WINVER) || WINVER < 0x501)
-# undef WINVER
-# undef _WIN32_WINDOWS
-# undef _WIN32_WINNT
-# define WINVER 0x0600
-# define _WIN32_WINDOWS 0x0600
-# define _WIN32_WINNT 0x0600 //windows vista version, which included InepPton
-#endif
-
-#include <stdlib.h>
-#if defined(_WIN32) && !defined(__clang__)
-# include <malloc.h>
-#endif
-
 #include <open62541/config.h>
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 #include <winsock2.h>
@@ -44,9 +30,6 @@
 typedef SSIZE_T ssize_t;
 #endif
 
-// Windows does not support ansi colors
-// #define UA_ENABLE_LOG_COLORS
-
 #define UA_IPV6 1
 #define UA_SOCKET SOCKET
 #define UA_INVALID_SOCKET INVALID_SOCKET
@@ -58,10 +41,6 @@ typedef SSIZE_T ssize_t;
 #define UA_POLLIN POLLRDNORM
 #define UA_POLLOUT POLLWRNORM
 
-#ifdef UNDER_CE
-# define errno
-#endif
-
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
     getnameinfo(sa, (socklen_t)salen, host, (DWORD)hostlen, serv, (DWORD)servlen, flags)
 #define UA_poll(fds,nfds,timeout) WSAPoll((LPWSAPOLLFD)fds, nfds, timeout)
@@ -80,21 +59,19 @@ typedef SSIZE_T ssize_t;
 #define UA_inet_pton InetPton
 
 #if UA_IPV6
+# define UA_if_nametoindex if_nametoindex
+
 # if defined(__WINCRYPT_H__) && defined(UA_ENABLE_ENCRYPTION_LIBRESSL)
 #  error "Wincrypt is not compatible with LibreSSL"
 # endif
-# ifdef UA_ENABLE_ENCRYPTION_LIBRESSL
 /* Hack: Prevent Wincrypt-Includes */
+# ifdef UA_ENABLE_ENCRYPTION_LIBRESSL
 #  define __WINCRYPT_H__
 # endif
-
 # include <iphlpapi.h>
-
 # ifdef UA_ENABLE_ENCRYPTION_LIBRESSL
 #  undef __WINCRYPT_H__
 # endif
-
-# define UA_if_nametoindex if_nametoindex
 #endif
 
 #ifdef maxStringLength //defined in mingw64

From 7547a8a9dc0b64eaf7a568305d82a78da6a6a6a1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 29 Jul 2023 18:57:37 +0200
Subject: [PATCH 1092/1963] refactor(build): Simplify architecture-based build
 config

---
 CMakeLists.txt                    | 769 +++++++++++++-----------------
 arch/posix/CMakeLists.txt         |  32 --
 arch/posix/ua_clock.c             |   4 +-
 arch/win32/CMakeLists.txt         |  21 -
 arch/win32/ua_clock.c             |   8 +-
 include/open62541/config.h.in     |  26 +-
 src/client/ua_client_internal.h   |   1 -
 src/server/ua_subscription.h      |   1 -
 tests/CMakeLists.txt              |   1 +
 tests/fuzz/CMakeLists.txt         |   1 +
 tools/cmake/macros_internal.cmake |  55 ---
 tools/cmake/macros_public.cmake   |   1 +
 12 files changed, 347 insertions(+), 573 deletions(-)
 delete mode 100644 arch/posix/CMakeLists.txt
 delete mode 100644 arch/win32/CMakeLists.txt
 delete mode 100644 tools/cmake/macros_internal.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e652b6f1675..853c5b3c30f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,18 +15,13 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/tools/cmake")
 if(${CMAKE_VERSION} VERSION_LESS 3.12)
     set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/tools/cmake3.12")
 endif()
+
 find_package(Python3 REQUIRED)
 set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+
 find_package(Git)
 include(AssignSourceGroup)
 include(GNUInstallDirs)
-
-# Set when installed via make install
-set(open62541_TOOLS_DIR ${PROJECT_SOURCE_DIR}/tools)
-set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path to the nodetset directory.")
-set(open62541_MQTT_DIR ${PROJECT_SOURCE_DIR}/deps/mqtt-c)
-
-include(macros_internal)
 include(macros_public)
 
 #############################
@@ -64,36 +59,15 @@ set_open62541_version()
 set(OPEN62541_VERSION "v${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}${OPEN62541_VER_LABEL}")
 MESSAGE(STATUS "open62541 Version: ${OPEN62541_VERSION}")
 
-#################
-# Build Options #
-#################
-
-# Set default build type.
-if(NOT CMAKE_BUILD_TYPE)
-    message(STATUS "CMAKE_BUILD_TYPE not given; setting to 'Debug'")
-    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build" FORCE)
-endif()
-
-option(UA_ENABLE_AMALGAMATION "Concatenate the library to a single file open62541.h/.c" OFF)
-set(UA_AMALGAMATION_ARCHITECTURES "" CACHE STRING "List of architectures to include in amalgamation")
-mark_as_advanced(UA_AMALGAMATION_ARCHITECTURES)
-
-# Platform. This is at the beginning in case the architecture changes some UA options
-set(UA_ARCHITECTURE "None" CACHE STRING "Architecture to build open62541 on")
+################
+# Architecture #
+################
 
-if(UA_ENABLE_AMALGAMATION)
-    if("${UA_AMALGAMATION_ARCHITECTURES}" STREQUAL "")
-        if(NOT "${UA_ARCHITECTURE}" STREQUAL "None")
-            set(UA_AMALGAMATION_ARCHITECTURES "${UA_ARCHITECTURE}")
-        else()
-            # select some default architectures which should be included
-            set(UA_AMALGAMATION_ARCHITECTURES "win32;posix")
-        endif()
-    endif()
-    message(STATUS "Architectures included in amalgamation: ${UA_AMALGAMATION_ARCHITECTURES}")
-endif()
+set(UA_ARCHITECTURES "none" "posix" "win32")
+set(UA_ARCHITECTURE "" CACHE STRING "Architecture to build open62541 for")
+SET_PROPERTY(CACHE UA_ARCHITECTURE PROPERTY STRINGS "" ${UA_ARCHITECTURES})
 
-if("${UA_ARCHITECTURE}" STREQUAL "None")
+if("${UA_ARCHITECTURE}" STREQUAL "")
     if(UNIX)
         set(UA_ARCHITECTURE "posix" CACHE STRING "" FORCE)
     elseif(WIN32)
@@ -102,55 +76,24 @@ if("${UA_ARCHITECTURE}" STREQUAL "None")
 endif()
 
 message(STATUS "The selected architecture is: ${UA_ARCHITECTURE}")
-string(TOUPPER ${UA_ARCHITECTURE} UA_ARCHITECTURE_UPPER)
-add_definitions(-DUA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
-
-add_subdirectory(arch)
-
-GET_PROPERTY(architectures GLOBAL PROPERTY UA_ARCHITECTURES)
-list(SORT architectures)
-set_property(CACHE UA_ARCHITECTURE PROPERTY STRINGS None ${architectures})
-
-GET_PROPERTY(ua_architecture_directories_to_include GLOBAL PROPERTY UA_INCLUDE_DIRECTORIES)
 
-GET_PROPERTY(ua_architecture_headers GLOBAL PROPERTY UA_ARCHITECTURE_HEADERS)
-
-GET_PROPERTY(ua_architecture_headers_beginning GLOBAL PROPERTY UA_ARCHITECTURE_HEADERS_BEGINNING)
-
-GET_PROPERTY(ua_architecture_sources GLOBAL PROPERTY UA_ARCHITECTURE_SOURCES)
-
-set(ua_architecture_sources ${ua_architecture_sources}
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_common.h
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_common.c
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_udp.c
-    ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c
-  )
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-    list(APPEND ua_architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
+if("${UA_ARCHITECTURE}" STREQUAL "posix")
+    set(UA_ARCHITECTURE_POSIX 1)
+elseif("${UA_ARCHITECTURE}" STREQUAL "win32")
+    set(UA_ARCHITECTURE_WIN32 1)
 endif()
 
-set(ua_architecture_headers ${ua_architecture_headers})
-
-if(${UA_ARCHITECTURE} STREQUAL "None")
-  message(FATAL_ERROR "No architecture was selected. Please select the architecture of your target platform")
-endif(${UA_ARCHITECTURE} STREQUAL "None")
+#################
+# Build Options #
+#################
 
-# Create a list of ifdefs for all the architectures.
-# This is needed to enable a default architecture if none is selected through gcc compiler def.
-# Especially if someone is using the amalgamated file on Linux/Windows he should not need to define an architecture.
-set(UA_ARCHITECTURES_NODEF "1 ") #to make it easier to append later the && symbol
-foreach(arch_ ${architectures})
-    string(TOUPPER ${arch_} UA_ARCHITECTURE_UPPER_)
-    set(UA_ARCHITECTURES_NODEF "${UA_ARCHITECTURES_NODEF} && !defined(UA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER_})")
-endforeach(arch_ ${architectures})
+# Set default build type.
+if(NOT CMAKE_BUILD_TYPE)
+    message(STATUS "CMAKE_BUILD_TYPE not given; setting to 'Debug'")
+    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build" FORCE)
+endif()
 
-# Options
+option(UA_ENABLE_AMALGAMATION "Concatenate the library to a single file open62541.h/.c" OFF)
 option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
 set(UA_LOGLEVEL 300 CACHE STRING "Minimal level at which logs shall be reported (100=TRACE, 200=DEBUG, 300=INFO, 400=WARNING, 500=ERROR, 600=FATAL)")
 option(UA_ENABLE_DIAGNOSTICS "Enable diagnostics information exposed by the server" ON)
@@ -364,28 +307,13 @@ mark_as_advanced(UA_ENABLE_DEBUG_SANITIZER)
 
 #General PubSub setup
 option(UA_ENABLE_PUBSUB "Enable the PubSub protocol" OFF)
+option(UA_ENABLE_PUBSUB_DELTAFRAMES "Enable sending of delta frames with only the changes" OFF)
 
 option(UA_ENABLE_PUBSUB_ENCRYPTION "Enable encryption of the PubSub payload" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_ENCRYPTION)
 
-option(UA_ENABLE_PUBSUB_INFORMATIONMODEL "Enable PubSub information model twin" OFF)
-
-option(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS "Enable PubSub informationmodel methods" OFF)
-
-option(UA_ENABLE_PUBSUB_DELTAFRAMES "Enable sending of delta frames with only the changes" OFF)
-
-option(UA_ENABLE_PUBSUB_FILE_CONFIG "Enable loading PubSub Config from file extension" OFF)
-mark_as_advanced(UA_ENABLE_PUBSUB_FILE_CONFIG)
-
-option(UA_ENABLE_PUBSUB_MONITORING "Enable monitoring of PubSub components (e.g. MessageReceiveTimeout)" OFF)
-mark_as_advanced(UA_ENABLE_PUBSUB_MONITORING)
-
-option(UA_ENABLE_PUBSUB_BUFMALLOC "Enable allocation with static memory buffer for time critical PubSub parts" OFF)
-mark_as_advanced(UA_ENABLE_PUBSUB_BUFMALLOC)
-
 option(UA_ENABLE_PUBSUB_SKS "Enable Security Key Service support for publisher and subscriber" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_SKS)
-
 if(UA_ENABLE_PUBSUB_SKS)
     message(WARNING "The PubSub SKS feature is under development and not yet ready.")
     if(NOT UA_ENABLE_PUBSUB_ENCRYPTION)
@@ -393,21 +321,7 @@ if(UA_ENABLE_PUBSUB_SKS)
     endif()
 endif()
 
-#RT and Transport PubSub settings
-option(UA_ENABLE_PUBSUB_ETH_UADP "Enable publish/subscribe UADP over Ethernet" OFF)
-
-if(UA_ENABLE_PUBSUB_ETH_UADP)
-    if(NOT CMAKE_SYSTEM MATCHES "Linux")
-    message(FATAL_ERROR "UADP over Ethernet is only available on Linux.")
-    endif()
-endif()
-
-if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
-    if(NOT UA_ENABLE_PUBSUB_INFORMATIONMODEL)
-        message(FATAL_ERROR "PubSub information model methods cannot be used with disabled PubSub information model.")
-    endif()
-endif()
-
+option(UA_ENABLE_PUBSUB_INFORMATIONMODEL "Enable PubSub information model twin" OFF)
 if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
     if(NOT UA_ENABLE_PUBSUB)
         message(FATAL_ERROR "PubSub information model representation cannot be used with disabled PubSub function.")
@@ -417,18 +331,31 @@ if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
     endif()
 endif()
 
+option(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS "Enable PubSub informationmodel methods" OFF)
+if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
+    if(NOT UA_ENABLE_PUBSUB_INFORMATIONMODEL)
+        message(FATAL_ERROR "PubSub information model methods cannot be used with disabled PubSub information model.")
+    endif()
+endif()
+
+option(UA_ENABLE_PUBSUB_FILE_CONFIG "Enable loading PubSub Config from file extension" OFF)
+mark_as_advanced(UA_ENABLE_PUBSUB_FILE_CONFIG)
 if(UA_ENABLE_PUBSUB_FILE_CONFIG)
     if(NOT UA_ENABLE_PUBSUB)
         message(FATAL_ERROR "For UA_ENABLE_PUBSUB_FILE_CONFIG PubSub needs to be enabled")
     endif()
 endif()
 
+option(UA_ENABLE_PUBSUB_MONITORING "Enable monitoring of PubSub components (e.g. MessageReceiveTimeout)" OFF)
+mark_as_advanced(UA_ENABLE_PUBSUB_MONITORING)
 if(UA_ENABLE_PUBSUB_MONITORING)
     if(NOT UA_ENABLE_PUBSUB)
         message(FATAL_ERROR "PubSub monitoring cannot be used with PubSub function disabled")
     endif()
 endif()
 
+option(UA_ENABLE_PUBSUB_BUFMALLOC "Enable allocation with static memory buffer for time critical PubSub parts" OFF)
+mark_as_advanced(UA_ENABLE_PUBSUB_BUFMALLOC)
 if(UA_ENABLE_PUBSUB_BUFMALLOC)
     if(NOT UA_ENABLE_PUBSUB)
         message(FATAL_ERROR "PubSub buffer allocation cannot be used with PubSub function disabled")
@@ -445,6 +372,17 @@ endif()
 
 option(UA_ENABLE_MQTT "Enable MQTT connections for the EventLoop" OFF)
 mark_as_advanced(UA_ENABLE_MQTT)
+if(UA_ENABLE_MQTT)
+    if(NOT EXISTS "${UA_FILE_MQTT}")
+        message(STATUS "Submodule update")
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
+        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+            message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}")
+        endif()
+    endif()
+    include_directories("${PROJECT_SOURCE_DIR}/deps/mqtt-c/include")
+endif()
 
 option(UA_ENABLE_STATUSCODE_DESCRIPTIONS "Enable conversion of StatusCode to human-readable error message" ON)
 mark_as_advanced(UA_ENABLE_STATUSCODE_DESCRIPTIONS)
@@ -559,17 +497,23 @@ if(UA_ENABLE_SUBSCRIPTIONS_EVENTS AND (NOT UA_ENABLE_SUBSCRIPTIONS))
     set(UA_ENABLE_SUBSCRIPTIONS_EVENTS OFF)
 endif()
 
-########################
-# Linting during build #
-########################
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-include(linting_build)
-
 ######################
 # External Libraries #
 ######################
 
-list(APPEND open62541_LIBRARIES "")
+set(open62541_LIBRARIES "")
+if("${UA_ARCHITECTURE}" STREQUAL "posix")
+    list(APPEND open62541_LIBRARIES "m")
+    if(UA_MULTITHREADING OR UA_BUILD_UNIT_TESTS)
+        list(APPEND open62541_LIBRARIES "pthread")
+    endif()
+    if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD"))
+        list(APPEND open62541_LIBRARIES "rt")
+    endif()
+elseif("${UA_ARCHITECTURE}" STREQUAL "win32")
+    list(APPEND open62541_LIBRARIES "ws2_32")
+    list(APPEND open62541_LIBRARIES "iphlpapi")
+endif()
 
 if(UA_ENABLE_ENCRYPTION_OPENSSL)
     # use the OpenSSL encryption library
@@ -819,32 +763,12 @@ if(UA_ENABLE_DISCOVERY_MULTICAST)
     configure_file("deps/mdnsd/libmdnsd/mdnsd_config_extra.in"
                    "${PROJECT_BINARY_DIR}/src_generated/mdnsd_config_extra")
     file(READ "${PROJECT_BINARY_DIR}/src_generated/mdnsd_config_extra" MDNSD_CONFIG_EXTRA)
-    generate_export_header(libmdnsd
-      EXPORT_FILE_NAME "${PROJECT_BINARY_DIR}/src_generated/mdnsd_config.h"
-      BASE_NAME MDNSD
-      DEFINE_NO_DEPRECATED
-      CUSTOM_CONTENT_FROM_VARIABLE MDNSD_CONFIG_EXTRA)
-endif()
-
-set(exported_headers ${ua_architecture_headers_beginning})
-
-if(NOT "${UA_AMALGAMATION_ARCHITECTURES}" STREQUAL "")
-    foreach(arch ${UA_AMALGAMATION_ARCHITECTURES})
-        list(APPEND exported_headers ${PROJECT_SOURCE_DIR}/arch/${arch}/ua_architecture.h)
-    endforeach()
-else()
-    list(APPEND exported_headers ${PROJECT_SOURCE_DIR}/arch/${UA_ARCHITECTURE}/ua_architecture.h)
-endif()
-
-
-if(UA_ENABLE_HISTORIZING)
-    # Historizing needs to be included before server.h
-    set(historizing_exported_headers
-         ${PROJECT_SOURCE_DIR}/include/open62541/plugin/historydatabase.h)
+    generate_export_header(libmdnsd EXPORT_FILE_NAME "${PROJECT_BINARY_DIR}/src_generated/mdnsd_config.h"
+                           BASE_NAME MDNSD DEFINE_NO_DEPRECATED CUSTOM_CONTENT_FROM_VARIABLE MDNSD_CONFIG_EXTRA)
 endif()
 
+# Exported headers
 set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
-                     ${exported_headers}
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/nodeids.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/common.h
@@ -858,7 +782,7 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/securitypolicy.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/eventloop.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h
-                     ${historizing_exported_headers}
+                     ${PROJECT_SOURCE_DIR}/include/open62541/plugin/historydatabase.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/server_pubsub.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/server.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/client.h
@@ -866,41 +790,40 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/client_subscriptions.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/client_highlevel_async.h)
 
-set(internal_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
-                     ${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
-                     ${PROJECT_SOURCE_DIR}/deps/libc_time.h
-                     ${PROJECT_SOURCE_DIR}/deps/base64.h
-                     ${PROJECT_SOURCE_DIR}/deps/dtoa.h
-                     ${PROJECT_SOURCE_DIR}/deps/mp_printf.h
-                     ${PROJECT_SOURCE_DIR}/deps/itoa.h
-                     ${PROJECT_SOURCE_DIR}/deps/ziptree.h
-                     ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.h
-                     ${PROJECT_SOURCE_DIR}/src/ua_util_internal.h
-                     ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated.h
-                     ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated_handling.h
-                     ${PROJECT_SOURCE_DIR}/src/ua_securechannel.h
-                     ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.h
-                     ${PROJECT_SOURCE_DIR}/src/server/ua_session.h
-                     ${PROJECT_SOURCE_DIR}/src/server/ua_subscription.h
-                     ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage.h
-                     ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub.h
-                     ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_ns0.h
-                     ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_keystorage.h
-                     ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.h
-                     ${PROJECT_SOURCE_DIR}/src/server/ua_server_internal.h
-                     ${PROJECT_SOURCE_DIR}/src/server/ua_services.h
-                     ${PROJECT_SOURCE_DIR}/src/client/ua_client_internal.h)
-
-# TODO: make client optional
+# Main Library
+set(lib_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
+                ${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
+                ${PROJECT_SOURCE_DIR}/deps/libc_time.h
+                ${PROJECT_SOURCE_DIR}/deps/base64.h
+                ${PROJECT_SOURCE_DIR}/deps/dtoa.h
+                ${PROJECT_SOURCE_DIR}/deps/mp_printf.h
+                ${PROJECT_SOURCE_DIR}/deps/itoa.h
+                ${PROJECT_SOURCE_DIR}/deps/ziptree.h
+                ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.h
+                ${PROJECT_SOURCE_DIR}/src/ua_util_internal.h
+                ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated.h
+                ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated_handling.h
+                ${PROJECT_SOURCE_DIR}/src/ua_securechannel.h
+                ${PROJECT_SOURCE_DIR}/src/server/ua_session.h
+                ${PROJECT_SOURCE_DIR}/src/server/ua_subscription.h
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage.h
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub.h
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_ns0.h
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_keystorage.h
+                ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.h
+                ${PROJECT_SOURCE_DIR}/src/server/ua_server_internal.h
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services.h
+                ${PROJECT_SOURCE_DIR}/src/client/ua_client_internal.h)
+
 set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/types_generated.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/transport_generated.c
                 ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c
                 ${PROJECT_SOURCE_DIR}/src/ua_util.c
-                ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.c
                 ${PROJECT_SOURCE_DIR}/src/ua_securechannel.c
                 ${PROJECT_SOURCE_DIR}/src/ua_securechannel_crypto.c
+                # server
                 ${PROJECT_SOURCE_DIR}/src/server/ua_session.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_nodes.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server.c
@@ -911,6 +834,17 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_utils.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_discovery.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_view.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_method.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_session.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_attribute.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_discovery.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_subscription.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_monitoreditem.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_securechannel.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_nodemanagement.c
+                ${PROJECT_SOURCE_DIR}/src/server/ua_services_discovery_multicast.c
+                # pubsub
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_eventloop.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_connection.c
@@ -923,24 +857,13 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_ns0.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_keystorage.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_securitygroup.c
-                # services
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_view.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_method.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_session.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_attribute.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_discovery.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_subscription.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_monitoreditem.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_securechannel.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_nodemanagement.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_discovery_multicast.c
+                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_config.c
                 # client
                 ${PROJECT_SOURCE_DIR}/src/client/ua_client.c
                 ${PROJECT_SOURCE_DIR}/src/client/ua_client_connect.c
                 ${PROJECT_SOURCE_DIR}/src/client/ua_client_discovery.c
                 ${PROJECT_SOURCE_DIR}/src/client/ua_client_highlevel.c
                 ${PROJECT_SOURCE_DIR}/src/client/ua_client_subscriptions.c
-
                 # dependencies
                 ${PROJECT_SOURCE_DIR}/deps/libc_time.c
                 ${PROJECT_SOURCE_DIR}/deps/pcg_basic.c
@@ -948,37 +871,10 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/deps/dtoa.c
                 ${PROJECT_SOURCE_DIR}/deps/mp_printf.c
                 ${PROJECT_SOURCE_DIR}/deps/itoa.c
-                ${PROJECT_SOURCE_DIR}/deps/ziptree.c
-
-                ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_config.c)
-
-set(default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/accesscontrol_default.h
-                           ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pki_default.h
-                           ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/log_stdout.h
-                           ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/nodestore_default.h
-                           ${PROJECT_SOURCE_DIR}/plugins/include/open62541/server_config_default.h
-                           ${PROJECT_SOURCE_DIR}/plugins/include/open62541/client_config_default.h
-                           ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/securitypolicy_default.h
-)
-
-set(default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
-                           ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.c
-                           ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_ziptree.c
-                           ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_hashmap.c
-                           ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c
-                           ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_pki_none.c
-                           ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_securitypolicy_none.c
-)
-
-# Syslog-logging on Linux and Unices
-if(UNIX)
-    list(APPEND default_plugin_headers
-        ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/log_syslog.h)
-    list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_syslog.c)
-endif()
+                ${PROJECT_SOURCE_DIR}/deps/ziptree.c)
 
 if(UA_GENERATED_NAMESPACE_ZERO)
-    list(APPEND internal_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/namespace0_generated.h)
+    list(APPEND lib_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/namespace0_generated.h)
     list(APPEND lib_sources ${PROJECT_BINARY_DIR}/src_generated/open62541/namespace0_generated.c)
 endif()
 
@@ -986,116 +882,10 @@ if(UA_ENABLE_PARSING)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types_lex.c)
 endif()
 
-if(UA_ENABLE_NODESET_INJECTOR)
-    message(STATUS "Nodesetinjector feature enabled")
-    cmake_minimum_required(VERSION 3.20)
-
-    add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
-                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
-                       PRE_BUILD
-                       COMMAND ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_injector/generate_nodesetinjector.py
-                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector)
-    add_custom_target(open62541-generator-nodesetinjector DEPENDS
-                      ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
-                      ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
-                      )
-
-    set(UA_NODESETINJECTOR_GENERATORS "")
-    set(UA_NODESETINJECTOR_SOURCE_FILES "")
-    set(UA_NODESETINJECTOR_EXAMPLE_NAMES "")
-    set(UA_NODESETINJECTOR_TEST_NAMES "")
-endif()
-
-# Always include encryption plugins into the amalgamation
-# Use guards in the files to ensure that UA_ENABLE_ENCRYPTON_MBEDTLS and UA_ENABLE_ENCRYPTION_OPENSSL are honored.
-
-if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION OR UA_ENABLE_AMALGAMATION)
-  list(INSERT default_plugin_sources 0
-    ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
-    ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c)
-endif()
-
-if(UA_ENABLE_PUBSUB_ENCRYPTION)
-  list(INSERT default_plugin_sources 1
-    ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
-    ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c)
-endif()
-
-if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL OR UA_ENABLE_AMALGAMATION)
-  list(APPEND default_plugin_headers
-      ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/create_certificate.h
-  )
-endif()
-
-if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_AMALGAMATION)
-list(INSERT default_plugin_sources 1
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c)
-endif()
-
-if(UA_ENABLE_TPM2_SECURITY)
-list(INSERT default_plugin_sources 0
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/pkcs11/securitypolicy_pubsub_aes128ctr_tpm.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/pkcs11/securitypolicy_pubsub_aes256ctr_tpm.c)
-endif()
-
-if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL OR UA_ENABLE_AMALGAMATION)
-list(INSERT default_plugin_sources 0
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/securitypolicy_openssl_common.h
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_version_abstraction.h
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/securitypolicy_openssl_common.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic256.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic256sha256.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_create_certificate.c
-     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_pki_openssl.c)
-endif()
-
-if(UA_ENABLE_HISTORIZING)
-
-    list(APPEND default_plugin_headers
-         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_backend.h
-         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_gathering.h
-         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_database_default.h
-         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_gathering_default.h
-         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_backend_memory.h
-         )
-    list(APPEND default_plugin_sources
-         ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_history_data_backend_memory.c
-         ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_history_data_gathering_default.c
-         ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_history_database_default.c
-         )
-endif()
-
-if(UA_ENABLE_DISCOVERY)
-    list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.h)
-    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.c)
-endif()
-
-if(UA_ENABLE_MQTT)
-    if(NOT EXISTS "${UA_FILE_MQTT}")
-        message(STATUS "Submodule update")
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
-                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
-        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
-            message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}")
-        endif()
-    endif()
-
-    include_directories("${open62541_MQTT_DIR}/include")
-    list(APPEND ua_architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
-endif()
-
 if(UA_ENABLE_PUBSUB)
     if(UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_PUBSUB_BUFMALLOC)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_bufmalloc.c)
-        list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_bufmalloc.h)
+        list(APPEND lib_headers ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_bufmalloc.h)
     endif()
     if(UA_ENABLE_PUBSUB_ENCRYPTION)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_security.c)
@@ -1104,14 +894,14 @@ endif()
 
 if(UA_ENABLE_JSON_ENCODING)
     if(UA_ENABLE_PUBSUB_ENCRYPTION)
-        MESSAGE(WARNING "Payload encryption with JSON encoding is not possible according to the specification.The message security is only defined for the UADP message mapping.")
+        MESSAGE(WARNING "Payload encryption with JSON encoding is not possible according to the specification. The message security is only defined for the UADP message mapping.")
     endif()
     if(UA_ENABLE_PUBSUB)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage_json.c)
     endif()
-    list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/cj5.h
-                                 ${PROJECT_SOURCE_DIR}/deps/parse_num.h
-                                 ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.h)
+    list(APPEND lib_headers ${PROJECT_SOURCE_DIR}/deps/cj5.h
+                            ${PROJECT_SOURCE_DIR}/deps/parse_num.h
+                            ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.h)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/cj5.c
                             ${PROJECT_SOURCE_DIR}/deps/parse_num.c
                             ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_json.c)
@@ -1119,10 +909,10 @@ endif()
 
 if(UA_ENABLE_XML_ENCODING)
     if(NOT UA_ENABLE_JSON_ENCODING)
-        list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/deps/parse_num.h)
+        list(APPEND lib_headers ${PROJECT_SOURCE_DIR}/deps/parse_num.h)
         list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/deps/parse_num.c)
     endif()
-    list(APPEND internal_headers ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_xml.h)
+    list(APPEND lib_headers ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_xml.h)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_xml.c)
 endif()
 
@@ -1149,24 +939,146 @@ endif()
 
 if(UA_ENABLE_DISCOVERY_MULTICAST)
     # prepend in list, otherwise it complains that winsock2.h has to be included before windows.h
-    set(internal_headers ${PROJECT_BINARY_DIR}/src_generated/mdnsd_config.h
-                         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/1035.h
-                         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/xht.h
-                         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/sdtxt.h
-                         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h
-                         ${internal_headers} )
-    set(lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_server_discovery_mdns.c
-        ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/1035.c
-        ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/xht.c
-        ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/sdtxt.c
-        ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.c
-        ${lib_sources})
+    list(APPEND lib_headers
+         ${PROJECT_BINARY_DIR}/src_generated/mdnsd_config.h
+         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/1035.h
+         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/xht.h
+         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/sdtxt.h
+         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
+    list(APPEND lib_sources
+         ${PROJECT_SOURCE_DIR}/src/server/ua_server_discovery_mdns.c
+         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/1035.c
+         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/xht.c
+         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/sdtxt.c
+         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.c)
 endif()
 
 if(UA_BUILD_FUZZING OR UA_BUILD_OSS_FUZZ)
-    set(lib_sources
-        ${lib_sources}
-        ${PROJECT_SOURCE_DIR}/tests/fuzz/custom_memory_manager.c)
+    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/tests/fuzz/custom_memory_manager.c)
+endif()
+
+# Architecture
+set(architecture_headers)
+set(architecture_sources)
+
+if(NOT "${UA_ARCHITECTURE}" STREQUAL "none")
+    list(APPEND architecture_headers
+         ${PROJECT_SOURCE_DIR}/arch/posix/ua_architecture.h
+         ${PROJECT_SOURCE_DIR}/arch/win32/ua_architecture.h
+         ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.h
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_common.h
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h)
+
+    list(APPEND architecture_sources
+         ${PROJECT_SOURCE_DIR}/arch/posix/ua_clock.c
+         ${PROJECT_SOURCE_DIR}/arch/win32/ua_clock.c
+         ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.c
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_common.c
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_epoll.c
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_tcp.c
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_udp.c
+         ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c)
+
+    if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+        list(APPEND architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
+    endif()
+
+    if(UA_ENABLE_MQTT)
+        list(APPEND architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
+    endif()
+endif()
+
+
+# Plugins
+set(plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/accesscontrol_default.h
+                   ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pki_default.h
+                   ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/log_stdout.h
+                   ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/nodestore_default.h
+                   ${PROJECT_SOURCE_DIR}/plugins/include/open62541/server_config_default.h
+                   ${PROJECT_SOURCE_DIR}/plugins/include/open62541/client_config_default.h
+                   ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/securitypolicy_default.h)
+
+set(plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
+                   ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.c
+                   ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_ziptree.c
+                   ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_hashmap.c
+                   ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c
+                   ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_pki_none.c
+                   ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_securitypolicy_none.c)
+
+if(UA_ENABLE_HISTORIZING)
+    list(APPEND plugin_headers
+         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_backend.h
+         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_gathering.h
+         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_database_default.h
+         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_gathering_default.h
+         ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_backend_memory.h)
+    list(APPEND plugin_sources
+         ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_history_data_backend_memory.c
+         ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_history_data_gathering_default.c
+         ${PROJECT_SOURCE_DIR}/plugins/historydata/ua_history_database_default.c)
+endif()
+
+# Syslog-logging on Linux and Unices
+if(UNIX)
+    list(APPEND plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/log_syslog.h)
+    list(APPEND plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_syslog.c)
+endif()
+
+# Always include encryption plugins into the amalgamation
+# Use guards in the files to ensure that UA_ENABLE_ENCRYPTON_MBEDTLS and UA_ENABLE_ENCRYPTION_OPENSSL are honored.
+
+if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION OR UA_ENABLE_AMALGAMATION)
+  list(INSERT plugin_sources 0
+       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
+       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c)
+endif()
+
+if(UA_ENABLE_PUBSUB_ENCRYPTION)
+  list(INSERT plugin_sources 1
+       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
+       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c)
+endif()
+
+if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL OR UA_ENABLE_AMALGAMATION)
+    list(APPEND plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/create_certificate.h)
+endif()
+
+if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_AMALGAMATION)
+list(INSERT plugin_sources 1
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c)
+endif()
+
+if(UA_ENABLE_TPM2_SECURITY)
+list(INSERT plugin_sources 0
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/pkcs11/securitypolicy_pubsub_aes128ctr_tpm.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/pkcs11/securitypolicy_pubsub_aes256ctr_tpm.c)
+endif()
+
+if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL OR UA_ENABLE_AMALGAMATION)
+list(INSERT plugin_sources 0
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/securitypolicy_openssl_common.h
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_version_abstraction.h
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/securitypolicy_openssl_common.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic256.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic256sha256.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_create_certificate.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_pki_openssl.c)
+endif()
+
+if(UA_ENABLE_DISCOVERY)
+    list(APPEND lib_headers ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.h)
+    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.c)
 endif()
 
 if(UA_ENABLE_NODESETLOADER)
@@ -1178,15 +1090,13 @@ if(UA_ENABLE_NODESETLOADER)
     add_subdirectory(${PROJECT_SOURCE_DIR}/deps/nodesetLoader)
 
     list(APPEND lib_sources ${NODESETLOADER_SOURCES})
-    list(APPEND default_plugin_headers
-                ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/nodesetloader.h)
-    list(APPEND default_plugin_sources
-                ${PROJECT_SOURCE_DIR}/plugins/ua_nodesetloader.c)
+    list(APPEND plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/nodesetloader.h)
+    list(APPEND plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_nodesetloader.c)
     list(APPEND open62541_LIBRARIES ${NODESETLOADER_DEPS_LIBS})
 
     if(UA_ENABLE_AMALGAMATION)
         list(APPEND exported_headers ${NODESETLOADER_PUBLIC_HEADERS})
-        list(APPEND internal_headers ${NODESETLOADER_PRIVATE_HEADERS})
+        list(APPEND lib_headers ${NODESETLOADER_PRIVATE_HEADERS})
     endif()
 endif()
 
@@ -1196,6 +1106,7 @@ endif()
 
 # List of nodeset files combined into NS0 generated file
 set(UA_FILE_NODESETS)
+set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path to the nodetset directory.")
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     if(NOT UA_FILE_NS0)
@@ -1212,7 +1123,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         endif()
     endif()
 
-
     set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
     set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
     set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
@@ -1274,44 +1184,30 @@ else()
 endif()
 
 # standard-defined data types
-ua_generate_datatypes(
-    BUILTIN
-    NAME "types"
-    TARGET_SUFFIX "types"
-    NAMESPACE_IDX 0
-    FILE_CSV "${UA_FILE_NODEIDS}"
-    FILES_BSD "${UA_FILE_TYPES_BSD}"
-    FILES_SELECTED ${UA_FILE_DATATYPES}
-)
+ua_generate_datatypes(BUILTIN NAME "types" TARGET_SUFFIX "types" NAMESPACE_IDX 0
+                      FILE_CSV "${UA_FILE_NODEIDS}"
+                      FILES_BSD "${UA_FILE_TYPES_BSD}"
+                      FILES_SELECTED ${UA_FILE_DATATYPES})
 
 # transport data types
-ua_generate_datatypes(
-    INTERNAL
-    NAME "transport"
-    TARGET_SUFFIX "transport"
-    NAMESPACE_IDX 1
-    FILE_CSV "${UA_FILE_NODEIDS}"
-    IMPORT_BSD "TYPES#${UA_FILE_TYPES_BSD}"
-    FILES_BSD "${PROJECT_SOURCE_DIR}/tools/schema/Custom.Opc.Ua.Transport.bsd"
-    FILES_SELECTED "${PROJECT_SOURCE_DIR}/tools/schema/datatypes_transport.txt"
-)
+ua_generate_datatypes(INTERNAL NAME "transport" TARGET_SUFFIX "transport" NAMESPACE_IDX 1
+                      FILE_CSV "${UA_FILE_NODEIDS}"
+                      IMPORT_BSD "TYPES#${UA_FILE_TYPES_BSD}"
+                      FILES_BSD "${PROJECT_SOURCE_DIR}/tools/schema/Custom.Opc.Ua.Transport.bsd"
+                      FILES_SELECTED "${PROJECT_SOURCE_DIR}/tools/schema/datatypes_transport.txt")
 
 # statuscode explanation
 add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
                           ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c
-        PRE_BUILD
-        COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
-        ${UA_FILE_STATUSCODES} ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
-                ${UA_FILE_STATUSCODES})
+                   PRE_BUILD
+                   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
+                           ${UA_FILE_STATUSCODES} ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes
+                   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
+                           ${UA_FILE_STATUSCODES})
 
 # Header containing defines for all NodeIds
-ua_generate_nodeid_header(
-    NAME "nodeids"
-    ID_PREFIX "NS0"
-    TARGET_SUFFIX "ids-ns0"
-    FILE_CSV "${UA_FILE_NODEIDS}"
-)
+ua_generate_nodeid_header(NAME "nodeids" ID_PREFIX "NS0" TARGET_SUFFIX "ids-ns0"
+                          FILE_CSV "${UA_FILE_NODEIDS}")
 
 # we need a custom target to avoid that the generator is called concurrently and
 # thus overwriting files while the other thread is compiling
@@ -1326,17 +1222,17 @@ if(UA_ENABLE_AMALGAMATION)
                        PRE_BUILD
                        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
                                ${OPEN62541_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/open62541.h
-                               ${exported_headers} ${default_plugin_headers} ${ua_architecture_headers}
+                               ${exported_headers} ${plugin_headers} 
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
-                               ${exported_headers} ${default_plugin_headers} ${ua_architecture_headers})
+                               ${exported_headers} ${plugin_headers})
 
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/open62541.c
                        PRE_BUILD
                        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
                                ${OPEN62541_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/open62541.c
-                               ${internal_headers} ${lib_sources} ${default_plugin_sources} ${ua_architecture_sources}
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py ${internal_headers}
-                               ${lib_sources} ${default_plugin_sources} ${ua_architecture_sources} )
+                               ${lib_headers} ${lib_sources} ${plugin_sources} ${architecture_headers} ${architecture_sources}
+                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py ${lib_headers}
+                               ${lib_sources} ${architecture_sources} ${plugin_sources} ${architecture_headers} ${architecture_sources})
 
     add_custom_target(open62541-amalgamation-source DEPENDS ${PROJECT_BINARY_DIR}/open62541.c)
     add_custom_target(open62541-amalgamation-header DEPENDS ${PROJECT_BINARY_DIR}/open62541.h)
@@ -1346,14 +1242,10 @@ if(UA_ENABLE_AMALGAMATION)
                      open62541-generator-transport open62541-generator-statuscode)
 endif()
 
-ua_generate_nodeset(
-    NAME "ns0"
-    FILE ${UA_FILE_NODESETS} ${UA_NODESET_FILE_DA}
-    INTERNAL
-    BLACKLIST ${UA_FILE_NS0_BLACKLIST}
-    IGNORE "${PROJECT_SOURCE_DIR}/tools/nodeset_compiler/NodeID_NS0_Base.txt"
-    DEPENDS_TARGET "open62541-generator-types"
-)
+ua_generate_nodeset(NAME "ns0" FILE ${UA_FILE_NODESETS} ${UA_NODESET_FILE_DA}
+                    INTERNAL BLACKLIST ${UA_FILE_NS0_BLACKLIST}
+                    IGNORE "${PROJECT_SOURCE_DIR}/tools/nodeset_compiler/NodeID_NS0_Base.txt"
+                    DEPENDS_TARGET "open62541-generator-types")
 
 # stack protector and optimization needs to be disabled for the huge ns0 file, otherwise debian packaging fails due to long build times.
 # We also disable optimization on Appveyor builds, since they take almost an hour otherwise
@@ -1366,20 +1258,34 @@ if(UA_PACK_DEBIAN OR (NOT "$ENV{APPVEYOR}" STREQUAL "") OR (
     set_source_files_properties(${PROJECT_BINARY_DIR}/src_generated/open62541/namespace0_generated.c PROPERTIES COMPILE_FLAGS "-fno-stack-protector -O0")
 endif()
 
+if(UA_ENABLE_NODESET_INJECTOR)
+    message(STATUS "Nodesetinjector feature enabled")
+    cmake_minimum_required(VERSION 3.20)
+    add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
+                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c PRE_BUILD
+                       COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/nodeset_injector/generate_nodesetinjector.py
+                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector)
+    add_custom_target(open62541-generator-nodesetinjector DEPENDS
+                      ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
+                      ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h)
+    set(UA_NODESETINJECTOR_GENERATORS "")
+    set(UA_NODESETINJECTOR_SOURCE_FILES "")
+    set(UA_NODESETINJECTOR_EXAMPLE_NAMES "")
+    set(UA_NODESETINJECTOR_TEST_NAMES "")
+endif()
+
 #####################
 # Build the Library #
 #####################
 
-assign_source_group(${lib_sources})
-assign_source_group(${internal_headers})
 assign_source_group(${exported_headers})
-assign_source_group(${default_plugin_sources})
-assign_source_group(${ua_architecture_sources})
+assign_source_group(${lib_headers} ${lib_sources})
+assign_source_group(${architecture_headers} ${architecture_sources})
+assign_source_group(${plugin_headers} ${plugin_sources})
 
 if(UA_ENABLE_AMALGAMATION)
     add_library(open62541-object OBJECT ${PROJECT_BINARY_DIR}/open62541.c ${PROJECT_BINARY_DIR}/open62541.h)
     target_include_directories(open62541-object PRIVATE ${PROJECT_BINARY_DIR})
-    target_include_directories(open62541-object PRIVATE "${ua_architecture_directories_to_include}")
     if(UA_ENABLE_ENCRYPTION_MBEDTLS)
         target_include_directories(open62541-object PRIVATE ${MBEDTLS_INCLUDE_DIRS})
     endif()
@@ -1403,8 +1309,7 @@ if(UA_ENABLE_AMALGAMATION)
                       open62541-generator-types
                       open62541-generator-transport
                       open62541-generator-statuscode
-                      open62541-amalgamation-source
-    )
+                      open62541-amalgamation-source)
 
     add_library(open62541 $<TARGET_OBJECTS:open62541-object>)
     # the only directory that needs to be included if open62541 (amalgameted) target from
@@ -1414,14 +1319,14 @@ if(UA_ENABLE_AMALGAMATION)
     add_dependencies(open62541-amalgamation-source open62541-generator-namespace)
     add_dependencies(open62541-amalgamation-header open62541-generator-namespace)
 else()
-    add_library(open62541-object OBJECT ${lib_sources} ${internal_headers} ${exported_headers})
+    add_library(open62541-object OBJECT ${lib_sources} ${lib_headers} ${exported_headers})
 
     add_custom_target(open62541-code-generation DEPENDS
                       open62541-generator-types
                       open62541-generator-transport
                       open62541-generator-statuscode
-                      open62541-generator-namespace
-                      )
+                      open62541-generator-namespace)
+
     if(UA_ENABLE_NODESET_INJECTOR)
         add_dependencies(open62541-code-generation open62541-generator-nodesetinjector)
     endif()
@@ -1429,10 +1334,10 @@ else()
     if(UA_ENABLE_COVERAGE)
         add_coverage(open62541-object)
     endif()
+
     target_include_directories(open62541-object PRIVATE ${PROJECT_SOURCE_DIR}/src)
-    target_include_directories(open62541-object PRIVATE ${PROJECT_SOURCE_DIR}/arch) # TODO: Remove once the EventLoop is integrated
 
-    add_library(open62541-plugins OBJECT ${default_plugin_sources} ${ua_architecture_sources} ${exported_headers})
+    add_library(open62541-plugins OBJECT ${plugin_sources} ${architecture_sources} ${exported_headers})
     add_dependencies(open62541-plugins open62541-generator-types open62541-generator-transport open62541-generator-namespace)
     target_include_directories(open62541-plugins PRIVATE ${PROJECT_SOURCE_DIR}/plugins)
     target_include_directories(open62541-plugins PRIVATE ${PROJECT_BINARY_DIR}/src_generated)
@@ -1468,8 +1373,7 @@ else()
     endfunction()
 
     # Public includes
-    include_directories_public(${ua_architecture_directories_to_include}
-                               "${PROJECT_SOURCE_DIR}/include"
+    include_directories_public("${PROJECT_SOURCE_DIR}/include"
                                "${PROJECT_SOURCE_DIR}/plugins/include"
                                "${PROJECT_SOURCE_DIR}/deps"
                                "${PROJECT_SOURCE_DIR}/src/pubsub"
@@ -1516,32 +1420,6 @@ endif()
 # Generate properly versioned shared library links on Linux
 SET_TARGET_PROPERTIES(open62541 PROPERTIES SOVERSION "${OPEN62541_VER_MAJOR}" VERSION "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}")
 
-##################################
-#     Architectures changes      #
-##################################
-
-GET_PROPERTY(ua_architecture_add_definitions GLOBAL PROPERTY UA_ARCHITECTURE_ADD_DEFINITIONS)
-add_definitions(${ua_architecture_add_definitions})
-
-GET_PROPERTY(ua_architecture_remove_definitions GLOBAL PROPERTY UA_ARCHITECTURE_REMOVE_DEFINITIONS)
-if(NOT "${ua_architecture_remove_definitions}" STREQUAL "")
-  string(REPLACE " " ";" ua_architecture_remove_definitions_list ${ua_architecture_remove_definitions})
-  remove_definitions(${ua_architecture_remove_definitions_list})
-  foreach ( flag ${ua_architecture_remove_definitions} )
-      string(REPLACE "${flag}" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
-  endforeach()
-endif(NOT "${ua_architecture_remove_definitions}" STREQUAL "")
-
-GET_PROPERTY(ua_architecture_append_to_library GLOBAL PROPERTY UA_ARCHITECTURE_APPEND_TO_LIBRARY)
-list(APPEND open62541_LIBRARIES ${ua_architecture_append_to_library})
-
-target_compile_definitions(open62541 PUBLIC UA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
-target_compile_definitions(open62541-object PUBLIC UA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
-
-if(NOT UA_ENABLE_AMALGAMATION)
-    target_compile_definitions(open62541-plugins PUBLIC UA_ARCHITECTURE_${UA_ARCHITECTURE_UPPER})
-endif()
-
 # DLL requires linking to dependencies
 target_link_libraries(open62541 ${open62541_LIBRARIES})
 
@@ -1586,11 +1464,15 @@ endif()
 ########################
 # Linting as target    #
 ########################
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+include(linting_build)
 include(linting_target)
 
 ##########################
 # Installation           #
 ##########################
+
 # invoke via `make install`
 # specify install location with `-DCMAKE_INSTALL_PREFIX=xyz`
 # Enable shared library with `-DBUILD_SHARED_LIBS=ON`
@@ -1690,13 +1572,11 @@ install(EXPORT open62541Targets
         DESTINATION "${cmake_configfile_install}"
         NAMESPACE open62541::)
 
-export(
-    TARGETS open62541
-    NAMESPACE open62541::
-    FILE ${CMAKE_CURRENT_BINARY_DIR}/open62541Targets.cmake
-)
+export(TARGETS open62541 NAMESPACE open62541::
+       FILE ${CMAKE_CURRENT_BINARY_DIR}/open62541Targets.cmake)
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/macros_public.cmake" "${CMAKE_CURRENT_BINARY_DIR}/open62541Macros.cmake" COPYONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/macros_public.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/open62541Macros.cmake" COPYONLY)
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
               "${CMAKE_CURRENT_BINARY_DIR}/open62541ConfigVersion.cmake"
@@ -1723,13 +1603,12 @@ set(UA_install_tools_files "tools/generate_datatypes.py"
     "tools/generate_statuscode_descriptions.py")
 
 install(DIRECTORY ${UA_install_tools_dirs}
-    DESTINATION ${open62541_install_tools_dir}
-    USE_SOURCE_PERMISSIONS
-    FILES_MATCHING
-    PATTERN "*"
-    PATTERN "*.pyc" EXCLUDE
-    PATTERN ".git*" EXCLUDE
-    )
+        DESTINATION ${open62541_install_tools_dir}
+        USE_SOURCE_PERMISSIONS
+        FILES_MATCHING
+        PATTERN "*"
+        PATTERN "*.pyc" EXCLUDE
+        PATTERN ".git*" EXCLUDE)
 
 install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir})
 
@@ -1743,16 +1622,14 @@ if(UA_PACK_DEBIAN)
         "examples/pubsub")
 
     set(open62541_install_examples_dir share/open62541/examples)
-    install(DIRECTORY ${UA_install_examples_dirs} COMPONENT examples DESTINATION ${open62541_install_examples_dir} USE_SOURCE_PERMISSIONS)
+    install(DIRECTORY ${UA_install_examples_dirs} COMPONENT examples
+            DESTINATION ${open62541_install_examples_dir} USE_SOURCE_PERMISSIONS)
 endif()
 
 if(NOT UA_ENABLE_AMALGAMATION)
     # Recreate the include folder structure from the source also in /usr/lib/include/open62541
 
-    set(FILES_TO_INSTALL
-        ${exported_headers}
-        ${default_plugin_headers}
-        ${ua_architecture_headers})
+    set(FILES_TO_INSTALL ${exported_headers} ${plugin_headers})
 
     set(BASE_PATH_MAIN "${PROJECT_SOURCE_DIR}/include/open62541")
     set(BASE_PATH_PLUGINS "${PROJECT_SOURCE_DIR}/plugins/include/open62541")
@@ -1784,12 +1661,12 @@ else()
     install(FILES ${PROJECT_BINARY_DIR}/open62541.h DESTINATION include)
 endif()
 
-if (UA_PACK_DEBIAN)
+if(UA_PACK_DEBIAN)
     add_subdirectory(tools/packaging)
 endif()
 
 ##################################
-# Visual studio solution folders #
+# Visual Studio Solution Folders #
 ##################################
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt
deleted file mode 100644
index f17d3ded305..00000000000
--- a/arch/posix/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-SET(SOURCE_GROUP ${SOURCE_GROUP}\\posix)
-
-ua_add_architecture("posix")
-
-list (FIND UA_AMALGAMATION_ARCHITECTURES "posix" _index)
-if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "posix")
-
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-
-    if("${UA_ARCHITECTURE}" STREQUAL "posix")
-        if(NOT CYGWIN AND NOT QNXNTO)
-            ua_architecture_add_definitions(-Wshadow -Wconversion -fvisibility=hidden -fPIC)
-        endif()
-
-        if(QNXNTO)
-          ua_architecture_append_to_library(socket c stdc++)
-        elseif(OS9)
-          ua_architecture_append_to_library(netdb ndblib socket)
-        else()
-          ua_architecture_append_to_library(m)
-          if(UA_MULTITHREADING OR UA_BUILD_UNIT_TESTS)
-            ua_architecture_append_to_library(pthread)
-          endif()
-          if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD"))
-            ua_architecture_append_to_library(rt)
-          endif()
-        endif()
-
-    endif()
-
-
-endif()
diff --git a/arch/posix/ua_clock.c b/arch/posix/ua_clock.c
index 634d4493cf5..a4e683723ce 100644
--- a/arch/posix/ua_clock.c
+++ b/arch/posix/ua_clock.c
@@ -6,10 +6,10 @@
  *    Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
  */
 
-#ifdef UA_ARCHITECTURE_POSIX
-
 #include <open62541/types.h>
 
+#ifdef UA_ARCHITECTURE_POSIX
+
 #include <time.h>
 #include <sys/time.h>
 
diff --git a/arch/win32/CMakeLists.txt b/arch/win32/CMakeLists.txt
deleted file mode 100644
index 091c239894b..00000000000
--- a/arch/win32/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-SET(SOURCE_GROUP ${SOURCE_GROUP}\\win32)
-
-ua_add_architecture("win32")
-
-list (FIND UA_AMALGAMATION_ARCHITECTURES "win32" _index)
-if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "win32")
-
-    ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-
-    if("${UA_ARCHITECTURE}" STREQUAL "win32")
-        ua_architecture_append_to_library(ws2_32)
-        ua_architecture_append_to_library(iphlpapi)
-	#append iphlpapi permanently. Problem: PUBSUB Flag is configured after execution.        
-	#if(UA_ENABLE_DISCOVERY_MULTICAST OR UA_ENABLE_PUBSUB)
-        #    ua_architecture_append_to_library(iphlpapi)
-        #endif()
-    endif()
-
-    ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-endif()
diff --git a/arch/win32/ua_clock.c b/arch/win32/ua_clock.c
index 6bf4f91c257..9ffc7f74617 100644
--- a/arch/win32/ua_clock.c
+++ b/arch/win32/ua_clock.c
@@ -6,14 +6,10 @@
  *    Copyright 2017 (c) Thomas Stalder
  */
 
-#ifdef UA_ARCHITECTURE_WIN32
-
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
-#endif
-
 #include <open62541/types.h>
 
+#ifdef UA_ARCHITECTURE_WIN32
+
 #include <time.h>
 /* Backup definition of SLIST_ENTRY on mingw winnt.h */
 # ifdef SLIST_ENTRY
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 8726ab6430c..fb74036194f 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -15,6 +15,23 @@
 #define UA_OPEN62541_VER_COMMIT "${OPEN62541_VER_COMMIT}"
 #define UA_OPEN62541_VERSION "${OPEN62541_VERSION}"
 
+/**
+ * Architecture
+ * ------------
+ * Define one of the following. */
+
+#cmakedefine UA_ARCHITECTURE_WIN32
+#cmakedefine UA_ARCHITECTURE_POSIX
+
+/* Select default architecture if none is selected */
+#if !defined(UA_ARCHITECtURE_WIN32) && !defined(UA_ARCHITECtURE_POSIX)
+# ifdef _WIN32
+#  define UA_ARCHITECTURE_WIN32
+# else
+#  define UA_ARCHITECTURE_POSIX
+# endif
+#endif
+
 /**
  * Feature Options
  * ---------------
@@ -107,15 +124,6 @@
 # endif
 #endif
 
-/* Select default architecture if non is selected through CMake or compiler define */
-#if ${UA_ARCHITECTURES_NODEF}
-# ifdef _WIN32
-#  define UA_ARCHITECTURE_WIN32
-# else
-#  define UA_ARCHITECTURE_POSIX
-# endif
-#endif
-
 /**
  * POSIX Feature Flags
  * -------------------
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 63ecdceec62..eb1757460ae 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -20,7 +20,6 @@
 
 #include "open62541_queue.h"
 #include "ua_securechannel.h"
-#include "common/ua_timer.h"
 #include "ua_util_internal.h"
 #include "ziptree.h"
 
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index ed6b0769fd6..4296a13fe95 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -23,7 +23,6 @@
 #include <open62541/plugin/nodestore.h>
 
 #include "ua_session.h"
-#include "common/ua_timer.h"
 #include "ua_util_internal.h"
 
 _UA_BEGIN_DECLS
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index db7be8540d9..7048db7ba5e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -59,6 +59,7 @@ endif()
 
 # Use different plugins for testing
 set(test_plugin_sources
+    ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_common.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index adc5f81f0f9..86c6d463cb2 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -60,6 +60,7 @@ link_libraries("-fsanitize=fuzzer")
 
 # Use different plugins for testing
 set(fuzzing_plugin_sources
+    ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_common.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.c
     ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_select.c
diff --git a/tools/cmake/macros_internal.cmake b/tools/cmake/macros_internal.cmake
deleted file mode 100644
index aa8d0246041..00000000000
--- a/tools/cmake/macros_internal.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-#Add a new architecture to to the lists of available architectures
-FUNCTION(ua_add_architecture)
-    FOREACH(ARG ${ARGV})
-        set_property(GLOBAL APPEND PROPERTY UA_ARCHITECTURES ${ARG})
-    ENDFOREACH(ARG)
-ENDFUNCTION(ua_add_architecture)
-
-#Include folders to the compilation
-FUNCTION(ua_include_directories)
-    FOREACH(ARG ${ARGV})
-        set_property(GLOBAL APPEND PROPERTY UA_INCLUDE_DIRECTORIES ${ARG})
-    ENDFOREACH(ARG)
-ENDFUNCTION(ua_include_directories)
-
-#Add a new header file to the architecture group
-FUNCTION(ua_add_architecture_header)
-    FOREACH(ARG ${ARGV})
-        set_property(GLOBAL APPEND PROPERTY UA_ARCHITECTURE_HEADERS ${ARG})
-    ENDFOREACH(ARG)
-ENDFUNCTION(ua_add_architecture_header)
-
-#Add a new header file to the architecture group at the beginning of it
-FUNCTION(ua_add_architecture_header_beginning)
-    FOREACH(ARG ${ARGV})
-        set_property(GLOBAL APPEND PROPERTY UA_ARCHITECTURE_HEADERS_BEGINNING ${ARG})
-    ENDFOREACH(ARG)
-ENDFUNCTION(ua_add_architecture_header_beginning)
-
-#Add a new source file to the architecture group
-FUNCTION(ua_add_architecture_file)
-    FOREACH(ARG ${ARGV})
-        set_property(GLOBAL APPEND PROPERTY UA_ARCHITECTURE_SOURCES ${ARG})
-    ENDFOREACH(ARG)
-ENDFUNCTION(ua_add_architecture_file)
-
-#Add definitions to the compilations that are exclusive for the selected architecture
-FUNCTION(ua_architecture_add_definitions)
-    FOREACH(ARG ${ARGV})
-        set_property(GLOBAL APPEND PROPERTY UA_ARCHITECTURE_ADD_DEFINITIONS ${ARG})
-    ENDFOREACH(ARG)
-ENDFUNCTION(ua_architecture_add_definitions)
-
-#Remove definitions from the compilations that are exclusive for the selected architecture
-FUNCTION(ua_architecture_remove_definitions)
-    FOREACH(ARG ${ARGV})
-        set_property(GLOBAL APPEND PROPERTY UA_ARCHITECTURE_REMOVE_DEFINITIONS ${ARG})
-    ENDFOREACH(ARG)
-ENDFUNCTION(ua_architecture_remove_definitions)
-
-#Add libraries to be linked to the comnpilation that are exclusive for the selected architecture
-FUNCTION(ua_architecture_append_to_library)
-    FOREACH(ARG ${ARGV})
-        set_property(GLOBAL APPEND PROPERTY UA_ARCHITECTURE_APPEND_TO_LIBRARY ${ARG})
-    ENDFOREACH(ARG)
-ENDFUNCTION(ua_architecture_append_to_library)
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index 2126b2f5b85..2a2aec7890d 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -1,3 +1,4 @@
+set(open62541_TOOLS_DIR "${PROJECT_SOURCE_DIR}/tools")
 
 # --------------- Generate NodeIDs header ---------------------
 #

From 13b12dd24a43d89c9d6aee1cf538ce5574101180 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 30 Jul 2023 09:46:47 +0200
Subject: [PATCH 1093/1963] refactor(build): Lighten the #ifdef forest for the
 client

---
 CMakeLists.txt                             |  34 +-----
 include/open62541/client.h                 |   8 --
 include/open62541/client_highlevel.h       |   9 --
 include/open62541/client_highlevel_async.h |   2 -
 include/open62541/client_subscriptions.h   |   4 -
 include/open62541/config.h.in              |   1 -
 src/client/ua_client_discovery.c           |   4 -
 src/client/ua_client_highlevel.c           | 130 ++++++++-------------
 src/client/ua_client_internal.h            |   6 -
 src/client/ua_client_subscriptions.c       |   4 -
 src/server/ua_server_binary.c              |   2 +-
 tools/schema/datatypes_events.txt          |   1 -
 tools/schema/datatypes_subscriptions.txt   |   1 +
 13 files changed, 56 insertions(+), 150 deletions(-)
 delete mode 100644 tools/schema/datatypes_events.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 853c5b3c30f..a699cbe10bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ mark_as_advanced(UA_ENABLE_DISCOVERY_MULTICAST)
 
 # security provider
 set(UA_ENCRYPTION_PLUGINS "MBEDTLS" "OPENSSL" "LIBRESSL")
-set(UA_ENABLE_ENCRYPTION "OFF" CACHE STRING "Encryption support (Libressl EXPERIMENTAL)")
+set(UA_ENABLE_ENCRYPTION "OFF" CACHE STRING "Encryption support (LibreSSL EXPERIMENTAL)")
 SET_PROPERTY(CACHE UA_ENABLE_ENCRYPTION PROPERTY STRINGS "OFF" ${UA_ENCRYPTION_PLUGINS})
 option(UA_ENABLE_ENCRYPTION_OPENSSL "Deprecated: Enable encryption support (uses openssl)" OFF)
 mark_as_advanced(UA_ENABLE_ENCRYPTION_OPENSSL)
@@ -294,9 +294,6 @@ mark_as_advanced(UA_ENABLE_QUERY)
 option(UA_ENABLE_IMMUTABLE_NODES "Nodes in the information model are not edited but copied and replaced" OFF)
 mark_as_advanced(UA_ENABLE_IMMUTABLE_NODES)
 
-option(UA_ENABLE_EXPERIMENTAL_HISTORIZING "Enable support for experimental historical access features (client)" OFF)
-mark_as_advanced(UA_ENABLE_EXPERIMENTAL_HISTORIZING)
-
 option(UA_FORCE_32BIT "Force compilation as 32-bit executable" OFF)
 mark_as_advanced(UA_FORCE_32BIT)
 
@@ -458,12 +455,6 @@ if(UA_BUILD_FUZZING)
     add_definitions(-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
 endif()
 
-if(UA_ENABLE_EXPERIMENTAL_HISTORIZING)
-    if(NOT UA_ENABLE_HISTORIZING)
-        message(FATAL_ERROR "UA_ENABLE_EXPERIMENTAL_HISTORIZING cannot be used with disabled UA_ENABLE_HISTORIZING.")
-    endif()
-endif()
-
 option(UA_BUILD_FUZZING_CORPUS "Build the fuzzing corpus" OFF)
 mark_as_advanced(UA_BUILD_FUZZING_CORPUS)
 if(UA_BUILD_FUZZING_CORPUS)
@@ -1137,33 +1128,25 @@ else()
     set(UA_FILE_STATUSCODES ${PROJECT_SOURCE_DIR}/tools/schema/StatusCode.csv)
     set(UA_FILE_TYPES_BSD ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.Types.bsd)
 
-    if(UA_ENABLE_METHODCALLS)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_method.txt)
-    endif()
+    # always enable  subscriptions, method, discovery and historizing datatypes (for the client)
+    list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_subscriptions.txt)
+    list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_method.txt)
+    list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_discovery.txt)
+    list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_historizing.txt)
 
     if(UA_ENABLE_DIAGNOSTICS)
         list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_diagnostics.txt)
         list(APPEND UA_FILE_NODESETS ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.DiagnosticsMinimal.xml)
     endif()
 
-    if(UA_ENABLE_SUBSCRIPTIONS)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_subscriptions.txt)
-    endif()
-
     if(UA_ENABLE_SUBSCRIPTIONS_EVENTS)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_events.txt)
         list(APPEND UA_FILE_NODESETS ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.EventsMinimal.xml)
     endif()
 
     if(UA_ENABLE_HISTORIZING)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_historizing.txt)
         list(APPEND UA_FILE_NODESETS ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.HistorizingMinimal.xml)
     endif()
 
-    if(UA_ENABLE_DISCOVERY)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_discovery.txt)
-    endif()
-
     if(UA_ENABLE_QUERY)
         list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_query.txt)
     endif()
@@ -1398,11 +1381,6 @@ else()
     if(UA_ENABLE_NODESETLOADER)
         include_directories_private(${NODESETLOADER_PRIVATE_INCLUDES})
     endif()
-
-    # Option-specific includes
-    if(UA_ENABLE_DISCOVERY)
-        include_directories_private("${PROJECT_SOURCE_DIR}/src/client")
-    endif()
 endif()
 
 add_dependencies(open62541-object open62541-code-generation)
diff --git a/include/open62541/client.h b/include/open62541/client.h
index c8e67452d50..23dcd80d453 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -197,7 +197,6 @@ typedef struct {
      * attempt to recreate a healthy connection. */
     void (*inactivityCallback)(UA_Client *client);
 
-#ifdef UA_ENABLE_SUBSCRIPTIONS
     /* Number of PublishResponse queued up in the server */
     UA_UInt16 outStandingPublishRequests;
 
@@ -208,7 +207,6 @@ typedef struct {
     void (*subscriptionInactivityCallback)(UA_Client *client,
                                            UA_UInt32 subscriptionId,
                                            void *subContext);
-#endif
 
     UA_LocaleId *sessionLocaleIds;
     size_t sessionLocaleIdsSize;
@@ -520,7 +518,6 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
                       size_t *registeredServersSize,
                       UA_ApplicationDescription **registeredServers);
 
-#ifdef UA_ENABLE_DISCOVERY
 /* Get a list of all known server in the network. Only supported by LDS servers.
  *
  * @param client to use. Must be connected to the same endpoint given in
@@ -544,7 +541,6 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
                                UA_UInt32 startingRecordId, UA_UInt32 maxRecordsToReturn,
                                size_t serverCapabilityFilterSize, UA_String *serverCapabilityFilter,
                                size_t *serverOnNetworkSize, UA_ServerOnNetwork **serverOnNetwork);
-#endif
 
 /**
  * .. _client-services:
@@ -583,7 +579,6 @@ UA_Client_Service_write(UA_Client *client, const UA_WriteRequest request) {
 /*
 * Historical Access Service Set
 * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
-#ifdef UA_ENABLE_HISTORIZING
 static UA_INLINE UA_THREADSAFE UA_HistoryReadResponse
 UA_Client_Service_historyRead(UA_Client *client, const UA_HistoryReadRequest request) {
     UA_HistoryReadResponse response;
@@ -599,12 +594,10 @@ UA_Client_Service_historyUpdate(UA_Client *client, const UA_HistoryUpdateRequest
         &response, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE]);
     return response;
 }
-#endif
 
 /*
  * Method Service Set
  * ^^^^^^^^^^^^^^^^^^ */
-#ifdef UA_ENABLE_METHODCALLS
 static UA_INLINE UA_THREADSAFE UA_CallResponse
 UA_Client_Service_call(UA_Client *client, const UA_CallRequest request) {
     UA_CallResponse response;
@@ -612,7 +605,6 @@ UA_Client_Service_call(UA_Client *client, const UA_CallRequest request) {
                         &response, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
     return response;
 }
-#endif
 
 /*
  * NodeManagement Service Set
diff --git a/include/open62541/client_highlevel.h b/include/open62541/client_highlevel.h
index 77ba54acb97..8c34ac1fe4f 100644
--- a/include/open62541/client_highlevel.h
+++ b/include/open62541/client_highlevel.h
@@ -218,21 +218,18 @@ UA_Client_readUserExecutableAttribute(UA_Client *client, const UA_NodeId nodeId,
  * The following functions can be used to read a single node historically.
  * Use the regular service to read several nodes at once. */
 
-#ifdef UA_ENABLE_HISTORIZING
 typedef UA_Boolean
 (*UA_HistoricalIteratorCallback)(UA_Client *client,
                                  const UA_NodeId *nodeId,
                                  UA_Boolean moreDataAvailable,
                                  const UA_ExtensionObject *data, void *callbackContext);
 
-#ifdef UA_ENABLE_EXPERIMENTAL_HISTORIZING
 UA_StatusCode UA_EXPORT
 UA_Client_HistoryRead_events(UA_Client *client, const UA_NodeId *nodeId,
                                 const UA_HistoricalIteratorCallback callback,
                                 UA_DateTime startTime, UA_DateTime endTime,
                                 UA_String indexRange, const UA_EventFilter filter, UA_UInt32 numValuesPerNode,
                                 UA_TimestampsToReturn timestampsToReturn, void *callbackContext);
-#endif // UA_ENABLE_EXPERIMENTAL_HISTORIZING
 
 UA_StatusCode UA_EXPORT
 UA_Client_HistoryRead_raw(UA_Client *client, const UA_NodeId *nodeId,
@@ -241,14 +238,12 @@ UA_Client_HistoryRead_raw(UA_Client *client, const UA_NodeId *nodeId,
                              UA_String indexRange, UA_Boolean returnBounds, UA_UInt32 numValuesPerNode,
                              UA_TimestampsToReturn timestampsToReturn, void *callbackContext);
 
-#ifdef UA_ENABLE_EXPERIMENTAL_HISTORIZING
 UA_StatusCode UA_EXPORT
 UA_Client_HistoryRead_modified(UA_Client *client, const UA_NodeId *nodeId,
                                   const UA_HistoricalIteratorCallback callback,
                                   UA_DateTime startTime, UA_DateTime endTime,
                                   UA_String indexRange, UA_Boolean returnBounds, UA_UInt32 numValuesPerNode,
                                   UA_TimestampsToReturn timestampsToReturn, void *callbackContext);
-#endif // UA_ENABLE_EXPERIMENTAL_HISTORIZING
 
 UA_StatusCode UA_EXPORT
 UA_Client_HistoryUpdate_insert(UA_Client *client,
@@ -271,8 +266,6 @@ UA_Client_HistoryUpdate_deleteRaw(UA_Client *client,
                                   UA_DateTime startTimestamp,
                                   UA_DateTime endTimestamp);
 
-#endif // UA_ENABLE_HISTORIZING
-
 /**
  * Write Attributes
  * ^^^^^^^^^^^^^^^^
@@ -458,12 +451,10 @@ UA_Client_writeUserExecutableAttribute(UA_Client *client, const UA_NodeId nodeId
  * Method Calling
  * ^^^^^^^^^^^^^^ */
 
-#ifdef UA_ENABLE_METHODCALLS
 UA_StatusCode UA_EXPORT
 UA_Client_call(UA_Client *client, const UA_NodeId objectId,
                const UA_NodeId methodId, size_t inputSize, const UA_Variant *input,
                size_t *outputSize, UA_Variant **output);
-#endif
 
 /**
  * Node Management
diff --git a/include/open62541/client_highlevel_async.h b/include/open62541/client_highlevel_async.h
index 148b614a47a..65b131612f2 100644
--- a/include/open62541/client_highlevel_async.h
+++ b/include/open62541/client_highlevel_async.h
@@ -514,7 +514,6 @@ UA_Client_writeUserExecutableAttribute_async(UA_Client *client, const UA_NodeId
 /**
  * Method Calling
  * ^^^^^^^^^^^^^^ */
-#ifdef UA_ENABLE_METHODCALLS
 UA_StatusCode UA_EXPORT
 __UA_Client_call_async(UA_Client *client, const UA_NodeId objectId,
                        const UA_NodeId methodId, size_t inputSize,
@@ -533,7 +532,6 @@ UA_Client_call_async(UA_Client *client, const UA_NodeId objectId,
                                   (UA_ClientAsyncServiceCallback)callback, userdata,
                                   reqId);
 }
-#endif
 
 /**
  * Node Management
diff --git a/include/open62541/client_subscriptions.h b/include/open62541/client_subscriptions.h
index 0326a3d3921..1dd4568402f 100644
--- a/include/open62541/client_subscriptions.h
+++ b/include/open62541/client_subscriptions.h
@@ -9,8 +9,6 @@
 
 _UA_BEGIN_DECLS
 
-#ifdef UA_ENABLE_SUBSCRIPTIONS
-
 /**
  * .. _client-subscriptions:
  *
@@ -284,8 +282,6 @@ UA_Client_MonitoredItems_setTriggering_async(UA_Client *client,
         userdata, requestId);
 }
 
-#endif
-
 _UA_END_DECLS
 
 #endif /* UA_CLIENT_SUBSCRIPTIONS_H_ */
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index fb74036194f..9dc15177dd5 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -55,7 +55,6 @@
 #cmakedefine UA_ENABLE_DIAGNOSTICS
 #cmakedefine UA_ENABLE_HISTORIZING
 #cmakedefine UA_ENABLE_PARSING
-#cmakedefine UA_ENABLE_EXPERIMENTAL_HISTORIZING
 #cmakedefine UA_ENABLE_SUBSCRIPTIONS_EVENTS
 #cmakedefine UA_ENABLE_JSON_ENCODING
 #cmakedefine UA_ENABLE_XML_ENCODING
diff --git a/src/client/ua_client_discovery.c b/src/client/ua_client_discovery.c
index b2a192f3025..e84240d5efc 100644
--- a/src/client/ua_client_discovery.c
+++ b/src/client/ua_client_discovery.c
@@ -162,8 +162,6 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
     return retval;
 }
 
-#ifdef UA_ENABLE_DISCOVERY
-
 UA_StatusCode
 UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
                                UA_UInt32 startingRecordId, UA_UInt32 maxRecordsToReturn,
@@ -221,5 +219,3 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
         UA_Client_disconnect(client);
     return retval;
 }
-
-#endif
diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index 5622894c50d..aa7c7da324b 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -231,8 +231,6 @@ __UA_Client_addNode(UA_Client *client, const UA_NodeClass nodeClass,
 /* Call */
 /********/
 
-#ifdef UA_ENABLE_METHODCALLS
-
 UA_StatusCode
 UA_Client_call(UA_Client *client, const UA_NodeId objectId,
                const UA_NodeId methodId, size_t inputSize,
@@ -275,8 +273,6 @@ UA_Client_call(UA_Client *client, const UA_NodeId objectId,
     return retval;
 }
 
-#endif
-
 /********************/
 /* Write Attributes */
 /********************/
@@ -461,7 +457,7 @@ UA_Client_readArrayDimensionsAttribute(UA_Client *client, const UA_NodeId nodeId
 /*********************/
 /* Historical Access */
 /*********************/
-#ifdef UA_ENABLE_HISTORIZING
+
 static UA_HistoryReadResponse
 __UA_Client_HistoryRead(UA_Client *client, const UA_NodeId *nodeId,
                         UA_ExtensionObject* details, UA_String indexRange,
@@ -508,7 +504,7 @@ __UA_Client_HistoryRead_service(UA_Client *client, const UA_NodeId *nodeId,
         UA_HistoryReadResponse response =
             __UA_Client_HistoryRead(client, nodeId, details, indexRange, timestampsToReturn, continuationPoint, cleanup);
 
-        if (cleanup) {
+        if(cleanup) {
             retval = response.responseHeader.serviceResult;
 cleanup:    UA_HistoryReadResponse_clear(&response);
             UA_ByteString_clear(&continuationPoint);
@@ -516,13 +512,13 @@ cleanup:    UA_HistoryReadResponse_clear(&response);
         }
 
         retval = response.responseHeader.serviceResult;
-        if (retval == UA_STATUSCODE_GOOD) {
-            if (response.resultsSize == 1)
+        if(retval == UA_STATUSCODE_GOOD) {
+            if(response.resultsSize == 1)
                 retval = response.results[0].statusCode;
             else
                 retval = UA_STATUSCODE_BADUNEXPECTEDERROR;
         }
-        if (!UA_StatusCode_isEqualTop(retval,UA_STATUSCODE_GOOD))
+        if(!UA_StatusCode_isEqualTop(retval,UA_STATUSCODE_GOOD))
             goto cleanup;
 
         UA_HistoryReadResult *res = response.results;
@@ -537,12 +533,11 @@ cleanup:    UA_HistoryReadResponse_clear(&response);
 
         /* Regular cleanup */
         UA_HistoryReadResponse_clear(&response);
-    } while (continuationAvail);
+    } while(continuationAvail);
 
     return retval;
 }
 
-#ifdef UA_ENABLE_EXPERIMENTAL_HISTORIZING
 UA_StatusCode
 UA_Client_HistoryRead_events(UA_Client *client, const UA_NodeId *nodeId,
                                 const UA_HistoricalIteratorCallback callback,
@@ -568,7 +563,6 @@ UA_Client_HistoryRead_events(UA_Client *client, const UA_NodeId *nodeId,
     return __UA_Client_HistoryRead_service(client, nodeId, callback, &detailsExtensionObject,
                                               indexRange, timestampsToReturn, callbackContext);
 }
-#endif // UA_ENABLE_EXPERIMENTAL_HISTORIZING
 
 static UA_StatusCode
 __UA_Client_HistoryRead_service_rawMod(UA_Client *client, const UA_NodeId *nodeId,
@@ -610,24 +604,19 @@ UA_Client_HistoryRead_raw(UA_Client *client, const UA_NodeId *nodeId,
                                                      numValuesPerNode, false, timestampsToReturn, callbackContext);
 }
 
-#ifdef UA_ENABLE_EXPERIMENTAL_HISTORIZING
 UA_StatusCode
 UA_Client_HistoryRead_modified(UA_Client *client, const UA_NodeId *nodeId,
                                   const UA_HistoricalIteratorCallback callback,
                                   UA_DateTime startTime, UA_DateTime endTime,
                                   UA_String indexRange, UA_Boolean returnBounds, UA_UInt32 maxItems,
                                   UA_TimestampsToReturn timestampsToReturn, void *callbackContext) {
-
-    return __UA_Client_HistoryRead_service_rawMod(client, nodeId, callback, startTime, endTime, indexRange, returnBounds,
-                                                     maxItems, true, timestampsToReturn, callbackContext);
+    return __UA_Client_HistoryRead_service_rawMod(client, nodeId, callback, startTime,
+                                                  endTime, indexRange, returnBounds, maxItems,
+                                                  true, timestampsToReturn, callbackContext);
 }
-#endif // UA_ENABLE_EXPERIMENTAL_HISTORIZING
 
 static UA_HistoryUpdateResponse
-__UA_Client_HistoryUpdate(UA_Client *client,
-                          void *details,
-                          size_t typeId)
-{
+__UA_Client_HistoryUpdate(UA_Client *client, void *details, size_t typeId) {
     UA_HistoryUpdateRequest request;
     UA_HistoryUpdateRequest_init(&request);
 
@@ -646,11 +635,8 @@ __UA_Client_HistoryUpdate(UA_Client *client,
 }
 
 static UA_StatusCode
-__UA_Client_HistoryUpdate_updateData(UA_Client *client,
-                          const UA_NodeId *nodeId,
-                          UA_PerformUpdateType type,
-                          UA_DataValue *value)
-{
+__UA_Client_HistoryUpdate_updateData(UA_Client *client, const UA_NodeId *nodeId,
+                                     UA_PerformUpdateType type, UA_DataValue *value) {
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     UA_UpdateDataDetails details;
     UA_UpdateDataDetails_init(&details);
@@ -662,15 +648,15 @@ __UA_Client_HistoryUpdate_updateData(UA_Client *client,
 
     UA_HistoryUpdateResponse response;
     response = __UA_Client_HistoryUpdate(client, &details, UA_TYPES_UPDATEDATADETAILS);
-    if (response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+    if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         ret = response.responseHeader.serviceResult;
         goto cleanup;
     }
-    if (response.resultsSize != 1 || response.results[0].operationResultsSize != 1) {
+    if(response.resultsSize != 1 || response.results[0].operationResultsSize != 1) {
         ret = UA_STATUSCODE_BADUNEXPECTEDERROR;
         goto cleanup;
     }
-    if (response.results[0].statusCode != UA_STATUSCODE_GOOD) {
+    if(response.results[0].statusCode != UA_STATUSCODE_GOOD) {
         ret = response.results[0].statusCode;
         goto cleanup;
     }
@@ -682,61 +668,47 @@ __UA_Client_HistoryUpdate_updateData(UA_Client *client,
 }
 
 UA_StatusCode
-UA_Client_HistoryUpdate_insert(UA_Client *client,
-                               const UA_NodeId *nodeId,
-                               UA_DataValue *value)
-{
-    return __UA_Client_HistoryUpdate_updateData(client,
-                                                nodeId,
+UA_Client_HistoryUpdate_insert(UA_Client *client, const UA_NodeId *nodeId,
+                               UA_DataValue *value) {
+    return __UA_Client_HistoryUpdate_updateData(client, nodeId,
                                                 UA_PERFORMUPDATETYPE_INSERT,
                                                 value);
 }
 
 UA_StatusCode
-UA_Client_HistoryUpdate_replace(UA_Client *client,
-                                const UA_NodeId *nodeId,
-                                UA_DataValue *value)
-{
-    return __UA_Client_HistoryUpdate_updateData(client,
-                                                nodeId,
+UA_Client_HistoryUpdate_replace(UA_Client *client, const UA_NodeId *nodeId,
+                                UA_DataValue *value) {
+    return __UA_Client_HistoryUpdate_updateData(client, nodeId,
                                                 UA_PERFORMUPDATETYPE_REPLACE,
                                                 value);
 }
 
 UA_StatusCode
-UA_Client_HistoryUpdate_update(UA_Client *client,
-                               const UA_NodeId *nodeId,
-                               UA_DataValue *value)
-{
-    return __UA_Client_HistoryUpdate_updateData(client,
-                                                nodeId,
+UA_Client_HistoryUpdate_update(UA_Client *client, const UA_NodeId *nodeId,
+                               UA_DataValue *value) {
+    return __UA_Client_HistoryUpdate_updateData(client, nodeId,
                                                 UA_PERFORMUPDATETYPE_UPDATE,
                                                 value);
 }
 
 UA_StatusCode
-UA_Client_HistoryUpdate_deleteRaw(UA_Client *client,
-                                  const UA_NodeId *nodeId,
-                                  UA_DateTime startTimestamp,
-                                  UA_DateTime endTimestamp)
-{
-    UA_StatusCode ret = UA_STATUSCODE_GOOD;
-
+UA_Client_HistoryUpdate_deleteRaw(UA_Client *client, const UA_NodeId *nodeId,
+                                  UA_DateTime startTimestamp, UA_DateTime endTimestamp) {
     UA_DeleteRawModifiedDetails details;
     UA_DeleteRawModifiedDetails_init(&details);
-
     details.isDeleteModified = false;
     details.startTime = startTimestamp;
     details.endTime = endTimestamp;
     UA_NodeId_copy(nodeId, &details.nodeId);
 
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
     UA_HistoryUpdateResponse response;
     response = __UA_Client_HistoryUpdate(client, &details, UA_TYPES_DELETERAWMODIFIEDDETAILS);
-    if (response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+    if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         ret = response.responseHeader.serviceResult;
         goto cleanup;
     }
-    if (response.resultsSize != 1) {
+    if(response.resultsSize != 1) {
         ret = UA_STATUSCODE_BADUNEXPECTEDERROR;
         goto cleanup;
     }
@@ -748,25 +720,24 @@ UA_Client_HistoryUpdate_deleteRaw(UA_Client *client,
     UA_NodeId_clear(&details.nodeId);
     return ret;
 }
-#endif // UA_ENABLE_HISTORIZING
 
 /*******************/
 /* Async Functions */
 /*******************/
 
-/*Write Attributes*/
-UA_StatusCode __UA_Client_writeAttribute_async(UA_Client *client,
-        const UA_NodeId *nodeId, UA_AttributeId attributeId, const void *in,
-        const UA_DataType *inDataType, UA_ClientAsyncServiceCallback callback,
-        void *userdata, UA_UInt32 *reqId) {
-    if (!in)
+UA_StatusCode
+__UA_Client_writeAttribute_async(UA_Client *client, const UA_NodeId *nodeId,
+                                 UA_AttributeId attributeId, const void *in,
+                                 const UA_DataType *inDataType, UA_ClientAsyncServiceCallback callback,
+                                 void *userdata, UA_UInt32 *reqId) {
+    if(!in)
         return UA_STATUSCODE_BADTYPEMISMATCH;
 
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
     wValue.nodeId = *nodeId;
     wValue.attributeId = attributeId;
-    if (attributeId == UA_ATTRIBUTEID_VALUE)
+    if(attributeId == UA_ATTRIBUTEID_VALUE)
         wValue.value.value = *(const UA_Variant*) in;
     else
         /* hack. is never written into. */
@@ -783,16 +754,14 @@ UA_StatusCode __UA_Client_writeAttribute_async(UA_Client *client,
             &UA_TYPES[UA_TYPES_WRITERESPONSE], userdata, reqId);
 }
 
-/*Node Management*/
-
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 __UA_Client_addNode_async(UA_Client *client, const UA_NodeClass nodeClass,
-        const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
-        const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
-        const UA_NodeId typeDefinition, const UA_NodeAttributes *attr,
-        const UA_DataType *attributeType, UA_NodeId *outNewNodeId,
-        UA_ClientAsyncServiceCallback callback, void *userdata,
-        UA_UInt32 *reqId) {
+                          const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
+                          const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
+                          const UA_NodeId typeDefinition, const UA_NodeAttributes *attr,
+                          const UA_DataType *attributeType, UA_NodeId *outNewNodeId,
+                          UA_ClientAsyncServiceCallback callback, void *userdata,
+                          UA_UInt32 *reqId) {
     UA_AddNodesRequest request;
     UA_AddNodesRequest_init(&request);
     UA_AddNodesItem item;
@@ -815,13 +784,11 @@ __UA_Client_addNode_async(UA_Client *client, const UA_NodeClass nodeClass,
 
 }
 
-/* Misc Highlevel Functions */
-#ifdef UA_ENABLE_METHODCALLS
-UA_StatusCode __UA_Client_call_async(UA_Client *client,
-        const UA_NodeId objectId, const UA_NodeId methodId, size_t inputSize,
-        const UA_Variant *input, UA_ClientAsyncServiceCallback callback,
-        void *userdata, UA_UInt32 *reqId) {
-
+UA_StatusCode
+__UA_Client_call_async(UA_Client *client, const UA_NodeId objectId,
+                       const UA_NodeId methodId, size_t inputSize,
+                       const UA_Variant *input, UA_ClientAsyncServiceCallback callback,
+                       void *userdata, UA_UInt32 *reqId) {
     UA_CallRequest request;
     UA_CallRequest_init(&request);
     UA_CallMethodRequest item;
@@ -837,7 +804,6 @@ UA_StatusCode __UA_Client_call_async(UA_Client *client,
             &UA_TYPES[UA_TYPES_CALLREQUEST], callback,
             &UA_TYPES[UA_TYPES_CALLRESPONSE], userdata, reqId);
 }
-#endif
 
 /* UA_StatusCode */
 /* UA_Cient_translateBrowsePathsToNodeIds_async(UA_Client *client, char **paths, */
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index eb1757460ae..7d764ec3f46 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -29,8 +29,6 @@ _UA_BEGIN_DECLS
 /* Subscriptions Handling */
 /**************************/
 
-#ifdef UA_ENABLE_SUBSCRIPTIONS
-
 typedef struct UA_Client_NotificationsAckNumber {
     LIST_ENTRY(UA_Client_NotificationsAckNumber) listEntry;
     UA_SubscriptionAcknowledgement subAck;
@@ -87,8 +85,6 @@ __Client_Subscriptions_backgroundPublish(UA_Client *client);
 void
 __Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client);
 
-#endif /* UA_ENABLE_SUBSCRIPTIONS */
-
 /**********/
 /* Client */
 /**********/
@@ -163,12 +159,10 @@ struct UA_Client {
     UA_AsyncServiceList asyncServiceCalls;
 
     /* Subscriptions */
-#ifdef UA_ENABLE_SUBSCRIPTIONS
     LIST_HEAD(, UA_Client_NotificationsAckNumber) pendingNotificationsAcks;
     LIST_HEAD(, UA_Client_Subscription) subscriptions;
     UA_UInt32 monitoredItemHandles;
     UA_UInt16 currentlyOutStandingPublishRequests;
-#endif
 
     /* Internal locking for thread-safety. Methods starting with UA_Client_ that
      * are marked with UA_THREADSAFE take the lock. The lock is released before
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 70fc9aab423..e0e56b7c391 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -16,8 +16,6 @@
 
 #include "ua_client_internal.h"
 
-#ifdef UA_ENABLE_SUBSCRIPTIONS /* conditional compilation */
-
 /*****************/
 /* Subscriptions */
 /*****************/
@@ -1378,5 +1376,3 @@ __Client_Subscriptions_backgroundPublish(UA_Client *client) {
         client->currentlyOutStandingPublishRequests++;
     }
 }
-
-#endif /* UA_ENABLE_SUBSCRIPTIONS */
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 3912d5245cd..f0cae3fe9ff 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -823,7 +823,7 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
     }
 #endif
 
-#if UA_MULTITHREADING >= 100
+#if UA_MULTITHREADING >= 100 && defined(UA_ENABLE_METHODCALLS)
     /* The call request might not be answered immediately */
     if(requestType == &UA_TYPES[UA_TYPES_CALLREQUEST]) {
         UA_Boolean finished = true;
diff --git a/tools/schema/datatypes_events.txt b/tools/schema/datatypes_events.txt
deleted file mode 100644
index fca672e432f..00000000000
--- a/tools/schema/datatypes_events.txt
+++ /dev/null
@@ -1 +0,0 @@
-TimeZoneDataType
diff --git a/tools/schema/datatypes_subscriptions.txt b/tools/schema/datatypes_subscriptions.txt
index 8c1ad4cfa66..e493174ce9a 100644
--- a/tools/schema/datatypes_subscriptions.txt
+++ b/tools/schema/datatypes_subscriptions.txt
@@ -55,3 +55,4 @@ TransferSubscriptionsRequest
 TransferSubscriptionsResponse
 SetTriggeringRequest
 SetTriggeringResponse
+TimeZoneDataType

From 0b3b53bfe739bda756f533aece967a5524731280 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 30 Jul 2023 09:50:46 +0200
Subject: [PATCH 1094/1963] refactor(build): Only force -werror for debug
 builds

---
 CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a699cbe10bd..f5e524d4d0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,7 +297,10 @@ mark_as_advanced(UA_ENABLE_IMMUTABLE_NODES)
 option(UA_FORCE_32BIT "Force compilation as 32-bit executable" OFF)
 mark_as_advanced(UA_FORCE_32BIT)
 
-option(UA_FORCE_WERROR "Force compilation with -Werror (or /WX on MSVC)" ON)
+option(UA_FORCE_WERROR "Force compilation with -Werror (or /WX on MSVC)" OFF)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(UA_FORCE_WERROR ON)
+endif()
 
 option(UA_ENABLE_DEBUG_SANITIZER "Use sanitizer in debug mode" ON)
 mark_as_advanced(UA_ENABLE_DEBUG_SANITIZER)

From 0fc3405cecbb486470f05749a00df7b4c833edd6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 30 Jul 2023 10:05:00 +0200
Subject: [PATCH 1095/1963] refactor(arch): Update the arch Readme

---
 arch/Readme.md | 94 +++++++++++++++-----------------------------------
 1 file changed, 28 insertions(+), 66 deletions(-)

diff --git a/arch/Readme.md b/arch/Readme.md
index 77fa1f0ee49..d3a23cdb3ea 100644
--- a/arch/Readme.md
+++ b/arch/Readme.md
@@ -1,54 +1,31 @@
-# open62541 Architectures 
+# open62541 Architecture Support
 
-The `arch` folder contains all the architecture-specific code for a given operating system.
+This folder contains all the architecture-specific code for different operating systems.
+The arch-specific code covers:
 
-The list of supported architectures is also available as a CMake option.
+- System clock
+- EventLoop (Networking, Interrupt handling (optional))
 
-## Adding new architectures
+Currently open62541 supports
 
-To port to a new architecture you should follow these steps:
+- Windows
+- POSIX (Linux, BSD, Mac, etc.)
 
-1. Create a folder with your architecture, let's call it new_arch
+Previously (until v1.3) there was additional support for:
 
-2. In the CMakeLists.txt file located next to this file, add `add_subdirectory(new_arch)` at the end of it
+- freeRTOS
+- vxWorks
+- WEC7
+- eCos
 
-3. Create a CMakeLists.txt file in the new_arch folder
+We strive to recover support for these.
+The main effort of porting is forking the EventLoop implementation.
 
-4. Use the following template for it (remember that when you see new_arch you should replace with the name of your architecture)
-    ```C
-    # ---------------------------------------------------
-    # ---- Beginning of the CMakeLists.txt template -----
-    # ---------------------------------------------------
-    
-    SET(SOURCE_GROUP ${SOURCE_GROUP}\\new_arch)
-    
-    ua_add_architecture("new_arch")
-    
-    if("${UA_ARCHITECTURE}" STREQUAL "new_arch")
-    
-        ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-        ua_add_architecture_file(${CMAKE_CURRENT_SOURCE_DIR}/ua_clock.c)
-        
-        #
-        # Add here below all the things that are specific for your architecture
-        #
-        
-        #You can use the following available CMake functions:
-         
-        #ua_include_directories() include some directories specific to your architecture when compiling the open62541 stack
-        #ua_architecture_remove_definitions() remove compiler flags from the general ../../CMakeLists.txt file that won't work with your architecture
-        #ua_architecture_add_definitions() add compiler flags that your architecture needs
-        #ua_architecture_append_to_library() add libraries to be linked to the open62541 that are needed by your architecture
-        #ua_add_architecture_header() add header files to compilation (Don't add the file ua_architecture.h)
-        #ua_add_architecture_file() add .c files to compilation    
-        
-    endif()
-    
-    # ---------------------------------------------------
-    # ---- End of the CMakeLists.txt template -----
-    # ---------------------------------------------------
-    ```
-5. Create a ua_clock.c file that implements the following functions defined in open62541/types.h:
+## Adding new architectures
+
+To port to a new architecture you should follow these steps:
+
+1. Create a ua_clock.c file that implements the following functions defined in open62541/types.h:
 
    * UA_DateTime UA_DateTime_now(void);
    
@@ -56,28 +33,13 @@ To port to a new architecture you should follow these steps:
    
    * UA_DateTime UA_DateTime_nowMonotonic(void);
 
-6. Create a file in the folder new_arch called ua_architecture.h
+2. Fork the EventLoop code (the default is POSIX) and adjust to your architecture
 
-7. Use the following template for it:  
+3. Add your architecture to the list in /include/open62541/config.h.in
 
-   * Change YEAR, YOUR_NAME and YOUR_COMPANY in the header
-   
-   * Change NEW_ARCH at the beginning in PLUGINS_ARCH_NEW_ARCH_UA_ARCHITECTURE_H_ for your own name in uppercase  
-   
-    ```C
-    /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
-     * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
-     *
-     *    Copyright YEAR (c) YOUR_NAME, YOUR_COMPANY
-     */
-    
-    #ifndef PLUGINS_ARCH_NEW_ARCH_UA_ARCHITECTURE_H_
-    #define PLUGINS_ARCH_NEW_ARCH_UA_ARCHITECTURE_H_
-    
-    /*
-     * Define and include all that's needed for your architecture
-     */
-    
-    #endif /* PLUGINS_ARCH_NEW_ARCH_UA_ARCHITECTURE_H_ */
-    
-    ```
+4. Add the architecture and the new files to /CMakeLists.txt
+
+You can also use a custom architecture implementation outside of the library build.
+For that, set UA_ARCHITECTURE=none in the cmake setting.
+Then no architecture-specific code will be included in the open62541 library itself.
+You have to link in your custom clock and EventLoop implementation only for the final binary.

From 580738041b83e074f8fcd7c0d3a2a5c3f2738455 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 30 Jul 2023 10:06:20 +0200
Subject: [PATCH 1096/1963] refactor(arch): Remove unused arch/CMakeLists.txt

---
 arch/CMakeLists.txt | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 arch/CMakeLists.txt

diff --git a/arch/CMakeLists.txt b/arch/CMakeLists.txt
deleted file mode 100644
index 9f795cc9307..00000000000
--- a/arch/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-SET(SOURCE_GROUP ${SOURCE_GROUP}\\arch)
-
-ua_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # to have access to ua_network_tcp.h
-ua_include_directories(${PROJECT_SOURCE_DIR}/src) # to have access to ua_securechannel.h
-
-add_subdirectory(posix)
-add_subdirectory(win32)
-
-SET(UA_ARCH_EXTRA_INCLUDES "" CACHE STRING "Folders to include from the architecture")
-mark_as_advanced(UA_ARCH_EXTRA_INCLUDES)
-ua_include_directories(${UA_ARCH_EXTRA_INCLUDES})
-
-SET(UA_ARCH_REMOVE_FLAGS "" CACHE STRING "Flags to be removed from compilation that depends on the architecure")
-mark_as_advanced(UA_ARCH_REMOVE_FLAGS)
-ua_architecture_remove_definitions(${UA_ARCH_REMOVE_FLAGS})
-
-SET(UA_ARCH_ADD_FLAGS "" CACHE STRING "Flags to be added to compilation that depends on the architecure")
-mark_as_advanced(UA_ARCH_ADD_FLAGS)
-ua_architecture_add_definitions(${UA_ARCH_ADD_FLAGS})
-
-SET(UA_ARCH_LINKER_FLAGS "" CACHE STRING "Linker Flags to be added to compilation that depends on the architecure")
-mark_as_advanced(UA_ARCH_LINKER_FLAGS)
-ua_architecture_append_to_library(${UA_ARCH_LINKER_FLAGS})

From 79982adfd563a43f09652db134fac652339672ae Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 30 Jul 2023 10:30:47 +0200
Subject: [PATCH 1097/1963] refactor(server): Remove dependency of the server
 on client internals

---
 src/server/ua_services_discovery.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index af0b4d29f64..c33cf32a14f 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -17,7 +17,7 @@
 
 #ifdef UA_ENABLE_DISCOVERY
 
-#include "ua_client_internal.h"
+#include <open62541/client.h>
 
 static UA_StatusCode
 setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *request,
@@ -570,7 +570,10 @@ UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    if(UA_SecureChannel_isConnected(&client->channel)) {
+    /* The client is already connected */
+    UA_SecureChannelState scState = UA_SECURECHANNELSTATE_CLOSED;
+    UA_Client_getState(client, &scState, NULL, NULL);
+    if(scState != UA_SECURECHANNELSTATE_CLOSED) {
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINVALIDSTATE;
     }

From 8895d69bc0c1c734eca96b6037af9f0442bf070c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 1 Aug 2023 13:36:38 +0200
Subject: [PATCH 1098/1963] refactor(client): Move struct from
 ua_client_internal.h to ua_client_subscriptions.c

---
 src/client/ua_client_internal.h      | 13 ++-----------
 src/client/ua_client_subscriptions.c |  6 ++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 7d764ec3f46..1f2e2db4bf1 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -34,10 +34,7 @@ typedef struct UA_Client_NotificationsAckNumber {
     UA_SubscriptionAcknowledgement subAck;
 } UA_Client_NotificationsAckNumber;
 
-struct UA_Client_MonitoredItem;
-typedef struct UA_Client_MonitoredItem UA_Client_MonitoredItem;
-
-struct UA_Client_MonitoredItem {
+typedef struct UA_Client_MonitoredItem {
     ZIP_ENTRY(UA_Client_MonitoredItem) zipfields;
     UA_UInt32 monitoredItemId;
     UA_UInt32 clientHandle;
@@ -48,7 +45,7 @@ struct UA_Client_MonitoredItem {
         UA_Client_EventNotificationCallback eventCallback;
     } handler;
     UA_Boolean isEventMonitoredItem; /* Otherwise a DataChange MoniitoredItem */
-};
+} UA_Client_MonitoredItem;
 
 ZIP_HEAD(MonitorItemsTree, UA_Client_MonitoredItem);
 typedef struct MonitorItemsTree MonitorItemsTree;
@@ -66,12 +63,6 @@ typedef struct UA_Client_Subscription {
     MonitorItemsTree monitoredItems;
 } UA_Client_Subscription;
 
-struct UA_Client_MonitoredItem_ForDelete {
-    UA_Client *client;
-    UA_Client_Subscription *sub;
-    UA_UInt32 *monitoredItemId;
-};
-
 void
 __Client_Subscriptions_clean(UA_Client *client);
 
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index e0e56b7c391..010373179aa 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -16,6 +16,12 @@
 
 #include "ua_client_internal.h"
 
+struct UA_Client_MonitoredItem_ForDelete {
+    UA_Client *client;
+    UA_Client_Subscription *sub;
+    UA_UInt32 *monitoredItemId;
+};
+
 /*****************/
 /* Subscriptions */
 /*****************/

From a5c7b317abccce773ba7baa35395cb08eb25b8a4 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Wed, 2 Aug 2023 14:24:35 +0200
Subject: [PATCH 1099/1963] fix(arch): Decrease log level for processing
 delayed callbacks

The log "Process delayed callbacks" is called as often as
the log "Iterate the EventLoop", so the log level should also be
UA_LOGLEVEL_TRACE, not UA_LOGLEVEL_DEBUG.
---
 arch/eventloop_posix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index c5f1bf47124..816f11b5341 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -93,7 +93,7 @@ UA_EventLoopPOSIX_removeDelayedCallback(UA_EventLoop *public_el,
 /* Process and then free registered delayed callbacks */
 static void
 processDelayed(UA_EventLoopPOSIX *el) {
-    UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
+    UA_LOG_TRACE(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
                  "Process delayed callbacks");
 
     UA_LOCK_ASSERT(&el->elMutex, 1);

From d80c72030f20a4b5fa5ec248a95eb5cb13cb2167 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 3 Aug 2023 09:09:38 +0200
Subject: [PATCH 1100/1963] fix(pubsub): Fix invalid null pointer access at
 realloc

---
 src/pubsub/ua_pubsub_bufmalloc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_bufmalloc.c b/src/pubsub/ua_pubsub_bufmalloc.c
index 35690ad974a..bc94bebf4d1 100644
--- a/src/pubsub/ua_pubsub_bufmalloc.c
+++ b/src/pubsub/ua_pubsub_bufmalloc.c
@@ -39,7 +39,10 @@ static void * membufCalloc(size_t nelem, size_t elsize) {
 }
 
 static void * (membufRealloc)(void *ptr, size_t size) {
-    size_t orig_size = ((size_t*)ptr)[-1];
+    size_t orig_size = 0;
+    if(ptr) {
+       orig_size = ((size_t*)ptr)[-1];
+    }
     if(size <= orig_size)
         return ptr;
     void *mem = membufMalloc(size);

From ab06537fb69890c8cf61e8a38ee8a03efa6f46cf Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 3 Aug 2023 12:06:58 +0200
Subject: [PATCH 1101/1963] fix(pubsub): Support all DSR publisher id types for
 xml encoding

---
 src/pubsub/ua_pubsub_reader.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 85c27834f0f..90de9178923 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -90,8 +90,7 @@ UA_DataSetReader_checkIdentifier(UA_Server *server, UA_NetworkMessage *msg,
         }
         return UA_STATUSCODE_GOOD;
     } else {
-        if(reader->config.publisherId.type != &UA_TYPES[UA_TYPES_UINT32] &&
-           msg->publisherId.uint32 != *(UA_UInt32*)reader->config.publisherId.data)
+        if (!publisherIdIsMatching(msg, reader->config.publisherId))
             return UA_STATUSCODE_BADNOTFOUND;
 
         if(reader->config.dataSetWriterId == *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {

From 7484adccc6efff0a232950439e92fd6ee5582955 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 11 Aug 2023 10:57:51 +0200
Subject: [PATCH 1102/1963] refactor(arch): Cosmetic fix in eventloop_common.c

---
 arch/eventloop_common.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/eventloop_common.c b/arch/eventloop_common.c
index 26aa2d0669f..a4225b1afe4 100644
--- a/arch/eventloop_common.c
+++ b/arch/eventloop_common.c
@@ -8,8 +8,7 @@
 #include "eventloop_common.h"
 
 UA_StatusCode
-UA_KeyValueRestriction_validate(const UA_Logger *logger,
-                                const char *logprefix,
+UA_KeyValueRestriction_validate(const UA_Logger *logger, const char *logprefix,
                                 const UA_KeyValueRestriction *restrictions, size_t restrictionsSize,
                                 const UA_KeyValueMap *map) {
     for(size_t i = 0; i < restrictionsSize; i++) {

From 8084975e787bc5465dd4e09478bde52ed7281062 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 11 Aug 2023 10:58:57 +0200
Subject: [PATCH 1103/1963] refactor(server): Cosmetic fix in ua_session.c

---
 src/server/ua_session.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index 8605d0933d4..884c48b49ed 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -211,7 +211,7 @@ getSubscriptionById(UA_Server *server, UA_UInt32 subscriptionId) {
 
 UA_PublishResponseEntry*
 UA_Session_dequeuePublishReq(UA_Session *session) {
-    UA_PublishResponseEntry* entry = SIMPLEQ_FIRST(&session->responseQueue);
+    UA_PublishResponseEntry *entry = SIMPLEQ_FIRST(&session->responseQueue);
     if(entry) {
         SIMPLEQ_REMOVE_HEAD(&session->responseQueue, listEntry);
         session->responseQueueSize--;

From 2f16a14523fec985840eaa9205d216a59d55b9ff Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 11 Aug 2023 11:02:21 +0200
Subject: [PATCH 1104/1963] fix(server): Consider the timeout hint of publish
 requests

Answer with BadTimeout if the request is too old.
---
 src/server/ua_services_subscription.c |  8 +++++++
 src/server/ua_session.h               |  1 +
 src/server/ua_subscription.c          | 30 ++++++++++++++++++++++++---
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 3d305868ff6..c4fa5787d1d 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -306,6 +306,14 @@ Service_Publish(UA_Server *server, UA_Session *session,
             UA_Subscription_removeRetransmissionMessage(sub, ack->sequenceNumber);
     }
 
+    /* Set the maxTime if a timeout hint is defined */
+    entry->maxTime = UA_INT64_MAX;
+    if(request->requestHeader.timeoutHint > 0) {
+        UA_EventLoop *el = server->config.eventLoop;
+        entry->maxTime = el->dateTime_nowMonotonic(el) +
+            (request->requestHeader.timeoutHint * UA_DATETIME_MSEC);
+    }
+
     /* Queue the publish response. It will be dequeued in a repeated publish
      * callback. This can also be triggered right now for a late
      * subscription. */
diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index 098a76cfba9..59a5d5c0e9f 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -31,6 +31,7 @@ typedef struct UA_Subscription UA_Subscription;
 typedef struct UA_PublishResponseEntry {
     SIMPLEQ_ENTRY(UA_PublishResponseEntry) listEntry;
     UA_UInt32 requestId;
+    UA_DateTime maxTime; /* Based on the TimeoutHint of the request */
     UA_PublishResponse response;
 } UA_PublishResponseEntry;
 #endif
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index ca14112bc8b..ebef8e8e33a 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -451,10 +451,34 @@ delayedPublishNotifications(UA_Server *server, UA_Subscription *sub) {
  * done. */
 void
 UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
-    /* Dequeue a response */
+    /* Get a response */
     UA_PublishResponseEntry *pre = NULL;
-    if(sub->session)
-        pre = UA_Session_dequeuePublishReq(sub->session);
+    if(sub->session) {
+        UA_EventLoop *el = server->config.eventLoop;
+        UA_DateTime nowMonotonic = el->dateTime_nowMonotonic(el);
+        do {
+            /* Dequeue the oldest response */
+            pre = UA_Session_dequeuePublishReq(sub->session);
+            if(!pre)
+                break;
+
+            /* Check if the TimeoutHint is still valid. Otherwise return with a bad
+             * statuscode and continue. */
+            if(pre->maxTime < nowMonotonic) {
+                UA_LOG_DEBUG_SESSION(&server->config.logger, sub->session,
+                                     "Publish request %u has timed out", pre->requestId);
+
+                pre->response.responseHeader.serviceResult = UA_STATUSCODE_BADTIMEOUT;
+                pre->response.responseHeader.timestamp = UA_DateTime_now();
+                sendResponse(server, sub->session, sub->session->header.channel,
+                             pre->requestId, (UA_Response *)&pre->response,
+                             &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+                UA_PublishResponse_clear(&pre->response);
+                UA_free(pre);
+                pre = NULL;
+            }
+        } while(!pre);
+    }
 
     /* Update the LifetimeCounter */
     if(pre) {

From c4f1159f3d3e7974414e85391e989dca0c2c3522 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 11 Aug 2023 11:15:19 +0200
Subject: [PATCH 1105/1963] refactor(server): Simplify the case where to many
 publish requests are in the queue

---
 src/server/ua_services_subscription.c | 12 +-----
 src/server/ua_subscription.c          | 56 ++++++++++-----------------
 src/server/ua_subscription.h          |  4 +-
 3 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index c4fa5787d1d..b5ad64cdc8d 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -246,16 +246,8 @@ Service_Publish(UA_Server *server, UA_Session *session,
 
     /* Handle too many subscriptions to free resources before trying to allocate
      * resources for the new publish request. If the limit has been reached the
-     * oldest publish request shall be responded */
-    if((server->config.maxPublishReqPerSession != 0) &&
-       (session->responseQueueSize >= server->config.maxPublishReqPerSession)) {
-        if(!UA_Session_reachedPublishReqLimit(server, session)) {
-            sendServiceFault(session->header.channel, requestId,
-                             request->requestHeader.requestHandle,
-                             UA_STATUSCODE_BADINTERNALERROR);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    }
+     * oldest publish request are returned with an error message. */
+    UA_Session_ensurePublishQueueSpace(server, session);
 
     /* Allocate the response to store it in the retransmission queue */
     UA_PublishResponseEntry *entry = (UA_PublishResponseEntry *)
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index ebef8e8e33a..637a4639e5e 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -691,46 +691,30 @@ UA_Subscription_sampleAndPublish(UA_Server *server, UA_Subscription *sub) {
     UA_Subscription_publish(server, sub);
 }
 
-UA_Boolean
-UA_Session_reachedPublishReqLimit(UA_Server *server, UA_Session *session) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
-                         "Reached number of publish request limit");
-
-    /* Dequeue a response */
-    UA_PublishResponseEntry *pre = UA_Session_dequeuePublishReq(session);
-
-    /* Cannot publish without a response */
-    if(!pre) {
-        UA_LOG_FATAL_SESSION(&server->config.logger, session,
-                             "No publish requests available");
-        return false;
-    }
-
-    /* <-- The point of no return --> */
-
-    UA_PublishResponse *response = &pre->response;
-    UA_NotificationMessage *message = &response->notificationMessage;
+void
+UA_Session_ensurePublishQueueSpace(UA_Server* server, UA_Session* session) {
+    if(server->config.maxPublishReqPerSession == 0)
+        return;
 
-    /* Set up the response. Note that this response has no related subscription id */
-    response->responseHeader.timestamp = UA_DateTime_now();
-    response->responseHeader.serviceResult = UA_STATUSCODE_BADTOOMANYPUBLISHREQUESTS;
-    response->subscriptionId = 0;
-    response->moreNotifications = false;
-    message->publishTime = response->responseHeader.timestamp;
-    message->sequenceNumber = 0;
-    response->availableSequenceNumbersSize = 0;
+    while(session->responseQueueSize >= server->config.maxPublishReqPerSession) {
+        /* Dequeue a response */
+        UA_PublishResponseEntry *pre = UA_Session_dequeuePublishReq(session);
+        UA_assert(pre != NULL); /* There must be a pre as session->responseQueueSize > 0 */
 
-    /* Send the response */
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
-                         "Sending out a publish response triggered by too many publish requests");
-    sendResponse(server, session, session->header.channel, pre->requestId,
-                 (UA_Response*)response, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                             "Sending out a publish response triggered by too many publish requests");
 
-    /* Free the response */
-    UA_Array_delete(response->results, response->resultsSize, &UA_TYPES[UA_TYPES_UINT32]);
-    UA_free(pre); /* no need for UA_PublishResponse_clear */
+        /* Send the response. This response has no related subscription id */
+        UA_PublishResponse *response = &pre->response;
+        response->responseHeader.timestamp = UA_DateTime_now();
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADTOOMANYPUBLISHREQUESTS;
+        sendResponse(server, session, session->header.channel, pre->requestId,
+                     (UA_Response *)response, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
 
-    return true;
+        /* Free the response */
+        UA_PublishResponse_clear(response);
+        UA_free(pre);
+    }
 }
 
 static void
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 4296a13fe95..4bb390de6e8 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -342,8 +342,8 @@ UA_StatusCode
 UA_Subscription_removeRetransmissionMessage(UA_Subscription *sub,
                                             UA_UInt32 sequenceNumber);
 
-UA_Boolean
-UA_Session_reachedPublishReqLimit(UA_Server *server, UA_Session *session);
+void
+UA_Session_ensurePublishQueueSpace(UA_Server *server, UA_Session *session);
 
 /* Forward declaration for A&C used in ua_server_internal.h" */
 struct UA_ConditionSource;

From 2fd751bd2e4d259d219d4d81f78c2a385a1af0e9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 15 Aug 2023 15:57:32 +0200
Subject: [PATCH 1106/1963] fix(plugin): Fix a cast-warning for the LibreSSL
 API

---
 .../openssl/securitypolicy_openssl_common.c     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.c b/plugins/crypto/openssl/securitypolicy_openssl_common.c
index cebc51ae017..e1d36f51318 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.c
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.c
@@ -32,7 +32,10 @@ modification history
 #include "ua_openssl_version_abstraction.h"
 
 #define SHA1_DIGEST_LENGTH 20          /* 160 bits */
-#define RSA_DECRYPT_BUFFER_LENGTH 2048  /* bytes */    
+#define RSA_DECRYPT_BUFFER_LENGTH 2048 /* bytes */
+
+/* Cast to prevent warnings in LibreSSL */
+#define SHA256EVP() ((EVP_MD *)(uintptr_t)EVP_sha256())
 
 
 /** P_SHA256 Context */
@@ -137,7 +140,7 @@ UA_OpenSSL_RSA_Public_Verify(const UA_ByteString *message,
             ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;
         }
-        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(evpKeyCtx, EVP_sha256());
+        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(evpKeyCtx, SHA256EVP());
         if(opensslRet != 1) {
             ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;
@@ -257,11 +260,11 @@ UA_Openssl_RSA_Private_Decrypt (UA_ByteString *      data,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     if(withSha256) {
-        opensslRet = EVP_PKEY_CTX_set_rsa_oaep_md(ctx, EVP_sha256());
+        opensslRet = EVP_PKEY_CTX_set_rsa_oaep_md(ctx, SHA256EVP());
         if (opensslRet != 1) {
             return UA_STATUSCODE_BADINTERNALERROR;
         }
-        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, EVP_sha256());
+        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, SHA256EVP());
         if (opensslRet != 1) {
             return UA_STATUSCODE_BADINTERNALERROR;
         }
@@ -342,12 +345,12 @@ UA_Openssl_RSA_Public_Encrypt  (const UA_ByteString * message,
         goto errout;
     }
     if(withSha256) {
-        opensslRet = EVP_PKEY_CTX_set_rsa_oaep_md(ctx, EVP_sha256());
+        opensslRet = EVP_PKEY_CTX_set_rsa_oaep_md(ctx, SHA256EVP());
         if (opensslRet != 1) {
             ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;
         }
-        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, EVP_sha256());
+        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, SHA256EVP());
         if (opensslRet != 1) {
             ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;
@@ -585,7 +588,7 @@ UA_Openssl_RSA_Private_Sign (const UA_ByteString * message,
             ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;
         }
-        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(evpKeyCtx, EVP_sha256());
+        opensslRet = EVP_PKEY_CTX_set_rsa_mgf1_md(evpKeyCtx, SHA256EVP());
         if (opensslRet != 1) {
             ret = UA_STATUSCODE_BADINTERNALERROR;
             goto errout;

From e7d789b5541c269f2b572c92e5951e20a583c00e Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Wed, 16 Aug 2023 14:09:05 +0200
Subject: [PATCH 1107/1963] fix(pubsub): No WriterGroup address with old
 transportSettings type

If the old type UA_TYPES_DATAGRAMWRITERGROUPTRANSPORTDATATYPE is
used for transportSettings, no address can be used for unicast configuration.
Yet a multicast configuration with this type must be possible.
---
 src/pubsub/ua_pubsub_eventloop.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 7ac50b1fa1a..5fccfde718e 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -568,6 +568,13 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg) {
     if(wg->sendChannel != 0)
         return UA_STATUSCODE_GOOD;
 
+    /* Check if address is available in TransportSettings */
+    if(((wg->config.transportSettings.encoding == UA_EXTENSIONOBJECT_DECODED ||
+         wg->config.transportSettings.encoding == UA_EXTENSIONOBJECT_DECODED_NODELETE) &&
+        wg->config.transportSettings.content.decoded.type ==
+        &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORTDATATYPE]))
+        return UA_STATUSCODE_GOOD;
+
     /* Unpack the TransportSettings */
     if((wg->config.transportSettings.encoding != UA_EXTENSIONOBJECT_DECODED &&
         wg->config.transportSettings.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||

From 43b4a9431078f3e22d10cc8eec4d6fee4dcb63f1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 18 Aug 2023 23:31:11 +0200
Subject: [PATCH 1108/1963] refactor(server): Simplify
 attributeId2AttributeMask

---
 src/server/ua_services_attribute.c | 63 ++++++++++++++++--------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 0745324806b..3fec3e90454 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -28,38 +28,41 @@
 #include <open62541/plugin/historydatabase.h>
 #endif
 
+static const UA_NodeAttributesMask attr2mask[28] = {
+    UA_NODEATTRIBUTESMASK_NODEID,
+    UA_NODEATTRIBUTESMASK_NODECLASS,
+    UA_NODEATTRIBUTESMASK_BROWSENAME,
+    UA_NODEATTRIBUTESMASK_DISPLAYNAME,
+    UA_NODEATTRIBUTESMASK_DESCRIPTION,
+    UA_NODEATTRIBUTESMASK_WRITEMASK,
+    UA_NODEATTRIBUTESMASK_USERWRITEMASK,
+    UA_NODEATTRIBUTESMASK_ISABSTRACT,
+    UA_NODEATTRIBUTESMASK_SYMMETRIC,
+    UA_NODEATTRIBUTESMASK_INVERSENAME,
+    UA_NODEATTRIBUTESMASK_CONTAINSNOLOOPS,
+    UA_NODEATTRIBUTESMASK_EVENTNOTIFIER,
+    UA_NODEATTRIBUTESMASK_VALUE,
+    UA_NODEATTRIBUTESMASK_DATATYPE,
+    UA_NODEATTRIBUTESMASK_VALUERANK,
+    UA_NODEATTRIBUTESMASK_ARRAYDIMENSIONS,
+    UA_NODEATTRIBUTESMASK_ACCESSLEVEL,
+    UA_NODEATTRIBUTESMASK_USERACCESSLEVEL,
+    UA_NODEATTRIBUTESMASK_MINIMUMSAMPLINGINTERVAL,
+    UA_NODEATTRIBUTESMASK_HISTORIZING,
+    UA_NODEATTRIBUTESMASK_EXECUTABLE,
+    UA_NODEATTRIBUTESMASK_USEREXECUTABLE,
+    UA_NODEATTRIBUTESMASK_DATATYPEDEFINITION,
+    UA_NODEATTRIBUTESMASK_ROLEPERMISSIONS,
+    UA_NODEATTRIBUTESMASK_ROLEPERMISSIONS,
+    UA_NODEATTRIBUTESMASK_ACCESSRESTRICTIONS,
+    UA_NODEATTRIBUTESMASK_ACCESSLEVEL
+};
+
 static UA_UInt32
 attributeId2AttributeMask(UA_AttributeId id) {
-    switch(id) {
-    case UA_ATTRIBUTEID_NODEID: return UA_NODEATTRIBUTESMASK_NODEID;
-    case UA_ATTRIBUTEID_NODECLASS: return UA_NODEATTRIBUTESMASK_NODECLASS;
-    case UA_ATTRIBUTEID_BROWSENAME: return UA_NODEATTRIBUTESMASK_BROWSENAME;
-    case UA_ATTRIBUTEID_DISPLAYNAME: return UA_NODEATTRIBUTESMASK_DISPLAYNAME;
-    case UA_ATTRIBUTEID_DESCRIPTION: return UA_NODEATTRIBUTESMASK_DESCRIPTION;
-    case UA_ATTRIBUTEID_WRITEMASK: return UA_NODEATTRIBUTESMASK_WRITEMASK;
-    case UA_ATTRIBUTEID_USERWRITEMASK: return UA_NODEATTRIBUTESMASK_USERWRITEMASK;
-    case UA_ATTRIBUTEID_ISABSTRACT: return UA_NODEATTRIBUTESMASK_ISABSTRACT;
-    case UA_ATTRIBUTEID_SYMMETRIC: return UA_NODEATTRIBUTESMASK_SYMMETRIC;
-    case UA_ATTRIBUTEID_INVERSENAME: return UA_NODEATTRIBUTESMASK_INVERSENAME;
-    case UA_ATTRIBUTEID_CONTAINSNOLOOPS: return UA_NODEATTRIBUTESMASK_CONTAINSNOLOOPS;
-    case UA_ATTRIBUTEID_EVENTNOTIFIER: return UA_NODEATTRIBUTESMASK_EVENTNOTIFIER;
-    case UA_ATTRIBUTEID_VALUE: return UA_NODEATTRIBUTESMASK_VALUE;
-    case UA_ATTRIBUTEID_DATATYPE: return UA_NODEATTRIBUTESMASK_DATATYPE;
-    case UA_ATTRIBUTEID_VALUERANK: return UA_NODEATTRIBUTESMASK_VALUERANK;
-    case UA_ATTRIBUTEID_ARRAYDIMENSIONS: return UA_NODEATTRIBUTESMASK_ARRAYDIMENSIONS;
-    case UA_ATTRIBUTEID_ACCESSLEVEL: return UA_NODEATTRIBUTESMASK_ACCESSLEVEL;
-    case UA_ATTRIBUTEID_USERACCESSLEVEL: return UA_NODEATTRIBUTESMASK_USERACCESSLEVEL;
-    case UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL: return UA_NODEATTRIBUTESMASK_MINIMUMSAMPLINGINTERVAL;
-    case UA_ATTRIBUTEID_HISTORIZING: return UA_NODEATTRIBUTESMASK_HISTORIZING;
-    case UA_ATTRIBUTEID_EXECUTABLE: return UA_NODEATTRIBUTESMASK_EXECUTABLE;
-    case UA_ATTRIBUTEID_USEREXECUTABLE: return UA_NODEATTRIBUTESMASK_USEREXECUTABLE;
-    case UA_ATTRIBUTEID_DATATYPEDEFINITION: return UA_NODEATTRIBUTESMASK_DATATYPEDEFINITION;
-    case UA_ATTRIBUTEID_ROLEPERMISSIONS: return UA_NODEATTRIBUTESMASK_ROLEPERMISSIONS;
-    case UA_ATTRIBUTEID_USERROLEPERMISSIONS: return UA_NODEATTRIBUTESMASK_ROLEPERMISSIONS;
-    case UA_ATTRIBUTEID_ACCESSRESTRICTIONS: return UA_NODEATTRIBUTESMASK_ACCESSRESTRICTIONS;
-    case UA_ATTRIBUTEID_ACCESSLEVELEX: return UA_NODEATTRIBUTESMASK_ACCESSLEVEL;
-    default: return UA_NODEATTRIBUTESMASK_NONE;
-    }
+    if(UA_UNLIKELY(id > UA_ATTRIBUTEID_ACCESSLEVELEX))
+        return UA_NODEATTRIBUTESMASK_NONE;
+    return attr2mask[id];
 }
 
 /******************/

From c5f5ceb0994397adb1fcd00247755c4c7855f8da Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 00:04:32 +0200
Subject: [PATCH 1109/1963] refactor(server): Remove an unneeded include in
 ua_services_attribute.c

---
 src/server/ua_services_attribute.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 3fec3e90454..65aaf5dd901 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -19,7 +19,6 @@
  *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart  (for VDW and umati)
  */
 
-#include "open62541/plugin/log.h"
 #include "ua_server_internal.h"
 #include "ua_types_encoding_binary.h"
 #include "ua_services.h"

From 4a623488c781589e49e63db3a1f1293f5d7e7279 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 00:05:15 +0200
Subject: [PATCH 1110/1963] refactor(server): Return the certificate used by
 the policy as the server certificate

---
 include/open62541/server.h       | 1 -
 plugins/ua_config_default.c      | 6 +-----
 src/server/ua_server_config.c    | 2 --
 src/server/ua_services_session.c | 2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 2bfe812feb2..c1b8b22ffad 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -95,7 +95,6 @@ struct UA_ServerConfig {
      * certificate. */
     UA_BuildInfo buildInfo;
     UA_ApplicationDescription applicationDescription;
-    UA_ByteString serverCertificate;
 
     /**
      * Server Lifecycle
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 3f56a575e5a..601f6d7c105 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -244,7 +244,7 @@ addEndpoint(UA_ServerConfig *conf,
     retval |= UA_String_copy(&securityPolicy->policyUri, &endpoint->securityPolicyUri);
     endpoint->transportProfileUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
-    retval |= UA_String_copy(&conf->serverCertificate, &endpoint->serverCertificate);
+    retval |= UA_String_copy(&securityPolicy->localCertificate, &endpoint->serverCertificate);
     retval |= UA_ApplicationDescription_copy(&conf->applicationDescription,
                                              &endpoint->server);
 
@@ -888,10 +888,6 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
         return retval;
     }
 
-    retval = UA_ByteString_copy(certificate, &conf->serverCertificate);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-
     retval = UA_CertificateVerification_Trustlist(&conf->sessionPKI,
                                                   trustList, trustListSize,
                                                   issuerList, issuerListSize,
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 0f44f94eaa1..f6b80a8d68a 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -28,8 +28,6 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 # endif
 #endif
 
-    UA_ByteString_clear(&config->serverCertificate);
-
     /* Stop and delete the EventLoop */
     UA_EventLoop *el = config->eventLoop;
     if(el && !config->externalEventLoop) {
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 0a41f3d99c1..06b3659c08d 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -381,7 +381,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
 
     /* Return the server certificate */
     response->responseHeader.serviceResult |=
-        UA_ByteString_copy(&server->config.serverCertificate,
+        UA_ByteString_copy(&channel->securityPolicy->localCertificate,
                            &response->serverCertificate);
 
     /* Sign the signature */

From 85cae67b796e3c468f9361cc010ccf009f0fe913 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Fri, 18 Aug 2023 11:01:17 +0200
Subject: [PATCH 1111/1963] fix(pubsub): Fix double free of writer group for
 unicast connection

If a socket is closed without data transfered, the sendChannel
has not been set yet and the writer group is freed with the
connection.
---
 src/pubsub/ua_pubsub_eventloop.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 5fccfde718e..6f3d16ebd40 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -521,14 +521,16 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     /* The connection is closing in the EventLoop. This is the last callback
      * from that connection. Clean up the SecureChannel in the client. */
     if(state == UA_CONNECTIONSTATE_CLOSING) {
-        /* Reset the connection channel */
-        wg->sendChannel = 0;
-
-        /* PSC marked for deletion and the last EventLoop connection has closed */
-        if(wg->deleteFlag) {
-            UA_WriterGroup_remove(server, wg);
-            UA_UNLOCK(&server->serviceMutex);
-            return;
+        if(wg->sendChannel == connectionId) {
+            /* Reset the connection channel */
+            wg->sendChannel = 0;
+
+            /* PSC marked for deletion and the last EventLoop connection has closed */
+            if(wg->deleteFlag) {
+                UA_WriterGroup_remove(server, wg);
+                UA_UNLOCK(&server->serviceMutex);
+                return;
+            }
         }
 
         /* Reconnect automatically if the connection was operational. This sets

From c49c146e2c719c9ee67ac7f37ad57a8f91bf7d06 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Tue, 15 Aug 2023 15:54:49 +0200
Subject: [PATCH 1112/1963] fix(server): Return the correct status code in the
 check signature function.

---
 src/server/ua_services_session.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 06b3659c08d..7739faf2a94 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -409,10 +409,14 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
 
 static UA_StatusCode
 checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
-               void *channelContext, const UA_ByteString *serverNonce, const UA_SignatureData *signature) {
+               void *channelContext, const UA_ByteString *serverNonce, const UA_SignatureData *signature,
+               const bool isUserTokenSignature) {
     /* Check for zero signature length */
-    if(signature->signature.length == 0)
-        return UA_STATUSCODE_BADUSERSIGNATUREINVALID;
+    if(signature->signature.length == 0) {
+        if(isUserTokenSignature)
+            return UA_STATUSCODE_BADUSERSIGNATUREINVALID;
+        return UA_STATUSCODE_BADAPPLICATIONSIGNATUREINVALID;
+    }
 
     if(!securityPolicy)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -432,8 +436,12 @@ checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
     retval = securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.
         verify(channelContext, &dataToVerify, &signature->signature);
     UA_ByteString_clear(&dataToVerify);
-    if(retval != UA_STATUSCODE_GOOD)
-        retval = UA_STATUSCODE_BADUSERSIGNATUREINVALID;
+    if(retval != UA_STATUSCODE_GOOD) {
+        if(isUserTokenSignature)
+            retval = UA_STATUSCODE_BADUSERSIGNATUREINVALID;
+        else
+            retval = UA_STATUSCODE_BADAPPLICATIONSIGNATUREINVALID;
+    }
     return retval;
 }
 
@@ -650,7 +658,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
        channel->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
         response->responseHeader.serviceResult =
             checkSignature(server, channel->securityPolicy, channel->channelContext,
-                           &session->serverNonce, &request->clientSignature);
+                           &session->serverNonce, &request->clientSignature, false);
         if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_SESSION(&server->config.logger, session,
                                    "ActivateSession: Client signature check failed with StatusCode %s",
@@ -781,7 +789,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         /* Check the user token signature */
         response->responseHeader.serviceResult =
             checkSignature(server, utpSecurityPolicy, tempChannelContext,
-                           &session->serverNonce, &request->userTokenSignature);
+                           &session->serverNonce, &request->userTokenSignature, true);
 
         /* Delete the temporary channel context */
         UA_UNLOCK(&server->serviceMutex);

From 920d621a68e3e8c17dd6e1b5d207374a8b24a48b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 08:48:17 +0200
Subject: [PATCH 1113/1963] refactor(server): Simplify saveClientUserId

---
 src/server/ua_services_session.c | 41 +++++++++++++-------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 7739faf2a94..1e70e1eca28 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -572,41 +572,34 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
 }
 
 #ifdef UA_ENABLE_DIAGNOSTICS
-static UA_StatusCode
+static void
 saveClientUserId(const UA_ExtensionObject *userIdentityToken,
-                 UA_SessionSecurityDiagnosticsDataType *diag) {
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-
-    UA_String_clear(&diag->clientUserIdOfSession);
-    if(userIdentityToken->encoding != UA_EXTENSIONOBJECT_DECODED)
-        return UA_STATUSCODE_GOOD;
+                 UA_SessionSecurityDiagnosticsDataType *ssd) {
+    if(userIdentityToken->encoding != UA_EXTENSIONOBJECT_DECODED &&
+       userIdentityToken->encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE)
+        return;
 
-    if(userIdentityToken->content.decoded.type ==
-       &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
-        /* String of length 0 */
-    } else if(userIdentityToken->content.decoded.type ==
-       &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
+    UA_String_clear(&ssd->clientUserIdOfSession);
+    const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
+    if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
         const UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken*)
             userIdentityToken->content.decoded.data;
-        res = UA_String_copy(&userToken->userName, &diag->clientUserIdOfSession);
-    } else if(userIdentityToken->content.decoded.type ==
-       &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
+        UA_String_copy(&userToken->userName, &ssd->clientUserIdOfSession);
+    } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
         /* TODO: return the X509 Subject Name of the certificate */
-    } else {
-        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
     }
 
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
+    /* TODO: Handle issued token */
 
-    return UA_Array_appendCopy((void**)&diag->clientUserIdHistory,
-                               &diag->clientUserIdHistorySize,
-                               &diag->clientUserIdOfSession,
-                               &UA_TYPES[UA_TYPES_STRING]);
+    UA_StatusCode res =
+        UA_Array_appendCopy((void**)&ssd->clientUserIdHistory,
+                            &ssd->clientUserIdHistorySize,
+                            &ssd->clientUserIdOfSession,
+                            &UA_TYPES[UA_TYPES_STRING]);
+    (void)res;
 }
 #endif
 
-
 /* TODO: Check all of the following: The Server shall verify that the
  * Certificate the Client used to create the new SecureChannel is the same as
  * the Certificate used to create the original SecureChannel. In addition, the

From 119580e210e18bf51491802ca4760c861b1e41ce Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 08:48:36 +0200
Subject: [PATCH 1114/1963] refactor(server): Cosmetic improvements in
 ua_services_session.c

---
 src/server/ua_services_session.c | 152 ++++++++++++++++---------------
 1 file changed, 80 insertions(+), 72 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 1e70e1eca28..0aa4241e85b 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -610,18 +610,18 @@ saveClientUserId(const UA_ExtensionObject *userIdentityToken,
 
 void
 Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
-                        const UA_ActivateSessionRequest *request,
-                        UA_ActivateSessionResponse *response) {
+                        const UA_ActivateSessionRequest *req,
+                        UA_ActivateSessionResponse *resp) {
     const UA_EndpointDescription *ed = NULL;
     const UA_UserTokenPolicy *utp = NULL;
     UA_String *tmpLocaleIds;
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_Session *session = getSessionByToken(server, &request->requestHeader.authenticationToken);
+    UA_Session *session = getSessionByToken(server, &req->requestHeader.authenticationToken);
     if(!session) {
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
                                "ActivateSession: Session not found");
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
+        resp->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
         goto rejected;
     }
 
@@ -634,7 +634,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
                                "ActivateSession: The Session has to be initially activated "
                                "on the SecureChannel that created it");
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
+        resp->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
         goto rejected;
     }
 
@@ -642,101 +642,103 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     if(session->validTill < UA_DateTime_nowMonotonic()) {
         UA_LOG_WARNING_SESSION(&server->config.logger, session,
                                "ActivateSession: The Session has timed out");
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
+        resp->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
         goto rejected;
     }
 
     /* Check the client signature */
     if(channel->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        channel->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
-        response->responseHeader.serviceResult =
+        resp->responseHeader.serviceResult =
             checkSignature(server, channel->securityPolicy, channel->channelContext,
-                           &session->serverNonce, &request->clientSignature, false);
-        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+                           &session->serverNonce, &req->clientSignature, false);
+        if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_SESSION(&server->config.logger, session,
-                                   "ActivateSession: Client signature check failed with StatusCode %s",
-                                   UA_StatusCode_name(response->responseHeader.serviceResult));
+                                   "ActivateSession: Client signature check failed "
+                                   "with StatusCode %s",
+                                   UA_StatusCode_name(resp->responseHeader.serviceResult));
             goto securityRejected;
         }
     }
 
     /* Find the matching Endpoint with UserTokenPolicy */
-    selectEndpointAndTokenPolicy(server, channel, &request->userIdentityToken, &ed, &utp);
+    selectEndpointAndTokenPolicy(server, channel, &req->userIdentityToken, &ed, &utp);
     if(!ed) {
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        resp->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
         goto rejected;
     }
 
     /* If it is a UserNameIdentityToken, the password may be encrypted */
     if(utp->tokenType == UA_USERTOKENTYPE_USERNAME) {
        UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken *)
-           request->userIdentityToken.content.decoded.data;
+           req->userIdentityToken.content.decoded.data;
 
        /* If the userTokenPolicy doesn't specify a security policy the security
         * policy of the secure channel is used. */
-       UA_SecurityPolicy* securityPolicy;
+       UA_SecurityPolicy *sp;
        if(!utp->securityPolicyUri.data)
-           securityPolicy = getSecurityPolicyByUri(server, &ed->securityPolicyUri);
+           sp = getSecurityPolicyByUri(server, &ed->securityPolicyUri);
        else
-           securityPolicy = getSecurityPolicyByUri(server, &utp->securityPolicyUri);
-       if(!securityPolicy) {
-          response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+           sp = getSecurityPolicyByUri(server, &utp->securityPolicyUri);
+       if(!sp) {
+          resp->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
           goto securityRejected;
        }
 
        /* Test if the encryption algorithm is correctly specified */
        if(!UA_String_equal(&userToken->encryptionAlgorithm,
-                           &securityPolicy->asymmetricModule.cryptoModule.encryptionAlgorithm.uri)) {
-           response->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+                           &sp->asymmetricModule.cryptoModule.encryptionAlgorithm.uri)) {
+           resp->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
            goto securityRejected;
        }
 
 #ifdef UA_ENABLE_ENCRYPTION
        /* Encrypted password? */
-       if(!UA_String_equal(&securityPolicy->policyUri, &UA_SECURITY_POLICY_NONE_URI)) {
+       if(!UA_String_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI)) {
            /* Create a temporary channel context if a different SecurityPolicy is
             * used for the password from the SecureChannel */
            void *tempChannelContext = channel->channelContext;
-           if(securityPolicy != channel->securityPolicy) {
+           if(sp != channel->securityPolicy) {
                /* We use our own certificate to create a temporary channel
                 * context. Because the client does not provide one in a #None
                 * SecureChannel. We should not need a ChannelContext at all for
                 * asymmetric decryption where the remote certificate is not
                 * used. */
                UA_UNLOCK(&server->serviceMutex);
-               response->responseHeader.serviceResult = securityPolicy->channelModule.
-                   newContext(securityPolicy, &securityPolicy->localCertificate,
+               resp->responseHeader.serviceResult = sp->channelModule.
+                   newContext(sp, &sp->localCertificate,
                               &tempChannelContext);
                UA_LOCK(&server->serviceMutex);
-               if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-                   UA_LOG_WARNING_SESSION(&server->config.logger, session, "ActivateSession: "
-                                          "Failed to create a context for the SecurityPolicy %.*s",
-                                          (int)securityPolicy->policyUri.length,
-                                          securityPolicy->policyUri.data);
+               if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+                   UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                                          "ActivateSession: Failed to create a "
+                                          "context for the SecurityPolicy %.*s",
+                                          (int)sp->policyUri.length, sp->policyUri.data);
                    goto securityRejected;
                }
            }
 
            /* Decrypt */
-           response->responseHeader.serviceResult =
-               decryptPassword(securityPolicy, tempChannelContext, &session->serverNonce, userToken);
+           resp->responseHeader.serviceResult =
+               decryptPassword(sp, tempChannelContext,
+                               &session->serverNonce, userToken);
 
            /* Remove the temporary channel context */
-           if(securityPolicy != channel->securityPolicy) {
+           if(sp != channel->securityPolicy) {
                UA_UNLOCK(&server->serviceMutex);
-               securityPolicy->channelModule.deleteContext(tempChannelContext);
+               sp->channelModule.deleteContext(tempChannelContext);
                UA_LOCK(&server->serviceMutex);
            }
        } else if(userToken->encryptionAlgorithm.length != 0) {
            /* If SecurityPolicy is None there shall be no EncryptionAlgorithm  */
-           response->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+           resp->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
            goto securityRejected;
        }
 
-       if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+       if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
            UA_LOG_WARNING_SESSION(&server->config.logger, session, "ActivateSession: "
                                   "Failed to decrypt the password with the StatusCode %s",
-                                  UA_StatusCode_name(response->responseHeader.serviceResult));
+                                  UA_StatusCode_name(resp->responseHeader.serviceResult));
            goto securityRejected;
        }
 #endif
@@ -750,7 +752,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
      * forwarded in the call to ActivateSession. */
     if(utp->tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
         UA_X509IdentityToken* userCertToken = (UA_X509IdentityToken*)
-            request->userIdentityToken.content.decoded.data;
+            req->userIdentityToken.content.decoded.data;
 
         /* If the userTokenPolicy doesn't specify a security policy the security
          * policy of the secure channel is used. */
@@ -760,7 +762,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         else
             utpSecurityPolicy = getSecurityPolicyByUri(server, &utp->securityPolicyUri);
         if(!utpSecurityPolicy) {
-            response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+            resp->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
             goto securityRejected;
         }
 
@@ -768,30 +770,33 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
          * the signature checking code. */
         void *tempChannelContext;
         UA_UNLOCK(&server->serviceMutex);
-        response->responseHeader.serviceResult = utpSecurityPolicy->channelModule.
-            newContext(utpSecurityPolicy, &userCertToken->certificateData, &tempChannelContext);
+        resp->responseHeader.serviceResult = utpSecurityPolicy->channelModule.
+            newContext(utpSecurityPolicy, &userCertToken->certificateData,
+                       &tempChannelContext);
         UA_LOCK(&server->serviceMutex);
-        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_SESSION(&server->config.logger, session, "ActivateSession: "
-                                   "Failed to create a context for the SecurityPolicy %.*s",
+        if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                                   "ActivateSession: Failed to create a context "
+                                   "for the SecurityPolicy %.*s",
                                    (int)utpSecurityPolicy->policyUri.length,
                                    utpSecurityPolicy->policyUri.data);
             goto securityRejected;
         }
 
         /* Check the user token signature */
-        response->responseHeader.serviceResult =
+        resp->responseHeader.serviceResult =
             checkSignature(server, utpSecurityPolicy, tempChannelContext,
-                           &session->serverNonce, &request->userTokenSignature, true);
+                           &session->serverNonce, &req->userTokenSignature, true);
 
         /* Delete the temporary channel context */
         UA_UNLOCK(&server->serviceMutex);
         utpSecurityPolicy->channelModule.deleteContext(tempChannelContext);
         UA_LOCK(&server->serviceMutex);
-        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+        if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_SESSION(&server->config.logger, session,
-                "ActivateSession: User token signature check failed with StatusCode %s",
-                UA_StatusCode_name(response->responseHeader.serviceResult));
+                                   "ActivateSession: User token signature check "
+                                   "failed with StatusCode %s",
+                                   UA_StatusCode_name(resp->responseHeader.serviceResult));
             goto securityRejected;
         }
     }
@@ -799,14 +804,16 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
 
     /* Callback into userland access control */
     UA_UNLOCK(&server->serviceMutex);
-    response->responseHeader.serviceResult = server->config.accessControl.
-        activateSession(server, &server->config.accessControl, ed, &channel->remoteCertificate,
-                        &session->sessionId, &request->userIdentityToken, &session->sessionHandle);
+    resp->responseHeader.serviceResult = server->config.accessControl.
+        activateSession(server, &server->config.accessControl, ed,
+                        &channel->remoteCertificate, &session->sessionId,
+                        &req->userIdentityToken, &session->sessionHandle);
     UA_LOCK(&server->serviceMutex);
-    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session, "ActivateSession: The AccessControl "
+    if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                               "ActivateSession: The AccessControl "
                                "plugin denied the activation with the StatusCode %s",
-                               UA_StatusCode_name(response->responseHeader.serviceResult));
+                               UA_StatusCode_name(resp->responseHeader.serviceResult));
         goto securityRejected;
     }
 
@@ -821,27 +828,26 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     }
 
     /* Generate a new session nonce for the next time ActivateSession is called */
-    response->responseHeader.serviceResult = UA_Session_generateNonce(session);
-    response->responseHeader.serviceResult |=
-        UA_ByteString_copy(&session->serverNonce, &response->serverNonce);
-    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+    resp->responseHeader.serviceResult = UA_Session_generateNonce(session);
+    resp->responseHeader.serviceResult |=
+        UA_ByteString_copy(&session->serverNonce, &resp->serverNonce);
+    if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_Session_detachFromSecureChannel(session);
         UA_LOG_WARNING_SESSION(&server->config.logger, session,
                                "ActivateSession: Could not generate the server nonce");
         goto rejected;
     }
 
-    /* Set the locale */
-
-    /* Part 4, §5.6.3.2: This parameter only needs to be specified during the first call to
-     * ActivateSession during a single application Session. If it is not specified the
-     * Server shall keep using the current localeIds for the Session.
-    */
-    if(request->localeIdsSize > 0) {
-        response->responseHeader.serviceResult |=
-            UA_Array_copy(request->localeIds, request->localeIdsSize,
+    /* Set the Locale */
+    if(req->localeIdsSize > 0) {
+        /* Part 4, §5.6.3.2: This parameter only needs to be specified during
+         * the first call to ActivateSession during a single application
+         * Session. If it is not specified the Server shall keep using the
+         * current localeIds for the Session. */
+        resp->responseHeader.serviceResult |=
+            UA_Array_copy(req->localeIds, req->localeIdsSize,
                           (void**)&tmpLocaleIds, &UA_TYPES[UA_TYPES_STRING]);
-        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+        if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_Session_detachFromSecureChannel(session);
             UA_LOG_WARNING_SESSION(&server->config.logger, session,
                                    "ActivateSession: Could not store the Session LocaleIds");
@@ -850,9 +856,10 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         UA_Array_delete(session->localeIds, session->localeIdsSize,
                         &UA_TYPES[UA_TYPES_STRING]);
         session->localeIds = tmpLocaleIds;
-        session->localeIdsSize = request->localeIdsSize;
+        session->localeIdsSize = req->localeIdsSize;
     }
 
+    /* Update the Session lifetime */
     UA_Session_updateLifetime(session);
 
     /* Activate the session */
@@ -863,7 +870,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     }
 
 #ifdef UA_ENABLE_DIAGNOSTICS
-    saveClientUserId(&request->userIdentityToken,
+    saveClientUserId(&req->userIdentityToken,
                      &session->securityDiagnostics);
     UA_String_clear(&session->securityDiagnostics.authenticationMechanism);
     switch(utp->tokenType) {
@@ -883,7 +890,8 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     }
 #endif
 
-    UA_LOG_INFO_SESSION(&server->config.logger, session, "ActivateSession: Session activated");
+    UA_LOG_INFO_SESSION(&server->config.logger, session,
+                        "ActivateSession: Session activated");
     return;
 
 securityRejected:

From 8331c22d3aad7ceaf0baa5860636d36acd9eb4c7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 09:00:15 +0200
Subject: [PATCH 1115/1963] refactor(server): Explicitly check that the user
 token was decoded

---
 src/server/ua_services_session.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 0aa4241e85b..18f011f6228 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -575,10 +575,6 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
 static void
 saveClientUserId(const UA_ExtensionObject *userIdentityToken,
                  UA_SessionSecurityDiagnosticsDataType *ssd) {
-    if(userIdentityToken->encoding != UA_EXTENSIONOBJECT_DECODED &&
-       userIdentityToken->encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE)
-        return;
-
     UA_String_clear(&ssd->clientUserIdOfSession);
     const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
     if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
@@ -668,6 +664,15 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         goto rejected;
     }
 
+    /* Check that the usertoken was correctly decoded.
+     * We still have to check for individual types downstream. */
+    if(req->userIdentityToken.encoding != UA_EXTENSIONOBJECT_DECODED &&
+       req->userIdentityToken.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE &&
+       req->userIdentityToken.encoding != UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
+        resp->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        goto securityRejected;
+    }
+
     /* If it is a UserNameIdentityToken, the password may be encrypted */
     if(utp->tokenType == UA_USERTOKENTYPE_USERNAME) {
        UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken *)

From 0fd48ac5b994e0a790c516a19a25a43d08763c8d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 09:07:14 +0200
Subject: [PATCH 1116/1963] feat(server): Store the ClientUserId in the session
 (not only for diagnostics)

---
 src/server/ua_server_ns0_diagnostics.c |  1 +
 src/server/ua_services_session.c       | 64 +++++++++++---------------
 src/server/ua_session.c                |  1 +
 src/server/ua_session.h                |  1 +
 4 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 8663e942720..c79db8609ac 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -329,6 +329,7 @@ setSessionSecurityDiagnostics(UA_Session *session,
                               UA_SessionSecurityDiagnosticsDataType *sd) {
     UA_SessionSecurityDiagnosticsDataType_copy(&session->securityDiagnostics, sd);
     UA_NodeId_copy(&session->sessionId, &sd->sessionId);
+    UA_String_copy(&session->clientUserIdOfSession, &sd->clientUserIdOfSession);
     UA_SecureChannel *channel = session->header.channel;
     if(channel) {
         UA_ByteString_copy(&channel->remoteCertificate, &sd->clientCertificate);
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 18f011f6228..173ff8d0c0a 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -571,31 +571,6 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
     }
 }
 
-#ifdef UA_ENABLE_DIAGNOSTICS
-static void
-saveClientUserId(const UA_ExtensionObject *userIdentityToken,
-                 UA_SessionSecurityDiagnosticsDataType *ssd) {
-    UA_String_clear(&ssd->clientUserIdOfSession);
-    const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
-    if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
-        const UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken*)
-            userIdentityToken->content.decoded.data;
-        UA_String_copy(&userToken->userName, &ssd->clientUserIdOfSession);
-    } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
-        /* TODO: return the X509 Subject Name of the certificate */
-    }
-
-    /* TODO: Handle issued token */
-
-    UA_StatusCode res =
-        UA_Array_appendCopy((void**)&ssd->clientUserIdHistory,
-                            &ssd->clientUserIdHistorySize,
-                            &ssd->clientUserIdOfSession,
-                            &UA_TYPES[UA_TYPES_STRING]);
-    (void)res;
-}
-#endif
-
 /* TODO: Check all of the following: The Server shall verify that the
  * Certificate the Client used to create the new SecureChannel is the same as
  * the Certificate used to create the original SecureChannel. In addition, the
@@ -874,23 +849,40 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         server->serverDiagnosticsSummary.cumulatedSessionCount++;
     }
 
+    /* Store the ClientUserId */
+    UA_String_clear(&session->clientUserIdOfSession);
+    const UA_DataType *tokenType = req->userIdentityToken.content.decoded.type;
+    if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
+        const UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken*)
+            req->userIdentityToken.content.decoded.data;
+        UA_String_copy(&userToken->userName, &session->clientUserIdOfSession);
+    } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
+        /* TODO: extract the X509 Subject Name of the certificate */
+    } else {
+        /* TODO: Handle issued token */
+    }
+
 #ifdef UA_ENABLE_DIAGNOSTICS
-    saveClientUserId(&req->userIdentityToken,
-                     &session->securityDiagnostics);
-    UA_String_clear(&session->securityDiagnostics.authenticationMechanism);
+    /* Add the ClientUserId to the diagnostics history */
+    UA_SessionSecurityDiagnosticsDataType *ssd = &session->securityDiagnostics;
+    UA_StatusCode res =
+        UA_Array_appendCopy((void**)&ssd->clientUserIdHistory,
+                            &ssd->clientUserIdHistorySize,
+                            &ssd->clientUserIdOfSession,
+                            &UA_TYPES[UA_TYPES_STRING]);
+    (void)res;
+
+    /* Store the auth mechanism */
+    UA_String_clear(&ssd->authenticationMechanism);
     switch(utp->tokenType) {
     case UA_USERTOKENTYPE_ANONYMOUS:
-        session->securityDiagnostics.authenticationMechanism = UA_STRING_ALLOC("Anonymous");
-        break;
+        ssd->authenticationMechanism = UA_STRING_ALLOC("Anonymous"); break;
     case UA_USERTOKENTYPE_USERNAME:
-        session->securityDiagnostics.authenticationMechanism = UA_STRING_ALLOC("UserName");
-        break;
+        ssd->authenticationMechanism = UA_STRING_ALLOC("UserName"); break;
     case UA_USERTOKENTYPE_CERTIFICATE:
-        session->securityDiagnostics.authenticationMechanism = UA_STRING_ALLOC("Certificate");
-        break;
+        ssd->authenticationMechanism = UA_STRING_ALLOC("Certificate"); break;
     case UA_USERTOKENTYPE_ISSUEDTOKEN:
-        session->securityDiagnostics.authenticationMechanism = UA_STRING_ALLOC("IssuedToken");
-        break;
+        ssd->authenticationMechanism = UA_STRING_ALLOC("IssuedToken"); break;
     default: break;
     }
 #endif
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index 884c48b49ed..74e53b34164 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -44,6 +44,7 @@ void UA_Session_clear(UA_Session *session, UA_Server* server) {
     UA_Session_detachFromSecureChannel(session);
     UA_ApplicationDescription_clear(&session->clientDescription);
     UA_NodeId_clear(&session->header.authenticationToken);
+    UA_String_clear(&session->clientUserIdOfSession);
     UA_NodeId_clear(&session->sessionId);
     UA_String_clear(&session->sessionName);
     UA_ByteString_clear(&session->serverNonce);
diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index 59a5d5c0e9f..22551a1dd37 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -43,6 +43,7 @@ typedef struct {
     UA_Boolean        activated;
     void             *sessionHandle; /* pointer assigned in userland-callback */
     UA_NodeId         sessionId;
+    UA_String         clientUserIdOfSession;
     UA_UInt32         maxRequestMessageSize;
     UA_UInt32         maxResponseMessageSize;
     UA_Double         timeout; /* in ms */

From 52a45f539042a1b158a785ec63d22f3281d45ca5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 09:11:19 +0200
Subject: [PATCH 1117/1963] feat(server): Make the ClientUserId a readable
 Session attribute

---
 include/open62541/server.h |  1 +
 src/server/ua_session.c    | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index c1b8b22ffad..579ee35f2ab 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -543,6 +543,7 @@ UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId);
  * - 0:localeIds [UA_String]: List of preferred languages (read-only)
  * - 0:clientDescription [UA_ApplicationDescription]: Client description (read-only)
  * - 0:sessionName [String] Client-defined name of the session (read-only)
+ * - 0:clientUserId [String] User identifier used to activate the session (read-only)
  */
 
 /* Returns a shallow copy of the attribute. Don't _clear or _delete the value
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index 74e53b34164..663fb2616bb 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -252,11 +252,12 @@ UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId) {
 
 /* Session Attributes */
 
-#define UA_PROTECTEDATTRIBUTESSIZE 3
+#define UA_PROTECTEDATTRIBUTESSIZE 4
 static const UA_QualifiedName protectedAttributes[UA_PROTECTEDATTRIBUTESSIZE] = {
     {0, UA_STRING_STATIC("localeIds")},
     {0, UA_STRING_STATIC("clientDescription")},
-    {0, UA_STRING_STATIC("sessionName")}
+    {0, UA_STRING_STATIC("sessionName")},
+    {0, UA_STRING_STATIC("clientUserId")}
 };
 
 static UA_Boolean
@@ -329,6 +330,11 @@ getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
         UA_Variant_setScalar(&localAttr, &session->sessionName,
                              &UA_TYPES[UA_TYPES_STRING]);
         attr = &localAttr;
+    } else if(UA_QualifiedName_equal(&key, &protectedAttributes[3])) {
+        /* Return client user id */
+        UA_Variant_setScalar(&localAttr, &session->clientUserIdOfSession,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        attr = &localAttr;
     } else {
         /* Get from the actual key-value list */
         attr = UA_KeyValueMap_get(session->attributes, key);

From d1aec8f109b12f64e7a5a5f1ed5383845dcf37cc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 10:10:49 +0200
Subject: [PATCH 1118/1963] fix(plugin): Fix a memleak in getExpirationDate
 (mbedTLS & OpenSSL)

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 4 +---
 plugins/crypto/openssl/ua_pki_openssl.c | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index ac7597b4a54..e2d4d620dbe 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -572,7 +572,6 @@ getCertificate_ExpirationDate(UA_DateTime *expiryDateTime,
     int mbedErr = mbedtls_x509_crt_parse(&publicKey, certificate->data, certificate->length);
     if(mbedErr)
         return UA_STATUSCODE_BADINTERNALERROR;
-
     UA_DateTimeStruct ts;
     ts.year = (UA_Int16)publicKey.valid_to.year;
     ts.month = (UA_UInt16)publicKey.valid_to.mon;
@@ -583,9 +582,8 @@ getCertificate_ExpirationDate(UA_DateTime *expiryDateTime,
     ts.milliSec = 0;
     ts.microSec = 0;
     ts.nanoSec = 0;
-
     *expiryDateTime = UA_DateTime_fromStruct(ts);
-
+    mbedtls_x509_crt_free(&publicKey);
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index d3b669098ab..8c09322e1fd 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -675,9 +675,8 @@ UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerificatio
 static UA_StatusCode
 UA_GetCertificate_ExpirationDate(UA_DateTime *expiryDateTime, 
                                  UA_ByteString *certificate) {
-    const unsigned char * pData;
-    pData = certificate->data;
-    X509 * x509 = d2i_X509 (NULL, &pData, (long) certificate->length);
+    const unsigned char *pData = certificate->data;
+    X509 * x509 = d2i_X509 (NULL, &pData, (long)certificate->length);
     if (x509 == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -687,6 +686,7 @@ UA_GetCertificate_ExpirationDate(UA_DateTime *expiryDateTime,
 
     struct tm dtTime;
     ASN1_TIME_to_tm(not_after, &dtTime);
+    X509_free(x509);
 
     struct mytm dateTime;
     memset(&dateTime, 0, sizeof(struct mytm));
@@ -698,10 +698,8 @@ UA_GetCertificate_ExpirationDate(UA_DateTime *expiryDateTime,
     dateTime.tm_sec = dtTime.tm_sec;
 
     long long sec_epoch = __tm_to_secs(&dateTime);
-
     *expiryDateTime = UA_DATETIME_UNIX_EPOCH;
     *expiryDateTime += sec_epoch * UA_DATETIME_SEC;
-
     return UA_STATUSCODE_GOOD;
 }
 #endif

From 41c399fe9558f27d59f27c4b06d4425a296fe1f4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 10:12:24 +0200
Subject: [PATCH 1119/1963] feat(server): Extract the ClientUserId from cert
 authentication

---
 include/open62541/plugin/pki.h          |  3 +++
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 18 ++++++++++++++++++
 plugins/crypto/openssl/ua_pki_openssl.c | 15 +++++++++++++++
 src/server/ua_services_session.c        |  7 ++++++-
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/include/open62541/plugin/pki.h b/include/open62541/plugin/pki.h
index a5065388355..1534d94403e 100644
--- a/include/open62541/plugin/pki.h
+++ b/include/open62541/plugin/pki.h
@@ -49,6 +49,9 @@ struct UA_CertificateVerification {
     UA_StatusCode (*getExpirationDate)(UA_DateTime *expiryDateTime, 
                                        UA_ByteString *certificate);
 
+    UA_StatusCode (*getSubjectName)(UA_String *subjectName,
+                                    UA_ByteString *certificate);
+
     /* Delete the certificate verification context */
     void (*clear)(UA_CertificateVerification *cv);
 
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index e2d4d620dbe..780330a5809 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -587,6 +587,23 @@ getCertificate_ExpirationDate(UA_DateTime *expiryDateTime,
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_StatusCode
+getCertificate_SubjectName(UA_String *subjectName,
+                           UA_ByteString *certificate) {
+    mbedtls_x509_crt publicKey;
+    mbedtls_x509_crt_init(&publicKey);
+    int mbedErr = mbedtls_x509_crt_parse(&publicKey, certificate->data, certificate->length);
+    if(mbedErr)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    char buf[1024];
+    int res = mbedtls_x509_dn_gets(buf, 1024, &publicKey.subject);
+    mbedtls_x509_crt_free(&publicKey);
+    if(res < 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    UA_String tmp = {(size_t)res, (UA_Byte*)buf};
+    return UA_String_copy(&tmp, subjectName);
+}
+
 UA_StatusCode
 UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
                                      const UA_ByteString *certificateTrustList,
@@ -620,6 +637,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
     cv->clear = certificateVerification_clear;
     cv->verifyApplicationURI = certificateVerification_verifyApplicationURI;
     cv->getExpirationDate = getCertificate_ExpirationDate;
+    cv->getSubjectName = getCertificate_SubjectName;
 
     int err;
     UA_ByteString data;
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 8c09322e1fd..ec21d87c7ac 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -703,6 +703,20 @@ UA_GetCertificate_ExpirationDate(UA_DateTime *expiryDateTime,
     return UA_STATUSCODE_GOOD;
 }
 #endif
+
+static UA_StatusCode
+UA_GetCertificate_SubjectName(UA_String *subjectName,
+                              UA_ByteString *certificate) {
+    const unsigned char *pData = certificate->data;
+    X509 *x509 = d2i_X509 (NULL, &pData, (long)certificate->length);
+    if(!x509)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    X509_NAME *sn = X509_get_subject_name(x509);
+    *subjectName = UA_STRING(X509_NAME_oneline(sn, NULL, 0));
+    X509_free(x509);
+    return UA_STATUSCODE_GOOD;
+}
+
 /* main entry */
 
 UA_StatusCode
@@ -742,6 +756,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
 #ifdef UA_ENABLE_ENCRYPTION_OPENSSL
     cv->getExpirationDate     = UA_GetCertificate_ExpirationDate;
 #endif
+    cv->getSubjectName = UA_GetCertificate_SubjectName;
     
     if (certificateTrustListSize > 0) {
         if (UA_skTrusted_Cert2X509 (certificateTrustList, certificateTrustListSize,
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 173ff8d0c0a..6af9bff26b0 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -857,7 +857,12 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
             req->userIdentityToken.content.decoded.data;
         UA_String_copy(&userToken->userName, &session->clientUserIdOfSession);
     } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
-        /* TODO: extract the X509 Subject Name of the certificate */
+        UA_X509IdentityToken* userCertToken = (UA_X509IdentityToken*)
+            req->userIdentityToken.content.decoded.data;
+        if(server->config.sessionPKI.getSubjectName)
+            server->config.sessionPKI.
+                getSubjectName(&session->clientUserIdOfSession,
+                               &userCertToken->certificateData);
     } else {
         /* TODO: Handle issued token */
     }

From c2fc758cdc01dc510f21f2632e4943c236361444 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 10:12:51 +0200
Subject: [PATCH 1120/1963] feat(server): Log the ClientUserId during
 ActivateSession

---
 src/server/ua_services_session.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 6af9bff26b0..b4bf8056027 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -892,8 +892,11 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     }
 #endif
 
+    /* Log the user for which the Session was activated */
     UA_LOG_INFO_SESSION(&server->config.logger, session,
-                        "ActivateSession: Session activated");
+                        "ActivateSession: Session activated with ClientUserId \"%.*s\"",
+                        (int)session->clientUserIdOfSession.length,
+                        session->clientUserIdOfSession.data);
     return;
 
 securityRejected:

From cab778fd9078462db974726dd4063af20c9105dd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 14:17:54 +0200
Subject: [PATCH 1121/1963] refactor(server): Simplify Service_GetEndpoints

---
 src/server/ua_services_discovery.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index c33cf32a14f..93873ac4558 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -240,23 +240,23 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
         if(!usable)
             continue;
 
+
         /* Copy into the results */
         for(size_t i = 0; i < clone_times; ++i) {
-            retval |= UA_EndpointDescription_copy(&server->config.endpoints[j],
-                                                  &response->endpoints[pos]);
-            UA_String_clear(&response->endpoints[pos].endpointUrl);
+            UA_EndpointDescription *respEP = &response->endpoints[pos];
+            retval |= UA_EndpointDescription_copy(&server->config.endpoints[j], respEP);
+            UA_String_clear(&respEP->endpointUrl);
             if(use_discovery) {
                 retval |=
                     UA_String_copy(&server->config.applicationDescription.discoveryUrls[i],
-                                   &response->endpoints[pos].endpointUrl);
+                                   &respEP->endpointUrl);
             } else {
                 /* Mirror back the requested EndpointUrl and also add it to the
                  * array of discovery urls */
-                retval |= UA_String_copy(endpointUrl, &response->endpoints[pos].endpointUrl);
-                retval |=
-                    UA_Array_appendCopy((void**)&response->endpoints[pos].server.discoveryUrls,
-                                        &response->endpoints[pos].server.discoveryUrlsSize,
-                                        endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
+                retval |= UA_String_copy(endpointUrl, &respEP->endpointUrl);
+                retval |= UA_Array_appendCopy((void**)&respEP->server.discoveryUrls,
+                                              &respEP->server.discoveryUrlsSize,
+                                              endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
             }
             if(retval != UA_STATUSCODE_GOOD)
                 goto error;

From f40f6e1327e5c6bc6d6e032ef9278987c200cce8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 14:46:41 +0200
Subject: [PATCH 1122/1963] feat(server): Use the UserTokenPolicies from the
 AccessControl plugin for authentication

---
 src/server/ua_services_session.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index b4bf8056027..df4259fa2af 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -522,10 +522,14 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
         if(!UA_String_equal(&desc->securityPolicyUri, &channel->securityPolicy->policyUri))
             continue;
 
-        /* Match the UserTokenType */
+        /* Match the UserTokenType
+         * Use the UserTokenPolicies configured in the AccessControl plugin.
+         * They override the configuration in the Endpoint.
+         *
+         * TODO: Allow different UserTokenPolicies for different endpoints. */
         const UA_DataType *tokenDataType = identityToken->content.decoded.type;
-        for(size_t j = 0; j < desc->userIdentityTokensSize; j++) {
-            const UA_UserTokenPolicy *pol = &desc->userIdentityTokens[j];
+        for(size_t j = 0; j < server->config.accessControl.userTokenPoliciesSize; j++) {
+            const UA_UserTokenPolicy *pol = &server->config.accessControl.userTokenPolicies[j];
 
             /* Part 4, Section 5.6.3.2, Table 17: A NULL or empty
              * UserIdentityToken should be treated as Anonymous */
@@ -536,7 +540,7 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
                 return;
             }
 
-            /* Expect decoded content */
+            /* Expect decoded content if not anonymous */
             if(!tokenDataType)
                 continue;
 
@@ -849,7 +853,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         server->serverDiagnosticsSummary.cumulatedSessionCount++;
     }
 
-    /* Store the ClientUserId */
+    /* Store the ClientUserId. tokenType can be NULL for the anonymous user. */
     UA_String_clear(&session->clientUserIdOfSession);
     const UA_DataType *tokenType = req->userIdentityToken.content.decoded.type;
     if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {

From 97bd00df3cef92c3930e8da42552d1b9721458f9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 14:47:45 +0200
Subject: [PATCH 1123/1963] feat(server): Return the UserTokenPolicies from the
 AccessControl plugin in GetEndpoints

---
 src/server/ua_services_discovery.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 93873ac4558..928cfeee64d 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -240,11 +240,29 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
         if(!usable)
             continue;
 
-
         /* Copy into the results */
         for(size_t i = 0; i < clone_times; ++i) {
             UA_EndpointDescription *respEP = &response->endpoints[pos];
             retval |= UA_EndpointDescription_copy(&server->config.endpoints[j], respEP);
+
+            /* Set the UserTokenPolicies from the AccessControl plugin.
+             * TODO: Allow different instances of the AccessControl plugin
+             *       per Endpoint. */
+            UA_Array_delete(respEP->userIdentityTokens, respEP->userIdentityTokensSize,
+                            &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+            respEP->userIdentityTokens = NULL;
+            respEP->userIdentityTokensSize = 0;
+            UA_StatusCode res =
+                UA_Array_copy(server->config.accessControl.userTokenPolicies,
+                              server->config.accessControl.userTokenPoliciesSize,
+                              (void **)&respEP->userIdentityTokens,
+                              &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+            if(UA_LIKELY(res == UA_STATUSCODE_GOOD))
+                respEP->userIdentityTokensSize =
+                    server->config.accessControl.userTokenPoliciesSize;
+            retval |= res;
+
+            /* Set the EndpointURL */
             UA_String_clear(&respEP->endpointUrl);
             if(use_discovery) {
                 retval |=

From 08dea8a421af96a53faf5a71df40c722e8c7eefa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 14:48:15 +0200
Subject: [PATCH 1124/1963] refactor(client): Fix a small logging typo in
 ua_client_connect.c

---
 src/client/ua_client_connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index c04e5329c08..8589bf11797 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1053,7 +1053,7 @@ responseFindServers(UA_Client *client, void *userdata,
         for(size_t j = 0; j < server->discoveryUrlsSize; j++) {
             if(UA_String_equal(&client->config.endpointUrl, &server->discoveryUrls[j])) {
                 UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                            "The initially defined EndpointURL %.*s"
+                            "The initially defined EndpointURL %.*s "
                             "is valid for the server",
                             (int)client->config.endpointUrl.length,
                             client->config.endpointUrl.data);

From d156e821237d87394c0f5b43681cdfed3b454707 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 19:22:44 +0200
Subject: [PATCH 1125/1963] refactor(examples): Improve server_access_control.c
 to show the intended usage

---
 .../access_control/server_access_control.c    | 40 ++++++++-----------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/examples/access_control/server_access_control.c b/examples/access_control/server_access_control.c
index 900e9a1ba4b..4b6cd8005d6 100644
--- a/examples/access_control/server_access_control.c
+++ b/examples/access_control/server_access_control.c
@@ -6,7 +6,6 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
-#include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -42,41 +41,34 @@ allowDeleteReference(UA_Server *server, UA_AccessControl *ac,
     return UA_TRUE;
 }
 
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
-static UA_UsernamePasswordLogin logins[2] = {
+static UA_UsernamePasswordLogin userNamePW[2] = {
     {UA_STRING_STATIC("peter"), UA_STRING_STATIC("peter123")},
     {UA_STRING_STATIC("paula"), UA_STRING_STATIC("paula123")}
 };
 
-int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
-    UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-
-    /* Disable anonymous logins, enable two user/password logins */
+static void
+setCustomAccessControl(UA_ServerConfig *config) {
+    /* Use the default AccessControl plugin as the starting point */
+    UA_Boolean allowAnonymous = false;
+    UA_String encryptionPolicy =
+        config->securityPolicies[config->securityPoliciesSize-1].policyUri;
     config->accessControl.clear(&config->accessControl);
-    UA_StatusCode retval = UA_AccessControl_default(config, false,
-             &config->securityPolicies[config->securityPoliciesSize-1].policyUri, 2, logins);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto cleanup;
+    UA_AccessControl_default(config, allowAnonymous, &encryptionPolicy, 2, userNamePW);
 
-    /* Set accessControl functions for nodeManagement */
+    /* Override accessControl functions for nodeManagement */
     config->accessControl.allowAddNode = allowAddNode;
     config->accessControl.allowAddReference = allowAddReference;
     config->accessControl.allowDeleteNode = allowDeleteNode;
     config->accessControl.allowDeleteReference = allowDeleteReference;
+}
 
-    retval = UA_Server_run(server, &running);
+int main(void) {
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    setCustomAccessControl(config);
 
- cleanup:
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
     UA_Server_delete(server);
+
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }

From dfa28d1b17a73eb6d6dbd9cb24ed90f1eef3f1e4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 19 Aug 2023 19:24:04 +0200
Subject: [PATCH 1126/1963] refactor(plugins): Don't set username/password in
 the default config

This can leave unwanted access possibilities.
---
 examples/server_ctt.c                | 11 +++++++++++
 plugins/ua_config_default.c          | 15 ++++-----------
 tests/client/check_activateSession.c | 17 ++++++++++++++++-
 tests/client/check_client.c          | 14 +++++++++++++-
 tests/server/check_accesscontrol.c   | 14 +++++++++++++-
 5 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 8aaa549712c..60af27c2a64 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -13,6 +13,7 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server_config_default.h>
 #include <open62541/plugin/pki_default.h>
+#include <open62541/plugin/accesscontrol_default.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -25,6 +26,11 @@
  * corresponding CTT configuration is available at
  * https://github.com/open62541/open62541-ctt */
 
+static const size_t usernamePasswordsSize = 2;
+static UA_UsernamePasswordLogin usernamePasswords[2] = {
+    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
+    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1")}};
+
 static const UA_NodeId baseDataVariableType = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_BASEDATAVARIABLETYPE}};
 static const UA_NodeId accessDenied = {1, UA_NODEIDTYPE_NUMERIC, {1337}};
 
@@ -1385,6 +1391,11 @@ int main(int argc, char **argv) {
     if(enableTime)
         config->verifyRequestTimestamp = UA_RULEHANDLING_DEFAULT;
 
+    /* Instatiate a new AccessControl plugin that knows username/pw */
+    UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
+    UA_AccessControl_default(config, true, &sp->policyUri,
+                             usernamePasswordsSize, usernamePasswords);
+
     /* Override with a custom access control policy */
     config->accessControl.getUserAccessLevel = getUserAccessLevel_disallowSpecific;
     UA_String_clear(&config->applicationDescription.applicationUri);
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 601f6d7c105..53d81c03ead 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -261,11 +261,6 @@ addEndpoint(UA_ServerConfig *conf,
     return retval;
 }
 
-static const size_t usernamePasswordsSize = 2;
-static UA_UsernamePasswordLogin usernamePasswords[2] = {
-    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
-    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1")}};
-
 static UA_StatusCode
 setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     if(!conf)
@@ -622,9 +617,8 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
     }
 
     /* Initialize the Access Control plugin */
-    retval = UA_AccessControl_default(config, true,
-                                      &config->securityPolicies[config->securityPoliciesSize-1].policyUri,
-                                      usernamePasswordsSize, usernamePasswords);
+    UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
+    retval = UA_AccessControl_default(config, true, &sp->policyUri, 0, NULL);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(config);
         return retval;
@@ -909,9 +903,8 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
     }
 
     if(retval == UA_STATUSCODE_GOOD) {
-        retval = UA_AccessControl_default(conf, true,
-                    &conf->securityPolicies[conf->securityPoliciesSize-1].policyUri,
-                    usernamePasswordsSize, usernamePasswords);
+        UA_SecurityPolicy *sp = &conf->securityPolicies[conf->securityPoliciesSize-1];
+        retval = UA_AccessControl_default(conf, true, &sp->policyUri, 0, NULL);
     }
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
diff --git a/tests/client/check_activateSession.c b/tests/client/check_activateSession.c
index 9ac03545d1f..e4f0161cf8d 100644
--- a/tests/client/check_activateSession.c
+++ b/tests/client/check_activateSession.c
@@ -2,8 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include <open62541/client.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/client_subscriptions.h>
 #include <open62541/client_config_default.h>
+#include <open62541/server.h>
 #include <open62541/server_config_default.h>
+#include <open62541/plugin/accesscontrol_default.h>
 
 #include "client/ua_client_internal.h"
 #include "ua_server_internal.h"
@@ -56,11 +61,21 @@ THREAD_CALLBACK(serverloop) {
 
 #define VARLENGTH 16366
 
+static const size_t usernamePasswordsSize = 2;
+static UA_UsernamePasswordLogin usernamePasswords[2] = {
+    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
+    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1")}};
+
 static void setup(void) {
     running = true;
     server = UA_Server_new();
     ck_assert(server != NULL);
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
+    UA_AccessControl_default(config, true, &sp->policyUri,
+                             usernamePasswordsSize, usernamePasswords);
+
     UA_Server_run_startup(server);
     addVariable(VARLENGTH);
     THREAD_CREATE(server_thread, serverloop);
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index f2996b5709a..e74781fdeb6 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -4,6 +4,7 @@
 
 #include <open62541/client_config_default.h>
 #include <open62541/server_config_default.h>
+#include <open62541/plugin/accesscontrol_default.h>
 
 #include "client/ua_client_internal.h"
 #include "ua_server_internal.h"
@@ -18,6 +19,11 @@ UA_Server *server;
 UA_Boolean running;
 THREAD_HANDLE server_thread;
 
+static const size_t usernamePasswordsSize = 2;
+static UA_UsernamePasswordLogin usernamePasswords[2] = {
+    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
+    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1")}};
+
 static void
 addVariable(size_t size) {
     /* Define the attribute of the myInteger variable node */
@@ -57,7 +63,13 @@ static void setup(void) {
     running = true;
     server = UA_Server_new();
     ck_assert(server != NULL);
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+
+    /* Instatiate a new AccessControl plugin that knows username/pw */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
+    UA_AccessControl_default(config, true, &sp->policyUri,
+                             usernamePasswordsSize, usernamePasswords);
+
     UA_Server_run_startup(server);
     addVariable(VARLENGTH);
     THREAD_CREATE(server_thread, serverloop);
diff --git a/tests/server/check_accesscontrol.c b/tests/server/check_accesscontrol.c
index 1e4939d38e3..a0a66db566f 100644
--- a/tests/server/check_accesscontrol.c
+++ b/tests/server/check_accesscontrol.c
@@ -6,6 +6,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
+#include <open62541/plugin/accesscontrol_default.h>
 #include <open62541/types.h>
 
 #include <stdlib.h>
@@ -17,6 +18,11 @@ UA_Server *server;
 UA_Boolean running;
 THREAD_HANDLE server_thread;
 
+static const size_t usernamePasswordsSize = 2;
+static UA_UsernamePasswordLogin usernamePasswords[2] = {
+    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
+    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1")}};
+
 THREAD_CALLBACK(serverloop) {
     while(running)
         UA_Server_run_iterate(server, true);
@@ -27,7 +33,13 @@ static void setup(void) {
     running = true;
     server = UA_Server_new();
     ck_assert(server != NULL);
-    UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+
+    /* Instatiate a new AccessControl plugin that knows username/pw */
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
+    UA_AccessControl_default(config, true, &sp->policyUri,
+                             usernamePasswordsSize, usernamePasswords);
+
     UA_Server_run_startup(server);
     THREAD_CREATE(server_thread, serverloop);
 }

From 99791f46aa2483d0e3db719e8767b55e3bbf23ba Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 20 Aug 2023 21:06:24 +0200
Subject: [PATCH 1127/1963] refactor(plugin): Don't set the UserTokenPolicy in
 the configured endpoint

We set this information at runtime from the AccessControl plugin.
---
 plugins/ua_config_default.c | 44 ++++++++++---------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 53d81c03ead..60ed2ae841b 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -188,8 +188,6 @@ const UA_ConnectionConfig UA_ConnectionConfig_default = {
 #define VERSION(MAJOR, MINOR, PATCH, LABEL) \
     STRINGIFY(MAJOR) "." STRINGIFY(MINOR) "." STRINGIFY(PATCH) LABEL
 
-const char *securityModeStrs[4] = {"-invalid", "-none", "-sign", "-sign+encrypt"};
-
 static UA_StatusCode
 addEndpoint(UA_ServerConfig *conf,
             const UA_SecurityPolicy *securityPolicy,
@@ -212,41 +210,21 @@ addEndpoint(UA_ServerConfig *conf,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     conf->endpoints = tmp;
 
+    /* The following fields are overwritten internally with up-to-date
+     * information from the server config:
+     *
+     * UserTokenPolicies
+     * ApplicationDescription (server)
+     * ServerCertificate
+     * EndpointURL */
     UA_EndpointDescription *endpoint = &conf->endpoints[conf->endpointsSize];
     UA_EndpointDescription_init(endpoint);
-
-    /* Add security level value for the corresponding message security mode */
-    endpoint->securityMode = securityMode;
-    endpoint->securityLevel = (UA_Byte)securityMode;
-
-    /* Enable all login mechanisms from the access control plugin  */
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_Array_copy(conf->accessControl.userTokenPolicies,
-                            conf->accessControl.userTokenPoliciesSize,
-                            (void **)&endpoint->userIdentityTokens,
-                            &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
-    if(retval == UA_STATUSCODE_GOOD)
-        endpoint->userIdentityTokensSize = conf->accessControl.userTokenPoliciesSize;
-
-    /* Append the SecurityMode to the usertokenpolicy PolicyId */
-    for(size_t i = 0; i < endpoint->userIdentityTokensSize; i++) {
-        UA_UserTokenPolicy *utp = &endpoint->userIdentityTokens[i];
-        size_t newLen = utp->policyId.length + strlen(securityModeStrs[securityMode]);
-        UA_Byte *newString = (UA_Byte*)UA_realloc(utp->policyId.data, newLen);
-        memcpy(&newString[utp->policyId.length], securityModeStrs[securityMode],
-               strlen(securityModeStrs[securityMode]));
-        if(!newString)
-            continue;
-        utp->policyId.data = newString;
-        utp->policyId.length = newLen;
-    }
-
-    retval |= UA_String_copy(&securityPolicy->policyUri, &endpoint->securityPolicyUri);
     endpoint->transportProfileUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
-    retval |= UA_String_copy(&securityPolicy->localCertificate, &endpoint->serverCertificate);
-    retval |= UA_ApplicationDescription_copy(&conf->applicationDescription,
-                                             &endpoint->server);
+    endpoint->securityMode = securityMode;
+    endpoint->securityLevel = (UA_Byte)securityMode;
+    UA_StatusCode retval = UA_String_copy(&securityPolicy->policyUri,
+                                          &endpoint->securityPolicyUri);
 
     if(retval == UA_STATUSCODE_GOOD) {
         conf->endpointsSize++;

From 1022d8b38849f257099249431eec42c78248b310 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 20 Aug 2023 22:09:49 +0200
Subject: [PATCH 1128/1963] feat(server): Set up the UserTokenPolicies at
 runtime during GetEndpoints

---
 include/open62541/server.h         |   4 +
 src/server/ua_server_internal.h    |  10 ++
 src/server/ua_services_discovery.c | 224 ++++++++++++++++++++---------
 3 files changed, 172 insertions(+), 66 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 579ee35f2ab..beccfc39f95 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -188,6 +188,10 @@ struct UA_ServerConfig {
     size_t securityPoliciesSize;
     UA_SecurityPolicy* securityPolicies;
 
+    /* Endpoints with combinations of SecurityPolicy and SecurityMode. If the
+     * UserIdentityToken array of the Endpoint is not set, then it will be
+     * filled by the server for all UserTokenPolicies that are configured in the
+     * AccessControl plugin. */
     size_t endpointsSize;
     UA_EndpointDescription *endpoints;
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 9f0df349d68..349afb45308 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -489,6 +489,16 @@ filterEvent(UA_Server *server, UA_Session *session,
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
+/* Returns a configured SecurityPolicy with encryption. Use Basic256Sha256 if
+ * available. Otherwise use any encrypted SecurityPolicy. */
+UA_SecurityPolicy *
+getDefaultEncryptedSecurityPolicy(UA_Server *server);
+
+UA_StatusCode
+setCurrentEndPointsArray(UA_Server *server, const UA_String endpointURL,
+                         UA_String *profileUris, size_t profileUrisSize,
+                         UA_EndpointDescription **arr, size_t *arrSize);
+
 UA_BrowsePathResult
 browseSimplifiedBrowsePath(UA_Server *server, const UA_NodeId origin,
                            size_t browsePathSize, const UA_QualifiedName *browsePath);
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 928cfeee64d..0eaaa04d9e3 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -188,50 +188,120 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
     }
 }
 
-void
-Service_GetEndpoints(UA_Server *server, UA_Session *session,
-                     const UA_GetEndpointsRequest *request,
-                     UA_GetEndpointsResponse *response) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+static const UA_String UA_SECURITY_POLICY_BASIC256SHA256_URI =
+    UA_STRING_STATIC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+
+UA_SecurityPolicy *
+getDefaultEncryptedSecurityPolicy(UA_Server *server) {
+    for(size_t i = 0; i < server->config.securityPoliciesSize; i++) {
+        UA_SecurityPolicy *sp = &server->config.securityPolicies[i];
+        if(UA_String_equal(&UA_SECURITY_POLICY_BASIC256SHA256_URI, &sp->policyUri))
+            return sp;
+    }
+    for(size_t i = server->config.securityPoliciesSize; i > 0; i--) {
+        UA_SecurityPolicy *sp = &server->config.securityPolicies[i-1];
+        if(!UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &sp->policyUri))
+            return sp;
+    }
+    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_CLIENT,
+                   "Could not find a SecurityPolicy with encryption for the "
+                   "UserTokenPolicy. Using an unencrypted policy.");
+    return server->config.securityPoliciesSize > 0 ?
+        &server->config.securityPolicies[0]: NULL;
+}
 
-    /* If the client expects to see a specific endpointurl, mirror it back. If
-     * not, clone the endpoints with the discovery url of all networklayers. */
-    const UA_String *endpointUrl = &request->endpointUrl;
-    if(endpointUrl->length > 0) {
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
-                             "Processing GetEndpointsRequest with endpointUrl "
-                             UA_PRINTF_STRING_FORMAT, UA_PRINTF_STRING_DATA(*endpointUrl));
-    } else {
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
-                             "Processing GetEndpointsRequest with an empty endpointUrl");
+const char *securityModeStrs[4] = {"-invalid", "-none", "-sign", "-sign+encrypt"};
+
+static UA_String
+securityPolicyUriPostfix(const UA_String uri) {
+    for(size_t i = 0; i < uri.length; i++) {
+        if(uri.data[i] != '#')
+            continue;
+        UA_String postfix = {uri.length - i, &uri.data[i]};
+        return postfix;
     }
+    return uri;
+}
 
-    /* Clone the endpoint for each networklayer? */
+static UA_StatusCode
+updateEndpointUserIdentityToken(UA_Server *server, UA_EndpointDescription *ed) {
+    /* Don't change the UserIdentityTokens if there are manually configured
+     * entries */
+    if(ed->userIdentityTokensSize > 0)
+        return UA_STATUSCODE_GOOD;
+
+    /* Copy the UserTokenPolicies from the AccessControl plugin
+     * TODO: Different instances of the AccessControl plugin per Endpoint */
+    UA_StatusCode res =
+        UA_Array_copy(server->config.accessControl.userTokenPolicies,
+                      server->config.accessControl.userTokenPoliciesSize,
+                      (void **)&ed->userIdentityTokens,
+                      &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+    ed->userIdentityTokensSize = server->config.accessControl.userTokenPoliciesSize;
+
+    for(size_t i = 0; i < ed->userIdentityTokensSize; i++) {
+        /* Use the securityPolicy of the SecureChannel. But not if the
+         * SecureChannel is unencrypted and there is a non-anonymous token. */
+        UA_UserTokenPolicy *utp = &ed->userIdentityTokens[i];
+        UA_String_clear(&utp->securityPolicyUri);
+        if(UA_String_equal(&ed->securityPolicyUri, &UA_SECURITY_POLICY_NONE_URI) &&
+           utp->tokenType != UA_USERTOKENTYPE_ANONYMOUS) {
+            UA_SecurityPolicy *encSP = getDefaultEncryptedSecurityPolicy(server);
+            if(encSP)
+                res |= UA_String_copy(&encSP->policyUri, &utp->securityPolicyUri);
+        }
+
+        /* Append the SecurityMode and SecurityPolicy postfix to the PolicyId to
+         * make it unique */
+        UA_String postfix;
+        if(utp->securityPolicyUri.length > 0)
+            postfix = securityPolicyUriPostfix(utp->securityPolicyUri);
+        else
+            postfix = securityPolicyUriPostfix(ed->securityPolicyUri);
+        size_t newLen = utp->policyId.length + postfix.length +
+            strlen(securityModeStrs[ed->securityMode]);
+        UA_Byte *newString = (UA_Byte*)UA_realloc(utp->policyId.data, newLen);
+        if(!newString)
+            continue;
+        size_t pos = utp->policyId.length;
+        memcpy(&newString[pos], securityModeStrs[ed->securityMode],
+               strlen(securityModeStrs[ed->securityMode]));
+        pos += strlen(securityModeStrs[ed->securityMode]);
+        memcpy(&newString[pos], postfix.data, postfix.length);
+        utp->policyId.data = newString;
+        utp->policyId.length = newLen;
+    }
+
+    return res;
+}
+
+/* Also reused to create the EndpointDescription array in the CreateSessionResponse */
+UA_StatusCode
+setCurrentEndPointsArray(UA_Server *server, const UA_String endpointUrl,
+                         UA_String *profileUris, size_t profileUrisSize,
+                         UA_EndpointDescription **arr, size_t *arrSize) {
+    /* Clone the endpoint for each discoveryURL? */
     size_t clone_times = 1;
-    UA_Boolean use_discovery = false;
-    if(endpointUrl->length == 0) {
+    if(endpointUrl.length == 0)
         clone_times = server->config.applicationDescription.discoveryUrlsSize;
-        use_discovery = true;
-    }
 
-    /* Allocate enough memory */
-    response->endpoints = (UA_EndpointDescription*)
+    /* Allocate the array */
+    *arr = (UA_EndpointDescription*)
         UA_Array_new(server->config.endpointsSize * clone_times,
                      &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
-    if(!response->endpoints) {
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
-        return;
-    }
+    if(!*arr)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
 
     size_t pos = 0;
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     for(size_t j = 0; j < server->config.endpointsSize; ++j) {
         /* Test if the supported binary profile shall be returned */
-        UA_Boolean usable = (request->profileUrisSize == 0);
+        UA_Boolean usable = (profileUrisSize == 0);
         if(!usable) {
-            for(size_t i = 0; i < request->profileUrisSize; ++i) {
-                if(!UA_String_equal(&request->profileUris[i],
-                                    &server->config.endpoints[j].transportProfileUri))
+            for(size_t i = 0; i < profileUrisSize; ++i) {
+                if(!UA_String_equal(&profileUris[i], &server->config.endpoints[j].transportProfileUri))
                     continue;
                 usable = true;
                 break;
@@ -242,56 +312,78 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
 
         /* Copy into the results */
         for(size_t i = 0; i < clone_times; ++i) {
-            UA_EndpointDescription *respEP = &response->endpoints[pos];
-            retval |= UA_EndpointDescription_copy(&server->config.endpoints[j], respEP);
-
-            /* Set the UserTokenPolicies from the AccessControl plugin.
-             * TODO: Allow different instances of the AccessControl plugin
-             *       per Endpoint. */
-            UA_Array_delete(respEP->userIdentityTokens, respEP->userIdentityTokensSize,
-                            &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
-            respEP->userIdentityTokens = NULL;
-            respEP->userIdentityTokensSize = 0;
-            UA_StatusCode res =
-                UA_Array_copy(server->config.accessControl.userTokenPolicies,
-                              server->config.accessControl.userTokenPoliciesSize,
-                              (void **)&respEP->userIdentityTokens,
-                              &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
-            if(UA_LIKELY(res == UA_STATUSCODE_GOOD))
-                respEP->userIdentityTokensSize =
-                    server->config.accessControl.userTokenPoliciesSize;
-            retval |= res;
+            /* Copy the endpoint with a current ApplicationDescription */
+            UA_EndpointDescription *ed = &(*arr)[pos];
+            retval |= UA_EndpointDescription_copy(&server->config.endpoints[j], ed);
+            UA_ApplicationDescription_clear(&ed->server);
+            retval |= UA_ApplicationDescription_copy(&server->config.applicationDescription,
+                                                     &ed->server);
+
+            /* Return the certificate for the SecurityPolicy. If the
+             * SecureChannel is unencrypted, select the default encrypted
+             * SecurityPolicy. */
+            UA_SecurityPolicy *sp = getSecurityPolicyByUri(server, &ed->securityPolicyUri);
+            if(!sp || UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &sp->policyUri))
+                sp = getDefaultEncryptedSecurityPolicy(server);
+            if(sp) {
+                UA_ByteString_clear(&ed->serverCertificate);
+                retval |= UA_String_copy(&sp->localCertificate, &ed->serverCertificate);
+            }
+
+            /* Set the User Identity Token list fromt the AccessControl plugin */
+            retval |= updateEndpointUserIdentityToken(server, ed);
 
             /* Set the EndpointURL */
-            UA_String_clear(&respEP->endpointUrl);
-            if(use_discovery) {
-                retval |=
-                    UA_String_copy(&server->config.applicationDescription.discoveryUrls[i],
-                                   &respEP->endpointUrl);
+            UA_String_clear(&ed->endpointUrl);
+            if(endpointUrl.length == 0) {
+                retval |= UA_String_copy(&server->config.applicationDescription.
+                                         discoveryUrls[i], &ed->endpointUrl);
             } else {
                 /* Mirror back the requested EndpointUrl and also add it to the
                  * array of discovery urls */
-                retval |= UA_String_copy(endpointUrl, &respEP->endpointUrl);
-                retval |= UA_Array_appendCopy((void**)&respEP->server.discoveryUrls,
-                                              &respEP->server.discoveryUrlsSize,
-                                              endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
+                retval |= UA_String_copy(&endpointUrl, &ed->endpointUrl);
+                retval |= UA_Array_appendCopy((void**)&ed->server.discoveryUrls,
+                                              &ed->server.discoveryUrlsSize,
+                                              &endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
             }
             if(retval != UA_STATUSCODE_GOOD)
                 goto error;
+
             pos++;
         }
     }
 
-    UA_assert(pos <= server->config.endpointsSize * clone_times);
-    response->endpointsSize = pos;
-    return;
+    *arrSize = pos;
+    return UA_STATUSCODE_GOOD;
 
-error:
-    response->responseHeader.serviceResult = retval;
-    UA_Array_delete(response->endpoints, response->endpointsSize,
+ error:
+    UA_Array_delete(*arr, server->config.endpointsSize * clone_times,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
-    response->endpoints = NULL;
-    response->endpointsSize = 0;
+    *arr = NULL;
+    return retval;
+}
+
+void
+Service_GetEndpoints(UA_Server *server, UA_Session *session,
+                     const UA_GetEndpointsRequest *request,
+                     UA_GetEndpointsResponse *response) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* If the client expects to see a specific endpointurl, mirror it back. If
+     * not, clone the endpoints with the discovery url of all networklayers. */
+    if(request->endpointUrl.length > 0) {
+        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                             "Processing GetEndpointsRequest with endpointUrl "
+                             UA_PRINTF_STRING_FORMAT, UA_PRINTF_STRING_DATA(request->endpointUrl));
+    } else {
+        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                             "Processing GetEndpointsRequest with an empty endpointUrl");
+    }
+
+    response->responseHeader.serviceResult =
+        setCurrentEndPointsArray(server, request->endpointUrl,
+                                 request->profileUris, request->profileUrisSize,
+                                 &response->endpoints, &response->endpointsSize);
 }
 
 #ifdef UA_ENABLE_DISCOVERY

From a9d37877ced459135b5d623460686a91c1a83e27 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 20 Aug 2023 22:14:08 +0200
Subject: [PATCH 1129/1963] refactor(server): Pull out password decryption and
 signature check from ActivateSession

---
 src/server/ua_services_session.c | 509 +++++++++++++++----------------
 1 file changed, 246 insertions(+), 263 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index df4259fa2af..3ea5923a7c4 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -306,6 +306,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
         }
     }
 
+    /* Create the Session */
     UA_Session *newSession = NULL;
     response->responseHeader.serviceResult =
         UA_Server_createSession(server, channel, request, &newSession);
@@ -316,57 +317,20 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
         return;
     }
 
-    UA_assert(newSession != NULL);
-
-    /* Allocate the response */
-    response->serverEndpoints = (UA_EndpointDescription *)
-        UA_Array_new(server->config.endpointsSize, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
-    if(!response->serverEndpoints) {
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
-        UA_Server_removeSessionByToken(server, &newSession->header.authenticationToken,
-                                       UA_SHUTDOWNREASON_REJECT);
-        return;
-    }
-    response->serverEndpointsSize = server->config.endpointsSize;
-
-    /* Copy the server's endpointdescriptions into the response */
-    for(size_t i = 0; i < server->config.endpointsSize; ++i)
-        response->responseHeader.serviceResult |=
-            UA_EndpointDescription_copy(&server->config.endpoints[i],
-                                        &response->serverEndpoints[i]);
-    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_Server_removeSessionByToken(server, &newSession->header.authenticationToken,
-                                       UA_SHUTDOWNREASON_REJECT);
-        return;
-    }
-
-    /* Mirror back the endpointUrl */
-    for(size_t i = 0; i < response->serverEndpointsSize; ++i) {
-        UA_String_clear(&response->serverEndpoints[i].endpointUrl);
+    /* If the session name is empty, use the generated SessionId */
+    response->responseHeader.serviceResult |=
+        UA_String_copy(&request->sessionName, &newSession->sessionName);
+    if(newSession->sessionName.length == 0)
         response->responseHeader.serviceResult |=
-            UA_String_copy(&request->endpointUrl,
-                           &response->serverEndpoints[i].endpointUrl);
-    }
+            UA_NodeId_print(&newSession->sessionId, &newSession->sessionName);
 
-    /* Fill the session information */
+    response->responseHeader.serviceResult |= UA_Session_generateNonce(newSession);
     newSession->maxResponseMessageSize = request->maxResponseMessageSize;
     newSession->maxRequestMessageSize = channel->config.localMaxMessageSize;
     response->responseHeader.serviceResult |=
         UA_ApplicationDescription_copy(&request->clientDescription,
                                        &newSession->clientDescription);
 
-    /* Prepare the response */
-    response->sessionId = newSession->sessionId;
-    response->revisedSessionTimeout = (UA_Double)newSession->timeout;
-    response->authenticationToken = newSession->header.authenticationToken;
-    response->responseHeader.serviceResult |=
-        UA_String_copy(&request->sessionName, &newSession->sessionName);
-
-    /* If the session name is empty, use the generated SessionId */
-    if(newSession->sessionName.length == 0)
-        response->responseHeader.serviceResult |=
-            UA_NodeId_print(&newSession->sessionId, &newSession->sessionName);
-
 #ifdef UA_ENABLE_DIAGNOSTICS
     response->responseHeader.serviceResult |=
         UA_String_copy(&request->serverUri, &newSession->diagnostics.serverUri);
@@ -374,15 +338,34 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
         UA_String_copy(&request->endpointUrl, &newSession->diagnostics.endpointUrl);
 #endif
 
-    /* Create a session nonce */
-    response->responseHeader.serviceResult |= UA_Session_generateNonce(newSession);
+    /* Prepare the response */
+    response->sessionId = newSession->sessionId;
+    response->revisedSessionTimeout = (UA_Double)newSession->timeout;
+    response->authenticationToken = newSession->header.authenticationToken;
     response->responseHeader.serviceResult |=
         UA_ByteString_copy(&newSession->serverNonce, &response->serverNonce);
 
-    /* Return the server certificate */
-    response->responseHeader.serviceResult |=
-        UA_ByteString_copy(&channel->securityPolicy->localCertificate,
-                           &response->serverCertificate);
+    /* Copy the server's endpointdescriptions into the response */
+    response->responseHeader.serviceResult =
+        setCurrentEndPointsArray(server, request->endpointUrl, NULL, 0,
+                                 &response->serverEndpoints,
+                                 &response->serverEndpointsSize);
+    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+        UA_Server_removeSessionByToken(server, &newSession->header.authenticationToken,
+                                       UA_SHUTDOWNREASON_REJECT);
+        return;
+    }
+
+    /* Return the server certificate from the SecurityPolicy of the current
+     * channel. Or, if the channel is unencrypted, return the standard policy
+     * used for usertoken encryption. */
+    const UA_SecurityPolicy *sp = channel->securityPolicy;
+    if(UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &sp->policyUri) ||
+       sp->localCertificate.length == 0)
+        sp = getDefaultEncryptedSecurityPolicy(server);
+    if(sp)
+        response->responseHeader.serviceResult |=
+            UA_ByteString_copy(&sp->localCertificate, &response->serverCertificate);
 
     /* Sign the signature */
     response->responseHeader.serviceResult |=
@@ -408,9 +391,10 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
 }
 
 static UA_StatusCode
-checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
-               void *channelContext, const UA_ByteString *serverNonce, const UA_SignatureData *signature,
-               const bool isUserTokenSignature) {
+checkCertificateSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
+                          void *channelContext, const UA_ByteString *serverNonce,
+                          const UA_SignatureData *signature,
+                          const bool isUserTokenSignature) {
     /* Check for zero signature length */
     if(signature->signature.length == 0) {
         if(isUserTokenSignature)
@@ -445,72 +429,12 @@ checkSignature(const UA_Server *server, const UA_SecurityPolicy *securityPolicy,
     return retval;
 }
 
-#ifdef UA_ENABLE_ENCRYPTION
-
-static UA_StatusCode
-decryptPassword(UA_SecurityPolicy *securityPolicy, void *tempChannelContext,
-                const UA_ByteString *serverNonce, UA_UserNameIdentityToken *userToken) {
-    UA_SecurityPolicyEncryptionAlgorithm *asymEnc =
-        &securityPolicy->asymmetricModule.cryptoModule.encryptionAlgorithm;
-    if(!UA_String_equal(&userToken->encryptionAlgorithm, &asymEnc->uri))
-        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-    UA_UInt32 tokenSecretLength;
-    UA_ByteString decryptedTokenSecret, tokenServerNonce;
-    size_t tokenpos = 0;
-    size_t offset = 0;
-    if(UA_ByteString_copy(&userToken->password, &decryptedTokenSecret) != UA_STATUSCODE_GOOD)
-        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-    UA_StatusCode retval = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-    if(asymEnc->decrypt(tempChannelContext, &decryptedTokenSecret) != UA_STATUSCODE_GOOD)
-        goto cleanup;
-
-    UA_UInt32_decodeBinary(&decryptedTokenSecret, &offset, &tokenSecretLength);
-
-    /* The decrypted data must be large enough to include the Encrypted Token
-     * Secret Format and the length field must indicate enough data to include
-     * the server nonce. */
-    if(decryptedTokenSecret.length < sizeof(UA_UInt32) + serverNonce->length ||
-       decryptedTokenSecret.length < sizeof(UA_UInt32) + tokenSecretLength ||
-       tokenSecretLength < serverNonce->length)
-        goto cleanup;
-
-    /* If the Encrypted Token Secret contains padding, the padding must be
-     * zeroes according to the 1.04.1 specification errata, chapter 3. */
-    for(size_t i = sizeof(UA_UInt32) + tokenSecretLength; i < decryptedTokenSecret.length; i++) {
-        if(decryptedTokenSecret.data[i] != 0)
-            goto cleanup;
-    }
-
-    /* The server nonce must match according to the 1.04.1 specification errata,
-     * chapter 3. */
-    tokenpos = sizeof(UA_UInt32) + tokenSecretLength - serverNonce->length;
-    tokenServerNonce.length = serverNonce->length;
-    tokenServerNonce.data = &decryptedTokenSecret.data[tokenpos];
-    if(!UA_ByteString_equal(serverNonce, &tokenServerNonce))
-        goto cleanup;
-
-    /* The password was decrypted successfully. Replace usertoken with the
-     * decrypted password. The encryptionAlgorithm and policyId fields are left
-     * in the UserToken as an indication for the AccessControl plugin that
-     * evaluates the decrypted content. */
-    memcpy(userToken->password.data, &decryptedTokenSecret.data[sizeof(UA_UInt32)],
-           tokenSecretLength - serverNonce->length);
-    userToken->password.length = tokenSecretLength - serverNonce->length;
-    retval = UA_STATUSCODE_GOOD;
-
- cleanup:
-    UA_ByteString_clear(&decryptedTokenSecret);
-    return retval;
-}
-#endif
-
 static void
 selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
                              const UA_ExtensionObject *identityToken,
                              const UA_EndpointDescription **ed,
-                             const UA_UserTokenPolicy **utp) {
+                             const UA_UserTokenPolicy **utp,
+                             const UA_SecurityPolicy **tokenSp) {
     for(size_t i = 0; i < server->config.endpointsSize; ++i) {
         const UA_EndpointDescription *desc = &server->config.endpoints[i];
 
@@ -522,14 +446,19 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
         if(!UA_String_equal(&desc->securityPolicyUri, &channel->securityPolicy->policyUri))
             continue;
 
-        /* Match the UserTokenType
-         * Use the UserTokenPolicies configured in the AccessControl plugin.
-         * They override the configuration in the Endpoint.
-         *
-         * TODO: Allow different UserTokenPolicies for different endpoints. */
+        /* If no UserTokenPolicies are configured in the endpoint, then use
+         * those of the AccessControl plugin. */
+        size_t identPoliciesSize = desc->userIdentityTokensSize;
+        const UA_UserTokenPolicy *identPolicies = desc->userIdentityTokens;
+        if(identPoliciesSize == 0) {
+            identPoliciesSize = server->config.accessControl.userTokenPoliciesSize;
+            identPolicies = server->config.accessControl.userTokenPolicies;
+        }
+
+        /* Match the UserTokenType */
         const UA_DataType *tokenDataType = identityToken->content.decoded.type;
-        for(size_t j = 0; j < server->config.accessControl.userTokenPoliciesSize; j++) {
-            const UA_UserTokenPolicy *pol = &server->config.accessControl.userTokenPolicies[j];
+        for(size_t j = 0; j < identPoliciesSize ; j++) {
+            const UA_UserTokenPolicy *pol = &identPolicies[j];
 
             /* Part 4, Section 5.6.3.2, Table 17: A NULL or empty
              * UserIdentityToken should be treated as Anonymous */
@@ -564,17 +493,183 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
             UA_AnonymousIdentityToken *token = (UA_AnonymousIdentityToken*)
                 identityToken->content.decoded.data;
 
-            if(!UA_String_equal(&pol->policyId, &token->policyId))
+            /* In setCurrentEndPointsArray we prepend the policyId with the
+             * security mode to make it unique. Remove that here. */
+            if(pol->policyId.length > token->policyId.length)
+                continue;
+            UA_String tmpId = token->policyId;
+            tmpId.length = pol->policyId.length;
+            if(!UA_String_equal(&tmpId, &pol->policyId))
                 continue;
 
             /* Match found */
             *ed = desc;
             *utp = pol;
+
+            /* Set the SecurityPolicy used to encrypt the token. If the
+             * userTokenPolicy doesn't specify a security policy the security
+             * policy of the secure channel is used. */
+            *tokenSp = channel->securityPolicy;
+            if(pol->securityPolicyUri.length > 0)
+                *tokenSp = getSecurityPolicyByUri(server, &pol->securityPolicyUri);
+#ifdef UA_ENABLE_ENCRYPTION
+            if(!*tokenSp || (*tokenSp)->localCertificate.length == 0 ||
+               UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &(*tokenSp)->policyUri))
+                *tokenSp = getDefaultEncryptedSecurityPolicy(server);
+#endif
             return;
         }
     }
 }
 
+#ifdef UA_ENABLE_ENCRYPTION
+static UA_StatusCode
+decryptUserNamePW(UA_Server *server, UA_Session *session,
+                  const UA_SecurityPolicy *sp,
+                  UA_UserNameIdentityToken *userToken) {
+    /* If SecurityPolicy is None there shall be no EncryptionAlgorithm  */
+    if(UA_String_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI)) {
+        if(userToken->encryptionAlgorithm.length > 0)
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+        UA_LOG_WARNING_SESSION(&server->config.logger, session, "ActivateSession: "
+                               "Received an unencrypted username/passwort. "
+                               "Is the server misconfigured to allow that?");
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Test if the correct encryption algorithm is used */
+    if(!UA_String_equal(&userToken->encryptionAlgorithm,
+                        &sp->asymmetricModule.cryptoModule.encryptionAlgorithm.uri))
+        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+    /* Encrypted password -- Create a temporary channel context.
+     * TODO: We should not need a ChannelContext at all for asymmetric
+     * decryption where the remote certificate is not used. */
+    void *tempChannelContext = NULL;
+    UA_UNLOCK(&server->serviceMutex);
+    UA_StatusCode res =
+        sp->channelModule.newContext(sp, &sp->localCertificate, &tempChannelContext);
+    UA_LOCK(&server->serviceMutex);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                               "ActivateSession: Failed to create a "
+                               "context for the SecurityPolicy %.*s",
+                               (int)sp->policyUri.length,
+                               sp->policyUri.data);
+        return res;
+    }
+
+    UA_UInt32 secretLen = 0;
+    UA_ByteString secret, tokenNonce;
+    size_t tokenpos = 0;
+    size_t offset = 0;
+    UA_ByteString *sn = &session->serverNonce;
+    const UA_SecurityPolicyEncryptionAlgorithm *asymEnc =
+        &sp->asymmetricModule.cryptoModule.encryptionAlgorithm;
+
+    res = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+    /* Decrypt the secret */
+    if(UA_ByteString_copy(&userToken->password, &secret) != UA_STATUSCODE_GOOD ||
+       asymEnc->decrypt(tempChannelContext, &secret) != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    /* The secret starts with a UInt32 length for the content */
+    if(UA_UInt32_decodeBinary(&secret, &offset,
+                              &secretLen) != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
+    /* The decrypted data must be large enough to include the Encrypted Token
+     * Secret Format and the length field must indicate enough data to include
+     * the server nonce. */
+    if(secret.length < sizeof(UA_UInt32) + sn->length ||
+       secret.length < sizeof(UA_UInt32) + secretLen ||
+       secretLen < sn->length)
+        goto cleanup;
+
+    /* If the Encrypted Token Secret contains padding, the padding must be
+     * zeroes according to the 1.04.1 specification errata, chapter 3. */
+    for(size_t i = sizeof(UA_UInt32) + secretLen; i < secret.length; i++) {
+        if(secret.data[i] != 0)
+            goto cleanup;
+    }
+
+    /* The server nonce must match according to the 1.04.1 specification errata,
+     * chapter 3. */
+    tokenpos = sizeof(UA_UInt32) + secretLen - sn->length;
+    tokenNonce.length = sn->length;
+    tokenNonce.data = &secret.data[tokenpos];
+    if(!UA_ByteString_equal(sn, &tokenNonce))
+        goto cleanup;
+
+    /* The password was decrypted successfully. Replace usertoken with the
+     * decrypted password. The encryptionAlgorithm and policyId fields are left
+     * in the UserToken as an indication for the AccessControl plugin that
+     * evaluates the decrypted content. */
+    memcpy(userToken->password.data,
+           &secret.data[sizeof(UA_UInt32)], secretLen - sn->length);
+    userToken->password.length = secretLen - sn->length;
+    res = UA_STATUSCODE_GOOD;
+
+ cleanup:
+    UA_ByteString_clear(&secret);
+
+    /* Remove the temporary channel context */
+    UA_UNLOCK(&server->serviceMutex);
+    sp->channelModule.deleteContext(tempChannelContext);
+    UA_LOCK(&server->serviceMutex);
+
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                               "ActivateSession: Failed to decrypt the "
+                               "password with the StatusCode %s",
+                               UA_StatusCode_name(res));
+    }
+    return res;
+}
+
+static UA_StatusCode
+checkActivateSessionX509(UA_Server *server, UA_Session *session,
+                         const UA_SecurityPolicy *sp, UA_X509IdentityToken* token,
+                         const UA_SignatureData *tokenSignature) {
+    /* The SecurityPolicy must be None */
+    if(UA_String_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI))
+        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+    /* We need a channel context with the user certificate in order to reuse
+     * the signature checking code. */
+    void *tempChannelContext;
+    UA_UNLOCK(&server->serviceMutex);
+    UA_StatusCode res = sp->channelModule.
+        newContext(sp, &token->certificateData, &tempChannelContext);
+    UA_LOCK(&server->serviceMutex);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                               "ActivateSession: Failed to create a context "
+                               "for the SecurityPolicy %.*s",
+                               (int)sp->policyUri.length,
+                               sp->policyUri.data);
+        return res;
+    }
+
+    /* Check the user token signature */
+    res = checkCertificateSignature(server, sp, tempChannelContext,
+                                    &session->serverNonce, tokenSignature, true);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                               "ActivateSession: User token signature check "
+                               "failed with StatusCode %s", UA_StatusCode_name(res));
+    }
+
+    /* Delete the temporary channel context */
+    UA_UNLOCK(&server->serviceMutex);
+    sp->channelModule.deleteContext(tempChannelContext);
+    UA_LOCK(&server->serviceMutex);
+    return res;
+}
+#endif
+
 /* TODO: Check all of the following: The Server shall verify that the
  * Certificate the Client used to create the new SecureChannel is the same as
  * the Certificate used to create the original SecureChannel. In addition, the
@@ -587,11 +682,13 @@ void
 Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
                         const UA_ActivateSessionRequest *req,
                         UA_ActivateSessionResponse *resp) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     const UA_EndpointDescription *ed = NULL;
     const UA_UserTokenPolicy *utp = NULL;
+    const UA_SecurityPolicy *tokenSp = NULL;
     UA_String *tmpLocaleIds;
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    /* Get the session */
     UA_Session *session = getSessionByToken(server, &req->requestHeader.authenticationToken);
     if(!session) {
         UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
@@ -625,8 +722,10 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     if(channel->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        channel->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
         resp->responseHeader.serviceResult =
-            checkSignature(server, channel->securityPolicy, channel->channelContext,
-                           &session->serverNonce, &req->clientSignature, false);
+            checkCertificateSignature(server, channel->securityPolicy,
+                                      channel->channelContext,
+                                      &session->serverNonce,
+                                      &req->clientSignature, false);
         if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_SESSION(&server->config.logger, session,
                                    "ActivateSession: Client signature check failed "
@@ -636,153 +735,37 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         }
     }
 
-    /* Find the matching Endpoint with UserTokenPolicy */
-    selectEndpointAndTokenPolicy(server, channel, &req->userIdentityToken, &ed, &utp);
-    if(!ed) {
+    /* Find the matching Endpoint with UserTokenPolicy.
+     * Also sets the SecurityPolicy used to encrypt the token. */
+    selectEndpointAndTokenPolicy(server, channel, &req->userIdentityToken,
+                                 &ed, &utp, &tokenSp);
+    if(!ed || !tokenSp) {
         resp->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
         goto rejected;
     }
 
-    /* Check that the usertoken was correctly decoded.
-     * We still have to check for individual types downstream. */
-    if(req->userIdentityToken.encoding != UA_EXTENSIONOBJECT_DECODED &&
-       req->userIdentityToken.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE &&
-       req->userIdentityToken.encoding != UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
-        resp->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-        goto securityRejected;
-    }
-
-    /* If it is a UserNameIdentityToken, the password may be encrypted */
+#ifdef UA_ENABLE_ENCRYPTION
     if(utp->tokenType == UA_USERTOKENTYPE_USERNAME) {
+        /* If it is a UserNameIdentityToken, the password may be encrypted */
        UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken *)
            req->userIdentityToken.content.decoded.data;
-
-       /* If the userTokenPolicy doesn't specify a security policy the security
-        * policy of the secure channel is used. */
-       UA_SecurityPolicy *sp;
-       if(!utp->securityPolicyUri.data)
-           sp = getSecurityPolicyByUri(server, &ed->securityPolicyUri);
-       else
-           sp = getSecurityPolicyByUri(server, &utp->securityPolicyUri);
-       if(!sp) {
-          resp->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
-          goto securityRejected;
-       }
-
-       /* Test if the encryption algorithm is correctly specified */
-       if(!UA_String_equal(&userToken->encryptionAlgorithm,
-                           &sp->asymmetricModule.cryptoModule.encryptionAlgorithm.uri)) {
-           resp->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-           goto securityRejected;
-       }
-
-#ifdef UA_ENABLE_ENCRYPTION
-       /* Encrypted password? */
-       if(!UA_String_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI)) {
-           /* Create a temporary channel context if a different SecurityPolicy is
-            * used for the password from the SecureChannel */
-           void *tempChannelContext = channel->channelContext;
-           if(sp != channel->securityPolicy) {
-               /* We use our own certificate to create a temporary channel
-                * context. Because the client does not provide one in a #None
-                * SecureChannel. We should not need a ChannelContext at all for
-                * asymmetric decryption where the remote certificate is not
-                * used. */
-               UA_UNLOCK(&server->serviceMutex);
-               resp->responseHeader.serviceResult = sp->channelModule.
-                   newContext(sp, &sp->localCertificate,
-                              &tempChannelContext);
-               UA_LOCK(&server->serviceMutex);
-               if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-                   UA_LOG_WARNING_SESSION(&server->config.logger, session,
-                                          "ActivateSession: Failed to create a "
-                                          "context for the SecurityPolicy %.*s",
-                                          (int)sp->policyUri.length, sp->policyUri.data);
-                   goto securityRejected;
-               }
-           }
-
-           /* Decrypt */
-           resp->responseHeader.serviceResult =
-               decryptPassword(sp, tempChannelContext,
-                               &session->serverNonce, userToken);
-
-           /* Remove the temporary channel context */
-           if(sp != channel->securityPolicy) {
-               UA_UNLOCK(&server->serviceMutex);
-               sp->channelModule.deleteContext(tempChannelContext);
-               UA_LOCK(&server->serviceMutex);
-           }
-       } else if(userToken->encryptionAlgorithm.length != 0) {
-           /* If SecurityPolicy is None there shall be no EncryptionAlgorithm  */
-           resp->responseHeader.serviceResult = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-           goto securityRejected;
-       }
-
-       if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-           UA_LOG_WARNING_SESSION(&server->config.logger, session, "ActivateSession: "
-                                  "Failed to decrypt the password with the StatusCode %s",
-                                  UA_StatusCode_name(resp->responseHeader.serviceResult));
+       resp->responseHeader.serviceResult =
+           decryptUserNamePW(server, session, tokenSp, userToken);
+       if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
            goto securityRejected;
-       }
-#endif
-    }
-
-#ifdef UA_ENABLE_ENCRYPTION
-    /* If it is a X509IdentityToken, check the userTokenSignature. Note this
-     * only validates that the user has the corresponding private key for the
-     * given user cetificate. Checking whether the user certificate is trusted
-     * has to be implemented in the access control plugin. The entire token is
-     * forwarded in the call to ActivateSession. */
-    if(utp->tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
-        UA_X509IdentityToken* userCertToken = (UA_X509IdentityToken*)
+    } else if(utp->tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
+        /* If it is a X509IdentityToken, check the userTokenSignature. Note this
+         * only validates that the user has the corresponding private key for
+         * the given user cetificate. Checking whether the user certificate is
+         * trusted has to be implemented in the access control plugin. The
+         * entire token is forwarded in the call to ActivateSession. */
+        UA_X509IdentityToken* token = (UA_X509IdentityToken*)
             req->userIdentityToken.content.decoded.data;
-
-        /* If the userTokenPolicy doesn't specify a security policy the security
-         * policy of the secure channel is used. */
-        UA_SecurityPolicy* utpSecurityPolicy;
-        if(!utp->securityPolicyUri.data)
-            utpSecurityPolicy = getSecurityPolicyByUri(server, &ed->securityPolicyUri);
-        else
-            utpSecurityPolicy = getSecurityPolicyByUri(server, &utp->securityPolicyUri);
-        if(!utpSecurityPolicy) {
-            resp->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
-            goto securityRejected;
-        }
-
-        /* We need a channel context with the user certificate in order to reuse
-         * the signature checking code. */
-        void *tempChannelContext;
-        UA_UNLOCK(&server->serviceMutex);
-        resp->responseHeader.serviceResult = utpSecurityPolicy->channelModule.
-            newContext(utpSecurityPolicy, &userCertToken->certificateData,
-                       &tempChannelContext);
-        UA_LOCK(&server->serviceMutex);
-        if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_SESSION(&server->config.logger, session,
-                                   "ActivateSession: Failed to create a context "
-                                   "for the SecurityPolicy %.*s",
-                                   (int)utpSecurityPolicy->policyUri.length,
-                                   utpSecurityPolicy->policyUri.data);
-            goto securityRejected;
-        }
-
-        /* Check the user token signature */
-        resp->responseHeader.serviceResult =
-            checkSignature(server, utpSecurityPolicy, tempChannelContext,
-                           &session->serverNonce, &req->userTokenSignature, true);
-
-        /* Delete the temporary channel context */
-        UA_UNLOCK(&server->serviceMutex);
-        utpSecurityPolicy->channelModule.deleteContext(tempChannelContext);
-        UA_LOCK(&server->serviceMutex);
-        if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_SESSION(&server->config.logger, session,
-                                   "ActivateSession: User token signature check "
-                                   "failed with StatusCode %s",
-                                   UA_StatusCode_name(resp->responseHeader.serviceResult));
-            goto securityRejected;
-        }
+       resp->responseHeader.serviceResult =
+           checkActivateSessionX509(server, session, tokenSp,
+                                    token, &req->userTokenSignature);
+       if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
+           goto securityRejected;
     }
 #endif
 

From 1f16df2d16efbce8be15afcc82bf4c3762bc2c8b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 20 Aug 2023 22:14:50 +0200
Subject: [PATCH 1130/1963] refactor(server): Cosmetic improvements in
 ua_services_session.c

---
 src/server/ua_services_session.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 3ea5923a7c4..98efb01dd1b 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -49,8 +49,9 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
     /* Callback into userland access control */
     if(server->config.accessControl.closeSession) {
         UA_UNLOCK(&server->serviceMutex);
-        server->config.accessControl.closeSession(server, &server->config.accessControl,
-                                                  &session->sessionId, session->sessionHandle);
+        server->config.accessControl.
+            closeSession(server, &server->config.accessControl,
+                         &session->sessionId, session->sessionHandle);
         UA_LOCK(&server->serviceMutex);
     }
 
@@ -120,7 +121,8 @@ UA_Server_cleanupSessions(UA_Server *server, UA_DateTime nowMonotonic) {
         /* Session has timed out? */
         if(sentry->session.validTill >= nowMonotonic)
             continue;
-        UA_LOG_INFO_SESSION(&server->config.logger, &sentry->session, "Session has timed out");
+        UA_LOG_INFO_SESSION(&server->config.logger, &sentry->session,
+                            "Session has timed out");
         UA_Server_removeSession(server, sentry, UA_SHUTDOWNREASON_TIMEOUT);
     }
 }
@@ -190,23 +192,25 @@ signCreateSessionResponse(UA_Server *server, UA_SecureChannel *channel,
     UA_SignatureData *signatureData = &response->serverSignature;
 
     /* Prepare the signature */
-    size_t signatureSize = securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.
-        getLocalSignatureSize(channel->channelContext);
-    UA_StatusCode retval = UA_String_copy(&securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.uri,
-                                          &signatureData->algorithm);
+    const UA_SecurityPolicySignatureAlgorithm *signAlg =
+        &securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm;
+    size_t signatureSize = signAlg->getLocalSignatureSize(channel->channelContext);
+    UA_StatusCode retval = UA_String_copy(&signAlg->uri, &signatureData->algorithm);
     retval |= UA_ByteString_allocBuffer(&signatureData->signature, signatureSize);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
     /* Allocate a temp buffer */
-    size_t dataToSignSize = request->clientCertificate.length + request->clientNonce.length;
+    size_t dataToSignSize =
+        request->clientCertificate.length + request->clientNonce.length;
     UA_ByteString dataToSign;
     retval = UA_ByteString_allocBuffer(&dataToSign, dataToSignSize);
     if(retval != UA_STATUSCODE_GOOD)
         return retval; /* signatureData->signature is cleaned up with the response */
 
     /* Sign the signature */
-    memcpy(dataToSign.data, request->clientCertificate.data, request->clientCertificate.length);
+    memcpy(dataToSign.data, request->clientCertificate.data,
+           request->clientCertificate.length);
     memcpy(dataToSign.data + request->clientCertificate.length,
            request->clientNonce.data, request->clientNonce.length);
     retval = securityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.

From 9650bc7a9282bcac05e875332ef14620a246498b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 21 Aug 2023 14:59:36 +0200
Subject: [PATCH 1131/1963] fix(el): Pacify some unused warnings if
 multi-threading is disabled

---
 arch/eventloop_posix_interrupt.c | 5 +++++
 arch/eventloop_posix_tcp.c       | 1 +
 arch/eventloop_posix_udp.c       | 1 +
 3 files changed, 7 insertions(+)

diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
index d30acca12f7..e5ce5019beb 100644
--- a/arch/eventloop_posix_interrupt.c
+++ b/arch/eventloop_posix_interrupt.c
@@ -62,6 +62,7 @@ static void deactivateSignal(UA_RegisteredSignal *rs);
 static void
 handlePOSIXInterruptEvent(UA_EventSource *es, UA_RegisteredFD *rfd, short event) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    (void)el;
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
     UA_RegisteredSignal *rs = (UA_RegisteredSignal*)rfd;
@@ -335,6 +336,7 @@ registerPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle,
 static void
 deregisterPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)im->eventSource.eventLoop;
+    (void)el;
     UA_POSIXInterruptManager *pim = (UA_POSIXInterruptManager *)im;
     UA_LOCK(&el->elMutex);
 
@@ -383,6 +385,7 @@ pair(SOCKET fds[2]) {
 static UA_StatusCode
 startPOSIXInterruptManager(UA_EventSource *es) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    (void)el;
     UA_LOCK(&el->elMutex);
 
     /* Check the state */
@@ -468,6 +471,7 @@ startPOSIXInterruptManager(UA_EventSource *es) {
 static void
 stopPOSIXInterruptManager(UA_EventSource *es) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    (void)el;
     UA_LOCK(&el->elMutex);
 
     if(es->state != UA_EVENTSOURCESTATE_STARTED) {
@@ -501,6 +505,7 @@ stopPOSIXInterruptManager(UA_EventSource *es) {
 static UA_StatusCode
 freePOSIXInterruptmanager(UA_EventSource *es) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX *)es->eventLoop;
+    (void)el;
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
     if(es->state >= UA_EVENTSOURCESTATE_STARTING) {
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index e191403fd93..f661c48204e 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -957,6 +957,7 @@ static void
 TCP_eventSourceStop(UA_ConnectionManager *cm) {
     UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    (void)el;
 
     UA_LOCK(&el->elMutex);
 
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 77d0aedd911..b5cd33e0867 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -1267,6 +1267,7 @@ static void
 UDP_eventSourceStop(UA_ConnectionManager *cm) {
     UA_POSIXConnectionManager *pcm = (UA_POSIXConnectionManager*)cm;
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)cm->eventSource.eventLoop;
+    (void)el;
     UA_LOCK(&el->elMutex);
 
     UA_LOG_INFO(cm->eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,

From f5c496306b7a54846ab153ed66bc1b9747ceef17 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 21 Aug 2023 15:00:00 +0200
Subject: [PATCH 1132/1963] refactor(core): Remove unused forward declarations
 in ua_types_encoding_json.c

---
 src/ua_types_encoding_json.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index a80db9f8519..ffed6544001 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -57,10 +57,6 @@
 #define ENCODE_DIRECT_JSON(SRC, TYPE) \
     TYPE##_encodeJson(ctx, (const UA_##TYPE*)SRC, NULL)
 
-/* Forward declarations */
-UA_String UA_DateTime_toJSON(UA_DateTime t);
-ENCODE_JSON(ByteString);
-
 static status UA_FUNC_ATTR_WARN_UNUSED_RESULT
 writeChar(CtxJson *ctx, char c) {
     if(ctx->pos >= ctx->end)

From 3b3ac03416bedef5097d5a6a47ea1a5ac59d8197 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Aug 2023 15:03:26 +0200
Subject: [PATCH 1133/1963] fix(server): Fix a potential memleak in
 ua_subscription_events.c

---
 src/server/ua_subscription_events.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index bb8fde7b790..6e8a6945f24 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -176,15 +176,17 @@ eventSetStandardFields(UA_Server *server, const UA_NodeId *event,
 UA_StatusCode
 UA_MonitoredItem_addEvent(UA_Server *server, UA_MonitoredItem *mon,
                           const UA_NodeId *event) {
-    UA_Notification *notification = UA_Notification_new();
-    if(!notification)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-
+    /* Get the filter */
     if(mon->parameters.filter.content.decoded.type != &UA_TYPES[UA_TYPES_EVENTFILTER])
         return UA_STATUSCODE_BADFILTERNOTALLOWED;
     UA_EventFilter *eventFilter = (UA_EventFilter*)
         mon->parameters.filter.content.decoded.data;
 
+    /* Allocate memory for the notification */
+    UA_Notification *notification = UA_Notification_new();
+    if(!notification)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
     /* The MonitoredItem must be attached to a Subscription. This code path is
      * not taken for local MonitoredItems (once they are enabled for Events). */
     UA_Subscription *sub = mon->subscription;

From f8de9bf920d7095a2bae5b3d0e953268e6b7d12e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Aug 2023 15:06:20 +0200
Subject: [PATCH 1134/1963] fix(server): Fix uninitialized memory in
 ua_services_view.c

---
 src/server/ua_services_view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index ede8ad7c002..2dbe087efba 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -167,12 +167,12 @@ isNodeInTree(UA_Server *server, const UA_NodeId *leafNode,
              const UA_NodeId *nodeToFind,
              const UA_ReferenceTypeSet *relevantRefs) {
     struct IsNodeInTreeContext ctx;
+    memset(&ctx, 0, sizeof(struct IsNodeInTreeContext));
     ctx.server = server;
     ctx.nodeToFind = UA_NodePointer_fromNodeId(nodeToFind);
-    ctx.parents.root = NULL;
     ctx.relevantRefs = *relevantRefs;
-    ctx.depth = 0;
     UA_ReferenceTarget tmpTarget;
+    memset(&tmpTarget, 0, sizeof(UA_ReferenceTarget));
     tmpTarget.targetId = UA_NodePointer_fromNodeId(leafNode);
     return (isNodeInTreeIterateCallback(&ctx, &tmpTarget) != NULL);
 }

From 2312357a91ba380134a3bfb11e07241543397d16 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Aug 2023 15:18:42 +0200
Subject: [PATCH 1135/1963] refactor(client): Remove unnecesary lock/unlocks in
 ua_client_discovery.c

---
 src/client/ua_client_connect.c   | 19 +++++++++++++++++--
 src/client/ua_client_discovery.c | 24 ++++++++++++------------
 src/client/ua_client_internal.h  |  2 ++
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 8589bf11797..8bf4ca9e402 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1662,8 +1662,7 @@ connectSync(UA_Client *client) {
 }
 
 UA_StatusCode
-__UA_Client_connect(UA_Client *client, UA_Boolean async) {
-    UA_LOCK(&client->clientMutex);
+connectInternal(UA_Client *client, UA_Boolean async) {
     /* Reset the connectStatus. This should be the only place where we can
      * recover from a bad connectStatus. */
     client->connectStatus = UA_STATUSCODE_GOOD;
@@ -1673,6 +1672,22 @@ __UA_Client_connect(UA_Client *client, UA_Boolean async) {
     else
         connectSync(client);
     notifyClientState(client);
+    return client->connectStatus;
+}
+
+UA_StatusCode
+connectSecureChannel(UA_Client *client, const char *endpointUrl) {
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->noSession = true;
+    UA_String_clear(&cc->endpointUrl);
+    cc->endpointUrl = UA_STRING_ALLOC(endpointUrl);
+    return connectInternal(client, false);
+}
+
+UA_StatusCode
+__UA_Client_connect(UA_Client *client, UA_Boolean async) {
+    UA_LOCK(&client->clientMutex);
+    connectInternal(client, async);
     UA_UNLOCK(&client->clientMutex);
     return client->connectStatus;
 }
diff --git a/src/client/ua_client_discovery.c b/src/client/ua_client_discovery.c
index e84240d5efc..7f948b157e4 100644
--- a/src/client/ua_client_discovery.c
+++ b/src/client/ua_client_discovery.c
@@ -89,11 +89,11 @@ UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
     UA_StatusCode retval;
     const UA_String url = UA_STRING((char*)(uintptr_t)serverUrl);
     if(!connected) {
-        UA_UNLOCK(&client->clientMutex);
-        retval = UA_Client_connectSecureChannel(client, serverUrl);
-        if(retval != UA_STATUSCODE_GOOD)
+        retval = connectSecureChannel(client, serverUrl);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_UNLOCK(&client->clientMutex);
             return retval;
-        UA_LOCK(&client->clientMutex);
+        }
     }
     retval = getEndpointsInternal(client, url, endpointDescriptionsSize,
                                   endpointDescriptions);
@@ -121,11 +121,11 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
 
     UA_StatusCode retval;
     if(!connected) {
-        UA_UNLOCK(&client->clientMutex);
-        retval = UA_Client_connectSecureChannel(client, serverUrl);
-        if(retval != UA_STATUSCODE_GOOD)
+        retval = connectSecureChannel(client, serverUrl);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_UNLOCK(&client->clientMutex);
             return retval;
-        UA_LOCK(&client->clientMutex);
+        }
     }
 
     /* Prepare the request */
@@ -179,11 +179,11 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
 
     UA_StatusCode retval;
     if(!connected) {
-        UA_UNLOCK(&client->clientMutex);
-        retval = UA_Client_connectSecureChannel(client, serverUrl);
-        if(retval != UA_STATUSCODE_GOOD)
+        retval = connectSecureChannel(client, serverUrl);
+        if(retval != UA_STATUSCODE_GOOD) {
+            UA_LOCK(&client->clientMutex);
             return retval;
-        UA_LOCK(&client->clientMutex);
+        }
     }
 
     /* Prepare the request */
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 1f2e2db4bf1..1011c5b18ce 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -188,6 +188,8 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message);
 
+UA_StatusCode connectInternal(UA_Client *client, UA_Boolean async);
+UA_StatusCode connectSecureChannel(UA_Client *client, const char *endpointUrl);
 UA_Boolean isFullyConnected(UA_Client *client);
 void connectSync(UA_Client *client);
 void notifyClientState(UA_Client *client);

From 0a1684c1a5cd4675446a28a9b18001ee32631ee1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Aug 2023 15:30:17 +0200
Subject: [PATCH 1136/1963] refactor(deps): Remove dead code in deps/itoa.c

---
 deps/itoa.c | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/deps/itoa.c b/deps/itoa.c
index ac85b57128d..b8d4b75852c 100644
--- a/deps/itoa.c
+++ b/deps/itoa.c
@@ -66,49 +66,34 @@ UA_UInt16 itoaUnsigned(UA_UInt64 value, char* buffer, UA_Byte base) {
     return i;
 }
 
-/* adapted from http://www.techiedelight.com/implement-itoa-function-in-c/ to use UA_... types */
+/* adapted from http://www.techiedelight.com/implement-itoa-function-in-c/ */
 UA_UInt16 itoaSigned(UA_Int64 value, char* buffer) {
-    /* consider absolute value of number */
-
-
-    UA_UInt64 n;
-
     /* Special case for UA_INT64_MIN which can not simply be negated */
     /* it will cause a signed integer overflow */
-    if (value == UA_INT64_MIN) {
+    UA_UInt64 n;
+    if(value == UA_INT64_MIN) {
         n = (UA_UInt64)UA_INT64_MAX + 1;
-    }
-    else {
+    } else {
         n = (UA_UInt64)value;
-
         if(value < 0){
             n = (UA_UInt64)-value;
         }
     }
 
     UA_UInt16 i = 0;
-    while (n) {
+    while(n) {
         UA_UInt64 r = n % 10;
-
-        if (r >= 10)
-            buffer[i++] = (char)(65 + (r - 10));
-        else
-            buffer[i++] = (char)(48 + r);
-
+        buffer[i++] = (char)('0' + r);
         n = n / 10;
     }
 
-    /* if number is 0 */
-    if (i == 0)
-        buffer[i++] = '0';
-
-    if (value < 0)
+    if(i == 0)
+        buffer[i++] = '0'; /* if number is 0 */
+    if(value < 0)
         buffer[i++] = '-';
-
     buffer[i] = '\0'; /* null terminate string */
     i--;
-    /* reverse the string and return it */
-    reverse(buffer, 0, i);
+    reverse(buffer, 0, i); /* reverse the string and return it */
     i++;
     return i;
 }

From ac7fdd207ad70b75109d28485e08b579ec2c8f74 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Aug 2023 15:38:36 +0200
Subject: [PATCH 1137/1963] refactor(server): Fix control-flow issue in
 ua_subscription_events_filter.c

---
 src/server/ua_subscription_events_filter.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 4ff8d7d57a5..f5b3567f230 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -864,14 +864,13 @@ inListOperator(UA_FilterEvalContext *ctx, size_t index) {
     UA_Variant *op1 = &ctx->stack[ctx->top++];
     UA_StatusCode res = resolveOperand(ctx, &elm->filterOperands[0], op0);
     UA_CHECK_STATUS(res, return res);
-    for(size_t i = 1; i < elm->filterOperandsSize; i++) {
+    for(size_t i = 1; i < elm->filterOperandsSize && !found; i++) {
         res = resolveOperand(ctx, &elm->filterOperands[i], op1);
-        UA_CHECK_STATUS(res, continue);
+        if(res != UA_STATUSCODE_GOOD)
+            continue;
         if(op0->type == op1->type &&
-           UA_order(op0->data, op1->data, op0->type) == UA_ORDER_EQ) {
+           UA_order(op0->data, op1->data, op0->type) == UA_ORDER_EQ)
             found = true;
-            break;
-        }
         UA_Variant_clear(op1);
     }
     ctx->results[index] = t2v((found) ? UA_TERNARY_TRUE: UA_TERNARY_FALSE);

From e564a09bf861839c6c3428ca37c6a8bea8d337cd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 23 Aug 2023 21:33:11 +0200
Subject: [PATCH 1138/1963] refactor(build): Don't directly modify
 CMAKE_C_FLAGS

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e524d4d0b..87aa0bb9fe5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -612,10 +612,10 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
 
     # Force 32bit build
     if(UA_FORCE_32BIT)
-      if(MSVC)
-        message(FATAL_ERROR "Select the 32bit (cross-) compiler instead of forcing compiler options")
-      endif()
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") # GCC and Clang, possibly more
+        if(MSVC)
+            message(FATAL_ERROR "Select the 32bit (cross-) compiler instead of forcing compiler options")
+        endif()
+        check_add_cc_flag("-m32") # GCC and Clang, possibly more
     endif()
 
     if(NOT MINGW AND NOT UA_BUILD_OSS_FUZZ)

From 9af3cfa133de1ded0a206dcfc5d2d47abd18cf12 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 23 Aug 2023 21:34:53 +0200
Subject: [PATCH 1139/1963] feat(build): Always speed up build of the full ns0
 is selected

---
 CMakeLists.txt | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87aa0bb9fe5..26b632ac8ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1233,17 +1233,6 @@ ua_generate_nodeset(NAME "ns0" FILE ${UA_FILE_NODESETS} ${UA_NODESET_FILE_DA}
                     IGNORE "${PROJECT_SOURCE_DIR}/tools/nodeset_compiler/NodeID_NS0_Base.txt"
                     DEPENDS_TARGET "open62541-generator-types")
 
-# stack protector and optimization needs to be disabled for the huge ns0 file, otherwise debian packaging fails due to long build times.
-# We also disable optimization on Appveyor builds, since they take almost an hour otherwise
-if(UA_PACK_DEBIAN OR (NOT "$ENV{APPVEYOR}" STREQUAL "") OR (
-        (CMAKE_BUILD_TYPE STREQUAL "MinSizeRel" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND (
-            # List of compilers which have problems with the huge ns0 optimization
-            (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0))
-        )
-   ))
-    set_source_files_properties(${PROJECT_BINARY_DIR}/src_generated/open62541/namespace0_generated.c PROPERTIES COMPILE_FLAGS "-fno-stack-protector -O0")
-endif()
-
 if(UA_ENABLE_NODESET_INJECTOR)
     message(STATUS "Nodesetinjector feature enabled")
     cmake_minimum_required(VERSION 3.20)
@@ -1306,6 +1295,7 @@ if(UA_ENABLE_AMALGAMATION)
     add_dependencies(open62541-amalgamation-header open62541-generator-namespace)
 else()
     add_library(open62541-object OBJECT ${lib_sources} ${lib_headers} ${exported_headers})
+    target_include_directories(open62541-object PRIVATE ${PROJECT_SOURCE_DIR}/src)
 
     add_custom_target(open62541-code-generation DEPENDS
                       open62541-generator-types
@@ -1321,7 +1311,11 @@ else()
         add_coverage(open62541-object)
     endif()
 
-    target_include_directories(open62541-object PRIVATE ${PROJECT_SOURCE_DIR}/src)
+    # stack protector and optimization are disabled for the huge ns0 file
+    if(UA_NAMESPACE_ZERO STREQUAL "FULL" AND NOT MSVC)
+        set_source_files_properties(${PROJECT_BINARY_DIR}/src_generated/open62541/namespace0_generated.c
+                                    PROPERTIES COMPILE_FLAGS "-fno-stack-protector -O0")
+    endif()
 
     add_library(open62541-plugins OBJECT ${plugin_sources} ${architecture_sources} ${exported_headers})
     add_dependencies(open62541-plugins open62541-generator-types open62541-generator-transport open62541-generator-namespace)

From ba690ea3216465bbf25523963805c4cab55de6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Engelthaler?= <engycz@gmail.com>
Date: Fri, 25 Aug 2023 10:33:26 +0200
Subject: [PATCH 1140/1963] fix(server): StartTime is missing in minimal NS0

StartTime is set for all data models in ua_server.c, but the node
is missing in the minimal NS0.
---
 src/server/ua_server_ns0.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 874a8da5357..5b4885d58fc 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -730,6 +730,10 @@ minimalServerObject(UA_Server *server) {
                               UA_NS0ID_SERVER, UA_NS0ID_HASCOMPONENT,
                               UA_VALUERANK_SCALAR, UA_NS0ID_BASEDATATYPE);
 
+    retval |= addVariableNode(server, "StartTime", UA_NS0ID_SERVER_SERVERSTATUS_STARTTIME,
+                              UA_NS0ID_SERVER_SERVERSTATUS, UA_NS0ID_HASCOMPONENT,
+                              UA_VALUERANK_SCALAR, UA_NS0ID_BASEDATATYPE);
+
     retval |= addVariableNode(server, "CurrentTime", UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME,
                               UA_NS0ID_SERVER_SERVERSTATUS, UA_NS0ID_HASCOMPONENT,
                               UA_VALUERANK_SCALAR, UA_NS0ID_BASEDATATYPE);

From 083ea64bebe4c908f655847139a18f3ebf83f648 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 21 Aug 2023 08:18:31 +0200
Subject: [PATCH 1141/1963] fix(tests): Unlock mutex in state callbacks before
 throwing assert

---
 .../check_pubsub_subscribe_msgrcvtimeout.c    | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 0217f013e2b..ef0ed00dee0 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -8,6 +8,12 @@
 
 #include <check.h>
 
+#define CHK_UNLOCK(pMutex, cond) \
+if (!(cond)) {                     \
+   UA_UNLOCK(pMutex);            \
+   ck_assert(cond);              \
+}                                \
+
 static UA_Server *server = NULL;
 
 /* global variables to check PubSubStateChangeCallback */
@@ -412,7 +418,7 @@ static void PubSubStateChangeCallback_basic (UA_Server *hostServer,
                                 UA_NodeId *pubsubComponentId,
                                 UA_PubSubState state,
                                 UA_StatusCode reason) {
-    ck_assert(hostServer == server);
+    CHK_UNLOCK(&hostServer->serviceMutex, hostServer == server);
 
     UA_String strId;
     UA_String_init(&strId);
@@ -423,17 +429,17 @@ static void PubSubStateChangeCallback_basic (UA_Server *hostServer,
     UA_String_clear(&strId);
 
     if(ExpectedCallbackStateChange == UA_PUBSUBSTATE_OPERATIONAL) {
-        ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL ||
-                  state == UA_PUBSUBSTATE_PREOPERATIONAL);
+        CHK_UNLOCK(&hostServer->serviceMutex, state == UA_PUBSUBSTATE_OPERATIONAL ||
+                   state == UA_PUBSUBSTATE_PREOPERATIONAL);
     } else {
-        ck_assert(ExpectedCallbackStateChange == state);
+        CHK_UNLOCK(&hostServer->serviceMutex, ExpectedCallbackStateChange == state);
     }
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
                 "Callback Cnt = %u", CallbackCnt);
 
     if(ExpectedCallbackCnt > 0) {
-        ck_assert(CallbackCnt <= ExpectedCallbackCnt);
+        CHK_UNLOCK(&hostServer->serviceMutex, CallbackCnt <= ExpectedCallbackCnt);
         /* UA_String_init(&strId); */
         /* UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId); */
         /* UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): " */
@@ -729,7 +735,7 @@ START_TEST(Test_basic) {
 static void
 PubSubStateChangeCallback_different_timeouts(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                              UA_PubSubState state, UA_StatusCode reason) {
-    ck_assert(hostServer == server);
+    CHK_UNLOCK(&hostServer->serviceMutex, hostServer == server);
 
     /* Disable some checks during shutdown */
     if(!runtime)
@@ -744,18 +750,18 @@ PubSubStateChangeCallback_different_timeouts(UA_Server *hostServer, UA_NodeId *p
     UA_String_clear(&strId);
 
     if(ExpectedCallbackStateChange == UA_PUBSUBSTATE_OPERATIONAL) {
-        ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL ||
-                  state == UA_PUBSUBSTATE_PREOPERATIONAL);
+        CHK_UNLOCK(&hostServer->serviceMutex, state == UA_PUBSUBSTATE_OPERATIONAL ||
+                   state == UA_PUBSUBSTATE_PREOPERATIONAL);
     } else {
-        ck_assert(ExpectedCallbackStateChange == state);
+        CHK_UNLOCK(&hostServer->serviceMutex, ExpectedCallbackStateChange == state);
     }
-    ck_assert(ExpectedCallbackStatus == reason);
+    CHK_UNLOCK(&hostServer->serviceMutex, ExpectedCallbackStatus == reason);
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): "
         "Callback Cnt = %u", CallbackCnt);
 
     if(ExpectedCallbackCnt > 0) {
-        ck_assert(CallbackCnt <= ExpectedCallbackCnt);
+        CHK_UNLOCK(&hostServer->serviceMutex, CallbackCnt <= ExpectedCallbackCnt);
         /* UA_String_init(&strId); */
         /* UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId); */
         /* UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): " */
@@ -964,7 +970,7 @@ static void
 PubSubStateChangeCallback_wrong_timeout (UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                          UA_PubSubState state, UA_StatusCode reason) {
 
-    ck_assert(hostServer == server);
+    CHK_UNLOCK(&hostServer->serviceMutex, hostServer == server);
 
     UA_String strId;
     UA_String_init(&strId);
@@ -1082,7 +1088,7 @@ START_TEST(Test_wrong_timeout) {
 /* static void */
 /* PubSubStateChangeCallback_many_components(UA_Server *hostServer, UA_NodeId *pubsubComponentId, */
 /*                                           UA_PubSubState state, UA_StatusCode reason) { */
-/*     ck_assert(hostServer == server); */
+/*     CHK_UNLOCK(&hostServer->serviceMutex, hostServer == server); */
 
 /*     if(!runtime) */
 /*         return; */
@@ -1095,7 +1101,7 @@ START_TEST(Test_wrong_timeout) {
 /*     UA_String_clear(&strId); */
 
 /*     if(ExpectedCallbackCnt > 0) { */
-/*         ck_assert(CallbackCnt <= ExpectedCallbackCnt); */
+/*         CHK_UNLOCK(&hostServer->serviceMutex, CallbackCnt <= ExpectedCallbackCnt); */
 /*         UA_String_init(&strId); */
 /*         UA_NodeId_print(&(pExpectedComponentCallbackIds[CallbackCnt]), &strId); */
 /*         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PubSubStateChangeCallback(): " */
@@ -1104,16 +1110,16 @@ START_TEST(Test_wrong_timeout) {
 /*     } */
 
 /*     if(ExpectedCallbackStateChange == UA_PUBSUBSTATE_OPERATIONAL) { */
-/*         ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL || */
+/*         CHK_UNLOCK(&hostServer->serviceMutex, state == UA_PUBSUBSTATE_OPERATIONAL || */
 /*                   state == UA_PUBSUBSTATE_PREOPERATIONAL); */
 /*     } else { */
-/*         ck_assert(ExpectedCallbackStateChange == state); */
+/*         CHK_UNLOCK(&hostServer->serviceMutex, ExpectedCallbackStateChange == state); */
 /*     } */
 
-/*     ck_assert(reason == ExpectedCallbackStatus); */
+/*     CHK_UNLOCK(&hostServer->serviceMutex, reason == ExpectedCallbackStatus); */
 /*     if (ExpectedCallbackStateChange == UA_PUBSUBSTATE_ERROR) { */
 /*         /\*  On error we want to verify the order of DataSetReader timeouts *\/ */
-/*         ck_assert(UA_NodeId_equal(pubsubComponentId, &pExpectedComponentCallbackIds[CallbackCnt]) == UA_TRUE); */
+/*         CHK_UNLOCK(&hostServer->serviceMutex, UA_NodeId_equal(pubsubComponentId, &pExpectedComponentCallbackIds[CallbackCnt]) == UA_TRUE); */
 /*     } /\* when the state is set back to operational we cannot verify the order of StateChanges, because we */
 /*             cannot know which DataSetReader will be operational first *\/ */
 /*     CallbackCnt++; */
@@ -1663,7 +1669,7 @@ START_TEST(Test_wrong_timeout) {
 static void
 PubSubStateChangeCallback_update_config(UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                         UA_PubSubState state, UA_StatusCode reason) {
-    ck_assert(hostServer == server);
+    CHK_UNLOCK(&hostServer->serviceMutex, hostServer == server);
 
     if(!runtime)
         return;
@@ -1678,8 +1684,8 @@ PubSubStateChangeCallback_update_config(UA_Server *hostServer, UA_NodeId *pubsub
     UA_String_clear(&strId);
 
     if (UA_NodeId_equal(pubsubComponentId, &ExpectedCallbackComponentNodeId) == UA_TRUE) {
-        ck_assert(ExpectedCallbackStateChange == state);
-        ck_assert(ExpectedCallbackStatus == reason);
+        CHK_UNLOCK(&hostServer->serviceMutex, ExpectedCallbackStateChange == state);
+        CHK_UNLOCK(&hostServer->serviceMutex, ExpectedCallbackStatus == reason);
         CallbackCnt++;
     }
 }
@@ -1849,7 +1855,7 @@ START_TEST(Test_add_remove) {
 static void
 PubSubStateChangeCallback_fast_path (UA_Server *hostServer, UA_NodeId *pubsubComponentId,
                                      UA_PubSubState state, UA_StatusCode reason) {
-    ck_assert(hostServer == server);
+    CHK_UNLOCK(&hostServer->serviceMutex, hostServer == server);
 
     UA_String strId;
     UA_String_init(&strId);
@@ -1863,8 +1869,8 @@ PubSubStateChangeCallback_fast_path (UA_Server *hostServer, UA_NodeId *pubsubCom
         if(state == UA_PUBSUBSTATE_PREOPERATIONAL &&
            ExpectedCallbackStateChange == UA_PUBSUBSTATE_OPERATIONAL)
             state = UA_PUBSUBSTATE_OPERATIONAL;
-        ck_assert(ExpectedCallbackStateChange == state);
-        ck_assert(ExpectedCallbackStatus == reason);
+        CHK_UNLOCK(&hostServer->serviceMutex, ExpectedCallbackStateChange == state);
+        CHK_UNLOCK(&hostServer->serviceMutex, ExpectedCallbackStatus == reason);
         CallbackCnt++;
     }
 }

From 0f0bd09f005057e98880a67ce7d45283a3836d86 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 21 Aug 2023 10:56:07 +0200
Subject: [PATCH 1142/1963] fix(tests): Reset expected cb counter in
 check_pubsub_subscribe_msgrcvtimeoout

---
 tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index ef0ed00dee0..516f1db747e 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -902,6 +902,8 @@ START_TEST(Test_different_timeouts) {
     /* check that callback has been called for writer and reader groups and datasets */
     ck_assert_int_eq(ExpectedCallbackCnt, CallbackCnt);
     CallbackCnt = 0;
+    /* disable callback cnt check */
+    ExpectedCallbackCnt = 0;
 
     /* check that all dataset writers- and readers are operational */
     UA_PubSubState state = UA_PUBSUBSTATE_DISABLED;
@@ -927,6 +929,7 @@ START_TEST(Test_different_timeouts) {
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "disable writergroup");
     ExpectedCallbackCnt = 2;
+    CallbackCnt = 0;
     pExpectedComponentCallbackIds[0] = DsWId_Conn1_WG1_DS1;
     pExpectedComponentCallbackIds[1] = WGId_Conn1_WG1;
     ExpectedCallbackStatus = UA_STATUSCODE_BADRESOURCEUNAVAILABLE;

From 03fc833b90d04bfa2b051dc3847cb9a151182aa0 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 17 Aug 2023 11:20:23 +0200
Subject: [PATCH 1143/1963] fix(pubsub): Set reader group to operational

If the function UA_PubSubConnection_setPubSubState is used
with UA_PUBSUBSTATE_OPERATIONAL in state UA_PUBSUBSTATE_PREOPERATIONAL,
the state is reset to UA_PUBSUBSTATE_PREOPERATIONAL internally.
Thus the state has to be set manually (like in ua_pubsub_eventloop.c)
and the user callback has to be called.
---
 src/pubsub/ua_pubsub_reader.c                  | 18 ++++++++++++------
 .../check_pubsub_subscribe_msgrcvtimeout.c     | 13 ++++++++-----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 90de9178923..24960d91fc1 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1099,9 +1099,12 @@ UA_ReaderGroup_process(UA_Server *server, UA_ReaderGroup *readerGroup,
     /* Received a (first) message for the ReaderGroup.
      * Transition from PreOperational to Operational. */
     if(readerGroup->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
-        UA_ReaderGroup_setPubSubState(server, readerGroup,
-                                      UA_PUBSUBSTATE_OPERATIONAL,
-                                      UA_STATUSCODE_GOOD);
+        readerGroup->state = UA_PUBSUBSTATE_OPERATIONAL;
+        UA_ServerConfig *config = &server->config;
+        if(config->pubSubConfig.stateChangeCallback != 0) {
+            config->pubSubConfig.stateChangeCallback(server, &readerGroup->identifier,
+                                                     readerGroup->state, UA_STATUSCODE_GOOD);
+        }
     }
     LIST_FOREACH(reader, &readerGroup->readers, listEntry) {
         UA_StatusCode res =
@@ -1160,9 +1163,12 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
     /* If pre-operational, set to operational after the first message was
      * processed */
     if(rg->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
-        rv = UA_ReaderGroup_setPubSubState(server, rg,
-                                           UA_PUBSUBSTATE_OPERATIONAL,
-                                           UA_STATUSCODE_GOOD);
+        rg->state = UA_PUBSUBSTATE_OPERATIONAL;
+        UA_ServerConfig *config = &server->config;
+        if(config->pubSubConfig.stateChangeCallback != 0) {
+            config->pubSubConfig.stateChangeCallback(server, &rg->identifier,
+                                                     rg->state, UA_STATUSCODE_GOOD);
+        }
     }
 
     return rv;
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 516f1db747e..26f6c0716d5 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -540,7 +540,7 @@ START_TEST(Test_basic) {
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_DISABLED);
 
-    /* state change to operational of WriterGroup */
+    /* state change to operational of ReaderGroup */
     ExpectedCallbackCnt = 2;
     pExpectedComponentCallbackIds[0] = DSRId_Conn2_RG1_DSR1;
     pExpectedComponentCallbackIds[1] = RGId_Conn2_RG1;
@@ -567,11 +567,14 @@ START_TEST(Test_basic) {
 
     ValidatePublishSubscribe(VarId_Conn1_WG1, VarId_Conn2_RG1_DSR1, 44, (UA_UInt32) PublishingInterval_Conn1WG1, 3);
 
+    ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
 
-    /* there should not be a callback notification for MessageReceiveTimeout */
-    ck_assert(CallbackCnt == 0);
+    /* check that callback has been called for reader group */
+    ck_assert_int_eq(1, CallbackCnt);
+    CallbackCnt = 0;
 
     /* now we disable the publisher WriterGroup and check if a MessageReceiveTimeout occurs at Subscriber */
     ExpectedCallbackCnt = 2;
@@ -604,7 +607,7 @@ START_TEST(Test_basic) {
 
     /* state of ReaderGroup should still be ok */
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
      /* but DataSetReader state shall be error */
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_ERROR);
@@ -2003,7 +2006,7 @@ START_TEST(Test_fast_path) {
 
     /* state of ReaderGroup should still be ok */
     ck_assert(UA_Server_ReaderGroup_getState(server, RGId_Conn2_RG1, &state) == UA_STATUSCODE_GOOD);
-    ck_assert(state == UA_PUBSUBSTATE_PREOPERATIONAL);
+    ck_assert(state == UA_PUBSUBSTATE_OPERATIONAL);
      /* but DataSetReader state shall be error */
     ck_assert(UA_Server_DataSetReader_getState(server, DSRId_Conn2_RG1_DSR1, &state) == UA_STATUSCODE_GOOD);
     ck_assert(state == UA_PUBSUBSTATE_ERROR);

From ee9e266bb7382f87ecd178acf5a3d61ead074cb3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 25 Aug 2023 23:42:37 +0200
Subject: [PATCH 1144/1963] refactor(build): Use add_compile_options in CMake
 instead of editing env strings

---
 CMakeLists.txt | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26b632ac8ec..da6c8e5bb9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,8 +272,7 @@ if(UA_ENABLE_CLANG_COV)
     if(UA_ENABLE_COVERAGE)
         message(FATAL_ERROR "Only either clang cov or normal coverage is allowed.")
     endif()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
+    add_compile_options(-fprofile-instr-generate -fcoverage-mapping)
 endif()
 
 if(UA_ENABLE_DISCOVERY_MULTICAST AND NOT UA_ENABLE_DISCOVERY)
@@ -551,12 +550,12 @@ endif()
 # Taken from https://stackoverflow.com/a/33266748
 include(CheckCCompilerFlag)
 function(check_add_cc_flag CC_FLAG)
-    string(FIND "${CMAKE_C_FLAGS}" "${CC_FLAG}" flag_already_set)
+    list(FIND COMPILE_OPTIONS ${CC_FLAG} flag_already_set)
     if(flag_already_set EQUAL -1)
         message(STATUS "Test CC flag ${CC_FLAG}")
-        check_c_compiler_flag("${CC_FLAG}" flag_supported)
+        check_c_compiler_flag(${CC_FLAG} flag_supported)
         if(flag_supported)
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CC_FLAG}" PARENT_SCOPE)
+            add_compile_options(${CC_FLAG})
         endif()
         unset(flag_supported CACHE)
     endif()
@@ -665,8 +664,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         if(CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
             set(SANITIZER_FLAGS "${SANITIZER_FLAGS} -fsanitize-coverage=trace-pc-guard")
         endif()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_FLAGS}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_FLAGS}")
+        add_compile_options(${SANITIZER_FLAGS})
     endif()
 
     if(NOT MINGW AND UA_ENABLE_HARDENING AND ((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")))
@@ -685,28 +683,25 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         # remove stack-protector with MinSizeRel
         if(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
             check_add_cc_flag("-fno-stack-protector")
+            if(NOT WIN32 AND NOT CYGWIN AND NOT APPLE)
+                # these settings reduce the binary size by ~2kb
+                add_link_options(-Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none)
+            endif()
         endif()
         if(NOT OS9)
-            set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -s")
-            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -s")
+            add_link_options(-s)
         endif()
         if(APPLE)
-            set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,-dead_strip")
-            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-dead_strip")
+            add_link_options(-Wl,-dead_strip)
         else()
-            set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--gc-sections")
-            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections")
-        endif()
-        if(NOT WIN32 AND NOT CYGWIN AND NOT APPLE)
-            # these settings reduce the binary size by ~2kb
-            set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none")
+            add_link_options(-Wl,--gc-sections)
         endif()
     endif()
 endif()
 
 if(APPLE)
     set(CMAKE_MACOSX_RPATH 1)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DARWIN_C_SOURCE=1")
+    add_compile_options(-D_DARWIN_C_SOURCE=1)
 endif()
 
 if(MSVC)

From 7aa5455b476aa187676e782ff15e9e219d60050d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 27 Aug 2023 11:36:39 +0200
Subject: [PATCH 1145/1963] refactor(server): Remove dead code in
 ua_server_binary.c

---
 src/server/ua_server_binary.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index f0cae3fe9ff..7394641770d 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -281,7 +281,6 @@ getServicePointers(UA_UInt32 requestTypeId, const UA_DataType **requestType,
         *responseType = &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE];
         break;
     case UA_NS0ID_READREQUEST_ENCODING_DEFAULTBINARY:
-        *service = NULL;
         *service = (UA_Service)Service_Read;
         *requestType = &UA_TYPES[UA_TYPES_READREQUEST];
         *responseType = &UA_TYPES[UA_TYPES_READRESPONSE];

From b59324ac83a5310fd950ad4404a94fa7a197f742 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 27 Aug 2023 12:12:46 +0200
Subject: [PATCH 1146/1963] refactor(server): UA_AsyncManager_sendAsyncResponse
 does not return StatusCode

Handle / log potential failures internally.
---
 src/server/ua_server_async.c | 47 ++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index b4854bc82fc..78bb9df4965 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -17,43 +17,48 @@ UA_AsyncOperation_delete(UA_AsyncOperation *ar) {
     UA_free(ar);
 }
 
-static UA_StatusCode
+static void
 UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
                                   UA_AsyncResponse *ar) {
     /* Get the session */
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_Session* session = getSessionById(server, &ar->sessionId);
-    UA_SecureChannel* channel = NULL;
-    UA_ResponseHeader *responseHeader = NULL;
     if(!session) {
-        res = UA_STATUSCODE_BADSESSIONIDINVALID;
+        UA_String sessionId = UA_STRING_NULL;
+        UA_NodeId_print(&ar->sessionId, &sessionId);
         UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "UA_Server_InsertMethodResponse: Session is gone");
-        goto clean_up;
+                       "Async Service: Session %.*s no longer exists",
+                       (int)sessionId.length, sessionId.data);
+        UA_String_clear(&sessionId);
+        UA_AsyncManager_removeAsyncResponse(&server->asyncManager, ar);
+        return;
     }
 
     /* Check the channel */
-    channel = session->header.channel;
+    UA_SecureChannel *channel = session->header.channel;
     if(!channel) {
-        res = UA_STATUSCODE_BADSECURECHANNELCLOSED;
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "UA_Server_InsertMethodResponse: Channel is gone");
-        goto clean_up;
+        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                               "Async Service Response cannot be sent. "
+                               "No SecureChannel for the session.");
+        UA_AsyncManager_removeAsyncResponse(&server->asyncManager, ar);
+        return;
     }
 
-    /* Okay, here we go, send the UA_CallResponse */
-    responseHeader = (UA_ResponseHeader*)
+    /* Set the request handle */
+    UA_ResponseHeader *responseHeader = (UA_ResponseHeader*)
         &ar->response.callResponse.responseHeader;
     responseHeader->requestHandle = ar->requestHandle;
-    res = sendResponse(server, session, channel, ar->requestId,
-                       (UA_Response*)&ar->response, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "UA_Server_SendResponse: Response for Req# %" PRIu32 " sent", ar->requestId);
 
- clean_up:
-    /* Remove from the AsyncManager */
+    /* Send the Response */
+    UA_StatusCode res =
+        sendResponse(server, session, channel, ar->requestId,
+                     (UA_Response*)&ar->response, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
     UA_AsyncManager_removeAsyncResponse(&server->asyncManager, ar);
-    return res;
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+                               "Async Response for Req# %" PRIu32 " failed "
+                               "with StatusCode %s", ar->requestId,
+                               UA_StatusCode_name(res));
+    }
 }
 
 /* Integrate operation result in the AsyncResponse and send out the response if

From 252d7f5ed59769f4fded2008515831c4f35f685f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 28 Aug 2023 17:25:31 +0200
Subject: [PATCH 1147/1963] refactor(server): Count number of dispatched async
 services

---
 src/server/ua_server_async.c | 47 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 78bb9df4965..57cfc3506d1 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -63,16 +63,16 @@ UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
 
 /* Integrate operation result in the AsyncResponse and send out the response if
  * it is ready. */
-static void
+static UA_Boolean
 integrateOperationResult(UA_AsyncManager *am, UA_Server *server,
                          UA_AsyncOperation *ao) {
+    UA_LOCK_ASSERT(&am->queueLock, 1);
+
     /* Grab the open request, so we can continue to construct the response */
     UA_AsyncResponse *ar = ao->parent;
 
     /* Reduce the number of open results */
-    UA_LOCK(&am->queueLock);
     ar->opCountdown -= 1;
-    UA_UNLOCK(&am->queueLock);
 
     UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
                  "Return result in the server thread with %" PRIu32 " remaining",
@@ -82,33 +82,32 @@ integrateOperationResult(UA_AsyncManager *am, UA_Server *server,
     ar->response.callResponse.results[ao->index] = ao->response;
     UA_CallMethodResult_init(&ao->response);
 
-    /* Are we done with all operations? */
-    if(ar->opCountdown == 0) {
-        UA_LOCK(&server->serviceMutex);
+    /* Done with all operations -> send the response */
+    UA_Boolean done = (ar->opCountdown == 0);
+    if(done)
         UA_AsyncManager_sendAsyncResponse(am, server, ar);
-        UA_UNLOCK(&server->serviceMutex);
-    }
+    return done;
 }
 
 /* Process all operations in the result queue -> move content over to the
- * AsyncResponse. This is only done by the server thread. */
-static void
-processAsyncResults(UA_Server *server, void *data) {
+ * AsyncResponse. This is only done by the server thread. Returns the nmber of
+ * completed async sesponses. */
+static UA_UInt32
+processAsyncResults(UA_Server *server) {
+    UA_UInt32 count = 0;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_AsyncManager *am = &server->asyncManager;
-    while(true) {
-        UA_LOCK(&am->queueLock);
-        UA_AsyncOperation *ao = TAILQ_FIRST(&am->resultQueue);
-        if(ao)
-            TAILQ_REMOVE(&am->resultQueue, ao, pointers);
-        UA_UNLOCK(&am->queueLock);
-        if(!ao)
-            break;
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "UA_Server_CallMethodResponse: Got Response: OKAY");
-        integrateOperationResult(am, server, ao);
+    UA_AsyncOperation *ao;
+    UA_LOCK(&am->queueLock);
+    while((ao = TAILQ_FIRST(&am->resultQueue))) {
+        TAILQ_REMOVE(&am->resultQueue, ao, pointers);
+        if(integrateOperationResult(am, server, ao))
+            count++;
         UA_AsyncOperation_delete(ao);
         am->opsCount--;
     }
+    UA_UNLOCK(&am->queueLock);
+    return count;
 }
 
 /* Check if any operations have timed out */
@@ -155,7 +154,9 @@ checkTimeouts(UA_Server *server, void *_) {
     UA_UNLOCK(&am->queueLock);
 
     /* Integrate async results and send out complete responses */
-    processAsyncResults(server, NULL);
+    UA_LOCK(&server->serviceMutex);
+    processAsyncResults(server);
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 void

From 9bc6318b62ff112fab20dcf67ce2794f7e68ab4e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 27 Aug 2023 11:35:38 +0200
Subject: [PATCH 1148/1963] feat(server): Implement the Cancel services

---
 src/server/ua_server_async.c       | 45 +++++++++++++++++++++++++++++-
 src/server/ua_server_async.h       |  6 ++++
 src/server/ua_server_binary.c      |  5 ++++
 src/server/ua_services.h           |  4 ++-
 src/server/ua_services_session.c   | 41 +++++++++++++++++++++++++++
 tools/schema/datatypes_minimal.txt |  4 ++-
 6 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 57cfc3506d1..4fc841fc76f 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -52,13 +52,13 @@ UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
     UA_StatusCode res =
         sendResponse(server, session, channel, ar->requestId,
                      (UA_Response*)&ar->response, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
-    UA_AsyncManager_removeAsyncResponse(&server->asyncManager, ar);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_SESSION(&server->config.logger, session,
                                "Async Response for Req# %" PRIu32 " failed "
                                "with StatusCode %s", ar->requestId,
                                UA_StatusCode_name(res));
     }
+    UA_AsyncManager_removeAsyncResponse(&server->asyncManager, ar);
 }
 
 /* Integrate operation result in the AsyncResponse and send out the response if
@@ -429,4 +429,47 @@ UA_Server_processServiceOperationsAsync(UA_Server *server, UA_Session *session,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_UInt32
+UA_AsyncManager_cancel(UA_Server *server, UA_Session *session, UA_UInt32 requestHandle) {
+    UA_LOCK(&server->serviceMutex);
+    UA_AsyncManager *am = &server->asyncManager;
+
+    /* Loop over the queue of dispatched ops */
+    UA_AsyncOperation *op = NULL, *op_tmp = NULL;
+    TAILQ_FOREACH_SAFE(op, &am->dispatchedQueue, pointers, op_tmp) {
+        if(op->parent->requestHandle != requestHandle ||
+           !UA_NodeId_equal(&session->sessionId, &op->parent->sessionId))
+            continue;
+
+        /* Set status and put it into the result queue */
+        op->response.statusCode = UA_STATUSCODE_BADREQUESTCANCELLEDBYCLIENT;
+        TAILQ_REMOVE(&am->dispatchedQueue, op, pointers);
+        TAILQ_INSERT_TAIL(&am->resultQueue, op, pointers);
+
+        /* Also set the status of the overall response */
+        op->parent->response.callResponse.responseHeader.
+            serviceResult = UA_STATUSCODE_BADREQUESTCANCELLEDBYCLIENT;
+    }
+
+    /* Idem for waiting ops */
+    TAILQ_FOREACH_SAFE(op, &am->newQueue, pointers, op_tmp) {
+        if(op->parent->requestHandle != requestHandle ||
+           !UA_NodeId_equal(&session->sessionId, &op->parent->sessionId))
+            continue;
+
+        /* Mark as timed out and put it into the result queue */
+        op->response.statusCode = UA_STATUSCODE_BADREQUESTCANCELLEDBYCLIENT;
+        TAILQ_REMOVE(&am->newQueue, op, pointers);
+        TAILQ_INSERT_TAIL(&am->resultQueue, op, pointers);
+
+        op->parent->response.callResponse.responseHeader.
+            serviceResult = UA_STATUSCODE_BADREQUESTCANCELLEDBYCLIENT;
+    }
+
+    UA_UNLOCK(&server->serviceMutex);
+
+    /* Process messages that have all ops completed */
+    return processAsyncResults(server);
+}
+
 #endif
diff --git a/src/server/ua_server_async.h b/src/server/ua_server_async.h
index 3c7c539486e..a0bbc619b60 100644
--- a/src/server/ua_server_async.h
+++ b/src/server/ua_server_async.h
@@ -93,6 +93,12 @@ UA_AsyncManager_createAsyncOp(UA_AsyncManager *am, UA_Server *server,
                               UA_AsyncResponse *ar, size_t opIndex,
                               const UA_CallMethodRequest *opRequest);
 
+/* Send out the response with status set. Also removes all outstanding
+ * operations from the dispatch queue. The queuelock needs to be taken before
+ * calling _cancel. */
+UA_UInt32
+UA_AsyncManager_cancel(UA_Server *server, UA_Session *session, UA_UInt32 requestHandle);
+
 typedef void (*UA_AsyncServiceOperation)(UA_Server *server, UA_Session *session,
                                          UA_UInt32 requestId, UA_UInt32 requestHandle,
                                          size_t opIndex, const void *requestOperation,
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 7394641770d..9da611fdf81 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -280,6 +280,11 @@ getServicePointers(UA_UInt32 requestTypeId, const UA_DataType **requestType,
         *requestType = &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST];
         *responseType = &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE];
         break;
+    case UA_NS0ID_CANCELREQUEST_ENCODING_DEFAULTBINARY:
+        *service = (UA_Service)Service_Cancel;
+        *requestType = &UA_TYPES[UA_TYPES_CANCELREQUEST];
+        *responseType = &UA_TYPES[UA_TYPES_CANCELRESPONSE];
+        break;
     case UA_NS0ID_READREQUEST_ENCODING_DEFAULTBINARY:
         *service = (UA_Service)Service_Read;
         *requestType = &UA_TYPES[UA_TYPES_READREQUEST];
diff --git a/src/server/ua_services.h b/src/server/ua_services.h
index bc1ffc986fe..61928558904 100644
--- a/src/server/ua_services.h
+++ b/src/server/ua_services.h
@@ -172,7 +172,9 @@ void Service_CloseSession(UA_Server *server, UA_SecureChannel *channel,
  * ^^^^^^^^^^^^^^
  * Used to cancel outstanding Service requests. Successfully cancelled service
  * requests shall respond with Bad_RequestCancelledByClient. */
-/* Not Implemented */
+void Service_Cancel(UA_Server *server, UA_Session *session,
+                    const UA_CancelRequest *request,
+                    UA_CancelResponse *response);
 
 /**
  * NodeManagement Service Set
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 98efb01dd1b..b2a421b2637 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -940,3 +940,44 @@ Service_CloseSession(UA_Server *server, UA_SecureChannel *channel,
         UA_Server_removeSessionByToken(server, &session->header.authenticationToken,
                                        UA_SHUTDOWNREASON_CLOSE);
 }
+
+void Service_Cancel(UA_Server *server, UA_Session *session,
+                    const UA_CancelRequest *request,
+                    UA_CancelResponse *response) {
+    /* If multithreading is disabled, then there are no async services. If all
+     * services are answered "right away", then there are no services that can
+     * be cancelled. */
+#if UA_MULTITHREADING >= 100
+    response->cancelCount = UA_AsyncManager_cancel(server, session, request->requestHandle);
+#endif
+
+    /* Publish requests for Subscriptions are stored separately */
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+    UA_PublishResponseEntry *pre, *pre_tmp;
+    UA_PublishResponseEntry *prev = NULL;
+    SIMPLEQ_FOREACH_SAFE(pre, &session->responseQueue, listEntry, pre_tmp) {
+        /* Skip entry and set as the previous entry that is kept in the list */
+        if(pre->response.responseHeader.requestHandle != request->requestHandle) {
+            prev = pre;
+            continue;
+        }
+
+        /* Dequeue */
+        if(prev)
+            SIMPLEQ_REMOVE_AFTER(&session->responseQueue, prev, listEntry);
+        else
+            SIMPLEQ_REMOVE_HEAD(&session->responseQueue, listEntry);
+        session->responseQueueSize--;
+
+        /* Send response and clean up */
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADREQUESTCANCELLEDBYCLIENT;
+        sendResponse(server, session, session->header.channel, pre->requestId,
+                     (UA_Response *)response, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+        UA_PublishResponse_clear(&pre->response);
+        UA_free(pre);
+
+        /* Increase the CancelCount */
+        response->cancelCount++;
+    }
+#endif
+}
diff --git a/tools/schema/datatypes_minimal.txt b/tools/schema/datatypes_minimal.txt
index 8578e227f2d..64fc1679185 100644
--- a/tools/schema/datatypes_minimal.txt
+++ b/tools/schema/datatypes_minimal.txt
@@ -117,4 +117,6 @@ ServerState
 ServerDiagnosticsSummaryDataType
 RedundancySupport
 KeyValuePair
-NamingRuleType
\ No newline at end of file
+NamingRuleType
+CancelRequest
+CancelResponse

From 79186dfb3756018ceaae466e37cecabb6cc463e5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 28 Aug 2023 23:26:08 +0200
Subject: [PATCH 1149/1963] feat(client): Support cancelling of async requests

---
 include/open62541/client.h      | 65 +++++++++++++++++++--------------
 src/client/ua_client.c          | 53 ++++++++++++++++++++++++++-
 src/client/ua_client_internal.h |  9 +++--
 3 files changed, 95 insertions(+), 32 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 23dcd80d453..8be9de4616d 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -726,27 +726,18 @@ UA_Client_Service_queryNext(UA_Client *client,
  * ---------------------
  * All OPC UA services are asynchronous in nature. So several service calls can
  * be made without waiting for the individual responses. Depending on the
- * server's priorities responses may come in a different ordering than sent.
- *
- * As noted in :ref:`the client overview<client>` currently no means
- * of handling asynchronous events automatically is provided. However, some
- * synchronous function calls will trigger handling, but to ensure this
- * happens a client should periodically call `UA_Client_run_iterate`
- * explicitly.
- *
- * Connection and session management are also performed in
- * `UA_Client_run_iterate`, so to keep a connection healthy any client needs to
- * consider how and when it is appropriate to do the call.
- * This is especially true for the periodic renewal of a SecureChannel's
- * SecurityToken which is designed to have a limited lifetime and will
- * invalidate the connection if not renewed.
- *
- * Use the typed wrappers instead of `__UA_Client_AsyncService` directly. See
- * :ref:`client_async`. However, the general mechanism of async service calls is
- * explained here.
- */
-
-/* We say that an async service call has been dispatched once
+ * server's priorities responses may come in a different ordering than sent. Use
+ * the typed wrappers for async service requests instead of
+ * `__UA_Client_AsyncService` directly. See :ref:`client_async`. However, the
+ * general mechanism of async service calls is explained here.
+ *
+ * Connection and session management are performed in `UA_Client_run_iterate`,
+ * so to keep a connection healthy any client needs to consider how and when it
+ * is appropriate to do the call. This is especially true for the periodic
+ * renewal of a SecureChannel's SecurityToken which is designed to have a
+ * limited lifetime and will invalidate the connection if not renewed.
+ *
+ * We say that an async service call has been dispatched once
  * __UA_Client_AsyncService returns UA_STATUSCODE_GOOD. If there is an error
  * after an async service has been dispatched, the callback is called with an
  * "empty" response where the StatusCode has been set accordingly. This is also
@@ -754,13 +745,18 @@ UA_Client_Service_queryNext(UA_Client *client,
  * is emptied.
  *
  * The StatusCode received when the client is shutting down is
- * UA_STATUSCODE_BADSHUTDOWN.
- *
- * The StatusCode received when the client doesn't receive response after the
- * specified in config->timeout (can be overridden via the "timeoutHint" in the
- * request header) is UA_STATUSCODE_BADTIMEOUT.
- *
- * The userdata and requestId arguments can be NULL. */
+ * UA_STATUSCODE_BADSHUTDOWN. The StatusCode received when the client doesn't
+ * receive response after the specified in config->timeout (can be overridden
+ * via the "timeoutHint" in the request header) is UA_STATUSCODE_BADTIMEOUT.
+ *
+ * The userdata and requestId arguments can be NULL. The (optional) requestId
+ * output can be used to cancel the service while it is still pending. The
+ * requestId is unique for each service request. Alternatively the requestHandle
+ * can be manually set (non necessarily unique) in the request header for full
+ * service call. This can be used to cancel all outstanding requests using that
+ * handle together. Note that the client will auto-generate a requestHandle
+ * >100,000 if none is defined. Avoid these when manually setting a requetHandle
+ * in the requestHeader to avoid clashes. */
 
 typedef void (*UA_ClientAsyncServiceCallback)(UA_Client *client, void *userdata,
                                               UA_UInt32 requestId, void *response);
@@ -772,6 +768,19 @@ __UA_Client_AsyncService(UA_Client *client, const void *request,
                          const UA_DataType *responseType,
                          void *userdata, UA_UInt32 *requestId);
 
+/* Cancel all dispatched requests with the given requestHandle.
+ * The number if cancelled requests is returned by the server.
+ * The output argument cancelCount is not set if NULL. */
+UA_EXPORT UA_THREADSAFE UA_StatusCode
+UA_Client_cancelByRequestHandle(UA_Client *client, UA_UInt32 requestHandle,
+                                UA_UInt32 *cancelCount);
+
+/* Map the requestId to the requestHandle used for that request and call the
+ * Cancel service for that requestHandle. */
+UA_EXPORT UA_THREADSAFE UA_StatusCode
+UA_Client_cancelByRequestId(UA_Client *client, UA_UInt32 requestId,
+                            UA_UInt32 *cancelCount);
+
 /* Set new userdata and callback for an existing request.
  *
  * @param client Pointer to the UA_Client
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index b18d5d10a79..d80d3c2ffa2 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -362,7 +362,15 @@ sendRequest(UA_Client *client, const void *request,
     UA_NodeId oldToken = rr->authenticationToken; /* Put back in place later */
     rr->authenticationToken = client->authenticationToken;
     rr->timestamp = UA_DateTime_now();
-    rr->requestHandle = ++client->requestHandle;
+
+    /* Create a unique handle >100,000 if not manually defined. The handle is
+     * not necessarily unique when manually defined and used to cancel async
+     * service requests. */
+    if(rr->requestHandle == 0) {
+        if(UA_UNLIKELY(client->requestHandle < 100000))
+            client->requestHandle = 100000;
+        rr->requestHandle = ++client->requestHandle;
+    }
 
     /* Set the timeout hint if not manually defined */
     if(rr->timeoutHint == 0)
@@ -625,6 +633,7 @@ __Client_Service(UA_Client *client, const void *request,
     ac.requestId = requestId;
     ac.start = UA_DateTime_nowMonotonic(); /* Start timeout after sending */
     ac.timeout = rh->timeoutHint;
+    ac.requestHandle = rh->requestHandle;
     if(ac.timeout == 0)
         ac.timeout = UA_UINT32_MAX; /* 0 -> unlimited */
 
@@ -809,6 +818,7 @@ __Client_AsyncService(UA_Client *client, const void *request,
     ac->syncResponse = NULL;
     ac->start = UA_DateTime_nowMonotonic();
     ac->timeout = rh->timeoutHint;
+    ac->requestHandle = rh->requestHandle;
     if(ac->timeout == 0)
         ac->timeout = UA_UINT32_MAX; /* 0 -> unlimited */
 
@@ -838,6 +848,47 @@ __UA_Client_AsyncService(UA_Client *client, const void *request,
     return res;
 }
 
+static UA_StatusCode
+cancelByRequestHandle(UA_Client *client, UA_UInt32 requestHandle, UA_UInt32 *cancelCount) {
+    UA_CancelRequest creq;
+    UA_CancelRequest_init(&creq);
+    creq.requestHandle = requestHandle;
+    UA_CancelResponse cresp;
+    UA_CancelResponse_init(&cresp);
+    __Client_Service(client, &creq, &UA_TYPES[UA_TYPES_CANCELREQUEST],
+                     &cresp, &UA_TYPES[UA_TYPES_CANCELRESPONSE]);
+    if(cancelCount)
+        *cancelCount = cresp.cancelCount;
+    UA_StatusCode res = cresp.responseHeader.serviceResult;
+    UA_CancelResponse_clear(&cresp);
+    return res;
+}
+
+UA_StatusCode
+UA_Client_cancelByRequestHandle(UA_Client *client, UA_UInt32 requestHandle,
+                                UA_UInt32 *cancelCount) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = cancelByRequestHandle(client, requestHandle, cancelCount);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_Client_cancelByRequestId(UA_Client *client, UA_UInt32 requestId,
+                            UA_UInt32 *cancelCount) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
+    AsyncServiceCall *ac;
+    LIST_FOREACH(ac, &client->asyncServiceCalls, pointers) {
+        if(ac->requestId != requestId)
+            continue;
+        res = cancelByRequestHandle(client, ac->requestHandle, cancelCount);
+        break;
+    }
+    UA_UNLOCK(&client->clientMutex);
+    return res;
+}
+
 /*******************/
 /* Timed Callbacks */
 /*******************/
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 1011c5b18ce..2b7c4fd7ca6 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -82,7 +82,9 @@ __Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client);
 
 typedef struct AsyncServiceCall {
     LIST_ENTRY(AsyncServiceCall) pointers;
-    UA_UInt32 requestId;
+    UA_UInt32 requestId;     /* Unique id */
+    UA_UInt32 requestHandle; /* Potentially non-unique if manually defined in
+                              * the request header*/
     UA_ClientAsyncServiceCallback callback;
     const UA_DataType *responseType;
     void *userdata;
@@ -132,13 +134,14 @@ struct UA_Client {
 
     /* SecureChannel */
     UA_SecureChannel channel;
-    UA_UInt32 requestId;
+    UA_UInt32 requestId; /* Unique, internally defined for each request */
     UA_DateTime nextChannelRenewal;
 
     /* Session */
     UA_SessionState sessionState;
     UA_NodeId authenticationToken;
-    UA_UInt32 requestHandle;
+    UA_UInt32 requestHandle; /* Unique handles >100,000 are generated if the
+                              * request header contains a zero-handle. */
     UA_ByteString serverSessionNonce;
     UA_ByteString clientSessionNonce;
 

From 91e0efc0f52bf58c56d2f9b343cc7fe383ecc093 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 29 Aug 2023 17:35:36 +0200
Subject: [PATCH 1150/1963] refactor(server): Clarify the usage of the async
 queueLock

---
 src/server/ua_server_async.c | 16 ++++++++++++----
 src/server/ua_server_async.h |  5 ++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 4fc841fc76f..2d0bfe091ab 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -20,6 +20,9 @@ UA_AsyncOperation_delete(UA_AsyncOperation *ar) {
 static void
 UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
                                   UA_AsyncResponse *ar) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_LOCK_ASSERT(&am->queueLock, 1);
+
     /* Get the session */
     UA_Session* session = getSessionById(server, &ar->sessionId);
     if(!session) {
@@ -66,6 +69,7 @@ UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
 static UA_Boolean
 integrateOperationResult(UA_AsyncManager *am, UA_Server *server,
                          UA_AsyncOperation *ao) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOCK_ASSERT(&am->queueLock, 1);
 
     /* Grab the open request, so we can continue to construct the response */
@@ -94,9 +98,11 @@ integrateOperationResult(UA_AsyncManager *am, UA_Server *server,
  * completed async sesponses. */
 static UA_UInt32
 processAsyncResults(UA_Server *server) {
-    UA_UInt32 count = 0;
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_AsyncManager *am = &server->asyncManager;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_LOCK_ASSERT(&am->queueLock, 0);
+
+    UA_UInt32 count = 0;
     UA_AsyncOperation *ao;
     UA_LOCK(&am->queueLock);
     while((ao = TAILQ_FIRST(&am->resultQueue))) {
@@ -431,9 +437,11 @@ UA_Server_processServiceOperationsAsync(UA_Server *server, UA_Session *session,
 
 UA_UInt32
 UA_AsyncManager_cancel(UA_Server *server, UA_Session *session, UA_UInt32 requestHandle) {
-    UA_LOCK(&server->serviceMutex);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_AsyncManager *am = &server->asyncManager;
 
+    UA_LOCK(&am->queueLock);
+
     /* Loop over the queue of dispatched ops */
     UA_AsyncOperation *op = NULL, *op_tmp = NULL;
     TAILQ_FOREACH_SAFE(op, &am->dispatchedQueue, pointers, op_tmp) {
@@ -466,7 +474,7 @@ UA_AsyncManager_cancel(UA_Server *server, UA_Session *session, UA_UInt32 request
             serviceResult = UA_STATUSCODE_BADREQUESTCANCELLEDBYCLIENT;
     }
 
-    UA_UNLOCK(&server->serviceMutex);
+    UA_UNLOCK(&am->queueLock);
 
     /* Process messages that have all ops completed */
     return processAsyncResults(server);
diff --git a/src/server/ua_server_async.h b/src/server/ua_server_async.h
index a0bbc619b60..ecedc12f440 100644
--- a/src/server/ua_server_async.h
+++ b/src/server/ua_server_async.h
@@ -62,7 +62,10 @@ typedef struct {
 
     /* Operations for the workers. The queues are all FIFO: Put in at the tail,
      * take out at the head.*/
-    UA_Lock queueLock;
+    UA_Lock queueLock; /* Either take this lock free-standing (with no other
+                        * locks). Or take server->serviceMutex first and then
+                        * the queueLock. Never take the server->serviceMutex
+                        * when the queueLock is already acquired (deadlock)! */
     UA_AsyncOperationQueue newQueue;        /* New operations for the workers */
     UA_AsyncOperationQueue dispatchedQueue; /* Operations taken by a worker. When a result is
                                              * returned, we search for the op here to see if it

From 7fa86dba01ba97bc29967178147d835dec3f515f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 29 Aug 2023 18:22:07 +0200
Subject: [PATCH 1151/1963] feat(tests): Add unit tests for the Cancel service

---
 tests/server/check_server_asyncop.c | 70 +++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/tests/server/check_server_asyncop.c b/tests/server/check_server_asyncop.c
index 3edfae0b4b0..4352f28b7f8 100644
--- a/tests/server/check_server_asyncop.c
+++ b/tests/server/check_server_asyncop.c
@@ -198,6 +198,74 @@ START_TEST(Async_timeout) {
     UA_Client_delete(client);
 } END_TEST
 
+START_TEST(Async_cancel) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *clientConfig = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(clientConfig);
+
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Call async method, then the sync method.
+     * The sync method returns first. */
+    UA_UInt32 reqId = 0;
+    retval = UA_Client_call_async(client,
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                  UA_NODEID_STRING(1, "asyncMethod"),
+                                  0, NULL, clientReceiveCallback, NULL, &reqId);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Cancel the request */
+    UA_UInt32 cancelCount = 0;
+    UA_Client_cancelByRequestId(client, reqId, &cancelCount);
+    ck_assert_uint_eq(cancelCount, 1);
+
+    /* We expect to receive the cancelled response */
+    UA_Client_run_iterate(client, 0);
+    ck_assert_uint_eq(clientCounter, 1);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+} END_TEST
+
+START_TEST(Async_cancel_multiple) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *clientConfig = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(clientConfig);
+
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_CallRequest creq;
+    UA_CallRequest_init(&creq);
+    creq.requestHeader.requestHandle = 1337;
+    UA_CallMethodRequest cmr;
+    UA_CallMethodRequest_init(&cmr);
+    cmr.objectId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    cmr.methodId = UA_NODEID_STRING(1, "asyncMethod");
+    creq.methodsToCall = &cmr;
+    creq.methodsToCallSize = 1;
+
+    __UA_Client_AsyncService(client,
+                             &creq, &UA_TYPES[UA_TYPES_CALLREQUEST],
+                             NULL, &UA_TYPES[UA_TYPES_CALLRESPONSE],
+                             NULL, NULL);
+
+    __UA_Client_AsyncService(client,
+                             &creq, &UA_TYPES[UA_TYPES_CALLREQUEST],
+                             NULL, &UA_TYPES[UA_TYPES_CALLRESPONSE],
+                             NULL, NULL);
+
+    /* Expect two cancelled requests */
+    UA_UInt32 cancelCount = 0;
+    UA_Client_cancelByRequestHandle(client, 1337, &cancelCount);
+    ck_assert_uint_eq(cancelCount, 2);
+
+    UA_Client_run_iterate(client, 0);
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+} END_TEST
+
 /* Force a timeout when the operation is checked out with the worker */
 START_TEST(Async_timeout_worker) {
     UA_Client *client = UA_Client_new();
@@ -255,6 +323,8 @@ static Suite* method_async_suite(void) {
     tcase_add_checked_fixture(tc_manager, setup, teardown);
     tcase_add_test(tc_manager, Async_call);
     tcase_add_test(tc_manager, Async_timeout);
+    tcase_add_test(tc_manager, Async_cancel);
+    tcase_add_test(tc_manager, Async_cancel_multiple);
     tcase_add_test(tc_manager, Async_timeout_worker);
     suite_add_tcase(s, tc_manager);
 

From e221d25d76b880b86c84d7a49e7de45142a313e1 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 24 Aug 2023 12:55:10 +0200
Subject: [PATCH 1152/1963] fix(PubSub): Fix decoding of rawdata message

Fix decoding of rawdata message with rtLevel UA_PUBSUB_RT_FIXED_SIZE.
---
 src/pubsub/ua_pubsub_connection.c             |   2 +-
 src/pubsub/ua_pubsub_networkmessage.c         | 113 ++++++---
 src/pubsub/ua_pubsub_networkmessage.h         |   6 +-
 src/pubsub/ua_pubsub_reader.c                 |  12 +-
 .../pubsub/check_pubsub_subscribe_rt_levels.c | 232 +++++++++++-------
 5 files changed, 234 insertions(+), 131 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index d611170e644..60e850870d7 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -87,7 +87,7 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
     }
 #endif
 
-    rv = UA_NetworkMessage_decodePayload(buffer, pos, nm, server->config.customDataTypes);
+    rv = UA_NetworkMessage_decodePayload(buffer, pos, nm, server->config.customDataTypes, NULL);
     if(rv != UA_STATUSCODE_GOOD) {
         UA_NetworkMessage_clear(nm);
         return rv;
diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index a274d1220ea..7988843f8fe 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -772,7 +772,7 @@ UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset, UA_Net
 }
 
 UA_StatusCode
-UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes) {
+UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes, UA_DataSetMetaDataType *dsm) {
 
     // Payload
     if(dst->networkMessageType != UA_NETWORKMESSAGE_DATASET)
@@ -800,12 +800,13 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
     if(count == 1)
         rv = UA_DataSetMessage_decodeBinary(src, offset,
                                             &dst->payload.dataSetPayload.dataSetMessages[0],
-                                            0, customTypes);
+                                            0, customTypes, dsm);
     else {
         for(UA_Byte i = 0; i < count; i++) {
             rv = UA_DataSetMessage_decodeBinary(src, offset,
                                                 &dst->payload.dataSetPayload.dataSetMessages[i],
-                                                dst->payload.dataSetPayload.sizes[i], customTypes);
+                                                dst->payload.dataSetPayload.sizes[i], customTypes,
+                                                dsm);
         }
     }
     UA_CHECK_STATUS(rv, return rv);
@@ -859,7 +860,7 @@ UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
     UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(src, offset, dst);
     UA_CHECK_STATUS(rv, return rv);
 
-    rv = UA_NetworkMessage_decodePayload(src, offset, dst, customTypes);
+    rv = UA_NetworkMessage_decodePayload(src, offset, dst, customTypes, NULL);
     UA_CHECK_STATUS(rv, return rv);
 
     rv = UA_NetworkMessage_decodeFooters(src, offset, dst);
@@ -1399,7 +1400,7 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
 }
 
 UA_StatusCode
-UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataSetMessage* dst, UA_UInt16 dsmSize, const UA_DataTypeArray *customTypes) {
+UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataSetMessage* dst, UA_UInt16 dsmSize, const UA_DataTypeArray *customTypes, UA_DataSetMetaDataType *dsm) {
     size_t initialOffset = *offset;
     memset(dst, 0, sizeof(UA_DataSetMessage));
     UA_StatusCode rv = UA_DataSetMessageHeader_decodeBinary(src, offset, &dst->header);
@@ -1441,11 +1442,40 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                 dst->data.keyFrameData.rawFields.data = &src->data[*offset];
                 dst->data.keyFrameData.rawFields.length = dsmSize;
                 if(dsmSize == 0){
-                    //TODO calculate the length of the DSM-Payload for a single DSM
-                    //Problem: Size is not set and MetaData information are needed.
-                    //Increase offset to avoid endless chunk loop. Needs to be fixed when
-                    //pubsub security footer and signatur is enabled.
-                    *offset += 1500;
+                    if(dsm != NULL) {
+                        size_t tmpOffset = 0;
+                        // calculate the length of the DSM-Payload for a single DSM
+                        dst->data.keyFrameData.fieldCount = (UA_UInt16)dsm->fieldsSize;
+                        for(size_t i = 0; i < dsm->fieldsSize; i++) {
+                            /* TODO The datatype reference should be part of the internal
+                             * pubsub configuration to avoid the time-expensive lookup */
+                            const UA_DataType *type =
+                                UA_findDataTypeWithCustom(&dsm->fields[i].dataType,
+                                                          customTypes);
+                            dst->data.keyFrameData.rawFields.length += type->memSize;
+                            UA_STACKARRAY(UA_Byte, value, type->memSize);
+                            rv = UA_decodeBinaryInternal(&dst->data.keyFrameData.rawFields,
+                                                         &tmpOffset, value, type, NULL);
+                            UA_CHECK_STATUS(rv, return rv); 
+                            if(dsm->fields[i].maxStringLength != 0) {
+                                if(type->typeKind == UA_DATATYPEKIND_STRING ||
+                                    type->typeKind == UA_DATATYPEKIND_BYTESTRING) {
+                                    UA_ByteString *bs = (UA_ByteString *) value;
+                                    //check if length < maxStringLength, The types ByteString and String are equal in their base definition
+                                    size_t lengthDifference = dsm->fields[i].maxStringLength - bs->length;
+                                    tmpOffset += lengthDifference;
+                                    dst->data.keyFrameData.rawFields.length += lengthDifference;
+                                }
+                            }
+                        }
+                        *offset += tmpOffset;
+                    } else {
+                        //TODO calculate the length of the DSM-Payload for a single DSM
+                        //Problem: Size is not set and MetaData information are needed.
+                        //Increase offset to avoid endless chunk loop. Needs to be fixed when
+                        //pubsub security footer and signatur is enabled.
+                        *offset += 1500;
+                    }
                 } else {
                     *offset += (dsmSize - (*offset - initialOffset));
                 }
@@ -1573,8 +1603,12 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p,
                     return 0;
                 nmo = &offsetBuffer->offsets[pos];
                 nmo->offset = size;
-                nmo->content.value = *v;
-                nmo->content.value.value.storageType = UA_VARIANT_DATA_NODELETE;
+                if(p->data.keyFrameData.dataSetFields != NULL) {
+                    nmo->content.value = *v;
+                    nmo->content.value.value.storageType = UA_VARIANT_DATA_NODELETE;
+                } else {
+                   UA_DataValue_init(&nmo->content.value);
+                }
             }
 
             if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
@@ -1582,28 +1616,39 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p,
                     nmo->contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT;
                 size += UA_calcSizeBinary(&v->value, &UA_TYPES[UA_TYPES_VARIANT]);
             } else if(p->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
-                if(offsetBuffer) {
-                    if(!v->value.type->pointerFree)
-                        return 0; /* only integer types for now */
-                    /* Count the memory size of the specific field */
-                    offsetBuffer->rawMessageLength += v->value.type->memSize;
-                    nmo->contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW;
-                }
-                size += UA_calcSizeBinary(v->value.data, v->value.type);
-
-                /* Handle zero-padding for strings with max-string-length.
-                 * Currently not supported for strings that are a part of larger
-                 * structures. */
-                UA_FieldMetaData *fmd =
-                    &p->data.keyFrameData.dataSetMetaDataType->fields[i];
-                if(fmd->maxStringLength != 0 &&
-                   (v->value.type->typeKind == UA_DATATYPEKIND_STRING ||
-                    v->value.type->typeKind == UA_DATATYPEKIND_BYTESTRING)) {
-                    /* Check if length < maxStringLength, The types ByteString
-                     * and String are equal in their base definition */
-                    size_t lengthDifference = fmd->maxStringLength -
-                        ((UA_String *)v->value.data)->length;
-                    size += lengthDifference;
+                if(p->data.keyFrameData.dataSetFields != NULL) {
+                    if(offsetBuffer) {
+                        if(!v->value.type->pointerFree)
+                            return 0; /* only integer types for now */
+                        /* Count the memory size of the specific field */
+                        offsetBuffer->rawMessageLength += v->value.type->memSize;
+                        nmo->contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW;
+                    }
+                    size += UA_calcSizeBinary(v->value.data, v->value.type);
+
+                    /* Handle zero-padding for strings with max-string-length.
+                     * Currently not supported for strings that are a part of larger
+                     * structures. */
+                    UA_FieldMetaData *fmd =
+                        &p->data.keyFrameData.dataSetMetaDataType->fields[i];
+                    if(fmd->maxStringLength != 0 &&
+                       (v->value.type->typeKind == UA_DATATYPEKIND_STRING ||
+                        v->value.type->typeKind == UA_DATATYPEKIND_BYTESTRING)) {
+                        /* Check if length < maxStringLength, The types ByteString
+                         * and String are equal in their base definition */
+                        size_t lengthDifference = fmd->maxStringLength -
+                            ((UA_String *)v->value.data)->length;
+                        size += lengthDifference;
+                    }
+                } else {
+                    /* get length calculated in UA_DataSetMessage_decodeBinary */
+                    if(offsetBuffer) {
+                        offsetBuffer->rawMessageLength = p->data.keyFrameData.rawFields.length;
+                        nmo->contentType = UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW;
+                    }
+                    size += p->data.keyFrameData.rawFields.length;
+                    /* no iteration needed */
+                    break;
                 }
             } else if(p->header.fieldEncoding == UA_FIELDENCODING_DATAVALUE) {
                 if(offsetBuffer)
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 4554e891c71..71812613b03 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -248,7 +248,8 @@ UA_DataSetMessage_encodeBinary(const UA_DataSetMessage* src, UA_Byte **bufPos,
 UA_StatusCode
 UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
                                UA_DataSetMessage* dst, UA_UInt16 dsmSize,
-                               const UA_DataTypeArray *customTypes);
+                               const UA_DataTypeArray *customTypes,
+                               UA_DataSetMetaDataType *dsm);
 
 size_t
 UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage *p,
@@ -290,7 +291,8 @@ UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset,
 
 UA_StatusCode
 UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset,
-                                UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes);
+                                UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes,
+                                UA_DataSetMetaDataType *dsm);
 
 UA_StatusCode
 UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset,
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 24960d91fc1..6f27cc75581 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -772,6 +772,8 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
         dsr->config.dataSetMetaData.fieldsSize;
 
     size_t offset = 0;
+    /* start iteration from beginning of rawFields buffer */
+    msg->data.keyFrameData.rawFields.length = 0;
     for(size_t i = 0; i < dsr->config.dataSetMetaData.fieldsSize; i++) {
         /* TODO The datatype reference should be part of the internal
          * pubsub configuration to avoid the time-expensive lookup */
@@ -1131,14 +1133,11 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
 
     /* Decode using the non-rt decoding */
     UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buf, pos, nm);
-    rv |= UA_NetworkMessage_decodePayload(buf, pos, nm, server->config.customDataTypes);
-    rv |= UA_NetworkMessage_decodeFooters(buf, pos, nm);
     if(rv != UA_STATUSCODE_GOOD) {
         UA_NetworkMessage_clear(nm);
         UA_free(nm);
         return rv;
     }
-
     /* Check if the message was intended for this reader */
     rv = UA_DataSetReader_checkIdentifier(server, nm, reader, rg->config);
     if(rv != UA_STATUSCODE_GOOD) {
@@ -1148,6 +1147,13 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
         UA_free(nm);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
+    rv = UA_NetworkMessage_decodePayload(buf, pos, nm, server->config.customDataTypes, &reader->config.dataSetMetaData);
+    rv |= UA_NetworkMessage_decodeFooters(buf, pos, nm);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_NetworkMessage_clear(nm);
+        UA_free(nm);
+        return rv;
+    }
 
     /* Compute and store the offsets necessary to decode */
     size_t nmSize = UA_NetworkMessage_calcSizeBinary(nm, &reader->bufferedMessage);
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 57fd8aab3f3..282ff56727b 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -478,8 +478,9 @@ START_TEST(SetupInvalidPubSubConfig) {
 } END_TEST
 
 /* additional SubscriberBeforeWriteCallback test data */
-static UA_UInt32 sSubscriberWriteValue = 0;
-static UA_NodeId sSubscribeWriteCb_TargetVar_Id;
+#define NUMVARS 2
+static UA_UInt32 sSubscriberWriteValue[NUMVARS] = {0};
+static UA_NodeId sSubscribeWriteCb_TargetVar_Id[NUMVARS];
 static void SubscriberBeforeWriteCallback(UA_Server *srv,
                        const UA_NodeId *readerId,
                        const UA_NodeId *readerGroupId,
@@ -487,20 +488,27 @@ static void SubscriberBeforeWriteCallback(UA_Server *srv,
                        void *targetVariableContext,
                        UA_DataValue **externalDataValue) {
 
+    int i = 0;
     ck_assert(srv != 0);
     ck_assert(UA_NodeId_equal(readerId, &readerIdentifier) == UA_TRUE);
     ck_assert(UA_NodeId_equal(readerGroupId, &readerGroupIdentifier) == UA_TRUE);
-    ck_assert(UA_NodeId_equal(targetVariableId, &sSubscribeWriteCb_TargetVar_Id) == UA_TRUE);
-    ck_assert(targetVariableContext != 0);
-    ck_assert_uint_eq(10, *((UA_UInt32*) targetVariableContext));
-    ck_assert(externalDataValue != 0);
-    ck_assert_uint_eq((**externalDataValue).value.type->memSize, sizeof(sSubscriberWriteValue));
-    memcpy(&sSubscriberWriteValue, (**externalDataValue).value.data, (**externalDataValue).value.type->memSize);
+    for (i = 0; i < NUMVARS; i++) {
+        if (UA_NodeId_equal(targetVariableId, &sSubscribeWriteCb_TargetVar_Id[i]) == UA_TRUE) {
+            ck_assert(targetVariableContext != 0);
+            ck_assert_uint_eq(10+i, *((UA_UInt32*) targetVariableContext));
+            ck_assert(externalDataValue != 0);
+            ck_assert_uint_eq((**externalDataValue).value.type->memSize, sizeof(sSubscriberWriteValue[i]));
+            memcpy(&sSubscriberWriteValue[i], (**externalDataValue).value.data, (**externalDataValue).value.type->memSize);
+            break;
+        }
+    }
+    /* check if variable has been found */
+    ck_assert(i < NUMVARS);
 }
 
 static void PublishSubscribeWithWriteCallback_Helper(
-    UA_NodeId publisherNode,
-    UA_UInt32 *publisherData,
+    UA_NodeId *publisherNode,
+    UA_UInt32 **publisherData,
     UA_Boolean useRawEncoding) {
 
     /* test fast-path with subscriber write callback */
@@ -508,6 +516,7 @@ static void PublishSubscribeWithWriteCallback_Helper(
         (useRawEncoding == UA_TRUE) ? "true" : "false");
 
     /* configure the connection */
+    int i;
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     ck_assert(addMinimalPubSubConfiguration() == UA_STATUSCODE_GOOD);
     UA_PubSubConnection *connection = UA_PubSubConnection_findConnectionbyId(server, connectionIdentifier);
@@ -515,14 +524,17 @@ static void PublishSubscribeWithWriteCallback_Helper(
 
     /* Data Set Field */
     UA_DataSetFieldConfig dataSetFieldConfig;
-    memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
-    dataSetFieldConfig.dataSetFieldType              = UA_PUBSUB_DATASETFIELD_VARIABLE;
-    dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
-    dataSetFieldConfig.field.variable.publishParameters.publishedVariable  = publisherNode;
-    dataSetFieldConfig.field.variable.publishParameters.attributeId        = UA_ATTRIBUTEID_VALUE;
-    dataSetFieldConfig.field.variable.rtValueSource.rtInformationModelNode = UA_TRUE;
-    retVal = UA_Server_addDataSetField (server, publishedDataSetIdent, &dataSetFieldConfig, &dataSetFieldIdent).result;
-    ck_assert(retVal == UA_STATUSCODE_GOOD);
+    UA_NodeId dataSetFieldIdents[NUMVARS];
+    for (i = 0; i < NUMVARS; i++) {
+        memset(&dataSetFieldConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dataSetFieldConfig.dataSetFieldType              = UA_PUBSUB_DATASETFIELD_VARIABLE;
+        dataSetFieldConfig.field.variable.promotedField  = UA_FALSE;
+        dataSetFieldConfig.field.variable.publishParameters.publishedVariable  = publisherNode[i];
+        dataSetFieldConfig.field.variable.publishParameters.attributeId        = UA_ATTRIBUTEID_VALUE;
+        dataSetFieldConfig.field.variable.rtValueSource.rtInformationModelNode = UA_TRUE;
+        retVal = UA_Server_addDataSetField (server, publishedDataSetIdent, &dataSetFieldConfig, &dataSetFieldIdents[i]).result;
+        ck_assert(retVal == UA_STATUSCODE_GOOD);
+    }
     /* Writer group */
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
@@ -599,34 +611,41 @@ static void PublishSubscribeWithWriteCallback_Helper(
     /* FilltestMetadata function in subscriber implementation */
     UA_DataSetMetaDataType_init (pMetaData);
     pMetaData->name       = UA_STRING ("DataSet Test");
-    /* Static definition of number of fields size to 1 to create one targetVariable */
-    pMetaData->fieldsSize = 1;
+    /* Static definition of number of fields size to NUMVARS to create targetVariables */
+    pMetaData->fieldsSize = NUMVARS;
     pMetaData->fields     = (UA_FieldMetaData*)UA_Array_new(pMetaData->fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
-    /* Unsigned Integer DataType */
-    UA_FieldMetaData_init (&pMetaData->fields[0]);
-    UA_NodeId_copy (&UA_TYPES[UA_TYPES_UINT32].typeId,
-                    &pMetaData->fields[0].dataType);
-    pMetaData->fields[0].builtInType = UA_NS0ID_UINT32;
-    pMetaData->fields[0].valueRank   = -1; /* scalar */
+    for (i = 0; i < NUMVARS; i++) {
+        /* Unsigned Integer DataType */
+        UA_FieldMetaData_init (&pMetaData->fields[i]);
+        UA_NodeId_copy (&UA_TYPES[UA_TYPES_UINT32].typeId,
+                        &pMetaData->fields[i].dataType);
+        pMetaData->fields[i].builtInType = UA_NS0ID_UINT32;
+        pMetaData->fields[i].valueRank   = -1; /* scalar */
+    }
     retVal |= UA_Server_addDataSetReader(server, readerGroupIdentifier, &readerConfig,
                                             &readerIdentifier);
     UA_UadpDataSetReaderMessageDataType_delete(dsReaderMessage);
     dsReaderMessage = 0;
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-    UA_FieldTargetVariable targetVar;
-    memset(&targetVar, 0, sizeof(UA_FieldTargetVariable));
-    /* For creating Targetvariable */
-    UA_FieldTargetDataType_init(&targetVar.targetVariable);
-    targetVar.targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
-    targetVar.targetVariable.targetNodeId = sSubscribeWriteCb_TargetVar_Id;
-    targetVar.beforeWrite                 = SubscriberBeforeWriteCallback;  /* set subscriber write callback */
-    UA_UInt32 DummyTargetVariableContext  = 10;
-    targetVar.targetVariableContext       = &DummyTargetVariableContext;
+    UA_FieldTargetVariable targetVar[NUMVARS];
+    UA_UInt32 DummyTargetVariableContext[NUMVARS];
+    memset(&targetVar, 0, sizeof(targetVar));
+    for (i = 0; i < NUMVARS; i++) {
+        /* For creating Targetvariable */
+        UA_FieldTargetDataType_init(&targetVar[i].targetVariable);
+        targetVar[i].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
+        targetVar[i].targetVariable.targetNodeId = sSubscribeWriteCb_TargetVar_Id[i];
+        targetVar[i].beforeWrite                 = SubscriberBeforeWriteCallback;  /* set subscriber write callback */
+        DummyTargetVariableContext[i]            = 10+i;
+        targetVar[i].targetVariableContext       = &DummyTargetVariableContext[i];
+    }
     retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
-                                                            1, &targetVar);
+                                                            NUMVARS, &targetVar[0]);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    UA_FieldTargetDataType_clear(&targetVar.targetVariable);
+    for (i = 0; i < NUMVARS; i++) {
+        UA_FieldTargetDataType_clear(&targetVar[i].targetVariable);
+    }
     UA_free(pMetaData->fields);
 
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier));
@@ -635,18 +654,33 @@ static void PublishSubscribeWithWriteCallback_Helper(
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupOperational(server, readerGroupIdentifier));
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupOperational(server, writerGroupIdent));
 
-    /* run server - publisher and subscriber */
-    *publisherData = 42;
-    sSubscriberWriteValue = 0;
+    for (i = 0; i < NUMVARS; i++) {
+        /* run server - publisher and subscriber */
+        *(publisherData[i]) = 42 + i;
+        sSubscriberWriteValue[i] = 0;
+    }
+    ServerDoProcess((UA_UInt32) writerGroupConfig.publishingInterval, 3);
+    for (i = 0; i < NUMVARS; i++) {
+        /* check that subscriber write callback has been called - verify received value */
+        ck_assert_uint_eq(*(publisherData[i]), sSubscriberWriteValue[i]);
+
+        /* set new publisher data and test again */
+        *(publisherData[i]) = 42 + NUMVARS + i;
+        sSubscriberWriteValue[i] = 0;
+    }
     ServerDoProcess((UA_UInt32) writerGroupConfig.publishingInterval, 3);
-    /* check that subscriber write callback has been called - verify received value */
-    ck_assert_uint_eq(*publisherData, sSubscriberWriteValue);
+    for (i = 0; i < NUMVARS; i++) {
+        /* check that subscriber write callback has been called - verify received value */
+        ck_assert_uint_eq(*(publisherData[i]), sSubscriberWriteValue[i]);
 
-    /* set new publisher data and test again */
-    *publisherData = 43;
-    sSubscriberWriteValue = 0;
+        /* set new publisher data and test again for checking buffered data handling */
+        *(publisherData[i]) = 42 + 2*NUMVARS + i;
+        sSubscriberWriteValue[i] = 0;
+    }
     ServerDoProcess((UA_UInt32) writerGroupConfig.publishingInterval, 3);
-    ck_assert_uint_eq(*publisherData, sSubscriberWriteValue);
+    for (i = 0; i < NUMVARS; i++) {
+        ck_assert_uint_eq(*(publisherData[i]), sSubscriberWriteValue[i]);
+    }
 
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setWriterGroupDisabled(server, writerGroupIdent));
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_setReaderGroupDisabled(server, readerGroupIdentifier));
@@ -662,43 +696,53 @@ static void PublishSubscribeWithWriteCallback_Helper(
     UA_NodeId_clear(&publishedDataSetIdent);
     UA_NodeId_clear(&writerGroupIdent);
     UA_NodeId_clear(&dataSetWriterIdent);
-    UA_NodeId_clear(&dataSetFieldIdent);
+    for (i = 0; i < NUMVARS; i++) {
+        UA_NodeId_clear(&dataSetFieldIdents[i]);
+    }
     UA_NodeId_clear(&readerGroupIdentifier);
     UA_NodeId_clear(&readerIdentifier);
 }
 
 START_TEST(PublishSubscribeWithWriteCallback) {
 
+    int i;
+
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PublishSubscribeWithWriteCallback() test start");
 
-    /* Create variable to publish integer data */
-    UA_NodeId publisherNode;
+    /* Create variables to publish integer data */
+    UA_NodeId publisherNode[NUMVARS];
     UA_VariableAttributes attr = UA_VariableAttributes_default;
     attr.description           = UA_LOCALIZEDTEXT("en-US","Published Integer");
     attr.displayName           = UA_LOCALIZEDTEXT("en-US","Published Integer");
     attr.dataType              = UA_TYPES[UA_TYPES_UINT32].typeId;
     attr.accessLevel           = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
 
-    UA_DataValue *publisherDataValue = UA_DataValue_new();
-    ck_assert(publisherDataValue != 0);
-    UA_UInt32 *publisherData  = UA_UInt32_new();
-    ck_assert(publisherData != 0);
-    *publisherData = 42;
-    UA_Variant_setScalar(&publisherDataValue->value, publisherData, &UA_TYPES[UA_TYPES_UINT32]);
-    UA_StatusCode retVal = UA_Server_addVariableNode(server,
-                                        UA_NODEID_NUMERIC(1, 50001),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                                        UA_QUALIFIEDNAME(1, "Published Integer"),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                                        attr, NULL, &publisherNode);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    /* add external value backend for fast-path */
+    UA_DataValue *publisherDataValue[NUMVARS];
+    UA_UInt32 *publisherData[NUMVARS];
+    UA_StatusCode retVal;
     UA_ValueBackend valueBackend;
-    valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
-    valueBackend.backend.external.value = &publisherDataValue;
-    retVal = UA_Server_setVariableNode_valueBackend(server, publisherNode, valueBackend);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    for (i = 0; i < NUMVARS; i++) {
+        publisherDataValue[i] = UA_DataValue_new();
+        ck_assert(publisherDataValue[i] != 0);
+        publisherData[i] = UA_UInt32_new();
+        ck_assert(publisherData[i] != 0);
+        *publisherData[i] = 42*(i+1);
+        UA_Variant_setScalar(&publisherDataValue[i]->value, publisherData[i], &UA_TYPES[UA_TYPES_UINT32]);
+        retVal = UA_Server_addVariableNode(server,
+                                           UA_NODEID_NUMERIC(1, 50001+i),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+                                           UA_QUALIFIEDNAME(1, "Published Integer"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                           attr, NULL, &publisherNode[i]);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        /* add external value backend for fast-path */
+        valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+        valueBackend.backend.external.value = &publisherDataValue[i];
+        retVal = UA_Server_setVariableNode_valueBackend(server, publisherNode[i], valueBackend);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    }
 
     /* Add Subscribed Variables */
     UA_NodeId folderId;
@@ -722,39 +766,45 @@ START_TEST(PublishSubscribeWithWriteCallback) {
                              folderBrowseName, UA_NODEID_NUMERIC (0,
                              UA_NS0ID_BASEOBJECTTYPE), oAttr, NULL, &folderId);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    /* Variable to subscribe data */
+    /* Variables to subscribe data */
     UA_VariableAttributes vAttr = UA_VariableAttributes_default;
     vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
     vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
     vAttr.dataType    = UA_TYPES[UA_TYPES_UINT32].typeId;
-    retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 50002),
-                                       folderId,
-                                       UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed UInt32"),
-                                       UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &sSubscribeWriteCb_TargetVar_Id);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-
-    UA_DataValue *subscriberDataValue = UA_DataValue_new();
-    ck_assert(subscriberDataValue    != 0);
-    UA_UInt32 *subscriberData         = UA_UInt32_new();
-    ck_assert(subscriberData         != 0);
-    *subscriberData                   = 0;
-    UA_Variant_setScalar(&subscriberDataValue->value, subscriberData, &UA_TYPES[UA_TYPES_UINT32]);
+    UA_DataValue *subscriberDataValue[NUMVARS];
+    UA_UInt32 *subscriberData[NUMVARS];
+    for (i = 0; i < NUMVARS; i++) {
+        retVal = UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 50001 + NUMVARS + i),
+                                           folderId,
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),  UA_QUALIFIEDNAME(1, "Subscribed UInt32"),
+                                           UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), vAttr, NULL, &sSubscribeWriteCb_TargetVar_Id[i]);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
-    /* add external value backend for fast-path */
-    memset(&valueBackend, 0, sizeof(valueBackend));
-    valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
-    valueBackend.backend.external.value = &subscriberDataValue;
-    retVal = UA_Server_setVariableNode_valueBackend(server, sSubscribeWriteCb_TargetVar_Id, valueBackend);
-    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+        subscriberDataValue[i] = UA_DataValue_new();
+        ck_assert(subscriberDataValue[i] != 0);
+        subscriberData[i] = UA_UInt32_new();
+        ck_assert(subscriberData[i] != 0);
+        *subscriberData[i] = 0;
+        UA_Variant_setScalar(&subscriberDataValue[i]->value, subscriberData[i], &UA_TYPES[UA_TYPES_UINT32]);
+
+        /* add external value backend for fast-path */
+        memset(&valueBackend, 0, sizeof(valueBackend));
+        valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
+        valueBackend.backend.external.value = &subscriberDataValue[i];
+        retVal = UA_Server_setVariableNode_valueBackend(server, sSubscribeWriteCb_TargetVar_Id[i], valueBackend);
+        ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    }
 
     PublishSubscribeWithWriteCallback_Helper(publisherNode, publisherData, UA_FALSE);
     PublishSubscribeWithWriteCallback_Helper(publisherNode, publisherData, UA_TRUE);
 
     /* cleanup */
-    UA_DataValue_delete(subscriberDataValue);
-    subscriberDataValue = 0;
-    UA_DataValue_delete(publisherDataValue);
-    publisherDataValue = 0;
+    for (i = 0; i < NUMVARS; i++) {
+       UA_DataValue_delete(subscriberDataValue[i]);
+       subscriberDataValue[i] = 0;
+       UA_DataValue_delete(publisherDataValue[i]);
+       publisherDataValue[i] = 0;
+    }
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "PublishSubscribeWithWriteCallback() test end");
 } END_TEST
 

From 3944ddf8064fa5f42878bfe92cc525ade6b239cf Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Tue, 5 Sep 2023 13:12:31 +0200
Subject: [PATCH 1153/1963] fix(server): Init UA_NodeId

---
 src/server/ua_services_nodemanagement.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index ac299ba7339..ffd27c54d49 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -702,7 +702,7 @@ copyChild(UA_Server *server, UA_Session *session,
         UA_Node_deleteReferencesSubset(node, &reftypes_skipped);
 
         /* Add the node to the nodestore */
-        UA_NodeId newNodeId;
+        UA_NodeId newNodeId = UA_NODEID_NULL;
         retval = UA_NODESTORE_INSERT(server, node, &newNodeId);
         /* node = NULL; The pointer is no longer valid */
         if(retval != UA_STATUSCODE_GOOD)

From 8465181e0560365323671720b32e8671ba9a8b09 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Wed, 6 Sep 2023 08:53:29 +0200
Subject: [PATCH 1154/1963] fix(pubsub): Only check PublisherId if PublisherId
 is enabled (#5983)

---
 src/pubsub/ua_pubsub_reader.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 6f27cc75581..82174fd1666 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -38,6 +38,9 @@ UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader
 
 static UA_Boolean
 publisherIdIsMatching(UA_NetworkMessage *msg, UA_Variant publisherId) {
+    if(!msg->publisherIdEnabled) {
+        return true;
+    }
     switch(msg->publisherIdType) {
         case UA_PUBLISHERIDTYPE_BYTE:
             return (publisherId.type == &UA_TYPES[UA_TYPES_BYTE] &&

From ef8fbc3ede1cffc51d61ce3c126cfc1fb324e5e6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Sep 2023 10:40:59 +0200
Subject: [PATCH 1155/1963] Revert "refactor(build): Use add_compile_options in
 CMake instead of editing env strings"

This reverts commit ee9e266bb7382f87ecd178acf5a3d61ead074cb3.
---
 CMakeLists.txt | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da6c8e5bb9f..26b632ac8ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,7 +272,8 @@ if(UA_ENABLE_CLANG_COV)
     if(UA_ENABLE_COVERAGE)
         message(FATAL_ERROR "Only either clang cov or normal coverage is allowed.")
     endif()
-    add_compile_options(-fprofile-instr-generate -fcoverage-mapping)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
 endif()
 
 if(UA_ENABLE_DISCOVERY_MULTICAST AND NOT UA_ENABLE_DISCOVERY)
@@ -550,12 +551,12 @@ endif()
 # Taken from https://stackoverflow.com/a/33266748
 include(CheckCCompilerFlag)
 function(check_add_cc_flag CC_FLAG)
-    list(FIND COMPILE_OPTIONS ${CC_FLAG} flag_already_set)
+    string(FIND "${CMAKE_C_FLAGS}" "${CC_FLAG}" flag_already_set)
     if(flag_already_set EQUAL -1)
         message(STATUS "Test CC flag ${CC_FLAG}")
-        check_c_compiler_flag(${CC_FLAG} flag_supported)
+        check_c_compiler_flag("${CC_FLAG}" flag_supported)
         if(flag_supported)
-            add_compile_options(${CC_FLAG})
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CC_FLAG}" PARENT_SCOPE)
         endif()
         unset(flag_supported CACHE)
     endif()
@@ -664,7 +665,8 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         if(CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
             set(SANITIZER_FLAGS "${SANITIZER_FLAGS} -fsanitize-coverage=trace-pc-guard")
         endif()
-        add_compile_options(${SANITIZER_FLAGS})
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_FLAGS}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_FLAGS}")
     endif()
 
     if(NOT MINGW AND UA_ENABLE_HARDENING AND ((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")))
@@ -683,25 +685,28 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         # remove stack-protector with MinSizeRel
         if(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
             check_add_cc_flag("-fno-stack-protector")
-            if(NOT WIN32 AND NOT CYGWIN AND NOT APPLE)
-                # these settings reduce the binary size by ~2kb
-                add_link_options(-Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none)
-            endif()
         endif()
         if(NOT OS9)
-            add_link_options(-s)
+            set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -s")
+            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -s")
         endif()
         if(APPLE)
-            add_link_options(-Wl,-dead_strip)
+            set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,-dead_strip")
+            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-dead_strip")
         else()
-            add_link_options(-Wl,--gc-sections)
+            set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--gc-sections")
+            set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections")
+        endif()
+        if(NOT WIN32 AND NOT CYGWIN AND NOT APPLE)
+            # these settings reduce the binary size by ~2kb
+            set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none")
         endif()
     endif()
 endif()
 
 if(APPLE)
     set(CMAKE_MACOSX_RPATH 1)
-    add_compile_options(-D_DARWIN_C_SOURCE=1)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DARWIN_C_SOURCE=1")
 endif()
 
 if(MSVC)

From cef068026ce7025b616894bfd94bc8a4cac704e4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Sep 2023 10:49:44 +0200
Subject: [PATCH 1156/1963] fix(el): Fix an unused parameter usage in
 eventloop_posix_eth.c

---
 arch/eventloop_posix_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 4ed043db092..66dfba48501 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -580,7 +580,7 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
     /* Validate the parameters */
     UA_StatusCode res =
         UA_KeyValueRestriction_validate(el->eventLoop.logger, "ETH", ETHConfigParameters,
-                                        ETH_PARAMETERSSIZE, params);
+                                        ethParams, params);
     if(res != UA_STATUSCODE_GOOD) {
         UA_UNLOCK(&el->elMutex);
         return res;

From 50f992d250ec2a67092dcde5d2b2ca603a5be6f1 Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Wed, 6 Sep 2023 15:31:53 +0200
Subject: [PATCH 1157/1963] refactor(server): Use macros for valueRank (#5996)

---
 src/server/ua_services_attribute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 65aaf5dd901..9f339393131 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -364,7 +364,7 @@ getStructureDefinition(const UA_DataType *type, UA_StructureDefinition *def) {
 
     for(size_t cnt = 0; cnt < def->fieldsSize; cnt++) {
         const UA_DataTypeMember *m = &type->members[cnt];
-        def->fields[cnt].valueRank = (m->isArray) ? 1 : -1;
+        def->fields[cnt].valueRank = (m->isArray) ? UA_VALUERANK_ONE_DIMENSION : UA_VALUERANK_SCALAR;
         def->fields[cnt].arrayDimensions = NULL;
         def->fields[cnt].arrayDimensionsSize = 0;
         def->fields[cnt].name = UA_STRING((char *)(uintptr_t)m->memberName);

From 59955dfc48d93e97ae07beece854e8f57310cbb5 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Fri, 8 Sep 2023 09:00:03 +0200
Subject: [PATCH 1158/1963] fix(tests): Revert change when setting -m32 build
 flag

Reverts part of commit 0e2cbabb7f8a70e2971f1821655e6f4b8f06b9ea

CI build 'Debug Build & Unit Tests (gcc, 32bit)' failed with previous setting.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26b632ac8ec..2c075cc3de0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -615,7 +615,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         if(MSVC)
             message(FATAL_ERROR "Select the 32bit (cross-) compiler instead of forcing compiler options")
         endif()
-        check_add_cc_flag("-m32") # GCC and Clang, possibly more
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") # GCC and Clang, possibly more
     endif()
 
     if(NOT MINGW AND NOT UA_BUILD_OSS_FUZZ)

From ee2bc790558f7b4aa7beae738d355998eab17608 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Fri, 25 Aug 2023 09:13:34 +0200
Subject: [PATCH 1159/1963] fix(PubSub): Check DataSetReader before using saved
 NetworkMessage

If a received message is not intended for a DataSetReader, the saved
NetworkMessage must not be used.
---
 src/pubsub/ua_pubsub_networkmessage.c | 20 +++++++
 src/pubsub/ua_pubsub_networkmessage.h |  3 ++
 src/pubsub/ua_pubsub_reader.c         | 76 +++++++++++++--------------
 3 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 5ea8c9a47f0..725102ccf29 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -771,6 +771,26 @@ UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset, UA_Net
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_NetworkMessage_decodeHeadersRT(const UA_ByteString *src, UA_NetworkMessage *dst) {
+
+    size_t offset = 0;
+    UA_StatusCode rv = UA_NetworkMessageHeader_decodeBinary(src, &offset, dst);
+    UA_CHECK_STATUS(rv, return rv);
+
+    if(dst->groupHeaderEnabled) {
+        rv = UA_GroupHeader_decodeBinary(src, &offset, dst);
+        UA_CHECK_STATUS(rv, return rv);
+    }
+
+    if(dst->payloadHeaderEnabled) {
+        rv = UA_PayloadHeader_decodeBinary(src, &offset, dst);
+        UA_CHECK_STATUS(rv, return rv);
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
 UA_StatusCode
 UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes, UA_DataSetMetaDataType *dsm) {
 
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 71812613b03..f9d99801229 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -289,6 +289,9 @@ UA_StatusCode
 UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset,
                                 UA_NetworkMessage *dst);
 
+UA_StatusCode
+UA_NetworkMessage_decodeHeadersRT(const UA_ByteString *src, UA_NetworkMessage *dst);
+
 UA_StatusCode
 UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset,
                                 UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes,
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 82174fd1666..dae68eda843 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1141,16 +1141,7 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
         UA_free(nm);
         return rv;
     }
-    /* Check if the message was intended for this reader */
-    rv = UA_DataSetReader_checkIdentifier(server, nm, reader, rg->config);
-    if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO_READER(&server->config.logger, reader,
-                           "PubSub receive. Message intended for a different reader.");
-        UA_NetworkMessage_clear(nm);
-        UA_free(nm);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    rv = UA_NetworkMessage_decodePayload(buf, pos, nm, server->config.customDataTypes, &reader->config.dataSetMetaData);
+    rv |= UA_NetworkMessage_decodePayload(buf, pos, nm, server->config.customDataTypes, &reader->config.dataSetMetaData);
     rv |= UA_NetworkMessage_decodeFooters(buf, pos, nm);
     if(rv != UA_STATUSCODE_GOOD) {
         UA_NetworkMessage_clear(nm);
@@ -1216,14 +1207,6 @@ decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
             return;
         }
 
-        /* Check the decoded message is intended for this reader */
-        rv = UA_DataSetReader_checkIdentifier(server, nm, dsr, readerGroup->config);
-        if(rv != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
-                               "PubSub receive. Message intended for a different reader.");
-            continue;
-        }
-
     process:
         /* Process for this reader */
         UA_DataSetReader_process(server, readerGroup, dsr,
@@ -1242,50 +1225,63 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
     useMembufAlloc();
 #endif
 
-    /* Decrypt */
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+    UA_Boolean decrypted = false;
+#endif
     UA_NetworkMessage currentNetworkMessage;
     memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
-
-    size_t payLoadPosition = 0;
-    UA_StatusCode rv =
-        UA_NetworkMessage_decodeHeaders(buf, &payLoadPosition, &currentNetworkMessage);
+    /* Decode headers necessary for checking identifier */
+    UA_StatusCode rv = UA_NetworkMessage_decodeHeadersRT(buf, &currentNetworkMessage);
     if(rv != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
                               "PubSub receive. decoding headers failed");
         goto done;
     }
 
-    rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &payLoadPosition,
-                                        &currentNetworkMessage, readerGroup);
-    UA_NetworkMessage_clear(&currentNetworkMessage);
-    if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
-                              "Subscribe failed. verify and decrypt network "
-                              "message failed.");
-        goto done;
-    }
-#endif
-
     /* Process for all readers in the ReaderGroup. Each reader might wait for a
      * different PublisherId. So the offsets are different for each. */
     UA_DataSetReader *dsr;
     LIST_FOREACH(dsr, &readerGroup->readers, listEntry) {
+        /* Check the message is intended for this reader */
+        rv = UA_DataSetReader_checkIdentifier(server, &currentNetworkMessage, dsr, readerGroup->config);
+        if(rv != UA_STATUSCODE_GOOD) {
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "PubSub receive. Message intended for a different reader.");
+            continue;
+        }
+#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
+        if(!decrypted) {
+            size_t payLoadPosition = 0;
+            /* Decode complete headers to use securityHeader information */
+            UA_NetworkMessage_clear(&currentNetworkMessage);
+            rv = UA_NetworkMessage_decodeHeaders(buf, &payLoadPosition, &currentNetworkMessage);
+            if(rv != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                                      "PubSub receive. decoding headers failed");
+                goto done;
+            }
+            /* Decrypt */
+            rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &payLoadPosition,
+                                                &currentNetworkMessage, readerGroup);
+            if(rv != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                                       "Subscribe failed. verify and decrypt network "
+                                       "message failed.");
+                goto done;
+            }
+            decrypted = true;
+        }
+#endif
         decodeAndProcessRT(server, readerGroup, dsr, buf);
     }
 
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
  done:
-#endif
+    UA_NetworkMessage_clear(&currentNetworkMessage);
 #ifdef UA_ENABLE_PUBSUB_BUFMALLOC
     useNormalAlloc();
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     return (rv == UA_STATUSCODE_GOOD);
-#else
-    return true;
-#endif
 }
 
 #endif /* UA_ENABLE_PUBSUB */

From 39c035a9b7e0df822bcd4408aade4be58e2bb6e7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 8 Sep 2023 17:30:02 +0200
Subject: [PATCH 1160/1963] refactor(pubsub): Fold decoding and processing into
 the RT processing loop

---
 src/pubsub/ua_pubsub_reader.c | 65 +++++++++++++----------------------
 1 file changed, 24 insertions(+), 41 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index dae68eda843..1f3d9381081 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1174,46 +1174,6 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
     return rv;
 }
 
-static void
-decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup,
-                   UA_DataSetReader *dsr, UA_ByteString *buf) {
-    size_t currentPosition = 0;
-    UA_StatusCode rv = UA_STATUSCODE_GOOD;
-    UA_NetworkMessage *nm = dsr->bufferedMessage.nm;
-    if(!nm) {
-        /* This is the first message being received for the RT fastpath. Prepare
-         * the offset buffer and set operational. */
-        rv = prepareOffsetBuffer(server, readerGroup, dsr, buf, &currentPosition);
-        if(rv != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
-                               "PubSub receive failed. Could not decode with "
-                               "status code %s.", UA_StatusCode_name(rv));
-            return;
-        }
-
-        /* Process and continue decoding (now using the prepared offsets) */
-        nm = dsr->bufferedMessage.nm;
-        goto process;
-    }
-
-    while(currentPosition < buf->length) {
-        /* Decode with offset information and update the networkMessage */
-        rv = UA_NetworkMessage_updateBufferedNwMessage(&dsr->bufferedMessage,
-                                                       buf, &currentPosition);
-        if(rv != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
-                               "PubSub receive failed. Could not decode with "
-                               "status code %s.", UA_StatusCode_name(rv));
-            return;
-        }
-
-    process:
-        /* Process for this reader */
-        UA_DataSetReader_process(server, readerGroup, dsr,
-                                 nm->payload.dataSetPayload.dataSetMessages);
-    }
-}
-
 /*******************************/
 /* Realtime Message Processing */
 /*******************************/
@@ -1272,7 +1232,30 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
             decrypted = true;
         }
 #endif
-        decodeAndProcessRT(server, readerGroup, dsr, buf);
+
+        /* Decode message. If this fails for one reader, abort overall. */
+        size_t currentPosition = 0;
+        UA_NetworkMessage *nm = dsr->bufferedMessage.nm;
+        if(!nm) {
+            /* This is the first message being received for the RT fastpath. Prepare
+             * the offset buffer and set operational. */
+            rv = prepareOffsetBuffer(server, readerGroup, dsr, buf, &currentPosition);
+            nm = dsr->bufferedMessage.nm;
+        } else {
+            /* Decode with offset information and update the networkMessage */
+            rv = UA_NetworkMessage_updateBufferedNwMessage(&dsr->bufferedMessage,
+                                                           buf, &currentPosition);
+        }
+        if(rv != UA_STATUSCODE_GOOD) {
+            UA_LOG_INFO_READER(&server->config.logger, dsr,
+                               "PubSub decoding failed. Could not decode with "
+                               "status code %s.", UA_StatusCode_name(rv));
+            goto done;
+        }
+
+        /* Process for this reader */
+        UA_DataSetReader_process(server, readerGroup, dsr,
+                                 dsr->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages);
     }
 
  done:

From ed9f3b2b030e1cc7af0bcade457baefc314dd9a9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 8 Sep 2023 18:05:14 +0200
Subject: [PATCH 1161/1963] refactor(pubsub): Reset the bufMalloc option before
 processing RT messages

---
 src/pubsub/ua_pubsub_reader.c | 112 ++++++++++++++++++++--------------
 1 file changed, 67 insertions(+), 45 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 1f3d9381081..9ef9449f217 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1185,86 +1185,108 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
     useMembufAlloc();
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-    UA_Boolean decrypted = false;
+    size_t i = 0;
+    size_t pos = 0;
+    UA_Boolean match = false;
+    UA_DataSetReader *dsr;
+    UA_STACKARRAY(UA_Boolean, matches, readerGroup->readersCount);
+#ifdef __clang_analyzer__
+    memset(matches, 0, sizeof(UA_Boolean)* readerGroup->readersCount); /* Pacify warning */
 #endif
+
+    /* Decode headers necessary for checking identifier */
     UA_NetworkMessage currentNetworkMessage;
     memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
-    /* Decode headers necessary for checking identifier */
-    UA_StatusCode rv = UA_NetworkMessage_decodeHeadersRT(buf, &currentNetworkMessage);
+    UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buf, &pos, &currentNetworkMessage);
     if(rv != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
                               "PubSub receive. decoding headers failed");
-        goto done;
+        goto error;
     }
 
-    /* Process for all readers in the ReaderGroup. Each reader might wait for a
-     * different PublisherId. So the offsets are different for each. */
-    UA_DataSetReader *dsr;
+    /* Check if the message is intended for each reader individually */
     LIST_FOREACH(dsr, &readerGroup->readers, listEntry) {
-        /* Check the message is intended for this reader */
         rv = UA_DataSetReader_checkIdentifier(server, &currentNetworkMessage, dsr, readerGroup->config);
+        matches[i] = (rv == UA_STATUSCODE_GOOD);
+        i++;
         if(rv != UA_STATUSCODE_GOOD) {
             UA_LOG_INFO_READER(&server->config.logger, dsr,
                                "PubSub receive. Message intended for a different reader.");
             continue;
         }
+        match = true;
+    }
+    if(!match)
+        goto error;
+    UA_assert(i == readerGroup->readersCount);
+
+    /* Decrypt the message once for all readers */
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
-        if(!decrypted) {
-            size_t payLoadPosition = 0;
-            /* Decode complete headers to use securityHeader information */
-            UA_NetworkMessage_clear(&currentNetworkMessage);
-            rv = UA_NetworkMessage_decodeHeaders(buf, &payLoadPosition, &currentNetworkMessage);
-            if(rv != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
-                                      "PubSub receive. decoding headers failed");
-                goto done;
-            }
-            /* Decrypt */
-            rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &payLoadPosition,
-                                                &currentNetworkMessage, readerGroup);
-            if(rv != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
-                                       "Subscribe failed. verify and decrypt network "
-                                       "message failed.");
-                goto done;
-            }
-            decrypted = true;
-        }
+    /* Keep pos to right after the header */
+    rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &pos,
+                                        &currentNetworkMessage, readerGroup);
+    if(rv != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+                                   "Subscribe failed. verify and decrypt network "
+                                   "message failed.");
+        goto error;
+    }
 #endif
 
-        /* Decode message. If this fails for one reader, abort overall. */
-        size_t currentPosition = 0;
-        UA_NetworkMessage *nm = dsr->bufferedMessage.nm;
-        if(!nm) {
-            /* This is the first message being received for the RT fastpath. Prepare
-             * the offset buffer and set operational. */
-            rv = prepareOffsetBuffer(server, readerGroup, dsr, buf, &currentPosition);
-            nm = dsr->bufferedMessage.nm;
+    /* Reset back to the normal malloc before processing the message.
+     * Any changes from here may be persisted longer than this.
+     * The userland (from callbacks) might rely on that. */
+    UA_NetworkMessage_clear(&currentNetworkMessage);
+#ifdef UA_ENABLE_PUBSUB_BUFMALLOC
+    useNormalAlloc();
+#endif
+
+    /* Decode message for every reader. If this fails for one reader, abort overall. */
+    i = 0;
+    LIST_FOREACH(dsr, &readerGroup->readers, listEntry) {
+        UA_assert(i < readerGroup->readersCount);
+        UA_Boolean match = matches[i];
+        i++;
+        if(!match)
+            continue;
+
+        pos = 0; /* reset */
+        if(!dsr->bufferedMessage.nm) {
+            /* This is the first message being received for the RT fastpath.
+             * Prepare the offset buffer and set operational. */
+            rv = prepareOffsetBuffer(server, readerGroup, dsr, buf, &pos);
         } else {
             /* Decode with offset information and update the networkMessage */
-            rv = UA_NetworkMessage_updateBufferedNwMessage(&dsr->bufferedMessage,
-                                                           buf, &currentPosition);
+            rv = UA_NetworkMessage_updateBufferedNwMessage(&dsr->bufferedMessage, buf, &pos);
         }
         if(rv != UA_STATUSCODE_GOOD) {
             UA_LOG_INFO_READER(&server->config.logger, dsr,
                                "PubSub decoding failed. Could not decode with "
                                "status code %s.", UA_StatusCode_name(rv));
-            goto done;
+            return false;
         }
+    }
 
-        /* Process for this reader */
+    /* Process the decoded messages */
+    i = 0;
+    LIST_FOREACH(dsr, &readerGroup->readers, listEntry) {
+        UA_assert(i < readerGroup->readersCount);
+        UA_Boolean match = matches[i];
+        i++;
+        if(!match)
+            continue;
         UA_DataSetReader_process(server, readerGroup, dsr,
                                  dsr->bufferedMessage.nm->payload.dataSetPayload.dataSetMessages);
     }
 
- done:
+    return match;
+
+ error:
     UA_NetworkMessage_clear(&currentNetworkMessage);
 #ifdef UA_ENABLE_PUBSUB_BUFMALLOC
     useNormalAlloc();
 #endif
-
-    return (rv == UA_STATUSCODE_GOOD);
+    return false;
 }
 
 #endif /* UA_ENABLE_PUBSUB */

From 02bc9ab896f8c792eeaf738565f56cab0926a867 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 8 Sep 2023 18:08:53 +0200
Subject: [PATCH 1162/1963] refactor(pubsub): Remove the now-unused
 UA_NetworkMessage_decodeHeadersRT

---
 src/pubsub/ua_pubsub_networkmessage.c | 20 --------------------
 src/pubsub/ua_pubsub_networkmessage.h |  3 ---
 2 files changed, 23 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 725102ccf29..5ea8c9a47f0 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -771,26 +771,6 @@ UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset, UA_Net
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode
-UA_NetworkMessage_decodeHeadersRT(const UA_ByteString *src, UA_NetworkMessage *dst) {
-
-    size_t offset = 0;
-    UA_StatusCode rv = UA_NetworkMessageHeader_decodeBinary(src, &offset, dst);
-    UA_CHECK_STATUS(rv, return rv);
-
-    if(dst->groupHeaderEnabled) {
-        rv = UA_GroupHeader_decodeBinary(src, &offset, dst);
-        UA_CHECK_STATUS(rv, return rv);
-    }
-
-    if(dst->payloadHeaderEnabled) {
-        rv = UA_PayloadHeader_decodeBinary(src, &offset, dst);
-        UA_CHECK_STATUS(rv, return rv);
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
 UA_StatusCode
 UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes, UA_DataSetMetaDataType *dsm) {
 
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index f9d99801229..71812613b03 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -289,9 +289,6 @@ UA_StatusCode
 UA_NetworkMessage_decodeHeaders(const UA_ByteString *src, size_t *offset,
                                 UA_NetworkMessage *dst);
 
-UA_StatusCode
-UA_NetworkMessage_decodeHeadersRT(const UA_ByteString *src, UA_NetworkMessage *dst);
-
 UA_StatusCode
 UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset,
                                 UA_NetworkMessage *dst, const UA_DataTypeArray *customTypes,

From 2b328be7e8ae3d64857f028dc006d4f01c90df79 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 8 Sep 2023 18:10:02 +0200
Subject: [PATCH 1163/1963] refactor(pubsub): Add a clarifying comment to RT
 use of the DataSetReader

---
 src/pubsub/ua_pubsub_reader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 9ef9449f217..07273d40236 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1194,7 +1194,8 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
     memset(matches, 0, sizeof(UA_Boolean)* readerGroup->readersCount); /* Pacify warning */
 #endif
 
-    /* Decode headers necessary for checking identifier */
+    /* Decode headers necessary for checking identifier. This can use malloc.
+     * So enable membufAlloc if you need RT timings. */
     UA_NetworkMessage currentNetworkMessage;
     memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
     UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buf, &pos, &currentNetworkMessage);

From d28fed38ec239e1545162c53a9dbf3185c8632ae Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 11 Sep 2023 07:32:08 +0200
Subject: [PATCH 1164/1963] fix(core): Include stdlib.h for usage of malloc,
 free etc.

Fixes commit 928931ec36d4441fc12d27b11470ea96f7dc9b9b
---
 src/pubsub/ua_pubsub_bufmalloc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pubsub/ua_pubsub_bufmalloc.c b/src/pubsub/ua_pubsub_bufmalloc.c
index bc94bebf4d1..e6f90924ef2 100644
--- a/src/pubsub/ua_pubsub_bufmalloc.c
+++ b/src/pubsub/ua_pubsub_bufmalloc.c
@@ -6,6 +6,7 @@
  */
 
 #include "ua_pubsub_bufmalloc.h"
+#include <stdlib.h> /* for malloc, ...*/
 
 #define MALLOCMEMBUFSIZE 16384
 

From 8c5cfb46c23586784a5ab0f34c33b53dd2b0ee70 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 11 Sep 2023 10:35:42 +0200
Subject: [PATCH 1165/1963] fix(test): Check for nullptr before access in
 check_pubsub_sks_pull

---
 tests/pubsub/check_pubsub_sks_pull.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index 973a8891296..f305393d4aa 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -220,8 +220,9 @@ START_TEST(getSecuritykeysBadSecurityModeInsufficient) {
     }
     UA_StatusCode expectedCode = UA_STATUSCODE_BADSECURITYMODEINSUFFICIENT;
     UA_CallResponse response = callGetSecurityKeys(client, securityGroupId, 1, 1);
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     UA_CallResponse_clear(&response);
     UA_Client_delete(client);
@@ -234,8 +235,9 @@ START_TEST(getSecuritykeysBadNotFound) {
     UA_String badSecurityGroupId = UA_STRING("BadSecurityGroupId");
     UA_StatusCode expectedCode = UA_STATUSCODE_BADNOTFOUND;
     UA_CallResponse response = callGetSecurityKeys(sksClient, badSecurityGroupId, 1, 1);
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     UA_CallResponse_clear(&response);
     UA_Client_delete(sksClient);
@@ -252,8 +254,9 @@ START_TEST(getSecuritykeysBadUserAccessDenied) {
     /* set SecurityGroupNodeContext to username
         compare the SGNodeContext with sessioncontext in getUserExecutableOnObject
     */
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     UA_CallResponse_clear(&response);
     UA_Client_delete(sksClient);
@@ -267,8 +270,9 @@ START_TEST(getSecuritykeysGoodAndValidOutput) {
     UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
     UA_UInt32 reqkeyCount = 1;
     UA_CallResponse response = callGetSecurityKeys(sksClient, securityGroupId, 1, reqkeyCount);
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
 
@@ -312,8 +316,9 @@ START_TEST(requestCurrentKeyWithFutureKeys) {
     UA_UInt32 reqkeyCount = 1;
     UA_UInt32 reqStartingTokenId = 0;
     UA_CallResponse response = callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
 
@@ -347,8 +352,9 @@ START_TEST(requestCurrentKeyOnly) {
     UA_UInt32 reqStartingTokenId = 0;
     UA_CallResponse response =
         callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
 
@@ -382,8 +388,9 @@ START_TEST(requestPastKey) {
     UA_UInt32 reqStartingTokenId = 1;
     UA_CallResponse response =
         callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
 
@@ -415,8 +422,9 @@ START_TEST(requestUnknownStartingTokenId){
     UA_UInt32 reqStartingTokenId = UA_UINT32_MAX;
     UA_CallResponse response =
         callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
 
@@ -448,8 +456,9 @@ START_TEST(requestMaxFutureKeys) {
     UA_UInt32 reqStartingTokenId = 0;
     UA_CallResponse response =
         callGetSecurityKeys(sksClient, securityGroupId, reqStartingTokenId, reqkeyCount);
+    ck_assert(response.results != NULL);
     ck_assert_msg(response.results->statusCode == expectedCode,
-                  "Expected %s but erorr code : %s \n", UA_StatusCode_name(expectedCode),
+                  "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     ck_assert_uint_eq(response.results->outputArgumentsSize, 5);
 

From c2fdc35f4dedd606d685e35a58d9840ffe32808e Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 11 Sep 2023 10:43:45 +0200
Subject: [PATCH 1166/1963] fix(text): Abort while loop after 1000 retries in
 check_pubsub_sks_client

---
 tests/pubsub/check_pubsub_sks_client.c | 56 +++++++++++++++++++-------
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index 71eee62d938..167ab69a4db 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -30,6 +30,7 @@
 #define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
 #define policUri "http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR"
 #define testingSKSEndpointUrl "opc.tcp://localhost:4840"
+#define MAX_RETRIES 1000
 
 #define TESTINGSECURITYMODE UA_MESSAGESECURITYMODE_SIGNANDENCRYPT
 
@@ -471,6 +472,7 @@ sksPullRequestCallback(UA_Server *server, UA_StatusCode sksPullRequestStatus, vo
 
 START_TEST(AddValidSksClientwithWriterGroup) {
     UA_StatusCode retval = UA_STATUSCODE_BAD;
+    int retryCnt = 0;
     UA_ClientConfig *config = newEncryptedClientConfig("user1", "password");
     retval = addPublisher(publisherApp);
 
@@ -478,12 +480,13 @@ START_TEST(AddValidSksClientwithWriterGroup) {
     ck_assert_msg(retval == UA_STATUSCODE_GOOD,
                   "Expected Statuscode to be Good, but failed with: %s ",
                   UA_StatusCode_name(retval));
-    while(UA_StatusCode_isBad(sksPullStatus)) {
+    while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(publisherApp, true);
+        UA_fakeSleep(50);
     }
     ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
-                  "Expected Statuscode to be Good, but failed with: %s ",
-                  UA_StatusCode_name(retval));
+                  "Expected Statuscode to be Good, but failed with: %s (%u retries)",
+                  UA_StatusCode_name(retval), retryCnt);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(publisherApp, writerGroupId);
     ck_assert(wg != NULL);
     retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
@@ -512,6 +515,7 @@ END_TEST
 START_TEST(AddValidSksClientwithReaderGroup) {
     UA_StatusCode retval = UA_STATUSCODE_BAD;
     UA_ClientConfig *config = newEncryptedClientConfig("user1", "password");
+    int retryCnt = 0;
     retval = addSubscriber(subscriberApp);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD,
                   "Expected Statuscode to be Good but failed with: %s ",
@@ -521,12 +525,13 @@ START_TEST(AddValidSksClientwithReaderGroup) {
                   "Expected Statuscode to be Good, but failed with: %s ",
                   UA_StatusCode_name(retval));
     sksPullStatus = UA_STATUSCODE_BAD;
-    while(UA_StatusCode_isBad(sksPullStatus)) {
+    while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(subscriberApp, false);
+        UA_fakeSleep(50);
     }
     ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
-                  "Expected Statuscode to be Good, but failed with: %s ",
-                  UA_StatusCode_name(retval));
+                  "Expected Statuscode to be Good, but failed with: %s (%u retries)",
+                  UA_StatusCode_name(retval), retryCnt);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(subscriberApp, readerGroupId);
     ck_assert(rg != NULL);
 
@@ -558,14 +563,16 @@ START_TEST(SetInvalidSKSClient) {
     addPublisher(publisherApp);
     UA_Client *client = UA_Client_new();
     UA_ClientConfig *config = UA_Client_getConfig(client);
+    int retryCnt = 0;
     UA_Server_setSksClient(publisherApp, securityGroupId, config, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
     sksPullStatus = UA_STATUSCODE_GOOD;
-    while(UA_StatusCode_isGood(sksPullStatus)) {
+    while(UA_StatusCode_isGood(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(publisherApp, false);
+        UA_fakeSleep(50);
     }
     ck_assert_msg(sksPullStatus != UA_STATUSCODE_GOOD,
-                  "Expected Statuscode to be not GOOD, but failed with: %s ",
-                  UA_StatusCode_name(sksPullStatus));
+                  "Expected Statuscode to be not GOOD, but failed with: %s (%u retries)",
+                  UA_StatusCode_name(sksPullStatus), retryCnt);
     UA_Client_delete(client);
 }
 END_TEST
@@ -602,6 +609,7 @@ END_TEST
 
 START_TEST(CheckPublishedValuesInUserLand) {
     UA_StatusCode retval = UA_STATUSCODE_BAD;
+    int retryCnt = 0;
     retval = addPublisher(publisherApp);
     ck_assert(retval == UA_STATUSCODE_GOOD);
     retval = addSubscriber(subscriberApp);
@@ -612,18 +620,23 @@ START_TEST(CheckPublishedValuesInUserLand) {
         UA_Server_setSksClient(publisherApp, securityGroupId, pubSksClientConfig, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
     ck_assert(retval == UA_STATUSCODE_GOOD);
     sksPullStatus = UA_STATUSCODE_BAD;
-    while(UA_StatusCode_isBad(sksPullStatus)) {
+    while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(publisherApp, false);
+        UA_fakeSleep(50);
     }
+    ck_assert(retryCnt < MAX_RETRIES);
 
     UA_ClientConfig *subSksClientConfig = newEncryptedClientConfig("user1", "password");
     retval =
         UA_Server_setSksClient(subscriberApp, securityGroupId, subSksClientConfig, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
     ck_assert(retval == UA_STATUSCODE_GOOD);
     sksPullStatus = UA_STATUSCODE_BAD;
-    while(UA_StatusCode_isBad(sksPullStatus)) {
+    retryCnt = 0;
+    while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(subscriberApp, false);
+        UA_fakeSleep(50);
     }
+    ck_assert(retryCnt < MAX_RETRIES);
 
     retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
     ck_assert(retval == UA_STATUSCODE_GOOD);
@@ -659,6 +672,7 @@ END_TEST
 
 START_TEST(PublisherSubscriberTogethor) {
     UA_StatusCode retval = UA_STATUSCODE_BAD;
+    int retryCnt = 0;
     retval = addSubscriber(publisherApp);
     ck_assert(retval == UA_STATUSCODE_GOOD);
      retval = addPublisher(publisherApp);
@@ -670,9 +684,11 @@ START_TEST(PublisherSubscriberTogethor) {
     ck_assert(retval == UA_STATUSCODE_GOOD);
 
     sksPullStatus = UA_STATUSCODE_BAD;
-    while(UA_StatusCode_isBad(sksPullStatus)) {
+    while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(publisherApp, false);
+        UA_fakeSleep(50);
     }
+    ck_assert(retryCnt < MAX_RETRIES);
     retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
     ck_assert(retval == UA_STATUSCODE_GOOD);
     retval = UA_Server_setReaderGroupOperational(publisherApp, readerGroupId);
@@ -707,6 +723,7 @@ END_TEST
 
 START_TEST(PublisherDelayedSubscriberTogethor) {
     UA_StatusCode retval = UA_STATUSCODE_BAD;
+    int retryCnt = 0;
 
     retval = addPublisher(publisherApp);
     ck_assert(retval == UA_STATUSCODE_GOOD);
@@ -721,9 +738,11 @@ START_TEST(PublisherDelayedSubscriberTogethor) {
     ck_assert(retval == UA_STATUSCODE_GOOD);
 
     sksPullStatus = UA_STATUSCODE_BAD;
-    while(UA_StatusCode_isBad(sksPullStatus)) {
+    while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(publisherApp, false);
+        UA_fakeSleep(50);
     }
+    ck_assert(retryCnt < MAX_RETRIES);
 
     retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
     ck_assert(retval == UA_STATUSCODE_GOOD);
@@ -760,6 +779,7 @@ END_TEST
 
 START_TEST(FetchNextbatchOfKeys) {
     UA_StatusCode retval = UA_STATUSCODE_BAD;
+    int retryCnt = 0;
 
     retval = addPublisher(publisherApp);
     ck_assert(retval == UA_STATUSCODE_GOOD);
@@ -770,9 +790,11 @@ START_TEST(FetchNextbatchOfKeys) {
     ck_assert(retval == UA_STATUSCODE_GOOD);
 
     sksPullStatus = UA_STATUSCODE_BAD;
-    while(UA_StatusCode_isBad(sksPullStatus)) {
+    while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(publisherApp, false);
+        UA_fakeSleep(50);
     }
+    ck_assert(retryCnt < MAX_RETRIES);
 
     retval = addSubscriber(subscriberApp);
     ck_assert(retval == UA_STATUSCODE_GOOD);
@@ -784,9 +806,13 @@ START_TEST(FetchNextbatchOfKeys) {
     ck_assert(retval == UA_STATUSCODE_GOOD);
 
     sksPullStatus = UA_STATUSCODE_BAD;
-    while(UA_StatusCode_isBad(sksPullStatus)) {
+    retryCnt = 0;
+    while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
         UA_Server_run_iterate(subscriberApp, false);
+        UA_fakeSleep(50);
     }
+    ck_assert(retryCnt < MAX_RETRIES);
+
     UA_LOCK(&publisherApp->serviceMutex);
     UA_PubSubKeyStorage *pubKs = UA_PubSubKeyStorage_findKeyStorage(
         publisherApp, securityGroupId);

From 62caf8b5a6c3c0812ba85ab80413ae982afe8d53 Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Wed, 13 Sep 2023 11:43:34 +0200
Subject: [PATCH 1167/1963] fix(examples): Bugfix for the evaluation of
 existing namespaces. (#5903)

---
 examples/nodeset/server_nodeset_plcopen.c           | 13 +++++--------
 examples/nodeset/server_nodeset_powerlink.c         | 13 +++++--------
 .../check_nodeset_compiler_testnodeset.c            |  6 +++---
 .../check_nodeset_loader_testnodeset.c              |  6 +++---
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/examples/nodeset/server_nodeset_plcopen.c b/examples/nodeset/server_nodeset_plcopen.c
index 5bd4af593d6..dcc80c092a3 100644
--- a/examples/nodeset/server_nodeset_plcopen.c
+++ b/examples/nodeset/server_nodeset_plcopen.c
@@ -29,12 +29,10 @@ int main(int argc, char** argv) {
     UA_Server *server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-
     /* create nodes from nodeset */
-    size_t idx = (size_t) -1;
-    UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/DI/"), &idx);
-    if(idx != (size_t) -1) {
+    size_t idx = LONG_MAX;
+    UA_StatusCode retval = UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/DI/"), &idx);
+    if(retval != UA_STATUSCODE_GOOD) {
         retval = namespace_di_generated(server);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -43,9 +41,8 @@ int main(int argc, char** argv) {
             return EXIT_FAILURE;
         }
     }
-    idx = (size_t) -1;
-    UA_Server_getNamespaceByName(server, UA_STRING("http://PLCopen.org/OpcUa/IEC61131-3/"), &idx);
-    if(idx != (size_t) -1) {
+    retval = UA_Server_getNamespaceByName(server, UA_STRING("http://PLCopen.org/OpcUa/IEC61131-3/"), &idx);
+    if(retval != UA_STATUSCODE_GOOD) {
         retval = namespace_plc_generated(server);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
diff --git a/examples/nodeset/server_nodeset_powerlink.c b/examples/nodeset/server_nodeset_powerlink.c
index 9647a8f1dd9..1588f95864d 100644
--- a/examples/nodeset/server_nodeset_powerlink.c
+++ b/examples/nodeset/server_nodeset_powerlink.c
@@ -29,12 +29,10 @@ int main(int argc, char** argv) {
     UA_Server *server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-
     /* create nodes from nodeset */
-    size_t idx = (size_t) -1;
-    UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/DI/"), &idx);
-    if(idx != (size_t) -1) {
+    size_t idx = LONG_MAX;
+    UA_StatusCode retval = UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/DI/"), &idx);
+    if(retval != UA_STATUSCODE_GOOD) {
         retval = namespace_di_generated(server);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -43,9 +41,8 @@ int main(int argc, char** argv) {
             return EXIT_FAILURE;
         }
     }
-    idx = (size_t) -1;
-    UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/POWERLINK/"), &idx);
-    if(idx != (size_t) -1) {
+    retval = UA_Server_getNamespaceByName(server, UA_STRING("http://opcfoundation.org/UA/POWERLINK/"), &idx);
+    if(retval != UA_STATUSCODE_GOOD) {
         retval = namespace_powerlink_generated(server);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
index f402564be55..43fc61368c6 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
@@ -34,9 +34,9 @@ static void teardown(void) {
 START_TEST(Server_addTestNodeset) {
     UA_StatusCode retval = namespace_tests_testnodeset_generated(server);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    size_t nsIndex = (size_t) -1;
-    UA_Server_getNamespaceByName(server, UA_STRING("http://yourorganisation.org/test/"), &nsIndex);
-    ck_assert(nsIndex != (size_t)-1);
+    size_t nsIndex = LONG_MAX;
+    retval = UA_Server_getNamespaceByName(server, UA_STRING("http://yourorganisation.org/test/"), &nsIndex);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     testNamespaceIndex = (UA_UInt16) nsIndex;
 }
 END_TEST
diff --git a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
index 5c926d7f021..7e99330261b 100644
--- a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
@@ -61,9 +61,9 @@ START_TEST(Server_loadTestNodeset) {
     UA_StatusCode retVal = UA_Server_loadNodeset(server,
         OPEN62541_TESTNODESET_DIR "testnodeset.xml", NULL);
     ck_assert(UA_StatusCode_isGood(retVal));
-    size_t nsIndex = (size_t) -1;
-    UA_Server_getNamespaceByName(server, UA_STRING("http://yourorganisation.org/test/"), &nsIndex);
-    ck_assert(nsIndex != (size_t)-1);
+    size_t nsIndex = LONG_MAX;
+    retVal = UA_Server_getNamespaceByName(server, UA_STRING("http://yourorganisation.org/test/"), &nsIndex);
+    ck_assert_uint_eq(retVal, UA_STATUSCODE_GOOD);
     testNamespaceIndex = (UA_UInt16) nsIndex;
 }
 END_TEST

From 98c465be39cf090c83f7039d5cecd836e782144d Mon Sep 17 00:00:00 2001
From: Florian Kauer <florian.kauer@linutronix.de>
Date: Tue, 12 Sep 2023 03:00:18 -0500
Subject: [PATCH 1168/1963] fix(build): Add UA_ENABLE_PUBSUB_ETH_UADP to
 CMakeLists.txt

UA_ENABLE_PUBSUB_ETH_UADP disappeared from CMakeLists.txt with
7547a8a ("refactor(build): Simplify architecture-based build config")
so add it again.

Fixes: 7547a8a ("refactor(build): Simplify architecture-based build config")
Signed-off-by: Florian Kauer <florian.kauer@linutronix.de>
---
 CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c075cc3de0..27c3a9b3fc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,6 +354,14 @@ if(UA_ENABLE_PUBSUB_MONITORING)
     endif()
 endif()
 
+option(UA_ENABLE_PUBSUB_ETH_UADP "Enable the OPC UA Ethernet PubSub support to transport UADP NetworkMessages as payload of Ethernet II frame without IP or UDP headers. This option will include Publish and Subscribe based on EtherType B62C." OFF)
+mark_as_advanced(UA_ENABLE_PUBSUB_ETH_UADP)
+if(UA_ENABLE_PUBSUB_ETH_UADP)
+    if(NOT UA_ENABLE_PUBSUB)
+	    message(FATAL_ERROR "For UA_ENABLE_PUBSUB_ETH_UADP PubSub needs to be enabled")
+    endif()
+endif()
+
 option(UA_ENABLE_PUBSUB_BUFMALLOC "Enable allocation with static memory buffer for time critical PubSub parts" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_BUFMALLOC)
 if(UA_ENABLE_PUBSUB_BUFMALLOC)

From c68f2a020d5028f32d83d29ae143e3f400a804cc Mon Sep 17 00:00:00 2001
From: Florian Kauer <florian.kauer@linutronix.de>
Date: Tue, 12 Sep 2023 03:14:07 -0500
Subject: [PATCH 1169/1963] fix(ex): add missing headers

In 928931ec36d4 ("refactor(core): Move architecture-specific definition out of the public headers"),
headers were removed from the core headers, so some examples do no
longer build. Therefore, add them directly.

Fixes: 928931ec36d4 ("refactor(core): Move architecture-specific definition out of the public headers")
Signed-off-by: Florian Kauer <florian.kauer@linutronix.de>
---
 examples/pubsub/pubsub_subscribe_standalone_dataset.c      | 1 +
 examples/pubsub/server_pubsub_publisher_on_demand.c        | 1 +
 examples/pubsub/server_pubsub_rt_field_information_model.c | 1 +
 examples/pubsub/tutorial_pubsub_connection.c               | 2 ++
 examples/pubsub/tutorial_pubsub_publish.c                  | 1 +
 examples/pubsub/tutorial_pubsub_subscribe.c                | 1 +
 examples/pubsub_realtime/pubsub_interrupt_publish.c        | 1 +
 7 files changed, 8 insertions(+)

diff --git a/examples/pubsub/pubsub_subscribe_standalone_dataset.c b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
index 7123fd31084..7e1721731db 100644
--- a/examples/pubsub/pubsub_subscribe_standalone_dataset.c
+++ b/examples/pubsub/pubsub_subscribe_standalone_dataset.c
@@ -16,6 +16,7 @@
 
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 UA_NodeId connectionIdentifier;
 UA_NodeId readerGroupIdentifier;
diff --git a/examples/pubsub/server_pubsub_publisher_on_demand.c b/examples/pubsub/server_pubsub_publisher_on_demand.c
index 143613d6a16..5f577b555e5 100644
--- a/examples/pubsub/server_pubsub_publisher_on_demand.c
+++ b/examples/pubsub/server_pubsub_publisher_on_demand.c
@@ -31,6 +31,7 @@
 
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent;
 
diff --git a/examples/pubsub/server_pubsub_rt_field_information_model.c b/examples/pubsub/server_pubsub_rt_field_information_model.c
index 9c057b9cbf7..03855ee44f3 100644
--- a/examples/pubsub/server_pubsub_rt_field_information_model.c
+++ b/examples/pubsub/server_pubsub_rt_field_information_model.c
@@ -8,6 +8,7 @@
 #include <open62541/server_config_default.h>
 
 #include <signal.h>
+#include <stdlib.h>
 
 UA_Boolean running = true;
 UA_NodeId publishedDataSetIdent, dataSetFieldIdent, writerGroupIdent, connectionIdentifier;
diff --git a/examples/pubsub/tutorial_pubsub_connection.c b/examples/pubsub/tutorial_pubsub_connection.c
index 44e5c623306..d1dbcdac37e 100644
--- a/examples/pubsub/tutorial_pubsub_connection.c
+++ b/examples/pubsub/tutorial_pubsub_connection.c
@@ -6,6 +6,8 @@
 #include <open62541/server.h>
 #include <open62541/server_pubsub.h>
 
+#include <stdlib.h>
+
 /**
  * The PubSub connection example demonstrate the PubSub TransportLayer configuration and
  * the dynamic creation of PubSub Connections on runtime.
diff --git a/examples/pubsub/tutorial_pubsub_publish.c b/examples/pubsub/tutorial_pubsub_publish.c
index b427244eb39..99c773c2745 100644
--- a/examples/pubsub/tutorial_pubsub_publish.c
+++ b/examples/pubsub/tutorial_pubsub_publish.c
@@ -29,6 +29,7 @@
 #include <open62541/server_pubsub.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 
 UA_NodeId connectionIdent, publishedDataSetIdent, writerGroupIdent;
 
diff --git a/examples/pubsub/tutorial_pubsub_subscribe.c b/examples/pubsub/tutorial_pubsub_subscribe.c
index 138c680343b..b62f830e713 100644
--- a/examples/pubsub/tutorial_pubsub_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_subscribe.c
@@ -19,6 +19,7 @@
 #include <open62541/server_pubsub.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 
 UA_NodeId connectionIdentifier;
 UA_NodeId readerGroupIdentifier;
diff --git a/examples/pubsub_realtime/pubsub_interrupt_publish.c b/examples/pubsub_realtime/pubsub_interrupt_publish.c
index a311046b52a..7099a80ddc0 100644
--- a/examples/pubsub_realtime/pubsub_interrupt_publish.c
+++ b/examples/pubsub_realtime/pubsub_interrupt_publish.c
@@ -13,6 +13,7 @@
 #define _XOPEN_SOURCE 500
 #endif /* __STDC_VERSION__ */
 
+#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <time.h>

From 7be88d64cf0747a3fae76bd1822d7e1df4d167ba Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 1 Jun 2023 11:44:08 +0200
Subject: [PATCH 1170/1963] feat(server): File-based server configuration.

---
 CMakeLists.txt                                |   24 +-
 examples/CMakeLists.txt                       |    4 +
 .../server_file_based_config.c                |   43 +
 include/open62541/config.h.in                 |    2 -
 include/open62541/server.h                    |    4 +
 include/open62541/server_pubsub.h             |    6 +
 .../open62541/server_config_file_based.h      |   33 +
 plugins/server_config.json5                   |  203 ++++
 plugins/ua_config_default.c                   |    7 +
 plugins/ua_config_json.c                      | 1080 +++++++++++++++++
 src/pubsub/ua_pubsub.h                        |    7 +-
 src/pubsub/ua_pubsub_ns0.c                    |  302 +++--
 src/pubsub/ua_pubsub_reader.c                 |    2 -
 src/pubsub/ua_pubsub_writer.c                 |  142 +--
 tests/CMakeLists.txt                          |    5 +-
 .../check_pubsub_informationmodel_methods.c   |   10 +-
 tools/appveyor/build.ps1                      |    1 -
 tools/azure-devops/win/build.ps1              |    2 -
 tools/ci.sh                                   |   46 +-
 tools/examples_with_valgrind.py               |    3 +-
 20 files changed, 1614 insertions(+), 312 deletions(-)
 create mode 100644 examples/file_based_server/server_file_based_config.c
 create mode 100644 plugins/include/open62541/server_config_file_based.h
 create mode 100644 plugins/server_config.json5
 create mode 100644 plugins/ua_config_json.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27c3a9b3fc3..08452b81bdf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,8 +101,8 @@ option(UA_ENABLE_METHODCALLS "Enable the Method service set" ON)
 option(UA_ENABLE_SUBSCRIPTIONS "Enable subscriptions support" ON)
 option(UA_ENABLE_SUBSCRIPTIONS_EVENTS "Enable event monitoring" ON)
 option(UA_ENABLE_DA "Enable OPC UA DataAccess (Part 8) definitions" ON)
-option(UA_ENABLE_HISTORIZING "Enable basic support for historical access (client and server)" OFF)
-option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" OFF)
+option(UA_ENABLE_HISTORIZING "Enable basic support for historical access (client and server)" ON)
+option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" ON)
 option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" ON)
 option(UA_ENABLE_XML_ENCODING "Enable XML encoding (EXPERIMENTAL)" OFF)
 option(UA_ENABLE_NODESETLOADER "Enable nodesetLoader public API" OFF)
@@ -307,7 +307,6 @@ mark_as_advanced(UA_ENABLE_DEBUG_SANITIZER)
 
 #General PubSub setup
 option(UA_ENABLE_PUBSUB "Enable the PubSub protocol" OFF)
-option(UA_ENABLE_PUBSUB_DELTAFRAMES "Enable sending of delta frames with only the changes" OFF)
 
 option(UA_ENABLE_PUBSUB_ENCRYPTION "Enable encryption of the PubSub payload" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_ENCRYPTION)
@@ -331,13 +330,6 @@ if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
     endif()
 endif()
 
-option(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS "Enable PubSub informationmodel methods" OFF)
-if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
-    if(NOT UA_ENABLE_PUBSUB_INFORMATIONMODEL)
-        message(FATAL_ERROR "PubSub information model methods cannot be used with disabled PubSub information model.")
-    endif()
-endif()
-
 option(UA_ENABLE_PUBSUB_FILE_CONFIG "Enable loading PubSub Config from file extension" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_FILE_CONFIG)
 if(UA_ENABLE_PUBSUB_FILE_CONFIG)
@@ -499,6 +491,10 @@ if(UA_ENABLE_SUBSCRIPTIONS_EVENTS AND (NOT UA_ENABLE_SUBSCRIPTIONS))
     set(UA_ENABLE_SUBSCRIPTIONS_EVENTS OFF)
 endif()
 
+if(UA_ENABLE_HISTORIZING AND (NOT UA_ENABLE_SUBSCRIPTIONS))
+    MESSAGE(FATAL_ERROR "UA_ENABLE_HISTORIZING needs Subscriptions enabled")
+endif()
+
 ######################
 # External Libraries #
 ######################
@@ -1010,6 +1006,12 @@ set(plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
                    ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_pki_none.c
                    ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_securitypolicy_none.c)
 
+# For file based server configuration
+if(UA_ENABLE_JSON_ENCODING)
+    list(APPEND plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/server_config_file_based.h)
+    list(APPEND plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_config_json.c)
+endif()
+
 if(UA_ENABLE_HISTORIZING)
     list(APPEND plugin_headers
          ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/historydata/history_data_backend.h
@@ -1216,7 +1218,7 @@ if(UA_ENABLE_AMALGAMATION)
                        PRE_BUILD
                        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
                                ${OPEN62541_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/open62541.h
-                               ${exported_headers} ${plugin_headers} 
+                               ${exported_headers} ${plugin_headers}
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
                                ${exported_headers} ${plugin_headers})
 
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 7e1a3655d3c..b8c201e3e14 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -166,6 +166,10 @@ add_example(server_inheritance server_inheritance.c)
 
 add_example(server_loglevel server_loglevel.c)
 
+if(UA_ENABLE_JSON_ENCODING)
+    add_example(server_file_based_config file_based_server/server_file_based_config.c)
+endif()
+
 if(UA_ENABLE_HISTORIZING)
     add_example(tutorial_server_historicaldata tutorial_server_historicaldata.c)
     add_example(tutorial_server_historicaldata_circular tutorial_server_historicaldata_circular.c)
diff --git a/examples/file_based_server/server_file_based_config.c b/examples/file_based_server/server_file_based_config.c
new file mode 100644
index 00000000000..88b887db9fd
--- /dev/null
+++ b/examples/file_based_server/server_file_based_config.c
@@ -0,0 +1,43 @@
+/* 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 <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/plugin/log_stdout.h>
+#include <open62541/server_config_file_based.h>
+
+#include "common.h"
+
+int main(int argc, char** argv) {
+    UA_ByteString json_config = UA_BYTESTRING_NULL;
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
+    if(argc >= 2) {
+        /* Load server config */
+        json_config = loadFile(argv[1]);
+    } else {
+        UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
+                     "Missing argument. Argument are "
+                     "<server-config.json5>");
+        return EXIT_FAILURE;
+    }
+
+    /* Alternative API function */
+//    UA_Server *server = UA_Server_new();
+//    UA_ServerConfig *config = UA_Server_getConfig(server);
+//    retval = UA_ServerConfig_setFromFile(config, json_config);
+//    if(retval != UA_STATUSCODE_GOOD) {
+//        UA_Server_delete(server);
+//        return EXIT_FAILURE;
+//    }
+
+    UA_Server *server = UA_Server_newFromFile(json_config);
+
+    retval = UA_Server_runUntilInterrupt(server);
+    retval |= UA_Server_delete(server);
+
+    /* clean up */
+    UA_ByteString_clear(&json_config);
+
+    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 9dc15177dd5..2d8b6ed3ef6 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -48,9 +48,7 @@
 #cmakedefine UA_ENABLE_PUBSUB_ENCRYPTION
 #cmakedefine UA_ENABLE_PUBSUB_FILE_CONFIG
 #cmakedefine UA_ENABLE_PUBSUB_ETH_UADP
-#cmakedefine UA_ENABLE_PUBSUB_DELTAFRAMES
 #cmakedefine UA_ENABLE_PUBSUB_INFORMATIONMODEL
-#cmakedefine UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 #cmakedefine UA_ENABLE_DA
 #cmakedefine UA_ENABLE_DIAGNOSTICS
 #cmakedefine UA_ENABLE_HISTORIZING
diff --git a/include/open62541/server.h b/include/open62541/server.h
index beccfc39f95..9cbaf08d756 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -175,6 +175,7 @@ struct UA_ServerConfig {
 
     /**
      * The following settings are specific to OPC UA with TCP transport. */
+    UA_Boolean tcpEnabled;
     UA_UInt32 tcpBufSize;    /* Max length of sent and received chunks (packets)
                               * (default: 64kB) */
     UA_UInt32 tcpMaxMsgSize; /* Max length of messages
@@ -291,6 +292,7 @@ struct UA_ServerConfig {
     /**
      * Subscriptions
      * ^^^^^^^^^^^^^ */
+    UA_Boolean subscriptionsEnabled;
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     /* Limits for Subscriptions */
     UA_UInt32 maxSubscriptions;
@@ -339,6 +341,7 @@ struct UA_ServerConfig {
     /**
      * PubSub
      * ^^^^^^ */
+    UA_Boolean pubsubEnabled;
 #ifdef UA_ENABLE_PUBSUB
     UA_PubSubConfiguration pubSubConfig;
 #endif
@@ -346,6 +349,7 @@ struct UA_ServerConfig {
     /**
      * Historical Access
      * ^^^^^^^^^^^^^^^^^ */
+    UA_Boolean historizingEnabled;
 #ifdef UA_ENABLE_HISTORIZING
     UA_HistoryDatabase historyDatabase;
 
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index fa6c9abbb2d..d7a1639e3f4 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -225,6 +225,12 @@ struct UA_PubSubConfiguration {
     void (*stateChangeCallback)(UA_Server *server, UA_NodeId *id,
                                 UA_PubSubState state, UA_StatusCode status);
 
+    UA_Boolean enableDeltaFrames;
+
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    UA_Boolean enableInformationModelMethods;
+#endif
+
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     /* PubSub security policies */
     size_t securityPoliciesSize;
diff --git a/plugins/include/open62541/server_config_file_based.h b/plugins/include/open62541/server_config_file_based.h
new file mode 100644
index 00000000000..c0f39a21547
--- /dev/null
+++ b/plugins/include/open62541/server_config_file_based.h
@@ -0,0 +1,33 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ *
+ *    Copyright 2023 (c) Fraunhofer IOSB (Author: Noel Graf)
+ */
+
+#ifndef UA_SERVER_CONFIG_FILE_BASED_H
+#define UA_SERVER_CONFIG_FILE_BASED_H
+
+#include <open62541/server.h>
+#include <stdio.h>
+#include <errno.h>
+
+_UA_BEGIN_DECLS
+
+/* Loads the server configuration from a Json5 file into the server.
+ *
+ * @param json The configuration in json5 format.
+ */
+UA_EXPORT UA_Server *
+UA_Server_newFromFile(const UA_ByteString json_config);
+
+/* Loads the server configuration from a Json5 file into the server.
+ *
+ * @param config The server configuration.
+ * @param json The configuration in json5 format.
+ */
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_updateFromFile(UA_ServerConfig *config, const UA_ByteString json_config);
+
+_UA_END_DECLS
+
+#endif //UA_SERVER_CONFIG_FILE_BASED_H
diff --git a/plugins/server_config.json5 b/plugins/server_config.json5
new file mode 100644
index 00000000000..1d03782575c
--- /dev/null
+++ b/plugins/server_config.json5
@@ -0,0 +1,203 @@
+// JSON 5 server configuration
+{
+  // Server Description
+  buildInfo: {
+    productUri: "build.product.test.org",
+    manufacturerName: "Manufacture GmbH",
+    productName: "Product Name",
+    softwareVersion: "0.1.0",
+    buildNumber: "0.9.4",
+    buildDate: "2022-11-02T15:31:03Z",
+  },
+  // The application description does not change the bahavior of the server.
+  // It just sets the value in the information model (https://reference.opcfoundation.org/Core/Part4/v104/docs/7.1).
+  applicationDescription: {
+    applicationUri: "urn:open62541.server.application",
+    productUri: "urn:product.test.org",
+    applicationName: {
+      locale: "en-EN",
+      text: "Test Application"
+    },
+    // Server = 0, Client = 1, Client&Server = 2, Discovery_Server = 3
+    applicationType: 0,
+    gatewayServerUri: "GATEWAY",
+    discoveryProfileUri: "DISC",
+    discoveryUrls: [
+      "opc.tcp://10.0.20.240:2017",
+      "opc.tcp://10.0.20.240:2018",
+      "opc.tcp://10.0.20.241:2020"
+    ],
+  },
+  // Value is in milliseconds.
+  shutdownDelay: 5000.00,
+
+  // Verify that the server sends a timestamp in the request header.
+  //    DEFAULT = 0
+  //    ABORT = 1  /* Abort the operation and return an error code */
+  //    WARN = 2   /* Print a message in the logs and continue */
+  //    ACCEPT = 3 /* Continue and disregard the broken rule */
+  verifyRequestTimestamp: 0,
+  // Variables (that don't have a DataType of BaseDataType) must not have an empty variant value.
+  // The default behaviour is to auto-create a matching zeroed-out value for empty VariableNodes when they are added.
+  //    DEFAULT = 0
+  //    ABORT = 1  /* Abort the operation and return an error code */
+  //    WARN = 2   /* Print a message in the logs and continue */
+  //    ACCEPT = 3 /* Continue and disregard the broken rule */
+  allowEmptyVariables: 0,
+
+  // Networking
+  // Set up the local ServerUrls. They are used during startup to initialize the server sockets.
+  serverUrls: [
+    "opc.tcp://localhost:4840",
+  ],
+  tcpEnabled: true,
+  tcp: {
+    tcpBufSize: 64000,
+    tcpMaxMsgSize: 0,
+    tcpMaxChunks: 0,
+  },
+
+  // Limits for SecureChannels
+  maxSecureChannels: 10,
+  maxSecurityTokenLifetime: 300000,
+
+  // Limits for Sessions
+  maxSessions: 50,
+  maxSessionTimeout: 3600000,
+
+  // Operation limits
+  maxNodesPerRead: 10000,
+  maxNodesPerWrite: 10000,
+  maxNodesPerMethodCall: 10000,
+  maxNodesPerBrowse: 10000,
+  maxNodesPerRegisterNodes: 10000,
+  maxNodesPerTranslateBrowsePathsToNodeIds: 10000,
+  maxNodesPerNodeManagement: 10000,
+  maxMonitoredItemsPerCall: 10000,
+
+  // Limits for Requests
+  maxReferencesPerNode: 0,
+
+  // Limits for Async Operations
+  asyncOperationTimeout: 120000,
+  maxAsyncOperationQueueSize: 1000000,
+
+  // Discovery Multicast
+  mdnsEnabled: false,
+  mdns: {
+    mdnsServerName: "mdnsServerName",
+    serverCapabilities: [
+      "LDS",
+      "NA",
+      "GDS"
+    ],
+    mdnsInterfaceIP: "127.0.0.1",
+    mdnsIpAddressList: [
+      1,
+      2,
+      3
+    ]
+  },
+
+  subscriptionsEnabled: true,
+  subscriptions: {
+    // Limits for Subscriptions
+    maxSubscriptions: 100,
+    maxSubscriptionsPerSession: 50,
+    publishingIntervalLimits: {
+      min: 100.0,
+      max: 3600000.0,
+    },
+    lifeTimeCountLimits: {
+      min: 3,
+      max: 15000
+    },
+    keepAliveCountLimits: {
+      min: 1,
+      max: 100
+    },
+    maxNotificationsPerPublish: 1000,
+    enableRetransmissionQueue: true,
+    maxRetransmissionQueueSize: 0,
+    maxEventsPerNode: 0,
+
+    // Limits for MonitoredItems
+    maxMonitoredItems: 0,
+    maxMonitoredItemsPerSubscription: 0,
+    samplingIntervalLimits: {
+      min: 50.0,
+      max: 86400000.0
+    },
+    queueSizeLimits: {
+      min: 1,
+      max: 100
+    },
+
+    // Limits for PublishRequests
+    maxPublishReqPerSession: 5
+  },
+
+  // PubSub Configuration
+  pubsubEnabled: true,
+  pubsub: {
+    enableDeltaFrames: true,
+    enableInformationModelMethods: true
+  },
+
+  // Limits for Historizing
+  historizingEnabled: true,
+  historizing: {
+    accessHistoryDataCapability: false,
+    maxReturnDataValues: 0,
+    accessHistoryEventsCapability: false,
+    maxReturnEventValues: 0,
+    insertDataCapability: false,
+    insertEventCapability: false,
+    insertAnnotationsCapability: false,
+    replaceDataCapability: false,
+    replaceEventCapability: false,
+    updateDataCapability: false,
+    updateEventCapability: false,
+    deleteRawCapability: false,
+    deleteEventCapability: false,
+    deleteAtTimeDataCapability: false,
+  },
+
+  // Reverse Connect
+  reverseReconnectInterval: 20000,
+
+  // Security Settings
+//  securityPolicies: [
+//    {
+//      policy: "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15",
+//      certificate: "/path/to/certificate",
+//      privateKey: "/path/to/privateKey"
+//    },
+//    {
+//      policy: "http://opcfoundation.org/UA/SecurityPolicy#Basic256",
+//      certificate: "/path/to/certificate",
+//      privateKey: "/path/to/privateKey"
+//    },
+//    {
+//      policy: "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256",
+//      certificate: "/path/to/certificate",
+//      privateKey: "/path/to/privateKey"
+//    },
+//    {
+//      policy: "http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep",
+//      certificate: "/path/to/certificate",
+//      privateKey: "/path/to/privateKey"
+//    }
+//  ],
+
+//  secureChannelPKI: {
+//    trustListFolder: "/path/to/folder",
+//    issuerListFolder: "/path/to/folder",
+//    revocationListFolder: "/path/to/folder"
+//  },
+//  sessionPKI: {
+//    trustListFolder: "/path/to/folder",
+//    issuerListFolder: "/path/to/folder",
+//    revocationListFolder: "/path/to/folder"
+//  },
+}
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 60ed2ae841b..46035e7b4d2 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -483,6 +483,13 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     conf->asyncOperationTimeout = 120000; /* Async Operation Timeout in ms (2 minutes) */
 #endif
 
+#ifdef UA_ENABLE_PUBSUB
+    conf->pubSubConfig.enableDeltaFrames = true;
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    conf->pubSubConfig.enableInformationModelMethods = true;
+#endif
+#endif
+
     /* --> Finish setting the default static config <-- */
 
     return UA_STATUSCODE_GOOD;
diff --git a/plugins/ua_config_json.c b/plugins/ua_config_json.c
new file mode 100644
index 00000000000..27f5a8c450d
--- /dev/null
+++ b/plugins/ua_config_json.c
@@ -0,0 +1,1080 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
+ *
+ *    Copyright 2023 (c) Fraunhofer IOSB (Author: Noel Graf)
+ */
+
+#include <open62541/server_config_file_based.h>
+#include <open62541/plugin/log_stdout.h>
+#include "cj5.h"
+#include "open62541/server_config_default.h"
+#ifdef UA_ENABLE_ENCRYPTION
+#include "open62541/plugin/pki_default.h"
+#endif
+
+#define MAX_TOKENS 256
+
+typedef struct {
+    const char *json;
+    const cj5_token *tokens;
+    cj5_result result;
+    unsigned int tokensSize;
+    size_t index;
+    UA_Byte depth;
+} ParsingCtx;
+
+static UA_ByteString
+getJsonPart(cj5_token tok, const char *json) {
+    UA_ByteString bs;
+    UA_ByteString_init(&bs);
+    if(tok.type == CJ5_TOKEN_STRING) {
+        bs.data = (UA_Byte*)(uintptr_t)(json + tok.start - 1);
+        bs.length = (tok.end - tok.start) + 3;
+        return bs;
+    } else {
+        bs.data = (UA_Byte*)(uintptr_t)(json + tok.start);
+        bs.length = (tok.end - tok.start) + 1;
+        return bs;
+    }
+}
+
+/* Forward declarations*/
+#define PARSE_JSON(TYPE) static UA_StatusCode                   \
+    TYPE##_parseJson(ParsingCtx *ctx, void *configField, size_t *configFieldSize)
+
+typedef UA_StatusCode
+(*parseJsonSignature)(ParsingCtx *ctx, void *configField, size_t *configFieldSize);
+
+#ifdef UA_ENABLE_ENCRYPTION
+static UA_ByteString
+loadCertificateFile(const char *const path);
+#endif
+
+/* The DataType "kind" is an internal type classification. It is used to
+ * dispatch handling to the correct routines. */
+#define UA_SERVERCONFIGFIELDKINDS 25
+typedef enum {
+    /* Basic Types */
+    UA_SERVERCONFIGFIELD_INT64 = 0,
+    UA_SERVERCONFIGFIELD_UINT16,
+    UA_SERVERCONFIGFIELD_UINT32,
+    UA_SERVERCONFIGFIELD_UINT64,
+    UA_SERVERCONFIGFIELD_STRING,
+    UA_SERVERCONFIGFIELD_LOCALIZEDTEXT,
+    UA_SERVERCONFIGFIELD_DOUBLE,
+    UA_SERVERCONFIGFIELD_BOOLEAN,
+    UA_SERVERCONFIGFIELD_DURATION,
+    UA_SERVERCONFIGFIELD_DURATIONRANGE,
+    UA_SERVERCONFIGFIELD_UINT32RANGE,
+
+    /* Advanced Types */
+    UA_SERVERCONFIGFIELD_BUILDINFO,
+    UA_SERVERCONFIGFIELD_APPLICATIONDESCRIPTION,
+    UA_SERVERCONFIGFIELD_STRINGARRAY,
+    UA_SERVERCONFIGFIELD_UINT32ARRAY,
+    UA_SERVERCONFIGFIELD_DATETIME,
+    UA_SERVERCONFIGFIELD_SUBSCRIPTIONCONFIGURATION,
+    UA_SERVERCONFIGFIELD_TCPCONFIGURATION,
+    UA_SERVERCONFIGFIELD_PUBSUBCONFIGURATION,
+    UA_SERVERCONFIGFIELD_HISTORIZINGCONFIGURATION,
+    UA_SERVERCONFIGFIELD_MDNSCONFIGURATION,
+    UA_SERVERCONFIGFIELD_SECURITYPOLICIES,
+    UA_SERVERCONFIGFIELD_SECURITYPKI,
+
+    /* Enumerations */
+    UA_SERVERCONFIGFIELD_APPLICATIONTYPE,
+    UA_SERVERCONFIGFIELD_RULEHANDLING
+} UA_ServerConfigFieldKind;
+
+extern const parseJsonSignature parseJsonJumpTable[UA_SERVERCONFIGFIELDKINDS];
+
+/*----------------------Basic Types------------------------*/
+PARSE_JSON(Int64Field) {
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_ByteString buf = getJsonPart(tok, ctx->json);
+    UA_Int64 out;
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_Int64 *field = (UA_Int64*)configField;
+    *field = out;
+    return retval;
+}
+PARSE_JSON(UInt16Field) {
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_ByteString buf = getJsonPart(tok, ctx->json);
+    UA_UInt16 out;
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_UINT16], NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_UInt16 *field = (UA_UInt16*)configField;
+    *field = out;
+    return retval;
+}
+PARSE_JSON(UInt32Field) {
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_ByteString buf = getJsonPart(tok, ctx->json);
+    UA_UInt32 out;
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_UINT32], NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_UInt32 *field = (UA_UInt32*)configField;
+    *field = out;
+    return retval;
+}
+PARSE_JSON(UInt64Field) {
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_ByteString buf = getJsonPart(tok, ctx->json);
+    UA_UInt64 out;
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_UINT64], NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_UInt64 *field = (UA_UInt64*)configField;
+    *field = out;
+    return retval;
+}
+PARSE_JSON(StringField) {
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_ByteString buf = getJsonPart(tok, ctx->json);
+    UA_String out;
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_STRING], NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_String *field = (UA_String*)configField;
+    if(field != NULL) {
+        UA_String_clear(field);
+        *field = out;
+    }
+    return retval;
+}
+PARSE_JSON(LocalizedTextField) {
+    /*
+     applicationName: {
+        locale: "de-DE",
+        text: "Test text"
+    }
+     */
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_String locale;
+    UA_String text;
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field, &str_len);
+
+            tok = ctx->tokens[++ctx->index];
+            UA_ByteString buf = getJsonPart(tok, ctx->json);
+            if(strcmp(field, "locale") == 0)
+                retval |= UA_decodeJson(&buf, &locale, &UA_TYPES[UA_TYPES_STRING], NULL);
+            else if(strcmp(field, "text") == 0)
+                retval |= UA_decodeJson(&buf, &text, &UA_TYPES[UA_TYPES_STRING], NULL);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+    UA_LocalizedText out;
+    out.locale = locale;
+    out.text = text;
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_LocalizedText *field = (UA_LocalizedText*)configField;
+    if(field != NULL) {
+        UA_LocalizedText_clear(field);
+        *field = out;
+    }
+    return retval;
+}
+PARSE_JSON(DoubleField) {
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_ByteString buf = getJsonPart(tok, ctx->json);
+    UA_Double out;
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_Double *field = (UA_Double *)configField;
+    *field = out;
+    return retval;
+}
+PARSE_JSON(BooleanField) {
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_ByteString buf = getJsonPart(tok, ctx->json);
+    UA_Boolean out;
+    if(tok.type != CJ5_TOKEN_BOOL) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Value of type bool expected.");
+        return UA_STATUSCODE_BADTYPEMISMATCH;
+    }
+    UA_String val = UA_STRING("true");
+    if(UA_String_equal(&val, &buf)) {
+        out = true;
+    }else {
+        out = false;
+    }
+    /* set server config field */
+    UA_Boolean *field = (UA_Boolean *)configField;
+    *field = out;
+    return UA_STATUSCODE_GOOD;
+}
+PARSE_JSON(DurationField) {
+    UA_Double double_value;
+    UA_StatusCode retval = DoubleField_parseJson(ctx, &double_value, NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_Duration *field = (UA_Duration*)configField;
+    *field = (UA_Duration)double_value;
+    return retval;
+}
+PARSE_JSON(DurationRangeField) {
+    UA_DurationRange *field = (UA_DurationRange*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "min") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_DURATION](ctx, &field->min, NULL);
+            else if(strcmp(field_str, "max") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_DURATION](ctx, &field->max, NULL);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+PARSE_JSON(UInt32RangeField) {
+    UA_UInt32Range *field = (UA_UInt32Range*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "min") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &field->min, NULL);
+            else if(strcmp(field_str, "max") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &field->max, NULL);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+/*----------------------Advanced Types------------------------*/
+PARSE_JSON(BuildInfo) {
+    UA_BuildInfo *field = (UA_BuildInfo*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "productUri") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->productUri, NULL);
+            else if(strcmp(field_str, "manufacturerName") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->manufacturerName, NULL);
+            else if(strcmp(field_str, "productName") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->productName, NULL);
+            else if(strcmp(field_str, "softwareVersion") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->softwareVersion, NULL);
+            else if(strcmp(field_str, "buildNumber") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->buildNumber, NULL);
+            else if(strcmp(field_str, "buildDate") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_DATETIME](ctx, &field->buildDate, NULL);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+PARSE_JSON(ApplicationDescriptionField) {
+    UA_ApplicationDescription *field = (UA_ApplicationDescription*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "applicationUri") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->applicationUri, NULL);
+            else if(strcmp(field_str, "productUri") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->productUri, NULL);
+            else if(strcmp(field_str, "applicationName") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_LOCALIZEDTEXT](ctx, &field->applicationName, NULL);
+            else if(strcmp(field_str, "applicationType") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_APPLICATIONTYPE](ctx, &field->applicationType, NULL);
+            else if(strcmp(field_str, "gatewayServerUri") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->gatewayServerUri, NULL);
+            else if(strcmp(field_str, "discoveryProfileUri") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &field->discoveryProfileUri, NULL);
+            else if(strcmp(field_str, "discoveryUrls") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRINGARRAY](ctx, &field->discoveryUrls, &field->discoveryUrlsSize);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+PARSE_JSON(StringArrayField) {
+    if(configFieldSize == NULL) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Pointer to the array size is not set.");
+        return UA_STATUSCODE_BADARGUMENTSMISSING;
+    }
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_String *stringArray = (UA_String*)UA_malloc(sizeof(UA_String) * tok.size);
+    size_t stringArraySize = 0;
+    for(size_t j = tok.size; j > 0; j--) {
+        UA_String out = {.length = 0, .data = NULL};;
+        parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &out, NULL);
+        UA_String_copy(&out, &stringArray[stringArraySize++]);
+        UA_String_clear(&out);
+    }
+    /* Add to the config */
+    UA_String **field = (UA_String**)configField;
+    if(*configFieldSize > 0) {
+        UA_Array_delete(*field, *configFieldSize,
+                        &UA_TYPES[UA_TYPES_STRING]);
+        *field = NULL;
+        *configFieldSize = 0;
+    }
+    UA_StatusCode retval =
+        UA_Array_copy(stringArray, stringArraySize,
+                      (void**)field, &UA_TYPES[UA_TYPES_STRING]);
+    *configFieldSize = stringArraySize;
+
+    /* Clean up */
+    UA_Array_delete(stringArray, stringArraySize, &UA_TYPES[UA_TYPES_STRING]);
+    return retval;
+}
+PARSE_JSON(UInt32ArrayField) {
+    if(configFieldSize == NULL) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Pointer to the array size is not set.");
+        return UA_STATUSCODE_BADARGUMENTSMISSING;
+    }
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_UInt32 *numberArray = (UA_UInt32*)UA_malloc(sizeof(UA_UInt32) * tok.size);;
+    size_t numberArraySize = 0;
+    for(size_t j = tok.size; j > 0; j--) {
+        UA_UInt32 value;
+        UA_StatusCode retval = UInt32Field_parseJson(ctx, &value, NULL);
+        if(retval != UA_STATUSCODE_GOOD)
+            continue;
+        numberArray[numberArraySize++] = value;
+    }
+    /* Add to the config */
+    UA_UInt32 **field = (UA_UInt32**)configField;
+    if(*configFieldSize > 0) {
+        UA_Array_delete(*field, *configFieldSize,
+                        &UA_TYPES[UA_TYPES_UINT32]);
+        *field = NULL;
+        *configFieldSize = 0;
+    }
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(numberArraySize > 0) {
+        retval = UA_Array_copy(numberArray, numberArraySize,
+                          (void **)field, &UA_TYPES[UA_TYPES_UINT32]);
+        *configFieldSize = numberArraySize;
+    }
+    /* Clean up */
+    UA_Array_delete(numberArray, numberArraySize, &UA_TYPES[UA_TYPES_UINT32]);
+    return retval;
+}
+PARSE_JSON(DateTimeField) {
+    cj5_token tok = ctx->tokens[++ctx->index];
+    UA_ByteString buf = getJsonPart(tok, ctx->json);
+    UA_DateTime out;
+    UA_DateTime_init(&out);
+    UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DATETIME], NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_DateTime *field = (UA_DateTime*)configField;
+    *field = out;
+    return retval;
+}
+
+PARSE_JSON(MdnsConfigurationField) {
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    UA_ServerConfig *config = (UA_ServerConfig*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "mdnsServerName") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &config->mdnsConfig.mdnsServerName, NULL);
+            else if(strcmp(field_str, "serverCapabilities") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRINGARRAY](ctx, &config->mdnsConfig.serverCapabilities, &config->mdnsConfig.serverCapabilitiesSize);
+            else if(strcmp(field_str, "mdnsInterfaceIP") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &config->mdnsInterfaceIP, NULL);
+            else if(strcmp(field_str, "mdnsIpAddressList") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32ARRAY](ctx, &config->mdnsIpAddressList, &config->mdnsIpAddressListSize);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+        break;
+        }
+    }
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+PARSE_JSON(SubscriptionConfigurationField) {
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+    UA_ServerConfig *config = (UA_ServerConfig*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "maxSubscriptions") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxSubscriptions, NULL);
+            else if(strcmp(field_str, "maxSubscriptionsPerSession") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxSubscriptionsPerSession, NULL);
+            else if(strcmp(field_str, "publishingIntervalLimits") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_DURATIONRANGE](ctx, &config->publishingIntervalLimits, NULL);
+            else if(strcmp(field_str, "lifeTimeCountLimits") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32RANGE](ctx, &config->lifeTimeCountLimits, NULL);
+            else if(strcmp(field_str, "keepAliveCountLimits") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32RANGE](ctx, &config->keepAliveCountLimits, NULL);
+            else if(strcmp(field_str, "maxNotificationsPerPublish") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxNotificationsPerPublish, NULL);
+            else if(strcmp(field_str, "enableRetransmissionQueue") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->enableRetransmissionQueue, NULL);
+            else if(strcmp(field_str, "maxRetransmissionQueueSize") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxRetransmissionQueueSize, NULL);
+# ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
+            else if(strcmp(field_str, "maxEventsPerNode") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxEventsPerNode, NULL);
+# endif
+            else if(strcmp(field_str, "maxMonitoredItems") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxMonitoredItems, NULL);
+            else if(strcmp(field_str, "maxMonitoredItemsPerSubscription") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxMonitoredItemsPerSubscription, NULL);
+            else if(strcmp(field_str, "samplingIntervalLimits") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_DURATIONRANGE](ctx, &config->samplingIntervalLimits, NULL);
+            else if(strcmp(field_str, "queueSizeLimits") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32RANGE](ctx, &config->queueSizeLimits, NULL);
+            else if(strcmp(field_str, "maxPublishReqPerSession") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxPublishReqPerSession, NULL);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+PARSE_JSON(TcpConfigurationField) {
+    UA_ServerConfig *config = (UA_ServerConfig*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "tcpBufSize") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->tcpBufSize, NULL);
+            else if(strcmp(field_str, "tcpMaxMsgSize") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->tcpMaxMsgSize, NULL);
+            else if(strcmp(field_str, "tcpMaxChunks") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->tcpMaxChunks, NULL);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+PARSE_JSON(PubsubConfigurationField) {
+#ifdef UA_ENABLE_PUBSUB
+    UA_PubSubConfiguration *field = (UA_PubSubConfiguration*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "enableDeltaFrames") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &field->enableDeltaFrames, NULL);
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+            else if(strcmp(field_str, "enableInformationModelMethods") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &field->enableInformationModelMethods, NULL);
+#endif
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+PARSE_JSON(HistorizingConfigurationField) {
+#ifdef UA_ENABLE_HISTORIZING
+    UA_ServerConfig *config = (UA_ServerConfig*)configField;
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size/2; j > 0; j--) {
+        tok = ctx->tokens[++ctx->index];
+        switch (tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "accessHistoryDataCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->accessHistoryDataCapability, NULL);
+            else if(strcmp(field_str, "maxReturnDataValues") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxReturnDataValues, NULL);
+            else if(strcmp(field_str, "accessHistoryEventsCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->accessHistoryEventsCapability, NULL);
+            else if(strcmp(field_str, "maxReturnEventValues") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](ctx, &config->maxReturnEventValues, NULL);
+            else if(strcmp(field_str, "insertDataCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->insertDataCapability, NULL);
+            else if(strcmp(field_str, "insertEventCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->insertEventCapability, NULL);
+            else if(strcmp(field_str, "insertAnnotationsCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->insertAnnotationsCapability, NULL);
+            else if(strcmp(field_str, "replaceDataCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->replaceDataCapability, NULL);
+            else if(strcmp(field_str, "replaceEventCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->replaceEventCapability, NULL);
+            else if(strcmp(field_str, "updateDataCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->updateDataCapability, NULL);
+            else if(strcmp(field_str, "updateEventCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->updateEventCapability, NULL);
+            else if(strcmp(field_str, "deleteRawCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->deleteRawCapability, NULL);
+            else if(strcmp(field_str, "deleteEventCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->deleteEventCapability, NULL);
+            else if(strcmp(field_str, "deleteAtTimeDataCapability") == 0)
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](ctx, &config->deleteAtTimeDataCapability, NULL);
+            else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+PARSE_JSON(SecurityPolciesField) {
+#ifdef UA_ENABLE_ENCRYPTION
+    UA_ServerConfig *config = (UA_ServerConfig*)configField;
+
+    UA_String noneuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
+    UA_String basic128Rsa15uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15");
+    UA_String basic256uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
+    UA_String basic256Sha256uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    UA_String aes128sha256rsaoaepuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
+
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t j = tok.size; j > 0; j--) {
+
+        UA_String policy = {.length = 0, .data = NULL};
+        UA_ByteString certificate = {.length = 0, .data = NULL};
+        UA_ByteString privateKey = {.length = 0, .data = NULL};
+
+        tok = ctx->tokens[++ctx->index];
+        for(size_t i = tok.size / 2; i > 0; i--) {
+            tok = ctx->tokens[++ctx->index];
+            switch(tok.type) {
+            case CJ5_TOKEN_STRING: {
+                char *field_str = (char *)UA_malloc(tok.size + 1);
+                unsigned int str_len = 0;
+                cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+                if(strcmp(field_str, "certificate") == 0) {
+                    UA_String out = {.length = 0, .data = NULL};
+                    parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &out, NULL);
+
+                    if(out.length > 0) {
+                        char *certfile = (char *)UA_malloc(out.length + 1);
+                        memcpy(certfile, out.data, out.length);
+                        certfile[out.length] = '\0';
+                        certificate = loadCertificateFile(certfile);
+                        UA_String_clear(&out);
+                        UA_free(certfile);
+                    }
+                } else if(strcmp(field_str, "privateKey") == 0) {
+                    UA_String out = {.length = 0, .data = NULL};
+                    parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &out, NULL);
+
+                    if(out.length > 0) {
+                        char *keyfile = (char *)UA_malloc(out.length + 1);
+                        memcpy(keyfile, out.data, out.length);
+                        keyfile[out.length] = '\0';
+                        privateKey = loadCertificateFile(keyfile);
+                        UA_String_clear(&out);
+                        UA_free(keyfile);
+                    }
+                } else if(strcmp(field_str, "policy") == 0) {
+                    parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &policy, NULL);
+                } else {
+                    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+                }
+                UA_free(field_str);
+                break;
+            }
+            default:
+                break;
+            }
+        }
+
+        if(certificate.length == 0 || privateKey.length == 0) {
+            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                           "Certificate and PrivateKey must be set for every policy.");
+            if(policy.length > 0)
+                UA_String_clear(&policy);
+            if(certificate.length > 0)
+                UA_ByteString_clear(&certificate);
+            if(privateKey.length > 0)
+                UA_ByteString_clear(&privateKey);
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        UA_StatusCode retval = UA_STATUSCODE_GOOD;
+        if(UA_String_equal(&policy, &noneuri)) {
+            /* Nothing to do! */
+        } else if(UA_String_equal(&policy, &basic128Rsa15uri)) {
+            retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &certificate, &privateKey);
+            if(retval != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                               "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
+                               UA_StatusCode_name(retval));
+            }
+        } else if(UA_String_equal(&policy, &basic256uri)) {
+            retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &certificate, &privateKey);
+            if(retval != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                               "Could not add SecurityPolicy#Basic256 with error code %s",
+                               UA_StatusCode_name(retval));
+            }
+        } else if(UA_String_equal(&policy, &basic256Sha256uri)) {
+            retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &certificate, &privateKey);
+            if(retval != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                               "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+                               UA_StatusCode_name(retval));
+            }
+        } else if(UA_String_equal(&policy, &aes128sha256rsaoaepuri)) {
+            retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &certificate, &privateKey);
+            if(retval != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                               "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+                               UA_StatusCode_name(retval));
+            }
+        } else {
+            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND, "Unknown Security Policy.");
+        }
+
+        /* Add all Endpoints */
+        UA_ServerConfig_addAllEndpoints(config);
+
+        if(policy.length > 0)
+            UA_String_clear(&policy);
+        if(certificate.length > 0)
+            UA_ByteString_clear(&certificate);
+        if(privateKey.length > 0)
+            UA_ByteString_clear(&privateKey);
+    }
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+PARSE_JSON(SecurityPkiField) {
+#ifdef UA_ENABLE_ENCRYPTION
+    UA_CertificateVerification *field = (UA_CertificateVerification*)configField;
+    UA_String trustListFolder = {.length = 0, .data = NULL};
+    UA_String issuerListFolder = {.length = 0, .data = NULL};
+    UA_String revocationListFolder = {.length = 0, .data = NULL};
+
+    cj5_token tok = ctx->tokens[++ctx->index];
+    for(size_t i = tok.size/2; i > 0; i--) {
+        tok = ctx->tokens[++ctx->index];
+        switch(tok.type) {
+        case CJ5_TOKEN_STRING: {
+            char *field_str = (char*)UA_malloc(tok.size + 1);
+            unsigned int str_len = 0;
+            cj5_get_str(&ctx->result, (unsigned int)ctx->index, field_str, &str_len);
+            if(strcmp(field_str, "trustListFolder") == 0) {
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &trustListFolder, NULL);
+            } else if(strcmp(field_str, "issuerListFolder") == 0) {
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &issuerListFolder, NULL);
+            } else if(strcmp(field_str, "revocationListFolder") == 0) {
+                parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &revocationListFolder, NULL);
+            } else {
+                UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
+            }
+            UA_free(field_str);
+            break;
+        }
+        default:
+            break;
+        }
+    }
+#ifndef __linux__
+    /* Currently not supported! */
+    return UA_STATUSCODE_GOOD;
+#else
+    /* set server config field */
+    char *sTrustListFolder = NULL;
+    char *sIssuerListFolder = NULL;
+    char *sRevocationListFolder = NULL;
+    if(trustListFolder.length > 0) {
+        sTrustListFolder = (char*)UA_malloc(trustListFolder.length+1);
+        memcpy(sTrustListFolder, trustListFolder.data, trustListFolder.length);
+        sTrustListFolder[trustListFolder.length] = '\0';
+    }
+    if(issuerListFolder.length > 0) {
+        sIssuerListFolder = (char*)UA_malloc(issuerListFolder.length+1);
+        memcpy(sIssuerListFolder, issuerListFolder.data, issuerListFolder.length);
+        sIssuerListFolder[issuerListFolder.length] = '\0';
+    }
+    if(revocationListFolder.length > 0) {
+        sRevocationListFolder = (char*)UA_malloc(revocationListFolder.length+1);
+        memcpy(sRevocationListFolder, revocationListFolder.data, revocationListFolder.length);
+        sRevocationListFolder[revocationListFolder.length] = '\0';
+    }
+    if(field && field->clear)
+        field->clear(field);
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+    UA_StatusCode retval = UA_CertificateVerification_CertFolders(field, sTrustListFolder,
+                                                                  sIssuerListFolder, sRevocationListFolder, NULL);
+#else
+    UA_StatusCode retval = UA_CertificateVerification_CertFolders(field, sTrustListFolder,
+                                                                  sIssuerListFolder, sRevocationListFolder);
+#endif
+    /* Clean up */
+    if(sTrustListFolder)
+        UA_free(sTrustListFolder);
+    if(sIssuerListFolder)
+        UA_free(sIssuerListFolder);
+    if(sRevocationListFolder)
+        UA_free(sRevocationListFolder);
+    UA_String_clear(&trustListFolder);
+    UA_String_clear(&issuerListFolder);
+    UA_String_clear(&revocationListFolder);
+
+    return retval;
+#endif
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+/*----------------------Enumerations------------------------*/
+PARSE_JSON(ApplicationTypeField) {
+    UA_UInt32 enum_value;
+    UA_StatusCode retval = UInt32Field_parseJson(ctx, &enum_value, NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_ApplicationType *field = (UA_ApplicationType*)configField;
+    *field = (UA_ApplicationType)enum_value;
+    return retval;
+}
+PARSE_JSON(RuleHandlingField) {
+    UA_UInt32 enum_value;
+    UA_StatusCode retval = UInt32Field_parseJson(ctx, &enum_value, NULL);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    UA_RuleHandling *field = (UA_RuleHandling*)configField;
+    *field = (UA_RuleHandling)enum_value;
+    return retval;
+}
+
+const parseJsonSignature parseJsonJumpTable[UA_SERVERCONFIGFIELDKINDS] = {
+    /* Basic Types */
+    (parseJsonSignature)Int64Field_parseJson,
+    (parseJsonSignature)UInt16Field_parseJson,
+    (parseJsonSignature)UInt32Field_parseJson,
+    (parseJsonSignature)UInt64Field_parseJson,
+    (parseJsonSignature)StringField_parseJson,
+    (parseJsonSignature)LocalizedTextField_parseJson,
+    (parseJsonSignature)DoubleField_parseJson,
+    (parseJsonSignature)BooleanField_parseJson,
+    (parseJsonSignature)DurationField_parseJson,
+    (parseJsonSignature)DurationRangeField_parseJson,
+    (parseJsonSignature)UInt32RangeField_parseJson,
+
+    /* Advanced Types */
+    (parseJsonSignature)BuildInfo_parseJson,
+    (parseJsonSignature)ApplicationDescriptionField_parseJson,
+    (parseJsonSignature)StringArrayField_parseJson,
+    (parseJsonSignature)UInt32ArrayField_parseJson,
+    (parseJsonSignature)DateTimeField_parseJson,
+    (parseJsonSignature)SubscriptionConfigurationField_parseJson,
+    (parseJsonSignature)TcpConfigurationField_parseJson,
+    (parseJsonSignature)PubsubConfigurationField_parseJson,
+    (parseJsonSignature)HistorizingConfigurationField_parseJson,
+    (parseJsonSignature)MdnsConfigurationField_parseJson,
+    (parseJsonSignature)SecurityPolciesField_parseJson,
+    (parseJsonSignature)SecurityPkiField_parseJson,
+
+    /* Enumerations */
+    (parseJsonSignature)ApplicationTypeField_parseJson,
+    (parseJsonSignature)RuleHandlingField_parseJson,
+};
+
+static UA_StatusCode
+parseJSONConfig(UA_ServerConfig *config, UA_ByteString json_config) {
+    // Parsing json config
+    const char *json = (const char*)json_config.data;
+    cj5_token tokens[MAX_TOKENS];
+    cj5_result r = cj5_parse(json, (unsigned int)json_config.length, tokens, MAX_TOKENS, NULL);
+
+    ParsingCtx ctx;
+    ctx.json = json;
+    ctx.result = r;
+    ctx.tokens = r.tokens;
+    ctx.tokensSize = r.num_tokens;
+    ctx.index = 1; // The first token is ignored because it is known and not needed.
+
+    size_t serverConfigSize = 0;
+    if(ctx.tokens)
+        serverConfigSize = (ctx.tokens[ctx.index-1].size/2);
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    for (size_t j = serverConfigSize; j > 0; j--) {
+        cj5_token tok = ctx.tokens[ctx.index];
+        switch (tok.type) {
+            case CJ5_TOKEN_STRING: {
+                char *field = (char*)UA_malloc(tok.size + 1);
+                unsigned int str_len = 0;
+                cj5_get_str(&ctx.result, (unsigned int)ctx.index, field, &str_len);
+                if(strcmp(field, "buildInfo") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_BUILDINFO](&ctx, &config->buildInfo, NULL);
+                else if(strcmp(field, "applicationDescription") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_APPLICATIONDESCRIPTION](&ctx, &config->applicationDescription, NULL);
+                else if(strcmp(field, "shutdownDelay") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_DOUBLE](&ctx, &config->shutdownDelay, NULL);
+                else if(strcmp(field, "verifyRequestTimestamp") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_RULEHANDLING](&ctx, &config->verifyRequestTimestamp, NULL);
+                else if(strcmp(field, "allowEmptyVariables") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_RULEHANDLING](&ctx, &config->allowEmptyVariables, NULL);
+                else if(strcmp(field, "serverUrls") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRINGARRAY](&ctx, &config->serverUrls, &config->serverUrlsSize);
+                else if(strcmp(field, "tcpEnabled") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](&ctx, &config->tcpEnabled, NULL);
+                else if(strcmp(field, "tcp") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_TCPCONFIGURATION](&ctx, config, NULL);
+                else if(strcmp(field, "securityPolicyNoneDiscoveryOnly") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](&ctx, &config->securityPolicyNoneDiscoveryOnly, NULL);
+                else if(strcmp(field, "modellingRulesOnInstances") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](&ctx, &config->modellingRulesOnInstances, NULL);
+                else if(strcmp(field, "maxSecureChannels") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT16](&ctx, &config->maxSecureChannels, NULL);
+                else if(strcmp(field, "maxSecurityTokenLifetime") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxSecurityTokenLifetime, NULL);
+                else if(strcmp(field, "maxSessions") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT16](&ctx, &config->maxSessions, NULL);
+                else if(strcmp(field, "maxSessionTimeout") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_DOUBLE](&ctx, &config->maxSessionTimeout, NULL);
+                else if(strcmp(field, "maxNodesPerRead") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxNodesPerRead, NULL);
+                else if(strcmp(field, "maxNodesPerWrite") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxNodesPerWrite, NULL);
+                else if(strcmp(field, "maxNodesPerMethodCall") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxNodesPerMethodCall, NULL);
+                else if(strcmp(field, "maxNodesPerBrowse") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxNodesPerBrowse, NULL);
+                else if(strcmp(field, "maxNodesPerRegisterNodes") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxNodesPerRegisterNodes, NULL);
+                else if(strcmp(field, "maxNodesPerTranslateBrowsePathsToNodeIds") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxNodesPerTranslateBrowsePathsToNodeIds, NULL);
+                else if(strcmp(field, "maxNodesPerNodeManagement") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxNodesPerNodeManagement, NULL);
+                else if(strcmp(field, "maxMonitoredItemsPerCall") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxMonitoredItemsPerCall, NULL);
+                else if(strcmp(field, "maxReferencesPerNode") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->maxReferencesPerNode, NULL);
+                else if(strcmp(field, "reverseReconnectInterval") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->reverseReconnectInterval, NULL);
+
+#if UA_MULTITHREADING >= 100
+                else if(strcmp(field, "asyncOperationTimeout") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_DOUBLE](&ctx, &config->asyncOperationTimeout, NULL);
+                else if(strcmp(field, "maxAsyncOperationQueueSize") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT64](&ctx, &config->maxAsyncOperationQueueSize, NULL);
+#endif
+
+#ifdef UA_ENABLE_DISCOVERY
+                else if(strcmp(field, "discoveryCleanupTimeout") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32](&ctx, &config->discoveryCleanupTimeout, NULL);
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+                else if(strcmp(field, "mdnsEnabled") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](&ctx, &config->mdnsEnabled, NULL);
+                else if(strcmp(field, "mdns") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_MDNSCONFIGURATION](&ctx, config, NULL);
+#if !defined(UA_HAS_GETIFADDR)
+                else if(strcmp(field, "mdnsIpAddressList") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32ARRAY](&ctx, &config->mdnsIpAddressList, &config->mdnsIpAddressListSize);
+#endif
+#endif
+#endif
+
+#ifdef UA_ENABLE_SUBSCRIPTIONS
+                else if(strcmp(field, "subscriptionsEnabled") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](&ctx, &config->subscriptionsEnabled, NULL);
+                else if(strcmp(field, "subscriptions") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_SUBSCRIPTIONCONFIGURATION](&ctx, config, NULL);
+# endif
+
+#ifdef UA_ENABLE_HISTORIZING
+                else if(strcmp(field, "historizingEnabled") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](&ctx, &config->historizingEnabled, NULL);
+                else if(strcmp(field, "historizing") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_HISTORIZINGCONFIGURATION](&ctx, config, NULL);
+#endif
+
+#ifdef UA_ENABLE_PUBSUB
+                else if(strcmp(field, "pubsubEnabled") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_BOOLEAN](&ctx, &config->pubsubEnabled, NULL);
+                else if(strcmp(field, "pubsub") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_PUBSUBCONFIGURATION](&ctx, config, NULL);
+#endif
+#ifdef UA_ENABLE_ENCRYPTION
+                else if(strcmp(field, "securityPolicies") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_SECURITYPOLICIES](&ctx, config, NULL);
+                else if(strcmp(field, "secureChannelPKI") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_SECURITYPKI](&ctx, &config->secureChannelPKI, NULL);
+                else if(strcmp(field, "sessionPKI") == 0)
+                    retval = parseJsonJumpTable[UA_SERVERCONFIGFIELD_SECURITYPKI](&ctx, &config->sessionPKI, NULL);
+#endif
+                else {
+                    UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Field name '%s' unknown or misspelled. Maybe the feature is not enabled either.", field);
+                }
+                UA_free(field);
+                if(retval != UA_STATUSCODE_GOOD) {
+                    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "An error occurred while parsing the configuration file.");
+                    return retval;
+                }
+                break;
+            }
+            default:
+                break;
+        }
+        ctx.index += 1;
+    }
+    return retval;
+}
+
+UA_Server *
+UA_Server_newFromFile(const UA_ByteString json_config) {
+    UA_ServerConfig config;
+    memset(&config, 0, sizeof(UA_ServerConfig));
+    UA_StatusCode res = UA_ServerConfig_setDefault(&config);
+    res |= parseJSONConfig(&config, json_config);
+    if(res != UA_STATUSCODE_GOOD)
+        return NULL;
+    return UA_Server_newWithConfig(&config);
+}
+
+UA_StatusCode
+UA_ServerConfig_updateFromFile(UA_ServerConfig *config, const UA_ByteString json_config) {
+    UA_StatusCode res = parseJSONConfig(config, json_config);
+    return res;
+}
+
+#ifdef UA_ENABLE_ENCRYPTION
+static UA_ByteString
+loadCertificateFile(const char *const path) {
+    UA_ByteString fileContents = UA_STRING_NULL;
+
+    /* Open the file */
+    FILE *fp = fopen(path, "rb");
+    if(!fp) {
+        errno = 0; /* We read errno also from the tcp layer... */
+        return fileContents;
+    }
+
+    /* Get the file length, allocate the data and read */
+    fseek(fp, 0, SEEK_END);
+    fileContents.length = (size_t)ftell(fp);
+    fileContents.data = (UA_Byte *)UA_malloc(fileContents.length * sizeof(UA_Byte));
+    if(fileContents.data) {
+        fseek(fp, 0, SEEK_SET);
+        size_t read = fread(fileContents.data, sizeof(UA_Byte), fileContents.length, fp);
+        if(read != fileContents.length)
+            UA_ByteString_clear(&fileContents);
+    } else {
+        fileContents.length = 0;
+    }
+    fclose(fp);
+
+    return fileContents;
+}
+#endif
diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index b9a78cfca47..8dac8756a5d 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -230,12 +230,10 @@ UA_PubSubConnection_setPubSubState(UA_Server *server,
 /*              DataSetWriter                 */
 /**********************************************/
 
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
 typedef struct UA_DataSetWriterSample {
     UA_Boolean valueChanged;
     UA_DataValue value;
 } UA_DataSetWriterSample;
-#endif
 
 typedef struct UA_DataSetWriter {
     UA_PubSubComponentEnumType componentType;
@@ -246,11 +244,12 @@ typedef struct UA_DataSetWriter {
     UA_NodeId connectedDataSet;
     UA_ConfigurationVersionDataType connectedDataSetVersion;
     UA_PubSubState state;
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
+
+    /* Deltaframes */
     UA_UInt16 deltaFrameCounter; /* count of sent deltaFrames */
     size_t lastSamplesCount;
     UA_DataSetWriterSample *lastSamples;
-#endif
+
     UA_UInt16 actualDataSetMessageSequenceCount;
     UA_Boolean configurationFrozen;
 } UA_DataSetWriter;
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 320d3a67640..2d94693a232 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -306,8 +306,6 @@ addVariableValueSource(UA_Server *server, UA_ValueCallback valueCallback,
     return setVariableNode_valueCallback(server, node, valueCallback);
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-
 static UA_StatusCode
 addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsubConnection,
                           UA_NodeId *connectionId) {
@@ -593,7 +591,6 @@ addDataSetReaderConfig(UA_Server *server, UA_NodeId readerGroupId,
     UA_free(pMetaData->fields);
     return retVal;
 }
-#endif
 
 /*************************************************/
 /*            PubSubConnection                   */
@@ -689,22 +686,20 @@ addPubSubConnectionRepresentation(UA_Server *server, UA_PubSubConnection *connec
     retVal |= addVariableValueSource(server, valueCallback, publisherIdNode,
                                      connectionPublisherIdContext);
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= addRef(server, connection->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDWRITERGROUP), true);
-    retVal |= addRef(server, connection->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDREADERGROUP), true);
-    retVal |= addRef(server, connection->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_REMOVEGROUP), true);
-#endif
+    if(server->config.pubSubConfig.enableInformationModelMethods) {
+        retVal |= addRef(server, connection->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDWRITERGROUP), true);
+        retVal |= addRef(server, connection->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDREADERGROUP), true);
+        retVal |= addRef(server, connection->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_REMOVEGROUP), true);
+    }
     return retVal;
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-
 static UA_StatusCode
 addPubSubConnectionLocked(UA_Server *server,
                           const UA_NodeId *sessionId, void *sessionHandle,
@@ -822,10 +817,6 @@ addPubSubConnectionAction(UA_Server *server,
     return res;
 }
 
-#endif
-
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-
 static UA_StatusCode
 removeConnectionAction(UA_Server *server,
                        const UA_NodeId *sessionId, void *sessionHandle,
@@ -842,8 +833,6 @@ removeConnectionAction(UA_Server *server,
     return retVal;
 }
 
-#endif
-
 /**********************************************/
 /*               DataSetReader                */
 /**********************************************/
@@ -913,8 +902,6 @@ addDataSetReaderRepresentation(UA_Server *server, UA_DataSetReader *dataSetReade
     return retVal;
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-
 static UA_StatusCode
 addDataSetReaderLocked(UA_Server *server,
                        const UA_NodeId *sessionId, void *sessionHandle,
@@ -969,12 +956,10 @@ removeDataSetReaderAction(UA_Server *server,
     UA_NodeId nodeToRemove = *((UA_NodeId *)input[0].data);
     return UA_Server_removeDataSetReader(server, nodeToRemove);
 }
-#endif
 
 /*************************************************/
 /*                PublishedDataSet               */
 /*************************************************/
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 addDataSetFolderAction(UA_Server *server,
                        const UA_NodeId *sessionId, void *sessionHandle,
@@ -997,25 +982,24 @@ addDataSetFolderAction(UA_Server *server,
                                       UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE),
                                       objectAttributes, NULL, &generatedId);
     UA_Variant_setScalarCopy(output, &generatedId, &UA_TYPES[UA_TYPES_NODEID]);
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= UA_Server_addReference(server, generatedId,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), true);
-    retVal |= UA_Server_addReference(server, generatedId,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), true);
-    retVal |= UA_Server_addReference(server, generatedId,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), true);
-    retVal |= UA_Server_addReference(server, generatedId,
-                                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                                     UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), true);
-#endif
+
+    if(server->config.pubSubConfig.enableInformationModelMethods) {
+        retVal |= UA_Server_addReference(server, generatedId,
+                                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), true);
+        retVal |= UA_Server_addReference(server, generatedId,
+                                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), true);
+        retVal |= UA_Server_addReference(server, generatedId,
+                                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), true);
+        retVal |= UA_Server_addReference(server, generatedId,
+                                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), true);
+    }
     return retVal;
 }
-#endif
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 removeDataSetFolderAction(UA_Server *server,
                           const UA_NodeId *sessionId, void *sessionHandle,
@@ -1026,7 +1010,6 @@ removeDataSetFolderAction(UA_Server *server,
     UA_NodeId nodeToRemove = *((UA_NodeId *) input[0].data);
     return UA_Server_deleteNode(server, nodeToRemove, true);
 }
-#endif
 
 UA_StatusCode
 addPublishedDataItemsRepresentation(UA_Server *server,
@@ -1101,18 +1084,17 @@ addPublishedDataItemsRepresentation(UA_Server *server,
     retVal |= addVariableValueSource(server, valueCallback,
                                      dataSetMetaDataNode, metaDataContext);
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= addRef(server, publishedDataSet->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_ADDVARIABLES), true);
-    retVal |= addRef(server, publishedDataSet->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_REMOVEVARIABLES), true);
-#endif
+    if(server->config.pubSubConfig.enableInformationModelMethods) {
+        retVal |= addRef(server, publishedDataSet->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_ADDVARIABLES), true);
+        retVal |= addRef(server, publishedDataSet->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_REMOVEVARIABLES), true);
+    }
     return retVal;
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 addPublishedDataItemsAction(UA_Server *server,
                             const UA_NodeId *sessionId, void *sessionHandle,
@@ -1169,9 +1151,7 @@ addPublishedDataItemsAction(UA_Server *server,
     UA_Variant_setScalarCopy(output, &dataSetItemsNodeId, &UA_TYPES[UA_TYPES_NODEID]);
     return retVal;
 }
-#endif
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 addVariablesAction(UA_Server *server,
                    const UA_NodeId *sessionId, void *sessionHandle,
@@ -1202,7 +1182,6 @@ removePublishedDataSetAction(UA_Server *server,
     UA_NodeId nodeToRemove = *((UA_NodeId *) input[0].data);
     return UA_Server_removePublishedDataSet(server, nodeToRemove);
 }
-#endif
 
 /**********************************************/
 /*       StandaloneSubscribedDataSet          */
@@ -1443,19 +1422,17 @@ addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup) {
     }
 
     /* Add reference to methods */
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= addRef(server, writerGroup->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_ADDDATASETWRITER), true);
-    retVal |= addRef(server, writerGroup->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), true);
-#endif
-
+    if(server->config.pubSubConfig.enableInformationModelMethods) {
+        retVal |= addRef(server, writerGroup->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_ADDDATASETWRITER), true);
+        retVal |= addRef(server, writerGroup->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), true);
+    }
     return retVal;
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 addWriterGroupAction(UA_Server *server,
                              const UA_NodeId *sessionId, void *sessionHandle,
@@ -1503,13 +1480,11 @@ removeGroupAction(UA_Server *server,
         return UA_Server_removeReaderGroup(server, nodeToRemove);
     }
 }
-#endif
 
 /**********************************************/
 /*               ReserveIds                   */
 /**********************************************/
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 addReserveIdsLocked(UA_Server *server,
                     const UA_NodeId *sessionId, void *sessionHandle,
@@ -1574,7 +1549,6 @@ addReserveIdsAction(UA_Server *server,
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
-#endif
 
 /**********************************************/
 /*               ReaderGroup                  */
@@ -1598,18 +1572,17 @@ addReaderGroupRepresentation(UA_Server *server, UA_ReaderGroup *readerGroup) {
                 UA_QUALIFIEDNAME(0, rgName), UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE),
                 &object_attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],
                 NULL, &readerGroup->identifier);
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    retVal |= addRef(server, readerGroup->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), true);
-    retVal |= addRef(server, readerGroup->identifier,
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), true);
-#endif
+    if(server->config.pubSubConfig.enableInformationModelMethods) {
+        retVal |= addRef(server, readerGroup->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), true);
+        retVal |= addRef(server, readerGroup->identifier,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), true);
+    }
     return retVal;
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
 static UA_StatusCode
 addReaderGroupAction(UA_Server *server,
                      const UA_NodeId *sessionId, void *sessionHandle,
@@ -1634,7 +1607,6 @@ addReaderGroupAction(UA_Server *server,
     UA_UNLOCK(&server->serviceMutex);
     return retVal;
 }
-#endif
 
 #ifdef UA_ENABLE_PUBSUB_SKS
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
@@ -1829,8 +1801,6 @@ addDataSetWriterRepresentation(UA_Server *server, UA_DataSetWriter *dataSetWrite
     return retVal;
 }
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-
 static UA_StatusCode
 addDataSetWriterLocked(UA_Server *server,
                        const UA_NodeId *sessionId, void *sessionHandle,
@@ -1892,9 +1862,8 @@ removeDataSetWriterAction(UA_Server *server,
     UA_NodeId nodeToRemove = *((UA_NodeId *) input[0].data);
     return UA_Server_removeDataSetWriter(server, nodeToRemove);
 }
-#endif
 
-#if defined(UA_ENABLE_PUBSUB_SKS) && defined(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
+#ifdef UA_ENABLE_PUBSUB_SKS
 /**
  * @note The user credentials and permissions are checked in the AccessControl plugin
  * before this callback is executed.
@@ -2292,7 +2261,7 @@ standaloneSubscribedDataSetTypeDestructor(UA_Server *server,
 /*         PubSub configurator       */
 /*************************************/
 
-#if defined(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS) && defined(UA_ENABLE_PUBSUB_FILE_CONFIG)
+#ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
 
 /* Callback function that will be executed when the method "PubSub configurator
  * (replace config)" is called. */
@@ -2331,7 +2300,7 @@ UA_deletePubSubConfigMethodCallback(UA_Server *server,
     return UA_STATUSCODE_GOOD;
 }
 
-#endif /* defined(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS) && defined(UA_ENABLE_PUBSUB_FILE_CONFIG) */
+#endif
 
 UA_StatusCode
 initPubSubNS0(UA_Server *server) {
@@ -2345,94 +2314,93 @@ initPubSubNS0(UA_Server *server) {
            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SUPPORTEDTRANSPORTPROFILES),
                                           profileArray, 1, &UA_TYPES[UA_TYPES_STRING]);
 
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS
-    /* Add missing references */
-    retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), true);
-    retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), true);
-    retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), true);
-    retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                     UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), true);
-
-    /* Set method callbacks */
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_ADDCONNECTION), addPubSubConnectionAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_REMOVECONNECTION), removeConnectionAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), addDataSetFolderAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), removeDataSetFolderAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), addPublishedDataItemsAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), removePublishedDataSetAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_ADDVARIABLES), addVariablesAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_REMOVEVARIABLES), removeVariablesAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDWRITERGROUP), addWriterGroupAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDREADERGROUP), addReaderGroupAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_REMOVEGROUP), removeGroupAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_ADDDATASETWRITER), addDataSetWriterAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), removeDataSetWriterAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), addDataSetReaderAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), removeDataSetReaderAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS), addReserveIdsAction);
+    if(server->config.pubSubConfig.enableInformationModelMethods) {
+        /* Add missing references */
+        retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), true);
+        retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), true);
+        retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), true);
+        retVal |= addRef(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBLISHEDDATASETS),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), true);
+
+        /* Set method callbacks */
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_ADDCONNECTION), addPubSubConnectionAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_REMOVECONNECTION), removeConnectionAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDDATASETFOLDER), addDataSetFolderAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEDATASETFOLDER), removeDataSetFolderAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_ADDPUBLISHEDDATAITEMS), addPublishedDataItemsAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_DATASETFOLDERTYPE_REMOVEPUBLISHEDDATASET), removePublishedDataSetAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_ADDVARIABLES), addVariablesAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHEDDATAITEMSTYPE_REMOVEVARIABLES), removeVariablesAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDWRITERGROUP), addWriterGroupAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_ADDREADERGROUP), addReaderGroupAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBSUBCONNECTIONTYPE_REMOVEGROUP), removeGroupAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_ADDDATASETWRITER), addDataSetWriterAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_WRITERGROUPTYPE_REMOVEDATASETWRITER), removeDataSetWriterAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_ADDDATASETREADER), addDataSetReaderAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_READERGROUPTYPE_REMOVEDATASETREADER), removeDataSetReaderAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_PUBSUBCONFIGURATION_RESERVEIDS), addReserveIdsAction);
 #ifdef UA_ENABLE_PUBSUB_SKS
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SETSECURITYKEYS), setSecurityKeysAction);
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS), getSecurityKeysAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_SETSECURITYKEYS), setSecurityKeysAction);
+        retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_GETSECURITYKEYS), getSecurityKeysAction);
 #endif
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
-    /* Adds method node to server. This method is used to load binary files for
-     * PubSub configuration and delete / replace old PubSub configurations. */
-    UA_Argument inputArgument;
-    UA_Argument_init(&inputArgument);
-    inputArgument.description = UA_LOCALIZEDTEXT("", "PubSub config binfile");
-    inputArgument.name = UA_STRING("BinFile");
-    inputArgument.dataType = UA_TYPES[UA_TYPES_BYTESTRING].typeId;
-    inputArgument.valueRank = UA_VALUERANK_SCALAR;
-
-    UA_MethodAttributes configAttr = UA_MethodAttributes_default;
-    configAttr.description = UA_LOCALIZEDTEXT("","Load binary configuration file");
-    configAttr.displayName = UA_LOCALIZEDTEXT("","LoadPubSubConfigurationFile");
-    configAttr.executable = true;
-    configAttr.userExecutable = true;
-    retVal |= addMethodNode(server, UA_NODEID_NULL,
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASORDEREDCOMPONENT),
-                            UA_QUALIFIEDNAME(1, "PubSub configuration"),
-                            &configAttr, UA_loadPubSubConfigMethodCallback,
-                            1, &inputArgument, UA_NODEID_NULL, NULL,
-                            0, NULL, UA_NODEID_NULL, NULL,
-                            NULL, NULL);
-
-    /* Adds method node to server. This method is used to delete the current
-     * PubSub configuration. */
-    configAttr.description = UA_LOCALIZEDTEXT("","Delete current PubSub configuration");
-    configAttr.displayName = UA_LOCALIZEDTEXT("","DeletePubSubConfiguration");
-    configAttr.executable = true;
-    configAttr.userExecutable = true;
-    retVal |= addMethodNode(server, UA_NODEID_NULL,
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASORDEREDCOMPONENT),
-                            UA_QUALIFIEDNAME(1, "Delete PubSub config"),
-                            &configAttr, UA_deletePubSubConfigMethodCallback,
-                            0, NULL, UA_NODEID_NULL, NULL,
-                            0, NULL, UA_NODEID_NULL, NULL,
-                            NULL, NULL);
-#endif
-
-#else
-    /* Remove methods */
-    retVal |= deleteReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), true,
-                              UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_ADDCONNECTION),
-                              false);
-    retVal |= deleteReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), true,
-                              UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_REMOVECONNECTION),
-                              false);
+        /* Adds method node to server. This method is used to load binary files for
+         * PubSub configuration and delete / replace old PubSub configurations. */
+        UA_Argument inputArgument;
+        UA_Argument_init(&inputArgument);
+        inputArgument.description = UA_LOCALIZEDTEXT("", "PubSub config binfile");
+        inputArgument.name = UA_STRING("BinFile");
+        inputArgument.dataType = UA_TYPES[UA_TYPES_BYTESTRING].typeId;
+        inputArgument.valueRank = UA_VALUERANK_SCALAR;
+
+        UA_MethodAttributes configAttr = UA_MethodAttributes_default;
+        configAttr.description = UA_LOCALIZEDTEXT("","Load binary configuration file");
+        configAttr.displayName = UA_LOCALIZEDTEXT("","LoadPubSubConfigurationFile");
+        configAttr.executable = true;
+        configAttr.userExecutable = true;
+        retVal |= addMethodNode(server, UA_NODEID_NULL,
+                                UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASORDEREDCOMPONENT),
+                                UA_QUALIFIEDNAME(1, "PubSub configuration"),
+                                &configAttr, UA_loadPubSubConfigMethodCallback,
+                                1, &inputArgument, UA_NODEID_NULL, NULL,
+                                0, NULL, UA_NODEID_NULL, NULL,
+                                NULL, NULL);
+
+        /* Adds method node to server. This method is used to delete the current
+         * PubSub configuration. */
+        configAttr.description = UA_LOCALIZEDTEXT("","Delete current PubSub configuration");
+        configAttr.displayName = UA_LOCALIZEDTEXT("","DeletePubSubConfiguration");
+        configAttr.executable = true;
+        configAttr.userExecutable = true;
+        retVal |= addMethodNode(server, UA_NODEID_NULL,
+                                UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASORDEREDCOMPONENT),
+                                UA_QUALIFIEDNAME(1, "Delete PubSub config"),
+                                &configAttr, UA_deletePubSubConfigMethodCallback,
+                                0, NULL, UA_NODEID_NULL, NULL,
+                                0, NULL, UA_NODEID_NULL, NULL,
+                                NULL, NULL);
 #endif
+    } else {
+        /* Remove methods */
+        retVal |= deleteReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), true,
+                                  UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_ADDCONNECTION),
+                                  false);
+        retVal |= deleteReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE),
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), true,
+                                  UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_PUBLISHSUBSCRIBE_REMOVECONNECTION),
+                                  false);
+    }
 
     /* Set the object-type destructors */
     UA_NodeTypeLifecycle lifeCycle;
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 07273d40236..5788eaf299e 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -20,9 +20,7 @@
 #include "ua_pubsub_ns0.h"
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
 #include "ua_types_encoding_binary.h"
-#endif
 
 #ifdef UA_ENABLE_PUBSUB_BUFMALLOC
 #include "ua_pubsub_bufmalloc.h"
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index b6d8c3e3aec..9969a441f5b 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -21,9 +21,7 @@
 #include "ua_pubsub_ns0.h"
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
 #include "ua_types_encoding_binary.h"
-#endif
 
 UA_StatusCode
 UA_DataSetWriterConfig_copy(const UA_DataSetWriterConfig *src,
@@ -268,24 +266,23 @@ UA_DataSetWriter_create(UA_Server *server,
         newDataSetWriter->connectedDataSetVersion =
             currentDataSetContext->dataSetMetaData.configurationVersion;
 
-    #ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
-        /* Initialize the queue for the last values */
-        if(currentDataSetContext->fieldSize > 0) {
-            newDataSetWriter->lastSamples = (UA_DataSetWriterSample*)
-                UA_calloc(currentDataSetContext->fieldSize, sizeof(UA_DataSetWriterSample));
-            if(!newDataSetWriter->lastSamples) {
-                UA_DataSetWriterConfig_clear(&newDataSetWriter->config);
-                UA_free(newDataSetWriter);
-                return UA_STATUSCODE_BADOUTOFMEMORY;
-            }
-            newDataSetWriter->lastSamplesCount = currentDataSetContext->fieldSize;
-            for(size_t i = 0; i < newDataSetWriter->lastSamplesCount; i++) {
-                UA_DataValue_init(&newDataSetWriter->lastSamples[i].value);
-                newDataSetWriter->lastSamples[i].valueChanged = false;
+        if(server->config.pubSubConfig.enableDeltaFrames) {
+            /* Initialize the queue for the last values */
+            if(currentDataSetContext->fieldSize > 0) {
+                newDataSetWriter->lastSamples = (UA_DataSetWriterSample*)
+                    UA_calloc(currentDataSetContext->fieldSize, sizeof(UA_DataSetWriterSample));
+                if(!newDataSetWriter->lastSamples) {
+                    UA_DataSetWriterConfig_clear(&newDataSetWriter->config);
+                    UA_free(newDataSetWriter);
+                    return UA_STATUSCODE_BADOUTOFMEMORY;
+                }
+                newDataSetWriter->lastSamplesCount = currentDataSetContext->fieldSize;
+                for(size_t i = 0; i < newDataSetWriter->lastSamplesCount; i++) {
+                    UA_DataValue_init(&newDataSetWriter->lastSamples[i].value);
+                    newDataSetWriter->lastSamples[i].valueChanged = false;
+                }
             }
         }
-    #endif
-
         /* Connect PublishedDataSet with DataSetWriter */
         newDataSetWriter->connectedDataSet = currentDataSetContext->identifier;
     } else {
@@ -466,15 +463,15 @@ UA_DataSetWriter_remove(UA_Server *server, UA_DataSetWriter *dataSetWriter) {
     UA_NodeId_clear(&dataSetWriter->linkedWriterGroup);
     UA_NodeId_clear(&dataSetWriter->connectedDataSet);
 
-    /* Delete lastSamples store */
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
-    for(size_t i = 0; i < dataSetWriter->lastSamplesCount; i++) {
-        UA_DataValue_clear(&dataSetWriter->lastSamples[i].value);
+    if(server->config.pubSubConfig.enableDeltaFrames) {
+        /* Delete lastSamples store */
+        for(size_t i = 0; i < dataSetWriter->lastSamplesCount; i++) {
+            UA_DataValue_clear(&dataSetWriter->lastSamples[i].value);
+        }
+        UA_free(dataSetWriter->lastSamples);
+        dataSetWriter->lastSamples = NULL;
+        dataSetWriter->lastSamplesCount = 0;
     }
-    UA_free(dataSetWriter->lastSamples);
-    dataSetWriter->lastSamples = NULL;
-    dataSetWriter->lastSamplesCount = 0;
-#endif
 
     UA_free(dataSetWriter);
     return UA_STATUSCODE_GOOD;
@@ -498,7 +495,6 @@ UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
 /*********************************************************/
 
 /* Compare two variants. Internally used for value change detection. */
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
 static UA_Boolean
 valueChangedVariant(UA_Variant *oldValue, UA_Variant *newValue) {
     if(!oldValue || !newValue)
@@ -550,7 +546,6 @@ valueChangedVariant(UA_Variant *oldValue, UA_Variant *newValue) {
     UA_ByteString_clear(&newValueEncoding);
     return compareResult;
 }
-#endif
 
 static UA_StatusCode
 UA_PubSubDataSetWriter_generateKeyFrameMessage(UA_Server *server,
@@ -614,12 +609,11 @@ UA_PubSubDataSetWriter_generateKeyFrameMessage(UA_Server *server,
             (u64)UA_DATASETFIELDCONTENTMASK_SERVERPICOSECONDS) == 0)
             dfv->hasServerPicoseconds = false;
 
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
-        /* Update lastValue store */
-        UA_DataValue_clear(&dataSetWriter->lastSamples[counter].value);
-        UA_DataValue_copy(dfv, &dataSetWriter->lastSamples[counter].value);
-#endif
-
+        if(server->config.pubSubConfig.enableDeltaFrames) {
+            /* Update lastValue store */
+            UA_DataValue_clear(&dataSetWriter->lastSamples[counter].value);
+            UA_DataValue_copy(dfv, &dataSetWriter->lastSamples[counter].value);
+        }
         counter++;
     }
     return UA_STATUSCODE_GOOD;
@@ -627,7 +621,6 @@ UA_PubSubDataSetWriter_generateKeyFrameMessage(UA_Server *server,
 
 /* the input message is already initialized and that the method 
  * must not be called twice for the same message */
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
 static UA_StatusCode
 UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
                                                  UA_DataSetMessage *dataSetMessage,
@@ -714,7 +707,6 @@ UA_PubSubDataSetWriter_generateDeltaFrameMessage(UA_Server *server,
     }
     return UA_STATUSCODE_GOOD;
 }
-#endif
 
 /* Generate a DataSetMessage for the given writer. */
 UA_StatusCode
@@ -892,50 +884,48 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
 
     /* JSON does not differ between deltaframes and keyframes, only keyframes
      * are currently used. */
-    if(dsm) {
-#ifdef UA_ENABLE_PUBSUB_DELTAFRAMES
+    if(dsm && server->config.pubSubConfig.enableDeltaFrames) {
         /* Check if the PublishedDataSet version has changed -> if yes flush the
          * lastValue store and send a KeyFrame */
-    if(dataSetWriter->connectedDataSetVersion.majorVersion !=
-       currentDataSet->dataSetMetaData.configurationVersion.majorVersion ||
-       dataSetWriter->connectedDataSetVersion.minorVersion !=
-       currentDataSet->dataSetMetaData.configurationVersion.minorVersion) {
-        /* Remove old samples */
-        for(size_t i = 0; i < dataSetWriter->lastSamplesCount; i++)
-            UA_DataValue_clear(&dataSetWriter->lastSamples[i].value);
-
-        /* Realloc PDS dependent memory */
-        dataSetWriter->lastSamplesCount = currentDataSet->fieldSize;
-        UA_DataSetWriterSample *newSamplesArray = (UA_DataSetWriterSample * )
-            UA_realloc(dataSetWriter->lastSamples,
-                       sizeof(UA_DataSetWriterSample) * dataSetWriter->lastSamplesCount);
-        if(!newSamplesArray)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        dataSetWriter->lastSamples = newSamplesArray;
-        memset(dataSetWriter->lastSamples, 0,
-               sizeof(UA_DataSetWriterSample) * dataSetWriter->lastSamplesCount);
-
-        dataSetWriter->connectedDataSetVersion =
-            currentDataSet->dataSetMetaData.configurationVersion;
-        UA_PubSubDataSetWriter_generateKeyFrameMessage(server, dataSetMessage,
-                                                       dataSetWriter);
-        dataSetWriter->deltaFrameCounter = 0;
-        return UA_STATUSCODE_GOOD;
-    }
+        if(dataSetWriter->connectedDataSetVersion.majorVersion !=
+           currentDataSet->dataSetMetaData.configurationVersion.majorVersion ||
+           dataSetWriter->connectedDataSetVersion.minorVersion !=
+           currentDataSet->dataSetMetaData.configurationVersion.minorVersion) {
+            /* Remove old samples */
+            for(size_t i = 0; i < dataSetWriter->lastSamplesCount; i++)
+                UA_DataValue_clear(&dataSetWriter->lastSamples[i].value);
+
+            /* Realloc PDS dependent memory */
+            dataSetWriter->lastSamplesCount = currentDataSet->fieldSize;
+            UA_DataSetWriterSample *newSamplesArray = (UA_DataSetWriterSample * )
+                UA_realloc(dataSetWriter->lastSamples,
+                           sizeof(UA_DataSetWriterSample) * dataSetWriter->lastSamplesCount);
+            if(!newSamplesArray)
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            dataSetWriter->lastSamples = newSamplesArray;
+            memset(dataSetWriter->lastSamples, 0,
+                   sizeof(UA_DataSetWriterSample) * dataSetWriter->lastSamplesCount);
+
+            dataSetWriter->connectedDataSetVersion =
+                currentDataSet->dataSetMetaData.configurationVersion;
+            UA_PubSubDataSetWriter_generateKeyFrameMessage(server, dataSetMessage,
+                                                           dataSetWriter);
+            dataSetWriter->deltaFrameCounter = 0;
+            return UA_STATUSCODE_GOOD;
+        }
 
-    /* The standard defines: if a PDS contains only one fields no delta messages
-     * should be generated because they need more memory than a keyframe with 1
-     * field. */
-    if(currentDataSet->fieldSize > 1 && dataSetWriter->deltaFrameCounter > 0 &&
-       dataSetWriter->deltaFrameCounter <= dataSetWriter->config.keyFrameCount) {
-        UA_PubSubDataSetWriter_generateDeltaFrameMessage(server, dataSetMessage,
-                                                         dataSetWriter);
-        dataSetWriter->deltaFrameCounter++;
-        return UA_STATUSCODE_GOOD;
-    }
+        /* The standard defines: if a PDS contains only one fields no delta messages
+         * should be generated because they need more memory than a keyframe with 1
+         * field. */
+        if(currentDataSet->fieldSize > 1 && dataSetWriter->deltaFrameCounter > 0 &&
+           dataSetWriter->deltaFrameCounter <= dataSetWriter->config.keyFrameCount) {
+            UA_PubSubDataSetWriter_generateDeltaFrameMessage(server, dataSetMessage,
+                                                             dataSetWriter);
+            dataSetWriter->deltaFrameCounter++;
+            return UA_STATUSCODE_GOOD;
+        }
 
-    dataSetWriter->deltaFrameCounter = 1;
-#endif
+        dataSetWriter->deltaFrameCounter = 1;
     }
 
     return UA_PubSubDataSetWriter_generateKeyFrameMessage(server, dataSetMessage,
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index abcce71d512..826c7ee063e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -360,10 +360,7 @@ if(UA_ENABLE_PUBSUB)
 
     if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
         ua_add_test(pubsub/check_pubsub_informationmodel.c)
-        if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
-            ua_add_test(pubsub/check_pubsub_informationmodel_methods.c)
-
-        endif()
+        ua_add_test(pubsub/check_pubsub_informationmodel_methods.c)
     endif()
     if(UA_ENABLE_MQTT)
         ua_add_test(pubsub/check_pubsub_connection_mqtt.c)
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index ac2cd844262..2273eb16cb3 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -1267,11 +1267,17 @@ START_TEST(ReserveIdsMultipleTimes){
 
         /* Call ReserveIds 3rd time within the same session and try to reserve one more ID from each category -
          * check if the already reserved IDs are blocked. */
-        retVal = CallReserveIds(client, &transportProfileUri, 1, 1,
+
+        /* Currently the return value is not checked, once the lower assert statement is re-inserted,
+         * the return value can also be saved. Otherwise there will be an error in the Clang static analyzer
+         * (warning: value stored in 'retVal' is never read). */
+        CallReserveIds(client, &transportProfileUri, 1, 1,
             &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
+        CallReserveIds(client, &transportProfileUri, 1, 1,
+                &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
         /* TODO: Currently Part 14 doesn't define what should happen if the ID cannot be reserved.
          * There is an open Mantis issue #8415. */
-        // ck_assert(UA_StatusCode_isBad(retVal));
+//        ck_assert(UA_StatusCode_isBad(retVal));
         ck_assert_uint_eq(regWriterGroupIds.arrayLength, 1);
         ck_assert_uint_eq(((UA_UInt16 *)regWriterGroupIds.data)[0], 0);
         ck_assert_uint_eq(regDataSetWriterIds.arrayLength, 1);
diff --git a/tools/appveyor/build.ps1 b/tools/appveyor/build.ps1
index 1b1f58acc71..08424d9f091 100644
--- a/tools/appveyor/build.ps1
+++ b/tools/appveyor/build.ps1
@@ -37,7 +37,6 @@ try {
             -DUA_ENABLE_DA:BOOL=ON `
             -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
             -DUA_ENABLE_PUBSUB:BOOL=ON `
-            -DUA_ENABLE_PUBSUB_DELTAFRAMES:BOOL=ON `
             -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
             -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
             -DUA_ENABLE_MQTT:BOOL=ON `
diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 5046d734e37..597c52f1686 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -64,7 +64,6 @@ try {
                 -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
                 -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
                 -DUA_ENABLE_PUBSUB:BOOL=ON `
-                -DUA_ENABLE_PUBSUB_DELTAFRAMES:BOOL=ON `
                 -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
                 -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON `
                 -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON ..
@@ -112,7 +111,6 @@ try {
             -DUA_ENABLE_DA:BOOL=ON `
             -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
             -DUA_ENABLE_PUBSUB:BOOL=ON `
-            -DUA_ENABLE_PUBSUB_DELTAFRAMES:BOOL=ON `
             -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
             -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
             -DUA_NAMESPACE_ZERO:STRING=FULL ..
diff --git a/tools/ci.sh b/tools/ci.sh
index 5fcde90e4aa..3bc584e51f9 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -75,7 +75,6 @@ function build_release {
     cmake -DBUILD_SHARED_LIBS=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DUA_BUILD_EXAMPLES=ON \
           ..
@@ -90,14 +89,12 @@ function build_amalgamation {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_ENABLE_AMALGAMATION=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           ..
@@ -108,14 +105,12 @@ function build_amalgamation_mt {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_ENABLE_AMALGAMATION=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_MULTITHREADING=100 \
@@ -138,19 +133,15 @@ function unit_tests {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_MQTT=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
-          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           ..
     make ${MAKEOPTS}
@@ -163,15 +154,12 @@ function unit_tests_32 {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_FORCE_32BIT=ON \
@@ -187,6 +175,7 @@ function unit_tests_nosub {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_HISTORIZING=OFF \
           -DUA_ENABLE_SUBSCRIPTIONS=OFF \
           ..
     make ${MAKEOPTS}
@@ -200,18 +189,14 @@ function unit_tests_diag {
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_DIAGNOSTICS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
-          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           ..
     make ${MAKEOPTS}
@@ -224,9 +209,7 @@ function unit_tests_mt {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_MULTITHREADING=200 \
           -DUA_BUILD_EXAMPLES=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           ..
@@ -257,7 +240,6 @@ function unit_tests_encryption {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           ..
@@ -271,12 +253,10 @@ function unit_tests_encryption_mbedtls_pubsub {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_CERT_REJECTED_DIR=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
@@ -292,13 +272,10 @@ function unit_tests_pubsub_sks {
           -DUA_NAMESPACE_ZERO=FULL \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
-          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           -DUA_ENABLE_PUBSUB_SKS=ON \
@@ -319,19 +296,15 @@ function unit_tests_with_coverage {
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_COVERAGE=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_MQTT=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
-          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           ..
@@ -349,19 +322,15 @@ function unit_tests_valgrind {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_MQTT=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
-          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
           ..
@@ -378,20 +347,20 @@ function examples_valgrind {
     mkdir -p build; cd build; rm -rf *
 
     # create certificates for the examples
-    python3 ../tools/certs/create_self-signed.py -c server 
-    python3 ../tools/certs/create_self-signed.py -c client 
+    python3 ../tools/certs/create_self-signed.py -c server
+    python3 ../tools/certs/create_self-signed.py -c client
+
+    # copy json server config
+    cp ../plugins/server_config.json5 server_config.json5
 
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
@@ -425,15 +394,12 @@ function build_clang_analyzer {
     scan-build-11 cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
-          -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           ..
diff --git a/tools/examples_with_valgrind.py b/tools/examples_with_valgrind.py
index a9b6a6cfbdb..fc80a88186a 100644
--- a/tools/examples_with_valgrind.py
+++ b/tools/examples_with_valgrind.py
@@ -16,7 +16,8 @@
         "pubsub_TSN_publisher_multiple_thread":"-i lo",
         "server_encryption":"server_cert.der server_key.der client_cert.der",
         "server_loglevel":"--loglevel=1",
-        "ci_server":"4840 server_cert.der server_key.der client_cert.der"
+        "ci_server":"4840 server_cert.der server_key.der client_cert.der",
+        "server_file_based_config":"server_config.json5"
         }
 
 server_needed_examples = {

From 6375f54f2460409b8a2c58b699c9e46441cae8b6 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 21 Sep 2023 16:23:16 +0200
Subject: [PATCH 1171/1963] fix(examples): Bug fix in the nodeset examples and
 tests. Added missing header inclusion.

---
 examples/nodeset/server_nodeset_plcopen.c                   | 1 +
 examples/nodeset/server_nodeset_powerlink.c                 | 1 +
 tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c | 1 +
 tests/nodeset-loader/check_nodeset_loader_testnodeset.c     | 1 +
 tests/pubsub/check_pubsub_informationmodel_methods.c        | 2 --
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/nodeset/server_nodeset_plcopen.c b/examples/nodeset/server_nodeset_plcopen.c
index dcc80c092a3..2e4bdb01ee7 100644
--- a/examples/nodeset/server_nodeset_plcopen.c
+++ b/examples/nodeset/server_nodeset_plcopen.c
@@ -13,6 +13,7 @@
 #include "open62541/namespace_plc_generated.h"
 
 #include <signal.h>
+#include <limits.h>
 #include <stdlib.h>
 
 UA_Boolean running = true;
diff --git a/examples/nodeset/server_nodeset_powerlink.c b/examples/nodeset/server_nodeset_powerlink.c
index 1588f95864d..20808001f9f 100644
--- a/examples/nodeset/server_nodeset_powerlink.c
+++ b/examples/nodeset/server_nodeset_powerlink.c
@@ -13,6 +13,7 @@
 #include "open62541/namespace_powerlink_generated.h"
 
 #include <signal.h>
+#include <limits.h>
 #include <stdlib.h>
 
 UA_Boolean running = true;
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
index 43fc61368c6..279ef325297 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
@@ -11,6 +11,7 @@
 #include "tests/namespace_tests_testnodeset_generated.h"
 #include "tests/types_tests_testnodeset_generated_handling.h"
 #include "namespace_tests_di_generated.h"
+#include <limits.h>
 #include "unistd.h"
 
 UA_Server *server = NULL;
diff --git a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
index 7e99330261b..8e4553c75cc 100644
--- a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
@@ -8,6 +8,7 @@
 #include <open62541/types.h>
 
 #include "check.h"
+#include <limits.h>
 #include "testing_clock.h"
 #include "unistd.h"
 
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 2273eb16cb3..3ef0dc71134 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -1273,8 +1273,6 @@ START_TEST(ReserveIdsMultipleTimes){
          * (warning: value stored in 'retVal' is never read). */
         CallReserveIds(client, &transportProfileUri, 1, 1,
             &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
-        CallReserveIds(client, &transportProfileUri, 1, 1,
-                &defaultPublisherId, &regWriterGroupIds, &regDataSetWriterIds);
         /* TODO: Currently Part 14 doesn't define what should happen if the ID cannot be reserved.
          * There is an open Mantis issue #8415. */
 //        ck_assert(UA_StatusCode_isBad(retVal));

From a32aa3ce25b3d2c19d3b4ce70093c0ea43ddbe23 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 25 Sep 2023 15:18:12 +0200
Subject: [PATCH 1172/1963] refactor(core): Update FEATURES.md

---
 FEATURES.md | 185 ++++++++++++++++++++++++++--------------------------
 1 file changed, 93 insertions(+), 92 deletions(-)

diff --git a/FEATURES.md b/FEATURES.md
index 8a7a0082d76..4c5c89e6e68 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -4,111 +4,112 @@ open62541 Supported Features
 OPC UA Stack
 ------------
 
-|                                         |                    |                      |
-| --------------------------------------- |:------------------:| -------------------- |
-| **Encoding**                            |                    |                      |
-| OPC UA Binary                           | :heavy_check_mark: |                      |
-| OPC UA JSON                             | :heavy_check_mark: |                      |
-| OPC UA XML                              |     :new_moon:     |                      |
-| **Transport**                           |                    |                      |
-| UA-TCP UA-SC UA Binary                  | :heavy_check_mark: |                      |
-| OPC UA HTTPS                            |     :new_moon:     |                      |
-| SOAP-HTTP WS-SC UA Binary               |     :new_moon:     |                      |
-| SOAP-HTTP WS-SC UA XML                  |     :new_moon:     |                      |
-| SOAP-HTTP WS-SC UA XML-UA Binary        |     :new_moon:     |                      |
-| **Encryption**                          |                    |                      |
-| None                                    | :heavy_check_mark: |                      |
-| Basic128Rsa15                           | :heavy_check_mark: |                      |
-| Basic256                                | :heavy_check_mark: |                      |
-| Basic256Sha256                          | :heavy_check_mark: |                      |
-| **Authentication**                      |                    |                      |
-| Anonymous                               | :heavy_check_mark: |                      |
-| User Name Password                      | :heavy_check_mark: |                      |
-| X509 Certificate                        | :heavy_check_mark: |                      |
+| **Feature**                       | **Support**        |
+| --------------------------------- |:------------------:|
+| **Encoding**                      |                    |
+| OPC UA Binary                     | :heavy_check_mark: |
+| OPC UA JSON                       | :heavy_check_mark: |
+| OPC UA XML                        |     :new_moon:     |
+| **Transport**                     |                    |
+| UA-TCP UA-SC UA Binary            | :heavy_check_mark: |
+| OPC UA HTTPS                      |     :new_moon:     |
+| SOAP-HTTP WS-SC UA Binary         |     :new_moon:     |
+| SOAP-HTTP WS-SC UA XML            |     :new_moon:     |
+| SOAP-HTTP WS-SC UA XML-UA Binary  |     :new_moon:     |
+| **Encryption**                    |                    |
+| None                              | :heavy_check_mark: |
+| Basic128Rsa15                     | :heavy_check_mark: |
+| Basic256                          | :heavy_check_mark: |
+| Basic256Sha256                    | :heavy_check_mark: |
+| Aes256Sha256RsaPss                | :heavy_check_mark: |
+| **Authentication**                |                    |
+| Anonymous                         | :heavy_check_mark: |
+| User Name Password                | :heavy_check_mark: |
+| X509 Certificate                  | :heavy_check_mark: |
 
 OPC UA Server
 -------------
 
-| **Service-Set**             | **Service**                     | **Support**          | **Comment**          |
-| --------------------------- | ------------------------------- |:--------------------:| -------------------- |
-| Discovery Service Set       | FindServers()                   |  :heavy_check_mark:  |                      |
-|                             | FindServersOnNetwork()          |     :full_moon:      |                      |
-|                             | GetEndpoints()                  |  :heavy_check_mark:  |                      |
-|                             | RegisterServer()                |  :heavy_check_mark:  |                      |
-|                             | RegisterServer2()               |     :full_moon:      |                      |
-| Secure Channel Service Set  | OpenSecureChannel()             |  :heavy_check_mark:  |                      |
-|                             | CloseSecureChannel()            |  :heavy_check_mark:  |                      |
-| Session Service Set         | CreateSession()                 |  :heavy_check_mark:  |                      |
-|                             | CloseSession()                  |  :heavy_check_mark:  |                      |
-|                             | ActivateSession()               |  :heavy_check_mark:  |                      |
-|                             | Cancel()                        |      :new_moon:      |                      |
-| Node Management Service Set | AddNodes()                      |  :heavy_check_mark:  |                      |
-|                             | AddReferences()                 |  :heavy_check_mark:  |                      |
-|                             | DeleteNodes()                   |  :heavy_check_mark:  |                      |
-|                             | DeleteReferences()              |  :heavy_check_mark:  |                      |
-| View Service Set            | Browse()                        |  :heavy_check_mark:  |                      |
-|                             | BrowseNext()                    |  :heavy_check_mark:  |                      |
-|                             | TranslateBrowsePathsToNodeIds() |  :heavy_check_mark:  |                      |
-|                             | RegisterNodes()                 |  :heavy_check_mark:  |                      |
-|                             | UnregisterNodes()               |  :heavy_check_mark:  |                      |
-| Query Service Set           | QueryFirst()                    |      :new_moon:      |                      |
-|                             | QueryNext()                     |      :new_moon:      |                      |
-| Attribute Service Set       | Read()                          |  :heavy_check_mark:  |                      |
-|                             | Write()                         |  :heavy_check_mark:  |                      |
-|                             | HistoryRead()                   |     :full_moon:      |                      |
-|                             | HistoryUpdate()                 |     :full_moon:      |                      |
-| Method Service Set          | Call()                          |  :heavy_check_mark:  |                      |
-| MonitoredItems Service Set  | CreateMonitoredItems()          |  :heavy_check_mark:  |                      |
-|                             | DeleteMonitoredItems()          |  :heavy_check_mark:  |                      |
-|                             | ModifyMonitoredItems()          |  :heavy_check_mark:  |                      |
-|                             | SetMonitoringMode()             |  :heavy_check_mark:  |                      |
-|                             | SetTriggering()                 |  :heavy_check_mark:  |                      |
-| Subscription Service Set    | CreateSubscription()            |  :heavy_check_mark:  |                      |
-|                             | ModifySubscription()            |  :heavy_check_mark:  |                      |
-|                             | SetPublishingMode()             |  :heavy_check_mark:  |                      |
-|                             | Publish()                       |  :heavy_check_mark:  |                      |
-|                             | Republish()                     |  :heavy_check_mark:  |                      |
-|                             | DeleteSubscriptions()           |  :heavy_check_mark:  |                      |
-|                             | TransferSubscriptions()         |  :heavy_check_mark:  |                      |
+| **Service-Set**             | **Service**                     | **Support**          |
+| --------------------------- | ------------------------------- |:--------------------:|
+| Discovery Service Set       | FindServers()                   |  :heavy_check_mark:  |
+|                             | FindServersOnNetwork()          |  :heavy_check_mark:  |
+|                             | GetEndpoints()                  |  :heavy_check_mark:  |
+|                             | RegisterServer()                |  :heavy_check_mark:  |
+|                             | RegisterServer2()               |     :full_moon:      |
+| Secure Channel Service Set  | OpenSecureChannel()             |  :heavy_check_mark:  |
+|                             | CloseSecureChannel()            |  :heavy_check_mark:  |
+| Session Service Set         | CreateSession()                 |  :heavy_check_mark:  |
+|                             | CloseSession()                  |  :heavy_check_mark:  |
+|                             | ActivateSession()               |  :heavy_check_mark:  |
+|                             | Cancel()                        |  :heavy_check_mark:  |
+| Node Management Service Set | AddNodes()                      |  :heavy_check_mark:  |
+|                             | AddReferences()                 |  :heavy_check_mark:  |
+|                             | DeleteNodes()                   |  :heavy_check_mark:  |
+|                             | DeleteReferences()              |  :heavy_check_mark:  |
+| View Service Set            | Browse()                        |  :heavy_check_mark:  |
+|                             | BrowseNext()                    |  :heavy_check_mark:  |
+|                             | TranslateBrowsePathsToNodeIds() |  :heavy_check_mark:  |
+|                             | RegisterNodes()                 |  :heavy_check_mark:  |
+|                             | UnregisterNodes()               |  :heavy_check_mark:  |
+| Query Service Set           | QueryFirst()                    |      :new_moon:      |
+|                             | QueryNext()                     |      :new_moon:      |
+| Attribute Service Set       | Read()                          |  :heavy_check_mark:  |
+|                             | Write()                         |  :heavy_check_mark:  |
+|                             | HistoryRead()                   |     :full_moon:      |
+|                             | HistoryUpdate()                 |     :full_moon:      |
+| Method Service Set          | Call()                          |  :heavy_check_mark:  |
+| MonitoredItems Service Set  | CreateMonitoredItems()          |  :heavy_check_mark:  |
+|                             | DeleteMonitoredItems()          |  :heavy_check_mark:  |
+|                             | ModifyMonitoredItems()          |  :heavy_check_mark:  |
+|                             | SetMonitoringMode()             |  :heavy_check_mark:  |
+|                             | SetTriggering()                 |  :heavy_check_mark:  |
+| Subscription Service Set    | CreateSubscription()            |  :heavy_check_mark:  |
+|                             | ModifySubscription()            |  :heavy_check_mark:  |
+|                             | SetPublishingMode()             |  :heavy_check_mark:  |
+|                             | Publish()                       |  :heavy_check_mark:  |
+|                             | Republish()                     |  :heavy_check_mark:  |
+|                             | DeleteSubscriptions()           |  :heavy_check_mark:  |
+|                             | TransferSubscriptions()         |  :heavy_check_mark:  |
 
-| **Subscriptions**                       |                    |                      |
-| --------------------------------------- |:------------------:| -------------------- |
-| DataChange MonitoredItems               | :heavy_check_mark: |                      |
-| DataChange Filters                      | :heavy_check_mark: |                      |
-| Event MonitoredItems                    | :heavy_check_mark: |                      |
-| Event Filters                           | :first_quarter_moon: | only select filter (no where filters) |
+| **Subscriptions**                       |                    |
+| --------------------------------------- |:------------------:|
+| DataChange MonitoredItems               | :heavy_check_mark: |
+| DataChange Filters                      | :heavy_check_mark: |
+| Event MonitoredItems                    | :heavy_check_mark: |
+| Event Filters                           | :heavy_check_mark: |
 
-| **Discovery**                           |                    | See Discovery Service Set |
-| --------------------------------------- |:------------------:| -------------------- |
-| Local Discovery Server                  | :heavy_check_mark: |                      |
-| Local Discovery Server Multicast Ext.   | :heavy_check_mark: |                      |
-| Global Discovery Server                 |     :new_moon:     |                      |
+| **Discovery**                           |                    |
+| --------------------------------------- |:------------------:|
+| Local Discovery Server                  | :heavy_check_mark: |
+| Local Discovery Server Multicast Ext.   | :heavy_check_mark: |
+| Global Discovery Server                 |     :new_moon:     |
 
 OPC UA Client
 -------------
 
 - All services are supported
 - Handling of subscriptions in the background
+- Asynchronous and Synchronous API
 
 OPC UA PubSub
 -------------
 
-|                                                   |                       |                        |
-| ------------------------------------------------- |:---------------------:| ---------------------- |
-| **NetworkMessage decoding/encoding**              |                       |                        |
-| Binary (UADP)                                     |   :heavy_check_mark:  |                        |
-| JSON                                              |   :heavy_check_mark:  |                        |
-| **PubSub Transport**                              |                       |                        |
-| UDP/multicast (send and receive)                  |   :heavy_check_mark:  |                        |
-| Ethernet (TSN)                                    |   :heavy_check_mark:  |                        |
-| MQTT                                              |   :heavy_check_mark:  |                        |
-| AMQP                                              |      :new_moon:       |                        |
-| **Publisher Configuration**                       |                       |                        |
-| Configure (server-side) Publisher at runtime      |  :heavy_check_mark:   |                        |
-| Configuration representation in information model |  :heavy_check_mark:   | Runtime configuration changes via the information model possible |
-| Message Encryption                                |  :heavy_check_mark:   | With manual key configuration |
-| Security Key Service Model                        |      :new_moon:       |                        |
-| **Subscriber Configuration**                      | :waning_gibbous_moon: | Manual Subscriber only |
-| Message Decryption                                |  :heavy_check_mark:   | With manual key configuration |
-| Configure (server-side) Subscriber at runtime     |  :heavy_check_mark:   |                        |
-| Configuration representation in information model |  :heavy_check_mark:   | Runtime configuration changes via the information model possible |
+| **Feature**                                       | **Support**           |
+| ------------------------------------------------- |:---------------------:|
+| **NetworkMessage encoding/decoding**              |                       |
+| Binary (UADP)                                     |   :heavy_check_mark:  |
+| JSON                                              |   :heavy_check_mark:  |
+| Message En/decryption                             |   :heavy_check_mark:  |
+| **PubSub Transport**                              |                       |
+| UDP/multicast                                     |   :heavy_check_mark:  |
+| Ethernet                                          |   :heavy_check_mark:  |
+| MQTT                                              |   :heavy_check_mark:  |
+| AMQP                                              |      :new_moon:       |
+| **Publisher Configuration**                       |                       |
+| Configure (server-side) publisher at runtime      |  :heavy_check_mark:   |
+| Configuration representation in information model |  :heavy_check_mark:   |
+| Security Key Service Model                        |  :heavy_check_mark:   |
+| **Subscriber Configuration**                      |                       |
+| Configure (server-side) subscriber at runtime     |  :heavy_check_mark:   |
+| Configuration representation in information model |  :heavy_check_mark:   |

From 6aacce6b32245c131e8cf3a9942cea4f629e0a1a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 25 Sep 2023 15:38:45 +0200
Subject: [PATCH 1173/1963] refactor(core): Update README.md to better reflect
 the current status

---
 README.md | 93 +++++++++++++++++++++++--------------------------------
 1 file changed, 38 insertions(+), 55 deletions(-)

diff --git a/README.md b/README.md
index 6052ed0d4a2..d1bad52154c 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,10 @@ General Project Info:
 [![Open Hub Project Status](https://www.openhub.net/p/open62541/widgets/project_thin_badge.gif)](https://www.openhub.net/p/open62541/)
 [![Overall Downloads](https://img.shields.io/github/downloads/open62541/open62541/total.svg)](https://github.com/open62541/open62541/releases)
 
-### Features and Certification
+## Features
 
-open62541 implements the OPC UA binary protocol stack as well as a client and server SDK. The final server binaries can be well under 100kb, depending on the selected features and the size of the information model.
+open62541 implements an OPC UA SDK with support for servers, clients and PubSub (publish-subscribe) communication.
+See the [features overview](FEATURES.md) for full details.
 
 - Communication Stack
   - OPC UA binary protocol
@@ -50,7 +51,16 @@ open62541 implements the OPC UA binary protocol stack as well as a client and se
   - UADP Binary protocol with UDP-multicast or Ethernet communication
   - PubSub JSON encoding
 
-### Official Certification
+## Commercial Use and Official Support
+
+open62541 is licensed under the MPLv2. That is, changes to files under MPLv2 fall under the same open-source license.
+But the library can be combined with private development from separate files, also if a static binary is produced, without the license affecting the private files.
+See the full [license document](LICENSE) for details.
+
+**Fraunhofer IOSB** maintains open62541 and also provides **[official commercial support](https://www.iosb.fraunhofer.de/en/projects-and-products/open62541.html)**.
+Additional commercial service providers are listed on [open62541.org](https://www.open62541.org/).
+
+## Official Certification
 
 The sample server (server_ctt) built using open62541 v1.0 is in conformance with the 'Micro Embedded Device Server' Profile of OPC Foundation supporting OPC UA client/server communication, subscriptions, method calls and security (encryption) with the security policies 'Basic128Rsa15', 'Basic256' and 'Basic256Sha256' and the facets 'method server' and 'node management'. See https://open62541.org/certified-sdk for more details.
 
@@ -72,6 +82,31 @@ The CTT configuration and results are tracked at https://github.com/open62541/op
 
 See the page on [open62541 Features](FEATURES.md) for an in-depth look at the support for the conformance units that make up the OPC UA profiles.
   
+## Documentation and Support
+
+A general introduction to OPC UA and the open62541 documentation can be found at http://open62541.org/doc/current.
+Past releases of the library can be downloaded at https://github.com/open62541/open62541/releases.
+To use the latest improvements, download a nightly build of the *single-file distribution* (the entire library merged into a single source and header file) from http://open62541.org/releases. Nightly builds of MSVC binaries of the library are available [here](https://ci.appveyor.com/project/open62541/open62541/build/artifacts).
+
+The overall open62541 community handles public support requests on Github and the mailing list.
+For individual discussion and support, use the following channels:
+
+- [Mailing List](https://groups.google.com/d/forum/open62541)
+- [Issue Tracker](https://github.com/open62541/open62541/issues)
+- [Pull Requests](https://github.com/open62541/open62541/pulls)
+
+We want to foster an open and welcoming community. Please take our [code of conduct](CODE_OF_CONDUCT.md) into regard.
+
+## Development
+
+As an open source project, new contributors are encouraged to help improve open62541. The file [CONTRIBUTING.md](CONTRIBUTING.md) aggregates good practices that we expect for code contributions. The following are good starting points for new contributors:
+
+- [Report bugs](https://github.com/open62541/open62541/issues)
+- Improve the [documentation](http://open62541.org/doc/current)
+- Work on issues marked as "[good first issue](https://github.com/open62541/open62541/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)"
+
+For custom development that shall eventually become part of the open62541 library, please keep one of the core maintainers in the loop.
+
 ### Dependencies
 
 On most systems, open62541 requires the C standard library only. For dependencies during the build process, see the following list and the [build documentation](https://www.open62541.org/doc/master/building.html) for details.
@@ -97,58 +132,6 @@ We emphasize code quality. The following quality metrics are continuously checke
 - Zero unresolved issues from fuzzing the library in Google's oss-fuzz infrastructure
 - Zero issues indicated by Valgrind (Linux), DrMemory (Windows) and Clang AddressSanitizer / MemorySanitizer for the CTT tests, unit tests and fuzzing
 
-### Documentation and Support
-
-A general introduction to OPC UA and the open62541 documentation can be found at http://open62541.org/doc/current.
-Past releases of the library can be downloaded at https://github.com/open62541/open62541/releases.
-To use the latest improvements, download a nightly build of the *single-file distribution* (the entire library merged into a single source and header file) from http://open62541.org/releases. Nightly builds of MSVC binaries of the library are available [here](https://ci.appveyor.com/project/open62541/open62541/build/artifacts).
-
-For individual discussion and support, use the following channels:
-
-- the [mailing list](https://groups.google.com/d/forum/open62541)
-- our [IRC channel](http://webchat.freenode.net/?channels=%23open62541)
-- the [bugtracker](https://github.com/open62541/open62541/issues)
-
-We want to foster an open and welcoming community. Please take our [code of conduct](CODE_OF_CONDUCT.md) into regard.
-
-Jointly with the overall open62541 community, the core maintainers steer the long-term development. The current core maintainers are (as of April 2018, in alphabetical order):
-
-- Chris-Paul Iatrou (Dresden University of Technology, Chair for Process Control Systems Engineering)
-- Florian Palm (RWTH Aachen University, Chair of Process Control Engineering)
-- Julius Pfrommer (Fraunhofer IOSB, Karlsruhe)
-- Stefan Profanter (fortiss, Munich)
-
-### Docker container
-
-Official docker container builds are available on [Docker Cloud](https://cloud.docker.com/u/open62541/repository/registry-1.docker.io/open62541/open62541)
-
-More information can be found in the [Docker README](tools/docker/README.md)
-
-## Support & Development
-
-### Commercial Support
-
-The open62541 community handles support requests for the open source library and its development. Custom development and individual support is provided by commercial partners that are affiliated with open62541:
-
-- [Kalycito Infotech, Tamil Nadu, INDIA](https://www.kalycito.com/landing/open62541-commercial-partner) for embedded and realtime IIoT applications (Contact: enterprise.services@kalycito.com)
-- [basysKom GmbH, Darmstadt, Germany](https://www.basyskom.com/) Software Engineering for Embedded Systems. (Contact: info@basysKom.com) 
-
-For custom development that shall eventually become part of the open62541 library, please keep one of the core maintainers in the loop. Again, please note that all changes to files that are already licensed under the MPLv2 automatically become MPLv2 as well. Static linking of the open62541 library with code under a different license is possible. All architecture-specific code is implemented in the form of exchangeable plugins under a very permissible CC0 license.
-
-### Development
-
-As an open source project, new contributors are encouraged to help improve open62541. The file [CONTRIBUTING.md](CONTRIBUTING.md) aggregates good practices that we expect for code contributions. The following are good starting points for new contributors:
-
-- [Report bugs](https://github.com/open62541/open62541/issues)
-- Improve the [documentation](http://open62541.org/doc/current)
-- Work on issues marked as "[good first issue](https://github.com/open62541/open62541/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)"
-
-### Success Stories and Users of open62541
-
-A list of projects and companies using our open62541 stack can be found in our Wiki:
-
-https://github.com/open62541/open62541/wiki/References-to-open62541
-
 ## Installation and code usage
 
 For every release, we provide some pre-packed release packages which you can directly use in your compile infrastructure.

From e07048935090d67e520eec20c1a7e2a1426316e8 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Tue, 26 Sep 2023 11:09:05 +0200
Subject: [PATCH 1174/1963] feat(serer) add max operations callback structure
 (#5976)

---
 src/server/ua_server_ns0.c | 73 +++++++++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 16 deletions(-)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 5b4885d58fc..94fdfb98ffe 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -10,6 +10,7 @@
  *    Copyright 2018 (c) Fabian Arndt, Root-Core
  *    Copyright 2019 (c) Kalycito Infotech Private Limited
  *    Copyright 2021 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
+ *    Copyright 2023 (c) Fraunhofer IOSB (Author: Andreas Ebner)
  */
 
 #include "open62541/namespace0_generated.h"
@@ -566,6 +567,45 @@ readCurrentTime(UA_Server *server, const UA_NodeId *sessionId, void *sessionCont
 }
 
 #ifdef UA_GENERATED_NAMESPACE_ZERO
+static UA_StatusCode
+readOperationLimits(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
+                        const UA_NodeId *nodeid, void *nodeContext, UA_Boolean includeSourceTimeStamp,
+                        const UA_NumericRange *range,
+                        UA_DataValue *value) {
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(nodeid->identifierType != UA_NODEIDTYPE_NUMERIC)
+        return UA_STATUSCODE_BADNOTSUPPORTED;
+    switch(nodeid->identifier.numeric) {
+        case UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERREAD:
+            retval = UA_Variant_setScalarCopy(&value->value, &server->config.maxNodesPerRead, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        case UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERWRITE:
+            retval = UA_Variant_setScalarCopy(&value->value, &server->config.maxNodesPerWrite, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        case UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERMETHODCALL:
+            retval = UA_Variant_setScalarCopy(&value->value, &server->config.maxNodesPerMethodCall, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        case UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERBROWSE:
+            retval = UA_Variant_setScalarCopy(&value->value, &server->config.maxNodesPerBrowse, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        case UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERREGISTERNODES:
+            retval = UA_Variant_setScalarCopy(&value->value, &server->config.maxNodesPerRegisterNodes, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        case UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERTRANSLATEBROWSEPATHSTONODEIDS:
+            retval = UA_Variant_setScalarCopy(&value->value, &server->config.maxNodesPerTranslateBrowsePathsToNodeIds, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        case UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERNODEMANAGEMENT:
+            retval = UA_Variant_setScalarCopy(&value->value, &server->config.maxNodesPerNodeManagement, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        case UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXMONITOREDITEMSPERCALL:
+            retval = UA_Variant_setScalarCopy(&value->value, &server->config.maxMonitoredItemsPerCall, &UA_TYPES[UA_TYPES_UINT32]);
+            break;
+        default:
+            retval = UA_STATUSCODE_BADNOTSUPPORTED;
+    }
+    return retval;
+}
+
 static UA_StatusCode
 readMinSamplingInterval(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
                const UA_NodeId *nodeid, void *nodeContext, UA_Boolean includeSourceTimeStamp,
@@ -1010,36 +1050,37 @@ initNS0(UA_Server *server) {
                                                    samplingInterval);
 
     /* ServerCapabilities - OperationLimits - MaxNodesPerRead */
-    retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERREAD,
-                               &server->config.maxNodesPerRead, &UA_TYPES[UA_TYPES_UINT32]);
+    UA_DataSource operationLimitRead = {readOperationLimits, NULL};
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERREAD),
+                                        operationLimitRead);
 
     /* ServerCapabilities - OperationLimits - maxNodesPerWrite */
-    retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERWRITE,
-                               &server->config.maxNodesPerWrite, &UA_TYPES[UA_TYPES_UINT32]);
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERWRITE),
+                                        operationLimitRead);
 
     /* ServerCapabilities - OperationLimits - MaxNodesPerMethodCall */
-    retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERMETHODCALL,
-                               &server->config.maxNodesPerMethodCall, &UA_TYPES[UA_TYPES_UINT32]);
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERMETHODCALL),
+                                        operationLimitRead);
 
     /* ServerCapabilities - OperationLimits - MaxNodesPerBrowse */
-    retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERBROWSE,
-                               &server->config.maxNodesPerBrowse, &UA_TYPES[UA_TYPES_UINT32]);
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERBROWSE),
+                                        operationLimitRead);
 
     /* ServerCapabilities - OperationLimits - MaxNodesPerRegisterNodes */
-    retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERREGISTERNODES,
-                               &server->config.maxNodesPerRegisterNodes, &UA_TYPES[UA_TYPES_UINT32]);
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERREGISTERNODES),
+                                        operationLimitRead);
 
     /* ServerCapabilities - OperationLimits - MaxNodesPerTranslateBrowsePathsToNodeIds */
-    retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERTRANSLATEBROWSEPATHSTONODEIDS,
-                               &server->config.maxNodesPerTranslateBrowsePathsToNodeIds, &UA_TYPES[UA_TYPES_UINT32]);
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERTRANSLATEBROWSEPATHSTONODEIDS),
+                                        operationLimitRead);
 
     /* ServerCapabilities - OperationLimits - MaxNodesPerNodeManagement */
-    retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERNODEMANAGEMENT,
-                               &server->config.maxNodesPerNodeManagement, &UA_TYPES[UA_TYPES_UINT32]);
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERNODEMANAGEMENT),
+                                        operationLimitRead);
 
     /* ServerCapabilities - OperationLimits - MaxMonitoredItemsPerCall */
-    retVal |= writeNs0Variable(server, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXMONITOREDITEMSPERCALL,
-                               &server->config.maxMonitoredItemsPerCall, &UA_TYPES[UA_TYPES_UINT32]);
+    retVal |= setVariableNode_dataSource(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXMONITOREDITEMSPERCALL),
+                                        operationLimitRead);
 
     /* Remove unused operation limit components */
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_OPERATIONLIMITS_MAXNODESPERHISTORYREADDATA), true);

From 0d31207e0d709063430ea4077cf792d3680a7fde Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Sep 2023 11:45:56 +0200
Subject: [PATCH 1175/1963] refactor(doc): Update the features list in the
 README.md and GH badges

---
 README.md | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index d1bad52154c..3e6510ee605 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,7 @@ Build Status:
 
 Code Quality:
 
-[![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/open62541/open62541.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/open62541/open62541/context:cpp)
-[![Total Alerts](https://img.shields.io/lgtm/alerts/g/open62541/open62541.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/open62541/open62541/alerts)
+[![Code Scanning](https://github.com/open62541/open62541/actions/workflows/codeql.yml/badge.svg)](https://github.com/open62541/open62541/actions/workflows/codeql.yml)
 [![codecov](https://codecov.io/gh/open62541/open62541/branch/master/graph/badge.svg)](https://codecov.io/gh/open62541/open62541)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/open62541.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:open62541)
 
@@ -30,26 +29,26 @@ General Project Info:
 open62541 implements an OPC UA SDK with support for servers, clients and PubSub (publish-subscribe) communication.
 See the [features overview](FEATURES.md) for full details.
 
-- Communication Stack
-  - OPC UA binary protocol
-  - OPC UA JSON encoding
-  - Secure communication with encrypted messages
-  - Exchangeable network layer (plugin) for using custom networking APIs (e.g. on embedded targets)
-  - Support for generating data types from standard XML definitions
+- Core Stack
+  - OPC UA binary and JSON encoding
+  - TCP-based OPC UA SecureChannel
+  - Custom data types (generated from XML definitions)
+  - Portable C99 -- architecture-specific code is encapsulated behind standard interfaces
+  - Highly configurable with default plugins for encryption (OpenSSL, mbedTLS), access control, historizing, logging, etc.
 - Server
-  - Support for all OPC UA node types
-  - Access control for individual nodes
-  - Support for generating server-side information models from standard XML definitions (nodesets)
-  - Support for adding and removing nodes and references also at runtime.
-  - Support for inheritance and instantiation of object- and variable-types (custom constructor/destructor, instantiation of child nodes)
-  - Support for subscriptions/monitoreditems (data change notifications and events)
+  - Support for all OPC UA services (except the Query service -- not implemented by any SDK)
+  - Support for generating information models from standard XML definitions (Nodeset Compiler)
+  - Support for adding and removing nodes and references at runtime
+  - Support for subscriptions (data-change and event notifications)
 - Client
-  - All OPC UA services supported
-  - Asynchronous service requests
+  - Support for all OPC UA services
+  - Support for asynchronous service requests
   - Background handling of subscriptions
-- Publish/Subscribe
-  - UADP Binary protocol with UDP-multicast or Ethernet communication
-  - PubSub JSON encoding
+- PubSub
+  - PubSub message encoding (binary and JSON)
+  - Transport over UDP-multicast, Ethernet, MQTT
+  - Runtime configuration via the information model
+  - Configurable realtime fast-path
 
 ## Commercial Use and Official Support
 

From b05a24b91439e87a8abc2c644395525a112791f1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Sep 2023 12:02:37 +0200
Subject: [PATCH 1176/1963] refactor(doc): Simplify the Github badges

---
 README.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3e6510ee605..a2e6c94b05e 100644
--- a/README.md
+++ b/README.md
@@ -6,21 +6,16 @@ open62541 is licensed under the Mozilla Public License v2.0 (MPLv2). This allows
 
 The library is [available](https://github.com/open62541/open62541/releases) in standard source and binary form. In addition, the single-file source distribution merges the entire library into a single .c and .h file that can be easily added to existing projects. Example server and client implementations can be found in the [/examples](examples/) directory or further down on this page.
 
-## Project Information
-
 Build Status:
-
 [![Build Status](https://dev.azure.com/open62541/open62541/_apis/build/status/open62541.open62541?branchName=master)](https://dev.azure.com/open62541/open62541/_build/latest?definitionId=1&branchName=master)
 [![Build Status](https://ci.appveyor.com/api/projects/status/github/open62541/open62541?branch=master&svg=true)](https://ci.appveyor.com/project/open62541/open62541/branch/master)
 
 Code Quality:
-
 [![Code Scanning](https://github.com/open62541/open62541/actions/workflows/codeql.yml/badge.svg)](https://github.com/open62541/open62541/actions/workflows/codeql.yml)
 [![codecov](https://codecov.io/gh/open62541/open62541/branch/master/graph/badge.svg)](https://codecov.io/gh/open62541/open62541)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/open62541.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:open62541)
 
-General Project Info:
-
+Project Statistics:
 [![Open Hub Project Status](https://www.openhub.net/p/open62541/widgets/project_thin_badge.gif)](https://www.openhub.net/p/open62541/)
 [![Overall Downloads](https://img.shields.io/github/downloads/open62541/open62541/total.svg)](https://github.com/open62541/open62541/releases)
 

From 5074ab2e086ff533fee09f62c0330a36f8922c47 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Tue, 26 Sep 2023 12:07:56 +0200
Subject: [PATCH 1177/1963] refactor(doc): Simplify README.md

---
 README.md | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index a2e6c94b05e..eb63e73f2e3 100644
--- a/README.md
+++ b/README.md
@@ -6,18 +6,12 @@ open62541 is licensed under the Mozilla Public License v2.0 (MPLv2). This allows
 
 The library is [available](https://github.com/open62541/open62541/releases) in standard source and binary form. In addition, the single-file source distribution merges the entire library into a single .c and .h file that can be easily added to existing projects. Example server and client implementations can be found in the [/examples](examples/) directory or further down on this page.
 
-Build Status:
+[![Open Hub Project Status](https://www.openhub.net/p/open62541/widgets/project_thin_badge.gif)](https://www.openhub.net/p/open62541/)
 [![Build Status](https://dev.azure.com/open62541/open62541/_apis/build/status/open62541.open62541?branchName=master)](https://dev.azure.com/open62541/open62541/_build/latest?definitionId=1&branchName=master)
 [![Build Status](https://ci.appveyor.com/api/projects/status/github/open62541/open62541?branch=master&svg=true)](https://ci.appveyor.com/project/open62541/open62541/branch/master)
-
-Code Quality:
 [![Code Scanning](https://github.com/open62541/open62541/actions/workflows/codeql.yml/badge.svg)](https://github.com/open62541/open62541/actions/workflows/codeql.yml)
-[![codecov](https://codecov.io/gh/open62541/open62541/branch/master/graph/badge.svg)](https://codecov.io/gh/open62541/open62541)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/open62541.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:open62541)
-
-Project Statistics:
-[![Open Hub Project Status](https://www.openhub.net/p/open62541/widgets/project_thin_badge.gif)](https://www.openhub.net/p/open62541/)
-[![Overall Downloads](https://img.shields.io/github/downloads/open62541/open62541/total.svg)](https://github.com/open62541/open62541/releases)
+[![codecov](https://codecov.io/gh/open62541/open62541/branch/master/graph/badge.svg)](https://codecov.io/gh/open62541/open62541)
 
 ## Features
 
@@ -51,8 +45,8 @@ open62541 is licensed under the MPLv2. That is, changes to files under MPLv2 fal
 But the library can be combined with private development from separate files, also if a static binary is produced, without the license affecting the private files.
 See the full [license document](LICENSE) for details.
 
-**Fraunhofer IOSB** maintains open62541 and also provides **[official commercial support](https://www.iosb.fraunhofer.de/en/projects-and-products/open62541.html)**.
-Additional commercial service providers are listed on [open62541.org](https://www.open62541.org/).
+**Fraunhofer IOSB** maintains open62541 and provides **[official commercial support](https://www.iosb.fraunhofer.de/en/projects-and-products/open62541.html)**.
+Additional service providers are listed on [open62541.org](https://www.open62541.org/).
 
 ## Official Certification
 
@@ -78,9 +72,8 @@ See the page on [open62541 Features](FEATURES.md) for an in-depth look at the su
   
 ## Documentation and Support
 
-A general introduction to OPC UA and the open62541 documentation can be found at http://open62541.org/doc/current.
+A general introduction to OPC UA and the open62541 documentation can be found at http://open62541.org.
 Past releases of the library can be downloaded at https://github.com/open62541/open62541/releases.
-To use the latest improvements, download a nightly build of the *single-file distribution* (the entire library merged into a single source and header file) from http://open62541.org/releases. Nightly builds of MSVC binaries of the library are available [here](https://ci.appveyor.com/project/open62541/open62541/build/artifacts).
 
 The overall open62541 community handles public support requests on Github and the mailing list.
 For individual discussion and support, use the following channels:

From 74a698c55d23a666503efe0c79460ff4d67297ef Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 29 Sep 2023 09:51:29 +0200
Subject: [PATCH 1178/1963] feat(client): Added support for reading the
 AccessLevelEx attribute.

---
 include/open62541/client_highlevel.h       | 14 ++++++++++++++
 include/open62541/client_highlevel_async.h | 19 +++++++++++++++++++
 src/client/ua_client_highlevel.c           | 10 ++++++++++
 3 files changed, 43 insertions(+)

diff --git a/include/open62541/client_highlevel.h b/include/open62541/client_highlevel.h
index 8c34ac1fe4f..55179c44733 100644
--- a/include/open62541/client_highlevel.h
+++ b/include/open62541/client_highlevel.h
@@ -170,6 +170,13 @@ UA_Client_readAccessLevelAttribute(UA_Client *client, const UA_NodeId nodeId,
                                      outAccessLevel, &UA_TYPES[UA_TYPES_BYTE]);
 }
 
+static UA_INLINE UA_StatusCode
+UA_Client_readAccessLevelExAttribute(UA_Client *client, const UA_NodeId nodeId,
+                                     UA_UInt32 *outAccessLevelEx) {
+    return __UA_Client_readAttribute(client, &nodeId, UA_ATTRIBUTEID_ACCESSLEVELEX,
+                                     outAccessLevelEx, &UA_TYPES[UA_TYPES_UINT32]);
+}
+
 static UA_INLINE UA_StatusCode
 UA_Client_readUserAccessLevelAttribute(UA_Client *client, const UA_NodeId nodeId,
                                        UA_Byte *outUserAccessLevel) {
@@ -406,6 +413,13 @@ UA_Client_writeAccessLevelAttribute(UA_Client *client, const UA_NodeId nodeId,
                                       newAccessLevel, &UA_TYPES[UA_TYPES_BYTE]);
 }
 
+static UA_INLINE UA_StatusCode
+UA_Client_writeAccessLevelExAttribute(UA_Client *client, const UA_NodeId nodeId,
+                                      UA_UInt32 *newAccessLevelEx) {
+    return __UA_Client_writeAttribute(client, &nodeId, UA_ATTRIBUTEID_ACCESSLEVELEX,
+                                      newAccessLevelEx, &UA_TYPES[UA_TYPES_UINT32]);
+}
+
 static UA_INLINE UA_StatusCode
 UA_Client_writeUserAccessLevelAttribute(UA_Client *client, const UA_NodeId nodeId,
                                         const UA_Byte *newUserAccessLevel) {
diff --git a/include/open62541/client_highlevel_async.h b/include/open62541/client_highlevel_async.h
index 65b131612f2..710fb575572 100644
--- a/include/open62541/client_highlevel_async.h
+++ b/include/open62541/client_highlevel_async.h
@@ -257,6 +257,16 @@ UA_Client_readAccessLevelAttribute_async(UA_Client *client, const UA_NodeId node
                                          UA_ClientAsyncReadAccessLevelAttributeCallback callback,
                                          void *userdata, UA_UInt32 *requestId);
 
+/* Read a single AccessLevelEx attribute */
+typedef void
+(*UA_ClientAsyncReadAccessLevelExAttributeCallback)(UA_Client *client, void *userdata,
+                                                    UA_UInt32 requestId, UA_StatusCode status,
+                                                    UA_UInt32 *accessLevelEx);
+UA_StatusCode UA_EXPORT
+UA_Client_readAccessLevelExAttribute_async(UA_Client *client, const UA_NodeId nodeId,
+                                           UA_ClientAsyncReadAccessLevelExAttributeCallback callback,
+                                           void *userdata, UA_UInt32 *requestId);
+
 /* Read a single UserAccessLevel attribute */
 typedef void
 (*UA_ClientAsyncReadUserAccessLevelAttributeCallback)(UA_Client *client, void *userdata,
@@ -465,6 +475,15 @@ UA_Client_writeAccessLevelAttribute_async(UA_Client *client, const UA_NodeId nod
                                             callback, userdata, reqId);
 }
 static UA_INLINE UA_StatusCode
+UA_Client_writeAccessLevelExAttribute_async(UA_Client *client, const UA_NodeId nodeId,
+                                            const UA_UInt32 *outAccessLevelEx,
+                                            UA_ClientAsyncServiceCallback callback,
+                                            void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_ACCESSLEVELEX,
+                                            outAccessLevelEx, &UA_TYPES[UA_TYPES_UINT32],
+                                            callback, userdata, reqId);
+}
+static UA_INLINE UA_StatusCode
 UA_Client_writeUserAccessLevelAttribute_async(UA_Client *client, const UA_NodeId nodeId,
                                               const UA_Byte *outUserAccessLevel,
                                               UA_ClientAsyncServiceCallback callback,
diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index aa7c7da324b..6c89847e63c 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -1096,6 +1096,16 @@ UA_Client_readAccessLevelAttribute_async(UA_Client *client, const UA_NodeId node
                                      userdata, requestId);
 }
 
+UA_StatusCode
+UA_Client_readAccessLevelExAttribute_async(UA_Client *client, const UA_NodeId nodeId,
+                                           UA_ClientAsyncReadAccessLevelExAttributeCallback callback,
+                                           void *userdata, UA_UInt32 *requestId) {
+    return readAttribute_simpleAsync(client, &nodeId, UA_ATTRIBUTEID_ACCESSLEVELEX,
+                                     &UA_TYPES[UA_TYPES_UINT32],
+                                     (UA_ClientAsyncOperationCallback)callback,
+                                     userdata, requestId);
+}
+
 UA_StatusCode
 UA_Client_readUserAccessLevelAttribute_async(UA_Client *client, const UA_NodeId nodeId,
                                              UA_ClientAsyncReadUserAccessLevelAttributeCallback callback,

From ed9edeca5db32549e6cc0d4b56be3e0363df5ac9 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Fri, 29 Sep 2023 23:24:22 +0200
Subject: [PATCH 1179/1963] build(plugin): ignore unused variable in #ifdef

When a variable is not used in a certain #ifdef path, cast it to
void to prevent compiler warning.
---
 plugins/ua_config_json.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/ua_config_json.c b/plugins/ua_config_json.c
index 27f5a8c450d..af608fb83c5 100644
--- a/plugins/ua_config_json.c
+++ b/plugins/ua_config_json.c
@@ -790,6 +790,7 @@ PARSE_JSON(SecurityPkiField) {
     }
 #ifndef __linux__
     /* Currently not supported! */
+    (void)field;
     return UA_STATUSCODE_GOOD;
 #else
     /* set server config field */

From 67c7283e47a386e5da8dd4cb3f369082ada97aa7 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Tue, 26 Sep 2023 22:38:24 +0200
Subject: [PATCH 1180/1963] build(arch): only CI build treats compiler warning
 as error

Compile option -Werror makes it hard to port to new platforms as
new warnings show up and are fatal.  Use -Werror in the CI build
as only this controlled enviroment keeps the supported C subset
fixed.
---
 CMakeLists.txt                   |  3 ---
 tools/azure-devops/win/build.ps1 | 20 +++++++++++++++-----
 tools/ci.sh                      | 25 +++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08452b81bdf..66f946aed88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -298,9 +298,6 @@ option(UA_FORCE_32BIT "Force compilation as 32-bit executable" OFF)
 mark_as_advanced(UA_FORCE_32BIT)
 
 option(UA_FORCE_WERROR "Force compilation with -Werror (or /WX on MSVC)" OFF)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(UA_FORCE_WERROR ON)
-endif()
 
 option(UA_ENABLE_DEBUG_SANITIZER "Use sanitizer in debug mode" ON)
 mark_as_advanced(UA_ENABLE_DEBUG_SANITIZER)
diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 597c52f1686..cb8ae257720 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -66,7 +66,9 @@ try {
                 -DUA_ENABLE_PUBSUB:BOOL=ON `
                 -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
                 -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON `
-                -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON ..
+                -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON `
+                -DUA_FORCE_WERROR=ON `
+                ..
         & cmake --build . --config Debug
         if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
             Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
@@ -90,7 +92,9 @@ try {
             -DUA_BUILD_EXAMPLES:BOOL=OFF  `
             -DUA_ENABLE_AMALGAMATION:BOOL=ON `
             -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
-            -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption ..
+            -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
+            -DUA_FORCE_WERROR=ON `
+            ..
     & cmake --build . --config RelWithDebInfo
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
@@ -113,7 +117,9 @@ try {
             -DUA_ENABLE_PUBSUB:BOOL=ON `
             -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
             -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
-            -DUA_NAMESPACE_ZERO:STRING=FULL ..
+            -DUA_FORCE_WERROR=ON `
+            -DUA_NAMESPACE_ZERO:STRING=FULL `
+            ..
     & cmake --build . --config Debug
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
@@ -131,7 +137,9 @@ try {
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             -DCMAKE_INSTALL_PREFIX="$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-static" `
             -DUA_BUILD_EXAMPLES:BOOL=ON `
-            -DUA_ENABLE_AMALGAMATION:BOOL=OFF ..
+            -DUA_ENABLE_AMALGAMATION:BOOL=OFF `
+            -DUA_FORCE_WERROR=ON `
+            ..
     & cmake --build . --target install --config RelWithDebInfo
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
     {
@@ -156,7 +164,9 @@ try {
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             -DCMAKE_INSTALL_PREFIX="$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-dynamic" `
             -DUA_BUILD_EXAMPLES:BOOL=ON `
-            -DUA_ENABLE_AMALGAMATION:BOOL=OFF ..
+            -DUA_ENABLE_AMALGAMATION:BOOL=OFF `
+            -DUA_FORCE_WERROR=ON `
+            ..
     & cmake --build . --target install --config RelWithDebInfo
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
     {
diff --git a/tools/ci.sh b/tools/ci.sh
index 3bc584e51f9..07110406415 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -22,7 +22,8 @@ fi
 
 function cpplint {
     mkdir -p build; cd build; rm -rf *
-    cmake ..
+    cmake -DUA_FORCE_WERROR=ON \
+          ..
     make ${MAKEOPTS} cpplint
 }
 
@@ -34,6 +35,7 @@ function build_docs {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Release \
           -DUA_BUILD_EXAMPLES=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make doc
 }
@@ -46,6 +48,7 @@ function build_docs_pdf {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Release \
           -DUA_BUILD_EXAMPLES=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make doc doc_pdf
 }
@@ -62,6 +65,7 @@ function build_tpm_tool {
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
 }
@@ -77,6 +81,7 @@ function build_release {
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DUA_BUILD_EXAMPLES=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
 }
@@ -97,6 +102,7 @@ function build_amalgamation {
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
 }
@@ -113,6 +119,7 @@ function build_amalgamation_mt {
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_FORCE_WERROR=ON \
           -DUA_MULTITHREADING=100 \
           ..
     make ${MAKEOPTS}
@@ -143,6 +150,7 @@ function unit_tests {
           -DUA_ENABLE_MQTT=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities
@@ -163,6 +171,7 @@ function unit_tests_32 {
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_FORCE_32BIT=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
           #-DUA_ENABLE_PUBSUB_ETH_UADP=ON \ # TODO: Enable this
     make ${MAKEOPTS}
@@ -177,6 +186,7 @@ function unit_tests_nosub {
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_HISTORIZING=OFF \
           -DUA_ENABLE_SUBSCRIPTIONS=OFF \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities
@@ -198,6 +208,7 @@ function unit_tests_diag {
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities
@@ -212,6 +223,7 @@ function unit_tests_mt {
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities
@@ -227,7 +239,8 @@ function unit_tests_alarms {
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
-	      -DUA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS=ON \
+              -DUA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS=ON \
+          -DUA_FORCE_WERROR=ON \
           -DUA_NAMESPACE_ZERO=FULL \
           ..
     make ${MAKEOPTS}
@@ -242,6 +255,7 @@ function unit_tests_encryption {
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities
@@ -260,6 +274,7 @@ function unit_tests_encryption_mbedtls_pubsub {
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities
@@ -280,6 +295,7 @@ function unit_tests_pubsub_sks {
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           -DUA_ENABLE_PUBSUB_SKS=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     # set_capabilities not possible with valgrind
@@ -307,6 +323,7 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     set_capabilities
@@ -333,6 +350,7 @@ function unit_tests_valgrind {
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
     # set_capabilities not possible with valgrind
@@ -371,6 +389,7 @@ function examples_valgrind {
           -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_SKS=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
 
@@ -402,6 +421,7 @@ function build_clang_analyzer {
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
+          -DUA_FORCE_WERROR=ON \
           ..
     scan-build-11 --status-bugs make ${MAKEOPTS}
 }
@@ -415,6 +435,7 @@ function build_all_companion_specs {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_FORCE_WERROR=ON \
           -DUA_INFORMATION_MODEL_AUTOLOAD=DI\;ISA95-JOBCONTROL\;OpenSCS\;DEXPI\;AMB\;AutoID\;POWERLINK\;IA\;Machinery\;PackML\;PNEM\;PLCopen\;MachineTool\;PROFINET\;MachineVision\;FDT\;CommercialKitchenEquipment\;Scales\;Weihenstephan\;Pumps\;CAS\;TMC \
           -DUA_NAMESPACE_ZERO=FULL \
           ..

From 478864fe7bc56592fbe1ac900dd4f8300c847ddd Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 29 Sep 2023 10:25:48 +0200
Subject: [PATCH 1181/1963] feat(server): Added support for the AccessLevelEx
 attribute.

---
 include/open62541/common.h               |  1 +
 include/open62541/server.h               | 14 ++++++++++++
 src/server/ua_services_attribute.c       | 19 ++++++++++++++--
 tests/server/check_services_attributes.c | 28 ++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/include/open62541/common.h b/include/open62541/common.h
index 461deb7cb80..0299a24a175 100644
--- a/include/open62541/common.h
+++ b/include/open62541/common.h
@@ -106,6 +106,7 @@ typedef enum {
 #define UA_WRITEMASK_VALUERANK               (0x01u << 19u)
 #define UA_WRITEMASK_WRITEMASK               (0x01u << 20u)
 #define UA_WRITEMASK_VALUEFORVARIABLETYPE    (0x01u << 21u)
+#define UA_WRITEMASK_ACCESSLEVELEX           (0x01u << 25u)
 
 /**
  * .. _valuerank-defines:
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 9cbaf08d756..741981f04f8 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -731,6 +731,13 @@ UA_Server_readAccessLevel(UA_Server *server, const UA_NodeId nodeId,
                             outAccessLevel);
 }
 
+static UA_INLINE UA_THREADSAFE UA_StatusCode
+UA_Server_readAccessLevelEx(UA_Server *server, const UA_NodeId nodeId,
+                            UA_UInt32 *outAccessLevelEx) {
+    return __UA_Server_read(server, &nodeId, UA_ATTRIBUTEID_ACCESSLEVELEX,
+                            outAccessLevelEx);
+}
+
 static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Server_readMinimumSamplingInterval(UA_Server *server, const UA_NodeId nodeId,
                                       UA_Double *outMinimumSamplingInterval) {
@@ -890,6 +897,13 @@ UA_Server_writeAccessLevel(UA_Server *server, const UA_NodeId nodeId,
                              &UA_TYPES[UA_TYPES_BYTE], &accessLevel);
 }
 
+static UA_INLINE UA_THREADSAFE UA_StatusCode
+UA_Server_writeAccessLevelEx(UA_Server *server, const UA_NodeId nodeId,
+                             const UA_UInt32 accessLevelEx) {
+    return __UA_Server_write(server, &nodeId, UA_ATTRIBUTEID_ACCESSLEVELEX,
+                             &UA_TYPES[UA_TYPES_UINT32], &accessLevelEx);
+}
+
 static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Server_writeMinimumSamplingInterval(UA_Server *server, const UA_NodeId nodeId,
                                        const UA_Double miniumSamplingInterval) {
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 9f339393131..466b7631561 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -522,6 +522,16 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
         retval = UA_Variant_setScalarCopy(&v->value, &node->variableNode.accessLevel,
                                           &UA_TYPES[UA_TYPES_BYTE]);
         break;
+    case UA_ATTRIBUTEID_ACCESSLEVELEX:
+        CHECK_NODECLASS(UA_NODECLASS_VARIABLE);
+        /* The normal AccessLevelEx contains the lowest 8 bits from the normal AccessLevel.
+         * In our case, all other bits are zero. */
+        const UA_Byte accessLevel = *((const UA_Byte*)(&node->variableNode.accessLevel));
+        UA_UInt32 accessLevelEx = accessLevel & 0xFF;
+        retval = UA_Variant_setScalarCopy(&v->value, &accessLevelEx,
+                                          &UA_TYPES[UA_TYPES_UINT32]);
+
+        break;
     case UA_ATTRIBUTEID_USERACCESSLEVEL: {
         CHECK_NODECLASS(UA_NODECLASS_VARIABLE);
         UA_Byte userAccessLevel = getUserAccessLevel(server, session, &node->variableNode);
@@ -581,9 +591,8 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
     case UA_ATTRIBUTEID_ROLEPERMISSIONS:
     case UA_ATTRIBUTEID_USERROLEPERMISSIONS:
     case UA_ATTRIBUTEID_ACCESSRESTRICTIONS:
-    case UA_ATTRIBUTEID_ACCESSLEVELEX:
         /* TODO: Add support for the attributes from the 1.04 spec */
-        retval = UA_STATUSCODE_BADNOTSUPPORTED;
+        retval = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
         break;
 
     default:
@@ -1791,6 +1800,12 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
         CHECK_DATATYPE_SCALAR(BYTE);
         node->variableNode.accessLevel = *(const UA_Byte*)value;
         break;
+    case UA_ATTRIBUTEID_ACCESSLEVELEX:
+        CHECK_NODECLASS_WRITE(UA_NODECLASS_VARIABLE);
+        CHECK_USERWRITEMASK(UA_WRITEMASK_ACCESSLEVELEX);
+        CHECK_DATATYPE_SCALAR(UINT32);
+        node->variableNode.accessLevel = (UA_Byte)(*(const UA_UInt32*)value & 0xFF);
+        break;
     case UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL:
         CHECK_NODECLASS_WRITE(UA_NODECLASS_VARIABLE);
         CHECK_USERWRITEMASK(UA_WRITEMASK_MINIMUMSAMPLINGINTERVAL);
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index 57df56acb7e..3ae85ff374e 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -511,6 +511,20 @@ START_TEST(ReadSingleAttributeAccessLevelWithoutTimestamp) {
     UA_DataValue_clear(&resp);
 } END_TEST
 
+START_TEST(ReadSingleAttributeAccessLevelExWithoutTimestamp) {
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = UA_NODEID_STRING(1, "the.answer");
+    rvi.attributeId = UA_ATTRIBUTEID_ACCESSLEVELEX;
+
+    UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
+
+    ck_assert_uint_eq(0, resp.value.arrayLength);
+    ck_assert(&UA_TYPES[UA_TYPES_UINT32] == resp.value.type);
+    ck_assert_int_eq(*(UA_Byte*)resp.value.data, UA_ACCESSLEVELMASK_READ); // set by default
+    UA_DataValue_clear(&resp);
+} END_TEST
+
 START_TEST(ReadSingleAttributeUserAccessLevelWithoutTimestamp) {
     UA_ReadValueId rvi;
     UA_ReadValueId_init(&rvi);
@@ -948,6 +962,18 @@ START_TEST(WriteSingleAttributeAccessLevel) {
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 } END_TEST
 
+START_TEST(WriteSingleAttributeAccessLevelEx) {
+    UA_WriteValue wValue;
+    UA_WriteValue_init(&wValue);
+    UA_Byte testValue = 0;
+    UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_UINT32]);
+    wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
+    wValue.attributeId = UA_ATTRIBUTEID_ACCESSLEVELEX;
+    wValue.value.hasValue = true;
+    UA_StatusCode retval = UA_Server_write(server, &wValue);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+} END_TEST
+
 START_TEST(WriteSingleAttributeMinimumSamplingInterval) {
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
@@ -1114,6 +1140,7 @@ static Suite * testSuite_services_attributes(void) {
     tcase_add_test(tc_readSingleAttributes, ReadSingleAttributeValueRankWithoutTimestamp);
     tcase_add_test(tc_readSingleAttributes, ReadSingleAttributeArrayDimensionsWithoutTimestamp);
     tcase_add_test(tc_readSingleAttributes, ReadSingleAttributeAccessLevelWithoutTimestamp);
+    tcase_add_test(tc_readSingleAttributes, ReadSingleAttributeAccessLevelExWithoutTimestamp);
     tcase_add_test(tc_readSingleAttributes, ReadSingleAttributeUserAccessLevelWithoutTimestamp);
     tcase_add_test(tc_readSingleAttributes, ReadSingleAttributeMinimumSamplingIntervalWithoutTimestamp);
     tcase_add_test(tc_readSingleAttributes, ReadSingleAttributeHistorizingWithoutTimestamp);
@@ -1149,6 +1176,7 @@ static Suite * testSuite_services_attributes(void) {
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeValueRank);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeArrayDimensions);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeAccessLevel);
+    tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeAccessLevelEx);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeMinimumSamplingInterval);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeHistorizing);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeExecutable);

From 07abb76cb316caf4cb1753a7a3a2493aed837886 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 2 Oct 2023 15:48:26 +0200
Subject: [PATCH 1182/1963] fix(test): Correct data type for setting the
 AccessLevelEx attribute.

---
 tests/server/check_services_attributes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index 3ae85ff374e..e9b98fa43fe 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -965,7 +965,7 @@ START_TEST(WriteSingleAttributeAccessLevel) {
 START_TEST(WriteSingleAttributeAccessLevelEx) {
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
-    UA_Byte testValue = 0;
+    UA_UInt32 testValue = 0;
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_UINT32]);
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_ACCESSLEVELEX;

From 92d5f064eac53c2012d1037b3296598a4025de74 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 27 Sep 2023 10:52:57 +0200
Subject: [PATCH 1183/1963] fix(server): Set correct server profile.

---
 src/server/ua_server_ns0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 94fdfb98ffe..708ea77adb2 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -1023,7 +1023,7 @@ initNS0(UA_Server *server) {
     UA_String profileArray[3];
     UA_UInt16 profileArraySize = 0;
 #define ADDPROFILEARRAY(x) profileArray[profileArraySize++] = UA_STRING(x)
-    ADDPROFILEARRAY("http://opcfoundation.org/UA-Profile/Server/MicroEmbeddedDevice");
+    ADDPROFILEARRAY("http://opcfoundation.org/UA-Profile/Server/StandardUA2017");
 #ifdef UA_ENABLE_NODEMANAGEMENT
     ADDPROFILEARRAY("http://opcfoundation.org/UA-Profile/Server/NodeManagement");
 #endif

From 738820751b713b72702021d18caacb21d7bbd9ed Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 27 Sep 2023 10:48:27 +0200
Subject: [PATCH 1184/1963] fix(server): Set the SecurityLevel in the
 Enpointdescription according to the specification.

---
 plugins/ua_config_default.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 46035e7b4d2..eeffd8f507c 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -222,7 +222,21 @@ addEndpoint(UA_ServerConfig *conf,
     endpoint->transportProfileUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
     endpoint->securityMode = securityMode;
-    endpoint->securityLevel = (UA_Byte)securityMode;
+
+    /* A numeric value that indicates how secure the EndpointDescription is compared to other EndpointDescriptions
+     * for the same Server. A value of 0 indicates that the EndpointDescription is not recommended and is only
+     * supported for backward compatibility. A higher value indicates better security. */
+    UA_String noneuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
+    UA_String basic128uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15");
+    UA_String basic256uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
+    if(UA_String_equal(&securityPolicy->policyUri, &noneuri) ||
+       UA_String_equal(&securityPolicy->policyUri, &basic128uri) ||
+       UA_String_equal(&securityPolicy->policyUri, &basic256uri)) {
+        endpoint->securityLevel = 0;
+    } else {
+        endpoint->securityLevel = 1;
+    }
+
     UA_StatusCode retval = UA_String_copy(&securityPolicy->policyUri,
                                           &endpoint->securityPolicyUri);
 

From d2ea2c8357a43510e3c9a13e78accab668823c71 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 2 Oct 2023 00:01:49 +0200
Subject: [PATCH 1185/1963] feat(server) add periodic lds reconnet logic

---
 examples/server_ctt.c | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 60af27c2a64..79b534d4ce8 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -19,6 +19,8 @@
 #include <stdio.h>
 
 #include "common.h"
+#include "open62541/client.h"
+#include "open62541/client_config_default.h"
 
 #define MAX_OPERATION_LIMIT 10000
 
@@ -33,6 +35,8 @@ static UA_UsernamePasswordLogin usernamePasswords[2] = {
 
 static const UA_NodeId baseDataVariableType = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_BASEDATAVARIABLETYPE}};
 static const UA_NodeId accessDenied = {1, UA_NODEIDTYPE_NUMERIC, {1337}};
+static UA_Client *ldsClientRegister;
+static UA_UInt64 ldsCallbackId;
 
 /* Custom AccessControl policy that disallows access to one specific node */
 static UA_Byte
@@ -849,6 +853,25 @@ setInformationModel(UA_Server *server) {
 #endif
 }
 
+#ifdef UA_ENABLE_DISCOVERY
+static void configureLdsRegistration(UA_Server *server){
+    ldsClientRegister = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(ldsClientRegister));
+
+    // periodic server register after 1 Minutes, delay first register for 500ms
+    UA_StatusCode retval =
+        UA_Server_addPeriodicServerRegisterCallback(server, ldsClientRegister, "opc.tcp://localhost:4840",
+                                                    60 * 1000, 500, &ldsCallbackId);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                     "Could not create periodic job for server register. StatusCode %s",
+                     UA_StatusCode_name(retval));
+        UA_Client_disconnect(ldsClientRegister);
+        UA_Client_delete(ldsClientRegister);
+    }
+}
+#endif
+
 static void
 disableAnonymous(UA_ServerConfig *config) {
     for(size_t i = 0; i < config->endpointsSize; i++) {
@@ -1304,7 +1327,7 @@ int main(int argc, char **argv) {
 
     /* Load PKI */
 #ifdef UA_ENABLE_ENCRYPTION
-    res = UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840,
+    res = UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4841,
                                                          &certificate, &privateKey,
                                                          NULL, 0, NULL, 0, NULL, 0);
     if(res != UA_STATUSCODE_GOOD)
@@ -1352,7 +1375,7 @@ int main(int argc, char **argv) {
         disableBasic256Sha256SecurityPolicy(config);
 
 #else /* UA_ENABLE_ENCRYPTION */
-    res = UA_ServerConfig_setMinimal(config, 4840, &certificate);
+    res = UA_ServerConfig_setMinimal(config, 4841, &certificate);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 #endif /* UA_ENABLE_ENCRYPTION */
@@ -1408,11 +1431,20 @@ int main(int argc, char **argv) {
 
     setInformationModel(server);
 
+#ifdef UA_ENABLE_DISCOVERY
+
+    configureLdsRegistration(server);
+
+#endif
 
     /* run server */
     res = UA_Server_runUntilInterrupt(server);
 
  cleanup:
+    UA_Server_removeCallback(server, ldsCallbackId);
+    UA_Server_unregister_discovery(server, ldsClientRegister);
+    UA_Client_disconnect(ldsClientRegister);
+    UA_Client_delete(ldsClientRegister);
     UA_Server_delete(server);
 
     UA_ByteString_clear(&certificate);

From 3f5676312f3c468a81305cfdcf264393a272fc85 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 4 Oct 2023 16:44:16 +0200
Subject: [PATCH 1186/1963] feat(server): Added ability to configure server
 with secure policies only.

---
 .../include/open62541/server_config_default.h |  24 ++++
 plugins/ua_config_default.c                   | 126 +++++++++++++++++-
 2 files changed, 148 insertions(+), 2 deletions(-)

diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index eade7f5411c..2ce8666f0cb 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -72,6 +72,18 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
                                                const UA_ByteString *revocationList,
                                                size_t revocationListSize);
 
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_setDefaultWithSecureSecurityPolicies(UA_ServerConfig *conf,
+                                                     UA_UInt16 portNumber,
+                                                     const UA_ByteString *certificate,
+                                                     const UA_ByteString *privateKey,
+                                                     const UA_ByteString *trustList,
+                                                     size_t trustListSize,
+                                                     const UA_ByteString *issuerList,
+                                                     size_t issuerListSize,
+                                                     const UA_ByteString *revocationList,
+                                                     size_t revocationListSize);
+
 #endif
 
 /* Creates a server config on the default port 4840 with no server
@@ -215,6 +227,11 @@ UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
                                        const UA_ByteString *certificate,
                                        const UA_ByteString *privateKey);
 
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_addAllSecureSecurityPolicies(UA_ServerConfig *config,
+                                       const UA_ByteString *certificate,
+                                       const UA_ByteString *privateKey);
+
 #endif
 
 /* Adds an endpoint for the given security policy and mode. The security
@@ -235,6 +252,13 @@ UA_ServerConfig_addEndpoint(UA_ServerConfig *config, const UA_String securityPol
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_addAllEndpoints(UA_ServerConfig *config);
 
+/* Adds endpoints for all secure configured security policies in each mode.
+ *
+ * @param config The configuration to manipulate
+ */
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_addAllSecureEndpoints(UA_ServerConfig *config);
+
 _UA_END_DECLS
 
 #endif /* UA_SERVER_CONFIG_DEFAULT_H_ */
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index eeffd8f507c..02350fb6fda 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -591,6 +591,43 @@ UA_ServerConfig_addAllEndpoints(UA_ServerConfig *config) {
     return UA_STATUSCODE_GOOD;
 }
 
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_addAllSecureEndpoints(UA_ServerConfig *config) {
+    UA_String noneuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
+    UA_String basic128uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15");
+    UA_String basic256uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
+
+    /* Delete all predefined endpoints. */
+    if(config->endpointsSize > 0) {
+        for(size_t i = 0; i < config->endpointsSize; ++i)
+            UA_EndpointDescription_clear(&config->endpoints[i]);
+
+        UA_free(config->endpoints);
+        config->endpoints = NULL;
+        config->endpointsSize = 0;
+    }
+
+    /* Populate the endpoints */
+    for(size_t i = 0; i < config->securityPoliciesSize; ++i) {
+        /* Skip the None and all deprecated policies */
+        if(UA_String_equal(&config->securityPolicies[i].policyUri, &noneuri) ||
+           UA_String_equal(&config->securityPolicies[i].policyUri, &basic128uri) ||
+           UA_String_equal(&config->securityPolicies[i].policyUri, &basic256uri)) {
+            continue;
+        }
+        UA_StatusCode retval =
+            addEndpoint(config, &config->securityPolicies[i], UA_MESSAGESECURITYMODE_SIGN);
+        if(retval != UA_STATUSCODE_GOOD)
+            return retval;
+        retval = addEndpoint(config, &config->securityPolicies[i],
+                             UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
+        if(retval != UA_STATUSCODE_GOOD)
+            return retval;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNumber,
                                        const UA_ByteString *certificate,
@@ -864,6 +901,43 @@ UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
     return UA_STATUSCODE_GOOD;
 }
 
+/* Always returns UA_STATUSCODE_GOOD. Logs a warning if policies could not be added. */
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_addAllSecureSecurityPolicies(UA_ServerConfig *config,
+                                             const UA_ByteString *certificate,
+                                             const UA_ByteString *privateKey) {
+    /* Populate the SecurityPolicies */
+    UA_ByteString localCertificate = UA_BYTESTRING_NULL;
+    UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
+    if(certificate)
+        localCertificate = *certificate;
+    if(privateKey)
+        localPrivateKey = *privateKey;
+
+    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate, &localPrivateKey);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate, &localPrivateKey);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate, &localPrivateKey);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
 UA_EXPORT UA_StatusCode
 UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
                                                UA_UInt16 portNumber,
@@ -896,25 +970,73 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
         return retval;
 
     retval = UA_ServerConfig_addAllSecurityPolicies(conf, certificate, privateKey);
+
+    if(retval == UA_STATUSCODE_GOOD) {
+        UA_SecurityPolicy *sp = &conf->securityPolicies[conf->securityPoliciesSize-1];
+        retval = UA_AccessControl_default(conf, true, &sp->policyUri, 0, NULL);
+    }
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_ServerConfig_clean(conf);
+        return retval;
+    }
+
+    retval = UA_ServerConfig_addAllEndpoints(conf);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
         return retval;
     }
 
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_EXPORT UA_StatusCode
+UA_ServerConfig_setDefaultWithSecureSecurityPolicies(UA_ServerConfig *conf,
+                                               UA_UInt16 portNumber,
+                                               const UA_ByteString *certificate,
+                                               const UA_ByteString *privateKey,
+                                               const UA_ByteString *trustList,
+                                               size_t trustListSize,
+                                               const UA_ByteString *issuerList,
+                                               size_t issuerListSize,
+                                               const UA_ByteString *revocationList,
+                                               size_t revocationListSize) {
+    UA_StatusCode retval = setDefaultConfig(conf, portNumber);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_ServerConfig_clean(conf);
+        return retval;
+    }
+
+    retval = UA_CertificateVerification_Trustlist(&conf->sessionPKI,
+                                                  trustList, trustListSize,
+                                                  issuerList, issuerListSize,
+                                                  revocationList, revocationListSize);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    retval = UA_CertificateVerification_Trustlist(&conf->secureChannelPKI,
+                                                  trustList, trustListSize,
+                                                  issuerList, issuerListSize,
+                                                  revocationList, revocationListSize);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    retval = UA_ServerConfig_addAllSecureSecurityPolicies(conf, certificate, privateKey);
+
     if(retval == UA_STATUSCODE_GOOD) {
         UA_SecurityPolicy *sp = &conf->securityPolicies[conf->securityPoliciesSize-1];
-        retval = UA_AccessControl_default(conf, true, &sp->policyUri, 0, NULL);
+        retval = UA_AccessControl_default(conf, false, &sp->policyUri, 0, NULL);
     }
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
         return retval;
     }
 
-    retval = UA_ServerConfig_addAllEndpoints(conf);
+    retval = UA_ServerConfig_addAllSecureEndpoints(conf);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
         return retval;
     }
+    conf->securityPolicyNoneDiscoveryOnly = true;
 
     return UA_STATUSCODE_GOOD;
 }

From 9ea46292af60dc7967217f79dd3536bb852d3f2e Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 4 Oct 2023 16:48:11 +0200
Subject: [PATCH 1187/1963] feat(examples): Added more startup parameters for
 configuring security settings to the server_ctt.

---
 examples/server_ctt.c | 208 ++++++++++++++++++------------------------
 1 file changed, 89 insertions(+), 119 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 79b534d4ce8..82e55454e63 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -872,87 +872,69 @@ static void configureLdsRegistration(UA_Server *server){
 }
 #endif
 
+#ifdef UA_ENABLE_ENCRYPTION
 static void
-disableAnonymous(UA_ServerConfig *config) {
-    for(size_t i = 0; i < config->endpointsSize; i++) {
-        UA_EndpointDescription *ep = &config->endpoints[i];
-
-        for(size_t j = 0; j < ep->userIdentityTokensSize; j++) {
-            UA_UserTokenPolicy *utp = &ep->userIdentityTokens[j];
-            if(utp->tokenType != UA_USERTOKENTYPE_ANONYMOUS)
-                continue;
-
-            UA_UserTokenPolicy_clear(utp);
-            /* Move the last to this position */
-            if(j + 1 < ep->userIdentityTokensSize) {
-                ep->userIdentityTokens[j] = ep->userIdentityTokens[ep->userIdentityTokensSize-1];
-                j--;
-            }
-            ep->userIdentityTokensSize--;
-        }
-
-        /* Delete the entire array if the last UserTokenPolicy was removed */
-        if(ep->userIdentityTokensSize == 0) {
-            UA_free(ep->userIdentityTokens);
-            ep->userIdentityTokens = NULL;
-        }
+enableNoneSecurityPolicy(UA_ServerConfig *config) {
+    UA_StatusCode retval = UA_ServerConfig_addEndpoint(config, UA_SECURITY_POLICY_NONE_URI,
+                                         UA_MESSAGESECURITYMODE_NONE);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Failed to add SecurityPolicy#None to the endpoint list.");
     }
+    config->securityPolicyNoneDiscoveryOnly = false;
 }
 
-#ifdef UA_ENABLE_ENCRYPTION
 static void
-disableUnencrypted(UA_ServerConfig *config) {
-    for(size_t i = 0; i < config->endpointsSize; i++) {
-        UA_EndpointDescription *ep = &config->endpoints[i];
-        if(ep->securityMode != UA_MESSAGESECURITYMODE_NONE)
-            continue;
-
-        UA_EndpointDescription_clear(ep);
-        /* Move the last to this position */
-        if(i + 1 < config->endpointsSize) {
-            config->endpoints[i] = config->endpoints[config->endpointsSize-1];
-            i--;
-        }
-        config->endpointsSize--;
-    }
-    /* Delete the entire array if the last Endpoint was removed */
-    if(config->endpointsSize== 0) {
-        UA_free(config->endpoints);
-        config->endpoints = NULL;
+enableBasic128SecurityPolicy(UA_ServerConfig *config,
+                             const UA_ByteString *certificate,
+                             const UA_ByteString *privateKey) {
+    /* Populate the SecurityPolicies */
+    UA_ByteString localCertificate = UA_BYTESTRING_NULL;
+    UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
+    if(certificate)
+        localCertificate = *certificate;
+    if(privateKey)
+        localPrivateKey = *privateKey;
+
+    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate, &localPrivateKey);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
+                       UA_StatusCode_name(retval));
     }
+    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri, UA_MESSAGESECURITYMODE_SIGN);
+    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri, UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
 }
 
 static void
-disableOutdatedSecurityPolicy(UA_ServerConfig *config) {
-    for(size_t i = 0; i < config->endpointsSize; i++) {
-        UA_EndpointDescription *ep = &config->endpoints[i];
-        UA_ByteString basic128uri = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15");
-        UA_ByteString basic256uri = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
-        if(!UA_String_equal(&ep->securityPolicyUri, &basic128uri) &&
-           !UA_String_equal(&ep->securityPolicyUri, &basic256uri))
-            continue;
-
-        UA_EndpointDescription_clear(ep);
-        /* Move the last to this position */
-        if(i + 1 < config->endpointsSize) {
-            config->endpoints[i] = config->endpoints[config->endpointsSize-1];
-            i--;
-        }
-        config->endpointsSize--;
-    }
-    /* Delete the entire array if the last Endpoint was removed */
-    if(config->endpointsSize== 0) {
-        UA_free(config->endpoints);
-        config->endpoints = NULL;
+enableBasic256SecurityPolicy(UA_ServerConfig *config,
+                             const UA_ByteString *certificate,
+                             const UA_ByteString *privateKey) {
+    /* Populate the SecurityPolicies */
+    UA_ByteString localCertificate = UA_BYTESTRING_NULL;
+    UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
+    if(certificate)
+        localCertificate = *certificate;
+    if(privateKey)
+        localPrivateKey = *privateKey;
+
+    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate, &localPrivateKey);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic256 with error code %s",
+                       UA_StatusCode_name(retval));
     }
+    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri, UA_MESSAGESECURITYMODE_SIGN);
+    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri, UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
 }
 
+
 static void
-disableBasic128SecurityPolicy(UA_ServerConfig *config) {
+disableBasic256Sha256SecurityPolicy(UA_ServerConfig *config) {
     for(size_t i = 0; i < config->endpointsSize; i++) {
         UA_EndpointDescription *ep = &config->endpoints[i];
-        UA_ByteString basic128uri = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15");
-        if(!UA_String_equal(&ep->securityPolicyUri, &basic128uri))
+        UA_ByteString basic256sha256uri = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+        if(!UA_String_equal(&ep->securityPolicyUri, &basic256sha256uri))
             continue;
 
         UA_EndpointDescription_clear(ep);
@@ -971,11 +953,11 @@ disableBasic128SecurityPolicy(UA_ServerConfig *config) {
 }
 
 static void
-disableBasic256SecurityPolicy(UA_ServerConfig *config) {
+disableAes128Sha256RsaOaepSecurityPolicy(UA_ServerConfig *config) {
     for(size_t i = 0; i < config->endpointsSize; i++) {
         UA_EndpointDescription *ep = &config->endpoints[i];
-        UA_ByteString basic256uri = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
-        if(!UA_String_equal(&ep->securityPolicyUri, &basic256uri))
+        UA_ByteString aes128Sha256RsaOaep = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
+        if(!UA_String_equal(&ep->securityPolicyUri, &aes128Sha256RsaOaep))
             continue;
 
         UA_EndpointDescription_clear(ep);
@@ -993,13 +975,12 @@ disableBasic256SecurityPolicy(UA_ServerConfig *config) {
     }
 }
 
-
 static void
-disableBasic256Sha256SecurityPolicy(UA_ServerConfig *config) {
+disableAes256Sha256RsaPssSecurityPolicy(UA_ServerConfig *config) {
     for(size_t i = 0; i < config->endpointsSize; i++) {
         UA_EndpointDescription *ep = &config->endpoints[i];
-        UA_ByteString basic256sha256uri = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
-        if(!UA_String_equal(&ep->securityPolicyUri, &basic256sha256uri))
+        UA_ByteString aes256Sha256RsaPss = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
+        if(!UA_String_equal(&ep->securityPolicyUri, &aes256Sha256RsaPss))
             continue;
 
         UA_EndpointDescription_clear(ep);
@@ -1042,11 +1023,12 @@ usage(void) {
                    "\t[--sessionIssuerListFolder <folder>]\n"
                    "\t[--sessionRevocationListFolder <folder>]\n"
 #endif
-                   "\t[--enableUnencrypted]\n"
-                   "\t[--enableOutdatedSecurityPolicy]\n"
-                   "\t[--disableBasic128]\n"
-                   "\t[--disableBasic256]\n"
+                   "\t[--enableNone]\n"
+                   "\t[--enableBasic128]\n"
+                   "\t[--enableBasic256]\n"
                    "\t[--disableBasic256Sha256]\n"
+                   "\t[--disableAes128Sha256RsaOaep]\n"
+                   "\t[--disableAes256Sha256RsaPss]\n"
 #endif
                    "\t[--enableTimestampCheck]\n"
                    "\t[--enableAnonymous]\n");
@@ -1089,11 +1071,12 @@ int main(int argc, char **argv) {
     }
 
     char filetype = ' '; /* t==trustlist, l == issuerList, r==revocationlist */
-    UA_Boolean enableUnencr = false;
-    UA_Boolean enableSec = false;
-    UA_Boolean disableBasic128 = false;
-    UA_Boolean disableBasic256 = false;
+    UA_Boolean enableNone = false;
+    UA_Boolean enableBasic128 = false;
+    UA_Boolean enableBasic256 = false;
     UA_Boolean disableBasic256Sha256 = false;
+    UA_Boolean disableAes128Sha256RsaOaep = false;
+    UA_Boolean disableAes256Sha256RsaPss = false;
 
 #ifndef __linux__
     UA_ByteString scTrustList[100];
@@ -1119,14 +1102,14 @@ int main(int argc, char **argv) {
 
 #endif /* UA_ENABLE_ENCRYPTION */
 
-    UA_Boolean enableAnon = false;
+    UA_Boolean enableAnonymous = false;
     UA_Boolean enableTime = false;
 
     /* Loop over the remaining arguments */
     for(; pos < (size_t)argc; pos++) {
 
         if(strcmp(argv[pos], "--enableAnonymous") == 0) {
-            enableAnon = true;
+            enableAnonymous = true;
             continue;
         }
 
@@ -1136,23 +1119,18 @@ int main(int argc, char **argv) {
         }
 
 #ifdef UA_ENABLE_ENCRYPTION
-        if(strcmp(argv[pos], "--enableUnencrypted") == 0) {
-            enableUnencr = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--enableOutdatedSecurityPolicy") == 0) {
-            enableSec = true;
+        if(strcmp(argv[pos], "--enableNone") == 0) {
+            enableNone = true;
             continue;
         }
 
-        if(strcmp(argv[pos], "--disableBasic128") == 0) {
-            disableBasic128 = true;
+        if(strcmp(argv[pos], "--enableBasic128") == 0) {
+            enableBasic128 = true;
             continue;
         }
 
-        if(strcmp(argv[pos], "--disableBasic256") == 0) {
-            disableBasic256 = true;
+        if(strcmp(argv[pos], "--enableBasic256") == 0) {
+            enableBasic256 = true;
             continue;
         }
 
@@ -1161,20 +1139,16 @@ int main(int argc, char **argv) {
             continue;
         }
 
-        if(strcmp(argv[pos], "--disableBasic128") == 0) {
-            disableBasic128 = true;
+        if(strcmp(argv[pos], "--disableAes128Sha256RsaOaep") == 0) {
+            disableAes128Sha256RsaOaep = true;
             continue;
         }
 
-        if(strcmp(argv[pos], "--disableBasic256") == 0) {
-            disableBasic256 = true;
+        if(strcmp(argv[pos], "--disableAes256Sha256RsaPss") == 0) {
+            disableAes256Sha256RsaPss = true;
             continue;
         }
 
-        if(strcmp(argv[pos], "--disableBasic256Sha256") == 0) {
-            disableBasic256Sha256 = true;
-            continue;
-        }
 
 #ifndef __linux__
         if(strcmp(argv[pos], "--secureChannelTrustList") == 0) {
@@ -1327,7 +1301,7 @@ int main(int argc, char **argv) {
 
     /* Load PKI */
 #ifdef UA_ENABLE_ENCRYPTION
-    res = UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4841,
+    res = UA_ServerConfig_setDefaultWithSecureSecurityPolicies(config, 4841,
                                                          &certificate, &privateKey,
                                                          NULL, 0, NULL, 0, NULL, 0);
     if(res != UA_STATUSCODE_GOOD)
@@ -1362,17 +1336,18 @@ int main(int argc, char **argv) {
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 
-    if(!enableUnencr)
-        disableUnencrypted(config);
-    if(!enableSec)
-        disableOutdatedSecurityPolicy(config);
-
-    if(disableBasic128)
-        disableBasic128SecurityPolicy(config);
-    if(disableBasic256)
-        disableBasic256SecurityPolicy(config);
+    if(enableNone)
+        enableNoneSecurityPolicy(config);
+    if(enableBasic128)
+        enableBasic128SecurityPolicy(config, &certificate, &privateKey);
+    if(enableBasic256)
+        enableBasic256SecurityPolicy(config, &certificate, &privateKey);
     if(disableBasic256Sha256)
         disableBasic256Sha256SecurityPolicy(config);
+    if(disableAes128Sha256RsaOaep)
+        disableAes128Sha256RsaOaepSecurityPolicy(config);
+    if(disableAes256Sha256RsaPss)
+        disableAes256Sha256RsaPssSecurityPolicy(config);
 
 #else /* UA_ENABLE_ENCRYPTION */
     res = UA_ServerConfig_setMinimal(config, 4841, &certificate);
@@ -1380,9 +1355,6 @@ int main(int argc, char **argv) {
         goto cleanup;
 #endif /* UA_ENABLE_ENCRYPTION */
 
-    if(!enableAnon)
-        disableAnonymous(config);
-
     /* Limit the number of SecureChannels and Sessions */
     config->maxSecureChannels = 40;
     config->maxSessions = 50;
@@ -1415,8 +1387,8 @@ int main(int argc, char **argv) {
         config->verifyRequestTimestamp = UA_RULEHANDLING_DEFAULT;
 
     /* Instatiate a new AccessControl plugin that knows username/pw */
-    UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
-    UA_AccessControl_default(config, true, &sp->policyUri,
+    UA_String aes128Sha256RsaOaep = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
+    UA_AccessControl_default(config, enableAnonymous, &aes128Sha256RsaOaep,
                              usernamePasswordsSize, usernamePasswords);
 
     /* Override with a custom access control policy */
@@ -1427,8 +1399,6 @@ int main(int argc, char **argv) {
 
     config->shutdownDelay = 5000.0; /* 5s */
 
-    UA_ServerConfig_addAllEndpoints(config);
-
     setInformationModel(server);
 
 #ifdef UA_ENABLE_DISCOVERY

From 25af9286cbf9ffe8f20b9f6d8f7cd6a59e6b7504 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 5 Oct 2023 15:27:36 +0200
Subject: [PATCH 1188/1963] fix(el): Unlock EventLoop mutex before wait
 condition

If UA_Server_addPubSubConnection was called in a (real-time) linux
system from a task with lower priority than the task that called
UA_Server_run, a deadlock occured.
---
 arch/eventloop_posix_epoll.c  | 7 +++++--
 arch/eventloop_posix_select.c | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
index cdcd7f40804..dfa99d4476b 100644
--- a/arch/eventloop_posix_epoll.c
+++ b/arch/eventloop_posix_epoll.c
@@ -70,7 +70,9 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
 
     /* Poll the registered sockets */
     struct epoll_event epoll_events[64];
-    int events = epoll_wait(el->epollfd, epoll_events, 64,
+    int epollfd = el->epollfd;
+    UA_UNLOCK(&el->elMutex);
+    int events = epoll_wait(epollfd, epoll_events, 64,
                             (int)(listenTimeout / UA_DATETIME_MSEC));
     /* TODO: Replace with pwait2 for higher-precision timeouts once this is
      * available in the standard library.
@@ -79,8 +81,9 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
      *  (long)(listenTimeout / UA_DATETIME_SEC),
      *   (long)((listenTimeout % UA_DATETIME_SEC) * 100)
      * };
-     * int events = epoll_pwait2(el->epollfd, epoll_events, 64,
+     * int events = epoll_pwait2(epollfd, epoll_events, 64,
      *                        precisionTimeout, NULL); */
+    UA_LOCK(&el->elMutex);
 
     /* Handle error conditions */
     if(events == -1) {
diff --git a/arch/eventloop_posix_select.c b/arch/eventloop_posix_select.c
index 004878d37dc..16a6a54b886 100644
--- a/arch/eventloop_posix_select.c
+++ b/arch/eventloop_posix_select.c
@@ -123,7 +123,9 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
 #endif
     };
 
+    UA_UNLOCK(&el->elMutex);
     int selectStatus = UA_select(highestfd+1, &readset, &writeset, &errset, &tmptv);
+    UA_LOCK(&el->elMutex);
     if(selectStatus < 0) {
         /* We will retry, only log the error */
         UA_LOG_SOCKET_ERRNO_WRAP(

From 1957ef850e4bf9e9ae260c6798e48b6b8c4efe1a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 12:07:40 +0200
Subject: [PATCH 1189/1963] feat(arch): Enable validation-only for TCP

---
 arch/eventloop_posix_tcp.c           | 49 +++++++++++++++++++++-------
 include/open62541/plugin/eventloop.h |  3 ++
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index f661c48204e..0f91a97a481 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -6,6 +6,7 @@
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
  */
 
+#include "open62541/types.h"
 #include "eventloop_posix.h"
 #include "eventloop_common.h"
 
@@ -338,7 +339,8 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn, short event) {
 static UA_StatusCode
 TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
                          UA_UInt16 port, void *application, void *context,
-                         UA_ConnectionManager_connectionCallback connectionCallback) {
+                         UA_ConnectionManager_connectionCallback connectionCallback,
+                         UA_Boolean validate) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
@@ -434,6 +436,12 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Only validate, don't actually start listening */
+    if(validate) {
+        UA_close(listenSocket);
+        return UA_STATUSCODE_GOOD;
+    }
+
     /* Start listening */
     if(listen(listenSocket, UA_MAXBACKLOG) < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
@@ -506,7 +514,8 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
 static UA_StatusCode
 TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
                           UA_UInt16 port, void *application, void *context,
-                          UA_ConnectionManager_connectionCallback connectionCallback) {
+                          UA_ConnectionManager_connectionCallback connectionCallback,
+                          UA_Boolean validate) {
     UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop)->elMutex, 1);
 
     /* Create a string for the port */
@@ -546,7 +555,7 @@ TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
     struct addrinfo *ai = res;
     while(ai) {
         total_result &= TCP_registerListenSocket(pcm, ai, port, application, context,
-                                                 connectionCallback);
+                                                 connectionCallback, validate);
         ai = ai->ai_next;
     }
     freeaddrinfo(res);
@@ -668,7 +677,8 @@ TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
 static UA_StatusCode
 TCP_openPassiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *params,
                           void *application, void *context,
-                          UA_ConnectionManager_connectionCallback connectionCallback) {
+                          UA_ConnectionManager_connectionCallback connectionCallback,
+                          UA_Boolean validate) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
@@ -695,7 +705,7 @@ TCP_openPassiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "TCP\t| Listening on all interfaces");
         return TCP_registerListenSockets(pcm, NULL, *port, application,
-                                         context, connectionCallback);
+                                         context, connectionCallback, validate);
     }
 
     /* Iterate over the configured hostnames */
@@ -707,7 +717,7 @@ TCP_openPassiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *
         memcpy(hostname, hostStrings[i].data, hostStrings->length);
         hostname[hostStrings->length] = '\0';
         TCP_registerListenSockets(pcm, hostname, *port, application,
-                                  context, connectionCallback);
+                                  context, connectionCallback, validate);
     }
 
     return UA_STATUSCODE_GOOD;
@@ -717,7 +727,8 @@ TCP_openPassiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *
 static UA_StatusCode
 TCP_openActiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *params,
                          void *application, void *context,
-                         UA_ConnectionManager_connectionCallback connectionCallback) {
+                         UA_ConnectionManager_connectionCallback connectionCallback,
+                         UA_Boolean validate) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
@@ -798,6 +809,13 @@ TCP_openActiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *p
         return res;
     }
 
+    /* Only validate, don't actually open the connection */
+    if(validate) {
+        freeaddrinfo(info);
+        UA_close(newSock);
+        return UA_STATUSCODE_GOOD;
+    }
+
     /* Non-blocking connect */
     error = UA_connect(newSock, info->ai_addr, info->ai_addrlen);
     freeaddrinfo(info);
@@ -886,6 +904,15 @@ TCP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         return res;
     }
 
+    /* Only validate the parameters? */
+    UA_Boolean validate = false;
+    const UA_Boolean *validateParam = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params,
+                                 TCPConfigParameters[TCP_PARAMINDEX_VALIDATE].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(validateParam)
+        validate = *validateParam;
+
     /* Listen or active connection? */
     UA_Boolean listen = false;
     const UA_Boolean *listenParam = (const UA_Boolean*)
@@ -896,11 +923,11 @@ TCP_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         listen = *listenParam;
 
     if(listen) {
-        res = TCP_openPassiveConnection(pcm, params, application,
-                                        context, connectionCallback);
+        res = TCP_openPassiveConnection(pcm, params, application, context,
+                                        connectionCallback, validate);
     } else {
-        res = TCP_openActiveConnection(pcm, params, application,
-                                       context, connectionCallback);
+        res = TCP_openActiveConnection(pcm, params, application, context,
+                                       connectionCallback, validate);
     }
 
     UA_UNLOCK(&el->elMutex);
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index b97a9a503e7..ba08c7d1acc 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -459,6 +459,9 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  *             for listening (default: listen on all interfaces).
  * - 0:port [uint16]: Port of the target host (required).
  * - 0:listen [boolean]: Listen-connection or active-connection (default: false)
+ * - 0:validate [boolean]: If true, the connection setup will act as a dry-run
+ *       without actually creating any connection but solely validating the
+ *       provided parameters (default: false)
  *
  * Connection Callback Parameters (first callback only):
  * - Active Connection

From 9f22760c5ebc1711c9e491c68e1c310e4d1b2e31 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 12:22:58 +0200
Subject: [PATCH 1190/1963] feat(arch): Enable parameter validation for ETH
 connections

---
 arch/eventloop_posix_eth.c           | 34 ++++++++++++++++++++--------
 include/open62541/plugin/eventloop.h |  3 +++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 66dfba48501..393b40a459b 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -18,7 +18,7 @@
 #include <linux/if_packet.h>
 
 /* Configuration parameters */
-#define ETH_PARAMETERSSIZE 8
+#define ETH_PARAMETERSSIZE 9
 #define ETH_PARAMINDEX_ADDR 0
 #define ETH_PARAMINDEX_LISTEN 1
 #define ETH_PARAMINDEX_IFACE 2
@@ -27,6 +27,7 @@
 #define ETH_PARAMINDEX_PCP 5
 #define ETH_PARAMINDEX_DEI 6
 #define ETH_PARAMINDEX_PROMISCUOUS 7
+#define ETH_PARAMINDEX_VALIDATE 8
 
 static UA_KeyValueRestriction ETHConfigParameters[ETH_PARAMETERSSIZE+1] = {
     {{0, UA_STRING_STATIC("address")}, &UA_TYPES[UA_TYPES_STRING], false, true, false},
@@ -37,6 +38,7 @@ static UA_KeyValueRestriction ETHConfigParameters[ETH_PARAMETERSSIZE+1] = {
     {{0, UA_STRING_STATIC("pcp")}, &UA_TYPES[UA_TYPES_BYTE], false, true, false},
     {{0, UA_STRING_STATIC("dei")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
     {{0, UA_STRING_STATIC("promiscuous")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    {{0, UA_STRING_STATIC("validate")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
     /* Duplicated address parameter with a scalar value required. For the send-socket case. */
     {{0, UA_STRING_STATIC("address")}, &UA_TYPES[UA_TYPES_STRING], true, true, false},
 };
@@ -421,7 +423,8 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
 static UA_StatusCode
 ETH_openListenConnection(UA_EventLoopPOSIX *el, ETH_FD *conn,
                          const UA_KeyValueMap *params,
-                         int ifindex, UA_UInt16 etherType) {
+                         int ifindex, UA_UInt16 etherType,
+                         UA_Boolean validate) {
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
     /* Bind the socket to interface and EtherType. Don't receive anything else. */
@@ -430,7 +433,7 @@ ETH_openListenConnection(UA_EventLoopPOSIX *el, ETH_FD *conn,
     sll.sll_family = AF_PACKET;
     sll.sll_protocol = htons(etherType);
     sll.sll_ifindex = ifindex;
-    if(bind(conn->rfd.fd, (struct sockaddr*)&sll, sizeof(sll)) < 0)
+    if(!validate && bind(conn->rfd.fd, (struct sockaddr*)&sll, sizeof(sll)) < 0)
         return UA_STATUSCODE_BADINTERNALERROR;
 
     /* Immediately register for listen events. Don't have to wait for a
@@ -485,15 +488,15 @@ ETH_openListenConnection(UA_EventLoopPOSIX *el, ETH_FD *conn,
         mreq.mr_type = PACKET_MR_MULTICAST;
         mreq.mr_alen = ETH_ALEN;
         memcpy(mreq.mr_address, addr, ETHER_ADDR_LEN);
-        int ret = UA_setsockopt(conn->rfd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
-                                (char *)&mreq, sizeof(mreq));
-        if(ret < 0) {
+        if(!validate && UA_setsockopt(conn->rfd.fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
+                                      (char *)&mreq, sizeof(mreq)) < 0) {
             UA_LOG_SOCKET_ERRNO_WRAP(
                UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                            "ETH\t| Registering for multicast failed with error %s", errno_str));
+                            "ETH\t| Registering for multicast failed with error %s",
+                            errno_str));
             return UA_STATUSCODE_BADINTERNALERROR;
         }
-    } 
+    }
 
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                 "ETH %u\t| Opened an Ethernet listen socket",
@@ -586,6 +589,15 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         return res;
     }
 
+    /* Only validate the parameters? */
+    UA_Boolean validate = false;
+    const UA_Boolean *validateParam = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params,
+                                 ETHConfigParameters[ETH_PARAMINDEX_VALIDATE].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(validateParam)
+        validate = *validateParam;
+
     /* Get the EtherType parameter */
     UA_UInt16 etherType = ETH_P_ALL;
     const UA_UInt16 *etParam =  (const UA_UInt16*)
@@ -665,9 +677,11 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
                                      (unsigned char*)ifr.ifr_hwaddr.sa_data,
                                      ifindex, etherType);
     } else {
-        res = ETH_openListenConnection(el, conn, params, ifindex, etherType);
+        res = ETH_openListenConnection(el, conn, params, ifindex, etherType, validate);
     }
-    if(res != UA_STATUSCODE_GOOD)
+
+    /* Don't actually open or shut down */
+    if(validate || res != UA_STATUSCODE_GOOD)
         goto cleanup;
 
     /* Register in the EventLoop */
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index ba08c7d1acc..3600d9077ee 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -552,6 +552,9 @@ UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName);
  * - 0:vid [uint16]: 12-bit VLAN identifier (optional for send connections).
  * - 0:pcp [byte]: 3-bit priority code point (optional for send connections).
  * - 0:dei [bool]: 1-bit drop eligible indicator (optional for seond connections).
+ * - 0:validate [boolean]: If true, the connection setup will act as a dry-run
+ *       without actually creating any connection but solely validating the
+ *       provided parameters (default: false)
  *
  * Send Parameters:
  * No additional parameters for sending over an Ethernet connection defined. */

From 99f7ec72ffa0f488eb629f9bdd0baeecc3ceba2b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 18:09:04 +0200
Subject: [PATCH 1191/1963] feat(arch): Enable connection validation for MQTT

---
 arch/eventloop_mqtt.c                | 48 ++++++++++++++++++----------
 include/open62541/plugin/eventloop.h |  3 ++
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index 3b30ef7e184..d4fee91900d 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -68,7 +68,7 @@ static ssize_t mqtt_pal_recvall(mqtt_pal_socket_handle fd, void* buf, size_t buf
 #include "../deps/mqtt-c/src/mqtt.c"
 
 #define MQTT_MESSAGE_MAXLEN (1u << 20) /* 1MB */
-#define MQTT_PARAMETERSSIZE 7
+#define MQTT_PARAMETERSSIZE 8
 #define MQTT_BROKERPARAMETERSSIZE 5 /* Parameters shared by topic connections
                                      * connected to the same broker */
 
@@ -82,6 +82,7 @@ static const struct {
     {{0, UA_STRING_STATIC("keep-alive")}, &UA_TYPES[UA_TYPES_UINT16], false},
     {{0, UA_STRING_STATIC("username")}, &UA_TYPES[UA_TYPES_STRING], false},
     {{0, UA_STRING_STATIC("password")}, &UA_TYPES[UA_TYPES_STRING], false},
+    {{0, UA_STRING_STATIC("validate")}, &UA_TYPES[UA_TYPES_BOOLEAN], false},
     {{0, UA_STRING_STATIC("subscribe")}, &UA_TYPES[UA_TYPES_BOOLEAN], false},
     {{0, UA_STRING_STATIC("topic")}, &UA_TYPES[UA_TYPES_STRING], true}
 };
@@ -586,8 +587,8 @@ MQTTNetworkCallback(UA_ConnectionManager *tcpCM, uintptr_t connectionId,
 }
 
 static MQTTBrokerConnection *
-createBrokerConnection(MQTTConnectionManager *mcm,
-                       const UA_KeyValueMap *params) {
+createBrokerConnection(MQTTConnectionManager *mcm, const UA_KeyValueMap *params,
+                       UA_Boolean validate) {
     /* Allocate connection memory */
     MQTTBrokerConnection *bc = (MQTTBrokerConnection*)
         UA_calloc(1, sizeof(MQTTBrokerConnection));
@@ -628,23 +629,15 @@ createBrokerConnection(MQTTConnectionManager *mcm,
     if(keepAlive && *keepAlive > 0)
         bc->keepalive = *keepAlive;
 
-    UA_EventLoop *el = mcm->cm.eventSource.eventLoop;
-    res = el->addCyclicCallback(el, (UA_Callback)MQTTKeepAliveCallback, NULL, bc,
-                                (UA_Double)(bc->keepalive * UA_DATETIME_SEC),
-                                NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-                                &bc->keepAliveCallbackId);
-    if(res != UA_STATUSCODE_GOOD) {
-        removeBrokerConnection(bc);
-        return NULL;
-    }
-
     /* Open the Connection. This also sets the broker connection id to the TCP id. */
-    UA_KeyValuePair tcpParams[2];
+    UA_KeyValuePair tcpParams[3];
     tcpParams[0].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&tcpParams[0].value, broker, &UA_TYPES[UA_TYPES_STRING]);
     tcpParams[1].key = UA_QUALIFIEDNAME(0, "port");
     UA_Variant_setScalar(&tcpParams[1].value, port, &UA_TYPES[UA_TYPES_UINT16]);
-    UA_KeyValueMap kvm = {2, tcpParams};
+    tcpParams[2].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&tcpParams[2].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    UA_KeyValueMap kvm = {3, tcpParams};
 
     UA_ConnectionManager *tcpCM = mcm->tcpCM;
     res = tcpCM->openConnection(tcpCM, &kvm, NULL, bc, MQTTNetworkCallback);
@@ -653,6 +646,22 @@ createBrokerConnection(MQTTConnectionManager *mcm,
         return NULL;
     }
 
+    /* Return non-null to indicate success */
+    if(validate) {
+        removeBrokerConnection(bc);
+        return (MQTTBrokerConnection*)0x01;
+    }
+
+    UA_EventLoop *el = mcm->cm.eventSource.eventLoop;
+    res = el->addCyclicCallback(el, (UA_Callback)MQTTKeepAliveCallback, NULL, bc,
+                                (UA_Double)(bc->keepalive * UA_DATETIME_SEC),
+                                NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                &bc->keepAliveCallbackId);
+    if(res != UA_STATUSCODE_GOOD) {
+        removeBrokerConnection(bc);
+        return NULL;
+    }
+
     UA_LOG_DEBUG(bc->mcm->cm.eventSource.eventLoop->logger,
                  UA_LOGCATEGORY_NETWORK, "MQTT-TCP %u\t| Created broker connection",
                  (unsigned)bc->tcpConnectionId);
@@ -756,10 +765,17 @@ MQTT_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
+    const UA_Boolean *validate = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "validate"),
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(validate && *validate)
+        return (createBrokerConnection(mcm, params, true) == 0) ?
+            UA_STATUSCODE_BADCONNECTIONREJECTED : UA_STATUSCODE_GOOD;
+
     /* Test whether an existing broker connection can be reused.
      * Otherwise create a new one. */
     MQTTBrokerConnection *bc = findIdenticalBrokerConnection(mcm, params);
-    if(!bc && !(bc = createBrokerConnection(mcm, params)))
+    if(!bc && !(bc = createBrokerConnection(mcm, params, false)))
         return UA_STATUSCODE_BADNOTCONNECTED;
 
     /* Create the per-topic connection */
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 3600d9077ee..3a3cf4543f1 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -582,6 +582,9 @@ UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName);
  * - 0:password [string]: Password to use (default: none)
  * - 0:keep-alive [uint16]: Number of seconds for the keep-alive (ping)
  *                          (default: 400).
+ * - 0:validate [boolean]: If true, the connection setup will act as a dry-run
+ *       without actually creating any connection but solely validating the
+ *       provided parameters (default: false)
  *
  * - 0:topic [string]: Topic to which the connection is associated (required).
  * - 0:subscribe [bool]: Subscribe to the topic (default: false).

From 79f16d06824e3f0753221cc7012117fc8b67282a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 18:21:15 +0200
Subject: [PATCH 1192/1963] feat(pubsub): Validate PubSub connections in the
 EventLoop during creation

---
 src/pubsub/ua_pubsub.h             |   8 +-
 src/pubsub/ua_pubsub_connection.c  |  58 ++++++++-------
 src/pubsub/ua_pubsub_eventloop.c   | 114 ++++++++++++++---------------
 src/pubsub/ua_pubsub_readergroup.c |   2 +-
 src/pubsub/ua_pubsub_writergroup.c |   2 +-
 5 files changed, 97 insertions(+), 87 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 8dac8756a5d..daef39d65a7 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -186,7 +186,8 @@ void
 UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c);
 
 UA_StatusCode
-UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c);
+UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c,
+                            UA_Boolean validate);
 
 void
 UA_PubSubConnection_disconnect(UA_PubSubConnection *c);
@@ -370,7 +371,8 @@ void
 UA_WriterGroup_disconnect(UA_WriterGroup *wg);
 
 UA_StatusCode
-UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg);
+UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg,
+                       UA_Boolean validate);
 
 UA_StatusCode
 setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
@@ -607,7 +609,7 @@ UA_StatusCode
 UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg);
 
 UA_StatusCode
-UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg);
+UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg, UA_Boolean validate);
 
 void
 UA_ReaderGroup_disconnect(UA_ReaderGroup *rg);
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index 60e850870d7..c73f29f9aa3 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -159,62 +159,70 @@ UA_PubSubConnectionConfig_clear(UA_PubSubConnectionConfig *connectionConfig) {
 }
 
 UA_StatusCode
-UA_PubSubConnection_create(UA_Server *server,
-                           const UA_PubSubConnectionConfig *connectionConfig,
-                           UA_NodeId *connectionIdentifier) {
+UA_PubSubConnection_create(UA_Server *server, const UA_PubSubConnectionConfig *cc,
+                           UA_NodeId *cId) {
     /* Validate preconditions */
     UA_CHECK_MEM(server, return UA_STATUSCODE_BADINTERNALERROR);
-    UA_CHECK_ERROR(connectionConfig != NULL, return UA_STATUSCODE_BADINTERNALERROR,
-                       &server->config.logger, UA_LOGCATEGORY_SERVER,
-                       "PubSub Connection creation failed. No connection configuration supplied.");
+    UA_CHECK_ERROR(cc != NULL, return UA_STATUSCODE_BADINTERNALERROR,
+                   &server->config.logger, UA_LOGCATEGORY_SERVER,
+                   "PubSub Connection creation failed. Missing connection configuration.");
 
     /* Allocate */
-    UA_PubSubConnection *connection = (UA_PubSubConnection *)
+    UA_PubSubConnection *c = (UA_PubSubConnection *)
         UA_calloc(1, sizeof(UA_PubSubConnection));
-    if(!connection) {
+    if(!c) {
         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
                      "PubSub Connection creation failed. Out of Memory.");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    connection->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
+    c->componentType = UA_PUBSUB_COMPONENT_CONNECTION;
 
     /* Copy the connection config */
-    UA_StatusCode ret =
-        UA_PubSubConnectionConfig_copy(connectionConfig, &connection->config);
-    UA_CHECK_STATUS(ret, UA_free(connection); return ret);
+    UA_StatusCode ret = UA_PubSubConnectionConfig_copy(cc, &c->config);
+    UA_CHECK_STATUS(ret, UA_free(c); return ret);
 
     /* Assign the connection identifier */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     /* Internally create a unique id */
-    addPubSubConnectionRepresentation(server, connection);
+    addPubSubConnectionRepresentation(server, c);
 #else
     /* Create a unique NodeId that does not correspond to a Node */
     UA_PubSubManager_generateUniqueNodeId(&server->pubSubManager,
-                                          &connection->identifier);
+                                          &c->identifier);
 #endif
-    if(connectionIdentifier)
-        UA_NodeId_copy(&connection->identifier, connectionIdentifier);
 
     /* Register */
     UA_PubSubManager *pubSubManager = &server->pubSubManager;
-    TAILQ_INSERT_HEAD(&pubSubManager->connections, connection, listEntry);
+    TAILQ_INSERT_HEAD(&pubSubManager->connections, c, listEntry);
     pubSubManager->connectionsSize++;
 
+    /* Validate-connect to check the parameters */
+    ret = UA_PubSubConnection_connect(server, c, true);
+    if(ret != UA_STATUSCODE_GOOD)
+        goto cleanup;
+
     /* Make the connection operational */
-    ret = UA_PubSubConnection_setPubSubState(server, connection, UA_PUBSUBSTATE_OPERATIONAL,
+    ret = UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_OPERATIONAL,
                                              UA_STATUSCODE_GOOD);
     if(ret != UA_STATUSCODE_GOOD)
-        UA_PubSubConnection_delete(server, connection);
+        goto cleanup;
+
+    /* Copy the created NodeId to the output. Cannot fail as we create a
+     * numerical NodeId. */
+    if(cId)
+        UA_NodeId_copy(&c->identifier, cId);
+
+ cleanup:
+    if(ret != UA_STATUSCODE_GOOD)
+        UA_PubSubConnection_delete(server, c);
     return ret;
 }
 
 UA_StatusCode
-UA_Server_addPubSubConnection(UA_Server *server,
-                              const UA_PubSubConnectionConfig *connectionConfig,
-                              UA_NodeId *connectionIdentifier) {
+UA_Server_addPubSubConnection(UA_Server *server, const UA_PubSubConnectionConfig *cc,
+                              UA_NodeId *cId) {
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res =
-        UA_PubSubConnection_create(server, connectionConfig, connectionIdentifier);
+    UA_StatusCode res = UA_PubSubConnection_create(server, cc, cId);
     UA_UNLOCK(&server->serviceMutex);
     return res;
 }
@@ -320,7 +328,7 @@ UA_PubSubConnection_setPubSubState(UA_Server *server, UA_PubSubConnection *c,
              * internally. */
             if(oldState != UA_PUBSUBSTATE_OPERATIONAL)
                 c->state = UA_PUBSUBSTATE_PREOPERATIONAL;
-            ret = UA_PubSubConnection_connect(server, c);
+            ret = UA_PubSubConnection_connect(server, c, false);
             if(ret != UA_STATUSCODE_GOOD)
                 UA_PubSubConnection_setPubSubState(server, c,
                                                    UA_PUBSUBSTATE_ERROR, ret);
diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 6f3d16ebd40..e23e23dcf82 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -15,19 +15,24 @@
 /********************/
 
 static UA_StatusCode
-UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c);
+UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
+                               UA_Boolean validate);
 
 static UA_StatusCode
-UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c);
+UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c,
+                               UA_Boolean validate);
 
 static UA_StatusCode
-UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg);
+UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg,
+                           UA_Boolean validate);
 
 static UA_StatusCode
-UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg);
+UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg,
+                           UA_Boolean validate);
 
 static UA_StatusCode
-UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg);
+UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg,
+                                 UA_Boolean validate);
 
 #define UA_PUBSUB_PROFILES_SIZE 4
 
@@ -35,9 +40,12 @@ typedef struct  {
     UA_String profileURI;
     UA_String protocol;
     UA_Boolean json;
-    UA_StatusCode (*connect)(UA_Server *server, UA_PubSubConnection *c);
-    UA_StatusCode (*connectWriterGroup)(UA_Server *server, UA_WriterGroup *wg);
-    UA_StatusCode (*connectReaderGroup)(UA_Server *server, UA_ReaderGroup *rg);
+    UA_StatusCode (*connect)(UA_Server *server, UA_PubSubConnection *c,
+                             UA_Boolean validate);
+    UA_StatusCode (*connectWriterGroup)(UA_Server *server, UA_WriterGroup *wg,
+                                        UA_Boolean validate);
+    UA_StatusCode (*connectReaderGroup)(UA_Server *server, UA_ReaderGroup *rg,
+                                        UA_Boolean validate);
 } ProfileMapping;
 
 static ProfileMapping transportProfiles[UA_PUBSUB_PROFILES_SIZE] = {
@@ -163,7 +171,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * several send or recv channels, then the connection is only reopened if
          * all of them close - which is usually the case. */
         if(psc->state == UA_PUBSUBSTATE_OPERATIONAL)
-            UA_PubSubConnection_connect(server, psc);
+            UA_PubSubConnection_connect(server, psc, false);
 
         UA_UNLOCK(&server->serviceMutex);
         return;
@@ -272,7 +280,8 @@ PubSubSendChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 }
 
 static UA_StatusCode
-UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c) {
+UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
+                               UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
@@ -290,7 +299,6 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c) {
 
     /* Set up the connection parameters */
     UA_Boolean listen = true;
-    UA_Boolean validate = false;
     UA_Boolean reuse = true;
     UA_Boolean loopback = true;
     UA_KeyValuePair kvp[7];
@@ -378,7 +386,8 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c) {
 }
 
 static UA_StatusCode
-UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c) {
+UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c,
+                               UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_NetworkAddressUrlDataType *addressUrl = (UA_NetworkAddressUrlDataType*)
@@ -397,7 +406,6 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c) {
     /* Set up the connection parameters.
      * TDOD: Complete the considered parameters. VID, PCP, etc. */
     UA_Boolean listen = true;
-    UA_Boolean validate = false;
     UA_KeyValuePair kvp[4];
     UA_KeyValueMap kvm = {4, kvp};
     kvp[0].key = UA_QUALIFIEDNAME(0, "address");
@@ -412,15 +420,6 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c) {
 
     /* Open recv channels */
     if(c->recvChannelsSize == 0) {
-        /* Validate only if no ReaderGroup configured */
-        validate = (c->readerGroupsSize == 0);
-        if(validate) {
-            UA_LOG_INFO_CONNECTION(&server->config.logger, c,
-                                   "No ReaderGroups configured. "
-                                   "Only validate the connection parameters "
-                                   "instead of opening a receiving channel.");
-        }
-
         UA_UNLOCK(&server->serviceMutex);
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubRecvChannelCallback);
         UA_LOCK(&server->serviceMutex);
@@ -433,15 +432,6 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c) {
 
     /* Open send channels */
     if(c->sendChannel == 0) {
-        /* Validate only if no WriterGroup configured */
-        validate = (c->writerGroupsSize == 0);
-        if(validate) {
-            UA_LOG_INFO_CONNECTION(&server->config.logger, c,
-                                   "No WriterGroups configured. "
-                                   "Only validate the connection parameters "
-                                   "instead of opening a channel for sending.");
-        }
-
         listen = false;
         UA_UNLOCK(&server->serviceMutex);
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
@@ -456,7 +446,8 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c) {
 }
 
 UA_StatusCode
-UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c) {
+UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c,
+                            UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_EventLoop *el = UA_PubSubConnection_getEL(server, c);
@@ -494,8 +485,8 @@ UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c) {
     /* Connect */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(profile->connect)
-        res = profile->connect(server, c);
-    if(res != UA_STATUSCODE_GOOD)
+        res = profile->connect(server, c, validate);
+    if(res != UA_STATUSCODE_GOOD && !validate)
         UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR, res);
     return res;
 }
@@ -538,7 +529,7 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * several send or recv channels, then the connection is only reopened if
          * all of them close - which is usually the case. */
         if(wg->state == UA_PUBSUBSTATE_OPERATIONAL)
-            UA_WriterGroup_connect(server, wg);
+            UA_WriterGroup_connect(server, wg, false);
 
         UA_UNLOCK(&server->serviceMutex);
         return;
@@ -563,11 +554,12 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 }
 
 static UA_StatusCode
-UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg) {
+UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg,
+                                 UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Already connected? */
-    if(wg->sendChannel != 0)
+    if(wg->sendChannel != 0 && !validate)
         return UA_STATUSCODE_GOOD;
 
     /* Check if address is available in TransportSettings */
@@ -613,19 +605,21 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg) {
 
     /* Set up the connection parameters */
     UA_Boolean listen = false;
-    UA_KeyValuePair kvp[4];
-    UA_KeyValueMap kvm = {3, kvp};
+    UA_KeyValuePair kvp[5];
+    UA_KeyValueMap kvm = {4, kvp};
     kvp[0].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
     kvp[1].key = UA_QUALIFIEDNAME(0, "port");
     UA_Variant_setScalar(&kvp[1].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
     kvp[2].key = UA_QUALIFIEDNAME(0, "listen");
     UA_Variant_setScalar(&kvp[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[3].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&kvp[3].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
     if(!UA_String_isEmpty(&addressUrl->networkInterface)) {
-        kvp[3].key = UA_QUALIFIEDNAME(0, "interface");
-        UA_Variant_setScalar(&kvp[3].value, &addressUrl->networkInterface,
+        kvp[4].key = UA_QUALIFIEDNAME(0, "interface");
+        UA_Variant_setScalar(&kvp[4].value, &addressUrl->networkInterface,
                              &UA_TYPES[UA_TYPES_STRING]);
-        kvm.mapSize = 4;
+        kvm.mapSize++;
     }
 
     /* Connect */
@@ -641,7 +635,8 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg) {
 }
 
 static UA_StatusCode
-UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg) {
+UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg,
+                           UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_PubSubConnection *c = wg->linkedConnection;
@@ -674,8 +669,8 @@ UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg) {
     /* Set up the connection parameters.
      * TODO: Complete the MQTT parameters. */
     UA_Boolean listen = false;
-    UA_KeyValuePair kvp[4];
-    UA_KeyValueMap kvm = {4, kvp};
+    UA_KeyValuePair kvp[5];
+    UA_KeyValueMap kvm = {5, kvp};
     kvp[0].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
     kvp[1].key = UA_QUALIFIEDNAME(0, "subscribe");
@@ -685,6 +680,8 @@ UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg) {
     kvp[3].key = UA_QUALIFIEDNAME(0, "topic");
     UA_Variant_setScalar(&kvp[3].value, &transportSettings->queueName,
                          &UA_TYPES[UA_TYPES_STRING]);
+    kvp[4].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&kvp[4].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     /* Connect */
     UA_UNLOCK(&server->serviceMutex);
@@ -707,11 +704,11 @@ UA_WriterGroup_disconnect(UA_WriterGroup *wg) {
 }
 
 UA_StatusCode
-UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg) {
+UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg, UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Already connected */
-    if(wg->sendChannel != 0)
+    if(wg->sendChannel != 0 && !validate)
         return UA_STATUSCODE_GOOD;
 
     /* Is this a WriterGroup with custom TransportSettings beyond the
@@ -750,8 +747,8 @@ UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg) {
     /* Connect */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(profile->connectWriterGroup)
-        res = profile->connectWriterGroup(server, wg);
-    if(res != UA_STATUSCODE_GOOD) {
+        res = profile->connectWriterGroup(server, wg, validate);
+    if(res != UA_STATUSCODE_GOOD && !validate) {
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR, res);
         return res;
     }
@@ -760,7 +757,7 @@ UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg) {
      * this is the only place to set pre-operational for PubSubConnections. The
      * state will be set to operational in the network callback when the
      * connection has fully opened. */
-    if(wg->state != UA_PUBSUBSTATE_OPERATIONAL)
+    if(wg->state != UA_PUBSUBSTATE_OPERATIONAL && !validate)
         wg->state = UA_PUBSUBSTATE_PREOPERATIONAL;
 
     return UA_STATUSCODE_GOOD;
@@ -904,7 +901,8 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 }
 
 static UA_StatusCode
-UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg) {
+UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg,
+                           UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_PubSubConnection *c = rg->linkedConnection;
@@ -937,8 +935,8 @@ UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg) {
     /* Set up the connection parameters.
      * TODO: Complete the MQTT parameters. */
     UA_Boolean listen = true;
-    UA_KeyValuePair kvp[4];
-    UA_KeyValueMap kvm = {4, kvp};
+    UA_KeyValuePair kvp[5];
+    UA_KeyValueMap kvm = {5, kvp};
     kvp[0].key = UA_QUALIFIEDNAME(0, "address");
     UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
     kvp[1].key = UA_QUALIFIEDNAME(0, "subscribe");
@@ -948,6 +946,8 @@ UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg) {
     kvp[3].key = UA_QUALIFIEDNAME(0, "topic");
     UA_Variant_setScalar(&kvp[3].value, &transportSettings->queueName,
                          &UA_TYPES[UA_TYPES_STRING]);
+    kvp[4].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&kvp[4].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     /* Connect */
     UA_UNLOCK(&server->serviceMutex);
@@ -972,11 +972,11 @@ UA_ReaderGroup_disconnect(UA_ReaderGroup *rg) {
 }
 
 UA_StatusCode
-UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg) {
+UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg, UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Already connected */
-    if(rg->recvChannelsSize != 0)
+    if(rg->recvChannelsSize != 0 && !validate)
         return UA_STATUSCODE_GOOD;
 
     /* Is this a ReaderGroup with custom TransportSettings beyond the
@@ -1015,8 +1015,8 @@ UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg) {
     /* Connect */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(profile->connectReaderGroup)
-        res = profile->connectReaderGroup(server, rg);
-    if(res != UA_STATUSCODE_GOOD) {
+        res = profile->connectReaderGroup(server, rg, validate);
+    if(res != UA_STATUSCODE_GOOD && !validate) {
         UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_ERROR, res);
         return res;
     }
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 907b56209c3..e45164cec0d 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -365,7 +365,7 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
 
     /* Connect if the ReaderGroup has dedicated connections */
     if(rg->recvChannelsSize == 0)
-        ret = UA_ReaderGroup_connect(server, rg);
+        ret = UA_ReaderGroup_connect(server, rg, false);
     if(ret != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_READERGROUP(&server->config.logger, rg, "Could not connect");
         UA_PubSubConnection_setPubSubState(server, pubSubConnection,
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 7d42ec74881..09d245c27e1 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -778,7 +778,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                                                         UA_PUBSUBSTATE_OPERATIONAL, cause);
                     }
 
-                    ret = UA_WriterGroup_connect(server, writerGroup);
+                    ret = UA_WriterGroup_connect(server, writerGroup, false);
                     if(ret != UA_STATUSCODE_GOOD) {
                         UA_WriterGroup_setPubSubState(server, writerGroup,
                                                         UA_PUBSUBSTATE_ERROR, ret);

From 629fefdd28d10dd39171e0bce24e661871ce9b41 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 18:47:31 +0200
Subject: [PATCH 1193/1963] refactor(plugins): Cosmetic cleanup in
 AccessControl plugin

---
 .../open62541/plugin/accesscontrol_default.h  | 13 ++++++------
 plugins/ua_accesscontrol_default.c            | 20 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/plugins/include/open62541/plugin/accesscontrol_default.h b/plugins/include/open62541/plugin/accesscontrol_default.h
index 1f00b04bd73..f593b6a48fe 100644
--- a/plugins/include/open62541/plugin/accesscontrol_default.h
+++ b/plugins/include/open62541/plugin/accesscontrol_default.h
@@ -40,13 +40,12 @@ UA_AccessControl_default(UA_ServerConfig *config,
 
 UA_EXPORT UA_StatusCode
 UA_AccessControl_defaultWithLoginCallback(UA_ServerConfig *config,
-                         UA_Boolean allowAnonymous,
-                         UA_CertificateVerification *verifyX509,
-                         const UA_ByteString *userTokenPolicyUri,
-                         size_t usernamePasswordLoginSize,
-                         const UA_UsernamePasswordLogin *usernamePasswordLogin,
-                         UA_UsernamePasswordLoginCallback loginCallback,
-                         void *loginContext);
+                                          UA_Boolean allowAnonymous,
+                                          const UA_ByteString *userTokenPolicyUri,
+                                          size_t usernamePasswordLoginSize,
+                                          const UA_UsernamePasswordLogin *usernamePasswordLogin,
+                                          UA_UsernamePasswordLoginCallback loginCallback,
+                                          void *loginContext);
 
 _UA_END_DECLS
 
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 7d2348795cc..30b58bb03e6 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -397,17 +397,17 @@ UA_AccessControl_default(UA_ServerConfig *config,
 
 UA_StatusCode
 UA_AccessControl_defaultWithLoginCallback(UA_ServerConfig *config,
-    UA_Boolean allowAnonymous, UA_CertificateVerification *verifyX509,
-    const UA_ByteString *userTokenPolicyUri, size_t usernamePasswordLoginSize,
-    const UA_UsernamePasswordLogin *usernamePasswordLogin,
-    UA_UsernamePasswordLoginCallback loginCallback, void *loginContext)
-{
+                                          UA_Boolean allowAnonymous,
+                                          const UA_ByteString *userTokenPolicyUri,
+                                          size_t usernamePasswordLoginSize,
+                                          const UA_UsernamePasswordLogin *usernamePasswordLogin,
+                                          UA_UsernamePasswordLoginCallback loginCallback,
+                                          void *loginContext) {
     AccessControlContext *context;
-    UA_StatusCode sc;
-
-    sc = UA_AccessControl_default(config, allowAnonymous, verifyX509,
-        userTokenPolicyUri, usernamePasswordLoginSize, usernamePasswordLogin);
-    if (sc != UA_STATUSCODE_GOOD)
+    UA_StatusCode sc =
+        UA_AccessControl_default(config, allowAnonymous, userTokenPolicyUri,
+                                 usernamePasswordLoginSize, usernamePasswordLogin);
+    if(sc != UA_STATUSCODE_GOOD)
         return sc;
 
     context = (AccessControlContext *)config->accessControl.context;

From 11aaf01d17146edae8aff11c4888990c424a0d3a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 18:48:16 +0200
Subject: [PATCH 1194/1963] feat(client): Return BadIdentityTokenInvalid if no
 matching UserTokenPolicy found

---
 src/client/ua_client_connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 18ee726a469..d325d9bbec0 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -984,7 +984,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
     } else if(!tokenFound) {
         UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
                      "No suitable UserTokenPolicy found for the possible endpoints");
-        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        client->connectStatus = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
         closeSecureChannel(client);
     }
 

From 3402347c20d012d03fb43a1ce4d1159dd4c89686 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 18:49:12 +0200
Subject: [PATCH 1195/1963] feat(pubsub): Early return in connection-opening if
 already connected

---
 src/pubsub/ua_pubsub_eventloop.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index e23e23dcf82..63544453d6c 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -445,11 +445,24 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c,
     return res;
 }
 
+static UA_Boolean
+UA_PubSubConnection_isConnected(UA_PubSubConnection *c) {
+    if(c->sendChannel == 0 && c->writerGroupsSize > 0)
+        return false;
+    if(c->recvChannelsSize == 0 && c->readerGroupsSize > 0)
+        return false;
+    return true;
+}
+
 UA_StatusCode
 UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c,
                             UA_Boolean validate) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    /* Already connected -> success */
+    if(UA_PubSubConnection_isConnected(c) && !validate)
+        return UA_STATUSCODE_GOOD;
+
     UA_EventLoop *el = UA_PubSubConnection_getEL(server, c);
     if(!el) {
         UA_LOG_ERROR_CONNECTION(&server->config.logger, c, "No EventLoop configured");

From 30dbd9d26e7fb74eddf8031e1df33196799572b9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 18:50:11 +0200
Subject: [PATCH 1196/1963] fix(server): Use the correct macro for the max
 select clause length

---
 src/server/ua_services_monitoreditem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index cc4cc39718c..5814c75649e 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -303,7 +303,7 @@ checkEventFilterParam(UA_Server *server, UA_Session *session,
 
     /* Correct number of elements? */
     if(eventFilter->selectClausesSize == 0 ||
-       eventFilter->selectClausesSize > UA_EVENTFILTER_MAXELEMENTS)
+       eventFilter->selectClausesSize > UA_EVENTFILTER_MAXSELECT)
         return UA_STATUSCODE_BADEVENTFILTERINVALID;
 
     /* Allow empty where clauses --> select every event */

From 44798b826525d7315d8b103d5626b2a4eec841b1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 21:42:33 +0200
Subject: [PATCH 1197/1963] fix(tests): Add required includes already in
 common.h

---
 tests/common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/common.h b/tests/common.h
index 820ffceae39..b8e39d68c91 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -3,6 +3,8 @@
 
 #include <open62541/types.h>
 #include <open62541/types_generated_handling.h>
+#include <stdio.h>
+#include <errno.h>
 
 /* loadFile parses the certificate file.
  *

From 2bd9e723ad6841499cd805ab8656753de28641cc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 22:16:37 +0200
Subject: [PATCH 1198/1963] refactor(build): Remove UA_ENABLE_PUBSUB_ETH_UADP
 option - now part of the EventLoop

---
 CMakeLists.txt                                |  8 -----
 doc/building.rst                              |  5 ----
 examples/CMakeLists.txt                       | 14 ++++-----
 .../README_client_server_tpm_keystore.txt     |  2 +-
 examples/pubsub/README_pubsub_tpm2_pkcs11.txt |  4 +--
 .../pubsub/README_pubsub_tpm_keystore.txt     |  4 +--
 examples/pubsub_realtime/README.md            |  1 -
 .../pubsub_realtime/README_pubsub_TSN.txt     | 10 +++----
 examples/pubsub_realtime/Readme_PubSub.txt    | 29 ++++---------------
 .../pubsub_TSN_loopback_single_thread.c       | 19 ------------
 .../pubsub_TSN_publisher_multiple_thread.c    | 19 ------------
 include/open62541/config.h.in                 |  1 -
 tests/CMakeLists.txt                          |  2 +-
 tools/ci.sh                                   |  8 -----
 14 files changed, 23 insertions(+), 103 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30c732b6406..e5b692d9969 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,14 +343,6 @@ if(UA_ENABLE_PUBSUB_MONITORING)
     endif()
 endif()
 
-option(UA_ENABLE_PUBSUB_ETH_UADP "Enable the OPC UA Ethernet PubSub support to transport UADP NetworkMessages as payload of Ethernet II frame without IP or UDP headers. This option will include Publish and Subscribe based on EtherType B62C." OFF)
-mark_as_advanced(UA_ENABLE_PUBSUB_ETH_UADP)
-if(UA_ENABLE_PUBSUB_ETH_UADP)
-    if(NOT UA_ENABLE_PUBSUB)
-	    message(FATAL_ERROR "For UA_ENABLE_PUBSUB_ETH_UADP PubSub needs to be enabled")
-    endif()
-endif()
-
 option(UA_ENABLE_PUBSUB_BUFMALLOC "Enable allocation with static memory buffer for time critical PubSub parts" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_BUFMALLOC)
 if(UA_ENABLE_PUBSUB_BUFMALLOC)
diff --git a/doc/building.rst b/doc/building.rst
index 4bec8e26043..f0f03546e83 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -378,11 +378,6 @@ PubSub Build Options
    be changed by the application to satisfy realtime requirements. Disabled by
    default.
 
-**UA_ENABLE_PUBSUB_ETH_UADP**
-   Enable the OPC UA Ethernet PubSub support to transport UADP NetworkMessages
-   as payload of Ethernet II frame without IP or UDP headers. This option will
-   include Publish and Subscribe based on EtherType B62C. Disabled by default.
-
 Debug Build Options
 ^^^^^^^^^^^^^^^^^^^
 
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index b8c201e3e14..b16455d4f5a 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -224,7 +224,7 @@ if(UA_ENABLE_PUBSUB)
     add_example(server_pubsub_publish_rt_level pubsub/server_pubsub_publisher_rt_level.c)
     add_example(server_pubsub_rt_information_model pubsub/server_pubsub_rt_field_information_model.c)
     if(CMAKE_SYSTEM MATCHES "Linux")
-        if(UA_ENABLE_PUBSUB_ETH_UADP AND UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_IMMUTABLE_NODES)
+        if(UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_IMMUTABLE_NODES)
             add_example(rt_publisher pubsub_realtime/pubsub_interrupt_publish.c)
             target_link_libraries(rt_publisher rt)
         endif()
@@ -242,13 +242,11 @@ if(UA_ENABLE_PUBSUB)
         #     add_example(pubsub_TSN_loopback_single_thread pubsub_realtime/pubsub_TSN_loopback_single_thread.c)
         #     target_link_libraries(pubsub_TSN_publisher_multiple_thread rt pthread)
         #     target_link_libraries(pubsub_TSN_loopback_single_thread rt pthread)
-        #     if(UA_ENABLE_PUBSUB_ETH_UADP)
-        #         add_subdirectory(pubsub_realtime/nodeset)
-        #         add_example(pubsub_TSN_publisher pubsub_realtime/pubsub_TSN_publisher.c)
-        #         add_example(pubsub_TSN_loopback pubsub_realtime/pubsub_TSN_loopback.c)
-        #         target_link_libraries(pubsub_TSN_publisher rt pthread)
-        #         target_link_libraries(pubsub_TSN_loopback rt pthread)
-        #     endif()
+        #     add_subdirectory(pubsub_realtime/nodeset)
+        #     add_example(pubsub_TSN_publisher pubsub_realtime/pubsub_TSN_publisher.c)
+        #     add_example(pubsub_TSN_loopback pubsub_realtime/pubsub_TSN_loopback.c)
+        #     target_link_libraries(pubsub_TSN_publisher rt pthread)
+        #     target_link_libraries(pubsub_TSN_loopback rt pthread)
         # endif()
     endif()
     if(UA_ENABLE_PUBSUB_ENCRYPTION)
diff --git a/examples/encryption/README_client_server_tpm_keystore.txt b/examples/encryption/README_client_server_tpm_keystore.txt
index 8a5d80a6bcf..4dc77cea542 100644
--- a/examples/encryption/README_client_server_tpm_keystore.txt
+++ b/examples/encryption/README_client_server_tpm_keystore.txt
@@ -113,7 +113,7 @@ Delete the original encryption and signing key
 To run client and server applications over Ethernet in two nodes connected in peer-to-peer network
     cd ../../
     mkdir build && cd build
-    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_ENCRYPTION=MBEDTLS -DUA_ENABLE_ENCRYPTION_TPM2=ON ..
+    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_ENCRYPTION=MBEDTLS -DUA_ENABLE_ENCRYPTION_TPM2=ON ..
     make -j$(nproc)
 
 The binaries are generated in build/bin/ folder
diff --git a/examples/pubsub/README_pubsub_tpm2_pkcs11.txt b/examples/pubsub/README_pubsub_tpm2_pkcs11.txt
index de0a34a6e38..f2524d3327f 100644
--- a/examples/pubsub/README_pubsub_tpm2_pkcs11.txt
+++ b/examples/pubsub/README_pubsub_tpm2_pkcs11.txt
@@ -91,7 +91,7 @@ Set environment variable for TCTI connection and path for database:
 To run PubSub applications over Ethernet in two nodes connected in peer-to-peer network
     cd open62541/
     mkdir build && cd build
-    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_ENCRYPTION=MBEDTLS -DUA_ENABLE_ENCRYPTION_TPM2=ON ..
+    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_ENCRYPTION=MBEDTLS -DUA_ENABLE_ENCRYPTION_TPM2=ON ..
     make
 
 The binaries are generated in build/bin/ folder
@@ -106,4 +106,4 @@ NOTE: It is recommended to run pubsub_subscribe_encrypted_tpm application first,
         ERROR:fapi:src/tss2-fapi/api/Fapi_List.c:81:Fapi_List() ErrorCode (0x00060034) Entities_List
         WARNING: Listing FAPI token objects failed: "fapi:Provisioning was not executed."
         Please see https://github.com/tpm2-software/tpm2-pkcs11/blob/master/docs/FAPI.md for more details
-        WARNING: Getting tokens from fapi backend failed.
\ No newline at end of file
+        WARNING: Getting tokens from fapi backend failed.
diff --git a/examples/pubsub/README_pubsub_tpm_keystore.txt b/examples/pubsub/README_pubsub_tpm_keystore.txt
index d4c1caa5d87..d655341ba7b 100644
--- a/examples/pubsub/README_pubsub_tpm_keystore.txt
+++ b/examples/pubsub/README_pubsub_tpm_keystore.txt
@@ -139,7 +139,7 @@ Delete the original encryption and signing key
 To run PubSub applications over Ethernet in two nodes connected in peer-to-peer network
     cd ../../
     mkdir build && cd build
-    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_ENCRYPTION=MBEDTLS -DUA_ENABLE_ENCRYPTION_TPM2=ON ..
+    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_ENCRYPTION=MBEDTLS -DUA_ENABLE_ENCRYPTION_TPM2=ON ..
     make -j$(nproc)
 
 The binaries are generated in build/bin/ folder
@@ -153,4 +153,4 @@ NOTE: Ignore the following warnings and error displayed during the run,
         ERROR:fapi:src/tss2-fapi/api/Fapi_List.c:81:Fapi_List() ErrorCode (0x00060034) Entities_List
         WARNING: Listing FAPI token objects failed: "fapi:Provisioning was not executed."
         Please see https://github.com/tpm2-software/tpm2-pkcs11/blob/master/docs/FAPI.md for more details
-        WARNING: Getting tokens from fapi backend failed.
\ No newline at end of file
+        WARNING: Getting tokens from fapi backend failed.
diff --git a/examples/pubsub_realtime/README.md b/examples/pubsub_realtime/README.md
index b3b2a431b22..b6b7fb5d7da 100644
--- a/examples/pubsub_realtime/README.md
+++ b/examples/pubsub_realtime/README.md
@@ -47,7 +47,6 @@ options. For good timings, ensure that the `CMAKE_BUILD_TYPE` is set to
 `Release`.
 
 - UA_ENABLE_PUBSUB
-- UA_ENABLE_PUBSUB_ETH_UADP
 - UA_BUILD_EXAMPLES
 - UA_ENABLE_MALLOC_SINGLETON
 - UA_ENABLE_PUBSUB_BUFMALLOC
diff --git a/examples/pubsub_realtime/README_pubsub_TSN.txt b/examples/pubsub_realtime/README_pubsub_TSN.txt
index da5336867d4..aa3a14440e0 100644
--- a/examples/pubsub_realtime/README_pubsub_TSN.txt
+++ b/examples/pubsub_realtime/README_pubsub_TSN.txt
@@ -54,7 +54,7 @@ TO RUN ETF APPLICATIONS:
 To run ETF applications over Ethernet in two nodes connected in peer-to-peer network
     mkdir build
     cd build
-    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON ..
+    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON ..
     make
 
 The generated binaries are generated in build/bin/ folder
@@ -104,7 +104,7 @@ As per the sample application, XDP listens to Rx_Queue 2; to direct the incoming
         ethtool --config-ntuple <I210 interface> flow-type ether proto 0x8100 dst 01:00:5E:7F:00:02 loc 14 action 2
 
 To run ETF in Publisher and XDP in Subscriber in two nodes connected in peer-to-peer network
-    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON ..
+    cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON ..
     make
     By default XDP will be disabled in the Subscriber, use -enableXdpSubscribe to use XDP in RX.
     ./bin/examples/pubsub_TSN_publisher -interface <I210 interface> -enableXdpSubscribe - Run in node 1
@@ -162,7 +162,7 @@ Change the ethernet interface in #define ETHERNET_INTERFACE macro in
 1. To test ethernet connection creation and ethernet publish unit tests(without realtime)
         cd open62541/build
         make clean
-        cmake -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON -DUA_BUILD_UNIT_TESTS=ON ..
+        cmake -DUA_ENABLE_PUBSUB=ON -DUA_BUILD_UNIT_TESTS=ON ..
         make
         The following binaries are generated in build/bin/tests folder
           ./bin/tests/check_pubsub_connection_ethernet - To check ethernet connection creation
@@ -171,7 +171,7 @@ Change the ethernet interface in #define ETHERNET_INTERFACE macro in
 2. To test ethernet connection creation and ethernet publish unit tests(with realtime)
         cd open62541/build
         make clean
-        cmake -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON -DUA_BUILD_UNIT_TESTS=ON ..
+        cmake -DUA_ENABLE_PUBSUB=ON -DUA_BUILD_UNIT_TESTS=ON ..
         make
         The following binaries are generated in build/bin/tests folder
           ./bin/tests/check_pubsub_connection_ethernet_etf - To check ethernet connection creation with etf
@@ -182,7 +182,7 @@ TO RUN THE UNIT TEST CASES FOR XDP FUNCTIONALITY:
 1. To test connection creation using XDP transport layer
         cd open62541/build
         make clean
-        cmake -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON -DUA_BUILD_UNIT_TESTS=ON ..
+        cmake -DUA_ENABLE_PUBSUB=ON -DUA_BUILD_UNIT_TESTS=ON ..
         make
         The following binary is generated in build/bin/tests folder
           ./bin/tests/check_pubsub_connection_xdp <I210 interface> - To check connection creation with XDP
diff --git a/examples/pubsub_realtime/Readme_PubSub.txt b/examples/pubsub_realtime/Readme_PubSub.txt
index 72ab9d592a9..e61fa4ef75f 100644
--- a/examples/pubsub_realtime/Readme_PubSub.txt
+++ b/examples/pubsub_realtime/Readme_PubSub.txt
@@ -75,46 +75,29 @@ Cross Compiler options to compile:
        for cross compilation
 
        CMake options for Publisher application(pubsub_TSN_publisher_multiple_thread):
-       For Ethernet:
-       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-ARM.cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON ..
-       make -j4 pubsub_TSN_publisher_multiple_thread
-
-       For UDP:
-       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-ARM.cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=OFF ..
+       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-ARM.cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON ..
        make -j4 pubsub_TSN_publisher_multiple_thread
 
        CMake options for loopback application(pubsub_TSN_loopback_single_thread):
-       For Ethernet:
-       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-ARM.cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_BUFMALLOC=ON -DUA_ENABLE_MALLOC_SINGLETON=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON ..
+       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-ARM.cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_BUFMALLOC=ON -DUA_ENABLE_MALLOC_SINGLETON=ON ..
        make -j4 pubsub_TSN_loopback_single_thread
 
-       For UDP:
-       cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-ARM.cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_BUFMALLOC=ON -DUA_ENABLE_MALLOC_SINGLETON=ON -DUA_ENABLE_PUBSUB_ETH_UADP=OFF ..
-       make -j4 pubsub_TSN_loopback_single_thread
-    
 5) Compilation for x86 architecture
        CMake options for Publisher application(pubsub_TSN_publisher_multiple_thread):
-       For Ethernet:
-       cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON ..
-       make -j4 pubsub_TSN_publisher_multiple_thread
-
-       For UDP:
-       cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ETH_UADP=OFF ..
+       cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON ..
        make -j4 pubsub_TSN_publisher_multiple_thread
 
        CMake options for loopback application(pubsub_TSN_loopback_single_thread):
-       For Ethernet:
-       cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_BUFMALLOC=ON -DUA_ENABLE_MALLOC_SINGLETON=ON -DUA_ENABLE_PUBSUB_ETH_UADP=ON ..
-       make -j4 pubsub_TSN_loopback_single_thread
-       For UDP:
-       cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_BUFMALLOC=ON -DUA_ENABLE_MALLOC_SINGLETON=ON -DUA_ENABLE_PUBSUB_ETH_UADP=OFF ..
+       cmake -DUA_BUILD_EXAMPLES=ON -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_BUFMALLOC=ON -DUA_ENABLE_MALLOC_SINGLETON=ON ..
        make -j4 pubsub_TSN_loopback_single_thread
+
 ============================================================================================================
 To RUN the APPLICATIONS:
 The generated binaries are generated in build/bin/ folder
 ============================================================================================================
 TWO WAY COMMUNICATION
 ============================================================================================================
+
     For Ethernet(Without logs) For long run:
     ./pubsub_TSN_publisher_multiple_thread -interface <interfaceName> -disableSoTxtime -operBaseTime /sys/class/net/<portName>/ieee8021ST/OperBaseTime -monotonicOffset /run/ptp_wc_mon_offset -cycleTimeInMsec 0.5 -subAppPriority 99 -pubAppPriority 98 - Run in node 1
 
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
index f3682663b87..c759d7e0171 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
@@ -120,13 +120,8 @@
 /* Set server running as true */
 UA_Boolean        runningServer           = UA_TRUE;
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
 char*             pubUri               = DEFAULT_PUBLISHING_MAC_ADDRESS;
 char*             subUri               = DEFAULT_SUBSCRIBING_MAC_ADDRESS;
-#else
-char*             pubUri               = DEFAULT_PUBLISHER_MULTICAST_ADDRESS;
-char*             subUri               = DEFAULT_SUBSCRIBER_MULTICAST_ADDRESS;
-#endif
 
 static UA_Double  cycleTimeInMsec      = DEFAULT_CYCLE_TIME;
 static UA_Int32   socketPriority       = DEFAULT_SOCKET_PRIORITY;
@@ -573,24 +568,14 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
     connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16                     = PUBLISHER_ID;
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
     UA_KeyValuePair connectionOptions[2];
-#else
-    UA_KeyValuePair connectionOptions[1];
-#endif
     connectionOptions[0].key = UA_QUALIFIEDNAME(0, "sockpriority");
     UA_Variant_setScalar(&connectionOptions[0].value, &socketPriority, &UA_TYPES[UA_TYPES_UINT32]);
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Variant_setScalar(&connectionOptions[1].value, &disableSoTxtime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-#endif
     connectionConfig.connectionProperties.map = connectionOptions;
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
     connectionConfig.connectionProperties.mapSize = 2;
-#else
-    connectionConfig.connectionProperties.mapSize = 1;
-#endif
 
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
@@ -1278,11 +1263,7 @@ int main(int argc, char **argv) {
     UA_NetworkAddressUrlDataType networkAddressUrlSub;
     networkAddressUrlSub.networkInterface = UA_STRING(interface);
     networkAddressUrlSub.url              = UA_STRING(subUri);
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
     transportProfile = UA_STRING(ETH_TRANSPORT_PROFILE);
-#else
-    transportProfile = UA_STRING(UDP_TRANSPORT_PROFILE);
-#endif
 
     if (enableCsvLog)
         fpSubscriber                  = fopen(fileSubscribedData, "w");
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
index 1a1fb757532..e270f2ab92e 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
@@ -128,13 +128,8 @@
 /* Set server running as true */
 UA_Boolean        runningServer           = UA_TRUE;
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
 char*             pubUri               = DEFAULT_PUBLISHING_MAC_ADDRESS;
 char*             subUri               = DEFAULT_SUBSCRIBING_MAC_ADDRESS;
-#else
-char*             pubUri               = DEFAULT_PUBLISHER_MULTICAST_ADDRESS;
-char*             subUri               = DEFAULT_SUBSCRIBER_MULTICAST_ADDRESS;
-#endif
 static UA_Double  cycleTimeInMsec      = DEFAULT_CYCLE_TIME;
 static UA_Int32   socketPriority       = DEFAULT_SOCKET_PRIORITY;
 static UA_Int32   pubAppPriority       = DEFAULT_PUBAPP_THREAD_PRIORITY;
@@ -584,24 +579,14 @@ addPubSubConnection(UA_Server *server, UA_String *transportProfile,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType                        = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16                     = PUBLISHER_ID;
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
     /* Connection options are given as Key/Value Pairs - Sockprio and Txtime */
     UA_KeyValuePair connectionOptions[2];
-#else
-    UA_KeyValuePair connectionOptions[1];
-#endif
     connectionOptions[0].key = UA_QUALIFIEDNAME(0, "sockpriority");
     UA_Variant_setScalar(&connectionOptions[0].value, &socketPriority, &UA_TYPES[UA_TYPES_UINT32]);
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
     connectionOptions[1].key = UA_QUALIFIEDNAME(0, "enablesotxtime");
     UA_Variant_setScalar(&connectionOptions[1].value, &disableSoTxtime, &UA_TYPES[UA_TYPES_BOOLEAN]);
-#endif
     connectionConfig.connectionProperties.map = connectionOptions;
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
     connectionConfig.connectionProperties.mapSize = 2;
-#else
-    connectionConfig.connectionProperties.mapSize = 1;
-#endif
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdent);
 }
 
@@ -1366,11 +1351,7 @@ int main(int argc, char **argv) {
     networkAddressUrlSub.url              = UA_STRING(subUri);
 #endif
 
-#ifdef UA_ENABLE_PUBSUB_ETH_UADP
     transportProfile = UA_STRING(ETH_TRANSPORT_PROFILE);
-#else
-    transportProfile = UA_STRING(UDP_TRANSPORT_PROFILE);
-#endif
 
     if (enableCsvLog)
         fpPublisher                   = fopen(filePublishedData, "w");
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 2d8b6ed3ef6..5b20497edda 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -47,7 +47,6 @@
 #cmakedefine UA_ENABLE_PUBSUB
 #cmakedefine UA_ENABLE_PUBSUB_ENCRYPTION
 #cmakedefine UA_ENABLE_PUBSUB_FILE_CONFIG
-#cmakedefine UA_ENABLE_PUBSUB_ETH_UADP
 #cmakedefine UA_ENABLE_PUBSUB_INFORMATIONMODEL
 #cmakedefine UA_ENABLE_DA
 #cmakedefine UA_ENABLE_DIAGNOSTICS
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b3a95a6a408..cc8d38edd32 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -356,7 +356,7 @@ if(UA_ENABLE_PUBSUB)
         endif()
     endif()
 
-    if(UA_ENABLE_PUBSUB_ETH_UADP)
+    if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
         ua_add_test(pubsub/check_pubsub_connection_ethernet.c)
         ua_add_test(pubsub/check_pubsub_publish_ethernet.c)
         ua_add_test(pubsub/check_pubsub_connection_ethernet_etf.c)
diff --git a/tools/ci.sh b/tools/ci.sh
index 07110406415..2e20a77be89 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -63,7 +63,6 @@ function build_tpm_tool {
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_ENCRYPTION_TPM2=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           -DUA_FORCE_WERROR=ON \
           ..
@@ -99,7 +98,6 @@ function build_amalgamation {
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_FORCE_WERROR=ON \
@@ -116,7 +114,6 @@ function build_amalgamation_mt {
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_FORCE_WERROR=ON \
@@ -146,7 +143,6 @@ function unit_tests {
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_MQTT=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
@@ -173,7 +169,6 @@ function unit_tests_32 {
           -DUA_FORCE_32BIT=ON \
           -DUA_FORCE_WERROR=ON \
           ..
-          #-DUA_ENABLE_PUBSUB_ETH_UADP=ON \ # TODO: Enable this
     make ${MAKEOPTS}
     set_capabilities
     make test ARGS="-V"
@@ -205,7 +200,6 @@ function unit_tests_diag {
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_FORCE_WERROR=ON \
@@ -318,7 +312,6 @@ function unit_tests_with_coverage {
           -DUA_ENABLE_XML_ENCODING=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_MQTT=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
@@ -386,7 +379,6 @@ function examples_valgrind {
           -DUA_ENABLE_PUBSUB_FILE_CONFIG=ON \
           -DUA_NAMESPACE_ZERO=FULL \
           -DUA_ENABLE_NODESETLOADER=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_SKS=ON \
           -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
           -DUA_FORCE_WERROR=ON \

From bf0ec621a80ab6a42608bc6b69f349e316866d6e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 22:29:58 +0200
Subject: [PATCH 1199/1963] fix(el): Zero-initialize a variable for ETH
 multicast registration

---
 arch/eventloop_posix_eth.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 393b40a459b..f3dc0ce0fb5 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -484,6 +484,7 @@ ETH_openListenConnection(UA_EventLoopPOSIX *el, ETH_FD *conn,
         }
 
         struct packet_mreq mreq;
+        memset(&mreq, 0, sizeof(struct packet_mreq));
         mreq.mr_ifindex = ifindex;
         mreq.mr_type = PACKET_MR_MULTICAST;
         mreq.mr_alen = ETH_ALEN;

From 2f80ccbfb4f2db261b785bdb1d277d16791f3e33 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 22:31:16 +0200
Subject: [PATCH 1200/1963] fix(tests): Activate ETH connection by adding a
 WriterGroup

---
 .../check_pubsub_publish_ethernet_etf.c       | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index 3e7adc83c9c..c212289aff2 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -79,7 +79,6 @@ START_TEST(EthernetSendWithoutVLANTag) {
     UA_Server_addPubSubConnection(server, &connectionConfig, &connection_test);
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     ck_assert(connection);
-    assert(connection->sendChannel != 0);
 
     /* Add a writer group to enable the connection */
     UA_WriterGroupConfig writerGroupConfig;
@@ -144,6 +143,20 @@ START_TEST(EthernetSendWithVLANTag) {
     connection = UA_PubSubConnection_findConnectionbyId(server, connection_test);
     ck_assert(connection);
 
+    /* Add a writer group to enable the connection */
+    UA_WriterGroupConfig writerGroupConfig;
+    memset(&writerGroupConfig, 0, sizeof(writerGroupConfig));
+    writerGroupConfig.name = UA_STRING("WriterGroup 1");
+    writerGroupConfig.publishingInterval = 10;
+    UA_NodeId localWriterGroup;
+    UA_StatusCode retVal =
+        UA_Server_addWriterGroup(server, connection_test,
+                                 &writerGroupConfig, &localWriterGroup);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
+    retVal = UA_Server_setWriterGroupOperational(server, localWriterGroup);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+
     /* TODO: Encapsulate ETF config in transportSettings */
     /* UA_ExtensionObject transportSettings; */
     /* memset(&transportSettings, 0, sizeof(UA_ExtensionObject)); */
@@ -162,9 +175,8 @@ START_TEST(EthernetSendWithVLANTag) {
                                        testBuffer.length);
     memcpy(networkBuffer.data, testBuffer.data, testBuffer.length);
 
-    UA_StatusCode retVal = connection->cm->
-        sendWithConnection(connection->cm, connection->sendChannel,
-                           &UA_KEYVALUEMAP_NULL, &networkBuffer);
+    retVal = connection->cm->sendWithConnection(connection->cm, connection->sendChannel,
+                                                &UA_KEYVALUEMAP_NULL, &networkBuffer);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 } END_TEST
 

From 9260330fac34aceb6c110b2dfb7550bdb23f4702 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 7 Oct 2023 23:06:27 +0200
Subject: [PATCH 1201/1963] fix(build): In ci.sh use sudo for valgrind instead
 of set_capabilities

---
 tests/pubsub/check_pubsub_connection_ethernet.c     | 3 +++
 tests/pubsub/check_pubsub_connection_ethernet_etf.c | 3 +++
 tests/pubsub/check_pubsub_publish_ethernet_etf.c    | 3 +++
 tests/pubsub/ethernet_config.h                      | 1 +
 tools/ci.sh                                         | 7 ++++---
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/pubsub/check_pubsub_connection_ethernet.c b/tests/pubsub/check_pubsub_connection_ethernet.c
index 7ebed089592..3437e93eecc 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet.c
@@ -215,6 +215,9 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
 } END_TEST
 
 int main(void) {
+    if(SKIP_ETHERNET && strlen(SKIP_ETHERNET) > 0)
+        return EXIT_SUCCESS;
+
     TCase *tc_add_pubsub_connections_minimal_config = tcase_create("Create PubSub Ethernet Connections with minimal valid config");
     tcase_add_checked_fixture(tc_add_pubsub_connections_minimal_config, setup, teardown);
     tcase_add_test(tc_add_pubsub_connections_minimal_config, AddConnectionsWithMinimalValidConfiguration);
diff --git a/tests/pubsub/check_pubsub_connection_ethernet_etf.c b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
index ff71a42f28f..3ffc5f9da75 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
@@ -266,6 +266,9 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
 } END_TEST
 
 int main(void) {
+    if(SKIP_ETHERNET && strlen(SKIP_ETHERNET) > 0)
+        return EXIT_SUCCESS;
+
     TCase *tc_add_pubsub_connections_minimal_config = tcase_create("Create PubSub Ethernet ETF Connections with minimal valid config");
     tcase_add_checked_fixture(tc_add_pubsub_connections_minimal_config, setup, teardown);
     tcase_add_test(tc_add_pubsub_connections_minimal_config, AddConnectionsWithMinimalValidConfiguration);
diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index c212289aff2..7106215255e 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -181,6 +181,9 @@ START_TEST(EthernetSendWithVLANTag) {
 } END_TEST
 
 int main(void) {
+    if(SKIP_ETHERNET && strlen(SKIP_ETHERNET) > 0)
+        return EXIT_SUCCESS;
+
     /*Test case to run both publisher*/
     TCase *tc_pubsub_ethernet_etf_publish = tcase_create("Publisher publishing Ethernet packets based on etf");
     tcase_add_checked_fixture(tc_pubsub_ethernet_etf_publish, setup, teardown);
diff --git a/tests/pubsub/ethernet_config.h b/tests/pubsub/ethernet_config.h
index 09e42314e46..35292688529 100644
--- a/tests/pubsub/ethernet_config.h
+++ b/tests/pubsub/ethernet_config.h
@@ -1,2 +1,3 @@
 #define ETHERNET_INTERFACE getenv("ETHERNET_INTERFACE")
+#define SKIP_ETHERNET getenv("SKIP_ETHERNET")
 #define MULTICAST_MAC_ADDRESS "opc.eth://08-00-27-b9-65-4a"
diff --git a/tools/ci.sh b/tools/ci.sh
index 2e20a77be89..ba82d7c666c 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -292,7 +292,7 @@ function unit_tests_pubsub_sks {
           -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
-    # set_capabilities not possible with valgrind
+    set_capabilities
     make test ARGS="-V -R sks"
 }
 
@@ -347,7 +347,7 @@ function unit_tests_valgrind {
           ..
     make ${MAKEOPTS}
     # set_capabilities not possible with valgrind
-    make test ARGS="-V"
+    sudo -E bash -c "make test ARGS=\"-V\""
 }
 
 ########################################
@@ -388,7 +388,8 @@ function examples_valgrind {
     # Run each example with valgrind. Wait 10 seconds and send the SIGINT
     # signal. Wait for the process to terminate and collect the exit status.
     # Abort when the exit status is non-null.
-    python3 ../tools/examples_with_valgrind.py
+    # set_capabilities not possible with valgrind
+    sudo -E bash -c "python3 ../tools/examples_with_valgrind.py"
     EXIT_CODE=$?
     if [[ $EXIT_CODE -ne 0 ]]; then
         echo "Processing failed with exit code $EXIT_CODE"

From 9e28b61b1ca6c9bb34d405df3adbfce5c280b284 Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Mon, 9 Oct 2023 16:57:16 +0200
Subject: [PATCH 1202/1963] fix(core): Do not reset tools directory when
 installed

---
 tools/cmake/macros_public.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index 2a2aec7890d..84949f6cafd 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -1,4 +1,6 @@
-set(open62541_TOOLS_DIR "${PROJECT_SOURCE_DIR}/tools")
+if(NOT open62541_TOOLS_DIR OR "${open62541_TOOLS_DIR}" STREQUAL "")
+    set(open62541_TOOLS_DIR "${PROJECT_SOURCE_DIR}/tools")
+endif()
 
 # --------------- Generate NodeIDs header ---------------------
 #

From 34e060cca7090222630927c81cf0ec9b4425b909 Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Tue, 10 Oct 2023 10:53:04 +0200
Subject: [PATCH 1203/1963] fix(core): LibreSSL build on win32

---
 CMakeLists.txt               |  4 ++--
 arch/win32/ua_architecture.h | 11 +----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5b692d9969..14e4c406b20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -514,8 +514,8 @@ if(UA_ENABLE_ENCRYPTION_LIBRESSL)
     find_package(LibreSSL REQUIRED)
     list(APPEND open62541_LIBRARIES ${LIBRESSL_LIBRARIES})
     if(WIN32)
-        # Add bestcrypt for random generator
-        list(APPEND open62541_LIBRARIES bcrypt)
+        # Add bestcrypt for random generator and ws2_32 for crypto
+        list(APPEND open62541_LIBRARIES ws2_32 bcrypt)
     endif()
 endif()
 
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 0d4af50cc30..378165825ce 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -61,17 +61,8 @@ typedef SSIZE_T ssize_t;
 #if UA_IPV6
 # define UA_if_nametoindex if_nametoindex
 
-# if defined(__WINCRYPT_H__) && defined(UA_ENABLE_ENCRYPTION_LIBRESSL)
-#  error "Wincrypt is not compatible with LibreSSL"
-# endif
-/* Hack: Prevent Wincrypt-Includes */
-# ifdef UA_ENABLE_ENCRYPTION_LIBRESSL
-#  define __WINCRYPT_H__
-# endif
 # include <iphlpapi.h>
-# ifdef UA_ENABLE_ENCRYPTION_LIBRESSL
-#  undef __WINCRYPT_H__
-# endif
+
 #endif
 
 #ifdef maxStringLength //defined in mingw64

From 89cfed74709ee24ca4cea71d35f478a69500702c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 10 Oct 2023 23:13:17 +0200
Subject: [PATCH 1204/1963] feat(el): Check for closed connections during
 select/epoll processing

---
 arch/eventloop_posix_epoll.c  |  9 +++++++++
 arch/eventloop_posix_select.c | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
index dfa99d4476b..fe25fd8a26e 100644
--- a/arch/eventloop_posix_epoll.c
+++ b/arch/eventloop_posix_epoll.c
@@ -103,6 +103,13 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
     /* Process all received events */
     for(int i = 0; i < events; i++) {
         UA_RegisteredFD *rfd = (UA_RegisteredFD*)epoll_events[i].data.ptr;
+
+        /* The rfd is already registered for removal. Don't process incoming
+         * events any longer. */
+        if(rfd->dc.callback)
+            continue;
+
+        /* Get the event */
         short revent = 0;
         if((epoll_events[i].events & EPOLLIN) == EPOLLIN) {
             revent = UA_FDEVENT_IN;
@@ -111,6 +118,8 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
         } else {
             revent = UA_FDEVENT_ERR;
         }
+
+        /* Call the EventSource callback */
         rfd->eventSourceCB(rfd->es, rfd, revent);
     }
     return UA_STATUSCODE_GOOD;
diff --git a/arch/eventloop_posix_select.c b/arch/eventloop_posix_select.c
index 16a6a54b886..992e02f597f 100644
--- a/arch/eventloop_posix_select.c
+++ b/arch/eventloop_posix_select.c
@@ -135,26 +135,32 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
     }
 
     /* Loop over all registered FD to see if an event arrived. Yes, this is why
-      * select is slow for many open sockets. */
+     * select is slow for many open sockets. */
     for(size_t i = 0; i < el->fdsSize; i++) {
         UA_RegisteredFD *rfd = el->fds[i];
-        UA_FD fd = rfd->fd;
 
-        /* Error Event */
+        /* The rfd is already registered for removal. Don't process incoming
+         * events any longer. */
+        if(rfd->dc.callback)
+            continue;
+
+        /* Event signaled for the fd? */
         short event = 0;
-        if(FD_ISSET(fd, &readset)) {
+        if(FD_ISSET(rfd->fd, &readset)) {
             event = UA_FDEVENT_IN;
-        } else if(FD_ISSET(fd, &writeset)) {
+        } else if(FD_ISSET(rfd->fd, &writeset)) {
             event = UA_FDEVENT_OUT;
-        } else if(FD_ISSET(fd, &errset)) {
+        } else if(FD_ISSET(rfd->fd, &errset)) {
             event = UA_FDEVENT_ERR;
         } else {
             continue;
         }
 
         UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_EVENTLOOP,
-                     "Processing event %u on fd %u", (unsigned)event, (unsigned)fd);
+                     "Processing event %u on fd %u", (unsigned)event,
+                     (unsigned)rfd->fd);
 
+        /* Call the EventSource callback */
         rfd->eventSourceCB(rfd->es, rfd, event);
 
         /* The fd has removed itself */

From 03842c431f1f83142d6fec0eb508257189d025aa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 Oct 2023 13:23:00 +0200
Subject: [PATCH 1205/1963] feat(client): Allow setting a custom SessionName in
 the client config

---
 include/open62541/client.h     | 2 ++
 src/client/ua_client.c         | 1 +
 src/client/ua_client_connect.c | 1 +
 3 files changed, 4 insertions(+)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 8be9de4616d..8cd15e02f0a 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -208,6 +208,8 @@ typedef struct {
                                            UA_UInt32 subscriptionId,
                                            void *subContext);
 
+    /* Session config */
+    UA_String sessionName;
     UA_LocaleId *sessionLocaleIds;
     size_t sessionLocaleIdsSize;
 } UA_ClientConfig;
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d80d3c2ffa2..73cf61d6c52 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -208,6 +208,7 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
     config->logger.log = NULL;
     config->logger.clear = NULL;
 
+    UA_String_clear(&config->sessionName);
     if(config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
         UA_Array_delete(config->sessionLocaleIds,
                         config->sessionLocaleIdsSize, &UA_TYPES[UA_TYPES_LOCALEID]);
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index d325d9bbec0..5e997aec15c 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1217,6 +1217,7 @@ createSessionAsync(UA_Client *client) {
     request.maxResponseMessageSize = UA_INT32_MAX;
     request.endpointUrl = client->config.endpoint.endpointUrl;
     request.clientDescription = client->config.clientDescription;
+    request.sessionName = client->config.sessionName;
     if(client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
         request.clientCertificate = client->channel.securityPolicy->localCertificate;

From 751e7dd460a9379167ecb077e882899849282d5f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 Oct 2023 11:20:30 +0200
Subject: [PATCH 1206/1963] feat(el): Cancel select/epoll when socket is shut
 down from another thread

---
 arch/eventloop_mqtt.c                     |  3 +++
 arch/eventloop_posix_eth.c                |  3 +++
 arch/eventloop_posix_tcp.c                |  3 +++
 arch/eventloop_posix_udp.c                |  3 +++
 arch/posix/ua_architecture.h              |  2 +-
 arch/win32/ua_architecture.h              |  1 +
 tests/client/check_activateSession.c      |  2 +-
 tests/client/check_client.c               |  2 +-
 tests/client/check_client_async.c         | 17 +++++++----------
 tests/client/check_client_securechannel.c |  2 +-
 10 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index d4fee91900d..69087e2abfb 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -833,6 +833,9 @@ MQTT_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
        tc->topicConnectionState == UA_CONNECTIONSTATE_CLOSED)
         return UA_STATUSCODE_GOOD;
 
+    /* TODO: Cancel the ongoing select/epoll if this was called from another
+     * thread. */
+
     UA_EventLoop *el = tc->brokerConnection->mcm->cm.eventSource.eventLoop;
     UA_LOG_DEBUG(el->logger, UA_LOGCATEGORY_NETWORK,
                  "MQTT %u\t| Shutdown called", (unsigned)tc->topicConnectionId);
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index f3dc0ce0fb5..118151a1659 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -721,6 +721,9 @@ ETH_shutdown(UA_POSIXConnectionManager *pcm, ETH_FD *conn) {
         return;
     }
 
+    /* Shutdown the socket to cancel the current select/epoll */
+    shutdown(conn->rfd.fd, UA_SHUT_RDWR);
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "ETH %u\t| Shutdown called", (unsigned)conn->rfd.fd);
 
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 0f91a97a481..2b7ff3e87e6 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -577,6 +577,9 @@ TCP_shutdown(UA_ConnectionManager *cm, TCP_FD *conn) {
         return;
     }
 
+    /* Shutdown the socket to cancel the current select/epoll */
+    shutdown(conn->rfd.fd, UA_SHUT_RDWR);
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "TCP %u\t| Shutdown triggered",
                  (unsigned)conn->rfd.fd);
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index b5cd33e0867..c3b8dfb371d 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -848,6 +848,9 @@ UDP_shutdown(UA_ConnectionManager *cm, UA_RegisteredFD *rfd) {
         return;
     }
 
+    /* Shutdown the socket to cancel the current select/epoll */
+    shutdown(rfd->fd, UA_SHUT_RDWR);
+
     UA_LOG_DEBUG(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                  "UDP %u\t| Shutdown called", (unsigned)rfd->fd);
 
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 439d255d21e..c427685481f 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -38,9 +38,9 @@
 #define UA_AGAIN EAGAIN /* the same as wouldblock on nearly every system */
 #define UA_INPROGRESS EINPROGRESS
 #define UA_WOULDBLOCK EWOULDBLOCK
-
 #define UA_POLLIN POLLIN
 #define UA_POLLOUT POLLOUT
+#define UA_SHUT_RDWR SHUT_RDWR
 
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
     getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
index 378165825ce..57a6b2ce0a9 100644
--- a/arch/win32/ua_architecture.h
+++ b/arch/win32/ua_architecture.h
@@ -40,6 +40,7 @@ typedef SSIZE_T ssize_t;
 #define UA_WOULDBLOCK WSAEWOULDBLOCK
 #define UA_POLLIN POLLRDNORM
 #define UA_POLLOUT POLLWRNORM
+#define UA_SHUT_RDWR SD_BOTH
 
 #define UA_getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \
     getnameinfo(sa, (socklen_t)salen, host, (DWORD)hostlen, serv, (DWORD)servlen, flags)
diff --git a/tests/client/check_activateSession.c b/tests/client/check_activateSession.c
index e4f0161cf8d..edd23716d6e 100644
--- a/tests/client/check_activateSession.c
+++ b/tests/client/check_activateSession.c
@@ -416,7 +416,7 @@ START_TEST(Client_activateSessionTimeout) {
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURECHANNELCLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
 
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index e74781fdeb6..120b9b49755 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -388,7 +388,7 @@ START_TEST(Client_activateSessionTimeout) {
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURECHANNELCLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
 
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
diff --git a/tests/client/check_client_async.c b/tests/client/check_client_async.c
index bad867333d7..01343bccaa7 100644
--- a/tests/client/check_client_async.c
+++ b/tests/client/check_client_async.c
@@ -179,22 +179,19 @@ START_TEST(Client_read_async_timed) {
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         ck_assert_uint_eq(asyncCounter, 1);
 
-        /* Manually close the connection. The connection is internally closed at the
-         * next iteration of the EventLoop. Hence the next request is sent out. But
-         * the connection "actually closes" before receiving the response. */
+        /* Manually close the connection */
         UA_ConnectionManager *cm = client->channel.connectionManager;
         uintptr_t connId = client->channel.connectionId;
         cm->closeConnection(cm, connId);
 
         rr.requestHeader.timeoutHint = 100;
-        retval = __UA_Client_AsyncService(client, &rr,
-                                          &UA_TYPES[UA_TYPES_READREQUEST],
+        retval = __UA_Client_AsyncService(client, &rr, &UA_TYPES[UA_TYPES_READREQUEST],
                                           (UA_ClientAsyncServiceCallback) asyncReadCallback,
-                                          &UA_TYPES[UA_TYPES_READRESPONSE], &asyncCounter, NULL);
-        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        /* Process async responses during 1s */
-        UA_Client_run_iterate(client, 100 + 1);
-        ck_assert_uint_eq(asyncCounter, 9999);
+                                          &UA_TYPES[UA_TYPES_READRESPONSE], &asyncCounter,
+                                          NULL);
+
+        /* Sending out the request failed */
+        ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
 
         UA_Client_disconnect(client);
         UA_Client_delete(client);
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index 942078eb7bf..d4c37caf4cc 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -214,7 +214,7 @@ START_TEST(SecureChannel_cableunplugged) {
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURECHANNELCLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
 
     UA_Client_delete(client);
 }

From 0c4cc65dc6ac54db19d336989cd5e092f23cdfa3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 12 Oct 2023 21:11:22 +0200
Subject: [PATCH 1207/1963] feat(server): Warn if maxSecureChannels <=
 maxSessions

---
 src/server/ua_server.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 47aa689a43d..2517281aaa9 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -730,6 +730,14 @@ UA_Server_run_startup(UA_Server *server) {
     UA_CHECK_STATUS(retVal, UA_UNLOCK(&server->serviceMutex); return retVal);
 #endif
 
+    /* Are there enough SecureChannels possible for the max number of sessions? */
+    if(config->maxSecureChannels != 0 &&
+       (config->maxSessions == 0 || config->maxSessions <= config->maxSecureChannels)) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                       "Maximum SecureChannels count not enough for the "
+                       "maximum Sessions count");
+    }
+
     /* Add a regular callback for housekeeping tasks. With a 1s interval. */
     retVal = addRepeatedCallback(server, serverHouseKeeping,
                                  NULL, 1000.0, &server->houseKeepingCallbackId);

From 92e437d785996312ffa1291209c2db42f962b12b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Oct 2023 08:24:53 +0200
Subject: [PATCH 1208/1963] feat(server): Add resendData method to server
 object

---
 src/server/ua_server_ns0.c               | 45 ++++++++++++++++++++++--
 src/server/ua_subscription.c             | 24 +++++++++++++
 src/server/ua_subscription.h             |  3 ++
 tools/schema/Opc.Ua.NodeSet2.Reduced.xml | 35 ++++++++++++++++++
 4 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index d3b8b080522..96f9e2a4c30 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -638,6 +638,43 @@ readMinSamplingInterval(UA_Server *server, const UA_NodeId *sessionId, void *ses
 
 #if defined(UA_GENERATED_NAMESPACE_ZERO) && defined(UA_ENABLE_METHODCALLS) && defined(UA_ENABLE_SUBSCRIPTIONS)
 static UA_StatusCode
+resendData(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
+           const UA_NodeId *methodId, void *methodContext, const UA_NodeId *objectId,
+           void *objectContext, size_t inputSize, const UA_Variant *input,
+           size_t outputSize, UA_Variant *output) {
+    /* Get the input argument */
+    if(inputSize != 1 ||
+       !UA_Variant_hasScalarType(input, &UA_TYPES[UA_TYPES_UINT32]))
+        return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
+    UA_UInt32 subscriptionId = *((UA_UInt32*)(input[0].data));
+
+    /* Get the Session */
+    UA_LOCK(&server->serviceMutex);
+    UA_Session *session = getSessionById(server, sessionId);
+    if(!session) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Get the Subscription */
+    UA_Subscription *subscription = getSubscriptionById(server, subscriptionId);
+    if(!subscription) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
+    }
+
+    /* The Subscription is not attached to this Session */
+    if(subscription->session != session) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADUSERACCESSDENIED;
+    }
+
+    UA_Subscription_resendData(server, subscription);
+
+    UA_UNLOCK(&server->serviceMutex);
+    return UA_STATUSCODE_GOOD;
+}
+static UA_StatusCode
 readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
                    const UA_NodeId *methodId, void *methodContext, const UA_NodeId *objectId,
                    void *objectContext, size_t inputSize, const UA_Variant *input,
@@ -1096,7 +1133,6 @@ initNS0(UA_Server *server) {
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_ESTIMATEDRETURNTIME), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_LOCALTIME), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_REQUESTSERVERSTATECHANGE), true);
-    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_RESENDDATA), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVERCONFIGURATION), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SETSUBSCRIPTIONDURABLE), true);
 
@@ -1250,8 +1286,13 @@ initNS0(UA_Server *server) {
 #endif
 
 #if defined(UA_ENABLE_METHODCALLS) && defined(UA_ENABLE_SUBSCRIPTIONS)
-    retVal |= setMethodNode_callback(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_GETMONITOREDITEMS),
+    retVal |= setMethodNode_callback(server,
+                                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_GETMONITOREDITEMS),
                                      readMonitoredItems);
+
+    retVal |= setMethodNode_callback(server,
+                                     UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_RESENDDATA),
+                                     resendData);
 #endif
 
     /* The HasComponent references to the ModellingRules are not part of the
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 637a4639e5e..69bd3834856 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -691,6 +691,30 @@ UA_Subscription_sampleAndPublish(UA_Server *server, UA_Subscription *sub) {
     UA_Subscription_publish(server, sub);
 }
 
+void
+UA_Subscription_resendData(UA_Server *server, UA_Subscription *sub) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_assert(server);
+    UA_assert(sub);
+
+    /* Part 4, §6.7: If this Method is called, subsequent Publish responses
+     * shall contain the current values of all data MonitoredItems in the
+     * Subscription where the MonitoringMode is set to Reporting. If a value is
+     * queued for a data MonitoredItem, the next value in the queue is sent in
+     * the Publish response. If no value is queued for a data MonitoredItem, the
+     * last value sent is repeated in the Publish response. */
+    UA_MonitoredItem *mon;
+    LIST_FOREACH(mon, &sub->samplingMonitoredItems, sampling.samplingListEntry) {
+        if(mon->itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER)
+            continue;
+        if(mon->monitoringMode != UA_MONITORINGMODE_REPORTING)
+            continue;
+        if(mon->queueSize > 0)
+            continue;
+        UA_MonitoredItem_createDataChangeNotification(server, sub, mon, &mon->lastValue);
+    }
+}
+
 void
 UA_Session_ensurePublishQueueSpace(UA_Server* server, UA_Session* session) {
     if(server->config.maxPublishReqPerSession == 0)
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index cd94f6a747e..081738b91fc 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -338,6 +338,9 @@ UA_Subscription_sampleAndPublish(UA_Server *server, UA_Subscription *sub);
 void
 UA_Subscription_publish(UA_Server *server, UA_Subscription *sub);
 
+void
+UA_Subscription_resendData(UA_Server *server, UA_Subscription *sub);
+
 UA_StatusCode
 UA_Subscription_removeRetransmissionMessage(UA_Subscription *sub,
                                             UA_UInt32 sequenceNumber);
diff --git a/tools/schema/Opc.Ua.NodeSet2.Reduced.xml b/tools/schema/Opc.Ua.NodeSet2.Reduced.xml
index 7e8b62e249f..89b207150d8 100644
--- a/tools/schema/Opc.Ua.NodeSet2.Reduced.xml
+++ b/tools/schema/Opc.Ua.NodeSet2.Reduced.xml
@@ -1334,6 +1334,41 @@
       </ListOfExtensionObject>
     </Value>
   </UAVariable>
+  <UAMethod NodeId="i=12873" BrowseName="ResendData" ParentNodeId="i=2253" MethodDeclarationId="i=12871">
+    <DisplayName>ResendData</DisplayName>
+    <Category>Base Info ServerType</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part5/9.2</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=12874</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2253</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=12874" BrowseName="InputArguments" ParentNodeId="i=12873" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=12873</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscriptionId</Name>
+              <DataType>
+                <Identifier>i=7</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
   <UAObjectType NodeId="i=17602" BrowseName="BaseInterfaceType" IsAbstract="true">
     <DisplayName>BaseInterfaceType</DisplayName>
     <References>

From d325d7886dc919de154a109646bfefec00e27e95 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Oct 2023 08:27:59 +0200
Subject: [PATCH 1209/1963] fix(server): Conditionally build writeNs0Variable
 in ua_server_ns0.c

---
 src/server/ua_server_ns0.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 96f9e2a4c30..5388cc06c58 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -761,6 +761,7 @@ writeNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
     return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
 }
 
+#ifdef UA_GENERATED_NAMESPACE_ZERO
 static UA_StatusCode
 writeNs0Variable(UA_Server *server, UA_UInt32 id, void *v, const UA_DataType *type) {
     UA_Variant var;
@@ -768,6 +769,7 @@ writeNs0Variable(UA_Server *server, UA_UInt32 id, void *v, const UA_DataType *ty
     UA_Variant_setScalar(&var, v, type);
     return writeValueAttribute(server, UA_NODEID_NUMERIC(0, id), &var);
 }
+#endif
 
 #ifndef UA_GENERATED_NAMESPACE_ZERO
 static UA_StatusCode

From 2e2c06f941b12abc7c5d664c39d034bb4e4129ab Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Oct 2023 08:38:34 +0200
Subject: [PATCH 1210/1963] refactor(server): Set time response timestamp only
 in "sendResponse"

---
 src/server/ua_server_discovery.c | 1 -
 src/server/ua_session.c          | 1 -
 src/server/ua_subscription.c     | 8 ++------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/server/ua_server_discovery.c b/src/server/ua_server_discovery.c
index 861fa2ba6d0..4db20985d76 100644
--- a/src/server/ua_server_discovery.c
+++ b/src/server/ua_server_discovery.c
@@ -24,7 +24,6 @@ register_server_with_discovery_server(UA_Server *server,
      * as the members are stack-allocated or point into the server config. */
     UA_RegisterServer2Request request;
     UA_RegisterServer2Request_init(&request);
-    request.requestHeader.timestamp = UA_DateTime_now();
     request.requestHeader.timeoutHint = 10000;
 
     request.server.isOnline = !isUnregister;
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index 663fb2616bb..98eb924a6a1 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -176,7 +176,6 @@ UA_Session_detachSubscription(UA_Server *server, UA_Session *session,
     while((pre = UA_Session_dequeuePublishReq(session))) {
         UA_PublishResponse *response = &pre->response;
         response->responseHeader.serviceResult = UA_STATUSCODE_BADNOSUBSCRIPTION;
-        response->responseHeader.timestamp = UA_DateTime_now();
         sendResponse(server, session, session->header.channel, pre->requestId,
                      (UA_Response*)response, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
         UA_PublishResponse_clear(response);
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 69bd3834856..cbb1233b2b6 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -406,11 +406,10 @@ sendStatusChangeDelete(UA_Server *server, UA_Subscription *sub,
     UA_ExtensionObject_setValue(&notificationData, &scn,
                                 &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
 
-    response->responseHeader.timestamp = UA_DateTime_now();
     response->notificationMessage.notificationData = &notificationData;
     response->notificationMessage.notificationDataSize = 1;
     response->subscriptionId = sub->subscriptionId;
-    response->notificationMessage.publishTime = response->responseHeader.timestamp;
+    response->notificationMessage.publishTime = UA_DateTime_now();
     response->notificationMessage.sequenceNumber = sub->nextSequenceNumber;
 
     /* Send the response */
@@ -469,7 +468,6 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
                                      "Publish request %u has timed out", pre->requestId);
 
                 pre->response.responseHeader.serviceResult = UA_STATUSCODE_BADTIMEOUT;
-                pre->response.responseHeader.timestamp = UA_DateTime_now();
                 sendResponse(server, sub->session, sub->session->header.channel,
                              pre->requestId, (UA_Response *)&pre->response,
                              &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
@@ -577,10 +575,9 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
     /* <-- The point of no return --> */
 
     /* Set up the response */
-    response->responseHeader.timestamp = UA_DateTime_now();
     response->subscriptionId = sub->subscriptionId;
     response->moreNotifications = (sub->notificationQueueSize > 0);
-    message->publishTime = response->responseHeader.timestamp;
+    message->publishTime = UA_DateTime_now();
 
     /* Set sequence number to message. Started at 1 which is given during
      * creating a new subscription. The 1 is required for initial publish
@@ -730,7 +727,6 @@ UA_Session_ensurePublishQueueSpace(UA_Server* server, UA_Session* session) {
 
         /* Send the response. This response has no related subscription id */
         UA_PublishResponse *response = &pre->response;
-        response->responseHeader.timestamp = UA_DateTime_now();
         response->responseHeader.serviceResult = UA_STATUSCODE_BADTOOMANYPUBLISHREQUESTS;
         sendResponse(server, session, session->header.channel, pre->requestId,
                      (UA_Response *)response, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);

From d9c9143de23e9397b624617a4b4ddad55e01bd10 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Oct 2023 08:39:41 +0200
Subject: [PATCH 1211/1963] refactor(server): Cosmetic simplification in
 ua_server_binary.c

---
 src/server/ua_server_binary.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 9da611fdf81..b2be945bbbe 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -935,17 +935,16 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
 
     /* Check timestamp in the request header */
     UA_RequestHeader *requestHeader = &request.requestHeader;
-    if(requestHeader->timestamp == 0) {
-        if(server->config.verifyRequestTimestamp <= UA_RULEHANDLING_WARN) {
-            UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
-                                   "The server sends no timestamp in the request header. "
-                                   "See the 'verifyRequestTimestamp' setting.");
-            if(server->config.verifyRequestTimestamp <= UA_RULEHANDLING_ABORT) {
-                retval = sendServiceFault(channel, requestId, requestHeader->requestHandle,
-                                          UA_STATUSCODE_BADINVALIDTIMESTAMP);
-                UA_clear(&request, requestType);
-                return retval;
-            }
+    if(requestHeader->timestamp == 0 &&
+       server->config.verifyRequestTimestamp <= UA_RULEHANDLING_WARN) {
+        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+                               "The server sends no timestamp in the request header. "
+                               "See the 'verifyRequestTimestamp' setting.");
+        if(server->config.verifyRequestTimestamp <= UA_RULEHANDLING_ABORT) {
+            retval = sendServiceFault(channel, requestId, requestHeader->requestHandle,
+                                      UA_STATUSCODE_BADINVALIDTIMESTAMP);
+            UA_clear(&request, requestType);
+            return retval;
         }
     }
 

From 4eafb8a11269e98d544370c90f5115fb2210df32 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Oct 2023 08:47:45 +0200
Subject: [PATCH 1212/1963] refactor(server): Cosmetic refactoring of
 Service_OpenSecureChannel

---
 src/server/ua_services_securechannel.c | 54 +++++++++++++-------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index 4a9bff7a3d9..ed43d86cbbf 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -124,8 +124,27 @@ void
 Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
                           const UA_OpenSecureChannelRequest *request,
                           UA_OpenSecureChannelResponse *response) {
-    /* Renew the channel */
-    if(request->requestType == UA_SECURITYTOKENREQUESTTYPE_RENEW) {
+    switch(request->requestType) {
+        /* Open the channel */
+    case UA_SECURITYTOKENREQUESTTYPE_ISSUE:
+        response->responseHeader.serviceResult =
+            UA_SecureChannelManager_open(server, channel, request, response);
+        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+            UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+                                "Opening a SecureChannel failed");
+            return;
+        }
+
+        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+                            "SecureChannel opened with SecurityPolicy %.*s "
+                            "and a revised lifetime of %.2fs",
+                            (int)channel->securityPolicy->policyUri.length,
+                            channel->securityPolicy->policyUri.data,
+                            (UA_Float)response->securityToken.revisedLifetime / 1000);
+        break;
+
+        /* Renew the channel */
+    case UA_SECURITYTOKENREQUESTTYPE_RENEW:
         response->responseHeader.serviceResult =
             UA_SecureChannelManager_renew(server, channel, request, response);
         if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
@@ -134,35 +153,16 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
             return;
         }
 
-        /* Log the renewal and the lifetime */
-        UA_Float lifetime = (UA_Float)response->securityToken.revisedLifetime / 1000;
         UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel renewed "
-                            "with a revised lifetime of %.2fs", lifetime);
-        return;
-    }
+                            "with a revised lifetime of %.2fs",
+                            (UA_Float)response->securityToken.revisedLifetime / 1000);
+        break;
 
-    /* Must be ISSUE or RENEW */
-    if(request->requestType != UA_SECURITYTOKENREQUESTTYPE_ISSUE) {
+        /* Unknown request type */
+    default:
         response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
-        return;
+        break;
     }
-
-    /* Open the channel */
-    response->responseHeader.serviceResult =
-        UA_SecureChannelManager_open(server, channel, request, response);
-    if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
-                            "Opening a SecureChannel failed");
-        return;
-    }
-
-    /* Log the lifetime */
-    UA_Float lifetime = (UA_Float)response->securityToken.revisedLifetime / 1000;
-    UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
-                        "SecureChannel opened with SecurityPolicy %.*s "
-                        "and a revised lifetime of %.2fs",
-                        (int)channel->securityPolicy->policyUri.length,
-                        channel->securityPolicy->policyUri.data, lifetime);
 }
 
 /* The server does not send a CloseSecureChannel response */

From 528b5151069ae7d26c3d8c6051368f4f4fea18ed Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 14 Oct 2023 09:18:36 +0200
Subject: [PATCH 1213/1963] refactor(server): Unify code-paths for
 SecureChannel ISSUE and RENEW

---
 src/server/ua_server_binary.c          |   1 -
 src/server/ua_services.h               |   2 +-
 src/server/ua_services_securechannel.c | 186 ++++++++++---------------
 3 files changed, 75 insertions(+), 114 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index b2be945bbbe..eabd2694e1d 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1131,7 +1131,6 @@ createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *c
      * alternative security token, we don't touch this value during the token
      * rollover. */
     entry->channel.securityToken.channelId = bpm->lastChannelId++;
-    entry->channel.altSecurityToken.channelId = entry->channel.securityToken.channelId;
 
     /* Set an initial timeout before the negotiation handshake. So the channel
      * is caught if the client is unresponsive.
diff --git a/src/server/ua_services.h b/src/server/ua_services.h
index 61928558904..789e0b74f57 100644
--- a/src/server/ua_services.h
+++ b/src/server/ua_services.h
@@ -121,7 +121,7 @@ void Service_RegisterServer2(UA_Server *server, UA_Session *session,
  * Open or renew a SecureChannel that can be used to ensure Confidentiality and
  * Integrity for Message exchange during a Session. */
 void Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel* channel,
-                               const UA_OpenSecureChannelRequest *request,
+                               UA_OpenSecureChannelRequest *request,
                                UA_OpenSecureChannelResponse *response);
 
 /**
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index ed43d86cbbf..fa6e9a0d285 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -16,152 +16,114 @@
  * decoding of the message. The main SecureChannel logic is handled in
  * /src/ua_securechannel.* and /src/server/ua_server_binary.c. */
 
-static UA_StatusCode
-UA_SecureChannelManager_open(UA_Server *server, UA_SecureChannel *channel,
-                             const UA_OpenSecureChannelRequest *request,
-                             UA_OpenSecureChannelResponse *response) {
-    if(channel->state != UA_SECURECHANNELSTATE_ACK_SENT) {
-        UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
-                             "Called open on already open or closed channel");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Set the SecurityMode */
+void
+Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
+                          UA_OpenSecureChannelRequest *request,
+                          UA_OpenSecureChannelResponse *response) {
     const UA_SecurityPolicy *sp = channel->securityPolicy;
-    if(request->securityMode != UA_MESSAGESECURITYMODE_NONE &&
-       UA_ByteString_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI))
-        return UA_STATUSCODE_BADSECURITYMODEREJECTED;
-    channel->securityMode = request->securityMode;
-
-    /* Set the initial SecurityToken. Set the alternative token that is moved to
-     * the primary token when the first symmetric message triggers a token
-     * revolve. Lifetime 0 -> set the maximum possible lifetime */
-    channel->renewState = UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER;
-    channel->altSecurityToken.tokenId = generateSecureChannelTokenId(server);
-    channel->altSecurityToken.createdAt = UA_DateTime_nowMonotonic();
-    channel->altSecurityToken.revisedLifetime =
-        (request->requestedLifetime > server->config.maxSecurityTokenLifetime) ?
-        server->config.maxSecurityTokenLifetime : request->requestedLifetime;
-    if(channel->altSecurityToken.revisedLifetime == 0)
-        channel->altSecurityToken.revisedLifetime = server->config.maxSecurityTokenLifetime;
 
-    /* Store the received client nonce and generate the server nonce. The
-     * syymmetric encryption keys are generated from the nonces when the first
-     * symmetric message is received that triggers revolving of the token. */
-    UA_StatusCode retval = UA_ByteString_copy(&request->clientNonce, &channel->remoteNonce);
-    UA_CHECK_STATUS(retval, return retval);
+    switch(request->requestType) {
+    /* Open the channel */
+    case UA_SECURITYTOKENREQUESTTYPE_ISSUE:
+        /* We must expect an OPN handshake */
+        if(channel->state != UA_SECURECHANNELSTATE_ACK_SENT) {
+            UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
+                                 "Called open on already open or closed channel");
+            response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+            goto error;
+        }
 
-    retval = UA_SecureChannel_generateLocalNonce(channel);
-    UA_CHECK_STATUS(retval, return retval);
+        /* Set the SecurityMode */
+        if(request->securityMode != UA_MESSAGESECURITYMODE_NONE &&
+           UA_ByteString_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI)) {
+            response->responseHeader.serviceResult = UA_STATUSCODE_BADSECURITYMODEREJECTED;
+            goto error;
+        }
+        channel->securityMode = request->securityMode;
+        break;
 
-    /* Set the response. The token will be revolved to the new token when the
-     * first symmetric messages is received. */
-    response->securityToken = channel->altSecurityToken;
-    response->securityToken.createdAt = UA_DateTime_now(); /* Only for sending */
-    response->responseHeader.timestamp = response->securityToken.createdAt;
-    response->responseHeader.requestHandle = request->requestHeader.requestHandle;
-    retval = UA_ByteString_copy(&channel->localNonce, &response->serverNonce);
-    UA_CHECK_STATUS(retval, return retval);
+    /* Renew the channel */
+    case UA_SECURITYTOKENREQUESTTYPE_RENEW:
+        /* The channel must be open to be renewed */
+        if(channel->state != UA_SECURECHANNELSTATE_OPEN) {
+            UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
+                                 "Called renew on channel which is not open");
+            response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+            goto error;
+        }
 
-    /* The channel is open */
-    channel->state = UA_SECURECHANNELSTATE_OPEN;
-    return UA_STATUSCODE_GOOD;
-}
+        /* Check whether the nonce was reused */
+        if(channel->securityMode != UA_MESSAGESECURITYMODE_NONE &&
+           UA_ByteString_equal(&channel->remoteNonce, &request->clientNonce)) {
+            UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
+                                 "The client reused the last nonce");
+            response->responseHeader.serviceResult = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+            goto error;
+        }
 
-static UA_StatusCode
-UA_SecureChannelManager_renew(UA_Server *server, UA_SecureChannel *channel,
-                              const UA_OpenSecureChannelRequest *request,
-                              UA_OpenSecureChannelResponse *response) {
-    if(channel->state != UA_SECURECHANNELSTATE_OPEN) {
-        UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
-                             "Called renew on channel which is not open");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
+        break;
 
-    /* Check whether the nonce was reused */
-    if(channel->securityMode != UA_MESSAGESECURITYMODE_NONE &&
-       UA_ByteString_equal(&channel->remoteNonce, &request->clientNonce)) {
-        UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
-                             "The client reused the last nonce");
-        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    /* Unknown request type */
+    default:
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+        return;
     }
 
-    /* Create a new SecurityToken. Will be switched over when the first message
-     * is received. The ChannelId is left unchanged. */
-    channel->altSecurityToken = channel->securityToken;
+    /* Create a new SecurityToken. It will be switched over when the first
+     * message is received. The ChannelId is left unchanged. */
+    channel->altSecurityToken.channelId = channel->securityToken.channelId;
     channel->altSecurityToken.tokenId = generateSecureChannelTokenId(server);
     channel->altSecurityToken.createdAt = UA_DateTime_nowMonotonic();
     channel->altSecurityToken.revisedLifetime =
         (request->requestedLifetime > server->config.maxSecurityTokenLifetime) ?
         server->config.maxSecurityTokenLifetime : request->requestedLifetime;
-    if(channel->altSecurityToken.revisedLifetime == 0) /* lifetime 0 -> return the max lifetime */
+    if(channel->altSecurityToken.revisedLifetime == 0)
         channel->altSecurityToken.revisedLifetime = server->config.maxSecurityTokenLifetime;
 
-    /* Replace the nonces */
+    /* Set the nonces. The remote nonce will be "rotated in" when it is first used. */
     UA_ByteString_clear(&channel->remoteNonce);
-    UA_StatusCode retval = UA_ByteString_copy(&request->clientNonce, &channel->remoteNonce);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    channel->remoteNonce = request->clientNonce;
+    UA_ByteString_init(&request->clientNonce);
 
-    retval = UA_SecureChannel_generateLocalNonce(channel);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    response->responseHeader.serviceResult = UA_SecureChannel_generateLocalNonce(channel);
+    UA_CHECK_STATUS(response->responseHeader.serviceResult, goto error);
+
+    /* Update the channel state */
+    channel->renewState = UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER;
+    channel->state = UA_SECURECHANNELSTATE_OPEN;
 
     /* Set the response */
     response->securityToken = channel->altSecurityToken;
-    response->securityToken.createdAt = UA_DateTime_now(); /* Only for sending */
+    response->securityToken.createdAt = UA_DateTime_now(); /* only for sending */
     response->responseHeader.timestamp = response->securityToken.createdAt;
     response->responseHeader.requestHandle = request->requestHeader.requestHandle;
-    retval = UA_ByteString_copy(&channel->localNonce, &response->serverNonce);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-
-    channel->renewState = UA_SECURECHANNELRENEWSTATE_NEWTOKEN_SERVER;
-    return UA_STATUSCODE_GOOD;
-}
-
-void
-Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
-                          const UA_OpenSecureChannelRequest *request,
-                          UA_OpenSecureChannelResponse *response) {
-    switch(request->requestType) {
-        /* Open the channel */
-    case UA_SECURITYTOKENREQUESTTYPE_ISSUE:
-        response->responseHeader.serviceResult =
-            UA_SecureChannelManager_open(server, channel, request, response);
-        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
-                                "Opening a SecureChannel failed");
-            return;
-        }
+    response->responseHeader.serviceResult =
+        UA_ByteString_copy(&channel->localNonce, &response->serverNonce);
+    UA_CHECK_STATUS(response->responseHeader.serviceResult, goto error);
 
+    /* Success */
+    if(request->requestType == UA_SECURITYTOKENREQUESTTYPE_ISSUE) {
         UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
                             "SecureChannel opened with SecurityPolicy %.*s "
                             "and a revised lifetime of %.2fs",
                             (int)channel->securityPolicy->policyUri.length,
                             channel->securityPolicy->policyUri.data,
                             (UA_Float)response->securityToken.revisedLifetime / 1000);
-        break;
-
-        /* Renew the channel */
-    case UA_SECURITYTOKENREQUESTTYPE_RENEW:
-        response->responseHeader.serviceResult =
-            UA_SecureChannelManager_renew(server, channel, request, response);
-        if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-            UA_LOG_DEBUG_CHANNEL(&server->config.logger, channel,
-                                 "Renewing SecureChannel failed");
-            return;
-        }
-
+    } else {
         UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel renewed "
                             "with a revised lifetime of %.2fs",
                             (UA_Float)response->securityToken.revisedLifetime / 1000);
-        break;
+    }
 
-        /* Unknown request type */
-    default:
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
-        break;
+    return;
+
+ error:
+    if(request->requestType == UA_SECURITYTOKENREQUESTTYPE_ISSUE) {
+        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+                            "Opening a SecureChannel failed");
+    } else {
+        UA_LOG_DEBUG_CHANNEL(&server->config.logger, channel,
+                             "Renewing SecureChannel failed");
     }
 }
 

From e71c8a4973820bdec58ff25ea6cef782e4249a4a Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Fri, 13 Oct 2023 13:42:54 +0200
Subject: [PATCH 1214/1963] fix(core): Include limits.h for PATH_MAX

---
 plugins/crypto/openssl/ua_pki_openssl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 1b46896ecb3..66db26afef1 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -21,6 +21,8 @@
 #include "ua_openssl_version_abstraction.h"
 #include "libc_time.h"
 
+#include <limits.h>
+
 /* Find binary substring. Taken and adjusted from
  * http://tungchingkai.blogspot.com/2011/07/binary-strstr.html */
 

From 569bbd8c1784cc3462bcf447a13c7ae4693cf79e Mon Sep 17 00:00:00 2001
From: panicgh <79252025+panicgh@users.noreply.github.com>
Date: Wed, 18 Oct 2023 20:30:59 +0000
Subject: [PATCH 1215/1963] refactor(build): Export amalgamation flag (#6067)

While a UA_ENABLE_AMALGAMATION macro is defined in the amalgamated
open62541.h file and undefined in the non-amalgamated open62541/config.h
file, it is not usable in downstream projects as they would need a
priori knowledge which of the header files to include.
They may try a test compilation in their build system's configure phase
with one of the headers and set UA_ENABLE_AMALGAMATION if amalgamation
is detected. However, this causes some code duplication in each
downstream project.

Exporting the flag in the pkg-config file enables downstream projects to
check for the open62541 dependency as usual and automatically get the
necessary flag.
---
 CMakeLists.txt        | 3 +++
 tools/open62541.pc.in | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14e4c406b20..ef3bd5b6d18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -732,6 +732,9 @@ file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/src_generated")
 configure_file(include/open62541/config.h.in ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h)
 
 # Generate a .pc file for pkg-config
+if(UA_ENABLE_AMALGAMATION)
+    set(PC_EXTRA_CFLAGS "-DUA_ENABLE_AMALGAMATION")
+endif()
 configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open62541.pc @ONLY)
 
 if(UA_ENABLE_DISCOVERY_MULTICAST)
diff --git a/tools/open62541.pc.in b/tools/open62541.pc.in
index 6e4613ebb79..a041c2dd945 100644
--- a/tools/open62541.pc.in
+++ b/tools/open62541.pc.in
@@ -10,4 +10,4 @@ Name: open62541
 Description: open62541 is an open source C (C99) implementation of OPC UA
 Version: @OPEN62541_VER_MAJOR@.@OPEN62541_VER_MINOR@.@OPEN62541_VER_PATCH@@OPEN62541_VER_LABEL@
 Libs: -L${libdir} -lopen62541
-Cflags: -I${includedir}
+Cflags: -I${includedir} @PC_EXTRA_CFLAGS@

From a290b4b22027b11b439e2ca91b8bcf378f5dbc1c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 Oct 2023 10:49:05 +0200
Subject: [PATCH 1216/1963] refactor(examples): Match max sessions in
 server_ctt with the CTT XML config

---
 examples/server_ctt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 82e55454e63..075e2dee2fc 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1357,7 +1357,7 @@ int main(int argc, char **argv) {
 
     /* Limit the number of SecureChannels and Sessions */
     config->maxSecureChannels = 40;
-    config->maxSessions = 50;
+    config->maxSessions = 10;
 
     /* Revolve the SecureChannel token every 300 seconds */
     config->maxSecurityTokenLifetime = 300000;

From 57659c7e32c02676f6f3dd6e748f94bdb1379158 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 15 Aug 2023 23:03:21 +0200
Subject: [PATCH 1217/1963] refactor(server): Small cosmetic fixes in
 ua_services_subscription.c

---
 src/server/ua_services_subscription.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index b5ad64cdc8d..4e652dcce83 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -82,7 +82,7 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
     }
 
     /* Create the subscription */
-    UA_Subscription *sub= UA_Subscription_new();
+    UA_Subscription *sub = UA_Subscription_new();
     if(!sub) {
         UA_LOG_DEBUG_SESSION(&server->config.logger, session,
                              "Processing CreateSubscriptionRequest failed");
@@ -138,7 +138,8 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
                              "Subscription created (Publishing interval %.2fms, "
                              "max %lu notifications per publish)",
                              sub->publishingInterval,
-                             (long unsigned)sub->notificationsPerPublish);}
+                             (long unsigned)sub->notificationsPerPublish);
+}
 
 void
 Service_ModifySubscription(UA_Server *server, UA_Session *session,
@@ -170,9 +171,10 @@ Service_ModifySubscription(UA_Server *server, UA_Session *session,
     /* Change the repeated callback to the new interval. This cannot fail as the
      * CallbackId must exist. */
     if(sub->publishCallbackId > 0 &&
-       sub->publishingInterval != oldPublishingInterval)
+       sub->publishingInterval != oldPublishingInterval) {
         changeRepeatedCallbackInterval(server, sub->publishCallbackId,
                                        sub->publishingInterval);
+    }
 
     /* If the priority has changed, re-enter the subscription to the
      * priority-ordered queue in the session. */

From e3fbcd5f5bc8218be64a1c4ef78fea44d9ce7ef7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 15 Aug 2023 23:06:21 +0200
Subject: [PATCH 1218/1963] fix(server): Reset the cyclic callback of a
 subscription after publishing on a late Subscription

The CTT expect the base-time reset after publishing on a late Subscription.
And that makes sense as we don't want the next "scheduled" publish just after we sent a response when the Subscription was still late.
---
 src/server/ua_services_subscription.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 4e652dcce83..9ffd6fd935c 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -346,6 +346,12 @@ Service_Publish(UA_Server *server, UA_Session *session,
                 TAILQ_INSERT_BEFORE(after, late, sessionListEntry);
             else
                 TAILQ_INSERT_TAIL(&session->subscriptions, late, sessionListEntry);
+
+            /* After publishing a late subscription (which only happens from here), reset
+             * the cyclic callback to use the current time as the new basetime.
+             * The publishing interval stays the same. */
+            changeRepeatedCallbackInterval(server, late->publishCallbackId,
+                                           late->publishingInterval);
         }
 
         /* In case of an error we might not have used the publish request that

From 25d5622ad26bb18a9cd0f7ae85368df0d1fc1a05 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 16 Aug 2023 13:53:57 +0200
Subject: [PATCH 1219/1963] refactor(server): Simplify publish logic

---
 src/server/ua_subscription.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index cbb1233b2b6..b2126679a6e 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -466,7 +466,6 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
             if(pre->maxTime < nowMonotonic) {
                 UA_LOG_DEBUG_SESSION(&server->config.logger, sub->session,
                                      "Publish request %u has timed out", pre->requestId);
-
                 pre->response.responseHeader.serviceResult = UA_STATUSCODE_BADTIMEOUT;
                 sendResponse(server, sub->session, sub->session->header.channel,
                              pre->requestId, (UA_Response *)&pre->response,
@@ -634,9 +633,10 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
     sub->currentKeepAliveCount = 0;
 
     /* Free the response */
-    if(retransmission)
+    if(retransmission) {
         /* NotificationMessage was moved into retransmission queue */
         UA_NotificationMessage_init(&response->notificationMessage);
+    }
     response->availableSequenceNumbers = NULL;
     response->availableSequenceNumbersSize = 0;
     UA_PublishResponse_clear(&pre->response);
@@ -749,28 +749,18 @@ Subscription_registerPublishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
                               "Register subscription publishing callback");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
     if(sub->publishCallbackId > 0)
         return UA_STATUSCODE_GOOD;
-
-    UA_StatusCode retval =
-        addRepeatedCallback(server, (UA_ServerCallback)repeatedPublishCallback,
-                            sub, sub->publishingInterval, &sub->publishCallbackId);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-
-    UA_assert(sub->publishCallbackId > 0);
-    return UA_STATUSCODE_GOOD;
+    return addRepeatedCallback(server, (UA_ServerCallback)repeatedPublishCallback,
+                               sub, sub->publishingInterval, &sub->publishCallbackId);
 }
 
 void
 Subscription_unregisterPublishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
                               "Unregister subscription publishing callback");
-
     if(sub->publishCallbackId == 0)
         return;
-
     removeCallback(server, sub->publishCallbackId);
     sub->publishCallbackId = 0;
 }

From a9c0e3826610005311eb200a15a65fb5b9d1e7ff Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 16 Aug 2023 14:14:23 +0200
Subject: [PATCH 1220/1963] refactor(examples): Use internal interrupts in
 server_pubsub_publisher_rt_level.c

---
 .../pubsub/server_pubsub_publisher_rt_level.c | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/examples/pubsub/server_pubsub_publisher_rt_level.c b/examples/pubsub/server_pubsub_publisher_rt_level.c
index aedd27f8a3f..8f5fa1f8654 100644
--- a/examples/pubsub/server_pubsub_publisher_rt_level.c
+++ b/examples/pubsub/server_pubsub_publisher_rt_level.c
@@ -6,13 +6,11 @@
 #include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
 
-#include <signal.h>
 #include <stdlib.h>
 
 /* possible options: PUBSUB_CONFIG_FASTPATH_NONE, PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS, PUBSUB_CONFIG_FASTPATH_STATIC_VALUES */
 #define PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS
 #define PUBSUB_CONFIG_PUBLISH_CYCLE_MS 100
-#define PUBSUB_CONFIG_PUBLISH_CYCLES 1000000
 #define PUBSUB_CONFIG_FIELD_COUNT 10
 
 /**
@@ -30,16 +28,9 @@
  * freeze, the NetworkMessages and DataSetMessages will be calculated and buffered. During the publish cycle these buffers will only be updated.
  */
 
-
 UA_NodeId publishedDataSetIdent, dataSetFieldIdent, writerGroupIdent, connectionIdentifier;
 UA_UInt32 valueStore[PUBSUB_CONFIG_FIELD_COUNT];
 
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 /* The following PubSub configuration does not differ from the 'normal' configuration */
 static void
 addMinimalPubSubConfiguration(UA_Server * server){
@@ -68,8 +59,6 @@ valueUpdateCallback(UA_Server *server, void *data) {
 #if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
     for(int i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; ++i)
         valueStore[i] = valueStore[i] + 1;
-    if(valueStore[0] > PUBSUB_CONFIG_PUBLISH_CYCLES)
-        running = false;
 #endif
 #if defined PUBSUB_CONFIG_FASTPATH_NONE
     for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++){
@@ -85,17 +74,12 @@ valueUpdateCallback(UA_Server *server, void *data) {
             UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Failed to update publish value. Node number: %zu", i);
             continue;
         }
-        if(i == 0 && *intValue  > PUBSUB_CONFIG_PUBLISH_CYCLES)
-            running = false;
         UA_Variant_clear(&value);
     }
 #endif
 }
 
 int main(void) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
@@ -186,6 +170,7 @@ int main(void) {
         UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent);
     }
 #endif
+
     /* The PubSub configuration is currently editable and the publish callback is not running */
     writerGroupConfig.publishingInterval = PUBSUB_CONFIG_PUBLISH_CYCLE_MS;
     UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
@@ -197,8 +182,7 @@ int main(void) {
     UA_UInt64 callbackId;
     UA_Server_addRepeatedCallback(server, valueUpdateCallback, NULL, PUBSUB_CONFIG_PUBLISH_CYCLE_MS, &callbackId);
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval |= UA_Server_run(server, &running);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_delete(server);
 

From 830923d08cd8c561786ea27b9c00f461056320f1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 17 Oct 2023 23:05:19 +0200
Subject: [PATCH 1221/1963] refactor(server): Add an explicit subscription
 state for "currently being removed"

---
 src/server/ua_services_subscription.c | 11 +++++++----
 src/server/ua_subscription.c          |  2 ++
 src/server/ua_subscription.h          |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 9ffd6fd935c..2b4ddfe0bd3 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -334,8 +334,8 @@ Service_Publish(UA_Server *server, UA_Session *session,
                                   "Send PublishResponse on a late subscription");
         UA_Subscription_publish(server, late);
 
-        /* Skip re-insert if the subscription was deleted during publishOnce */
-        if(late->session) {
+        /* Skip re-insert if the subscription was deleted during _publish */
+        if(late->state != UA_SUBSCRIPTIONSTATE_REMOVING) {
             /* Find the first element with smaller priority and insert before
              * that. If there is none, insert at the end of the queue. */
             UA_Subscription *after = TAILQ_NEXT(late, sessionListEntry);
@@ -354,11 +354,14 @@ Service_Publish(UA_Server *server, UA_Session *session,
                                            late->publishingInterval);
         }
 
+        /* The enqueued request was used for a late subscription. Nothing more
+         * we can do? */
+        if(session->responseQueueSize == 0)
+            break;
+
         /* In case of an error we might not have used the publish request that
          * was just enqueued. Continue to find late subscriptions in that
          * case. */
-        if(session->responseQueueSize == 0)
-            break;
     }
 
     return UA_STATUSCODE_GOOD;
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index b2126679a6e..cc90518b203 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -62,6 +62,8 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
         sub->delayedCallbackRegistered = false;
     }
 
+    sub->state = UA_SUBSCRIPTIONSTATE_REMOVING;
+
     /* Remove the diagnostics object for the subscription */
 #ifdef UA_ENABLE_DIAGNOSTICS
     if(sub->session) {
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 081738b91fc..9d39f51c35e 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -230,7 +230,8 @@ typedef enum {
     /* UA_SUBSCRIPTIONSTATE_CREATING */
     UA_SUBSCRIPTIONSTATE_NORMAL,
     UA_SUBSCRIPTIONSTATE_LATE,
-    UA_SUBSCRIPTIONSTATE_KEEPALIVE
+    UA_SUBSCRIPTIONSTATE_KEEPALIVE,
+    UA_SUBSCRIPTIONSTATE_REMOVING
 } UA_SubscriptionState;
 
 /* Subscriptions are managed in a server-wide linked list. If they are attached

From c70356c18443d713085a9ce5057ce2dc6eeadc11 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 17 Oct 2023 23:26:19 +0200
Subject: [PATCH 1222/1963] refactor(server): Simplify the Subscription state
 machine to a single enum

---
 src/server/ua_server_ns0_diagnostics.c |  2 +-
 src/server/ua_services_subscription.c  | 38 ++++++++--------------
 src/server/ua_subscription.c           | 45 +++++++++++++++++++-------
 src/server/ua_subscription.h           | 12 +++----
 4 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index c79db8609ac..63f34d77ad6 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -34,7 +34,7 @@ fillSubscriptionDiagnostics(UA_Subscription *sub,
     diag->maxKeepAliveCount = sub->maxKeepAliveCount;
     diag->maxLifetimeCount = sub->lifeTimeCount;
     diag->maxNotificationsPerPublish = sub->notificationsPerPublish;
-    diag->publishingEnabled = sub->publishingEnabled;
+    diag->publishingEnabled = (sub->state >= UA_SUBSCRIPTIONSTATE_NORMAL);
     diag->modifyCount = sub->modifyCount;
     diag->enableCount = sub->enableCount;
     diag->disableCount = sub->disableCount;
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 2b4ddfe0bd3..b7cc6aeeb2c 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -22,21 +22,6 @@
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS /* conditional compilation */
 
-static void
-setPublishingEnabled(UA_Subscription *sub, UA_Boolean publishingEnabled) {
-    if(sub->publishingEnabled == publishingEnabled)
-        return;
-
-    sub->publishingEnabled = publishingEnabled;
-
-#ifdef UA_ENABLE_DIAGNOSTICS
-    if(publishingEnabled)
-        sub->enableCount++;
-    else
-        sub->disableCount++;
-#endif
-}
-
 static void
 setSubscriptionSettings(UA_Server *server, UA_Subscription *subscription,
                         UA_Double requestedPublishingInterval,
@@ -95,14 +80,15 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
                             request->requestedLifetimeCount,
                             request->requestedMaxKeepAliveCount,
                             request->maxNotificationsPerPublish, request->priority);
-    setPublishingEnabled(sub, request->publishingEnabled);
     sub->currentKeepAliveCount = sub->maxKeepAliveCount; /* set settings first */
+    sub->subscriptionId = ++server->lastSubscriptionId;  /* Assign the SubscriptionId */
 
-    /* Assign the SubscriptionId */
-    sub->subscriptionId = ++server->lastSubscriptionId;
-
-    /* Register the cyclic callback */
-    UA_StatusCode retval = Subscription_registerPublishCallback(server, sub);
+    /* Set the state, this also registers the callback */
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    if(request->publishingEnabled)
+        retval = Subscription_enable(server, sub);
+    else
+        Subscription_disable(server, sub);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_DEBUG_SESSION(&server->config.logger, sub->session,
                              "Subscription %" PRIu32 " | "
@@ -206,7 +192,11 @@ Operation_SetPublishingMode(UA_Server *server, UA_Session *session,
         return;
     }
 
-    setPublishingEnabled(sub, *publishingEnabled); /* Set the publishing mode */
+    /* Enable/disable */
+    if(*publishingEnabled)
+        *result = Subscription_enable(server, sub);
+    else
+        Subscription_disable(server, sub);
 
     /* Reset the lifetime counter */
     Subscription_resetLifetime(sub);
@@ -541,8 +531,8 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
      * that all backpointers are set correctly. */
     memcpy(newSub, sub, sizeof(UA_Subscription));
 
-    /* Register cyclic publish callback */
-    result->statusCode = Subscription_registerPublishCallback(server, newSub);
+    /* Enable / Register cyclic publish callback */
+    result->statusCode = Subscription_enable(server, newSub);
     if(result->statusCode != UA_STATUSCODE_GOOD) {
         UA_Array_delete(result->availableSequenceNumbers,
                         sub->retransmissionQueueSize, &UA_TYPES[UA_TYPES_UINT32]);
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index cc90518b203..526f0caa1bf 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -33,7 +33,7 @@ UA_Subscription_new(void) {
         return NULL;
 
     /* The first publish response is sent immediately */
-    newSub->state = UA_SUBSCRIPTIONSTATE_NORMAL;
+    newSub->state = UA_SUBSCRIPTIONSTATE_DISABLED;
 
     /* Even if the first publish response is a keepalive the sequence number is 1.
      * This can happen by a subscription without a monitored item (see CTT test scripts). */
@@ -56,7 +56,7 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     UA_EventLoop *el = server->config.eventLoop;
 
     /* Unregister the publish callback and possible delayed callback */
-    Subscription_unregisterPublishCallback(server, sub);
+    Subscription_disable(server, sub);
     if(sub->delayedCallbackRegistered) {
         el->removeDelayedCallback(el, &sub->delayedMoreNotifications);
         sub->delayedCallbackRegistered = false;
@@ -502,7 +502,8 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
     }
 
     /* Count the available notifications */
-    UA_UInt32 notifications = (sub->publishingEnabled) ? sub->notificationQueueSize : 0;
+    UA_UInt32 notifications = (sub->state >= UA_SUBSCRIPTIONSTATE_NORMAL) ?
+        sub->notificationQueueSize : 0;
     if(notifications > sub->notificationsPerPublish)
         notifications = sub->notificationsPerPublish;
 
@@ -747,24 +748,44 @@ repeatedPublishCallback(UA_Server *server, UA_Subscription *sub) {
 }
 
 UA_StatusCode
-Subscription_registerPublishCallback(UA_Server *server, UA_Subscription *sub) {
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
-                              "Register subscription publishing callback");
+Subscription_enable(UA_Server *server, UA_Subscription *sub) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    if(sub->publishCallbackId > 0)
+    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+                              "Enable Subscription");
+
+    /* Already enabled? */
+    if(sub->state >= UA_SUBSCRIPTIONSTATE_NORMAL)
         return UA_STATUSCODE_GOOD;
-    return addRepeatedCallback(server, (UA_ServerCallback)repeatedPublishCallback,
-                               sub, sub->publishingInterval, &sub->publishCallbackId);
+
+    UA_StatusCode res =
+        addRepeatedCallback(server, (UA_ServerCallback)repeatedPublishCallback,
+                            sub, sub->publishingInterval, &sub->publishCallbackId);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+
+    sub->state = UA_SUBSCRIPTIONSTATE_NORMAL;
+#ifdef UA_ENABLE_DIAGNOSTICS
+    sub->enableCount++;
+#endif
+    return UA_STATUSCODE_GOOD;
 }
 
 void
-Subscription_unregisterPublishCallback(UA_Server *server, UA_Subscription *sub) {
+Subscription_disable(UA_Server *server, UA_Subscription *sub) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
-                              "Unregister subscription publishing callback");
-    if(sub->publishCallbackId == 0)
+                              "Disable Subscription");
+
+    /* Alreadu disabled? */
+    if(sub->state < UA_SUBSCRIPTIONSTATE_NORMAL)
         return;
+
     removeCallback(server, sub->publishCallbackId);
     sub->publishCallbackId = 0;
+    sub->state = UA_SUBSCRIPTIONSTATE_DISABLED;
+#ifdef UA_ENABLE_DIAGNOSTICS
+    sub->disableCount++;
+#endif
 }
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 9d39f51c35e..ed9a3ae4758 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -226,12 +226,11 @@ UA_MonitoredItem_ensureQueueSpace(UA_Server *server, UA_MonitoredItem *mon);
 
 /* We use only a subset of the states defined in the standard */
 typedef enum {
-    /* UA_SUBSCRIPTIONSTATE_CLOSED */
-    /* UA_SUBSCRIPTIONSTATE_CREATING */
+    UA_SUBSCRIPTIONSTATE_DISABLED,
+    UA_SUBSCRIPTIONSTATE_REMOVING,
     UA_SUBSCRIPTIONSTATE_NORMAL,
     UA_SUBSCRIPTIONSTATE_LATE,
     UA_SUBSCRIPTIONSTATE_KEEPALIVE,
-    UA_SUBSCRIPTIONSTATE_REMOVING
 } UA_SubscriptionState;
 
 /* Subscriptions are managed in a server-wide linked list. If they are attached
@@ -253,7 +252,6 @@ struct UA_Subscription {
     UA_UInt32 maxKeepAliveCount;
     UA_Double publishingInterval; /* in ms */
     UA_UInt32 notificationsPerPublish;
-    UA_Boolean publishingEnabled;
     UA_Byte priority;
 
     /* Runtime information */
@@ -319,12 +317,10 @@ void
 UA_Subscription_delete(UA_Server *server, UA_Subscription *sub);
 
 UA_StatusCode
-Subscription_registerPublishCallback(UA_Server *server,
-                                     UA_Subscription *sub);
+Subscription_enable(UA_Server *server, UA_Subscription *sub);
 
 void
-Subscription_unregisterPublishCallback(UA_Server *server,
-                                       UA_Subscription *sub);
+Subscription_disable(UA_Server *server, UA_Subscription *sub);
 
 void
 Subscription_resetLifetime(UA_Subscription *sub);

From 9b759bbfb7a9d267ac097c1542ff387a7553a79f Mon Sep 17 00:00:00 2001
From: Ignacio Rostagno <ignaciorostagno@hotmail.com>
Date: Thu, 19 Oct 2023 21:50:54 -0300
Subject: [PATCH 1223/1963] fix(server): fix zero sampling interval handling

---
 src/server/ua_services_monitoreditem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 5814c75649e..e7c0bc59d55 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -249,7 +249,7 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
                 params->samplingInterval = -1.0;
             }
         }
-    } else {
+    } else if(params->samplingInterval > 0.0) {
         /* Adjust positive sampling interval to lie within the limits */
         UA_BOUNDEDVALUE_SETWBOUNDS(server->config.samplingIntervalLimits,
                                    params->samplingInterval, params->samplingInterval);

From c2c051970da0bfeab1a8d424838134867a1c6290 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 Oct 2023 14:44:12 +0200
Subject: [PATCH 1224/1963] refactor(server): Simplify Service_Publish

---
 src/server/ua_services_subscription.c | 56 ++++++++++++---------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index b7cc6aeeb2c..ab11e679e4f 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -304,12 +304,6 @@ Service_Publish(UA_Server *server, UA_Session *session,
     UA_Session_queuePublishReq(session, entry, false);
     UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Queued a publication message");
 
-    /* If we still had publish requests in the queue, none of the subscriptions
-     * is late. So we don't have to search for one. */
-    if(session->responseQueueSize > 1) {
-        return UA_STATUSCODE_GOOD;
-    }
-
     /* If there are late subscriptions, the new publish request is used to
      * answer them immediately. Late subscriptions with higher priority are
      * considered earlier. However, a single subscription that generates many
@@ -317,41 +311,39 @@ Service_Publish(UA_Server *server, UA_Session *session,
      * it to the end of the queue for the subscriptions of that priority. */
     UA_Subscription *late, *late_tmp;
     TAILQ_FOREACH_SAFE(late, &session->subscriptions, sessionListEntry, late_tmp) {
+        /* Responses left in the queue? */
+        if(session->responseQueueSize == 0)
+            break;
+
+        /* Skip any non-late subscription */
         if(late->state != UA_SUBSCRIPTIONSTATE_LATE)
             continue;
 
+        /* Call publish on the late subscription */
         UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, late,
                                   "Send PublishResponse on a late subscription");
         UA_Subscription_publish(server, late);
 
         /* Skip re-insert if the subscription was deleted during _publish */
-        if(late->state != UA_SUBSCRIPTIONSTATE_REMOVING) {
-            /* Find the first element with smaller priority and insert before
-             * that. If there is none, insert at the end of the queue. */
-            UA_Subscription *after = TAILQ_NEXT(late, sessionListEntry);
-            while(after && after->priority >= late->priority)
-                after = TAILQ_NEXT(after, sessionListEntry);
-            TAILQ_REMOVE(&session->subscriptions, late, sessionListEntry);
-            if(after)
-                TAILQ_INSERT_BEFORE(after, late, sessionListEntry);
-            else
-                TAILQ_INSERT_TAIL(&session->subscriptions, late, sessionListEntry);
-
-            /* After publishing a late subscription (which only happens from here), reset
-             * the cyclic callback to use the current time as the new basetime.
-             * The publishing interval stays the same. */
-            changeRepeatedCallbackInterval(server, late->publishCallbackId,
-                                           late->publishingInterval);
-        }
-
-        /* The enqueued request was used for a late subscription. Nothing more
-         * we can do? */
-        if(session->responseQueueSize == 0)
-            break;
+        if(late->state == UA_SUBSCRIPTIONSTATE_REMOVING)
+            continue;
 
-        /* In case of an error we might not have used the publish request that
-         * was just enqueued. Continue to find late subscriptions in that
-         * case. */
+        /* Find the first element with smaller priority and insert before
+         * that. If there is none, insert at the end of the queue. */
+        UA_Subscription *after = TAILQ_NEXT(late, sessionListEntry);
+        while(after && after->priority >= late->priority)
+            after = TAILQ_NEXT(after, sessionListEntry);
+        TAILQ_REMOVE(&session->subscriptions, late, sessionListEntry);
+        if(after)
+            TAILQ_INSERT_BEFORE(after, late, sessionListEntry);
+        else
+            TAILQ_INSERT_TAIL(&session->subscriptions, late, sessionListEntry);
+
+        /* After publishing on a late subscription (which only happens from
+         * here), reset the cyclic callback to use the current time as the new
+         * basetime. The publishing interval stays the same. */
+        changeRepeatedCallbackInterval(server, late->publishCallbackId,
+                                       late->publishingInterval);
     }
 
     return UA_STATUSCODE_GOOD;

From bdbc736ef24b980d7a2e3bf754c68255fecf7351 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 Oct 2023 14:49:37 +0200
Subject: [PATCH 1225/1963] refactor(server): Remove unused
 UA_SubscriptionState

---
 src/server/ua_subscription.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index ed9a3ae4758..c696c0d6085 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -229,8 +229,7 @@ typedef enum {
     UA_SUBSCRIPTIONSTATE_DISABLED,
     UA_SUBSCRIPTIONSTATE_REMOVING,
     UA_SUBSCRIPTIONSTATE_NORMAL,
-    UA_SUBSCRIPTIONSTATE_LATE,
-    UA_SUBSCRIPTIONSTATE_KEEPALIVE,
+    UA_SUBSCRIPTIONSTATE_LATE
 } UA_SubscriptionState;
 
 /* Subscriptions are managed in a server-wide linked list. If they are attached

From a1d07763b2f5fd9e03b18e6b0147fda211c4b69e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 Oct 2023 14:58:57 +0200
Subject: [PATCH 1226/1963] refactor(server): Don't reset Subscription basetime
 if deactivated

---
 src/server/ua_services_subscription.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index ab11e679e4f..562be652848 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -324,8 +324,9 @@ Service_Publish(UA_Server *server, UA_Session *session,
                                   "Send PublishResponse on a late subscription");
         UA_Subscription_publish(server, late);
 
-        /* Skip re-insert if the subscription was deleted during _publish */
-        if(late->state == UA_SUBSCRIPTIONSTATE_REMOVING)
+        /* Skip re-insert if the subscription was deleted or deactivated during
+         * _publish */
+        if(late->state <= UA_SUBSCRIPTIONSTATE_REMOVING)
             continue;
 
         /* Find the first element with smaller priority and insert before

From d351ae7217a72745b3733cc94d5f30fc840fea83 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 Oct 2023 17:13:31 +0200
Subject: [PATCH 1227/1963] feat(deps): Return the removed element (if found)
 in ZIP_REMOVE

---
 deps/ziptree.c |  7 ++++---
 deps/ziptree.h | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/deps/ziptree.c b/deps/ziptree.c
index 24668c9d20a..09655d10e79 100644
--- a/deps/ziptree.c
+++ b/deps/ziptree.c
@@ -166,14 +166,14 @@ __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
     }
 }
 
-void
+void *
 __ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
              unsigned short keyoffset, void *elm) {
     zip_head *head = (zip_head*)h;
     zip_elem *x = (zip_elem*)elm;
     zip_elem *cur = head->root;
     if(!cur)
-        return;
+        return NULL;
 
     const void *x_key = ZIP_KEY_PTR(x);
     zip_elem **prev_edge = &head->root;
@@ -183,12 +183,13 @@ __ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
             &ZIP_ENTRY_PTR(cur)->left : &ZIP_ENTRY_PTR(cur)->right;
         cur = *prev_edge;
         if(!cur)
-            return;
+            return NULL;
         cur_order = __ZIP_UNIQUE_CMP(cmp, x_key, ZIP_KEY_PTR(cur));
     }
     *prev_edge = (zip_elem*)__ZIP_ZIP(fieldoffset,
                                       ZIP_ENTRY_PTR(cur)->left,
                                       ZIP_ENTRY_PTR(cur)->right);
+    return cur;
 }
 
 void *
diff --git a/deps/ziptree.h b/deps/ziptree.h
index 53e89f5a978..874121bf9bb 100644
--- a/deps/ziptree.h
+++ b/deps/ziptree.h
@@ -100,10 +100,12 @@ name##_ZIP_INSERT(struct name *head, struct type *el) {                 \
                  offsetof(struct type, keyfield), el);                  \
 }                                                                       \
                                                                         \
-ZIP_UNUSED static ZIP_INLINE void                                       \
+ZIP_UNUSED static ZIP_INLINE struct type *                              \
 name##_ZIP_REMOVE(struct name *head, struct type *elm) {                \
-    __ZIP_REMOVE(head, (zip_cmp_cb)cmp, offsetof(struct type, field),   \
-                 offsetof(struct type, keyfield), elm);                 \
+    return (struct type*)                                               \
+        __ZIP_REMOVE(head, (zip_cmp_cb)cmp,                             \
+                     offsetof(struct type, field),                      \
+                     offsetof(struct type, keyfield), elm);             \
 }                                                                       \
                                                                         \
 ZIP_UNUSED static ZIP_INLINE struct type *                              \
@@ -179,7 +181,7 @@ void
 __ZIP_INSERT(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
              unsigned short keyoffset, void *elm);
 
-void
+void *
 __ZIP_REMOVE(void *h, zip_cmp_cb cmp, unsigned short fieldoffset,
              unsigned short keyoffset, void *elm);
 

From 102619ed1a16044aeffdda463df49b0e99cd3de1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 Oct 2023 17:20:28 +0200
Subject: [PATCH 1228/1963] refactor(deps): Better documentation in ziptree.h

---
 deps/ziptree.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/deps/ziptree.h b/deps/ziptree.h
index 874121bf9bb..c26f21839af 100644
--- a/deps/ziptree.h
+++ b/deps/ziptree.h
@@ -70,10 +70,15 @@ typedef enum ZIP_CMP (*zip_cmp_cb)(const void *key1, const void *key2);
 #define ZIP_LEFT(elm, field) (elm)->field.left
 #define ZIP_RIGHT(elm, field) (elm)->field.right
 #define ZIP_INSERT(name, head, elm) name##_ZIP_INSERT(head, elm)
-#define ZIP_REMOVE(name, head, elm) name##_ZIP_REMOVE(head, elm)
 #define ZIP_FIND(name, head, key) name##_ZIP_FIND(head, key)
 #define ZIP_MIN(name, head) name##_ZIP_MIN(head)
 #define ZIP_MAX(name, head) name##_ZIP_MAX(head)
+
+/* Returns the element if it was found in the tree. Returns NULL otherwise. */
+#define ZIP_REMOVE(name, head, elm) name##_ZIP_REMOVE(head, elm)
+
+/* Split (_UNZIP) and merge (_ZIP) trees. _UNZIP splits at the key and moves
+ * elements <= into the left output (right otherwise). */
 #define ZIP_ZIP(name, left, right) name##_ZIP_ZIP(left, right)
 #define ZIP_UNZIP(name, head, key, left, right) \
     name##_ZIP_UNZIP(head, key, left, right)

From 66e6e9851539290a3c26624f075a304a77067891 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 Oct 2023 17:21:04 +0200
Subject: [PATCH 1229/1963] refactor(server): Add additional locking asserts in
 ua_server.c

---
 src/server/ua_server.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 2517281aaa9..3d492486417 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -487,6 +487,7 @@ UA_Server_addTimedCallback(UA_Server *server, UA_ServerCallback callback,
 UA_StatusCode
 addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
                     void *data, UA_Double interval_ms, UA_UInt64 *callbackId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     return server->config.eventLoop->
         addCyclicCallback(server->config.eventLoop, (UA_Callback) callback,
                           server, data, interval_ms, NULL,
@@ -506,6 +507,7 @@ UA_Server_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
 UA_StatusCode
 changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId,
                                UA_Double interval_ms) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     return server->config.eventLoop->
         modifyCyclicCallback(server->config.eventLoop, callbackId, interval_ms,
                              NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
@@ -523,6 +525,7 @@ UA_Server_changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId
 
 void
 removeCallback(UA_Server *server, UA_UInt64 callbackId) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_EventLoop *el = server->config.eventLoop;
     if(el) {
         el->removeCyclicCallback(el, callbackId);

From 7e1fbd395055785aa1b69f77bd635d685c1653ba Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 20 Oct 2023 17:21:40 +0200
Subject: [PATCH 1230/1963] fix(arch): Don't insert timer-entry in the
 timed-tree if not currently in there

This is needed when we change the interval of a cyclic callback while
currently processing it.
---
 arch/common/ua_timer.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index dbf49b732c2..549d439ac75 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -137,13 +137,17 @@ UA_Timer_changeRepeatedCallback(UA_Timer *t, UA_UInt64 callbackId,
 
     UA_LOCK(&t->timerMutex);
 
-    /* Remove from the sorted tree */
+    /* Find according to the id */
     UA_TimerEntry *te = ZIP_FIND(UA_TimerIdTree, &t->idTree, &callbackId);
     if(!te) {
         UA_UNLOCK(&t->timerMutex);
         return UA_STATUSCODE_BADNOTFOUND;
     }
-    ZIP_REMOVE(UA_TimerTree, &t->tree, te);
+
+    /* Try to remove from the time-sorted tree. If not found, then the entry is
+     * in the processTree. If that is the case, leave it there and only adjust
+     * the interval and nextTime (if the TimerPolicy uses a basetime). */
+    UA_Boolean normalTree = (ZIP_REMOVE(UA_TimerTree, &t->tree, te) != NULL);
 
     /* Compute the next time for execution. The logic is identical to the
      * creation of a new repeated callback. */
@@ -158,7 +162,9 @@ UA_Timer_changeRepeatedCallback(UA_Timer *t, UA_UInt64 callbackId,
     /* Update the remaining parameters and re-insert */
     te->interval = interval;
     te->timerPolicy = timerPolicy;
-    ZIP_INSERT(UA_TimerTree, &t->tree, te);
+
+    if(normalTree)
+        ZIP_INSERT(UA_TimerTree, &t->tree, te);
 
     UA_UNLOCK(&t->timerMutex);
     return UA_STATUSCODE_GOOD;

From 71fe28c869d7a92673319da27dc6bef5b79ed53a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 22 Oct 2023 09:23:17 +0200
Subject: [PATCH 1231/1963] fix(test): Make check_client_subscriptions.c
 time-deterministic

---
 tests/client/check_client_subscriptions.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 7a45a76d215..b9cc8f153f1 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -754,7 +754,11 @@ START_TEST(Client_subscription_keepAlive) {
     UA_UInt32 monId = monResponse.monitoredItemId;
 
     /* Ensure that the subscription is late */
+    running = false;
+    THREAD_JOIN(server_thread);
     UA_fakeSleep((UA_UInt32)(publishingInterval + 1));
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
 
     /* Manually send a publish request */
     UA_PublishRequest pr;
@@ -769,7 +773,12 @@ START_TEST(Client_subscription_keepAlive) {
     UA_PublishResponse_clear(&presponse);
     UA_PublishRequest_clear(&pr);
 
+    /* Ensure that the subscription is late */
+    running = false;
+    THREAD_JOIN(server_thread);
     UA_fakeSleep((UA_UInt32)(publishingInterval + 1));
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
 
     UA_PublishRequest_init(&pr);
     pr.subscriptionAcknowledgementsSize = 0;

From 132b056c3cc839a3d83fa0fc131065735f3110df Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 22 Oct 2023 23:43:54 +0200
Subject: [PATCH 1232/1963] fix(server): Fix warnings for SecureChannel limits

---
 src/server/ua_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 3d492486417..0ee96a0da39 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -735,7 +735,7 @@ UA_Server_run_startup(UA_Server *server) {
 
     /* Are there enough SecureChannels possible for the max number of sessions? */
     if(config->maxSecureChannels != 0 &&
-       (config->maxSessions == 0 || config->maxSessions <= config->maxSecureChannels)) {
+       (config->maxSessions == 0 || config->maxSessions >= config->maxSecureChannels)) {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
                        "Maximum SecureChannels count not enough for the "
                        "maximum Sessions count");

From 73a0494b65fbb54ccb912bfcf3984eae6869374e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 22 Oct 2023 23:47:08 +0200
Subject: [PATCH 1233/1963] refactor(server): Store Subscription late-ness in
 dedicated Boolean flag

---
 src/server/ua_server_ns0_diagnostics.c |   2 +-
 src/server/ua_services_subscription.c  | 101 +++++++++++--------------
 src/server/ua_subscription.c           |  87 +++++++++------------
 src/server/ua_subscription.h           |  13 ++--
 4 files changed, 86 insertions(+), 117 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 63f34d77ad6..34122078695 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -34,7 +34,7 @@ fillSubscriptionDiagnostics(UA_Subscription *sub,
     diag->maxKeepAliveCount = sub->maxKeepAliveCount;
     diag->maxLifetimeCount = sub->lifeTimeCount;
     diag->maxNotificationsPerPublish = sub->notificationsPerPublish;
-    diag->publishingEnabled = (sub->state >= UA_SUBSCRIPTIONSTATE_NORMAL);
+    diag->publishingEnabled = (sub->state > UA_SUBSCRIPTIONSTATE_ENABLED_NOPUBLISH);
     diag->modifyCount = sub->modifyCount;
     diag->enableCount = sub->enableCount;
     diag->disableCount = sub->disableCount;
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 562be652848..ed39ec78ca9 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -80,25 +80,8 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
                             request->requestedLifetimeCount,
                             request->requestedMaxKeepAliveCount,
                             request->maxNotificationsPerPublish, request->priority);
-    sub->currentKeepAliveCount = sub->maxKeepAliveCount; /* set settings first */
     sub->subscriptionId = ++server->lastSubscriptionId;  /* Assign the SubscriptionId */
 
-    /* Set the state, this also registers the callback */
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(request->publishingEnabled)
-        retval = Subscription_enable(server, sub);
-    else
-        Subscription_disable(server, sub);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_DEBUG_SESSION(&server->config.logger, sub->session,
-                             "Subscription %" PRIu32 " | "
-                             "Could not register publish callback with error code %s",
-                             sub->subscriptionId, UA_StatusCode_name(retval));
-        response->responseHeader.serviceResult = retval;
-        UA_Subscription_delete(server, sub);
-        return;
-    }
-
     /* Register the subscription in the server */
     LIST_INSERT_HEAD(&server->subscriptions, sub, serverListEntry);
     server->subscriptionsSize++;
@@ -110,21 +93,37 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
     /* Attach the Subscription to the session */
     UA_Session_attachSubscription(session, sub);
 
-    /* Prepare the response */
-    response->subscriptionId = sub->subscriptionId;
-    response->revisedPublishingInterval = sub->publishingInterval;
-    response->revisedLifetimeCount = sub->lifeTimeCount;
-    response->revisedMaxKeepAliveCount = sub->maxKeepAliveCount;
-
+    /* Create representation in the Session object */
 #ifdef UA_ENABLE_DIAGNOSTICS
     createSubscriptionObject(server, session, sub);
 #endif
 
+    /* Set the subscription state. This also registers the callback.
+     * Note that also a disabled subscription publishes keepalives. */
+    UA_SubscriptionState sState = (request->publishingEnabled) ?
+        UA_SUBSCRIPTIONSTATE_ENABLED : UA_SUBSCRIPTIONSTATE_ENABLED_NOPUBLISH;
+    UA_StatusCode res = Subscription_setState(server, sub, sState);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_DEBUG_SESSION(&server->config.logger, sub->session,
+                             "Subscription %" PRIu32 " | Could not register "
+                             "publish callback with error code %s",
+                             sub->subscriptionId, UA_StatusCode_name(res));
+        response->responseHeader.serviceResult = res;
+        UA_Subscription_delete(server, sub);
+        return;
+    }
+
     UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, sub,
                              "Subscription created (Publishing interval %.2fms, "
                              "max %lu notifications per publish)",
                              sub->publishingInterval,
                              (long unsigned)sub->notificationsPerPublish);
+
+    /* Prepare the response */
+    response->subscriptionId = sub->subscriptionId;
+    response->revisedPublishingInterval = sub->publishingInterval;
+    response->revisedLifetimeCount = sub->lifeTimeCount;
+    response->revisedMaxKeepAliveCount = sub->maxKeepAliveCount;
 }
 
 void
@@ -193,10 +192,9 @@ Operation_SetPublishingMode(UA_Server *server, UA_Session *session,
     }
 
     /* Enable/disable */
-    if(*publishingEnabled)
-        *result = Subscription_enable(server, sub);
-    else
-        Subscription_disable(server, sub);
+    UA_SubscriptionState sState = (*publishingEnabled) ?
+        UA_SUBSCRIPTIONSTATE_ENABLED : UA_SUBSCRIPTIONSTATE_ENABLED_NOPUBLISH;
+    *result = Subscription_setState(server, sub, sState);
 
     /* Reset the lifetime counter */
     Subscription_resetLifetime(sub);
@@ -311,12 +309,8 @@ Service_Publish(UA_Server *server, UA_Session *session,
      * it to the end of the queue for the subscriptions of that priority. */
     UA_Subscription *late, *late_tmp;
     TAILQ_FOREACH_SAFE(late, &session->subscriptions, sessionListEntry, late_tmp) {
-        /* Responses left in the queue? */
-        if(session->responseQueueSize == 0)
-            break;
-
-        /* Skip any non-late subscription */
-        if(late->state != UA_SUBSCRIPTIONSTATE_LATE)
+        /* Skip non-late subscriptions */
+        if(!late->late)
             continue;
 
         /* Call publish on the late subscription */
@@ -326,25 +320,22 @@ Service_Publish(UA_Server *server, UA_Session *session,
 
         /* Skip re-insert if the subscription was deleted or deactivated during
          * _publish */
-        if(late->state <= UA_SUBSCRIPTIONSTATE_REMOVING)
-            continue;
+        if(late->state >= UA_SUBSCRIPTIONSTATE_ENABLED_NOPUBLISH) {
+            /* Find the first element with smaller priority and insert before
+             * that. If there is none, insert at the end of the queue. */
+            UA_Subscription *after = TAILQ_NEXT(late, sessionListEntry);
+            while(after && after->priority >= late->priority)
+                after = TAILQ_NEXT(after, sessionListEntry);
+            TAILQ_REMOVE(&session->subscriptions, late, sessionListEntry);
+            if(after)
+                TAILQ_INSERT_BEFORE(after, late, sessionListEntry);
+            else
+                TAILQ_INSERT_TAIL(&session->subscriptions, late, sessionListEntry);
+        }
 
-        /* Find the first element with smaller priority and insert before
-         * that. If there is none, insert at the end of the queue. */
-        UA_Subscription *after = TAILQ_NEXT(late, sessionListEntry);
-        while(after && after->priority >= late->priority)
-            after = TAILQ_NEXT(after, sessionListEntry);
-        TAILQ_REMOVE(&session->subscriptions, late, sessionListEntry);
-        if(after)
-            TAILQ_INSERT_BEFORE(after, late, sessionListEntry);
-        else
-            TAILQ_INSERT_TAIL(&session->subscriptions, late, sessionListEntry);
-
-        /* After publishing on a late subscription (which only happens from
-         * here), reset the cyclic callback to use the current time as the new
-         * basetime. The publishing interval stays the same. */
-        changeRepeatedCallbackInterval(server, late->publishCallbackId,
-                                       late->publishingInterval);
+        /* Responses left in the queue? */
+        if(session->responseQueueSize == 0)
+            break;
     }
 
     return UA_STATUSCODE_GOOD;
@@ -524,8 +515,8 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
      * that all backpointers are set correctly. */
     memcpy(newSub, sub, sizeof(UA_Subscription));
 
-    /* Enable / Register cyclic publish callback */
-    result->statusCode = Subscription_enable(server, newSub);
+    /* Set to the same state as the original subscription */
+    result->statusCode = Subscription_setState(server, newSub, sub->state);
     if(result->statusCode != UA_STATUSCODE_GOOD) {
         UA_Array_delete(result->availableSequenceNumbers,
                         sub->retransmissionQueueSize, &UA_TYPES[UA_TYPES_UINT32]);
@@ -628,10 +619,6 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     else
         sub->transferredToAltClientCount++;
 #endif
-
-    /* Immediately try to publish on the new Subscription. This might put it
-     * into the "late subscription" mode. */
-    UA_Subscription_publish(server, newSub);
 }
 
 void Service_TransferSubscriptions(UA_Server *server, UA_Session *session,
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 526f0caa1bf..a4e78be8d58 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -33,7 +33,7 @@ UA_Subscription_new(void) {
         return NULL;
 
     /* The first publish response is sent immediately */
-    newSub->state = UA_SUBSCRIPTIONSTATE_DISABLED;
+    newSub->state = UA_SUBSCRIPTIONSTATE_STOPPED;
 
     /* Even if the first publish response is a keepalive the sequence number is 1.
      * This can happen by a subscription without a monitored item (see CTT test scripts). */
@@ -56,14 +56,14 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     UA_EventLoop *el = server->config.eventLoop;
 
     /* Unregister the publish callback and possible delayed callback */
-    Subscription_disable(server, sub);
+    Subscription_setState(server, sub, UA_SUBSCRIPTIONSTATE_REMOVING);
+
+    /* Remove delayed callbacks for processing remaining notifications */
     if(sub->delayedCallbackRegistered) {
         el->removeDelayedCallback(el, &sub->delayedMoreNotifications);
         sub->delayedCallbackRegistered = false;
     }
 
-    sub->state = UA_SUBSCRIPTIONSTATE_REMOVING;
-
     /* Remove the diagnostics object for the subscription */
 #ifdef UA_ENABLE_DIAGNOSTICS
     if(sub->session) {
@@ -431,15 +431,6 @@ sendStatusChangeDelete(UA_Server *server, UA_Subscription *sub,
     UA_Subscription_delete(server, sub);
 }
 
-/* Called every time we set the subscription late (or it is still late) */
-static void
-UA_Subscription_isLate(UA_Subscription *sub) {
-    sub->state = UA_SUBSCRIPTIONSTATE_LATE;
-#ifdef UA_ENABLE_DIAGNOSTICS
-    sub->latePublishRequestCount++;
-#endif
-}
-
 static void
 delayedPublishNotifications(UA_Server *server, UA_Subscription *sub) {
     UA_LOCK(&server->serviceMutex);
@@ -501,9 +492,11 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
         return;
     }
 
-    /* Count the available notifications */
-    UA_UInt32 notifications = (sub->state >= UA_SUBSCRIPTIONSTATE_NORMAL) ?
+    /* Dsiabled subscriptions do not send notifications */
+    UA_UInt32 notifications = (sub->state == UA_SUBSCRIPTIONSTATE_ENABLED) ?
         sub->notificationQueueSize : 0;
+
+    /* Limit the number of notifications to the configured maximum */
     if(notifications > sub->notificationsPerPublish)
         notifications = sub->notificationsPerPublish;
 
@@ -525,7 +518,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
         UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
                                   "Want to send a publish response but cannot. "
                                   "The subscription is late.");
-        UA_Subscription_isLate(sub);
+        sub->late = true;
         if(pre)
             UA_Session_queuePublishReq(sub->session, pre, true); /* Re-enqueue */
         return;
@@ -551,8 +544,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
                 UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
                                             "Could not allocate memory for retransmission. "
                                             "The subscription is late.");
-
-                UA_Subscription_isLate(sub);
+                sub->late = true;
                 UA_Session_queuePublishReq(sub->session, pre, true); /* Re-enqueue */
                 return;
             }
@@ -568,7 +560,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
             /* If the retransmission queue is enabled a retransmission message is allocated */
             if(retransmission)
                 UA_free(retransmission);
-            UA_Subscription_isLate(sub);
+            sub->late = true;
             UA_Session_queuePublishReq(sub->session, pre, true); /* Re-enqueue */
             return;
         }
@@ -630,7 +622,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
      * avoid answering Publish requests out of order. As we additionally may have
      * scheduled a publish callback as a delayed callback. */
     if(sub->notificationQueueSize == 0)
-        sub->state = UA_SUBSCRIPTIONSTATE_NORMAL;
+        sub->late = false;
 
     /* Reset the KeepAlive after publishing */
     sub->currentKeepAliveCount = 0;
@@ -748,44 +740,35 @@ repeatedPublishCallback(UA_Server *server, UA_Subscription *sub) {
 }
 
 UA_StatusCode
-Subscription_enable(UA_Server *server, UA_Subscription *sub) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
-                              "Enable Subscription");
-
-    /* Already enabled? */
-    if(sub->state >= UA_SUBSCRIPTIONSTATE_NORMAL)
-        return UA_STATUSCODE_GOOD;
-
-    UA_StatusCode res =
-        addRepeatedCallback(server, (UA_ServerCallback)repeatedPublishCallback,
-                            sub, sub->publishingInterval, &sub->publishCallbackId);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-
-    sub->state = UA_SUBSCRIPTIONSTATE_NORMAL;
+Subscription_setState(UA_Server *server, UA_Subscription *sub,
+                      UA_SubscriptionState state) {
+    if(state <= UA_SUBSCRIPTIONSTATE_REMOVING) {
+        if(sub->publishCallbackId != 0) {
+            removeCallback(server, sub->publishCallbackId);
+            sub->publishCallbackId = 0;
 #ifdef UA_ENABLE_DIAGNOSTICS
-    sub->enableCount++;
+            sub->disableCount++;
 #endif
-    return UA_STATUSCODE_GOOD;
-}
-
-void
-Subscription_disable(UA_Server *server, UA_Subscription *sub) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
-                              "Disable Subscription");
+        }
+    } else if(sub->publishCallbackId == 0) {
+        UA_StatusCode res =
+            addRepeatedCallback(server, (UA_ServerCallback)repeatedPublishCallback,
+                                sub, sub->publishingInterval, &sub->publishCallbackId);
+        if(res != UA_STATUSCODE_GOOD) {
+            sub->state = UA_SUBSCRIPTIONSTATE_STOPPED;
+            return res;
+        }
 
-    /* Alreadu disabled? */
-    if(sub->state < UA_SUBSCRIPTIONSTATE_NORMAL)
-        return;
+        /* Send (at least a) keepalive after the next publish interval */
+        sub->currentKeepAliveCount = sub->maxKeepAliveCount;
 
-    removeCallback(server, sub->publishCallbackId);
-    sub->publishCallbackId = 0;
-    sub->state = UA_SUBSCRIPTIONSTATE_DISABLED;
 #ifdef UA_ENABLE_DIAGNOSTICS
-    sub->disableCount++;
+        sub->enableCount++;
 #endif
+    }
+
+    sub->state = state;
+    return UA_STATUSCODE_GOOD;
 }
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index c696c0d6085..20ad036c7ba 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -226,10 +226,10 @@ UA_MonitoredItem_ensureQueueSpace(UA_Server *server, UA_MonitoredItem *mon);
 
 /* We use only a subset of the states defined in the standard */
 typedef enum {
-    UA_SUBSCRIPTIONSTATE_DISABLED,
+    UA_SUBSCRIPTIONSTATE_STOPPED = 0,
     UA_SUBSCRIPTIONSTATE_REMOVING,
-    UA_SUBSCRIPTIONSTATE_NORMAL,
-    UA_SUBSCRIPTIONSTATE_LATE
+    UA_SUBSCRIPTIONSTATE_ENABLED_NOPUBLISH, /* only keepalive */
+    UA_SUBSCRIPTIONSTATE_ENABLED
 } UA_SubscriptionState;
 
 /* Subscriptions are managed in a server-wide linked list. If they are attached
@@ -255,6 +255,7 @@ struct UA_Subscription {
 
     /* Runtime information */
     UA_SubscriptionState state;
+    UA_Boolean late;
     UA_StatusCode statusChange; /* If set, a notification is generated and the
                                  * Subscription is deleted within
                                  * UA_Subscription_publish. */
@@ -316,10 +317,8 @@ void
 UA_Subscription_delete(UA_Server *server, UA_Subscription *sub);
 
 UA_StatusCode
-Subscription_enable(UA_Server *server, UA_Subscription *sub);
-
-void
-Subscription_disable(UA_Server *server, UA_Subscription *sub);
+Subscription_setState(UA_Server *server, UA_Subscription *sub,
+                      UA_SubscriptionState state);
 
 void
 Subscription_resetLifetime(UA_Subscription *sub);

From 0b33021dce94c0042edf6aed324a0fa2ab84132a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 25 Oct 2023 11:40:46 +0200
Subject: [PATCH 1234/1963] feat(server): Only allow subscription transfer if
 the same user was used

---
 plugins/ua_accesscontrol_default.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 30b58bb03e6..c78f60c9a5a 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -224,7 +224,20 @@ static UA_Boolean
 allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
                                   const UA_NodeId *oldSessionId, void *oldSessionContext,
                                   const UA_NodeId *newSessionId, void *newSessionContext) {
-    return true;
+    /* Allow the transfer if the same user-id was used to activate both sessions */
+    UA_Variant session1UserId;
+    UA_Variant_init(&session1UserId);
+    UA_Server_getSessionAttribute(server, oldSessionId,
+                                  UA_QUALIFIEDNAME(0, "clientUserId"),
+                                  &session1UserId);
+    UA_Variant session2UserId;
+    UA_Variant_init(&session2UserId);
+    UA_Server_getSessionAttribute(server, newSessionId,
+                                  UA_QUALIFIEDNAME(0, "clientUserId"),
+                                  &session2UserId);
+
+    return (UA_order(&session1UserId, &session2UserId,
+                     &UA_TYPES[UA_TYPES_VARIANT]) == UA_ORDER_EQ);
 }
 #endif
 

From 0c13cc61c2ab95236169e83e28e2edddf06e7f60 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 23 Oct 2023 22:37:59 +0200
Subject: [PATCH 1235/1963] refactor(server): Instantiate an internal client to
 register at a DiscoveryServer

---
 CMakeLists.txt                               |   2 +-
 examples/discovery/server_multicast.c        |  59 ++--
 examples/discovery/server_register.c         |  41 +--
 examples/server_ctt.c                        |  50 ++-
 include/open62541/server.h                   |  80 ++---
 src/server/ua_discovery_manager.c            |  41 ++-
 src/server/ua_discovery_manager.h            |  30 +-
 src/server/ua_server_discovery.c             | 344 ++++++++++++++-----
 src/server/ua_server_internal.h              |   5 -
 src/server/ua_services_discovery.c           | 181 ----------
 src/server/ua_services_discovery_multicast.c |  13 +-
 tests/server/check_discovery.c               | 140 +++-----
 12 files changed, 446 insertions(+), 540 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef3bd5b6d18..e02594f7b8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -774,8 +774,8 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/plugin/historydatabase.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/server_pubsub.h
-                     ${PROJECT_SOURCE_DIR}/include/open62541/server.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/client.h
+                     ${PROJECT_SOURCE_DIR}/include/open62541/server.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/client_highlevel.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/client_subscriptions.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/client_highlevel_async.h)
diff --git a/examples/discovery/server_multicast.c b/examples/discovery/server_multicast.c
index 7a3ff907f24..1395fcfe582 100644
--- a/examples/discovery/server_multicast.c
+++ b/examples/discovery/server_multicast.c
@@ -70,8 +70,8 @@ serverOnNetworkCallback(const UA_ServerOnNetwork *serverOnNetwork, UA_Boolean is
  * @param discoveryServerUrl The discovery url from the remote server
  * @return The endpoint description (which needs to be freed) or NULL
  */
-static
-UA_EndpointDescription *getRegisterEndpointFromServer(const char *discoveryServerUrl) {
+static UA_EndpointDescription *
+getRegisterEndpointFromServer(const char *discoveryServerUrl) {
     UA_Client *client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
     UA_EndpointDescription *endpointArray = NULL;
@@ -161,19 +161,19 @@ static UA_ByteString loadFile(const char *const path) {
  * @param argv from the main method
  * @return NULL or the initialized non-connected client
  */
-static
-UA_Client *getRegisterClient(UA_EndpointDescription *endpointRegister, int argc, char **argv) {
+static UA_StatusCode
+getRegisterClient(UA_ClientConfig *cc, UA_EndpointDescription *endpointRegister, int argc, char **argv) {
+    UA_ClientConfig_setDefault(cc);
     if(endpointRegister->securityMode == UA_MESSAGESECURITYMODE_NONE) {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Using LDS endpoint with security None");
-        UA_Client *client = UA_Client_new();
-        UA_ClientConfig_setDefault(UA_Client_getConfig(client));
-        return client;
+        return UA_STATUSCODE_GOOD;
     }
+
 #ifdef UA_ENABLE_ENCRYPTION
     if(endpointRegister->securityMode == UA_MESSAGESECURITYMODE_SIGN) {
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                     "LDS endpoint which only supports Sign is currently not supported");
-        return NULL;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
@@ -185,7 +185,7 @@ UA_Client *getRegisterClient(UA_EndpointDescription *endpointRegister, int argc,
                          "The required arguments are "
                          "<client-certificate.der> <client-private-key.der> "
                          "[<trustlist1.crl>, ...]");
-        return NULL;
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Load certificate and key */
@@ -203,8 +203,6 @@ UA_Client *getRegisterClient(UA_EndpointDescription *endpointRegister, int argc,
         trustList[trustListCount] = loadFile(argv[trustListCount + 3]);
 
     /* Secure client initialization */
-    UA_Client *clientRegister = UA_Client_new();
-    UA_ClientConfig *cc = UA_Client_getConfig(clientRegister);
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
@@ -214,11 +212,9 @@ UA_Client *getRegisterClient(UA_EndpointDescription *endpointRegister, int argc,
     UA_ByteString_clear(&privateKey);
     for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++)
         UA_ByteString_clear(&trustList[deleteCount]);
-
-    return clientRegister;
-#else
-    return NULL;
 #endif
+
+    return UA_STATUSCODE_GOOD;
 }
 
 int main(int argc, char **argv) {
@@ -300,49 +296,46 @@ int main(int argc, char **argv) {
         return EXIT_FAILURE;
     }
 
-    UA_Client *clientRegister = getRegisterClient(endpointRegister, argc, argv);
-    if(!clientRegister) {
+    UA_ClientConfig cc;
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+    retval = getRegisterClient(&cc, endpointRegister, argc, argv);
+    if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                      "Could not create the client for remote registering");
+        UA_ClientConfig_clear(&cc);
         UA_Server_run_shutdown(server);
         UA_Server_delete(server);
+        UA_EndpointDescription_delete(endpointRegister);
         return EXIT_FAILURE;
     }
 
-    /* Connect the client */
-    char *endpointUrl = (char*)UA_malloc(endpointRegister->endpointUrl.length + 1);
-    memcpy(endpointUrl, endpointRegister->endpointUrl.data, endpointRegister->endpointUrl.length);
-    endpointUrl[endpointRegister->endpointUrl.length] = 0;
-    UA_EndpointDescription_delete(endpointRegister);
-    retval = UA_Server_addPeriodicServerRegisterCallback(server, clientRegister, endpointUrl,
-                                                         10 * 60 * 1000, 500, NULL);
+    /* Register the server */
+    retval = UA_Server_registerDiscovery(server, &cc, endpointRegister->endpointUrl, UA_STRING_NULL);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "Could not create periodic job for server register. StatusCode %s",
                      UA_StatusCode_name(retval));
-        UA_free(endpointUrl);
-        UA_Client_disconnect(clientRegister);
-        UA_Client_delete(clientRegister);
         UA_Server_run_shutdown(server);
         UA_Server_delete(server);
+        UA_EndpointDescription_delete(endpointRegister);
         return EXIT_FAILURE;
     }
 
-    while (running)
+    while(running)
         UA_Server_run_iterate(server, true);
 
     UA_Server_run_shutdown(server);
 
-    // UNregister the server from the discovery server.
-    retval = UA_Server_unregister_discovery(server, clientRegister);
+    /* Deregister the server from the discovery server */
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+    retval = getRegisterClient(&cc, endpointRegister, argc, argv);
+    retval |= UA_Server_deregisterDiscovery(server, &cc, endpointRegister->endpointUrl);
     if(retval != UA_STATUSCODE_GOOD)
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "Could not unregister server from discovery server. "
                      "StatusCode %s", UA_StatusCode_name(retval));
 
-    UA_free(endpointUrl);
-    UA_Client_disconnect(clientRegister);
-    UA_Client_delete(clientRegister);
     UA_Server_delete(server);
+    UA_EndpointDescription_delete(endpointRegister);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/examples/discovery/server_register.c b/examples/discovery/server_register.c
index dca76f58cec..476f10a675d 100644
--- a/examples/discovery/server_register.c
+++ b/examples/discovery/server_register.c
@@ -97,50 +97,39 @@ int main(int argc, char **argv) {
                                         myIntegerName, UA_NODEID_NULL, attr, dateDataSource,
                                         &myInteger, NULL);
 
-    UA_Client *clientRegister = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegister));
+    UA_Server_run_startup(server);
+
+    // register server
+    UA_ClientConfig cc;
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+    UA_ClientConfig_setDefault(&cc);
 
-    // periodic server register after 10 Minutes, delay first register for 500ms
-    UA_UInt64 callbackId;
     UA_StatusCode retval =
-        UA_Server_addPeriodicServerRegisterCallback(server, clientRegister, DISCOVERY_SERVER_ENDPOINT,
-                                                    10 * 60 * 1000, 500, &callbackId);
-    // UA_StatusCode retval = UA_Server_addPeriodicServerRegisterJob(server,
-    // "opc.tcp://localhost:4840", 10*60*1000, 500, NULL);
+        UA_Server_registerDiscovery(server, &cc,
+                                    UA_STRING(DISCOVERY_SERVER_ENDPOINT), UA_STRING_NULL);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "Could not create periodic job for server register. StatusCode %s",
                      UA_StatusCode_name(retval));
-        UA_Client_disconnect(clientRegister);
-        UA_Client_delete(clientRegister);
         UA_Server_delete(server);
         return EXIT_FAILURE;
     }
 
-    retval = UA_Server_run(server, &running);
-
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "Could not start the server. StatusCode %s",
-                     UA_StatusCode_name(retval));
-        UA_Client_disconnect(clientRegister);
-        UA_Client_delete(clientRegister);
-        UA_Server_delete(server);
-        return EXIT_FAILURE;
-    }
+    while(running)
+        UA_Server_run_iterate(server, true);
 
     // Unregister the server from the discovery server.
-    retval = UA_Server_unregister_discovery(server, clientRegister);
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+    UA_ClientConfig_setDefault(&cc);
+    retval = UA_Server_deregisterDiscovery(server, &cc,
+                                           UA_STRING(DISCOVERY_SERVER_ENDPOINT));
     //retval = UA_Server_unregister_discovery(server, "opc.tcp://localhost:4840" );
     if(retval != UA_STATUSCODE_GOOD)
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
                      "Could not unregister server from discovery server. StatusCode %s",
                      UA_StatusCode_name(retval));
 
-    UA_Server_removeCallback(server, callbackId);
-
-    UA_Client_disconnect(clientRegister);
-    UA_Client_delete(clientRegister);
+    UA_Server_run_shutdown(server);
     UA_Server_delete(server);
     return EXIT_SUCCESS;
 }
diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 075e2dee2fc..f2b5e3a5c45 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -35,8 +35,6 @@ static UA_UsernamePasswordLogin usernamePasswords[2] = {
 
 static const UA_NodeId baseDataVariableType = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_BASEDATAVARIABLETYPE}};
 static const UA_NodeId accessDenied = {1, UA_NODEIDTYPE_NUMERIC, {1337}};
-static UA_Client *ldsClientRegister;
-static UA_UInt64 ldsCallbackId;
 
 /* Custom AccessControl policy that disallows access to one specific node */
 static UA_Byte
@@ -853,24 +851,30 @@ setInformationModel(UA_Server *server) {
 #endif
 }
 
+static UA_Boolean hasRegistered = false;
+
+static void
+notifyState(UA_Server *server, UA_LifecycleState state) {
 #ifdef UA_ENABLE_DISCOVERY
-static void configureLdsRegistration(UA_Server *server){
-    ldsClientRegister = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(ldsClientRegister));
-
-    // periodic server register after 1 Minutes, delay first register for 500ms
-    UA_StatusCode retval =
-        UA_Server_addPeriodicServerRegisterCallback(server, ldsClientRegister, "opc.tcp://localhost:4840",
-                                                    60 * 1000, 500, &ldsCallbackId);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                     "Could not create periodic job for server register. StatusCode %s",
-                     UA_StatusCode_name(retval));
-        UA_Client_disconnect(ldsClientRegister);
-        UA_Client_delete(ldsClientRegister);
+    if(state == UA_LIFECYCLESTATE_STARTED && !hasRegistered) {
+        UA_ClientConfig cc;
+        memset(&cc, 0, sizeof(UA_ClientConfig));
+        UA_ClientConfig_setDefault(&cc);
+        UA_Server_registerDiscovery(server, &cc,
+                                    UA_STRING("opc.tcp://localhost:4840"),
+                                    UA_STRING_NULL);
+        hasRegistered = true;
+    }
+    if(state != UA_LIFECYCLESTATE_STARTED && hasRegistered) {
+        UA_ClientConfig cc;
+        memset(&cc, 0, sizeof(UA_ClientConfig));
+        UA_ClientConfig_setDefault(&cc);
+        UA_Server_deregisterDiscovery(server, &cc,
+                                      UA_STRING("opc.tcp://localhost:4840"));
+        hasRegistered = false;
     }
-}
 #endif
+}
 
 #ifdef UA_ENABLE_ENCRYPTION
 static void
@@ -1397,24 +1401,16 @@ int main(int argc, char **argv) {
     config->applicationDescription.applicationUri =
         UA_String_fromChars("urn:open62541.server.application");
 
+    /* Lifecycle config */
     config->shutdownDelay = 5000.0; /* 5s */
+    config->notifyLifecycleState = notifyState;
 
     setInformationModel(server);
 
-#ifdef UA_ENABLE_DISCOVERY
-
-    configureLdsRegistration(server);
-
-#endif
-
     /* run server */
     res = UA_Server_runUntilInterrupt(server);
 
  cleanup:
-    UA_Server_removeCallback(server, ldsCallbackId);
-    UA_Server_unregister_discovery(server, ldsClientRegister);
-    UA_Client_disconnect(ldsClientRegister);
-    UA_Client_delete(ldsClientRegister);
     UA_Server_delete(server);
 
     UA_ByteString_clear(&certificate);
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 741981f04f8..6eac5064561 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -27,6 +27,8 @@
 #include <open62541/plugin/accesscontrol.h>
 #include <open62541/plugin/securitypolicy.h>
 
+#include <open62541/client.h>
+
 #ifdef UA_ENABLE_PUBSUB
 #include <open62541/server_pubsub.h>
 #endif
@@ -991,64 +993,38 @@ UA_Server_forEachChildNodeCall(UA_Server *server, UA_NodeId parentNodeId,
 
 /**
  * Discovery
- * --------- */
-/* Register the given server instance at the discovery server.
- * This should be called periodically.
- * The semaphoreFilePath is optional. If the given file is deleted,
- * the server will automatically be unregistered. This could be
- * for example a pid file which is deleted if the server crashes.
+ * ---------
  *
- * When the server shuts down you need to call unregister.
+ * Registering at a Discovery Server
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
+
+/* Register the given server instance at the discovery server. This should be
+ * called periodically, for example every 10 minutes, depending on the
+ * configuration of the discovery server. You should also call
+ * _unregisterDiscovery when the server shuts down.
  *
- * @param server
- * @param client the client which is used to call the RegisterServer. It must
- *        already be connected to the correct endpoint
- * @param semaphoreFilePath optional parameter pointing to semaphore file. */
+ * The supplied client configuration is used to create a new client to connect
+ * to the discovery server. The client configuration is moved over to the server
+ * and eventually cleaned up internally. The structure pointed at by `cc` is
+ * zeroed to avoid accessing outdated information.
+ *
+ * The eventloop and logging plugins in the client configuration are replaced by
+ * those configured in the server. */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Server_register_discovery(UA_Server *server, struct UA_Client *client,
-                             const char* semaphoreFilePath);
+UA_Server_registerDiscovery(UA_Server *server, UA_ClientConfig *cc,
+                            const UA_String discoveryServerUrl,
+                            const UA_String semaphoreFilePath);
 
-/* Unregister the given server instance from the discovery server.
- * This should only be called when the server is shutting down.
- * @param server
- * @param client the client which is used to call the RegisterServer. It must
- *        already be connected to the correct endpoint */
+/* Deregister the given server instance from the discovery server.
+ * This should be called when the server is shutting down. */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Server_unregister_discovery(UA_Server *server, struct UA_Client *client);
+UA_Server_deregisterDiscovery(UA_Server *server, UA_ClientConfig *cc,
+                              const UA_String discoveryServerUrl);
 
- /* Adds a periodic callback to register the server with the LDS (local
-  * discovery server) periodically. The interval between each register call is
-  * given as second parameter. It should be 10 minutes by default (=
-  * 10*60*1000).
-  *
-  * The delayFirstRegisterMs parameter indicates the delay for the first
-  * register call. If it is 0, the first register call will be after intervalMs
-  * milliseconds, otherwise the server's first register will be after
-  * delayFirstRegisterMs.
-  *
-  * When you manually unregister the server, you also need to cancel the
-  * periodic callback, otherwise it will be automatically be registered again.
-  *
-  * If you call this method multiple times for the same discoveryServerUrl, the
-  * older periodic callback will be removed.
-  *
-  * @param server
-  * @param client the client which is used to call the RegisterServer. It must
-  *         not yet be connected and will be connected for every register call
-  *         to the given discoveryServerUrl.
-  * @param discoveryServerUrl where this server should register itself. The
-  *        string will be copied internally. Therefore you can free it after
-  *        calling this method.
-  * @param intervalMs
-  * @param delayFirstRegisterMs
-  * @param periodicCallbackId */
-UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
-                                            struct UA_Client *client,
-                                            const char* discoveryServerUrl,
-                                            UA_Double intervalMs,
-                                            UA_Double delayFirstRegisterMs,
-                                            UA_UInt64 *periodicCallbackId);
+/**
+ * Operating a Discovery Server
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 
 /* Callback for RegisterServer. Data is passed from the register call */
 typedef void
diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index e9c7e9bfff3..e58f772f579 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -11,6 +11,7 @@
  *    Copyright 2017 (c) Julian Grothoff
  */
 
+#include <open62541/client.h>
 #include "ua_discovery_manager.h"
 #include "ua_server_internal.h"
 
@@ -20,8 +21,26 @@ void
 UA_DiscoveryManager_setState(UA_Server *server,
                              UA_DiscoveryManager *dm,
                              UA_LifecycleState state) {
+    /* Check if open connections remain */
+    if(state == UA_LIFECYCLESTATE_STOPPING ||
+       state == UA_LIFECYCLESTATE_STOPPED) {
+        state = UA_LIFECYCLESTATE_STOPPED;
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+        if(dm->mdnsRecvConnectionsSize != 0 || dm->mdnsSendConnection != 0)
+            state = UA_LIFECYCLESTATE_STOPPING;
+#endif
+
+        for(size_t i = 0; i < UA_MAXREGISTERREQUESTS; i++) {
+            if(dm->registerRequests[i].client != NULL)
+                state = UA_LIFECYCLESTATE_STOPPING;
+        }
+    }
+
+    /* No change */
     if(state == dm->sc.state)
         return;
+
+    /* Set the new state and notify */
     dm->sc.state = state;
     if(dm->sc.notifyState)
         dm->sc.notifyState(server, &dm->sc, state);
@@ -45,14 +64,6 @@ UA_DiscoveryManager_free(UA_Server *server,
         UA_RegisteredServer_clear(&rs->registeredServer);
         UA_free(rs);
     }
-    periodicServerRegisterCallback_entry *ps, *ps_tmp;
-    LIST_FOREACH_SAFE(ps, &dm->periodicServerRegisterCallbacks, pointers, ps_tmp) {
-        LIST_REMOVE(ps, pointers);
-        if(ps->callback->discovery_server_url)
-            UA_free(ps->callback->discovery_server_url);
-        UA_free(ps->callback);
-        UA_free(ps);
-    }
 
 # ifdef UA_ENABLE_DISCOVERY_MULTICAST
     serverOnNetwork_list_entry *son, *son_tmp;
@@ -181,19 +192,19 @@ UA_DiscoveryManager_stop(UA_Server *server,
     UA_DiscoveryManager *dm = (UA_DiscoveryManager*)sc;
     removeCallback(server, dm->discoveryCallbackId);
 
+    /* Cancel all outstanding register requests */
+    for(size_t i = 0; i < UA_MAXREGISTERREQUESTS; i++) {
+        if(dm->registerRequests[i].client == NULL)
+            continue;
+        UA_Client_disconnectSecureChannelAsync(dm->registerRequests[i].client);
+    }
+
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     if(server->config.mdnsEnabled)
         stopMulticastDiscoveryServer(server);
 #endif
 
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    if(dm->mdnsRecvConnectionsSize == 0 && dm->mdnsSendConnection == 0)
-        UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPED);
-    else
-        UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPING);
-#else
     UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPED);
-#endif
 }
 
 UA_ServerComponent *
diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery_manager.h
index e4bc0c35174..0a6214a3f8f 100644
--- a/src/server/ua_discovery_manager.h
+++ b/src/server/ua_discovery_manager.h
@@ -26,19 +26,17 @@ typedef struct registeredServer_list_entry {
     UA_DateTime lastSeen;
 } registeredServer_list_entry;
 
-struct PeriodicServerRegisterCallback {
-    UA_UInt64 id;
-    UA_Double this_interval;
-    UA_Double default_interval;
-    UA_Boolean registered;
-    struct UA_Client* client;
-    char* discovery_server_url;
-};
-
-typedef struct periodicServerRegisterCallback_entry {
-    LIST_ENTRY(periodicServerRegisterCallback_entry) pointers;
-    struct PeriodicServerRegisterCallback *callback;
-} periodicServerRegisterCallback_entry;
+/* Store async register service calls. So we can cancel outstanding requests
+ * during shutdown. */
+typedef struct {
+    UA_DelayedCallback cleanupCallback; /* delayed cleanup */
+    UA_Server *server;
+    UA_DiscoveryManager *dm;
+    UA_Client *client;
+    UA_String semaphoreFilePath;
+    UA_Boolean unregister;
+} asyncRegisterRequest;
+#define UA_MAXREGISTERREQUESTS 4
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
 
@@ -79,9 +77,11 @@ struct UA_DiscoveryManager {
 
     /* Taken from the server config during startup */
     UA_Logger *logging;
-    const UA_ServerConfig *serverConfig;
+    UA_ServerConfig *serverConfig;
+
+    /* Outstanding requests. So they can be cancelled during shutdown. */
+    asyncRegisterRequest registerRequests[UA_MAXREGISTERREQUESTS];
 
-    LIST_HEAD(, periodicServerRegisterCallback_entry) periodicServerRegisterCallbacks;
     LIST_HEAD(, registeredServer_list_entry) registeredServers;
     size_t registeredServersSize;
     UA_Server_registerServerCallback registerServerCallback;
diff --git a/src/server/ua_server_discovery.c b/src/server/ua_server_discovery.c
index 4db20985d76..50fd68ed727 100644
--- a/src/server/ua_server_discovery.c
+++ b/src/server/ua_server_discovery.c
@@ -9,116 +9,292 @@
 
 #include <open62541/client.h>
 
-#include "ua_server_internal.h"
+#include "ua_discovery_manager.h"
 
 #ifdef UA_ENABLE_DISCOVERY
 
-UA_StatusCode
-register_server_with_discovery_server(UA_Server *server,
-                                      void *pClient,
-                                      const UA_Boolean isUnregister,
-                                      const char* semaphoreFilePath) {
-    UA_Client *client = (UA_Client *) pClient;
-
-    /* Prepare the request. Do not cleanup the request after the service call,
-     * as the members are stack-allocated or point into the server config. */
-    UA_RegisterServer2Request request;
-    UA_RegisterServer2Request_init(&request);
-    request.requestHeader.timeoutHint = 10000;
-
-    request.server.isOnline = !isUnregister;
-    request.server.serverUri = server->config.applicationDescription.applicationUri;
-    request.server.productUri = server->config.applicationDescription.productUri;
-    request.server.serverType = server->config.applicationDescription.applicationType;
-    request.server.gatewayServerUri = server->config.applicationDescription.gatewayServerUri;
-
-    if(semaphoreFilePath) {
-#ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
-        request.server.semaphoreFilePath =
-            UA_STRING((char*)(uintptr_t)semaphoreFilePath); /* dirty cast */
-#else
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_CLIENT,
-                       "Ignoring semaphore file path. open62541 not compiled "
-                       "with UA_ENABLE_DISCOVERY_SEMAPHORE=ON");
-#endif
+static void
+asyncRegisterRequest_clear(void *app, void *context) {
+    UA_Server *server = (UA_Server*)app;
+    asyncRegisterRequest *ar = (asyncRegisterRequest*)context;
+    UA_DiscoveryManager *dm = ar->dm;
+
+    UA_String_clear(&ar->semaphoreFilePath);
+    if(ar->client)
+        UA_Client_delete(ar->client);
+    memset(ar, 0, sizeof(asyncRegisterRequest));
+    
+    /* The Discovery manager is fully stopped? */
+    UA_DiscoveryManager_setState(server, dm, dm->sc.state);
+}
+
+static void
+asyncRegisterRequest_clearAsync(asyncRegisterRequest *ar) {
+    UA_Server *server = ar->server;
+    UA_ServerConfig *sc = &server->config;
+    UA_EventLoop *el = sc->eventLoop;
+
+    ar->cleanupCallback.callback = asyncRegisterRequest_clear;
+    ar->cleanupCallback.application = server;
+    ar->cleanupCallback.context = ar;
+    el->addDelayedCallback(el, &ar->cleanupCallback);
+}
+
+static void
+registerAsyncResponse(UA_Client *client, void *userdata,
+                      UA_UInt32 requestId, void *resp) {
+    asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
+    const UA_ServerConfig *sc = ar->dm->serverConfig;
+    UA_RegisterServerResponse *response = (UA_RegisterServerResponse*)resp;
+    if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
+                    "RegisterServer succeeded");
+    } else {
+        UA_LOG_WARNING(&sc->logger, UA_LOGCATEGORY_SERVER,
+                       "RegisterServer failed with statuscode %s",
+                       UA_StatusCode_name(response->responseHeader.serviceResult));
     }
 
-    request.server.serverNames = &server->config.applicationDescription.applicationName;
-    request.server.serverNamesSize = 1;
+    /* Close the client connection, will be cleaned up in the client state
+     * callback when closing is complete */
+    UA_Client_disconnectSecureChannelAsync(ar->client);
+}
+
+static void
+setupRegisterRequest(asyncRegisterRequest *ar, UA_RequestHeader *rh,
+                     UA_RegisteredServer *rs) {
+    UA_ServerConfig *sc = ar->dm->serverConfig;
 
-    /* Mirror the discovery urls from the server config (includes hostnames from
+    rh->timeoutHint = 10000;
+
+    rs->isOnline = !ar->unregister;
+    rs->serverUri = sc->applicationDescription.applicationUri;
+    rs->productUri = sc->applicationDescription.productUri;
+    rs->serverType = sc->applicationDescription.applicationType;
+    rs->gatewayServerUri = sc->applicationDescription.gatewayServerUri;
+    rs->semaphoreFilePath = ar->semaphoreFilePath;
+
+    rs->serverNames = &sc->applicationDescription.applicationName;
+    rs->serverNamesSize = 1;
+
+    /* Mirror the discovery URLs from the server config (includes hostnames from
      * the network layers) */
-    request.server.discoveryUrls =
-        server->config.applicationDescription.discoveryUrls;
-    request.server.discoveryUrlsSize =
-        server->config.applicationDescription.discoveryUrlsSize;
+    rs->discoveryUrls = sc->applicationDescription.discoveryUrls;
+    rs->discoveryUrlsSize = sc->applicationDescription.discoveryUrlsSize;
+}
+
+static void
+register2AsyncResponse(UA_Client *client, void *userdata,
+                       UA_UInt32 requestId, void *resp) {
+    asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
+    const UA_ServerConfig *sc = ar->dm->serverConfig;
+    UA_RegisterServer2Response *response = (UA_RegisterServer2Response*)resp;
+
+    /* Success */
+    UA_StatusCode serviceResult = response->responseHeader.serviceResult;
+    if(serviceResult == UA_STATUSCODE_GOOD) {
+        /* Close the client connection, will be cleaned up in the client state
+         * callback when closing is complete */
+        UA_Client_disconnectSecureChannelAsync(ar->client);
+        UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
+                    "RegisterServer succeeded");
+        return;
+    }
+
+    /* Unrecoverable error */
+    if(serviceResult != UA_STATUSCODE_BADNOTIMPLEMENTED &&
+       serviceResult != UA_STATUSCODE_BADSERVICEUNSUPPORTED) {
+        /* Close the client connection, will be cleaned up in the client state
+         * callback when closing is complete */
+        UA_Client_disconnectSecureChannelAsync(ar->client);
+        UA_LOG_WARNING(&sc->logger, UA_LOGCATEGORY_SERVER,
+                       "RegisterServer failed with error %s",
+                       UA_StatusCode_name(serviceResult));
+        return;
+    }
+
+    /* Try RegisterServer */
+    UA_RegisterServerRequest request;
+    UA_RegisterServerRequest_init(&request);
+    setupRegisterRequest(ar, &request.requestHeader, &request.server);
+    UA_StatusCode res =
+        __UA_Client_AsyncService(client, &request,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST],
+                                 registerAsyncResponse,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE],
+                                 ar, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        /* Close the client connection, will be cleaned up in the client state
+         * callback when closing is complete */
+        UA_Client_disconnectSecureChannelAsync(ar->client);
+        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
+                     "RegisterServer2 failed with statuscode %s",
+                     UA_StatusCode_name(res));
+    }
+}
+
+static void
+discoveryClientStateCallback(UA_Client *client,
+                             UA_SecureChannelState channelState,
+                             UA_SessionState sessionState,
+                             UA_StatusCode connectStatus) {
+    asyncRegisterRequest *ar = (asyncRegisterRequest*)
+        UA_Client_getContext(client);
+    UA_ServerConfig *sc = ar->dm->serverConfig;
+
+    /* Connection failed */
+    if(connectStatus != UA_STATUSCODE_GOOD) {
+        if(connectStatus != UA_STATUSCODE_BADCONNECTIONCLOSED) {
+            UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+                         "Could not connect to the Discovery server with error %s",
+                         UA_StatusCode_name(connectStatus));
+        }
+        /* If fully closed, delete the client and clean up */
+        if(channelState == UA_SECURECHANNELSTATE_CLOSED)
+            asyncRegisterRequest_clearAsync(ar);
+        return;
+    }
+
+    /* Wait until the SecureChannel is open */
+    if(channelState != UA_SECURECHANNELSTATE_OPEN)
+        return;
+
+    /* Prepare the request. This does not allocate memory */
+    UA_RegisterServer2Request request;
+    UA_RegisterServer2Request_init(&request);
+    setupRegisterRequest(ar, &request.requestHeader, &request.server);
 
+    /* Set the configuration that is only available for UA_RegisterServer2Request */
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    request.discoveryConfigurationSize = 1;
-    request.discoveryConfiguration = UA_ExtensionObject_new();
-    // Set to NODELETE so that we can just use a pointer to the mdns config
-    UA_ExtensionObject_setValueNoDelete(request.discoveryConfiguration,
-                                        &server->config.mdnsConfig,
+    UA_ExtensionObject mdnsConfig;
+    UA_ExtensionObject_setValueNoDelete(ar->request.discoveryConfiguration,
+                                        &sc->mdnsConfig,
                                         &UA_TYPES[UA_TYPES_MDNSDISCOVERYCONFIGURATION]);
+    ar->request.discoveryConfigurationSize = 1;
+    ar->request.discoveryConfiguration = &mdnsConfig;
 #endif
 
-    // First try with RegisterServer2, if that isn't implemented, use RegisterServer
-    UA_RegisterServer2Response response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_REGISTERSERVER2REQUEST],
-                        &response, &UA_TYPES[UA_TYPES_REGISTERSERVER2RESPONSE]);
-
-    UA_StatusCode serviceResult = response.responseHeader.serviceResult;
-    UA_RegisterServer2Response_clear(&response);
-    UA_Array_delete(request.discoveryConfiguration,
-                    request.discoveryConfigurationSize,
-                    &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
-
-    if(serviceResult == UA_STATUSCODE_BADNOTIMPLEMENTED ||
-       serviceResult == UA_STATUSCODE_BADSERVICEUNSUPPORTED) {
-        /* Try RegisterServer */
-        UA_RegisterServerRequest request_fallback;
-        UA_RegisterServerRequest_init(&request_fallback);
-        /* Copy from RegisterServer2 request */
-        request_fallback.requestHeader = request.requestHeader;
-        request_fallback.server = request.server;
-
-        UA_RegisterServerResponse response_fallback;
-
-        __UA_Client_Service(client, &request_fallback,
-                            &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST],
-                            &response_fallback,
-                            &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE]);
-
-        serviceResult = response_fallback.responseHeader.serviceResult;
-        UA_RegisterServerResponse_clear(&response_fallback);
+    /* Try to call RegisterServer2 */
+    UA_StatusCode res =
+        __UA_Client_AsyncService(client, &request,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2REQUEST],
+                                 register2AsyncResponse,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2RESPONSE],
+                                 ar, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        /* Close the client connection, will be cleaned up in the client state
+         * callback when closing is complete */
+        UA_Client_disconnectSecureChannelAsync(ar->client);
+        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
+                     "RegisterServer2 failed with statuscode %s",
+                     UA_StatusCode_name(res));
+    }
+}
+
+static UA_StatusCode
+UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister,
+                   const UA_String discoveryServerUrl,
+                   const UA_String  semaphoreFilePath) {
+    /* Get the discovery manager */
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
+    if(!dm) {
+        UA_ClientConfig_clear(cc);
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    if(serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_CLIENT,
-                     "RegisterServer/RegisterServer2 failed with statuscode %s",
-                     UA_StatusCode_name(serviceResult));
+    /* Check that the discovery manager is running */
+    UA_ServerConfig *sc = &server->config;
+    if(dm->sc.state != UA_LIFECYCLESTATE_STARTED) {
+        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+                     "The server must be started for registering");
+        UA_ClientConfig_clear(cc);
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    return serviceResult;
+    /* Find a free slot for storing the async request information */
+    asyncRegisterRequest *ar = NULL;
+    for(size_t i = 0; i < UA_MAXREGISTERREQUESTS; i++) {
+        if(dm->registerRequests[i].client == NULL) {
+            ar = &dm->registerRequests[i];
+            break;
+        }
+    }
+    if(!ar) {
+        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+                     "Too many outstanding register requests. Cannot proceed.");
+        UA_ClientConfig_clear(cc);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Use the EventLoop from the server for the client */
+    if(cc->eventLoop && !cc->externalEventLoop)
+        cc->eventLoop->free(cc->eventLoop);
+    cc->eventLoop = sc->eventLoop;
+    cc->externalEventLoop = true;
+
+    /* Use the logging from the server */
+    if(cc->logging->clear)
+        cc->logging->clear(&cc->logging);
+    cc->logging = sc->logging;
+
+    /* Set the state callback method and context */
+    cc->stateCallback = discoveryClientStateCallback;
+    cc->clientContext = ar;
+
+    /* Open only a SecureChannel */
+    cc->noSession = true;
+
+    /* Move the endpoint url */
+    UA_String_clear(&cc->endpointUrl);
+    UA_String_copy(&discoveryServerUrl, &cc->endpointUrl);
+
+    /* Instantiate the client */
+    ar->client = UA_Client_newWithConfig(cc);
+    if(!ar->client) {
+        UA_ClientConfig_clear(cc);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    /* Zero out the supplied config */
+    memset(cc, 0, sizeof(UA_ClientConfig));
+
+    /* Finish setting up the context */
+    ar->server = server;
+    ar->dm = dm;
+    ar->unregister = unregister;
+    UA_String_copy(&semaphoreFilePath, &ar->semaphoreFilePath);
+
+    /* Connect asynchronously. The register service is called once the
+     * connection is open. */
+    return __UA_Client_connect(ar->client, true);
 }
 
 UA_StatusCode
-UA_Server_register_discovery(UA_Server *server, UA_Client *client,
-                             const char* semaphoreFilePath) {
+UA_Server_registerDiscovery(UA_Server *server, UA_ClientConfig *cc,
+                            const UA_String discoveryServerUrl,
+                            const UA_String semaphoreFilePath) {
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                "Registering at the DiscoveryServer: %.*s",
+                (int)discoveryServerUrl.length, discoveryServerUrl.data);
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode retval = register_server_with_discovery_server(server, client,
-                                                                 false, semaphoreFilePath);
+    UA_StatusCode res =
+        UA_Server_register(server, cc, false, discoveryServerUrl, semaphoreFilePath);
     UA_UNLOCK(&server->serviceMutex);
-    return retval;
+    return res;
 }
 
 UA_StatusCode
-UA_Server_unregister_discovery(UA_Server *server, UA_Client *client) {
+UA_Server_deregisterDiscovery(UA_Server *server, UA_ClientConfig *cc,
+                              const UA_String discoveryServerUrl) {
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                "Deregistering at the DiscoveryServer: %.*s",
+                (int)discoveryServerUrl.length, discoveryServerUrl.data);
     UA_LOCK(&server->serviceMutex);
-    UA_StatusCode retval = register_server_with_discovery_server(server, client,
-                                                                 true, NULL);
+    UA_StatusCode res =
+        UA_Server_register(server, cc, true, discoveryServerUrl, UA_STRING_NULL);
     UA_UNLOCK(&server->serviceMutex);
-    return retval;
+    return res;
 }
 
 #endif /* UA_ENABLE_DISCOVERY */
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 349afb45308..667e9bb6489 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -532,11 +532,6 @@ addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
 #ifdef UA_ENABLE_DISCOVERY
 UA_ServerComponent *
 UA_DiscoveryManager_new(UA_Server *server);
-
-UA_StatusCode
-register_server_with_discovery_server(UA_Server *server, void *client,
-                                      const UA_Boolean isUnregister,
-                                      const char* semaphoreFilePath);
 #endif
 
 UA_ServerComponent *
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 0eaaa04d9e3..d149951256d 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -581,185 +581,4 @@ void Service_RegisterServer2(UA_Server *server, UA_Session *session,
                            response->diagnosticInfos);
 }
 
-/* Called by the UA_Server callback. The OPC UA specification says:
- *
- * > If an error occurs during registration (e.g. the Discovery Server is not running) then the Server
- * > must periodically re-attempt registration. The frequency of these attempts should start at 1 second
- * > but gradually increase until the registration frequency is the same as what it would be if not
- * > errors occurred. The recommended approach would double the period each attempt until reaching the maximum.
- *
- * We will do so by using the additional data parameter which holds information
- * if the next interval is default or if it is a repeated call. */
-static void
-periodicServerRegister(UA_Server *server, void *data) {
-    UA_assert(data != NULL);
-    UA_LOCK(&server->serviceMutex);
-
-    struct PeriodicServerRegisterCallback *cb = (struct PeriodicServerRegisterCallback *)data;
-
-    UA_StatusCode retval = UA_Client_connectSecureChannel(cb->client, cb->discovery_server_url);
-    if (retval == UA_STATUSCODE_GOOD) {
-        /* Register
-           You can also use a semaphore file. That file must exist. When the file is
-           deleted, the server is automatically unregistered. The semaphore file has
-           to be accessible by the discovery server
-
-           UA_StatusCode retval = UA_Server_register_discovery(server,
-           "opc.tcp://localhost:4840", "/path/to/some/file");
-        */
-        retval = register_server_with_discovery_server(server, cb->client, false, NULL);
-        if (retval == UA_STATUSCODE_BADCONNECTIONCLOSED) {
-            /* If the periodic interval is higher than the maximum lifetime of
-             * the session, the server will close the connection. In this case
-             * we should try to reconnect */
-            UA_Client_disconnect(cb->client);
-            retval = UA_Client_connectSecureChannel(cb->client, cb->discovery_server_url);
-            if (retval == UA_STATUSCODE_GOOD) {
-                retval = register_server_with_discovery_server(server, cb->client, false, NULL);
-            }
-        }
-    }
-    /* Registering failed */
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Could not register server with discovery server. "
-                     "Is the discovery server started? StatusCode %s",
-                     UA_StatusCode_name(retval));
-
-        /* If the server was previously registered, retry in one second,
-         * else, double the previous interval */
-        UA_Double nextInterval = 1000.0;
-        if(!cb->registered)
-            nextInterval = cb->this_interval * 2;
-
-        /* The interval should be smaller than the default interval */
-        if(nextInterval > cb->default_interval)
-            nextInterval = cb->default_interval;
-
-        cb->this_interval = nextInterval;
-        changeRepeatedCallbackInterval(server, cb->id, nextInterval);
-        UA_UNLOCK(&server->serviceMutex);
-        return;
-    }
-
-    /* Registering succeeded */
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                 "Server successfully registered. Next periodical register will be in %d seconds",
-                 (int)(cb->default_interval/1000));
-
-    if(!cb->registered) {
-        retval = changeRepeatedCallbackInterval(server, cb->id, cb->default_interval);
-        /* If changing the interval fails, try again after the next registering */
-        if(retval == UA_STATUSCODE_GOOD)
-            cb->registered = true;
-    }
-    UA_UNLOCK(&server->serviceMutex);
-}
-
-UA_StatusCode
-UA_Server_addPeriodicServerRegisterCallback(UA_Server *server,
-                                            struct UA_Client *client,
-                                            const char* discoveryServerUrl,
-                                            UA_Double intervalMs,
-                                            UA_Double delayFirstRegisterMs,
-                                            UA_UInt64 *periodicCallbackId) {
-    UA_LOCK(&server->serviceMutex);
-
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
-        getServerComponentByName(server, UA_STRING("discovery"));
-    if(!dm) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* No valid server URL */
-    if(!discoveryServerUrl) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "No discovery server URL provided");
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* The client is already connected */
-    UA_SecureChannelState scState = UA_SECURECHANNELSTATE_CLOSED;
-    UA_Client_getState(client, &scState, NULL, NULL);
-    if(scState != UA_SECURECHANNELSTATE_CLOSED) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADINVALIDSTATE;
-    }
-
-    /* Check if we are already registering with the given discovery url and
-     * remove the old periodic call */
-    periodicServerRegisterCallback_entry *rs, *rs_tmp;
-    LIST_FOREACH_SAFE(rs, &dm->periodicServerRegisterCallbacks, pointers, rs_tmp) {
-        if(strcmp(rs->callback->discovery_server_url, discoveryServerUrl) == 0) {
-            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                        "There is already a register callback for '%s' in place. "
-                        "Removing the older one.", discoveryServerUrl);
-            removeCallback(server, rs->callback->id);
-            LIST_REMOVE(rs, pointers);
-            UA_free(rs->callback->discovery_server_url);
-            UA_free(rs->callback);
-            UA_free(rs);
-            break;
-        }
-    }
-
-    /* Allocate and initialize */
-    struct PeriodicServerRegisterCallback* cb = (struct PeriodicServerRegisterCallback*)
-        UA_malloc(sizeof(struct PeriodicServerRegisterCallback));
-    if(!cb) {
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-
-    /* Start repeating a failed register after 1s, then increase the delay. Set
-     * to 500ms, as the delay is doubled before changing the callback
-     * interval.*/
-    cb->this_interval = 500.0;
-    cb->default_interval = intervalMs;
-    cb->registered = false;
-    cb->client = client;
-    size_t len = strlen(discoveryServerUrl);
-    cb->discovery_server_url = (char*)UA_malloc(len+1);
-    if (!cb->discovery_server_url) {
-        UA_free(cb);
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    memcpy(cb->discovery_server_url, discoveryServerUrl, len+1);
-
-    /* Add the callback */
-    UA_StatusCode retval =
-        addRepeatedCallback(server, periodicServerRegister,
-                            cb, delayFirstRegisterMs, &cb->id);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                     "Could not create periodic job for server register. "
-                     "StatusCode %s", UA_StatusCode_name(retval));
-        UA_free(cb);
-        UA_UNLOCK(&server->serviceMutex);
-        return retval;
-    }
-
-#ifndef __clang_analyzer__
-    // the analyzer reports on LIST_INSERT_HEAD a use after free false positive
-    periodicServerRegisterCallback_entry *newEntry = (periodicServerRegisterCallback_entry*)
-        UA_malloc(sizeof(periodicServerRegisterCallback_entry));
-    if(!newEntry) {
-        removeCallback(server, cb->id);
-        UA_free(cb);
-        UA_UNLOCK(&server->serviceMutex);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-    newEntry->callback = cb;
-    LIST_INSERT_HEAD(&dm->periodicServerRegisterCallbacks, newEntry, pointers);
-#endif
-
-    if(periodicCallbackId)
-        *periodicCallbackId = cb->id;
-    UA_UNLOCK(&server->serviceMutex);
-    return UA_STATUSCODE_GOOD;
-}
-
 #endif /* UA_ENABLE_DISCOVERY */
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index 7716e80262f..4978995dfe2 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -103,14 +103,13 @@ MulticastDiscoveryCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     if(state == UA_CONNECTIONSTATE_CLOSING) {
         mdnsRemoveConnection(dm, connectionId, recv);
 
-        if(dm->sc.state == UA_LIFECYCLESTATE_STOPPING) {
-            /* If we are stopping, was the last open socket closed? */
-            if(dm->mdnsSendConnection == 0 && dm->mdnsRecvConnectionsSize == 0)
-                UA_DiscoveryManager_setState(server, dm, UA_LIFECYCLESTATE_STOPPED);
-        } else {
-            /* Restart mdns sockets */
+        /* Fully stopped? Internally checks if all sockets are closed. */
+        UA_DiscoveryManager_setState(server, dm, dm->sc.state);
+
+        /* Restart mdns sockets if not shutting down */
+        if(dm->sc.state == UA_LIFECYCLESTATE_STARTED)
             startMulticastDiscoveryServer(server);
-        }
+
         return;
     }
 
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 5b949c91f56..9a18ea6f77e 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -146,30 +146,42 @@ teardown_register(void) {
 
 static void
 registerServer(void) {
-    UA_Client *clientRegister = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegister));
+    UA_ClientConfig cc;
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+    UA_ClientConfig_setDefault(&cc);
 
-    UA_StatusCode retval =
-        UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    retval = UA_Server_register_discovery(server_register, clientRegister, NULL);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_Client_disconnect(clientRegister);
-    UA_Client_delete(clientRegister);
+    *running_register = false;
+    THREAD_JOIN(server_thread_register);
+
+    UA_StatusCode res =
+        UA_Server_registerDiscovery(server_register, &cc,
+                                    UA_STRING("opc.tcp://localhost:4840"),
+                                    UA_STRING_NULL);
+    *running_register = true;
+    THREAD_CREATE(server_thread_register, serverloop_register);
+
+    ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+    UA_realSleep(1000);
 }
 
 static void
 unregisterServer(void) {
-    UA_Client *clientRegister = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegister));
+    UA_ClientConfig cc;
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+    UA_ClientConfig_setDefault(&cc);
 
-    UA_StatusCode retval =
-        UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    retval = UA_Server_unregister_discovery(server_register, clientRegister);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_Client_disconnect(clientRegister);
-    UA_Client_delete(clientRegister);
+    *running_register = false;
+    THREAD_JOIN(server_thread_register);
+
+    UA_StatusCode res =
+        UA_Server_deregisterDiscovery(server_register, &cc,
+                                    UA_STRING("opc.tcp://localhost:4840"));
+
+    *running_register = true;
+    THREAD_CREATE(server_thread_register, serverloop_register);
+
+    ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+    UA_realSleep(1000);
 }
 
 #ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
@@ -188,16 +200,23 @@ Server_register_semaphore(void) {
     fclose(fp);
 #endif
 
-    UA_Client *clientRegister = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegister));
+    UA_ClientConfig cc;
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+    UA_ClientConfig_setDefault(&cc);
 
-    UA_StatusCode retval =
-        UA_Client_connectSecureChannel(clientRegister, "opc.tcp://localhost:4840");
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    retval = UA_Server_register_discovery(server_register, clientRegister, SEMAPHORE_PATH);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_Client_disconnect(clientRegister);
-    UA_Client_delete(clientRegister);
+    *running_register = false;
+    THREAD_JOIN(server_thread_register);
+
+    UA_StatusCode res =
+        UA_Server_registerDiscovery(server_register, &cc,
+                                    UA_STRING("opc.tcp://localhost:4840"),
+                                    UA_STRING(SEMAPHORE_PATH));
+
+    *running_register = true;
+    THREAD_CREATE(server_thread_register, serverloop_register);
+
+    ck_assert_uint_eq(res, UA_STATUSCODE_GOOD);
+    UA_realSleep(1000);
 }
 
 static void
@@ -208,32 +227,6 @@ Server_unregister_semaphore(void) {
 
 #endif /* UA_ENABLE_DISCOVERY_SEMAPHORE */
 
-static void
-Server_register_periodic(void) {
-    ck_assert(clientRegisterRepeated == NULL);
-    clientRegisterRepeated = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(clientRegisterRepeated));
-    ck_assert(clientRegisterRepeated != NULL);
-
-    // periodic register every minute, first register immediately
-    UA_StatusCode retval =
-        UA_Server_addPeriodicServerRegisterCallback(server_register, clientRegisterRepeated,
-                                                    "opc.tcp://localhost:4840", 60*1000, 100,
-                                                    &periodicRegisterCallbackId);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-}
-
-static void
-Server_unregister_periodic(void) {
-    UA_Server_removeRepeatedCallback(server_register, periodicRegisterCallbackId);
-    UA_StatusCode retval =
-        UA_Server_unregister_discovery(server_register, clientRegisterRepeated);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_Client_disconnect(clientRegisterRepeated);
-    UA_Client_delete(clientRegisterRepeated);
-    clientRegisterRepeated=NULL;
-}
-
 static void
 FindAndCheck(const UA_String expectedUris[], size_t expectedUrisSize,
              const UA_String expectedLocales[],
@@ -241,7 +234,6 @@ FindAndCheck(const UA_String expectedUris[], size_t expectedUrisSize,
              const char *filterUri,
              const char *filterLocale) {
     UA_Client *client = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
 
     UA_ApplicationDescription* applicationDescriptionArray = NULL;
     size_t applicationDescriptionArraySize = 0;
@@ -308,7 +300,6 @@ FindOnNetworkAndCheck(UA_String expectedServerNames[], size_t expectedServerName
                       const char *filterUri, const char *filterLocale,
                       const char** filterCapabilities, size_t filterCapabilitiesSize) {
     UA_Client *client = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
 
     UA_ServerOnNetwork* serverOnNetwork = NULL;
     size_t serverOnNetworkSize = 0;
@@ -408,7 +399,6 @@ GetEndpointsAndCheck(const char* discoveryUrl, const char* filterTransportProfil
                      const UA_String *expectedEndpointUrls,
                      size_t expectedEndpointUrlsSize) {
     UA_Client *client = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
 
     ck_assert_uint_eq(UA_Client_connect(client, discoveryUrl), UA_STATUSCODE_GOOD);
 
@@ -564,38 +554,6 @@ START_TEST(Server_registerUnregister) {
 }
 END_TEST
 
-START_TEST(Server_registerRetry) {
-    Server_register_periodic();
-
-    // wait a bit to let first try run through
-    UA_fakeSleep(1000);
-    UA_realSleep(1000);
-
-    // now start LDS
-    setup_lds();
-    // first retry is after 2 seconds, then 4, so it should be enough to wait 3 seconds
-    UA_fakeSleep(3000);
-    UA_realSleep(3000);
-
-    // check if there
-    Client_find_registered();
-    Server_unregister_periodic();
-    Client_find_discovery();
-    teardown_lds();
-}
-END_TEST
-
-START_TEST(Server_registerUnregister_periodic) {
-    Server_register_periodic();
-
-    // wait for first register delay
-    UA_fakeSleep(1000);
-    UA_realSleep(1000);
-
-    Server_unregister_periodic();
-}
-END_TEST
-
 START_TEST(Server_registerTimeout) {
     registerServer();
     Client_find_registered();
@@ -663,14 +621,8 @@ static Suite* testSuite_Client(void) {
     tcase_add_unchecked_fixture(tc_register, setup_lds, teardown_lds);
     tcase_add_unchecked_fixture(tc_register, setup_register, teardown_register);
     tcase_add_test(tc_register, Server_registerUnregister);
-    tcase_add_test(tc_register, Server_registerUnregister_periodic);
     suite_add_tcase(s,tc_register);
 
-    TCase *tc_register_retry = tcase_create("RegisterServer Retry");
-    tcase_add_unchecked_fixture(tc_register_retry, setup_register, teardown_register);
-    tcase_add_test(tc_register_retry, Server_registerRetry);
-    suite_add_tcase(s,tc_register_retry);
-
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     TCase *tc_register_find = tcase_create("RegisterServer and FindServers");
     tcase_add_unchecked_fixture(tc_register_find, setup_lds, teardown_lds);

From 3d9561e9ff535c699eb2831585e5568a05a75a9a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Oct 2023 22:59:21 +0200
Subject: [PATCH 1236/1963] refactor(examples): Adjust SecureChannel limit for
 the CTT server

---
 examples/server_ctt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index f2b5e3a5c45..16beba661bf 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1360,8 +1360,8 @@ int main(int argc, char **argv) {
 #endif /* UA_ENABLE_ENCRYPTION */
 
     /* Limit the number of SecureChannels and Sessions */
-    config->maxSecureChannels = 40;
-    config->maxSessions = 10;
+    config->maxSecureChannels = 60;
+    config->maxSessions = 50;
 
     /* Revolve the SecureChannel token every 300 seconds */
     config->maxSecurityTokenLifetime = 300000;

From e128299b759b9d7eaabe0e00dc3501d28441bc4c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Oct 2023 22:59:48 +0200
Subject: [PATCH 1237/1963] refactor(client): Remove local validation whether a
 session is required

The previous check was faulty. For example, the RegisterServer Service
does not require a Session also.
Whether a session is required is up to the server.
This also aligns with the async API.
---
 src/client/ua_client.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 73cf61d6c52..b5e0722770f 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -783,17 +783,6 @@ __Client_AsyncService(UA_Client *client, const void *request,
         return UA_STATUSCODE_BADSERVERNOTCONNECTED;
     }
 
-    /* Do we need a Session for this Service? Is the Session connected? */
-    if(requestType != &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST] &&
-       requestType != &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST] &&
-       requestType != &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST] &&
-       requestType != &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST] &&
-       client->sessionState < UA_SESSIONSTATE_ACTIVATED) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
-                     "Session must be connected to send a request of this type");
-        return UA_STATUSCODE_BADSERVERNOTCONNECTED;
-    }
-
     /* Prepare the entry for the linked list */
     AsyncServiceCall *ac = (AsyncServiceCall*)UA_malloc(sizeof(AsyncServiceCall));
     if(!ac)

From 097916244ead0d4830f1fd83157179a1e28954ef Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Oct 2023 23:14:50 +0200
Subject: [PATCH 1238/1963] feat(plugin): Notify the application when the
 server is going to shutdown with a delay (UA_Server_runUntilInterrupt)

---
 plugins/ua_config_default.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 02350fb6fda..2f9ff0ce7b7 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -99,6 +99,10 @@ interruptServer(UA_InterruptManager *im, uintptr_t interruptHandle,
     UA_Server_addTimedCallback(ic->server, shutdownServer, ic, UA_DateTime_nowMonotonic() +
                                (UA_DateTime)(config->shutdownDelay * UA_DATETIME_MSEC),
                                NULL);
+
+    /* Notify the application that the server is stopping */
+    if(config->notifyLifecycleState)
+        config->notifyLifecycleState(ic->server, UA_LIFECYCLESTATE_STOPPING);
 }
 
 UA_StatusCode

From 949ff61a8315779a7fc8f11bd121568bed963cb3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Oct 2023 23:19:50 +0200
Subject: [PATCH 1239/1963] refactor(server): Move registering functionality to
 ua_discovery_manager.c

---
 CMakeLists.txt                    |   1 -
 src/server/ua_discovery_manager.c | 289 ++++++++++++++++++++++++++++
 src/server/ua_server_discovery.c  | 300 ------------------------------
 3 files changed, 289 insertions(+), 301 deletions(-)
 delete mode 100644 src/server/ua_server_discovery.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e02594f7b8f..81e0c4554f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -822,7 +822,6 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_config.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_binary.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_utils.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_server_discovery.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_server_async.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_view.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_method.c
diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery_manager.c
index e58f772f579..7a3c3d71329 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery_manager.c
@@ -9,6 +9,8 @@
  *    Copyright 2015-2016 (c) Oleksiy Vasylyev
  *    Copyright 2016-2017 (c) Stefan Profanter, fortiss GmbH
  *    Copyright 2017 (c) Julian Grothoff
+ *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
+ *    Copyright 2017 (c) HMS Industrial Networks AB (Author: Jonas Green)
  */
 
 #include <open62541/client.h>
@@ -225,4 +227,291 @@ UA_DiscoveryManager_new(UA_Server *server) {
     return &dm->sc;
 }
 
+/********************************/
+/* Register at Discovery Server */
+/********************************/
+
+static void
+asyncRegisterRequest_clear(void *app, void *context) {
+    UA_Server *server = (UA_Server*)app;
+    asyncRegisterRequest *ar = (asyncRegisterRequest*)context;
+    UA_DiscoveryManager *dm = ar->dm;
+
+    UA_String_clear(&ar->semaphoreFilePath);
+    if(ar->client)
+        UA_Client_delete(ar->client);
+    memset(ar, 0, sizeof(asyncRegisterRequest));
+
+    /* The Discovery manager is fully stopped? */
+    UA_DiscoveryManager_setState(server, dm, dm->sc.state);
+}
+
+static void
+asyncRegisterRequest_clearAsync(asyncRegisterRequest *ar) {
+    UA_Server *server = ar->server;
+    UA_ServerConfig *sc = &server->config;
+    UA_EventLoop *el = sc->eventLoop;
+
+    ar->cleanupCallback.callback = asyncRegisterRequest_clear;
+    ar->cleanupCallback.application = server;
+    ar->cleanupCallback.context = ar;
+    el->addDelayedCallback(el, &ar->cleanupCallback);
+}
+
+static void
+registerAsyncResponse(UA_Client *client, void *userdata,
+                      UA_UInt32 requestId, void *resp) {
+    asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
+    const UA_ServerConfig *sc = ar->dm->serverConfig;
+    UA_RegisterServerResponse *response = (UA_RegisterServerResponse*)resp;
+    if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
+                    "RegisterServer succeeded");
+    } else {
+        UA_LOG_WARNING(&sc->logger, UA_LOGCATEGORY_SERVER,
+                       "RegisterServer failed with statuscode %s",
+                       UA_StatusCode_name(response->responseHeader.serviceResult));
+    }
+
+    /* Close the client connection, will be cleaned up in the client state
+     * callback when closing is complete */
+    UA_Client_disconnectSecureChannelAsync(ar->client);
+}
+
+static void
+setupRegisterRequest(asyncRegisterRequest *ar, UA_RequestHeader *rh,
+                     UA_RegisteredServer *rs) {
+    UA_ServerConfig *sc = ar->dm->serverConfig;
+
+    rh->timeoutHint = 10000;
+
+    rs->isOnline = !ar->unregister;
+    rs->serverUri = sc->applicationDescription.applicationUri;
+    rs->productUri = sc->applicationDescription.productUri;
+    rs->serverType = sc->applicationDescription.applicationType;
+    rs->gatewayServerUri = sc->applicationDescription.gatewayServerUri;
+    rs->semaphoreFilePath = ar->semaphoreFilePath;
+
+    rs->serverNames = &sc->applicationDescription.applicationName;
+    rs->serverNamesSize = 1;
+
+    /* Mirror the discovery URLs from the server config (includes hostnames from
+     * the network layers) */
+    rs->discoveryUrls = sc->applicationDescription.discoveryUrls;
+    rs->discoveryUrlsSize = sc->applicationDescription.discoveryUrlsSize;
+}
+
+static void
+register2AsyncResponse(UA_Client *client, void *userdata,
+                       UA_UInt32 requestId, void *resp) {
+    asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
+    const UA_ServerConfig *sc = ar->dm->serverConfig;
+    UA_RegisterServer2Response *response = (UA_RegisterServer2Response*)resp;
+
+    /* Success */
+    UA_StatusCode serviceResult = response->responseHeader.serviceResult;
+    if(serviceResult == UA_STATUSCODE_GOOD) {
+        /* Close the client connection, will be cleaned up in the client state
+         * callback when closing is complete */
+        UA_Client_disconnectSecureChannelAsync(ar->client);
+        UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
+                    "RegisterServer succeeded");
+        return;
+    }
+
+    /* Unrecoverable error */
+    if(serviceResult != UA_STATUSCODE_BADNOTIMPLEMENTED &&
+       serviceResult != UA_STATUSCODE_BADSERVICEUNSUPPORTED) {
+        /* Close the client connection, will be cleaned up in the client state
+         * callback when closing is complete */
+        UA_Client_disconnectSecureChannelAsync(ar->client);
+        UA_LOG_WARNING(&sc->logger, UA_LOGCATEGORY_SERVER,
+                       "RegisterServer failed with error %s",
+                       UA_StatusCode_name(serviceResult));
+        return;
+    }
+
+    /* Try RegisterServer */
+    UA_RegisterServerRequest request;
+    UA_RegisterServerRequest_init(&request);
+    setupRegisterRequest(ar, &request.requestHeader, &request.server);
+    UA_StatusCode res =
+        __UA_Client_AsyncService(client, &request,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST],
+                                 registerAsyncResponse,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE],
+                                 ar, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        /* Close the client connection, will be cleaned up in the client state
+         * callback when closing is complete */
+        UA_Client_disconnectSecureChannelAsync(ar->client);
+        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
+                     "RegisterServer2 failed with statuscode %s",
+                     UA_StatusCode_name(res));
+    }
+}
+
+static void
+discoveryClientStateCallback(UA_Client *client,
+                             UA_SecureChannelState channelState,
+                             UA_SessionState sessionState,
+                             UA_StatusCode connectStatus) {
+    asyncRegisterRequest *ar = (asyncRegisterRequest*)
+        UA_Client_getContext(client);
+    UA_ServerConfig *sc = ar->dm->serverConfig;
+
+    /* Connection failed */
+    if(connectStatus != UA_STATUSCODE_GOOD) {
+        if(connectStatus != UA_STATUSCODE_BADCONNECTIONCLOSED) {
+            UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+                         "Could not connect to the Discovery server with error %s",
+                         UA_StatusCode_name(connectStatus));
+        }
+        /* If fully closed, delete the client and clean up */
+        if(channelState == UA_SECURECHANNELSTATE_CLOSED)
+            asyncRegisterRequest_clearAsync(ar);
+        return;
+    }
+
+    /* Wait until the SecureChannel is open */
+    if(channelState != UA_SECURECHANNELSTATE_OPEN)
+        return;
+
+    /* Prepare the request. This does not allocate memory */
+    UA_RegisterServer2Request request;
+    UA_RegisterServer2Request_init(&request);
+    setupRegisterRequest(ar, &request.requestHeader, &request.server);
+
+    /* Set the configuration that is only available for UA_RegisterServer2Request */
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    UA_ExtensionObject mdnsConfig;
+    UA_ExtensionObject_setValueNoDelete(&mdnsConfig, &sc->mdnsConfig,
+                                        &UA_TYPES[UA_TYPES_MDNSDISCOVERYCONFIGURATION]);
+    request.discoveryConfigurationSize = 1;
+    request.discoveryConfiguration = &mdnsConfig;
+#endif
+
+    /* Try to call RegisterServer2 */
+    UA_StatusCode res =
+        __UA_Client_AsyncService(client, &request,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2REQUEST],
+                                 register2AsyncResponse,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2RESPONSE],
+                                 ar, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
+        /* Close the client connection, will be cleaned up in the client state
+         * callback when closing is complete */
+        UA_Client_disconnectSecureChannelAsync(ar->client);
+        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
+                     "RegisterServer2 failed with statuscode %s",
+                     UA_StatusCode_name(res));
+    }
+}
+
+static UA_StatusCode
+UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister,
+                   const UA_String discoveryServerUrl,
+                   const UA_String  semaphoreFilePath) {
+    /* Get the discovery manager */
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
+    if(!dm) {
+        UA_ClientConfig_clear(cc);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Check that the discovery manager is running */
+    UA_ServerConfig *sc = &server->config;
+    if(dm->sc.state != UA_LIFECYCLESTATE_STARTED) {
+        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+                     "The server must be started for registering");
+        UA_ClientConfig_clear(cc);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Find a free slot for storing the async request information */
+    asyncRegisterRequest *ar = NULL;
+    for(size_t i = 0; i < UA_MAXREGISTERREQUESTS; i++) {
+        if(dm->registerRequests[i].client == NULL) {
+            ar = &dm->registerRequests[i];
+            break;
+        }
+    }
+    if(!ar) {
+        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+                     "Too many outstanding register requests. Cannot proceed.");
+        UA_ClientConfig_clear(cc);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Use the EventLoop from the server for the client */
+    if(cc->eventLoop && !cc->externalEventLoop)
+        cc->eventLoop->free(cc->eventLoop);
+    cc->eventLoop = sc->eventLoop;
+    cc->externalEventLoop = true;
+
+    /* Use the logging from the server */
+    if(cc->logging->clear)
+        cc->logging->clear(&cc->logging);
+    cc->logging = sc->logging;
+
+    /* Set the state callback method and context */
+    cc->stateCallback = discoveryClientStateCallback;
+    cc->clientContext = ar;
+
+    /* Open only a SecureChannel */
+    cc->noSession = true;
+
+    /* Move the endpoint url */
+    UA_String_clear(&cc->endpointUrl);
+    UA_String_copy(&discoveryServerUrl, &cc->endpointUrl);
+
+    /* Instantiate the client */
+    ar->client = UA_Client_newWithConfig(cc);
+    if(!ar->client) {
+        UA_ClientConfig_clear(cc);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    /* Zero out the supplied config */
+    memset(cc, 0, sizeof(UA_ClientConfig));
+
+    /* Finish setting up the context */
+    ar->server = server;
+    ar->dm = dm;
+    ar->unregister = unregister;
+    UA_String_copy(&semaphoreFilePath, &ar->semaphoreFilePath);
+
+    /* Connect asynchronously. The register service is called once the
+     * connection is open. */
+    return __UA_Client_connect(ar->client, true);
+}
+
+UA_StatusCode
+UA_Server_registerDiscovery(UA_Server *server, UA_ClientConfig *cc,
+                            const UA_String discoveryServerUrl,
+                            const UA_String semaphoreFilePath) {
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                "Registering at the DiscoveryServer: %.*s",
+                (int)discoveryServerUrl.length, discoveryServerUrl.data);
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res =
+        UA_Server_register(server, cc, false, discoveryServerUrl, semaphoreFilePath);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_Server_deregisterDiscovery(UA_Server *server, UA_ClientConfig *cc,
+                              const UA_String discoveryServerUrl) {
+    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                "Deregistering at the DiscoveryServer: %.*s",
+                (int)discoveryServerUrl.length, discoveryServerUrl.data);
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res =
+        UA_Server_register(server, cc, true, discoveryServerUrl, UA_STRING_NULL);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 #endif /* UA_ENABLE_DISCOVERY */
diff --git a/src/server/ua_server_discovery.c b/src/server/ua_server_discovery.c
deleted file mode 100644
index 50fd68ed727..00000000000
--- a/src/server/ua_server_discovery.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2017 (c) HMS Industrial Networks AB (Author: Jonas Green)
- */
-
-#include <open62541/client.h>
-
-#include "ua_discovery_manager.h"
-
-#ifdef UA_ENABLE_DISCOVERY
-
-static void
-asyncRegisterRequest_clear(void *app, void *context) {
-    UA_Server *server = (UA_Server*)app;
-    asyncRegisterRequest *ar = (asyncRegisterRequest*)context;
-    UA_DiscoveryManager *dm = ar->dm;
-
-    UA_String_clear(&ar->semaphoreFilePath);
-    if(ar->client)
-        UA_Client_delete(ar->client);
-    memset(ar, 0, sizeof(asyncRegisterRequest));
-    
-    /* The Discovery manager is fully stopped? */
-    UA_DiscoveryManager_setState(server, dm, dm->sc.state);
-}
-
-static void
-asyncRegisterRequest_clearAsync(asyncRegisterRequest *ar) {
-    UA_Server *server = ar->server;
-    UA_ServerConfig *sc = &server->config;
-    UA_EventLoop *el = sc->eventLoop;
-
-    ar->cleanupCallback.callback = asyncRegisterRequest_clear;
-    ar->cleanupCallback.application = server;
-    ar->cleanupCallback.context = ar;
-    el->addDelayedCallback(el, &ar->cleanupCallback);
-}
-
-static void
-registerAsyncResponse(UA_Client *client, void *userdata,
-                      UA_UInt32 requestId, void *resp) {
-    asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
-    const UA_ServerConfig *sc = ar->dm->serverConfig;
-    UA_RegisterServerResponse *response = (UA_RegisterServerResponse*)resp;
-    if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
-                    "RegisterServer succeeded");
-    } else {
-        UA_LOG_WARNING(&sc->logger, UA_LOGCATEGORY_SERVER,
-                       "RegisterServer failed with statuscode %s",
-                       UA_StatusCode_name(response->responseHeader.serviceResult));
-    }
-
-    /* Close the client connection, will be cleaned up in the client state
-     * callback when closing is complete */
-    UA_Client_disconnectSecureChannelAsync(ar->client);
-}
-
-static void
-setupRegisterRequest(asyncRegisterRequest *ar, UA_RequestHeader *rh,
-                     UA_RegisteredServer *rs) {
-    UA_ServerConfig *sc = ar->dm->serverConfig;
-
-    rh->timeoutHint = 10000;
-
-    rs->isOnline = !ar->unregister;
-    rs->serverUri = sc->applicationDescription.applicationUri;
-    rs->productUri = sc->applicationDescription.productUri;
-    rs->serverType = sc->applicationDescription.applicationType;
-    rs->gatewayServerUri = sc->applicationDescription.gatewayServerUri;
-    rs->semaphoreFilePath = ar->semaphoreFilePath;
-
-    rs->serverNames = &sc->applicationDescription.applicationName;
-    rs->serverNamesSize = 1;
-
-    /* Mirror the discovery URLs from the server config (includes hostnames from
-     * the network layers) */
-    rs->discoveryUrls = sc->applicationDescription.discoveryUrls;
-    rs->discoveryUrlsSize = sc->applicationDescription.discoveryUrlsSize;
-}
-
-static void
-register2AsyncResponse(UA_Client *client, void *userdata,
-                       UA_UInt32 requestId, void *resp) {
-    asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
-    const UA_ServerConfig *sc = ar->dm->serverConfig;
-    UA_RegisterServer2Response *response = (UA_RegisterServer2Response*)resp;
-
-    /* Success */
-    UA_StatusCode serviceResult = response->responseHeader.serviceResult;
-    if(serviceResult == UA_STATUSCODE_GOOD) {
-        /* Close the client connection, will be cleaned up in the client state
-         * callback when closing is complete */
-        UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
-                    "RegisterServer succeeded");
-        return;
-    }
-
-    /* Unrecoverable error */
-    if(serviceResult != UA_STATUSCODE_BADNOTIMPLEMENTED &&
-       serviceResult != UA_STATUSCODE_BADSERVICEUNSUPPORTED) {
-        /* Close the client connection, will be cleaned up in the client state
-         * callback when closing is complete */
-        UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_WARNING(&sc->logger, UA_LOGCATEGORY_SERVER,
-                       "RegisterServer failed with error %s",
-                       UA_StatusCode_name(serviceResult));
-        return;
-    }
-
-    /* Try RegisterServer */
-    UA_RegisterServerRequest request;
-    UA_RegisterServerRequest_init(&request);
-    setupRegisterRequest(ar, &request.requestHeader, &request.server);
-    UA_StatusCode res =
-        __UA_Client_AsyncService(client, &request,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST],
-                                 registerAsyncResponse,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE],
-                                 ar, NULL);
-    if(res != UA_STATUSCODE_GOOD) {
-        /* Close the client connection, will be cleaned up in the client state
-         * callback when closing is complete */
-        UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
-                     "RegisterServer2 failed with statuscode %s",
-                     UA_StatusCode_name(res));
-    }
-}
-
-static void
-discoveryClientStateCallback(UA_Client *client,
-                             UA_SecureChannelState channelState,
-                             UA_SessionState sessionState,
-                             UA_StatusCode connectStatus) {
-    asyncRegisterRequest *ar = (asyncRegisterRequest*)
-        UA_Client_getContext(client);
-    UA_ServerConfig *sc = ar->dm->serverConfig;
-
-    /* Connection failed */
-    if(connectStatus != UA_STATUSCODE_GOOD) {
-        if(connectStatus != UA_STATUSCODE_BADCONNECTIONCLOSED) {
-            UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
-                         "Could not connect to the Discovery server with error %s",
-                         UA_StatusCode_name(connectStatus));
-        }
-        /* If fully closed, delete the client and clean up */
-        if(channelState == UA_SECURECHANNELSTATE_CLOSED)
-            asyncRegisterRequest_clearAsync(ar);
-        return;
-    }
-
-    /* Wait until the SecureChannel is open */
-    if(channelState != UA_SECURECHANNELSTATE_OPEN)
-        return;
-
-    /* Prepare the request. This does not allocate memory */
-    UA_RegisterServer2Request request;
-    UA_RegisterServer2Request_init(&request);
-    setupRegisterRequest(ar, &request.requestHeader, &request.server);
-
-    /* Set the configuration that is only available for UA_RegisterServer2Request */
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    UA_ExtensionObject mdnsConfig;
-    UA_ExtensionObject_setValueNoDelete(ar->request.discoveryConfiguration,
-                                        &sc->mdnsConfig,
-                                        &UA_TYPES[UA_TYPES_MDNSDISCOVERYCONFIGURATION]);
-    ar->request.discoveryConfigurationSize = 1;
-    ar->request.discoveryConfiguration = &mdnsConfig;
-#endif
-
-    /* Try to call RegisterServer2 */
-    UA_StatusCode res =
-        __UA_Client_AsyncService(client, &request,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2REQUEST],
-                                 register2AsyncResponse,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2RESPONSE],
-                                 ar, NULL);
-    if(res != UA_STATUSCODE_GOOD) {
-        /* Close the client connection, will be cleaned up in the client state
-         * callback when closing is complete */
-        UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
-                     "RegisterServer2 failed with statuscode %s",
-                     UA_StatusCode_name(res));
-    }
-}
-
-static UA_StatusCode
-UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister,
-                   const UA_String discoveryServerUrl,
-                   const UA_String  semaphoreFilePath) {
-    /* Get the discovery manager */
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
-        getServerComponentByName(server, UA_STRING("discovery"));
-    if(!dm) {
-        UA_ClientConfig_clear(cc);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Check that the discovery manager is running */
-    UA_ServerConfig *sc = &server->config;
-    if(dm->sc.state != UA_LIFECYCLESTATE_STARTED) {
-        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
-                     "The server must be started for registering");
-        UA_ClientConfig_clear(cc);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Find a free slot for storing the async request information */
-    asyncRegisterRequest *ar = NULL;
-    for(size_t i = 0; i < UA_MAXREGISTERREQUESTS; i++) {
-        if(dm->registerRequests[i].client == NULL) {
-            ar = &dm->registerRequests[i];
-            break;
-        }
-    }
-    if(!ar) {
-        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
-                     "Too many outstanding register requests. Cannot proceed.");
-        UA_ClientConfig_clear(cc);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    /* Use the EventLoop from the server for the client */
-    if(cc->eventLoop && !cc->externalEventLoop)
-        cc->eventLoop->free(cc->eventLoop);
-    cc->eventLoop = sc->eventLoop;
-    cc->externalEventLoop = true;
-
-    /* Use the logging from the server */
-    if(cc->logging->clear)
-        cc->logging->clear(&cc->logging);
-    cc->logging = sc->logging;
-
-    /* Set the state callback method and context */
-    cc->stateCallback = discoveryClientStateCallback;
-    cc->clientContext = ar;
-
-    /* Open only a SecureChannel */
-    cc->noSession = true;
-
-    /* Move the endpoint url */
-    UA_String_clear(&cc->endpointUrl);
-    UA_String_copy(&discoveryServerUrl, &cc->endpointUrl);
-
-    /* Instantiate the client */
-    ar->client = UA_Client_newWithConfig(cc);
-    if(!ar->client) {
-        UA_ClientConfig_clear(cc);
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-
-    /* Zero out the supplied config */
-    memset(cc, 0, sizeof(UA_ClientConfig));
-
-    /* Finish setting up the context */
-    ar->server = server;
-    ar->dm = dm;
-    ar->unregister = unregister;
-    UA_String_copy(&semaphoreFilePath, &ar->semaphoreFilePath);
-
-    /* Connect asynchronously. The register service is called once the
-     * connection is open. */
-    return __UA_Client_connect(ar->client, true);
-}
-
-UA_StatusCode
-UA_Server_registerDiscovery(UA_Server *server, UA_ClientConfig *cc,
-                            const UA_String discoveryServerUrl,
-                            const UA_String semaphoreFilePath) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Registering at the DiscoveryServer: %.*s",
-                (int)discoveryServerUrl.length, discoveryServerUrl.data);
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res =
-        UA_Server_register(server, cc, false, discoveryServerUrl, semaphoreFilePath);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-UA_StatusCode
-UA_Server_deregisterDiscovery(UA_Server *server, UA_ClientConfig *cc,
-                              const UA_String discoveryServerUrl) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
-                "Deregistering at the DiscoveryServer: %.*s",
-                (int)discoveryServerUrl.length, discoveryServerUrl.data);
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res =
-        UA_Server_register(server, cc, true, discoveryServerUrl, UA_STRING_NULL);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
-}
-
-#endif /* UA_ENABLE_DISCOVERY */

From 72bcb7b5d2a8d681f775647dab6ea828ddbe8869 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Oct 2023 23:32:42 +0200
Subject: [PATCH 1240/1963] refactor(server): Move FindServersOnNetwork to
 ua_services_discovery.c

---
 src/server/ua_services_discovery.c           | 91 ++++++++++++++++++++
 src/server/ua_services_discovery_multicast.c | 90 -------------------
 2 files changed, 91 insertions(+), 90 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index d149951256d..2fc7a5a4958 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -188,6 +188,97 @@ void Service_FindServers(UA_Server *server, UA_Session *session,
     }
 }
 
+#if defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST)
+/* All filter criteria must be fulfilled in the list entry. The comparison is
+ * case insensitive. Returns true if the entry matches the filter. */
+static UA_Boolean
+entryMatchesCapabilityFilter(size_t serverCapabilityFilterSize,
+                             UA_String *serverCapabilityFilter,
+                             serverOnNetwork_list_entry* current) {
+    /* If the entry has less capabilities defined than the filter, there's no match */
+    if(serverCapabilityFilterSize > current->serverOnNetwork.serverCapabilitiesSize)
+        return false;
+    for(size_t i = 0; i < serverCapabilityFilterSize; i++) {
+        UA_Boolean capabilityFound = false;
+        for(size_t j = 0; j < current->serverOnNetwork.serverCapabilitiesSize; j++) {
+            if(UA_String_equal_ignorecase(&serverCapabilityFilter[i],
+                               &current->serverOnNetwork.serverCapabilities[j])) {
+                capabilityFound = true;
+                break;
+            }
+        }
+        if(!capabilityFound)
+            return false;
+    }
+    return true;
+}
+
+void
+Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
+                             const UA_FindServersOnNetworkRequest *request,
+                             UA_FindServersOnNetworkResponse *response) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
+    if(!dm) {
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
+        return;
+    }
+
+    if(!server->config.mdnsEnabled) {
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTIMPLEMENTED;
+        return;
+    }
+
+    /* Set LastCounterResetTime */
+    response->lastCounterResetTime =
+        dm->serverOnNetworkRecordIdLastReset;
+
+    /* Compute the max number of records to return */
+    UA_UInt32 recordCount = 0;
+    if(request->startingRecordId < dm->serverOnNetworkRecordIdCounter)
+        recordCount = dm->serverOnNetworkRecordIdCounter - request->startingRecordId;
+    if(request->maxRecordsToReturn && recordCount > request->maxRecordsToReturn)
+        recordCount = UA_MIN(recordCount, request->maxRecordsToReturn);
+    if(recordCount == 0) {
+        response->serversSize = 0;
+        return;
+    }
+
+    /* Iterate over all records and add to filtered list */
+    UA_UInt32 filteredCount = 0;
+    UA_STACKARRAY(UA_ServerOnNetwork*, filtered, recordCount);
+    serverOnNetwork_list_entry* current;
+    LIST_FOREACH(current, &dm->serverOnNetwork, pointers) {
+        if(filteredCount >= recordCount)
+            break;
+        if(current->serverOnNetwork.recordId < request->startingRecordId)
+            continue;
+        if(!entryMatchesCapabilityFilter(request->serverCapabilityFilterSize,
+                               request->serverCapabilityFilter, current))
+            continue;
+        filtered[filteredCount++] = &current->serverOnNetwork;
+    }
+
+    if(filteredCount == 0)
+        return;
+
+    /* Allocate the array for the response */
+    response->servers = (UA_ServerOnNetwork*)
+        UA_malloc(sizeof(UA_ServerOnNetwork)*filteredCount);
+    if(!response->servers) {
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+        return;
+    }
+    response->serversSize = filteredCount;
+
+    /* Copy the server names */
+    for(size_t i = 0; i < filteredCount; i++)
+        UA_ServerOnNetwork_copy(filtered[i], &response->servers[filteredCount-i-1]);
+}
+#endif
+
 static const UA_String UA_SECURITY_POLICY_BASIC256SHA256_URI =
     UA_STRING_STATIC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
 
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
index 4978995dfe2..0448e5af1c4 100644
--- a/src/server/ua_services_discovery_multicast.c
+++ b/src/server/ua_services_discovery_multicast.c
@@ -8,7 +8,6 @@
  */
 
 #include "ua_discovery_manager.h"
-#include "ua_services.h"
 
 #include "../deps/mp_printf.h"
 
@@ -397,95 +396,6 @@ stopMulticastDiscoveryServer(UA_Server *server) {
     }
 }
 
-/* All filter criteria must be fulfilled in the list entry. The comparison is
- * case insensitive. Returns true if the entry matches the filter. */
-static UA_Boolean
-entryMatchesCapabilityFilter(size_t serverCapabilityFilterSize,
-                             UA_String *serverCapabilityFilter,
-                             serverOnNetwork_list_entry* current) {
-    /* If the entry has less capabilities defined than the filter, there's no match */
-    if(serverCapabilityFilterSize > current->serverOnNetwork.serverCapabilitiesSize)
-        return false;
-    for(size_t i = 0; i < serverCapabilityFilterSize; i++) {
-        UA_Boolean capabilityFound = false;
-        for(size_t j = 0; j < current->serverOnNetwork.serverCapabilitiesSize; j++) {
-            if(UA_String_equal_ignorecase(&serverCapabilityFilter[i],
-                               &current->serverOnNetwork.serverCapabilities[j])) {
-                capabilityFound = true;
-                break;
-            }
-        }
-        if(!capabilityFound)
-            return false;
-    }
-    return true;
-}
-
-void
-Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
-                             const UA_FindServersOnNetworkRequest *request,
-                             UA_FindServersOnNetworkResponse *response) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
-        getServerComponentByName(server, UA_STRING("discovery"));
-    if(!dm) {
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
-        return;
-    }
-
-    if(!server->config.mdnsEnabled) {
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTIMPLEMENTED;
-        return;
-    }
-
-    /* Set LastCounterResetTime */
-    response->lastCounterResetTime =
-        dm->serverOnNetworkRecordIdLastReset;
-
-    /* Compute the max number of records to return */
-    UA_UInt32 recordCount = 0;
-    if(request->startingRecordId < dm->serverOnNetworkRecordIdCounter)
-        recordCount = dm->serverOnNetworkRecordIdCounter - request->startingRecordId;
-    if(request->maxRecordsToReturn && recordCount > request->maxRecordsToReturn)
-        recordCount = UA_MIN(recordCount, request->maxRecordsToReturn);
-    if(recordCount == 0) {
-        response->serversSize = 0;
-        return;
-    }
-
-    /* Iterate over all records and add to filtered list */
-    UA_UInt32 filteredCount = 0;
-    UA_STACKARRAY(UA_ServerOnNetwork*, filtered, recordCount);
-    serverOnNetwork_list_entry* current;
-    LIST_FOREACH(current, &dm->serverOnNetwork, pointers) {
-        if(filteredCount >= recordCount)
-            break;
-        if(current->serverOnNetwork.recordId < request->startingRecordId)
-            continue;
-        if(!entryMatchesCapabilityFilter(request->serverCapabilityFilterSize,
-                               request->serverCapabilityFilter, current))
-            continue;
-        filtered[filteredCount++] = &current->serverOnNetwork;
-    }
-
-    if(filteredCount == 0)
-        return;
-
-    /* Allocate the array for the response */
-    response->servers = (UA_ServerOnNetwork*)
-        UA_malloc(sizeof(UA_ServerOnNetwork)*filteredCount);
-    if(!response->servers) {
-        response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
-        return;
-    }
-    response->serversSize = filteredCount;
-
-    /* Copy the server names */
-    for(size_t i = 0; i < filteredCount; i++)
-        UA_ServerOnNetwork_copy(filtered[i], &response->servers[filteredCount-i-1]);
-}
-
 void
 UA_Discovery_updateMdnsForDiscoveryUrl(UA_DiscoveryManager *dm, const UA_String *serverName,
                                        const UA_MdnsDiscoveryConfiguration *mdnsConfig,

From acb380a20a06ba9984c50523e48539266c3c9337 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Oct 2023 23:39:10 +0200
Subject: [PATCH 1241/1963] refactor(server): Merge
 ua_services_discovery_multicast.c into ua_server_discovery_mdns.c

---
 CMakeLists.txt                               |   1 -
 src/server/ua_server_discovery_mdns.c        | 751 ++++++++++++++++++
 src/server/ua_services_discovery_multicast.c | 772 -------------------
 3 files changed, 751 insertions(+), 773 deletions(-)
 delete mode 100644 src/server/ua_services_discovery_multicast.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81e0c4554f9..1846c93da0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -832,7 +832,6 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_monitoreditem.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_securechannel.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_nodemanagement.c
-                ${PROJECT_SOURCE_DIR}/src/server/ua_services_discovery_multicast.c
                 # pubsub
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_networkmessage.c
                 ${PROJECT_SOURCE_DIR}/src/pubsub/ua_pubsub_eventloop.c
diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_server_discovery_mdns.c
index 075b0225a5f..4374f1a3f55 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_server_discovery_mdns.c
@@ -4,6 +4,7 @@
  *
  *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
  *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
  */
 
 #include "ua_discovery_manager.h"
@@ -25,6 +26,8 @@
 # include <iphlpapi.h>
 # include <ws2tcpip.h>
 #else
+# include <sys/types.h>
+# include <sys/socket.h>
 # include <sys/time.h> // for struct timeval
 # include <netinet/in.h> // for struct ip_mreq
 # if defined(UA_HAS_GETIFADDR)
@@ -629,4 +632,752 @@ mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
 
 #endif /* _WIN32 */
 
+typedef enum {
+    UA_DISCOVERY_TCP,    /* OPC UA TCP mapping */
+    UA_DISCOVERY_TLS     /* OPC UA HTTPS mapping */
+} UA_DiscoveryProtocol;
+
+/* Create a mDNS Record for the given server info and adds it to the mDNS output
+ * queue.
+ *
+ * Additionally this method also adds the given server to the internal
+ * serversOnNetwork list so that a client finds it when calling
+ * FindServersOnNetwork. */
+static UA_StatusCode
+UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
+                       const UA_String *hostname, UA_UInt16 port,
+                       const UA_String *path, const UA_DiscoveryProtocol protocol,
+                       UA_Boolean createTxt, const UA_String* capabilites,
+                       const size_t capabilitiesSize,
+                       UA_Boolean isSelf);
+
+/* Create a mDNS Record for the given server info with TTL=0 and adds it to the
+ * mDNS output queue.
+ *
+ * Additionally this method also removes the given server from the internal
+ * serversOnNetwork list so that a client gets the updated data when calling
+ * FindServersOnNetwork. */
+static UA_StatusCode
+UA_Discovery_removeRecord(UA_DiscoveryManager *dm, const UA_String *servername,
+                          const UA_String *hostname, UA_UInt16 port,
+                          UA_Boolean removeTxt);
+
+static int
+discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg);
+
+static void
+mdnsAddConnection(UA_DiscoveryManager *dm, uintptr_t connectionId,
+                  UA_Boolean recv) {
+    if(!recv) {
+        dm->mdnsSendConnection = connectionId;
+        return;
+    }
+    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
+        if(dm->mdnsRecvConnections[i] == connectionId)
+            return;
+    }
+
+    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
+        if(dm->mdnsRecvConnections[i] != 0)
+            continue;
+        dm->mdnsRecvConnections[i] = connectionId;
+        dm->mdnsRecvConnectionsSize++;
+        break;
+    }
+}
+
+static void
+mdnsRemoveConnection(UA_DiscoveryManager *dm, uintptr_t connectionId,
+                     UA_Boolean recv) {
+    if(dm->mdnsSendConnection == connectionId) {
+        dm->mdnsSendConnection = 0;
+        return;
+    }
+    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
+        if(dm->mdnsRecvConnections[i] != connectionId)
+            continue;
+        dm->mdnsRecvConnections[i] = 0;
+        dm->mdnsRecvConnectionsSize--;
+        break;
+    }
+}
+
+static void
+MulticastDiscoveryCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                           void *application, void **connectionContext,
+                           UA_ConnectionState state, const UA_KeyValueMap *params,
+                           UA_ByteString msg, UA_Boolean recv) {
+    UA_Server *server = (UA_Server*)application;
+    UA_DiscoveryManager *dm = *(UA_DiscoveryManager**)connectionContext;
+
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
+        mdnsRemoveConnection(dm, connectionId, recv);
+
+        /* Fully stopped? Internally checks if all sockets are closed. */
+        UA_DiscoveryManager_setState(server, dm, dm->sc.state);
+
+        /* Restart mdns sockets if not shutting down */
+        if(dm->sc.state == UA_LIFECYCLESTATE_STARTED)
+            startMulticastDiscoveryServer(server);
+
+        return;
+    }
+
+    mdnsAddConnection(dm, connectionId, recv);
+
+    if(msg.length == 0)
+        return;
+
+    /* Prepare the sockaddrinfo */
+    const UA_UInt16 *port = (const UA_UInt16*)
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "remote-port"),
+                                 &UA_TYPES[UA_TYPES_UINT16]);
+    const UA_String *address = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "remote-address"),
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!port || !address)
+        return;
+
+    char portStr[16];
+    UA_UInt16 myPort = *port;
+    for(size_t i = 0; i < 16; i++) {
+        if(myPort == 0) {
+            portStr[i] = 0;
+            break;
+        }
+        unsigned char rem = (unsigned char)(myPort % 10);
+        portStr[i] = (char)(rem + 48); /* to ascii */
+        myPort = myPort / 10;
+    }
+
+    struct addrinfo *infoptr;
+    int res = getaddrinfo((const char*)address->data, portStr, NULL, &infoptr);
+    if(res != 0)
+        return;
+
+    /* Parse and process the message */
+    struct message mm;
+    memset(&mm, 0, sizeof(struct message));
+    UA_Boolean rr = message_parse(&mm, (unsigned char*)msg.data, msg.length);
+    if(rr)
+        mdnsd_in(dm->mdnsDaemon, &mm, infoptr->ai_addr,
+                 (unsigned short)infoptr->ai_addrlen);
+    freeaddrinfo(infoptr);
+}
+
+void
+sendMulticastMessages(UA_DiscoveryManager *dm) {
+    if(!dm->cm || dm->mdnsSendConnection == 0)
+        return;
+    UA_ConnectionManager *cm = dm->cm;
+
+    struct sockaddr ip;
+    memset(&ip, 0, sizeof(struct sockaddr));
+    ip.sa_family = AF_INET; /* Ipv4 */
+
+    struct message mm;
+    memset(&mm, 0, sizeof(struct message));
+
+    unsigned short sport = 0;
+    while(mdnsd_out(dm->mdnsDaemon, &mm, &ip, &sport) > 0) {
+        int len = message_packet_len(&mm);
+        char* buf = (char*)message_packet(&mm);
+        if(len > 0) {
+            UA_ByteString sendBuf = UA_BYTESTRING_NULL;
+            UA_StatusCode rv = cm->allocNetworkBuffer(cm, dm->mdnsSendConnection,
+                                                      &sendBuf, (size_t)len);
+            if(rv == UA_STATUSCODE_GOOD) {
+                memcpy(sendBuf.data, buf, sendBuf.length);
+                cm->sendWithConnection(cm, dm->mdnsSendConnection,
+                                       &UA_KEYVALUEMAP_NULL, &sendBuf);
+            }
+        }
+    }
+}
+
+static void
+MulticastDiscoveryRecvCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                               void *application, void **connectionContext,
+                               UA_ConnectionState state, const UA_KeyValueMap *params,
+                               UA_ByteString msg) {
+    MulticastDiscoveryCallback(cm, connectionId, application, connectionContext,
+                               state, params, msg, true);
+}
+
+static void
+MulticastDiscoverySendCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                               void *application, void **connectionContext,
+                               UA_ConnectionState state, const UA_KeyValueMap *params,
+                               UA_ByteString msg) {
+    MulticastDiscoveryCallback(cm, connectionId, application, connectionContext,
+                               state, params, msg, false);
+}
+
+static UA_StatusCode
+addMdnsRecordForNetworkLayer(UA_DiscoveryManager *dm, const UA_String *appName,
+                             const UA_String *discoveryUrl) {
+    UA_String hostname = UA_STRING_NULL;
+    UA_UInt16 port = 4840;
+    UA_String path = UA_STRING_NULL;
+    UA_StatusCode retval =
+        UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Server url is invalid: %.*s",
+                       (int)discoveryUrl->length, discoveryUrl->data);
+        return retval;
+    }
+
+    retval = UA_Discovery_addRecord(dm, appName, &hostname, port,
+                                    &path, UA_DISCOVERY_TCP, true,
+                                    dm->serverConfig->mdnsConfig.serverCapabilities,
+                                    dm->serverConfig->mdnsConfig.serverCapabilitiesSize,
+                                    true);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Cannot add mDNS Record: %s", UA_StatusCode_name(retval));
+        return retval;
+    }
+    return UA_STATUSCODE_GOOD;
+}
+
+#ifndef IN_ZERONET
+#define IN_ZERONET(addr) ((addr & IN_CLASSA_NET) == 0)
+#endif
+
+/* Create multicast 224.0.0.251:5353 socket */
+static void
+discovery_createMulticastSocket(UA_Server* server, UA_DiscoveryManager *dm) {
+    /* Find the connection manager */
+    if(!dm->cm) {
+        UA_String udpString = UA_STRING("udp");
+        for(UA_EventSource *es = server->config.eventLoop->eventSources;
+            es != NULL; es = es->next) {
+            /* Is this a usable connection manager? */
+            if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
+                continue;
+            UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
+            if(UA_String_equal(&udpString, &cm->protocol)) {
+                dm->cm = cm;
+                break;
+            }
+        }
+    }
+
+    if(!dm->cm) {
+        UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                     "No UDP communication supported");
+        return;
+    }
+
+    /* Set up the parameters */
+    UA_KeyValuePair params[6];
+    size_t paramsSize = 5;
+
+    UA_UInt16 port = 5353;
+    UA_String address = UA_STRING("224.0.0.251");
+    UA_UInt32 ttl = 255;
+    UA_Boolean reuse = true;
+    UA_Boolean listen = true;
+
+    params[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    params[1].key = UA_QUALIFIEDNAME(0, "address");
+    UA_Variant_setScalar(&params[1].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+    params[2].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&params[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    params[3].key = UA_QUALIFIEDNAME(0, "reuse");
+    UA_Variant_setScalar(&params[3].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    params[4].key = UA_QUALIFIEDNAME(0, "ttl");
+    UA_Variant_setScalar(&params[4].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
+    if(server->config.mdnsInterfaceIP.length > 0) {
+        params[5].key = UA_QUALIFIEDNAME(0, "interface");
+        UA_Variant_setScalar(&params[5].value, &server->config.mdnsInterfaceIP,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        paramsSize++;
+    }
+
+    /* Open the listen connection */
+    UA_KeyValueMap kvm = {paramsSize, params};
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+
+    if(dm->mdnsRecvConnectionsSize == 0) {
+        res = dm->cm->openConnection(dm->cm, &kvm, server, dm,
+                                     MulticastDiscoveryRecvCallback);
+        if(res != UA_STATUSCODE_GOOD)
+            UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                         "Could not create the mdns UDP multicast listen connection");
+    }
+
+    /* Open the send connection */
+    listen = false;
+    if(dm->mdnsSendConnection == 0) {
+        res = dm->cm->openConnection(dm->cm, &kvm, server, dm,
+                                     MulticastDiscoverySendCallback);
+        if(res != UA_STATUSCODE_GOOD)
+            UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                         "Could not create the mdns UDP multicast send connection");
+    }
+}
+
+void
+startMulticastDiscoveryServer(UA_Server *server) {
+    /* Initialize the mdns daemon */
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
+    if(!dm)
+        return;
+
+    if(!dm->mdnsDaemon) {
+        dm->mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
+        mdnsd_register_receive_callback(dm->mdnsDaemon, mdns_record_received, dm);
+    }
+
+#if defined(UA_ARCHITECTURE_WIN32) || defined(UA_ARCHITECTURE_WEC7)
+  WSADATA wsaData;
+  WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
+
+    /* Open the mdns listen socket */
+    if(dm->mdnsSendConnection == 0)
+        discovery_createMulticastSocket(server, dm);
+    if(dm->mdnsSendConnection == 0) {
+        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                     "Could not create multicast socket");
+        return;
+    }
+
+    /* Add record for the server itself */
+    UA_String *appName = &server->config.mdnsConfig.mdnsServerName;
+    for(size_t i = 0; i < server->config.serverUrlsSize; i++)
+        addMdnsRecordForNetworkLayer(dm, appName, &server->config.serverUrls[i]);
+
+    /* Send a multicast probe to find any other OPC UA server on the network
+     * through mDNS */
+    mdnsd_query(dm->mdnsDaemon, "_opcua-tcp._tcp.local.",
+                QTYPE_PTR,discovery_multicastQueryAnswer, server);
+}
+
+void
+stopMulticastDiscoveryServer(UA_Server *server) {
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
+    if(!dm)
+        return;
+
+    for(size_t i = 0; i < server->config.serverUrlsSize; i++) {
+        UA_String hostname = UA_STRING_NULL;
+        UA_String path = UA_STRING_NULL;
+        UA_UInt16 port = 0;
+
+        UA_StatusCode retval =
+            UA_parseEndpointUrl(&server->config.serverUrls[i],
+                                &hostname, &port, &path);
+
+        if(retval != UA_STATUSCODE_GOOD || hostname.length == 0)
+            continue;
+
+        UA_Discovery_removeRecord(dm, &server->config.mdnsConfig.mdnsServerName,
+                                  &hostname, port, true);
+    }
+
+    /* Stop the cyclic polling callback */
+    if(dm->mdnsCallbackId != 0) {
+        UA_EventLoop *el = server->config.eventLoop;
+        if(el) {
+            el->removeCyclicCallback(el, dm->mdnsCallbackId);
+            dm->mdnsCallbackId = 0;
+        }
+    }
+
+    /* Clean up mdns daemon */
+    if(dm->mdnsDaemon) {
+        mdnsd_shutdown(dm->mdnsDaemon);
+        mdnsd_free(dm->mdnsDaemon);
+        dm->mdnsDaemon = NULL;
+    }
+
+    /* Close the socket */
+    if(dm->cm) {
+        if(dm->mdnsSendConnection)
+            dm->cm->closeConnection(dm->cm, dm->mdnsSendConnection);
+        for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++)
+            if(dm->mdnsRecvConnections[i] != 0)
+                dm->cm->closeConnection(dm->cm, dm->mdnsRecvConnections[i]);
+    }
+}
+
+void
+UA_Discovery_updateMdnsForDiscoveryUrl(UA_DiscoveryManager *dm, const UA_String *serverName,
+                                       const UA_MdnsDiscoveryConfiguration *mdnsConfig,
+                                       const UA_String *discoveryUrl,
+                                       UA_Boolean isOnline, UA_Boolean updateTxt) {
+    UA_String hostname = UA_STRING_NULL;
+    UA_UInt16 port = 4840;
+    UA_String path = UA_STRING_NULL;
+    UA_StatusCode retval =
+        UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Server url invalid: %.*s",
+                       (int)discoveryUrl->length, discoveryUrl->data);
+        return;
+    }
+
+    if(!isOnline) {
+        UA_StatusCode removeRetval =
+                UA_Discovery_removeRecord(dm, serverName, &hostname,
+                                          port, updateTxt);
+        if(removeRetval != UA_STATUSCODE_GOOD)
+            UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                           "Could not remove mDNS record for hostname %.*s.",
+                           (int)serverName->length, serverName->data);
+        return;
+    }
+
+    UA_String *capabilities = NULL;
+    size_t capabilitiesSize = 0;
+    if(mdnsConfig) {
+        capabilities = mdnsConfig->serverCapabilities;
+        capabilitiesSize = mdnsConfig->serverCapabilitiesSize;
+    }
+
+    UA_StatusCode addRetval =
+        UA_Discovery_addRecord(dm, serverName, &hostname,
+                               port, &path, UA_DISCOVERY_TCP, updateTxt,
+                               capabilities, capabilitiesSize,
+                               false);
+    if(addRetval != UA_STATUSCODE_GOOD)
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Could not add mDNS record for hostname %.*s.",
+                       (int)serverName->length, serverName->data);
+}
+
+void
+UA_Server_setServerOnNetworkCallback(UA_Server *server,
+                                     UA_Server_serverOnNetworkCallback cb,
+                                     void* data) {
+    UA_LOCK(&server->serviceMutex);
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
+    if(dm) {
+        dm->serverOnNetworkCallback = cb;
+        dm->serverOnNetworkCallbackData = data;
+    }
+    UA_UNLOCK(&server->serviceMutex);
+}
+
+static void
+UA_Discovery_multicastConflict(char *name, int type, void *arg) {
+    /* In case logging is disabled */
+    (void)name;
+    (void)type;
+
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*) arg;
+    UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                 "Multicast DNS name conflict detected: "
+                 "'%s' for type %d", name, type);
+}
+
+/* Create a service domain with the format [servername]-[hostname]._opcua-tcp._tcp.local. */
+static void
+createFullServiceDomain(char *outServiceDomain, size_t maxLen,
+                        const UA_String *servername, const UA_String *hostname) {
+    size_t hostnameLen = hostname->length;
+    size_t servernameLen = servername->length;
+
+    maxLen -= 24; /* the length we have remaining before the opc ua postfix and
+                   * the trailing zero */
+
+    /* Can we use hostname and servername with full length? */
+    if(hostnameLen + servernameLen + 1 > maxLen) {
+        if(servernameLen + 2 > maxLen) {
+            servernameLen = maxLen;
+            hostnameLen = 0;
+        } else {
+            hostnameLen = maxLen - servernameLen - 1;
+        }
+    }
+
+    size_t offset = 0;
+    if(hostnameLen > 0) {
+        mp_snprintf(outServiceDomain, maxLen + 1, "%.*s-%.*s",
+                    (int) servernameLen, (char *) servername->data,
+                    (int) hostnameLen, (char *) hostname->data);
+        offset = servernameLen + hostnameLen + 1;
+        //replace all dots with minus. Otherwise mDNS is not valid
+        for(size_t i=servernameLen+1; i<offset; i++) {
+            if(outServiceDomain[i] == '.')
+                outServiceDomain[i] = '-';
+        }
+    } else {
+        mp_snprintf(outServiceDomain, maxLen + 1, "%.*s",
+                    (int) servernameLen, (char *) servername->data);
+        offset = servernameLen;
+    }
+    mp_snprintf(&outServiceDomain[offset], 24, "._opcua-tcp._tcp.local.");
+}
+
+/* Check if mDNS already has an entry for given hostname and port combination */
+static UA_Boolean
+UA_Discovery_recordExists(UA_DiscoveryManager *dm, const char* fullServiceDomain,
+                          unsigned short port, const UA_DiscoveryProtocol protocol) {
+    // [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname].
+    mdns_record_t *r  = mdnsd_get_published(dm->mdnsDaemon, fullServiceDomain);
+    while(r) {
+        const mdns_answer_t *data = mdnsd_record_data(r);
+        if(data->type == QTYPE_SRV && (port == 0 || data->srv.port == port))
+            return true;
+        r = mdnsd_record_next(r);
+    }
+    return false;
+}
+
+static int
+discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
+    UA_Server *server = (UA_Server*) arg;
+    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
+        getServerComponentByName(server, UA_STRING("discovery"));
+    if(!dm)
+        return 0;
+
+    if(a->type != QTYPE_PTR)
+        return 0;
+
+    if(a->rdname == NULL)
+        return 0;
+
+    /* Skip, if we already know about this server */
+    UA_Boolean exists =
+        UA_Discovery_recordExists(dm, a->rdname, 0, UA_DISCOVERY_TCP);
+    if(exists == true)
+        return 0;
+
+    if(mdnsd_has_query(dm->mdnsDaemon, a->rdname))
+        return 0;
+
+    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+                 "mDNS send query for: %s SRV&TXT %s", a->name, a->rdname);
+
+    mdnsd_query(dm->mdnsDaemon, a->rdname, QTYPE_SRV,
+                discovery_multicastQueryAnswer, server);
+    mdnsd_query(dm->mdnsDaemon, a->rdname, QTYPE_TXT,
+                discovery_multicastQueryAnswer, server);
+    return 0;
+}
+
+static UA_StatusCode
+UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
+                       const UA_String *hostname, UA_UInt16 port,
+                       const UA_String *path, const UA_DiscoveryProtocol protocol,
+                       UA_Boolean createTxt, const UA_String* capabilites,
+                       const size_t capabilitiesSize,
+                       UA_Boolean isSelf) {
+    /* We assume that the hostname is not an IP address, but a valid domain
+     * name. It is required by the OPC UA spec (see Part 12, DiscoveryURL to DNS
+     * SRV mapping) to always use the hostname instead of the IP address. */
+
+    if(capabilitiesSize > 0 && !capabilites)
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    size_t hostnameLen = hostname->length;
+    size_t servernameLen = servername->length;
+    if(hostnameLen == 0 || servernameLen == 0)
+        return UA_STATUSCODE_BADOUTOFRANGE;
+
+    /* Use a limit for the hostname length to make sure full string fits into 63
+     * chars (limited by DNS spec) */
+    if(hostnameLen+servernameLen + 1 > 63) { /* include dash between servername-hostname */
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Multicast DNS: Combination of hostname+servername exceeds "
+                       "maximum of 62 chars. It will be truncated.");
+    } else if(hostnameLen > 63) {
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Multicast DNS: Hostname length exceeds maximum of 63 chars. "
+                       "It will be truncated.");
+    }
+
+    if(!dm->mdnsMainSrvAdded) {
+        mdns_record_t *r =
+            mdnsd_shared(dm->mdnsDaemon, "_services._dns-sd._udp.local.",
+                         QTYPE_PTR, 600);
+        mdnsd_set_host(dm->mdnsDaemon, r, "_opcua-tcp._tcp.local.");
+        dm->mdnsMainSrvAdded = true;
+    }
+
+    /* [servername]-[hostname]._opcua-tcp._tcp.local. */
+    char fullServiceDomain[63+24];
+    createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
+
+    UA_Boolean exists = UA_Discovery_recordExists(dm, fullServiceDomain,
+                                                  port, protocol);
+    if(exists == true)
+        return UA_STATUSCODE_GOOD;
+
+    UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                "Multicast DNS: add record for domain: %s", fullServiceDomain);
+
+    if(isSelf && dm->selfFqdnMdnsRecord.length == 0) {
+        dm->selfFqdnMdnsRecord = UA_STRING_ALLOC(fullServiceDomain);
+        if(!dm->selfFqdnMdnsRecord.data)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    struct serverOnNetwork_list_entry *listEntry;
+    /* The servername is servername + hostname. It is the same which we get
+     * through mDNS and therefore we need to match servername */
+    UA_StatusCode retval =
+        UA_DiscoveryManager_addEntryToServersOnNetwork(dm, fullServiceDomain,
+                                                       fullServiceDomain,
+                                                       UA_MIN(63, (servernameLen+hostnameLen)+1),
+                                                       &listEntry);
+    if(retval != UA_STATUSCODE_GOOD &&
+       retval != UA_STATUSCODE_BADALREADYEXISTS)
+        return retval;
+
+    /* If entry is already in list, skip initialization of capabilities and txt+srv */
+    if(retval != UA_STATUSCODE_BADALREADYEXISTS) {
+        /* if capabilitiesSize is 0, then add default cap 'NA' */
+        listEntry->serverOnNetwork.serverCapabilitiesSize = UA_MAX(1, capabilitiesSize);
+        listEntry->serverOnNetwork.serverCapabilities = (UA_String *)
+            UA_Array_new(listEntry->serverOnNetwork.serverCapabilitiesSize,
+                         &UA_TYPES[UA_TYPES_STRING]);
+        if(!listEntry->serverOnNetwork.serverCapabilities)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        if(capabilitiesSize == 0) {
+            UA_String na;
+            na.length = 2;
+            na.data = (UA_Byte *) (uintptr_t) "NA";
+            UA_String_copy(&na, &listEntry->serverOnNetwork.serverCapabilities[0]);
+        } else {
+            for(size_t i = 0; i < capabilitiesSize; i++)
+                UA_String_copy(&capabilites[i],
+                               &listEntry->serverOnNetwork.serverCapabilities[i]);
+        }
+
+        listEntry->txtSet = true;
+
+        UA_STACKARRAY(char, newUrl, 10 + hostnameLen + 8 + path->length + 1);
+        mp_snprintf(newUrl, 10 + hostnameLen + 8 + path->length + 1,
+                    "opc.tcp://%.*s:%d%s%.*s", (int) hostnameLen,
+                    hostname->data, port, path->length > 0 ? "/" : "",
+                    (int) path->length, path->data);
+        listEntry->serverOnNetwork.discoveryUrl = UA_String_fromChars(newUrl);
+        listEntry->srvSet = true;
+    }
+
+    /* _services._dns-sd._udp.local. PTR _opcua-tcp._tcp.local */
+
+    /* check if there is already a PTR entry for the given service. */
+
+    /* _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local. */
+    mdns_record_t *r =
+        mdns_find_record(dm->mdnsDaemon, QTYPE_PTR,
+                         "_opcua-tcp._tcp.local.", fullServiceDomain);
+    if(!r) {
+        r = mdnsd_shared(dm->mdnsDaemon, "_opcua-tcp._tcp.local.",
+                         QTYPE_PTR, 600);
+        mdnsd_set_host(dm->mdnsDaemon, r, fullServiceDomain);
+    }
+
+    /* The first 63 characters of the hostname (or less) */
+    size_t maxHostnameLen = UA_MIN(hostnameLen, 63);
+    char localDomain[65];
+    memcpy(localDomain, hostname->data, maxHostnameLen);
+    localDomain[maxHostnameLen] = '.';
+    localDomain[maxHostnameLen+1] = '\0';
+
+    /* [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname]. */
+    r = mdnsd_unique(dm->mdnsDaemon, fullServiceDomain,
+                     QTYPE_SRV, 600, UA_Discovery_multicastConflict, dm);
+    mdnsd_set_srv(dm->mdnsDaemon, r, 0, 0, port, localDomain);
+
+    /* A/AAAA record for all ip addresses.
+     * [servername]-[hostname]._opcua-tcp._tcp.local. A [ip].
+     * [hostname]. A [ip]. */
+    mdns_set_address_record(dm, fullServiceDomain, localDomain);
+
+    /* TXT record: [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,... */
+    UA_STACKARRAY(char, pathChars, path->length + 1);
+    if(createTxt) {
+        if(path->length > 0)
+            memcpy(pathChars, path->data, path->length);
+        pathChars[path->length] = 0;
+        mdns_create_txt(dm, fullServiceDomain, pathChars, capabilites,
+                        capabilitiesSize, UA_Discovery_multicastConflict);
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+UA_Discovery_removeRecord(UA_DiscoveryManager *dm, const UA_String *servername,
+                          const UA_String *hostname, UA_UInt16 port,
+                          UA_Boolean removeTxt) {
+    /* use a limit for the hostname length to make sure full string fits into 63
+     * chars (limited by DNS spec) */
+    size_t hostnameLen = hostname->length;
+    size_t servernameLen = servername->length;
+    if(hostnameLen == 0 || servernameLen == 0)
+        return UA_STATUSCODE_BADOUTOFRANGE;
+
+    if(hostnameLen+servernameLen+1 > 63) { /* include dash between servername-hostname */
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Multicast DNS: Combination of hostname+servername exceeds "
+                       "maximum of 62 chars. It will be truncated.");
+    }
+
+    /* [servername]-[hostname]._opcua-tcp._tcp.local. */
+    char fullServiceDomain[63 + 24];
+    createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
+
+    UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                "Multicast DNS: remove record for domain: %s",
+                fullServiceDomain);
+
+    UA_StatusCode retval =
+        UA_DiscoveryManager_removeEntryFromServersOnNetwork(dm, fullServiceDomain,
+                   fullServiceDomain, UA_MIN(63, (servernameLen+hostnameLen)+1));
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local. */
+    mdns_record_t *r =
+        mdns_find_record(dm->mdnsDaemon, QTYPE_PTR,
+                         "_opcua-tcp._tcp.local.", fullServiceDomain);
+    if(!r) {
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Multicast DNS: could not remove record. "
+                       "PTR Record not found for domain: %s", fullServiceDomain);
+        return UA_STATUSCODE_BADNOTHINGTODO;
+    }
+    mdnsd_done(dm->mdnsDaemon, r);
+
+    /* looks for [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5
+     * port hostname.local. and TXT record:
+     * [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,...
+     * and A record: [servername]-[hostname]._opcua-tcp._tcp.local. A [ip] */
+    mdns_record_t *r2 =
+        mdnsd_get_published(dm->mdnsDaemon, fullServiceDomain);
+    if(!r2) {
+        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
+                       "Multicast DNS: could not remove record. Record not "
+                       "found for domain: %s", fullServiceDomain);
+        return UA_STATUSCODE_BADNOTHINGTODO;
+    }
+
+    while(r2) {
+        const mdns_answer_t *data = mdnsd_record_data(r2);
+        mdns_record_t *next = mdnsd_record_next(r2);
+        if((removeTxt && data->type == QTYPE_TXT) ||
+           (removeTxt && data->type == QTYPE_A) ||
+           data->srv.port == port) {
+            mdnsd_done(dm->mdnsDaemon, r2);
+        }
+        r2 = next;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
 #endif /* UA_ENABLE_DISCOVERY_MULTICAST */
diff --git a/src/server/ua_services_discovery_multicast.c b/src/server/ua_services_discovery_multicast.c
deleted file mode 100644
index 0448e5af1c4..00000000000
--- a/src/server/ua_services_discovery_multicast.c
+++ /dev/null
@@ -1,772 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- *    Copyright 2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- *    Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
- */
-
-#include "ua_discovery_manager.h"
-
-#include "../deps/mp_printf.h"
-
-#if defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST)
-
-#ifdef _WIN32
-# include <winsock2.h>
-#else
-# include <sys/types.h>
-# include <sys/socket.h>
-# include <netdb.h>
-#endif
-
-typedef enum {
-    UA_DISCOVERY_TCP,    /* OPC UA TCP mapping */
-    UA_DISCOVERY_TLS     /* OPC UA HTTPS mapping */
-} UA_DiscoveryProtocol;
-
-/* Create a mDNS Record for the given server info and adds it to the mDNS output
- * queue.
- *
- * Additionally this method also adds the given server to the internal
- * serversOnNetwork list so that a client finds it when calling
- * FindServersOnNetwork. */
-static UA_StatusCode
-UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
-                       const UA_String *hostname, UA_UInt16 port,
-                       const UA_String *path, const UA_DiscoveryProtocol protocol,
-                       UA_Boolean createTxt, const UA_String* capabilites,
-                       const size_t capabilitiesSize,
-                       UA_Boolean isSelf);
-
-/* Create a mDNS Record for the given server info with TTL=0 and adds it to the
- * mDNS output queue.
- *
- * Additionally this method also removes the given server from the internal
- * serversOnNetwork list so that a client gets the updated data when calling
- * FindServersOnNetwork. */
-static UA_StatusCode
-UA_Discovery_removeRecord(UA_DiscoveryManager *dm, const UA_String *servername,
-                          const UA_String *hostname, UA_UInt16 port,
-                          UA_Boolean removeTxt);
-
-static int
-discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg);
-
-static void
-mdnsAddConnection(UA_DiscoveryManager *dm, uintptr_t connectionId,
-                  UA_Boolean recv) {
-    if(!recv) {
-        dm->mdnsSendConnection = connectionId;
-        return;
-    }
-    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
-        if(dm->mdnsRecvConnections[i] == connectionId)
-            return;
-    }
-
-    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
-        if(dm->mdnsRecvConnections[i] != 0)
-            continue;
-        dm->mdnsRecvConnections[i] = connectionId;
-        dm->mdnsRecvConnectionsSize++;
-        break;
-    }
-}
-
-static void
-mdnsRemoveConnection(UA_DiscoveryManager *dm, uintptr_t connectionId,
-                     UA_Boolean recv) {
-    if(dm->mdnsSendConnection == connectionId) {
-        dm->mdnsSendConnection = 0;
-        return;
-    }
-    for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++) {
-        if(dm->mdnsRecvConnections[i] != connectionId)
-            continue;
-        dm->mdnsRecvConnections[i] = 0;
-        dm->mdnsRecvConnectionsSize--;
-        break;
-    }
-}
-
-static void
-MulticastDiscoveryCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                           void *application, void **connectionContext,
-                           UA_ConnectionState state, const UA_KeyValueMap *params,
-                           UA_ByteString msg, UA_Boolean recv) {
-    UA_Server *server = (UA_Server*)application;
-    UA_DiscoveryManager *dm = *(UA_DiscoveryManager**)connectionContext;
-
-    if(state == UA_CONNECTIONSTATE_CLOSING) {
-        mdnsRemoveConnection(dm, connectionId, recv);
-
-        /* Fully stopped? Internally checks if all sockets are closed. */
-        UA_DiscoveryManager_setState(server, dm, dm->sc.state);
-
-        /* Restart mdns sockets if not shutting down */
-        if(dm->sc.state == UA_LIFECYCLESTATE_STARTED)
-            startMulticastDiscoveryServer(server);
-
-        return;
-    }
-
-    mdnsAddConnection(dm, connectionId, recv);
-
-    if(msg.length == 0)
-        return;
-
-    /* Prepare the sockaddrinfo */
-    const UA_UInt16 *port = (const UA_UInt16*)
-        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "remote-port"),
-                                 &UA_TYPES[UA_TYPES_UINT16]);
-    const UA_String *address = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "remote-address"),
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(!port || !address)
-        return;
-
-    char portStr[16];
-    UA_UInt16 myPort = *port;
-    for(size_t i = 0; i < 16; i++) {
-        if(myPort == 0) {
-            portStr[i] = 0;
-            break;
-        }
-        unsigned char rem = (unsigned char)(myPort % 10);
-        portStr[i] = (char)(rem + 48); /* to ascii */
-        myPort = myPort / 10;
-    }
-
-    struct addrinfo *infoptr;
-    int res = getaddrinfo((const char*)address->data, portStr, NULL, &infoptr);
-    if(res != 0)
-        return;
-
-    /* Parse and process the message */
-    struct message mm;
-    memset(&mm, 0, sizeof(struct message));
-    UA_Boolean rr = message_parse(&mm, (unsigned char*)msg.data, msg.length);
-    if(rr)
-        mdnsd_in(dm->mdnsDaemon, &mm, infoptr->ai_addr,
-                 (unsigned short)infoptr->ai_addrlen);
-    freeaddrinfo(infoptr);
-}
-
-void
-sendMulticastMessages(UA_DiscoveryManager *dm) {
-    if(!dm->cm || dm->mdnsSendConnection == 0)
-        return;
-    UA_ConnectionManager *cm = dm->cm;
-
-    struct sockaddr ip;
-    memset(&ip, 0, sizeof(struct sockaddr));
-    ip.sa_family = AF_INET; /* Ipv4 */
-
-    struct message mm;
-    memset(&mm, 0, sizeof(struct message));
-
-    unsigned short sport = 0;
-    while(mdnsd_out(dm->mdnsDaemon, &mm, &ip, &sport) > 0) {
-        int len = message_packet_len(&mm);
-        char* buf = (char*)message_packet(&mm);
-        if(len > 0) {
-            UA_ByteString sendBuf = UA_BYTESTRING_NULL;
-            UA_StatusCode rv = cm->allocNetworkBuffer(cm, dm->mdnsSendConnection,
-                                                      &sendBuf, (size_t)len);
-            if(rv == UA_STATUSCODE_GOOD) {
-                memcpy(sendBuf.data, buf, sendBuf.length);
-                cm->sendWithConnection(cm, dm->mdnsSendConnection,
-                                       &UA_KEYVALUEMAP_NULL, &sendBuf);
-            }
-        }
-    }
-}
-
-static void
-MulticastDiscoveryRecvCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                               void *application, void **connectionContext,
-                               UA_ConnectionState state, const UA_KeyValueMap *params,
-                               UA_ByteString msg) {
-    MulticastDiscoveryCallback(cm, connectionId, application, connectionContext,
-                               state, params, msg, true);
-}
-
-static void
-MulticastDiscoverySendCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                               void *application, void **connectionContext,
-                               UA_ConnectionState state, const UA_KeyValueMap *params,
-                               UA_ByteString msg) {
-    MulticastDiscoveryCallback(cm, connectionId, application, connectionContext,
-                               state, params, msg, false);
-}
-
-static UA_StatusCode
-addMdnsRecordForNetworkLayer(UA_DiscoveryManager *dm, const UA_String *appName,
-                             const UA_String *discoveryUrl) {
-    UA_String hostname = UA_STRING_NULL;
-    UA_UInt16 port = 4840;
-    UA_String path = UA_STRING_NULL;
-    UA_StatusCode retval =
-        UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Server url is invalid: %.*s",
-                       (int)discoveryUrl->length, discoveryUrl->data);
-        return retval;
-    }
-
-    retval = UA_Discovery_addRecord(dm, appName, &hostname, port,
-                                    &path, UA_DISCOVERY_TCP, true,
-                                    dm->serverConfig->mdnsConfig.serverCapabilities,
-                                    dm->serverConfig->mdnsConfig.serverCapabilitiesSize,
-                                    true);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Cannot add mDNS Record: %s", UA_StatusCode_name(retval));
-        return retval;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-#ifndef IN_ZERONET
-#define IN_ZERONET(addr) ((addr & IN_CLASSA_NET) == 0)
-#endif
-
-/* Create multicast 224.0.0.251:5353 socket */
-static void
-discovery_createMulticastSocket(UA_Server* server, UA_DiscoveryManager *dm) {
-    /* Find the connection manager */
-    if(!dm->cm) {
-        UA_String udpString = UA_STRING("udp");
-        for(UA_EventSource *es = server->config.eventLoop->eventSources;
-            es != NULL; es = es->next) {
-            /* Is this a usable connection manager? */
-            if(es->eventSourceType != UA_EVENTSOURCETYPE_CONNECTIONMANAGER)
-                continue;
-            UA_ConnectionManager *cm = (UA_ConnectionManager*)es;
-            if(UA_String_equal(&udpString, &cm->protocol)) {
-                dm->cm = cm;
-                break;
-            }
-        }
-    }
-
-    if(!dm->cm) {
-        UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                     "No UDP communication supported");
-        return;
-    }
-
-    /* Set up the parameters */
-    UA_KeyValuePair params[6];
-    size_t paramsSize = 5;
-
-    UA_UInt16 port = 5353;
-    UA_String address = UA_STRING("224.0.0.251");
-    UA_UInt32 ttl = 255;
-    UA_Boolean reuse = true;
-    UA_Boolean listen = true;
-
-    params[0].key = UA_QUALIFIEDNAME(0, "port");
-    UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    params[1].key = UA_QUALIFIEDNAME(0, "address");
-    UA_Variant_setScalar(&params[1].value, &address, &UA_TYPES[UA_TYPES_STRING]);
-    params[2].key = UA_QUALIFIEDNAME(0, "listen");
-    UA_Variant_setScalar(&params[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    params[3].key = UA_QUALIFIEDNAME(0, "reuse");
-    UA_Variant_setScalar(&params[3].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    params[4].key = UA_QUALIFIEDNAME(0, "ttl");
-    UA_Variant_setScalar(&params[4].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
-    if(server->config.mdnsInterfaceIP.length > 0) {
-        params[5].key = UA_QUALIFIEDNAME(0, "interface");
-        UA_Variant_setScalar(&params[5].value, &server->config.mdnsInterfaceIP,
-                             &UA_TYPES[UA_TYPES_STRING]);
-        paramsSize++;
-    }
-
-    /* Open the listen connection */
-    UA_KeyValueMap kvm = {paramsSize, params};
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-
-    if(dm->mdnsRecvConnectionsSize == 0) {
-        res = dm->cm->openConnection(dm->cm, &kvm, server, dm,
-                                     MulticastDiscoveryRecvCallback);
-        if(res != UA_STATUSCODE_GOOD)
-            UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                         "Could not create the mdns UDP multicast listen connection");
-    }
-
-    /* Open the send connection */
-    listen = false;
-    if(dm->mdnsSendConnection == 0) {
-        res = dm->cm->openConnection(dm->cm, &kvm, server, dm,
-                                     MulticastDiscoverySendCallback);
-        if(res != UA_STATUSCODE_GOOD)
-            UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                         "Could not create the mdns UDP multicast send connection");
-    }
-}
-
-void
-startMulticastDiscoveryServer(UA_Server *server) {
-    /* Initialize the mdns daemon */
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
-        getServerComponentByName(server, UA_STRING("discovery"));
-    if(!dm)
-        return;
-
-    if(!dm->mdnsDaemon) {
-        dm->mdnsDaemon = mdnsd_new(QCLASS_IN, 1000);
-        mdnsd_register_receive_callback(dm->mdnsDaemon, mdns_record_received, dm);
-    }
-
-#if defined(UA_ARCHITECTURE_WIN32) || defined(UA_ARCHITECTURE_WEC7)
-  WSADATA wsaData;
-  WSAStartup(MAKEWORD(2, 2), &wsaData);
-#endif
-
-    /* Open the mdns listen socket */
-    if(dm->mdnsSendConnection == 0)
-        discovery_createMulticastSocket(server, dm);
-    if(dm->mdnsSendConnection == 0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                     "Could not create multicast socket");
-        return;
-    }
-
-    /* Add record for the server itself */
-    UA_String *appName = &server->config.mdnsConfig.mdnsServerName;
-    for(size_t i = 0; i < server->config.serverUrlsSize; i++)
-        addMdnsRecordForNetworkLayer(dm, appName, &server->config.serverUrls[i]);
-
-    /* Send a multicast probe to find any other OPC UA server on the network
-     * through mDNS */
-    mdnsd_query(dm->mdnsDaemon, "_opcua-tcp._tcp.local.",
-                QTYPE_PTR,discovery_multicastQueryAnswer, server);
-}
-
-void
-stopMulticastDiscoveryServer(UA_Server *server) {
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
-        getServerComponentByName(server, UA_STRING("discovery"));
-    if(!dm)
-        return;
-
-    for(size_t i = 0; i < server->config.serverUrlsSize; i++) {
-        UA_String hostname = UA_STRING_NULL;
-        UA_String path = UA_STRING_NULL;
-        UA_UInt16 port = 0;
-
-        UA_StatusCode retval =
-            UA_parseEndpointUrl(&server->config.serverUrls[i],
-                                &hostname, &port, &path);
-
-        if(retval != UA_STATUSCODE_GOOD || hostname.length == 0)
-            continue;
-
-        UA_Discovery_removeRecord(dm, &server->config.mdnsConfig.mdnsServerName,
-                                  &hostname, port, true);
-    }
-
-    /* Stop the cyclic polling callback */
-    if(dm->mdnsCallbackId != 0) {
-        UA_EventLoop *el = server->config.eventLoop;
-        if(el) {
-            el->removeCyclicCallback(el, dm->mdnsCallbackId);
-            dm->mdnsCallbackId = 0;
-        }
-    }
-
-    /* Clean up mdns daemon */
-    if(dm->mdnsDaemon) {
-        mdnsd_shutdown(dm->mdnsDaemon);
-        mdnsd_free(dm->mdnsDaemon);
-        dm->mdnsDaemon = NULL;
-    }
-
-    /* Close the socket */
-    if(dm->cm) {
-        if(dm->mdnsSendConnection)
-            dm->cm->closeConnection(dm->cm, dm->mdnsSendConnection);
-        for(size_t i = 0; i < UA_MAXMDNSRECVSOCKETS; i++)
-            if(dm->mdnsRecvConnections[i] != 0)
-                dm->cm->closeConnection(dm->cm, dm->mdnsRecvConnections[i]);
-    }
-}
-
-void
-UA_Discovery_updateMdnsForDiscoveryUrl(UA_DiscoveryManager *dm, const UA_String *serverName,
-                                       const UA_MdnsDiscoveryConfiguration *mdnsConfig,
-                                       const UA_String *discoveryUrl,
-                                       UA_Boolean isOnline, UA_Boolean updateTxt) {
-    UA_String hostname = UA_STRING_NULL;
-    UA_UInt16 port = 4840;
-    UA_String path = UA_STRING_NULL;
-    UA_StatusCode retval =
-        UA_parseEndpointUrl(discoveryUrl, &hostname, &port, &path);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Server url invalid: %.*s",
-                       (int)discoveryUrl->length, discoveryUrl->data);
-        return;
-    }
-
-    if(!isOnline) {
-        UA_StatusCode removeRetval =
-                UA_Discovery_removeRecord(dm, serverName, &hostname,
-                                          port, updateTxt);
-        if(removeRetval != UA_STATUSCODE_GOOD)
-            UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                           "Could not remove mDNS record for hostname %.*s.",
-                           (int)serverName->length, serverName->data);
-        return;
-    }
-
-    UA_String *capabilities = NULL;
-    size_t capabilitiesSize = 0;
-    if(mdnsConfig) {
-        capabilities = mdnsConfig->serverCapabilities;
-        capabilitiesSize = mdnsConfig->serverCapabilitiesSize;
-    }
-
-    UA_StatusCode addRetval =
-        UA_Discovery_addRecord(dm, serverName, &hostname,
-                               port, &path, UA_DISCOVERY_TCP, updateTxt,
-                               capabilities, capabilitiesSize,
-                               false);
-    if(addRetval != UA_STATUSCODE_GOOD)
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Could not add mDNS record for hostname %.*s.",
-                       (int)serverName->length, serverName->data);
-}
-
-void
-UA_Server_setServerOnNetworkCallback(UA_Server *server,
-                                     UA_Server_serverOnNetworkCallback cb,
-                                     void* data) {
-    UA_LOCK(&server->serviceMutex);
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
-        getServerComponentByName(server, UA_STRING("discovery"));
-    if(dm) {
-        dm->serverOnNetworkCallback = cb;
-        dm->serverOnNetworkCallbackData = data;
-    }
-    UA_UNLOCK(&server->serviceMutex);
-}
-
-static void
-UA_Discovery_multicastConflict(char *name, int type, void *arg) {
-    /* In case logging is disabled */
-    (void)name;
-    (void)type;
-
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*) arg;
-    UA_LOG_ERROR(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                 "Multicast DNS name conflict detected: "
-                 "'%s' for type %d", name, type);
-}
-
-/* Create a service domain with the format [servername]-[hostname]._opcua-tcp._tcp.local. */
-static void
-createFullServiceDomain(char *outServiceDomain, size_t maxLen,
-                        const UA_String *servername, const UA_String *hostname) {
-    size_t hostnameLen = hostname->length;
-    size_t servernameLen = servername->length;
-
-    maxLen -= 24; /* the length we have remaining before the opc ua postfix and
-                   * the trailing zero */
-
-    /* Can we use hostname and servername with full length? */
-    if(hostnameLen + servernameLen + 1 > maxLen) {
-        if(servernameLen + 2 > maxLen) {
-            servernameLen = maxLen;
-            hostnameLen = 0;
-        } else {
-            hostnameLen = maxLen - servernameLen - 1;
-        }
-    }
-
-    size_t offset = 0;
-    if(hostnameLen > 0) {
-        mp_snprintf(outServiceDomain, maxLen + 1, "%.*s-%.*s",
-                    (int) servernameLen, (char *) servername->data,
-                    (int) hostnameLen, (char *) hostname->data);
-        offset = servernameLen + hostnameLen + 1;
-        //replace all dots with minus. Otherwise mDNS is not valid
-        for(size_t i=servernameLen+1; i<offset; i++) {
-            if(outServiceDomain[i] == '.')
-                outServiceDomain[i] = '-';
-        }
-    } else {
-        mp_snprintf(outServiceDomain, maxLen + 1, "%.*s",
-                    (int) servernameLen, (char *) servername->data);
-        offset = servernameLen;
-    }
-    mp_snprintf(&outServiceDomain[offset], 24, "._opcua-tcp._tcp.local.");
-}
-
-/* Check if mDNS already has an entry for given hostname and port combination */
-static UA_Boolean
-UA_Discovery_recordExists(UA_DiscoveryManager *dm, const char* fullServiceDomain,
-                          unsigned short port, const UA_DiscoveryProtocol protocol) {
-    // [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname].
-    mdns_record_t *r  = mdnsd_get_published(dm->mdnsDaemon, fullServiceDomain);
-    while(r) {
-        const mdns_answer_t *data = mdnsd_record_data(r);
-        if(data->type == QTYPE_SRV && (port == 0 || data->srv.port == port))
-            return true;
-        r = mdnsd_record_next(r);
-    }
-    return false;
-}
-
-static int
-discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
-    UA_Server *server = (UA_Server*) arg;
-    UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
-        getServerComponentByName(server, UA_STRING("discovery"));
-    if(!dm)
-        return 0;
-
-    if(a->type != QTYPE_PTR)
-        return 0;
-
-    if(a->rdname == NULL)
-        return 0;
-
-    /* Skip, if we already know about this server */
-    UA_Boolean exists =
-        UA_Discovery_recordExists(dm, a->rdname, 0, UA_DISCOVERY_TCP);
-    if(exists == true)
-        return 0;
-
-    if(mdnsd_has_query(dm->mdnsDaemon, a->rdname))
-        return 0;
-
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
-                 "mDNS send query for: %s SRV&TXT %s", a->name, a->rdname);
-
-    mdnsd_query(dm->mdnsDaemon, a->rdname, QTYPE_SRV,
-                discovery_multicastQueryAnswer, server);
-    mdnsd_query(dm->mdnsDaemon, a->rdname, QTYPE_TXT,
-                discovery_multicastQueryAnswer, server);
-    return 0;
-}
-
-static UA_StatusCode
-UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
-                       const UA_String *hostname, UA_UInt16 port,
-                       const UA_String *path, const UA_DiscoveryProtocol protocol,
-                       UA_Boolean createTxt, const UA_String* capabilites,
-                       const size_t capabilitiesSize,
-                       UA_Boolean isSelf) {
-    /* We assume that the hostname is not an IP address, but a valid domain
-     * name. It is required by the OPC UA spec (see Part 12, DiscoveryURL to DNS
-     * SRV mapping) to always use the hostname instead of the IP address. */
-
-    if(capabilitiesSize > 0 && !capabilites)
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-
-    size_t hostnameLen = hostname->length;
-    size_t servernameLen = servername->length;
-    if(hostnameLen == 0 || servernameLen == 0)
-        return UA_STATUSCODE_BADOUTOFRANGE;
-
-    /* Use a limit for the hostname length to make sure full string fits into 63
-     * chars (limited by DNS spec) */
-    if(hostnameLen+servernameLen + 1 > 63) { /* include dash between servername-hostname */
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Multicast DNS: Combination of hostname+servername exceeds "
-                       "maximum of 62 chars. It will be truncated.");
-    } else if(hostnameLen > 63) {
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Multicast DNS: Hostname length exceeds maximum of 63 chars. "
-                       "It will be truncated.");
-    }
-
-    if(!dm->mdnsMainSrvAdded) {
-        mdns_record_t *r =
-            mdnsd_shared(dm->mdnsDaemon, "_services._dns-sd._udp.local.",
-                         QTYPE_PTR, 600);
-        mdnsd_set_host(dm->mdnsDaemon, r, "_opcua-tcp._tcp.local.");
-        dm->mdnsMainSrvAdded = true;
-    }
-
-    /* [servername]-[hostname]._opcua-tcp._tcp.local. */
-    char fullServiceDomain[63+24];
-    createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
-
-    UA_Boolean exists = UA_Discovery_recordExists(dm, fullServiceDomain,
-                                                  port, protocol);
-    if(exists == true)
-        return UA_STATUSCODE_GOOD;
-
-    UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                "Multicast DNS: add record for domain: %s", fullServiceDomain);
-
-    if(isSelf && dm->selfFqdnMdnsRecord.length == 0) {
-        dm->selfFqdnMdnsRecord = UA_STRING_ALLOC(fullServiceDomain);
-        if(!dm->selfFqdnMdnsRecord.data)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
-
-    struct serverOnNetwork_list_entry *listEntry;
-    /* The servername is servername + hostname. It is the same which we get
-     * through mDNS and therefore we need to match servername */
-    UA_StatusCode retval =
-        UA_DiscoveryManager_addEntryToServersOnNetwork(dm, fullServiceDomain,
-                                                       fullServiceDomain,
-                                                       UA_MIN(63, (servernameLen+hostnameLen)+1),
-                                                       &listEntry);
-    if(retval != UA_STATUSCODE_GOOD &&
-       retval != UA_STATUSCODE_BADALREADYEXISTS)
-        return retval;
-
-    /* If entry is already in list, skip initialization of capabilities and txt+srv */
-    if(retval != UA_STATUSCODE_BADALREADYEXISTS) {
-        /* if capabilitiesSize is 0, then add default cap 'NA' */
-        listEntry->serverOnNetwork.serverCapabilitiesSize = UA_MAX(1, capabilitiesSize);
-        listEntry->serverOnNetwork.serverCapabilities = (UA_String *)
-            UA_Array_new(listEntry->serverOnNetwork.serverCapabilitiesSize,
-                         &UA_TYPES[UA_TYPES_STRING]);
-        if(!listEntry->serverOnNetwork.serverCapabilities)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        if(capabilitiesSize == 0) {
-            UA_String na;
-            na.length = 2;
-            na.data = (UA_Byte *) (uintptr_t) "NA";
-            UA_String_copy(&na, &listEntry->serverOnNetwork.serverCapabilities[0]);
-        } else {
-            for(size_t i = 0; i < capabilitiesSize; i++)
-                UA_String_copy(&capabilites[i],
-                               &listEntry->serverOnNetwork.serverCapabilities[i]);
-        }
-
-        listEntry->txtSet = true;
-
-        UA_STACKARRAY(char, newUrl, 10 + hostnameLen + 8 + path->length + 1);
-        mp_snprintf(newUrl, 10 + hostnameLen + 8 + path->length + 1,
-                    "opc.tcp://%.*s:%d%s%.*s", (int) hostnameLen,
-                    hostname->data, port, path->length > 0 ? "/" : "",
-                    (int) path->length, path->data);
-        listEntry->serverOnNetwork.discoveryUrl = UA_String_fromChars(newUrl);
-        listEntry->srvSet = true;
-    }
-
-    /* _services._dns-sd._udp.local. PTR _opcua-tcp._tcp.local */
-
-    /* check if there is already a PTR entry for the given service. */
-
-    /* _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local. */
-    mdns_record_t *r =
-        mdns_find_record(dm->mdnsDaemon, QTYPE_PTR,
-                         "_opcua-tcp._tcp.local.", fullServiceDomain);
-    if(!r) {
-        r = mdnsd_shared(dm->mdnsDaemon, "_opcua-tcp._tcp.local.",
-                         QTYPE_PTR, 600);
-        mdnsd_set_host(dm->mdnsDaemon, r, fullServiceDomain);
-    }
-
-    /* The first 63 characters of the hostname (or less) */
-    size_t maxHostnameLen = UA_MIN(hostnameLen, 63);
-    char localDomain[65];
-    memcpy(localDomain, hostname->data, maxHostnameLen);
-    localDomain[maxHostnameLen] = '.';
-    localDomain[maxHostnameLen+1] = '\0';
-
-    /* [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname]. */
-    r = mdnsd_unique(dm->mdnsDaemon, fullServiceDomain,
-                     QTYPE_SRV, 600, UA_Discovery_multicastConflict, dm);
-    mdnsd_set_srv(dm->mdnsDaemon, r, 0, 0, port, localDomain);
-
-    /* A/AAAA record for all ip addresses.
-     * [servername]-[hostname]._opcua-tcp._tcp.local. A [ip].
-     * [hostname]. A [ip]. */
-    mdns_set_address_record(dm, fullServiceDomain, localDomain);
-
-    /* TXT record: [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,... */
-    UA_STACKARRAY(char, pathChars, path->length + 1);
-    if(createTxt) {
-        if(path->length > 0)
-            memcpy(pathChars, path->data, path->length);
-        pathChars[path->length] = 0;
-        mdns_create_txt(dm, fullServiceDomain, pathChars, capabilites,
-                        capabilitiesSize, UA_Discovery_multicastConflict);
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-UA_Discovery_removeRecord(UA_DiscoveryManager *dm, const UA_String *servername,
-                          const UA_String *hostname, UA_UInt16 port,
-                          UA_Boolean removeTxt) {
-    /* use a limit for the hostname length to make sure full string fits into 63
-     * chars (limited by DNS spec) */
-    size_t hostnameLen = hostname->length;
-    size_t servernameLen = servername->length;
-    if(hostnameLen == 0 || servernameLen == 0)
-        return UA_STATUSCODE_BADOUTOFRANGE;
-
-    if(hostnameLen+servernameLen+1 > 63) { /* include dash between servername-hostname */
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Multicast DNS: Combination of hostname+servername exceeds "
-                       "maximum of 62 chars. It will be truncated.");
-    }
-
-    /* [servername]-[hostname]._opcua-tcp._tcp.local. */
-    char fullServiceDomain[63 + 24];
-    createFullServiceDomain(fullServiceDomain, 63+24, servername, hostname);
-
-    UA_LOG_INFO(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                "Multicast DNS: remove record for domain: %s",
-                fullServiceDomain);
-
-    UA_StatusCode retval =
-        UA_DiscoveryManager_removeEntryFromServersOnNetwork(dm, fullServiceDomain,
-                   fullServiceDomain, UA_MIN(63, (servernameLen+hostnameLen)+1));
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
-
-    /* _opcua-tcp._tcp.local. PTR [servername]-[hostname]._opcua-tcp._tcp.local. */
-    mdns_record_t *r =
-        mdns_find_record(dm->mdnsDaemon, QTYPE_PTR,
-                         "_opcua-tcp._tcp.local.", fullServiceDomain);
-    if(!r) {
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Multicast DNS: could not remove record. "
-                       "PTR Record not found for domain: %s", fullServiceDomain);
-        return UA_STATUSCODE_BADNOTHINGTODO;
-    }
-    mdnsd_done(dm->mdnsDaemon, r);
-
-    /* looks for [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5
-     * port hostname.local. and TXT record:
-     * [servername]-[hostname]._opcua-tcp._tcp.local. TXT path=/ caps=NA,DA,...
-     * and A record: [servername]-[hostname]._opcua-tcp._tcp.local. A [ip] */
-    mdns_record_t *r2 =
-        mdnsd_get_published(dm->mdnsDaemon, fullServiceDomain);
-    if(!r2) {
-        UA_LOG_WARNING(dm->logging, UA_LOGCATEGORY_DISCOVERY,
-                       "Multicast DNS: could not remove record. Record not "
-                       "found for domain: %s", fullServiceDomain);
-        return UA_STATUSCODE_BADNOTHINGTODO;
-    }
-
-    while(r2) {
-        const mdns_answer_t *data = mdnsd_record_data(r2);
-        mdns_record_t *next = mdnsd_record_next(r2);
-        if((removeTxt && data->type == QTYPE_TXT) ||
-           (removeTxt && data->type == QTYPE_A) ||
-           data->srv.port == port) {
-            mdnsd_done(dm->mdnsDaemon, r2);
-        }
-        r2 = next;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
-
-#endif /* defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST) */

From b6eacc607858f8f9d9b443a85ddf751618f78281 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Oct 2023 23:45:34 +0200
Subject: [PATCH 1242/1963] refactor(server): Unified naming scheme for
 ua_discovery* files

---
 CMakeLists.txt                                              | 6 +++---
 src/server/{ua_discovery_manager.c => ua_discovery.c}       | 2 +-
 src/server/{ua_discovery_manager.h => ua_discovery.h}       | 0
 .../{ua_server_discovery_mdns.c => ua_discovery_mdns.c}     | 2 +-
 src/server/ua_services_discovery.c                          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename src/server/{ua_discovery_manager.c => ua_discovery.c} (99%)
 rename src/server/{ua_discovery_manager.h => ua_discovery.h} (100%)
 rename src/server/{ua_server_discovery_mdns.c => ua_discovery_mdns.c} (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1846c93da0e..e3e29c5f579 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -934,7 +934,7 @@ if(UA_ENABLE_DISCOVERY_MULTICAST)
          ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/sdtxt.h
          ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
     list(APPEND lib_sources
-         ${PROJECT_SOURCE_DIR}/src/server/ua_server_discovery_mdns.c
+         ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_mdns.c
          ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/1035.c
          ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/xht.c
          ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/sdtxt.c
@@ -1071,8 +1071,8 @@ list(INSERT plugin_sources 0
 endif()
 
 if(UA_ENABLE_DISCOVERY)
-    list(APPEND lib_headers ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.h)
-    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_manager.c)
+    list(APPEND lib_headers ${PROJECT_SOURCE_DIR}/src/server/ua_discovery.h)
+    list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_discovery.c)
 endif()
 
 if(UA_ENABLE_NODESETLOADER)
diff --git a/src/server/ua_discovery_manager.c b/src/server/ua_discovery.c
similarity index 99%
rename from src/server/ua_discovery_manager.c
rename to src/server/ua_discovery.c
index 7a3c3d71329..71e2577a750 100644
--- a/src/server/ua_discovery_manager.c
+++ b/src/server/ua_discovery.c
@@ -14,7 +14,7 @@
  */
 
 #include <open62541/client.h>
-#include "ua_discovery_manager.h"
+#include "ua_discovery.h"
 #include "ua_server_internal.h"
 
 #ifdef UA_ENABLE_DISCOVERY
diff --git a/src/server/ua_discovery_manager.h b/src/server/ua_discovery.h
similarity index 100%
rename from src/server/ua_discovery_manager.h
rename to src/server/ua_discovery.h
diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_discovery_mdns.c
similarity index 99%
rename from src/server/ua_server_discovery_mdns.c
rename to src/server/ua_discovery_mdns.c
index 4374f1a3f55..4cde3c05d14 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -7,7 +7,7 @@
  *    Copyright 2017 (c) Thomas Stalder, Blue Time Concept SA
  */
 
-#include "ua_discovery_manager.h"
+#include "ua_discovery.h"
 #include "ua_server_internal.h"
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 2fc7a5a4958..166d5e7ba38 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -12,7 +12,7 @@
  */
 
 #include "ua_server_internal.h"
-#include "ua_discovery_manager.h"
+#include "ua_discovery.h"
 #include "ua_services.h"
 
 #ifdef UA_ENABLE_DISCOVERY

From 461c45f855b93a687a51b427e0efe17ee05ad929 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 25 Oct 2023 09:50:23 +0200
Subject: [PATCH 1243/1963] fix(server) remove unused capabilities from 1.05
 nodeset

---
 src/server/ua_server_ns0.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index 5388cc06c58..fd7878842cb 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -1047,6 +1047,17 @@ initNS0(UA_Server *server) {
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_REDUNDANTSERVERARRAY), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_SERVERURIARRAY), true);
     deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERREDUNDANCY_SERVERNETWORKGROUPS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_CONFORMANCEUNITS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_URISVERSION), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_CONFORMANCEUNITS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXMONITOREDITEMS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXMONITOREDITEMSPERSUBSCRIPTION), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXMONITOREDITEMSQUEUESIZE), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXSELECTCLAUSEPARAMETERS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXSESSIONS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXSUBSCRIPTIONS), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXSUBSCRIPTIONSPERSESSION), true);
+    deleteNode(server, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERCAPABILITIES_MAXWHERECLAUSEPARAMETERS), true);
 
     /* ServerCapabilities - LocaleIdArray */
     UA_LocaleId locale_en = UA_STRING("en");

From 35b9f5f0da77aa764fd8e3266ea506ba816bd97b Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 16 Oct 2023 15:52:07 +0200
Subject: [PATCH 1244/1963] feat(examples): Added startup parameters to disable
 x509 or username/password authentication.

---
 examples/server_ctt.c | 57 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 16beba661bf..4388a951fc1 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1002,6 +1002,42 @@ disableAes256Sha256RsaPssSecurityPolicy(UA_ServerConfig *config) {
     }
 }
 
+static void
+disableX509Auth(UA_ServerConfig *config) {
+    UA_AccessControl *ac = &config->accessControl;
+    for(size_t i = 0; i < ac->userTokenPoliciesSize; i++) {
+        UA_UserTokenPolicy *utp = &ac->userTokenPolicies[i];
+        if(utp->tokenType != UA_USERTOKENTYPE_CERTIFICATE)
+            continue;
+
+        UA_UserTokenPolicy_clear(utp);
+        /* Move the last to this position */
+        if(i + 1 < ac->userTokenPoliciesSize) {
+            ac->userTokenPolicies[i] = ac->userTokenPolicies[ac->userTokenPoliciesSize-1];
+            i--;
+        }
+        ac->userTokenPoliciesSize--;
+    }
+}
+
+static void
+disableUsernamePasswordAuth(UA_ServerConfig *config) {
+    UA_AccessControl *ac = &config->accessControl;
+    for(size_t i = 0; i < ac->userTokenPoliciesSize; i++) {
+        UA_UserTokenPolicy *utp = &ac->userTokenPolicies[i];
+        if(utp->tokenType != UA_USERTOKENTYPE_USERNAME)
+            continue;
+
+        UA_UserTokenPolicy_clear(utp);
+        /* Move the last to this position */
+        if(i + 1 < ac->userTokenPoliciesSize) {
+            ac->userTokenPolicies[i] = ac->userTokenPolicies[ac->userTokenPoliciesSize-1];
+            i--;
+        }
+        ac->userTokenPoliciesSize--;
+    }
+}
+
 #endif
 
 static void
@@ -1033,6 +1069,8 @@ usage(void) {
                    "\t[--disableBasic256Sha256]\n"
                    "\t[--disableAes128Sha256RsaOaep]\n"
                    "\t[--disableAes256Sha256RsaPss]\n"
+                   "\t[--disableX509]\n"
+                   "\t[--disableUsernamePassword]\n"
 #endif
                    "\t[--enableTimestampCheck]\n"
                    "\t[--enableAnonymous]\n");
@@ -1081,6 +1119,8 @@ int main(int argc, char **argv) {
     UA_Boolean disableBasic256Sha256 = false;
     UA_Boolean disableAes128Sha256RsaOaep = false;
     UA_Boolean disableAes256Sha256RsaPss = false;
+    UA_Boolean disableX509 = false;
+    UA_Boolean disableUsernamePassword = false;
 
 #ifndef __linux__
     UA_ByteString scTrustList[100];
@@ -1153,6 +1193,16 @@ int main(int argc, char **argv) {
             continue;
         }
 
+        if(strcmp(argv[pos], "--disableX509") == 0) {
+            disableX509 = true;
+            continue;
+        }
+
+        if(strcmp(argv[pos], "--disableUsernamePassword") == 0) {
+            disableUsernamePassword = true;
+            continue;
+        }
+
 
 #ifndef __linux__
         if(strcmp(argv[pos], "--secureChannelTrustList") == 0) {
@@ -1407,6 +1457,13 @@ int main(int argc, char **argv) {
 
     setInformationModel(server);
 
+#ifdef UA_ENABLE_ENCRYPTION
+    if(disableX509)
+        disableX509Auth(config);
+    if(disableUsernamePassword)
+        disableUsernamePasswordAuth(config);
+#endif
+
     /* run server */
     res = UA_Server_runUntilInterrupt(server);
 

From c1b6936b6bd61339f3e59ae5b0376f4ff35dd7af Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 23 Oct 2023 14:20:03 +0200
Subject: [PATCH 1245/1963] fix(server): Bug fixes in the subscription transfer
 service.

---
 plugins/ua_accesscontrol_default.c    |  2 ++
 src/server/ua_services_subscription.c |  4 +---
 src/server/ua_subscription.c          | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index c78f60c9a5a..b7d79d9cc10 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -224,6 +224,8 @@ static UA_Boolean
 allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
                                   const UA_NodeId *oldSessionId, void *oldSessionContext,
                                   const UA_NodeId *newSessionId, void *newSessionContext) {
+    if(!oldSessionId)
+        return true;
     /* Allow the transfer if the same user-id was used to activate both sessions */
     UA_Variant session1UserId;
     UA_Variant_init(&session1UserId);
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index ed39ec78ca9..e903f794ba0 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -516,6 +516,7 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     memcpy(newSub, sub, sizeof(UA_Subscription));
 
     /* Set to the same state as the original subscription */
+    newSub->publishCallbackId = 0;
     result->statusCode = Subscription_setState(server, newSub, sub->state);
     if(result->statusCode != UA_STATUSCODE_GOOD) {
         UA_Array_delete(result->availableSequenceNumbers,
@@ -577,9 +578,6 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     sub->statusChange = UA_STATUSCODE_GOODSUBSCRIPTIONTRANSFERRED;
     UA_Subscription_publish(server, sub);
 
-    /* The original subscription has been deactivated */
-    UA_assert(sub->publishCallbackId == 0);
-
     /* Re-create notifications with the current values for the new subscription */
     if(*sendInitialValues) {
         LIST_FOREACH(mon, &newSub->monitoredItems, listEntry) {
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index a4e78be8d58..543757fcbc6 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -384,12 +384,14 @@ static void
 sendStatusChangeDelete(UA_Server *server, UA_Subscription *sub,
                        UA_PublishResponseEntry *pre) {
     /* Cannot send out the StatusChange because no response is queued.
-     * Delete the Subscription without sending the StatusChange. */
+     * Delete the Subscription without sending the StatusChange, if the statusChange is Bad*/
     if(!pre) {
         UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
-                                  "Cannot send the StatusChange notification. "
-                                  "Removing the subscription.");
-        UA_Subscription_delete(server, sub);
+                                  "Cannot send the StatusChange notification because no response is queued.");
+        if(UA_StatusCode_isBad(sub->statusChange)) {
+            UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub, "Removing the subscription.");
+            UA_Subscription_delete(server, sub);
+        }
         return;
     }
 

From 8a6c410aed2fa45a98176bf95aa33f71b0af09c5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 25 Oct 2023 14:36:52 +0200
Subject: [PATCH 1246/1963] fix(server): Indicate the value timestamp and
 statuscode is writable in the default

---
 src/server/ua_server_utils.c             | 5 ++++-
 tests/server/check_services_attributes.c | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_server_utils.c b/src/server/ua_server_utils.c
index 8b020a20fe0..f70f21efce1 100644
--- a/src/server/ua_server_utils.c
+++ b/src/server/ua_server_utils.c
@@ -359,7 +359,10 @@ const UA_VariableAttributes UA_VariableAttributes_default = {
      {UA_NS0ID_BASEDATATYPE}},   /* dataType */
     UA_VALUERANK_ANY,            /* valueRank */
     0, NULL,                     /* arrayDimensions */
-    UA_ACCESSLEVELMASK_READ, 0,  /* accessLevel (userAccessLevel) */
+    UA_ACCESSLEVELMASK_READ |    /* accessLevel */
+    UA_ACCESSLEVELMASK_STATUSWRITE |
+    UA_ACCESSLEVELMASK_TIMESTAMPWRITE,
+    0,                           /* userAccessLevel */
     0.0,                         /* minimumSamplingInterval */
     false                        /* historizing */
 };
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index e9b98fa43fe..bc07742ee12 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -507,7 +507,9 @@ START_TEST(ReadSingleAttributeAccessLevelWithoutTimestamp) {
 
     ck_assert_uint_eq(0, resp.value.arrayLength);
     ck_assert(&UA_TYPES[UA_TYPES_BYTE] == resp.value.type);
-    ck_assert_int_eq(*(UA_Byte*)resp.value.data, UA_ACCESSLEVELMASK_READ); // set by default
+    // set by default
+    ck_assert_int_eq(*(UA_Byte*)resp.value.data, UA_ACCESSLEVELMASK_READ |
+                     UA_ACCESSLEVELMASK_STATUSWRITE | UA_ACCESSLEVELMASK_TIMESTAMPWRITE);
     UA_DataValue_clear(&resp);
 } END_TEST
 
@@ -521,7 +523,9 @@ START_TEST(ReadSingleAttributeAccessLevelExWithoutTimestamp) {
 
     ck_assert_uint_eq(0, resp.value.arrayLength);
     ck_assert(&UA_TYPES[UA_TYPES_UINT32] == resp.value.type);
-    ck_assert_int_eq(*(UA_Byte*)resp.value.data, UA_ACCESSLEVELMASK_READ); // set by default
+    // set by default
+    ck_assert_int_eq(*(UA_Byte*)resp.value.data, UA_ACCESSLEVELMASK_READ |
+                     UA_ACCESSLEVELMASK_STATUSWRITE | UA_ACCESSLEVELMASK_TIMESTAMPWRITE);
     UA_DataValue_clear(&resp);
 } END_TEST
 

From e326ba8f9d349f96c18b74d1653682a59ff4fa5d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Thu, 26 Oct 2023 13:00:36 +0200
Subject: [PATCH 1247/1963] refactor(examples): Set session timeout for CTT to
 10 minutes (#6088)

---
 examples/server_ctt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 4388a951fc1..33bb283c62b 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1412,6 +1412,7 @@ int main(int argc, char **argv) {
     /* Limit the number of SecureChannels and Sessions */
     config->maxSecureChannels = 60;
     config->maxSessions = 50;
+    config->maxSessionTimeout = 10 * 60 * 10000; /* 10 minutes */
 
     /* Revolve the SecureChannel token every 300 seconds */
     config->maxSecurityTokenLifetime = 300000;

From 82775dc480667ced760a95a26a214c059a5c7ed2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 17:00:38 +0100
Subject: [PATCH 1248/1963] feat(client): Add UA_Client_writeValueAttributeEx
 to write DataValues conveniently

---
 include/open62541/client_highlevel.h |  8 ++++++++
 src/client/ua_client_highlevel.c     | 15 +++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/include/open62541/client_highlevel.h b/include/open62541/client_highlevel.h
index 55179c44733..28d2273744e 100644
--- a/include/open62541/client_highlevel.h
+++ b/include/open62541/client_highlevel.h
@@ -387,6 +387,14 @@ UA_Client_writeValueAttribute(UA_Client *client, const UA_NodeId nodeId,
                                       newValue, &UA_TYPES[UA_TYPES_VARIANT]);
 }
 
+/* Write a DataValue that can include timestamps and status codes */
+static UA_INLINE UA_StatusCode
+UA_Client_writeValueAttributeEx(UA_Client *client, const UA_NodeId nodeId,
+                                const UA_DataValue *newValue) {
+    return __UA_Client_writeAttribute(client, &nodeId, UA_ATTRIBUTEID_VALUE,
+                                      newValue, &UA_TYPES[UA_TYPES_DATAVALUE]);
+}
+
 static UA_INLINE UA_StatusCode
 UA_Client_writeDataTypeAttribute(UA_Client *client, const UA_NodeId nodeId,
                                  const UA_NodeId *newDataType) {
diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index 6c89847e63c..b0d082309be 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -288,12 +288,19 @@ __UA_Client_writeAttribute(UA_Client *client, const UA_NodeId *nodeId,
     UA_WriteValue_init(&wValue);
     wValue.nodeId = *nodeId;
     wValue.attributeId = attributeId;
-    if(attributeId == UA_ATTRIBUTEID_VALUE)
+    if(attributeId == UA_ATTRIBUTEID_VALUE &&
+       inDataType == &UA_TYPES[UA_TYPES_VARIANT]) {
         wValue.value.value = *(const UA_Variant*)in;
-    else
-        /* hack. is never written into. */
+        wValue.value.hasValue = true;
+    } else if(attributeId == UA_ATTRIBUTEID_VALUE &&
+              inDataType == &UA_TYPES[UA_TYPES_DATAVALUE]) {
+        wValue.value = *(const UA_DataValue*)in;
+    } else {
+        /* Hack to get rid of the const annotation.
+         * The value is never written into. */
         UA_Variant_setScalar(&wValue.value.value, (void*)(uintptr_t)in, inDataType);
-    wValue.value.hasValue = true;
+        wValue.value.hasValue = true;
+    }
     UA_WriteRequest wReq;
     UA_WriteRequest_init(&wReq);
     wReq.nodesToWrite = &wValue;

From f69da9ccdc42fb5871598def6033f48dd92a002f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 17:01:35 +0100
Subject: [PATCH 1249/1963] feat(client): Protect against missing datatype
 pointer in __UA_Client_writeAttribute

---
 src/client/ua_client_highlevel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index b0d082309be..8782cb77e00 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -281,7 +281,7 @@ UA_StatusCode
 __UA_Client_writeAttribute(UA_Client *client, const UA_NodeId *nodeId,
                            UA_AttributeId attributeId, const void *in,
                            const UA_DataType *inDataType) {
-    if(!in)
+    if(!in || !inDataType)
       return UA_STATUSCODE_BADTYPEMISMATCH;
 
     UA_WriteValue wValue;

From 9cf305532f703e5d24f05575b6992247ecbcc2ff Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 17:03:38 +0100
Subject: [PATCH 1250/1963] feat(client): Add shorthand
 UA_Client_writeValueAttribute_scalar

---
 include/open62541/client_highlevel.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/open62541/client_highlevel.h b/include/open62541/client_highlevel.h
index 28d2273744e..189ea472ad6 100644
--- a/include/open62541/client_highlevel.h
+++ b/include/open62541/client_highlevel.h
@@ -387,6 +387,14 @@ UA_Client_writeValueAttribute(UA_Client *client, const UA_NodeId nodeId,
                                       newValue, &UA_TYPES[UA_TYPES_VARIANT]);
 }
 
+static UA_INLINE UA_StatusCode
+UA_Client_writeValueAttribute_scalar(UA_Client *client, const UA_NodeId nodeId,
+                                     const void *newValue,
+                                     const UA_DataType *valueType) {
+    return __UA_Client_writeAttribute(client, &nodeId, UA_ATTRIBUTEID_VALUE,
+                                      newValue, valueType);
+}
+
 /* Write a DataValue that can include timestamps and status codes */
 static UA_INLINE UA_StatusCode
 UA_Client_writeValueAttributeEx(UA_Client *client, const UA_NodeId nodeId,

From aa67447588fba1b4fda58348557b6abe536d9c6d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 28 Oct 2023 15:15:51 +0200
Subject: [PATCH 1251/1963] refactor(server): Fix handling of server/source
 timestamp

Don't "invent" a source timestamp for dynamic node values.
---
 src/server/ua_services_attribute.c            | 57 +++++++++----------
 tests/server/check_server_historical_data.c   | 10 +++-
 .../check_server_historical_data_circular.c   | 10 +++-
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 466b7631561..0718935298e 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -277,16 +277,11 @@ readValueAttributeComplete(UA_Server *server, UA_Session *session,
             break;
     }
 
-    /* Static Variables and VariableTypes have timestamps of "now". Will be set
-     * below in the absence of predefined timestamps. */
-    if(vn->head.nodeClass == UA_NODECLASS_VARIABLE) {
-        if(!vn->isDynamic) {
-            v->hasServerTimestamp = false;
-            v->hasSourceTimestamp = false;
-        }
-    } else {
-        v->hasServerTimestamp = false;
-        v->hasSourceTimestamp = false;
+    /* Static nodes have a source timestamp of now.
+     * No source timestamp is "invented" otherwise. */
+    if(vn->head.nodeClass != UA_NODECLASS_VARIABLE || !vn->isDynamic) {
+        v->sourceTimestamp = UA_DateTime_now();
+        v->hasSourceTimestamp = true;
     }
 
     /* Clean up */
@@ -607,28 +602,27 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
         v->hasValue = true;
     }
 
-    /* Create server timestamp */
+    /* Static VariableNodes, VariableTypes and non-value attributes don't store
+     * a server-timestamp. Dynamic variables receive the timestamp during the
+     * Write service or from the external datasource. If the external datasource
+     * does not set a timestamp one is created here. */
     if(timestampsToReturn == UA_TIMESTAMPSTORETURN_SERVER ||
        timestampsToReturn == UA_TIMESTAMPSTORETURN_BOTH) {
         if(!v->hasServerTimestamp) {
             v->serverTimestamp = UA_DateTime_now();
             v->hasServerTimestamp = true;
+            v->hasServerPicoseconds = false;
         }
     } else {
-        /* In case the ServerTimestamp has been set manually */
         v->hasServerTimestamp = false;
+        v->hasServerPicoseconds = false;
     }
 
-    /* Handle source time stamp */
-    if(id->attributeId == UA_ATTRIBUTEID_VALUE) {
-        if(timestampsToReturn == UA_TIMESTAMPSTORETURN_SERVER ||
-           timestampsToReturn == UA_TIMESTAMPSTORETURN_NEITHER) {
-            v->hasSourceTimestamp = false;
-            v->hasSourcePicoseconds = false;
-        } else if(!v->hasSourceTimestamp) {
-            v->sourceTimestamp = UA_DateTime_now();
-            v->hasSourceTimestamp = true;
-        }
+    /* Don't "invent" source timestamps. But remove them when not required. */
+    if(timestampsToReturn == UA_TIMESTAMPSTORETURN_SERVER ||
+       timestampsToReturn == UA_TIMESTAMPSTORETURN_NEITHER) {
+        v->hasSourceTimestamp = false;
+        v->hasSourcePicoseconds = false;
     }
 }
 
@@ -1483,16 +1477,19 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
         }
     }
 
-    /* Set the source timestamp if there is none */
-    UA_DateTime now = UA_DateTime_now();
-    if(!adjustedValue.hasSourceTimestamp) {
-        adjustedValue.sourceTimestamp = now;
-        adjustedValue.hasSourceTimestamp = true;
+    /* Set the server timestamp in the Write service if the target VariableNode
+     * is "dynamic". For static nodes we generate a current server timestamp
+     * when the node is read. */
+    if(node->head.nodeClass == UA_NODECLASS_VARIABLE && node->isDynamic) {
+        adjustedValue.serverTimestamp = UA_DateTime_now();
+        adjustedValue.hasServerTimestamp = true;
+    } else {
+        adjustedValue.hasServerTimestamp = false;
     }
 
-    /* Update the timestamp when the value was last updated in the server */
-    adjustedValue.serverTimestamp = now;
-    adjustedValue.hasServerTimestamp = true;
+    /* Picoseconds server timestamps are not supported in the standard code-path
+     * (only via a datasource callback configured for a variable node) */
+    adjustedValue.hasServerPicoseconds = false;
 
     switch(node->valueBackend.backendType) {
         case UA_VALUEBACKENDTYPE_NONE:
diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c
index e51f65e21c7..8b9b792ca6b 100644
--- a/tests/server/check_server_historical_data.c
+++ b/tests/server/check_server_historical_data.c
@@ -121,9 +121,13 @@ static void teardown(void) {
 
 static UA_StatusCode
 setUInt32(UA_Client *thisClient, UA_NodeId node, UA_UInt32 value) {
-    UA_Variant variant;
-    UA_Variant_setScalar(&variant, &value, &UA_TYPES[UA_TYPES_UINT32]);
-    return UA_Client_writeValueAttribute(thisClient, node, &variant);
+    UA_DataValue dv;
+    UA_DataValue_init(&dv);
+    UA_Variant_setScalar(&dv.value, &value, &UA_TYPES[UA_TYPES_UINT32]);
+    dv.hasValue = true;
+    dv.sourceTimestamp = UA_DateTime_now();
+    dv.hasSourceTimestamp = true;
+    return UA_Client_writeValueAttributeEx(thisClient, node, &dv);
 }
 
 static UA_DateTime* sortDateTimes(UA_DateTime *data) {
diff --git a/tests/server/check_server_historical_data_circular.c b/tests/server/check_server_historical_data_circular.c
index cfe047311a7..8bb10919caf 100644
--- a/tests/server/check_server_historical_data_circular.c
+++ b/tests/server/check_server_historical_data_circular.c
@@ -116,9 +116,13 @@ static void teardown(void) {
 
 static UA_StatusCode
 setUInt32(UA_Client *thisClient, UA_NodeId node, UA_UInt32 value) {
-    UA_Variant variant;
-    UA_Variant_setScalar(&variant, &value, &UA_TYPES[UA_TYPES_UINT32]);
-    return UA_Client_writeValueAttribute(thisClient, node, &variant);
+    UA_DataValue dv;
+    UA_DataValue_init(&dv);
+    UA_Variant_setScalar(&dv.value, &value, &UA_TYPES[UA_TYPES_UINT32]);
+    dv.hasValue = true;
+    dv.sourceTimestamp = UA_DateTime_now();
+    dv.hasSourceTimestamp = true;
+    return UA_Client_writeValueAttributeEx(thisClient, node, &dv);
 }
 
 void

From 8590870af6ff4f1401fa075b43a56fab98fa7113 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 28 Oct 2023 15:45:35 +0200
Subject: [PATCH 1252/1963] refactor(server): Treat the happy case first in
 ReadWithNode

---
 src/server/ua_services_attribute.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 0718935298e..d1de72cbc08 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -594,12 +594,12 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
         retval = UA_STATUSCODE_BADATTRIBUTEIDINVALID;
     }
 
-    if(retval != UA_STATUSCODE_GOOD) {
-        /* Reading has failed but can not return because we may need to add timestamp */
+    /* Reading has failed? */
+    if(retval == UA_STATUSCODE_GOOD) {
+        v->hasValue = true;
+    } else {
         v->hasStatus = true;
         v->status = retval;
-    } else {
-        v->hasValue = true;
     }
 
     /* Static VariableNodes, VariableTypes and non-value attributes don't store

From d41c3ecc1bb0a5fbabe6c8d38d7c97c3f18f9432 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 28 Oct 2023 15:47:01 +0200
Subject: [PATCH 1253/1963] refactor(server): Improve comments in
 ua_services_attribute.c

---
 src/server/ua_services_attribute.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index d1de72cbc08..82cd884f363 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1419,7 +1419,6 @@ writeValueAttributeWithRange(UA_VariableNode *node, const UA_DataValue *value,
     return UA_STATUSCODE_GOOD;
 }
 
-/* Stack layout: ... | node */
 static UA_StatusCode
 writeNodeValueAttribute(UA_Server *server, UA_Session *session,
                         UA_VariableNode *node, const UA_DataValue *value,
@@ -1444,7 +1443,7 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
      * "container". */
     UA_DataValue adjustedValue = *value;
 
-    /* Type checking. May change the type of editableValue */
+    /* Type checking. May change the type of adjustedValue */
     const char *reason;
     if(value->hasValue && value->value.type &&
        !compatibleValue(server, session, &node->dataType, node->valueRank,

From 87fe3286892930f6e47df38e667f4ce0359642bf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 10:13:11 +0100
Subject: [PATCH 1254/1963] refactor(server): Remove redundant read service
 helper methods

---
 src/pubsub/ua_pubsub_dataset.c             |  3 +-
 src/server/ua_server_internal.h            | 14 ++---
 src/server/ua_services_attribute.c         | 60 +++++++---------------
 src/server/ua_services_monitoreditem.c     | 13 +++--
 src/server/ua_subscription_datachange.c    |  6 +--
 src/server/ua_subscription_events_filter.c |  6 +--
 6 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 217364c9b6b..7b8e769d12c 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -595,7 +595,8 @@ UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
         rvid.nodeId = params->publishedVariable;
         rvid.attributeId = params->attributeId;
         rvid.indexRange = params->indexRange;
-        *value = readAttribute(server, &rvid, UA_TIMESTAMPSTORETURN_BOTH);
+        *value = readWithSession(server, &server->adminSession,
+                                 &rvid, UA_TIMESTAMPSTORETURN_BOTH);
     } else {
         *value = **field->config.field.variable.rtValueSource.staticValueSource;
         value->value.storageType = UA_VARIANT_DATA_NODELETE;
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 667e9bb6489..fa6c9e99056 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -444,9 +444,14 @@ UA_WRITEATTRIBUTEFUNCS(AccessLevel, UA_ATTRIBUTEID_ACCESSLEVEL, UA_Byte, BYTE)
 UA_WRITEATTRIBUTEFUNCS(MinimumSamplingInterval, UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL,
                        UA_Double, DOUBLE)
 
+void
+Operation_Read(UA_Server *server, UA_Session *session, UA_TimestampsToReturn *ttr,
+               const UA_ReadValueId *rvi, UA_DataValue *dv);
+
 UA_DataValue
-readAttribute(UA_Server *server, const UA_ReadValueId *item,
-              UA_TimestampsToReturn timestamps);
+readWithSession(UA_Server *server, UA_Session *session,
+                const UA_ReadValueId *item,
+                UA_TimestampsToReturn timestampsToReturn);
 
 UA_StatusCode
 readWithReadValue(UA_Server *server, const UA_NodeId *nodeId,
@@ -659,11 +664,6 @@ void
 Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxrefs,
                  const UA_BrowseDescription *descr, UA_BrowseResult *result);
 
-UA_DataValue
-UA_Server_readWithSession(UA_Server *server, UA_Session *session,
-                          const UA_ReadValueId *item,
-                          UA_TimestampsToReturn timestampsToReturn);
-
 /************/
 /* AddNodes */
 /************/
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 82cd884f363..f09d8351263 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -626,24 +626,24 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
     }
 }
 
-static void
-Operation_Read(UA_Server *server, UA_Session *session, UA_ReadRequest *request,
-               UA_ReadValueId *rvi, UA_DataValue *result) {
+void
+Operation_Read(UA_Server *server, UA_Session *session, UA_TimestampsToReturn *ttr,
+               const UA_ReadValueId *rvi, UA_DataValue *dv) {
     /* Get the node (with only the selected attribute if the NodeStore supports that) */
     const UA_Node *node =
         UA_NODESTORE_GET_SELECTIVE(server, &rvi->nodeId,
                                    attributeId2AttributeMask((UA_AttributeId)rvi->attributeId),
                                    UA_REFERENCETYPESET_NONE,
                                    UA_BROWSEDIRECTION_INVALID);
+    if(!node) {
+        dv->hasStatus = true;
+        dv->status = UA_STATUSCODE_BADNODEIDUNKNOWN;
+        return;
+    }
 
     /* Perform the read operation */
-    if(node) {
-        ReadWithNode(node, server, session, request->timestampsToReturn, rvi, result);
-        UA_NODESTORE_RELEASE(server, node);
-    } else {
-        result->hasStatus = true;
-        result->status = UA_STATUSCODE_BADNODEIDUNKNOWN;
-    }
+    ReadWithNode(node, server, session, *ttr, rvi, dv);
+    UA_NODESTORE_RELEASE(server, node);
 }
 
 void
@@ -676,48 +676,25 @@ Service_Read(UA_Server *server, UA_Session *session,
     response->responseHeader.serviceResult =
         UA_Server_processServiceOperations(server, session,
                                            (UA_ServiceOperation)Operation_Read,
-                                           request, &request->nodesToReadSize,
+                                           &request->timestampsToReturn,
+                                           &request->nodesToReadSize,
                                            &UA_TYPES[UA_TYPES_READVALUEID],
                                            &response->resultsSize,
                                            &UA_TYPES[UA_TYPES_DATAVALUE]);
 }
 
 UA_DataValue
-UA_Server_readWithSession(UA_Server *server, UA_Session *session,
-                          const UA_ReadValueId *item,
-                          UA_TimestampsToReturn timestampsToReturn) {
+readWithSession(UA_Server *server, UA_Session *session,
+                const UA_ReadValueId *item,
+                UA_TimestampsToReturn timestampsToReturn) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_DataValue dv;
     UA_DataValue_init(&dv);
-
-    /* Get the node (with only the selected attribute if the NodeStore supports it) */
-    const UA_Node *node =
-        UA_NODESTORE_GET_SELECTIVE(server, &item->nodeId,
-                                   attributeId2AttributeMask((UA_AttributeId)item->attributeId),
-                                   UA_REFERENCETYPESET_NONE,
-                                   UA_BROWSEDIRECTION_INVALID);
-    if(!node) {
-        dv.hasStatus = true;
-        dv.status = UA_STATUSCODE_BADNODEIDUNKNOWN;
-        return dv;
-    }
-
-    /* Perform the read operation */
-    ReadWithNode(node, server, session, timestampsToReturn, item, &dv);
-
-    /* Release the node and return */
-    UA_NODESTORE_RELEASE(server, node);
+    Operation_Read(server, session, &timestampsToReturn, item, &dv);
     return dv;
 }
 
-UA_DataValue
-readAttribute(UA_Server *server, const UA_ReadValueId *item,
-               UA_TimestampsToReturn timestamps) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    return UA_Server_readWithSession(server, &server->adminSession, item, timestamps);
-}
-
 UA_StatusCode
 readWithReadValue(UA_Server *server, const UA_NodeId *nodeId,
                   const UA_AttributeId attributeId, void *v) {
@@ -728,7 +705,8 @@ readWithReadValue(UA_Server *server, const UA_NodeId *nodeId,
     UA_ReadValueId_init(&item);
     item.nodeId = *nodeId;
     item.attributeId = attributeId;
-    UA_DataValue dv = readAttribute(server, &item, UA_TIMESTAMPSTORETURN_NEITHER);
+    UA_DataValue dv = readWithSession(server, &server->adminSession,
+                                      &item, UA_TIMESTAMPSTORETURN_NEITHER);
 
     /* Check the return value */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
@@ -758,7 +736,7 @@ UA_DataValue
 UA_Server_read(UA_Server *server, const UA_ReadValueId *item,
                UA_TimestampsToReturn timestamps) {
     UA_LOCK(&server->serviceMutex);
-    UA_DataValue dv = readAttribute(server, item, timestamps);
+    UA_DataValue dv = readWithSession(server, &server->adminSession, item, timestamps);
     UA_UNLOCK(&server->serviceMutex);
     return dv;
 }
diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index e7c0bc59d55..37b5dfd7a45 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -50,8 +50,8 @@ setAbsoluteFromPercentageDeadband(UA_Server *server, UA_Session *session,
     UA_ReadValueId_init(&rvi);
     rvi.nodeId = bpr.targets->targetId.nodeId;
     rvi.attributeId = UA_ATTRIBUTEID_VALUE;
-    UA_DataValue rangeVal = UA_Server_readWithSession(server, session, &rvi,
-                                                      UA_TIMESTAMPSTORETURN_NEITHER);
+    UA_DataValue rangeVal = readWithSession(server, session, &rvi,
+                                            UA_TIMESTAMPSTORETURN_NEITHER);
     UA_BrowsePathResult_clear(&bpr);
     if(!UA_Variant_isScalar(&rangeVal.value) ||
        rangeVal.value.type != &UA_TYPES[UA_TYPES_RANGE]) {
@@ -407,8 +407,8 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
      * - The AttributeId does not match the NodeClass
      * - The Session does not have sufficient access rights
      * - The indicated encoding is not supported or not valid */
-    UA_DataValue v = UA_Server_readWithSession(server, session, &request->itemToMonitor,
-                                               cmc->timestampsToReturn);
+    UA_DataValue v = readWithSession(server, session, &request->itemToMonitor,
+                                     cmc->timestampsToReturn);
     if(v.hasStatus &&
        (v.status == UA_STATUSCODE_BADNODEIDUNKNOWN ||
         v.status == UA_STATUSCODE_BADATTRIBUTEIDINVALID ||
@@ -625,9 +625,8 @@ Operation_ModifyMonitoredItem(UA_Server *server, UA_Session *session, UA_Subscri
 
     /* Read the current value to test if filters are possible.
      * Can return an empty value (v.value.type == NULL). */
-    UA_DataValue v =
-        UA_Server_readWithSession(server, session, &mon->itemToMonitor,
-                                  mon->timestampsToReturn);
+    UA_DataValue v = readWithSession(server, session, &mon->itemToMonitor,
+                                     mon->timestampsToReturn);
 
     /* Verify and adjust the new parameters. This still leaves the original
      * MonitoredItem untouched. */
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index 4d572d2729c..a39a5da802b 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -222,9 +222,9 @@ monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *monitoredItem)
     UA_assert(monitoredItem->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
 
     /* Sample the value. The sample can still point into the node. */
-    UA_DataValue value = UA_Server_readWithSession(server, session,
-                                                   &monitoredItem->itemToMonitor,
-                                                   monitoredItem->timestampsToReturn);
+    UA_DataValue value = readWithSession(server, session,
+                                         &monitoredItem->itemToMonitor,
+                                         monitoredItem->timestampsToReturn);
 
     /* Operate on the sample. The sample is consumed when the status is good. */
     UA_StatusCode res = sampleCallbackWithValue(server, sub, monitoredItem, &value);
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index e8e9f1ff8df..07433fea627 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -499,8 +499,7 @@ resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session,
 #endif
         }
 
-        v = UA_Server_readWithSession(server, session, &rvi,
-                                      UA_TIMESTAMPSTORETURN_NEITHER);
+        v = readWithSession(server, session, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
     } else {
         /* Resolve the browse path, starting from the event-source (and not the
          * typeDefinitionId). */
@@ -517,8 +516,7 @@ resolveSimpleAttributeOperand(UA_Server *server, UA_Session *session,
 
         /* Use the first match */
         rvi.nodeId = bpr.targets[0].targetId.nodeId;
-        v = UA_Server_readWithSession(server, session, &rvi,
-                                      UA_TIMESTAMPSTORETURN_NEITHER);
+        v = readWithSession(server, session, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
         UA_BrowsePathResult_clear(&bpr);
     }
 

From 1f3a5519b8861850fa63ae37b8223bbe5864debb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 10:25:49 +0100
Subject: [PATCH 1255/1963] refactor(server): Simplify
 ua_subscription_datachange.c

---
 src/server/ua_server_internal.h         |  2 +-
 src/server/ua_subscription_datachange.c | 65 ++++++++++++-------------
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index fa6c9e99056..2fa2758cebd 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -467,7 +467,7 @@ translateBrowsePathToNodeIds(UA_Server *server, const UA_BrowsePath *browsePath)
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
 
-void monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *monitoredItem);
+void monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon);
 
 UA_Subscription *
 getSubscriptionById(UA_Server *server, UA_UInt32 subscriptionId);
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index a39a5da802b..adad0d56c36 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -75,13 +75,12 @@ detectVariantDeadband(const UA_Variant *value, const UA_Variant *oldValue,
 }
 
 static UA_Boolean
-detectValueChange(UA_Server *server, UA_MonitoredItem *mon,
-                  const UA_DataValue *value) {
+detectValueChange(UA_Server *server, UA_MonitoredItem *mon, const UA_DataValue *dv) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Status changes are always reported */
-    if(value->hasStatus != mon->lastValue.hasStatus ||
-       value->status != mon->lastValue.status) {
+    if(dv->hasStatus != mon->lastValue.hasStatus ||
+       dv->status != mon->lastValue.status) {
         return true;
     }
 
@@ -105,47 +104,46 @@ detectValueChange(UA_Server *server, UA_MonitoredItem *mon,
 
     /* Test absolute deadband */
     if(dcf && dcf->deadbandType == UA_DEADBANDTYPE_ABSOLUTE &&
-       value->value.type != NULL && UA_DataType_isNumeric(value->value.type))
-        return detectVariantDeadband(&value->value, &mon->lastValue.value,
+       dv->value.type != NULL && UA_DataType_isNumeric(dv->value.type))
+        return detectVariantDeadband(&dv->value, &mon->lastValue.value,
                                      dcf->deadbandValue);
 
     /* Compare the source timestamp if the trigger requires that */
     if(trigger == UA_DATACHANGETRIGGER_STATUSVALUETIMESTAMP) {
-        if(value->hasSourceTimestamp != mon->lastValue.hasSourceTimestamp)
+        if(dv->hasSourceTimestamp != mon->lastValue.hasSourceTimestamp)
             return true;
-        if(value->hasSourceTimestamp &&
-           value->sourceTimestamp != mon->lastValue.sourceTimestamp)
+        if(dv->hasSourceTimestamp &&
+           dv->sourceTimestamp != mon->lastValue.sourceTimestamp)
             return true;
     }
 
     /* Has the value changed? */
-    if(value->hasValue != mon->lastValue.hasValue)
+    if(dv->hasValue != mon->lastValue.hasValue)
         return true;
-    return (UA_order(&value->value, &mon->lastValue.value,
+    return (UA_order(&dv->value, &mon->lastValue.value,
                      &UA_TYPES[UA_TYPES_VARIANT]) != UA_ORDER_EQ);
 }
 
 UA_StatusCode
 UA_MonitoredItem_createDataChangeNotification(UA_Server *server, UA_Subscription *sub,
-                                              UA_MonitoredItem *mon,
-                                              const UA_DataValue *value) {
+                                              UA_MonitoredItem *mon, const UA_DataValue *dv) {
     /* Allocate a new notification */
-    UA_Notification *newNotification = UA_Notification_new();
-    if(!newNotification)
+    UA_Notification *newNot = UA_Notification_new();
+    if(!newNot)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     /* Prepare the notification */
-    newNotification->mon = mon;
-    newNotification->data.dataChange.clientHandle = mon->parameters.clientHandle;
-    UA_StatusCode retval = UA_DataValue_copy(value, &newNotification->data.dataChange.value);
+    newNot->mon = mon;
+    newNot->data.dataChange.clientHandle = mon->parameters.clientHandle;
+    UA_StatusCode retval = UA_DataValue_copy(dv, &newNot->data.dataChange.value);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_free(newNotification);
+        UA_free(newNot);
         return retval;
     }
 
     /* Enqueue the notification */
     UA_assert(sub);
-    UA_Notification_enqueueAndTrigger(server, newNotification);
+    UA_Notification_enqueueAndTrigger(server, newNot);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -200,41 +198,38 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
 }
 
 void
-UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *monitoredItem) {
+UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
     UA_LOCK(&server->serviceMutex);
-    monitoredItem_sampleCallback(server, monitoredItem);
+    monitoredItem_sampleCallback(server, mon);
     UA_UNLOCK(&server->serviceMutex);
 }
 
 void
-monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *monitoredItem) {
+monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    UA_Subscription *sub = monitoredItem->subscription;
+    UA_Subscription *sub = mon->subscription;
     UA_Session *session = &server->adminSession;
     if(sub)
         session = sub->session;
 
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
-                              "MonitoredItem %" PRIi32 " | "
-                              "Sample callback called", monitoredItem->monitoredItemId);
+    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub, "MonitoredItem %" PRIi32
+                              " | Sample callback called", mon->monitoredItemId);
 
-    UA_assert(monitoredItem->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
+    UA_assert(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
 
     /* Sample the value. The sample can still point into the node. */
-    UA_DataValue value = readWithSession(server, session,
-                                         &monitoredItem->itemToMonitor,
-                                         monitoredItem->timestampsToReturn);
+    UA_DataValue dv = readWithSession(server, session, &mon->itemToMonitor,
+                                         mon->timestampsToReturn);
 
     /* Operate on the sample. The sample is consumed when the status is good. */
-    UA_StatusCode res = sampleCallbackWithValue(server, sub, monitoredItem, &value);
+    UA_StatusCode res = sampleCallbackWithValue(server, sub, mon, &dv);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_DataValue_clear(&value);
+        UA_DataValue_clear(&dv);
         UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
                                     "MonitoredItem %" PRIi32 " | "
                                     "Sampling returned the statuscode %s",
-                                    monitoredItem->monitoredItemId,
-                                    UA_StatusCode_name(res));
+                                    mon->monitoredItemId, UA_StatusCode_name(res));
     }
 }
 

From 54ad45b0c25f479bc250ea17babfa19a523ffaeb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 11:00:45 +0100
Subject: [PATCH 1256/1963] feat(core): Generate a static inline _equal method
 for every type

---
 include/open62541/types.h                     |  37 ++---
 src/ua_types.c                                | 129 ++++++++----------
 tools/cmake/macros_public.cmake               |   1 +
 .../backend_open62541_typedefinitions.py      |   2 +
 4 files changed, 69 insertions(+), 100 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index c8921552ab6..dda4a1445e2 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -197,9 +197,6 @@ typedef struct {
 UA_String UA_EXPORT
 UA_String_fromChars(const char *src) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
 
-UA_Boolean UA_EXPORT
-UA_String_equal(const UA_String *s1, const UA_String *s2);
-
 UA_Boolean UA_EXPORT
 UA_String_isEmpty(const UA_String *s);
 
@@ -304,9 +301,6 @@ typedef struct {
 
 UA_EXPORT extern const UA_Guid UA_GUID_NULL;
 
-UA_Boolean UA_EXPORT
-UA_Guid_equal(const UA_Guid *g1, const UA_Guid *g2);
-
 /* Print a Guid in the human-readable format defined in Part 6, 5.1.3
  *
  * Format: C496578A-0DFE-4B8F-870A-745238C6AEAE
@@ -357,8 +351,6 @@ UA_ByteString_fromBase64(UA_ByteString *bs,
 #define UA_BYTESTRING(chars) UA_STRING(chars)
 #define UA_BYTESTRING_ALLOC(chars) UA_STRING_ALLOC(chars)
 
-#define UA_ByteString_equal(s1, s2) UA_String_equal(s1, s2)
-
 /* Returns a non-cryptographic hash of a bytestring */
 UA_UInt32 UA_EXPORT
 UA_ByteString_hash(UA_UInt32 initialHashValue,
@@ -498,12 +490,6 @@ UA_INLINABLE(UA_NodeId
 UA_Order UA_EXPORT
 UA_NodeId_order(const UA_NodeId *n1, const UA_NodeId *n2);
 
-/* Check for equality */
-UA_INLINABLE(UA_Boolean
-             UA_NodeId_equal(const UA_NodeId *n1, const UA_NodeId *n2), {
-    return (UA_NodeId_order(n1, n2) == UA_ORDER_EQ);
-})
-
 /* Returns a non-cryptographic hash for NodeId */
 UA_UInt32 UA_EXPORT UA_NodeId_hash(const UA_NodeId *n);
 
@@ -603,13 +589,6 @@ UA_Order UA_EXPORT
 UA_ExpandedNodeId_order(const UA_ExpandedNodeId *n1,
                         const UA_ExpandedNodeId *n2);
 
-/* Check for equality */
-UA_INLINABLE(UA_Boolean
-             UA_ExpandedNodeId_equal(const UA_ExpandedNodeId *n1,
-                                     const UA_ExpandedNodeId *n2), {
-    return (UA_ExpandedNodeId_order(n1, n2) == UA_ORDER_EQ);
-})
-
 /* Returns a non-cryptographic hash for ExpandedNodeId. The hash of an
  * ExpandedNodeId is identical to the hash of the embedded (simple) NodeId if
  * the ServerIndex is zero and no NamespaceUri is set. */
@@ -652,10 +631,6 @@ UA_INLINABLE(UA_QualifiedName
     return qn;
 })
 
-UA_Boolean UA_EXPORT
-UA_QualifiedName_equal(const UA_QualifiedName *qn1,
-                       const UA_QualifiedName *qn2);
-
 /**
  * LocalizedText
  * ^^^^^^^^^^^^^
@@ -1024,6 +999,9 @@ typedef struct UA_DiagnosticInfo {
  *   of the data type and perform a ``T_init`` to reset the type.
  * - ``void T_delete(T *ptr)``: Delete the content of the data type and the
  *   memory for the data type itself.
+ * - ``void T_equal(T *p1, T *p2)``: Compare whether ``p1`` and ``p2`` have
+ *   identical content. You can use ``UA_order`` if an absolute ordering
+ *   is required.
  *
  * Specializations, such as ``UA_Int32_new()`` are derived from the generic
  * type operations as static inline functions. */
@@ -1209,8 +1187,7 @@ UA_StatusCode UA_EXPORT
 UA_print(const void *p, const UA_DataType *type, UA_String *output);
 #endif
 
-/* Compare two variables and return their order. This can also be used to test
- * for equality of two values.
+/* Compare two values and return their order.
  *
  * For numerical types (including StatusCodes and Enums), their natural order is
  * used. NaN is the "smallest" value for floating point values. Different bit
@@ -1232,6 +1209,12 @@ UA_print(const void *p, const UA_DataType *type, UA_String *output);
 UA_Order UA_EXPORT
 UA_order(const void *p1, const void *p2, const UA_DataType *type);
 
+/* Compare if two values have identical content. */
+UA_INLINABLE(UA_Boolean
+             UA_equal(const void *p1, const void *p2, const UA_DataType *type), {
+    return (UA_order(p1, p2, type) == UA_ORDER_EQ);
+})
+
 /**
  * Binary Encoding/Decoding
  * ------------------------
diff --git a/src/ua_types.c b/src/ua_types.c
index 9889d8f99b5..af410fb4f65 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -52,6 +52,14 @@ typedef UA_Order
 (*UA_orderSignature)(const void *p1, const void *p2, const UA_DataType *type);
 extern const UA_orderSignature orderJumpTable[UA_DATATYPEKINDS];
 
+static UA_Order
+nodeIdOrder(const UA_NodeId *p1, const UA_NodeId *p2, const UA_DataType *_);
+static UA_Order
+expandedNodeIdOrder(const UA_ExpandedNodeId *p1, const UA_ExpandedNodeId *p2,
+                    const UA_DataType *_);
+static UA_Order
+guidOrder(const UA_Guid *p1, const UA_Guid *p2, const UA_DataType *_);
+
 const UA_DataType *
 UA_findDataTypeWithCustom(const UA_NodeId *typeId,
                           const UA_DataTypeArray *customTypes) {
@@ -61,14 +69,14 @@ UA_findDataTypeWithCustom(const UA_NodeId *typeId,
      * TODO: The standard-defined types are ordered. See if binary search is
      * more efficient. */
     for(size_t i = 0; i < UA_TYPES_COUNT; ++i) {
-        if(UA_NodeId_equal(&UA_TYPES[i].typeId, typeId))
+        if(nodeIdOrder(&UA_TYPES[i].typeId, typeId, NULL) == UA_ORDER_EQ)
             return &UA_TYPES[i];
     }
 
     /* Search in the customTypes */
     while(customTypes) {
         for(size_t i = 0; i < customTypes->typesSize; ++i) {
-            if(UA_NodeId_equal(&customTypes->types[i].typeId, typeId))
+            if(nodeIdOrder(&customTypes->types[i].typeId, typeId, NULL) == UA_ORDER_EQ)
                 return &customTypes->types[i];
         }
         customTypes = customTypes->next;
@@ -126,19 +134,6 @@ UA_String_fromChars(const char *src) {
     return s;
 }
 
-static UA_Order
-stringOrder(const UA_String *p1, const UA_String *p2, const UA_DataType *type);
-static UA_Order
-guidOrder(const UA_Guid *p1, const UA_Guid *p2, const UA_DataType *type);
-static UA_Order
-qualifiedNameOrder(const UA_QualifiedName *p1, const UA_QualifiedName *p2,
-                   const UA_DataType *type);
-
-UA_Boolean
-UA_String_equal(const UA_String *s1, const UA_String *s2) {
-    return (stringOrder(s1, s2, NULL) == UA_ORDER_EQ);
-}
-
 UA_Boolean
 UA_String_isEmpty(const UA_String *s) {
     return (s->length == 0 || s->data == NULL);
@@ -205,12 +200,6 @@ UA_QualifiedName_hash(const UA_QualifiedName *q) {
                               q->name.data, q->name.length);
 }
 
-UA_Boolean
-UA_QualifiedName_equal(const UA_QualifiedName *qn1,
-                       const UA_QualifiedName *qn2) {
-    return (qualifiedNameOrder(qn1, qn2, NULL) == UA_ORDER_EQ);
-}
-
 /* DateTime */
 UA_DateTimeStruct
 UA_DateTime_toStruct(UA_DateTime t) {
@@ -266,11 +255,6 @@ UA_DateTime_fromStruct(UA_DateTimeStruct ts) {
 }
 
 /* Guid */
-UA_Boolean
-UA_Guid_equal(const UA_Guid *g1, const UA_Guid *g2) {
-    return (guidOrder(g1, g2, NULL) == UA_ORDER_EQ);
-}
-
 static const u8 hexmapLower[16] =
     {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 static const u8 hexmapUpper[16] =
@@ -375,38 +359,14 @@ UA_NodeId_isNull(const UA_NodeId *p) {
     case UA_NODEIDTYPE_BYTESTRING:
         return (p->identifier.string.length == 0); /* Null and empty string */
     case UA_NODEIDTYPE_GUID:
-        return UA_Guid_equal(&p->identifier.guid, &UA_GUID_NULL);
+        return (guidOrder(&p->identifier.guid, &UA_GUID_NULL, NULL) == UA_ORDER_EQ);
     }
     return false;
 }
 
-/* Absolute ordering for NodeIds */
 UA_Order
 UA_NodeId_order(const UA_NodeId *n1, const UA_NodeId *n2) {
-    /* Compare namespaceIndex */
-    if(n1->namespaceIndex != n2->namespaceIndex)
-        return (n1->namespaceIndex < n2->namespaceIndex) ? UA_ORDER_LESS : UA_ORDER_MORE;
-
-    /* Compare identifierType */
-    if(n1->identifierType != n2->identifierType)
-        return (n1->identifierType < n2->identifierType) ? UA_ORDER_LESS : UA_ORDER_MORE;
-
-    /* Compare the identifier */
-    switch(n1->identifierType) {
-    case UA_NODEIDTYPE_NUMERIC:
-    default:
-        if(n1->identifier.numeric != n2->identifier.numeric)
-            return (n1->identifier.numeric < n2->identifier.numeric) ?
-                UA_ORDER_LESS : UA_ORDER_MORE;
-        return UA_ORDER_EQ;
-
-    case UA_NODEIDTYPE_GUID:
-        return guidOrder(&n1->identifier.guid, &n2->identifier.guid, NULL);
-
-    case UA_NODEIDTYPE_STRING:
-    case UA_NODEIDTYPE_BYTESTRING:
-        return stringOrder(&n1->identifier.string, &n2->identifier.string, NULL);
-    }
+    return nodeIdOrder(n1, n2, NULL);
 }
 
 /* sdbm-hash (http://www.cse.yorku.ca/~oz/hash.html) */
@@ -565,12 +525,7 @@ UA_ExpandedNodeId_isLocal(const UA_ExpandedNodeId *n) {
 UA_Order
 UA_ExpandedNodeId_order(const UA_ExpandedNodeId *n1,
                         const UA_ExpandedNodeId *n2) {
-    if(n1->serverIndex != n2->serverIndex)
-        return (n1->serverIndex < n2->serverIndex) ? UA_ORDER_LESS : UA_ORDER_MORE;
-    UA_Order o = stringOrder(&n1->namespaceUri, &n2->namespaceUri, NULL);
-    if(o != UA_ORDER_EQ)
-        return o;
-    return UA_NodeId_order(&n1->nodeId, &n2->nodeId);
+    return expandedNodeIdOrder(n1, n2, NULL);
 }
 
 u32
@@ -1599,19 +1554,45 @@ stringOrder(const UA_String *p1, const UA_String *p2, const UA_DataType *type) {
 }
 
 static UA_Order
-nodeIdOrder(const UA_NodeId *p1, const UA_NodeId *p2, const UA_DataType *type) {
-    return UA_NodeId_order(p1, p2);
+nodeIdOrder(const UA_NodeId *p1, const UA_NodeId *p2, const UA_DataType *_) {
+    /* Compare namespaceIndex */
+    if(p1->namespaceIndex != p2->namespaceIndex)
+        return (p1->namespaceIndex < p2->namespaceIndex) ? UA_ORDER_LESS : UA_ORDER_MORE;
+
+    /* Compare identifierType */
+    if(p1->identifierType != p2->identifierType)
+        return (p1->identifierType < p2->identifierType) ? UA_ORDER_LESS : UA_ORDER_MORE;
+
+    /* Compare the identifier */
+    switch(p1->identifierType) {
+    case UA_NODEIDTYPE_NUMERIC:
+    default:
+        if(p1->identifier.numeric != p2->identifier.numeric)
+            return (p1->identifier.numeric < p2->identifier.numeric) ?
+                UA_ORDER_LESS : UA_ORDER_MORE;
+        return UA_ORDER_EQ;
+    case UA_NODEIDTYPE_GUID:
+        return guidOrder(&p1->identifier.guid, &p2->identifier.guid, NULL);
+    case UA_NODEIDTYPE_STRING:
+    case UA_NODEIDTYPE_BYTESTRING:
+        return stringOrder(&p1->identifier.string, &p2->identifier.string, NULL);
+    }
 }
 
 static UA_Order
 expandedNodeIdOrder(const UA_ExpandedNodeId *p1, const UA_ExpandedNodeId *p2,
-                    const UA_DataType *type) {
-    return UA_ExpandedNodeId_order(p1, p2);
+                    const UA_DataType *_) {
+    if(p1->serverIndex != p2->serverIndex)
+        return (p1->serverIndex < p2->serverIndex) ? UA_ORDER_LESS : UA_ORDER_MORE;
+    UA_Order o = stringOrder(&p1->namespaceUri, &p2->namespaceUri, NULL);
+    if(o != UA_ORDER_EQ)
+        return o;
+    return nodeIdOrder(&p1->nodeId, &p2->nodeId, NULL);
 }
 
 static UA_Order
 qualifiedNameOrder(const UA_QualifiedName *p1, const UA_QualifiedName *p2,
-                   const UA_DataType *type) {
+                   const UA_DataType *_) {
     if(p1->namespaceIndex != p2->namespaceIndex)
         return (p1->namespaceIndex < p2->namespaceIndex) ? UA_ORDER_LESS : UA_ORDER_MORE;
     return stringOrder(&p1->name, &p2->name, NULL);
@@ -1619,7 +1600,7 @@ qualifiedNameOrder(const UA_QualifiedName *p1, const UA_QualifiedName *p2,
 
 static UA_Order
 localizedTextOrder(const UA_LocalizedText *p1, const UA_LocalizedText *p2,
-                   const UA_DataType *type) {
+                   const UA_DataType *_) {
     UA_Order o = stringOrder(&p1->locale, &p2->locale, NULL);
     if(o != UA_ORDER_EQ)
         return o;
@@ -1628,7 +1609,7 @@ localizedTextOrder(const UA_LocalizedText *p1, const UA_LocalizedText *p2,
 
 static UA_Order
 extensionObjectOrder(const UA_ExtensionObject *p1, const UA_ExtensionObject *p2,
-                     const UA_DataType *type) {
+                     const UA_DataType *_) {
     UA_ExtensionObjectEncoding enc1 = p1->encoding;
     UA_ExtensionObjectEncoding enc2 = p2->encoding;
     if(enc1 > UA_EXTENSIONOBJECT_DECODED)
@@ -1644,8 +1625,8 @@ extensionObjectOrder(const UA_ExtensionObject *p1, const UA_ExtensionObject *p2,
 
     case UA_EXTENSIONOBJECT_ENCODED_BYTESTRING:
     case UA_EXTENSIONOBJECT_ENCODED_XML: {
-            UA_Order o = UA_NodeId_order(&p1->content.encoded.typeId,
-                                         &p2->content.encoded.typeId);
+            UA_Order o = nodeIdOrder(&p1->content.encoded.typeId,
+                                     &p2->content.encoded.typeId, NULL);
             if(o == UA_ORDER_EQ)
                 o = stringOrder((const UA_String*)&p1->content.encoded.body,
                                 (const UA_String*)&p2->content.encoded.body, NULL);
@@ -1666,8 +1647,12 @@ extensionObjectOrder(const UA_ExtensionObject *p1, const UA_ExtensionObject *p2,
     }
 }
 
+/* Don't compare overlayable types as "binary blobs". We have specific order
+ * rules also for some overlayable types. For example how NaN floats are
+ * compared. */
 static UA_Order
-arrayOrder(const void *p1, size_t p1Length, const void *p2, size_t p2Length,
+arrayOrder(const void *p1, size_t p1Length,
+           const void *p2, size_t p2Length,
            const UA_DataType *type) {
     if(p1Length != p2Length)
         return (p1Length < p2Length) ? UA_ORDER_LESS : UA_ORDER_MORE;
@@ -1689,8 +1674,7 @@ arrayOrder(const void *p1, size_t p1Length, const void *p2, size_t p2Length,
 }
 
 static UA_Order
-variantOrder(const UA_Variant *p1, const UA_Variant *p2,
-             const UA_DataType *type) {
+variantOrder(const UA_Variant *p1, const UA_Variant *p2, const UA_DataType *_) {
     if(p1->type != p2->type)
         return ((uintptr_t)p1->type < (uintptr_t)p2->type) ? UA_ORDER_LESS : UA_ORDER_MORE;
 
@@ -1725,8 +1709,7 @@ variantOrder(const UA_Variant *p1, const UA_Variant *p2,
 }
 
 static UA_Order
-dataValueOrder(const UA_DataValue *p1, const UA_DataValue *p2,
-               const UA_DataType *type) {
+dataValueOrder(const UA_DataValue *p1, const UA_DataValue *p2, const UA_DataType *_) {
     /* Value */
     if(p1->hasValue != p2->hasValue)
         return (!p1->hasValue) ? UA_ORDER_LESS : UA_ORDER_MORE;
@@ -1773,7 +1756,7 @@ dataValueOrder(const UA_DataValue *p1, const UA_DataValue *p2,
 
 static UA_Order
 diagnosticInfoOrder(const UA_DiagnosticInfo *p1, const UA_DiagnosticInfo *p2,
-                    const UA_DataType *type) {
+                    const UA_DataType *_) {
     /* SymbolicId */
     if(p1->hasSymbolicId != p2->hasSymbolicId)
         return (!p1->hasSymbolicId) ? UA_ORDER_LESS : UA_ORDER_MORE;
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index 84949f6cafd..a661da0dd96 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -215,6 +215,7 @@ function(ua_generate_datatypes)
         ${UA_GEN_DT_INTERNAL_ARG}
         ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}
         DEPENDS ${open62541_TOOLS_DIR}/generate_datatypes.py
+                ${open62541_TOOLS_DIR}/nodeset_compiler/backend_open62541_typedefinitions.py
         ${UA_GEN_DT_FILES_BSD}
         ${UA_GEN_DT_FILE_CSV}
         ${UA_GEN_DT_FILES_SELECTED})
diff --git a/tools/nodeset_compiler/backend_open62541_typedefinitions.py b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
index 52577711cca..fe6d92ea773 100644
--- a/tools/nodeset_compiler/backend_open62541_typedefinitions.py
+++ b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
@@ -234,6 +234,8 @@ def print_functions(self, datatype):
                 idName, idName, self.print_datatype_ptr(datatype))
         funcs += "static UA_INLINE void\nUA_%s_delete(UA_%s *p) {\n    UA_delete(p, %s);\n}" % (
             idName, idName, self.print_datatype_ptr(datatype))
+        funcs += "static UA_INLINE UA_Boolean\nUA_%s_equal(const UA_%s *p1, const UA_%s *p2) {\n    return (UA_order(p1, p2, %s) == UA_ORDER_EQ);\n}\n\n" % (
+            idName, idName, idName, self.print_datatype_ptr(datatype))
         return funcs
 
     def print_datatype_encoding(self, datatype):

From 304953ccdb8e0d87cddb93b517e25e7ff959958e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 11:11:21 +0100
Subject: [PATCH 1257/1963] refactor(core): Simplification in
 extensionObjectOrder

---
 src/ua_types.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ua_types.c b/src/ua_types.c
index af410fb4f65..42d609606d3 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1627,10 +1627,10 @@ extensionObjectOrder(const UA_ExtensionObject *p1, const UA_ExtensionObject *p2,
     case UA_EXTENSIONOBJECT_ENCODED_XML: {
             UA_Order o = nodeIdOrder(&p1->content.encoded.typeId,
                                      &p2->content.encoded.typeId, NULL);
-            if(o == UA_ORDER_EQ)
-                o = stringOrder((const UA_String*)&p1->content.encoded.body,
-                                (const UA_String*)&p2->content.encoded.body, NULL);
-            return o;
+            if(o != UA_ORDER_EQ)
+                return o;
+            return stringOrder((const UA_String*)&p1->content.encoded.body,
+                               (const UA_String*)&p2->content.encoded.body, NULL);
         }
 
     case UA_EXTENSIONOBJECT_DECODED:

From 566a52c044a96e558d92c99d2c5393ca96c15685 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 11:11:51 +0100
Subject: [PATCH 1258/1963] refactor(core): Use _equal instead of (_order ==
 EQ) where possible

---
 src/server/ua_services_subscription.c      | 5 ++---
 src/server/ua_subscription_datachange.c    | 4 ++--
 src/server/ua_subscription_events_filter.c | 3 +--
 src/ua_types_encoding_json.c               | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index e903f794ba0..2bc211780f8 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -610,9 +610,8 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
      * Update the diagnostics statistics: */
 #ifdef UA_ENABLE_DIAGNOSTICS
     if(oldSession &&
-       UA_order(&oldSession->clientDescription,
-                &session->clientDescription,
-                &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]) == UA_ORDER_EQ)
+       UA_equal(&oldSession->clientDescription, &session->clientDescription,
+                &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]))
         sub->transferredToSameClientCount++;
     else
         sub->transferredToAltClientCount++;
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index adad0d56c36..047e97e2938 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -120,8 +120,8 @@ detectValueChange(UA_Server *server, UA_MonitoredItem *mon, const UA_DataValue *
     /* Has the value changed? */
     if(dv->hasValue != mon->lastValue.hasValue)
         return true;
-    return (UA_order(&dv->value, &mon->lastValue.value,
-                     &UA_TYPES[UA_TYPES_VARIANT]) != UA_ORDER_EQ);
+    return !UA_equal(&dv->value, &mon->lastValue.value,
+                     &UA_TYPES[UA_TYPES_VARIANT]);
 }
 
 UA_StatusCode
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 07433fea627..022b1065905 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -866,8 +866,7 @@ inListOperator(UA_FilterEvalContext *ctx, size_t index) {
         res = resolveOperand(ctx, &elm->filterOperands[i], op1);
         if(res != UA_STATUSCODE_GOOD)
             continue;
-        if(op0->type == op1->type &&
-           UA_order(op0->data, op1->data, op0->type) == UA_ORDER_EQ)
+        if(op0->type == op1->type && UA_equal(op0->data, op1->data, op0->type))
             found = true;
         UA_Variant_clear(op1);
     }
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index ffed6544001..98750ba5041 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -246,7 +246,7 @@ isNull(const void *p, const UA_DataType *type) {
         return false;
     UA_STACKARRAY(char, buf, type->memSize);
     memset(buf, 0, type->memSize);
-    return (UA_order(buf, p, type) == UA_ORDER_EQ);
+    return UA_equal(buf, p, type);
 }
 
 /* Boolean */

From 4b784f3359c797604e32317c3fbc67d00f7c4c01 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 4 Oct 2023 00:41:39 +0200
Subject: [PATCH 1259/1963] feat(server) enable automatic datatype adjust logic

---
 src/server/ua_services_attribute.c | 34 ++++++++++++++++--------------
 src/server/ua_services_method.c    |  7 +-----
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index f09d8351263..0192a0a2fdc 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1149,22 +1149,27 @@ void
 adjustValueType(UA_Server *server, UA_Variant *value,
                 const UA_NodeId *targetDataTypeId) {
     /* If the value is empty, there is nothing we can do here */
-    if(!value->type)
+    const UA_DataType *type = value->type;
+    if(!type)
         return;
 
     /* Unwrap ExtensionObject arrays if they all contain the same DataType */
     unwrapEOArray(server, value);
 
-    const UA_DataType *targetDataType = UA_findDataTypeWithCustom(targetDataTypeId, server->config.customDataTypes);
-    if(!targetDataType) {
-        /* Type might not have been found, if it's a non-NS0 type or an abstract type. */
+    /* The target type is already achieved. No adjustment needed. */
+    if(UA_NodeId_equal(&type->typeId, targetDataTypeId))
+        return;
+
+    /* Find the target type */
+    const UA_DataType *targetType =
+        UA_findDataTypeWithCustom(targetDataTypeId, server->config.customDataTypes);
+    if(!targetType)
         return;
-    }
 
     /* A string is written to a byte array. the valuerank and array dimensions
      * are checked later */
-    if(targetDataType == &UA_TYPES[UA_TYPES_BYTE] &&
-       value->type == &UA_TYPES[UA_TYPES_BYTESTRING] &&
+    if(targetType == &UA_TYPES[UA_TYPES_BYTE] &&
+       type == &UA_TYPES[UA_TYPES_BYTESTRING] &&
        UA_Variant_isScalar(value)) {
         UA_ByteString *str = (UA_ByteString*)value->data;
         value->type = &UA_TYPES[UA_TYPES_BYTE];
@@ -1175,14 +1180,14 @@ adjustValueType(UA_Server *server, UA_Variant *value,
 
     /* An enum was sent as an int32, or an opaque type as a bytestring. This
      * is detected with the typeKind indicating the "true" datatype. */
-    UA_DataTypeKind te1 = typeEquivalence(targetDataType);
-    UA_DataTypeKind te2 = typeEquivalence(value->type);
+    UA_DataTypeKind te1 = typeEquivalence(targetType);
+    UA_DataTypeKind te2 = typeEquivalence(type);
     if(te1 == te2 && te1 <= UA_DATATYPEKIND_ENUM) {
-        value->type = targetDataType;
+        value->type = targetType;
         return;
     }
 
-    /* No more possible equivalencies */
+    /* Add more possible type adjustments here. What are they? */
 }
 
 static UA_StatusCode
@@ -1423,14 +1428,11 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
 
     /* Type checking. May change the type of adjustedValue */
     const char *reason;
-    if(value->hasValue && value->value.type &&
-       !compatibleValue(server, session, &node->dataType, node->valueRank,
-                        node->arrayDimensionsSize, node->arrayDimensions,
-                        &adjustedValue.value, rangeptr, &reason)) {
+    if(value->hasValue && value->value.type) {
         /* Try to correct the type */
         adjustValueType(server, &adjustedValue.value, &node->dataType);
 
-        /* Recheck the type */
+        /* Check the type */
         if(!compatibleValue(server, session, &node->dataType, node->valueRank,
                             node->arrayDimensionsSize, node->arrayDimensions,
                             &adjustedValue.value, rangeptr, &reason)) {
diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index e32b5e242af..ac2a872bdff 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -92,15 +92,10 @@ checkAdjustArguments(UA_Server *server, UA_Session *session,
     UA_Argument *argReqs = (UA_Argument*)argRequirements->value.data.value.value.data;
     const char *reason;
     for(size_t i = 0; i < argReqsSize; ++i) {
-        if(compatibleValue(server, session, &argReqs[i].dataType, argReqs[i].valueRank,
-                           argReqs[i].arrayDimensionsSize, argReqs[i].arrayDimensions,
-                           &args[i], NULL, &reason))
-            continue;
-
         /* Incompatible value. Try to correct the type if possible. */
         adjustValueType(server, &args[i], &argReqs[i].dataType);
 
-        /* Recheck */
+        /* Check */
         if(!compatibleValue(server, session, &argReqs[i].dataType, argReqs[i].valueRank,
                             argReqs[i].arrayDimensionsSize, argReqs[i].arrayDimensions,
                             &args[i], NULL, &reason)) {

From 18b835d8f5bdfa4a7f9616dca6dff973a256131b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 14:23:36 +0100
Subject: [PATCH 1260/1963] refactor(server): Simplify writeNodeValueAttribute

---
 src/server/ua_services_attribute.c | 113 +++++++++++++++--------------
 1 file changed, 57 insertions(+), 56 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 0192a0a2fdc..620d0d0574f 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1470,70 +1470,71 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
      * (only via a datasource callback configured for a variable node) */
     adjustedValue.hasServerPicoseconds = false;
 
+    /* Call into the different value storage backends.
+     *
+     * TODO: Clean up this mess with duplicated possibilities for external
+     * callbacks */
+    retval = UA_STATUSCODE_BADWRITENOTSUPPORTED; /* default */
     switch(node->valueBackend.backendType) {
-        case UA_VALUEBACKENDTYPE_NONE:
-            /* Ok, do it */
-            if(node->valueSource == UA_VALUESOURCE_DATA) {
-                if(!rangeptr)
-                    retval = writeValueAttributeWithoutRange(node, &adjustedValue);
-                else
-                    retval = writeValueAttributeWithRange(node, &adjustedValue, rangeptr);
-
-#ifdef UA_ENABLE_HISTORIZING
-                /* node is a UA_VariableNode*, but it may also point to a
-                   UA_VariableTypeNode */
-                /* UA_VariableTypeNode doesn't have the historizing attribute */
-                if(retval == UA_STATUSCODE_GOOD &&
-                   node->head.nodeClass == UA_NODECLASS_VARIABLE &&
-                   server->config.historyDatabase.setValue) {
-                    UA_UNLOCK(&server->serviceMutex);
-                    server->config.historyDatabase.
-                        setValue(server, server->config.historyDatabase.context,
-                                 &session->sessionId, session->sessionHandle,
-                                 &node->head.nodeId, node->historizing, &adjustedValue);
-                    UA_LOCK(&server->serviceMutex);
-                }
-#endif
-                /* Callback after writing */
-                if(retval == UA_STATUSCODE_GOOD && node->value.data.callback.onWrite) {
-                    UA_UNLOCK(&server->serviceMutex);
-                    node->value.data.callback.
-                        onWrite(server, &session->sessionId, session->sessionHandle,
-                                &node->head.nodeId, node->head.context,
-                                rangeptr, &adjustedValue);
-                    UA_LOCK(&server->serviceMutex);
-
-                }
-            } else {
-                if(node->value.dataSource.write) {
-                    UA_UNLOCK(&server->serviceMutex);
-                    retval = node->value.dataSource.
-                        write(server, &session->sessionId, session->sessionHandle,
-                              &node->head.nodeId, node->head.context,
-                              rangeptr, &adjustedValue);
-                    UA_LOCK(&server->serviceMutex);
-                } else {
-                    retval = UA_STATUSCODE_BADWRITENOTSUPPORTED;
-                }
-            }
-            break;
-        case UA_VALUEBACKENDTYPE_INTERNAL:
-            break;
-        case UA_VALUEBACKENDTYPE_DATA_SOURCE_CALLBACK:
-            break;
-        case UA_VALUEBACKENDTYPE_EXTERNAL:
-            if(node->valueBackend.backend.external.callback.userWrite == NULL){
-                if(rangeptr && rangeptr->dimensions != NULL)
-                    UA_free(rangeptr->dimensions);
-                return UA_STATUSCODE_BADWRITENOTSUPPORTED;
+    case UA_VALUEBACKENDTYPE_NONE:
+        if(node->valueSource == UA_VALUESOURCE_DATA) {
+            /* Write into the in-situ DataValue */
+            if(!rangeptr)
+                retval = writeValueAttributeWithoutRange(node, &adjustedValue);
+            else
+                retval = writeValueAttributeWithRange(node, &adjustedValue, rangeptr);
+
+            /* Callback after writing */
+            if(retval == UA_STATUSCODE_GOOD &&
+               node->value.data.callback.onWrite) {
+                UA_UNLOCK(&server->serviceMutex);
+                node->value.data.callback.
+                    onWrite(server, &session->sessionId, session->sessionHandle,
+                            &node->head.nodeId, node->head.context,
+                            rangeptr, &adjustedValue);
+                UA_LOCK(&server->serviceMutex);
             }
+        } else if(node->value.dataSource.write) {
+            /* Write via the datasource callback */
+            UA_UNLOCK(&server->serviceMutex);
+            retval = node->value.dataSource.
+                write(server, &session->sessionId, session->sessionHandle,
+                      &node->head.nodeId, node->head.context,
+                      rangeptr, &adjustedValue);
+            UA_LOCK(&server->serviceMutex);
+        }
+        break;
+
+    case UA_VALUEBACKENDTYPE_EXTERNAL:
+        if(node->valueBackend.backend.external.callback.userWrite) {
             retval = node->valueBackend.backend.external.callback.
                 userWrite(server, &session->sessionId, session->sessionHandle,
                           &node->head.nodeId, node->head.context,
                           rangeptr, &adjustedValue);
-            break;
+        }
+        break;
+
+    case UA_VALUEBACKENDTYPE_INTERNAL:
+    case UA_VALUEBACKENDTYPE_DATA_SOURCE_CALLBACK:
+    default:
+        break;
     }
 
+    /* Write into the historical data backend. Not that the historical data
+     * backend can be configured to "poll" data like a MonitoredItem also. */
+#ifdef UA_ENABLE_HISTORIZING
+    if(retval == UA_STATUSCODE_GOOD &&
+       node->head.nodeClass == UA_NODECLASS_VARIABLE &&
+       server->config.historyDatabase.setValue) {
+        UA_UNLOCK(&server->serviceMutex);
+        server->config.historyDatabase.
+            setValue(server, server->config.historyDatabase.context,
+                     &session->sessionId, session->sessionHandle,
+                     &node->head.nodeId, node->historizing, &adjustedValue);
+        UA_LOCK(&server->serviceMutex);
+    }
+#endif
+
     /* Clean up */
     if(rangeptr && rangeptr->dimensions != NULL)
         UA_free(rangeptr->dimensions);

From c87f91267f150c7219cd7d99e4da9e3ffe5a15a5 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Thu, 26 Oct 2023 23:44:44 +0200
Subject: [PATCH 1261/1963] fix(ctt) exclude extension object and data values
 from the ctt nodeset

---
 examples/server_ctt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 33bb283c62b..1d761af485e 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -537,7 +537,7 @@ setInformationModel(UA_Server *server) {
     UA_UInt32 matrixDims[2] = {5, 5};
     UA_UInt32 id = 51000; // running id in namespace 0
     for(UA_UInt32 type = 0; type < UA_TYPES_DIAGNOSTICINFO; type++) {
-        if(type == UA_TYPES_VARIANT || type == UA_TYPES_DIAGNOSTICINFO)
+        if(type == UA_TYPES_VARIANT || type == UA_TYPES_DIAGNOSTICINFO || type == UA_TYPES_EXTENSIONOBJECT || type == UA_TYPES_DATAVALUE)
             continue;
 
         UA_VariableAttributes attr = UA_VariableAttributes_default;

From c910c1f01693f3ab8546576cc89d08e24a7f4030 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Thu, 26 Oct 2023 17:49:21 +0200
Subject: [PATCH 1262/1963] fix(server) add reference for 1.04. nodeset
 compatibility

---
 examples/server_ctt.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 1d761af485e..d57067cf90d 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -364,6 +364,22 @@ outargMethod(UA_Server *server,
 
 static void
 setInformationModel(UA_Server *server) {
+    /* Workaround for compatibility between the CTT 1.04. information model
+     * check and the 1.05. nodeset, which is loaded in our default configuration.
+     * With 1.05. the fields "ConditionSubClassId" and "ConditionSubClassName"
+     * are now optional children of the "BaseEventType". Therefore, the fields are
+     * not referenced in the "ConditionType" since this type inherit the fields
+     * from the "BaseEventType". For compatibility, the references are created
+     * manually */
+    UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE),
+                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE_CONDITIONSUBCLASSID),
+                           true);
+    UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE),
+                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
+                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE_CONDITIONSUBCLASSNAME),
+                           true);
+
     /* add a custom reference type */
     UA_ReferenceTypeAttributes myRef = UA_ReferenceTypeAttributes_default;
     myRef.description = UA_LOCALIZEDTEXT("", "my organize");

From 6e7a851c68605023160e966b176395468ad8d088 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 28 Sep 2023 17:48:22 +0200
Subject: [PATCH 1263/1963] feat(server): Automatic creation of all user token
 policies for all defined policies in the SecureChannel in AccessControl.

---
 examples/server_ctt.c              |  3 +-
 plugins/ua_accesscontrol_default.c | 91 ++++++++++++++++++++----------
 plugins/ua_config_default.c        |  9 +--
 src/server/ua_services_discovery.c | 22 +++++---
 src/server/ua_services_session.c   |  4 ++
 5 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index d57067cf90d..68058a27741 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1458,8 +1458,7 @@ int main(int argc, char **argv) {
         config->verifyRequestTimestamp = UA_RULEHANDLING_DEFAULT;
 
     /* Instatiate a new AccessControl plugin that knows username/pw */
-    UA_String aes128Sha256RsaOaep = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
-    UA_AccessControl_default(config, enableAnonymous, &aes128Sha256RsaOaep,
+    UA_AccessControl_default(config, enableAnonymous, NULL,
                              usernamePasswordsSize, usernamePasswords);
 
     /* Override with a custom access control policy */
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index b7d79d9cc10..8d2ed7d2208 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -355,6 +355,17 @@ UA_AccessControl_default(UA_ServerConfig *config,
         }
     }
 
+    size_t numOfPolcies = 1;
+    if(!userTokenPolicyUri) {
+        if(config->securityPoliciesSize > 0)
+            numOfPolcies = config->securityPoliciesSize;
+        else {
+            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                           "No security policies defined for the secure channel.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    }
+
     /* Set the allowed policies */
     size_t policies = 0;
     if(allowAnonymous)
@@ -365,47 +376,64 @@ UA_AccessControl_default(UA_ServerConfig *config,
         policies++;
     ac->userTokenPoliciesSize = 0;
     ac->userTokenPolicies = (UA_UserTokenPolicy *)
-        UA_Array_new(policies, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+        UA_Array_new(policies * numOfPolcies, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
     if(!ac->userTokenPolicies)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    ac->userTokenPoliciesSize = policies;
+    ac->userTokenPoliciesSize = policies * numOfPolcies;
 
-    policies = 0;
-    if(allowAnonymous) {
-        ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_ANONYMOUS;
-        ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(ANONYMOUS_POLICY);
-        policies++;
+    if(policies == 0) {
+        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                       "No allowed policies set.");
+        return UA_STATUSCODE_GOOD;
     }
 
-    if(config->sessionPKI.verifyCertificate) {
-        ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_CERTIFICATE;
-        ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(CERTIFICATE_POLICY);
-#if UA_LOGLEVEL <= 400
-        if(UA_ByteString_equal(userTokenPolicyUri, &UA_SECURITY_POLICY_NONE_URI)) {
-            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
-                           "x509 Certificate Authentication configured, "
-                           "but no encrypting SecurityPolicy. "
-                           "This can leak credentials on the network.");
+    const UA_ByteString *utpUri = NULL;
+    policies = 0;
+    for(size_t i = 0; i < numOfPolcies; i++) {
+        if(userTokenPolicyUri) {
+            utpUri = userTokenPolicyUri;
+        } else {
+            utpUri = &config->securityPolicies[i].policyUri;
+        }
+        if(allowAnonymous) {
+            ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_ANONYMOUS;
+            ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(ANONYMOUS_POLICY);
+            UA_ByteString_copy(utpUri,
+                               &ac->userTokenPolicies[policies].securityPolicyUri);
+            policies++;
         }
-#endif
-        UA_ByteString_copy(userTokenPolicyUri,
-                           &ac->userTokenPolicies[policies].securityPolicyUri);
-        policies++;
-    }
 
-    if(usernamePasswordLoginSize > 0) {
-        ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_USERNAME;
-        ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(USERNAME_POLICY);
+        if(config->sessionPKI.verifyCertificate) {
+            ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_CERTIFICATE;
+            ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(CERTIFICATE_POLICY);
 #if UA_LOGLEVEL <= 400
-        if(UA_ByteString_equal(userTokenPolicyUri, &UA_SECURITY_POLICY_NONE_URI)) {
-            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
-                           "Username/Password Authentication configured, "
-                           "but no encrypting SecurityPolicy. "
-                           "This can leak credentials on the network.");
+            if(UA_ByteString_equal(utpUri, &UA_SECURITY_POLICY_NONE_URI)) {
+                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                               "x509 Certificate Authentication configured, "
+                               "but no encrypting SecurityPolicy. "
+                               "This can leak credentials on the network.");
+            }
+#endif
+            UA_ByteString_copy(utpUri,
+                               &ac->userTokenPolicies[policies].securityPolicyUri);
+            policies++;
         }
+
+        if(usernamePasswordLoginSize > 0) {
+            ac->userTokenPolicies[policies].tokenType = UA_USERTOKENTYPE_USERNAME;
+            ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(USERNAME_POLICY);
+#if UA_LOGLEVEL <= 400
+            if(UA_ByteString_equal(utpUri, &UA_SECURITY_POLICY_NONE_URI)) {
+                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                               "Username/Password Authentication configured, "
+                               "but no encrypting SecurityPolicy. "
+                               "This can leak credentials on the network.");
+            }
 #endif
-        UA_ByteString_copy(userTokenPolicyUri,
-                           &ac->userTokenPolicies[policies].securityPolicyUri);
+            UA_ByteString_copy(utpUri,
+                               &ac->userTokenPolicies[policies].securityPolicyUri);
+            policies++;
+        }
     }
     return UA_STATUSCODE_GOOD;
 }
@@ -431,3 +459,4 @@ UA_AccessControl_defaultWithLoginCallback(UA_ServerConfig *config,
 
     return UA_STATUSCODE_GOOD;
 }
+
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 2f9ff0ce7b7..44758240e80 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -657,8 +657,7 @@ UA_ServerConfig_setMinimalCustomBuffer(UA_ServerConfig *config, UA_UInt16 portNu
     }
 
     /* Initialize the Access Control plugin */
-    UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
-    retval = UA_AccessControl_default(config, true, &sp->policyUri, 0, NULL);
+    retval = UA_AccessControl_default(config, true, NULL, 0, NULL);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(config);
         return retval;
@@ -976,8 +975,7 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
     retval = UA_ServerConfig_addAllSecurityPolicies(conf, certificate, privateKey);
 
     if(retval == UA_STATUSCODE_GOOD) {
-        UA_SecurityPolicy *sp = &conf->securityPolicies[conf->securityPoliciesSize-1];
-        retval = UA_AccessControl_default(conf, true, &sp->policyUri, 0, NULL);
+        retval = UA_AccessControl_default(conf, true, NULL, 0, NULL);
     }
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
@@ -1027,8 +1025,7 @@ UA_ServerConfig_setDefaultWithSecureSecurityPolicies(UA_ServerConfig *conf,
     retval = UA_ServerConfig_addAllSecureSecurityPolicies(conf, certificate, privateKey);
 
     if(retval == UA_STATUSCODE_GOOD) {
-        UA_SecurityPolicy *sp = &conf->securityPolicies[conf->securityPoliciesSize-1];
-        retval = UA_AccessControl_default(conf, false, &sp->policyUri, 0, NULL);
+        retval = UA_AccessControl_default(conf, false, NULL, 0, NULL);
     }
     if(retval != UA_STATUSCODE_GOOD) {
         UA_ServerConfig_clean(conf);
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 166d5e7ba38..7a440332319 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -321,16 +321,20 @@ updateEndpointUserIdentityToken(UA_Server *server, UA_EndpointDescription *ed) {
     if(ed->userIdentityTokensSize > 0)
         return UA_STATUSCODE_GOOD;
 
-    /* Copy the UserTokenPolicies from the AccessControl plugin
+    /* Copy the UserTokenPolicies from the AccessControl plugin, but only the matching ones to the securityPolicyUri.
      * TODO: Different instances of the AccessControl plugin per Endpoint */
-    UA_StatusCode res =
-        UA_Array_copy(server->config.accessControl.userTokenPolicies,
-                      server->config.accessControl.userTokenPoliciesSize,
-                      (void **)&ed->userIdentityTokens,
-                      &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
-    if(res != UA_STATUSCODE_GOOD)
-        return res;
-    ed->userIdentityTokensSize = server->config.accessControl.userTokenPoliciesSize;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    for(size_t i = 0; i < server->config.accessControl.userTokenPoliciesSize; i++) {
+        UA_UserTokenPolicy *utp = &server->config.accessControl.userTokenPolicies[i];
+        if(UA_String_equal(&ed->securityPolicyUri, &utp->securityPolicyUri)) {
+             res = UA_Array_appendCopy((void**)&ed->userIdentityTokens,
+                                &ed->userIdentityTokensSize,
+                                utp,
+                                &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+            if(res != UA_STATUSCODE_GOOD)
+                return res;
+        }
+    }
 
     for(size_t i = 0; i < ed->userIdentityTokensSize; i++) {
         /* Use the securityPolicy of the SecureChannel. But not if the
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index b2a421b2637..1b3e40edd41 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -460,10 +460,14 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
         }
 
         /* Match the UserTokenType */
+        UA_String noneuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
         const UA_DataType *tokenDataType = identityToken->content.decoded.type;
         for(size_t j = 0; j < identPoliciesSize ; j++) {
             const UA_UserTokenPolicy *pol = &identPolicies[j];
 
+            if(!UA_String_equal(&desc->securityPolicyUri, &noneuri) && !UA_String_equal(&desc->securityPolicyUri, &pol->securityPolicyUri))
+                continue;
+
             /* Part 4, Section 5.6.3.2, Table 17: A NULL or empty
              * UserIdentityToken should be treated as Anonymous */
             if(identityToken->encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY &&

From cc769be77a6b0c6fcde2f59426f5981fc4708738 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 23:01:32 +0100
Subject: [PATCH 1264/1963] refactor(server): Improve comment in
 ua_services_attribute.c

---
 src/server/ua_services_attribute.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 620d0d0574f..8b3cbe77a4f 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -277,8 +277,7 @@ readValueAttributeComplete(UA_Server *server, UA_Session *session,
             break;
     }
 
-    /* Static nodes have a source timestamp of now.
-     * No source timestamp is "invented" otherwise. */
+    /* Static nodes always have a source timestamp of "now" */
     if(vn->head.nodeClass != UA_NODECLASS_VARIABLE || !vn->isDynamic) {
         v->sourceTimestamp = UA_DateTime_now();
         v->hasSourceTimestamp = true;

From 5825df9c4c04a8bff371d013fbde4e45658aaa57 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 23:02:32 +0100
Subject: [PATCH 1265/1963] refactor(server): Make setVariableNodeDynamic more
 general

---
 src/server/ua_services_nodemanagement.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index ffd27c54d49..467eab6b311 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -1356,10 +1356,10 @@ setReferenceTypeSubtypes(UA_Server *server, const UA_ReferenceTypeNode *node) {
 
 static UA_StatusCode
 setVariableNodeDynamic(UA_Server *server, UA_Session *session,
-                       UA_Node *node, const void *_) {
-    (void)_; /* unused */
-    if(node->head.nodeClass == UA_NODECLASS_VARIABLE)
-        ((UA_VariableNode*)node)->isDynamic = true;
+                       UA_Node *node, const void *ctx) {
+    if(node->head.nodeClass != UA_NODECLASS_VARIABLE)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    ((UA_VariableNode*)node)->isDynamic = *(const UA_Boolean*)ctx;
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1404,8 +1404,9 @@ checkSetIsDynamicVariable(UA_Server *server, UA_Session *session,
         return UA_STATUSCODE_GOOD;
 
     /* Set the variable to "dynamic" */
+    UA_Boolean isDynamic = true;
     UA_Server_editNode(server, session, nodeId,
-                       (UA_EditNodeCallback)setVariableNodeDynamic, NULL);
+                       (UA_EditNodeCallback)setVariableNodeDynamic, &isDynamic);
 
     return UA_STATUSCODE_GOOD;
 }

From 74cc875d649566bc9c010845e08f36276bf2c853 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Oct 2023 23:03:09 +0100
Subject: [PATCH 1266/1963] feat(server): Add UA_Server_setVariableNodeDynamic

---
 include/open62541/server.h              | 22 +++++++++++-----------
 src/server/ua_services_nodemanagement.c | 11 +++++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 6eac5064561..bb4624dc491 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -847,11 +847,6 @@ UA_Server_writeEventNotifier(UA_Server *server, const UA_NodeId nodeId,
                              &UA_TYPES[UA_TYPES_BYTE], &eventNotifier);
 }
 
-/**
- * Writes an UA_Variant to a variable/variableType node.
- * StatusCode is set to ``UA_STATUSCODE_GOOD``, sourceTimestamp and
- * serverTimestamp are set to UA_DateTime_now()
- */
 static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Server_writeValue(UA_Server *server, const UA_NodeId nodeId,
                      const UA_Variant value) {
@@ -859,14 +854,12 @@ UA_Server_writeValue(UA_Server *server, const UA_NodeId nodeId,
                              &UA_TYPES[UA_TYPES_VARIANT], &value);
 }
 
-/**
- * Writes an UA_DataValue to a variable/variableType node.
- * In contrast to UA_Server_writeValue, this functions can also write
- * sourceTimestamp, serverTimestamp and statusCode.
- */
+/* Writes an UA_DataValue to a variable/variableType node. In contrast to
+ * UA_Server_writeValue, this functions can also write SourceTimestamp,
+ * ServerTimestamp and StatusCode. */
 static UA_INLINE UA_THREADSAFE UA_StatusCode
 UA_Server_writeDataValue(UA_Server *server, const UA_NodeId nodeId,
-                     const UA_DataValue value) {
+                         const UA_DataValue value) {
     return __UA_Server_write(server, &nodeId, UA_ATTRIBUTEID_VALUE,
                              &UA_TYPES[UA_TYPES_DATAVALUE], &value);
 }
@@ -1432,6 +1425,13 @@ UA_Server_addDataSourceVariableNode(UA_Server *server,
                                     const UA_DataSource dataSource,
                                     void *nodeContext, UA_NodeId *outNewNodeId);
 
+/* VariableNodes that are "dynamic" (default for user-created variables) receive
+ * and store a SourceTimestamp. For non-dynamic VariableNodes the current time
+ * is used for the SourceTimestamp. */
+UA_StatusCode UA_EXPORT UA_THREADSAFE
+UA_Server_setVariableNodeDynamic(UA_Server *server, const UA_NodeId nodeId,
+                                 UA_Boolean isDynamic);
+
 #ifdef UA_ENABLE_METHODCALLS
 
 UA_StatusCode UA_EXPORT UA_THREADSAFE
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 467eab6b311..5f438e609df 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -1411,6 +1411,17 @@ checkSetIsDynamicVariable(UA_Server *server, UA_Session *session,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_Server_setVariableNodeDynamic(UA_Server *server, const UA_NodeId nodeId,
+                                 UA_Boolean isDynamic) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res =
+        UA_Server_editNode(server, &server->adminSession, &nodeId,
+                           (UA_EditNodeCallback)setVariableNodeDynamic, &isDynamic);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 /* Children, references, type-checking, constructors. */
 UA_StatusCode
 addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId) {

From cb82b772b9173939109246af450bb5cd8eb531ba Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Oct 2023 13:50:36 +0100
Subject: [PATCH 1267/1963] fix(server): Correctly return the timestamps when
 reading a range

---
 src/server/ua_services_attribute.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 8b3cbe77a4f..0b1c31c010a 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -182,9 +182,14 @@ readValueAttributeFromNode(UA_Server *server, UA_Session *session,
     }
 
     /* Set the result */
-    if(rangeptr)
-        return UA_Variant_copyRange(&vn->value.data.value.value, &v->value, *rangeptr);
-    UA_StatusCode retval = UA_DataValue_copy(&vn->value.data.value, v);
+    UA_StatusCode retval;
+    if(!rangeptr) {
+        retval = UA_DataValue_copy(&vn->value.data.value, v);
+    } else {
+        *v = vn->value.data.value; /* Copy timestamps */
+        UA_Variant_init(&v->value);
+        retval = UA_Variant_copyRange(&vn->value.data.value.value, &v->value, *rangeptr);
+    }
 
     /* Clean up */
     if(vn->value.data.callback.onRead)

From 151bd98c23a1ab2e395e82fb350c26e9b159b74d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Oct 2023 13:51:07 +0100
Subject: [PATCH 1268/1963] fix(server): Create a current sourceTimestamp
 during "Write" if none is defined

---
 src/server/ua_services_attribute.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 0b1c31c010a..25950b18ba2 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1466,8 +1466,17 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
     if(node->head.nodeClass == UA_NODECLASS_VARIABLE && node->isDynamic) {
         adjustedValue.serverTimestamp = UA_DateTime_now();
         adjustedValue.hasServerTimestamp = true;
+
+        /* If no source timestamp is defined create one here.
+         * It should be created as close to the source as possible. */
+        if(!adjustedValue.hasSourceTimestamp) {
+            adjustedValue.sourceTimestamp = adjustedValue.serverTimestamp;
+            adjustedValue.hasSourceTimestamp = true;
+            adjustedValue.hasSourcePicoseconds = false;
+        }
     } else {
         adjustedValue.hasServerTimestamp = false;
+        adjustedValue.hasSourceTimestamp = false;
     }
 
     /* Picoseconds server timestamps are not supported in the standard code-path

From 2f99b61aa0f6c953067f71ce4837b5d653cf0968 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Oct 2023 14:07:06 +0100
Subject: [PATCH 1269/1963] fix(server): Create a current source timestamp when
 variables are instantiated

---
 src/server/ua_services_nodemanagement.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 5f438e609df..f3c0335cdf5 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -1070,6 +1070,13 @@ addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
     if(retval != UA_STATUSCODE_GOOD)
         goto create_error;
 
+    /* Create a current source timestamp for values that don't have any */
+    if(node->head.nodeClass == UA_NODECLASS_VARIABLE &&
+       !node->variableNode.value.data.value.hasSourceTimestamp) {
+        node->variableNode.value.data.value.hasSourceTimestamp = true;
+        node->variableNode.value.data.value.sourceTimestamp = UA_DateTime_now();
+    }
+
     /* Add the node to the nodestore */
     if(!outNewNodeId)
         outNewNodeId = &tmpOutId;

From 519c1e3132da15ba4e17fcab46358ad930225cc1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Oct 2023 22:02:59 +0100
Subject: [PATCH 1270/1963] refactor(server): Mark VariableNodes as dynamic
 before setting the default value

---
 src/server/ua_services_nodemanagement.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index f3c0335cdf5..d0003d7106d 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -1463,6 +1463,15 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
         }
     }
 
+    /* Set variables to dynamic (source and server timestamps are meaningful) if
+     * they fulfill some conditions. (Do this before replacing the default value
+     * in a VariableNode. So that the sourceTimestamp is set in the Write service.) */
+    if(node->head.nodeClass == UA_NODECLASS_VARIABLE) {
+        retval = checkSetIsDynamicVariable(server, session, nodeId);
+        if(retval != UA_STATUSCODE_GOOD)
+            goto cleanup;
+    }
+
     /* Get the type node */
     if(node->head.nodeClass == UA_NODECLASS_VARIABLE ||
        node->head.nodeClass == UA_NODECLASS_VARIABLETYPE ||
@@ -1550,14 +1559,6 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
         }
     }
 
-    /* Set variables to dynamic (source and server timestamps are meaningful) if
-     * they fulfill some conditions */
-    if(node->head.nodeClass == UA_NODECLASS_VARIABLE) {
-        retval = checkSetIsDynamicVariable(server, session, nodeId);
-        if(retval != UA_STATUSCODE_GOOD)
-            goto cleanup;
-    }
-
     /* Call the constructor(s) */
  constructor:
     if(!node->head.constructed)

From 6a51f028ce9c4913c4d9f10c2f9f39e5f8a36bfe Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Oct 2023 22:52:13 +0100
Subject: [PATCH 1271/1963] fix(server): Iterate over the correct list in
 UA_Subscription_resendData

---
 src/server/ua_subscription.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 543757fcbc6..c67c88a321e 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -698,7 +698,7 @@ UA_Subscription_resendData(UA_Server *server, UA_Subscription *sub) {
      * the Publish response. If no value is queued for a data MonitoredItem, the
      * last value sent is repeated in the Publish response. */
     UA_MonitoredItem *mon;
-    LIST_FOREACH(mon, &sub->samplingMonitoredItems, sampling.samplingListEntry) {
+    LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
         if(mon->itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER)
             continue;
         if(mon->monitoringMode != UA_MONITORINGMODE_REPORTING)

From fad2394df69b9b70df200baacbb8acc0644f021a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 31 Oct 2023 08:51:11 +0100
Subject: [PATCH 1272/1963] fix(plugins): Fix a memory issue for Windows
 OpenSSL (reading the subject name)

---
 plugins/crypto/openssl/ua_pki_openssl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 66db26afef1..9d98098e52d 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -714,7 +714,8 @@ UA_GetCertificate_SubjectName(UA_String *subjectName,
     if(!x509)
         return UA_STATUSCODE_BADINTERNALERROR;
     X509_NAME *sn = X509_get_subject_name(x509);
-    *subjectName = UA_STRING(X509_NAME_oneline(sn, NULL, 0));
+    char buf[1024];
+    *subjectName = UA_STRING_ALLOC(X509_NAME_oneline(sn, buf, 1024));
     X509_free(x509);
     return UA_STATUSCODE_GOOD;
 }

From 10f8945b91c111e8b08d4e9f44fed39dcc546679 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Nov 2023 23:07:31 +0100
Subject: [PATCH 1273/1963] refactor(server): Simplify processMSGDecoded

---
 src/server/ua_server_binary.c | 83 +++++++++++++----------------------
 1 file changed, 30 insertions(+), 53 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index eabd2694e1d..dc5c4e1768f 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -708,10 +708,12 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
                   const UA_DataType *requestType, UA_Response *response,
                   const UA_DataType *responseType, UA_Boolean sessionRequired,
                   size_t counterOffset) {
+    UA_Session anonymousSession;
     UA_Session *session = NULL;
     UA_StatusCode channelRes = UA_STATUSCODE_GOOD;
-    UA_StatusCode serviceRes = UA_STATUSCODE_GOOD;
-    const UA_RequestHeader *requestHeader = &request->requestHeader;
+    UA_ResponseHeader *rh = &response->responseHeader;
+
+    UA_LOCK(&server->serviceMutex);
 
     /* If it is an unencrypted (#None) channel, only allow the discovery services */
     if(server->config.securityPolicyNoneDiscoveryOnly &&
@@ -722,19 +724,15 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
        && requestType != &UA_TYPES[UA_TYPES_FINDSERVERSONNETWORKREQUEST]
 #endif
        ) {
-        serviceRes = UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
-        channelRes = sendServiceFault(channel, requestId, requestHeader->requestHandle,
-                                      UA_STATUSCODE_BADSECURITYPOLICYREJECTED);
-        goto update_statistics;
+        rh->serviceResult = UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
+        goto send_response;
     }
 
     /* Session lifecycle services. */
     if(requestType == &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST] ||
        requestType == &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST] ||
        requestType == &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]) {
-        UA_LOCK(&server->serviceMutex);
         ((UA_ChannelService)service)(server, channel, request, response);
-        UA_UNLOCK(&server->serviceMutex);
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
         /* Store the authentication token so we can help fuzzing by setting
          * these values in the next request automatically */
@@ -743,28 +741,18 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
             UA_NodeId_copy(&res->authenticationToken, &unsafe_fuzz_authenticationToken);
         }
 #endif
-        serviceRes = response->responseHeader.serviceResult;
-        channelRes = sendResponse(server, NULL, channel, requestId, response, responseType);
-        goto update_statistics;
+        goto send_response;
     }
 
     /* Get the Session bound to the SecureChannel (not necessarily activated) */
-    if(!UA_NodeId_isNull(&requestHeader->authenticationToken)) {
-        UA_LOCK(&server->serviceMutex);
-        UA_StatusCode retval =
-            getBoundSession(server, channel,
-                            &requestHeader->authenticationToken, &session);
-        UA_UNLOCK(&server->serviceMutex);
-        if(retval != UA_STATUSCODE_GOOD) {
-            serviceRes = response->responseHeader.serviceResult;
-            channelRes = sendServiceFault(channel, requestId,
-                                          requestHeader->requestHandle, retval);
-            goto update_statistics;
-        }
+    if(!UA_NodeId_isNull(&request->requestHeader.authenticationToken)) {
+        rh->serviceResult = getBoundSession(server, channel,
+                      &request->requestHeader.authenticationToken, &session);
+        if(rh->serviceResult != UA_STATUSCODE_GOOD)
+            goto send_response;
     }
 
     /* Set an anonymous, inactive session for services that need no session */
-    UA_Session anonymousSession;
     if(!session) {
         if(sessionRequired) {
 #ifdef UA_ENABLE_TYPEDESCRIPTION
@@ -776,10 +764,8 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
                                    "Service %" PRIu32 " refused without a valid session",
                                    requestType->binaryEncodingId.identifier.numeric);
 #endif
-            serviceRes = UA_STATUSCODE_BADSESSIONIDINVALID;
-            channelRes = sendServiceFault(channel, requestId, requestHeader->requestHandle,
-                                          UA_STATUSCODE_BADSESSIONIDINVALID);
-            goto update_statistics;
+            rh->serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
+            goto send_response;
         }
 
         UA_Session_init(&anonymousSession);
@@ -802,15 +788,11 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
                                requestType->binaryEncodingId.identifier.numeric);
 #endif
         if(session != &anonymousSession) {
-            UA_LOCK(&server->serviceMutex);
             UA_Server_removeSessionByToken(server, &session->header.authenticationToken,
                                            UA_SHUTDOWNREASON_ABORT);
-            UA_UNLOCK(&server->serviceMutex);
         }
-        serviceRes = UA_STATUSCODE_BADSESSIONNOTACTIVATED;
-        channelRes = sendServiceFault(channel, requestId, requestHeader->requestHandle,
-                                      UA_STATUSCODE_BADSESSIONNOTACTIVATED);
-        goto update_statistics;
+        rh->serviceResult = UA_STATUSCODE_BADSESSIONNOTACTIVATED;
+        goto send_response;
     }
 
     /* Update the session lifetime */
@@ -819,9 +801,10 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     /* The publish request is not answered immediately */
     if(requestType == &UA_TYPES[UA_TYPES_PUBLISHREQUEST]) {
-        UA_LOCK(&server->serviceMutex);
-        serviceRes = Service_Publish(server, session, &request->publishRequest, requestId);
-        /* No channelRes due to the async response */
+        rh->serviceResult =
+            Service_Publish(server, session, &request->publishRequest, requestId);
+
+        /* Don't send a response */
         UA_UNLOCK(&server->serviceMutex);
         goto update_statistics;
     }
@@ -831,49 +814,43 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
     /* The call request might not be answered immediately */
     if(requestType == &UA_TYPES[UA_TYPES_CALLREQUEST]) {
         UA_Boolean finished = true;
-        UA_LOCK(&server->serviceMutex);
         Service_CallAsync(server, session, requestId, &request->callRequest,
                           &response->callResponse, &finished);
-        UA_UNLOCK(&server->serviceMutex);
 
         /* Async method calls remain. Don't send a response now. In case we have
          * an async call, count as a "good" request for the diagnostics
          * statistic. */
-        if(UA_LIKELY(finished)) {
-            serviceRes = response->responseHeader.serviceResult;
-            channelRes = sendResponse(server, session, channel,
-                                      requestId, response, responseType);
-        }
+        if(UA_LIKELY(finished))
+            goto send_response;
+        UA_UNLOCK(&server->serviceMutex);
         goto update_statistics;
     }
 #endif
 
     /* Execute the synchronous service call */
-    UA_LOCK(&server->serviceMutex);
     service(server, session, request, response);
-    UA_UNLOCK(&server->serviceMutex);
 
-    /* Send the response */
-    serviceRes = response->responseHeader.serviceResult;
-    channelRes = sendResponse(server, session, channel, requestId, response, responseType);
+    /* Upon success, send the response. Otherwise a ServiceFault. */
+ send_response:
+    UA_UNLOCK(&server->serviceMutex);
+    channelRes = sendResponse(server, session, channel,
+                              requestId, response, responseType);
 
     /* Update the diagnostics statistics */
  update_statistics:
 #ifdef UA_ENABLE_DIAGNOSTICS
     if(session && session != &server->adminSession) {
         session->diagnostics.totalRequestCount.totalCount++;
-        if(serviceRes != UA_STATUSCODE_GOOD)
+        if(rh->serviceResult != UA_STATUSCODE_GOOD)
             session->diagnostics.totalRequestCount.errorCount++;
         if(counterOffset != 0) {
             UA_ServiceCounterDataType *serviceCounter = (UA_ServiceCounterDataType*)
                 (((uintptr_t)&session->diagnostics) + counterOffset);
             serviceCounter->totalCount++;
-            if(serviceRes != UA_STATUSCODE_GOOD)
+            if(rh->serviceResult != UA_STATUSCODE_GOOD)
                 serviceCounter->errorCount++;
         }
     }
-#else
-    (void)serviceRes; /* Pacify compiler warnings */
 #endif
 
     return channelRes;

From 3c1d2f8977e412c7d9f6f2aa8a53eae3153eb6a5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 1 Nov 2023 23:29:52 +0100
Subject: [PATCH 1274/1963] refactor(examples): Increase the max subscriptions
 settings for server_ctt

---
 examples/server_ctt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 68058a27741..a5a4d70040c 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -1445,7 +1445,7 @@ int main(int argc, char **argv) {
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     /* Set Subscription limits */
-    config->maxSubscriptions = 100;
+    config->maxSubscriptions = 200;
 
     /* Make the minimum lifetimecount larger.
      * Otherwise we get unwanted timing effects in the CTT. */

From d9f8579825363df410f63aa3270ecbccf036812a Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Thu, 2 Nov 2023 13:36:09 +0100
Subject: [PATCH 1275/1963] Fix includes in the nodeset compiler

If UA_ENABLE_AMALGAMATION is defined, open62541.h
must be included instead of open62541/types.h
---
 .../nodeset_compiler/backend_open62541_typedefinitions.py  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/nodeset_compiler/backend_open62541_typedefinitions.py b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
index fe6d92ea773..5e81b875557 100644
--- a/tools/nodeset_compiler/backend_open62541_typedefinitions.py
+++ b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
@@ -404,7 +404,12 @@ def print_header(self):
  * Autogenerated -- do not modify *
  **********************************/
 
-#include <open62541/types.h> /* Must be before the include guards */
+/* Must be before the include guards */
+#ifdef UA_ENABLE_AMALGAMATION
+# include "open62541.h"
+#else
+# include <open62541/types.h>
+#endif
 
 #ifndef ''' + self.parser.outname.upper() + '''_GENERATED_H_
 #define ''' + self.parser.outname.upper() + '''_GENERATED_H_

From 572d75b9cda834eb452e67e7944f1850cb7dd4ed Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Wed, 1 Nov 2023 23:45:24 +0100
Subject: [PATCH 1276/1963] docs(plugins): build docs without obsolete headers

The header include files plugin/network.h and plugin/pubsub.h have
been deleted.  They must also be removed from the dependencies of
the documentation build.
---
 doc/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a5c2a4cc9dd..373010e624f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -44,10 +44,8 @@ generate_rst(${PROJECT_SOURCE_DIR}/src/server/ua_services.h ${DOC_SRC_DIR}/servi
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/server_pubsub.h ${DOC_SRC_DIR}/pubsub.rst)
 
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/accesscontrol.h ${DOC_SRC_DIR}/plugin_accesscontrol.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/network.h ${DOC_SRC_DIR}/plugin_network.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/log.h ${DOC_SRC_DIR}/plugin_log.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/nodestore.h ${DOC_SRC_DIR}/plugin_nodestore.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/pubsub.h ${DOC_SRC_DIR}/plugin_pubsub.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/eventloop.h ${DOC_SRC_DIR}/plugin_eventloop.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/pki.h ${DOC_SRC_DIR}/plugin_pki.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/securitypolicy.h ${DOC_SRC_DIR}/plugin_securitypolicy.rst)

From 5b22388d2159f465e7750efb20f29302e31bd820 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Wed, 1 Nov 2023 23:15:32 +0100
Subject: [PATCH 1277/1963] fix(tools): ua2json initialize options struct

The initializer for UA_DecodeJsonOptions does not contain all fields
and emits warning: missing field 'namespacesSize' initializer
[-Wmissing-field-initializers].  As variable opt is constant, it
can also be declared static.  Then it is allocated in BSS and zero
initialized if there is no initializer.
---
 tools/ua2json/ua2json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ua2json/ua2json.c b/tools/ua2json/ua2json.c
index 09da345ff2e..50ca2dd5747 100644
--- a/tools/ua2json/ua2json.c
+++ b/tools/ua2json/ua2json.c
@@ -44,7 +44,7 @@ decode(const UA_ByteString *buf, UA_ByteString *out, const UA_DataType *type) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     /* Decode JSON */
-    const UA_DecodeJsonOptions opt = {NULL};
+    static const UA_DecodeJsonOptions opt;
     UA_StatusCode retval = UA_decodeJson(buf, data, type, &opt);
     if(retval != UA_STATUSCODE_GOOD) {
         free(data);

From ef5ea2073b2b837fdb788932b211dab1fc140c5a Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 9 Oct 2023 15:06:58 +0200
Subject: [PATCH 1278/1963] feat(nodesetinjector): Added more Companion
 Specifications supported by the autoload feature and adaptation of the
 documentation.

---
 doc/nodeset_compiler.rst              | 19 ++++++++++--
 tools/nodeset_injector/CMakeLists.txt | 43 ++++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
index 595530d99f4..79599a56eaf 100644
--- a/doc/nodeset_compiler.rst
+++ b/doc/nodeset_compiler.rst
@@ -477,6 +477,22 @@ Finally you need to include all these files in your build process and call the c
 
     retval = UA_Server_run(server, &running);
 
+Outstanding Companion Spec Issues
+................................
+
+There are some Companion Specifications that currently cannot be compiled with the Nodeset compiler.
+Which Companion Specifications are affected and what causes this is described below.
+
+* Safety, Glass
+Do not specify a BSD file or BSD blob in the XML file. The BSD file is considered deprecated. However, it is currently still required by the Nodeser compiler.
+
+* I4AAS, RSL, CNC, FDI
+Attempting to load will result in a runtime error ("Type-checking failed with error code BadTypeMismatch" or "Parent node not found").
+
+* BACnet
+Defines data types whose fields have the names signed or unsigned. This leads to errors when creating C structures, because signed and unsigned are keywords in C.
+
+
 
 Automatic Nodesetinjection
 ................................
@@ -500,5 +516,4 @@ A CMake call could look like this.
 The order of nodesets is important! Nodesets that build on other nodesets must be placed after them in the list.
 The following nodesets are currently supported.
 
-* DI, ISA95-JOBCONTROL, OpenSCS, DEXPI, AMB, AutoID, POWERLINK, IA, Machinery, PackML, PNEM, PLCopen, MachineTool, PROFINET, MachineVision, FDT, CommercialKitchenEquipment,
-PNRIO, Scales, Weihenstephan, Pumps, CAS, TMC, IJT
+* DI, ISA95-JOBCONTROL, OpenSCS, DEXPI, AMB, AutoID, POWERLINK, IA, Machinery, PackML, PNEM, PLCopen, MachineTool, PROFINET, MachineVision, FDT, CommercialKitchenEquipment, PNRIO, Scales, Weihenstephan, Pumps, CAS, TMC, IJT
diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
index 67567944c76..d40767c17fe 100644
--- a/tools/nodeset_injector/CMakeLists.txt
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -5,11 +5,11 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
     # no dependency
     if(MODEL STREQUAL "DEXPI" OR MODEL STREQUAL "Safety" OR MODEL STREQUAL "CNC" OR MODEL STREQUAL "BACnet"
        OR MODEL STREQUAL "AMB" OR MODEL STREQUAL "MachineVision" OR MODEL STREQUAL "RSL" OR MODEL STREQUAL "I4AAS"
-       OR MODEL STREQUAL "PackML")
+       OR MODEL STREQUAL "PackML" OR MODEL STREQUAL "MTConnect")
         # get csv file
         file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.csv")
         foreach(file ${files})
-            string(REGEX MATCH "(.*NodeIds.csv)|(Opc.Ua.${MODEL}.NodeSet[2]?.csv)" csv_file_match ${file})
+            string(REGEX MATCH "(.*nodeids.csv)|(.*NodeIds.csv)|(Opc.Ua.${MODEL}.NodeSet[2]?.csv)" csv_file_match ${file})
             if(csv_file_match)
                 set(csv_file ${file})
             endif()
@@ -35,12 +35,12 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
     # only one xml file
     # di as dependency
     elseif(MODEL STREQUAL "AutoID" OR MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK"
-       OR MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT"
+       OR MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT" OR MODEL STREQUAL "Robotics"
        OR MODEL STREQUAL "CommercialKitchenEquipment" OR MODEL STREQUAL "Machinery")
         # get csv file
         file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.csv")
         foreach(file ${files})
-            string(REGEX MATCH "(.*NodeIds.csv)|(Opc.Ua.${MODEL}.NodeSet[2]?.csv)" csv_file_match ${file})
+            string(REGEX MATCH "(.*nodeids.csv)|(.*NodeIds.csv)|(Opc.Ua.${MODEL}.NodeSet[2]?.csv)" csv_file_match ${file})
             if(csv_file_match)
                 set(csv_file ${file})
             endif()
@@ -212,6 +212,41 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 AUTOLOAD
                 DEPENDS "di"
         )
+    elseif(MODEL STREQUAL "ADI")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/OpcUaAdiModel.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.Adi.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+        )
+    elseif(MODEL STREQUAL "MDIS")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/MDIS.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.MDIS.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+        )
+    elseif(MODEL STREQUAL "Sercos")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/SercosModel.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Sercos.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+        )
+    elseif(MODEL STREQUAL "GDS")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
+                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/OpcUaGdsModel.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.Gds.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+        )
     elseif(MODEL STREQUAL "PADIM")
         ua_generate_nodeset_and_datatypes(
                 NAME "irdi"

From c7ef9c012b5ac59c4ee973bfa0b23196374a87e2 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Thu, 2 Nov 2023 01:43:19 +0100
Subject: [PATCH 1279/1963] feat(client): add
 UA_Client_sendAsyncBrowseNextRequest

The function UA_Client_sendAsyncBrowseNextRequest() was missing in
the API.  In older open62541 versions the user of the library could
implement it using UA_Client_sendAsyncRequest().  But as this
function is gone in version 1.4 the client highlevel async API
should be complete.
---
 include/open62541/client_highlevel_async.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/open62541/client_highlevel_async.h b/include/open62541/client_highlevel_async.h
index 710fb575572..9bb90464011 100644
--- a/include/open62541/client_highlevel_async.h
+++ b/include/open62541/client_highlevel_async.h
@@ -56,6 +56,18 @@ UA_Client_sendAsyncBrowseRequest(UA_Client *client, UA_BrowseRequest *request,
                                       reqId);
 }
 
+typedef void (*UA_ClientAsyncBrowseNextCallback)(UA_Client *client, void *userdata,
+                                                 UA_UInt32 requestId, UA_BrowseNextResponse *wr);
+static UA_INLINE UA_THREADSAFE UA_StatusCode
+UA_Client_sendAsyncBrowseNextRequest(UA_Client *client, UA_BrowseNextRequest *request,
+                                     UA_ClientAsyncBrowseNextCallback browseNextCallback,
+                                     void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_AsyncService(client, request, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST],
+                                      (UA_ClientAsyncServiceCallback)browseNextCallback,
+                                      &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE], userdata,
+                                      reqId);
+}
+
 /**
  * Asynchronous Operations
  * ^^^^^^^^^^^^^^^^^^^^^^^

From 4e60d79743a92dd54406d87c8c6be279cd4dbf1a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 2 Nov 2023 00:37:04 +0100
Subject: [PATCH 1280/1963] refactor(server): Simplify cleaning up the
 subscription diagnostics object

---
 src/server/ua_server_ns0_diagnostics.c | 11 ++++++-----
 src/server/ua_subscription.c           | 26 +++-----------------------
 src/server/ua_subscription.h           |  2 ++
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 34122078695..64817c9f34b 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -211,24 +211,25 @@ createSubscriptionObject(UA_Server *server, UA_Session *session,
     UA_NodeId refId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT);
     UA_QualifiedName browseName = UA_QUALIFIEDNAME(0, subIdStr);
     UA_NodeId typeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SUBSCRIPTIONDIAGNOSTICSTYPE);
-    UA_NodeId objId = UA_NODEID_NUMERIC(1, 0); /* 0 => assign a random free id */
-    UA_StatusCode res = addNode(server, UA_NODECLASS_VARIABLE, objId,
+    /* Assign a random free NodeId */
+    UA_StatusCode res = addNode(server, UA_NODECLASS_VARIABLE, UA_NODEID_NUMERIC(1, 0),
                                 bpr.targets[0].targetId.nodeId,
                                 refId, browseName, typeId, &var_attr,
-                                &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], NULL, &objId);
+                                &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], NULL,
+                                &sub->ns0Id);
     UA_CHECK_STATUS(res, goto cleanup);
 
     /* Add a second reference from the overall SubscriptionDiagnosticsArray variable */
     const UA_NodeId subDiagArray =
         UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SUBSCRIPTIONDIAGNOSTICSARRAY);
-    res = addRefWithSession(server, session,  &subDiagArray, &refId, &objId, true);
+    res = addRefWithSession(server, session,  &subDiagArray, &refId, &sub->ns0Id, true);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
 
     /* Get all children (including the variable itself) and set the contenxt + callback */
     res = referenceTypeIndices(server, &hasComponent, &refTypes, false);
     if(UA_LIKELY(res == UA_STATUSCODE_GOOD)) {
-        res = browseRecursive(server, 1, &objId,
+        res = browseRecursive(server, 1, &sub->ns0Id,
                               UA_BROWSEDIRECTION_FORWARD, &refTypes,
                               UA_NODECLASS_VARIABLE, true, &childrenSize, &children);
     }
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index c67c88a321e..10a88951d22 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -66,29 +66,9 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
 
     /* Remove the diagnostics object for the subscription */
 #ifdef UA_ENABLE_DIAGNOSTICS
-    if(sub->session) {
-        /* Use a browse path to find the node */
-        char subIdStr[32];
-        itoaUnsigned(sub->subscriptionId, subIdStr, 10);
-        UA_BrowsePath bp;
-        UA_BrowsePath_init(&bp);
-        bp.startingNode = sub->session->sessionId;
-        UA_RelativePathElement rpe[2];
-        memset(rpe, 0, sizeof(UA_RelativePathElement) * 2);
-        rpe[0].targetName = UA_QUALIFIEDNAME(0, "SubscriptionDiagnosticsArray");
-        rpe[1].targetName = UA_QUALIFIEDNAME(0, subIdStr);
-        bp.relativePath.elements = rpe;
-        bp.relativePath.elementsSize = 2;
-        UA_BrowsePathResult bpr = translateBrowsePathToNodeIds(server, &bp);
-
-        /* Delete all nodes matching the browse path */
-        for(size_t i = 0; i < bpr.targetsSize; i++) {
-            if(bpr.targets[i].remainingPathIndex < UA_UINT32_MAX)
-                continue;
-            deleteNode(server, bpr.targets[i].targetId.nodeId, true);
-        }
-        UA_BrowsePathResult_clear(&bpr);
-    }
+    if(!UA_NodeId_isNull(&sub->ns0Id))
+        deleteNode(server, sub->ns0Id, true);
+    UA_NodeId_clear(&sub->ns0Id);
 #endif
 
     UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, sub, "Subscription deleted");
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 20ad036c7ba..c333b6a5b56 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -292,6 +292,8 @@ struct UA_Subscription {
     /* Statistics for the server diagnostics. The fields are defined according
      * to the SubscriptionDiagnosticsDataType (Part 5, §12.15). */
 #ifdef UA_ENABLE_DIAGNOSTICS
+    UA_NodeId ns0Id; /* Representation in the Session object */
+
     UA_UInt32 modifyCount;
     UA_UInt32 enableCount;
     UA_UInt32 disableCount;

From 0f7208763e79bd50d854db1f1bface046381f035 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 14:40:10 +0100
Subject: [PATCH 1281/1963] fix(server): Set the sampling interval ==
 publishing interval if a negative value is requested

---
 src/server/ua_services_monitoreditem.c | 32 ++++++++------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 37b5dfd7a45..03f9c3d91bf 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -228,29 +228,15 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
     }
         
 
-    /* Adjust sampling interval */
-    if(params->samplingInterval < 0.0) {
-        /* A negative number indicates that the sampling interval is the publishing
-         * interval of the Subscription. */
-        if(!mon->subscription) {
-            /* Not possible for local MonitoredItems */
-            params->samplingInterval = server->config.samplingIntervalLimits.min;
-        } else {
-            /* Test if the publishing interval is a valid sampling interval. If
-             * not, adjust to lie within the limits. */
-            UA_BOUNDEDVALUE_SETWBOUNDS(server->config.samplingIntervalLimits,
-                                       mon->subscription->publishingInterval,
-                                       params->samplingInterval);
-            if(params->samplingInterval == mon->subscription->publishingInterval) {
-               /* The publishing interval is valid also for sampling. Set sampling
-                * interval to -1 to sample the monitored item in the publish
-                * callback. The revised sampling interval of the response will be
-                * set to the publishing interval.*/
-                params->samplingInterval = -1.0;
-            }
-        }
-    } else if(params->samplingInterval > 0.0) {
-        /* Adjust positive sampling interval to lie within the limits */
+    /* A negative number indicates that the sampling interval is the publishing
+     * interval of the Subscription. Note that the sampling interval selected
+     * here remains also when the Subscription's publish interval is adjusted
+     * afterwards. */
+    if(mon->subscription && params->samplingInterval < 0.0)
+        params->samplingInterval = mon->subscription->publishingInterval;
+
+    /* Adjust non-null sampling interval to lie within the configured limits */
+    if(params->samplingInterval != 0.0) {
         UA_BOUNDEDVALUE_SETWBOUNDS(server->config.samplingIntervalLimits,
                                    params->samplingInterval, params->samplingInterval);
         /* Check for NaN */

From 7adac2e5f29e8b1672a0c30512703b19daa0a3b7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 15:01:09 +0100
Subject: [PATCH 1282/1963] refactor(server): Correct linking of MonitoredItem
 sampling with Subscription publishing after a ModifySubscription

---
 src/server/ua_services_subscription.c      | 25 ++++++++++++++++------
 src/server/ua_subscription.c               |  2 +-
 src/server/ua_subscription.h               |  4 ++--
 src/server/ua_subscription_monitoreditem.c |  9 ++++----
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 2bc211780f8..d26eb521565 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -153,12 +153,25 @@ Service_ModifySubscription(UA_Server *server, UA_Session *session,
     /* Reset the subscription lifetime */
     Subscription_resetLifetime(sub);
 
-    /* Change the repeated callback to the new interval. This cannot fail as the
-     * CallbackId must exist. */
-    if(sub->publishCallbackId > 0 &&
-       sub->publishingInterval != oldPublishingInterval) {
-        changeRepeatedCallbackInterval(server, sub->publishCallbackId,
-                                       sub->publishingInterval);
+    /* The publish interval has changed */
+    if(sub->publishingInterval != oldPublishingInterval) {
+        /* Change the repeated callback to the new interval. This cannot fail as
+         * memory is reused. */
+        if(sub->publishCallbackId > 0)
+            changeRepeatedCallbackInterval(server, sub->publishCallbackId,
+                                           sub->publishingInterval);
+
+        /* For each MonitoredItem check if it was/shall be attached to the
+         * publish interval. This ensures that we have less cyclic callbacks
+         * registered and that the notifications are fresh. */
+        UA_MonitoredItem *mon;
+        LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
+            if(mon->parameters.samplingInterval == sub->publishingInterval ||
+               mon->parameters.samplingInterval == oldPublishingInterval) {
+                UA_MonitoredItem_unregisterSampling(server, mon);
+                UA_MonitoredItem_registerSampling(server, mon);
+            }
+        }
     }
 
     /* If the priority has changed, re-enter the subscription to the
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 10a88951d22..515827678d7 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -657,7 +657,7 @@ UA_Subscription_sampleAndPublish(UA_Server *server, UA_Subscription *sub) {
     /* Sample the MonitoredItems with sampling interval <0 (which implies
      * sampling in the same interval as the subscription) */
     UA_MonitoredItem *mon;
-    LIST_FOREACH(mon, &sub->samplingMonitoredItems, sampling.samplingListEntry) {
+    LIST_FOREACH(mon, &sub->samplingMonitoredItems, sampling.subscriptionSampling) {
         monitoredItem_sampleCallback(server, mon);
     }
 
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index c333b6a5b56..eb756045fa7 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -152,8 +152,8 @@ struct UA_MonitoredItem {
     union {
         UA_UInt64 callbackId;
         UA_MonitoredItem *nodeListNext; /* Event-Based: Attached to Node */
-        LIST_ENTRY(UA_MonitoredItem) samplingListEntry; /* Publish-interval: Linked in
-                                                         * Subscription */
+        LIST_ENTRY(UA_MonitoredItem) subscriptionSampling; /* Linked to publish
+                                                            * interval */
     } sampling;
     UA_DataValue lastValue;
 
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 425297fae52..a8b4d6d3334 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -727,11 +727,10 @@ UA_MonitoredItem_registerSampling(UA_Server *server, UA_MonitoredItem *mon) {
         if(res == UA_STATUSCODE_GOOD)
             mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_EVENT;
         return res;
-    } else if(mon->parameters.samplingInterval < 0.0) {
+    } else if(sub && mon->parameters.samplingInterval == sub->publishingInterval) {
         /* Add to the subscription for sampling before every publish */
-        if(!sub)
-            return UA_STATUSCODE_BADINTERNALERROR; /* Not possible for local MonitoredItems */
-        LIST_INSERT_HEAD(&sub->samplingMonitoredItems, mon, sampling.samplingListEntry);
+        LIST_INSERT_HEAD(&sub->samplingMonitoredItems, mon,
+                         sampling.subscriptionSampling);
         mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_PUBLISH;
     } else {
         /* DataChange MonitoredItems with a positive sampling interval have a
@@ -771,7 +770,7 @@ UA_MonitoredItem_unregisterSampling(UA_Server *server, UA_MonitoredItem *mon) {
 
     case UA_MONITOREDITEMSAMPLINGTYPE_PUBLISH:
         /* Added to the subscription */
-        LIST_REMOVE(mon, sampling.samplingListEntry);
+        LIST_REMOVE(mon, sampling.subscriptionSampling);
         break;
 
     case UA_MONITOREDITEMSAMPLINGTYPE_NONE:

From 9f3adac3d1ce37eb23a6f4d0352df27c67ad0f8d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 15:30:44 +0100
Subject: [PATCH 1283/1963] feat(test): Add test for MonitoredItem with
 negative sampling interval

---
 tests/client/check_client_subscriptions.c | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index b9cc8f153f1..31706f7de0d 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -7,6 +7,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
+#include "open62541/types_generated_handling.h"
 
 #include "client/ua_client_internal.h"
 #include "server/ua_server_internal.h"
@@ -445,6 +446,39 @@ START_TEST(Client_subscription_createDataChanges) {
 }
 END_TEST
 
+/* An interval of -1 links the subscription to the publishing interval of the
+ * server */
+START_TEST(Client_subscription_createDataChanges_negativeInterval) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_CreateSubscriptionRequest request = UA_CreateSubscriptionRequest_default();
+    UA_CreateSubscriptionResponse response = UA_Client_Subscriptions_create(client, request,
+                                                                            NULL, NULL, NULL);
+    ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    UA_UInt32 subId = response.subscriptionId;
+
+    /* monitor current time */
+    UA_MonitoredItemCreateRequest monRequest =
+        UA_MonitoredItemCreateRequest_default(UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME));
+    monRequest.requestedParameters.samplingInterval = -2.0;
+
+    UA_MonitoredItemCreateResult monResult =
+        UA_Client_MonitoredItems_createDataChange(client, subId, UA_TIMESTAMPSTORETURN_BOTH,
+                                                  monRequest, NULL, dataChangeHandler, NULL);
+
+    ck_assert_uint_eq(monResult.statusCode, UA_STATUSCODE_GOOD);
+    ck_assert(monResult.revisedSamplingInterval == response.revisedPublishingInterval);
+    UA_MonitoredItemCreateResult_clear(&monResult);
+    UA_CreateSubscriptionResponse_clear(&response);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
 /* An unchanged value shall not be published after a ModifyMonitoredItem */
 START_TEST(Client_subscription_modifyMonitoredItem) {
     UA_Client *client = UA_Client_new();
@@ -1656,6 +1690,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_client, Client_subscription_detach);
     tcase_add_test(tc_client, Client_subscription_connectionClose);
     tcase_add_test(tc_client, Client_subscription_createDataChanges);
+    tcase_add_test(tc_client, Client_subscription_createDataChanges_negativeInterval);
     tcase_add_test(tc_client, Client_subscription_modifyMonitoredItem);
     tcase_add_test(tc_client, Client_subscription_createDataChanges_async);
     tcase_add_test(tc_client, Client_subscription_keepAlive);

From 4d222b3c900112e17fe79ad0641e0d849d8afa1e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 15:31:19 +0100
Subject: [PATCH 1284/1963] fix(server): Fix a lock issue in the subscription
 diagnostics

---
 src/server/ua_server_ns0_diagnostics.c | 113 +++++++++++++------------
 1 file changed, 60 insertions(+), 53 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 64817c9f34b..8b1ce425a6b 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -118,8 +118,7 @@ readSubscriptionDiagnostics(UA_Server *server,
     return res;
 }
 
-/* If the nodeContext == NULL, return all subscriptions in the server.
- * Otherwise only for the current session. */
+/* Return all subscriptions in the server. */
 UA_StatusCode
 readSubscriptionDiagnosticsArray(UA_Server *server,
                                  const UA_NodeId *sessionId, void *sessionContext,
@@ -130,19 +129,9 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
 
     /* Get the current session */
     size_t sdSize = 0;
-    UA_Session *session = NULL;
     session_list_entry *sentry;
-    if(nodeContext) {
-        session = getSessionById(server, sessionId);
-        if(!session) {
-            UA_UNLOCK(&server->serviceMutex);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        sdSize = session->subscriptionsSize;
-    } else {
-        LIST_FOREACH(sentry, &server->sessions, pointers) {
-            sdSize += sentry->session.subscriptionsSize;
-        }
+    LIST_FOREACH(sentry, &server->sessions, pointers) {
+        sdSize += sentry->session.subscriptionsSize;
     }
 
     /* Allocate the output array */
@@ -156,18 +145,11 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
     /* Collect the statistics */
     size_t i = 0;
     UA_Subscription *sub;
-    if(session) {
-        TAILQ_FOREACH(sub, &session->subscriptions, sessionListEntry) {
+    LIST_FOREACH(sentry, &server->sessions, pointers) {
+        TAILQ_FOREACH(sub, &sentry->session.subscriptions, sessionListEntry) {
             fillSubscriptionDiagnostics(sub, &sd[i]);
             i++;
         }
-    } else {
-        LIST_FOREACH(sentry, &server->sessions, pointers) {
-            TAILQ_FOREACH(sub, &sentry->session.subscriptions, sessionListEntry) {
-                fillSubscriptionDiagnostics(sub, &sd[i]);
-                i++;
-            }
-        }
     }
 
     /* Set the output */
@@ -254,12 +236,43 @@ createSubscriptionObject(UA_Server *server, UA_Session *session,
     }
 }
 
-#endif /* UA_ENABLE_SUBSCRIPTIONS */
-
 /***********************/
 /* Session Diagnostics */
 /***********************/
 
+static UA_StatusCode
+setSessionSubscriptionDiagnostics(UA_Server *server, UA_Session *session,
+                                  UA_DataValue *value) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    /* Get the current session */
+    size_t sdSize = session->subscriptionsSize;
+
+    /* Allocate the output array */
+    UA_SubscriptionDiagnosticsDataType *sd = (UA_SubscriptionDiagnosticsDataType*)
+        UA_Array_new(sdSize, &UA_TYPES[UA_TYPES_SUBSCRIPTIONDIAGNOSTICSDATATYPE]);
+    if(!sd) {
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    /* Collect the statistics */
+    size_t i = 0;
+    UA_Subscription *sub;
+    TAILQ_FOREACH(sub, &session->subscriptions, sessionListEntry) {
+        fillSubscriptionDiagnostics(sub, &sd[i]);
+        i++;
+    }
+
+    /* Set the output */
+    value->hasValue = true;
+    UA_Variant_setArray(&value->value, sd, sdSize,
+                        &UA_TYPES[UA_TYPES_SUBSCRIPTIONDIAGNOSTICSDATATYPE]);
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif /* UA_ENABLE_SUBSCRIPTIONS */
+
 static void
 setSessionDiagnostics(UA_Session *session, UA_SessionDiagnosticsDataType *sd) {
     UA_SessionDiagnosticsDataType_copy(&session->diagnostics, sd);
@@ -379,50 +392,44 @@ readSessionDiagnostics(UA_Server *server,
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     if(equalBrowseName(&bn.name, "SubscriptionDiagnosticsArray")) {
-        /* Reuse the datasource callback. Forward a non-null nodeContext to
-         * indicate that we want to see only the subscriptions for the current
-         * session. */
-        res = readSubscriptionDiagnosticsArray(server, sessionId, sessionContext,
-                                               nodeId, (void*)0x01,
-                                               sourceTimestamp, range, value);
+        res = setSessionSubscriptionDiagnostics(server, session, value);
         goto cleanup;
-    } else
+    }
 #endif
+
     if(equalBrowseName(&bn.name, "SessionDiagnostics")) {
         setSessionDiagnostics(session, &data.sddt);
         content = &data.sddt;
         type = &UA_TYPES[UA_TYPES_SESSIONDIAGNOSTICSDATATYPE];
-        goto set_value;
     } else if(equalBrowseName(&bn.name, "SessionSecurityDiagnostics")) {
         setSessionSecurityDiagnostics(session, &data.ssddt);
         securityDiagnostics = true;
         content = &data.ssddt;
         type = &UA_TYPES[UA_TYPES_SESSIONSECURITYDIAGNOSTICSDATATYPE];
-        goto set_value;
-    }
-
-    /* Try to find the member in SessionDiagnosticsDataType and
-     * SessionSecurityDiagnosticsDataType */
-    memcpy(memberName, bn.name.data, bn.name.length);
-    memberName[bn.name.length] = 0;
-    found = UA_DataType_getStructMember(&UA_TYPES[UA_TYPES_SESSIONDIAGNOSTICSDATATYPE],
-                                        memberName, &memberOffset, &type, &isArray);
-    if(found) {
-        setSessionDiagnostics(session, &data.sddt);
-        content = (void*)(((uintptr_t)&data.sddt) + memberOffset);
     } else {
-        found = UA_DataType_getStructMember(&UA_TYPES[UA_TYPES_SESSIONSECURITYDIAGNOSTICSDATATYPE],
+        /* Try to find the member in SessionDiagnosticsDataType and
+         * SessionSecurityDiagnosticsDataType */
+        memcpy(memberName, bn.name.data, bn.name.length);
+        memberName[bn.name.length] = 0;
+        found = UA_DataType_getStructMember(&UA_TYPES[UA_TYPES_SESSIONDIAGNOSTICSDATATYPE],
                                             memberName, &memberOffset, &type, &isArray);
-        if(!found) {
-            res = UA_STATUSCODE_BADNOTIMPLEMENTED;
-            goto cleanup;
+        if(found) {
+            setSessionDiagnostics(session, &data.sddt);
+            content = (void*)(((uintptr_t)&data.sddt) + memberOffset);
+        } else {
+            const UA_DataType *dt = &UA_TYPES[UA_TYPES_SESSIONSECURITYDIAGNOSTICSDATATYPE];
+            found = UA_DataType_getStructMember(dt, memberName, &memberOffset,
+                                                &type, &isArray);
+            if(!found) {
+                res = UA_STATUSCODE_BADNOTIMPLEMENTED;
+                goto cleanup;
+            }
+            setSessionSecurityDiagnostics(session, &data.ssddt);
+            securityDiagnostics = true;
+            content = (void*)(((uintptr_t)&data.ssddt) + memberOffset);
         }
-        setSessionSecurityDiagnostics(session, &data.ssddt);
-        securityDiagnostics = true;
-        content = (void*)(((uintptr_t)&data.ssddt) + memberOffset);
     }
 
- set_value:
     if(!isArray) {
         res = UA_Variant_setScalarCopy(&value->value, content, type);
     } else {

From c7536e348292e5fb0ec21755b87ffb2699951fbe Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 16:22:30 +0100
Subject: [PATCH 1285/1963] fix(test): Replace outdated certificates in
 /tests/client/certificates.h

Use a 10 year lifetime so we don't have to do this often.
---
 tests/client/certificates.h | 1008 ++++++++++++++++++++---------------
 1 file changed, 576 insertions(+), 432 deletions(-)

diff --git a/tests/client/certificates.h b/tests/client/certificates.h
index 8e52a00995f..435bb9a9461 100644
--- a/tests/client/certificates.h
+++ b/tests/client/certificates.h
@@ -5,448 +5,592 @@
 
 _UA_BEGIN_DECLS
 
-#define CLIENT_CERT_DER_LENGTH 1040
-UA_Byte CLIENT_CERT_DER_DATA[1040] = {
-    0x30, 0x82, 0x04, 0x0c, 0x30, 0x82, 0x02, 0xf4, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x17,
-    0x4f, 0x72, 0x6b, 0xde, 0x8d, 0xb7, 0xd9, 0x72, 0x80, 0x35, 0xff, 0x3d, 0xe2, 0x3f, 0x7c, 0xb8,
-    0xe8, 0x77, 0xbd, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
-    0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
-    0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65,
-    0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
-    0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f,
-    0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c,
-    0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x31, 0x31,
-    0x31, 0x34, 0x31, 0x36, 0x31, 0x38, 0x31, 0x34, 0x5a, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31, 0x31,
-    0x34, 0x31, 0x36, 0x31, 0x38, 0x31, 0x34, 0x5a, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03,
-    0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
-    0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
-    0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03,
-    0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
-    0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82,
-    0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
-    0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0x98,
-    0xc6, 0x5d, 0xad, 0xf6, 0xf3, 0x3f, 0x7b, 0x73, 0x55, 0x10, 0xc1, 0xd7, 0x0c, 0xa4, 0x78, 0xc0,
-    0x76, 0xb1, 0x41, 0xa2, 0x00, 0xd1, 0xc9, 0xb0, 0x34, 0xe1, 0x9c, 0x36, 0xb8, 0x63, 0xa8, 0xa8,
-    0xad, 0xd5, 0xfc, 0x17, 0xae, 0xdd, 0xbe, 0xfb, 0x23, 0x10, 0x4e, 0x10, 0xc4, 0x13, 0xe3, 0x78,
-    0x49, 0xe1, 0xd4, 0x72, 0x2a, 0xf9, 0x6f, 0xfa, 0x7c, 0xbd, 0x3d, 0xce, 0xc0, 0x0e, 0xcb, 0x63,
-    0x13, 0xda, 0x46, 0xa2, 0xd4, 0x16, 0xef, 0xe8, 0xd8, 0x81, 0x20, 0x1d, 0x50, 0xbe, 0x9e, 0x1d,
-    0xd1, 0xb7, 0xc3, 0x13, 0x6f, 0xfa, 0x54, 0xfe, 0x3b, 0x3a, 0x88, 0xfe, 0xc0, 0xcc, 0x17, 0x4b,
-    0xb8, 0x22, 0xa1, 0x05, 0x47, 0xc0, 0xeb, 0xa3, 0x5a, 0x43, 0x4f, 0xe7, 0x7f, 0x9b, 0xf3, 0x8e,
-    0xbf, 0x4e, 0xf6, 0x40, 0x6b, 0xcd, 0x9a, 0xba, 0xa7, 0x0d, 0xef, 0xe0, 0x17, 0x97, 0x23, 0x91,
-    0x65, 0x29, 0x66, 0x12, 0xad, 0x13, 0xdf, 0x22, 0x4f, 0xd4, 0x52, 0x2f, 0xc0, 0x22, 0xea, 0x6a,
-    0x57, 0x72, 0x65, 0x37, 0xf5, 0x9c, 0x91, 0x5d, 0x3a, 0xb6, 0x34, 0x55, 0x1f, 0xe2, 0xc8, 0x86,
-    0xd2, 0xf0, 0x04, 0x27, 0x93, 0x82, 0x81, 0x83, 0xfa, 0x89, 0x78, 0xdd, 0x16, 0x96, 0x7d, 0x96,
-    0xc8, 0x75, 0xae, 0x60, 0x68, 0xcc, 0xb3, 0xb1, 0xbc, 0x06, 0x4b, 0xb1, 0xe7, 0x5a, 0xa1, 0xa2,
-    0x67, 0xac, 0x9a, 0x7a, 0x8f, 0x7f, 0x40, 0x01, 0x75, 0x66, 0x68, 0x2d, 0x7a, 0x3e, 0x74, 0x5e,
-    0xb9, 0x14, 0xf6, 0x2f, 0x1f, 0x96, 0x33, 0xa7, 0x34, 0x39, 0xfd, 0xd8, 0xf9, 0x77, 0x0a, 0x16,
-    0xc2, 0x09, 0xd6, 0x51, 0xa9, 0xdf, 0x67, 0x8d, 0xf4, 0x3d, 0xf9, 0xf3, 0xff, 0x3b, 0x1b, 0xd8,
-    0x6a, 0x1d, 0x1e, 0x90, 0x09, 0x24, 0xc3, 0x48, 0x1b, 0x78, 0x05, 0xff, 0xb7, 0xfe, 0x95, 0x02,
-    0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xd5, 0x30, 0x81, 0xd2, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
-    0x0e, 0x04, 0x16, 0x04, 0x14, 0x11, 0x42, 0x36, 0x14, 0x77, 0x99, 0xe8, 0x08, 0xaf, 0xe2, 0xea,
-    0xd2, 0xb1, 0xd7, 0x0d, 0x0b, 0xe3, 0xf1, 0x89, 0x5b, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23,
-    0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x11, 0x42, 0x36, 0x14, 0x77, 0x99, 0xe8, 0x08, 0xaf, 0xe2,
-    0xea, 0xd2, 0xb1, 0xd7, 0x0d, 0x0b, 0xe3, 0xf1, 0x89, 0x5b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
-    0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02,
-    0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b,
-    0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
-    0x02, 0x30, 0x59, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x52, 0x30, 0x50, 0x82, 0x0f, 0x44, 0x45,
-    0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x82, 0x0f, 0x44,
-    0x45, 0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x87, 0x04,
-    0xac, 0x17, 0xd1, 0xe9, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a,
-    0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
-    0x2e, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09,
-    0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,
-    0x4f, 0x05, 0x26, 0x68, 0x3d, 0x60, 0x9f, 0x14, 0xa5, 0x7f, 0x55, 0x0e, 0x69, 0xc2, 0xef, 0x8d,
-    0x62, 0xdd, 0x74, 0x7d, 0x98, 0x9b, 0x6f, 0x58, 0xc9, 0x58, 0x6e, 0x21, 0xf3, 0x2b, 0xbe, 0x8b,
-    0xf1, 0x26, 0x9c, 0x22, 0x01, 0xcf, 0xea, 0x8d, 0xad, 0x06, 0x05, 0x23, 0xa4, 0x2c, 0xc8, 0x05,
-    0x36, 0xc8, 0x49, 0x4c, 0x48, 0x15, 0x8b, 0xd8, 0x24, 0x30, 0x7c, 0x5a, 0x78, 0x45, 0x40, 0x21,
-    0x55, 0x71, 0x28, 0x3a, 0xea, 0xb1, 0xa1, 0x80, 0xa4, 0xa6, 0xeb, 0xf6, 0x47, 0x13, 0x92, 0xa1,
-    0xad, 0xe4, 0xb4, 0x87, 0xdf, 0xd0, 0xc5, 0x33, 0x88, 0x0f, 0x5e, 0x7e, 0x62, 0xd6, 0x03, 0xaa,
-    0xb9, 0x08, 0xab, 0x1b, 0x09, 0x49, 0x8b, 0x68, 0xe7, 0x42, 0x74, 0x0c, 0x94, 0xf6, 0x2d, 0xaa,
-    0x07, 0x12, 0x68, 0xb0, 0x7e, 0x4e, 0x84, 0xed, 0x80, 0xba, 0xf3, 0xb4, 0x16, 0xe9, 0xcd, 0xc4,
-    0xd2, 0xec, 0x3c, 0xa9, 0xa0, 0x63, 0xdd, 0x86, 0x9d, 0x6a, 0xd6, 0x80, 0xfa, 0x3b, 0x62, 0xdf,
-    0x91, 0x39, 0xea, 0x3c, 0x22, 0x28, 0x32, 0xaf, 0x22, 0x98, 0x40, 0x7f, 0x5c, 0x6f, 0x56, 0x04,
-    0xdb, 0xe9, 0xb9, 0xdd, 0xd1, 0xdb, 0x74, 0x98, 0x36, 0x94, 0x5a, 0x38, 0xa5, 0xa9, 0x42, 0x16,
-    0x6b, 0x3f, 0x27, 0xb9, 0xd7, 0x90, 0x26, 0x6a, 0x38, 0x32, 0x6e, 0x5d, 0xee, 0xff, 0xdf, 0xdf,
-    0x9b, 0xbe, 0x8b, 0xa5, 0x75, 0xe5, 0xdf, 0x98, 0xeb, 0x17, 0x95, 0x91, 0x62, 0x6d, 0xbf, 0x6e,
-    0x91, 0xf5, 0xed, 0x7e, 0x5a, 0xf7, 0x87, 0x70, 0x1f, 0x5d, 0x2f, 0x88, 0xb1, 0x14, 0xf0, 0xb7,
-    0x0f, 0xde, 0x91, 0xec, 0x1f, 0x25, 0xe6, 0x0c, 0xcc, 0x5d, 0x25, 0x62, 0x96, 0x80, 0x50, 0xfb,
-    0xd0, 0x33, 0xc6, 0x3c, 0x44, 0xb9, 0xe7, 0x0f, 0xee, 0x15, 0x4b, 0x81, 0x18, 0x52, 0x21, 0x83
+#define CLIENT_CERT_DER_LENGTH 1030
+UA_Byte CLIENT_CERT_DER_DATA[CLIENT_CERT_DER_LENGTH] = {
+  0x30, 0x82, 0x04, 0x02, 0x30, 0x82, 0x02, 0xea, 0xa0, 0x03, 0x02, 0x01,
+  0x02, 0x02, 0x14, 0x36, 0xbb, 0x70, 0x44, 0x14, 0xdf, 0x1f, 0xad, 0xe7,
+  0xe7, 0xc8, 0x69, 0x52, 0x60, 0x0e, 0xcb, 0x46, 0x73, 0xcb, 0x7a, 0x30,
+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
+  0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04,
+  0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55,
+  0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10,
+  0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
+  0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04,
+  0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31,
+  0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
+  0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31,
+  0x30, 0x38, 0x31, 0x35, 0x31, 0x33, 0x33, 0x32, 0x5a, 0x17, 0x0d, 0x33,
+  0x33, 0x31, 0x31, 0x30, 0x35, 0x31, 0x35, 0x31, 0x33, 0x33, 0x32, 0x5a,
+  0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+  0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
+  0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03,
+  0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35,
+  0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c,
+  0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
+  0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f,
+  0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+  0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01,
+  0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xcf,
+  0xe9, 0xd9, 0x66, 0x9a, 0x06, 0xa1, 0x6d, 0x87, 0x90, 0x44, 0xca, 0xdc,
+  0xff, 0x4a, 0xe4, 0x1c, 0x0a, 0x5e, 0xe9, 0x62, 0xe4, 0x08, 0x6b, 0x83,
+  0x23, 0xdc, 0x76, 0xe3, 0xe1, 0xbe, 0x73, 0x0a, 0xb6, 0x1a, 0x07, 0x8b,
+  0x80, 0x7f, 0xe2, 0x87, 0x6f, 0x8f, 0xf2, 0xe3, 0xf5, 0x64, 0x83, 0xe5,
+  0x6f, 0x83, 0x2b, 0xb4, 0x9d, 0xd6, 0xf2, 0x6f, 0xa2, 0x2a, 0x78, 0x6c,
+  0xcf, 0xba, 0x9d, 0xd1, 0xca, 0xad, 0xa2, 0xed, 0xd0, 0x52, 0x53, 0x6c,
+  0x09, 0x72, 0xe8, 0xcc, 0xb5, 0xb6, 0x99, 0xea, 0xf9, 0x04, 0x04, 0xee,
+  0x42, 0x12, 0x18, 0x8a, 0x20, 0xbb, 0x05, 0xce, 0xe1, 0x32, 0x54, 0x5a,
+  0x99, 0x9d, 0x27, 0xe6, 0xae, 0xd5, 0x4a, 0xa4, 0xf2, 0x6b, 0x96, 0xee,
+  0x5a, 0x27, 0x7e, 0xbf, 0x3d, 0x19, 0xd0, 0xcd, 0x2e, 0xa3, 0xc9, 0xe3,
+  0x64, 0x67, 0x23, 0x94, 0x07, 0xb7, 0x20, 0x22, 0x9d, 0xd4, 0x13, 0x76,
+  0xec, 0x76, 0xc2, 0xe2, 0xbe, 0xfe, 0x99, 0x1a, 0x37, 0x28, 0x56, 0x8d,
+  0x10, 0x46, 0xd7, 0xb3, 0x62, 0xa8, 0x86, 0x46, 0x16, 0xf4, 0x7d, 0x07,
+  0x20, 0x6f, 0xd4, 0xa2, 0x7a, 0xd8, 0xd0, 0xf1, 0x90, 0xd7, 0xd2, 0xa7,
+  0x58, 0x69, 0xdd, 0x49, 0x44, 0xe3, 0x97, 0xd7, 0x25, 0x6a, 0x67, 0x70,
+  0x3c, 0xc7, 0xaa, 0xfd, 0xb6, 0xe4, 0x14, 0xb9, 0x76, 0x55, 0x34, 0x7d,
+  0x45, 0x66, 0xfb, 0xf9, 0x3a, 0x0b, 0x47, 0xb3, 0xca, 0x66, 0xed, 0xe7,
+  0xa6, 0x68, 0x38, 0x57, 0xd1, 0x6b, 0xc2, 0x4e, 0x70, 0x25, 0xf9, 0xcd,
+  0x76, 0x00, 0x5c, 0x54, 0x63, 0xa2, 0xa5, 0x74, 0x4b, 0xde, 0xc1, 0xa7,
+  0x43, 0x1a, 0x0e, 0x9e, 0x80, 0x07, 0x2b, 0x5b, 0x4f, 0x7c, 0xd3, 0xb6,
+  0x8e, 0xd7, 0x3a, 0x59, 0xcd, 0x16, 0xd8, 0xf2, 0xeb, 0xc3, 0x56, 0x1f,
+  0xde, 0x2e, 0x5d, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xcb, 0x30,
+  0x81, 0xc8, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04,
+  0x14, 0x03, 0x6f, 0x5c, 0x80, 0x4d, 0x2a, 0x06, 0xe3, 0x3b, 0x60, 0xf4,
+  0x1c, 0xe5, 0xcc, 0xa2, 0xeb, 0xe7, 0xcf, 0x20, 0x19, 0x30, 0x1f, 0x06,
+  0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x03, 0x6f,
+  0x5c, 0x80, 0x4d, 0x2a, 0x06, 0xe3, 0x3b, 0x60, 0xf4, 0x1c, 0xe5, 0xcc,
+  0xa2, 0xeb, 0xe7, 0xcf, 0x20, 0x19, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
+  0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f,
+  0x04, 0x04, 0x03, 0x02, 0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
+  0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05,
+  0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
+  0x02, 0x30, 0x4f, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x48, 0x30, 0x46,
+  0x82, 0x0a, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x62, 0x6f, 0x78,
+  0x82, 0x0a, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x62, 0x6f, 0x78,
+  0x87, 0x04, 0x0a, 0x00, 0x02, 0x0f, 0x87, 0x04, 0xc0, 0xa8, 0x38, 0x65,
+  0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32,
+  0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61,
+  0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d,
+  0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,
+  0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0xc4, 0xb5, 0xd3, 0x3f, 0xaa, 0x26,
+  0x9a, 0xb2, 0xc3, 0x9a, 0xaf, 0xcf, 0xd2, 0x9b, 0xf0, 0x83, 0x39, 0x95,
+  0x91, 0x1b, 0x72, 0xcc, 0x2f, 0xa7, 0x3e, 0x08, 0x19, 0xbf, 0x9b, 0xbe,
+  0xd3, 0x45, 0xea, 0x50, 0xb2, 0x5d, 0xab, 0x19, 0x57, 0x61, 0x55, 0x0a,
+  0x59, 0x0b, 0x46, 0xbd, 0x88, 0xa2, 0x5a, 0xd1, 0xb7, 0x55, 0x8e, 0x27,
+  0xb6, 0xff, 0x75, 0x09, 0x43, 0x25, 0x83, 0x82, 0x23, 0xa9, 0xc1, 0x98,
+  0x0b, 0x0b, 0xd5, 0xe7, 0x36, 0xbb, 0xe8, 0xf9, 0xf7, 0x2c, 0xd1, 0x1f,
+  0x19, 0x9a, 0x87, 0x82, 0x5f, 0xb8, 0x95, 0xe0, 0x60, 0xcd, 0xf1, 0xdf,
+  0x66, 0xb8, 0xbe, 0xae, 0xc8, 0x1f, 0x94, 0x34, 0x9f, 0x87, 0x80, 0x29,
+  0xbd, 0x08, 0x19, 0x7a, 0x47, 0x4d, 0x5c, 0xdb, 0x00, 0x5d, 0xee, 0x87,
+  0x8e, 0xc2, 0x3d, 0xb0, 0x72, 0xfb, 0xbf, 0x1a, 0xf9, 0xde, 0x76, 0xf1,
+  0xba, 0x3f, 0xed, 0x97, 0x17, 0xc5, 0xc7, 0x4b, 0x94, 0x03, 0x8a, 0x63,
+  0x66, 0xd3, 0x49, 0x35, 0x30, 0x97, 0x1c, 0x37, 0x83, 0x08, 0xb3, 0x9f,
+  0x5d, 0xf7, 0xd4, 0x40, 0x63, 0xc5, 0xc2, 0x54, 0x9a, 0x87, 0x59, 0x17,
+  0x7f, 0x78, 0x02, 0xa4, 0xcb, 0x0b, 0x18, 0x32, 0xc0, 0x74, 0x94, 0xbe,
+  0x07, 0x29, 0x18, 0x1e, 0x65, 0x9f, 0x3c, 0x6a, 0x9a, 0x7b, 0xce, 0xff,
+  0x21, 0x79, 0x40, 0x03, 0x79, 0xd5, 0xa5, 0xb9, 0xbf, 0xc9, 0xba, 0x29,
+  0x18, 0xc9, 0xf8, 0x93, 0x69, 0xb1, 0x86, 0xc9, 0x32, 0x1a, 0x67, 0x2f,
+  0x60, 0xaa, 0xdd, 0x0e, 0xb0, 0xb4, 0x1d, 0x44, 0x71, 0xc3, 0x89, 0x48,
+  0xab, 0xc7, 0x36, 0xf8, 0xfc, 0xf2, 0x95, 0x07, 0xd1, 0x68, 0x2b, 0xe4,
+  0x16, 0x82, 0x63, 0x90, 0x58, 0xf1, 0x10, 0xf4, 0x33, 0xf8, 0xb8, 0x5d,
+  0x29, 0x95, 0x73, 0xf7, 0xc9, 0x97, 0xdb, 0x23, 0x6c, 0x01
 };
 
-#define CLIENT_KEY_DER_LENGTH 1192
-UA_Byte CLIENT_KEY_DER_DATA[1192] = {
-    0x30, 0x82, 0x04, 0xa4, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0x98, 0xc6, 0x5d, 0xad,
-    0xf6, 0xf3, 0x3f, 0x7b, 0x73, 0x55, 0x10, 0xc1, 0xd7, 0x0c, 0xa4, 0x78, 0xc0, 0x76, 0xb1, 0x41,
-    0xa2, 0x00, 0xd1, 0xc9, 0xb0, 0x34, 0xe1, 0x9c, 0x36, 0xb8, 0x63, 0xa8, 0xa8, 0xad, 0xd5, 0xfc,
-    0x17, 0xae, 0xdd, 0xbe, 0xfb, 0x23, 0x10, 0x4e, 0x10, 0xc4, 0x13, 0xe3, 0x78, 0x49, 0xe1, 0xd4,
-    0x72, 0x2a, 0xf9, 0x6f, 0xfa, 0x7c, 0xbd, 0x3d, 0xce, 0xc0, 0x0e, 0xcb, 0x63, 0x13, 0xda, 0x46,
-    0xa2, 0xd4, 0x16, 0xef, 0xe8, 0xd8, 0x81, 0x20, 0x1d, 0x50, 0xbe, 0x9e, 0x1d, 0xd1, 0xb7, 0xc3,
-    0x13, 0x6f, 0xfa, 0x54, 0xfe, 0x3b, 0x3a, 0x88, 0xfe, 0xc0, 0xcc, 0x17, 0x4b, 0xb8, 0x22, 0xa1,
-    0x05, 0x47, 0xc0, 0xeb, 0xa3, 0x5a, 0x43, 0x4f, 0xe7, 0x7f, 0x9b, 0xf3, 0x8e, 0xbf, 0x4e, 0xf6,
-    0x40, 0x6b, 0xcd, 0x9a, 0xba, 0xa7, 0x0d, 0xef, 0xe0, 0x17, 0x97, 0x23, 0x91, 0x65, 0x29, 0x66,
-    0x12, 0xad, 0x13, 0xdf, 0x22, 0x4f, 0xd4, 0x52, 0x2f, 0xc0, 0x22, 0xea, 0x6a, 0x57, 0x72, 0x65,
-    0x37, 0xf5, 0x9c, 0x91, 0x5d, 0x3a, 0xb6, 0x34, 0x55, 0x1f, 0xe2, 0xc8, 0x86, 0xd2, 0xf0, 0x04,
-    0x27, 0x93, 0x82, 0x81, 0x83, 0xfa, 0x89, 0x78, 0xdd, 0x16, 0x96, 0x7d, 0x96, 0xc8, 0x75, 0xae,
-    0x60, 0x68, 0xcc, 0xb3, 0xb1, 0xbc, 0x06, 0x4b, 0xb1, 0xe7, 0x5a, 0xa1, 0xa2, 0x67, 0xac, 0x9a,
-    0x7a, 0x8f, 0x7f, 0x40, 0x01, 0x75, 0x66, 0x68, 0x2d, 0x7a, 0x3e, 0x74, 0x5e, 0xb9, 0x14, 0xf6,
-    0x2f, 0x1f, 0x96, 0x33, 0xa7, 0x34, 0x39, 0xfd, 0xd8, 0xf9, 0x77, 0x0a, 0x16, 0xc2, 0x09, 0xd6,
-    0x51, 0xa9, 0xdf, 0x67, 0x8d, 0xf4, 0x3d, 0xf9, 0xf3, 0xff, 0x3b, 0x1b, 0xd8, 0x6a, 0x1d, 0x1e,
-    0x90, 0x09, 0x24, 0xc3, 0x48, 0x1b, 0x78, 0x05, 0xff, 0xb7, 0xfe, 0x95, 0x02, 0x03, 0x01, 0x00,
-    0x01, 0x02, 0x82, 0x01, 0x00, 0x3f, 0x77, 0x00, 0x49, 0x99, 0x71, 0xf9, 0x68, 0x36, 0x44, 0x1b,
-    0x3e, 0xfb, 0x30, 0x04, 0x4f, 0x29, 0x5c, 0xe5, 0x4b, 0xe7, 0x99, 0xc1, 0x8c, 0xb0, 0x87, 0x77,
-    0x45, 0xa6, 0xb1, 0xb8, 0xac, 0xc2, 0xcd, 0xdc, 0x3b, 0xea, 0x36, 0xb9, 0x65, 0x71, 0xfc, 0x61,
-    0xf4, 0x9c, 0x20, 0x68, 0x46, 0xb1, 0x9c, 0xb7, 0x94, 0xc2, 0x8c, 0xb9, 0xac, 0x5b, 0xf9, 0x5f,
-    0xc0, 0x02, 0x58, 0x64, 0x8c, 0xf7, 0x2e, 0xb3, 0x19, 0x6e, 0xe0, 0xfe, 0x5a, 0x51, 0x77, 0x47,
-    0x44, 0xe9, 0x08, 0xb6, 0xf7, 0x06, 0x5a, 0x2d, 0xa5, 0x7b, 0x38, 0xa4, 0x5c, 0x94, 0x74, 0x54,
-    0x5f, 0xbe, 0xbc, 0xa6, 0xcb, 0xf2, 0xa7, 0x9e, 0xb3, 0x17, 0x77, 0x74, 0x5c, 0x2f, 0x32, 0xfb,
-    0x0d, 0x81, 0x94, 0xd0, 0x5b, 0x40, 0x6c, 0x96, 0xc7, 0xd3, 0x81, 0x35, 0x1b, 0x56, 0xf8, 0xb8,
-    0xe0, 0x72, 0x4e, 0x3a, 0x79, 0x66, 0xbf, 0x3b, 0xcd, 0xb6, 0xca, 0x99, 0xdb, 0xfd, 0x62, 0x9a,
-    0xb7, 0x7d, 0xa5, 0x7a, 0x77, 0x6a, 0x22, 0x63, 0x11, 0x46, 0x4a, 0x41, 0xcc, 0x60, 0x89, 0xb7,
-    0x6f, 0x44, 0x74, 0x90, 0x9a, 0x1e, 0x71, 0x3a, 0x6e, 0xba, 0x8b, 0x0d, 0x56, 0xeb, 0x2b, 0x3f,
-    0x10, 0xd7, 0x80, 0xe3, 0xf5, 0x8f, 0x4c, 0xf5, 0xa7, 0xde, 0x4d, 0x11, 0x03, 0x3f, 0xe4, 0xf1,
-    0xc4, 0x2d, 0x28, 0x4c, 0xbb, 0x63, 0xd9, 0x6f, 0x3e, 0xcd, 0xe9, 0x9c, 0x2c, 0x11, 0x58, 0xf4,
-    0xa0, 0xc2, 0x7f, 0x14, 0xbd, 0x35, 0x46, 0x45, 0xf7, 0x1f, 0x1b, 0x73, 0x8e, 0x9b, 0xf4, 0x79,
-    0x57, 0x23, 0xc3, 0x37, 0x67, 0xc5, 0x9f, 0x2f, 0xe2, 0xf3, 0x0c, 0xc0, 0x70, 0x2a, 0x35, 0x53,
-    0x6e, 0xe8, 0x76, 0x9a, 0x0a, 0x3c, 0xb3, 0x6e, 0xe6, 0x82, 0xe9, 0xd1, 0x34, 0xd7, 0x07, 0x21,
-    0xc1, 0xff, 0x96, 0xa0, 0x01, 0x02, 0x81, 0x81, 0x00, 0xca, 0x00, 0x03, 0xbe, 0x3c, 0x8c, 0x56,
-    0xe4, 0x4d, 0x1f, 0x76, 0xac, 0xca, 0xd9, 0x32, 0xd6, 0x8b, 0x2a, 0x5b, 0x95, 0xde, 0x42, 0xa2,
-    0x81, 0x43, 0xc8, 0x9d, 0xb3, 0xb0, 0x04, 0xa2, 0x9a, 0x9e, 0x4b, 0x9d, 0x82, 0x7e, 0x5a, 0xd8,
-    0xa2, 0xb8, 0x39, 0xa8, 0xee, 0x27, 0xc9, 0x1a, 0x35, 0x0b, 0x5b, 0x62, 0x44, 0x8d, 0x32, 0x19,
-    0xee, 0x31, 0x10, 0x0f, 0x0e, 0xc7, 0x98, 0xfc, 0x70, 0x6c, 0x4d, 0x00, 0x47, 0x00, 0xb5, 0x5e,
-    0x2d, 0x19, 0x8a, 0xb3, 0x06, 0x1d, 0xfd, 0xcd, 0x32, 0xfb, 0x09, 0x8f, 0x42, 0x7f, 0x5e, 0x0c,
-    0x4e, 0x80, 0x91, 0x4f, 0x9f, 0x44, 0x87, 0x58, 0xdc, 0xdb, 0x6e, 0xd5, 0x64, 0x1c, 0xac, 0xc0,
-    0xb7, 0xce, 0xdb, 0x71, 0xb9, 0x6d, 0xbc, 0xb7, 0xd8, 0x52, 0x44, 0xcc, 0x02, 0x7f, 0xc9, 0xb4,
-    0xf7, 0xf1, 0xa5, 0x00, 0x8e, 0xcf, 0x7f, 0x08, 0x01, 0x02, 0x81, 0x81, 0x00, 0xc1, 0x9d, 0x99,
-    0x27, 0x97, 0x4f, 0xe3, 0x84, 0x85, 0x38, 0x1c, 0xee, 0xd1, 0xd8, 0xd2, 0x99, 0x8f, 0x4a, 0x00,
-    0x76, 0x40, 0xa0, 0x1a, 0x99, 0xe3, 0xbb, 0xf2, 0xb6, 0x26, 0x55, 0xcb, 0x43, 0x8d, 0xcb, 0x6b,
-    0xbe, 0xb0, 0x00, 0xc8, 0x2a, 0xdc, 0xc5, 0x82, 0xb9, 0xde, 0x71, 0xa0, 0x71, 0x8c, 0x98, 0xb9,
-    0xbc, 0xc7, 0xa1, 0x2f, 0x8c, 0x46, 0xae, 0x4d, 0x0a, 0x51, 0x59, 0xb7, 0xf2, 0xac, 0xd4, 0x64,
-    0xb0, 0xdb, 0x5e, 0x31, 0xfb, 0xd3, 0x66, 0x22, 0xbf, 0x34, 0xe7, 0x12, 0x54, 0x04, 0x50, 0x8c,
-    0x69, 0x79, 0xf6, 0xfa, 0xd1, 0x0f, 0xa0, 0x4c, 0x75, 0x01, 0x5e, 0x41, 0xc4, 0x82, 0x48, 0x07,
-    0x78, 0x3e, 0x90, 0x5e, 0x40, 0x9d, 0x42, 0x83, 0x73, 0x6c, 0xad, 0xb4, 0x1f, 0xb8, 0x27, 0x98,
-    0x9c, 0x8a, 0x42, 0x76, 0x9f, 0xca, 0x28, 0xb6, 0xd9, 0xce, 0x18, 0x56, 0x95, 0x02, 0x81, 0x81,
-    0x00, 0xc3, 0x0b, 0x20, 0x92, 0x1f, 0x84, 0xa2, 0xa1, 0xee, 0x95, 0xe2, 0xd1, 0x15, 0x4c, 0x83,
-    0x7a, 0x05, 0x05, 0xf1, 0x48, 0xd4, 0x43, 0x23, 0x06, 0x0d, 0x9d, 0x38, 0x28, 0xb8, 0x5c, 0xc1,
-    0x64, 0xea, 0x53, 0xb8, 0xd2, 0xb7, 0x8e, 0xa0, 0x7e, 0xfd, 0xc3, 0x2f, 0x0a, 0x46, 0x00, 0x37,
-    0xfd, 0xdf, 0xe9, 0x6d, 0x09, 0x24, 0x0c, 0xac, 0x5d, 0x01, 0xa2, 0xaf, 0xe7, 0x65, 0x72, 0xa2,
-    0xcd, 0x2a, 0xc5, 0x6e, 0xef, 0x20, 0x0f, 0xff, 0xcf, 0x2c, 0x4a, 0x70, 0x72, 0x07, 0xa3, 0x78,
-    0xef, 0x30, 0xd6, 0x1a, 0x2d, 0xeb, 0x2d, 0xb4, 0x54, 0x58, 0x6f, 0xf6, 0xa1, 0xa2, 0x59, 0xcd,
-    0xc3, 0xf3, 0x5d, 0x21, 0x4e, 0x79, 0x21, 0x95, 0x33, 0xe5, 0xd8, 0x9e, 0x06, 0x9d, 0x9f, 0x0b,
-    0x25, 0x24, 0xca, 0xa8, 0xf2, 0x00, 0xd1, 0x92, 0x9b, 0x96, 0x07, 0xec, 0x71, 0xf8, 0x88, 0x80,
-    0x01, 0x02, 0x81, 0x80, 0x4b, 0xf4, 0x75, 0x96, 0xd0, 0x87, 0x68, 0xac, 0x1e, 0x4f, 0x0b, 0x1a,
-    0xad, 0x7c, 0x2f, 0xf2, 0x4a, 0x02, 0x2f, 0xf8, 0x34, 0x16, 0x1b, 0x19, 0x6f, 0xfb, 0xd5, 0x95,
-    0x9b, 0xa8, 0x60, 0x9b, 0x59, 0xcf, 0x09, 0xaf, 0xbf, 0x00, 0x2f, 0x86, 0x91, 0x21, 0x72, 0xcd,
-    0x53, 0xf4, 0xa3, 0x8a, 0xa8, 0x2b, 0x6a, 0x02, 0x23, 0x16, 0x9a, 0xbe, 0x9f, 0x23, 0xd5, 0xd9,
-    0x4c, 0x5c, 0xb4, 0x0b, 0x21, 0xbe, 0x18, 0xda, 0x40, 0xd4, 0xcd, 0x2b, 0x0b, 0x9d, 0xaf, 0xd7,
-    0xee, 0xfb, 0x0f, 0x77, 0xa2, 0x51, 0xaf, 0x23, 0xd9, 0xd3, 0x08, 0x46, 0x67, 0xa8, 0xed, 0x15,
-    0xa1, 0xb9, 0xc6, 0x77, 0x3e, 0xdc, 0xdf, 0x01, 0x4f, 0x19, 0xf7, 0xbf, 0xc5, 0x71, 0xc8, 0x7b,
-    0xc9, 0x90, 0xc3, 0x6f, 0x06, 0x21, 0x92, 0x7f, 0x26, 0xc6, 0x38, 0x1f, 0x2b, 0x81, 0x99, 0x6a,
-    0x0c, 0xae, 0x03, 0x99, 0x02, 0x81, 0x81, 0x00, 0x98, 0x75, 0x81, 0x7a, 0xc6, 0x18, 0xd2, 0xb1,
-    0x74, 0xb4, 0x7e, 0x1d, 0x48, 0x9c, 0xe4, 0x49, 0x1e, 0xfa, 0x8a, 0x0a, 0x36, 0xc4, 0xa0, 0xca,
-    0x55, 0xb8, 0x98, 0x86, 0x8c, 0x8a, 0x66, 0xba, 0x90, 0x5e, 0x3a, 0x76, 0x9a, 0xa9, 0x5b, 0x15,
-    0xc2, 0x6e, 0x50, 0xed, 0x8f, 0x70, 0xe7, 0x67, 0x80, 0xd4, 0x46, 0x5f, 0x63, 0xdd, 0xed, 0x0a,
-    0xdd, 0xfb, 0xf7, 0xbc, 0xa4, 0x96, 0x85, 0x70, 0x51, 0xa1, 0x62, 0xc9, 0xfd, 0x41, 0xd3, 0x77,
-    0x50, 0x42, 0xc5, 0x8c, 0x49, 0x5f, 0xa7, 0xe3, 0xaa, 0x1e, 0x0e, 0x4e, 0xc5, 0x13, 0x25, 0x16,
-    0x3a, 0x1c, 0x9d, 0xc9, 0x05, 0xd9, 0xa4, 0x4a, 0x57, 0xaa, 0x2a, 0x87, 0x23, 0x13, 0x6a, 0x2c,
-    0x2a, 0x76, 0x60, 0xda, 0xb1, 0x8a, 0x7a, 0xf8, 0x6d, 0xad, 0x23, 0x00, 0x1b, 0x53, 0xad, 0xc1,
-    0xc5, 0x12, 0x2c, 0xca, 0x4b, 0xb4, 0x8d, 0x74
+#define CLIENT_KEY_DER_LENGTH 1218
+UA_Byte CLIENT_KEY_DER_DATA[CLIENT_KEY_DER_LENGTH] = {
+  0x30, 0x82, 0x04, 0xbe, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a,
+  0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82,
+  0x04, 0xa8, 0x30, 0x82, 0x04, 0xa4, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01,
+  0x01, 0x00, 0xcf, 0xe9, 0xd9, 0x66, 0x9a, 0x06, 0xa1, 0x6d, 0x87, 0x90,
+  0x44, 0xca, 0xdc, 0xff, 0x4a, 0xe4, 0x1c, 0x0a, 0x5e, 0xe9, 0x62, 0xe4,
+  0x08, 0x6b, 0x83, 0x23, 0xdc, 0x76, 0xe3, 0xe1, 0xbe, 0x73, 0x0a, 0xb6,
+  0x1a, 0x07, 0x8b, 0x80, 0x7f, 0xe2, 0x87, 0x6f, 0x8f, 0xf2, 0xe3, 0xf5,
+  0x64, 0x83, 0xe5, 0x6f, 0x83, 0x2b, 0xb4, 0x9d, 0xd6, 0xf2, 0x6f, 0xa2,
+  0x2a, 0x78, 0x6c, 0xcf, 0xba, 0x9d, 0xd1, 0xca, 0xad, 0xa2, 0xed, 0xd0,
+  0x52, 0x53, 0x6c, 0x09, 0x72, 0xe8, 0xcc, 0xb5, 0xb6, 0x99, 0xea, 0xf9,
+  0x04, 0x04, 0xee, 0x42, 0x12, 0x18, 0x8a, 0x20, 0xbb, 0x05, 0xce, 0xe1,
+  0x32, 0x54, 0x5a, 0x99, 0x9d, 0x27, 0xe6, 0xae, 0xd5, 0x4a, 0xa4, 0xf2,
+  0x6b, 0x96, 0xee, 0x5a, 0x27, 0x7e, 0xbf, 0x3d, 0x19, 0xd0, 0xcd, 0x2e,
+  0xa3, 0xc9, 0xe3, 0x64, 0x67, 0x23, 0x94, 0x07, 0xb7, 0x20, 0x22, 0x9d,
+  0xd4, 0x13, 0x76, 0xec, 0x76, 0xc2, 0xe2, 0xbe, 0xfe, 0x99, 0x1a, 0x37,
+  0x28, 0x56, 0x8d, 0x10, 0x46, 0xd7, 0xb3, 0x62, 0xa8, 0x86, 0x46, 0x16,
+  0xf4, 0x7d, 0x07, 0x20, 0x6f, 0xd4, 0xa2, 0x7a, 0xd8, 0xd0, 0xf1, 0x90,
+  0xd7, 0xd2, 0xa7, 0x58, 0x69, 0xdd, 0x49, 0x44, 0xe3, 0x97, 0xd7, 0x25,
+  0x6a, 0x67, 0x70, 0x3c, 0xc7, 0xaa, 0xfd, 0xb6, 0xe4, 0x14, 0xb9, 0x76,
+  0x55, 0x34, 0x7d, 0x45, 0x66, 0xfb, 0xf9, 0x3a, 0x0b, 0x47, 0xb3, 0xca,
+  0x66, 0xed, 0xe7, 0xa6, 0x68, 0x38, 0x57, 0xd1, 0x6b, 0xc2, 0x4e, 0x70,
+  0x25, 0xf9, 0xcd, 0x76, 0x00, 0x5c, 0x54, 0x63, 0xa2, 0xa5, 0x74, 0x4b,
+  0xde, 0xc1, 0xa7, 0x43, 0x1a, 0x0e, 0x9e, 0x80, 0x07, 0x2b, 0x5b, 0x4f,
+  0x7c, 0xd3, 0xb6, 0x8e, 0xd7, 0x3a, 0x59, 0xcd, 0x16, 0xd8, 0xf2, 0xeb,
+  0xc3, 0x56, 0x1f, 0xde, 0x2e, 0x5d, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
+  0x82, 0x01, 0x00, 0x16, 0x6a, 0xa6, 0x2f, 0xf3, 0xc7, 0x67, 0x3c, 0x41,
+  0xf3, 0x82, 0x17, 0x45, 0x40, 0x99, 0x38, 0x82, 0xf5, 0x73, 0x4a, 0x42,
+  0x89, 0x47, 0x87, 0x1f, 0xfa, 0x8b, 0xd8, 0x9d, 0xb5, 0x47, 0x2d, 0x6c,
+  0x28, 0x3a, 0x22, 0x3a, 0x1e, 0x3e, 0xab, 0x93, 0xe2, 0xa9, 0x68, 0x8c,
+  0xbf, 0x76, 0x78, 0xea, 0x11, 0xdd, 0xd8, 0xa6, 0x7e, 0xa6, 0x20, 0x39,
+  0x7d, 0x08, 0x8b, 0x37, 0x60, 0x26, 0x44, 0xc1, 0xcb, 0xd2, 0x70, 0xd0,
+  0xa7, 0x37, 0x59, 0x1b, 0x3a, 0xe1, 0x92, 0xcc, 0x0f, 0x83, 0x82, 0x90,
+  0xdd, 0x0c, 0x5b, 0xe3, 0xbc, 0x67, 0xeb, 0x11, 0x69, 0x7a, 0x00, 0xa4,
+  0x4f, 0x8f, 0x77, 0x9c, 0xd5, 0x17, 0x26, 0xa8, 0x2e, 0x8d, 0x7c, 0xa0,
+  0xd0, 0x2a, 0x5d, 0x79, 0x91, 0x6a, 0xd4, 0xb5, 0x95, 0xc6, 0xe4, 0xc6,
+  0x5a, 0x92, 0xfa, 0x3f, 0x74, 0x21, 0xd2, 0xaa, 0x31, 0x32, 0xc3, 0x28,
+  0x70, 0xd9, 0x86, 0x7f, 0x85, 0x6b, 0x1b, 0xa8, 0x7c, 0x8a, 0x1f, 0xb6,
+  0x4c, 0xe2, 0xb6, 0x55, 0xd1, 0x61, 0x10, 0xc0, 0x8e, 0x39, 0x6f, 0x9f,
+  0xac, 0xde, 0x0f, 0xb0, 0x4d, 0x9a, 0x29, 0x60, 0x8c, 0x2a, 0xfb, 0x44,
+  0x08, 0x5a, 0x04, 0xc3, 0x03, 0x75, 0xb0, 0x9f, 0xb0, 0x25, 0xe1, 0xda,
+  0x1f, 0x2f, 0xd8, 0xe6, 0xb5, 0x09, 0x93, 0x1a, 0xb5, 0x0f, 0xdd, 0xbd,
+  0xa1, 0xab, 0x48, 0x85, 0x94, 0xe8, 0x9c, 0x70, 0x8d, 0xfc, 0xf8, 0xf1,
+  0xa9, 0xe2, 0x16, 0x6c, 0x27, 0xba, 0x39, 0xe5, 0x06, 0x96, 0xf4, 0x46,
+  0x6f, 0x0d, 0x08, 0xc9, 0xeb, 0xd1, 0x24, 0x01, 0x07, 0x08, 0xa6, 0x0e,
+  0xee, 0xeb, 0xeb, 0x6e, 0xc7, 0xaf, 0x90, 0x8a, 0x8b, 0xf1, 0x0f, 0x75,
+  0xcd, 0xef, 0xec, 0x6c, 0xaf, 0x7e, 0xf1, 0x64, 0xb8, 0x9d, 0x57, 0xd2,
+  0x58, 0xb3, 0x73, 0xa9, 0x0c, 0xe3, 0x81, 0x02, 0x81, 0x81, 0x00, 0xee,
+  0xde, 0xc3, 0x6d, 0x83, 0xf3, 0xe3, 0x69, 0x31, 0x27, 0xbb, 0x62, 0x9d,
+  0xd6, 0xfb, 0xc4, 0x3b, 0x55, 0x5c, 0xf4, 0x2a, 0xcb, 0xdb, 0x99, 0x14,
+  0x18, 0xe7, 0xa6, 0x2c, 0xee, 0x98, 0x89, 0x4f, 0x8a, 0xe6, 0xc7, 0xf6,
+  0x66, 0x65, 0x89, 0x05, 0x24, 0xd5, 0x68, 0x1f, 0x61, 0x09, 0x26, 0xc8,
+  0xc2, 0x2b, 0x9d, 0x9d, 0xb7, 0x34, 0x65, 0x05, 0x1b, 0x86, 0xbd, 0xe9,
+  0x44, 0x3a, 0x44, 0x62, 0x98, 0x84, 0xe4, 0x09, 0x95, 0xc4, 0x18, 0x42,
+  0x74, 0xb5, 0xb3, 0x62, 0xaa, 0x7d, 0x70, 0x85, 0x6e, 0x57, 0x38, 0x58,
+  0x96, 0x67, 0x93, 0x71, 0x9a, 0xc6, 0x71, 0x08, 0xcf, 0x43, 0x59, 0x5f,
+  0x7b, 0x5a, 0x78, 0x89, 0x40, 0x71, 0xd3, 0x8f, 0xe0, 0xd7, 0xfb, 0x9b,
+  0xf4, 0x70, 0x5c, 0x87, 0x48, 0x7b, 0x77, 0xf5, 0x1a, 0xa2, 0xde, 0x21,
+  0xa6, 0x90, 0xcc, 0x2f, 0x4f, 0x1d, 0x8d, 0x02, 0x81, 0x81, 0x00, 0xde,
+  0xd2, 0xc6, 0x79, 0x21, 0x90, 0xca, 0x61, 0x76, 0x2a, 0xb2, 0x23, 0xb4,
+  0x13, 0x54, 0x86, 0x6a, 0xaa, 0xa6, 0x91, 0xaa, 0xf8, 0xd6, 0xb6, 0xcf,
+  0x6d, 0xef, 0xfa, 0xec, 0x8d, 0x7c, 0x52, 0x66, 0x3a, 0x60, 0xeb, 0x3c,
+  0x64, 0xb3, 0xc0, 0x36, 0x72, 0x28, 0xda, 0x1f, 0x5a, 0xfe, 0x17, 0x7e,
+  0xf3, 0xcd, 0xac, 0xf6, 0x9b, 0xe1, 0xf5, 0x9a, 0x67, 0x3e, 0xcd, 0xf4,
+  0x84, 0xf7, 0x47, 0xe4, 0xdb, 0xc1, 0xf1, 0xec, 0xcc, 0xdf, 0x63, 0xa9,
+  0xc0, 0x37, 0x8e, 0xc8, 0x00, 0xf9, 0xb8, 0x8f, 0x58, 0x23, 0xb9, 0x5f,
+  0x03, 0x92, 0x7e, 0xbe, 0x3c, 0x10, 0xfc, 0x63, 0xbe, 0x56, 0x8f, 0xfd,
+  0xbc, 0xa1, 0xc3, 0x8c, 0x78, 0x89, 0x5a, 0xca, 0x58, 0xe9, 0xa5, 0x9b,
+  0xa7, 0xa5, 0xfe, 0x96, 0xf7, 0xae, 0x42, 0x39, 0x70, 0x38, 0xfb, 0x55,
+  0xff, 0x5a, 0x86, 0x02, 0x38, 0x18, 0x11, 0x02, 0x81, 0x80, 0x7a, 0x09,
+  0x20, 0xfa, 0xb0, 0x71, 0x47, 0x7b, 0x94, 0x7b, 0x62, 0x06, 0x8d, 0xf1,
+  0x29, 0x8b, 0x25, 0x6d, 0x05, 0x22, 0x51, 0x42, 0xf9, 0x1c, 0x09, 0xe2,
+  0x77, 0x66, 0xb4, 0x89, 0xe9, 0x30, 0x2d, 0x8d, 0x1f, 0x3e, 0x85, 0xa9,
+  0xe6, 0xb1, 0xcc, 0x08, 0xf7, 0x66, 0x4c, 0xb1, 0xbc, 0x85, 0x2e, 0x07,
+  0xd5, 0x54, 0x9f, 0x20, 0xdc, 0x09, 0xc8, 0x44, 0x39, 0xe0, 0x88, 0x6e,
+  0x2c, 0xfe, 0x87, 0x08, 0xb8, 0xcb, 0xf0, 0x01, 0xad, 0xbf, 0x5f, 0x24,
+  0x55, 0x38, 0x22, 0x6e, 0x4b, 0xcb, 0xd2, 0xbf, 0x7e, 0x9b, 0xf0, 0xd6,
+  0x56, 0x70, 0x43, 0x97, 0xf9, 0x4e, 0x02, 0x5c, 0x31, 0x62, 0x55, 0x9f,
+  0xa5, 0xa6, 0xf3, 0x28, 0x13, 0x7f, 0x2c, 0x80, 0x88, 0x97, 0xa9, 0x23,
+  0x86, 0xcc, 0x1e, 0xe9, 0x6e, 0xfa, 0xe8, 0x24, 0x05, 0x95, 0x4a, 0xc7,
+  0xd8, 0x2e, 0x18, 0xf5, 0x68, 0x79, 0x02, 0x81, 0x81, 0x00, 0xcb, 0xe5,
+  0x4f, 0xdc, 0x94, 0x0c, 0x6c, 0x44, 0xd6, 0xde, 0xa6, 0xf7, 0xe8, 0xd6,
+  0x2f, 0x68, 0x78, 0xbf, 0x03, 0x81, 0x14, 0x54, 0x74, 0x16, 0x00, 0xa5,
+  0xf7, 0x0d, 0x43, 0xdd, 0x0c, 0x40, 0x52, 0x6f, 0x65, 0x34, 0x9c, 0xa5,
+  0x01, 0x9f, 0x07, 0xb3, 0x5b, 0x12, 0x8d, 0xd2, 0xb3, 0xe4, 0x48, 0x35,
+  0x4c, 0xa5, 0xd3, 0x5c, 0x3d, 0x5e, 0x83, 0x15, 0xaa, 0xf0, 0xc7, 0xa9,
+  0xcc, 0xa5, 0xab, 0x14, 0x34, 0xda, 0xed, 0xf7, 0x63, 0x0b, 0x4d, 0xd0,
+  0x28, 0x86, 0xad, 0x19, 0xc7, 0x69, 0x4d, 0x32, 0x38, 0x2e, 0x6e, 0x75,
+  0x54, 0x5e, 0x4a, 0x31, 0xa8, 0xd1, 0x6b, 0x6c, 0x46, 0xc5, 0xa8, 0x48,
+  0x2e, 0x36, 0x44, 0x9a, 0x20, 0x06, 0x46, 0x57, 0x2a, 0x26, 0x72, 0xd2,
+  0xec, 0x20, 0x95, 0x80, 0xbb, 0xa2, 0xb9, 0xf0, 0xa9, 0x13, 0xc4, 0x53,
+  0xd0, 0x40, 0x04, 0x53, 0xd4, 0x21, 0x02, 0x81, 0x81, 0x00, 0xc7, 0xf4,
+  0x63, 0x08, 0x30, 0xb6, 0x34, 0x62, 0xdd, 0xf1, 0x99, 0x40, 0xa4, 0xc3,
+  0x86, 0xe0, 0x58, 0xb9, 0xc2, 0x77, 0x0c, 0x48, 0x8d, 0x86, 0x73, 0x27,
+  0xa3, 0x8c, 0xe8, 0x90, 0xed, 0x34, 0x40, 0x03, 0x3b, 0x47, 0x10, 0x40,
+  0xe6, 0x2d, 0xb6, 0xa1, 0x86, 0x71, 0xbc, 0x0a, 0xd2, 0x79, 0x0f, 0xe4,
+  0xaa, 0x71, 0xc2, 0xee, 0x7f, 0xf7, 0x89, 0x2f, 0xf2, 0xee, 0x79, 0x40,
+  0x6c, 0xa2, 0x30, 0x41, 0xda, 0xe7, 0x80, 0x76, 0x0c, 0xf6, 0xb2, 0xfb,
+  0x54, 0xf3, 0x45, 0xe5, 0x67, 0xa2, 0x45, 0x06, 0x24, 0x98, 0x4c, 0xbe,
+  0xef, 0xc2, 0x10, 0x98, 0x04, 0x0e, 0x6c, 0x3e, 0x23, 0x70, 0x9a, 0x14,
+  0xb9, 0x88, 0x2f, 0xa4, 0x2b, 0xec, 0x90, 0x88, 0x0d, 0x75, 0x3b, 0xae,
+  0x24, 0x87, 0xfc, 0x25, 0x05, 0xe9, 0xf1, 0xc5, 0xb6, 0xc1, 0xa5, 0x11,
+  0x76, 0xd1, 0xee, 0xdb, 0x2e, 0x44
 };
 
-#define SERVER_CERT_DER_LENGTH 1040
-UA_Byte SERVER_CERT_DER_DATA[1040] = {
-    0x30, 0x82, 0x04, 0x0c, 0x30, 0x82, 0x02, 0xf4, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x03,
-  0x35, 0x42, 0xb9, 0x6d, 0x85, 0x7e, 0x8b, 0xd2, 0xe5, 0x3b, 0xd0, 0xd4, 0x28, 0x34, 0x0c, 0x31,
-  0x1f, 0x7f, 0x69, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
-  0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
-  0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65,
-  0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
-  0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f,
-  0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c,
-  0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x31, 0x31,
-  0x31, 0x35, 0x31, 0x32, 0x34, 0x30, 0x32, 0x33, 0x5a, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31, 0x31,
-  0x35, 0x31, 0x32, 0x34, 0x30, 0x32, 0x33, 0x5a, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03,
-  0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
-  0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
-  0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03,
-  0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
-  0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82,
-  0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
-  0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xd3,
-  0xde, 0x49, 0x13, 0x18, 0x08, 0x67, 0x9e, 0x72, 0xe9, 0x63, 0xec, 0xce, 0x00, 0xcd, 0xb9, 0xfd,
-  0x4e, 0xd3, 0xa7, 0x02, 0x41, 0x4c, 0xe1, 0x9d, 0xd0, 0xfd, 0x0c, 0xe7, 0x5d, 0xef, 0xe3, 0x43,
-  0x46, 0x09, 0x35, 0x21, 0xb4, 0x25, 0xbf, 0x9a, 0x81, 0xcb, 0x2e, 0x9e, 0xbd, 0x62, 0x03, 0x93,
-  0x9e, 0x34, 0x13, 0xd4, 0x23, 0x36, 0x82, 0x8a, 0xff, 0x24, 0x30, 0x14, 0xb4, 0xf3, 0xde, 0x0b,
-  0xf1, 0x41, 0x39, 0xf3, 0x03, 0x57, 0xdc, 0x0e, 0xdc, 0x7b, 0x20, 0x62, 0x04, 0xf7, 0x60, 0xf1,
-  0xdb, 0x44, 0xd7, 0x6f, 0x70, 0x1e, 0xd0, 0xa5, 0x5b, 0x8a, 0x21, 0xa8, 0x1b, 0xb4, 0xf5, 0x65,
-  0x95, 0xc1, 0x4c, 0xae, 0x55, 0xd1, 0x7c, 0xb7, 0x73, 0x79, 0x63, 0xd6, 0x5a, 0xa8, 0x1d, 0x52,
-  0xeb, 0xc2, 0x9d, 0x57, 0xb6, 0x63, 0xe2, 0x28, 0x6e, 0xf8, 0x7b, 0xd7, 0x9c, 0x5f, 0x07, 0x11,
-  0x8c, 0xfb, 0x55, 0x94, 0x60, 0x6d, 0xb1, 0x7e, 0xff, 0x82, 0x5c, 0xc9, 0x62, 0xc9, 0x68, 0xa6,
-  0x8b, 0x33, 0xba, 0x13, 0x85, 0xe7, 0x6a, 0x74, 0xb3, 0xa6, 0x1c, 0x0c, 0x3c, 0xee, 0xc7, 0x13,
-  0xed, 0x98, 0xea, 0xf2, 0x2b, 0x9b, 0xba, 0xb6, 0xfb, 0xaf, 0x02, 0x7a, 0x01, 0x37, 0xef, 0xed,
-  0x60, 0x6f, 0xd4, 0xbf, 0xbb, 0xe4, 0x63, 0x03, 0x6d, 0x9b, 0x6d, 0xe5, 0x8e, 0xe7, 0xbb, 0xac,
-  0x2e, 0x0f, 0xa4, 0x8a, 0x6a, 0x05, 0x36, 0x3e, 0x48, 0xcb, 0x47, 0x9e, 0xa8, 0x4b, 0x4a, 0x11,
-  0xbc, 0xc2, 0x5b, 0x04, 0xcd, 0x8a, 0x48, 0xb1, 0x88, 0x53, 0xcd, 0x66, 0x70, 0xcb, 0x08, 0xa0,
-  0x5c, 0x10, 0x99, 0xa4, 0x94, 0x3d, 0xc7, 0xfa, 0xa2, 0x63, 0xad, 0xa5, 0xae, 0xa0, 0xba, 0xde,
-  0xcc, 0x91, 0xd8, 0xdb, 0xc5, 0xd2, 0x28, 0x60, 0x06, 0x1c, 0x20, 0x3b, 0x45, 0xb9, 0x37, 0x02,
-  0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xd5, 0x30, 0x81, 0xd2, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
-  0x0e, 0x04, 0x16, 0x04, 0x14, 0x4f, 0xc1, 0xb2, 0x6c, 0xd1, 0xc1, 0xf6, 0x77, 0x26, 0x5f, 0xf0,
-  0xe0, 0xe9, 0x1a, 0x40, 0xaf, 0x79, 0xdc, 0xe4, 0x01, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23,
-  0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x4f, 0xc1, 0xb2, 0x6c, 0xd1, 0xc1, 0xf6, 0x77, 0x26, 0x5f,
-  0xf0, 0xe0, 0xe9, 0x1a, 0x40, 0xaf, 0x79, 0xdc, 0xe4, 0x01, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
-  0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02,
-  0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b,
-  0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
-  0x02, 0x30, 0x59, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x52, 0x30, 0x50, 0x82, 0x0f, 0x44, 0x45,
-  0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x82, 0x0f, 0x44,
-  0x45, 0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x87, 0x04,
-  0xac, 0x17, 0xd1, 0xe9, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a,
-  0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
-  0x2e, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09,
-  0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,
-  0x93, 0x10, 0xdb, 0x06, 0x14, 0x2e, 0xe2, 0x82, 0x84, 0x53, 0xc1, 0x56, 0x71, 0x30, 0xf4, 0x26,
-  0xaf, 0x41, 0xaf, 0xde, 0x38, 0x6b, 0x39, 0x4d, 0xa9, 0x9b, 0x31, 0x9d, 0x20, 0xf8, 0x24, 0xff,
-  0xee, 0x1a, 0x66, 0x48, 0x01, 0x80, 0x1d, 0x0b, 0xe9, 0xa7, 0x37, 0xf1, 0x89, 0x94, 0x90, 0xe4,
-  0x6c, 0xe0, 0x20, 0xf0, 0x76, 0x3e, 0x78, 0x91, 0x0b, 0xf2, 0x46, 0xdd, 0xb6, 0x02, 0x67, 0xfa,
-  0x5a, 0xbd, 0xea, 0x56, 0xa2, 0xcd, 0xaa, 0x0f, 0xe7, 0xda, 0xad, 0x88, 0x60, 0x8a, 0x45, 0x0e,
-  0x10, 0x9e, 0x1b, 0xef, 0xc2, 0x39, 0x7b, 0x81, 0x27, 0x31, 0x21, 0x55, 0xb3, 0xb8, 0xe5, 0xda,
-  0x42, 0xa5, 0xb1, 0x77, 0x10, 0xfc, 0xb4, 0x49, 0xed, 0xa2, 0x1a, 0x8a, 0xa6, 0x73, 0x00, 0xbf,
-  0x00, 0xda, 0x39, 0x0b, 0x96, 0x52, 0xe7, 0x1a, 0xf6, 0xd8, 0xc1, 0xb8, 0x85, 0xe1, 0x99, 0x0a,
-  0x9b, 0x84, 0xed, 0x22, 0xf6, 0xf7, 0xc3, 0x8e, 0x95, 0x82, 0x9a, 0xa3, 0x4b, 0x2e, 0x3c, 0x69,
-  0x0b, 0xac, 0x0f, 0x5c, 0x1a, 0xdb, 0x11, 0xb6, 0xad, 0xee, 0x20, 0xd0, 0x75, 0x2e, 0x21, 0xdf,
-  0xaa, 0x66, 0x42, 0xe9, 0x9a, 0x88, 0x52, 0x5c, 0x41, 0x22, 0xeb, 0x97, 0xbd, 0xf3, 0x47, 0xae,
-  0xbd, 0x93, 0x3f, 0x52, 0x3b, 0xb6, 0x75, 0xca, 0xb4, 0xcb, 0x7b, 0x08, 0xcc, 0x1f, 0x1c, 0x41,
-  0xa3, 0xee, 0x90, 0x48, 0xda, 0xfc, 0x05, 0x6b, 0x01, 0x49, 0x96, 0xbb, 0x5b, 0xcb, 0x47, 0xa5,
-  0x48, 0xb1, 0x65, 0x9e, 0x64, 0xda, 0x15, 0x9d, 0xa9, 0xaf, 0xd1, 0x3f, 0x16, 0x68, 0x61, 0x66,
-  0xb3, 0xd1, 0x86, 0x8e, 0xef, 0xc4, 0x40, 0x58, 0xa8, 0x2d, 0xee, 0x15, 0x96, 0x89, 0xfe, 0x37,
-  0x3d, 0x69, 0xe4, 0x2c, 0xfe, 0xb2, 0xf4, 0x3b, 0xbe, 0x3a, 0xa9, 0x69, 0x75, 0x1c, 0x31, 0xf1
+#define SERVER_CERT_DER_LENGTH 1030
+UA_Byte SERVER_CERT_DER_DATA[SERVER_CERT_DER_LENGTH] = {
+  0x30, 0x82, 0x04, 0x02, 0x30, 0x82, 0x02, 0xea, 0xa0, 0x03, 0x02, 0x01,
+  0x02, 0x02, 0x14, 0x59, 0x1b, 0x70, 0x7b, 0xac, 0xa0, 0x8e, 0xb0, 0xe1,
+  0x4f, 0x06, 0x48, 0xef, 0x91, 0x01, 0x5d, 0xc4, 0x3e, 0xde, 0x0b, 0x30,
+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
+  0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04,
+  0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55,
+  0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10,
+  0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
+  0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04,
+  0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31,
+  0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
+  0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31,
+  0x30, 0x38, 0x31, 0x35, 0x31, 0x35, 0x35, 0x34, 0x5a, 0x17, 0x0d, 0x33,
+  0x33, 0x31, 0x31, 0x30, 0x35, 0x31, 0x35, 0x31, 0x35, 0x35, 0x34, 0x5a,
+  0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+  0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
+  0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03,
+  0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35,
+  0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c,
+  0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
+  0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f,
+  0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+  0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01,
+  0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xcf,
+  0x37, 0x8d, 0x67, 0xf0, 0x28, 0x1a, 0x6b, 0x58, 0x15, 0x19, 0x80, 0x2e,
+  0xf8, 0xcc, 0xad, 0x85, 0xa1, 0x9c, 0x2f, 0x39, 0x5b, 0x1b, 0xbc, 0xe3,
+  0x02, 0xa5, 0xac, 0x71, 0xfe, 0xce, 0xa8, 0x59, 0x6a, 0x3c, 0x4c, 0xef,
+  0xf8, 0x9a, 0x75, 0x3f, 0x77, 0x63, 0xe1, 0x1c, 0x52, 0xbc, 0x13, 0x2c,
+  0xfb, 0xdd, 0x80, 0x3a, 0x4f, 0x69, 0xaa, 0x7f, 0x77, 0xca, 0x99, 0x1f,
+  0x1a, 0x42, 0xb5, 0x3f, 0x54, 0xa3, 0x9a, 0x38, 0x85, 0xc5, 0x12, 0x87,
+  0xd7, 0xe2, 0x58, 0x36, 0x6b, 0xd1, 0xf1, 0xcf, 0xa0, 0x66, 0x08, 0x98,
+  0xdc, 0xaf, 0x46, 0x66, 0xee, 0x36, 0x91, 0x50, 0x21, 0x20, 0xd6, 0xc4,
+  0xbb, 0x2d, 0x0b, 0x25, 0x05, 0xeb, 0x0e, 0xcf, 0x2f, 0x15, 0x5e, 0xa5,
+  0x97, 0x3f, 0x37, 0xc2, 0xf1, 0x2f, 0xd1, 0x8f, 0xd4, 0xc4, 0x76, 0x79,
+  0x70, 0xbb, 0x73, 0xb4, 0x18, 0xa9, 0x1e, 0xc6, 0xde, 0x2e, 0x77, 0xe9,
+  0x8b, 0x67, 0x01, 0xd8, 0x97, 0x55, 0xa2, 0x78, 0x35, 0xa7, 0x80, 0xcd,
+  0xe7, 0x70, 0xa3, 0x84, 0xfc, 0x0d, 0x87, 0xaf, 0xc7, 0x6d, 0xa1, 0xa6,
+  0x8a, 0x8a, 0x1e, 0x2f, 0xa9, 0x31, 0x00, 0x34, 0xda, 0xe9, 0x4c, 0x6d,
+  0x96, 0x4c, 0x00, 0x16, 0xab, 0x75, 0x94, 0x73, 0x97, 0x1d, 0x02, 0xfb,
+  0x7f, 0x1f, 0x1c, 0x20, 0xc4, 0xb9, 0x72, 0x32, 0xeb, 0x43, 0x1c, 0x43,
+  0x9e, 0x88, 0xc1, 0x3c, 0xab, 0x27, 0x95, 0x61, 0x78, 0x0b, 0xea, 0x39,
+  0x29, 0x0b, 0xb7, 0xdb, 0xcd, 0xe5, 0x43, 0xfa, 0x9a, 0x8b, 0x14, 0x9e,
+  0x4e, 0xd8, 0x64, 0x0f, 0x95, 0xea, 0xed, 0xac, 0xa2, 0x80, 0xb9, 0xa4,
+  0x89, 0x7f, 0x30, 0x39, 0x53, 0xad, 0x3d, 0x5d, 0xf6, 0x27, 0xc5, 0x5a,
+  0x95, 0xaa, 0x47, 0xbc, 0xe4, 0xfe, 0x1b, 0x1e, 0x23, 0x76, 0xa5, 0x2d,
+  0xf7, 0x6a, 0xa9, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xcb, 0x30,
+  0x81, 0xc8, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04,
+  0x14, 0xb4, 0x1f, 0xa6, 0xe1, 0x8b, 0x56, 0x14, 0xe9, 0x9e, 0xf5, 0xbe,
+  0x3d, 0x00, 0xa8, 0xb4, 0x49, 0xa6, 0x98, 0x12, 0xc2, 0x30, 0x1f, 0x06,
+  0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xb4, 0x1f,
+  0xa6, 0xe1, 0x8b, 0x56, 0x14, 0xe9, 0x9e, 0xf5, 0xbe, 0x3d, 0x00, 0xa8,
+  0xb4, 0x49, 0xa6, 0x98, 0x12, 0xc2, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
+  0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f,
+  0x04, 0x04, 0x03, 0x02, 0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
+  0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05,
+  0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
+  0x02, 0x30, 0x4f, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x48, 0x30, 0x46,
+  0x82, 0x0a, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x62, 0x6f, 0x78,
+  0x82, 0x0a, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x62, 0x6f, 0x78,
+  0x87, 0x04, 0x0a, 0x00, 0x02, 0x0f, 0x87, 0x04, 0xc0, 0xa8, 0x38, 0x65,
+  0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32,
+  0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61,
+  0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d,
+  0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,
+  0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x73, 0xfc, 0x75, 0xb9, 0xba, 0x6a,
+  0x7d, 0x20, 0xbb, 0xec, 0x7f, 0xa1, 0xdd, 0xbc, 0xf8, 0x70, 0x94, 0x67,
+  0x3f, 0xd3, 0xf3, 0x01, 0x3b, 0xe2, 0x8b, 0x12, 0x21, 0xec, 0xb6, 0x47,
+  0x93, 0x9f, 0xa5, 0x6e, 0xf0, 0x88, 0x17, 0x69, 0x10, 0x08, 0xd0, 0xd8,
+  0x7a, 0x82, 0x70, 0x1a, 0x1b, 0xf3, 0xa8, 0x40, 0x1f, 0xa0, 0xe2, 0x81,
+  0x4c, 0x1d, 0x8a, 0x37, 0xdf, 0x02, 0xcb, 0x42, 0xb4, 0xcf, 0xb8, 0x5c,
+  0x78, 0x87, 0x0a, 0x26, 0x7d, 0x64, 0x2d, 0x07, 0x6a, 0xa1, 0x0a, 0xd8,
+  0xa6, 0x76, 0xbe, 0x9f, 0x54, 0x37, 0x4a, 0x4e, 0x00, 0x8f, 0x46, 0xab,
+  0xc7, 0x6c, 0x32, 0xbc, 0xfa, 0x3a, 0x05, 0xd4, 0xef, 0x7e, 0x57, 0xac,
+  0x22, 0x3c, 0x06, 0xad, 0x2b, 0x68, 0x39, 0x01, 0x7f, 0xdb, 0xa5, 0x18,
+  0xed, 0x15, 0x9c, 0x64, 0x38, 0x30, 0xcd, 0x01, 0x0f, 0xd0, 0xc6, 0x2d,
+  0x7d, 0x7f, 0x1e, 0xde, 0x8b, 0xea, 0x29, 0x17, 0x9a, 0x16, 0x07, 0x03,
+  0xd9, 0xe4, 0x01, 0x86, 0xd6, 0xd2, 0xdd, 0xa0, 0xb6, 0x6c, 0xca, 0x68,
+  0x88, 0xdd, 0xfe, 0x85, 0x60, 0x64, 0xf2, 0x54, 0x37, 0x83, 0x7d, 0x53,
+  0x24, 0xe0, 0x0c, 0x87, 0x82, 0x93, 0xb6, 0x3a, 0x4c, 0xf3, 0xe3, 0xfc,
+  0x0f, 0x6c, 0xcf, 0xce, 0x22, 0x8d, 0x38, 0x28, 0x0c, 0x47, 0xa4, 0x99,
+  0x2f, 0x7d, 0xbd, 0x21, 0xc9, 0xd3, 0xd8, 0x55, 0xfe, 0x87, 0xba, 0x13,
+  0x12, 0x89, 0xa0, 0x0f, 0xa7, 0x83, 0x35, 0x79, 0xb8, 0xa5, 0xb0, 0xbb,
+  0xcd, 0xa5, 0xfd, 0x7d, 0x8e, 0x65, 0xb3, 0xc3, 0x3c, 0xe5, 0x59, 0x27,
+  0xdc, 0xf6, 0x0f, 0xe6, 0xc5, 0x01, 0xe1, 0xe8, 0x12, 0x08, 0xd4, 0xf0,
+  0x63, 0x1d, 0x37, 0xb8, 0xc0, 0x24, 0xbe, 0x90, 0x97, 0x35, 0x6e, 0xb7,
+  0xee, 0xcb, 0x30, 0x0f, 0x10, 0x52, 0x47, 0x10, 0x8b, 0xc3
 };
 
-#define SERVER_KEY_DER_LENGTH 1194
-UA_Byte SERVER_KEY_DER_DATA[1194] = {
-0x30, 0x82, 0x04, 0xa6, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xd3, 0xde, 0x49, 0x13,
-  0x18, 0x08, 0x67, 0x9e, 0x72, 0xe9, 0x63, 0xec, 0xce, 0x00, 0xcd, 0xb9, 0xfd, 0x4e, 0xd3, 0xa7,
-  0x02, 0x41, 0x4c, 0xe1, 0x9d, 0xd0, 0xfd, 0x0c, 0xe7, 0x5d, 0xef, 0xe3, 0x43, 0x46, 0x09, 0x35,
-  0x21, 0xb4, 0x25, 0xbf, 0x9a, 0x81, 0xcb, 0x2e, 0x9e, 0xbd, 0x62, 0x03, 0x93, 0x9e, 0x34, 0x13,
-  0xd4, 0x23, 0x36, 0x82, 0x8a, 0xff, 0x24, 0x30, 0x14, 0xb4, 0xf3, 0xde, 0x0b, 0xf1, 0x41, 0x39,
-  0xf3, 0x03, 0x57, 0xdc, 0x0e, 0xdc, 0x7b, 0x20, 0x62, 0x04, 0xf7, 0x60, 0xf1, 0xdb, 0x44, 0xd7,
-  0x6f, 0x70, 0x1e, 0xd0, 0xa5, 0x5b, 0x8a, 0x21, 0xa8, 0x1b, 0xb4, 0xf5, 0x65, 0x95, 0xc1, 0x4c,
-  0xae, 0x55, 0xd1, 0x7c, 0xb7, 0x73, 0x79, 0x63, 0xd6, 0x5a, 0xa8, 0x1d, 0x52, 0xeb, 0xc2, 0x9d,
-  0x57, 0xb6, 0x63, 0xe2, 0x28, 0x6e, 0xf8, 0x7b, 0xd7, 0x9c, 0x5f, 0x07, 0x11, 0x8c, 0xfb, 0x55,
-  0x94, 0x60, 0x6d, 0xb1, 0x7e, 0xff, 0x82, 0x5c, 0xc9, 0x62, 0xc9, 0x68, 0xa6, 0x8b, 0x33, 0xba,
-  0x13, 0x85, 0xe7, 0x6a, 0x74, 0xb3, 0xa6, 0x1c, 0x0c, 0x3c, 0xee, 0xc7, 0x13, 0xed, 0x98, 0xea,
-  0xf2, 0x2b, 0x9b, 0xba, 0xb6, 0xfb, 0xaf, 0x02, 0x7a, 0x01, 0x37, 0xef, 0xed, 0x60, 0x6f, 0xd4,
-  0xbf, 0xbb, 0xe4, 0x63, 0x03, 0x6d, 0x9b, 0x6d, 0xe5, 0x8e, 0xe7, 0xbb, 0xac, 0x2e, 0x0f, 0xa4,
-  0x8a, 0x6a, 0x05, 0x36, 0x3e, 0x48, 0xcb, 0x47, 0x9e, 0xa8, 0x4b, 0x4a, 0x11, 0xbc, 0xc2, 0x5b,
-  0x04, 0xcd, 0x8a, 0x48, 0xb1, 0x88, 0x53, 0xcd, 0x66, 0x70, 0xcb, 0x08, 0xa0, 0x5c, 0x10, 0x99,
-  0xa4, 0x94, 0x3d, 0xc7, 0xfa, 0xa2, 0x63, 0xad, 0xa5, 0xae, 0xa0, 0xba, 0xde, 0xcc, 0x91, 0xd8,
-  0xdb, 0xc5, 0xd2, 0x28, 0x60, 0x06, 0x1c, 0x20, 0x3b, 0x45, 0xb9, 0x37, 0x02, 0x03, 0x01, 0x00,
-  0x01, 0x02, 0x82, 0x01, 0x01, 0x00, 0x8e, 0x2d, 0xc1, 0xc4, 0x3a, 0x80, 0x89, 0x68, 0xdf, 0x9c,
-  0x98, 0x1e, 0x36, 0x30, 0x7b, 0xde, 0xb0, 0x8a, 0xd1, 0xa6, 0x65, 0xf1, 0x04, 0x72, 0xf3, 0xc1,
-  0x67, 0xcf, 0xdd, 0x04, 0x41, 0x13, 0xb5, 0xf5, 0xae, 0x00, 0x25, 0xda, 0x0a, 0xeb, 0x05, 0xf8,
-  0xcc, 0x2d, 0x41, 0x01, 0xbe, 0x60, 0xc0, 0x13, 0x8e, 0xc7, 0x2f, 0xb9, 0x61, 0xbf, 0x41, 0x1f,
-  0xef, 0x5d, 0x04, 0xc8, 0x5a, 0x4f, 0x4c, 0x9c, 0x5e, 0x35, 0x51, 0x4b, 0x91, 0x0e, 0x70, 0x3a,
-  0xad, 0xb6, 0x11, 0x91, 0x5b, 0xa1, 0x87, 0x2c, 0xaa, 0x8a, 0x18, 0x92, 0x99, 0x5b, 0x53, 0x5c,
-  0x96, 0xd9, 0xf7, 0x42, 0x80, 0xb1, 0x9d, 0xb6, 0x5d, 0xbd, 0xe3, 0xd0, 0x5b, 0x80, 0xe2, 0x6b,
-  0x6f, 0xae, 0xfc, 0x0e, 0x62, 0x7b, 0x2b, 0x46, 0x63, 0x97, 0xcb, 0x60, 0xee, 0xae, 0xba, 0x8b,
-  0x9d, 0xdd, 0x1d, 0xd8, 0x26, 0x3c, 0x13, 0x7e, 0xcb, 0x46, 0x03, 0xc0, 0x00, 0x6b, 0x01, 0x35,
-  0x34, 0x27, 0xd9, 0xdc, 0xc5, 0x0c, 0x6f, 0x95, 0x30, 0x16, 0x92, 0x8e, 0x02, 0xfe, 0xae, 0x98,
-  0x2a, 0x37, 0x97, 0x21, 0xe5, 0x49, 0x3d, 0x62, 0xdc, 0xe3, 0xd9, 0xff, 0x8d, 0x6e, 0xaa, 0xc7,
-  0x05, 0x09, 0x1d, 0x7d, 0xd6, 0xa2, 0xbe, 0x16, 0xc4, 0x72, 0x74, 0xf5, 0x65, 0x54, 0xe6, 0x04,
-  0x0d, 0xf3, 0x04, 0x7b, 0xfd, 0xb0, 0xcb, 0xbf, 0x37, 0x41, 0xb2, 0xda, 0x77, 0x48, 0xeb, 0xc7,
-  0xfe, 0x15, 0x94, 0x82, 0x8d, 0xab, 0x8f, 0x7f, 0x88, 0x1d, 0xb3, 0x9b, 0xaa, 0x20, 0x6d, 0xe0,
-  0xe9, 0x59, 0xa5, 0xfe, 0xf1, 0x4e, 0x91, 0x14, 0xc0, 0x1f, 0x13, 0xed, 0x94, 0x30, 0x84, 0x6c,
-  0x36, 0xeb, 0x9b, 0xcb, 0x36, 0xcb, 0xfb, 0xc8, 0x3a, 0x2b, 0xfa, 0xa1, 0xd3, 0x34, 0xbe, 0xd3,
-  0xde, 0x44, 0xa3, 0xd4, 0xd4, 0x41, 0x02, 0x81, 0x81, 0x00, 0xed, 0x04, 0xa2, 0x67, 0x2c, 0xc4,
-  0xe7, 0x83, 0x5e, 0xee, 0xa8, 0x5f, 0x4e, 0x46, 0x60, 0xfb, 0xf2, 0x96, 0x91, 0xab, 0x21, 0xf9,
-  0xa6, 0xb8, 0x84, 0x18, 0xb4, 0xe4, 0xf2, 0xc8, 0xe5, 0x02, 0xfb, 0x35, 0x19, 0x62, 0xad, 0xe5,
-  0xe7, 0x3c, 0xc9, 0xce, 0x39, 0xb5, 0xc5, 0xf6, 0x24, 0x08, 0x4a, 0xfa, 0xc1, 0xbd, 0x70, 0x81,
-  0x64, 0x47, 0x65, 0x57, 0x41, 0x45, 0x3e, 0xec, 0xd5, 0xb6, 0x2e, 0x74, 0x04, 0xf3, 0x67, 0xed,
-  0x3f, 0x54, 0x04, 0x30, 0x75, 0xf9, 0xa6, 0x5d, 0x40, 0xa9, 0xb3, 0x1d, 0x29, 0x8f, 0xf7, 0x39,
-  0xd6, 0xe8, 0x71, 0xe0, 0x5c, 0xb8, 0x77, 0xa0, 0x6c, 0xb0, 0x8d, 0xe5, 0x7b, 0x2c, 0xea, 0x10,
-  0x8e, 0x12, 0x97, 0x2c, 0x03, 0x5f, 0x4f, 0x16, 0x9f, 0x0c, 0x99, 0xa3, 0xbd, 0x68, 0xea, 0x96,
-  0xc4, 0x64, 0x32, 0xf7, 0x73, 0x32, 0xff, 0x4c, 0x8a, 0x29, 0x02, 0x81, 0x81, 0x00, 0xe4, 0xd6,
-  0x07, 0x15, 0xf2, 0x09, 0xd0, 0xf2, 0xdc, 0x19, 0xc2, 0xd7, 0x25, 0x13, 0x55, 0x71, 0x13, 0x98,
-  0x0f, 0x7d, 0xc7, 0xae, 0x5a, 0x8f, 0x0d, 0x5d, 0xe9, 0x76, 0x9b, 0xc2, 0xe5, 0x72, 0xf6, 0x42,
-  0xc3, 0xb6, 0x9b, 0x60, 0xed, 0x32, 0x76, 0xcb, 0x9f, 0x71, 0x0e, 0x9f, 0x16, 0xc9, 0xdf, 0xc3,
-  0x61, 0x6f, 0x6d, 0xbb, 0x02, 0xce, 0x99, 0xa2, 0x78, 0xaa, 0x53, 0x25, 0x18, 0xa1, 0x1b, 0xc0,
-  0x1f, 0xdf, 0xda, 0x1f, 0x35, 0x4c, 0x43, 0xba, 0xa1, 0x5c, 0xab, 0x7b, 0x0f, 0xf2, 0x2e, 0x2d,
-  0x17, 0x7e, 0x67, 0xee, 0x78, 0xe3, 0x43, 0x89, 0x60, 0x19, 0x0e, 0xcd, 0x40, 0xac, 0x1c, 0x68,
-  0xbf, 0x14, 0x5e, 0x3d, 0x23, 0x22, 0x8f, 0x76, 0xae, 0xc5, 0x94, 0x5f, 0x0a, 0x5e, 0xbe, 0x1d,
-  0x74, 0xc9, 0xc9, 0xa9, 0x59, 0xad, 0xa0, 0x3c, 0x79, 0x9c, 0xaf, 0x61, 0x54, 0x5f, 0x02, 0x81,
-  0x81, 0x00, 0xb0, 0x4a, 0xe4, 0x28, 0xed, 0xc9, 0xbf, 0x91, 0x9d, 0x48, 0xd2, 0x7f, 0xa1, 0x0f,
-  0x04, 0x10, 0x22, 0x4e, 0x10, 0x27, 0x43, 0xec, 0x17, 0x2f, 0xe3, 0x41, 0x25, 0x3b, 0xad, 0xc1,
-  0xf3, 0x65, 0x16, 0x48, 0x56, 0x8b, 0x69, 0x61, 0x39, 0x6f, 0xa3, 0x82, 0xfa, 0xb5, 0xd3, 0x7a,
-  0xd3, 0x2e, 0x3f, 0xe6, 0xe7, 0xb7, 0xea, 0x38, 0xb3, 0xc7, 0xce, 0xfe, 0xe9, 0x93, 0x81, 0xcc,
-  0x52, 0xe1, 0x61, 0x07, 0xf6, 0xae, 0xbd, 0x3c, 0x60, 0x00, 0x33, 0xe5, 0x7f, 0xba, 0xa3, 0x1d,
-  0x75, 0x7d, 0x43, 0xb6, 0x8b, 0x35, 0x83, 0xe3, 0xc7, 0x8f, 0xb9, 0x33, 0xf2, 0x83, 0x5a, 0xa7,
-  0x3e, 0x70, 0xcb, 0xfa, 0x46, 0x76, 0x0f, 0xdb, 0x24, 0x71, 0x7b, 0x73, 0xc7, 0x46, 0x5a, 0xe3,
-  0x2e, 0x86, 0x06, 0xb9, 0x1d, 0xa7, 0x2d, 0xe5, 0xda, 0x49, 0xd5, 0x06, 0xec, 0xee, 0x9f, 0xa9,
-  0xe4, 0x91, 0x02, 0x81, 0x81, 0x00, 0x85, 0x02, 0x76, 0x79, 0xe6, 0x06, 0x98, 0xa2, 0x21, 0x17,
-  0x04, 0x2e, 0x63, 0x89, 0x7a, 0x57, 0x50, 0x89, 0x49, 0x2f, 0xd5, 0xf9, 0xdc, 0xff, 0x5b, 0x48,
-  0xa3, 0xe3, 0xe2, 0x23, 0x85, 0x94, 0xad, 0xd9, 0x1e, 0xc3, 0x2c, 0x4b, 0x49, 0x73, 0xd4, 0xa3,
-  0x04, 0x99, 0x05, 0x63, 0xa9, 0x2e, 0x4b, 0xd6, 0xd7, 0xf2, 0x99, 0xb8, 0x62, 0xa8, 0x4d, 0x9a,
-  0xa7, 0x42, 0x71, 0x33, 0x95, 0xbe, 0x47, 0x50, 0x03, 0xf6, 0xec, 0x64, 0xc9, 0x68, 0xfb, 0xd1,
-  0x25, 0xeb, 0xa4, 0x6c, 0xd2, 0x56, 0xf5, 0x4a, 0x16, 0x66, 0xcd, 0xe8, 0x49, 0xf1, 0xe7, 0x16,
-  0x99, 0x79, 0xd7, 0x25, 0xac, 0x9a, 0x9d, 0xa4, 0xb0, 0xb4, 0x19, 0x16, 0xb6, 0x2e, 0x67, 0x6f,
-  0x17, 0xa5, 0x16, 0x59, 0xab, 0xc0, 0x68, 0x06, 0xdd, 0x14, 0x51, 0x18, 0x13, 0x5d, 0x1d, 0x4f,
-  0x29, 0x6c, 0xce, 0x6f, 0xe7, 0x47, 0x02, 0x81, 0x81, 0x00, 0x9a, 0x8d, 0xd5, 0x3e, 0x24, 0xb5,
-  0xeb, 0x3b, 0xda, 0x59, 0x1b, 0x40, 0x11, 0x3b, 0xac, 0xcf, 0x74, 0xe5, 0xe6, 0xae, 0x38, 0x06,
-  0xa0, 0x51, 0x96, 0xfe, 0xb5, 0xeb, 0x66, 0xd1, 0x7a, 0x61, 0x73, 0xa0, 0x60, 0xb1, 0xf9, 0xe8,
-  0x01, 0x46, 0xa4, 0x3a, 0x31, 0x63, 0xcd, 0xb6, 0x4f, 0xcd, 0xfa, 0x67, 0x0d, 0x44, 0x8f, 0xef,
-  0x2e, 0x7e, 0xa0, 0xbc, 0x87, 0x46, 0x21, 0x83, 0x7f, 0xfd, 0x1d, 0x00, 0xbf, 0x35, 0x6e, 0xca,
-  0x79, 0xf7, 0x5b, 0x4f, 0x1e, 0xe1, 0x5b, 0xfb, 0xa0, 0x56, 0x1c, 0xfc, 0x9c, 0x91, 0x60, 0x91,
-  0x22, 0xd8, 0xc3, 0x72, 0x7c, 0x25, 0x76, 0xf5, 0xe1, 0xeb, 0xb7, 0x28, 0x0f, 0xd4, 0x90, 0x6c,
-  0x31, 0x55, 0x7a, 0xf9, 0x7f, 0xe9, 0x86, 0x3b, 0x03, 0xee, 0xcd, 0xd2, 0x63, 0xac, 0xef, 0x9d,
-  0xdd, 0xee, 0x66, 0x35, 0x4e, 0x92, 0x7b, 0xb2, 0x44, 0xc0
+#define SERVER_KEY_DER_LENGTH 1218
+UA_Byte SERVER_KEY_DER_DATA[SERVER_KEY_DER_LENGTH] = {
+  0x30, 0x82, 0x04, 0xbe, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a,
+  0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82,
+  0x04, 0xa8, 0x30, 0x82, 0x04, 0xa4, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01,
+  0x01, 0x00, 0xcf, 0x37, 0x8d, 0x67, 0xf0, 0x28, 0x1a, 0x6b, 0x58, 0x15,
+  0x19, 0x80, 0x2e, 0xf8, 0xcc, 0xad, 0x85, 0xa1, 0x9c, 0x2f, 0x39, 0x5b,
+  0x1b, 0xbc, 0xe3, 0x02, 0xa5, 0xac, 0x71, 0xfe, 0xce, 0xa8, 0x59, 0x6a,
+  0x3c, 0x4c, 0xef, 0xf8, 0x9a, 0x75, 0x3f, 0x77, 0x63, 0xe1, 0x1c, 0x52,
+  0xbc, 0x13, 0x2c, 0xfb, 0xdd, 0x80, 0x3a, 0x4f, 0x69, 0xaa, 0x7f, 0x77,
+  0xca, 0x99, 0x1f, 0x1a, 0x42, 0xb5, 0x3f, 0x54, 0xa3, 0x9a, 0x38, 0x85,
+  0xc5, 0x12, 0x87, 0xd7, 0xe2, 0x58, 0x36, 0x6b, 0xd1, 0xf1, 0xcf, 0xa0,
+  0x66, 0x08, 0x98, 0xdc, 0xaf, 0x46, 0x66, 0xee, 0x36, 0x91, 0x50, 0x21,
+  0x20, 0xd6, 0xc4, 0xbb, 0x2d, 0x0b, 0x25, 0x05, 0xeb, 0x0e, 0xcf, 0x2f,
+  0x15, 0x5e, 0xa5, 0x97, 0x3f, 0x37, 0xc2, 0xf1, 0x2f, 0xd1, 0x8f, 0xd4,
+  0xc4, 0x76, 0x79, 0x70, 0xbb, 0x73, 0xb4, 0x18, 0xa9, 0x1e, 0xc6, 0xde,
+  0x2e, 0x77, 0xe9, 0x8b, 0x67, 0x01, 0xd8, 0x97, 0x55, 0xa2, 0x78, 0x35,
+  0xa7, 0x80, 0xcd, 0xe7, 0x70, 0xa3, 0x84, 0xfc, 0x0d, 0x87, 0xaf, 0xc7,
+  0x6d, 0xa1, 0xa6, 0x8a, 0x8a, 0x1e, 0x2f, 0xa9, 0x31, 0x00, 0x34, 0xda,
+  0xe9, 0x4c, 0x6d, 0x96, 0x4c, 0x00, 0x16, 0xab, 0x75, 0x94, 0x73, 0x97,
+  0x1d, 0x02, 0xfb, 0x7f, 0x1f, 0x1c, 0x20, 0xc4, 0xb9, 0x72, 0x32, 0xeb,
+  0x43, 0x1c, 0x43, 0x9e, 0x88, 0xc1, 0x3c, 0xab, 0x27, 0x95, 0x61, 0x78,
+  0x0b, 0xea, 0x39, 0x29, 0x0b, 0xb7, 0xdb, 0xcd, 0xe5, 0x43, 0xfa, 0x9a,
+  0x8b, 0x14, 0x9e, 0x4e, 0xd8, 0x64, 0x0f, 0x95, 0xea, 0xed, 0xac, 0xa2,
+  0x80, 0xb9, 0xa4, 0x89, 0x7f, 0x30, 0x39, 0x53, 0xad, 0x3d, 0x5d, 0xf6,
+  0x27, 0xc5, 0x5a, 0x95, 0xaa, 0x47, 0xbc, 0xe4, 0xfe, 0x1b, 0x1e, 0x23,
+  0x76, 0xa5, 0x2d, 0xf7, 0x6a, 0xa9, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
+  0x82, 0x01, 0x00, 0x03, 0x0b, 0x7a, 0xed, 0x73, 0x0e, 0xf3, 0xcc, 0x6d,
+  0xff, 0xe9, 0x5f, 0x03, 0xd1, 0xae, 0x18, 0x42, 0xa5, 0x6c, 0x49, 0x19,
+  0x5b, 0xa8, 0x5d, 0xaf, 0x2c, 0x43, 0xc8, 0xf3, 0xe7, 0xdd, 0x9b, 0x85,
+  0xac, 0xd4, 0xf4, 0x00, 0x76, 0xb3, 0xb6, 0x53, 0x57, 0x6a, 0xc5, 0x4d,
+  0x08, 0x3e, 0x31, 0x3d, 0xf0, 0xf9, 0x81, 0x3f, 0xda, 0x18, 0xe0, 0x63,
+  0x7d, 0x1c, 0x22, 0x01, 0xdd, 0xfd, 0xea, 0xf1, 0xe2, 0x49, 0x81, 0x23,
+  0xa1, 0x7b, 0x92, 0xd9, 0x22, 0x27, 0xf6, 0x49, 0xde, 0x6d, 0xb8, 0x52,
+  0xe7, 0xb5, 0x78, 0x1c, 0xde, 0xe9, 0x48, 0x6c, 0x8c, 0xc5, 0x8a, 0x7f,
+  0x15, 0xed, 0x88, 0x9a, 0x5d, 0x71, 0xbc, 0xff, 0x2f, 0x46, 0x13, 0xf2,
+  0xa1, 0x6b, 0x7b, 0xf7, 0x8c, 0xf0, 0x65, 0xde, 0x5c, 0x72, 0xea, 0x6e,
+  0x65, 0x9e, 0xf9, 0x6a, 0xb1, 0x68, 0x5f, 0xbb, 0xde, 0xbc, 0xe5, 0x6b,
+  0x19, 0x8a, 0x4a, 0x03, 0x6d, 0x14, 0x1f, 0xfd, 0xe0, 0x05, 0x13, 0x0e,
+  0x70, 0x0c, 0xf7, 0xa7, 0xbb, 0x2e, 0x87, 0x1f, 0xac, 0x87, 0x16, 0x06,
+  0x4b, 0x81, 0x1e, 0x97, 0x43, 0xc5, 0x6f, 0x7c, 0x6d, 0x90, 0x43, 0xd5,
+  0x25, 0x1e, 0x2e, 0x0f, 0xf4, 0xe6, 0x1a, 0xfc, 0xe2, 0x88, 0x7d, 0xd3,
+  0x82, 0x92, 0x51, 0xf7, 0x31, 0x32, 0xab, 0xf9, 0x9a, 0x1d, 0x7e, 0x94,
+  0x57, 0xd0, 0xac, 0xf8, 0x5a, 0x80, 0xd1, 0xb7, 0x7e, 0x3b, 0xcc, 0x29,
+  0x1f, 0x23, 0xf1, 0xa4, 0x1d, 0x11, 0xa4, 0x02, 0x62, 0xcb, 0x4f, 0x6e,
+  0x01, 0x24, 0x46, 0x15, 0xec, 0x85, 0xb8, 0xe8, 0x47, 0xef, 0x70, 0x81,
+  0xf0, 0x94, 0xb4, 0x2a, 0xbd, 0x6f, 0xf0, 0xa0, 0xbb, 0x54, 0xdb, 0xf9,
+  0xb6, 0xf2, 0x25, 0x3a, 0x58, 0x8d, 0xc7, 0xb1, 0x99, 0x6b, 0x0d, 0x1a,
+  0x5a, 0xf5, 0xf8, 0xbc, 0x2f, 0x01, 0x0d, 0x02, 0x81, 0x81, 0x00, 0xf2,
+  0x90, 0x20, 0xf2, 0x2b, 0x6c, 0xf6, 0x84, 0xc6, 0xe3, 0xe1, 0x34, 0xcb,
+  0xfe, 0x77, 0xa1, 0x50, 0xf8, 0x6e, 0xaf, 0x83, 0x8e, 0x06, 0xe1, 0x70,
+  0x72, 0xec, 0xfb, 0x0e, 0x86, 0x18, 0x15, 0x9a, 0x1f, 0x76, 0xa7, 0xb5,
+  0x86, 0x7a, 0x4e, 0xc5, 0x80, 0xc7, 0xa8, 0x1d, 0x14, 0xbf, 0xc0, 0xef,
+  0x70, 0xca, 0xa8, 0xfc, 0x39, 0xc8, 0xe8, 0x16, 0xe2, 0x0e, 0x52, 0x49,
+  0xe6, 0x00, 0x46, 0x6d, 0x42, 0x83, 0x7e, 0x10, 0xc4, 0x75, 0x6c, 0x5f,
+  0xe8, 0x16, 0x92, 0x54, 0xab, 0x06, 0xfb, 0x66, 0xe3, 0x63, 0x8e, 0x04,
+  0xed, 0x8a, 0xa9, 0xe4, 0x7d, 0xe0, 0xdd, 0x04, 0x8a, 0xcf, 0xa0, 0x06,
+  0xcd, 0xc8, 0x4a, 0xc9, 0x16, 0xb0, 0xbf, 0x29, 0x6c, 0x94, 0x9b, 0x1c,
+  0x50, 0xf3, 0xea, 0x8a, 0x24, 0xf7, 0xbe, 0x9a, 0x3e, 0x14, 0x24, 0xee,
+  0xe7, 0xad, 0x7d, 0x95, 0xb0, 0xd5, 0x1b, 0x02, 0x81, 0x81, 0x00, 0xda,
+  0xb2, 0x2b, 0x6a, 0x2b, 0xe2, 0x7a, 0xd6, 0x63, 0xd7, 0x5b, 0x27, 0x5b,
+  0x1b, 0x6e, 0xb0, 0x3f, 0xd5, 0xaf, 0x32, 0x6c, 0x63, 0x74, 0xd3, 0x12,
+  0x87, 0x6e, 0xd0, 0x7e, 0x66, 0x9e, 0x5c, 0x17, 0xc8, 0xd0, 0x09, 0xf7,
+  0x80, 0x35, 0xc9, 0xc8, 0x42, 0xb1, 0x4c, 0xcf, 0xfa, 0xd4, 0x91, 0x52,
+  0x99, 0x35, 0x3b, 0x8e, 0x3f, 0x42, 0x38, 0x38, 0x1d, 0xec, 0x99, 0xf8,
+  0xdd, 0xa5, 0x84, 0x7b, 0xd9, 0x72, 0xfe, 0x80, 0xb7, 0x4c, 0xc5, 0x9a,
+  0xde, 0xa0, 0xdd, 0x97, 0xbe, 0x26, 0x79, 0xfd, 0x9b, 0xa2, 0x59, 0x5d,
+  0x77, 0x3a, 0x93, 0x14, 0x92, 0x0e, 0xce, 0x8d, 0x58, 0x45, 0xfc, 0x33,
+  0x7f, 0x7b, 0x5b, 0x99, 0x5c, 0x4b, 0xa2, 0x10, 0x2d, 0xea, 0xd4, 0x14,
+  0xbd, 0x6e, 0x4a, 0xdd, 0xca, 0x40, 0x29, 0x11, 0x57, 0xc9, 0xa8, 0x2f,
+  0xbf, 0x8d, 0xb0, 0x31, 0x77, 0x6f, 0x8b, 0x02, 0x81, 0x81, 0x00, 0x87,
+  0xe5, 0x41, 0xe0, 0x0b, 0x7e, 0x4f, 0x9a, 0xd2, 0x07, 0x27, 0xcc, 0x39,
+  0xa1, 0xc6, 0x8a, 0x45, 0x5f, 0xfa, 0x3b, 0x30, 0xfc, 0x28, 0x54, 0xb3,
+  0x78, 0x5f, 0xd6, 0xc4, 0x2b, 0x52, 0x60, 0xff, 0xe9, 0x32, 0xc4, 0x01,
+  0x0a, 0x67, 0x89, 0xac, 0x53, 0x5b, 0x08, 0x8f, 0xca, 0x69, 0x28, 0x01,
+  0xbd, 0xf2, 0x7c, 0xbc, 0x5a, 0xef, 0x79, 0x40, 0x20, 0xc4, 0x1f, 0x4c,
+  0x31, 0xa4, 0xe3, 0xd0, 0x20, 0xdc, 0xa4, 0x8b, 0x66, 0x55, 0xd7, 0x32,
+  0xe0, 0x47, 0x8d, 0x12, 0x0c, 0x83, 0xab, 0xe3, 0xd7, 0xef, 0x95, 0xc8,
+  0xa3, 0x00, 0xf5, 0xf0, 0x02, 0xaa, 0x31, 0x89, 0x72, 0xef, 0xa1, 0xdb,
+  0x4d, 0xfd, 0x32, 0x10, 0xf9, 0x3a, 0x6a, 0xcf, 0x1d, 0x7b, 0x20, 0x6f,
+  0xbb, 0xd6, 0xfc, 0x07, 0x0b, 0x71, 0x15, 0x83, 0x3a, 0xd6, 0x74, 0x5e,
+  0xb8, 0xc3, 0xd5, 0x41, 0x41, 0x42, 0x13, 0x02, 0x81, 0x80, 0x5a, 0x9c,
+  0xcb, 0xe4, 0x37, 0xbe, 0xa5, 0x0a, 0xc3, 0x5f, 0x6d, 0x83, 0x46, 0xfa,
+  0x7c, 0xc8, 0x46, 0x0a, 0xb1, 0x86, 0x80, 0xe6, 0x4c, 0x77, 0x50, 0x0c,
+  0x11, 0x5c, 0x0d, 0xa3, 0x53, 0x25, 0xf1, 0x2c, 0xe1, 0x15, 0xe0, 0x18,
+  0x9d, 0x30, 0xb7, 0xea, 0xfa, 0x2f, 0x4b, 0x55, 0x30, 0x51, 0xee, 0x19,
+  0x50, 0xb7, 0x16, 0x5f, 0x1b, 0x7e, 0xd3, 0xb1, 0x82, 0x60, 0xe1, 0x7e,
+  0x64, 0xa0, 0x19, 0xf8, 0xa4, 0xee, 0xd2, 0x42, 0x20, 0x6b, 0x17, 0x99,
+  0xfa, 0xa9, 0x15, 0xc0, 0x51, 0x8c, 0xe6, 0x09, 0x60, 0x21, 0x0a, 0xda,
+  0xe5, 0xc8, 0x1f, 0x13, 0xcd, 0x52, 0xc3, 0xb9, 0xb9, 0x75, 0x9f, 0x98,
+  0xc8, 0x71, 0xd1, 0x7f, 0x2e, 0x4f, 0x3d, 0xc8, 0xe8, 0xad, 0x6a, 0xd2,
+  0x7a, 0x2a, 0x46, 0xef, 0x0f, 0xda, 0x74, 0x37, 0x1d, 0x74, 0xb4, 0x23,
+  0xf7, 0xfe, 0xf2, 0xdf, 0xfb, 0xb5, 0x02, 0x81, 0x81, 0x00, 0xc3, 0x5a,
+  0x06, 0xad, 0x8a, 0xed, 0xdf, 0x11, 0xda, 0x20, 0x8b, 0x47, 0x82, 0x5e,
+  0xe4, 0x01, 0x9b, 0x52, 0x9c, 0x7b, 0x30, 0x04, 0x7f, 0x48, 0xce, 0xaf,
+  0x46, 0x81, 0xa3, 0x07, 0xe8, 0xcc, 0x8a, 0x97, 0x9f, 0x1f, 0x10, 0xe2,
+  0xf9, 0xf7, 0x66, 0x90, 0x1d, 0xd4, 0x82, 0x45, 0x1f, 0x32, 0x3b, 0xc1,
+  0x7c, 0xc1, 0xfb, 0x74, 0x4e, 0x64, 0xab, 0xe0, 0xd0, 0x17, 0x99, 0xfc,
+  0xc4, 0x24, 0xd3, 0xca, 0xae, 0x0a, 0x20, 0xa3, 0xa3, 0x9c, 0x05, 0x45,
+  0xb3, 0x64, 0x75, 0x94, 0xa4, 0x99, 0x3a, 0x43, 0xbd, 0x98, 0x58, 0xdb,
+  0x06, 0xec, 0x6d, 0xa7, 0x55, 0xd7, 0x6e, 0x29, 0xe2, 0x93, 0xdb, 0xd9,
+  0x52, 0x71, 0x50, 0xdb, 0x87, 0xb2, 0x5b, 0x86, 0x7e, 0x20, 0x74, 0x39,
+  0x45, 0x81, 0xba, 0x94, 0x27, 0x6a, 0x11, 0x67, 0xaa, 0xff, 0x5b, 0xcd,
+  0xec, 0x5f, 0x7a, 0x5b, 0xfe, 0x10
 };
 
-#define CLIENT_CERT_AUTH_DER_LENGTH 1040
-UA_Byte CLIENT_CERT_AUTH_DER_DATA[1040] = {
-    0x30, 0x82, 0x04, 0x0c, 0x30, 0x82, 0x02, 0xf4, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x7d,
-    0xc5, 0x5e, 0x49, 0x62, 0x67, 0x65, 0x02, 0xbe, 0xae, 0xc1, 0x17, 0x4f, 0x31, 0xb9, 0xb6, 0x0a,
-    0x77, 0x7d, 0xb8, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
-    0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
-    0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65,
-    0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
-    0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f,
-    0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c,
-    0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x31, 0x31,
-    0x30, 0x33, 0x31, 0x30, 0x33, 0x36, 0x32, 0x36, 0x5a, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31, 0x30,
-    0x33, 0x31, 0x30, 0x33, 0x36, 0x32, 0x36, 0x5a, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03,
-    0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
-    0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
-    0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03,
-    0x55, 0x04, 0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
-    0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82,
-    0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
-    0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb3,
-    0x7b, 0xbb, 0x2f, 0xc2, 0xb8, 0x69, 0xc1, 0x7b, 0x5a, 0xdd, 0xe6, 0xd3, 0x60, 0x4f, 0x73, 0xb3,
-    0x77, 0x04, 0x31, 0x76, 0x6a, 0xf8, 0xf7, 0x96, 0xf0, 0x03, 0xf4, 0x65, 0x87, 0x28, 0x0e, 0xf9,
-    0x45, 0xac, 0xa2, 0xbf, 0x2e, 0xc2, 0x4c, 0x6f, 0x4f, 0xf4, 0x79, 0x1a, 0xb0, 0x3f, 0x7d, 0x74,
-    0x53, 0x9c, 0xe9, 0xd5, 0xb6, 0x73, 0x4f, 0xaf, 0x93, 0xb5, 0x74, 0x9e, 0x21, 0x70, 0x1a, 0xd8,
-    0xd4, 0x61, 0x61, 0xcf, 0xf4, 0xaa, 0x19, 0x8f, 0x5f, 0xa6, 0xc1, 0x5b, 0xb7, 0x6d, 0x65, 0xf4,
-    0x40, 0xa1, 0x8e, 0x8e, 0x60, 0x48, 0x8e, 0x27, 0xc8, 0xb8, 0x12, 0xb5, 0x49, 0x43, 0x21, 0x6c,
-    0xcb, 0x20, 0xa7, 0x59, 0x53, 0x3c, 0xf4, 0xab, 0xe1, 0xbe, 0x7f, 0xaa, 0xe5, 0x2f, 0x36, 0x92,
-    0x3d, 0xf8, 0xd8, 0xf8, 0x85, 0x9e, 0xdc, 0x1d, 0x81, 0x9f, 0xc1, 0x9f, 0xf1, 0x04, 0x9d, 0xe0,
-    0x8f, 0x9f, 0x76, 0x73, 0x51, 0xcd, 0x7b, 0xdb, 0xec, 0xe4, 0x46, 0x78, 0x9b, 0x60, 0x4a, 0x6d,
-    0x90, 0x25, 0xef, 0x53, 0xf9, 0x47, 0x50, 0xfe, 0xa7, 0x53, 0x60, 0xff, 0xb7, 0x70, 0xe1, 0x14,
-    0xc9, 0x12, 0x82, 0xfc, 0xd0, 0x1f, 0xc6, 0xda, 0x41, 0xbd, 0x2e, 0x57, 0x71, 0xad, 0x54, 0xd0,
-    0xe8, 0x8a, 0x5e, 0xa8, 0xa7, 0xf3, 0xa9, 0xc7, 0xc8, 0x64, 0x23, 0x84, 0xa1, 0x25, 0x91, 0x79,
-    0x68, 0xe3, 0x78, 0xd3, 0x39, 0x7c, 0xd2, 0x27, 0x2a, 0x0e, 0xaa, 0x0b, 0x0f, 0xeb, 0xf6, 0x44,
-    0x8b, 0x4d, 0x36, 0x35, 0xe3, 0xea, 0x02, 0x21, 0xd6, 0x73, 0x47, 0x75, 0xef, 0xe9, 0x87, 0x09,
-    0x23, 0xf0, 0xe4, 0x48, 0x9e, 0x70, 0xe9, 0x7d, 0xdc, 0xc8, 0xd0, 0x93, 0xff, 0x64, 0x91, 0x0f,
-    0x30, 0x1a, 0xc8, 0xfc, 0x4c, 0xb4, 0x11, 0xe9, 0xbc, 0xa5, 0x71, 0xcf, 0xa5, 0x35, 0x35, 0x02,
-    0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xd5, 0x30, 0x81, 0xd2, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
-    0x0e, 0x04, 0x16, 0x04, 0x14, 0x18, 0xbb, 0x91, 0x02, 0x25, 0x8d, 0xa5, 0xd2, 0x92, 0xc5, 0x09,
-    0x15, 0xcb, 0x4b, 0x87, 0x97, 0x97, 0x1c, 0x76, 0xdd, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23,
-    0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x18, 0xbb, 0x91, 0x02, 0x25, 0x8d, 0xa5, 0xd2, 0x92, 0xc5,
-    0x09, 0x15, 0xcb, 0x4b, 0x87, 0x97, 0x97, 0x1c, 0x76, 0xdd, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
-    0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02,
-    0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b,
-    0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
-    0x02, 0x30, 0x59, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x52, 0x30, 0x50, 0x82, 0x0f, 0x44, 0x45,
-    0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x82, 0x0f, 0x44,
-    0x45, 0x53, 0x4b, 0x54, 0x4f, 0x50, 0x2d, 0x32, 0x31, 0x30, 0x49, 0x39, 0x32, 0x38, 0x87, 0x04,
-    0xac, 0x17, 0xcd, 0x7c, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a,
-    0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
-    0x2e, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09,
-    0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,
-    0x15, 0xc1, 0x12, 0xce, 0x8c, 0xc9, 0x74, 0xb7, 0xd6, 0xc5, 0x2c, 0x52, 0x78, 0xc5, 0xbf, 0xca,
-    0xf1, 0x47, 0xb9, 0x25, 0x88, 0x24, 0x03, 0x2b, 0x10, 0xa4, 0x97, 0x3c, 0xe4, 0xdf, 0xc3, 0xea,
-    0x7e, 0xe5, 0x8a, 0x5a, 0x24, 0x10, 0x4b, 0x91, 0xaf, 0x5e, 0xa8, 0x2b, 0x74, 0x83, 0x1f, 0x01,
-    0xc3, 0x0b, 0x17, 0xea, 0x35, 0xab, 0x2c, 0x5c, 0xfd, 0x28, 0xa2, 0xf7, 0x80, 0x10, 0xc6, 0xd8,
-    0x92, 0x76, 0xef, 0x5b, 0x72, 0x9d, 0xf4, 0x53, 0xc1, 0x1b, 0xd4, 0x9d, 0xaa, 0x0a, 0x87, 0x23,
-    0x72, 0xad, 0x00, 0x2f, 0x2c, 0xd1, 0x3a, 0x87, 0x9b, 0x3c, 0xb8, 0xad, 0x1a, 0x2c, 0xa7, 0x06,
-    0x89, 0xb0, 0xba, 0x9f, 0xfd, 0x86, 0x42, 0xfa, 0x5e, 0x68, 0x3e, 0xe6, 0xfe, 0x4d, 0xf7, 0xc3,
-    0x43, 0x8c, 0x81, 0x5f, 0x91, 0xf9, 0x20, 0x2e, 0x6b, 0x4d, 0x7d, 0x4f, 0xa0, 0x62, 0x65, 0x95,
-    0xbc, 0xe3, 0xb7, 0x5b, 0xa1, 0x0b, 0x48, 0x32, 0xf9, 0x3e, 0xb4, 0xf3, 0x03, 0xa2, 0x98, 0x6f,
-    0x20, 0x2e, 0x9e, 0x77, 0x7a, 0xca, 0x52, 0x59, 0x59, 0x66, 0xb2, 0x45, 0x1e, 0x0c, 0x22, 0x0d,
-    0xbc, 0xf0, 0x6f, 0x07, 0x1a, 0xa7, 0x05, 0x35, 0x71, 0x43, 0xdb, 0xb5, 0x33, 0xf4, 0x37, 0x72,
-    0xaa, 0x07, 0x77, 0x56, 0x3e, 0x87, 0x77, 0x11, 0xc0, 0xf8, 0xe2, 0x79, 0x56, 0xa0, 0x80, 0x24,
-    0x29, 0x48, 0x38, 0xa5, 0xe1, 0xf2, 0x66, 0xae, 0x2f, 0xab, 0x12, 0x4b, 0x0e, 0x33, 0x25, 0xdb,
-    0xb3, 0x4f, 0x9d, 0xde, 0xdf, 0xa3, 0xfb, 0x5f, 0xac, 0x1f, 0xd1, 0xc0, 0xc9, 0x94, 0x54, 0x4e,
-    0x64, 0x01, 0x46, 0x08, 0x1d, 0xac, 0x44, 0xb5, 0x76, 0x86, 0x99, 0x61, 0xdb, 0xe4, 0xe9, 0x99,
-    0xca, 0xdc, 0xdc, 0x9e, 0xad, 0xed, 0x88, 0x42, 0xae, 0xe9, 0xe3, 0x1d, 0x3f, 0xd3, 0xce, 0xa9
+#define CLIENT_CERT_AUTH_DER_LENGTH 1030
+UA_Byte CLIENT_CERT_AUTH_DER_DATA[CLIENT_CERT_AUTH_DER_LENGTH] = {
+  0x30, 0x82, 0x04, 0x02, 0x30, 0x82, 0x02, 0xea, 0xa0, 0x03, 0x02, 0x01,
+  0x02, 0x02, 0x14, 0x02, 0x99, 0xb0, 0x8f, 0x9a, 0x61, 0x96, 0x15, 0xe9,
+  0x76, 0xaf, 0x5a, 0x88, 0x61, 0x65, 0x32, 0xa9, 0xff, 0x94, 0x3f, 0x30,
+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
+  0x05, 0x00, 0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04,
+  0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55,
+  0x04, 0x07, 0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10,
+  0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36,
+  0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04,
+  0x03, 0x0c, 0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31,
+  0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
+  0x68, 0x6f, 0x73, 0x74, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x33, 0x31, 0x31,
+  0x30, 0x38, 0x31, 0x35, 0x31, 0x39, 0x30, 0x33, 0x5a, 0x17, 0x0d, 0x33,
+  0x33, 0x31, 0x31, 0x30, 0x35, 0x31, 0x35, 0x31, 0x39, 0x30, 0x33, 0x5a,
+  0x30, 0x54, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+  0x02, 0x44, 0x45, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x07,
+  0x0c, 0x04, 0x48, 0x65, 0x72, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03,
+  0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35,
+  0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c,
+  0x19, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65,
+  0x72, 0x76, 0x65, 0x72, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f,
+  0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+  0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01,
+  0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xdb,
+  0xb4, 0xe3, 0xe6, 0xd3, 0x93, 0x25, 0xe5, 0x7c, 0xe2, 0x64, 0x78, 0xa7,
+  0x88, 0x5b, 0x63, 0x6c, 0x4f, 0x18, 0x10, 0x41, 0x1f, 0x4c, 0x35, 0xeb,
+  0x3c, 0x33, 0x3b, 0x40, 0x18, 0x79, 0x30, 0x99, 0x3c, 0x7a, 0x9e, 0xd7,
+  0xbe, 0x2e, 0x77, 0xba, 0x2b, 0x0f, 0x05, 0xb1, 0xec, 0xea, 0x55, 0xbe,
+  0x4e, 0xce, 0x9a, 0x64, 0xc4, 0xde, 0x5b, 0x25, 0x38, 0x45, 0x7f, 0x49,
+  0xa5, 0xf3, 0x8c, 0x5a, 0xb9, 0xa6, 0xf2, 0x1d, 0xf4, 0x83, 0x5d, 0xba,
+  0x44, 0x6b, 0x13, 0x16, 0xbb, 0xf9, 0x20, 0x7e, 0x97, 0xfc, 0xb5, 0xfa,
+  0x3a, 0x9c, 0x56, 0xc3, 0xaa, 0x27, 0xc1, 0x15, 0xa2, 0x80, 0xd5, 0xb4,
+  0x62, 0xe0, 0x5b, 0xe8, 0x4e, 0x38, 0xde, 0x2a, 0xc8, 0x2e, 0x27, 0x2f,
+  0x3c, 0x0e, 0x6f, 0x31, 0xe0, 0xc7, 0x1b, 0x60, 0x83, 0xc1, 0xe8, 0xf3,
+  0x71, 0x6d, 0x42, 0xc2, 0xf2, 0x57, 0x32, 0xdb, 0xd8, 0x2f, 0xf2, 0xdc,
+  0x8f, 0x6b, 0x5f, 0xb4, 0x1f, 0xac, 0x02, 0xa9, 0x6e, 0xa8, 0x71, 0xf8,
+  0x85, 0x01, 0x85, 0x52, 0x2a, 0x83, 0x18, 0xf8, 0xc4, 0x43, 0x46, 0xda,
+  0xc2, 0xc2, 0xc2, 0xc8, 0xdc, 0x8f, 0x2a, 0xe2, 0xc5, 0xe7, 0xe0, 0x5d,
+  0x9a, 0xdb, 0xb4, 0x48, 0x69, 0x22, 0xd9, 0xdb, 0x71, 0x65, 0xcd, 0x57,
+  0x06, 0xf8, 0x2e, 0x29, 0x5a, 0xee, 0x22, 0x9d, 0xce, 0x68, 0xe5, 0xcf,
+  0x07, 0x27, 0x99, 0xca, 0x80, 0x15, 0xf0, 0xdf, 0x72, 0x04, 0xa3, 0x8e,
+  0xee, 0xae, 0x28, 0x27, 0x4e, 0xb0, 0x08, 0x38, 0x3c, 0x55, 0x8e, 0xea,
+  0x52, 0x36, 0xb2, 0xfc, 0x27, 0x5d, 0xfb, 0x42, 0xb6, 0x2e, 0x89, 0xda,
+  0x86, 0x7d, 0x2a, 0xe2, 0x3f, 0x93, 0x3a, 0x38, 0xda, 0xd1, 0xc7, 0x8a,
+  0x9b, 0xfc, 0x6f, 0x9c, 0x76, 0xd2, 0x00, 0x0c, 0x26, 0x72, 0x74, 0x0f,
+  0x29, 0xfd, 0xeb, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0xcb, 0x30,
+  0x81, 0xc8, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04,
+  0x14, 0x05, 0x79, 0x6d, 0x2e, 0x93, 0xaf, 0x23, 0x28, 0xd1, 0xcd, 0xe3,
+  0xe6, 0xd8, 0x33, 0x08, 0x97, 0x32, 0x41, 0xb4, 0xe8, 0x30, 0x1f, 0x06,
+  0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x05, 0x79,
+  0x6d, 0x2e, 0x93, 0xaf, 0x23, 0x28, 0xd1, 0xcd, 0xe3, 0xe6, 0xd8, 0x33,
+  0x08, 0x97, 0x32, 0x41, 0xb4, 0xe8, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d,
+  0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f,
+  0x04, 0x04, 0x03, 0x02, 0x02, 0xf4, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
+  0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05,
+  0x07, 0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03,
+  0x02, 0x30, 0x4f, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x48, 0x30, 0x46,
+  0x82, 0x0a, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x62, 0x6f, 0x78,
+  0x82, 0x0a, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x62, 0x6f, 0x78,
+  0x87, 0x04, 0x0a, 0x00, 0x02, 0x0f, 0x87, 0x04, 0xc0, 0xa8, 0x38, 0x65,
+  0x86, 0x20, 0x75, 0x72, 0x6e, 0x3a, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32,
+  0x35, 0x34, 0x31, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x61,
+  0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d,
+  0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05,
+  0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x32, 0x5d, 0x3f, 0xcf, 0x97, 0x58,
+  0x8e, 0x18, 0x1f, 0xeb, 0xbe, 0x11, 0xb4, 0xae, 0x8a, 0x7f, 0x44, 0xc2,
+  0xd2, 0x69, 0xa9, 0x93, 0x51, 0x41, 0x69, 0x1f, 0xbe, 0x01, 0x5c, 0x69,
+  0x13, 0xbf, 0xf6, 0xde, 0x48, 0xb8, 0xea, 0xbd, 0x28, 0x5d, 0x7f, 0x5c,
+  0x02, 0x8d, 0x77, 0x11, 0x27, 0x7b, 0xeb, 0x2b, 0x8b, 0xd6, 0x9b, 0xa4,
+  0xa5, 0x83, 0x11, 0x89, 0x41, 0x64, 0x00, 0x6b, 0x32, 0x6d, 0xa4, 0xf1,
+  0xde, 0xac, 0xad, 0x66, 0x87, 0x43, 0x84, 0x96, 0x31, 0xe5, 0x16, 0x50,
+  0x76, 0xad, 0xed, 0xf8, 0xe4, 0xdf, 0xc9, 0x20, 0xa4, 0xc1, 0xf2, 0xd0,
+  0x40, 0x47, 0x9c, 0xb9, 0x6f, 0x8d, 0xf3, 0xb7, 0x17, 0x39, 0xbc, 0x69,
+  0x99, 0x0f, 0xf6, 0x19, 0xf5, 0xdd, 0xca, 0x94, 0xe0, 0x71, 0x4b, 0x94,
+  0x35, 0x53, 0x2f, 0xf1, 0xcf, 0x62, 0x45, 0x91, 0x36, 0x4b, 0xb6, 0xdf,
+  0x91, 0xb7, 0x37, 0x44, 0x01, 0x95, 0xf2, 0xc7, 0x44, 0x8f, 0x98, 0x4a,
+  0x04, 0x41, 0x7a, 0x1b, 0x28, 0x74, 0x3e, 0xbc, 0x56, 0x49, 0x8e, 0x94,
+  0xdf, 0x6f, 0xee, 0x52, 0xaa, 0x99, 0xe2, 0x15, 0xa9, 0xa8, 0xe1, 0x3e,
+  0x32, 0x3a, 0xf8, 0x3f, 0x0a, 0x76, 0x85, 0x45, 0x2e, 0x8d, 0x4d, 0xed,
+  0xc5, 0xdb, 0xe1, 0xf8, 0x79, 0x5d, 0xc1, 0xef, 0x13, 0x8a, 0x5f, 0x18,
+  0x30, 0xc6, 0x88, 0xef, 0x6d, 0x66, 0x27, 0x5b, 0x00, 0x99, 0xb0, 0x6e,
+  0xc8, 0x29, 0x8a, 0x90, 0xdd, 0x55, 0x48, 0x66, 0x14, 0xbb, 0xda, 0x02,
+  0x1f, 0x36, 0x54, 0x11, 0xa0, 0x21, 0x26, 0xc1, 0x54, 0xd3, 0xbd, 0x16,
+  0xba, 0xa6, 0x72, 0x56, 0xcd, 0x4e, 0x5e, 0xd1, 0x30, 0x25, 0xe7, 0xea,
+  0x93, 0x13, 0x63, 0x33, 0x1e, 0x39, 0x5a, 0x3b, 0x95, 0xdf, 0x6c, 0x84,
+  0x8f, 0x1d, 0xe0, 0x9f, 0xcf, 0xc6, 0xab, 0x7c, 0x55, 0xb5
 };
 
-#define CLIENT_KEY_AUTH_DER_LENGTH 1190
-UA_Byte CLIENT_KEY_AUTH_DER_DATA[1190] = {
-    0x30, 0x82, 0x04, 0xa2, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb3, 0x7b, 0xbb, 0x2f,
-    0xc2, 0xb8, 0x69, 0xc1, 0x7b, 0x5a, 0xdd, 0xe6, 0xd3, 0x60, 0x4f, 0x73, 0xb3, 0x77, 0x04, 0x31,
-    0x76, 0x6a, 0xf8, 0xf7, 0x96, 0xf0, 0x03, 0xf4, 0x65, 0x87, 0x28, 0x0e, 0xf9, 0x45, 0xac, 0xa2,
-    0xbf, 0x2e, 0xc2, 0x4c, 0x6f, 0x4f, 0xf4, 0x79, 0x1a, 0xb0, 0x3f, 0x7d, 0x74, 0x53, 0x9c, 0xe9,
-    0xd5, 0xb6, 0x73, 0x4f, 0xaf, 0x93, 0xb5, 0x74, 0x9e, 0x21, 0x70, 0x1a, 0xd8, 0xd4, 0x61, 0x61,
-    0xcf, 0xf4, 0xaa, 0x19, 0x8f, 0x5f, 0xa6, 0xc1, 0x5b, 0xb7, 0x6d, 0x65, 0xf4, 0x40, 0xa1, 0x8e,
-    0x8e, 0x60, 0x48, 0x8e, 0x27, 0xc8, 0xb8, 0x12, 0xb5, 0x49, 0x43, 0x21, 0x6c, 0xcb, 0x20, 0xa7,
-    0x59, 0x53, 0x3c, 0xf4, 0xab, 0xe1, 0xbe, 0x7f, 0xaa, 0xe5, 0x2f, 0x36, 0x92, 0x3d, 0xf8, 0xd8,
-    0xf8, 0x85, 0x9e, 0xdc, 0x1d, 0x81, 0x9f, 0xc1, 0x9f, 0xf1, 0x04, 0x9d, 0xe0, 0x8f, 0x9f, 0x76,
-    0x73, 0x51, 0xcd, 0x7b, 0xdb, 0xec, 0xe4, 0x46, 0x78, 0x9b, 0x60, 0x4a, 0x6d, 0x90, 0x25, 0xef,
-    0x53, 0xf9, 0x47, 0x50, 0xfe, 0xa7, 0x53, 0x60, 0xff, 0xb7, 0x70, 0xe1, 0x14, 0xc9, 0x12, 0x82,
-    0xfc, 0xd0, 0x1f, 0xc6, 0xda, 0x41, 0xbd, 0x2e, 0x57, 0x71, 0xad, 0x54, 0xd0, 0xe8, 0x8a, 0x5e,
-    0xa8, 0xa7, 0xf3, 0xa9, 0xc7, 0xc8, 0x64, 0x23, 0x84, 0xa1, 0x25, 0x91, 0x79, 0x68, 0xe3, 0x78,
-    0xd3, 0x39, 0x7c, 0xd2, 0x27, 0x2a, 0x0e, 0xaa, 0x0b, 0x0f, 0xeb, 0xf6, 0x44, 0x8b, 0x4d, 0x36,
-    0x35, 0xe3, 0xea, 0x02, 0x21, 0xd6, 0x73, 0x47, 0x75, 0xef, 0xe9, 0x87, 0x09, 0x23, 0xf0, 0xe4,
-    0x48, 0x9e, 0x70, 0xe9, 0x7d, 0xdc, 0xc8, 0xd0, 0x93, 0xff, 0x64, 0x91, 0x0f, 0x30, 0x1a, 0xc8,
-    0xfc, 0x4c, 0xb4, 0x11, 0xe9, 0xbc, 0xa5, 0x71, 0xcf, 0xa5, 0x35, 0x35, 0x02, 0x03, 0x01, 0x00,
-    0x01, 0x02, 0x82, 0x01, 0x00, 0x04, 0x2b, 0xc4, 0xee, 0xd8, 0x34, 0x96, 0xe8, 0x93, 0x28, 0x4a,
-    0x6d, 0xd9, 0xcd, 0xac, 0x2b, 0x01, 0x29, 0xab, 0xe4, 0x46, 0x5f, 0x38, 0x07, 0xf0, 0xef, 0x04,
-    0xf8, 0x81, 0xff, 0x81, 0x13, 0xd0, 0x01, 0x29, 0x80, 0xe2, 0xb6, 0x80, 0x77, 0x6c, 0x42, 0xcc,
-    0x68, 0xa0, 0x11, 0x26, 0x78, 0x90, 0xe2, 0x7c, 0x8c, 0x06, 0x96, 0x65, 0xd9, 0x9d, 0x37, 0xee,
-    0x88, 0x96, 0x40, 0x2a, 0xad, 0xc5, 0x0a, 0x32, 0x75, 0x26, 0x73, 0x06, 0x1c, 0xef, 0xf3, 0x06,
-    0x1a, 0x0a, 0x3a, 0x9a, 0x05, 0x3b, 0x86, 0xe0, 0xfa, 0x42, 0x1e, 0xc4, 0xb0, 0xe1, 0x05, 0xce,
-    0x19, 0x49, 0x33, 0x39, 0xa7, 0x26, 0x33, 0x16, 0x40, 0x2d, 0x58, 0x3c, 0xdb, 0x66, 0xbf, 0x29,
-    0x41, 0x28, 0x44, 0x89, 0x33, 0x58, 0x74, 0xae, 0x3a, 0xc4, 0x93, 0xbe, 0x5c, 0x59, 0x27, 0x31,
-    0x02, 0x3b, 0xe8, 0x4a, 0xf6, 0x22, 0x4a, 0xd2, 0xc2, 0xce, 0x7b, 0x7a, 0xc1, 0xd6, 0xcd, 0x46,
-    0x01, 0x04, 0xc6, 0xe2, 0xa7, 0xc0, 0x30, 0x30, 0x9f, 0xaf, 0xd4, 0x11, 0x2b, 0x4b, 0xd8, 0xbb,
-    0x0a, 0xa5, 0xe2, 0x2c, 0xd5, 0x0f, 0x88, 0xbe, 0x12, 0x71, 0x31, 0x7d, 0xb3, 0x54, 0xb2, 0x8b,
-    0x46, 0x39, 0x4a, 0x3d, 0xeb, 0x09, 0x0a, 0x7c, 0xfc, 0xbe, 0xce, 0x7e, 0x36, 0xed, 0x76, 0xa0,
-    0xd6, 0x72, 0x83, 0x3f, 0x59, 0x92, 0x2d, 0x34, 0x9f, 0x7f, 0xc1, 0xaa, 0x7f, 0x76, 0x1d, 0x47,
-    0xc2, 0xba, 0xb2, 0xeb, 0xf9, 0xe8, 0xdc, 0xd6, 0x14, 0x38, 0x91, 0xb1, 0x1c, 0x4b, 0xac, 0x8e,
-    0x32, 0x5a, 0xb0, 0x3d, 0xef, 0x9d, 0x74, 0x18, 0xf5, 0xfa, 0x89, 0xd9, 0x81, 0x2f, 0x49, 0x92,
-    0xdc, 0x29, 0xbc, 0xa9, 0x09, 0xee, 0xe1, 0xcb, 0xf3, 0x70, 0xa0, 0x2d, 0xae, 0x5f, 0x84, 0x48,
-    0xff, 0xca, 0x49, 0x43, 0x65, 0x02, 0x81, 0x81, 0x00, 0xe7, 0x77, 0x0b, 0xd8, 0xba, 0xc9, 0x9a,
-    0x0c, 0xd1, 0x17, 0xe8, 0xc1, 0x2c, 0x09, 0xcd, 0x60, 0x3a, 0xd7, 0xf3, 0x4e, 0xca, 0xec, 0x1f,
-    0xeb, 0x9d, 0x55, 0x46, 0x47, 0x5e, 0xce, 0x63, 0x60, 0xf1, 0xdb, 0x7c, 0x61, 0x89, 0x47, 0xaf,
-    0xbb, 0x63, 0x66, 0x71, 0xf2, 0xa1, 0xc6, 0x2c, 0x67, 0x3a, 0xd7, 0x45, 0x95, 0x42, 0xdf, 0xe5,
-    0x3b, 0x78, 0xb3, 0x5d, 0x11, 0x3d, 0x71, 0x30, 0xd5, 0x29, 0xc8, 0x8a, 0x34, 0xee, 0x86, 0x3f,
-    0x93, 0x60, 0x58, 0xf6, 0x88, 0x71, 0x73, 0xa0, 0xa9, 0xca, 0xe4, 0x71, 0xab, 0xe6, 0x15, 0xe4,
-    0x83, 0x54, 0x8f, 0xa0, 0x4a, 0x1d, 0x8d, 0x91, 0xbc, 0x7a, 0x7c, 0xcb, 0xde, 0x78, 0x04, 0x77,
-    0xa3, 0x61, 0xea, 0xc3, 0xee, 0x35, 0x0e, 0xd3, 0x27, 0x21, 0x06, 0x64, 0xf1, 0xb9, 0x3f, 0x6b,
-    0x0f, 0xb3, 0x14, 0x0a, 0x42, 0xa5, 0x97, 0x39, 0x33, 0x02, 0x81, 0x81, 0x00, 0xc6, 0x82, 0x20,
-    0xb4, 0x8a, 0x42, 0x67, 0x51, 0xde, 0x6f, 0xfe, 0x54, 0x40, 0xfc, 0x92, 0xf9, 0xdb, 0x52, 0xb4,
-    0x13, 0x99, 0xbb, 0xcc, 0x91, 0x14, 0xaa, 0xd2, 0x34, 0x89, 0x12, 0x48, 0x4a, 0xca, 0x60, 0xcb,
-    0x37, 0x42, 0x20, 0x3d, 0x7a, 0xd7, 0x31, 0x5c, 0x3f, 0xd1, 0x28, 0x86, 0xee, 0xc5, 0x0b, 0x61,
-    0x7d, 0x9f, 0xbb, 0x72, 0x34, 0x8a, 0x53, 0x00, 0x80, 0xd2, 0x6a, 0xa4, 0x6b, 0x5f, 0x20, 0xcd,
-    0x76, 0xed, 0xbf, 0xcd, 0x9c, 0xcd, 0xc0, 0x79, 0x74, 0x0d, 0xfc, 0xa9, 0xf6, 0x1a, 0xb9, 0x5b,
-    0x72, 0x55, 0x88, 0xd2, 0x90, 0xfd, 0xe1, 0x26, 0xe1, 0xa1, 0x3c, 0x14, 0xea, 0x6d, 0xc1, 0x77,
-    0x09, 0x98, 0xd3, 0x1d, 0xe9, 0x5b, 0xdc, 0x24, 0x87, 0x80, 0x96, 0x57, 0x7d, 0xc7, 0x36, 0x2d,
-    0x50, 0x05, 0x6d, 0x61, 0x74, 0xfc, 0x38, 0x92, 0x6e, 0x51, 0x60, 0xe7, 0xf7, 0x02, 0x81, 0x80,
-    0x69, 0x84, 0x47, 0x8e, 0x41, 0x78, 0x6e, 0x15, 0xb1, 0xac, 0x28, 0x9b, 0x07, 0x2c, 0x60, 0xc7,
-    0xa1, 0x8b, 0x98, 0x8b, 0x2e, 0xce, 0x7d, 0xae, 0xb7, 0x46, 0x8c, 0x87, 0x34, 0x9c, 0xf9, 0x88,
-    0xd4, 0x38, 0xae, 0x76, 0xf8, 0x52, 0x09, 0xb6, 0x6f, 0x15, 0xe0, 0x94, 0x2f, 0x53, 0x5c, 0x22,
-    0xa3, 0x1c, 0x47, 0xc8, 0x47, 0x78, 0x31, 0xd3, 0xee, 0xae, 0x35, 0x9b, 0x0a, 0x5b, 0x73, 0x5b,
-    0x79, 0x74, 0xc6, 0x2c, 0x63, 0x20, 0x28, 0x13, 0x53, 0x34, 0xbb, 0x0e, 0x70, 0x49, 0xb9, 0xd0,
-    0x2d, 0x81, 0xfe, 0x9f, 0xd2, 0x7f, 0xe0, 0x70, 0x4e, 0x38, 0x3b, 0x66, 0x0e, 0x1a, 0xdf, 0x79,
-    0x00, 0x8d, 0xab, 0x92, 0x7b, 0x3b, 0xee, 0x1e, 0x39, 0x21, 0x00, 0xb8, 0xb2, 0xcf, 0x53, 0x4a,
-    0xdf, 0x2f, 0x3f, 0x0d, 0x42, 0xd9, 0xba, 0x40, 0xa9, 0xee, 0x54, 0xcf, 0x15, 0x15, 0xdf, 0x29,
-    0x02, 0x81, 0x80, 0x33, 0xb6, 0x98, 0xb0, 0x8f, 0xc8, 0x26, 0xc4, 0x64, 0x2f, 0x46, 0xd1, 0x4a,
-    0x30, 0xc2, 0x55, 0x46, 0xf6, 0xaf, 0xa4, 0xdf, 0x8a, 0xd6, 0x0b, 0x01, 0x98, 0x52, 0xb4, 0x8e,
-    0xf4, 0xed, 0x52, 0x56, 0x90, 0x8a, 0xc0, 0x35, 0x80, 0xd2, 0xa3, 0x5a, 0xc6, 0x28, 0x23, 0x13,
-    0xe8, 0xfb, 0xe5, 0xdd, 0xfd, 0x4e, 0x03, 0x7d, 0x06, 0x47, 0x05, 0x3a, 0xf7, 0xce, 0x8c, 0xc0,
-    0xc4, 0x39, 0x5b, 0x23, 0x68, 0x17, 0x3e, 0xa1, 0x47, 0x33, 0x58, 0x63, 0x1d, 0x7e, 0x46, 0x66,
-    0x92, 0x68, 0xf0, 0x8d, 0x1b, 0xb6, 0x9f, 0xfd, 0x7a, 0x6c, 0x68, 0x8b, 0x4b, 0x09, 0x67, 0x04,
-    0x2a, 0xf3, 0xc3, 0xf2, 0x9d, 0xd0, 0xd5, 0xf6, 0x33, 0x21, 0x7a, 0xb6, 0x8c, 0x8e, 0x13, 0xa2,
-    0xc3, 0x07, 0xbd, 0xe3, 0x94, 0xd0, 0x8f, 0x25, 0x2a, 0xce, 0x95, 0xbc, 0x53, 0x3c, 0x8a, 0x72,
-    0xb6, 0xcd, 0x17, 0x02, 0x81, 0x80, 0x2e, 0x07, 0x75, 0x1e, 0x89, 0x89, 0xfc, 0x40, 0x35, 0x14,
-    0x48, 0x5f, 0x9a, 0x23, 0x87, 0x2d, 0x32, 0x2d, 0x30, 0x95, 0x4e, 0x0f, 0x5f, 0xb3, 0x46, 0x53,
-    0x90, 0x86, 0x2c, 0x2b, 0xe2, 0x84, 0x5f, 0x76, 0xee, 0x8f, 0x8b, 0xa0, 0xbf, 0x63, 0x02, 0xca,
-    0xaa, 0x5a, 0x43, 0x41, 0xc5, 0x84, 0x55, 0x94, 0x72, 0x52, 0x24, 0xbd, 0x4a, 0xec, 0x9d, 0xcf,
-    0xb8, 0xca, 0x16, 0x64, 0x5d, 0x79, 0xe1, 0xe2, 0xce, 0x92, 0x25, 0xac, 0x31, 0x91, 0x4f, 0x6a,
-    0x8c, 0xfe, 0x5e, 0xff, 0x17, 0xa2, 0x57, 0x53, 0xef, 0x31, 0xa7, 0x7a, 0x4d, 0xff, 0x07, 0xb0,
-    0xab, 0x5b, 0xcd, 0x65, 0x4b, 0xe9, 0x86, 0x1b, 0x95, 0xad, 0x30, 0xde, 0x3e, 0x61, 0x58, 0x05,
-    0xd6, 0xde, 0x58, 0xc2, 0xfa, 0xfb, 0x92, 0x03, 0xa9, 0xf0, 0xeb, 0x73, 0x74, 0xb6, 0xd5, 0x56,
-    0x1d, 0xd3, 0x9d, 0xf5, 0x64, 0xea
+#define CLIENT_KEY_AUTH_DER_LENGTH 1218
+UA_Byte CLIENT_KEY_AUTH_DER_DATA[CLIENT_KEY_AUTH_DER_LENGTH] = {
+  0x30, 0x82, 0x04, 0xbe, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a,
+  0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82,
+  0x04, 0xa8, 0x30, 0x82, 0x04, 0xa4, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01,
+  0x01, 0x00, 0xdb, 0xb4, 0xe3, 0xe6, 0xd3, 0x93, 0x25, 0xe5, 0x7c, 0xe2,
+  0x64, 0x78, 0xa7, 0x88, 0x5b, 0x63, 0x6c, 0x4f, 0x18, 0x10, 0x41, 0x1f,
+  0x4c, 0x35, 0xeb, 0x3c, 0x33, 0x3b, 0x40, 0x18, 0x79, 0x30, 0x99, 0x3c,
+  0x7a, 0x9e, 0xd7, 0xbe, 0x2e, 0x77, 0xba, 0x2b, 0x0f, 0x05, 0xb1, 0xec,
+  0xea, 0x55, 0xbe, 0x4e, 0xce, 0x9a, 0x64, 0xc4, 0xde, 0x5b, 0x25, 0x38,
+  0x45, 0x7f, 0x49, 0xa5, 0xf3, 0x8c, 0x5a, 0xb9, 0xa6, 0xf2, 0x1d, 0xf4,
+  0x83, 0x5d, 0xba, 0x44, 0x6b, 0x13, 0x16, 0xbb, 0xf9, 0x20, 0x7e, 0x97,
+  0xfc, 0xb5, 0xfa, 0x3a, 0x9c, 0x56, 0xc3, 0xaa, 0x27, 0xc1, 0x15, 0xa2,
+  0x80, 0xd5, 0xb4, 0x62, 0xe0, 0x5b, 0xe8, 0x4e, 0x38, 0xde, 0x2a, 0xc8,
+  0x2e, 0x27, 0x2f, 0x3c, 0x0e, 0x6f, 0x31, 0xe0, 0xc7, 0x1b, 0x60, 0x83,
+  0xc1, 0xe8, 0xf3, 0x71, 0x6d, 0x42, 0xc2, 0xf2, 0x57, 0x32, 0xdb, 0xd8,
+  0x2f, 0xf2, 0xdc, 0x8f, 0x6b, 0x5f, 0xb4, 0x1f, 0xac, 0x02, 0xa9, 0x6e,
+  0xa8, 0x71, 0xf8, 0x85, 0x01, 0x85, 0x52, 0x2a, 0x83, 0x18, 0xf8, 0xc4,
+  0x43, 0x46, 0xda, 0xc2, 0xc2, 0xc2, 0xc8, 0xdc, 0x8f, 0x2a, 0xe2, 0xc5,
+  0xe7, 0xe0, 0x5d, 0x9a, 0xdb, 0xb4, 0x48, 0x69, 0x22, 0xd9, 0xdb, 0x71,
+  0x65, 0xcd, 0x57, 0x06, 0xf8, 0x2e, 0x29, 0x5a, 0xee, 0x22, 0x9d, 0xce,
+  0x68, 0xe5, 0xcf, 0x07, 0x27, 0x99, 0xca, 0x80, 0x15, 0xf0, 0xdf, 0x72,
+  0x04, 0xa3, 0x8e, 0xee, 0xae, 0x28, 0x27, 0x4e, 0xb0, 0x08, 0x38, 0x3c,
+  0x55, 0x8e, 0xea, 0x52, 0x36, 0xb2, 0xfc, 0x27, 0x5d, 0xfb, 0x42, 0xb6,
+  0x2e, 0x89, 0xda, 0x86, 0x7d, 0x2a, 0xe2, 0x3f, 0x93, 0x3a, 0x38, 0xda,
+  0xd1, 0xc7, 0x8a, 0x9b, 0xfc, 0x6f, 0x9c, 0x76, 0xd2, 0x00, 0x0c, 0x26,
+  0x72, 0x74, 0x0f, 0x29, 0xfd, 0xeb, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
+  0x82, 0x01, 0x00, 0x04, 0x20, 0xe4, 0x8d, 0x70, 0x59, 0x5a, 0x03, 0x73,
+  0x72, 0xcf, 0x9f, 0x82, 0xca, 0x69, 0xa9, 0x37, 0x1e, 0x4f, 0x5d, 0xf2,
+  0xd3, 0x53, 0x3b, 0xca, 0x25, 0x51, 0xf3, 0x21, 0x93, 0xb4, 0x27, 0x49,
+  0x21, 0xdd, 0x4e, 0x01, 0xd0, 0xd5, 0x8f, 0xb3, 0x64, 0x5e, 0xbe, 0x65,
+  0x27, 0x06, 0x0a, 0x41, 0x6e, 0xba, 0xac, 0x25, 0x0b, 0x9c, 0x00, 0x0b,
+  0x75, 0x80, 0xbc, 0xd1, 0x15, 0xf8, 0xbb, 0x20, 0xf3, 0x4f, 0x23, 0x4a,
+  0x93, 0xcf, 0x2a, 0x22, 0x37, 0x69, 0xe9, 0xac, 0x6a, 0x30, 0xd6, 0xbe,
+  0xfa, 0x3d, 0x29, 0xf0, 0x3f, 0x4c, 0xb3, 0xc6, 0xae, 0x7a, 0x5b, 0xc2,
+  0xfb, 0xd0, 0x3e, 0xf3, 0xca, 0x4d, 0xdb, 0xfc, 0x44, 0x08, 0x06, 0x88,
+  0xb8, 0x45, 0x41, 0xc0, 0x3d, 0xf9, 0x29, 0x76, 0xbe, 0xfa, 0x0e, 0xd6,
+  0x23, 0xf3, 0xaf, 0x5c, 0x6f, 0xbb, 0xb5, 0x5e, 0xf3, 0x6d, 0xd7, 0x02,
+  0x65, 0x40, 0x92, 0xbb, 0x1c, 0xf4, 0x3f, 0x71, 0xfd, 0x07, 0x83, 0xac,
+  0xf5, 0x98, 0xa3, 0x26, 0x79, 0x87, 0xd9, 0xdc, 0x6c, 0x87, 0x11, 0xca,
+  0xb2, 0x23, 0xaa, 0xe6, 0xc3, 0x9f, 0x2b, 0x6b, 0x60, 0x5b, 0x27, 0xbd,
+  0xc5, 0xd4, 0x71, 0x52, 0xca, 0x28, 0xe2, 0xd3, 0xe0, 0xe2, 0xae, 0x96,
+  0x45, 0x67, 0xaa, 0x16, 0x42, 0x46, 0xe6, 0x9e, 0x93, 0x35, 0x30, 0x61,
+  0x5c, 0xdb, 0x9b, 0x4a, 0x3c, 0x8f, 0x82, 0x2c, 0xc0, 0x36, 0x1b, 0x5d,
+  0x76, 0x5e, 0x3c, 0xc2, 0x99, 0x8a, 0x5e, 0x00, 0x84, 0xce, 0xec, 0x90,
+  0xc7, 0xeb, 0xac, 0xd4, 0xe6, 0xb9, 0x7a, 0x3a, 0x6f, 0xad, 0x83, 0xed,
+  0x4e, 0x7a, 0x3b, 0x51, 0xa6, 0x3c, 0xaa, 0xc3, 0x98, 0xac, 0xbb, 0x24,
+  0x8c, 0x47, 0xaf, 0xf6, 0xc0, 0x96, 0xd2, 0x51, 0xc4, 0xa1, 0xef, 0x40,
+  0xf7, 0xbd, 0x31, 0x3d, 0x4c, 0xa6, 0xe1, 0x02, 0x81, 0x81, 0x00, 0xf8,
+  0xb0, 0x9f, 0x21, 0x0e, 0xc4, 0xef, 0x4a, 0x93, 0x5d, 0xc9, 0x5b, 0x6c,
+  0x0d, 0x7e, 0x2d, 0x08, 0x2d, 0xf1, 0xfc, 0x48, 0x7b, 0x25, 0x37, 0xb7,
+  0x84, 0xea, 0x0b, 0x8a, 0xd8, 0x4f, 0xff, 0xd2, 0x05, 0x1f, 0x0d, 0xc7,
+  0x8b, 0x6d, 0x7c, 0x85, 0xa7, 0x41, 0xb9, 0x9b, 0x58, 0xc4, 0xa5, 0xdf,
+  0x9a, 0xc8, 0x3d, 0xef, 0x76, 0x12, 0xfa, 0xe0, 0xda, 0x4e, 0x82, 0xc2,
+  0xa3, 0x1f, 0xc5, 0x58, 0x29, 0x14, 0xaa, 0x00, 0xb8, 0x59, 0x40, 0x8e,
+  0xac, 0x88, 0x0c, 0x1d, 0x8b, 0xa4, 0x0b, 0xb1, 0x16, 0xc8, 0x69, 0xf3,
+  0xaa, 0x55, 0xd9, 0x4b, 0x27, 0x5b, 0x3a, 0xb4, 0xc6, 0x7d, 0xeb, 0x28,
+  0xd6, 0xe7, 0xf0, 0x94, 0x41, 0x17, 0x25, 0x81, 0x6e, 0x44, 0x1c, 0x92,
+  0x0d, 0x18, 0x41, 0xf9, 0xac, 0xac, 0xe9, 0xae, 0xb4, 0xd7, 0xcd, 0x10,
+  0xdd, 0x17, 0xec, 0x93, 0x16, 0x12, 0xa1, 0x02, 0x81, 0x81, 0x00, 0xe2,
+  0x2a, 0x2b, 0xb0, 0xeb, 0xaf, 0xcd, 0x2c, 0xe1, 0x76, 0xd7, 0x62, 0xa5,
+  0x5d, 0x81, 0xd6, 0x88, 0x77, 0xd6, 0x64, 0x4a, 0x5b, 0x98, 0x04, 0xd9,
+  0xbd, 0x3f, 0x07, 0xe0, 0x7d, 0x39, 0x11, 0x38, 0x5e, 0x8d, 0x17, 0x9c,
+  0xd3, 0x1e, 0x5f, 0x6e, 0x0a, 0xbe, 0x41, 0x9c, 0x63, 0xb6, 0xc3, 0xa2,
+  0xde, 0x6c, 0x9b, 0x5f, 0x97, 0x4e, 0x68, 0x4b, 0xf7, 0xe3, 0xca, 0x25,
+  0xf4, 0x84, 0x3c, 0xaa, 0x09, 0x42, 0xe8, 0x40, 0x30, 0x89, 0x53, 0xcb,
+  0xc9, 0x2f, 0xdb, 0xc3, 0xa4, 0xbc, 0x40, 0xa7, 0xf0, 0xb8, 0x0a, 0x6c,
+  0xcc, 0x1c, 0x08, 0x3c, 0x9f, 0x4b, 0x1b, 0xff, 0xe3, 0x6e, 0x8a, 0x5e,
+  0x98, 0x61, 0xc4, 0xd9, 0x6f, 0xa2, 0xb8, 0x83, 0x56, 0x7d, 0x68, 0x03,
+  0x6d, 0xbd, 0xa0, 0xea, 0x1a, 0x53, 0x63, 0x4c, 0x74, 0x9a, 0xe9, 0x4f,
+  0x45, 0x29, 0xae, 0xc6, 0x6a, 0x91, 0x0b, 0x02, 0x81, 0x80, 0x1f, 0xeb,
+  0xab, 0xc1, 0x36, 0x80, 0x18, 0xa6, 0xdd, 0xdb, 0x7f, 0xe8, 0xf8, 0x29,
+  0x93, 0x34, 0x7c, 0x84, 0x49, 0x37, 0x34, 0xa6, 0x79, 0xd4, 0x78, 0xfd,
+  0xda, 0x7c, 0xb8, 0xc9, 0xa3, 0x1b, 0x16, 0xfe, 0x09, 0x4a, 0x5f, 0x7e,
+  0x8a, 0x03, 0x1d, 0xb4, 0xa6, 0x3f, 0x08, 0xad, 0x90, 0x30, 0x2a, 0x4f,
+  0x57, 0xbc, 0x7b, 0x6c, 0x10, 0x6b, 0x9b, 0x48, 0xea, 0x22, 0xe6, 0x90,
+  0xc1, 0x97, 0x37, 0x05, 0xae, 0xdd, 0x53, 0x52, 0x56, 0x42, 0x6f, 0x0d,
+  0xbe, 0x38, 0xaf, 0xe2, 0x28, 0xa0, 0x47, 0x8e, 0xc1, 0x12, 0xb8, 0x6f,
+  0xf8, 0xac, 0xf7, 0x74, 0x89, 0xc5, 0x33, 0x46, 0xf7, 0x0a, 0xa4, 0x27,
+  0x51, 0x86, 0x13, 0xc1, 0x77, 0x13, 0x1d, 0x55, 0xe5, 0xf0, 0x34, 0xde,
+  0xf1, 0x6a, 0x26, 0x7d, 0xff, 0x83, 0xcf, 0x24, 0xef, 0x3e, 0x27, 0x17,
+  0xf9, 0xe6, 0x27, 0xcb, 0x01, 0x81, 0x02, 0x81, 0x81, 0x00, 0xb8, 0x19,
+  0xe3, 0xde, 0xec, 0xbb, 0xfa, 0xa4, 0xa2, 0x13, 0xff, 0x58, 0x49, 0x8c,
+  0x48, 0x78, 0xbe, 0x35, 0xee, 0xcb, 0x4c, 0xcc, 0x2a, 0x7f, 0x28, 0x4f,
+  0xa8, 0xd3, 0x5c, 0xa6, 0x12, 0xa2, 0x35, 0xe4, 0xa1, 0xad, 0xaa, 0xf7,
+  0x20, 0x2e, 0x46, 0x81, 0x70, 0x46, 0x30, 0x6b, 0xeb, 0x06, 0x6d, 0xb9,
+  0xe9, 0x66, 0xc0, 0xf5, 0x85, 0xd9, 0xd8, 0x9d, 0x3d, 0x4b, 0xfc, 0x81,
+  0x82, 0x73, 0x6f, 0x66, 0x82, 0x94, 0x54, 0x4c, 0x2e, 0x3d, 0x8c, 0x11,
+  0x85, 0x67, 0xbb, 0x66, 0x89, 0xe7, 0x87, 0xcd, 0xa7, 0xc2, 0xb4, 0xb5,
+  0xa1, 0xcc, 0x02, 0xad, 0x18, 0x92, 0xfe, 0x45, 0xc0, 0x61, 0xda, 0x86,
+  0xe8, 0x6f, 0x39, 0x20, 0x6a, 0xb1, 0x10, 0x18, 0x83, 0x94, 0xfb, 0xd5,
+  0x85, 0x1b, 0x4b, 0xf5, 0x8a, 0x13, 0xb6, 0xd4, 0xe4, 0x95, 0x2e, 0xf5,
+  0xf9, 0xec, 0x4f, 0x8f, 0xc7, 0xe9, 0x02, 0x81, 0x81, 0x00, 0x93, 0xc0,
+  0x5d, 0x4e, 0x69, 0x53, 0x1f, 0xd8, 0x8d, 0x5f, 0xeb, 0xa3, 0x3e, 0xdc,
+  0x56, 0x9f, 0x98, 0x98, 0xb4, 0xdd, 0x36, 0x37, 0xea, 0xfc, 0xaa, 0xbd,
+  0x88, 0xce, 0x23, 0x37, 0x44, 0xf1, 0x5e, 0xb1, 0x02, 0xf2, 0xed, 0xe6,
+  0xcb, 0x8f, 0x17, 0x23, 0xad, 0x49, 0x3e, 0xb2, 0x28, 0x56, 0xbc, 0x08,
+  0x93, 0x89, 0xe7, 0x1e, 0xf2, 0xb6, 0xf7, 0x61, 0x94, 0x48, 0xa0, 0x2d,
+  0x8c, 0x34, 0xbb, 0xbc, 0x9f, 0x35, 0xa9, 0x3d, 0xc6, 0xd1, 0x8a, 0xcc,
+  0x7b, 0xd4, 0x96, 0x4a, 0x1c, 0x39, 0xd5, 0x45, 0x0b, 0xb3, 0xc3, 0xbc,
+  0xa3, 0xc5, 0x36, 0xce, 0x2f, 0x79, 0x3a, 0x65, 0xf3, 0x5b, 0x89, 0x18,
+  0x29, 0xc3, 0xd0, 0x7c, 0xcf, 0x9e, 0x4b, 0x2e, 0x0a, 0x62, 0x00, 0x4a,
+  0x3c, 0xf1, 0x3e, 0xe1, 0xb8, 0x71, 0x37, 0x87, 0x6c, 0xc2, 0x14, 0x63,
+  0x23, 0x24, 0xd7, 0x6e, 0x8b, 0x3c
 };
 
 _UA_END_DECLS

From b74270be32aaf63bf4512a8dd94ffb11bcb23196 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 18:34:10 +0100
Subject: [PATCH 1286/1963] refactor(server): Simplify
 readValueAttributeComplete

---
 src/server/ua_services_attribute.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 25950b18ba2..d8fb4636028 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -252,18 +252,18 @@ readValueAttributeComplete(UA_Server *server, UA_Session *session,
             //TODO change old structure to value backend
             break;
         case UA_VALUEBACKENDTYPE_EXTERNAL:
-            if(vn->valueBackend.backend.external.callback.notificationRead){
-                retval = vn->valueBackend.backend.external.callback.
-                    notificationRead(server,
-                                     session ? &session->sessionId : NULL,
-                                     session ? session->sessionHandle : NULL,
-                                     &vn->head.nodeId, vn->head.context, rangeptr);
-            } else {
+            if(!vn->valueBackend.backend.external.callback.notificationRead) {
                 retval = UA_STATUSCODE_BADNOTREADABLE;
-            }
-            if(retval != UA_STATUSCODE_GOOD){
                 break;
             }
+            retval = vn->valueBackend.backend.external.callback.
+                notificationRead(server,
+                                 session ? &session->sessionId : NULL,
+                                 session ? session->sessionHandle : NULL,
+                                 &vn->head.nodeId, vn->head.context, rangeptr);
+            if(retval != UA_STATUSCODE_GOOD)
+                break;
+
             /* Set the result */
             if(rangeptr)
                 retval = UA_DataValue_copyVariantRange(

From 05171944cd2ff66a877d764921b8a855848c3186 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 18:34:41 +0100
Subject: [PATCH 1287/1963] fix(server): Always return the current time as
 ServerTimestamp (CTT fix)

---
 src/server/ua_services_attribute.c | 42 ++++++++----------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index d8fb4636028..f9cdb4b5dab 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -282,8 +282,9 @@ readValueAttributeComplete(UA_Server *server, UA_Session *session,
             break;
     }
 
-    /* Static nodes always have a source timestamp of "now" */
-    if(vn->head.nodeClass != UA_NODECLASS_VARIABLE || !vn->isDynamic) {
+    /* If not defined return a source timestamp of "now".
+     * Static nodes always have the current time as source-time. */
+    if(!v->hasSourceTimestamp) {
         v->sourceTimestamp = UA_DateTime_now();
         v->hasSourceTimestamp = true;
     }
@@ -606,17 +607,12 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
         v->status = retval;
     }
 
-    /* Static VariableNodes, VariableTypes and non-value attributes don't store
-     * a server-timestamp. Dynamic variables receive the timestamp during the
-     * Write service or from the external datasource. If the external datasource
-     * does not set a timestamp one is created here. */
+    /* Always use the current time as the server-timestamp */
     if(timestampsToReturn == UA_TIMESTAMPSTORETURN_SERVER ||
        timestampsToReturn == UA_TIMESTAMPSTORETURN_BOTH) {
-        if(!v->hasServerTimestamp) {
-            v->serverTimestamp = UA_DateTime_now();
-            v->hasServerTimestamp = true;
-            v->hasServerPicoseconds = false;
-        }
+        v->serverTimestamp = UA_DateTime_now();
+        v->hasServerTimestamp = true;
+        v->hasServerPicoseconds = false;
     } else {
         v->hasServerTimestamp = false;
         v->hasServerPicoseconds = false;
@@ -1460,29 +1456,13 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
         }
     }
 
-    /* Set the server timestamp in the Write service if the target VariableNode
-     * is "dynamic". For static nodes we generate a current server timestamp
-     * when the node is read. */
-    if(node->head.nodeClass == UA_NODECLASS_VARIABLE && node->isDynamic) {
-        adjustedValue.serverTimestamp = UA_DateTime_now();
-        adjustedValue.hasServerTimestamp = true;
-
-        /* If no source timestamp is defined create one here.
-         * It should be created as close to the source as possible. */
-        if(!adjustedValue.hasSourceTimestamp) {
-            adjustedValue.sourceTimestamp = adjustedValue.serverTimestamp;
-            adjustedValue.hasSourceTimestamp = true;
-            adjustedValue.hasSourcePicoseconds = false;
-        }
-    } else {
-        adjustedValue.hasServerTimestamp = false;
+    /* If no source timestamp is defined create one here.
+     * It should be created as close to the source as possible. */
+    if(node->head.nodeClass == UA_NODECLASS_VARIABLE && !node->isDynamic) {
         adjustedValue.hasSourceTimestamp = false;
+        adjustedValue.hasSourcePicoseconds = false;
     }
 
-    /* Picoseconds server timestamps are not supported in the standard code-path
-     * (only via a datasource callback configured for a variable node) */
-    adjustedValue.hasServerPicoseconds = false;
-
     /* Call into the different value storage backends.
      *
      * TODO: Clean up this mess with duplicated possibilities for external

From f22608ba66e52165a68246d67c9591d0569d6c98 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 18:35:31 +0100
Subject: [PATCH 1288/1963] fix(server): Don't create default values of
 abstract type ExtensionObject

---
 src/server/ua_services_nodemanagement.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index d0003d7106d..0f4f40f2e1f 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -220,6 +220,14 @@ setDefaultValue(UA_Server *server, const UA_VariableNode *node) {
             if(UA_NodeId_equal(&UA_TYPES[UA_TYPES_VARIANT].typeId,
                                &typeCandidates[i].nodeId))
                 continue;
+
+            /* Skip ExtensionObject. Even though we can encode the type it is
+             * abstract and nodes should not contain them as value. */
+            if(UA_NodeId_equal(&UA_TYPES[UA_TYPES_EXTENSIONOBJECT].typeId,
+                               &typeCandidates[i].nodeId))
+                continue;
+
+            /* Get the type encoding information */
             type = UA_Server_findDataType(server, &typeCandidates[i].nodeId);
             if(type)
                 break;

From 1fd76c5f38739eec912748ec4636403d1a62beae Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 18:36:20 +0100
Subject: [PATCH 1289/1963] refactor(server): Simplify logic for default value
 generation

---
 src/server/ua_services_nodemanagement.c | 94 +++++++++++++------------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 0f4f40f2e1f..756f43092d9 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -317,7 +317,10 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
         return UA_STATUSCODE_BADTYPEMISMATCH;
     }
 
-    /* Typecheck the value */
+    /* Typecheck the value. Less strict for NS0 -- we adjust nodes after loading
+     * the generated definitions. */
+    if(server->bootstrapNS0)
+        return UA_STATUSCODE_GOOD;
 
     /* The value might come from a datasource, so we perform a
      * regular read. */
@@ -327,57 +330,58 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    /* Only BaseDataType (Variant) can have empty values. Create default content
-     * otherwise that matches the constraints. */
-    if(!value.hasValue || !value.value.type) {
-        if(!UA_NodeId_equal(&node->dataType, &UA_TYPES[UA_TYPES_VARIANT].typeId)) {
-            /* Warn if that is configured */
-            if(!server->bootstrapNS0 &&
-               server->config.allowEmptyVariables != UA_RULEHANDLING_ACCEPT)
-                logAddNode(&server->config.logger, session, &node->head.nodeId,
-                           "The value is empty. But this is only allowed for BaseDataType. "
-                           "Create a matching default value.");
-
-            /* Abort if that is configured */
-            if(server->config.allowEmptyVariables == UA_RULEHANDLING_ABORT)
-                retval = UA_STATUSCODE_BADTYPEMISMATCH;
-
-            /* Try to generate a default value if that is configured */
-            if(server->config.allowEmptyVariables == UA_RULEHANDLING_DEFAULT) {
-                retval = setDefaultValue(server, node);
-                if(retval != UA_STATUSCODE_GOOD) {
-                    UA_LOG_NODEID_INFO(&node->head.nodeId,
-                    UA_LOG_INFO_SESSION(&server->config.logger, session,
-                                        "AddNode (%.*s): Could not create a default value "
-                                        "with StatusCode %s", (int)nodeIdStr.length,
-                                        nodeIdStr.data, UA_StatusCode_name(retval)));
-                }
-
-                /* Reread the current value for compat tests below */
-                UA_DataValue_clear(&value);
-                retval = readValueAttribute(server, session, node, &value);
-            }
+    /* We have a value. Write it back to perform checks and adjustments. */
+    const char *reason;
+    if(node->valueSource == UA_VALUESOURCE_DATA && value.hasValue) {
+        if(!compatibleValue(server, session, &node->dataType, node->valueRank,
+                            node->arrayDimensionsSize, node->arrayDimensions,
+                            &value.value, NULL, &reason)) {
+            retval = writeAttribute(server, session, &node->head.nodeId,
+                                    UA_ATTRIBUTEID_VALUE, &value.value,
+                                    &UA_TYPES[UA_TYPES_VARIANT]);
         }
+        UA_DataValue_clear(&value);
+        return retval;
+    }
 
-        if(retval != UA_STATUSCODE_GOOD) {
-            UA_DataValue_clear(&value);
-            return retval;
+    /* Only BaseDataType (Variant) can have empty values */
+    if(!value.hasValue &&
+       !UA_NodeId_equal(&node->dataType, &UA_TYPES[UA_TYPES_VARIANT].typeId)) {
+        /* Warn if that is configured */
+        if(server->config.allowEmptyVariables != UA_RULEHANDLING_ACCEPT)
+            logAddNode(&server->config.logger, session, &node->head.nodeId,
+                       "The value is empty. But this is only allowed for BaseDataType. "
+                       "Create a matching default value.");
+
+        /* Abort if that is configured */
+        if(server->config.allowEmptyVariables == UA_RULEHANDLING_ABORT)
+            retval = UA_STATUSCODE_BADTYPEMISMATCH;
+
+        /* Try to generate and write a default value */
+        if(server->config.allowEmptyVariables == UA_RULEHANDLING_DEFAULT) {
+            retval = setDefaultValue(server, node);
+            if(retval != UA_STATUSCODE_GOOD) {
+                UA_LOG_NODEID_INFO(&node->head.nodeId,
+                   UA_LOG_INFO_SESSION(&server->config.logger, session,
+                                       "AddNode (%.*s): Could not create a default value "
+                                       "with StatusCode %s", (int)nodeIdStr.length,
+                                       nodeIdStr.data, UA_StatusCode_name(retval)));
+            }
         }
+        return retval;
     }
 
-    /* Perform the value typecheck. If this fails, write the current value
-     * again. The write-service tries to convert to the correct type... */
-    const char *reason;
-    if(!compatibleValue(server, session, &node->dataType, node->valueRank,
+    /* Type-check the value */
+    if(retval == UA_STATUSCODE_GOOD &&
+       !compatibleValue(server, session, &node->dataType, node->valueRank,
                         node->arrayDimensionsSize, node->arrayDimensions,
                         &value.value, NULL, &reason)) {
-        retval = writeAttribute(server, session, &node->head.nodeId,
-                                UA_ATTRIBUTEID_VALUE, &value.value,
-                                &UA_TYPES[UA_TYPES_VARIANT]);
-        if(retval != UA_STATUSCODE_GOOD) {
-            logAddNode(&server->config.logger, session, &node->head.nodeId,
-                       "The value is incompatible with the variable definition");
-        }
+        UA_LOG_NODEID_INFO(&node->head.nodeId,
+           UA_LOG_INFO_SESSION(&server->config.logger, session,
+                               "AddNode (%.*s): The VariableNode value has "
+                               "failed the type check with reason %s. ",
+                               (int)nodeIdStr.length, nodeIdStr.data, reason));
+        retval = UA_STATUSCODE_BADINTERNALERROR;
     }
 
     UA_DataValue_clear(&value);

From 46b94266f1c6f48ae6ff695285d9034e86f9e256 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 21:25:22 +0100
Subject: [PATCH 1290/1963] fix(plugins): Create ServerTimestamp if none
 defined in the historical data plugin

---
 .../ua_history_data_backend_memory.c           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/plugins/historydata/ua_history_data_backend_memory.c b/plugins/historydata/ua_history_data_backend_memory.c
index 3e99794ec33..dbd6d4169e9 100644
--- a/plugins/historydata/ua_history_data_backend_memory.c
+++ b/plugins/historydata/ua_history_data_backend_memory.c
@@ -217,6 +217,10 @@ serverSetHistoryData_backend_memory(UA_Server *server,
     UA_DataValueMemoryStoreItem *newItem = (UA_DataValueMemoryStoreItem *)UA_calloc(1, sizeof(UA_DataValueMemoryStoreItem));
     newItem->timestamp = timestamp;
     UA_DataValue_copy(value, &newItem->value);
+    if(!newItem->value.hasServerTimestamp) {
+        newItem->value.serverTimestamp = timestamp;
+        newItem->value.hasServerTimestamp = true;
+    }
     size_t index = getDateTimeMatch_backend_memory(server,
                                                    context,
                                                    NULL,
@@ -426,6 +430,11 @@ insertDataValue_backend_memory(UA_Server *server,
     UA_DataValueMemoryStoreItem *newItem = (UA_DataValueMemoryStoreItem *)UA_calloc(1, sizeof(UA_DataValueMemoryStoreItem));
     newItem->timestamp = timestamp;
     UA_DataValue_copy(value, &newItem->value);
+    if(!newItem->value.hasServerTimestamp) {
+        newItem->value.serverTimestamp = timestamp;
+        newItem->value.hasServerTimestamp = true;
+    }
+
     if (item->storeEnd > 0 && index < item->storeEnd) {
         memmove(&item->dataStore[index+1], &item->dataStore[index], sizeof(UA_DataValueMemoryStoreItem*) * (item->storeEnd - index));
     }
@@ -458,6 +467,10 @@ replaceDataValue_backend_memory(UA_Server *server,
         return UA_STATUSCODE_BADNOENTRYEXISTS;
     UA_DataValue_clear(&item->dataStore[index]->value);
     UA_DataValue_copy(value, &item->dataStore[index]->value);
+    if(!item->dataStore[index]->value.hasServerTimestamp) {
+        item->dataStore[index]->value.serverTimestamp = timestamp;
+        item->dataStore[index]->value.hasServerTimestamp = true;
+    }
     return UA_STATUSCODE_GOOD;
 }
 
@@ -670,6 +683,11 @@ serverSetHistoryData_backend_memory_Circular(UA_Server *server,
     UA_DataValueMemoryStoreItem *newItem = (UA_DataValueMemoryStoreItem *)UA_calloc(1, sizeof(UA_DataValueMemoryStoreItem));
     newItem->timestamp = timestamp;
     UA_DataValue_copy(value, &newItem->value);
+    if(!newItem->value.hasServerTimestamp) {
+        newItem->value.serverTimestamp = timestamp;
+        newItem->value.hasServerTimestamp = true;
+    }
+
 
     /* This implementation does NOT sort values by timestamp */
 

From 0ae0b2c7befacb19752f9445524ea6043ebe3f28 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 22:14:01 +0100
Subject: [PATCH 1291/1963] fix(tools): Fix a C++ compliance issue in ua2json.c

---
 tools/ua2json/ua2json.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ua2json/ua2json.c b/tools/ua2json/ua2json.c
index 50ca2dd5747..39954dc6a9f 100644
--- a/tools/ua2json/ua2json.c
+++ b/tools/ua2json/ua2json.c
@@ -44,8 +44,8 @@ decode(const UA_ByteString *buf, UA_ByteString *out, const UA_DataType *type) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     /* Decode JSON */
-    static const UA_DecodeJsonOptions opt;
-    UA_StatusCode retval = UA_decodeJson(buf, data, type, &opt);
+    static const UA_DecodeJsonOptions options;
+    UA_StatusCode retval = UA_decodeJson(buf, data, type, &options);
     if(retval != UA_STATUSCODE_GOOD) {
         free(data);
         return retval;

From fe8ce532d364574844031bf8a6c17fb6615947cc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Nov 2023 07:46:33 +0100
Subject: [PATCH 1292/1963] fix(server): Use the publish callback for sampling
 of MonitoredItems where SamplingInterval == PublishingInterval

---
 src/server/ua_subscription.c | 36 ++++++++++++++++--------------------
 src/server/ua_subscription.h |  3 ---
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 515827678d7..cf29c591dbd 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -647,24 +647,6 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
     }
 }
 
-void
-UA_Subscription_sampleAndPublish(UA_Server *server, UA_Subscription *sub) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
-                              "Sample and Publish Callback");
-    UA_assert(sub);
-
-    /* Sample the MonitoredItems with sampling interval <0 (which implies
-     * sampling in the same interval as the subscription) */
-    UA_MonitoredItem *mon;
-    LIST_FOREACH(mon, &sub->samplingMonitoredItems, sampling.subscriptionSampling) {
-        monitoredItem_sampleCallback(server, mon);
-    }
-
-    /* Publish the queued notifications */
-    UA_Subscription_publish(server, sub);
-}
-
 void
 UA_Subscription_resendData(UA_Server *server, UA_Subscription *sub) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
@@ -715,9 +697,23 @@ UA_Session_ensurePublishQueueSpace(UA_Server* server, UA_Session* session) {
 }
 
 static void
-repeatedPublishCallback(UA_Server *server, UA_Subscription *sub) {
+sampleAndPublishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_LOCK(&server->serviceMutex);
+    UA_assert(sub);
+
+    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+                              "Sample and Publish Callback");
+
+    /* Sample the MonitoredItems with sampling interval <0 (which implies
+     * sampling in the same interval as the subscription) */
+    UA_MonitoredItem *mon;
+    LIST_FOREACH(mon, &sub->samplingMonitoredItems, sampling.subscriptionSampling) {
+        monitoredItem_sampleCallback(server, mon);
+    }
+
+    /* Publish the queued notifications */
     UA_Subscription_publish(server, sub);
+
     UA_UNLOCK(&server->serviceMutex);
 }
 
@@ -734,7 +730,7 @@ Subscription_setState(UA_Server *server, UA_Subscription *sub,
         }
     } else if(sub->publishCallbackId == 0) {
         UA_StatusCode res =
-            addRepeatedCallback(server, (UA_ServerCallback)repeatedPublishCallback,
+            addRepeatedCallback(server, (UA_ServerCallback)sampleAndPublishCallback,
                                 sub, sub->publishingInterval, &sub->publishCallbackId);
         if(res != UA_STATUSCODE_GOOD) {
             sub->state = UA_SUBSCRIPTIONSTATE_STOPPED;
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index eb756045fa7..ff62df88d84 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -329,9 +329,6 @@ UA_MonitoredItem *
 UA_Subscription_getMonitoredItem(UA_Subscription *sub,
                                  UA_UInt32 monitoredItemId);
 
-void
-UA_Subscription_sampleAndPublish(UA_Server *server, UA_Subscription *sub);
-
 void
 UA_Subscription_publish(UA_Server *server, UA_Subscription *sub);
 

From 54a3840a40d7498197ebaf5cd464bef00d9b52e6 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 8 Nov 2023 14:23:51 +0100
Subject: [PATCH 1293/1963] fix(server): Implemented new behavior that the
 server will not start if no userTokenPolcies are defined.

---
 src/server/ua_server.c           | 14 ++++++++++++++
 src/server/ua_services_session.c |  3 +--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 0ee96a0da39..3ebf307066d 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -712,6 +712,20 @@ UA_Server_run_startup(UA_Server *server) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Check if UserIdentityTokens are defined */
+    bool hasUserIdentityTokens = false;
+    for(size_t i = 0; i < config->endpointsSize; i++) {
+        if(config->endpoints[i].userIdentityTokensSize > 0) {
+            hasUserIdentityTokens = true;
+            break;
+        }
+    }
+    if(config->accessControl.userTokenPoliciesSize == 0 && hasUserIdentityTokens == false) {
+        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
+                       "The server has no userIdentificationPolicies defined.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     /* Start the EventLoop if not already started */
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_EventLoop *el = config->eventLoop;
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 1b3e40edd41..c2145f3022d 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -460,12 +460,11 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
         }
 
         /* Match the UserTokenType */
-        UA_String noneuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
         const UA_DataType *tokenDataType = identityToken->content.decoded.type;
         for(size_t j = 0; j < identPoliciesSize ; j++) {
             const UA_UserTokenPolicy *pol = &identPolicies[j];
 
-            if(!UA_String_equal(&desc->securityPolicyUri, &noneuri) && !UA_String_equal(&desc->securityPolicyUri, &pol->securityPolicyUri))
+            if(!UA_String_equal(&desc->securityPolicyUri, &pol->securityPolicyUri))
                 continue;
 
             /* Part 4, Section 5.6.3.2, Table 17: A NULL or empty

From ea6632af333acc9a58c6ccd2752a6d2de499eb13 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Nov 2023 23:25:26 +0100
Subject: [PATCH 1294/1963] refactor(server): Demote the creation of a default
 variable value to a debug message

---
 src/server/ua_services_nodemanagement.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 756f43092d9..319ea488f3a 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -349,9 +349,12 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
        !UA_NodeId_equal(&node->dataType, &UA_TYPES[UA_TYPES_VARIANT].typeId)) {
         /* Warn if that is configured */
         if(server->config.allowEmptyVariables != UA_RULEHANDLING_ACCEPT)
-            logAddNode(&server->config.logger, session, &node->head.nodeId,
-                       "The value is empty. But this is only allowed for BaseDataType. "
-                       "Create a matching default value.");
+            UA_LOG_NODEID_DEBUG(&node->head.nodeId,
+               UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                                    "AddNode (%.*s): The value is empty. "
+                                    "But this is only allowed for BaseDataType. "
+                                    "Create a matching default value.",
+                                    (int)nodeIdStr.length, nodeIdStr.data));
 
         /* Abort if that is configured */
         if(server->config.allowEmptyVariables == UA_RULEHANDLING_ABORT)

From f0ac67a6d1d2c328a90bb03be5f146e2499b4c93 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Nov 2023 07:04:12 +0100
Subject: [PATCH 1295/1963] fix(tools): Remove a C++ keyword collision in
 ua2json.c

---
 tools/ua2json/ua2json.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/ua2json/ua2json.c b/tools/ua2json/ua2json.c
index 39954dc6a9f..4e6211f4b52 100644
--- a/tools/ua2json/ua2json.c
+++ b/tools/ua2json/ua2json.c
@@ -36,6 +36,8 @@ encode(const UA_ByteString *buf, UA_ByteString *out, const UA_DataType *type) {
     return UA_STATUSCODE_GOOD;
 }
 
+static const UA_DecodeJsonOptions decode_options = {0};
+
 static UA_StatusCode
 decode(const UA_ByteString *buf, UA_ByteString *out, const UA_DataType *type) {
     /* Allocate memory for the type */
@@ -44,8 +46,7 @@ decode(const UA_ByteString *buf, UA_ByteString *out, const UA_DataType *type) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     /* Decode JSON */
-    static const UA_DecodeJsonOptions options;
-    UA_StatusCode retval = UA_decodeJson(buf, data, type, &options);
+    UA_StatusCode retval = UA_decodeJson(buf, data, type, &decode_options);
     if(retval != UA_STATUSCODE_GOOD) {
         free(data);
         return retval;

From 0c0497177dc3dfc4ce72a116fd52d8e1a4b6915f Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Tue, 7 Nov 2023 09:25:58 +0100
Subject: [PATCH 1296/1963] Fix architecture independent amalgamation (#6110)

- Don't set an architecture define in config.h.in when amalgamating
- Disable eventloop_posix_eth if __linux__ is not defined
---
 CMakeLists.txt             | 15 +++++++++------
 arch/eventloop_posix_eth.c |  5 +++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3e29c5f579..c5c39a30b35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,12 +75,14 @@ if("${UA_ARCHITECTURE}" STREQUAL "")
     endif(UNIX)
 endif()
 
-message(STATUS "The selected architecture is: ${UA_ARCHITECTURE}")
+if (NOT UA_ENABLE_AMALGAMATION OR (UA_ENABLE_AMALGAMATION AND NOT UA_AMALGAMATION_MULTIARCH))
+    message(STATUS "The selected architecture is: ${UA_ARCHITECTURE}")
 
-if("${UA_ARCHITECTURE}" STREQUAL "posix")
-    set(UA_ARCHITECTURE_POSIX 1)
-elseif("${UA_ARCHITECTURE}" STREQUAL "win32")
-    set(UA_ARCHITECTURE_WIN32 1)
+    if("${UA_ARCHITECTURE}" STREQUAL "posix")
+        set(UA_ARCHITECTURE_POSIX 1)
+    elseif("${UA_ARCHITECTURE}" STREQUAL "win32")
+        set(UA_ARCHITECTURE_WIN32 1)
+    endif()
 endif()
 
 #################
@@ -94,6 +96,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 option(UA_ENABLE_AMALGAMATION "Concatenate the library to a single file open62541.h/.c" OFF)
+option(UA_AMALGAMATION_MULTIARCH "Create an architecture-independent amalgamation if UA_ENABLE_AMALGAMATION is ON" OFF)
 option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
 set(UA_LOGLEVEL 300 CACHE STRING "Minimal level at which logs shall be reported (100=TRACE, 200=DEBUG, 300=INFO, 400=WARNING, 500=ERROR, 600=FATAL)")
 option(UA_ENABLE_DIAGNOSTICS "Enable diagnostics information exposed by the server" ON)
@@ -969,7 +972,7 @@ if(NOT "${UA_ARCHITECTURE}" STREQUAL "none")
          ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_udp.c
          ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_interrupt.c)
 
-    if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+     if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR UA_ENABLE_AMALGAMATION)
         list(APPEND architecture_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
     endif()
 
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 118151a1659..c04a72fb844 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -11,7 +11,7 @@
 #include "eventloop_posix.h"
 #include "eventloop_common.h"
 
-#ifdef UA_ARCHITECTURE_POSIX
+#if defined(UA_ARCHITECTURE_POSIX) && defined(__linux__)
 
 #include <arpa/inet.h> /* htons */
 #include <net/ethernet.h> /* ETH_P_*/
@@ -930,4 +930,5 @@ UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName) {
     return &cm->cm;
 }
 
-#endif /* defined(UA_ARCHITECTURE_POSIX) */
+#endif /* defined(UA_ARCHITECTURE_POSIX) && defined(__linux__) */
+

From 24495b44534024e3e8e971066ff42a6fd1250982 Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Thu, 9 Nov 2023 12:54:22 +0100
Subject: [PATCH 1297/1963] Fix amalgamation order for Mac OS

arch/posix/ua_architecture.h must be included before open62541_queue.h
because it may undef some of its defines.
---
 CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5c39a30b35..3312eecd62c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -784,6 +784,7 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_SOURCE_DIR}/include/open62541/client_highlevel_async.h)
 
 # Main Library
+
 set(lib_headers ${PROJECT_SOURCE_DIR}/deps/open62541_queue.h
                 ${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
                 ${PROJECT_SOURCE_DIR}/deps/libc_time.h
@@ -869,6 +870,10 @@ if(UA_GENERATED_NAMESPACE_ZERO)
     list(APPEND lib_sources ${PROJECT_BINARY_DIR}/src_generated/open62541/namespace0_generated.c)
 endif()
 
+if (NOT "${UA_ARCHITECTURE}" STREQUAL "none")
+    list(PREPEND lib_headers ${PROJECT_SOURCE_DIR}/arch/posix/ua_architecture.h)
+endif()
+
 if(UA_ENABLE_PARSING)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types_lex.c)
 endif()
@@ -954,7 +959,6 @@ set(architecture_sources)
 
 if(NOT "${UA_ARCHITECTURE}" STREQUAL "none")
     list(APPEND architecture_headers
-         ${PROJECT_SOURCE_DIR}/arch/posix/ua_architecture.h
          ${PROJECT_SOURCE_DIR}/arch/win32/ua_architecture.h
          ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.h
          ${PROJECT_SOURCE_DIR}/arch/eventloop_common.h

From 34ad2483ef9c2809d459bbc61d3d3fbce308fe13 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Nov 2023 23:00:44 +0100
Subject: [PATCH 1298/1963] feat(server): Use an encrypted SecureChannel for
 registering at a Discovery Server

---
 src/server/ua_discovery.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
index 71e2577a750..69957343b1c 100644
--- a/src/server/ua_discovery.c
+++ b/src/server/ua_discovery.c
@@ -459,6 +459,11 @@ UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister
     cc->stateCallback = discoveryClientStateCallback;
     cc->clientContext = ar;
 
+    /* Use encryption by default */
+#ifdef UA_ENABLE_ENCRYPTION
+    cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+#endif
+
     /* Open only a SecureChannel */
     cc->noSession = true;
 

From 3c3f2c1be76ab738f34c75b2414e93a32bbb2d0d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Nov 2023 23:01:19 +0100
Subject: [PATCH 1299/1963] feat(examples): Configure certificate for the
 discovery client in server_ctt

---
 examples/server_ctt.c | 68 +++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index a5a4d70040c..15adc808bcc 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -28,6 +28,12 @@
  * corresponding CTT configuration is available at
  * https://github.com/open62541/open62541-ctt */
 
+/* Global variables also used by the discovery client */
+static UA_ByteString certificate;
+#ifdef UA_ENABLE_ENCRYPTION
+static UA_ByteString privateKey;
+#endif
+
 static const size_t usernamePasswordsSize = 2;
 static UA_UsernamePasswordLogin usernamePasswords[2] = {
     {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
@@ -876,6 +882,13 @@ notifyState(UA_Server *server, UA_LifecycleState state) {
         UA_ClientConfig cc;
         memset(&cc, 0, sizeof(UA_ClientConfig));
         UA_ClientConfig_setDefault(&cc);
+#ifdef UA_ENABLE_ENCRYPTION
+        UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
+        UA_String_clear(&cc.clientDescription.applicationUri);
+        UA_ServerConfig *sc = UA_Server_getConfig(server);
+        UA_String_copy(&sc->applicationDescription.applicationUri,
+                       &cc.clientDescription.applicationUri);
+#endif
         UA_Server_registerDiscovery(server, &cc,
                                     UA_STRING("opc.tcp://localhost:4840"),
                                     UA_STRING_NULL);
@@ -885,6 +898,13 @@ notifyState(UA_Server *server, UA_LifecycleState state) {
         UA_ClientConfig cc;
         memset(&cc, 0, sizeof(UA_ClientConfig));
         UA_ClientConfig_setDefault(&cc);
+#ifdef UA_ENABLE_ENCRYPTION
+        UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
+        UA_String_clear(&cc.clientDescription.applicationUri);
+        UA_ServerConfig *sc = UA_Server_getConfig(server);
+        UA_String_copy(&sc->applicationDescription.applicationUri,
+                       &cc.clientDescription.applicationUri);
+#endif
         UA_Server_deregisterDiscovery(server, &cc,
                                       UA_STRING("opc.tcp://localhost:4840"));
         hasRegistered = false;
@@ -905,47 +925,33 @@ enableNoneSecurityPolicy(UA_ServerConfig *config) {
 }
 
 static void
-enableBasic128SecurityPolicy(UA_ServerConfig *config,
-                             const UA_ByteString *certificate,
-                             const UA_ByteString *privateKey) {
-    /* Populate the SecurityPolicies */
-    UA_ByteString localCertificate = UA_BYTESTRING_NULL;
-    UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
-    if(certificate)
-        localCertificate = *certificate;
-    if(privateKey)
-        localPrivateKey = *privateKey;
-
-    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate, &localPrivateKey);
+enableBasic128SecurityPolicy(UA_ServerConfig *config) {
+    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &certificate, &privateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
                        UA_StatusCode_name(retval));
+        return;
     }
-    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri, UA_MESSAGESECURITYMODE_SIGN);
-    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri, UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
+    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri,
+                                UA_MESSAGESECURITYMODE_SIGN);
+    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri,
+                                UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
 }
 
 static void
-enableBasic256SecurityPolicy(UA_ServerConfig *config,
-                             const UA_ByteString *certificate,
-                             const UA_ByteString *privateKey) {
-    /* Populate the SecurityPolicies */
-    UA_ByteString localCertificate = UA_BYTESTRING_NULL;
-    UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
-    if(certificate)
-        localCertificate = *certificate;
-    if(privateKey)
-        localPrivateKey = *privateKey;
-
-    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate, &localPrivateKey);
+enableBasic256SecurityPolicy(UA_ServerConfig *config) {
+    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &certificate, &privateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256 with error code %s",
                        UA_StatusCode_name(retval));
+        return;
     }
-    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri, UA_MESSAGESECURITYMODE_SIGN);
-    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri, UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
+    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri,
+                                UA_MESSAGESECURITYMODE_SIGN);
+    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri,
+                                UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
 }
 
 
@@ -1104,7 +1110,6 @@ int main(int argc, char **argv) {
 
     /* Load certificate */
     size_t pos = 1;
-    UA_ByteString certificate = UA_BYTESTRING_NULL;
     if((size_t)argc >= pos + 1) {
         certificate = loadFile(argv[1]);
         if(certificate.length == 0) {
@@ -1117,7 +1122,6 @@ int main(int argc, char **argv) {
 
 #ifdef UA_ENABLE_ENCRYPTION
     /* Load the private key */
-    UA_ByteString privateKey = UA_BYTESTRING_NULL;
     if((size_t)argc >= pos + 1) {
         privateKey = loadFile(argv[2]);
         if(privateKey.length == 0) {
@@ -1409,9 +1413,9 @@ int main(int argc, char **argv) {
     if(enableNone)
         enableNoneSecurityPolicy(config);
     if(enableBasic128)
-        enableBasic128SecurityPolicy(config, &certificate, &privateKey);
+        enableBasic128SecurityPolicy(config);
     if(enableBasic256)
-        enableBasic256SecurityPolicy(config, &certificate, &privateKey);
+        enableBasic256SecurityPolicy(config);
     if(disableBasic256Sha256)
         disableBasic256Sha256SecurityPolicy(config);
     if(disableAes128Sha256RsaOaep)

From 9e240851220622abdaa4bec5b7c217e5275df42c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 01:24:12 +0100
Subject: [PATCH 1300/1963] feat(server): Make connection attributes in the
 client accessible

---
 include/open62541/client.h      | 38 ++++++++++++++
 src/client/ua_client.c          | 92 +++++++++++++++++++++++++++++++++
 src/client/ua_client_internal.h |  2 +
 3 files changed, 132 insertions(+)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 8cd15e02f0a..c9b4b0fa7a0 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -300,6 +300,44 @@ UA_Client_getContext(UA_Client *client) {
 void UA_EXPORT
 UA_Client_delete(UA_Client *client);
 
+/**
+ * Connection Attrbiutes
+ * ---------------------
+ *
+ * Besides the client configuration, some attributes of the connection are
+ * defined only at runtime. For example the choice of SecurityPolicy or the
+ * ApplicationDescripton from the server. This API allows to access such
+ * connection attributes.
+ *
+ * The currently defined connection attributes are:
+ *
+ * - 0:serverDescription [UA_ApplicationDescription]: Server description
+ * - 0:securityPolicyUri [UA_String]: Uri of the SecurityPolicy used
+ * - 0:securityMode [UA_MessageSecurityMode]: SecurityMode of the SecureChannel
+ */
+
+/* Returns a shallow copy of the attribute. Don't _clear or _delete the value
+ * variant. Don't use the value after returning the control flow to the client.
+ * Also don't use this in a multi-threaded application. */
+UA_EXPORT UA_StatusCode
+UA_Client_getConnectionAttribute(UA_Client *client, const UA_QualifiedName key,
+                                 UA_Variant *outValue);
+
+/* Return a deep copy of the attribute */
+UA_EXPORT UA_StatusCode UA_THREADSAFE
+UA_Client_getConnectionAttributeCopy(UA_Client *client, const UA_QualifiedName key,
+                                     UA_Variant *outValue);
+
+/* Returns NULL if the attribute is not defined or not a scalar or not of the
+ * right datatype. Otherwise a shallow copy of the scalar value is created at
+ * the target location of the void pointer. Hence don't use this in a
+ * multi-threaded application. */
+UA_EXPORT UA_StatusCode
+UA_Client_getConnectionAttribute_scalar(UA_Client *client,
+                                        const UA_QualifiedName key,
+                                        const UA_DataType *type,
+                                        void *outValue);
+
 /**
  * Connect to a Server
  * -------------------
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index b5e0722770f..b4123adbe9b 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -241,6 +241,7 @@ UA_Client_clear(UA_Client *client) {
 
     UA_Client_disconnect(client);
     UA_String_clear(&client->discoveryUrl);
+    UA_ApplicationDescription_clear(&client->serverDescription);
 
     UA_String_clear(&client->serverSessionNonce);
     UA_String_clear(&client->clientSessionNonce);
@@ -1086,3 +1087,94 @@ const UA_DataType *
 UA_Client_findDataType(UA_Client *client, const UA_NodeId *typeId) {
     return UA_findDataTypeWithCustom(typeId, client->config.customDataTypes);
 }
+
+/*************************/
+/* Connection Attributes */
+/*************************/
+
+#define UA_CONNECTIONATTRIBUTESSIZE 3
+static const UA_QualifiedName connectionAttributes[UA_CONNECTIONATTRIBUTESSIZE] = {
+    {0, UA_STRING_STATIC("serverDescription")},
+    {0, UA_STRING_STATIC("securityPolicyUri")},
+    {0, UA_STRING_STATIC("securityMode")}
+};
+
+static UA_StatusCode
+getConnectionttribute(UA_Client *client, const UA_QualifiedName key,
+                      UA_Variant *outValue, UA_Boolean copy) {
+    if(!outValue)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    const UA_Variant *attr;
+    UA_Variant localAttr;
+
+    if(UA_QualifiedName_equal(&key, &connectionAttributes[0])) {
+        /* ServerDescription */
+        UA_Variant_setScalar(&localAttr, &client->serverDescription,
+                             &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+        attr = &localAttr;
+    } else if(UA_QualifiedName_equal(&key, &connectionAttributes[1])) {
+        /* SecurityPolicyUri */
+        const UA_SecurityPolicy *sp = client->channel.securityPolicy;
+        if(!sp)
+            return UA_STATUSCODE_BADNOTCONNECTED;
+        UA_Variant_setScalar(&localAttr, (void*)(uintptr_t)&sp->policyUri,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        attr = &localAttr;
+    } else if(UA_QualifiedName_equal(&key, &connectionAttributes[2])) {
+        /* SecurityMode */
+        UA_Variant_setScalar(&localAttr, &client->channel.securityMode,
+                             &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
+        attr = &localAttr;
+    }
+
+    if(copy)
+        return UA_Variant_copy(attr, outValue);
+
+    *outValue = *attr;
+    outValue->storageType = UA_VARIANT_DATA_NODELETE;
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode
+UA_Client_getConnectionAttribute(UA_Client *client, const UA_QualifiedName key,
+                                 UA_Variant *outValue) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = getConnectionttribute(client, key, outValue, false);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_Client_getConnectionAttributeCopy(UA_Client *client, const UA_QualifiedName key,
+                                     UA_Variant *outValue) {
+    UA_LOCK(&client->clientMutex);
+    UA_StatusCode res = getConnectionttribute(client, key, outValue, true);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
+}
+
+UA_StatusCode
+UA_Client_getConnectionAttribute_scalar(UA_Client *client,
+                                        const UA_QualifiedName key,
+                                        const UA_DataType *type,
+                                        void *outValue) {
+    UA_LOCK(&client->clientMutex);
+
+    UA_Variant attr;
+    UA_StatusCode res = getConnectionttribute(client, key, &attr, false);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&client->clientMutex);
+        return res;
+    }
+
+    if(!UA_Variant_hasScalarType(&attr, type)) {
+        UA_UNLOCK(&client->clientMutex);
+        return UA_STATUSCODE_BADNOTFOUND;
+    }
+
+    memcpy(outValue, attr.data, type->memSize);
+
+    UA_UNLOCK(&client->clientMutex);
+    return UA_STATUSCODE_GOOD;
+}
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 2b7c4fd7ca6..f03df801f26 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -132,6 +132,8 @@ struct UA_Client {
      * EndpointUrl != DiscoveryUrl. */
     UA_String discoveryUrl;
 
+    UA_ApplicationDescription serverDescription;
+
     /* SecureChannel */
     UA_SecureChannel channel;
     UA_UInt32 requestId; /* Unique, internally defined for each request */

From 4aeae40afaa729fa98bf13648c8f9d13ba156a8c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 01:27:39 +0100
Subject: [PATCH 1301/1963] refactor(client): Only use pointer to logging in
 the client

We could not repair all pointers when the logger was directly stored in
the config and then moved.
---
 include/open62541/client.h              |   7 +-
 include/open62541/plugin/pki.h          |   8 +-
 plugins/crypto/mbedtls/ua_pki_mbedtls.c |  25 ++--
 plugins/crypto/openssl/ua_pki_openssl.c |  30 ++---
 plugins/crypto/ua_pki_none.c            |   2 +-
 plugins/ua_config_default.c             |  56 +++++----
 src/client/ua_client.c                  |  97 ++++++----------
 src/client/ua_client_connect.c          | 145 ++++++++++++------------
 src/client/ua_client_discovery.c        |   6 +-
 src/client/ua_client_highlevel.c        |   2 +-
 src/client/ua_client_subscriptions.c    |  42 +++----
 src/server/ua_server.c                  |  10 +-
 12 files changed, 196 insertions(+), 234 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index c9b4b0fa7a0..0f5e1950aed 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -68,11 +68,8 @@ _UA_BEGIN_DECLS
  * The :ref:`tutorials` provide a good starting point for this. */
 
 typedef struct {
-    void *clientContext; /* User-defined pointer attached to the client */
-    UA_Logger logger;    /* Logger used by the client.
-                            logger is deprecated but still supported at this time.
-                            Use logging pointer instead. */
-    UA_Logger *logging; /* If NULL and "logger" is set, make this point to "logger" */
+    void *clientContext;       /* User-defined pointer attached to the client */
+    const UA_Logger *logging;  /* Plugin for log output */
 
     /* Response timeout in ms (0 -> no timeout). If the server does not answer a
      * request within this time a StatusCode UA_STATUSCODE_BADTIMEOUT is
diff --git a/include/open62541/plugin/pki.h b/include/open62541/plugin/pki.h
index 1534d94403e..a897537b249 100644
--- a/include/open62541/plugin/pki.h
+++ b/include/open62541/plugin/pki.h
@@ -55,10 +55,10 @@ struct UA_CertificateVerification {
     /* Delete the certificate verification context */
     void (*clear)(UA_CertificateVerification *cv);
 
-    /* Pointer to logging pointer in the server/client configuration.
-       If the logging pointer is changed outside of the plugin, the new
-       logger is used automatically*/
-    UA_Logger **logging;
+    /* Pointer to logging pointer in the server/client configuration. If the
+     * logging pointer is changed outside of the plugin, the new logger is used
+     * automatically*/
+    const UA_Logger *logging;
 };
 
 _UA_END_DECLS
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 780330a5809..4d2c6bf5392 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -158,7 +158,7 @@ reloadCertificates(const UA_CertificateVerification *cv, CertInfo *ci) {
 
     /* Load the trustlists */
     if(ci->trustListFolder.length > 0) {
-        UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
+        UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
         mbedtls_x509_crt_free(&ci->certificateTrustList);
         mbedtls_x509_crt_init(&ci->certificateTrustList);
 
@@ -167,12 +167,12 @@ reloadCertificates(const UA_CertificateVerification *cv, CertInfo *ci) {
         f[ci->trustListFolder.length] = 0;
         err = mbedtls_x509_crt_parse_path(&ci->certificateTrustList, f);
         if(err == 0) {
-            UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER,
                         "Loaded certificate from %s", f);
         } else {
             char errBuff[300];
             mbedtls_strerror(err, errBuff, 300);
-            UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER,
                         "Failed to load certificate from %s, mbedTLS error: %s (error code: %d)", f, errBuff, err);
             internalErrorFlag = 1;
         }
@@ -180,7 +180,7 @@ reloadCertificates(const UA_CertificateVerification *cv, CertInfo *ci) {
 
     /* Load the revocationlists */
     if(ci->revocationListFolder.length > 0) {
-        UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
+        UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
         size_t pathsSize = 0;
         UA_String *paths = NULL;
         retval = fileNamesFromFolder(&ci->revocationListFolder, &pathsSize, &paths);
@@ -194,13 +194,13 @@ reloadCertificates(const UA_CertificateVerification *cv, CertInfo *ci) {
             f[paths[i].length] = 0;
             err = mbedtls_x509_crl_parse_file(&ci->certificateRevocationList, f);
             if(err == 0) {
-                UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER,
                             "Loaded certificate from %.*s",
                             (int)paths[i].length, paths[i].data);
             } else {
                 char errBuff[300];
                 mbedtls_strerror(err, errBuff, 300);
-                UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to load certificate from %.*s, mbedTLS error: %s (error code: %d)",
                             (int)paths[i].length, paths[i].data, errBuff, err);
                 internalErrorFlag = 1;
@@ -213,7 +213,7 @@ reloadCertificates(const UA_CertificateVerification *cv, CertInfo *ci) {
 
     /* Load the issuerlists */
     if(ci->issuerListFolder.length > 0) {
-        UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
+        UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
         mbedtls_x509_crt_free(&ci->certificateIssuerList);
         mbedtls_x509_crt_init(&ci->certificateIssuerList);
         char f[PATH_MAX];
@@ -221,12 +221,12 @@ reloadCertificates(const UA_CertificateVerification *cv, CertInfo *ci) {
         f[ci->issuerListFolder.length] = 0;
         err = mbedtls_x509_crt_parse_path(&ci->certificateIssuerList, f);
         if(err == 0) {
-            UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER,
                         "Loaded certificate from %s", f);
         } else {
             char errBuff[300];
             mbedtls_strerror(err, errBuff, 300);
-            UA_LOG_INFO(*(cv->logging), UA_LOGCATEGORY_SERVER,
+            UA_LOG_INFO(cv->logging, UA_LOGCATEGORY_SERVER,
                         "Failed to load certificate from %s, mbedTLS error: %s (error code: %d)",
                         f, errBuff, err);
             internalErrorFlag = 1;
@@ -265,7 +265,7 @@ certificateVerification_verify(const UA_CertificateVerification *cv,
        ci->certificateTrustList.raw.len == 0 &&
        ci->certificateIssuerList.raw.len == 0 &&
        ci->certificateRevocationList.raw.len == 0) {
-        UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(cv->logging, UA_LOGCATEGORY_USERLAND,
                        "No certificate store configured. Accepting the certificate.");
         return UA_STATUSCODE_GOOD;
     }
@@ -460,7 +460,7 @@ certificateVerification_verify(const UA_CertificateVerification *cv,
 #if UA_LOGLEVEL <= 400
         char buff[100];
         int len = mbedtls_x509_crt_verify_info(buff, 100, "", flags);
-        UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_SECURITYPOLICY,
+        UA_LOG_WARNING(cv->logging, UA_LOGCATEGORY_SECURITYPOLICY,
                        "Verifying the certificate failed with error: %.*s", len-1, buff);
 #endif
         if(flags & (uint32_t)MBEDTLS_X509_BADCERT_NOT_TRUSTED) {
@@ -616,9 +616,6 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
     if(cv == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    if(cv->logging == NULL) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
 
     /* Clear if the plugin is already initialized */
     if(cv->clear)
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 9d98098e52d..d3324975615 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -294,7 +294,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     UA_ByteString_init (&strCert);
 
     if (ctx->trustListFolder.length > 0) {
-        UA_LOG_INFO(*(ctx->cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
+        UA_LOG_INFO(ctx->cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
 
         sk_X509_pop_free (ctx->skTrusted, X509_free);
         ctx->skTrusted = sk_X509_new_null();
@@ -315,12 +315,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(ctx->cv->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skTrusted_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -330,7 +330,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->issuerListFolder.length > 0) {
-        UA_LOG_INFO(*(ctx->cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
+        UA_LOG_INFO(ctx->cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
 
         sk_X509_pop_free (ctx->skIssue, X509_free);
         ctx->skIssue = sk_X509_new_null();
@@ -350,12 +350,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skIssuer_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -365,7 +365,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->revocationListFolder.length > 0) {
-        UA_LOG_INFO(*(ctx->cv->logging), UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
+        UA_LOG_INFO(ctx->cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
 
         sk_X509_CRL_pop_free (ctx->skCrls, X509_CRL_free);
         ctx->skCrls = sk_X509_CRL_new_null();
@@ -385,12 +385,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to load the revocation file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skCrls_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (*(ctx->cv->logging), UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the revocation file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -474,7 +474,7 @@ UA_CertificateVerification_Verify (const UA_CertificateVerification *cv,
     if(sk_X509_CRL_num(ctx->skCrls) == 0 &&
        sk_X509_num(ctx->skIssue) == 0 &&
        sk_X509_num(ctx->skTrusted) == 0) {
-        UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(cv->logging, UA_LOGCATEGORY_USERLAND,
                        "No certificate store configured. Accepting the certificate.");
         goto cleanup;
     }
@@ -623,13 +623,13 @@ UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerificatio
 
     pData = certificate->data;
     if (pData == NULL) {
-        UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error Empty Certificate");
+        UA_LOG_ERROR(cv->logging, UA_LOGCATEGORY_USERLAND, "Error Empty Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
     certificateX509 = UA_OpenSSL_LoadCertificate(certificate);
     if (certificateX509 == NULL) {
-        UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error loading X509 Certificate");
+        UA_LOG_ERROR(cv->logging, UA_LOGCATEGORY_USERLAND, "Error loading X509 Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
@@ -637,7 +637,7 @@ UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerificatio
                                                 NULL, NULL);
     if (pNames == NULL) {
         X509_free (certificateX509);
-        UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error processing X509 Certificate");
+        UA_LOG_ERROR(cv->logging, UA_LOGCATEGORY_USERLAND, "Error processing X509 Certificate");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
     
@@ -649,7 +649,7 @@ UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerificatio
              subjectURI.length = (size_t) (value->d.ia5->length);
              subjectURI.data = (UA_Byte *) UA_malloc (subjectURI.length);
              if (subjectURI.data == NULL) {
-                 UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error Empty subjectURI");
+                 UA_LOG_ERROR(cv->logging, UA_LOGCATEGORY_USERLAND, "Error Empty subjectURI");
                  X509_free (certificateX509);
                  sk_GENERAL_NAME_pop_free(pNames, GENERAL_NAME_free);
                  return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
@@ -663,7 +663,7 @@ UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerificatio
     ret = UA_STATUSCODE_GOOD;
     if (UA_Bstrstr (subjectURI.data, subjectURI.length,
                     applicationURI->data, applicationURI->length) == NULL) {
-        UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Empty comparing subjectURI and applicationURI");
+        UA_LOG_ERROR(cv->logging, UA_LOGCATEGORY_USERLAND, "Empty comparing subjectURI and applicationURI");
         ret = UA_STATUSCODE_BADCERTIFICATEURIINVALID;
     }
 
diff --git a/plugins/crypto/ua_pki_none.c b/plugins/crypto/ua_pki_none.c
index f8ff7b7a58e..0f31986d6c5 100644
--- a/plugins/crypto/ua_pki_none.c
+++ b/plugins/crypto/ua_pki_none.c
@@ -9,7 +9,7 @@
 static UA_StatusCode
 verifyCertificateAllowAll(const UA_CertificateVerification *cv,
                           const UA_ByteString *certificate) {
-    UA_LOG_WARNING(*(cv->logging), UA_LOGCATEGORY_USERLAND,
+    UA_LOG_WARNING(cv->logging, UA_LOGCATEGORY_USERLAND,
                    "No certificate store configured. Accepting the certificate.");
     return UA_STATUSCODE_GOOD;
 }
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 44758240e80..d541a6f5d04 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -429,9 +429,9 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 
     /* Set Logger for Certificate Verification */
     if(!conf->secureChannelPKI.logging)
-        conf->secureChannelPKI.logging = &conf->logging;
+        conf->secureChannelPKI.logging = conf->logging;
     if(!conf->sessionPKI.logging)
-        conf->sessionPKI.logging = &conf->logging;
+        conf->sessionPKI.logging = conf->logging;
 
     /* Certificate Verification that accepts every certificate. Can be
      * overwritten when the policy is specialized. */
@@ -1081,14 +1081,12 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
     if(config->secureChannelLifeTime == 0)
         config->secureChannelLifeTime = 10 * 60 * 1000; /* 10 minutes */
 
-    if(!config->logger.log)
-        config->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
     if(config->logging == NULL)
-        config->logging = &config->logger;
+        config->logging = UA_Log_Stdout;
 
     /* EventLoop */
     if(config->eventLoop == NULL) {
-        config->eventLoop = UA_EventLoop_new_POSIX(&config->logger);
+        config->eventLoop = UA_EventLoop_new_POSIX(config->logging);
         config->externalEventLoop = false;
 
         /* Add the TCP connection manager */
@@ -1106,7 +1104,7 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
         config->localConnectionConfig = UA_ConnectionConfig_default;
 
     if(!config->certificateVerification.logging) {
-        config->certificateVerification.logging = &config->logging;
+        config->certificateVerification.logging = config->logging;
     }
 
     if(!config->certificateVerification.verifyCertificate) {
@@ -1127,7 +1125,7 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
         if(!config->securityPolicies)
             return UA_STATUSCODE_BADOUTOFMEMORY;
         UA_StatusCode retval = UA_SecurityPolicy_None(config->securityPolicies,
-                                                      UA_BYTESTRING_NULL, &config->logger);
+                                                      UA_BYTESTRING_NULL, config->logging);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_free(config->securityPolicies);
             config->securityPolicies = NULL;
@@ -1172,51 +1170,51 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     config->securityPolicies = sp;
 
     retval = UA_SecurityPolicy_Basic128Rsa15(&config->securityPolicies[config->securityPoliciesSize],
-                                             localCertificate, privateKey, &config->logger);
+                                             localCertificate, privateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_SecurityPolicy_Basic256(&config->securityPolicies[config->securityPoliciesSize],
-                                        localCertificate, privateKey, &config->logger);
+                                        localCertificate, privateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->securityPolicies[config->securityPoliciesSize],
-                                                   localCertificate, privateKey, &config->logger);
+                                                  localCertificate, privateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_SecurityPolicy_Basic256Sha256(&config->securityPolicies[config->securityPoliciesSize],
-                                              localCertificate, privateKey, &config->logger);
+                                              localCertificate, privateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->securityPolicies[config->securityPoliciesSize],
-                                                   localCertificate, privateKey, &config->logger);
+                                                   localCertificate, privateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                        UA_StatusCode_name(retval));
     }
@@ -1236,7 +1234,7 @@ UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
                                       UA_ByteString certificateAuth,
                                       UA_ByteString privateKeyAuth) {
 #ifdef UA_ENABLE_ENCRYPTION_LIBRESSL
-    UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                    "Certificate authentication with LibreSSL as crypto backend is not supported.");
     return UA_STATUSCODE_BADNOTIMPLEMENTED;
 #endif
@@ -1262,51 +1260,51 @@ UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
     config->authSecurityPolicies = sp;
 
     retval = UA_SecurityPolicy_Basic128Rsa15(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                                           certificateAuth, privateKeyAuth, &config->logger);
+                                                           certificateAuth, privateKeyAuth, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->authSecurityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_SecurityPolicy_Basic256(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                        certificateAuth, privateKeyAuth, &config->logger);
+                                        certificateAuth, privateKeyAuth, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->authSecurityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                                   certificateAuth, privateKeyAuth, &config->logger);
+                                                   certificateAuth, privateKeyAuth, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->authSecurityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_SecurityPolicy_Basic256Sha256(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                              certificateAuth, privateKeyAuth, &config->logger);
+                                              certificateAuth, privateKeyAuth, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->authSecurityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                                   certificateAuth, privateKeyAuth, &config->logger);
+                                                   certificateAuth, privateKeyAuth, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->authSecurityPoliciesSize;
     } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                        UA_StatusCode_name(retval));
     }
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index b4123adbe9b..b92efe1d426 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -70,16 +70,9 @@ UA_ClientConfig_copy(UA_ClientConfig const *src, UA_ClientConfig *dst){
     dst->externalEventLoop = src->externalEventLoop;
     dst->inactivityCallback = src->inactivityCallback;
     dst->localConnectionConfig = src->localConnectionConfig;
-    dst->logger = src->logger;
-    if(src->logging == &src->logger) {
-        dst->logging = &dst->logger;
-    } else {
-        dst->logging = src->logging;
-    }
-    if((src->certificateVerification.logging == NULL) ||
-       (src->certificateVerification.logging == &src->logging)) {
-        dst->certificateVerification.logging = &dst->logging;
-    }
+    dst->logging = src->logging;
+    if(src->certificateVerification.logging == NULL)
+        dst->certificateVerification.logging = dst->logging;
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     dst->outStandingPublishRequests = src->outStandingPublishRequests;
 #endif
@@ -103,7 +96,6 @@ UA_ClientConfig_copy(UA_ClientConfig const *src, UA_ClientConfig *dst){
         dst->authSecurityPolicies = NULL;
         dst->certificateVerification.context = NULL;
         dst->eventLoop = NULL;
-        dst->logger.context = NULL;
         dst->logging = NULL;
         dst->securityPolicies = NULL;
         UA_ClientConfig_clear(dst);
@@ -120,23 +112,6 @@ UA_Client_newWithConfig(const UA_ClientConfig *config) {
         return NULL;
     memset(client, 0, sizeof(UA_Client));
     client->config = *config;
-    /* Fix up known logger pointers now that the config has "moved" into the
-     * client struct */
-    if(client->config.eventLoop &&
-       (client->config.eventLoop->logger == &config->logger))
-        client->config.eventLoop->logger = &client->config.logger;
-    for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
-        if(client->config.securityPolicies[i].logger == &config->logger)
-            client->config.securityPolicies[i].logger = &client->config.logger;
-    }
-
-    if((client->config.logging == NULL) ||
-       (client->config.logging == &config->logger)) {
-        /* re-set the logger pointer */
-        client->config.logging = &client->config.logger;
-    }
-    if(client->config.certificateVerification.logging == &config->logging)
-        client->config.certificateVerification.logging = &client->config.logging;
 
     UA_SecureChannel_init(&client->channel);
     client->channel.config = client->config.localConnectionConfig;
@@ -195,18 +170,10 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
         config->eventLoop = NULL;
     }
 
-    /* Logger */
-    if(config->logging != NULL) {
-        if((config->logging != &config->logger) &&
-           (config->logging->clear != NULL)) {
-            config->logging->clear(config->logging->context);
-        }
-        config->logging = NULL;
-    }
-    if(config->logger.clear)
-        config->logger.clear(config->logger.context);
-    config->logger.log = NULL;
-    config->logger.clear = NULL;
+    /* Logging */
+    if(config->logging != NULL && config->logging->clear != NULL)
+        config->logging->clear(config->logging->context);
+    config->logging = NULL;
 
     UA_String_clear(&config->sessionName);
     if(config->sessionLocaleIdsSize > 0 && config->sessionLocaleIds) {
@@ -323,11 +290,11 @@ notifyClientState(UA_Client *client) {
     const char *connectStatusText = UA_StatusCode_name(client->connectStatus);
 
     if(info)
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                     "Client Status: ChannelState: %s, SessionState: %s, ConnectStatus: %s",
                     channelStateText, sessionStateText, connectStatusText);
     else
-        UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "Client Status: ChannelState: %s, SessionState: %s, ConnectStatus: %s",
                      channelStateText, sessionStateText, connectStatusText);
 #endif
@@ -382,11 +349,11 @@ sendRequest(UA_Client *client, const void *request,
     UA_UInt32 rqId = ++client->requestId;
 
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-    UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
+    UA_LOG_DEBUG_CHANNEL(client->config.logging, &client->channel,
                          "Sending request with RequestId %u of type %s",
                          (unsigned)rqId, requestType->typeName);
 #else
-    UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
+    UA_LOG_DEBUG_CHANNEL(client->config.logging, &client->channel,
                          "Sending request with RequestId %u of type %" PRIu32,
                          (unsigned)rqId, requestType->binaryEncodingId.identifier.numeric);
 #endif
@@ -429,7 +396,7 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
      * be verified by the Client since only the Client knows if it is valid or
      * not.*/
     if(!ac) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Request with unknown RequestId %u", requestId);
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
@@ -456,11 +423,11 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
         UA_init(response, ac->responseType);
         if(UA_NodeId_equal(&responseTypeId, &serviceFaultId)) {
             /* Decode as a ServiceFault, i.e. only the response header */
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "Received a ServiceFault response");
             responseType = &UA_TYPES[UA_TYPES_SERVICEFAULT];
         } else {
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "Service response type does not match");
             retval = UA_STATUSCODE_BADCOMMUNICATIONERROR;
             goto process; /* Do not decode */
@@ -469,10 +436,10 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
 
     /* Decode the response */
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Decode a message of type %s", responseType->typeName);
 #else
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Decode a message of type %" PRIu32,
                  responseTypeId.identifier.numeric);
 #endif
@@ -482,7 +449,7 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
  process:
     /* Process the received MSG response */
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Could not decode the response with RequestId %u with status %s",
                        (unsigned)requestId, UA_StatusCode_name(retval));
         response->responseHeader.serviceResult = retval;
@@ -500,13 +467,13 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
             /* Configuration option to not create a new Session. Disconnect the
              * client. */
             client->connectStatus = response->responseHeader.serviceResult;
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "Session cannot be activated with StatusCode %s. "
                          "The client is configured not to create a new Session.",
                          UA_StatusCode_name(client->connectStatus));
             closeSecureChannel(client);
         } else {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Session no longer valid. A new Session is created for the next "
                            "Service request but we do not re-send the current request.");
         }
@@ -538,11 +505,11 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
 
     if(!UA_SecureChannel_isConnected(channel)) {
         if(messageType == UA_MESSAGETYPE_MSG) {
-            UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Discard MSG message "
+            UA_LOG_DEBUG_CHANNEL(client->config.logging, channel, "Discard MSG message "
                                  "with RequestId %u as the SecureChannel is not connected",
                                  requestId);
         } else {
-            UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Discard message "
+            UA_LOG_DEBUG_CHANNEL(client->config.logging, channel, "Discard message "
                                  "as the SecureChannel is not connected");
         }
         return UA_STATUSCODE_BADCONNECTIONCLOSED;
@@ -550,27 +517,27 @@ processServiceResponse(void *application, UA_SecureChannel *channel,
 
     switch(messageType) {
     case UA_MESSAGETYPE_RHE:
-        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process RHE message");
+        UA_LOG_DEBUG_CHANNEL(client->config.logging, channel, "Process RHE message");
         processRHEMessage(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_ACK:
-        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process ACK message");
+        UA_LOG_DEBUG_CHANNEL(client->config.logging, channel, "Process ACK message");
         processACKResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_OPN:
-        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process OPN message");
+        UA_LOG_DEBUG_CHANNEL(client->config.logging, channel, "Process OPN message");
         processOPNResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_ERR:
-        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process ERR message");
+        UA_LOG_DEBUG_CHANNEL(client->config.logging, channel, "Process ERR message");
         processERRResponse(client, message);
         return UA_STATUSCODE_GOOD;
     case UA_MESSAGETYPE_MSG:
-        UA_LOG_DEBUG_CHANNEL(&client->config.logger, channel, "Process MSG message "
+        UA_LOG_DEBUG_CHANNEL(client->config.logging, channel, "Process MSG message "
                              "with RequestId %u", requestId);
         return processMSGResponse(client, requestId, message);
     default:
-        UA_LOG_TRACE_CHANNEL(&client->config.logger, channel,
+        UA_LOG_TRACE_CHANNEL(client->config.logging, channel,
                              "Invalid message type");
         channel->state = UA_SECURECHANNELSTATE_CLOSING;
         return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
@@ -596,7 +563,7 @@ __Client_Service(UA_Client *client, const void *request,
     /* Check that the SecureChannel is open and also a Session active (if we
      * want a Session). Otherwise reopen. */
     if(!isFullyConnected(client)) {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                     "Re-establish the connction for the synchronous service call");
         connectSync(client);
         if(client->connectStatus != UA_STATUSCODE_GOOD) {
@@ -617,7 +584,7 @@ __Client_Service(UA_Client *client, const void *request,
          * the actually closed in the next iteration of the EventLoop. */
         UA_assert(client->channel.state == UA_SECURECHANNELSTATE_CLOSING ||
                   client->channel.state == UA_SECURECHANNELSTATE_CLOSED);
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Sending the request failed with status %s",
                        UA_StatusCode_name(retval));
         notifyClientState(client);
@@ -779,7 +746,7 @@ __Client_AsyncService(UA_Client *client, const void *request,
 
     /* Is the SecureChannel connected? */
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "SecureChannel must be connected to send request");
         return UA_STATUSCODE_BADSERVERNOTCONNECTED;
     }
@@ -1015,7 +982,7 @@ static void
 clientHouseKeeping(UA_Client *client, void *_) {
     UA_LOCK(&client->clientMutex);
 
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Internally check the the client state and "
                  "required activities");
 
@@ -1048,7 +1015,7 @@ __UA_Client_startup(UA_Client *client) {
     UA_EventLoop *el = client->config.eventLoop;
     UA_CHECK_ERROR(el != NULL,
                    return UA_STATUSCODE_BADINTERNALERROR,
-                   &client->config.logger, UA_LOGCATEGORY_CLIENT,
+                   client->config.logging, UA_LOGCATEGORY_CLIENT,
                    "No EventLoop configured");
 
     /* Set up the regular callback for checking the internal state? */
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 5e997aec15c..76713a94eca 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -214,7 +214,7 @@ encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPo
 
     UA_SecurityPolicy *sp = getSecurityPolicy(client, *userTokenSecurityPolicy);
     if(!sp) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                        "Could not find the required SecurityPolicy for the UserToken");
         return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
     }
@@ -225,7 +225,7 @@ encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPo
     UA_StatusCode retval = sp->channelModule.
         newContext(sp, &client->config.endpoint.serverCertificate, &channelContext);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                        "Could not instantiate the SecurityPolicy for the UserToken");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -338,7 +338,7 @@ processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
         UA_decodeBinaryInternal(chunk, &offset, &errMessage,
                                 &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE], NULL);
     if(client->connectStatus != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_CHANNEL(&client->config.logger, &client->channel,
+        UA_LOG_ERROR_CHANNEL(client->config.logging, &client->channel,
                              "Received an ERR response that could not be decoded "
                              "with StatusCode %s",
                              UA_StatusCode_name(client->connectStatus));
@@ -346,7 +346,7 @@ processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
         return;
     }
 
-    UA_LOG_ERROR_CHANNEL(&client->config.logger, &client->channel,
+    UA_LOG_ERROR_CHANNEL(client->config.logging, &client->channel,
                          "Received an ERR response with StatusCode %s and the following "
                          "reason: %.*s", UA_StatusCode_name(errMessage.error),
                          (int)errMessage.reason.length, errMessage.reason.data);
@@ -359,7 +359,7 @@ void
 processACKResponse(UA_Client *client, const UA_ByteString *chunk) {
     UA_SecureChannel *channel = &client->channel;
     if(channel->state != UA_SECURECHANNELSTATE_HEL_SENT) {
-        UA_LOG_ERROR_CHANNEL(&client->config.logger, channel,
+        UA_LOG_ERROR_CHANNEL(client->config.logging, channel,
                              "SecureChannel not in the HEL-sent state");
         client->connectStatus = UA_STATUSCODE_BADSECURECHANNELCLOSED;
         closeSecureChannel(client);
@@ -373,7 +373,7 @@ processACKResponse(UA_Client *client, const UA_ByteString *chunk) {
         UA_decodeBinaryInternal(chunk, &offset, &ackMessage,
                                 &UA_TRANSPORT[UA_TRANSPORT_TCPACKNOWLEDGEMESSAGE], NULL);
     if(client->connectStatus != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_NETWORK,
                      "Decoding ACK message failed");
         closeSecureChannel(client);
         return;
@@ -382,7 +382,7 @@ processACKResponse(UA_Client *client, const UA_ByteString *chunk) {
     client->connectStatus =
         UA_SecureChannel_processHELACK(channel, &ackMessage);
     if(client->connectStatus != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_NETWORK,
                      "Processing the ACK message failed with StatusCode %s",
                      UA_StatusCode_name(client->connectStatus));
         closeSecureChannel(client);
@@ -444,18 +444,18 @@ sendHELMessage(UA_Client *client) {
     retval = cm->sendWithConnection(cm, client->channel.connectionId,
                                     &UA_KEYVALUEMAP_NULL, &message);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT, "Sending HEL failed");
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT, "Sending HEL failed");
         closeSecureChannel(client);
         return retval;
     }
 
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT, "Sent HEL message");
+    UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT, "Sent HEL message");
     client->channel.state = UA_SECURECHANNELSTATE_HEL_SENT;
     return UA_STATUSCODE_GOOD;
 }
 
 void processRHEMessage(UA_Client *client, const UA_ByteString *chunk) {
-    UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT, "RHE received");
+    UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT, "RHE received");
 
     size_t offset = 0; /* Go to the beginning of the TcpHelloMessage */
     UA_TcpReverseHelloMessage rheMessage;
@@ -464,7 +464,7 @@ void processRHEMessage(UA_Client *client, const UA_ByteString *chunk) {
                                 &UA_TRANSPORT[UA_TRANSPORT_TCPREVERSEHELLOMESSAGE], NULL);
 
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                      "Decoding RHE message failed");
         closeSecureChannel(client);
         return;
@@ -510,7 +510,7 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
     if(client->channel.securityMode != UA_MESSAGESECURITYMODE_NONE &&
        UA_ByteString_equal(&client->channel.remoteNonce,
                            &response.serverNonce)) {
-        UA_LOG_ERROR_CHANNEL(&client->config.logger, &client->channel,
+        UA_LOG_ERROR_CHANNEL(client->config.logging, &client->channel,
                              "The server reused the last nonce");
         client->connectStatus = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         closeSecureChannel(client);
@@ -547,10 +547,10 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
     UA_Float lifetime = (UA_Float)response.securityToken.revisedLifetime / 1000;
     UA_Boolean renew = (client->channel.state == UA_SECURECHANNELSTATE_OPEN);
     if(renew) {
-        UA_LOG_INFO_CHANNEL(&client->config.logger, &client->channel, "SecureChannel "
+        UA_LOG_INFO_CHANNEL(client->config.logging, &client->channel, "SecureChannel "
                             "renewed with a revised lifetime of %.2fs", lifetime);
     } else {
-        UA_LOG_INFO_CHANNEL(&client->config.logger, &client->channel,
+        UA_LOG_INFO_CHANNEL(client->config.logging, &client->channel,
                             "SecureChannel opened with SecurityPolicy %.*s "
                             "and a revised lifetime of %.2fs",
                             (int)client->channel.securityPolicy->policyUri.length,
@@ -583,11 +583,11 @@ sendOPNAsync(UA_Client *client, UA_Boolean renew) {
     opnSecRq.requestedLifetime = client->config.secureChannelLifeTime;
     if(renew) {
         opnSecRq.requestType = UA_SECURITYTOKENREQUESTTYPE_RENEW;
-        UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
+        UA_LOG_DEBUG_CHANNEL(client->config.logging, &client->channel,
                              "Requesting to renew the SecureChannel");
     } else {
         opnSecRq.requestType = UA_SECURITYTOKENREQUESTTYPE_ISSUE;
-        UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
+        UA_LOG_DEBUG_CHANNEL(client->config.logging, &client->channel,
                              "Requesting to open a SecureChannel");
     }
 
@@ -595,13 +595,13 @@ sendOPNAsync(UA_Client *client, UA_Boolean renew) {
     UA_UInt32 requestId = ++client->requestId;
 
     /* Send the OPN message */
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_SECURECHANNEL,
+    UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_SECURECHANNEL,
                  "Requesting to open a SecureChannel");
     client->connectStatus =
         UA_SecureChannel_sendAsymmetricOPNMessage(&client->channel, requestId, &opnSecRq,
                                                   &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
     if(client->connectStatus != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_SECURECHANNEL,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_SECURECHANNEL,
                       "Sending OPN message failed with error %s",
                       UA_StatusCode_name(client->connectStatus));
         closeSecureChannel(client);
@@ -613,7 +613,7 @@ sendOPNAsync(UA_Client *client, UA_Boolean renew) {
     if(client->channel.state < UA_SECURECHANNELSTATE_OPN_SENT)
         client->channel.state = UA_SECURECHANNELSTATE_OPN_SENT;
 
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_SECURECHANNEL,
+    UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_SECURECHANNEL,
                  "OPN message sent");
 }
 
@@ -652,7 +652,7 @@ responseActivateSession(UA_Client *client, void *userdata,
 
         /* Configuration option to not create a new Session */
         if(client->config.noNewSession) {
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "Session cannot be activated with StatusCode %s. "
                          "The client is configured not to create a new Session.",
                          UA_StatusCode_name(ar->responseHeader.serviceResult));
@@ -665,7 +665,7 @@ responseActivateSession(UA_Client *client, void *userdata,
         /* The Session is no longer usable. Create a brand new one. */
         if(ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONIDINVALID ||
            ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Session to be activated no longer exists. Create a new Session.");
             client->connectStatus = createSessionAsync(client);
             UA_UNLOCK(&client->clientMutex);
@@ -673,7 +673,7 @@ responseActivateSession(UA_Client *client, void *userdata,
         }
 
         /* Something else is wrong. Maybe the credentials no longer work. Give up. */
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "Session cannot be activated with StatusCode %s. "
                      "The client cannot recover from this, closing the connection.",
                      UA_StatusCode_name(ar->responseHeader.serviceResult));
@@ -706,7 +706,7 @@ activateSessionAsync(UA_Client *client) {
 
     if(client->sessionState != UA_SESSIONSTATE_CREATED &&
        client->sessionState != UA_SESSIONSTATE_ACTIVATED) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "Can not activate session, session neither created nor activated. "
                      "Actual state: '%u'", client->sessionState);
         return UA_STATUSCODE_BADSESSIONCLOSED;
@@ -767,7 +767,7 @@ activateSessionAsync(UA_Client *client) {
     if(retval == UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_ACTIVATE_REQUESTED;
     else
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "ActivateSession failed when sending the request with error code %s",
                      UA_StatusCode_name(retval));
 
@@ -782,7 +782,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
 
     client->endpointsHandshake = false;
 
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Received GetEndpointsResponse");
 
     UA_GetEndpointsResponse *resp = (UA_GetEndpointsResponse*)response;
@@ -795,7 +795,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         if(UA_SecureChannel_isConnected(&client->channel)) {
            client->connectStatus = resp->responseHeader.serviceResult;
            closeSecureChannel(client);
-           UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+           UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "GetEndpointRequest failed with error code %s",
                         UA_StatusCode_name(client->connectStatus));
         }
@@ -831,7 +831,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
 
         /* Valid SecurityMode? */
         if(endpoint->securityMode < 1 || endpoint->securityMode > 3) {
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "Rejecting endpoint %lu: invalid security mode",
                         (long unsigned)i);
             continue;
@@ -840,7 +840,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         /* Selected SecurityMode? */
         if(client->config.securityMode > 0 &&
            client->config.securityMode != endpoint->securityMode) {
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "Rejecting endpoint %lu: security mode doesn't match",
                         (long unsigned)i);
             continue;
@@ -850,7 +850,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         if(client->config.securityPolicyUri.length > 0 &&
            !UA_String_equal(&client->config.securityPolicyUri,
                             &endpoint->securityPolicyUri)) {
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "Rejecting endpoint %lu: security policy doesn't match",
                         (long unsigned)i);
             continue;
@@ -858,7 +858,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
 
         /* SecurityPolicy available? */
         if(!getSecurityPolicy(client, endpoint->securityPolicyUri)) {
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "Rejecting endpoint %lu: security policy not available",
                         (long unsigned)i);
             continue;
@@ -876,7 +876,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             if(tokenPolicy->tokenType != UA_USERTOKENTYPE_ANONYMOUS &&
                tokenPolicy->securityPolicyUri.length > 0 &&
                !getSecurityPolicy(client, tokenPolicy->securityPolicyUri)) {
-                UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu in endpoint %lu: "
                             "security policy '%.*s' not available",
                             (long unsigned)j, (long unsigned)i,
@@ -886,7 +886,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             }
 
             if(tokenPolicy->tokenType > 3) {
-                UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu in endpoint %lu: "
                             "invalid token type",
                             (long unsigned)j, (long unsigned)i);
@@ -896,7 +896,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             if(tokenPolicy->tokenType == UA_USERTOKENTYPE_ANONYMOUS &&
                tokenType != &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN] &&
                tokenType != NULL) {
-                UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu (anonymous) in endpoint %lu: "
                             "configuration doesn't match",
                             (long unsigned)j, (long unsigned)i);
@@ -904,7 +904,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             }
             if(tokenPolicy->tokenType == UA_USERTOKENTYPE_USERNAME &&
                tokenType != &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
-                UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu (username) in endpoint %lu: "
                             "configuration doesn't match",
                             (long unsigned)j, (long unsigned)i);
@@ -912,7 +912,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             }
             if(tokenPolicy->tokenType == UA_USERTOKENTYPE_CERTIFICATE &&
                tokenType != &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
-                UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu (certificate) in endpoint %lu: "
                             "configuration doesn't match",
                             (long unsigned)j, (long unsigned)i);
@@ -920,7 +920,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             }
             if(tokenPolicy->tokenType == UA_USERTOKENTYPE_ISSUEDTOKEN &&
                tokenType != &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]) {
-                UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                             "Rejecting UserTokenPolicy %lu (token) in endpoint %lu: "
                             "configuration doesn't match",
                             (long unsigned)j, (long unsigned)i);
@@ -943,7 +943,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             const char *userTokenTypeNames[4] = {"Anonymous", "UserName",
                                                  "Certificate", "IssuedToken"};
             /* Log the selected endpoint */
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "Selected endpoint %lu in URL %.*s with SecurityMode "
                         "%s and SecurityPolicy %.*s", (long unsigned)i,
                         (int)endpoint->endpointUrl.length, endpoint->endpointUrl.data,
@@ -952,7 +952,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
                         endpoint->securityPolicyUri.data);
 
             /* Log the selected UserTokenPolicy */
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "Selected UserTokenPolicy %.*s with UserTokenType %s "
                         "and SecurityPolicy %.*s",
                         (int)tokenPolicy->policyId.length, tokenPolicy->policyId.data,
@@ -969,6 +969,11 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             client->config.userTokenPolicy = *tokenPolicy;
             UA_UserTokenPolicy_init(tokenPolicy);
 
+            /* Store the Server Description */
+            UA_ApplicationDescription_clear(&client->serverDescription);
+            UA_ApplicationDescription_copy(&endpoint->server,
+                                           &client->serverDescription);
+
             break;
         }
 
@@ -977,12 +982,12 @@ responseGetEndpoints(UA_Client *client, void *userdata,
     }
 
     if(!endpointFound) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "No suitable endpoint found");
         client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
         closeSecureChannel(client);
     } else if(!tokenFound) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "No suitable UserTokenPolicy found for the possible endpoints");
         client->connectStatus = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
         closeSecureChannel(client);
@@ -1013,7 +1018,7 @@ requestGetEndpoints(UA_Client *client) {
     if(retval == UA_STATUSCODE_GOOD)
         client->endpointsHandshake = true;
     else
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "RequestGetEndpoints failed when sending the request with error code %s",
                      UA_StatusCode_name(retval));
     return retval;
@@ -1024,14 +1029,14 @@ responseFindServers(UA_Client *client, void *userdata,
                     UA_UInt32 requestId, void *response) {
     client->findServersHandshake = false;
 
-    UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Received FindServersResponse");
 
     /* Error handling. Log the error but continue to connect with the current
      * EndpointURL. */
     UA_FindServersResponse *fsr = (UA_FindServersResponse*)response;
     if(fsr->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "FindServers failed with error code %s. Continue with the "
                        "EndpointURL %.*s.",
                        UA_StatusCode_name(fsr->responseHeader.serviceResult),
@@ -1052,7 +1057,7 @@ responseFindServers(UA_Client *client, void *userdata,
 
         for(size_t j = 0; j < server->discoveryUrlsSize; j++) {
             if(UA_String_equal(&client->config.endpointUrl, &server->discoveryUrls[j])) {
-                UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                             "The initially defined EndpointURL %.*s "
                             "is valid for the server",
                             (int)client->config.endpointUrl.length,
@@ -1095,7 +1100,7 @@ responseFindServers(UA_Client *client, void *userdata,
             client->discoveryUrl = server->discoveryUrls[j];
             UA_String_init(&server->discoveryUrls[j]);
 
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "Use the EndpointURL %.*s returned from FindServers",
                         (int)client->discoveryUrl.length, client->discoveryUrl.data);
 
@@ -1108,7 +1113,7 @@ responseFindServers(UA_Client *client, void *userdata,
 
     /* Could not find a suitable server. Try to continue with the
      * original EndpointURL. */
-    UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                    "FindServers did not returned a suitable DiscoveryURL. "
                    "Continue with the EndpointURL %.*s.",
                    (int)client->config.endpointUrl.length,
@@ -1128,7 +1133,7 @@ requestFindServers(UA_Client *client) {
                               (UA_ClientAsyncServiceCallback) responseFindServers,
                               &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE], NULL, NULL);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "FindServers failed when sending the request with error code %s",
                      UA_StatusCode_name(retval));
         return retval;
@@ -1231,7 +1236,7 @@ createSessionAsync(UA_Client *client) {
     if(res == UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_CREATE_REQUESTED;
     else
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "CreateSession failed when sending the request with "
                      "error code %s", UA_StatusCode_name(res));
 
@@ -1249,7 +1254,7 @@ fixBadDiscoveryUrl(UA_Client* client) {
        UA_String_equal(&client->discoveryUrl, &client->config.endpointUrl))
         return;
 
-    UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                    "The DiscoveryUrl returned by the FindServers service (%.*s) could not be "
                    "connected. Trying with the original EndpointUrl.",
                    (int)client->discoveryUrl.length, client->discoveryUrl.data);
@@ -1286,7 +1291,7 @@ initSecurityPolicy(UA_Client *client) {
 
 static void
 connectActivity(UA_Client *client) {
-    UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_TRACE(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Client connect iterate");
 
     /* Could not connect with an error that canot be recovered from */
@@ -1401,7 +1406,7 @@ verifyClientApplicationURI(const UA_Client *client) {
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         UA_SecurityPolicy *sp = &client->config.securityPolicies[i];
         if(!sp->localCertificate.data) {
-                UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+                UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                 "skip verifying ApplicationURI for the SecurityPolicy %.*s",
                 (int)sp->policyUri.length, sp->policyUri.data);
                 continue;
@@ -1413,7 +1418,7 @@ verifyClientApplicationURI(const UA_Client *client) {
                                  &sp->localCertificate,
                                  &client->config.clientDescription.applicationUri);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "The configured ApplicationURI does not match the URI "
                            "specified in the certificate for the SecurityPolicy %.*s",
                            (int)sp->policyUri.length, sp->policyUri.data);
@@ -1431,7 +1436,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_Client *client = (UA_Client*)application;
     UA_LOCK(&client->clientMutex);
 
-    UA_LOG_TRACE(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_TRACE(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Client network callback");
 
     /* A new connection is not yet registered */
@@ -1446,7 +1451,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * connection. */
         if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED &&
            client->channel.state != UA_SECURECHANNELSTATE_REVERSE_LISTENING) {
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "Cannot open a connection for SecureChannel that is already used");
             client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
             goto refuse_connection;
@@ -1497,12 +1502,12 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * connecting asynchronously, this happens when the server does not
          * exist or is unresponsive. */
         if(oldState == UA_SECURECHANNELSTATE_CONNECTING) {
-            UA_LOG_INFO_CHANNEL(&client->config.logger, &client->channel,
+            UA_LOG_INFO_CHANNEL(client->config.logging, &client->channel,
                                 "Could not open the connection");
             goto refuse_connection; /* The client cannot recover from this */
         }
 
-        UA_LOG_INFO_CHANNEL(&client->config.logger, &client->channel,
+        UA_LOG_INFO_CHANNEL(client->config.logging, &client->channel,
                             "Closed the SecureChannel");
 
         /* Try to reconnect */
@@ -1520,7 +1525,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         UA_SecureChannel_processBuffer(&client->channel, client,
                                        processServiceResponse, &msg);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "Processing the message returned the error code %s",
                      UA_StatusCode_name(res));
 
@@ -1564,7 +1569,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 static void
 initConnect(UA_Client *client) {
     if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Client connection already initiated");
         return;
     }
@@ -1596,7 +1601,7 @@ initConnect(UA_Client *client) {
     client->connectStatus =
         UA_parseEndpointUrl(&client->config.endpointUrl, &hostname, &port, &path);
     if(client->connectStatus != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_NETWORK,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                        "OPC UA URL is invalid: %.*s",
                        (int)client->config.endpointUrl.length,
                        client->config.endpointUrl.data);
@@ -1640,7 +1645,7 @@ initConnect(UA_Client *client) {
 
     /* Opening the TCP connection failed */
     if(client->connectStatus != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Could not open a TCP connection to %.*s",
                        (int)client->config.endpointUrl.length,
                        client->config.endpointUrl.data);
@@ -1674,7 +1679,7 @@ connectSync(UA_Client *client) {
         /* Timeout -> abort */
         now = UA_DateTime_nowMonotonic();
         if(maxDate < now) {
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "The connection has timed out before it could be fully opened");
             client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
             closeSecureChannel(client);
@@ -1747,7 +1752,7 @@ activateSessionSync(UA_Client *client) {
         /* Timeout -> abort */
         now = UA_DateTime_nowMonotonic();
         if(maxDate < now) {
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "The connection has timed out before it could be fully opened");
             client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
             closeSecureChannel(client);
@@ -1794,7 +1799,7 @@ UA_Client_getSessionAuthenticationToken(UA_Client *client, UA_NodeId *authentica
     UA_LOCK(&client->clientMutex);
     if(client->sessionState != UA_SESSIONSTATE_CREATED &&
        client->sessionState != UA_SESSIONSTATE_ACTIVATED) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "There is no current session");
         UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADSESSIONCLOSED;
@@ -1812,7 +1817,7 @@ switchSession(UA_Client *client,
               const UA_ByteString serverNonce) {
     /* Check that there is no pending session in the client */
     if(client->sessionState != UA_SESSIONSTATE_CLOSED) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "Cannot activate a session with a different AuthenticationToken "
                      "when the client already has a Session.");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -1931,7 +1936,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     UA_LOCK(&client->clientMutex);
 
     if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Unable to listen for reverse connect while the client "
                        "is connected or already listening");
         UA_UNLOCK(&client->clientMutex);
@@ -1956,7 +1961,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
 
     UA_EventLoop *el = client->config.eventLoop;
     if(!el) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "No EventLoop configured");
         UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -1978,7 +1983,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     }
 
     if(!cm) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Could not find a TCP connection manager, unable to "
                        "listen for reverse connect");
         UA_UNLOCK(&client->clientMutex);
@@ -2007,7 +2012,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
 
     /* Opening the TCP connection failed */
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Failed to open a listening TCP socket for reverse connect");
         res = UA_STATUSCODE_BADCONNECTIONCLOSED;
     }
@@ -2033,12 +2038,12 @@ closeSecureChannel(UA_Client *client) {
        client->channel.state == UA_SECURECHANNELSTATE_CLOSED)
         return;
 
-    UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
+    UA_LOG_DEBUG_CHANNEL(client->config.logging, &client->channel,
                          "Closing the channel");
 
     /* Send CLO if the SecureChannel is open */
     if(client->channel.state == UA_SECURECHANNELSTATE_OPEN) {
-        UA_LOG_DEBUG_CHANNEL(&client->config.logger, &client->channel,
+        UA_LOG_DEBUG_CHANNEL(client->config.logging, &client->channel,
                              "Sending the CLO message");
 
         /* Manually set up the header (otherwise done in sendRequest) */
diff --git a/src/client/ua_client_discovery.c b/src/client/ua_client_discovery.c
index 7f948b157e4..4dbcd30e90b 100644
--- a/src/client/ua_client_discovery.c
+++ b/src/client/ua_client_discovery.c
@@ -15,7 +15,7 @@ Client_warnEndpointsResult(UA_Client *client,
                            const UA_GetEndpointsResponse *response,
                            const UA_String *endpointUrl) {
     if(response->endpointsSize == 0) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "The server did not return any endpoints. "
                        "Did you use the correct endpointUrl?");
         return;
@@ -27,7 +27,7 @@ Client_warnEndpointsResult(UA_Client *client,
         UA_String *betterUrl = &response->endpoints[0].endpointUrl;
         if(response->endpoints[0].server.discoveryUrlsSize > 0)
             betterUrl = &response->endpoints[0].server.discoveryUrls[0];
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "The server returned Endpoints with a different EndpointUrl %.*s than was "
                        "used to initialize the connection: %.*s. Some servers require a complete "
                        "match of the EndpointUrl/DiscoveryUrl (including the path) "
@@ -57,7 +57,7 @@ getEndpointsInternal(UA_Client *client, const UA_String endpointUrl,
 
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_StatusCode retval = response.responseHeader.serviceResult;
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "GetEndpointRequest failed with error code %s",
                      UA_StatusCode_name(retval));
         UA_GetEndpointsResponse_clear(&response);
diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index 8782cb77e00..83a522dd81e 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -835,7 +835,7 @@ static void
 AttributeReadCallback(UA_Client *client, void *userdata,
                       UA_UInt32 requestId, UA_ReadResponse *rr) {
     UA_AttributeReadContext *ctx = (UA_AttributeReadContext*)userdata;
-    UA_LOG_DEBUG(&UA_Client_getConfig(client)->logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_DEBUG(UA_Client_getConfig(client)->logging, UA_LOGCATEGORY_CLIENT,
                 "Async read response for request %" PRIu32, requestId);
 
     UA_DataValue *dv = NULL;
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 010373179aa..c2969804d94 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -187,7 +187,7 @@ ua_Subscriptions_modify_handler(UA_Client *client, void *data, UA_UInt32 request
     if(sub) {
         ua_Subscriptions_modify(client, sub, response);
     } else {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                     "No internal representation of subscription %" PRIu32,
                     (UA_UInt32)(uintptr_t)cc->clientData);
     }
@@ -315,7 +315,7 @@ __Client_Subscription_processDelete(UA_Client *client,
         UA_Client_Subscription *sub =
             findSubscription(client, request->subscriptionIds[i]);
         if(!sub) {
-            UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "No internal representation of subscription %" PRIu32,
                         request->subscriptionIds[i]);
             continue;
@@ -512,7 +512,7 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
             (request->itemsToCreate[i].itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER);
         ZIP_INSERT(MonitorItemsTree, &sub->monitoredItems, newMon);
 
-        UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "Subscription %" PRIu32 " | Added a MonitoredItem with handle %" PRIu32,
                      sub->subscriptionId, newMon->clientHandle);
     }
@@ -832,7 +832,7 @@ ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId
 
     sub = findSubscription(client, request->subscriptionId);
     if(!sub) {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                     "No internal representation of subscription %" PRIu32,
                     request->subscriptionId);
         goto cleanup;
@@ -866,7 +866,7 @@ UA_Client_MonitoredItems_delete(UA_Client *client,
     /* Find the internal subscription representation */
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
-        UA_LOG_INFO(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                     "No internal representation of subscription %" PRIu32,
                     request.subscriptionId);
         UA_UNLOCK(&client->clientMutex);
@@ -1040,14 +1040,14 @@ processDataChangeNotification(UA_Client *client, UA_Client_Subscription *sub,
         mon = ZIP_FIND(MonitorItemsTree, &sub->monitoredItems, &dummy);
 
         if(!mon) {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Could not process a notification with clienthandle %" PRIu32
                            " on subscription %" PRIu32, min->clientHandle, sub->subscriptionId);
             continue;
         }
 
         if(mon->isEventMonitoredItem) {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "MonitoredItem is configured for Events. But received a "
                            "DataChangeNotification.");
             continue;
@@ -1080,7 +1080,7 @@ processEventNotification(UA_Client *client, UA_Client_Subscription *sub,
         mon = ZIP_FIND(MonitorItemsTree, &sub->monitoredItems, &dummy);
 
         if(!mon) {
-            UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "Could not process a notification with clienthandle %" PRIu32
                          " on subscription %" PRIu32, eventFieldList->clientHandle,
                          sub->subscriptionId);
@@ -1088,7 +1088,7 @@ processEventNotification(UA_Client *client, UA_Client_Subscription *sub,
         }
 
         if(!mon->isEventMonitoredItem) {
-            UA_LOG_DEBUG(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "MonitoredItem is configured for DataChanges. But received a "
                          "EventNotification.");
             continue;
@@ -1140,14 +1140,14 @@ processNotificationMessage(UA_Client *client, UA_Client_Subscription *sub,
                                       (UA_StatusChangeNotification*)msg->content.decoded.data);
             UA_LOCK(&client->clientMutex);
         } else {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Dropped a StatusChangeNotification since no "
                            "callback is registered");
         }
         return;
     }
 
-    UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                    "Unknown notification message type");
 }
 
@@ -1163,11 +1163,11 @@ __Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishReque
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADTOOMANYPUBLISHREQUESTS) {
         if(client->config.outStandingPublishRequests > 1) {
             client->config.outStandingPublishRequests--;
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Too many publishrequest, reduce outStandingPublishRequests "
                            "to %" PRId16, client->config.outStandingPublishRequests);
         } else {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Too many publishrequest when outStandingPublishRequests = 1");
             UA_Client_Subscriptions_deleteSingle(client, response->subscriptionId);
         }
@@ -1179,7 +1179,7 @@ __Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishReque
 
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADNOSUBSCRIPTION) 
     {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Received BadNoSubscription, delete internal information about subscription");
         UA_Client_Subscription *sub = findSubscription(client, response->subscriptionId);
         if(sub != NULL)
@@ -1195,14 +1195,14 @@ __Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishReque
     UA_Client_Subscription *sub = findSubscription(client, response->subscriptionId);
     if(!sub) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Received Publish Response for a non-existant subscription");
         return;
     }
 
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
         if(client->sessionState != UA_SESSIONSTATE_ACTIVATED) {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Received Publish Response with code %s",
                            UA_StatusCode_name(response->responseHeader.serviceResult));
             __Client_Subscription_deleteInternal(client, sub);
@@ -1218,13 +1218,13 @@ __Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishReque
             client->config.subscriptionInactivityCallback(client, subId, subC);
             UA_LOCK(&client->clientMutex);
         }
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Received Timeout for Publish Response");
         return;
     }
 
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Received Publish Response with code %s",
                        UA_StatusCode_name(response->responseHeader.serviceResult));
         return;
@@ -1234,7 +1234,7 @@ __Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishReque
 
     /* Detect missing message - OPC Unified Architecture, Part 4 5.13.1.1 e) */
     if(__nextSequenceNumber(sub->sequenceNumber) != msg->sequenceNumber) {
-        UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Invalid subscription sequence number: expected %" PRIu32
                        " but got %" PRIu32, __nextSequenceNumber(sub->sequenceNumber),
                        msg->sequenceNumber);
@@ -1262,7 +1262,7 @@ __Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishReque
         UA_Client_NotificationsAckNumber *tmpAck = (UA_Client_NotificationsAckNumber*)
             UA_malloc(sizeof(UA_Client_NotificationsAckNumber));
         if(!tmpAck) {
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Not enough memory to store the acknowledgement for a publish "
                            "message on subscription %" PRIu32, sub->subscriptionId);
             break;
@@ -1338,7 +1338,7 @@ __Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client) {
                 client->config.subscriptionInactivityCallback(client, subId, subC);
                 UA_LOCK(&client->clientMutex);
             }
-            UA_LOG_WARNING(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Inactivity for Subscription %" PRIu32 ".", sub->subscriptionId);
         }
     }
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 3ebf307066d..7bb83f608cb 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -444,12 +444,10 @@ UA_Server_newWithConfig(UA_ServerConfig *config) {
         /* re-set the logger pointer */
         server->config.logging = &server->config.logger;
     }
-    if(!server->config.secureChannelPKI.logging ||
-       server->config.secureChannelPKI.logging == &config->logging)
-        server->config.secureChannelPKI.logging = &server->config.logging;
-    if(!server->config.sessionPKI.logging ||
-       server->config.sessionPKI.logging == &config->logging)
-        server->config.sessionPKI.logging = &server->config.logging;
+    if(!server->config.secureChannelPKI.logging)
+        server->config.secureChannelPKI.logging = server->config.logging;
+    if(!server->config.sessionPKI.logging)
+        server->config.sessionPKI.logging = server->config.logging;
 
     /* Reset the old config */
     memset(config, 0, sizeof(UA_ServerConfig));

From 39eb8e4e1d39616ca855e5972964653a9984a2d0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 01:34:32 +0100
Subject: [PATCH 1302/1963] refactor(server): For Discovery first try
 RegisterServer then RegisterServer2

---
 src/server/ua_discovery.c | 66 ++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
index 69957343b1c..1d24e81a772 100644
--- a/src/server/ua_discovery.c
+++ b/src/server/ua_discovery.c
@@ -259,11 +259,11 @@ asyncRegisterRequest_clearAsync(asyncRegisterRequest *ar) {
 }
 
 static void
-registerAsyncResponse(UA_Client *client, void *userdata,
-                      UA_UInt32 requestId, void *resp) {
+register2AsyncResponse(UA_Client *client, void *userdata,
+                       UA_UInt32 requestId, void *resp) {
     asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
     const UA_ServerConfig *sc = ar->dm->serverConfig;
-    UA_RegisterServerResponse *response = (UA_RegisterServerResponse*)resp;
+    UA_RegisterServer2Response *response = (UA_RegisterServer2Response*)resp;
     if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
                     "RegisterServer succeeded");
@@ -302,11 +302,11 @@ setupRegisterRequest(asyncRegisterRequest *ar, UA_RequestHeader *rh,
 }
 
 static void
-register2AsyncResponse(UA_Client *client, void *userdata,
+registerAsyncResponse(UA_Client *client, void *userdata,
                        UA_UInt32 requestId, void *resp) {
     asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
-    const UA_ServerConfig *sc = ar->dm->serverConfig;
-    UA_RegisterServer2Response *response = (UA_RegisterServer2Response*)resp;
+    UA_ServerConfig *sc = ar->dm->serverConfig;
+    UA_RegisterServerResponse *response = (UA_RegisterServerResponse*)resp;
 
     /* Success */
     UA_StatusCode serviceResult = response->responseHeader.serviceResult;
@@ -331,15 +331,25 @@ register2AsyncResponse(UA_Client *client, void *userdata,
         return;
     }
 
-    /* Try RegisterServer */
-    UA_RegisterServerRequest request;
-    UA_RegisterServerRequest_init(&request);
+    /* Try RegisterServer2 */
+    UA_RegisterServer2Request request;
+    UA_RegisterServer2Request_init(&request);
     setupRegisterRequest(ar, &request.requestHeader, &request.server);
+
+    /* Set the configuration that is only available for UA_RegisterServer2Request */
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    UA_ExtensionObject mdnsConfig;
+    UA_ExtensionObject_setValueNoDelete(&mdnsConfig, &sc->mdnsConfig,
+                                        &UA_TYPES[UA_TYPES_MDNSDISCOVERYCONFIGURATION]);
+    request.discoveryConfigurationSize = 1;
+    request.discoveryConfiguration = &mdnsConfig;
+#endif
+
     UA_StatusCode res =
         __UA_Client_AsyncService(client, &request,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST],
-                                 registerAsyncResponse,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE],
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2REQUEST],
+                                 register2AsyncResponse,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2RESPONSE],
                                  ar, NULL);
     if(res != UA_STATUSCODE_GOOD) {
         /* Close the client connection, will be cleaned up in the client state
@@ -377,33 +387,33 @@ discoveryClientStateCallback(UA_Client *client,
     if(channelState != UA_SECURECHANNELSTATE_OPEN)
         return;
 
+    /* Is this the encrypted SecureChannel already? (We might have to wait for
+     * the second connection after the FindServers handshake */
+    UA_MessageSecurityMode msm = UA_MESSAGESECURITYMODE_INVALID;
+    UA_Client_getConnectionAttribute_scalar(client, UA_QUALIFIEDNAME(0, "securityMode"),
+                                            &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE],
+                                            &msm);
+    if(msm != UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
+        return;
+
     /* Prepare the request. This does not allocate memory */
-    UA_RegisterServer2Request request;
-    UA_RegisterServer2Request_init(&request);
+    UA_RegisterServerRequest request;
+    UA_RegisterServerRequest_init(&request);
     setupRegisterRequest(ar, &request.requestHeader, &request.server);
 
-    /* Set the configuration that is only available for UA_RegisterServer2Request */
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    UA_ExtensionObject mdnsConfig;
-    UA_ExtensionObject_setValueNoDelete(&mdnsConfig, &sc->mdnsConfig,
-                                        &UA_TYPES[UA_TYPES_MDNSDISCOVERYCONFIGURATION]);
-    request.discoveryConfigurationSize = 1;
-    request.discoveryConfiguration = &mdnsConfig;
-#endif
-
-    /* Try to call RegisterServer2 */
+    /* Try to call RegisterServer */
     UA_StatusCode res =
         __UA_Client_AsyncService(client, &request,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2REQUEST],
-                                 register2AsyncResponse,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2RESPONSE],
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST],
+                                 registerAsyncResponse,
+                                 &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE],
                                  ar, NULL);
     if(res != UA_STATUSCODE_GOOD) {
         /* Close the client connection, will be cleaned up in the client state
          * callback when closing is complete */
         UA_Client_disconnectSecureChannelAsync(ar->client);
         UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
-                     "RegisterServer2 failed with statuscode %s",
+                     "RegisterServer failed with statuscode %s",
                      UA_StatusCode_name(res));
     }
 }

From c5f80e9e208aa96ff84086586982ef0b0d48fde0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 01:35:08 +0100
Subject: [PATCH 1303/1963] refactor(client): Cosmetic cleanup in client.h

---
 include/open62541/client.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 0f5e1950aed..20afb2a9807 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -575,9 +575,12 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
  * @return Indicates whether the operation succeeded or returns an error code */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
-                               UA_UInt32 startingRecordId, UA_UInt32 maxRecordsToReturn,
-                               size_t serverCapabilityFilterSize, UA_String *serverCapabilityFilter,
-                               size_t *serverOnNetworkSize, UA_ServerOnNetwork **serverOnNetwork);
+                               UA_UInt32 startingRecordId,
+                               UA_UInt32 maxRecordsToReturn,
+                               size_t serverCapabilityFilterSize,
+                               UA_String *serverCapabilityFilter,
+                               size_t *serverOnNetworkSize,
+                               UA_ServerOnNetwork **serverOnNetwork);
 
 /**
  * .. _client-services:

From b3f4444cc905fb9be567ebd374deba0c524b6908 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 01:35:30 +0100
Subject: [PATCH 1304/1963] refactor(server): Fix comment in server.h

---
 include/open62541/server.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index bb4624dc491..6b0e0202612 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -569,7 +569,7 @@ UA_EXPORT UA_StatusCode UA_THREADSAFE
 UA_Server_getSessionAttributeCopy(UA_Server *server, const UA_NodeId *sessionId,
                                   const UA_QualifiedName key, UA_Variant *outValue);
 
-/* Returns NULL if the parameter is not defined or not a scalar or not of the
+/* Returns NULL if the attribute is not defined or not a scalar or not of the
  * right datatype. Otherwise a shallow copy of the scalar value is created at
  * the target location of the void pointer. Hence don't use this in a
  * multi-threaded application. */

From b88dbc0e50c98e6389d3f8379a23833ea27bdf4b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 01:36:08 +0100
Subject: [PATCH 1305/1963] refactor(server): Return session attributes with
 UA_VARIANT_DATA_NODELETE

---
 src/server/ua_session.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index 98eb924a6a1..9eb8f42c79c 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -343,7 +343,9 @@ getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
 
     if(copy)
         return UA_Variant_copy(attr, outValue);
+
     *outValue = *attr;
+    outValue->storageType = UA_VARIANT_DATA_NODELETE;
     return UA_STATUSCODE_GOOD;
 }
 

From df01e3edbce60b10aed1b6177d729c1eb8832a6b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 02:28:29 +0100
Subject: [PATCH 1306/1963] refactor(test): Require encryption for the
 discovery tests

---
 tests/CMakeLists.txt           |  8 ++--
 tests/server/check_discovery.c | 71 +++++++++++++++++++++++++++++++++-
 2 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cc8d38edd32..c88c0262625 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -312,10 +312,6 @@ if(UA_ENABLE_SUBSCRIPTIONS)
   ua_add_test(server/check_local_monitored_item.c)
 endif()
 
-if(UA_ENABLE_DISCOVERY)
-    ua_add_test(server/check_discovery.c)
-endif()
-
 if(UA_ENABLE_PUBSUB)
     ua_add_test(pubsub/check_pubsub_encoding.c)
     ua_add_test(pubsub/check_pubsub_encoding_custom.c)
@@ -426,6 +422,10 @@ if(UA_ENABLE_ENCRYPTION)
     else()
         MESSAGE(WARNING "Certificate authentication with LibreSSL as crypto backend is not supported.")
     endif()
+
+    if(UA_ENABLE_DISCOVERY)
+        ua_add_test(server/check_discovery.c)
+    endif()
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS)
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 9a18ea6f77e..a1f70bf5d7e 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -5,8 +5,10 @@
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
 #include <open62541/server_config_default.h>
+#include <open62541/plugin/pki_default.h>
 
 #include "server/ua_server_internal.h"
+#include "../encryption/certificates.h"
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -52,6 +54,22 @@ static void
 configure_lds_server(UA_Server *pServer) {
     UA_ServerConfig *config_lds = UA_Server_getConfig(pServer);
 
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config_lds, 4840,
+                                                   &certificate, &privateKey,
+                                                   NULL, 0, NULL, 0, NULL, 0);
+
+    UA_CertificateVerification_AcceptAll(&config_lds->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config_lds->sessionPKI);
+
     config_lds->applicationDescription.applicationType =
         UA_APPLICATIONTYPE_DISCOVERYSERVER;
     UA_String_clear(&config_lds->applicationDescription.applicationUri);
@@ -119,7 +137,22 @@ setup_register(void) {
 
     server_register = UA_Server_new();
     UA_ServerConfig *config_register = UA_Server_getConfig(server_register);
-    UA_ServerConfig_setMinimal(config_register, 16664, NULL);
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config_register, 16664,
+                                                   &certificate, &privateKey,
+                                                   NULL, 0, NULL, 0, NULL, 0);
+
+    UA_CertificateVerification_AcceptAll(&config_register->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config_register->sessionPKI);
 
     UA_String_clear(&config_register->applicationDescription.applicationUri);
     config_register->applicationDescription.applicationUri =
@@ -150,6 +183,18 @@ registerServer(void) {
     memset(&cc, 0, sizeof(UA_ClientConfig));
     UA_ClientConfig_setDefault(&cc);
 
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
+    UA_CertificateVerification_AcceptAll(&cc.certificateVerification);
+
     *running_register = false;
     THREAD_JOIN(server_thread_register);
 
@@ -170,6 +215,18 @@ unregisterServer(void) {
     memset(&cc, 0, sizeof(UA_ClientConfig));
     UA_ClientConfig_setDefault(&cc);
 
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
+    UA_CertificateVerification_AcceptAll(&cc.certificateVerification);
+
     *running_register = false;
     THREAD_JOIN(server_thread_register);
 
@@ -204,6 +261,18 @@ Server_register_semaphore(void) {
     memset(&cc, 0, sizeof(UA_ClientConfig));
     UA_ClientConfig_setDefault(&cc);
 
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
+    UA_CertificateVerification_AcceptAll(&cc.certificateVerification);
+
     *running_register = false;
     THREAD_JOIN(server_thread_register);
 

From 0271f505799a7a44cc99da06277071d2cdbdf5e6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 02:35:48 +0100
Subject: [PATCH 1307/1963] refactor(server): Only use logging-pointer instead
 of inline structure

We could not adjust all pointers when moving the config "into" the
server.
---
 examples/pubsub/pubsub_publish_encrypted.c    |   2 +-
 .../pubsub/pubsub_publish_encrypted_tpm.c     |   2 +-
 .../pubsub_publish_encrypted_tpm_keystore.c   |   2 +-
 examples/pubsub/pubsub_subscribe_encrypted.c  |   2 +-
 .../pubsub/pubsub_subscribe_encrypted_tpm.c   |   2 +-
 .../pubsub_subscribe_encrypted_tpm_keystore.c |   2 +-
 .../pubsub/sks/pubsub_publish_encrypted_sks.c |   2 +-
 .../sks/pubsub_subscribe_encrypted_sks.c      |   2 +-
 .../pubsub/sks/server_pubsub_central_sks.c    |   2 +-
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |   2 +-
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   |   2 +-
 .../pubsub_realtime/pubsub_TSN_loopback.c     |   4 +-
 .../pubsub_realtime/pubsub_TSN_publisher.c    |   4 +-
 examples/server_ctt.c                         |   6 +-
 examples/server_loglevel.c                    |   4 +-
 include/open62541/server.h                    |   4 +-
 plugins/ua_accesscontrol_default.c            |  12 +-
 plugins/ua_config_default.c                   |  52 +++++----
 plugins/ua_config_json.c                      |  12 +-
 src/pubsub/ua_pubsub_config.c                 | 104 +++++++++---------
 src/pubsub/ua_pubsub_connection.c             |  14 +--
 src/pubsub/ua_pubsub_dataset.c                |  36 +++---
 src/pubsub/ua_pubsub_eventloop.c              |  66 +++++------
 src/pubsub/ua_pubsub_keystorage.c             |  25 ++---
 src/pubsub/ua_pubsub_manager.c                |  62 +++++------
 src/pubsub/ua_pubsub_ns0.c                    |  76 ++++++-------
 src/pubsub/ua_pubsub_reader.c                 |  92 ++++++++--------
 src/pubsub/ua_pubsub_readergroup.c            |  34 +++---
 src/pubsub/ua_pubsub_securitygroup.c          |   8 +-
 src/pubsub/ua_pubsub_writer.c                 |  38 +++----
 src/pubsub/ua_pubsub_writergroup.c            |  54 ++++-----
 src/server/ua_discovery.c                     |  34 +++---
 src/server/ua_discovery.h                     |   2 +-
 src/server/ua_discovery_mdns.c                |   4 +-
 src/server/ua_server.c                        |  43 +++-----
 src/server/ua_server_async.c                  |  26 ++---
 src/server/ua_server_binary.c                 |  68 ++++++------
 src/server/ua_server_config.c                 |  14 +--
 src/server/ua_server_ns0.c                    |   4 +-
 src/server/ua_server_ns0_diagnostics.c        |   4 +-
 src/server/ua_services_attribute.c            |  34 +++---
 src/server/ua_services_discovery.c            |  20 ++--
 src/server/ua_services_method.c               |   4 +-
 src/server/ua_services_monitoreditem.c        |  18 +--
 src/server/ua_services_nodemanagement.c       |  96 ++++++++--------
 src/server/ua_services_securechannel.c        |  14 +--
 src/server/ua_services_session.c              |  52 ++++-----
 src/server/ua_services_subscription.c         |  30 ++---
 src/server/ua_services_view.c                 |  12 +-
 src/server/ua_subscription.c                  |  34 +++---
 .../ua_subscription_alarms_conditions.c       |  78 ++++++-------
 src/server/ua_subscription_datachange.c       |   6 +-
 src/server/ua_subscription_events.c           |  30 ++---
 src/server/ua_subscription_events_filter.c    |   2 +-
 src/server/ua_subscription_monitoreditem.c    |   8 +-
 tests/fuzz/ua_debug_dump_pkgs_file.c          |   2 +-
 tests/pubsub/check_pubsub_decryption.c        |   5 +-
 .../pubsub/check_pubsub_encrypted_rt_levels.c |   2 +-
 tests/pubsub/check_pubsub_encryption.c        |   2 +-
 tests/pubsub/check_pubsub_encryption_aes256.c |   2 +-
 tests/pubsub/check_pubsub_publish_rt_levels.c |   2 +-
 tests/pubsub/check_pubsub_sks_client.c        |   8 +-
 tests/pubsub/check_pubsub_sks_keystorage.c    |   2 +-
 tests/pubsub/check_pubsub_sks_pull.c          |   2 +-
 tests/pubsub/check_pubsub_sks_push.c          |   2 +-
 .../pubsub/check_pubsub_sks_securitygroups.c  |   4 +-
 .../pubsub/check_pubsub_subscribe_encrypted.c |   2 +-
 tests/server/check_server_speed_addnodes.c    |   2 +-
 68 files changed, 687 insertions(+), 716 deletions(-)

diff --git a/examples/pubsub/pubsub_publish_encrypted.c b/examples/pubsub/pubsub_publish_encrypted.c
index c69bfca6291..c1522b7d48f 100644
--- a/examples/pubsub/pubsub_publish_encrypted.c
+++ b/examples/pubsub/pubsub_publish_encrypted.c
@@ -130,7 +130,7 @@ static int run(UA_String *transportProfile,
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
diff --git a/examples/pubsub/pubsub_publish_encrypted_tpm.c b/examples/pubsub/pubsub_publish_encrypted_tpm.c
index c4f42e6e5bd..26d738d0c36 100644
--- a/examples/pubsub/pubsub_publish_encrypted_tpm.c
+++ b/examples/pubsub/pubsub_publish_encrypted_tpm.c
@@ -149,7 +149,7 @@ static int run(UA_String *transportProfile,
     config->pubSubConfig.securityPoliciesSize = 1;
 
     UA_PubSubSecurityPolicy_Aes128CtrTPM(config->pubSubConfig.securityPolicies, userpin, slotId,
-                                         encryptionKeyLabel, signingKeyLabel, &config->logger);
+                                         encryptionKeyLabel, signingKeyLabel, config->logging);
 
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
diff --git a/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c b/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
index d705ee06d75..870330abdd6 100644
--- a/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
+++ b/examples/pubsub/pubsub_publish_encrypted_tpm_keystore.c
@@ -154,7 +154,7 @@ static int run(UA_String *transportProfile,
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
diff --git a/examples/pubsub/pubsub_subscribe_encrypted.c b/examples/pubsub/pubsub_subscribe_encrypted.c
index 02da6d00bc1..b32b0f2d84c 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted.c
@@ -294,7 +294,7 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     /* API calls */
     /* Add PubSubConnection */
diff --git a/examples/pubsub/pubsub_subscribe_encrypted_tpm.c b/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
index a4ce1c55df7..4b95367d0c8 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted_tpm.c
@@ -297,7 +297,7 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     config->pubSubConfig.securityPoliciesSize = 1;
 
     UA_PubSubSecurityPolicy_Aes128CtrTPM(config->pubSubConfig.securityPolicies, userpin, slotId,
-                                         encryptionKeyLabel, signingKeyLabel, &config->logger);
+                                         encryptionKeyLabel, signingKeyLabel, config->logging);
 
     /* API calls */
     /* Add PubSubConnection */
diff --git a/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c b/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
index 73d207c9375..9383dbb5cab 100644
--- a/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
+++ b/examples/pubsub/pubsub_subscribe_encrypted_tpm_keystore.c
@@ -303,7 +303,7 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     /* API calls */
     /* Add PubSubConnection */
diff --git a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
index e60abb8bd20..407dfe2c835 100644
--- a/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
+++ b/examples/pubsub/sks/pubsub_publish_encrypted_sks.c
@@ -152,7 +152,7 @@ run(UA_UInt16 port, UA_String *transportProfile,
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     addPubSubConnection(server, transportProfile, networkAddressUrl);
     addPublishedDataSet(server);
diff --git a/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c b/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
index ef0b2c3c11f..6e7cd452da1 100644
--- a/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
+++ b/examples/pubsub/sks/pubsub_subscribe_encrypted_sks.c
@@ -297,7 +297,7 @@ run(UA_UInt16 port, UA_String *transportProfile,
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     /* API calls */
     /* Add PubSubConnection */
diff --git a/examples/pubsub/sks/server_pubsub_central_sks.c b/examples/pubsub/sks/server_pubsub_central_sks.c
index 91a79c30d91..77839f22156 100644
--- a/examples/pubsub/sks/server_pubsub_central_sks.c
+++ b/examples/pubsub/sks/server_pubsub_central_sks.c
@@ -485,7 +485,7 @@ main(int argc, char **argv) {
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config.pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config.pubSubConfig.securityPolicies,
-                                      &config.logger);
+                                      config.logging);
 
     /* User Access Control */
     config.accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index d10f0f3fb89..22619715d79 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -479,7 +479,7 @@ int main(int argc, char **argv) {
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 #endif
 
     addPubSubConnection(server, addressUrl);
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index 197a8531d67..ec199a88d8f 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -375,7 +375,7 @@ int main(int argc, char **argv) {
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 #endif
 
     /* API calls */
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/pubsub_TSN_loopback.c
index 50821a7b4a5..672b0e277ff 100644
--- a/examples/pubsub_realtime/pubsub_TSN_loopback.c
+++ b/examples/pubsub_realtime/pubsub_TSN_loopback.c
@@ -1595,7 +1595,7 @@ int main(int argc, char **argv) {
 
 #if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && defined(PUBLISHER)
     UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[1],
-                                      &config->logger);
+                                      config->logging);
 #endif
 
 #if defined(PUBLISHER)
@@ -1642,7 +1642,7 @@ if(enableCsvLog)
 
 #if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && defined(SUBSCRIBER)
     UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
-                                      &config->logger);
+                                      config->logging);
 #endif
 
 #if defined(SUBSCRIBER)
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/pubsub_TSN_publisher.c
index d21b1f3cacc..59d2f60a973 100644
--- a/examples/pubsub_realtime/pubsub_TSN_publisher.c
+++ b/examples/pubsub_realtime/pubsub_TSN_publisher.c
@@ -1667,7 +1667,7 @@ int main(int argc, char **argv) {
 
 #if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && defined(PUBLISHER)
     UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
-                                      &config->logger);
+                                      config->logging);
 #endif
 
 #if defined(PUBLISHER)
@@ -1711,7 +1711,7 @@ int main(int argc, char **argv) {
 
 #if defined(UA_ENABLE_PUBSUB_ENCRYPTION) && defined(SUBSCRIBER)
     UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[1],
-                                      &config->logger);
+                                      config->logging);
 #endif
 
 #if defined(SUBSCRIBER)
diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 15adc808bcc..8f65134635e 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -918,7 +918,7 @@ enableNoneSecurityPolicy(UA_ServerConfig *config) {
     UA_StatusCode retval = UA_ServerConfig_addEndpoint(config, UA_SECURITY_POLICY_NONE_URI,
                                          UA_MESSAGESECURITYMODE_NONE);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Failed to add SecurityPolicy#None to the endpoint list.");
     }
     config->securityPolicyNoneDiscoveryOnly = false;
@@ -928,7 +928,7 @@ static void
 enableBasic128SecurityPolicy(UA_ServerConfig *config) {
     UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &certificate, &privateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
                        UA_StatusCode_name(retval));
         return;
@@ -943,7 +943,7 @@ static void
 enableBasic256SecurityPolicy(UA_ServerConfig *config) {
     UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &certificate, &privateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256 with error code %s",
                        UA_StatusCode_name(retval));
         return;
diff --git a/examples/server_loglevel.c b/examples/server_loglevel.c
index 3eae466cdbe..5b433d25a65 100644
--- a/examples/server_loglevel.c
+++ b/examples/server_loglevel.c
@@ -46,10 +46,12 @@ int main(int argc, char **argv) {
     }
 #endif
 
+    UA_Logger logger = UA_Log_Stdout_withLevel( log_level );
+
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    config->logger = UA_Log_Stdout_withLevel( log_level );
+    config->logging = &logger;
 
     /* Some data */
     UA_StatusCode retval;
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 6b0e0202612..26bf452955f 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -82,9 +82,7 @@ typedef struct {
  * The :ref:`tutorials` provide a good starting point for this. */
 
 struct UA_ServerConfig {
-    UA_Logger logger;   /* logger is deprecated but still supported at this time.
-                           Use logging pointer instead. */
-    UA_Logger *logging; /* If NULL and "logger" is set, make this point to "logger" */
+    const UA_Logger *logging; /* Plugin for log output */
     void *context; /* Used to attach custom data to a server config. This can
                     * then be retrieved e.g. in a callback that forwards a
                     * pointer to the server. */
diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 8d2ed7d2208..0d808819df8 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -296,7 +296,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
                          const UA_ByteString *userTokenPolicyUri,
                          size_t usernamePasswordLoginSize,
                          const UA_UsernamePasswordLogin *usernamePasswordLogin) {
-    UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                    "AccessControl: Unconfigured AccessControl. Users have all permissions.");
     UA_AccessControl *ac = &config->accessControl;
 
@@ -336,7 +336,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
     /* Allow anonymous? */
     context->allowAnonymous = allowAnonymous;
     if(allowAnonymous) {
-        UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_INFO(config->logging, UA_LOGCATEGORY_SERVER,
                     "AccessControl: Anonymous login is enabled");
     }
 
@@ -360,7 +360,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
         if(config->securityPoliciesSize > 0)
             numOfPolcies = config->securityPoliciesSize;
         else {
-            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                            "No security policies defined for the secure channel.");
             return UA_STATUSCODE_BADINTERNALERROR;
         }
@@ -382,7 +382,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
     ac->userTokenPoliciesSize = policies * numOfPolcies;
 
     if(policies == 0) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                        "No allowed policies set.");
         return UA_STATUSCODE_GOOD;
     }
@@ -408,7 +408,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
             ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(CERTIFICATE_POLICY);
 #if UA_LOGLEVEL <= 400
             if(UA_ByteString_equal(utpUri, &UA_SECURITY_POLICY_NONE_URI)) {
-                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                                "x509 Certificate Authentication configured, "
                                "but no encrypting SecurityPolicy. "
                                "This can leak credentials on the network.");
@@ -424,7 +424,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
             ac->userTokenPolicies[policies].policyId = UA_STRING_ALLOC(USERNAME_POLICY);
 #if UA_LOGLEVEL <= 400
             if(UA_ByteString_equal(utpUri, &UA_SECURITY_POLICY_NONE_URI)) {
-                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                                "Username/Password Authentication configured, "
                                "but no encrypting SecurityPolicy. "
                                "This can leak credentials on the network.");
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index d541a6f5d04..7c17fb3c037 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -69,7 +69,7 @@ static void
 shutdownServer(UA_Server *server, void *context) {
     struct InterruptContext *ic = (struct InterruptContext*)context;
     UA_ServerConfig *config = UA_Server_getConfig(ic->server);
-    UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(config->logging, UA_LOGCATEGORY_USERLAND,
                 "Stopping the server");
     ic->running = false;
 }
@@ -81,13 +81,13 @@ interruptServer(UA_InterruptManager *im, uintptr_t interruptHandle,
     UA_ServerConfig *config = UA_Server_getConfig(ic->server);
 
     if(config->shutdownDelay <= 0.0) {
-        UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_INFO(config->logging, UA_LOGCATEGORY_USERLAND,
                     "Received SIGINT interrupt. Stopping the server.");
         ic->running = false;
         return;
     }
 
-    UA_LOG_INFO(&config->logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(config->logging, UA_LOGCATEGORY_USERLAND,
                 "Received SIGINT interrupt. Stopping the server in %.2fs.",
                 config->shutdownDelay / 1000.0);
 
@@ -122,7 +122,7 @@ UA_Server_runUntilInterrupt(UA_Server *server) {
         es = es->next;
     }
     if(!es) {
-        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_USERLAND,
                        "No Interrupt EventSource configured");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -136,7 +136,7 @@ UA_Server_runUntilInterrupt(UA_Server *server) {
         im->registerInterrupt(im, SIGINT, &UA_KEYVALUEMAP_NULL,
                               interruptServer, &ic);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_USERLAND,
                      "Could not register the interrupt with status code %s",
                      UA_StatusCode_name(retval));
         return retval;
@@ -267,14 +267,12 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         UA_Nodestore_HashMap(&conf->nodestore);
 
     /* Logging */
-    if(!conf->logger.log)
-        conf->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
     if(conf->logging == NULL)
-        conf->logging = &conf->logger;
+        conf->logging = UA_Log_Stdout;
 
     /* EventLoop */
     if(conf->eventLoop == NULL) {
-        conf->eventLoop = UA_EventLoop_new_POSIX(&conf->logger);
+        conf->eventLoop = UA_EventLoop_new_POSIX(conf->logging);
         if(conf->eventLoop == NULL)
             return UA_STATUSCODE_BADOUTOFMEMORY;
 
@@ -305,7 +303,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         if(im) {
             conf->eventLoop->registerEventSource(conf->eventLoop, &im->eventSource);
         } else {
-            UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
+            UA_LOG_WARNING(conf->logging, UA_LOGCATEGORY_USERLAND,
                            "Cannot create the Interrupt Manager (only relevant if used)");
         }
 #ifdef UA_ENABLE_MQTT
@@ -377,11 +375,11 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     char serverUrlBuffer[2][512];
 
     if(portNumber == 0) {
-        UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(conf->logging, UA_LOGCATEGORY_USERLAND,
                        "Cannot set the ServerUrl with a zero port");
     } else {
         if(conf->serverUrlsSize > 0) {
-            UA_LOG_WARNING(&conf->logger, UA_LOGCATEGORY_USERLAND,
+            UA_LOG_WARNING(conf->logging, UA_LOGCATEGORY_USERLAND,
                            "ServerUrls already set. Overriding.");
             UA_Array_delete(conf->serverUrls, conf->serverUrlsSize,
                             &UA_TYPES[UA_TYPES_STRING]);
@@ -540,7 +538,7 @@ UA_ServerConfig_addSecurityPolicyNone(UA_ServerConfig *config,
         localCertificate = *certificate;
     UA_StatusCode retval =
         UA_SecurityPolicy_None(&config->securityPolicies[config->securityPoliciesSize],
-                               localCertificate, &config->logger);
+                               localCertificate, config->logging);
     if(retval != UA_STATUSCODE_GOOD) {
         if(config->securityPoliciesSize == 0) {
             UA_free(config->securityPolicies);
@@ -697,7 +695,7 @@ UA_ServerConfig_addSecurityPolicyBasic128Rsa15(UA_ServerConfig *config,
        localPrivateKey = *privateKey;
     UA_StatusCode retval =
         UA_SecurityPolicy_Basic128Rsa15(&config->securityPolicies[config->securityPoliciesSize],
-                                        localCertificate, localPrivateKey, &config->logger);
+                                        localCertificate, localPrivateKey, config->logging);
     if(retval != UA_STATUSCODE_GOOD) {
         if(config->securityPoliciesSize == 0) {
             UA_free(config->securityPolicies);
@@ -731,7 +729,7 @@ UA_ServerConfig_addSecurityPolicyBasic256(UA_ServerConfig *config,
        localPrivateKey = *privateKey;
     UA_StatusCode retval =
         UA_SecurityPolicy_Basic256(&config->securityPolicies[config->securityPoliciesSize],
-                                   localCertificate, localPrivateKey, &config->logger);
+                                   localCertificate, localPrivateKey, config->logging);
     if(retval != UA_STATUSCODE_GOOD) {
         if(config->securityPoliciesSize == 0) {
             UA_free(config->securityPolicies);
@@ -765,7 +763,7 @@ UA_ServerConfig_addSecurityPolicyBasic256Sha256(UA_ServerConfig *config,
        localPrivateKey = *privateKey;
     UA_StatusCode retval =
         UA_SecurityPolicy_Basic256Sha256(&config->securityPolicies[config->securityPoliciesSize],
-                                         localCertificate, localPrivateKey, &config->logger);
+                                         localCertificate, localPrivateKey, config->logging);
     if(retval != UA_STATUSCODE_GOOD) {
         if(config->securityPoliciesSize == 0) {
             UA_free(config->securityPolicies);
@@ -799,7 +797,7 @@ UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(UA_ServerConfig *config,
        localPrivateKey = *privateKey;
     UA_StatusCode retval =
         UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->securityPolicies[config->securityPoliciesSize],
-                                              localCertificate, localPrivateKey, &config->logger);
+                                              localCertificate, localPrivateKey, config->logging);
     if(retval != UA_STATUSCODE_GOOD) {
         if(config->securityPoliciesSize == 0) {
             UA_free(config->securityPolicies);
@@ -833,7 +831,7 @@ UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(UA_ServerConfig *config,
         localPrivateKey = *privateKey;
     UA_StatusCode retval =
         UA_SecurityPolicy_Aes256Sha256RsaPss(&config->securityPolicies[config->securityPoliciesSize],
-                                              localCertificate, localPrivateKey, &config->logger);
+                                              localCertificate, localPrivateKey, config->logging);
     if(retval != UA_STATUSCODE_GOOD) {
         if(config->securityPoliciesSize == 0) {
             UA_free(config->securityPolicies);
@@ -861,42 +859,42 @@ UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
 
     UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyNone(config, &localCertificate);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#None with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                        UA_StatusCode_name(retval));
     }
@@ -919,21 +917,21 @@ UA_ServerConfig_addAllSecureSecurityPolicies(UA_ServerConfig *config,
 
     UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
                        UA_StatusCode_name(retval));
     }
diff --git a/plugins/ua_config_json.c b/plugins/ua_config_json.c
index af608fb83c5..defc4c9d6a5 100644
--- a/plugins/ua_config_json.c
+++ b/plugins/ua_config_json.c
@@ -698,7 +698,7 @@ PARSE_JSON(SecurityPolciesField) {
         }
 
         if(certificate.length == 0 || privateKey.length == 0) {
-            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+            UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                            "Certificate and PrivateKey must be set for every policy.");
             if(policy.length > 0)
                 UA_String_clear(&policy);
@@ -714,33 +714,33 @@ PARSE_JSON(SecurityPolciesField) {
         } else if(UA_String_equal(&policy, &basic128Rsa15uri)) {
             retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &certificate, &privateKey);
             if(retval != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                                "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
                                UA_StatusCode_name(retval));
             }
         } else if(UA_String_equal(&policy, &basic256uri)) {
             retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &certificate, &privateKey);
             if(retval != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                                "Could not add SecurityPolicy#Basic256 with error code %s",
                                UA_StatusCode_name(retval));
             }
         } else if(UA_String_equal(&policy, &basic256Sha256uri)) {
             retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &certificate, &privateKey);
             if(retval != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                                "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                                UA_StatusCode_name(retval));
             }
         } else if(UA_String_equal(&policy, &aes128sha256rsaoaepuri)) {
             retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &certificate, &privateKey);
             if(retval != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
+                UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                                "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                                UA_StatusCode_name(retval));
             }
         } else {
-            UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND, "Unknown Security Policy.");
+            UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, "Unknown Security Policy.");
         }
 
         /* Add all Endpoints */
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 0a019b229fd..327895eff49 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -60,7 +60,7 @@ extractPubSubConfigFromExtensionObject(UA_Server *server,
                                        UA_PubSubConfigurationDataType **dst) {
     if(src->encoding != UA_EXTENSIONOBJECT_DECODED ||
        src->content.decoded.type != &UA_TYPES[UA_TYPES_UABINARYFILEDATATYPE]) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_extractPubSubConfigFromDecodedObject] "
                      "Reading extensionObject failed");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -69,14 +69,14 @@ extractPubSubConfigFromExtensionObject(UA_Server *server,
     UA_UABinaryFileDataType *binFile = (UA_UABinaryFileDataType*)src->content.decoded.data;
 
     if(binFile->body.arrayLength != 0 || binFile->body.arrayDimensionsSize != 0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_extractPubSubConfigFromDecodedObject] "
                      "Loading multiple configurations is not supported");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
     if(binFile->body.type != &UA_TYPES[UA_TYPES_PUBSUBCONFIGURATIONDATATYPE]) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_extractPubSubConfigFromDecodedObject] "
                      "Invalid datatype encoded in the binary file");
         return UA_STATUSCODE_BADTYPEMISMATCH;
@@ -93,7 +93,7 @@ updatePubSubConfig(UA_Server *server,
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(configurationParameters == NULL) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_updatePubSubConfig] Invalid argument");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -113,7 +113,7 @@ updatePubSubConfig(UA_Server *server,
                                      &configurationParameters->publishedDataSets[i],
                                      &publishedDataSetIdent[i]);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_updatePubSubConfig] PDS creation failed");
             UA_free(publishedDataSetIdent);
             return res;
@@ -122,7 +122,7 @@ updatePubSubConfig(UA_Server *server,
 
     /* Configuration of PubSub Connections: */
     if(configurationParameters->connectionsSize < 1) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "[UA_PubSubManager_updatePubSubConfig] no connection in "
                        "UA_PubSubConfigurationDataType");
         UA_free(publishedDataSetIdent);
@@ -164,7 +164,7 @@ setConnectionPublisherId(UA_Server *server,
         dst->publisherIdType = UA_PUBLISHERIDTYPE_UINT64;
         dst->publisherId.uint64 = *(UA_UInt64*)src->publisherId.data;
     } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setConnectionPublisherId] PublisherId is not valid.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -186,7 +186,7 @@ createComponentsForConnection(UA_Server *server,
         res = createWriterGroup(server, &connParams->writerGroups[i],
                                 connectionIdent, pdsCount, pdsIdent);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createComponentsForConnection] "
                          "Error occured during %d. WriterGroup Creation", (UA_UInt32)i+1);
             return res;
@@ -197,7 +197,7 @@ createComponentsForConnection(UA_Server *server,
     for(size_t j = 0; j < connParams->readerGroupsSize; j++) {
         res = createReaderGroup(server, &connParams->readerGroups[j], connectionIdent);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createComponentsForConnection] "
                          "Error occured during %d. ReaderGroup Creation", (UA_UInt32)j+1);
             return res;
@@ -229,7 +229,7 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
 
     UA_StatusCode res = setConnectionPublisherId(server, connParams, &config);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPubSubConnection] "
                      "Setting PublisherId failed");
         return res;
@@ -240,7 +240,7 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
                              connParams->address.content.decoded.data,
                              connParams->address.content.decoded.type);
     } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPubSubConnection] "
                      "Reading connection address failed");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -251,7 +251,7 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
                              connParams->transportSettings.content.decoded.data,
                              connParams->transportSettings.content.decoded.type);
     } else {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "[UA_PubSubManager_createPubSubConnection] "
                        "TransportSettings can not be read");
     }
@@ -264,7 +264,7 @@ createPubSubConnection(UA_Server *server, const UA_PubSubConnectionDataType *con
         res = createComponentsForConnection(server, connParams, connectionIdent,
                                             pdsCount, pdsIdent);
     } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPubSubConnection] "
                      "Connection creation failed");
     }
@@ -279,7 +279,7 @@ setWriterGroupEncodingType(UA_Server *server,
                            const UA_WriterGroupDataType *writerGroupParameters,
                            UA_WriterGroupConfig *config) {
     if(writerGroupParameters->messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setWriterGroupEncodingType] "
                      "getting message type information failed");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -290,12 +290,12 @@ setWriterGroupEncodingType(UA_Server *server,
         config->encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     } else if(writerGroupParameters->messageSettings.content.decoded.type ==
               &UA_TYPES[UA_TYPES_JSONWRITERGROUPMESSAGEDATATYPE]) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setWriterGroupEncodingType] "
                      "encoding type: JSON (not implemented!)");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setWriterGroupEncodingType] "
                      "invalid message encoding type");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -335,7 +335,7 @@ createWriterGroup(UA_Server *server,
 
     UA_StatusCode res = setWriterGroupEncodingType(server, writerGroupParameters, &config);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createWriterGroup] "
                      "Setting message settings failed");
         return res;
@@ -348,7 +348,7 @@ createWriterGroup(UA_Server *server,
     if(wg)
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL, UA_STATUSCODE_GOOD);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createWriterGroup] "
                      "Adding WriterGroup to server failed: 0x%x", res);
         return res;
@@ -359,7 +359,7 @@ createWriterGroup(UA_Server *server,
         res = createDataSetWriter(server, &writerGroupParameters->dataSetWriters[dsw],
                                   writerGroupIdent, pdsCount, pdsIdent);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createWriterGroup] "
                          "DataSetWriter Creation failed.");
             break;
@@ -392,7 +392,7 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
         res = getPublishedDataSetConfig(server, pdsIdent[pds], &pdsConfig);
         /* members of pdsConfig must be deleted manually */
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addDataSetWriterWithPdsReference] "
                          "Getting pdsConfig from NodeId failed.");
             return res;
@@ -406,7 +406,7 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
             res = UA_DataSetWriter_create(server, writerGroupIdent, pdsIdent[pds],
                                           dsWriterConfig, &dataSetWriterIdent);
             if(res != UA_STATUSCODE_GOOD) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                              "[UA_PubSubManager_addDataSetWriterWithPdsReference] "
                              "Adding DataSetWriter failed");
             } else {
@@ -420,7 +420,7 @@ addDataSetWriterWithPdsReference(UA_Server *server, UA_NodeId writerGroupIdent,
     }
 
     if(!pdsFound) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_addDataSetWriterWithPdsReference] "
                      "No matching DataSet found; no DataSetWriter created");
     }
@@ -456,7 +456,7 @@ createDataSetWriter(UA_Server *server,
     UA_StatusCode res = addDataSetWriterWithPdsReference(server, writerGroupIdent,
                                                          &config, pdsCount, pdsIdent);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createDataSetWriter] "
                      "Referencing related PDS failed");
     }
@@ -485,19 +485,19 @@ createReaderGroup(UA_Server *server,
     UA_StatusCode res =
         UA_ReaderGroup_create(server, connectionIdent, &config, &readerGroupIdent);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createReaderGroup] Adding ReaderGroup "
                      "to server failed: 0x%x", res);
         return res;
     }
 
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "[UA_PubSubManager_createReaderGroup] ReaderGroup successfully added.");
     for(UA_UInt32 i = 0; i < readerGroupParameters->dataSetReadersSize; i++) {
         res = createDataSetReader(server, &readerGroupParameters->dataSetReaders[i],
                                   readerGroupIdent);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_createReaderGroup] Creating DataSetReader failed");
             break;
         }
@@ -540,7 +540,7 @@ addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
                                                       tmpTargetVars->targetVariablesSize,
                                                       targetVars);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addSubscribedDataSet] "
                          "create TargetVariables failed");
         }
@@ -555,13 +555,13 @@ addSubscribedDataSet(UA_Server *server, const UA_NodeId dsReaderIdent,
 
     if(subscribedDataSet->content.decoded.type ==
        &UA_TYPES[UA_TYPES_SUBSCRIBEDDATASETMIRRORDATATYPE]) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_addSubscribedDataSet] "
                      "DataSetMirror is currently not supported");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                  "[UA_PubSubManager_addSubscribedDataSet] "
                  "Invalid Type of SubscribedDataSet");
     return UA_STATUSCODE_BADINTERNALERROR;
@@ -596,7 +596,7 @@ createDataSetReader(UA_Server *server, const UA_DataSetReaderDataType *dsrParams
         res = addSubscribedDataSet(server, dsReaderIdent,
                                    &dsrParams->subscribedDataSet);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createDataSetReader] "
                      "create subscribedDataSet failed");
     }
@@ -622,12 +622,12 @@ setPublishedDataSetType(UA_Server *server,
         return UA_STATUSCODE_GOOD;
     } else if(sourceType == &UA_TYPES[UA_TYPES_PUBLISHEDEVENTSDATATYPE]) {
         /* config.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDEVENTS; */
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setPublishedDataSetType] Published events not supported.");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                  "[UA_PubSubManager_setPublishedDataSetType] Invalid DataSetSourceDataType.");
     return UA_STATUSCODE_BADINTERNALERROR;
 }
@@ -653,7 +653,7 @@ createPublishedDataSet(UA_Server *server,
 
     res = UA_PublishedDataSet_create(server, &config, pdsIdent).addResult;
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPublishedDataSet] "
                      "Adding PublishedDataSet failed.");
         return res;
@@ -662,7 +662,7 @@ createPublishedDataSet(UA_Server *server,
     /* DataSetField configuration for this publishedDataSet: */
     res = createDataSetFields(server, pdsIdent, pdsParams);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createPublishedDataSet] "
                      "Creating DataSetFieldConfig failed.");
     }
@@ -700,7 +700,7 @@ addDataSetFieldVariables(UA_Server *server, const UA_NodeId *pdsIdent,
         UA_NodeId fieldIdent;
         UA_StatusCode res = UA_DataSetField_create(server, *pdsIdent, &fc, &fieldIdent).result;
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_addDataSetFieldVariables] "
                          "Adding DataSetField Variable failed.");
             return res;
@@ -731,13 +731,13 @@ createDataSetFields(UA_Server *server, const UA_NodeId *pdsIdent,
     /* TODO: Implement Routine for adding Event DataSetFields */
     if(pdsParams->dataSetSource.content.decoded.type ==
        &UA_TYPES[UA_TYPES_PUBLISHEDEVENTSDATATYPE]) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_createDataSetFields] "
                      "Published events not supported.");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }
 
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                  "[UA_PubSubManager_createDataSetFields] "
                  "Invalid DataSetSourceDataType.");
     return UA_STATUSCODE_BADINTERNALERROR;
@@ -751,7 +751,7 @@ UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
     UA_StatusCode res;
 
     if(server == NULL) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_loadPubSubConfigFromByteString] Invalid argument");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -760,7 +760,7 @@ UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
 
     res = UA_ExtensionObject_decodeBinary(&buffer, &offset, &decodedFile);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_decodeBinFile] decoding UA_Binary failed");
         goto cleanup;
     }
@@ -768,7 +768,7 @@ UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
     UA_PubSubConfigurationDataType *pubSubConfig = NULL;
     res = extractPubSubConfigFromExtensionObject(server, &decodedFile, &pubSubConfig);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_loadPubSubConfigFromByteString] "
                      "Extracting PubSub Configuration failed");
         goto cleanup;
@@ -776,7 +776,7 @@ UA_PubSubManager_loadPubSubConfigFromByteString(UA_Server *server,
 
     res = updatePubSubConfig(server, pubSubConfig);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_loadPubSubConfigFromByteString] "
                      "Loading PubSub configuration into server failed");
         goto cleanup;
@@ -809,7 +809,7 @@ encodePubSubConfiguration(UA_Server *server,
     size_t fileSize = UA_ExtensionObject_calcSizeBinary(&container);
     buffer->data = (UA_Byte*)UA_calloc(fileSize, sizeof(UA_Byte));
     if(buffer->data == NULL) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_encodePubSubConfiguration] Allocating buffer failed");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
@@ -820,7 +820,7 @@ encodePubSubConfiguration(UA_Server *server,
     UA_StatusCode res =
         UA_ExtensionObject_encodeBinary(&container, &bufferPos, bufferPos + fileSize);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_encodePubSubConfiguration] Encoding failed");
     }
     return res;
@@ -844,7 +844,7 @@ generatePublishedDataSetDataType(UA_Server* server,
     tmp->publishedData = (UA_PublishedVariableDataType*)
         UA_Array_new(tmp->publishedDataSize, &UA_TYPES[UA_TYPES_PUBLISHEDVARIABLEDATATYPE]);
     if(tmp->publishedData == NULL) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Allocation memory failed");
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "Allocation memory failed");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -852,7 +852,7 @@ generatePublishedDataSetDataType(UA_Server* server,
         UA_Array_new(dst->dataSetMetaData.fieldsSize, &UA_TYPES[UA_TYPES_FIELDMETADATA]);
     if(dst->dataSetMetaData.fields == NULL) {
         UA_free(tmp->publishedData);
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Allocation memory failed");
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "Allocation memory failed");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -1051,7 +1051,7 @@ generatePubSubConnectionDataType(UA_Server* server,
             publisherIdType = &UA_TYPES[UA_TYPES_STRING];
             break;
         default:
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "generatePubSubConnectionDataType(): publisher Id type is not supported");
             return UA_STATUSCODE_BADINTERNALERROR;
             break;
@@ -1149,7 +1149,7 @@ generatePubSubConfigurationDataType(UA_Server* server,
         UA_PublishedDataSetDataType *dst = &configDT->publishedDataSets[pdsIndex];
         res = generatePublishedDataSetDataType(server, pds, dst);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_generatePubSubConfigurationDataType] "
                          "retrieving PublishedDataSet configuration failed");
             return res;
@@ -1169,7 +1169,7 @@ generatePubSubConfigurationDataType(UA_Server* server,
         UA_PubSubConnectionDataType *cdt = &configDT->connections[connectionIndex];
         res = generatePubSubConnectionDataType(server, connection, cdt);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "[UA_PubSubManager_generatePubSubConfigurationDataType] "
                          "retrieving PubSubConnection configuration failed");
             return res;
@@ -1187,7 +1187,7 @@ UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
     memset(&config, 0, sizeof(UA_PubSubConfigurationDataType));
 
     if(server == NULL) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_getEncodedPubSubConfiguration] Invalid argument");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -1196,19 +1196,19 @@ UA_PubSubManager_getEncodedPubSubConfiguration(UA_Server *server,
 
     UA_StatusCode res = generatePubSubConfigurationDataType(server, &config);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "retrieving PubSub configuration from server failed");
         goto cleanup;
     }
 
     res = encodePubSubConfiguration(server, &config, buffer);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "encoding PubSub configuration failed");
         goto cleanup;
     }
 
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "Saving PubSub config was successful");
 
  cleanup:
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index c73f29f9aa3..0cf31766fde 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -36,7 +36,7 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
 
     UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buffer, pos, nm);
     if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+        UA_LOG_WARNING_CONNECTION(server->config.logging, connection,
                                   "PubSub receive. decoding headers failed");
         UA_NetworkMessage_clear(nm);
         return rv;
@@ -56,10 +56,10 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
             if(retval != UA_STATUSCODE_GOOD)
                 continue;
             processed = true;
-            rv = verifyAndDecryptNetworkMessage(&server->config.logger, buffer, pos,
+            rv = verifyAndDecryptNetworkMessage(server->config.logging, buffer, pos,
                                                 nm, readerGroup);
             if(rv != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+                UA_LOG_WARNING_CONNECTION(server->config.logging, connection,
                                           "Subscribe failed, verify and decrypt "
                                           "network message failed.");
                 UA_NetworkMessage_clear(nm);
@@ -73,7 +73,7 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
 
 loops_exit:
     if(!processed) {
-        UA_LOG_INFO_CONNECTION(&server->config.logger, connection,
+        UA_LOG_INFO_CONNECTION(server->config.logging, connection,
                                "Dataset reader not found. Check PublisherId, "
                                "WriterGroupId and DatasetWriterId");
         /* Possible multicast scenario: there are multiple connections (with one
@@ -164,14 +164,14 @@ UA_PubSubConnection_create(UA_Server *server, const UA_PubSubConnectionConfig *c
     /* Validate preconditions */
     UA_CHECK_MEM(server, return UA_STATUSCODE_BADINTERNALERROR);
     UA_CHECK_ERROR(cc != NULL, return UA_STATUSCODE_BADINTERNALERROR,
-                   &server->config.logger, UA_LOGCATEGORY_SERVER,
+                   server->config.logging, UA_LOGCATEGORY_SERVER,
                    "PubSub Connection creation failed. Missing connection configuration.");
 
     /* Allocate */
     UA_PubSubConnection *c = (UA_PubSubConnection *)
         UA_calloc(1, sizeof(UA_PubSubConnection));
     if(!c) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PubSub Connection creation failed. Out of Memory.");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
@@ -334,7 +334,7 @@ UA_PubSubConnection_setPubSubState(UA_Server *server, UA_PubSubConnection *c,
                                                    UA_PUBSUBSTATE_ERROR, ret);
             break;
         default:
-            UA_LOG_WARNING_CONNECTION(&server->config.logger, c,
+            UA_LOG_WARNING_CONNECTION(server->config.logging, c,
                                       "Received unknown PubSub state!");
             return UA_STATUSCODE_BADINTERNALERROR;
     }
diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 7b8e769d12c..34b0592144f 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -153,7 +153,7 @@ UA_PublishedDataSet_clear(UA_Server *server, UA_PublishedDataSet *publishedDataS
          * function regenerates DataSetMetaData, which is not necessary if we want to
          * clear the whole PDS anyway. */
         if(field->configurationFrozen) {
-            UA_LOG_WARNING_DATASET(&server->config.logger, publishedDataSet,
+            UA_LOG_WARNING_DATASET(server->config.logging, publishedDataSet,
                                    "Clearing a frozen field.");
         }
         field->fieldMetaData.arrayDimensions = NULL;
@@ -221,7 +221,7 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
     res = readWithReadValue(server, &pp->publishedVariable,
                             UA_ATTRIBUTEID_ARRAYDIMENSIONS, &value);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+        UA_LOG_WARNING_DATASET(server->config.logging, pds,
                                "PubSub meta data generation: Reading the array dimensions failed");
         return res;
     }
@@ -242,7 +242,7 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
     res = readWithReadValue(server, &pp->publishedVariable,
                             UA_ATTRIBUTEID_DATATYPE, &fieldMetaData->dataType);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+        UA_LOG_WARNING_DATASET(server->config.logging, pds,
                                "PubSub meta data generation: Reading the datatype failed");
         return res;
     }
@@ -252,7 +252,7 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
             UA_findDataTypeWithCustom(&fieldMetaData->dataType,
                                       server->config.customDataTypes);
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-        UA_LOG_DEBUG_DATASET(&server->config.logger, pds,
+        UA_LOG_DEBUG_DATASET(server->config.logging, pds,
                              "MetaData creation: Found DataType %s",
                              currentDataType->typeName);
 #endif
@@ -266,12 +266,12 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
             currentDataType->typeKind == UA_DATATYPEKIND_LOCALIZEDTEXT) {
                 fieldMetaData->maxStringLength = field->config.field.variable.maxStringLength;
             } else {
-                UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                UA_LOG_WARNING_DATASET(server->config.logging, pds,
                                        "PubSub meta data generation: MaxStringLength with incompatible DataType configured.");
             }
         }
     } else {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+        UA_LOG_WARNING_DATASET(server->config.logging, pds,
                                "PubSub meta data generation: DataType is UA_NODEID_NULL");
     }
 
@@ -280,7 +280,7 @@ generateFieldMetaData(UA_Server *server, UA_PublishedDataSet *pds,
     res = readWithReadValue(server, &pp->publishedVariable,
                             UA_ATTRIBUTEID_VALUERANK, &valueRank);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+        UA_LOG_WARNING_DATASET(server->config.logging, pds,
                                "PubSub meta data generation: Reading the value rank failed");
         return res;
     }
@@ -322,7 +322,7 @@ UA_DataSetField_create(UA_Server *server, const UA_NodeId publishedDataSet,
     }
 
     if(currDS->configurationFreezeCounter > 0) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, currDS,
+        UA_LOG_WARNING_DATASET(server->config.logging, currDS,
                                "Adding DataSetField failed: PublishedDataSet is frozen");
         result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
         return result;
@@ -434,14 +434,14 @@ UA_DataSetField_remove(UA_Server *server, UA_DataSetField *currentField) {
     }
 
     if(currentField->configurationFrozen) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+        UA_LOG_WARNING_DATASET(server->config.logging, pds,
                                "Remove DataSetField failed: DataSetField is frozen");
         result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
         return result;
     }
 
     if(pds->configurationFreezeCounter > 0) {
-        UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+        UA_LOG_WARNING_DATASET(server->config.logging, pds,
                                "Remove DataSetField failed: PublishedDataSet is frozen");
         result.result = UA_STATUSCODE_BADCONFIGURATIONERROR;
         return result;
@@ -487,7 +487,7 @@ UA_DataSetField_remove(UA_Server *server, UA_DataSetField *currentField) {
             result.result = generateFieldMetaData(server, pds, tmpDSF, &fieldMetaData[counter]);
             if(result.result != UA_STATUSCODE_GOOD) {
                 UA_FieldMetaData_clear(&fieldMetaData[counter]);
-                UA_LOG_WARNING_DATASET(&server->config.logger, pds,
+                UA_LOG_WARNING_DATASET(server->config.logging, pds,
                                        "PubSub MetaData regeneration failed "
                                        "after removing a field!");
                 break;
@@ -611,27 +611,27 @@ UA_PublishedDataSet_create(UA_Server *server,
 
     UA_AddPublishedDataSetResult result = {UA_STATUSCODE_BADINVALIDARGUMENT, 0, NULL, {0, 0}};
     if(!publishedDataSetConfig){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PublishedDataSet creation failed. No config passed in.");
         return result;
     }
 
     if(publishedDataSetConfig->publishedDataSetType != UA_PUBSUB_DATASET_PUBLISHEDITEMS){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PublishedDataSet creation failed. Unsupported PublishedDataSet type.");
         return result;
     }
 
     if(UA_String_isEmpty(&publishedDataSetConfig->name)) {
         // DataSet has to have a valid name
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PublishedDataSet creation failed. Invalid name.");
         return result;
     }
 
     if(UA_PublishedDataSet_findPDSbyName(server, publishedDataSetConfig->name)) {
         // DataSet name has to be unique in the publisher
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PublishedDataSet creation failed. DataSet with the same name already exists.");
         result.addResult = UA_STATUSCODE_BADBROWSENAMEDUPLICATED;
         return result;
@@ -641,7 +641,7 @@ UA_PublishedDataSet_create(UA_Server *server,
     UA_PublishedDataSet *newPDS = (UA_PublishedDataSet *)
         UA_calloc(1, sizeof(UA_PublishedDataSet));
     if(!newPDS) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PublishedDataSet creation failed. Out of Memory.");
         result.addResult = UA_STATUSCODE_BADOUTOFMEMORY;
         return result;
@@ -654,7 +654,7 @@ UA_PublishedDataSet_create(UA_Server *server,
     UA_StatusCode res = UA_PublishedDataSetConfig_copy(publishedDataSetConfig, newConfig);
     if(res != UA_STATUSCODE_GOOD){
         UA_free(newPDS);
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PublishedDataSet creation failed. Configuration copy failed.");
         result.addResult = UA_STATUSCODE_BADINTERNALERROR;
         return result;
@@ -730,7 +730,7 @@ UA_Server_addPublishedDataSet(UA_Server *server,
 UA_StatusCode
 UA_PublishedDataSet_remove(UA_Server *server, UA_PublishedDataSet *publishedDataSet) {
     if(publishedDataSet->configurationFreezeCounter > 0) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Remove PublishedDataSet failed. PublishedDataSet is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 63544453d6c..03126e8de6d 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -182,7 +182,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         UA_PubSubConnection_addRecvConnection(psc, connectionId) :
         UA_PubSubConnection_addSendConnection(psc, connectionId);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, psc,
+        UA_LOG_WARNING_CONNECTION(server->config.logging, psc,
                                   "No more space for an additional EventLoop connection");
         if(psc->cm)
             psc->cm->closeConnection(psc->cm, connectionId);
@@ -232,7 +232,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 #endif
             }
             if(res != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING_CONNECTION(&server->config.logger, psc,
+                UA_LOG_WARNING_CONNECTION(server->config.logging, psc,
                                           "Verify, decrypt and decode network message failed");
                 nonRT = false;
             }
@@ -253,7 +253,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 
     if(!processed) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, psc,
+        UA_LOG_WARNING_CONNECTION(server->config.logging, psc,
                                   "Message received that could not be processed. "
                                   "Check PublisherID, WriterGroupID and DatasetWriterID.");
     }
@@ -292,7 +292,7 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
     UA_UInt16 port;
     UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, &port, NULL);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                 "Could not parse the UDP network URL");
         return res;
     }
@@ -327,7 +327,7 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
         /* Validate only if no ReaderGroup configured */
         validate = (c->readerGroupsSize == 0);
         if(validate) {
-            UA_LOG_INFO_CONNECTION(&server->config.logger, c,
+            UA_LOG_INFO_CONNECTION(server->config.logging, c,
                                    "No ReaderGroups configured. "
                                    "Only validate the connection parameters "
                                    "instead of opening a receiving channel.");
@@ -337,7 +337,7 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubRecvChannelCallback);
         UA_LOCK(&server->serviceMutex);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+            UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an UDP channel for receiving");
             return res;
         }
@@ -359,13 +359,13 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
         strncmp((const char*)&address.data[address.length - localhostAddrs[2].length],
                 (const char*)localhostAddrs[2].data, localhostAddrs[2].length) == 0)) {
         /* Localhost address -- no send connection */
-        UA_LOG_INFO_CONNECTION(&server->config.logger, c,
+        UA_LOG_INFO_CONNECTION(server->config.logging, c,
                                "Localhost address - don't open UDP send connection");
     } else if(c->sendChannel == 0) {
         /* Validate only if no WriterGroup configured */
         validate = (c->writerGroupsSize == 0);
         if(validate) {
-            UA_LOG_INFO_CONNECTION(&server->config.logger, c,
+            UA_LOG_INFO_CONNECTION(server->config.logging, c,
                                    "No WriterGroups configured. "
                                    "Only validate the connection parameters "
                                    "instead of opening a channel for sending.");
@@ -377,7 +377,7 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
         UA_LOCK(&server->serviceMutex);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+            UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an UDP recv channel");
         }
     }
@@ -398,7 +398,7 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c,
     UA_String vidPCP = UA_STRING_NULL;
     UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, NULL, &vidPCP);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                 "Could not parse the ETH network URL");
         return res;
     }
@@ -424,7 +424,7 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c,
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubRecvChannelCallback);
         UA_LOCK(&server->serviceMutex);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+            UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an ETH recv channel");
             return res;
         }
@@ -437,7 +437,7 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c,
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
         UA_LOCK(&server->serviceMutex);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+            UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an ETH channel for sending");
         }
     }
@@ -465,7 +465,7 @@ UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c,
 
     UA_EventLoop *el = UA_PubSubConnection_getEL(server, c);
     if(!el) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c, "No EventLoop configured");
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c, "No EventLoop configured");
         UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
                                            UA_STATUSCODE_BADINTERNALERROR);
         return UA_STATUSCODE_BADINTERNALERROR;;
@@ -477,7 +477,7 @@ UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c,
     if(profile)
         cm = getCM(el, profile->protocol);
     if(!cm || (c->cm && cm != c->cm)) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                 "The requested protocol is not supported");
         UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
                                            UA_STATUSCODE_BADINTERNALERROR);
@@ -490,7 +490,7 @@ UA_PubSubConnection_connect(UA_Server *server, UA_PubSubConnection *c,
     /* Check the configuration address type */
     if(!UA_Variant_hasScalarType(&c->config.address,
                                  &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE])) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c, "No NetworkAddressUrlDataType "
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c, "No NetworkAddressUrlDataType "
                                 "for the address configuration");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -550,7 +550,7 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     /* Store the connectionId (if a new connection) */
     if(wg->sendChannel && wg->sendChannel != connectionId) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                   "WriterGroup is already bound to a different channel");
         UA_UNLOCK(&server->serviceMutex);
         return;
@@ -587,7 +587,7 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg,
         wg->config.transportSettings.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
        wg->config.transportSettings.content.decoded.type !=
        &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE]) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Invalid TransportSettings for a UDP Connection");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -599,7 +599,7 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg,
     if((ts->address.encoding != UA_EXTENSIONOBJECT_DECODED &&
         ts->address.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
        ts->address.content.decoded.type != &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Invalid TransportSettings Address for a UDP Connection");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -611,7 +611,7 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg,
     UA_UInt16 port;
     UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, &port, NULL);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                 "Could not parse the UDP network URL");
         return res;
     }
@@ -641,7 +641,7 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg,
     res = cm->openConnection(cm, &kvm, server, wg, WriterGroupChannelCallback);
     UA_LOCK(&server->serviceMutex);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Could not open a UDP send channel");
     }
     return res;
@@ -662,7 +662,7 @@ UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg,
         ts->encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
        ts->content.decoded.type !=
        &UA_TYPES[UA_TYPES_BROKERWRITERGROUPTRANSPORTDATATYPE]) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Wrong TransportSettings type for MQTT");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -674,7 +674,7 @@ UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg,
     UA_UInt16 port = 1883; /* Default */
     UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, &port, NULL);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                 "Could not parse the MQTT network URL");
         return res;
     }
@@ -701,7 +701,7 @@ UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg,
     res = c->cm->openConnection(c->cm, &kvm, server, wg, WriterGroupChannelCallback);
     UA_LOCK(&server->serviceMutex);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Could not open the MQTT connection");
     }
     return res;
@@ -731,7 +731,7 @@ UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg, UA_Boolean validat
 
     UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);
     if(!el) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg, "No EventLoop configured");
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg, "No EventLoop configured");
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR,
                                            UA_STATUSCODE_BADINTERNALERROR);
         return UA_STATUSCODE_BADINTERNALERROR;;
@@ -747,7 +747,7 @@ UA_WriterGroup_connect(UA_Server *server, UA_WriterGroup *wg, UA_Boolean validat
     if(profile)
         cm = getCM(el, profile->protocol);
     if(!cm || (c->cm && cm != c->cm)) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                 "The requested protocol is not supported");
         UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
                                            UA_STATUSCODE_BADINTERNALERROR);
@@ -847,7 +847,7 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     /* Store the connectionId (if a new connection) */
     UA_StatusCode res = UA_ReaderGroup_addRecvConnection(rg, connectionId);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                   "No more space for an additional EventLoop connection");
         UA_PubSubConnection *c = rg->linkedConnection;
         if(c && c->cm)
@@ -873,7 +873,7 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 
     if(rg->state != UA_PUBSUBSTATE_OPERATIONAL) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "Received a messaage for a non-operational ReaderGroup");
         UA_UNLOCK(&server->serviceMutex);
         return;
@@ -901,7 +901,7 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 #endif
     }
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                   "Verify, decrypt and decode network message failed");
         UA_UNLOCK(&server->serviceMutex);
         return;
@@ -928,7 +928,7 @@ UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg,
         ts->encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
        ts->content.decoded.type !=
        &UA_TYPES[UA_TYPES_BROKERDATASETREADERTRANSPORTDATATYPE]) {
-        UA_LOG_ERROR_READERGROUP(&server->config.logger, rg,
+        UA_LOG_ERROR_READERGROUP(server->config.logging, rg,
                                 "Wrong TransportSettings type for MQTT");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -940,7 +940,7 @@ UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg,
     UA_UInt16 port = 1883; /* Default */
     UA_StatusCode res = UA_parseEndpointUrl(&addressUrl->url, &address, &port, NULL);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                 "Could not parse the MQTT network URL");
         return res;
     }
@@ -967,7 +967,7 @@ UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg,
     res = c->cm->openConnection(c->cm, &kvm, server, rg, ReaderGroupChannelCallback);
     UA_LOCK(&server->serviceMutex);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_READERGROUP(&server->config.logger, rg,
+        UA_LOG_ERROR_READERGROUP(server->config.logging, rg,
                                  "Could not open the MQTT connection");
     }
     return res;
@@ -999,7 +999,7 @@ UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg, UA_Boolean validat
 
     UA_EventLoop *el = UA_PubSubConnection_getEL(server, rg->linkedConnection);
     if(!el) {
-        UA_LOG_ERROR_READERGROUP(&server->config.logger, rg, "No EventLoop configured");
+        UA_LOG_ERROR_READERGROUP(server->config.logging, rg, "No EventLoop configured");
         UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_ERROR,
                                       UA_STATUSCODE_BADINTERNALERROR);
         return UA_STATUSCODE_BADINTERNALERROR;;
@@ -1015,7 +1015,7 @@ UA_ReaderGroup_connect(UA_Server *server, UA_ReaderGroup *rg, UA_Boolean validat
     if(profile)
         cm = getCM(el, profile->protocol);
     if(!cm || (c->cm && cm != c->cm)) {
-        UA_LOG_ERROR_CONNECTION(&server->config.logger, c,
+        UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                 "The requested protocol is not supported");
         UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_ERROR,
                                            UA_STATUSCODE_BADINTERNALERROR);
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 3032198351a..6ec48e8567c 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -345,7 +345,7 @@ UA_PubSubKeyStorage_activateKeyToChannelContext(UA_Server *server, UA_NodeId pub
             server, securityGroupId, securityTokenId, signingKey, encryptKey, keyNonce);
 
     if(retval != UA_STATUSCODE_GOOD)
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Failed to set Encrypting keys with Error: %s",
                      UA_StatusCode_name(retval));
 
@@ -356,14 +356,14 @@ static void
 nextGetSecuritykeysCallback(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     UA_StatusCode retval = UA_STATUSCODE_BAD;
     if(!keyStorage) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "GetSecurityKeysCall Failed with error: KeyStorage does not exist "
                      "in the server");
         return;
     }
     retval = getSecurityKeysAndStoreFetchedKeys(server, keyStorage);
     if(retval != UA_STATUSCODE_GOOD)
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "GetSecurityKeysCall Failed with error: %s ",
                      UA_StatusCode_name(retval));
 }
@@ -377,7 +377,7 @@ UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *
                                      (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback,
                                                    keyStorage->keyLifeTime, &keyStorage->callBackId);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Failed to update keys for security group id '%.*s'. Reason: '%s'.",
                      (int)keyStorage->securityGroupID.length,
                      keyStorage->securityGroupID.data, UA_StatusCode_name(retval));
@@ -389,7 +389,7 @@ UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *
         retval = UA_PubSubKeyStorage_activateKeyToChannelContext(server, UA_NODEID_NULL,
                                                                  keyStorage->securityGroupID);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "Failed to update keys for security group id '%.*s'. Reason: '%s'.",
                          (int)keyStorage->securityGroupID.length, keyStorage->securityGroupID.data,
                          UA_StatusCode_name(retval));
@@ -504,7 +504,7 @@ sksClientCleanupCb(void *client, void *context) {
         sksClient->config.securityPolicies = NULL;
         sksClient->config.securityPoliciesSize = 0;
         sksClient->config.certificateVerification.context = NULL;
-        sksClient->config.logger.context = NULL;
+        sksClient->config.logging = NULL;
         sksClient->config.clientContext = NULL;
         UA_Client_delete(sksClient);
         UA_free(context);
@@ -528,7 +528,7 @@ storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
     if(response->resultsSize != 0)
         retval = response->results->statusCode;
     if(retval != UA_STATUSCODE_GOOD) {
-         UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "SKS Client: Failed to call GetSecurityKeys on SKS server with error: %s ",
                      UA_StatusCode_name(retval));
         goto cleanup;
@@ -583,7 +583,7 @@ storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
 
 cleanup:
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Failed to store the fetched keys from SKS server with error: %s",
                      UA_StatusCode_name(retval));
     }
@@ -625,7 +625,7 @@ onConnect(UA_Client *client, UA_SecureChannelState channelState,
     if(connectStatus != UA_STATUSCODE_GOOD &&
        connectStatus != UA_STATUSCODE_BADNOTCONNECTED &&
        sessionState != UA_SESSIONSTATE_ACTIVATED) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "SKS Client: Failed to connect SKS server with error: %s ",
                      UA_StatusCode_name(connectStatus));
         triggerSKSCleanup = true;
@@ -633,7 +633,7 @@ onConnect(UA_Client *client, UA_SecureChannelState channelState,
     if(connectStatus == UA_STATUSCODE_GOOD && sessionState == UA_SESSIONSTATE_ACTIVATED) {
         connectStatus = callGetSecurityKeysMethod(client);
         if(connectStatus != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_SERVER,
                          "SKS Client: Failed to call GetSecurityKeys on SKS server with "
                          "error: %s ",
                          UA_StatusCode_name(connectStatus));
@@ -666,7 +666,7 @@ getSecurityKeysAndStoreFetchedKeys(UA_Server *server, UA_PubSubKeyStorage *keySt
     UA_UInt32 requestKeyCount = UA_UINT32_MAX;
 
     if(keyStorage->sksConfig.reqId != 0) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                     "SKS Client: SKS Pull request in process ");
         return UA_STATUSCODE_GOOD;
     }
@@ -697,7 +697,7 @@ getSecurityKeysAndStoreFetchedKeys(UA_Server *server, UA_PubSubKeyStorage *keySt
     /* connect to sks server */
     retval = UA_Client_connectAsync(client, keyStorage->sksConfig.endpointUrl);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&client->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "Failed to connect SKS server with error: %s ",
                      UA_StatusCode_name(retval));
         /* Make sure the client channel state is closed and not fresh, otherwise, eventloop will
@@ -734,7 +734,6 @@ UA_Server_setSksClient(UA_Server *server, UA_String securityGroupId,
     clientConfig->authSecurityPolicies = NULL;
     clientConfig->certificateVerification.context = NULL;
     clientConfig->eventLoop = NULL;
-    clientConfig->logger.context = NULL;
     clientConfig->logging = NULL;
     clientConfig->securityPolicies = NULL;
     UA_ClientConfig_clear(clientConfig);
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 378ffd7307c..3ebaf9e9312 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -31,7 +31,7 @@ UA_PubSubManager_addTopic(UA_PubSubManager *pubSubManager, UA_TopicAssign *topic
 
 static UA_TopicAssign *
 UA_TopicAssign_new(UA_ReaderGroup *readerGroup,
-                   UA_String topic, UA_Logger *logger) {
+                   UA_String topic, const UA_Logger *logger) {
     UA_TopicAssign *topicAssign = (UA_TopicAssign *) calloc(1, sizeof(UA_TopicAssign));
     if(!topicAssign) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
@@ -46,7 +46,7 @@ UA_TopicAssign_new(UA_ReaderGroup *readerGroup,
 UA_StatusCode
 UA_PubSubManager_addPubSubTopicAssign(UA_Server *server, UA_ReaderGroup *readerGroup, UA_String topic) {
     UA_PubSubManager *pubSubManager = &server->pubSubManager;
-    UA_TopicAssign *topicAssign = UA_TopicAssign_new(readerGroup, topic, &server->config.logger);
+    UA_TopicAssign *topicAssign = UA_TopicAssign_new(readerGroup, topic, server->config.logging);
     UA_PubSubManager_addTopic(pubSubManager, topicAssign);
     return UA_STATUSCODE_GOOD;
 }
@@ -70,7 +70,7 @@ UA_ReserveId_new(UA_Server *server, UA_UInt16 id, UA_String transportProfileUri,
                  UA_ReserveIdType reserveIdType, UA_NodeId sessionId) {
     UA_ReserveId *reserveId = (UA_ReserveId *) calloc(1, sizeof(UA_ReserveId));
     if(!reserveId) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PubSub ReserveId creation failed. Out of Memory.");
         return NULL;
     }
@@ -144,7 +144,7 @@ UA_ReserveId_createId(UA_Server *server,  UA_NodeId sessionId,
         next_id++;
     }
     if(!is_free) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PubSub ReserveId creation failed. No free ID could be found.");
         return 0;
     }
@@ -224,7 +224,7 @@ UA_PubSubManager_reserveIds(UA_Server *server, UA_NodeId sessionId, UA_UInt16 nu
     if(!UA_String_equal(&transportProfileUri, &profile_1) &&
        !UA_String_equal(&transportProfileUri, &profile_2) &&
        !UA_String_equal(&transportProfileUri, &profile_3)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PubSub ReserveId creation failed. No valid transport profile uri.");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -257,7 +257,7 @@ addStandaloneSubscribedDataSet(UA_Server *server,
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(!sdsConfig){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "SubscribedDataSet creation failed. No config passed in.");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -265,7 +265,7 @@ addStandaloneSubscribedDataSet(UA_Server *server,
     UA_StandaloneSubscribedDataSetConfig tmpSubscribedDataSetConfig;
     memset(&tmpSubscribedDataSetConfig, 0, sizeof(UA_StandaloneSubscribedDataSetConfig));
     if(UA_StandaloneSubscribedDataSetConfig_copy(sdsConfig, &tmpSubscribedDataSetConfig) != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "SubscribedDataSet creation failed. Configuration copy failed.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -274,7 +274,7 @@ addStandaloneSubscribedDataSet(UA_Server *server,
             UA_calloc(1, sizeof(UA_StandaloneSubscribedDataSet));
     if(!newSubscribedDataSet) {
         UA_StandaloneSubscribedDataSetConfig_clear(&tmpSubscribedDataSetConfig);
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "SubscribedDataSet creation failed. Out of Memory.");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
@@ -415,7 +415,7 @@ UA_PubSubManager_shutdown(UA_Server *server, UA_PubSubManager *pubSubManager) {
  * action also delete the configured PubSub transport Layers. */
 void
 UA_PubSubManager_delete(UA_Server *server, UA_PubSubManager *pubSubManager) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "PubSub cleanup was called.");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -474,7 +474,7 @@ UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
                                     UA_PubSubMonitoringType eMonitoringType, void *data, UA_ServerCallback callback) {
 
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Error UA_PubSubComponent_createMonitoring(): "
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "Error UA_PubSubComponent_createMonitoring(): "
             "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -484,12 +484,12 @@ UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT:
-                    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
+                    UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
                         "- MessageReceiveTimeout", (UA_Int32) reader->config.name.length, reader->config.name.data);
                     reader->msgRcvTimeoutTimerCallback = callback;
                     break;
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
+                    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
                         "DataSetReader does not support timeout type '%i'", (UA_Int32) reader->config.name.length, reader->config.name.data,
                         eMonitoringType);
                     ret = UA_STATUSCODE_BADNOTSUPPORTED;
@@ -498,7 +498,7 @@ UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubCo
             break;
         }
         default:
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "Error UA_PubSubComponent_createMonitoring(): PubSub component type '%i' is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
             break;
@@ -520,7 +520,7 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
                                    UA_PubSubComponentEnumType eComponentType,
                                    UA_PubSubMonitoringType eMonitoringType, void *data) {
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Error UA_PubSubComponent_startMonitoring(): "
                      "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -541,14 +541,14 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
                                                 NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
                                                 &reader->msgRcvTimeoutTimerId);
                     if(ret == UA_STATUSCODE_GOOD) {
-                        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                        UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                                      "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s'- "
                                      "MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
                                      "Timer Id = '%u'", (UA_Int32) reader->config.name.length,
                                      reader->config.name.data, reader->config.messageReceiveTimeout,
                                      (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     } else {
-                        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                                      "Error UA_PubSubComponent_startMonitoring(): DataSetReader "
                                      "'%.*s' - MessageReceiveTimeout: start timer failed",
                                      (UA_Int32) reader->config.name.length, reader->config.name.data);
@@ -556,7 +556,7 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
                     break;
                 }
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                                  "UA_PubSubComponent_startMonitoring(): DataSetReader '%.*s' "
                                  "DataSetReader does not support timeout type '%i'",
                                  (UA_Int32) reader->config.name.length, reader->config.name.data,
@@ -567,7 +567,7 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
             break;
         }
         default:
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "Error UA_PubSubComponent_startMonitoring(): PubSub component "
                          "type '%i' is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
@@ -581,7 +581,7 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id,
                                   UA_PubSubComponentEnumType eComponentType,
                                   UA_PubSubMonitoringType eMonitoringType, void *data) {
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Error UA_PubSubComponent_stopMonitoring(): "
                      "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -595,7 +595,7 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id,
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
                     UA_EventLoop *el = server->config.eventLoop;
                     el->removeCyclicCallback(el, reader->msgRcvTimeoutTimerId);
-                    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                                  "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' - "
                                  "MessageReceiveTimeout: MessageReceiveTimeout = '%f' "
                                  "Timer Id = '%u'", (UA_Int32) reader->config.name.length,
@@ -604,7 +604,7 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id,
                     break;
                 }
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                                  "UA_PubSubComponent_stopMonitoring(): DataSetReader '%.*s' "
                                  "DataSetReader does not support timeout type '%i'",
                                  (UA_Int32) reader->config.name.length, reader->config.name.data,
@@ -615,7 +615,7 @@ UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id,
             break;
         }
         default:
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "Error UA_PubSubComponent_stopMonitoring(): PubSub component type '%i' "
                          "is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
@@ -629,7 +629,7 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id,
                                             UA_PubSubComponentEnumType eComponentType,
                                             UA_PubSubMonitoringType eMonitoringType, void *data) {
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Error UA_PubSubComponent_updateMonitoringInterval(): "
                      "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -645,7 +645,7 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id,
                                                    reader->config.messageReceiveTimeout, NULL,
                                                    UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
                     if (ret == UA_STATUSCODE_GOOD) {
-                        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                        UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                                      "UA_PubSubComponent_updateMonitoringInterval(): "
                                      "DataSetReader '%.*s' - MessageReceiveTimeout: new "
                                      "MessageReceiveTimeout = '%f' Timer Id = '%u'",
@@ -653,7 +653,7 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id,
                                      reader->config.messageReceiveTimeout,
                                      (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     } else {
-                        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                                      "Error UA_PubSubComponent_updateMonitoringInterval(): "
                                      "DataSetReader '%.*s': update timer interval failed",
                                      (UA_Int32) reader->config.name.length, reader->config.name.data);
@@ -661,7 +661,7 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id,
                     break;
                 }
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                                  "UA_PubSubComponent_createMonitoring(): DataSetReader '%.*s' "
                                  "DataSetReader does not support timeout type '%i'",
                                  (UA_Int32) reader->config.name.length, reader->config.name.data,
@@ -672,7 +672,7 @@ UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id,
             break;
         }
         default:
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "Error UA_PubSubComponent_updateMonitoringInterval(): "
                          "PubSub component type '%i' is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
@@ -687,7 +687,7 @@ UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id,
                                     UA_PubSubMonitoringType eMonitoringType, void *data) {
 
     if ((!server) || (!data)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Error UA_PubSubComponent_deleteMonitoring(): "
                      "null pointer param");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -698,14 +698,14 @@ UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id,
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT:
-                    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                                  "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' - "
                                  "MessageReceiveTimeout: Timer Id = '%u'",
                                  (UA_Int32)reader->config.name.length, reader->config.name.data,
                                  (UA_UInt32) reader->msgRcvTimeoutTimerId);
                     break;
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                                  "UA_PubSubComponent_deleteMonitoring(): DataSetReader '%.*s' "
                                  "DataSetReader does not support timeout type '%i'",
                                  (UA_Int32) reader->config.name.length, reader->config.name.data,
@@ -716,7 +716,7 @@ UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id,
             break;
         }
         default:
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "Error UA_PubSubComponent_deleteMonitoring(): PubSub component type "
                          "'%i' is not supported", eComponentType);
             ret = UA_STATUSCODE_BADNOTSUPPORTED;
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 2d94693a232..0be1f2f4a20 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -101,12 +101,12 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
                                          &UA_TYPES[UA_TYPES_STRING]);
                     break;
                 default:
-                    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown PublisherId type.");
                 }
             break;
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown property.");
         }
         break;
@@ -122,7 +122,7 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
                                  dataSetReader->config.publisherId.type);
             break;
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown property.");
         }
         break;
@@ -137,7 +137,7 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
                                  &UA_TYPES[UA_TYPES_DURATION]);
             break;
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown property.");
         }
         break;
@@ -153,7 +153,7 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
                                      &UA_TYPES[UA_TYPES_UINT16]);
                 break;
             default:
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                                "Read error! Unknown property.");
         }
         break;
@@ -191,7 +191,7 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
             break;
         }
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown property.");
         }
         break;
@@ -211,13 +211,13 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
                 break;
             }
             default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                             "Read error! Unknown property.");
         }
         break;
     }
     default:
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Read error! Unknown parent element.");
     }
 
@@ -271,19 +271,19 @@ onWriteLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContex
                     UA_WriterGroupConfig_clear(&writerGroupConfig);
                     break;
                 default:
-                    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                    UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                                    "Write error! Unknown property element.");
             }
             break;
         }
         default:
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Read error! Unknown parent element.");
     }
 
  cleanup:
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Changing the ReaderGroupConfig failed with status %s",
                        UA_StatusCode_name(res));
     }
@@ -352,7 +352,7 @@ addPubSubConnectionConfig(UA_Server *server, UA_PubSubConnectionDataType *pubsub
         UA_String_copy((UA_String *) pubsubConnection->publisherId.data,
                        &connectionConfig.publisherId.string);
     } else {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Unsupported PublisherId Type used.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
@@ -717,7 +717,7 @@ addPubSubConnectionLocked(UA_Server *server,
     UA_NodeId connectionId;
     retVal |= addPubSubConnectionConfig(server, pubSubConnection, &connectionId);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "addPubSubConnection failed");
         return retVal;
     }
@@ -727,7 +727,7 @@ addPubSubConnectionLocked(UA_Server *server,
         UA_WriterGroupDataType *writerGroup = &pubSubConnection->writerGroups[i];
         retVal |= addWriterGroupConfig(server, connectionId, writerGroup, &writerGroupId);
         if(retVal != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "addWriterGroup failed");
             return retVal;
         }
@@ -736,7 +736,7 @@ addPubSubConnectionLocked(UA_Server *server,
             UA_DataSetWriterDataType *dataSetWriter = &writerGroup->dataSetWriters[j];
             retVal |= addDataSetWriterConfig(server, &writerGroupId, dataSetWriter, NULL);
             if(retVal != UA_STATUSCODE_GOOD) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                              "addDataSetWriter failed");
                 return retVal;
             }
@@ -762,7 +762,7 @@ addPubSubConnectionLocked(UA_Server *server,
         UA_ReaderGroupDataType *readerGroup = &pubSubConnection->readerGroups[i];
         retVal |= addReaderGroupConfig(server, connectionId, readerGroup, &readerGroupId);
         if(retVal != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "addReaderGroup failed");
             return retVal;
         }
@@ -773,7 +773,7 @@ addPubSubConnectionLocked(UA_Server *server,
             retVal |= addDataSetReaderConfig(server, readerGroupId,
                                              dataSetReader, &dataSetReaderId);
             if(retVal != UA_STATUSCODE_GOOD) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                              "addDataSetReader failed");
                 return retVal;
             }
@@ -913,7 +913,7 @@ addDataSetReaderLocked(UA_Server *server,
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, *objectId);
     if(rg->configurationFrozen) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "AddDataSetReader cannot be done because ReaderGroup config frozen");
         return UA_STATUSCODE_BAD;
     }
@@ -922,7 +922,7 @@ addDataSetReaderLocked(UA_Server *server,
     UA_DataSetReaderDataType *dataSetReader= (UA_DataSetReaderDataType *) input[0].data;
     retVal |= addDataSetReaderConfig(server, *objectId, dataSetReader, &dataSetReaderId);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "AddDataSetReader failed");
         return retVal;
     }
@@ -1125,7 +1125,7 @@ addPublishedDataItemsAction(UA_Server *server,
     retVal |= UA_Server_addPublishedDataSet(server, &publishedDataSetConfig,
                                             &dataSetItemsNodeId).addResult;
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "addPublishedDataset failed");
         return retVal;
     }
@@ -1142,7 +1142,7 @@ addPublishedDataItemsAction(UA_Server *server,
         retVal |= UA_Server_addDataSetField(server, dataSetItemsNodeId,
                                             &dataSetFieldConfig, NULL).result;
         if(retVal != UA_STATUSCODE_GOOD) {
-           UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+           UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                         "addDataSetField failed");
            return retVal;
         }
@@ -1446,7 +1446,7 @@ addWriterGroupAction(UA_Server *server,
     UA_NodeId writerGroupId;
     retVal |= addWriterGroupConfig(server, *objectId, writerGroup, &writerGroupId);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addWriterGroup failed");
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "addWriterGroup failed");
         UA_UNLOCK(&server->serviceMutex);
         return retVal;
     }
@@ -1505,7 +1505,7 @@ addReserveIdsLocked(UA_Server *server,
                                           numRegDataSetWriterIds, transportProfileUri,
                                           &writerGroupIds, &dataSetWriterIds);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addReserveIds failed");
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "addReserveIds failed");
         return retVal;
     }
 
@@ -1515,7 +1515,7 @@ addReserveIdsLocked(UA_Server *server,
 
     if(UA_String_equal(&transportProfileUri, &profile_1) ||
        UA_String_equal(&transportProfileUri, &profile_2)) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "ApplicationUri: %.*s",
+        UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER, "ApplicationUri: %.*s",
                     (int)server->config.applicationDescription.applicationUri.length,
                     server->config.applicationDescription.applicationUri.data);
         retVal |= UA_Variant_setScalarCopy(&output[0],
@@ -1596,7 +1596,7 @@ addReaderGroupAction(UA_Server *server,
     UA_NodeId readerGroupId;
     retVal |= addReaderGroupConfig(server, *objectId, readerGroup, &readerGroupId);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "addReaderGroup failed");
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "addReaderGroup failed");
         UA_UNLOCK(&server->serviceMutex);
         return retVal;
     }
@@ -1698,7 +1698,7 @@ addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGrou
                      &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL,
                      &securityGroup->securityGroupNodeId);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Add SecurityGroup failed with error: %s.",
                      UA_StatusCode_name(retval));
         return retval;
@@ -1708,7 +1708,7 @@ addSecurityGroupRepresentation(UA_Server *server, UA_SecurityGroup *securityGrou
                                            &securityGroup->securityGroupNodeId,
                                            securityGroupConfig);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Add SecurityGroup failed with error: %s.",
                      UA_StatusCode_name(retval));
         deleteNode(server, securityGroup->securityGroupNodeId, true);
@@ -1813,12 +1813,12 @@ addDataSetWriterLocked(UA_Server *server,
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, *objectId);
     if(!wg) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Not a WriterGroup");
         return UA_STATUSCODE_BAD;
     }
     if(wg->configurationFrozen) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "addDataSetWriter cannot be done because writergroup config frozen");
         return UA_STATUSCODE_BAD;
     }
@@ -1827,7 +1827,7 @@ addDataSetWriterLocked(UA_Server *server,
     UA_DataSetWriterDataType *dataSetWriterData = (UA_DataSetWriterDataType *)input->data;
     retVal |= addDataSetWriterConfig(server, objectId, dataSetWriterData, &dataSetWriterId);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "addDataSetWriter failed");
         return retVal;
     }
@@ -1941,7 +1941,7 @@ setSecurityKeysLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessi
                                                            ks->securityGroupID);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(
-            &server->config.logger, UA_LOGCATEGORY_SERVER,
+            server->config.logging, UA_LOGCATEGORY_SERVER,
             "Failed to import Symmetric Keys into PubSub Channel Context with %s \n",
             UA_StatusCode_name(retval));
         return retval;
@@ -2128,7 +2128,7 @@ connectionTypeDestructor(UA_Server *server,
                          const UA_NodeId *typeId, void *typeContext,
                          const UA_NodeId *nodeId, void **nodeContext) {
     UA_LOCK(&server->serviceMutex);
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "Connection destructor called!");
     UA_NodeId publisherIdNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublisherId"),
@@ -2145,7 +2145,7 @@ writerGroupTypeDestructor(UA_Server *server,
                           const UA_NodeId *sessionId, void *sessionContext,
                           const UA_NodeId *typeId, void *typeContext,
                           const UA_NodeId *nodeId, void **nodeContext) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "WriterGroup destructor called!");
     UA_LOCK(&server->serviceMutex);
     UA_NodeId intervalNode =
@@ -2163,7 +2163,7 @@ readerGroupTypeDestructor(UA_Server *server,
                           const UA_NodeId *sessionId, void *sessionContext,
                           const UA_NodeId *typeId, void *typeContext,
                           const UA_NodeId *nodeId, void **nodeContext) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "ReaderGroup destructor called!");
 }
 
@@ -2172,7 +2172,7 @@ dataSetWriterTypeDestructor(UA_Server *server,
                             const UA_NodeId *sessionId, void *sessionContext,
                             const UA_NodeId *typeId, void *typeContext,
                             const UA_NodeId *nodeId, void **nodeContext) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "DataSetWriter destructor called!");
     UA_LOCK(&server->serviceMutex);
     UA_NodeId dataSetWriterIdNode =
@@ -2190,7 +2190,7 @@ dataSetReaderTypeDestructor(UA_Server *server,
                             const UA_NodeId *sessionId, void *sessionContext,
                             const UA_NodeId *typeId, void *typeContext,
                             const UA_NodeId *nodeId, void **nodeContext) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "DataSetReader destructor called!");
     UA_LOCK(&server->serviceMutex);
     UA_NodeId publisherIdNode =
@@ -2208,7 +2208,7 @@ publishedDataItemsTypeDestructor(UA_Server *server,
                             const UA_NodeId *sessionId, void *sessionContext,
                             const UA_NodeId *typeId, void *typeContext,
                             const UA_NodeId *nodeId, void **nodeContext) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "PublishedDataItems destructor called!");
     UA_LOCK(&server->serviceMutex);
     void *childContext;
@@ -2238,7 +2238,7 @@ standaloneSubscribedDataSetTypeDestructor(UA_Server *server,
                             const UA_NodeId *sessionId, void *sessionContext,
                             const UA_NodeId *typeId, void *typeContext,
                             const UA_NodeId *nodeId, void **nodeContext) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "Standalone SubscribedDataSet destructor called!");
     UA_LOCK(&server->serviceMutex);
     void *childContext;
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 5788eaf299e..83e28247bfc 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -71,7 +71,7 @@ UA_DataSetReader_checkIdentifier(UA_Server *server, UA_NetworkMessage *msg,
         }
         if(msg->groupHeaderEnabled && msg->groupHeader.writerGroupIdEnabled) {
             if(reader->config.writerGroupId != msg->groupHeader.writerGroupId) {
-                UA_LOG_INFO_READER(&server->config.logger, reader,
+                UA_LOG_INFO_READER(server->config.logging, reader,
                                    "WriterGroupId doesn't match");
                 return UA_STATUSCODE_BADNOTFOUND;
             }
@@ -85,7 +85,7 @@ UA_DataSetReader_checkIdentifier(UA_Server *server, UA_NetworkMessage *msg,
                 }
             }
             if (iterator == totalDataSets) {
-                UA_LOG_INFO_READER(&server->config.logger, reader, "DataSetWriterId doesn't match");
+                UA_LOG_INFO_READER(server->config.logging, reader, "DataSetWriterId doesn't match");
                 return UA_STATUSCODE_BADNOTFOUND;
             }
         }
@@ -95,7 +95,7 @@ UA_DataSetReader_checkIdentifier(UA_Server *server, UA_NetworkMessage *msg,
             return UA_STATUSCODE_BADNOTFOUND;
 
         if(reader->config.dataSetWriterId == *msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds) {
-            UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "DataSetReader found. Process NetworkMessage");
             return UA_STATUSCODE_GOOD;
         }
@@ -118,7 +118,7 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(readerGroup->configurationFrozen) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, readerGroup,
                                    "Add DataSetReader failed, Subscriber configuration is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
@@ -139,7 +139,7 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     retVal = addDataSetReaderRepresentation(server, newDataSetReader);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
+        UA_LOG_ERROR_READERGROUP(server->config.logging, readerGroup,
                                  "Add DataSetReader failed, addDataSetReaderRepresentation failed");
         UA_DataSetReaderConfig_clear(&newDataSetReader->config);
         UA_free(newDataSetReader);
@@ -161,7 +161,7 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
                          (void (*)(UA_Server *, void *))
                          UA_DataSetReader_handleMessageReceiveTimeout);
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
+        UA_LOG_ERROR_READERGROUP(server->config.logging, readerGroup,
                                  "Add DataSetReader failed, create message "
                                  "receive timeout timer failed");
         UA_DataSetReaderConfig_clear(&newDataSetReader->config);
@@ -182,15 +182,15 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
                newDataSetReader->config.linkedStandaloneSubscribedDataSetName);
         if(subscribedDataSet != NULL) {
             if(subscribedDataSet->config.subscribedDataSetType != UA_PUBSUB_SDS_TARGET) {
-                UA_LOG_ERROR_READER(&server->config.logger, newDataSetReader,
+                UA_LOG_ERROR_READER(server->config.logging, newDataSetReader,
                                     "Not implemented! Currently only SubscribedDataSet as "
                                     "TargetVariables is implemented");
             } else {
                 if(subscribedDataSet->config.isConnected) {
-                    UA_LOG_ERROR_READER(&server->config.logger, newDataSetReader,
+                    UA_LOG_ERROR_READER(server->config.logging, newDataSetReader,
                                         "SubscribedDataSet is already connected");
                 } else {
-                    UA_LOG_DEBUG_READER(&server->config.logger, newDataSetReader,
+                    UA_LOG_DEBUG_READER(server->config.logging, newDataSetReader,
                                         "Found SubscribedDataSet");
                     subscribedDataSet->config.isConnected = true;
                     UA_DataSetMetaDataType_copy(
@@ -243,7 +243,7 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
         retVal = UA_DataSetReader_setPubSubState(server, newDataSetReader, readerGroup->state,
                                         UA_STATUSCODE_GOOD);
         if(retVal != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_READERGROUP(&server->config.logger, readerGroup,
+            UA_LOG_ERROR_READERGROUP(server->config.logging, readerGroup,
                                      "Add DataSetReader failed, setPubSubState failed");
         }
     }
@@ -266,7 +266,7 @@ UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
 UA_StatusCode
 UA_DataSetReader_remove(UA_Server *server, UA_DataSetReader *dsr) {
     if(dsr->configurationFrozen) {
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                               "Remove DataSetReader failed, "
                               "Subscriber configuration is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -284,7 +284,7 @@ UA_DataSetReader_remove(UA_Server *server, UA_DataSetReader *dsr) {
             stopMonitoring(server, dsr->identifier, UA_PUBSUB_COMPONENT_DATASETREADER,
                            UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT, dsr);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_READER(&server->config.logger, dsr,
+            UA_LOG_ERROR_READER(server->config.logging, dsr,
                                 "Remove DataSetReader failed. Stop message "
                                 "receive timeout timer of DataSetReader '%.*s' failed.",
                                 (int) dsr->config.name.length, dsr->config.name.data);
@@ -295,7 +295,7 @@ UA_DataSetReader_remove(UA_Server *server, UA_DataSetReader *dsr) {
         deleteMonitoring(server, dsr->identifier, UA_PUBSUB_COMPONENT_DATASETREADER,
                          UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT, dsr);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+        UA_LOG_ERROR_READER(server->config.logging, dsr,
                             "Remove DataSetReader failed. Delete message receive "
                             "timeout timer of DataSetReader '%.*s' failed.",
                             (int) dsr->config.name.length, dsr->config.name.data);
@@ -351,21 +351,21 @@ DataSetReader_updateConfig(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetRead
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(dsr->configurationFrozen) {
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                               "Update DataSetReader config failed. "
                               "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
     if(rg->configurationFrozen) {
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                               "Update DataSetReader config failed. "
                               "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
     if(dsr->config.subscribedDataSetType != UA_PUBSUB_SDS_TARGET) {
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                               "Unsupported SubscribedDataSetType.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
@@ -405,7 +405,7 @@ DataSetReader_updateConfig(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetRead
                                      UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT,
                                      dsr);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_READER(&server->config.logger, dsr,
+            UA_LOG_ERROR_READER(server->config.logging, dsr,
                                 "Update DataSetReader message receive timeout timer failed.");
         }
     }
@@ -539,7 +539,7 @@ UA_DataSetReader_setState_disabled(UA_Server *server, UA_DataSetReader *dsr) {
             if(ret == UA_STATUSCODE_GOOD) {
                 dsr->msgRcvTimeoutTimerRunning = false;
             } else {
-                UA_LOG_ERROR_READER(&server->config.logger, dsr,
+                UA_LOG_ERROR_READER(server->config.logging, dsr,
                                     "Disable ReaderGroup failed. Stop message receive "
                                     "timeout timer of DataSetReader '%.*s' failed.",
                                     (int) dsr->config.name.length, dsr->config.name.data);
@@ -552,7 +552,7 @@ UA_DataSetReader_setState_disabled(UA_Server *server, UA_DataSetReader *dsr) {
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                               "Received unknown PubSub state!");
     }
     return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -579,7 +579,7 @@ UA_DataSetReader_setPubSubState(UA_Server *server,
             dataSetReader->state = state;
             break;
         default:
-            UA_LOG_WARNING_READER(&server->config.logger, dataSetReader,
+            UA_LOG_WARNING_READER(server->config.logging, dataSetReader,
                                   "Received unknown PubSub state!");
             ret = UA_STATUSCODE_BADINVALIDARGUMENT;
             break;
@@ -637,7 +637,7 @@ DataSetReader_createTargetVariables(UA_Server *server, UA_DataSetReader *dsr,
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(dsr->configurationFrozen) {
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                               "Create Target Variables failed. "
                               "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -686,7 +686,7 @@ UA_Server_DataSetReader_createDataSetMirror(UA_Server *server, UA_String *parent
     }
 
     if(pDataSetReader->configurationFrozen) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Add Target Variables failed. Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     } // TODO: Frozen configuration variable in TargetVariable structure
@@ -744,11 +744,11 @@ UA_Server_DataSetReader_createDataSetMirror(UA_Server *server, UA_String *parent
                                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                                            vAttr, NULL, &newNode);
         if(retval == UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+            UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                         "addVariableNode %s succeeded", szTmpName);
         }
         else {
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                          "addVariableNode: error 0x%" PRIx32, retval);
         }
 
@@ -768,7 +768,7 @@ UA_Server_DataSetReader_createDataSetMirror(UA_Server *server, UA_String *parent
 static void
 DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
                          UA_DataSetReader *dsr, UA_DataSetMessage* msg) {
-    UA_LOG_TRACE_READER(&server->config.logger, dsr, "Received RAW Frame");
+    UA_LOG_TRACE_READER(server->config.logging, dsr, "Received RAW Frame");
     msg->data.keyFrameData.fieldCount = (UA_UInt16)
         dsr->config.dataSetMetaData.fieldsSize;
 
@@ -796,7 +796,7 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
             }
         }
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
+            UA_LOG_INFO_READER(server->config.logging, dsr,
                                "Error during Raw-decode KeyFrame field %u: %s",
                                (unsigned)i, UA_StatusCode_name(res));
             return;
@@ -837,7 +837,7 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
         Operation_Write(server, &server->adminSession, NULL, &writeVal, &res);
         UA_clear(value, type);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
+            UA_LOG_INFO_READER(server->config.logging, dsr,
                                "Error writing KeyFrame field %u: %s",
                                (unsigned)i, UA_StatusCode_name(res));
         }
@@ -859,7 +859,7 @@ DataSetReader_processFixedSize(UA_Server *server, UA_ReaderGroup *rg,
 
         if(msg->data.keyFrameData.dataSetFields[i].value.type !=
            (*tv->externalDataValue)->value.type) {
-            UA_LOG_WARNING_READER(&server->config.logger, dsr,
+            UA_LOG_WARNING_READER(server->config.logging, dsr,
                                   "Mismatching type");
             continue;
         }
@@ -900,7 +900,7 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
             msg->header.configVersionMajorVersion != 0 ||
             msg->header.configVersionMinorVersion != 0 ||
             msg->data.keyFrameData.fieldCount != 0) {
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
+            UA_LOG_INFO_READER(server->config.logging, dsr,
                                "This DSR expects heartbeat, but the received "
                                "message doesn't seem to be so.");
         }
@@ -911,18 +911,18 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
         return;
     }
 
-    UA_LOG_DEBUG_READER(&server->config.logger, dsr,
+    UA_LOG_DEBUG_READER(server->config.logging, dsr,
                         "DataSetReader '%.*s': received a network message",
                         (int)dsr->config.name.length, dsr->config.name.data);
 
     if(!msg->header.dataSetMessageValid) {
-        UA_LOG_INFO_READER(&server->config.logger, dsr,
+        UA_LOG_INFO_READER(server->config.logging, dsr,
                            "DataSetMessage is discarded: message is not valid");
         /* To Do check ConfigurationVersion */
         /* if(msg->header.configVersionMajorVersionEnabled) {
          *     if(msg->header.configVersionMajorVersion !=
          *            dsr->config.dataSetMetaData.configurationVersion.majorVersion) {
-         *         UA_LOG_WARNING(server->config.logger, UA_LOGCATEGORY_SERVER,
+         *         UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
          *                        "DataSetMessage is discarded: ConfigurationVersion "
          *                        "MajorVersion does not match");
          *         return;
@@ -932,7 +932,7 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
     }
 
     if(msg->header.dataSetMessageType != UA_DATASETMESSAGE_DATAKEYFRAME) {
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                        "DataSetMessage is discarded: Only keyframes are supported");
         return;
     }
@@ -981,7 +981,7 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
         writeVal.value = msg->data.keyFrameData.dataSetFields[i];
         Operation_Write(server, &server->adminSession, NULL, &writeVal, &res);
         if(res != UA_STATUSCODE_GOOD)
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
+            UA_LOG_INFO_READER(server->config.logging, dsr,
                                "Error writing KeyFrame field %u: %s",
                                (unsigned)i, UA_StatusCode_name(res));
     }
@@ -1015,7 +1015,7 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
         if(res == UA_STATUSCODE_GOOD) {
             dsr->msgRcvTimeoutTimerRunning = false;
         } else {
-            UA_LOG_ERROR_READER(&server->config.logger, dsr,
+            UA_LOG_ERROR_READER(server->config.logging, dsr,
                                 "DataSetReader '%.*s': stop receive timeout timer failed",
                                 (int)dsr->config.name.length, dsr->config.name.data);
             UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
@@ -1028,12 +1028,12 @@ UA_DataSetReader_checkMessageReceiveTimeout(UA_Server *server,
         startMonitoring(server, dsr->identifier, UA_PUBSUB_COMPONENT_DATASETREADER,
                         UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT, dsr);
     if(res == UA_STATUSCODE_GOOD) {
-        UA_LOG_DEBUG_READER(&server->config.logger, dsr,
+        UA_LOG_DEBUG_READER(server->config.logging, dsr,
                             "Info: DataSetReader '%.*s': start receive timeout timer",
                             (int)dsr->config.name.length, dsr->config.name.data);
         dsr->msgRcvTimeoutTimerRunning = true;
     } else {
-        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+        UA_LOG_ERROR_READER(server->config.logging, dsr,
                             "Starting Message Receive Timeout timer failed.");
         UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
                                         UA_STATUSCODE_BADINTERNALERROR);
@@ -1047,13 +1047,13 @@ UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader
     UA_assert(dsr);
 
     if(dsr->componentType != UA_PUBSUB_COMPONENT_DATASETREADER) {
-        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+        UA_LOG_ERROR_READER(server->config.logging, dsr,
                             "UA_DataSetReader_handleMessageReceiveTimeout(): "
                             "input param is not of type DataSetReader");
         return;
     }
 
-    UA_LOG_DEBUG_READER(&server->config.logger, dsr,
+    UA_LOG_DEBUG_READER(server->config.logging, dsr,
                         "UA_DataSetReader_handleMessageReceiveTimeout(): "
                         "MessageReceiveTimeout occurred at DataSetReader "
                         "'%.*s': MessageReceiveTimeout = %f Timer Id = %u ",
@@ -1065,7 +1065,7 @@ UA_DataSetReader_handleMessageReceiveTimeout(UA_Server *server, UA_DataSetReader
         UA_DataSetReader_setPubSubState(server, dsr, UA_PUBSUBSTATE_ERROR,
                                         UA_STATUSCODE_BADTIMEOUT);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_READER(&server->config.logger, dsr,
+        UA_LOG_ERROR_READER(server->config.logging, dsr,
                             "UA_DataSetReader_handleMessageReceiveTimeout(): "
                             "setting pubsub state failed");
     }
@@ -1085,7 +1085,7 @@ processMessageWithReader(UA_Server *server, UA_ReaderGroup *readerGroup,
          * written to the wrong dataset reader. */
         if(!msg->payloadHeaderEnabled ||
            (reader->config.dataSetWriterId == msg->payloadHeader.dataSetPayloadHeader.dataSetWriterIds[i])) {
-            UA_LOG_DEBUG_READER(&server->config.logger, reader,
+            UA_LOG_DEBUG_READER(server->config.logging, reader,
                                 "Process Msg with DataSetReader!");
             UA_DataSetReader_process(server, readerGroup, reader,
                                      &msg->payload.dataSetPayload.dataSetMessages[i]);
@@ -1198,7 +1198,7 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
     memset(&currentNetworkMessage, 0, sizeof(UA_NetworkMessage));
     UA_StatusCode rv = UA_NetworkMessage_decodeHeaders(buf, &pos, &currentNetworkMessage);
     if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, readerGroup,
                               "PubSub receive. decoding headers failed");
         goto error;
     }
@@ -1209,7 +1209,7 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
         matches[i] = (rv == UA_STATUSCODE_GOOD);
         i++;
         if(rv != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
+            UA_LOG_INFO_READER(server->config.logging, dsr,
                                "PubSub receive. Message intended for a different reader.");
             continue;
         }
@@ -1222,10 +1222,10 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
     /* Decrypt the message once for all readers */
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     /* Keep pos to right after the header */
-    rv = verifyAndDecryptNetworkMessage(&server->config.logger, buf, &pos,
+    rv = verifyAndDecryptNetworkMessage(server->config.logging, buf, &pos,
                                         &currentNetworkMessage, readerGroup);
     if(rv != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, readerGroup,
                                    "Subscribe failed. verify and decrypt network "
                                    "message failed.");
         goto error;
@@ -1259,7 +1259,7 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
             rv = UA_NetworkMessage_updateBufferedNwMessage(&dsr->bufferedMessage, buf, &pos);
         }
         if(rv != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO_READER(&server->config.logger, dsr,
+            UA_LOG_INFO_READER(server->config.logging, dsr,
                                "PubSub decoding failed. Could not decode with "
                                "status code %s.", UA_StatusCode_name(rv));
             return false;
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index e45164cec0d..742c2954ccf 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -92,7 +92,7 @@ UA_ReaderGroup_create(UA_Server *server, UA_NodeId connectionId,
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(connection->configurationFreezeCounter > 0) {
-        UA_LOG_WARNING_CONNECTION(&server->config.logger, connection,
+        UA_LOG_WARNING_CONNECTION(server->config.logging, connection,
                                   "Adding ReaderGroup failed. "
                                   "Connection configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -189,7 +189,7 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
 UA_StatusCode
 UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
     if(rg->configurationFrozen) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "Remove ReaderGroup failed. "
                                    "Subscriber configuration is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -315,7 +315,7 @@ UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "Unknown PubSub state!");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -326,7 +326,7 @@ static UA_StatusCode
 UA_ReaderGroup_setPubSubState_paused(UA_Server *server,
                                      UA_ReaderGroup *rg,
                                      UA_StatusCode cause) {
-    UA_LOG_DEBUG_READERGROUP(&server->config.logger, rg,
+    UA_LOG_DEBUG_READERGROUP(server->config.logging, rg,
                              "PubSub state paused is unsupported at the moment!");
     (void)cause;
     switch(rg->state) {
@@ -340,7 +340,7 @@ UA_ReaderGroup_setPubSubState_paused(UA_Server *server,
     case UA_PUBSUBSTATE_ERROR:
         break;
     default:
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg, "Unknown PubSub state!");
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg, "Unknown PubSub state!");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -358,7 +358,7 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
     if(ret != UA_STATUSCODE_GOOD ||
        (pubSubConnection->state != UA_PUBSUBSTATE_OPERATIONAL &&
         pubSubConnection->state != UA_PUBSUBSTATE_PREOPERATIONAL)) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "Connection not operational");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -367,7 +367,7 @@ UA_ReaderGroup_setPubSubState_operational(UA_Server *server,
     if(rg->recvChannelsSize == 0)
         ret = UA_ReaderGroup_connect(server, rg, false);
     if(ret != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_READERGROUP(&server->config.logger, rg, "Could not connect");
+        UA_LOG_ERROR_READERGROUP(server->config.logging, rg, "Could not connect");
         UA_PubSubConnection_setPubSubState(server, pubSubConnection,
                                            UA_PUBSUBSTATE_ERROR, ret);
     }
@@ -406,7 +406,7 @@ UA_ReaderGroup_setPubSubState_error(UA_Server *server,
     case UA_PUBSUBSTATE_ERROR:
         return UA_STATUSCODE_GOOD;
     default:
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg, "Unknown PubSub state!");
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg, "Unknown PubSub state!");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     rg->state = UA_PUBSUBSTATE_ERROR;
@@ -436,7 +436,7 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
             ret = UA_ReaderGroup_setPubSubState_error(server, readerGroup, cause);
             break;
         default:
-            UA_LOG_WARNING_READERGROUP(&server->config.logger, readerGroup,
+            UA_LOG_WARNING_READERGROUP(server->config.logging, readerGroup,
                                        "Received unknown PubSub state!");
             break;
     }
@@ -500,13 +500,13 @@ setReaderGroupEncryptionKeys(UA_Server *server, const UA_NodeId readerGroup,
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
     UA_CHECK_MEM(rg, return UA_STATUSCODE_BADNOTFOUND);
     if(rg->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "JSON encoding is enabled. The message security is "
                                    "only defined for the UADP message mapping.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     if(!rg->config.securityPolicy) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "No SecurityPolicy configured for the ReaderGroup");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -579,7 +579,7 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
         return UA_STATUSCODE_GOOD;
 
     if(dsrCount > 1) {
-        UA_LOG_WARNING_READERGROUP(&server->config.logger, rg,
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "Mutiple DSR in a readerGroup not supported in RT "
                                    "fixed size configuration");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
@@ -590,14 +590,14 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
     /* Support only to UADP encoding */
     if(dsr->config.messageSettings.content.decoded.type !=
        &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE]) {
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                               "PubSub-RT configuration fail: Non-RT capable encoding.");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
 
     /* Don't support string PublisherId for the fast-path (at this time) */
     if(!dsr->config.publisherId.type->pointerFree) {
-        UA_LOG_WARNING_READER(&server->config.logger, dsr,
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
                               "PubSub-RT configuration fail: String PublisherId");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
@@ -610,7 +610,7 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
             UA_NODESTORE_GET(server, &tv->targetVariable.targetNodeId);
         if(!rtNode ||
            rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
-            UA_LOG_WARNING_READER(&server->config.logger, dsr,
+            UA_LOG_WARNING_READER(server->config.logging, dsr,
                                   "PubSub-RT configuration fail: PDS contains field "
                                   "without external data source.");
             UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
@@ -626,13 +626,13 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
         if((UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_STRING].typeId) ||
             UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
            field->maxStringLength == 0) {
-            UA_LOG_WARNING_READER(&server->config.logger, dsr,
+            UA_LOG_WARNING_READER(server->config.logging, dsr,
                                   "PubSub-RT configuration fail: "
                                   "PDS contains String/ByteString with dynamic length.");
             return UA_STATUSCODE_BADNOTSUPPORTED;
         } else if(!UA_DataType_isNumeric(UA_findDataType(&field->dataType)) &&
                   !UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
-            UA_LOG_WARNING_READER(&server->config.logger, dsr,
+            UA_LOG_WARNING_READER(server->config.logging, dsr,
                                   "PubSub-RT configuration fail: "
                                   "PDS contains variable with dynamic size.");
             return UA_STATUSCODE_BADNOTSUPPORTED;
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 68440a3f5dd..24ee95ad348 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -75,7 +75,7 @@ static void
 updateSKSKeyStorage(UA_Server *server, UA_SecurityGroup *securityGroup){
 
     if(!securityGroup) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_PUBSUB,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_PUBSUB,
                        "UpdateSKSKeyStorage callback failed with Error: %s ",
                        UA_StatusCode_name(UA_STATUSCODE_BADINVALIDARGUMENT));
         return;
@@ -89,7 +89,7 @@ updateSKSKeyStorage(UA_Server *server, UA_SecurityGroup *securityGroup){
 
     retval = UA_ByteString_allocBuffer(&newKey, keyLength);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_PUBSUB,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_PUBSUB,
                        "UpdateSKSKeyStorage callback failed to allocate memory for new key with Error: %s ",
                        UA_StatusCode_name(retval));
         return;
@@ -115,7 +115,7 @@ updateSKSKeyStorage(UA_Server *server, UA_SecurityGroup *securityGroup){
         UA_PubSubKeyListItem *newItem =
             UA_PubSubKeyStorage_push(keyStorage, &newKey, newKeyID);
         if(!newItem) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_PUBSUB,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_PUBSUB,
                            "UpdateSKSKeyStorage callback failed to add new key to the "
                            "sks keystorage for the SecurityGroup %.*s",
                            (int)securityGroup->securityGroupId.length,
@@ -254,7 +254,7 @@ addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     retval = addSecurityGroupRepresentation(server, newSecurityGroup);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Add SecurityGroup failed with error: %s.",
                      UA_StatusCode_name(retval));
         UA_SecurityGroup_delete(newSecurityGroup);
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 9969a441f5b..f4ca4a84fdc 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -118,7 +118,7 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                    UA_LOG_WARNING_WRITER(server->config.logging, dataSetWriter,
                                           "Received unknown PubSub state!");
             }
             break;
@@ -133,7 +133,7 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                    UA_LOG_WARNING_WRITER(server->config.logging, dataSetWriter,
                                           "Received unknown PubSub state!");
             }
             break;
@@ -149,7 +149,7 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                    UA_LOG_WARNING_WRITER(server->config.logging, dataSetWriter,
                                           "Received unknown PubSub state!");
             }
             break;
@@ -164,12 +164,12 @@ UA_DataSetWriter_setPubSubState(UA_Server *server,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+                    UA_LOG_WARNING_WRITER(server->config.logging, dataSetWriter,
                                           "Received unknown PubSub state!");
             }
             break;
         default:
-            UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+            UA_LOG_WARNING_WRITER(server->config.logging, dataSetWriter,
                                   "Received unknown PubSub state!");
     }
     if (state != oldState) {
@@ -198,14 +198,14 @@ UA_DataSetWriter_create(UA_Server *server,
 
     /* Make checks for a heartbeat */
     if(UA_NodeId_isNull(&dataSet) && dataSetWriterConfig->keyFrameCount != 1) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "Adding DataSetWriter failed: DataSet can be null only for "
                                    "a heartbeat in which case KeyFrameCount shall be 1");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
     if(wg->configurationFrozen) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "Adding DataSetWriter failed: WriterGroup is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
@@ -218,7 +218,7 @@ UA_DataSetWriter_create(UA_Server *server,
             return UA_STATUSCODE_BADNOTFOUND;
 
         if(currentDataSetContext->configurationFreezeCounter > 0) {
-            UA_LOG_WARNING_DATASET(&server->config.logger, currentDataSetContext,
+            UA_LOG_WARNING_DATASET(server->config.logging, currentDataSetContext,
                                    "Adding DataSetWriter failed: PublishedDataSet is frozen");
             return UA_STATUSCODE_BADCONFIGURATIONERROR;
         }
@@ -228,7 +228,7 @@ UA_DataSetWriter_create(UA_Server *server,
             TAILQ_FOREACH(tmpDSF, &currentDataSetContext->fields, listEntry) {
                 if(!tmpDSF->config.field.variable.rtValueSource.rtFieldSourceEnabled &&
                    !tmpDSF->config.field.variable.rtValueSource.rtInformationModelNode) {
-                    UA_LOG_WARNING_DATASET(&server->config.logger, currentDataSetContext,
+                    UA_LOG_WARNING_DATASET(server->config.logging, currentDataSetContext,
                                            "Adding DataSetWriter failed: "
                                            "Fields in PDS are not RT capable");
                     return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -250,7 +250,7 @@ UA_DataSetWriter_create(UA_Server *server,
                                               UA_PUBSUBSTATE_OPERATIONAL,
                                               UA_STATUSCODE_GOOD);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+            UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                      "Add DataSetWriter failed: setPubSubState failed");
             UA_free(newDataSetWriter);
             return res;
@@ -364,7 +364,7 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
         UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
     if(!pds) {
         if(!UA_NodeId_isNull(&dsw->connectedDataSet)) {
-            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                                   "PubSub-RT configuration fail: "
                                   "PublishedDataSet not found");
             return UA_STATUSCODE_BADINTERNALERROR;
@@ -372,7 +372,7 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
 
         res = UA_DataSetWriter_generateDataSetMessage(server, dsm, dsw);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                                   "PubSub-RT configuration fail: "
                                   "Heartbeat DataSetMessage creation failed");
         }
@@ -380,7 +380,7 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
     }
 
     if(pds->promotedFieldsCount > 0) {
-        UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+        UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                               "PubSub-RT configuration fail: "
                               "PDS contains promoted fields");
         return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -395,7 +395,7 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
             UA_NODESTORE_GET(server, publishedVariable);
         if(rtNode != NULL &&
            rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
-            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                                   "PubSub-RT configuration fail: "
                                   "PDS contains field without external data source");
             UA_NODESTORE_RELEASE(server, (const UA_Node *)rtNode);
@@ -409,14 +409,14 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
             UA_NodeId_equal(&dsf->fieldMetaData.dataType,
                             &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
            dsf->fieldMetaData.maxStringLength == 0) {
-            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                                   "PubSub-RT configuration fail: "
                                   "PDS contains String/ByteString with dynamic length");
             return UA_STATUSCODE_BADNOTSUPPORTED;
         } else if(!UA_DataType_isNumeric(UA_findDataType(&dsf->fieldMetaData.dataType)) &&
                   !UA_NodeId_equal(&dsf->fieldMetaData.dataType,
                                    &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
-            UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                                   "PubSub-RT configuration fail: "
                                   "PDS contains variable with dynamic size");
             return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -426,7 +426,7 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
     /* Generate the DSM */
     res = UA_DataSetWriter_generateDataSetMessage(server, dsm, dsw);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_WRITER(&server->config.logger, dsw,
+        UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                               "PubSub-RT configuration fail: "
                               "DataSetMessage buffering failed");
     }
@@ -440,7 +440,7 @@ UA_DataSetWriter_remove(UA_Server *server, UA_DataSetWriter *dataSetWriter) {
 
     /* Frozen? */
     if(dataSetWriter->configurationFrozen) {
-        UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+        UA_LOG_WARNING_WRITER(server->config.logging, dataSetWriter,
                               "Remove DataSetWriter failed: WriterGroup is frozen");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
@@ -772,7 +772,7 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
         if(dsm->networkMessageNumber != 0 ||
            dsm->dataSetOffset != 0 ||
            dsm->configuredSize != 0) {
-            UA_LOG_WARNING_WRITER(&server->config.logger, dataSetWriter,
+            UA_LOG_WARNING_WRITER(server->config.logging, dataSetWriter,
                                   "Static DSM configuration not supported, using defaults");
             dsm->networkMessageNumber = 0;
             dsm->dataSetOffset = 0;
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 09d245c27e1..ce44de34de6 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -108,7 +108,7 @@ UA_WriterGroup_create(UA_Server *server, const UA_NodeId connection,
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(currentConnectionContext->configurationFreezeCounter > 0) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Adding WriterGroup failed. PubSubConnection is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
@@ -225,7 +225,7 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(wg->configurationFrozen) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "Deleting the WriterGroup failed. "
                                    "WriterGroup is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -236,7 +236,7 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
         return UA_STATUSCODE_BADNOTFOUND;
 
     if(connection->configurationFreezeCounter > 0) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "Deleting the WriterGroup failed. "
                                    "PubSubConnection is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
@@ -324,7 +324,7 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
 
     /* Check if RT is possible */
     if(wg->config.encodingMimeType != UA_PUBSUB_ENCODING_UADP) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "PubSub-RT configuration fail: Non-RT capable encoding.");
         return UA_STATUSCODE_BADNOTSUPPORTED;
     }
@@ -545,7 +545,7 @@ UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     if(wg->configurationFrozen){
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "Modify WriterGroup failed. WriterGroup is frozen.");
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
@@ -555,7 +555,7 @@ UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
     if(wg->config.maxEncapsulatedDataSetMessageCount != config->maxEncapsulatedDataSetMessageCount) {
         wg->config.maxEncapsulatedDataSetMessageCount = config->maxEncapsulatedDataSetMessageCount;
         if(wg->config.messageSettings.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
-            UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+            UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                        "MaxEncapsulatedDataSetMessag need enabled "
                                        "'PayloadHeader' within the message settings.");
         }
@@ -571,7 +571,7 @@ UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
     }
 
     if(wg->config.priority != config->priority) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "Priority parameter is not yet "
                                    "supported for WriterGroup updates");
     }
@@ -667,12 +667,12 @@ setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writerGroup,
     if(!wg)
         return UA_STATUSCODE_BADNOTFOUND;
     if(wg->config.encodingMimeType == UA_PUBSUB_ENCODING_JSON) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "JSON encoding is enabled. The message security is only defined for the UADP message mapping.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     if(!wg->config.securityPolicy) {
-        UA_LOG_WARNING_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "No SecurityPolicy configured for the WriterGroup");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -749,7 +749,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                    UA_LOG_WARNING_WRITERGROUP(server->config.logging, writerGroup,
                                                "Received unknown PubSub state!");
             }
             break;
@@ -764,7 +764,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                    UA_LOG_WARNING_WRITERGROUP(server->config.logging, writerGroup,
                                                "Received unknown PubSub state!");
             }
             break;
@@ -794,7 +794,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                    UA_LOG_WARNING_WRITERGROUP(server->config.logging, writerGroup,
                                                "Received unknown PubSub state!");
             }
 
@@ -805,7 +805,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
             if(ret != UA_STATUSCODE_GOOD ||
                (c->state != UA_PUBSUBSTATE_OPERATIONAL &&
                 c->state != UA_PUBSUBSTATE_PREOPERATIONAL)) {
-                UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                UA_LOG_WARNING_WRITERGROUP(server->config.logging, writerGroup,
                                            "Connection not operational");
                 return UA_STATUSCODE_BADINTERNALERROR;
             }
@@ -828,14 +828,14 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                 case UA_PUBSUBSTATE_ERROR:
                     break;
                 default:
-                    UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+                    UA_LOG_WARNING_WRITERGROUP(server->config.logging, writerGroup,
                                     "Received unknown PubSub state!");
             }
             writerGroup->state = UA_PUBSUBSTATE_ERROR;
             break;
         }
         default:
-            UA_LOG_WARNING_WRITERGROUP(&server->config.logger, writerGroup,
+            UA_LOG_WARNING_WRITERGROUP(server->config.logging, writerGroup,
                                        "Received unknown PubSub state!");
     }
 
@@ -932,7 +932,7 @@ sendNetworkMessageBuffer(UA_Server *server, UA_WriterGroup *wg,
 
     /* Failure, set the WriterGroup into an error mode */
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Sending NetworkMessage failed");
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR, res);
         UA_PubSubConnection_setPubSubState(server, connection, UA_PUBSUBSTATE_ERROR, res);
@@ -972,7 +972,7 @@ sendNetworkMessageJson(UA_Server *server, UA_PubSubConnection *connection, UA_Wr
     if(wg->sendChannel != 0)
         sendChannel = wg->sendChannel;
     if(sendChannel == 0) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Cannot send, no open connection");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -1131,7 +1131,7 @@ sendNetworkMessageBinary(UA_Server *server, UA_PubSubConnection *connection, UA_
     if(wg->sendChannel != 0)
         sendChannel = wg->sendChannel;
     if(sendChannel == 0) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Cannot send, no open connection");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -1164,7 +1164,7 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
         UA_NetworkMessage_updateBufferedMessage(&writerGroup->bufferedMessage);
 
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_DEBUG_WRITERGROUP(&server->config.logger, writerGroup,
+        UA_LOG_DEBUG_WRITERGROUP(server->config.logging, writerGroup,
                                  "PubSub sending. Unknown field type.");
         return;
     }
@@ -1189,7 +1189,7 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
                                  writerGroup->bufferedMessage.encryptBuffer.length - sigSize);
 
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_WRITERGROUP(&server->config.logger, writerGroup,
+            UA_LOG_ERROR_WRITERGROUP(server->config.logging, writerGroup,
                                      "PubSub Encryption failed");
             return;
         }
@@ -1207,7 +1207,7 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
     if(writerGroup->sendChannel != 0)
         sendChannel = writerGroup->sendChannel;
     if(sendChannel == 0) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, writerGroup,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, writerGroup,
                                  "Cannot send, no open connection");
         return;
     }
@@ -1216,7 +1216,7 @@ publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *c
     UA_ByteString outBuf;
     res = cm->allocNetworkBuffer(cm, sendChannel, &outBuf, buf->length);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, writerGroup,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, writerGroup,
                                  "PubSub message memory allocation failed");
         return;
     }
@@ -1244,7 +1244,7 @@ sendNetworkMessage(UA_Server *server, UA_WriterGroup *wg, UA_PubSubConnection *c
 
     /* If sending failed, disable all writer of the writergroup */
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, wg,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "PubSub Publish: Could not send a NetworkMessage "
                                  "with status code %s", UA_StatusCode_name(res));
         UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_ERROR, res);
@@ -1260,7 +1260,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
 
     UA_LOCK(&server->serviceMutex);
 
-    UA_LOG_DEBUG_WRITERGROUP(&server->config.logger, writerGroup, "Publish Callback");
+    UA_LOG_DEBUG_WRITERGROUP(server->config.logging, writerGroup, "Publish Callback");
 
     /* Nothing to do? */
     if(writerGroup->writersCount == 0) {
@@ -1271,7 +1271,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     /* Find the connection associated with the writer */
     UA_PubSubConnection *connection = writerGroup->linkedConnection;
     if(!connection) {
-        UA_LOG_ERROR_WRITERGROUP(&server->config.logger, writerGroup,
+        UA_LOG_ERROR_WRITERGROUP(server->config.logging, writerGroup,
                                  "Publish failed. PubSubConnection invalid");
         UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_ERROR,
                                       UA_STATUSCODE_BADNOTCONNECTED);
@@ -1311,7 +1311,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
         UA_PublishedDataSet *pds = (heartbeat) ? NULL :
             UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
         if(!heartbeat && !pds) {
-            UA_LOG_ERROR_WRITER(&server->config.logger, dsw,
+            UA_LOG_ERROR_WRITER(server->config.logging, dsw,
                                 "PubSub Publish: PublishedDataSet not found");
             UA_DataSetWriter_setPubSubState(server, dsw, UA_PUBSUBSTATE_ERROR,
                                             UA_STATUSCODE_BADINTERNALERROR);
@@ -1323,7 +1323,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
         UA_StatusCode res =
             UA_DataSetWriter_generateDataSetMessage(server, &dsmStore[dsmCount], dsw);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_ERROR_WRITER(&server->config.logger, dsw,
+            UA_LOG_ERROR_WRITER(server->config.logging, dsw,
                          "PubSub Publish: DataSetMessage creation failed");
             UA_DataSetWriter_setPubSubState(server, dsw, UA_PUBSUBSTATE_ERROR, res);
             continue;
diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
index 1d24e81a772..3036f50c2d2 100644
--- a/src/server/ua_discovery.c
+++ b/src/server/ua_discovery.c
@@ -54,7 +54,7 @@ UA_DiscoveryManager_free(UA_Server *server,
     UA_DiscoveryManager *dm = (UA_DiscoveryManager*)sc;
 
     if(sc->state != UA_LIFECYCLESTATE_STOPPED) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Cannot delete the DiscoveryManager because "
                      "it is not stopped");
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -123,7 +123,7 @@ UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
                 semaphoreDeleted = UA_fileExists(filePath) == false;
                 UA_free(filePath);
             } else {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                              "Cannot check registration semaphore. Out of memory");
             }
         }
@@ -133,7 +133,7 @@ UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
            (server->config.discoveryCleanupTimeout &&
             current->lastSeen < timedOut)) {
             if(semaphoreDeleted) {
-                UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                             "Registration of server with URI %.*s is removed because "
                             "the semaphore file '%.*s' was deleted",
                             (int)current->registeredServer.serverUri.length,
@@ -142,7 +142,7 @@ UA_DiscoveryManager_cleanupTimedOut(UA_Server *server,
                             current->registeredServer.semaphoreFilePath.data);
             } else {
                 // cppcheck-suppress unreadVariable
-                UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                             "Registration of server with URI %.*s has timed out "
                             "and is removed",
                             (int)current->registeredServer.serverUri.length,
@@ -173,7 +173,7 @@ UA_DiscoveryManager_start(UA_Server *server,
     if(res != UA_STATUSCODE_GOOD)
         return res;
 
-    dm->logging = &server->config.logger;
+    dm->logging = server->config.logging;
     dm->serverConfig = &server->config;
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
@@ -265,10 +265,10 @@ register2AsyncResponse(UA_Client *client, void *userdata,
     const UA_ServerConfig *sc = ar->dm->serverConfig;
     UA_RegisterServer2Response *response = (UA_RegisterServer2Response*)resp;
     if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_INFO(sc->logging, UA_LOGCATEGORY_SERVER,
                     "RegisterServer succeeded");
     } else {
-        UA_LOG_WARNING(&sc->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(sc->logging, UA_LOGCATEGORY_SERVER,
                        "RegisterServer failed with statuscode %s",
                        UA_StatusCode_name(response->responseHeader.serviceResult));
     }
@@ -314,7 +314,7 @@ registerAsyncResponse(UA_Client *client, void *userdata,
         /* Close the client connection, will be cleaned up in the client state
          * callback when closing is complete */
         UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_INFO(&sc->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_INFO(sc->logging, UA_LOGCATEGORY_SERVER,
                     "RegisterServer succeeded");
         return;
     }
@@ -325,7 +325,7 @@ registerAsyncResponse(UA_Client *client, void *userdata,
         /* Close the client connection, will be cleaned up in the client state
          * callback when closing is complete */
         UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_WARNING(&sc->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(sc->logging, UA_LOGCATEGORY_SERVER,
                        "RegisterServer failed with error %s",
                        UA_StatusCode_name(serviceResult));
         return;
@@ -355,7 +355,7 @@ registerAsyncResponse(UA_Client *client, void *userdata,
         /* Close the client connection, will be cleaned up in the client state
          * callback when closing is complete */
         UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(sc->logging, UA_LOGCATEGORY_CLIENT,
                      "RegisterServer2 failed with statuscode %s",
                      UA_StatusCode_name(res));
     }
@@ -373,7 +373,7 @@ discoveryClientStateCallback(UA_Client *client,
     /* Connection failed */
     if(connectStatus != UA_STATUSCODE_GOOD) {
         if(connectStatus != UA_STATUSCODE_BADCONNECTIONCLOSED) {
-            UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_ERROR(sc->logging, UA_LOGCATEGORY_SERVER,
                          "Could not connect to the Discovery server with error %s",
                          UA_StatusCode_name(connectStatus));
         }
@@ -412,7 +412,7 @@ discoveryClientStateCallback(UA_Client *client,
         /* Close the client connection, will be cleaned up in the client state
          * callback when closing is complete */
         UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_ERROR(sc->logging, UA_LOGCATEGORY_CLIENT,
                      "RegisterServer failed with statuscode %s",
                      UA_StatusCode_name(res));
     }
@@ -433,7 +433,7 @@ UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister
     /* Check that the discovery manager is running */
     UA_ServerConfig *sc = &server->config;
     if(dm->sc.state != UA_LIFECYCLESTATE_STARTED) {
-        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(sc->logging, UA_LOGCATEGORY_SERVER,
                      "The server must be started for registering");
         UA_ClientConfig_clear(cc);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -448,7 +448,7 @@ UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister
         }
     }
     if(!ar) {
-        UA_LOG_ERROR(&sc->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(sc->logging, UA_LOGCATEGORY_SERVER,
                      "Too many outstanding register requests. Cannot proceed.");
         UA_ClientConfig_clear(cc);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -461,8 +461,6 @@ UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister
     cc->externalEventLoop = true;
 
     /* Use the logging from the server */
-    if(cc->logging->clear)
-        cc->logging->clear(&cc->logging);
     cc->logging = sc->logging;
 
     /* Set the state callback method and context */
@@ -506,7 +504,7 @@ UA_StatusCode
 UA_Server_registerDiscovery(UA_Server *server, UA_ClientConfig *cc,
                             const UA_String discoveryServerUrl,
                             const UA_String semaphoreFilePath) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "Registering at the DiscoveryServer: %.*s",
                 (int)discoveryServerUrl.length, discoveryServerUrl.data);
     UA_LOCK(&server->serviceMutex);
@@ -519,7 +517,7 @@ UA_Server_registerDiscovery(UA_Server *server, UA_ClientConfig *cc,
 UA_StatusCode
 UA_Server_deregisterDiscovery(UA_Server *server, UA_ClientConfig *cc,
                               const UA_String discoveryServerUrl) {
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "Deregistering at the DiscoveryServer: %.*s",
                 (int)discoveryServerUrl.length, discoveryServerUrl.data);
     UA_LOCK(&server->serviceMutex);
diff --git a/src/server/ua_discovery.h b/src/server/ua_discovery.h
index 0a6214a3f8f..55248c3f4c2 100644
--- a/src/server/ua_discovery.h
+++ b/src/server/ua_discovery.h
@@ -76,7 +76,7 @@ struct UA_DiscoveryManager {
     UA_UInt64 discoveryCallbackId;
 
     /* Taken from the server config during startup */
-    UA_Logger *logging;
+    const UA_Logger *logging;
     UA_ServerConfig *serverConfig;
 
     /* Outstanding requests. So they can be cancelled during shutdown. */
diff --git a/src/server/ua_discovery_mdns.c b/src/server/ua_discovery_mdns.c
index 4cde3c05d14..4e20df4a5d9 100644
--- a/src/server/ua_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -942,7 +942,7 @@ startMulticastDiscoveryServer(UA_Server *server) {
     if(dm->mdnsSendConnection == 0)
         discovery_createMulticastSocket(server, dm);
     if(dm->mdnsSendConnection == 0) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_DISCOVERY,
                      "Could not create multicast socket");
         return;
     }
@@ -1156,7 +1156,7 @@ discovery_multicastQueryAnswer(mdns_answer_t *a, void *arg) {
     if(mdnsd_has_query(dm->mdnsDaemon, a->rdname))
         return 0;
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_DISCOVERY,
+    UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_DISCOVERY,
                  "mDNS send query for: %s SRV&TXT %s", a->name, a->rdname);
 
     mdnsd_query(dm->mdnsDaemon, a->rdname, QTYPE_SRV,
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 7bb83f608cb..74f8eca3c3c 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -248,7 +248,7 @@ UA_Server_delete(UA_Server *server) {
     }
 
     if(server->state != UA_LIFECYCLESTATE_STOPPED) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "The server must be fully stopped before it can be deleted");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -335,7 +335,7 @@ static UA_Server *
 UA_Server_init(UA_Server *server) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_CHECK_FATAL(UA_Server_NodestoreIsConfigured(server), goto cleanup,
-                   &server->config.logger, UA_LOGCATEGORY_SERVER,
+                   server->config.logging, UA_LOGCATEGORY_SERVER,
                    "No Nodestore configured in the server");
 
     /* Init start time to zero, the actual start time will be sampled in
@@ -423,27 +423,14 @@ UA_Server_newWithConfig(UA_ServerConfig *config) {
     UA_CHECK_MEM(config, return NULL);
 
     UA_CHECK_LOG(config->eventLoop != NULL, return NULL, ERROR,
-                 &config->logger, UA_LOGCATEGORY_SERVER, "No EventLoop configured");
+                 config->logging, UA_LOGCATEGORY_SERVER, "No EventLoop configured");
 
     UA_Server *server = (UA_Server *)UA_calloc(1, sizeof(UA_Server));
     UA_CHECK_MEM(server, UA_ServerConfig_clean(config); return NULL);
 
     server->config = *config;
 
-    /* The config might have been "moved" into the server struct. Ensure that
-     * the logger pointer is correct. */
-    for(size_t i = 0; i < server->config.securityPoliciesSize; i++)
-        if(server->config.securityPolicies[i].logger == &config->logger)
-            server->config.securityPolicies[i].logger = &server->config.logger;
-
-    if(server->config.eventLoop->logger == &config->logger)
-        server->config.eventLoop->logger = &server->config.logger;
-
-    if((server->config.logging == NULL) ||
-       (server->config.logging == &config->logger)) {
-        /* re-set the logger pointer */
-        server->config.logging = &server->config.logger;
-    }
+    /* If not defined, set logging to what the server has */
     if(!server->config.secureChannelPKI.logging)
         server->config.secureChannelPKI.logging = server->config.logging;
     if(!server->config.sessionPKI.logging)
@@ -461,7 +448,7 @@ setServerShutdown(UA_Server *server) {
         return false;
     if(server->config.shutdownDelay == 0)
         return true;
-    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                    "Shutting down the server with a delay of %i ms", (int)server->config.shutdownDelay);
     server->endTime = UA_DateTime_now() + (UA_DateTime)(server->config.shutdownDelay * UA_DATETIME_MSEC);
     return false;
@@ -629,7 +616,7 @@ verifyServerApplicationURI(const UA_Server *server) {
                                  &sp->localCertificate,
                                  &server->config.applicationDescription.applicationUri);
 
-        UA_CHECK_STATUS_ERROR(retval, return retval, &server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_CHECK_STATUS_ERROR(retval, return retval, server->config.logging, UA_LOGCATEGORY_SERVER,
                        "The configured ApplicationURI \"%.*s\"does not match the "
                        "ApplicationURI specified in the certificate for the "
                        "SecurityPolicy %.*s",
@@ -699,13 +686,13 @@ UA_Server_run_startup(UA_Server *server) {
      * with authentication tokens and other important variables E.g. if fuzzing
      * is enabled, and two clients are connected, subscriptions do not work
      * properly, since the tokens will be overridden to allow easier fuzzing. */
-    UA_LOG_FATAL(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_FATAL(server->config.logging, UA_LOGCATEGORY_SERVER,
                  "Server was built with unsafe fuzzing mode. "
                  "This should only be used for specific fuzzing builds.");
 #endif
 
     if(server->state != UA_LIFECYCLESTATE_STOPPED) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                        "The server has already been started");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -719,8 +706,8 @@ UA_Server_run_startup(UA_Server *server) {
         }
     }
     if(config->accessControl.userTokenPoliciesSize == 0 && hasUserIdentityTokens == false) {
-        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
-                       "The server has no userIdentificationPolicies defined.");
+        UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_SERVER,
+                     "The server has no userIdentificationPolicies defined.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -728,7 +715,7 @@ UA_Server_run_startup(UA_Server *server) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_EventLoop *el = config->eventLoop;
     UA_CHECK_MEM_ERROR(el, return UA_STATUSCODE_BADINTERNALERROR,
-                       &config->logger, UA_LOGCATEGORY_SERVER,
+                       config->logging, UA_LOGCATEGORY_SERVER,
                        "An EventLoop must be configured");
 
     if(el->state != UA_EVENTLOOPSTATE_STARTED) {
@@ -748,7 +735,7 @@ UA_Server_run_startup(UA_Server *server) {
     /* Are there enough SecureChannels possible for the max number of sessions? */
     if(config->maxSecureChannels != 0 &&
        (config->maxSessions == 0 || config->maxSessions >= config->maxSecureChannels)) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                        "Maximum SecureChannels count not enough for the "
                        "maximum Sessions count");
     }
@@ -757,7 +744,7 @@ UA_Server_run_startup(UA_Server *server) {
     retVal = addRepeatedCallback(server, serverHouseKeeping,
                                  NULL, 1000.0, &server->houseKeepingCallbackId);
     UA_CHECK_STATUS_ERROR(retVal, UA_UNLOCK(&server->serviceMutex); return retVal,
-                          &config->logger, UA_LOGCATEGORY_SERVER,
+                          config->logging, UA_LOGCATEGORY_SERVER,
                           "Could not create the server housekeeping task");
 
     /* Ensure that the uri for ns1 is set up from the app description */
@@ -765,7 +752,7 @@ UA_Server_run_startup(UA_Server *server) {
 
     /* At least one endpoint has to be configured */
     if(config->endpointsSize == 0) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                        "There has to be at least one endpoint.");
     }
 
@@ -848,7 +835,7 @@ UA_Server_run_shutdown(UA_Server *server) {
     UA_LOCK(&server->serviceMutex);
 
     if(server->state != UA_LIFECYCLESTATE_STARTED) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "The server is not started, cannot be shut down");
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 2d0bfe091ab..1642530e9b2 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -28,7 +28,7 @@ UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
     if(!session) {
         UA_String sessionId = UA_STRING_NULL;
         UA_NodeId_print(&ar->sessionId, &sessionId);
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Async Service: Session %.*s no longer exists",
                        (int)sessionId.length, sessionId.data);
         UA_String_clear(&sessionId);
@@ -39,7 +39,7 @@ UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
     /* Check the channel */
     UA_SecureChannel *channel = session->header.channel;
     if(!channel) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "Async Service Response cannot be sent. "
                                "No SecureChannel for the session.");
         UA_AsyncManager_removeAsyncResponse(&server->asyncManager, ar);
@@ -56,7 +56,7 @@ UA_AsyncManager_sendAsyncResponse(UA_AsyncManager *am, UA_Server *server,
         sendResponse(server, session, channel, ar->requestId,
                      (UA_Response*)&ar->response, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "Async Response for Req# %" PRIu32 " failed "
                                "with StatusCode %s", ar->requestId,
                                UA_StatusCode_name(res));
@@ -78,7 +78,7 @@ integrateOperationResult(UA_AsyncManager *am, UA_Server *server,
     /* Reduce the number of open results */
     ar->opCountdown -= 1;
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                  "Return result in the server thread with %" PRIu32 " remaining",
                  ar->opCountdown);
 
@@ -139,7 +139,7 @@ checkTimeouts(UA_Server *server, void *_) {
         op->response.statusCode = UA_STATUSCODE_BADTIMEOUT;
         TAILQ_REMOVE(&am->dispatchedQueue, op, pointers);
         TAILQ_INSERT_TAIL(&am->resultQueue, op, pointers);
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Operation was removed due to a timeout");
     }
 
@@ -153,7 +153,7 @@ checkTimeouts(UA_Server *server, void *_) {
         op->response.statusCode = UA_STATUSCODE_BADTIMEOUT;
         TAILQ_REMOVE(&am->newQueue, op, pointers);
         TAILQ_INSERT_TAIL(&am->resultQueue, op, pointers);
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Operation was removed due to a timeout");
     }
 
@@ -258,7 +258,7 @@ UA_AsyncManager_createAsyncOp(UA_AsyncManager *am, UA_Server *server,
                               const UA_CallMethodRequest *opRequest) {
     if(server->config.maxAsyncOperationQueueSize != 0 &&
        am->opsCount >= server->config.maxAsyncOperationQueueSize) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "UA_Server_SetNextAsyncMethod: Queue exceeds limit (%d).",
                        (int unsigned)server->config.maxAsyncOperationQueueSize);
         return UA_STATUSCODE_BADUNEXPECTEDERROR;
@@ -266,14 +266,14 @@ UA_AsyncManager_createAsyncOp(UA_AsyncManager *am, UA_Server *server,
 
     UA_AsyncOperation *ao = (UA_AsyncOperation*)UA_calloc(1, sizeof(UA_AsyncOperation));
     if(!ao) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "UA_Server_SetNextAsyncMethod: Mem alloc failed.");
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
     UA_StatusCode result = UA_CallMethodRequest_copy(opRequest, &ao->request);
     if(result != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "UA_Server_SetAsyncMethodResult: UA_CallMethodRequest_copy failed.");
         UA_free(ao);
         return result;
@@ -331,7 +331,7 @@ UA_Server_setAsyncOperationResult(UA_Server *server,
     UA_AsyncOperation *ao = (UA_AsyncOperation*)context;
     if(!ao) {
         /* Something went wrong. Not a good AsyncOp. */
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "UA_Server_SetAsyncMethodResult: Invalid context");
         return;
     }
@@ -353,7 +353,7 @@ UA_Server_setAsyncOperationResult(UA_Server *server,
     }
 
     if(!found) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "UA_Server_SetAsyncMethodResult: The operation has timed out");
         UA_UNLOCK(&am->queueLock);
         return;
@@ -363,7 +363,7 @@ UA_Server_setAsyncOperationResult(UA_Server *server,
     UA_StatusCode result =
         UA_CallMethodResult_copy(&response->callMethodResult, &ao->response);
     if(result != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "UA_Server_SetAsyncMethodResult: UA_CallMethodResult_copy failed.");
         ao->response.statusCode = UA_STATUSCODE_BADOUTOFMEMORY;
     }
@@ -374,7 +374,7 @@ UA_Server_setAsyncOperationResult(UA_Server *server,
 
     UA_UNLOCK(&am->queueLock);
 
-    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                  "Set the result from the worker thread");
 }
 
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index dc5c4e1768f..86e93214b48 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -81,7 +81,7 @@ typedef struct {
     UA_ServerComponent sc;
     UA_Server *server;  /* remember the pointer so we don't need an additional
                            context pointer for connections */
-    UA_Logger *logging; /* shortcut */
+    const UA_Logger *logging; /* shortcut */
     UA_UInt64 houseKeepingCallbackId;
 
     UA_ServerConnection serverConnections[UA_MAXSERVERCONNECTIONS];
@@ -487,7 +487,7 @@ processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *ms
     retval = UA_SecureChannel_processHELACK(channel,
                                             (UA_TcpAcknowledgeMessage*)&helloMessage);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+        UA_LOG_INFO_CHANNEL(server->config.logging, channel,
                             "Error during the HEL/ACK handshake");
         return retval;
     }
@@ -547,7 +547,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
     UA_StatusCode retval = UA_NodeId_decodeBinary(msg, &offset, &requestType);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_NodeId_clear(&requestType);
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "Could not decode the NodeId. "
                                "Closing the SecureChannel.");
         UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_REJECT);
@@ -562,7 +562,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
     if(retval != UA_STATUSCODE_GOOD || !UA_NodeId_equal(&requestType, opnRequestId)) {
         UA_NodeId_clear(&requestType);
         UA_OpenSecureChannelRequest_clear(&openSecureChannelRequest);
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "Could not decode the OPN message. "
                                "Closing the SecureChannel.");
         UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_REJECT);
@@ -576,7 +576,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
     Service_OpenSecureChannel(server, channel, &openSecureChannelRequest, &openScResponse);
     UA_OpenSecureChannelRequest_clear(&openSecureChannelRequest);
     if(openScResponse.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "Could not open a SecureChannel. "
                                "Closing the connection.");
         UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_REJECT);
@@ -588,7 +588,7 @@ processOPN(UA_Server *server, UA_SecureChannel *channel,
                                                        &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
     UA_OpenSecureChannelResponse_clear(&openScResponse);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "Could not send the OPN answer with error code %s",
                                UA_StatusCode_name(retval));
         UA_SecureChannel_shutdown(channel, UA_SHUTDOWNREASON_REJECT);
@@ -614,21 +614,21 @@ sendResponse(UA_Server *server, UA_Session *session, UA_SecureChannel *channel,
 
     if(session) {
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+        UA_LOG_DEBUG_SESSION(server->config.logging, session,
                              "Sending response for RequestId %u of type %s",
                              (unsigned)requestId, responseType->typeName);
 #else
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+        UA_LOG_DEBUG_SESSION(server->config.logging, session,
                              "Sending reponse for RequestId %u of type %" PRIu32,
                              (unsigned)requestId, responseType->binaryEncodingId.identifier.numeric);
 #endif
     } else {
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-        UA_LOG_DEBUG_CHANNEL(&server->config.logger, channel,
+        UA_LOG_DEBUG_CHANNEL(server->config.logging, channel,
                              "Sending response for RequestId %u of type %s",
                              (unsigned)requestId, responseType->typeName);
 #else
-        UA_LOG_DEBUG_CHANNEL(&server->config.logger, channel,
+        UA_LOG_DEBUG_CHANNEL(server->config.logging, channel,
                              "Sending reponse for RequestId %u of type %" PRIu32,
                              (unsigned)requestId, responseType->binaryEncodingId.identifier.numeric);
 #endif
@@ -756,11 +756,11 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
     if(!session) {
         if(sessionRequired) {
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-            UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+            UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                    "%s refused without a valid session",
                                    requestType->typeName);
 #else
-            UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+            UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                    "Service %" PRIu32 " refused without a valid session",
                                    requestType->binaryEncodingId.identifier.numeric);
 #endif
@@ -779,11 +779,11 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
     /* Trying to use a non-activated session? */
     if(sessionRequired && !session->activated) {
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "%s refused on a non-activated session",
                                requestType->typeName);
 #else
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "Service %" PRIu32 " refused on a non-activated session",
                                requestType->binaryEncodingId.identifier.numeric);
 #endif
@@ -884,11 +884,11 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
     if(!requestType) {
         if(requestTypeId.identifier.numeric ==
            UA_NS0ID_CREATESUBSCRIPTIONREQUEST_ENCODING_DEFAULTBINARY) {
-            UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+            UA_LOG_INFO_CHANNEL(server->config.logging, channel,
                                 "Client requested a subscription, "
                                 "but those are not enabled in the build");
         } else {
-            UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+            UA_LOG_INFO_CHANNEL(server->config.logging, channel,
                                 "Unknown request with type identifier %" PRIi32,
                                 requestTypeId.identifier.numeric);
         }
@@ -903,7 +903,7 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
     retval = UA_decodeBinaryInternal(msg, &offset, &request,
                                      requestType, server->config.customDataTypes);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_DEBUG_CHANNEL(&server->config.logger, channel,
+        UA_LOG_DEBUG_CHANNEL(server->config.logging, channel,
                              "Could not decode the request with StatusCode %s",
                              UA_StatusCode_name(retval));
         return decodeHeaderSendServiceFault(channel, msg, requestPos,
@@ -914,7 +914,7 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
     UA_RequestHeader *requestHeader = &request.requestHeader;
     if(requestHeader->timestamp == 0 &&
        server->config.verifyRequestTimestamp <= UA_RULEHANDLING_WARN) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "The server sends no timestamp in the request header. "
                                "See the 'verifyRequestTimestamp' setting.");
         if(server->config.verifyRequestTimestamp <= UA_RULEHANDLING_ABORT) {
@@ -958,35 +958,35 @@ processSecureChannelMessage(void *application, UA_SecureChannel *channel,
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     switch(messagetype) {
     case UA_MESSAGETYPE_HEL:
-        UA_LOG_TRACE_CHANNEL(&server->config.logger, channel, "Process a HEL message");
+        UA_LOG_TRACE_CHANNEL(server->config.logging, channel, "Process a HEL message");
         retval = processHEL(server, channel, message);
         break;
     case UA_MESSAGETYPE_OPN:
-        UA_LOG_TRACE_CHANNEL(&server->config.logger, channel, "Process an OPN message");
+        UA_LOG_TRACE_CHANNEL(server->config.logging, channel, "Process an OPN message");
         retval = processOPN(server, channel, requestId, message);
         break;
     case UA_MESSAGETYPE_MSG:
-        UA_LOG_TRACE_CHANNEL(&server->config.logger, channel, "Process a MSG");
+        UA_LOG_TRACE_CHANNEL(server->config.logging, channel, "Process a MSG");
         retval = processMSG(server, channel, requestId, message);
         break;
     case UA_MESSAGETYPE_CLO:
-        UA_LOG_TRACE_CHANNEL(&server->config.logger, channel, "Process a CLO");
+        UA_LOG_TRACE_CHANNEL(server->config.logging, channel, "Process a CLO");
         Service_CloseSecureChannel(server, channel); /* Regular close */
         break;
     default:
-        UA_LOG_TRACE_CHANNEL(&server->config.logger, channel, "Invalid message type");
+        UA_LOG_TRACE_CHANNEL(server->config.logging, channel, "Invalid message type");
         retval = UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
         break;
     }
     if(retval != UA_STATUSCODE_GOOD) {
         if(!UA_SecureChannel_isConnected(channel)) {
-            UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+            UA_LOG_INFO_CHANNEL(server->config.logging, channel,
                                 "Processing the message failed. Channel already closed "
                                 "with StatusCode %s. ", UA_StatusCode_name(retval));
             return retval;
         }
 
-        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+        UA_LOG_INFO_CHANNEL(server->config.logging, channel,
                             "Processing the message failed with StatusCode %s. "
                             "Closing the channel.", UA_StatusCode_name(retval));
         UA_TcpErrorMessage errMsg;
@@ -1410,7 +1410,7 @@ retryReverseConnectCallback(UA_Server *server, void *context) {
     LIST_FOREACH(rc, &bpm->reverseConnects, next) {
         if(rc->currentConnection.connectionId)
             continue;
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                     "Attempt to reverse reconnect to %.*s:%d",
                     (int)rc->hostname.length, rc->hostname.data, rc->port);
         attemptReverseConnect(bpm, rc);
@@ -1491,14 +1491,14 @@ attemptReverseConnect(UA_BinaryProtocolManager *bpm, reverse_connect_context *co
         UA_StatusCode res = cm->openConnection(cm, &kvm, bpm, context,
                                                serverReverseConnectCallback);
         if(res != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Failed to create connection for reverse connect: %s\n",
                            UA_StatusCode_name(res));
         }
         return res;
     }
 
-    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                    "No ConnectionManager found for reverse connect");
     return UA_STATUSCODE_BADINTERNALERROR;
 }
@@ -1512,7 +1512,7 @@ UA_Server_addReverseConnect(UA_Server *server, UA_String url,
         getServerComponentByName(server, UA_STRING("binary"));
     UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)sc;
     if(!bpm) {
-        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_SERVER,
                      "No BinaryProtocolManager configured");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -1522,7 +1522,7 @@ UA_Server_addReverseConnect(UA_Server *server, UA_String url,
     UA_UInt16 port = 0;
     UA_StatusCode res = UA_parseEndpointUrl(&url, &hostname, &port, NULL);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                        "OPC UA URL is invalid: %.*s",
                        (int)url.length, url.data);
         return res;
@@ -1568,7 +1568,7 @@ UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
         getServerComponentByName(server, UA_STRING("binary"));
     UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)sc;
     if(!bpm) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "No BinaryProtocolManager configured");
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -1736,7 +1736,7 @@ UA_BinaryProtocolManager_start(UA_Server *server,
     UA_Boolean haveServerSocket = false;
     if(config->serverUrlsSize == 0) {
         /* Empty hostname -> listen on all devices */
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                        "No Server URL configured. Using \"opc.tcp://:4840\" "
                        "to configure the listen socket.");
         UA_String defaultUrl = UA_STRING("opc.tcp://:4840");
@@ -1752,7 +1752,7 @@ UA_BinaryProtocolManager_start(UA_Server *server,
     }
 
     if(!haveServerSocket) {
-        UA_LOG_ERROR(&config->logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_SERVER,
                      "The server has no server socket");
     }
 
@@ -1863,7 +1863,7 @@ UA_BinaryProtocolManager_new(UA_Server *server) {
         return NULL;
 
     bpm->server = server;
-    bpm->logging = &server->config.logger;
+    bpm->logging = server->config.logging;
 
     /* Initialize SecureChannel */
     TAILQ_INIT(&bpm->channels);
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index f6b80a8d68a..95229b2264c 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -87,17 +87,9 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 #endif
 
     /* Logger */
-    if(config->logging != NULL) {
-        if((config->logging != &config->logger) &&
-           (config->logging->clear != NULL)) {
-            config->logging->clear(config->logging->context);
-        }
-        config->logging = NULL;
-    }
-    if(config->logger.clear)
-        config->logger.clear(config->logger.context);
-    config->logger.log = NULL;
-    config->logger.clear = NULL;
+    if(config->logging != NULL && config->logging->clear != NULL)
+        config->logging->clear(config->logging->context);
+    config->logging = NULL;
 
 #ifdef UA_ENABLE_PUBSUB
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index fd7878842cb..acc956110bc 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -927,7 +927,7 @@ initNS0(UA_Server *server) {
     server->bootstrapNS0 = false;
 
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Initialization of Namespace 0 failed with %s. "
                      "See previous outputs for any error messages.",
                      UA_StatusCode_name(retVal));
@@ -1315,7 +1315,7 @@ initNS0(UA_Server *server) {
 #endif /* UA_GENERATED_NAMESPACE_ZERO */
 
     if(retVal != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Initialization of Namespace 0 (after bootstrapping) "
                      "failed with %s. See previous outputs for any error messages.",
                      UA_StatusCode_name(retVal));
diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 8b1ce425a6b..5fa23d6ab0f 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -230,7 +230,7 @@ createSubscriptionObject(UA_Server *server, UA_Session *session,
  cleanup:
     UA_BrowsePathResult_clear(&bpr);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "Creating the subscription diagnostics object failed "
                                "with StatusCode %s", UA_StatusCode_name(res));
     }
@@ -522,7 +522,7 @@ createSessionObject(UA_Server *server, UA_Session *session) {
 
  cleanup:
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "Creating the session diagnostics object failed "
                                "with StatusCode %s", UA_StatusCode_name(res));
     }
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index f9cdb4b5dab..809d228d8a8 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -386,7 +386,7 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
              UA_TimestampsToReturn timestampsToReturn,
              const UA_ReadValueId *id, UA_DataValue *v) {
     UA_LOG_NODEID_TRACE(&node->head.nodeId,
-                        UA_LOG_TRACE_SESSION(&server->config.logger, session,
+                        UA_LOG_TRACE_SESSION(server->config.logging, session,
                                              "Read attribute %"PRIi32 " of Node %.*s",
                                              id->attributeId, (int)nodeIdStr.length,
                                              nodeIdStr.data));
@@ -649,7 +649,7 @@ Operation_Read(UA_Server *server, UA_Session *session, UA_TimestampsToReturn *tt
 void
 Service_Read(UA_Server *server, UA_Session *session,
              const UA_ReadRequest *request, UA_ReadResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Processing ReadRequest");
+    UA_LOG_DEBUG_SESSION(server->config.logging, session, "Processing ReadRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Check if the timestampstoreturn is valid */
@@ -873,7 +873,7 @@ compatibleValueRankArrayDimensions(UA_Server *server, UA_Session *session,
                                    UA_Int32 valueRank, size_t arrayDimensionsSize) {
     /* ValueRank invalid */
     if(valueRank < UA_VALUERANK_SCALAR_OR_ONE_DIMENSION) {
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "The ValueRank is invalid (< -3)");
         return false;
     }
@@ -887,7 +887,7 @@ compatibleValueRankArrayDimensions(UA_Server *server, UA_Session *session,
      *   one or more dimensions */
     if(valueRank <= UA_VALUERANK_ONE_OR_MORE_DIMENSIONS) {
         if(arrayDimensionsSize > 0) {
-            UA_LOG_INFO_SESSION(&server->config.logger, session,
+            UA_LOG_INFO_SESSION(server->config.logging, session,
                                 "No ArrayDimensions can be defined for a ValueRank <= 0");
             return false;
         }
@@ -897,7 +897,7 @@ compatibleValueRankArrayDimensions(UA_Server *server, UA_Session *session,
     /* case >= 1, UA_VALUERANK_ONE_DIMENSION: the value is an array with the
        specified number of dimensions */
     if(arrayDimensionsSize != (size_t)valueRank) {
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "The number of ArrayDimensions is not equal to "
                             "the (positive) ValueRank");
         return false;
@@ -1042,7 +1042,7 @@ compatibleValue(UA_Server *server, UA_Session *session, const UA_NodeId *targetD
            server->config.allowEmptyVariables == UA_RULEHANDLING_ACCEPT)
             return true;
 
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "Only Variables with data type BaseDataType "
                             "can contain an empty value");
 
@@ -1201,7 +1201,7 @@ writeArrayDimensionsAttribute(UA_Server *server, UA_Session *session,
      * when we do the change */
     if(node->head.nodeClass == UA_NODECLASS_VARIABLETYPE &&
        UA_Node_hasSubTypeOrInstances(&node->head)) {
-        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                     "Cannot change a variable type with existing instances");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -1209,7 +1209,7 @@ writeArrayDimensionsAttribute(UA_Server *server, UA_Session *session,
     /* Check that the array dimensions match with the valuerank */
     if(!compatibleValueRankArrayDimensions(server, session, node->valueRank,
                                            arrayDimensionsSize)) {
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "Cannot write the ArrayDimensions. The ValueRank does not match.");
         return UA_STATUSCODE_BADTYPEMISMATCH;
     }
@@ -1219,7 +1219,7 @@ writeArrayDimensionsAttribute(UA_Server *server, UA_Session *session,
     if(type->arrayDimensions &&
        !compatibleArrayDimensions(type->arrayDimensionsSize, type->arrayDimensions,
                                   arrayDimensionsSize, arrayDimensions)) {
-       UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+       UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                     "Array dimensions in the variable type do not match");
        return UA_STATUSCODE_BADTYPEMISMATCH;
     }
@@ -1236,7 +1236,7 @@ writeArrayDimensionsAttribute(UA_Server *server, UA_Session *session,
             retval = UA_STATUSCODE_BADTYPEMISMATCH;
         UA_DataValue_clear(&value);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "Array dimensions in the current value do not match");
             return retval;
         }
@@ -1334,7 +1334,7 @@ writeDataTypeAttribute(UA_Server *server, UA_Session *session,
             retval = UA_STATUSCODE_BADTYPEMISMATCH;
         UA_DataValue_clear(&value);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
                          "The current value does not match the new data type");
             return retval;
         }
@@ -1439,13 +1439,13 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
             UA_LOG_NODEID_WARNING(&node->head.nodeId,
             if(session == &server->adminSession) {
                 /* If the value is written via the local API, log a warning */
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                                "Writing the value of Node %.*s failed with the "
                                "following reason: %s",
                                (int)nodeIdStr.length, nodeIdStr.data, reason);
             } else {
                 /* Don't spam the logs if writing from remote failed */
-                UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+                UA_LOG_DEBUG_SESSION(server->config.logging, session,
                                      "Writing the value of Node %.*s failed with the "
                                      "following reason: %s",
                                      (int)nodeIdStr.length, nodeIdStr.data, reason);
@@ -1626,7 +1626,7 @@ triggerImmediateDataChange(UA_Server *server, UA_Session *session,
         UA_StatusCode res = sampleCallbackWithValue(server, sub, mon, &value);
         if(res != UA_STATUSCODE_GOOD) {
             UA_DataValue_clear(&value);
-            UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
+            UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
                                         "MonitoredItem %" PRIi32 " | "
                                         "Sampling returned the statuscode %s",
                                         mon->monitoredItemId,
@@ -1647,7 +1647,7 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
 
     UA_LOG_NODEID_TRACE(&node->head.nodeId,
-                        UA_LOG_TRACE_SESSION(&server->config.logger, session,
+                        UA_LOG_TRACE_SESSION(server->config.logging, session,
                                              "Write attribute %"PRIi32 " of Node %.*s",
                                              wvalue->attributeId, (int)nodeIdStr.length,
                                              nodeIdStr.data));
@@ -1801,7 +1801,7 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
 
     /* Check if writing succeeded */
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "WriteRequest returned status code %s",
                             UA_StatusCode_name(retval));
         return retval;
@@ -1829,7 +1829,7 @@ Service_Write(UA_Server *server, UA_Session *session,
               const UA_WriteRequest *request,
               UA_WriteResponse *response) {
     UA_assert(session != NULL);
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing WriteRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 7a440332319..b2735cf9b7a 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -93,7 +93,7 @@ setApplicationDescriptionFromRegisteredServer(const UA_FindServersRequest *reque
 void Service_FindServers(UA_Server *server, UA_Session *session,
                          const UA_FindServersRequest *request,
                          UA_FindServersResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Processing FindServersRequest");
+    UA_LOG_DEBUG_SESSION(server->config.logging, session, "Processing FindServersRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Return the server itself? */
@@ -294,7 +294,7 @@ getDefaultEncryptedSecurityPolicy(UA_Server *server) {
         if(!UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &sp->policyUri))
             return sp;
     }
-    UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_CLIENT,
+    UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_CLIENT,
                    "Could not find a SecurityPolicy with encryption for the "
                    "UserTokenPolicy. Using an unencrypted policy.");
     return server->config.securityPoliciesSize > 0 ?
@@ -467,11 +467,11 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
     /* If the client expects to see a specific endpointurl, mirror it back. If
      * not, clone the endpoints with the discovery url of all networklayers. */
     if(request->endpointUrl.length > 0) {
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+        UA_LOG_DEBUG_SESSION(server->config.logging, session,
                              "Processing GetEndpointsRequest with endpointUrl "
                              UA_PRINTF_STRING_FORMAT, UA_PRINTF_STRING_DATA(request->endpointUrl));
     } else {
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+        UA_LOG_DEBUG_SESSION(server->config.logging, session,
                              "Processing GetEndpointsRequest with an empty endpointUrl");
     }
 
@@ -556,7 +556,7 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
         char* filePath = (char*)
             UA_malloc(sizeof(char)*requestServer->semaphoreFilePath.length+1);
         if(!filePath) {
-            UA_LOG_ERROR_SESSION(&server->config.logger, session,
+            UA_LOG_ERROR_SESSION(server->config.logging, session,
                                  "Cannot allocate memory for semaphore path. Out of memory.");
             responseHeader->serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
             return;
@@ -570,7 +570,7 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
         }
         UA_free(filePath);
 #else
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_CLIENT,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Ignoring semaphore file path. open62541 not compiled "
                        "with UA_ENABLE_DISCOVERY_SEMAPHORE=ON");
 #endif
@@ -593,7 +593,7 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
         // server is shutting down. Remove it from the registered servers list
         if(!registeredServer_entry) {
             // server not found, show warning
-            UA_LOG_WARNING_SESSION(&server->config.logger, session,
+            UA_LOG_WARNING_SESSION(server->config.logging, session,
                                    "Could not unregister server %.*s. Not registered.",
                                    (int)requestServer->serverUri.length, requestServer->serverUri.data);
             responseHeader->serviceResult = UA_STATUSCODE_BADNOTHINGTODO;
@@ -619,7 +619,7 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(!registeredServer_entry) {
         // server not yet registered, register it by adding it to the list
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Registering new server: %.*s",
+        UA_LOG_DEBUG_SESSION(server->config.logging, session, "Registering new server: %.*s",
                              (int)requestServer->serverUri.length, requestServer->serverUri.data);
 
         registeredServer_entry =
@@ -656,7 +656,7 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
 void Service_RegisterServer(UA_Server *server, UA_Session *session,
                             const UA_RegisterServerRequest *request,
                             UA_RegisterServerResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing RegisterServerRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     process_RegisterServer(server, session, &request->requestHeader, &request->server, 0,
@@ -666,7 +666,7 @@ void Service_RegisterServer(UA_Server *server, UA_Session *session,
 void Service_RegisterServer2(UA_Server *server, UA_Session *session,
                             const UA_RegisterServer2Request *request,
                              UA_RegisterServer2Response *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing RegisterServer2Request");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     process_RegisterServer(server, session, &request->requestHeader, &request->server,
diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index ac2a872bdff..d8f8e8ecfe0 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -429,7 +429,7 @@ void
 Service_CallAsync(UA_Server *server, UA_Session *session, UA_UInt32 requestId,
                   const UA_CallRequest *request, UA_CallResponse *response,
                   UA_Boolean *finished) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Processing CallRequestAsync");
+    UA_LOG_DEBUG_SESSION(server->config.logging, session, "Processing CallRequestAsync");
     if(server->config.maxNodesPerMethodCall != 0 &&
         request->methodsToCallSize > server->config.maxNodesPerMethodCall) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADTOOMANYOPERATIONS;
@@ -503,7 +503,7 @@ Operation_CallMethod(UA_Server *server, UA_Session *session, void *context,
 
 void Service_Call(UA_Server *server, UA_Session *session,
                   const UA_CallRequest *request, UA_CallResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Processing CallRequest");
+    UA_LOG_DEBUG_SESSION(server->config.logging, session, "Processing CallRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(server->config.maxNodesPerMethodCall != 0 &&
diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 03f9c3d91bf..23e24e01742 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -421,7 +421,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
     if(request->itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER) {
         /* TODO: Only remote clients can add Event-MonitoredItems at the moment */
         if(!cmc->sub) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Only remote clients can add Event-MonitoredItems");
             result->statusCode = UA_STATUSCODE_BADNOTSUPPORTED;
             UA_DataValue_clear(&v);
@@ -438,7 +438,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
         UA_Byte eventNotifierValue = *((UA_Byte *)v.value.data);
         if((eventNotifierValue & 0x01) != 1) {
             result->statusCode = UA_STATUSCODE_BADNOTSUPPORTED;
-            UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, cmc->sub,
+            UA_LOG_INFO_SUBSCRIPTION(server->config.logging, cmc->sub,
                                      "Could not create a MonitoredItem as the "
                                      "'SubscribeToEvents' bit of the EventNotifier "
                                      "attribute is not set");
@@ -485,7 +485,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
                                                 &newMon->parameters, result);
 #endif
     if(result->statusCode != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, cmc->sub,
+        UA_LOG_INFO_SUBSCRIPTION(server->config.logging, cmc->sub,
                                  "Could not create a MonitoredItem "
                                  "with StatusCode %s",
                                  UA_StatusCode_name(result->statusCode));
@@ -521,7 +521,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
     if(result->revisedSamplingInterval < 0.0 && cmc->sub)
         result->revisedSamplingInterval = cmc->sub->publishingInterval;
 
-    UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, cmc->sub,
+    UA_LOG_INFO_SUBSCRIPTION(server->config.logging, cmc->sub,
                              "MonitoredItem %" PRIi32 " | "
                              "Created the MonitoredItem "
                              "(Sampling Interval: %.2fms, Queue Size: %lu)",
@@ -534,7 +534,7 @@ void
 Service_CreateMonitoredItems(UA_Server *server, UA_Session *session,
                              const UA_CreateMonitoredItemsRequest *request,
                              UA_CreateMonitoredItemsResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing CreateMonitoredItemsRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -664,7 +664,7 @@ Operation_ModifyMonitoredItem(UA_Server *server, UA_Session *session, UA_Subscri
     if(result->revisedSamplingInterval < 0.0 && mon->subscription)
         result->revisedSamplingInterval = mon->subscription->publishingInterval;
 
-    UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, sub,
+    UA_LOG_INFO_SUBSCRIPTION(server->config.logging, sub,
                              "MonitoredItem %" PRIi32 " | "
                              "Modified the MonitoredItem "
                              "(Sampling Interval: %fms, Queue Size: %lu)",
@@ -677,7 +677,7 @@ void
 Service_ModifyMonitoredItems(UA_Server *server, UA_Session *session,
                              const UA_ModifyMonitoredItemsRequest *request,
                              UA_ModifyMonitoredItemsResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing ModifyMonitoredItemsRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -733,7 +733,7 @@ void
 Service_SetMonitoringMode(UA_Server *server, UA_Session *session,
                           const UA_SetMonitoringModeRequest *request,
                           UA_SetMonitoringModeResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Processing SetMonitoringMode");
+    UA_LOG_DEBUG_SESSION(server->config.logging, session, "Processing SetMonitoringMode");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(server->config.maxMonitoredItemsPerCall != 0 &&
@@ -779,7 +779,7 @@ void
 Service_DeleteMonitoredItems(UA_Server *server, UA_Session *session,
                              const UA_DeleteMonitoredItemsRequest *request,
                              UA_DeleteMonitoredItemsResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing DeleteMonitoredItemsRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 319ea488f3a..5a4ca440648 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -123,7 +123,7 @@ checkParentReference(UA_Server *server, UA_Session *session, const UA_NodeHead *
     /* See if the parent exists */
     const UA_Node *parent = UA_NODESTORE_GET(server, parentNodeId);
     if(!parent) {
-        logAddNode(&server->config.logger, session, &head->nodeId,
+        logAddNode(server->config.logging, session, &head->nodeId,
                    "Parent node not found");
         return UA_STATUSCODE_BADPARENTNODEIDINVALID;
     }
@@ -134,14 +134,14 @@ checkParentReference(UA_Server *server, UA_Session *session, const UA_NodeHead *
     /* Check the referencetype exists */
     const UA_Node *referenceType = UA_NODESTORE_GET(server, referenceTypeId);
     if(!referenceType) {
-        logAddNode(&server->config.logger, session, &head->nodeId,
+        logAddNode(server->config.logging, session, &head->nodeId,
                    "Reference type to the parent not found");
         return UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
     }
 
     /* Check if the referencetype is a reference type node */
     if(referenceType->head.nodeClass != UA_NODECLASS_REFERENCETYPE) {
-        logAddNode(&server->config.logger, session, &head->nodeId,
+        logAddNode(server->config.logging, session, &head->nodeId,
                    "Reference type to the parent is not a ReferenceTypeNode");
         UA_NODESTORE_RELEASE(server, referenceType);
         return UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
@@ -151,7 +151,7 @@ checkParentReference(UA_Server *server, UA_Session *session, const UA_NodeHead *
     UA_Boolean referenceTypeIsAbstract = referenceType->referenceTypeNode.isAbstract;
     UA_NODESTORE_RELEASE(server, referenceType);
     if(referenceTypeIsAbstract == true) {
-        logAddNode(&server->config.logger, session, &head->nodeId,
+        logAddNode(server->config.logging, session, &head->nodeId,
                    "Abstract reference type to the parent not allowed");
         return UA_STATUSCODE_BADREFERENCENOTALLOWED;
     }
@@ -164,13 +164,13 @@ checkParentReference(UA_Server *server, UA_Session *session, const UA_NodeHead *
         /* Type needs hassubtype reference to the supertype */
         if(referenceType->referenceTypeNode.referenceTypeIndex !=
            UA_REFERENCETYPEINDEX_HASSUBTYPE) {
-            logAddNode(&server->config.logger, session, &head->nodeId,
+            logAddNode(server->config.logging, session, &head->nodeId,
                        "Type nodes need to have a HasSubType reference to the parent");
             return UA_STATUSCODE_BADREFERENCENOTALLOWED;
         }
         /* Supertype needs to be of the same node type  */
         if(parentNodeClass != head->nodeClass) {
-            logAddNode(&server->config.logger, session, &head->nodeId,
+            logAddNode(server->config.logging, session, &head->nodeId,
                        "Type nodes needs to be of the same node "
                        "type as their parent");
             return UA_STATUSCODE_BADPARENTNODEIDINVALID;
@@ -182,7 +182,7 @@ checkParentReference(UA_Server *server, UA_Session *session, const UA_NodeHead *
     const UA_NodeId hierarchRefs = UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES);
     if(!isNodeInTree_singleRef(server, referenceTypeId, &hierarchRefs,
                                UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-        logAddNode(&server->config.logger, session, &head->nodeId,
+        logAddNode(server->config.logging, session, &head->nodeId,
                    "Reference type to the parent is not hierarchical");
         return UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
     }
@@ -286,7 +286,7 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
                       const UA_VariableTypeNode *vt) {
     /* Check the datatype against the vt */
     if(!compatibleDataTypes(server, &node->dataType, &vt->dataType)) {
-        logAddNode(&server->config.logger, session, &node->head.nodeId,
+        logAddNode(server->config.logging, session, &node->head.nodeId,
                    "The value of is incompatible with "
                    "the datatype of the VariableType");
         return UA_STATUSCODE_BADTYPEMISMATCH;
@@ -295,14 +295,14 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
     /* Check valueRank against array dimensions */
     if(!compatibleValueRankArrayDimensions(server, session, node->valueRank,
                                            node->arrayDimensionsSize)) {
-        logAddNode(&server->config.logger, session, &node->head.nodeId,
+        logAddNode(server->config.logging, session, &node->head.nodeId,
                    "The value rank of is incompatible with its array dimensions");
         return UA_STATUSCODE_BADTYPEMISMATCH;
     }
 
     /* Check valueRank against the vt */
     if(!compatibleValueRanks(node->valueRank, vt->valueRank)) {
-        logAddNode(&server->config.logger, session, &node->head.nodeId,
+        logAddNode(server->config.logging, session, &node->head.nodeId,
                    "The value rank is incompatible "
                    "with the value rank of the VariableType");
         return UA_STATUSCODE_BADTYPEMISMATCH;
@@ -311,7 +311,7 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
     /* Check array dimensions against the vt */
     if(!compatibleArrayDimensions(vt->arrayDimensionsSize, vt->arrayDimensions,
                                   node->arrayDimensionsSize, node->arrayDimensions)) {
-        logAddNode(&server->config.logger, session, &node->head.nodeId,
+        logAddNode(server->config.logging, session, &node->head.nodeId,
                    "The array dimensions are incompatible with the "
                    "array dimensions of the VariableType");
         return UA_STATUSCODE_BADTYPEMISMATCH;
@@ -350,7 +350,7 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
         /* Warn if that is configured */
         if(server->config.allowEmptyVariables != UA_RULEHANDLING_ACCEPT)
             UA_LOG_NODEID_DEBUG(&node->head.nodeId,
-               UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+               UA_LOG_DEBUG_SESSION(server->config.logging, session,
                                     "AddNode (%.*s): The value is empty. "
                                     "But this is only allowed for BaseDataType. "
                                     "Create a matching default value.",
@@ -365,7 +365,7 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
             retval = setDefaultValue(server, node);
             if(retval != UA_STATUSCODE_GOOD) {
                 UA_LOG_NODEID_INFO(&node->head.nodeId,
-                   UA_LOG_INFO_SESSION(&server->config.logger, session,
+                   UA_LOG_INFO_SESSION(server->config.logging, session,
                                        "AddNode (%.*s): Could not create a default value "
                                        "with StatusCode %s", (int)nodeIdStr.length,
                                        nodeIdStr.data, UA_StatusCode_name(retval)));
@@ -380,7 +380,7 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
                         node->arrayDimensionsSize, node->arrayDimensions,
                         &value.value, NULL, &reason)) {
         UA_LOG_NODEID_INFO(&node->head.nodeId,
-           UA_LOG_INFO_SESSION(&server->config.logger, session,
+           UA_LOG_INFO_SESSION(server->config.logging, session,
                                "AddNode (%.*s): The VariableNode value has "
                                "failed the type check with reason %s. ",
                                (int)nodeIdStr.length, nodeIdStr.data, reason));
@@ -432,7 +432,7 @@ useVariableTypeAttributes(UA_Server *server, UA_Session *session,
         UA_DataValue_clear(&v);
 
         if(retval != UA_STATUSCODE_GOOD) {
-            logAddNode(&server->config.logger, session, &node->head.nodeId,
+            logAddNode(server->config.logging, session, &node->head.nodeId,
                        "The default content of the VariableType could "
                        "not be used. This may happen if the VariableNode "
                        "makes additional restrictions.");
@@ -442,7 +442,7 @@ useVariableTypeAttributes(UA_Server *server, UA_Session *session,
 
     /* If no datatype is given, use the datatype of the vt */
     if(UA_NodeId_isNull(&node->dataType)) {
-        logAddNode(&server->config.logger, session, &node->head.nodeId,
+        logAddNode(server->config.logging, session, &node->head.nodeId,
                    "No datatype given; Copy the datatype attribute "
                    "from the TypeDefinition");
         retval = writeAttribute(server, session, &node->head.nodeId,
@@ -858,7 +858,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
     UA_StatusCode retval;
     /* Make sure newly created node does not have itself as parent */
     if(UA_NodeId_equal(nodeId, parentNodeId)) {
-        logAddNode(&server->config.logger, session, nodeId,
+        logAddNode(server->config.logging, session, nodeId,
                    "A node cannot have itself as parent");
         retval = UA_STATUSCODE_BADINVALIDARGUMENT;
         goto cleanup;
@@ -868,7 +868,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
     /* Check parent reference. Objects may have no parent. */
     retval = checkParentReference(server, session, head, parentNodeId, referenceTypeId);
     if(retval != UA_STATUSCODE_GOOD) {
-        logAddNode(&server->config.logger, session, nodeId,
+        logAddNode(server->config.logging, session, nodeId,
                    "The parent reference for is invalid");
         goto cleanup;
     }
@@ -877,7 +877,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
     if((head->nodeClass == UA_NODECLASS_VARIABLE ||
         head->nodeClass == UA_NODECLASS_OBJECT) &&
        UA_NodeId_isNull(typeDefinitionId)) {
-        logAddNode(&server->config.logger, session, nodeId,
+        logAddNode(server->config.logging, session, nodeId,
                    "No TypeDefinition. Use the default "
                    "TypeDefinition for the Variable/Object");
         if(head->nodeClass == UA_NODECLASS_VARIABLE)
@@ -892,7 +892,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
         /* Get the type node */
         type = UA_NODESTORE_GET(server, typeDefinitionId);
         if(!type) {
-            logAddNode(&server->config.logger, session, nodeId, "Node type not found");
+            logAddNode(server->config.logging, session, nodeId, "Node type not found");
             retval = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
             goto cleanup;
         }
@@ -924,7 +924,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
                 typeOk = false;
         }
         if(!typeOk) {
-            logAddNode(&server->config.logger, session, nodeId,
+            logAddNode(server->config.logging, session, nodeId,
                        "Type does not match the NodeClass");
             retval = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
             goto cleanup;
@@ -949,7 +949,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
             const UA_NodeId objectTypes = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE);
             if(!isNodeInTree(server, parentNodeId, &variableTypes, &refTypes) &&
                !isNodeInTree(server, parentNodeId, &objectTypes, &refTypes)) {
-                logAddNode(&server->config.logger, session, nodeId,
+                logAddNode(server->config.logging, session, nodeId,
                            "Type of variable node must be a "
                            "VariableType and not cannot be abstract");
                 retval = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
@@ -982,7 +982,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
 
             if(!isInBaseObjectType &&
                !(isInBaseEventType && UA_NodeId_isNull(parentNodeId))) {
-                logAddNode(&server->config.logger, session, nodeId,
+                logAddNode(server->config.logging, session, nodeId,
                            "Type of ObjectNode must be ObjectType and not be abstract");
                 retval = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
                 goto cleanup;
@@ -993,7 +993,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
     /* Add reference to the parent */
     if(!UA_NodeId_isNull(parentNodeId)) {
         if(UA_NodeId_isNull(referenceTypeId)) {
-            logAddNode(&server->config.logger, session, nodeId,
+            logAddNode(server->config.logging, session, nodeId,
                        "Reference to parent cannot be null");
             retval = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
             goto cleanup;
@@ -1002,7 +1002,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
         retval = addRefWithSession(server, session, &head->nodeId, referenceTypeId,
                                    parentNodeId, false);
         if(retval != UA_STATUSCODE_GOOD) {
-            logAddNode(&server->config.logger, session, nodeId,
+            logAddNode(server->config.logging, session, nodeId,
                        "Adding reference to parent failed");
             goto cleanup;
         }
@@ -1015,7 +1015,7 @@ addNode_addRefs(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId,
         retval = addRefWithSession(server, session, &head->nodeId, &hasTypeDefinition,
                                    &type->head.nodeId, true);
         if(retval != UA_STATUSCODE_GOOD) {
-            logAddNode(&server->config.logger, session, nodeId,
+            logAddNode(server->config.logging, session, nodeId,
                        "Adding a reference to the type definition failed");
         }
     }
@@ -1047,14 +1047,14 @@ addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
 
     /* Check the namespaceindex */
     if(item->requestedNewNodeId.nodeId.namespaceIndex >= server->namespacesSize) {
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "AddNode: Namespace invalid");
         return UA_STATUSCODE_BADNODEIDINVALID;
     }
 
     if(item->nodeAttributes.encoding != UA_EXTENSIONOBJECT_DECODED &&
        item->nodeAttributes.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) {
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "AddNode: Node attributes invalid");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -1062,7 +1062,7 @@ addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
     /* Create a node */
     UA_Node *node = UA_NODESTORE_NEW(server, item->nodeClass);
     if(!node) {
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "AddNode: Node could not create a node "
                             "in the nodestore");
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -1097,7 +1097,7 @@ addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
         outNewNodeId = &tmpOutId;
     retval = UA_NODESTORE_INSERT(server, node, outNewNodeId);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "AddNode: Node could not add the new node "
                             "to the nodestore with error code %s",
                             UA_StatusCode_name(retval));
@@ -1110,7 +1110,7 @@ addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
     return UA_STATUSCODE_GOOD;
 
 create_error:
-    UA_LOG_INFO_SESSION(&server->config.logger, session,
+    UA_LOG_INFO_SESSION(server->config.logging, session,
                         "AddNode: Node could not create a node "
                         "with error code %s", UA_StatusCode_name(retval));
     UA_NODESTORE_DELETE(server, node);
@@ -1468,7 +1468,7 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
             if(node->head.references[i].referenceTypeIndex ==
                UA_REFERENCETYPEINDEX_HASSUBTYPE) {
                 UA_LOG_NODEID_INFO(&node->head.nodeId,
-                UA_LOG_INFO_SESSION(&server->config.logger, session,
+                UA_LOG_INFO_SESSION(server->config.logging, session,
                                     "AddNode (%.*s): Variable not allowed "
                                     "to have HasSubType reference",
                                     (int)nodeIdStr.length, nodeIdStr.data));
@@ -1495,7 +1495,7 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
         if(!type) {
             if(server->bootstrapNS0)
                 goto constructor;
-            logAddNode(&server->config.logger, session, &node->head.nodeId,
+            logAddNode(server->config.logging, session, &node->head.nodeId,
                        "Node type not found");
             retval = UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
             goto cleanup;
@@ -1512,7 +1512,7 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
                                            &type->variableTypeNode);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_NODEID_INFO(&node->head.nodeId,
-            UA_LOG_INFO_SESSION(&server->config.logger, session,
+            UA_LOG_INFO_SESSION(server->config.logging, session,
                                 "AddNode (%.*s): Using attributes for from "
                                 "the variable type failed with error code %s",
                                 (int)nodeIdStr.length, nodeIdStr.data,
@@ -1538,7 +1538,7 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
                                        &type->variableTypeNode);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_NODEID_INFO(&node->head.nodeId,
-            UA_LOG_INFO_SESSION(&server->config.logger, session,
+            UA_LOG_INFO_SESSION(server->config.logging, session,
                                 "AddNode (%.*s): Type-checking "
                                 "failed with error code %s", (int)nodeIdStr.length,
                                 nodeIdStr.data, UA_StatusCode_name(retval)));
@@ -1552,7 +1552,7 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
         retval = addTypeChildren(server, session, nodeId, &type->head.nodeId);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_NODEID_INFO(&node->head.nodeId,
-            UA_LOG_INFO_SESSION(&server->config.logger, session,
+            UA_LOG_INFO_SESSION(server->config.logging, session,
                                 "AddNode (%.*s): Adding child nodes "
                                 "failed with error code %s", (int)nodeIdStr.length,
                                 nodeIdStr.data, UA_StatusCode_name(retval)));
@@ -1565,7 +1565,7 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
         retval = addInterfaceChildren(server, session, nodeId, &type->head.nodeId);
         if(retval != UA_STATUSCODE_GOOD) {
             UA_LOG_NODEID_INFO(&node->head.nodeId,
-            UA_LOG_INFO_SESSION(&server->config.logger, session,
+            UA_LOG_INFO_SESSION(server->config.logging, session,
                                 "AddNode (%.*s): Adding child nodes "
                                 "interface failed with error code %s",
                                 (int)nodeIdStr.length, nodeIdStr.data,
@@ -1580,7 +1580,7 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
         retval = recursiveCallConstructors(server, session, nodeId, type);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_NODEID_INFO(&node->head.nodeId,
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "AddNode (%.*s): Calling the node constructor(s) "
                             "failed with status code %s", (int)nodeIdStr.length,
                             nodeIdStr.data, UA_StatusCode_name(retval)));
@@ -1618,7 +1618,7 @@ void
 Service_AddNodes(UA_Server *server, UA_Session *session,
                  const UA_AddNodesRequest *request,
                  UA_AddNodesResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Processing AddNodesRequest");
+    UA_LOG_DEBUG_SESSION(server->config.logging, session, "Processing AddNodesRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(server->config.maxNodesPerNodeManagement != 0 &&
@@ -1984,7 +1984,7 @@ deleteNodeOperation(UA_Server *server, UA_Session *session, void *context,
 
     if(UA_Node_hasSubTypeOrInstances(&node->head)) {
         UA_LOG_NODEID_INFO(&node->head.nodeId,
-        UA_LOG_INFO_SESSION(&server->config.logger, session, "DeleteNode (%.*s): "
+        UA_LOG_INFO_SESSION(server->config.logging, session, "DeleteNode (%.*s): "
                             "Cannot delete a type node with active instances or "
                             "subtypes", (int)nodeIdStr.length, nodeIdStr.data));
         UA_NODESTORE_RELEASE(server, node);
@@ -2019,7 +2019,7 @@ deleteNodeOperation(UA_Server *server, UA_Session *session, void *context,
     *result = buildDeleteNodeSet(server, session, &hierarchRefsSet, &item->nodeId,
                                  item->deleteTargetReferences, &refTree);
     if(*result != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "DeleteNode: Incomplete lookup of nodes. "
                                "Still deleting what we have.");
         /* Continue, so the RefTree is cleaned up. Return the error message
@@ -2037,7 +2037,7 @@ void
 Service_DeleteNodes(UA_Server *server, UA_Session *session,
                     const UA_DeleteNodesRequest *request,
                     UA_DeleteNodesResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing DeleteNodesRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -2140,7 +2140,7 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
     const UA_Node *refType = UA_NODESTORE_GET(server, &item->referenceTypeId);
     if(!refType) {
         UA_LOG_NODEID_DEBUG(&item->referenceTypeId,
-            UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+            UA_LOG_DEBUG_SESSION(server->config.logging, session,
                                  "Cannot add reference - ReferenceType %.*s unknown",
                                  (int)nodeIdStr.length, nodeIdStr.data));
         *retval = UA_STATUSCODE_BADREFERENCETYPEIDINVALID;
@@ -2148,7 +2148,7 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
     }
     if(refType->head.nodeClass != UA_NODECLASS_REFERENCETYPE) {
         UA_LOG_NODEID_DEBUG(&item->referenceTypeId,
-            UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+            UA_LOG_DEBUG_SESSION(server->config.logging, session,
                                  "Cannot add reference - ReferenceType %.*s with wrong NodeClass",
                                  (int)nodeIdStr.length, nodeIdStr.data));
         UA_NODESTORE_RELEASE(server, refType);
@@ -2162,7 +2162,7 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
     const UA_Node *targetNode = UA_NODESTORE_GET(server, &item->targetNodeId.nodeId);
     if(!targetNode) {
         UA_LOG_NODEID_DEBUG(&item->targetNodeId.nodeId,
-            UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+            UA_LOG_DEBUG_SESSION(server->config.logging, session,
                                  "Cannot add reference - target %.*s does not exist",
                                  (int)nodeIdStr.length, nodeIdStr.data));
         *retval = UA_STATUSCODE_BADTARGETNODEIDINVALID;
@@ -2213,7 +2213,7 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
          * result if BOTH directions already existed */
         if(UA_NodeId_equal(&item->sourceNodeId, &item->targetNodeId.nodeId)) {
             *retval = UA_STATUSCODE_GOOD;
-            UA_LOG_INFO_SESSION(&server->config.logger, session, "The source node and the target node are identical. The check for duplicate references is skipped.");
+            UA_LOG_INFO_SESSION(server->config.logging, session, "The source node and the target node are identical. The check for duplicate references is skipped.");
         }
         else if(firstExisted) {
             *retval = UA_STATUSCODE_BADDUPLICATEREFERENCENOTALLOWED;
@@ -2240,7 +2240,7 @@ void
 Service_AddReferences(UA_Server *server, UA_Session *session,
                       const UA_AddReferencesRequest *request,
                       UA_AddReferencesResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing AddReferencesRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_assert(session);
@@ -2328,7 +2328,7 @@ void
 Service_DeleteReferences(UA_Server *server, UA_Session *session,
                          const UA_DeleteReferencesRequest *request,
                          UA_DeleteReferencesResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing DeleteReferencesRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
diff --git a/src/server/ua_services_securechannel.c b/src/server/ua_services_securechannel.c
index fa6e9a0d285..53f89d107ce 100644
--- a/src/server/ua_services_securechannel.c
+++ b/src/server/ua_services_securechannel.c
@@ -27,7 +27,7 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
     case UA_SECURITYTOKENREQUESTTYPE_ISSUE:
         /* We must expect an OPN handshake */
         if(channel->state != UA_SECURECHANNELSTATE_ACK_SENT) {
-            UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
+            UA_LOG_ERROR_CHANNEL(server->config.logging, channel,
                                  "Called open on already open or closed channel");
             response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
             goto error;
@@ -46,7 +46,7 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
     case UA_SECURITYTOKENREQUESTTYPE_RENEW:
         /* The channel must be open to be renewed */
         if(channel->state != UA_SECURECHANNELSTATE_OPEN) {
-            UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
+            UA_LOG_ERROR_CHANNEL(server->config.logging, channel,
                                  "Called renew on channel which is not open");
             response->responseHeader.serviceResult = UA_STATUSCODE_BADINTERNALERROR;
             goto error;
@@ -55,7 +55,7 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
         /* Check whether the nonce was reused */
         if(channel->securityMode != UA_MESSAGESECURITYMODE_NONE &&
            UA_ByteString_equal(&channel->remoteNonce, &request->clientNonce)) {
-            UA_LOG_ERROR_CHANNEL(&server->config.logger, channel,
+            UA_LOG_ERROR_CHANNEL(server->config.logging, channel,
                                  "The client reused the last nonce");
             response->responseHeader.serviceResult = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
             goto error;
@@ -103,14 +103,14 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
 
     /* Success */
     if(request->requestType == UA_SECURITYTOKENREQUESTTYPE_ISSUE) {
-        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+        UA_LOG_INFO_CHANNEL(server->config.logging, channel,
                             "SecureChannel opened with SecurityPolicy %.*s "
                             "and a revised lifetime of %.2fs",
                             (int)channel->securityPolicy->policyUri.length,
                             channel->securityPolicy->policyUri.data,
                             (UA_Float)response->securityToken.revisedLifetime / 1000);
     } else {
-        UA_LOG_INFO_CHANNEL(&server->config.logger, channel, "SecureChannel renewed "
+        UA_LOG_INFO_CHANNEL(server->config.logging, channel, "SecureChannel renewed "
                             "with a revised lifetime of %.2fs",
                             (UA_Float)response->securityToken.revisedLifetime / 1000);
     }
@@ -119,10 +119,10 @@ Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel *channel,
 
  error:
     if(request->requestType == UA_SECURITYTOKENREQUESTTYPE_ISSUE) {
-        UA_LOG_INFO_CHANNEL(&server->config.logger, channel,
+        UA_LOG_INFO_CHANNEL(server->config.logging, channel,
                             "Opening a SecureChannel failed");
     } else {
-        UA_LOG_DEBUG_CHANNEL(&server->config.logger, channel,
+        UA_LOG_DEBUG_CHANNEL(server->config.logging, channel,
                              "Renewing SecureChannel failed");
     }
 }
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index c2145f3022d..8d85eef4151 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -121,7 +121,7 @@ UA_Server_cleanupSessions(UA_Server *server, UA_DateTime nowMonotonic) {
         /* Session has timed out? */
         if(sentry->session.validTill >= nowMonotonic)
             continue;
-        UA_LOG_INFO_SESSION(&server->config.logger, &sentry->session,
+        UA_LOG_INFO_SESSION(server->config.logging, &sentry->session,
                             "Session has timed out");
         UA_Server_removeSession(server, sentry, UA_SHUTDOWNREASON_TIMEOUT);
     }
@@ -143,7 +143,7 @@ getSessionByToken(UA_Server *server, const UA_NodeId *token) {
 
         /* Session has timed out */
         if(UA_DateTime_nowMonotonic() > current->session.validTill) {
-            UA_LOG_INFO_SESSION(&server->config.logger, &current->session,
+            UA_LOG_INFO_SESSION(server->config.logging, &current->session,
                                 "Client tries to use a session that has timed out");
             return NULL;
         }
@@ -166,7 +166,7 @@ getSessionById(UA_Server *server, const UA_NodeId *sessionId) {
 
         /* Session has timed out */
         if(UA_DateTime_nowMonotonic() > current->session.validTill) {
-            UA_LOG_INFO_SESSION(&server->config.logger, &current->session,
+            UA_LOG_INFO_SESSION(server->config.logging, &current->session,
                                 "Client tries to use a session that has timed out");
             return NULL;
         }
@@ -228,7 +228,7 @@ UA_Server_createSession(UA_Server *server, UA_SecureChannel *channel,
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     if(server->sessionCount >= server->config.maxSessions) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "Could not create a Session - Server limits reached");
         return UA_STATUSCODE_BADTOOMANYSESSIONS;
     }
@@ -266,7 +266,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
                       const UA_CreateSessionRequest *request,
                       UA_CreateSessionResponse *response) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_LOG_DEBUG_CHANNEL(&server->config.logger, channel, "Trying to create session");
+    UA_LOG_DEBUG_CHANNEL(server->config.logging, channel, "Trying to create session");
 
     if(channel->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
        channel->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT) {
@@ -280,7 +280,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
         UA_StatusCode retval = channel->securityPolicy->channelModule.
             compareCertificate(channel->channelContext, &request->clientCertificate);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+            UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                    "The client certificate did not validate");
             response->responseHeader.serviceResult = UA_STATUSCODE_BADCERTIFICATEINVALID;
             return;
@@ -302,7 +302,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
             cv->verifyApplicationURI(cv, &request->clientCertificate,
                                      &request->clientDescription.applicationUri);
         if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+            UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                    "The client's ApplicationURI did not match the certificate");
             server->serverDiagnosticsSummary.securityRejectedSessionCount++;
             server->serverDiagnosticsSummary.rejectedSessionCount++;
@@ -315,7 +315,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
     response->responseHeader.serviceResult =
         UA_Server_createSession(server, channel, request, &newSession);
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "Processing CreateSessionRequest failed");
         server->serverDiagnosticsSummary.rejectedSessionCount++;
         return;
@@ -391,7 +391,7 @@ Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
     createSessionObject(server, newSession);
 #endif
 
-    UA_LOG_INFO_SESSION(&server->config.logger, newSession, "Session created");
+    UA_LOG_INFO_SESSION(server->config.logging, newSession, "Session created");
 }
 
 static UA_StatusCode
@@ -539,7 +539,7 @@ decryptUserNamePW(UA_Server *server, UA_Session *session,
         if(userToken->encryptionAlgorithm.length > 0)
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
-        UA_LOG_WARNING_SESSION(&server->config.logger, session, "ActivateSession: "
+        UA_LOG_WARNING_SESSION(server->config.logging, session, "ActivateSession: "
                                "Received an unencrypted username/passwort. "
                                "Is the server misconfigured to allow that?");
         return UA_STATUSCODE_GOOD;
@@ -559,7 +559,7 @@ decryptUserNamePW(UA_Server *server, UA_Session *session,
         sp->channelModule.newContext(sp, &sp->localCertificate, &tempChannelContext);
     UA_LOCK(&server->serviceMutex);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: Failed to create a "
                                "context for the SecurityPolicy %.*s",
                                (int)sp->policyUri.length,
@@ -628,7 +628,7 @@ decryptUserNamePW(UA_Server *server, UA_Session *session,
     UA_LOCK(&server->serviceMutex);
 
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: Failed to decrypt the "
                                "password with the StatusCode %s",
                                UA_StatusCode_name(res));
@@ -652,7 +652,7 @@ checkActivateSessionX509(UA_Server *server, UA_Session *session,
         newContext(sp, &token->certificateData, &tempChannelContext);
     UA_LOCK(&server->serviceMutex);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: Failed to create a context "
                                "for the SecurityPolicy %.*s",
                                (int)sp->policyUri.length,
@@ -664,7 +664,7 @@ checkActivateSessionX509(UA_Server *server, UA_Session *session,
     res = checkCertificateSignature(server, sp, tempChannelContext,
                                     &session->serverNonce, tokenSignature, true);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: User token signature check "
                                "failed with StatusCode %s", UA_StatusCode_name(res));
     }
@@ -698,7 +698,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     /* Get the session */
     UA_Session *session = getSessionByToken(server, &req->requestHeader.authenticationToken);
     if(!session) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "ActivateSession: Session not found");
         resp->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
         goto rejected;
@@ -710,7 +710,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
      * CreateSession request. Subsequent calls to ActivateSession may be
      * associated with different SecureChannels. */
     if(!session->activated && session->header.channel != channel) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "ActivateSession: The Session has to be initially activated "
                                "on the SecureChannel that created it");
         resp->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
@@ -719,7 +719,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
 
     /* Has the session timed out? */
     if(session->validTill < UA_DateTime_nowMonotonic()) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: The Session has timed out");
         resp->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
         goto rejected;
@@ -734,7 +734,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
                                       &session->serverNonce,
                                       &req->clientSignature, false);
         if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_SESSION(&server->config.logger, session,
+            UA_LOG_WARNING_SESSION(server->config.logging, session,
                                    "ActivateSession: Client signature check failed "
                                    "with StatusCode %s",
                                    UA_StatusCode_name(resp->responseHeader.serviceResult));
@@ -784,7 +784,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
                         &req->userIdentityToken, &session->sessionHandle);
     UA_LOCK(&server->serviceMutex);
     if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: The AccessControl "
                                "plugin denied the activation with the StatusCode %s",
                                UA_StatusCode_name(resp->responseHeader.serviceResult));
@@ -797,7 +797,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
     if(!session->header.channel || session->header.channel != channel) {
         /* Attach the new SecureChannel, the old channel will be detached if present */
         UA_Session_attachToSecureChannel(session, channel);
-        UA_LOG_INFO_SESSION(&server->config.logger, session,
+        UA_LOG_INFO_SESSION(server->config.logging, session,
                             "ActivateSession: Session attached to new channel");
     }
 
@@ -807,7 +807,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         UA_ByteString_copy(&session->serverNonce, &resp->serverNonce);
     if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_Session_detachFromSecureChannel(session);
-        UA_LOG_WARNING_SESSION(&server->config.logger, session,
+        UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: Could not generate the server nonce");
         goto rejected;
     }
@@ -823,7 +823,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
                           (void**)&tmpLocaleIds, &UA_TYPES[UA_TYPES_STRING]);
         if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
             UA_Session_detachFromSecureChannel(session);
-            UA_LOG_WARNING_SESSION(&server->config.logger, session,
+            UA_LOG_WARNING_SESSION(server->config.logging, session,
                                    "ActivateSession: Could not store the Session LocaleIds");
             goto rejected;
         }
@@ -887,7 +887,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
 #endif
 
     /* Log the user for which the Session was activated */
-    UA_LOG_INFO_SESSION(&server->config.logger, session,
+    UA_LOG_INFO_SESSION(server->config.logging, session,
                         "ActivateSession: Session activated with ClientUserId \"%.*s\"",
                         (int)session->clientUserIdOfSession.length,
                         session->clientUserIdOfSession.data);
@@ -918,20 +918,20 @@ Service_CloseSession(UA_Server *server, UA_SecureChannel *channel,
     if(!session && response->responseHeader.serviceResult == UA_STATUSCODE_GOOD)
         response->responseHeader.serviceResult = UA_STATUSCODE_BADSESSIONIDINVALID;
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING_CHANNEL(&server->config.logger, channel,
+        UA_LOG_WARNING_CHANNEL(server->config.logging, channel,
                                "CloseSession: No Session activated to the SecureChannel");
         return;
     }
 
     UA_assert(session); /* Assured by the previous section */
-    UA_LOG_INFO_SESSION(&server->config.logger, session, "Closing the Session");
+    UA_LOG_INFO_SESSION(server->config.logging, session, "Closing the Session");
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     /* If Subscriptions are not deleted, detach them from the Session */
     if(!request->deleteSubscriptions) {
         UA_Subscription *sub, *sub_tmp;
         TAILQ_FOREACH_SAFE(sub, &session->subscriptions, sessionListEntry, sub_tmp) {
-            UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, sub,
+            UA_LOG_INFO_SUBSCRIPTION(server->config.logging, sub,
                                      "Detaching the Subscription from the Session");
             UA_Session_detachSubscription(server, session, sub, true);
         }
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index d26eb521565..67bfc22d0e9 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -69,7 +69,7 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
     /* Create the subscription */
     UA_Subscription *sub = UA_Subscription_new();
     if(!sub) {
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+        UA_LOG_DEBUG_SESSION(server->config.logging, session,
                              "Processing CreateSubscriptionRequest failed");
         response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
         return;
@@ -104,7 +104,7 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
         UA_SUBSCRIPTIONSTATE_ENABLED : UA_SUBSCRIPTIONSTATE_ENABLED_NOPUBLISH;
     UA_StatusCode res = Subscription_setState(server, sub, sState);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_DEBUG_SESSION(&server->config.logger, sub->session,
+        UA_LOG_DEBUG_SESSION(server->config.logging, sub->session,
                              "Subscription %" PRIu32 " | Could not register "
                              "publish callback with error code %s",
                              sub->subscriptionId, UA_StatusCode_name(res));
@@ -113,7 +113,7 @@ Service_CreateSubscription(UA_Server *server, UA_Session *session,
         return;
     }
 
-    UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, sub,
+    UA_LOG_INFO_SUBSCRIPTION(server->config.logging, sub,
                              "Subscription created (Publishing interval %.2fms, "
                              "max %lu notifications per publish)",
                              sub->publishingInterval,
@@ -130,7 +130,7 @@ void
 Service_ModifySubscription(UA_Server *server, UA_Session *session,
                            const UA_ModifySubscriptionRequest *request,
                            UA_ModifySubscriptionResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing ModifySubscriptionRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -217,7 +217,7 @@ void
 Service_SetPublishingMode(UA_Server *server, UA_Session *session,
                           const UA_SetPublishingModeRequest *request,
                           UA_SetPublishingModeResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing SetPublishingModeRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -235,7 +235,7 @@ Service_SetPublishingMode(UA_Server *server, UA_Session *session,
 UA_StatusCode
 Service_Publish(UA_Server *server, UA_Session *session,
                 const UA_PublishRequest *request, UA_UInt32 requestId) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing PublishRequest with RequestId %u", requestId);
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -291,7 +291,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
         UA_Subscription *sub = UA_Session_getSubscriptionById(session, ack->subscriptionId);
         if(!sub) {
             response->results[i] = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
-            UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+            UA_LOG_DEBUG_SESSION(server->config.logging, session,
                                  "Cannot process acknowledgements subscription %u" PRIu32,
                                  ack->subscriptionId);
             continue;
@@ -313,7 +313,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
      * callback. This can also be triggered right now for a late
      * subscription. */
     UA_Session_queuePublishReq(session, entry, false);
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Queued a publication message");
+    UA_LOG_DEBUG_SESSION(server->config.logging, session, "Queued a publication message");
 
     /* If there are late subscriptions, the new publish request is used to
      * answer them immediately. Late subscriptions with higher priority are
@@ -327,7 +327,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
             continue;
 
         /* Call publish on the late subscription */
-        UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, late,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, late,
                                   "Send PublishResponse on a late subscription");
         UA_Subscription_publish(server, late);
 
@@ -360,7 +360,7 @@ Operation_DeleteSubscription(UA_Server *server, UA_Session *session, void *_,
     UA_Subscription *sub = UA_Session_getSubscriptionById(session, *subscriptionId);
     if(!sub) {
         *result = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+        UA_LOG_DEBUG_SESSION(server->config.logging, session,
                              "Deleting Subscription with Id %" PRIu32
                              " failed with error code %s",
                              *subscriptionId, UA_StatusCode_name(*result));
@@ -369,7 +369,7 @@ Operation_DeleteSubscription(UA_Server *server, UA_Session *session, void *_,
 
     UA_Subscription_delete(server, sub);
     *result = UA_STATUSCODE_GOOD;
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Subscription %" PRIu32 " | Subscription deleted",
                          *subscriptionId);
 }
@@ -378,7 +378,7 @@ void
 Service_DeleteSubscriptions(UA_Server *server, UA_Session *session,
                             const UA_DeleteSubscriptionsRequest *request,
                             UA_DeleteSubscriptionsResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing DeleteSubscriptionsRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -393,7 +393,7 @@ void
 Service_Republish(UA_Server *server, UA_Session *session,
                   const UA_RepublishRequest *request,
                   UA_RepublishResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing RepublishRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -583,7 +583,7 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     /* Attach to the session */
     UA_Session_attachSubscription(session, newSub);
 
-    UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, newSub, "Transferred to this Session");
+    UA_LOG_INFO_SUBSCRIPTION(server->config.logging, newSub, "Transferred to this Session");
 
     /* Set StatusChange in the original subscription and force publish. This
      * also removes the Subscription, even if there was no PublishResponse
@@ -634,7 +634,7 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
 void Service_TransferSubscriptions(UA_Server *server, UA_Session *session,
                                    const UA_TransferSubscriptionsRequest *request,
                                    UA_TransferSubscriptionsResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing TransferSubscriptionsRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 2dbe087efba..0bafe865e32 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -959,7 +959,7 @@ Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxref
 
 void Service_Browse(UA_Server *server, UA_Session *session,
                     const UA_BrowseRequest *request, UA_BrowseResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session, "Processing BrowseRequest");
+    UA_LOG_DEBUG_SESSION(server->config.logging, session, "Processing BrowseRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Test the number of operations in the request */
@@ -1078,7 +1078,7 @@ void
 Service_BrowseNext(UA_Server *server, UA_Session *session,
                    const UA_BrowseNextRequest *request,
                    UA_BrowseNextResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing BrowseNextRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -1385,7 +1385,7 @@ void
 Service_TranslateBrowsePathsToNodeIds(UA_Server *server, UA_Session *session,
                                       const UA_TranslateBrowsePathsToNodeIdsRequest *request,
                                       UA_TranslateBrowsePathsToNodeIdsResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing TranslateBrowsePathsToNodeIdsRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -1413,7 +1413,7 @@ browseSimplifiedBrowsePath(UA_Server *server, const UA_NodeId origin,
     UA_BrowsePathResult bpr;
     UA_BrowsePathResult_init(&bpr);
     if(browsePathSize > UA_MAX_TREE_RECURSE) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Simplified Browse Path too long");
         bpr.statusCode = UA_STATUSCODE_BADINTERNALERROR;
         return bpr;
@@ -1457,7 +1457,7 @@ UA_Server_browseSimplifiedBrowsePath(UA_Server *server, const UA_NodeId origin,
 void Service_RegisterNodes(UA_Server *server, UA_Session *session,
                            const UA_RegisterNodesRequest *request,
                            UA_RegisterNodesResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing RegisterNodesRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -1484,7 +1484,7 @@ void Service_RegisterNodes(UA_Server *server, UA_Session *session,
 void Service_UnregisterNodes(UA_Server *server, UA_Session *session,
                              const UA_UnregisterNodesRequest *request,
                              UA_UnregisterNodesResponse *response) {
-    UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+    UA_LOG_DEBUG_SESSION(server->config.logging, session,
                          "Processing UnRegisterNodesRequest");
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index cf29c591dbd..714bf5e3258 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -71,7 +71,7 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
     UA_NodeId_clear(&sub->ns0Id);
 #endif
 
-    UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, sub, "Subscription deleted");
+    UA_LOG_INFO_SUBSCRIPTION(server->config.logging, sub, "Subscription deleted");
 
     /* Detach from the session if necessary */
     if(sub->session)
@@ -172,13 +172,13 @@ UA_Subscription_addRetransmissionMessage(UA_Server *server, UA_Subscription *sub
     /* Release the oldest entry if there is not enough space */
     UA_Session *session = sub->session;
     if(sub->retransmissionQueueSize >= UA_MAX_RETRANSMISSIONQUEUESIZE) {
-        UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
+        UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
                                     "Subscription retransmission queue overflow");
         removeOldestRetransmissionMessageFromSub(sub);
     } else if(session && server->config.maxRetransmissionQueueSize > 0 &&
               session->totalRetransmissionQueueSize >=
               server->config.maxRetransmissionQueueSize) {
-        UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
+        UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
                                     "Session-wide retransmission queue overflow");
         removeOldestRetransmissionMessageFromSession(sub->session);
     }
@@ -366,16 +366,16 @@ sendStatusChangeDelete(UA_Server *server, UA_Subscription *sub,
     /* Cannot send out the StatusChange because no response is queued.
      * Delete the Subscription without sending the StatusChange, if the statusChange is Bad*/
     if(!pre) {
-        UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                                   "Cannot send the StatusChange notification because no response is queued.");
         if(UA_StatusCode_isBad(sub->statusChange)) {
-            UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub, "Removing the subscription.");
+            UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub, "Removing the subscription.");
             UA_Subscription_delete(server, sub);
         }
         return;
     }
 
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+    UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                               "Sending out a StatusChange "
                               "notification and removing the subscription");
 
@@ -398,7 +398,7 @@ sendStatusChangeDelete(UA_Server *server, UA_Subscription *sub,
 
     /* Send the response */
     UA_assert(sub->session); /* Otherwise pre is NULL */
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+    UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                               "Sending out a publish response");
     sendResponse(server, sub->session, sub->session->header.channel, pre->requestId,
                  (UA_Response *)response, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
@@ -439,7 +439,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
             /* Check if the TimeoutHint is still valid. Otherwise return with a bad
              * statuscode and continue. */
             if(pre->maxTime < nowMonotonic) {
-                UA_LOG_DEBUG_SESSION(&server->config.logger, sub->session,
+                UA_LOG_DEBUG_SESSION(server->config.logging, sub->session,
                                      "Publish request %u has timed out", pre->requestId);
                 pre->response.responseHeader.serviceResult = UA_STATUSCODE_BADTIMEOUT;
                 sendResponse(server, sub->session, sub->session->header.channel,
@@ -456,11 +456,11 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
     if(pre) {
         Subscription_resetLifetime(sub);
     } else {
-        UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                                   "The publish queue is empty");
         ++sub->currentLifetimeCount;
         if(sub->currentLifetimeCount > sub->lifeTimeCount) {
-            UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
+            UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
                                         "End of subscription lifetime");
             /* Set the StatusChange to delete the subscription. */
             sub->statusChange = UA_STATUSCODE_BADTIMEOUT;
@@ -490,14 +490,14 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
                 UA_Session_queuePublishReq(sub->session, pre, true); /* Re-enqueue */
             return;
         }
-        UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub, "Sending a KeepAlive");
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub, "Sending a KeepAlive");
     }
 
     /* We want to send a response, but cannot. Either because there is no queued
      * response or because the Subscription is detached from a Session or because
      * the SecureChannel for the Session is closed. */
     if(!pre || !sub->session || !sub->session->header.channel) {
-        UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                                   "Want to send a publish response but cannot. "
                                   "The subscription is late.");
         sub->late = true;
@@ -523,7 +523,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
             retransmission = (UA_NotificationMessageEntry*)
                 UA_malloc(sizeof(UA_NotificationMessageEntry));
             if(!retransmission) {
-                UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
+                UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
                                             "Could not allocate memory for retransmission. "
                                             "The subscription is late.");
                 sub->late = true;
@@ -536,7 +536,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
         UA_StatusCode retval =
             prepareNotificationMessage(server, sub, message, notifications);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
+            UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
                                         "Could not prepare the notification message. "
                                         "The subscription is late.");
             /* If the retransmission queue is enabled a retransmission message is allocated */
@@ -590,7 +590,7 @@ UA_Subscription_publish(UA_Server *server, UA_Subscription *sub) {
     UA_assert(i == sub->retransmissionQueueSize);
 
     /* Send the response */
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+    UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                               "Sending out a publish response with %" PRIu32
                               " notifications", notifications);
     sendResponse(server, sub->session, sub->session->header.channel, pre->requestId,
@@ -681,7 +681,7 @@ UA_Session_ensurePublishQueueSpace(UA_Server* server, UA_Session* session) {
         UA_PublishResponseEntry *pre = UA_Session_dequeuePublishReq(session);
         UA_assert(pre != NULL); /* There must be a pre as session->responseQueueSize > 0 */
 
-        UA_LOG_DEBUG_SESSION(&server->config.logger, session,
+        UA_LOG_DEBUG_SESSION(server->config.logging, session,
                              "Sending out a publish response triggered by too many publish requests");
 
         /* Send the response. This response has no related subscription id */
@@ -701,7 +701,7 @@ sampleAndPublishCallback(UA_Server *server, UA_Subscription *sub) {
     UA_LOCK(&server->serviceMutex);
     UA_assert(sub);
 
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+    UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                               "Sample and Publish Callback");
 
     /* Sample the MonitoredItems with sampling interval <0 (which implies
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 1e7610a579b..ce0b7467136 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -173,7 +173,7 @@ static const UA_QualifiedName fieldExpirationLimitQN = STATIC_QN(CONDITION_FIELD
 #define CONDITION_ASSERT_RETURN_RETVAL(retval, logMessage, deleteFunction)                \
     {                                                                                     \
         if(retval != UA_STATUSCODE_GOOD) {                                                \
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,                  \
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,                  \
                          logMessage". StatusCode %s", UA_StatusCode_name(retval));        \
             deleteFunction                                                                \
             return retval;                                                                \
@@ -183,7 +183,7 @@ static const UA_QualifiedName fieldExpirationLimitQN = STATIC_QN(CONDITION_FIELD
 #define CONDITION_ASSERT_RETURN_VOID(retval, logMessage, deleteFunction)                  \
     {                                                                                     \
         if(retval != UA_STATUSCODE_GOOD) {                                                \
-            UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,                  \
+            UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,                  \
                          logMessage". StatusCode %s", UA_StatusCode_name(retval));        \
             deleteFunction                                                                \
             return;                                                                       \
@@ -533,7 +533,7 @@ UA_Server_getConditionLastSeverity(UA_Server *server, const UA_NodeId *condition
     UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
@@ -552,7 +552,7 @@ UA_Server_updateConditionLastSeverity(UA_Server *server, const UA_NodeId *condit
     UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
@@ -571,7 +571,7 @@ UA_Server_getConditionActiveState(UA_Server *server, const UA_NodeId *conditionS
     UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
@@ -591,7 +591,7 @@ UA_Server_updateConditionActiveState(UA_Server *server, const UA_NodeId *conditi
     UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADNOTFOUND;
@@ -611,7 +611,7 @@ updateConditionLastEventId(UA_Server *server, const UA_NodeId *triggeredEvent,
 
     UA_Condition *cond = getCondition(server, conditionSource, triggeredEvent);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         return UA_STATUSCODE_BADNOTFOUND;
     }
@@ -624,7 +624,7 @@ updateConditionLastEventId(UA_Server *server, const UA_NodeId *triggeredEvent,
             return UA_ByteString_copy(lastEventId, &branch->lastEventId);
         }
     }
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                  "Condition Branch not implemented");
     return UA_STATUSCODE_BADNOTFOUND;
 }
@@ -636,7 +636,7 @@ setIsCallerAC(UA_Server *server, const UA_NodeId *condition,
 
     UA_Condition *cond = getCondition(server, conditionSource, condition);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         return;
     }
@@ -648,7 +648,7 @@ setIsCallerAC(UA_Server *server, const UA_NodeId *condition,
             return;
         }
     }
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                  "Condition Branch not implemented");
 }
 
@@ -659,7 +659,7 @@ isConditionOrBranch(UA_Server *server, const UA_NodeId *condition,
 
     UA_Condition *cond = getCondition(server, conditionSource, condition);
     if(!cond) {
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         return false;
     }
@@ -671,7 +671,7 @@ isConditionOrBranch(UA_Server *server, const UA_NodeId *condition,
             return true;
         }
     }
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                  "Condition Branch not implemented");
     return false;
 }
@@ -684,7 +684,7 @@ isRetained(UA_Server *server, const UA_NodeId *condition) {
     UA_NodeId retainNodeId;
     UA_StatusCode retval = getConditionFieldNodeId(server, condition, &fieldRetainQN, &retainNodeId);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Retain not found. StatusCode %s", UA_StatusCode_name(retval));
         return false; //TODO maybe a better error handling?
     }
@@ -728,7 +728,7 @@ isTwoStateVariableInTrueState(UA_Server *server, const UA_NodeId *condition,
                                                            &twoStateVariableIdQN,
                                                            &twoStateVariableIdNodeId);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "TwoStateVariable/Id not found. StatusCode %s", UA_StatusCode_name(retval));
         return false; //TODO maybe a better error handling?
     }
@@ -769,7 +769,7 @@ enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
 
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         return UA_STATUSCODE_BADNOTFOUND;
     }
@@ -836,7 +836,7 @@ enteringEnabledState(UA_Server *server,
     /* Get Condition */
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
         return UA_STATUSCODE_BADNOTFOUND;
     }
@@ -1375,7 +1375,7 @@ disableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Cannot call method of ConditionType Node. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADNODEIDINVALID));
         return UA_STATUSCODE_BADNODEIDINVALID;
@@ -1408,7 +1408,7 @@ enableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Cannot call method of ConditionType Node. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADNODEIDINVALID));
         return UA_STATUSCODE_BADNODEIDINVALID;
@@ -1449,7 +1449,7 @@ addCommentMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Cannot call method of ConditionType Node. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADNODEIDINVALID));
         return UA_STATUSCODE_BADNODEIDINVALID;
@@ -1532,7 +1532,7 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Cannot call method of ConditionType Node. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADNODEIDINVALID));
         return UA_STATUSCODE_BADNODEIDINVALID;
@@ -1569,7 +1569,7 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
     UA_UNLOCK(&server->serviceMutex);
     if(!found) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of AcknowledgeableConditionType!");
         UA_NodeId_clear(&conditionNode);
         UA_NodeId_clear(&eventType);
@@ -1614,7 +1614,7 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
 
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Cannot call method of ConditionType Node. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADNODEIDINVALID));
         return UA_STATUSCODE_BADNODEIDINVALID;
@@ -1651,7 +1651,7 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
     UA_UNLOCK(&server->serviceMutex);
     if(!found) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of AcknowledgeableConditionType!");
         UA_NodeId_clear(&conditionNode);
         UA_NodeId_clear(&eventType);
@@ -2122,7 +2122,7 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
     /* Get ConditionSourceNode*/
     const UA_Node *conditionSourceNode = UA_NODESTORE_GET(server, conditionSource);
     if(!conditionSourceNode) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Couldn't find ConditionSourceNode. StatusCode %s", UA_StatusCode_name(retval));
         return UA_STATUSCODE_BADNOTFOUND;
     }
@@ -2133,7 +2133,7 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
     retval = setConditionField(server, *condition, &value,
                                UA_QUALIFIEDNAME(0,CONDITION_FIELD_SOURCENAME));
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Set SourceName Field failed. StatusCode %s",
                      UA_StatusCode_name(retval));
         UA_NODESTORE_RELEASE(server, conditionSourceNode);
@@ -2145,7 +2145,7 @@ setStandardConditionFields(UA_Server *server, const UA_NodeId* condition,
                          &UA_TYPES[UA_TYPES_NODEID]);
     retval = setConditionField(server, *condition, &value, fieldSourceQN);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Set SourceNode Field failed. StatusCode %s", UA_StatusCode_name(retval));
         UA_NODESTORE_RELEASE(server, conditionSourceNode);
         return retval;
@@ -2544,7 +2544,7 @@ UA_Server_createCondition(UA_Server *server,
     UA_LOCK_ASSERT(&server->serviceMutex, 0);
 
     if(!outNodeId) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "outNodeId cannot be NULL!");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -2568,7 +2568,7 @@ UA_Server_addCondition_begin(UA_Server *server, const UA_NodeId conditionId,
     UA_LOCK_ASSERT(&server->serviceMutex, 0);
 
     if(!outNodeId) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "outNodeId cannot be NULL!");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -2580,7 +2580,7 @@ UA_Server_addCondition_begin(UA_Server *server, const UA_NodeId conditionId,
                                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
     UA_UNLOCK(&server->serviceMutex);
     if(!found) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of ConditionType!");
         return UA_STATUSCODE_BADNOMATCH;
     }
@@ -2648,7 +2648,7 @@ addOptionalVariableField(UA_Server *server, const UA_NodeId *originCondition,
     /* Get typedefintion */
     const UA_Node *type = getNodeType(server, &optionalVariableFieldNode->head);
     if(!type) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Invalid VariableType. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADTYPEDEFINITIONINVALID));
         return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
@@ -2687,7 +2687,7 @@ addOptionalObjectField(UA_Server *server, const UA_NodeId *originCondition,
     /* Get typedefintion */
     const UA_Node *type = getNodeType(server, &optionalObjectFieldNode->head);
     if(!type) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Invalid ObjectType. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADTYPEDEFINITIONINVALID));
         return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
@@ -2729,7 +2729,7 @@ addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
     UA_NodeId optionalFieldNodeId = bpr.targets[0].targetId.nodeId;
     const UA_Node *optionalFieldNode = UA_NODESTORE_GET(server, &optionalFieldNodeId);
     if(NULL == optionalFieldNode) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Couldn't find optional Field Node in ConditionType. StatusCode %s",
                        UA_StatusCode_name(UA_STATUSCODE_BADNOTFOUND));
         UA_BrowsePathResult_clear(&bpr);
@@ -2742,7 +2742,7 @@ addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
                 addOptionalVariableField(server, &condition, &fieldName,
                                          (const UA_VariableNode *)optionalFieldNode, outOptionalNode);
             if(retval != UA_STATUSCODE_GOOD) {
-                UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+                UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                              "Adding Condition Optional Variable Field failed. StatusCode %s",
                              UA_StatusCode_name(retval));
             }
@@ -2755,7 +2755,7 @@ addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
               addOptionalObjectField(server, &condition, &fieldName,
                                      (const UA_ObjectNode *)optionalFieldNode, outOptionalNode);
           if(retval != UA_STATUSCODE_GOOD) {
-              UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+              UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                            "Adding Condition Optional Object Field failed. StatusCode %s",
                            UA_StatusCode_name(retval));
           }
@@ -2777,7 +2777,7 @@ addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
     }
 
 #else
-    UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+    UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                  "Adding Condition Optional Fields disabled. StatusCode %s",
                  UA_StatusCode_name(UA_STATUSCODE_BADNOTSUPPORTED));
     return UA_STATUSCODE_BADNOTSUPPORTED;
@@ -2893,7 +2893,7 @@ triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
     UA_ByteString eventId = UA_BYTESTRING_NULL;
     UA_QualifiedName enabledStateField = UA_QUALIFIEDNAME(0, CONDITION_FIELD_ENABLEDSTATE);
     if(!isTwoStateVariableInTrueState(server, &condition, &enabledStateField)) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
                        "Cannot trigger condition event when "
                        CONDITION_FIELD_ENABLEDSTATE"."
                        CONDITION_FIELD_TWOSTATEVARIABLE_ID" is false.");
@@ -3125,7 +3125,7 @@ UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
 
     UA_StatusCode retval;
     if(cert.data == NULL){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                     "No Certificate found.");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -3133,14 +3133,14 @@ UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
     UA_CertificateVerification *cv = &server->config.sessionPKI;
     UA_DateTime getExpiryDateAndTime;
     if(cv == NULL && cv->getExpirationDate == NULL) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                     "Certificate verification and get Expiration date function is not registered");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     
     retval = cv->getExpirationDate(&getExpiryDateAndTime, &cert);
     if(retval != UA_STATUSCODE_GOOD){
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                     "Failed to get certificate expiration date");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index 047e97e2938..4ec7bd8915b 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -157,7 +157,7 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
     /* Has the value changed (with the filters applied)? */
     UA_Boolean changed = detectValueChange(server, mon, value);
     if(!changed) {
-        UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                                   "MonitoredItem %" PRIi32 " | "
                                   "The value has not changed", mon->monitoredItemId);
         UA_DataValue_clear(value);
@@ -213,7 +213,7 @@ monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
     if(sub)
         session = sub->session;
 
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub, "MonitoredItem %" PRIi32
+    UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub, "MonitoredItem %" PRIi32
                               " | Sample callback called", mon->monitoredItemId);
 
     UA_assert(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
@@ -226,7 +226,7 @@ monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
     UA_StatusCode res = sampleCallbackWithValue(server, sub, mon, &dv);
     if(res != UA_STATUSCODE_GOOD) {
         UA_DataValue_clear(&dv);
-        UA_LOG_WARNING_SUBSCRIPTION(&server->config.logger, sub,
+        UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
                                     "MonitoredItem %" PRIi32 " | "
                                     "Sampling returned the statuscode %s",
                                     mon->monitoredItemId, UA_StatusCode_name(res));
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 6e8a6945f24..7c719aa62b0 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -31,7 +31,7 @@ generateEventId(UA_ByteString *generatedId) {
 UA_StatusCode
 createEvent(UA_Server *server, const UA_NodeId eventType, UA_NodeId *outNodeId) {
     if(!outNodeId) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "outNodeId must not be NULL. The event's NodeId must be returned "
                      "so it can be triggered.");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -41,7 +41,7 @@ createEvent(UA_Server *server, const UA_NodeId eventType, UA_NodeId *outNodeId)
     UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
     if(!isNodeInTree_singleRef(server, &eventType, &baseEventTypeId,
                                UA_REFERENCETYPEINDEX_HASSUBTYPE)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Event type must be a subtype of BaseEventType!");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -63,7 +63,7 @@ createEvent(UA_Server *server, const UA_NodeId eventType, UA_NodeId *outNodeId)
                                    NULL,           /* no node context */
                                    &newNodeId);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Adding event failed. StatusCode %s", UA_StatusCode_name(retval));
         return retval;
     }
@@ -225,7 +225,7 @@ setHistoricalEvent(UA_Server *server, const UA_NodeId *origin,
     if(retval != UA_STATUSCODE_GOOD) {
         /* Do not vex users with no match errors */
         if(retval != UA_STATUSCODE_BADNOMATCH)
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Cannot read the HistoricalEventFilter property of a "
                            "listening node. StatusCode %s",
                            UA_StatusCode_name(retval));
@@ -236,7 +236,7 @@ setHistoricalEvent(UA_Server *server, const UA_NodeId *origin,
     if(UA_Variant_isEmpty(&historicalEventFilterValue) ||
        !UA_Variant_isScalar(&historicalEventFilterValue) ||
        historicalEventFilterValue.type != &UA_TYPES[UA_TYPES_EVENTFILTER]) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "HistoricalEventFilter property of a listening node "
                        "does not have a valid value");
         UA_Variant_clear(&historicalEventFilterValue);
@@ -276,7 +276,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_LOG_NODEID_DEBUG(&origin,
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_DEBUG(server->config.logging, UA_LOGCATEGORY_SERVER,
             "Events: An event is triggered on node %.*s",
             (int)nodeIdStr.length, nodeIdStr.data));
 
@@ -284,7 +284,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
     UA_Boolean isCallerAC = false;
     if(isConditionOrBranch(server, &eventNodeId, &origin, &isCallerAC)) {
         if(!isCallerAC) {
-          UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+          UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                                  "Condition Events: Please use A&C API to trigger Condition Events 0x%08X",
                                   UA_STATUSCODE_BADINVALIDARGUMENT);
           return UA_STATUSCODE_BADINVALIDARGUMENT;
@@ -295,7 +295,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
     /* Check that the origin node exists */
     const UA_Node *originNode = UA_NODESTORE_GET(server, &origin);
     if(!originNode) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Origin node for event does not exist.");
         return UA_STATUSCODE_BADNOTFOUND;
     }
@@ -310,7 +310,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
         UA_ReferenceTypeSet tmpRefTypes;
         retval = referenceTypeIndices(server, &isInFolderReferences[i], &tmpRefTypes, true);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Events: Could not create the list of references and their subtypes "
                            "with StatusCode %s", UA_StatusCode_name(retval));
         }
@@ -318,7 +318,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
     }
 
     if(!isNodeInTree(server, &origin, &objectsFolderId, &refTypes)) {
-        UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_USERLAND,
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Node for event must be in ObjectsFolder!");
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -326,7 +326,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
     /* Update the standard fields of the event */
     retval = eventSetStandardFields(server, &eventNodeId, &origin, outEventId);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Events: Could not set the standard event fields with StatusCode %s",
                        UA_StatusCode_name(retval));
         return retval;
@@ -355,7 +355,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
         UA_ReferenceTypeSet tmpRefTypes;
         retval = referenceTypeIndices(server, &emitReferencesRoots[i], &tmpRefTypes, true);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Events: Could not create the list of references for event "
                            "propagation with StatusCode %s", UA_StatusCode_name(retval));
             goto cleanup;
@@ -368,7 +368,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
                              &emitRefTypes, UA_NODECLASS_UNSPECIFIED, true,
                              &emitNodesSize, &emitNodes);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                        "Events: Could not create the list of nodes listening on the "
                        "event with StatusCode %s", UA_StatusCode_name(retval));
         goto cleanup;
@@ -395,7 +395,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
                 continue;
             retval = UA_MonitoredItem_addEvent(server, mon, &eventNodeId);
             if(retval != UA_STATUSCODE_GOOD) {
-                UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+                UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                                "Events: Could not add the event to a listening "
                                "node with StatusCode %s", UA_StatusCode_name(retval));
                 retval = UA_STATUSCODE_GOOD; /* Only log problems with individual emit nodes */
@@ -415,7 +415,7 @@ triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
     if(deleteEventNode) {
         retval = deleteNode(server, eventNodeId, true);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(&server->config.logger, UA_LOGCATEGORY_SERVER,
+            UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
                            "Attempt to remove event using deleteNode failed. StatusCode %s",
                            UA_StatusCode_name(retval));
         }
diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 022b1065905..74615ac29f3 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -601,7 +601,7 @@ ofTypeOperator(UA_FilterEvalContext *ctx, size_t index) {
     UA_CHECK_STATUS(res, return res);
 
     if(!UA_Variant_hasScalarType(&eventTypeVar, &UA_TYPES[UA_TYPES_NODEID])) {
-        UA_LOG_WARNING(&ctx->server->config.logger, UA_LOGCATEGORY_SERVER,
+        UA_LOG_WARNING(ctx->server->config.logging, UA_LOGCATEGORY_SERVER,
                        "EventType has an invalid type.");
         UA_Variant_clear(&eventTypeVar);
         return UA_STATUSCODE_BADINTERNALERROR;
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index a8b4d6d3334..b08b0aa0864 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -227,7 +227,7 @@ UA_Notification_enqueueMon(UA_Server *server, UA_Notification *n) {
      * adding the new Notification. */
     UA_MonitoredItem_ensureQueueSpace(server, mon);
 
-    UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, mon->subscription,
+    UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, mon->subscription,
                               "MonitoredItem %" PRIi32 " | "
                               "Notification enqueued (Queue size %lu / %lu)",
                               mon->monitoredItemId,
@@ -277,7 +277,7 @@ UA_Notification_enqueueAndTrigger(UA_Server *server, UA_Notification *n) {
         mon->triggeredUntil > UA_DateTime_nowMonotonic())) {
         UA_Notification_enqueueSub(n);
         mon->triggeredUntil = UA_INT64_MIN;
-        UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, mon->subscription,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, mon->subscription,
                                   "Notification enqueued (Queue size %lu)",
                                   (long unsigned)mon->subscription->notificationQueueSize);
     }
@@ -314,7 +314,7 @@ UA_Notification_enqueueAndTrigger(UA_Server *server, UA_Notification *n) {
         triggeredMon->triggeredUntil = UA_DateTime_nowMonotonic() +
             (UA_DateTime)(sub->publishingInterval * (UA_Double)UA_DATETIME_MSEC);
 
-        UA_LOG_DEBUG_SUBSCRIPTION(&server->config.logger, sub,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                                   "MonitoredItem %u triggers MonitoredItem %u",
                                   mon->monitoredItemId, triggeredMon->monitoredItemId);
     }
@@ -469,7 +469,7 @@ UA_Server_unregisterMonitoredItem(UA_Server *server, UA_MonitoredItem *mon) {
         return;
 
     UA_Subscription *sub = mon->subscription;
-    UA_LOG_INFO_SUBSCRIPTION(&server->config.logger, sub,
+    UA_LOG_INFO_SUBSCRIPTION(server->config.logging, sub,
                              "MonitoredItem %" PRIi32 " | Deleting the MonitoredItem",
                              mon->monitoredItemId);
 
diff --git a/tests/fuzz/ua_debug_dump_pkgs_file.c b/tests/fuzz/ua_debug_dump_pkgs_file.c
index 412004d31cf..a264374639f 100644
--- a/tests/fuzz/ua_debug_dump_pkgs_file.c
+++ b/tests/fuzz/ua_debug_dump_pkgs_file.c
@@ -169,7 +169,7 @@ UA_debug_dumpCompleteChunk(UA_Server *const server, UA_Connection *const connect
         cnt++;
     }
 
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER,
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "Dumping package %s", dumpOutputFile);
 
     FILE *write_ptr = fopen(dumpOutputFile, "ab");
diff --git a/tests/pubsub/check_pubsub_decryption.c b/tests/pubsub/check_pubsub_decryption.c
index fbf65d0c94f..f703310e816 100644
--- a/tests/pubsub/check_pubsub_decryption.c
+++ b/tests/pubsub/check_pubsub_decryption.c
@@ -46,8 +46,6 @@ UA_Byte keyNonce[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
 UA_Server *server = NULL;
 UA_NodeId writerGroupId, readerGroupId, connectionId;
 
-UA_Logger *logger = NULL;
-
 static void
 setup(void) {
     server = UA_Server_new();
@@ -58,7 +56,7 @@ setup(void) {
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     retVal |= UA_Server_run_startup(server);
     // add connection
@@ -75,7 +73,6 @@ setup(void) {
     connectionConfig.publisherId.uint16 = 2234;
     retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connectionId);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
-    logger = &server->config.logger;
 }
 
 static void
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index 26f326ee6a3..ac4908b50a2 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -77,7 +77,7 @@ static void setup(void) {
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
-                                      &config->logger);
+                                      config->logging);
     UA_Server_run_startup(server);
 }
 
diff --git a/tests/pubsub/check_pubsub_encryption.c b/tests/pubsub/check_pubsub_encryption.c
index 80df6680e0d..fac05ba0f2c 100644
--- a/tests/pubsub/check_pubsub_encryption.c
+++ b/tests/pubsub/check_pubsub_encryption.c
@@ -37,7 +37,7 @@ static void setup(void) {
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     retVal |= UA_Server_run_startup(server);
     //add 2 connections
diff --git a/tests/pubsub/check_pubsub_encryption_aes256.c b/tests/pubsub/check_pubsub_encryption_aes256.c
index 8010b286bee..64d461f5c07 100644
--- a/tests/pubsub/check_pubsub_encryption_aes256.c
+++ b/tests/pubsub/check_pubsub_encryption_aes256.c
@@ -37,7 +37,7 @@ static void setup(void) {
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     retVal |= UA_Server_run_startup(server);
     //add 2 connections
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index 9ab01329032..e3c472dc65b 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -55,7 +55,7 @@ static void setup(void) {
     UA_ServerConfig_setDefault(config);
     UA_Server_run_startup(server);
 
-    rtEventLoop = UA_EventLoop_new_POSIX(&server->config.logger);
+    rtEventLoop = UA_EventLoop_new_POSIX(server->config.logging);
 
     /* Add the TCP connection manager */
     UA_ConnectionManager *tcpCM =
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index 167ab69a4db..f2e83082df5 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -151,7 +151,7 @@ skssetup(void) {
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     /*User Access Control*/
     config->accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
@@ -174,7 +174,7 @@ publishersetup(void) {
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -204,7 +204,7 @@ subscribersetup(void) {
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
@@ -371,7 +371,7 @@ addSubscriber(UA_Server *server) {
 
     retval = UA_Server_addDataSetReader(server, readerGroupId, &readerConfig,
                                         &readerIdentifier);
-    UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "%s \n",
+    UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER, "%s \n",
                 UA_StatusCode_name(retval));
     /*Add Subscribed Variable and target variable */
     UA_NodeId folderId;
diff --git a/tests/pubsub/check_pubsub_sks_keystorage.c b/tests/pubsub/check_pubsub_sks_keystorage.c
index 99a89af952e..4f26b671018 100644
--- a/tests/pubsub/check_pubsub_sks_keystorage.c
+++ b/tests/pubsub/check_pubsub_sks_keystorage.c
@@ -190,7 +190,7 @@ setup(void) {
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     UA_Server_run_startup(server);
     //add 2 connections
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index f305393d4aa..9744e4dea19 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -117,7 +117,7 @@ setup(void) {
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index bb4e344673f..7bcd69d8a27 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -219,7 +219,7 @@ setup(void) {
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes256Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     // add 2 connections
     UA_PubSubConnectionConfig connectionConfig;
diff --git a/tests/pubsub/check_pubsub_sks_securitygroups.c b/tests/pubsub/check_pubsub_sks_securitygroups.c
index c5a1371dba9..eff05903d88 100644
--- a/tests/pubsub/check_pubsub_sks_securitygroups.c
+++ b/tests/pubsub/check_pubsub_sks_securitygroups.c
@@ -34,9 +34,9 @@ securityGroup_setup(void) {
         (UA_PubSubSecurityPolicy *)UA_calloc(2, sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 2;
     UA_PubSubSecurityPolicy_Aes128Ctr(&config->pubSubConfig.securityPolicies[0],
-                                      &config->logger);
+                                      config->logging);
     UA_PubSubSecurityPolicy_Aes256Ctr(&config->pubSubConfig.securityPolicies[1],
-                                      &config->logger);
+                                      config->logging);
 
     UA_Server_run_startup(server);
 }
diff --git a/tests/pubsub/check_pubsub_subscribe_encrypted.c b/tests/pubsub/check_pubsub_subscribe_encrypted.c
index 6d1fdf7925a..4da8a3c967b 100644
--- a/tests/pubsub/check_pubsub_subscribe_encrypted.c
+++ b/tests/pubsub/check_pubsub_subscribe_encrypted.c
@@ -58,7 +58,7 @@ static void setup(void) {
         UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
     UA_PubSubSecurityPolicy_Aes128Ctr(config->pubSubConfig.securityPolicies,
-                                      &config->logger);
+                                      config->logging);
 
     retVal |= UA_Server_run_startup(server);
 
diff --git a/tests/server/check_server_speed_addnodes.c b/tests/server/check_server_speed_addnodes.c
index d3dccc1e3cb..1db106a9ec1 100644
--- a/tests/server/check_server_speed_addnodes.c
+++ b/tests/server/check_server_speed_addnodes.c
@@ -17,7 +17,7 @@ static void setup(void) {
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
     /* Disable logging */
     UA_ServerConfig *config = UA_Server_getConfig(server);
-    config->logger.log = NULL;
+    config->logging = NULL;
 }
 
 static void teardown(void) {

From 1f57e21dd29fe662c57a379e061672c7d31fcc7f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 03:14:29 +0100
Subject: [PATCH 1308/1963] refactor(deps): Update nodeset-loader to the newest
 upstream

---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index 4b0b0f3ddf4..aa5754d167b 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit 4b0b0f3ddf42c1ee3e6812fc6ef785db67ee9f03
+Subproject commit aa5754d167b44c3da2fd51a87f3eaa413fff9cb3

From 478a6e4ced3020ff35b75a1e369af961d582620d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 03:46:13 +0100
Subject: [PATCH 1309/1963] refactor(ci): Disable multicast discovery in the CI
 build

---
 tools/ci.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index ba82d7c666c..db6907988f5 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -137,7 +137,6 @@ function unit_tests {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
@@ -158,7 +157,6 @@ function unit_tests_32 {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
@@ -194,7 +192,6 @@ function unit_tests_diag {
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_DIAGNOSTICS=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
@@ -215,7 +212,6 @@ function unit_tests_mt {
           -DUA_MULTITHREADING=200 \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_FORCE_WERROR=ON \
           ..
@@ -247,7 +243,6 @@ function unit_tests_encryption {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_FORCE_WERROR=ON \
           ..
@@ -261,7 +256,6 @@ function unit_tests_encryption_mbedtls_pubsub {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_CERT_REJECTED_DIR=ON \
           -DUA_ENABLE_PUBSUB=ON \
@@ -281,7 +275,6 @@ function unit_tests_pubsub_sks {
           -DUA_NAMESPACE_ZERO=FULL \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
@@ -306,7 +299,6 @@ function unit_tests_with_coverage {
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_COVERAGE=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
@@ -332,7 +324,6 @@ function unit_tests_valgrind {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_UNIT_TESTS=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
@@ -366,7 +357,6 @@ function examples_valgrind {
 
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
-          -DUA_ENABLE_DISCOVERY_MULTICAST=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS=ON \

From 1485378ab99921245f2bac32f839c7166c7db35a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Nov 2023 08:27:26 +0100
Subject: [PATCH 1310/1963] fix(core): Pacify some clang-analyzer warnings

---
 src/client/ua_client.c         | 12 +++++-------
 src/pubsub/ua_pubsub_manager.c | 32 ++++++++------------------------
 src/server/ua_server_async.c   |  2 ++
 src/ua_types.c                 |  1 +
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index b92efe1d426..bd7f2ba0cb1 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -1072,14 +1072,12 @@ getConnectionttribute(UA_Client *client, const UA_QualifiedName key,
     if(!outValue)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    const UA_Variant *attr;
     UA_Variant localAttr;
 
     if(UA_QualifiedName_equal(&key, &connectionAttributes[0])) {
         /* ServerDescription */
         UA_Variant_setScalar(&localAttr, &client->serverDescription,
                              &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
-        attr = &localAttr;
     } else if(UA_QualifiedName_equal(&key, &connectionAttributes[1])) {
         /* SecurityPolicyUri */
         const UA_SecurityPolicy *sp = client->channel.securityPolicy;
@@ -1087,19 +1085,19 @@ getConnectionttribute(UA_Client *client, const UA_QualifiedName key,
             return UA_STATUSCODE_BADNOTCONNECTED;
         UA_Variant_setScalar(&localAttr, (void*)(uintptr_t)&sp->policyUri,
                              &UA_TYPES[UA_TYPES_STRING]);
-        attr = &localAttr;
     } else if(UA_QualifiedName_equal(&key, &connectionAttributes[2])) {
         /* SecurityMode */
         UA_Variant_setScalar(&localAttr, &client->channel.securityMode,
                              &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
-        attr = &localAttr;
+    } else {
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     if(copy)
-        return UA_Variant_copy(attr, outValue);
+        return UA_Variant_copy(&localAttr, outValue);
 
-    *outValue = *attr;
-    outValue->storageType = UA_VARIANT_DATA_NODELETE;
+    localAttr.storageType = UA_VARIANT_DATA_NODELETE;
+    *outValue = localAttr;
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 3ebaf9e9312..f671b99f8d6 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -473,11 +473,9 @@ static UA_StatusCode
 UA_PubSubComponent_createMonitoring(UA_Server *server, UA_NodeId Id, UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data, UA_ServerCallback callback) {
 
-    if ((!server) || (!data)) {
-        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "Error UA_PubSubComponent_createMonitoring(): "
-            "null pointer param");
+    if(!server || !data)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
+
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     switch (eComponentType) {
         case UA_PUBSUB_COMPONENT_DATASETREADER: {
@@ -519,12 +517,8 @@ static UA_StatusCode
 UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
                                    UA_PubSubComponentEnumType eComponentType,
                                    UA_PubSubMonitoringType eMonitoringType, void *data) {
-    if ((!server) || (!data)) {
-        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
-                     "Error UA_PubSubComponent_startMonitoring(): "
-                     "null pointer param");
+    if(!server || !data)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
 
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     switch (eComponentType) {
@@ -580,12 +574,8 @@ static UA_StatusCode
 UA_PubSubComponent_stopMonitoring(UA_Server *server, UA_NodeId Id,
                                   UA_PubSubComponentEnumType eComponentType,
                                   UA_PubSubMonitoringType eMonitoringType, void *data) {
-    if ((!server) || (!data)) {
-        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
-                     "Error UA_PubSubComponent_stopMonitoring(): "
-                     "null pointer param");
+    if(!server || !data)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
 
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     switch (eComponentType) {
@@ -628,12 +618,9 @@ static UA_StatusCode
 UA_PubSubComponent_updateMonitoringInterval(UA_Server *server, UA_NodeId Id,
                                             UA_PubSubComponentEnumType eComponentType,
                                             UA_PubSubMonitoringType eMonitoringType, void *data) {
-    if ((!server) || (!data)) {
-        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
-                     "Error UA_PubSubComponent_updateMonitoringInterval(): "
-                     "null pointer param");
+    if(!server || !data)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
+
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     switch (eComponentType) {
         case UA_PUBSUB_COMPONENT_DATASETREADER: {
@@ -686,12 +673,9 @@ UA_PubSubComponent_deleteMonitoring(UA_Server *server, UA_NodeId Id,
                                     UA_PubSubComponentEnumType eComponentType,
                                     UA_PubSubMonitoringType eMonitoringType, void *data) {
 
-    if ((!server) || (!data)) {
-        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
-                     "Error UA_PubSubComponent_deleteMonitoring(): "
-                     "null pointer param");
+    if(!server || !data)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
+
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     switch (eComponentType) {
         case UA_PUBSUB_COMPONENT_DATASETREADER: {
diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 1642530e9b2..c75b3c1ed57 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -110,6 +110,8 @@ processAsyncResults(UA_Server *server) {
         if(integrateOperationResult(am, server, ao))
             count++;
         UA_AsyncOperation_delete(ao);
+        /* Pacify clang-analyzer */
+        UA_assert(TAILQ_FIRST(&am->resultQueue) != ao);
         am->opsCount--;
     }
     UA_UNLOCK(&am->queueLock);
diff --git a/src/ua_types.c b/src/ua_types.c
index 42d609606d3..bf3257cbfe6 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -965,6 +965,7 @@ UA_Variant_copyRange(const UA_Variant *src, UA_Variant * UA_RESTRICT dst,
     /* Compute the strides */
     size_t count, block, stride, first;
     computeStrides(src, thisrange, &count, &block, &stride, &first);
+    UA_assert(block > 0);
 
     /* Allocate the array */
     UA_Variant_init(dst);

From 9073ee22b0878100fdd857fe8cd12c9669a34b81 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 13 Nov 2023 09:24:25 +0100
Subject: [PATCH 1311/1963] fix(server) adjust discovery register service order
 (#6122)

* fix(server) adjust discovery register service order

* refactor(server): Debug Register/Register2 against the UA-LDS implementation

---------

Co-authored-by: Julius Pfrommer <julius.pfrommer@web.de>
---
 src/server/ua_discovery.c | 168 +++++++++++++++++++-------------------
 src/server/ua_discovery.h |   3 +
 2 files changed, 88 insertions(+), 83 deletions(-)

diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
index 3036f50c2d2..ad752993059 100644
--- a/src/server/ua_discovery.c
+++ b/src/server/ua_discovery.c
@@ -258,26 +258,6 @@ asyncRegisterRequest_clearAsync(asyncRegisterRequest *ar) {
     el->addDelayedCallback(el, &ar->cleanupCallback);
 }
 
-static void
-register2AsyncResponse(UA_Client *client, void *userdata,
-                       UA_UInt32 requestId, void *resp) {
-    asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
-    const UA_ServerConfig *sc = ar->dm->serverConfig;
-    UA_RegisterServer2Response *response = (UA_RegisterServer2Response*)resp;
-    if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
-        UA_LOG_INFO(sc->logging, UA_LOGCATEGORY_SERVER,
-                    "RegisterServer succeeded");
-    } else {
-        UA_LOG_WARNING(sc->logging, UA_LOGCATEGORY_SERVER,
-                       "RegisterServer failed with statuscode %s",
-                       UA_StatusCode_name(response->responseHeader.serviceResult));
-    }
-
-    /* Close the client connection, will be cleaned up in the client state
-     * callback when closing is complete */
-    UA_Client_disconnectSecureChannelAsync(ar->client);
-}
-
 static void
 setupRegisterRequest(asyncRegisterRequest *ar, UA_RequestHeader *rh,
                      UA_RegisteredServer *rs) {
@@ -303,62 +283,53 @@ setupRegisterRequest(asyncRegisterRequest *ar, UA_RequestHeader *rh,
 
 static void
 registerAsyncResponse(UA_Client *client, void *userdata,
-                       UA_UInt32 requestId, void *resp) {
+                      UA_UInt32 requestId, void *resp) {
     asyncRegisterRequest *ar = (asyncRegisterRequest*)userdata;
-    UA_ServerConfig *sc = ar->dm->serverConfig;
-    UA_RegisterServerResponse *response = (UA_RegisterServerResponse*)resp;
+    const UA_ServerConfig *sc = ar->dm->serverConfig;
+    UA_Response *response = (UA_Response*)resp;
+    const char *regtype = (ar->register2) ? "RegisterServer2" : "RegisterServer";
 
-    /* Success */
-    UA_StatusCode serviceResult = response->responseHeader.serviceResult;
-    if(serviceResult == UA_STATUSCODE_GOOD) {
-        /* Close the client connection, will be cleaned up in the client state
-         * callback when closing is complete */
-        UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_INFO(sc->logging, UA_LOGCATEGORY_SERVER,
-                    "RegisterServer succeeded");
-        return;
+    /* Success registering? */
+    if(response->responseHeader.serviceResult == UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(sc->logging, UA_LOGCATEGORY_SERVER, "%s succeeded", regtype);
+        goto done;
     }
 
-    /* Unrecoverable error */
-    if(serviceResult != UA_STATUSCODE_BADNOTIMPLEMENTED &&
-       serviceResult != UA_STATUSCODE_BADSERVICEUNSUPPORTED) {
-        /* Close the client connection, will be cleaned up in the client state
-         * callback when closing is complete */
-        UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_WARNING(sc->logging, UA_LOGCATEGORY_SERVER,
-                       "RegisterServer failed with error %s",
-                       UA_StatusCode_name(serviceResult));
-        return;
+    UA_LOG_WARNING(sc->logging, UA_LOGCATEGORY_SERVER,
+                   "%s failed with statuscode %s", regtype,
+                   UA_StatusCode_name(response->responseHeader.serviceResult));
+
+    /* Try RegisterServer next */
+    ar->register2 = false;
+
+    /* Try RegisterServer immediately if we can.
+     * Otherwise wait for the next state callback. */
+    UA_SecureChannelState ss;
+    UA_Client_getState(client, &ss, NULL, NULL);
+    if(!ar->shutdown && ss == UA_SECURECHANNELSTATE_OPEN) {
+        UA_RegisterServerRequest request;
+        UA_RegisterServerRequest_init(&request);
+        setupRegisterRequest(ar, &request.requestHeader, &request.server);
+        UA_StatusCode res =
+            __UA_Client_AsyncService(client, &request,
+                                     &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST],
+                                     registerAsyncResponse,
+                                     &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE], ar, NULL);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_ERROR((const UA_Logger *)&sc->logging, UA_LOGCATEGORY_CLIENT,
+                         "RegisterServer failed with statuscode %s",
+                         UA_StatusCode_name(res));
+            goto done;
+        }
     }
 
-    /* Try RegisterServer2 */
-    UA_RegisterServer2Request request;
-    UA_RegisterServer2Request_init(&request);
-    setupRegisterRequest(ar, &request.requestHeader, &request.server);
-
-    /* Set the configuration that is only available for UA_RegisterServer2Request */
-#ifdef UA_ENABLE_DISCOVERY_MULTICAST
-    UA_ExtensionObject mdnsConfig;
-    UA_ExtensionObject_setValueNoDelete(&mdnsConfig, &sc->mdnsConfig,
-                                        &UA_TYPES[UA_TYPES_MDNSDISCOVERYCONFIGURATION]);
-    request.discoveryConfigurationSize = 1;
-    request.discoveryConfiguration = &mdnsConfig;
-#endif
+    return;
 
-    UA_StatusCode res =
-        __UA_Client_AsyncService(client, &request,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2REQUEST],
-                                 register2AsyncResponse,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVER2RESPONSE],
-                                 ar, NULL);
-    if(res != UA_STATUSCODE_GOOD) {
-        /* Close the client connection, will be cleaned up in the client state
-         * callback when closing is complete */
-        UA_Client_disconnectSecureChannelAsync(ar->client);
-        UA_LOG_ERROR(sc->logging, UA_LOGCATEGORY_CLIENT,
-                     "RegisterServer2 failed with statuscode %s",
-                     UA_StatusCode_name(res));
-    }
+ done:
+    /* Close the client connection, will be cleaned up in the client state
+     * callback when closing is complete */
+    ar->shutdown = true;
+    UA_Client_disconnectSecureChannelAsync(ar->client);
 }
 
 static void
@@ -377,9 +348,14 @@ discoveryClientStateCallback(UA_Client *client,
                          "Could not connect to the Discovery server with error %s",
                          UA_StatusCode_name(connectStatus));
         }
-        /* If fully closed, delete the client and clean up */
-        if(channelState == UA_SECURECHANNELSTATE_CLOSED)
-            asyncRegisterRequest_clearAsync(ar);
+
+        /* Connection fully closed */
+        if(channelState == UA_SECURECHANNELSTATE_CLOSED) {
+            if(ar->shutdown)
+                asyncRegisterRequest_clearAsync(ar); /* Clean up */
+            else
+                __UA_Client_connect(client, true);   /* Reconnect */
+        }
         return;
     }
 
@@ -396,24 +372,49 @@ discoveryClientStateCallback(UA_Client *client,
     if(msm != UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
         return;
 
+    const UA_DataType *reqType;
+    const UA_DataType *respType;
+    UA_RegisterServerRequest reg1;
+    UA_RegisterServer2Request reg2;
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+    UA_ExtensionObject mdnsConfig;
+#endif
+    void *request;
+
     /* Prepare the request. This does not allocate memory */
-    UA_RegisterServerRequest request;
-    UA_RegisterServerRequest_init(&request);
-    setupRegisterRequest(ar, &request.requestHeader, &request.server);
+    if(ar->register2) {
+        UA_RegisterServer2Request_init(&reg2);
+        setupRegisterRequest(ar, &reg2.requestHeader, &reg2.server);
+        reqType = &UA_TYPES[UA_TYPES_REGISTERSERVER2REQUEST];
+        respType = &UA_TYPES[UA_TYPES_REGISTERSERVER2RESPONSE];
+        request = &reg2;
 
-    /* Try to call RegisterServer */
+#ifdef UA_ENABLE_DISCOVERY_MULTICAST
+        /* Set the configuration that is only available for
+         * UA_RegisterServer2Request */
+        UA_ExtensionObject_setValueNoDelete(&mdnsConfig, &sc->mdnsConfig,
+                                            &UA_TYPES[UA_TYPES_MDNSDISCOVERYCONFIGURATION]);
+        reg2.discoveryConfigurationSize = 1;
+        reg2.discoveryConfiguration = &mdnsConfig;
+#endif
+    } else {
+        UA_RegisterServerRequest_init(&reg1);
+        setupRegisterRequest(ar, &reg1.requestHeader, &reg1.server);
+        reqType = &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST];
+        respType = &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE];
+        request = &reg1;
+    }
+
+    /* Try to call RegisterServer2 */
     UA_StatusCode res =
-        __UA_Client_AsyncService(client, &request,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVERREQUEST],
-                                 registerAsyncResponse,
-                                 &UA_TYPES[UA_TYPES_REGISTERSERVERRESPONSE],
-                                 ar, NULL);
+        __UA_Client_AsyncService(client, request, reqType, registerAsyncResponse,
+                                 respType, ar, NULL);
     if(res != UA_STATUSCODE_GOOD) {
         /* Close the client connection, will be cleaned up in the client state
          * callback when closing is complete */
         UA_Client_disconnectSecureChannelAsync(ar->client);
         UA_LOG_ERROR(sc->logging, UA_LOGCATEGORY_CLIENT,
-                     "RegisterServer failed with statuscode %s",
+                     "RegisterServer2 failed with statuscode %s",
                      UA_StatusCode_name(res));
     }
 }
@@ -421,7 +422,7 @@ discoveryClientStateCallback(UA_Client *client,
 static UA_StatusCode
 UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister,
                    const UA_String discoveryServerUrl,
-                   const UA_String  semaphoreFilePath) {
+                   const UA_String semaphoreFilePath) {
     /* Get the discovery manager */
     UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
         getServerComponentByName(server, UA_STRING("discovery"));
@@ -493,6 +494,7 @@ UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister
     ar->server = server;
     ar->dm = dm;
     ar->unregister = unregister;
+    ar->register2 = true; /* Try register2 first */
     UA_String_copy(&semaphoreFilePath, &ar->semaphoreFilePath);
 
     /* Connect asynchronously. The register service is called once the
diff --git a/src/server/ua_discovery.h b/src/server/ua_discovery.h
index 55248c3f4c2..e6635903300 100644
--- a/src/server/ua_discovery.h
+++ b/src/server/ua_discovery.h
@@ -35,6 +35,9 @@ typedef struct {
     UA_Client *client;
     UA_String semaphoreFilePath;
     UA_Boolean unregister;
+
+    UA_Boolean register2;
+    UA_Boolean shutdown;
 } asyncRegisterRequest;
 #define UA_MAXREGISTERREQUESTS 4
 

From 21a59dd5bdde3ec0ab5917798a9b84c93097a275 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 14 Nov 2023 21:23:23 +0100
Subject: [PATCH 1312/1963] fix(server): Fix infinite loop when the discovery
 server cannot be reached

---
 src/server/ua_discovery.c | 10 ++++++++--
 src/server/ua_discovery.h |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
index ad752993059..8db042cf552 100644
--- a/src/server/ua_discovery.c
+++ b/src/server/ua_discovery.c
@@ -351,10 +351,12 @@ discoveryClientStateCallback(UA_Client *client,
 
         /* Connection fully closed */
         if(channelState == UA_SECURECHANNELSTATE_CLOSED) {
-            if(ar->shutdown)
+            if(!ar->connectSuccess || ar->shutdown) {
                 asyncRegisterRequest_clearAsync(ar); /* Clean up */
-            else
+            } else {
+                ar->connectSuccess = false;
                 __UA_Client_connect(client, true);   /* Reconnect */
+            }
         }
         return;
     }
@@ -363,6 +365,9 @@ discoveryClientStateCallback(UA_Client *client,
     if(channelState != UA_SECURECHANNELSTATE_OPEN)
         return;
 
+    /* We have at least succeeded to connect */
+    ar->connectSuccess = true;
+
     /* Is this the encrypted SecureChannel already? (We might have to wait for
      * the second connection after the FindServers handshake */
     UA_MessageSecurityMode msm = UA_MESSAGESECURITYMODE_INVALID;
@@ -499,6 +504,7 @@ UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister
 
     /* Connect asynchronously. The register service is called once the
      * connection is open. */
+    ar->connectSuccess = false;
     return __UA_Client_connect(ar->client, true);
 }
 
diff --git a/src/server/ua_discovery.h b/src/server/ua_discovery.h
index e6635903300..b0031c7329f 100644
--- a/src/server/ua_discovery.h
+++ b/src/server/ua_discovery.h
@@ -38,6 +38,7 @@ typedef struct {
 
     UA_Boolean register2;
     UA_Boolean shutdown;
+    UA_Boolean connectSuccess;
 } asyncRegisterRequest;
 #define UA_MAXREGISTERREQUESTS 4
 

From f8946a1118719526c33fe054774ef6499a31e437 Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Thu, 16 Nov 2023 10:34:28 +0100
Subject: [PATCH 1313/1963] Add server option to allow password with None
 policy (#5988)

If the server is built with security support, plain text passwords
are currently rejected and no corresponding token is offered in the
None policy endpoint.
A client without encryption support is unable to authenticate using
username and password, even if a None policy endpoint is offered.

This commit adds the "allowNonePolicyPassword" option to the server
config to enable access for clients with no encryption support.
---
 include/open62541/server.h                    |   6 +
 src/server/ua_services_discovery.c            |   3 +-
 src/server/ua_services_session.c              |   6 +-
 tests/CMakeLists.txt                          |   2 +
 .../encryption/check_username_connect_none.c  | 116 ++++++++++++++++++
 5 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100644 tests/encryption/check_username_connect_none.c

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 26bf452955f..518d9f80f8d 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -205,6 +205,12 @@ struct UA_ServerConfig {
      * securityPolicies list. */
     UA_Boolean securityPolicyNoneDiscoveryOnly;
 
+    /* Allow clients without encryption support to connect with username and password.
+     * This requires to transmit the password in plain text over the network which is
+     * why this option is disabled by default.
+     * Make sure you really need this before enabling plain text passwords. */
+    UA_Boolean allowNonePolicyPassword;
+
     /* Different sets of certificates are trusted for SecureChannel / Session */
     UA_CertificateVerification secureChannelPKI;
     UA_CertificateVerification sessionPKI;
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index b2735cf9b7a..5685a0b2a52 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -341,7 +341,8 @@ updateEndpointUserIdentityToken(UA_Server *server, UA_EndpointDescription *ed) {
          * SecureChannel is unencrypted and there is a non-anonymous token. */
         UA_UserTokenPolicy *utp = &ed->userIdentityTokens[i];
         UA_String_clear(&utp->securityPolicyUri);
-        if(UA_String_equal(&ed->securityPolicyUri, &UA_SECURITY_POLICY_NONE_URI) &&
+        if((!server->config.allowNonePolicyPassword || ed->userIdentityTokens[i].tokenType != UA_USERTOKENTYPE_USERNAME) &&
+           UA_String_equal(&ed->securityPolicyUri, &UA_SECURITY_POLICY_NONE_URI) &&
            utp->tokenType != UA_USERTOKENTYPE_ANONYMOUS) {
             UA_SecurityPolicy *encSP = getDefaultEncryptedSecurityPolicy(server);
             if(encSP)
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 8d85eef4151..85235e13766 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -519,9 +519,11 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
             *tokenSp = channel->securityPolicy;
             if(pol->securityPolicyUri.length > 0)
                 *tokenSp = getSecurityPolicyByUri(server, &pol->securityPolicyUri);
+
 #ifdef UA_ENABLE_ENCRYPTION
-            if(!*tokenSp || (*tokenSp)->localCertificate.length == 0 ||
-               UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &(*tokenSp)->policyUri))
+            if(!*tokenSp || (!server->config.allowNonePolicyPassword &&
+               ((*tokenSp)->localCertificate.length == 0 ||
+               UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &(*tokenSp)->policyUri))))
                 *tokenSp = getDefaultEncryptedSecurityPolicy(server);
 #endif
             return;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c88c0262625..62012b2b370 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -434,6 +434,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
     ua_add_test(encryption/check_encryption_basic256sha256.c)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
     ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
+    ua_add_test(encryption/check_username_connect_none.c)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS AND UA_ENABLE_CERT_REJECTED_DIR)
@@ -447,6 +448,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
     ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
     ua_add_test(encryption/check_cert_generation.c)
+    ua_add_test(encryption/check_username_connect_none.c)
 endif()
 
 # Tests for Nodeset Compiler
diff --git a/tests/encryption/check_username_connect_none.c b/tests/encryption/check_username_connect_none.c
new file mode 100644
index 00000000000..3db48f7dd60
--- /dev/null
+++ b/tests/encryption/check_username_connect_none.c
@@ -0,0 +1,116 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <open62541/client_config_default.h>
+#include <open62541/plugin/securitypolicy_default.h>
+#include <open62541/plugin/pki_default.h>
+#include <open62541/plugin/accesscontrol_default.h>
+#include <open62541/server_config_default.h>
+
+#include "ua_server_internal.h"
+
+#include <check.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "certificates.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+static const size_t usernamePasswordsSize = 2;
+static UA_UsernamePasswordLogin usernamePasswords[2] = {
+    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
+    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1")}};
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static void setup(void) {
+    running = true;
+
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   NULL, 0, NULL, 0, NULL, 0);
+
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
+    UA_AccessControl_default(config, false, NULL, usernamePasswordsSize, usernamePasswords);
+
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(none_policy_connect) {
+    server->config.allowNonePolicyPassword = true;
+    UA_Client *client = UA_Client_new();
+    UA_StatusCode retval =
+        UA_Client_connectUsername(client, "opc.tcp://localhost:4840", "user1", "password");
+
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(none_policy_connect_fail) {
+    server->config.allowNonePolicyPassword = false;
+
+    UA_Client *client = UA_Client_new();
+    UA_StatusCode retval =
+        UA_Client_connectUsername(client, "opc.tcp://localhost:4840", "user1", "password");
+
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADIDENTITYTOKENINVALID);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+static Suite* testSuite_encryption(void) {
+    Suite *s = suite_create("NoneClientWithEncryptionServer");
+    TCase *tc_encryption = tcase_create("Client without certificate and server with certificate");
+    tcase_add_checked_fixture(tc_encryption, setup, teardown);
+    tcase_add_test(tc_encryption, none_policy_connect);
+    tcase_add_test(tc_encryption, none_policy_connect_fail);
+    suite_add_tcase(s,tc_encryption);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_encryption();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 4750fceda17c721f1a607362fc85577905a8d1d1 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 23 Nov 2023 14:20:42 +0100
Subject: [PATCH 1314/1963] fix(server): Server returns the status
 BadServiceUnsupported for Service RegisterServer.

---
 src/server/ua_services_discovery.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 5685a0b2a52..9fb068cee31 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -502,6 +502,11 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
     if(!dm)
         return;
 
+    if(dm->serverConfig->applicationDescription.applicationType != UA_APPLICATIONTYPE_DISCOVERYSERVER) {
+        responseHeader->serviceResult = UA_STATUSCODE_BADSERVICEUNSUPPORTED;
+        return;
+    }
+
     /* Find the server from the request in the registered list */
     registeredServer_list_entry* current;
     registeredServer_list_entry *registeredServer_entry = NULL;

From 3a6c9eca0869740a7507484a1a7d2774ff4f6fdd Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 23 Nov 2023 14:24:08 +0100
Subject: [PATCH 1315/1963] fix(server_ctt): Server will continuously register
 with the LDS.

---
 examples/server_ctt.c       | 29 +++++++++++++++++++++++++++++
 include/open62541/server.h  |  6 +++++-
 plugins/server_config.json5 |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/examples/server_ctt.c b/examples/server_ctt.c
index 8f65134635e..70321bce694 100644
--- a/examples/server_ctt.c
+++ b/examples/server_ctt.c
@@ -912,6 +912,25 @@ notifyState(UA_Server *server, UA_LifecycleState state) {
 #endif
 }
 
+#ifdef UA_ENABLE_DISCOVERY
+static void
+discoveryRegisterCallback(UA_Server *server, void *data) {
+    UA_ClientConfig cc;
+    memset(&cc, 0, sizeof(UA_ClientConfig));
+    UA_ClientConfig_setDefault(&cc);
+#ifdef UA_ENABLE_ENCRYPTION
+    UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
+    UA_String_clear(&cc.clientDescription.applicationUri);
+    UA_ServerConfig *sc = UA_Server_getConfig(server);
+    UA_String_copy(&sc->applicationDescription.applicationUri,
+                   &cc.clientDescription.applicationUri);
+#endif
+    UA_Server_registerDiscovery(server, &cc,
+                                UA_STRING("opc.tcp://localhost:4840"),
+                                UA_STRING_NULL);
+}
+#endif
+
 #ifdef UA_ENABLE_ENCRYPTION
 static void
 enableNoneSecurityPolicy(UA_ServerConfig *config) {
@@ -1484,9 +1503,19 @@ int main(int argc, char **argv) {
         disableUsernamePasswordAuth(config);
 #endif
 
+#ifdef UA_ENABLE_DISCOVERY
+    /* Add a repeated callback so that the server periodically registers with the Discovery Server. */
+    UA_UInt64 discoveryRegisterCallbackId;
+    UA_Server_addRepeatedCallback(server, (UA_ServerCallback)discoveryRegisterCallback, NULL, 600000, &discoveryRegisterCallbackId);
+#endif
+
     /* run server */
     res = UA_Server_runUntilInterrupt(server);
 
+#ifdef UA_ENABLE_DISCOVERY
+    UA_Server_removeCallback(server, discoveryRegisterCallbackId);
+#endif
+
  cleanup:
     UA_Server_delete(server);
 
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 518d9f80f8d..a1aa93fa584 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -92,7 +92,11 @@ struct UA_ServerConfig {
      * ^^^^^^^^^^^^^^^^^^
      * The description must be internally consistent. The ApplicationUri set in
      * the ApplicationDescription must match the URI set in the server
-     * certificate. */
+     * certificate.
+     * The applicationType is not just descriptive, it changes the actual
+     * functionality of the server. The RegisterServer service is available only
+     * if the server is a DiscoveryServer and the applicationType is set to the
+     * appropriate value.*/
     UA_BuildInfo buildInfo;
     UA_ApplicationDescription applicationDescription;
 
diff --git a/plugins/server_config.json5 b/plugins/server_config.json5
index 1d03782575c..81be7fe9e80 100644
--- a/plugins/server_config.json5
+++ b/plugins/server_config.json5
@@ -9,7 +9,7 @@
     buildNumber: "0.9.4",
     buildDate: "2022-11-02T15:31:03Z",
   },
-  // The application description does not change the bahavior of the server.
+  // The applicationType is not just descriptive, it changes the actual functionality of the server.
   // It just sets the value in the information model (https://reference.opcfoundation.org/Core/Part4/v104/docs/7.1).
   applicationDescription: {
     applicationUri: "urn:open62541.server.application",

From d5b137c5e0fe0844f3ec3390910bbf8bcb6be821 Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Tue, 19 Sep 2023 11:11:06 +0200
Subject: [PATCH 1316/1963] feat(client): Add client side support for PEM
 private keys with password

This commit extends UA_ClientConfig with a callback function
pointer which is called if a password protected private key in
PEM format is encountered in UA_ClientConfig_setDefaultEncryption().
---
 include/open62541/client.h                    |   9 +
 include/open62541/plugin/pki.h                |  14 ++
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       |  91 ++++++++
 plugins/crypto/openssl/ua_pki_openssl.c       |  91 ++++++++
 .../include/open62541/plugin/pki_default.h    |  10 +
 plugins/ua_config_default.c                   |  21 +-
 src/client/ua_client.c                        |   5 +
 tests/CMakeLists.txt                          |   2 +
 tests/encryption/certificates.h               | 122 +++++++++++
 .../check_encryption_key_password.c           | 196 ++++++++++++++++++
 10 files changed, 556 insertions(+), 5 deletions(-)
 create mode 100644 tests/encryption/check_encryption_key_password.c

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 20afb2a9807..11d46d1725b 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -209,6 +209,15 @@ typedef struct {
     UA_String sessionName;
     UA_LocaleId *sessionLocaleIds;
     size_t sessionLocaleIdsSize;
+
+#ifdef UA_ENABLE_ENCRYPTION
+    /* If the private key is in PEM format and password protected,
+     * this callback is called during initialization to get the password
+     * to decrypt the private key.
+     * The callback must be set before invoking UA_ClientConfig_setDefaultEncryption(). */
+    UA_PKI_PrivateKeyPasswordCallback privateKeyPasswordCallback;
+    void *privateKeyPasswordCallbackContext;
+#endif
 } UA_ClientConfig;
 
 /**
diff --git a/include/open62541/plugin/pki.h b/include/open62541/plugin/pki.h
index a897537b249..6b3a5fbe0b2 100644
--- a/include/open62541/plugin/pki.h
+++ b/include/open62541/plugin/pki.h
@@ -30,6 +30,20 @@ _UA_BEGIN_DECLS
  * The lifecycle of the plugin is attached to a server or client config. The
  * ``clear`` method is called automatically when the config is destroyed. */
 
+/* Enum and functions for the private key password */
+typedef enum  {
+    UA_PRIVATEKEYPASSWORDSTATE_INITIAL = 0,
+    UA_PRIVATEKEYPASSWORDSTATE_WRONG = 1,
+} UA_PrivateKeyPasswordState;
+
+/* This callback is called when UA_PKI_decryptPemWithPassword is called and detects
+ * a password protected private key in the PEM format.
+ * If a wrong password is encountered, the callback will be called repeatedly until
+ * doRetry is set to false. */
+typedef UA_String (*UA_PKI_PrivateKeyPasswordCallback)(UA_PrivateKeyPasswordState state,
+                                                       UA_Boolean *doRetry,
+                                                       void *context);
+
 struct UA_CertificateVerification;
 typedef struct UA_CertificateVerification UA_CertificateVerification;
 
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 4d2c6bf5392..dc155f8c589 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -16,6 +16,7 @@
 
 #include <mbedtls/x509.h>
 #include <mbedtls/x509_crt.h>
+#include <mbedtls/entropy.h>
 #include <mbedtls/error.h>
 #include <mbedtls/version.h>
 
@@ -729,4 +730,94 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
 }
 
 #endif
+
+UA_StatusCode
+UA_PKI_decryptPemWithPassword(UA_ByteString privateKey, UA_ByteString *derOutput,
+                                  UA_PKI_PrivateKeyPasswordCallback passwordCallback,
+                                     void *callbackContext)
+{
+    if (!derOutput) {
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    if (!passwordCallback ||
+       // Magic number for DER encoded keys
+       (privateKey.length > 1 && privateKey.data[0] == 0x30 && privateKey.data[1] == 0x82)) {
+        UA_ByteString_copy(&privateKey, derOutput);
+         return UA_STATUSCODE_GOOD;
+    }
+
+    UA_ByteString nullTerminatedKey = UA_mbedTLS_CopyDataFormatAware(&privateKey);
+
+    mbedtls_pk_context key;
+    mbedtls_pk_init(&key);
+    UA_Boolean loadSuccess = false;
+
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+    int err = mbedtls_pk_parse_key(&key, nullTerminatedKey.data, nullTerminatedKey.length, NULL, 0);
+#else
+    mbedtls_entropy_context entropy;
+    mbedtls_entropy_init(&entropy);
+    int err = mbedtls_pk_parse_key(&key, nullTerminatedKey.data, nullTerminatedKey.length, NULL, 0, mbedtls_entropy_func, &entropy);
+#endif
+
+    if (err) {
+        if (err == MBEDTLS_ERR_PK_PASSWORD_REQUIRED) {
+            UA_PrivateKeyPasswordState state = UA_PRIVATEKEYPASSWORDSTATE_INITIAL;
+             UA_Boolean doRetry = false;
+
+             do {
+                doRetry = false;
+                UA_ByteString password = passwordCallback( state, &doRetry, callbackContext);
+#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
+                err = mbedtls_pk_parse_key(&key, nullTerminatedKey.data, nullTerminatedKey.length, password.data, password.length);
+#else
+                err = mbedtls_pk_parse_key(&key, nullTerminatedKey.data, nullTerminatedKey.length, password.data, password.length,
+                                           mbedtls_entropy_func, &entropy);
+#endif
+                UA_ByteString_clear(&password);
+
+                if (!err) {
+                    loadSuccess = true;
+                    break;
+                }
+
+                state = UA_PRIVATEKEYPASSWORDSTATE_WRONG;
+             } while (doRetry);
+        } else {
+             /* If this happens, there is something wrong with the PK file */
+#if MBEDTLS_VERSION_NUMBER < 0x02060000 || MBEDTLS_VERSION_NUMBER >= 0x03000000
+             mbedtls_entropy_free(&entropy);
+#endif
+             return UA_STATUSCODE_BADINVALIDARGUMENT;
+        }
+    } else {
+        loadSuccess = true;
+    }
+
+    UA_ByteString_clear(&nullTerminatedKey);
+
+#if MBEDTLS_VERSION_NUMBER < 0x02060000 || MBEDTLS_VERSION_NUMBER >= 0x03000000
+    mbedtls_entropy_free(&entropy);
+#endif
+
+    if (loadSuccess) {
+        unsigned char buffer[16000];
+        memset(buffer, 0, sizeof(buffer));
+        err = mbedtls_pk_write_key_der(&key, buffer, sizeof(buffer));
+        mbedtls_pk_free(&key);
+
+        if (err > 0) {
+            UA_ByteString temp = UA_BYTESTRING_NULL;
+            temp.length = err;
+            temp.data = buffer + sizeof(buffer) - err;
+            UA_ByteString_copy(&temp, derOutput);
+        }
+
+        return err > 0 ? UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
 #endif
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index d3324975615..fa28f72c202 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -834,4 +834,95 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
 }
 #endif
 
+struct PrivateKeyPasswordCallbackUserData {
+    UA_PKI_PrivateKeyPasswordCallback callback;
+    void *callbackContext;
+    UA_PrivateKeyPasswordState state;
+    UA_Boolean retry;
+    UA_Boolean callbackWasCalled;
+};
+
+static int PrivateKeyPasswordCallback(char *buf, int size, int rwflag, void *userdata) {
+    (void) rwflag;
+
+    struct PrivateKeyPasswordCallbackUserData *context = (struct PrivateKeyPasswordCallbackUserData *) userdata;
+
+    size_t passwordSize = 0;
+
+    if (context && context->callback) {
+        UA_String password = context->callback(context->state, &context->retry, context->callbackContext);
+        context->callbackWasCalled = true;
+
+        if (password.length) {
+            if (password.length <= (size_t) size) {
+                memcpy(buf, password.data, password.length);
+                passwordSize = password.length;
+            }
+            UA_String_clear(&password);
+        }
+    }
+
+    return (int) passwordSize;
+}
+
+UA_StatusCode UA_PKI_decryptPemWithPassword(UA_ByteString privateKey, UA_ByteString *derOutput,
+                                     UA_PKI_PrivateKeyPasswordCallback passwordCallback,
+                                     void *callbackContext)
+{
+    if (!derOutput) {
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
+    if (!passwordCallback ||
+       // Magic number for DER encoded keys
+       (privateKey.length > 1 && privateKey.data[0] == 0x30 && privateKey.data[1] == 0x82)) {
+        UA_ByteString_copy(&privateKey, derOutput);
+
+        return UA_STATUSCODE_GOOD;
+    }
+
+    struct PrivateKeyPasswordCallbackUserData userData;
+    userData.callback = passwordCallback;
+    userData.callbackContext = callbackContext;
+    userData.retry = false;
+    userData.state = UA_PRIVATEKEYPASSWORDSTATE_INITIAL;
+
+    do {
+        userData.retry = false;
+        userData.callbackWasCalled = false;
+
+        EVP_PKEY *pkey = NULL;
+
+        BIO *bio = NULL;
+        bio = BIO_new_mem_buf((void *) privateKey.data, (int) privateKey.length);
+        pkey = PEM_read_bio_PrivateKey(bio, NULL, PrivateKeyPasswordCallback, &userData);
+
+        BIO_free(bio);
+
+        if (pkey) {
+            unsigned char *data = NULL;
+            const int numBytes = i2d_PrivateKey(pkey, &data);
+
+            EVP_PKEY_free(pkey);
+
+            if (numBytes > 0) {
+                derOutput->length = (size_t)numBytes;
+                derOutput->data = data;
+                return UA_STATUSCODE_GOOD;
+            }
+
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+
+        if (!userData.callbackWasCalled) {
+            /* If this happens, there is something wrong with the PK file */
+            return UA_STATUSCODE_BADINVALIDARGUMENT;
+        }
+
+        userData.state = UA_PRIVATEKEYPASSWORDSTATE_WRONG;
+    } while(userData.retry);
+
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
 #endif  /* end of defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_LIBRESSL) */
diff --git a/plugins/include/open62541/plugin/pki_default.h b/plugins/include/open62541/plugin/pki_default.h
index a999fbbe626..93fa131acf2 100644
--- a/plugins/include/open62541/plugin/pki_default.h
+++ b/plugins/include/open62541/plugin/pki_default.h
@@ -47,6 +47,16 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
 #endif
 #endif
 
+/* Attempts to load privateKey and writes a DER encoded private key to derOutput.
+ * If the key is PEM encoded and password protected, the password callback
+ * is called to get the password to decrypt the private key.
+ * A DER private key input is just copied without any loading operation involved.
+ * The content of derOutput must be cleared after use. */
+UA_EXPORT UA_StatusCode
+UA_PKI_decryptPemWithPassword(UA_ByteString privateKey, UA_ByteString *derOutput,
+                              UA_PKI_PrivateKeyPasswordCallback passwordCallback,
+                              void *callbackContext);
+
 #endif
 
 _UA_END_DECLS
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 7c17fb3c037..c577cc136ae 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -1167,8 +1167,16 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = sp;
 
+    UA_ByteString decryptedPrivateKey = UA_BYTESTRING_NULL;
+    const UA_StatusCode keySuccess = UA_PKI_decryptPemWithPassword(privateKey, &decryptedPrivateKey,
+                                                                config->privateKeyPasswordCallback,
+                                                                config->privateKeyPasswordCallbackContext);
+
+    if (keySuccess != UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+
     retval = UA_SecurityPolicy_Basic128Rsa15(&config->securityPolicies[config->securityPoliciesSize],
-                                             localCertificate, privateKey, config->logging);
+                                             localCertificate, decryptedPrivateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
@@ -1178,7 +1186,8 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     }
 
     retval = UA_SecurityPolicy_Basic256(&config->securityPolicies[config->securityPoliciesSize],
-                                        localCertificate, privateKey, config->logging);
+                                        localCertificate, decryptedPrivateKey, config->logging);
+
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
@@ -1188,7 +1197,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     }
 
     retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->securityPolicies[config->securityPoliciesSize],
-                                                  localCertificate, privateKey, config->logging);
+                                                  localCertificate, decryptedPrivateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
@@ -1198,7 +1207,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     }
 
     retval = UA_SecurityPolicy_Basic256Sha256(&config->securityPolicies[config->securityPoliciesSize],
-                                              localCertificate, privateKey, config->logging);
+                                              localCertificate, decryptedPrivateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
@@ -1208,7 +1217,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     }
 
     retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->securityPolicies[config->securityPoliciesSize],
-                                                   localCertificate, privateKey, config->logging);
+                                                   localCertificate, decryptedPrivateKey, config->logging);
     if(retval == UA_STATUSCODE_GOOD) {
         ++config->securityPoliciesSize;
     } else {
@@ -1217,6 +1226,8 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
                        UA_StatusCode_name(retval));
     }
 
+    UA_ByteString_clear(&decryptedPrivateKey);
+
     if(config->securityPoliciesSize == 0) {
         UA_free(config->securityPolicies);
         config->securityPolicies = NULL;
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index bd7f2ba0cb1..53c9e85c5ee 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -185,6 +185,11 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
 
     /* Custom Data Types */
     UA_cleanupDataTypeWithCustom(config->customDataTypes);
+
+#ifdef UA_ENABLE_ENCRYPTION
+    config->privateKeyPasswordCallback = NULL;
+    config->privateKeyPasswordCallbackContext = NULL;
+#endif
 }
 
 void
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 62012b2b370..519957310d7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -435,6 +435,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
     ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
     ua_add_test(encryption/check_username_connect_none.c)
+    ua_add_test(encryption/check_encryption_key_password.c)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS AND UA_ENABLE_CERT_REJECTED_DIR)
@@ -447,6 +448,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
     ua_add_test(encryption/check_encryption_basic256sha256.c)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
     ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
+    ua_add_test(encryption/check_encryption_key_password.c)
     ua_add_test(encryption/check_cert_generation.c)
     ua_add_test(encryption/check_username_connect_none.c)
 endif()
diff --git a/tests/encryption/certificates.h b/tests/encryption/certificates.h
index 0347e87e521..da843bb9932 100644
--- a/tests/encryption/certificates.h
+++ b/tests/encryption/certificates.h
@@ -348,6 +348,128 @@ UA_Byte CERT_PEM_DATA[1367] = {
     0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
 };
 
+/* Generated from KEY_PEM_DATA via: openssl pkcs8 -topk8 -v2 des3 -in key.pem -out key-password.pem
+   The password is pass1234 */
+#define KEY_PEM_PASSWORD_LENGTH 1854
+UA_Byte KEY_PEM_PASSWORD_DATA[KEY_PEM_PASSWORD_LENGTH] = {
+    0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x45, 0x4e, 0x43, 0x52, 0x59,
+    0x50, 0x54, 0x45, 0x44, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59,
+    0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x46, 0x48, 0x44, 0x42, 0x4f, 0x42, 0x67,
+    0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x42, 0x51, 0x30, 0x77, 0x51, 0x54,
+    0x41, 0x70, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x42, 0x51,
+    0x77, 0x77, 0x48, 0x41, 0x51, 0x49, 0x71, 0x77, 0x7a, 0x47, 0x38, 0x51, 0x68, 0x69, 0x56, 0x58,
+    0x38, 0x43, 0x41, 0x67, 0x67, 0x41, 0x0a, 0x4d, 0x41, 0x77, 0x47, 0x43, 0x43, 0x71, 0x47, 0x53,
+    0x49, 0x62, 0x33, 0x44, 0x51, 0x49, 0x4a, 0x42, 0x51, 0x41, 0x77, 0x46, 0x41, 0x59, 0x49, 0x4b,
+    0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x77, 0x63, 0x45, 0x43, 0x4a, 0x5a, 0x52, 0x51,
+    0x57, 0x78, 0x4c, 0x47, 0x62, 0x31, 0x39, 0x42, 0x49, 0x49, 0x45, 0x79, 0x4e, 0x7a, 0x72, 0x52,
+    0x4b, 0x31, 0x77, 0x4b, 0x42, 0x65, 0x51, 0x0a, 0x59, 0x48, 0x48, 0x36, 0x45, 0x37, 0x45, 0x7a,
+    0x5a, 0x67, 0x43, 0x57, 0x4f, 0x64, 0x62, 0x53, 0x7a, 0x30, 0x44, 0x50, 0x78, 0x33, 0x52, 0x6a,
+    0x48, 0x6c, 0x62, 0x53, 0x67, 0x48, 0x64, 0x30, 0x55, 0x34, 0x6f, 0x36, 0x4f, 0x76, 0x74, 0x71,
+    0x31, 0x36, 0x55, 0x46, 0x43, 0x4c, 0x65, 0x74, 0x77, 0x4d, 0x6e, 0x30, 0x35, 0x72, 0x56, 0x41,
+    0x68, 0x4c, 0x61, 0x44, 0x73, 0x39, 0x43, 0x75, 0x0a, 0x61, 0x65, 0x7a, 0x78, 0x42, 0x4d, 0x4a,
+    0x77, 0x78, 0x77, 0x37, 0x6d, 0x32, 0x43, 0x4b, 0x42, 0x6f, 0x49, 0x79, 0x33, 0x41, 0x41, 0x39,
+    0x47, 0x46, 0x58, 0x49, 0x5a, 0x71, 0x79, 0x75, 0x37, 0x63, 0x65, 0x5a, 0x4e, 0x52, 0x36, 0x64,
+    0x53, 0x39, 0x4c, 0x49, 0x50, 0x73, 0x73, 0x71, 0x75, 0x54, 0x4f, 0x54, 0x76, 0x76, 0x48, 0x6f,
+    0x4b, 0x45, 0x6a, 0x64, 0x30, 0x56, 0x51, 0x71, 0x42, 0x0a, 0x33, 0x66, 0x66, 0x38, 0x5a, 0x72,
+    0x4d, 0x49, 0x6a, 0x2b, 0x33, 0x7a, 0x43, 0x4b, 0x6f, 0x78, 0x45, 0x62, 0x38, 0x38, 0x50, 0x70,
+    0x68, 0x54, 0x61, 0x65, 0x75, 0x31, 0x62, 0x4e, 0x66, 0x6c, 0x49, 0x72, 0x6a, 0x79, 0x79, 0x78,
+    0x70, 0x30, 0x4c, 0x5a, 0x79, 0x45, 0x36, 0x51, 0x75, 0x66, 0x75, 0x76, 0x4c, 0x42, 0x72, 0x4a,
+    0x53, 0x66, 0x41, 0x46, 0x4c, 0x71, 0x63, 0x32, 0x6d, 0x4e, 0x0a, 0x45, 0x45, 0x45, 0x5a, 0x55,
+    0x79, 0x43, 0x77, 0x74, 0x78, 0x4e, 0x6d, 0x31, 0x42, 0x2f, 0x37, 0x75, 0x52, 0x2b, 0x72, 0x36,
+    0x2f, 0x50, 0x64, 0x36, 0x74, 0x58, 0x6c, 0x2f, 0x57, 0x6d, 0x45, 0x47, 0x4c, 0x68, 0x76, 0x2b,
+    0x36, 0x45, 0x52, 0x58, 0x74, 0x35, 0x61, 0x61, 0x61, 0x39, 0x47, 0x51, 0x30, 0x67, 0x32, 0x78,
+    0x7a, 0x4a, 0x42, 0x36, 0x54, 0x50, 0x30, 0x41, 0x5a, 0x45, 0x6d, 0x0a, 0x73, 0x7a, 0x42, 0x4a,
+    0x72, 0x62, 0x4f, 0x31, 0x4e, 0x57, 0x79, 0x73, 0x33, 0x6e, 0x5a, 0x4f, 0x65, 0x64, 0x31, 0x2f,
+    0x46, 0x49, 0x38, 0x43, 0x6e, 0x42, 0x55, 0x32, 0x4b, 0x6f, 0x61, 0x62, 0x67, 0x65, 0x6b, 0x6c,
+    0x64, 0x37, 0x69, 0x61, 0x39, 0x61, 0x58, 0x4b, 0x5a, 0x54, 0x65, 0x76, 0x44, 0x78, 0x70, 0x46,
+    0x4b, 0x75, 0x61, 0x36, 0x73, 0x35, 0x77, 0x43, 0x75, 0x58, 0x32, 0x4a, 0x0a, 0x54, 0x4d, 0x2b,
+    0x41, 0x43, 0x76, 0x46, 0x65, 0x6d, 0x52, 0x71, 0x71, 0x68, 0x4f, 0x48, 0x6c, 0x69, 0x43, 0x4d,
+    0x65, 0x70, 0x38, 0x41, 0x6c, 0x4a, 0x6e, 0x2f, 0x4a, 0x66, 0x45, 0x78, 0x38, 0x48, 0x6a, 0x74,
+    0x53, 0x6a, 0x7a, 0x77, 0x42, 0x35, 0x52, 0x71, 0x56, 0x4f, 0x6b, 0x33, 0x6b, 0x72, 0x72, 0x44,
+    0x71, 0x6e, 0x79, 0x31, 0x36, 0x41, 0x6d, 0x64, 0x78, 0x50, 0x34, 0x61, 0x56, 0x0a, 0x75, 0x68,
+    0x6a, 0x67, 0x44, 0x62, 0x58, 0x4e, 0x66, 0x33, 0x31, 0x39, 0x63, 0x75, 0x43, 0x71, 0x32, 0x74,
+    0x35, 0x68, 0x38, 0x31, 0x6e, 0x72, 0x48, 0x6d, 0x6a, 0x4b, 0x63, 0x6c, 0x55, 0x52, 0x59, 0x54,
+    0x30, 0x2f, 0x6d, 0x64, 0x34, 0x43, 0x6b, 0x51, 0x6e, 0x64, 0x50, 0x51, 0x7a, 0x51, 0x33, 0x4c,
+    0x61, 0x51, 0x73, 0x62, 0x38, 0x47, 0x4f, 0x63, 0x67, 0x35, 0x58, 0x45, 0x76, 0x67, 0x0a, 0x78,
+    0x73, 0x68, 0x39, 0x65, 0x55, 0x58, 0x64, 0x75, 0x4f, 0x65, 0x45, 0x46, 0x6f, 0x72, 0x32, 0x54,
+    0x6d, 0x73, 0x2f, 0x6b, 0x55, 0x62, 0x77, 0x76, 0x73, 0x66, 0x2b, 0x63, 0x30, 0x4f, 0x50, 0x58,
+    0x53, 0x65, 0x70, 0x5a, 0x6b, 0x46, 0x35, 0x4b, 0x47, 0x51, 0x4d, 0x43, 0x50, 0x39, 0x36, 0x4b,
+    0x32, 0x32, 0x4f, 0x43, 0x69, 0x43, 0x4b, 0x78, 0x58, 0x59, 0x37, 0x4b, 0x57, 0x56, 0x75, 0x0a,
+    0x73, 0x6b, 0x47, 0x6a, 0x62, 0x70, 0x34, 0x65, 0x63, 0x58, 0x56, 0x57, 0x56, 0x47, 0x67, 0x4f,
+    0x48, 0x6a, 0x4e, 0x51, 0x67, 0x73, 0x47, 0x75, 0x64, 0x45, 0x66, 0x75, 0x50, 0x63, 0x30, 0x49,
+    0x71, 0x53, 0x42, 0x66, 0x6b, 0x46, 0x7a, 0x79, 0x71, 0x35, 0x63, 0x54, 0x36, 0x2b, 0x63, 0x6a,
+    0x36, 0x31, 0x78, 0x73, 0x49, 0x76, 0x58, 0x53, 0x61, 0x35, 0x36, 0x78, 0x69, 0x69, 0x59, 0x51,
+    0x0a, 0x39, 0x4b, 0x38, 0x2b, 0x61, 0x30, 0x75, 0x68, 0x58, 0x4d, 0x32, 0x66, 0x4f, 0x32, 0x49,
+    0x57, 0x55, 0x78, 0x74, 0x2b, 0x70, 0x33, 0x35, 0x42, 0x73, 0x5a, 0x4d, 0x56, 0x44, 0x31, 0x7a,
+    0x6f, 0x30, 0x67, 0x63, 0x6d, 0x31, 0x36, 0x6b, 0x73, 0x78, 0x77, 0x31, 0x36, 0x32, 0x73, 0x37,
+    0x75, 0x61, 0x55, 0x74, 0x6a, 0x53, 0x56, 0x39, 0x61, 0x2f, 0x30, 0x58, 0x6d, 0x62, 0x65, 0x7a,
+    0x45, 0x0a, 0x55, 0x53, 0x50, 0x36, 0x4c, 0x2f, 0x6a, 0x74, 0x57, 0x6a, 0x50, 0x50, 0x52, 0x52,
+    0x33, 0x56, 0x57, 0x42, 0x70, 0x44, 0x34, 0x4a, 0x4d, 0x53, 0x61, 0x79, 0x77, 0x58, 0x67, 0x47,
+    0x6b, 0x53, 0x34, 0x31, 0x69, 0x4e, 0x79, 0x68, 0x70, 0x50, 0x6f, 0x72, 0x35, 0x54, 0x6f, 0x69,
+    0x34, 0x66, 0x4d, 0x41, 0x43, 0x49, 0x7a, 0x75, 0x34, 0x59, 0x4a, 0x59, 0x4b, 0x70, 0x69, 0x72,
+    0x51, 0x52, 0x0a, 0x4f, 0x47, 0x71, 0x2b, 0x6e, 0x49, 0x54, 0x6e, 0x70, 0x6b, 0x75, 0x6a, 0x53,
+    0x4e, 0x78, 0x34, 0x51, 0x4b, 0x66, 0x39, 0x49, 0x49, 0x4d, 0x4f, 0x4e, 0x6c, 0x36, 0x57, 0x33,
+    0x52, 0x78, 0x31, 0x56, 0x4b, 0x6b, 0x2f, 0x76, 0x71, 0x50, 0x30, 0x59, 0x45, 0x4a, 0x64, 0x47,
+    0x4a, 0x58, 0x44, 0x75, 0x70, 0x50, 0x41, 0x43, 0x49, 0x42, 0x77, 0x4e, 0x58, 0x38, 0x2f, 0x54,
+    0x59, 0x78, 0x6b, 0x0a, 0x6c, 0x79, 0x34, 0x50, 0x71, 0x32, 0x43, 0x6e, 0x53, 0x31, 0x33, 0x39,
+    0x6e, 0x59, 0x44, 0x31, 0x32, 0x4f, 0x50, 0x71, 0x32, 0x56, 0x41, 0x77, 0x47, 0x55, 0x7a, 0x56,
+    0x6e, 0x72, 0x32, 0x32, 0x61, 0x74, 0x54, 0x73, 0x4e, 0x6a, 0x4d, 0x6a, 0x48, 0x4e, 0x79, 0x72,
+    0x2f, 0x6b, 0x63, 0x6d, 0x34, 0x32, 0x4c, 0x72, 0x58, 0x5a, 0x65, 0x33, 0x79, 0x6a, 0x4c, 0x31,
+    0x32, 0x58, 0x78, 0x2b, 0x0a, 0x5a, 0x46, 0x48, 0x74, 0x36, 0x77, 0x45, 0x71, 0x45, 0x33, 0x70,
+    0x77, 0x5a, 0x66, 0x77, 0x46, 0x72, 0x4c, 0x75, 0x43, 0x38, 0x36, 0x48, 0x52, 0x73, 0x51, 0x7a,
+    0x52, 0x4f, 0x4d, 0x46, 0x57, 0x34, 0x43, 0x32, 0x69, 0x4e, 0x76, 0x73, 0x56, 0x36, 0x48, 0x61,
+    0x6e, 0x63, 0x34, 0x73, 0x70, 0x74, 0x56, 0x55, 0x6f, 0x58, 0x4a, 0x4b, 0x38, 0x74, 0x52, 0x68,
+    0x39, 0x33, 0x70, 0x72, 0x67, 0x0a, 0x58, 0x47, 0x5a, 0x64, 0x64, 0x2f, 0x57, 0x58, 0x51, 0x70,
+    0x64, 0x32, 0x6e, 0x76, 0x6f, 0x75, 0x76, 0x4d, 0x42, 0x70, 0x56, 0x6c, 0x6a, 0x63, 0x6d, 0x6a,
+    0x4e, 0x47, 0x57, 0x56, 0x54, 0x72, 0x68, 0x54, 0x48, 0x75, 0x4a, 0x4d, 0x4f, 0x34, 0x6a, 0x56,
+    0x44, 0x31, 0x34, 0x74, 0x73, 0x30, 0x36, 0x72, 0x37, 0x48, 0x46, 0x6c, 0x6d, 0x56, 0x47, 0x31,
+    0x57, 0x50, 0x6c, 0x4c, 0x69, 0x44, 0x0a, 0x42, 0x6d, 0x41, 0x6d, 0x31, 0x68, 0x57, 0x64, 0x61,
+    0x75, 0x38, 0x59, 0x52, 0x59, 0x4b, 0x50, 0x34, 0x4a, 0x38, 0x47, 0x57, 0x57, 0x52, 0x45, 0x34,
+    0x35, 0x68, 0x64, 0x71, 0x52, 0x74, 0x7a, 0x43, 0x37, 0x51, 0x44, 0x65, 0x68, 0x65, 0x74, 0x78,
+    0x62, 0x54, 0x67, 0x6a, 0x46, 0x6a, 0x64, 0x48, 0x4b, 0x34, 0x38, 0x57, 0x46, 0x71, 0x53, 0x2b,
+    0x38, 0x6b, 0x5a, 0x53, 0x42, 0x63, 0x34, 0x0a, 0x2b, 0x4a, 0x6d, 0x4b, 0x56, 0x51, 0x46, 0x57,
+    0x39, 0x79, 0x6d, 0x35, 0x32, 0x54, 0x54, 0x70, 0x61, 0x43, 0x5a, 0x57, 0x6b, 0x47, 0x71, 0x5a,
+    0x6a, 0x30, 0x61, 0x47, 0x48, 0x54, 0x6e, 0x31, 0x63, 0x4f, 0x33, 0x6e, 0x4c, 0x65, 0x4f, 0x35,
+    0x34, 0x44, 0x6f, 0x47, 0x6f, 0x76, 0x66, 0x70, 0x57, 0x38, 0x47, 0x64, 0x4c, 0x4d, 0x47, 0x70,
+    0x5a, 0x59, 0x6b, 0x30, 0x48, 0x63, 0x76, 0x49, 0x0a, 0x78, 0x76, 0x4e, 0x70, 0x73, 0x2b, 0x58,
+    0x54, 0x46, 0x55, 0x30, 0x50, 0x7a, 0x46, 0x6f, 0x55, 0x4d, 0x33, 0x54, 0x63, 0x73, 0x2b, 0x4f,
+    0x66, 0x4b, 0x52, 0x6c, 0x61, 0x35, 0x62, 0x47, 0x4f, 0x31, 0x67, 0x48, 0x49, 0x2f, 0x5a, 0x79,
+    0x39, 0x54, 0x78, 0x5a, 0x68, 0x6a, 0x35, 0x5a, 0x33, 0x6c, 0x75, 0x46, 0x42, 0x44, 0x58, 0x45,
+    0x75, 0x34, 0x72, 0x56, 0x45, 0x6e, 0x4b, 0x34, 0x52, 0x0a, 0x41, 0x56, 0x35, 0x47, 0x4f, 0x45,
+    0x72, 0x51, 0x49, 0x41, 0x6c, 0x70, 0x77, 0x76, 0x61, 0x64, 0x70, 0x52, 0x34, 0x73, 0x57, 0x31,
+    0x30, 0x42, 0x72, 0x54, 0x2b, 0x50, 0x72, 0x4f, 0x44, 0x6c, 0x51, 0x36, 0x42, 0x6a, 0x4a, 0x71,
+    0x75, 0x46, 0x4e, 0x46, 0x61, 0x5a, 0x31, 0x56, 0x35, 0x39, 0x78, 0x4f, 0x53, 0x30, 0x35, 0x39,
+    0x6d, 0x6e, 0x35, 0x79, 0x79, 0x36, 0x31, 0x56, 0x71, 0x38, 0x0a, 0x39, 0x72, 0x54, 0x61, 0x33,
+    0x78, 0x69, 0x78, 0x6c, 0x52, 0x47, 0x59, 0x46, 0x78, 0x45, 0x70, 0x4c, 0x65, 0x73, 0x4d, 0x59,
+    0x66, 0x4a, 0x5a, 0x59, 0x41, 0x46, 0x39, 0x37, 0x35, 0x4e, 0x31, 0x68, 0x74, 0x71, 0x76, 0x53,
+    0x4c, 0x6e, 0x49, 0x73, 0x70, 0x38, 0x36, 0x70, 0x74, 0x48, 0x59, 0x59, 0x63, 0x50, 0x74, 0x42,
+    0x72, 0x4a, 0x4f, 0x34, 0x63, 0x53, 0x63, 0x4e, 0x79, 0x72, 0x6e, 0x0a, 0x49, 0x64, 0x53, 0x58,
+    0x54, 0x58, 0x6d, 0x79, 0x4c, 0x33, 0x55, 0x43, 0x78, 0x56, 0x4e, 0x4b, 0x4f, 0x2f, 0x68, 0x73,
+    0x6f, 0x65, 0x2f, 0x75, 0x4c, 0x32, 0x42, 0x61, 0x79, 0x68, 0x73, 0x45, 0x66, 0x4e, 0x7a, 0x63,
+    0x34, 0x69, 0x55, 0x6c, 0x6b, 0x6c, 0x67, 0x30, 0x39, 0x6b, 0x2b, 0x44, 0x58, 0x51, 0x4f, 0x4e,
+    0x50, 0x6b, 0x68, 0x61, 0x71, 0x52, 0x37, 0x34, 0x74, 0x75, 0x39, 0x47, 0x0a, 0x77, 0x55, 0x57,
+    0x4f, 0x4d, 0x48, 0x68, 0x77, 0x6c, 0x32, 0x6e, 0x62, 0x35, 0x47, 0x65, 0x52, 0x64, 0x73, 0x39,
+    0x76, 0x79, 0x39, 0x70, 0x63, 0x78, 0x63, 0x71, 0x38, 0x52, 0x6e, 0x67, 0x2b, 0x79, 0x46, 0x70,
+    0x54, 0x46, 0x75, 0x56, 0x53, 0x64, 0x41, 0x43, 0x6e, 0x35, 0x75, 0x39, 0x62, 0x4d, 0x5a, 0x46,
+    0x4f, 0x46, 0x6b, 0x64, 0x56, 0x75, 0x32, 0x6e, 0x36, 0x38, 0x42, 0x63, 0x65, 0x0a, 0x31, 0x4e,
+    0x68, 0x75, 0x49, 0x31, 0x53, 0x48, 0x79, 0x6c, 0x42, 0x7a, 0x35, 0x30, 0x79, 0x4e, 0x6b, 0x43,
+    0x4b, 0x4c, 0x33, 0x77, 0x51, 0x44, 0x47, 0x72, 0x38, 0x6b, 0x69, 0x2f, 0x54, 0x73, 0x75, 0x74,
+    0x59, 0x30, 0x31, 0x48, 0x46, 0x30, 0x30, 0x76, 0x41, 0x36, 0x73, 0x4e, 0x75, 0x66, 0x4d, 0x66,
+    0x6c, 0x6e, 0x61, 0x77, 0x79, 0x61, 0x67, 0x31, 0x4a, 0x69, 0x34, 0x46, 0x37, 0x6f, 0x0a, 0x41,
+    0x4c, 0x49, 0x55, 0x39, 0x4e, 0x69, 0x47, 0x67, 0x41, 0x66, 0x6f, 0x33, 0x4a, 0x79, 0x4b, 0x52,
+    0x6c, 0x56, 0x48, 0x6c, 0x71, 0x52, 0x2b, 0x63, 0x6b, 0x47, 0x74, 0x34, 0x6a, 0x66, 0x75, 0x51,
+    0x59, 0x52, 0x5a, 0x4b, 0x46, 0x31, 0x34, 0x43, 0x51, 0x38, 0x66, 0x78, 0x65, 0x64, 0x62, 0x53,
+    0x77, 0x44, 0x6d, 0x36, 0x33, 0x54, 0x77, 0x37, 0x58, 0x41, 0x49, 0x50, 0x43, 0x35, 0x39, 0x0a,
+    0x4c, 0x32, 0x56, 0x49, 0x54, 0x45, 0x77, 0x46, 0x59, 0x51, 0x70, 0x6f, 0x4f, 0x77, 0x30, 0x4c,
+    0x48, 0x45, 0x50, 0x78, 0x63, 0x53, 0x70, 0x36, 0x71, 0x4f, 0x53, 0x6a, 0x51, 0x76, 0x42, 0x4c,
+    0x47, 0x6c, 0x68, 0x71, 0x4c, 0x46, 0x77, 0x38, 0x73, 0x4a, 0x50, 0x38, 0x69, 0x68, 0x59, 0x36,
+    0x73, 0x6d, 0x41, 0x42, 0x53, 0x6d, 0x42, 0x76, 0x49, 0x45, 0x59, 0x4a, 0x5a, 0x79, 0x55, 0x35,
+    0x0a, 0x56, 0x36, 0x47, 0x61, 0x31, 0x76, 0x4e, 0x62, 0x51, 0x43, 0x57, 0x67, 0x65, 0x43, 0x6f,
+    0x71, 0x4b, 0x6f, 0x39, 0x5a, 0x5a, 0x51, 0x3d, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45,
+    0x4e, 0x44, 0x20, 0x45, 0x4e, 0x43, 0x52, 0x59, 0x50, 0x54, 0x45, 0x44, 0x20, 0x50, 0x52, 0x49,
+    0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+
 _UA_END_DECLS
 
 #endif /* CERTIFICATES_H_ */
diff --git a/tests/encryption/check_encryption_key_password.c b/tests/encryption/check_encryption_key_password.c
new file mode 100644
index 00000000000..510a794c829
--- /dev/null
+++ b/tests/encryption/check_encryption_key_password.c
@@ -0,0 +1,196 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2022 (c) Fraunhofer IOSB (Author: Noel Graf)
+ *
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/securitypolicy.h>
+#include <open62541/plugin/pki_default.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include "client/ua_client_internal.h"
+#include "ua_server_internal.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "certificates.h"
+#include "check.h"
+#include "testing_clock.h"
+#include "testing_networklayers.h"
+#include "thread_wrapper.h"
+
+static int numAttempts = 0;
+static UA_String privateKeyPasswordCallback(UA_PrivateKeyPasswordState state, bool *doRetry, void *context)
+{
+    if (numAttempts++ == 0) {
+        ck_assert(state == UA_PRIVATEKEYPASSWORDSTATE_INITIAL);
+        *doRetry = true;
+        return UA_STRING_ALLOC("invalid");
+    }
+
+    ck_assert(state == UA_PRIVATEKEYPASSWORDSTATE_WRONG);
+    return UA_STRING_ALLOC("pass1234");
+}
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+    UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static void setup(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    /* Load the trustlist */
+    size_t trustListSize = 0;
+    UA_ByteString *trustList = NULL;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 0;
+    UA_ByteString *issuerList = NULL;
+
+    /* Loading of a revocation list currently unsupported */
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   trustList, trustListSize,
+                                                   issuerList, issuerListSize,
+                                                   revocationList, revocationListSize);
+
+    UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
+    UA_CertificateVerification_AcceptAll(&config->sessionPKI);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    for(size_t i = 0; i < trustListSize; i++)
+        UA_ByteString_clear(&trustList[i]);
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(encryption_connect_pem) {
+    UA_Client *client = NULL;
+    UA_EndpointDescription* endpointArray = NULL;
+    size_t endpointArraySize = 0;
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_PEM_LENGTH;
+    certificate.data = CERT_PEM_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_PEM_PASSWORD_LENGTH;
+    privateKey.data = KEY_PEM_PASSWORD_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* The Get endpoint (discovery service) is done with
+     * security mode as none to see the server's capability
+     * and certificate */
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    ck_assert(client != NULL);
+    UA_StatusCode retval = UA_Client_getEndpoints(client, "opc.tcp://localhost:4840",
+                                                  &endpointArraySize, &endpointArray);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(endpointArraySize > 0);
+
+    UA_Array_delete(endpointArray, endpointArraySize,
+                    &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+
+    UA_Client_delete(client);
+
+    /* Secure client initialization */
+    client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->privateKeyPasswordCallback = privateKeyPasswordCallback;
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                         trustList, trustListSize,
+                                         revocationList, revocationListSize);
+    cc->certificateVerification.clear(&cc->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
+    ck_assert(client != NULL);
+
+    for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++) {
+        UA_ByteString_clear(&trustList[deleteCount]);
+    }
+
+    /* Secure client connect */
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    ck_assert_int_eq(numAttempts, 2);
+
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+static Suite* testSuite_encryption(void) {
+    Suite *s = suite_create("Encryption");
+    TCase *tc_encryption = tcase_create("Encryption Aes256Sha256RsaPss security policy");
+    tcase_add_checked_fixture(tc_encryption, setup, teardown);
+#ifdef UA_ENABLE_ENCRYPTION
+    tcase_add_test(tc_encryption, encryption_connect_pem);
+#endif /* UA_ENABLE_ENCRYPTION */
+    suite_add_tcase(s,tc_encryption);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_encryption();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 3b04b0b1d8416c649cad827e84363c4de7af6c16 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Nov 2023 19:59:47 +0100
Subject: [PATCH 1317/1963] refactor(client): Rework the client certificate
 password callback

---
 include/open62541/client.h                    |  21 ++--
 include/open62541/plugin/pki.h                |  25 ++--
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       | 110 ++++++----------
 plugins/crypto/openssl/ua_pki_openssl.c       | 117 +++++-------------
 .../include/open62541/plugin/pki_default.h    |  10 --
 plugins/ua_config_default.c                   |  52 +++++++-
 src/client/ua_client.c                        |   1 -
 .../check_encryption_key_password.c           |  24 ++--
 8 files changed, 150 insertions(+), 210 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 11d46d1725b..ab868cb4fb4 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -26,6 +26,10 @@
 #include <open62541/plugin/eventloop.h>
 #include <open62541/plugin/securitypolicy.h>
 
+/* Forward declarations */
+struct UA_ClientConfig;
+typedef struct UA_ClientConfig UA_ClientConfig;
+
 _UA_BEGIN_DECLS
 
 /**
@@ -67,7 +71,7 @@ _UA_BEGIN_DECLS
  *
  * The :ref:`tutorials` provide a good starting point for this. */
 
-typedef struct {
+struct UA_ClientConfig {
     void *clientContext;       /* User-defined pointer attached to the client */
     const UA_Logger *logging;  /* Plugin for log output */
 
@@ -211,14 +215,15 @@ typedef struct {
     size_t sessionLocaleIdsSize;
 
 #ifdef UA_ENABLE_ENCRYPTION
-    /* If the private key is in PEM format and password protected,
-     * this callback is called during initialization to get the password
-     * to decrypt the private key.
-     * The callback must be set before invoking UA_ClientConfig_setDefaultEncryption(). */
-    UA_PKI_PrivateKeyPasswordCallback privateKeyPasswordCallback;
-    void *privateKeyPasswordCallbackContext;
+    /* If the private key is in PEM format and password protected, this callback
+     * is called during initialization to get the password to decrypt the
+     * private key. The memory containing the password is freed by the client
+     * after use. The callback should be set early, other parts of the client
+     * config setup may depend on it. */
+    UA_StatusCode (*privateKeyPasswordCallback)(UA_ClientConfig *cc,
+                                                UA_ByteString *password);
 #endif
-} UA_ClientConfig;
+};
 
 /**
  * @brief It makes a partial deep copy of the clientconfig. It makes a shallow
diff --git a/include/open62541/plugin/pki.h b/include/open62541/plugin/pki.h
index 6b3a5fbe0b2..ce21872a634 100644
--- a/include/open62541/plugin/pki.h
+++ b/include/open62541/plugin/pki.h
@@ -30,20 +30,6 @@ _UA_BEGIN_DECLS
  * The lifecycle of the plugin is attached to a server or client config. The
  * ``clear`` method is called automatically when the config is destroyed. */
 
-/* Enum and functions for the private key password */
-typedef enum  {
-    UA_PRIVATEKEYPASSWORDSTATE_INITIAL = 0,
-    UA_PRIVATEKEYPASSWORDSTATE_WRONG = 1,
-} UA_PrivateKeyPasswordState;
-
-/* This callback is called when UA_PKI_decryptPemWithPassword is called and detects
- * a password protected private key in the PEM format.
- * If a wrong password is encountered, the callback will be called repeatedly until
- * doRetry is set to false. */
-typedef UA_String (*UA_PKI_PrivateKeyPasswordCallback)(UA_PrivateKeyPasswordState state,
-                                                       UA_Boolean *doRetry,
-                                                       void *context);
-
 struct UA_CertificateVerification;
 typedef struct UA_CertificateVerification UA_CertificateVerification;
 
@@ -75,6 +61,17 @@ struct UA_CertificateVerification {
     const UA_Logger *logging;
 };
 
+/* Decrypt a private key in PEM format using a password. The output is the key
+ * in the binary DER format. Also succeeds if the PEM private key does not
+ * require a password or is already in the DER format. The outDerKey memory is
+ * allocated internally.
+ *
+ * Returns UA_STATUSCODE_BADSECURITYCHECKSFAILED if the password is wrong. */
+UA_EXPORT UA_StatusCode
+UA_PKI_decryptPrivateKey(const UA_ByteString privateKey,
+                         const UA_ByteString password,
+                         UA_ByteString *outDerKey);
+
 _UA_END_DECLS
 
 #endif /* UA_PLUGIN_PKI_H_ */
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index dc155f8c589..42eab2b44dd 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -732,92 +732,58 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
 #endif
 
 UA_StatusCode
-UA_PKI_decryptPemWithPassword(UA_ByteString privateKey, UA_ByteString *derOutput,
-                                  UA_PKI_PrivateKeyPasswordCallback passwordCallback,
-                                     void *callbackContext)
-{
-    if (!derOutput) {
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
+UA_PKI_decryptPrivateKey(const UA_ByteString privateKey,
+                         const UA_ByteString password,
+                         UA_ByteString *outDerKey) {
+    if(!outDerKey)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
-    if (!passwordCallback ||
-       // Magic number for DER encoded keys
-       (privateKey.length > 1 && privateKey.data[0] == 0x30 && privateKey.data[1] == 0x82)) {
-        UA_ByteString_copy(&privateKey, derOutput);
-         return UA_STATUSCODE_GOOD;
-    }
+    /* Already in DER format -> return verbatim */
+    if(privateKey.length > 1 && privateKey.data[0] == 0x30 && privateKey.data[1] == 0x82)
+        return UA_ByteString_copy(&privateKey, outDerKey);
 
+    /* Create a null-terminated string */
     UA_ByteString nullTerminatedKey = UA_mbedTLS_CopyDataFormatAware(&privateKey);
+    if(nullTerminatedKey.length != privateKey.length + 1)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    mbedtls_pk_context key;
-    mbedtls_pk_init(&key);
-    UA_Boolean loadSuccess = false;
-
+    /* Create the private-key context */
+    mbedtls_pk_context ctx;
+    mbedtls_pk_init(&ctx);
 #if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
-    int err = mbedtls_pk_parse_key(&key, nullTerminatedKey.data, nullTerminatedKey.length, NULL, 0);
+    int err = mbedtls_pk_parse_key(&ctx, nullTerminatedKey.data,
+                                   nullTerminatedKey.length,
+                                   password.data, password.length);
 #else
     mbedtls_entropy_context entropy;
     mbedtls_entropy_init(&entropy);
-    int err = mbedtls_pk_parse_key(&key, nullTerminatedKey.data, nullTerminatedKey.length, NULL, 0, mbedtls_entropy_func, &entropy);
-#endif
-
-    if (err) {
-        if (err == MBEDTLS_ERR_PK_PASSWORD_REQUIRED) {
-            UA_PrivateKeyPasswordState state = UA_PRIVATEKEYPASSWORDSTATE_INITIAL;
-             UA_Boolean doRetry = false;
-
-             do {
-                doRetry = false;
-                UA_ByteString password = passwordCallback( state, &doRetry, callbackContext);
-#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
-                err = mbedtls_pk_parse_key(&key, nullTerminatedKey.data, nullTerminatedKey.length, password.data, password.length);
-#else
-                err = mbedtls_pk_parse_key(&key, nullTerminatedKey.data, nullTerminatedKey.length, password.data, password.length,
-                                           mbedtls_entropy_func, &entropy);
-#endif
-                UA_ByteString_clear(&password);
-
-                if (!err) {
-                    loadSuccess = true;
-                    break;
-                }
-
-                state = UA_PRIVATEKEYPASSWORDSTATE_WRONG;
-             } while (doRetry);
-        } else {
-             /* If this happens, there is something wrong with the PK file */
-#if MBEDTLS_VERSION_NUMBER < 0x02060000 || MBEDTLS_VERSION_NUMBER >= 0x03000000
-             mbedtls_entropy_free(&entropy);
-#endif
-             return UA_STATUSCODE_BADINVALIDARGUMENT;
-        }
-    } else {
-        loadSuccess = true;
-    }
-
-    UA_ByteString_clear(&nullTerminatedKey);
-
-#if MBEDTLS_VERSION_NUMBER < 0x02060000 || MBEDTLS_VERSION_NUMBER >= 0x03000000
+    int err = mbedtls_pk_parse_key(&ctx, nullTerminatedKey.data,
+                                   nullTerminatedKey.length,
+                                   password.data, password.length,
+                                   mbedtls_entropy_func, &entropy);
     mbedtls_entropy_free(&entropy);
 #endif
+    UA_ByteString_clear(&nullTerminatedKey);
+    if(err != 0) {
+        mbedtls_pk_free(&ctx);
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    }
 
-    if (loadSuccess) {
-        unsigned char buffer[16000];
-        memset(buffer, 0, sizeof(buffer));
-        err = mbedtls_pk_write_key_der(&key, buffer, sizeof(buffer));
-        mbedtls_pk_free(&key);
-
-        if (err > 0) {
-            UA_ByteString temp = UA_BYTESTRING_NULL;
-            temp.length = err;
-            temp.data = buffer + sizeof(buffer) - err;
-            UA_ByteString_copy(&temp, derOutput);
-        }
+    /* Write the DER-encoded key into a local buffer */
+    unsigned char buf[2 << 13];
+    size_t pos = (size_t)mbedtls_pk_write_key_der(&ctx, buf, sizeof(buf));
 
-        return err > 0 ? UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
+    /* Allocate memory */
+    UA_StatusCode res = UA_ByteString_allocBuffer(outDerKey, pos);
+    if(res != UA_STATUSCODE_GOOD) {
+        mbedtls_pk_free(&ctx);
+        return res;
     }
 
-    return UA_STATUSCODE_BADINTERNALERROR;
+    /* Copy to the output */
+    memcpy(outDerKey->data, &buf[sizeof(buf) - pos], pos);
+    mbedtls_pk_free(&ctx);
+    return UA_STATUSCODE_GOOD;
 }
 
 #endif
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index fa28f72c202..42d5aeda9e6 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -834,95 +834,46 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
 }
 #endif
 
-struct PrivateKeyPasswordCallbackUserData {
-    UA_PKI_PrivateKeyPasswordCallback callback;
-    void *callbackContext;
-    UA_PrivateKeyPasswordState state;
-    UA_Boolean retry;
-    UA_Boolean callbackWasCalled;
-};
-
-static int PrivateKeyPasswordCallback(char *buf, int size, int rwflag, void *userdata) {
+static int
+privateKeyPasswordCallback(char *buf, int size, int rwflag, void *userdata) {
     (void) rwflag;
-
-    struct PrivateKeyPasswordCallbackUserData *context = (struct PrivateKeyPasswordCallbackUserData *) userdata;
-
-    size_t passwordSize = 0;
-
-    if (context && context->callback) {
-        UA_String password = context->callback(context->state, &context->retry, context->callbackContext);
-        context->callbackWasCalled = true;
-
-        if (password.length) {
-            if (password.length <= (size_t) size) {
-                memcpy(buf, password.data, password.length);
-                passwordSize = password.length;
-            }
-            UA_String_clear(&password);
-        }
-    }
-
-    return (int) passwordSize;
+    UA_ByteString *pw = (UA_ByteString*)userdata;
+    if(pw->length <= (size_t)size)
+        memcpy(buf, pw->data, pw->length);
+    return (int)pw->length;
 }
 
-UA_StatusCode UA_PKI_decryptPemWithPassword(UA_ByteString privateKey, UA_ByteString *derOutput,
-                                     UA_PKI_PrivateKeyPasswordCallback passwordCallback,
-                                     void *callbackContext)
-{
-    if (!derOutput) {
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-
-    if (!passwordCallback ||
-       // Magic number for DER encoded keys
-       (privateKey.length > 1 && privateKey.data[0] == 0x30 && privateKey.data[1] == 0x82)) {
-        UA_ByteString_copy(&privateKey, derOutput);
-
-        return UA_STATUSCODE_GOOD;
-    }
-
-    struct PrivateKeyPasswordCallbackUserData userData;
-    userData.callback = passwordCallback;
-    userData.callbackContext = callbackContext;
-    userData.retry = false;
-    userData.state = UA_PRIVATEKEYPASSWORDSTATE_INITIAL;
-
-    do {
-        userData.retry = false;
-        userData.callbackWasCalled = false;
-
-        EVP_PKEY *pkey = NULL;
-
-        BIO *bio = NULL;
-        bio = BIO_new_mem_buf((void *) privateKey.data, (int) privateKey.length);
-        pkey = PEM_read_bio_PrivateKey(bio, NULL, PrivateKeyPasswordCallback, &userData);
-
-        BIO_free(bio);
-
-        if (pkey) {
-            unsigned char *data = NULL;
-            const int numBytes = i2d_PrivateKey(pkey, &data);
-
-            EVP_PKEY_free(pkey);
-
-            if (numBytes > 0) {
-                derOutput->length = (size_t)numBytes;
-                derOutput->data = data;
-                return UA_STATUSCODE_GOOD;
-            }
-
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
+UA_StatusCode
+UA_PKI_decryptPrivateKey(const UA_ByteString privateKey,
+                         const UA_ByteString password,
+                         UA_ByteString *outDerKey) {
+    if(!outDerKey)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
-        if (!userData.callbackWasCalled) {
-            /* If this happens, there is something wrong with the PK file */
-            return UA_STATUSCODE_BADINVALIDARGUMENT;
-        }
+    /* Already in DER format -> return verbatim */
+    if(privateKey.length > 1 && privateKey.data[0] == 0x30 && privateKey.data[1] == 0x82)
+        return UA_ByteString_copy(&privateKey, outDerKey);
+
+    /* Decrypt */
+    BIO *bio = BIO_new_mem_buf((void*)privateKey.data, (int)privateKey.length);
+    EVP_PKEY *pkey = PEM_read_bio_PrivateKey(bio, NULL,
+                                             privateKeyPasswordCallback,
+                                             (void*)(uintptr_t)&password);
+    BIO_free(bio);
+    if(!pkey)
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
 
-        userData.state = UA_PRIVATEKEYPASSWORDSTATE_WRONG;
-    } while(userData.retry);
+    /* Write DER encoded, allocates the new memory */
+    unsigned char *data = NULL;
+    const int numBytes = i2d_PrivateKey(pkey, &data);
+    EVP_PKEY_free(pkey);
+    if(!data)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    return UA_STATUSCODE_BADINTERNALERROR;
+    /* Move to the output */
+    outDerKey->data = data;
+    outDerKey->length = (size_t)numBytes;
+    return UA_STATUSCODE_GOOD;
 }
 
 #endif  /* end of defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_LIBRESSL) */
diff --git a/plugins/include/open62541/plugin/pki_default.h b/plugins/include/open62541/plugin/pki_default.h
index 93fa131acf2..a999fbbe626 100644
--- a/plugins/include/open62541/plugin/pki_default.h
+++ b/plugins/include/open62541/plugin/pki_default.h
@@ -47,16 +47,6 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
 #endif
 #endif
 
-/* Attempts to load privateKey and writes a DER encoded private key to derOutput.
- * If the key is PEM encoded and password protected, the password callback
- * is called to get the password to decrypt the private key.
- * A DER private key input is just copied without any loading operation involved.
- * The content of derOutput must be cleared after use. */
-UA_EXPORT UA_StatusCode
-UA_PKI_decryptPemWithPassword(UA_ByteString privateKey, UA_ByteString *derOutput,
-                              UA_PKI_PrivateKeyPasswordCallback passwordCallback,
-                              void *callbackContext);
-
 #endif
 
 _UA_END_DECLS
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index c577cc136ae..75142889ce8 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -24,6 +24,7 @@
 
 #include "../deps/mp_printf.h"
 
+#include <stdio.h>
 #ifdef _WIN32
 # include <winsock2.h>
 #else
@@ -45,6 +46,29 @@ UA_DURATIONRANGE(UA_Duration min, UA_Duration max) {
     return range;
 }
 
+/* Request the private key password from stdin if no callback is defined */
+#ifdef UA_ENABLE_ENCRYPTION
+static UA_StatusCode
+readPrivateKeyPassword(UA_ByteString *password) {
+    /* Read from stdin */
+    char buf[256];
+    fputs("Private key requires a password. Enter and press return: ", stdout);
+    char *s = fgets(buf, 256, stdin);
+    if(!s)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Get rid of any trailing \n */
+    size_t len = strlen(buf);
+    if(len == 0)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    if(buf[len-1] == '\n')
+        buf[len-1] = 0;
+
+    *password = UA_BYTESTRING_ALLOC(buf);
+    return UA_STATUSCODE_GOOD;
+}
+#endif
+
 UA_Server *
 UA_Server_new(void) {
     UA_ServerConfig config;
@@ -1144,6 +1168,7 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
 }
 
 #ifdef UA_ENABLE_ENCRYPTION
+
 UA_StatusCode
 UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
                                      UA_ByteString localCertificate, UA_ByteString privateKey,
@@ -1167,13 +1192,28 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = sp;
 
+    /* Load the private key and convert to the DER format. Use an empty password
+     * on the first try -- maybe the key does not require a password. */
     UA_ByteString decryptedPrivateKey = UA_BYTESTRING_NULL;
-    const UA_StatusCode keySuccess = UA_PKI_decryptPemWithPassword(privateKey, &decryptedPrivateKey,
-                                                                config->privateKeyPasswordCallback,
-                                                                config->privateKeyPasswordCallbackContext);
-
-    if (keySuccess != UA_STATUSCODE_GOOD)
-        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    UA_ByteString keyPassword = UA_BYTESTRING_NULL;
+    UA_StatusCode keySuccess = UA_PKI_decryptPrivateKey(privateKey, keyPassword,
+                                                        &decryptedPrivateKey);
+
+    /* Get the password and decrypt. An application might want to loop / retry
+     * here to allow users to correct their entry. */
+    if(keySuccess != UA_STATUSCODE_GOOD) {
+        if(config->privateKeyPasswordCallback)
+            keySuccess = config->privateKeyPasswordCallback(config, &keyPassword);
+        else
+            keySuccess = readPrivateKeyPassword(&keyPassword);
+        if(keySuccess != UA_STATUSCODE_GOOD)
+            return keySuccess;
+        keySuccess = UA_PKI_decryptPrivateKey(privateKey, keyPassword, &decryptedPrivateKey);
+        memset(keyPassword.data, 0, keyPassword.length);
+        UA_ByteString_clear(&keyPassword);
+    }
+    if(keySuccess != UA_STATUSCODE_GOOD)
+        return keySuccess;
 
     retval = UA_SecurityPolicy_Basic128Rsa15(&config->securityPolicies[config->securityPoliciesSize],
                                              localCertificate, decryptedPrivateKey, config->logging);
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 53c9e85c5ee..59ce4fe6d06 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -188,7 +188,6 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
 
 #ifdef UA_ENABLE_ENCRYPTION
     config->privateKeyPasswordCallback = NULL;
-    config->privateKeyPasswordCallbackContext = NULL;
 #endif
 }
 
diff --git a/tests/encryption/check_encryption_key_password.c b/tests/encryption/check_encryption_key_password.c
index 510a794c829..2ed1da362ea 100644
--- a/tests/encryption/check_encryption_key_password.c
+++ b/tests/encryption/check_encryption_key_password.c
@@ -26,17 +26,10 @@
 #include "testing_networklayers.h"
 #include "thread_wrapper.h"
 
-static int numAttempts = 0;
-static UA_String privateKeyPasswordCallback(UA_PrivateKeyPasswordState state, bool *doRetry, void *context)
-{
-    if (numAttempts++ == 0) {
-        ck_assert(state == UA_PRIVATEKEYPASSWORDSTATE_INITIAL);
-        *doRetry = true;
-        return UA_STRING_ALLOC("invalid");
-    }
-
-    ck_assert(state == UA_PRIVATEKEYPASSWORDSTATE_WRONG);
-    return UA_STRING_ALLOC("pass1234");
+static UA_StatusCode
+privateKeyPasswordCallback(UA_ClientConfig *cc, UA_ByteString *password) {
+    *password = UA_STRING_ALLOC("pass1234");
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_Server *server;
@@ -143,9 +136,10 @@ START_TEST(encryption_connect_pem) {
     client = UA_Client_new();
     UA_ClientConfig *cc = UA_Client_getConfig(client);
     cc->privateKeyPasswordCallback = privateKeyPasswordCallback;
-    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
-                                         trustList, trustListSize,
-                                         revocationList, revocationListSize);
+    retval = UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                                  trustList, trustListSize,
+                                                  revocationList, revocationListSize);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
@@ -160,8 +154,6 @@ START_TEST(encryption_connect_pem) {
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    ck_assert_int_eq(numAttempts, 2);
-
     UA_Variant val;
     UA_Variant_init(&val);
     UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);

From b30640a98814581ecc5be09da463ac1035a8eb25 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Nov 2023 20:11:27 +0100
Subject: [PATCH 1318/1963] refactor(plugin): Unify code-paths for adding
 server SecurityPolicies

---
 plugins/ua_config_default.c | 85 +++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 46 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 75142889ce8..6862b967d9f 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -869,98 +869,91 @@ UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(UA_ServerConfig *config,
 }
 
 /* Always returns UA_STATUSCODE_GOOD. Logs a warning if policies could not be added. */
-UA_EXPORT UA_StatusCode
-UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
-                                       const UA_ByteString *certificate,
-                                       const UA_ByteString *privateKey) {
+static UA_StatusCode
+addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate,
+                       const UA_ByteString *privateKey, UA_Boolean onlySecure) {
     /* Populate the SecurityPolicies */
     UA_ByteString localCertificate = UA_BYTESTRING_NULL;
     UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(certificate)
         localCertificate = *certificate;
     if(privateKey)
        localPrivateKey = *privateKey;
 
-    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyNone(config, &localCertificate);
+    /* Basic256Sha256 */
+    retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate,
+                                                             &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#None with error code %s",
+                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate, &localPrivateKey);
+    /* Aes256Sha256RsaPss */
+    retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate,
+                                                                 &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate, &localPrivateKey);
+    /* Aes128Sha256RsaOaep */
+    retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate,
+                                                                  &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256 with error code %s",
+                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate, &localPrivateKey);
+    if(onlySecure)
+        return UA_STATUSCODE_GOOD;
+
+    /* None */
+    retval = UA_ServerConfig_addSecurityPolicyNone(config, &localCertificate);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       "Could not add SecurityPolicy#None with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate, &localPrivateKey);
+    /* Basic128Rsa15 */
+    retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate,
+                                                            &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate, &localPrivateKey);
+    /* Basic256 */
+    retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate,
+                                                       &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+                       "Could not add SecurityPolicy#Basic256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
+                                       const UA_ByteString *certificate,
+                                       const UA_ByteString *privateKey) {
+    return addAllSecurityPolicies(config, certificate, privateKey, false);
+}
+
 /* Always returns UA_STATUSCODE_GOOD. Logs a warning if policies could not be added. */
-UA_EXPORT UA_StatusCode
+UA_StatusCode
 UA_ServerConfig_addAllSecureSecurityPolicies(UA_ServerConfig *config,
                                              const UA_ByteString *certificate,
                                              const UA_ByteString *privateKey) {
-    /* Populate the SecurityPolicies */
-    UA_ByteString localCertificate = UA_BYTESTRING_NULL;
-    UA_ByteString localPrivateKey  = UA_BYTESTRING_NULL;
-    if(certificate)
-        localCertificate = *certificate;
-    if(privateKey)
-        localPrivateKey = *privateKey;
-
-    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate, &localPrivateKey);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
+    return addAllSecurityPolicies(config, certificate, privateKey, true);
 
-    retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate, &localPrivateKey);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate, &localPrivateKey);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    return UA_STATUSCODE_GOOD;
 }
 
 UA_EXPORT UA_StatusCode

From 8756e34330c0df81639557a140327d6252404b6a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Nov 2023 20:15:17 +0100
Subject: [PATCH 1319/1963] feat(server): Private key password protection with
 a userland callback

---
 include/open62541/server.h  | 13 +++++++++++++
 plugins/ua_config_default.c | 36 +++++++++++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index a1aa93fa584..7db673d39a0 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -388,6 +388,19 @@ struct UA_ServerConfig {
      * Reverse Connect
      * ^^^^^^^^^^^^^^^ */
     UA_UInt32 reverseReconnectInterval; /* Default is 15000 ms */
+
+    /**
+     * Certificate Password Callback
+     * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
+#ifdef UA_ENABLE_ENCRYPTION
+    /* If the private key is in PEM format and password protected, this callback
+     * is called during initialization to get the password to decrypt the
+     * private key. The memory containing the password is freed by the client
+     * after use. The callback should be set early, other parts of the client
+     * config setup may depend on it. */
+    UA_StatusCode (*privateKeyPasswordCallback)(UA_ServerConfig *sc,
+                                                UA_ByteString *password);
+#endif
 };
 
 void UA_EXPORT
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 6862b967d9f..e48c932ea62 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -881,9 +881,33 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
     if(privateKey)
        localPrivateKey = *privateKey;
 
+    /* Load the private key and convert to the DER format. Use an empty password
+     * on the first try -- maybe the key does not require a password. */
+    UA_ByteString decryptedPrivateKey = UA_BYTESTRING_NULL;
+    UA_ByteString keyPassword = UA_BYTESTRING_NULL;
+    UA_StatusCode keySuccess = UA_PKI_decryptPrivateKey(localPrivateKey, keyPassword,
+                                                        &decryptedPrivateKey);
+
+    /* Get the password and decrypt. An application might want to loop / retry
+     * here to allow users to correct their entry. */
+    if(keySuccess != UA_STATUSCODE_GOOD) {
+        if(config->privateKeyPasswordCallback)
+            keySuccess = config->privateKeyPasswordCallback(config, &keyPassword);
+        else
+            keySuccess = readPrivateKeyPassword(&keyPassword);
+        if(keySuccess != UA_STATUSCODE_GOOD)
+            return keySuccess;
+        keySuccess = UA_PKI_decryptPrivateKey(localPrivateKey, keyPassword,
+                                              &decryptedPrivateKey);
+        memset(keyPassword.data, 0, keyPassword.length);
+        UA_ByteString_clear(&keyPassword);
+    }
+    if(keySuccess != UA_STATUSCODE_GOOD)
+        return keySuccess;
+
     /* Basic256Sha256 */
     retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate,
-                                                             &localPrivateKey);
+                                                             &decryptedPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
@@ -892,7 +916,7 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
 
     /* Aes256Sha256RsaPss */
     retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &localCertificate,
-                                                                 &localPrivateKey);
+                                                                 &decryptedPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
@@ -901,7 +925,7 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
 
     /* Aes128Sha256RsaOaep */
     retval = UA_ServerConfig_addSecurityPolicyAes128Sha256RsaOaep(config, &localCertificate,
-                                                                  &localPrivateKey);
+                                                                  &decryptedPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
@@ -921,7 +945,7 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
 
     /* Basic128Rsa15 */
     retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate,
-                                                            &localPrivateKey);
+                                                            &decryptedPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
@@ -930,13 +954,15 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
 
     /* Basic256 */
     retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate,
-                                                       &localPrivateKey);
+                                                       &decryptedPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
                        "Could not add SecurityPolicy#Basic256 with error code %s",
                        UA_StatusCode_name(retval));
     }
 
+    UA_ByteString_clear(&decryptedPrivateKey);
+
     return UA_STATUSCODE_GOOD;
 }
 

From 71d742354345eb69cfaec907a5c860c8946e249e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Nov 2023 20:42:54 +0100
Subject: [PATCH 1320/1963] feat(core): Add UA_ByteString_memZero to zero-out
 cryptographic secrets

---
 include/open62541/util.h    | 24 ++++++++++++++++++++++--
 plugins/ua_config_default.c | 12 ++++++++----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/include/open62541/util.h b/include/open62541/util.h
index ad1afd71a5a..7401029f054 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -235,8 +235,8 @@ UA_RelativePath_parse(UA_RelativePath *rp, const UA_String str);
 #define UA_PRINTF_STRING_DATA(STRING) (int)(STRING).length, (STRING).data
 
 /**
- * Helper functions for converting data types
- * ------------------------------------------ */
+ * Cryptography Helpers
+ * -------------------- */
 
 /* Compare memory in constant time to mitigate timing attacks.
  * Returns true if ptr1 and ptr2 are equal for length bytes. */
@@ -252,6 +252,26 @@ UA_constantTimeEqual(const void *ptr1, const void *ptr2, size_t length) {
     return !c;
 }
 
+/* Zero-out memory in a way that is not removed by compiler-optimizations. Use
+ * this to ensure cryptographic secrets don't leave traces after the memory was
+ * freed. */
+static UA_INLINE void
+UA_ByteString_memZero(UA_ByteString *bs) {
+#if defined(__STDC_LIB_EXT1__)
+   memset_s(bs->data, bs->length, 0, bs->length);
+#elif defined(_WIN32)
+   SecureZeroMemory(bs->data, bs->length);
+#else
+   volatile unsigned char *volatile ptr =
+       (volatile unsigned char *volatile)bs->data;
+   size_t i = 0;
+   size_t maxLen = bs->length;
+   while(i < maxLen) {
+       ptr[i++] = 0;
+   }
+#endif
+}
+
 _UA_END_DECLS
 
 #endif /* UA_HELPER_H_ */
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index e48c932ea62..a2d1fe0060e 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -899,7 +899,7 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
             return keySuccess;
         keySuccess = UA_PKI_decryptPrivateKey(localPrivateKey, keyPassword,
                                               &decryptedPrivateKey);
-        memset(keyPassword.data, 0, keyPassword.length);
+        UA_ByteString_memZero(&keyPassword);
         UA_ByteString_clear(&keyPassword);
     }
     if(keySuccess != UA_STATUSCODE_GOOD)
@@ -932,8 +932,11 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
                        UA_StatusCode_name(retval));
     }
 
-    if(onlySecure)
+    if(onlySecure) {
+        UA_ByteString_memZero(&decryptedPrivateKey);
+        UA_ByteString_clear(&decryptedPrivateKey);
         return UA_STATUSCODE_GOOD;
+    }
 
     /* None */
     retval = UA_ServerConfig_addSecurityPolicyNone(config, &localCertificate);
@@ -961,8 +964,8 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
                        UA_StatusCode_name(retval));
     }
 
+    UA_ByteString_memZero(&decryptedPrivateKey);
     UA_ByteString_clear(&decryptedPrivateKey);
-
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1228,7 +1231,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
         if(keySuccess != UA_STATUSCODE_GOOD)
             return keySuccess;
         keySuccess = UA_PKI_decryptPrivateKey(privateKey, keyPassword, &decryptedPrivateKey);
-        memset(keyPassword.data, 0, keyPassword.length);
+        UA_ByteString_memZero(&keyPassword);
         UA_ByteString_clear(&keyPassword);
     }
     if(keySuccess != UA_STATUSCODE_GOOD)
@@ -1285,6 +1288,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
                        UA_StatusCode_name(retval));
     }
 
+    UA_ByteString_memZero(&decryptedPrivateKey);
     UA_ByteString_clear(&decryptedPrivateKey);
 
     if(config->securityPoliciesSize == 0) {

From d66c55cea53c4bd32f0e461fc6916c028de0d199 Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Tue, 28 Nov 2023 12:32:48 +0100
Subject: [PATCH 1321/1963] Don't ask for a password for an empty private key
 ByteString

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c |  5 +++++
 plugins/crypto/openssl/ua_pki_openssl.c |  5 +++++
 plugins/ua_config_default.c             | 14 ++++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 42eab2b44dd..807043f006d 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -738,6 +738,11 @@ UA_PKI_decryptPrivateKey(const UA_ByteString privateKey,
     if(!outDerKey)
         return UA_STATUSCODE_BADINTERNALERROR;
 
+    if (privateKey.length == 0) {
+        *outDerKey = UA_BYTESTRING_NULL;
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
     /* Already in DER format -> return verbatim */
     if(privateKey.length > 1 && privateKey.data[0] == 0x30 && privateKey.data[1] == 0x82)
         return UA_ByteString_copy(&privateKey, outDerKey);
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 42d5aeda9e6..6289f45ca4f 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -850,6 +850,11 @@ UA_PKI_decryptPrivateKey(const UA_ByteString privateKey,
     if(!outDerKey)
         return UA_STATUSCODE_BADINTERNALERROR;
 
+    if (privateKey.length == 0) {
+        *outDerKey = UA_BYTESTRING_NULL;
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+    }
+
     /* Already in DER format -> return verbatim */
     if(privateKey.length > 1 && privateKey.data[0] == 0x30 && privateKey.data[1] == 0x82)
         return UA_ByteString_copy(&privateKey, outDerKey);
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index a2d1fe0060e..5d8d12a357a 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -885,8 +885,11 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
      * on the first try -- maybe the key does not require a password. */
     UA_ByteString decryptedPrivateKey = UA_BYTESTRING_NULL;
     UA_ByteString keyPassword = UA_BYTESTRING_NULL;
-    UA_StatusCode keySuccess = UA_PKI_decryptPrivateKey(localPrivateKey, keyPassword,
-                                                        &decryptedPrivateKey);
+    UA_StatusCode keySuccess = UA_STATUSCODE_GOOD;
+
+    if (privateKey && privateKey->length > 0)
+        keySuccess = UA_PKI_decryptPrivateKey(localPrivateKey, keyPassword,
+                                              &decryptedPrivateKey);
 
     /* Get the password and decrypt. An application might want to loop / retry
      * here to allow users to correct their entry. */
@@ -1218,8 +1221,11 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
      * on the first try -- maybe the key does not require a password. */
     UA_ByteString decryptedPrivateKey = UA_BYTESTRING_NULL;
     UA_ByteString keyPassword = UA_BYTESTRING_NULL;
-    UA_StatusCode keySuccess = UA_PKI_decryptPrivateKey(privateKey, keyPassword,
-                                                        &decryptedPrivateKey);
+    UA_StatusCode keySuccess = UA_STATUSCODE_GOOD;
+
+    if (privateKey.length > 0)
+        keySuccess = UA_PKI_decryptPrivateKey(privateKey, keyPassword,
+                                              &decryptedPrivateKey);
 
     /* Get the password and decrypt. An application might want to loop / retry
      * here to allow users to correct their entry. */

From 4f7f8794c2e2c191097e82ff51382c82fd8925d4 Mon Sep 17 00:00:00 2001
From: Jannis Voelker <jannis.voelker@basyskom.com>
Date: Tue, 28 Nov 2023 16:11:55 +0100
Subject: [PATCH 1322/1963] Fix warning when building amalgamation as C++ with
 -Wextra

warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
---
 include/open62541/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/util.h b/include/open62541/util.h
index 7401029f054..7fe3b22d0c2 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -263,7 +263,7 @@ UA_ByteString_memZero(UA_ByteString *bs) {
    SecureZeroMemory(bs->data, bs->length);
 #else
    volatile unsigned char *volatile ptr =
-       (volatile unsigned char *volatile)bs->data;
+       (volatile unsigned char *)bs->data;
    size_t i = 0;
    size_t maxLen = bs->length;
    while(i < maxLen) {

From 1114b8ef8433ddc384359436908c9c455641e7dc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 30 Nov 2023 11:13:19 +0100
Subject: [PATCH 1323/1963] refactor(examples): Move CTT example to the ctt
 repository

---
 examples/CMakeLists.txt |   10 -
 examples/server_ctt.c   | 1543 ---------------------------------------
 2 files changed, 1553 deletions(-)
 delete mode 100644 examples/server_ctt.c

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index b16455d4f5a..042c59a179e 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -110,16 +110,6 @@ if(UA_ENABLE_SUBSCRIPTIONS_EVENTS)
   endif()
 endif()
 
-##################
-# Example Server #
-##################
-
-add_example(server_ctt server_ctt.c)
-
-install(PROGRAMS $<TARGET_FILE:server_ctt>
-        DESTINATION bin
-        RENAME ua_server_ctt.exe)
-
 ##################
 # Example Client #
 ##################
diff --git a/examples/server_ctt.c b/examples/server_ctt.c
deleted file mode 100644
index 70321bce694..00000000000
--- a/examples/server_ctt.c
+++ /dev/null
@@ -1,1543 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
- *
- * Copyright 2019 (c) Kalycito Infotech Private Limited
- * Copyright 2019 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
- */
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS /* disable fopen deprication warning in msvs */
-#endif
-
-#include <open62541/server.h>
-#include <open62541/plugin/log_stdout.h>
-#include <open62541/server_config_default.h>
-#include <open62541/plugin/pki_default.h>
-#include <open62541/plugin/accesscontrol_default.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "common.h"
-#include "open62541/client.h"
-#include "open62541/client_config_default.h"
-
-#define MAX_OPERATION_LIMIT 10000
-
-/* This server is configured to the Compliance Testing Tools (CTT) against. The
- * corresponding CTT configuration is available at
- * https://github.com/open62541/open62541-ctt */
-
-/* Global variables also used by the discovery client */
-static UA_ByteString certificate;
-#ifdef UA_ENABLE_ENCRYPTION
-static UA_ByteString privateKey;
-#endif
-
-static const size_t usernamePasswordsSize = 2;
-static UA_UsernamePasswordLogin usernamePasswords[2] = {
-    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
-    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password1")}};
-
-static const UA_NodeId baseDataVariableType = {0, UA_NODEIDTYPE_NUMERIC, {UA_NS0ID_BASEDATAVARIABLETYPE}};
-static const UA_NodeId accessDenied = {1, UA_NODEIDTYPE_NUMERIC, {1337}};
-
-/* Custom AccessControl policy that disallows access to one specific node */
-static UA_Byte
-getUserAccessLevel_disallowSpecific(UA_Server *server, UA_AccessControl *ac,
-                                    const UA_NodeId *sessionId, void *sessionContext,
-                                    const UA_NodeId *nodeId, void *nodeContext) {
-    if(UA_NodeId_equal(nodeId, &accessDenied))
-        return 0x00;
-    return 0xFF;
-}
-
-/* Datasource Example */
-static UA_StatusCode
-readTimeData(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_DateTime currentTime = UA_DateTime_now();
-    UA_Variant_setScalarCopy(&value->value, &currentTime, &UA_TYPES[UA_TYPES_DATETIME]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = currentTime;
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomBoolData(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_Boolean toggle = !((UA_UInt32_random() % 10 ) % 2);
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomInt16Data(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_Int16 toggle = (UA_Int16)UA_UInt32_random();
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_INT16]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomInt32Data(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_Int32 toggle = (UA_Int32)UA_UInt32_random();
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_INT32]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomInt64Data(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-    value->hasStatus = true;
-    value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-    return UA_STATUSCODE_GOOD;
-    }
-        UA_Int64 toggle = (UA_Int64)UA_UInt32_random();
-        UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_INT64]);
-        value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomUInt16Data(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_UInt16 toggle = (UA_UInt16)UA_UInt32_random();
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_UINT16]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomUInt32Data(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_UInt32 toggle = UA_UInt32_random();
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_UINT32]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomUInt64Data(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_UInt64 toggle = UA_UInt32_random();
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_UINT64]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomStringData (UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    char randomName[32];
-    sprintf(randomName, "Random%u", UA_UInt32_random());
-    UA_String toggle = UA_STRING(randomName);
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_STRING]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-   return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomFloatData (UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_Float toggle = (UA_Float)UA_UInt32_random();
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_FLOAT]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-   return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-readRandomDoubleData (UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    UA_Double toggle = (UA_Double)UA_UInt32_random();
-    UA_Variant_setScalarCopy(&value->value, &toggle, &UA_TYPES[UA_TYPES_DOUBLE]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-   return UA_STATUSCODE_GOOD;
-}
-static UA_StatusCode
-readByteString (UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *nodeId, void *nodeContext,
-             UA_Boolean sourceTimeStamp,
-             const UA_NumericRange *range, UA_DataValue *value) {
-    if(range) {
-        value->hasStatus = true;
-        value->status = UA_STATUSCODE_BADINDEXRANGEINVALID;
-        return UA_STATUSCODE_GOOD;
-    }
-    char randomName[32];
-    sprintf(randomName, "%u%u", UA_UInt32_random(), UA_UInt32_random());
-    UA_ByteString randomByte = UA_BYTESTRING(randomName);
-    UA_Variant_setScalarCopy(&value->value, &randomByte, &UA_TYPES[UA_TYPES_BYTESTRING]);
-    value->hasValue = true;
-    if(sourceTimeStamp) {
-        value->hasSourceTimestamp = true;
-        value->sourceTimestamp = UA_DateTime_now();
-    }
-   return UA_STATUSCODE_GOOD;
-}
-
-#ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
-static UA_NodeId eventId;
-static void
-writeEventTrigger(UA_Server *server, const UA_NodeId *sessionId,
-                  void *sessionContext, const UA_NodeId *nodeId,
-                  void *nodeContext, const UA_NumericRange *range,
-                  const UA_DataValue *data) {
-    UA_Server_triggerEvent(server, eventId,
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER),
-                           NULL, false);
-}
-#endif
-
-/* Method Node Example */
-#ifdef UA_ENABLE_METHODCALLS
-
-static UA_StatusCode
-helloWorld(UA_Server *server,
-           const UA_NodeId *sessionId, void *sessionContext,
-           const UA_NodeId *methodId, void *methodContext,
-           const UA_NodeId *objectId, void *objectContext,
-           size_t inputSize, const UA_Variant *input,
-           size_t outputSize, UA_Variant *output) {
-    /* input is a scalar string (checked by the server) */
-    UA_String *name = (UA_String *)input[0].data;
-    UA_String hello = UA_STRING("Hello ");
-    UA_String greet;
-    greet.length = hello.length + name->length;
-    greet.data = (UA_Byte *)UA_malloc(greet.length);
-    memcpy(greet.data, hello.data, hello.length);
-    memcpy(greet.data + hello.length, name->data, name->length);
-    UA_Variant_setScalarCopy(output, &greet, &UA_TYPES[UA_TYPES_STRING]);
-    UA_String_clear(&greet);
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-noargMethod(UA_Server *server,
-            const UA_NodeId *sessionId, void *sessionContext,
-            const UA_NodeId *methodId, void *methodContext,
-            const UA_NodeId *objectId, void *objectContext,
-            size_t inputSize, const UA_Variant *input,
-            size_t outputSize, UA_Variant *output) {
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-outargMethod(UA_Server *server,
-             const UA_NodeId *sessionId, void *sessionContext,
-             const UA_NodeId *methodId, void *methodContext,
-             const UA_NodeId *objectId, void *objectContext,
-             size_t inputSize, const UA_Variant *input,
-             size_t outputSize, UA_Variant *output) {
-    UA_Int32 out = 42;
-    UA_Variant_setScalarCopy(output, &out, &UA_TYPES[UA_TYPES_INT32]);
-    return UA_STATUSCODE_GOOD;
-}
-
-#endif
-
-static void
-setInformationModel(UA_Server *server) {
-    /* Workaround for compatibility between the CTT 1.04. information model
-     * check and the 1.05. nodeset, which is loaded in our default configuration.
-     * With 1.05. the fields "ConditionSubClassId" and "ConditionSubClassName"
-     * are now optional children of the "BaseEventType". Therefore, the fields are
-     * not referenced in the "ConditionType" since this type inherit the fields
-     * from the "BaseEventType". For compatibility, the references are created
-     * manually */
-    UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE_CONDITIONSUBCLASSID),
-                           true);
-    UA_Server_addReference(server, UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
-                           UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE_CONDITIONSUBCLASSNAME),
-                           true);
-
-    /* add a custom reference type */
-    UA_ReferenceTypeAttributes myRef = UA_ReferenceTypeAttributes_default;
-    myRef.description = UA_LOCALIZEDTEXT("", "my organize");
-    myRef.displayName = UA_LOCALIZEDTEXT("", "myOrganize");
-    const UA_QualifiedName myRefName = UA_QUALIFIEDNAME(1, "myOrganize");
-    const UA_NodeId myRefNodeId = UA_NODEID_STRING(1, "myOrganize");
-    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
-    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE);
-    UA_Server_addReferenceTypeNode(server, myRefNodeId, parentNodeId, parentReferenceNodeId,
-                                   myRefName, myRef, NULL, NULL);
-
-    /* add a static variable node to the server */
-    UA_VariableAttributes myVar = UA_VariableAttributes_default;
-    myVar.description = UA_LOCALIZEDTEXT("en-US", "the answer");
-    myVar.displayName = UA_LOCALIZEDTEXT("en-US", "the answer");
-    myVar.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
-    myVar.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
-    myVar.valueRank = UA_VALUERANK_SCALAR;
-    UA_Int32 myInteger = 42;
-    UA_Variant_setScalar(&myVar.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
-    const UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, "the answer");
-    const UA_NodeId myIntegerNodeId = UA_NODEID_STRING(1, "the.answer");
-    parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
-    parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
-    UA_Server_addVariableNode(server, myIntegerNodeId, parentNodeId, parentReferenceNodeId,
-                              myIntegerName, baseDataVariableType, myVar, NULL, NULL);
-
-    /* add a static variable that is readable but not writable*/
-    myVar = UA_VariableAttributes_default;
-    myVar.description = UA_LOCALIZEDTEXT("en-US", "the answer - not readable");
-    myVar.displayName = UA_LOCALIZEDTEXT("en-US", "the answer - not readable");
-    myVar.accessLevel = UA_ACCESSLEVELMASK_WRITE;
-    myVar.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
-    myVar.valueRank = UA_VALUERANK_SCALAR;
-    UA_Variant_setScalar(&myVar.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
-    const UA_QualifiedName myInteger2Name = UA_QUALIFIEDNAME(1, "the answer - not readable");
-    const UA_NodeId myInteger2NodeId = UA_NODEID_STRING(1, "the.answer.no.read");
-    UA_Server_addVariableNode(server, myInteger2NodeId, parentNodeId, parentReferenceNodeId,
-                              myInteger2Name, baseDataVariableType, myVar, NULL, NULL);
-
-    /* add a variable that is not readable or writable for the current user */
-    myVar = UA_VariableAttributes_default;
-    myVar.description = UA_LOCALIZEDTEXT("en-US", "the answer - not current user");
-    myVar.displayName = UA_LOCALIZEDTEXT("en-US", "the answer - not current user");
-    myVar.accessLevel = UA_ACCESSLEVELMASK_WRITE;
-    myVar.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
-    myVar.valueRank = UA_VALUERANK_SCALAR;
-    myVar.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
-    UA_Variant_setScalar(&myVar.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
-    const UA_QualifiedName accessDeniedName = UA_QUALIFIEDNAME(1, "the answer - not current user");
-    UA_Server_addVariableNode(server, accessDenied, parentNodeId, parentReferenceNodeId,
-                              accessDeniedName, baseDataVariableType, myVar, NULL, NULL);
-
-    /* add a variable with the datetime data source */
-    UA_DataSource dateDataSource;
-    dateDataSource.read = readTimeData;
-    dateDataSource.write = NULL;
-    UA_VariableAttributes v_attr = UA_VariableAttributes_default;
-    v_attr.description = UA_LOCALIZEDTEXT("en-US", "current time");
-    v_attr.displayName = UA_LOCALIZEDTEXT("en-US", "current time");
-    v_attr.accessLevel = UA_ACCESSLEVELMASK_READ;
-    v_attr.dataType = UA_TYPES[UA_TYPES_DATETIME].typeId;
-    v_attr.valueRank = UA_VALUERANK_SCALAR;
-    const UA_QualifiedName dateName = UA_QUALIFIEDNAME(1, "current time");
-    UA_Server_addDataSourceVariableNode(server, UA_NODEID_NUMERIC(1, 2345),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
-                                        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), dateName,
-                                        baseDataVariableType, v_attr, dateDataSource, NULL, NULL);
-
-    /* add a bytestring variable with some content */
-    myVar = UA_VariableAttributes_default;
-    myVar.description = UA_LOCALIZEDTEXT("", "");
-    myVar.displayName = UA_LOCALIZEDTEXT("", "example bytestring");
-    myVar.dataType = UA_TYPES[UA_TYPES_BYTESTRING].typeId;
-    myVar.valueRank = UA_VALUERANK_SCALAR;
-    myVar.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
-    UA_ByteString myByteString = UA_BYTESTRING("test123\0test123");
-    UA_Variant_setScalar(&myVar.value, &myByteString, &UA_TYPES[UA_TYPES_BYTESTRING]);
-    const UA_QualifiedName byteStringName = UA_QUALIFIEDNAME(1, "example bytestring");
-    UA_Server_addVariableNode(server, UA_NODEID_STRING(1, "myByteString"),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), byteStringName,
-                              baseDataVariableType, myVar, NULL, NULL);
-
-    /* Add HelloWorld method to the server */
-#ifdef UA_ENABLE_METHODCALLS
-    /* Method with IO Arguments */
-    UA_Argument inputArguments;
-    UA_Argument_init(&inputArguments);
-    inputArguments.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
-    inputArguments.description = UA_LOCALIZEDTEXT("en-US", "Say your name");
-    inputArguments.name = UA_STRING("Name");
-    inputArguments.valueRank = UA_VALUERANK_SCALAR; /* scalar argument */
-
-    UA_Argument outputArguments;
-    UA_Argument_init(&outputArguments);
-    outputArguments.arrayDimensionsSize = 0;
-    outputArguments.arrayDimensions = NULL;
-    outputArguments.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
-    outputArguments.description = UA_LOCALIZEDTEXT("en-US", "Receive a greeting");
-    outputArguments.name = UA_STRING("greeting");
-    outputArguments.valueRank = UA_VALUERANK_SCALAR;
-
-    UA_MethodAttributes addmethodattributes = UA_MethodAttributes_default;
-    addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "Hello World");
-    addmethodattributes.executable = true;
-    addmethodattributes.userExecutable = true;
-    UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, 62541),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                            UA_QUALIFIEDNAME(1, "hello_world"), addmethodattributes,
-                            &helloWorld, /* callback of the method node */
-                            1, &inputArguments, 1, &outputArguments, NULL, NULL);
-#endif
-
-    /* Add folders for demo information model */
-#define DEMOID 50000
-#define SCALARID 50001
-#define ARRAYID 50002
-#define MATRIXID 50003
-#define DEPTHID 50004
-#define SCALETESTID 40005
-#define DOUBLEREFID 40006
-
-    UA_ObjectAttributes object_attr = UA_ObjectAttributes_default;
-    object_attr.description = UA_LOCALIZEDTEXT("en-US", "Demo");
-    object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Demo");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Demo"),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
-
-    object_attr.description = UA_LOCALIZEDTEXT("en-US", "Scalar");
-    object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Scalar");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, SCALARID),
-                            UA_NODEID_NUMERIC(1, DEMOID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                            UA_QUALIFIEDNAME(1, "Scalar"),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
-
-    object_attr.description = UA_LOCALIZEDTEXT("en-US", "Array");
-    object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Array");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, ARRAYID),
-                            UA_NODEID_NUMERIC(1, DEMOID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                            UA_QUALIFIEDNAME(1, "Array"),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
-
-    object_attr.description = UA_LOCALIZEDTEXT("en-US", "Matrix");
-    object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Matrix");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, MATRIXID), UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Matrix"),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
-
-    object_attr.description = UA_LOCALIZEDTEXT("en-US", "ScaleTest");
-    object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "ScaleTest");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, SCALETESTID), UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "ScaleTest"),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
-
-    /* Reference to this node from the "Demo" object both with "Organizes" and
-     * the "myOrganizes" subtype */
-    object_attr.description = UA_LOCALIZEDTEXT("en-US", "Double Refs");
-    object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Double Refs");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, DOUBLEREFID), UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Double Refs"),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
-    UA_Server_addReference(server, UA_NODEID_NUMERIC(1, DEMOID),
-                           UA_NODEID_STRING(1, "myOrganize"),
-                           UA_EXPANDEDNODEID_NUMERIC(1, DOUBLEREFID), true);
-
-    /* Fill demo nodes for each type*/
-    UA_UInt32 matrixDims[2] = {5, 5};
-    UA_UInt32 id = 51000; // running id in namespace 0
-    for(UA_UInt32 type = 0; type < UA_TYPES_DIAGNOSTICINFO; type++) {
-        if(type == UA_TYPES_VARIANT || type == UA_TYPES_DIAGNOSTICINFO || type == UA_TYPES_EXTENSIONOBJECT || type == UA_TYPES_DATAVALUE)
-            continue;
-
-        UA_VariableAttributes attr = UA_VariableAttributes_default;
-        attr.dataType = UA_TYPES[type].typeId;
-#ifndef UA_ENABLE_TYPEDESCRIPTION
-        char name[32];
-        sprintf(name, "%02d", type);
-        attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
-        UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME(1, name);
-#else
-        attr.displayName = UA_LOCALIZEDTEXT_ALLOC("en-US", UA_TYPES[type].typeName);
-        UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME_ALLOC(1, UA_TYPES[type].typeName);
-#endif
-        attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
-        attr.writeMask = UA_WRITEMASK_DISPLAYNAME | UA_WRITEMASK_DESCRIPTION;
-        attr.userWriteMask = UA_WRITEMASK_DISPLAYNAME | UA_WRITEMASK_DESCRIPTION;
-
-        /* add a scalar node for every built-in type */
-        attr.valueRank = UA_VALUERANK_SCALAR;
-        void *value = UA_new(&UA_TYPES[type]);
-        UA_Variant_setScalar(&attr.value, value, &UA_TYPES[type]);
-        UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, ++id),
-                                  UA_NODEID_NUMERIC(1, SCALARID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                                  qualifiedName, baseDataVariableType, attr, NULL, NULL);
-        UA_Variant_clear(&attr.value);
-
-        /* add an array node for every built-in type */
-        UA_UInt32 arrayDims = 0;
-        attr.valueRank = UA_VALUERANK_ONE_DIMENSION;
-        attr.arrayDimensions = &arrayDims;
-        attr.arrayDimensionsSize = 1;
-        UA_Variant_setArray(&attr.value, UA_Array_new(10, &UA_TYPES[type]), 10, &UA_TYPES[type]);
-        UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, ++id), UA_NODEID_NUMERIC(1, ARRAYID),
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), qualifiedName,
-                                  baseDataVariableType, attr, NULL, NULL);
-        UA_Variant_clear(&attr.value);
-
-        /* add an matrix node for every built-in type */
-        attr.valueRank = UA_VALUERANK_TWO_DIMENSIONS;
-        attr.arrayDimensions = matrixDims;
-        attr.arrayDimensionsSize = 2;
-        void *myMultiArray = UA_Array_new(25, &UA_TYPES[type]);
-        attr.value.arrayDimensions = (UA_UInt32 *)UA_Array_new(2, &UA_TYPES[UA_TYPES_INT32]);
-        attr.value.arrayDimensions[0] = 5;
-        attr.value.arrayDimensions[1] = 5;
-        attr.value.arrayDimensionsSize = 2;
-        attr.value.arrayLength = 25;
-        attr.value.data = myMultiArray;
-        attr.value.type = &UA_TYPES[type];
-        UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, ++id),
-                                  UA_NODEID_NUMERIC(1, MATRIXID),
-                                  UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), qualifiedName,
-                                  baseDataVariableType, attr, NULL, NULL);
-        UA_Variant_clear(&attr.value);
-#ifdef UA_ENABLE_TYPEDESCRIPTION
-        UA_LocalizedText_clear(&attr.displayName);
-        UA_QualifiedName_clear(&qualifiedName);
-#endif
-    }
-
-    /* Add Integer and UInteger variables */
-    UA_VariableAttributes iattr = UA_VariableAttributes_default;
-    iattr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_INTEGER);
-    iattr.displayName = UA_LOCALIZEDTEXT("en-US", "Integer");
-    iattr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
-    iattr.writeMask = UA_WRITEMASK_DISPLAYNAME | UA_WRITEMASK_DESCRIPTION;
-    iattr.userWriteMask = UA_WRITEMASK_DISPLAYNAME | UA_WRITEMASK_DESCRIPTION;
-    iattr.valueRank = UA_VALUERANK_SCALAR;
-    UA_QualifiedName iQualifiedName = UA_QUALIFIEDNAME(1, "integer");
-    UA_Server_addVariableNode(server, UA_NODEID_STRING(1, "integer"),
-                              UA_NODEID_NUMERIC(1, SCALARID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                              iQualifiedName, baseDataVariableType, iattr, NULL, NULL);
-
-    iattr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_UINTEGER);
-    iattr.displayName = UA_LOCALIZEDTEXT("en-US", "UInteger");
-    UA_QualifiedName uQualifiedName = UA_QUALIFIEDNAME(1, "uinteger");
-    UA_Server_addVariableNode(server, UA_NODEID_STRING(1, "uinteger"),
-                              UA_NODEID_NUMERIC(1, SCALARID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                              uQualifiedName, baseDataVariableType, iattr, NULL, NULL);
-    UA_Variant_clear(&iattr.value);
-
-    /* Hierarchy of depth 10 for CTT testing with forward and inverse references */
-    /* Enter node "depth 9" in CTT configuration - Project->Settings->Server
-       Test->NodeIds->Paths->Starting Node 1 */
-    object_attr.description = UA_LOCALIZEDTEXT("en-US", "DepthDemo");
-    object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "DepthDemo");
-    UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, DEPTHID), UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "DepthDemo"),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
-
-    id = DEPTHID; // running id in namespace 0 - Start with Matrix NODE
-    for(UA_UInt32 i = 1; i <= 20; i++) {
-        char name[32];
-        sprintf(name, "depth%u", i);
-        object_attr.description = UA_LOCALIZEDTEXT("en-US", name);
-        object_attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
-        UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, id + i),
-                                UA_NODEID_NUMERIC(1, i == 1 ? DEPTHID : id + i - 1),
-                                UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                                UA_QUALIFIEDNAME(1, name),
-                                UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
-    }
-
-    /* Scale Test: 100 nodes of each type */
-    int scale_i = 0;
-    UA_UInt32 scale_nodeid = 43000;
-    for(UA_UInt32 type = 0; type < 15; type++) {
-        if(type == UA_TYPES_SBYTE || type == UA_TYPES_BYTE
-                || type == UA_TYPES_GUID)
-            continue;
-
-        UA_DataSource scaleTestDataSource;
-        scaleTestDataSource.read = NULL;
-        scaleTestDataSource.write = NULL;
-        UA_VariableAttributes attr = UA_VariableAttributes_default;
-        attr.dataType = UA_TYPES[type].typeId;
-        attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
-        attr.writeMask = UA_WRITEMASK_DISPLAYNAME | UA_WRITEMASK_DESCRIPTION;
-        attr.userWriteMask = UA_WRITEMASK_DISPLAYNAME | UA_WRITEMASK_DESCRIPTION;
-        attr.valueRank = UA_VALUERANK_SCALAR;
-        switch(UA_TYPES[type].typeKind) {
-            case UA_DATATYPEKIND_BOOLEAN: {
-                scaleTestDataSource.read = readRandomBoolData;
-                break;
-            }
-            case UA_DATATYPEKIND_INT16: {
-                scaleTestDataSource.read = readRandomInt16Data;
-                break;
-            }
-            case UA_DATATYPEKIND_UINT16: {
-                scaleTestDataSource.read = readRandomUInt16Data;
-                break;
-            }
-            case UA_DATATYPEKIND_INT32: {
-                scaleTestDataSource.read = readRandomInt32Data;
-                break;
-            }
-            case UA_DATATYPEKIND_UINT32: {
-                scaleTestDataSource.read = readRandomUInt32Data;
-                break;
-            }
-            case UA_DATATYPEKIND_INT64: {
-                scaleTestDataSource.read = readRandomInt64Data;
-                break;
-            }
-            case UA_DATATYPEKIND_UINT64: {
-                scaleTestDataSource.read = readRandomUInt64Data;
-                break;
-            }
-            case UA_DATATYPEKIND_STRING: {
-                scaleTestDataSource.read = readRandomStringData;
-                break;
-            }
-            case UA_DATATYPEKIND_FLOAT: {
-                scaleTestDataSource.read = readRandomFloatData;
-                break;
-            }
-            case UA_DATATYPEKIND_DOUBLE: {
-                scaleTestDataSource.read = readRandomDoubleData;
-                break;
-            }
-            case UA_DATATYPEKIND_DATETIME:
-                scaleTestDataSource.read = readTimeData;
-                break;
-            case UA_DATATYPEKIND_BYTESTRING:
-                scaleTestDataSource.read = readByteString;
-                break;
-            default:
-                break;
-        }
-
-        for(size_t j = 0; j < 100; j++) {
-            char name[32];
-#ifndef UA_ENABLE_TYPEDESCRIPTION
-            sprintf(name, "%02d - %i", type, scale_i);
-#else
-            sprintf(name, "%s - %i", UA_TYPES[type].typeName, scale_i);
-#endif
-            attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
-            UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME(1, name);
-            UA_Server_addDataSourceVariableNode(server, UA_NODEID_NUMERIC(1, ++scale_nodeid),
-                                      UA_NODEID_NUMERIC(1, SCALETESTID),
-                                      UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),qualifiedName,
-                                      baseDataVariableType, attr, scaleTestDataSource, NULL, NULL);
-            scale_i++;
-        }
-        UA_Variant_clear(&attr.value);
-    }
-
-    /* Add the variable to some more places to get a node with three inverse references for the CTT */
-    UA_ExpandedNodeId answer_nodeid = UA_EXPANDEDNODEID_STRING(1, "the.answer");
-    UA_Server_addReference(server, UA_NODEID_NUMERIC(1, DEMOID),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), answer_nodeid, true);
-    UA_Server_addReference(server, UA_NODEID_NUMERIC(1, SCALARID),
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), answer_nodeid, true);
-
-    /* Example for manually setting an attribute within the server */
-    UA_LocalizedText objectsName = UA_LOCALIZEDTEXT("en-US", "Objects");
-    UA_Server_writeDisplayName(server, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), objectsName);
-
-#define NOARGID     60000
-#define INARGID     60001
-#define OUTARGID    60002
-#define INOUTARGID  60003
-#ifdef UA_ENABLE_METHODCALLS
-    /* adding some more method nodes to pass CTT */
-    /* Method without arguments */
-    addmethodattributes = UA_MethodAttributes_default;
-    addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "noarg");
-    addmethodattributes.executable = true;
-    addmethodattributes.userExecutable = true;
-    UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, NOARGID),
-                            UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                            UA_QUALIFIEDNAME(1, "noarg"), addmethodattributes,
-                            &noargMethod, /* callback of the method node */
-                            0, NULL, 0, NULL, NULL, NULL);
-
-    /* Method with in arguments */
-    addmethodattributes = UA_MethodAttributes_default;
-    addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "inarg");
-    addmethodattributes.executable = true;
-    addmethodattributes.userExecutable = true;
-
-    UA_Argument_init(&inputArguments);
-    inputArguments.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
-    inputArguments.description = UA_LOCALIZEDTEXT("en-US", "Input");
-    inputArguments.name = UA_STRING("Input");
-    inputArguments.valueRank = UA_VALUERANK_SCALAR; //uaexpert will crash if set to 0 ;)
-
-    UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, INARGID),
-                            UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                            UA_QUALIFIEDNAME(1, "noarg"), addmethodattributes,
-                            &noargMethod, /* callback of the method node */
-                            1, &inputArguments, 0, NULL, NULL, NULL);
-
-    /* Method with out arguments */
-    addmethodattributes = UA_MethodAttributes_default;
-    addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "outarg");
-    addmethodattributes.executable = true;
-    addmethodattributes.userExecutable = true;
-
-    UA_Argument_init(&outputArguments);
-    outputArguments.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
-    outputArguments.description = UA_LOCALIZEDTEXT("en-US", "Output");
-    outputArguments.name = UA_STRING("Output");
-    outputArguments.valueRank = UA_VALUERANK_SCALAR;
-
-    UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, OUTARGID),
-                            UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                            UA_QUALIFIEDNAME(1, "outarg"), addmethodattributes,
-                            &outargMethod, /* callback of the method node */
-                            0, NULL, 1, &outputArguments, NULL, NULL);
-
-    /* Method with inout arguments */
-    addmethodattributes = UA_MethodAttributes_default;
-    addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "inoutarg");
-    addmethodattributes.executable = true;
-    addmethodattributes.userExecutable = true;
-
-    UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, INOUTARGID),
-                            UA_NODEID_NUMERIC(1, DEMOID),
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
-                            UA_QUALIFIEDNAME(1, "inoutarg"), addmethodattributes,
-                            &outargMethod, /* callback of the method node */
-                            1, &inputArguments, 1, &outputArguments, NULL, NULL);
-#endif
-
-#ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
-    /* Create the reusable event instance */
-    UA_Server_createEvent(server, UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE), &eventId);
-    UA_UInt16 eventSeverity = 500;
-    UA_Server_writeObjectProperty_scalar(server, eventId,
-                                         UA_QUALIFIEDNAME(0, "Severity"),
-                                         &eventSeverity, &UA_TYPES[UA_TYPES_UINT16]);
-
-    /* Trigger the event from two variables */
-    UA_ValueCallback eventTriggerValueBackend;
-    eventTriggerValueBackend.onRead = NULL;
-    eventTriggerValueBackend.onWrite = writeEventTrigger;
-
-    UA_VariableAttributes_init(&myVar);
-    myVar.description = UA_LOCALIZEDTEXT("en-US", "event trigger 1");
-    myVar.displayName = UA_LOCALIZEDTEXT("en-US", "event trigger 1");
-    myVar.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
-    myVar.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
-    myVar.valueRank = UA_VALUERANK_SCALAR;
-    myInteger = 0;
-    UA_Variant_setScalar(&myVar.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
-    parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
-    parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
-    UA_Server_addVariableNode(server, UA_NODEID_STRING(1, "event-trigger-1"),
-                              parentNodeId, parentReferenceNodeId,
-                              UA_QUALIFIEDNAME(1, "event trigger 1"),
-                              baseDataVariableType, myVar, NULL, NULL);
-    UA_Server_setVariableNode_valueCallback(server,
-                                            UA_NODEID_STRING(1, "event-trigger-1"),
-                                            eventTriggerValueBackend);
-
-    myVar.description = UA_LOCALIZEDTEXT("en-US", "event trigger 2");
-    myVar.displayName = UA_LOCALIZEDTEXT("en-US", "event trigger 2");
-    UA_Server_addVariableNode(server, UA_NODEID_STRING(1, "event-trigger-2"),
-                              parentNodeId, parentReferenceNodeId,
-                              UA_QUALIFIEDNAME(1, "event trigger 2"),
-                              baseDataVariableType, myVar, NULL, NULL);
-    UA_Server_setVariableNode_valueCallback(server,
-                                            UA_NODEID_STRING(1, "event-trigger-2"),
-                                            eventTriggerValueBackend);
-#endif
-}
-
-static UA_Boolean hasRegistered = false;
-
-static void
-notifyState(UA_Server *server, UA_LifecycleState state) {
-#ifdef UA_ENABLE_DISCOVERY
-    if(state == UA_LIFECYCLESTATE_STARTED && !hasRegistered) {
-        UA_ClientConfig cc;
-        memset(&cc, 0, sizeof(UA_ClientConfig));
-        UA_ClientConfig_setDefault(&cc);
-#ifdef UA_ENABLE_ENCRYPTION
-        UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
-        UA_String_clear(&cc.clientDescription.applicationUri);
-        UA_ServerConfig *sc = UA_Server_getConfig(server);
-        UA_String_copy(&sc->applicationDescription.applicationUri,
-                       &cc.clientDescription.applicationUri);
-#endif
-        UA_Server_registerDiscovery(server, &cc,
-                                    UA_STRING("opc.tcp://localhost:4840"),
-                                    UA_STRING_NULL);
-        hasRegistered = true;
-    }
-    if(state != UA_LIFECYCLESTATE_STARTED && hasRegistered) {
-        UA_ClientConfig cc;
-        memset(&cc, 0, sizeof(UA_ClientConfig));
-        UA_ClientConfig_setDefault(&cc);
-#ifdef UA_ENABLE_ENCRYPTION
-        UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
-        UA_String_clear(&cc.clientDescription.applicationUri);
-        UA_ServerConfig *sc = UA_Server_getConfig(server);
-        UA_String_copy(&sc->applicationDescription.applicationUri,
-                       &cc.clientDescription.applicationUri);
-#endif
-        UA_Server_deregisterDiscovery(server, &cc,
-                                      UA_STRING("opc.tcp://localhost:4840"));
-        hasRegistered = false;
-    }
-#endif
-}
-
-#ifdef UA_ENABLE_DISCOVERY
-static void
-discoveryRegisterCallback(UA_Server *server, void *data) {
-    UA_ClientConfig cc;
-    memset(&cc, 0, sizeof(UA_ClientConfig));
-    UA_ClientConfig_setDefault(&cc);
-#ifdef UA_ENABLE_ENCRYPTION
-    UA_ClientConfig_setDefaultEncryption(&cc, certificate, privateKey, NULL, 0, NULL, 0);
-    UA_String_clear(&cc.clientDescription.applicationUri);
-    UA_ServerConfig *sc = UA_Server_getConfig(server);
-    UA_String_copy(&sc->applicationDescription.applicationUri,
-                   &cc.clientDescription.applicationUri);
-#endif
-    UA_Server_registerDiscovery(server, &cc,
-                                UA_STRING("opc.tcp://localhost:4840"),
-                                UA_STRING_NULL);
-}
-#endif
-
-#ifdef UA_ENABLE_ENCRYPTION
-static void
-enableNoneSecurityPolicy(UA_ServerConfig *config) {
-    UA_StatusCode retval = UA_ServerConfig_addEndpoint(config, UA_SECURITY_POLICY_NONE_URI,
-                                         UA_MESSAGESECURITYMODE_NONE);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Failed to add SecurityPolicy#None to the endpoint list.");
-    }
-    config->securityPolicyNoneDiscoveryOnly = false;
-}
-
-static void
-enableBasic128SecurityPolicy(UA_ServerConfig *config) {
-    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &certificate, &privateKey);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
-                       UA_StatusCode_name(retval));
-        return;
-    }
-    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri,
-                                UA_MESSAGESECURITYMODE_SIGN);
-    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri,
-                                UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
-}
-
-static void
-enableBasic256SecurityPolicy(UA_ServerConfig *config) {
-    UA_StatusCode retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &certificate, &privateKey);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256 with error code %s",
-                       UA_StatusCode_name(retval));
-        return;
-    }
-    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri,
-                                UA_MESSAGESECURITYMODE_SIGN);
-    UA_ServerConfig_addEndpoint(config, config->securityPolicies[config->securityPoliciesSize-1].policyUri,
-                                UA_MESSAGESECURITYMODE_SIGNANDENCRYPT);
-}
-
-
-static void
-disableBasic256Sha256SecurityPolicy(UA_ServerConfig *config) {
-    for(size_t i = 0; i < config->endpointsSize; i++) {
-        UA_EndpointDescription *ep = &config->endpoints[i];
-        UA_ByteString basic256sha256uri = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
-        if(!UA_String_equal(&ep->securityPolicyUri, &basic256sha256uri))
-            continue;
-
-        UA_EndpointDescription_clear(ep);
-        /* Move the last to this position */
-        if(i + 1 < config->endpointsSize) {
-            config->endpoints[i] = config->endpoints[config->endpointsSize-1];
-            i--;
-        }
-        config->endpointsSize--;
-    }
-    /* Delete the entire array if the last Endpoint was removed */
-    if(config->endpointsSize== 0) {
-        UA_free(config->endpoints);
-        config->endpoints = NULL;
-    }
-}
-
-static void
-disableAes128Sha256RsaOaepSecurityPolicy(UA_ServerConfig *config) {
-    for(size_t i = 0; i < config->endpointsSize; i++) {
-        UA_EndpointDescription *ep = &config->endpoints[i];
-        UA_ByteString aes128Sha256RsaOaep = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
-        if(!UA_String_equal(&ep->securityPolicyUri, &aes128Sha256RsaOaep))
-            continue;
-
-        UA_EndpointDescription_clear(ep);
-        /* Move the last to this position */
-        if(i + 1 < config->endpointsSize) {
-            config->endpoints[i] = config->endpoints[config->endpointsSize-1];
-            i--;
-        }
-        config->endpointsSize--;
-    }
-    /* Delete the entire array if the last Endpoint was removed */
-    if(config->endpointsSize== 0) {
-        UA_free(config->endpoints);
-        config->endpoints = NULL;
-    }
-}
-
-static void
-disableAes256Sha256RsaPssSecurityPolicy(UA_ServerConfig *config) {
-    for(size_t i = 0; i < config->endpointsSize; i++) {
-        UA_EndpointDescription *ep = &config->endpoints[i];
-        UA_ByteString aes256Sha256RsaPss = UA_BYTESTRING("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
-        if(!UA_String_equal(&ep->securityPolicyUri, &aes256Sha256RsaPss))
-            continue;
-
-        UA_EndpointDescription_clear(ep);
-        /* Move the last to this position */
-        if(i + 1 < config->endpointsSize) {
-            config->endpoints[i] = config->endpoints[config->endpointsSize-1];
-            i--;
-        }
-        config->endpointsSize--;
-    }
-    /* Delete the entire array if the last Endpoint was removed */
-    if(config->endpointsSize== 0) {
-        UA_free(config->endpoints);
-        config->endpoints = NULL;
-    }
-}
-
-static void
-disableX509Auth(UA_ServerConfig *config) {
-    UA_AccessControl *ac = &config->accessControl;
-    for(size_t i = 0; i < ac->userTokenPoliciesSize; i++) {
-        UA_UserTokenPolicy *utp = &ac->userTokenPolicies[i];
-        if(utp->tokenType != UA_USERTOKENTYPE_CERTIFICATE)
-            continue;
-
-        UA_UserTokenPolicy_clear(utp);
-        /* Move the last to this position */
-        if(i + 1 < ac->userTokenPoliciesSize) {
-            ac->userTokenPolicies[i] = ac->userTokenPolicies[ac->userTokenPoliciesSize-1];
-            i--;
-        }
-        ac->userTokenPoliciesSize--;
-    }
-}
-
-static void
-disableUsernamePasswordAuth(UA_ServerConfig *config) {
-    UA_AccessControl *ac = &config->accessControl;
-    for(size_t i = 0; i < ac->userTokenPoliciesSize; i++) {
-        UA_UserTokenPolicy *utp = &ac->userTokenPolicies[i];
-        if(utp->tokenType != UA_USERTOKENTYPE_USERNAME)
-            continue;
-
-        UA_UserTokenPolicy_clear(utp);
-        /* Move the last to this position */
-        if(i + 1 < ac->userTokenPoliciesSize) {
-            ac->userTokenPolicies[i] = ac->userTokenPolicies[ac->userTokenPoliciesSize-1];
-            i--;
-        }
-        ac->userTokenPoliciesSize--;
-    }
-}
-
-#endif
-
-static void
-usage(void) {
-    UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                   "Usage:\n"
-#ifndef UA_ENABLE_ENCRYPTION
-                   "server_ctt [<server-certificate.der>]\n"
-#else
-                   "server_ctt <server-certificate.der> <private-key.der>\n"
-#ifndef __linux__
-                   "\t[--secureChannelTrustList <tl1.ctl> <tl2.ctl> ... ]\n"
-                   "\t[--secureChannelIssuerList <il1.der> <il2.der> ... ]\n"
-                   "\t[--secureChannelRevocationList <rv1.crl> <rv2.crl> ...]\n"
-                   "\t[--sessionTrustList <tl1.ctl> <tl2.ctl> ... ]\n"
-                   "\t[--sessionIssuerList <il1.der> <il2.der> ... ]\n"
-                   "\t[--sessionRevocationList <rv1.crl> <rv2.crl> ...]\n"
-#else
-                   "\t[--secureChannelTrustListFolder <folder>]\n"
-                   "\t[--secureChannelIssuerListFolder <folder>]\n"
-                   "\t[--secureChannelRevocationListFolder <folder>]\n"
-                   "\t[--sessionTrustListFolder <folder>]\n"
-                   "\t[--sessionIssuerListFolder <folder>]\n"
-                   "\t[--sessionRevocationListFolder <folder>]\n"
-#endif
-                   "\t[--enableNone]\n"
-                   "\t[--enableBasic128]\n"
-                   "\t[--enableBasic256]\n"
-                   "\t[--disableBasic256Sha256]\n"
-                   "\t[--disableAes128Sha256RsaOaep]\n"
-                   "\t[--disableAes256Sha256RsaPss]\n"
-                   "\t[--disableX509]\n"
-                   "\t[--disableUsernamePassword]\n"
-#endif
-                   "\t[--enableTimestampCheck]\n"
-                   "\t[--enableAnonymous]\n");
-}
-
-int main(int argc, char **argv) {
-    /* Print help */
-    for(int i = 1; i < argc; i++) {
-        if(strcmp(argv[i], "--help") == 0 ||
-           strcmp(argv[i], "-h") == 0) {
-            usage();
-            return EXIT_SUCCESS;
-        }
-    }
-
-    /* Load certificate */
-    size_t pos = 1;
-    if((size_t)argc >= pos + 1) {
-        certificate = loadFile(argv[1]);
-        if(certificate.length == 0) {
-            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                           "Unable to load file %s.", argv[pos]);
-            return EXIT_FAILURE;
-        }
-        pos++;
-    }
-
-#ifdef UA_ENABLE_ENCRYPTION
-    /* Load the private key */
-    if((size_t)argc >= pos + 1) {
-        privateKey = loadFile(argv[2]);
-        if(privateKey.length == 0) {
-            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                           "Unable to load file %s.", argv[pos]);
-            return EXIT_FAILURE;
-        }
-        pos++;
-    }
-
-    char filetype = ' '; /* t==trustlist, l == issuerList, r==revocationlist */
-    UA_Boolean enableNone = false;
-    UA_Boolean enableBasic128 = false;
-    UA_Boolean enableBasic256 = false;
-    UA_Boolean disableBasic256Sha256 = false;
-    UA_Boolean disableAes128Sha256RsaOaep = false;
-    UA_Boolean disableAes256Sha256RsaPss = false;
-    UA_Boolean disableX509 = false;
-    UA_Boolean disableUsernamePassword = false;
-
-#ifndef __linux__
-    UA_ByteString scTrustList[100];
-    size_t scTrustListSize = 0;
-    UA_ByteString scIssuerList[100];
-    size_t scIssuerListSize = 0;
-    UA_ByteString scRevocationList[100];
-    size_t scRevocationListSize = 0;
-    UA_ByteString sTrustList[100];
-    size_t sTrustListSize = 0;
-    UA_ByteString sIssuerList[100];
-    size_t sIssuerListSize = 0;
-    UA_ByteString sRevocationList[100];
-    size_t sRevocationListSize = 0;
-#else
-    const char *scTrustlistFolder = NULL;
-    const char *scIssuerlistFolder = NULL;
-    const char *scRevocationlistFolder = NULL;
-    const char *sTrustlistFolder = NULL;
-    const char *sIssuerlistFolder = NULL;
-    const char *sRevocationlistFolder = NULL;
-#endif /* __linux__ */
-
-#endif /* UA_ENABLE_ENCRYPTION */
-
-    UA_Boolean enableAnonymous = false;
-    UA_Boolean enableTime = false;
-
-    /* Loop over the remaining arguments */
-    for(; pos < (size_t)argc; pos++) {
-
-        if(strcmp(argv[pos], "--enableAnonymous") == 0) {
-            enableAnonymous = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--enableTimestampCheck") == 0) {
-            enableTime = true;
-            continue;
-        }
-
-#ifdef UA_ENABLE_ENCRYPTION
-        if(strcmp(argv[pos], "--enableNone") == 0) {
-            enableNone = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--enableBasic128") == 0) {
-            enableBasic128 = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--enableBasic256") == 0) {
-            enableBasic256 = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--disableBasic256Sha256") == 0) {
-            disableBasic256Sha256 = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--disableAes128Sha256RsaOaep") == 0) {
-            disableAes128Sha256RsaOaep = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--disableAes256Sha256RsaPss") == 0) {
-            disableAes256Sha256RsaPss = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--disableX509") == 0) {
-            disableX509 = true;
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--disableUsernamePassword") == 0) {
-            disableUsernamePassword = true;
-            continue;
-        }
-
-
-#ifndef __linux__
-        if(strcmp(argv[pos], "--secureChannelTrustList") == 0) {
-            filetype = 't';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--secureChannelIssuerList") == 0) {
-            filetype = 'i';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--secureChannelRevocationList") == 0) {
-            filetype = 'r';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--sessionTrustList") == 0) {
-            filetype = 'T';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--sessionIssuerList") == 0) {
-            filetype = 'I';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--sessionRevocationList") == 0) {
-            filetype = 'R';
-            continue;
-        }
-
-        UA_ByteString *list;
-        size_t *listSize;
-        if(filetype == 't') {
-            list = scTrustList;
-            listSize = &scTrustListSize;
-        } else if(filetype == 'i') {
-            list = scIssuerList;
-            listSize = &scIssuerListSize;
-        } else if(filetype == 'r') {
-            list = scRevocationList;
-            listSize = &scRevocationListSize;
-        } else if(filetype == 'T') {
-            list = sTrustList;
-            listSize = &sTrustListSize;
-        } else if(filetype == 'I') {
-            list = sIssuerList;
-            listSize = &sIssuerListSize;
-        } else if(filetype == 'R') {
-            list = sRevocationList;
-            listSize = &sRevocationListSize;
-        } else {
-            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                         "Unknown certificate list");
-            return EXIT_FAILURE;
-        }
-
-        if(*listSize >= 100) {
-            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                         "Certificate list too large");
-            return EXIT_FAILURE;
-        }
-        list[*listSize] = loadFile(argv[pos]);
-        if(list[*listSize].data == NULL) {
-            UA_LOG_FATAL(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
-                         "Unable to load certificate %s", argv[pos]);
-            continue;
-        }
-        scTrustListSize++;
-        continue;
-
-#else /* __linux__ */
-        if(strcmp(argv[pos], "--secureChannelTrustListFolder") == 0) {
-            filetype = 't';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--secureChannelIssuerListFolder") == 0) {
-            filetype = 'i';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--secureChannelRevocationListFolder") == 0) {
-            filetype = 'r';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--sessionTrustListFolder") == 0) {
-            filetype = 'T';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--sessionIssuerListFolder") == 0) {
-            filetype = 'I';
-            continue;
-        }
-
-        if(strcmp(argv[pos], "--sessionRevocationListFolder") == 0) {
-            filetype = 'R';
-            continue;
-        }
-
-        if(filetype == 't') {
-            scTrustlistFolder = argv[pos];
-            continue;
-        }
-
-        if(filetype == 'i') {
-            scIssuerlistFolder = argv[pos];
-            continue;
-        }
-
-        if(filetype == 'r') {
-            scRevocationlistFolder = argv[pos];
-            continue;
-        }
-
-        if(filetype == 'T') {
-            sTrustlistFolder = argv[pos];
-            continue;
-        }
-
-        if(filetype == 'I') {
-            sIssuerlistFolder = argv[pos];
-            continue;
-        }
-
-        if(filetype == 'R') {
-            sRevocationlistFolder = argv[pos];
-            continue;
-        }
-#endif /* __linux__ */
-
-#endif /* UA_ENABLE_ENCRYPTION */
-
-        usage();
-        return EXIT_FAILURE;
-    }
-
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-
-    UA_Server *server = UA_Server_new();
-    if(!server) {
-        res = UA_STATUSCODE_BADINTERNALERROR;
-        goto cleanup;
-    }
-
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* Load PKI */
-#ifdef UA_ENABLE_ENCRYPTION
-    res = UA_ServerConfig_setDefaultWithSecureSecurityPolicies(config, 4841,
-                                                         &certificate, &privateKey,
-                                                         NULL, 0, NULL, 0, NULL, 0);
-    if(res != UA_STATUSCODE_GOOD)
-        goto cleanup;
-#ifndef __linux__
-    res |= UA_CertificateVerification_Trustlist(&config->secureChannelPKI,
-                                                scTrustList, scTrustListSize,
-                                                scIssuerList, scIssuerListSize,
-                                                scRevocationList, scRevocationListSize);
-    res |= UA_CertificateVerification_Trustlist(&config->sessionPKI,
-                                                sTrustList, sTrustListSize,
-                                                sIssuerList, sIssuerListSize,
-                                                sRevocationList, sRevocationListSize);
-#else
-    /* On Linux we can monitor the certs folder and reload when changes are made */
-# ifdef UA_ENABLE_CERT_REJECTED_DIR
-    res |= UA_CertificateVerification_CertFolders(&config->secureChannelPKI,
-                                                 scTrustlistFolder, scIssuerlistFolder,
-                                                 scRevocationlistFolder, NULL);
-    res |= UA_CertificateVerification_CertFolders(&config->sessionPKI,
-                                                  sTrustlistFolder, sIssuerlistFolder,
-                                                  sRevocationlistFolder, NULL);
-# else
-    res |= UA_CertificateVerification_CertFolders(&config->secureChannelPKI,
-                                                  scTrustlistFolder, scIssuerlistFolder,
-                                                  scRevocationlistFolder);
-    res |= UA_CertificateVerification_CertFolders(&config->sessionPKI,
-                                                  sTrustlistFolder, sIssuerlistFolder,
-                                                  sRevocationlistFolder);
-# endif
-#endif /* __linux__ */
-    if(res != UA_STATUSCODE_GOOD)
-        goto cleanup;
-
-    if(enableNone)
-        enableNoneSecurityPolicy(config);
-    if(enableBasic128)
-        enableBasic128SecurityPolicy(config);
-    if(enableBasic256)
-        enableBasic256SecurityPolicy(config);
-    if(disableBasic256Sha256)
-        disableBasic256Sha256SecurityPolicy(config);
-    if(disableAes128Sha256RsaOaep)
-        disableAes128Sha256RsaOaepSecurityPolicy(config);
-    if(disableAes256Sha256RsaPss)
-        disableAes256Sha256RsaPssSecurityPolicy(config);
-
-#else /* UA_ENABLE_ENCRYPTION */
-    res = UA_ServerConfig_setMinimal(config, 4841, &certificate);
-    if(res != UA_STATUSCODE_GOOD)
-        goto cleanup;
-#endif /* UA_ENABLE_ENCRYPTION */
-
-    /* Limit the number of SecureChannels and Sessions */
-    config->maxSecureChannels = 60;
-    config->maxSessions = 50;
-    config->maxSessionTimeout = 10 * 60 * 10000; /* 10 minutes */
-
-    /* Revolve the SecureChannel token every 300 seconds */
-    config->maxSecurityTokenLifetime = 300000;
-
-    /* Set operation limits */
-    config->maxNodesPerRead = MAX_OPERATION_LIMIT;
-    config->maxNodesPerWrite = MAX_OPERATION_LIMIT;
-    config->maxNodesPerMethodCall = MAX_OPERATION_LIMIT;
-    config->maxNodesPerBrowse = MAX_OPERATION_LIMIT;
-    config->maxNodesPerRegisterNodes = MAX_OPERATION_LIMIT;
-    config->maxNodesPerTranslateBrowsePathsToNodeIds = MAX_OPERATION_LIMIT;
-    config->maxNodesPerNodeManagement = MAX_OPERATION_LIMIT;
-    config->maxMonitoredItemsPerCall = MAX_OPERATION_LIMIT;
-
-#ifdef UA_ENABLE_SUBSCRIPTIONS
-    /* Set Subscription limits */
-    config->maxSubscriptions = 200;
-
-    /* Make the minimum lifetimecount larger.
-     * Otherwise we get unwanted timing effects in the CTT. */
-    config->lifeTimeCountLimits.min = 100;
-#endif
-
-    /* If RequestTimestamp is '0', log the warning and proceed */
-    config->verifyRequestTimestamp = UA_RULEHANDLING_WARN;
-    if(enableTime)
-        config->verifyRequestTimestamp = UA_RULEHANDLING_DEFAULT;
-
-    /* Instatiate a new AccessControl plugin that knows username/pw */
-    UA_AccessControl_default(config, enableAnonymous, NULL,
-                             usernamePasswordsSize, usernamePasswords);
-
-    /* Override with a custom access control policy */
-    config->accessControl.getUserAccessLevel = getUserAccessLevel_disallowSpecific;
-    UA_String_clear(&config->applicationDescription.applicationUri);
-    config->applicationDescription.applicationUri =
-        UA_String_fromChars("urn:open62541.server.application");
-
-    /* Lifecycle config */
-    config->shutdownDelay = 5000.0; /* 5s */
-    config->notifyLifecycleState = notifyState;
-
-    setInformationModel(server);
-
-#ifdef UA_ENABLE_ENCRYPTION
-    if(disableX509)
-        disableX509Auth(config);
-    if(disableUsernamePassword)
-        disableUsernamePasswordAuth(config);
-#endif
-
-#ifdef UA_ENABLE_DISCOVERY
-    /* Add a repeated callback so that the server periodically registers with the Discovery Server. */
-    UA_UInt64 discoveryRegisterCallbackId;
-    UA_Server_addRepeatedCallback(server, (UA_ServerCallback)discoveryRegisterCallback, NULL, 600000, &discoveryRegisterCallbackId);
-#endif
-
-    /* run server */
-    res = UA_Server_runUntilInterrupt(server);
-
-#ifdef UA_ENABLE_DISCOVERY
-    UA_Server_removeCallback(server, discoveryRegisterCallbackId);
-#endif
-
- cleanup:
-    UA_Server_delete(server);
-
-    UA_ByteString_clear(&certificate);
-#if defined(UA_ENABLE_ENCRYPTION)
-    UA_ByteString_clear(&privateKey);
-#ifndef __linux__
-    for(size_t i = 0; i < scTrustListSize; i++)
-        UA_ByteString_clear(&scTrustList[i]);
-    for(size_t i = 0; i < scIssuerListSize; i++)
-        UA_ByteString_clear(&scIssuerList[i]);
-    for(size_t i = 0; i < scRevocationListSize; i++)
-        UA_ByteString_clear(&scRevocationList[i]);
-
-    for(size_t i = 0; i < sTrustListSize; i++)
-        UA_ByteString_clear(&sTrustList[i]);
-    for(size_t i = 0; i < sIssuerListSize; i++)
-        UA_ByteString_clear(&sIssuerList[i]);
-    for(size_t i = 0; i < sRevocationListSize; i++)
-        UA_ByteString_clear(&sRevocationList[i]);
-#endif
-#endif
-
-    return res == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
-}

From ec3d789c20d80aa4627348c2515fa6c020ba80e6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 30 Nov 2023 11:22:54 +0100
Subject: [PATCH 1324/1963] refactor(deps): Bump the nodesetloader version

---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index aa5754d167b..fd603490d7d 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit aa5754d167b44c3da2fd51a87f3eaa413fff9cb3
+Subproject commit fd603490d7dbf6727a9cfa8ac819657ed6ae4c47

From a7b4496eeaa84c071e3a9bc12f350abaece090d3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 30 Nov 2023 11:14:55 +0100
Subject: [PATCH 1325/1963] refactor(core): Bump version to 1.4.0-rc1

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7033cfe0a0..bca1792f818 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,9 +40,9 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # number from the latest release plus the "-undefined" label. Will be
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
-set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 9)
-set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
+set(OPEN62541_VER_MINOR 4)
+set(OPEN62541_VER_PATCH 0)
+set(OPEN62541_VER_LABEL "-rc1") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 
 # Overwrite the version information based on git if available

From c1753cd1a9f6c9608d6bc4eeff3e27c94fa64774 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 4 Dec 2023 11:25:02 +0100
Subject: [PATCH 1326/1963] fix(pubsub): Evaluate status code of
 addCustomCallback callback

---
 src/pubsub/ua_pubsub_writergroup.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index ce44de34de6..dc9c967df34 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -52,12 +52,12 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *wg) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(wg->config.pubsubManagerCallback.addCustomCallback) {
         /* Use configured mechanism for cyclic callbacks */
-        wg->config.pubsubManagerCallback.
-            addCustomCallback(server, wg->identifier,
-                              (UA_ServerCallback)UA_WriterGroup_publishCallback,
-                              wg, wg->config.publishingInterval,
-                              NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
-                              &wg->publishCallbackId);
+        retval = wg->config.pubsubManagerCallback.
+                 addCustomCallback(server, wg->identifier,
+                                   (UA_ServerCallback)UA_WriterGroup_publishCallback,
+                                   wg, wg->config.publishingInterval,
+                                   NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
+                                   &wg->publishCallbackId);
     } else {
         /* Use EventLoop for cyclic callbacks */
         UA_EventLoop *el = UA_PubSubConnection_getEL(server, wg->linkedConnection);

From 52396ed0fe3512ef9a64d6bc3f0115cbfd1faf97 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 4 Dec 2023 11:32:56 +0100
Subject: [PATCH 1327/1963] fix(pubsub): Evaluate status code of
 UA_WriterGroup_addPublishCallback

---
 src/pubsub/ua_pubsub_writergroup.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index dc9c967df34..43bb3006422 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -541,6 +541,7 @@ UA_Server_getWriterGroupConfig(UA_Server *server, const UA_NodeId writerGroup,
 UA_StatusCode
 UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
                             const UA_WriterGroupConfig *config) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
@@ -566,7 +567,13 @@ UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
         if(wg->config.rtLevel == UA_PUBSUB_RT_NONE &&
            wg->state == UA_PUBSUBSTATE_OPERATIONAL) {
             UA_WriterGroup_removePublishCallback(server, wg);
-            UA_WriterGroup_addPublishCallback(server, wg);
+            res = UA_WriterGroup_addPublishCallback(server, wg);
+            if(res != UA_STATUSCODE_GOOD) {
+                UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
+                                           "Modify WriterGroup failed. Adding publish callback failed"
+                                           "with status code %s", UA_StatusCode_name(res));
+                return res;
+            }
         }
     }
 
@@ -784,7 +791,12 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                                                         UA_PUBSUBSTATE_ERROR, ret);
                         break;
                     }
-                    UA_WriterGroup_addPublishCallback(server, writerGroup);
+                    ret = UA_WriterGroup_addPublishCallback(server, writerGroup);
+                    if(ret != UA_STATUSCODE_GOOD) {
+                        UA_WriterGroup_setPubSubState(server, writerGroup,
+                                                        UA_PUBSUBSTATE_ERROR, ret);
+                        break;
+                    }
                     break;
                 }
                 case UA_PUBSUBSTATE_PAUSED:

From 47239db132de3db30b975d65853a5a2ee295124c Mon Sep 17 00:00:00 2001
From: Norbert Greiner <n.greiner@pilz.de>
Date: Mon, 4 Dec 2023 10:09:59 +0100
Subject: [PATCH 1328/1963] fix(server): memory handling in the server mdns
 implementation Fixes some issues, if the discovery url includes a path (size
 calculation and memcpy fix).

---
 src/server/ua_server_discovery_mdns.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_server_discovery_mdns.c b/src/server/ua_server_discovery_mdns.c
index fccb9c73145..ca39fe06bde 100644
--- a/src/server/ua_server_discovery_mdns.c
+++ b/src/server/ua_server_discovery_mdns.c
@@ -214,8 +214,10 @@ UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const cha
     /* Remove from list */
     LIST_REMOVE(entry, pointers);
     UA_ServerOnNetwork_clear(&entry->serverOnNetwork);
-    if(entry->pathTmp)
+    if(entry->pathTmp) {
         UA_free(entry->pathTmp);
+        entry->pathTmp = NULL;
+    }
     UA_free(entry);
     return UA_STATUSCODE_GOOD;
 }
@@ -223,12 +225,13 @@ UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_Server *server, const cha
 static void
 mdns_append_path_to_url(UA_String *url, const char *path) {
     size_t pathLen = strlen(path);
+    size_t newUrlLen = url->length + pathLen; //size of the new url string incl. the path 
     /* todo: malloc may fail: return a statuscode */
     char *newUrl = (char *)UA_malloc(url->length + pathLen);
     memcpy(newUrl, url->data, url->length);
     memcpy(newUrl + url->length, path, pathLen);
     UA_String_clear(url);
-    url->length = url->length + pathLen;
+    url->length = newUrlLen;
     url->data = (UA_Byte *) newUrl;
 }
 
@@ -251,7 +254,7 @@ setTxt(UA_Server *server, const struct resource *r,
                     UA_LOG_ERROR(&server->config.logger, UA_LOGCATEGORY_SERVER, "Cannot alloc memory for mDNS srv path");
                     return;
                 }
-                memcpy(&(entry->pathTmp), &path, pathLen);
+                memcpy(entry->pathTmp, path, pathLen);
                 entry->pathTmp[pathLen] = '\0';
             }
         } else {
@@ -322,6 +325,7 @@ setSrv(UA_Server *server, const struct resource *r,
     if(entry->pathTmp) {
         mdns_append_path_to_url(&entry->serverOnNetwork.discoveryUrl, entry->pathTmp);
         UA_free(entry->pathTmp);
+        entry->pathTmp = NULL;
     }
 }
 

From 66eb2d192138fa192408c5d3f51ca494f5b00c79 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Dec 2023 12:29:05 +0100
Subject: [PATCH 1329/1963] feat(core): Add a consistency check to
 UA_Array_copy

Users might have manually created an inconsistent array.
Defensive programming is good practice.
---
 src/ua_types.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ua_types.c b/src/ua_types.c
index b8f6739bb5d..5e5f174ef00 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1752,7 +1752,9 @@ UA_Array_copy(const void *src, size_t size,
         return UA_STATUSCODE_GOOD;
     }
 
-    if(!type)
+    /* Check the array consistency -- defensive programming in case the user
+     * manually created an inconsistent array */
+    if(UA_UNLIKELY(!type || !src))
         return UA_STATUSCODE_BADINTERNALERROR;
 
     /* calloc, so we don't have to check retval in every iteration of copying */

From 9f37f89ac0669cff87b657f06ffc6c41e3875ffa Mon Sep 17 00:00:00 2001
From: Mike Granby <mikeg@mikeg.net>
Date: Sat, 9 Dec 2023 01:05:59 +0000
Subject: [PATCH 1330/1963] fix(client): honor endpoint security policies

Pick endpoint based on highest security level rather than using first

Closes #6167
---
 src/client/ua_client_connect.c | 86 ++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 76713a94eca..46b3d739265 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -808,15 +808,21 @@ responseGetEndpoints(UA_Client *client, void *userdata,
     /* Warn if the Endpoints look incomplete / don't match the EndpointUrl */
     Client_warnEndpointsResult(client, resp, &client->discoveryUrl);
 
-    UA_Boolean endpointFound = false;
-    UA_Boolean tokenFound = false;
-    const UA_String binaryTransport = UA_STRING("http://opcfoundation.org/UA-Profile/"
-                                                "Transport/uatcp-uasc-uabinary");
+    const size_t notFound = (size_t)-1;
+    size_t bestEndpointIndex = notFound;
+    size_t bestTokenIndex = notFound;
+    UA_Byte bestEndpointLevel = 0;
+    const UA_String binaryTransport =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
 
     /* Find a matching combination of Endpoint and UserTokenPolicy */
     for(size_t i = 0; i < resp->endpointsSize; ++i) {
         UA_EndpointDescription* endpoint = &resp->endpoints[i];
 
+        /* Do we already have a better candidate? */
+        if(endpoint->securityLevel < bestEndpointLevel)
+            continue;
+
         /* Filter by the ApplicationURI if defined */
         if(client->config.applicationUri.length > 0 &&
            !UA_String_equal(&client->config.applicationUri,
@@ -864,9 +870,11 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             continue;
         }
 
-        endpointFound = true;
+        /* We have found a matching endpoint.
+         * But does it contain a matching user token policy? */
+        bestEndpointIndex = i;
 
-        /* Look for a user token policy with an anonymous token */
+        /* Look for a supported user token policy */
         for(size_t j = 0; j < endpoint->userIdentityTokensSize; ++j) {
             UA_UserTokenPolicy* tokenPolicy = &endpoint->userIdentityTokens[j];
             const UA_DataType *tokenType =
@@ -927,7 +935,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
                 continue;
             }
 
-            /* Endpoint with matching usertokenpolicy found */
+            /* Endpoint with matching UserTokenPolicy found */
 
             /* If not explicit PolicyUri for authentication is configured, use
              * that from the TokenPolicy or (if that is not defined) from the
@@ -938,30 +946,11 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             if(UA_String_isEmpty(&client->config.authSecurityPolicyUri))
                 UA_String_copy(securityPolicyUri, &client->config.authSecurityPolicyUri);
 
-#if UA_LOGLEVEL <= 300
-            const char *securityModeNames[3] = {"None", "Sign", "SignAndEncrypt"};
-            const char *userTokenTypeNames[4] = {"Anonymous", "UserName",
-                                                 "Certificate", "IssuedToken"};
-            /* Log the selected endpoint */
-            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                        "Selected endpoint %lu in URL %.*s with SecurityMode "
-                        "%s and SecurityPolicy %.*s", (long unsigned)i,
-                        (int)endpoint->endpointUrl.length, endpoint->endpointUrl.data,
-                        securityModeNames[endpoint->securityMode - 1],
-                        (int)endpoint->securityPolicyUri.length,
-                        endpoint->securityPolicyUri.data);
-
-            /* Log the selected UserTokenPolicy */
-            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                        "Selected UserTokenPolicy %.*s with UserTokenType %s "
-                        "and SecurityPolicy %.*s",
-                        (int)tokenPolicy->policyId.length, tokenPolicy->policyId.data,
-                        userTokenTypeNames[tokenPolicy->tokenType],
-                        (int)securityPolicyUri->length, securityPolicyUri->data);
-#endif
+            /* Update tracking */
+            bestEndpointLevel = endpoint->securityLevel;
+            bestTokenIndex = j;
 
             /* Move to the client config */
-            tokenFound = true;
             UA_EndpointDescription_clear(&client->config.endpoint);
             client->config.endpoint = *endpoint;
             UA_EndpointDescription_init(endpoint);
@@ -976,28 +965,55 @@ responseGetEndpoints(UA_Client *client, void *userdata,
 
             break;
         }
-
-        if(tokenFound)
-            break;
     }
 
-    if(!endpointFound) {
+    if(bestEndpointIndex == notFound) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "No suitable endpoint found");
         client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
         closeSecureChannel(client);
-    } else if(!tokenFound) {
+        UA_UNLOCK(&client->clientMutex);
+        return;
+    } else if(bestTokenIndex == notFound) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "No suitable UserTokenPolicy found for the possible endpoints");
         client->connectStatus = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
         closeSecureChannel(client);
+        UA_UNLOCK(&client->clientMutex);
+        return;
     }
 
-    /* Close the SecureChannel if a different SecurityPolicy is defined by the Endpoint */
+    /* Log the selected Endpoint and UserTokenPolicy */
+#if UA_LOGLEVEL <= 300
+    UA_EndpointDescription *endpoint = &client->config.endpoint;
+    UA_UserTokenPolicy *tokenPolicy = &client->config.userTokenPolicy;
+    UA_String *securityPolicyUri = &tokenPolicy->securityPolicyUri;
+    const char *securityModeNames[3] = {"None", "Sign", "SignAndEncrypt"};
+    const char *userTokenTypeNames[4] =
+        {"Anonymous", "UserName", "Certificate", "IssuedToken"};
+
+    UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                "Selected endpoint %lu in URL %.*s with SecurityMode "
+                "%s and SecurityPolicy %.*s",
+                (long unsigned)bestEndpointIndex, (int)endpoint->endpointUrl.length,
+                endpoint->endpointUrl.data, securityModeNames[endpoint->securityMode - 1],
+                (int)endpoint->securityPolicyUri.length, endpoint->securityPolicyUri.data);
+
+    UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                "Selected UserTokenPolicy %.*s with UserTokenType %s "
+                "and SecurityPolicy %.*s",
+                (int)tokenPolicy->policyId.length, tokenPolicy->policyId.data,
+                userTokenTypeNames[tokenPolicy->tokenType],
+                (int)securityPolicyUri->length, securityPolicyUri->data);
+#endif
+
+    /* Close the SecureChannel if a different SecurityPolicy is defined by the
+     * Endpoint. The client then opens a new mathing SecureChannel. */
     if(client->config.endpoint.securityMode != client->channel.securityMode ||
        !UA_String_equal(&client->config.endpoint.securityPolicyUri,
                         &client->channel.securityPolicy->policyUri))
         closeSecureChannel(client);
+
     UA_UNLOCK(&client->clientMutex);
 }
 

From 1f1be88474ff6e39f2a7d7a8214a113776cc3125 Mon Sep 17 00:00:00 2001
From: Mike Granby <mikeg@mikeg.net>
Date: Sat, 9 Dec 2023 01:27:58 +0000
Subject: [PATCH 1331/1963] fix(client): failure to switch from discovery url

Client does not switch from discovery to full-feature endpoint if security policy does not change

Closes #6165
---
 src/client/ua_client_connect.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 46b3d739265..23456df356a 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -413,8 +413,12 @@ sendHELMessage(UA_Client *client) {
     hello.maxMessageSize = client->config.localConnectionConfig.localMaxMessageSize;
     hello.maxChunkCount = client->config.localConnectionConfig.localMaxChunkCount;
 
-    /* Use the DiscoveryUrl -- if already known via FindServers */
-    if(client->discoveryUrl.length > 0) {
+    /* We may open difference SecureChannels with different EndpointUrls. The
+     * response of the FindServers and GetEndpoints services can depend on the
+     * EndpointUrl used in the HEL message. */
+    if(client->config.endpoint.endpointUrl.length > 0) {
+        hello.endpointUrl = client->config.endpoint.endpointUrl;
+    } else if(client->discoveryUrl.length > 0) {
         hello.endpointUrl = client->discoveryUrl;
     } else {
         hello.endpointUrl = client->config.endpointUrl;
@@ -1007,13 +1011,29 @@ responseGetEndpoints(UA_Client *client, void *userdata,
                 (int)securityPolicyUri->length, securityPolicyUri->data);
 #endif
 
-    /* Close the SecureChannel if a different SecurityPolicy is defined by the
-     * Endpoint. The client then opens a new mathing SecureChannel. */
+    /* Close the SecureChannel -- a different SecurityMode or SecurityPolicy is
+     * defined by the Endpoint. */
     if(client->config.endpoint.securityMode != client->channel.securityMode ||
        !UA_String_equal(&client->config.endpoint.securityPolicyUri,
-                        &client->channel.securityPolicy->policyUri))
+                        &client->channel.securityPolicy->policyUri)) {
         closeSecureChannel(client);
+        UA_UNLOCK(&client->clientMutex);
+        return;
+    }
+
+    /* We were using a distinct discovery URL and we are switching away from it.
+     * Close the SecureChannel to reopen with the EndpointUrl. If an endpoint
+     * was selected, then we use the endpointUrl for the HEL message. */
+    if(client->discoveryUrl.length > 0 &&
+       !UA_String_equal(&client->discoveryUrl,
+                        &client->config.endpoint.endpointUrl)) {
+        closeSecureChannel(client);
+        UA_UNLOCK(&client->clientMutex);
+        return;
+    }
 
+    /* Nothing to do. We have selected an endpoint that we can use to open a
+     * Session on the current SecureChannel. */
     UA_UNLOCK(&client->clientMutex);
 }
 

From 51b046d136dccb45cb0aca6ef265f45c3f22a7d0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 15:17:50 +0100
Subject: [PATCH 1332/1963] refactor(client): Cosmetic improvements in
 ua_client_connect.c

---
 src/client/ua_client_connect.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 23456df356a..dd638f6b875 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -22,7 +22,7 @@
  * - Call FindServers
  *   - If one of the results has an exactly matching EndpointUrl, continue.
  *   - Otherwise select a matching server, update the endpointURL member of
- *     UA_Client and reconnect. -
+ *     UA_Client and reconnect.
  * - Call GetEndpoints and select an Endpoint
  * - Open a SecureChannel and Session for that Endpoint
  */
@@ -30,7 +30,6 @@
 #define UA_MINMESSAGESIZE 8192
 #define UA_SESSION_LOCALNONCELENGTH 32
 #define MAX_DATA_SIZE 4096
-
 #define REVERSE_CONNECT_INDICATOR (void *)(uintptr_t)0xFFFFFFFF
 
 static void initConnect(UA_Client *client);
@@ -1076,7 +1075,8 @@ responseFindServers(UA_Client *client, void *userdata,
                        "FindServers failed with error code %s. Continue with the "
                        "EndpointURL %.*s.",
                        UA_StatusCode_name(fsr->responseHeader.serviceResult),
-                       (int)client->config.endpointUrl.length, client->config.endpointUrl.data);
+                       (int)client->config.endpointUrl.length,
+                       client->config.endpointUrl.data);
         UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
         return;
     }
@@ -1108,10 +1108,9 @@ responseFindServers(UA_Client *client, void *userdata,
      * returned server. */
     for(size_t i = 0; i < fsr->serversSize; i++) {
         UA_ApplicationDescription *server = &fsr->servers[i];
-        if (server->applicationType != UA_APPLICATIONTYPE_SERVER &&
+        if(server->applicationType != UA_APPLICATIONTYPE_SERVER &&
             server->applicationType != UA_APPLICATIONTYPE_CLIENTANDSERVER &&
-            server->applicationType != UA_APPLICATIONTYPE_DISCOVERYSERVER
-        )
+            server->applicationType != UA_APPLICATIONTYPE_DISCOVERYSERVER)
             continue;
 
         /* Filter by the ApplicationURI if defined */

From b4335c5bfb88cbff5c30ba0b0d1303a577c184f4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 16:20:00 +0100
Subject: [PATCH 1333/1963] refactor(client): Unify code-paths for the
 EndpointUrl selection

---
 src/client/ua_client_connect.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index dd638f6b875..d3cfa1fe1a1 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -35,6 +35,20 @@
 static void initConnect(UA_Client *client);
 static UA_StatusCode createSessionAsync(UA_Client *client);
 
+/* Get the EndpointUrl to be used right now.
+ * This is adjusted during the discovery process.
+ * We fall back if connecting to an EndpointUrl fails. */
+static UA_String
+getEndpointUrl(UA_Client *client) {
+    if(client->config.endpoint.endpointUrl.length > 0) {
+        return client->config.endpoint.endpointUrl;
+    } else if(client->discoveryUrl.length > 0) {
+        return client->discoveryUrl;
+    } else {
+        return client->config.endpointUrl;
+    }
+}
+
 static UA_SecurityPolicy *
 getSecurityPolicy(UA_Client *client, UA_String policyUri) {
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
@@ -411,17 +425,7 @@ sendHELMessage(UA_Client *client) {
     hello.sendBufferSize = client->config.localConnectionConfig.sendBufferSize;
     hello.maxMessageSize = client->config.localConnectionConfig.localMaxMessageSize;
     hello.maxChunkCount = client->config.localConnectionConfig.localMaxChunkCount;
-
-    /* We may open difference SecureChannels with different EndpointUrls. The
-     * response of the FindServers and GetEndpoints services can depend on the
-     * EndpointUrl used in the HEL message. */
-    if(client->config.endpoint.endpointUrl.length > 0) {
-        hello.endpointUrl = client->config.endpoint.endpointUrl;
-    } else if(client->discoveryUrl.length > 0) {
-        hello.endpointUrl = client->discoveryUrl;
-    } else {
-        hello.endpointUrl = client->config.endpointUrl;
-    }
+    hello.endpointUrl = getEndpointUrl(client);
 
     UA_Byte *bufPos = &message.data[8]; /* skip the header */
     const UA_Byte *bufEnd = &message.data[message.length];
@@ -1042,10 +1046,8 @@ requestGetEndpoints(UA_Client *client) {
 
     UA_GetEndpointsRequest request;
     UA_GetEndpointsRequest_init(&request);
-    if(client->discoveryUrl.length > 0)
-        request.endpointUrl = client->discoveryUrl;
-    else
-        request.endpointUrl = client->config.endpointUrl;
+    request.endpointUrl = getEndpointUrl(client);
+
     UA_StatusCode retval =
         __Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
                               (UA_ClientAsyncServiceCallback) responseGetEndpoints,

From 8f93e2f5a3aeef195084f21cbce875571e0fb454 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 16:20:35 +0100
Subject: [PATCH 1334/1963] refactor(client): Simplify requestGetEndpoints

---
 src/client/ua_client_connect.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index d3cfa1fe1a1..240d38e00f1 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1052,13 +1052,15 @@ requestGetEndpoints(UA_Client *client) {
         __Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST],
                               (UA_ClientAsyncServiceCallback) responseGetEndpoints,
                               &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], NULL, NULL);
-    if(retval == UA_STATUSCODE_GOOD)
-        client->endpointsHandshake = true;
-    else
+    if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "RequestGetEndpoints failed when sending the request with error code %s",
                      UA_StatusCode_name(retval));
-    return retval;
+        return retval;
+    }
+
+    client->endpointsHandshake = true;
+    return UA_STATUSCODE_GOOD;
 }
 
 static void

From 24df153c586271499ec6375d091628ee66f0587a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 16:21:00 +0100
Subject: [PATCH 1335/1963] refactor(client): Remove a potential memleak in
 responseFindServers

---
 src/client/ua_client_connect.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 240d38e00f1..aba6dfb7383 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1157,6 +1157,7 @@ responseFindServers(UA_Client *client, void *userdata,
                    "Continue with the EndpointURL %.*s.",
                    (int)client->config.endpointUrl.length,
                    client->config.endpointUrl.data);
+    UA_String_clear(&client->discoveryUrl);
     UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
 }
 

From 36a9db0766260efb446fa2739298ec6657a891cc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 16:27:13 +0100
Subject: [PATCH 1336/1963] refactor(client): initSecurityPolicy returns a
 StatusCode

---
 src/client/ua_client_connect.c | 37 +++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index aba6dfb7383..482070b6f96 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1304,16 +1304,9 @@ fixBadDiscoveryUrl(UA_Client* client) {
     client->connectStatus = UA_STATUSCODE_GOOD;
 }
 
-static void
+static UA_StatusCode
 initSecurityPolicy(UA_Client *client) {
-    /* Already initialized */
-    if(client->channel.securityPolicy)
-        return;
-
-    client->channel.securityMode = client->config.endpoint.securityMode;
-
-    if(client->channel.securityMode == UA_MESSAGESECURITYMODE_INVALID)
-        client->channel.securityMode = UA_MESSAGESECURITYMODE_NONE;
+    /* Find the SecurityPolicy */
     UA_SecurityPolicy *sp = NULL;
     if(client->config.endpoint.securityPolicyUri.length == 0) {
         sp = getSecurityPolicy(client,
@@ -1322,11 +1315,23 @@ initSecurityPolicy(UA_Client *client) {
         sp = getSecurityPolicy(client, client->config.endpoint.securityPolicyUri);
     }
 
-    if(sp) {
-        client->connectStatus =
-            UA_SecureChannel_setSecurityPolicy(&client->channel, sp,
-                                               &client->config.endpoint.serverCertificate);
-    }
+    /* Unknown SecurityPolicy -- we would never select such an endpoint */
+    if(!sp)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Already initialized -- check we are using the configured SecurityPolicy */
+    if(client->channel.securityPolicy)
+        return (client->channel.securityPolicy == sp) ?
+            UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Set the SecurityMode -- none if no endpoint is selected so far */
+    client->channel.securityMode = client->config.endpoint.securityMode;
+    if(client->channel.securityMode == UA_MESSAGESECURITYMODE_INVALID)
+        client->channel.securityMode = UA_MESSAGESECURITYMODE_NONE;
+
+    /* Instantiate the SecurityPolicy context with the remote certificate */
+    return UA_SecureChannel_setSecurityPolicy(&client->channel, sp,
+                                              &client->config.endpoint.serverCertificate);
 }
 
 static void
@@ -1629,7 +1634,7 @@ initConnect(UA_Client *client) {
     client->channel.processOPNHeader = verifyClientSecurechannelHeader;
 
     /* Initialize the SecurityPolicy */
-    initSecurityPolicy(client);
+    client->connectStatus = initSecurityPolicy(client);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return;
 
@@ -1995,7 +2000,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     client->channel.processOPNHeader = verifyClientSecurechannelHeader;
     client->channel.connectionId = 0;
 
-    initSecurityPolicy(client);
+    client->connectStatus = initSecurityPolicy(client);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return client->connectStatus;
 

From 4b7a94624e0e6f9f54087799886a2c87af625237 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 16:29:21 +0100
Subject: [PATCH 1337/1963] refactor(client): Fix indendation in
 verifyClientApplicationURI

---
 src/client/ua_client_connect.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 482070b6f96..7eeaf9545e0 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1451,10 +1451,10 @@ verifyClientApplicationURI(const UA_Client *client) {
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         UA_SecurityPolicy *sp = &client->config.securityPolicies[i];
         if(!sp->localCertificate.data) {
-                UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                "skip verifying ApplicationURI for the SecurityPolicy %.*s",
-                (int)sp->policyUri.length, sp->policyUri.data);
-                continue;
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                           "skip verifying ApplicationURI for the SecurityPolicy %.*s",
+                           (int)sp->policyUri.length, sp->policyUri.data);
+            continue;
         }
 
         UA_StatusCode retval =

From e3863b61850c450522d1ae838b8a240d6dd2457e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 19:54:57 +0100
Subject: [PATCH 1338/1963] refactor(server): Simplify getLeafCertificate

---
 src/server/ua_server_binary.c | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index d77f0ab83d9..f5cac21f7ab 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1032,30 +1032,29 @@ purgeFirstChannelWithoutSession(UA_BinaryProtocolManager *bpm) {
 
 /* Get pointer to leaf certificate of a specified valid chain of DER encoded
  * certificates */
-static void
-getLeafCertificate(const UA_ByteString *chain, UA_ByteString *leaf) {
+static UA_ByteString
+getLeafCertificate(const UA_ByteString chain) {
     /* Detect DER encoded X.509 v3 certificate. If the DER detection fails,
      * return the entire chain.
      *
      * The OPC UA standard requires this to be DER. But we also allow other
      * formats like PEM. Afterwards it depends on the crypto backend to parse
      * it. mbedTLS and OpenSSL detect the format automatically. */
-    if(chain->length < 4 || chain->data[0] != 0x30 || chain->data[1] != 0x82) {
-        *leaf = *chain;
-        return;
-    }
+    if(chain.length < 4 || chain.data[0] != 0x30 || chain.data[1] != 0x82)
+        return chain;
 
     /* The certificate length is encoded in the next 2 bytes. */
     size_t leafLen = 4; /* Magic numbers + length bytes */
-    leafLen += (size_t)(((uint16_t)chain->data[2]) << 8);
-    leafLen += chain->data[3];
+    leafLen += (size_t)(((uint16_t)chain.data[2]) << 8);
+    leafLen += chain.data[3];
 
-    /* Length consistency check */
-    if(leafLen > chain->length)
-        return;
+    /* Consistency check */
+    if(leafLen > chain.length)
+        return UA_BYTESTRING_NULL;
 
-    leaf->data = chain->data;
-    leaf->length = leafLen;
+    /* Adjust the length and return */
+    chain.length = leafLen;
+    return chain;
 }
 
 static UA_StatusCode
@@ -1088,13 +1087,11 @@ configServerSecureChannel(void *application, UA_SecureChannel *channel,
      * ApplicationInstanceCertificate. and ignore the extra bytes. See also: OPC
      * UA Part 6, V1.04, 6.7.2.3 Security Header, Table 42 - Asymmetric
      * algorithm Security header */
-    UA_ByteString appInstanceCertificate = UA_BYTESTRING_NULL;
-    getLeafCertificate(&asymHeader->senderCertificate, &appInstanceCertificate);
+    UA_ByteString appInstCert = getLeafCertificate(asymHeader->senderCertificate);
 
     /* Create the channel context and parse the sender (remote) certificate used
      * for the secureChannel. */
-    return UA_SecureChannel_setSecurityPolicy(channel, securityPolicy,
-                                              &appInstanceCertificate);
+    return UA_SecureChannel_setSecurityPolicy(channel, securityPolicy, &appInstCert);
 }
 
 static UA_StatusCode

From ce4db95a7bb134e8b4ea6c88ac37843f0abf125f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 19:57:09 +0100
Subject: [PATCH 1339/1963] refactor(core): Make getLeafCertificate available
 to the client

---
 src/server/ua_server_binary.c | 27 ---------------------------
 src/ua_util.c                 | 25 +++++++++++++++++++++++++
 src/ua_util_internal.h        |  4 ++++
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index f5cac21f7ab..6270a1e9c03 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1030,33 +1030,6 @@ purgeFirstChannelWithoutSession(UA_BinaryProtocolManager *bpm) {
     return false;
 }
 
-/* Get pointer to leaf certificate of a specified valid chain of DER encoded
- * certificates */
-static UA_ByteString
-getLeafCertificate(const UA_ByteString chain) {
-    /* Detect DER encoded X.509 v3 certificate. If the DER detection fails,
-     * return the entire chain.
-     *
-     * The OPC UA standard requires this to be DER. But we also allow other
-     * formats like PEM. Afterwards it depends on the crypto backend to parse
-     * it. mbedTLS and OpenSSL detect the format automatically. */
-    if(chain.length < 4 || chain.data[0] != 0x30 || chain.data[1] != 0x82)
-        return chain;
-
-    /* The certificate length is encoded in the next 2 bytes. */
-    size_t leafLen = 4; /* Magic numbers + length bytes */
-    leafLen += (size_t)(((uint16_t)chain.data[2]) << 8);
-    leafLen += chain.data[3];
-
-    /* Consistency check */
-    if(leafLen > chain.length)
-        return UA_BYTESTRING_NULL;
-
-    /* Adjust the length and return */
-    chain.length = leafLen;
-    return chain;
-}
-
 static UA_StatusCode
 configServerSecureChannel(void *application, UA_SecureChannel *channel,
                           const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
diff --git a/src/ua_util.c b/src/ua_util.c
index fbb8e314c23..85cb4a83e50 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -482,6 +482,31 @@ UA_Guid_random(void) {
     return result;
 }
 
+UA_ByteString
+getLeafCertificate(UA_ByteString chain) {
+    /* Detect DER encoded X.509 v3 certificate. If the DER detection fails,
+     * return the entire chain.
+     *
+     * The OPC UA standard requires this to be DER. But we also allow other
+     * formats like PEM. Afterwards it depends on the crypto backend to parse
+     * it. mbedTLS and OpenSSL detect the format automatically. */
+    if(chain.length < 4 || chain.data[0] != 0x30 || chain.data[1] != 0x82)
+        return chain;
+
+    /* The certificate length is encoded in the next 2 bytes. */
+    size_t leafLen = 4; /* Magic numbers + length bytes */
+    leafLen += (size_t)(((uint16_t)chain.data[2]) << 8);
+    leafLen += chain.data[3];
+
+    /* Consistency check */
+    if(leafLen > chain.length)
+        return UA_BYTESTRING_NULL;
+
+    /* Adjust the length and return */
+    chain.length = leafLen;
+    return chain;
+}
+
 /********************/
 /* Malloc Singleton */
 /********************/
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 9ebc58e483e..774a6495169 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -194,6 +194,10 @@ void UA_EXPORT
 UA_dump_hex_pkg(UA_Byte* buffer, size_t bufferLen);
 #endif
 
+/* Get pointer to leaf certificate of a specified valid chain of DER encoded
+ * certificates */
+UA_ByteString getLeafCertificate(UA_ByteString chain);
+
 /* Chunked for loop */
 #define FOR_EACH_CHUNK(CURSOR, SIZE, chunkSize, arraySize) \
         for((CURSOR) = 0, (SIZE) = (arraySize) <= (chunkSize) ? (arraySize) : (chunkSize); \

From c9efc586abbfb376edca2a62804a248499aff341 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 20:05:21 +0100
Subject: [PATCH 1340/1963] refactor(core): Remove the unused FOR_EACH_CHUNK
 macro

---
 src/ua_util_internal.h |  6 -----
 tests/check_utils.c    | 61 ------------------------------------------
 2 files changed, 67 deletions(-)

diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 774a6495169..6fdc53a5de2 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -198,12 +198,6 @@ UA_dump_hex_pkg(UA_Byte* buffer, size_t bufferLen);
  * certificates */
 UA_ByteString getLeafCertificate(UA_ByteString chain);
 
-/* Chunked for loop */
-#define FOR_EACH_CHUNK(CURSOR, SIZE, chunkSize, arraySize) \
-        for((CURSOR) = 0, (SIZE) = (arraySize) <= (chunkSize) ? (arraySize) : (chunkSize); \
-            (CURSOR) < (arraySize); \
-            (CURSOR) = (CURSOR) + (chunkSize), (SIZE) = (arraySize) - (CURSOR) <= (chunkSize) ? (arraySize) - (CURSOR) : (chunkSize))
-
 /* Unions that represent any of the supported request or response message */
 typedef union {
     UA_RequestHeader requestHeader;
diff --git a/tests/check_utils.c b/tests/check_utils.c
index a4d5851a0c2..540f7e8652a 100644
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -567,60 +567,6 @@ START_TEST(idOrderString) {
     ck_assert(UA_NodeId_order(&id_str_d, &id_str_c) == UA_ORDER_MORE);
 } END_TEST
 
-START_TEST(chunkForLoopFitting) {
-    size_t validator[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-    size_t start, size;
-    FOR_EACH_CHUNK(start, size, 2, 8) {
-        for(size_t i = start; i < start + size; i++) {
-            validator[i]++;
-        }
-    }
-    for(size_t i = 0; i < 8; i++) {
-        ck_assert_uint_eq(validator[i], 1);
-    }
-} END_TEST
-
-START_TEST(chunkForLoopUndersize) {
-    size_t validator[4] = {0, 0, 0, 0};
-    size_t start, size;
-
-    FOR_EACH_CHUNK(start, size, 6, 4) {
-        for(size_t i = start; i < start + size; i++) {
-            validator[i]++;
-        }
-    }
-    for(size_t i = 0; i < 4; i++) {
-        ck_assert_uint_eq(validator[i], 1);
-    }
-} END_TEST
-
-START_TEST(chunkForLoopWithRemainder) {
-    size_t validator[7] = {0, 0, 0, 0, 0, 0, 0};
-    size_t start, size;
-    FOR_EACH_CHUNK(start, size, 2, 7) {
-        for(size_t i = start; i < start + size; i++) {
-            validator[i]++;
-        }
-    }
-    for(size_t i = 0; i < 7; i++) {
-        ck_assert_uint_eq(validator[i], 1);
-    }
-} END_TEST
-
-START_TEST(chunkForLoopOneChunk) {
-    size_t validator[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-    size_t start, size;
-
-    FOR_EACH_CHUNK(start, size, 8, 8) {
-        for(size_t i = start; i < start + size; i++) {
-            validator[i]++;
-        }
-    }
-    for(size_t i = 0; i < 8; i++) {
-        ck_assert_uint_eq(validator[i], 1);
-    }
-} END_TEST
-
 static Suite* testSuite_Utils(void) {
     Suite *s = suite_create("Utils");
     TCase *tc_endpointUrl_split = tcase_create("EndpointUrl_split");
@@ -652,13 +598,6 @@ static Suite* testSuite_Utils(void) {
     tcase_add_test(tc1, idOrderString);
     suite_add_tcase(s, tc2);
 
-    TCase *tc3 = tcase_create("test chunk for loop");
-    tcase_add_test(tc3, chunkForLoopFitting);
-    tcase_add_test(tc3, chunkForLoopUndersize);
-    tcase_add_test(tc3, chunkForLoopWithRemainder);
-    tcase_add_test(tc3, chunkForLoopOneChunk);
-    suite_add_tcase(s, tc3);
-
     return s;
 }
 

From c65d3f3fcb788c5dd7c3e371cef9253f52a08308 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 20:37:52 +0100
Subject: [PATCH 1341/1963] feat(client): Verify the content of the
 UA_AsymmetricAlgorithmSecurityHeader

---
 src/client/ua_client_connect.c | 40 +++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 7eeaf9545e0..dcdae915007 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1436,10 +1436,40 @@ connectActivity(UA_Client *client) {
 }
 
 static UA_StatusCode
-verifyClientSecurechannelHeader(void *application, UA_SecureChannel *channel,
+verifyClientSecureChannelHeader(void *application, UA_SecureChannel *channel,
                                 const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
-    /* TODO: Verify if certificate is the same as configured in the client
-     * endpoint config */
+    UA_Client *client = (UA_Client*)application;
+    const UA_SecurityPolicy *sp = channel->securityPolicy;
+    UA_assert(sp != NULL);
+
+    /* Check the SecurityPolicyUri */
+    if(asymHeader->securityPolicyUri.length > 0 &&
+       !UA_String_equal(&sp->policyUri, &asymHeader->securityPolicyUri)) {
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                     "The server uses a different SecurityPolicy from the client");
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    }
+
+    /* If encryption is used, check that the server certificate for the
+     * endpoint is used for the SecureChannel */
+    UA_ByteString serverCert = getLeafCertificate(asymHeader->senderCertificate);
+    if(client->config.endpoint.serverCertificate.length > 0 &&
+       !UA_String_equal(&client->config.endpoint.serverCertificate, &serverCert)) {
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                     "The server certificate is different from the EndpointDescription");
+        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+    }
+
+    /* Verify the certificate the server assumes on our end */
+    UA_StatusCode res = sp->asymmetricModule.
+        compareCertificateThumbprint(sp, &asymHeader->receiverCertificateThumbprint);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                     "The server does not use the client certificate "
+                     "used for the selected SecurityPolicy");
+        return res;
+    }
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1631,7 +1661,7 @@ initConnect(UA_Client *client) {
     UA_SecureChannel_clear(&client->channel);
     client->channel.config = client->config.localConnectionConfig;
     client->channel.certificateVerification = &client->config.certificateVerification;
-    client->channel.processOPNHeader = verifyClientSecurechannelHeader;
+    client->channel.processOPNHeader = verifyClientSecureChannelHeader;
 
     /* Initialize the SecurityPolicy */
     client->connectStatus = initSecurityPolicy(client);
@@ -1997,7 +2027,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     UA_SecureChannel_init(&client->channel);
     client->channel.config = client->config.localConnectionConfig;
     client->channel.certificateVerification = &client->config.certificateVerification;
-    client->channel.processOPNHeader = verifyClientSecurechannelHeader;
+    client->channel.processOPNHeader = verifyClientSecureChannelHeader;
     client->channel.connectionId = 0;
 
     client->connectStatus = initSecurityPolicy(client);

From 03deba9412f201b376f40ab1bdc8c1d273b5ae88 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 21:12:59 +0100
Subject: [PATCH 1342/1963] fix(client): Remove potential memleaks in
 signActivateSessionRequest

---
 src/client/ua_client_connect.c | 127 ++++++++++++++++++---------------
 1 file changed, 70 insertions(+), 57 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index dcdae915007..fbbf2409b4e 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -111,26 +111,26 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
 
     const UA_SecurityPolicy *sp = channel->securityPolicy;
     UA_SignatureData *sd = &request->clientSignature;
+    const UA_SecurityPolicySignatureAlgorithm *signAlg =
+        &sp->asymmetricModule.cryptoModule.signatureAlgorithm;
 
-    /* Prepare the clientSignature */
-    size_t signatureSize = sp->asymmetricModule.cryptoModule.signatureAlgorithm.
-        getLocalSignatureSize(channel->channelContext);
-    UA_StatusCode retval = UA_String_copy(&sp->asymmetricModule.cryptoModule.signatureAlgorithm.uri,
-                                          &sd->algorithm);
+    /* Copy the signature algorithm identifier */
+    UA_StatusCode retval = UA_String_copy(&signAlg->uri, &sd->algorithm);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
+    /* Allocate memory for the signature */
+    size_t signatureSize = signAlg->getLocalSignatureSize(channel->channelContext);
     retval = UA_ByteString_allocBuffer(&sd->signature, signatureSize);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
     /* Allocate a temporary buffer */
-    size_t dataToSignSize = channel->remoteCertificate.length +
-        client->serverSessionNonce.length;
+    UA_ByteString dataToSign;
+    size_t dataToSignSize =
+        channel->remoteCertificate.length + client->serverSessionNonce.length;
     if(dataToSignSize > MAX_DATA_SIZE)
         return UA_STATUSCODE_BADINTERNALERROR;
-
-    UA_ByteString dataToSign;
     retval = UA_ByteString_allocBuffer(&dataToSign, dataToSignSize);
     if(retval != UA_STATUSCODE_GOOD)
         return retval; /* sd->signature is cleaned up with the response */
@@ -140,63 +140,76 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
            channel->remoteCertificate.length);
     memcpy(dataToSign.data + channel->remoteCertificate.length,
            client->serverSessionNonce.data, client->serverSessionNonce.length);
-    retval = sp->asymmetricModule.cryptoModule.signatureAlgorithm.sign(channel->channelContext,
-                                                  &dataToSign, &sd->signature);
+    retval = signAlg->sign(channel->channelContext, &dataToSign, &sd->signature);
     if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+        goto cleanup;
 
     /* Prepare the userTokenSignature */
-if(client->config.userTokenPolicy.tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
-    UA_SignatureData *utsd = &request->userTokenSignature;
-    UA_X509IdentityToken *userIdentityToken = (UA_X509IdentityToken *)
-        request->userIdentityToken.content.decoded.data;
-
-    /* Get the correct securityPolicy for authentication */
-    UA_SecurityPolicy* utpSecurityPolicy;
-    utpSecurityPolicy = getAuthSecurityPolicy(client, client->config.authSecurityPolicyUri);
-
-    /* We need a channel context with the user certificate in order to reuse
-    * the code for signing. */
-    void *tempChannelContext;
-    retval = utpSecurityPolicy->channelModule.
-        newContext(utpSecurityPolicy, &userIdentityToken->certificateData, &tempChannelContext);
-    if(retval != UA_STATUSCODE_GOOD)
-        return UA_STATUSCODE_BADINTERNALERROR;
+    if(client->config.userTokenPolicy.tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
+        /* Get the correct securityPolicy for authentication */
+        UA_SecurityPolicy *utsp =
+            getAuthSecurityPolicy(client, client->config.authSecurityPolicyUri);
+        if(!utsp) {
+            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                         "The configured SecurityPolicy for certificate "
+                         "authentication could not be found");
+            retval = UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
+            goto cleanup;
+        }
 
-    size_t userTokenSignatureSize = utpSecurityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.
-        getLocalSignatureSize(tempChannelContext);
-    retval = UA_String_copy(&utpSecurityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.uri,
-                            &utsd->algorithm);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+        UA_SignatureData *utsd = &request->userTokenSignature;
+        UA_X509IdentityToken *token = (UA_X509IdentityToken *)
+            request->userIdentityToken.content.decoded.data;
+        UA_SecurityPolicySignatureAlgorithm *utpSignAlg =
+            &utsp->asymmetricModule.cryptoModule.signatureAlgorithm;
+
+        /* Check the size of the content for signing */
+        UA_ByteString signData = UA_BYTESTRING_NULL;
+        size_t signDataSize =
+            channel->remoteCertificate.length + client->serverSessionNonce.length;
+        if(dataToSignSize > MAX_DATA_SIZE) {
+            retval = UA_STATUSCODE_BADINTERNALERROR;
+            goto cleanup;
+        }
 
-    retval = UA_ByteString_allocBuffer(&utsd->signature, userTokenSignatureSize);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+        /* Copy the algorithm identifier */
+        retval = UA_String_copy(&utpSignAlg->uri, &utsd->algorithm);
+        if(retval != UA_STATUSCODE_GOOD)
+            goto cleanup;
 
-    /* Allocate a temporary buffer */
-    size_t userTokenSignSize = channel->remoteCertificate.length +
-        client->serverSessionNonce.length;
-    if(dataToSignSize > MAX_DATA_SIZE)
-        return UA_STATUSCODE_BADINTERNALERROR;
+        /* We need a channel context with the user certificate in order to reuse
+         * the code for signing. */
+        void *tmpCtx;
+        retval = utsp->channelModule.newContext(utsp, &token->certificateData, &tmpCtx);
+        if(retval != UA_STATUSCODE_GOOD)
+            goto cleanup;
 
-    UA_ByteString userTokenSign;
-    retval = UA_ByteString_allocBuffer(&userTokenSign, userTokenSignSize);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval; /* sd->signature is cleaned up with the response */
+        /* Allocate memory for the signature */
+        retval = UA_ByteString_allocBuffer(&utsd->signature,
+                                           utpSignAlg->getLocalSignatureSize(tmpCtx));
+        if(retval != UA_STATUSCODE_GOOD)
+            goto cleanup_utp;
+
+        /* Allocate a temporary buffer for the data to be signed */
+        retval = UA_ByteString_allocBuffer(&signData, signDataSize);
+        if(retval != UA_STATUSCODE_GOOD)
+            goto cleanup_utp;
+
+        /* Create the userTokenSignature */
+        memcpy(signData.data, channel->remoteCertificate.data,
+               channel->remoteCertificate.length);
+        memcpy(signData.data + channel->remoteCertificate.length,
+               client->serverSessionNonce.data, client->serverSessionNonce.length);
+        retval = utpSignAlg->sign(tmpCtx, &signData, &utsd->signature);
+
+        /* Clean up */
+    cleanup_utp:
+        UA_ByteString_clear(&signData);
+        utsp->channelModule.deleteContext(tmpCtx);
+    }
 
-    /* Create the userTokenSignature */
-    memcpy(userTokenSign.data, channel->remoteCertificate.data,
-           channel->remoteCertificate.length);
-    memcpy(userTokenSign.data + channel->remoteCertificate.length,
-           client->serverSessionNonce.data, client->serverSessionNonce.length);
-    retval = utpSecurityPolicy->asymmetricModule.cryptoModule.signatureAlgorithm.sign(tempChannelContext,
-                                                  &userTokenSign, &utsd->signature);
-    /* Clean up */
-    UA_ByteString_clear(&userTokenSign);
-    utpSecurityPolicy->channelModule.deleteContext(tempChannelContext);
-}
     /* Clean up */
+ cleanup:
     UA_ByteString_clear(&dataToSign);
     return retval;
 }

From 76f4cfb925ba09f470b0618bac3092029ff18243 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 21:16:59 +0100
Subject: [PATCH 1343/1963] refactor(client): Simplifications in
 ua_client_connect.c

---
 src/client/ua_client_connect.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index fbbf2409b4e..c6f3a3bc308 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -69,16 +69,13 @@ getAuthSecurityPolicy(UA_Client *client, UA_String policyUri) {
 }
 #endif
 
+/* The endpoint is unconfigured if the description is all zeroed-out */
 static UA_Boolean
 endpointUnconfigured(UA_Client *client) {
-    char test = 0;
-    char *pos = (char *)&client->config.endpoint;
-    for(size_t i = 0; i < sizeof(UA_EndpointDescription); i++)
-        test = test | *(pos + i);
-    pos = (char *)&client->config.userTokenPolicy;
-    for(size_t i = 0; i < sizeof(UA_UserTokenPolicy); i++)
-        test = test | *(pos + i);
-    return (test == 0);
+    UA_EndpointDescription tmp;
+    UA_EndpointDescription_init(&tmp);
+    return UA_equal(&tmp, &client->config.endpoint,
+                    &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 }
 
 UA_Boolean
@@ -342,8 +339,9 @@ checkCreateSessionSignature(UA_Client *client, const UA_SecureChannel *channel,
     memcpy(dataToVerify.data + lc->length, client->clientSessionNonce.data,
            client->clientSessionNonce.length);
 
-    retval = sp->asymmetricModule.cryptoModule.signatureAlgorithm.verify(channel->channelContext, &dataToVerify,
-                                                    &response->serverSignature.signature);
+    retval = sp->asymmetricModule.cryptoModule.signatureAlgorithm.
+        verify(channel->channelContext, &dataToVerify,
+               &response->serverSignature.signature);
     UA_ByteString_clear(&dataToVerify);
     return retval;
 }

From fd10e434ccb24720ac48caeda3ee3d8fba67af1e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 10 Dec 2023 22:02:40 +0100
Subject: [PATCH 1344/1963] feat(client): Fall back to the initial EndpointUrl
 if a connection fails

After FindServers / GetEndpoints a different EndpointUrl might be used.
---
 src/client/ua_client_connect.c | 150 ++++++++++++++++-----------------
 1 file changed, 74 insertions(+), 76 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index c6f3a3bc308..5c437bc49c1 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -49,6 +49,48 @@ getEndpointUrl(UA_Client *client) {
     }
 }
 
+/* If an EndpointUrl doesn't work (TCP connection fails), fall back to the
+ * initial EndpointUrl */
+static UA_StatusCode
+fallbackEndpointUrl(UA_Client* client) {
+    /* Cannot fallback, the initial EndpointUrl is already in use */
+    UA_String currentUrl = getEndpointUrl(client);
+    if(UA_String_equal(&currentUrl, &client->config.endpointUrl)) {
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                     "Could not open a TCP connection to the Endpoint at %.*s",
+                     (int)client->config.endpointUrl.length,
+                     client->config.endpointUrl.data);
+        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    }
+
+    if(client->config.endpoint.endpointUrl.length > 0) {
+        /* Overwrite the EndpointUrl of the Endpoint */
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                       "Could not open a TCP connection to the Endpoint at %.*s. "
+                       "Overriding the endpoint description with the initial "
+                       "EndpointUrl at %.*s.",
+                       (int)client->config.endpoint.endpointUrl.length,
+                       client->config.endpoint.endpointUrl.data,
+                       (int)client->config.endpointUrl.length,
+                       client->config.endpointUrl.data);
+        UA_String_clear(&client->config.endpoint.endpointUrl);
+        return UA_String_copy(&client->config.endpointUrl,
+                              &client->config.endpoint.endpointUrl);
+    } else {
+        /* Overwrite the DiscoveryUrl returned by FindServers */
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                       "The DiscoveryUrl returned by the FindServers service (%.*s) "
+                       "could not be connected. Continuing with the initial EndpointUrl "
+                       "%.*s for the GetEndpoints service.",
+                       (int)client->config.endpointUrl.length,
+                       client->config.endpointUrl.data,
+                       (int)client->config.endpointUrl.length,
+                       client->config.endpointUrl.data);
+        UA_String_clear(&client->discoveryUrl);
+        return UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
+    }
+}
+
 static UA_SecurityPolicy *
 getSecurityPolicy(UA_Client *client, UA_String policyUri) {
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
@@ -1294,27 +1336,6 @@ createSessionAsync(UA_Client *client) {
     return res;
 }
 
-/* A workaround if the DiscoveryUrl returned by the FindServers service doesn't work.
- * Then default back to the initial EndpointUrl and pretend that was returned
- * by FindServers. */
-static void
-fixBadDiscoveryUrl(UA_Client* client) {
-    if(client->connectStatus == UA_STATUSCODE_GOOD)
-        return;
-    if(client->discoveryUrl.length == 0 ||
-       UA_String_equal(&client->discoveryUrl, &client->config.endpointUrl))
-        return;
-
-    UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                   "The DiscoveryUrl returned by the FindServers service (%.*s) could not be "
-                   "connected. Trying with the original EndpointUrl.",
-                   (int)client->discoveryUrl.length, client->discoveryUrl.data);
-
-    UA_String_clear(&client->discoveryUrl);
-    UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
-    client->connectStatus = UA_STATUSCODE_GOOD;
-}
-
 static UA_StatusCode
 initSecurityPolicy(UA_Client *client) {
     /* Find the SecurityPolicy */
@@ -1522,51 +1543,34 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_Client *client = (UA_Client*)application;
     UA_LOCK(&client->clientMutex);
 
-    UA_LOG_TRACE(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                 "Client network callback");
+    UA_LOG_TRACE(client->config.logging, UA_LOGCATEGORY_CLIENT, "Client network callback");
 
-    /* A new connection is not yet registered */
+    /* A new connection with no context pointer attached */
     if(!*connectionContext) {
-        /* Opening the connection failed. The client cannot recover from this. */
-        if(state != UA_CONNECTIONSTATE_OPENING &&
-           state != UA_CONNECTIONSTATE_ESTABLISHED) {
-            goto refuse_connection;
-        }
-
         /* Inconsistent SecureChannel state. Has to be fresh for a new
          * connection. */
         if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED &&
            client->channel.state != UA_SECURECHANNELSTATE_REVERSE_LISTENING) {
             UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                         "Cannot open a connection for SecureChannel that is already used");
+                         "Cannot open a connection, the SecureChannel is already used");
             client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
-            goto refuse_connection;
+            notifyClientState(client);
+            UA_UNLOCK(&client->clientMutex);
+            return;
         }
 
         /* Initialize the client connection and attach to the EventLoop connection */
         client->channel.connectionManager = cm;
         client->channel.connectionId = connectionId;
         *connectionContext = &client->channel;
-
-        /* If the connection is not fully established we still save the
-         * connectionId in the client now so that the connection can be closed
-         * before it fully opens. Wait for the connection to be established
-         * before sending the HEL message. */
-        if(state == UA_CONNECTIONSTATE_OPENING)
-            client->channel.state = UA_SECURECHANNELSTATE_CONNECTING;
-        else {
-            if(client->channel.state == UA_SECURECHANNELSTATE_REVERSE_LISTENING)
-                client->channel.state = UA_SECURECHANNELSTATE_REVERSE_CONNECTED;
-            else /* state == UA_CONNECTIONSTATE_ESTABLISHED */
-                client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
-        }
-        
-        goto continue_connect;
     }
 
     /* The connection is closing in the EventLoop. This is the last callback
      * from that connection. Clean up the SecureChannel in the client. */
     if(state == UA_CONNECTIONSTATE_CLOSING) {
+        UA_LOG_INFO_CHANNEL(client->config.logging, &client->channel,
+                            "SecureChannel closed");
+
         /* Set to closing (could be done already in UA_SecureChannel_shutdown).
          * This impacts the handling of cancelled requests below. */
         UA_SecureChannelState oldState = client->channel.state;
@@ -1585,26 +1589,30 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         UA_SecureChannel_clear(&client->channel);
 
         /* The connection closed before it actually opened. Since we are
-         * connecting asynchronously, this happens when the server does not
-         * exist or is unresponsive. */
-        if(oldState == UA_SECURECHANNELSTATE_CONNECTING) {
-            UA_LOG_INFO_CHANNEL(client->config.logging, &client->channel,
-                                "Could not open the connection");
-            goto refuse_connection; /* The client cannot recover from this */
-        }
-
-        UA_LOG_INFO_CHANNEL(client->config.logging, &client->channel,
-                            "Closed the SecureChannel");
+         * connecting asynchronously, this happens when the TCP connection
+         * fails. Try to fall back on the initial EndpointUrl. */
+        if(oldState == UA_SECURECHANNELSTATE_CONNECTING &&
+           client->connectStatus == UA_STATUSCODE_GOOD)
+            client->connectStatus = fallbackEndpointUrl(client);
 
         /* Try to reconnect */
         goto continue_connect;
     }
 
-    /* The connection has opened on the TCP level. Set the SecureChannel state
-     * to reflect this. Otherwise later consistency checks for the received
-     * messages fail. */
-    if(client->channel.state < UA_SECURECHANNELSTATE_CONNECTED)
-        client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
+    /* Update the SecureChannel state */
+    if(UA_LIKELY(state == UA_CONNECTIONSTATE_ESTABLISHED)) {
+        /* The connection is now open on the TCP level. Set the SecureChannel
+         * state to reflect this. Otherwise later consistency checks for the
+         * received messages fail. */
+        if(client->channel.state == UA_SECURECHANNELSTATE_REVERSE_LISTENING)
+            client->channel.state = UA_SECURECHANNELSTATE_REVERSE_CONNECTED;
+        if(client->channel.state < UA_SECURECHANNELSTATE_CONNECTED)
+            client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
+    } else /* state == UA_CONNECTIONSTATE_OPENING */ {
+        /* The connection was opened on our end only. Waiting for the TCP handshake
+         * to complete. */
+        client->channel.state = UA_SECURECHANNELSTATE_CONNECTING;
+    }
 
     /* Received a message. Process the message with the SecureChannel. */
     UA_StatusCode res =
@@ -1615,9 +1623,9 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                      "Processing the message returned the error code %s",
                      UA_StatusCode_name(res));
 
-        /* If connecting has failed before the SecureChannel has opened, then
-         * the client cannot recover. Set the connectStatus to reflect this. The
-         * application is notified when the socket has closed. */
+        /* If processing the buffer fails before the SecureChannel has opened,
+         * then the client cannot recover. Set the connectStatus to reflect
+         * this. The application is notified when the socket has closed. */
         if(client->channel.state != UA_SECURECHANNELSTATE_OPEN)
             client->connectStatus = res;
 
@@ -1633,20 +1641,10 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         return;
     }
 
-    /* Trigger the next action from our end to fully open up the connection */
  continue_connect:
-    fixBadDiscoveryUrl(client);
+    /* Trigger the next action from our end to fully open up the connection */
     if(!isFullyConnected(client))
         connectActivity(client);
-
-    /* Notify the application if the client state has changed */
-    notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
-    return;
-
- refuse_connection:
-    client->connectStatus = UA_STATUSCODE_BADCONNECTIONREJECTED;
-    fixBadDiscoveryUrl(client);
     notifyClientState(client);
     UA_UNLOCK(&client->clientMutex);
 }

From 16a182ea2e2fb872a0d0a826dc4b498f125ee697 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 15 Dec 2023 21:44:15 +0100
Subject: [PATCH 1345/1963] fix(core): Reset sequence numbers in
 UA_SecureChannel_close

This was missed when the client reuses its SecureChannel structure.
Some servers want the client to start the sequence number close to zero.

Reported by Mike Granby in #6177.
---
 src/ua_securechannel.c | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index f62aaf58fcb..6cef858ebc1 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -102,6 +102,22 @@ void
 UA_SecureChannel_close(UA_SecureChannel *channel) {
     /* Set the status to closed */
     channel->state = UA_SECURECHANNELSTATE_CLOSED;
+    channel->renewState = UA_SECURECHANNELRENEWSTATE_NORMAL;
+
+    /* Reset the SecurityMode and config */
+    channel->securityMode = UA_MESSAGESECURITYMODE_INVALID;
+    memset(&channel->config, 0, sizeof(UA_ConnectionConfig));
+
+    /* Clean up the SecurityToken */
+    UA_ChannelSecurityToken_clear(&channel->securityToken);
+    UA_ChannelSecurityToken_clear(&channel->altSecurityToken);
+
+    /* Delete the channel context for the security policy */
+    if(channel->securityPolicy) {
+        channel->securityPolicy->channelModule.deleteContext(channel->channelContext);
+        channel->securityPolicy = NULL;
+        channel->channelContext = NULL;
+    }
 
     /* Detach from the connection and close the connection */
     if(channel->connection) {
@@ -110,6 +126,15 @@ UA_SecureChannel_close(UA_SecureChannel *channel) {
         UA_Connection_detachSecureChannel(channel->connection);
     }
 
+    /* Clean up certificate and nonces */
+    UA_ByteString_clear(&channel->remoteCertificate);
+    UA_ByteString_clear(&channel->localNonce);
+    UA_ByteString_clear(&channel->remoteNonce);
+
+    /* Reset the sequence numbers */
+    channel->receiveSequenceNumber = 0;
+    channel->sendSequenceNumber = 0;
+
     /* Detach Sessions from the SecureChannel. This also removes outstanding
      * Publish requests whose RequestId is valid only for the SecureChannel. */
     UA_SessionHeader *sh;
@@ -122,19 +147,7 @@ UA_SecureChannel_close(UA_SecureChannel *channel) {
         }
     }
 
-    /* Delete the channel context for the security policy */
-    if(channel->securityPolicy) {
-        channel->securityPolicy->channelModule.deleteContext(channel->channelContext);
-        channel->securityPolicy = NULL;
-        channel->channelContext = NULL;
-    }
-
-    /* Delete members */
-    UA_ByteString_clear(&channel->remoteCertificate);
-    UA_ByteString_clear(&channel->localNonce);
-    UA_ByteString_clear(&channel->remoteNonce);
-    UA_ChannelSecurityToken_clear(&channel->securityToken);
-    UA_ChannelSecurityToken_clear(&channel->altSecurityToken);
+    /* Delete remaining chunks */
     UA_SecureChannel_deleteBuffered(channel);
 }
 

From abaa3408a042045485bf036459590467b71fc78d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Dec 2023 21:47:15 +0100
Subject: [PATCH 1346/1963] refactor(server): Always use the subscription from
 the MonitoredItem structure

---
 src/server/ua_services_attribute.c      | 10 ++++------
 src/server/ua_services_subscription.c   |  3 +--
 src/server/ua_subscription.c            |  2 +-
 src/server/ua_subscription.h            | 11 ++++-------
 src/server/ua_subscription_datachange.c | 21 +++++++++------------
 5 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 809d228d8a8..04c8669ce0a 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1622,14 +1622,12 @@ triggerImmediateDataChange(UA_Server *server, UA_Session *session,
         UA_DataValue_init(&value);
         ReadWithNode(node, server, session, mon->timestampsToReturn,
                      &mon->itemToMonitor, &value);
-        UA_Subscription *sub = mon->subscription;
-        UA_StatusCode res = sampleCallbackWithValue(server, sub, mon, &value);
+        UA_StatusCode res = UA_MonitoredItem_sampleCallbackWithValue(server, mon, &value);
         if(res != UA_STATUSCODE_GOOD) {
             UA_DataValue_clear(&value);
-            UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
-                                        "MonitoredItem %" PRIi32 " | "
-                                        "Sampling returned the statuscode %s",
-                                        mon->monitoredItemId,
+            UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, mon->subscription,
+                                        "MonitoredItem %" PRIi32 " | Sampling returned "
+                                        "the statuscode %s", mon->monitoredItemId,
                                         UA_StatusCode_name(res));
         }
     }
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 67bfc22d0e9..1a9f5860d92 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -609,8 +609,7 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
                 continue;
 
             /* Create a notification with the last sampled value */
-            UA_MonitoredItem_createDataChangeNotification(server, newSub, mon,
-                                                          &mon->lastValue);
+            UA_MonitoredItem_createDataChangeNotification(server, mon, &mon->lastValue);
         }
     }
 
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 714bf5e3258..e1d4dbace5a 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -667,7 +667,7 @@ UA_Subscription_resendData(UA_Server *server, UA_Subscription *sub) {
             continue;
         if(mon->queueSize > 0)
             continue;
-        UA_MonitoredItem_createDataChangeNotification(server, sub, mon, &mon->lastValue);
+        UA_MonitoredItem_createDataChangeNotification(server, mon, &mon->lastValue);
     }
 }
 
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index ff62df88d84..7a51084e5f0 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -194,12 +194,11 @@ UA_MonitoredItem_setMonitoringMode(UA_Server *server, UA_MonitoredItem *mon,
                                    UA_MonitoringMode monitoringMode);
 
 void
-UA_MonitoredItem_sampleCallback(UA_Server *server,
-                                UA_MonitoredItem *monitoredItem);
+UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon);
 
 UA_StatusCode
-sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
-                        UA_MonitoredItem *mon, UA_DataValue *value);
+UA_MonitoredItem_sampleCallbackWithValue(UA_Server *server, UA_MonitoredItem *mon,
+                                         UA_DataValue *value);
 
 UA_StatusCode
 UA_MonitoredItem_removeLink(UA_Subscription *sub, UA_MonitoredItem *mon,
@@ -210,9 +209,7 @@ UA_MonitoredItem_addLink(UA_Subscription *sub, UA_MonitoredItem *mon,
                          UA_UInt32 linkId);
 
 UA_StatusCode
-UA_MonitoredItem_createDataChangeNotification(UA_Server *server,
-                                              UA_Subscription *sub,
-                                              UA_MonitoredItem *mon,
+UA_MonitoredItem_createDataChangeNotification(UA_Server *server, UA_MonitoredItem *mon,
                                               const UA_DataValue *value);
 
 /* Remove entries until mon->maxQueueSize is reached. Sets infobits for lost
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index 4ec7bd8915b..a42babd846f 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -125,8 +125,8 @@ detectValueChange(UA_Server *server, UA_MonitoredItem *mon, const UA_DataValue *
 }
 
 UA_StatusCode
-UA_MonitoredItem_createDataChangeNotification(UA_Server *server, UA_Subscription *sub,
-                                              UA_MonitoredItem *mon, const UA_DataValue *dv) {
+UA_MonitoredItem_createDataChangeNotification(UA_Server *server, UA_MonitoredItem *mon,
+                                              const UA_DataValue *dv) {
     /* Allocate a new notification */
     UA_Notification *newNot = UA_Notification_new();
     if(!newNot)
@@ -142,15 +142,14 @@ UA_MonitoredItem_createDataChangeNotification(UA_Server *server, UA_Subscription
     }
 
     /* Enqueue the notification */
-    UA_assert(sub);
     UA_Notification_enqueueAndTrigger(server, newNot);
     return UA_STATUSCODE_GOOD;
 }
 
 /* Moves the value to the MonitoredItem if successful */
 UA_StatusCode
-sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
-                        UA_MonitoredItem *mon, UA_DataValue *value) {
+UA_MonitoredItem_sampleCallbackWithValue(UA_Server *server, UA_MonitoredItem *mon,
+                                         UA_DataValue *value) {
     UA_assert(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -166,9 +165,9 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
 
     /* The MonitoredItem is attached to a subscription (not server-local).
      * Prepare a notification and enqueue it. */
-    if(sub) {
+    if(mon->subscription) {
         UA_StatusCode retval =
-            UA_MonitoredItem_createDataChangeNotification(server, sub, mon, value);
+            UA_MonitoredItem_createDataChangeNotification(server, mon, value);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
     }
@@ -182,7 +181,7 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
     /* Call the local callback if the MonitoredItem is not attached to a
      * subscription. Do this at the very end. Because the callback might delete
      * the subscription. */
-    if(!sub) {
+    if(!mon->subscription) {
         UA_LocalMonitoredItem *localMon = (UA_LocalMonitoredItem*) mon;
         void *nodeContext = NULL;
         getNodeContext(server, mon->itemToMonitor.nodeId, &nodeContext);
@@ -209,9 +208,7 @@ monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_Subscription *sub = mon->subscription;
-    UA_Session *session = &server->adminSession;
-    if(sub)
-        session = sub->session;
+    UA_Session *session = (sub) ? &server->adminSession : sub->session;
 
     UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub, "MonitoredItem %" PRIi32
                               " | Sample callback called", mon->monitoredItemId);
@@ -223,7 +220,7 @@ monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
                                          mon->timestampsToReturn);
 
     /* Operate on the sample. The sample is consumed when the status is good. */
-    UA_StatusCode res = sampleCallbackWithValue(server, sub, mon, &dv);
+    UA_StatusCode res = UA_MonitoredItem_sampleCallbackWithValue(server, mon, &dv);
     if(res != UA_STATUSCODE_GOOD) {
         UA_DataValue_clear(&dv);
         UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,

From 0bf81493094a3ff681ad66dead88a121b68e4fb0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Dec 2023 22:02:07 +0100
Subject: [PATCH 1347/1963] refactor(server): Reuse UA_Subscription_resendData
 in subscription transfer

---
 src/server/ua_services_subscription.c | 22 ++--------------------
 src/server/ua_subscription.c          |  8 ++++++++
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 1a9f5860d92..27219c2ebff 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -592,26 +592,8 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     UA_Subscription_publish(server, sub);
 
     /* Re-create notifications with the current values for the new subscription */
-    if(*sendInitialValues) {
-        LIST_FOREACH(mon, &newSub->monitoredItems, listEntry) {
-
-            /* Create only DataChange notifications */
-            if(mon->itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER)
-                continue;
-
-            /* Only if the mode is monitoring */
-            if(mon->monitoringMode != UA_MONITORINGMODE_REPORTING)
-                continue;
-
-            /* If a value is queued for a data MonitoredItem, the next value in
-             * the queue is sent in the Publish response. */
-            if(mon->queueSize > 0)
-                continue;
-
-            /* Create a notification with the last sampled value */
-            UA_MonitoredItem_createDataChangeNotification(server, mon, &mon->lastValue);
-        }
-    }
+    if(*sendInitialValues)
+        UA_Subscription_resendData(server, newSub);
 
     /* Do not update the statistics for the number of Subscriptions here. The
      * fact that we duplicate the subscription and move over the content is just
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index e1d4dbace5a..9f8d0d6bb2e 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -661,12 +661,20 @@ UA_Subscription_resendData(UA_Server *server, UA_Subscription *sub) {
      * last value sent is repeated in the Publish response. */
     UA_MonitoredItem *mon;
     LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
+        /* Create only DataChange notifications */
         if(mon->itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER)
             continue;
+
+        /* Only if the mode is monitoring */
         if(mon->monitoringMode != UA_MONITORINGMODE_REPORTING)
             continue;
+
+        /* If a value is queued for a data MonitoredItem, the next value in
+         * the queue is sent in the Publish response. */
         if(mon->queueSize > 0)
             continue;
+
+        /* Create a notification with the last sampled value */
         UA_MonitoredItem_createDataChangeNotification(server, mon, &mon->lastValue);
     }
 }

From 8f3811fa658c12d0c74f48a1c7cee2632ae6f61c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Dec 2023 22:07:28 +0100
Subject: [PATCH 1348/1963] refactor(server): Simplify processing of a sampled
 value in MonitoredItem

---
 src/server/ua_services_attribute.c      |  9 +----
 src/server/ua_subscription.h            |  8 +++--
 src/server/ua_subscription_datachange.c | 46 +++++++++++--------------
 3 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 04c8669ce0a..d02c8693b1b 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1622,14 +1622,7 @@ triggerImmediateDataChange(UA_Server *server, UA_Session *session,
         UA_DataValue_init(&value);
         ReadWithNode(node, server, session, mon->timestampsToReturn,
                      &mon->itemToMonitor, &value);
-        UA_StatusCode res = UA_MonitoredItem_sampleCallbackWithValue(server, mon, &value);
-        if(res != UA_STATUSCODE_GOOD) {
-            UA_DataValue_clear(&value);
-            UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, mon->subscription,
-                                        "MonitoredItem %" PRIi32 " | Sampling returned "
-                                        "the statuscode %s", mon->monitoredItemId,
-                                        UA_StatusCode_name(res));
-        }
+        UA_MonitoredItem_processSampledValue(server, mon, &value);
     }
 }
 #endif
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 7a51084e5f0..3c0990d3c89 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -196,9 +196,11 @@ UA_MonitoredItem_setMonitoringMode(UA_Server *server, UA_MonitoredItem *mon,
 void
 UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon);
 
-UA_StatusCode
-UA_MonitoredItem_sampleCallbackWithValue(UA_Server *server, UA_MonitoredItem *mon,
-                                         UA_DataValue *value);
+/* Do not use the value after calling this. It will be moved to the notification
+ * or freed. */
+void
+UA_MonitoredItem_processSampledValue(UA_Server *server, UA_MonitoredItem *mon,
+                                     UA_DataValue *value);
 
 UA_StatusCode
 UA_MonitoredItem_removeLink(UA_Subscription *sub, UA_MonitoredItem *mon,
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index a42babd846f..b37edf0466d 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -146,10 +146,9 @@ UA_MonitoredItem_createDataChangeNotification(UA_Server *server, UA_MonitoredIte
     return UA_STATUSCODE_GOOD;
 }
 
-/* Moves the value to the MonitoredItem if successful */
-UA_StatusCode
-UA_MonitoredItem_sampleCallbackWithValue(UA_Server *server, UA_MonitoredItem *mon,
-                                         UA_DataValue *value) {
+void
+UA_MonitoredItem_processSampledValue(UA_Server *server, UA_MonitoredItem *mon,
+                                     UA_DataValue *value) {
     UA_assert(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
@@ -160,16 +159,22 @@ UA_MonitoredItem_sampleCallbackWithValue(UA_Server *server, UA_MonitoredItem *mo
                                   "MonitoredItem %" PRIi32 " | "
                                   "The value has not changed", mon->monitoredItemId);
         UA_DataValue_clear(value);
-        return UA_STATUSCODE_GOOD;
+        return;
     }
 
     /* The MonitoredItem is attached to a subscription (not server-local).
      * Prepare a notification and enqueue it. */
     if(mon->subscription) {
-        UA_StatusCode retval =
+        UA_StatusCode res =
             UA_MonitoredItem_createDataChangeNotification(server, mon, value);
-        if(retval != UA_STATUSCODE_GOOD)
-            return retval;
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, mon->subscription,
+                                        "MonitoredItem %" PRIi32 " | "
+                                        "Processing the sample returned the statuscode %s",
+                                        mon->monitoredItemId, UA_StatusCode_name(res));
+            UA_DataValue_clear(value);
+            return;
+        }
     }
 
     /* <-- Point of no return --> */
@@ -192,8 +197,6 @@ UA_MonitoredItem_sampleCallbackWithValue(UA_Server *server, UA_MonitoredItem *mo
                                               mon->itemToMonitor.attributeId, value);
         UA_LOCK(&server->serviceMutex);
     }
-
-    return UA_STATUSCODE_GOOD;
 }
 
 void
@@ -206,28 +209,19 @@ UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
 void
 monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_assert(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
 
     UA_Subscription *sub = mon->subscription;
-    UA_Session *session = (sub) ? &server->adminSession : sub->session;
-
     UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub, "MonitoredItem %" PRIi32
                               " | Sample callback called", mon->monitoredItemId);
 
-    UA_assert(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER);
-
-    /* Sample the value. The sample can still point into the node. */
+    /* Sample the current value */
+    UA_Session *session = (sub) ? sub->session : &server->adminSession;
     UA_DataValue dv = readWithSession(server, session, &mon->itemToMonitor,
-                                         mon->timestampsToReturn);
-
-    /* Operate on the sample. The sample is consumed when the status is good. */
-    UA_StatusCode res = UA_MonitoredItem_sampleCallbackWithValue(server, mon, &dv);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_DataValue_clear(&dv);
-        UA_LOG_WARNING_SUBSCRIPTION(server->config.logging, sub,
-                                    "MonitoredItem %" PRIi32 " | "
-                                    "Sampling returned the statuscode %s",
-                                    mon->monitoredItemId, UA_StatusCode_name(res));
-    }
+                                      mon->timestampsToReturn);
+
+    /* Process the sample. This always clears the value. */
+    UA_MonitoredItem_processSampledValue(server, mon, &dv);
 }
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */

From 0dd8500436f73bee29c212763b1c0c89dc0f30b7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Dec 2023 22:57:59 +0100
Subject: [PATCH 1349/1963] refactor(server): Remove unused
 UA_EventFilterResult from UA_Notification

---
 src/server/ua_subscription.h               |  1 -
 src/server/ua_subscription_events.c        | 13 ++++++++-----
 src/server/ua_subscription_monitoreditem.c |  1 -
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 3c0990d3c89..39823878e4f 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -62,7 +62,6 @@ typedef struct UA_Notification {
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
     UA_Boolean isOverflowEvent; /* Counted manually */
-    UA_EventFilterResult result;
 #endif
 } UA_Notification;
 
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 7c719aa62b0..71eca8733c7 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -189,13 +189,16 @@ UA_MonitoredItem_addEvent(UA_Server *server, UA_MonitoredItem *mon,
 
     /* The MonitoredItem must be attached to a Subscription. This code path is
      * not taken for local MonitoredItems (once they are enabled for Events). */
+    UA_assert(mon->subscription);
     UA_Subscription *sub = mon->subscription;
-    UA_assert(sub);
-
     UA_Session *session = sub->session;
-    UA_StatusCode retval = filterEvent(server, session, event,
-                                       eventFilter, &notification->data.event,
-                                       &notification->result);
+
+    UA_EventFilterResult res; /* FilterResult contains only statuscodes. Ignored
+                               * outside the initial setup/validation. */
+    UA_EventFilterResult_init(&res);
+    UA_StatusCode retval = filterEvent(server, session, event, eventFilter,
+                                       &notification->data.event, &res);
+    UA_EventFilterResult_clear(&res);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_Notification_delete(notification);
         if(retval == UA_STATUSCODE_BADNOMATCH)
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index b08b0aa0864..b70be4bbd54 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -192,7 +192,6 @@ UA_Notification_delete(UA_Notification *n) {
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
         case UA_ATTRIBUTEID_EVENTNOTIFIER:
             UA_EventFieldList_clear(&n->data.event);
-            UA_EventFilterResult_clear(&n->result);
             break;
 #endif
         default:

From bee3ae68266926f3addd97142d96098c327b074c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Dec 2023 23:22:46 +0100
Subject: [PATCH 1350/1963] refactor(server): Cleanups in ua_subscription.h

---
 src/server/ua_subscription.h               | 24 +++++++---------------
 src/server/ua_subscription_monitoreditem.c |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 39823878e4f..4f03d624ee2 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -169,15 +169,10 @@ struct UA_MonitoredItem {
 };
 
 void UA_MonitoredItem_init(UA_MonitoredItem *mon);
-
-void
-UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *monitoredItem);
-
-void
-UA_MonitoredItem_removeOverflowInfoBits(UA_MonitoredItem *mon);
-
-void
-UA_Server_registerMonitoredItem(UA_Server *server, UA_MonitoredItem *mon);
+void UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *mon);
+void UA_MonitoredItem_removeOverflowInfoBits(UA_MonitoredItem *mon);
+void UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon);
+void UA_Server_registerMonitoredItem(UA_Server *server, UA_MonitoredItem *mon);
 
 /* Register sampling. Either by adding a repeated callback or by adding the
  * MonitoredItem to a linked list in the node. */
@@ -185,18 +180,14 @@ UA_StatusCode
 UA_MonitoredItem_registerSampling(UA_Server *server, UA_MonitoredItem *mon);
 
 void
-UA_MonitoredItem_unregisterSampling(UA_Server *server,
-                                    UA_MonitoredItem *mon);
+UA_MonitoredItem_unregisterSampling(UA_Server *server, UA_MonitoredItem *mon);
 
 UA_StatusCode
 UA_MonitoredItem_setMonitoringMode(UA_Server *server, UA_MonitoredItem *mon,
                                    UA_MonitoringMode monitoringMode);
 
-void
-UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon);
 
-/* Do not use the value after calling this. It will be moved to the notification
- * or freed. */
+/* Do not use the value after calling this. It will be moved to mon or freed. */
 void
 UA_MonitoredItem_processSampledValue(UA_Server *server, UA_MonitoredItem *mon,
                                      UA_DataValue *value);
@@ -215,8 +206,7 @@ UA_MonitoredItem_createDataChangeNotification(UA_Server *server, UA_MonitoredIte
 
 /* Remove entries until mon->maxQueueSize is reached. Sets infobits for lost
  * data if required. */
-void
-UA_MonitoredItem_ensureQueueSpace(UA_Server *server, UA_MonitoredItem *mon);
+void UA_MonitoredItem_ensureQueueSpace(UA_Server *server, UA_MonitoredItem *mon);
 
 /****************/
 /* Subscription */
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index b70be4bbd54..95ca6b3dfab 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -234,7 +234,7 @@ UA_Notification_enqueueMon(UA_Server *server, UA_Notification *n) {
                               (long unsigned)mon->parameters.queueSize);
 }
 
-void
+static void
 UA_Notification_enqueueSub(UA_Notification *n) {
     UA_MonitoredItem *mon = n->mon;
     UA_assert(mon);

From 371ed0f95e585179f1c5205781e19b3573669474 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 18 Dec 2023 22:22:27 +0100
Subject: [PATCH 1351/1963] fix(server): Fix a missing array index in the event
 filter code

---
 src/server/ua_subscription_events_filter.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 74615ac29f3..a05ce1c1ff4 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -1056,13 +1056,15 @@ filterEvent(UA_Server *server, UA_Session *session,
             UA_EventFilterResult_clear(result);
             return UA_STATUSCODE_BADOUTOFMEMORY;
         }
-        for(size_t i = 0; i < result->whereClauseResult.elementResultsSize; ++i) {
-            result->whereClauseResult.elementResults[i].operandStatusCodesSize =
-            filter->whereClause.elements->filterOperandsSize;
-            result->whereClauseResult.elementResults[i].operandStatusCodes = (UA_StatusCode *)
-                UA_Array_new(filter->whereClause.elements->filterOperandsSize,
-                             &UA_TYPES[UA_TYPES_STATUSCODE]);
-            if(!result->whereClauseResult.elementResults[i].operandStatusCodes) {
+
+        for(size_t i = 0; i < filter->whereClause.elementsSize; ++i) {
+            UA_ContentFilterElementResult *er =
+                &result->whereClauseResult.elementResults[i];
+            UA_ContentFilterElement *cf = &filter->whereClause.elements[i];
+            er->operandStatusCodesSize = cf->filterOperandsSize;
+            er->operandStatusCodes = (UA_StatusCode *)
+                UA_Array_new(er->operandStatusCodesSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
+            if(!er->operandStatusCodes) {
                 UA_EventFieldList_clear(efl);
                 UA_EventFilterResult_clear(result);
                 return UA_STATUSCODE_BADOUTOFMEMORY;

From e03d32b5cec155fea5816ef8f7a948a1e62b0aeb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 18 Dec 2023 22:22:43 +0100
Subject: [PATCH 1352/1963] refactor(server): Cosmetic cleanups in
 ua_subscription_events_filter.c

---
 src/server/ua_subscription_events_filter.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index a05ce1c1ff4..945d67b0ef3 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -1046,7 +1046,7 @@ filterEvent(UA_Server *server, UA_Session *session,
     }
 
     /* Prepare content filter result structure */
-    if(filter->whereClause.elementsSize != 0) {
+    if(filter->whereClause.elementsSize > 0) {
         result->whereClauseResult.elementResultsSize = filter->whereClause.elementsSize;
         result->whereClauseResult.elementResults = (UA_ContentFilterElementResult *)
             UA_Array_new(filter->whereClause.elementsSize,
@@ -1073,7 +1073,8 @@ filterEvent(UA_Server *server, UA_Session *session,
     }
 
     /* Evaluate the where filter. Do we event need to consider the event? */
-    UA_StatusCode res = evaluateWhereClause(server, session, eventNode, &filter->whereClause,
+    UA_StatusCode res = evaluateWhereClause(server, session, eventNode,
+                                            &filter->whereClause,
                                             &result->whereClauseResult);
     if(res != UA_STATUSCODE_GOOD){
         UA_EventFieldList_clear(efl);
@@ -1084,13 +1085,15 @@ filterEvent(UA_Server *server, UA_Session *session,
     /* Apply the select filter */
     UA_NodeId baseEventTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
     for(size_t i = 0; i < filter->selectClausesSize; i++) {
+        UA_SimpleAttributeOperand *sc = &filter->selectClauses[i];
         /* Check if the browsePath is BaseEventType, in which case nothing more
          * needs to be checked */
-        if(!UA_NodeId_equal(&filter->selectClauses[i].typeDefinitionId, &baseEventTypeId) &&
-           !isValidEvent(server, &filter->selectClauses[i].typeDefinitionId, eventNode)) {
+        if(!UA_NodeId_equal(&sc->typeDefinitionId, &baseEventTypeId) &&
+           !isValidEvent(server, &sc->typeDefinitionId, eventNode)) {
             UA_Variant_init(&efl->eventFields[i]);
             /* EventFilterResult currently isn't being used
-            notification->result.selectClauseResults[i] = UA_STATUSCODE_BADTYPEDEFINITIONINVALID; */
+               notification->result.selectClauseResults[i] =
+                   UA_STATUSCODE_BADTYPEDEFINITIONINVALID; */
             continue;
         }
 
@@ -1098,7 +1101,7 @@ filterEvent(UA_Server *server, UA_Session *session,
          * select-field cannot be resolved. */
         result->selectClauseResults[i] =
             resolveSimpleAttributeOperand(server, session, eventNode,
-                                          &filter->selectClauses[i], &efl->eventFields[i]);
+                                          sc, &efl->eventFields[i]);
     }
 
     return UA_STATUSCODE_GOOD;

From 326101e4c576d9f2c5379743e043acacf3cc9deb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 22 Dec 2023 23:40:55 +0100
Subject: [PATCH 1353/1963] fix(core): Remove a memleak in JSON decoding of
 ExtensionObjects

---
 src/ua_types_encoding_json.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 98750ba5041..bd5bfe7f123 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2462,17 +2462,20 @@ DECODE_JSON(ExtensionObject) {
     if(ret != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADENCODINGERROR;
 
+    /* Decode the DataType */
     unsigned int oldIndex = ctx->index; /* to restore later */
     ctx->index = (UA_UInt16)searchTypeIdResult;
     ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
-    if(ret != UA_STATUSCODE_GOOD)
+    ctx->index = oldIndex; /* Restore the index */
+    if(ret != UA_STATUSCODE_GOOD) {
+        UA_NodeId_clear(&typeId); /* Type NodeId not used anymore and not moved into dst */
         return ret;
+    }
 
-    /* Restore the index to the beginning of the object  */
-    ctx->index = oldIndex;
+    /* Lookup the DataType */
+    const UA_DataType *typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
 
     /* If the type is not known, decode the body as an opaque JSON decoding */
-    const UA_DataType *typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
     if(!typeOfBody) {
         /* Dont decode body: 1. save as bytestring, 2. jump over */
         dst->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING;

From 18355b5ee152c4c9bd2ed695f07fd683a267efc7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 00:01:51 +0100
Subject: [PATCH 1354/1963] fix(core): Fix a memleak in the Variant decoding

---
 src/ua_types_encoding_json.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index bd5bfe7f123..c6df5dac007 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2168,9 +2168,7 @@ unwrappedExtensionObjectType(ParseCtx *ctx) {
         return NULL;
     }
 
-    /* Get the type NodeId */
-    UA_NodeId typeId;
-    UA_NodeId_init(&typeId);
+    /* Get the type NodeId index */
     size_t searchTypeIdResult = 0;
     ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
     if(ret != UA_STATUSCODE_GOOD) {
@@ -2178,14 +2176,14 @@ unwrappedExtensionObjectType(ParseCtx *ctx) {
         return NULL;
     }
 
+    /* Decode and lookup the type */
+    UA_NodeId typeId;
+    UA_NodeId_init(&typeId);
+    const UA_DataType *typeOfBody = NULL;
     ctx->index = (UA_UInt16)searchTypeIdResult;
     ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
-    if(ret != UA_STATUSCODE_GOOD) {
-        ctx->index = oldIndex; /* Restore the index */
-        return NULL;
-    }
-
-    const UA_DataType *typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
+    if(UA_LIKELY(ret == UA_STATUSCODE_GOOD))
+        typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
     UA_NodeId_clear(&typeId);
     if(!typeOfBody) {
         ctx->index = oldIndex; /* Restore the index */

From 72cf578fe9dcfc8e0d9028bb92de601a3c74937e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 00:02:19 +0100
Subject: [PATCH 1355/1963] refactor(core): Make assertions instead of checks
 when a JSON index must point to an object

---
 src/ua_types_encoding_json.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index c6df5dac007..6cd12d931bb 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1786,6 +1786,10 @@ DECODE_JSON(QualifiedName) {
 
 UA_FUNC_ATTR_WARN_UNUSED_RESULT status
 lookAheadForKey(ParseCtx *ctx, const char *key, size_t *resultIndex) {
+    /* The current index must point to the beginning of an object.
+     * This has to be ensured by the caller. */
+    UA_assert(currentTokenType(ctx) == CJ5_TOKEN_OBJECT);
+
     status ret = UA_STATUSCODE_BADNOTFOUND;
     unsigned int oldIndex = ctx->index; /* Save index for later restore */
     unsigned int end = ctx->tokens[ctx->index].end;
@@ -1817,6 +1821,8 @@ lookAheadForKey(ParseCtx *ctx, const char *key, size_t *resultIndex) {
 static status
 prepareDecodeNodeIdJson(ParseCtx *ctx, UA_NodeId *dst,
                         u8 *fieldCount, DecodeEntry *entries) {
+    UA_assert(currentTokenType(ctx) == CJ5_TOKEN_OBJECT);
+
     /* possible keys: Id, IdType, NamespaceIndex */
     /* Id must always be present */
     entries[*fieldCount].fieldName = UA_JSONKEY_ID;
@@ -2140,8 +2146,7 @@ VariantDimension_decodeJson(ParseCtx *ctx, void *dst, const UA_DataType *type) {
 
 static const UA_DataType *
 unwrappedExtensionObjectType(ParseCtx *ctx) {
-    if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT)
-        return NULL;
+    UA_assert(currentTokenType(ctx) == CJ5_TOKEN_OBJECT);
 
     unsigned int oldIndex = ctx->index; /* Save index to restore later */
 
@@ -2284,7 +2289,7 @@ DECODE_JSON(Variant) {
     size_t searchResultType = 0;
     status ret = lookAheadForKey(ctx, UA_JSONKEY_TYPE, &searchResultType);
     if(ret != UA_STATUSCODE_GOOD) {
-         skipObject(ctx);
+        skipObject(ctx);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -2479,14 +2484,10 @@ DECODE_JSON(ExtensionObject) {
         dst->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING;
         dst->content.encoded.typeId = typeId; /* Move the type NodeId */
 
-        /* Check if an object */
-        if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT)
-            return UA_STATUSCODE_BADDECODINGERROR;
-
-        /* Search for body to save */
+        /* Search for body */
         size_t bodyIndex = 0;
         ret = lookAheadForKey(ctx, UA_JSONKEY_BODY, &bodyIndex);
-        if(ret != UA_STATUSCODE_GOOD || bodyIndex >= (size_t)ctx->tokensSize)
+        if(ret != UA_STATUSCODE_GOOD)
             return UA_STATUSCODE_BADDECODINGERROR;
 
         /* Get the size of the Object as a string, not the Object key count! */
@@ -2499,10 +2500,10 @@ DECODE_JSON(ExtensionObject) {
         ret = UA_ByteString_allocBuffer(&dst->content.encoded.body, sizeOfJsonString);
         if(ret != UA_STATUSCODE_GOOD)
             return ret;
-
         memcpy(dst->content.encoded.body.data, bodyJsonString, sizeOfJsonString);
 
-        skipObject(ctx); /* ctx->index still at the object beginning. Skip. */
+        /* Success. Skip to the end of the object. */
+        skipObject(ctx);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -2529,6 +2530,7 @@ DECODE_JSON(ExtensionObject) {
 static status
 Variant_decodeJsonUnwrapExtensionObject(ParseCtx *ctx,void *p, const UA_DataType *type) {
     (void) type;
+    CHECK_OBJECT;
 
     UA_Variant *dst = (UA_Variant*)p;
     if(currentTokenType(ctx) == CJ5_TOKEN_NULL) {
@@ -2553,7 +2555,6 @@ Variant_decodeJsonUnwrapExtensionObject(ParseCtx *ctx,void *p, const UA_DataType
         UA_NodeId_clear(&typeId);
         return ret;
     }
-
     ctx->index = old_index; /* restore the index */
 
     /* Find the DataType from the NodeId */

From 22439eb93e7731a95061e24b2a6c3d269400487b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 00:56:58 +0100
Subject: [PATCH 1356/1963] refactor(core): Simplify decodeFields in JSON
 decoding

---
 src/ua_types_encoding_json.c | 101 ++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 56 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 6cd12d931bb..22bc6cdfb8d 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2656,10 +2656,10 @@ decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
 
     /* Keys and values are counted separately */
     UA_assert(ctx->tokens[ctx->index].size % 2 == 0);
-    size_t objectCount = (size_t)(ctx->tokens[ctx->index].size) / 2;
+    size_t keyCount = (size_t)(ctx->tokens[ctx->index].size) / 2;
 
     /* Empty object, nothing to decode */
-    if(objectCount == 0) {
+    if(keyCount == 0) {
         ctx->depth--;
         ctx->index++; /* Jump to the element after the empty object */
         return UA_STATUSCODE_GOOD;
@@ -2667,76 +2667,65 @@ decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
 
     ctx->index++; /* Go to first key */
 
-    /* CHECK_TOKEN_BOUNDS */
-    if(ctx->index >= ctx->tokensSize) {
-        ctx->depth--;
-        return UA_STATUSCODE_BADDECODINGERROR;
-    }
-
     status ret = UA_STATUSCODE_GOOD;
-    for(size_t currObj = 0; currObj < objectCount &&
-            ctx->index < ctx->tokensSize; currObj++) {
-
+    for(size_t key = 0; key < keyCount; key++) {
         /* Key must be a string */
+        UA_assert(ctx->index < ctx->tokensSize);
         UA_assert(currentTokenType(ctx) == CJ5_TOKEN_STRING);
 
-        /* Start searching at the index of currObj */
-        for(size_t i = currObj; i < entryCount + currObj; i++) {
-            /* Search for key, if found outer loop will be one less. Best case
-             * if objectCount is in order! */
-            size_t index = i % entryCount;
-
-            /* CHECK_TOKEN_BOUNDS */
-            if(ctx->index >= ctx->tokensSize) {
-                ret = UA_STATUSCODE_BADDECODINGERROR;
-                goto cleanup;
-            }
-
+        /* Search for the decoding entry matching the key */
+        size_t i = 0;
+        for(; i < entryCount; i++) {
+            /* Compare the key */
             if(jsoneq(ctx->json5, &ctx->tokens[ctx->index],
-                      entries[index].fieldName) != 0)
+                      entries[i].fieldName) != 0)
                 continue;
 
-            /* Duplicate key found, abort */
-            if(entries[index].found) {
+            /* Key was already used -> duplicate, abort */
+            if(entries[i].found) {
                 ret = UA_STATUSCODE_BADDECODINGERROR;
                 goto cleanup;
             }
 
-            entries[index].found = true;
+            /* Found the key */
+            entries[i].found = true;
+            break;
+        }
 
-            ctx->index++; /* Go from key to value */
+        /* The key is unknown */
+        if(i == entryCount) {
+            ret = UA_STATUSCODE_BADDECODINGERROR;
+            break;
+        }
 
-            /* CHECK_TOKEN_BOUNDS */
-            if(ctx->index >= ctx->tokensSize) {
-                ret = UA_STATUSCODE_BADDECODINGERROR;
-                goto cleanup;
-            }
+        /* Go from key to value */
+        ctx->index++;
+        UA_assert(ctx->index < ctx->tokensSize);
 
-            /* An entry that was expected, but shall not be decoded.
-             * Jump over it. */
-            if(!entries[index].function && !entries[index].type) {
-                skipObject(ctx);
-                break;
-            }
+        /* An entry that was expected, but shall not be decoded.
+         * Jump over it. */
+        if(!entries[i].function && !entries[i].type) {
+            skipObject(ctx);
+            continue;
+        }
 
-            /* A null-value -> skip the decoding (as a convention, if we know
-             * the type here, the value must be already initialized) */
-            if(currentTokenType(ctx) == CJ5_TOKEN_NULL && entries[index].type) {
-                ctx->index++;
-                break;
-            }
+        /* A null-value -> skip the decoding (as a convention, if we know
+         * the type here, the value is already initialized) */
+        if(currentTokenType(ctx) == CJ5_TOKEN_NULL && entries[i].type) {
+            ctx->index++; /* skip null value */
+            continue;
+        }
 
-            /* Decode */
-            if(entries[index].function) /* Specialized decoding function */
-                ret = entries[index].function(ctx, entries[index].fieldPointer,
-                                              entries[index].type);
-            else /* Decode by type-kind */
-                ret = decodeJsonJumpTable[entries[index].type->typeKind]
-                    (ctx, entries[index].fieldPointer, entries[index].type);
-            if(ret != UA_STATUSCODE_GOOD)
-                goto cleanup;
+        /* Decode. This also moves to the next key or right after the object for
+         * the last value. */
+        if(entries[i].function) /* Specialized decoding function */
+            ret = entries[i].function(ctx, entries[i].fieldPointer,
+                                          entries[i].type);
+        else /* Decode by type-kind */
+            ret = decodeJsonJumpTable[entries[i].type->typeKind]
+                (ctx, entries[i].fieldPointer, entries[i].type);
+        if(ret != UA_STATUSCODE_GOOD)
             break;
-        }
     }
 
  cleanup:
@@ -2755,7 +2744,7 @@ Array_decodeJson(ParseCtx *ctx, void **dst, const UA_DataType *type) {
     size_t length = (size_t)ctx->tokens[ctx->index].size;
 
     ctx->index++; /* Go to first array member or to the first element after
-                        * the array (if empty) */
+                   * the array (if empty) */
 
     /* Return early for empty arrays */
     if(length == 0) {

From 6a51f8e2b25b54e8766a3dd95a1585e47a79d3e0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 02:07:59 +0100
Subject: [PATCH 1357/1963] fix(util): Fix an infinite recursion in the parsing
 of pretty-printed ExpandedNodeId

---
 src/ua_types_lex.c  | 4 +++-
 src/ua_types_lex.re | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ua_types_lex.c b/src/ua_types_lex.c
index c26cee7536c..5f21af11e53 100644
--- a/src/ua_types_lex.c
+++ b/src/ua_types_lex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 3.0 */
+/* Generated by re2c 3.1 */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -428,6 +428,7 @@ parse_expandednodeid(UA_ExpandedNodeId *id, const char *pos, const char *end) {
 	YYSKIP();
 	yych = YYPEEK();
 	switch (yych) {
+		case 0x00:
 		case '\n': goto yy20;
 		case ';':
 			YYSTAGP(context.yyt4);
@@ -470,6 +471,7 @@ parse_expandednodeid(UA_ExpandedNodeId *id, const char *pos, const char *end) {
 	YYSKIP();
 	yych = YYPEEK();
 	switch (yych) {
+		case 0x00:
 		case '\n': goto yy20;
 		case ';': goto yy30;
 		default: goto yy29;
diff --git a/src/ua_types_lex.re b/src/ua_types_lex.re
index e087087c390..6f974ec1add 100644
--- a/src/ua_types_lex.re
+++ b/src/ua_types_lex.re
@@ -176,8 +176,10 @@ parse_expandednodeid(UA_ExpandedNodeId *id, const char *pos, const char *end) {
     const char *svr = NULL, *svre = NULL, *nsu = NULL, *ns = NULL, *body = NULL;
 
     /*!re2c
+    // The "." character class also matches \x00. Exlude this as we produce
+    // an infinite sequence of zeros once the end of the buffer was hit.
     ("svr=" @svr [0-9]+ @svre ";")?
-    ("ns=" @ns [0-9]+ ";" | "nsu=" @nsu (.\";")* ";")?
+    ("ns=" @ns [0-9]+ ";" | "nsu=" @nsu (.\[;\x00])* ";")?
     @body nodeid_body {
         (void)pos; // Get rid of a dead store clang-analyzer warning
         if(svr) {

From 7a128b73c7e6a188c4e5c66b9428dee5f05145a4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 11:47:42 +0100
Subject: [PATCH 1358/1963] refactor(core): Simplify decodeFields for the JSON
 decoding

---
 src/ua_types_encoding_json.c | 52 +++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 22bc6cdfb8d..0254abf2a8f 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2652,20 +2652,13 @@ decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
 
     if(ctx->depth >= UA_JSON_ENCODING_MAX_RECURSION - 1)
         return UA_STATUSCODE_BADENCODINGERROR;
-    ctx->depth++;
 
     /* Keys and values are counted separately */
     UA_assert(ctx->tokens[ctx->index].size % 2 == 0);
     size_t keyCount = (size_t)(ctx->tokens[ctx->index].size) / 2;
 
-    /* Empty object, nothing to decode */
-    if(keyCount == 0) {
-        ctx->depth--;
-        ctx->index++; /* Jump to the element after the empty object */
-        return UA_STATUSCODE_GOOD;
-    }
-
-    ctx->index++; /* Go to first key */
+    ctx->index++; /* Go to first key - or jump after the empty object */
+    ctx->depth++;
 
     status ret = UA_STATUSCODE_GOOD;
     for(size_t key = 0; key < keyCount; key++) {
@@ -2673,27 +2666,34 @@ decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
         UA_assert(ctx->index < ctx->tokensSize);
         UA_assert(currentTokenType(ctx) == CJ5_TOKEN_STRING);
 
-        /* Search for the decoding entry matching the key */
-        size_t i = 0;
-        for(; i < entryCount; i++) {
+        /* Search for the decoding entry matching the key. Start at the key
+         * index to speed-up the case where they key-order is the same as the
+         * entry-order. */
+        DecodeEntry *entry = NULL;
+        for(size_t i = key; i < key + entryCount; i++) {
+            size_t ii = i;
+            while(ii >= entryCount)
+                ii -= entryCount;
+
             /* Compare the key */
             if(jsoneq(ctx->json5, &ctx->tokens[ctx->index],
-                      entries[i].fieldName) != 0)
+                      entries[ii].fieldName) != 0)
                 continue;
 
             /* Key was already used -> duplicate, abort */
-            if(entries[i].found) {
-                ret = UA_STATUSCODE_BADDECODINGERROR;
-                goto cleanup;
+            if(entries[ii].found) {
+                ctx->depth--;
+                return UA_STATUSCODE_BADDECODINGERROR;
             }
 
             /* Found the key */
-            entries[i].found = true;
+            entries[ii].found = true;
+            entry = &entries[ii];
             break;
         }
 
         /* The key is unknown */
-        if(i == entryCount) {
+        if(!entry) {
             ret = UA_STATUSCODE_BADDECODINGERROR;
             break;
         }
@@ -2703,32 +2703,28 @@ decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
         UA_assert(ctx->index < ctx->tokensSize);
 
         /* An entry that was expected, but shall not be decoded.
-         * Jump over it. */
-        if(!entries[i].function && !entries[i].type) {
+         * Jump over the value. */
+        if(!entry->function && !entry->type) {
             skipObject(ctx);
             continue;
         }
 
         /* A null-value -> skip the decoding (as a convention, if we know
          * the type here, the value is already initialized) */
-        if(currentTokenType(ctx) == CJ5_TOKEN_NULL && entries[i].type) {
+        if(currentTokenType(ctx) == CJ5_TOKEN_NULL && entry->type) {
             ctx->index++; /* skip null value */
             continue;
         }
 
         /* Decode. This also moves to the next key or right after the object for
          * the last value. */
-        if(entries[i].function) /* Specialized decoding function */
-            ret = entries[i].function(ctx, entries[i].fieldPointer,
-                                          entries[i].type);
-        else /* Decode by type-kind */
-            ret = decodeJsonJumpTable[entries[i].type->typeKind]
-                (ctx, entries[i].fieldPointer, entries[i].type);
+        decodeJsonSignature decodeFunc = (entry->function) ?
+            entry->function : decodeJsonJumpTable[entry->type->typeKind];
+        ret = decodeFunc(ctx, entry->fieldPointer, entry->type);
         if(ret != UA_STATUSCODE_GOOD)
             break;
     }
 
- cleanup:
     ctx->depth--;
     return ret;
 }

From 3b16c4b7c7b05a9f36c4f8a39fea15cdd1614220 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 14:28:50 +0100
Subject: [PATCH 1359/1963] refactor(core): Cosmetic improvements for JSON
 decoding

---
 src/ua_types_encoding_json.c | 84 +++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 0254abf2a8f..e7b45394400 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1831,14 +1831,14 @@ prepareDecodeNodeIdJson(ParseCtx *ctx, UA_NodeId *dst,
     entries[*fieldCount].function = NULL;
 
     /* IdType */
-    size_t searchResult = 0;
-    status ret = lookAheadForKey(ctx, UA_JSONKEY_IDTYPE, &searchResult);
+    size_t idIndex = 0;
+    status ret = lookAheadForKey(ctx, UA_JSONKEY_IDTYPE, &idIndex);
     if(ret == UA_STATUSCODE_GOOD) {
-        size_t size = getTokenLength(&ctx->tokens[searchResult]);
+        size_t size = getTokenLength(&ctx->tokens[idIndex]);
         if(size < 1)
             return UA_STATUSCODE_BADDECODINGERROR;
 
-        const char *idType = &ctx->json5[ctx->tokens[searchResult].start];
+        const char *idType = &ctx->json5[ctx->tokens[idIndex].start];
 
         if(idType[0] == '2') {
             dst->identifierType = UA_NODEIDTYPE_GUID;
@@ -2174,8 +2174,8 @@ unwrappedExtensionObjectType(ParseCtx *ctx) {
     }
 
     /* Get the type NodeId index */
-    size_t searchTypeIdResult = 0;
-    ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
+    size_t typeIdIndex = 0;
+    UA_StatusCode ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &typeIdIndex);
     if(ret != UA_STATUSCODE_GOOD) {
         ctx->index = oldIndex; /* Restore the index */
         return NULL;
@@ -2185,7 +2185,7 @@ unwrappedExtensionObjectType(ParseCtx *ctx) {
     UA_NodeId typeId;
     UA_NodeId_init(&typeId);
     const UA_DataType *typeOfBody = NULL;
-    ctx->index = (UA_UInt16)searchTypeIdResult;
+    ctx->index = (UA_UInt16)typeIdIndex;
     ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
     if(UA_LIKELY(ret == UA_STATUSCODE_GOOD))
         typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
@@ -2195,8 +2195,8 @@ unwrappedExtensionObjectType(ParseCtx *ctx) {
         return NULL;
     }
 
-    /* Loop over all members and see if they have the correct type */
-    ctx->index = (unsigned int)(searchArrayBody + 1);
+    /* Loop over all members check whether they can be unwrapped */
+    ctx->index = (unsigned int)(arrayIndex + 1);
 
     for(size_t i = 0; i < length; i++) {
         /* Array element must be an object */
@@ -2206,21 +2206,21 @@ unwrappedExtensionObjectType(ParseCtx *ctx) {
         }
 
         /* Check for non-JSON encoding */
-        unsigned int objectIndex = ctx->index;
-        size_t encodingPos = 0;
-        ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encodingPos);
+        size_t objIndex = ctx->index;
+        size_t encIndex = 0;
+        ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encIndex);
         if(ret == UA_STATUSCODE_GOOD) {
             ctx->index = oldIndex; /* Restore the index */
             return NULL;
         }
 
         /* Decode the type NodeId and compare */
-        ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
+        ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &typeIdIndex);
         if(ret != UA_STATUSCODE_GOOD) {
             ctx->index = oldIndex; /* Restore the index */
             return NULL;
         }
-        ctx->index = (UA_UInt16)searchTypeIdResult;
+        ctx->index = (UA_UInt16)typeIdIndex;
         ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
         if(ret != UA_STATUSCODE_GOOD) {
             ctx->index = oldIndex; /* Restore the index */
@@ -2234,7 +2234,7 @@ unwrappedExtensionObjectType(ParseCtx *ctx) {
         }
 
         /* Skip forward */
-        ctx->index = objectIndex;
+        ctx->index = objIndex;
         skipObject(ctx);
     }
 
@@ -2286,19 +2286,19 @@ DECODE_JSON(Variant) {
     CHECK_OBJECT;
 
     /* First search for the variant type in the json object. */
-    size_t searchResultType = 0;
-    status ret = lookAheadForKey(ctx, UA_JSONKEY_TYPE, &searchResultType);
+    size_t typeIndex = 0;
+    status ret = lookAheadForKey(ctx, UA_JSONKEY_TYPE, &typeIndex);
     if(ret != UA_STATUSCODE_GOOD) {
         skipObject(ctx);
         return UA_STATUSCODE_GOOD;
     }
 
     /* Parse the type */
-    size_t size = getTokenLength(&ctx->tokens[searchResultType]);
-    if(size == 0 || ctx->tokens[searchResultType].type != CJ5_TOKEN_NUMBER)
+    size_t size = getTokenLength(&ctx->tokens[typeIndex]);
+    if(size == 0 || ctx->tokens[typeIndex].type != CJ5_TOKEN_NUMBER)
         return UA_STATUSCODE_BADDECODINGERROR;
     UA_UInt64 idTypeDecoded = 0;
-    const char *idTypeEncoded = &ctx->json5[ctx->tokens[searchResultType].start];
+    const char *idTypeEncoded = &ctx->json5[ctx->tokens[typeIndex].start];
     size_t len = parseUInt64(idTypeEncoded, size, &idTypeDecoded);
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -2316,27 +2316,27 @@ DECODE_JSON(Variant) {
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* Search for body */
-    size_t searchResultBody = 0;
-    ret = lookAheadForKey(ctx, UA_JSONKEY_BODY, &searchResultBody);
+    size_t bodyIndex = 0;
+    ret = lookAheadForKey(ctx, UA_JSONKEY_BODY, &bodyIndex);
     if(ret != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* Value is an array? */
-    UA_Boolean isArray = (ctx->tokens[searchResultBody].type == CJ5_TOKEN_ARRAY);
+    UA_Boolean isArray = (ctx->tokens[bodyIndex].type == CJ5_TOKEN_ARRAY);
 
     /* TODO: Handling of null-arrays (length -1) needs to be clarified
      *
-     * if(tokenIsNull(ctx, searchResultBody)) {
+     * if(tokenIsNull(ctx, bodyIndex)) {
      *     isArray = true;
      *     dst->arrayLength = 0;
      * } */
 
     /* Has the variant dimension? */
     UA_Boolean hasDimension = false;
-    size_t searchResultDim = 0;
-    ret = lookAheadForKey(ctx, UA_JSONKEY_DIMENSION, &searchResultDim);
+    size_t dimIndex = 0;
+    ret = lookAheadForKey(ctx, UA_JSONKEY_DIMENSION, &dimIndex);
     if(ret == UA_STATUSCODE_GOOD)
-        hasDimension = (ctx->tokens[searchResultDim].size > 0);
+        hasDimension = (ctx->tokens[dimIndex].size > 0);
 
     /* No array but has dimension -> error */
     if(!isArray && hasDimension)
@@ -2371,10 +2371,7 @@ DECODE_JSON(Variant) {
             }
         }
 
-        size_t entriesCount = 3;
-        if(!hasDimension)
-            entriesCount = 2; /* Use the first 2 fields only */
-        return decodeFields(ctx, entries, entriesCount);
+        return decodeFields(ctx, entries, (hasDimension) ? 3 : 2);
     }
 
     /* Decode a value wrapped in an ExtensionObject */
@@ -2429,15 +2426,15 @@ DECODE_JSON(ExtensionObject) {
     }
 
     /* Search for Encoding */
-    size_t encodingPos = 0;
-    status ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encodingPos);
+    size_t encIndex = 0;
+    status ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encIndex);
 
     /* UA_JSONKEY_ENCODING found */
     if(ret == UA_STATUSCODE_GOOD) {
         /* Parse the encoding */
         UA_UInt64 encoding = 0;
-        const char *extObjEncoding = &ctx->json5[ctx->tokens[encodingPos].start];
-        size_t size = getTokenLength(&ctx->tokens[encodingPos]);
+        const char *extObjEncoding = &ctx->json5[ctx->tokens[encIndex].start];
+        size_t size = getTokenLength(&ctx->tokens[encIndex]);
         parseUInt64(extObjEncoding, size, &encoding);
 
         if(encoding == 1) {
@@ -2460,16 +2457,16 @@ DECODE_JSON(ExtensionObject) {
     UA_NodeId typeId;
     UA_NodeId_init(&typeId);
 
-    size_t searchTypeIdResult = 0;
-    ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
+    size_t typeIdIndex = 0;
+    ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &typeIdIndex);
     if(ret != UA_STATUSCODE_GOOD)
         return UA_STATUSCODE_BADENCODINGERROR;
 
     /* Decode the DataType */
-    unsigned int oldIndex = ctx->index; /* to restore later */
-    ctx->index = (UA_UInt16)searchTypeIdResult;
+    unsigned int oldIndex = ctx->index;
+    ctx->index = (UA_UInt16)typeIdIndex;
     ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
-    ctx->index = oldIndex; /* Restore the index */
+    ctx->index = oldIndex;
     if(ret != UA_STATUSCODE_GOOD) {
         UA_NodeId_clear(&typeId); /* Type NodeId not used anymore and not moved into dst */
         return ret;
@@ -2702,16 +2699,15 @@ decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
         ctx->index++;
         UA_assert(ctx->index < ctx->tokensSize);
 
-        /* An entry that was expected, but shall not be decoded.
+        /* An entry that was expected but shall not be decoded.
          * Jump over the value. */
         if(!entry->function && !entry->type) {
             skipObject(ctx);
             continue;
         }
 
-        /* A null-value -> skip the decoding (as a convention, if we know
-         * the type here, the value is already initialized) */
-        if(currentTokenType(ctx) == CJ5_TOKEN_NULL && entry->type) {
+        /* A null-value, skip the decoding (the value is already initialized) */
+        if(currentTokenType(ctx) == CJ5_TOKEN_NULL && !entry->function) {
             ctx->index++; /* skip null value */
             continue;
         }

From 40a2564e22a62f7b656249552e5700bf59da737c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 14:29:48 +0100
Subject: [PATCH 1360/1963] refactor(core): Avoid duplicate array index lookup
 in JSON decoding

---
 src/ua_types_encoding_json.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index e7b45394400..58e9a3469fe 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2145,20 +2145,12 @@ VariantDimension_decodeJson(ParseCtx *ctx, void *dst, const UA_DataType *type) {
 }
 
 static const UA_DataType *
-unwrappedExtensionObjectType(ParseCtx *ctx) {
-    UA_assert(currentTokenType(ctx) == CJ5_TOKEN_OBJECT);
-
-    unsigned int oldIndex = ctx->index; /* Save index to restore later */
+unwrapArrayExtensionObjectType(ParseCtx *ctx, size_t arrayIndex) {
+    UA_assert(ctx->tokens[arrayIndex].type == CJ5_TOKEN_ARRAY);
 
-    /* Check the body array */
-    size_t searchArrayBody = 0;
-    status ret = lookAheadForKey(ctx, UA_JSONKEY_BODY, &searchArrayBody);
-    if(ret != UA_STATUSCODE_GOOD)
-        return NULL;
-
-    if(ctx->tokens[searchArrayBody].type != CJ5_TOKEN_ARRAY)
-        return NULL;
-    ctx->index = (unsigned int)searchArrayBody;
+    /* Save index to restore later */
+    unsigned int oldIndex = ctx->index;
+    ctx->index = (unsigned int)arrayIndex;
 
     /* Return early for empty arrays */
     size_t length = (size_t)ctx->tokens[ctx->index].size;
@@ -2362,7 +2354,7 @@ DECODE_JSON(Variant) {
 
         /* Can we unwrap ExtensionObjects in the array? */
         if(dst->type == &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) {
-            const UA_DataType *unwrappedType = unwrappedExtensionObjectType(ctx);
+            const UA_DataType *unwrappedType = unwrapArrayExtensionObjectType(ctx, bodyIndex);
             if(unwrappedType) {
                 dst->type = unwrappedType;
                 entries[1].type = unwrappedType;

From 7ba97eb7784174c0354f15384a4ae0cdf04dc50a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 14:30:29 +0100
Subject: [PATCH 1361/1963] refactor(core): Simplify unwrapping of
 ExtensionObjects for JSON encoding

---
 src/ua_types_encoding_json.c | 77 +++++++++---------------------------
 1 file changed, 19 insertions(+), 58 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 58e9a3469fe..1a81b9820ad 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2517,11 +2517,11 @@ DECODE_JSON(ExtensionObject) {
 }
 
 static status
-Variant_decodeJsonUnwrapExtensionObject(ParseCtx *ctx,void *p, const UA_DataType *type) {
+Variant_decodeJsonUnwrapExtensionObject(ParseCtx *ctx, void *p, const UA_DataType *type) {
     (void) type;
-    CHECK_OBJECT;
-
     UA_Variant *dst = (UA_Variant*)p;
+
+    /* ExtensionObject with null body */
     if(currentTokenType(ctx) == CJ5_TOKEN_NULL) {
         dst->data = UA_ExtensionObject_new();
         dst->type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
@@ -2529,71 +2529,32 @@ Variant_decodeJsonUnwrapExtensionObject(ParseCtx *ctx,void *p, const UA_DataType
         return UA_STATUSCODE_GOOD;
     }
 
-    unsigned int old_index = ctx->index; /* Store the start index of the ExtensionObject */
-
-    /* Decode the DataType */
-    UA_NodeId typeId;
-    UA_NodeId_init(&typeId);
-    size_t searchTypeIdResult = 0;
-    status ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &searchTypeIdResult);
-    if(ret != UA_STATUSCODE_GOOD)
-        return UA_STATUSCODE_BADDECODINGERROR;
-    ctx->index = (UA_UInt16)searchTypeIdResult;
-    ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
+    /* Decode the ExtensionObject */
+    UA_ExtensionObject eo;
+    UA_ExtensionObject_init(&eo);
+    UA_StatusCode ret = ExtensionObject_decodeJson(ctx, &eo, NULL);
     if(ret != UA_STATUSCODE_GOOD) {
-        UA_NodeId_clear(&typeId);
+        UA_ExtensionObject_clear(&eo); /* We don't have the global cleanup */
         return ret;
     }
-    ctx->index = old_index; /* restore the index */
 
-    /* Find the DataType from the NodeId */
-    const UA_DataType *typeOfBody = UA_findDataType(&typeId);
-    UA_NodeId_clear(&typeId);
-
-    /* Search for encoding (without advancing the index) */
-    UA_UInt64 encoding = 0; /* If no encoding found it is structure encoding */
-    size_t searchEncodingResult = 0;
-    ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &searchEncodingResult);
-    if(ret == UA_STATUSCODE_GOOD) {
-        const char *extObjEncoding = &ctx->json5[ctx->tokens[searchEncodingResult].start];
-        size_t size = getTokenLength(&ctx->tokens[searchEncodingResult]);
-        parseUInt64(extObjEncoding, size, &encoding);
-    }
-
-    /* If we have the content in JSON encoding and the type is known -> Unwrap
-     * the ExtensionObject */
-    if(encoding == 0 && typeOfBody != NULL &&
-       typeOfBody != &UA_TYPES[UA_TYPES_VARIANT]) {
-        dst->data = UA_new(typeOfBody);
-        if(!dst->data)
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        dst->type = typeOfBody;
-
-        /* Decode the content */
-        DecodeEntry entries[3] = {
-            {UA_JSONKEY_TYPEID, NULL, NULL, false, NULL},
-            {UA_JSONKEY_BODY, dst->data, NULL, false, typeOfBody},
-            {UA_JSONKEY_ENCODING, NULL, NULL, false, NULL}
-        };
-        ret = decodeFields(ctx, entries, 3);
-    } else {
+    /* The content is still encoded, cannot unwrap */
+    if(eo.encoding != UA_EXTENSIONOBJECT_DECODED) {
         /* Decode as ExtensionObject */
         dst->data = UA_new(&UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
-        if(!dst->data)
+        if(!dst->data) {
+            UA_ExtensionObject_clear(&eo);
             return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
         dst->type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
-
-        UA_assert(ctx->index == old_index); /* The index points to the start of
-                                             * the ExtensionObject */
-        ret = ExtensionObject_decodeJson(ctx, (UA_ExtensionObject*)dst->data, NULL);
+        *(UA_ExtensionObject*)dst->data = eo;
+        return UA_STATUSCODE_GOOD;
     }
 
-    if(ret != UA_STATUSCODE_GOOD) {
-        UA_delete(dst->data, dst->type);
-        dst->data = NULL;
-        dst->type = NULL;
-    }
-    return ret;
+    /* Unwrap the ExtensionObject */
+    dst->data = eo.content.decoded.data;
+    dst->type = eo.content.decoded.type;
+    return UA_STATUSCODE_GOOD;
 }
 
 status

From 7397021e8e3f292e38934fdbb4d7fb64f60e2d15 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 14:31:16 +0100
Subject: [PATCH 1362/1963] refactor(core): Allow null in more positions for
 the JSON decoding

---
 src/ua_types_encoding_json.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 1a81b9820ad..55d1f5f0722 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2598,12 +2598,18 @@ DiagnosticInfoInner_decodeJson(ParseCtx* ctx, void* dst, const UA_DataType* type
 status
 decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
     CHECK_TOKEN_BOUNDS;
-    CHECK_OBJECT;
+
+    /* null is treated like an empty object */
+    if(currentTokenType(ctx) == CJ5_TOKEN_NULL) {
+        ctx->index++;
+        return UA_STATUSCODE_GOOD;
+    }
 
     if(ctx->depth >= UA_JSON_ENCODING_MAX_RECURSION - 1)
         return UA_STATUSCODE_BADENCODINGERROR;
 
     /* Keys and values are counted separately */
+    CHECK_OBJECT;
     UA_assert(ctx->tokens[ctx->index].size % 2 == 0);
     size_t keyCount = (size_t)(ctx->tokens[ctx->index].size) / 2;
 

From d29216f4359242df93ec45b9b4fe23fb287a0489 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 14:46:29 +0100
Subject: [PATCH 1363/1963] fix(tests): Fix a missing include in
 check_server_password.c

---
 tests/server/check_server_password.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/server/check_server_password.c b/tests/server/check_server_password.c
index 5a1d6c0db59..69e711c89bb 100644
--- a/tests/server/check_server_password.c
+++ b/tests/server/check_server_password.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #endif
 
+#include <stdlib.h>
 #include <check.h>
 
 #include "thread_wrapper.h"

From 7ff806cb50b12ca9867f83b2cf6f5ca18ede8763 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 17:44:02 +0100
Subject: [PATCH 1364/1963] refactor(ci): Build non-algamated first on azure to
 get better error messages

---
 tools/azure-devops/win/build.ps1 | 54 ++++++++++++++++----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index cb8ae257720..f499394afd1 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -83,6 +83,33 @@ try {
         Remove-Item -Path build -Recurse -Force
     }
 
+    Write-Host -ForegroundColor Green "`n###################################################################"
+    Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME without amalgamation #####`n"
+    New-Item -ItemType directory -Path "build"
+    cd build
+    & cmake $cmake_cnf `
+            -DBUILD_SHARED_LIBS:BOOL=OFF `
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_INSTALL_PREFIX="$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-static" `
+            -DUA_BUILD_EXAMPLES:BOOL=ON `
+            -DUA_ENABLE_AMALGAMATION:BOOL=OFF `
+            -DUA_FORCE_WERROR=ON `
+            ..
+    & cmake --build . --target install --config RelWithDebInfo
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
+    {
+        Write-Host -ForegroundColor Red "`n`n*** Make install failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
+    cd ..
+    & 7z a -tzip "$env:Build_ArtifactStagingDirectory/open62541-$env:CC_SHORTNAME-static.zip" "$env:Build_Repository_LocalPath\pack\*" "$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-static\*"
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
+    {
+        Write-Host -ForegroundColor Red "`n`n*** Zipping failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
+    Remove-Item -Path build -Recurse -Force
+
     Write-Host -ForegroundColor Green "`n###################################################################"
     Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with amalgamation #####`n"
     New-Item -ItemType directory -Path "build"
@@ -128,33 +155,6 @@ try {
     cd ..
     Remove-Item -Path build -Recurse -Force
 
-    Write-Host -ForegroundColor Green "`n###################################################################"
-    Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME without amalgamation #####`n"
-    New-Item -ItemType directory -Path "build"
-    cd build
-    & cmake $cmake_cnf `
-            -DBUILD_SHARED_LIBS:BOOL=OFF `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DCMAKE_INSTALL_PREFIX="$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-static" `
-            -DUA_BUILD_EXAMPLES:BOOL=ON `
-            -DUA_ENABLE_AMALGAMATION:BOOL=OFF `
-            -DUA_FORCE_WERROR=ON `
-            ..
-    & cmake --build . --target install --config RelWithDebInfo
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
-    {
-        Write-Host -ForegroundColor Red "`n`n*** Make install failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    cd ..
-    & 7z a -tzip "$env:Build_ArtifactStagingDirectory/open62541-$env:CC_SHORTNAME-static.zip" "$env:Build_Repository_LocalPath\pack\*" "$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-static\*"
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
-    {
-        Write-Host -ForegroundColor Red "`n`n*** Zipping failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    Remove-Item -Path build -Recurse -Force
-
     Write-Host -ForegroundColor Green "`n###################################################################"
     Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME (.dll) #####`n"
     New-Item -ItemType directory -Path "build"

From 4d82d07fb7de8d168abb422ea4ca72f6cd9f16aa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 17:49:54 +0100
Subject: [PATCH 1365/1963] refactor(ci): Always build unit tests on azure

---
 tools/azure-devops/win/build.ps1   | 67 ++++++++++++++----------------
 tools/azure-devops/win/install.ps1 |  2 +-
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index f499394afd1..6007856ac86 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -47,44 +47,41 @@ try {
     Copy-Item AUTHORS pack
     Copy-Item README.md pack
 
-    # Only execute unit tests on vs2017 to save compilation time
-    if ($env:CC_SHORTNAME -eq "vs2017") {
-        Write-Host -ForegroundColor Green "`n###################################################################"
-        Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with unit tests #####`n"
-        New-Item -ItemType directory -Path "build"
-        cd build
-        & cmake $cmake_cnf `
-                -DBUILD_SHARED_LIBS:BOOL=OFF `
-                -DCMAKE_BUILD_TYPE=Debug `
-                -DUA_BUILD_EXAMPLES=OFF `
-                -DUA_BUILD_UNIT_TESTS=ON `
-                -DUA_ENABLE_DA=ON `
-                -DUA_ENABLE_DISCOVERY=ON `
-                -DUA_ENABLE_DISCOVERY_MULTICAST=ON `
-                -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
-                -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
-                -DUA_ENABLE_PUBSUB:BOOL=ON `
-                -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
-                -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON `
-                -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON `
-                -DUA_FORCE_WERROR=ON `
-                ..
-        & cmake --build . --config Debug
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-        & cmake --build . --target test-verbose --config Debug -j 1
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-        cd ..
-        Remove-Item -Path build -Recurse -Force
+    Write-Host -ForegroundColor Green "`n###################################################################"
+    Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with unit tests #####`n"
+    New-Item -ItemType directory -Path "build"
+    cd build
+    & cmake $cmake_cnf `
+            -DBUILD_SHARED_LIBS:BOOL=OFF `
+            -DCMAKE_BUILD_TYPE=Debug `
+            -DUA_BUILD_EXAMPLES=OFF `
+            -DUA_BUILD_UNIT_TESTS=ON `
+            -DUA_ENABLE_DA=ON `
+            -DUA_ENABLE_DISCOVERY=ON `
+            -DUA_ENABLE_DISCOVERY_MULTICAST=ON `
+            -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
+            -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
+            -DUA_ENABLE_PUBSUB:BOOL=ON `
+            -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
+            -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON `
+            -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON `
+            -DUA_FORCE_WERROR=ON `
+            ..
+    & cmake --build . --config Debug
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
+        exit $LASTEXITCODE
     }
+    & cmake --build . --target test-verbose --config Debug -j 1
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
+    cd ..
+    Remove-Item -Path build -Recurse -Force
 
     Write-Host -ForegroundColor Green "`n###################################################################"
-    Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME without amalgamation #####`n"
+    Write-Host -ForegroundColor Green "`n##### Building $env:CC_NAME examples without amalgamation #####`n"
     New-Item -ItemType directory -Path "build"
     cd build
     & cmake $cmake_cnf `
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 7e029ca61dd..8936000664f 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -28,7 +28,7 @@ try {
             exit $LASTEXITCODE
         }
 
-    } elseif ($env:CC_SHORTNAME -eq "vs2015" -or $env:CC_SHORTNAME -eq "vs2017") {
+    } else {
         Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
         & vcpkg install mbedtls:x86-windows-static
         if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {

From 9da2af94c69da2e9c02125473eec89d315689e86 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 18:02:26 +0100
Subject: [PATCH 1366/1963] refactor(core): Use size_t for indices in JSON
 encoding

---
 src/ua_types_encoding_json.c | 20 ++++++++++----------
 src/ua_types_encoding_json.h |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 55d1f5f0722..b7b81c58f1f 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1715,12 +1715,12 @@ DECODE_JSON(String) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     /* Decode the string */
-    unsigned int len = 0;
     cj5_result r;
     r.tokens = ctx->tokens;
-    r.num_tokens = ctx->tokensSize;
+    r.num_tokens = (unsigned int)ctx->tokensSize;
     r.json5 = ctx->json5;
-    cj5_error_code err = cj5_get_str(&r, ctx->index, outBuf, &len);
+    unsigned int len = 0;
+    cj5_error_code err = cj5_get_str(&r, (unsigned int)ctx->index, outBuf, &len);
     if(err != CJ5_ERROR_NONE) {
         UA_free(outBuf);
         return UA_STATUSCODE_BADDECODINGERROR;
@@ -1791,7 +1791,7 @@ lookAheadForKey(ParseCtx *ctx, const char *key, size_t *resultIndex) {
     UA_assert(currentTokenType(ctx) == CJ5_TOKEN_OBJECT);
 
     status ret = UA_STATUSCODE_BADNOTFOUND;
-    unsigned int oldIndex = ctx->index; /* Save index for later restore */
+    size_t oldIndex = ctx->index; /* Save index for later restore */
     unsigned int end = ctx->tokens[ctx->index].end;
     ctx->index++; /* Move to the first key */
     while(ctx->index < ctx->tokensSize &&
@@ -1913,7 +1913,7 @@ decodeExpandedNodeIdNamespace(ParseCtx *ctx, void *dst, const UA_DataType *type)
     UA_ExpandedNodeId *en = (UA_ExpandedNodeId*)dst;
 
     /* Parse as a number */
-    unsigned int oldIndex = ctx->index;
+    size_t oldIndex = ctx->index;
     status ret = UInt16_decodeJson(ctx, &en->nodeId.namespaceIndex, NULL);
     if(ret == UA_STATUSCODE_GOOD)
         return ret;
@@ -1940,7 +1940,7 @@ decodeExpandedNodeIdServerUri(ParseCtx *ctx, void *dst, const UA_DataType *type)
     UA_ExpandedNodeId *en = (UA_ExpandedNodeId*)dst;
 
     /* Parse as a number */
-    unsigned int oldIndex = ctx->index;
+    size_t oldIndex = ctx->index;
     status ret = UInt32_decodeJson(ctx, &en->serverIndex, NULL);
     if(ret == UA_STATUSCODE_GOOD)
         return ret;
@@ -2149,8 +2149,8 @@ unwrapArrayExtensionObjectType(ParseCtx *ctx, size_t arrayIndex) {
     UA_assert(ctx->tokens[arrayIndex].type == CJ5_TOKEN_ARRAY);
 
     /* Save index to restore later */
-    unsigned int oldIndex = ctx->index;
-    ctx->index = (unsigned int)arrayIndex;
+    size_t oldIndex = ctx->index;
+    ctx->index = arrayIndex;
 
     /* Return early for empty arrays */
     size_t length = (size_t)ctx->tokens[ctx->index].size;
@@ -2188,7 +2188,7 @@ unwrapArrayExtensionObjectType(ParseCtx *ctx, size_t arrayIndex) {
     }
 
     /* Loop over all members check whether they can be unwrapped */
-    ctx->index = (unsigned int)(arrayIndex + 1);
+    ctx->index = arrayIndex + 1;
 
     for(size_t i = 0; i < length; i++) {
         /* Array element must be an object */
@@ -2455,7 +2455,7 @@ DECODE_JSON(ExtensionObject) {
         return UA_STATUSCODE_BADENCODINGERROR;
 
     /* Decode the DataType */
-    unsigned int oldIndex = ctx->index;
+    size_t oldIndex = ctx->index;
     ctx->index = (UA_UInt16)typeIdIndex;
     ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
     ctx->index = oldIndex;
diff --git a/src/ua_types_encoding_json.h b/src/ua_types_encoding_json.h
index 2d34913f128..0013e9ecae7 100644
--- a/src/ua_types_encoding_json.h
+++ b/src/ua_types_encoding_json.h
@@ -59,8 +59,8 @@ UA_StatusCode writeJsonBeforeElement(CtxJson *ctx, UA_Boolean distinct);
 typedef struct {
     const char *json5;
     cj5_token *tokens;
-    unsigned int tokensSize;
-    unsigned int index;
+    size_t tokensSize;
+    size_t index;
     UA_Byte depth;
 
     size_t namespacesSize;

From f3c7a65a212f2b58e06037e9a2a2bd6a7a01e0c7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 18:02:51 +0100
Subject: [PATCH 1367/1963] refactor(ci): Disable multicast-DNS testing on
 win32 until mdns was updated

---
 tools/azure-devops/win/build.ps1 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 6007856ac86..aa83456dd06 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -58,7 +58,6 @@ try {
             -DUA_BUILD_UNIT_TESTS=ON `
             -DUA_ENABLE_DA=ON `
             -DUA_ENABLE_DISCOVERY=ON `
-            -DUA_ENABLE_DISCOVERY_MULTICAST=ON `
             -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
             -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
             -DUA_ENABLE_PUBSUB:BOOL=ON `

From 0042a7de79b3f2001421dcf00312c0e81197ee3b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Dec 2023 18:32:01 +0100
Subject: [PATCH 1368/1963] refactor(build): Reduce warning level for tests on
 MSVC

---
 tests/CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 519957310d7..bb0f8885709 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,9 @@
-add_compile_options(-Wno-unused-variable -Wno-unused-function)
+if(MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W1") # Reduce warnings level
+else()
+    add_compile_options(-Wno-unused-variable -Wno-unused-function)
+endif()
+
 # Load CMake Packages
 find_package(Check REQUIRED)
 set(LIBS ${CHECK_LIBRARIES} ${open62541_LIBRARIES})

From 614c074353bfd05d732f49ec2b4e118cf5bb8116 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 00:17:43 +0100
Subject: [PATCH 1369/1963] refactor(ci): Simplify the azure windows build

---
 tools/azure-devops/win/build.ps1   | 331 +++++++++++++----------------
 tools/azure-devops/win/install.ps1 |   7 +-
 2 files changed, 150 insertions(+), 188 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index aa83456dd06..43d3579dc40 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -1,193 +1,150 @@
+Write-Host -ForegroundColor Green "`n## Build Path $env:Build_Repository_LocalPath #####`n"
 
-try {
+$build_encryption = "MBEDTLS"
 
+if ($env:CC_SHORTNAME -eq "vs2008" -or $env:CC_SHORTNAME -eq "vs2013") {
+    # on VS2008 mbedtls can not be built since it includes stdint.h which is not available there
+    $build_encryption = "OFF"
+    Write-Host -ForegroundColor Green "`n## Building without encryption on VS2008 or VS2013 #####`n"
+}
 
-    Write-Host -ForegroundColor Green "`n## Build Path $env:Build_Repository_LocalPath #####`n"
-
-    $vcpkg_toolchain = ""
-    $vcpkg_triplet = ""
-
-    if ($env:CC_SHORTNAME -eq "vs2008" -or $env:CC_SHORTNAME -eq "vs2013") {
-        # on VS2008 mbedtls can not be built since it includes stdint.h which is not available there
-        $build_encryption = "OFF"
-        Write-Host -ForegroundColor Green "`n## Building without encryption on VS2008 or VS2013 #####`n"
-    } else {
-        $build_encryption = "MBEDTLS"
-    }
-
-    if ($env:CC_SHORTNAME -eq "mingw" -or $env:CC_SHORTNAME -eq "clang-mingw") {
-        # Workaround for CMake not wanting sh.exe on PATH for MinGW (necessary for CMake 3.12.2)
-        $env:PATH = ($env:PATH.Split(';') | Where-Object { $_ -ne 'C:\Program Files\Git\bin' }) -join ';'
-        $env:PATH = ($env:PATH.Split(';') | Where-Object { $_ -ne 'C:\Program Files\Git\usr\bin' }) -join ';'
-        # Add mingw to path so that CMake finds e.g. clang
-        $env:PATH = "$env:MSYS2_ROOT\mingw64\bin;$env:PATH"
-        [System.Environment]::SetEnvironmentVariable('Path', $path, 'Machine')
-    }
-
-    if ($env:CC_SHORTNAME -eq "mingw") {
-
-    } elseif ($env:CC_SHORTNAME -eq "clang-mingw") {
-        # Setup clang
-        $env:CC = "clang --target=x86_64-w64-mingw32"
-        $env:CXX = "clang++ --target=x86_64-w64-mingw32"
-        clang --version
-    } else {
-        $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
-        $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x86-windows-static"'
-        # since https://github.com/Microsoft/vcpkg/commit/0334365f516c5f229ff4fcf038c7d0190979a38a#diff-464a170117fa96bf98b2f8d224bf503c
-        # vcpkg need to have  "C:\Tools\vcpkg\installed\x86-windows-static"
-        New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x86-windows-static"
-    }
-
-    $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`""
-
-    # Collect files for .zip packing
-    New-Item -ItemType directory -Path pack
-    Copy-Item LICENSE pack
-    Copy-Item AUTHORS pack
-    Copy-Item README.md pack
-
-    Write-Host -ForegroundColor Green "`n###################################################################"
-    Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with unit tests #####`n"
-    New-Item -ItemType directory -Path "build"
-    cd build
-    & cmake $cmake_cnf `
-            -DBUILD_SHARED_LIBS:BOOL=OFF `
-            -DCMAKE_BUILD_TYPE=Debug `
-            -DUA_BUILD_EXAMPLES=OFF `
-            -DUA_BUILD_UNIT_TESTS=ON `
-            -DUA_ENABLE_DA=ON `
-            -DUA_ENABLE_DISCOVERY=ON `
-            -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
-            -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
-            -DUA_ENABLE_PUBSUB:BOOL=ON `
-            -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
-            -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON `
-            -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON `
-            -DUA_FORCE_WERROR=ON `
-            ..
-    & cmake --build . --config Debug
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-        Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    & cmake --build . --target test-verbose --config Debug -j 1
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-        Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    cd ..
-    Remove-Item -Path build -Recurse -Force
-
-    Write-Host -ForegroundColor Green "`n###################################################################"
-    Write-Host -ForegroundColor Green "`n##### Building $env:CC_NAME examples without amalgamation #####`n"
-    New-Item -ItemType directory -Path "build"
-    cd build
-    & cmake $cmake_cnf `
-            -DBUILD_SHARED_LIBS:BOOL=OFF `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DCMAKE_INSTALL_PREFIX="$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-static" `
-            -DUA_BUILD_EXAMPLES:BOOL=ON `
-            -DUA_ENABLE_AMALGAMATION:BOOL=OFF `
-            -DUA_FORCE_WERROR=ON `
-            ..
-    & cmake --build . --target install --config RelWithDebInfo
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
-    {
-        Write-Host -ForegroundColor Red "`n`n*** Make install failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    cd ..
-    & 7z a -tzip "$env:Build_ArtifactStagingDirectory/open62541-$env:CC_SHORTNAME-static.zip" "$env:Build_Repository_LocalPath\pack\*" "$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-static\*"
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
-    {
-        Write-Host -ForegroundColor Red "`n`n*** Zipping failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    Remove-Item -Path build -Recurse -Force
-
-    Write-Host -ForegroundColor Green "`n###################################################################"
-    Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with amalgamation #####`n"
-    New-Item -ItemType directory -Path "build"
-    cd build
-    & cmake $cmake_cnf `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DUA_BUILD_EXAMPLES:BOOL=OFF  `
-            -DUA_ENABLE_AMALGAMATION:BOOL=ON `
-            -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
-            -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
-            -DUA_FORCE_WERROR=ON `
-            ..
-    & cmake --build . --config RelWithDebInfo
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-        Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
-        get-content D:\a\1\s\build\open62541.c
-        exit $LASTEXITCODE
-    }
-    cd ..
-    Remove-Item -Path build -Recurse -Force
-
-    Write-Host -ForegroundColor Green "`n###################################################################"
-    Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with full NS0 #####`n"
-    New-Item -ItemType directory -Path "build"
-    cd build
-    # Use build type Debug here, to force `-Werror`
-    & cmake $cmake_cnf `
-            -DCMAKE_BUILD_TYPE=Debug `
-            -DUA_BUILD_EXAMPLES:BOOL=ON `
-            -DUA_ENABLE_DA:BOOL=ON `
-            -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
-            -DUA_ENABLE_PUBSUB:BOOL=ON `
-            -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
-            -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
-            -DUA_FORCE_WERROR=ON `
-            -DUA_NAMESPACE_ZERO:STRING=FULL `
-            ..
-    & cmake --build . --config Debug
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-        Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    cd ..
-    Remove-Item -Path build -Recurse -Force
-
-    Write-Host -ForegroundColor Green "`n###################################################################"
-    Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME (.dll) #####`n"
-    New-Item -ItemType directory -Path "build"
-    cd build
-    & cmake $cmake_cnf `
-            -DBUILD_SHARED_LIBS:BOOL=ON `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DCMAKE_INSTALL_PREFIX="$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-dynamic" `
-            -DUA_BUILD_EXAMPLES:BOOL=ON `
-            -DUA_ENABLE_AMALGAMATION:BOOL=OFF `
-            -DUA_FORCE_WERROR=ON `
-            ..
-    & cmake --build . --target install --config RelWithDebInfo
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
-    {
-        Write-Host -ForegroundColor Red "`n`n*** Make install failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    cd ..
-    & 7z a -tzip "$env:Build_ArtifactStagingDirectory/open62541-$env:CC_SHORTNAME-dynamic.zip" "$env:Build_Repository_LocalPath\pack\*" "$env:Build_Repository_LocalPath-$env:CC_SHORTNAME-static\*"
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0)
-    {
-        Write-Host -ForegroundColor Red "`n`n*** Zipping failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
-    Remove-Item -Path build -Recurse -Force
-
+if ($env:CC_SHORTNAME -eq "mingw" -or $env:CC_SHORTNAME -eq "clang-mingw") {
+    # Workaround for CMake not wanting sh.exe on PATH for MinGW (necessary for CMake 3.12.2)
+    $env:PATH = ($env:PATH.Split(';') | Where-Object { $_ -ne 'C:\Program Files\Git\bin' }) -join ';'
+    $env:PATH = ($env:PATH.Split(';') | Where-Object { $_ -ne 'C:\Program Files\Git\usr\bin' }) -join ';'
+    # Add mingw to path so that CMake finds e.g. clang
+    $env:PATH = "$env:MSYS2_ROOT\mingw64\bin;$env:PATH"
+    [System.Environment]::SetEnvironmentVariable('Path', $path, 'Machine')
+}
 
-    # # do not cache log
-    # Remove-Item -Path c:\miktex\texmfs\data\miktex\log -Recurse -Force
+$vcpkg_toolchain = ""
+$vcpkg_triplet = ""
+
+if ($env:CC_SHORTNAME -eq "mingw") {
+
+} elseif ($env:CC_SHORTNAME -eq "clang-mingw") {
+    # Setup clang
+    $env:CC = "clang --target=x86_64-w64-mingw32"
+    $env:CXX = "clang++ --target=x86_64-w64-mingw32"
+    clang --version
+} else {
+    $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
+    $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x86-windows-static"'
+    # since https://github.com/Microsoft/vcpkg/commit/0334365f516c5f229ff4fcf038c7d0190979a38a#diff-464a170117fa96bf98b2f8d224bf503c
+    # vcpkg need to have  "C:\Tools\vcpkg\installed\x86-windows-static"
+    New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x86-windows-static"
+}
 
-} catch {
-    # Print a detailed error message
-    $FullException = ($_.Exception|format-list -force) | Out-String
-    Write-Host -ForegroundColor Red "`n------------------ Exception ------------------`n$FullException`n"
-    [Console]::Out.Flush()
-    # Wait a bit to make sure appveyor shows the error message
-    Start-Sleep 10
-    throw
+$cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`""
+
+Write-Host -ForegroundColor Green "`n###################################################################"
+Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with unit tests #####`n"
+New-Item -ItemType directory -Path "build"
+cd build
+& cmake $cmake_cnf `
+        -DBUILD_SHARED_LIBS:BOOL=OFF `
+        -DCMAKE_BUILD_TYPE=Debug `
+        -DUA_BUILD_EXAMPLES=OFF `
+        -DUA_BUILD_UNIT_TESTS=ON `
+        -DUA_ENABLE_DA=ON `
+        -DUA_ENABLE_DISCOVERY=ON `
+        -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
+        -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
+        -DUA_ENABLE_PUBSUB:BOOL=ON `
+        -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
+        -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON `
+        -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON `
+        -DUA_FORCE_WERROR=ON `
+        ..
+& cmake --build .
+if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
+    exit $LASTEXITCODE
+}
+& cmake --build . --target test-verbose -j 1
+if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "`n`n*** Test failed. Exiting ... ***"
+    exit $LASTEXITCODE
+}
+cd ..
+Remove-Item -Path build -Recurse -Force
+
+Write-Host -ForegroundColor Green "`n###################################################################"
+Write-Host -ForegroundColor Green "`n##### Building $env:CC_NAME examples #####`n"
+New-Item -ItemType directory -Path "build"
+cd build
+& cmake $cmake_cnf `
+        -DBUILD_SHARED_LIBS:BOOL=OFF `
+        -DCMAKE_BUILD_TYPE=Debug `
+        -DUA_BUILD_EXAMPLES:BOOL=ON `
+        -DUA_ENABLE_AMALGAMATION:BOOL=OFF `
+        -DUA_FORCE_WERROR=ON `
+        ..
+& cmake --build .
+if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "`n`n*** Make install failed. Exiting ... ***"
+    exit $LASTEXITCODE
+}
+cd ..
+Remove-Item -Path build -Recurse -Force
+
+Write-Host -ForegroundColor Green "`n###################################################################"
+Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with amalgamation #####`n"
+New-Item -ItemType directory -Path "build"
+cd build
+& cmake $cmake_cnf `
+        -DBUILD_SHARED_LIBS:BOOL=OFF `
+        -DCMAKE_BUILD_TYPE=Debug `
+        -DUA_BUILD_EXAMPLES:BOOL=OFF `
+        -DUA_ENABLE_AMALGAMATION:BOOL=ON `
+        -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
+        -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
+        -DUA_FORCE_WERROR=ON `
+        ..
+& cmake --build .
+if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
+    exit $LASTEXITCODE
+}
+cd ..
+Remove-Item -Path build -Recurse -Force
+
+Write-Host -ForegroundColor Green "`n###################################################################"
+Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with full NS0 #####`n"
+New-Item -ItemType directory -Path "build"
+cd build
+& cmake $cmake_cnf `
+        -DBUILD_SHARED_LIBS:BOOL=OFF `
+        -DCMAKE_BUILD_TYPE=Debug `
+        -DUA_ENABLE_DA:BOOL=ON `
+        -DUA_ENABLE_JSON_ENCODING:BOOL=ON `
+        -DUA_ENABLE_PUBSUB:BOOL=ON `
+        -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
+        -DUA_ENABLE_SUBSCRIPTIONS_EVENTS:BOOL=ON `
+        -DUA_FORCE_WERROR=ON `
+        -DUA_NAMESPACE_ZERO:STRING=FULL `
+        ..
+& cmake --build .
+if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
+    exit $LASTEXITCODE
+}
+cd ..
+Remove-Item -Path build -Recurse -Force
+
+Write-Host -ForegroundColor Green "`n###################################################################"
+Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME (.dll) #####`n"
+New-Item -ItemType directory -Path "build"
+cd build
+& cmake $cmake_cnf `
+        -DBUILD_SHARED_LIBS:BOOL=ON `
+        -DCMAKE_BUILD_TYPE=Debug `
+        -DUA_FORCE_WERROR=ON `
+        ..
+& cmake --build .
+if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
+    exit $LASTEXITCODE
 }
+cd ..
+Remove-Item -Path build -Recurse -Force
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 8936000664f..ce725a09a33 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -24,10 +24,15 @@ try {
         Write-Host -ForegroundColor Green "`n### Installing mbedtls via PacMan ###`n"
         & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-mbedtls
         if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
+            Write-Host -ForegroundColor Red "`n`n*** Install of mbedTLS failed. Exiting ... ***"
             exit $LASTEXITCODE
         }
 
+        & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-check
+        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+            Write-Host -ForegroundColor Red "`n`n*** Install of check failed. Exiting ... ***"
+            exit $LASTEXITCODE
+        }
     } else {
         Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
         & vcpkg install mbedtls:x86-windows-static

From 85ddfaad48ca5f8510280b4a5b12c10d14785082 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 00:47:48 +0100
Subject: [PATCH 1370/1963] refactor(ci): Simplify
 tools/azure-devops/win/install.ps1

---
 tools/azure-devops/win/install.ps1 | 98 +++++++++++-------------------
 1 file changed, 36 insertions(+), 62 deletions(-)

diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index ce725a09a33..0790fb9ab0b 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -1,74 +1,48 @@
-try {
-
-    Write-Host -ForegroundColor Green "`n### Installing sphinx ###`n"
-    & choco install -y sphinx --no-progress --source python
+if ($env:CC_SHORTNAME -eq "mingw" -or $env:CC_SHORTNAME -eq "clang-mingw") {
+    Write-Host -ForegroundColor Green "`n### Installing msys64 ###`n"
+    & choco install -y msys2 --no-progress --params="/InstallDir:$env:MSYS2_ROOT /NoPath"
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE
     }
+    # pacman may complain that the directory does not exist, thus create it.
+    # Se https://github.com/open62541/open62541/issues/2068
+    & C:\msys64\usr\bin\mkdir -p /var/cache/pacman/pkg
+    # Update all packages. Ensure that we have up-to-date clang version.
+    # Otherwise we run into issue: https://github.com/msys2/MINGW-packages/issues/6576
+    & C:\msys64\usr\bin\pacman -Syu
+
+    Write-Host -ForegroundColor Green "`n### Installing mbedtls via PacMan ###`n"
+    & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-mbedtls
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Install of mbedTLS failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
 
-    if ($env:CC_SHORTNAME -eq "mingw" -or $env:CC_SHORTNAME -eq "clang-mingw") {
-        Write-Host -ForegroundColor Green "`n### Installing msys64 ###`n"
-        & choco install -y msys2 --no-progress --params="/InstallDir:$env:MSYS2_ROOT /NoPath"
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-        # pacman may complain that the directory does not exist, thus create it.
-        # See https://github.com/open62541/open62541/issues/2068
-        & C:\msys64\usr\bin\mkdir -p /var/cache/pacman/pkg
-        # Update all packages. Ensure that we have up-to-date clang version.
-        # Otherwise we run into issue: https://github.com/msys2/MINGW-packages/issues/6576
-        & C:\msys64\usr\bin\pacman -Syu
-
-        Write-Host -ForegroundColor Green "`n### Installing mbedtls via PacMan ###`n"
-        & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-mbedtls
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install of mbedTLS failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-
-        & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-check
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install of check failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-    } else {
-        Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
-        & vcpkg install mbedtls:x86-windows-static
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-
-        Write-Host -ForegroundColor Green "`n### Installing libcheck via vcpkg ###`n"
-        & vcpkg install check:x86-windows-static
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-
-        Write-Host -ForegroundColor Green "`n### Installing DrMemory ###`n"
-        & choco install -y --no-progress drmemory.portable
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-        #$env:Path = 'C:\Program Files (x86)\Dr. Memory\bin;' + $env:Path
-        #[System.Environment]::SetEnvironmentVariable('Path', $path, 'Machine')
+    & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-check
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Install of check failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
+} else {
+    Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
+    & vcpkg install mbedtls:x86-windows-static
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
+        exit $LASTEXITCODE
     }
 
+    Write-Host -ForegroundColor Green "`n### Installing libcheck via vcpkg ###`n"
+    & vcpkg install check:x86-windows-static
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-        Write-Host -ForegroundColor Red "`n`n*** Installing dependencies failed. Exiting ... ***"
+        Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE
     }
 
-} catch {
-    # Print a detailed error message
-    $FullException = ($_.Exception|format-list -force) | Out-String
-    Write-Host -ForegroundColor Red "`n------------------ Exception ------------------`n$FullException`n"
-    [Console]::Out.Flush()
-    # Wait a bit to make sure appveyor shows the error message
-    Start-Sleep 10
-    throw
+    Write-Host -ForegroundColor Green "`n### Installing DrMemory ###`n"
+    & choco install -y --no-progress drmemory.portable
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
 }

From 47bd799e7a57a23c8f7391f19b4e216f14c5cf7f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 00:48:07 +0100
Subject: [PATCH 1371/1963] fix(test): Fix check_server_password.c for win32
 builds

---
 tests/server/check_server_password.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/server/check_server_password.c b/tests/server/check_server_password.c
index 69e711c89bb..61e0ce6d6d0 100644
--- a/tests/server/check_server_password.c
+++ b/tests/server/check_server_password.c
@@ -160,7 +160,7 @@ static void setup(void) {
     UA_AccessControl_defaultWithLoginCallback(config, false, &policy,
         sizeof(login) / sizeof(login[0]), login, loginCallback, "$6$");
 #else
-    UA_AccessControl_default(config, false, NULL, &policy,
+    UA_AccessControl_default(config, false, &policy,
         sizeof(login) / sizeof(login[0]), login);
 #endif
     UA_Server_run_startup(server);

From fd37838e2bb4445dff76dd7acc8d04d835b38f90 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 00:58:51 +0100
Subject: [PATCH 1372/1963] refactor(build): Switch to x64 VS2019 builds

---
 tools/azure-devops/win/build.ps1   | 6 ++----
 tools/azure-devops/win/install.ps1 | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 43d3579dc40..7c715f6b011 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -29,10 +29,8 @@ if ($env:CC_SHORTNAME -eq "mingw") {
     clang --version
 } else {
     $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
-    $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x86-windows-static"'
-    # since https://github.com/Microsoft/vcpkg/commit/0334365f516c5f229ff4fcf038c7d0190979a38a#diff-464a170117fa96bf98b2f8d224bf503c
-    # vcpkg need to have  "C:\Tools\vcpkg\installed\x86-windows-static"
-    New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x86-windows-static"
+    $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows"'
+    New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x64-windows"
 }
 
 $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`""
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 0790fb9ab0b..4449b690d4d 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -26,14 +26,14 @@ if ($env:CC_SHORTNAME -eq "mingw" -or $env:CC_SHORTNAME -eq "clang-mingw") {
     }
 } else {
     Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
-    & vcpkg install mbedtls:x86-windows-static
+    & vcpkg install mbedtls:x64-windows
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE
     }
 
     Write-Host -ForegroundColor Green "`n### Installing libcheck via vcpkg ###`n"
-    & vcpkg install check:x86-windows-static
+    & vcpkg install check:x64-windows
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE

From 1de0621842569265c561456d06c8f0c168b9b61c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 01:31:47 +0100
Subject: [PATCH 1373/1963] refactor(ci): Disable caching of vcpkg artifacts

---
 .azure-pipelines/azure-pipelines-win.yml | 27 ------------------------
 tools/azure-devops/win/build.ps1         |  1 -
 2 files changed, 28 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
index cb1882b5d26..30f5acd8c5f 100644
--- a/.azure-pipelines/azure-pipelines-win.yml
+++ b/.azure-pipelines/azure-pipelines-win.yml
@@ -11,26 +11,13 @@ jobs:
     CC_SHORTNAME: VS2019
     GENERATOR: Visual Studio 16 2019
     FORCE_CXX: OFF
-    vcpkg_cache: C:/vcpkg/installed
   steps:
   - checkout: self
     submodules: recursive
-  - task: CacheBeta@0
-    inputs:
-      key: $(Build.SourcesDirectory)/tools/azure-devops/win/install.ps1
-      path: $(vcpkg_cache)
-    displayName: Cache vcpkg
   - powershell: ./tools/azure-devops/win/install.ps1
     displayName: Install Requirements
   - powershell: ./tools/azure-devops/win/build.ps1
     displayName: "Build: $(CC_NAME)"
-  - task: PublishBuildArtifacts@1
-    inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-        ArtifactName: open62541-$(CC_SHORTNAME)
-        # publishing artifacts from PRs from a fork is currently blocked
-    condition: succeeded()
-    displayName: "Publish Artifact: open62541-$(CC_SHORTNAME)"
 
 - job: 'win_msys64'
   displayName: 'Windows (msys64)'
@@ -51,13 +38,6 @@ jobs:
   - powershell: ./tools/azure-devops/win/build.ps1
     displayName: "Build: $(CC_NAME)"
     errorActionPreference: continue # If set to Stop, we only get a truncated exception message. Error is handled by checking exit code
-  - task: PublishBuildArtifacts@1
-    inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-        ArtifactName: open62541-$(CC_SHORTNAME)
-        # publishing artifacts from PRs from a fork is currently blocked
-    condition: succeeded()
-    displayName: "Publish Artifact: open62541-$(CC_SHORTNAME)"
 
 - job: 'win_clang'
   displayName: 'Windows (clang)'
@@ -78,10 +58,3 @@ jobs:
   - powershell: ./tools/azure-devops/win/build.ps1
     displayName: "Build: $(CC_NAME)"
     errorActionPreference: continue # If set to Stop, we only get a truncated exception message. Error is handled by checking exit code
-  - task: PublishBuildArtifacts@1
-    inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-        ArtifactName: open62541-$(CC_SHORTNAME)
-        # publishing artifacts from PRs from a fork is currently blocked
-    condition: succeeded()
-    displayName: "Publish Artifact: open62541-$(CC_SHORTNAME)"
diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 7c715f6b011..ca5f0174f64 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -30,7 +30,6 @@ if ($env:CC_SHORTNAME -eq "mingw") {
 } else {
     $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
     $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows"'
-    New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x64-windows"
 }
 
 $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`""

From 7c657977b91bf990258383bbabfbded2150baf9e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 01:49:50 +0100
Subject: [PATCH 1374/1963] refactor(ci): Pin vcpkg triplet to
 x64-windows-static

---
 tools/azure-devops/win/build.ps1   | 2 +-
 tools/azure-devops/win/install.ps1 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index ca5f0174f64..c132733b6f2 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -29,7 +29,7 @@ if ($env:CC_SHORTNAME -eq "mingw") {
     clang --version
 } else {
     $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
-    $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows"'
+    $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows-static"'
 }
 
 $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`""
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 4449b690d4d..6ac53683d92 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -26,14 +26,14 @@ if ($env:CC_SHORTNAME -eq "mingw" -or $env:CC_SHORTNAME -eq "clang-mingw") {
     }
 } else {
     Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
-    & vcpkg install mbedtls:x64-windows
+    & vcpkg install mbedtls:x64-windows-static
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE
     }
 
     Write-Host -ForegroundColor Green "`n### Installing libcheck via vcpkg ###`n"
-    & vcpkg install check:x64-windows
+    & vcpkg install check:x64-windows-static
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE

From ce2fab2e4e473dd2ff4de3de68b821b3d33ff06d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 02:05:26 +0100
Subject: [PATCH 1375/1963] fix(test): Fix Visual Studio build of
 check_types_builtin.c

---
 tests/check_types_builtin.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/check_types_builtin.c b/tests/check_types_builtin.c
index ff8eeb17eac..7570de39df1 100644
--- a/tests/check_types_builtin.c
+++ b/tests/check_types_builtin.c
@@ -1618,11 +1618,11 @@ END_TEST
 
 START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfDifferentTypes) {
     const size_t arraySize = 2;
-    UA_ExtensionObject sourceArray[arraySize];
+    UA_ExtensionObject sourceArray[2];
     UA_Range arrayElement0 = { 1.0, 2.0 };
     UA_ComplexNumberType arrayElement1 = { 3.0, 4.0 };
 
-    UA_ExtensionObject* arrayElement = &sourceArray[0];
+    UA_ExtensionObject* arrayElement = sourceArray;
     UA_ExtensionObject_init(arrayElement);
     arrayElement->encoding = UA_EXTENSIONOBJECT_DECODED;
     arrayElement->content.decoded.data = &arrayElement0;
@@ -1640,9 +1640,9 @@ END_TEST
 
 START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsWithUnknownType) {
     const size_t arraySize = 2;
-    UA_ExtensionObject sourceArray[arraySize];
+    UA_ExtensionObject sourceArray[2];
 
-    UA_ExtensionObject* arrayElement = &sourceArray[0];
+    UA_ExtensionObject* arrayElement = sourceArray;
     UA_ExtensionObject_init(arrayElement);
     arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING;
     arrayElement->content.encoded.body = UA_BYTESTRING("DataOfUnknownType");
@@ -1660,9 +1660,9 @@ END_TEST
 
 START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsXmlEncoded) {
     const size_t arraySize = 2;
-    UA_ExtensionObject sourceArray[arraySize];
+    UA_ExtensionObject sourceArray[2];
 
-    UA_ExtensionObject* arrayElement = &sourceArray[0];
+    UA_ExtensionObject* arrayElement = sourceArray;
     UA_ExtensionObject_init(arrayElement);
     arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_XML;
     arrayElement->content.encoded.body = UA_STRING("<uax:Boolean>false</uax:Boolean>");
@@ -1680,9 +1680,9 @@ END_TEST
 
 START_TEST(UA_Variant_encodeDecodeShallWorkOnVariantWithArrayOfExtensionObjectsNoBody) {
     const size_t arraySize = 2;
-    UA_ExtensionObject sourceArray[arraySize];
+    UA_ExtensionObject sourceArray[2];
 
-    UA_ExtensionObject* arrayElement = &sourceArray[0];
+    UA_ExtensionObject* arrayElement = sourceArray;
     UA_ExtensionObject_init(arrayElement);
     arrayElement->encoding = UA_EXTENSIONOBJECT_ENCODED_NOBODY;
     arrayElement->content.encoded.typeId = UA_TYPES[UA_TYPES_BOOLEAN].typeId;

From c136967af3f062df41dc278af5721e7e61a87482 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 02:16:26 +0100
Subject: [PATCH 1376/1963] fix(test): Remove use of raw sleep() in all unit
 tests

---
 tests/client/check_client_async_connect.c               | 4 ++--
 tests/nodeset-loader/add_node_integration_test/client.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index f1e05f524f8..f286cdf92d1 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -76,7 +76,7 @@ START_TEST(Client_connect_async) {
                                              &asyncCounter, &reqId);
         }
         /* Give network a chance to process packet */
-        sleep(0);
+        UA_realSleep(100);
         /* Manual clock for unit tests */
         UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 0);
@@ -186,7 +186,7 @@ START_TEST(Client_run_iterate) {
         UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 0);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        sleep(0);
+        UA_realSleep(100);
     }
 
     UA_Client_disconnectAsync(client);
diff --git a/tests/nodeset-loader/add_node_integration_test/client.c b/tests/nodeset-loader/add_node_integration_test/client.c
index 135ae63ab77..2246e2ee4dc 100644
--- a/tests/nodeset-loader/add_node_integration_test/client.c
+++ b/tests/nodeset-loader/add_node_integration_test/client.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) {
     do {
         printf("Try to connect ...\n");
         retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
-        sleep(1);
+        UA_realSleep(100);
         iteration++;
     } while ((retval != UA_STATUSCODE_GOOD) && (iteration < cNoOfReconnectTries));
 

From d2e62e238676e547400f3414108c761bdfa6b5bc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 02:49:50 +0100
Subject: [PATCH 1377/1963] refactor(ci): Don't use DrMemory on Azure, takes
 too long

---
 tools/azure-devops/win/build.ps1   | 1 -
 tools/azure-devops/win/install.ps1 | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index c132733b6f2..2d986e99db9 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -50,7 +50,6 @@ cd build
         -DUA_ENABLE_PUBSUB:BOOL=ON `
         -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
         -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON `
-        -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON `
         -DUA_FORCE_WERROR=ON `
         ..
 & cmake --build .
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 6ac53683d92..9abf3b13267 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -38,11 +38,4 @@ if ($env:CC_SHORTNAME -eq "mingw" -or $env:CC_SHORTNAME -eq "clang-mingw") {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE
     }
-
-    Write-Host -ForegroundColor Green "`n### Installing DrMemory ###`n"
-    & choco install -y --no-progress drmemory.portable
-    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-        Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-        exit $LASTEXITCODE
-    }
 }

From 8517db92f29a2eb689508be967f35235f9670fec Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 25 Dec 2023 01:14:37 +0100
Subject: [PATCH 1378/1963] refactor(arch): More code-reuse for the multicast
 UDP setup

---
 arch/eventloop_posix_udp.c | 389 ++++++++++++++-----------------------
 1 file changed, 145 insertions(+), 244 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index c3b8dfb371d..11c8864763e 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -58,6 +58,34 @@ typedef struct {
 #endif
 } UDP_FD;
 
+typedef enum {
+    MULTICASTTYPE_NONE = 0,
+    MULTICASTTYPE_IPV4,
+    MULTICASTTYPE_IPV6
+} MultiCastType;
+
+static UA_Boolean
+isMulticastAddress(const UA_Byte *address, UA_Byte mask, UA_Byte prefix) {
+    return (address[0] & mask) == prefix;
+}
+
+static MultiCastType
+multiCastType(struct addrinfo *info) {
+    const UA_Byte *address;
+    if(info->ai_family == AF_INET) {
+        address = (UA_Byte *)&((struct sockaddr_in *)info->ai_addr)->sin_addr;
+        if(isMulticastAddress(address, IPV4_PREFIX_MASK, IPV4_MULTICAST_PREFIX))
+            return MULTICASTTYPE_IPV4;
+#if UA_IPV6
+    } else if(info->ai_family == AF_INET6) {
+        address = (UA_Byte *)&((struct sockaddr_in6 *)info->ai_addr)->sin6_addr;
+        if(isMulticastAddress(address, IPV6_PREFIX_MASK, IPV6_MULTICAST_PREFIX))
+            return MULTICASTTYPE_IPV6;
+#endif
+    }
+    return MULTICASTTYPE_NONE;
+}
+
 typedef union {
     struct ip_mreq ipv4;
 #if UA_IPV6
@@ -65,6 +93,57 @@ typedef union {
 #endif
 } IpMulticastRequest;
 
+static UA_StatusCode
+setupMulticastRequest(UA_FD socket, IpMulticastRequest *req, const UA_KeyValueMap *params,
+                      struct addrinfo *info, const UA_Logger *logger) {
+    /* Was an interface defined? */
+    const UA_String *netif = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!netif) {
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| No network interface defined for multicast. "
+                       "That means the first suitable network interface is used.",
+                       (unsigned)socket);
+    }
+
+    if(info->ai_family == AF_INET) {
+        struct sockaddr_in *sin = (struct sockaddr_in *)info->ai_addr;
+        req->ipv4.imr_multiaddr = sin->sin_addr;
+        req->ipv4.imr_interface.s_addr = htonl(INADDR_ANY); /* default ANY */
+        if(!netif)
+            return UA_STATUSCODE_GOOD;
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
+        memcpy(interfaceAsChar, netif->data, netif->length);
+        interfaceAsChar[netif->length] = 0;
+        if(UA_inet_pton(AF_INET, interfaceAsChar, &req->ipv4.imr_interface) <= 0) {
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                         "UDP\t| Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        return UA_STATUSCODE_GOOD;
+#if UA_IPV6
+    } else if(info->ai_family == AF_INET6) {
+        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)info->ai_addr;
+        req->ipv6.ipv6mr_multiaddr = sin6->sin6_addr;
+        req->ipv6.ipv6mr_interface = 0; /* default ANY interface */
+        if(!netif)
+            return UA_STATUSCODE_GOOD;
+        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
+        memcpy(interfaceAsChar, netif->data, netif->length);
+        interfaceAsChar[netif->length] = 0;
+        req->ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
+        if(req->ipv6.ipv6mr_interface == 0) {
+            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                         "UDP\t| Interface configuration preparation failed.");
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        return UA_STATUSCODE_GOOD;
+#endif
+    }
+    return UA_STATUSCODE_BADINTERNALERROR;
+}
+
 /* Retrieves hostname and port from given key value parameters.
  *
  * @param[in] params the parameter map to retrieve from
@@ -218,23 +297,6 @@ setSocketPriority(UA_SOCKET sockfd, UA_UInt32 socketPriority,
 }
 #endif
 
-static UA_Boolean
-isMulticastAddress(const UA_Byte *address, UA_Byte mask, UA_Byte prefix) {
-    return (address[0] & mask) == prefix;
-}
-
-static UA_Boolean
-isIPv4MulticastAddress(const UA_Byte *address) {
-    return isMulticastAddress(address, IPV4_PREFIX_MASK, IPV4_MULTICAST_PREFIX);
-}
-
-#if UA_IPV6
-static UA_Boolean
-isIPv6MulticastAddress(const UA_Byte *address) {
-    return isMulticastAddress(address, IPV6_PREFIX_MASK, IPV6_MULTICAST_PREFIX);
-}
-#endif
-
 static UA_StatusCode
 setConnectionConfig(UA_FD socket, const UA_KeyValueMap *params,
                     int ai_family, const UA_Logger *logger) {
@@ -294,182 +356,75 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *params,
     }
     return res;
 }
-static UA_StatusCode
-setupSendMulticastIPv4(UA_FD socket, struct sockaddr_in *addr, const UA_KeyValueMap *params,
-                       const UA_Logger *logger) {
-    IpMulticastRequest ipMulticastRequest;
-    ipMulticastRequest.ipv4.imr_multiaddr = addr->sin_addr;
-    ipMulticastRequest.ipv4.imr_interface.s_addr = htonl(INADDR_ANY); /* default ANY */
-
-    /* Use a defined network interface */
-    const UA_String *netif = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(netif) {
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
-        memcpy(interfaceAsChar, netif->data, netif->length);
-        interfaceAsChar[netif->length] = 0;
-        if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "UDP %u\t| Interface configuration preparation failed",
-                         (unsigned)socket);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    } else {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| No network interface defined for multicast. "
-                       "That means the first suitable network interface is used.",
-                       (unsigned)socket);
-    }
-
-    int res = setsockopt(socket, IPPROTO_IP, IP_MULTICAST_IF,
-#ifdef _WIN32
-                         (const char *)&ipMulticastRequest.ipv4.imr_interface,
-#else
-                         &ipMulticastRequest.ipv4.imr_interface,
-#endif
-                         sizeof(struct in_addr));
-    if(res < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "UDP\t| Multicast IP membership setup failed: "
-                         "Cannot set socket option IP_MULTICAST_IF. Error: %s",
-                         errno_str));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
 
 static UA_StatusCode
-setupListenMulticastIPv4(UA_FD socket, const UA_KeyValueMap *params, struct sockaddr_in *addr,
-                         const UA_Logger *logger) {
-    IpMulticastRequest ipMulticastRequest;
-    ipMulticastRequest.ipv4.imr_multiaddr = addr->sin_addr;
-    ipMulticastRequest.ipv4.imr_interface.s_addr = htonl(INADDR_ANY); /* default ANY */
-
-    /* Use a defined interface */
-    const UA_String *netif = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(netif) {
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
-        memcpy(interfaceAsChar, netif->data, netif->length);
-        interfaceAsChar[netif->length] = 0;
-        if(UA_inet_pton(AF_INET, interfaceAsChar, &ipMulticastRequest.ipv4.imr_interface) <= 0) {
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "UDP\t| Interface configuration preparation failed.");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    } else {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| No network interface defined for multicast. "
-                       "That means the first suitable network interface is used.",
-                       (unsigned)socket);
-    }
-
-    int res = UA_setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                            &ipMulticastRequest.ipv4, sizeof(ipMulticastRequest.ipv4));
-    if(res < 0) {
-        UA_LOG_SOCKET_ERRNO_WRAP(
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "UDP\t| Multicast IP membership setup failed: "
-                         "Cannot set socket option IP_ADD_MEMBERSHIP. Error: %s",
-                         errno_str));
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
-    return UA_STATUSCODE_GOOD;
-}
+setupListenMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *params,
+                     MultiCastType multiCastType, const UA_Logger *logger) {
+    IpMulticastRequest req;
+    UA_StatusCode res = setupMulticastRequest(fd, &req, params, info, logger);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
 
+    int result = -1;
+    if(info->ai_family == AF_INET && multiCastType == MULTICASTTYPE_IPV4) {
+        result = UA_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                               &req.ipv4, sizeof(req.ipv4));
 #if UA_IPV6
-static UA_StatusCode
-setupListenMulticastIPv6(UA_FD socket, const UA_KeyValueMap *params, struct sockaddr_in6 *addr,
-                         const UA_Logger *logger) {
-    IpMulticastRequest ipMulticastRequest;
-    ipMulticastRequest.ipv6.ipv6mr_multiaddr = addr->sin6_addr;
-    ipMulticastRequest.ipv6.ipv6mr_interface = 0; /* default ANY interface */
-
-    /* Bind to a defined interface */
-    const UA_String *netif = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(netif) {
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
-        memcpy(interfaceAsChar, netif->data, netif->length);
-        interfaceAsChar[netif->length] = 0;
-        ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
-        if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "UDP\t| Interface configuration preparation failed.");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    } else {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| No network interface defined for multicast. "
-                       "That means the first suitable network interface is used.",
-                       (unsigned)socket);
+    } else if(info->ai_family == AF_INET6 && multiCastType == MULTICASTTYPE_IPV6) {
+        result = UA_setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
+                               &req.ipv6, sizeof(req.ipv6));
+#endif
     }
 
-    if(UA_setsockopt(socket, IPPROTO_IPV6,IPV6_JOIN_GROUP,
-                     &ipMulticastRequest.ipv6, sizeof(ipMulticastRequest.ipv6)) < 0) {
+    if(result < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "UDP\t| Multicast IP membership setup failed: "
-                         "Cannot set socket option IP_ADD_MEMBERSHIP. Error: %s",
-                         errno_str));
+                         "UDP %u\t| Cannot set socket for multicast receiving. Error: %s",
+                         (unsigned)fd, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode
-setupSendMulticastIPv6(UA_FD socket, struct sockaddr_in6 *addr, const UA_KeyValueMap *params,
-                       const UA_Logger *logger) {
-    IpMulticastRequest ipMulticastRequest;
-    ipMulticastRequest.ipv6.ipv6mr_multiaddr = addr->sin6_addr;
-    ipMulticastRequest.ipv6.ipv6mr_interface = 0; /* default ANY interface */
-
-    /* Use a defined network interface */
-    const UA_String *netif = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(netif) {
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
-        memcpy(interfaceAsChar, netif->data, netif->length);
-        interfaceAsChar[netif->length] = 0;
-        ipMulticastRequest.ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
-        if(ipMulticastRequest.ipv6.ipv6mr_interface == 0) {
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "UDP\t| Interface configuration preparation failed.");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-    } else {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| No network interface defined for multicast. "
-                       "That means the first suitable network interface is used.",
-                       (unsigned)socket);
-    }
+setupSendMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *params,
+                   MultiCastType multiCastType, const UA_Logger *logger) {
+    IpMulticastRequest req;
+    UA_StatusCode res = setupMulticastRequest(fd, &req, params, info, logger);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
 
-    int res = setsockopt(socket, IPPROTO_IPV6, IPV6_MULTICAST_IF,
+    int result = -1;
+    if(info->ai_family == AF_INET && multiCastType == MULTICASTTYPE_IPV4) {
+        result = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
+#ifdef _WIN32
+                            (const char *)&req.ipv4.imr_interface,
+#else
+                            &req.ipv4.imr_interface,
+#endif
+                            sizeof(struct in_addr));
+#if UA_IPV6
+    } else if(info->ai_family == AF_INET6 && multiCastType == MULTICASTTYPE_IPV6) {
+        result = setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_IF,
 #ifdef _WIN32
-                         (const char *)&ipMulticastRequest.ipv6.ipv6mr_interface,
+                            (const char *)&req.ipv6.ipv6mr_interface,
 #else
-                         &ipMulticastRequest.ipv6.ipv6mr_interface,
+                            &req.ipv6.ipv6mr_interface,
 #endif
-                         sizeof(ipMulticastRequest.ipv6.ipv6mr_interface));
-    if(res < 0) {
+                            sizeof(req.ipv6.ipv6mr_interface));
+#endif
+    }
+
+    if(result < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
             UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                         "UDP\t| Cannot set socket option IPV6_MULTICAST_IF. Error: %s",
-                         errno_str));
+                         "UDP %u\t| Cannot set socket for multicast sending. Error: %s",
+                         (unsigned)fd, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     return UA_STATUSCODE_GOOD;
 }
 
-#endif
-
 /* Test if the ConnectionManager can be stopped */
 static void
 UDP_checkStopped(UA_POSIXConnectionManager *pcm) {
@@ -639,35 +594,6 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
     UA_LOCK(&el->elMutex);
 }
 
-static UA_StatusCode
-checkForListenMulticastAndConfigure(struct addrinfo *info, const UA_KeyValueMap *params,
-                                    UA_FD listenSocket, const UA_Logger *logger) {
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    if(info->ai_family == AF_INET) {
-        UA_Byte *addressVal = (UA_Byte *)
-            &((struct sockaddr_in *)info->ai_addr)->sin_addr;
-        if(isIPv4MulticastAddress(addressVal)) {
-            res = setupListenMulticastIPv4(listenSocket, params,
-                                           (struct sockaddr_in *)info->ai_addr,
-                                           logger);
-        }
-#if UA_IPV6
-    } else if(info->ai_family == AF_INET6) {
-        UA_Byte *addressVal = (UA_Byte *)
-            &((struct sockaddr_in6 *)info->ai_addr)->sin6_addr;
-        if(isIPv6MulticastAddress(addressVal)) {
-            res = setupListenMulticastIPv6(listenSocket, params,
-                                           (struct sockaddr_in6 *)info->ai_addr,
-                                           logger);
-        }
-#endif
-    } else {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK, "UDP\t| Unknown connection type");
-        res = UA_STATUSCODE_BADCONNECTIONREJECTED;
-    }
-    return res;
-}
-
 static UA_StatusCode
 UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
                          struct addrinfo *info, const UA_KeyValueMap *params,
@@ -693,6 +619,9 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
         }
     }
 
+    /* Are we going to create a socket for multicast? */
+    MultiCastType mc = multiCastType(info);
+
     /* Create the listen socket */
     UA_FD listenSocket = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
@@ -729,13 +658,13 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
     }
 
     /* Enable multicast if this is a multicast address */
-    res = checkForListenMulticastAndConfigure(info, params, listenSocket,
-                                              el->eventLoop.logger);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Configuring listen multicast failed");
-        UA_close(listenSocket);
-        return UA_STATUSCODE_BADCONNECTIONREJECTED;
+    if(mc != MULTICASTTYPE_NONE) {
+        res = setupListenMultiCast(listenSocket, info, params,
+                                   mc, el->eventLoop.logger);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_close(listenSocket);
+            return res;
+        }
     }
 
     /* Validation is complete - close and return */
@@ -962,41 +891,14 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode
-checkForSendMulticastAndConfigure(const UA_KeyValueMap *params,
-                                  struct addrinfo *info, UA_FD newSock,
-                                  const UA_Logger *logger) {
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    if(info->ai_family == AF_INET) {
-        struct sockaddr_in* addr = (struct sockaddr_in *)info->ai_addr;
-        UA_Byte *addressVal = (UA_Byte *) &addr->sin_addr;
-
-        if(isIPv4MulticastAddress(addressVal)) {
-            res = setupSendMulticastIPv4(newSock, (struct sockaddr_in *)info->ai_addr,
-                                         params, logger);
-        }
-#if UA_IPV6
-    } else if(info->ai_family == AF_INET6) {
-        struct sockaddr_in6* addr = (struct sockaddr_in6 *)info->ai_addr;
-        UA_Byte *addressVal = (UA_Byte *) &addr->sin6_addr;
-        if(isIPv6MulticastAddress(addressVal)) {
-            res = setupSendMulticastIPv6(newSock, (struct sockaddr_in6 *)info->ai_addr,
-                                         params, logger);
-        }
-#endif
-    } else {
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Opening a connection failed");
-        res = UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return res;
-}
-
 static UA_StatusCode
 registerSocketAndDestinationForSend(const UA_KeyValueMap *params,
                                     const char *hostname, struct addrinfo *info,
                                     int error, UDP_FD *ufd, UA_FD *sock,
                                     const UA_Logger *logger) {
+    /* Are we going to create a socket for multicast? */
+    MultiCastType mc = multiCastType(info);
+
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     *sock = newSock;
     if(newSock == UA_INVALID_FD) {
@@ -1006,24 +908,23 @@ registerSocketAndDestinationForSend(const UA_KeyValueMap *params,
                            hostname, errno_str));
         return UA_STATUSCODE_BADDISCONNECT;
     }
-    UA_StatusCode res =
-        setConnectionConfig(newSock, params, info->ai_family, logger);
+    UA_StatusCode res = setConnectionConfig(newSock, params, info->ai_family, logger);
     if(res != UA_STATUSCODE_GOOD) {
         UA_close(newSock);
         return res;
     }
 
-    res = checkForSendMulticastAndConfigure(params, info, newSock, logger);
-    if(res != UA_STATUSCODE_GOOD) {
-        UA_close(newSock);
-        UA_LOG_ERROR(logger, UA_LOGCATEGORY_NETWORK,
-                     "UDP\t| Configuring send multicast failed");
-        return UA_STATUSCODE_BADINTERNALERROR;
+    if(mc != MULTICASTTYPE_NONE) {
+        res = setupSendMultiCast(newSock, info, params, mc, logger);
+        if(res != UA_STATUSCODE_GOOD) {
+            UA_close(newSock);
+            return res;
+        }
     }
+
     memcpy(&ufd->sendAddr, info->ai_addr, info->ai_addrlen);
     ufd->sendAddrLength = info->ai_addrlen;
-
-    return res;
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode

From 2d8239b27647518738cae532a389eb20e97bb0da Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 25 Dec 2023 02:05:42 +0100
Subject: [PATCH 1379/1963] fix(arch): On win32 a socket for multicast needs to
 be bound to INADDR_ANY

---
 arch/eventloop_posix_udp.c | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 11c8864763e..870a00c103c 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -619,9 +619,6 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
         }
     }
 
-    /* Are we going to create a socket for multicast? */
-    MultiCastType mc = multiCastType(info);
-
     /* Create the listen socket */
     UA_FD listenSocket = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     if(listenSocket == UA_INVALID_FD) {
@@ -646,8 +643,38 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
+    /* Are we going to prepare a socket for multicast? */
+    MultiCastType mc = multiCastType(info);
+
     /* Bind socket to the address */
+#ifdef _WIN32
+    /* On windows we need to bind the socket to INADDR_ANY before registering
+     * for the multicast group */
+    int ret = -1;
+    if(mc != MULTICASTTYPE_NONE) {
+        if(info->ai_family == AF_INET) {
+            struct sockaddr_in *orig = (struct sockaddr_in *)info->ai_addr;
+            struct sockaddr_in sin;
+            memset(&sin, 0, sizeof(sin));
+            sin.sin_family = AF_INET;
+            sin.sin_addr.s_addr = htonl(INADDR_ANY);
+            sin.sin_port = orig->sin_port;
+            ret = bind(listenSocket, (struct sockaddr*)&sin, sizeof(sin));
+        } else if(info->ai_family == AF_INET6) {
+            struct sockaddr_in6 *orig = (struct sockaddr_in6 *)info->ai_addr;
+            struct sockaddr_in6 sin6;
+            memset(&sin6, 0, sizeof(sin6));
+            sin6.sin6_family = AF_INET6;
+            sin6.sin6_addr = in6addr_any;
+            sin6.sin6_port = orig->sin6_port;
+            ret = bind(listenSocket, (struct sockaddr*)&sin6, sizeof(sin6));
+        }
+    } else {
+        ret = bind(listenSocket, info->ai_addr, (socklen_t)info->ai_addrlen);
+    }
+#else
     int ret = bind(listenSocket, info->ai_addr, (socklen_t)info->ai_addrlen);
+#endif
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -896,9 +923,6 @@ registerSocketAndDestinationForSend(const UA_KeyValueMap *params,
                                     const char *hostname, struct addrinfo *info,
                                     int error, UDP_FD *ufd, UA_FD *sock,
                                     const UA_Logger *logger) {
-    /* Are we going to create a socket for multicast? */
-    MultiCastType mc = multiCastType(info);
-
     UA_FD newSock = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
     *sock = newSock;
     if(newSock == UA_INVALID_FD) {
@@ -914,6 +938,8 @@ registerSocketAndDestinationForSend(const UA_KeyValueMap *params,
         return res;
     }
 
+    /* Prepare socket for multicast */
+    MultiCastType mc = multiCastType(info);
     if(mc != MULTICASTTYPE_NONE) {
         res = setupSendMultiCast(newSock, info, params, mc, logger);
         if(res != UA_STATUSCODE_GOOD) {

From d85b390f12076cc0b3dc3dc2878296937cc4887c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 25 Dec 2023 17:00:41 +0100
Subject: [PATCH 1380/1963] refactor(test): Add alternative URL for IPv6
 multicast subscriber test

---
 tests/pubsub/check_pubsub_subscribe.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 060fca1363a..4c3dca48e76 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -16,6 +16,9 @@
 #include "ua_pubsub.h"
 #include "ua_server_internal.h"
 
+#define MULTICAST_URL "opc.udp://224.0.0.22:4801/"
+//#define MULTICAST_URL "opc.udp://[ff01::100]:4801/"
+
 #define UA_SUBSCRIBER_PORT       4801    /* Port for Subscriber*/
 #define PUBLISH_INTERVAL         5       /* Publish interval*/
 #define PUBLISHER_ID             2234    /* Publisher Id*/
@@ -105,8 +108,7 @@ static void setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Test Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4801/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING(MULTICAST_URL)};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =

From 3609c2e87c0f46c294598d4ff4470d8fcb88e58a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 1 Jan 2024 23:07:44 +0100
Subject: [PATCH 1381/1963] refactor(core): Allow null in more places to define
 an empty JSON object

---
 src/ua_types_encoding_json.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index b7b81c58f1f..12952af0380 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1416,6 +1416,12 @@ UA_calcSizeJson(const void *src, const UA_DataType *type,
         return UA_STATUSCODE_BADDECODINGERROR;           \
     }} while(0)
 
+#define CHECK_NULL_SKIP do {                         \
+    if(currentTokenType(ctx) == CJ5_TOKEN_NULL) {    \
+        ctx->index++;                                \
+        return UA_STATUSCODE_GOOD;                   \
+    }} while(0)
+
 /* Forward declarations*/
 #define DECODE_JSON(TYPE) static status                   \
     TYPE##_decodeJson(ParseCtx *ctx, UA_##TYPE *dst,      \
@@ -2275,6 +2281,7 @@ Array_decodeJsonUnwrapExtensionObject(ParseCtx *ctx, void **dst, const UA_DataTy
 }
 
 DECODE_JSON(Variant) {
+    CHECK_NULL_SKIP; /* Treat null as an empty variant */
     CHECK_OBJECT;
 
     /* First search for the variant type in the json object. */
@@ -2387,6 +2394,7 @@ DECODE_JSON(Variant) {
 }
 
 DECODE_JSON(DataValue) {
+    CHECK_NULL_SKIP; /* Treat a null value as an empty DataValue */
     CHECK_OBJECT;
 
     DecodeEntry entries[6] = {
@@ -2409,6 +2417,7 @@ DECODE_JSON(DataValue) {
 }
 
 DECODE_JSON(ExtensionObject) {
+    CHECK_NULL_SKIP; /* Treat a null value as an empty DataValue */
     CHECK_OBJECT;
 
     /* Empty object -> Null ExtensionObject */
@@ -2561,6 +2570,7 @@ status
 DiagnosticInfoInner_decodeJson(ParseCtx* ctx, void* dst, const UA_DataType* type);
 
 DECODE_JSON(DiagnosticInfo) {
+    CHECK_NULL_SKIP; /* Treat a null value as an empty DiagnosticInfo */
     CHECK_OBJECT;
 
     DecodeEntry entries[7] = {
@@ -2598,12 +2608,7 @@ DiagnosticInfoInner_decodeJson(ParseCtx* ctx, void* dst, const UA_DataType* type
 status
 decodeFields(ParseCtx *ctx, DecodeEntry *entries, size_t entryCount) {
     CHECK_TOKEN_BOUNDS;
-
-    /* null is treated like an empty object */
-    if(currentTokenType(ctx) == CJ5_TOKEN_NULL) {
-        ctx->index++;
-        return UA_STATUSCODE_GOOD;
-    }
+    CHECK_NULL_SKIP; /* null is treated like an empty object */
 
     if(ctx->depth >= UA_JSON_ENCODING_MAX_RECURSION - 1)
         return UA_STATUSCODE_BADENCODINGERROR;

From b606ef38a999cbd4d419326aa3070b319ef66682 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 1 Jan 2024 23:17:05 +0100
Subject: [PATCH 1382/1963] refactor(core): Simplify the variant parsing in
 JSON format

---
 src/ua_types_encoding_json.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 12952af0380..4c1f4bdee61 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2293,23 +2293,22 @@ DECODE_JSON(Variant) {
     }
 
     /* Parse the type */
-    size_t size = getTokenLength(&ctx->tokens[typeIndex]);
-    if(size == 0 || ctx->tokens[typeIndex].type != CJ5_TOKEN_NUMBER)
+    if(ctx->tokens[typeIndex].type != CJ5_TOKEN_NUMBER)
         return UA_STATUSCODE_BADDECODINGERROR;
-    UA_UInt64 idTypeDecoded = 0;
-    const char *idTypeEncoded = &ctx->json5[ctx->tokens[typeIndex].start];
-    size_t len = parseUInt64(idTypeEncoded, size, &idTypeDecoded);
+    UA_UInt64 idType = 0;
+    size_t len = parseUInt64(&ctx->json5[ctx->tokens[typeIndex].start],
+                             getTokenLength(&ctx->tokens[typeIndex]), &idType);
     if(len == 0)
         return UA_STATUSCODE_BADDECODINGERROR;
 
     /* A NULL Variant */
-    if(idTypeDecoded == 0) {
+    if(idType == 0) {
         skipObject(ctx);
         return UA_STATUSCODE_GOOD;
     }
 
     /* Set the type */
-    UA_NodeId typeNodeId = UA_NODEID_NUMERIC(0, (UA_UInt32)idTypeDecoded);
+    UA_NodeId typeNodeId = UA_NODEID_NUMERIC(0, (UA_UInt32)idType);
     dst->type = UA_findDataTypeWithCustom(&typeNodeId, ctx->customTypes);
     if(!dst->type)
         return UA_STATUSCODE_BADDECODINGERROR;

From 21fc7512d559c39d4f3841949af3d64bbf21aeab Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 1 Jan 2024 23:59:37 +0100
Subject: [PATCH 1383/1963] refactor(core): Speed up the detection whether an
 ExtensionObject array can be unwrapped

---
 src/ua_types_encoding_json.c | 103 +++++++++++++++++++++--------------
 1 file changed, 61 insertions(+), 42 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 4c1f4bdee61..83181a98cc6 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2150,8 +2150,40 @@ VariantDimension_decodeJson(ParseCtx *ctx, void *dst, const UA_DataType *type) {
     return Array_decodeJson(ctx, (void**)dst, dimType);
 }
 
+/* Get type type encoded by the ExtensionObject at ctx->index.
+ * Returns NULL if that fails (type unknown or otherwise). */
 static const UA_DataType *
-unwrapArrayExtensionObjectType(ParseCtx *ctx, size_t arrayIndex) {
+getExtensionObjectType(ParseCtx *ctx) {
+    if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT)
+        return NULL;
+
+    /* Get the type NodeId index */
+    size_t typeIdIndex = 0;
+    UA_StatusCode ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &typeIdIndex);
+    if(ret != UA_STATUSCODE_GOOD)
+        return NULL;
+
+    size_t oldIndex = ctx->index;
+    ctx->index = (UA_UInt16)typeIdIndex;
+
+    /* Decode the type NodeId */
+    UA_NodeId typeId;
+    UA_NodeId_init(&typeId);
+    ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
+    ctx->index = oldIndex;
+    if(ret != UA_STATUSCODE_GOOD)
+        return NULL;
+
+    /* Lookup an return */
+    const UA_DataType *type = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
+    UA_NodeId_clear(&typeId);
+    return type;
+}
+
+/* Check if all array members are ExtensionObjects of the same type. Return this
+ * type or NULL. */
+static const UA_DataType *
+getArrayUnwrapType(ParseCtx *ctx, size_t arrayIndex) {
     UA_assert(ctx->tokens[arrayIndex].type == CJ5_TOKEN_ARRAY);
 
     /* Save index to restore later */
@@ -2165,37 +2197,28 @@ unwrapArrayExtensionObjectType(ParseCtx *ctx, size_t arrayIndex) {
         return NULL;
     }
 
-    ctx->index++; /* Go to first array member */
-    if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT) {
-        ctx->index = oldIndex; /* Restore the index */
-        return NULL;
-    }
-
-    /* Get the type NodeId index */
-    size_t typeIdIndex = 0;
-    UA_StatusCode ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &typeIdIndex);
-    if(ret != UA_STATUSCODE_GOOD) {
-        ctx->index = oldIndex; /* Restore the index */
-        return NULL;
-    }
+    /* Go to first array member */
+    ctx->index++;
 
-    /* Decode and lookup the type */
+    /* Lookup the type for the first array member */
     UA_NodeId typeId;
     UA_NodeId_init(&typeId);
-    const UA_DataType *typeOfBody = NULL;
-    ctx->index = (UA_UInt16)typeIdIndex;
-    ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
-    if(UA_LIKELY(ret == UA_STATUSCODE_GOOD))
-        typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
-    UA_NodeId_clear(&typeId);
+    const UA_DataType *typeOfBody = getExtensionObjectType(ctx);
     if(!typeOfBody) {
         ctx->index = oldIndex; /* Restore the index */
         return NULL;
     }
 
-    /* Loop over all members check whether they can be unwrapped */
-    ctx->index = arrayIndex + 1;
+    /* Get the typeId index for faster comparison below.
+     * Cannot fail as getExtensionObjectType already looked this up. */
+    size_t typeIdIndex = 0;
+    UA_StatusCode ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &typeIdIndex);
+    (void)ret;
+    UA_assert(ret == UA_STATUSCODE_GOOD);
+    const char* typeIdData = &ctx->json5[ctx->tokens[typeIdIndex].start];
+    size_t typeIdSize = getTokenLength(&ctx->tokens[typeIdIndex]);
 
+    /* Loop over all members and check whether they can be unwrapped */
     for(size_t i = 0; i < length; i++) {
         /* Array element must be an object */
         if(currentTokenType(ctx) != CJ5_TOKEN_OBJECT) {
@@ -2204,35 +2227,31 @@ unwrapArrayExtensionObjectType(ParseCtx *ctx, size_t arrayIndex) {
         }
 
         /* Check for non-JSON encoding */
-        size_t objIndex = ctx->index;
         size_t encIndex = 0;
-        ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encIndex);
+        UA_StatusCode ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encIndex);
         if(ret == UA_STATUSCODE_GOOD) {
             ctx->index = oldIndex; /* Restore the index */
             return NULL;
         }
 
-        /* Decode the type NodeId and compare */
-        ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &typeIdIndex);
+        /* Get the type NodeId index */
+        size_t memberTypeIdIndex = 0;
+        ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &memberTypeIdIndex);
         if(ret != UA_STATUSCODE_GOOD) {
             ctx->index = oldIndex; /* Restore the index */
             return NULL;
         }
-        ctx->index = (UA_UInt16)typeIdIndex;
-        ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
-        if(ret != UA_STATUSCODE_GOOD) {
-            ctx->index = oldIndex; /* Restore the index */
-            return NULL;
-        }
-        UA_Boolean sameType = UA_NodeId_equal(&typeId, &typeOfBody->typeId);
-        UA_NodeId_clear(&typeId);
-        if(!sameType) {
+
+        /* Is it the same type? Compare raw NodeId string */
+        const char* memberTypeIdData = &ctx->json5[ctx->tokens[memberTypeIdIndex].start];
+        size_t memberTypeIdSize = getTokenLength(&ctx->tokens[memberTypeIdIndex]);
+        if(typeIdSize != memberTypeIdSize ||
+           memcmp(typeIdData, memberTypeIdData, typeIdSize) != 0) {
             ctx->index = oldIndex; /* Restore the index */
             return NULL;
         }
 
-        /* Skip forward */
-        ctx->index = objIndex;
+        /* Skip to the next array member */
         skipObject(ctx);
     }
 
@@ -2360,10 +2379,10 @@ DECODE_JSON(Variant) {
 
         /* Can we unwrap ExtensionObjects in the array? */
         if(dst->type == &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) {
-            const UA_DataType *unwrappedType = unwrapArrayExtensionObjectType(ctx, bodyIndex);
-            if(unwrappedType) {
-                dst->type = unwrappedType;
-                entries[1].type = unwrappedType;
+            const UA_DataType *unwrapType = getArrayUnwrapType(ctx, bodyIndex);
+            if(unwrapType) {
+                dst->type = unwrapType;
+                entries[1].type = unwrapType;
                 entries[1].function = (decodeJsonSignature)
                     Array_decodeJsonUnwrapExtensionObject;
             }

From e9781b3f445a247185c52b826b38ca44f9e688ca Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 2 Jan 2024 00:30:05 +0100
Subject: [PATCH 1384/1963] refactor(core): Simplify the decoding of
 ExtensionObjects in JSON format

---
 src/ua_types_encoding_json.c | 108 ++++++++++++-----------------------
 1 file changed, 38 insertions(+), 70 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 83181a98cc6..87484029f57 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2434,6 +2434,18 @@ DECODE_JSON(DataValue) {
     return ret;
 }
 
+/* Move the entire current token into the target bytestring */
+static UA_StatusCode
+tokenToByteString(ParseCtx *ctx, UA_ByteString *p, const UA_DataType *type) {
+    GET_TOKEN;
+    UA_StatusCode res = UA_ByteString_allocBuffer(p, tokenSize);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
+    memcpy(p->data, tokenData, tokenSize);
+    skipObject(ctx);
+    return UA_STATUSCODE_GOOD;
+}
+
 DECODE_JSON(ExtensionObject) {
     CHECK_NULL_SKIP; /* Treat a null value as an empty DataValue */
     CHECK_OBJECT;
@@ -2444,19 +2456,33 @@ DECODE_JSON(ExtensionObject) {
         return UA_STATUSCODE_GOOD;
     }
 
-    /* Search for Encoding */
+    /* Search for non-JSON encoding */
+    UA_UInt64 encoding = 0;
     size_t encIndex = 0;
     status ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encIndex);
-
-    /* UA_JSONKEY_ENCODING found */
     if(ret == UA_STATUSCODE_GOOD) {
-        /* Parse the encoding */
-        UA_UInt64 encoding = 0;
         const char *extObjEncoding = &ctx->json5[ctx->tokens[encIndex].start];
-        size_t size = getTokenLength(&ctx->tokens[encIndex]);
-        parseUInt64(extObjEncoding, size, &encoding);
+        size_t len = parseUInt64(extObjEncoding, getTokenLength(&ctx->tokens[encIndex]),
+                                 &encoding);
+        if(len == 0)
+            return UA_STATUSCODE_BADDECODINGERROR;
+    }
+
+    /* Lookup the DataType for the ExtensionObject if the body can be decoded */
+    const UA_DataType *typeOfBody = (encoding == 0) ? getExtensionObjectType(ctx) : NULL;
+
+    /* Keep the encoded body */
+    if(!typeOfBody) {
+        DecodeEntry entries[3] = {
+            {UA_JSONKEY_ENCODING, NULL, NULL, false, NULL},
+            {UA_JSONKEY_TYPEID, &dst->content.encoded.typeId, NULL, false, &UA_TYPES[UA_TYPES_NODEID]},
+            {UA_JSONKEY_BODY, &dst->content.encoded.body, NULL, false, &UA_TYPES[UA_TYPES_STRING]}
+        };
 
-        if(encoding == 1) {
+        if(encoding == 0) {
+            entries[2].function = (decodeJsonSignature)tokenToByteString;
+            dst->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING; /* ByteString in Json Body */
+        } else if(encoding == 1) {
             dst->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING; /* ByteString in Json Body */
         } else if(encoding == 2) {
             dst->encoding = UA_EXTENSIONOBJECT_ENCODED_XML; /* XmlElement in Json Body */
@@ -2464,69 +2490,10 @@ DECODE_JSON(ExtensionObject) {
             return UA_STATUSCODE_BADDECODINGERROR;
         }
 
-        DecodeEntry entries[3] = {
-            {UA_JSONKEY_ENCODING, NULL, NULL, false, NULL},
-            {UA_JSONKEY_BODY, &dst->content.encoded.body, NULL, false, &UA_TYPES[UA_TYPES_STRING]},
-            {UA_JSONKEY_TYPEID, &dst->content.encoded.typeId, NULL, false, &UA_TYPES[UA_TYPES_NODEID]}
-        };
         return decodeFields(ctx, entries, 3);
     }
 
-    /* Decode the type NodeId */
-    UA_NodeId typeId;
-    UA_NodeId_init(&typeId);
-
-    size_t typeIdIndex = 0;
-    ret = lookAheadForKey(ctx, UA_JSONKEY_TYPEID, &typeIdIndex);
-    if(ret != UA_STATUSCODE_GOOD)
-        return UA_STATUSCODE_BADENCODINGERROR;
-
-    /* Decode the DataType */
-    size_t oldIndex = ctx->index;
-    ctx->index = (UA_UInt16)typeIdIndex;
-    ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
-    ctx->index = oldIndex;
-    if(ret != UA_STATUSCODE_GOOD) {
-        UA_NodeId_clear(&typeId); /* Type NodeId not used anymore and not moved into dst */
-        return ret;
-    }
-
-    /* Lookup the DataType */
-    const UA_DataType *typeOfBody = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);
-
-    /* If the type is not known, decode the body as an opaque JSON decoding */
-    if(!typeOfBody) {
-        /* Dont decode body: 1. save as bytestring, 2. jump over */
-        dst->encoding = UA_EXTENSIONOBJECT_ENCODED_BYTESTRING;
-        dst->content.encoded.typeId = typeId; /* Move the type NodeId */
-
-        /* Search for body */
-        size_t bodyIndex = 0;
-        ret = lookAheadForKey(ctx, UA_JSONKEY_BODY, &bodyIndex);
-        if(ret != UA_STATUSCODE_GOOD)
-            return UA_STATUSCODE_BADDECODINGERROR;
-
-        /* Get the size of the Object as a string, not the Object key count! */
-        size_t sizeOfJsonString = getTokenLength(&ctx->tokens[bodyIndex]);
-        if(sizeOfJsonString == 0)
-            return UA_STATUSCODE_BADDECODINGERROR;
-
-        /* Copy body as bytestring. */
-        const char *bodyJsonString = &ctx->json5[ctx->tokens[bodyIndex].start];
-        ret = UA_ByteString_allocBuffer(&dst->content.encoded.body, sizeOfJsonString);
-        if(ret != UA_STATUSCODE_GOOD)
-            return ret;
-        memcpy(dst->content.encoded.body.data, bodyJsonString, sizeOfJsonString);
-
-        /* Success. Skip to the end of the object. */
-        skipObject(ctx);
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* Type NodeId not used anymore */
-    UA_NodeId_clear(&typeId);
-
-    /* Allocate */
+    /* Allocate memory for the decoded data */
     dst->content.decoded.data = UA_new(typeOfBody);
     if(!dst->content.decoded.data)
         return UA_STATUSCODE_BADOUTOFMEMORY;
@@ -2536,11 +2503,12 @@ DECODE_JSON(ExtensionObject) {
     dst->encoding = UA_EXTENSIONOBJECT_DECODED;
 
     /* Decode body */
-    DecodeEntry entries[2] = {
+    DecodeEntry entries[3] = {
+        {UA_JSONKEY_ENCODING, NULL, NULL, false, NULL},
         {UA_JSONKEY_TYPEID, NULL, NULL, false, NULL},
         {UA_JSONKEY_BODY, dst->content.decoded.data, NULL, false, typeOfBody}
     };
-    return decodeFields(ctx, entries, 2);
+    return decodeFields(ctx, entries, 3);
 }
 
 static status

From 7ad7a09178a4052c84bb60b537c1b359a8830647 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 2 Jan 2024 01:27:37 +0100
Subject: [PATCH 1385/1963] refactor(core): Don't unwrap an ExtensionObject if
 it contains a builtin

We had fuzzer issuers from this where the encoding != decoding because
we would not wrap the builtin content again.
---
 src/ua_types_encoding_json.c     | 48 ++++++++++++++++++++++++--------
 tests/check_types_builtin_json.c |  9 ++----
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 87484029f57..be2e600645a 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2209,6 +2209,17 @@ getArrayUnwrapType(ParseCtx *ctx, size_t arrayIndex) {
         return NULL;
     }
 
+    /* The content is a builtin type that could have been directly encoded in
+     * the Variant, there was no need to wrap in an ExtensionObject. But this
+     * means for us, that somebody made an extra effort to explicitly get an
+     * ExtensionObject. So we keep it. As an added advantage we will generate
+     * the same JSON again when encoding again. */
+    UA_Boolean isBuiltin = (typeOfBody->typeKind <= UA_DATATYPEKIND_DIAGNOSTICINFO);
+    if(isBuiltin) {
+        ctx->index = oldIndex; /* Restore the index */
+        return NULL;
+    }
+
     /* Get the typeId index for faster comparison below.
      * Cannot fail as getExtensionObjectType already looked this up. */
     size_t typeIdIndex = 0;
@@ -2377,7 +2388,8 @@ DECODE_JSON(Variant) {
             {UA_JSONKEY_DIMENSION, &dst->arrayDimensions, VariantDimension_decodeJson, false, NULL}
         };
 
-        /* Can we unwrap ExtensionObjects in the array? */
+        /* Try to unwrap ExtensionObjects in the array.
+         * The members must all have the same type. */
         if(dst->type == &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) {
             const UA_DataType *unwrapType = getArrayUnwrapType(ctx, bodyIndex);
             if(unwrapType) {
@@ -2534,22 +2546,34 @@ Variant_decodeJsonUnwrapExtensionObject(ParseCtx *ctx, void *p, const UA_DataTyp
     }
 
     /* The content is still encoded, cannot unwrap */
-    if(eo.encoding != UA_EXTENSIONOBJECT_DECODED) {
-        /* Decode as ExtensionObject */
-        dst->data = UA_new(&UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
-        if(!dst->data) {
-            UA_ExtensionObject_clear(&eo);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
-        }
-        dst->type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
-        *(UA_ExtensionObject*)dst->data = eo;
-        return UA_STATUSCODE_GOOD;
-    }
+    if(eo.encoding != UA_EXTENSIONOBJECT_DECODED)
+        goto use_eo;
+
+    /* The content is a builtin type that could have been directly encoded in
+     * the Variant, there was no need to wrap in an ExtensionObject. But this
+     * means for us, that somebody made an extra effort to explicitly get an
+     * ExtensionObject. So we keep it. As an added advantage we will generate
+     * the same JSON again when encoding again. */
+    UA_Boolean isBuiltin =
+        (eo.content.decoded.type->typeKind <= UA_DATATYPEKIND_DIAGNOSTICINFO);
+    if(isBuiltin)
+        goto use_eo;
 
     /* Unwrap the ExtensionObject */
     dst->data = eo.content.decoded.data;
     dst->type = eo.content.decoded.type;
     return UA_STATUSCODE_GOOD;
+
+ use_eo:
+    /* Don't unwrap */
+    dst->data = UA_new(&UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+    if(!dst->data) {
+        UA_ExtensionObject_clear(&eo);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    dst->type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
+    *(UA_ExtensionObject*)dst->data = eo;
+    return UA_STATUSCODE_GOOD;
 }
 
 status
diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index bf5a1fcd9a4..c91200512c2 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -5175,16 +5175,11 @@ START_TEST(UA_Variant_ExtensionObjectArray_json_decode) {
 
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_VARIANT], NULL);
 
-    UA_Boolean *testArray;
-    testArray = (UA_Boolean*)(out.data);
-    // then
+    // don't unwrap builtin types that shouldn't be wrapped in the first place
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-    //decoded as False
-    ck_assert_int_eq(testArray[0], 0);
-    ck_assert_int_eq(testArray[1], 1);
+    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_EXTENSIONOBJECT);
     ck_assert_uint_eq(out.arrayDimensionsSize, 0);
     ck_assert_uint_eq(out.arrayLength, 2);
-    ck_assert_int_eq(out.type->typeKind, UA_DATATYPEKIND_BOOLEAN);
     UA_Variant_clear(&out);
 }
 END_TEST

From 6e0e8b09f92ec266b5e0f1185cbd9ba3f774bca0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 2 Jan 2024 23:28:26 +0100
Subject: [PATCH 1386/1963] refactor(deps): Simplify parseUInt64 from
 /deps/parse_num.c

---
 deps/parse_num.c | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/deps/parse_num.c b/deps/parse_num.c
index acb64ca1b87..34a2024db71 100644
--- a/deps/parse_num.c
+++ b/deps/parse_num.c
@@ -26,15 +26,15 @@
 #include <stdlib.h>
 #include <errno.h>
 
-size_t parseUInt64(const char *str, size_t size, uint64_t *result) {
+size_t
+parseUInt64(const char *str, size_t size, uint64_t *result) {
     size_t i = 0;
     uint64_t n = 0, prev = 0;
-    bool digit = false; /* At least one real digit */
-    if(size - i >= 2 && str[i] == '0' && (str[i+1] | 32) == 'x') {
-        /* Hex */
-        i += 2;
+
+    /* Hex */
+    if(size > 2 && str[0] == '0' && (str[1] | 32) == 'x') {
+        i = 2;
         for(; i < size; i++) {
-            /* Get the byte value */
             uint8_t c = (uint8_t)str[i] | 32;
             if(c >= '0' && c <= '9')
                 c = (uint8_t)(c - '0');
@@ -44,38 +44,31 @@ size_t parseUInt64(const char *str, size_t size, uint64_t *result) {
                 c = (uint8_t)(c - 'A' + 10);
             else
                 break;
-            /* Update */
-            digit = true;
             n = (n << 4) | (c & 0xF);
-            if(n < prev)
-            /* Check for overflow */
-                return 0;
-            prev = n;
-        }
-    } else {
-        /* Decimal */
-        for(; i < size; i++) {
-            /* Update */
-            if(str[i] < '0' || str[i] > '9')
-                break;
-            n *= 10;
-            digit = true;
-            n +=(uint8_t)(str[i] - '0');
             if(n < prev) /* Check for overflow */
                 return 0;
             prev = n;
         }
+        *result = n;
+        return (i > 2) ? i : 0; /* 2 -> No digit was parsed */
     }
 
-    /* No digit was parsed */
-    if(!digit)
-        return 0;
-
+    /* Decimal */
+    for(; i < size; i++) {
+        if(str[i] < '0' || str[i] > '9')
+            break;
+        n *= 10;
+        n +=(uint8_t)(str[i] - '0');
+        if(n < prev) /* Check for overflow */
+            return 0;
+        prev = n;
+    }
     *result = n;
     return i;
 }
 
-size_t parseInt64(const char *str, size_t size, int64_t *result) {
+size_t
+parseInt64(const char *str, size_t size, int64_t *result) {
     /* Negative value? */
     size_t i = 0;
     bool neg = false;

From 54638f62d8abba7d4443669fc6410e669b118749 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 2 Jan 2024 23:32:22 +0100
Subject: [PATCH 1387/1963] refactor(deps): Use bit-shift instead of
 multiplication in parse_num.c

---
 deps/parse_num.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deps/parse_num.c b/deps/parse_num.c
index 34a2024db71..0fa2919b1d6 100644
--- a/deps/parse_num.c
+++ b/deps/parse_num.c
@@ -57,8 +57,8 @@ parseUInt64(const char *str, size_t size, uint64_t *result) {
     for(; i < size; i++) {
         if(str[i] < '0' || str[i] > '9')
             break;
-        n *= 10;
-        n +=(uint8_t)(str[i] - '0');
+        /* Fast multiplication: n*10 == (n*8) + (n*2) */
+        n = (n << 3) + (n << 1) + (uint8_t)(str[i] - '0');
         if(n < prev) /* Check for overflow */
             return 0;
         prev = n;

From 81ba96c75f90de76bb4ce6e0bc4636fda6dfbe3d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Jan 2024 00:16:00 +0100
Subject: [PATCH 1388/1963] fix(test): Fix a missing include in
 /tests/nodeset-loader/add_node_integration_test/client.c

---
 tests/nodeset-loader/add_node_integration_test/client.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/nodeset-loader/add_node_integration_test/client.c b/tests/nodeset-loader/add_node_integration_test/client.c
index 2246e2ee4dc..df3cece148a 100644
--- a/tests/nodeset-loader/add_node_integration_test/client.c
+++ b/tests/nodeset-loader/add_node_integration_test/client.c
@@ -2,6 +2,7 @@
 #include <open62541/client_highlevel.h>
 #include <open62541/types.h>
 
+#include "../testing-plugins/testing_clock.h"
 #include "ua_types_encoding_xml.h"
 
 #include <signal.h>

From 9fe37fbde6aabdcca7f022aac0cfcfbaa7fc89e1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 4 Jan 2024 11:14:50 +0100
Subject: [PATCH 1389/1963] fix(core): Use Int32 instead of UInt32 for JSON
 DiagnosticInfo encoding

---
 src/ua_types_encoding_json.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index be2e600645a..ecc5951e6a5 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1172,22 +1172,22 @@ ENCODE_JSON(DiagnosticInfo) {
 
     if(src->hasSymbolicId) {
         ret |= writeJsonKey(ctx, UA_JSONKEY_SYMBOLICID);
-        ret |= ENCODE_DIRECT_JSON(&src->symbolicId, UInt32);
+        ret |= ENCODE_DIRECT_JSON(&src->symbolicId, Int32);
     }
 
     if(src->hasNamespaceUri) {
         ret |= writeJsonKey(ctx, UA_JSONKEY_NAMESPACEURI);
-        ret |= ENCODE_DIRECT_JSON(&src->namespaceUri, UInt32);
+        ret |= ENCODE_DIRECT_JSON(&src->namespaceUri, Int32);
     }
 
     if(src->hasLocalizedText) {
         ret |= writeJsonKey(ctx, UA_JSONKEY_LOCALIZEDTEXT);
-        ret |= ENCODE_DIRECT_JSON(&src->localizedText, UInt32);
+        ret |= ENCODE_DIRECT_JSON(&src->localizedText, Int32);
     }
 
     if(src->hasLocale) {
         ret |= writeJsonKey(ctx, UA_JSONKEY_LOCALE);
-        ret |= ENCODE_DIRECT_JSON(&src->locale, UInt32);
+        ret |= ENCODE_DIRECT_JSON(&src->locale, Int32);
     }
 
     if(src->hasAdditionalInfo) {

From fa0fe62e9202d4357af3adedc9fa5e72aeb1c6e3 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 5 Jan 2024 14:31:47 +0100
Subject: [PATCH 1390/1963] fix(nc): Mark the NamespaceMap attribute as
 deprecated

---
 doc/nodeset_compiler.rst              |  6 +++---
 tests/nodeset-compiler/CMakeLists.txt |  4 ----
 tests/nodeset-loader/CMakeLists.txt   |  1 -
 tools/cmake/macros_public.cmake       | 17 ++++++++++-------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
index 79599a56eaf..08e4f699293 100644
--- a/doc/nodeset_compiler.rst
+++ b/doc/nodeset_compiler.rst
@@ -284,7 +284,7 @@ If you look into the files generated by the nodeset compiler, you will see that
 This is how you can use the nodeset compiler to compile simple NodeSet XMLs to be used by the open62541 stack.
 
 For your convenience and for simpler use we also provide a CMake function which simplifies the use of the ``ua_generate_datatypes`` and ``ua_generate_nodeset`` function even more.
-It is highly recommended to use this function: ``ua_generate_nodeset_and_datatypes``. It uses some best practice settings and you only need to pass a name, the namespace mapping ``NAMESPACE_MAP`` (as described further below) and the nodeset files.
+It is highly recommended to use this function: ``ua_generate_nodeset_and_datatypes``. It uses some best practice settings and you only need to pass a name and the nodeset files.
 Passing the .csv and .bsd files is optional and if not given, generating datatypes for that noteset will be skipped. You can also define dependencies between nodesets using the ``DEPENDS`` argument.
 
 Here are some examples for the ``DI`` and ``PLCOpen`` nodesets::
@@ -294,7 +294,6 @@ Here are some examples for the ``DI`` and ``PLCOpen`` nodesets::
         NAME "di"
         FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
         FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
-        NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
     )
 
@@ -400,7 +399,6 @@ This DI nodeset makes use of some additional data types in ``deps/ua-nodeset/DI/
     ua_generate_datatypes(
         NAME "ua_types_di"
         TARGET_SUFFIX "types-di"
-        NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
         FILES_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
     )
@@ -410,6 +408,8 @@ This mapping is required for correct mapping of DataType nodes and their node id
 If you are using the `DEPENDS` option on the ``ua_generate_nodeset_and_datatypes``, the ``NAMESPACE_MAP`` is also inherited and you do not need to pass all mappings for dependent types.
 The CSV and BSD files contain the metadata and definition for the types. ``TARGET_SUFFIX`` is used to create a new target with the name ``open62541-generator-TARGET_SUFFIX``.
 
+**The ``NAMESPACE_MAP`` parameter is deprecated and no longer has any effect. The index of the nodeset is set automatically when it is loaded.**
+
 Now you can compile the DI nodeset XML using the following command::
 
     ua_generate_nodeset(
diff --git a/tests/nodeset-compiler/CMakeLists.txt b/tests/nodeset-compiler/CMakeLists.txt
index 8fd55c9b1fc..78674ab652e 100644
--- a/tests/nodeset-compiler/CMakeLists.txt
+++ b/tests/nodeset-compiler/CMakeLists.txt
@@ -13,7 +13,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         NAME "tests-di"
         FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
         FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
-        NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
         FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
         INTERNAL
@@ -24,7 +23,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         NAME "tests-adi"
         FILE_CSV "${UA_NODESET_DIR}/ADI/OpcUaAdiModel.csv"
         FILE_BSD "${UA_NODESET_DIR}/ADI/Opc.Ua.Adi.Types.bsd"
-        NAMESPACE_MAP "3:http://opcfoundation.org/UA/ADI/"
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
         FILE_NS "${UA_NODESET_DIR}/ADI/Opc.Ua.Adi.NodeSet2.xml"
         DEPENDS "tests-di"
@@ -59,7 +57,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
             NAME "tests-autoid"
             FILE_CSV "${PROJECT_SOURCE_DIR}/tests/nodeset-compiler/Opc.Ua.AutoID.NodeIds.csv"
             FILE_BSD "${PROJECT_SOURCE_DIR}/tests/nodeset-compiler/Opc.Ua.AutoID.Types.bsd"
-            NAMESPACE_MAP "3:http://opcfoundation.org/UA/AutoID/"
             OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
             FILE_NS "${UA_NODESET_DIR}/AutoID/Opc.Ua.AutoID.NodeSet2.xml"
             DEPENDS "tests-di"
@@ -95,7 +92,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         NAME "tests-testnodeset"
         FILE_CSV "${PROJECT_SOURCE_DIR}/tests/nodeset-compiler/testnodeset.csv"
         FILE_BSD "${PROJECT_SOURCE_DIR}/tests/nodeset-compiler/testtypes.bsd"
-        NAMESPACE_MAP "3:http://yourorganisation.org/test/"
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
         FILE_NS "${PROJECT_SOURCE_DIR}/tests/nodeset-compiler/testnodeset.xml"
         DEPENDS "tests-di"
diff --git a/tests/nodeset-loader/CMakeLists.txt b/tests/nodeset-loader/CMakeLists.txt
index a80537cec8b..8c146c65dba 100644
--- a/tests/nodeset-loader/CMakeLists.txt
+++ b/tests/nodeset-loader/CMakeLists.txt
@@ -19,7 +19,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         NAME "nodesetloader-di"
         FILE_CSV "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeIds.csv"
         FILE_BSD "${UA_NODESET_DIR}/DI/Opc.Ua.Di.Types.bsd"
-        NAMESPACE_MAP "2:http://opcfoundation.org/UA/DI/"
         OUTPUT_DIR "${GENERATE_OUTPUT_DIR}"
         FILE_NS "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
         INTERNAL
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index a661da0dd96..beb40e9c99d 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -112,7 +112,7 @@ endfunction()
 #                   Multiple files can be passed which will all be imported.
 #   [FILES_SELECTED] Optional path to a simple text file which contains a list of types which should be included in the generation.
 #                   The file should contain one type per line. Multiple files can be passed to this argument.
-#   NAMESPACE_MAP   Array of Namespace index mappings to indicate the final namespace index of a namespace uri when the server is started.
+#   NAMESPACE_MAP   [Deprecated]Array of Namespace index mappings to indicate the final namespace index of a namespace uri when the server is started.
 #                   This is required to correctly map datatype node ids to the resulting server namespace index.
 #                   "0:http://opcfoundation.org/UA/" is added by default.
 #                   Example: ["2:http://example.org/UA/"]
@@ -129,8 +129,8 @@ function(ua_generate_datatypes)
     endif()
 
     # ------ Argument checking -----
-    if(NOT DEFINED UA_GEN_DT_NAMESPACE_MAP AND NOT "${UA_GEN_DT_NAMESPACE_MAP}" STREQUAL "")
-        message(FATAL_ERROR "ua_generate_datatype function requires a value for the NAMESPACE_MAP argument")
+    if(DEFINED UA_GEN_DT_NAMESPACE_MAP)
+        message(WARNING "NAMESPACE_MAP argument is deprecated and no longer has any effect. The index of the nodeset is set automatically.")
     endif()
     if(NOT UA_GEN_DT_NAME OR "${UA_GEN_DT_NAME}" STREQUAL "")
         message(FATAL_ERROR "ua_generate_datatype function requires a value for the NAME argument")
@@ -509,7 +509,7 @@ endfunction()
 #   [TARGET_PREFIX] Optional prefix for the resulting targets. Default `open62541-generator`
 #
 #   Arguments taking multiple values:
-#   [NAMESPACE_MAP] Array of Namespace index mappings to indicate the final namespace index of a namespace uri when the server is started.
+#   [NAMESPACE_MAP] [Deprecated]Array of Namespace index mappings to indicate the final namespace index of a namespace uri when the server is started.
 #                   This parameter is mandatory if FILE_CSV or FILE_BSD is set.
 #   [IMPORT_BSD]    Optional combination of types array and path to the .bsd file containing additional type definitions referenced by
 #                   the FILES_BSD files. The value is separated with a hash sign, i.e.
@@ -535,6 +535,10 @@ function(ua_generate_nodeset_and_datatypes)
     endif()
 
     # ------ Argument checking -----
+    if(DEFINED UA_GEN_NAMESPACE_MAP)
+        message(WARNING "NAMESPACE_MAP argument is deprecated and no longer has any effect. The index of the nodeset is set automatically.")
+    endif()
+
     if(NOT UA_GEN_NAME OR "${UA_GEN_NAME}" STREQUAL "")
         message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires a value for the NAME argument")
     endif()
@@ -545,9 +549,8 @@ function(ua_generate_nodeset_and_datatypes)
     endif()
 
     if((NOT UA_GEN_FILE_CSV OR "${UA_GEN_FILE_CSV}" STREQUAL "") AND
-    (NOT "${UA_GEN_FILE_BSD}" STREQUAL "" OR
-        NOT "${UA_GEN_NAMESPACE_MAP}" STREQUAL ""))
-        message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires FILE_CSV argument if any of FILE_BSD or NAMESPACE_MAP are set")
+    (NOT "${UA_GEN_FILE_BSD}" STREQUAL ""))
+        message(FATAL_ERROR "ua_generate_nodeset_and_datatypes function requires FILE_CSV argument if FILE_BSD is set")
     endif()
 
     # Set default value for output dir

From f7a7ac92a7dba91e2b9e066a1a77d25f2e298c43 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 6 Jan 2024 09:52:01 +0100
Subject: [PATCH 1391/1963] refactor(server): Move A&C to a dedicated
 documentation subchapter

---
 include/open62541/server.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 7db673d39a0..2e5a270f1f9 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *    Copyright 2014-2020 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2014-2024 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2015-2016 (c) Sten Grüner
  *    Copyright 2014-2015, 2017 (c) Florian Palm
  *    Copyright 2015-2016 (c) Chris Iatrou
@@ -1618,6 +1618,10 @@ UA_Server_triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS_EVENTS */
 
+/**
+ * Alarms & Conditions (Experimental)
+ * ---------------------------------- */
+
 #ifdef UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS
 typedef enum UA_TwoStateVariableCallbackType {
   UA_ENTERING_ENABLEDSTATE,

From 0c7d745b3b0ce84e9b5890e9dd1f7954e3ba0253 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 6 Jan 2024 09:55:13 +0100
Subject: [PATCH 1392/1963] refactor(util): Code reordered in /src/ua_util.c

---
 src/ua_util.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/ua_util.c b/src/ua_util.c
index 85cb4a83e50..e6834c5b319 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -482,6 +482,22 @@ UA_Guid_random(void) {
     return result;
 }
 
+/********************/
+/* Malloc Singleton */
+/********************/
+
+#ifdef UA_ENABLE_MALLOC_SINGLETON
+# include <stdlib.h>
+UA_EXPORT UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size) = malloc;
+UA_EXPORT UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr) = free;
+UA_EXPORT UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize) = calloc;
+UA_EXPORT UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size) = realloc;
+#endif
+
+/************************/
+/* Cryptography Helpers */
+/************************/
+
 UA_ByteString
 getLeafCertificate(UA_ByteString chain) {
     /* Detect DER encoded X.509 v3 certificate. If the DER detection fails,
@@ -506,16 +522,3 @@ getLeafCertificate(UA_ByteString chain) {
     chain.length = leafLen;
     return chain;
 }
-
-/********************/
-/* Malloc Singleton */
-/********************/
-
-/* Global malloc singletons */
-#ifdef UA_ENABLE_MALLOC_SINGLETON
-# include <stdlib.h>
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_mallocSingleton)(size_t size) = malloc;
-UA_EXPORT UA_THREAD_LOCAL void (*UA_freeSingleton)(void *ptr) = free;
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_callocSingleton)(size_t nelem, size_t elsize) = calloc;
-UA_EXPORT UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size) = realloc;
-#endif

From 28b758b01432314f2b626d87d62592537dc5e415 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 6 Jan 2024 09:57:34 +0100
Subject: [PATCH 1393/1963] refactor(core): Move cryptography helpers from
 static inline to /src/ua_util.c

---
 include/open62541/util.h | 31 ++++---------------------------
 src/ua_util.c            | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/include/open62541/util.h b/include/open62541/util.h
index 7fe3b22d0c2..8933f08584a 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -240,37 +240,14 @@ UA_RelativePath_parse(UA_RelativePath *rp, const UA_String str);
 
 /* Compare memory in constant time to mitigate timing attacks.
  * Returns true if ptr1 and ptr2 are equal for length bytes. */
-static UA_INLINE UA_Boolean
-UA_constantTimeEqual(const void *ptr1, const void *ptr2, size_t length) {
-    volatile const UA_Byte *a = (volatile const UA_Byte *)ptr1;
-    volatile const UA_Byte *b = (volatile const UA_Byte *)ptr2;
-    volatile UA_Byte c = 0;
-    for(size_t i = 0; i < length; ++i) {
-        UA_Byte x = a[i], y = b[i];
-        c = c | (x ^ y);
-    }
-    return !c;
-}
+UA_EXPORT UA_Boolean
+UA_constantTimeEqual(const void *ptr1, const void *ptr2, size_t length);
 
 /* Zero-out memory in a way that is not removed by compiler-optimizations. Use
  * this to ensure cryptographic secrets don't leave traces after the memory was
  * freed. */
-static UA_INLINE void
-UA_ByteString_memZero(UA_ByteString *bs) {
-#if defined(__STDC_LIB_EXT1__)
-   memset_s(bs->data, bs->length, 0, bs->length);
-#elif defined(_WIN32)
-   SecureZeroMemory(bs->data, bs->length);
-#else
-   volatile unsigned char *volatile ptr =
-       (volatile unsigned char *)bs->data;
-   size_t i = 0;
-   size_t maxLen = bs->length;
-   while(i < maxLen) {
-       ptr[i++] = 0;
-   }
-#endif
-}
+UA_EXPORT void
+UA_ByteString_memZero(UA_ByteString *bs);
 
 _UA_END_DECLS
 
diff --git a/src/ua_util.c b/src/ua_util.c
index e6834c5b319..951608eb475 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -522,3 +522,32 @@ getLeafCertificate(UA_ByteString chain) {
     chain.length = leafLen;
     return chain;
 }
+
+UA_Boolean
+UA_constantTimeEqual(const void *ptr1, const void *ptr2, size_t length) {
+    volatile const UA_Byte *a = (volatile const UA_Byte *)ptr1;
+    volatile const UA_Byte *b = (volatile const UA_Byte *)ptr2;
+    volatile UA_Byte c = 0;
+    for(size_t i = 0; i < length; ++i) {
+        UA_Byte x = a[i], y = b[i];
+        c = c | (x ^ y);
+    }
+    return !c;
+}
+
+void
+UA_ByteString_memZero(UA_ByteString *bs) {
+#if defined(__STDC_LIB_EXT1__)
+   memset_s(bs->data, bs->length, 0, bs->length);
+#elif defined(_WIN32)
+   SecureZeroMemory(bs->data, bs->length);
+#else
+   volatile unsigned char *volatile ptr =
+       (volatile unsigned char *)bs->data;
+   size_t i = 0;
+   size_t maxLen = bs->length;
+   while(i < maxLen) {
+       ptr[i++] = 0;
+   }
+#endif
+}

From 2ad136fcf95ae2d6ee3a81c2d99d6b8255967510 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 6 Jan 2024 10:05:50 +0100
Subject: [PATCH 1394/1963] refactor(core): Define the default node attributes
 in utils.h only

---
 include/open62541/client.h           |  1 +
 include/open62541/client_highlevel.h | 17 -----------------
 include/open62541/server.h           | 23 ++++++-----------------
 include/open62541/util.h             | 24 ++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index ab868cb4fb4..9195083cf7d 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -21,6 +21,7 @@
 
 #include <open62541/types.h>
 #include <open62541/common.h>
+#include <open62541/util.h>
 
 #include <open62541/plugin/log.h>
 #include <open62541/plugin/eventloop.h>
diff --git a/include/open62541/client_highlevel.h b/include/open62541/client_highlevel.h
index 189ea472ad6..4e0eeda8869 100644
--- a/include/open62541/client_highlevel.h
+++ b/include/open62541/client_highlevel.h
@@ -508,23 +508,6 @@ UA_StatusCode UA_EXPORT
 UA_Client_deleteNode(UA_Client *client, const UA_NodeId nodeId,
                      UA_Boolean deleteTargetReferences);
 
-/* Protect against redundant definitions for server/client */
-#ifndef UA_DEFAULT_ATTRIBUTES_DEFINED
-#define UA_DEFAULT_ATTRIBUTES_DEFINED
-/* The default for variables is "BaseDataType" for the datatype, -2 for the
- * valuerank and a read-accesslevel. */
-UA_EXPORT extern const UA_VariableAttributes UA_VariableAttributes_default;
-UA_EXPORT extern const UA_VariableTypeAttributes UA_VariableTypeAttributes_default;
-/* Methods are executable by default */
-UA_EXPORT extern const UA_MethodAttributes UA_MethodAttributes_default;
-/* The remaining attribute definitions are currently all zeroed out */
-UA_EXPORT extern const UA_ObjectAttributes UA_ObjectAttributes_default;
-UA_EXPORT extern const UA_ObjectTypeAttributes UA_ObjectTypeAttributes_default;
-UA_EXPORT extern const UA_ReferenceTypeAttributes UA_ReferenceTypeAttributes_default;
-UA_EXPORT extern const UA_DataTypeAttributes UA_DataTypeAttributes_default;
-UA_EXPORT extern const UA_ViewAttributes UA_ViewAttributes_default;
-#endif
-
 /* Don't call this function, use the typed versions */
 UA_StatusCode UA_EXPORT
 __UA_Client_addNode(UA_Client *client, const UA_NodeClass nodeClass,
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 2e5a270f1f9..c35886d1923 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -19,6 +19,7 @@
 
 #include <open62541/types.h>
 #include <open62541/common.h>
+#include <open62541/util.h>
 
 #include <open62541/plugin/log.h>
 #include <open62541/plugin/pki.h>
@@ -1292,6 +1293,11 @@ UA_Server_readObjectProperty(UA_Server *server, const UA_NodeId objectId,
  * See the Section :ref:`node-lifecycle` on constructors and on attaching
  * user-defined data to nodes.
  *
+ * The Section :ref:`default-node-attributes` contains useful starting points
+ * for defining node attributes. Forgetting to set the ValueRank or the
+ * AccessLevel leads to errors that can be hard to track down for new users. The
+ * default attributes have a high likelihood to "do the right thing".
+ *
  * The methods for node addition and deletion take mostly const arguments that
  * are not modified. When creating a node, a deep copy of the node identifier,
  * node attributes, etc. is created. Therefore, it is possible to call for
@@ -1300,23 +1306,6 @@ UA_Server_readObjectProperty(UA_Server *server, const UA_NodeId objectId,
  * changes to a variable value to manifest at a specific memory location, please
  * use a :ref:`datasource` or a :ref:`value-callback`. */
 
-/* Protect against redundant definitions for server/client */
-#ifndef UA_DEFAULT_ATTRIBUTES_DEFINED
-#define UA_DEFAULT_ATTRIBUTES_DEFINED
-/* The default for variables is "BaseDataType" for the datatype, -2 for the
- * valuerank and a read-accesslevel. */
-UA_EXPORT extern const UA_VariableAttributes UA_VariableAttributes_default;
-UA_EXPORT extern const UA_VariableTypeAttributes UA_VariableTypeAttributes_default;
-/* Methods are executable by default */
-UA_EXPORT extern const UA_MethodAttributes UA_MethodAttributes_default;
-/* The remaining attribute definitions are currently all zeroed out */
-UA_EXPORT extern const UA_ObjectAttributes UA_ObjectAttributes_default;
-UA_EXPORT extern const UA_ObjectTypeAttributes UA_ObjectTypeAttributes_default;
-UA_EXPORT extern const UA_ReferenceTypeAttributes UA_ReferenceTypeAttributes_default;
-UA_EXPORT extern const UA_DataTypeAttributes UA_DataTypeAttributes_default;
-UA_EXPORT extern const UA_ViewAttributes UA_ViewAttributes_default;
-#endif
-
 /* Don't use this function. There are typed versions as inline functions. */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 __UA_Server_addNode(UA_Server *server, const UA_NodeClass nodeClass,
diff --git a/include/open62541/util.h b/include/open62541/util.h
index 8933f08584a..9a0ca7fd7c9 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -119,6 +119,30 @@ typedef struct {
     UA_UInt32 remoteMaxChunkCount;  /* (0 = unbounded) */
 } UA_ConnectionConfig;
 
+/**
+ * .. _default-node-attributes:
+ *
+ * Default Node Attributes
+ * -----------------------
+ * Default node attributes to simplify the use of the AddNodes services. For
+ * example, Setting the ValueRank and AccessLevel to zero is often an unintended
+ * setting and leads to errors that are hard to track down. */
+
+/* The default for variables is "BaseDataType" for the datatype, -2 for the
+ * valuerank and a read-accesslevel. */
+UA_EXPORT extern const UA_VariableAttributes UA_VariableAttributes_default;
+UA_EXPORT extern const UA_VariableTypeAttributes UA_VariableTypeAttributes_default;
+
+/* Methods are executable by default */
+UA_EXPORT extern const UA_MethodAttributes UA_MethodAttributes_default;
+
+/* The remaining attribute definitions are currently all zeroed out */
+UA_EXPORT extern const UA_ObjectAttributes UA_ObjectAttributes_default;
+UA_EXPORT extern const UA_ObjectTypeAttributes UA_ObjectTypeAttributes_default;
+UA_EXPORT extern const UA_ReferenceTypeAttributes UA_ReferenceTypeAttributes_default;
+UA_EXPORT extern const UA_DataTypeAttributes UA_DataTypeAttributes_default;
+UA_EXPORT extern const UA_ViewAttributes UA_ViewAttributes_default;
+
 /**
  * Endpoint URL Parser
  * -------------------

From 6283739667e619b95db96e4023b603e9f289fa6b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 6 Jan 2024 10:09:08 +0100
Subject: [PATCH 1395/1963] refactor(core): Move the range definition to util.h

---
 include/open62541/server.h | 11 -----------
 include/open62541/util.h   | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index c35886d1923..d52bdb07db9 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -43,19 +43,8 @@ _UA_BEGIN_DECLS
 /* Forward declarations */
 struct UA_PubSubConfiguration;
 typedef struct UA_PubSubConfiguration UA_PubSubConfiguration;
-
 typedef void (*UA_Server_AsyncOperationNotifyCallback)(UA_Server *server);
 
-typedef struct {
-    UA_UInt32 min;
-    UA_UInt32 max;
-} UA_UInt32Range;
-
-typedef struct {
-    UA_Duration min;
-    UA_Duration max;
-} UA_DurationRange;
-
 /**
  * .. _server:
  *
diff --git a/include/open62541/util.h b/include/open62541/util.h
index 9a0ca7fd7c9..63a20880c7c 100644
--- a/include/open62541/util.h
+++ b/include/open62541/util.h
@@ -14,6 +14,20 @@
 
 _UA_BEGIN_DECLS
 
+/**
+ * Range Definition
+ * ---------------- */
+
+typedef struct {
+    UA_UInt32 min;
+    UA_UInt32 max;
+} UA_UInt32Range;
+
+typedef struct {
+    UA_Duration min;
+    UA_Duration max;
+} UA_DurationRange;
+
 /**
  * Random Number Generator
  * -----------------------

From cc1a1a5709b37d49e01b28ff4e8ff4ad086e3fef Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 6 Jan 2024 10:35:08 +0100
Subject: [PATCH 1396/1963] refactor(server): Cosmetic improvements in server.h

---
 include/open62541/server.h | 132 ++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 74 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index d52bdb07db9..a3e0f269c1a 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -564,8 +564,7 @@ UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId);
  * - 0:localeIds [UA_String]: List of preferred languages (read-only)
  * - 0:clientDescription [UA_ApplicationDescription]: Client description (read-only)
  * - 0:sessionName [String] Client-defined name of the session (read-only)
- * - 0:clientUserId [String] User identifier used to activate the session (read-only)
- */
+ * - 0:clientUserId [String] User identifier used to activate the session (read-only) */
 
 /* Returns a shallow copy of the attribute. Don't _clear or _delete the value
  * variant. Don't use the value once the Session could be already closed in the
@@ -612,6 +611,7 @@ UA_Server_deleteSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
  * - UserWriteMask
  * - UserAccessLevel
  * - UserExecutable */
+
 /* Read an attribute of a node. The specialized functions below provide a more
  * concise syntax.
  *
@@ -1027,8 +1027,7 @@ UA_Server_deregisterDiscovery(UA_Server *server, UA_ClientConfig *cc,
 
 /**
  * Operating a Discovery Server
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
 
 /* Callback for RegisterServer. Data is passed from the register call */
 typedef void
@@ -1085,14 +1084,12 @@ UA_Server_setServerOnNetworkCallback(UA_Server *server,
 /**
  * Information Model Callbacks
  * ---------------------------
- *
  * There are three places where a callback from an information model to
  * user-defined code can happen.
  *
  * - Custom node constructors and destructors
  * - Linking VariableNodes with an external data source
- * - MethodNode callbacks
- */
+ * - MethodNode callbacks */
 
 void UA_EXPORT
 UA_Server_setAdminSessionContext(UA_Server *server,
@@ -1116,7 +1113,6 @@ UA_Server_setNodeContext(UA_Server *server, UA_NodeId nodeId,
  *
  * Data Source Callback
  * ^^^^^^^^^^^^^^^^^^^^
- *
  * The server has a unique way of dealing with the content of variables. Instead
  * of storing a variant attached to the variable node, the node can point to a
  * function with a local data provider. Whenever the value attribute is read,
@@ -1145,7 +1141,6 @@ UA_Server_setVariableNode_valueBackend(UA_Server *server,
  *
  * Local MonitoredItems
  * ^^^^^^^^^^^^^^^^^^^^
- *
  * MonitoredItems are used with the Subscription mechanism of OPC UA to
  * transported notifications for data changes and events. MonitoredItems can
  * also be registered locally. Notifications are then forwarded to a
@@ -1229,8 +1224,7 @@ UA_Server_call(UA_Server *server, const UA_CallMethodRequest *request);
  * Interacting with Objects
  * ------------------------
  * Objects in the information model are represented as ObjectNodes. Some
- * convenience functions are provided to simplify the interaction with objects.
- */
+ * convenience functions are provided to simplify the interaction with objects. */
 
 /* Write an object property. The property is represented as a VariableNode with
  * a ``HasProperty`` reference from the ObjectNode. The VariableNode is
@@ -1530,6 +1524,7 @@ UA_Server_deleteNode(UA_Server *server, const UA_NodeId nodeId,
 /**
  * Reference Management
  * -------------------- */
+
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_addReference(UA_Server *server, const UA_NodeId sourceId,
                        const UA_NodeId refTypeId,
@@ -1640,8 +1635,7 @@ UA_Server_createCondition(UA_Server *server,
                           const UA_NodeId hierarchialReferenceType,
                           UA_NodeId *outConditionId);
 
-/**
- * The method pair UA_Server_addCondition_begin and _finish splits the
+/* The method pair UA_Server_addCondition_begin and _finish splits the
  * UA_Server_createCondtion in two parts similiar to the
  * UA_Server_addNode_begin / _finish pair. This is useful if the node shall be
  * modified before finish the instantiation. For example to add children with
@@ -1666,9 +1660,7 @@ UA_Server_addCondition_begin(UA_Server *server,
                              const UA_QualifiedName conditionName,
                              UA_NodeId *outConditionId);
 
-/**
- * Second call of the UA_Server_addCondition_begin and _finish pair.
- *
+/* Second call of the UA_Server_addCondition_begin and _finish pair.
  * Additionally to UA_Server_addNode_finish UA_Server_addCondition_finish:
  *  - checks whether the condition source has HasEventSource reference to its
  *    parent. If not, a HasEventSource reference will be created between
@@ -1783,24 +1775,20 @@ UA_Server_deleteCondition(UA_Server *server,
                           const UA_NodeId condition,
                           const UA_NodeId conditionSource);
 
-/*
- * Set the LimitState of the LimitAlarmType
+/* Set the LimitState of the LimitAlarmType
  *
  * @param server The server object
- * @param conditionId The NodeId of the node representation of the Condition Instance
- * @param limitValue The value from the trigger node
- */
+ * @param conditionId NodeId of the node representation of the Condition Instance
+ * @param limitValue The value from the trigger node */
 UA_StatusCode UA_EXPORT
 UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
                         UA_Double limitValue);
 
-/*
- * Parse the certifcate and set Expiration date
+/* Parse the certifcate and set Expiration date
  *
  * @param server The server object
- * @param conditionId The NodeId of the node representation of the Condition Instance
- * @param cert The certificate for parsing
- */
+ * @param conditionId NodeId of the node representation of the Condition Instance
+ * @param cert The certificate for parsing */
 UA_StatusCode UA_EXPORT
 UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
                             UA_ByteString  cert);
@@ -1810,6 +1798,7 @@ UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
 /**
  * Update the Server Certificate at Runtime
  * ---------------------------------------- */
+
 UA_StatusCode UA_EXPORT
 UA_Server_updateCertificate(UA_Server *server,
                             const UA_ByteString *oldCertificate,
@@ -1821,6 +1810,7 @@ UA_Server_updateCertificate(UA_Server *server,
 /**
  * Utility Functions
  * ----------------- */
+
 /* Lookup a datatype by its NodeId. Takes the custom types in the server
  * configuration into account. Return NULL if none found. */
 UA_EXPORT const UA_DataType *
@@ -1841,22 +1831,22 @@ UA_Server_getNamespaceByIndex(UA_Server *server, const size_t namespaceIndex,
                               UA_String *foundUri);
 
 /**
-* .. _async-operations:
-*
-* Async Operations
-* ----------------
-* Some operations (such as reading out a sensor that needs to warm up) can take
-* quite some time. In order not to block the server during such an operation, it
-* can be "outsourced" to a worker thread.
-*
-* Take the example of a CallRequest. It is split into the individual method call
-* operations. If the method is marked as async, then the operation is put into a
-* queue where it is be retrieved by a worker. The worker returns the result when
-* ready. See the examples in ``/examples/tutorial_server_method_async.c`` for
-* the usage.
-*
-* Note that the operation can time out (see the asyncOperationTimeout setting in
-* the server config) also when it has been retrieved by the worker. */
+ * .. _async-operations:
+ *
+ * Async Operations
+ * ----------------
+ * Some operations (such as reading out a sensor that needs to warm up) can take
+ * quite some time. In order not to block the server during such an operation, it
+ * can be "outsourced" to a worker thread.
+ *
+ * Take the example of a CallRequest. It is split into the individual method call
+ * operations. If the method is marked as async, then the operation is put into a
+ * queue where it is be retrieved by a worker. The worker returns the result when
+ * ready. See the examples in ``/examples/tutorial_server_method_async.c`` for
+ * the usage.
+ *
+ * Note that the operation can time out (see the asyncOperationTimeout setting in
+ * the server config) also when it has been retrieved by the worker. */
 
 #if UA_MULTITHREADING >= 100
 
@@ -1919,7 +1909,6 @@ UA_Server_setAsyncOperationResult(UA_Server *server,
 /**
  * Statistics
  * ----------
- *
  * Statistic counters keeping track of the current state of the stack. Counters
  * are structured per OPC UA communication layer. */
 
@@ -1932,52 +1921,47 @@ UA_ServerStatistics UA_EXPORT
 UA_Server_getStatistics(UA_Server *server);
 
 /**
-  * Reverse Connect
-  * ---------------
-  *
-  * The reverse connect feature of OPC UA permits the server instead of the client to
-  * establish the connection.
-  * The client must expose the listening port so the server is able to reach it.
-  */
-
-/**
- * The reverse connect state change callback is called whenever the state of a reverse
- * connect is changed by a connection attempt, a successful connection or a connection
- * loss.
- *
- * The reverse connect states reflect the state of the secure channel currently associated
- * with a reverse connect. The state will remain UA_SECURECHANNELSTATE_CONNECTING while
- * the server attempts repeatedly to establish a connection.
- */
-typedef void (*UA_Server_ReverseConnectStateCallback)(UA_Server *server, UA_UInt64 handle,
+ * Reverse Connect
+ * ---------------
+ * The reverse connect feature of OPC UA permits the server instead of the
+ * client to establish the connection. The client must expose the listening port
+ * so the server is able to reach it. */
+
+/* The reverse connect state change callback is called whenever the state of a
+ * reverse connect is changed by a connection attempt, a successful connection
+ * or a connection loss.
+ *
+ * The reverse connect states reflect the state of the secure channel currently
+ * associated with a reverse connect. The state will remain
+ * UA_SECURECHANNELSTATE_CONNECTING while the server attempts repeatedly to
+ * establish a connection. */
+typedef void (*UA_Server_ReverseConnectStateCallback)(UA_Server *server,
+                                                      UA_UInt64 handle,
                                                       UA_SecureChannelState state,
                                                       void *context);
 
-/**
- * Registers a reverse connect in the server.
- * The server periodically attempts to establish a connection if the initial connect fails
- * or if the connection breaks.
+/* Registers a reverse connect in the server. The server periodically attempts
+ * to establish a connection if the initial connect fails or if the connection
+ * breaks.
  *
  * @param server The server object
  * @param url The URL of the remote client
  * @param stateCallback The callback which will be called on state changes
  * @param callbackContext The context for the state callback
  * @param handle Is set to the handle of the reverse connect if not NULL
- * @return Returns UA_STATUSCODE_GOOD if the reverse connect has been registered
- */
+ * @return Returns UA_STATUSCODE_GOOD if the reverse connect has been registered */
 UA_StatusCode UA_EXPORT
 UA_Server_addReverseConnect(UA_Server *server, UA_String url,
-                                          UA_Server_ReverseConnectStateCallback stateCallback,
-                                          void *callbackContext, UA_UInt64 *handle);
+                            UA_Server_ReverseConnectStateCallback stateCallback,
+                            void *callbackContext, UA_UInt64 *handle);
 
-/**
- * Removes a reverse connect from the server and closes the connection if it is currently
- * open.
+/* Removes a reverse connect from the server and closes the connection if it is
+ * currently open.
  *
  * @param server The server object
  * @param handle The handle of the reverse connect to remove
- * @return Returns UA_STATUSCODE_GOOD if the reverse connect has been successfully removed
- */
+ * @return Returns UA_STATUSCODE_GOOD if the reverse connect has been
+ *         successfully removed */
 UA_StatusCode UA_EXPORT
 UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle);
 

From 815541ca1863a50703ec1d5793001fc3e0be5eb5 Mon Sep 17 00:00:00 2001
From: Norbert Greiner <n.greiner@pilz.de>
Date: Mon, 8 Jan 2024 14:03:52 +0100
Subject: [PATCH 1397/1963] fix(server): memory handling in the server mdns
 implementation. Fix memcpy issue (maybe "copy&paste" error from fix in 1.3 ->
  47239db132de3db30b975d65853a5a2ee295124c.

---
 src/server/ua_discovery_mdns.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_discovery_mdns.c b/src/server/ua_discovery_mdns.c
index c6ba3991490..f6f9b19e6db 100644
--- a/src/server/ua_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -269,7 +269,7 @@ setTxt(UA_DiscoveryManager *dm, const struct resource *r,
                                  "Cannot alloc memory for mDNS srv path");
                     return;
                 }
-                memcpy(&entry->pathTmp, path, pathLen);
+                memcpy(entry->pathTmp, path, pathLen);
                 entry->pathTmp[pathLen] = '\0';
             }
         } else {

From 834c1ee07abb39071b07ca9cc3877db58b117a1e Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Wed, 10 Jan 2024 08:54:27 +0100
Subject: [PATCH 1398/1963] fix(build): lowercase typo in UA_ARCHITECTURE_*

Use an uppercase T to match the #cmakedefine's above.

Fixes: 7547a8a9dc0b64eaf7a568305d82a78da6a6a6a1
---
 include/open62541/config.h.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 5b20497edda..4fe010e3e2d 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -24,7 +24,7 @@
 #cmakedefine UA_ARCHITECTURE_POSIX
 
 /* Select default architecture if none is selected */
-#if !defined(UA_ARCHITECtURE_WIN32) && !defined(UA_ARCHITECtURE_POSIX)
+#if !defined(UA_ARCHITECTURE_WIN32) && !defined(UA_ARCHITECTURE_POSIX)
 # ifdef _WIN32
 #  define UA_ARCHITECTURE_WIN32
 # else

From 821eb1e002364c8ac42783ff2023b52f3d13d88b Mon Sep 17 00:00:00 2001
From: Patrik Wenger <patrik.wenger@mindclue.ch>
Date: Sat, 30 Dec 2023 10:55:07 +0100
Subject: [PATCH 1399/1963] UA_MonitoredItem_processSampledValue(): fix passing
 subscription pointer to UA_LOG_DEBUG_SUBSCRIPTION

---
 src/server/ua_subscription_datachange.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index b37edf0466d..ff0ec730861 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -155,7 +155,7 @@ UA_MonitoredItem_processSampledValue(UA_Server *server, UA_MonitoredItem *mon,
     /* Has the value changed (with the filters applied)? */
     UA_Boolean changed = detectValueChange(server, mon, value);
     if(!changed) {
-        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, mon->subscription,
                                   "MonitoredItem %" PRIi32 " | "
                                   "The value has not changed", mon->monitoredItemId);
         UA_DataValue_clear(value);

From 9a1652af769ffa56f9f4f868f68c796040965562 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 3 Jan 2024 09:20:16 +0100
Subject: [PATCH 1400/1963] fix(nc): Handling of symbolic names during data
 type generation.

---
 doc/nodeset_compiler.rst                      |   6 +-
 tools/ci.sh                                   |   2 +-
 tools/cmake/macros_public.cmake               |  10 +-
 tools/generate_datatypes.py                   |  10 +-
 tools/nodeset_compiler/nodeset.py             |   3 +-
 tools/nodeset_compiler/type_parser.py         |  44 +++-
 tools/nodeset_injector/CMakeLists.txt         |  11 +-
 .../schema/Opc.Ua.AutoID.NodeIds.csv          | 240 ++++++++++++++++++
 8 files changed, 314 insertions(+), 12 deletions(-)
 create mode 100644 tools/nodeset_injector/schema/Opc.Ua.AutoID.NodeIds.csv

diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
index 08e4f699293..abc52dc5c06 100644
--- a/doc/nodeset_compiler.rst
+++ b/doc/nodeset_compiler.rst
@@ -483,10 +483,10 @@ Outstanding Companion Spec Issues
 There are some Companion Specifications that currently cannot be compiled with the Nodeset compiler.
 Which Companion Specifications are affected and what causes this is described below.
 
-* Safety, Glass
+* Safety, Glass, DEXPI
 Do not specify a BSD file or BSD blob in the XML file. The BSD file is considered deprecated. However, it is currently still required by the Nodeser compiler.
 
-* I4AAS, RSL, CNC, FDI
+* I4AAS, RSL, FDI
 Attempting to load will result in a runtime error ("Type-checking failed with error code BadTypeMismatch" or "Parent node not found").
 
 * BACnet
@@ -516,4 +516,4 @@ A CMake call could look like this.
 The order of nodesets is important! Nodesets that build on other nodesets must be placed after them in the list.
 The following nodesets are currently supported.
 
-* DI, ISA95-JOBCONTROL, OpenSCS, DEXPI, AMB, AutoID, POWERLINK, IA, Machinery, PackML, PNEM, PLCopen, MachineTool, PROFINET, MachineVision, FDT, CommercialKitchenEquipment, PNRIO, Scales, Weihenstephan, Pumps, CAS, TMC, IJT
+* DI, CNC, ISA95-JOBCONTROL, OpenSCS, AMB, AutoID, POWERLINK, IA, Machinery, PackML, PNEM, PLCopen, MachineTool, PROFINET, MachineVision, FDT, CommercialKitchenEquipment, PNRIO, Scales, Weihenstephan, Pumps, CAS, TMC, IJT
diff --git a/tools/ci.sh b/tools/ci.sh
index db6907988f5..b5f1b8056db 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -419,7 +419,7 @@ function build_all_companion_specs {
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_FORCE_WERROR=ON \
-          -DUA_INFORMATION_MODEL_AUTOLOAD=DI\;ISA95-JOBCONTROL\;OpenSCS\;DEXPI\;AMB\;AutoID\;POWERLINK\;IA\;Machinery\;PackML\;PNEM\;PLCopen\;MachineTool\;PROFINET\;MachineVision\;FDT\;CommercialKitchenEquipment\;Scales\;Weihenstephan\;Pumps\;CAS\;TMC \
+          -DUA_INFORMATION_MODEL_AUTOLOAD=DI\;IA\;ISA95-JOBCONTROL\;OpenSCS\;CNC\;AMB\;AutoID\;POWERLINK\;Machinery\;PackML\;PNEM\;PLCopen\;MachineTool\;PROFINET\;MachineVision\;FDT\;CommercialKitchenEquipment\;Scales\;Weihenstephan\;Pumps\;CAS\;TMC \
           -DUA_NAMESPACE_ZERO=FULL \
           ..
     make ${MAKEOPTS} check_nodeset_compiler_testnodeset
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index beb40e9c99d..5693fe114a4 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -120,7 +120,7 @@ endfunction()
 #
 function(ua_generate_datatypes)
     set(options BUILTIN INTERNAL AUTOLOAD)
-    set(oneValueArgs NAME TARGET_SUFFIX TARGET_PREFIX OUTPUT_DIR FILE_CSV)
+    set(oneValueArgs NAME TARGET_SUFFIX TARGET_PREFIX OUTPUT_DIR FILE_XML FILE_CSV)
     set(multiValueArgs FILES_BSD IMPORT_BSD FILES_SELECTED NAMESPACE_MAP)
     cmake_parse_arguments(UA_GEN_DT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
 
@@ -201,6 +201,11 @@ function(ua_generate_datatypes)
         set(ARG_CONV_EXCL_ENV env MSYS2_ARG_CONV_EXCL=--import)
     endif()
 
+    set(FILE_XML "")
+    if (UA_GEN_DT_FILE_XML)
+        set(FILE_XML "--xml=${UA_GEN_DT_FILE_XML}")
+    endif()
+
     add_custom_command(OUTPUT ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.c
         ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.h
         ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated_handling.h
@@ -210,6 +215,7 @@ function(ua_generate_datatypes)
         ${SELECTED_TYPES_TMP}
         ${BSD_FILES_TMP}
         ${IMPORT_BSD_TMP}
+        ${FILE_XML}
         --type-csv=${UA_GEN_DT_FILE_CSV}
         ${UA_GEN_DT_NO_BUILTIN}
         ${UA_GEN_DT_INTERNAL_ARG}
@@ -217,6 +223,7 @@ function(ua_generate_datatypes)
         DEPENDS ${open62541_TOOLS_DIR}/generate_datatypes.py
                 ${open62541_TOOLS_DIR}/nodeset_compiler/backend_open62541_typedefinitions.py
         ${UA_GEN_DT_FILES_BSD}
+        ${UA_GEN_DT_FILE_XML}
         ${UA_GEN_DT_FILE_CSV}
         ${UA_GEN_DT_FILES_SELECTED})
     if(NOT TARGET ${UA_GEN_DT_TARGET_PREFIX}-${UA_GEN_DT_TARGET_SUFFIX})
@@ -606,6 +613,7 @@ function(ua_generate_nodeset_and_datatypes)
             TARGET_PREFIX "${UA_GEN_TARGET_PREFIX}"
             TARGET_SUFFIX "types-${UA_GEN_NAME}"
             NAMESPACE_MAP "${NAMESPACE_MAP_DEPENDS}"
+            FILE_XML "${UA_GEN_FILE_NS}"
             FILE_CSV "${UA_GEN_FILE_CSV}"
             FILES_BSD "${UA_GEN_FILE_BSD}"
             ${NODESET_AUTOLOAD}
diff --git a/tools/generate_datatypes.py b/tools/generate_datatypes.py
index 227dd41c858..66e49c55619 100755
--- a/tools/generate_datatypes.py
+++ b/tools/generate_datatypes.py
@@ -22,6 +22,14 @@
                     default=[],
                     help='csv file with type descriptions')
 
+parser.add_argument('-x', '--xml',
+                    metavar="<nodeSetXML>",
+                    type=argparse.FileType('rb'),
+                    action='append',
+                    dest="type_xml",
+                    default=[],
+                    help='NodeSet XML file.')
+
 parser.add_argument('--namespaceMap',
                     metavar="<namespaceMap>",
                     type=str,
@@ -91,7 +99,7 @@
 
 
 parser = CSVBSDTypeParser(args.opaque_map, args.selected_types, args.no_builtin, outname, args.import_bsd,
-                          args.type_bsd, args.type_csv, namespaceMap)
+                          args.type_bsd, args.type_csv, args.type_xml, namespaceMap)
 parser.create_types()
 
 generator = backend.CGenerator(parser, inname, args.outfile, args.internal, namespaceMap)
diff --git a/tools/nodeset_compiler/nodeset.py b/tools/nodeset_compiler/nodeset.py
index fc1264d46f1..b8fee666119 100644
--- a/tools/nodeset_compiler/nodeset.py
+++ b/tools/nodeset_compiler/nodeset.py
@@ -471,6 +471,7 @@ def generateParser(self, existing, infiles , bsdFile):
         opaque_map = []
         selected_types = []
         type_csv = []
+        type_xml = []
         no_builtin = True
         outname = "outname"
 
@@ -478,7 +479,7 @@ def generateParser(self, existing, infiles , bsdFile):
             type_bsd.append(bsd)
 
         self.parser = CSVBSDTypeParser(opaque_map, selected_types, no_builtin, outname, import_bsd,
-                                    type_bsd, type_csv, self.namespaces)
+                                    type_bsd, type_csv, type_xml, self.namespaces)
         self.parser.create_types()
 
         nodeset_base.close()
diff --git a/tools/nodeset_compiler/type_parser.py b/tools/nodeset_compiler/type_parser.py
index 2cfad6f435c..07b25155e8b 100644
--- a/tools/nodeset_compiler/type_parser.py
+++ b/tools/nodeset_compiler/type_parser.py
@@ -1,4 +1,5 @@
 import abc
+import codecs
 import csv
 import json
 import xml.etree.ElementTree as etree
@@ -6,6 +7,7 @@
 import re
 from collections import OrderedDict
 import sys
+import xml.dom.minidom as dom
 
 if sys.version_info[0] >= 3:
     try:
@@ -385,12 +387,13 @@ def create_types(self):
 
 class CSVBSDTypeParser(TypeParser):
     def __init__(self, opaque_map, selected_types, no_builtin, outname,
-                 existing_bsd, type_bsd, type_csv, namespaceIndexMap):
+                 existing_bsd, type_bsd, type_csv, type_xml, namespaceIndexMap):
         TypeParser.__init__(self, opaque_map, selected_types, no_builtin, outname, namespaceIndexMap)
         self.existing_bsd = existing_bsd # bsd files with existing types that shall not be printed again
         self.existing_types_array = set() # existing TYPE_ARRAY from existing_bsd
         self.type_bsd = type_bsd # bsd files with new types
         self.type_csv = type_csv # csv files with nodeids, etc.
+        self.type_xml = type_xml # xml files with symbolicNames etc.
         self.existing_types = [] # existing types that shall not be printed
 
     def parse_types(self):
@@ -418,11 +421,41 @@ def parse_types(self):
         for f in self.type_bsd:
             self.parseTypeDefinitions(self.outname, f)
 
+        # create a lookup table with symbolicNames
+        table = {}
+        for f in self.type_xml:
+            table = self.createSymbolicNameTable(f)
+
         # extend the type definitions with nodeids, etc. from the csv file
         for f in self.type_csv:
-            self.parseTypeDescriptions(f)
-
-    def parseTypeDescriptions(self, f):
+            self.parseTypeDescriptions(f, table)
+
+    def createSymbolicNameTable(self, f):
+        table = {}
+        nodeset_base = open(f.name, "rb")
+        fileContent = nodeset_base.read()
+        # Remove BOM since the dom parser cannot handle it on python 3 windows
+        if fileContent.startswith(codecs.BOM_UTF8):
+            fileContent = fileContent.lstrip(codecs.BOM_UTF8)
+        if sys.version_info >= (3, 0):
+            fileContent = fileContent.decode("utf-8")
+
+        # Remove the uax namespace from tags. UaModeler adds this namespace to some elements
+        fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\g<1>\g<2>\g<3>>", fileContent)
+
+        nodesets = dom.parseString(fileContent).getElementsByTagName("UANodeSet")
+        if len(nodesets) == 0 or len(nodesets) > 1:
+            raise Exception("contains no or more then 1 nodeset")
+        nodeset = nodesets[0]
+        dataTypeNodes = nodeset.getElementsByTagName("UADataType")
+        for nd in dataTypeNodes:
+            if nd.hasAttribute("SymbolicName"):
+                # Remove any digit and the colon
+                result_string = re.sub(r'\d|:', '', nd.attributes["BrowseName"].nodeValue)
+                table[nd.attributes["SymbolicName"].nodeValue] = result_string
+        return table
+
+    def parseTypeDescriptions(self, f, table):
         csvreader = csv.reader(f, delimiter=',')
         for row in csvreader:
             if len(row) < 3:
@@ -449,6 +482,9 @@ def parseTypeDescriptions(self, f):
                 typeName = "ExtensionObject"
             if typeName in rename_types:
                 typeName = rename_types[typeName]
+            # check if typeName is a symbolicName and replace it with the browseName
+            if typeName in table:
+                typeName = table[typeName]
             for ns in self.types:
                 if typeName in self.types[ns]:
                     self.types[ns][typeName].nodeId = row[1]
diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
index d40767c17fe..b1d6b8d8574 100644
--- a/tools/nodeset_injector/CMakeLists.txt
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -34,7 +34,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
 
     # only one xml file
     # di as dependency
-    elseif(MODEL STREQUAL "AutoID" OR MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK"
+    elseif(MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK"
        OR MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT" OR MODEL STREQUAL "Robotics"
        OR MODEL STREQUAL "CommercialKitchenEquipment" OR MODEL STREQUAL "Machinery")
         # get csv file
@@ -139,6 +139,15 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 INTERNAL
                 AUTOLOAD
         )
+    elseif(MODEL STREQUAL "AutoID")
+        ua_generate_nodeset_and_datatypes(
+                NAME "${NODESET_NAME}"
+                FILE_CSV "${PROJECT_SOURCE_DIR}/tools/nodeset_injector/schema/Opc.Ua.AutoID.NodeIds.csv"
+                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.AutoID.NodeSet2.xml"
+                INTERNAL
+                AUTOLOAD
+                DEPENDS "di"
+        )
     elseif(MODEL STREQUAL "PROFINET")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
diff --git a/tools/nodeset_injector/schema/Opc.Ua.AutoID.NodeIds.csv b/tools/nodeset_injector/schema/Opc.Ua.AutoID.NodeIds.csv
new file mode 100644
index 00000000000..d78060d8b17
--- /dev/null
+++ b/tools/nodeset_injector/schema/Opc.Ua.AutoID.NodeIds.csv
@@ -0,0 +1,240 @@
+AutoIdDeviceType,1001,ObjectType
+OcrReaderDeviceType,1002,ObjectType
+RfidReaderDeviceType,1003,ObjectType
+AutoIdScanEventType,1004,ObjectType
+OcrScanEventType,1005,ObjectType
+RfidScanEventType,1006,ObjectType
+OpticalReaderDeviceType,1008,ObjectType
+OpticalScanEventType,1009,ObjectType
+OpticalVerifierDeviceType,1011,ObjectType
+RtlsDeviceType,1012,ObjectType
+OpticalVerifierScanEventType,1013,ObjectType
+RtlsLocationEventType,1014,ObjectType
+LocationVariableType,2002,VariableType
+ScanResult,3001,DataType
+OcrScanResult,3002,DataType
+DeviceStatusEnumeration,3003,DataType
+Position,3004,DataType
+RfidSighting,3006,DataType
+RfidScanResult,3007,DataType
+Location,3008,DataType
+LocationTypeEnumeration,3009,DataType
+ScanSettings,3010,DataType
+AntennaNameIdPair,3011,DataType
+NmeaCoordinateString,3012,DataType
+AutoIdOperationStatusEnumeration,3013,DataType
+RfidPasswordTypeEnumeration,3014,DataType
+RfidLockRegionEnumeration,3015,DataType
+RfidLockOperationEnumeration,3016,DataType
+AccessResult,3017,DataType
+RfidAccessResult,3018,DataType
+LocalCoordinate,3019,DataType
+ScanData,3020,DataType
+LocationName,3021,DataType
+DhcpGeoConfCoordinate,3023,DataType
+ScanDataEpc,3024,DataType
+OpticalScanResult,3026,DataType
+WGS84Coordinate,3027,DataType
+RtlsLocationResult,3028,DataType
+Rotation,3029,DataType
+OpticalVerifierScanResult,3030,DataType
+CodeTypeDataType,3031,DataType
+OpticalReaderDeviceType_Images,5001,Object
+ScanResult_Encoding_DefaultBinary,5002,Object
+ScanResult_Encoding_DefaultXml,5003,Object
+OcrScanResult_Encoding_DefaultBinary,5004,Object
+OcrScanResult_Encoding_DefaultXml,5005,Object
+OcrReaderDeviceType_Images,5006,Object
+Position_Encoding_DefaultBinary,5007,Object
+Position_Encoding_DefaultXml,5008,Object
+RfidSighting_Encoding_DefaultBinary,5009,Object
+RfidSighting_Encoding_DefaultXml,5010,Object
+RfidScanResult_Encoding_DefaultBinary,5011,Object
+RfidScanResult_Encoding_DefaultXml,5012,Object
+Location_Encoding_DefaultBinary,5013,Object
+Location_Encoding_DefaultXml,5014,Object
+ScanSettings_Encoding_DefaultBinary,5015,Object
+ScanSettings_Encoding_DefaultXml,5016,Object
+AntennaNameIdPair_Encoding_DefaultBinary,5017,Object
+AntennaNameIdPair_Encoding_DefaultXml,5018,Object
+Server_Namespaces_http___opcfoundation_org_UA_AutoID_,5019,Object
+OpticalReaderDeviceType_Images_ImageName,5020,Object
+OcrReaderDeviceType_Images_ImageName,5021,Object
+LocalCoordinate_Encoding_DefaultBinary,5028,Object
+LocalCoordinate_Encoding_DefaultXml,5029,Object
+ScanData_Encoding_DefaultBinary,5030,Object
+ScanData_Encoding_DefaultXml,5031,Object
+DhcpGeoConfCoordinate_Encoding_DefaultBinary,5034,Object
+DhcpGeoConfCoordinate_Encoding_DefaultXml,5035,Object
+ScanDataEpc_Encoding_DefaultBinary,5036,Object
+ScanDataEpc_Encoding_DefaultXml,5037,Object
+OpticalScanResult_Encoding_DefaultBinary,5040,Object
+OpticalScanResult_Encoding_DefaultXml,5041,Object
+AutoIdDeviceType_RuntimeParameters,5044,Object
+WGS84Coordinate_Encoding_DefaultBinary,5046,Object
+WGS84Coordinate_Encoding_DefaultXml,5047,Object
+RtlsLocationResult_Encoding_DefaultBinary,5048,Object
+RtlsLocationResult_Encoding_DefaultXml,5049,Object
+Rotation_Encoding_DefaultBinary,5050,Object
+Rotation_Encoding_DefaultXml,5051,Object
+OpticalVerifierScanResult_Encoding_DefaultBinary,5052,Object
+OpticalVerifierScanResult_Encoding_DefaultXml,5053,Object
+AutoIdDeviceType_IOData,5054,Object
+AutoIdDeviceType_Scan_OutputArguments,6001,Variable
+OpticalReaderDeviceType_Images_ImageName_Close_InputArguments,6002,Variable
+OpticalReaderDeviceType_Images_ImageName_GetPosition_InputArguments,6003,Variable
+OpticalReaderDeviceType_Images_ImageName_GetPosition_OutputArguments,6004,Variable
+OpticalReaderDeviceType_Images_ImageName_Open_InputArguments,6005,Variable
+OpticalReaderDeviceType_Images_ImageName_Open_OutputArguments,6006,Variable
+OpticalReaderDeviceType_Images_ImageName_OpenCount,6007,Variable
+OpticalReaderDeviceType_Images_ImageName_Read_InputArguments,6008,Variable
+OpticalReaderDeviceType_Images_ImageName_Read_OutputArguments,6009,Variable
+OpticalReaderDeviceType_Images_ImageName_SetPosition_InputArguments,6010,Variable
+OpticalReaderDeviceType_Images_ImageName_Size,6011,Variable
+OpticalReaderDeviceType_Images_ImageName_UserWritable,6012,Variable
+OpticalReaderDeviceType_Images_ImageName_Writable,6013,Variable
+OpticalReaderDeviceType_Images_ImageName_Write_InputArguments,6014,Variable
+OcrReaderDeviceType_Scan_OutputArguments,6015,Variable
+AutoID,6016,Variable
+AutoID_NamespaceUri,6017,Variable
+AutoID,6018,Variable
+AutoID_NamespaceUri,6019,Variable
+AutoID_ScanResult,6020,Variable
+AutoID_ScanResult,6021,Variable
+AutoID_OcrScanResult,6022,Variable
+AutoID_OcrScanResult,6023,Variable
+AutoIdScanEventType_ScanResult,6024,Variable
+AutoID_RfidSighting,6025,Variable
+AutoIdDeviceType_DeviceInfo,6026,Variable
+OcrReaderDeviceType_Scan_InputArguments,6027,Variable
+Server_Namespaces_http___opcfoundation_org_UA_AutoID__IsNamespaceSubset,6028,Variable
+DeviceStatusEnumeration_EnumStrings,6029,Variable
+AutoIdDeviceType_DeviceStatus,6030,Variable
+OpticalVerifierDeviceType_Scan_InputArguments,6031,Variable
+AutoID_Position,6032,Variable
+AutoID_Position,6033,Variable
+AutoID_Location,6034,Variable
+AutoID_RfidSighting,6035,Variable
+AutoID_Location,6036,Variable
+AutoID_RfidScanResult,6037,Variable
+AutoID_RfidScanResult,6038,Variable
+Server_Namespaces_http___opcfoundation_org_UA_AutoID__NamespacePublicationDate,6039,Variable
+LocationTypeEnumeration_EnumStrings,6040,Variable
+OcrScanEventType_ScanResult,6041,Variable
+RfidScanEventType_ScanResult,6042,Variable
+RfidReaderDeviceType_Scan_OutputArguments,6043,Variable
+AutoID_ScanSettings,6044,Variable
+AutoID_ScanSettings,6045,Variable
+AutoID_AntennaNameIdPair,6046,Variable
+AutoID_AntennaNameIdPair,6047,Variable
+RfidReaderDeviceType_AntennaNames,6048,Variable
+AutoIdScanEventType_DeviceName,6049,Variable
+AutoIdDeviceType_Scan_InputArguments,6050,Variable
+AutoIdDeviceType_ScanStart_InputArguments,6051,Variable
+RfidReaderDeviceType_Scan_InputArguments,6052,Variable
+Server_Namespaces_http___opcfoundation_org_UA_AutoID__NamespaceUri,6053,Variable
+RfidReaderDeviceType_ReadTag_InputArguments,6054,Variable
+AutoIdDeviceType_LastScanData,6055,Variable
+RfidReaderDeviceType_ReadTag_OutputArguments,6056,Variable
+RfidReaderDeviceType_WriteTag_InputArguments,6057,Variable
+RfidReaderDeviceType_WriteTag_OutputArguments,6058,Variable
+RfidReaderDeviceType_SetTagPassword_InputArguments,6059,Variable
+RfidReaderDeviceType_SetTagPassword_OutputArguments,6060,Variable
+RfidPasswordTypeEnumeration_EnumStrings,6061,Variable
+RfidReaderDeviceType_KillTag_InputArguments,6062,Variable
+RfidReaderDeviceType_KillTag_OutputArguments,6063,Variable
+RfidReaderDeviceType_LockTag_InputArguments,6064,Variable
+RfidReaderDeviceType_LockTag_OutputArguments,6065,Variable
+RfidLockRegionEnumeration_EnumStrings,6066,Variable
+RfidLockOperationEnumeration_EnumStrings,6067,Variable
+Server_Namespaces_http___opcfoundation_org_UA_AutoID__NamespaceVersion,6068,Variable
+Server_Namespaces_http___opcfoundation_org_UA_AutoID__StaticNodeIdIdentifierTypes,6069,Variable
+Server_Namespaces_http___opcfoundation_org_UA_AutoID__StaticNumericNodeIdRange,6070,Variable
+Server_Namespaces_http___opcfoundation_org_UA_AutoID__StaticStringNodeIdPattern,6071,Variable
+OcrReaderDeviceType_Images_ImageName_Close_InputArguments,6072,Variable
+OcrReaderDeviceType_Images_ImageName_GetPosition_InputArguments,6073,Variable
+OcrReaderDeviceType_Images_ImageName_GetPosition_OutputArguments,6074,Variable
+OcrReaderDeviceType_Images_ImageName_Open_InputArguments,6075,Variable
+OpticalVerifierDeviceType_Scan_OutputArguments,6076,Variable
+OcrReaderDeviceType_Images_ImageName_Open_OutputArguments,6077,Variable
+OcrReaderDeviceType_Images_ImageName_OpenCount,6078,Variable
+OcrReaderDeviceType_Images_ImageName_Read_InputArguments,6079,Variable
+OcrReaderDeviceType_Images_ImageName_Read_OutputArguments,6080,Variable
+OcrReaderDeviceType_Images_ImageName_SetPosition_InputArguments,6081,Variable
+OcrReaderDeviceType_Images_ImageName_Size,6082,Variable
+OcrReaderDeviceType_Images_ImageName_UserWritable,6083,Variable
+OcrReaderDeviceType_Images_ImageName_Writable,6084,Variable
+OcrReaderDeviceType_Images_ImageName_Write_InputArguments,6085,Variable
+AutoID_LocalCoordinate,6122,Variable
+AutoID_LocalCoordinate,6123,Variable
+AutoIdDeviceType_DeviceName,6124,Variable
+AutoIdDeviceType_DeviceLocationName,6127,Variable
+AutoIdDeviceType_DeviceLocation,6128,Variable
+AutoIdDeviceType_GetDeviceLocation_OutputArguments,6129,Variable
+AutoIdDeviceType_GetDeviceLocation_InputArguments,6130,Variable
+AutoID_ScanData,6131,Variable
+AutoID_ScanData,6132,Variable
+AutoID_ScanDataEpc,6138,Variable
+AutoID_ScanDataEpc,6139,Variable
+AutoID_OpticalScanResult,6142,Variable
+AutoID_OpticalScanResult,6143,Variable
+OpticalReaderDeviceType_Scan_InputArguments,6144,Variable
+OpticalReaderDeviceType_Scan_OutputArguments,6145,Variable
+OpticalScanEventType_ScanResult,6147,Variable
+AutoID_DhcpGeoConfCoordinate,6189,Variable
+AutoID_DhcpGeoConfCoordinate,6190,Variable
+AutoIdDeviceType_AutoIdModelVersion,6193,Variable
+LocationVariableType_LengthUnit,6197,Variable
+LocationVariableType_RotationalUnit,6198,Variable
+LocationVariableType_GeographicalUnit,6199,Variable
+LocationVariableType_SpeedUnit,6200,Variable
+AutoIdOperationStatusEnumeration_EnumValues,6201,Variable
+AutoIdDeviceType_ScanStart_OutputArguments,6208,Variable
+AutoID_WGS84Coordinate,6212,Variable
+AutoID_WGS84Coordinate,6213,Variable
+RtlsDeviceType_GeographicalUnit,6214,Variable
+RtlsDeviceType_SpeedUnit,6215,Variable
+RtlsDeviceType_RotationalUnit,6216,Variable
+RtlsDeviceType_LengthUnit,6217,Variable
+RtlsDeviceType_Scan_InputArguments,6218,Variable
+RtlsDeviceType_Scan_OutputArguments,6219,Variable
+AutoID_RtlsLocationResult,6220,Variable
+AutoID_RtlsLocationResult,6221,Variable
+AutoID_Rotation,6222,Variable
+AutoID_Rotation,6223,Variable
+RtlsDeviceType_GetLocation_InputArguments,6224,Variable
+RtlsDeviceType_GetLocation_OutputArguments,6225,Variable
+RtlsDeviceType_GetSupportedLocationTypes_OutputArguments,6226,Variable
+OpticalVerifierScanEventType_ScanResult,6227,Variable
+RtlsLocationEventType_ScanResult,6228,Variable
+AutoID_OpticalVerifierScanResult,6229,Variable
+AutoID_OpticalVerifierScanResult,6230,Variable
+OcrReaderDeviceType_Scan,7001,Method
+OpticalReaderDeviceType_Images_ImageName_Close,7002,Method
+OpticalReaderDeviceType_Images_ImageName_GetPosition,7003,Method
+OpticalReaderDeviceType_Images_ImageName_Open,7004,Method
+OpticalReaderDeviceType_Images_ImageName_Read,7005,Method
+OpticalReaderDeviceType_Images_ImageName_SetPosition,7006,Method
+OpticalReaderDeviceType_Images_ImageName_Write,7007,Method
+AutoIdDeviceType_Scan,7008,Method
+AutoIdDeviceType_ScanStart,7009,Method
+AutoIdDeviceType_ScanStop,7010,Method
+OcrReaderDeviceType_Images_ImageName_Close,7011,Method
+OcrReaderDeviceType_Images_ImageName_GetPosition,7012,Method
+RfidReaderDeviceType_Scan,7013,Method
+RfidReaderDeviceType_ReadTag,7014,Method
+RfidReaderDeviceType_WriteTag,7015,Method
+RfidReaderDeviceType_SetTagPassword,7016,Method
+RfidReaderDeviceType_KillTag,7017,Method
+RfidReaderDeviceType_LockTag,7018,Method
+OcrReaderDeviceType_Images_ImageName_Open,7019,Method
+OcrReaderDeviceType_Images_ImageName_Read,7020,Method
+OcrReaderDeviceType_Images_ImageName_SetPosition,7021,Method
+OcrReaderDeviceType_Images_ImageName_Write,7022,Method
+AutoIdDeviceType_GetDeviceLocation,7042,Method
+OpticalReaderDeviceType_Scan,7043,Method
+OpticalVerifierDeviceType_Scan,7054,Method
+RtlsDeviceType_Scan,7055,Method
+RtlsDeviceType_GetLocation,7056,Method
+RtlsDeviceType_GetUnits,7057,Method
+RtlsDeviceType_GetSupportedLocationTypes,7058,Method

From 19cf4240f5e336c5aa0776f9f4bd9dd990a37289 Mon Sep 17 00:00:00 2001
From: basyskom-jvoe <33348624+basyskom-jvoe@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:32:50 +0100
Subject: [PATCH 1401/1963] fix(plugins): Fix heap corruption on Windows when
 loading a PEM encoded private key (#6227)

If the data buffer created by i2d_PrivateKey() is returned directly,
freeing the ByteString causes a heap corruption on Windows.
---
 plugins/crypto/openssl/ua_pki_openssl.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 6289f45ca4f..7804e2ca96f 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -875,10 +875,18 @@ UA_PKI_decryptPrivateKey(const UA_ByteString privateKey,
     if(!data)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    /* Move to the output */
-    outDerKey->data = data;
-    outDerKey->length = (size_t)numBytes;
-    return UA_STATUSCODE_GOOD;
+    /* Copy to the data to outDerKey
+     * Passing the data pointer directly causes a heap corruption on Windows
+     * when outDerKey is cleared.
+     */
+    UA_ByteString temp = UA_BYTESTRING_NULL;
+    temp.data = data;
+    temp.length = (size_t)numBytes;
+    const UA_StatusCode success = UA_ByteString_copy(&temp, outDerKey);
+    /* OPENSSL_clear_free() is not supported by the LibreSSL version in the CI */
+    OPENSSL_cleanse(data, numBytes);
+    OPENSSL_free(data);
+    return success;
 }
 
 #endif  /* end of defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_LIBRESSL) */

From 099557b13cb95a082270226a29c09dd51cd66d36 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 16 Oct 2023 16:49:43 +0200
Subject: [PATCH 1402/1963] fix(tests): Fixing the SKS build.

---
 src/pubsub/ua_pubsub_ns0.c             |   4 +-
 tests/pubsub/check_pubsub_sks_client.c | 200 ++++++++++++++++++---
 tests/pubsub/check_pubsub_sks_pull.c   | 234 +++++++++++++++++++++++--
 tools/ci.sh                            |   3 +-
 4 files changed, 404 insertions(+), 37 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 0be1f2f4a20..ded20a500f2 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1896,7 +1896,7 @@ setSecurityKeysLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessi
     /*check for types*/
     if(!UA_Variant_hasScalarType(&input[0], &UA_TYPES[UA_TYPES_STRING]) || /*SecurityGroupId*/
         !UA_Variant_hasScalarType(&input[1], &UA_TYPES[UA_TYPES_STRING]) || /*SecurityPolicyUri*/
-        !UA_Variant_hasScalarType(&input[2], &UA_TYPES[UA_TYPES_UINT32]) || /*CurrentTokenId*/
+        !UA_Variant_hasScalarType(&input[2], &UA_TYPES[UA_TYPES_INTEGERID]) || /*CurrentTokenId*/
         !UA_Variant_hasScalarType(&input[3], &UA_TYPES[UA_TYPES_BYTESTRING]) || /*CurrentKey*/
         !UA_Variant_hasArrayType(&input[4], &UA_TYPES[UA_TYPES_BYTESTRING]) || /*FutureKeys*/
         (!UA_Variant_hasScalarType(&input[5], &UA_TYPES[UA_TYPES_DURATION]) &&
@@ -2001,7 +2001,7 @@ getSecurityKeysLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessi
     if(!UA_Variant_hasScalarType(&input[0],
                                  &UA_TYPES[UA_TYPES_STRING]) || /*SecurityGroupId*/
        !UA_Variant_hasScalarType(&input[1],
-                                 &UA_TYPES[UA_TYPES_UINT32]) || /*StartingTokenId*/
+                                 &UA_TYPES[UA_TYPES_INTEGERID]) || /*StartingTokenId*/
        !UA_Variant_hasScalarType(&input[2],
                                  &UA_TYPES[UA_TYPES_UINT32])) /*RequestedKeyCount*/
         return UA_STATUSCODE_BADTYPEMISMATCH;
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index f2e83082df5..3f50b5ac16d 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -21,6 +21,7 @@
 #include "../encryption/certificates.h"
 #include "testing_clock.h"
 #include "thread_wrapper.h"
+#include "open62541/plugin/accesscontrol_default.h"
 
 #define PUBLISHER_ID 2234             /*Publisher Id*/
 #define WRITER_GROUP_ID 100           /*Writer group Id*/
@@ -34,6 +35,11 @@
 
 #define TESTINGSECURITYMODE UA_MESSAGESECURITYMODE_SIGNANDENCRYPT
 
+static UA_UsernamePasswordLogin userNamePW[2] = {
+    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
+    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password2")}
+};
+
 
 UA_Boolean running;
 UA_UInt32 maxKeyCount;
@@ -49,6 +55,23 @@ THREAD_CALLBACK(serverloop) {
     return 0;
 }
 
+typedef struct {
+    UA_Boolean allowAnonymous;
+    size_t usernamePasswordLoginSize;
+    UA_UsernamePasswordLogin *usernamePasswordLogin;
+    UA_UsernamePasswordLoginCallback loginCallback;
+    void *loginContext;
+    UA_CertificateVerification verifyX509;
+} AccessControlContext;
+
+#define ANONYMOUS_POLICY "open62541-anonymous-policy"
+#define CERTIFICATE_POLICY "open62541-certificate-policy"
+#define USERNAME_POLICY "open62541-username-policy"
+const UA_String anonymousPolicy = UA_STRING_STATIC(ANONYMOUS_POLICY);
+const UA_String certificatePolicy = UA_STRING_STATIC(CERTIFICATE_POLICY);
+const UA_String usernamePolicy = UA_STRING_STATIC(USERNAME_POLICY);
+
+
 static void
 disableAnonymous(UA_ServerConfig *config) {
     for(size_t i = 0; i < config->endpointsSize; i++) {
@@ -83,7 +106,7 @@ addSecurityGroup(void) {
     UA_NodeId outNodeId;
     UA_SecurityGroupConfig config;
     memset(&config, 0, sizeof(UA_SecurityGroupConfig));
-    config.keyLifeTime = 200;
+    config.keyLifeTime = 1000;
     config.securityPolicyUri = UA_STRING(policUri);
     config.securityGroupName = UA_STRING("TestSecurityGroup");
     config.maxFutureKeyCount = 1;
@@ -114,7 +137,131 @@ getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
     UA_UserNameIdentityToken *token = (UA_UserNameIdentityToken*)
         userIdentityToken->content.decoded.data;
     UA_ByteString *username = (UA_ByteString *)objectContext;
-    return UA_ByteString_equal(username, &token->userName);
+    UA_Boolean isUsernameEqual = UA_ByteString_equal(username, &token->userName);
+
+    /* clear session context */
+    UA_ExtensionObject_clear(userIdentityToken);
+    UA_free(sessionContext);
+
+    return isUsernameEqual;
+}
+
+static UA_StatusCode
+activateSession_default(UA_Server *server, UA_AccessControl *ac,
+                        const UA_EndpointDescription *endpointDescription,
+                        const UA_ByteString *secureChannelRemoteCertificate,
+                        const UA_NodeId *sessionId,
+                        const UA_ExtensionObject *userIdentityToken,
+                        void **sessionContext) {
+    AccessControlContext *context = (AccessControlContext*)ac->context;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    /* The empty token is interpreted as anonymous */
+    UA_AnonymousIdentityToken anonToken;
+    UA_ExtensionObject tmpIdentity;
+    if(userIdentityToken->encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
+        UA_AnonymousIdentityToken_init(&anonToken);
+        UA_ExtensionObject_init(&tmpIdentity);
+        UA_ExtensionObject_setValueNoDelete(&tmpIdentity,
+                                            &anonToken,
+                                            &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+        userIdentityToken = &tmpIdentity;
+    }
+
+    /* Could the token be decoded? */
+    if(userIdentityToken->encoding < UA_EXTENSIONOBJECT_DECODED)
+        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+    const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
+    if(tokenType == &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
+        /* Anonymous login */
+        if(!context->allowAnonymous)
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+        const UA_AnonymousIdentityToken *token = (UA_AnonymousIdentityToken*)
+            userIdentityToken->content.decoded.data;
+
+        /* Match the beginnig of the PolicyId.
+         * Compatibility notice: Siemens OPC Scout v10 provides an empty
+         * policyId. This is not compliant. For compatibility, assume that empty
+         * policyId == ANONYMOUS_POLICY */
+        if(token->policyId.data &&
+           (token->policyId.length < anonymousPolicy.length ||
+            strncmp((const char*)token->policyId.data,
+                    (const char*)anonymousPolicy.data,
+                    anonymousPolicy.length) != 0)) {
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
+    } else if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
+        /* Username and password */
+        const UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken*)
+            userIdentityToken->content.decoded.data;
+
+        /* Match the beginnig of the PolicyId */
+        if(userToken->policyId.length < usernamePolicy.length ||
+           strncmp((const char*)userToken->policyId.data,
+                   (const char*)usernamePolicy.data,
+                   usernamePolicy.length) != 0) {
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
+
+        /* The userToken has been decrypted by the server before forwarding
+         * it to the plugin. This information can be used here. */
+        /* if(userToken->encryptionAlgorithm.length > 0) {} */
+
+        /* Empty username and password */
+        if(userToken->userName.length == 0 && userToken->password.length == 0)
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+        /* Try to match username/pw */
+        UA_Boolean match = false;
+        if(context->loginCallback) {
+            if(context->loginCallback(&userToken->userName, &userToken->password,
+                                      context->usernamePasswordLoginSize, context->usernamePasswordLogin,
+                                      sessionContext, context->loginContext) == UA_STATUSCODE_GOOD)
+                match = true;
+        } else {
+            for(size_t i = 0; i < context->usernamePasswordLoginSize; i++) {
+                if(UA_String_equal(&userToken->userName, &context->usernamePasswordLogin[i].username) &&
+                   UA_String_equal(&userToken->password, &context->usernamePasswordLogin[i].password)) {
+                    UA_ExtensionObject *mySessionContext = (UA_ExtensionObject *)malloc(sizeof(UA_ExtensionObject));
+                    // Copy data from userIdentityToken to the session context
+                    UA_ExtensionObject_copy(userIdentityToken, mySessionContext);
+                    if(!*sessionContext)
+                        *sessionContext = (void*)mySessionContext;
+                    match = true;
+                    break;
+                }
+            }
+        }
+        if(!match)
+            return UA_STATUSCODE_BADUSERACCESSDENIED;
+    } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
+        /* x509 certificate */
+        const UA_X509IdentityToken *userToken = (UA_X509IdentityToken*)
+            userIdentityToken->content.decoded.data;
+
+        /* Match the beginnig of the PolicyId */
+        if(userToken->policyId.length < certificatePolicy.length ||
+           strncmp((const char*)userToken->policyId.data,
+                   (const char*)certificatePolicy.data,
+                   certificatePolicy.length) != 0) {
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
+
+        if(!config->sessionPKI.verifyCertificate)
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+        UA_StatusCode res = config->sessionPKI.
+            verifyCertificate(&config->sessionPKI, &userToken->certificateData);
+        if(res != UA_STATUSCODE_GOOD)
+            return UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
+    } else {
+        /* Unsupported token type */
+        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+    }
+
+    return UA_STATUSCODE_GOOD;
 }
 
 static void
@@ -145,6 +292,9 @@ skssetup(void) {
     config->applicationDescription.applicationUri =
         UA_STRING_ALLOC("urn:unconfigured:application");
 
+    UA_String basic256sha256 = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    UA_AccessControl_default(config, true, &basic256sha256, 2, userNamePW);
+
     disableAnonymous(config);
 
     config->pubSubConfig.securityPolicies =
@@ -154,6 +304,7 @@ skssetup(void) {
                                       config->logging);
 
     /*User Access Control*/
+    config->accessControl.activateSession = activateSession_default;
     config->accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
 
     addSecurityGroup();
@@ -475,7 +626,9 @@ START_TEST(AddValidSksClientwithWriterGroup) {
     int retryCnt = 0;
     UA_ClientConfig *config = newEncryptedClientConfig("user1", "password");
     retval = addPublisher(publisherApp);
-
+    ck_assert_msg(retval == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good but failed with: %s ",
+                  UA_StatusCode_name(retval));
     retval = UA_Server_setSksClient(publisherApp, securityGroupId, config, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD,
                   "Expected Statuscode to be Good, but failed with: %s ",
@@ -486,7 +639,7 @@ START_TEST(AddValidSksClientwithWriterGroup) {
     }
     ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
                   "Expected Statuscode to be Good, but failed with: %s (%u retries)",
-                  UA_StatusCode_name(retval), retryCnt);
+                  UA_StatusCode_name(sksPullStatus), retryCnt);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(publisherApp, writerGroupId);
     ck_assert(wg != NULL);
     retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
@@ -526,16 +679,16 @@ START_TEST(AddValidSksClientwithReaderGroup) {
                   UA_StatusCode_name(retval));
     sksPullStatus = UA_STATUSCODE_BAD;
     while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
-        UA_Server_run_iterate(subscriberApp, false);
+        UA_Server_run_iterate(subscriberApp, true);
         UA_fakeSleep(50);
     }
     ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
                   "Expected Statuscode to be Good, but failed with: %s (%u retries)",
-                  UA_StatusCode_name(retval), retryCnt);
+                  UA_StatusCode_name(sksPullStatus), retryCnt);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(subscriberApp, readerGroupId);
     ck_assert(rg != NULL);
 
-    retval = UA_Server_setReaderGroupOperational(subscriberApp, writerGroupId);
+    retval = UA_Server_setReaderGroupOperational(subscriberApp, readerGroupId);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD,
                   "Expected Statuscode to be Good, but failed with: %s ",
                   UA_StatusCode_name(retval));
@@ -567,12 +720,11 @@ START_TEST(SetInvalidSKSClient) {
     UA_Server_setSksClient(publisherApp, securityGroupId, config, testingSKSEndpointUrl, sksPullRequestCallback, NULL);
     sksPullStatus = UA_STATUSCODE_GOOD;
     while(UA_StatusCode_isGood(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
-        UA_Server_run_iterate(publisherApp, false);
+        UA_Server_run_iterate(publisherApp, true);
         UA_fakeSleep(50);
     }
     ck_assert_msg(sksPullStatus != UA_STATUSCODE_GOOD,
-                  "Expected Statuscode to be not GOOD, but failed with: %s (%u retries)",
-                  UA_StatusCode_name(sksPullStatus), retryCnt);
+                  "Expected Statuscode not to be GOOD: (%u retries)", retryCnt);
     UA_Client_delete(client);
 }
 END_TEST
@@ -621,10 +773,12 @@ START_TEST(CheckPublishedValuesInUserLand) {
     ck_assert(retval == UA_STATUSCODE_GOOD);
     sksPullStatus = UA_STATUSCODE_BAD;
     while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
-        UA_Server_run_iterate(publisherApp, false);
+        UA_Server_run_iterate(publisherApp, true);
         UA_fakeSleep(50);
     }
-    ck_assert(retryCnt < MAX_RETRIES);
+    ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s (%u retries)",
+                  UA_StatusCode_name(sksPullStatus), retryCnt);
 
     UA_ClientConfig *subSksClientConfig = newEncryptedClientConfig("user1", "password");
     retval =
@@ -633,7 +787,7 @@ START_TEST(CheckPublishedValuesInUserLand) {
     sksPullStatus = UA_STATUSCODE_BAD;
     retryCnt = 0;
     while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
-        UA_Server_run_iterate(subscriberApp, false);
+        UA_Server_run_iterate(subscriberApp, true);
         UA_fakeSleep(50);
     }
     ck_assert(retryCnt < MAX_RETRIES);
@@ -685,10 +839,12 @@ START_TEST(PublisherSubscriberTogethor) {
 
     sksPullStatus = UA_STATUSCODE_BAD;
     while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
-        UA_Server_run_iterate(publisherApp, false);
+        UA_Server_run_iterate(publisherApp, true);
         UA_fakeSleep(50);
     }
-    ck_assert(retryCnt < MAX_RETRIES);
+    ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s (%u retries)",
+                  UA_StatusCode_name(sksPullStatus), retryCnt);
     retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
     ck_assert(retval == UA_STATUSCODE_GOOD);
     retval = UA_Server_setReaderGroupOperational(publisherApp, readerGroupId);
@@ -739,10 +895,12 @@ START_TEST(PublisherDelayedSubscriberTogethor) {
 
     sksPullStatus = UA_STATUSCODE_BAD;
     while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
-        UA_Server_run_iterate(publisherApp, false);
+        UA_Server_run_iterate(publisherApp, true);
         UA_fakeSleep(50);
     }
-    ck_assert(retryCnt < MAX_RETRIES);
+    ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s (%u retries)",
+                  UA_StatusCode_name(sksPullStatus), retryCnt);
 
     retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
     ck_assert(retval == UA_STATUSCODE_GOOD);
@@ -791,10 +949,12 @@ START_TEST(FetchNextbatchOfKeys) {
 
     sksPullStatus = UA_STATUSCODE_BAD;
     while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
-        UA_Server_run_iterate(publisherApp, false);
+        UA_Server_run_iterate(publisherApp, true);
         UA_fakeSleep(50);
     }
-    ck_assert(retryCnt < MAX_RETRIES);
+    ck_assert_msg(sksPullStatus == UA_STATUSCODE_GOOD,
+                  "Expected Statuscode to be Good, but failed with: %s (%u retries)",
+                  UA_StatusCode_name(sksPullStatus), retryCnt);
 
     retval = addSubscriber(subscriberApp);
     ck_assert(retval == UA_STATUSCODE_GOOD);
@@ -808,7 +968,7 @@ START_TEST(FetchNextbatchOfKeys) {
     sksPullStatus = UA_STATUSCODE_BAD;
     retryCnt = 0;
     while(UA_StatusCode_isBad(sksPullStatus) && (retryCnt++ < MAX_RETRIES)) {
-        UA_Server_run_iterate(subscriberApp, false);
+        UA_Server_run_iterate(subscriberApp, true);
         UA_fakeSleep(50);
     }
     ck_assert(retryCnt < MAX_RETRIES);
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index 9744e4dea19..124daeb151b 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -20,10 +20,16 @@
 #include "testing_clock.h"
 #include "../encryption/certificates.h"
 #include "thread_wrapper.h"
+#include "open62541/plugin/accesscontrol_default.h"
 
 #define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
 #define policUri "http://opcfoundation.org/UA/SecurityPolicy#PubSub-Aes256-CTR"
 
+static UA_UsernamePasswordLogin userNamePW[2] = {
+    {UA_STRING_STATIC("user1"), UA_STRING_STATIC("password")},
+    {UA_STRING_STATIC("user2"), UA_STRING_STATIC("password2")}
+};
+
 UA_Server *sksServer = NULL;
 UA_String securityGroupId;
 UA_NodeId sgNodeId;
@@ -39,6 +45,22 @@ THREAD_CALLBACK(serverloop) {
     return 0;
 }
 
+typedef struct {
+    UA_Boolean allowAnonymous;
+    size_t usernamePasswordLoginSize;
+    UA_UsernamePasswordLogin *usernamePasswordLogin;
+    UA_UsernamePasswordLoginCallback loginCallback;
+    void *loginContext;
+    UA_CertificateVerification verifyX509;
+} AccessControlContext;
+
+#define ANONYMOUS_POLICY "open62541-anonymous-policy"
+#define CERTIFICATE_POLICY "open62541-certificate-policy"
+#define USERNAME_POLICY "open62541-username-policy"
+const UA_String anonymousPolicy = UA_STRING_STATIC(ANONYMOUS_POLICY);
+const UA_String certificatePolicy = UA_STRING_STATIC(CERTIFICATE_POLICY);
+const UA_String usernamePolicy = UA_STRING_STATIC(USERNAME_POLICY);
+
 static void
 addSecurityGroup(void) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -82,6 +104,124 @@ getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
     return UA_ByteString_equal(username, &token->userName);
 }
 
+static UA_StatusCode
+activateSession_default(UA_Server *server, UA_AccessControl *ac,
+                        const UA_EndpointDescription *endpointDescription,
+                        const UA_ByteString *secureChannelRemoteCertificate,
+                        const UA_NodeId *sessionId,
+                        const UA_ExtensionObject *userIdentityToken,
+                        void **sessionContext) {
+    AccessControlContext *context = (AccessControlContext*)ac->context;
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    /* The empty token is interpreted as anonymous */
+    UA_AnonymousIdentityToken anonToken;
+    UA_ExtensionObject tmpIdentity;
+    if(userIdentityToken->encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
+        UA_AnonymousIdentityToken_init(&anonToken);
+        UA_ExtensionObject_init(&tmpIdentity);
+        UA_ExtensionObject_setValueNoDelete(&tmpIdentity,
+                                            &anonToken,
+                                            &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+        userIdentityToken = &tmpIdentity;
+    }
+
+    /* Could the token be decoded? */
+    if(userIdentityToken->encoding < UA_EXTENSIONOBJECT_DECODED)
+        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+    const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
+    if(tokenType == &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
+        /* Anonymous login */
+        if(!context->allowAnonymous)
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+        const UA_AnonymousIdentityToken *token = (UA_AnonymousIdentityToken*)
+            userIdentityToken->content.decoded.data;
+
+        /* Match the beginnig of the PolicyId.
+         * Compatibility notice: Siemens OPC Scout v10 provides an empty
+         * policyId. This is not compliant. For compatibility, assume that empty
+         * policyId == ANONYMOUS_POLICY */
+        if(token->policyId.data &&
+           (token->policyId.length < anonymousPolicy.length ||
+            strncmp((const char*)token->policyId.data,
+                    (const char*)anonymousPolicy.data,
+                    anonymousPolicy.length) != 0)) {
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
+    } else if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
+        /* Username and password */
+        const UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken*)
+            userIdentityToken->content.decoded.data;
+
+        /* Match the beginnig of the PolicyId */
+        if(userToken->policyId.length < usernamePolicy.length ||
+           strncmp((const char*)userToken->policyId.data,
+                   (const char*)usernamePolicy.data,
+                   usernamePolicy.length) != 0) {
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
+
+        /* The userToken has been decrypted by the server before forwarding
+         * it to the plugin. This information can be used here. */
+        /* if(userToken->encryptionAlgorithm.length > 0) {} */
+
+        /* Empty username and password */
+        if(userToken->userName.length == 0 && userToken->password.length == 0)
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+        /* Try to match username/pw */
+        UA_Boolean match = false;
+        if(context->loginCallback) {
+            if(context->loginCallback(&userToken->userName, &userToken->password,
+                                      context->usernamePasswordLoginSize, context->usernamePasswordLogin,
+                                      sessionContext, context->loginContext) == UA_STATUSCODE_GOOD)
+                match = true;
+        } else {
+            for(size_t i = 0; i < context->usernamePasswordLoginSize; i++) {
+                if(UA_String_equal(&userToken->userName, &context->usernamePasswordLogin[i].username) &&
+                   UA_String_equal(&userToken->password, &context->usernamePasswordLogin[i].password)) {
+                    UA_ExtensionObject *mySessionContext = (UA_ExtensionObject *)malloc(sizeof(UA_ExtensionObject));
+                    // Copy data from userIdentityToken to the session context
+                    UA_ExtensionObject_copy(userIdentityToken, mySessionContext);
+                    if(!*sessionContext)
+                        *sessionContext = (void*)mySessionContext;
+                    match = true;
+                    break;
+                }
+            }
+        }
+        if(!match)
+            return UA_STATUSCODE_BADUSERACCESSDENIED;
+    } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
+        /* x509 certificate */
+        const UA_X509IdentityToken *userToken = (UA_X509IdentityToken*)
+            userIdentityToken->content.decoded.data;
+
+        /* Match the beginnig of the PolicyId */
+        if(userToken->policyId.length < certificatePolicy.length ||
+           strncmp((const char*)userToken->policyId.data,
+                   (const char*)certificatePolicy.data,
+                   certificatePolicy.length) != 0) {
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+        }
+
+        if(!config->sessionPKI.verifyCertificate)
+            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+
+        UA_StatusCode res = config->sessionPKI.
+            verifyCertificate(&config->sessionPKI, &userToken->certificateData);
+        if(res != UA_STATUSCODE_GOOD)
+            return UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
+    } else {
+        /* Unsupported token type */
+        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
 static void
 setup(void) {
     running = true;
@@ -113,6 +253,9 @@ setup(void) {
     config->applicationDescription.applicationUri =
         UA_STRING_ALLOC("urn:unconfigured:application");
 
+    UA_String basic256sha256 = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    UA_AccessControl_default(config, true, &basic256sha256, 2, userNamePW);
+
     config->pubSubConfig.securityPolicies =
         (UA_PubSubSecurityPolicy *)UA_malloc(sizeof(UA_PubSubSecurityPolicy));
     config->pubSubConfig.securityPoliciesSize = 1;
@@ -131,6 +274,7 @@ setup(void) {
     retVal |= UA_Server_addPubSubConnection(sksServer, &connectionConfig, &connection);
 
     /*User Access Control*/
+    config->accessControl.activateSession = activateSession_default;
     config->accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
 
     addSecurityGroup();
@@ -149,8 +293,21 @@ teardown(void) {
     UA_Server_delete(sksServer);
 }
 
+static void
+cleanupSessionContext(void) {
+    session_list_entry *current, *temp;
+    LIST_FOREACH_SAFE(current, &sksServer->sessions, pointers, temp) {
+        if(current->session.sessionHandle) {
+            UA_ExtensionObject *handle = (UA_ExtensionObject*)current->session.sessionHandle;
+            UA_ExtensionObject_clear(handle);
+            UA_free(current->session.sessionHandle);
+            current->session.sessionHandle = NULL;
+        }
+    }
+}
+
 static UA_StatusCode
-encyrptedclientconnect(UA_Client *client, const char *username, const char *password ) {
+encyrptedclientconnect(UA_Client *client) {
     UA_ByteString *trustList = NULL;
     size_t trustListSize = 0;
     UA_ByteString *revocationList = NULL;
@@ -178,8 +335,7 @@ encyrptedclientconnect(UA_Client *client, const char *username, const char *pass
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
     ck_assert(client != NULL);
 
-    /* Secure client connect */
-    return UA_Client_connectUsername(client, "opc.tcp://localhost:4840", username, password);
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_CallResponse
@@ -213,8 +369,11 @@ callGetSecurityKeys(UA_Client *client, UA_String sksSecurityGroupId,
 
 START_TEST(getSecuritykeysBadSecurityModeInsufficient) {
     UA_Client *client = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
-    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    encyrptedclientconnect(client);
+    cc->securityMode = UA_MESSAGESECURITYMODE_SIGN;
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(client, "opc.tcp://localhost:4840", "user1", "password");
     if(retval != UA_STATUSCODE_GOOD) {
         UA_Client_delete(client);
     }
@@ -225,13 +384,19 @@ START_TEST(getSecuritykeysBadSecurityModeInsufficient) {
                   "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(client);
 }
 END_TEST
 
 START_TEST(getSecuritykeysBadNotFound) {
     UA_Client *sksClient = UA_Client_new();
-    encyrptedclientconnect(sksClient, "user1", "password");
+    encyrptedclientconnect(sksClient);
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(sksClient, "opc.tcp://localhost:4840", "user1", "password");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(sksClient);
+    }
     UA_String badSecurityGroupId = UA_STRING("BadSecurityGroupId");
     UA_StatusCode expectedCode = UA_STATUSCODE_BADNOTFOUND;
     UA_CallResponse response = callGetSecurityKeys(sksClient, badSecurityGroupId, 1, 1);
@@ -240,13 +405,19 @@ START_TEST(getSecuritykeysBadNotFound) {
                   "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(sksClient);
 }
 END_TEST
 
 START_TEST(getSecuritykeysBadUserAccessDenied) {
     UA_Client *sksClient = UA_Client_new();
-    encyrptedclientconnect(sksClient, "user2", "password1");
+    encyrptedclientconnect(sksClient);
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(sksClient, "opc.tcp://localhost:4840", "user2", "password2");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(sksClient);
+    }
     UA_StatusCode expectedCode = UA_STATUSCODE_BADUSERACCESSDENIED;
     UA_UInt32 reqkeyCount = 1;
     UA_CallResponse response =
@@ -259,6 +430,7 @@ START_TEST(getSecuritykeysBadUserAccessDenied) {
                   "Expected %s but error code : %s \n", UA_StatusCode_name(expectedCode),
                   UA_StatusCode_name(response.results->statusCode));
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(sksClient);
 }
 END_TEST
@@ -266,7 +438,12 @@ END_TEST
 START_TEST(getSecuritykeysGoodAndValidOutput) {
     UA_fakeSleep(1000);
     UA_Client *sksClient = UA_Client_new();
-    encyrptedclientconnect(sksClient, "user1", "password");
+    encyrptedclientconnect(sksClient);
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(sksClient, "opc.tcp://localhost:4840", "user1", "password");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(sksClient);
+    }
     UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
     UA_UInt32 reqkeyCount = 1;
     UA_CallResponse response = callGetSecurityKeys(sksClient, securityGroupId, 1, reqkeyCount);
@@ -304,6 +481,7 @@ START_TEST(getSecuritykeysGoodAndValidOutput) {
         ck_assert(UA_ByteString_equal(&keys[i], &UA_BYTESTRING_NULL) == UA_FALSE);
     }
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(sksClient);
 }
 END_TEST
@@ -311,7 +489,12 @@ END_TEST
 START_TEST(requestCurrentKeyWithFutureKeys) {
     UA_fakeSleep(1000);
     UA_Client *sksClient = UA_Client_new();
-    encyrptedclientconnect(sksClient, "user1", "password");
+    encyrptedclientconnect(sksClient);
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(sksClient, "opc.tcp://localhost:4840", "user1", "password");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(sksClient);
+    }
     UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
     UA_UInt32 reqkeyCount = 1;
     UA_UInt32 reqStartingTokenId = 0;
@@ -339,6 +522,7 @@ START_TEST(requestCurrentKeyWithFutureKeys) {
         iterator = TAILQ_NEXT(iterator, keyListEntry);
     }
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(sksClient);
 }
 END_TEST
@@ -346,7 +530,12 @@ END_TEST
 START_TEST(requestCurrentKeyOnly) {
     UA_fakeSleep(1000);
     UA_Client *sksClient = UA_Client_new();
-    encyrptedclientconnect(sksClient, "user1", "password");
+    encyrptedclientconnect(sksClient);
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(sksClient, "opc.tcp://localhost:4840", "user1", "password");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(sksClient);
+    }
     UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
     UA_UInt32 reqkeyCount = 0;
     UA_UInt32 reqStartingTokenId = 0;
@@ -374,6 +563,7 @@ START_TEST(requestCurrentKeyOnly) {
         iterator = TAILQ_NEXT(iterator, keyListEntry);
     }
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(sksClient);
 }
 END_TEST
@@ -382,7 +572,12 @@ START_TEST(requestPastKey) {
     /*wait for one keyLifeTime*/
     UA_fakeSleep(2000);
     UA_Client *sksClient = UA_Client_new();
-    encyrptedclientconnect(sksClient, "user1", "password");
+    encyrptedclientconnect(sksClient);
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(sksClient, "opc.tcp://localhost:4840", "user1", "password");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(sksClient);
+    }
     UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
     UA_UInt32 reqkeyCount = 0;
     UA_UInt32 reqStartingTokenId = 1;
@@ -408,6 +603,7 @@ START_TEST(requestPastKey) {
     ck_assert(UA_ByteString_equal(retKeys, &firstItem->key) == UA_TRUE);
     ck_assert(UA_ByteString_equal(retKeys, &sg->keyStorage->currentItem->key) != UA_TRUE);
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(sksClient);
 }
 END_TEST
@@ -416,7 +612,12 @@ START_TEST(requestUnknownStartingTokenId){
     UA_fakeSleep(1000);
     UA_realSleep(4000);
     UA_Client *sksClient = UA_Client_new();
-    encyrptedclientconnect(sksClient, "user1", "password");
+    encyrptedclientconnect(sksClient);
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(sksClient, "opc.tcp://localhost:4840", "user1", "password");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(sksClient);
+    }
     UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
     UA_UInt32 reqkeyCount = UA_UINT32_MAX;
     UA_UInt32 reqStartingTokenId = UA_UINT32_MAX;
@@ -444,13 +645,19 @@ START_TEST(requestUnknownStartingTokenId){
         iterator = TAILQ_NEXT(iterator, keyListEntry);
     }
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(sksClient);
 }END_TEST
 
 START_TEST(requestMaxFutureKeys) {
     UA_fakeSleep(1000);
     UA_Client *sksClient = UA_Client_new();
-    encyrptedclientconnect(sksClient, "user1", "password");
+    encyrptedclientconnect(sksClient);
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connectUsername(sksClient, "opc.tcp://localhost:4840", "user1", "password");
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_Client_delete(sksClient);
+    }
     UA_StatusCode expectedCode = UA_STATUSCODE_GOOD;
     UA_UInt32 reqkeyCount = UA_UINT32_MAX;
     UA_UInt32 reqStartingTokenId = 0;
@@ -478,6 +685,7 @@ START_TEST(requestMaxFutureKeys) {
         iterator = TAILQ_NEXT(iterator, keyListEntry);
     }
     UA_CallResponse_clear(&response);
+    cleanupSessionContext();
     UA_Client_delete(sksClient);
 }
 END_TEST
diff --git a/tools/ci.sh b/tools/ci.sh
index b5f1b8056db..8587907a88a 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -285,8 +285,7 @@ function unit_tests_pubsub_sks {
           -DUA_FORCE_WERROR=ON \
           ..
     make ${MAKEOPTS}
-    set_capabilities
-    make test ARGS="-V -R sks"
+    sudo -E bash -c "make test ARGS=\"-V -R sks\""
 }
 
 ##########################################

From 5e76d257fd0ab4bc2558bf5e24ba4d5f0bab0aec Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Mon, 15 Jan 2024 11:56:29 +0100
Subject: [PATCH 1403/1963] fix(tests): Add dependencies for the nodeset
 compiler tests to ensure that the generator targets are built beforehand.
 (#6230)

---
 tests/nodeset-compiler/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/nodeset-compiler/CMakeLists.txt b/tests/nodeset-compiler/CMakeLists.txt
index 78674ab652e..3458c154d8c 100644
--- a/tests/nodeset-compiler/CMakeLists.txt
+++ b/tests/nodeset-compiler/CMakeLists.txt
@@ -34,6 +34,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
                 ${UA_NODESET_TESTS_ADI_SOURCES}
                 ${UA_TYPES_TESTS_DI_SOURCES}
                 ${UA_TYPES_TESTS_ADI_SOURCES})
+    add_dependencies(check_nodeset_compiler_adi open62541-generator-ns-tests-adi)
 
     # generate PLCopen namespace which is using DI
     ua_generate_nodeset_and_datatypes(
@@ -51,6 +52,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
                 ${UA_NODESET_TESTS_PLC_SOURCES}
                 ${UA_TYPES_TESTS_DI_SOURCES}
                 ${UA_TYPES_TESTS_PLC_SOURCES})
+    add_dependencies(check_nodeset_compiler_plc open62541-generator-ns-tests-plc)
 
     # generate AutoID namespace which is using DI (test e.g. for structures with optional fields)
     ua_generate_nodeset_and_datatypes(
@@ -68,6 +70,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
                 ${UA_NODESET_TESTS_AUTOID_SOURCES}
                 ${UA_TYPES_TESTS_DI_SOURCES}
                 ${UA_TYPES_TESTS_AUTOID_SOURCES})
+    add_dependencies(check_nodeset_compiler_autoid open62541-generator-ns-tests-autoid)
 endif()
 
 #[[ua_generate_datatypes(
@@ -102,6 +105,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
                 ${UA_NODESET_TESTS_TESTNODESET_SOURCES}
                 ${UA_TYPES_TESTS_DI_SOURCES}
                 ${UA_TYPES_TESTS_TESTNODESET_SOURCES})
+    add_dependencies(check_nodeset_compiler_testnodeset open62541-generator-ns-tests-testnodeset)
 endif()
 
 if(UA_ENABLE_NODESET_INJECTOR)

From 012b62cb28c5cae3ebc07201075f0ef629a66518 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Thu, 18 Jan 2024 15:25:43 +0100
Subject: [PATCH 1404/1963] feat(core) update mdnsd submodule refernce

---
 .idea/deployment.xml | 14 ++++++++++++++
 deps/mdnsd           |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .idea/deployment.xml

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
new file mode 100644
index 00000000000..c63b895e1fc
--- /dev/null
+++ b/.idea/deployment.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PublishConfigData">
+    <serverData>
+      <paths name="Remote Host HZDR Environment (fc527c4e-2e08-4f73-bb0f-7559d322293e)">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+    </serverData>
+  </component>
+</project>
\ No newline at end of file
diff --git a/deps/mdnsd b/deps/mdnsd
index 0611cc06da8..488d24fb9d4 160000
--- a/deps/mdnsd
+++ b/deps/mdnsd
@@ -1 +1 @@
-Subproject commit 0611cc06da863e083c0e0534a932cf016fa9efe0
+Subproject commit 488d24fb9d427aec77df180268f0291eeee7fb8b

From 1bda4f6083bad6abd9630b12dd4c76e23cdcbca7 Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Fri, 19 Jan 2024 13:59:33 +0100
Subject: [PATCH 1405/1963] fix(examples,tests): correct Windows define

Checking for WIN32 only works by virtue of CMake defining WIN32, by
itself. The _WIN32 define actually comes from the compiler, so use
that instead.

Since these are examples and tests, don't use UA_ARCHITECTURE_WIN32.
---
 examples/tutorial_server_method_async.c | 2 +-
 tests/server/check_discovery.c          | 6 +++---
 tests/testing-plugins/thread_wrapper.h  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/tutorial_server_method_async.c b/examples/tutorial_server_method_async.c
index 9f9216953b6..115d8439a49 100644
--- a/examples/tutorial_server_method_async.c
+++ b/examples/tutorial_server_method_async.c
@@ -38,7 +38,7 @@
 #include <malloc.h>
 #include "common.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <pthread.h>
 #define THREAD_HANDLE pthread_t
 #define THREAD_CREATE(handle, callback) do {            \
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index a1f70bf5d7e..37862a25446 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -15,7 +15,7 @@
 
 #include "testing_clock.h"
 #include "thread_wrapper.h"
-#ifndef WIN32
+#ifndef _WIN32
 #include <sys/stat.h>
 #endif
 
@@ -32,7 +32,7 @@
 #define checkWait registerTimeout + 11
 
 #ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
-# ifndef WIN32
+# ifndef _WIN32
 #  define SEMAPHORE_PATH "/tmp/open62541-unit-test-semaphore"
 # else
 #  define SEMAPHORE_PATH ".\\open62541-unit-test-semaphore"
@@ -246,7 +246,7 @@ unregisterServer(void) {
 static void
 Server_register_semaphore(void) {
     // create the semaphore
-#ifndef WIN32
+#ifndef _WIN32
     int fd = open(SEMAPHORE_PATH, O_RDWR|O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
     ck_assert_int_ne(fd, -1);
     close(fd);
diff --git a/tests/testing-plugins/thread_wrapper.h b/tests/testing-plugins/thread_wrapper.h
index e50315c430e..98ee2fd7adb 100644
--- a/tests/testing-plugins/thread_wrapper.h
+++ b/tests/testing-plugins/thread_wrapper.h
@@ -6,7 +6,7 @@
 
 /* Threads */
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <pthread.h>
 #define THREAD_HANDLE pthread_t
 #define THREAD_CREATE(handle, callback) pthread_create(&handle, NULL, callback, NULL)
@@ -31,7 +31,7 @@
 /* Windows returns non-zero on success and pthread returns zero,
  * so compare to zero to achieve consistent return values */
 
-#ifndef WIN32
+#ifndef _WIN32
 #define MUTEX_HANDLE pthread_mutex_t
 
 /* Will return UA_TRUE when zero */

From bb304bb74b44dbe6590a1b1207d2c9e5232241b8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:17:00 +0100
Subject: [PATCH 1406/1963] refactor(core): Bump to v1.4-rc1

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bca1792f818..8b7c6678fe2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
 set(OPEN62541_VER_PATCH 0)
-set(OPEN62541_VER_LABEL "-rc1") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
+set(OPEN62541_VER_LABEL "-rc2") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 
 # Overwrite the version information based on git if available

From d4eba76182b15b3dd1ebf614213bcf1cbdff2f90 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 15 Feb 2024 22:43:46 +0100
Subject: [PATCH 1407/1963] fix(core): Protect against encoding with NULL
 datatype ptr

---
 src/ua_types_encoding_binary.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index 7b290fb1ceb..53b051a7896 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -1591,6 +1591,9 @@ UA_encodeBinaryInternal(const void *src, const UA_DataType *type,
                         u8 **bufPos, const u8 **bufEnd,
                         UA_exchangeEncodeBuffer exchangeCallback,
                         void *exchangeHandle) {
+    if(!type || !src)
+        return UA_STATUSCODE_BADENCODINGERROR;
+
     /* Set up the context */
     Ctx ctx;
     ctx.pos = *bufPos;

From 7b3ad4d60fd9af5eeef47ee596e8c595f7504bf0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 15 Feb 2024 22:09:19 +0100
Subject: [PATCH 1408/1963] fix(pubsub): Fix receiving from all addresses for
 UDP unicast "localhost"

---
 src/pubsub/ua_pubsub_eventloop.c | 79 ++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 03126e8de6d..4fbf917f1d6 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -297,29 +297,48 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
         return res;
     }
 
+    /* Detect a wildcard address for unicast receiving. The individual
+     * DataSetWriters then contain additional target hostnames for sending.
+     *
+     * "localhost" and the empty hostname are used as a special "receive all"
+     * wildcard for PubSub UDP. All other addresses (also the 127.0.0/8 and ::1
+     * range) are handled differently. For them we only receive messages that
+     * originate from these addresses.
+     *
+     * The EventLoop backend detects whether an address is multicast capable and
+     * registers it for the multicast group in the background. */
+    UA_String localhostAddr = UA_STRING_STATIC("localhost");
+    UA_Boolean receive_all =
+        (address.length == 0) || UA_String_equal(&localhostAddr, &address);
+
     /* Set up the connection parameters */
     UA_Boolean listen = true;
     UA_Boolean reuse = true;
     UA_Boolean loopback = true;
     UA_KeyValuePair kvp[7];
-    UA_KeyValueMap kvm = {6, kvp};
-    kvp[0].key = UA_QUALIFIEDNAME(0, "address");
-    UA_Variant_setScalar(&kvp[0].value, &address, &UA_TYPES[UA_TYPES_STRING]);
-    kvp[1].key = UA_QUALIFIEDNAME(0, "port");
-    UA_Variant_setScalar(&kvp[1].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
-    kvp[2].key = UA_QUALIFIEDNAME(0, "listen");
-    UA_Variant_setScalar(&kvp[2].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    kvp[3].key = UA_QUALIFIEDNAME(0, "validate");
-    UA_Variant_setScalar(&kvp[3].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    kvp[4].key = UA_QUALIFIEDNAME(0, "reuse");
-    UA_Variant_setScalar(&kvp[4].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
-    kvp[5].key = UA_QUALIFIEDNAME(0, "loopback");
-    UA_Variant_setScalar(&kvp[5].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    UA_KeyValueMap kvm = {5, kvp};
+    kvp[0].key = UA_QUALIFIEDNAME(0, "port");
+    UA_Variant_setScalar(&kvp[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    kvp[1].key = UA_QUALIFIEDNAME(0, "listen");
+    UA_Variant_setScalar(&kvp[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[2].key = UA_QUALIFIEDNAME(0, "validate");
+    UA_Variant_setScalar(&kvp[2].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[3].key = UA_QUALIFIEDNAME(0, "reuse");
+    UA_Variant_setScalar(&kvp[3].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    kvp[4].key = UA_QUALIFIEDNAME(0, "loopback");
+    UA_Variant_setScalar(&kvp[4].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(!receive_all) {
+        /* The "receive all" wildcard is different in the eventloop UDP layer.
+         * Omit the address entirely to receive all.*/
+        kvp[5].key = UA_QUALIFIEDNAME(0, "address");
+        UA_Variant_setScalar(&kvp[5].value, &address, &UA_TYPES[UA_TYPES_STRING]);
+        kvm.mapSize++;
+    }
     if(!UA_String_isEmpty(&addressUrl->networkInterface)) {
-        kvp[6].key = UA_QUALIFIEDNAME(0, "interface");
-        UA_Variant_setScalar(&kvp[6].value, &addressUrl->networkInterface,
+        kvp[kvm.mapSize].key = UA_QUALIFIEDNAME(0, "interface");
+        UA_Variant_setScalar(&kvp[kvm.mapSize].value, &addressUrl->networkInterface,
                              &UA_TYPES[UA_TYPES_STRING]);
-        kvm.mapSize = 7;
+        kvm.mapSize++;
     }
 
     /* Open a recv connection */
@@ -343,25 +362,15 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
         }
     }
 
-    /* Detect whether this is a localhost address */
-    UA_String localhostAddrs[3] = {
-        UA_STRING_STATIC("localhost"),
-        UA_STRING_STATIC("127.0.0."), /* begins with */
-        UA_STRING_STATIC(":1"),       /* ends with */
-    };
-
-    /* Open a send connection */
-    if(UA_String_equal(&address, &localhostAddrs[0]) ||
-       (address.length > localhostAddrs[1].length &&
-        strncmp((const char*)address.data, (const char*)localhostAddrs[1].data,
-                localhostAddrs[1].length) == 0) ||
-       (address.length > localhostAddrs[2].length &&
-        strncmp((const char*)&address.data[address.length - localhostAddrs[2].length],
-                (const char*)localhostAddrs[2].data, localhostAddrs[2].length) == 0)) {
-        /* Localhost address -- no send connection */
+    /* Receive all -- sending is handled in the DataSetWriter */
+    if(receive_all) {
         UA_LOG_INFO_CONNECTION(server->config.logging, c,
                                "Localhost address - don't open UDP send connection");
-    } else if(c->sendChannel == 0) {
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Open a send connection */
+    if(c->sendChannel == 0) {
         /* Validate only if no WriterGroup configured */
         validate = (c->writerGroupsSize == 0);
         if(validate) {
@@ -371,7 +380,6 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
                                    "instead of opening a channel for sending.");
         }
 
-        /* Open a send-channel */
         listen = false;
         UA_UNLOCK(&server->serviceMutex);
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
@@ -379,10 +387,11 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an UDP recv channel");
+            return res;
         }
     }
 
-    return res;
+    return UA_STATUSCODE_GOOD;
 }
 
 static UA_StatusCode

From bf245df156c08c844b5688cdb370f7bd1a5c8721 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Feb 2024 00:35:55 +0100
Subject: [PATCH 1409/1963] refactor(server): Add lock assert to
 UA_ReaderGroup_remove

---
 src/pubsub/ua_pubsub_readergroup.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 742c2954ccf..ec8706b853e 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -188,6 +188,8 @@ UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
 
 UA_StatusCode
 UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(rg->configurationFrozen) {
         UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "Remove ReaderGroup failed. "

From 18b2eb3dfce1c3b33504208c8d4819ddbcceaf15 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Feb 2024 21:21:22 +0100
Subject: [PATCH 1410/1963] fix(pubsub): Don't unfreeze a ReaderGroup several
 times

---
 src/pubsub/ua_pubsub_readergroup.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index ec8706b853e..ae600a614d4 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -670,6 +670,10 @@ UA_StatusCode
 UA_ReaderGroup_unfreezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    /* Already unfrozen */
+    if(!rg->configurationFrozen)
+        return UA_STATUSCODE_GOOD;
+
     /* PubSubConnection freezeCounter-- */
     UA_PubSubConnection *pubSubConnection = rg->linkedConnection;
     pubSubConnection->configurationFreezeCounter--;

From ef41e531322d98aeebac8deb116fda439c3a36a5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 15 Feb 2024 23:52:25 +0100
Subject: [PATCH 1411/1963] fix(pubsub): Only clean up the WriterGroup
 connection id when the connection actually closes in the callback

---
 src/pubsub/ua_pubsub_eventloop.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 4fbf917f1d6..4843e9a3fa9 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -722,7 +722,6 @@ UA_WriterGroup_disconnect(UA_WriterGroup *wg) {
         return;
     UA_PubSubConnection *c = wg->linkedConnection;
     c->cm->closeConnection(c->cm, c->sendChannel);
-    wg->sendChannel = 0;
 }
 
 UA_StatusCode

From 36a1a196774d21e510fe151e0c3dd1e2ff918bcd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Feb 2024 00:36:59 +0100
Subject: [PATCH 1412/1963] fix(pubsub): Don't remove ReaderGroup if the
 connection is frozen

---
 src/pubsub/ua_pubsub_readergroup.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index ae600a614d4..bb2b292c3e1 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -197,6 +197,14 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
+    UA_PubSubConnection *connection = rg->linkedConnection;
+    if(connection && connection->configurationFreezeCounter > 0) {
+        UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
+                                   "Deleting the ReaderGroup failed. "
+                                   "PubSubConnection is frozen.");
+        return UA_STATUSCODE_BADCONFIGURATIONERROR;
+    }
+
     UA_DataSetReader *dsr, *tmp_dsr;
     LIST_FOREACH_SAFE(dsr, &rg->readers, listEntry, tmp_dsr) {
         UA_DataSetReader_remove(server, dsr);

From 26cc90d6d10706be0aeff182a0f506b19521e306 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Feb 2024 00:37:48 +0100
Subject: [PATCH 1413/1963] fix(pubsub): Unlink ReaderGroup from connection
 during first _remove

This is not repeated if we need to wait for sockets to close.
---
 src/pubsub/ua_pubsub_readergroup.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index bb2b292c3e1..d70fbc4e40f 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -198,7 +198,8 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
     }
 
     UA_PubSubConnection *connection = rg->linkedConnection;
-    if(connection && connection->configurationFreezeCounter > 0) {
+    UA_assert(connection);
+    if(connection->configurationFreezeCounter > 0) {
         UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "Deleting the ReaderGroup failed. "
                                    "PubSubConnection is frozen.");
@@ -224,27 +225,30 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
     }
 #endif
 
+    /* Disconnect only once */
     if(!rg->deleteFlag)
         UA_ReaderGroup_disconnect(rg);
     rg->deleteFlag = true;
 
     if(rg->recvChannelsSize == 0) {
-        UA_PubSubConnection* pConn = rg->linkedConnection;
-        if(pConn != NULL) {
-            LIST_REMOVE(rg, listEntry);
-            pConn->readerGroupsSize--;
-            UA_PubSubConnection_setPubSubState(server, pConn, pConn->state,
-                                               UA_STATUSCODE_GOOD);
-        }
+        /* Unlink from the connection */
+        LIST_REMOVE(rg, listEntry);
+        connection->readerGroupsSize--;
+        rg->linkedConnection = NULL;
 
+        /* Actually remove the ReaderGroup */
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
         deleteNode(server, rg->identifier, true);
 #endif
-        UA_NodeId_clear(&rg->identifier);
         UA_ReaderGroupConfig_clear(&rg->config);
+        UA_NodeId_clear(&rg->identifier);
         UA_free(rg);
     }
 
+    /* Update the connection state */
+    UA_PubSubConnection_setPubSubState(server, connection, connection->state,
+                                       UA_STATUSCODE_GOOD);
+
     return UA_STATUSCODE_GOOD;
 }
 

From c1aa209852ed1ab7429779107228766b62a93d3c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Feb 2024 00:38:35 +0100
Subject: [PATCH 1414/1963] fix(pubsub): Unlink WriterGroup from connection
 during the first _remove

---
 src/pubsub/ua_pubsub_writergroup.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 43bb3006422..4ac12da374d 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -232,9 +232,7 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
     }
 
     UA_PubSubConnection *connection = wg->linkedConnection;
-    if(!connection)
-        return UA_STATUSCODE_BADNOTFOUND;
-
+    UA_assert(connection);
     if(connection->configurationFreezeCounter > 0) {
         UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "Deleting the WriterGroup failed. "
@@ -264,23 +262,31 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
     }
 #endif
 
+    /* Disconnect only once */
     if(!wg->deleteFlag)
         UA_WriterGroup_disconnect(wg);
     wg->deleteFlag = true;
 
     if(wg->sendChannel == 0) {
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-        deleteNode(server, wg->identifier, true);
-#endif
-
+        /* Unlink from the connection */
         LIST_REMOVE(wg, listEntry);
         connection->writerGroupsSize--;
+        wg->linkedConnection = NULL;
 
+        /* Actually remove the WriterGroup */
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+        deleteNode(server, wg->identifier, true);
+#endif
         UA_WriterGroupConfig_clear(&wg->config);
         UA_NodeId_clear(&wg->identifier);
         UA_NetworkMessageOffsetBuffer_clear(&wg->bufferedMessage);
         UA_free(wg);
     }
+
+    /* Update the connection state */
+    UA_PubSubConnection_setPubSubState(server, connection, connection->state,
+                                       UA_STATUSCODE_GOOD);
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -297,7 +303,6 @@ UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
     return res;
 }
 
-
 UA_StatusCode
 UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);

From 47211f3e8a009b7b7d15f0a18fcdeb68dbefad89 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 16 Feb 2024 21:22:14 +0100
Subject: [PATCH 1415/1963] refactor(pubsub): Retry removing the PubSub
 connection if it still has ReaderGroups / WriterGroups attached

---
 src/pubsub/ua_pubsub_connection.c | 76 +++++++++++++++++++------------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index 0cf31766fde..4569a46d6ce 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -19,14 +19,6 @@
 
 #ifdef UA_ENABLE_PUBSUB /* conditional compilation */
 
-static void
-delayedPubSubConnection_delete(void *application, void *context) {
-    UA_PubSubConnection *c = (UA_PubSubConnection*)context;
-    UA_PubSubConnectionConfig_clear(&c->config);
-    UA_NodeId_clear(&c->identifier);
-    UA_free(c);
-}
-
 UA_StatusCode
 decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
                      UA_NetworkMessage *nm, UA_PubSubConnection *connection) {
@@ -227,6 +219,15 @@ UA_Server_addPubSubConnection(UA_Server *server, const UA_PubSubConnectionConfig
     return res;
 }
 
+static void
+delayedPubSubConnection_delete(void *application, void *context) {
+    UA_Server *server = (UA_Server*)application;
+    UA_PubSubConnection *c = (UA_PubSubConnection*)context;
+    UA_LOCK(&server->serviceMutex);
+    UA_PubSubConnection_delete(server, c);
+    UA_UNLOCK(&server->serviceMutex);
+}
+
 /* Clean up the PubSubConnection. If no EventLoop connection is attached we can
  * immediately free. Otherwise we close the EventLoop connections and free in
  * the connection callback. */
@@ -234,45 +235,64 @@ void
 UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    /* Stop, unfreeze and delete all WriterGroups attached to the Connection */
+    /* Stop and unfreeze all ReaderGroupds and WriterGroups attached to the
+     * Connection. Do this before removing them because we need to unfreeze all
+     * to remove the Connection.*/
+    UA_ReaderGroup *readerGroup, *tmpReaderGroup;
+    LIST_FOREACH(readerGroup, &c->readerGroups, listEntry) {
+        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
+                                      UA_STATUSCODE_BADSHUTDOWN);
+        UA_ReaderGroup_unfreezeConfiguration(server, readerGroup);
+    }
+
     UA_WriterGroup *writerGroup, *tmpWriterGroup;
-    LIST_FOREACH_SAFE(writerGroup, &c->writerGroups, listEntry, tmpWriterGroup) {
+    LIST_FOREACH(writerGroup, &c->writerGroups, listEntry) {
         UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_DISABLED,
                                       UA_STATUSCODE_BADSHUTDOWN);
         UA_WriterGroup_unfreezeConfiguration(server, writerGroup);
-        UA_WriterGroup_remove(server, writerGroup);
     }
 
-    /* Stop, unfreeze and delete all ReaderGroups attached to the Connection */
-    UA_ReaderGroup *readerGroup, *tmpReaderGroup;
+    /* Remove all ReaderGorups and WriterGroups */
     LIST_FOREACH_SAFE(readerGroup, &c->readerGroups, listEntry, tmpReaderGroup) {
-        UA_ReaderGroup_setPubSubState(server, readerGroup, UA_PUBSUBSTATE_DISABLED,
-                                      UA_STATUSCODE_BADSHUTDOWN);
-        UA_ReaderGroup_unfreezeConfiguration(server, readerGroup);
         UA_ReaderGroup_remove(server, readerGroup);
     }
 
-    /* Shutting down and  unlinking in the server is done only once */
-    if(!c->deleteFlag) {
-        UA_PubSubConnection_disconnect(c);
-        TAILQ_REMOVE(&server->pubSubManager.connections, c, listEntry);
-        server->pubSubManager.connectionsSize--;
+    LIST_FOREACH_SAFE(writerGroup, &c->writerGroups, listEntry, tmpWriterGroup) {
+        UA_WriterGroup_remove(server, writerGroup);
     }
+
+    /* Disconnect only once */
+    if(!c->deleteFlag)
+        UA_PubSubConnection_disconnect(c);
     c->deleteFlag = true;
 
-    /* No open sockets -> delete delayed */
-    if(c->sendChannel == 0 && c->recvChannelsSize == 0) {
-        /* Remove from the information model */
-#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
-        deleteNode(server, c->identifier, true);
-#endif
+    /* Not all sockets are closed. This method will be called again */
+    if(c->sendChannel != 0 || c->recvChannelsSize > 0)
+        return;
 
-        /* Free the memory delayed to ensure nobody is accessing any more */
+    /* The WriterGroups / ReaderGroups are not deleted. Try again in the next
+     * iteration of the event loop.*/
+    if(!LIST_EMPTY(&c->writerGroups) || !LIST_EMPTY(&c->readerGroups)) {
         UA_EventLoop *el = UA_PubSubConnection_getEL(server, c);
         c->dc.callback = delayedPubSubConnection_delete;
+        c->dc.application = server;
         c->dc.context = c;
         el->addDelayedCallback(el, &c->dc);
+        return;
     }
+
+    /* Remove from the information model */
+#ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
+    deleteNode(server, c->identifier, true);
+#endif
+
+    /* Unlink from the server */
+    TAILQ_REMOVE(&server->pubSubManager.connections, c, listEntry);
+    server->pubSubManager.connectionsSize--;
+
+    UA_PubSubConnectionConfig_clear(&c->config);
+    UA_NodeId_clear(&c->identifier);
+    UA_free(c);
 }
 
 UA_StatusCode

From fe5415395ed748bb5519a0cce3764cc8fea5ee23 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 20 Feb 2024 11:37:35 +0100
Subject: [PATCH 1416/1963] fix(server): Add required locks to
 readSessionDiagnostics

---
 src/server/ua_server_ns0_diagnostics.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 72ac9aecb77..63d9ee95823 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -328,16 +328,22 @@ readSessionDiagnostics(UA_Server *server,
                        const UA_NodeId *nodeId, void *nodeContext,
                        UA_Boolean sourceTimestamp,
                        const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK(&server->serviceMutex);
+
     /* Get the Session */
     UA_Session *session = UA_Server_getSessionById(server, sessionId);
-    if(!session)
+    if(!session) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
     
     /* Read the BrowseName */
     UA_QualifiedName bn;
     UA_StatusCode res = readWithReadValue(server, nodeId, UA_ATTRIBUTEID_BROWSENAME, &bn);
-    if(res != UA_STATUSCODE_GOOD)
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&server->serviceMutex);
         return res;
+    }
 
     union {
         UA_SessionDiagnosticsDataType sddt;
@@ -412,6 +418,7 @@ readSessionDiagnostics(UA_Server *server,
 
  cleanup:
     UA_QualifiedName_clear(&bn);
+    UA_UNLOCK(&server->serviceMutex);
     return res;
 }
 

From 05b48e41ddaec3bdb9c15e83402966a57c25b0ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20L=C3=B6tzsch?= <tom.loetzsch@bb-automation.com>
Date: Mon, 19 Feb 2024 17:16:19 +0100
Subject: [PATCH 1417/1963] Use correct address when reading array members of
 session diagnostic types.

---
 src/server/ua_server_ns0_diagnostics.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 63d9ee95823..aa764b43a7d 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -405,7 +405,7 @@ readSessionDiagnostics(UA_Server *server,
         res = UA_Variant_setScalarCopy(&value->value, content, type);
     } else {
         size_t len = *(size_t*)content;
-        content = (void*)(((uintptr_t)content) + sizeof(size_t));
+        content = *(void**)((uintptr_t)content + sizeof(size_t));
         res = UA_Variant_setArrayCopy(&value->value, content, len, type);
     }
     if(UA_LIKELY(res == UA_STATUSCODE_GOOD))

From e1bd2f5478ba2f75e769f000b0ead73d0679d4f5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 21 Feb 2024 20:42:55 +0100
Subject: [PATCH 1418/1963] fix(core): Empty array and NULL array shall compare
 as "identical"

---
 src/ua_types.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/ua_types.c b/src/ua_types.c
index 62441bbc116..3e46e6212cd 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1648,7 +1648,10 @@ extensionObjectOrder(const UA_ExtensionObject *p1, const UA_ExtensionObject *p2,
     }
 }
 
-/* Don't compare overlayable types as "binary blobs". We have specific order
+/* Part 4: When testing for equality, a Server shall treat null and empty arrays
+ * as equal.
+ *
+ * Don't compare overlayable types as "binary blobs". We have specific order
  * rules also for some overlayable types. For example how NaN floats are
  * compared. */
 static UA_Order
@@ -1657,11 +1660,6 @@ arrayOrder(const void *p1, size_t p1Length,
            const UA_DataType *type) {
     if(p1Length != p2Length)
         return (p1Length < p2Length) ? UA_ORDER_LESS : UA_ORDER_MORE;
-    /* For zero-length arrays, every pointer not NULL is considered a
-     * UA_EMPTY_ARRAY_SENTINEL. */
-    if(p1 == p2) return UA_ORDER_EQ;
-    if(p1 == NULL) return UA_ORDER_LESS;
-    if(p2 == NULL) return UA_ORDER_MORE;
     uintptr_t u1 = (uintptr_t)p1;
     uintptr_t u2 = (uintptr_t)p2;
     for(size_t i = 0; i < p1Length; i++) {

From 22649f410643c8ee8746e32d47c9b284eddc02f2 Mon Sep 17 00:00:00 2001
From: Lukas Berbuer <36054362+lukasberbuer@users.noreply.github.com>
Date: Thu, 22 Feb 2024 08:23:10 +0100
Subject: [PATCH 1419/1963] fix(client): Identical functionality for the
 `UA_Client_MonitoredItems_modify_async` implementation (#6297)

---
 include/open62541/client_subscriptions.h | 37 +++++++-------
 src/client/ua_client_subscriptions.c     | 61 +++++++++++++++++-------
 2 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/include/open62541/client_subscriptions.h b/include/open62541/client_subscriptions.h
index 1dd4568402f..9e35559041e 100644
--- a/include/open62541/client_subscriptions.h
+++ b/include/open62541/client_subscriptions.h
@@ -225,6 +225,12 @@ UA_ModifyMonitoredItemsResponse UA_EXPORT
 UA_Client_MonitoredItems_modify(UA_Client *client,
     const UA_ModifyMonitoredItemsRequest request);
 
+UA_StatusCode UA_EXPORT
+UA_Client_MonitoredItems_modify_async(UA_Client *client,
+    const UA_ModifyMonitoredItemsRequest request,
+    UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *requestId);
+
 /**
  * The following service calls go directly to the server. The MonitoredItem
  * settings are not stored in the client. */
@@ -239,27 +245,6 @@ UA_Client_MonitoredItems_setMonitoringMode(UA_Client *client,
     return response;
 }
 
-static UA_INLINE UA_SetTriggeringResponse
-UA_Client_MonitoredItems_setTriggering(UA_Client *client,
-    const UA_SetTriggeringRequest request) {
-    UA_SetTriggeringResponse response;
-    __UA_Client_Service(client,
-        &request, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST],
-        &response, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
-    return response;
-}
-
-static UA_INLINE UA_StatusCode
-UA_Client_MonitoredItems_modify_async(UA_Client *client,
-    const UA_ModifyMonitoredItemsRequest request,
-    UA_ClientAsyncServiceCallback callback,
-    void *userdata, UA_UInt32 *requestId) {
-    return __UA_Client_AsyncService(client, &request,
-        &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], callback,
-        &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE],
-        userdata, requestId);
-}
-
 static UA_INLINE UA_StatusCode
 UA_Client_MonitoredItems_setMonitoringMode_async(UA_Client *client,
     const UA_SetMonitoringModeRequest request,
@@ -271,6 +256,16 @@ UA_Client_MonitoredItems_setMonitoringMode_async(UA_Client *client,
         userdata, requestId);
 }
 
+static UA_INLINE UA_SetTriggeringResponse
+UA_Client_MonitoredItems_setTriggering(UA_Client *client,
+    const UA_SetTriggeringRequest request) {
+    UA_SetTriggeringResponse response;
+    __UA_Client_Service(client,
+        &request, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST],
+        &response, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+    return response;
+}
+
 static UA_INLINE UA_StatusCode
 UA_Client_MonitoredItems_setTriggering_async(UA_Client *client,
     const UA_SetTriggeringRequest request,
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index c2969804d94..ff42a1d2bf4 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -936,7 +936,7 @@ UA_Client_MonitoredItems_deleteSingle(UA_Client *client, UA_UInt32 subscriptionI
 }
 
 static void *
-UA_MonitoredItem_change_clientHandle(void *data, UA_Client_MonitoredItem *mon) {
+UA_MonitoredItem_change_clientHandle_wrapper(void *data, UA_Client_MonitoredItem *mon) {
     UA_MonitoredItemModifyRequest *monitoredItemModifyRequest =
         (UA_MonitoredItemModifyRequest *)data;
     if(monitoredItemModifyRequest &&
@@ -945,41 +945,68 @@ UA_MonitoredItem_change_clientHandle(void *data, UA_Client_MonitoredItem *mon) {
     return NULL;
 }
 
+static void
+UA_MonitoredItem_change_clientHandle(UA_Client_Subscription *sub,
+                                     UA_ModifyMonitoredItemsRequest *request) {
+    for(size_t i = 0; i < request->itemsToModifySize; ++i) {
+        ZIP_ITER(MonitorItemsTree, &sub->monitoredItems,
+                 UA_MonitoredItem_change_clientHandle_wrapper,
+                 &request->itemsToModify[i]);
+    }
+}
+
 UA_ModifyMonitoredItemsResponse
 UA_Client_MonitoredItems_modify(UA_Client *client,
                                 const UA_ModifyMonitoredItemsRequest request) {
     UA_ModifyMonitoredItemsResponse response;
+    UA_ModifyMonitoredItemsResponse_init(&response);
 
     UA_LOCK(&client->clientMutex);
-    UA_Client_Subscription *sub;
-    LIST_FOREACH(sub, &client->subscriptions, listEntry) {
-        if (sub->subscriptionId == request.subscriptionId)
-            break;
-    }
-
+    UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
-        UA_ModifyMonitoredItemsResponse_init(&response);
-        response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         UA_UNLOCK(&client->clientMutex);
+        response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return response;
     }
 
     UA_ModifyMonitoredItemsRequest modifiedRequest;
     UA_ModifyMonitoredItemsRequest_copy(&request, &modifiedRequest);
+    UA_MonitoredItem_change_clientHandle(sub, &modifiedRequest);
 
-    for(size_t i = 0; i < modifiedRequest.itemsToModifySize; ++i) {
-        ZIP_ITER(MonitorItemsTree, &sub->monitoredItems,
-                 UA_MonitoredItem_change_clientHandle, &modifiedRequest.itemsToModify[i]);
-        __Client_Service(client, &modifiedRequest,
-                         &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], &response,
-                         &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
-    }
-    UA_ModifyMonitoredItemsRequest_clear(&modifiedRequest);
+    __Client_Service(client, &modifiedRequest,
+                     &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], &response,
+                     &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
 
     UA_UNLOCK(&client->clientMutex);
+    UA_ModifyMonitoredItemsRequest_clear(&modifiedRequest);
     return response;
 }
 
+UA_StatusCode
+UA_Client_MonitoredItems_modify_async(UA_Client *client,
+                                      const UA_ModifyMonitoredItemsRequest request,
+                                      UA_ClientAsyncServiceCallback callback,
+                                      void *userdata, UA_UInt32 *requestId) {
+    UA_LOCK(&client->clientMutex);
+    UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
+    if(!sub) {
+        UA_UNLOCK(&client->clientMutex);
+        return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
+    }
+
+    UA_ModifyMonitoredItemsRequest modifiedRequest;
+    UA_ModifyMonitoredItemsRequest_copy(&request, &modifiedRequest);
+    UA_MonitoredItem_change_clientHandle(sub, &modifiedRequest);
+
+    UA_StatusCode statusCode = __Client_AsyncService(
+        client, &modifiedRequest, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST],
+        callback, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE], userdata, requestId);
+
+    UA_UNLOCK(&client->clientMutex);
+    UA_ModifyMonitoredItemsRequest_clear(&modifiedRequest);
+    return statusCode;
+}
+
 /*************************************/
 /* Async Processing of Notifications */
 /*************************************/

From c59d5057997988bdac06ac97742f4b72201a7823 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 26 Feb 2024 10:22:28 +0100
Subject: [PATCH 1420/1963] fix(plugins): Fix a memory leak for the PKI
 CertContext

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c |  7 ++++---
 plugins/crypto/openssl/ua_pki_openssl.c | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 807043f006d..46ca239d545 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -691,6 +691,7 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
                                        const char *issuerListFolder,
                                        const char *revocationListFolder) {
 #endif
+    UA_StatusCode ret;
     if(cv == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -719,14 +720,14 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
     ci->rejectedListFolder = UA_STRING_ALLOC(rejectedListFolder);
 #endif
 
-    reloadCertificates(cv, ci);
-
     cv->context = (void*)ci;
     cv->verifyCertificate = certificateVerification_verify;
     cv->clear = certificateVerification_clear;
     cv->verifyApplicationURI = certificateVerification_verifyApplicationURI;
 
-    return UA_STATUSCODE_GOOD;
+    ret = reloadCertificates(cv, ci);
+
+    return ret;
 }
 
 #endif
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 7804e2ca96f..ae52cdb9239 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -747,10 +747,6 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    ret = UA_CertContext_Init (context, cv);
-    if (ret != UA_STATUSCODE_GOOD) {
-        return ret;
-    }
 
     cv->verifyApplicationURI = UA_CertificateVerification_VerifyApplicationURI;
     cv->clear = UA_CertificateVerification_clear;
@@ -760,6 +756,11 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
     cv->getExpirationDate     = UA_GetCertificate_ExpirationDate;
 #endif
     cv->getSubjectName = UA_GetCertificate_SubjectName;
+
+    ret = UA_CertContext_Init (context, cv);
+    if (ret != UA_STATUSCODE_GOOD) {
+        return ret;
+    }
     
     if (certificateTrustListSize > 0) {
         if (UA_skTrusted_Cert2X509 (certificateTrustList, certificateTrustListSize,
@@ -814,16 +815,17 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
     if (context == NULL) {
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
-    ret = UA_CertContext_Init (context, cv);
-    if (ret != UA_STATUSCODE_GOOD) {
-        return ret;
-    }
 
     cv->verifyApplicationURI = UA_CertificateVerification_VerifyApplicationURI;
     cv->clear = UA_CertificateVerification_clear;
     cv->context = context;
     cv->verifyCertificate = UA_CertificateVerification_Verify;
 
+    ret = UA_CertContext_Init (context, cv);
+    if (ret != UA_STATUSCODE_GOOD) {
+        return ret;
+    }
+
     /* Only set the folder paths. They will be reloaded during runtime. */
 
     context->trustListFolder = UA_STRING_ALLOC(trustListFolder);

From 2f180cbb2d5e06c356bad50df3c290f3b5f6fa5f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 20 Feb 2024 11:09:25 +0100
Subject: [PATCH 1421/1963] refactor(plugins): Enable the log plugin to free
 itself during _clear

---
 include/open62541/client.h                    |  4 ++--
 include/open62541/plugin/log.h                |  4 ++--
 include/open62541/server.h                    |  2 +-
 plugins/include/open62541/plugin/log_stdout.h |  5 +++++
 plugins/include/open62541/plugin/log_syslog.h |  4 ++++
 plugins/ua_log_stdout.c                       | 18 +++++++++++++++---
 plugins/ua_log_syslog.c                       | 15 +++++++++++++--
 src/client/ua_client.c                        |  2 +-
 src/server/ua_server_config.c                 |  2 +-
 9 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 9195083cf7d..7e2fc4eb7e5 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -73,8 +73,8 @@ _UA_BEGIN_DECLS
  * The :ref:`tutorials` provide a good starting point for this. */
 
 struct UA_ClientConfig {
-    void *clientContext;       /* User-defined pointer attached to the client */
-    const UA_Logger *logging;  /* Plugin for log output */
+    void *clientContext; /* User-defined pointer attached to the client */
+    UA_Logger *logging;  /* Plugin for log output */
 
     /* Response timeout in ms (0 -> no timeout). If the server does not answer a
      * request within this time a StatusCode UA_STATUSCODE_BADTIMEOUT is
diff --git a/include/open62541/plugin/log.h b/include/open62541/plugin/log.h
index b21a59ef010..aff57b72dd3 100644
--- a/include/open62541/plugin/log.h
+++ b/include/open62541/plugin/log.h
@@ -52,7 +52,7 @@ typedef enum {
     UA_LOGCATEGORY_DISCOVERY
 } UA_LogCategory;
 
-typedef struct {
+typedef struct UA_Logger {
     /* Log a message. The message string and following varargs are formatted
      * according to the rules of the printf command. Use the convenience macros
      * below that take the minimum log level defined in ua_config.h into
@@ -62,7 +62,7 @@ typedef struct {
 
     void *context; /* Logger state */
 
-    void (*clear)(void *context); /* Clean up the logger plugin */
+    void (*clear)(struct UA_Logger *logger); /* Clean up the logger plugin */
 } UA_Logger;
 
 static UA_INLINE UA_FORMAT(3,4) void
diff --git a/include/open62541/server.h b/include/open62541/server.h
index a3e0f269c1a..71109b12850 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -72,10 +72,10 @@ typedef void (*UA_Server_AsyncOperationNotifyCallback)(UA_Server *server);
  * The :ref:`tutorials` provide a good starting point for this. */
 
 struct UA_ServerConfig {
-    const UA_Logger *logging; /* Plugin for log output */
     void *context; /* Used to attach custom data to a server config. This can
                     * then be retrieved e.g. in a callback that forwards a
                     * pointer to the server. */
+    UA_Logger *logging; /* Plugin for log output */
 
     /**
      * Server Description
diff --git a/plugins/include/open62541/plugin/log_stdout.h b/plugins/include/open62541/plugin/log_stdout.h
index 08ca5ceb148..6d06df465bf 100644
--- a/plugins/include/open62541/plugin/log_stdout.h
+++ b/plugins/include/open62541/plugin/log_stdout.h
@@ -14,9 +14,14 @@ _UA_BEGIN_DECLS
 extern UA_EXPORT const UA_Logger UA_Log_Stdout_; /* Logger structure */
 extern UA_EXPORT const UA_Logger *UA_Log_Stdout; /* Shorthand pointer */
 
+/* Returns a logger for messages up to the specified level */
 UA_EXPORT UA_Logger
 UA_Log_Stdout_withLevel(UA_LogLevel minlevel);
 
+/* Allocates memory for the logger. Automatically cleared up via _clear. */
+UA_EXPORT UA_Logger *
+UA_Log_Stdout_new(UA_LogLevel minlevel);
+
 _UA_END_DECLS
 
 #endif /* UA_LOG_STDOUT_H_ */
diff --git a/plugins/include/open62541/plugin/log_syslog.h b/plugins/include/open62541/plugin/log_syslog.h
index 262b2237176..765a242c4dc 100644
--- a/plugins/include/open62541/plugin/log_syslog.h
+++ b/plugins/include/open62541/plugin/log_syslog.h
@@ -30,6 +30,10 @@ _UA_BEGIN_DECLS
 UA_EXPORT UA_Logger
 UA_Log_Syslog_withLevel(UA_LogLevel minlevel);
 
+/* Allocates memory for the logger. Automatically cleared up via _clear. */
+UA_EXPORT UA_Logger *
+UA_Log_Syslog_new(UA_LogLevel minlevel);
+
 /* Log all warning levels supported by syslog (no trace-warnings).
  * The programm must call openlog(3) before using this logger. */
 UA_EXPORT UA_Logger
diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index 6757e786c2a..a0b117807cf 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -105,14 +105,26 @@ UA_Log_Stdout_log(void *context, UA_LogLevel level, UA_LogCategory category,
 }
 
 static void
-UA_Log_Stdout_clear(void *context) {}
+UA_Log_Stdout_clear(UA_Logger *logger) {
+    UA_free(logger);
+}
 
-const UA_Logger UA_Log_Stdout_ = {UA_Log_Stdout_log, NULL, UA_Log_Stdout_clear};
+const UA_Logger UA_Log_Stdout_ = {UA_Log_Stdout_log, NULL, NULL};
 const UA_Logger *UA_Log_Stdout = &UA_Log_Stdout_;
 
 UA_Logger
 UA_Log_Stdout_withLevel(UA_LogLevel minlevel) {
     UA_Logger logger =
-        {UA_Log_Stdout_log, (void*)(uintptr_t)minlevel, UA_Log_Stdout_clear};
+        {UA_Log_Stdout_log, (void*)(uintptr_t)minlevel, NULL};
+    return logger;
+}
+
+UA_Logger *
+UA_Log_Stdout_new(UA_LogLevel minlevel) {
+    UA_Logger *logger = (UA_Logger*)UA_malloc(sizeof(UA_Logger));
+    if(!logger)
+        return NULL;
+    *logger = UA_Log_Stdout_withLevel(minlevel);
+    logger->clear = UA_Log_Stdout_clear;
     return logger;
 }
diff --git a/plugins/ua_log_syslog.c b/plugins/ua_log_syslog.c
index 45a41164247..9fb80067abb 100644
--- a/plugins/ua_log_syslog.c
+++ b/plugins/ua_log_syslog.c
@@ -73,10 +73,11 @@ UA_Log_Syslog_log(void *context, UA_LogLevel level, UA_LogCategory category,
 }
 
 static void
-UA_Log_Syslog_clear(void *logContext) {
+UA_Log_Syslog_clear(UA_Logger *logger) {
     /* closelog is optional. We don't use it as several loggers might be
      * instantiated in parallel. */
     /* closelog(); */
+    UA_free(logger);
 }
 
 UA_Logger
@@ -86,7 +87,17 @@ UA_Log_Syslog(void) {
 
 UA_Logger
 UA_Log_Syslog_withLevel(UA_LogLevel minlevel) {
-    UA_Logger logger = {UA_Log_Syslog_log, (void*)(uintptr_t)minlevel, UA_Log_Syslog_clear};
+    UA_Logger logger = {UA_Log_Syslog_log, (void*)(uintptr_t)minlevel, NULL};
+    return logger;
+}
+
+UA_Logger *
+UA_Log_Syslog_new(UA_LogLevel minlevel) {
+    UA_Logger *logger = (UA_Logger*)UA_malloc(sizeof(UA_Logger));
+    if(!logger)
+        return NULL;
+    *logger = UA_Log_Syslog_withLevel(minlevel);
+    logger->clear = UA_Log_Syslog_clear;
     return logger;
 }
 
diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 59ce4fe6d06..1c572343f44 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -172,7 +172,7 @@ UA_ClientConfig_clear(UA_ClientConfig *config) {
 
     /* Logging */
     if(config->logging != NULL && config->logging->clear != NULL)
-        config->logging->clear(config->logging->context);
+        config->logging->clear(config->logging);
     config->logging = NULL;
 
     UA_String_clear(&config->sessionName);
diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index 95229b2264c..bac7e3d8b64 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -88,7 +88,7 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 
     /* Logger */
     if(config->logging != NULL && config->logging->clear != NULL)
-        config->logging->clear(config->logging->context);
+        config->logging->clear(config->logging);
     config->logging = NULL;
 
 #ifdef UA_ENABLE_PUBSUB

From 131a8f6c1fcc3e3eb9dee8533ff04c85ef63b8d4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 20 Feb 2024 11:10:14 +0100
Subject: [PATCH 1422/1963] refactor(plugin): Heap-allocate the log plugin by
 default

---
 plugins/ua_config_default.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 5d8d12a357a..b8f5ed3dce9 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -292,7 +292,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 
     /* Logging */
     if(conf->logging == NULL)
-        conf->logging = UA_Log_Stdout;
+        conf->logging = UA_Log_Stdout_new(UA_LOGLEVEL_INFO);
 
     /* EventLoop */
     if(conf->eventLoop == NULL) {
@@ -1129,7 +1129,7 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
         config->secureChannelLifeTime = 10 * 60 * 1000; /* 10 minutes */
 
     if(config->logging == NULL)
-        config->logging = UA_Log_Stdout;
+        config->logging = UA_Log_Stdout_new(UA_LOGLEVEL_INFO);
 
     /* EventLoop */
     if(config->eventLoop == NULL) {

From f458be20ecc91141b3e199cd0a84a617c5fc1d50 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 20 Feb 2024 11:15:02 +0100
Subject: [PATCH 1423/1963] refactor(build): Use TRACE as the compiled-in
 log-level (in addition to the configuration setting)

---
 CMakeLists.txt                 | 2 +-
 doc/building.rst               | 5 +++++
 include/open62541/plugin/log.h | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b7c6678fe2..9dc3e291c0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ endif()
 option(UA_ENABLE_AMALGAMATION "Concatenate the library to a single file open62541.h/.c" OFF)
 option(UA_AMALGAMATION_MULTIARCH "Create an architecture-independent amalgamation if UA_ENABLE_AMALGAMATION is ON" OFF)
 option(BUILD_SHARED_LIBS "Enable building of shared libraries (dll/so)" OFF)
-set(UA_LOGLEVEL 300 CACHE STRING "Minimal level at which logs shall be reported (100=TRACE, 200=DEBUG, 300=INFO, 400=WARNING, 500=ERROR, 600=FATAL)")
+set(UA_LOGLEVEL 100 CACHE STRING "Minimal level for logs (in addition to the log plugin settings) (100=TRACE, 200=DEBUG, 300=INFO, 400=WARNING, 500=ERROR, 600=FATAL)")
 option(UA_ENABLE_DIAGNOSTICS "Enable diagnostics information exposed by the server" ON)
 option(UA_ENABLE_METHODCALLS "Enable the Method service set" ON)
 option(UA_ENABLE_SUBSCRIPTIONS "Enable subscriptions support" ON)
diff --git a/doc/building.rst b/doc/building.rst
index f0f03546e83..0272381b9e4 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -244,6 +244,11 @@ Main Build Options
    - 200: Debug
    - 100: Trace
 
+   This compilation flag defines which log levels get compiled into the code. In
+   addition, the implementations of :ref:`logging` allow to set a filter for the
+   logging level at runtime. So the logging level can be changed in the
+   configuration without recompiling.
+
 **UA_MULTITHREADING**
    Level of multi-threading support. The supported levels are currently as follows:
 
diff --git a/include/open62541/plugin/log.h b/include/open62541/plugin/log.h
index aff57b72dd3..e4fef3e4b31 100644
--- a/include/open62541/plugin/log.h
+++ b/include/open62541/plugin/log.h
@@ -16,6 +16,8 @@
 _UA_BEGIN_DECLS
 
 /**
+ * .. _logging:
+ *
  * Logging Plugin API
  * ==================
  *

From 8c6b00fe520cda94ae62b7db6e35a6ed0e611757 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 20 Feb 2024 15:28:11 +0100
Subject: [PATCH 1424/1963] fix(test): Fix logging memleak in
 check_server_speed_addnodes.c

---
 tests/server/check_server_speed_addnodes.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/server/check_server_speed_addnodes.c b/tests/server/check_server_speed_addnodes.c
index 1db106a9ec1..a1e04728ddd 100644
--- a/tests/server/check_server_speed_addnodes.c
+++ b/tests/server/check_server_speed_addnodes.c
@@ -15,9 +15,6 @@ static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
-    /* Disable logging */
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    config->logging = NULL;
 }
 
 static void teardown(void) {

From fc49d2068c4da9f424790b58eaea099ab423fea8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 20 Feb 2024 22:25:32 +0100
Subject: [PATCH 1425/1963] refactor(server): Don't share the logging plugin
 with the client for discovery registration

---
 src/server/ua_discovery.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
index 8db042cf552..30db7723fc5 100644
--- a/src/server/ua_discovery.c
+++ b/src/server/ua_discovery.c
@@ -466,9 +466,6 @@ UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister
     cc->eventLoop = sc->eventLoop;
     cc->externalEventLoop = true;
 
-    /* Use the logging from the server */
-    cc->logging = sc->logging;
-
     /* Set the state callback method and context */
     cc->stateCallback = discoveryClientStateCallback;
     cc->clientContext = ar;

From ccd95b8af4d1b82b5c3f583b4379116d9c1bda2b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 21 Feb 2024 00:31:05 +0100
Subject: [PATCH 1426/1963] fix(examples): Remove a memleak in the logger
 handling in server_loglevel.c

---
 examples/server_loglevel.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/server_loglevel.c b/examples/server_loglevel.c
index 5b433d25a65..39083b37345 100644
--- a/examples/server_loglevel.c
+++ b/examples/server_loglevel.c
@@ -46,12 +46,15 @@ int main(int argc, char **argv) {
     }
 #endif
 
-    UA_Logger logger = UA_Log_Stdout_withLevel( log_level );
 
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
-    config->logging = &logger;
+
+    /* Exchange the logger */
+    UA_Logger logger = UA_Log_Stdout_withLevel( log_level );
+    logger.clear = config->logging->clear;
+    *config->logging = logger;
 
     /* Some data */
     UA_StatusCode retval;

From 6a6dd04eb026990e680f81462ac556ea435abeec Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Fri, 23 Feb 2024 08:51:42 +0100
Subject: [PATCH 1427/1963] fix(server): clear logger after usage

---
 src/server/ua_server_config.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_server_config.c b/src/server/ua_server_config.c
index bac7e3d8b64..27d3c9fd3b2 100644
--- a/src/server/ua_server_config.c
+++ b/src/server/ua_server_config.c
@@ -86,11 +86,6 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
         config->historyDatabase.clear(&config->historyDatabase);
 #endif
 
-    /* Logger */
-    if(config->logging != NULL && config->logging->clear != NULL)
-        config->logging->clear(config->logging);
-    config->logging = NULL;
-
 #ifdef UA_ENABLE_PUBSUB
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     if(config->pubSubConfig.securityPolicies != NULL) {
@@ -104,6 +99,11 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 #endif
 #endif /* UA_ENABLE_PUBSUB */
 
+    /* Logger */
+    if(config->logging != NULL && config->logging->clear != NULL)
+        config->logging->clear(config->logging);
+    config->logging = NULL;
+
     /* Custom Data Types */
     UA_cleanupDataTypeWithCustom(config->customDataTypes);
     config->customDataTypes = NULL;

From cb77551ecace056a1cb31e54def208755a2d5e0e Mon Sep 17 00:00:00 2001
From: m-obi <mathias.obetzhauser@gmx.de>
Date: Mon, 4 Mar 2024 16:49:33 +0100
Subject: [PATCH 1428/1963] adding floating point number representation for ESP
 platform

---
 include/open62541/architecture_definitions.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/open62541/architecture_definitions.h b/include/open62541/architecture_definitions.h
index 0bbde78b795..c7e9e10e98b 100644
--- a/include/open62541/architecture_definitions.h
+++ b/include/open62541/architecture_definitions.h
@@ -356,10 +356,11 @@ UA_STATIC_ASSERT(sizeof(bool) == 1, cannot_overlay_integers_with_large_bool);
  * Float Endianness
  * ^^^^^^^^^^^^^^^^
  * The definition ``UA_FLOAT_IEEE754`` is set to true when the floating point
- * number representation of the target architecture is IEEE 754. The definition
- * ``UA_FLOAT_LITTLE_ENDIAN`` is set to true when the floating point number
- * representation is in little-endian encoding. */
-
+ * number representation of the target architecture is IEEE 754. This can be
+ * set from outside with ``-DUA_FLOAT_IEEE754=1``.
+ * The definition ``UA_FLOAT_LITTLE_ENDIAN`` is set to true when the floating
+ * point number representation is in little-endian encoding. */
+#ifndef UA_FLOAT_IEEE754
 #if defined(_WIN32)
 # define UA_FLOAT_IEEE754 1
 #elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || \
@@ -368,9 +369,12 @@ UA_STATIC_ASSERT(sizeof(bool) == 1, cannot_overlay_integers_with_large_bool);
 # define UA_FLOAT_IEEE754 1
 #elif defined(__STDC_IEC_559__)
 # define UA_FLOAT_IEEE754 1
+#elif defined(ESP_PLATFORM)
+# define UA_FLOAT_IEEE754 1
 #else
 # define UA_FLOAT_IEEE754 0
 #endif
+#endif
 
 /* Wikipedia says (https://en.wikipedia.org/wiki/Endianness): Although the
  * ubiquitous x86 processors of today use little-endian storage for all types of

From 4c5000f74c0782e79e20d61fecff6f171765443b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Mar 2024 23:51:43 +0100
Subject: [PATCH 1429/1963] fix(doc): Remove doc generation warnings

---
 doc/CMakeLists.txt                   |   9 +-
 doc/nodeset_compiler.rst             |  25 +--
 doc/plugin.rst                       |   2 -
 include/open62541/plugin/eventloop.h | 303 ++++++++++++++++-----------
 include/open62541/server_pubsub.h    |  14 +-
 5 files changed, 206 insertions(+), 147 deletions(-)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 373010e624f..7078f6471c0 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -64,10 +64,11 @@ generate_rst(${PROJECT_SOURCE_DIR}/examples/tutorial_server_method.c ${DOC_SRC_D
 generate_rst(${PROJECT_SOURCE_DIR}/examples/tutorial_client_firststeps.c ${DOC_SRC_DIR}/tutorial_client_firststeps.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub/tutorial_pubsub_publish.c ${DOC_SRC_DIR}/tutorial_pubsub_publish.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub/tutorial_pubsub_subscribe.c ${DOC_SRC_DIR}/tutorial_pubsub_subscribe.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub_realtime/pubsub_TSN_publisher.c ${DOC_SRC_DIR}/pubsub_TSN_publisher.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub_realtime/pubsub_TSN_loopback.c ${DOC_SRC_DIR}/pubsub_TSN_loopback.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c ${DOC_SRC_DIR}/pubsub_nodeset_rt_publisher.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c ${DOC_SRC_DIR}/pubsub_nodeset_rt_subscriber.rst)
+
+# generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub_realtime/pubsub_TSN_publisher.c ${DOC_SRC_DIR}/pubsub_TSN_publisher.rst)
+# generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub_realtime/pubsub_TSN_loopback.c ${DOC_SRC_DIR}/pubsub_TSN_loopback.rst)
+# generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c ${DOC_SRC_DIR}/pubsub_nodeset_rt_publisher.rst)
+# generate_rst(${PROJECT_SOURCE_DIR}/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c ${DOC_SRC_DIR}/pubsub_nodeset_rt_subscriber.rst)
 
 # Doc targets
 
diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
index abc52dc5c06..9cf7712cc4f 100644
--- a/doc/nodeset_compiler.rst
+++ b/doc/nodeset_compiler.rst
@@ -438,6 +438,7 @@ Next we can generate the PLCopen nodeset. Since it doesn't require any additiona
             "${UA_NODESET_DIR}/DI/Opc.Ua.Di.NodeSet2.xml"
         DEPENDS_TARGET "open62541-generator-ns-di"
     )
+
 This call is quite similar to the compilation of the DI nodeset. As you can see, we do not define any specific types array for the PLCopen nodeset. Since the PLCopen nodeset depends on the NS0 and DI nodeset, we need to tell the nodeset compiler that these two nodesets should be seen as already existing. Make sure that the order is the same as in your XML file, e.g., in this case the order indicated in ``Opc.Ua.PLCopen.NodeSet2_V1.02.xml -> UANodeSet -> Models -> Model``.
 
 As a result of the previous scripts you will have multiple source files:
@@ -478,24 +479,22 @@ Finally you need to include all these files in your build process and call the c
     retval = UA_Server_run(server, &running);
 
 Outstanding Companion Spec Issues
-................................
+.................................
 
 There are some Companion Specifications that currently cannot be compiled with the Nodeset compiler.
 Which Companion Specifications are affected and what causes this is described below.
 
-* Safety, Glass, DEXPI
-Do not specify a BSD file or BSD blob in the XML file. The BSD file is considered deprecated. However, it is currently still required by the Nodeser compiler.
-
-* I4AAS, RSL, FDI
-Attempting to load will result in a runtime error ("Type-checking failed with error code BadTypeMismatch" or "Parent node not found").
-
-* BACnet
-Defines data types whose fields have the names signed or unsigned. This leads to errors when creating C structures, because signed and unsigned are keywords in C.
+Safety, Glass, DEXPI
+   Do not specify a BSD file or BSD blob in the XML file. The BSD file is considered deprecated. However, it is currently still required by the Nodeser compiler.
 
+I4AAS, RSL, FDI
+   Attempting to load will result in a runtime error ("Type-checking failed with error code BadTypeMismatch" or "Parent node not found").
 
+BACnet
+   Defines data types whose fields have the names signed or unsigned. This leads to errors when creating C structures, because signed and unsigned are keywords in C.
 
 Automatic Nodesetinjection
-................................
+..........................
 
 The nodesetinjector is a mechanism for automatically loading nodeset/companion specifications during server initialization.
 It provides a fast and easy way to load nodesets in all applications, focusing on the official OPCFoundation/UANodeset Repository ( https://github.com/OPCFoundation/UA-Nodeset ).
@@ -514,6 +513,8 @@ A CMake call could look like this.
     -DUA_NAMESPACE_ZERO=FULL
 
 The order of nodesets is important! Nodesets that build on other nodesets must be placed after them in the list.
-The following nodesets are currently supported.
+The following nodesets are currently supported:
 
-* DI, CNC, ISA95-JOBCONTROL, OpenSCS, AMB, AutoID, POWERLINK, IA, Machinery, PackML, PNEM, PLCopen, MachineTool, PROFINET, MachineVision, FDT, CommercialKitchenEquipment, PNRIO, Scales, Weihenstephan, Pumps, CAS, TMC, IJT
+DI, CNC, ISA95-JOBCONTROL, OpenSCS, AMB, AutoID, POWERLINK, IA, Machinery,
+PackML, PNEM, PLCopen, MachineTool, PROFINET, MachineVision, FDT,
+CommercialKitchenEquipment, PNRIO, Scales, Weihenstephan, Pumps, CAS, TMC, IJT
diff --git a/doc/plugin.rst b/doc/plugin.rst
index accdbd2bcf5..ee086658b5f 100644
--- a/doc/plugin.rst
+++ b/doc/plugin.rst
@@ -5,9 +5,7 @@ Plugin API
 
    plugin_log
    plugin_nodestore
-   plugin_network
    plugin_accesscontrol
-   plugin_pubsub
    plugin_eventloop
    plugin_pki
    plugin_securitypolicy
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 3a3cf4543f1..6e5736ec3ee 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -31,7 +31,6 @@ typedef struct UA_InterruptManager UA_InterruptManager;
 /**
  * Event Loop Subsystem
  * ====================
- *
  * An OPC UA-enabled application can have several clients and servers. And
  * server can serve different transport-level protocols for OPC UA. The
  * EventLoop is a central module that provides a unified control-flow for all of
@@ -46,7 +45,6 @@ typedef struct UA_InterruptManager UA_InterruptManager;
  *
  * Timer Policies
  * --------------
- *
  * A timer comes with a cyclic interval in which a callback is executed. If an
  * application is congested the interval can be missed. Two different policies
  * can be used when this happens. Either schedule the next execution after the
@@ -377,11 +375,10 @@ struct UA_ConnectionManager {
  * The implementations of the interrupt manager for the different platforms
  * shall be designed such that:
  *
- * Registered interrupts are only intercepted from within the running EventLoop
- *
- * Processing an interrupt in the EventLoop is handled similarly to handling a
- * network event: all methods and also memory allocation are available from
- * within the interrupt callback. */
+ * - Registered interrupts are only intercepted from within the running EventLoop
+ * - Processing an interrupt in the EventLoop is handled similarly to handling a
+ *   network event: all methods and also memory allocation are available from
+ *   within the interrupt callback. */
 
 /* Interrupts can have additional key-value 'instanceInfos' for each individual
  * triggering. See the architecture-specific documentation. */
@@ -448,80 +445,111 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  * The following list defines the parameters and their type. Note that some
  * parameters are only set for the first callback when a new connection opens.
  *
- * Configuration parameters for the entire ConnectionManager:
- * - 0:recv-bufsize [uint32]: Size of the buffer that is allocated for receiving
- *                            messages (default 64kB).
- *
- * Open Connection Parameters:
- * - 0:address [string | array of string]: Hostname or IPv4/v6 address for the
- *             connection (scalar parameter required for active connections).
- *             For listen-connections the address implies the network interfaces
- *             for listening (default: listen on all interfaces).
- * - 0:port [uint16]: Port of the target host (required).
- * - 0:listen [boolean]: Listen-connection or active-connection (default: false)
- * - 0:validate [boolean]: If true, the connection setup will act as a dry-run
- *       without actually creating any connection but solely validating the
- *       provided parameters (default: false)
- *
- * Connection Callback Parameters (first callback only):
- * - Active Connection
- *   - 0:remote-address [string]: Address of the remote side (hostname or IP address).
- * - Listen Connection
- *   - 0:listen-address [string]: Local address for that particular
- *                                listen-connection.
- *   - 0:listen-port [uint16]: Port on which the connection listens.
- *
- * Send Parameters:
- * No additional parameters for sending over an established TCP socket defined. */
+ * **Configuration parameters for the entire ConnectionManager:**
+ *
+ * 0:recv-bufsize [uint32]
+ *    Size of the buffer that is allocated for receiving messages (default 64kB).
+ *
+ * **Open Connection Parameters:**
+ *
+ * 0:address [string | array of string]
+ *    Hostname or IPv4/v6 address for the connection (scalar parameter required
+ *    for active connections). For listen-connections the address implies the
+ *    network interfaces for listening (default: listen on all interfaces).
+ *
+ * 0:port [uint16]
+ *    Port of the target host (required).
+ *
+ * 0:listen [boolean]
+ *    Listen-connection or active-connection (default: false)
+ *
+ * 0:validate [boolean]
+ *    If true, the connection setup will act as a dry-run without actually
+ *    creating any connection but solely validating the provided parameters
+ *    (default: false)
+ *
+ * **Active Connection Connection Callback Parameters (first callback only):**
+ *
+ * 0:remote-address [string]
+ *    Address of the remote side (hostname or IP address).
+ *
+ * **Listen Connection Connection Callback Parameters (first callback only):**
+ *
+ * 0:listen-address [string]
+ *    Local address for that particular listen-connection.
+ *
+ * 0:listen-port [uint16]
+ *    Port on which the connection listens.
+ *
+ * **Send Parameters:**
+ *
+ * No additional parameters for sending over an established TCP socket
+ * defined. */
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
 
 /**
  * UDP Connection Manager
  * ~~~~~~~~~~~~~~~~~~~~~~
+ * Manages UDP connections. This should be available for all architectures. The
+ * configuration parameters have to set before calling _start to take effect.
+ *
+ * **Configuration Parameters:**
+ *
+ * 0:recv-bufsize [uint32]
+ *    Size of the buffer that is allocated for receiving messages (default
+ *    64kB).
+ *
+ * **Open Connection Parameters:**
+ *
+ * 0:listen [boolean]
+ *    Use the connection for listening or for sending (default: false)
+ *
+ * 0:address [string | string array]
+ *    Hostname (or IPv4/v6 address) for sending or receiving. A scalar is
+ *    required for sending. For listening a string array for the list-hostnames
+ *    is possible as well (default: list on all hostnames).
+ *
+ * 0:port [uint16]
+ *    Port for sending or listening (required).
+ *
+ * 0:interface [string]
+ *    Network interface for listening or sending (e.g. when using multicast
+ *    addresses)
+ *
+ * 0:ttl [uint32]
+ *    Multicast time to live, (optional, default: 1 - meaning multicast is
+ *    available only to the local subnet).
+ *
+ * 0:loopback [boolean]
+ *    Whether or not to use multicast loopback, enabling local interfaces
+ *    belonging to the multicast group to receive packages. (default: enabled).
+ *
+ * 0:reuse [boolean]
+ *    Enables sharing of the same listening address on different sockets
+ *    (default: disabled).
+ *
+ * 0:sockpriority [uint32]
+ *    The socket priority (optional) - only available on linux. packets with a
+ *    higher priority may be processed first depending on the selected device
+ *    queueing discipline. Setting a priority outside the range 0 to 6 requires
+ *    the CAP_NET_ADMIN capability (on Linux).
+ *
+ * 0:validate [boolean]
+ *    If true, the connection setup will act as a dry-run without actually
+ *    creating any connection but solely validating the provided parameters
+ *    (default: false)
+ *
+ * **Connection Callback Paramters:**
+ *
+ * 0:remote-address [string]
+ *    Contains the remote IP address.
+ *
+ * 0:remote-port [uint16]
+ *    Contains the remote port.
+ *
+ * **Send Parameters:**
  *
- * Manages UDP connections. This should be available for all architectures.
- *
- * The configuration parameters have to set before calling _start to take
- * effect.
- *
- * Configuration Parameters:
- *
- * - 0:recv-bufsize [uint32]: Size of the buffer that is allocated for receiving
- *                            messages (default 64kB).
- *
- * Open Connection Parameters:
- *
- * - 0:listen [boolean]: Use the connection for listening or for sending
- *       (default: false)
- * - 0:address [string | string array]: Hostname (or IPv4/v6 address) for
- *       sending or receiving. A scalar is required for sending. For listening a
- *       string array for the list-hostnames is possible as well (default: list
- *       on all hostnames).
- * - 0:port [uint16]: Port for sending or listening (required).
- * - 0:interface [string]: Network interface for listening or sending (e.g. when
- *       using multicast addresses)
- * - 0:ttl [uint32]: Multicast time to live, (optional, default: 1 - meaning
- *       multicast is available only to the local subnet).
- * - 0:loopback [boolean]: Whether or not to use multicast loopback, enabling
- *       local interfaces belonging to the multicast group to receive packages.
- *       (default: enabled).
- * - 0:reuse [boolean]: Enables sharing of the same listening address on
- *       different sockets (default: disabled).
- * - 0:sockpriority [uint32]: The socket priority (optional) - only available on
- *       linux. packets with a higher priority may be processed first depending
- *       on the selected device queueing discipline. Setting a priority outside
- *       the range 0 to 6 requires the CAP_NET_ADMIN capability (on Linux).
- * - 0:validate [boolean]: If true, the connection setup will act as a dry-run
- *       without actually creating any connection but solely validating the
- *       provided parameters (default: false)
- *
- * Connection Callback Paramters:
- *
- * - 0:remote-address [string]: Contains the remote IP address.
- * - 0:remote-port [uint16]: Contains the remote port.
- *
- * Send Parameters:
  * No additional parameters for sending over an UDP connection defined. */
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName);
@@ -530,33 +558,47 @@ UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName);
  * Ethernet Connection Manager
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * Listens on the network and manages UDP connections. This should be available
- * for all architectures.
+ * for all architectures. The configuration parameters have to set before
+ * calling _start to take effect.
+ *
+ * **Open Connection Parameters:**
+ *
+ * 0:listen [bool]
+ *    The connection is either for sending or for listening (default: false).
+ *
+ * 0:interface [string]
+ *    The name of the Ethernet interface to use (required).
+ *
+ * 0:address [string]
+ *    MAC target address consisting of six groups of hexadecimal digits
+ *    separated by hyphens such as 01-23-45-67-89-ab. For sending this is a
+ *    required parameter. For listening this is a multicast address that the
+ *    connections tries to register for.
+ *
+ * 0:ethertype [uint16]
+ *    EtherType for sending and receiving frames (optional). For listening
+ *    connections, this filters out all frames with different EtherTypes.
+ *
+ * 0:promiscuous [bool]
+ *    Receive frames also for different target addresses. Defined only for
+ *    listening connections (default: false).
+ *
+ * 0:vid [uint16]
+ *    12-bit VLAN identifier (optional for send connections).
+ *
+ * 0:pcp [byte]
+ *    3-bit priority code point (optional for send connections).
+ *
+ * 0:dei [bool]
+ *    1-bit drop eligible indicator (optional for seond connections).
+ *
+ * 0:validate [boolean]
+ *    If true, the connection setup will act as a dry-run without actually
+ *    creating any connection but solely validating the provided parameters
+ *    (default: false)
+ *
+ * **Send Parameters:**
  *
- * The configuration parameters have to set before calling _start to take
- * effect.
- *
- * Open Connection Parameters:
- * - 0:listen [bool]: The connection is either for sending or for listening
- *                    (default: false).
- * - 0:interface [string]: The name of the Ethernet interface to use (required).
- * - 0:address [string]: MAC target address consisting of six groups of
- *                       hexadecimal digits separated by hyphens such as
- *                       01-23-45-67-89-ab. For sending this is a required
- *                       parameter. For listening this is a multicast address
- *                       that the connections tries to register for.
- * - 0:ethertype [uint16]: EtherType for sending and receiving frames (optional).
- *                         For listening connections, this filters out all frames
- *                         with different EtherTypes.
- * - 0:promiscuous [bool]: Receive frames also for different target addresses.
- *                         Defined only for listening connections (default: false).
- * - 0:vid [uint16]: 12-bit VLAN identifier (optional for send connections).
- * - 0:pcp [byte]: 3-bit priority code point (optional for send connections).
- * - 0:dei [bool]: 1-bit drop eligible indicator (optional for seond connections).
- * - 0:validate [boolean]: If true, the connection setup will act as a dry-run
- *       without actually creating any connection but solely validating the
- *       provided parameters (default: false)
- *
- * Send Parameters:
  * No additional parameters for sending over an Ethernet connection defined. */
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName);
@@ -564,7 +606,6 @@ UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName);
 /**
  * MQTT Connection Manager
  * ~~~~~~~~~~~~~~~~~~~~~~~
- *
  * The MQTT ConnectionManager reuses the TCP ConnectionManager that is
  * configured in the EventLoop. Hence the MQTT ConnectionManager is platform
  * agnostic and does not require porting. An MQTT connection is for a
@@ -574,26 +615,46 @@ UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName);
  * separate connections are created for each topic and for each direction
  * (publishing / subscribing).
  *
- * Open Connection Parameters:
- * - 0:address [string]: Hostname or IPv4/v6 address of the MQTT broker
- *                       (required).
- * - 0:port [uint16]: Port of the MQTT broker (default: 1883).
- * - 0:username [string]: Username to use (default: none)
- * - 0:password [string]: Password to use (default: none)
- * - 0:keep-alive [uint16]: Number of seconds for the keep-alive (ping)
- *                          (default: 400).
- * - 0:validate [boolean]: If true, the connection setup will act as a dry-run
- *       without actually creating any connection but solely validating the
- *       provided parameters (default: false)
- *
- * - 0:topic [string]: Topic to which the connection is associated (required).
- * - 0:subscribe [bool]: Subscribe to the topic (default: false).
- *                       Otherwise it is only possible to publish on the topic.
- *                       Subscribed topics can also be published to.
- *
- * Connection Callback Parameters:
- * - 0:topic [string]: The value set during connect.
- * - 0:subscribe [bool]: The value set during connect. */
+ * **Open Connection Parameters:**
+ *
+ * 0:address [string]
+ *    Hostname or IPv4/v6 address of the MQTT broker (required).
+ *
+ * 0:port [uint16]
+ *    Port of the MQTT broker (default: 1883).
+ *
+ * 0:username [string]
+ *    Username to use (default: none)
+ *
+ * 0:password [string]
+ *    Password to use (default: none)
+ *
+ * 0:keep-alive [uint16]
+ *   Number of seconds for the keep-alive (ping) (default: 400).
+ *
+ * 0:validate [boolean]
+ *    If true, the connection setup will act as a dry-run without actually
+ *    creating any connection but solely validating the provided parameters
+ *    (default: false)
+ *
+ * 0:topic [string]
+ *    Topic to which the connection is associated (required).
+ *
+ * 0:subscribe [bool]
+ *    Subscribe to the topic (default: false). Otherwise it is only possible to
+ *    publish on the topic. Subscribed topics can also be published to.
+ *
+ * **Connection Callback Parameters:**
+ *
+ * 0:topic [string]
+ *    The value set during connect.
+ *
+ * 0:subscribe [bool]
+ *    The value set during connect.
+ *
+ * **Send Parameters:**
+ *
+ * No additional parameters for sending over an Ethernet connection defined. */
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_MQTT(const UA_String eventSourceName);
 
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index d7a1639e3f4..5cba4a6e89c 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -242,15 +242,13 @@ struct UA_PubSubConfiguration {
 #endif
 };
 
-/**
- * Add a new PubSub connection to the given server and open it.
- * @param[in] server the server to add the connection to
- * @param[in] connectionConfig the configuration for the newly added connection
- * @param[out] connectionIdentifier if not NULL will be set to the identifier of the
- *                                  newly added connection
+/* Add a new PubSub connection to the given server and open it.
+ * @param server The server to add the connection to.
+ * @param connectionConfig The configuration for the newly added connection.
+ * @param connectionIdentifier If not NULL will be set to the identifier of the
+ *        newly added connection.
  * @return UA_STATUSCODE_GOOD if connection was successfully added, otherwise an
- *         error code.
- */
+ *         error code. */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 UA_Server_addPubSubConnection(UA_Server *server,
                               const UA_PubSubConnectionConfig *connectionConfig,

From 626f078deafd571355090fbbdf3ab465413ca6d0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Mar 2024 23:53:14 +0100
Subject: [PATCH 1430/1963] refactor(doc): Remove outdated arch documentation

---
 doc/building.rst      |   1 -
 doc/building_arch.rst | 141 ------------------------------------------
 2 files changed, 142 deletions(-)
 delete mode 100644 doc/building_arch.rst

diff --git a/doc/building.rst b/doc/building.rst
index 0272381b9e4..acbc30aaa7b 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -487,4 +487,3 @@ the shared library.
    cp /path-to/examples/tutorial_server_firststeps.c . # copy the example server
    gcc -std=c99 -o server tutorial_server_firststeps.c -lopen62541
 
-.. include:: building_arch.rst
diff --git a/doc/building_arch.rst b/doc/building_arch.rst
deleted file mode 100644
index bd7daf49f5f..00000000000
--- a/doc/building_arch.rst
+++ /dev/null
@@ -1,141 +0,0 @@
-Building for specific architectures
------------------------------------
-
-The open62541 library can be build for many operating systems and embedded systems.
-This document shows a small excerpt of already tested architectures. Since the stack is only using the
-C99 standard, there are many more supported architectures.
-
-A full list of implemented architecture support can be found in the arch folder.
-
-Windows, Linux, MacOS
-^^^^^^^^^^^^^^^^^^^^^
-
-These architectures are supported by default and are automatically chosen by CMake.
-
-Have a look into the previous sections on how to do that.
-
-freeRTOS + LwIP
-^^^^^^^^^^^^^^^
-
-Credits to `@cabralfortiss <https://github.com/cabralfortiss>`_
-
-This documentation is based on the discussion of the PR https://github.com/open62541/open62541/pull/2511. If you have any doubts, please first check the discussion there.
-
-This documentation assumes that you have a basic example using LwIP and freeRTOS that works fine, and you only want to add an OPC UA task to it.
-
-There are two main ways to build open62541 for freeRTOS + LwIP:
-
-- Select the cross compiler in CMake, set the flags needed for compilation (different for each microcontroller so it can be difficult) and then run make in the folder and the library should be generated. This method can be hard to do because you need to specify the include files and some other configurations.
-- Generate the open6254.h and open6254.c files with the freeRTOSLWIP architecture and then put these files in your project in your IDE that you're using for compiling. This is the easiest way of doing it and the documentation only focus on this method.
-
-In CMake, select freertosLWIP using the variable UA_ARCHITECTURE, enable amalgamation using the UA_ENABLE_AMALGAMATION variable and just select the native compilers. Then try to compile as always. The compilation will fail, but the open62541.h and open62541.c will be generated.
-
-NOTE: If you are using the memory allocation functions from freeRTOS (pvPortMalloc and family) you will need also to set the variable UA_ARCH_FREERTOS_USE_OWN_MEMORY_FUNCTIONS to true. Many users had to implement pvPortCalloc and pvPortRealloc.
-
-If using the terminal, the command should look like this
-
-.. code-block:: bash
-
-	mkdir build_freeRTOS
-	cd build_freeRTOS
-	cmake -DUA_ARCHITECTURE=freertosLWIP -DUA_ENABLE_AMALGAMATION=ON ../
-	make 
-
-Remember, the compilation will fail. That's not a problem, because you need only the generated files (open62541.h and open62541.c) found in the directory where you tried to compile. Import these in your IDE that you're using. 
-There is no standard way of doing the following across all IDEs, but you need to do the following configurations in your project:
-
-- Add the open62541.c file for compilation 
-- Add the variable UA_ARCHITECTURE_FREERTOSLWIP to the compilation
-- Make sure that the open62541.h is in a folder which is included in the compilation.
-
-When compiling LwIP you need a file called lwipopts.h. In this file, you put all the configuration variables. You need to make sure that you have the following configurations there:
-
-.. code-block:: c
-
-	#define LWIP_COMPAT_SOCKETS 0 // Don't do name define-transformation in networking function names.
-	#define LWIP_SOCKET 1 // Enable Socket API (normally already set)
-	#define LWIP_DNS 1 // enable the lwip_getaddrinfo function, struct addrinfo and more.
-	#define SO_REUSE 1 // Allows to set the socket as reusable
-	#define LWIP_TIMEVAL_PRIVATE 0 // This is optional. Set this flag if you get a compilation error about redefinition of struct timeval
-
-For freeRTOS there's a similar file called FreeRTOSConfig.h. Usually, you should have an example project with this file. The only two variables that are recommended to check are:
-
-.. code-block:: c
-
-	#define configCHECK_FOR_STACK_OVERFLOW 1
-	#define configUSE_MALLOC_FAILED_HOOK 1
-
-Most problems when running the OPC UA server in freeRTOS + LwIP come from the fact that is usually deployed in embedded systems with a limited amount of memory, so these definitions will allow checking if there was a memory problem (will save a lot of effort looking for hidden problems).
-
-Now, you need to add the task that will start the OPC UA server. 
-
-.. code-block:: c
-
-	static void opcua_thread(void *arg){
-	
-		//The default 64KB of memory for sending and receicing buffer caused problems to many users. With the code below, they are reduced to ~16KB
-		UA_UInt32 sendBufferSize = 16000;	//64 KB was too much for my platform
-		UA_UInt32 recvBufferSize = 16000;	//64 KB was too much for my platform
-		UA_UInt16 portNumber = 4840;
-		
-		UA_Server* mUaServer = UA_Server_new();
-		UA_ServerConfig *uaServerConfig = UA_Server_getConfig(mUaServer);
-		UA_ServerConfig_setMinimal(uaServerConfig, portNumber, 0, sendBufferSize, recvBufferSize);
-		
-		//VERY IMPORTANT: Set the hostname with your IP before starting the server
-		UA_ServerConfig_setCustomHostname(uaServerConfig, UA_STRING("192.168.0.102"));
-		
-		//The rest is the same as the example
-		
-		UA_Boolean running = true;
-		
-		// add a variable node to the adresspace
-		UA_VariableAttributes attr = UA_VariableAttributes_default;
-		UA_Int32 myInteger = 42;
-		UA_Variant_setScalarCopy(&attr.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
-		attr.description = UA_LOCALIZEDTEXT_ALLOC("en-US","the answer");
-		attr.displayName = UA_LOCALIZEDTEXT_ALLOC("en-US","the answer");
-		UA_NodeId myIntegerNodeId = UA_NODEID_STRING_ALLOC(1, "the.answer");
-		UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME_ALLOC(1, "the answer");
-		UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
-		UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
-		UA_Server_addVariableNode(mUaServer, myIntegerNodeId, parentNodeId,
-									parentReferenceNodeId, myIntegerName,
-									UA_NODEID_NULL, attr, NULL, NULL);
-		
-		/* allocations on the heap need to be freed */
-		UA_VariableAttributes_clear(&attr);
-		UA_NodeId_clear(&myIntegerNodeId);
-		UA_QualifiedName_clear(&myIntegerName);
-		
-		UA_StatusCode retval = UA_Server_run(mUaServer, &running);
-		UA_Server_delete(mUaServer);
-	}
-
-In your main function, after you initialize the TCP IP stack and all the hardware, you need to add the task:
-
-.. code-block:: c
-	
-	//8000 is the stack size and 8 is priority. This values might need to be changed according to your project
-	if(NULL == sys_thread_new("opcua_thread", opcua_thread, NULL, 8000, 8))
-		LWIP_ASSERT("opcua(): Task creation failed.", 0);
-		
-And lastly, in the same file (or any actually) add:
-
-.. code-block:: c
-
-	void vApplicationMallocFailedHook(){
-		for(;;){
-			vTaskDelay(pdMS_TO_TICKS(1000));
-		}
-	}
-	
-	void vApplicationStackOverflowHook( TaskHandle_t xTask, char *pcTaskName ){
-		for(;;){
-			vTaskDelay(pdMS_TO_TICKS(1000));
-		}
-	}
-
-And put a breakpoint in each of the vTaskDelay. These functions are called when there's a problem in the heap or the stack. If the program gets here, you have a memory problem.
-
-That's it. Your OPC UA server should run smoothly. If not, as said before, check the discussion in https://github.com/open62541/open62541/pull/2511. If you still have problems, ask there so the discussion remains centralized.

From 3a831af49925c633000e07a5206c827164af4097 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 7 Mar 2024 14:44:33 +0100
Subject: [PATCH 1431/1963] fix(arch): Fix recursive lock in
 UDP_shutdownConnection

---
 arch/eventloop_posix_udp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 870a00c103c..38adf5c8054 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -881,8 +881,8 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                        UA_LOG_ERROR(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                                     "UDP %u\t| Send failed with error %s",
                                     (unsigned)connectionId, errno_str));
-                    UDP_shutdownConnection(cm, connectionId);
                     UA_UNLOCK(&el->elMutex);
+                    UDP_shutdownConnection(cm, connectionId);
                     UA_ByteString_clear(buf);
                     return UA_STATUSCODE_BADCONNECTIONCLOSED;
                 }
@@ -901,8 +901,8 @@ UDP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                                         UA_LOGCATEGORY_NETWORK,
                                         "UDP %u\t| Send failed with error %s",
                                         (unsigned)connectionId, errno_str));
-                        UDP_shutdownConnection(cm, connectionId);
                         UA_UNLOCK(&el->elMutex);
+                        UDP_shutdownConnection(cm, connectionId);
                         UA_ByteString_clear(buf);
                         return UA_STATUSCODE_BADCONNECTIONCLOSED;
                     }

From ce33ab9de651af0bf33a2632bdea919663eb62d5 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Tue, 5 Mar 2024 10:22:34 +0100
Subject: [PATCH 1432/1963] fix(test): Fix potential memleak in sks examples

---
 tests/pubsub/check_pubsub_sks_client.c | 136 +------------------------
 tests/pubsub/check_pubsub_sks_pull.c   | 130 +----------------------
 2 files changed, 6 insertions(+), 260 deletions(-)

diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index 3f50b5ac16d..ed1ff74fcb3 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -129,139 +129,10 @@ getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
                               const UA_NodeId *objectId, void *objectContext) {
     if(!objectContext)
         return true;
-    if(!sessionContext)
-        return false;
-    UA_ExtensionObject *userIdentityToken = (UA_ExtensionObject*)sessionContext;
-    if(userIdentityToken->content.decoded.type != &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN])
-        return false;
-    UA_UserNameIdentityToken *token = (UA_UserNameIdentityToken*)
-        userIdentityToken->content.decoded.data;
-    UA_ByteString *username = (UA_ByteString *)objectContext;
-    UA_Boolean isUsernameEqual = UA_ByteString_equal(username, &token->userName);
-
-    /* clear session context */
-    UA_ExtensionObject_clear(userIdentityToken);
-    UA_free(sessionContext);
-
-    return isUsernameEqual;
-}
 
-static UA_StatusCode
-activateSession_default(UA_Server *server, UA_AccessControl *ac,
-                        const UA_EndpointDescription *endpointDescription,
-                        const UA_ByteString *secureChannelRemoteCertificate,
-                        const UA_NodeId *sessionId,
-                        const UA_ExtensionObject *userIdentityToken,
-                        void **sessionContext) {
-    AccessControlContext *context = (AccessControlContext*)ac->context;
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* The empty token is interpreted as anonymous */
-    UA_AnonymousIdentityToken anonToken;
-    UA_ExtensionObject tmpIdentity;
-    if(userIdentityToken->encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
-        UA_AnonymousIdentityToken_init(&anonToken);
-        UA_ExtensionObject_init(&tmpIdentity);
-        UA_ExtensionObject_setValueNoDelete(&tmpIdentity,
-                                            &anonToken,
-                                            &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
-        userIdentityToken = &tmpIdentity;
-    }
-
-    /* Could the token be decoded? */
-    if(userIdentityToken->encoding < UA_EXTENSIONOBJECT_DECODED)
-        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-    const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
-    if(tokenType == &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
-        /* Anonymous login */
-        if(!context->allowAnonymous)
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        const UA_AnonymousIdentityToken *token = (UA_AnonymousIdentityToken*)
-            userIdentityToken->content.decoded.data;
-
-        /* Match the beginnig of the PolicyId.
-         * Compatibility notice: Siemens OPC Scout v10 provides an empty
-         * policyId. This is not compliant. For compatibility, assume that empty
-         * policyId == ANONYMOUS_POLICY */
-        if(token->policyId.data &&
-           (token->policyId.length < anonymousPolicy.length ||
-            strncmp((const char*)token->policyId.data,
-                    (const char*)anonymousPolicy.data,
-                    anonymousPolicy.length) != 0)) {
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-        }
-    } else if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
-        /* Username and password */
-        const UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken*)
-            userIdentityToken->content.decoded.data;
-
-        /* Match the beginnig of the PolicyId */
-        if(userToken->policyId.length < usernamePolicy.length ||
-           strncmp((const char*)userToken->policyId.data,
-                   (const char*)usernamePolicy.data,
-                   usernamePolicy.length) != 0) {
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-        }
-
-        /* The userToken has been decrypted by the server before forwarding
-         * it to the plugin. This information can be used here. */
-        /* if(userToken->encryptionAlgorithm.length > 0) {} */
-
-        /* Empty username and password */
-        if(userToken->userName.length == 0 && userToken->password.length == 0)
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        /* Try to match username/pw */
-        UA_Boolean match = false;
-        if(context->loginCallback) {
-            if(context->loginCallback(&userToken->userName, &userToken->password,
-                                      context->usernamePasswordLoginSize, context->usernamePasswordLogin,
-                                      sessionContext, context->loginContext) == UA_STATUSCODE_GOOD)
-                match = true;
-        } else {
-            for(size_t i = 0; i < context->usernamePasswordLoginSize; i++) {
-                if(UA_String_equal(&userToken->userName, &context->usernamePasswordLogin[i].username) &&
-                   UA_String_equal(&userToken->password, &context->usernamePasswordLogin[i].password)) {
-                    UA_ExtensionObject *mySessionContext = (UA_ExtensionObject *)malloc(sizeof(UA_ExtensionObject));
-                    // Copy data from userIdentityToken to the session context
-                    UA_ExtensionObject_copy(userIdentityToken, mySessionContext);
-                    if(!*sessionContext)
-                        *sessionContext = (void*)mySessionContext;
-                    match = true;
-                    break;
-                }
-            }
-        }
-        if(!match)
-            return UA_STATUSCODE_BADUSERACCESSDENIED;
-    } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
-        /* x509 certificate */
-        const UA_X509IdentityToken *userToken = (UA_X509IdentityToken*)
-            userIdentityToken->content.decoded.data;
-
-        /* Match the beginnig of the PolicyId */
-        if(userToken->policyId.length < certificatePolicy.length ||
-           strncmp((const char*)userToken->policyId.data,
-                   (const char*)certificatePolicy.data,
-                   certificatePolicy.length) != 0) {
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-        }
-
-        if(!config->sessionPKI.verifyCertificate)
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        UA_StatusCode res = config->sessionPKI.
-            verifyCertificate(&config->sessionPKI, &userToken->certificateData);
-        if(res != UA_STATUSCODE_GOOD)
-            return UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
-    } else {
-        /* Unsupported token type */
-        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-    }
-
-    return UA_STATUSCODE_GOOD;
+    UA_Session *session = getSessionById(server, sessionId);
+    UA_ByteString *username = (UA_ByteString *)objectContext;
+    return UA_ByteString_equal(username, &session->clientUserIdOfSession);
 }
 
 static void
@@ -304,7 +175,6 @@ skssetup(void) {
                                       config->logging);
 
     /*User Access Control*/
-    config->accessControl.activateSession = activateSession_default;
     config->accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
 
     addSecurityGroup();
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index 124daeb151b..250e9992be8 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -93,133 +93,10 @@ getUserExecutableOnObject_sks(UA_Server *server, UA_AccessControl *ac,
                               const UA_NodeId *objectId, void *objectContext) {
     if(!objectContext)
         return true;
-    if(!sessionContext)
-        return false;
-    UA_ExtensionObject *userIdentityToken = (UA_ExtensionObject*)sessionContext;
-    if(userIdentityToken->content.decoded.type != &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN])
-        return false;
-    UA_UserNameIdentityToken *token = (UA_UserNameIdentityToken*)
-        userIdentityToken->content.decoded.data;
-    UA_ByteString *username = (UA_ByteString *)objectContext;
-    return UA_ByteString_equal(username, &token->userName);
-}
-
-static UA_StatusCode
-activateSession_default(UA_Server *server, UA_AccessControl *ac,
-                        const UA_EndpointDescription *endpointDescription,
-                        const UA_ByteString *secureChannelRemoteCertificate,
-                        const UA_NodeId *sessionId,
-                        const UA_ExtensionObject *userIdentityToken,
-                        void **sessionContext) {
-    AccessControlContext *context = (AccessControlContext*)ac->context;
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-
-    /* The empty token is interpreted as anonymous */
-    UA_AnonymousIdentityToken anonToken;
-    UA_ExtensionObject tmpIdentity;
-    if(userIdentityToken->encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
-        UA_AnonymousIdentityToken_init(&anonToken);
-        UA_ExtensionObject_init(&tmpIdentity);
-        UA_ExtensionObject_setValueNoDelete(&tmpIdentity,
-                                            &anonToken,
-                                            &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
-        userIdentityToken = &tmpIdentity;
-    }
-
-    /* Could the token be decoded? */
-    if(userIdentityToken->encoding < UA_EXTENSIONOBJECT_DECODED)
-        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-    const UA_DataType *tokenType = userIdentityToken->content.decoded.type;
-    if(tokenType == &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
-        /* Anonymous login */
-        if(!context->allowAnonymous)
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        const UA_AnonymousIdentityToken *token = (UA_AnonymousIdentityToken*)
-            userIdentityToken->content.decoded.data;
-
-        /* Match the beginnig of the PolicyId.
-         * Compatibility notice: Siemens OPC Scout v10 provides an empty
-         * policyId. This is not compliant. For compatibility, assume that empty
-         * policyId == ANONYMOUS_POLICY */
-        if(token->policyId.data &&
-           (token->policyId.length < anonymousPolicy.length ||
-            strncmp((const char*)token->policyId.data,
-                    (const char*)anonymousPolicy.data,
-                    anonymousPolicy.length) != 0)) {
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-        }
-    } else if(tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
-        /* Username and password */
-        const UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken*)
-            userIdentityToken->content.decoded.data;
-
-        /* Match the beginnig of the PolicyId */
-        if(userToken->policyId.length < usernamePolicy.length ||
-           strncmp((const char*)userToken->policyId.data,
-                   (const char*)usernamePolicy.data,
-                   usernamePolicy.length) != 0) {
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-        }
 
-        /* The userToken has been decrypted by the server before forwarding
-         * it to the plugin. This information can be used here. */
-        /* if(userToken->encryptionAlgorithm.length > 0) {} */
-
-        /* Empty username and password */
-        if(userToken->userName.length == 0 && userToken->password.length == 0)
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        /* Try to match username/pw */
-        UA_Boolean match = false;
-        if(context->loginCallback) {
-            if(context->loginCallback(&userToken->userName, &userToken->password,
-                                      context->usernamePasswordLoginSize, context->usernamePasswordLogin,
-                                      sessionContext, context->loginContext) == UA_STATUSCODE_GOOD)
-                match = true;
-        } else {
-            for(size_t i = 0; i < context->usernamePasswordLoginSize; i++) {
-                if(UA_String_equal(&userToken->userName, &context->usernamePasswordLogin[i].username) &&
-                   UA_String_equal(&userToken->password, &context->usernamePasswordLogin[i].password)) {
-                    UA_ExtensionObject *mySessionContext = (UA_ExtensionObject *)malloc(sizeof(UA_ExtensionObject));
-                    // Copy data from userIdentityToken to the session context
-                    UA_ExtensionObject_copy(userIdentityToken, mySessionContext);
-                    if(!*sessionContext)
-                        *sessionContext = (void*)mySessionContext;
-                    match = true;
-                    break;
-                }
-            }
-        }
-        if(!match)
-            return UA_STATUSCODE_BADUSERACCESSDENIED;
-    } else if(tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
-        /* x509 certificate */
-        const UA_X509IdentityToken *userToken = (UA_X509IdentityToken*)
-            userIdentityToken->content.decoded.data;
-
-        /* Match the beginnig of the PolicyId */
-        if(userToken->policyId.length < certificatePolicy.length ||
-           strncmp((const char*)userToken->policyId.data,
-                   (const char*)certificatePolicy.data,
-                   certificatePolicy.length) != 0) {
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-        }
-
-        if(!config->sessionPKI.verifyCertificate)
-            return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        UA_StatusCode res = config->sessionPKI.
-            verifyCertificate(&config->sessionPKI, &userToken->certificateData);
-        if(res != UA_STATUSCODE_GOOD)
-            return UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
-    } else {
-        /* Unsupported token type */
-        return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-    }
-
-    return UA_STATUSCODE_GOOD;
+    UA_Session *session = getSessionById(server, sessionId);
+    UA_ByteString *username = (UA_ByteString *)objectContext;
+    return UA_ByteString_equal(username, &session->clientUserIdOfSession);
 }
 
 static void
@@ -274,7 +151,6 @@ setup(void) {
     retVal |= UA_Server_addPubSubConnection(sksServer, &connectionConfig, &connection);
 
     /*User Access Control*/
-    config->accessControl.activateSession = activateSession_default;
     config->accessControl.getUserExecutableOnObject = getUserExecutableOnObject_sks;
 
     addSecurityGroup();

From 29c49f3b35bafe8890d81830603c1ff80f33c11f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Thu, 14 Mar 2024 11:54:04 +0100
Subject: [PATCH 1433/1963] refactor(doc): Small update to the README.md

---
 README.md | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index eb63e73f2e3..f7aba991469 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # open62541
 
-open62541 (<http://open62541.org>) is an open source and free implementation of OPC UA (OPC Unified Architecture) written in the common subset of the C99 and C++98 languages. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications. open62541 library is platform independent. All platform-specific functionality is implemented via exchangeable plugins. Plugin implementations are provided for the major operating systems.
+open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications. open62541 library is platform independent: All platform-specific functionality is implemented via exchangeable plugins for porting to different (embedded) platforms.
 
 open62541 is licensed under the Mozilla Public License v2.0 (MPLv2). This allows the open62541 library to be combined and distributed with any proprietary software. Only changes to the open62541 library itself need to be licensed under the MPLv2 when copied and distributed. The plugins, as well as the server and client examples are in the public domain (CC0 license). They can be reused under any license and changes do not have to be published.
 
@@ -103,9 +103,8 @@ On most systems, open62541 requires the C standard library only. For dependencie
 - Building and Code Generation: The build environment is generated via CMake. Some code is auto-generated from XML definitions that are part of the OPC UA standard. The code generation scripts run with both Python 2 and 3.
 
 **Note:**
-Specific optional features are dependent on third-party libraries. These are all listed under the `deps/` folder.
+Some (optional) features are dependent on third-party libraries. These are all listed under the `deps/` folder.
 Depending on the selected feature set, some of these libraries will be included in the resulting library.
-
 More information on the third-party libraries can be found in the corresponding [deps/README.md](deps/README.md)
 
 ### Code Quality
@@ -126,20 +125,13 @@ For every release, we provide some pre-packed release packages which you can dir
 Have a look at the [release page](https://github.com/open62541/open62541/releases) and the corresponding attached assets.
 
 A more detailed explanation on how to install the open62541 SDK is given in our [documentation](https://www.open62541.org/doc/master/building.html#building-the-library).
+In essence, clone the repository and initialize all the submodules using `git submodule update --init --recursive`. Then use CMake to configure your build.
 
-You can not directly download a .zip package from the main branches using the Github UI, since then some of the submodules and version strings are missing.
-Therefore you have three options to install and use this stack:
+Furthermore we provide "pack branches" that are up-to-date with the corresponding base branches, and in addition have the git submodules in-place for a zip download.
+Here are some direct download links for the current pack branches:  
 
-- **Recommended:** Use any of the prepared packages attached to every release or in the package repository of your distro (if available).  
-  Please check the install guide for more info.
-  
-- Download a .zip package of special `pack/` branches.  
-  These pack branches are up-to-date with the corresponding base branches, but already have the submodules in-place and the version string set correctly.  
-  Here are some direct download links for the current pack branches:  
   - [pack/master.zip](https://github.com/open62541/open62541/archive/pack/master.zip)
   - [pack/1.0.zip](https://github.com/open62541/open62541/archive/pack/1.0.zip)
-   
-- Clone this repository and initialize all the submodules using `git submodule update --init --recursive`. Then either use `make install` or setup your CMake project correspondingly.
 
 ## Examples
 

From 21d984d7ef54abf514aee0191a982ad8f6ec88a0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Thu, 14 Mar 2024 11:55:17 +0100
Subject: [PATCH 1434/1963] refactor(doc): Fix grammar in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f7aba991469..2abc52615e1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # open62541
 
-open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications. open62541 library is platform independent: All platform-specific functionality is implemented via exchangeable plugins for porting to different (embedded) platforms.
+open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications. The open62541 library is platform independent: All platform-specific functionality is implemented via exchangeable plugins for easy porting to different (embedded) targets.
 
 open62541 is licensed under the Mozilla Public License v2.0 (MPLv2). This allows the open62541 library to be combined and distributed with any proprietary software. Only changes to the open62541 library itself need to be licensed under the MPLv2 when copied and distributed. The plugins, as well as the server and client examples are in the public domain (CC0 license). They can be reused under any license and changes do not have to be published.
 

From 74333dd77f273031225059e2c3993a44e908511e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:00:25 +0100
Subject: [PATCH 1435/1963] refactor(doc): Simplify the examples build
 instructions in the README.md

---
 README.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2abc52615e1..27bed7fab67 100644
--- a/README.md
+++ b/README.md
@@ -136,15 +136,12 @@ Here are some direct download links for the current pack branches:
 ## Examples
 
 A complete list of examples can be found in the [examples directory](https://github.com/open62541/open62541/tree/master/examples).
-
-To build the examples, we recommend to install the open62541 project as mentioned in previous section.
+To build the examples, we recommend to install open62541 as mentioned in the previous section.
+Using the GCC compiler, just run ```gcc -std=c99 <server.c> -lopen62541 -o server``` (under Windows you may need to add additionally link against the ```ws2_32``` 
+socket library).
 
 ### Example Server Implementation
 
-The following simple server example can be built using gcc, after you installed open62541 on your system.
-
-Using the GCC compiler, just run ```gcc -std=c99 -DUA_ARCHITECTURE_POSIX <server.c> -lopen62541 -o server``` (under Windows you may need to add ``` -lws2_32``` 
-and change `-DUA_ARCHITECTURE_POSIX` to `-DUA_ARCHITECTURE_WIN32`).
 ```c
 #include <open62541/server.h>
 
@@ -183,6 +180,7 @@ int main(int argc, char** argv)
 ```
 
 ### Example Client Implementation
+
 ```c
 #include <stdio.h>
 #include <open62541/client.h>

From 3bc62f7812b835285bb184d7aa0c09d0c4293efe Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 29 Jan 2024 12:44:00 +0100
Subject: [PATCH 1436/1963] fix(server): The reuseaddr socket option is now
 disabled by default. Server does not start if Binary Protocol Manager fails
 to start.

---
 CMakeLists.txt                     |  3 ++
 arch/eventloop_posix.c             |  8 ++++
 arch/eventloop_posix_tcp.c         | 64 ++++++++++++++++--------------
 include/open62541/config.h.in      |  3 ++
 include/open62541/server.h         |  1 +
 plugins/ua_config_default.c        | 29 +++-----------
 src/server/ua_server.c             | 13 ++++++
 src/server/ua_server_binary.c      | 61 +++++++++++++++++++++++++---
 src/server/ua_services_discovery.c | 21 ++++++++++
 src/ua_securechannel.c             |  3 ++
 src/ua_securechannel.h             |  2 +
 tools/azure-devops/win/build.ps1   |  1 +
 tools/ci.sh                        | 12 ++++++
 13 files changed, 164 insertions(+), 57 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dc3e291c0f..687f6448f54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,9 @@ endif()
 set(UA_MULTITHREADING ${MULTITHREADING_DEFAULT} CACHE STRING
     "Multithreading support (<100: No multithreading support, >=100: Thread-safety enabled (internal mutexes)")
 
+option(UA_ENABLE_ALLOW_REUSEADDR "Enable reuseaddr (only for tests)" OFF)
+mark_as_advanced(UA_ENABLE_ALLOW_REUSEADDR)
+
 option(UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS "Enable the use of A&C. (EXPERIMENTAL)" OFF)
 mark_as_advanced(UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS)
 
diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 816f11b5341..856d9df9e6a 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -545,7 +545,15 @@ UA_EventLoopPOSIX_setNoSigPipe(UA_FD sockfd) {
 UA_StatusCode
 UA_EventLoopPOSIX_setReusable(UA_FD sockfd) {
     int enableReuseVal = 1;
+#ifndef _WIN32
     int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
                             (const char*)&enableReuseVal, sizeof(enableReuseVal));
+    res |= UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT,
+                            (const char*)&enableReuseVal, sizeof(enableReuseVal));
     return (res == 0) ? UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
+#else
+    int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
+                            (const char*)&enableReuseVal, sizeof(enableReuseVal));
+    return (res == 0) ? UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
+#endif
 }
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 2b7ff3e87e6..7e46ef73ac3 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -11,19 +11,21 @@
 #include "eventloop_common.h"
 
 /* Configuration parameters */
-#define TCP_PARAMETERSSIZE 5
+#define TCP_PARAMETERSSIZE 6
 #define TCP_PARAMINDEX_RECVBUF 0
 #define TCP_PARAMINDEX_ADDR 1
 #define TCP_PARAMINDEX_PORT 2
 #define TCP_PARAMINDEX_LISTEN 3
 #define TCP_PARAMINDEX_VALIDATE 4
+#define TCP_PARAMINDEX_REUSE 5
 
 static UA_KeyValueRestriction TCPConfigParameters[TCP_PARAMETERSSIZE] = {
     {{0, UA_STRING_STATIC("recv-bufsize")}, &UA_TYPES[UA_TYPES_UINT32], false, true, false},
     {{0, UA_STRING_STATIC("address")}, &UA_TYPES[UA_TYPES_STRING], false, true, true},
     {{0, UA_STRING_STATIC("port")}, &UA_TYPES[UA_TYPES_UINT16], true, true, false},
     {{0, UA_STRING_STATIC("listen")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
-    {{0, UA_STRING_STATIC("validate")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false}
+    {{0, UA_STRING_STATIC("validate")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false},
+    {{0, UA_STRING_STATIC("reuse")}, &UA_TYPES[UA_TYPES_BOOLEAN], false, true, false}
 };
 
 typedef struct {
@@ -340,7 +342,7 @@ static UA_StatusCode
 TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
                          UA_UInt16 port, void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback,
-                         UA_Boolean validate) {
+                         UA_Boolean validate, UA_Boolean reuseaddr) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
@@ -387,26 +389,17 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
     }
 #endif
 
-    /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
-    if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR,
-                     (const char *)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Could not make the socket addr reusable",
-                       (unsigned)listenSocket);
-        UA_close(listenSocket);
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-#ifndef _WIN32
-    /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
-    if(UA_setsockopt(listenSocket, SOL_SOCKET, SO_REUSEPORT,
-                     (const char *)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                       "TCP %u\t| Could not make the socket port reusable",
-                       (unsigned)listenSocket);
-        UA_close(listenSocket);
-        return UA_STATUSCODE_BADINTERNALERROR;
+    if(reuseaddr) {
+        /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
+        if(UA_EventLoopPOSIX_setReusable(listenSocket) != UA_STATUSCODE_GOOD) {
+            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                           "TCP %u\t| Could not make the socket addr reusable",
+                           (unsigned)listenSocket);
+            UA_close(listenSocket);
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
     }
-#endif
+
     /* Set the socket non-blocking */
     if(UA_EventLoopPOSIX_setNonBlocking(listenSocket) != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
@@ -515,7 +508,7 @@ static UA_StatusCode
 TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
                           UA_UInt16 port, void *application, void *context,
                           UA_ConnectionManager_connectionCallback connectionCallback,
-                          UA_Boolean validate) {
+                          UA_Boolean validate, UA_Boolean reuseaddr) {
     UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop)->elMutex, 1);
 
     /* Create a string for the port */
@@ -555,7 +548,7 @@ TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
     struct addrinfo *ai = res;
     while(ai) {
         total_result &= TCP_registerListenSocket(pcm, ai, port, application, context,
-                                                 connectionCallback, validate);
+                                                 connectionCallback, validate, reuseaddr);
         ai = ai->ai_next;
     }
     freeaddrinfo(res);
@@ -703,27 +696,40 @@ TCP_openPassiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *
             addrsSize = addrs->arrayLength;
     }
 
+    /* Get the reuseaddr parameter */
+    UA_Boolean reuseaddr = false;
+    const UA_Boolean *reuseaddrTmp = (const UA_Boolean*)
+        UA_KeyValueMap_getScalar(params, TCPConfigParameters[TCP_PARAMINDEX_REUSE].name,
+                                 &UA_TYPES[UA_TYPES_BOOLEAN]);
+    if(reuseaddrTmp)
+        reuseaddr = *reuseaddrTmp;
+
+#ifdef UA_ENABLE_ALLOW_REUSEADDR
+    reuseaddr = true;
+#endif
+
     /* Undefined or empty addresses array -> listen on all interfaces */
     if(addrsSize == 0) {
         UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                     "TCP\t| Listening on all interfaces");
         return TCP_registerListenSockets(pcm, NULL, *port, application,
-                                         context, connectionCallback, validate);
+                                         context, connectionCallback, validate, reuseaddr);
     }
 
     /* Iterate over the configured hostnames */
     UA_String *hostStrings = (UA_String*)addrs->data;
+    UA_StatusCode retval = UA_STATUSCODE_BADINTERNALERROR;
     for(size_t i = 0; i < addrsSize; i++) {
         char hostname[512];
         if(hostStrings[i].length >= sizeof(hostname))
             continue;
         memcpy(hostname, hostStrings[i].data, hostStrings->length);
         hostname[hostStrings->length] = '\0';
-        TCP_registerListenSockets(pcm, hostname, *port, application,
-                                  context, connectionCallback, validate);
+        if(TCP_registerListenSockets(pcm, hostname, *port, application,
+                                     context, connectionCallback, validate, reuseaddr) == UA_STATUSCODE_GOOD)
+            retval = UA_STATUSCODE_GOOD;
     }
-
-    return UA_STATUSCODE_GOOD;
+    return retval;
 }
 
 /* Open a TCP connection to a remote host */
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 743da187cb1..c035ab1e127 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -96,6 +96,9 @@
 #cmakedefine UA_DEBUG_DUMP_PKGS
 #cmakedefine UA_DEBUG_FILE_LINE_INFO
 
+/* Options for Tests */
+#cmakedefine UA_ENABLE_ALLOW_REUSEADDR
+
 /**
  * Function Export
  * ---------------
diff --git a/include/open62541/server.h b/include/open62541/server.h
index 71109b12850..376c9af1374 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -176,6 +176,7 @@ struct UA_ServerConfig {
                               * (default: 0 -> unbounded) */
     UA_UInt32 tcpMaxChunks;  /* Max number of chunks per message
                               * (default: 0 -> unbounded) */
+    UA_Boolean tcpReuseAddr;
 
     /**
      * Security and Encryption
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index b8f5ed3dce9..bbf0f803b45 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -347,6 +347,8 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         }
     }
 
+    conf->tcpReuseAddr = false;
+
     /* --> Start setting the default static config <-- */
 
     conf->shutdownDelay = 0.0;
@@ -393,10 +395,9 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     /* Networking */
     /* Set up the local ServerUrls. They are used during startup to initialize
      * the server sockets. */
-    UA_String serverUrls[2];
+    UA_String serverUrls[1];
     size_t serverUrlsSize = 0;
-    char hostnamestr[256];
-    char serverUrlBuffer[2][512];
+    char serverUrlBuffer[1][512];
 
     if(portNumber == 0) {
         UA_LOG_WARNING(conf->logging, UA_LOGCATEGORY_USERLAND,
@@ -411,7 +412,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
             conf->serverUrlsSize = 0;
         }
 
-        /* 1) Listen on all interfaces (also external). This must be the first
+        /* Listen on all interfaces (also external). This must be the first
          * entry if this is desired. Otherwise some interfaces may be blocked
          * (already in use) with a hostname that is only locally reachable.*/
         mp_snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
@@ -419,25 +420,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[0]);
         serverUrlsSize++;
 
-        /* 2) Use gethostname to get the local hostname. For that temporarily
-         * initialize the Winsock API on Win32. */
-#ifdef _WIN32
-        WSADATA wsaData;
-        WSAStartup(MAKEWORD(2, 2), &wsaData);
-#endif
-        int err = gethostname(hostnamestr, sizeof(hostnamestr));
-#ifdef _WIN32
-        WSACleanup();
-#endif
-
-        if(err == 0) {
-            mp_snprintf(serverUrlBuffer[1], sizeof(serverUrlBuffer[1]),
-                        "opc.tcp://%s:%u", hostnamestr, portNumber);
-            serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[1]);
-            serverUrlsSize++;
-        }
-
-        /* 3) Add to the config */
+        /* Add to the config */
         UA_StatusCode retval =
             UA_Array_copy(serverUrls, serverUrlsSize,
                           (void**)&conf->serverUrls, &UA_TYPES[UA_TYPES_STRING]);
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 74f8eca3c3c..7ca0b0256bd 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -783,6 +783,19 @@ UA_Server_run_startup(UA_Server *server) {
     ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
              startServerComponent, server);
 
+    /* Check that the binary protocol support component have been started */
+    UA_ServerComponent *binaryProtocolManager =
+        getServerComponentByName(server, UA_STRING("binary"));
+    if(binaryProtocolManager->state != UA_LIFECYCLESTATE_STARTED) {
+        UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_SERVER,
+                       "The binary protocol support component could not been started.");
+        /* Stop all server components that have already been started */
+        ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
+                 stopServerComponent, server);
+        UA_UNLOCK(&server->serviceMutex);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     /* Set the server to STARTED. From here on, only use
      * UA_Server_run_shutdown(server) to stop the server. */
     setServerLifecycleState(server, UA_LIFECYCLESTATE_STARTED);
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 6270a1e9c03..acf66f567bb 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -23,6 +23,13 @@
 #include "ua_server_internal.h"
 #include "ua_types_encoding_binary.h"
 #include "ua_services.h"
+#include "mp_printf.h"
+
+#ifdef _WIN32
+# include <winsock2.h>
+#else
+# include <unistd.h>
+#endif
 
 #define STARTCHANNELID 1
 #define STARTTOKENID 1
@@ -481,6 +488,7 @@ processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *ms
         return retval;
 
     /* Currently not checked */
+    UA_String_copy(&helloMessage.endpointUrl, &channel->endpointUrl);
     UA_String_clear(&helloMessage.endpointUrl);
 
     /* Parameterize the connection. The TcpHelloMessage casts to a
@@ -1278,8 +1286,8 @@ createServerConnection(UA_BinaryProtocolManager *bpm, const UA_String *serverUrl
             continue;
 
         /* Set up the parameters */
-        UA_KeyValuePair params[3];
-        size_t paramsSize = 2;
+        UA_KeyValuePair params[4];
+        size_t paramsSize = 3;
 
         params[0].key = UA_QUALIFIEDNAME(0, "port");
         UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
@@ -1288,11 +1296,53 @@ createServerConnection(UA_BinaryProtocolManager *bpm, const UA_String *serverUrl
         params[1].key = UA_QUALIFIEDNAME(0, "listen");
         UA_Variant_setScalar(&params[1].value, &listen, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
+        UA_Boolean reuseaddr = config->tcpReuseAddr;
+        params[2].key = UA_QUALIFIEDNAME(0, "reuse");
+        UA_Variant_setScalar(&params[2].value, &reuseaddr, &UA_TYPES[UA_TYPES_BOOLEAN]);
+
         if(hostname.length > 0) {
             /* The hostname is non-empty */
-            params[2].key = UA_QUALIFIEDNAME(0, "address");
-            UA_Variant_setArray(&params[2].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
-            paramsSize = 3;
+            params[3].key = UA_QUALIFIEDNAME(0, "address");
+            UA_Variant_setArray(&params[3].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
+            paramsSize = 4;
+        } else {
+            /* Add DiscoveryServerUrl */
+            char hostnamestr[1024];
+            hostnamestr[1023] = '\0';
+#ifdef _WIN32
+            WSADATA wsaData;
+            WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
+            gethostname(hostnamestr, 1023);
+#ifdef _WIN32
+            WSACleanup();
+#endif
+
+            char urlstr[1024];
+            mp_snprintf(urlstr, 1024, "opc.tcp://%s:%d", hostnamestr, port);
+            UA_String discoveryServerUrl = UA_STRING(urlstr);
+
+            /* Check if the ServerUrl is already present in the DiscoveryUrl array.
+             * Add if not already there. */
+            bool isContaining = false;
+            for(size_t i = 0; i < config->applicationDescription.discoveryUrlsSize; i++) {
+                if(UA_String_equal(&discoveryServerUrl,
+                                   &config->applicationDescription.discoveryUrls[i])) {
+                    isContaining = true;
+                }
+            }
+            if(!isContaining) {
+                if(config->applicationDescription.discoveryUrls == NULL) {
+                    config->applicationDescription.discoveryUrls = (UA_String*)UA_Array_new(1, &UA_TYPES[UA_TYPES_STRING]);
+                    config->applicationDescription.discoveryUrlsSize = 0;
+                }
+                UA_StatusCode retval = UA_STATUSCODE_GOOD;
+                retval = UA_Array_appendCopy((void **)&config->applicationDescription.discoveryUrls,
+                                             &config->applicationDescription.discoveryUrlsSize,
+                                             &discoveryServerUrl, &UA_TYPES[UA_TYPES_STRING]);
+                if(retval != UA_STATUSCODE_GOOD)
+                    return retval;
+            }
         }
 
         UA_KeyValueMap paramsMap;
@@ -1760,6 +1810,7 @@ UA_BinaryProtocolManager_start(UA_Server *server,
     if(!haveServerSocket) {
         UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_SERVER,
                      "The server has no server socket");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Update the application description to include the server urls for
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 9fb068cee31..1270d63c8f1 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -480,6 +480,27 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
         setCurrentEndPointsArray(server, request->endpointUrl,
                                  request->profileUris, request->profileUrisSize,
                                  &response->endpoints, &response->endpointsSize);
+
+    /* Check if the ServerUrl is already present in the DiscoveryUrl array.
+     * Add if not already there. */
+    UA_SecureChannel *channel = session->header.channel;
+    for(size_t i = 0; i < server->config.applicationDescription.discoveryUrlsSize; i++) {
+        if(UA_String_equal(&channel->endpointUrl,
+                           &server->config.applicationDescription.discoveryUrls[i])) {
+            return;
+        }
+    }
+    if(server->config.applicationDescription.discoveryUrls == NULL){
+        server->config.applicationDescription.discoveryUrls = (UA_String*)UA_Array_new(1, &UA_TYPES[UA_TYPES_STRING]);
+        server->config.applicationDescription.discoveryUrlsSize = 0;
+    }
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    retval = UA_Array_appendCopy((void**)&server->config.applicationDescription.discoveryUrls,
+                        &server->config.applicationDescription.discoveryUrlsSize,
+                        &request->endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
+    if(retval != UA_STATUSCODE_GOOD)
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
+                     "Error adding the ServerUrl to theDiscoverUrl list.");
 }
 
 #ifdef UA_ENABLE_DISCOVERY
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 3ff03b54f21..abf3151b47e 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -195,6 +195,9 @@ UA_SecureChannel_clear(UA_SecureChannel *channel) {
     UA_ByteString_clear(&channel->localNonce);
     UA_ByteString_clear(&channel->remoteNonce);
 
+    /* Clean up endpointUrl */
+    UA_String_clear(&channel->endpointUrl);
+
     /* Delete remaining chunks */
     UA_SecureChannel_deleteBuffered(channel);
 
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 59b8cf028f8..4c5a0a180f5 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -105,6 +105,8 @@ struct UA_SecureChannel {
     UA_ShutdownReason shutdownReason;
     UA_ConnectionConfig config;
 
+    UA_String endpointUrl;
+
     /* Connection handling in the EventLoop */
     UA_ConnectionManager *connectionManager;
     uintptr_t connectionId;
diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 2d986e99db9..67804f98430 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -43,6 +43,7 @@ cd build
         -DCMAKE_BUILD_TYPE=Debug `
         -DUA_BUILD_EXAMPLES=OFF `
         -DUA_BUILD_UNIT_TESTS=ON `
+        -DUA_ENABLE_ALLOW_REUSEADDR=ON `
         -DUA_ENABLE_DA=ON `
         -DUA_ENABLE_DISCOVERY=ON `
         -DUA_ENABLE_ENCRYPTION:STRING=$build_encryption `
diff --git a/tools/ci.sh b/tools/ci.sh
index 8587907a88a..b76f5415c3d 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -137,6 +137,7 @@ function unit_tests {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
@@ -157,6 +158,7 @@ function unit_tests_32 {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
@@ -177,6 +179,7 @@ function unit_tests_nosub {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_HISTORIZING=OFF \
           -DUA_ENABLE_SUBSCRIPTIONS=OFF \
           -DUA_FORCE_WERROR=ON \
@@ -191,6 +194,7 @@ function unit_tests_diag {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_DIAGNOSTICS=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
@@ -212,6 +216,7 @@ function unit_tests_mt {
           -DUA_MULTITHREADING=200 \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_FORCE_WERROR=ON \
           ..
@@ -225,6 +230,7 @@ function unit_tests_alarms {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_DA=ON \
           -DUA_ENABLE_NODESETLOADER=ON \
           -DUA_ENABLE_XML_ENCODING=ON \
@@ -243,6 +249,7 @@ function unit_tests_encryption {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_FORCE_WERROR=ON \
           ..
@@ -256,6 +263,7 @@ function unit_tests_encryption_mbedtls_pubsub {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_CERT_REJECTED_DIR=ON \
           -DUA_ENABLE_PUBSUB=ON \
@@ -275,6 +283,7 @@ function unit_tests_pubsub_sks {
           -DUA_NAMESPACE_ZERO=FULL \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \
           -DUA_ENABLE_PUBSUB=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
@@ -297,6 +306,7 @@ function unit_tests_with_coverage {
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_COVERAGE=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
@@ -323,6 +333,7 @@ function unit_tests_valgrind {
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_UNIT_TESTS=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
@@ -356,6 +367,7 @@ function examples_valgrind {
 
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
+          -DUA_ENABLE_ALLOW_REUSEADDR=ON \
           -DUA_ENABLE_ENCRYPTION=$1 \
           -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \
           -DUA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS=ON \

From 1b26b5c26072d591c19cc7b5287199e715fa5b3b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Mar 2024 17:30:31 +0100
Subject: [PATCH 1437/1963] refactor(doc): Remove quotation marks from
 statuscode descriptions

---
 tools/generate_statuscode_descriptions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/generate_statuscode_descriptions.py b/tools/generate_statuscode_descriptions.py
index 27cebf5f89b..5420054664f 100755
--- a/tools/generate_statuscode_descriptions.py
+++ b/tools/generate_statuscode_descriptions.py
@@ -50,7 +50,7 @@ def printc(string):
 ''')
 
 for row in rows:
-    printh(u"/* %s */\n#define UA_STATUSCODE_%s %s\n" % (row[2], row[0].upper(), row[1]))
+    printh(u"/* %s */\n#define UA_STATUSCODE_%s %s\n" % (row[2][1:-1], row[0].upper(), row[1]))
 
 printh(u'''/* Depending on the version of the schema, the following might be already defined: */
 #ifndef UA_STATUSCODE_GOOD

From d066fbacc679c574374f49b55ee147f7aa428081 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Mar 2024 18:42:28 +0100
Subject: [PATCH 1438/1963] refactor(doc): Prepare StatusCode generation for
 new doc structure

---
 doc/generated.rst                         | 14 --------------
 tools/generate_statuscode_descriptions.py | 10 +++-------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 doc/generated.rst

diff --git a/doc/generated.rst b/doc/generated.rst
deleted file mode 100644
index d7bcc9218eb..00000000000
--- a/doc/generated.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _generated-definitions:
-
-Generated Definitions
-=====================
-
-The following definitions are auto-generated from XML files that are part of the
-OPC UA standard.
-
-Generated Data Types
---------------------
-
-.. include:: types_generated.rst
-
-.. include:: statuscodes.rst
diff --git a/tools/generate_statuscode_descriptions.py b/tools/generate_statuscode_descriptions.py
index 5420054664f..28594474514 100755
--- a/tools/generate_statuscode_descriptions.py
+++ b/tools/generate_statuscode_descriptions.py
@@ -30,15 +30,11 @@ def printc(string):
 # Print the header file #
 #########################
 
-printh(u'''/**********************************
- * Autogenerated -- do not modify *
- **********************************/
-
-/**
- * .. _statuscodes:
+printh(u'''/** .. _statuscodes:
  *
  * StatusCodes
- * -----------
+ * ===========
+ *
  * StatusCodes are extensively used in the OPC UA protocol and in the open62541
  * API. They are represented by the :ref:`statuscode` data type. The following
  * definitions are autogenerated from the ``Opc.Ua.StatusCodes.csv`` file provided

From 5a18803de2de9dc644ee5e8e5fb7610615f47caa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Mar 2024 18:43:24 +0100
Subject: [PATCH 1439/1963] feat(doc): Add keyword to stop doc generation

---
 include/open62541/types.h | 11 +++++++----
 tools/c2rst.py            |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index dda4a1445e2..b5f1edcad22 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1486,10 +1486,13 @@ UA_Array_delete(void *p, size_t size, const UA_DataType *type);
  * Generated Data Type Definitions
  * -------------------------------
  *
- * The OPC UA standard defines many data types that are combinations of the 25
- * builtin data types. See the section on :ref:`generated-definitions` for the
- * list of data types that are integrated for this build of the open62541
- * library. */
+ * The following standard-defined datatypes are auto-generated from XML files
+ * that are part of the OPC UA standard. All datatypes are built up from the 25
+ * builtin-in datatypes from the :ref:`types` section.
+ *
+ * .. include:: types_generated.rst */
+
+/* stop-doc-generation */
 
 /* Helper used to exclude type names in the definition of UA_DataType structures
  * if the feature is disabled. */
diff --git a/tools/c2rst.py b/tools/c2rst.py
index 036b6b921f6..bd58aefb8f4 100755
--- a/tools/c2rst.py
+++ b/tools/c2rst.py
@@ -53,6 +53,8 @@ def last_line(c):
     "Searches for the latest ifdef (closing the include guard)"
     reg = re.compile("^#ifdef")
     for i in range(len(c)-1,1,-1):
+        if "stop-doc-generation" in c[i]:
+            return i
         if "_UA_END_DECLS" in c[i]:
             reg = re.compile("^_UA_END_DECLS")
     last = 1

From 646bac2e1cb1b82651ea27bc0ddaacc9a73575b1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Mar 2024 18:45:06 +0100
Subject: [PATCH 1440/1963] refactor(doc): Generate datatype docs into separate
 rst file

---
 CMakeLists.txt                                |  2 +-
 doc/CMakeLists.txt                            | 10 ++-
 doc/toc.rst                                   |  2 +-
 tools/cmake/macros_public.cmake               | 10 ++-
 tools/generate_datatypes.py                   |  7 ++-
 .../backend_open62541_typedefinitions.py      | 63 ++++++++++++++-----
 6 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 687f6448f54..2d7e9d947c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1180,7 +1180,7 @@ else()
 endif()
 
 # standard-defined data types
-ua_generate_datatypes(BUILTIN NAME "types" TARGET_SUFFIX "types" NAMESPACE_IDX 0
+ua_generate_datatypes(BUILTIN GEN_DOC NAME "types" TARGET_SUFFIX "types" NAMESPACE_IDX 0
                       FILE_CSV "${UA_FILE_NODEIDS}"
                       FILES_BSD "${UA_FILE_TYPES_BSD}"
                       FILES_SELECTED ${UA_FILE_DATATYPES})
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7078f6471c0..a080f96d37f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -17,9 +17,15 @@ file(COPY ${DOC_SRC} DESTINATION ${DOC_SRC_DIR})
 
 configure_file("${PROJECT_SOURCE_DIR}/doc/conf.py" "${DOC_SRC_DIR}/conf.py")
 
-
 list(APPEND GENERATED_RST "")
 
+# Generated type definitions
+add_custom_command(OUTPUT ${DOC_SRC_DIR}/types_generated.rst
+                   COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/src_generated/open62541/types_generated.rst ${DOC_SRC_DIR}
+                   PRE_BUILD
+                   DEPENDS ${PROJECT_BINARY_DIR}/src_generated/open62541/types_generated.rst)
+list(APPEND GENERATED_RST ${DOC_SRC_DIR}/types_generated.rst)
+
 macro(generate_rst in out)
     add_custom_command(OUTPUT ${out}
                        DEPENDS ${PROJECT_SOURCE_DIR}/tools/c2rst.py ${in}
@@ -28,13 +34,11 @@ macro(generate_rst in out)
     list(APPEND GENERATED_RST "${out}")
 endmacro()
 
-
 # Doc from headers
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/types.h ${DOC_SRC_DIR}/types.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/common.h ${DOC_SRC_DIR}/common.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/util.h ${DOC_SRC_DIR}/util.rst)
 generate_rst(${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h ${DOC_SRC_DIR}/statuscodes.rst)
-generate_rst(${PROJECT_BINARY_DIR}/src_generated/open62541/types_generated.h ${DOC_SRC_DIR}/types_generated.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/server.h ${DOC_SRC_DIR}/server.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client_subscriptions.h ${DOC_SRC_DIR}/client_subscriptions.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client.h ${DOC_SRC_DIR}/client.rst)
diff --git a/doc/toc.rst b/doc/toc.rst
index ca8c5e1a489..b692e2f27b4 100644
--- a/doc/toc.rst
+++ b/doc/toc.rst
@@ -14,5 +14,5 @@ open62541 Documentation
    pubsub
    common
    nodeset_compiler
+   statuscodes
    plugin
-   generated
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index 5693fe114a4..df5cd7b0c18 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -83,6 +83,7 @@ endfunction()
 # - NAME_generated.c
 # - NAME_generated.h
 # - NAME_generated_handling.h
+# - NAME_generated.rst (optional)
 #
 # The cmake resulting cmake target will be named like this:
 #   open62541-generator-${TARGET_SUFFIX}
@@ -93,6 +94,7 @@ endfunction()
 #   [BUILTIN]       Optional argument. If given, then builtin types will be generated.
 #   [INTERNAL]      Optional argument. If given, then the given types file is seen as internal file (e.g. does not require a .csv)
 #   [AUTOLOAD]      Optional argument. If given, the nodeset is automatically attached to the server.
+#   [GEN_DOC]       Optional argument. If given, a .rst file for documenting the generated datatypes is generated.
 #
 #   Arguments taking one value:
 #
@@ -119,7 +121,7 @@ endfunction()
 #
 #
 function(ua_generate_datatypes)
-    set(options BUILTIN INTERNAL AUTOLOAD)
+    set(options BUILTIN INTERNAL AUTOLOAD GEN_DOC)
     set(oneValueArgs NAME TARGET_SUFFIX TARGET_PREFIX OUTPUT_DIR FILE_XML FILE_CSV)
     set(multiValueArgs FILES_BSD IMPORT_BSD FILES_SELECTED NAMESPACE_MAP)
     cmake_parse_arguments(UA_GEN_DT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
@@ -166,6 +168,11 @@ function(ua_generate_datatypes)
         set(UA_GEN_DT_NO_BUILTIN "")
     endif()
 
+    set(UA_GEN_DOC_ARG "")
+    if(UA_GEN_DT_GEN_DOC)
+        set(UA_GEN_DOC_ARG "--gen-doc")
+    endif()
+
     set(UA_GEN_DT_INTERNAL_ARG "")
     if (UA_GEN_DT_INTERNAL)
         set(UA_GEN_DT_INTERNAL_ARG "--internal")
@@ -220,6 +227,7 @@ function(ua_generate_datatypes)
         ${UA_GEN_DT_NO_BUILTIN}
         ${UA_GEN_DT_INTERNAL_ARG}
         ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}
+        ${UA_GEN_DOC_ARG}
         DEPENDS ${open62541_TOOLS_DIR}/generate_datatypes.py
                 ${open62541_TOOLS_DIR}/nodeset_compiler/backend_open62541_typedefinitions.py
         ${UA_GEN_DT_FILES_BSD}
diff --git a/tools/generate_datatypes.py b/tools/generate_datatypes.py
index 66e49c55619..8f525274427 100755
--- a/tools/generate_datatypes.py
+++ b/tools/generate_datatypes.py
@@ -65,6 +65,11 @@
                     dest="internal",
                     help='Given bsd are internal types which do not have any .csv file')
 
+parser.add_argument('--gen-doc',
+                    action='store_true',
+                    dest="gen_doc",
+                    help='Generate a .rst documentation version of the type definition')
+
 parser.add_argument('-t', '--type-bsd',
                     metavar="<typeBsds>",
                     type=argparse.FileType('r'),
@@ -102,5 +107,5 @@
                           args.type_bsd, args.type_csv, args.type_xml, namespaceMap)
 parser.create_types()
 
-generator = backend.CGenerator(parser, inname, args.outfile, args.internal, namespaceMap)
+generator = backend.CGenerator(parser, inname, args.outfile, args.internal, args.gen_doc, namespaceMap)
 generator.write_definitions()
diff --git a/tools/nodeset_compiler/backend_open62541_typedefinitions.py b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
index 5e81b875557..4d286ed36e6 100644
--- a/tools/nodeset_compiler/backend_open62541_typedefinitions.py
+++ b/tools/nodeset_compiler/backend_open62541_typedefinitions.py
@@ -62,16 +62,18 @@ def getNodeidTypeAndId(nodeId):
         return "UA_NODEIDTYPE_STRING, {{ .string = UA_STRING_STATIC(\"{id}\") }}".format(id=strId.replace("\"", "\\\""))
 
 class CGenerator(object):
-    def __init__(self, parser, inname, outfile, is_internal_types, namespaceMap):
+    def __init__(self, parser, inname, outfile, is_internal_types, gen_doc, namespaceMap):
         self.parser = parser
         self.inname = inname
         self.outfile = outfile
         self.is_internal_types = is_internal_types
+        self.gen_doc = gen_doc
         self.filtered_types = None
         self.namespaceMap = namespaceMap
         self.fh = None
         self.ff = None
         self.fc = None
+        self.fd = None
         self.fe = None
 
     @staticmethod
@@ -247,23 +249,29 @@ def print_datatype_encoding(self, datatype):
             list(itertools.chain(*itertools.repeat([idName, idName, self.print_datatype_ptr(datatype)], 3))))
 
     @staticmethod
-    def print_enum_typedef(enum):
+    def print_enum_typedef(enum, gen_doc=False):
         if sys.version_info[0] < 3:
             values = enum.elements.iteritems()
         else:
             values = enum.elements.items()
 
         if enum.isOptionSet == True:
-            return "typedef " + enum.strDataType + " " + makeCIdentifier("UA_" + enum.name) + ";\n\n" + "\n".join(
-                map(lambda kv: "#define " + makeCIdentifier("UA_" + enum.name.upper() + "_" + kv[0].upper()) +
-                " " + kv[1], values))
+            elements = map(lambda kv: "#define " + makeCIdentifier("UA_" + enum.name.upper() + "_" + kv[0].upper()) + " " + kv[1], values)
+            return "typedef " + enum.strDataType + " " + makeCIdentifier("UA_" + enum.name) + ";\n\n" + "\n".join(elements)
         else:
-            return "typedef enum {\n    " + ",\n    ".join(
-                map(lambda kv: makeCIdentifier("UA_" + enum.name.upper() + "_" + kv[0].upper()) +
-                               " = " + kv[1], values)) + \
-                   "{}\n    __UA_{}_FORCE32BIT = 0x7fffffff\n".format("," if len(enum.elements) != 0 else "", makeCIdentifier(enum.name.upper())) + "} " + \
-                   "UA_{0};\nUA_STATIC_ASSERT(sizeof(UA_{0}) == sizeof(UA_Int32), enum_must_be_32bit);".format(
-                       makeCIdentifier(enum.name))
+            elements = [makeCIdentifier("UA_" + enum.name.upper() + "_" + kv[0].upper()) + " = " + kv[1] for kv in values]
+            if not gen_doc:
+                elements.append("__UA_{}_FORCE32BIT = 0x7fffffff".format(makeCIdentifier(enum.name.upper())))
+            out = []
+            out.append("typedef enum {")
+            for i,e in enumerate(elements):
+                out.append("    " + e)
+                if i < len(elements)-1:
+                    out[-1] += ","
+            out.append("}} UA_{0};".format(makeCIdentifier(enum.name)))
+            if not gen_doc:
+                out.append("\nUA_STATIC_ASSERT(sizeof(UA_{0}) == sizeof(UA_Int32), enum_must_be_32bit);".format(makeCIdentifier(enum.name)))
+            return "\n".join(out)
 
     @staticmethod
     def print_struct_typedef(struct):
@@ -322,9 +330,9 @@ def print_struct_typedef(struct):
             return returnstr + "} UA_%s;" % makeCIdentifier(struct.name)
 
     @staticmethod
-    def print_datatype_typedef(datatype):
+    def print_datatype_typedef(datatype, gen_doc=False):
         if isinstance(datatype, EnumerationType):
-            return CGenerator.print_enum_typedef(datatype)
+            return CGenerator.print_enum_typedef(datatype, gen_doc)
         if isinstance(datatype, OpaqueType):
             return "typedef UA_" + datatype.base_type + " UA_%s;" % datatype.name
         if isinstance(datatype, StructType):
@@ -346,6 +354,11 @@ def write_definitions(self):
         self.ff.close()
         self.fc.close()
 
+        if self.gen_doc:
+            self.fd = open(self.outfile + "_generated.rst", 'w')
+            self.print_doc()
+            self.fd.close()
+
     def printh(self, string):
         print(string, end='\n', file=self.fh)
 
@@ -355,6 +368,9 @@ def printf(self, string):
     def printc(self, string):
         print(string, end='\n', file=self.fc)
 
+    def printd(self, string):
+        print(string, end='\n', file=self.fd)
+
     def iter_types(self, v):
         # Make a copy. We cannot delete from the map that is iterated over at
         # the same time.
@@ -435,12 +451,10 @@ def print_header(self):
             for ns in self.filtered_types:
                 for i, t_name in enumerate(self.filtered_types[ns]):
                     t = self.filtered_types[ns][t_name]
-                    self.printh("\n/**\n * " + t.name)
-                    self.printh(" * " + "^" * len(t.name))
                     if t.description == "":
-                        self.printh(" */")
+                        self.printh("\n/* " + t.name + " */")
                     else:
-                        self.printh(" * " + t.description + " */")
+                        self.printh("\n/* " + t.name + ": " + t.description + " */")
                     if not isinstance(t, BuiltinType):
                         self.printh(self.print_datatype_typedef(t) + "\n")
                     self.printh(
@@ -454,6 +468,21 @@ def print_header(self):
 
 #endif /* %s_GENERATED_H_ */''' % self.parser.outname.upper())
 
+    def print_doc(self):
+        for ns in self.filtered_types:
+            for i, t_name in enumerate(self.filtered_types[ns]):
+                t = self.filtered_types[ns][t_name]
+                if isinstance(t, BuiltinType):
+                    continue
+                self.printd(t.name)
+                self.printd("^" * len(t.name))
+                self.printd(t.description)
+                self.printd(".. code-block:: c\n")
+                lines = self.print_datatype_typedef(t, True)
+                for l in lines.splitlines():
+                    self.printd("    " + l)
+                self.printd("")
+
     def print_handling(self):
         self.printf(u'''/**********************************
  * Autogenerated -- do not modify *

From 6b451940de815b2571432caf67f97e034c4d162d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Mar 2024 22:09:54 +0100
Subject: [PATCH 1441/1963] refactor(client): Refactor API line-breaks to
 improve the generated PDF

---
 include/open62541/client.h                 | 161 ++--
 include/open62541/client_highlevel.h       |  79 +-
 include/open62541/client_highlevel_async.h | 924 +++++++++++----------
 3 files changed, 639 insertions(+), 525 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 7e2fc4eb7e5..945bc4b40ba 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -175,8 +175,8 @@ struct UA_ClientConfig {
     UA_CertificateVerification certificateVerification;
 
     /* Available SecurityPolicies for Authentication. The policy defined by the
-     * AccessControl is selected. If no policy is defined, the policy of the secure channel
-     * is selected.*/
+     * AccessControl is selected. If no policy is defined, the policy of the
+     * secure channel is selected.*/
     size_t authSecurityPoliciesSize;
     UA_SecurityPolicy *authSecurityPolicies;
     /* SecurityPolicyUri for the Authentication. */
@@ -452,21 +452,23 @@ UA_Client_connectUsername(UA_Client *client, const char *endpointUrl,
     return UA_Client_connect(client, endpointUrl);
 }
 
-/* Sets up a listening socket for incoming reverse connect requests by OPC UA servers.
- * After the first server has connected, the listening socket is removed.
- * The client state callback is also used for reverse connect. An implementation could
- * for example issue a new call to UA_Client_startListeningForReverseConnect after the
- * server has closed the connection. If the client is connected to any server while
- * UA_Client_startListeningForReverseConnect is called, the connection will be closed.
- *
- * The reverse connect is closed by calling the standard disconnect functions like
- * for a "normal" connection that was initiated by the client. Calling one of the connect
- * methods will also close the listening socket and the connection to the remote server.
- */
+/* Sets up a listening socket for incoming reverse connect requests by OPC UA
+ * servers. After the first server has connected, the listening socket is
+ * removed. The client state callback is also used for reverse connect. An
+ * implementation could for example issue a new call to
+ * UA_Client_startListeningForReverseConnect after the server has closed the
+ * connection. If the client is connected to any server while
+ * UA_Client_startListeningForReverseConnect is called, the connection will be
+ * closed.
+ *
+ * The reverse connect is closed by calling the standard disconnect functions
+ * like for a "normal" connection that was initiated by the client. Calling one
+ * of the connect methods will also close the listening socket and the
+ * connection to the remote server. */
 UA_StatusCode UA_EXPORT
-UA_Client_startListeningForReverseConnect(UA_Client *client, const UA_String *listenHostnames,
-                                          size_t listenHostnamesLength,
-                                          UA_UInt16 port);
+UA_Client_startListeningForReverseConnect(
+    UA_Client *client, const UA_String *listenHostnames,
+    size_t listenHostnamesLength, UA_UInt16 port);
 
 /* Disconnect and close a connection to the selected server. Disconnection is
  * always performed async (without blocking). */
@@ -491,8 +493,8 @@ UA_Client_disconnectSecureChannelAsync(UA_Client *client);
 /* Get the AuthenticationToken and ServerNonce required to activate the current
  * Session on a different SecureChannel. */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
-UA_Client_getSessionAuthenticationToken(UA_Client *client, UA_NodeId *authenticationToken,
-                                        UA_ByteString *serverNonce);
+UA_Client_getSessionAuthenticationToken(
+    UA_Client *client, UA_NodeId *authenticationToken, UA_ByteString *serverNonce);
 
 /* Re-activate the current session. A change of prefered locales can be done by
  * updating the client configuration. */
@@ -545,13 +547,13 @@ UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
 
 /* Gets a list of all registered servers at the given server.
  *
- * You can pass an optional filter for serverUris. If the given server is not registered,
- * an empty array will be returned. If the server is registered, only that application
- * description will be returned.
+ * You can pass an optional filter for serverUris. If the given server is not
+ * registered, an empty array will be returned. If the server is registered,
+ * only that application description will be returned.
  *
- * Additionally you can optionally indicate which locale you want for the server name
- * in the returned application description. The array indicates the order of preference.
- * A server may have localized names.
+ * Additionally you can optionally indicate which locale you want for the server
+ * name in the returned application description. The array indicates the order
+ * of preference. A server may have localized names.
  *
  * @param client to use. Must be connected to the same endpoint given in
  *        serverUrl or otherwise in disconnected state.
@@ -560,7 +562,8 @@ UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
  * @param serverUris Optional filter for specific server uris
  * @param localeIdsSize Optional indication which locale you prefer
  * @param localeIds Optional indication which locale you prefer
- * @param registeredServersSize size of returned array, i.e., number of found/registered servers
+ * @param registeredServersSize size of returned array, i.e., number of
+ *        found/registered servers
  * @param registeredServers array containing found/registered servers
  * @return Indicates whether the operation succeeded or returns an error code */
 UA_StatusCode UA_EXPORT UA_THREADSAFE
@@ -632,20 +635,24 @@ UA_Client_Service_write(UA_Client *client, const UA_WriteRequest request) {
 }
 
 /*
-* Historical Access Service Set
-* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
+ * Historical Access Service Set
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
 static UA_INLINE UA_THREADSAFE UA_HistoryReadResponse
-UA_Client_Service_historyRead(UA_Client *client, const UA_HistoryReadRequest request) {
+UA_Client_Service_historyRead(UA_Client *client,
+                              const UA_HistoryReadRequest request) {
     UA_HistoryReadResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST],
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST],
         &response, &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE]);
     return response;
 }
 
 static UA_INLINE UA_THREADSAFE UA_HistoryUpdateResponse
-UA_Client_Service_historyUpdate(UA_Client *client, const UA_HistoryUpdateRequest request) {
+UA_Client_Service_historyUpdate(UA_Client *client,
+                                const UA_HistoryUpdateRequest request) {
     UA_HistoryUpdateResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST],
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST],
         &response, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE]);
     return response;
 }
@@ -654,10 +661,12 @@ UA_Client_Service_historyUpdate(UA_Client *client, const UA_HistoryUpdateRequest
  * Method Service Set
  * ^^^^^^^^^^^^^^^^^^ */
 static UA_INLINE UA_THREADSAFE UA_CallResponse
-UA_Client_Service_call(UA_Client *client, const UA_CallRequest request) {
+UA_Client_Service_call(UA_Client *client,
+                       const UA_CallRequest request) {
     UA_CallResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_CALLREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_CALLREQUEST],
+        &response, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
     return response;
 }
 
@@ -665,10 +674,12 @@ UA_Client_Service_call(UA_Client *client, const UA_CallRequest request) {
  * NodeManagement Service Set
  * ^^^^^^^^^^^^^^^^^^^^^^^^^^ */
 static UA_INLINE UA_THREADSAFE UA_AddNodesResponse
-UA_Client_Service_addNodes(UA_Client *client, const UA_AddNodesRequest request) {
+UA_Client_Service_addNodes(UA_Client *client,
+                           const UA_AddNodesRequest request) {
     UA_AddNodesResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_ADDNODESREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_ADDNODESREQUEST],
+        &response, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
     return response;
 }
 
@@ -676,8 +687,9 @@ static UA_INLINE UA_THREADSAFE UA_AddReferencesResponse
 UA_Client_Service_addReferences(UA_Client *client,
                                 const UA_AddReferencesRequest request) {
     UA_AddReferencesResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST],
+        &response, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
     return response;
 }
 
@@ -685,17 +697,19 @@ static UA_INLINE UA_THREADSAFE UA_DeleteNodesResponse
 UA_Client_Service_deleteNodes(UA_Client *client,
                               const UA_DeleteNodesRequest request) {
     UA_DeleteNodesResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_DELETENODESREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_DELETENODESREQUEST],
+        &response, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
     return response;
 }
 
 static UA_INLINE UA_THREADSAFE UA_DeleteReferencesResponse
-UA_Client_Service_deleteReferences(UA_Client *client,
-                                   const UA_DeleteReferencesRequest request) {
+UA_Client_Service_deleteReferences(
+    UA_Client *client, const UA_DeleteReferencesRequest request) {
     UA_DeleteReferencesResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST],
+        &response, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
     return response;
 }
 
@@ -703,10 +717,12 @@ UA_Client_Service_deleteReferences(UA_Client *client,
  * View Service Set
  * ^^^^^^^^^^^^^^^^ */
 static UA_INLINE UA_THREADSAFE UA_BrowseResponse
-UA_Client_Service_browse(UA_Client *client, const UA_BrowseRequest request) {
+UA_Client_Service_browse(UA_Client *client,
+                         const UA_BrowseRequest request) {
     UA_BrowseResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_BROWSEREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_BROWSEREQUEST],
+        &response, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
     return response;
 }
 
@@ -714,19 +730,22 @@ static UA_INLINE UA_THREADSAFE UA_BrowseNextResponse
 UA_Client_Service_browseNext(UA_Client *client,
                              const UA_BrowseNextRequest request) {
     UA_BrowseNextResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST],
+        &response, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
     return response;
 }
 
 static UA_INLINE UA_THREADSAFE UA_TranslateBrowsePathsToNodeIdsResponse
-UA_Client_Service_translateBrowsePathsToNodeIds(UA_Client *client,
-                        const UA_TranslateBrowsePathsToNodeIdsRequest request) {
+UA_Client_Service_translateBrowsePathsToNodeIds(
+    UA_Client *client,
+    const UA_TranslateBrowsePathsToNodeIdsRequest request) {
     UA_TranslateBrowsePathsToNodeIdsResponse response;
-    __UA_Client_Service(client, &request,
-                        &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST],
-                        &response,
-                        &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
+    __UA_Client_Service(
+        client, &request,
+        &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST],
+        &response,
+        &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
     return response;
 }
 
@@ -734,18 +753,19 @@ static UA_INLINE UA_THREADSAFE UA_RegisterNodesResponse
 UA_Client_Service_registerNodes(UA_Client *client,
                                 const UA_RegisterNodesRequest request) {
     UA_RegisterNodesResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST],
+        &response, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
     return response;
 }
 
 static UA_INLINE UA_THREADSAFE UA_UnregisterNodesResponse
-UA_Client_Service_unregisterNodes(UA_Client *client,
-                                  const UA_UnregisterNodesRequest request) {
+UA_Client_Service_unregisterNodes(
+    UA_Client *client, const UA_UnregisterNodesRequest request) {
     UA_UnregisterNodesResponse response;
-    __UA_Client_Service(client, &request,
-                        &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_UNREGISTERNODESRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST],
+        &response, &UA_TYPES[UA_TYPES_UNREGISTERNODESRESPONSE]);
     return response;
 }
 
@@ -758,8 +778,9 @@ static UA_INLINE UA_THREADSAFE UA_QueryFirstResponse
 UA_Client_Service_queryFirst(UA_Client *client,
                              const UA_QueryFirstRequest request) {
     UA_QueryFirstResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_QUERYFIRSTREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_QUERYFIRSTRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_QUERYFIRSTREQUEST],
+        &response, &UA_TYPES[UA_TYPES_QUERYFIRSTRESPONSE]);
     return response;
 }
 
@@ -767,8 +788,9 @@ static UA_INLINE UA_THREADSAFE UA_QueryNextResponse
 UA_Client_Service_queryNext(UA_Client *client,
                             const UA_QueryNextRequest request) {
     UA_QueryNextResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_QUERYFIRSTREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_QUERYFIRSTRESPONSE]);
+    __UA_Client_Service(
+        client, &request, &UA_TYPES[UA_TYPES_QUERYFIRSTREQUEST],
+        &response, &UA_TYPES[UA_TYPES_QUERYFIRSTRESPONSE]);
     return response;
 }
 
@@ -813,8 +835,9 @@ UA_Client_Service_queryNext(UA_Client *client,
  * >100,000 if none is defined. Avoid these when manually setting a requetHandle
  * in the requestHeader to avoid clashes. */
 
-typedef void (*UA_ClientAsyncServiceCallback)(UA_Client *client, void *userdata,
-                                              UA_UInt32 requestId, void *response);
+typedef void
+(*UA_ClientAsyncServiceCallback)(UA_Client *client, void *userdata,
+                                 UA_UInt32 requestId, void *response);
 
 UA_StatusCode UA_EXPORT UA_THREADSAFE
 __UA_Client_AsyncService(UA_Client *client, const void *request,
diff --git a/include/open62541/client_highlevel.h b/include/open62541/client_highlevel.h
index 4e0eeda8869..80068f2dd69 100644
--- a/include/open62541/client_highlevel.h
+++ b/include/open62541/client_highlevel.h
@@ -226,52 +226,50 @@ UA_Client_readUserExecutableAttribute(UA_Client *client, const UA_NodeId nodeId,
  * Use the regular service to read several nodes at once. */
 
 typedef UA_Boolean
-(*UA_HistoricalIteratorCallback)(UA_Client *client,
-                                 const UA_NodeId *nodeId,
-                                 UA_Boolean moreDataAvailable,
-                                 const UA_ExtensionObject *data, void *callbackContext);
+(*UA_HistoricalIteratorCallback)(
+    UA_Client *client, const UA_NodeId *nodeId, UA_Boolean moreDataAvailable,
+    const UA_ExtensionObject *data, void *callbackContext);
 
 UA_StatusCode UA_EXPORT
-UA_Client_HistoryRead_events(UA_Client *client, const UA_NodeId *nodeId,
-                                const UA_HistoricalIteratorCallback callback,
-                                UA_DateTime startTime, UA_DateTime endTime,
-                                UA_String indexRange, const UA_EventFilter filter, UA_UInt32 numValuesPerNode,
-                                UA_TimestampsToReturn timestampsToReturn, void *callbackContext);
+UA_Client_HistoryRead_events(
+    UA_Client *client, const UA_NodeId *nodeId,
+    const UA_HistoricalIteratorCallback callback, UA_DateTime startTime,
+    UA_DateTime endTime, UA_String indexRange, const UA_EventFilter filter,
+    UA_UInt32 numValuesPerNode, UA_TimestampsToReturn timestampsToReturn,
+    void *callbackContext);
 
 UA_StatusCode UA_EXPORT
-UA_Client_HistoryRead_raw(UA_Client *client, const UA_NodeId *nodeId,
-                             const UA_HistoricalIteratorCallback callback,
-                             UA_DateTime startTime, UA_DateTime endTime,
-                             UA_String indexRange, UA_Boolean returnBounds, UA_UInt32 numValuesPerNode,
-                             UA_TimestampsToReturn timestampsToReturn, void *callbackContext);
+UA_Client_HistoryRead_raw(
+    UA_Client *client, const UA_NodeId *nodeId,
+    const UA_HistoricalIteratorCallback callback, UA_DateTime startTime,
+    UA_DateTime endTime, UA_String indexRange, UA_Boolean returnBounds,
+    UA_UInt32 numValuesPerNode, UA_TimestampsToReturn timestampsToReturn,
+    void *callbackContext);
 
 UA_StatusCode UA_EXPORT
-UA_Client_HistoryRead_modified(UA_Client *client, const UA_NodeId *nodeId,
-                                  const UA_HistoricalIteratorCallback callback,
-                                  UA_DateTime startTime, UA_DateTime endTime,
-                                  UA_String indexRange, UA_Boolean returnBounds, UA_UInt32 numValuesPerNode,
-                                  UA_TimestampsToReturn timestampsToReturn, void *callbackContext);
+UA_Client_HistoryRead_modified(
+    UA_Client *client, const UA_NodeId *nodeId,
+    const UA_HistoricalIteratorCallback callback, UA_DateTime startTime,
+    UA_DateTime endTime, UA_String indexRange, UA_Boolean returnBounds,
+    UA_UInt32 numValuesPerNode, UA_TimestampsToReturn timestampsToReturn,
+    void *callbackContext);
 
 UA_StatusCode UA_EXPORT
-UA_Client_HistoryUpdate_insert(UA_Client *client,
-                               const UA_NodeId *nodeId,
-                               UA_DataValue *value);
+UA_Client_HistoryUpdate_insert(
+    UA_Client *client, const UA_NodeId *nodeId, UA_DataValue *value);
 
 UA_StatusCode UA_EXPORT
-UA_Client_HistoryUpdate_replace(UA_Client *client,
-                                const UA_NodeId *nodeId,
-                                UA_DataValue *value);
+UA_Client_HistoryUpdate_replace(
+    UA_Client *client, const UA_NodeId *nodeId, UA_DataValue *value);
 
 UA_StatusCode UA_EXPORT
-UA_Client_HistoryUpdate_update(UA_Client *client,
-                               const UA_NodeId *nodeId,
-                               UA_DataValue *value);
+UA_Client_HistoryUpdate_update(
+    UA_Client *client, const UA_NodeId *nodeId, UA_DataValue *value);
 
 UA_StatusCode UA_EXPORT
-UA_Client_HistoryUpdate_deleteRaw(UA_Client *client,
-                                  const UA_NodeId *nodeId,
-                                  UA_DateTime startTimestamp,
-                                  UA_DateTime endTimestamp);
+UA_Client_HistoryUpdate_deleteRaw(
+    UA_Client *client, const UA_NodeId *nodeId,
+    UA_DateTime startTimestamp, UA_DateTime endTimestamp);
 
 /**
  * Write Attributes
@@ -482,8 +480,9 @@ UA_Client_writeUserExecutableAttribute(UA_Client *client, const UA_NodeId nodeId
  * ^^^^^^^^^^^^^^ */
 
 UA_StatusCode UA_EXPORT
-UA_Client_call(UA_Client *client, const UA_NodeId objectId,
-               const UA_NodeId methodId, size_t inputSize, const UA_Variant *input,
+UA_Client_call(UA_Client *client,
+               const UA_NodeId objectId, const UA_NodeId methodId,
+               size_t inputSize, const UA_Variant *input,
                size_t *outputSize, UA_Variant **output);
 
 /**
@@ -650,14 +649,16 @@ UA_Client_NamespaceGetIndex(UA_Client *client, UA_String *namespaceUri,
 #ifndef HAVE_NODEITER_CALLBACK
 #define HAVE_NODEITER_CALLBACK
 /* Iterate over all nodes referenced by parentNodeId by calling the callback
-   function for each child node */
-typedef UA_StatusCode (*UA_NodeIteratorCallback)(UA_NodeId childId, UA_Boolean isInverse,
-                                                 UA_NodeId referenceTypeId, void *handle);
+ * function for each child node */
+typedef UA_StatusCode
+(*UA_NodeIteratorCallback)(UA_NodeId childId, UA_Boolean isInverse,
+                           UA_NodeId referenceTypeId, void *handle);
 #endif
 
 UA_StatusCode UA_EXPORT
-UA_Client_forEachChildNodeCall(UA_Client *client, UA_NodeId parentNodeId,
-                               UA_NodeIteratorCallback callback, void *handle);
+UA_Client_forEachChildNodeCall(
+    UA_Client *client, UA_NodeId parentNodeId,
+    UA_NodeIteratorCallback callback, void *handle);
 
 _UA_END_DECLS
 
diff --git a/include/open62541/client_highlevel_async.h b/include/open62541/client_highlevel_async.h
index 9bb90464011..5efc051b653 100644
--- a/include/open62541/client_highlevel_async.h
+++ b/include/open62541/client_highlevel_async.h
@@ -22,50 +22,68 @@ _UA_BEGIN_DECLS
  * Call OPC UA Services asynchronously with a callback. The (optional) requestId
  * output can be used to cancel the service while it is still pending. */
 
-typedef void (*UA_ClientAsyncReadCallback)(UA_Client *client, void *userdata,
-                                           UA_UInt32 requestId, UA_ReadResponse *rr);
+typedef void
+(*UA_ClientAsyncReadCallback)(
+    UA_Client *client, void *userdata,
+    UA_UInt32 requestId, UA_ReadResponse *rr);
+
 static UA_INLINE UA_THREADSAFE UA_StatusCode
-UA_Client_sendAsyncReadRequest(UA_Client *client, UA_ReadRequest *request,
-                               UA_ClientAsyncReadCallback readCallback, void *userdata,
-                               UA_UInt32 *reqId) {
-    return __UA_Client_AsyncService(client, request, &UA_TYPES[UA_TYPES_READREQUEST],
-                                      (UA_ClientAsyncServiceCallback)readCallback,
-                                      &UA_TYPES[UA_TYPES_READRESPONSE], userdata, reqId);
+UA_Client_sendAsyncReadRequest(
+    UA_Client *client, UA_ReadRequest *request,
+    UA_ClientAsyncReadCallback readCallback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_AsyncService(
+        client, request, &UA_TYPES[UA_TYPES_READREQUEST],
+        (UA_ClientAsyncServiceCallback)readCallback,
+        &UA_TYPES[UA_TYPES_READRESPONSE], userdata, reqId);
 }
 
-typedef void (*UA_ClientAsyncWriteCallback)(UA_Client *client, void *userdata,
-                                            UA_UInt32 requestId, UA_WriteResponse *wr);
+typedef void
+(*UA_ClientAsyncWriteCallback)(
+    UA_Client *client, void *userdata,
+    UA_UInt32 requestId, UA_WriteResponse *wr);
+
 static UA_INLINE UA_THREADSAFE UA_StatusCode
-UA_Client_sendAsyncWriteRequest(UA_Client *client, UA_WriteRequest *request,
-                                UA_ClientAsyncWriteCallback writeCallback, void *userdata,
-                                UA_UInt32 *reqId) {
-    return __UA_Client_AsyncService(client, request, &UA_TYPES[UA_TYPES_WRITEREQUEST],
-                                      (UA_ClientAsyncServiceCallback)writeCallback,
-                                      &UA_TYPES[UA_TYPES_WRITERESPONSE], userdata, reqId);
+UA_Client_sendAsyncWriteRequest(
+    UA_Client *client, UA_WriteRequest *request,
+    UA_ClientAsyncWriteCallback writeCallback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_AsyncService(
+        client, request, &UA_TYPES[UA_TYPES_WRITEREQUEST],
+        (UA_ClientAsyncServiceCallback)writeCallback,
+        &UA_TYPES[UA_TYPES_WRITERESPONSE], userdata, reqId);
 }
 
-typedef void (*UA_ClientAsyncBrowseCallback)(UA_Client *client, void *userdata,
-                                             UA_UInt32 requestId, UA_BrowseResponse *wr);
+typedef void
+(*UA_ClientAsyncBrowseCallback)(
+    UA_Client *client, void *userdata,
+    UA_UInt32 requestId, UA_BrowseResponse *wr);
+
 static UA_INLINE UA_THREADSAFE UA_StatusCode
-UA_Client_sendAsyncBrowseRequest(UA_Client *client, UA_BrowseRequest *request,
-                                 UA_ClientAsyncBrowseCallback browseCallback,
-                                 void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_AsyncService(client, request, &UA_TYPES[UA_TYPES_BROWSEREQUEST],
-                                      (UA_ClientAsyncServiceCallback)browseCallback,
-                                      &UA_TYPES[UA_TYPES_BROWSERESPONSE], userdata,
-                                      reqId);
+UA_Client_sendAsyncBrowseRequest(
+    UA_Client *client, UA_BrowseRequest *request,
+    UA_ClientAsyncBrowseCallback browseCallback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_AsyncService(
+        client, request, &UA_TYPES[UA_TYPES_BROWSEREQUEST],
+        (UA_ClientAsyncServiceCallback)browseCallback,
+        &UA_TYPES[UA_TYPES_BROWSERESPONSE], userdata, reqId);
 }
 
-typedef void (*UA_ClientAsyncBrowseNextCallback)(UA_Client *client, void *userdata,
-                                                 UA_UInt32 requestId, UA_BrowseNextResponse *wr);
+typedef void
+(*UA_ClientAsyncBrowseNextCallback)(
+    UA_Client *client, void *userdata,
+    UA_UInt32 requestId, UA_BrowseNextResponse *wr);
+
 static UA_INLINE UA_THREADSAFE UA_StatusCode
-UA_Client_sendAsyncBrowseNextRequest(UA_Client *client, UA_BrowseNextRequest *request,
-                                     UA_ClientAsyncBrowseNextCallback browseNextCallback,
-                                     void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_AsyncService(client, request, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST],
-                                      (UA_ClientAsyncServiceCallback)browseNextCallback,
-                                      &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE], userdata,
-                                      reqId);
+UA_Client_sendAsyncBrowseNextRequest(
+    UA_Client *client, UA_BrowseNextRequest *request,
+    UA_ClientAsyncBrowseNextCallback browseNextCallback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_AsyncService(
+        client, request, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST],
+        (UA_ClientAsyncServiceCallback)browseNextCallback,
+        &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE], userdata, reqId);
 }
 
 /**
@@ -82,9 +100,9 @@ UA_Client_sendAsyncBrowseNextRequest(UA_Client *client, UA_BrowseNextRequest *re
  * the request and the operation. The result argument is non-NULL only if the
  * status is no good. */
 typedef void
-(*UA_ClientAsyncOperationCallback)(UA_Client *client, void *userdata,
-                                   UA_UInt32 requestId, UA_StatusCode status,
-                                   void *result);
+(*UA_ClientAsyncOperationCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, void *result);
 
 /**
  * Read Attribute
@@ -99,446 +117,514 @@ typedef void
 
 /* Reading a single attribute */
 typedef void
-(*UA_ClientAsyncReadAttributeCallback)(UA_Client *client, void *userdata,
-                                       UA_UInt32 requestId, UA_StatusCode status,
-                                       UA_DataValue *attribute);
+(*UA_ClientAsyncReadAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_DataValue *attribute);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readAttribute_async(UA_Client *client, const UA_ReadValueId *rvi,
-                              UA_TimestampsToReturn timestampsToReturn,
-                              UA_ClientAsyncReadAttributeCallback callback,
-                              void *userdata, UA_UInt32 *requestId);
+UA_Client_readAttribute_async(
+    UA_Client *client, const UA_ReadValueId *rvi,
+    UA_TimestampsToReturn timestampsToReturn,
+    UA_ClientAsyncReadAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single Value attribute */
 typedef void
-(*UA_ClientAsyncReadValueAttributeCallback)(UA_Client *client, void *userdata,
-                                            UA_UInt32 requestId, UA_StatusCode status,
-                                            UA_DataValue *value);
+(*UA_ClientAsyncReadValueAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_DataValue *value);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readValueAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                   UA_ClientAsyncReadValueAttributeCallback callback,
-                                   void *userdata, UA_UInt32 *requestId);
+UA_Client_readValueAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadValueAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single DataType attribute */
 typedef void
-(*UA_ClientAsyncReadDataTypeAttributeCallback)(UA_Client *client, void *userdata,
-                                               UA_UInt32 requestId, UA_StatusCode status,
-                                               UA_NodeId *dataType);
+(*UA_ClientAsyncReadDataTypeAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_NodeId *dataType);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readDataTypeAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                      UA_ClientAsyncReadDataTypeAttributeCallback callback,
-                                      void *userdata, UA_UInt32 *requestId);
+UA_Client_readDataTypeAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadDataTypeAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single ArrayDimensions attribute. If the status is good, the variant
  * carries an UInt32 array. */
 typedef void
-(*UA_ClientReadArrayDimensionsAttributeCallback)(UA_Client *client, void *userdata,
-                                                 UA_UInt32 requestId, UA_StatusCode status,
-                                                 UA_Variant *arrayDimensions);
+(*UA_ClientReadArrayDimensionsAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_Variant *arrayDimensions);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readArrayDimensionsAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                             UA_ClientReadArrayDimensionsAttributeCallback callback,
-                                             void *userdata, UA_UInt32 *requestId);
+UA_Client_readArrayDimensionsAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientReadArrayDimensionsAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single NodeClass attribute */
 typedef void
-(*UA_ClientAsyncReadNodeClassAttributeCallback)(UA_Client *client, void *userdata,
-                                                UA_UInt32 requestId, UA_StatusCode status,
-                                                UA_NodeClass *nodeClass);
+(*UA_ClientAsyncReadNodeClassAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_NodeClass *nodeClass);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readNodeClassAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                       UA_ClientAsyncReadNodeClassAttributeCallback callback,
-                                       void *userdata, UA_UInt32 *requestId);
+UA_Client_readNodeClassAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadNodeClassAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single BrowseName attribute */
 typedef void
-(*UA_ClientAsyncReadBrowseNameAttributeCallback)(UA_Client *client, void *userdata,
-                                                 UA_UInt32 requestId, UA_StatusCode status,
-                                                 UA_QualifiedName *browseName);
+(*UA_ClientAsyncReadBrowseNameAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_QualifiedName *browseName);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readBrowseNameAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                        UA_ClientAsyncReadBrowseNameAttributeCallback callback,
-                                        void *userdata, UA_UInt32 *requestId);
+UA_Client_readBrowseNameAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadBrowseNameAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single DisplayName attribute */
 typedef void
-(*UA_ClientAsyncReadDisplayNameAttributeCallback)(UA_Client *client, void *userdata,
-                                                  UA_UInt32 requestId, UA_StatusCode status,
-                                                  UA_LocalizedText *displayName);
+(*UA_ClientAsyncReadDisplayNameAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_LocalizedText *displayName);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readDisplayNameAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                         UA_ClientAsyncReadDisplayNameAttributeCallback callback,
-                                         void *userdata, UA_UInt32 *requestId);
+UA_Client_readDisplayNameAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadDisplayNameAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single Description attribute */
 typedef void
-(*UA_ClientAsyncReadDescriptionAttributeCallback)(UA_Client *client, void *userdata,
-                                                  UA_UInt32 requestId, UA_StatusCode status,
-                                                  UA_LocalizedText *description);
+(*UA_ClientAsyncReadDescriptionAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_LocalizedText *description);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readDescriptionAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                         UA_ClientAsyncReadDescriptionAttributeCallback callback,
-                                         void *userdata, UA_UInt32 *requestId);
+UA_Client_readDescriptionAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadDescriptionAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single WriteMask attribute */
 typedef void
-(*UA_ClientAsyncReadWriteMaskAttributeCallback)(UA_Client *client, void *userdata,
-                                                UA_UInt32 requestId, UA_StatusCode status,
-                                                UA_UInt32 *writeMask);
+(*UA_ClientAsyncReadWriteMaskAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_UInt32 *writeMask);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readWriteMaskAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                       UA_ClientAsyncReadWriteMaskAttributeCallback callback,
-                                       void *userdata, UA_UInt32 *requestId);
+UA_Client_readWriteMaskAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadWriteMaskAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single UserWriteMask attribute */
 typedef void
-(*UA_ClientAsyncReadUserWriteMaskAttributeCallback)(UA_Client *client, void *userdata,
-                                                    UA_UInt32 requestId, UA_StatusCode status,
-                                                    UA_UInt32 *writeMask);
+(*UA_ClientAsyncReadUserWriteMaskAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_UInt32 *writeMask);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readUserWriteMaskAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                           UA_ClientAsyncReadUserWriteMaskAttributeCallback callback,
-                                           void *userdata, UA_UInt32 *requestId);
+UA_Client_readUserWriteMaskAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadUserWriteMaskAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single IsAbstract attribute */
 typedef void
-(*UA_ClientAsyncReadIsAbstractAttributeCallback)(UA_Client *client, void *userdata,
-                                                 UA_UInt32 requestId, UA_StatusCode status,
-                                                 UA_Boolean *isAbstract);
+(*UA_ClientAsyncReadIsAbstractAttributeCallback)(
+      UA_Client *client, void *userdata, UA_UInt32 requestId,
+      UA_StatusCode status, UA_Boolean *isAbstract);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readIsAbstractAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                        UA_ClientAsyncReadIsAbstractAttributeCallback callback,
-                                        void *userdata, UA_UInt32 *requestId);
+UA_Client_readIsAbstractAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadIsAbstractAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single Symmetric attribute */
 typedef void
-(*UA_ClientAsyncReadSymmetricAttributeCallback)(UA_Client *client, void *userdata,
-                                                UA_UInt32 requestId, UA_StatusCode status,
-                                                UA_Boolean *symmetric);
+(*UA_ClientAsyncReadSymmetricAttributeCallback)(
+      UA_Client *client, void *userdata, UA_UInt32 requestId,
+      UA_StatusCode status, UA_Boolean *symmetric);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readSymmetricAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                       UA_ClientAsyncReadSymmetricAttributeCallback callback,
-                                       void *userdata, UA_UInt32 *requestId);
+UA_Client_readSymmetricAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadSymmetricAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single InverseName attribute */
 typedef void
-(*UA_ClientAsyncReadInverseNameAttributeCallback)(UA_Client *client, void *userdata,
-                                                  UA_UInt32 requestId, UA_StatusCode status,
-                                                  UA_LocalizedText *inverseName);
+(*UA_ClientAsyncReadInverseNameAttributeCallback)(
+      UA_Client *client, void *userdata, UA_UInt32 requestId,
+      UA_StatusCode status, UA_LocalizedText *inverseName);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readInverseNameAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                         UA_ClientAsyncReadInverseNameAttributeCallback callback,
-                                         void *userdata, UA_UInt32 *requestId);
+UA_Client_readInverseNameAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadInverseNameAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single ContainsNoLoops attribute */
 typedef void
-(*UA_ClientAsyncReadContainsNoLoopsAttributeCallback)(UA_Client *client, void *userdata,
-                                                      UA_UInt32 requestId, UA_StatusCode status,
-                                                      UA_Boolean *containsNoLoops);
+(*UA_ClientAsyncReadContainsNoLoopsAttributeCallback)(
+      UA_Client *client, void *userdata, UA_UInt32 requestId,
+      UA_StatusCode status, UA_Boolean *containsNoLoops);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readContainsNoLoopsAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                             UA_ClientAsyncReadContainsNoLoopsAttributeCallback callback,
-                                             void *userdata, UA_UInt32 *requestId);
+UA_Client_readContainsNoLoopsAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadContainsNoLoopsAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single EventNotifier attribute */
 typedef void
-(*UA_ClientAsyncReadEventNotifierAttributeCallback)(UA_Client *client, void *userdata,
-                                                    UA_UInt32 requestId, UA_StatusCode status,
-                                                    UA_Byte *eventNotifier);
+(*UA_ClientAsyncReadEventNotifierAttributeCallback)(
+      UA_Client *client, void *userdata, UA_UInt32 requestId,
+      UA_StatusCode status, UA_Byte *eventNotifier);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readEventNotifierAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                           UA_ClientAsyncReadEventNotifierAttributeCallback callback,
-                                           void *userdata, UA_UInt32 *requestId);
+UA_Client_readEventNotifierAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadEventNotifierAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single ValueRank attribute */
 typedef void
-(*UA_ClientAsyncReadValueRankAttributeCallback)(UA_Client *client, void *userdata,
-                                                UA_UInt32 requestId, UA_StatusCode status,
-                                                UA_Int32 *valueRank);
+(*UA_ClientAsyncReadValueRankAttributeCallback)(
+      UA_Client *client, void *userdata, UA_UInt32 requestId,
+      UA_StatusCode status, UA_Int32 *valueRank);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readValueRankAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                       UA_ClientAsyncReadValueRankAttributeCallback callback,
-                                       void *userdata, UA_UInt32 *requestId);
+UA_Client_readValueRankAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadValueRankAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single AccessLevel attribute */
 typedef void
-(*UA_ClientAsyncReadAccessLevelAttributeCallback)(UA_Client *client, void *userdata,
-                                                  UA_UInt32 requestId, UA_StatusCode status,
-                                                  UA_Byte *accessLevel);
+(*UA_ClientAsyncReadAccessLevelAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_Byte *accessLevel);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readAccessLevelAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                         UA_ClientAsyncReadAccessLevelAttributeCallback callback,
-                                         void *userdata, UA_UInt32 *requestId);
+UA_Client_readAccessLevelAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadAccessLevelAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single AccessLevelEx attribute */
 typedef void
-(*UA_ClientAsyncReadAccessLevelExAttributeCallback)(UA_Client *client, void *userdata,
-                                                    UA_UInt32 requestId, UA_StatusCode status,
-                                                    UA_UInt32 *accessLevelEx);
+(*UA_ClientAsyncReadAccessLevelExAttributeCallback)(
+      UA_Client *client, void *userdata, UA_UInt32 requestId,
+      UA_StatusCode status, UA_UInt32 *accessLevelEx);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readAccessLevelExAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                           UA_ClientAsyncReadAccessLevelExAttributeCallback callback,
-                                           void *userdata, UA_UInt32 *requestId);
+UA_Client_readAccessLevelExAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadAccessLevelExAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single UserAccessLevel attribute */
 typedef void
-(*UA_ClientAsyncReadUserAccessLevelAttributeCallback)(UA_Client *client, void *userdata,
-                                                      UA_UInt32 requestId, UA_StatusCode status,
-                                                      UA_Byte *userAccessLevel);
+(*UA_ClientAsyncReadUserAccessLevelAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_Byte *userAccessLevel);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readUserAccessLevelAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                             UA_ClientAsyncReadUserAccessLevelAttributeCallback callback,
-                                             void *userdata, UA_UInt32 *requestId);
+UA_Client_readUserAccessLevelAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadUserAccessLevelAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single MinimumSamplingInterval attribute */
 typedef void
-(*UA_ClientAsyncReadMinimumSamplingIntervalAttributeCallback)(UA_Client *client, void *userdata,
-                                                              UA_UInt32 requestId, UA_StatusCode status,
-                                                              UA_Double *minimumSamplingInterval);
+(*UA_ClientAsyncReadMinimumSamplingIntervalAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_Double *minimumSamplingInterval);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readMinimumSamplingIntervalAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                                     UA_ClientAsyncReadMinimumSamplingIntervalAttributeCallback callback,
-                                                     void *userdata, UA_UInt32 *requestId);
+UA_Client_readMinimumSamplingIntervalAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadMinimumSamplingIntervalAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single Historizing attribute */
 typedef void
-(*UA_ClientAsyncReadHistorizingAttributeCallback)(UA_Client *client, void *userdata,
-                                                  UA_UInt32 requestId, UA_StatusCode status,
-                                                  UA_Boolean *historizing);
+(*UA_ClientAsyncReadHistorizingAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_Boolean *historizing);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readHistorizingAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                         UA_ClientAsyncReadHistorizingAttributeCallback callback,
-                                         void *userdata, UA_UInt32 *requestId);
+UA_Client_readHistorizingAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadHistorizingAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single Executable attribute */
 typedef void
-(*UA_ClientAsyncReadExecutableAttributeCallback)(UA_Client *client, void *userdata,
-                                                 UA_UInt32 requestId, UA_StatusCode status,
-                                                 UA_Boolean *executable);
+(*UA_ClientAsyncReadExecutableAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_Boolean *executable);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readExecutableAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                        UA_ClientAsyncReadExecutableAttributeCallback callback,
-                                        void *userdata, UA_UInt32 *requestId);
+UA_Client_readExecutableAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadExecutableAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /* Read a single UserExecutable attribute */
 typedef void
-(*UA_ClientAsyncReadUserExecutableAttributeCallback)(UA_Client *client, void *userdata,
-                                                     UA_UInt32 requestId, UA_StatusCode status,
-                                                     UA_Boolean *userExecutable);
+(*UA_ClientAsyncReadUserExecutableAttributeCallback)(
+    UA_Client *client, void *userdata, UA_UInt32 requestId,
+    UA_StatusCode status, UA_Boolean *userExecutable);
+
 UA_StatusCode UA_EXPORT
-UA_Client_readUserExecutableAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                            UA_ClientAsyncReadUserExecutableAttributeCallback callback,
-                                            void *userdata, UA_UInt32 *requestId);
+UA_Client_readUserExecutableAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    UA_ClientAsyncReadUserExecutableAttributeCallback callback,
+    void *userdata, UA_UInt32 *requestId);
 
 /**
  * Write Attribute
  * ^^^^^^^^^^^^^^^ */
 
 UA_StatusCode UA_EXPORT
-__UA_Client_writeAttribute_async(UA_Client *client, const UA_NodeId *nodeId,
-                                 UA_AttributeId attributeId, const void *in,
-                                 const UA_DataType *inDataType,
-                                 UA_ClientAsyncServiceCallback callback, void *userdata,
-                                 UA_UInt32 *reqId);
+__UA_Client_writeAttribute_async(
+    UA_Client *client, const UA_NodeId *nodeId,
+    UA_AttributeId attributeId, const void *in,
+    const UA_DataType *inDataType,
+    UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId);
 
 static UA_INLINE UA_StatusCode
-UA_Client_writeValueAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                    const UA_Variant *newValue,
-                                    UA_ClientAsyncWriteCallback callback, void *userdata,
-                                    UA_UInt32 *reqId) {
-
+UA_Client_writeValueAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Variant *attr, UA_ClientAsyncWriteCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
-        client, &nodeId, UA_ATTRIBUTEID_VALUE, newValue, &UA_TYPES[UA_TYPES_VARIANT],
-        (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
+        client, &nodeId, UA_ATTRIBUTEID_VALUE, attr,
+        &UA_TYPES[UA_TYPES_VARIANT],
+        (UA_ClientAsyncServiceCallback)callback,
+        userdata, reqId);
 }
 
 static UA_INLINE UA_StatusCode
-UA_Client_writeNodeIdAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                     const UA_NodeId *outNodeId,
-                                     UA_ClientAsyncServiceCallback callback,
-                                     void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_NODEID,
-                                            outNodeId, &UA_TYPES[UA_TYPES_NODEID],
-                                            callback, userdata, reqId);
+UA_Client_writeNodeIdAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_NodeId *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_NODEID, attr,
+        &UA_TYPES[UA_TYPES_NODEID], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeNodeClassAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                        const UA_NodeClass *outNodeClass,
-                                        UA_ClientAsyncServiceCallback callback,
-                                        void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_NODECLASS,
-                                            outNodeClass, &UA_TYPES[UA_TYPES_NODECLASS],
-                                            callback, userdata, reqId);
+UA_Client_writeNodeClassAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_NodeClass *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_NODECLASS, attr,
+        &UA_TYPES[UA_TYPES_NODECLASS], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeBrowseNameAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                         const UA_QualifiedName *outBrowseName,
-                                         UA_ClientAsyncServiceCallback callback,
-                                         void *userdata, UA_UInt32 *reqId) {
+UA_Client_writeBrowseNameAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_QualifiedName *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
-        client, &nodeId, UA_ATTRIBUTEID_BROWSENAME, outBrowseName,
+        client, &nodeId, UA_ATTRIBUTEID_BROWSENAME, attr,
         &UA_TYPES[UA_TYPES_QUALIFIEDNAME], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeDisplayNameAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                          const UA_LocalizedText *outDisplayName,
-                                          UA_ClientAsyncServiceCallback callback,
-                                          void *userdata, UA_UInt32 *reqId) {
+UA_Client_writeDisplayNameAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_LocalizedText *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
-        client, &nodeId, UA_ATTRIBUTEID_DISPLAYNAME, outDisplayName,
+        client, &nodeId, UA_ATTRIBUTEID_DISPLAYNAME, attr,
         &UA_TYPES[UA_TYPES_LOCALIZEDTEXT], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeDescriptionAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                          const UA_LocalizedText *outDescription,
-                                          UA_ClientAsyncServiceCallback callback,
-                                          void *userdata, UA_UInt32 *reqId) {
+UA_Client_writeDescriptionAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_LocalizedText *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
-        client, &nodeId, UA_ATTRIBUTEID_DESCRIPTION, outDescription,
+        client, &nodeId, UA_ATTRIBUTEID_DESCRIPTION, attr,
         &UA_TYPES[UA_TYPES_LOCALIZEDTEXT], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeWriteMaskAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                        const UA_UInt32 *outWriteMask,
-                                        UA_ClientAsyncServiceCallback callback,
-                                        void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_WRITEMASK,
-                                            outWriteMask, &UA_TYPES[UA_TYPES_UINT32],
-                                            callback, userdata, reqId);
+UA_Client_writeWriteMaskAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_UInt32 *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_WRITEMASK, attr,
+        &UA_TYPES[UA_TYPES_UINT32], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeUserWriteMaskAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                            const UA_UInt32 *outUserWriteMask,
-                                            UA_ClientAsyncServiceCallback callback,
-                                            void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_USERWRITEMASK,
-                                            outUserWriteMask, &UA_TYPES[UA_TYPES_UINT32],
-                                            callback, userdata, reqId);
+UA_Client_writeUserWriteMaskAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_UInt32 *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_USERWRITEMASK, attr,
+        &UA_TYPES[UA_TYPES_UINT32], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeIsAbstractAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                         const UA_Boolean *outIsAbstract,
-                                         UA_ClientAsyncServiceCallback callback,
-                                         void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_ISABSTRACT,
-                                            outIsAbstract, &UA_TYPES[UA_TYPES_BOOLEAN],
-                                            callback, userdata, reqId);
+UA_Client_writeIsAbstractAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Boolean *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_ISABSTRACT, attr,
+        &UA_TYPES[UA_TYPES_BOOLEAN], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeSymmetricAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                        const UA_Boolean *outSymmetric,
-                                        UA_ClientAsyncServiceCallback callback,
-                                        void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_SYMMETRIC,
-                                            outSymmetric, &UA_TYPES[UA_TYPES_BOOLEAN],
-                                            callback, userdata, reqId);
+UA_Client_writeSymmetricAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Boolean *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_SYMMETRIC, attr,
+        &UA_TYPES[UA_TYPES_BOOLEAN], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeInverseNameAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                          const UA_LocalizedText *outInverseName,
-                                          UA_ClientAsyncServiceCallback callback,
-                                          void *userdata, UA_UInt32 *reqId) {
+UA_Client_writeInverseNameAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_LocalizedText *attr,
+    UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
-        client, &nodeId, UA_ATTRIBUTEID_INVERSENAME, outInverseName,
+        client, &nodeId, UA_ATTRIBUTEID_INVERSENAME, attr,
         &UA_TYPES[UA_TYPES_LOCALIZEDTEXT], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeContainsNoLoopsAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                              const UA_Boolean *outContainsNoLoops,
-                                              UA_ClientAsyncServiceCallback callback,
-                                              void *userdata, UA_UInt32 *reqId) {
+UA_Client_writeContainsNoLoopsAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Boolean *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
-        client, &nodeId, UA_ATTRIBUTEID_CONTAINSNOLOOPS, outContainsNoLoops,
+        client, &nodeId, UA_ATTRIBUTEID_CONTAINSNOLOOPS, attr,
         &UA_TYPES[UA_TYPES_BOOLEAN], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeEventNotifierAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                            const UA_Byte *outEventNotifier,
-                                            UA_ClientAsyncServiceCallback callback,
-                                            void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_EVENTNOTIFIER,
-                                            outEventNotifier, &UA_TYPES[UA_TYPES_BYTE],
-                                            callback, userdata, reqId);
+UA_Client_writeEventNotifierAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Byte *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_EVENTNOTIFIER, attr,
+        &UA_TYPES[UA_TYPES_BYTE], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeDataTypeAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                       const UA_NodeId *outDataType,
-                                       UA_ClientAsyncServiceCallback callback,
-                                       void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_DATATYPE,
-                                            outDataType, &UA_TYPES[UA_TYPES_NODEID],
-                                            callback, userdata, reqId);
+UA_Client_writeDataTypeAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_NodeId *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_DATATYPE, attr,
+        &UA_TYPES[UA_TYPES_NODEID], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeValueRankAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                        const UA_Int32 *outValueRank,
-                                        UA_ClientAsyncServiceCallback callback,
-                                        void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_VALUERANK,
-                                            outValueRank, &UA_TYPES[UA_TYPES_INT32],
-                                            callback, userdata, reqId);
+UA_Client_writeValueRankAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Int32 *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_VALUERANK, attr,
+        &UA_TYPES[UA_TYPES_INT32], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeAccessLevelAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                          const UA_Byte *outAccessLevel,
-                                          UA_ClientAsyncServiceCallback callback,
-                                          void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_ACCESSLEVEL,
-                                            outAccessLevel, &UA_TYPES[UA_TYPES_BYTE],
-                                            callback, userdata, reqId);
+UA_Client_writeAccessLevelAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Byte *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_ACCESSLEVEL, attr,
+        &UA_TYPES[UA_TYPES_BYTE], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeAccessLevelExAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                            const UA_UInt32 *outAccessLevelEx,
-                                            UA_ClientAsyncServiceCallback callback,
-                                            void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_ACCESSLEVELEX,
-                                            outAccessLevelEx, &UA_TYPES[UA_TYPES_UINT32],
-                                            callback, userdata, reqId);
+UA_Client_writeAccessLevelExAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_UInt32 *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_ACCESSLEVELEX, attr,
+        &UA_TYPES[UA_TYPES_UINT32], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeUserAccessLevelAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                              const UA_Byte *outUserAccessLevel,
-                                              UA_ClientAsyncServiceCallback callback,
-                                              void *userdata, UA_UInt32 *reqId) {
+UA_Client_writeUserAccessLevelAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Byte *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
-        client, &nodeId, UA_ATTRIBUTEID_USERACCESSLEVEL, outUserAccessLevel,
+        client, &nodeId, UA_ATTRIBUTEID_USERACCESSLEVEL, attr,
         &UA_TYPES[UA_TYPES_BYTE], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
 UA_Client_writeMinimumSamplingIntervalAttribute_async(
     UA_Client *client, const UA_NodeId nodeId,
-    const UA_Double *outMinimumSamplingInterval, UA_ClientAsyncServiceCallback callback,
+    const UA_Double *attr, UA_ClientAsyncServiceCallback callback,
     void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
         client, &nodeId, UA_ATTRIBUTEID_MINIMUMSAMPLINGINTERVAL,
-        outMinimumSamplingInterval, &UA_TYPES[UA_TYPES_DOUBLE], callback, userdata,
-        reqId);
+        attr, &UA_TYPES[UA_TYPES_DOUBLE], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeHistorizingAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                          const UA_Boolean *outHistorizing,
-                                          UA_ClientAsyncServiceCallback callback,
-                                          void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_HISTORIZING,
-                                            outHistorizing, &UA_TYPES[UA_TYPES_BOOLEAN],
-                                            callback, userdata, reqId);
+UA_Client_writeHistorizingAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Boolean *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_HISTORIZING, attr,
+        &UA_TYPES[UA_TYPES_BOOLEAN], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeExecutableAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                         const UA_Boolean *outExecutable,
-                                         UA_ClientAsyncServiceCallback callback,
-                                         void *userdata, UA_UInt32 *reqId) {
-    return __UA_Client_writeAttribute_async(client, &nodeId, UA_ATTRIBUTEID_EXECUTABLE,
-                                            outExecutable, &UA_TYPES[UA_TYPES_BOOLEAN],
-                                            callback, userdata, reqId);
+UA_Client_writeExecutableAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Boolean *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
+    return __UA_Client_writeAttribute_async(
+        client, &nodeId, UA_ATTRIBUTEID_EXECUTABLE, attr,
+        &UA_TYPES[UA_TYPES_BOOLEAN], callback, userdata, reqId);
 }
+
 static UA_INLINE UA_StatusCode
-UA_Client_writeUserExecutableAttribute_async(UA_Client *client, const UA_NodeId nodeId,
-                                             const UA_Boolean *outUserExecutable,
-                                             UA_ClientAsyncServiceCallback callback,
-                                             void *userdata, UA_UInt32 *reqId) {
+UA_Client_writeUserExecutableAttribute_async(
+    UA_Client *client, const UA_NodeId nodeId,
+    const UA_Boolean *attr, UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_writeAttribute_async(
-        client, &nodeId, UA_ATTRIBUTEID_USEREXECUTABLE, outUserExecutable,
+        client, &nodeId, UA_ATTRIBUTEID_USEREXECUTABLE, attr,
         &UA_TYPES[UA_TYPES_BOOLEAN], callback, userdata, reqId);
 }
 
@@ -546,81 +632,92 @@ UA_Client_writeUserExecutableAttribute_async(UA_Client *client, const UA_NodeId
  * Method Calling
  * ^^^^^^^^^^^^^^ */
 UA_StatusCode UA_EXPORT
-__UA_Client_call_async(UA_Client *client, const UA_NodeId objectId,
-                       const UA_NodeId methodId, size_t inputSize,
-                       const UA_Variant *input, UA_ClientAsyncServiceCallback callback,
-                       void *userdata, UA_UInt32 *reqId);
+__UA_Client_call_async(
+    UA_Client *client,
+    const UA_NodeId objectId, const UA_NodeId methodId,
+    size_t inputSize, const UA_Variant *input,
+    UA_ClientAsyncServiceCallback callback,
+    void *userdata, UA_UInt32 *reqId);
 
-typedef void (*UA_ClientAsyncCallCallback)(UA_Client *client, void *userdata,
-                                           UA_UInt32 requestId, UA_CallResponse *cr);
+typedef void
+(*UA_ClientAsyncCallCallback)(
+    UA_Client *client, void *userdata,
+    UA_UInt32 requestId, UA_CallResponse *cr);
 
 static UA_INLINE UA_StatusCode
-UA_Client_call_async(UA_Client *client, const UA_NodeId objectId,
-                     const UA_NodeId methodId, size_t inputSize, const UA_Variant *input,
-                     UA_ClientAsyncCallCallback callback, void *userdata,
-                     UA_UInt32 *reqId) {
-    return __UA_Client_call_async(client, objectId, methodId, inputSize, input,
-                                  (UA_ClientAsyncServiceCallback)callback, userdata,
-                                  reqId);
+UA_Client_call_async(
+    UA_Client *client,
+    const UA_NodeId objectId, const UA_NodeId methodId,
+    size_t inputSize, const UA_Variant *input,
+    UA_ClientAsyncCallCallback callback, void *userdata,
+    UA_UInt32 *reqId) {
+    return __UA_Client_call_async(
+        client, objectId, methodId, inputSize, input,
+        (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
 }
 
 /**
  * Node Management
  * ^^^^^^^^^^^^^^^ */
-typedef void (*UA_ClientAsyncAddNodesCallback)(UA_Client *client, void *userdata,
-                                               UA_UInt32 requestId,
-                                               UA_AddNodesResponse *ar);
+typedef void
+(*UA_ClientAsyncAddNodesCallback)(
+    UA_Client *client, void *userdata,
+    UA_UInt32 requestId, UA_AddNodesResponse *ar);
 
 UA_StatusCode UA_EXPORT
-__UA_Client_addNode_async(UA_Client *client, const UA_NodeClass nodeClass,
-                          const UA_NodeId requestedNewNodeId,
-                          const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
-                          const UA_QualifiedName browseName,
-                          const UA_NodeId typeDefinition, const UA_NodeAttributes *attr,
-                          const UA_DataType *attributeType, UA_NodeId *outNewNodeId,
-                          UA_ClientAsyncServiceCallback callback, void *userdata,
-                          UA_UInt32 *reqId);
+__UA_Client_addNode_async(
+    UA_Client *client, const UA_NodeClass nodeClass,
+    const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
+    const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
+    const UA_NodeId typeDefinition, const UA_NodeAttributes *attr,
+    const UA_DataType *attributeType, UA_NodeId *outNewNodeId,
+    UA_ClientAsyncServiceCallback callback, void *userdata,
+    UA_UInt32 *reqId);
 
 static UA_INLINE UA_StatusCode
-UA_Client_addVariableNode_async(UA_Client *client, const UA_NodeId requestedNewNodeId,
-                                const UA_NodeId parentNodeId,
-                                const UA_NodeId referenceTypeId,
-                                const UA_QualifiedName browseName,
-                                const UA_NodeId typeDefinition,
-                                const UA_VariableAttributes attr, UA_NodeId *outNewNodeId,
-                                UA_ClientAsyncAddNodesCallback callback, void *userdata,
-                                UA_UInt32 *reqId) {
+UA_Client_addVariableNode_async(
+    UA_Client *client, const UA_NodeId requestedNewNodeId,
+    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+    const UA_QualifiedName browseName, const UA_NodeId typeDefinition,
+    const UA_VariableAttributes attr, UA_NodeId *outNewNodeId,
+    UA_ClientAsyncAddNodesCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_addNode_async(
-        client, UA_NODECLASS_VARIABLE, requestedNewNodeId, parentNodeId, referenceTypeId,
-        browseName, typeDefinition, (const UA_NodeAttributes *)&attr,
+        client, UA_NODECLASS_VARIABLE, requestedNewNodeId,
+        parentNodeId, referenceTypeId, browseName,
+        typeDefinition, (const UA_NodeAttributes *)&attr,
         &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], outNewNodeId,
         (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
 }
 
 static UA_INLINE UA_StatusCode
 UA_Client_addVariableTypeNode_async(
-    UA_Client *client, const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
-    const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
-    const UA_VariableTypeAttributes attr, UA_NodeId *outNewNodeId,
-    UA_ClientAsyncAddNodesCallback callback, void *userdata, UA_UInt32 *reqId) {
+    UA_Client *client, const UA_NodeId requestedNewNodeId,
+    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+    const UA_QualifiedName browseName,
+    const UA_VariableTypeAttributes attr,
+    UA_NodeId *outNewNodeId, UA_ClientAsyncAddNodesCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_addNode_async(
-        client, UA_NODECLASS_VARIABLETYPE, requestedNewNodeId, parentNodeId,
-        referenceTypeId, browseName, UA_NODEID_NULL, (const UA_NodeAttributes *)&attr,
-        &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES], outNewNodeId,
-        (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
+        client, UA_NODECLASS_VARIABLETYPE,
+        requestedNewNodeId, parentNodeId,
+        referenceTypeId, browseName, UA_NODEID_NULL,
+        (const UA_NodeAttributes *)&attr,
+        &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],
+        outNewNodeId, (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
 }
 
 static UA_INLINE UA_StatusCode
-UA_Client_addObjectNode_async(UA_Client *client, const UA_NodeId requestedNewNodeId,
-                              const UA_NodeId parentNodeId,
-                              const UA_NodeId referenceTypeId,
-                              const UA_QualifiedName browseName,
-                              const UA_NodeId typeDefinition,
-                              const UA_ObjectAttributes attr, UA_NodeId *outNewNodeId,
-                              UA_ClientAsyncAddNodesCallback callback, void *userdata,
-                              UA_UInt32 *reqId) {
+UA_Client_addObjectNode_async(
+    UA_Client *client, const UA_NodeId requestedNewNodeId,
+    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+    const UA_QualifiedName browseName, const UA_NodeId typeDefinition,
+    const UA_ObjectAttributes attr, UA_NodeId *outNewNodeId,
+    UA_ClientAsyncAddNodesCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_addNode_async(
-        client, UA_NODECLASS_OBJECT, requestedNewNodeId, parentNodeId, referenceTypeId,
+        client, UA_NODECLASS_OBJECT, requestedNewNodeId,
+        parentNodeId, referenceTypeId,
         browseName, typeDefinition, (const UA_NodeAttributes *)&attr,
         &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], outNewNodeId,
         (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
@@ -628,26 +725,30 @@ UA_Client_addObjectNode_async(UA_Client *client, const UA_NodeId requestedNewNod
 
 static UA_INLINE UA_StatusCode
 UA_Client_addObjectTypeNode_async(
-    UA_Client *client, const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
-    const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
-    const UA_ObjectTypeAttributes attr, UA_NodeId *outNewNodeId,
-    UA_ClientAsyncAddNodesCallback callback, void *userdata, UA_UInt32 *reqId) {
+    UA_Client *client, const UA_NodeId requestedNewNodeId,
+    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+    const UA_QualifiedName browseName,
+    const UA_ObjectTypeAttributes attr,
+    UA_NodeId *outNewNodeId, UA_ClientAsyncAddNodesCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_addNode_async(
         client, UA_NODECLASS_OBJECTTYPE, requestedNewNodeId, parentNodeId,
-        referenceTypeId, browseName, UA_NODEID_NULL, (const UA_NodeAttributes *)&attr,
+        referenceTypeId, browseName, UA_NODEID_NULL,
+        (const UA_NodeAttributes *)&attr,
         &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES], outNewNodeId,
         (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
 }
 
 static UA_INLINE UA_StatusCode
-UA_Client_addViewNode_async(UA_Client *client, const UA_NodeId requestedNewNodeId,
-                            const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
-                            const UA_QualifiedName browseName,
-                            const UA_ViewAttributes attr, UA_NodeId *outNewNodeId,
-                            UA_ClientAsyncAddNodesCallback callback, void *userdata,
-                            UA_UInt32 *reqId) {
+UA_Client_addViewNode_async(
+    UA_Client *client, const UA_NodeId requestedNewNodeId,
+    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+    const UA_QualifiedName browseName, const UA_ViewAttributes attr,
+    UA_NodeId *outNewNodeId, UA_ClientAsyncAddNodesCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_addNode_async(
-        client, UA_NODECLASS_VIEW, requestedNewNodeId, parentNodeId, referenceTypeId,
+        client, UA_NODECLASS_VIEW, requestedNewNodeId,
+        parentNodeId, referenceTypeId,
         browseName, UA_NODEID_NULL, (const UA_NodeAttributes *)&attr,
         &UA_TYPES[UA_TYPES_VIEWATTRIBUTES], outNewNodeId,
         (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
@@ -655,61 +756,50 @@ UA_Client_addViewNode_async(UA_Client *client, const UA_NodeId requestedNewNodeI
 
 static UA_INLINE UA_StatusCode
 UA_Client_addReferenceTypeNode_async(
-    UA_Client *client, const UA_NodeId requestedNewNodeId, const UA_NodeId parentNodeId,
-    const UA_NodeId referenceTypeId, const UA_QualifiedName browseName,
-    const UA_ReferenceTypeAttributes attr, UA_NodeId *outNewNodeId,
-    UA_ClientAsyncAddNodesCallback callback, void *userdata, UA_UInt32 *reqId) {
+    UA_Client *client, const UA_NodeId requestedNewNodeId,
+    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+    const UA_QualifiedName browseName,
+    const UA_ReferenceTypeAttributes attr,
+    UA_NodeId *outNewNodeId, UA_ClientAsyncAddNodesCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_addNode_async(
         client, UA_NODECLASS_REFERENCETYPE, requestedNewNodeId, parentNodeId,
-        referenceTypeId, browseName, UA_NODEID_NULL, (const UA_NodeAttributes *)&attr,
+        referenceTypeId, browseName, UA_NODEID_NULL,
+        (const UA_NodeAttributes *)&attr,
         &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES], outNewNodeId,
         (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
 }
 
 static UA_INLINE UA_StatusCode
-UA_Client_addDataTypeNode_async(UA_Client *client, const UA_NodeId requestedNewNodeId,
-                                const UA_NodeId parentNodeId,
-                                const UA_NodeId referenceTypeId,
-                                const UA_QualifiedName browseName,
-                                const UA_DataTypeAttributes attr, UA_NodeId *outNewNodeId,
-                                UA_ClientAsyncAddNodesCallback callback, void *userdata,
-                                UA_UInt32 *reqId) {
+UA_Client_addDataTypeNode_async(
+    UA_Client *client, const UA_NodeId requestedNewNodeId,
+    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+    const UA_QualifiedName browseName, const UA_DataTypeAttributes attr,
+    UA_NodeId *outNewNodeId, UA_ClientAsyncAddNodesCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_addNode_async(
-        client, UA_NODECLASS_DATATYPE, requestedNewNodeId, parentNodeId, referenceTypeId,
-        browseName, UA_NODEID_NULL, (const UA_NodeAttributes *)&attr,
+        client, UA_NODECLASS_DATATYPE, requestedNewNodeId,
+        parentNodeId, referenceTypeId, browseName,
+        UA_NODEID_NULL, (const UA_NodeAttributes *)&attr,
         &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES], outNewNodeId,
         (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
 }
 
 static UA_INLINE UA_StatusCode
-UA_Client_addMethodNode_async(UA_Client *client, const UA_NodeId requestedNewNodeId,
-                              const UA_NodeId parentNodeId,
-                              const UA_NodeId referenceTypeId,
-                              const UA_QualifiedName browseName,
-                              const UA_MethodAttributes attr, UA_NodeId *outNewNodeId,
-                              UA_ClientAsyncAddNodesCallback callback, void *userdata,
-                              UA_UInt32 *reqId) {
+UA_Client_addMethodNode_async(
+    UA_Client *client, const UA_NodeId requestedNewNodeId,
+    const UA_NodeId parentNodeId, const UA_NodeId referenceTypeId,
+    const UA_QualifiedName browseName, const UA_MethodAttributes attr,
+    UA_NodeId *outNewNodeId, UA_ClientAsyncAddNodesCallback callback,
+    void *userdata, UA_UInt32 *reqId) {
     return __UA_Client_addNode_async(
-        client, UA_NODECLASS_METHOD, requestedNewNodeId, parentNodeId, referenceTypeId,
-        browseName, UA_NODEID_NULL, (const UA_NodeAttributes *)&attr,
+        client, UA_NODECLASS_METHOD, requestedNewNodeId, parentNodeId,
+        referenceTypeId, browseName, UA_NODEID_NULL,
+        (const UA_NodeAttributes *)&attr,
         &UA_TYPES[UA_TYPES_METHODATTRIBUTES], outNewNodeId,
         (UA_ClientAsyncServiceCallback)callback, userdata, reqId);
 }
 
-/**
- * Misc Functionalities
- * ^^^^^^^^^^^^^^^^^^^^ */
-
-/* typedef void (*UA_ClientAsyncTranslateCallback)( */
-/*     UA_Client *client, void *userdata, UA_UInt32 requestId, */
-/*     UA_TranslateBrowsePathsToNodeIdsResponse *tr); */
-
-/* UA_DEPRECATED UA_StatusCode UA_EXPORT */
-/* UA_Cient_translateBrowsePathsToNodeIds_async(UA_Client *client, char **paths, */
-/*                                              UA_UInt32 *ids, size_t pathSize, */
-/*                                              UA_ClientAsyncTranslateCallback callback, */
-/*                                              void *userdata, UA_UInt32 *reqId); */
-
 _UA_END_DECLS
 
 #endif /* UA_CLIENT_HIGHLEVEL_ASYNC_H_ */

From 80e039544840ef9dea597082c3f236f4b5f7ebd1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Mar 2024 22:10:52 +0100
Subject: [PATCH 1442/1963] refactor(doc): Move the service descriptions to
 core_concepts.rst

---
 doc/CMakeLists.txt       |   1 -
 doc/core_concepts.rst    | 259 ++++++++++++++++++++++++++++
 doc/toc.rst              |   3 +-
 src/server/ua_services.h | 356 +++------------------------------------
 4 files changed, 284 insertions(+), 335 deletions(-)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a080f96d37f..d1f3de64a88 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -44,7 +44,6 @@ generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client_subscriptions.h ${DO
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client.h ${DOC_SRC_DIR}/client.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client_highlevel.h ${DOC_SRC_DIR}/client_highlevel.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/client_highlevel_async.h ${DOC_SRC_DIR}/client_highlevel_async.rst)
-generate_rst(${PROJECT_SOURCE_DIR}/src/server/ua_services.h ${DOC_SRC_DIR}/services.rst)
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/server_pubsub.h ${DOC_SRC_DIR}/pubsub.rst)
 
 generate_rst(${PROJECT_SOURCE_DIR}/include/open62541/plugin/accesscontrol.h ${DOC_SRC_DIR}/plugin_accesscontrol.rst)
diff --git a/doc/core_concepts.rst b/doc/core_concepts.rst
index 2d22dcfb086..1e7e00726a3 100644
--- a/doc/core_concepts.rst
+++ b/doc/core_concepts.rst
@@ -158,6 +158,265 @@ The bottom right window shows the binary payload of the selected *ReadRequest*
 message. The message header is highlighted in light-grey. The message body in
 blue highlighting shows the encoded *ReadRequest* data structure.
 
+.. _services:
+
+Services
+--------
+
+In OPC UA, all communication is based on service calls, each consisting of a
+request and a response message. These messages are defined as data structures
+with a binary encoding and listed in :ref:`generated-types`. Since all
+Services are pre-defined in the standard, they cannot be modified by the
+user. But you can use the :ref:`Call <method-services>` service to invoke
+user-defined methods on the server.
+
+Please refer to the :ref:`client` and :ref:`server` API where the services
+are exposed to end users. Please see part 4 of the OPC UA standard for the
+authoritative definition of the services and their behaviour.
+   
+Discovery Service Set
+~~~~~~~~~~~~~~~~~~~~~
+This Service Set defines Services used to discover the Endpoints implemented
+by a Server and to read the security configuration for those Endpoints.
+
+FindServers Service
+   Returns the Servers known to a Server or Discovery Server. The Client may
+   reduce the number of results returned by specifying filter criteria
+
+GetEndpoints Service
+   Returns the Endpoints supported by a Server and all of the configuration
+   information required to establish a SecureChannel and a Session.
+
+FindServersOnNetwork Service
+   Returns the Servers known to a Discovery Server. Unlike FindServer,
+   this Service is only implemented by Discovery Servers. It additionally
+   returns servers which may have been detected through Multicast.
+
+RegisterServer
+   Registers a remote server in the local discovery service.
+
+RegisterServer2
+   This Service allows a Server to register its DiscoveryUrls and capabilities
+   with a Discovery Server. It extends the registration information from
+   RegisterServer with information necessary for FindServersOnNetwork.
+
+SecureChannel Service Set
+~~~~~~~~~~~~~~~~~~~~~~~~~
+This Service Set defines Services used to open a communication channel that
+ensures the confidentiality and Integrity of all Messages exchanged with the
+Server.
+
+OpenSecureChannel Service
+   Open or renew a SecureChannel that can be used to ensure Confidentiality and
+   Integrity for Message exchange during a Session.
+
+CloseSecureChannel Service
+   Used to terminate a SecureChannel.
+
+Session Service Set
+   This Service Set defines Services for an application layer connection
+   establishment in the context of a Session.
+
+CreateSession Service
+   Used by an OPC UA Client to create a Session and the Server returns two
+   values which uniquely identify the Session. The first value is the sessionId
+   which is used to identify the Session in the audit logs and in the Server's
+   address space. The second is the authenticationToken which is used to
+   associate an incoming request with a Session.
+
+ActivateSession
+   Used by the Client to submit its SoftwareCertificates to the Server for
+   validation and to specify the identity of the user associated with the
+   Session. This Service request shall be issued by the Client before it issues
+   any other Service request after CreateSession. Failure to do so shall cause
+   the Server to close the Session.
+
+CloseSession
+   Used to terminate a Session.
+   
+Cancel Service
+   Used to cancel outstanding Service requests. Successfully cancelled service
+   requests shall respond with Bad_RequestCancelledByClient.
+
+NodeManagement Service Set
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+This Service Set defines Services to add and delete AddressSpace Nodes and
+References between them. All added Nodes continue to exist in the
+AddressSpace even if the Client that created them disconnects from the
+Server.
+
+AddNodes Service
+   Used to add one or more Nodes into the AddressSpace hierarchy.
+   If the type or one of the supertypes has any HasInterface references
+   (see OPC 10001-7 - Amendment 7, 4.9.2), the child nodes of the interfaces
+   are added to the new object.
+
+AddReferences Service
+   Used to add one or more References to one or more Nodes.
+
+DeleteNodes Service
+   Used to delete one or more Nodes from the AddressSpace.
+
+DeleteReferences
+   Used to delete one or more References of a Node.
+
+.. _view-services:
+
+View Service Set
+~~~~~~~~~~~~~~~~
+Clients use the browse Services of the View Service Set to navigate through
+the AddressSpace or through a View which is a subset of the AddressSpace.
+
+Browse Service
+   Used to discover the References of a specified Node. The browse can be
+   further limited by the use of a View. This Browse Service also supports a
+   primitive filtering capability.
+
+BrowseNext Service
+   Used to request the next set of Browse or BrowseNext response information
+   that is too large to be sent in a single response. "Too large" in this
+   context means that the Server is not able to return a larger response or that
+   the number of results to return exceeds the maximum number of results to
+   return that was specified by the Client in the original Browse request.
+
+TranslateBrowsePathsToNodeIds Service
+   Used to translate textual node paths to their respective ids.
+
+RegisterNodes Service
+   Used by Clients to register the Nodes that they know they will access
+   repeatedly (e.g. Write, Call). It allows Servers to set up anything needed so
+   that the access operations will be more efficient.
+
+UnregisterNodes Service
+   This Service is used to unregister NodeIds that have been obtained via the
+   RegisterNodes service.
+
+Query Service Set
+~~~~~~~~~~~~~~~~~
+This Service Set is used to issue a Query to a Server. OPC UA Query is
+generic in that it provides an underlying storage mechanism independent Query
+capability that can be used to access a wide variety of OPC UA data stores
+and information management systems. OPC UA Query permits a Client to access
+data maintained by a Server without any knowledge of the logical schema used
+for internal storage of the data. Knowledge of the AddressSpace is
+sufficient.
+
+QueryFirst Service (not implemented)
+   This Service is used to issue a Query request to the Server.
+
+QueryNext Service (not implemented)
+   This Service is used to request the next set of QueryFirst or QueryNext
+   response information that is too large to be sent in a single response.
+
+Attribute Service Set
+~~~~~~~~~~~~~~~~~~~~~
+This Service Set provides Services to access Attributes that are part of
+Nodes.
+
+Read Service
+   Used to read attributes of nodes. For constructed attribute values whose
+   elements are indexed, such as an array, this Service allows Clients to read
+   the entire set of indexed values as a composite, to read individual elements
+   or to read ranges of elements of the composite.
+
+Write Service
+   Used to write attributes of nodes. For constructed attribute values whose
+   elements are indexed, such as an array, this Service allows Clients to write
+   the entire set of indexed values as a composite, to write individual elements
+   or to write ranges of elements of the composite.
+
+HistoryRead Service
+   Used to read historical values or Events of one or more Nodes. Servers may
+   make historical values available to Clients using this Service, although the
+   historical values themselves are not visible in the AddressSpace.
+
+HistoryUpdate Service
+   Used to update historical values or Events of one or more Nodes. Several
+   request parameters indicate how the Server is to update the historical value
+   or Event. Valid actions are Insert, Replace or Delete.
+
+.. _method-services:
+
+Method Service Set
+~~~~~~~~~~~~~~~~~~
+The Method Service Set defines the means to invoke methods. A method shall be
+a component of an Object. See the section on :ref:`MethodNodes <methodnode>`
+for more information.
+
+Call Service
+   Used to call (invoke) a methods. Each method call is invoked within the
+   context of an existing Session. If the Session is terminated, the results of
+   the method's execution cannot be returned to the Client and are discarded.
+
+MonitoredItem Service Set
+~~~~~~~~~~~~~~~~~~~~~~~~~
+Clients define MonitoredItems to subscribe to data and Events. Each
+MonitoredItem identifies the item to be monitored and the Subscription to use
+to send Notifications. The item to be monitored may be any Node Attribute.
+
+CreateMonitoredItems Service
+   Used to create and add one or more MonitoredItems to a Subscription. A
+   MonitoredItem is deleted automatically by the Server when the Subscription is
+   deleted. Deleting a MonitoredItem causes its entire set of triggered item
+   links to be deleted, but has no effect on the MonitoredItems referenced by
+   the triggered items.
+
+DeleteMonitoredItems Service
+   Used to remove one or more MonitoredItems of a Subscription. When a
+   MonitoredItem is deleted, its triggered item links are also deleted.
+
+ModifyMonitoredItems Service
+   Used to modify MonitoredItems of a Subscription. Changes to the MonitoredItem
+   settings shall be applied immediately by the Server. They take effect as soon
+   as practical but not later than twice the new revisedSamplingInterval.
+
+   Illegal request values for parameters that can be revised do not generate
+   errors. Instead the server will choose default values and indicate them in
+   the corresponding revised parameter.
+
+SetMonitoringMode Service
+   Used to set the monitoring mode for one or more MonitoredItems of a
+   Subscription.
+
+SetTriggering Service
+   Used to create and delete triggering links for a triggering item.
+
+Subscription Service Set
+~~~~~~~~~~~~~~~~~~~~~~~~
+Subscriptions are used to report Notifications to the Client.
+
+CreateSubscription Service
+   Used to create a Subscription. Subscriptions monitor a set of MonitoredItems
+   for Notifications and return them to the Client in response to Publish
+   requests.
+
+ModifySubscription Service
+   Used to modify a Subscription.
+
+SetPublishingMode Service
+   Used to enable sending of Notifications on one or more Subscriptions.
+
+Publish Service
+   Used for two purposes. First, it is used to acknowledge the receipt of
+   NotificationMessages for one or more Subscriptions. Second, it is used to
+   request the Server to return a NotificationMessage or a keep-alive
+   Message.
+
+Republish Service
+   Requests the Subscription to republish a NotificationMessage from its
+   retransmission queue.
+
+DeleteSubscriptions Service
+   Invoked to delete one or more Subscriptions that belong to the Client's
+   Session.
+
+TransferSubscription Service
+   Used to transfer a Subscription and its MonitoredItems from one Session to
+   another. For example, a Client may need to reopen a Session and then transfer
+   its Subscriptions to that Session. It may also be used by one Client to take
+   over a Subscription from another Client by transferring the Subscription to
+   its Session.
+
 .. _information-modelling:
 
 Information Modelling
diff --git a/doc/toc.rst b/doc/toc.rst
index b692e2f27b4..ea4f44dcbea 100644
--- a/doc/toc.rst
+++ b/doc/toc.rst
@@ -6,12 +6,11 @@ open62541 Documentation
    index
    core_concepts
    building
-   tutorials
    types
-   services
    server
    client
    pubsub
+   tutorials
    common
    nodeset_compiler
    statuscodes
diff --git a/src/server/ua_services.h b/src/server/ua_services.h
index 789e0b74f57..6bc8b1262af 100644
--- a/src/server/ua_services.h
+++ b/src/server/ua_services.h
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- *    Copyright 2014-2017 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
+ *    Copyright 2014-2017, 2024 (c) Fraunhofer IOSB (Author: Julius Pfrommer)
  *    Copyright 2014-2017 (c) Florian Palm
  *    Copyright 2015 (c) Sten Grüner
  *    Copyright 2014 (c) LEvertz
@@ -16,352 +16,129 @@
 #define UA_SERVICES_H_
 
 #include <open62541/server.h>
-
 #include "ua_session.h"
 
 _UA_BEGIN_DECLS
 
-/**
- * .. _services:
- *
- * Services
- * ========
- *
- * In OPC UA, all communication is based on service calls, each consisting of a
- * request and a response message. These messages are defined as data structures
- * with a binary encoding and listed in :ref:`generated-types`. Since all
- * Services are pre-defined in the standard, they cannot be modified by the
- * user. But you can use the :ref:`Call <method-services>` service to invoke
- * user-defined methods on the server.
- *
- * The following service signatures are internal and *not visible to users*.
- * Still, we present them here for an overview of the capabilities of OPC UA.
- * Please refer to the :ref:`client` and :ref:`server` API where the services
- * are exposed to end users. Please see part 4 of the OPC UA standard for the
- * authoritative definition of the service and their behaviour.
- *
- * Most services take as input the server, the current session and pointers to
- * the request and response structures. Possible error codes are returned as
- * part of the response. */
-
 typedef void (*UA_Service)(UA_Server*, UA_Session*,
                            const void *request, void *response);
 
 typedef void (*UA_ChannelService)(UA_Server*, UA_SecureChannel*,
                                   const void *request, void *response);
 
-/**
- * Discovery Service Set
- * ---------------------
- * This Service Set defines Services used to discover the Endpoints implemented
- * by a Server and to read the security configuration for those Endpoints.
- *
- * FindServers Service
- * ^^^^^^^^^^^^^^^^^^^
- * Returns the Servers known to a Server or Discovery Server. The Client may
- * reduce the number of results returned by specifying filter criteria */
+/** Discovery Service Set **/
 void Service_FindServers(UA_Server *server, UA_Session *session,
                          const UA_FindServersRequest *request,
                          UA_FindServersResponse *response);
 
-/**
- * GetEndpoints Service
- * ^^^^^^^^^^^^^^^^^^^^
- * Returns the Endpoints supported by a Server and all of the configuration
- * information required to establish a SecureChannel and a Session. */
 void Service_GetEndpoints(UA_Server *server, UA_Session *session,
                           const UA_GetEndpointsRequest *request,
                           UA_GetEndpointsResponse *response);
 
 #ifdef UA_ENABLE_DISCOVERY
 
-# ifdef UA_ENABLE_DISCOVERY_MULTICAST
-
-/**
- * FindServersOnNetwork Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Returns the Servers known to a Discovery Server. Unlike FindServer,
- * this Service is only implemented by Discovery Servers. It additionally
- * returns servers which may have been detected through Multicast. */
-void Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
-                                  const UA_FindServersOnNetworkRequest *request,
-                                  UA_FindServersOnNetworkResponse *response);
-
-# endif /* UA_ENABLE_DISCOVERY_MULTICAST */
-
-/**
- * RegisterServer
- * ^^^^^^^^^^^^^^
- * Registers a remote server in the local discovery service. */
 void Service_RegisterServer(UA_Server *server, UA_Session *session,
                             const UA_RegisterServerRequest *request,
                             UA_RegisterServerResponse *response);
 
-/**
- * RegisterServer2
- * ^^^^^^^^^^^^^^^
- * This Service allows a Server to register its DiscoveryUrls and capabilities
- * with a Discovery Server. It extends the registration information from
- * RegisterServer with information necessary for FindServersOnNetwork. */
 void Service_RegisterServer2(UA_Server *server, UA_Session *session,
                             const UA_RegisterServer2Request *request,
                             UA_RegisterServer2Response *response);
 
+# ifdef UA_ENABLE_DISCOVERY_MULTICAST
+
+void Service_FindServersOnNetwork(UA_Server *server, UA_Session *session,
+                                  const UA_FindServersOnNetworkRequest *request,
+                                  UA_FindServersOnNetworkResponse *response);
+
+# endif /* UA_ENABLE_DISCOVERY_MULTICAST */
+
 #endif /* UA_ENABLE_DISCOVERY */
 
-/**
- * SecureChannel Service Set
- * -------------------------
- * This Service Set defines Services used to open a communication channel that
- * ensures the confidentiality and Integrity of all Messages exchanged with the
- * Server.
- *
- * OpenSecureChannel Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- * Open or renew a SecureChannel that can be used to ensure Confidentiality and
- * Integrity for Message exchange during a Session. */
+/** SecureChannel Service Set **/
 void Service_OpenSecureChannel(UA_Server *server, UA_SecureChannel* channel,
                                UA_OpenSecureChannelRequest *request,
                                UA_OpenSecureChannelResponse *response);
 
-/**
- * CloseSecureChannel Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to terminate a SecureChannel. */
 void Service_CloseSecureChannel(UA_Server *server, UA_SecureChannel *channel);
 
-/**
- * Session Service Set
- * -------------------
- * This Service Set defines Services for an application layer connection
- * establishment in the context of a Session.
- *
- * CreateSession Service
- * ^^^^^^^^^^^^^^^^^^^^^
- * Used by an OPC UA Client to create a Session and the Server returns two
- * values which uniquely identify the Session. The first value is the sessionId
- * which is used to identify the Session in the audit logs and in the Server's
- * address space. The second is the authenticationToken which is used to
- * associate an incoming request with a Session. */
+/** Session Service Set **/
 void Service_CreateSession(UA_Server *server, UA_SecureChannel *channel,
                            const UA_CreateSessionRequest *request,
                            UA_CreateSessionResponse *response);
 
-/**
- * ActivateSession
- * ^^^^^^^^^^^^^^^
- * Used by the Client to submit its SoftwareCertificates to the Server for
- * validation and to specify the identity of the user associated with the
- * Session. This Service request shall be issued by the Client before it issues
- * any other Service request after CreateSession. Failure to do so shall cause
- * the Server to close the Session. */
 void Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
                              const UA_ActivateSessionRequest *request,
                              UA_ActivateSessionResponse *response);
 
-/**
- * CloseSession
- * ^^^^^^^^^^^^
- * Used to terminate a Session. */
 void Service_CloseSession(UA_Server *server, UA_SecureChannel *channel,
                           const UA_CloseSessionRequest *request,
                           UA_CloseSessionResponse *response);
 
-/**
- * Cancel Service
- * ^^^^^^^^^^^^^^
- * Used to cancel outstanding Service requests. Successfully cancelled service
- * requests shall respond with Bad_RequestCancelledByClient. */
 void Service_Cancel(UA_Server *server, UA_Session *session,
                     const UA_CancelRequest *request,
                     UA_CancelResponse *response);
 
-/**
- * NodeManagement Service Set
- * --------------------------
- * This Service Set defines Services to add and delete AddressSpace Nodes and
- * References between them. All added Nodes continue to exist in the
- * AddressSpace even if the Client that created them disconnects from the
- * Server.
- *
- * AddNodes Service
- * ^^^^^^^^^^^^^^^^
- * Used to add one or more Nodes into the AddressSpace hierarchy.
- * If the type or one of the supertypes has any HasInterface references
- * (see OPC 10001-7 - Amendment 7, 4.9.2), the child nodes of the interfaces
- * are added to the new object.
-*/
+/** NodeManagement Service Set **/
 void Service_AddNodes(UA_Server *server, UA_Session *session,
                       const UA_AddNodesRequest *request,
                       UA_AddNodesResponse *response);
 
-/**
- * AddReferences Service
- * ^^^^^^^^^^^^^^^^^^^^^
- * Used to add one or more References to one or more Nodes.*/
 void Service_AddReferences(UA_Server *server, UA_Session *session,
                            const UA_AddReferencesRequest *request,
                            UA_AddReferencesResponse *response);
 
-/**
- * DeleteNodes Service
- * ^^^^^^^^^^^^^^^^^^^
- * Used to delete one or more Nodes from the AddressSpace. */
 void Service_DeleteNodes(UA_Server *server, UA_Session *session,
                          const UA_DeleteNodesRequest *request,
                          UA_DeleteNodesResponse *response);
 
-/**
- * DeleteReferences
- * ^^^^^^^^^^^^^^^^
- * Used to delete one or more References of a Node. */
 void Service_DeleteReferences(UA_Server *server, UA_Session *session,
                               const UA_DeleteReferencesRequest *request,
                               UA_DeleteReferencesResponse *response);
 
-/**
- * .. _view-services:
- *
- * View Service Set
- * ----------------
- * Clients use the browse Services of the View Service Set to navigate through
- * the AddressSpace or through a View which is a subset of the AddressSpace.
- *
- * Browse Service
- * ^^^^^^^^^^^^^^
- * Used to discover the References of a specified Node. The browse can be
- * further limited by the use of a View. This Browse Service also supports a
- * primitive filtering capability. */
+/** View Service Set **/
 void Service_Browse(UA_Server *server, UA_Session *session,
                     const UA_BrowseRequest *request,
                     UA_BrowseResponse *response);
 
-/**
- * BrowseNext Service
- * ^^^^^^^^^^^^^^^^^^
- * Used to request the next set of Browse or BrowseNext response information
- * that is too large to be sent in a single response. "Too large" in this
- * context means that the Server is not able to return a larger response or that
- * the number of results to return exceeds the maximum number of results to
- * return that was specified by the Client in the original Browse request. */
 void Service_BrowseNext(UA_Server *server, UA_Session *session,
                         const UA_BrowseNextRequest *request,
                         UA_BrowseNextResponse *response);
 
-/**
- * TranslateBrowsePathsToNodeIds Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to translate textual node paths to their respective ids. */
 void Service_TranslateBrowsePathsToNodeIds(UA_Server *server, UA_Session *session,
              const UA_TranslateBrowsePathsToNodeIdsRequest *request,
              UA_TranslateBrowsePathsToNodeIdsResponse *response);
 
-/**
- * RegisterNodes Service
- * ^^^^^^^^^^^^^^^^^^^^^
- * Used by Clients to register the Nodes that they know they will access
- * repeatedly (e.g. Write, Call). It allows Servers to set up anything needed so
- * that the access operations will be more efficient. */
 void Service_RegisterNodes(UA_Server *server, UA_Session *session,
                            const UA_RegisterNodesRequest *request,
                            UA_RegisterNodesResponse *response);
 
-/**
- * UnregisterNodes Service
- * ^^^^^^^^^^^^^^^^^^^^^^^
- * This Service is used to unregister NodeIds that have been obtained via the
- * RegisterNodes service. */
 void Service_UnregisterNodes(UA_Server *server, UA_Session *session,
                              const UA_UnregisterNodesRequest *request,
                              UA_UnregisterNodesResponse *response);
 
-/**
- * Query Service Set
- * -----------------
- * This Service Set is used to issue a Query to a Server. OPC UA Query is
- * generic in that it provides an underlying storage mechanism independent Query
- * capability that can be used to access a wide variety of OPC UA data stores
- * and information management systems. OPC UA Query permits a Client to access
- * data maintained by a Server without any knowledge of the logical schema used
- * for internal storage of the data. Knowledge of the AddressSpace is
- * sufficient.
- *
- * QueryFirst Service
- * ^^^^^^^^^^^^^^^^^^
- * This Service is used to issue a Query request to the Server. */
-/* Not Implemented */
-
-/**
- * QueryNext Service
- * ^^^^^^^^^^^^^^^^^
- * This Service is used to request the next set of QueryFirst or QueryNext
- * response information that is too large to be sent in a single response. */
-/* Not Impelemented */
-
-/**
- * Attribute Service Set
- * ---------------------
- * This Service Set provides Services to access Attributes that are part of
- * Nodes.
- *
- * Read Service
- * ^^^^^^^^^^^^
- * Used to read attributes of nodes. For constructed attribute values whose
- * elements are indexed, such as an array, this Service allows Clients to read
- * the entire set of indexed values as a composite, to read individual elements
- * or to read ranges of elements of the composite. */
+/** Query Service Set (not implemented) **/
+
+/** Attribute Service Set **/
 void Service_Read(UA_Server *server, UA_Session *session,
                   const UA_ReadRequest *request,
                   UA_ReadResponse *response);
 
-/**
- * Write Service
- * ^^^^^^^^^^^^^
- * Used to write attributes of nodes. For constructed attribute values whose
- * elements are indexed, such as an array, this Service allows Clients to write
- * the entire set of indexed values as a composite, to write individual elements
- * or to write ranges of elements of the composite. */
 void Service_Write(UA_Server *server, UA_Session *session,
                    const UA_WriteRequest *request,
                    UA_WriteResponse *response);
 
-/**
- * HistoryRead Service
- * ^^^^^^^^^^^^^^^^^^^
- * Used to read historical values or Events of one or more Nodes. Servers may
- * make historical values available to Clients using this Service, although the
- * historical values themselves are not visible in the AddressSpace. */
 #ifdef UA_ENABLE_HISTORIZING
 void Service_HistoryRead(UA_Server *server, UA_Session *session,
                          const UA_HistoryReadRequest *request,
                          UA_HistoryReadResponse *response);
 
-/**
- * HistoryUpdate Service
- * ^^^^^^^^^^^^^^^^^^^^^
- * Used to update historical values or Events of one or more Nodes. Several
- * request parameters indicate how the Server is to update the historical value
- * or Event. Valid actions are Insert, Replace or Delete. */
-void
-Service_HistoryUpdate(UA_Server *server, UA_Session *session,
-                      const UA_HistoryUpdateRequest *request,
-                      UA_HistoryUpdateResponse *response);
+void Service_HistoryUpdate(UA_Server *server, UA_Session *session,
+                           const UA_HistoryUpdateRequest *request,
+                           UA_HistoryUpdateResponse *response);
 #endif
 
-/**
- * .. _method-services:
- *
- * Method Service Set
- * ------------------
- * The Method Service Set defines the means to invoke methods. A method shall be
- * a component of an Object. See the section on :ref:`MethodNodes <methodnode>`
- * for more information.
- *
- * Call Service
- * ^^^^^^^^^^^^
- * Used to call (invoke) a methods. Each method call is invoked within the
- * context of an existing Session. If the Session is terminated, the results of
- * the method's execution cannot be returned to the Client and are discarded. */
+/** Method Service Set **/
 #ifdef UA_ENABLE_METHODCALLS
 void Service_Call(UA_Server *server, UA_Session *session,
                   const UA_CallRequest *request,
@@ -376,138 +153,53 @@ void Service_CallAsync(UA_Server *server, UA_Session *session, UA_UInt32 request
 
 #ifdef UA_ENABLE_SUBSCRIPTIONS
 
-/**
- * MonitoredItem Service Set
- * -------------------------
- * Clients define MonitoredItems to subscribe to data and Events. Each
- * MonitoredItem identifies the item to be monitored and the Subscription to use
- * to send Notifications. The item to be monitored may be any Node Attribute.
- *
- * CreateMonitoredItems Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to create and add one or more MonitoredItems to a Subscription. A
- * MonitoredItem is deleted automatically by the Server when the Subscription is
- * deleted. Deleting a MonitoredItem causes its entire set of triggered item
- * links to be deleted, but has no effect on the MonitoredItems referenced by
- * the triggered items. */
+/** MonitoredItem Service Set **/
 void Service_CreateMonitoredItems(UA_Server *server, UA_Session *session,
                                   const UA_CreateMonitoredItemsRequest *request,
                                   UA_CreateMonitoredItemsResponse *response);
 
-/**
- * DeleteMonitoredItems Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to remove one or more MonitoredItems of a Subscription. When a
- * MonitoredItem is deleted, its triggered item links are also deleted. */
 void Service_DeleteMonitoredItems(UA_Server *server, UA_Session *session,
                                   const UA_DeleteMonitoredItemsRequest *request,
                                   UA_DeleteMonitoredItemsResponse *response);
 
-/**
- * ModifyMonitoredItems Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to modify MonitoredItems of a Subscription. Changes to the MonitoredItem
- * settings shall be applied immediately by the Server. They take effect as soon
- * as practical but not later than twice the new revisedSamplingInterval.
- *
- * Illegal request values for parameters that can be revised do not generate
- * errors. Instead the server will choose default values and indicate them in
- * the corresponding revised parameter. */
 void Service_ModifyMonitoredItems(UA_Server *server, UA_Session *session,
                                   const UA_ModifyMonitoredItemsRequest *request,
                                   UA_ModifyMonitoredItemsResponse *response);
 
-/**
- * SetMonitoringMode Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to set the monitoring mode for one or more MonitoredItems of a
- * Subscription. */
 void Service_SetMonitoringMode(UA_Server *server, UA_Session *session,
                                const UA_SetMonitoringModeRequest *request,
                                UA_SetMonitoringModeResponse *response);
 
-/**
- * SetTriggering Service
- * ^^^^^^^^^^^^^^^^^^^^^
- * Used to create and delete triggering links for a triggering item. */
 void Service_SetTriggering(UA_Server *server, UA_Session *session,
                            const UA_SetTriggeringRequest *request,
                            UA_SetTriggeringResponse *response);
 
-/**
- * Subscription Service Set
- * ------------------------
- * Subscriptions are used to report Notifications to the Client.
- *
- * CreateSubscription Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to create a Subscription. Subscriptions monitor a set of MonitoredItems
- * for Notifications and return them to the Client in response to Publish
- * requests. */
+/** Subscription Service Set **/
 void Service_CreateSubscription(UA_Server *server, UA_Session *session,
                                 const UA_CreateSubscriptionRequest *request,
                                 UA_CreateSubscriptionResponse *response);
 
-/**
- * ModifySubscription Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to modify a Subscription. */
 void Service_ModifySubscription(UA_Server *server, UA_Session *session,
                                 const UA_ModifySubscriptionRequest *request,
                                 UA_ModifySubscriptionResponse *response);
 
-/**
- * SetPublishingMode Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to enable sending of Notifications on one or more Subscriptions. */
 void Service_SetPublishingMode(UA_Server *server, UA_Session *session,
                                const UA_SetPublishingModeRequest *request,
                                UA_SetPublishingModeResponse *response);
 
-/**
- * Publish Service
- * ^^^^^^^^^^^^^^^
- * Used for two purposes. First, it is used to acknowledge the receipt of
- * NotificationMessages for one or more Subscriptions. Second, it is used to
- * request the Server to return a NotificationMessage or a keep-alive
- * Message.
- *
- * Note that the service signature is an exception and does not contain a
- * pointer to a PublishResponse. That is because the service queues up publish
- * requests internally and sends responses asynchronously based on timeouts.
- *
- * Also, this is the only service method that returns a StatusCode. This
- * simplifies keeping track of the diagnostics statistics. */
+/* Special async service. Do not answer if StatusCode == Good. */
 UA_StatusCode
 Service_Publish(UA_Server *server, UA_Session *session,
                 const UA_PublishRequest *request, UA_UInt32 requestId);
 
-/**
- * Republish Service
- * ^^^^^^^^^^^^^^^^^
- * Requests the Subscription to republish a NotificationMessage from its
- * retransmission queue. */
 void Service_Republish(UA_Server *server, UA_Session *session,
                        const UA_RepublishRequest *request,
                        UA_RepublishResponse *response);
 
-/**
- * DeleteSubscriptions Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Invoked to delete one or more Subscriptions that belong to the Client's
- * Session. */
 void Service_DeleteSubscriptions(UA_Server *server, UA_Session *session,
                                  const UA_DeleteSubscriptionsRequest *request,
                                  UA_DeleteSubscriptionsResponse *response);
 
-/**
- * TransferSubscription Service
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Used to transfer a Subscription and its MonitoredItems from one Session to
- * another. For example, a Client may need to reopen a Session and then transfer
- * its Subscriptions to that Session. It may also be used by one Client to take
- * over a Subscription from another Client by transferring the Subscription to
- * its Session. */
 void Service_TransferSubscriptions(UA_Server *server, UA_Session *session,
                                    const UA_TransferSubscriptionsRequest *request,
                                    UA_TransferSubscriptionsResponse *response);

From ffc18871af9ee141c5294e0448ce92440cc20123 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 17 Mar 2024 22:12:00 +0100
Subject: [PATCH 1443/1963] refactor(server): Better line breaks in server.h

---
 include/open62541/server.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 376c9af1374..397663de620 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -1886,12 +1886,14 @@ typedef union {
  *        be set in UA_Server_setAsyncOperationResult in any case.
  * @return false if queue is empty, true else */
 UA_Boolean UA_EXPORT
-UA_Server_getAsyncOperationNonBlocking(UA_Server *server, UA_AsyncOperationType *type,
+UA_Server_getAsyncOperationNonBlocking(UA_Server *server,
+                                       UA_AsyncOperationType *type,
                                        const UA_AsyncOperationRequest **request,
                                        void **context, UA_DateTime *timeout);
 
 /* UA_Boolean UA_EXPORT */
-/* UA_Server_getAsyncOperationBlocking(UA_Server *server, UA_AsyncOperationType *type, */
+/* UA_Server_getAsyncOperationBlocking(UA_Server *server, */
+/*                                     UA_AsyncOperationType *type, */
 /*                                     const UA_AsyncOperationRequest **request, */
 /*                                     void **context, UA_DateTime *timeout); */
 

From 828c4c9c2c71ac2dfad72516b7ef98b18d544c88 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Tue, 19 Mar 2024 12:23:09 +0100
Subject: [PATCH 1444/1963] fix(pubsub): Set readergroup state to operational
 after restart

Set the state of a readergroup with UA_PUBSUB_RT_FIXED_SIZE to
UA_PUBSUBSTATE_OPERATIONAL also after several disable and endable
calls. The buffered network message is not reset when disabling a
readergroup.
---
 src/pubsub/ua_pubsub_reader.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 83e28247bfc..fef7b2bc9ae 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -1126,7 +1126,7 @@ UA_ReaderGroup_process(UA_Server *server, UA_ReaderGroup *readerGroup,
  ********************************************************************************/
 
 static UA_StatusCode
-prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *reader,
+prepareOffsetBuffer(UA_Server *server, UA_DataSetReader *reader,
                     UA_ByteString *buf, size_t *pos) {
     UA_NetworkMessage *nm = (UA_NetworkMessage*)UA_calloc(1, sizeof(UA_NetworkMessage));
     if(!nm)
@@ -1158,17 +1158,6 @@ prepareOffsetBuffer(UA_Server *server, UA_ReaderGroup *rg, UA_DataSetReader *rea
     /* Set the offset buffer in the reader */
     reader->bufferedMessage.nm = nm;
 
-    /* If pre-operational, set to operational after the first message was
-     * processed */
-    if(rg->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
-        rg->state = UA_PUBSUBSTATE_OPERATIONAL;
-        UA_ServerConfig *config = &server->config;
-        if(config->pubSubConfig.stateChangeCallback != 0) {
-            config->pubSubConfig.stateChangeCallback(server, &rg->identifier,
-                                                     rg->state, UA_STATUSCODE_GOOD);
-        }
-    }
-
     return rv;
 }
 
@@ -1253,7 +1242,7 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
         if(!dsr->bufferedMessage.nm) {
             /* This is the first message being received for the RT fastpath.
              * Prepare the offset buffer and set operational. */
-            rv = prepareOffsetBuffer(server, readerGroup, dsr, buf, &pos);
+            rv = prepareOffsetBuffer(server, dsr, buf, &pos);
         } else {
             /* Decode with offset information and update the networkMessage */
             rv = UA_NetworkMessage_updateBufferedNwMessage(&dsr->bufferedMessage, buf, &pos);
@@ -1263,6 +1252,15 @@ UA_ReaderGroup_decodeAndProcessRT(UA_Server *server, UA_ReaderGroup *readerGroup
                                "PubSub decoding failed. Could not decode with "
                                "status code %s.", UA_StatusCode_name(rv));
             return false;
+        } else if (readerGroup->state == UA_PUBSUBSTATE_PREOPERATIONAL) {
+            /* If pre-operational, set to operational after the first message was
+             * processed */
+            readerGroup->state = UA_PUBSUBSTATE_OPERATIONAL;
+            UA_ServerConfig *config = &server->config;
+            if(config->pubSubConfig.stateChangeCallback != 0) {
+                config->pubSubConfig.stateChangeCallback(server, &readerGroup->identifier,
+                                                         readerGroup->state, UA_STATUSCODE_GOOD);
+            }
         }
     }
 

From 6f4e5a35514d73b5738b018deac32153d8b29a90 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 22 Mar 2024 11:51:18 +0100
Subject: [PATCH 1445/1963] fix(pubsub): Prevent reconnect after beginning to
 delete PubSubConnection

---
 src/pubsub/ua_pubsub_connection.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index 4569a46d6ce..7376251cd55 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -235,6 +235,10 @@ void
 UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    /* Disable the PubSubConnection */
+    UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_DISABLED, UA_STATUSCODE_GOOD);
+    c->deleteFlag = true; /* Prevent reconnect from this point on */
+
     /* Stop and unfreeze all ReaderGroupds and WriterGroups attached to the
      * Connection. Do this before removing them because we need to unfreeze all
      * to remove the Connection.*/
@@ -261,11 +265,6 @@ UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c) {
         UA_WriterGroup_remove(server, writerGroup);
     }
 
-    /* Disconnect only once */
-    if(!c->deleteFlag)
-        UA_PubSubConnection_disconnect(c);
-    c->deleteFlag = true;
-
     /* Not all sockets are closed. This method will be called again */
     if(c->sendChannel != 0 || c->recvChannelsSize > 0)
         return;
@@ -314,6 +313,12 @@ UA_PubSubConnection_setPubSubState(UA_Server *server, UA_PubSubConnection *c,
                                    UA_PubSubState state, UA_StatusCode cause) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    if(c->deleteFlag && state != UA_PUBSUBSTATE_DISABLED) {
+        UA_LOG_WARNING_CONNECTION(server->config.logging, c,
+                                  "The connection is being deleted. Can only be disabled.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     UA_PubSubState oldState = c->state;
     UA_WriterGroup *writerGroup;

From 665d328aa67e20fe1e3eabcf1f789d554c8c9604 Mon Sep 17 00:00:00 2001
From: Patrik Wenger <patrik.wenger@mindclue.ch>
Date: Sun, 24 Mar 2024 19:57:27 +0100
Subject: [PATCH 1446/1963] feat(nc): Nodeset compiler with guid nodeids
 (#6355)

* nodeset_compiler: add support for GUID node IDs

* fix error string

* ensure leading zeroes to fix GUID format
---
 tools/nodeset_compiler/backend_open62541_datatypes.py | 6 +++++-
 tools/nodeset_compiler/datatypes.py                   | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/nodeset_compiler/backend_open62541_datatypes.py b/tools/nodeset_compiler/backend_open62541_datatypes.py
index 775d3a741c3..3943d8c5e8b 100644
--- a/tools/nodeset_compiler/backend_open62541_datatypes.py
+++ b/tools/nodeset_compiler/backend_open62541_datatypes.py
@@ -86,6 +86,8 @@ def generateQualifiedNameCode(value, alloc=False,):
                                                      str(value.ns), splitStringLiterals(vn))
 
 def generateGuidCode(value):
+    if isinstance(value, str):
+        return "UA_GUID(\"{}\")".format(value)
     if not value or len(value) != 5:
         return "UA_GUID_NULL"
     else:
@@ -99,7 +101,9 @@ def generateNodeIdCode(value):
     elif value.s != None:
         v = makeCLiteral(value.s)
         return u"UA_NODEID_STRING(ns[%s], \"%s\")" % (value.ns, v)
-    raise Exception(str(value) + " no NodeID generation for bytestring and guid..")
+    elif value.g != None:
+        return u"UA_NODEID_GUID(ns[%s], %s)" % (value.ns, generateGuidCode(value.gAsString()))
+    raise Exception(str(value) + " NodeID generation for bytestring NodeIDs not supported")
 
 def generateExpandedNodeIdCode(value):
     if value.i != None:
diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index 01346c7bc99..1b0b04108d7 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -699,6 +699,9 @@ def setFromIdString(self, idstring):
             else:
                 raise Exception("no valid nodeid: " + idstring)
 
+    def gAsString(self):
+        return '{:08X}-{:04X}-{:04X}-{:04X}-{:012X}'.format(*self.g);
+
     # The parsing can be called with an optional namespace mapping dict.
     def parseXML(self, xmlvalue):
         # Expect <NodeId> or <Alias>

From 99484f8a069484aad0ce924a6c1d4e172fe5380f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Mar 2024 10:26:05 +0100
Subject: [PATCH 1447/1963] refactor(pubsub): Make assertions explicit in
 Reader deletion

---
 src/pubsub/ua_pubsub_reader.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index fef7b2bc9ae..700704f1941 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -314,11 +314,14 @@ UA_DataSetReader_remove(UA_Server *server, UA_DataSetReader *dsr) {
     /* Delete DataSetReader config */
     UA_DataSetReaderConfig_clear(&dsr->config);
 
+    /* Get the ReaderGroup. This must succeed since all Readers are removed from
+     * the group before it is deleted in UA_ReaderGroup_remove.*/
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, dsr->linkedReaderGroup);
+    UA_assert(rg);
+
     /* Remove DataSetReader from group */
     LIST_REMOVE(dsr, listEntry);
-    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, dsr->linkedReaderGroup);
-    if(rg)
-        rg->readersCount--;
+    rg->readersCount--;
 
     /* THe offset buffer is only set when the dsr is frozen
      * UA_NetworkMessageOffsetBuffer_clear(&dsr->bufferedMessage); */

From 4963ac4248b657454ee5025065d34dfc2bcde076 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Mar 2024 10:33:49 +0100
Subject: [PATCH 1448/1963] refactor(pubsub): Disconnect ReaderGroup as part of
 UA_ReaderGroup_setPubSubState_disable

---
 src/pubsub/ua_pubsub_readergroup.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index d70fbc4e40f..ac3a056773a 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -312,6 +312,9 @@ static UA_StatusCode
 UA_ReaderGroup_setPubSubState_disable(UA_Server *server,
                                       UA_ReaderGroup *rg,
                                       UA_StatusCode cause) {
+    /* Disconnect if not already done */
+    UA_ReaderGroup_disconnect(rg);
+
     UA_DataSetReader *dataSetReader;
     switch(rg->state) {
     case UA_PUBSUBSTATE_DISABLED:

From 14605a27837d2d3dbc912091b94822f292cd5431 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Mar 2024 10:34:15 +0100
Subject: [PATCH 1449/1963] refactor(pubsub): Prevent enabling of ReaderGroup
 after the deleteFlag has been set

---
 src/pubsub/ua_pubsub_readergroup.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index ac3a056773a..df762e6688f 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -437,6 +437,12 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
                               UA_StatusCode cause) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    if(readerGroup->deleteFlag && state != UA_PUBSUBSTATE_DISABLED) {
+        UA_LOG_WARNING_READERGROUP(server->config.logging, readerGroup,
+                                  "The ReaderGroup is being deleted. Can only be disabled.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     UA_StatusCode ret = UA_STATUSCODE_BADINVALIDARGUMENT;
     UA_PubSubState oldState = readerGroup->state;
     switch(state) {

From 23fc1b878e8430d7ab6c4694eb3032a5f02a80b1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Mar 2024 10:34:54 +0100
Subject: [PATCH 1450/1963] refactor(pubsub): Use the normal setState(disable)
 in ReaderGroup_remove

---
 src/pubsub/ua_pubsub_readergroup.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index df762e6688f..d694ea7c444 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -206,6 +206,12 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
+    /* Disable (and disconnect) and set the deleteFlag. This prevents a
+     * reconnect and triggers the deletion when the last open socket is
+     * closed. */
+    rg->deleteFlag = true;
+    UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_DISABLED, UA_STATUSCODE_GOOD);
+
     UA_DataSetReader *dsr, *tmp_dsr;
     LIST_FOREACH_SAFE(dsr, &rg->readers, listEntry, tmp_dsr) {
         UA_DataSetReader_remove(server, dsr);
@@ -225,11 +231,6 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
     }
 #endif
 
-    /* Disconnect only once */
-    if(!rg->deleteFlag)
-        UA_ReaderGroup_disconnect(rg);
-    rg->deleteFlag = true;
-
     if(rg->recvChannelsSize == 0) {
         /* Unlink from the connection */
         LIST_REMOVE(rg, listEntry);

From a62ee806c2c055f2003dc818ee07c344ce4e02ca Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Mar 2024 10:44:21 +0100
Subject: [PATCH 1451/1963] refactor(pubsub): Set deleteFlag first in
 Connection_remove to prevent re-enabling in callbacks during _setPubSubState

---
 src/pubsub/ua_pubsub_connection.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index 7376251cd55..b763ca1ddb9 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -235,9 +235,11 @@ void
 UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    /* Disable the PubSubConnection */
+    /* Disable (and disconnect) and set the deleteFlag. This prevents a
+     * reconnect and triggers the deletion when the last open socket is
+     * closed. */
+    c->deleteFlag = true;
     UA_PubSubConnection_setPubSubState(server, c, UA_PUBSUBSTATE_DISABLED, UA_STATUSCODE_GOOD);
-    c->deleteFlag = true; /* Prevent reconnect from this point on */
 
     /* Stop and unfreeze all ReaderGroupds and WriterGroups attached to the
      * Connection. Do this before removing them because we need to unfreeze all

From 4f683c058511c4b83ce7e2b3d1e8c6daceed8ff8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Mar 2024 10:45:12 +0100
Subject: [PATCH 1452/1963] refactor(pubsub): Always disconnect during
 WriterGroup _disable

---
 src/pubsub/ua_pubsub_writergroup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 4ac12da374d..9658f1868be 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -742,6 +742,7 @@ UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
     UA_PubSubState oldState = writerGroup->state;
     switch(state) {
         case UA_PUBSUBSTATE_DISABLED:
+            UA_WriterGroup_disconnect(writerGroup);
             switch (writerGroup->state){
                 case UA_PUBSUBSTATE_DISABLED:
                     break;

From fa0c10214fc7d6650ba0f87a35b6f5d065965568 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Mar 2024 10:45:38 +0100
Subject: [PATCH 1453/1963] refactor(pubsub): Prevent WriterGroup enabling
 after the deleteFlag has been set

---
 src/pubsub/ua_pubsub_writergroup.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 9658f1868be..f9a5fdee045 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -737,6 +737,13 @@ UA_StatusCode
 UA_WriterGroup_setPubSubState(UA_Server *server, UA_WriterGroup *writerGroup,
                               UA_PubSubState state, UA_StatusCode cause) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
+    if(writerGroup->deleteFlag && state != UA_PUBSUBSTATE_DISABLED) {
+        UA_LOG_WARNING_WRITERGROUP(server->config.logging, writerGroup,
+                                  "The WriterGroup is being deleted. Can only be disabled.");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     UA_DataSetWriter *dataSetWriter;
     UA_PubSubState oldState = writerGroup->state;

From 0bbf08cc886023f431b283763024e64cf035b160 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 26 Mar 2024 10:46:16 +0100
Subject: [PATCH 1454/1963] refactor(pubsub): Use normal WriterGroup _disable
 before _remove

---
 src/pubsub/ua_pubsub_writergroup.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index f9a5fdee045..a4b5fbc14f1 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -240,8 +240,11 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
         return UA_STATUSCODE_BADCONFIGURATIONERROR;
     }
 
-    if(wg->state == UA_PUBSUBSTATE_OPERATIONAL)
-        UA_WriterGroup_removePublishCallback(server, wg);
+    /* Disable (and disconnect) and set the deleteFlag. This prevents a
+     * reconnect and triggers the deletion when the last open socket is
+     * closed. */
+    wg->deleteFlag = true;
+    UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_DISABLED, UA_STATUSCODE_GOOD);
 
     UA_DataSetWriter *dsw, *dsw_tmp;
     LIST_FOREACH_SAFE(dsw, &wg->writers, listEntry, dsw_tmp) {
@@ -262,11 +265,6 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
     }
 #endif
 
-    /* Disconnect only once */
-    if(!wg->deleteFlag)
-        UA_WriterGroup_disconnect(wg);
-    wg->deleteFlag = true;
-
     if(wg->sendChannel == 0) {
         /* Unlink from the connection */
         LIST_REMOVE(wg, listEntry);

From 95febdcaa8500848a4ce2634b1222d357a002dca Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 27 Mar 2024 08:25:31 +0100
Subject: [PATCH 1455/1963] refactor(server): Use the hostname supplied by the
 EventLoop to register DiscoveryUrls

---
 arch/eventloop_posix_tcp.c    |  5 +-
 src/server/ua_server_binary.c | 86 +++++++++++++++++------------------
 2 files changed, 44 insertions(+), 47 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 7e46ef73ac3..de968fcab6f 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -348,8 +348,9 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
 
     /* Get the hostname information */
     char hoststr[UA_MAXHOSTNAME_LENGTH];
-    int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen, hoststr,
-                                 sizeof(hoststr), NULL, 0, NI_NUMERICHOST);
+    int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                                 hoststr, sizeof(hoststr),
+                                 NULL, 0, 0);
     if(get_res != 0) {
         hoststr[0] = 0;
         UA_LOG_SOCKET_ERRNO_WRAP(
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index acf66f567bb..99808e3730a 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -25,12 +25,6 @@
 #include "ua_services.h"
 #include "mp_printf.h"
 
-#ifdef _WIN32
-# include <winsock2.h>
-#else
-# include <unistd.h>
-#endif
-
 #define STARTCHANNELID 1
 #define STARTTOKENID 1
 
@@ -1141,6 +1135,36 @@ createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *c
     return UA_STATUSCODE_GOOD;
 }
 
+static void
+addDiscoveryUrl(UA_Server *server, const UA_String hostname, UA_UInt16 port) {
+    char urlstr[1024];
+    mp_snprintf(urlstr, 1024, "opc.tcp://%*s:%d",
+                (int)hostname.length, (char*)hostname.data, port);
+    UA_String discoveryServerUrl = UA_STRING(urlstr);
+
+    /* Check if the ServerUrl is already present in the DiscoveryUrl array.
+     * Add if not already there. */
+    for(size_t i = 0; i < server->config.applicationDescription.discoveryUrlsSize; i++) {
+        if(UA_String_equal(&discoveryServerUrl,
+                           &server->config.applicationDescription.discoveryUrls[i]))
+            return;
+    }
+
+    /* Add to the list of discovery url */
+    UA_StatusCode res =
+        UA_Array_appendCopy((void **)&server->config.applicationDescription.discoveryUrls,
+                            &server->config.applicationDescription.discoveryUrlsSize,
+                            &discoveryServerUrl, &UA_TYPES[UA_TYPES_STRING]);
+    if(res == UA_STATUSCODE_GOOD) {
+        UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
+                    "New DiscoveryUrl added: %*s", (int)discoveryServerUrl.length,
+                    (char*)discoveryServerUrl.data);
+    } else {
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
+                       "Could not register DiscoveryUrl -- out of memory");
+    }
+}
+
 /* Callback of a TCP socket (server socket or an active connection) */
 void
 serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
@@ -1178,6 +1202,16 @@ serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         sc->connectionId = connectionId;
         sc->connectionManager = cm;
         *connectionContext = (void*)sc; /* Set the context pointer in the connection */
+
+        /* Add to the DiscoveryUrls */
+        const UA_UInt16 *port = (const UA_UInt16*)
+            UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "listen-port"),
+                                     &UA_TYPES[UA_TYPES_UINT16]);
+        const UA_String *address = (const UA_String*)
+            UA_KeyValueMap_getScalar(params, UA_QUALIFIEDNAME(0, "listen-address"),
+                                     &UA_TYPES[UA_TYPES_STRING]);
+        if(port && address)
+            addDiscoveryUrl(bpm->server, *address, *port);
         return;
     }
 
@@ -1300,49 +1334,11 @@ createServerConnection(UA_BinaryProtocolManager *bpm, const UA_String *serverUrl
         params[2].key = UA_QUALIFIEDNAME(0, "reuse");
         UA_Variant_setScalar(&params[2].value, &reuseaddr, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
+        /* The hostname is non-empty */
         if(hostname.length > 0) {
-            /* The hostname is non-empty */
             params[3].key = UA_QUALIFIEDNAME(0, "address");
             UA_Variant_setArray(&params[3].value, &hostname, 1, &UA_TYPES[UA_TYPES_STRING]);
             paramsSize = 4;
-        } else {
-            /* Add DiscoveryServerUrl */
-            char hostnamestr[1024];
-            hostnamestr[1023] = '\0';
-#ifdef _WIN32
-            WSADATA wsaData;
-            WSAStartup(MAKEWORD(2, 2), &wsaData);
-#endif
-            gethostname(hostnamestr, 1023);
-#ifdef _WIN32
-            WSACleanup();
-#endif
-
-            char urlstr[1024];
-            mp_snprintf(urlstr, 1024, "opc.tcp://%s:%d", hostnamestr, port);
-            UA_String discoveryServerUrl = UA_STRING(urlstr);
-
-            /* Check if the ServerUrl is already present in the DiscoveryUrl array.
-             * Add if not already there. */
-            bool isContaining = false;
-            for(size_t i = 0; i < config->applicationDescription.discoveryUrlsSize; i++) {
-                if(UA_String_equal(&discoveryServerUrl,
-                                   &config->applicationDescription.discoveryUrls[i])) {
-                    isContaining = true;
-                }
-            }
-            if(!isContaining) {
-                if(config->applicationDescription.discoveryUrls == NULL) {
-                    config->applicationDescription.discoveryUrls = (UA_String*)UA_Array_new(1, &UA_TYPES[UA_TYPES_STRING]);
-                    config->applicationDescription.discoveryUrlsSize = 0;
-                }
-                UA_StatusCode retval = UA_STATUSCODE_GOOD;
-                retval = UA_Array_appendCopy((void **)&config->applicationDescription.discoveryUrls,
-                                             &config->applicationDescription.discoveryUrlsSize,
-                                             &discoveryServerUrl, &UA_TYPES[UA_TYPES_STRING]);
-                if(retval != UA_STATUSCODE_GOOD)
-                    return retval;
-            }
         }
 
         UA_KeyValueMap paramsMap;

From 271bd94eb6bca908f60ed1a354d1d4b80e09f6fb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 27 Mar 2024 09:28:51 +0100
Subject: [PATCH 1456/1963] refactor(arch): Use the local hostname if
 INADDR_ANY is used for TCP listen connections

---
 arch/eventloop_posix_tcp.c | 81 +++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index de968fcab6f..fe31425d265 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -340,23 +340,28 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn, short event) {
 
 static UA_StatusCode
 TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
-                         UA_UInt16 port, void *application, void *context,
+                         const char *hostname, UA_UInt16 port,
+                         void *application, void *context,
                          UA_ConnectionManager_connectionCallback connectionCallback,
                          UA_Boolean validate, UA_Boolean reuseaddr) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)pcm->cm.eventSource.eventLoop;
     UA_LOCK_ASSERT(&el->elMutex, 1);
 
-    /* Get the hostname information */
-    char hoststr[UA_MAXHOSTNAME_LENGTH];
+    /* Translate INADDR_ANY to IPv4/IPv6 address */
+    char addrstr[UA_MAXHOSTNAME_LENGTH];
     int get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
-                                 hoststr, sizeof(hoststr),
-                                 NULL, 0, 0);
+                                 addrstr, sizeof(addrstr), NULL, 0, 0);
     if(get_res != 0) {
-        hoststr[0] = 0;
-        UA_LOG_SOCKET_ERRNO_WRAP(
-           UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                          "TCP\t| getnameinfo(...) could not resolve the "
-                          "hostname (%s)", errno_str));
+        get_res = UA_getnameinfo(ai->ai_addr, ai->ai_addrlen,
+                                 addrstr, sizeof(addrstr),
+                                 NULL, 0, NI_NUMERICHOST);
+        if(get_res != 0) {
+            addrstr[0] = 0;
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                               "TCP\t| getnameinfo(...) could not resolve the "
+                               "hostname (%s)", errno_str));
+        }
     }
 
     /* Create the server socket */
@@ -366,13 +371,24 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error opening the listen socket for "
                           "\"%s\" on port %u (%s)",
-                          (unsigned)listenSocket, hoststr, port, errno_str));
+                          (unsigned)listenSocket, addrstr, port, errno_str));
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                "TCP %u\t| Creating server socket for \"%s\" on port %u",
-                (unsigned)listenSocket, hoststr, port);
+    /* If the INADDR_ANY is used, use the local hostname */
+    char hoststr[UA_MAXHOSTNAME_LENGTH];
+    if(hostname) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP %u\t| Creating listen socket for \"%s\" on port %u",
+                    (unsigned)listenSocket, hostname, port);
+    } else {
+        gethostname(hoststr, UA_MAXHOSTNAME_LENGTH);
+        hostname = hoststr;
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP %u\t| Creating listen socket for \"%s\" "
+                    "(with local hostname \"%s\") on port %u",
+                    (unsigned)listenSocket, addrstr, hostname, port);
+    }
 
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
@@ -390,15 +406,14 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
     }
 #endif
 
-    if(reuseaddr) {
-        /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
-        if(UA_EventLoopPOSIX_setReusable(listenSocket) != UA_STATUSCODE_GOOD) {
-            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                           "TCP %u\t| Could not make the socket addr reusable",
-                           (unsigned)listenSocket);
-            UA_close(listenSocket);
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
+    /* Allow rebinding to the IP/port combination. Eg. to restart the server. */
+    if(reuseaddr &&
+       UA_EventLoopPOSIX_setReusable(listenSocket) != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                       "TCP %u\t| Could not make the socket addr reusable",
+                       (unsigned)listenSocket);
+        UA_close(listenSocket);
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Set the socket non-blocking */
@@ -425,7 +440,7 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error binding the socket to the address %s (%s)",
-                          (unsigned)listenSocket, hoststr, errno_str));
+                          (unsigned)listenSocket, hostname, errno_str));
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -480,19 +495,13 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
     pcm->fdsSize++;
 
     /* Set up the callback parameters */
+    UA_String listenAddress = UA_STRING((char*)(uintptr_t)hostname);
     UA_KeyValuePair params[2];
     params[0].key = UA_QUALIFIEDNAME(0, "listen-address");
+    UA_Variant_setScalar(&params[0].value, &listenAddress, &UA_TYPES[UA_TYPES_STRING]);
     params[1].key = UA_QUALIFIEDNAME(0, "listen-port");
-    UA_KeyValueMap paramMap;
-    paramMap.mapSize = 0;
-    UA_String hostname;
-    if(hoststr[0] != 0) {
-        paramMap.mapSize = 2;
-        hostname = UA_STRING(hoststr);
-        UA_Variant_setScalar(&params[0].value, &hostname, &UA_TYPES[UA_TYPES_STRING]);
-        UA_Variant_setScalar(&params[1].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
-        paramMap.map = params;
-    }
+    UA_Variant_setScalar(&params[1].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
+    UA_KeyValueMap paramMap = {2, params};
 
     /* Announce the listen-socket in the application */
     UA_UNLOCK(&el->elMutex);
@@ -548,7 +557,7 @@ TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
     UA_StatusCode total_result = UA_INT32_MAX;
     struct addrinfo *ai = res;
     while(ai) {
-        total_result &= TCP_registerListenSocket(pcm, ai, port, application, context,
+        total_result &= TCP_registerListenSocket(pcm, ai, hostname, port, application, context,
                                                  connectionCallback, validate, reuseaddr);
         ai = ai->ai_next;
     }
@@ -874,7 +883,7 @@ TCP_openActiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *p
     pcm->fdsSize++;
 
     UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                "TCP %u\t| New connection to \"%s\" on port %s",
+                "TCP %u\t| Opening a connection to \"%s\" on port %s",
                 (unsigned)newSock, hostname, portStr);
 
     /* Signal the new connection to the application as asynchonously opening */

From 5466a4dfe23aed88e57d5297b0a89416a24268a6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 27 Mar 2024 09:29:28 +0100
Subject: [PATCH 1457/1963] refactor(el): Small improvement to the EventLoop
 documentation / TCP ConnectionManager

---
 include/open62541/plugin/eventloop.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 6e5736ec3ee..5748c4c18a0 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -454,8 +454,9 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  *
  * 0:address [string | array of string]
  *    Hostname or IPv4/v6 address for the connection (scalar parameter required
- *    for active connections). For listen-connections the address implies the
- *    network interfaces for listening (default: listen on all interfaces).
+ *    for active connections). For listen-connections the address contains the
+ *    local hostnames or IP addresses for listening. If undefined, listen on all
+ *    interfaces INADDR_ANY. (default: undefined)
  *
  * 0:port [uint16]
  *    Port of the target host (required).
@@ -476,10 +477,10 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger);
  * **Listen Connection Connection Callback Parameters (first callback only):**
  *
  * 0:listen-address [string]
- *    Local address for that particular listen-connection.
+ *    Local address (IP or hostname) for the new listen-connection.
  *
  * 0:listen-port [uint16]
- *    Port on which the connection listens.
+ *    Port on which the new connection listens.
  *
  * **Send Parameters:**
  *

From badc309441e682b5504fc65e41e96e4d2fcf485a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 27 Mar 2024 16:08:25 +0100
Subject: [PATCH 1458/1963] refactor(build): Bump the minimum CMake version to
 3.13 (available since Debian Buster)

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d7e9d947c1..1fd7a2f0520 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1...3.12)
+cmake_minimum_required(VERSION 3.13)
 if(UA_BUILD_FUZZING OR UA_BUILD_OSS_FUZZ OR UA_BUILD_FUZZING_CORPUS)
     project(open62541) # We need to have C++ support configured for fuzzing
 else()

From 9e0b766fbba73be8d703b6ccbfdeec5bfd200b48 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 27 Mar 2024 17:39:23 +0100
Subject: [PATCH 1459/1963] fix(build): Reactivate building of Debian packages

---
 CMakeLists.txt                                | 148 ++---------------
 doc/CMakeLists.txt                            |  19 ---
 tools/cmake/open62541Config.cmake.in          |  29 ----
 tools/ide/idea/workspace.xml                  | 156 ++++++++++++++++++
 tools/packaging/CMakeLists.txt                |   4 +-
 tools/packaging/debian/compat                 |   2 +-
 tools/packaging/debian/control-template       |  68 ++------
 .../debian/libopen62541-dev.install-template  |   2 -
 .../debian/libopen62541-doc.doc-base-template |  16 --
 .../debian/libopen62541-doc.install-template  |   2 -
 .../libopen62541-tools.install-template       |   9 -
 tools/packaging/debian/rules-template         |   8 -
 tools/prepare_packaging.py                    |  15 --
 13 files changed, 185 insertions(+), 293 deletions(-)
 create mode 100644 tools/ide/idea/workspace.xml
 delete mode 100644 tools/packaging/debian/libopen62541-doc.doc-base-template
 delete mode 100644 tools/packaging/debian/libopen62541-doc.install-template
 delete mode 100644 tools/packaging/debian/libopen62541-tools.install-template

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fd7a2f0520..9332c7db554 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -647,10 +647,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         add_definitions(-Wno-unused-function)
     endif()
 
-    if(UA_PACK_DEBIAN)
-        remove_definitions(-Wno-static-in-inline)
-    endif()
-
     # Linker
     set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # cmake sets -rdynamic by default
 
@@ -1334,10 +1330,6 @@ else()
     target_compile_definitions(open62541-plugins PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
     set_target_properties(open62541-plugins PROPERTIES FOLDER "open62541/lib")
 
-    if(UA_PACK_DEBIAN)
-        add_library(open62541-static STATIC $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
-        set_target_properties(open62541-static PROPERTIES OUTPUT_NAME open62541)
-    endif()
     add_library(open62541 $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
 
     if(UA_ENABLE_ENCRYPTION_LIBRESSL)
@@ -1462,160 +1454,52 @@ include(linting_target)
 # specify install location with `-DCMAKE_INSTALL_PREFIX=xyz`
 # Enable shared library with `-DBUILD_SHARED_LIBS=ON`
 
-set(cmake_configfile_install ${CMAKE_INSTALL_LIBDIR}/cmake/open62541)
-set(open62541_install_tools_dir share/open62541/tools)
-set(open62541_install_nodeset_dir share/open62541/tools/ua-nodeset)
-
-# This list of components allows to define a find_package requirement.
-# E.g.:
-# find_package(open62541 1.0.0 REQUIRED COMPONENTS Events Methods FullNamespace)
-set(open62541_enabled_components "")
-if(UA_NAMESPACE_ZERO STREQUAL "FULL")
-    list(APPEND open62541_enabled_components "FullNamespace")
-endif()
-if(UA_ENABLE_METHODCALLS)
-    list(APPEND open62541_enabled_components "Methods")
-endif()
-if(UA_ENABLE_SUBSCRIPTIONS)
-    list(APPEND open62541_enabled_components "Subscriptions")
-endif()
-if(UA_ENABLE_PUBSUB)
-    list(APPEND open62541_enabled_components "PubSub")
-endif()
-list (FIND UA_ENCRYPTION_PLUGINS ${UA_ENABLE_ENCRYPTION} _tmp)
-if(${_tmp} GREATER -1)
-    list(APPEND open62541_enabled_components "Encryption")
-endif()
-if(UA_ENABLE_ENCRYPTION_MBEDTLS)
-    list(APPEND open62541_enabled_components "EncryptionMbedTLS")
-endif()
-if(UA_ENABLE_ENCRYPTION_OPENSSL)
-    list(APPEND open62541_enabled_components "EncryptionOpenSSL")
-endif()
-if(UA_ENABLE_ENCRYPTION_LIBRESSL)
-    list(APPEND open62541_enabled_components "EncryptionLibreSSL")
-endif()
 if(UA_ENABLE_AMALGAMATION)
-    list(APPEND open62541_enabled_components "Amalgamation")
-endif()
-if(UA_ENABLE_HISTORIZING)
-    list(APPEND open62541_enabled_components "Historizing")
-endif()
-if(UA_ENABLE_EXPERIMENTAL_HISTORIZING)
-    list(APPEND open62541_enabled_components "ExperimentalHistorizing")
-endif()
-if(UA_ENABLE_SUBSCRIPTIONS_EVENTS)
-    list(APPEND open62541_enabled_components "Events")
-endif()
-if(UA_MULTITHREADING GREATER_EQUAL 100)
-    list(APPEND open62541_enabled_components "Multithreading")
-endif()
-if(UA_ENABLE_DISCOVERY)
-    list(APPEND open62541_enabled_components "Discovery")
-endif()
-if(UA_ENABLE_DISCOVERY_MULTICAST)
-    list(APPEND open62541_enabled_components "DiscoveryMulticast")
+    install(CODE "MESSAGE(FATAL_ERROR \"Installation with UA_ENABLE_AMALGAMATION=ON is not possible.\")")
 endif()
 
 # export library (either static or shared depending on BUILD_SHARED_LIBS)
-if(UA_PACK_DEBIAN)
-    set(EXTRATARGETS "open62541-static")
-else()
-    set(EXTRATARGETS "")
-endif()
-install(TARGETS open62541 ${EXTRATARGETS}
+install(TARGETS open62541
         EXPORT open62541Targets
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         INCLUDES DESTINATION include)
 
-if(UA_ENABLE_AMALGAMATION)
-# Our default way of installation is the non-amalgamated version.
-# See also https://github.com/open62541/open62541/pull/2292#discussion_r241106424
-install(CODE "MESSAGE(WARNING \"Installation with UA_ENABLE_AMALGAMATION=ON is not recommended.\")")
-endif()
-
+# Create open62541Config.cmake
 include(CMakePackageConfigHelpers)
+set(cmake_configfile_install ${CMAKE_INSTALL_LIBDIR}/cmake/open62541)
 configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541Config.cmake.in"
                               "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
-                              INSTALL_DESTINATION "${cmake_configfile_install}"
-                              PATH_VARS open62541_install_tools_dir
-                                        open62541_install_nodeset_dir
-                                        open62541_enabled_components
-                              )
+                              INSTALL_DESTINATION "${cmake_configfile_install}")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
+        DESTINATION "${cmake_configfile_install}")
 
+# Create open62541ConfigVersion.cmake
 set(open62541_VERSION)
 get_target_property(open62541_VERSION open62541 VERSION)
-
 write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/open62541ConfigVersion.cmake"
-                                 VERSION ${open62541_VERSION}
-                                 COMPATIBILITY AnyNewerVersion)
+                                 VERSION ${open62541_VERSION} COMPATIBILITY AnyNewerVersion)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541ConfigVersion.cmake"
+        DESTINATION "${cmake_configfile_install}")
 
+# Create open62541Targets.cmake
 install(EXPORT open62541Targets
         FILE open62541Targets.cmake
         DESTINATION "${cmake_configfile_install}"
         NAMESPACE open62541::)
-
 export(TARGETS open62541 NAMESPACE open62541::
        FILE ${CMAKE_CURRENT_BINARY_DIR}/open62541Targets.cmake)
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/macros_public.cmake"
-               "${CMAKE_CURRENT_BINARY_DIR}/open62541Macros.cmake" COPYONLY)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
-              "${CMAKE_CURRENT_BINARY_DIR}/open62541ConfigVersion.cmake"
-              "${CMAKE_CURRENT_BINARY_DIR}/open62541Macros.cmake"
-        DESTINATION "${cmake_configfile_install}")
-
-if(UA_ENABLE_ENCRYPTION_MBEDTLS)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/FindMbedTLS.cmake"
-            DESTINATION "${cmake_configfile_install}")
-endif()
-
+# Create open62541Targets.cmake
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     install(FILES "${PROJECT_BINARY_DIR}/src_generated/open62541.pc"
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
 
-set(UA_install_tools_dirs "tools/certs"
-    "tools/nodeset_compiler"
-    "tools/schema"
-    ${UA_NODESET_DIR})
-
-set(UA_install_tools_files "tools/generate_datatypes.py"
-    "tools/generate_nodeid_header.py"
-    "tools/generate_statuscode_descriptions.py")
-
-install(DIRECTORY ${UA_install_tools_dirs}
-        DESTINATION ${open62541_install_tools_dir}
-        USE_SOURCE_PERMISSIONS
-        FILES_MATCHING
-        PATTERN "*"
-        PATTERN "*.pyc" EXCLUDE
-        PATTERN ".git*" EXCLUDE)
-
-install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir})
-
-if(UA_PACK_DEBIAN)
-    set(UA_install_examples_dirs "examples/"
-        "examples/access_control"
-        "examples/custom_datatype"
-        "examples/discovery"
-        "examples/encryption"
-        "examples/nodeset"
-        "examples/pubsub")
-
-    set(open62541_install_examples_dir share/open62541/examples)
-    install(DIRECTORY ${UA_install_examples_dirs} COMPONENT examples
-            DESTINATION ${open62541_install_examples_dir} USE_SOURCE_PERMISSIONS)
-endif()
-
+# Recreate the include folder structure from the source also in /usr/lib/include/open62541
 if(NOT UA_ENABLE_AMALGAMATION)
-    # Recreate the include folder structure from the source also in /usr/lib/include/open62541
-
     set(FILES_TO_INSTALL ${exported_headers} ${plugin_headers})
-
     set(BASE_PATH_MAIN "${PROJECT_SOURCE_DIR}/include/open62541")
     set(BASE_PATH_PLUGINS "${PROJECT_SOURCE_DIR}/plugins/include/open62541")
     set(BASE_PATH_ARCH "${PROJECT_SOURCE_DIR}/arch")
@@ -1640,10 +1524,6 @@ if(NOT UA_ENABLE_AMALGAMATION)
             install(FILES ${full_path} DESTINATION include/open62541${dir})
         endif()
     endforeach()
-else()
-    # Export amalgamated header open62541.h which is generated due to build of
-    # open62541-object
-    install(FILES ${PROJECT_BINARY_DIR}/open62541.h DESTINATION include)
 endif()
 
 if(UA_PACK_DEBIAN)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index d1f3de64a88..c4bafd1ae1f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -97,22 +97,3 @@ add_dependencies(doc open62541)
 
 set_target_properties(doc doc_latex doc_pdf PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
 set_target_properties(doc doc_latex doc_pdf PROPERTIES FOLDER "open62541/doc")
-
-if (UA_PACK_DEBIAN)
-    set(open62541_install_debdoc_html_dir share/doc/open62541/open62541.html)
-    set(open62541_install_debdoc_dir share/doc/open62541)
-
-    set(open62541_debdoc_pdf_files "${DOC_LATEX_DIR}/open62541.pdf")
-
-    install(DIRECTORY ${DOC_HTML_DIR}/
-        COMPONENT htmldoc 
-        DESTINATION ${open62541_install_debdoc_dir}/open62541.html 
-        USE_SOURCE_PERMISSIONS
-        FILES_MATCHING 
-        PATTERN "*.*"
-        PATTERN "_sources" EXCLUDE
-        PATTERN "CMakeFiles" EXCLUDE
-        PATTERN "cmake_install.cmake" EXCLUDE
-        )
-    install(FILES ${open62541_debdoc_pdf_files} COMPONENT pdfdoc DESTINATION ${open62541_install_debdoc_dir})
-endif()
diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index 664ada54fea..1197e449842 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -1,31 +1,2 @@
 @PACKAGE_INIT@
-
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
-
-set (open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
-set (UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
-
-include(CMakeFindDependencyMacro)
-find_dependency(PythonInterp 3 REQUIRED)
-
-include("${CMAKE_CURRENT_LIST_DIR}/open62541Macros.cmake")
-
-set(open62541_COMPONENTS_ALL @open62541_enabled_components@)
-
-# find_dependency has no option to provide hints for modules, so temporary add the path to CMAKE_MODULE_PATH
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-list (FIND open62541_COMPONENTS_ALL "EncryptionMbedTLS" _index)
-if((${_index} GREATER 0) OR (${_index} EQUAL 0))
-    find_dependency(MbedTLS REQUIRED)
-endif()
-
-list(REMOVE_AT CMAKE_MODULE_PATH -1)
-
-foreach(_comp ${open62541_FIND_COMPONENTS})
-  list (FIND open62541_COMPONENTS_ALL "${_comp}" _index)
-  if (${_index} LESS 0)
-    set(open62541_FOUND False)
-    set(open62541_NOTFOUND_MESSAGE "Unsupported open62541 component: ${_comp}")
-    message(WARNING "${open62541_NOTFOUND_MESSAGE}")
-  endif()
-endforeach()
diff --git a/tools/ide/idea/workspace.xml b/tools/ide/idea/workspace.xml
new file mode 100644
index 00000000000..890a9d28258
--- /dev/null
+++ b/tools/ide/idea/workspace.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeReloadState">
+    <option name="reloaded" value="true" />
+  </component>
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" ENABLED="true" GENERATION_DIR="build-clion" CONFIG_NAME="Debug" />
+    </configurations>
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="be832dab-88bb-47f9-9eca-64cff50785b5" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/deps/mqtt-c" beforeDir="false" afterPath="$PROJECT_DIR$/deps/mqtt-c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/deps/ua-nodeset" beforeDir="false" afterPath="$PROJECT_DIR$/deps/ua-nodeset" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="2BZ0NDCzFg7lv98SvLf7R5jxxw3" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "last_opened_file_path": "/home/jpfr/software/open62541/build-clion"
+  }
+}]]></component>
+  <component name="RunManager" selected="CMake Application.clang-tidy">
+    <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
+      <method v="2">
+        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="clang-tidy" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="clang-tidy" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="cpplint" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="cpplint" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="doc" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="doc" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="doc_latex" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="doc_latex" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="doc_pdf" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="doc_pdf" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541-code-generation" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541-code-generation" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541-generator-ids-ns0" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541-generator-ids-ns0" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541-generator-namespace" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541-generator-namespace" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541-generator-statuscode" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541-generator-statuscode" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541-generator-transport" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541-generator-transport" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541-generator-types" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541-generator-types" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541-object" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541-object" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541-plugins" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541-plugins" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="open62541" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="open62541" TARGET_NAME="open62541" CONFIG_NAME="Debug">
+      <method v="2">
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+    <list>
+      <item itemvalue="CMake Application.clang-tidy" />
+      <item itemvalue="CMake Application.cpplint" />
+      <item itemvalue="CMake Application.open62541" />
+      <item itemvalue="CMake Application.open62541-code-generation" />
+      <item itemvalue="CMake Application.open62541-generator-ids-ns0" />
+      <item itemvalue="CMake Application.open62541-generator-namespace" />
+      <item itemvalue="CMake Application.open62541-generator-statuscode" />
+      <item itemvalue="CMake Application.open62541-generator-transport" />
+      <item itemvalue="CMake Application.open62541-generator-types" />
+      <item itemvalue="CMake Application.open62541-object" />
+      <item itemvalue="CMake Application.open62541-plugins" />
+      <item itemvalue="CMake Application.doc" />
+      <item itemvalue="CMake Application.doc_latex" />
+      <item itemvalue="CMake Application.doc_pdf" />
+    </list>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="be832dab-88bb-47f9-9eca-64cff50785b5" name="Changes" comment="" />
+      <created>1657098264311</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1657098264311</updated>
+      <workItem from="1657098275060" duration="746000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
+</project>
\ No newline at end of file
diff --git a/tools/packaging/CMakeLists.txt b/tools/packaging/CMakeLists.txt
index 87fd02f5603..072c5d82ec5 100644
--- a/tools/packaging/CMakeLists.txt
+++ b/tools/packaging/CMakeLists.txt
@@ -3,10 +3,10 @@
 ##########################
 # invoke via `make package`
 
-set(CPACK_GENERATOR "TGZ;DEB;RPM")
+set(CPACK_GENERATOR "TGZ;DEB")
 set(CPACK_PACKAGE_VENDOR "open62541 team")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OPC UA implementation")
-set(CPACK_PACKAGE_DESCRIPTION "open62541 is a C-based library (linking with C++ projects is possible) with all necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications.")
+set(CPACK_PACKAGE_DESCRIPTION "open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications.")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "${OPEN62541_VER_MAJOR}")
diff --git a/tools/packaging/debian/compat b/tools/packaging/debian/compat
index ec635144f60..f599e28b8ab 100644
--- a/tools/packaging/debian/compat
+++ b/tools/packaging/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/tools/packaging/debian/control-template b/tools/packaging/debian/control-template
index cd09ad4befd..72b58cb326b 100644
--- a/tools/packaging/debian/control-template
+++ b/tools/packaging/debian/control-template
@@ -1,16 +1,7 @@
 Source: open62541
 Priority: optional
 Maintainer: open62541 Team <open62541-core@googlegroups.com>
-Build-Depends: debhelper (>= 9),
- cmake (>= 2.8),
- python3,
- python3-sphinx, python3-sphinx-rtd-theme,
- graphviz,
- texlive-fonts-recommended,
- texlive-latex-extra,
- texlive-plain-generic | texlive-generic-extra,
- latexmk,
- libmbedtls-dev
+Build-Depends: debhelper (>= 9), cmake (>= 3.13), python3 (>= 3.11), libmbedtls-dev (>= 2.28.0)
 Standards-Version: 4.4.1
 Section: libs
 Homepage: https://open62541.org/
@@ -20,14 +11,12 @@ Vcs-Browser: https://github.com/open62541/open62541
 Package: libopen62541-<soname>
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmbedtls10 | libmbedtls12 | libmbedtls14
-Description: Open source implementation of OPC UA - shared library
- open62541 (http://open62541.org) is an open source and free implementation
- of OPC UA (OPC Unified Architecture) written in the common subset of the
- C99 and C++98 languages.
- The library is usable with all major compilers and provides the necessary
- tools to implement dedicated OPC UA clients and servers, or to integrate
- OPC UA-based communication into existing applications.
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmbedtls14
+Description: open62541 (<http://open62541.org>) is an open source implementation
+ of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The
+ library is usable with all major compilers and provides the necessary tools to
+ implement dedicated OPC UA clients and servers, or to integrate OPC UA-based
+ communication into existing applications.
  .
  This package provides the open62541 shared library
 
@@ -36,43 +25,10 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libopen62541-<soname> (= ${binary:Version}), ${misc:Depends}, libmbedtls-dev
-Description: Open source implementation of OPC UA - development files
- open62541 (http://open62541.org) is an open source and free implementation
- of OPC UA (OPC Unified Architecture) written in the common subset of the
- C99 and C++98 languages.
- The library is usable with all major compilers and provides the necessary
- tools to implement dedicated OPC UA clients and servers, or to integrate
- OPC UA-based communication into existing applications.
+Description: open62541 (<http://open62541.org>) is an open source implementation
+ of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The
+ library is usable with all major compilers and provides the necessary tools to
+ implement dedicated OPC UA clients and servers, or to integrate OPC UA-based
+ communication into existing applications.
  .
  This package provides the open62541 header and development files
-
-Package: libopen62541-<soname>-tools
-Section: libdevel
-Architecture: all
-Depends: ${misc:Depends}, python3
-Recommends: libopen62541-<soname>-dev
-Description: Open source implementation of OPC UA - tools
- open62541 (http://open62541.org) is an open source and free implementation
- of OPC UA (OPC Unified Architecture) written in the common subset of the
- C99 and C++98 languages.
- The library is usable with all major compilers and provides the necessary
- tools to implement dedicated OPC UA clients and servers, or to integrate
- OPC UA-based communication into existing applications.
- .
- This package provides some open62541 tools, e.g. the nodeset compiler
-
-Package: libopen62541-<soname>-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: Open source implementation of OPC UA - documentation
- open62541 (http://open62541.org) is an open source and free implementation
- of OPC UA (OPC Unified Architecture) written in the common subset of the
- C99 and C++98 languages.
- The library is usable with all major compilers and provides the necessary
- tools to implement dedicated OPC UA clients and servers, or to integrate
- OPC UA-based communication into existing applications.
- .
- This package provides the open62541 documentation as PDF and HTML
- and example applications
diff --git a/tools/packaging/debian/libopen62541-dev.install-template b/tools/packaging/debian/libopen62541-dev.install-template
index ff354febf69..9193d90fbe2 100644
--- a/tools/packaging/debian/libopen62541-dev.install-template
+++ b/tools/packaging/debian/libopen62541-dev.install-template
@@ -1,5 +1,3 @@
 usr/include
-usr/lib/*/*.so
-usr/lib/*/*.a
 usr/lib/*/cmake/open62541/*
 usr/lib/*/pkgconfig/open62541.pc
diff --git a/tools/packaging/debian/libopen62541-doc.doc-base-template b/tools/packaging/debian/libopen62541-doc.doc-base-template
deleted file mode 100644
index d440a281dff..00000000000
--- a/tools/packaging/debian/libopen62541-doc.doc-base-template
+++ /dev/null
@@ -1,16 +0,0 @@
-Document: open62541
-Title: open62541 Manual
-Author: The open62541 Team <open62541-core@googlegroups.com>
-Abstract: open62541 (http://open62541.org) is an open source 
- and free implementation of OPC UA (OPC Unified Architecture) 
- written in the common subset of the C99 and C++98 languages.   
- This manual contains an introduction to the open62541 library 
- and describes how to use it for server and client applications. 
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/open62541/open62541.html/index.html
-Files: /usr/share/doc/open62541/open62541.html/*
-
-Format: PDF
-Files: /usr/share/doc/open62541/open62541.pdf.gz
diff --git a/tools/packaging/debian/libopen62541-doc.install-template b/tools/packaging/debian/libopen62541-doc.install-template
deleted file mode 100644
index efad6f77428..00000000000
--- a/tools/packaging/debian/libopen62541-doc.install-template
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/open62541
-usr/share/open62541/examples
diff --git a/tools/packaging/debian/libopen62541-tools.install-template b/tools/packaging/debian/libopen62541-tools.install-template
deleted file mode 100644
index fb42663dbae..00000000000
--- a/tools/packaging/debian/libopen62541-tools.install-template
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/share/open62541/tools/*.py
-usr/share/open62541/tools/certs
-usr/share/open62541/tools/nodeset_compiler
-usr/share/open62541/tools/schema
-usr/share/open62541/tools/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml
-usr/share/open62541/tools/ua-nodeset/Schema/Opc.Ua.Types.bsd
-usr/share/open62541/tools/ua-nodeset/Schema/AttributeIds.csv
-usr/share/open62541/tools/ua-nodeset/Schema/NodeIds.csv
-usr/share/open62541/tools/ua-nodeset/Schema/StatusCode.csv
diff --git a/tools/packaging/debian/rules-template b/tools/packaging/debian/rules-template
index ebb9149aab5..e283e20508b 100755
--- a/tools/packaging/debian/rules-template
+++ b/tools/packaging/debian/rules-template
@@ -10,13 +10,5 @@ override_dh_auto_configure:
 override_dh_auto_test:
 	dh_auto_test -- ARGS+=--output-on-failure
 
-override_dh_auto_build:
-	dh_auto_build -- -j`nproc --ignore=2`
-	make -C obj-${DEB_HOST_GNU_TYPE} doc doc_pdf
-
-override_dh_install:
-	dh_install
-	dh_sphinxdoc -X_sources
-
 %:
 	dh $@ --buildsystem=cmake --parallel
diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index d0191bbcd99..5f757caacf7 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -88,21 +88,6 @@
                   "libopen62541-{}.{}-dev.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
-install_file_template = os.path.join(debian_path, "libopen62541-tools.install-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}-tools.install".format(version_major, version_minor))
-shutil.copy(install_file_template, install_file)
-
-install_file_template = os.path.join(debian_path, "libopen62541-doc.doc-base-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}-doc.doc-base".format(version_major, version_minor))
-shutil.copy(install_file_template, install_file)
-
-install_file_template = os.path.join(debian_path, "libopen62541-doc.install-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}-doc.install".format(version_major, version_minor))
-shutil.copy(install_file_template, install_file)
-
 # Create rule file and replace template variables
 rule_file_template = os.path.join(debian_path, "rules-template")
 rule_file = os.path.join(target_debian_path, "rules")

From 7b91f4c38b4b925d58b09d364f7e4368d245ae25 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 4 Apr 2024 00:43:06 +0200
Subject: [PATCH 1460/1963] refactor(client): Add additional mutex assertions

---
 src/client/ua_client_connect.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 5c437bc49c1..562e48ae6b3 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1368,6 +1368,7 @@ initSecurityPolicy(UA_Client *client) {
 
 static void
 connectActivity(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
     UA_LOG_TRACE(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Client connect iterate");
 
@@ -1652,6 +1653,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 /* Initialize a TCP connection. Writes the result to client->connectStatus. */
 static void
 initConnect(UA_Client *client) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
     if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Client connection already initiated");
@@ -1786,6 +1788,8 @@ connectSync(UA_Client *client) {
 
 UA_StatusCode
 connectInternal(UA_Client *client, UA_Boolean async) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     /* Reset the connectStatus. This should be the only place where we can
      * recover from a bad connectStatus. */
     client->connectStatus = UA_STATUSCODE_GOOD;
@@ -1800,6 +1804,8 @@ connectInternal(UA_Client *client, UA_Boolean async) {
 
 UA_StatusCode
 connectSecureChannel(UA_Client *client, const char *endpointUrl) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_ClientConfig *cc = UA_Client_getConfig(client);
     cc->noSession = true;
     UA_String_clear(&cc->endpointUrl);

From 43ea708216e0460d9d50348a140a952cca34fe81 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 4 Apr 2024 00:53:03 +0200
Subject: [PATCH 1461/1963] fix(client): Always take the client lock before
 __UA_Client_startup

---
 src/client/ua_client.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 1c572343f44..9916fb512e1 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -1015,17 +1015,19 @@ clientHouseKeeping(UA_Client *client, void *_) {
 
 UA_StatusCode
 __UA_Client_startup(UA_Client *client) {
-    /* On entry, the client mutex is already locked */
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_EventLoop *el = client->config.eventLoop;
     UA_CHECK_ERROR(el != NULL,
                    return UA_STATUSCODE_BADINTERNALERROR,
                    client->config.logging, UA_LOGCATEGORY_CLIENT,
                    "No EventLoop configured");
 
-    /* Set up the regular callback for checking the internal state? */
+    /* Set up the repeated timer callback for checking the internal state. Like
+     * in the public API UA_Client_addRepeatedCallback, but without locking the
+     * mutex again */
     UA_StatusCode rv = UA_STATUSCODE_GOOD;
     if(!client->houseKeepingCallbackId) {
-        /* As per UA_Client_addRepeatedCallback but without locking mutex */
         rv = el->addCyclicCallback(el, (UA_Callback)clientHouseKeeping,
                                    client, NULL, 1000.0, NULL,
                                    UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
@@ -1044,10 +1046,15 @@ __UA_Client_startup(UA_Client *client) {
 
 UA_StatusCode
 UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
+    /* Make sure the EventLoop has been started */
+    UA_LOCK(&client->clientMutex);
     UA_StatusCode rv = __UA_Client_startup(client);
+    UA_UNLOCK(&client->clientMutex);
     UA_CHECK_STATUS(rv, return rv);
 
-    /* Process timed and network events in the EventLoop */
+    /* All timers and network events are triggered in the EventLoop. Release the
+     * client lock before. The callbacks from the EventLoop take the lock
+     * again. */
     UA_EventLoop *el = client->config.eventLoop;
     rv = el->run(el, timeout);
     UA_CHECK_STATUS(rv, return rv);

From f70bf4943e02bc6b6fc09ebdd1cf56b63af9db0f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 4 Apr 2024 22:35:57 +0200
Subject: [PATCH 1462/1963] refactor(server): Inline the A&C conditions
 callback structure

---
 .../ua_subscription_alarms_conditions.c       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index ce0b7467136..68ea0e9b831 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -19,15 +19,6 @@ typedef enum {
   UA_ACTIVE_LOWLOW
 } UA_ActiveState;
 
-typedef struct {
-    UA_TwoStateVariableChangeCallback enableStateCallback;
-    UA_TwoStateVariableChangeCallback ackStateCallback;
-    UA_Boolean ackedRemoveBranch;
-    UA_TwoStateVariableChangeCallback confirmStateCallback;
-    UA_Boolean confirmedRemoveBranch;
-    UA_TwoStateVariableChangeCallback activeStateCallback;
-} UA_ConditionCallbacks;
-
 /* In Alarms and Conditions first implementation, conditionBranchId is always
  * equal to NULL NodeId (UA_NODEID_NULL). That ConditionBranch represents the
  * current state Condition. The current state is determined by the last Event
@@ -47,7 +38,17 @@ typedef struct UA_Condition {
     UA_NodeId conditionId;
     UA_UInt16 lastSeverity;
     UA_DateTime lastSeveritySourceTimeStamp;
-    UA_ConditionCallbacks callbacks;
+
+    /* These callbacks must only be called with a taken server lock */
+    struct {
+        UA_TwoStateVariableChangeCallback enableStateCallback;
+        UA_TwoStateVariableChangeCallback ackStateCallback;
+        UA_Boolean ackedRemoveBranch;
+        UA_TwoStateVariableChangeCallback confirmStateCallback;
+        UA_Boolean confirmedRemoveBranch;
+        UA_TwoStateVariableChangeCallback activeStateCallback;
+    } callbacks;
+
     UA_ActiveState lastActiveState;
     UA_ActiveState currentActiveState;
     UA_Boolean isLimitAlarm;

From 60319c6b868e38ed07332d9553d5e1944fad1544 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 4 Apr 2024 22:36:29 +0200
Subject: [PATCH 1463/1963] refactor(server): Cosmetic improvements in
 ua_subscription_alarms_conditions.c

---
 .../ua_subscription_alarms_conditions.c       | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 68ea0e9b831..03da4469b13 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -11,12 +11,12 @@
 #ifdef UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS
 
 typedef enum {
-  UA_INACTIVE,
-  UA_ACTIVE,
-  UA_ACTIVE_HIGHHIGH,
-  UA_ACTIVE_HIGH,
-  UA_ACTIVE_LOW,
-  UA_ACTIVE_LOWLOW
+    UA_INACTIVE = 0,
+    UA_ACTIVE,
+    UA_ACTIVE_HIGHHIGH,
+    UA_ACTIVE_HIGH,
+    UA_ACTIVE_LOW,
+    UA_ACTIVE_LOWLOW
 } UA_ActiveState;
 
 /* In Alarms and Conditions first implementation, conditionBranchId is always
@@ -39,7 +39,8 @@ typedef struct UA_Condition {
     UA_UInt16 lastSeverity;
     UA_DateTime lastSeveritySourceTimeStamp;
 
-    /* These callbacks must only be called with a taken server lock */
+    /* These callbacks are defined by the user and must not be called with a
+     * locked server mutex */
     struct {
         UA_TwoStateVariableChangeCallback enableStateCallback;
         UA_TwoStateVariableChangeCallback ackStateCallback;
@@ -284,8 +285,8 @@ UA_Server_setConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeI
 
 static UA_StatusCode
 getConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeId *branch,
-                                    UA_Condition *condition, UA_Boolean *removeBranch,
-                                    UA_TwoStateVariableCallbackType callbackType) {
+                                     UA_Condition *condition, UA_Boolean *removeBranch,
+                                     UA_TwoStateVariableCallbackType callbackType) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     switch(callbackType) {
@@ -372,6 +373,7 @@ copyFieldParent(void *context, UA_ReferenceTarget *t) {
 static UA_StatusCode
 getFieldParentNodeId(UA_Server *server, const UA_NodeId *field, UA_NodeId *parent) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     *parent = UA_NODEID_NULL;
     const UA_Node *fieldNode = UA_NODESTORE_GET(server, field);
     if(!fieldNode)
@@ -1848,6 +1850,7 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     //TODO implement logic for subscription array
     /* Check if valid subscriptionId */
@@ -1891,6 +1894,7 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
 
     //TODO implement logic for subscription array

From 952a65f1a3388936d376e6c556c3c7e69397704d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 4 Apr 2024 22:54:39 +0200
Subject: [PATCH 1464/1963] fix(server): Make sure the A&C callbacks are only
 called without a locked server mutex

---
 .../ua_subscription_alarms_conditions.c       | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 03da4469b13..5d735aa8054 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -288,35 +288,44 @@ getConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeId *branch,
                                      UA_Condition *condition, UA_Boolean *removeBranch,
                                      UA_TwoStateVariableCallbackType callbackType) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
 
+    /* That callbacks are defined in the userland. Release the server lock before. */
+    UA_UNLOCK(&server->serviceMutex);
+
+    /* TODO log warning when the callback wasn't set */
     switch(callbackType) {
     case UA_ENTERING_ENABLEDSTATE:
-        if(condition->callbacks.enableStateCallback != NULL)
-            return condition->callbacks.enableStateCallback(server, branch);
-        return UA_STATUSCODE_GOOD;//TODO log warning when the callback wasn't set
+        if(condition->callbacks.enableStateCallback)
+            res = condition->callbacks.enableStateCallback(server, branch);
+        break;
 
     case UA_ENTERING_ACKEDSTATE:
-        if(condition->callbacks.ackStateCallback != NULL) {
+        if(condition->callbacks.ackStateCallback) {
             *removeBranch = condition->callbacks.ackedRemoveBranch;
-            return condition->callbacks.ackStateCallback(server, branch);
+            res = condition->callbacks.ackStateCallback(server, branch);
         }
-        return UA_STATUSCODE_GOOD;
+        break;
 
     case UA_ENTERING_CONFIRMEDSTATE:
-        if(condition->callbacks.confirmStateCallback != NULL) {
+        if(condition->callbacks.confirmStateCallback) {
             *removeBranch = condition->callbacks.confirmedRemoveBranch;
-            return condition->callbacks.confirmStateCallback(server, branch);
+            res = condition->callbacks.confirmStateCallback(server, branch);
         }
-        return UA_STATUSCODE_GOOD;
+        break;
 
     case UA_ENTERING_ACTIVESTATE:
-        if(condition->callbacks.activeStateCallback != NULL)
-            return condition->callbacks.activeStateCallback(server, branch);
-        return UA_STATUSCODE_GOOD;
+        if(condition->callbacks.activeStateCallback)
+            res = condition->callbacks.activeStateCallback(server, branch);
+        break;
 
     default:
-        return UA_STATUSCODE_BADNOTFOUND;
+        res = UA_STATUSCODE_BADNOTFOUND;
+        break;
     }
+    UA_LOCK(&server->serviceMutex);
+
+    return res;
 }
 
 static UA_StatusCode

From c964d9cfe15ac6e1eafc923b9ed7e33b0bdab5d9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 3 Apr 2024 11:48:53 +0200
Subject: [PATCH 1465/1963] fix(pubsub): Remove a potential memleak for very
 large PubSub JSON messages

(cherry picked from commit 0a2b8fbfbb65c0a0821d271ecf9661514ad54efe)
---
 src/pubsub/ua_pubsub_networkmessage_json.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index 3f56d22968a..21a486abcd9 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -512,16 +512,19 @@ NetworkMessage_decodeJsonInternal(ParseCtx *ctx, UA_NetworkMessage *dst) {
 status
 UA_NetworkMessage_decodeJson(UA_NetworkMessage *dst, const UA_ByteString *src) {
     /* Set up the context */
+    cj5_token tokens[UA_JSON_MAXTOKENCOUNT];
     ParseCtx ctx;
     memset(&ctx, 0, sizeof(ParseCtx));
-    ctx.tokens = (cj5_token*)
-        UA_calloc(UA_JSON_MAXTOKENCOUNT, sizeof(cj5_token));
-    if(!ctx.tokens)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    status ret = tokenize(&ctx, src, UA_JSON_MAXTOKENCOUNT);
+    ctx.tokens = tokens;
+    status ret = tokenize(&ctx, src, UA_JSON_MAXTOKENCOUNT, NULL);
     if(ret != UA_STATUSCODE_GOOD)
-        return ret;
+        goto cleanup;
+
     ret = NetworkMessage_decodeJsonInternal(&ctx, dst);
-    UA_free((void*)(uintptr_t)ctx.tokens);
+
+ cleanup:
+    /* Free token array on the heap */
+    if(ctx.tokens != tokens)
+        UA_free((void*)(uintptr_t)ctx.tokens);
     return ret;
 }

From cb8e7c61843bf85d11a42fdc360a98c6239d5239 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 8 Apr 2024 15:17:13 +0200
Subject: [PATCH 1466/1963] fix(pubsub): Adjust the function call of the
 tokenize function

---
 src/pubsub/ua_pubsub_networkmessage_json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index 21a486abcd9..f78d4399700 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -516,7 +516,7 @@ UA_NetworkMessage_decodeJson(UA_NetworkMessage *dst, const UA_ByteString *src) {
     ParseCtx ctx;
     memset(&ctx, 0, sizeof(ParseCtx));
     ctx.tokens = tokens;
-    status ret = tokenize(&ctx, src, UA_JSON_MAXTOKENCOUNT, NULL);
+    status ret = tokenize(&ctx, src, UA_JSON_MAXTOKENCOUNT);
     if(ret != UA_STATUSCODE_GOOD)
         goto cleanup;
 

From 84347820c8550b5750f2cd581c14ab201611c579 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 8 Apr 2024 16:27:38 +0200
Subject: [PATCH 1467/1963] Bump the version to 1.4.0

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9332c7db554..8b3c2cebc3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
 set(OPEN62541_VER_PATCH 0)
-set(OPEN62541_VER_LABEL "-rc2") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
+set(OPEN62541_VER_LABEL "") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 
 # Overwrite the version information based on git if available

From 2405c6588f8d8093e3e0e49e920db64daf479799 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 8 Apr 2024 16:48:20 +0200
Subject: [PATCH 1468/1963] Bump version to 1.3.10

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a051f12f6f..986ed1731cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 9)
+set(OPEN62541_VER_PATCH 10)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 4df0a3df6d5e971213aeac30e922a59dd6157008 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 11 Apr 2024 07:25:46 +0200
Subject: [PATCH 1469/1963] Bump the version for 1.4.1 hotfix

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b3c2cebc3f..d00abb48c33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
 set(OPEN62541_VER_PATCH 0)
-set(OPEN62541_VER_LABEL "") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
+set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 
 # Overwrite the version information based on git if available

From b0f06275937c2d7977bddea01e1c5bc19372d321 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 11 Apr 2024 07:10:01 +0200
Subject: [PATCH 1470/1963] fix(build): Reintegrate open62541Macros

Has been removed with commit 9e0b766fbba73be8d703b6ccbfdeec5bfd200b48
---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d00abb48c33..613bb9e15fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1491,6 +1491,12 @@ install(EXPORT open62541Targets
 export(TARGETS open62541 NAMESPACE open62541::
        FILE ${CMAKE_CURRENT_BINARY_DIR}/open62541Targets.cmake)
 
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/macros_public.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/open62541Macros.cmake" COPYONLY)
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Macros.cmake"
+        DESTINATION "${cmake_configfile_install}")
+
 # Create open62541Targets.cmake
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     install(FILES "${PROJECT_BINARY_DIR}/src_generated/open62541.pc"

From 48243932aeabc977c87b4fd23575586fb1d0d104 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 11 Apr 2024 07:15:13 +0200
Subject: [PATCH 1471/1963] fix(build): Provide libopen62541-tools package
 again

Nodeset compiler has been removed with commit 9e0b766fbba73be8d703b6ccbfdeec5bfd200b48
---
 CMakeLists.txt                                | 27 ++++++++++++++++++-
 tools/cmake/open62541Config.cmake.in          |  3 +++
 tools/packaging/debian/control-template       | 13 +++++++++
 .../libopen62541-tools.install-template       |  9 +++++++
 tools/prepare_packaging.py                    |  5 ++++
 5 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 tools/packaging/debian/libopen62541-tools.install-template

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 613bb9e15fd..4ff9e5630fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1466,12 +1466,18 @@ install(TARGETS open62541
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         INCLUDES DESTINATION include)
 
+set(open62541_install_tools_dir share/open62541/tools)
+set(open62541_install_nodeset_dir share/open62541/tools/ua-nodeset)
+
 # Create open62541Config.cmake
 include(CMakePackageConfigHelpers)
 set(cmake_configfile_install ${CMAKE_INSTALL_LIBDIR}/cmake/open62541)
 configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541Config.cmake.in"
                               "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
-                              INSTALL_DESTINATION "${cmake_configfile_install}")
+                              INSTALL_DESTINATION "${cmake_configfile_install}"
+                              PATH_VARS open62541_install_tools_dir
+                                        open62541_install_nodeset_dir
+                              )
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
         DESTINATION "${cmake_configfile_install}")
 
@@ -1503,6 +1509,25 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
 
+set(UA_install_tools_dirs "tools/certs"
+    "tools/nodeset_compiler"
+    "tools/schema"
+    ${UA_NODESET_DIR})
+
+set(UA_install_tools_files "tools/generate_datatypes.py"
+    "tools/generate_nodeid_header.py"
+    "tools/generate_statuscode_descriptions.py")
+
+install(DIRECTORY ${UA_install_tools_dirs}
+        DESTINATION ${open62541_install_tools_dir}
+        USE_SOURCE_PERMISSIONS
+        FILES_MATCHING
+        PATTERN "*"
+        PATTERN "*.pyc" EXCLUDE
+        PATTERN ".git*" EXCLUDE)
+
+install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir})
+
 # Recreate the include folder structure from the source also in /usr/lib/include/open62541
 if(NOT UA_ENABLE_AMALGAMATION)
     set(FILES_TO_INSTALL ${exported_headers} ${plugin_headers})
diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index 1197e449842..f6743f3ebfa 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -1,2 +1,5 @@
 @PACKAGE_INIT@
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
+
+set (open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
+set (UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
diff --git a/tools/packaging/debian/control-template b/tools/packaging/debian/control-template
index 72b58cb326b..ccfadb6f0ae 100644
--- a/tools/packaging/debian/control-template
+++ b/tools/packaging/debian/control-template
@@ -32,3 +32,16 @@ Description: open62541 (<http://open62541.org>) is an open source implementation
  communication into existing applications.
  .
  This package provides the open62541 header and development files
+
+Package: libopen62541-<soname>-tools
+Section: libdevel
+Architecture: all
+Depends: ${misc:Depends}, python3
+Recommends: libopen62541-<soname>-dev
+Description: open62541 (<http://open62541.org>) is an open source implementation
+ of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The
+ library is usable with all major compilers and provides the necessary tools to
+ implement dedicated OPC UA clients and servers, or to integrate OPC UA-based
+ communication into existing applications.
+ .
+ This package provides some open62541 tools, e.g. the nodeset compiler
diff --git a/tools/packaging/debian/libopen62541-tools.install-template b/tools/packaging/debian/libopen62541-tools.install-template
new file mode 100644
index 00000000000..fb42663dbae
--- /dev/null
+++ b/tools/packaging/debian/libopen62541-tools.install-template
@@ -0,0 +1,9 @@
+usr/share/open62541/tools/*.py
+usr/share/open62541/tools/certs
+usr/share/open62541/tools/nodeset_compiler
+usr/share/open62541/tools/schema
+usr/share/open62541/tools/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml
+usr/share/open62541/tools/ua-nodeset/Schema/Opc.Ua.Types.bsd
+usr/share/open62541/tools/ua-nodeset/Schema/AttributeIds.csv
+usr/share/open62541/tools/ua-nodeset/Schema/NodeIds.csv
+usr/share/open62541/tools/ua-nodeset/Schema/StatusCode.csv
diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index 5f757caacf7..4578fc8d329 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -88,6 +88,11 @@
                   "libopen62541-{}.{}-dev.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
+install_file_template = os.path.join(debian_path, "libopen62541-tools.install-template")
+install_file = os.path.join(target_debian_path,
+                  "libopen62541-{}.{}-tools.install".format(version_major, version_minor))
+shutil.copy(install_file_template, install_file)
+
 # Create rule file and replace template variables
 rule_file_template = os.path.join(debian_path, "rules-template")
 rule_file = os.path.join(target_debian_path, "rules")

From 24b51402710ac87fafa8628a5602e709a1f6cc4d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 30 Mar 2024 09:57:29 +0100
Subject: [PATCH 1472/1963] refactor(build): Persist the compiler flags between
 CMake runs

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ff9e5630fc..c87df2e79ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -555,7 +555,7 @@ function(check_add_cc_flag CC_FLAG)
         message(STATUS "Test CC flag ${CC_FLAG}")
         check_c_compiler_flag("${CC_FLAG}" flag_supported)
         if(flag_supported)
-            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CC_FLAG}" PARENT_SCOPE)
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CC_FLAG}" CACHE INTERNAL "C Compiler Flags")
         endif()
         unset(flag_supported CACHE)
     endif()

From b8e71c8a9fbbbd55f0b3ee69ea68945f4de7b2f1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 7 Apr 2024 03:09:49 +0200
Subject: [PATCH 1473/1963] refactor(build): Always enable -fPIC for shared
 library builds

---
 CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c87df2e79ba..c44dd1422d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -560,6 +560,12 @@ function(check_add_cc_flag CC_FLAG)
         unset(flag_supported CACHE)
     endif()
 endfunction()
+function(add_cc_flag CC_FLAG)
+    string(FIND "${CMAKE_C_FLAGS}" "${CC_FLAG}" flag_already_set)
+    if(flag_already_set EQUAL -1)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CC_FLAG}" CACHE INTERNAL "C Compiler Flags")
+    endif()
+endfunction()
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
     check_add_cc_flag("-std=c99")   # C99 mode
@@ -602,7 +608,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
 
     # Generate position-independent code for shared libraries (adds a performance penalty)
     if(BUILD_SHARED_LIBS)
-        check_add_cc_flag("-fPIC")
+        add_cc_flag("-fPIC")
     endif()
 
     if(UA_MULTITHREADING GREATER_EQUAL 100 AND NOT WIN32)

From 564dc2ff391c36ecbfbd37bb3bb55bea425eafa3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 7 Apr 2024 03:11:12 +0200
Subject: [PATCH 1474/1963] fix(examples): Use stdlib.h over malloc.h

---
 examples/tutorial_server_method_async.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/tutorial_server_method_async.c b/examples/tutorial_server_method_async.c
index 115d8439a49..cd1d6112f2e 100644
--- a/examples/tutorial_server_method_async.c
+++ b/examples/tutorial_server_method_async.c
@@ -35,7 +35,7 @@
 #include <open62541/server.h>
 
 #include <signal.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "common.h"
 
 #ifndef _WIN32

From c06bd907acd08858b9005003a6e8a0c7678d4b74 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 17 Apr 2024 13:48:37 +0200
Subject: [PATCH 1475/1963] fix(build): Reduce debian package dependencies for
 Debian Buster (oldoldstable)

---
 tools/packaging/debian/control-template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/packaging/debian/control-template b/tools/packaging/debian/control-template
index ccfadb6f0ae..6f5136491d8 100644
--- a/tools/packaging/debian/control-template
+++ b/tools/packaging/debian/control-template
@@ -1,7 +1,7 @@
 Source: open62541
 Priority: optional
 Maintainer: open62541 Team <open62541-core@googlegroups.com>
-Build-Depends: debhelper (>= 9), cmake (>= 3.13), python3 (>= 3.11), libmbedtls-dev (>= 2.28.0)
+Build-Depends: debhelper (>= 9), cmake (>= 3.13), python3 (>= 3.7), libmbedtls-dev (>= 2.16.0)
 Standards-Version: 4.4.1
 Section: libs
 Homepage: https://open62541.org/
@@ -11,7 +11,7 @@ Vcs-Browser: https://github.com/open62541/open62541
 Package: libopen62541-<soname>
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmbedtls14
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmbedtls12 | libmbedtls14
 Description: open62541 (<http://open62541.org>) is an open source implementation
  of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The
  library is usable with all major compilers and provides the necessary tools to

From a4eb57f82d2cf08f4619deeb62a084c9c6ffd85f Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Tue, 23 Apr 2024 09:14:26 +0200
Subject: [PATCH 1476/1963] refactor(core): Import Python3 in public macros and
 use Python3_EXECUTABLE everywhere

---
 CMakeLists.txt                  |  9 ++++-----
 doc/CMakeLists.txt              |  2 +-
 tests/CMakeLists.txt            |  2 +-
 tools/cmake/macros_public.cmake | 13 ++++++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c44dd1422d7..02a5ddf0487 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@ if(${CMAKE_VERSION} VERSION_LESS 3.12)
 endif()
 
 find_package(Python3 REQUIRED)
-set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
 
 find_package(Git)
 include(AssignSourceGroup)
@@ -1198,7 +1197,7 @@ ua_generate_datatypes(INTERNAL NAME "transport" TARGET_SUFFIX "transport" NAMESP
 add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
                           ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c
                    PRE_BUILD
-                   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
+                   COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
                            ${UA_FILE_STATUSCODES} ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes
                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
                            ${UA_FILE_STATUSCODES})
@@ -1218,7 +1217,7 @@ if(UA_ENABLE_AMALGAMATION)
     # single-file release
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/open62541.h
                        PRE_BUILD
-                       COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
+                       COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
                                ${OPEN62541_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/open62541.h
                                ${exported_headers} ${plugin_headers}
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
@@ -1226,7 +1225,7 @@ if(UA_ENABLE_AMALGAMATION)
 
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/open62541.c
                        PRE_BUILD
-                       COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
+                       COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
                                ${OPEN62541_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/open62541.c
                                ${lib_headers} ${lib_sources} ${plugin_sources} ${architecture_headers} ${architecture_sources}
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py ${lib_headers}
@@ -1250,7 +1249,7 @@ if(UA_ENABLE_NODESET_INJECTOR)
     cmake_minimum_required(VERSION 3.20)
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
                        ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c PRE_BUILD
-                       COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/nodeset_injector/generate_nodesetinjector.py
+                       COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/nodeset_injector/generate_nodesetinjector.py
                        ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector)
     add_custom_target(open62541-generator-nodesetinjector DEPENDS
                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index c4bafd1ae1f..68d89f27375 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -30,7 +30,7 @@ macro(generate_rst in out)
     add_custom_command(OUTPUT ${out}
                        DEPENDS ${PROJECT_SOURCE_DIR}/tools/c2rst.py ${in}
                        PRE_BUILD
-                       COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/c2rst.py ${in} ${out})
+                       COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/c2rst.py ${in} ${out})
     list(APPEND GENERATED_RST "${out}")
 endmacro()
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bb0f8885709..d62bd596673 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -173,7 +173,7 @@ macro(add_test_valgrind TEST_NAME)
         else()
             set(VALGRIND_LOG ${TESTS_BINARY_DIR}/${TEST_NAME}.log)
             set(VALGRIND_CMD valgrind --error-exitcode=1 --suppressions=${PROJECT_SOURCE_DIR}/tools/valgrind_suppressions.supp ${VALGRIND_FLAGS} --log-file=${VALGRIND_LOG} ${ARGN})
-            add_test(${TEST_NAME} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/valgrind_check_error.py ${VALGRIND_LOG} ${VALGRIND_CMD})
+            add_test(${TEST_NAME} ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/valgrind_check_error.py ${VALGRIND_LOG} ${VALGRIND_CMD})
         endif()
     else()
         add_test(${TEST_NAME} ${ARGN})
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/macros_public.cmake
index df5cd7b0c18..5a1494a464e 100644
--- a/tools/cmake/macros_public.cmake
+++ b/tools/cmake/macros_public.cmake
@@ -2,6 +2,9 @@ if(NOT open62541_TOOLS_DIR OR "${open62541_TOOLS_DIR}" STREQUAL "")
     set(open62541_TOOLS_DIR "${PROJECT_SOURCE_DIR}/tools")
 endif()
 
+# Required when installed
+find_package(Python3 REQUIRED)
+
 # --------------- Generate NodeIDs header ---------------------
 #
 # Generates header file from .csv which contains defines for every
@@ -65,7 +68,7 @@ function(ua_generate_nodeid_header)
     # Header containing defines for all NodeIds
     add_custom_command(OUTPUT ${UA_GEN_ID_OUTPUT_DIR}/${UA_GEN_ID_NAME}.h
         PRE_BUILD
-        COMMAND ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_nodeid_header.py
+        COMMAND ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_nodeid_header.py
         ${UA_GEN_ID_FILE_CSV}  ${UA_GEN_ID_OUTPUT_DIR}/${UA_GEN_ID_NAME} ${UA_GEN_ID_ID_PREFIX}
         DEPENDS ${open62541_TOOLS_DIR}/generate_nodeid_header.py
         ${UA_GEN_ID_FILE_CSV})
@@ -217,7 +220,7 @@ function(ua_generate_datatypes)
         ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.h
         ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated_handling.h
         PRE_BUILD
-        COMMAND ${ARG_CONV_EXCL_ENV} ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_datatypes.py
+        COMMAND ${ARG_CONV_EXCL_ENV} ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_datatypes.py
         ${NAMESPACE_MAP_TMP}
         ${SELECTED_TYPES_TMP}
         ${BSD_FILES_TMP}
@@ -394,7 +397,7 @@ function(ua_generate_nodeset)
     add_custom_command(OUTPUT ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c
                        ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h
                        PRE_BUILD
-                       COMMAND ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_compiler/nodeset_compiler.py
+                       COMMAND ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_compiler/nodeset_compiler.py
                        ${GEN_INTERNAL_HEADERS}
                        ${GEN_NS0}
                        ${GEN_BIN_SIZE}
@@ -433,7 +436,7 @@ function(ua_generate_nodeset)
             if(NOT TARGET ${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection)
                 add_dependencies(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX} open62541-generator-nodesetinjector)
                 add_custom_target(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection
-                                  COMMAND ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_injector/generate_nodesetinjector_content.py
+                                  COMMAND ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_injector/generate_nodesetinjector_content.py
                                   ${CMAKE_BINARY_DIR}/src_generated/open62541/nodesetinjector
                                   "namespace${FILE_SUFFIX}"
                                   DEPENDS
@@ -589,7 +592,7 @@ function(ua_generate_nodeset_and_datatypes)
     if("${UA_GEN_FILE_BSD}" STREQUAL "" AND NOT "${UA_GEN_FILE_CSV}" STREQUAL "")
         string(TOUPPER "${UA_GEN_NAME}" BSD_NAME)
         file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/bsd_files_gen")
-        execute_process(COMMAND ${PYTHON_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_bsd.py
+        execute_process(COMMAND ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_bsd.py
                         --xml ${UA_GEN_FILE_NS}
                         ${PROJECT_BINARY_DIR}/bsd_files_gen/Opc.Ua.${BSD_NAME}.Types.bsd)
         if(EXISTS "${PROJECT_BINARY_DIR}/bsd_files_gen/Opc.Ua.${BSD_NAME}.Types.bsd")

From 0f8a7f41164b3351edcf9929b5f766fd6592fb21 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Tue, 23 Apr 2024 13:22:50 +0200
Subject: [PATCH 1477/1963] fix(server): Fix string output with %*s

%.*s must be used if a length of an unlimited buffer is provided
and only the first 'n' bytes should be printed.
---
 src/server/ua_server_binary.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 99808e3730a..7569d8b6d52 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1138,7 +1138,7 @@ createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *c
 static void
 addDiscoveryUrl(UA_Server *server, const UA_String hostname, UA_UInt16 port) {
     char urlstr[1024];
-    mp_snprintf(urlstr, 1024, "opc.tcp://%*s:%d",
+    mp_snprintf(urlstr, 1024, "opc.tcp://%.*s:%d",
                 (int)hostname.length, (char*)hostname.data, port);
     UA_String discoveryServerUrl = UA_STRING(urlstr);
 
@@ -1157,7 +1157,7 @@ addDiscoveryUrl(UA_Server *server, const UA_String hostname, UA_UInt16 port) {
                             &discoveryServerUrl, &UA_TYPES[UA_TYPES_STRING]);
     if(res == UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
-                    "New DiscoveryUrl added: %*s", (int)discoveryServerUrl.length,
+                    "New DiscoveryUrl added: %.*s", (int)discoveryServerUrl.length,
                     (char*)discoveryServerUrl.data);
     } else {
         UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,

From 8a75c0060b2051981a0c2d0775a513dca48f5af5 Mon Sep 17 00:00:00 2001
From: Goetz Goerisch <g.goerisch@vdw.de>
Date: Fri, 19 Apr 2024 05:55:01 +0000
Subject: [PATCH 1478/1963] build(deps): bump deps/nodesetLoader from `fd60349`
 to `a6ef450`

---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index fd603490d7d..a6ef45054ff 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit fd603490d7dbf6727a9cfa8ac819657ed6ae4c47
+Subproject commit a6ef45054ff74e0d798fccc257e4646355dadb6a

From 4ec3bd92f5761020ce546ddeec2f1de610d02acb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 26 Apr 2024 07:47:48 +0200
Subject: [PATCH 1479/1963] refactor(build): Enable PubSub (+ InformationModel
 representation) by default

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02a5ddf0487..4206caed0ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -307,8 +307,8 @@ option(UA_FORCE_WERROR "Force compilation with -Werror (or /WX on MSVC)" OFF)
 option(UA_ENABLE_DEBUG_SANITIZER "Use sanitizer in debug mode" ON)
 mark_as_advanced(UA_ENABLE_DEBUG_SANITIZER)
 
-#General PubSub setup
-option(UA_ENABLE_PUBSUB "Enable the PubSub protocol" OFF)
+# General PubSub setup
+option(UA_ENABLE_PUBSUB "Enable the PubSub protocol" ON)
 
 option(UA_ENABLE_PUBSUB_ENCRYPTION "Enable encryption of the PubSub payload" OFF)
 mark_as_advanced(UA_ENABLE_PUBSUB_ENCRYPTION)
@@ -322,7 +322,7 @@ if(UA_ENABLE_PUBSUB_SKS)
     endif()
 endif()
 
-option(UA_ENABLE_PUBSUB_INFORMATIONMODEL "Enable PubSub information model twin" OFF)
+option(UA_ENABLE_PUBSUB_INFORMATIONMODEL "Enable PubSub information model twin" ON)
 if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
     if(NOT UA_ENABLE_PUBSUB)
         message(FATAL_ERROR "PubSub information model representation cannot be used with disabled PubSub function.")

From 9964d5cf1ffe06867b28b475af29bf131640c41d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 26 Apr 2024 09:23:47 +0200
Subject: [PATCH 1480/1963] refactor(build): Enable PubSub by default for the
 Debian packages

---
 tools/packaging/debian/rules-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packaging/debian/rules-template b/tools/packaging/debian/rules-template
index e283e20508b..071bf4cadfb 100755
--- a/tools/packaging/debian/rules-template
+++ b/tools/packaging/debian/rules-template
@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=REDUCED -DUA_ENABLE_ENCRYPTION="MBEDTLS" -DUA_ENABLE_AMALGAMATION=OFF -DUA_PACK_DEBIAN=ON -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)"
+	dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=REDUCED -DUA_ENABLE_ENCRYPTION="MBEDTLS" -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON -DUA_ENABLE_AMALGAMATION=OFF -DUA_PACK_DEBIAN=ON -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)"
 
 override_dh_auto_test:
 	dh_auto_test -- ARGS+=--output-on-failure

From a5aa4cab13abe59ab4b3b0b6794b35a5258ac401 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 26 Apr 2024 09:29:47 +0200
Subject: [PATCH 1481/1963] refactor(build): Move packaging definitions into
 the main CMakeLists.txt

---
 CMakeLists.txt                 | 23 ++++++++++++++++++-----
 tools/packaging/CMakeLists.txt | 17 -----------------
 2 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 tools/packaging/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4206caed0ca..44e695603a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -463,9 +463,26 @@ endif()
 option(UA_BUILD_OSS_FUZZ "Special build switch used in oss-fuzz" OFF)
 mark_as_advanced(UA_BUILD_OSS_FUZZ)
 
-# Advanced Build Targets
+##########################
+# Advanced Build Targets #
+##########################
+
+# Build packages - invoke via `make package`
 option(UA_PACK_DEBIAN "Special build switch used in .deb packaging" OFF)
 mark_as_advanced(UA_PACK_DEBIAN)
+if(UA_PACK_DEBIAN)
+    set(CPACK_GENERATOR "TGZ;DEB")
+    set(CPACK_PACKAGE_VENDOR "open62541 team")
+    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OPC UA implementation")
+    set(CPACK_PACKAGE_DESCRIPTION "open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications.")
+    set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
+    set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
+    set(CPACK_PACKAGE_VERSION_MAJOR "${OPEN62541_VER_MAJOR}")
+    set(CPACK_PACKAGE_VERSION_MINOR "${OPEN62541_VER_MINOR}")
+    set(CPACK_PACKAGE_VERSION_PATCH "${OPEN62541_VER_PATCH}${OPEN62541_VER_LABEL}")
+    set(CPACK_DEBIAN_PACKAGE_MAINTAINER "open62541 team") # required
+    include(CPack)
+endif()
 
 # Building shared libs (dll, so). This option is written into ua_config.h.
 set(UA_DYNAMIC_LINKING OFF)
@@ -1562,10 +1579,6 @@ if(NOT UA_ENABLE_AMALGAMATION)
     endforeach()
 endif()
 
-if(UA_PACK_DEBIAN)
-    add_subdirectory(tools/packaging)
-endif()
-
 ##################################
 # Visual Studio Solution Folders #
 ##################################
diff --git a/tools/packaging/CMakeLists.txt b/tools/packaging/CMakeLists.txt
deleted file mode 100644
index 072c5d82ec5..00000000000
--- a/tools/packaging/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-##########################
-# Packaging (DEB/RPM)    #
-##########################
-# invoke via `make package`
-
-set(CPACK_GENERATOR "TGZ;DEB")
-set(CPACK_PACKAGE_VENDOR "open62541 team")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OPC UA implementation")
-set(CPACK_PACKAGE_DESCRIPTION "open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications.")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-set(CPACK_PACKAGE_VERSION_MAJOR "${OPEN62541_VER_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${OPEN62541_VER_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${OPEN62541_VER_PATCH}${OPEN62541_VER_LABEL}")
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "open62541 team") #required
-
-include(CPack)

From 12f6a2cfb52ca16cdbb364b8c7df12abe899f8fa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 26 Apr 2024 17:38:28 +0200
Subject: [PATCH 1482/1963] refactor(doc): Clean up /doc/building.rst

---
 doc/building.rst | 49 +++++++++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/doc/building.rst b/doc/building.rst
index acbc30aaa7b..0708acb97b5 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -15,14 +15,14 @@ Building with CMake on Ubuntu or Debian
 
 .. code-block:: bash
 
-   sudo apt-get install git build-essential gcc pkg-config cmake python
+   sudo apt-get install git build-essential gcc pkg-config cmake python3
 
    # enable additional features
-   sudo apt-get install cmake-curses-gui # for the ccmake graphical interface
-   sudo apt-get install libmbedtls-dev # for encryption support
+   sudo apt-get install cmake-curses-gui     # for the ccmake graphical interface
+   sudo apt-get install libmbedtls-dev       # for encryption support
    sudo apt-get install check libsubunit-dev # for unit tests
-   sudo apt-get install python-sphinx graphviz # for documentation generation
-   sudo apt-get install python-sphinx-rtd-theme # documentation style
+   sudo apt-get install python3-sphinx graphviz  # for documentation generation
+   sudo apt-get install python3-sphinx-rtd-theme # documentation style
 
    cd open62541
    mkdir build
@@ -59,9 +59,6 @@ In your own CMake project you can then include the open62541 library using:
    add_executable(main main.cpp)
    target_link_libraries(main open62541::open62541)
 
-A full list of enabled features during build time is stored in the CMake
-Variable ``open62541_COMPONENTS_ALL``
-
 Building with CMake on Windows
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -70,7 +67,7 @@ with MinGW, just replace the compiler selection in the call to CMake.
 
 - Download and install
 
-  - Python 2.7.x (Python 3.x works as well): https://python.org/downloads
+  - Python 3.x: https://python.org/downloads
   - CMake: http://www.cmake.org/cmake/resources/software.html
   - Microsoft Visual Studio: https://www.visualstudio.com/products/visual-studio-community-vs
 
@@ -233,6 +230,12 @@ Main Build Options
   - ``Debug`` -O0 optimization with debug symbols
   - ``MinSizeRel`` -Os optimization without debug symbols
 
+**BUILD_SHARED_LIBS**
+   Build a shared library (dll/so) or (an archive of) object files for linking
+   into a static binary. Shared libraries are recommended for a system-wide
+   install. Note that this option modifies the :file:`ua_config.h` file that is
+   also included in :file:`open62541.h` for the single-file distribution.
+
 **UA_LOGLEVEL**
    The SDK logs events of the level defined in ``UA_LOGLEVEL`` and above only.
    The logging event levels are as follows:
@@ -272,16 +275,13 @@ artifacts can be specified by the following options:
    An individual test can be executed with ``make test ARGS="-R <test_name> -V"``.
    The list of available tests can be displayed with ``make test ARGS="-N"``.
 
-**UA_BUILD_SELFSIGNED_CERTIFICATE**
-   Generate a self-signed certificate for the server (openSSL required)
-
 Detailed SDK Features
 ^^^^^^^^^^^^^^^^^^^^^
 
 **UA_ENABLE_SUBSCRIPTIONS**
    Enable subscriptions
 
-**UA_ENABLE_SUBSCRIPTIONS_EVENTS (EXPERIMENTAL)**
+**UA_ENABLE_SUBSCRIPTIONS_EVENTS**
     Enable the use of events for subscriptions. This is a new feature and currently marked as EXPERIMENTAL.
 
 **UA_ENABLE_SUBSCRIPTIONS_ALARMS_CONDITIONS (EXPERIMENTAL)**
@@ -308,12 +308,16 @@ Detailed SDK Features
 
 **UA_ENABLE_COVERAGE**
    Measure the coverage of unit tests
+
 **UA_ENABLE_DISCOVERY**
    Enable Discovery Service (LDS)
+
 **UA_ENABLE_DISCOVERY_MULTICAST**
    Enable Discovery Service with multicast support (LDS-ME)
+
 **UA_ENABLE_DISCOVERY_SEMAPHORE**
    Enable Discovery Semaphore support
+
 **UA_ENABLE_ENCRYPTION**
    Enable encryption support and specify the used encryption backend. The possible
    options are:
@@ -321,13 +325,13 @@ Detailed SDK Features
    - ``MBEDTLS`` Encryption support using mbed TLS
    - ``OPENSSL`` Encryption support using OpenSSL
    - ``LIBRESSL`` EXPERIMENTAL: Encryption support using LibreSSL
+
 **UA_ENABLE_ENCRYPTION_TPM2**
    Enable TPM hardware for encryption. The possible options are:
       - ``OFF`` No TPM encryption support. (default)
       - ``ON`` TPM encryption support
 
 **UA_NAMESPACE_ZERO**
-
    Namespace zero contains the standard-defined nodes. The full namespace zero
    may not be required for all applications. The selectable options are as follows:
 
@@ -348,6 +352,7 @@ be visible in the cmake GUIs.
 
 **UA_ENABLE_STATUSCODE_DESCRIPTIONS**
    Compile the human-readable name of the StatusCodes into the binary. Enabled by default.
+
 **UA_ENABLE_FULL_NS0**
    Use the full NS0 instead of a minimal Namespace 0 nodeset
    ``UA_FILE_NS0`` is used to specify the file for NS0 generation from namespace0 folder. Default value is ``Opc.Ua.NodeSet2.xml``
@@ -359,12 +364,6 @@ PubSub Build Options
    Enable the experimental OPC UA PubSub support. The option will include the
    PubSub UDP multicast plugin. Disabled by default.
 
-**UA_ENABLE_PUBSUB_DELTAFRAMES**
-   The PubSub messages differentiate between keyframe (all published values
-   contained) and deltaframe (only changed values contained) messages.
-   Deltaframe messages creation consumes some additional resources and can be
-   disabled with this flag. Disabled by default.
-
 **UA_ENABLE_PUBSUB_FILE_CONFIG**
    Enable loading OPC UA PubSub configuration from File/ByteString. Enabling
    PubSub informationmodel methods also will add a method to the
@@ -394,16 +393,6 @@ This group contains build options mainly useful for development of the library i
 **UA_DEBUG_DUMP_PKGS**
    Dump every package received by the server as hexdump format
 
-Building a shared library
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-open62541 is small enough that most users will want to statically link the
-library into their programs. If a shared library (.dll, .so) is required, this
-can be enabled in CMake with the ``BUILD_SHARED_LIBS`` option. Note that this
-option modifies the :file:`ua_config.h` file that is also included in
-:file:`open62541.h` for the single-file distribution.
-
-
 Minimizing the binary size
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 

From 70c25ecbd23624cee53b9ebee146a4e47341e52a Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Wed, 17 Apr 2024 08:42:42 +0200
Subject: [PATCH 1483/1963] fix(pubsub): Allow interface name for multicast

In case of multicast configuration only an IP address was allowed
for the network interface. Now also network interface names can be
used.
---
 arch/eventloop_posix_udp.c           | 226 +++++++++++++++++++++------
 arch/posix/ua_architecture.h         |   1 +
 include/open62541/plugin/eventloop.h |   5 +-
 3 files changed, 182 insertions(+), 50 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 38adf5c8054..e23ea19f35a 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -12,8 +12,8 @@
 #define IPV4_PREFIX_MASK 0xF0
 #define IPV4_MULTICAST_PREFIX 0xE0
 #if UA_IPV6
-#   define IPV6_PREFIX_MASK 0xFF
-#   define IPV6_MULTICAST_PREFIX 0xFF
+# define IPV6_PREFIX_MASK 0xFF
+# define IPV6_MULTICAST_PREFIX 0xFF
 #endif
 
 /* Configuration parameters */
@@ -64,6 +64,17 @@ typedef enum {
     MULTICASTTYPE_IPV6
 } MultiCastType;
 
+typedef union {
+#ifdef _WIN32
+    struct ip_mreq ipv4;
+#else
+    struct ip_mreqn ipv4;
+#endif
+#if UA_IPV6
+    struct ipv6_mreq ipv6;
+#endif
+} MulticastRequest;
+
 static UA_Boolean
 isMulticastAddress(const UA_Byte *address, UA_Byte mask, UA_Byte prefix) {
     return (address[0] & mask) == prefix;
@@ -86,62 +97,181 @@ multiCastType(struct addrinfo *info) {
     return MULTICASTTYPE_NONE;
 }
 
-typedef union {
-    struct ip_mreq ipv4;
+#ifdef _WIN32
+
+#define ADDR_BUFFER_SIZE 15000 /* recommended size in the MSVC docs */
+
+static UA_StatusCode
+setMulticastInterface(const char *netif, struct addrinfo *info,
+                      MulticastRequest *req, const UA_Logger *logger) {
+    ULONG outBufLen = ADDR_BUFFER_SIZE;
+    UA_STACKARRAY(char, addrBuf, ADDR_BUFFER_SIZE);
+
+    /* Get the network interface descriptions */
+    ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST |
+        GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME;
+    PIP_ADAPTER_ADDRESSES ifaddr = (IP_ADAPTER_ADDRESSES *)addrBuf;
+    DWORD ret = GetAdaptersAddresses(info->ai_family, flags, NULL, ifaddr, &outBufLen);
+    if(ret != NO_ERROR) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                     "UDP\t| Interface configuration preparation failed");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Iterate through linked list of network interfaces */
+    char sourceAddr[64];
+    unsigned int idx = 0;
+    for(PIP_ADAPTER_ADDRESSES ifa = ifaddr; ifa != NULL; ifa = ifa->Next) {
+        idx = (info->ai_family == AF_INET) ? ifa->IfIndex : ifa->Ipv6IfIndex;
+
+        /* Check if network interface name matches */
+        if(strcmp(ifa->AdapterName, netif) == 0)
+            goto done;
+
+        /* Check if ip address matches */
+        for(PIP_ADAPTER_UNICAST_ADDRESS u = ifa->FirstUnicastAddress; u; u = u->Next) {
+            LPSOCKADDR addr = u->Address.lpSockaddr;
+            if(addr->sa_family == AF_INET) {
+                inet_ntop(AF_INET, &((struct sockaddr_in*)addr)->sin_addr,
+                          sourceAddr, sizeof(sourceAddr));
+            } else if(addr->sa_family == AF_INET6) {
+                inet_ntop(AF_INET6, &((struct sockaddr_in6*)addr)->sin6_addr,
+                          sourceAddr, sizeof(sourceAddr));
+            } else {
+                continue;
+            }
+            if(strcmp(sourceAddr, netif) == 0)
+                goto done;
+        }
+    }
+
+    /* Not matching interface found */
+    UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                 "UDP\t| Interface configuration preparation failed "
+                 "(interface %s not found)", netif);
+    return UA_STATUSCODE_BADINTERNALERROR;
+
+ done:
+    /* Write the interface index */
+    if(info->ai_family == AF_INET)
+        /* MSVC documentation of struct ip_mreq: To use an interface index of 1
+         * would be the same as an IP address of 0.0.0.1. */
+        req->ipv4.imr_interface.s_addr = htonl(idx);
+    else /* if(info->ai_family == AF_INET6) */
+        req->ipv6.ipv6mr_interface = idx;
+    return UA_STATUSCODE_GOOD;
+}
+
+#else
+
+static UA_StatusCode
+setMulticastInterface(const char *netif, struct addrinfo *info,
+                      MulticastRequest *req, const UA_Logger *logger) {
+    struct ifaddrs *ifaddr;
+    int ret = getifaddrs(&ifaddr);
+    if(ret == -1) {
+        UA_LOG_SOCKET_ERRNO_WRAP(
+           UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                        "UDP\t| Interface configuration preparation failed "
+                        "(getifaddrs error: %s)", errno_str));
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    /* Iterate over the interfaces */
+    unsigned int idx = 0;
+    struct ifaddrs *ifa = NULL;
+    for(ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
+        if(!ifa->ifa_addr)
+            continue;
+
+        /* Does the protocol family match? */
+        if(ifa->ifa_addr->sa_family != info->ai_family)
+            continue;
+
+        idx = UA_if_nametoindex(ifa->ifa_name);
+        if(idx == 0)
+            continue;
+
+        /* Found network interface by name */
+        if(strcmp(ifa->ifa_name, netif) == 0)
+            break;
+
+        /* Check if the interface name is an IP address that matches */
+        char host[NI_MAXHOST];
+        ret = getnameinfo(ifa->ifa_addr,
+                          (info->ai_family == AF_INET) ?
+                          sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6),
+                          host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+        if(ret != 0) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+               UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                            "UDP\t| Interface configuration preparation "
+                            "ifailed (getnameinfo error: %s).", errno_str));
+            freeifaddrs(ifaddr);
+            return UA_STATUSCODE_BADINTERNALERROR;
+        }
+        if(strcmp(host, netif) == 0)
+            break;
+    }
+
+    freeifaddrs(ifaddr);
+    if(!ifa)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Write the interface index */
+    if(info->ai_family == AF_INET)
+        req->ipv4.imr_ifindex = idx;
 #if UA_IPV6
-    struct ipv6_mreq ipv6;
+    else /* if(info->ai_family == AF_INET6) */
+        req->ipv6.ipv6mr_interface = idx;
 #endif
-} IpMulticastRequest;
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif /* _WIN32 */
 
 static UA_StatusCode
-setupMulticastRequest(UA_FD socket, IpMulticastRequest *req, const UA_KeyValueMap *params,
+setupMulticastRequest(UA_FD socket, MulticastRequest *req, const UA_KeyValueMap *params,
                       struct addrinfo *info, const UA_Logger *logger) {
-    /* Was an interface defined? */
-    const UA_String *netif = (const UA_String*)
-        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
-                                 &UA_TYPES[UA_TYPES_STRING]);
-    if(!netif) {
-        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
-                       "UDP %u\t| No network interface defined for multicast. "
-                       "That means the first suitable network interface is used.",
-                       (unsigned)socket);
-    }
-
+    /* Initialize the address information */
     if(info->ai_family == AF_INET) {
         struct sockaddr_in *sin = (struct sockaddr_in *)info->ai_addr;
         req->ipv4.imr_multiaddr = sin->sin_addr;
+#ifdef _WIN32
         req->ipv4.imr_interface.s_addr = htonl(INADDR_ANY); /* default ANY */
-        if(!netif)
-            return UA_STATUSCODE_GOOD;
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
-        memcpy(interfaceAsChar, netif->data, netif->length);
-        interfaceAsChar[netif->length] = 0;
-        if(UA_inet_pton(AF_INET, interfaceAsChar, &req->ipv4.imr_interface) <= 0) {
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "UDP\t| Interface configuration preparation failed.");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        return UA_STATUSCODE_GOOD;
+#else
+        req->ipv4.imr_address.s_addr = htonl(INADDR_ANY); /* default ANY */
+        req->ipv4.imr_ifindex = 0;
+#endif
 #if UA_IPV6
     } else if(info->ai_family == AF_INET6) {
         struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)info->ai_addr;
         req->ipv6.ipv6mr_multiaddr = sin6->sin6_addr;
         req->ipv6.ipv6mr_interface = 0; /* default ANY interface */
-        if(!netif)
-            return UA_STATUSCODE_GOOD;
-        UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
-        memcpy(interfaceAsChar, netif->data, netif->length);
-        interfaceAsChar[netif->length] = 0;
-        req->ipv6.ipv6mr_interface = UA_if_nametoindex(interfaceAsChar);
-        if(req->ipv6.ipv6mr_interface == 0) {
-            UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
-                         "UDP\t| Interface configuration preparation failed.");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-        return UA_STATUSCODE_GOOD;
 #endif
+    } else {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
+                     "UDP\t| Multicast configuration failed: Unknown protocol family");
+        return UA_STATUSCODE_BADINTERNALERROR;
     }
-    return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* Was an interface (or local IP address) defined? */
+    const UA_String *netif = (const UA_String*)
+        UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_INTERFACE].name,
+                                 &UA_TYPES[UA_TYPES_STRING]);
+    if(!netif) {
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK,
+                       "UDP %u\t| No network interface defined for multicast. "
+                       "The first suitable network interface is used.",
+                       (unsigned)socket);
+        return UA_STATUSCODE_GOOD;
+    }
+
+    /* Set the interface index */
+    UA_STACKARRAY(char, interfaceAsChar, sizeof(char) * netif->length + 1);
+    memcpy(interfaceAsChar, netif->data, netif->length);
+    interfaceAsChar[netif->length] = 0;
+    return setMulticastInterface(interfaceAsChar, info, req, logger);
 }
 
 /* Retrieves hostname and port from given key value parameters.
@@ -153,8 +283,8 @@ setupMulticastRequest(UA_FD socket, IpMulticastRequest *req, const UA_KeyValueMa
  * @return -1 upon error, 0 if there was no host or port parameter, 1 if
  *         host and port are present */
 static int
-getHostAndPortFromParams(const UA_KeyValueMap *params,
-                         char *hostname, char *portStr, const UA_Logger *logger) {
+getHostAndPortFromParams(const UA_KeyValueMap *params, char *hostname,
+                         char *portStr, const UA_Logger *logger) {
     /* Prepare the port parameter as a string */
     const UA_UInt16 *port = (const UA_UInt16*)
         UA_KeyValueMap_getScalar(params, UDPConfigParameters[UDP_PARAMINDEX_PORT].name,
@@ -360,7 +490,7 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *params,
 static UA_StatusCode
 setupListenMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *params,
                      MultiCastType multiCastType, const UA_Logger *logger) {
-    IpMulticastRequest req;
+    MulticastRequest req;
     UA_StatusCode res = setupMulticastRequest(fd, &req, params, info, logger);
     if(res != UA_STATUSCODE_GOOD)
         return res;
@@ -389,7 +519,7 @@ setupListenMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *para
 static UA_StatusCode
 setupSendMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *params,
                    MultiCastType multiCastType, const UA_Logger *logger) {
-    IpMulticastRequest req;
+    MulticastRequest req;
     UA_StatusCode res = setupMulticastRequest(fd, &req, params, info, logger);
     if(res != UA_STATUSCODE_GOOD)
         return res;
@@ -399,10 +529,10 @@ setupSendMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *params
         result = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
 #ifdef _WIN32
                             (const char *)&req.ipv4.imr_interface,
+                            sizeof(struct in_addr));
 #else
-                            &req.ipv4.imr_interface,
+                            &req.ipv4, sizeof(req.ipv4));
 #endif
-                            sizeof(struct in_addr));
 #if UA_IPV6
     } else if(info->ai_family == AF_INET6 && multiCastType == MULTICASTTYPE_IPV6) {
         result = setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_IF,
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index c427685481f..fc711df716c 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -22,6 +22,7 @@
 #include <poll.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <ifaddrs.h>
 
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 # include <sys/param.h>
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 5748c4c18a0..5a9d3217556 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -516,7 +516,8 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  *
  * 0:interface [string]
  *    Network interface for listening or sending (e.g. when using multicast
- *    addresses)
+ *    addresses). Can be either the IP address of the network interface
+ *    or the interface name (e.g. 'eth0').
  *
  * 0:ttl [uint32]
  *    Multicast time to live, (optional, default: 1 - meaning multicast is
@@ -541,7 +542,7 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
  *    creating any connection but solely validating the provided parameters
  *    (default: false)
  *
- * **Connection Callback Paramters:**
+ * **Connection Callback Parameters:**
  *
  * 0:remote-address [string]
  *    Contains the remote IP address.

From 4d0b97ecbdc8b46930c368f8a5b45272982724cd Mon Sep 17 00:00:00 2001
From: Nico Sonack <nsonack@herrhotzenplotz.de>
Date: Sat, 27 Apr 2024 11:23:13 +0200
Subject: [PATCH 1484/1963] fix(core): (#6414) Fix build for FreeBSD

The 1.4 release does not build on FreeBSD for two reasons:

 - Missing include of <netinet/in.h>
 - Defining _XOPEN_SOURCE to 600 which hides BSD socket symbols

This fixes both of these issues making open62541 at least compilable
on FreeBSD.

I have yet to figure out how to run the test suite as there is a
nasty pile of python dependencies which are not ported to FreeBSD
yet.

This fix will also allow me to update the FreeBSD Port.

Issue-tracker: https://github.com/open62541/open62541/issues/6414
Signed-off-by: Nico Sonack <nsonack@herrhotzenplotz.de>
---
 arch/posix/ua_architecture.h  | 1 +
 include/open62541/config.h.in | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index fc711df716c..2bb68e2af33 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -14,6 +14,7 @@
 
 #include <errno.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index c035ab1e127..309cb746797 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -127,9 +127,14 @@
  * POSIX Feature Flags
  * -------------------
  * These feature flags have to be set before including the first POSIX
- * header. */
+ * header.
+ *
+ * Special note for FreeBSD: Defining _XOPEN_SOURCE will hide lots of socket
+ * definitions as they are not defined by POSIX. Defining _BSD_SOURCE will
+ * not help as the symbols undergo a consistency check and get adjusted in
+ * the headers. */
 #ifdef UA_ARCHITECTURE_POSIX
-# if !defined(_XOPEN_SOURCE)
+# if !defined(_XOPEN_SOURCE) && !defined(__FreeBSD__)
 #  define _XOPEN_SOURCE 600
 # endif
 # ifndef _DEFAULT_SOURCE

From 00206cdffa0d90c1d3d423eb4ecea7c997eccda2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 May 2024 14:45:48 +0200
Subject: [PATCH 1485/1963] feat(arch): Set REUSEADDR on all TCP sockets right
 before closing them

This ensures the server can be restarted without waiting for the
timeout. And port-stealing is prevented during the runtime of the
server.
---
 arch/eventloop_posix_tcp.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index fe31425d265..3efd4dbb772 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -75,6 +75,11 @@ TCP_delayedClose(void *application, void *context) {
                  "TCP %u\t| Delayed closing of the connection",
                  (unsigned)conn->rfd.fd);
 
+    /* Ensure reuse is possible right away. Port-stealing is no longer an issue
+     * as the socket gets closed anyway. And we do not want to wait for the
+     * timeout to open a new socket for the same address and port. */
+    UA_EventLoopPOSIX_setReusable(conn->rfd.fd);
+
     /* Deregister from the EventLoop */
     UA_EventLoopPOSIX_deregisterFD(el, &conn->rfd);
 
@@ -447,6 +452,7 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
 
     /* Only validate, don't actually start listening */
     if(validate) {
+        UA_EventLoopPOSIX_setReusable(listenSocket); /* Ensure reuse is possible */
         UA_close(listenSocket);
         return UA_STATUSCODE_GOOD;
     }
@@ -457,6 +463,7 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                           "TCP %u\t| Error listening on the socket (%s)",
                           (unsigned)listenSocket, errno_str));
+        UA_EventLoopPOSIX_setReusable(listenSocket); /* Ensure reuse is possible */
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -467,6 +474,7 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP %u\t| Error allocating memory for the socket",
                        (unsigned)listenSocket);
+        UA_EventLoopPOSIX_setReusable(listenSocket); /* Ensure reuse is possible */
         UA_close(listenSocket);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
@@ -486,6 +494,7 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
                        "TCP %u\t| Error registering the socket",
                        (unsigned)listenSocket);
         UA_free(newConn);
+        UA_EventLoopPOSIX_setReusable(listenSocket); /* Ensure reuse is possible */
         UA_close(listenSocket);
         return res;
     }

From 239aafff40f9d8d2610b33a4c7f457f3de6a9ffe Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 09:49:20 +0200
Subject: [PATCH 1486/1963] fix(server): Add missing lock handling for the
 subscription diagnostics

---
 src/server/ua_server_ns0_diagnostics.c | 46 ++++++++++++++++++++------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index aa764b43a7d..c35c1f4e95f 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -73,16 +73,22 @@ readSubscriptionDiagnostics(UA_Server *server,
                             const UA_NodeId *nodeId, void *nodeContext,
                             UA_Boolean sourceTimestamp,
                             const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK(&server->serviceMutex);
+
     /* Check the Subscription pointer */
     UA_Subscription *sub = (UA_Subscription*)nodeContext;
-    if(!sub)
+    if(!sub) {
+        UA_UNLOCK(&server->serviceMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     /* Read the BrowseName */
     UA_QualifiedName bn;
     UA_StatusCode res = readWithReadValue(server, nodeId, UA_ATTRIBUTEID_BROWSENAME, &bn);
-    if(res != UA_STATUSCODE_GOOD)
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_UNLOCK(&server->serviceMutex);
         return res;
+    }
 
     /* Set the value */
     UA_SubscriptionDiagnosticsDataType sddt;
@@ -112,17 +118,21 @@ readSubscriptionDiagnostics(UA_Server *server,
 
     UA_SubscriptionDiagnosticsDataType_clear(&sddt);
     UA_QualifiedName_clear(&bn);
+
+    UA_UNLOCK(&server->serviceMutex);
     return res;
 }
 
 /* If the nodeContext == NULL, return all subscriptions in the server.
  * Otherwise only for the current session. */
-UA_StatusCode
-readSubscriptionDiagnosticsArray(UA_Server *server,
-                                 const UA_NodeId *sessionId, void *sessionContext,
-                                 const UA_NodeId *nodeId, void *nodeContext,
-                                 UA_Boolean sourceTimestamp,
-                                 const UA_NumericRange *range, UA_DataValue *value) {
+static UA_StatusCode
+readSubscriptionDiagnosticsArrayLocked(UA_Server *server,
+                                       const UA_NodeId *sessionId, void *sessionContext,
+                                       const UA_NodeId *nodeId, void *nodeContext,
+                                       UA_Boolean sourceTimestamp,
+                                       const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     /* Get the current session */
     size_t sdSize = 0;
     UA_Session *session = NULL;
@@ -168,6 +178,20 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
     return UA_STATUSCODE_GOOD;
 }
 
+UA_StatusCode
+readSubscriptionDiagnosticsArray(UA_Server *server,
+                                 const UA_NodeId *sessionId, void *sessionContext,
+                                 const UA_NodeId *nodeId, void *nodeContext,
+                                 UA_Boolean sourceTimestamp,
+                                 const UA_NumericRange *range, UA_DataValue *value) {
+    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = readSubscriptionDiagnosticsArrayLocked(
+        server, sessionId, sessionContext, nodeId, nodeContext,
+        sourceTimestamp, range, value);
+    UA_UNLOCK(&server->serviceMutex);
+    return res;
+}
+
 void
 createSubscriptionObject(UA_Server *server, UA_Session *session,
                          UA_Subscription *sub) {
@@ -362,9 +386,9 @@ readSessionDiagnostics(UA_Server *server,
         /* Reuse the datasource callback. Forward a non-null nodeContext to
          * indicate that we want to see only the subscriptions for the current
          * session. */
-        res = readSubscriptionDiagnosticsArray(server, sessionId, sessionContext,
-                                               nodeId, (void*)0x01,
-                                               sourceTimestamp, range, value);
+        res = readSubscriptionDiagnosticsArrayLocked(server, sessionId, sessionContext,
+                                                     nodeId, (void*)0x01,
+                                                     sourceTimestamp, range, value);
         goto cleanup;
     } else if(equalBrowseName(&bn.name, "SessionDiagnostics")) {
         setSessionDiagnostics(session, &data.sddt);

From 1d5066d7efbbb199802e6fa86bfe80191a7eae58 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 13 May 2024 11:09:17 +0200
Subject: [PATCH 1487/1963] refactor(core): Bump version to 1.3.11

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986ed1731cf..0f58b4f017d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 10)
+set(OPEN62541_VER_PATCH 11)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From a75c27cadfe83203762b4797261d107239adc85b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 10:04:09 +0200
Subject: [PATCH 1488/1963] refactor(build): Rename macros_public.cmake to the
 installed name open62541Macros.cmake

---
 CMakeLists.txt                                  | 17 ++++++-----------
 ...acros_public.cmake => open62541Macros.cmake} |  0
 2 files changed, 6 insertions(+), 11 deletions(-)
 rename tools/cmake/{macros_public.cmake => open62541Macros.cmake} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44e695603a1..2780c7ebee3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(Python3 REQUIRED)
 find_package(Git)
 include(AssignSourceGroup)
 include(GNUInstallDirs)
-include(macros_public)
+include(open62541Macros)
 
 #############################
 # Compiled binaries folders #
@@ -1498,9 +1498,9 @@ configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541
                               "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
                               INSTALL_DESTINATION "${cmake_configfile_install}"
                               PATH_VARS open62541_install_tools_dir
-                                        open62541_install_nodeset_dir
-                              )
+                                        open62541_install_nodeset_dir)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
+              "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541Macros.cmake"
         DESTINATION "${cmake_configfile_install}")
 
 # Create open62541ConfigVersion.cmake
@@ -1516,16 +1516,11 @@ install(EXPORT open62541Targets
         FILE open62541Targets.cmake
         DESTINATION "${cmake_configfile_install}"
         NAMESPACE open62541::)
-export(TARGETS open62541 NAMESPACE open62541::
+export(TARGETS open62541
+       NAMESPACE open62541::
        FILE ${CMAKE_CURRENT_BINARY_DIR}/open62541Targets.cmake)
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/macros_public.cmake"
-               "${CMAKE_CURRENT_BINARY_DIR}/open62541Macros.cmake" COPYONLY)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Macros.cmake"
-        DESTINATION "${cmake_configfile_install}")
-
-# Create open62541Targets.cmake
+# Install open62541.pc
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     install(FILES "${PROJECT_BINARY_DIR}/src_generated/open62541.pc"
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/tools/cmake/macros_public.cmake b/tools/cmake/open62541Macros.cmake
similarity index 100%
rename from tools/cmake/macros_public.cmake
rename to tools/cmake/open62541Macros.cmake

From 4c426338d35e5db169910c18eb0e1d32362a9980 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 10:20:23 +0200
Subject: [PATCH 1489/1963] refactor(build): Use the set_and_check marcro in
 open62541Config.cmake

---
 tools/cmake/open62541Config.cmake.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index f6743f3ebfa..10934bf7651 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -1,5 +1,5 @@
 @PACKAGE_INIT@
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
 
-set (open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
-set (UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
+set_and_check(open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
+set_and_check(UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")

From 69667d1fd9201264dc0c2949076b337d6e2aead8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 11:00:48 +0200
Subject: [PATCH 1490/1963] refactor(build): Add check_required_components to
 open62541Config.cmake

---
 tools/cmake/open62541Config.cmake.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index 10934bf7651..3ae1bc9f507 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -3,3 +3,5 @@ include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
 
 set_and_check(open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
 set_and_check(UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
+
+check_required_components(open62541)

From bb099552d9cd7fa591e9f87e43b83f504c91e321 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 11:04:47 +0200
Subject: [PATCH 1491/1963] feat(build): Always include open62541Macros.cmake
 in the open62541Config.cmake

---
 tools/cmake/open62541Config.cmake.in | 3 +++
 tools/cmake/open62541Macros.cmake    | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index 3ae1bc9f507..f23cd6ece24 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -4,4 +4,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
 set_and_check(open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
 set_and_check(UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
 
+# Macros for datatype generation, nodeset compiler, etc.
+include("${CMAKE_CURRENT_LIST_DIR}/open62541Macros.cmake")
+
 check_required_components(open62541)
diff --git a/tools/cmake/open62541Macros.cmake b/tools/cmake/open62541Macros.cmake
index 5a1494a464e..5c5f50356c8 100644
--- a/tools/cmake/open62541Macros.cmake
+++ b/tools/cmake/open62541Macros.cmake
@@ -2,9 +2,6 @@ if(NOT open62541_TOOLS_DIR OR "${open62541_TOOLS_DIR}" STREQUAL "")
     set(open62541_TOOLS_DIR "${PROJECT_SOURCE_DIR}/tools")
 endif()
 
-# Required when installed
-find_package(Python3 REQUIRED)
-
 # --------------- Generate NodeIDs header ---------------------
 #
 # Generates header file from .csv which contains defines for every
@@ -28,6 +25,8 @@ find_package(Python3 REQUIRED)
 #   FILE_CSV        Path to the .csv file containing the node ids, e.g. 'OpcUaDiModel.csv'
 #
 function(ua_generate_nodeid_header)
+    find_package(Python3 REQUIRED)
+
     set(options AUTOLOAD)
     set(oneValueArgs NAME ID_PREFIX OUTPUT_DIR FILE_CSV TARGET_SUFFIX TARGET_PREFIX)
     set(multiValueArgs )
@@ -124,6 +123,8 @@ endfunction()
 #
 #
 function(ua_generate_datatypes)
+    find_package(Python3 REQUIRED)
+
     set(options BUILTIN INTERNAL AUTOLOAD GEN_DOC)
     set(oneValueArgs NAME TARGET_SUFFIX TARGET_PREFIX OUTPUT_DIR FILE_XML FILE_CSV)
     set(multiValueArgs FILES_BSD IMPORT_BSD FILES_SELECTED NAMESPACE_MAP)
@@ -297,6 +298,7 @@ endfunction()
 #
 #
 function(ua_generate_nodeset)
+    find_package(Python3 REQUIRED)
 
     set(options INTERNAL AUTOLOAD)
     set(oneValueArgs NAME TYPES_ARRAY OUTPUT_DIR IGNORE TARGET_PREFIX BLACKLIST FILES_BSD)
@@ -538,6 +540,7 @@ endfunction()
 #
 #
 function(ua_generate_nodeset_and_datatypes)
+    find_package(Python3 REQUIRED)
 
     set(options INTERNAL AUTOLOAD)
     set(oneValueArgs NAME FILE_NS FILE_CSV FILE_BSD OUTPUT_DIR TARGET_PREFIX BLACKLIST)

From edc9f906483a6667fbb30980a3ce9998b799c273 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 13 May 2024 14:05:16 +0200
Subject: [PATCH 1492/1963] fix(tests): Only build add_node_integration_test
 with UA_ENABLE_XML_ENCODING

The function UA_decodeXml is needed by the add_node_integration_test
in client.c, but only available with the define UA_ENABLE_XML_ENCODING.
---
 .../add_node_integration_test/CMakeLists.txt  | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt b/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
index 907444e71af..cee7263a3a8 100644
--- a/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
+++ b/tests/nodeset-loader/add_node_integration_test/CMakeLists.txt
@@ -3,27 +3,29 @@
 #######################################################
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+    if(UA_ENABLE_XML_ENCODING)
 
-    add_executable(add_node_integration_test_client client.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    set_target_properties(add_node_integration_test_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-    target_link_libraries(add_node_integration_test_client ${LIBS})
+        add_executable(add_node_integration_test_client client.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+        set_target_properties(add_node_integration_test_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+        target_link_libraries(add_node_integration_test_client ${LIBS})
 
-    add_executable(add_node_integration_test_server server.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    set_target_properties(add_node_integration_test_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-    target_link_libraries(add_node_integration_test_server ${LIBS})
+        add_executable(add_node_integration_test_server server.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+        set_target_properties(add_node_integration_test_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+        target_link_libraries(add_node_integration_test_server ${LIBS})
 
-    find_program(BASH_PROGRAM bash)
+        find_program(BASH_PROGRAM bash)
 
-    add_test(check_nodeset_loader_add_node_integration
-             ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh 
-             "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_client"
-             "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_server"
-    )
+        add_test(check_nodeset_loader_add_node_integration
+                 ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh 
+                 "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_client"
+                 "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_server"
+        )
 
-    add_test(check_nodeset_loader_DI_ordering_integration
-             ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/run_test_ordering.sh
-             "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_client"
-             "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_server"
-    )
+        add_test(check_nodeset_loader_DI_ordering_integration
+                 ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/run_test_ordering.sh
+                 "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_client"
+                 "${CMAKE_CURRENT_BINARY_DIR}/add_node_integration_test_server"
+        )
+    endif()
 
 endif()
\ No newline at end of file

From 566424929a89bd54fbd6406b2be8edce5a523120 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 3 May 2024 22:26:07 +0200
Subject: [PATCH 1493/1963] fix(core): Fix a memleak in the JSON decoding

---
 src/ua_types_encoding_json.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index ecc5951e6a5..f6af4a62d7e 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2171,8 +2171,10 @@ getExtensionObjectType(ParseCtx *ctx) {
     UA_NodeId_init(&typeId);
     ret = NodeId_decodeJson(ctx, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
     ctx->index = oldIndex;
-    if(ret != UA_STATUSCODE_GOOD)
+    if(ret != UA_STATUSCODE_GOOD) {
+        UA_NodeId_clear(&typeId); /* We don't have the global cleanup */
         return NULL;
+    }
 
     /* Lookup an return */
     const UA_DataType *type = UA_findDataTypeWithCustom(&typeId, ctx->customTypes);

From d440948266a87442b98feab5b91886e06ce89a0f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 5 May 2024 17:03:15 +0200
Subject: [PATCH 1494/1963] refactor(pubsub): Use UA_calloc everywhere in
 ua_pubsub_manager.c

---
 src/pubsub/ua_pubsub_manager.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index f671b99f8d6..65b58a0f71d 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -32,7 +32,8 @@ UA_PubSubManager_addTopic(UA_PubSubManager *pubSubManager, UA_TopicAssign *topic
 static UA_TopicAssign *
 UA_TopicAssign_new(UA_ReaderGroup *readerGroup,
                    UA_String topic, const UA_Logger *logger) {
-    UA_TopicAssign *topicAssign = (UA_TopicAssign *) calloc(1, sizeof(UA_TopicAssign));
+    UA_TopicAssign *topicAssign = (UA_TopicAssign *)
+        UA_calloc(1, sizeof(UA_TopicAssign));
     if(!topicAssign) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER,
                      "PubSub TopicAssign creation failed. Out of Memory.");
@@ -68,7 +69,8 @@ ZIP_FUNCTIONS(UA_ReserveIdTree, UA_ReserveId, treeEntry, UA_ReserveId, id, cmpRe
 static UA_ReserveId *
 UA_ReserveId_new(UA_Server *server, UA_UInt16 id, UA_String transportProfileUri,
                  UA_ReserveIdType reserveIdType, UA_NodeId sessionId) {
-    UA_ReserveId *reserveId = (UA_ReserveId *) calloc(1, sizeof(UA_ReserveId));
+    UA_ReserveId *reserveId = (UA_ReserveId *)
+        UA_calloc(1, sizeof(UA_ReserveId));
     if(!reserveId) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "PubSub ReserveId creation failed. Out of Memory.");

From 64fb3cbeaadf8c0e5646c1ce27e77d71efb0233d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 5 May 2024 17:08:09 +0200
Subject: [PATCH 1495/1963] refactor(core): Cosmetic improvements in
 ua_types_encoding_json.c

---
 src/ua_types_encoding_json.c | 54 ++++++++++++------------------------
 1 file changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index f6af4a62d7e..db30e783c60 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -87,11 +87,10 @@ static WRITE_JSON_ELEMENT(Quote) {
 
 UA_StatusCode
 writeJsonBeforeElement(CtxJson *ctx, UA_Boolean distinct) {
-    /* Comma if needed */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
+    /* Comma if needed */
     if(ctx->commaNeeded[ctx->depth])
         res |= writeChar(ctx, ',');
-
     if(ctx->prettyPrint) {
         if(distinct) {
             /* Newline and indent if needed */
@@ -103,7 +102,6 @@ writeJsonBeforeElement(CtxJson *ctx, UA_Boolean distinct) {
             res |= writeChar(ctx, ' ');
         }
     }
-
     return res;
 }
 
@@ -130,8 +128,7 @@ WRITE_JSON_ELEMENT(ObjEnd) {
         for(size_t i = 0; i < ctx->depth; i++)
             res |= writeChar(ctx, '\t');
     }
-    res |= writeChar(ctx, '}');
-    return res;
+    return res | writeChar(ctx, '}');
 }
 
 WRITE_JSON_ELEMENT(ArrStart) {
@@ -155,8 +152,7 @@ WRITE_JSON_ELEMENT(ArrEnd) {
         for(size_t i = 0; i < ctx->depth; i++)
             res |= writeChar(ctx, '\t');
     }
-    res |= writeChar(ctx, ']');
-    return res;
+    return res | writeChar(ctx, ']');
 }
 
 status
@@ -165,8 +161,7 @@ writeJsonArrElm(CtxJson *ctx, const void *value,
     UA_Boolean distinct = (type->typeKind > UA_DATATYPEKIND_DOUBLE);
     status ret = writeJsonBeforeElement(ctx, distinct);
     ctx->commaNeeded[ctx->depth] = true;
-    ret |= encodeJsonJumpTable[type->typeKind](ctx, value, type);
-    return ret;
+    return ret | encodeJsonJumpTable[type->typeKind](ctx, value, type);
 }
 
 status
@@ -445,8 +440,7 @@ encodeJsonArray(CtxJson *ctx, const void *ptr, size_t length,
         ctx->commaNeeded[ctx->depth] = true;
         uptr += type->memSize;
     }
-    ret |= writeJsonArrEnd(ctx);
-    return ret;
+    return ret | writeJsonArrEnd(ctx);
 }
 
 static const uint32_t min_codepoints[5] = {0x00, 0x00, 0x80, 0x800, 0x10000};
@@ -604,8 +598,7 @@ ENCODE_JSON(String) {
         str = pos = end;
     }
 
-    ret |= writeJsonQuote(ctx);
-    return ret;
+    return ret | writeJsonQuote(ctx);
 }
 
 ENCODE_JSON(ByteString) {
@@ -639,8 +632,7 @@ ENCODE_JSON(ByteString) {
     /* Base64 result no longer needed */
     UA_free(ba64);
 
-    ret |= writeJsonQuote(ctx);
-    return ret;
+    return ret | writeJsonQuote(ctx);
 }
 
 /* Guid */
@@ -651,8 +643,7 @@ ENCODE_JSON(Guid) {
     if(!ctx->calcOnly)
         UA_Guid_to_hex(src, ctx->pos, false);
     ctx->pos += 36;
-    ret |= writeJsonQuote(ctx);
-    return ret;
+    return ret | writeJsonQuote(ctx);
 }
 
 static u8
@@ -788,8 +779,7 @@ ENCODE_JSON(NodeId) {
         }
     }
 
-    ret |= writeJsonObjEnd(ctx);
-    return ret;
+    return ret | writeJsonObjEnd(ctx);
 }
 
 /* ExpandedNodeId */
@@ -871,8 +861,7 @@ ENCODE_JSON(ExpandedNodeId) {
         ret |= ENCODE_DIRECT_JSON(&serverUriEntry, String);
     }
 
-    ret |= writeJsonObjEnd(ctx);
-    return ret;
+    return ret | writeJsonObjEnd(ctx);
 }
 
 /* LocalizedText */
@@ -883,8 +872,7 @@ ENCODE_JSON(LocalizedText) {
         ret |= ENCODE_DIRECT_JSON(&src->locale, String);
         ret |= writeJsonKey(ctx, UA_JSONKEY_TEXT);
         ret |= ENCODE_DIRECT_JSON(&src->text, String);
-        ret |= writeJsonObjEnd(ctx);
-        return ret;
+        return ret | writeJsonObjEnd(ctx);
     }
 
     /* For the non-reversible form, LocalizedText value shall be encoded as a
@@ -1040,18 +1028,13 @@ addMultiArrayContentJSON(CtxJson *ctx, void* array, const UA_DataType *type,
 
     /* Recurse to the next dimension */
     ret = writeJsonArrStart(ctx);
-    if(ret != UA_STATUSCODE_GOOD)
-        return ret;
     for(size_t i = 0; i < arrayDimensions[dimensionIndex]; i++) {
         ret |= writeJsonBeforeElement(ctx, true);
         ret |= addMultiArrayContentJSON(ctx, array, type, index, arrayDimensions,
                                         dimensionIndex + 1, dimensionSize);
         ctx->commaNeeded[ctx->depth] = true;
-        if(ret != UA_STATUSCODE_GOOD)
-            return ret;
     }
-    ret |= writeJsonArrEnd(ctx);
-    return ret;
+    return ret | writeJsonArrEnd(ctx);
 }
 
 ENCODE_JSON(Variant) {
@@ -1238,8 +1221,7 @@ encodeJsonStructure(CtxJson *ctx, const void *src, const UA_DataType *type) {
         }
     }
 
-    ret |= writeJsonObjEnd(ctx);
-    return ret;
+    return ret | writeJsonObjEnd(ctx);
 }
 
 static status
@@ -1322,11 +1304,10 @@ UA_encodeJson(const void *src, const UA_DataType *type, UA_ByteString *outBuf,
     res = encodeJsonJumpTable[type->typeKind](&ctx, src, type);
 
     /* Clean up */
-    if(res == UA_STATUSCODE_GOOD) {
+    if(res == UA_STATUSCODE_GOOD)
         outBuf->length = (size_t)((uintptr_t)ctx.pos - (uintptr_t)outBuf->data);
-    } else if(allocated) {
+    else if(allocated)
         UA_ByteString_clear(outBuf);
-    }
     return res;
 }
 
@@ -1341,7 +1322,6 @@ UA_print(const void *p, const UA_DataType *type, UA_String *output) {
     options.prettyPrint = true;
     options.unquotedKeys = true;
     options.stringNodeIds = true;
-
     return UA_encodeJson(p, type, output, &options);
 }
 
@@ -1938,6 +1918,7 @@ decodeExpandedNodeIdNamespace(ParseCtx *ctx, void *dst, const UA_DataType *type)
             break;
         }
     }
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1967,6 +1948,7 @@ decodeExpandedNodeIdServerUri(ParseCtx *ctx, void *dst, const UA_DataType *type)
             break;
         }
     }
+
     UA_String_clear(&uri);
     return ret;
 }
@@ -2418,6 +2400,7 @@ DECODE_JSON(Variant) {
     dst->data = UA_new(dst->type);
     if(!dst->data)
         return UA_STATUSCODE_BADOUTOFMEMORY;
+
     DecodeEntry entries[2] = {
         {UA_JSONKEY_TYPE, NULL, NULL, false, NULL},
         {UA_JSONKEY_BODY, dst->data, NULL, false, dst->type}
@@ -2503,7 +2486,6 @@ DECODE_JSON(ExtensionObject) {
         } else {
             return UA_STATUSCODE_BADDECODINGERROR;
         }
-
         return decodeFields(ctx, entries, 3);
     }
 

From 750aaafabc4ab997cdea3d5c228bbf8f1460ae80 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 5 May 2024 17:22:09 +0200
Subject: [PATCH 1496/1963] fix(core): Fix and simplify the JSON encoding of
 Variants with wrapped ExtensionObjects

---
 src/ua_types_encoding_json.c | 87 ++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 48 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index db30e783c60..a52e7ffbe66 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -976,41 +976,48 @@ ENCODE_JSON(ExtensionObject) {
             (ctx, src->content.decoded.data, t);
     }
 
-    ret |= writeJsonObjEnd(ctx);
-    return ret;
+    return ret | writeJsonObjEnd(ctx);
 }
 
+/* Internally decides whether the value needs to be wrapped in an ExtensionObject */
 static status
 Variant_encodeJsonWrapExtensionObject(const UA_Variant *src, const bool isArray,
                                       CtxJson *ctx) {
-    size_t length = 1;
     if(isArray) {
         if(src->arrayLength > UA_INT32_MAX)
             return UA_STATUSCODE_BADENCODINGERROR;
-
-        length = src->arrayLength;
     }
 
+    const UA_Boolean isBuiltin = (src->type->typeKind <= UA_DATATYPEKIND_DIAGNOSTICINFO);
+    uintptr_t ptr = (uintptr_t)src->data;
+    const UA_DataType *type = src->type;
+
     /* Set up a temporary ExtensionObject to wrap the data */
     UA_ExtensionObject eo;
-    UA_ExtensionObject_init(&eo);
-    eo.encoding = UA_EXTENSIONOBJECT_DECODED;
-    eo.content.decoded.type = src->type;
+    if(!isBuiltin) {
+        UA_ExtensionObject_init(&eo);
+        eo.encoding = UA_EXTENSIONOBJECT_DECODED;
+        eo.content.decoded.type = src->type;
+        eo.content.decoded.data = (void*)ptr;
+        ptr = (uintptr_t)&eo;
+        type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
+    }
 
     if(isArray) {
         u16 memSize = src->type->memSize;
-        uintptr_t ptr = (uintptr_t)src->data;
         status ret = writeJsonArrStart(ctx);
-        for(size_t i = 0; i < length && ret == UA_STATUSCODE_GOOD; ++i) {
-            eo.content.decoded.data = (void*)ptr;
-            ret |= writeJsonArrElm(ctx, &eo, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
-            ptr += memSize;
+        for(size_t i = 0; i < src->arrayLength && ret == UA_STATUSCODE_GOOD; ++i) {
+            ret |= writeJsonArrElm(ctx, (const void*)ptr, type);
+            if(isBuiltin)
+                ptr += memSize;
+            else
+                eo.content.decoded.data = (void*)
+                    ((uintptr_t)eo.content.decoded.data + memSize);
         }
         return ret | writeJsonArrEnd(ctx);
     }
 
-    eo.content.decoded.data = src->data;
-    return ExtensionObject_encodeJson(ctx, &eo, NULL);
+    return encodeJsonJumpTable[type->typeKind](ctx, (const void*)ptr, type);
 }
 
 static status
@@ -1068,41 +1075,25 @@ ENCODE_JSON(Variant) {
         ret |= ENCODE_DIRECT_JSON(&typeId, UInt32);
     }
 
-    if(wrapEO) {
-        /* Not builtin. Can it be encoded? Wrap in extension object. */
-        if(src->arrayDimensionsSize > 1)
-            return UA_STATUSCODE_BADNOTIMPLEMENTED;
-        ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-        ret |= Variant_encodeJsonWrapExtensionObject(src, isArray, ctx);
-    } else if(!isArray) {
-        /* Unwrapped scalar */
-        ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-        ret |= encodeJsonJumpTable[src->type->typeKind](ctx, src->data, src->type);
-    } else if(ctx->useReversible) {
-        /* Reversible array */
-        ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-        ret |= encodeJsonArray(ctx, src->data, src->arrayLength, src->type);
-        if(hasDimensions) {
-            ret |= writeJsonKey(ctx, UA_JSONKEY_DIMENSION);
-            ret |= encodeJsonArray(ctx, src->arrayDimensions, src->arrayDimensionsSize,
-                                   &UA_TYPES[UA_TYPES_INT32]);
-        }
-    } else {
-        /* Non-Reversible array */
-        ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
-        if(src->arrayDimensionsSize > 1) {
-            size_t index = 0;
-            size_t dimensionIndex = 0;
-            ret |= addMultiArrayContentJSON(ctx, src->data, src->type, &index,
-                                            src->arrayDimensions, dimensionIndex,
-                                            src->arrayDimensionsSize);
-        } else {
-            ret |= encodeJsonArray(ctx, src->data, src->arrayLength, src->type);
-        }
+    ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
+
+    /* Special case of non-reversible array with dimensions */
+    if(!ctx->useReversible && hasDimensions) {
+        size_t index = 0;
+        ret |= addMultiArrayContentJSON(ctx, src->data, src->type, &index,
+                                        src->arrayDimensions, 0,
+                                        src->arrayDimensionsSize);
+        return ret | writeJsonObjEnd(ctx);
     }
 
-    ret |= writeJsonObjEnd(ctx);
-    return ret;
+    ret |= Variant_encodeJsonWrapExtensionObject(src, isArray, ctx);
+    if(hasDimensions) {
+        ret |= writeJsonKey(ctx, UA_JSONKEY_DIMENSION);
+        ret |= encodeJsonArray(ctx, src->arrayDimensions, src->arrayDimensionsSize,
+                               &UA_TYPES[UA_TYPES_INT32]);
+    }
+
+    return ret | writeJsonObjEnd(ctx);
 }
 
 /* DataValue */

From fd5b3089a3d9d1b119897e27d4d1fd942f0c34ff Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 5 May 2024 21:31:36 +0200
Subject: [PATCH 1497/1963] fix(core): Can wrap JSON values in ExtensionObjects
 for (non-reversible) nested arrays

---
 src/ua_types_encoding_json.c | 101 +++++++++++++++++++++--------------
 1 file changed, 60 insertions(+), 41 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index a52e7ffbe66..5507a0d2ffb 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -979,17 +979,11 @@ ENCODE_JSON(ExtensionObject) {
     return ret | writeJsonObjEnd(ctx);
 }
 
-/* Internally decides whether the value needs to be wrapped in an ExtensionObject */
+/* Non-builtin types get wrapped in an ExtensionObject */
 static status
-Variant_encodeJsonWrapExtensionObject(const UA_Variant *src, const bool isArray,
-                                      CtxJson *ctx) {
-    if(isArray) {
-        if(src->arrayLength > UA_INT32_MAX)
-            return UA_STATUSCODE_BADENCODINGERROR;
-    }
-
+encodeScalarJsonWrapExtensionObject(CtxJson *ctx, const UA_Variant *src) {
     const UA_Boolean isBuiltin = (src->type->typeKind <= UA_DATATYPEKIND_DIAGNOSTICINFO);
-    uintptr_t ptr = (uintptr_t)src->data;
+    const void *ptr = src->data;
     const UA_DataType *type = src->type;
 
     /* Set up a temporary ExtensionObject to wrap the data */
@@ -998,39 +992,59 @@ Variant_encodeJsonWrapExtensionObject(const UA_Variant *src, const bool isArray,
         UA_ExtensionObject_init(&eo);
         eo.encoding = UA_EXTENSIONOBJECT_DECODED;
         eo.content.decoded.type = src->type;
-        eo.content.decoded.data = (void*)ptr;
-        ptr = (uintptr_t)&eo;
+        eo.content.decoded.data = src->data;
+        ptr = &eo;
         type = &UA_TYPES[UA_TYPES_EXTENSIONOBJECT];
     }
 
-    if(isArray) {
-        u16 memSize = src->type->memSize;
-        status ret = writeJsonArrStart(ctx);
-        for(size_t i = 0; i < src->arrayLength && ret == UA_STATUSCODE_GOOD; ++i) {
+    return encodeJsonJumpTable[type->typeKind](ctx, ptr, type);
+}
+
+/* Non-builtin types get wrapped in an ExtensionObject */
+static status
+encodeArrayJsonWrapExtensionObject(CtxJson *ctx, const void *data,
+                                   size_t size, const UA_DataType *type) {
+    if(size > UA_INT32_MAX)
+        return UA_STATUSCODE_BADENCODINGERROR;
+
+    status ret = writeJsonArrStart(ctx);
+
+    u16 memSize = type->memSize;
+    const UA_Boolean isBuiltin = (type->typeKind <= UA_DATATYPEKIND_DIAGNOSTICINFO);
+    if(isBuiltin) {
+        uintptr_t ptr = (uintptr_t)data;
+        for(size_t i = 0; i < size && ret == UA_STATUSCODE_GOOD; ++i) {
             ret |= writeJsonArrElm(ctx, (const void*)ptr, type);
-            if(isBuiltin)
-                ptr += memSize;
-            else
-                eo.content.decoded.data = (void*)
-                    ((uintptr_t)eo.content.decoded.data + memSize);
+            ptr += memSize;
+        }
+    } else {
+        /* Set up a temporary ExtensionObject to wrap the data */
+        UA_ExtensionObject eo;
+        UA_ExtensionObject_init(&eo);
+        eo.encoding = UA_EXTENSIONOBJECT_DECODED;
+        eo.content.decoded.type = type;
+        eo.content.decoded.data = (void*)(uintptr_t)data;
+        for(size_t i = 0; i < size && ret == UA_STATUSCODE_GOOD; ++i) {
+            ret |= writeJsonArrElm(ctx, &eo, &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]);
+            eo.content.decoded.data = (void*)
+                ((uintptr_t)eo.content.decoded.data + memSize);
         }
-        return ret | writeJsonArrEnd(ctx);
     }
 
-    return encodeJsonJumpTable[type->typeKind](ctx, (const void*)ptr, type);
+    return ret | writeJsonArrEnd(ctx);
 }
 
 static status
 addMultiArrayContentJSON(CtxJson *ctx, void* array, const UA_DataType *type,
                          size_t *index, UA_UInt32 *arrayDimensions, size_t dimensionIndex,
                          size_t dimensionSize) {
-    /* Stop recursion: The inner Arrays are written */
+    /* Stop recursion: The inner arrays are written */
     status ret;
     if(dimensionIndex == (dimensionSize - 1)) {
-        ret = encodeJsonArray(ctx, ((u8*)array) + (type->memSize * *index),
-                              arrayDimensions[dimensionIndex], type);
+        u8 *ptr = ((u8 *)array) + (type->memSize * *index);
+        u32 size = arrayDimensions[dimensionIndex];
         (*index) += arrayDimensions[dimensionIndex];
-        return ret;
+        return encodeArrayJsonWrapExtensionObject(ctx, ptr, size, type);
     }
 
     /* Recurse to the next dimension */
@@ -1066,8 +1080,8 @@ ENCODE_JSON(Variant) {
 
     status ret = writeJsonObjStart(ctx);
 
+    /* Write the type NodeId */
     if(ctx->useReversible) {
-        /* Write the NodeId for the reversible form */
         UA_UInt32 typeId = src->type->typeId.identifier.numeric;
         if(wrapEO)
             typeId = UA_TYPES[UA_TYPES_EXTENSIONOBJECT].typeId.identifier.numeric;
@@ -1075,22 +1089,27 @@ ENCODE_JSON(Variant) {
         ret |= ENCODE_DIRECT_JSON(&typeId, UInt32);
     }
 
+    /* Write the Variant body */
     ret |= writeJsonKey(ctx, UA_JSONKEY_BODY);
 
-    /* Special case of non-reversible array with dimensions */
-    if(!ctx->useReversible && hasDimensions) {
-        size_t index = 0;
-        ret |= addMultiArrayContentJSON(ctx, src->data, src->type, &index,
-                                        src->arrayDimensions, 0,
-                                        src->arrayDimensionsSize);
-        return ret | writeJsonObjEnd(ctx);
-    }
-
-    ret |= Variant_encodeJsonWrapExtensionObject(src, isArray, ctx);
-    if(hasDimensions) {
-        ret |= writeJsonKey(ctx, UA_JSONKEY_DIMENSION);
-        ret |= encodeJsonArray(ctx, src->arrayDimensions, src->arrayDimensionsSize,
-                               &UA_TYPES[UA_TYPES_INT32]);
+    if(!isArray) {
+        encodeScalarJsonWrapExtensionObject(ctx, src);
+    } else {
+        if(ctx->useReversible || !hasDimensions) {
+            ret |= encodeArrayJsonWrapExtensionObject(ctx, src->data,
+                                                      src->arrayLength, src->type);
+            if(hasDimensions) {
+                ret |= writeJsonKey(ctx, UA_JSONKEY_DIMENSION);
+                ret |= encodeJsonArray(ctx, src->arrayDimensions, src->arrayDimensionsSize,
+                                       &UA_TYPES[UA_TYPES_INT32]);
+            }
+        } else {
+            /* Special case of non-reversible array with dimensions */
+            size_t index = 0;
+            ret |= addMultiArrayContentJSON(ctx, src->data, src->type, &index,
+                                            src->arrayDimensions, 0,
+                                            src->arrayDimensionsSize);
+        }
     }
 
     return ret | writeJsonObjEnd(ctx);

From f1c8bb37883a0f59af4bcd9b10b5db7444fa5008 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 14:11:14 +0200
Subject: [PATCH 1498/1963] fix(doc): Remove outdated CMake component
 specification

---
 doc/building.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/building.rst b/doc/building.rst
index 0708acb97b5..8c47e39386e 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -53,10 +53,8 @@ In your own CMake project you can then include the open62541 library using:
 
 .. code-block:: cmake
 
-   # optionally you can also specify a specific version
-   # e.g. find_package(open62541 1.0.0)
-   find_package(open62541 REQUIRED COMPONENTS Events FullNamespace)
-   add_executable(main main.cpp)
+   find_package(open62541 REQUIRED)
+   add_executable(main main.c)
    target_link_libraries(main open62541::open62541)
 
 Building with CMake on Windows

From 72bec11958e34b27b0f0759fc6c5ce9f5f2e4586 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 15:39:40 +0200
Subject: [PATCH 1499/1963] fix(build): Add the dependency libraries to the
 open62541.pc

---
 CMakeLists.txt        | 17 ++++++++++-------
 tools/open62541.pc.in |  6 +-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2780c7ebee3..e200e92201e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -755,12 +755,6 @@ file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/src_generated")
 # Generate the config.h
 configure_file(include/open62541/config.h.in ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h)
 
-# Generate a .pc file for pkg-config
-if(UA_ENABLE_AMALGAMATION)
-    set(PC_EXTRA_CFLAGS "-DUA_ENABLE_AMALGAMATION")
-endif()
-configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open62541.pc @ONLY)
-
 if(UA_ENABLE_DISCOVERY_MULTICAST)
   include(GenerateExportHeader)
     set(MDNSD_LOGLEVEL 300 CACHE STRING "Level at which logs shall be reported" FORCE)
@@ -1520,7 +1514,16 @@ export(TARGETS open62541
        NAMESPACE open62541::
        FILE ${CMAKE_CURRENT_BINARY_DIR}/open62541Targets.cmake)
 
-# Install open62541.pc
+# Generate and install open62541.pc
+if(UA_ENABLE_AMALGAMATION)
+    set(PC_EXTRA_CFLAGS "-DUA_ENABLE_AMALGAMATION")
+endif()
+set(pkgcfglibs "-lopen62541")
+foreach(lib ${open62541_LIBRARIES})
+    set(pkgcfglibs "${pkgcfglibs} -l${lib}")
+endforeach()
+configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open62541.pc @ONLY)
+
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     install(FILES "${PROJECT_BINARY_DIR}/src_generated/open62541.pc"
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/tools/open62541.pc.in b/tools/open62541.pc.in
index a041c2dd945..3776752994f 100644
--- a/tools/open62541.pc.in
+++ b/tools/open62541.pc.in
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 sharedlibdir=${libdir}
 includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
@@ -9,5 +5,5 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 Name: open62541
 Description: open62541 is an open source C (C99) implementation of OPC UA
 Version: @OPEN62541_VER_MAJOR@.@OPEN62541_VER_MINOR@.@OPEN62541_VER_PATCH@@OPEN62541_VER_LABEL@
-Libs: -L${libdir} -lopen62541
+Libs: -L${libdir} @pkgcfglibs@
 Cflags: -I${includedir} @PC_EXTRA_CFLAGS@

From 48927f4590d7d904464df071b00235798f4a01d4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 15:48:23 +0200
Subject: [PATCH 1500/1963] refactor(doc): Prefer pkg-config for using
 open62541 as a dependency

---
 doc/building.rst | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/doc/building.rst b/doc/building.rst
index 8c47e39386e..322015bc3a9 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -49,13 +49,25 @@ described in :ref:`build_options`, these features will also be included in the
 installation. Thus we recommend to enable as many non-experimental features as
 possible for the installed binary.
 
-In your own CMake project you can then include the open62541 library using:
+In your own CMake project you can then include the open62541 library. A simple
+CMake project definition looks as follows:
 
 .. code-block:: cmake
 
-   find_package(open62541 REQUIRED)
-   add_executable(main main.c)
-   target_link_libraries(main open62541::open62541)
+    cmake_minimum_required(VERSION 3.5)
+    project("open62541SampleApplication")
+    add_executable(main main.c)
+
+    # Linux/Unix configuration using pkg-config
+    find_package(PkgConfig)
+    pkg_check_modules(open62541 REQUIRED open62541)
+    target_link_libraries(main open62541)
+
+    # Alternative CMake-based library definition.
+    # This might not be included in some package distributions.
+    #
+    #   find_package(open62541 REQUIRED)
+    #   target_link_libraries(main open62541::open62541)
 
 Building with CMake on Windows
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

From 8aac9006689a01f086b0d2535a92d9e135e8fdfb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 17:24:20 +0200
Subject: [PATCH 1501/1963] refactor(build): Simplify the installation folder
 structure

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e200e92201e..db45b996af9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1482,8 +1482,8 @@ install(TARGETS open62541
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         INCLUDES DESTINATION include)
 
-set(open62541_install_tools_dir share/open62541/tools)
-set(open62541_install_nodeset_dir share/open62541/tools/ua-nodeset)
+set(open62541_install_tools_dir share/open62541)
+set(open62541_install_nodeset_dir share/open62541/ua-nodeset)
 
 # Create open62541Config.cmake
 include(CMakePackageConfigHelpers)

From 2c5cb94ee6a3955900ed3f111c7f823c36a63f9a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 23:20:49 +0200
Subject: [PATCH 1502/1963] feat(build): Add copyright information for the
 /deps dependencies to Debian packaging

---
 tools/packaging/debian/copyright | 284 ++++++++++++++++++++++++++++++-
 1 file changed, 283 insertions(+), 1 deletion(-)

diff --git a/tools/packaging/debian/copyright b/tools/packaging/debian/copyright
index 18afde167dc..f2b358f6b8c 100644
--- a/tools/packaging/debian/copyright
+++ b/tools/packaging/debian/copyright
@@ -4,7 +4,43 @@ Upstream-Contact: open62541 Team <open62541-core@googlegroups.com>
 Source: https://open62541.org/
 
 Files: *
-Copyright: 2019 open62541 Team <open62541-core@googlegroups.com>
+Copyright: 2019, open62541 Team <open62541-core@googlegroups.com>
+License: MPL-2.0
+
+Files: deps/ziptree.*
+Copyright: 2018, 2021-2022 Julius Pfrommer
+License: MPL-2.0
+
+Files: deps/open62541_queue.h
+Copyright: 1991, 1993, The Regents of the University of California.
+License: BSD-3-clause
+
+Files: deps/base64.c
+Copyright: 2005-2011, Jouni Malinen
+License: BSD-3-clause
+
+Files: deps/parse_num.c
+Copyright: 2005-2013, Rich Felker
+License: MIT
+
+Files: deps/itoa.c
+Copyright: 2017, Techie Delight
+License: MIT
+
+Files: deps/mp_printf.*
+Copyright: 2014-2019, Marco Paland
+           2021-2023, Eyal Rozenberg
+License: MIT
+
+Files: deps/pcg_basic.*
+Copyright: 2014, Melissa O'Neill
+License: Apache-2.0
+
+Files: deps/dtoa.*
+Copyright: 2013, Andreas Samoljuk
+           2023, Julius Pfrommer
+License: BSL-1.0
+
 License: MPL-2.0
  Mozilla Public License Version 2.0
  ==================================
@@ -379,3 +415,249 @@ License: MPL-2.0
  .
    This Source Code Form is "Incompatible With Secondary Licenses", as
    defined by the Mozilla Public License, v. 2.0.
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holder nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: Apache-2.0
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+ .
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ .
+   1. Definitions.
+ .
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+ .
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+ .
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+ .
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+ .
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+ .
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+ .
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+ .
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+ .
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+ .
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+ .
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+ .
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+ .
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+ .
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+ .
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+ .
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+ .
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+ .
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+ .
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+ .
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+ .
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+ .
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+ .
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+ .
+   END OF TERMS AND CONDITIONS
+
+License: BSL-1.0
+ Boost Software License 1.0
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by this
+ license (the “Software”) to use, reproduce, display, distribute, execute, and
+ transmit the Software, and to prepare derivative works of the Software, and to
+ permit third-parties to whom the Software is furnished to do so, all subject to
+ the following:
+ .
+ The copyright notices in the Software and this entire statement, including the
+ above license grant, this restriction and the following disclaimer, must be
+ included in all copies of the Software, in whole or in part, and all derivative
+ works of the Software, unless such copies or derivative works are solely in the
+ form of machine-executable object code generated by a source language
+ processor.
+ .
+ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY
+ DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

From cecaba6c0ba2ef39c9f05900eb6fcf713ad51e35 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 23:21:41 +0200
Subject: [PATCH 1503/1963] fix(doc): Fix the Boost License shortname in
 deps/README.md

---
 deps/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/README.md b/deps/README.md
index 6500c68c796..e47742bb7ae 100644
--- a/deps/README.md
+++ b/deps/README.md
@@ -19,5 +19,5 @@ The following third party libraries may be included -- depending on the activate
 | pcg_basic       | Apache License 2 | Random Number Generation                        |
 | ziptree         | MPL 2.0          | Reusable zip tree implementation                |
 | mqtt-c          | MIT              | a portable MQTT client in C                     |
-| dtoa            | BSC (Boost)      | Printing of float numbers                       |
+| dtoa            | BSL (Boost)      | Printing of float numbers                       |
 | mp_printf       | MIT              | Our version of github:mpaland/printf            |

From bcf8cb261d17c18b0b8244e0a9beff18e57f346b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 23:23:16 +0200
Subject: [PATCH 1504/1963] refactor(build): Reset the Debian changelog

---
 tools/packaging/debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/packaging/debian/changelog b/tools/packaging/debian/changelog
index 7ca072cea30..6181d05b6e6 100644
--- a/tools/packaging/debian/changelog
+++ b/tools/packaging/debian/changelog
@@ -1,5 +1,5 @@
-open62541 (1.0~rc1) UNRELEASED; urgency=low
+open62541 (1.4.1) unstable; urgency=mediaum
 
-  * Release Candidate 1 for 1.0 Version.
+  * Initial release of the 1.4.1 version.
 
- -- open62541 Team <open62541-core@googlegroups.com>  Fri, 19 Jul 2019 10:51:28 +0100
+-- open62541 Team <open62541-core@googlegroups.com>  Mon, 13 May 2024 10:51:28 +0100

From 6091b1865f87acf3285b45b06c38d740cab40cd5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 13 May 2024 23:23:46 +0200
Subject: [PATCH 1505/1963] refactor(build): Move the cmake files into the
 -tools debian package

Also install our "reduced" schema files as the package binary was built
against those.
---
 .../debian/libopen62541-dev.install-template       |  1 -
 .../debian/libopen62541-tools.install-template     | 14 +++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/tools/packaging/debian/libopen62541-dev.install-template b/tools/packaging/debian/libopen62541-dev.install-template
index 9193d90fbe2..bcde8558af3 100644
--- a/tools/packaging/debian/libopen62541-dev.install-template
+++ b/tools/packaging/debian/libopen62541-dev.install-template
@@ -1,3 +1,2 @@
 usr/include
-usr/lib/*/cmake/open62541/*
 usr/lib/*/pkgconfig/open62541.pc
diff --git a/tools/packaging/debian/libopen62541-tools.install-template b/tools/packaging/debian/libopen62541-tools.install-template
index fb42663dbae..d0a03a3dd69 100644
--- a/tools/packaging/debian/libopen62541-tools.install-template
+++ b/tools/packaging/debian/libopen62541-tools.install-template
@@ -1,9 +1,5 @@
-usr/share/open62541/tools/*.py
-usr/share/open62541/tools/certs
-usr/share/open62541/tools/nodeset_compiler
-usr/share/open62541/tools/schema
-usr/share/open62541/tools/ua-nodeset/Schema/Opc.Ua.NodeSet2.xml
-usr/share/open62541/tools/ua-nodeset/Schema/Opc.Ua.Types.bsd
-usr/share/open62541/tools/ua-nodeset/Schema/AttributeIds.csv
-usr/share/open62541/tools/ua-nodeset/Schema/NodeIds.csv
-usr/share/open62541/tools/ua-nodeset/Schema/StatusCode.csv
+usr/lib/*/cmake/open62541/*
+usr/share/open62541/*.py
+usr/share/open62541/certs
+usr/share/open62541/nodeset_compiler
+usr/share/open62541/schema

From 51b4427f35dd959f3cedef58108c12db4c3289ce Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 13 May 2024 13:59:01 +0200
Subject: [PATCH 1506/1963] refactor(tests): Include stdlib.h where open62541
 no longer does it

Include is needed for definition of EXIT_SUCCESS.
---
 tests/check_types_builtin_xml.c                             | 1 +
 tests/encryption/check_cert_generation.c                    | 1 +
 tests/nodeset-compiler/check_nodeset_compiler_adi.c         | 1 +
 tests/nodeset-compiler/check_nodeset_compiler_autoid.c      | 1 +
 tests/nodeset-compiler/check_nodeset_compiler_plc.c         | 1 +
 tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c | 1 +
 tests/nodeset-loader/check_nodeset_loader_adi.c             | 1 +
 tests/nodeset-loader/check_nodeset_loader_compare_di.c      | 1 +
 tests/nodeset-loader/check_nodeset_loader_ordering_di.c     | 1 +
 tests/nodeset-loader/check_nodeset_loader_testnodeset.c     | 1 +
 tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c      | 1 +
 tests/pubsub/check_pubsub_config_freeze.c                   | 1 +
 tests/pubsub/check_pubsub_configuration.c                   | 1 +
 tests/pubsub/check_pubsub_connection_ethernet.c             | 1 +
 tests/pubsub/check_pubsub_connection_ethernet_etf.c         | 1 +
 tests/pubsub/check_pubsub_connection_mqtt.c                 | 1 +
 tests/pubsub/check_pubsub_connection_udp.c                  | 1 +
 tests/pubsub/check_pubsub_connection_xdp.c                  | 1 +
 tests/pubsub/check_pubsub_decryption.c                      | 1 +
 tests/pubsub/check_pubsub_encoding.c                        | 1 +
 tests/pubsub/check_pubsub_encoding_custom.c                 | 1 +
 tests/pubsub/check_pubsub_encoding_json.c                   | 1 +
 tests/pubsub/check_pubsub_encrypted_rt_levels.c             | 1 +
 tests/pubsub/check_pubsub_encryption.c                      | 1 +
 tests/pubsub/check_pubsub_encryption_aes256.c               | 1 +
 tests/pubsub/check_pubsub_get_state.c                       | 1 +
 tests/pubsub/check_pubsub_informationmodel.c                | 1 +
 tests/pubsub/check_pubsub_informationmodel_methods.c        | 1 +
 tests/pubsub/check_pubsub_mqtt.c                            | 1 +
 tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c    | 1 +
 tests/pubsub/check_pubsub_pds.c                             | 1 +
 tests/pubsub/check_pubsub_publish.c                         | 1 +
 tests/pubsub/check_pubsub_publish_ethernet.c                | 1 +
 tests/pubsub/check_pubsub_publish_ethernet_etf.c            | 1 +
 tests/pubsub/check_pubsub_publish_json.c                    | 1 +
 tests/pubsub/check_pubsub_publish_rt_levels.c               | 1 +
 tests/pubsub/check_pubsub_publisherid.c                     | 1 +
 tests/pubsub/check_pubsub_publishspeed.c                    | 1 +
 tests/pubsub/check_pubsub_sks_client.c                      | 1 +
 tests/pubsub/check_pubsub_sks_keystorage.c                  | 1 +
 tests/pubsub/check_pubsub_sks_pull.c                        | 1 +
 tests/pubsub/check_pubsub_sks_push.c                        | 1 +
 tests/pubsub/check_pubsub_sks_securitygroups.c              | 1 +
 tests/pubsub/check_pubsub_subscribe.c                       | 1 +
 tests/pubsub/check_pubsub_subscribe_config_freeze.c         | 1 +
 tests/pubsub/check_pubsub_subscribe_encrypted.c             | 1 +
 tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c         | 1 +
 tests/pubsub/check_pubsub_subscribe_rt_levels.c             | 1 +
 tests/pubsub/check_pubsub_udp_unicast.c                     | 1 +
 tests/server/check_server_alarmsconditions.c                | 1 +
 50 files changed, 50 insertions(+)

diff --git a/tests/check_types_builtin_xml.c b/tests/check_types_builtin_xml.c
index 36e9d0754e1..9566bed4773 100644
--- a/tests/check_types_builtin_xml.c
+++ b/tests/check_types_builtin_xml.c
@@ -11,6 +11,7 @@
 
 #include <check.h>
 #include <math.h>
+#include <stdlib.h>
 
 #if defined(_MSC_VER)
 # pragma warning(disable: 4146)
diff --git a/tests/encryption/check_cert_generation.c b/tests/encryption/check_cert_generation.c
index c6a58038109..2636cae5978 100644
--- a/tests/encryption/check_cert_generation.c
+++ b/tests/encryption/check_cert_generation.c
@@ -10,6 +10,7 @@
 #include <open62541/plugin/create_certificate.h>
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Server *server;
 
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_adi.c b/tests/nodeset-compiler/check_nodeset_compiler_adi.c
index f514467ab7e..48911a4c802 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_adi.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_adi.c
@@ -9,6 +9,7 @@
 #include "namespace_tests_adi_generated.h"
 #include "namespace_tests_di_generated.h"
 #include "testing_clock.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_autoid.c b/tests/nodeset-compiler/check_nodeset_compiler_autoid.c
index 5127675c396..99105f14c57 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_autoid.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_autoid.c
@@ -11,6 +11,7 @@
 #include "tests/namespace_tests_di_generated.h"
 #include "tests/namespace_tests_autoid_generated.h"
 #include "unistd.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_plc.c b/tests/nodeset-compiler/check_nodeset_compiler_plc.c
index a75ecf98cfd..5010bc2af01 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_plc.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_plc.c
@@ -11,6 +11,7 @@
 #include "tests/namespace_tests_di_generated.h"
 #include "tests/namespace_tests_plc_generated.h"
 #include "unistd.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
index 279ef325297..08ea81c1446 100644
--- a/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
+++ b/tests/nodeset-compiler/check_nodeset_compiler_testnodeset.c
@@ -13,6 +13,7 @@
 #include "namespace_tests_di_generated.h"
 #include <limits.h>
 #include "unistd.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_DataTypeArray customTypesArray = { NULL, UA_TYPES_TESTS_TESTNODESET_COUNT, UA_TYPES_TESTS_TESTNODESET, UA_FALSE};
diff --git a/tests/nodeset-loader/check_nodeset_loader_adi.c b/tests/nodeset-loader/check_nodeset_loader_adi.c
index 6ba9222b6de..ca146f913bb 100644
--- a/tests/nodeset-loader/check_nodeset_loader_adi.c
+++ b/tests/nodeset-loader/check_nodeset_loader_adi.c
@@ -8,6 +8,7 @@
 
 #include "check.h"
 #include "testing_clock.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_compare_di.c b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
index 3dace7ec71f..6b8e39e6d6f 100644
--- a/tests/nodeset-loader/check_nodeset_loader_compare_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_compare_di.c
@@ -10,6 +10,7 @@
 #include "check.h"
 #include "tests/namespace_nodesetloader_di_generated.h"
 #include "testing_clock.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_ordering_di.c b/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
index 081545ba55c..5eceb2f4a12 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ordering_di.c
@@ -8,6 +8,7 @@
 
 #include "check.h"
 #include "testing_clock.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
index 8e4553c75cc..f6f3bfb7233 100644
--- a/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_testnodeset.c
@@ -11,6 +11,7 @@
 #include <limits.h>
 #include "testing_clock.h"
 #include "unistd.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_UInt16 testNamespaceIndex = (UA_UInt16) -1;
diff --git a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
index 8378d424f90..2f48de1bae8 100644
--- a/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
+++ b/tests/nodeset-loader/check_nodeset_loader_ua_nodeset.c
@@ -44,6 +44,7 @@
 
 #include "check.h"
 #include "testing_clock.h"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/pubsub/check_pubsub_config_freeze.c b/tests/pubsub/check_pubsub_config_freeze.c
index 8e83fc2a2f1..1f2e48bff78 100644
--- a/tests/pubsub/check_pubsub_config_freeze.c
+++ b/tests/pubsub/check_pubsub_config_freeze.c
@@ -13,6 +13,7 @@
 #include <check.h>
 #include <stdio.h>
 #include <time.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/pubsub/check_pubsub_configuration.c b/tests/pubsub/check_pubsub_configuration.c
index f8715026e6e..d6ce23b90c4 100644
--- a/tests/pubsub/check_pubsub_configuration.c
+++ b/tests/pubsub/check_pubsub_configuration.c
@@ -13,6 +13,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/pubsub/check_pubsub_connection_ethernet.c b/tests/pubsub/check_pubsub_connection_ethernet.c
index 3437e93eecc..e718b258b78 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet.c
@@ -16,6 +16,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 /* Adjust your configuration globally for the ethernet tests here: */
 #include "ethernet_config.h"
diff --git a/tests/pubsub/check_pubsub_connection_ethernet_etf.c b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
index 3ffc5f9da75..48b340a4aef 100644
--- a/tests/pubsub/check_pubsub_connection_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_connection_ethernet_etf.c
@@ -9,6 +9,7 @@
 #include <open62541/server_pubsub.h>
 #include <check.h>
 #include <time.h>
+#include <stdlib.h>
 
 #include "ua_pubsub.h"
 #include "ua_server_internal.h"
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index b06748fc389..21ffade5da7 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -13,6 +13,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 //#define TEST_MQTT_SERVER "opc.mqtt://test.mosquitto.org:1883"
 #define TEST_MQTT_SERVER "opc.mqtt://localhost:1883"
diff --git a/tests/pubsub/check_pubsub_connection_udp.c b/tests/pubsub/check_pubsub_connection_udp.c
index 2acbd091c03..6b9b0de6e44 100644
--- a/tests/pubsub/check_pubsub_connection_udp.c
+++ b/tests/pubsub/check_pubsub_connection_udp.c
@@ -12,6 +12,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/pubsub/check_pubsub_connection_xdp.c b/tests/pubsub/check_pubsub_connection_xdp.c
index 3f5d34e2d49..0f6419ebcad 100644
--- a/tests/pubsub/check_pubsub_connection_xdp.c
+++ b/tests/pubsub/check_pubsub_connection_xdp.c
@@ -22,6 +22,7 @@
 #include <sys/mman.h>
 
 #include <check.h>
+#include <stdlib.h>
 
 #define             MULTICAST_MAC_ADDRESS              "opc.eth://01-00-5E-00-00-01"
 #define             RECEIVE_QUEUE_0                    0
diff --git a/tests/pubsub/check_pubsub_decryption.c b/tests/pubsub/check_pubsub_decryption.c
index f703310e816..685635fa146 100644
--- a/tests/pubsub/check_pubsub_decryption.c
+++ b/tests/pubsub/check_pubsub_decryption.c
@@ -14,6 +14,7 @@
 
 #include <check.h>
 #include <ctype.h>
+#include <stdlib.h>
 
 #include <mbedtls/aes.h>
 #include <mbedtls/ctr_drbg.h>
diff --git a/tests/pubsub/check_pubsub_encoding.c b/tests/pubsub/check_pubsub_encoding.c
index 3cf420ffad0..dacc1f83310 100644
--- a/tests/pubsub/check_pubsub_encoding.c
+++ b/tests/pubsub/check_pubsub_encoding.c
@@ -11,6 +11,7 @@
 #include "ua_pubsub_networkmessage.h"
 
 #include "check.h"
+#include <stdlib.h>
 
 START_TEST(UA_PubSub_EnDecode_ShallWorkOn1DS1ValueVariantKeyFrame) {
     UA_NetworkMessage m;
diff --git a/tests/pubsub/check_pubsub_encoding_custom.c b/tests/pubsub/check_pubsub_encoding_custom.c
index e6a19fabe99..008f34fce80 100644
--- a/tests/pubsub/check_pubsub_encoding_custom.c
+++ b/tests/pubsub/check_pubsub_encoding_custom.c
@@ -12,6 +12,7 @@
 
 #include "math.h"
 #include "check.h"
+#include <stdlib.h>
 
 /* The custom datatype for describing a 3d position */
 
diff --git a/tests/pubsub/check_pubsub_encoding_json.c b/tests/pubsub/check_pubsub_encoding_json.c
index f41bd5f2be9..8324f9de11f 100644
--- a/tests/pubsub/check_pubsub_encoding_json.c
+++ b/tests/pubsub/check_pubsub_encoding_json.c
@@ -12,6 +12,7 @@
 #include "ua_pubsub_networkmessage.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 START_TEST(UA_PubSub_EncodeAllOptionalFields) {
     UA_NetworkMessage m;
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index ac4908b50a2..1ae94c9412b 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -16,6 +16,7 @@
 
 #include <check.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_NodeId connectionIdentifier, publishedDataSetIdent, writerGroupIdent, dataSetWriterIdent, dataSetFieldIdent, dataSetFieldIdent1,  readerGroupIdentifier, readerIdentifier;
diff --git a/tests/pubsub/check_pubsub_encryption.c b/tests/pubsub/check_pubsub_encryption.c
index fac05ba0f2c..03563bf0946 100644
--- a/tests/pubsub/check_pubsub_encryption.c
+++ b/tests/pubsub/check_pubsub_encryption.c
@@ -13,6 +13,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #define UA_AES128CTR_SIGNING_KEY_LENGTH 32
 #define UA_AES128CTR_KEY_LENGTH 16
diff --git a/tests/pubsub/check_pubsub_encryption_aes256.c b/tests/pubsub/check_pubsub_encryption_aes256.c
index 64d461f5c07..3b7b375c7d8 100644
--- a/tests/pubsub/check_pubsub_encryption_aes256.c
+++ b/tests/pubsub/check_pubsub_encryption_aes256.c
@@ -13,6 +13,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #define UA_AES256CTR_SIGNING_KEY_LENGTH 32
 #define UA_AES256CTR_KEY_LENGTH 32
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 57f5d54fa91..889aafcdea4 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -13,6 +13,7 @@
 #include "ua_server_internal.h"
 #include <check.h>
 #include <assert.h>
+#include <stdlib.h>
 
 static UA_Server *server = NULL;
 
diff --git a/tests/pubsub/check_pubsub_informationmodel.c b/tests/pubsub/check_pubsub_informationmodel.c
index 7ad893f8085..3331667c487 100644
--- a/tests/pubsub/check_pubsub_informationmodel.c
+++ b/tests/pubsub/check_pubsub_informationmodel.c
@@ -15,6 +15,7 @@
 
 #include <math.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "check.h"
 
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 3ef0dc71134..8242b885825 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -16,6 +16,7 @@
 
 #include <string.h>
 #include <math.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_Boolean running;
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index 1a6fc0690f4..26b03fab5f2 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -11,6 +11,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #define TEST_MQTT_SERVER "opc.mqtt://localhost:1883"
 #define MQTT_CLIENT_ID               "TESTCLIENTPUBSUBMQTT"
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index bccc75dc3c1..b077733b8e0 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -15,6 +15,7 @@
 
 #include <check.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_NodeId connectionIdentifier, publishedDataSetIdent, writerGroupIdent, writerGroupIdent1, dataSetWriterIdent, dataSetWriterIdent1, dataSetFieldIdent, readerGroupIdentifier, readerIdentifier;
diff --git a/tests/pubsub/check_pubsub_pds.c b/tests/pubsub/check_pubsub_pds.c
index 48b1af88784..6375e38a974 100644
--- a/tests/pubsub/check_pubsub_pds.c
+++ b/tests/pubsub/check_pubsub_pds.c
@@ -11,6 +11,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index 4424567cc1c..a6f40362d74 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -12,6 +12,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_NodeId connection1, connection2, writerGroup1, writerGroup2, writerGroup3,
diff --git a/tests/pubsub/check_pubsub_publish_ethernet.c b/tests/pubsub/check_pubsub_publish_ethernet.c
index d350324baa5..4a2c1396f7d 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet.c
@@ -8,6 +8,7 @@
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 #include <check.h>
+#include <stdlib.h>
 
 #include "ua_pubsub.h"
 #include "ua_server_internal.h"
diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
index 7106215255e..5319fbdcf57 100644
--- a/tests/pubsub/check_pubsub_publish_ethernet_etf.c
+++ b/tests/pubsub/check_pubsub_publish_ethernet_etf.c
@@ -10,6 +10,7 @@
 
 #include <check.h>
 #include <time.h>
+#include <stdlib.h>
 
 #include "ua_pubsub.h"
 #include "ua_server_internal.h"
diff --git a/tests/pubsub/check_pubsub_publish_json.c b/tests/pubsub/check_pubsub_publish_json.c
index 956433316a6..1954ee1e2d5 100644
--- a/tests/pubsub/check_pubsub_publish_json.c
+++ b/tests/pubsub/check_pubsub_publish_json.c
@@ -12,6 +12,7 @@
 #include "ua_pubsub.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index e3c472dc65b..07bf1c36460 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -14,6 +14,7 @@
 
 #include <check.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 UA_EventLoop *rtEventLoop = NULL;
 UA_Server *server = NULL;
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 283b578de3e..c779bca20ad 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -11,6 +11,7 @@
 #endif /* UA_ENABLE_PUBSUB_FILE_CONFIG */
 
 #include <check.h>
+#include <stdlib.h>
 
 static UA_Server *server = NULL;
 
diff --git a/tests/pubsub/check_pubsub_publishspeed.c b/tests/pubsub/check_pubsub_publishspeed.c
index a0ba131c684..d62a4307c54 100644
--- a/tests/pubsub/check_pubsub_publishspeed.c
+++ b/tests/pubsub/check_pubsub_publishspeed.c
@@ -13,6 +13,7 @@
 #include <check.h>
 #include <stdio.h>
 #include <time.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_NodeId connection1, writerGroup1, publishedDataSet1, dataSetWriter1;
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index ed1ff74fcb3..3e96d646af2 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -17,6 +17,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #include "../encryption/certificates.h"
 #include "testing_clock.h"
diff --git a/tests/pubsub/check_pubsub_sks_keystorage.c b/tests/pubsub/check_pubsub_sks_keystorage.c
index 4f26b671018..5fce7e45af0 100644
--- a/tests/pubsub/check_pubsub_sks_keystorage.c
+++ b/tests/pubsub/check_pubsub_sks_keystorage.c
@@ -14,6 +14,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 #include "testing_clock.h"
 
 #define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index 250e9992be8..0916a03d576 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -17,6 +17,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 #include "testing_clock.h"
 #include "../encryption/certificates.h"
 #include "thread_wrapper.h"
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index 7bcd69d8a27..3dd0273848d 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -19,6 +19,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 #include "thread_wrapper.h"
 
 #define UA_PUBSUB_KEYMATERIAL_NONCELENGTH 32
diff --git a/tests/pubsub/check_pubsub_sks_securitygroups.c b/tests/pubsub/check_pubsub_sks_securitygroups.c
index eff05903d88..4f4c9c42a74 100644
--- a/tests/pubsub/check_pubsub_sks_securitygroups.c
+++ b/tests/pubsub/check_pubsub_sks_securitygroups.c
@@ -17,6 +17,7 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
+#include <stdlib.h>
 #include <testing_clock.h>
 
 #include "../encryption/certificates.h"
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 4c3dca48e76..81e0e02d533 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -10,6 +10,7 @@
 #include <open62541/server_pubsub.h>
 #include <check.h>
 #include <time.h>
+#include <stdlib.h>
 
 #include "testing_clock.h"
 #include "open62541/types_generated_handling.h"
diff --git a/tests/pubsub/check_pubsub_subscribe_config_freeze.c b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
index e91ac5d7649..b9ab24baf03 100644
--- a/tests/pubsub/check_pubsub_subscribe_config_freeze.c
+++ b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
@@ -13,6 +13,7 @@
 #include <check.h>
 #include <stdio.h>
 #include <time.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 
diff --git a/tests/pubsub/check_pubsub_subscribe_encrypted.c b/tests/pubsub/check_pubsub_subscribe_encrypted.c
index 4da8a3c967b..8f7e9383ac1 100644
--- a/tests/pubsub/check_pubsub_subscribe_encrypted.c
+++ b/tests/pubsub/check_pubsub_subscribe_encrypted.c
@@ -15,6 +15,7 @@
 
 #include <check.h>
 #include <time.h>
+#include <stdlib.h>
 
 #define UA_SUBSCRIBER_PORT       4801    /* Port for Subscriber*/
 #define PUBLISH_INTERVAL         5       /* Publish interval*/
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 26f6c0716d5..1a5f624bdd5 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -7,6 +7,7 @@
 #include "ua_pubsub.h"
 
 #include <check.h>
+#include <stdlib.h>
 
 #define CHK_UNLOCK(pMutex, cond) \
 if (!(cond)) {                     \
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 282ff56727b..bc466927dc2 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -16,6 +16,7 @@
 
 #include <check.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_NodeId connectionIdentifier, publishedDataSetIdent, writerGroupIdent, dataSetWriterIdent, dataSetFieldIdent, readerGroupIdentifier, readerIdentifier;
diff --git a/tests/pubsub/check_pubsub_udp_unicast.c b/tests/pubsub/check_pubsub_udp_unicast.c
index 573cddf8b3c..dc8ccee6590 100644
--- a/tests/pubsub/check_pubsub_udp_unicast.c
+++ b/tests/pubsub/check_pubsub_udp_unicast.c
@@ -9,6 +9,7 @@
 #include <open62541/server_pubsub.h>
 #include <check.h>
 #include <time.h>
+#include <stdlib.h>
 
 #include "../../deps/mp_printf.h"
 #include "testing_clock.h"
diff --git a/tests/server/check_server_alarmsconditions.c b/tests/server/check_server_alarmsconditions.c
index 061b85fbb1d..a4c81dbc493 100644
--- a/tests/server/check_server_alarmsconditions.c
+++ b/tests/server/check_server_alarmsconditions.c
@@ -9,6 +9,7 @@
 #include <open62541/server_config_default.h>
 
 #include <check.h>
+#include <stdlib.h>
 
 UA_Server *server_ac;
 

From d35d7ed2ced0ebd97f9b10e53eea34b1cb47c12a Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Wed, 15 May 2024 09:07:26 +0200
Subject: [PATCH 1507/1963] fix(build): Declare tools package
 architecture-specific

Due to commit 6091b1865f87acf3285b45b06c38d740cab40cd5 the tools
package now contains architecture-specific
content (usr/lib/*/cmake/open62541/*).
Thus the package must be declared with Architecture 'any' instead of
'all'.
---
 tools/packaging/debian/control-template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/packaging/debian/control-template b/tools/packaging/debian/control-template
index 6f5136491d8..baa7b38d19e 100644
--- a/tools/packaging/debian/control-template
+++ b/tools/packaging/debian/control-template
@@ -35,7 +35,8 @@ Description: open62541 (<http://open62541.org>) is an open source implementation
 
 Package: libopen62541-<soname>-tools
 Section: libdevel
-Architecture: all
+Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, python3
 Recommends: libopen62541-<soname>-dev
 Description: open62541 (<http://open62541.org>) is an open source implementation

From 3b5cece390159286d69d319558621b8ca3f8277d Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Fri, 17 May 2024 08:50:05 +0200
Subject: [PATCH 1508/1963] fix(build): Fix path to schema files in CMakeLists

The directory ua-nodeset does not exist any more, the schema files
can be found below the schema directory.
---
 CMakeLists.txt                       | 2 +-
 tools/cmake/open62541Config.cmake.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db45b996af9..c46eb1e61c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1483,7 +1483,7 @@ install(TARGETS open62541
         INCLUDES DESTINATION include)
 
 set(open62541_install_tools_dir share/open62541)
-set(open62541_install_nodeset_dir share/open62541/ua-nodeset)
+set(open62541_install_nodeset_dir share/open62541/schema)
 
 # Create open62541Config.cmake
 include(CMakePackageConfigHelpers)
diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index f23cd6ece24..04842f1ad87 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -2,7 +2,7 @@
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
 
 set_and_check(open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
-set_and_check(UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the OPC UA schema repository")
+set_and_check(UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the schema files")
 
 # Macros for datatype generation, nodeset compiler, etc.
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Macros.cmake")

From 46cf57dcb1ccc2e5b7add8d34858b5af28e911f5 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Wed, 22 May 2024 13:18:42 +0200
Subject: [PATCH 1509/1963] fix(server) find crypto plugin in cmake install

---
 CMakeLists.txt                       |  4 +++-
 tools/cmake/open62541Config.cmake.in | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c46eb1e61c8..080bba76360 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1484,6 +1484,7 @@ install(TARGETS open62541
 
 set(open62541_install_tools_dir share/open62541)
 set(open62541_install_nodeset_dir share/open62541/schema)
+set(open62541_crypto_plugin ${UA_ENABLE_ENCRYPTION})
 
 # Create open62541Config.cmake
 include(CMakePackageConfigHelpers)
@@ -1492,7 +1493,8 @@ configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541
                               "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
                               INSTALL_DESTINATION "${cmake_configfile_install}"
                               PATH_VARS open62541_install_tools_dir
-                                        open62541_install_nodeset_dir)
+                                        open62541_install_nodeset_dir
+                                        open62541_crypto_plugin)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
               "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541Macros.cmake"
         DESTINATION "${cmake_configfile_install}")
diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index 04842f1ad87..c7344874db1 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -3,8 +3,20 @@ include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
 
 set_and_check(open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
 set_and_check(UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the schema files")
+set(open62541_crypto_plugin @open62541_crypto_plugin@)
 
 # Macros for datatype generation, nodeset compiler, etc.
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Macros.cmake")
 
 check_required_components(open62541)
+
+include(CMakeFindDependencyMacro)
+if(open62541_crypto_plugin STREQUAL "mbedtls")
+  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+  find_dependency(MbedTLS REQUIRED)
+  list(REMOVE_AT CMAKE_MODULE_PATH -1)
+elseif(open62541_crypto_plugin STREQUAL "openssl")
+  find_dependency(OpenSSL REQUIRED)
+elseif(open62541_crypto_plugin STREQUAL "libressl")
+  find_dependency(LibreSSL REQUIRED)
+endif()

From 6eb3c34dc3283cfaf0913bfec18ec8cfb4b93058 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 21 May 2024 18:30:15 +0200
Subject: [PATCH 1510/1963] refactor(build): Improve the documentation of the
 UA_NODESET_DIR setting

---
 CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 080bba76360..ee529cd1f9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1120,11 +1120,13 @@ endif()
 # Generate source files #
 #########################
 
-# List of nodeset files combined into NS0 generated file
-set(UA_FILE_NODESETS)
-set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path to the nodetset directory.")
+# Nodeset files combined into NS0 generated file
+set(UA_FILE_NODESETS) # List of nodeset-xml files to be considered in the generated information model
+set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path to the node-set directory (e.g. from https://github.com/OPCFoundation/UA-Nodeset)")
+set(UA_SCHEMA_DIR ${PROJECT_SOURCE_DIR}/tools/schema) # Directory with the schema files for installation
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
+    set(UA_SCHEMA_DIR ${UA_NODESET_DIR}/Schema) # Use the "full" schema files also for datatypes and statuscodes
     if(NOT UA_FILE_NS0)
         set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
     endif()

From b30748ac1a63451e5ade9993ab3df794a50cdcd6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 21 May 2024 18:37:37 +0200
Subject: [PATCH 1511/1963] refactor(build): Unify schema file definitions

---
 CMakeLists.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee529cd1f9b..89eb0c2f29b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1141,9 +1141,6 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         endif()
     endif()
 
-    set(UA_FILE_NODEIDS ${UA_NODESET_DIR}/Schema/NodeIds.csv)
-    set(UA_FILE_STATUSCODES ${UA_NODESET_DIR}/Schema/StatusCode.csv)
-    set(UA_FILE_TYPES_BSD ${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd)
 else()
     if(NOT UA_FILE_NS0)
         set(UA_FILE_NS0 ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Reduced.xml)
@@ -1151,9 +1148,6 @@ else()
     set(UA_FILE_NODESETS "${UA_FILE_NS0}")
 
     set(UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_minimal.txt)
-    set(UA_FILE_NODEIDS ${PROJECT_SOURCE_DIR}/tools/schema/NodeIds.csv)
-    set(UA_FILE_STATUSCODES ${PROJECT_SOURCE_DIR}/tools/schema/StatusCode.csv)
-    set(UA_FILE_TYPES_BSD ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.Types.bsd)
 
     # always enable  subscriptions, method, discovery and historizing datatypes (for the client)
     list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_subscriptions.txt)
@@ -1193,6 +1187,10 @@ else()
     endif()
 endif()
 
+set(UA_FILE_NODEIDS ${UA_SCHEMA_DIR}/NodeIds.csv)
+set(UA_FILE_STATUSCODES ${UA_SCHEMA_DIR}/StatusCode.csv)
+set(UA_FILE_TYPES_BSD ${UA_SCHEMA_DIR}/Opc.Ua.Types.bsd)
+
 # standard-defined data types
 ua_generate_datatypes(BUILTIN GEN_DOC NAME "types" TARGET_SUFFIX "types" NAMESPACE_IDX 0
                       FILE_CSV "${UA_FILE_NODEIDS}"

From 1deaa455fdf10ca818a71efb5de4cbb3e2a18aad Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 21 May 2024 19:20:11 +0200
Subject: [PATCH 1512/1963] refactor(build): Simplify the handling of
 feature-dependent ns0 and type definitions

---
 CMakeLists.txt | 56 +++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89eb0c2f29b..61048cff860 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1126,12 +1126,15 @@ set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path
 set(UA_SCHEMA_DIR ${PROJECT_SOURCE_DIR}/tools/schema) # Directory with the schema files for installation
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
-    set(UA_SCHEMA_DIR ${UA_NODESET_DIR}/Schema) # Use the "full" schema files also for datatypes and statuscodes
+    # Use the "full" schema files also for datatypes and statuscodes
+    set(UA_SCHEMA_DIR ${UA_NODESET_DIR}/Schema)
+
+    # Set the full Nodeset for NS0
     if(NOT UA_FILE_NS0)
-        set(UA_FILE_NS0 ${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml)
+        set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.xml)
     endif()
-    set(UA_FILE_NODESETS "${UA_FILE_NS0}")
 
+    # Check that the submodule was checked out or manually downloaded into the folder
     if(NOT EXISTS "${UA_FILE_NS0}")
         message(STATUS "Submodule update")
         execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
@@ -1140,53 +1143,60 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
             message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}")
         endif()
     endif()
-
 else()
+    # Set the reduced Nodeset for NS0
     if(NOT UA_FILE_NS0)
-        set(UA_FILE_NS0 ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Reduced.xml)
+        set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.Reduced.xml)
     endif()
-    set(UA_FILE_NODESETS "${UA_FILE_NS0}")
 
-    set(UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_minimal.txt)
+    # Set feature-specific datatypes definitions and nodesets
+    set(UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_minimal.txt
+                          ${UA_SCHEMA_DIR}/datatypes_discovery.txt)
 
-    # always enable  subscriptions, method, discovery and historizing datatypes (for the client)
-    list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_subscriptions.txt)
-    list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_method.txt)
-    list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_discovery.txt)
-    list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_historizing.txt)
+    if(UA_ENABLE_METHODCALLS)
+        list(APPEND UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_method.txt)
+    endif()
 
     if(UA_ENABLE_DIAGNOSTICS)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_diagnostics.txt)
-        list(APPEND UA_FILE_NODESETS ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.DiagnosticsMinimal.xml)
+        list(APPEND UA_FILE_NODESETS ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.DiagnosticsMinimal.xml)
+        list(APPEND UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_diagnostics.txt)
+    endif()
+
+    if(UA_ENABLE_SUBSCRIPTIONS)
+        list(APPEND UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_subscriptions.txt)
     endif()
 
     if(UA_ENABLE_SUBSCRIPTIONS_EVENTS)
-        list(APPEND UA_FILE_NODESETS ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.EventsMinimal.xml)
+        list(APPEND UA_FILE_NODESETS ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.EventsMinimal.xml)
     endif()
 
     if(UA_ENABLE_HISTORIZING)
-        list(APPEND UA_FILE_NODESETS ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.HistorizingMinimal.xml)
+        list(APPEND UA_FILE_NODESETS ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.HistorizingMinimal.xml)
+        list(APPEND UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_historizing.txt)
     endif()
 
     if(UA_ENABLE_QUERY)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_query.txt)
+        list(APPEND UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_query.txt)
     endif()
 
     if(UA_ENABLE_PUBSUB)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_pubsub.txt)
+        list(APPEND UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_pubsub.txt)
         if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
-            list(APPEND UA_FILE_NODESETS ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.PubSubMinimal.xml)
+            list(APPEND UA_FILE_NODESETS ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.PubSubMinimal.xml)
         endif()
     endif()
+
 	if(UA_ENABLE_DA)
-		list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_dataaccess.txt)
-        set(UA_NODESET_FILE_DA ${PROJECT_SOURCE_DIR}/tools/schema/Opc.Ua.NodeSet2.Part8_Subset.xml)
+		list(APPEND UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_dataaccess.txt)
+        list(APPEND UA_FILE_NODESETS ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.Part8_Subset.xml)
     endif()
+
     if(UA_ENABLE_TYPEDESCRIPTION)
-        list(APPEND UA_FILE_DATATYPES ${PROJECT_SOURCE_DIR}/tools/schema/datatypes_typedescription.txt)
+        list(APPEND UA_FILE_DATATYPES ${UA_SCHEMA_DIR}/datatypes_typedescription.txt)
     endif()
 endif()
 
+list(INSERT UA_FILE_NODESETS 0 "${UA_FILE_NS0}")
 set(UA_FILE_NODEIDS ${UA_SCHEMA_DIR}/NodeIds.csv)
 set(UA_FILE_STATUSCODES ${UA_SCHEMA_DIR}/StatusCode.csv)
 set(UA_FILE_TYPES_BSD ${UA_SCHEMA_DIR}/Opc.Ua.Types.bsd)
@@ -1250,7 +1260,7 @@ if(UA_ENABLE_AMALGAMATION)
                      open62541-generator-transport open62541-generator-statuscode)
 endif()
 
-ua_generate_nodeset(NAME "ns0" FILE ${UA_FILE_NODESETS} ${UA_NODESET_FILE_DA}
+ua_generate_nodeset(NAME "ns0" FILE ${UA_FILE_NODESETS}
                     INTERNAL BLACKLIST ${UA_FILE_NS0_BLACKLIST}
                     IGNORE "${PROJECT_SOURCE_DIR}/tools/nodeset_compiler/NodeID_NS0_Base.txt"
                     DEPENDS_TARGET "open62541-generator-types")

From 859d50f5e88ba26a5e8a3a46a511696c9883dfaa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 21 May 2024 19:40:00 +0200
Subject: [PATCH 1513/1963] feat(build): Add option UA_ENABLE_DATATYPES_ALL to
 generate all datatypes also with the reduced information model

---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61048cff860..6c4b9ec0093 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,7 @@ option(UA_ENABLE_DISCOVERY "Enable Discovery Service (LDS)" ON)
 option(UA_ENABLE_JSON_ENCODING "Enable JSON encoding" ON)
 option(UA_ENABLE_XML_ENCODING "Enable XML encoding (EXPERIMENTAL)" OFF)
 option(UA_ENABLE_NODESETLOADER "Enable nodesetLoader public API" OFF)
+option(UA_ENABLE_DATATYPES_ALL "Generate all datatypes for namespace zero (uses more binary space)" ON)
 
 if(UA_INFORMATION_MODEL_AUTOLOAD AND NOT UA_ENABLE_NODESETLOADER AND NOT UA_BUILD_FUZZING)
     set(UA_ENABLE_NODESET_INJECTOR ON)
@@ -1201,6 +1202,11 @@ set(UA_FILE_NODEIDS ${UA_SCHEMA_DIR}/NodeIds.csv)
 set(UA_FILE_STATUSCODES ${UA_SCHEMA_DIR}/StatusCode.csv)
 set(UA_FILE_TYPES_BSD ${UA_SCHEMA_DIR}/Opc.Ua.Types.bsd)
 
+# Generate all datatypes -> reset the lists used for filtering
+if(UA_ENABLE_DATATYPES_ALL)
+    unset(UA_FILE_DATATYPES)
+endif()
+
 # standard-defined data types
 ua_generate_datatypes(BUILTIN GEN_DOC NAME "types" TARGET_SUFFIX "types" NAMESPACE_IDX 0
                       FILE_CSV "${UA_FILE_NODEIDS}"

From 742d3f1bb37c210fc5c239af729ce70d3ef06133 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 21 May 2024 19:40:59 +0200
Subject: [PATCH 1514/1963] feat(build): Build debian packages with all
 datatypes

---
 tools/packaging/debian/rules-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packaging/debian/rules-template b/tools/packaging/debian/rules-template
index 071bf4cadfb..c02d991030b 100755
--- a/tools/packaging/debian/rules-template
+++ b/tools/packaging/debian/rules-template
@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=REDUCED -DUA_ENABLE_ENCRYPTION="MBEDTLS" -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON -DUA_ENABLE_AMALGAMATION=OFF -DUA_PACK_DEBIAN=ON -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)"
+	dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=REDUCED -DUA_ENABLE_DATATYPES_ALL=ON -DUA_ENABLE_ENCRYPTION="MBEDTLS" -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON -DUA_ENABLE_AMALGAMATION=OFF -DUA_PACK_DEBIAN=ON -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)"
 
 override_dh_auto_test:
 	dh_auto_test -- ARGS+=--output-on-failure

From b561a93bd3dcfaac1d4b9e9cab2791cd38c6becf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 21 May 2024 20:09:09 +0200
Subject: [PATCH 1515/1963] fix(build): Clean install file permissions /
 install only schema used for compilation

The installed NodeSet file(s) is the one used to generate the library.
---
 CMakeLists.txt | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c4b9ec0093..abf803b43b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1547,24 +1547,28 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
 
-set(UA_install_tools_dirs "tools/certs"
-    "tools/nodeset_compiler"
-    "tools/schema"
-    ${UA_NODESET_DIR})
-
-set(UA_install_tools_files "tools/generate_datatypes.py"
-    "tools/generate_nodeid_header.py"
-    "tools/generate_statuscode_descriptions.py")
-
-install(DIRECTORY ${UA_install_tools_dirs}
+install(DIRECTORY "tools/certs" "tools/nodeset_compiler"
         DESTINATION ${open62541_install_tools_dir}
-        USE_SOURCE_PERMISSIONS
         FILES_MATCHING
         PATTERN "*"
+        PATTERN "__pycache__" EXCLUDE
         PATTERN "*.pyc" EXCLUDE
-        PATTERN ".git*" EXCLUDE)
+        PATTERN ".git*" EXCLUDE
+        PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
 
-install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir})
+# Trailing slash to prevent "schema/schema" nesting
+install(DIRECTORY ${UA_SCHEMA_DIR}/
+        DESTINATION ${open62541_install_nodeset_dir}
+        FILES_MATCHING
+        PATTERN "*"
+        PATTERN "*.txt" EXCLUDE
+        PERMISSIONS OWNER_READ GROUP_READ)
+
+set(UA_install_tools_files "tools/generate_datatypes.py"
+                           "tools/generate_nodeid_header.py"
+                           "tools/generate_statuscode_descriptions.py")
+install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir}
+        PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
 
 # Recreate the include folder structure from the source also in /usr/lib/include/open62541
 if(NOT UA_ENABLE_AMALGAMATION)

From 57d9aebf1854e3a203cdf532a876009c795bce78 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 21 May 2024 20:13:32 +0200
Subject: [PATCH 1516/1963] refactor(build): Minor documentation fix in
 CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abf803b43b9..d5a2299ccdf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1570,7 +1570,7 @@ set(UA_install_tools_files "tools/generate_datatypes.py"
 install(FILES ${UA_install_tools_files} DESTINATION ${open62541_install_tools_dir}
         PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
 
-# Recreate the include folder structure from the source also in /usr/lib/include/open62541
+# Recreate the include folder structure from the source also in /usr/include/open62541
 if(NOT UA_ENABLE_AMALGAMATION)
     set(FILES_TO_INSTALL ${exported_headers} ${plugin_headers})
     set(BASE_PATH_MAIN "${PROJECT_SOURCE_DIR}/include/open62541")

From 98b893cc4debab45c5262417136130b8e2ef4349 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:10:36 +0200
Subject: [PATCH 1517/1963] refactor(build): Don't package the full copyright
 text for files in /usr/share/common-licenses

---
 tools/packaging/debian/copyright | 606 ++-----------------------------
 1 file changed, 31 insertions(+), 575 deletions(-)

diff --git a/tools/packaging/debian/copyright b/tools/packaging/debian/copyright
index f2b358f6b8c..3dd99f8bc43 100644
--- a/tools/packaging/debian/copyright
+++ b/tools/packaging/debian/copyright
@@ -13,11 +13,11 @@ License: MPL-2.0
 
 Files: deps/open62541_queue.h
 Copyright: 1991, 1993, The Regents of the University of California.
-License: BSD-3-clause
+License: BSD-3-Clause
 
 Files: deps/base64.c
 Copyright: 2005-2011, Jouni Malinen
-License: BSD-3-clause
+License: BSD-3-Clause
 
 Files: deps/parse_num.c
 Copyright: 2005-2013, Rich Felker
@@ -42,403 +42,8 @@ Copyright: 2013, Andreas Samoljuk
 License: BSL-1.0
 
 License: MPL-2.0
- Mozilla Public License Version 2.0
- ==================================
- .
- 1. Definitions
- --------------
- .
- 1.1. "Contributor"
-     means each individual or legal entity that creates, contributes to
-     the creation of, or owns Covered Software.
- .
- 1.2. "Contributor Version"
-     means the combination of the Contributions of others (if any) used
-     by a Contributor and that particular Contributor's Contribution.
- .
- 1.3. "Contribution"
-     means Covered Software of a particular Contributor.
- .
- 1.4. "Covered Software"
-     means Source Code Form to which the initial Contributor has attached
-     the notice in Exhibit A, the Executable Form of such Source Code
-     Form, and Modifications of such Source Code Form, in each case
-     including portions thereof.
- .
- 1.5. "Incompatible With Secondary Licenses"
-     means
- .
-     (a) that the initial Contributor has attached the notice described
-         in Exhibit B to the Covered Software; or
- .
-     (b) that the Covered Software was made available under the terms of
-         version 1.1 or earlier of the License, but not also under the
-         terms of a Secondary License.
- .
- 1.6. "Executable Form"
-     means any form of the work other than Source Code Form.
- .
- 1.7. "Larger Work"
-     means a work that combines Covered Software with other material, in
-     a separate file or files, that is not Covered Software.
- .
- 1.8. "License"
-     means this document.
- .
- 1.9. "Licensable"
-     means having the right to grant, to the maximum extent possible,
-     whether at the time of the initial grant or subsequently, any and
-     all of the rights conveyed by this License.
- .
- 1.10. "Modifications"
-     means any of the following:
- .
-     (a) any file in Source Code Form that results from an addition to,
-         deletion from, or modification of the contents of Covered
-         Software; or
- .
-     (b) any new file in Source Code Form that contains any Covered
-         Software.
- .
- 1.11. "Patent Claims" of a Contributor
-     means any patent claim(s), including without limitation, method,
-     process, and apparatus claims, in any patent Licensable by such
-     Contributor that would be infringed, but for the grant of the
-     License, by the making, using, selling, offering for sale, having
-     made, import, or transfer of either its Contributions or its
-     Contributor Version.
- .
- 1.12. "Secondary License"
-     means either the GNU General Public License, Version 2.0, the GNU
-     Lesser General Public License, Version 2.1, the GNU Affero General
-     Public License, Version 3.0, or any later versions of those
-     licenses.
- .
- 1.13. "Source Code Form"
-     means the form of the work preferred for making modifications.
- .
- 1.14. "You" (or "Your")
-     means an individual or a legal entity exercising rights under this
-     License. For legal entities, "You" includes any entity that
-     controls, is controlled by, or is under common control with You. For
-     purposes of this definition, "control" means (a) the power, direct
-     or indirect, to cause the direction or management of such entity,
-     whether by contract or otherwise, or (b) ownership of more than
-     fifty percent (50%) of the outstanding shares or beneficial
-     ownership of such entity.
- .
- 2. License Grants and Conditions
- --------------------------------
- .
- 2.1. Grants
- .
- Each Contributor hereby grants You a world-wide, royalty-free,
- non-exclusive license:
- .
- (a) under intellectual property rights (other than patent or trademark)
-     Licensable by such Contributor to use, reproduce, make available,
-     modify, display, perform, distribute, and otherwise exploit its
-     Contributions, either on an unmodified basis, with Modifications, or
-     as part of a Larger Work; and
- .
- (b) under Patent Claims of such Contributor to make, use, sell, offer
-     for sale, have made, import, and otherwise transfer either its
-     Contributions or its Contributor Version.
- .
- 2.2. Effective Date
- .
- The licenses granted in Section 2.1 with respect to any Contribution
- become effective for each Contribution on the date the Contributor first
- distributes such Contribution.
- .
- 2.3. Limitations on Grant Scope
- .
- The licenses granted in this Section 2 are the only rights granted under
- this License. No additional rights or licenses will be implied from the
- distribution or licensing of Covered Software under this License.
- Notwithstanding Section 2.1(b) above, no patent license is granted by a
- Contributor:
- .
- (a) for any code that a Contributor has removed from Covered Software;
-     or
- .
- (b) for infringements caused by: (i) Your and any other third party's
-     modifications of Covered Software, or (ii) the combination of its
-     Contributions with other software (except as part of its Contributor
-     Version); or
- .
- (c) under Patent Claims infringed by Covered Software in the absence of
-     its Contributions.
- .
- This License does not grant any rights in the trademarks, service marks,
- or logos of any Contributor (except as may be necessary to comply with
- the notice requirements in Section 3.4).
- .
- 2.4. Subsequent Licenses
- .
- No Contributor makes additional grants as a result of Your choice to
- distribute the Covered Software under a subsequent version of this
- License (see Section 10.2) or under the terms of a Secondary License (if
- permitted under the terms of Section 3.3).
- .
- 2.5. Representation
- .
- Each Contributor represents that the Contributor believes its
- Contributions are its original creation(s) or it has sufficient rights
- to grant the rights to its Contributions conveyed by this License.
- .
- 2.6. Fair Use
- .
- This License is not intended to limit any rights You have under
- applicable copyright doctrines of fair use, fair dealing, or other
- equivalents.
- .
- 2.7. Conditions
- .
- Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
- in Section 2.1.
- .
- 3. Responsibilities
- -------------------
- .
- 3.1. Distribution of Source Form
- .
- All distribution of Covered Software in Source Code Form, including any
- Modifications that You create or to which You contribute, must be under
- the terms of this License. You must inform recipients that the Source
- Code Form of the Covered Software is governed by the terms of this
- License, and how they can obtain a copy of this License. You may not
- attempt to alter or restrict the recipients' rights in the Source Code
- Form.
- .
- 3.2. Distribution of Executable Form
- .
- If You distribute Covered Software in Executable Form then:
- .
- (a) such Covered Software must also be made available in Source Code
-     Form, as described in Section 3.1, and You must inform recipients of
-     the Executable Form how they can obtain a copy of such Source Code
-     Form by reasonable means in a timely manner, at a charge no more
-     than the cost of distribution to the recipient; and
- .
- (b) You may distribute such Executable Form under the terms of this
-     License, or sublicense it under different terms, provided that the
-     license for the Executable Form does not attempt to limit or alter
-     the recipients' rights in the Source Code Form under this License.
- .
- 3.3. Distribution of a Larger Work
- .
- You may create and distribute a Larger Work under terms of Your choice,
- provided that You also comply with the requirements of this License for
- the Covered Software. If the Larger Work is a combination of Covered
- Software with a work governed by one or more Secondary Licenses, and the
- Covered Software is not Incompatible With Secondary Licenses, this
- License permits You to additionally distribute such Covered Software
- under the terms of such Secondary License(s), so that the recipient of
- the Larger Work may, at their option, further distribute the Covered
- Software under the terms of either this License or such Secondary
- License(s).
- .
- 3.4. Notices
- .
- You may not remove or alter the substance of any license notices
- (including copyright notices, patent notices, disclaimers of warranty,
- or limitations of liability) contained within the Source Code Form of
- the Covered Software, except that You may alter any license notices to
- the extent required to remedy known factual inaccuracies.
- .
- 3.5. Application of Additional Terms
- .
- You may choose to offer, and to charge a fee for, warranty, support,
- indemnity or liability obligations to one or more recipients of Covered
- Software. However, You may do so only on Your own behalf, and not on
- behalf of any Contributor. You must make it absolutely clear that any
- such warranty, support, indemnity, or liability obligation is offered by
- You alone, and You hereby agree to indemnify every Contributor for any
- liability incurred by such Contributor as a result of warranty, support,
- indemnity or liability terms You offer. You may include additional
- disclaimers of warranty and limitations of liability specific to any
- jurisdiction.
- .
- 4. Inability to Comply Due to Statute or Regulation
- ---------------------------------------------------
- .
- If it is impossible for You to comply with any of the terms of this
- License with respect to some or all of the Covered Software due to
- statute, judicial order, or regulation then You must: (a) comply with
- the terms of this License to the maximum extent possible; and (b)
- describe the limitations and the code they affect. Such description must
- be placed in a text file included with all distributions of the Covered
- Software under this License. Except to the extent prohibited by statute
- or regulation, such description must be sufficiently detailed for a
- recipient of ordinary skill to be able to understand it.
- .
- 5. Termination
- --------------
- .
- 5.1. The rights granted under this License will terminate automatically
- if You fail to comply with any of its terms. However, if You become
- compliant, then the rights granted under this License from a particular
- Contributor are reinstated (a) provisionally, unless and until such
- Contributor explicitly and finally terminates Your grants, and (b) on an
- ongoing basis, if such Contributor fails to notify You of the
- non-compliance by some reasonable means prior to 60 days after You have
- come back into compliance. Moreover, Your grants from a particular
- Contributor are reinstated on an ongoing basis if such Contributor
- notifies You of the non-compliance by some reasonable means, this is the
- first time You have received notice of non-compliance with this License
- from such Contributor, and You become compliant prior to 30 days after
- Your receipt of the notice.
- .
- 5.2. If You initiate litigation against any entity by asserting a patent
- infringement claim (excluding declaratory judgment actions,
- counter-claims, and cross-claims) alleging that a Contributor Version
- directly or indirectly infringes any patent, then the rights granted to
- You by any and all Contributors for the Covered Software under Section
- 2.1 of this License shall terminate.
- .
- 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
- end user license agreements (excluding distributors and resellers) which
- have been validly granted by You or Your distributors under this License
- prior to termination shall survive termination.
- .
- ************************************************************************
- *                                                                      *
- *  6. Disclaimer of Warranty                                           *
- *  -------------------------                                           *
- *                                                                      *
- *  Covered Software is provided under this License on an "as is"       *
- *  basis, without warranty of any kind, either expressed, implied, or  *
- *  statutory, including, without limitation, warranties that the       *
- *  Covered Software is free of defects, merchantable, fit for a        *
- *  particular purpose or non-infringing. The entire risk as to the     *
- *  quality and performance of the Covered Software is with You.        *
- *  Should any Covered Software prove defective in any respect, You     *
- *  (not any Contributor) assume the cost of any necessary servicing,   *
- *  repair, or correction. This disclaimer of warranty constitutes an   *
- *  essential part of this License. No use of any Covered Software is   *
- *  authorized under this License except under this disclaimer.         *
- *                                                                      *
- ************************************************************************
- .
- ************************************************************************
- *                                                                      *
- *  7. Limitation of Liability                                          *
- *  --------------------------                                          *
- *                                                                      *
- *  Under no circumstances and under no legal theory, whether tort      *
- *  (including negligence), contract, or otherwise, shall any           *
- *  Contributor, or anyone who distributes Covered Software as          *
- *  permitted above, be liable to You for any direct, indirect,         *
- *  special, incidental, or consequential damages of any character      *
- *  including, without limitation, damages for lost profits, loss of    *
- *  goodwill, work stoppage, computer failure or malfunction, or any    *
- *  and all other commercial damages or losses, even if such party      *
- *  shall have been informed of the possibility of such damages. This   *
- *  limitation of liability shall not apply to liability for death or   *
- *  personal injury resulting from such party's negligence to the       *
- *  extent applicable law prohibits such limitation. Some               *
- *  jurisdictions do not allow the exclusion or limitation of           *
- *  incidental or consequential damages, so this exclusion and          *
- *  limitation may not apply to You.                                    *
- *                                                                      *
- ************************************************************************
- .
- 8. Litigation
- -------------
- .
- Any litigation relating to this License may be brought only in the
- courts of a jurisdiction where the defendant maintains its principal
- place of business and such litigation shall be governed by laws of that
- jurisdiction, without reference to its conflict-of-law provisions.
- Nothing in this Section shall prevent a party's ability to bring
- cross-claims or counter-claims.
- .
- 9. Miscellaneous
- ----------------
- .
- This License represents the complete agreement concerning the subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the extent
- necessary to make it enforceable. Any law or regulation which provides
- that the language of a contract shall be construed against the drafter
- shall not be used to construe this License against a Contributor.
- .
- 10. Versions of the License
- ---------------------------
- .
- 10.1. New Versions
- .
- Mozilla Foundation is the license steward. Except as provided in Section
- 10.3, no one other than the license steward has the right to modify or
- publish new versions of this License. Each version will be given a
- distinguishing version number.
- .
- 10.2. Effect of New Versions
- .
- You may distribute the Covered Software under the terms of the version
- of the License under which You originally received the Covered Software,
- or under the terms of any subsequent version published by the license
- steward.
- .
- 10.3. Modified Versions
- .
- If you create software not governed by this License, and you want to
- create a new license for such software, you may create and use a
- modified version of this License if you rename the license and remove
- any references to the name of the license steward (except to note that
- such modified license differs from this License).
- .
- 10.4. Distributing Source Code Form that is Incompatible With Secondary
- Licenses
- .
- If You choose to distribute Source Code Form that is Incompatible With
- Secondary Licenses under the terms of this version of the License, the
- notice described in Exhibit B of this License must be attached.
- .
- Exhibit A - Source Code Form License Notice
- -------------------------------------------
- .
-   This Source Code Form is subject to the terms of the Mozilla Public
-   License, v. 2.0. If a copy of the MPL was not distributed with this
-   file, You can obtain one at http://mozilla.org/MPL/2.0/.
- .
- If it is not possible or desirable to put the notice in a particular
- file, then You may include the notice in a location (such as a LICENSE
- file in a relevant directory) where a recipient would be likely to look
- for such a notice.
- .
- You may add additional accurate notices of copyright ownership.
- .
- Exhibit B - "Incompatible With Secondary Licenses" Notice
- ---------------------------------------------------------
- .
-   This Source Code Form is "Incompatible With Secondary Licenses", as
-   defined by the Mozilla Public License, v. 2.0.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holder nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ On Debian systems, the complete text of the Mozilla Public License, Version 2.0
+ can be found in /usr/share/common-licenses/MPL-2.0.
 
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -459,183 +64,34 @@ License: MIT
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-License: Apache-2.0
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
- .
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- .
-   1. Definitions.
- .
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
- .
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
- .
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
- .
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
- .
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
- .
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
- .
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
- .
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
- .
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
- .
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
- .
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
- .
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
- .
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
- .
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
- .
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
- .
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
- .
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
- .
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
- .
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
- .
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
- .
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
- .
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
- .
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
  .
-   END OF TERMS AND CONDITIONS
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache License, Version 2.0 can be
+ found in /usr/share/common-licenses/Apache-2.0.
 
 License: BSL-1.0
  Boost Software License 1.0

From 717bf6a800b479342ecb79d50e55864074494203 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:13:33 +0200
Subject: [PATCH 1518/1963] refactor(build): Manually set the version string in
 the right location in tools/prepare_packaging.py

---
 tools/prepare_packaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index 4578fc8d329..85038c7dd59 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -110,6 +110,6 @@
     f.seek(0)
     f.truncate()
     for idx, line in enumerate(lines):
-        if idx == 2:
+        if idx == 1:
             f.write('set(OPEN62541_VERSION "{}")\n'.format(git_describe_version))
         f.write(line)

From ebaf380f060579482f43d82fcc8b3cf6a3cc9c35 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:15:27 +0200
Subject: [PATCH 1519/1963] refactor(build): Name the library
 libopen62541-<major>.<minor> for the Debian build

---
 CMakeLists.txt                   | 36 +++++++++++++++++++-------------
 doc/CMakeLists.txt               |  4 ++--
 tools/cmake/linting_target.cmake |  2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5a2299ccdf..a548446caa2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1296,6 +1296,14 @@ assign_source_group(${lib_headers} ${lib_sources})
 assign_source_group(${architecture_headers} ${architecture_sources})
 assign_source_group(${plugin_headers} ${plugin_sources})
 
+# When building packages, include the source in the library name to enable parallel
+# installation of multiple versions. We may break the ABI between minor releases!
+if(UA_PACK_DEBIAN)
+    set(OPEN62541-LIB "open62541-${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}")
+else()
+    set(OPEN62541-LIB "open62541")
+endif()
+
 if(UA_ENABLE_AMALGAMATION)
     add_library(open62541-object OBJECT ${PROJECT_BINARY_DIR}/open62541.c ${PROJECT_BINARY_DIR}/open62541.h)
     target_include_directories(open62541-object PRIVATE ${PROJECT_BINARY_DIR})
@@ -1324,10 +1332,10 @@ if(UA_ENABLE_AMALGAMATION)
                       open62541-generator-statuscode
                       open62541-amalgamation-source)
 
-    add_library(open62541 $<TARGET_OBJECTS:open62541-object>)
+    add_library(${OPEN62541-LIB} $<TARGET_OBJECTS:open62541-object>)
     # the only directory that needs to be included if open62541 (amalgameted) target from
     # the build directory is ${PROJECT_BINARY_DIR}, that contains the generated open62541.h
-    target_include_directories(open62541 PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
+    target_include_directories(${OPEN62541-LIB} PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 
     add_dependencies(open62541-amalgamation-source open62541-generator-namespace)
     add_dependencies(open62541-amalgamation-header open62541-generator-namespace)
@@ -1362,13 +1370,13 @@ else()
     target_compile_definitions(open62541-plugins PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
     set_target_properties(open62541-plugins PROPERTIES FOLDER "open62541/lib")
 
-    add_library(open62541 $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+    add_library(${OPEN62541-LIB} $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
 
     if(UA_ENABLE_ENCRYPTION_LIBRESSL)
         # Prevent Wincrypt override warning.
         target_compile_definitions(open62541-plugins PUBLIC NOCRYPT=1)
         target_compile_definitions(open62541-object PUBLIC NOCRYPT=1)
-        target_compile_definitions(open62541 PUBLIC NOCRYPT=1)
+        target_compile_definitions(${OPEN62541-LIB} PUBLIC NOCRYPT=1)
     endif()
 
     # Declare include directories
@@ -1382,7 +1390,7 @@ else()
     function(include_directories_public)
         include_directories_private(${ARGN})
         foreach(_include_dir IN ITEMS ${ARGN})
-            target_include_directories(open62541 PUBLIC $<BUILD_INTERFACE:${_include_dir}>)
+            target_include_directories(${OPEN62541-LIB} PUBLIC $<BUILD_INTERFACE:${_include_dir}>)
         endforeach()
     endfunction()
 
@@ -1417,20 +1425,20 @@ endif()
 add_dependencies(open62541-object open62541-code-generation)
 
 # Ensure that the open62541::open62541 alias can be used inside open62541's build
-add_library(open62541::open62541 ALIAS open62541)
+add_library(open62541::open62541 ALIAS ${OPEN62541-LIB})
 
 # Export Symbols
 target_compile_definitions(open62541-object PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
-target_compile_definitions(open62541 PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
+target_compile_definitions(${OPEN62541-LIB} PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
 if(UA_ENABLE_DISCOVERY_MULTICAST)
     target_compile_definitions(open62541-object PRIVATE -DMDNSD_DYNAMIC_LINKING_EXPORT)
-    target_compile_definitions(open62541 PRIVATE -DMDNSD_DYNAMIC_LINKING_EXPORT)
+    target_compile_definitions(${OPEN62541-LIB} PRIVATE -DMDNSD_DYNAMIC_LINKING_EXPORT)
 endif()
 # Generate properly versioned shared library links on Linux
-SET_TARGET_PROPERTIES(open62541 PROPERTIES SOVERSION "${OPEN62541_VER_MAJOR}" VERSION "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}")
+SET_TARGET_PROPERTIES(${OPEN62541-LIB} PROPERTIES SOVERSION "${OPEN62541_VER_MAJOR}" VERSION "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}")
 
 # DLL requires linking to dependencies
-target_link_libraries(open62541 ${open62541_LIBRARIES})
+target_link_libraries(${OPEN62541-LIB} ${open62541_LIBRARIES})
 
 ##########################
 # Build Selected Targets #
@@ -1491,7 +1499,7 @@ if(UA_ENABLE_AMALGAMATION)
 endif()
 
 # export library (either static or shared depending on BUILD_SHARED_LIBS)
-install(TARGETS open62541
+install(TARGETS ${OPEN62541-LIB}
         EXPORT open62541Targets
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -1517,7 +1525,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
 
 # Create open62541ConfigVersion.cmake
 set(open62541_VERSION)
-get_target_property(open62541_VERSION open62541 VERSION)
+get_target_property(open62541_VERSION ${OPEN62541-LIB} VERSION)
 write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/open62541ConfigVersion.cmake"
                                  VERSION ${open62541_VERSION} COMPATIBILITY AnyNewerVersion)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541ConfigVersion.cmake"
@@ -1528,7 +1536,7 @@ install(EXPORT open62541Targets
         FILE open62541Targets.cmake
         DESTINATION "${cmake_configfile_install}"
         NAMESPACE open62541::)
-export(TARGETS open62541
+export(TARGETS ${OPEN62541-LIB}
        NAMESPACE open62541::
        FILE ${CMAKE_CURRENT_BINARY_DIR}/open62541Targets.cmake)
 
@@ -1606,7 +1614,7 @@ endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "_CmakePredifinedTargets")
 
-set_target_properties(open62541 PROPERTIES FOLDER "open62541/lib")
+set_target_properties(${OPEN62541-LIB} PROPERTIES FOLDER "open62541/lib")
 set_target_properties(open62541-object PROPERTIES FOLDER "open62541/lib")
 if(UA_ENABLE_AMALGAMATION)
     set_target_properties(open62541-amalgamation-header PROPERTIES FOLDER "open62541/lib")
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 68d89f27375..a2e792cf6be 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -79,7 +79,7 @@ add_custom_target(doc_latex ${SPHINX_EXECUTABLE}
                   -b latex "${DOC_SRC_DIR}" "${DOC_LATEX_DIR}"
                   DEPENDS ${GENERATED_RST} ${DOC_TARGET}
                   COMMENT "Building LaTeX sources for documentation with Sphinx")
-add_dependencies(doc_latex open62541)
+add_dependencies(doc_latex ${OPEN62541-LIB})
 
 add_custom_target(doc_pdf ${PDFLATEX_COMPILER} -interaction=batchmode "open62541.tex"
                   WORKING_DIRECTORY ${DOC_LATEX_DIR}
@@ -93,7 +93,7 @@ add_custom_target(doc ${SPHINX_EXECUTABLE}
                   -b html "${DOC_SRC_DIR}" "${DOC_HTML_DIR}"
                   DEPENDS ${GENERATED_RST} ${DOC_TARGET}
                   COMMENT "Building HTML documentation with Sphinx")
-add_dependencies(doc open62541)
+add_dependencies(doc ${OPEN62541-LIB})
 
 set_target_properties(doc doc_latex doc_pdf PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
 set_target_properties(doc doc_latex doc_pdf PROPERTIES FOLDER "open62541/doc")
diff --git a/tools/cmake/linting_target.cmake b/tools/cmake/linting_target.cmake
index 202ac526ded..1ecf3b35519 100644
--- a/tools/cmake/linting_target.cmake
+++ b/tools/cmake/linting_target.cmake
@@ -7,7 +7,7 @@ add_custom_target(clang-tidy ${CLANG_TIDY_PROGRAM}
                   ${lib_sources}
                   DEPENDS ${lib_sources}
                   COMMENT "Run clang-tidy on the library")
-add_dependencies(clang-tidy open62541)
+add_dependencies(clang-tidy ${OPEN62541-LIB})
 set_target_properties(clang-tidy PROPERTIES FOLDER "CodeAnalysis")
 
 add_custom_target(cpplint cpplint

From ff62b53246f001736fd008ec4a244b281b25fc99 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:16:13 +0200
Subject: [PATCH 1520/1963] refactor(build): Only install the schema files used
 by our nodeset compiler

---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a548446caa2..228706e5aa2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1568,8 +1568,10 @@ install(DIRECTORY "tools/certs" "tools/nodeset_compiler"
 install(DIRECTORY ${UA_SCHEMA_DIR}/
         DESTINATION ${open62541_install_nodeset_dir}
         FILES_MATCHING
-        PATTERN "*"
-        PATTERN "*.txt" EXCLUDE
+        PATTERN "*.xml"
+        PATTERN "*Types.bsd"
+        PATTERN "StatusCode.csv"
+        PATTERN "NodeIds.csv"
         PERMISSIONS OWNER_READ GROUP_READ)
 
 set(UA_install_tools_files "tools/generate_datatypes.py"

From 8660b325dec7889ebe9f3e7763d40a372f0285d3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:17:49 +0200
Subject: [PATCH 1521/1963] refactor(build): Remove unused config flag from
 config.h.in

---
 include/open62541/config.h.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 309cb746797..e96b17121c4 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -89,8 +89,6 @@
 #cmakedefine UA_ENABLE_PUBSUB_BUFMALLOC
 #cmakedefine UA_ENABLE_PUBSUB_SKS
 
-#cmakedefine UA_PACK_DEBIAN
-
 /* Options for Debugging */
 #cmakedefine UA_DEBUG
 #cmakedefine UA_DEBUG_DUMP_PKGS

From 66e6dcfa512ca46b9c2aba2ce738a5068ec56254 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:18:15 +0200
Subject: [PATCH 1522/1963] refactor(doc): Prefer the use of "debuild" to
 prepare Debian packages

---
 doc/building.rst | 72 ++++--------------------------------------------
 1 file changed, 6 insertions(+), 66 deletions(-)

diff --git a/doc/building.rst b/doc/building.rst
index 322015bc3a9..963a029c25f 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -146,78 +146,18 @@ The procedure below works on OpenBSD 5.8 with gcc version 4.8.4, cmake version
 Building Debian Packages inside Docker Container with CMake on Ubuntu or Debian
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Here is an example howto build the library as Debian package inside a Docker container
-
-- Download and install
-
-  - Docker Engine: https://docs.docker.com/install/linux/docker-ce/debian/
-  - docker-deb-builder: https://github.com/tsaarni/docker-deb-builder.git
-  - open62541: https://github.com/open62541/open62541.git
-
-Install Docker as described at https://docs.docker.com/install/linux/docker-ce/debian/ .
-
-Get the docker-deb-builder utility from github and make Docker images for the needed
-Debian and/or Ubuntu relases
-
-.. code-block:: bash
-
-   # make and goto local development path (e.g. ~/development)
-   mkdir ~/development
-   cd ~/development
-
-   # clone docker-deb-builder utility from github and change into builder directory
-   git clone https://github.com/tsaarni/docker-deb-builder.git
-   cd docker-deb-builder
-
-   # make Docker builder images (e.g. Ubuntu 18.04 and 17.04)
-   docker build -t docker-deb-builder:18.04 -f Dockerfile-ubuntu-18.04 .
-   docker build -t docker-deb-builder:17.04 -f Dockerfile-ubuntu-17.04 .
-
-Make a local copy of the open62541 git repo and checkout a pack branch
+This is how to build the Debian packages.
 
 .. code-block:: bash
 
-   # make a local copy of the open62541 git repo (e.g. in the home directory)
-   # and checkout a pack branch (e.g. pack/1.0)
-   cd ~
-   git clone https://github.com/open62541/open62541.git
+   # Assume a fresh checkout of open62541 in the ~/open62541 directory
    cd ~/open62541
-   git checkout pack/1.0
-
-Now it's all set to build Debian/Ubuntu open62541 packages
-
-.. code-block:: bash
-
-   # goto local developmet path
-   cd ~/development
-
-   # make a local output directory for the builder where the packages can be placed after build
-   mkdir output
-
-   # build Debian/Ubuntu packages inside Docker container (e.g. Ubuntu-18.04)
-   ./build -i docker-deb-builder:18.04 -o output ~/open62541
-
-After a successfull build the Debian/Ubuntu packages can be found at :file:`~/development/docker-deb-builder/output`
-
-CMake Build Options and Debian Packaging
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If the open62541 library will be build as a Debian package using a pack branch (e.g. pack/master or pack/1.0)
-then altering or adding CMake build options should be done inside the :file:`debian/rules` file respectively in
-the :file:`debian/rules-template` file if working with a development branch (e.g. master or 1.0).
-
-The section in :file:`debian/rules` where the CMake build options are defined is
-
-.. code-block:: bash
-
-   ...
-   override_dh_auto_configure:
-       dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=FULL -DUA_ENABLE_AMALGAMATION=OFF -DUA_PACK_DEBIAN=ON
-   ...
 
-This CMake build options will be passed as command line variables to CMake during Debian packaging.
+   # Create the debian packaging definitions
+   python3 ./tools/prepare_packaging.py
 
-.. _build_options:
+   # Build the package (generated packages and source will be in the ~ folder)
+   debuild
 
 Build Options
 -------------

From d04491523e61bcc950615d2688179ff1cf07ffe1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:19:05 +0200
Subject: [PATCH 1523/1963] fix(build): Install the .so symbolic link with the
 -dev package

---
 tools/packaging/debian/libopen62541-dev.install-template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/packaging/debian/libopen62541-dev.install-template b/tools/packaging/debian/libopen62541-dev.install-template
index bcde8558af3..cc6b8f10abf 100644
--- a/tools/packaging/debian/libopen62541-dev.install-template
+++ b/tools/packaging/debian/libopen62541-dev.install-template
@@ -1,2 +1,3 @@
 usr/include
+usr/lib/*/*.so
 usr/lib/*/pkgconfig/open62541.pc

From 4705b88cfd73ead293ec7a8421cf4d32fb06a8aa Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:19:40 +0200
Subject: [PATCH 1524/1963] refactor(build): Remove a deprecated build option
 from the Debian build rules

---
 tools/packaging/debian/rules-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/packaging/debian/rules-template b/tools/packaging/debian/rules-template
index c02d991030b..c18a2196cec 100755
--- a/tools/packaging/debian/rules-template
+++ b/tools/packaging/debian/rules-template
@@ -11,4 +11,4 @@ override_dh_auto_test:
 	dh_auto_test -- ARGS+=--output-on-failure
 
 %:
-	dh $@ --buildsystem=cmake --parallel
+	dh $@ --buildsystem=cmake

From 21a88b994f35d561f5ef271d153feddacb5b203e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 22 May 2024 23:36:16 +0200
Subject: [PATCH 1525/1963] refactor(build): Don't automatically adjust the
 Debian package changelog

---
 .../debian/{rules-template => rules}          |  0
 tools/prepare_packaging.py                    | 64 ++-----------------
 2 files changed, 7 insertions(+), 57 deletions(-)
 rename tools/packaging/debian/{rules-template => rules} (100%)

diff --git a/tools/packaging/debian/rules-template b/tools/packaging/debian/rules
similarity index 100%
rename from tools/packaging/debian/rules-template
rename to tools/packaging/debian/rules
diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index 85038c7dd59..fd6c060776b 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -7,19 +7,14 @@
 import subprocess
 import os
 import re
-from email.utils import formatdate
-import datetime
 import shutil
 
 # Get the base filesystem paths.
-# The current path is used as the "build environment"
+# The current path is used as the "build environment".
 dirpath = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)),".."))
 debian_path = os.path.join(dirpath, "tools/packaging/debian")
 target_debian_path = os.path.join(dirpath, "debian")
-shutil.copytree(debian_path, target_debian_path)
-
-# Unpack the library version from the git information
-git_describe_version = subprocess.check_output(["git", "describe", "--tags", "--dirty", "--match", "v*"]).decode('utf-8').strip()
+shutil.copytree(debian_path, target_debian_path, ignore=shutil.ignore_patterns('*-template'))
 
 # v1.2
 # v1.2.3
@@ -29,43 +24,12 @@
 # v1.2.3-5-g4538abcd-dirty
 # git_describe_version = "v1.2.3"
 
+git_describe_version = subprocess.check_output(["git", "describe", "--tags", "--dirty", "--match", "v*"]).decode('utf-8').strip()
 m = re.match(r"^v([0-9]{1,4})(\.[0-9]{1,4})?(\.[0-9]{1,4})?(-(.*){1,100})?$", git_describe_version)
 version_major = m.group(1) if m.group(1) is not None else "0"
 version_minor = m.group(2).replace(".", "") if m.group(2) is not None else "0"
 version_patch = m.group(3).replace(".", "") if m.group(3) is not None else "0"
 version_label = m.group(4) if m.group(4) is not None else ""
-#print("major {} minor {} patch {} label {}".format(version_major, version_minor, version_patch, version_label))
-
-# We can not use unstable for now, because dpkg-buildpackage wants to sign them
-# It will fail with gpg: skipped "open62541 Team <open62541-core@googlegroups.com>": No secret key
-#debian_distribution = "unstable"
-#if version_label is not "":
-debian_distribution = "UNRELEASED"
-
-changelog_file = os.path.join(debian_path, "changelog")
-
-# remove leading 'v'
-changelog_version = git_describe_version[1:] if git_describe_version[0] == 'v' else git_describe_version
-# replace all '-' with '~' in version
-changelog_version = changelog_version.replace('-', '~')
-
-# prefix the version string with the current ISO datetime to ensure correct version ordering.
-# See https://github.com/open62541/open62541/issues/3140
-changelog_version = datetime.datetime.utcnow().replace(microsecond=0).isoformat().replace('-', '').replace(':', '') + '~' + changelog_version
-
-# Create an updated changelog file with the version information
-with open(changelog_file, 'r') as original:
-    data = original.read()
-with open(os.path.join(target_debian_path, "changelog"), 'w') as modified:
-    new_entry = """open62541 ({version}) {distribution}; urgency=medium
-
-  * Full changelog is available here:
-    https://github.com/open62541/open62541/blob/master/CHANGELOG
-
- -- open62541 Team <open62541-core@googlegroups.com>  {time}
-""".format(version=changelog_version, time=formatdate(), distribution = debian_distribution)
-
-    modified.write(new_entry + "\n" + data)
 
 # Create control file and replace template variables
 control_file_template = os.path.join(debian_path, "control-template")
@@ -77,33 +41,19 @@
     f.truncate()
     f.write(content.replace('<soname>', "{}.{}".format(version_major, version_minor)))
 
-# rename the install template to match the soname
+# Rename the install template to match the soname
 install_file_template = os.path.join(debian_path, "libopen62541.install-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path, "libopen62541-{}.{}.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
 install_file_template = os.path.join(debian_path, "libopen62541-dev.install-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}-dev.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path, "libopen62541-{}.{}-dev.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
 install_file_template = os.path.join(debian_path, "libopen62541-tools.install-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}-tools.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path, "libopen62541-{}.{}-tools.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
-# Create rule file and replace template variables
-rule_file_template = os.path.join(debian_path, "rules-template")
-rule_file = os.path.join(target_debian_path, "rules")
-shutil.copy(rule_file_template, rule_file)
-with open(rule_file, 'r+') as f:
-    content = f.read()
-    f.seek(0)
-    f.truncate()
-    content = content.replace('<srcdir>', "{}".format(dirpath))
-    f.write(content)
-
 # Update CMakeLists.txt to include full version string
 with open(os.path.join(dirpath,"CMakeLists.txt"), 'r+') as f:
     lines = f.readlines()

From a4d98ec913d96bd28ce2fd2e47829ad2892a5c0e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 May 2024 00:12:04 +0200
Subject: [PATCH 1526/1963] Revert "refactor(build): Don't automatically adjust
 the Debian package changelog"

This reverts commit 92a1d70c38e3ee8d82c345aad627007d6fd541f8.
---
 .../debian/{rules => rules-template}          |  0
 tools/prepare_packaging.py                    | 64 +++++++++++++++++--
 2 files changed, 57 insertions(+), 7 deletions(-)
 rename tools/packaging/debian/{rules => rules-template} (100%)

diff --git a/tools/packaging/debian/rules b/tools/packaging/debian/rules-template
similarity index 100%
rename from tools/packaging/debian/rules
rename to tools/packaging/debian/rules-template
diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index fd6c060776b..85038c7dd59 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -7,14 +7,19 @@
 import subprocess
 import os
 import re
+from email.utils import formatdate
+import datetime
 import shutil
 
 # Get the base filesystem paths.
-# The current path is used as the "build environment".
+# The current path is used as the "build environment"
 dirpath = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)),".."))
 debian_path = os.path.join(dirpath, "tools/packaging/debian")
 target_debian_path = os.path.join(dirpath, "debian")
-shutil.copytree(debian_path, target_debian_path, ignore=shutil.ignore_patterns('*-template'))
+shutil.copytree(debian_path, target_debian_path)
+
+# Unpack the library version from the git information
+git_describe_version = subprocess.check_output(["git", "describe", "--tags", "--dirty", "--match", "v*"]).decode('utf-8').strip()
 
 # v1.2
 # v1.2.3
@@ -24,12 +29,43 @@
 # v1.2.3-5-g4538abcd-dirty
 # git_describe_version = "v1.2.3"
 
-git_describe_version = subprocess.check_output(["git", "describe", "--tags", "--dirty", "--match", "v*"]).decode('utf-8').strip()
 m = re.match(r"^v([0-9]{1,4})(\.[0-9]{1,4})?(\.[0-9]{1,4})?(-(.*){1,100})?$", git_describe_version)
 version_major = m.group(1) if m.group(1) is not None else "0"
 version_minor = m.group(2).replace(".", "") if m.group(2) is not None else "0"
 version_patch = m.group(3).replace(".", "") if m.group(3) is not None else "0"
 version_label = m.group(4) if m.group(4) is not None else ""
+#print("major {} minor {} patch {} label {}".format(version_major, version_minor, version_patch, version_label))
+
+# We can not use unstable for now, because dpkg-buildpackage wants to sign them
+# It will fail with gpg: skipped "open62541 Team <open62541-core@googlegroups.com>": No secret key
+#debian_distribution = "unstable"
+#if version_label is not "":
+debian_distribution = "UNRELEASED"
+
+changelog_file = os.path.join(debian_path, "changelog")
+
+# remove leading 'v'
+changelog_version = git_describe_version[1:] if git_describe_version[0] == 'v' else git_describe_version
+# replace all '-' with '~' in version
+changelog_version = changelog_version.replace('-', '~')
+
+# prefix the version string with the current ISO datetime to ensure correct version ordering.
+# See https://github.com/open62541/open62541/issues/3140
+changelog_version = datetime.datetime.utcnow().replace(microsecond=0).isoformat().replace('-', '').replace(':', '') + '~' + changelog_version
+
+# Create an updated changelog file with the version information
+with open(changelog_file, 'r') as original:
+    data = original.read()
+with open(os.path.join(target_debian_path, "changelog"), 'w') as modified:
+    new_entry = """open62541 ({version}) {distribution}; urgency=medium
+
+  * Full changelog is available here:
+    https://github.com/open62541/open62541/blob/master/CHANGELOG
+
+ -- open62541 Team <open62541-core@googlegroups.com>  {time}
+""".format(version=changelog_version, time=formatdate(), distribution = debian_distribution)
+
+    modified.write(new_entry + "\n" + data)
 
 # Create control file and replace template variables
 control_file_template = os.path.join(debian_path, "control-template")
@@ -41,19 +77,33 @@
     f.truncate()
     f.write(content.replace('<soname>', "{}.{}".format(version_major, version_minor)))
 
-# Rename the install template to match the soname
+# rename the install template to match the soname
 install_file_template = os.path.join(debian_path, "libopen62541.install-template")
-install_file = os.path.join(target_debian_path, "libopen62541-{}.{}.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path,
+                  "libopen62541-{}.{}.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
 install_file_template = os.path.join(debian_path, "libopen62541-dev.install-template")
-install_file = os.path.join(target_debian_path, "libopen62541-{}.{}-dev.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path,
+                  "libopen62541-{}.{}-dev.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
 install_file_template = os.path.join(debian_path, "libopen62541-tools.install-template")
-install_file = os.path.join(target_debian_path, "libopen62541-{}.{}-tools.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path,
+                  "libopen62541-{}.{}-tools.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
+# Create rule file and replace template variables
+rule_file_template = os.path.join(debian_path, "rules-template")
+rule_file = os.path.join(target_debian_path, "rules")
+shutil.copy(rule_file_template, rule_file)
+with open(rule_file, 'r+') as f:
+    content = f.read()
+    f.seek(0)
+    f.truncate()
+    content = content.replace('<srcdir>', "{}".format(dirpath))
+    f.write(content)
+
 # Update CMakeLists.txt to include full version string
 with open(os.path.join(dirpath,"CMakeLists.txt"), 'r+') as f:
     lines = f.readlines()

From ad12372be5df8f706587f9be14a44176da18ef52 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 May 2024 00:22:49 +0200
Subject: [PATCH 1527/1963] refactor(build): Don't regex-replace in the Debian
 rules file

---
 .../debian/{rules-template => rules}          |  0
 tools/prepare_packaging.py                    | 22 ++++---------------
 2 files changed, 4 insertions(+), 18 deletions(-)
 rename tools/packaging/debian/{rules-template => rules} (100%)

diff --git a/tools/packaging/debian/rules-template b/tools/packaging/debian/rules
similarity index 100%
rename from tools/packaging/debian/rules-template
rename to tools/packaging/debian/rules
diff --git a/tools/prepare_packaging.py b/tools/prepare_packaging.py
index 85038c7dd59..f4bb6b1e723 100644
--- a/tools/prepare_packaging.py
+++ b/tools/prepare_packaging.py
@@ -16,7 +16,7 @@
 dirpath = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)),".."))
 debian_path = os.path.join(dirpath, "tools/packaging/debian")
 target_debian_path = os.path.join(dirpath, "debian")
-shutil.copytree(debian_path, target_debian_path)
+shutil.copytree(debian_path, target_debian_path, ignore=shutil.ignore_patterns('*-template'))
 
 # Unpack the library version from the git information
 git_describe_version = subprocess.check_output(["git", "describe", "--tags", "--dirty", "--match", "v*"]).decode('utf-8').strip()
@@ -79,31 +79,17 @@
 
 # rename the install template to match the soname
 install_file_template = os.path.join(debian_path, "libopen62541.install-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path, "libopen62541-{}.{}.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
 install_file_template = os.path.join(debian_path, "libopen62541-dev.install-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}-dev.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path, "libopen62541-{}.{}-dev.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
 install_file_template = os.path.join(debian_path, "libopen62541-tools.install-template")
-install_file = os.path.join(target_debian_path,
-                  "libopen62541-{}.{}-tools.install".format(version_major, version_minor))
+install_file = os.path.join(target_debian_path, "libopen62541-{}.{}-tools.install".format(version_major, version_minor))
 shutil.copy(install_file_template, install_file)
 
-# Create rule file and replace template variables
-rule_file_template = os.path.join(debian_path, "rules-template")
-rule_file = os.path.join(target_debian_path, "rules")
-shutil.copy(rule_file_template, rule_file)
-with open(rule_file, 'r+') as f:
-    content = f.read()
-    f.seek(0)
-    f.truncate()
-    content = content.replace('<srcdir>', "{}".format(dirpath))
-    f.write(content)
-
 # Update CMakeLists.txt to include full version string
 with open(os.path.join(dirpath,"CMakeLists.txt"), 'r+') as f:
     lines = f.readlines()

From e443785ec27d472eded8513b9ad5700c725eb077 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 May 2024 00:23:58 +0200
Subject: [PATCH 1528/1963] refactor(build): Fix version no and indendation in
 the Debian changelog file

---
 tools/packaging/debian/changelog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/packaging/debian/changelog b/tools/packaging/debian/changelog
index 6181d05b6e6..4431ed81a37 100644
--- a/tools/packaging/debian/changelog
+++ b/tools/packaging/debian/changelog
@@ -1,5 +1,5 @@
-open62541 (1.4.1) unstable; urgency=mediaum
+open62541 (1.4.0) UNRELEASED; urgency=low
 
-  * Initial release of the 1.4.1 version.
+  * Initial release of the 1.4.0 version.
 
--- open62541 Team <open62541-core@googlegroups.com>  Mon, 13 May 2024 10:51:28 +0100
+ -- open62541 Team <open62541-core@googlegroups.com>  Mon, 13 May 2024 10:51:28 +0100

From ab1e3093c78363a795ff29976609280267f0de42 Mon Sep 17 00:00:00 2001
From: Sebastian Goll <goll@hmi-project.com>
Date: Mon, 20 May 2024 12:17:23 +0200
Subject: [PATCH 1529/1963] fix(arch): Remove assertion with invalid assumption

---
 arch/eventloop_posix_tcp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 3efd4dbb772..aa1eede8bf7 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -633,9 +633,8 @@ TCP_shutdownConnection(UA_ConnectionManager *cm, uintptr_t connectionId) {
 static UA_StatusCode
 TCP_sendWithConnection(UA_ConnectionManager *cm, uintptr_t connectionId,
                        const UA_KeyValueMap *params, UA_ByteString *buf) {
-    /* Don't have a lock and don't take a lock. As the connectionId is the fd,
-     * no need to to a lookup and access internal data strucures. */
-    UA_LOCK_ASSERT(&((UA_EventLoopPOSIX*)cm->eventSource.eventLoop)->elMutex, 0);
+    /* We may not have a lock. But we need not take it. As the connectionId is
+     * the fd, no need to do a lookup and access internal data strucures. */
 
     /* Prevent OS signals when sending to a closed socket */
     int flags = MSG_NOSIGNAL;

From 7f8c3b026a495b31f6d27b80f965d81b45820370 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 23 May 2024 13:14:48 +0200
Subject: [PATCH 1530/1963] fix(server): Don't assert that a lock was not taken
 -- a concurrent thread might take it

---
 src/client/ua_client_subscriptions.c          |  2 -
 src/pubsub/ua_pubsub_ns0.c                    | 12 ------
 src/server/ua_server_async.c                  |  1 -
 src/server/ua_server_ns0_diagnostics.c        |  4 --
 .../ua_subscription_alarms_conditions.c       | 41 -------------------
 5 files changed, 60 deletions(-)

diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index ff42a1d2bf4..5d5285e575f 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -71,8 +71,6 @@ ua_Subscriptions_create(UA_Client *client, UA_Client_Subscription *newSub,
 static void
 ua_Subscriptions_create_handler(UA_Client *client, void *data,
                                 UA_UInt32 requestId, void *r) {
-    UA_LOCK_ASSERT(&client->clientMutex, 0);
-
     UA_CreateSubscriptionResponse *response = (UA_CreateSubscriptionResponse *)r;
     CustomCallback *cc = (CustomCallback *)data;
     UA_Client_Subscription *newSub = (UA_Client_Subscription *)cc->clientData;
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index ded20a500f2..792ef6ba644 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -807,7 +807,6 @@ addPubSubConnectionAction(UA_Server *server,
                           const UA_NodeId *objectId, void *objectContext,
                           size_t inputSize, const UA_Variant *input,
                           size_t outputSize, UA_Variant *output) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode res = addPubSubConnectionLocked(server, sessionId, sessionHandle,
                                                   methodId, methodContext,
@@ -824,7 +823,6 @@ removeConnectionAction(UA_Server *server,
                        const UA_NodeId *objectId, void *objectContext,
                        size_t inputSize, const UA_Variant *input,
                        size_t outputSize, UA_Variant *output){
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_NodeId nodeToRemove = *((UA_NodeId *) input[0].data);
     retVal |= UA_Server_removePubSubConnection(server, nodeToRemove);
@@ -967,8 +965,6 @@ addDataSetFolderAction(UA_Server *server,
                        const UA_NodeId *objectId, void *objectContext,
                        size_t inputSize, const UA_Variant *input,
                        size_t outputSize, UA_Variant *output){
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     /* defined in R 1.04 9.1.4.5.7 */
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_String newFolderName = *((UA_String *) input[0].data);
@@ -1102,7 +1098,6 @@ addPublishedDataItemsAction(UA_Server *server,
                             const UA_NodeId *objectId, void *objectContext,
                             size_t inputSize, const UA_Variant *input,
                             size_t outputSize, UA_Variant *output){
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     size_t fieldNameAliasesSize = input[1].arrayLength;
     UA_String * fieldNameAliases = (UA_String *) input[1].data;
@@ -1278,8 +1273,6 @@ readContentMask(UA_Server *server, const UA_NodeId *sessionId,
                 void *sessionContext, const UA_NodeId *nodeId,
                 void *nodeContext, UA_Boolean includeSourceTimeStamp,
                 const UA_NumericRange *range, UA_DataValue *value) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_WriterGroup *writerGroup = (UA_WriterGroup*)nodeContext;
     if((writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED &&
         writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
@@ -1300,8 +1293,6 @@ writeContentMask(UA_Server *server, const UA_NodeId *sessionId,
                  void *sessionContext, const UA_NodeId *nodeId,
                  void *nodeContext, const UA_NumericRange *range,
                  const UA_DataValue *value) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_WriterGroup *writerGroup = (UA_WriterGroup*)nodeContext;
     if((writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED &&
         writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
@@ -1465,8 +1456,6 @@ removeGroupAction(UA_Server *server,
                   const UA_NodeId *objectId, void *objectContext,
                   size_t inputSize, const UA_Variant *input,
                   size_t outputSize, UA_Variant *output){
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_NodeId nodeToRemove = *((UA_NodeId *)input->data);
     if(UA_WriterGroup_findWGbyId(server, nodeToRemove)) {
         UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, nodeToRemove);
@@ -1858,7 +1847,6 @@ removeDataSetWriterAction(UA_Server *server,
                           const UA_NodeId *objectId, void *objectContext,
                           size_t inputSize, const UA_Variant *input,
                           size_t outputSize, UA_Variant *output){
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_NodeId nodeToRemove = *((UA_NodeId *) input[0].data);
     return UA_Server_removeDataSetWriter(server, nodeToRemove);
 }
diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index c75b3c1ed57..24e3b30a35c 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -100,7 +100,6 @@ static UA_UInt32
 processAsyncResults(UA_Server *server) {
     UA_AsyncManager *am = &server->asyncManager;
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_LOCK_ASSERT(&am->queueLock, 0);
 
     UA_UInt32 count = 0;
     UA_AsyncOperation *ao;
diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 9d243e146fc..a7c057fbb6e 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -74,8 +74,6 @@ readSubscriptionDiagnostics(UA_Server *server,
                             const UA_NodeId *nodeId, void *nodeContext,
                             UA_Boolean sourceTimestamp,
                             const UA_NumericRange *range, UA_DataValue *value) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     /* Check the Subscription pointer */
     UA_Subscription *sub = (UA_Subscription*)nodeContext;
     if(!sub)
@@ -310,8 +308,6 @@ readSessionDiagnosticsArray(UA_Server *server,
                             const UA_NodeId *nodeId, void *nodeContext,
                             UA_Boolean sourceTimestamp,
                             const UA_NumericRange *range, UA_DataValue *value) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     /* Allocate the output array */
     UA_SessionDiagnosticsDataType *sd = (UA_SessionDiagnosticsDataType*)
         UA_Array_new(server->sessionCount,
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index 5d735aa8054..ab1e2df022d 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -248,7 +248,6 @@ UA_Server_setConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeI
                                                const UA_NodeId conditionSource, UA_Boolean removeBranch,
                                                UA_TwoStateVariableChangeCallback callback,
                                                UA_TwoStateVariableCallbackType callbackType) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
 
     /* Get Condition */
@@ -500,7 +499,6 @@ UA_Server_getNodeIdValueOfConditionField(UA_Server *server, const UA_NodeId *con
 static UA_StatusCode
 UA_Server_getConditionBranchNodeId(UA_Server *server, const UA_ByteString *eventId,
                          UA_NodeId *outConditionBranchNodeId) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
 
     *outConditionBranchNodeId = UA_NODEID_NULL;
@@ -541,7 +539,6 @@ static UA_StatusCode
 UA_Server_getConditionLastSeverity(UA_Server *server, const UA_NodeId *conditionSource,
                          const UA_NodeId *conditionId, UA_UInt16 *outLastSeverity,
                          UA_DateTime *outLastSeveritySourceTimeStamp) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
@@ -560,7 +557,6 @@ static UA_StatusCode
 UA_Server_updateConditionLastSeverity(UA_Server *server, const UA_NodeId *conditionSource,
                                       const UA_NodeId *conditionId, UA_UInt16 lastSeverity,
                                       UA_DateTime lastSeveritySourceTimeStamp) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
@@ -579,7 +575,6 @@ static UA_StatusCode
 UA_Server_getConditionActiveState(UA_Server *server, const UA_NodeId *conditionSource,
                                   const UA_NodeId *conditionId, UA_ActiveState *outLastActiveState,
                                   UA_ActiveState *outCurrentActiveState, UA_Boolean *outIsLimitAlarm) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
@@ -599,7 +594,6 @@ static UA_StatusCode
 UA_Server_updateConditionActiveState(UA_Server *server, const UA_NodeId *conditionSource,
                                      const UA_NodeId *conditionId, const UA_ActiveState lastActiveState,
                                      const UA_ActiveState currentActiveState, UA_Boolean isLimitAlarm) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
@@ -905,8 +899,6 @@ afterWriteCallbackEnabledStateChange(UA_Server *server,
                                      const UA_NodeId *sessionId, void *sessionContext,
                                      const UA_NodeId *nodeId, void *nodeContext,
                                      const UA_NumericRange *range, const UA_DataValue *data) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     /* Callback for change in EnabledState/Id property.
      * First we get the EnabledState NodeId then The Condition NodeId */
     UA_NodeId twoStateVariableNode;
@@ -955,8 +947,6 @@ afterWriteCallbackAckedStateChange(UA_Server *server,
                                    const UA_NodeId *sessionId, void *sessionContext,
                                    const UA_NodeId *nodeId, void *nodeContext,
                                    const UA_NumericRange *range, const UA_DataValue *data) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     /* Get the AckedState NodeId then The Condition NodeId */
     UA_NodeId twoStateVariableNode;
     UA_StatusCode retval = UA_Server_getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
@@ -1050,8 +1040,6 @@ afterWriteCallbackConfirmedStateChange(UA_Server *server,
                                        const UA_NodeId *sessionId, void *sessionContext,
                                        const UA_NodeId *nodeId, void *nodeContext,
                                        const UA_NumericRange *range, const UA_DataValue *data) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_Variant value;
     UA_NodeId twoStateVariableNode;
     UA_StatusCode retval = UA_Server_getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
@@ -1145,8 +1133,6 @@ afterWriteCallbackActiveStateChange(UA_Server *server,
                                     const UA_NodeId *sessionId, void *sessionContext,
                                     const UA_NodeId *nodeId, void *nodeContext,
                                     const UA_NumericRange *range, const UA_DataValue *data) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_Variant value;
     UA_NodeId twoStateVariableNode;
     UA_StatusCode retval = UA_Server_getFieldParentNodeId(server, nodeId, &twoStateVariableNode);
@@ -1292,8 +1278,6 @@ afterWriteCallbackSeverityChange(UA_Server *server,
                                  const UA_NodeId *sessionId, void *sessionContext,
                                  const UA_NodeId *nodeId, void *nodeContext,
                                  const UA_NumericRange *range, const UA_DataValue *data) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_QualifiedName fieldLastSeverity = UA_QUALIFIEDNAME(0, CONDITION_FIELD_LASTSEVERITY);
     UA_QualifiedName fieldSourceTimeStamp =
         UA_QUALIFIEDNAME(0, CONDITION_FIELD_CONDITIONVARIABLE_SOURCETIMESTAMP);
@@ -1383,8 +1367,6 @@ disableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *methodContext, const UA_NodeId *objectId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize, UA_Variant *output) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
         UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
@@ -1416,8 +1398,6 @@ enableMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                      void *objectContext, size_t inputSize,
                      const UA_Variant *input, size_t outputSize,
                      UA_Variant *output) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_NodeId conditionTypeNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
     if(UA_NodeId_equal(objectId, &conditionTypeNodeId)) {
         UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_USERLAND,
@@ -1449,8 +1429,6 @@ addCommentMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                          void *objectContext, size_t inputSize,
                          const UA_Variant *input, size_t outputSize,
                          UA_Variant *output) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_QualifiedName fieldComment = UA_QUALIFIEDNAME(0, CONDITION_FIELD_COMMENT);
     UA_QualifiedName fieldSourceTimeStamp =
         UA_QUALIFIEDNAME(0, CONDITION_FIELD_CONDITIONVARIABLE_SOURCETIMESTAMP);
@@ -1537,8 +1515,6 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                           void *objectContext, size_t inputSize,
                           const UA_Variant *input, size_t outputSize,
                           UA_Variant *output) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_QualifiedName fieldComment = UA_QUALIFIEDNAME(0, CONDITION_FIELD_COMMENT);
     UA_Variant value;
 
@@ -1619,8 +1595,6 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_QualifiedName fieldComment = UA_QUALIFIEDNAME(0, CONDITION_FIELD_COMMENT);
     UA_Variant value;
 
@@ -1859,7 +1833,6 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     //TODO implement logic for subscription array
     /* Check if valid subscriptionId */
@@ -1903,7 +1876,6 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
 
     //TODO implement logic for subscription array
@@ -2555,8 +2527,6 @@ UA_Server_createCondition(UA_Server *server,
                           const UA_NodeId conditionSource,
                           const UA_NodeId hierarchialReferenceType,
                           UA_NodeId *outNodeId) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     if(!outNodeId) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "outNodeId cannot be NULL!");
@@ -2579,8 +2549,6 @@ UA_StatusCode
 UA_Server_addCondition_begin(UA_Server *server, const UA_NodeId conditionId,
                              const UA_NodeId conditionType,
                              const UA_QualifiedName conditionName, UA_NodeId *outNodeId) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     if(!outNodeId) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "outNodeId cannot be NULL!");
@@ -2616,7 +2584,6 @@ UA_StatusCode
 UA_Server_addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
                               const UA_NodeId conditionSource,
                               const UA_NodeId hierarchialReferenceType) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
 
     const UA_Node *node = UA_NODESTORE_GET(server, &conditionId);
@@ -2806,7 +2773,6 @@ UA_StatusCode
 UA_Server_addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
                                     const UA_NodeId conditionType, const UA_QualifiedName fieldName,
                                     UA_NodeId *outOptionalNode) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode res = addConditionOptionalField(server, condition, conditionType,
                                                   fieldName, outOptionalNode);
@@ -2840,7 +2806,6 @@ setConditionField(UA_Server *server, const UA_NodeId condition,
 UA_StatusCode
 UA_Server_setConditionField(UA_Server *server, const UA_NodeId condition,
                             const UA_Variant* value, const UA_QualifiedName fieldName) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode retval = setConditionField(server, condition, value, fieldName);
     UA_UNLOCK(&server->serviceMutex);
@@ -2888,7 +2853,6 @@ UA_Server_setConditionVariableFieldProperty(UA_Server *server, const UA_NodeId c
                                             const UA_Variant* value,
                                             const UA_QualifiedName variableFieldName,
                                             const UA_QualifiedName variablePropertyName) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode res = setConditionVariableFieldProperty(server, condition, value,
                                                           variableFieldName, variablePropertyName);
@@ -2937,7 +2901,6 @@ triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
 UA_StatusCode
 UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
                                 const UA_NodeId conditionSource, UA_ByteString *outEventId) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
     UA_LOCK(&server->serviceMutex);
     UA_StatusCode res = triggerConditionEvent(server, condition, conditionSource, outEventId);
     UA_UNLOCK(&server->serviceMutex);
@@ -2947,8 +2910,6 @@ UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
 UA_StatusCode
 UA_Server_deleteCondition(UA_Server *server, const UA_NodeId condition,
                           const UA_NodeId conditionSource) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     /* Get ConditionSource Entry */
     UA_Boolean found = false; /* Delete from internal list */
     UA_ConditionSource *source, *tmp_source;
@@ -3135,8 +3096,6 @@ UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
 UA_StatusCode
 UA_Server_setExpirationDate(UA_Server *server, const UA_NodeId conditionId,
                             UA_ByteString  cert) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 0);
-
     UA_StatusCode retval;
     if(cert.data == NULL){
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,

From 1fea0ecc32742c07cd8411164ed0928ee8cd30cd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Thu, 23 May 2024 17:09:50 +0200
Subject: [PATCH 1531/1963] refactor(build): Bump version to 1.4.1

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 228706e5aa2..59b23569659 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 0)
+set(OPEN62541_VER_PATCH 1)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 14c1d6fb1175257b624bcd509817887f5e8a2543 Mon Sep 17 00:00:00 2001
From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com>
Date: Fri, 24 May 2024 17:28:57 +0800
Subject: [PATCH 1532/1963] fix(server) transform to uppercase in comparing
 open62541_crypto_plugin

---
 tools/cmake/open62541Config.cmake.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index c7344874db1..9e4e68a45e7 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -11,12 +11,12 @@ include("${CMAKE_CURRENT_LIST_DIR}/open62541Macros.cmake")
 check_required_components(open62541)
 
 include(CMakeFindDependencyMacro)
-if(open62541_crypto_plugin STREQUAL "mbedtls")
+if(open62541_crypto_plugin STREQUAL "MBEDTLS")
   list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
   find_dependency(MbedTLS REQUIRED)
   list(REMOVE_AT CMAKE_MODULE_PATH -1)
-elseif(open62541_crypto_plugin STREQUAL "openssl")
+elseif(open62541_crypto_plugin STREQUAL "OPENSSL")
   find_dependency(OpenSSL REQUIRED)
-elseif(open62541_crypto_plugin STREQUAL "libressl")
+elseif(open62541_crypto_plugin STREQUAL "LIBRESSL")
   find_dependency(LibreSSL REQUIRED)
 endif()

From f083d7ad3fb6cc992d066bc604cae9f0a2d7988b Mon Sep 17 00:00:00 2001
From: Peter Schuster <p.schuster@pilz.de>
Date: Tue, 28 May 2024 14:25:02 +0200
Subject: [PATCH 1533/1963] fix(client): added missing channel state
 "UA_SECURECHANNELSTATE_OPN_SENT"

fixes issue #5782
---
 src/client/ua_client_connect.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 562e48ae6b3..9ecd301cd06 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1386,6 +1386,7 @@ connectActivity(UA_Client *client) {
     case UA_SECURECHANNELSTATE_CONNECTING:
     case UA_SECURECHANNELSTATE_CLOSING:
     case UA_SECURECHANNELSTATE_HEL_SENT:
+    case UA_SECURECHANNELSTATE_OPN_SENT:
         return;
 
         /* Send HEL */

From 3bf247173676be3ea383ef1f9d59bf40eb715265 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 30 May 2024 23:22:30 +0200
Subject: [PATCH 1534/1963] feat(test): Add a test for MonitoredItems on a
 DataSource with a fixed memory location

Test a hypothesis for #6512.
---
 tests/server/check_local_monitored_item.c | 44 +++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/tests/server/check_local_monitored_item.c b/tests/server/check_local_monitored_item.c
index 8dbea401a0b..5d8596311f1 100644
--- a/tests/server/check_local_monitored_item.c
+++ b/tests/server/check_local_monitored_item.c
@@ -119,6 +119,49 @@ START_TEST(Server_LocalMonitoredItem) {
 }
 END_TEST
 
+static UA_UInt32 staticUInt32 = 1337;
+
+static UA_StatusCode
+readDataSource(UA_Server *s, const UA_NodeId *sessionId, void *sessionContext,
+               const UA_NodeId *nodeId, void *nodeContext,
+               UA_Boolean includeSourceTimeStamp, const UA_NumericRange *range,
+               UA_DataValue *value) {
+    UA_Variant_setScalar(&value->value, &staticUInt32, &UA_TYPES[UA_TYPES_UINT32]);
+    value->value.storageType = UA_VARIANT_DATA_NODELETE;
+    value->hasValue = true;
+    return UA_STATUSCODE_GOOD;
+}
+
+/* Use a datasource with a static memory location */
+START_TEST(Server_LocalMonitoredItem_dataSource) {
+    callbackCount = 0;
+
+    UA_DataSource ds = {readDataSource, NULL};
+    UA_Server_setVariableNode_dataSource(server, outNodeId, ds);
+
+    UA_MonitoredItemCreateRequest monitorRequest =
+            UA_MonitoredItemCreateRequest_default(outNodeId);
+    monitorRequest.requestedParameters.samplingInterval = (double)100;
+    monitorRequest.monitoringMode = UA_MONITORINGMODE_REPORTING;
+    UA_MonitoredItemCreateResult result =
+            UA_Server_createDataChangeMonitoredItem(server,
+                                                    UA_TIMESTAMPSTORETURN_BOTH,
+                                                    monitorRequest,
+                                                    NULL,
+                                                    &dataChangeNotificationCallback);
+
+    ASSERT_STATUSCODE(result.statusCode, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(callbackCount, 1);
+
+    for(size_t i = 0; i < 10; i++) {
+        staticUInt32++;
+        UA_fakeSleep(100);
+        UA_Server_run_iterate(server, 1);
+    }
+    ck_assert_uint_eq(callbackCount, 11);
+}
+END_TEST
+
 /* Custom datatype with a String NodeId */
 typedef struct {
     UA_Float p;
@@ -280,6 +323,7 @@ static Suite * testSuite_Client(void) {
     TCase *tc_server = tcase_create("Local Monitored Item Basic");
     tcase_add_checked_fixture(tc_server, setup, teardown);
     tcase_add_test(tc_server, Server_LocalMonitoredItem);
+    tcase_add_test(tc_server, Server_LocalMonitoredItem_dataSource);
     tcase_add_test(tc_server, Server_LocalMonitoredItem_CustomType);
     suite_add_tcase(s, tc_server);
 

From 3f40576187cc9db8198f6bc0479411416ed5780a Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Fri, 31 May 2024 07:56:38 +0200
Subject: [PATCH 1535/1963] fix(build): Correct path for schema files of
 external build

---
 CMakeLists.txt                       | 10 ++++++----
 tools/cmake/open62541Config.cmake.in |  2 +-
 tools/cmake/open62541Macros.cmake    |  8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59b23569659..35e4e6e9e55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1124,7 +1124,6 @@ endif()
 # Nodeset files combined into NS0 generated file
 set(UA_FILE_NODESETS) # List of nodeset-xml files to be considered in the generated information model
 set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path to the node-set directory (e.g. from https://github.com/OPCFoundation/UA-Nodeset)")
-set(UA_SCHEMA_DIR ${PROJECT_SOURCE_DIR}/tools/schema) # Directory with the schema files for installation
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     # Use the "full" schema files also for datatypes and statuscodes
@@ -1145,6 +1144,9 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         endif()
     endif()
 else()
+    # Directory with the schema files for installation
+    set(UA_SCHEMA_DIR ${PROJECT_SOURCE_DIR}/tools/schema)
+
     # Set the reduced Nodeset for NS0
     if(NOT UA_FILE_NS0)
         set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.Reduced.xml)
@@ -1507,7 +1509,7 @@ install(TARGETS ${OPEN62541-LIB}
         INCLUDES DESTINATION include)
 
 set(open62541_install_tools_dir share/open62541)
-set(open62541_install_nodeset_dir share/open62541/schema)
+set(open62541_install_schema_dir share/open62541/schema)
 set(open62541_crypto_plugin ${UA_ENABLE_ENCRYPTION})
 
 # Create open62541Config.cmake
@@ -1517,7 +1519,7 @@ configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541
                               "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
                               INSTALL_DESTINATION "${cmake_configfile_install}"
                               PATH_VARS open62541_install_tools_dir
-                                        open62541_install_nodeset_dir
+                                        open62541_install_schema_dir
                                         open62541_crypto_plugin)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
               "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541Macros.cmake"
@@ -1566,7 +1568,7 @@ install(DIRECTORY "tools/certs" "tools/nodeset_compiler"
 
 # Trailing slash to prevent "schema/schema" nesting
 install(DIRECTORY ${UA_SCHEMA_DIR}/
-        DESTINATION ${open62541_install_nodeset_dir}
+        DESTINATION ${open62541_install_schema_dir}
         FILES_MATCHING
         PATTERN "*.xml"
         PATTERN "*Types.bsd"
diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index 9e4e68a45e7..a5f50dc9595 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -2,7 +2,7 @@
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
 
 set_and_check(open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
-set_and_check(UA_NODESET_DIR @PACKAGE_open62541_install_nodeset_dir@ CACHE PATH "Path to the directory that contains the schema files")
+set_and_check(UA_SCHEMA_DIR @PACKAGE_open62541_install_schema_dir@ CACHE PATH "Path to the directory that contains the schema files")
 set(open62541_crypto_plugin @open62541_crypto_plugin@)
 
 # Macros for datatype generation, nodeset compiler, etc.
diff --git a/tools/cmake/open62541Macros.cmake b/tools/cmake/open62541Macros.cmake
index 5c5f50356c8..ef103c9bced 100644
--- a/tools/cmake/open62541Macros.cmake
+++ b/tools/cmake/open62541Macros.cmake
@@ -112,7 +112,7 @@ endfunction()
 #                   passed which will all combined to one resulting code.
 #   IMPORT_BSD      Combination of types array and path to the .bsd file containing additional type definitions referenced by
 #                   the FILES_BSD files. The value is separated with a hash sign, i.e.
-#                   'UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd'
+#                   'UA_TYPES#${UA_SCHEMA_DIR}/Opc.Ua.Types.bsd'
 #                   Multiple files can be passed which will all be imported.
 #   [FILES_SELECTED] Optional path to a simple text file which contains a list of types which should be included in the generation.
 #                   The file should contain one type per line. Multiple files can be passed to this argument.
@@ -551,8 +551,8 @@ function(ua_generate_nodeset_and_datatypes)
         message(FATAL_ERROR "open62541_TOOLS_DIR must point to the open62541 tools directory")
     endif()
 
-    if(NOT DEFINED UA_NODESET_DIR)
-        message(FATAL_ERROR "UA_NODESET_DIR must point to the open62541/deps/ua-nodeset directory")
+    if(NOT DEFINED UA_SCHEMA_DIR)
+        message(FATAL_ERROR "UA_SCHEMA_DIR must point to the directory that contains the schema files")
     endif()
 
     # ------ Argument checking -----
@@ -669,7 +669,7 @@ function(ua_generate_nodeset_and_datatypes)
     # Create a list of nodesets on which this nodeset depends on
     if (NOT UA_GEN_DEPENDS OR "${UA_GEN_DEPENDS}" STREQUAL "" )
         if(NOT UA_FILE_NS0)
-            set(NODESET_DEPENDS "${UA_NODESET_DIR}/Schema/Opc.Ua.NodeSet2.xml")
+            set(NODESET_DEPENDS "${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.xml")
         else()
             set(NODESET_DEPENDS "${UA_FILE_NS0}")
         endif()

From 8eb85bb26fdda5de544230bf0a8b1f26c26ef5fb Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 3 Jun 2024 14:41:23 +0200
Subject: [PATCH 1536/1963] fix(nc): Correct setting of the namespaceIndex.
 Improve condition for extracting BSD from nodeset

---
 tools/generate_bsd.py                       | 14 ++++++++++----
 tools/nodeset_compiler/backend_open62541.py |  8 +++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tools/generate_bsd.py b/tools/generate_bsd.py
index af657dbc75d..5c6f44f0f76 100644
--- a/tools/generate_bsd.py
+++ b/tools/generate_bsd.py
@@ -50,7 +50,13 @@
 for nd in variableNodes:
     if (nd.hasAttribute("SymbolicName") and (re.match(r".*_BinarySchema", nd.attributes["SymbolicName"].nodeValue) or nd.attributes["SymbolicName"].nodeValue == "TypeDictionary_BinarySchema")) or (nd.hasAttribute("ParentNodeId") and not nd.hasAttribute("SymbolicName") and re.fullmatch(r"i=93", nd.attributes["ParentNodeId"].nodeValue)):
         type_content = nd.getElementsByTagName("Value")[0].getElementsByTagName("ByteString")[0]
-        f = open(args.outputFile, 'w')
-        f.write(base64.b64decode(type_content.firstChild.nodeValue).decode("utf-8"))
-        f.flush()
-        f.close()
+        with open(args.outputFile, 'w') as f:
+            f.write(base64.b64decode(type_content.firstChild.nodeValue).decode("utf-8"))
+    elif nd.hasAttribute("BrowseName") and nd.getAttribute("BrowseName").endswith("TypeDictionary"):
+        references = nd.getElementsByTagName("Reference")
+        for ref in references:
+            if ref.getAttribute("ReferenceType") == "HasComponent" and ref.firstChild.nodeValue == "i=93":
+                type_content = nd.getElementsByTagName("Value")[0].getElementsByTagName("ByteString")[0]
+                with open(args.outputFile, 'w') as f:
+                    f.write(base64.b64decode(type_content.firstChild.nodeValue).decode("utf-8"))
+                break
diff --git a/tools/nodeset_compiler/backend_open62541.py b/tools/nodeset_compiler/backend_open62541.py
index 14627498bf6..07a2e46e1a7 100644
--- a/tools/nodeset_compiler/backend_open62541.py
+++ b/tools/nodeset_compiler/backend_open62541.py
@@ -310,12 +310,14 @@ def writec(line):
     # but only if it defines its own data types, otherwise it is not necessary.
     if len(typesArray) > 0:
         typeArr = typesArray[-1]
-        if typeArr != "UA_TYPES" and typeArr != "ns0":
+        # Build the name of the TypeArray to compare if the current nodeset defines data types.
+        currentTypeArr = '_'.join(outfilebase.upper().split('_')[1:-1])
+        if typeArr != "UA_TYPES" and typeArr != "ns0" and typeArr == "UA_TYPES_"+currentTypeArr:
             writec("/* Change namespaceIndex from current namespace */")
             writec("#if " + typeArr + "_COUNT" + " > 0")
             writec("for(int i = 0; i < " + typeArr + "_COUNT" + "; i++) {")
-            writec(typeArr + "[i]" + ".typeId.namespaceIndex = ns[" + str(nodeset.namespaceMapping[1]) + "];")
-            writec(typeArr + "[i]" + ".binaryEncodingId.namespaceIndex = ns[" + str(nodeset.namespaceMapping[1]) + "];")
+            writec(typeArr + "[i]" + ".typeId.namespaceIndex = ns[" + str(len(nodeset.namespaces)-1) + "];")
+            writec(typeArr + "[i]" + ".binaryEncodingId.namespaceIndex = ns[" + str(len(nodeset.namespaces)-1) + "];")
             writec("}")
             writec("#endif")
 

From 4c148acf9cf421d8de9754c291853bc800d3392c Mon Sep 17 00:00:00 2001
From: Rick Boks <boks@spectral-i.com>
Date: Tue, 4 Jun 2024 10:47:14 +0200
Subject: [PATCH 1537/1963] fix(build): fix OpenSSL link flags in build output
 files

Fixed CMake imported targets OpenSSL::Crypto and OpenSSL::SSL being
written literally (without being expanded) to output files
open62541Targets.cmake and open62541.pc
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35e4e6e9e55..7038ecbc133 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -527,9 +527,9 @@ endif()
 
 if(UA_ENABLE_ENCRYPTION_OPENSSL)
     # use the OpenSSL encryption library
-    # https://cmake.org/cmake/help/v3.0/module/FindOpenSSL.html
+    # https://cmake.org/cmake/help/v3.13/module/FindOpenSSL.html
     find_package(OpenSSL REQUIRED)
-    list(APPEND open62541_LIBRARIES OpenSSL::Crypto OpenSSL::SSL)
+    list(APPEND open62541_LIBRARIES "${OPENSSL_LIBRARIES}")
 endif()
 
 if(UA_ENABLE_ENCRYPTION_LIBRESSL)

From dc0c061cb5a80436f985092df5e076b15a36b38b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 4 Jun 2024 18:42:12 +0200
Subject: [PATCH 1538/1963] refactor(build): Use the SONAME version x.y
 property to disambiguate multiple installed libraries

---
 CMakeLists.txt                   | 36 +++++++++++++++-----------------
 doc/CMakeLists.txt               |  4 ++--
 tools/cmake/linting_target.cmake |  2 +-
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7038ecbc133..551904f7760 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1300,11 +1300,6 @@ assign_source_group(${plugin_headers} ${plugin_sources})
 
 # When building packages, include the source in the library name to enable parallel
 # installation of multiple versions. We may break the ABI between minor releases!
-if(UA_PACK_DEBIAN)
-    set(OPEN62541-LIB "open62541-${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}")
-else()
-    set(OPEN62541-LIB "open62541")
-endif()
 
 if(UA_ENABLE_AMALGAMATION)
     add_library(open62541-object OBJECT ${PROJECT_BINARY_DIR}/open62541.c ${PROJECT_BINARY_DIR}/open62541.h)
@@ -1334,10 +1329,10 @@ if(UA_ENABLE_AMALGAMATION)
                       open62541-generator-statuscode
                       open62541-amalgamation-source)
 
-    add_library(${OPEN62541-LIB} $<TARGET_OBJECTS:open62541-object>)
+    add_library(open62541 SHARED $<TARGET_OBJECTS:open62541-object>)
     # the only directory that needs to be included if open62541 (amalgameted) target from
     # the build directory is ${PROJECT_BINARY_DIR}, that contains the generated open62541.h
-    target_include_directories(${OPEN62541-LIB} PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
+    target_include_directories(open62541 PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 
     add_dependencies(open62541-amalgamation-source open62541-generator-namespace)
     add_dependencies(open62541-amalgamation-header open62541-generator-namespace)
@@ -1372,13 +1367,13 @@ else()
     target_compile_definitions(open62541-plugins PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
     set_target_properties(open62541-plugins PROPERTIES FOLDER "open62541/lib")
 
-    add_library(${OPEN62541-LIB} $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
+    add_library(open62541 $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
 
     if(UA_ENABLE_ENCRYPTION_LIBRESSL)
         # Prevent Wincrypt override warning.
         target_compile_definitions(open62541-plugins PUBLIC NOCRYPT=1)
         target_compile_definitions(open62541-object PUBLIC NOCRYPT=1)
-        target_compile_definitions(${OPEN62541-LIB} PUBLIC NOCRYPT=1)
+        target_compile_definitions(open62541 PUBLIC NOCRYPT=1)
     endif()
 
     # Declare include directories
@@ -1392,7 +1387,7 @@ else()
     function(include_directories_public)
         include_directories_private(${ARGN})
         foreach(_include_dir IN ITEMS ${ARGN})
-            target_include_directories(${OPEN62541-LIB} PUBLIC $<BUILD_INTERFACE:${_include_dir}>)
+            target_include_directories(open62541 PUBLIC $<BUILD_INTERFACE:${_include_dir}>)
         endforeach()
     endfunction()
 
@@ -1427,20 +1422,23 @@ endif()
 add_dependencies(open62541-object open62541-code-generation)
 
 # Ensure that the open62541::open62541 alias can be used inside open62541's build
-add_library(open62541::open62541 ALIAS ${OPEN62541-LIB})
+add_library(open62541::open62541 ALIAS open62541)
 
 # Export Symbols
 target_compile_definitions(open62541-object PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
-target_compile_definitions(${OPEN62541-LIB} PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
+target_compile_definitions(open62541 PRIVATE -DUA_DYNAMIC_LINKING_EXPORT)
 if(UA_ENABLE_DISCOVERY_MULTICAST)
     target_compile_definitions(open62541-object PRIVATE -DMDNSD_DYNAMIC_LINKING_EXPORT)
-    target_compile_definitions(${OPEN62541-LIB} PRIVATE -DMDNSD_DYNAMIC_LINKING_EXPORT)
+    target_compile_definitions(open62541 PRIVATE -DMDNSD_DYNAMIC_LINKING_EXPORT)
 endif()
+
 # Generate properly versioned shared library links on Linux
-SET_TARGET_PROPERTIES(${OPEN62541-LIB} PROPERTIES SOVERSION "${OPEN62541_VER_MAJOR}" VERSION "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}")
+SET_TARGET_PROPERTIES(open62541 PROPERTIES
+                      SOVERSION "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}"
+                      VERSION "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}")
 
 # DLL requires linking to dependencies
-target_link_libraries(${OPEN62541-LIB} ${open62541_LIBRARIES})
+target_link_libraries(open62541 ${open62541_LIBRARIES})
 
 ##########################
 # Build Selected Targets #
@@ -1501,7 +1499,7 @@ if(UA_ENABLE_AMALGAMATION)
 endif()
 
 # export library (either static or shared depending on BUILD_SHARED_LIBS)
-install(TARGETS ${OPEN62541-LIB}
+install(TARGETS open62541
         EXPORT open62541Targets
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -1527,7 +1525,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
 
 # Create open62541ConfigVersion.cmake
 set(open62541_VERSION)
-get_target_property(open62541_VERSION ${OPEN62541-LIB} VERSION)
+get_target_property(open62541_VERSION open62541 VERSION)
 write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/open62541ConfigVersion.cmake"
                                  VERSION ${open62541_VERSION} COMPATIBILITY AnyNewerVersion)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541ConfigVersion.cmake"
@@ -1538,7 +1536,7 @@ install(EXPORT open62541Targets
         FILE open62541Targets.cmake
         DESTINATION "${cmake_configfile_install}"
         NAMESPACE open62541::)
-export(TARGETS ${OPEN62541-LIB}
+export(TARGETS open62541
        NAMESPACE open62541::
        FILE ${CMAKE_CURRENT_BINARY_DIR}/open62541Targets.cmake)
 
@@ -1618,7 +1616,7 @@ endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "_CmakePredifinedTargets")
 
-set_target_properties(${OPEN62541-LIB} PROPERTIES FOLDER "open62541/lib")
+set_target_properties(open62541 PROPERTIES FOLDER "open62541/lib")
 set_target_properties(open62541-object PROPERTIES FOLDER "open62541/lib")
 if(UA_ENABLE_AMALGAMATION)
     set_target_properties(open62541-amalgamation-header PROPERTIES FOLDER "open62541/lib")
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a2e792cf6be..68d89f27375 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -79,7 +79,7 @@ add_custom_target(doc_latex ${SPHINX_EXECUTABLE}
                   -b latex "${DOC_SRC_DIR}" "${DOC_LATEX_DIR}"
                   DEPENDS ${GENERATED_RST} ${DOC_TARGET}
                   COMMENT "Building LaTeX sources for documentation with Sphinx")
-add_dependencies(doc_latex ${OPEN62541-LIB})
+add_dependencies(doc_latex open62541)
 
 add_custom_target(doc_pdf ${PDFLATEX_COMPILER} -interaction=batchmode "open62541.tex"
                   WORKING_DIRECTORY ${DOC_LATEX_DIR}
@@ -93,7 +93,7 @@ add_custom_target(doc ${SPHINX_EXECUTABLE}
                   -b html "${DOC_SRC_DIR}" "${DOC_HTML_DIR}"
                   DEPENDS ${GENERATED_RST} ${DOC_TARGET}
                   COMMENT "Building HTML documentation with Sphinx")
-add_dependencies(doc ${OPEN62541-LIB})
+add_dependencies(doc open62541)
 
 set_target_properties(doc doc_latex doc_pdf PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
 set_target_properties(doc doc_latex doc_pdf PROPERTIES FOLDER "open62541/doc")
diff --git a/tools/cmake/linting_target.cmake b/tools/cmake/linting_target.cmake
index 1ecf3b35519..202ac526ded 100644
--- a/tools/cmake/linting_target.cmake
+++ b/tools/cmake/linting_target.cmake
@@ -7,7 +7,7 @@ add_custom_target(clang-tidy ${CLANG_TIDY_PROGRAM}
                   ${lib_sources}
                   DEPENDS ${lib_sources}
                   COMMENT "Run clang-tidy on the library")
-add_dependencies(clang-tidy ${OPEN62541-LIB})
+add_dependencies(clang-tidy open62541)
 set_target_properties(clang-tidy PROPERTIES FOLDER "CodeAnalysis")
 
 add_custom_target(cpplint cpplint

From c18a46294a577cc6f832d896be4815b048d24a8a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 4 Jun 2024 18:54:32 +0200
Subject: [PATCH 1539/1963] refactor(build): Remove UA_PACK_DEBIAN - use the
 tools/prepare_packaging script instead

---
 CMakeLists.txt               | 17 -----------------
 plugins/ua_config_default.c  |  4 ----
 tools/packaging/debian/rules |  2 +-
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 551904f7760..681bedbc57f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -468,23 +468,6 @@ mark_as_advanced(UA_BUILD_OSS_FUZZ)
 # Advanced Build Targets #
 ##########################
 
-# Build packages - invoke via `make package`
-option(UA_PACK_DEBIAN "Special build switch used in .deb packaging" OFF)
-mark_as_advanced(UA_PACK_DEBIAN)
-if(UA_PACK_DEBIAN)
-    set(CPACK_GENERATOR "TGZ;DEB")
-    set(CPACK_PACKAGE_VENDOR "open62541 team")
-    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OPC UA implementation")
-    set(CPACK_PACKAGE_DESCRIPTION "open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications.")
-    set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
-    set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-    set(CPACK_PACKAGE_VERSION_MAJOR "${OPEN62541_VER_MAJOR}")
-    set(CPACK_PACKAGE_VERSION_MINOR "${OPEN62541_VER_MINOR}")
-    set(CPACK_PACKAGE_VERSION_PATCH "${OPEN62541_VER_PATCH}${OPEN62541_VER_LABEL}")
-    set(CPACK_DEBIAN_PACKAGE_MAINTAINER "open62541 team") # required
-    include(CPack)
-endif()
-
 # Building shared libs (dll, so). This option is written into ua_config.h.
 set(UA_DYNAMIC_LINKING OFF)
 if(BUILD_SHARED_LIBS)
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index bbf0f803b45..f25fea14b05 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -361,11 +361,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     conf->buildInfo.softwareVersion =
         UA_STRING_ALLOC(VERSION(UA_OPEN62541_VER_MAJOR, UA_OPEN62541_VER_MINOR,
                                 UA_OPEN62541_VER_PATCH, UA_OPEN62541_VER_LABEL));
-#ifdef UA_PACK_DEBIAN
-    conf->buildInfo.buildNumber = UA_STRING_ALLOC("deb");
-#else
     conf->buildInfo.buildNumber = UA_STRING_ALLOC(__DATE__ " " __TIME__);
-#endif
     conf->buildInfo.buildDate = UA_DateTime_now();
 
     UA_ApplicationDescription_clear(&conf->applicationDescription);
diff --git a/tools/packaging/debian/rules b/tools/packaging/debian/rules
index c18a2196cec..208e137e217 100755
--- a/tools/packaging/debian/rules
+++ b/tools/packaging/debian/rules
@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=REDUCED -DUA_ENABLE_DATATYPES_ALL=ON -DUA_ENABLE_ENCRYPTION="MBEDTLS" -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON -DUA_ENABLE_AMALGAMATION=OFF -DUA_PACK_DEBIAN=ON -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)"
+	dh_auto_configure -- -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=REDUCED -DUA_ENABLE_DATATYPES_ALL=ON -DUA_ENABLE_ENCRYPTION="MBEDTLS" -DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB_ENCRYPTION=ON -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON -DUA_ENABLE_AMALGAMATION=OFF -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)"
 
 override_dh_auto_test:
 	dh_auto_test -- ARGS+=--output-on-failure

From 68ed72e6720e32226bd3220293c4b4b2c8c154fb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 4 Jun 2024 23:30:06 +0200
Subject: [PATCH 1540/1963] feat(tests): Extend tests for writing int32 into an
 enum type

---
 tests/server/check_services_attributes.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index bc07742ee12..fcf25fc04de 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -65,7 +65,8 @@ static void setup(void) {
     UA_Variant_setScalar(&vattr.value, &m, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
     vattr.description = UA_LOCALIZEDTEXT("locale","the enum answer");
     vattr.displayName = UA_LOCALIZEDTEXT("locale","the enum answer");
-    vattr.valueRank = UA_VALUERANK_ANY;
+    vattr.valueRank = UA_VALUERANK_SCALAR;
+    vattr.dataType = UA_TYPES[UA_TYPES_MESSAGESECURITYMODE].typeId;
     retval = UA_Server_addVariableNode(server, UA_NODEID_STRING(1, "the.enum.answer"),
                                        parentNodeId, parentReferenceNodeId,
                                        UA_QUALIFIEDNAME(1, "the enum answer"),
@@ -877,6 +878,10 @@ START_TEST(WriteSingleAttributeValueEnum) {
     UA_StatusCode retval = UA_Server_write(server, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
 
+    UA_Variant_setScalar(&wValue.value.value, &myInteger, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
+    retval = UA_Server_write(server, &wValue);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
     UA_ReadValueId rvi;
     UA_ReadValueId_init(&rvi);
     rvi.nodeId = UA_NODEID_STRING(1, "the.enum.answer");

From 11c1a554e581ec3a33edfd450368d211e64dfde8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 1 Jun 2024 22:07:04 +0200
Subject: [PATCH 1541/1963] refactor(plugins): Make TCP port reuse the default

---
 plugins/ua_config_default.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index f25fea14b05..17d47964f81 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -347,7 +347,10 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
         }
     }
 
-    conf->tcpReuseAddr = false;
+    /* If a second server is started later it can "steal" the port.
+     * Having port reuse enabled is important for development.
+     * Otherwise a long TCP TIME_WAIT is required before the port can be used again. */
+    conf->tcpReuseAddr = true;
 
     /* --> Start setting the default static config <-- */
 

From 5ddf7ff37cbd7b0a9ffa885da5a82842bcca2f3c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 5 Jun 2024 00:16:47 +0200
Subject: [PATCH 1542/1963] feat(server): Avoid malloc when writing
 "pointerfree" values of the same size

---
 src/server/ua_services_attribute.c | 40 +++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index d02c8693b1b..fa7f56dcfe2 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1353,12 +1353,46 @@ writeDataTypeAttribute(UA_Server *server, UA_Session *session,
 
 static UA_StatusCode
 writeValueAttributeWithoutRange(UA_VariableNode *node, const UA_DataValue *value) {
-    UA_DataValue new_value;
-    UA_StatusCode retval = UA_DataValue_copy(value, &new_value);
+    UA_DataValue *oldValue = &node->value.data.value;
+    UA_DataValue tmpValue = *value;
+
+    /* If possible memcpy the new value over the old value without
+     * a malloc. For this the value needs to be "pointerfree". */
+    if(oldValue->hasValue && oldValue->value.type && oldValue->value.type->pointerFree &&
+       value->hasValue && value->value.type && value->value.type->pointerFree &&
+       oldValue->value.type->memSize == value->value.type->memSize) {
+        size_t oSize = 1;
+        size_t vSize = 1;
+        if(!UA_Variant_isScalar(&oldValue->value))
+            oSize = oldValue->value.arrayLength;
+        if(!UA_Variant_isScalar(&value->value))
+            vSize = value->value.arrayLength;
+
+        if(oSize == vSize &&
+           oldValue->value.arrayDimensionsSize == value->value.arrayDimensionsSize) {
+            /* Keep the old pointers, but adjust type and array length */
+            tmpValue.value = oldValue->value;
+            tmpValue.value.type = value->value.type;
+            tmpValue.value.arrayLength = value->value.arrayLength;
+
+            /* Copy the data over the old memory */
+            memcpy(tmpValue.value.data, value->value.data,
+                   oSize * oldValue->value.type->memSize);
+            memcpy(tmpValue.value.arrayDimensions, value->value.arrayDimensions,
+                   sizeof(UA_UInt32) * oldValue->value.arrayDimensionsSize);
+
+            /* Set the value */
+            node->value.data.value = tmpValue;
+            return UA_STATUSCODE_GOOD;
+        }
+    }
+
+    /* Make a deep copy of the value and replace when this succeeds */
+    UA_StatusCode retval = UA_Variant_copy(&value->value, &tmpValue.value);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
     UA_DataValue_clear(&node->value.data.value);
-    node->value.data.value = new_value;
+    node->value.data.value = tmpValue;
     return UA_STATUSCODE_GOOD;
 }
 

From 3888af3410b53be0c5fa15b9d762dbab5b84902e Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 5 Jun 2024 15:28:29 +0200
Subject: [PATCH 1543/1963] fix(ns): Add ModelChangeEventType and ConditionType
 to support subscriptions with reduced namespace

---
 .../schema/Opc.Ua.NodeSet2.EventsMinimal.xml  | 695 ++++++++++++++++++
 1 file changed, 695 insertions(+)

diff --git a/tools/schema/Opc.Ua.NodeSet2.EventsMinimal.xml b/tools/schema/Opc.Ua.NodeSet2.EventsMinimal.xml
index 7ac5a2ed9c0..115bd69f27a 100644
--- a/tools/schema/Opc.Ua.NodeSet2.EventsMinimal.xml
+++ b/tools/schema/Opc.Ua.NodeSet2.EventsMinimal.xml
@@ -145,4 +145,699 @@
       <Field Name="DaylightSavingInOffset" DataType="i=1"/>
     </Definition>
   </UADataType>
+  <UADataType NodeId="i=877" BrowseName="ModelChangeStructureDataType">
+    <DisplayName>ModelChangeStructureDataType</DisplayName>
+    <Category>Base Info Model Change General</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part5/12.16</Documentation>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+    </References>
+    <Definition Name="ModelChangeStructureDataType">
+      <Field Name="Affected" DataType="i=17" />
+      <Field Name="AffectedType" DataType="i=17" />
+      <Field Name="Verb" DataType="i=3" />
+    </Definition>
+  </UADataType>
+  <UAObjectType NodeId="i=2132" BrowseName="BaseModelChangeEventType" IsAbstract="true">
+    <DisplayName>BaseModelChangeEventType</DisplayName>
+    <Category>Base Info Model Change</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part5/6.4.31</Documentation>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2041</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType NodeId="i=2133" BrowseName="GeneralModelChangeEventType" IsAbstract="true">
+    <DisplayName>GeneralModelChangeEventType</DisplayName>
+    <Category>Base Info Model Change General</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part5/6.4.32</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=2134</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2132</Reference>
+    </References>
+  </UAObjectType>
+  <UAVariable NodeId="i=2134" BrowseName="Changes" ParentNodeId="i=2133" DataType="i=877" ValueRank="1" ArrayDimensions="0">
+    <DisplayName>Changes</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2133</Reference>
+    </References>
+  </UAVariable>
+  <UAObjectType NodeId="i=2130" BrowseName="SystemEventType" IsAbstract="true">
+    <DisplayName>SystemEventType</DisplayName>
+    <Category>Base Info Device Failure</Category>
+    <Category>Base Info System Status Underlying System</Category>
+    <Category>Base Info System Status</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part5/6.4.28</Documentation>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2041</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType NodeId="i=2788" BrowseName="RefreshEndEventType" IsAbstract="true">
+    <DisplayName>RefreshEndEventType</DisplayName>
+    <Category>A &amp; C Refresh</Category>
+    <Category>A &amp; C Refresh2</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.11.3</Documentation>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2130</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType NodeId="i=2787" BrowseName="RefreshStartEventType" IsAbstract="true">
+    <DisplayName>RefreshStartEventType</DisplayName>
+    <Category>A &amp; C Refresh</Category>
+    <Category>A &amp; C Refresh2</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.11.2</Documentation>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2130</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType NodeId="i=2829" BrowseName="AuditConditionCommentEventType">
+    <DisplayName>AuditConditionCommentEventType</DisplayName>
+    <Category>A &amp; C Auditing</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.10.4</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=17222</Reference>
+      <Reference ReferenceType="HasProperty">i=11851</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2790</Reference>
+    </References>
+  </UAObjectType>
+  <UAVariable NodeId="i=17222" BrowseName="ConditionEventId" ParentNodeId="i=2829" DataType="ByteString">
+    <DisplayName>ConditionEventId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2829</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=11851" BrowseName="Comment" ParentNodeId="i=2829" DataType="LocalizedText">
+    <DisplayName>Comment</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2829</Reference>
+    </References>
+  </UAVariable>
+  <UAReferenceType NodeId="i=3065" BrowseName="AlwaysGeneratesEvent">
+    <DisplayName>AlwaysGeneratesEvent</DisplayName>
+    <Category>Address Space Events 2</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part5/11.17</Documentation>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=41</Reference>
+    </References>
+    <InverseName>AlwaysGeneratedBy</InverseName>
+  </UAReferenceType>
+  <UAObjectType NodeId="i=2052" BrowseName="AuditEventType" IsAbstract="true">
+    <DisplayName>AuditEventType</DisplayName>
+    <Category>Auditing Connections</Category>
+    <Category>Auditing NodeManagement</Category>
+    <Category>Auditing History Services</Category>
+    <Category>Auditing Write</Category>
+    <Category>Auditing Method</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part5/6.4.3</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=2053</Reference>
+      <Reference ReferenceType="HasProperty">i=2054</Reference>
+      <Reference ReferenceType="HasProperty">i=2055</Reference>
+      <Reference ReferenceType="HasProperty">i=2056</Reference>
+      <Reference ReferenceType="HasProperty">i=2057</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2041</Reference>
+    </References>
+  </UAObjectType>
+  <UAVariable NodeId="i=2053" BrowseName="ActionTimeStamp" ParentNodeId="i=2052" DataType="i=294">
+    <DisplayName>ActionTimeStamp</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2052</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=2054" BrowseName="Status" ParentNodeId="i=2052" DataType="Boolean">
+    <DisplayName>Status</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2052</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=2055" BrowseName="ServerId" ParentNodeId="i=2052" DataType="String">
+    <DisplayName>ServerId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2052</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=2056" BrowseName="ClientAuditEntryId" ParentNodeId="i=2052" DataType="String">
+    <DisplayName>ClientAuditEntryId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2052</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=2057" BrowseName="ClientUserId" ParentNodeId="i=2052" DataType="String">
+    <DisplayName>ClientUserId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2052</Reference>
+    </References>
+  </UAVariable>
+  <UAObjectType NodeId="i=2127" BrowseName="AuditUpdateMethodEventType" IsAbstract="true">
+    <DisplayName>AuditUpdateMethodEventType</DisplayName>
+    <Category>Auditing Method</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part5/6.4.27</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=2128</Reference>
+      <Reference ReferenceType="HasProperty">i=2129</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2052</Reference>
+    </References>
+  </UAObjectType>
+  <UAVariable NodeId="i=2128" BrowseName="MethodId" ParentNodeId="i=2127" DataType="NodeId">
+    <DisplayName>MethodId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2127</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=2129" BrowseName="InputArguments" ParentNodeId="i=2127" ValueRank="1" ArrayDimensions="0">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2127</Reference>
+    </References>
+  </UAVariable>
+  <UAObjectType NodeId="i=2790" BrowseName="AuditConditionEventType">
+    <DisplayName>AuditConditionEventType</DisplayName>
+    <Category>A &amp; C Auditing</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.10.2</Documentation>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2127</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType NodeId="i=2803" BrowseName="AuditConditionEnableEventType">
+    <DisplayName>AuditConditionEnableEventType</DisplayName>
+    <Category>A &amp; C Auditing</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.10.3</Documentation>
+    <References>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2790</Reference>
+    </References>
+  </UAObjectType>
+  <UAVariableType NodeId="i=9002" BrowseName="ConditionVariableType" ValueRank="-2">
+    <DisplayName>ConditionVariableType</DisplayName>
+    <Category>A &amp; C Basic</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.3</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=9003</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=63</Reference>
+    </References>
+  </UAVariableType>
+  <UAVariable NodeId="i=9003" BrowseName="SourceTimestamp" ParentNodeId="i=9002" DataType="i=294">
+    <DisplayName>SourceTimestamp</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9002</Reference>
+    </References>
+  </UAVariable>
+  <UAVariableType NodeId="i=2755" BrowseName="StateVariableType" DataType="LocalizedText">
+    <DisplayName>StateVariableType</DisplayName>
+    <Category>Base Info State Machine Instance</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part16/4.4.3</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=2756</Reference>
+      <Reference ReferenceType="HasProperty">i=2757</Reference>
+      <Reference ReferenceType="HasProperty">i=2758</Reference>
+      <Reference ReferenceType="HasProperty">i=2759</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=63</Reference>
+    </References>
+  </UAVariableType>
+  <UAVariable NodeId="i=2756" BrowseName="Id" ParentNodeId="i=2755">
+    <DisplayName>Id</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2755</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=2757" BrowseName="Name" ParentNodeId="i=2755" DataType="QualifiedName">
+    <DisplayName>Name</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2755</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=2758" BrowseName="Number" ParentNodeId="i=2755" DataType="UInt32">
+    <DisplayName>Number</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2755</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=2759" BrowseName="EffectiveDisplayName" ParentNodeId="i=2755" DataType="LocalizedText">
+    <DisplayName>EffectiveDisplayName</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2755</Reference>
+    </References>
+  </UAVariable>
+  <UAVariableType NodeId="i=8995" BrowseName="TwoStateVariableType" DataType="LocalizedText">
+    <DisplayName>TwoStateVariableType</DisplayName>
+    <Category>A &amp; C Basic</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.2</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=8996</Reference>
+      <Reference ReferenceType="HasProperty">i=9000</Reference>
+      <Reference ReferenceType="HasProperty">i=9001</Reference>
+      <Reference ReferenceType="HasProperty">i=11110</Reference>
+      <Reference ReferenceType="HasProperty">i=11111</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2755</Reference>
+    </References>
+  </UAVariableType>
+  <UAVariable NodeId="i=8996" BrowseName="Id" ParentNodeId="i=8995" DataType="Boolean">
+    <DisplayName>Id</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=8995</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9000" BrowseName="TransitionTime" ParentNodeId="i=8995" DataType="i=294">
+    <DisplayName>TransitionTime</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=8995</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9001" BrowseName="EffectiveTransitionTime" ParentNodeId="i=8995" DataType="i=294">
+    <DisplayName>EffectiveTransitionTime</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=8995</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=11110" BrowseName="TrueState" ParentNodeId="i=8995" DataType="LocalizedText">
+    <DisplayName>TrueState</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=8995</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=11111" BrowseName="FalseState" ParentNodeId="i=8995" DataType="LocalizedText">
+    <DisplayName>FalseState</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=8995</Reference>
+    </References>
+  </UAVariable>
+  <UAObjectType NodeId="i=2782" BrowseName="ConditionType" IsAbstract="true">
+    <DisplayName>ConditionType</DisplayName>
+    <Category>A &amp; C Basic</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.5.2</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=11112</Reference>
+      <Reference ReferenceType="HasProperty">i=11113</Reference>
+      <Reference ReferenceType="HasProperty">i=9009</Reference>
+      <Reference ReferenceType="HasProperty">i=9010</Reference>
+      <Reference ReferenceType="HasProperty">i=3874</Reference>
+      <Reference ReferenceType="HasProperty">i=32060</Reference>
+      <Reference ReferenceType="HasComponent">i=9011</Reference>
+      <Reference ReferenceType="HasComponent">i=9020</Reference>
+      <Reference ReferenceType="HasComponent">i=9022</Reference>
+      <Reference ReferenceType="HasComponent">i=9024</Reference>
+      <Reference ReferenceType="HasProperty">i=9026</Reference>
+      <Reference ReferenceType="HasComponent">i=9028</Reference>
+      <Reference ReferenceType="HasComponent">i=9027</Reference>
+      <Reference ReferenceType="HasComponent">i=9029</Reference>
+      <Reference ReferenceType="HasComponent">i=3875</Reference>
+      <Reference ReferenceType="HasComponent">i=12912</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=2041</Reference>
+    </References>
+  </UAObjectType>
+  <UAVariable NodeId="i=11112" BrowseName="ConditionClassId" ParentNodeId="i=2782" DataType="NodeId">
+    <DisplayName>ConditionClassId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=11113" BrowseName="ConditionClassName" ParentNodeId="i=2782" DataType="LocalizedText">
+    <DisplayName>ConditionClassName</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9009" BrowseName="ConditionName" ParentNodeId="i=2782" DataType="String">
+    <DisplayName>ConditionName</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9010" BrowseName="BranchId" ParentNodeId="i=2782" DataType="NodeId">
+    <DisplayName>BranchId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=3874" BrowseName="Retain" ParentNodeId="i=2782" DataType="Boolean">
+    <DisplayName>Retain</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=32060" BrowseName="SupportsFilteredRetain" ParentNodeId="i=2782" DataType="Boolean">
+    <DisplayName>SupportsFilteredRetain</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9011" BrowseName="EnabledState" ParentNodeId="i=2782" DataType="LocalizedText">
+    <DisplayName>EnabledState</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=9012</Reference>
+      <Reference ReferenceType="HasProperty">i=9015</Reference>
+      <Reference ReferenceType="HasProperty">i=9016</Reference>
+      <Reference ReferenceType="HasProperty">i=9017</Reference>
+      <Reference ReferenceType="HasProperty">i=9018</Reference>
+      <Reference ReferenceType="HasProperty">i=9019</Reference>
+      <Reference ReferenceType="HasTypeDefinition">i=8995</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9012" BrowseName="Id" ParentNodeId="i=9011" DataType="Boolean">
+    <DisplayName>Id</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9011</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9015" BrowseName="EffectiveDisplayName" ParentNodeId="i=9011" DataType="LocalizedText">
+    <DisplayName>EffectiveDisplayName</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9011</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9016" BrowseName="TransitionTime" ParentNodeId="i=9011" DataType="i=294">
+    <DisplayName>TransitionTime</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9011</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9017" BrowseName="EffectiveTransitionTime" ParentNodeId="i=9011" DataType="i=294">
+    <DisplayName>EffectiveTransitionTime</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=80</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9011</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9018" BrowseName="TrueState" ParentNodeId="i=9011" DataType="LocalizedText">
+    <DisplayName>TrueState</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9011</Reference>
+    </References>
+    <Value>
+      <LocalizedText xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <Locale>en</Locale>
+        <Text>Enabled</Text>
+      </LocalizedText>
+    </Value>
+  </UAVariable>
+  <UAVariable NodeId="i=9019" BrowseName="FalseState" ParentNodeId="i=9011" DataType="LocalizedText">
+    <DisplayName>FalseState</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9011</Reference>
+    </References>
+    <Value>
+      <LocalizedText xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <Locale>en</Locale>
+        <Text>Disabled</Text>
+      </LocalizedText>
+    </Value>
+  </UAVariable>
+  <UAVariable NodeId="i=9020" BrowseName="Quality" ParentNodeId="i=2782" DataType="StatusCode">
+    <DisplayName>Quality</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=9021</Reference>
+      <Reference ReferenceType="HasTypeDefinition">i=9002</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9021" BrowseName="SourceTimestamp" ParentNodeId="i=9020" DataType="i=294">
+    <DisplayName>SourceTimestamp</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9020</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9022" BrowseName="LastSeverity" ParentNodeId="i=2782" DataType="UInt16">
+    <DisplayName>LastSeverity</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=9023</Reference>
+      <Reference ReferenceType="HasTypeDefinition">i=9002</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9023" BrowseName="SourceTimestamp" ParentNodeId="i=9022" DataType="i=294">
+    <DisplayName>SourceTimestamp</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9022</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9024" BrowseName="Comment" ParentNodeId="i=2782" DataType="LocalizedText">
+    <DisplayName>Comment</DisplayName>
+    <References>
+      <Reference ReferenceType="HasProperty">i=9025</Reference>
+      <Reference ReferenceType="HasTypeDefinition">i=9002</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9025" BrowseName="SourceTimestamp" ParentNodeId="i=9024" DataType="i=294">
+    <DisplayName>SourceTimestamp</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9024</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable NodeId="i=9026" BrowseName="ClientUserId" ParentNodeId="i=2782" DataType="String">
+    <DisplayName>ClientUserId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=2782</Reference>
+    </References>
+  </UAVariable>
+  <UAMethod NodeId="i=9028" BrowseName="Disable" ParentNodeId="i=2782">
+    <DisplayName>Disable</DisplayName>
+    <Category>A &amp; C Enable</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.5.4</Documentation>
+    <References>
+      <Reference ReferenceType="i=3065">i=2803</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAMethod>
+  <UAMethod NodeId="i=9027" BrowseName="Enable" ParentNodeId="i=2782">
+    <DisplayName>Enable</DisplayName>
+    <Category>A &amp; C Enable</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.5.5</Documentation>
+    <References>
+      <Reference ReferenceType="i=3065">i=2803</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAMethod>
+  <UAMethod NodeId="i=9029" BrowseName="AddComment" ParentNodeId="i=2782">
+    <DisplayName>AddComment</DisplayName>
+    <Category>A &amp; C Comment</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.5.6</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=9030</Reference>
+      <Reference ReferenceType="i=3065">i=2829</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=9030" BrowseName="InputArguments" ParentNodeId="i=9029" DataType="i=296" ValueRank="1" ArrayDimensions="2">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=9029</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>EventId</Name>
+              <DataType>
+                <Identifier>i=15</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+              <Description>
+                <Text>The identifier for the event to comment.</Text>
+              </Description>
+            </Argument>
+          </Body>
+        </ExtensionObject>
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>Comment</Name>
+              <DataType>
+                <Identifier>i=21</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+              <Description>
+                <Text>The comment to add to the condition.</Text>
+              </Description>
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAMethod NodeId="i=3875" BrowseName="ConditionRefresh" ParentNodeId="i=2782">
+    <DisplayName>ConditionRefresh</DisplayName>
+    <Category>A &amp; C Refresh</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.5.7</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=3876</Reference>
+      <Reference ReferenceType="i=3065">i=2787</Reference>
+      <Reference ReferenceType="i=3065">i=2788</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=3876" BrowseName="InputArguments" ParentNodeId="i=3875" DataType="i=296" ValueRank="1" ArrayDimensions="1">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=3875</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscriptionId</Name>
+              <DataType>
+                <Identifier>i=288</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+              <Description>
+                <Text>The identifier for the subscription to refresh.</Text>
+              </Description>
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
+  <UAMethod NodeId="i=12912" BrowseName="ConditionRefresh2" ParentNodeId="i=2782">
+    <DisplayName>ConditionRefresh2</DisplayName>
+    <Category>A &amp; C Refresh2</Category>
+    <Documentation>https://reference.opcfoundation.org/v105/Core/docs/Part9/5.5.8</Documentation>
+    <References>
+      <Reference ReferenceType="HasProperty">i=12913</Reference>
+      <Reference ReferenceType="i=3065">i=2787</Reference>
+      <Reference ReferenceType="i=3065">i=2788</Reference>
+      <Reference ReferenceType="HasComponent" IsForward="false">i=2782</Reference>
+    </References>
+  </UAMethod>
+  <UAVariable NodeId="i=12913" BrowseName="InputArguments" ParentNodeId="i=12912" DataType="i=296" ValueRank="1" ArrayDimensions="2">
+    <DisplayName>InputArguments</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+      <Reference ReferenceType="HasModellingRule">i=78</Reference>
+      <Reference ReferenceType="HasProperty" IsForward="false">i=12912</Reference>
+    </References>
+    <Value>
+      <ListOfExtensionObject xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>SubscriptionId</Name>
+              <DataType>
+                <Identifier>i=288</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+              <Description>
+                <Text>The identifier for the subscription to refresh.</Text>
+              </Description>
+            </Argument>
+          </Body>
+        </ExtensionObject>
+        <ExtensionObject>
+          <TypeId>
+            <Identifier>i=297</Identifier>
+          </TypeId>
+          <Body>
+            <Argument>
+              <Name>MonitoredItemId</Name>
+              <DataType>
+                <Identifier>i=288</Identifier>
+              </DataType>
+              <ValueRank>-1</ValueRank>
+              <ArrayDimensions />
+              <Description>
+                <Text>The identifier for the monitored item to refresh.</Text>
+              </Description>
+            </Argument>
+          </Body>
+        </ExtensionObject>
+      </ListOfExtensionObject>
+    </Value>
+  </UAVariable>
 </UANodeSet>

From 069fffda8ea6ab9071296ae89e648cc2fccbac3e Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Fri, 14 Jun 2024 07:42:52 +0200
Subject: [PATCH 1544/1963] fix(arch): Fix build error with undefined UA_IPV6

---
 arch/eventloop_posix_udp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index e23ea19f35a..628e8e2bac4 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -157,8 +157,10 @@ setMulticastInterface(const char *netif, struct addrinfo *info,
         /* MSVC documentation of struct ip_mreq: To use an interface index of 1
          * would be the same as an IP address of 0.0.0.1. */
         req->ipv4.imr_interface.s_addr = htonl(idx);
+#if UA_IPV6
     else /* if(info->ai_family == AF_INET6) */
         req->ipv6.ipv6mr_interface = idx;
+#endif
     return UA_STATUSCODE_GOOD;
 }
 

From 88dae2112e2370a530bdb2ccfc02014e87d17d13 Mon Sep 17 00:00:00 2001
From: Peter Schuster <p.schuster@pilz.de>
Date: Wed, 12 Jun 2024 18:37:05 +0200
Subject: [PATCH 1545/1963] fix(client): channel state set to CLOSING without
 closing underlying connection

UA_SECURECHANNELSTATE_CLOSING is set in UA_SecureChannel_shutdown
but this was never called due to the recursion check in closeSecureChannel.

Closes issue #5783
---
 src/client/ua_client_connect.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 9ecd301cd06..f3acbfa269e 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -396,8 +396,6 @@ checkCreateSessionSignature(UA_Client *client, const UA_SecureChannel *channel,
 
 void
 processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
-    client->channel.state = UA_SECURECHANNELSTATE_CLOSING;
-
     size_t offset = 0;
     UA_TcpErrorMessage errMessage;
     client->connectStatus =

From cd444152a9e085eead02c2d8eaa1664cf4a8f5fe Mon Sep 17 00:00:00 2001
From: Peter Schuster <p.schuster@pilz.de>
Date: Fri, 14 Jun 2024 12:41:58 +0200
Subject: [PATCH 1546/1963] test(client) Added test for connection termination
 when server sent an error

If the server sends an error, but does not initiate closing the conenction,
the client previously hung up in an infinite loop (see issue #5783).
---
 tests/client/check_client.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 120b9b49755..0e95e57e3ac 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -440,6 +440,28 @@ START_TEST(Client_activateSessionLocaleIds) {
 }
 END_TEST
 
+START_TEST(Client_closes_on_server_error) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    ck_assert_uint_eq(server->sessionCount, 1);
+    UA_SecureChannel *channel = server->sessions.lh_first->session.header.channel;
+
+    // send error message from server to client
+    UA_TcpErrorMessage errMsg = {.error = UA_STATUSCODE_BADSECURITYCHECKSFAILED,
+                                 .reason = UA_STRING_NULL};
+    UA_SecureChannel_sendError(channel, &errMsg);
+
+    // client should disconnect and close TCP connections, although err was received
+    // note: if it fails to do so the tests might hang here
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
 static Suite* testSuite_Client(void) {
     Suite *s = suite_create("Client");
     TCase *tc_client = tcase_create("Client Basic");
@@ -451,6 +473,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_client, Client_endpoints);
     tcase_add_test(tc_client, Client_endpoints_empty);
     tcase_add_test(tc_client, Client_read);
+    tcase_add_test(tc_client, Client_closes_on_server_error);
     suite_add_tcase(s,tc_client);
     TCase *tc_client_reconnect = tcase_create("Client Reconnect");
     tcase_add_checked_fixture(tc_client_reconnect, setup, teardown);

From 0f6514453afeb8c8bb92597a7ab2e3669564165c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 14:08:24 +0200
Subject: [PATCH 1547/1963] fix(server): Directly write into the external data
 source if no callback is provided

---
 src/server/ua_services_attribute.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index fa7f56dcfe2..755305c1e6b 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1533,11 +1533,18 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
         break;
 
     case UA_VALUEBACKENDTYPE_EXTERNAL:
+        retval = UA_STATUSCODE_GOOD;
         if(node->valueBackend.backend.external.callback.userWrite) {
             retval = node->valueBackend.backend.external.callback.
                 userWrite(server, &session->sessionId, session->sessionHandle,
                           &node->head.nodeId, node->head.context,
                           rangeptr, &adjustedValue);
+        } else {
+            if(node->valueBackend.backend.external.value) {
+                UA_DataValue_clear(*node->valueBackend.backend.external.value);
+                retval = UA_DataValue_copy(&adjustedValue,
+                                           *node->valueBackend.backend.external.value);
+            }
         }
         break;
 

From 8cee854beaf97e71bb54604a893a3e597af851d6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 6 Jun 2024 14:10:39 +0200
Subject: [PATCH 1548/1963] refactor(examples): Move outdated PubSub RT
 examples to the attic

---
 examples/CMakeLists.txt                       | 25 +++----------------
 .../pubsub_realtime/{ => attic}/README.md     |  0
 .../{ => attic}/README_pubsub_TSN.txt         |  0
 .../{ => attic}/Readme_PubSub.txt             |  0
 .../{ => attic}/nodeset/CMakeLists.txt        |  0
 .../{ => attic}/nodeset/pubDataModel.csv      |  0
 .../{ => attic}/nodeset/pubDataModel.xml      |  0
 .../nodeset/pubsub_nodeset_rt_publisher.c     |  0
 .../nodeset/pubsub_nodeset_rt_subscriber.c    |  0
 .../{ => attic}/nodeset/subDataModel.csv      |  0
 .../{ => attic}/nodeset/subDataModel.xml      |  0
 .../{ => attic}/pubsub_TSN_loopback.c         |  0
 .../pubsub_TSN_loopback_single_thread.c       |  0
 .../{ => attic}/pubsub_TSN_publisher.c        |  0
 .../pubsub_TSN_publisher_multiple_thread.c    |  0
 .../{ => attic}/pubsub_interrupt_publish.c    |  0
 .../{ => attic}/start_rt_publish.sh           |  0
 .../{ => attic}/vxworks/README.md             |  0
 .../vxworks/pubsub_interrupt_publish_tsn.c    |  0
 .../server_pubsub_publisher_rt_level.c        |  0
 ...server_pubsub_rt_field_information_model.c |  0
 .../server_pubsub_subscriber_rt_level.c       |  0
 22 files changed, 3 insertions(+), 22 deletions(-)
 rename examples/pubsub_realtime/{ => attic}/README.md (100%)
 rename examples/pubsub_realtime/{ => attic}/README_pubsub_TSN.txt (100%)
 rename examples/pubsub_realtime/{ => attic}/Readme_PubSub.txt (100%)
 rename examples/pubsub_realtime/{ => attic}/nodeset/CMakeLists.txt (100%)
 rename examples/pubsub_realtime/{ => attic}/nodeset/pubDataModel.csv (100%)
 rename examples/pubsub_realtime/{ => attic}/nodeset/pubDataModel.xml (100%)
 rename examples/pubsub_realtime/{ => attic}/nodeset/pubsub_nodeset_rt_publisher.c (100%)
 rename examples/pubsub_realtime/{ => attic}/nodeset/pubsub_nodeset_rt_subscriber.c (100%)
 rename examples/pubsub_realtime/{ => attic}/nodeset/subDataModel.csv (100%)
 rename examples/pubsub_realtime/{ => attic}/nodeset/subDataModel.xml (100%)
 rename examples/pubsub_realtime/{ => attic}/pubsub_TSN_loopback.c (100%)
 rename examples/pubsub_realtime/{ => attic}/pubsub_TSN_loopback_single_thread.c (100%)
 rename examples/pubsub_realtime/{ => attic}/pubsub_TSN_publisher.c (100%)
 rename examples/pubsub_realtime/{ => attic}/pubsub_TSN_publisher_multiple_thread.c (100%)
 rename examples/pubsub_realtime/{ => attic}/pubsub_interrupt_publish.c (100%)
 rename examples/pubsub_realtime/{ => attic}/start_rt_publish.sh (100%)
 rename examples/pubsub_realtime/{ => attic}/vxworks/README.md (100%)
 rename examples/pubsub_realtime/{ => attic}/vxworks/pubsub_interrupt_publish_tsn.c (100%)
 rename examples/{pubsub => pubsub_realtime}/server_pubsub_publisher_rt_level.c (100%)
 rename examples/{pubsub => pubsub_realtime}/server_pubsub_rt_field_information_model.c (100%)
 rename examples/{pubsub => pubsub_realtime}/server_pubsub_subscriber_rt_level.c (100%)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 042c59a179e..e9a4fea7ecc 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -211,33 +211,14 @@ if(UA_ENABLE_PUBSUB)
     add_example(tutorial_pubsub_publish pubsub/tutorial_pubsub_publish.c)
     add_example(server_pubsub_publish_on_demand pubsub/server_pubsub_publisher_on_demand.c)
     add_example(server_pubsub_publisher_iop pubsub/server_pubsub_publisher_iop.c)
-    add_example(server_pubsub_publish_rt_level pubsub/server_pubsub_publisher_rt_level.c)
-    add_example(server_pubsub_rt_information_model pubsub/server_pubsub_rt_field_information_model.c)
-    if(CMAKE_SYSTEM MATCHES "Linux")
-        if(UA_ENABLE_MALLOC_SINGLETON AND UA_ENABLE_IMMUTABLE_NODES)
-            add_example(rt_publisher pubsub_realtime/pubsub_interrupt_publish.c)
-            target_link_libraries(rt_publisher rt)
-        endif()
-    endif()
-    add_example(server_pubsub_subscribe_rt_level pubsub/server_pubsub_subscriber_rt_level.c)
+    add_example(server_pubsub_publish_rt_level pubsub_realtime/server_pubsub_publisher_rt_level.c)
+    add_example(server_pubsub_rt_information_model pubsub_realtime/server_pubsub_rt_field_information_model.c)
+    add_example(server_pubsub_subscribe_rt_level pubsub_realtime/server_pubsub_subscriber_rt_level.c)
     add_example(tutorial_pubsub_subscribe pubsub/tutorial_pubsub_subscribe.c)
     if (BUILD_SHARED_LIBS)
         message(WARNING "Build option BUILD_SHARED_LIBS not supported for standalone subscriber and realtime examples. Skipping these examples.")
     else (NOT BUILD_SHARED_LIBS)
         add_example(pubsub_subscribe_standalone_dataset pubsub/pubsub_subscribe_standalone_dataset.c)
-
-        # TODO: The TSN examples need to be reworked for the EventLoop model
-        # if(CMAKE_SYSTEM MATCHES "Linux")
-        #     add_example(pubsub_TSN_publisher_multiple_thread pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c)
-        #     add_example(pubsub_TSN_loopback_single_thread pubsub_realtime/pubsub_TSN_loopback_single_thread.c)
-        #     target_link_libraries(pubsub_TSN_publisher_multiple_thread rt pthread)
-        #     target_link_libraries(pubsub_TSN_loopback_single_thread rt pthread)
-        #     add_subdirectory(pubsub_realtime/nodeset)
-        #     add_example(pubsub_TSN_publisher pubsub_realtime/pubsub_TSN_publisher.c)
-        #     add_example(pubsub_TSN_loopback pubsub_realtime/pubsub_TSN_loopback.c)
-        #     target_link_libraries(pubsub_TSN_publisher rt pthread)
-        #     target_link_libraries(pubsub_TSN_loopback rt pthread)
-        # endif()
     endif()
     if(UA_ENABLE_PUBSUB_ENCRYPTION)
         add_example(pubsub_publish_encrypted pubsub/pubsub_publish_encrypted.c)
diff --git a/examples/pubsub_realtime/README.md b/examples/pubsub_realtime/attic/README.md
similarity index 100%
rename from examples/pubsub_realtime/README.md
rename to examples/pubsub_realtime/attic/README.md
diff --git a/examples/pubsub_realtime/README_pubsub_TSN.txt b/examples/pubsub_realtime/attic/README_pubsub_TSN.txt
similarity index 100%
rename from examples/pubsub_realtime/README_pubsub_TSN.txt
rename to examples/pubsub_realtime/attic/README_pubsub_TSN.txt
diff --git a/examples/pubsub_realtime/Readme_PubSub.txt b/examples/pubsub_realtime/attic/Readme_PubSub.txt
similarity index 100%
rename from examples/pubsub_realtime/Readme_PubSub.txt
rename to examples/pubsub_realtime/attic/Readme_PubSub.txt
diff --git a/examples/pubsub_realtime/nodeset/CMakeLists.txt b/examples/pubsub_realtime/attic/nodeset/CMakeLists.txt
similarity index 100%
rename from examples/pubsub_realtime/nodeset/CMakeLists.txt
rename to examples/pubsub_realtime/attic/nodeset/CMakeLists.txt
diff --git a/examples/pubsub_realtime/nodeset/pubDataModel.csv b/examples/pubsub_realtime/attic/nodeset/pubDataModel.csv
similarity index 100%
rename from examples/pubsub_realtime/nodeset/pubDataModel.csv
rename to examples/pubsub_realtime/attic/nodeset/pubDataModel.csv
diff --git a/examples/pubsub_realtime/nodeset/pubDataModel.xml b/examples/pubsub_realtime/attic/nodeset/pubDataModel.xml
similarity index 100%
rename from examples/pubsub_realtime/nodeset/pubDataModel.xml
rename to examples/pubsub_realtime/attic/nodeset/pubDataModel.xml
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c b/examples/pubsub_realtime/attic/nodeset/pubsub_nodeset_rt_publisher.c
similarity index 100%
rename from examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_publisher.c
rename to examples/pubsub_realtime/attic/nodeset/pubsub_nodeset_rt_publisher.c
diff --git a/examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c b/examples/pubsub_realtime/attic/nodeset/pubsub_nodeset_rt_subscriber.c
similarity index 100%
rename from examples/pubsub_realtime/nodeset/pubsub_nodeset_rt_subscriber.c
rename to examples/pubsub_realtime/attic/nodeset/pubsub_nodeset_rt_subscriber.c
diff --git a/examples/pubsub_realtime/nodeset/subDataModel.csv b/examples/pubsub_realtime/attic/nodeset/subDataModel.csv
similarity index 100%
rename from examples/pubsub_realtime/nodeset/subDataModel.csv
rename to examples/pubsub_realtime/attic/nodeset/subDataModel.csv
diff --git a/examples/pubsub_realtime/nodeset/subDataModel.xml b/examples/pubsub_realtime/attic/nodeset/subDataModel.xml
similarity index 100%
rename from examples/pubsub_realtime/nodeset/subDataModel.xml
rename to examples/pubsub_realtime/attic/nodeset/subDataModel.xml
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback.c b/examples/pubsub_realtime/attic/pubsub_TSN_loopback.c
similarity index 100%
rename from examples/pubsub_realtime/pubsub_TSN_loopback.c
rename to examples/pubsub_realtime/attic/pubsub_TSN_loopback.c
diff --git a/examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c b/examples/pubsub_realtime/attic/pubsub_TSN_loopback_single_thread.c
similarity index 100%
rename from examples/pubsub_realtime/pubsub_TSN_loopback_single_thread.c
rename to examples/pubsub_realtime/attic/pubsub_TSN_loopback_single_thread.c
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher.c b/examples/pubsub_realtime/attic/pubsub_TSN_publisher.c
similarity index 100%
rename from examples/pubsub_realtime/pubsub_TSN_publisher.c
rename to examples/pubsub_realtime/attic/pubsub_TSN_publisher.c
diff --git a/examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c b/examples/pubsub_realtime/attic/pubsub_TSN_publisher_multiple_thread.c
similarity index 100%
rename from examples/pubsub_realtime/pubsub_TSN_publisher_multiple_thread.c
rename to examples/pubsub_realtime/attic/pubsub_TSN_publisher_multiple_thread.c
diff --git a/examples/pubsub_realtime/pubsub_interrupt_publish.c b/examples/pubsub_realtime/attic/pubsub_interrupt_publish.c
similarity index 100%
rename from examples/pubsub_realtime/pubsub_interrupt_publish.c
rename to examples/pubsub_realtime/attic/pubsub_interrupt_publish.c
diff --git a/examples/pubsub_realtime/start_rt_publish.sh b/examples/pubsub_realtime/attic/start_rt_publish.sh
similarity index 100%
rename from examples/pubsub_realtime/start_rt_publish.sh
rename to examples/pubsub_realtime/attic/start_rt_publish.sh
diff --git a/examples/pubsub_realtime/vxworks/README.md b/examples/pubsub_realtime/attic/vxworks/README.md
similarity index 100%
rename from examples/pubsub_realtime/vxworks/README.md
rename to examples/pubsub_realtime/attic/vxworks/README.md
diff --git a/examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c b/examples/pubsub_realtime/attic/vxworks/pubsub_interrupt_publish_tsn.c
similarity index 100%
rename from examples/pubsub_realtime/vxworks/pubsub_interrupt_publish_tsn.c
rename to examples/pubsub_realtime/attic/vxworks/pubsub_interrupt_publish_tsn.c
diff --git a/examples/pubsub/server_pubsub_publisher_rt_level.c b/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c
similarity index 100%
rename from examples/pubsub/server_pubsub_publisher_rt_level.c
rename to examples/pubsub_realtime/server_pubsub_publisher_rt_level.c
diff --git a/examples/pubsub/server_pubsub_rt_field_information_model.c b/examples/pubsub_realtime/server_pubsub_rt_field_information_model.c
similarity index 100%
rename from examples/pubsub/server_pubsub_rt_field_information_model.c
rename to examples/pubsub_realtime/server_pubsub_rt_field_information_model.c
diff --git a/examples/pubsub/server_pubsub_subscriber_rt_level.c b/examples/pubsub_realtime/server_pubsub_subscriber_rt_level.c
similarity index 100%
rename from examples/pubsub/server_pubsub_subscriber_rt_level.c
rename to examples/pubsub_realtime/server_pubsub_subscriber_rt_level.c

From 0cdf8195292b741692553eabc152c3be4bd89d6e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 22:27:49 +0200
Subject: [PATCH 1549/1963] refactor(tests): Move incomplete ETF tests to the
 attic

---
 tests/CMakeLists.txt                                      | 8 +++-----
 .../{ => attic}/check_pubsub_connection_ethernet_etf.c    | 0
 tests/pubsub/{ => attic}/check_pubsub_connection_xdp.c    | 0
 .../{ => attic}/check_pubsub_publish_ethernet_etf.c       | 0
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename tests/pubsub/{ => attic}/check_pubsub_connection_ethernet_etf.c (100%)
 rename tests/pubsub/{ => attic}/check_pubsub_connection_xdp.c (100%)
 rename tests/pubsub/{ => attic}/check_pubsub_publish_ethernet_etf.c (100%)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d62bd596673..129559d9f48 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -360,11 +360,9 @@ if(UA_ENABLE_PUBSUB)
     if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
         ua_add_test(pubsub/check_pubsub_connection_ethernet.c)
         ua_add_test(pubsub/check_pubsub_publish_ethernet.c)
-        ua_add_test(pubsub/check_pubsub_connection_ethernet_etf.c)
-        ua_add_test(pubsub/check_pubsub_publish_ethernet_etf.c)
-        if(LIB_BPF)
-            ua_add_test(pubsub/check_pubsub_connection_xdp.c)
-        endif()
+        #ua_add_test(pubsub/check_pubsub_connection_ethernet_etf.c)
+        #ua_add_test(pubsub/check_pubsub_publish_ethernet_etf.c)
+        #ua_add_test(pubsub/check_pubsub_connection_xdp.c)
     endif()
 
     if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
diff --git a/tests/pubsub/check_pubsub_connection_ethernet_etf.c b/tests/pubsub/attic/check_pubsub_connection_ethernet_etf.c
similarity index 100%
rename from tests/pubsub/check_pubsub_connection_ethernet_etf.c
rename to tests/pubsub/attic/check_pubsub_connection_ethernet_etf.c
diff --git a/tests/pubsub/check_pubsub_connection_xdp.c b/tests/pubsub/attic/check_pubsub_connection_xdp.c
similarity index 100%
rename from tests/pubsub/check_pubsub_connection_xdp.c
rename to tests/pubsub/attic/check_pubsub_connection_xdp.c
diff --git a/tests/pubsub/check_pubsub_publish_ethernet_etf.c b/tests/pubsub/attic/check_pubsub_publish_ethernet_etf.c
similarity index 100%
rename from tests/pubsub/check_pubsub_publish_ethernet_etf.c
rename to tests/pubsub/attic/check_pubsub_publish_ethernet_etf.c

From 44cd91f903628a9b1b4c464ead1e30d4005ac206 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 6 Jun 2024 18:05:43 +0200
Subject: [PATCH 1550/1963] refactor(examples): Clean up
 server_pubsub_publisher_rt_level.c

---
 .../server_pubsub_publisher_rt_level.c        | 247 +++++++++---------
 1 file changed, 117 insertions(+), 130 deletions(-)

diff --git a/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c b/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c
index 8f5fa1f8654..0ec133d1f2d 100644
--- a/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c
+++ b/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c
@@ -1,196 +1,183 @@
 /* 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 <open62541/plugin/eventloop.h>
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
 #include <open62541/server_pubsub.h>
-#include <open62541/server_config_default.h>
+#include <open62541/types.h>
 
-#include <stdlib.h>
+#include <signal.h>
 
-/* possible options: PUBSUB_CONFIG_FASTPATH_NONE, PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS, PUBSUB_CONFIG_FASTPATH_STATIC_VALUES */
-#define PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS
 #define PUBSUB_CONFIG_PUBLISH_CYCLE_MS 100
 #define PUBSUB_CONFIG_FIELD_COUNT 10
 
+UA_NodeId publishedDataSetIdent, dataSetFieldIdent, writerGroupIdent, connectionIdentifier;
+
 /**
- * The PubSub RT level example points out the configuration of different PubSub RT-levels. These levels will be
- * used together with an RT capable OS for deterministic message generation. The main target is to reduce the time
- * spread and effort during the publish cycle. Most of the RT levels are based on pre-generated and buffered
- * DataSetMesseges and NetworkMessages. Since changes in the PubSub-configuration will invalidate the buffered
- * frames, the PubSub configuration must be frozen after the configuration phase.
+ * For realtime publishing the following is configured:
+ *
+ * - Direct-access data source with double-pointers to a DataValue.
+ *   That allows atomic updates by switching the pointer to a new DataValue.
+ * - The WriterGroup has UA_PUBSUB_RT_FIXED_SIZE configured. So
+ *   the message is pre-computed and updated only at fixed offsets.
+ * - A dedicated EventLoop is instantiated for PubSub.
+ *   So the client/server operations do not interfere with the publisher.
+ *
+ * Note that for true realtime the following additions are needed (at least):
  *
- * This example can be configured to compare and measure the different PubSub options by the following define options:
- * PUBSUB_CONFIG_FASTPATH_NONE -> The published fields are added to the information model and published in the default non-RT mode
- * PUBSUB_CONFIG_FASTPATH_STATIC_VALUES -> The published fields are not visible in the information model. The publish cycle is improved
- * by prevent the value lookup within the information model.
- * PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS -> The published fields are not visible in the information model. After the PubSub-configuration
- * freeze, the NetworkMessages and DataSetMessages will be calculated and buffered. During the publish cycle these buffers will only be updated.
+ * - An EventLoop + PubSubConnection that supports TSN.
+ * - The EventLoop uses a fixed TX buffer instead of a malloc each.
+ * - Preparing the message with a time-offset before sending.
  */
 
-UA_NodeId publishedDataSetIdent, dataSetFieldIdent, writerGroupIdent, connectionIdentifier;
+/* Values in static locations. We cycle the dvPointers double-pointer to the
+ * next with atomic operations. */
 UA_UInt32 valueStore[PUBSUB_CONFIG_FIELD_COUNT];
+UA_DataValue dvStore[PUBSUB_CONFIG_FIELD_COUNT];
+UA_DataValue *dvPointers[PUBSUB_CONFIG_FIELD_COUNT];
 
-/* The following PubSub configuration does not differ from the 'normal' configuration */
 static void
-addMinimalPubSubConfiguration(UA_Server * server){
-    /* Add one PubSubConnection */
+valueUpdateCallback(UA_Server *server, void *data) {
+    for(int i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; ++i) {
+        if(dvPointers[i] < &dvStore[PUBSUB_CONFIG_FIELD_COUNT - 1])
+            UA_atomic_xchg((void**)&dvPointers[i], dvPointers[i]+1);
+        else
+            UA_atomic_xchg((void**)&dvPointers[i], &dvStore[0]);
+    }
+}
+
+/* Dedicated EventLoop for PubSub */
+volatile UA_Boolean pubSubELRunning = true;
+UA_EventLoop *pubSubEL;
+
+static void *
+runPubSubEL(void *_) {
+    sigset_t set;
+    sigemptyset(&set);
+    sigaddset(&set, SIGINT);
+    pthread_sigmask(SIG_BLOCK, &set, NULL);
+    while(pubSubELRunning)
+        pubSubEL->run(pubSubEL, 100);
+    return NULL;
+}
+
+int main(void) {
+    UA_Server *server = UA_Server_new();
+
+    /* Instantiate the custom EventLoop.
+     * Will be attached to the PubSubConnection and gets used for everything "above".
+     * This should be bound to a dedicated core for RT. */
+    pubSubEL = UA_EventLoop_new_POSIX(UA_Log_Stdout);
+    UA_ConnectionManager *udpCM =
+        UA_ConnectionManager_new_POSIX_UDP(UA_STRING("udp connection manager"));
+    pubSubEL->registerEventSource(pubSubEL, (UA_EventSource *)udpCM);
+    pubSubEL->start(pubSubEL);
+
+    pthread_t pubSubELThread;
+    pthread_create(&pubSubELThread, NULL, runPubSubEL, NULL);
+
+    /* Prepare the values */
+    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++) {
+        valueStore[i] = (UA_UInt32) i + 1;
+        UA_Variant_setScalar(&dvStore[i].value, &valueStore[i], &UA_TYPES[UA_TYPES_UINT32]);
+        dvStore[i].hasValue = true;
+        dvPointers[i] = &dvStore[i];
+    }
+
+    /* Add a PubSubConnection */
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(connectionConfig));
     connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.enabled = UA_TRUE;
+    connectionConfig.enabled = true;
+    connectionConfig.eventLoop = pubSubEL;
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = 2234;
     UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
-    /* Add one PublishedDataSet */
+
+    /* Add a PublishedDataSet */
     UA_PublishedDataSetConfig publishedDataSetConfig;
     memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
     publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
     publishedDataSetConfig.name = UA_STRING("Demo PDS");
-    /* Add one DataSetField to the PDS */
     UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent);
-}
 
-static void
-valueUpdateCallback(UA_Server *server, void *data) {
-#if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    for(int i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; ++i)
-        valueStore[i] = valueStore[i] + 1;
-#endif
-#if defined PUBSUB_CONFIG_FASTPATH_NONE
-    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++){
-        UA_Variant value;
-        UA_Variant_init(&value);
-        if(UA_Server_readValue(server, UA_NODEID_NUMERIC(1, 1000 + (UA_UInt32) i), &value) != UA_STATUSCODE_GOOD) {
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Failed to read publish value. Node number: %zu", i);
-            continue;
-        }
-        UA_UInt32 *intValue = (UA_UInt32 *) value.data;
-        *intValue = *intValue + 1;
-        if(UA_Server_writeValue(server, UA_NODEID_NUMERIC(1, 1000 + (UA_UInt32) i), value) != UA_STATUSCODE_GOOD){
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Failed to update publish value. Node number: %zu", i);
-            continue;
-        }
-        UA_Variant_clear(&value);
+    /* Add DataSetFields with static value source to PDS */
+    UA_DataSetFieldConfig dsfConfig;
+    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++) {
+        /* TODO: Point to a variable in the information model */
+        memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
+        dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = true;
+        dsfConfig.field.variable.rtValueSource.staticValueSource = &dvPointers[i];
+        UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent);
     }
-#endif
-}
-
-int main(void) {
-    UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
-
-    /*Add standard PubSub configuration (no difference to the std. configuration)*/
-    addMinimalPubSubConfiguration(server);
 
+    /* Add a WriterGroup */
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
     writerGroupConfig.name = UA_STRING("Demo WriterGroup");
     writerGroupConfig.publishingInterval = PUBSUB_CONFIG_PUBLISH_CYCLE_MS;
-    writerGroupConfig.enabled = UA_FALSE;
+    writerGroupConfig.enabled = true;
     writerGroupConfig.writerGroupId = 100;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
-    writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
+    writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+
+    /* Change message settings of writerGroup to send PublisherId, WriterGroupId
+     * in GroupHeader and DataSetWriterId in PayloadHeader of NetworkMessage */
     UA_UadpWriterGroupMessageDataType writerGroupMessage;
     UA_UadpWriterGroupMessageDataType_init(&writerGroupMessage);
-    /* Change message settings of writerGroup to send PublisherId,
-     * WriterGroupId in GroupHeader and DataSetWriterId in PayloadHeader
-     * of NetworkMessage */
-    writerGroupMessage.networkMessageContentMask = (UA_UadpNetworkMessageContentMask) ((UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
-                                                    (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
-                                                    (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
-                                                    (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_SEQUENCENUMBER |
-                                                    (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
-    writerGroupConfig.messageSettings.content.decoded.data = &writerGroupMessage;
-#ifdef PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS
-    writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
-#elif defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    writerGroupConfig.rtLevel = UA_PUBSUB_RT_DIRECT_VALUE_ACCESS;
-#endif
+    writerGroupMessage.networkMessageContentMask = (UA_UadpNetworkMessageContentMask)
+        (UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID | UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+         UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID | UA_UADPNETWORKMESSAGECONTENTMASK_SEQUENCENUMBER |
+         UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    UA_ExtensionObject_setValue(&writerGroupConfig.messageSettings, &writerGroupMessage,
+                                &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE]);
+
     UA_Server_addWriterGroup(server, connectionIdentifier, &writerGroupConfig, &writerGroupIdent);
-    /* Add one DataSetWriter */
+
+    /* Add a DataSetWriter to the WriterGroup */
     UA_NodeId dataSetWriterIdent;
     UA_DataSetWriterConfig dataSetWriterConfig;
     memset(&dataSetWriterConfig, 0, sizeof(UA_DataSetWriterConfig));
     dataSetWriterConfig.name = UA_STRING("Demo DataSetWriter");
     dataSetWriterConfig.dataSetWriterId = 62541;
     dataSetWriterConfig.keyFrameCount = 10;
+    dataSetWriterConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
 
     UA_UadpDataSetWriterMessageDataType uadpDataSetWriterMessageDataType;
     UA_UadpDataSetWriterMessageDataType_init(&uadpDataSetWriterMessageDataType);
-    uadpDataSetWriterMessageDataType.dataSetMessageContentMask = (UA_UadpDataSetMessageContentMask) UA_UADPDATASETMESSAGECONTENTMASK_SEQUENCENUMBER;
-    dataSetWriterConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
-    dataSetWriterConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE];
-    dataSetWriterConfig.messageSettings.content.decoded.data = &uadpDataSetWriterMessageDataType;
-
-    /* Encode fields as RAW-Encoded */
-    dataSetWriterConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
+    uadpDataSetWriterMessageDataType.dataSetMessageContentMask =
+        UA_UADPDATASETMESSAGECONTENTMASK_SEQUENCENUMBER;
+    UA_ExtensionObject_setValue(&dataSetWriterConfig.messageSettings,
+                                &uadpDataSetWriterMessageDataType,
+                                &UA_TYPES[UA_TYPES_UADPDATASETWRITERMESSAGEDATATYPE]);
 
-    UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent);
+    UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
+                               &dataSetWriterConfig, &dataSetWriterIdent);
 
-#if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    /* Add one DataSetField with static value source to PDS */
-    UA_DataValue *staticValueSource = UA_DataValue_new();
-    UA_DataSetFieldConfig dsfConfig;
-    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++) {
-        memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
-        /* Create Variant and configure as DataSetField source */
-        valueStore[i] = (UA_UInt32) i * 1000;
-        UA_Variant_setScalar(&staticValueSource->value, &valueStore[i],
-                             &UA_TYPES[UA_TYPES_UINT32]);
-        dsfConfig.field.variable.rtValueSource.rtFieldSourceEnabled = UA_TRUE;
-        dsfConfig.field.variable.rtValueSource.staticValueSource = &staticValueSource;
-        UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent);
-    }
-#endif
-#if defined PUBSUB_CONFIG_FASTPATH_NONE
-    UA_DataSetFieldConfig dsfConfig;
-    memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
-    for(size_t i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++){
-        UA_VariableAttributes attributes = UA_VariableAttributes_default;
-        UA_Variant value;
-        UA_Variant_init(&value);
-        UA_UInt32 intValue = (UA_UInt32) i * 1000;
-        UA_Variant_setScalar(&value, &intValue, &UA_TYPES[UA_TYPES_UINT32]);
-        attributes.value = value;
-        if(UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1,  1000 + (UA_UInt32) i),
-                UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
-                UA_QUALIFIEDNAME(1, "variable"), UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
-                 attributes, NULL, NULL) != UA_STATUSCODE_GOOD){
-            UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Failed to add Publish-Node to the server. Node number: %zu", i);
-            continue;
-        }
-        dsfConfig.field.variable.publishParameters.publishedVariable = UA_NODEID_NUMERIC(1, 1000 + (UA_UInt32) i);
-        dsfConfig.field.variable.publishParameters.attributeId = UA_ATTRIBUTEID_VALUE;
-        UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dataSetFieldIdent);
-    }
-#endif
-
-    /* The PubSub configuration is currently editable and the publish callback is not running */
-    writerGroupConfig.publishingInterval = PUBSUB_CONFIG_PUBLISH_CYCLE_MS;
-    UA_Server_updateWriterGroupConfig(server, writerGroupIdent, &writerGroupConfig);
-
-    /* Freeze the PubSub configuration (and start implicitly the publish callback) */
+    /* Freeze the PubSub configuration and enable */
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
 
+    /* Add a callback that updates the value */
     UA_UInt64 callbackId;
-    UA_Server_addRepeatedCallback(server, valueUpdateCallback, NULL, PUBSUB_CONFIG_PUBLISH_CYCLE_MS, &callbackId);
+    UA_Server_addRepeatedCallback(server, valueUpdateCallback, NULL,
+                                  PUBSUB_CONFIG_PUBLISH_CYCLE_MS, &callbackId);
 
     UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
+    pubSubELRunning = false;
+    pthread_join(pubSubELThread, NULL);
+
+    pubSubEL->stop(pubSubEL);
+    while(pubSubEL->state != UA_EVENTLOOPSTATE_STOPPED)
+        pubSubEL->run(pubSubEL, 0);
+    pubSubEL->free(pubSubEL);
+
     UA_Server_delete(server);
 
-    /* Remove the source after deleting the server.
-     * It might be accessed during shutdown. */
-#if defined PUBSUB_CONFIG_FASTPATH_FIXED_OFFSETS || defined PUBSUB_CONFIG_FASTPATH_STATIC_VALUES
-    UA_DataValue_init(staticValueSource);
-    UA_DataValue_delete(staticValueSource);
-#endif
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }

From 6bae4af47adb3271433287cb5631180bfd7f8f89 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 10 Jun 2024 21:24:54 +0200
Subject: [PATCH 1551/1963] refactor(examples): Clean up
 server_pubsub_subscriber_rt_level.c

---
 .../server_pubsub_subscriber_rt_level.c       | 182 ++++++++----------
 1 file changed, 75 insertions(+), 107 deletions(-)

diff --git a/examples/pubsub_realtime/server_pubsub_subscriber_rt_level.c b/examples/pubsub_realtime/server_pubsub_subscriber_rt_level.c
index 487193d5434..75595267762 100644
--- a/examples/pubsub_realtime/server_pubsub_subscriber_rt_level.c
+++ b/examples/pubsub_realtime/server_pubsub_subscriber_rt_level.c
@@ -5,25 +5,26 @@
 #include <open62541/server.h>
 #include <open62541/server_pubsub.h>
 #include <open62541/server_config_default.h>
+#include <open62541/types.h>
 #include <open62541/types_generated.h>
 
 #include <stdio.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <assert.h>
 
 #define PUBSUB_CONFIG_FIELD_COUNT 10
 
 /**
- * The main target of this example is to reduce the time spread and effort during the subscribe cycle.
- * This RT level example is based on buffered DataSetMessages and NetworkMessages. Since changes in the
- * PubSub-configuration will invalidate the buffered frames, the PubSub configuration
- * must be frozen after the configuration phase.
+ * The main target of this example is to reduce the time spread and effort
+ * during the subscribe cycle. This RT level example is based on buffered
+ * DataSetMessages and NetworkMessages. Since changes in the
+ * PubSub-configuration will invalidate the buffered frames, the PubSub
+ * configuration must be frozen after the configuration phase.
  *
- * After the PubSub-configuration freeze, the NetworkMessages and DataSetMessages
- * will be calculated and buffered. During the subscribe cycle, decoding will happen only to the necessary offsets and
- * the buffered NetworkMessage will only be updated. Support only for one DSM.
- * PUBSUB_CONFIG_FASTPATH_STATIC_VALUES -> TODO
+ * After the PubSub-configuration freeze, the NetworkMessages and
+ * DataSetMessages will be calculated and buffered. During the subscribe cycle,
+ * decoding will happen only to the necessary offsets and the buffered
+ * NetworkMessage will only be updated.
  */
 
 UA_NodeId connectionIdentifier;
@@ -32,12 +33,10 @@ UA_NodeId readerIdentifier;
 
 UA_DataSetReaderConfig readerConfig;
 
-UA_UInt32    *repeatedFieldValues[PUBSUB_CONFIG_FIELD_COUNT];
+/* Simulate a custom data sink (e.g. shared memory) */
+UA_UInt32     repeatedFieldValues[PUBSUB_CONFIG_FIELD_COUNT];
 UA_DataValue *repeatedDataValueRT[PUBSUB_CONFIG_FIELD_COUNT];
 
-static UA_UInt32 sSubscribedDataSink[PUBSUB_CONFIG_FIELD_COUNT];    /* simulate a custom data sink (e.g. shared memory) */
-static UA_UInt32 sSubscribedTargetVarDataOffset[PUBSUB_CONFIG_FIELD_COUNT];
-
 /* If the external data source is written over the information model, the
  * externalDataWriteCallback will be triggered. The user has to take care and assure
  * that the write leads not to synchronization issues and race conditions. */
@@ -60,21 +59,19 @@ externalDataReadNotificationCallback(UA_Server *server, const UA_NodeId *session
 }
 
 static void
-subscribeAfterWriteCallback(
-   UA_Server *server,
-   const UA_NodeId *dataSetReaderId,
-   const UA_NodeId *readerGroupId,
-   const UA_NodeId *targetVariableId,
-   void *targetVariableContext,
-   UA_DataValue **externalDataValue) {    // received value has already been copied to param externalDataValue
-
+subscribeAfterWriteCallback(UA_Server *server, const UA_NodeId *dataSetReaderId,
+                            const UA_NodeId *readerGroupId,
+                            const UA_NodeId *targetVariableId,
+                            void *targetVariableContext,
+                            UA_DataValue **externalDataValue) {
     (void) server;
     (void) dataSetReaderId;
     (void) readerGroupId;
+    (void) targetVariableContext;
 
     assert(targetVariableId != 0);
-    assert(targetVariableContext != 0);
     assert(externalDataValue != 0);
+
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(targetVariableId, &strId);
@@ -84,50 +81,33 @@ subscribeAfterWriteCallback(
     UA_String_clear(&strId);
 }
 
-/* callback gets triggered before subscriber has received data
-    received data hasn't been copied/handled yet */
+/* Callback gets triggered before subscriber has received data received data
+ * hasn't been copied/handled yet */
 static void
-subscribeBeforeWriteCallback(
-    UA_Server *server,
-    const UA_NodeId *dataSetReaderId,
-    const UA_NodeId *readerGroupId,
-    const UA_NodeId *targetVariableId,
-    void *targetVariableContext,  /* custom target variable context (e.g. shared mem handle, offset) */
-    UA_DataValue **externalDataValue) { /* received value */
-
+subscribeBeforeWriteCallback(UA_Server *server, const UA_NodeId *dataSetReaderId,
+                             const UA_NodeId *readerGroupId, const UA_NodeId *targetVariableId,
+                             void *targetVariableContext, UA_DataValue **externalDataValue) {
     (void) server;
     (void) dataSetReaderId;
     (void) readerGroupId;
+    (void) targetVariableContext;
 
     assert(targetVariableId != 0);
-    assert(targetVariableContext != 0);
     assert(externalDataValue != 0);
-    void *data = (**externalDataValue).value.data;
-    UA_UInt32 dataSize = (**externalDataValue).value.type->memSize;
-    assert(data != 0);
-    assert(dataSize == sizeof(UA_UInt32)); /* in this simple example all dataset fields are of type UInt32 */
 
     UA_String strId;
     UA_String_init(&strId);
     UA_NodeId_print(targetVariableId, &strId);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "subscribeBeforeWriteCallback(): "
-        "WriteUpdate() for node Id = '%.*s'. New Value Data = %u", (UA_Int32) strId.length, strId.data,
-        *(UA_UInt32*) data);
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
+                "subscribeBeforeWriteCallback(): "
+                "WriteUpdate() for node Id = '%.*s'",
+                (UA_Int32) strId.length, strId.data);
     UA_String_clear(&strId);
-
-    /* We can prepare custom data sink before data is copied
-        meta information is available at targetVariableContext
-        data sink could be a shared memory or any other custom implementation which represents variables of the engineering system
-        in this example we simulate a custom data sink */
-    UA_UInt32 offset = *((UA_UInt32*) targetVariableContext);
-    assert(offset < PUBSUB_CONFIG_FIELD_COUNT);
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "subscribeBeforeWriteCallback(): "
-        "offset = %u", offset);
-    memcpy(sSubscribedDataSink + offset, data, dataSize);
 }
 
 /* Define MetaData for TargetVariables */
-static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
+static void
+fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
     if(pMetaData == NULL)
         return;
 
@@ -187,7 +167,7 @@ addReaderGroup(UA_Server *server) {
     UA_ReaderGroupConfig readerGroupConfig;
     memset (&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
     readerGroupConfig.name = UA_STRING("ReaderGroup1");
-    readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    readerGroupConfig.rtLevel = UA_PUBSUB_RT_DETERMINISTIC;
     retval |= UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
                                        &readerGroupIdentifier);
     return retval;
@@ -211,8 +191,7 @@ addSubscribedVariables (UA_Server *server) {
         oAttr.displayName.text = folderName;
         folderBrowseName.namespaceIndex = 1;
         folderBrowseName.name = folderName;
-    }
-    else {
+    } else {
         oAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed Variables");
         folderBrowseName = UA_QUALIFIEDNAME (1, "Subscribed Variables");
     }
@@ -226,32 +205,35 @@ addSubscribedVariables (UA_Server *server) {
     /* Set the subscribed data to TargetVariable type */
     readerConfig.subscribedDataSetType = UA_PUBSUB_SDS_TARGET;
     /* Create the TargetVariables with respect to DataSetMetaData fields */
-    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize = readerConfig.dataSetMetaData.fieldsSize;
-    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables = (UA_FieldTargetVariable *)
-            UA_calloc(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize, sizeof(UA_FieldTargetVariable));
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize =
+        readerConfig.dataSetMetaData.fieldsSize;
+    readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables =
+        (UA_FieldTargetVariable *)UA_calloc(
+            readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize,
+            sizeof(UA_FieldTargetVariable));
     for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++) {
         /* Variable to subscribe data */
         UA_VariableAttributes vAttr = UA_VariableAttributes_default;
         vAttr.description = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
         vAttr.displayName = UA_LOCALIZEDTEXT ("en-US", "Subscribed UInt32");
         vAttr.dataType    = UA_TYPES[UA_TYPES_UINT32].typeId;
-        // Initialize the values at first to create the buffered NetworkMessage with correct size and offsets
+        // Initialize the values at first to create the buffered NetworkMessage
+        // with correct size and offsets
         UA_Variant value;
         UA_Variant_init(&value);
         UA_UInt32 intValue = 0;
         UA_Variant_setScalar(&value, &intValue, &UA_TYPES[UA_TYPES_UINT32]);
         vAttr.value = value;
         retval |= UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, (UA_UInt32)i + 50000),
-                                           folderId,
-                                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
+                                           folderId, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                                            UA_QUALIFIEDNAME(1, "Subscribed UInt32"),
                                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
                                            vAttr, NULL, &newnodeId);
-        repeatedFieldValues[i] = UA_UInt32_new();
-        *repeatedFieldValues[i] = 0;
+        repeatedFieldValues[i] = 0;
         repeatedDataValueRT[i] = UA_DataValue_new();
-        UA_Variant_setScalar(&repeatedDataValueRT[i]->value, repeatedFieldValues[i],
+        UA_Variant_setScalar(&repeatedDataValueRT[i]->value, &repeatedFieldValues[i],
                              &UA_TYPES[UA_TYPES_UINT32]);
+        repeatedDataValueRT[i]->value.storageType = UA_VARIANT_DATA_NODELETE;
         repeatedDataValueRT[i]->hasValue = true;
 
         /* Set the value backend of the above create node to 'external value source' */
@@ -262,17 +244,18 @@ addSubscribedVariables (UA_Server *server) {
         valueBackend.backend.external.callback.notificationRead = externalDataReadNotificationCallback;
         UA_Server_setVariableNode_valueBackend(server, newnodeId, valueBackend);
 
+        UA_FieldTargetVariable *tv =
+            &readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
+        UA_FieldTargetDataType *ftdt = &tv->targetVariable;
+
         /* For creating Targetvariables */
-        UA_FieldTargetDataType_init(&readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariable);
-        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
-        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariable.targetNodeId = newnodeId;
+        UA_FieldTargetDataType_init(ftdt);
+        ftdt->attributeId  = UA_ATTRIBUTEID_VALUE;
+        ftdt->targetNodeId = newnodeId;
         /* set both before and after write callback to show the usage */
-        /* configure before write callback */
-        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].beforeWrite = subscribeBeforeWriteCallback;
-        sSubscribedTargetVarDataOffset[i] = (UA_UInt32) i;
-        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariableContext = &sSubscribedTargetVarDataOffset[i];
-        /* configure after write callback */
-        readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].afterWrite = subscribeAfterWriteCallback;
+        tv->beforeWrite = subscribeBeforeWriteCallback;
+        tv->externalDataValue = &repeatedDataValueRT[i];
+        tv->afterWrite = subscribeAfterWriteCallback;
     }
 
     return retval;
@@ -284,8 +267,7 @@ addDataSetReader(UA_Server *server) {
     if(server == NULL)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    memset (&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
+    memset(&readerConfig, 0, sizeof(UA_DataSetReaderConfig));
     readerConfig.name = UA_STRING("DataSet Reader 1");
     /* Parameters to filter which DataSetMessage has to be processed
      * by the DataSetReader */
@@ -301,43 +283,38 @@ addDataSetReader(UA_Server *server) {
     readerConfig.expectedEncoding = UA_PUBSUB_RT_RAW;
     readerConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPDATASETREADERMESSAGEDATATYPE];
     UA_UadpDataSetReaderMessageDataType *dataSetReaderMessage = UA_UadpDataSetReaderMessageDataType_new();
-    dataSetReaderMessage->networkMessageContentMask           = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
-                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
-                                                                 (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_SEQUENCENUMBER |
-                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
-                                                                 (UA_UadpNetworkMessageContentMask)UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
-    dataSetReaderMessage->dataSetMessageContentMask           = (UA_UadpDataSetMessageContentMask)(UA_UADPDATASETMESSAGECONTENTMASK_SEQUENCENUMBER);
+    dataSetReaderMessage->networkMessageContentMask = (UA_UadpNetworkMessageContentMask)
+        (UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID | UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+         UA_UADPNETWORKMESSAGECONTENTMASK_SEQUENCENUMBER | UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |
+         UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    dataSetReaderMessage->dataSetMessageContentMask = UA_UADPDATASETMESSAGECONTENTMASK_SEQUENCENUMBER;
     readerConfig.messageSettings.content.decoded.data = dataSetReaderMessage;
 
     readerConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
 
     /* Setting up Meta data configuration in DataSetReader */
     fillTestDataSetMetaData(&readerConfig.dataSetMetaData);
-    retval |= addSubscribedVariables(server);
 
-    retval |= UA_Server_addDataSetReader(server, readerGroupIdentifier, &readerConfig,
-                                         &readerIdentifier);
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    retval |= addSubscribedVariables(server);
+    retval |= UA_Server_addDataSetReader(server, readerGroupIdentifier,
+                                         &readerConfig, &readerIdentifier);
 
-    for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++)
-        UA_FieldTargetDataType_clear(&readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariable);
+    for(size_t i = 0; i < readerConfig.dataSetMetaData.fieldsSize; i++) {
+        UA_FieldTargetVariable *tv =
+            &readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
+        UA_FieldTargetDataType *ftdt = &tv->targetVariable;
+        UA_FieldTargetDataType_clear(ftdt);
+    }
 
     UA_free(readerConfig.subscribedDataSet.subscribedDataSetTarget.targetVariables);
     UA_free(readerConfig.dataSetMetaData.fields);
-
     UA_UadpDataSetReaderMessageDataType_delete(dataSetReaderMessage);
     return retval;
 }
 
-UA_Boolean running = true;
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
 static int
 run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl) {
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
     /* Return value initialized to Status Good */
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_Server *server = UA_Server_new();
@@ -364,31 +341,24 @@ run(UA_String *transportProfile, UA_NetworkAddressUrlDataType *networkAddressUrl
     UA_Server_freezeReaderGroupConfiguration(server, readerGroupIdentifier);
     UA_Server_setReaderGroupOperational(server, readerGroupIdentifier);
 
-    retval = UA_Server_run(server, &running);
+    retval = UA_Server_runUntilInterrupt(server);
 
     UA_Server_unfreezeReaderGroupConfiguration(server, readerGroupIdentifier);
     UA_Server_delete(server);
 
-    for (UA_Int32 iterator = 0; iterator <  PUBSUB_CONFIG_FIELD_COUNT; iterator++)
-    {
-        UA_free(repeatedFieldValues[iterator]);
-        UA_free(repeatedDataValueRT[iterator]);
+    for(UA_Int32 i = 0; i < PUBSUB_CONFIG_FIELD_COUNT; i++) {
+        UA_DataValue_delete(repeatedDataValueRT[i]);
     }
 
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
-static void
-usage(char *progname) {
-    printf("usage: %s <uri> [device]\n", progname);
-}
-
 int main(int argc, char **argv) {
     UA_String transportProfile = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
     if(argc > 1) {
         if(strcmp(argv[1], "-h") == 0) {
-            usage(argv[0]);
+            printf("usage: %s <uri> [device]\n", argv[0]);
             return EXIT_SUCCESS;
         } else if(strncmp(argv[1], "opc.udp://", 10) == 0) {
             networkAddressUrl.url = UA_STRING(argv[1]);
@@ -399,7 +369,6 @@ int main(int argc, char **argv) {
                 printf("Error: UADP/ETH needs an interface name\n");
                 return EXIT_FAILURE;
             }
-
             networkAddressUrl.networkInterface = UA_STRING(argv[2]);
             networkAddressUrl.url = UA_STRING(argv[1]);
         } else {
@@ -410,4 +379,3 @@ int main(int argc, char **argv) {
 
     return run(&transportProfile, &networkAddressUrl);
 }
-

From 7a6cc8ad991ec81d597bbb3a5bd5c2dcbc73ffe3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 12 Jun 2024 04:00:06 +0200
Subject: [PATCH 1552/1963] refactor(examples): Clean up
 server_pubsub_rt_field_information_model.c

---
 ...server_pubsub_rt_field_information_model.c | 146 +++++++-----------
 1 file changed, 59 insertions(+), 87 deletions(-)

diff --git a/examples/pubsub_realtime/server_pubsub_rt_field_information_model.c b/examples/pubsub_realtime/server_pubsub_rt_field_information_model.c
index 03855ee44f3..2c07abd8ac2 100644
--- a/examples/pubsub_realtime/server_pubsub_rt_field_information_model.c
+++ b/examples/pubsub_realtime/server_pubsub_rt_field_information_model.c
@@ -7,49 +7,19 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server_config_default.h>
 
-#include <signal.h>
 #include <stdlib.h>
 
-UA_Boolean running = true;
 UA_NodeId publishedDataSetIdent, dataSetFieldIdent, writerGroupIdent, connectionIdentifier;
 UA_UInt32 *integerRTValue, *integerRTValue2;
 UA_NodeId rtNodeId1, rtNodeId2;
 
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
-// Info: It is still possible to create a RT-PubSub configuration without an information model
-// node. Just set the DSF flags to 'rtInformationModelNode' -> UA_TRUE and
-// 'rtInformationModelNode' -> UA_FALSE and provide the PTR to your self managed value source.
-
-/* The following PubSub configuration does not differ from the 'normal' configuration */
-static void
-addMinimalPubSubConfiguration(UA_Server * server){
-    /* Add one PubSubConnection */
-    UA_PubSubConnectionConfig connectionConfig;
-    memset(&connectionConfig, 0, sizeof(connectionConfig));
-    connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
-    connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    connectionConfig.enabled = UA_TRUE;
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
-    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
-    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
-    connectionConfig.publisherId.uint16 = 2234;
-    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
-    /* Add one PublishedDataSet */
-    UA_PublishedDataSetConfig publishedDataSetConfig;
-    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
-    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
-    publishedDataSetConfig.name = UA_STRING("Demo PDS");
-    /* Add one DataSetField to the PDS */
-    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent);
-}
+/* Info: It is still possible to create a RT-PubSub configuration without an
+ * information model node. Just set the DSF flags to 'rtInformationModelNode' ->
+ * true and 'rtInformationModelNode' -> false and provide the PTR to your self
+ * managed value source. */
 
 static UA_NodeId
 addVariable(UA_Server *server, char *name) {
-    UA_NodeId outNodeId;
     /* Define the attribute of the myInteger variable node */
     UA_VariableAttributes attr = UA_VariableAttributes_default;
     UA_UInt32 myInteger = 42;
@@ -60,12 +30,13 @@ addVariable(UA_Server *server, char *name) {
     attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
 
     /* Add the variable node to the information model */
+    UA_NodeId outNodeId;
     UA_QualifiedName myIntegerName = UA_QUALIFIEDNAME(1, name);
     UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
     UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
-    UA_Server_addVariableNode(server, UA_NODEID_NULL, parentNodeId,
-                              parentReferenceNodeId, myIntegerName,
-                              UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE), attr, NULL, &outNodeId);
+    UA_Server_addVariableNode(server, UA_NODEID_NULL, parentNodeId, parentReferenceNodeId,
+                              myIntegerName, UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                              attr, NULL, &outNodeId);
     return outNodeId;
 }
 
@@ -74,13 +45,11 @@ addVariable(UA_Server *server, char *name) {
  * that the write leads not to synchronization issues and race conditions. */
 static UA_StatusCode
 externalDataWriteCallback(UA_Server *server, const UA_NodeId *sessionId,
-                                  void *sessionContext, const UA_NodeId *nodeId,
-                                  void *nodeContext, const UA_NumericRange *range,
-                                  const UA_DataValue *data){
-    //It's possible to create a new DataValue here and use an atomic ptr switch
-    //to update the value without the need for locks e.g. UA_atomic_cmpxchg();
-
-    //!!The user must take about synchronization.!!
+                          void *sessionContext, const UA_NodeId *nodeId,
+                          void *nodeContext, const UA_NumericRange *range,
+                          const UA_DataValue *data) {
+    /* It's possible to create a new DataValue here and use an atomic ptr switch
+     * to update the value without the need for locks e.g. UA_atomic_cmpxchg(); */
     if(UA_NodeId_equal(nodeId, &rtNodeId1)){
         memcpy(integerRTValue, data->value.data, sizeof(UA_UInt32));
     } else if(UA_NodeId_equal(nodeId, &rtNodeId2)){
@@ -89,14 +58,6 @@ externalDataWriteCallback(UA_Server *server, const UA_NodeId *sessionId,
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode
-externalDataReadNotificationCallback(UA_Server *server, const UA_NodeId *sessionId,
-                                     void *sessionContext, const UA_NodeId *nodeid,
-                                     void *nodeContext, const UA_NumericRange *range){
-    //allow read without any preparation
-    return UA_STATUSCODE_GOOD;
-}
-
 static void
 cyclicValueUpdateCallback_UpdateToMemory(UA_Server *server, void *data) {
     *integerRTValue = (*integerRTValue)+1;
@@ -117,16 +78,33 @@ cyclicValueUpdateCallback_UpdateToStack(UA_Server *server, void *data) {
 }
 
 int main(void){
-    signal(SIGINT, stopHandler);
-    signal(SIGTERM, stopHandler);
-
     UA_Server *server = UA_Server_new();
-    UA_ServerConfig *config = UA_Server_getConfig(server);
-    UA_ServerConfig_setDefault(config);
 
-    addMinimalPubSubConfiguration(server);
+    /* Add one PubSubConnection */
+    UA_PubSubConnectionConfig connectionConfig;
+    memset(&connectionConfig, 0, sizeof(connectionConfig));
+    connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
+    connectionConfig.transportProfileUri =
+        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
+    connectionConfig.enabled = UA_TRUE;
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+    connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
+    connectionConfig.publisherId.uint16 = 2234;
+    UA_Server_addPubSubConnection(server, &connectionConfig, &connectionIdentifier);
+
+    /* Add one PublishedDataSet */
+    UA_PublishedDataSetConfig publishedDataSetConfig;
+    memset(&publishedDataSetConfig, 0, sizeof(UA_PublishedDataSetConfig));
+    publishedDataSetConfig.publishedDataSetType = UA_PUBSUB_DATASET_PUBLISHEDITEMS;
+    publishedDataSetConfig.name = UA_STRING("Demo PDS");
 
-    /*add rt configuration*/
+    /* Add one DataSetField to the PDS */
+    UA_Server_addPublishedDataSet(server, &publishedDataSetConfig, &publishedDataSetIdent);
+
+    /* Add RT configuration */
     UA_WriterGroupConfig writerGroupConfig;
     memset(&writerGroupConfig, 0, sizeof(UA_WriterGroupConfig));
     writerGroupConfig.name = UA_STRING("Demo WriterGroup");
@@ -134,14 +112,13 @@ int main(void){
     writerGroupConfig.enabled = UA_FALSE;
     writerGroupConfig.writerGroupId = 100;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
-    writerGroupConfig.messageSettings.encoding             = UA_EXTENSIONOBJECT_DECODED;
-    writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
     UA_UadpWriterGroupMessageDataType writerGroupMessage;
     UA_UadpWriterGroupMessageDataType_init(&writerGroupMessage);
-    writerGroupMessage.networkMessageContentMask = (UA_UadpNetworkMessageContentMask) ((UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
-                                                                                       (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
-                                                                                       (UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID |(UA_UadpNetworkMessageContentMask) UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
-    writerGroupConfig.messageSettings.content.decoded.data = &writerGroupMessage;
+    writerGroupMessage.networkMessageContentMask = (UA_UadpNetworkMessageContentMask)
+        (UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID | UA_UADPNETWORKMESSAGECONTENTMASK_GROUPHEADER |
+         UA_UADPNETWORKMESSAGECONTENTMASK_WRITERGROUPID | UA_UADPNETWORKMESSAGECONTENTMASK_PAYLOADHEADER);
+    UA_ExtensionObject_setValue(&writerGroupConfig.messageSettings, &writerGroupMessage,
+                                &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE]);
     writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
     UA_Server_addWriterGroup(server, connectionIdentifier, &writerGroupConfig, &writerGroupIdent);
 
@@ -154,49 +131,46 @@ int main(void){
     dataSetWriterConfig.keyFrameCount = 10;
     /* Encode fields as RAW-Encoded */
     dataSetWriterConfig.dataSetFieldContentMask = UA_DATASETFIELDCONTENTMASK_RAWDATA;
-    UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent, &dataSetWriterConfig, &dataSetWriterIdent);
+    UA_Server_addDataSetWriter(server, writerGroupIdent, publishedDataSetIdent,
+                               &dataSetWriterConfig, &dataSetWriterIdent);
 
-    /* add new node to the information model with external data source backend*/
+    /* Add new nodes */
     rtNodeId1 = addVariable(server, "RT value source 1");
-    /* create external value source for the node */
+    rtNodeId2 = addVariable(server, "RT value source 2");
+
+    /* Set the value backend to 'external value source' */
     integerRTValue = UA_UInt32_new();
     UA_DataValue *dataValueRT = UA_DataValue_new();
     dataValueRT->hasValue = UA_TRUE;
     UA_Variant_setScalar(&dataValueRT->value, integerRTValue, &UA_TYPES[UA_TYPES_UINT32]);
-    /* Set the value backend of the above create node to 'external value source' */
     UA_ValueBackend valueBackend;
     valueBackend.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
     valueBackend.backend.external.value = &dataValueRT;
     valueBackend.backend.external.callback.userWrite = externalDataWriteCallback;
-    valueBackend.backend.external.callback.notificationRead = externalDataReadNotificationCallback;
     UA_Server_setVariableNode_valueBackend(server, rtNodeId1, valueBackend);
 
-    /* setup RT DataSetField config */
+    /* Setup RT DataSetField config */
+    UA_NodeId dsfNodeId;
     UA_DataSetFieldConfig dsfConfig;
     memset(&dsfConfig, 0, sizeof(UA_DataSetFieldConfig));
     dsfConfig.field.variable.rtValueSource.rtInformationModelNode = UA_TRUE;
     dsfConfig.field.variable.publishParameters.publishedVariable = rtNodeId1;
     dsfConfig.field.variable.fieldNameAlias = UA_STRING("Field 1");
-    UA_NodeId dsfNodeId;
     UA_Server_addDataSetField(server, publishedDataSetIdent, &dsfConfig, &dsfNodeId);
 
-    /* add second new node to the information model with external data source backend*/
-    rtNodeId2 = addVariable(server, "RT value source 2");
-    /* create external value source for the node */
+    /* Set the value backend of the above create node to 'external value source' */
     integerRTValue2 = UA_UInt32_new();
     *integerRTValue2 = 1000;
     UA_DataValue *dataValue2RT = UA_DataValue_new();
-    dataValue2RT->hasValue = UA_TRUE;
+    dataValue2RT->hasValue = true;
     UA_Variant_setScalar(&dataValue2RT->value, integerRTValue2, &UA_TYPES[UA_TYPES_UINT32]);
-    /* Set the value backend of the above create node to 'external value source' */
     UA_ValueBackend valueBackend2;
     valueBackend2.backendType = UA_VALUEBACKENDTYPE_EXTERNAL;
     valueBackend2.backend.external.value = &dataValue2RT;
     valueBackend2.backend.external.callback.userWrite = externalDataWriteCallback;
-    valueBackend2.backend.external.callback.notificationRead = externalDataReadNotificationCallback;
     UA_Server_setVariableNode_valueBackend(server, rtNodeId2, valueBackend2);
 
-    /* setup second DataSetField config */
+    /* Setup second DataSetField config */
     UA_DataSetFieldConfig dsfConfig2;
     memset(&dsfConfig2, 0, sizeof(UA_DataSetFieldConfig));
     dsfConfig2.field.variable.rtValueSource.rtInformationModelNode = UA_TRUE;
@@ -208,18 +182,16 @@ int main(void){
     UA_Server_freezeWriterGroupConfiguration(server, writerGroupIdent);
     UA_Server_setWriterGroupOperational(server, writerGroupIdent);
 
-    UA_Server_addRepeatedCallback(server, cyclicValueUpdateCallback_UpdateToMemory, NULL,
-                                  1000, NULL);
+    UA_Server_addRepeatedCallback(server, cyclicValueUpdateCallback_UpdateToMemory,
+                                  NULL, 1000, NULL);
 
-    UA_Server_addRepeatedCallback(server, cyclicValueUpdateCallback_UpdateToStack, NULL,
-                                  5000, NULL);
+    UA_Server_addRepeatedCallback(server, cyclicValueUpdateCallback_UpdateToStack,
+                                  NULL, 5000, NULL);
 
-    UA_StatusCode retval = UA_Server_run(server, &running);
-    UA_Server_delete(server);
+    UA_StatusCode retval = UA_Server_runUntilInterrupt(server);
 
-    /* Free external data source */
+    UA_Server_delete(server);
     UA_DataValue_delete(dataValueRT);
     UA_DataValue_delete(dataValue2RT);
-
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
 }

From 1b0aa2e0db3b0250902d7fa95e990c81d52b5d3a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 6 Jun 2024 15:06:07 +0200
Subject: [PATCH 1553/1963] refactor(pubsub): Improve the documentation of
 UA_PubSubRTLevel

---
 include/open62541/server_pubsub.h | 46 +++++++++++++++++--------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 5cba4a6e89c..6bf35ed2d71 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -458,28 +458,32 @@ typedef enum {
  * The message publishing can be configured for realtime requirements. The RT-levels
  * go along with different requirements. The below listed levels can be configured:
  *
- * UA_PUBSUB_RT_NONE -
- * ---> Description: Default "none-RT" Mode
- * ---> Requirements: -
- * ---> Restrictions: -
- * UA_PUBSUB_RT_DIRECT_VALUE_ACCESS (Preview - not implemented)
- * ---> Description: Normally, the latest value for each DataSetField is read out of the information model. Within this RT-mode, the
- * value source of each field configured as static pointer to an DataValue. The publish cycle won't use call the server read function.
- * ---> Requirements: All fields must be configured with a 'staticValueSource'.
- * ---> Restrictions: -
- * UA_PUBSUB_RT_FIXED_LENGTH (Preview - not implemented)
- * ---> Description: All DataSetFields have a known, non-changing length. The server will pre-generate some
- * buffers and use only memcopy operations to generate requested PubSub packages.
- * ---> Requirements: DataSetFields with variable size cannot be used within this mode.
- * ---> Restrictions: The configuration must be frozen and changes are not allowed while the WriterGroup is 'Operational'.
- * UA_PUBSUB_RT_DETERMINISTIC (Preview - not implemented)
- * ---> Description: -
- * ---> Requirements: -
- * ---> Restrictions: -
- *
- * WARNING! For hard real time requirements the underlying system must be rt-capable.
+ * UA_PUBSUB_RT_NONE
+ *    No realtime-specific configuration.
  *
- */
+ * UA_PUBSUB_RT_DIRECT_VALUE_ACCESS
+ *    All PublishedDataSets need to point to a variable with a
+ *    ``UA_VALUEBACKENDTYPE_EXTERNAL`` value backend. The value backend gets
+ *    cached when the configuration is frozen. No lookup of the variable from
+ *    the information is performed afterwards. This enables also big data
+ *    structures to be updated atomically with a compare-and-switch operation on
+ *    the ``UA_DataValue`` double-pointer in the backend.
+ *
+ * UA_PUBSUB_RT_FIXED_SIZE
+ *    Validate that the message constains only fields with a known size.
+ *    Then the message fields have fixed offsets that are known ahead of time.
+ *
+ * UA_PUBSUB_RT_DETERMINISTIC
+ *    Both direct-access and fixed-size is being used. The server pre-allocates
+ *    buffers when the configuration is frozen and uses only memcpy operations
+ *    to update the PubSub network messages for sending.
+ *
+ * WARNING! For hard real time requirements the underlying system must be
+ * RT-capable. Also note that each PubSubConnection can have a dedicated
+ * EventLoop. That way normal client/server operations can run independently
+ * from PubSub. The double-pointer in the ``UA_VALUEBACKENDTYPE_EXTERNAL`` value
+ * backend allows avoid race-condition with non-blocking atomic operations. */
+
 typedef enum {
     UA_PUBSUB_RT_NONE = 0,
     UA_PUBSUB_RT_DIRECT_VALUE_ACCESS = 1,

From 8682ac8bad61654dee1e3553cb5366c7ec8d5b72 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 11:36:07 +0200
Subject: [PATCH 1554/1963] refactor(pubsub): Use UA_PUBSUB_RT_DETERMINISTIC as
 the ORed combination of the other options

---
 include/open62541/server_pubsub.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 6bf35ed2d71..615b729da6a 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -488,7 +488,7 @@ typedef enum {
     UA_PUBSUB_RT_NONE = 0,
     UA_PUBSUB_RT_DIRECT_VALUE_ACCESS = 1,
     UA_PUBSUB_RT_FIXED_SIZE = 2,
-    UA_PUBSUB_RT_DETERMINISTIC = 4,
+    UA_PUBSUB_RT_DETERMINISTIC = 3,
 } UA_PubSubRTLevel;
 
 typedef struct {

From f9fe2879160f9b422a49f53d82b9f59c57930f2f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 6 Jun 2024 18:44:39 +0200
Subject: [PATCH 1555/1963] feat(pubsub): Don't require the server-lock for
 RT-publishing when the configuration is frozen

---
 src/pubsub/ua_pubsub_writergroup.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index a4b5fbc14f1..54c5fc09efe 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -1181,7 +1181,7 @@ sendNetworkMessageBinary(UA_Server *server, UA_PubSubConnection *connection, UA_
 
 static void
 publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *connection) {
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    UA_assert(writerGroup->configurationFrozen);
 
     UA_StatusCode res =
         UA_NetworkMessage_updateBufferedMessage(&writerGroup->bufferedMessage);
@@ -1281,21 +1281,14 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     UA_assert(writerGroup != NULL);
     UA_assert(server != NULL);
 
-    UA_LOCK(&server->serviceMutex);
-
     UA_LOG_DEBUG_WRITERGROUP(server->config.logging, writerGroup, "Publish Callback");
 
-    /* Nothing to do? */
-    if(writerGroup->writersCount == 0) {
-        UA_UNLOCK(&server->serviceMutex);
-        return;
-    }
-
     /* Find the connection associated with the writer */
     UA_PubSubConnection *connection = writerGroup->linkedConnection;
     if(!connection) {
         UA_LOG_ERROR_WRITERGROUP(server->config.logging, writerGroup,
                                  "Publish failed. PubSubConnection invalid");
+        UA_LOCK(&server->serviceMutex);
         UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_ERROR,
                                       UA_STATUSCODE_BADNOTCONNECTED);
         UA_UNLOCK(&server->serviceMutex);
@@ -1305,6 +1298,13 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     /* Realtime path - update the buffer message and send directly */
     if(writerGroup->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
         publishRT(server, writerGroup, connection);
+        return;
+    }
+
+    UA_LOCK(&server->serviceMutex);
+
+    /* Nothing to do? */
+    if(writerGroup->writersCount == 0) {
         UA_UNLOCK(&server->serviceMutex);
         return;
     }

From a3818f9727f46bd7e47f00b5444e86aaf4ebb174 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 6 Jun 2024 15:12:12 +0200
Subject: [PATCH 1556/1963] refactor(pubsub): Disentangle cases for the DataSet
 preparation

---
 src/pubsub/ua_pubsub_writer.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index f4ca4a84fdc..95dd4a3cd8f 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -358,18 +358,9 @@ UA_DataSetWriter_unfreezeConfiguration(UA_Server *server,
 UA_StatusCode
 UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
                                 UA_DataSetMessage *dsm) {
-    /* Find the dataset */
+    /* No PublishedDataSet defined -> Heartbeat messages only */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    UA_PublishedDataSet *pds =
-        UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
-    if(!pds) {
-        if(!UA_NodeId_isNull(&dsw->connectedDataSet)) {
-            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
-                                  "PubSub-RT configuration fail: "
-                                  "PublishedDataSet not found");
-            return UA_STATUSCODE_BADINTERNALERROR;
-        }
-
+    if(UA_NodeId_isNull(&dsw->connectedDataSet)) {
         res = UA_DataSetWriter_generateDataSetMessage(server, dsm, dsw);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_WARNING_WRITER(server->config.logging, dsw,
@@ -379,6 +370,16 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
         return res;
     }
 
+    /* Get the PublishedDataSet */
+    UA_PublishedDataSet *pds =
+        UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
+    if(!pds) {
+        UA_LOG_WARNING_WRITER(server->config.logging, dsw,
+                              "PubSub-RT configuration fail: "
+                              "PublishedDataSet not found");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     if(pds->promotedFieldsCount > 0) {
         UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                               "PubSub-RT configuration fail: "

From f1f0a18fe7ce455793df0b4a5c3e123d5ca99379 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 11:43:12 +0200
Subject: [PATCH 1557/1963] refactor(pubsub): Memset-zero the offset table
 fields to initialize

---
 src/pubsub/ua_pubsub_networkmessage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 5ea8c9a47f0..2d154243cf7 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -874,7 +874,7 @@ increaseOffsetArray(UA_NetworkMessageOffsetBuffer *offsetBuffer) {
     UA_NetworkMessageOffset *tmpOffsets = (UA_NetworkMessageOffset *)
         UA_realloc(offsetBuffer->offsets, sizeof(UA_NetworkMessageOffset) * (offsetBuffer->offsetsSize + (size_t)1));
     UA_CHECK_MEM(tmpOffsets, return false);
-
+    memset(&tmpOffsets[offsetBuffer->offsetsSize], 0, sizeof(UA_NetworkMessageOffset));
     offsetBuffer->offsets = tmpOffsets;
     offsetBuffer->offsetsSize++;
     return true;

From 7e807ac6eca7646a186c8733cdd2944532646b40 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 11:49:40 +0200
Subject: [PATCH 1558/1963] refactor(pubsub): Store the external value source
 in the offset table

---
 src/pubsub/ua_pubsub_networkmessage.c | 11 +++++++++++
 src/pubsub/ua_pubsub_networkmessage.h |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 2d154243cf7..2e2b3ae91e6 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -69,14 +69,25 @@ UA_NetworkMessage_updateBufferedMessage(UA_NetworkMessageOffsetBuffer *buffer) {
             case UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE:
                 rv = UA_DataValue_encodeBinary(&nmo->content.value, &bufPos, bufEnd);
                 break;
+            case UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE_EXTERNAL:
+                rv = UA_DataValue_encodeBinary(*nmo->content.externalValue, &bufPos, bufEnd);
+                break;
             case UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT:
                 rv = UA_Variant_encodeBinary(&nmo->content.value.value, &bufPos, bufEnd);
                 break;
+            case UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT_EXTERNAL:
+                rv = UA_Variant_encodeBinary(&(*nmo->content.externalValue)->value, &bufPos, bufEnd);
+                break;
             case UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW:
                 rv = UA_encodeBinaryInternal(nmo->content.value.value.data,
                                              nmo->content.value.value.type,
                                              &bufPos, &bufEnd, NULL, NULL);
                 break;
+            case UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW_EXTERNAL:
+                rv = UA_encodeBinaryInternal((*nmo->content.externalValue)->value.data,
+                                             (*nmo->content.externalValue)->value.type,
+                                             &bufPos, &bufEnd, NULL, NULL);
+                break;
             default:
                 break; /* The other fields are assumed to not change between messages.
                         * Only used for RT decoding (not encoding). */
diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 71812613b03..4ca92a63ed2 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -187,8 +187,11 @@ typedef enum {
     UA_PUBSUB_OFFSETTYPE_TIMESTAMP,     /* source pointer */
     UA_PUBSUB_OFFSETTYPE_TIMESTAMP_NOW, /* no source */
     UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE,
+    UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE_EXTERNAL,
     UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT,
+    UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT_EXTERNAL,
     UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW,
+    UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW_EXTERNAL,
     /* For subscriber RT */
     UA_PUBSUB_OFFSETTYPE_PUBLISHERID,
     UA_PUBSUB_OFFSETTYPE_WRITERGROUPID,
@@ -200,6 +203,7 @@ typedef struct {
     UA_NetworkMessageOffsetType contentType;
     union {
         UA_UInt16 sequenceNumber;
+        UA_DataValue **externalValue;
         UA_DataValue value;
     } content;
     size_t offset;

From d78eebcff6910ed2b72f1942f52926d4a5d25adb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 13:24:38 +0200
Subject: [PATCH 1559/1963] refactor(pubsub): Update
 UA_DataSetWriter_prepareDataSet to check for fixed length and direct value
 access

---
 src/pubsub/ua_pubsub_writer.c | 64 +++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 95dd4a3cd8f..4e915beb83a 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -380,7 +380,12 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    if(pds->promotedFieldsCount > 0) {
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, dsw->linkedWriterGroup);
+    UA_assert(wg);
+
+    /* Promoted Fields not allowed if RT is enabled */
+    if(wg->config.rtLevel > UA_PUBSUB_RT_NONE &&
+       pds->promotedFieldsCount > 0) {
         UA_LOG_WARNING_WRITER(server->config.logging, dsw,
                               "PubSub-RT configuration fail: "
                               "PDS contains promoted fields");
@@ -392,36 +397,51 @@ UA_DataSetWriter_prepareDataSet(UA_Server *server, UA_DataSetWriter *dsw,
     TAILQ_FOREACH(dsf, &pds->fields, listEntry) {
         UA_NodeId *publishedVariable =
             &dsf->config.field.variable.publishParameters.publishedVariable;
+
+        /* Check that the target is a VariableNode */
         const UA_VariableNode *rtNode = (const UA_VariableNode*)
             UA_NODESTORE_GET(server, publishedVariable);
-        if(rtNode != NULL &&
-           rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
-            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
-                                  "PubSub-RT configuration fail: "
-                                  "PDS contains field without external data source");
+        if(rtNode && rtNode->head.nodeClass != UA_NODECLASS_VARIABLE) {
+            UA_LOG_ERROR_WRITER(server->config.logging, dsw,
+                                "PubSub-RT configuration fail: "
+                                "PDS points to a node that is not a variable");
             UA_NODESTORE_RELEASE(server, (const UA_Node *)rtNode);
             return UA_STATUSCODE_BADNOTSUPPORTED;
         }
-
         UA_NODESTORE_RELEASE(server, (const UA_Node *)rtNode);
 
-        if((UA_NodeId_equal(&dsf->fieldMetaData.dataType,
-                            &UA_TYPES[UA_TYPES_STRING].typeId) ||
-            UA_NodeId_equal(&dsf->fieldMetaData.dataType,
-                            &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
-           dsf->fieldMetaData.maxStringLength == 0) {
-            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
-                                  "PubSub-RT configuration fail: "
-                                  "PDS contains String/ByteString with dynamic length");
-            return UA_STATUSCODE_BADNOTSUPPORTED;
-        } else if(!UA_DataType_isNumeric(UA_findDataType(&dsf->fieldMetaData.dataType)) &&
-                  !UA_NodeId_equal(&dsf->fieldMetaData.dataType,
-                                   &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
-            UA_LOG_WARNING_WRITER(server->config.logging, dsw,
-                                  "PubSub-RT configuration fail: "
-                                  "PDS contains variable with dynamic size");
+        /* TODO: Get the External Value Source from the node instead of from the config */
+
+        /* If direct-value-access is enabled, the pointers need to be set */
+        if(wg->config.rtLevel & UA_PUBSUB_RT_DIRECT_VALUE_ACCESS &&
+           !dsf->config.field.variable.rtValueSource.rtFieldSourceEnabled) {
+            UA_LOG_ERROR_WRITER(server->config.logging, dsw,
+                                "PubSub-RT configuration fail: PDS published-variable "
+                                "does not have an external data source");
             return UA_STATUSCODE_BADNOTSUPPORTED;
         }
+
+        /* Check that the values have a fixed size if fixed offsets are needed */
+        if(wg->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) {
+            if((UA_NodeId_equal(&dsf->fieldMetaData.dataType,
+                                &UA_TYPES[UA_TYPES_STRING].typeId) ||
+                UA_NodeId_equal(&dsf->fieldMetaData.dataType,
+                                &UA_TYPES[UA_TYPES_BYTESTRING].typeId)) &&
+               dsf->fieldMetaData.maxStringLength == 0) {
+                UA_LOG_WARNING_WRITER(server->config.logging, dsw,
+                                      "PubSub-RT configuration fail: "
+                                      "PDS contains String/ByteString with dynamic length");
+                return UA_STATUSCODE_BADNOTSUPPORTED;
+            } else if(!UA_DataType_isNumeric(
+                          UA_findDataType(&dsf->fieldMetaData.dataType)) &&
+                      !UA_NodeId_equal(&dsf->fieldMetaData.dataType,
+                                       &UA_TYPES[UA_TYPES_BOOLEAN].typeId)) {
+                UA_LOG_WARNING_WRITER(server->config.logging, dsw,
+                                      "PubSub-RT configuration fail: "
+                                      "PDS contains variable with dynamic size");
+                return UA_STATUSCODE_BADNOTSUPPORTED;
+            }
+        }
     }
 
     /* Generate the DSM */

From 018177c84940665dbf7dfdc25cd239d21bc2d5d8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 13:26:10 +0200
Subject: [PATCH 1560/1963] refactor(pubsub): Cache the direct value pointer
 for the offset table in UA_WriterGroup_freezeConfiguration

---
 src/pubsub/ua_pubsub_networkmessage.c |   6 --
 src/pubsub/ua_pubsub_writergroup.c    | 100 ++++++++++++++++----------
 2 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 2e2b3ae91e6..ea0765db144 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1614,12 +1614,6 @@ UA_DataSetMessage_calcSizeBinary(UA_DataSetMessage* p,
                     return 0;
                 nmo = &offsetBuffer->offsets[pos];
                 nmo->offset = size;
-                if(p->data.keyFrameData.dataSetFields != NULL) {
-                    nmo->content.value = *v;
-                    nmo->content.value.value.storageType = UA_VARIANT_DATA_NODELETE;
-                } else {
-                   UA_DataValue_init(&nmo->content.value);
-                }
             }
 
             if(p->header.fieldEncoding == UA_FIELDENCODING_VARIANT) {
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 54c5fc09efe..29d35fef6c0 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -308,24 +308,24 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     if(wg->configurationFrozen)
         return UA_STATUSCODE_GOOD;
 
-    /* PubSubConnection freezeCounter++ */
+    /* Increase PubSubConnection freezeCounter */
     UA_PubSubConnection *pubSubConnection =  wg->linkedConnection;
     pubSubConnection->configurationFreezeCounter++;
 
-    /* WriterGroup freeze */
+    /* Freeze the WriterGroup */
     wg->configurationFrozen = true;
 
-    /* DataSetWriter freeze */
+    /* Freeze the DataSetWriter */
     UA_DataSetWriter *dsw;
     LIST_FOREACH(dsw, &wg->writers, listEntry) {
         UA_DataSetWriter_freezeConfiguration(server, dsw);
     }
 
-    /* Enabling RT? */
-    if(wg->config.rtLevel != UA_PUBSUB_RT_FIXED_SIZE)
+    /* Offset table enabled? */
+    if((wg->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) == 0)
         return UA_STATUSCODE_GOOD;
 
-    /* Check if RT is possible */
+    /* Offset table only possible for binary encoding */
     if(wg->config.encodingMimeType != UA_PUBSUB_ENCODING_UADP) {
         UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                    "PubSub-RT configuration fail: Non-RT capable encoding.");
@@ -335,33 +335,27 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     //TODO Clarify: should we only allow = maxEncapsulatedDataSetMessageCount == 1 with RT?
     //TODO Clarify: Behaviour if the finale size is more than MTU
 
-    /* Prepare the DataSetMessages */
+    /* Define variables here for goto */
+    size_t msgSize;
+    UA_ByteString buf;
+    const UA_Byte *bufEnd;
+    UA_Byte *bufPos;
+    UA_NetworkMessage networkMessage;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_STACKARRAY(UA_UInt16, dsWriterIds, wg->writersCount);
     UA_STACKARRAY(UA_DataSetMessage, dsmStore, wg->writersCount);
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
+
+    /* Validate the DataSetWriters and generate their DataSetMessage */
     size_t dsmCount = 0;
     LIST_FOREACH(dsw, &wg->writers, listEntry) {
         dsWriterIds[dsmCount] = dsw->config.dataSetWriterId;
         res = UA_DataSetWriter_prepareDataSet(server, dsw, &dsmStore[dsmCount]);
-        if(res != UA_STATUSCODE_GOOD) {
-            for(size_t i = 0; i < dsmCount; i++) {
-                UA_DataSetMessage_clear(&dsmStore[i]);
-            }
-            return res;
-        }
+        if(res != UA_STATUSCODE_GOOD)
+            goto cleanup_dsm;
         dsmCount++;
     }
 
-    /* Define variables here for goto */
-    size_t msgSize;
-    UA_ByteString buf;
-    UA_NetworkMessage networkMessage;
-    const UA_Byte *bufEnd;
-    UA_Byte *bufPos;
-
-    if(res != UA_STATUSCODE_GOOD)
-        goto cleanup_dsm;
-
+    /* Generate the NetworkMessage */
     memset(&networkMessage, 0, sizeof(networkMessage));
     res = generateNetworkMessage(pubSubConnection, wg, dsmStore, dsWriterIds,
                                  (UA_Byte) dsmCount, &wg->config.messageSettings,
@@ -369,10 +363,10 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup_dsm;
 
-    /* Generate the offset-buffer (done inside calcSizeBinary) */
+    /* Compute the message length and generate the offset-table (done inside
+     * calcSizeBinary) */
     memset(&wg->bufferedMessage, 0, sizeof(UA_NetworkMessageOffsetBuffer));
     msgSize = UA_NetworkMessage_calcSizeBinary(&networkMessage, &wg->bufferedMessage);
-
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     if(wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
         UA_PubSubSecurityPolicy *sp = wg->config.securityPolicy;
@@ -380,6 +374,8 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
                    signatureAlgorithm.getLocalSignatureSize(sp->policyContext);
     }
 #endif
+
+    /* Generate the buffer for the pre-encoded message */
     res = UA_ByteString_allocBuffer(&buf, msgSize);
     if(res != UA_STATUSCODE_GOOD)
         goto cleanup;
@@ -389,12 +385,12 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     bufEnd = &wg->bufferedMessage.buffer.data[wg->bufferedMessage.buffer.length];
     bufPos = wg->bufferedMessage.buffer.data;
 
+    /* Preallocate the encryption buffer */
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     if(wg->config.securityMode > UA_MESSAGESECURITYMODE_NONE) {
         UA_Byte *payloadPosition;
         UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, &payloadPosition);
         wg->bufferedMessage.payloadPosition = payloadPosition;
-
         wg->bufferedMessage.nm = (UA_NetworkMessage *)UA_calloc(1,sizeof(UA_NetworkMessage));
         wg->bufferedMessage.nm->securityHeader = networkMessage.securityHeader;
         UA_ByteString_allocBuffer(&wg->bufferedMessage.encryptBuffer, msgSize);
@@ -404,20 +400,52 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
     if(wg->config.securityMode <= UA_MESSAGESECURITYMODE_NONE)
         UA_NetworkMessage_encodeBinary(&networkMessage, &bufPos, bufEnd, NULL);
 
+    /* Post-processing of the OffsetBuffer to set the external data source from
+     * the DataSetField configuration */
+    if(wg->config.rtLevel & UA_PUBSUB_RT_DIRECT_VALUE_ACCESS) {
+        size_t fieldPos = 0;
+        LIST_FOREACH(dsw, &wg->writers, listEntry) {
+            UA_PublishedDataSet *pds =
+                UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
+            if(!pds)
+                continue;
+
+            /* Loop over all DataSetFields */
+            UA_DataSetField *dsf;
+            TAILQ_FOREACH(dsf, &pds->fields, listEntry) {
+                UA_NetworkMessageOffsetType contentType;
+                /* Move forward to the next payload-type offset field */
+                do {
+                    fieldPos++;
+                    contentType = wg->bufferedMessage.offsets[fieldPos].contentType;
+                } while(contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE &&
+                        contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT &&
+                        contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW);
+                UA_assert(fieldPos < wg->bufferedMessage.offsetsSize);
+
+                if(!dsf->config.field.variable.rtValueSource.rtFieldSourceEnabled)
+                    continue;
+
+                /* Set the external value soure in the offset buffer */
+                UA_DataValue_clear(&wg->bufferedMessage.offsets[fieldPos].content.value);
+                wg->bufferedMessage.offsets[fieldPos].content.externalValue =
+                    dsf->config.field.variable.rtValueSource.staticValueSource;
+
+                /* Update the content type to _EXTERNAL */
+                wg->bufferedMessage.offsets[fieldPos].contentType =
+                    (UA_NetworkMessageOffsetType)(contentType + 1);
+            }
+        }
+    }
+
  cleanup:
     UA_free(networkMessage.payload.dataSetPayload.sizes);
 
-    /* Clean up DSM */
  cleanup_dsm:
-    for(size_t i = 0; i < dsmCount; i++){
-        UA_free(dsmStore[i].data.keyFrameData.dataSetFields);
-#ifdef UA_ENABLE_JSON_ENCODING
-        UA_Array_delete(dsmStore[i].data.keyFrameData.fieldNames,
-                        dsmStore[i].data.keyFrameData.fieldCount,
-                        &UA_TYPES[UA_TYPES_STRING]);
-#endif
+    /* Clean up DataSetMessages */
+    for(size_t i = 0; i < dsmCount; i++) {
+        UA_DataSetMessage_clear(&dsmStore[i]);
     }
-
     return res;
 }
 

From caf7ef2cb041a4dca3e6495a67989f3b13657bef Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 13:29:39 +0200
Subject: [PATCH 1561/1963] refactor(pubsub): Cosmetic improvement in
 ua_pubsub_writergroup.c

---
 src/pubsub/ua_pubsub_writergroup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 29d35fef6c0..3c5e99a1e18 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -667,7 +667,8 @@ UA_Server_WriterGroup_publish(UA_Server *server, const UA_NodeId writerGroupIden
 }
 
 UA_StatusCode
-UA_WriterGroup_lastPublishTimestamp(UA_Server *server, const UA_NodeId writerGroupId, UA_DateTime *timestamp){
+UA_WriterGroup_lastPublishTimestamp(UA_Server *server, const UA_NodeId writerGroupId,
+                                    UA_DateTime *timestamp){
     UA_LOCK(&server->serviceMutex);
     //search WriterGroup ToDo create lookup table for more efficiency
     UA_WriterGroup *writerGroup;

From 6db68f07f539ce1f6a4a315ded2f6f264db5025b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 13:31:08 +0200
Subject: [PATCH 1562/1963] refactor(pubsub): Explicit sampling in the RT
 publish path if direct value access is not configured

---
 src/pubsub/ua_pubsub_writergroup.c | 56 ++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 3c5e99a1e18..80acd552887 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -1209,9 +1209,59 @@ sendNetworkMessageBinary(UA_Server *server, UA_PubSubConnection *connection, UA_
 }
 
 static void
-publishRT(UA_Server *server, UA_WriterGroup *writerGroup, UA_PubSubConnection *connection) {
+sampleOffsetPublishingValues(UA_Server *server, UA_WriterGroup *wg) {
+    UA_LOCK(&server->serviceMutex);
+
+    size_t fieldPos = 0;
+    UA_DataSetWriter *dsw;
+    LIST_FOREACH(dsw, &wg->writers, listEntry) {
+        UA_PublishedDataSet *pds =
+            UA_PublishedDataSet_findPDSbyId(server, dsw->connectedDataSet);
+        if(!pds)
+            continue;
+
+        /* Loop over the fields */
+        UA_DataSetField *dsf;
+        TAILQ_FOREACH(dsf, &pds->fields, listEntry) {
+            /* Get the matching offset table entry */
+            UA_NetworkMessageOffsetType contentType;
+            do {
+                fieldPos++;
+                contentType = wg->bufferedMessage.offsets[fieldPos].contentType;
+            } while(contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE &&
+                    contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE_EXTERNAL &&
+                    contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT &&
+                    contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT_EXTERNAL &&
+                    contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW &&
+                    contentType != UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW_EXTERNAL);
+
+            /* External data source is never sampled, but accessed directly in
+             * the encoding */
+            if(contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_DATAVALUE_EXTERNAL ||
+               contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_VARIANT_EXTERNAL ||
+               contentType == UA_PUBSUB_OFFSETTYPE_PAYLOAD_RAW_EXTERNAL)
+                continue;
+
+            /* Sample the value into the offset table */
+            UA_DataValue *dfv = &wg->bufferedMessage.offsets[fieldPos].content.value;
+            UA_DataValue_clear(dfv);
+            UA_PubSubDataSetField_sampleValue(server, dsf, dfv);
+        }
+    }
+
+    UA_UNLOCK(&server->serviceMutex);
+}
+
+static void
+publishWithOffsets(UA_Server *server, UA_WriterGroup *writerGroup,
+                   UA_PubSubConnection *connection) {
     UA_assert(writerGroup->configurationFrozen);
 
+    /* Fixed size but no direct value access. Sample to get recent values into
+     * the offset buffer structure. */
+    if((writerGroup->config.rtLevel & UA_PUBSUB_RT_DIRECT_VALUE_ACCESS) == 0)
+        sampleOffsetPublishingValues(server, writerGroup);
+
     UA_StatusCode res =
         UA_NetworkMessage_updateBufferedMessage(&writerGroup->bufferedMessage);
 
@@ -1325,8 +1375,8 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     }
 
     /* Realtime path - update the buffer message and send directly */
-    if(writerGroup->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
-        publishRT(server, writerGroup, connection);
+    if(writerGroup->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) {
+        publishWithOffsets(server, writerGroup, connection);
         return;
     }
 

From 42fee7b6ea04eb3381baf968c9291b512102ded6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 13:32:22 +0200
Subject: [PATCH 1563/1963] refactor(pubsub): Use the RT configuration as a
 bit-field

So that UA_PUBSUB_RT_DETERMINISTIC implies the fixed message length and
also direct value access.
---
 src/pubsub/ua_pubsub_eventloop.c   | 6 +++---
 src/pubsub/ua_pubsub_readergroup.c | 2 +-
 src/pubsub/ua_pubsub_writergroup.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 4843e9a3fa9..c8736347165 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -213,7 +213,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         if(rg->state != UA_PUBSUBSTATE_OPERATIONAL &&
            rg->state != UA_PUBSUBSTATE_PREOPERATIONAL)
             continue;
-        if(rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
+        if(rg->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) {
             processed |= UA_ReaderGroup_decodeAndProcessRT(server, rg, &msg);
             continue;
         } 
@@ -245,7 +245,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             if(rg->state != UA_PUBSUBSTATE_OPERATIONAL &&
                rg->state != UA_PUBSUBSTATE_PREOPERATIONAL)
                 continue;
-            if(rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE)
+            if(rg->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE)
                 continue;
             processed |= UA_ReaderGroup_process(server, rg, &nm);
         }
@@ -888,7 +888,7 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 
     /* ReaderGroup with realtime processing */
-    if(rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
+    if(rg->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) {
         UA_ReaderGroup_decodeAndProcessRT(server, rg, &msg);
         UA_UNLOCK(&server->serviceMutex);
         return;
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index d694ea7c444..dfa8de3d042 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -599,7 +599,7 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
     }
 
     /* Not rt, we don't have to adjust anything */
-    if(rg->config.rtLevel != UA_PUBSUB_RT_FIXED_SIZE)
+    if((rg->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) == 0)
         return UA_STATUSCODE_GOOD;
 
     if(dsrCount > 1) {
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 80acd552887..b355c2ac603 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -1438,7 +1438,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
                                &dsWriterIds[dsmCount], 1);
 
             /* Clean up the current store entry */
-            if(writerGroup->config.rtLevel == UA_PUBSUB_RT_DIRECT_VALUE_ACCESS &&
+            if(writerGroup->config.rtLevel & UA_PUBSUB_RT_DIRECT_VALUE_ACCESS &&
                dsmStore[dsmCount].header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
                 for(size_t i = 0; i < dsmStore[dsmCount].data.keyFrameData.fieldCount; ++i) {
                     dsmStore[dsmCount].data.keyFrameData.dataSetFields[i].value.data = NULL;
@@ -1466,7 +1466,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
 
     /* Clean up DSM */
     for(size_t i = 0; i < dsmCount; i++) {
-        if(writerGroup->config.rtLevel == UA_PUBSUB_RT_DIRECT_VALUE_ACCESS &&
+        if(writerGroup->config.rtLevel & UA_PUBSUB_RT_DIRECT_VALUE_ACCESS &&
            dsmStore[i].header.dataSetMessageType == UA_DATASETMESSAGE_DATAKEYFRAME) {
             for(size_t j = 0; j < dsmStore[i].data.keyFrameData.fieldCount; ++j) {
                 dsmStore[i].data.keyFrameData.dataSetFields[j].value.data = NULL;

From 06da5d07bd9a653d32e7a6ed06deae994d29953c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 15 Jun 2024 13:28:53 +0200
Subject: [PATCH 1564/1963] fix(pubsub): Use the external value source in the
 Reader

---
 src/pubsub/ua_pubsub_reader.c | 192 ++++++++++++++--------------------
 1 file changed, 76 insertions(+), 116 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 700704f1941..ab58cad44a2 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -775,8 +775,8 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
     msg->data.keyFrameData.fieldCount = (UA_UInt16)
         dsr->config.dataSetMetaData.fieldsSize;
 
+    /* Start iteration from beginning of rawFields buffer */
     size_t offset = 0;
-    /* start iteration from beginning of rawFields buffer */
     msg->data.keyFrameData.rawFields.length = 0;
     for(size_t i = 0; i < dsr->config.dataSetMetaData.fieldsSize; i++) {
         /* TODO The datatype reference should be part of the internal
@@ -791,10 +791,12 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
                                     &offset, value, type, NULL);
         if(dsr->config.dataSetMetaData.fields[i].maxStringLength != 0) {
             if(type->typeKind == UA_DATATYPEKIND_STRING ||
-                type->typeKind == UA_DATATYPEKIND_BYTESTRING) {
+               type->typeKind == UA_DATATYPEKIND_BYTESTRING) {
                 UA_ByteString *bs = (UA_ByteString *) value;
-                //check if length < maxStringLength, The types ByteString and String are equal in their base definition
-                size_t lengthDifference = dsr->config.dataSetMetaData.fields[i].maxStringLength - bs->length;
+                /* Check if length < maxStringLength, The types ByteString and
+                 * String are equal in their base definition */
+                size_t lengthDifference =
+                    dsr->config.dataSetMetaData.fields[i].maxStringLength - bs->length;
                 offset += lengthDifference;
             }
         }
@@ -808,25 +810,16 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
         UA_FieldTargetVariable *tv =
             &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
 
-        if(rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
-            if (tv->beforeWrite) {
-                void *pData = (**tv->externalDataValue).value.data;
-                (**tv->externalDataValue).value.data = value;   // set raw data as "preview"
-                tv->beforeWrite(server,
-                                &dsr->identifier,
-                                &dsr->linkedReaderGroup,
-                                &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariable.targetNodeId,
-                                dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariableContext,
-                                tv->externalDataValue);
-                (**tv->externalDataValue).value.data = pData;  // restore previous data pointer
-            }
-            memcpy((**tv->externalDataValue).value.data, value, type->memSize);
-            if(tv->afterWrite)
-                tv->afterWrite(server, &dsr->identifier,
-                                &dsr->linkedReaderGroup,
+        if(tv->beforeWrite || tv->externalDataValue) {
+            if(tv->beforeWrite)
+                tv->beforeWrite(server, &dsr->identifier, &dsr->linkedReaderGroup,
                                 &tv->targetVariable.targetNodeId,
-                                tv->targetVariableContext,
-                                tv->externalDataValue);
+                                tv->targetVariableContext, tv->externalDataValue);
+            memcpy((*tv->externalDataValue)->value.data, value, type->memSize);
+            if(tv->afterWrite)
+                tv->afterWrite(server, &dsr->identifier, &dsr->linkedReaderGroup,
+                               &tv->targetVariable.targetNodeId,
+                               tv->targetVariableContext, tv->externalDataValue);
             continue; /* No dynamic allocation for fixed-size msg, no need to _clear */
         }
 
@@ -847,151 +840,118 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
     }
 }
 
-static void
-DataSetReader_processFixedSize(UA_Server *server, UA_ReaderGroup *rg,
-                               UA_DataSetReader *dsr, UA_DataSetMessage *msg,
-                               size_t fieldCount) {
-    for(size_t i = 0; i < fieldCount; i++) {
-        if(!msg->data.keyFrameData.dataSetFields[i].hasValue)
-            continue;
-
-        UA_FieldTargetVariable *tv =
-            &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
-        if(tv->targetVariable.attributeId != UA_ATTRIBUTEID_VALUE)
-            continue;
-
-        if(msg->data.keyFrameData.dataSetFields[i].value.type !=
-           (*tv->externalDataValue)->value.type) {
-            UA_LOG_WARNING_READER(server->config.logging, dsr,
-                                  "Mismatching type");
-            continue;
-        }
-
-        if (tv->beforeWrite) {
-            UA_DataValue *tmp = &msg->data.keyFrameData.dataSetFields[i];
-            tv->beforeWrite(server,
-                      &dsr->identifier,
-                      &dsr->linkedReaderGroup,
-                      &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariable.targetNodeId,
-                      dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i].targetVariableContext,
-                      &tmp);
-        }
-        if(UA_LIKELY(tv->externalDataValue != NULL)) {
-            memcpy((**tv->externalDataValue).value.data,
-                   msg->data.keyFrameData.dataSetFields[i].value.data,
-                   msg->data.keyFrameData.dataSetFields[i].value.type->memSize);
-        }
-        if(tv->afterWrite)
-            tv->afterWrite(server, &dsr->identifier, &dsr->linkedReaderGroup,
-                        &tv->targetVariable.targetNodeId,
-                        tv->targetVariableContext, tv->externalDataValue);
-    }
-}
-
 void
 UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
                          UA_DataSetReader *dsr, UA_DataSetMessage *msg) {
     if(!dsr || !rg || !msg || !server)
         return;
 
-    /* Check the metadata, to see if this reader is configured for a heartbeat */
-    if(dsr->config.dataSetMetaData.fieldsSize == 0 &&
-       dsr->config.dataSetMetaData.configurationVersion.majorVersion == 0 &&
-       dsr->config.dataSetMetaData.configurationVersion.minorVersion == 0) {
-        /* Expecting a heartbeat, check the message */
-        if(msg->header.dataSetMessageType != UA_DATASETMESSAGE_DATAKEYFRAME ||
-            msg->header.configVersionMajorVersion != 0 ||
-            msg->header.configVersionMinorVersion != 0 ||
-            msg->data.keyFrameData.fieldCount != 0) {
-            UA_LOG_INFO_READER(server->config.logging, dsr,
-                               "This DSR expects heartbeat, but the received "
-                               "message doesn't seem to be so.");
-        }
+    UA_LOG_DEBUG_READER(server->config.logging, dsr, "Received a network message");
+
 #ifdef UA_ENABLE_PUBSUB_MONITORING
-        UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
+    UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
 #endif
-        dsr->lastHeartbeatReceived = UA_DateTime_nowMonotonic();
+
+    if(dsr->state != UA_PUBSUBSTATE_OPERATIONAL &&
+       dsr->state != UA_PUBSUBSTATE_PREOPERATIONAL) {
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
+                            "Received a network message but not operational");
         return;
     }
 
-    UA_LOG_DEBUG_READER(server->config.logging, dsr,
-                        "DataSetReader '%.*s': received a network message",
-                        (int)dsr->config.name.length, dsr->config.name.data);
-
     if(!msg->header.dataSetMessageValid) {
         UA_LOG_INFO_READER(server->config.logging, dsr,
                            "DataSetMessage is discarded: message is not valid");
-        /* To Do check ConfigurationVersion */
-        /* if(msg->header.configVersionMajorVersionEnabled) {
-         *     if(msg->header.configVersionMajorVersion !=
-         *            dsr->config.dataSetMetaData.configurationVersion.majorVersion) {
-         *         UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
-         *                        "DataSetMessage is discarded: ConfigurationVersion "
-         *                        "MajorVersion does not match");
-         *         return;
-         *     }
-         * } */
         return;
     }
 
+    /* TODO: Check ConfigurationVersion */
+    /* if(msg->header.configVersionMajorVersionEnabled) {
+     *     if(msg->header.configVersionMajorVersion !=
+     *            dsr->config.dataSetMetaData.configurationVersion.majorVersion) {
+     *         UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
+     *                        "DataSetMessage is discarded: ConfigurationVersion "
+     *                        "MajorVersion does not match");
+     *         return;
+     *     }
+     * } */
+
     if(msg->header.dataSetMessageType != UA_DATASETMESSAGE_DATAKEYFRAME) {
         UA_LOG_WARNING_READER(server->config.logging, dsr,
                        "DataSetMessage is discarded: Only keyframes are supported");
         return;
     }
 
-    /* Process message with raw encoding (realtime and non-realtime) */
+    /* Process message with raw encoding. We have no field-count information for
+     * the message. */
     if(msg->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {
         DataSetReader_processRaw(server, rg, dsr, msg);
-#ifdef UA_ENABLE_PUBSUB_MONITORING
-        UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
-#endif
         return;
     }
 
-    /* Check and adjust the field count
-     * TODO Throw an error if non-matching? */
-    size_t fieldCount = msg->data.keyFrameData.fieldCount;
-    if(dsr->config.dataSetMetaData.fieldsSize < fieldCount)
-        fieldCount = dsr->config.dataSetMetaData.fieldsSize;
+    /* Received a heartbeat with no fields */
+    if(msg->data.keyFrameData.fieldCount == 0) {
+        dsr->lastHeartbeatReceived = UA_DateTime_nowMonotonic();
+        return;
+    }
 
-    if(dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize < fieldCount)
-        fieldCount = dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize;
+    /* Check whether the field count matches the configuration */
+    size_t fieldCount = msg->data.keyFrameData.fieldCount;
+    if(dsr->config.dataSetMetaData.fieldsSize != fieldCount) {
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
+                       "Number of fields does not match the DataSetMetaData configuration");
+        return;
+    }
 
-    /* Process message with fixed size fields (realtime capable) */
-    if(rg->config.rtLevel == UA_PUBSUB_RT_FIXED_SIZE) {
-        DataSetReader_processFixedSize(server, rg, dsr, msg, fieldCount);
-#ifdef UA_ENABLE_PUBSUB_MONITORING
-        UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
-#endif
+    if(dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariablesSize != fieldCount) {
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
+                       "Number of fields does not match the TargetVariables configuration");
         return;
     }
 
-    /* Write the message fields via the write service (non realtime) */
+    /* Write the message fields. RT has the external data value configured. */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     for(size_t i = 0; i < fieldCount; i++) {
-        if(!msg->data.keyFrameData.dataSetFields[i].hasValue)
+        UA_DataValue *field = &msg->data.keyFrameData.dataSetFields[i];
+        if(!field->hasValue)
             continue;
 
         UA_FieldTargetVariable *tv =
             &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
 
+        /* RT-path: write directly into the target memory */
+        if(tv->externalDataValue) {
+            if(field->value.type != (*tv->externalDataValue)->value.type) {
+                UA_LOG_WARNING_READER(server->config.logging, dsr, "Mismatching type");
+                continue;
+            }
+
+            if(tv->beforeWrite)
+                tv->beforeWrite(server, &dsr->identifier, &dsr->linkedReaderGroup,
+                                &tv->targetVariable.targetNodeId,
+                                tv->targetVariableContext, tv->externalDataValue);
+            memcpy((*tv->externalDataValue)->value.data,
+                   field->value.data, field->value.type->memSize);
+            if(tv->afterWrite)
+                tv->afterWrite(server, &dsr->identifier, &dsr->linkedReaderGroup,
+                               &tv->targetVariable.targetNodeId,
+                               tv->targetVariableContext, tv->externalDataValue);
+            continue;
+        }
+
+        /* Write via the Write-Service */
         UA_WriteValue writeVal;
         UA_WriteValue_init(&writeVal);
         writeVal.attributeId = tv->targetVariable.attributeId;
         writeVal.indexRange = tv->targetVariable.receiverIndexRange;
         writeVal.nodeId = tv->targetVariable.targetNodeId;
-        writeVal.value = msg->data.keyFrameData.dataSetFields[i];
+        writeVal.value = *field;
         Operation_Write(server, &server->adminSession, NULL, &writeVal, &res);
         if(res != UA_STATUSCODE_GOOD)
             UA_LOG_INFO_READER(server->config.logging, dsr,
                                "Error writing KeyFrame field %u: %s",
                                (unsigned)i, UA_StatusCode_name(res));
     }
-
-#ifdef UA_ENABLE_PUBSUB_MONITORING
-    UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
-#endif
 }
 
 #ifdef UA_ENABLE_PUBSUB_MONITORING

From deeb3967cd11ad2707837cc8c7a845330cb0a9e6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Jun 2024 00:11:32 +0200
Subject: [PATCH 1565/1963] refactor(build): RT examples depend on sigset_t. Do
 not build on WIN32

---
 examples/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e9a4fea7ecc..ecb0ba303eb 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -211,9 +211,11 @@ if(UA_ENABLE_PUBSUB)
     add_example(tutorial_pubsub_publish pubsub/tutorial_pubsub_publish.c)
     add_example(server_pubsub_publish_on_demand pubsub/server_pubsub_publisher_on_demand.c)
     add_example(server_pubsub_publisher_iop pubsub/server_pubsub_publisher_iop.c)
-    add_example(server_pubsub_publish_rt_level pubsub_realtime/server_pubsub_publisher_rt_level.c)
-    add_example(server_pubsub_rt_information_model pubsub_realtime/server_pubsub_rt_field_information_model.c)
-    add_example(server_pubsub_subscribe_rt_level pubsub_realtime/server_pubsub_subscriber_rt_level.c)
+    if(NOT WIN32)
+        add_example(server_pubsub_publish_rt_level pubsub_realtime/server_pubsub_publisher_rt_level.c)
+        add_example(server_pubsub_subscribe_rt_level pubsub_realtime/server_pubsub_subscriber_rt_level.c)
+        add_example(server_pubsub_rt_information_model pubsub_realtime/server_pubsub_rt_field_information_model.c)
+    endif()
     add_example(tutorial_pubsub_subscribe pubsub/tutorial_pubsub_subscribe.c)
     if (BUILD_SHARED_LIBS)
         message(WARNING "Build option BUILD_SHARED_LIBS not supported for standalone subscriber and realtime examples. Skipping these examples.")

From 54dd5fe14e19e51e5edb3cdca23c33d63b61882f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Jun 2024 01:37:18 +0200
Subject: [PATCH 1566/1963] fix(pubsub): Don't abort Reader with monitoring
 enabled for messageReceiveTimeout == 0

---
 src/pubsub/ua_pubsub_manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index 65b58a0f71d..ca5443b6e5b 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -528,6 +528,12 @@ UA_PubSubComponent_startMonitoring(UA_Server *server, UA_NodeId Id,
             UA_DataSetReader *reader = (UA_DataSetReader*) data;
             switch (eMonitoringType) {
                 case UA_PUBSUB_MONITORING_MESSAGE_RECEIVE_TIMEOUT: {
+                    if(reader->config.messageReceiveTimeout == 0) {
+                        UA_LOG_WARNING_READER(server->config.logging, reader,
+                                              "Cannot monitor timeout for messageReceiveTimeout == 0");
+                        return UA_STATUSCODE_GOOD;
+                    }
+
                     /* use a timed callback, because one notification is enough,
                      * we assume that MessageReceiveTimeout configuration is in
                      * [ms], we do not handle or check fractions */

From 3a59e733de9d007bc1944c5f78dd5686070577d2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Jun 2024 21:43:22 +0200
Subject: [PATCH 1567/1963] fix(pubsub): Don't overwrite the ReaderGroup
 external value configuration

If an external datasource is configured in the target node.
---
 src/pubsub/ua_pubsub_readergroup.c | 35 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index dfa8de3d042..048b5d6aa3f 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -628,23 +628,24 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
 
     size_t fieldsSize = dsr->config.dataSetMetaData.fieldsSize;
     for(size_t i = 0; i < fieldsSize; i++) {
-        UA_FieldTargetVariable *tv =
-            &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
-        const UA_VariableNode *rtNode = (const UA_VariableNode *)
-            UA_NODESTORE_GET(server, &tv->targetVariable.targetNodeId);
-        if(!rtNode ||
-           rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) {
-            UA_LOG_WARNING_READER(server->config.logging, dsr,
-                                  "PubSub-RT configuration fail: PDS contains field "
-                                  "without external data source.");
-            UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
-            return UA_STATUSCODE_BADNOTSUPPORTED;
-        }
-
-        /* Set the external data source in the tv */
-        tv->externalDataValue = rtNode->valueBackend.backend.external.value;
-
-        UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
+        /* TODO: Use the datasource from the node */
+        /* UA_FieldTargetVariable *tv = */
+        /*     &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i]; */
+        /* const UA_VariableNode *rtNode = (const UA_VariableNode *) */
+        /*     UA_NODESTORE_GET(server, &tv->targetVariable.targetNodeId); */
+        /* if(!rtNode || */
+        /*    rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL) { */
+        /*     UA_LOG_WARNING_READER(server->config.logging, dsr, */
+        /*                           "PubSub-RT configuration fail: PDS contains field " */
+        /*                           "without external data source."); */
+        /*     UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode); */
+        /*     return UA_STATUSCODE_BADNOTSUPPORTED; */
+        /* } */
+
+        /* /\* Set the external data source in the tv *\/ */
+        /* tv->externalDataValue = rtNode->valueBackend.backend.external.value; */
+
+        /* UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode); */
 
         UA_FieldMetaData *field = &dsr->config.dataSetMetaData.fields[i];
         if((UA_NodeId_equal(&field->dataType, &UA_TYPES[UA_TYPES_STRING].typeId) ||

From ce747d61cc4a025ea1a440dab13f864227383b6b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 16 Jun 2024 21:44:33 +0200
Subject: [PATCH 1568/1963] refactor(tests): Use the RT_DETERMINISTIC setting
 in check_pubsub_subscribe_rt_levels.c

---
 .../pubsub/check_pubsub_subscribe_rt_levels.c | 51 ++++++-------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index bc466927dc2..5c91fa8902c 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -122,7 +122,7 @@ START_TEST(SubscribeSingleFieldWithFixedOffsets) {
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.enabled = UA_FALSE;
     writerGroupConfig.writerGroupId = 100;
-    writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    writerGroupConfig.rtLevel = UA_PUBSUB_RT_DETERMINISTIC;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
     wgm->networkMessageContentMask = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
@@ -147,7 +147,7 @@ START_TEST(SubscribeSingleFieldWithFixedOffsets) {
     UA_ReaderGroupConfig readerGroupConfig;
     memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
     readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
-    readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    readerGroupConfig.rtLevel = UA_PUBSUB_RT_DETERMINISTIC;
     retVal =  UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
                                        &readerGroupIdentifier);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -289,7 +289,7 @@ START_TEST(SetupInvalidPubSubConfigReader) {
         writerGroupConfig.publishingInterval = 10;
         writerGroupConfig.enabled = UA_FALSE;
         writerGroupConfig.writerGroupId = 100;
-        writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+        writerGroupConfig.rtLevel = UA_PUBSUB_RT_DETERMINISTIC;
         writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
         UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
         wgm->networkMessageContentMask = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
@@ -317,7 +317,7 @@ START_TEST(SetupInvalidPubSubConfigReader) {
         UA_ReaderGroupConfig readerGroupConfig;
         memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
         readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
-        readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+        readerGroupConfig.rtLevel = UA_PUBSUB_RT_DETERMINISTIC;
         retVal =  UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig,
                                            &readerGroupIdentifier);
         ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -433,7 +433,7 @@ START_TEST(SetupInvalidPubSubConfig) {
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.enabled = UA_FALSE;
     writerGroupConfig.writerGroupId = 100;
-    writerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    writerGroupConfig.rtLevel = UA_PUBSUB_RT_DETERMINISTIC;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     UA_UadpWriterGroupMessageDataType *wgm = UA_UadpWriterGroupMessageDataType_new();
     wgm->networkMessageContentMask = (UA_UadpNetworkMessageContentMask)(UA_UADPNETWORKMESSAGECONTENTMASK_PUBLISHERID |
@@ -482,30 +482,8 @@ START_TEST(SetupInvalidPubSubConfig) {
 #define NUMVARS 2
 static UA_UInt32 sSubscriberWriteValue[NUMVARS] = {0};
 static UA_NodeId sSubscribeWriteCb_TargetVar_Id[NUMVARS];
-static void SubscriberBeforeWriteCallback(UA_Server *srv,
-                       const UA_NodeId *readerId,
-                       const UA_NodeId *readerGroupId,
-                       const UA_NodeId *targetVariableId,
-                       void *targetVariableContext,
-                       UA_DataValue **externalDataValue) {
-
-    int i = 0;
-    ck_assert(srv != 0);
-    ck_assert(UA_NodeId_equal(readerId, &readerIdentifier) == UA_TRUE);
-    ck_assert(UA_NodeId_equal(readerGroupId, &readerGroupIdentifier) == UA_TRUE);
-    for (i = 0; i < NUMVARS; i++) {
-        if (UA_NodeId_equal(targetVariableId, &sSubscribeWriteCb_TargetVar_Id[i]) == UA_TRUE) {
-            ck_assert(targetVariableContext != 0);
-            ck_assert_uint_eq(10+i, *((UA_UInt32*) targetVariableContext));
-            ck_assert(externalDataValue != 0);
-            ck_assert_uint_eq((**externalDataValue).value.type->memSize, sizeof(sSubscriberWriteValue[i]));
-            memcpy(&sSubscriberWriteValue[i], (**externalDataValue).value.data, (**externalDataValue).value.type->memSize);
-            break;
-        }
-    }
-    /* check if variable has been found */
-    ck_assert(i < NUMVARS);
-}
+static UA_DataValue subscriberDataValues[NUMVARS];
+static UA_DataValue *subscriberIndirectDataValues[NUMVARS];
 
 static void PublishSubscribeWithWriteCallback_Helper(
     UA_NodeId *publisherNode,
@@ -576,7 +554,7 @@ static void PublishSubscribeWithWriteCallback_Helper(
     UA_ReaderGroupConfig readerGroupConfig;
     memset (&readerGroupConfig, 0, sizeof (UA_ReaderGroupConfig));
     readerGroupConfig.name = UA_STRING ("ReaderGroup Test");
-    readerGroupConfig.rtLevel = UA_PUBSUB_RT_FIXED_SIZE;
+    readerGroupConfig.rtLevel = UA_PUBSUB_RT_DETERMINISTIC;
     retVal |= UA_Server_addReaderGroup(server, connectionIdentifier, &readerGroupConfig, &readerGroupIdentifier);
 
     /* Data Set Reader */
@@ -629,20 +607,21 @@ static void PublishSubscribeWithWriteCallback_Helper(
     dsReaderMessage = 0;
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
 
+    /* Create TargetVariables */
     UA_FieldTargetVariable targetVar[NUMVARS];
-    UA_UInt32 DummyTargetVariableContext[NUMVARS];
     memset(&targetVar, 0, sizeof(targetVar));
     for (i = 0; i < NUMVARS; i++) {
-        /* For creating Targetvariable */
+        UA_Variant_setScalar(&subscriberDataValues[i].value, &sSubscriberWriteValue[i],
+                             &UA_TYPES[UA_TYPES_UINT32]);
+        subscriberIndirectDataValues[i] = &subscriberDataValues[i];
+        subscriberDataValues[i].hasValue = true;
         UA_FieldTargetDataType_init(&targetVar[i].targetVariable);
         targetVar[i].targetVariable.attributeId  = UA_ATTRIBUTEID_VALUE;
         targetVar[i].targetVariable.targetNodeId = sSubscribeWriteCb_TargetVar_Id[i];
-        targetVar[i].beforeWrite                 = SubscriberBeforeWriteCallback;  /* set subscriber write callback */
-        DummyTargetVariableContext[i]            = 10+i;
-        targetVar[i].targetVariableContext       = &DummyTargetVariableContext[i];
+        targetVar[i].externalDataValue           = &subscriberIndirectDataValues[i];
     }
     retVal |= UA_Server_DataSetReader_createTargetVariables(server, readerIdentifier,
-                                                            NUMVARS, &targetVar[0]);
+                                                            NUMVARS, targetVar);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     for (i = 0; i < NUMVARS; i++) {
         UA_FieldTargetDataType_clear(&targetVar[i].targetVariable);

From d2d919f1eefd2bf0d534bf91af0cf1d3143cf938 Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Mon, 17 Jun 2024 21:40:21 +0200
Subject: [PATCH 1569/1963] fix(core): ret is already defined, so reuse var

If src/ua_types_encoding_json.c is compiled with "gcc -Wshadow",
a warning is output for an already defined var. This change fixes
this.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 src/ua_types_encoding_json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 5507a0d2ffb..015b09158d8 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2233,7 +2233,7 @@ getArrayUnwrapType(ParseCtx *ctx, size_t arrayIndex) {
 
         /* Check for non-JSON encoding */
         size_t encIndex = 0;
-        UA_StatusCode ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encIndex);
+        ret = lookAheadForKey(ctx, UA_JSONKEY_ENCODING, &encIndex);
         if(ret == UA_STATUSCODE_GOOD) {
             ctx->index = oldIndex; /* Restore the index */
             return NULL;

From b77583284db6be3dfd4e4dea1975e26ef4932108 Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Tue, 18 Jun 2024 05:51:35 +0200
Subject: [PATCH 1570/1963] fix(plugins): mdnsIpAddressList only if
 UA_HAS_GETIFADDR is undefined

In plugins/ua_config_json.c mdnsIpAddressList and mdnsIpAddressListSize
can only be set if UA_HAS_GETIFADDR is undefined.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 plugins/ua_config_json.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/ua_config_json.c b/plugins/ua_config_json.c
index defc4c9d6a5..a7a454f1e15 100644
--- a/plugins/ua_config_json.c
+++ b/plugins/ua_config_json.c
@@ -451,8 +451,11 @@ PARSE_JSON(MdnsConfigurationField) {
                 parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRINGARRAY](ctx, &config->mdnsConfig.serverCapabilities, &config->mdnsConfig.serverCapabilitiesSize);
             else if(strcmp(field_str, "mdnsInterfaceIP") == 0)
                 parseJsonJumpTable[UA_SERVERCONFIGFIELD_STRING](ctx, &config->mdnsInterfaceIP, NULL);
+            /* mdnsIpAddressList and mdnsIpAddressListSize are only available if UA_HAS_GETIFADDR is not defined: */
+# if !defined(UA_HAS_GETIFADDR)
             else if(strcmp(field_str, "mdnsIpAddressList") == 0)
                 parseJsonJumpTable[UA_SERVERCONFIGFIELD_UINT32ARRAY](ctx, &config->mdnsIpAddressList, &config->mdnsIpAddressListSize);
+# endif
             else {
                 UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Unknown field name.");
             }

From 9ab1485176f207f8c9143c94e181cbeffd97fffd Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Tue, 18 Jun 2024 17:40:51 +0200
Subject: [PATCH 1571/1963] fix(arch): Fix build error on posix with undefined
 UA_IPV6

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 arch/eventloop_posix_tcp.c   | 2 +-
 arch/eventloop_posix_udp.c   | 2 +-
 arch/posix/ua_architecture.h | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index aa1eede8bf7..450f04e792e 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -398,8 +398,8 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
      * AF_INET6 sockets only for IPv6. */
-    int optval = 1;
 #if UA_IPV6
+    int optval = 1;
     if(ai->ai_family == AF_INET6 &&
        UA_setsockopt(listenSocket, IPPROTO_IPV6, IPV6_V6ONLY,
                      (const char*)&optval, sizeof(optval)) == -1) {
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 628e8e2bac4..e5f58d38848 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -442,8 +442,8 @@ setConnectionConfig(UA_FD socket, const UA_KeyValueMap *params,
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
      * AF_INET6 sockets only for IPv6. */
-    int optval = 1;
 #if UA_IPV6
+    int optval = 1;
     if(ai_family == AF_INET6 &&
        UA_setsockopt(socket, IPPROTO_IPV6, IPV6_V6ONLY,
                      (const char*)&optval, sizeof(optval)) == -1) {
diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
index 2bb68e2af33..ba1648c4b6b 100644
--- a/arch/posix/ua_architecture.h
+++ b/arch/posix/ua_architecture.h
@@ -56,9 +56,7 @@
 #define UA_getsockopt getsockopt
 #define UA_setsockopt setsockopt
 #define UA_inet_pton inet_pton
-#if UA_IPV6
-# define UA_if_nametoindex if_nametoindex
-#endif
+#define UA_if_nametoindex if_nametoindex
 
 #define UA_clean_errno(STR_FUN) (errno == 0 ? (char*) "None" : (STR_FUN)(errno))
 

From bde1b79cc572051360eb9dcdcae87e4d1f67343b Mon Sep 17 00:00:00 2001
From: Florian La Roche <florian.laroche@gmail.com>
Date: Wed, 19 Jun 2024 08:09:08 +0200
Subject: [PATCH 1572/1963] refactor(plugins): Adjust default network buffer
 sizes (#6552)

Some items use 2<<y instead of 1<<y==2^y.
I've kept the buffer size in ua_pki_mbedtls.c the same,
though this could also get reduced.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c |  2 +-
 plugins/ua_config_default.c             | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 46ca239d545..7a90f32d36c 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -776,7 +776,7 @@ UA_PKI_decryptPrivateKey(const UA_ByteString privateKey,
     }
 
     /* Write the DER-encoded key into a local buffer */
-    unsigned char buf[2 << 13];
+    unsigned char buf[1 << 14];
     size_t pos = (size_t)mbedtls_pk_write_key_der(&ctx, buf, sizeof(buf));
 
     /* Allocate memory */
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 17d47964f81..f5197957049 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -191,12 +191,12 @@ UA_Server_runUntilInterrupt(UA_Server *server) {
 
 const UA_ConnectionConfig UA_ConnectionConfig_default = {
     0,       /* .protocolVersion */
-    2 << 16, /* .sendBufferSize, 64k per chunk */
-    2 << 16, /* .recvBufferSize, 64k per chunk */
-    2 << 29, /* .localMaxMessageSize, 512 MB */
-    2 << 29, /* .remoteMaxMessageSize, 512 MB */
-    2 << 14, /* .localMaxChunkCount, 16k */
-    2 << 14  /* .remoteMaxChunkCount, 16k */
+    1 << 16, /* .sendBufferSize, 64k per chunk */
+    1 << 16, /* .recvBufferSize, 64k per chunk */
+    1 << 29, /* .localMaxMessageSize, 512 MB */
+    1 << 29, /* .remoteMaxMessageSize, 512 MB */
+    1 << 14, /* .localMaxChunkCount, 16k */
+    1 << 14  /* .remoteMaxChunkCount, 16k */
 };
 
 /***************************/

From 71b6cb6b34190cd2ef9f18b32ada7404ca276cc1 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 19 Jun 2024 15:21:31 +0200
Subject: [PATCH 1573/1963] fix(plugin): Add the missing function
 'updateCertificateAndPrivateKey' in the rsapss security policy for the
 openssl implementation

---
 .../openssl/ua_openssl_aes256sha256rsapss.c   | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c b/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
index d7d7fd987a8..49ea9f6e1d8 100644
--- a/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
+++ b/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
@@ -104,6 +104,54 @@ UA_Policy_Aes256Sha256RsaPss_Clear_Context(UA_SecurityPolicy *policy) {
     return;
 }
 
+static UA_StatusCode
+updateCertificateAndPrivateKey_sp_aes128sha256rsapss(UA_SecurityPolicy *securityPolicy,
+                                                      const UA_ByteString newCertificate,
+                                                      const UA_ByteString newPrivateKey) {
+    if(securityPolicy == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    if(securityPolicy->policyContext == NULL)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    Policy_Context_Aes256Sha256RsaPss *pc =
+        (Policy_Context_Aes256Sha256RsaPss *)securityPolicy->policyContext;
+
+    UA_ByteString_clear(&securityPolicy->localCertificate);
+
+    UA_StatusCode retval = UA_OpenSSL_LoadLocalCertificate(
+        &newCertificate, &securityPolicy->localCertificate);
+
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+    /* Set the new private key */
+    EVP_PKEY_free(pc->localPrivateKey);
+
+    pc->localPrivateKey = UA_OpenSSL_LoadPrivateKey(&newPrivateKey);
+    if(!pc->localPrivateKey) {
+        retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        goto error;
+    }
+
+    UA_ByteString_clear(&pc->localCertThumbprint);
+
+    retval = UA_Openssl_X509_GetCertificateThumbprint(&securityPolicy->localCertificate,
+                                                      &pc->localCertThumbprint, true);
+    if(retval != UA_STATUSCODE_GOOD) {
+        goto error;
+    }
+
+    return retval;
+
+error:
+    UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                 "Could not update certificate and private key");
+    if(securityPolicy->policyContext != NULL)
+        UA_Policy_Aes256Sha256RsaPss_Clear_Context(securityPolicy);
+    return retval;
+}
+
 /* create the channel context */
 
 static UA_StatusCode
@@ -670,6 +718,7 @@ UA_SecurityPolicy_Aes256Sha256RsaPss(UA_SecurityPolicy *policy,
         UA_ByteString_clear(&policy->localCertificate);
         return retval;
     }
+    policy->updateCertificateAndPrivateKey = updateCertificateAndPrivateKey_sp_aes128sha256rsapss;
     policy->clear = UA_Policy_Aes256Sha256RsaPss_Clear_Context;
 
     /* Certificate Signing Algorithm */

From 548a2ef985d85f1c7b3e41baa8281402919077e6 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Fri, 21 Jun 2024 09:42:28 +0200
Subject: [PATCH 1574/1963] fix(server) check history backend for event support
 in history-read service

---
 src/server/ua_services_attribute.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 2cf5f459964..091f5abe0ef 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1833,6 +1833,14 @@ Service_HistoryRead(UA_Server *server, UA_Session *session,
         return;
     }
 
+    /* Check if the configured History-Backend supports the requested history type */
+    if(!readHistory){
+        UA_LOG_INFO_SESSION(server->config.logging, session,
+                            "The configured HistoryBackend does not support the selected history-type.");
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTSUPPORTED;
+        return;
+    }
+
     /* Something to do? */
     if(request->nodesToReadSize == 0) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTHINGTODO;

From 2b291efe08198038a495bac53d8899466b9d8366 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Fri, 21 Jun 2024 09:42:28 +0200
Subject: [PATCH 1575/1963] fix(server) check history backend for event support
 in history-read service

---
 src/server/ua_services_attribute.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 755305c1e6b..48ef05e0843 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1990,6 +1990,14 @@ Service_HistoryRead(UA_Server *server, UA_Session *session,
         return;
     }
 
+    /* Check if the configured History-Backend supports the requested history type */
+    if(!readHistory){
+        UA_LOG_INFO_SESSION(server->config.logging, session,
+                            "The configured HistoryBackend does not support the selected history-type.");
+        response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTSUPPORTED;
+        return;
+    }
+
     /* Something to do? */
     if(request->nodesToReadSize == 0) {
         response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTHINGTODO;

From 303671681888b27857b94753ee0d62d468b57ddd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 1 Jul 2024 21:56:48 +0200
Subject: [PATCH 1576/1963] refactor(build): Make the dependencies not exposed
 in the API private

---
 CMakeLists.txt                       | 21 ++++++++++++---------
 tools/cmake/open62541Config.cmake.in | 12 ------------
 tools/open62541.pc.in                |  3 ++-
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 681bedbc57f..b9ad8663b01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -495,10 +495,11 @@ endif()
 ######################
 
 set(open62541_LIBRARIES "")
+set(open62541_PUBLIC_LIBRARIES "")
 if("${UA_ARCHITECTURE}" STREQUAL "posix")
     list(APPEND open62541_LIBRARIES "m")
-    if(UA_MULTITHREADING OR UA_BUILD_UNIT_TESTS)
-        list(APPEND open62541_LIBRARIES "pthread")
+    if(UA_MULTITHREADING GREATER_EQUAL 100 OR UA_BUILD_UNIT_TESTS)
+        list(APPEND open62541_PUBLIC_LIBRARIES "pthread")
     endif()
     if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD"))
         list(APPEND open62541_LIBRARIES "rt")
@@ -1421,7 +1422,8 @@ SET_TARGET_PROPERTIES(open62541 PROPERTIES
                       VERSION "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}")
 
 # DLL requires linking to dependencies
-target_link_libraries(open62541 ${open62541_LIBRARIES})
+target_link_libraries(open62541 PUBLIC ${open62541_PUBLIC_LIBRARIES})
+target_link_libraries(open62541 PRIVATE ${open62541_LIBRARIES})
 
 ##########################
 # Build Selected Targets #
@@ -1491,7 +1493,6 @@ install(TARGETS open62541
 
 set(open62541_install_tools_dir share/open62541)
 set(open62541_install_schema_dir share/open62541/schema)
-set(open62541_crypto_plugin ${UA_ENABLE_ENCRYPTION})
 
 # Create open62541Config.cmake
 include(CMakePackageConfigHelpers)
@@ -1500,8 +1501,7 @@ configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541
                               "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
                               INSTALL_DESTINATION "${cmake_configfile_install}"
                               PATH_VARS open62541_install_tools_dir
-                                        open62541_install_schema_dir
-                                        open62541_crypto_plugin)
+                                        open62541_install_schema_dir)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/open62541Config.cmake"
               "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/open62541Macros.cmake"
         DESTINATION "${cmake_configfile_install}")
@@ -1527,10 +1527,13 @@ export(TARGETS open62541
 if(UA_ENABLE_AMALGAMATION)
     set(PC_EXTRA_CFLAGS "-DUA_ENABLE_AMALGAMATION")
 endif()
-set(pkgcfglibs "-lopen62541")
-foreach(lib ${open62541_LIBRARIES})
-    set(pkgcfglibs "${pkgcfglibs} -l${lib}")
+
+set(pkgcfgpubliclibs "")
+foreach(lib ${open62541_PUBLIC_LIBRARIES})
+    set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ")
 endforeach()
+
+string(REPLACE ";" ", " pkgcfglibs "${open62541_LIBRARIES}")
 configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open62541.pc @ONLY)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/tools/cmake/open62541Config.cmake.in b/tools/cmake/open62541Config.cmake.in
index a5f50dc9595..654f9cb5c77 100644
--- a/tools/cmake/open62541Config.cmake.in
+++ b/tools/cmake/open62541Config.cmake.in
@@ -3,20 +3,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
 
 set_and_check(open62541_TOOLS_DIR @PACKAGE_open62541_install_tools_dir@ CACHE PATH "Path to the directory that contains the tooling of the stack")
 set_and_check(UA_SCHEMA_DIR @PACKAGE_open62541_install_schema_dir@ CACHE PATH "Path to the directory that contains the schema files")
-set(open62541_crypto_plugin @open62541_crypto_plugin@)
 
 # Macros for datatype generation, nodeset compiler, etc.
 include("${CMAKE_CURRENT_LIST_DIR}/open62541Macros.cmake")
 
 check_required_components(open62541)
-
-include(CMakeFindDependencyMacro)
-if(open62541_crypto_plugin STREQUAL "MBEDTLS")
-  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-  find_dependency(MbedTLS REQUIRED)
-  list(REMOVE_AT CMAKE_MODULE_PATH -1)
-elseif(open62541_crypto_plugin STREQUAL "OPENSSL")
-  find_dependency(OpenSSL REQUIRED)
-elseif(open62541_crypto_plugin STREQUAL "LIBRESSL")
-  find_dependency(LibreSSL REQUIRED)
-endif()
diff --git a/tools/open62541.pc.in b/tools/open62541.pc.in
index 3776752994f..57271a278ff 100644
--- a/tools/open62541.pc.in
+++ b/tools/open62541.pc.in
@@ -5,5 +5,6 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 Name: open62541
 Description: open62541 is an open source C (C99) implementation of OPC UA
 Version: @OPEN62541_VER_MAJOR@.@OPEN62541_VER_MINOR@.@OPEN62541_VER_PATCH@@OPEN62541_VER_LABEL@
-Libs: -L${libdir} @pkgcfglibs@
+Libs: -L${libdir} -lopen62541 @pkgcfgpubliclibs@
+Requires.private: @pkgcfglibs@
 Cflags: -I${includedir} @PC_EXTRA_CFLAGS@

From 7c015e3e7bc1c1ae687726465ce49008f204b7db Mon Sep 17 00:00:00 2001
From: Roman Sinawski <r.sinawski@pilz.de>
Date: Mon, 1 Jul 2024 23:43:01 +0200
Subject: [PATCH 1577/1963] fix(client): Don't force
 UA_MESSAGESECURITYMODE_SIGNANDENCRYPT if encryption is disabled. (#6573)

Added static check for enabled encryption.
The discovery example fails (server_register can't register with the LDS) if encryption is disabled and this check is missing. It corresponds to UA_Server_register, line 475.
---
 src/server/ua_discovery.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
index 30db7723fc5..8c8360e97a2 100644
--- a/src/server/ua_discovery.c
+++ b/src/server/ua_discovery.c
@@ -374,8 +374,10 @@ discoveryClientStateCallback(UA_Client *client,
     UA_Client_getConnectionAttribute_scalar(client, UA_QUALIFIEDNAME(0, "securityMode"),
                                             &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE],
                                             &msm);
+#ifdef UA_ENABLE_ENCRYPTION 
     if(msm != UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
         return;
+#endif
 
     const UA_DataType *reqType;
     const UA_DataType *respType;

From 22cfafdbb36e3419172c0af63ca1bebb24206102 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Tue, 2 Jul 2024 09:50:57 +0200
Subject: [PATCH 1578/1963] refactor(build): Bump version to 1.4.2

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9ad8663b01..8b9e028044c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 1)
+set(OPEN62541_VER_PATCH 2)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 94ce469a891726f096bdf85a250adec26d164a26 Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Thu, 4 Jul 2024 13:03:06 +0200
Subject: [PATCH 1579/1963] refactor(examples): server_multicast.c: remove "NA"
 from server capabilities

server_multicast.c: remove "NA" from server capabilities and
only keep "LDS" as server capability.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 examples/discovery/server_multicast.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/discovery/server_multicast.c b/examples/discovery/server_multicast.c
index 1395fcfe582..ed454dc28c6 100644
--- a/examples/discovery/server_multicast.c
+++ b/examples/discovery/server_multicast.c
@@ -250,10 +250,9 @@ int main(int argc, char **argv) {
     // NOTE: UaExpert does not show LDS-only servers in the list.
     // See also: https://forum.unified-automation.com/topic1987.html
 
-    config->mdnsConfig.serverCapabilitiesSize = 2;
-    UA_String *caps = (UA_String *) UA_Array_new(2, &UA_TYPES[UA_TYPES_STRING]);
+    config->mdnsConfig.serverCapabilitiesSize = 1;
+    UA_String *caps = (UA_String *) UA_Array_new(1, &UA_TYPES[UA_TYPES_STRING]);
     caps[0] = UA_String_fromChars("LDS");
-    caps[1] = UA_String_fromChars("NA");
     config->mdnsConfig.serverCapabilities = caps;
 
     // Start the server and call iterate to wait for the multicast discovery of the LDS

From e2fba7c0c2b0096d7e221d1e2423a22b576d9a7d Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Thu, 4 Jul 2024 15:07:15 +0200
Subject: [PATCH 1580/1963] refactor(server): add local hostname if none given
 for LDS-ME.

In src/server/ua_discovery_mdns.c if no local hostname is
given and thus INADDR_ANY/0.0.0.0 should be used, use
gethostname() as local hostname.
Until now an error is returned from UA_Discovery_addRecord().

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 src/server/ua_discovery_mdns.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/server/ua_discovery_mdns.c b/src/server/ua_discovery_mdns.c
index f6f9b19e6db..f60273d0f15 100644
--- a/src/server/ua_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -821,6 +821,7 @@ static UA_StatusCode
 addMdnsRecordForNetworkLayer(UA_DiscoveryManager *dm, const UA_String *appName,
                              const UA_String *discoveryUrl) {
     UA_String hostname = UA_STRING_NULL;
+    char hoststr[256]; /* check with UA_MAXHOSTNAME_LENGTH */
     UA_UInt16 port = 4840;
     UA_String path = UA_STRING_NULL;
     UA_StatusCode retval =
@@ -832,6 +833,12 @@ addMdnsRecordForNetworkLayer(UA_DiscoveryManager *dm, const UA_String *appName,
         return retval;
     }
 
+    if (hostname.length == 0) {
+	gethostname(hoststr, sizeof(hoststr)-1);
+	hoststr[sizeof(hoststr)-1] = '\0';
+	hostname.data = (unsigned char *) hoststr;
+	hostname.length = strlen(hoststr);
+    }
     retval = UA_Discovery_addRecord(dm, appName, &hostname, port,
                                     &path, UA_DISCOVERY_TCP, true,
                                     dm->serverConfig->mdnsConfig.serverCapabilities,

From c230c13990d6fab97216548146920ca626ce7b0f Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Wed, 10 Jul 2024 06:44:23 +0200
Subject: [PATCH 1581/1963] refactor(server): define UA_HAS_GETIFADDR for posix
 builds

Define UA_HAS_GETIFADDR=1 for POSIX builds and fix a typo in
the comments: ppoll -> poll.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 include/open62541/config.h.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index e96b17121c4..baaa1fcb388 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -145,11 +145,13 @@
 #  define _BSD_SOURCE
 # endif
 
-/* Define _GNU_SOURCE to get functions like ppoll. Comment this out to
+/* Define _GNU_SOURCE to get functions like poll. Comment this out to
  * only use standard POSIX definitions. */
 # ifndef _GNU_SOURCE
 #  define _GNU_SOURCE
 # endif
+
+#define UA_HAS_GETIFADDR 1
 #endif
 
 /**

From 69acb3d961281e1f1d3dd80b814ddc35e060b2d6 Mon Sep 17 00:00:00 2001
From: matkonnerth <matthias.konnerth@engel.at>
Date: Fri, 19 Jul 2024 15:48:45 +0200
Subject: [PATCH 1582/1963] fix(server): Empty DiscoveryUrl instead of (null)
 (#6602)

do not add path to discoveryUrl if empty, otherwise (null) will be added to the discoveryUrl
---
 src/server/ua_discovery_mdns.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_discovery_mdns.c b/src/server/ua_discovery_mdns.c
index f60273d0f15..c53abd4d343 100644
--- a/src/server/ua_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -1268,11 +1268,16 @@ UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
 
         listEntry->txtSet = true;
 
-        UA_STACKARRAY(char, newUrl, 10 + hostnameLen + 8 + path->length + 1);
-        mp_snprintf(newUrl, 10 + hostnameLen + 8 + path->length + 1,
-                    "opc.tcp://%.*s:%d%s%.*s", (int) hostnameLen,
-                    hostname->data, port, path->length > 0 ? "/" : "",
-                    (int) path->length, path->data);
+        const size_t newUrlSize = 10 + hostnameLen + 8 + path->length + 1;
+        UA_STACKARRAY(char, newUrl, newUrlSize);
+        memset(newUrl, 0, newUrlSize);
+        if(path->length > 0) {
+            mp_snprintf(newUrl, newUrlSize, "opc.tcp://%.*s:%d%s%.*s", (int)hostnameLen,
+                        hostname->data, port, "/", (int)path->length, path->data);
+        } else {
+            mp_snprintf(newUrl, newUrlSize, "opc.tcp://%.*s:%d", (int)hostnameLen,
+                        hostname->data, port);
+        }
         listEntry->serverOnNetwork.discoveryUrl = UA_String_fromChars(newUrl);
         listEntry->srvSet = true;
     }

From 18bfc8e3f26b6a6f08f265012d8a8968842ce072 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 22 Jul 2024 11:33:20 +0200
Subject: [PATCH 1583/1963] refactor(pubsub): Fix typo in
 ua_pubsub_readergroup.c

---
 src/pubsub/ua_pubsub_readergroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 048b5d6aa3f..23513329eac 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -604,7 +604,7 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
 
     if(dsrCount > 1) {
         UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
-                                   "Mutiple DSR in a readerGroup not supported in RT "
+                                   "Multiple DSR in a readerGroup not supported in RT "
                                    "fixed size configuration");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
     }

From cec93e44d3c3589b32fee0e79e868aac1a5a90da Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 22 Jul 2024 14:55:24 +0200
Subject: [PATCH 1584/1963] refactor(build): Remove the "private" dependencies
 from the shared library pkg-config .pc

---
 CMakeLists.txt        | 7 ++++++-
 tools/open62541.pc.in | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b9e028044c..1603aa6aa1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1533,7 +1533,12 @@ foreach(lib ${open62541_PUBLIC_LIBRARIES})
     set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ")
 endforeach()
 
-string(REPLACE ";" ", " pkgcfglibs "${open62541_LIBRARIES}")
+if(BUILD_SHARED_LIBS)
+    foreach(lib ${open62541_LIBRARIES})
+        set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ")
+    endforeach()
+endif()
+
 configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open62541.pc @ONLY)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/tools/open62541.pc.in b/tools/open62541.pc.in
index 57271a278ff..50abf00af4e 100644
--- a/tools/open62541.pc.in
+++ b/tools/open62541.pc.in
@@ -6,5 +6,4 @@ Name: open62541
 Description: open62541 is an open source C (C99) implementation of OPC UA
 Version: @OPEN62541_VER_MAJOR@.@OPEN62541_VER_MINOR@.@OPEN62541_VER_PATCH@@OPEN62541_VER_LABEL@
 Libs: -L${libdir} -lopen62541 @pkgcfgpubliclibs@
-Requires.private: @pkgcfglibs@
 Cflags: -I${includedir} @PC_EXTRA_CFLAGS@

From 6998f16e29989b73ba2f7eb1326cf787dc34799a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 22 Jul 2024 14:59:19 +0200
Subject: [PATCH 1585/1963] refactor(build): Better comments in CMakeLists.txt

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1603aa6aa1f..0bb41121e46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1546,6 +1546,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
 
+# Install nodeset compiler
 install(DIRECTORY "tools/certs" "tools/nodeset_compiler"
         DESTINATION ${open62541_install_tools_dir}
         FILES_MATCHING
@@ -1555,6 +1556,7 @@ install(DIRECTORY "tools/certs" "tools/nodeset_compiler"
         PATTERN ".git*" EXCLUDE
         PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
 
+# Install schemas
 # Trailing slash to prevent "schema/schema" nesting
 install(DIRECTORY ${UA_SCHEMA_DIR}/
         DESTINATION ${open62541_install_schema_dir}
@@ -1565,6 +1567,7 @@ install(DIRECTORY ${UA_SCHEMA_DIR}/
         PATTERN "NodeIds.csv"
         PERMISSIONS OWNER_READ GROUP_READ)
 
+# Install python tools
 set(UA_install_tools_files "tools/generate_datatypes.py"
                            "tools/generate_nodeid_header.py"
                            "tools/generate_statuscode_descriptions.py")

From 6b6f2ab0323c1516b9d5278f028b5941bffe6d8b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 22 Jul 2024 14:59:56 +0200
Subject: [PATCH 1586/1963] fix(build): Remove the mbedtls::mbedtls namespace
 from FindMbedTLS.cmake

That way our library can be linked without having FindMbedTLS.cmake
installed locally.
---
 tools/cmake/FindMbedTLS.cmake | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/tools/cmake/FindMbedTLS.cmake b/tools/cmake/FindMbedTLS.cmake
index 80b78a6bbc6..d8bea4b3a69 100644
--- a/tools/cmake/FindMbedTLS.cmake
+++ b/tools/cmake/FindMbedTLS.cmake
@@ -19,20 +19,10 @@ else()
     find_library(MBEDCRYPTO_LIBRARY mbedcrypto HINTS ${MBEDTLS_FOLDER_LIBRARY})
 endif()
 
-if (NOT TARGET mbedtls::mbedtls)
-    # Only add library if not yet added. If project referenced multiple times, the target is also created multiple times.
-    add_library(mbedtls::mbedtls UNKNOWN IMPORTED)
-    set_property(TARGET mbedtls::mbedtls PROPERTY IMPORTED_LOCATION "${MBEDTLS_LIBRARY}")
-    add_library(mbedtls::mbedx509 UNKNOWN IMPORTED)
-    set_property(TARGET mbedtls::mbedx509 PROPERTY IMPORTED_LOCATION "${MBEDX509_LIBRARY}")
-    add_library(mbedtls::mbedcrypto UNKNOWN IMPORTED)
-    set_property(TARGET mbedtls::mbedcrypto PROPERTY IMPORTED_LOCATION "${MBEDCRYPTO_LIBRARY}")
-endif()
-
-set(MBEDTLS_LIBRARIES mbedtls::mbedtls mbedtls::mbedx509 mbedtls::mbedcrypto)
+set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(MbedTLS DEFAULT_MSG
-        MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
+find_package_handle_standard_args(MbedTLS DEFAULT_MSG MBEDTLS_INCLUDE_DIRS
+                                  MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
 
 mark_as_advanced(MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)

From 8f0c80a0b92eaa1eb3dd5180a53704ca3fb0476b Mon Sep 17 00:00:00 2001
From: Tiago <ti@gosantos.com.br>
Date: Mon, 22 Jul 2024 09:21:01 +0200
Subject: [PATCH 1587/1963] fix(core): Remove unnecessary semicolons from
 types.h

Removed semicolon from the end of min/max values #define's for float/double
---
 include/open62541/types.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index b5f1edcad22..b49300f7c14 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -119,16 +119,16 @@ typedef uint64_t UA_UInt64;
  * ^^^^^
  * An IEEE single precision (32 bit) floating point value. */
 typedef float UA_Float;
-#define UA_FLOAT_MIN FLT_MIN;
-#define UA_FLOAT_MAX FLT_MAX;
+#define UA_FLOAT_MIN FLT_MIN
+#define UA_FLOAT_MAX FLT_MAX
 
 /**
  * Double
  * ^^^^^^
  * An IEEE double precision (64 bit) floating point value. */
 typedef double UA_Double;
-#define UA_DOUBLE_MIN DBL_MIN;
-#define UA_DOUBLE_MAX DBL_MAX;
+#define UA_DOUBLE_MIN DBL_MIN
+#define UA_DOUBLE_MAX DBL_MAX
 
 /**
  * .. _statuscode:

From 1ecbe1b3dba656696ac74ebfccafecab67be871f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 22 Jul 2024 20:56:38 +0200
Subject: [PATCH 1588/1963] refactor(core): Make the "adjustType" functionality
 accessible for the client

---
 src/server/ua_services_attribute.c | 38 ++++-----------------------
 src/ua_util.c                      | 41 ++++++++++++++++++++++++++++++
 src/ua_util_internal.h             |  5 ++++
 3 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 48ef05e0843..0ca258dc83e 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -803,14 +803,6 @@ UA_Server_readObjectProperty(UA_Server *server, const UA_NodeId objectId,
 /* Type Checking */
 /*****************/
 
-static UA_DataTypeKind
-typeEquivalence(const UA_DataType *t) {
-    UA_DataTypeKind k = (UA_DataTypeKind)t->typeKind;
-    if(k == UA_DATATYPEKIND_ENUM)
-        return UA_DATATYPEKIND_INT32;
-    return k;
-}
-
 UA_Boolean
 compatibleValueDataType(UA_Server *server, const UA_DataType *dataType,
                         const UA_NodeId *constraintDataType) {
@@ -1153,41 +1145,21 @@ adjustValueType(UA_Server *server, UA_Variant *value,
     if(!type)
         return;
 
-    /* Unwrap ExtensionObject arrays if they all contain the same DataType */
-    unwrapEOArray(server, value);
-
     /* The target type is already achieved. No adjustment needed. */
     if(UA_NodeId_equal(&type->typeId, targetDataTypeId))
         return;
 
+    /* Unwrap ExtensionObject arrays if they all contain the same DataType */
+    unwrapEOArray(server, value);
+
     /* Find the target type */
     const UA_DataType *targetType =
         UA_findDataTypeWithCustom(targetDataTypeId, server->config.customDataTypes);
     if(!targetType)
         return;
 
-    /* A string is written to a byte array. the valuerank and array dimensions
-     * are checked later */
-    if(targetType == &UA_TYPES[UA_TYPES_BYTE] &&
-       type == &UA_TYPES[UA_TYPES_BYTESTRING] &&
-       UA_Variant_isScalar(value)) {
-        UA_ByteString *str = (UA_ByteString*)value->data;
-        value->type = &UA_TYPES[UA_TYPES_BYTE];
-        value->arrayLength = str->length;
-        value->data = str->data;
-        return;
-    }
-
-    /* An enum was sent as an int32, or an opaque type as a bytestring. This
-     * is detected with the typeKind indicating the "true" datatype. */
-    UA_DataTypeKind te1 = typeEquivalence(targetType);
-    UA_DataTypeKind te2 = typeEquivalence(type);
-    if(te1 == te2 && te1 <= UA_DATATYPEKIND_ENUM) {
-        value->type = targetType;
-        return;
-    }
-
-    /* Add more possible type adjustments here. What are they? */
+    /* Use the generic functionality shared by client and server */
+    adjustType(value, targetType);
 }
 
 static UA_StatusCode
diff --git a/src/ua_util.c b/src/ua_util.c
index 951608eb475..8e7324af8ae 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -18,6 +18,47 @@
 #include "pcg_basic.h"
 #include "base64.h"
 
+static UA_DataTypeKind
+typeEquivalence(const UA_DataType *t) {
+    UA_DataTypeKind k = (UA_DataTypeKind)t->typeKind;
+    if(k == UA_DATATYPEKIND_ENUM)
+        return UA_DATATYPEKIND_INT32;
+    return k;
+}
+
+void
+adjustType(UA_Variant *value, const UA_DataType *targetType) {
+    /* If the value is empty, there is nothing we can do here */
+    const UA_DataType *type = value->type;
+    if(!type || !targetType)
+        return;
+
+    /* A string is written to a byte array. the valuerank and array dimensions
+     * are checked later */
+    if(targetType == &UA_TYPES[UA_TYPES_BYTE] &&
+       type == &UA_TYPES[UA_TYPES_BYTESTRING] &&
+       UA_Variant_isScalar(value)) {
+        UA_ByteString *str = (UA_ByteString*)value->data;
+        value->type = &UA_TYPES[UA_TYPES_BYTE];
+        value->arrayLength = str->length;
+        value->data = str->data;
+        if(value->storageType != UA_VARIANT_DATA_NODELETE)
+            UA_free(str);
+        return;
+    }
+
+    /* An enum was sent as an int32, or an opaque type as a bytestring. This
+     * is detected with the typeKind indicating the "true" datatype. */
+    UA_DataTypeKind te1 = typeEquivalence(targetType);
+    UA_DataTypeKind te2 = typeEquivalence(type);
+    if(te1 == te2 && te1 <= UA_DATATYPEKIND_ENUM) {
+        value->type = targetType;
+        return;
+    }
+
+    /* Add more possible type adjustments here. What are they? */
+}
+
 size_t
 UA_readNumberWithBase(const UA_Byte *buf, size_t buflen, UA_UInt32 *number, UA_Byte base) {
     UA_assert(buf);
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 6fdc53a5de2..11f94372725 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -27,6 +27,11 @@ _UA_BEGIN_DECLS
 /* Macro-Expand for MSVC workarounds */
 #define UA_MACRO_EXPAND(x) x
 
+/* Try if the type of the value can be adjusted "in situ" to the target type.
+ * That can be done, for example, to map between int32 and an enum. */
+void
+adjustType(UA_Variant *value, const UA_DataType *targetType);
+
 /* Print a NodeId in logs */
 #define UA_LOG_NODEID_INTERNAL(NODEID, LEVEL, LOG)   \
     if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) {         \

From c34ae4910a4673bad5f8ae450868be3d49b52a2f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 22 Jul 2024 21:02:08 +0200
Subject: [PATCH 1589/1963] fix(client): Adjust the expected type during
 (async) read

Servers can send enums as Int32. This is now adjusted "in situ" without
an additional malloc.
---
 src/client/ua_client_highlevel.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index 83a522dd81e..351d031daaf 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -13,6 +13,7 @@
 
 #include <open62541/client_highlevel.h>
 #include <open62541/client_highlevel_async.h>
+#include "ua_util_internal.h"
 
 /* The highlevel client API is an "outer onion layer". This file does not
  * include ua_client_internal.h on purpose. */
@@ -871,13 +872,21 @@ AttributeReadCallback(UA_Client *client, void *userdata,
         goto finish;
     }
 
-    /* Check we have a scalar value of the right datatype */
-    if(!dv->hasValue ||
-       !UA_Variant_hasScalarType(&dv->value, ctx->resultType)) {
+    /* Check we have a value */
+    if(!dv->hasValue) {
         res = UA_STATUSCODE_BADINTERNALERROR;
         goto finish;
     }
 
+    /* Check the type. Try to adjust "in situ" if no match. */
+    if(!UA_Variant_hasScalarType(&dv->value, ctx->resultType)) {
+        adjustType(&dv->value, ctx->resultType);
+        if(!UA_Variant_hasScalarType(&dv->value, ctx->resultType)) {
+            res = UA_STATUSCODE_BADINTERNALERROR;
+            goto finish;
+        }
+    }
+
     /* Callback into userland */
     ctx->userCallback(client, ctx->userContext, requestId,
                       UA_STATUSCODE_GOOD, dv->value.data);

From 12142ad4b6d3224962871952de2ebd935ebf0294 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 22 Jul 2024 21:06:11 +0200
Subject: [PATCH 1590/1963] feat(tests): Add a test for async reading of the
 NodeClass

This previously failed as the "value adjustment" from int32 to the enum
was not done.
---
 tests/client/check_client_async.c | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/client/check_client_async.c b/tests/client/check_client_async.c
index 01343bccaa7..4761fea5c7f 100644
--- a/tests/client/check_client_async.c
+++ b/tests/client/check_client_async.c
@@ -142,6 +142,39 @@ START_TEST(Client_read_async) {
         UA_Client_delete(client);
 } END_TEST
 
+static void
+asyncReadNodeClassAttributeCallback(UA_Client *client, void *userdata,
+                                    UA_UInt32 requestId, UA_StatusCode status,
+                                    UA_NodeClass *nodeClass) {
+    ck_assert_uint_eq(status, UA_STATUSCODE_GOOD);
+    UA_UInt16 *asyncCounter = (UA_UInt16*)userdata;
+    (*asyncCounter)++;
+}
+
+START_TEST(Client_readNodeClass_async) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *clientConfig = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(clientConfig);
+
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_UInt16 asyncCounter = 0;
+    UA_NodeId cTimeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    retval = UA_Client_readNodeClassAttribute_async(client, cTimeId,
+                                                    asyncReadNodeClassAttributeCallback,
+                                                    &asyncCounter, NULL);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Process async responses during 1s */
+    while(asyncCounter == 0)
+        retval |= UA_Client_run_iterate(client, 999);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+} END_TEST
+
 START_TEST(Client_read_async_timed) {
         UA_Client *client = UA_Client_new();
         UA_ClientConfig *clientConfig = UA_Client_getConfig(client);
@@ -248,6 +281,7 @@ static Suite* testSuite_Client(void) {
     TCase *tc_client = tcase_create("Client Basic");
     tcase_add_checked_fixture(tc_client, setup, teardown);
     tcase_add_test(tc_client, Client_read_async);
+    tcase_add_test(tc_client, Client_readNodeClass_async);
     tcase_add_test(tc_client, Client_read_async_timed);
     tcase_add_test(tc_client, Client_connectivity_check);
     tcase_add_test(tc_client, Client_highlevel_async_readValue);

From 48e08399cd07bb3d615b1a86ea0a402585d698e2 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 12 Jul 2024 16:15:24 +0200
Subject: [PATCH 1591/1963] fix(server): Allow dynamic port assignment

---
 arch/eventloop_posix_tcp.c                    | 40 +++++++++------
 arch/eventloop_posix_udp.c                    | 18 +++++--
 .../include/open62541/server_config_default.h |  6 ++-
 plugins/ua_config_default.c                   | 50 +++++++++----------
 4 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 450f04e792e..152412790a9 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -380,21 +380,6 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    /* If the INADDR_ANY is used, use the local hostname */
-    char hoststr[UA_MAXHOSTNAME_LENGTH];
-    if(hostname) {
-        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                    "TCP %u\t| Creating listen socket for \"%s\" on port %u",
-                    (unsigned)listenSocket, hostname, port);
-    } else {
-        gethostname(hoststr, UA_MAXHOSTNAME_LENGTH);
-        hostname = hoststr;
-        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                    "TCP %u\t| Creating listen socket for \"%s\" "
-                    "(with local hostname \"%s\") on port %u",
-                    (unsigned)listenSocket, addrstr, hostname, port);
-    }
-
     /* Some Linux distributions have net.ipv6.bindv6only not activated. So
      * sockets can double-bind to IPv4 and IPv6. This leads to problems. Use
      * AF_INET6 sockets only for IPv6. */
@@ -441,6 +426,31 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
 
     /* Bind socket to address */
     int ret = bind(listenSocket, ai->ai_addr, (socklen_t)ai->ai_addrlen);
+
+    /* Get the port being used if dynamic porting was used */
+    if(port == 0) {
+        struct sockaddr_in sin;
+        memset(&sin, 0, sizeof(sin));
+        socklen_t len = sizeof(sin);
+        getsockname(listenSocket, (struct sockaddr *)&sin, &len);
+        port = ntohs(sin.sin_port);
+    }
+
+    /* If the INADDR_ANY is used, use the local hostname */
+    char hoststr[UA_MAXHOSTNAME_LENGTH];
+    if(hostname) {
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP %u\t| Creating listen socket for \"%s\" on port %u",
+                    (unsigned)listenSocket, hostname, port);
+    } else {
+        gethostname(hoststr, UA_MAXHOSTNAME_LENGTH);
+        hostname = hoststr;
+        UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                    "TCP %u\t| Creating listen socket for \"%s\" "
+                    "(with local hostname \"%s\") on port %u",
+                    (unsigned)listenSocket, addrstr, hostname, port);
+    }
+
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index e5f58d38848..dd160bc301c 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -762,10 +762,6 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
-    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
-                "UDP %u\t| New listen socket for \"%s\" on port %u",
-                (unsigned)listenSocket, hoststr, port);
-
     /* Set the socket configuration per the parameters */
     UA_StatusCode res =
         setConnectionConfig(listenSocket, params,
@@ -807,6 +803,20 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
 #else
     int ret = bind(listenSocket, info->ai_addr, (socklen_t)info->ai_addrlen);
 #endif
+
+    /* Get the port being used if dynamic porting was used */
+    if(port == 0) {
+        struct sockaddr_in sin;
+        memset(&sin, 0, sizeof(sin));
+        socklen_t len = sizeof(sin);
+        getsockname(listenSocket, (struct sockaddr *)&sin, &len);
+        port = ntohs(sin.sin_port);
+    }
+
+    UA_LOG_INFO(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+            "UDP %u\t| New listen socket for \"%s\" on port %u",
+            (unsigned)listenSocket, hoststr, port);
+
     if(ret < 0) {
         UA_LOG_SOCKET_ERRNO_WRAP(
            UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
diff --git a/plugins/include/open62541/server_config_default.h b/plugins/include/open62541/server_config_default.h
index 2ce8666f0cb..d3828b30d49 100644
--- a/plugins/include/open62541/server_config_default.h
+++ b/plugins/include/open62541/server_config_default.h
@@ -28,8 +28,9 @@ UA_ConnectionConfig UA_ConnectionConfig_default;
 /* Creates a new server config with one endpoint and custom buffer size.
  *
  * The config will set the tcp network layer to the given port and adds a single
- * endpoint with the security policy ``SecurityPolicy#None`` to the server. A
- * server certificate may be supplied but is optional.
+ * endpoint with the security policy ``SecurityPolicy#None`` to the server.
+ * If the port is set to 0, it will be dynamically assigned.
+ * A server certificate may be supplied but is optional.
  * Additionally you can define a custom buffer size for send and receive buffer.
  *
  * @param portNumber The port number for the tcp network layer
@@ -113,6 +114,7 @@ UA_ServerConfig_setBasics(UA_ServerConfig *conf);
  * Use the various UA_ServerConfig_addXxx functions to add them.
  * The config will set the tcp network layer to the given port if the
  * eventloop is not already set.
+ * If the port is set to 0, it will be dynamically assigned.
  *
  * @param conf The configuration to manipulate
  * @param portNumber The port number for the tcp network layer
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index f5197957049..e13b99192a4 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -400,34 +400,34 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 
     if(portNumber == 0) {
         UA_LOG_WARNING(conf->logging, UA_LOGCATEGORY_USERLAND,
-                       "Cannot set the ServerUrl with a zero port");
-    } else {
-        if(conf->serverUrlsSize > 0) {
-            UA_LOG_WARNING(conf->logging, UA_LOGCATEGORY_USERLAND,
-                           "ServerUrls already set. Overriding.");
-            UA_Array_delete(conf->serverUrls, conf->serverUrlsSize,
-                            &UA_TYPES[UA_TYPES_STRING]);
-            conf->serverUrls = NULL;
-            conf->serverUrlsSize = 0;
-        }
-
-        /* Listen on all interfaces (also external). This must be the first
-         * entry if this is desired. Otherwise some interfaces may be blocked
-         * (already in use) with a hostname that is only locally reachable.*/
-        mp_snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
-                    "opc.tcp://:%u", portNumber);
-        serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[0]);
-        serverUrlsSize++;
+                       "Dynamic port assignment will be used.");
+    }
 
-        /* Add to the config */
-        UA_StatusCode retval =
-            UA_Array_copy(serverUrls, serverUrlsSize,
-                          (void**)&conf->serverUrls, &UA_TYPES[UA_TYPES_STRING]);
-        if(retval != UA_STATUSCODE_GOOD)
-            return retval;
-        conf->serverUrlsSize = serverUrlsSize;
+    if(conf->serverUrlsSize > 0) {
+        UA_LOG_WARNING(conf->logging, UA_LOGCATEGORY_USERLAND,
+                       "ServerUrls already set. Overriding.");
+        UA_Array_delete(conf->serverUrls, conf->serverUrlsSize,
+                        &UA_TYPES[UA_TYPES_STRING]);
+        conf->serverUrls = NULL;
+        conf->serverUrlsSize = 0;
     }
 
+    /* Listen on all interfaces (also external). This must be the first
+     * entry if this is desired. Otherwise some interfaces may be blocked
+     * (already in use) with a hostname that is only locally reachable.*/
+    mp_snprintf(serverUrlBuffer[0], sizeof(serverUrlBuffer[0]),
+                "opc.tcp://:%u", portNumber);
+    serverUrls[serverUrlsSize] = UA_STRING(serverUrlBuffer[0]);
+    serverUrlsSize++;
+
+    /* Add to the config */
+    UA_StatusCode retval =
+        UA_Array_copy(serverUrls, serverUrlsSize,
+                      (void**)&conf->serverUrls, &UA_TYPES[UA_TYPES_STRING]);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+    conf->serverUrlsSize = serverUrlsSize;
+
     /* Endpoints */
     /* conf->endpoints = {0, NULL}; */
 

From 253fc8abd5855851acc0f0d7fa62c98d2487f4f2 Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Wed, 24 Jul 2024 07:04:48 +0200
Subject: [PATCH 1592/1963] refactor(examples): do not set an invalid IP in
 server_multicast.c

Currently an IP 42.42.42.42 is set and the comment suggests that
the network stack resets this to 0.0.0.0 in server_multicast.c.
Just set 0.0.0.0 directly.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 examples/discovery/server_multicast.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/discovery/server_multicast.c b/examples/discovery/server_multicast.c
index ed454dc28c6..4f7fa3c9daf 100644
--- a/examples/discovery/server_multicast.c
+++ b/examples/discovery/server_multicast.c
@@ -241,7 +241,7 @@ int main(int argc, char **argv) {
     config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample Multicast Server");
 
     //setting custom outbound interface
-    config->mdnsInterfaceIP = UA_String_fromChars("42.42.42.42"); //this line will produce an error and set the interface to 0.0.0.0
+    config->mdnsInterfaceIP = UA_String_fromChars("0.0.0.0");
 
     // See http://www.opcfoundation.org/UA/schemas/1.03/ServerCapabilities.csv
     // For a LDS server, you should only indicate the LDS capability.

From 213fb1101d47c5f9e9b7b06675cbbba78c729c80 Mon Sep 17 00:00:00 2001
From: Roman Sinawski <r.sinawski@pilz.de>
Date: Wed, 24 Jul 2024 11:35:11 +0200
Subject: [PATCH 1593/1963] Make UA_SCHEMA_DIR an internal cache variable.

Fix for issue #6609 (build fails if open62541 is not the top level folder in a project hierarchy).
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bb41121e46..f4e1bc0f3f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1111,7 +1111,7 @@ set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path
 
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     # Use the "full" schema files also for datatypes and statuscodes
-    set(UA_SCHEMA_DIR ${UA_NODESET_DIR}/Schema)
+    set(UA_SCHEMA_DIR ${UA_NODESET_DIR}/Schema CACHE INTERNAL "")
 
     # Set the full Nodeset for NS0
     if(NOT UA_FILE_NS0)
@@ -1129,7 +1129,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     endif()
 else()
     # Directory with the schema files for installation
-    set(UA_SCHEMA_DIR ${PROJECT_SOURCE_DIR}/tools/schema)
+    set(UA_SCHEMA_DIR ${PROJECT_SOURCE_DIR}/tools/schema CACHE INTERNAL "")
 
     # Set the reduced Nodeset for NS0
     if(NOT UA_FILE_NS0)

From 20bee0fe7393e5f14f9c738b30acaeaeb4396775 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 15 Jul 2024 11:29:11 +0200
Subject: [PATCH 1594/1963] fix(client): GetEndpoints does not match user
 identity token if no session is required

---
 src/client/ua_client_connect.c | 67 +++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index f3acbfa269e..7b1b2f7db4f 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -929,12 +929,12 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         }
 
         /* We have found a matching endpoint.
-         * But does it contain a matching user token policy? */
+         * But maybe not a amtching user token policy. */
         bestEndpointIndex = i;
 
-        /* Look for a supported user token policy */
+        /* Compare the available UserTokenPolicies */
         for(size_t j = 0; j < endpoint->userIdentityTokensSize; ++j) {
-            UA_UserTokenPolicy* tokenPolicy = &endpoint->userIdentityTokens[j];
+            UA_UserTokenPolicy *tokenPolicy = &endpoint->userIdentityTokens[j];
             const UA_DataType *tokenType =
                 client->config.userIdentityToken.content.decoded.type;
 
@@ -1008,19 +1008,8 @@ responseGetEndpoints(UA_Client *client, void *userdata,
             bestEndpointLevel = endpoint->securityLevel;
             bestTokenIndex = j;
 
-            /* Move to the client config */
-            UA_EndpointDescription_clear(&client->config.endpoint);
-            client->config.endpoint = *endpoint;
-            UA_EndpointDescription_init(endpoint);
-            UA_UserTokenPolicy_clear(&client->config.userTokenPolicy);
-            client->config.userTokenPolicy = *tokenPolicy;
-            UA_UserTokenPolicy_init(tokenPolicy);
-
-            /* Store the Server Description */
-            UA_ApplicationDescription_clear(&client->serverDescription);
-            UA_ApplicationDescription_copy(&endpoint->server,
-                                           &client->serverDescription);
-
+            /* Stop search for the UserTokenPolicy. But we go on searching for
+             * an endpoints with a better security level. */
             break;
         }
     }
@@ -1032,7 +1021,9 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         closeSecureChannel(client);
         UA_UNLOCK(&client->clientMutex);
         return;
-    } else if(bestTokenIndex == notFound) {
+    }
+
+    if(!client->config.noSession && bestTokenIndex == notFound) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "No suitable UserTokenPolicy found for the possible endpoints");
         client->connectStatus = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
@@ -1041,29 +1032,45 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         return;
     }
 
-    /* Log the selected Endpoint and UserTokenPolicy */
+    /* Move the application description and endpoint information to the client config */
+    UA_EndpointDescription *endpoint = &resp->endpoints[bestEndpointIndex];
+    UA_ApplicationDescription_clear(&client->serverDescription);
+    UA_ApplicationDescription_copy(&endpoint->server, &client->serverDescription);
+    UA_EndpointDescription_clear(&client->config.endpoint);
+    client->config.endpoint = *endpoint;
+
 #if UA_LOGLEVEL <= 300
-    UA_EndpointDescription *endpoint = &client->config.endpoint;
-    UA_UserTokenPolicy *tokenPolicy = &client->config.userTokenPolicy;
-    UA_String *securityPolicyUri = &tokenPolicy->securityPolicyUri;
     const char *securityModeNames[3] = {"None", "Sign", "SignAndEncrypt"};
-    const char *userTokenTypeNames[4] =
-        {"Anonymous", "UserName", "Certificate", "IssuedToken"};
-
     UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                 "Selected endpoint %lu in URL %.*s with SecurityMode "
                 "%s and SecurityPolicy %.*s",
                 (long unsigned)bestEndpointIndex, (int)endpoint->endpointUrl.length,
                 endpoint->endpointUrl.data, securityModeNames[endpoint->securityMode - 1],
                 (int)endpoint->securityPolicyUri.length, endpoint->securityPolicyUri.data);
+#endif
 
-    UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                "Selected UserTokenPolicy %.*s with UserTokenType %s "
-                "and SecurityPolicy %.*s",
-                (int)tokenPolicy->policyId.length, tokenPolicy->policyId.data,
-                userTokenTypeNames[tokenPolicy->tokenType],
-                (int)securityPolicyUri->length, securityPolicyUri->data);
+    /* Move the UserTokenPolicy information to the client config */
+    if(bestTokenIndex != notFound) {
+        UA_UserTokenPolicy *tokenPolicy = &endpoint->userIdentityTokens[bestTokenIndex];
+        UA_assert(tokenPolicy);
+        UA_UserTokenPolicy_clear(&client->config.userTokenPolicy);
+        client->config.userTokenPolicy = *tokenPolicy;
+        UA_UserTokenPolicy_init(tokenPolicy);
+#if UA_LOGLEVEL <= 300
+        UA_String *securityPolicyUri = &tokenPolicy->securityPolicyUri;
+        const char *userTokenTypeNames[4] =
+            {"Anonymous", "UserName", "Certificate", "IssuedToken"};
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                    "Selected UserTokenPolicy %.*s with UserTokenType %s "
+                    "and SecurityPolicy %.*s",
+                    (int)tokenPolicy->policyId.length, tokenPolicy->policyId.data,
+                    userTokenTypeNames[tokenPolicy->tokenType],
+                    (int)securityPolicyUri->length, securityPolicyUri->data);
 #endif
+    }
+
+    /* Don't clean up later -- was moved to the client config */
+    UA_EndpointDescription_init(endpoint);
 
     /* Close the SecureChannel -- a different SecurityMode or SecurityPolicy is
      * defined by the Endpoint. */

From 69586cf0ef9a1cd44629921cf8bb408431df57c5 Mon Sep 17 00:00:00 2001
From: Thomas Vetter <80452158+thomvet@users.noreply.github.com>
Date: Thu, 27 Jun 2024 16:38:05 +0200
Subject: [PATCH 1595/1963] fix(client) UA_Client_connectSecureChannel_async
 not async.

It seems that UA_Client_connectSecureChannel_async should connect asynchronously as the name suggests.

Problem introduced in: https://github.com/open62541/open62541/pull/5789
---
 include/open62541/client.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 945bc4b40ba..31dcbe39547 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -432,7 +432,7 @@ UA_Client_connectSecureChannelAsync(UA_Client *client, const char *endpointUrl)
     cc->endpointUrl = UA_STRING_ALLOC(endpointUrl);
 
     /* Connect */
-    return __UA_Client_connect(client, false);
+    return __UA_Client_connect(client, true);
 }
 
 /* Connect to the server and create+activate a Session with the given username

From 763f1789a9974830bf40577bbd3d24997c8433de Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:33:14 +0200
Subject: [PATCH 1596/1963] fix(server): Check bounding properly before
 converting time until next scheduled callback

---
 src/server/ua_server.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 7ca0b0256bd..473903ea558 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -818,6 +818,8 @@ UA_Server_run_iterate(UA_Server *server, UA_Boolean waitInternal) {
     /* Return the time until the next scheduled callback */
     UA_DateTime now = el->dateTime_nowMonotonic(el);
     UA_DateTime nextTimeout = (el->nextCyclicTime(el) - now) / UA_DATETIME_MSEC;
+    if(nextTimeout < 0)
+        nextTimeout = 0;
     if(nextTimeout > UA_UINT16_MAX)
         nextTimeout = UA_UINT16_MAX;
     return (UA_UInt16)nextTimeout;

From a709a0e89317386adc59cd52f1bb6582865d49cc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:56:37 +0200
Subject: [PATCH 1597/1963] refactor(build): Bump version to v1.4.3

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4e1bc0f3f2..aa323029223 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 2)
+set(OPEN62541_VER_PATCH 3)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 319b4251d0855fe2861f2a6b24b1cff09844f483 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 29 Jul 2024 21:36:36 +0200
Subject: [PATCH 1598/1963] fix(arch): Fix setting the source address in the
 Ethernet frame

This fixes #6623 reported by @Bubeck-ISW.
---
 arch/eventloop_posix_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index c04a72fb844..636e8fe2815 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -162,7 +162,7 @@ setETHHeader(unsigned char *buf,
     size_t pos = 0;
     memcpy(buf, destAddr, ETHER_ADDR_LEN);
     pos += ETHER_ADDR_LEN;
-    memcpy(&buf[pos], destAddr, ETHER_ADDR_LEN);
+    memcpy(&buf[pos], sourceAddr, ETHER_ADDR_LEN);
     pos += ETHER_ADDR_LEN;
 
     /* Set the 802.1Q VLAN header */

From a1e11a04bef7c95e9df73dd59345e13436074917 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 31 Jul 2024 08:41:39 +0200
Subject: [PATCH 1599/1963] refactor(arch): Don't wait until the MQTT
 keep-alive timeout to send a ping

---
 arch/eventloop_mqtt.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index 69087e2abfb..9256a347551 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -421,8 +421,6 @@ findTopicConnection(MQTTConnectionManager *mcm, uintptr_t id) {
 static void
 MQTTKeepAliveCallback(void *app, MQTTBrokerConnection *bc) {
     (void)app;
-    if(bc->lastSendTime + (bc->keepalive * UA_DATETIME_SEC) > UA_DateTime_nowMonotonic())
-        return;
     mqtt_ping(&bc->client);
     __mqtt_send(&bc->client);
 }
@@ -654,7 +652,7 @@ createBrokerConnection(MQTTConnectionManager *mcm, const UA_KeyValueMap *params,
 
     UA_EventLoop *el = mcm->cm.eventSource.eventLoop;
     res = el->addCyclicCallback(el, (UA_Callback)MQTTKeepAliveCallback, NULL, bc,
-                                (UA_Double)(bc->keepalive * UA_DATETIME_SEC),
+                                (UA_Double)(bc->keepalive * 0.75 * UA_DATETIME_SEC),
                                 NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
                                 &bc->keepAliveCallbackId);
     if(res != UA_STATUSCODE_GOOD) {

From 899717cc07b30d767f53bb401ead5bc9a4265488 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 31 Jul 2024 09:24:01 +0200
Subject: [PATCH 1600/1963] refactor(plugin): Simplify key loading

---
 .../ua_securitypolicy_aes128sha256rsaoaep.c       | 15 +++------------
 .../ua_securitypolicy_aes256sha256rsapss.c        | 15 +++------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
index f97b262bb97..45b3c9d14b1 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
@@ -599,24 +599,15 @@ updateCertificateAndPrivateKey_sp_aes128sha256rsaoaep(UA_SecurityPolicy *securit
 
     UA_ByteString_clear(&securityPolicy->localCertificate);
 
-    UA_StatusCode retval = UA_ByteString_allocBuffer(&securityPolicy->localCertificate,
-                                                     newCertificate.length + 1);
+    UA_StatusCode retval = UA_mbedTLS_LoadLocalCertificate(&newCertificate, &securityPolicy->localCertificate);
+
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
-    memcpy(securityPolicy->localCertificate.data, newCertificate.data, newCertificate.length);
-    securityPolicy->localCertificate.data[newCertificate.length] = '\0';
-    securityPolicy->localCertificate.length--;
 
     /* Set the new private key */
     mbedtls_pk_free(&pc->localPrivateKey);
     mbedtls_pk_init(&pc->localPrivateKey);
-#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
-    int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
-                                       newPrivateKey.length, NULL, 0);
-#else
-    int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
-                                       newPrivateKey.length, NULL, 0, mbedtls_entropy_func, &pc->drbgContext);
-#endif
+    int mbedErr = UA_mbedTLS_LoadPrivateKey(&newPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c b/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
index 0aa5cbb8f8d..13547d6fe0a 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
@@ -692,24 +692,15 @@ updateCertificateAndPrivateKey_sp_aes256sha256rsapss(UA_SecurityPolicy *security
 
     UA_ByteString_clear(&securityPolicy->localCertificate);
 
-    UA_StatusCode retval = UA_ByteString_allocBuffer(&securityPolicy->localCertificate,
-                                                     newCertificate.length + 1);
+    UA_StatusCode retval = UA_mbedTLS_LoadLocalCertificate(&newCertificate, &securityPolicy->localCertificate);
+
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
-    memcpy(securityPolicy->localCertificate.data, newCertificate.data, newCertificate.length);
-    securityPolicy->localCertificate.data[newCertificate.length] = '\0';
-    securityPolicy->localCertificate.length--;
 
     /* Set the new private key */
     mbedtls_pk_free(&pc->localPrivateKey);
     mbedtls_pk_init(&pc->localPrivateKey);
-#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
-    int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
-                                       newPrivateKey.length, NULL, 0);
-#else
-    int mbedErr = mbedtls_pk_parse_key(&pc->localPrivateKey, newPrivateKey.data,
-                                       newPrivateKey.length, NULL, 0, mbedtls_entropy_func, &pc->drbgContext);
-#endif
+    int mbedErr = UA_mbedTLS_LoadPrivateKey(&newPrivateKey, &pc->localPrivateKey, &pc->entropyContext);
     if(mbedErr) {
         retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         goto error;

From 647efea2197466bab7ed223712178ec48146fb98 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Fri, 2 Aug 2024 11:23:16 +0200
Subject: [PATCH 1601/1963] fix(arch): Use the correct time-interval for the
 MQTT keep-alive ping

---
 arch/eventloop_mqtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/eventloop_mqtt.c b/arch/eventloop_mqtt.c
index 9256a347551..591edbd49ac 100644
--- a/arch/eventloop_mqtt.c
+++ b/arch/eventloop_mqtt.c
@@ -652,7 +652,7 @@ createBrokerConnection(MQTTConnectionManager *mcm, const UA_KeyValueMap *params,
 
     UA_EventLoop *el = mcm->cm.eventSource.eventLoop;
     res = el->addCyclicCallback(el, (UA_Callback)MQTTKeepAliveCallback, NULL, bc,
-                                (UA_Double)(bc->keepalive * 0.75 * UA_DATETIME_SEC),
+                                (UA_Double)(bc->keepalive * 0.75 * UA_DATETIME_MSEC),
                                 NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME,
                                 &bc->keepAliveCallbackId);
     if(res != UA_STATUSCODE_GOOD) {

From 8d7fabcefe8d94d3a929567f42e4b591acbb83e6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 2 Aug 2024 14:52:05 +0200
Subject: [PATCH 1602/1963] refactor(deps): Use only base64 routines under the
 BSD license

The code from stackoverflow was (by default) under CC-BY-SA license.
This has raised some unclear points concerning copyleft.
---
 deps/base64.c | 116 ++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 55 deletions(-)

diff --git a/deps/base64.c b/deps/base64.c
index ce60b663e1c..2cf8ec803e8 100644
--- a/deps/base64.c
+++ b/deps/base64.c
@@ -1,10 +1,9 @@
 /*
- * Base64 encoding: Copyright (c) 2005-2011, Jouni Malinen <j@w1.fi>
- * This software may be distributed under the terms of the BSD license.
+ * Base64 encoding/decoding (RFC1341)
+ * Copyright (c) 2005-2011, Jouni Malinen <j@w1.fi>
  *
- * Base64 decoding: Copyright (c) 2016, polfosol
- * Posted at https://stackoverflow.com/a/37109258 under the CC-BY-SA Creative
- * Commons license.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "base64.h"
@@ -55,61 +54,68 @@ UA_base64(const unsigned char *src, size_t len, size_t *out_len) {
 	return out;
 }
 
-static const uint32_t from_b64[256] = {
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  62, 63, 62, 62, 63,
-    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 0,  0,  0,  0,  0,  0,
-    0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14,
-    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0,  0,  0,  0,  63,
-    0,  26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
+static unsigned char dtable[256] = {
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 62  , 0x80, 62  , 0x80, 63  ,
+	52  , 53  , 54  , 55  , 56  , 57  , 58  , 59  , 60  , 61  , 0x80, 0x80, 0x80, 0, 0x80, 0x80,
+	0x80, 0   , 1   , 2   , 3   , 4   , 5   , 6   , 7   , 8   , 9   , 10  , 11  , 12  , 13  , 14  ,
+	15  , 16  , 17  , 18  , 19  , 20  , 21  , 22  , 23  , 24  , 25  , 0x80, 0x80, 0x80, 0x80, 63  ,
+	0x80, 26  , 27  , 28  , 29  , 30  , 31  , 32  , 33  , 34  , 35  , 36  , 37  , 38  , 39  , 40  ,
+	41  , 42  , 43  , 44  , 45  , 46  , 47  , 48  , 49  , 50  , 51  , 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80
+};
 
 unsigned char *
 UA_unbase64(const unsigned char *src, size_t len, size_t *out_len) {
-    // we need a minimum length
-    if(len <= 2) {
-        *out_len = 0;
-        return (unsigned char*)UA_EMPTY_ARRAY_SENTINEL;
-    }
-
-    const unsigned char *p = src;
-    size_t pad1 = len % 4 || p[len - 1] == '=';
-    size_t pad2 = pad1 && (len % 4 > 2 || p[len - 2] != '=');
-    const size_t last = (len - pad1) / 4 << 2;
+	if(len == 0)
+		return NULL;
 
-    unsigned char *str = (unsigned char*)UA_malloc(last / 4 * 3 + pad1 + pad2);
-    if(!str)
-        return NULL;
+    unsigned char *out, *pos;
+	size_t olen = len / 4 * 3;
+	pos = out = (unsigned char*)UA_malloc(olen);
+	if(!out)
+		return NULL;
 
-    unsigned char *pos = str;
-    for(size_t i = 0; i < last; i += 4) {
-        uint32_t n = from_b64[p[i]] << 18 | from_b64[p[i + 1]] << 12 |
-                     from_b64[p[i + 2]] << 6 | from_b64[p[i + 3]];
-        *pos++ = (unsigned char)(n >> 16);
-        *pos++ = (unsigned char)(n >> 8 & 0xFF);
-        *pos++ = (unsigned char)(n & 0xFF);
-    }
+	int pad = 0;
+	size_t count = 0;
+    unsigned char block[4];
+	for(size_t i = 0; i < len; i++) {
+		unsigned char tmp = dtable[src[i]];
+		if(tmp == 0x80)
+			continue;
 
-    if(pad1) {
-        if (last + 1 >= len) {
-            UA_free(str);
-            *out_len = 0;
-            return (unsigned char*)UA_EMPTY_ARRAY_SENTINEL;
-        }
-        uint32_t n = from_b64[p[last]] << 18 | from_b64[p[last + 1]] << 12;
-        *pos++ = (unsigned char)(n >> 16);
-        if(pad2) {
-            if (last + 2 >= len) {
-                UA_free(str);
-                *out_len = 0;
-                return (unsigned char*)UA_EMPTY_ARRAY_SENTINEL;
-            }
-            n |= from_b64[p[last + 2]] << 6;
-            *pos++ = (unsigned char)(n >> 8 & 0xFF);
-        }
-    }
+		if(src[i] == '=')
+			pad++;
+		block[count] = tmp;
+		count++;
+		if(count == 4) {
+			*pos++ = (block[0] << 2) | (block[1] >> 4);
+			*pos++ = (block[1] << 4) | (block[2] >> 2);
+			*pos++ = (block[2] << 6) | block[3];
+			count = 0;
+			if(pad) {
+				if(pad == 1)
+					pos--;
+				else if(pad == 2)
+					pos -= 2;
+				else {
+					/* Invalid padding */
+					UA_free(out);
+					return NULL;
+				}
+				break;
+			}
+		}
+	}
 
-    *out_len = (uintptr_t)(pos - str);
-    return str;
+	*out_len = (size_t)(pos - out);
+	return out;
 }

From 5131c69f3696afd745c2440d4333693a067d8d41 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 2 Aug 2024 15:24:29 +0200
Subject: [PATCH 1603/1963] feat(deps): Better validation during base64
 decoding

---
 deps/base64.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/deps/base64.c b/deps/base64.c
index 2cf8ec803e8..1dac29f8a92 100644
--- a/deps/base64.c
+++ b/deps/base64.c
@@ -75,7 +75,7 @@ static unsigned char dtable[256] = {
 
 unsigned char *
 UA_unbase64(const unsigned char *src, size_t len, size_t *out_len) {
-	if(len == 0)
+	if(len == 0 || len % 4 != 0)
 		return NULL;
 
     unsigned char *out, *pos;
@@ -84,38 +84,40 @@ UA_unbase64(const unsigned char *src, size_t len, size_t *out_len) {
 	if(!out)
 		return NULL;
 
-	int pad = 0;
-	size_t count = 0;
+	size_t pad = 0;
+    unsigned char count = 0;
     unsigned char block[4];
 	for(size_t i = 0; i < len; i++) {
 		unsigned char tmp = dtable[src[i]];
-		if(tmp == 0x80)
-			continue;
+        if(tmp == 0x80)
+            goto error; /* Invalid input */
 
 		if(src[i] == '=')
 			pad++;
+
 		block[count] = tmp;
 		count++;
 		if(count == 4) {
 			*pos++ = (block[0] << 2) | (block[1] >> 4);
 			*pos++ = (block[1] << 4) | (block[2] >> 2);
 			*pos++ = (block[2] << 6) | block[3];
-			count = 0;
 			if(pad) {
-				if(pad == 1)
-					pos--;
-				else if(pad == 2)
-					pos -= 2;
-				else {
-					/* Invalid padding */
-					UA_free(out);
-					return NULL;
-				}
+                if(pad == 1)
+                    pos--;
+                else if(pad == 2)
+                    pos -= 2;
+                else
+                    goto error; /* Invalid padding */
 				break;
-			}
+            }
+			count = 0;
 		}
 	}
 
 	*out_len = (size_t)(pos - out);
 	return out;
+
+ error:
+    UA_free(out);
+    return NULL;
 }

From 253fcabd400fe87db0cfa27535929d432aabc963 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 2 Aug 2024 15:52:05 +0200
Subject: [PATCH 1604/1963] fix(tests): Fix decoding of bad JSON

---
 tests/check_types_builtin_json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/check_types_builtin_json.c b/tests/check_types_builtin_json.c
index 28b54484a91..ccf3fbaf828 100644
--- a/tests/check_types_builtin_json.c
+++ b/tests/check_types_builtin_json.c
@@ -4339,7 +4339,7 @@ START_TEST(UA_ByteString_bad_json_decode) {
     
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_BYTESTRING]);
     // then
-    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_ne(retval, UA_STATUSCODE_GOOD);
     UA_ByteString_clear(&out);
 }
 END_TEST

From 55990fd579de976a2df0d18931d0fc0fd0fad854 Mon Sep 17 00:00:00 2001
From: lbm <lbm@keba.com>
Date: Mon, 5 Aug 2024 11:24:16 +0200
Subject: [PATCH 1605/1963] fix(pubsub): Change include syntax

Changes the include syntax for the 'ua_pubsub_keystorage.h' file from
<> to "". This resolves a compile error that occurred because the
compiler was unable to find the file when it was included with <>
signs, which are typically used for system libraries. Now, with the ""
signs, the compiler should be able to locate the file in the local
directory.
---
 src/pubsub/ua_pubsub.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index daef39d65a7..51a86e1e18a 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -24,7 +24,7 @@
 #include "ua_pubsub_networkmessage.h"
 
 #ifdef UA_ENABLE_PUBSUB_SKS
-#include <ua_pubsub_keystorage.h>
+#include "ua_pubsub_keystorage.h"
 #endif
 
 _UA_BEGIN_DECLS

From 67b677b2992f0bd8ab1546e702b8da96ad76b0b6 Mon Sep 17 00:00:00 2001
From: Roman Sinawski <r.sinawski@pilz.de>
Date: Tue, 6 Aug 2024 16:16:53 +0200
Subject: [PATCH 1606/1963] fix(build): Make UA_FILE_NS0 visible in other CMake
 files

Fix for #6622.
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa323029223..9557c35a9e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1115,7 +1115,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
 
     # Set the full Nodeset for NS0
     if(NOT UA_FILE_NS0)
-        set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.xml)
+        set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.xml CACHE INTERNAL "")
     endif()
 
     # Check that the submodule was checked out or manually downloaded into the folder
@@ -1133,7 +1133,7 @@ else()
 
     # Set the reduced Nodeset for NS0
     if(NOT UA_FILE_NS0)
-        set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.Reduced.xml)
+        set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.Reduced.xml CACHE INTERNAL "")
     endif()
 
     # Set feature-specific datatypes definitions and nodesets

From d445afa6bbe6761399755ff27a2a4f00ef469571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20V=C3=B6lker?= <jannis.voelker@basyskom.com>
Date: Mon, 5 Aug 2024 17:08:42 +0200
Subject: [PATCH 1607/1963] Fix binary encoding and decoding for DiagnosticInfo

The order of the locale and localizedText fields is different between
the encoding mask and the encoded values in the body.
---
 src/ua_types_encoding_binary.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index 7b3a4f6b84e..7e1509267a6 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -1199,10 +1199,10 @@ ENCODE_BINARY(DiagnosticInfo) {
         ret |= ENCODE_DIRECT(&src->symbolicId, UInt32); /* Int32 */
     if(src->hasNamespaceUri)
         ret |= ENCODE_DIRECT(&src->namespaceUri, UInt32); /* Int32 */
-    if(src->hasLocalizedText)
-        ret |= ENCODE_DIRECT(&src->localizedText, UInt32); /* Int32 */
     if(src->hasLocale)
         ret |= ENCODE_DIRECT(&src->locale, UInt32); /* Int32 */
+    if(src->hasLocalizedText)
+        ret |= ENCODE_DIRECT(&src->localizedText, UInt32); /* Int32 */
     if(ret != UA_STATUSCODE_GOOD)
         return ret;
 
@@ -1245,14 +1245,14 @@ DECODE_BINARY(DiagnosticInfo) {
         dst->hasNamespaceUri = true;
         ret |= DECODE_DIRECT(&dst->namespaceUri, UInt32); /* Int32 */
     }
-    if(encodingMask & 0x04u) {
-        dst->hasLocalizedText = true;
-        ret |= DECODE_DIRECT(&dst->localizedText, UInt32); /* Int32 */
-    }
     if(encodingMask & 0x08u) {
         dst->hasLocale = true;
         ret |= DECODE_DIRECT(&dst->locale, UInt32); /* Int32 */
     }
+    if(encodingMask & 0x04u) {
+        dst->hasLocalizedText = true;
+        ret |= DECODE_DIRECT(&dst->localizedText, UInt32); /* Int32 */
+    }
     if(encodingMask & 0x10u) {
         dst->hasAdditionalInfo = true;
         ret |= DECODE_DIRECT(&dst->additionalInfo, String);

From 0a522e44b109f175a0502912121d8d704efee945 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Aug 2024 09:58:57 +0200
Subject: [PATCH 1608/1963] fix(server): Fix a build error for the historizing
 feature

---
 src/server/ua_services_attribute.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 091f5abe0ef..5c9f5d08349 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1834,8 +1834,8 @@ Service_HistoryRead(UA_Server *server, UA_Session *session,
     }
 
     /* Check if the configured History-Backend supports the requested history type */
-    if(!readHistory){
-        UA_LOG_INFO_SESSION(server->config.logging, session,
+    if(!readHistory) {
+        UA_LOG_INFO_SESSION(&server->config.logger, session,
                             "The configured HistoryBackend does not support the selected history-type.");
         response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTSUPPORTED;
         return;

From 73dc1b06b4fa1d58285f4acde320041ac0245f7e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Aug 2024 10:03:45 +0200
Subject: [PATCH 1609/1963] fix(deps): Fix a (false positive) type conversion
 warning in base64.c

---
 deps/base64.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/base64.c b/deps/base64.c
index 1dac29f8a92..ded1af55a69 100644
--- a/deps/base64.c
+++ b/deps/base64.c
@@ -98,9 +98,9 @@ UA_unbase64(const unsigned char *src, size_t len, size_t *out_len) {
 		block[count] = tmp;
 		count++;
 		if(count == 4) {
-			*pos++ = (block[0] << 2) | (block[1] >> 4);
-			*pos++ = (block[1] << 4) | (block[2] >> 2);
-			*pos++ = (block[2] << 6) | block[3];
+			*pos++ = (unsigned char)((block[0] << 2) | (block[1] >> 4));
+			*pos++ = (unsigned char)((block[1] << 4) | (block[2] >> 2));
+			*pos++ = (unsigned char)((block[2] << 6) | block[3]);
 			if(pad) {
                 if(pad == 1)
                     pos--;

From 07f5f4030d031680843e0fdd175ab136e51d275a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 7 Aug 2024 10:03:45 +0200
Subject: [PATCH 1610/1963] fix(deps): Fix a (false positive) type conversion
 warning in base64.c

---
 deps/base64.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/base64.c b/deps/base64.c
index 1dac29f8a92..ded1af55a69 100644
--- a/deps/base64.c
+++ b/deps/base64.c
@@ -98,9 +98,9 @@ UA_unbase64(const unsigned char *src, size_t len, size_t *out_len) {
 		block[count] = tmp;
 		count++;
 		if(count == 4) {
-			*pos++ = (block[0] << 2) | (block[1] >> 4);
-			*pos++ = (block[1] << 4) | (block[2] >> 2);
-			*pos++ = (block[2] << 6) | block[3];
+			*pos++ = (unsigned char)((block[0] << 2) | (block[1] >> 4));
+			*pos++ = (unsigned char)((block[1] << 4) | (block[2] >> 2));
+			*pos++ = (unsigned char)((block[2] << 6) | block[3]);
 			if(pad) {
                 if(pad == 1)
                     pos--;

From 41ee330400bd67898bea61981c8fd85ad35b97ec Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 8 Aug 2024 16:45:16 +0200
Subject: [PATCH 1611/1963] fix(deps): Re-enable support for empty base64
 strings

---
 deps/base64.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/deps/base64.c b/deps/base64.c
index ded1af55a69..2b5d6b70870 100644
--- a/deps/base64.c
+++ b/deps/base64.c
@@ -75,18 +75,27 @@ static unsigned char dtable[256] = {
 
 unsigned char *
 UA_unbase64(const unsigned char *src, size_t len, size_t *out_len) {
-	if(len == 0 || len % 4 != 0)
+    /* Empty base64 results in an empty byte-string */
+    if(len == 0) {
+        *out_len = 0;
+        return (unsigned char*)UA_EMPTY_ARRAY_SENTINEL;
+    }
+
+    /* The input length must be a multiple of four */
+    if(len % 4 != 0)
 		return NULL;
 
-    unsigned char *out, *pos;
+    /* Allocate the output string */
 	size_t olen = len / 4 * 3;
-	pos = out = (unsigned char*)UA_malloc(olen);
+    unsigned char *out = (unsigned char*)UA_malloc(olen);
 	if(!out)
 		return NULL;
 
+    /* Iterate over the input */
 	size_t pad = 0;
     unsigned char count = 0;
     unsigned char block[4];
+    unsigned char *pos = out;
 	for(size_t i = 0; i < len; i++) {
 		unsigned char tmp = dtable[src[i]];
         if(tmp == 0x80)

From a7f5371888c5beca5c952182bf2dd7baabbd54f3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Fri, 9 Aug 2024 11:21:08 +0200
Subject: [PATCH 1612/1963] refactor(build): Bump version to v1.2.10

---
 tools/cmake/SetGitBasedVersion.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/cmake/SetGitBasedVersion.cmake b/tools/cmake/SetGitBasedVersion.cmake
index c8eec383260..fb07baf573d 100644
--- a/tools/cmake/SetGitBasedVersion.cmake
+++ b/tools/cmake/SetGitBasedVersion.cmake
@@ -73,10 +73,10 @@ function(set_open62541_version)
         set(OPEN62541_VER_COMMIT ${OPEN62541_VERSION} PARENT_SCOPE)
     else()
         # Final fallback
-        set(OPEN62541_VERSION "v1.2.9-unknown" PARENT_SCOPE)
+        set(OPEN62541_VERSION "v1.2.10-unknown" PARENT_SCOPE)
         set(OPEN62541_VER_MAJOR 1 PARENT_SCOPE)
         set(OPEN62541_VER_MINOR 2 PARENT_SCOPE)
-        set(OPEN62541_VER_PATCH 9 PARENT_SCOPE)
+        set(OPEN62541_VER_PATCH 10 PARENT_SCOPE)
         set(OPEN62541_VER_LABEL "-unknown" PARENT_SCOPE)
         set(OPEN62541_VER_COMMIT "undefined" PARENT_SCOPE)
         message(WARNING "Failed to determine OPEN62541_VERSION from repository tags. Using default version \"${OPEN62541_VERSION}\".")

From f9385773e9037aa31ec4ee7b4f3261b57d85ef09 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Aug 2024 11:27:02 +0200
Subject: [PATCH 1613/1963] refactor(build): Bump version to v1.3.12

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f58b4f017d..1b9863ed34f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 11)
+set(OPEN62541_VER_PATCH 12)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 400411c5579b1c1369c7608ea59603d2ad2e3013 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 9 Aug 2024 11:31:12 +0200
Subject: [PATCH 1614/1963] refactor(build): Bump version to v1.4.4

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9557c35a9e3..bbc1c4fc7c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 3)
+set(OPEN62541_VER_PATCH 4)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From f5de42a64360870c83468f7f725360ca58366769 Mon Sep 17 00:00:00 2001
From: Maddin-619 <martin.brenner94@gmail.com>
Date: Mon, 26 Aug 2024 16:58:42 +0200
Subject: [PATCH 1615/1963] fix(server): Select the right sp to check
 userTokenSignature

---
 src/server/ua_services_session.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 0a940ea5a9b..3626efd44cd 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -781,7 +781,7 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
 
         /* Check the user token signature */
         response->responseHeader.serviceResult =
-            checkSignature(server, channel->securityPolicy, tempChannelContext,
+            checkSignature(server, securityPolicy, tempChannelContext,
                            &session->serverNonce, &request->userTokenSignature);
 
         /* Delete the temporary channel context */

From b6c844135124dc5cd129b9684c9142dd51104945 Mon Sep 17 00:00:00 2001
From: Joe <joepaz200@gmail.com>
Date: Thu, 29 Aug 2024 13:29:21 +0100
Subject: [PATCH 1616/1963] fix(server): Allow changing the namespace1 URI
 before calling UA_Server_startup (#6670)

---
 src/server/ua_server.c                |  1 +
 tests/server/check_server_userspace.c | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 473903ea558..f777ecd41c1 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -748,6 +748,7 @@ UA_Server_run_startup(UA_Server *server) {
                           "Could not create the server housekeeping task");
 
     /* Ensure that the uri for ns1 is set up from the app description */
+    UA_String_clear(&server->namespaces[1]);
     setupNs1Uri(server);
 
     /* At least one endpoint has to be configured */
diff --git a/tests/server/check_server_userspace.c b/tests/server/check_server_userspace.c
index 2b57fa16584..6cb1c80159a 100644
--- a/tests/server/check_server_userspace.c
+++ b/tests/server/check_server_userspace.c
@@ -14,6 +14,27 @@
 #pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
 #endif
 
+START_TEST(Server_Namespace1_check) {
+    UA_Server *server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+
+    const char *namespace1 = "http://namespace1";
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri = UA_STRING_ALLOC(namespace1);
+
+    UA_Server_run_startup(server);
+
+    UA_String out;
+    UA_StatusCode status = UA_Server_getNamespaceByIndex(server, 1, &out);
+    ck_assert(status == UA_STATUSCODE_GOOD);
+
+    ck_assert(UA_String_equal(&out, &config->applicationDescription.applicationUri));
+    UA_String_clear(&out);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+END_TEST
+
 START_TEST(Server_addNamespace_ShallWork) {
     UA_Server *server = UA_Server_new();
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
@@ -187,6 +208,7 @@ START_TEST(Server_forEachChildNodeCall) {
 static Suite* testSuite_ServerUserspace(void) {
     Suite *s = suite_create("ServerUserspace");
     TCase *tc_core = tcase_create("Core");
+    tcase_add_test(tc_core, Server_Namespace1_check);
     tcase_add_test(tc_core, Server_addNamespace_ShallWork);
     tcase_add_test(tc_core, Server_addNamespace_writeService);
     tcase_add_test(tc_core, Server_forEachChildNodeCall);

From acbf68420ac9fbf617f237407a56ebd5b6125479 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Mon, 2 Sep 2024 11:05:39 +0200
Subject: [PATCH 1617/1963] fix(core): add UA_EXPORT for
 UA_DataType_getStructMember

---
 src/ua_types.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_types.c b/src/ua_types.c
index 5e5f174ef00..ea5d3ca27af 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1882,7 +1882,7 @@ UA_Array_delete(void *p, size_t size, const UA_DataType *type) {
 }
 
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-UA_Boolean
+UA_Boolean UA_EXPORT
 UA_DataType_getStructMember(const UA_DataType *type, const char *memberName,
                             size_t *outOffset, const UA_DataType **outMemberType,
                             UA_Boolean *outIsArray) {

From ebe5e4260a25843fa93fb88477bf1051d7d5109e Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Tue, 18 Jun 2024 17:53:58 +0200
Subject: [PATCH 1618/1963] fix(core): increase maxSecureChannels to 100, fix
 check for enough channels

Increase maxSecureChannels to 100 and change the check for enough
SecureChannels to not give a warning if maxSessions==maxSecureChannels.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 plugins/ua_config_default.c | 2 +-
 src/server/ua_server.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index e13b99192a4..f2746d29cc0 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -450,7 +450,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     conf->modellingRulesOnInstances = true;
 
     /* Limits for SecureChannels */
-    conf->maxSecureChannels = 40;
+    conf->maxSecureChannels = 100;
     conf->maxSecurityTokenLifetime = 10 * 60 * 1000; /* 10 minutes */
 
     /* Limits for Sessions */
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index f777ecd41c1..10f42757282 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -734,7 +734,7 @@ UA_Server_run_startup(UA_Server *server) {
 
     /* Are there enough SecureChannels possible for the max number of sessions? */
     if(config->maxSecureChannels != 0 &&
-       (config->maxSessions == 0 || config->maxSessions >= config->maxSecureChannels)) {
+       (config->maxSessions == 0 || config->maxSessions > config->maxSecureChannels)) {
         UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SERVER,
                        "Maximum SecureChannels count not enough for the "
                        "maximum Sessions count");

From 317819b7d3b7c575b57310220c1be236acbfbac0 Mon Sep 17 00:00:00 2001
From: soekkle <soekkle@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:07:58 +0200
Subject: [PATCH 1619/1963] fix(plugin): Avoid memmory read access errors
 (#6688)

Check for null pointer befor passing then into a openssl function.
---
 plugins/crypto/openssl/ua_pki_openssl.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index d85f4617a5f..478b50e5df7 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -556,11 +556,13 @@ UA_CertificateVerification_Verify (void *                verificationContext,
                 /* Fetch the Subject key identifier of the remote certificate */
                 remote_cert_keyid = X509_get0_subject_key_id(certificateX509);
 
-                /* Check remote certificate is present in the trust list */
-                cmpVal = ASN1_OCTET_STRING_cmp(trusted_cert_keyid, remote_cert_keyid);
-                if (cmpVal == 0){
-                    ret = UA_STATUSCODE_GOOD;
-                    goto cleanup;
+                if(trusted_cert_keyid && remote_cert_keyid) {
+                    /* Check remote certificate is present in the trust list */
+                    cmpVal = ASN1_OCTET_STRING_cmp(trusted_cert_keyid, remote_cert_keyid);
+                    if(cmpVal == 0) {
+                        ret = UA_STATUSCODE_GOOD;
+                        goto cleanup;
+                    }
                 }
             }
         }

From 1c9116d6189953714f5ac14ddb851394ad0169e5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 22 Aug 2024 21:25:38 +0200
Subject: [PATCH 1620/1963] fix(pubsub): Close the correct connection in
 UA_WriterGroup_disconnect

---
 src/pubsub/ua_pubsub_eventloop.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index c8736347165..a542eec7183 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -721,7 +721,9 @@ UA_WriterGroup_disconnect(UA_WriterGroup *wg) {
     if(wg->sendChannel == 0)
         return;
     UA_PubSubConnection *c = wg->linkedConnection;
-    c->cm->closeConnection(c->cm, c->sendChannel);
+    if(!c || !c->cm)
+        return;
+    c->cm->closeConnection(c->cm, wg->sendChannel);
 }
 
 UA_StatusCode

From 9b6848a7e89167be03bbc2229faf5ccfd07601e5 Mon Sep 17 00:00:00 2001
From: Romain Gauci <r.gauci@til-technologies.fr>
Date: Tue, 10 Sep 2024 17:31:24 +0200
Subject: [PATCH 1621/1963] fix(plugin): Proper error handling when checking
 all CRLs

If a chain of Certificate Authorities (CAs) longer than one is present,
all CRL checks on the additional CAs were bypassed. This resulted in the
potential acceptance of certificates that have been revoked or have
expired CRLs.
---
 plugins/crypto/openssl/ua_pki_openssl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 478b50e5df7..3b2749f14ea 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -532,6 +532,8 @@ UA_CertificateVerification_Verify (void *                verificationContext,
                 opensslRet = X509_STORE_CTX_get_error (storeCtx);
                 if (opensslRet == X509_V_ERR_UNABLE_TO_GET_CRL) {
                     ret = UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN;
+                } else {
+                    ret = UA_X509_Store_CTX_Error_To_UAError (opensslRet);
                 }
             }
         }

From 083e4e93a235679a3b746934ba5b34f46d680dc1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 Sep 2024 08:57:26 +0200
Subject: [PATCH 1622/1963] fix(core): Fix UA_EXPORT annotations for
 UA_DataType handling

---
 include/open62541/types.h | 6 +++---
 src/ua_types.c            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/open62541/types.h b/include/open62541/types.h
index 6374480a33f..9ea3c3c38bb 100644
--- a/include/open62541/types.h
+++ b/include/open62541/types.h
@@ -1067,7 +1067,7 @@ typedef struct UA_DataTypeArray {
  * If the member is an array, the offset points to the (size_t) length field.
  * (The array pointer comes after the length field without any padding.) */
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-UA_Boolean
+UA_Boolean UA_EXPORT
 UA_DataType_getStructMember(const UA_DataType *type,
                             const char *memberName,
                             size_t *outOffset,
@@ -1078,12 +1078,12 @@ UA_DataType_getStructMember(const UA_DataType *type,
 /* Test if the data type is a numeric builtin data type (via the typeKind field
  * of UA_DataType). This includes integers and floating point numbers. Not
  * included are Boolean, DateTime, StatusCode and Enums. */
-UA_Boolean
+UA_Boolean UA_EXPORT
 UA_DataType_isNumeric(const UA_DataType *type);
 
 /* Return the Data Type Precedence-Rank defined in Part 4.
  * If there is no Precedence-Rank assigned with the type -1 is returned.*/
-UA_Int16
+UA_Int16 UA_EXPORT
 UA_DataType_getPrecedence(const UA_DataType *type);
 
 /**
diff --git a/src/ua_types.c b/src/ua_types.c
index ea5d3ca27af..c2c14cccac0 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1850,7 +1850,7 @@ UA_Array_append(void **p, size_t *size, void *newElem,
     return UA_STATUSCODE_GOOD;
 }
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Array_appendCopy(void **p, size_t *size, const void *newElem,
                     const UA_DataType *type) {
     char scratch[512];
@@ -1882,7 +1882,7 @@ UA_Array_delete(void *p, size_t size, const UA_DataType *type) {
 }
 
 #ifdef UA_ENABLE_TYPEDESCRIPTION
-UA_Boolean UA_EXPORT
+UA_Boolean
 UA_DataType_getStructMember(const UA_DataType *type, const char *memberName,
                             size_t *outOffset, const UA_DataType **outMemberType,
                             UA_Boolean *outIsArray) {

From a2fe7ab42c39753cb9da565b29cfbcb5ab81463e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 11 Sep 2024 10:14:32 +0200
Subject: [PATCH 1623/1963] fix(server): Fix a double-free after adjusting a
 value type

The issue was reported by @tomitkl in #6685.
---
 src/client/ua_client_highlevel.c         |  5 +++
 src/ua_util.c                            |  2 -
 src/ua_util_internal.h                   |  7 +++-
 tests/server/check_services_attributes.c | 53 ++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index 351d031daaf..5d1c57d44ff 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -880,7 +880,12 @@ AttributeReadCallback(UA_Client *client, void *userdata,
 
     /* Check the type. Try to adjust "in situ" if no match. */
     if(!UA_Variant_hasScalarType(&dv->value, ctx->resultType)) {
+        /* Remember the old pointer, adjustType can "unwrap" a type but won't
+         * free the wrapper. Because the server code still keeps the wrapper. */
+        void *oldVal = dv->value.data;
         adjustType(&dv->value, ctx->resultType);
+        if(dv->value.data != oldVal)
+            UA_free(oldVal);
         if(!UA_Variant_hasScalarType(&dv->value, ctx->resultType)) {
             res = UA_STATUSCODE_BADINTERNALERROR;
             goto finish;
diff --git a/src/ua_util.c b/src/ua_util.c
index 8e7324af8ae..13eb0fba2e5 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -42,8 +42,6 @@ adjustType(UA_Variant *value, const UA_DataType *targetType) {
         value->type = &UA_TYPES[UA_TYPES_BYTE];
         value->arrayLength = str->length;
         value->data = str->data;
-        if(value->storageType != UA_VARIANT_DATA_NODELETE)
-            UA_free(str);
         return;
     }
 
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 11f94372725..90020d00f33 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -28,7 +28,12 @@ _UA_BEGIN_DECLS
 #define UA_MACRO_EXPAND(x) x
 
 /* Try if the type of the value can be adjusted "in situ" to the target type.
- * That can be done, for example, to map between int32 and an enum. */
+ * That can be done, for example, to map between int32 and an enum.
+ *
+ * This can also "unwrap" a type. For example: string -> array of bytes
+ *
+ * If value->data is changed during adjustType, free the pointer afterwards (if
+ * you did not keep the original variant for _clear). */
 void
 adjustType(UA_Variant *value, const UA_DataType *targetType);
 
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index fcf25fc04de..d5429c2127c 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -894,6 +894,58 @@ START_TEST(WriteSingleAttributeValueEnum) {
     UA_DataValue_clear(&resp);
 } END_TEST
 
+/* Writing a ByteString into a byte array */
+START_TEST(WriteSingleAttributeStringToByteArray) {
+    UA_WriteValue wValue;
+    UA_WriteValue_init(&wValue);
+
+    UA_VariableAttributes vattr = UA_VariableAttributes_default;
+    UA_Byte testArray[4] = {1,2,3,4};
+    UA_UInt32 testArrayDims[1] = {4};
+    UA_Variant_setArray(&vattr.value, testArray, 4, &UA_TYPES[UA_TYPES_BYTE]);
+    vattr.value.arrayDimensions = testArrayDims;
+    vattr.value.arrayDimensionsSize = 1;
+    vattr.description = UA_LOCALIZEDTEXT("locale","test array");
+    vattr.displayName = UA_LOCALIZEDTEXT("locale","test array");
+    vattr.valueRank = UA_VALUERANK_ONE_DIMENSION;
+    vattr.arrayDimensions = testArrayDims;
+    vattr.arrayDimensionsSize = 1;
+    vattr.dataType = UA_TYPES[UA_TYPES_BYTE].typeId;
+    UA_QualifiedName arrayName = UA_QUALIFIEDNAME(1, "test array");
+    UA_NodeId arrayNodeId = UA_NODEID_STRING(1, "test.array");
+    UA_NodeId parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
+    UA_NodeId parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
+    UA_StatusCode retval =
+        UA_Server_addVariableNode(server, arrayNodeId, parentNodeId,
+                                  parentReferenceNodeId, arrayName,
+                                  UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                                  vattr, NULL, NULL);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_String testString = UA_STRING("open");
+    UA_Variant_setScalar(&wValue.value.value, &testString, &UA_TYPES[UA_TYPES_BYTESTRING]);
+    wValue.value.hasValue = true;
+    wValue.nodeId = UA_NODEID_STRING(1, "test.array");
+    wValue.attributeId = UA_ATTRIBUTEID_VALUE;
+    retval = UA_Server_write(server, &wValue);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = UA_NODEID_STRING(1, "test.array");
+    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+    UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
+    ck_assert_int_eq(resp.status, UA_STATUSCODE_GOOD);
+    ck_assert(resp.hasValue);
+    ck_assert(UA_Variant_hasArrayType(&resp.value, &UA_TYPES[UA_TYPES_BYTE]));
+
+    UA_Byte *arr = (UA_Byte*)resp.value.data;
+    arr[0] = 'o';
+    arr[1] = 'p';
+
+    UA_DataValue_clear(&resp);
+} END_TEST
+
 START_TEST(WriteSingleAttributeValueRangeFromScalar) {
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
@@ -1179,6 +1231,7 @@ static Suite * testSuite_services_attributes(void) {
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeValue);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeValueWithServerTimestamp);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeValueEnum);
+    tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeStringToByteArray);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeDataType);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeValueRangeFromScalar);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeValueRangeFromArray);

From 54f3dfe65056aaaeff70a47b5572551921417d94 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 12 Sep 2024 07:36:51 +0200
Subject: [PATCH 1624/1963] fix(pubsub): Fix exception at PubSub update

If a beforeWrite callback is used without an externalDataValue pointer,
an exception occurred.
---
 src/pubsub/ua_pubsub_reader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index ab58cad44a2..9eb28711a99 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -810,7 +810,7 @@ DataSetReader_processRaw(UA_Server *server, UA_ReaderGroup *rg,
         UA_FieldTargetVariable *tv =
             &dsr->config.subscribedDataSet.subscribedDataSetTarget.targetVariables[i];
 
-        if(tv->beforeWrite || tv->externalDataValue) {
+        if(tv->externalDataValue) {
             if(tv->beforeWrite)
                 tv->beforeWrite(server, &dsr->identifier, &dsr->linkedReaderGroup,
                                 &tv->targetVariable.targetNodeId,

From d6acc73ec6f5e0d6492ae1b93d107ecd4b3a3770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:00:53 +0000
Subject: [PATCH 1625/1963] fix(ci): update all GH actions

(cherry picked from 1581b063137cc23e256eed4634831a8169b28132)
---
 .github/workflows/build_linux.yml    | 2 +-
 .github/workflows/cifuzz.yml         | 2 +-
 .github/workflows/codeql.yml         | 6 +++---
 .github/workflows/coverage.yml       | 2 +-
 .github/workflows/debian_packing.yml | 4 ++--
 .github/workflows/doc_upload.yml     | 6 +++---
 .github/workflows/rebase.yml         | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index b32bed721a0..5eb5ba714d5 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -112,7 +112,7 @@ jobs:
     name: ${{matrix.build_name}}
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install Dependencies
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 190798db298..bfa4f4452e3 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -17,7 +17,7 @@ jobs:
         fuzz-seconds: 600
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b9156a3feb0..b7a95c8ebcf 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout open62541
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       
@@ -39,7 +39,7 @@ jobs:
           sudo apt-get install -y -qq libmbedtls-dev openssl
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
       
@@ -49,4 +49,4 @@ jobs:
           ETHERNET_INTERFACE: eth0
       
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 9a4fd3ea155..a7d198e4805 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -29,4 +29,4 @@ jobs:
         run: |
           tree .
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
diff --git a/.github/workflows/debian_packing.yml b/.github/workflows/debian_packing.yml
index 4b2d06df116..c32d0cdffbb 100644
--- a/.github/workflows/debian_packing.yml
+++ b/.github/workflows/debian_packing.yml
@@ -11,10 +11,10 @@ jobs:
   Debian-Package-Branch-Preperation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
diff --git a/.github/workflows/doc_upload.yml b/.github/workflows/doc_upload.yml
index d989f572845..679b89c80b4 100644
--- a/.github/workflows/doc_upload.yml
+++ b/.github/workflows/doc_upload.yml
@@ -10,10 +10,10 @@ jobs:
   Documentation-Generation-And-Upload:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -25,7 +25,7 @@ jobs:
       - name: Build Documentation
         run: source tools/ci.sh && build_docs_pdf
       - name: Checkout Website Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: open62541/open62541-www
           path: open62541-www
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
index 9025bf48284..31c972c91dc 100644
--- a/.github/workflows/rebase.yml
+++ b/.github/workflows/rebase.yml
@@ -8,11 +8,11 @@ jobs:
     if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.2
+      uses: cirrus-actions/rebase@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   # https://github.community/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250

From 7a1dfce2e765b9976c9e96ce8bc663ab9b5e0728 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 12 Sep 2024 09:09:16 +0200
Subject: [PATCH 1626/1963] fix(ci): Add bcrypt library for windows

---
 CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbc1c4fc7c6..c26ef2d3884 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -514,6 +514,10 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL)
     # https://cmake.org/cmake/help/v3.13/module/FindOpenSSL.html
     find_package(OpenSSL REQUIRED)
     list(APPEND open62541_LIBRARIES "${OPENSSL_LIBRARIES}")
+    if(WIN32)
+        # Add bestcrypt for windows systems
+        list(APPEND open62541_LIBRARIES bcrypt)
+    endif()
 endif()
 
 if(UA_ENABLE_ENCRYPTION_LIBRESSL)
@@ -532,6 +536,10 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION)
     # defined in /tools/cmake/FindMbedTLS.cmake.
     find_package(MbedTLS REQUIRED)
     list(APPEND open62541_LIBRARIES ${MBEDTLS_LIBRARIES})
+    if(WIN32)
+        # Add bestcrypt for windows systems
+        list(APPEND open62541_LIBRARIES bcrypt)
+    endif()
 endif()
 
 if(UA_ENABLE_TPM2_SECURITY)

From e613a90d97d7d06396dee1a1bca6fabccd8f778f Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Thu, 18 Jan 2024 15:25:43 +0100
Subject: [PATCH 1627/1963] feat(core) update mdnsd submodule refernce

(cherry picked from commit 012b62cb28c5cae3ebc07201075f0ef629a66518)
---
 deps/mdnsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/mdnsd b/deps/mdnsd
index 3151afe5899..488d24fb9d4 160000
--- a/deps/mdnsd
+++ b/deps/mdnsd
@@ -1 +1 @@
-Subproject commit 3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0
+Subproject commit 488d24fb9d427aec77df180268f0291eeee7fb8b

From 44e1987e1221c47ec5a202a84e02db1b6a2d7580 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Mon, 16 Sep 2024 09:38:33 +0200
Subject: [PATCH 1628/1963] fix(ci): Fix azure pipeline build for 1.3

---
 tools/azure-devops/win/build.ps1   | 4 ++--
 tools/azure-devops/win/install.ps1 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 8986d409101..17d71c4424d 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -47,8 +47,8 @@ try {
     Copy-Item AUTHORS pack
     Copy-Item README.md pack
 
-    # Only execute unit tests on vs2017 to save compilation time
-    if ($env:CC_SHORTNAME -eq "vs2017") {
+    # Only execute unit tests on vs2019 to save compilation time
+    if ($env:CC_SHORTNAME -eq "vs2019") {
         Write-Host -ForegroundColor Green "`n###################################################################"
         Write-Host -ForegroundColor Green "`n##### Testing $env:CC_NAME with unit tests #####`n"
         New-Item -ItemType directory -Path "build"
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 7e029ca61dd..8936000664f 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -28,7 +28,7 @@ try {
             exit $LASTEXITCODE
         }
 
-    } elseif ($env:CC_SHORTNAME -eq "vs2015" -or $env:CC_SHORTNAME -eq "vs2017") {
+    } else {
         Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
         & vcpkg install mbedtls:x86-windows-static
         if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {

From 24de47803bf2a2ac69f5b516fbd112f759b0848f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 11 Jan 2023 16:47:03 +0000
Subject: [PATCH 1629/1963] fix(ci): Updates azure pipelines

* now using ubuntu-20.04

(cherry picked from commit 13b412558ff026d73e0d44bd162690cc043997a6)
---
 .azure-pipelines/azure-pipelines-dist.yml  | 2 +-
 .azure-pipelines/azure-pipelines-linux.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-dist.yml b/.azure-pipelines/azure-pipelines-dist.yml
index de12655b011..9b07fb6b54c 100644
--- a/.azure-pipelines/azure-pipelines-dist.yml
+++ b/.azure-pipelines/azure-pipelines-dist.yml
@@ -5,7 +5,7 @@ jobs:
 - job: 'dist_debian'
   displayName: 'Dist (debian)'
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-20.04'
   steps:
   - checkout: self
     submodules: recursive
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index 4240cfcae6d..6625754ea2f 100644
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -5,7 +5,7 @@ jobs:
 - job: 'cross_freeRTOS'
   displayName: 'Arch (freeRTOS)'
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-20.04'
   variables:
     IDF_PATH: $(Build.BinariesDirectory)/esp-idf
   steps:

From eb7e4277757b18337a8c41717dbae47edcd5db42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?=
 <47734341+GoetzGoerisch@users.noreply.github.com>
Date: Wed, 11 Jan 2023 17:05:41 +0000
Subject: [PATCH 1630/1963] fix(ci): Adapts install script to ubuntu-20.04

* updates mbedTLS to 2.28.2

(cherry picked from commit b87738545a9975d91a33a4a07ec847c41cb50347)
---
 tools/azure-devops/debian/install.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/azure-devops/debian/install.sh b/tools/azure-devops/debian/install.sh
index 19935fa6299..6168486c9a5 100644
--- a/tools/azure-devops/debian/install.sh
+++ b/tools/azure-devops/debian/install.sh
@@ -12,17 +12,17 @@ sudo apt install -y \
     graphviz \
     latexmk \
     libsubunit-dev \
-    python-sphinx \
+    python3-sphinx \
     python3-pip \
     tar \
     texlive-fonts-recommended \
-    texlive-generic-extra \
+    texlive-extra-utils \
     texlive-latex-extra \
     wget
 
-wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.7.1.tar.gz
-tar xf mbedtls-2.7.1.tar.gz
-cd mbedtls-mbedtls-2.7.1
+wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.28.2.tar.gz
+tar xf mbedtls-2.28.2.tar.gz
+cd mbedtls-mbedtls-2.28.2
 cmake -DENABLE_TESTING=Off .
 make -j
 sudo make install

From bb20fb7b1def065b69996292f38dbc802f204706 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 00:58:51 +0100
Subject: [PATCH 1631/1963] refactor(build): Switch to x64 VS2019 builds

(cherry picked from commit fd37838e2bb4445dff76dd7acc8d04d835b38f90)
---
 tools/azure-devops/win/build.ps1   | 22 +++++++--------
 tools/azure-devops/win/install.ps1 | 43 +++++++++++++++++-------------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 17d71c4424d..d2091f93ad2 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -26,18 +26,16 @@ try {
 
     if ($env:CC_SHORTNAME -eq "mingw") {
 
-    } elseif ($env:CC_SHORTNAME -eq "clang-mingw") {
-        # Setup clang
-        $env:CC = "clang --target=x86_64-w64-mingw32"
-        $env:CXX = "clang++ --target=x86_64-w64-mingw32"
-        clang --version
-    } else {
-        $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
-        $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x86-windows-static"'
-        # since https://github.com/Microsoft/vcpkg/commit/0334365f516c5f229ff4fcf038c7d0190979a38a#diff-464a170117fa96bf98b2f8d224bf503c
-        # vcpkg need to have  "C:\Tools\vcpkg\installed\x86-windows-static"
-        New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x86-windows-static"
-    }
+} elseif ($env:CC_SHORTNAME -eq "clang-mingw") {
+    # Setup clang
+    $env:CC = "clang --target=x86_64-w64-mingw32"
+    $env:CXX = "clang++ --target=x86_64-w64-mingw32"
+    clang --version
+} else {
+    $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
+    $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows"'
+    New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x64-windows"
+}
 
     $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`"", "-DUA_FORCE_CPP:BOOL=$env:FORCE_CXX"
 
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 8936000664f..02a73cf3329 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -21,27 +21,32 @@ try {
         # Otherwise we run into issue: https://github.com/msys2/MINGW-packages/issues/6576
         & C:\msys64\usr\bin\pacman -Syu
 
-        Write-Host -ForegroundColor Green "`n### Installing mbedtls via PacMan ###`n"
-        & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-mbedtls
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
+    Write-Host -ForegroundColor Green "`n### Installing mbedtls via PacMan ###`n"
+    & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-mbedtls
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Install of mbedTLS failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
 
-    } else {
-        Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
-        & vcpkg install mbedtls:x86-windows-static
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
+    & C:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-check
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Install of check failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
+} else {
+    Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
+    & vcpkg install mbedtls:x64-windows
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
 
-        Write-Host -ForegroundColor Green "`n### Installing libcheck via vcpkg ###`n"
-        & vcpkg install check:x86-windows-static
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
+    Write-Host -ForegroundColor Green "`n### Installing libcheck via vcpkg ###`n"
+    & vcpkg install check:x64-windows
+    if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
+        Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
+        exit $LASTEXITCODE
+    }
 
         Write-Host -ForegroundColor Green "`n### Installing DrMemory ###`n"
         & choco install -y --no-progress drmemory.portable

From 5d5ab15293e777c6cfb0c83d81a1fa44d0107edf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 01:49:50 +0100
Subject: [PATCH 1632/1963] refactor(ci): Pin vcpkg triplet to
 x64-windows-static

(cherry picked from commit 7c657977b91bf990258383bbabfbded2150baf9e)
---
 tools/azure-devops/win/build.ps1   | 3 +--
 tools/azure-devops/win/install.ps1 | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index d2091f93ad2..39d1bb051a7 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -33,8 +33,7 @@ try {
     clang --version
 } else {
     $vcpkg_toolchain = '-DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
-    $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows"'
-    New-Item -Force -ItemType directory -Path "C:/vcpkg/installed/x64-windows"
+    $vcpkg_triplet = '-DVCPKG_TARGET_TRIPLET="x64-windows-static"'
 }
 
     $cmake_cnf="$vcpkg_toolchain", "$vcpkg_triplet", "-G`"$env:GENERATOR`"", "-DUA_FORCE_CPP:BOOL=$env:FORCE_CXX"
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 02a73cf3329..2ac25c03f06 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -35,14 +35,14 @@ try {
     }
 } else {
     Write-Host -ForegroundColor Green "`n### Installing mbedtls via vcpkg ###`n"
-    & vcpkg install mbedtls:x64-windows
+    & vcpkg install mbedtls:x64-windows-static
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE
     }
 
     Write-Host -ForegroundColor Green "`n### Installing libcheck via vcpkg ###`n"
-    & vcpkg install check:x64-windows
+    & vcpkg install check:x64-windows-static
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE

From 46b1d0d4192cb27da51a32e03e95d711415a60ed Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 12 Sep 2024 09:09:16 +0200
Subject: [PATCH 1633/1963] fix(ci): Add bcrypt library for windows

(cherry picked from commit 5849f46e9c520e5fc376d78ec93014775eb18191)
---
 CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b9863ed34f..fbced8259ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -605,8 +605,12 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_MQTT_TLS_OPENSSL)
     # use the OpenSSL encryption library
     # https://cmake.org/cmake/help/v3.0/module/FindOpenSSL.html
     find_package(OpenSSL REQUIRED)
-    list(APPEND open62541_LIBRARIES ${OPENSSL_LIBRARIES})
-    endif ()
+    list(APPEND open62541_LIBRARIES "${OPENSSL_LIBRARIES}")
+    if(WIN32)
+        # Add bestcrypt for windows systems
+        list(APPEND open62541_LIBRARIES bcrypt)
+    endif()
+endif()
 
 if(UA_ENABLE_ENCRYPTION_LIBRESSL)
     # See https://github.com/libressl-portable/portable/blob/master/FindLibreSSL.cmake
@@ -624,6 +628,10 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION)
     # defined in /tools/cmake/FindMbedTLS.cmake.
     find_package(MbedTLS REQUIRED)
     list(APPEND open62541_LIBRARIES ${MBEDTLS_LIBRARIES})
+    if(WIN32)
+        # Add bestcrypt for windows systems
+        list(APPEND open62541_LIBRARIES bcrypt)
+    endif()
 endif()
 
 if(UA_ENABLE_TPM2_SECURITY)

From d04e8156c4ecac526477bad8e0b2448b3c69f298 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 02:16:26 +0100
Subject: [PATCH 1634/1963] fix(test): Remove use of raw sleep() in all unit
 tests

(cherry picked from commit c136967af3f062df41dc278af5721e7e61a87482)
---
 tests/client/check_client_async_connect.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index 8c86a51d36e..e9045ff73cc 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -77,6 +77,8 @@ START_TEST(Client_connect_async) {
             UA_Client_sendAsyncBrowseRequest(client, &bReq, asyncBrowseCallback,
                                              &asyncCounter, &reqId);
         }
+        /* Give network a chance to process packet */
+        UA_realSleep(100);
         /* Manual clock for unit tests */
         UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 0);
@@ -182,7 +184,7 @@ START_TEST(Client_run_iterate) {
         UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 0);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        sleep(0);
+        UA_realSleep(100);
     }
     UA_Client_delete(client);
 }

From 2c9b91aaff3f8571d76a9ede211839e963fc18b7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 24 Dec 2023 02:49:50 +0100
Subject: [PATCH 1635/1963] refactor(ci): Don't use DrMemory on Azure, takes
 too long

(cherry picked from commit d2e62e238676e547400f3414108c761bdfa6b5bc)
---
 tools/azure-devops/win/build.ps1   | 3 +--
 tools/azure-devops/win/install.ps1 | 9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/tools/azure-devops/win/build.ps1 b/tools/azure-devops/win/build.ps1
index 39d1bb051a7..b443eee5930 100644
--- a/tools/azure-devops/win/build.ps1
+++ b/tools/azure-devops/win/build.ps1
@@ -63,8 +63,7 @@ try {
                 -DUA_ENABLE_PUBSUB:BOOL=ON `
                 -DUA_ENABLE_PUBSUB_DELTAFRAMES:BOOL=ON `
                 -DUA_ENABLE_PUBSUB_INFORMATIONMODEL:BOOL=ON `
-                -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON `
-                -DUA_ENABLE_UNIT_TESTS_MEMCHECK=ON ..
+                -DUA_ENABLE_PUBSUB_MONITORING:BOOL=ON ..
         & cmake --build . --config Debug
         if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
             Write-Host -ForegroundColor Red "`n`n*** Make failed. Exiting ... ***"
diff --git a/tools/azure-devops/win/install.ps1 b/tools/azure-devops/win/install.ps1
index 2ac25c03f06..93a9791ef8c 100644
--- a/tools/azure-devops/win/install.ps1
+++ b/tools/azure-devops/win/install.ps1
@@ -47,15 +47,6 @@ try {
         Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
         exit $LASTEXITCODE
     }
-
-        Write-Host -ForegroundColor Green "`n### Installing DrMemory ###`n"
-        & choco install -y --no-progress drmemory.portable
-        if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {
-            Write-Host -ForegroundColor Red "`n`n*** Install failed. Exiting ... ***"
-            exit $LASTEXITCODE
-        }
-        #$env:Path = 'C:\Program Files (x86)\Dr. Memory\bin;' + $env:Path
-        #[System.Environment]::SetEnvironmentVariable('Path', $path, 'Machine')
     }
 
     if ($LASTEXITCODE -and $LASTEXITCODE -ne 0) {

From f4af493b579b02700ba6cfdb47845747fd01e8f8 Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Fri, 3 Jun 2022 12:16:16 +0200
Subject: [PATCH 1636/1963] fix(core): LibreSSL 3.5

(cherry picked from commit 35939a5b688d9647dbc96db88df5df27ebcced7a)
---
 plugins/crypto/openssl/ua_openssl_version_abstraction.h | 4 ++--
 plugins/crypto/openssl/ua_pki_openssl.c                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/crypto/openssl/ua_openssl_version_abstraction.h b/plugins/crypto/openssl/ua_openssl_version_abstraction.h
index a6fa45bdf70..c3eb7fd7dc5 100644
--- a/plugins/crypto/openssl/ua_openssl_version_abstraction.h
+++ b/plugins/crypto/openssl/ua_openssl_version_abstraction.h
@@ -21,11 +21,11 @@
 #define X509_STORE_CTX_set0_trusted_stack(STORE_CTX, CTX_SKTRUSTED) X509_STORE_CTX_trusted_stack(STORE_CTX, CTX_SKTRUSTED)
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL)
 #define X509_STORE_CTX_get_check_issued(STORE_CTX) STORE_CTX->check_issued
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL)
 #define get_pkey_rsa(evp) ((evp)->pkey.rsa)
 #else
 #define get_pkey_rsa(evp) EVP_PKEY_get0_RSA(evp)
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 3b2749f14ea..87b91e03c1e 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -485,7 +485,7 @@ UA_CertificateVerification_Verify (void *                verificationContext,
     /* Set flag to check if the certificate has an invalid signature */
     X509_STORE_CTX_set_flags (storeCtx, X509_V_FLAG_CHECK_SS_SIGNATURE);
 
-    if (X509_STORE_CTX_get_check_issued(storeCtx) (storeCtx,certificateX509, certificateX509) != 1) {
+    if (X509_check_issued(certificateX509,certificateX509) != X509_V_OK) {
         X509_STORE_CTX_set_flags (storeCtx, X509_V_FLAG_CRL_CHECK);
     }
 
@@ -505,7 +505,7 @@ UA_CertificateVerification_Verify (void *                verificationContext,
         /* Check if the not trusted certificate has a CRL file. If there is no CRL file available for the corresponding
          * parent certificate then return status code UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN. Refer the test
          * case CTT/Security/Security Certificate Validation/002.js */
-        if (X509_STORE_CTX_get_check_issued (storeCtx) (storeCtx,certificateX509, certificateX509) != 1) {
+        if (X509_check_issued(certificateX509,certificateX509) != X509_V_OK) {
             /* Free X509_STORE_CTX and reuse it for certification verification */
             if (storeCtx != NULL) {
                X509_STORE_CTX_free(storeCtx);

From 86db884eb48925dc2751ce5ed293218f0053ac30 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 13 Sep 2024 11:38:50 +0200
Subject: [PATCH 1637/1963] fix(deps): Bump LibreSSL to 3.7.2

---
 .github/workflows/build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 50201b43225..59a26d4fe99 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -41,9 +41,9 @@ jobs:
           - build_name: "Encryption (LibreSSL) Build & Unit Tests (gcc)"
             cmd_deps: |
                 sudo apt-get install -y -qq curl
-                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.2.tar.gz --output libressl.tar.gz
+                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.2.tar.gz --output libressl.tar.gz
                 tar -xvz -f libressl.tar.gz
-                cd libressl-3.4.2
+                cd libressl-3.7.2
                 ./configure
                 sudo make install
             cmd_action: unit_tests_encryption LIBRESSL

From f199580223c5c5e81d69de26929ba702713db7aa Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 12 Sep 2024 14:48:04 +0200
Subject: [PATCH 1638/1963] fix(plugin): Proper error handling when checking
 parent CRL for the mbedTLS backend

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index c990ea14305..b5cb09c6321 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -375,7 +375,13 @@ certificateVerification_verify(void *verificationContext,
 
                 /* If the CRL file corresponding to the parent certificate is not present
                  * then return UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN */
-                if(!issuerKnown) {
+                if(issuerKnown) {
+                    flags = 0;
+                    mbedErr = mbedtls_x509_crt_verify_with_profile(parentCert,
+                                                                   &ci->certificateIssuerList,
+                                                                   &ci->certificateRevocationList,
+                                                                   &crtProfile, NULL, &flags, NULL, NULL);
+                } else {
                     return UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN;
                 }
 
@@ -417,8 +423,14 @@ certificateVerification_verify(void *verificationContext,
 
             /* If the CRL file corresponding to the parent certificate is not present
              * then return UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN */
-            if(!issuerKnown) {
-                return UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN;
+            if(issuerKnown) {
+                flags = 0;
+                mbedErr = mbedtls_x509_crt_verify_with_profile(parentCert,
+                                                               &ci->certificateIssuerList,
+                                                               &ci->certificateRevocationList,
+                                                               &crtProfile, NULL, &flags, NULL, NULL);
+            } else {
+                return UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN;
             }
 
         }

From 90661da2b2e8f07d8bfe31f3431ce8498fccd48a Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Wed, 11 Sep 2024 15:08:45 +0200
Subject: [PATCH 1639/1963] feat(test): Add test cases for CRL validation

---
 tests/CMakeLists.txt                    |    4 +
 tests/encryption/certificates.h         | 1172 ++++++++++++++++++++---
 tests/encryption/check_crl_validation.c |  337 +++++++
 3 files changed, 1377 insertions(+), 136 deletions(-)
 create mode 100644 tests/encryption/check_crl_validation.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 89c23af6b0d..4e9cf9c9aca 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -585,6 +585,10 @@ if(UA_ENABLE_ENCRYPTION)
     add_executable(check_client_encryption client/check_client_encryption.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
     target_link_libraries(check_client_encryption ${LIBS})
     add_test_valgrind(client_encryption ${TESTS_BINARY_DIR}/check_client_encryption)
+
+    add_executable(check_crl_validation encryption/check_crl_validation.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    target_link_libraries(check_crl_validation ${LIBS})
+    add_test_valgrind(crl_validation ${TESTS_BINARY_DIR}/check_crl_validation)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS)
diff --git a/tests/encryption/certificates.h b/tests/encryption/certificates.h
index a3810e9deb8..75089746058 100644
--- a/tests/encryption/certificates.h
+++ b/tests/encryption/certificates.h
@@ -7,146 +7,146 @@ _UA_BEGIN_DECLS
 
 #define KEY_DER_LENGTH 1193
 UA_Byte KEY_DER_DATA[1193] = {
-    0x30, 0x82, 0x04, 0xa5, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe0, 0xc9, 0x91, 0x62, 
-    0xcd, 0x91, 0x68, 0x75, 0x2c, 0x32, 0x7a, 0xdd, 0xf1, 0xd6, 0x64, 0x77, 0x8b, 0x72, 0x9e, 0x14, 
-    0x2a, 0x62, 0x08, 0xd1, 0x89, 0x7d, 0xe2, 0x17, 0xdc, 0xb3, 0xda, 0xbc, 0x3a, 0x9f, 0x84, 0x03, 
-    0xd3, 0x2e, 0x68, 0xbe, 0xc1, 0x57, 0xcb, 0x2a, 0xe2, 0xd6, 0xcf, 0xc4, 0x7f, 0xbd, 0x53, 0x3f, 
-    0xeb, 0x39, 0x98, 0x69, 0xb0, 0x40, 0x14, 0xbf, 0xf5, 0x5a, 0x23, 0x23, 0xf4, 0x4c, 0xf8, 0xf1, 
-    0x03, 0x56, 0x6d, 0x7d, 0x1b, 0x93, 0xd7, 0x0f, 0xc1, 0x8c, 0x70, 0xe0, 0x2c, 0x55, 0x7e, 0xa1, 
-    0xfc, 0x05, 0xe9, 0xd7, 0xea, 0xb1, 0x5c, 0x0f, 0x9b, 0xac, 0x6a, 0x2e, 0xb4, 0xc5, 0xbf, 0x41, 
-    0x8f, 0xda, 0xfc, 0x85, 0xc6, 0xaa, 0x25, 0xe4, 0xb9, 0x9a, 0xc6, 0xd8, 0x9a, 0x31, 0x8a, 0x17, 
-    0x8b, 0x8c, 0x4e, 0x20, 0xd9, 0x71, 0xfc, 0x66, 0x3a, 0xfd, 0x49, 0x95, 0x54, 0xa8, 0xaf, 0x42, 
-    0x5e, 0xba, 0x26, 0xe6, 0xd3, 0xa0, 0xd2, 0x02, 0x3b, 0x51, 0x8b, 0x39, 0xd3, 0x97, 0xd2, 0xe4, 
-    0xd1, 0x01, 0x65, 0xab, 0x8e, 0xa2, 0x80, 0x5b, 0x5e, 0xbb, 0x11, 0x7f, 0x50, 0x1b, 0x2b, 0x0d, 
-    0x20, 0x40, 0xb5, 0xbf, 0xd1, 0x32, 0xfa, 0x25, 0xe1, 0x0d, 0x75, 0xfc, 0x11, 0xcf, 0x21, 0xdd, 
-    0x45, 0x16, 0xe4, 0x56, 0x58, 0x49, 0x33, 0xca, 0xaf, 0xe3, 0x17, 0x7b, 0x7a, 0x8f, 0xb1, 0xec, 
-    0x1c, 0x4d, 0xa2, 0xc2, 0xce, 0x8b, 0x19, 0x4b, 0xc0, 0xc4, 0x36, 0x6a, 0x7c, 0x5b, 0x89, 0x14, 
-    0x98, 0xcb, 0xa9, 0xca, 0x66, 0xf2, 0xaa, 0xf9, 0x12, 0x40, 0x0e, 0x6a, 0x78, 0x4d, 0x1f, 0x54, 
-    0x3c, 0x03, 0x7a, 0x91, 0xf5, 0xb7, 0x3d, 0xe2, 0xfc, 0x65, 0xb7, 0xaa, 0xa9, 0x39, 0x68, 0xa7, 
-    0xdb, 0x29, 0xc1, 0x40, 0x0b, 0x4e, 0xfb, 0xce, 0x74, 0xa5, 0x46, 0xb9, 0x02, 0x03, 0x01, 0x00, 
-    0x01, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb4, 0xc8, 0x07, 0x60, 0x01, 0xd9, 0xb6, 0xbb, 0xbd, 0x8e, 
-    0xdf, 0x97, 0xcd, 0xde, 0x51, 0xb0, 0x7e, 0xfa, 0xf0, 0x3d, 0x61, 0x94, 0xb4, 0x68, 0xe8, 0x7d, 
-    0xd0, 0x2e, 0xc6, 0xb5, 0xf2, 0xed, 0xbc, 0xeb, 0xfb, 0x3d, 0x24, 0x43, 0x47, 0xc4, 0x5a, 0x34, 
-    0x64, 0x56, 0x1a, 0x57, 0x0e, 0x83, 0x87, 0x04, 0x59, 0x86, 0xa7, 0x84, 0x0b, 0x9a, 0xbc, 0x3f, 
-    0xdd, 0x30, 0x40, 0x7f, 0x7c, 0x91, 0x76, 0xf1, 0xcc, 0xa7, 0xf0, 0xba, 0x3a, 0x96, 0x0a, 0x6e, 
-    0xcc, 0xe0, 0x84, 0x15, 0x91, 0xd6, 0x08, 0x71, 0xbd, 0xc5, 0x42, 0xad, 0xf2, 0xd2, 0x4e, 0x92, 
-    0xd3, 0x6a, 0x4e, 0x15, 0xcc, 0xd3, 0xc1, 0x58, 0xe4, 0x27, 0x33, 0x2d, 0xb8, 0x37, 0x52, 0x7e, 
-    0x16, 0xb9, 0xab, 0xb7, 0xd9, 0xc1, 0xeb, 0xc8, 0x79, 0xb9, 0xd3, 0xe6, 0x44, 0x13, 0x51, 0x2d, 
-    0xc6, 0x02, 0xe5, 0xe0, 0x3c, 0xa3, 0x15, 0x9b, 0x49, 0xae, 0x85, 0xbe, 0x8c, 0x84, 0xf9, 0x87, 
-    0x5d, 0x91, 0x9e, 0xf4, 0xf9, 0xf2, 0x8d, 0x81, 0x77, 0x7c, 0xfc, 0x60, 0x09, 0x48, 0x43, 0x2e, 
-    0xbb, 0xaf, 0xc9, 0xd6, 0x90, 0x2d, 0x40, 0x80, 0x59, 0xbd, 0x3b, 0x04, 0xda, 0x50, 0x2a, 0x53, 
-    0xf5, 0xc0, 0x97, 0x54, 0x04, 0x14, 0xb1, 0x8e, 0xd1, 0x6b, 0x53, 0x9e, 0xa4, 0xaa, 0x5e, 0x6e, 
-    0x1c, 0x11, 0x6b, 0x0a, 0xc4, 0xec, 0x5b, 0x77, 0xa8, 0x00, 0x83, 0x77, 0xdb, 0xf4, 0xfb, 0x00, 
-    0xf4, 0x06, 0x57, 0x25, 0x8e, 0x1c, 0x87, 0xb4, 0xbe, 0xb8, 0x04, 0x35, 0x93, 0x67, 0xaa, 0x36, 
-    0xa5, 0x62, 0xe4, 0xf6, 0xcb, 0xc8, 0xa6, 0x58, 0x77, 0x96, 0xc4, 0x6c, 0x0b, 0xc8, 0x41, 0xe2, 
-    0x36, 0x01, 0x94, 0xa5, 0xe9, 0x46, 0x17, 0xd3, 0x0b, 0x18, 0x7e, 0x06, 0x88, 0x9b, 0x7e, 0xdd, 
-    0x92, 0x20, 0xc6, 0xe3, 0x7e, 0xb1, 0x02, 0x81, 0x81, 0x00, 0xf5, 0xa6, 0xda, 0x32, 0xb9, 0x37, 
-    0x61, 0xe9, 0x7c, 0x99, 0xf7, 0x4a, 0x37, 0xee, 0x52, 0x30, 0x4f, 0xbf, 0x57, 0x6f, 0xfe, 0x20, 
-    0xdc, 0xa3, 0xfe, 0x51, 0xbf, 0x72, 0x13, 0x8a, 0xb1, 0xd7, 0x99, 0x7d, 0x67, 0xa8, 0xd4, 0xb0, 
-    0x35, 0x40, 0x7c, 0xc8, 0xdc, 0x03, 0x6b, 0x90, 0xb5, 0x65, 0x04, 0x7f, 0x97, 0x8b, 0xa8, 0x69, 
-    0x20, 0x04, 0xcb, 0x48, 0x39, 0xb7, 0x57, 0xe0, 0xd9, 0xbb, 0x15, 0xe1, 0x59, 0x16, 0xf3, 0xe1, 
-    0xab, 0x91, 0xea, 0x8a, 0x88, 0xad, 0x8d, 0xa3, 0x24, 0x4a, 0x35, 0xa5, 0xd2, 0x32, 0x19, 0x66, 
-    0xa8, 0xbb, 0x32, 0x9d, 0xf4, 0x94, 0x99, 0xc1, 0x2e, 0x2b, 0xf8, 0x98, 0x6a, 0x6e, 0x72, 0x77, 
-    0xd0, 0xc9, 0xfc, 0x5f, 0xd7, 0x69, 0xd1, 0x08, 0x12, 0xbf, 0x81, 0xc1, 0xa1, 0x1b, 0x3b, 0x41, 
-    0xb0, 0x24, 0x11, 0x0a, 0x65, 0xab, 0x81, 0x39, 0xb3, 0xd5, 0x02, 0x81, 0x81, 0x00, 0xea, 0x41, 
-    0xb5, 0xed, 0xac, 0xa0, 0x43, 0xd7, 0xde, 0x1e, 0x6b, 0x95, 0xbe, 0x88, 0x02, 0xaf, 0x2f, 0xbb, 
-    0x37, 0xf7, 0x2f, 0xf6, 0x4f, 0xa0, 0xaa, 0x43, 0x03, 0x7d, 0x33, 0xdd, 0x1e, 0x7a, 0xba, 0xa0, 
-    0x10, 0x77, 0x1f, 0x4a, 0xc9, 0x88, 0x58, 0x9d, 0x81, 0x3a, 0xe8, 0xac, 0x86, 0x2f, 0x80, 0x6c, 
-    0xc7, 0xa0, 0xe5, 0xed, 0x8d, 0x90, 0xa9, 0xa7, 0x36, 0x23, 0xd7, 0xb5, 0x89, 0xfc, 0xad, 0x4d, 
-    0xae, 0x0e, 0xec, 0xdc, 0xe7, 0x7e, 0x69, 0xfe, 0x62, 0x4b, 0x81, 0xfe, 0x52, 0x81, 0x77, 0x6a, 
-    0x35, 0xab, 0x52, 0x6f, 0x56, 0x41, 0x6c, 0x57, 0x3d, 0x75, 0x92, 0x14, 0x42, 0xa2, 0xc9, 0x50, 
-    0x52, 0x57, 0x9f, 0x26, 0x3c, 0xcd, 0x61, 0xa9, 0xda, 0x9b, 0x2c, 0xda, 0xc1, 0xd0, 0x26, 0x07, 
-    0x90, 0x15, 0x8c, 0x81, 0xe2, 0xde, 0xc0, 0x98, 0x58, 0x9d, 0x96, 0x0f, 0xcd, 0x55, 0x02, 0x81, 
-    0x81, 0x00, 0x87, 0xfb, 0xf8, 0x77, 0xf1, 0xcd, 0xf5, 0xb6, 0xa1, 0xd2, 0x3d, 0x71, 0x69, 0x6a, 
-    0xd5, 0x36, 0x87, 0x3e, 0xdd, 0xb1, 0x52, 0x55, 0x70, 0xae, 0x9b, 0x9f, 0x37, 0x42, 0x78, 0x0c, 
-    0xe4, 0x0b, 0xfc, 0x9c, 0xce, 0x20, 0x48, 0xb4, 0xce, 0x95, 0xc7, 0x3e, 0x0d, 0x85, 0x1b, 0x2b, 
-    0x7d, 0x2e, 0xd1, 0x81, 0xac, 0x2b, 0x94, 0x6b, 0xb5, 0x5c, 0xd2, 0x07, 0x46, 0x63, 0xf7, 0x12, 
-    0xb2, 0x94, 0xfd, 0x34, 0xc4, 0xf3, 0x8e, 0xc8, 0x13, 0x08, 0xf0, 0x74, 0x05, 0xdb, 0x45, 0x37, 
-    0xd5, 0x63, 0xfb, 0x34, 0xb3, 0x1a, 0x26, 0xb3, 0x8c, 0x9e, 0x2c, 0x14, 0x02, 0x8b, 0xac, 0x5d, 
-    0xa3, 0x28, 0x96, 0x32, 0x11, 0x60, 0xd8, 0x9e, 0xf9, 0x06, 0x87, 0x5d, 0xaa, 0xca, 0x99, 0xfb, 
-    0x45, 0x1d, 0x9c, 0x3f, 0xca, 0xe6, 0x5f, 0x34, 0x2a, 0xc4, 0x9c, 0x66, 0x4c, 0x07, 0xd7, 0xbe, 
-    0x50, 0x8d, 0x02, 0x81, 0x80, 0x51, 0xdb, 0x96, 0x6c, 0x30, 0x37, 0x6c, 0x9d, 0xa1, 0x43, 0x76, 
-    0x0a, 0xc4, 0xa2, 0x98, 0x75, 0x89, 0x33, 0x5d, 0xd2, 0x25, 0xd3, 0x67, 0x6d, 0xd8, 0x31, 0x44, 
-    0xa5, 0xda, 0x9a, 0xb9, 0x0c, 0xdf, 0xec, 0x10, 0xf4, 0xdf, 0x5d, 0x6d, 0xe1, 0x14, 0x3e, 0x2d, 
-    0xab, 0x5d, 0x24, 0xf4, 0x5a, 0xe3, 0x00, 0xa0, 0x1d, 0x8c, 0x5b, 0x1f, 0x6d, 0xde, 0xaa, 0xcc, 
-    0x93, 0x67, 0xcc, 0x4b, 0x24, 0x9d, 0x96, 0x98, 0x6d, 0x24, 0xbd, 0xe8, 0xb2, 0xd6, 0xed, 0x0a, 
-    0x82, 0x22, 0x31, 0xb1, 0xb9, 0x05, 0xf6, 0x7a, 0x3c, 0x9c, 0xb8, 0xc5, 0x26, 0x65, 0x6a, 0x72, 
-    0xd2, 0x83, 0xb2, 0x4a, 0xba, 0xc1, 0xa8, 0x2c, 0xad, 0xeb, 0xb2, 0x1b, 0xeb, 0x14, 0xe6, 0x9a, 
-    0xba, 0x40, 0xc9, 0x4c, 0x92, 0xa4, 0xc7, 0x5d, 0xc4, 0xf9, 0xed, 0x65, 0x4e, 0xbb, 0x74, 0x40, 
-    0xfb, 0x08, 0x36, 0x0b, 0x65, 0x02, 0x81, 0x81, 0x00, 0xeb, 0x60, 0x01, 0x21, 0x22, 0xa1, 0xde, 
-    0x89, 0x62, 0xfa, 0x68, 0x03, 0x09, 0xf1, 0xa6, 0x14, 0xf0, 0xbe, 0xf7, 0x71, 0x3a, 0x01, 0x85, 
-    0x1f, 0x2c, 0x86, 0xde, 0x4a, 0xfb, 0x35, 0x16, 0xc4, 0x84, 0x22, 0x83, 0x49, 0xeb, 0x0d, 0xf7, 
-    0x33, 0x47, 0x8f, 0x96, 0x37, 0x32, 0xd3, 0xd2, 0xec, 0xea, 0x0f, 0xd0, 0xde, 0x0d, 0x27, 0x9e, 
-    0xc1, 0xf1, 0xe0, 0x39, 0xa6, 0x3e, 0x6c, 0xd4, 0x39, 0xdf, 0xde, 0xbd, 0x4c, 0xb8, 0xe7, 0xb7, 
-    0x4e, 0x2a, 0x32, 0x92, 0x83, 0xd3, 0x12, 0xb9, 0xa1, 0x91, 0x52, 0x46, 0x24, 0x58, 0x05, 0x35, 
-    0x22, 0x5f, 0x10, 0x3c, 0x13, 0x5b, 0xbe, 0x47, 0x5e, 0xbf, 0x85, 0xd6, 0xac, 0xfc, 0xbb, 0xd9, 
-    0x91, 0xf9, 0x50, 0x8f, 0xfc, 0xc2, 0x2c, 0x81, 0x5c, 0xa5, 0xc3, 0xc2, 0x15, 0xbe, 0xf4, 0x72, 
-    0xfd, 0x4d, 0xf0, 0x10, 0x6f, 0xe5, 0xbf, 0x8c, 0xb1  
+    0x30, 0x82, 0x04, 0xa5, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe0, 0xc9, 0x91, 0x62,
+    0xcd, 0x91, 0x68, 0x75, 0x2c, 0x32, 0x7a, 0xdd, 0xf1, 0xd6, 0x64, 0x77, 0x8b, 0x72, 0x9e, 0x14,
+    0x2a, 0x62, 0x08, 0xd1, 0x89, 0x7d, 0xe2, 0x17, 0xdc, 0xb3, 0xda, 0xbc, 0x3a, 0x9f, 0x84, 0x03,
+    0xd3, 0x2e, 0x68, 0xbe, 0xc1, 0x57, 0xcb, 0x2a, 0xe2, 0xd6, 0xcf, 0xc4, 0x7f, 0xbd, 0x53, 0x3f,
+    0xeb, 0x39, 0x98, 0x69, 0xb0, 0x40, 0x14, 0xbf, 0xf5, 0x5a, 0x23, 0x23, 0xf4, 0x4c, 0xf8, 0xf1,
+    0x03, 0x56, 0x6d, 0x7d, 0x1b, 0x93, 0xd7, 0x0f, 0xc1, 0x8c, 0x70, 0xe0, 0x2c, 0x55, 0x7e, 0xa1,
+    0xfc, 0x05, 0xe9, 0xd7, 0xea, 0xb1, 0x5c, 0x0f, 0x9b, 0xac, 0x6a, 0x2e, 0xb4, 0xc5, 0xbf, 0x41,
+    0x8f, 0xda, 0xfc, 0x85, 0xc6, 0xaa, 0x25, 0xe4, 0xb9, 0x9a, 0xc6, 0xd8, 0x9a, 0x31, 0x8a, 0x17,
+    0x8b, 0x8c, 0x4e, 0x20, 0xd9, 0x71, 0xfc, 0x66, 0x3a, 0xfd, 0x49, 0x95, 0x54, 0xa8, 0xaf, 0x42,
+    0x5e, 0xba, 0x26, 0xe6, 0xd3, 0xa0, 0xd2, 0x02, 0x3b, 0x51, 0x8b, 0x39, 0xd3, 0x97, 0xd2, 0xe4,
+    0xd1, 0x01, 0x65, 0xab, 0x8e, 0xa2, 0x80, 0x5b, 0x5e, 0xbb, 0x11, 0x7f, 0x50, 0x1b, 0x2b, 0x0d,
+    0x20, 0x40, 0xb5, 0xbf, 0xd1, 0x32, 0xfa, 0x25, 0xe1, 0x0d, 0x75, 0xfc, 0x11, 0xcf, 0x21, 0xdd,
+    0x45, 0x16, 0xe4, 0x56, 0x58, 0x49, 0x33, 0xca, 0xaf, 0xe3, 0x17, 0x7b, 0x7a, 0x8f, 0xb1, 0xec,
+    0x1c, 0x4d, 0xa2, 0xc2, 0xce, 0x8b, 0x19, 0x4b, 0xc0, 0xc4, 0x36, 0x6a, 0x7c, 0x5b, 0x89, 0x14,
+    0x98, 0xcb, 0xa9, 0xca, 0x66, 0xf2, 0xaa, 0xf9, 0x12, 0x40, 0x0e, 0x6a, 0x78, 0x4d, 0x1f, 0x54,
+    0x3c, 0x03, 0x7a, 0x91, 0xf5, 0xb7, 0x3d, 0xe2, 0xfc, 0x65, 0xb7, 0xaa, 0xa9, 0x39, 0x68, 0xa7,
+    0xdb, 0x29, 0xc1, 0x40, 0x0b, 0x4e, 0xfb, 0xce, 0x74, 0xa5, 0x46, 0xb9, 0x02, 0x03, 0x01, 0x00,
+    0x01, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb4, 0xc8, 0x07, 0x60, 0x01, 0xd9, 0xb6, 0xbb, 0xbd, 0x8e,
+    0xdf, 0x97, 0xcd, 0xde, 0x51, 0xb0, 0x7e, 0xfa, 0xf0, 0x3d, 0x61, 0x94, 0xb4, 0x68, 0xe8, 0x7d,
+    0xd0, 0x2e, 0xc6, 0xb5, 0xf2, 0xed, 0xbc, 0xeb, 0xfb, 0x3d, 0x24, 0x43, 0x47, 0xc4, 0x5a, 0x34,
+    0x64, 0x56, 0x1a, 0x57, 0x0e, 0x83, 0x87, 0x04, 0x59, 0x86, 0xa7, 0x84, 0x0b, 0x9a, 0xbc, 0x3f,
+    0xdd, 0x30, 0x40, 0x7f, 0x7c, 0x91, 0x76, 0xf1, 0xcc, 0xa7, 0xf0, 0xba, 0x3a, 0x96, 0x0a, 0x6e,
+    0xcc, 0xe0, 0x84, 0x15, 0x91, 0xd6, 0x08, 0x71, 0xbd, 0xc5, 0x42, 0xad, 0xf2, 0xd2, 0x4e, 0x92,
+    0xd3, 0x6a, 0x4e, 0x15, 0xcc, 0xd3, 0xc1, 0x58, 0xe4, 0x27, 0x33, 0x2d, 0xb8, 0x37, 0x52, 0x7e,
+    0x16, 0xb9, 0xab, 0xb7, 0xd9, 0xc1, 0xeb, 0xc8, 0x79, 0xb9, 0xd3, 0xe6, 0x44, 0x13, 0x51, 0x2d,
+    0xc6, 0x02, 0xe5, 0xe0, 0x3c, 0xa3, 0x15, 0x9b, 0x49, 0xae, 0x85, 0xbe, 0x8c, 0x84, 0xf9, 0x87,
+    0x5d, 0x91, 0x9e, 0xf4, 0xf9, 0xf2, 0x8d, 0x81, 0x77, 0x7c, 0xfc, 0x60, 0x09, 0x48, 0x43, 0x2e,
+    0xbb, 0xaf, 0xc9, 0xd6, 0x90, 0x2d, 0x40, 0x80, 0x59, 0xbd, 0x3b, 0x04, 0xda, 0x50, 0x2a, 0x53,
+    0xf5, 0xc0, 0x97, 0x54, 0x04, 0x14, 0xb1, 0x8e, 0xd1, 0x6b, 0x53, 0x9e, 0xa4, 0xaa, 0x5e, 0x6e,
+    0x1c, 0x11, 0x6b, 0x0a, 0xc4, 0xec, 0x5b, 0x77, 0xa8, 0x00, 0x83, 0x77, 0xdb, 0xf4, 0xfb, 0x00,
+    0xf4, 0x06, 0x57, 0x25, 0x8e, 0x1c, 0x87, 0xb4, 0xbe, 0xb8, 0x04, 0x35, 0x93, 0x67, 0xaa, 0x36,
+    0xa5, 0x62, 0xe4, 0xf6, 0xcb, 0xc8, 0xa6, 0x58, 0x77, 0x96, 0xc4, 0x6c, 0x0b, 0xc8, 0x41, 0xe2,
+    0x36, 0x01, 0x94, 0xa5, 0xe9, 0x46, 0x17, 0xd3, 0x0b, 0x18, 0x7e, 0x06, 0x88, 0x9b, 0x7e, 0xdd,
+    0x92, 0x20, 0xc6, 0xe3, 0x7e, 0xb1, 0x02, 0x81, 0x81, 0x00, 0xf5, 0xa6, 0xda, 0x32, 0xb9, 0x37,
+    0x61, 0xe9, 0x7c, 0x99, 0xf7, 0x4a, 0x37, 0xee, 0x52, 0x30, 0x4f, 0xbf, 0x57, 0x6f, 0xfe, 0x20,
+    0xdc, 0xa3, 0xfe, 0x51, 0xbf, 0x72, 0x13, 0x8a, 0xb1, 0xd7, 0x99, 0x7d, 0x67, 0xa8, 0xd4, 0xb0,
+    0x35, 0x40, 0x7c, 0xc8, 0xdc, 0x03, 0x6b, 0x90, 0xb5, 0x65, 0x04, 0x7f, 0x97, 0x8b, 0xa8, 0x69,
+    0x20, 0x04, 0xcb, 0x48, 0x39, 0xb7, 0x57, 0xe0, 0xd9, 0xbb, 0x15, 0xe1, 0x59, 0x16, 0xf3, 0xe1,
+    0xab, 0x91, 0xea, 0x8a, 0x88, 0xad, 0x8d, 0xa3, 0x24, 0x4a, 0x35, 0xa5, 0xd2, 0x32, 0x19, 0x66,
+    0xa8, 0xbb, 0x32, 0x9d, 0xf4, 0x94, 0x99, 0xc1, 0x2e, 0x2b, 0xf8, 0x98, 0x6a, 0x6e, 0x72, 0x77,
+    0xd0, 0xc9, 0xfc, 0x5f, 0xd7, 0x69, 0xd1, 0x08, 0x12, 0xbf, 0x81, 0xc1, 0xa1, 0x1b, 0x3b, 0x41,
+    0xb0, 0x24, 0x11, 0x0a, 0x65, 0xab, 0x81, 0x39, 0xb3, 0xd5, 0x02, 0x81, 0x81, 0x00, 0xea, 0x41,
+    0xb5, 0xed, 0xac, 0xa0, 0x43, 0xd7, 0xde, 0x1e, 0x6b, 0x95, 0xbe, 0x88, 0x02, 0xaf, 0x2f, 0xbb,
+    0x37, 0xf7, 0x2f, 0xf6, 0x4f, 0xa0, 0xaa, 0x43, 0x03, 0x7d, 0x33, 0xdd, 0x1e, 0x7a, 0xba, 0xa0,
+    0x10, 0x77, 0x1f, 0x4a, 0xc9, 0x88, 0x58, 0x9d, 0x81, 0x3a, 0xe8, 0xac, 0x86, 0x2f, 0x80, 0x6c,
+    0xc7, 0xa0, 0xe5, 0xed, 0x8d, 0x90, 0xa9, 0xa7, 0x36, 0x23, 0xd7, 0xb5, 0x89, 0xfc, 0xad, 0x4d,
+    0xae, 0x0e, 0xec, 0xdc, 0xe7, 0x7e, 0x69, 0xfe, 0x62, 0x4b, 0x81, 0xfe, 0x52, 0x81, 0x77, 0x6a,
+    0x35, 0xab, 0x52, 0x6f, 0x56, 0x41, 0x6c, 0x57, 0x3d, 0x75, 0x92, 0x14, 0x42, 0xa2, 0xc9, 0x50,
+    0x52, 0x57, 0x9f, 0x26, 0x3c, 0xcd, 0x61, 0xa9, 0xda, 0x9b, 0x2c, 0xda, 0xc1, 0xd0, 0x26, 0x07,
+    0x90, 0x15, 0x8c, 0x81, 0xe2, 0xde, 0xc0, 0x98, 0x58, 0x9d, 0x96, 0x0f, 0xcd, 0x55, 0x02, 0x81,
+    0x81, 0x00, 0x87, 0xfb, 0xf8, 0x77, 0xf1, 0xcd, 0xf5, 0xb6, 0xa1, 0xd2, 0x3d, 0x71, 0x69, 0x6a,
+    0xd5, 0x36, 0x87, 0x3e, 0xdd, 0xb1, 0x52, 0x55, 0x70, 0xae, 0x9b, 0x9f, 0x37, 0x42, 0x78, 0x0c,
+    0xe4, 0x0b, 0xfc, 0x9c, 0xce, 0x20, 0x48, 0xb4, 0xce, 0x95, 0xc7, 0x3e, 0x0d, 0x85, 0x1b, 0x2b,
+    0x7d, 0x2e, 0xd1, 0x81, 0xac, 0x2b, 0x94, 0x6b, 0xb5, 0x5c, 0xd2, 0x07, 0x46, 0x63, 0xf7, 0x12,
+    0xb2, 0x94, 0xfd, 0x34, 0xc4, 0xf3, 0x8e, 0xc8, 0x13, 0x08, 0xf0, 0x74, 0x05, 0xdb, 0x45, 0x37,
+    0xd5, 0x63, 0xfb, 0x34, 0xb3, 0x1a, 0x26, 0xb3, 0x8c, 0x9e, 0x2c, 0x14, 0x02, 0x8b, 0xac, 0x5d,
+    0xa3, 0x28, 0x96, 0x32, 0x11, 0x60, 0xd8, 0x9e, 0xf9, 0x06, 0x87, 0x5d, 0xaa, 0xca, 0x99, 0xfb,
+    0x45, 0x1d, 0x9c, 0x3f, 0xca, 0xe6, 0x5f, 0x34, 0x2a, 0xc4, 0x9c, 0x66, 0x4c, 0x07, 0xd7, 0xbe,
+    0x50, 0x8d, 0x02, 0x81, 0x80, 0x51, 0xdb, 0x96, 0x6c, 0x30, 0x37, 0x6c, 0x9d, 0xa1, 0x43, 0x76,
+    0x0a, 0xc4, 0xa2, 0x98, 0x75, 0x89, 0x33, 0x5d, 0xd2, 0x25, 0xd3, 0x67, 0x6d, 0xd8, 0x31, 0x44,
+    0xa5, 0xda, 0x9a, 0xb9, 0x0c, 0xdf, 0xec, 0x10, 0xf4, 0xdf, 0x5d, 0x6d, 0xe1, 0x14, 0x3e, 0x2d,
+    0xab, 0x5d, 0x24, 0xf4, 0x5a, 0xe3, 0x00, 0xa0, 0x1d, 0x8c, 0x5b, 0x1f, 0x6d, 0xde, 0xaa, 0xcc,
+    0x93, 0x67, 0xcc, 0x4b, 0x24, 0x9d, 0x96, 0x98, 0x6d, 0x24, 0xbd, 0xe8, 0xb2, 0xd6, 0xed, 0x0a,
+    0x82, 0x22, 0x31, 0xb1, 0xb9, 0x05, 0xf6, 0x7a, 0x3c, 0x9c, 0xb8, 0xc5, 0x26, 0x65, 0x6a, 0x72,
+    0xd2, 0x83, 0xb2, 0x4a, 0xba, 0xc1, 0xa8, 0x2c, 0xad, 0xeb, 0xb2, 0x1b, 0xeb, 0x14, 0xe6, 0x9a,
+    0xba, 0x40, 0xc9, 0x4c, 0x92, 0xa4, 0xc7, 0x5d, 0xc4, 0xf9, 0xed, 0x65, 0x4e, 0xbb, 0x74, 0x40,
+    0xfb, 0x08, 0x36, 0x0b, 0x65, 0x02, 0x81, 0x81, 0x00, 0xeb, 0x60, 0x01, 0x21, 0x22, 0xa1, 0xde,
+    0x89, 0x62, 0xfa, 0x68, 0x03, 0x09, 0xf1, 0xa6, 0x14, 0xf0, 0xbe, 0xf7, 0x71, 0x3a, 0x01, 0x85,
+    0x1f, 0x2c, 0x86, 0xde, 0x4a, 0xfb, 0x35, 0x16, 0xc4, 0x84, 0x22, 0x83, 0x49, 0xeb, 0x0d, 0xf7,
+    0x33, 0x47, 0x8f, 0x96, 0x37, 0x32, 0xd3, 0xd2, 0xec, 0xea, 0x0f, 0xd0, 0xde, 0x0d, 0x27, 0x9e,
+    0xc1, 0xf1, 0xe0, 0x39, 0xa6, 0x3e, 0x6c, 0xd4, 0x39, 0xdf, 0xde, 0xbd, 0x4c, 0xb8, 0xe7, 0xb7,
+    0x4e, 0x2a, 0x32, 0x92, 0x83, 0xd3, 0x12, 0xb9, 0xa1, 0x91, 0x52, 0x46, 0x24, 0x58, 0x05, 0x35,
+    0x22, 0x5f, 0x10, 0x3c, 0x13, 0x5b, 0xbe, 0x47, 0x5e, 0xbf, 0x85, 0xd6, 0xac, 0xfc, 0xbb, 0xd9,
+    0x91, 0xf9, 0x50, 0x8f, 0xfc, 0xc2, 0x2c, 0x81, 0x5c, 0xa5, 0xc3, 0xc2, 0x15, 0xbe, 0xf4, 0x72,
+    0xfd, 0x4d, 0xf0, 0x10, 0x6f, 0xe5, 0xbf, 0x8c, 0xb1
     };
 
 #define CERT_DER_LENGTH 968
 UA_Byte CERT_DER_DATA[968] = {
-    0x30, 0x82, 0x03, 0xc4, 0x30, 0x82, 0x02, 0xac, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00, 
-    0xa7, 0x17, 0x44, 0x2f, 0x8e, 0x6b, 0x74, 0xba, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 
-    0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x39, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 
-    0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 
-    0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 
-    0x55, 0x04, 0x03, 0x0c, 0x0d, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x6f, 
-    0x72, 0x67, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x33, 0x32, 0x38, 0x30, 0x38, 0x33, 0x33, 
-    0x35, 0x37, 0x5a, 0x17, 0x0d, 0x32, 0x38, 0x30, 0x33, 0x32, 0x35, 0x30, 0x38, 0x33, 0x33, 0x35, 
-    0x37, 0x5a, 0x30, 0x45, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44, 
-    0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e, 
-    0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19, 
-    0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40, 
-    0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 
-    0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 
-    0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe0, 0xc9, 0x91, 0x62, 0xcd, 0x91, 
-    0x68, 0x75, 0x2c, 0x32, 0x7a, 0xdd, 0xf1, 0xd6, 0x64, 0x77, 0x8b, 0x72, 0x9e, 0x14, 0x2a, 0x62, 
-    0x08, 0xd1, 0x89, 0x7d, 0xe2, 0x17, 0xdc, 0xb3, 0xda, 0xbc, 0x3a, 0x9f, 0x84, 0x03, 0xd3, 0x2e, 
-    0x68, 0xbe, 0xc1, 0x57, 0xcb, 0x2a, 0xe2, 0xd6, 0xcf, 0xc4, 0x7f, 0xbd, 0x53, 0x3f, 0xeb, 0x39, 
-    0x98, 0x69, 0xb0, 0x40, 0x14, 0xbf, 0xf5, 0x5a, 0x23, 0x23, 0xf4, 0x4c, 0xf8, 0xf1, 0x03, 0x56, 
-    0x6d, 0x7d, 0x1b, 0x93, 0xd7, 0x0f, 0xc1, 0x8c, 0x70, 0xe0, 0x2c, 0x55, 0x7e, 0xa1, 0xfc, 0x05, 
-    0xe9, 0xd7, 0xea, 0xb1, 0x5c, 0x0f, 0x9b, 0xac, 0x6a, 0x2e, 0xb4, 0xc5, 0xbf, 0x41, 0x8f, 0xda, 
-    0xfc, 0x85, 0xc6, 0xaa, 0x25, 0xe4, 0xb9, 0x9a, 0xc6, 0xd8, 0x9a, 0x31, 0x8a, 0x17, 0x8b, 0x8c, 
-    0x4e, 0x20, 0xd9, 0x71, 0xfc, 0x66, 0x3a, 0xfd, 0x49, 0x95, 0x54, 0xa8, 0xaf, 0x42, 0x5e, 0xba, 
-    0x26, 0xe6, 0xd3, 0xa0, 0xd2, 0x02, 0x3b, 0x51, 0x8b, 0x39, 0xd3, 0x97, 0xd2, 0xe4, 0xd1, 0x01, 
-    0x65, 0xab, 0x8e, 0xa2, 0x80, 0x5b, 0x5e, 0xbb, 0x11, 0x7f, 0x50, 0x1b, 0x2b, 0x0d, 0x20, 0x40, 
-    0xb5, 0xbf, 0xd1, 0x32, 0xfa, 0x25, 0xe1, 0x0d, 0x75, 0xfc, 0x11, 0xcf, 0x21, 0xdd, 0x45, 0x16, 
-    0xe4, 0x56, 0x58, 0x49, 0x33, 0xca, 0xaf, 0xe3, 0x17, 0x7b, 0x7a, 0x8f, 0xb1, 0xec, 0x1c, 0x4d, 
-    0xa2, 0xc2, 0xce, 0x8b, 0x19, 0x4b, 0xc0, 0xc4, 0x36, 0x6a, 0x7c, 0x5b, 0x89, 0x14, 0x98, 0xcb, 
-    0xa9, 0xca, 0x66, 0xf2, 0xaa, 0xf9, 0x12, 0x40, 0x0e, 0x6a, 0x78, 0x4d, 0x1f, 0x54, 0x3c, 0x03, 
-    0x7a, 0x91, 0xf5, 0xb7, 0x3d, 0xe2, 0xfc, 0x65, 0xb7, 0xaa, 0xa9, 0x39, 0x68, 0xa7, 0xdb, 0x29, 
-    0xc1, 0x40, 0x0b, 0x4e, 0xfb, 0xce, 0x74, 0xa5, 0x46, 0xb9, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 
-    0x81, 0xc2, 0x30, 0x81, 0xbf, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 
-    0x60, 0x6e, 0x44, 0x94, 0xa8, 0xa2, 0x4e, 0x7a, 0x3e, 0xe2, 0x4b, 0x84, 0x5e, 0xec, 0x01, 0xc9, 
-    0xa3, 0xf9, 0x69, 0xaf, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 
-    0x14, 0x53, 0x77, 0xe0, 0xa2, 0xf2, 0x49, 0x38, 0xcf, 0x71, 0x58, 0x0a, 0x67, 0xa6, 0xc0, 0x17, 
-    0xd7, 0xb5, 0xdc, 0x52, 0x4b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x02, 0x30, 0x00, 
-    0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x05, 0xe0, 0x30, 0x1d, 0x06, 
-    0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 
-    0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x46, 0x06, 0x03, 
-    0x55, 0x1d, 0x11, 0x04, 0x3f, 0x30, 0x3d, 0x82, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 
-    0x73, 0x74, 0x82, 0x06, 0x64, 0x65, 0x62, 0x69, 0x61, 0x6e, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01, 
-    0x87, 0x04, 0x00, 0x00, 0x00, 0x00, 0x86, 0x1c, 0x75, 0x72, 0x6e, 0x3a, 0x75, 0x6e, 0x63, 0x6f, 
-    0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x3a, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 
-    0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 
-    0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0xa4, 0xc1, 0x4f, 0x0e, 0xfe, 0xce, 0x2d, 0x91, 
-    0x8a, 0x51, 0x25, 0xd2, 0x6c, 0x07, 0x86, 0x95, 0xba, 0xc5, 0xe0, 0xad, 0x9b, 0x09, 0x3e, 0x7f, 
-    0x36, 0xc4, 0xa8, 0x10, 0x5b, 0x33, 0x77, 0xe5, 0xb5, 0x3b, 0xd8, 0x98, 0x7c, 0x42, 0x05, 0xcb, 
-    0xb7, 0x91, 0x07, 0x3f, 0x47, 0xff, 0x13, 0x15, 0x45, 0xff, 0x05, 0x03, 0x3d, 0xed, 0x63, 0x96, 
-    0x3a, 0x5c, 0xf8, 0x59, 0xd0, 0xbc, 0x68, 0x8c, 0xfb, 0xf8, 0x29, 0x07, 0x76, 0x63, 0xa7, 0x39, 
-    0xc1, 0x82, 0xc1, 0x10, 0x8b, 0x17, 0xf2, 0x1d, 0x14, 0xdd, 0x88, 0xe7, 0xdc, 0x2f, 0xa7, 0x9d, 
-    0xa3, 0xaa, 0xfd, 0x1a, 0x70, 0xce, 0x57, 0xb5, 0x9f, 0xc3, 0x7b, 0xd0, 0xc0, 0x6f, 0x73, 0x81, 
-    0x74, 0x41, 0x93, 0x0d, 0x0d, 0x1a, 0x95, 0xf6, 0xe4, 0x1c, 0x04, 0x2b, 0x37, 0x4f, 0xf9, 0x99, 
-    0x82, 0x57, 0xf0, 0x4f, 0x14, 0xcb, 0x0f, 0x3d, 0x1a, 0x52, 0x69, 0x18, 0x3f, 0xbe, 0x1c, 0x1c, 
-    0x1b, 0xca, 0xbd, 0xe7, 0xe0, 0x81, 0x44, 0x6d, 0x4a, 0x08, 0x8a, 0xe2, 0x7e, 0x59, 0x9f, 0x89, 
-    0x44, 0x7e, 0x4d, 0xaf, 0x5a, 0x8e, 0xe8, 0xd2, 0x2e, 0x98, 0x72, 0x86, 0xef, 0x7b, 0xcf, 0x88, 
-    0xd0, 0xe2, 0xd5, 0xd9, 0xd5, 0x19, 0xa2, 0x8c, 0xf4, 0x40, 0x98, 0x86, 0x32, 0x9f, 0x3e, 0x25, 
-    0x05, 0xd0, 0xdc, 0xf8, 0x1a, 0x0f, 0xdf, 0xc0, 0x54, 0x46, 0x20, 0xbd, 0xd4, 0xf6, 0xf5, 0xdd, 
-    0x10, 0x2e, 0xa7, 0x1a, 0xf4, 0xbb, 0xed, 0x5d, 0xf3, 0x1c, 0x96, 0x44, 0x81, 0x69, 0xd4, 0x0b, 
-    0xbe, 0x59, 0x07, 0x1b, 0x7f, 0x93, 0xc3, 0x4e, 0x7b, 0x32, 0x51, 0xd0, 0x13, 0x47, 0x57, 0x52, 
-    0xf0, 0x5c, 0x54, 0x36, 0x22, 0xb6, 0xf5, 0x67, 0xbb, 0xd3, 0xa6, 0x43, 0xf0, 0xca, 0x98, 0x91, 
-    0xda, 0x31, 0x3e, 0xd2, 0x8c, 0xfe, 0xd7, 0x51  
+    0x30, 0x82, 0x03, 0xc4, 0x30, 0x82, 0x02, 0xac, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00,
+    0xa7, 0x17, 0x44, 0x2f, 0x8e, 0x6b, 0x74, 0xba, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
+    0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x39, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55,
+    0x04, 0x06, 0x13, 0x02, 0x44, 0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
+    0x09, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03,
+    0x55, 0x04, 0x03, 0x0c, 0x0d, 0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x2e, 0x6f,
+    0x72, 0x67, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x33, 0x32, 0x38, 0x30, 0x38, 0x33, 0x33,
+    0x35, 0x37, 0x5a, 0x17, 0x0d, 0x32, 0x38, 0x30, 0x33, 0x32, 0x35, 0x30, 0x38, 0x33, 0x33, 0x35,
+    0x37, 0x5a, 0x30, 0x45, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x44,
+    0x45, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x09, 0x6f, 0x70, 0x65, 0x6e,
+    0x36, 0x32, 0x35, 0x34, 0x31, 0x31, 0x22, 0x30, 0x20, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x19,
+    0x6f, 0x70, 0x65, 0x6e, 0x36, 0x32, 0x35, 0x34, 0x31, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x40,
+    0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06,
+    0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f,
+    0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe0, 0xc9, 0x91, 0x62, 0xcd, 0x91,
+    0x68, 0x75, 0x2c, 0x32, 0x7a, 0xdd, 0xf1, 0xd6, 0x64, 0x77, 0x8b, 0x72, 0x9e, 0x14, 0x2a, 0x62,
+    0x08, 0xd1, 0x89, 0x7d, 0xe2, 0x17, 0xdc, 0xb3, 0xda, 0xbc, 0x3a, 0x9f, 0x84, 0x03, 0xd3, 0x2e,
+    0x68, 0xbe, 0xc1, 0x57, 0xcb, 0x2a, 0xe2, 0xd6, 0xcf, 0xc4, 0x7f, 0xbd, 0x53, 0x3f, 0xeb, 0x39,
+    0x98, 0x69, 0xb0, 0x40, 0x14, 0xbf, 0xf5, 0x5a, 0x23, 0x23, 0xf4, 0x4c, 0xf8, 0xf1, 0x03, 0x56,
+    0x6d, 0x7d, 0x1b, 0x93, 0xd7, 0x0f, 0xc1, 0x8c, 0x70, 0xe0, 0x2c, 0x55, 0x7e, 0xa1, 0xfc, 0x05,
+    0xe9, 0xd7, 0xea, 0xb1, 0x5c, 0x0f, 0x9b, 0xac, 0x6a, 0x2e, 0xb4, 0xc5, 0xbf, 0x41, 0x8f, 0xda,
+    0xfc, 0x85, 0xc6, 0xaa, 0x25, 0xe4, 0xb9, 0x9a, 0xc6, 0xd8, 0x9a, 0x31, 0x8a, 0x17, 0x8b, 0x8c,
+    0x4e, 0x20, 0xd9, 0x71, 0xfc, 0x66, 0x3a, 0xfd, 0x49, 0x95, 0x54, 0xa8, 0xaf, 0x42, 0x5e, 0xba,
+    0x26, 0xe6, 0xd3, 0xa0, 0xd2, 0x02, 0x3b, 0x51, 0x8b, 0x39, 0xd3, 0x97, 0xd2, 0xe4, 0xd1, 0x01,
+    0x65, 0xab, 0x8e, 0xa2, 0x80, 0x5b, 0x5e, 0xbb, 0x11, 0x7f, 0x50, 0x1b, 0x2b, 0x0d, 0x20, 0x40,
+    0xb5, 0xbf, 0xd1, 0x32, 0xfa, 0x25, 0xe1, 0x0d, 0x75, 0xfc, 0x11, 0xcf, 0x21, 0xdd, 0x45, 0x16,
+    0xe4, 0x56, 0x58, 0x49, 0x33, 0xca, 0xaf, 0xe3, 0x17, 0x7b, 0x7a, 0x8f, 0xb1, 0xec, 0x1c, 0x4d,
+    0xa2, 0xc2, 0xce, 0x8b, 0x19, 0x4b, 0xc0, 0xc4, 0x36, 0x6a, 0x7c, 0x5b, 0x89, 0x14, 0x98, 0xcb,
+    0xa9, 0xca, 0x66, 0xf2, 0xaa, 0xf9, 0x12, 0x40, 0x0e, 0x6a, 0x78, 0x4d, 0x1f, 0x54, 0x3c, 0x03,
+    0x7a, 0x91, 0xf5, 0xb7, 0x3d, 0xe2, 0xfc, 0x65, 0xb7, 0xaa, 0xa9, 0x39, 0x68, 0xa7, 0xdb, 0x29,
+    0xc1, 0x40, 0x0b, 0x4e, 0xfb, 0xce, 0x74, 0xa5, 0x46, 0xb9, 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3,
+    0x81, 0xc2, 0x30, 0x81, 0xbf, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14,
+    0x60, 0x6e, 0x44, 0x94, 0xa8, 0xa2, 0x4e, 0x7a, 0x3e, 0xe2, 0x4b, 0x84, 0x5e, 0xec, 0x01, 0xc9,
+    0xa3, 0xf9, 0x69, 0xaf, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80,
+    0x14, 0x53, 0x77, 0xe0, 0xa2, 0xf2, 0x49, 0x38, 0xcf, 0x71, 0x58, 0x0a, 0x67, 0xa6, 0xc0, 0x17,
+    0xd7, 0xb5, 0xdc, 0x52, 0x4b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x02, 0x30, 0x00,
+    0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x05, 0xe0, 0x30, 0x1d, 0x06,
+    0x03, 0x55, 0x1d, 0x25, 0x04, 0x16, 0x30, 0x14, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07,
+    0x03, 0x01, 0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02, 0x30, 0x46, 0x06, 0x03,
+    0x55, 0x1d, 0x11, 0x04, 0x3f, 0x30, 0x3d, 0x82, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f,
+    0x73, 0x74, 0x82, 0x06, 0x64, 0x65, 0x62, 0x69, 0x61, 0x6e, 0x87, 0x04, 0x7f, 0x00, 0x00, 0x01,
+    0x87, 0x04, 0x00, 0x00, 0x00, 0x00, 0x86, 0x1c, 0x75, 0x72, 0x6e, 0x3a, 0x75, 0x6e, 0x63, 0x6f,
+    0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x3a, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61,
+    0x74, 0x69, 0x6f, 0x6e, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+    0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0xa4, 0xc1, 0x4f, 0x0e, 0xfe, 0xce, 0x2d, 0x91,
+    0x8a, 0x51, 0x25, 0xd2, 0x6c, 0x07, 0x86, 0x95, 0xba, 0xc5, 0xe0, 0xad, 0x9b, 0x09, 0x3e, 0x7f,
+    0x36, 0xc4, 0xa8, 0x10, 0x5b, 0x33, 0x77, 0xe5, 0xb5, 0x3b, 0xd8, 0x98, 0x7c, 0x42, 0x05, 0xcb,
+    0xb7, 0x91, 0x07, 0x3f, 0x47, 0xff, 0x13, 0x15, 0x45, 0xff, 0x05, 0x03, 0x3d, 0xed, 0x63, 0x96,
+    0x3a, 0x5c, 0xf8, 0x59, 0xd0, 0xbc, 0x68, 0x8c, 0xfb, 0xf8, 0x29, 0x07, 0x76, 0x63, 0xa7, 0x39,
+    0xc1, 0x82, 0xc1, 0x10, 0x8b, 0x17, 0xf2, 0x1d, 0x14, 0xdd, 0x88, 0xe7, 0xdc, 0x2f, 0xa7, 0x9d,
+    0xa3, 0xaa, 0xfd, 0x1a, 0x70, 0xce, 0x57, 0xb5, 0x9f, 0xc3, 0x7b, 0xd0, 0xc0, 0x6f, 0x73, 0x81,
+    0x74, 0x41, 0x93, 0x0d, 0x0d, 0x1a, 0x95, 0xf6, 0xe4, 0x1c, 0x04, 0x2b, 0x37, 0x4f, 0xf9, 0x99,
+    0x82, 0x57, 0xf0, 0x4f, 0x14, 0xcb, 0x0f, 0x3d, 0x1a, 0x52, 0x69, 0x18, 0x3f, 0xbe, 0x1c, 0x1c,
+    0x1b, 0xca, 0xbd, 0xe7, 0xe0, 0x81, 0x44, 0x6d, 0x4a, 0x08, 0x8a, 0xe2, 0x7e, 0x59, 0x9f, 0x89,
+    0x44, 0x7e, 0x4d, 0xaf, 0x5a, 0x8e, 0xe8, 0xd2, 0x2e, 0x98, 0x72, 0x86, 0xef, 0x7b, 0xcf, 0x88,
+    0xd0, 0xe2, 0xd5, 0xd9, 0xd5, 0x19, 0xa2, 0x8c, 0xf4, 0x40, 0x98, 0x86, 0x32, 0x9f, 0x3e, 0x25,
+    0x05, 0xd0, 0xdc, 0xf8, 0x1a, 0x0f, 0xdf, 0xc0, 0x54, 0x46, 0x20, 0xbd, 0xd4, 0xf6, 0xf5, 0xdd,
+    0x10, 0x2e, 0xa7, 0x1a, 0xf4, 0xbb, 0xed, 0x5d, 0xf3, 0x1c, 0x96, 0x44, 0x81, 0x69, 0xd4, 0x0b,
+    0xbe, 0x59, 0x07, 0x1b, 0x7f, 0x93, 0xc3, 0x4e, 0x7b, 0x32, 0x51, 0xd0, 0x13, 0x47, 0x57, 0x52,
+    0xf0, 0x5c, 0x54, 0x36, 0x22, 0xb6, 0xf5, 0x67, 0xbb, 0xd3, 0xa6, 0x43, 0xf0, 0xca, 0x98, 0x91,
+    0xda, 0x31, 0x3e, 0xd2, 0x8c, 0xfe, 0xd7, 0x51
     };
 
 #define KEY_PEM_LENGTH 1679
@@ -348,6 +348,906 @@ UA_Byte CERT_PEM_DATA[1367] = {
     0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
 };
 
+/* Generated from KEY_PEM_DATA via: openssl pkcs8 -topk8 -v2 des3 -in key.pem -out key-password.pem
+   The password is pass1234 */
+#define KEY_PEM_PASSWORD_LENGTH 1854
+UA_Byte KEY_PEM_PASSWORD_DATA[KEY_PEM_PASSWORD_LENGTH] = {
+    0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x45, 0x4e, 0x43, 0x52, 0x59,
+    0x50, 0x54, 0x45, 0x44, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59,
+    0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x46, 0x48, 0x44, 0x42, 0x4f, 0x42, 0x67,
+    0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x42, 0x51, 0x30, 0x77, 0x51, 0x54,
+    0x41, 0x70, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x42, 0x51,
+    0x77, 0x77, 0x48, 0x41, 0x51, 0x49, 0x71, 0x77, 0x7a, 0x47, 0x38, 0x51, 0x68, 0x69, 0x56, 0x58,
+    0x38, 0x43, 0x41, 0x67, 0x67, 0x41, 0x0a, 0x4d, 0x41, 0x77, 0x47, 0x43, 0x43, 0x71, 0x47, 0x53,
+    0x49, 0x62, 0x33, 0x44, 0x51, 0x49, 0x4a, 0x42, 0x51, 0x41, 0x77, 0x46, 0x41, 0x59, 0x49, 0x4b,
+    0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x77, 0x63, 0x45, 0x43, 0x4a, 0x5a, 0x52, 0x51,
+    0x57, 0x78, 0x4c, 0x47, 0x62, 0x31, 0x39, 0x42, 0x49, 0x49, 0x45, 0x79, 0x4e, 0x7a, 0x72, 0x52,
+    0x4b, 0x31, 0x77, 0x4b, 0x42, 0x65, 0x51, 0x0a, 0x59, 0x48, 0x48, 0x36, 0x45, 0x37, 0x45, 0x7a,
+    0x5a, 0x67, 0x43, 0x57, 0x4f, 0x64, 0x62, 0x53, 0x7a, 0x30, 0x44, 0x50, 0x78, 0x33, 0x52, 0x6a,
+    0x48, 0x6c, 0x62, 0x53, 0x67, 0x48, 0x64, 0x30, 0x55, 0x34, 0x6f, 0x36, 0x4f, 0x76, 0x74, 0x71,
+    0x31, 0x36, 0x55, 0x46, 0x43, 0x4c, 0x65, 0x74, 0x77, 0x4d, 0x6e, 0x30, 0x35, 0x72, 0x56, 0x41,
+    0x68, 0x4c, 0x61, 0x44, 0x73, 0x39, 0x43, 0x75, 0x0a, 0x61, 0x65, 0x7a, 0x78, 0x42, 0x4d, 0x4a,
+    0x77, 0x78, 0x77, 0x37, 0x6d, 0x32, 0x43, 0x4b, 0x42, 0x6f, 0x49, 0x79, 0x33, 0x41, 0x41, 0x39,
+    0x47, 0x46, 0x58, 0x49, 0x5a, 0x71, 0x79, 0x75, 0x37, 0x63, 0x65, 0x5a, 0x4e, 0x52, 0x36, 0x64,
+    0x53, 0x39, 0x4c, 0x49, 0x50, 0x73, 0x73, 0x71, 0x75, 0x54, 0x4f, 0x54, 0x76, 0x76, 0x48, 0x6f,
+    0x4b, 0x45, 0x6a, 0x64, 0x30, 0x56, 0x51, 0x71, 0x42, 0x0a, 0x33, 0x66, 0x66, 0x38, 0x5a, 0x72,
+    0x4d, 0x49, 0x6a, 0x2b, 0x33, 0x7a, 0x43, 0x4b, 0x6f, 0x78, 0x45, 0x62, 0x38, 0x38, 0x50, 0x70,
+    0x68, 0x54, 0x61, 0x65, 0x75, 0x31, 0x62, 0x4e, 0x66, 0x6c, 0x49, 0x72, 0x6a, 0x79, 0x79, 0x78,
+    0x70, 0x30, 0x4c, 0x5a, 0x79, 0x45, 0x36, 0x51, 0x75, 0x66, 0x75, 0x76, 0x4c, 0x42, 0x72, 0x4a,
+    0x53, 0x66, 0x41, 0x46, 0x4c, 0x71, 0x63, 0x32, 0x6d, 0x4e, 0x0a, 0x45, 0x45, 0x45, 0x5a, 0x55,
+    0x79, 0x43, 0x77, 0x74, 0x78, 0x4e, 0x6d, 0x31, 0x42, 0x2f, 0x37, 0x75, 0x52, 0x2b, 0x72, 0x36,
+    0x2f, 0x50, 0x64, 0x36, 0x74, 0x58, 0x6c, 0x2f, 0x57, 0x6d, 0x45, 0x47, 0x4c, 0x68, 0x76, 0x2b,
+    0x36, 0x45, 0x52, 0x58, 0x74, 0x35, 0x61, 0x61, 0x61, 0x39, 0x47, 0x51, 0x30, 0x67, 0x32, 0x78,
+    0x7a, 0x4a, 0x42, 0x36, 0x54, 0x50, 0x30, 0x41, 0x5a, 0x45, 0x6d, 0x0a, 0x73, 0x7a, 0x42, 0x4a,
+    0x72, 0x62, 0x4f, 0x31, 0x4e, 0x57, 0x79, 0x73, 0x33, 0x6e, 0x5a, 0x4f, 0x65, 0x64, 0x31, 0x2f,
+    0x46, 0x49, 0x38, 0x43, 0x6e, 0x42, 0x55, 0x32, 0x4b, 0x6f, 0x61, 0x62, 0x67, 0x65, 0x6b, 0x6c,
+    0x64, 0x37, 0x69, 0x61, 0x39, 0x61, 0x58, 0x4b, 0x5a, 0x54, 0x65, 0x76, 0x44, 0x78, 0x70, 0x46,
+    0x4b, 0x75, 0x61, 0x36, 0x73, 0x35, 0x77, 0x43, 0x75, 0x58, 0x32, 0x4a, 0x0a, 0x54, 0x4d, 0x2b,
+    0x41, 0x43, 0x76, 0x46, 0x65, 0x6d, 0x52, 0x71, 0x71, 0x68, 0x4f, 0x48, 0x6c, 0x69, 0x43, 0x4d,
+    0x65, 0x70, 0x38, 0x41, 0x6c, 0x4a, 0x6e, 0x2f, 0x4a, 0x66, 0x45, 0x78, 0x38, 0x48, 0x6a, 0x74,
+    0x53, 0x6a, 0x7a, 0x77, 0x42, 0x35, 0x52, 0x71, 0x56, 0x4f, 0x6b, 0x33, 0x6b, 0x72, 0x72, 0x44,
+    0x71, 0x6e, 0x79, 0x31, 0x36, 0x41, 0x6d, 0x64, 0x78, 0x50, 0x34, 0x61, 0x56, 0x0a, 0x75, 0x68,
+    0x6a, 0x67, 0x44, 0x62, 0x58, 0x4e, 0x66, 0x33, 0x31, 0x39, 0x63, 0x75, 0x43, 0x71, 0x32, 0x74,
+    0x35, 0x68, 0x38, 0x31, 0x6e, 0x72, 0x48, 0x6d, 0x6a, 0x4b, 0x63, 0x6c, 0x55, 0x52, 0x59, 0x54,
+    0x30, 0x2f, 0x6d, 0x64, 0x34, 0x43, 0x6b, 0x51, 0x6e, 0x64, 0x50, 0x51, 0x7a, 0x51, 0x33, 0x4c,
+    0x61, 0x51, 0x73, 0x62, 0x38, 0x47, 0x4f, 0x63, 0x67, 0x35, 0x58, 0x45, 0x76, 0x67, 0x0a, 0x78,
+    0x73, 0x68, 0x39, 0x65, 0x55, 0x58, 0x64, 0x75, 0x4f, 0x65, 0x45, 0x46, 0x6f, 0x72, 0x32, 0x54,
+    0x6d, 0x73, 0x2f, 0x6b, 0x55, 0x62, 0x77, 0x76, 0x73, 0x66, 0x2b, 0x63, 0x30, 0x4f, 0x50, 0x58,
+    0x53, 0x65, 0x70, 0x5a, 0x6b, 0x46, 0x35, 0x4b, 0x47, 0x51, 0x4d, 0x43, 0x50, 0x39, 0x36, 0x4b,
+    0x32, 0x32, 0x4f, 0x43, 0x69, 0x43, 0x4b, 0x78, 0x58, 0x59, 0x37, 0x4b, 0x57, 0x56, 0x75, 0x0a,
+    0x73, 0x6b, 0x47, 0x6a, 0x62, 0x70, 0x34, 0x65, 0x63, 0x58, 0x56, 0x57, 0x56, 0x47, 0x67, 0x4f,
+    0x48, 0x6a, 0x4e, 0x51, 0x67, 0x73, 0x47, 0x75, 0x64, 0x45, 0x66, 0x75, 0x50, 0x63, 0x30, 0x49,
+    0x71, 0x53, 0x42, 0x66, 0x6b, 0x46, 0x7a, 0x79, 0x71, 0x35, 0x63, 0x54, 0x36, 0x2b, 0x63, 0x6a,
+    0x36, 0x31, 0x78, 0x73, 0x49, 0x76, 0x58, 0x53, 0x61, 0x35, 0x36, 0x78, 0x69, 0x69, 0x59, 0x51,
+    0x0a, 0x39, 0x4b, 0x38, 0x2b, 0x61, 0x30, 0x75, 0x68, 0x58, 0x4d, 0x32, 0x66, 0x4f, 0x32, 0x49,
+    0x57, 0x55, 0x78, 0x74, 0x2b, 0x70, 0x33, 0x35, 0x42, 0x73, 0x5a, 0x4d, 0x56, 0x44, 0x31, 0x7a,
+    0x6f, 0x30, 0x67, 0x63, 0x6d, 0x31, 0x36, 0x6b, 0x73, 0x78, 0x77, 0x31, 0x36, 0x32, 0x73, 0x37,
+    0x75, 0x61, 0x55, 0x74, 0x6a, 0x53, 0x56, 0x39, 0x61, 0x2f, 0x30, 0x58, 0x6d, 0x62, 0x65, 0x7a,
+    0x45, 0x0a, 0x55, 0x53, 0x50, 0x36, 0x4c, 0x2f, 0x6a, 0x74, 0x57, 0x6a, 0x50, 0x50, 0x52, 0x52,
+    0x33, 0x56, 0x57, 0x42, 0x70, 0x44, 0x34, 0x4a, 0x4d, 0x53, 0x61, 0x79, 0x77, 0x58, 0x67, 0x47,
+    0x6b, 0x53, 0x34, 0x31, 0x69, 0x4e, 0x79, 0x68, 0x70, 0x50, 0x6f, 0x72, 0x35, 0x54, 0x6f, 0x69,
+    0x34, 0x66, 0x4d, 0x41, 0x43, 0x49, 0x7a, 0x75, 0x34, 0x59, 0x4a, 0x59, 0x4b, 0x70, 0x69, 0x72,
+    0x51, 0x52, 0x0a, 0x4f, 0x47, 0x71, 0x2b, 0x6e, 0x49, 0x54, 0x6e, 0x70, 0x6b, 0x75, 0x6a, 0x53,
+    0x4e, 0x78, 0x34, 0x51, 0x4b, 0x66, 0x39, 0x49, 0x49, 0x4d, 0x4f, 0x4e, 0x6c, 0x36, 0x57, 0x33,
+    0x52, 0x78, 0x31, 0x56, 0x4b, 0x6b, 0x2f, 0x76, 0x71, 0x50, 0x30, 0x59, 0x45, 0x4a, 0x64, 0x47,
+    0x4a, 0x58, 0x44, 0x75, 0x70, 0x50, 0x41, 0x43, 0x49, 0x42, 0x77, 0x4e, 0x58, 0x38, 0x2f, 0x54,
+    0x59, 0x78, 0x6b, 0x0a, 0x6c, 0x79, 0x34, 0x50, 0x71, 0x32, 0x43, 0x6e, 0x53, 0x31, 0x33, 0x39,
+    0x6e, 0x59, 0x44, 0x31, 0x32, 0x4f, 0x50, 0x71, 0x32, 0x56, 0x41, 0x77, 0x47, 0x55, 0x7a, 0x56,
+    0x6e, 0x72, 0x32, 0x32, 0x61, 0x74, 0x54, 0x73, 0x4e, 0x6a, 0x4d, 0x6a, 0x48, 0x4e, 0x79, 0x72,
+    0x2f, 0x6b, 0x63, 0x6d, 0x34, 0x32, 0x4c, 0x72, 0x58, 0x5a, 0x65, 0x33, 0x79, 0x6a, 0x4c, 0x31,
+    0x32, 0x58, 0x78, 0x2b, 0x0a, 0x5a, 0x46, 0x48, 0x74, 0x36, 0x77, 0x45, 0x71, 0x45, 0x33, 0x70,
+    0x77, 0x5a, 0x66, 0x77, 0x46, 0x72, 0x4c, 0x75, 0x43, 0x38, 0x36, 0x48, 0x52, 0x73, 0x51, 0x7a,
+    0x52, 0x4f, 0x4d, 0x46, 0x57, 0x34, 0x43, 0x32, 0x69, 0x4e, 0x76, 0x73, 0x56, 0x36, 0x48, 0x61,
+    0x6e, 0x63, 0x34, 0x73, 0x70, 0x74, 0x56, 0x55, 0x6f, 0x58, 0x4a, 0x4b, 0x38, 0x74, 0x52, 0x68,
+    0x39, 0x33, 0x70, 0x72, 0x67, 0x0a, 0x58, 0x47, 0x5a, 0x64, 0x64, 0x2f, 0x57, 0x58, 0x51, 0x70,
+    0x64, 0x32, 0x6e, 0x76, 0x6f, 0x75, 0x76, 0x4d, 0x42, 0x70, 0x56, 0x6c, 0x6a, 0x63, 0x6d, 0x6a,
+    0x4e, 0x47, 0x57, 0x56, 0x54, 0x72, 0x68, 0x54, 0x48, 0x75, 0x4a, 0x4d, 0x4f, 0x34, 0x6a, 0x56,
+    0x44, 0x31, 0x34, 0x74, 0x73, 0x30, 0x36, 0x72, 0x37, 0x48, 0x46, 0x6c, 0x6d, 0x56, 0x47, 0x31,
+    0x57, 0x50, 0x6c, 0x4c, 0x69, 0x44, 0x0a, 0x42, 0x6d, 0x41, 0x6d, 0x31, 0x68, 0x57, 0x64, 0x61,
+    0x75, 0x38, 0x59, 0x52, 0x59, 0x4b, 0x50, 0x34, 0x4a, 0x38, 0x47, 0x57, 0x57, 0x52, 0x45, 0x34,
+    0x35, 0x68, 0x64, 0x71, 0x52, 0x74, 0x7a, 0x43, 0x37, 0x51, 0x44, 0x65, 0x68, 0x65, 0x74, 0x78,
+    0x62, 0x54, 0x67, 0x6a, 0x46, 0x6a, 0x64, 0x48, 0x4b, 0x34, 0x38, 0x57, 0x46, 0x71, 0x53, 0x2b,
+    0x38, 0x6b, 0x5a, 0x53, 0x42, 0x63, 0x34, 0x0a, 0x2b, 0x4a, 0x6d, 0x4b, 0x56, 0x51, 0x46, 0x57,
+    0x39, 0x79, 0x6d, 0x35, 0x32, 0x54, 0x54, 0x70, 0x61, 0x43, 0x5a, 0x57, 0x6b, 0x47, 0x71, 0x5a,
+    0x6a, 0x30, 0x61, 0x47, 0x48, 0x54, 0x6e, 0x31, 0x63, 0x4f, 0x33, 0x6e, 0x4c, 0x65, 0x4f, 0x35,
+    0x34, 0x44, 0x6f, 0x47, 0x6f, 0x76, 0x66, 0x70, 0x57, 0x38, 0x47, 0x64, 0x4c, 0x4d, 0x47, 0x70,
+    0x5a, 0x59, 0x6b, 0x30, 0x48, 0x63, 0x76, 0x49, 0x0a, 0x78, 0x76, 0x4e, 0x70, 0x73, 0x2b, 0x58,
+    0x54, 0x46, 0x55, 0x30, 0x50, 0x7a, 0x46, 0x6f, 0x55, 0x4d, 0x33, 0x54, 0x63, 0x73, 0x2b, 0x4f,
+    0x66, 0x4b, 0x52, 0x6c, 0x61, 0x35, 0x62, 0x47, 0x4f, 0x31, 0x67, 0x48, 0x49, 0x2f, 0x5a, 0x79,
+    0x39, 0x54, 0x78, 0x5a, 0x68, 0x6a, 0x35, 0x5a, 0x33, 0x6c, 0x75, 0x46, 0x42, 0x44, 0x58, 0x45,
+    0x75, 0x34, 0x72, 0x56, 0x45, 0x6e, 0x4b, 0x34, 0x52, 0x0a, 0x41, 0x56, 0x35, 0x47, 0x4f, 0x45,
+    0x72, 0x51, 0x49, 0x41, 0x6c, 0x70, 0x77, 0x76, 0x61, 0x64, 0x70, 0x52, 0x34, 0x73, 0x57, 0x31,
+    0x30, 0x42, 0x72, 0x54, 0x2b, 0x50, 0x72, 0x4f, 0x44, 0x6c, 0x51, 0x36, 0x42, 0x6a, 0x4a, 0x71,
+    0x75, 0x46, 0x4e, 0x46, 0x61, 0x5a, 0x31, 0x56, 0x35, 0x39, 0x78, 0x4f, 0x53, 0x30, 0x35, 0x39,
+    0x6d, 0x6e, 0x35, 0x79, 0x79, 0x36, 0x31, 0x56, 0x71, 0x38, 0x0a, 0x39, 0x72, 0x54, 0x61, 0x33,
+    0x78, 0x69, 0x78, 0x6c, 0x52, 0x47, 0x59, 0x46, 0x78, 0x45, 0x70, 0x4c, 0x65, 0x73, 0x4d, 0x59,
+    0x66, 0x4a, 0x5a, 0x59, 0x41, 0x46, 0x39, 0x37, 0x35, 0x4e, 0x31, 0x68, 0x74, 0x71, 0x76, 0x53,
+    0x4c, 0x6e, 0x49, 0x73, 0x70, 0x38, 0x36, 0x70, 0x74, 0x48, 0x59, 0x59, 0x63, 0x50, 0x74, 0x42,
+    0x72, 0x4a, 0x4f, 0x34, 0x63, 0x53, 0x63, 0x4e, 0x79, 0x72, 0x6e, 0x0a, 0x49, 0x64, 0x53, 0x58,
+    0x54, 0x58, 0x6d, 0x79, 0x4c, 0x33, 0x55, 0x43, 0x78, 0x56, 0x4e, 0x4b, 0x4f, 0x2f, 0x68, 0x73,
+    0x6f, 0x65, 0x2f, 0x75, 0x4c, 0x32, 0x42, 0x61, 0x79, 0x68, 0x73, 0x45, 0x66, 0x4e, 0x7a, 0x63,
+    0x34, 0x69, 0x55, 0x6c, 0x6b, 0x6c, 0x67, 0x30, 0x39, 0x6b, 0x2b, 0x44, 0x58, 0x51, 0x4f, 0x4e,
+    0x50, 0x6b, 0x68, 0x61, 0x71, 0x52, 0x37, 0x34, 0x74, 0x75, 0x39, 0x47, 0x0a, 0x77, 0x55, 0x57,
+    0x4f, 0x4d, 0x48, 0x68, 0x77, 0x6c, 0x32, 0x6e, 0x62, 0x35, 0x47, 0x65, 0x52, 0x64, 0x73, 0x39,
+    0x76, 0x79, 0x39, 0x70, 0x63, 0x78, 0x63, 0x71, 0x38, 0x52, 0x6e, 0x67, 0x2b, 0x79, 0x46, 0x70,
+    0x54, 0x46, 0x75, 0x56, 0x53, 0x64, 0x41, 0x43, 0x6e, 0x35, 0x75, 0x39, 0x62, 0x4d, 0x5a, 0x46,
+    0x4f, 0x46, 0x6b, 0x64, 0x56, 0x75, 0x32, 0x6e, 0x36, 0x38, 0x42, 0x63, 0x65, 0x0a, 0x31, 0x4e,
+    0x68, 0x75, 0x49, 0x31, 0x53, 0x48, 0x79, 0x6c, 0x42, 0x7a, 0x35, 0x30, 0x79, 0x4e, 0x6b, 0x43,
+    0x4b, 0x4c, 0x33, 0x77, 0x51, 0x44, 0x47, 0x72, 0x38, 0x6b, 0x69, 0x2f, 0x54, 0x73, 0x75, 0x74,
+    0x59, 0x30, 0x31, 0x48, 0x46, 0x30, 0x30, 0x76, 0x41, 0x36, 0x73, 0x4e, 0x75, 0x66, 0x4d, 0x66,
+    0x6c, 0x6e, 0x61, 0x77, 0x79, 0x61, 0x67, 0x31, 0x4a, 0x69, 0x34, 0x46, 0x37, 0x6f, 0x0a, 0x41,
+    0x4c, 0x49, 0x55, 0x39, 0x4e, 0x69, 0x47, 0x67, 0x41, 0x66, 0x6f, 0x33, 0x4a, 0x79, 0x4b, 0x52,
+    0x6c, 0x56, 0x48, 0x6c, 0x71, 0x52, 0x2b, 0x63, 0x6b, 0x47, 0x74, 0x34, 0x6a, 0x66, 0x75, 0x51,
+    0x59, 0x52, 0x5a, 0x4b, 0x46, 0x31, 0x34, 0x43, 0x51, 0x38, 0x66, 0x78, 0x65, 0x64, 0x62, 0x53,
+    0x77, 0x44, 0x6d, 0x36, 0x33, 0x54, 0x77, 0x37, 0x58, 0x41, 0x49, 0x50, 0x43, 0x35, 0x39, 0x0a,
+    0x4c, 0x32, 0x56, 0x49, 0x54, 0x45, 0x77, 0x46, 0x59, 0x51, 0x70, 0x6f, 0x4f, 0x77, 0x30, 0x4c,
+    0x48, 0x45, 0x50, 0x78, 0x63, 0x53, 0x70, 0x36, 0x71, 0x4f, 0x53, 0x6a, 0x51, 0x76, 0x42, 0x4c,
+    0x47, 0x6c, 0x68, 0x71, 0x4c, 0x46, 0x77, 0x38, 0x73, 0x4a, 0x50, 0x38, 0x69, 0x68, 0x59, 0x36,
+    0x73, 0x6d, 0x41, 0x42, 0x53, 0x6d, 0x42, 0x76, 0x49, 0x45, 0x59, 0x4a, 0x5a, 0x79, 0x55, 0x35,
+    0x0a, 0x56, 0x36, 0x47, 0x61, 0x31, 0x76, 0x4e, 0x62, 0x51, 0x43, 0x57, 0x67, 0x65, 0x43, 0x6f,
+    0x71, 0x4b, 0x6f, 0x39, 0x5a, 0x5a, 0x51, 0x3d, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45,
+    0x4e, 0x44, 0x20, 0x45, 0x4e, 0x43, 0x52, 0x59, 0x50, 0x54, 0x45, 0x44, 0x20, 0x50, 0x52, 0x49,
+    0x56, 0x41, 0x54, 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+
+#define ROOT_CERT_DER_LENGTH 2000
+UA_Byte ROOT_CERT_DER_DATA[2000] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49,
+  0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x46,
+  0x6d, 0x54, 0x43, 0x43, 0x41, 0x34, 0x47, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x55,
+  0x44, 0x4f, 0x39, 0x78, 0x48, 0x76, 0x72, 0x67, 0x31, 0x4d, 0x48, 0x57, 0x74, 0x4e, 0x7a, 0x4c,
+  0x49, 0x73, 0x30, 0x39, 0x35, 0x67, 0x58, 0x6b, 0x6d, 0x69, 0x4d, 0x77, 0x44, 0x51, 0x59, 0x4a,
+  0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x4c, 0x0a, 0x42, 0x51, 0x41,
+  0x77, 0x5a, 0x6a, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x68, 0x4d,
+  0x43, 0x52, 0x45, 0x55, 0x78, 0x44, 0x6a, 0x41, 0x4d, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x67,
+  0x4d, 0x42, 0x56, 0x4e, 0x30, 0x59, 0x58, 0x52, 0x6c, 0x4d, 0x51, 0x30, 0x77, 0x43, 0x77, 0x59,
+  0x44, 0x56, 0x51, 0x51, 0x48, 0x44, 0x41, 0x52, 0x44, 0x61, 0x58, 0x52, 0x35, 0x0a, 0x4d, 0x52,
+  0x55, 0x77, 0x45, 0x77, 0x59, 0x44, 0x56, 0x51, 0x51, 0x4b, 0x44, 0x41, 0x78, 0x50, 0x63, 0x6d,
+  0x64, 0x68, 0x62, 0x6d, 0x6c, 0x36, 0x59, 0x58, 0x52, 0x70, 0x62, 0x32, 0x34, 0x78, 0x45, 0x44,
+  0x41, 0x4f, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x73, 0x4d, 0x42, 0x30, 0x39, 0x79, 0x5a, 0x31,
+  0x56, 0x75, 0x61, 0x58, 0x51, 0x78, 0x44, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x4e, 0x56, 0x0a, 0x42,
+  0x41, 0x4d, 0x4d, 0x42, 0x6c, 0x4a, 0x76, 0x62, 0x33, 0x52, 0x44, 0x51, 0x54, 0x41, 0x65, 0x46,
+  0x77, 0x30, 0x79, 0x4e, 0x44, 0x41, 0x35, 0x4d, 0x54, 0x45, 0x78, 0x4d, 0x54, 0x55, 0x31, 0x4e,
+  0x44, 0x64, 0x61, 0x46, 0x77, 0x30, 0x7a, 0x4e, 0x44, 0x41, 0x35, 0x4d, 0x44, 0x6b, 0x78, 0x4d,
+  0x54, 0x55, 0x31, 0x4e, 0x44, 0x64, 0x61, 0x4d, 0x47, 0x59, 0x78, 0x43, 0x7a, 0x41, 0x4a, 0x0a,
+  0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x59, 0x54, 0x41, 0x6b, 0x52, 0x46, 0x4d, 0x51, 0x34, 0x77,
+  0x44, 0x41, 0x59, 0x44, 0x56, 0x51, 0x51, 0x49, 0x44, 0x41, 0x56, 0x54, 0x64, 0x47, 0x46, 0x30,
+  0x5a, 0x54, 0x45, 0x4e, 0x4d, 0x41, 0x73, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x77, 0x77, 0x45,
+  0x51, 0x32, 0x6c, 0x30, 0x65, 0x54, 0x45, 0x56, 0x4d, 0x42, 0x4d, 0x47, 0x41, 0x31, 0x55, 0x45,
+  0x0a, 0x43, 0x67, 0x77, 0x4d, 0x54, 0x33, 0x4a, 0x6e, 0x59, 0x57, 0x35, 0x70, 0x65, 0x6d, 0x46,
+  0x30, 0x61, 0x57, 0x39, 0x75, 0x4d, 0x52, 0x41, 0x77, 0x44, 0x67, 0x59, 0x44, 0x56, 0x51, 0x51,
+  0x4c, 0x44, 0x41, 0x64, 0x50, 0x63, 0x6d, 0x64, 0x56, 0x62, 0x6d, 0x6c, 0x30, 0x4d, 0x51, 0x38,
+  0x77, 0x44, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, 0x5a, 0x53, 0x62, 0x32, 0x39,
+  0x30, 0x0a, 0x51, 0x30, 0x45, 0x77, 0x67, 0x67, 0x49, 0x69, 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53,
+  0x71, 0x47, 0x53, 0x49, 0x62, 0x33, 0x44, 0x51, 0x45, 0x42, 0x41, 0x51, 0x55, 0x41, 0x41, 0x34,
+  0x49, 0x43, 0x44, 0x77, 0x41, 0x77, 0x67, 0x67, 0x49, 0x4b, 0x41, 0x6f, 0x49, 0x43, 0x41, 0x51,
+  0x44, 0x4f, 0x78, 0x50, 0x54, 0x36, 0x4b, 0x6d, 0x52, 0x4e, 0x34, 0x51, 0x67, 0x4e, 0x55, 0x61,
+  0x37, 0x54, 0x0a, 0x59, 0x2f, 0x56, 0x5a, 0x76, 0x68, 0x58, 0x6e, 0x53, 0x35, 0x75, 0x2f, 0x5a,
+  0x47, 0x73, 0x37, 0x6d, 0x47, 0x37, 0x53, 0x4d, 0x6f, 0x50, 0x6f, 0x71, 0x49, 0x44, 0x44, 0x7a,
+  0x4d, 0x74, 0x44, 0x57, 0x32, 0x66, 0x51, 0x78, 0x62, 0x34, 0x36, 0x48, 0x43, 0x76, 0x63, 0x38,
+  0x55, 0x4f, 0x68, 0x38, 0x2f, 0x37, 0x34, 0x70, 0x50, 0x59, 0x48, 0x4c, 0x41, 0x34, 0x59, 0x58,
+  0x67, 0x58, 0x37, 0x0a, 0x36, 0x49, 0x6f, 0x34, 0x6a, 0x52, 0x6b, 0x79, 0x6e, 0x6d, 0x50, 0x7a,
+  0x44, 0x66, 0x43, 0x31, 0x37, 0x43, 0x56, 0x4c, 0x53, 0x63, 0x64, 0x42, 0x58, 0x35, 0x51, 0x48,
+  0x57, 0x43, 0x6c, 0x5a, 0x56, 0x48, 0x43, 0x58, 0x77, 0x4c, 0x75, 0x42, 0x45, 0x59, 0x49, 0x47,
+  0x6f, 0x30, 0x78, 0x33, 0x65, 0x66, 0x75, 0x39, 0x6c, 0x75, 0x69, 0x73, 0x70, 0x70, 0x73, 0x4c,
+  0x7a, 0x59, 0x54, 0x4d, 0x0a, 0x38, 0x31, 0x62, 0x79, 0x6a, 0x2b, 0x78, 0x74, 0x49, 0x64, 0x42,
+  0x72, 0x68, 0x4c, 0x68, 0x39, 0x48, 0x5a, 0x4f, 0x73, 0x57, 0x6b, 0x63, 0x70, 0x79, 0x68, 0x38,
+  0x75, 0x52, 0x55, 0x6d, 0x35, 0x43, 0x50, 0x76, 0x2f, 0x74, 0x78, 0x4f, 0x36, 0x4f, 0x6a, 0x6e,
+  0x41, 0x67, 0x4f, 0x2b, 0x47, 0x33, 0x38, 0x38, 0x56, 0x71, 0x55, 0x4b, 0x59, 0x38, 0x76, 0x54,
+  0x46, 0x54, 0x30, 0x49, 0x61, 0x0a, 0x76, 0x36, 0x4d, 0x36, 0x6b, 0x62, 0x57, 0x45, 0x78, 0x49,
+  0x50, 0x5a, 0x52, 0x62, 0x6d, 0x51, 0x52, 0x64, 0x74, 0x5a, 0x74, 0x59, 0x57, 0x72, 0x54, 0x43,
+  0x2f, 0x50, 0x54, 0x43, 0x45, 0x6b, 0x73, 0x34, 0x61, 0x76, 0x6e, 0x47, 0x38, 0x44, 0x61, 0x52,
+  0x4f, 0x39, 0x66, 0x42, 0x6c, 0x79, 0x65, 0x37, 0x61, 0x32, 0x45, 0x6f, 0x62, 0x35, 0x33, 0x34,
+  0x42, 0x76, 0x4d, 0x2f, 0x74, 0x76, 0x0a, 0x30, 0x74, 0x63, 0x6f, 0x38, 0x2b, 0x50, 0x69, 0x58,
+  0x52, 0x70, 0x61, 0x6a, 0x66, 0x71, 0x56, 0x68, 0x31, 0x43, 0x70, 0x61, 0x68, 0x7a, 0x7a, 0x78,
+  0x5a, 0x35, 0x65, 0x76, 0x4d, 0x7a, 0x77, 0x78, 0x4d, 0x43, 0x2f, 0x74, 0x75, 0x61, 0x69, 0x54,
+  0x76, 0x76, 0x4d, 0x56, 0x44, 0x62, 0x33, 0x63, 0x68, 0x53, 0x77, 0x41, 0x4a, 0x55, 0x6c, 0x75,
+  0x33, 0x48, 0x73, 0x59, 0x35, 0x5a, 0x4d, 0x0a, 0x72, 0x52, 0x59, 0x31, 0x6b, 0x56, 0x30, 0x4a,
+  0x74, 0x4f, 0x35, 0x68, 0x64, 0x58, 0x44, 0x57, 0x61, 0x79, 0x35, 0x59, 0x52, 0x78, 0x75, 0x42,
+  0x2f, 0x76, 0x45, 0x65, 0x2f, 0x36, 0x77, 0x2b, 0x4b, 0x4e, 0x42, 0x35, 0x75, 0x4e, 0x62, 0x73,
+  0x55, 0x78, 0x6f, 0x6a, 0x35, 0x79, 0x48, 0x44, 0x6b, 0x45, 0x67, 0x75, 0x42, 0x4b, 0x4a, 0x38,
+  0x59, 0x77, 0x42, 0x36, 0x44, 0x47, 0x4e, 0x31, 0x0a, 0x32, 0x53, 0x57, 0x57, 0x5a, 0x45, 0x47,
+  0x34, 0x38, 0x4b, 0x67, 0x30, 0x6e, 0x52, 0x68, 0x6b, 0x54, 0x35, 0x6d, 0x62, 0x45, 0x44, 0x45,
+  0x68, 0x49, 0x57, 0x43, 0x2f, 0x61, 0x30, 0x50, 0x6e, 0x73, 0x6a, 0x49, 0x71, 0x69, 0x49, 0x68,
+  0x6a, 0x5a, 0x6a, 0x61, 0x77, 0x35, 0x6f, 0x62, 0x74, 0x30, 0x38, 0x71, 0x58, 0x2b, 0x63, 0x79,
+  0x67, 0x32, 0x52, 0x31, 0x4e, 0x66, 0x51, 0x77, 0x7a, 0x0a, 0x74, 0x35, 0x33, 0x68, 0x79, 0x47,
+  0x6c, 0x48, 0x65, 0x35, 0x4e, 0x35, 0x61, 0x61, 0x7a, 0x77, 0x57, 0x4b, 0x4a, 0x42, 0x73, 0x72,
+  0x78, 0x48, 0x50, 0x74, 0x77, 0x38, 0x79, 0x48, 0x56, 0x64, 0x4a, 0x64, 0x73, 0x66, 0x59, 0x6c,
+  0x38, 0x70, 0x7a, 0x39, 0x63, 0x34, 0x76, 0x54, 0x50, 0x59, 0x6e, 0x5a, 0x33, 0x4d, 0x41, 0x41,
+  0x46, 0x59, 0x44, 0x76, 0x57, 0x70, 0x33, 0x45, 0x52, 0x44, 0x0a, 0x30, 0x70, 0x48, 0x48, 0x57,
+  0x6d, 0x67, 0x30, 0x73, 0x6c, 0x76, 0x41, 0x66, 0x4f, 0x6e, 0x6f, 0x35, 0x31, 0x55, 0x41, 0x32,
+  0x53, 0x65, 0x77, 0x2b, 0x51, 0x52, 0x37, 0x53, 0x53, 0x30, 0x33, 0x70, 0x49, 0x55, 0x69, 0x58,
+  0x53, 0x68, 0x75, 0x2b, 0x38, 0x51, 0x56, 0x66, 0x6b, 0x6f, 0x6b, 0x66, 0x4a, 0x66, 0x67, 0x71,
+  0x30, 0x4f, 0x45, 0x30, 0x33, 0x31, 0x78, 0x46, 0x77, 0x66, 0x41, 0x0a, 0x5a, 0x46, 0x68, 0x39,
+  0x53, 0x49, 0x4b, 0x48, 0x38, 0x51, 0x31, 0x32, 0x47, 0x55, 0x61, 0x6c, 0x34, 0x53, 0x55, 0x73,
+  0x65, 0x4d, 0x4d, 0x43, 0x34, 0x73, 0x76, 0x55, 0x4f, 0x48, 0x4d, 0x36, 0x6d, 0x58, 0x2b, 0x32,
+  0x4f, 0x64, 0x5a, 0x33, 0x64, 0x32, 0x77, 0x79, 0x4c, 0x77, 0x55, 0x34, 0x43, 0x37, 0x6a, 0x2b,
+  0x32, 0x6e, 0x71, 0x51, 0x66, 0x53, 0x39, 0x45, 0x4f, 0x63, 0x65, 0x66, 0x0a, 0x42, 0x58, 0x76,
+  0x53, 0x4e, 0x59, 0x33, 0x71, 0x2f, 0x36, 0x61, 0x34, 0x37, 0x48, 0x49, 0x47, 0x5a, 0x4d, 0x62,
+  0x6b, 0x4a, 0x75, 0x35, 0x7a, 0x65, 0x51, 0x49, 0x44, 0x41, 0x51, 0x41, 0x42, 0x6f, 0x7a, 0x38,
+  0x77, 0x50, 0x54, 0x41, 0x50, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x52, 0x4d, 0x42, 0x41, 0x66, 0x38,
+  0x45, 0x42, 0x54, 0x41, 0x44, 0x41, 0x51, 0x48, 0x2f, 0x4d, 0x41, 0x73, 0x47, 0x0a, 0x41, 0x31,
+  0x55, 0x64, 0x44, 0x77, 0x51, 0x45, 0x41, 0x77, 0x49, 0x42, 0x42, 0x6a, 0x41, 0x64, 0x42, 0x67,
+  0x4e, 0x56, 0x48, 0x51, 0x34, 0x45, 0x46, 0x67, 0x51, 0x55, 0x30, 0x6c, 0x76, 0x57, 0x4b, 0x57,
+  0x53, 0x77, 0x72, 0x4c, 0x51, 0x74, 0x44, 0x30, 0x2f, 0x64, 0x76, 0x57, 0x56, 0x5a, 0x67, 0x73,
+  0x64, 0x42, 0x39, 0x43, 0x59, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x0a, 0x68,
+  0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x4c, 0x42, 0x51, 0x41, 0x44, 0x67, 0x67, 0x49, 0x42, 0x41,
+  0x42, 0x44, 0x44, 0x68, 0x4b, 0x76, 0x57, 0x30, 0x73, 0x55, 0x70, 0x64, 0x75, 0x49, 0x47, 0x74,
+  0x68, 0x4e, 0x34, 0x6f, 0x38, 0x62, 0x37, 0x61, 0x45, 0x41, 0x6e, 0x4e, 0x77, 0x2f, 0x2b, 0x62,
+  0x61, 0x5a, 0x30, 0x54, 0x38, 0x32, 0x6e, 0x59, 0x72, 0x69, 0x73, 0x74, 0x6d, 0x50, 0x76, 0x0a,
+  0x42, 0x76, 0x30, 0x4e, 0x48, 0x50, 0x6a, 0x53, 0x5a, 0x37, 0x33, 0x4d, 0x43, 0x56, 0x6c, 0x4d,
+  0x61, 0x2b, 0x66, 0x39, 0x65, 0x62, 0x71, 0x65, 0x73, 0x54, 0x49, 0x45, 0x77, 0x47, 0x41, 0x65,
+  0x78, 0x4a, 0x45, 0x39, 0x76, 0x4b, 0x49, 0x5a, 0x68, 0x31, 0x30, 0x53, 0x70, 0x79, 0x78, 0x61,
+  0x62, 0x77, 0x68, 0x56, 0x6f, 0x47, 0x41, 0x71, 0x30, 0x74, 0x44, 0x51, 0x68, 0x7a, 0x47, 0x77,
+  0x0a, 0x71, 0x6d, 0x34, 0x4d, 0x30, 0x34, 0x4c, 0x62, 0x33, 0x53, 0x46, 0x42, 0x75, 0x76, 0x52,
+  0x70, 0x46, 0x34, 0x6f, 0x68, 0x62, 0x4d, 0x51, 0x64, 0x47, 0x49, 0x76, 0x71, 0x2b, 0x75, 0x34,
+  0x72, 0x6d, 0x6d, 0x39, 0x54, 0x62, 0x69, 0x70, 0x41, 0x63, 0x43, 0x33, 0x47, 0x37, 0x50, 0x32,
+  0x6a, 0x4c, 0x42, 0x53, 0x38, 0x37, 0x55, 0x48, 0x7a, 0x32, 0x74, 0x71, 0x42, 0x74, 0x4b, 0x64,
+  0x4d, 0x0a, 0x64, 0x39, 0x44, 0x47, 0x73, 0x78, 0x78, 0x7a, 0x6b, 0x50, 0x75, 0x4c, 0x77, 0x48,
+  0x50, 0x52, 0x36, 0x58, 0x75, 0x77, 0x75, 0x30, 0x78, 0x35, 0x5a, 0x38, 0x37, 0x4f, 0x58, 0x6e,
+  0x6e, 0x6e, 0x6a, 0x38, 0x75, 0x59, 0x77, 0x61, 0x31, 0x2b, 0x55, 0x56, 0x6f, 0x65, 0x59, 0x7a,
+  0x4a, 0x4c, 0x30, 0x75, 0x31, 0x51, 0x38, 0x46, 0x2f, 0x6c, 0x47, 0x63, 0x7a, 0x39, 0x65, 0x57,
+  0x44, 0x6d, 0x0a, 0x6e, 0x58, 0x78, 0x75, 0x36, 0x64, 0x35, 0x79, 0x68, 0x70, 0x6c, 0x64, 0x4a,
+  0x6f, 0x2b, 0x67, 0x42, 0x71, 0x72, 0x4d, 0x58, 0x6c, 0x32, 0x58, 0x4e, 0x4e, 0x5a, 0x61, 0x39,
+  0x6e, 0x4d, 0x4a, 0x52, 0x54, 0x64, 0x2b, 0x6f, 0x57, 0x69, 0x54, 0x47, 0x65, 0x4e, 0x74, 0x4e,
+  0x48, 0x6f, 0x41, 0x44, 0x7a, 0x34, 0x30, 0x2b, 0x41, 0x64, 0x62, 0x69, 0x47, 0x35, 0x48, 0x35,
+  0x35, 0x30, 0x77, 0x0a, 0x4d, 0x45, 0x54, 0x57, 0x64, 0x54, 0x4e, 0x63, 0x4d, 0x6d, 0x4c, 0x31,
+  0x77, 0x57, 0x6a, 0x30, 0x67, 0x35, 0x35, 0x49, 0x57, 0x7a, 0x65, 0x65, 0x48, 0x68, 0x73, 0x4e,
+  0x54, 0x75, 0x66, 0x46, 0x55, 0x70, 0x48, 0x44, 0x4d, 0x34, 0x33, 0x61, 0x2f, 0x33, 0x7a, 0x53,
+  0x48, 0x6e, 0x41, 0x44, 0x6f, 0x75, 0x5a, 0x78, 0x6e, 0x53, 0x67, 0x72, 0x71, 0x30, 0x31, 0x76,
+  0x55, 0x75, 0x69, 0x70, 0x0a, 0x31, 0x6b, 0x45, 0x72, 0x35, 0x65, 0x53, 0x59, 0x64, 0x47, 0x6f,
+  0x64, 0x34, 0x36, 0x78, 0x58, 0x35, 0x30, 0x56, 0x56, 0x4c, 0x79, 0x61, 0x53, 0x72, 0x39, 0x2b,
+  0x37, 0x71, 0x4a, 0x64, 0x75, 0x77, 0x2b, 0x7a, 0x73, 0x41, 0x6d, 0x67, 0x50, 0x55, 0x58, 0x65,
+  0x58, 0x7a, 0x79, 0x31, 0x7a, 0x44, 0x34, 0x46, 0x47, 0x61, 0x54, 0x2f, 0x56, 0x62, 0x57, 0x63,
+  0x70, 0x37, 0x76, 0x65, 0x4c, 0x0a, 0x56, 0x48, 0x58, 0x53, 0x38, 0x35, 0x6b, 0x72, 0x72, 0x5a,
+  0x6c, 0x4f, 0x64, 0x6c, 0x4b, 0x56, 0x4a, 0x6d, 0x45, 0x78, 0x4a, 0x45, 0x30, 0x6e, 0x4c, 0x4d,
+  0x6b, 0x38, 0x55, 0x50, 0x53, 0x63, 0x75, 0x46, 0x35, 0x4c, 0x48, 0x36, 0x69, 0x61, 0x39, 0x51,
+  0x67, 0x41, 0x53, 0x34, 0x6d, 0x35, 0x43, 0x66, 0x55, 0x33, 0x76, 0x69, 0x35, 0x77, 0x6d, 0x37,
+  0x71, 0x6e, 0x59, 0x56, 0x77, 0x37, 0x0a, 0x45, 0x55, 0x4e, 0x50, 0x39, 0x36, 0x72, 0x78, 0x31,
+  0x44, 0x66, 0x64, 0x2f, 0x41, 0x58, 0x73, 0x6a, 0x4a, 0x44, 0x62, 0x50, 0x6e, 0x4a, 0x57, 0x53,
+  0x45, 0x69, 0x73, 0x4e, 0x35, 0x63, 0x31, 0x64, 0x67, 0x30, 0x56, 0x74, 0x48, 0x51, 0x56, 0x70,
+  0x33, 0x67, 0x77, 0x39, 0x52, 0x56, 0x4e, 0x74, 0x66, 0x6d, 0x2b, 0x59, 0x2b, 0x31, 0x72, 0x33,
+  0x2f, 0x44, 0x61, 0x44, 0x42, 0x48, 0x54, 0x0a, 0x49, 0x65, 0x33, 0x30, 0x79, 0x51, 0x50, 0x6c,
+  0x41, 0x56, 0x72, 0x56, 0x6a, 0x57, 0x44, 0x77, 0x6e, 0x48, 0x73, 0x35, 0x31, 0x34, 0x50, 0x47,
+  0x75, 0x69, 0x4d, 0x42, 0x51, 0x42, 0x67, 0x61, 0x6a, 0x67, 0x6e, 0x64, 0x4f, 0x45, 0x70, 0x54,
+  0x67, 0x5a, 0x56, 0x48, 0x2f, 0x46, 0x33, 0x6a, 0x34, 0x59, 0x39, 0x6b, 0x37, 0x36, 0x4c, 0x44,
+  0x62, 0x35, 0x45, 0x49, 0x54, 0x68, 0x51, 0x59, 0x0a, 0x59, 0x53, 0x63, 0x33, 0x31, 0x5a, 0x41,
+  0x6b, 0x63, 0x49, 0x65, 0x79, 0x53, 0x66, 0x6f, 0x33, 0x2b, 0x51, 0x39, 0x4a, 0x69, 0x78, 0x59,
+  0x51, 0x42, 0x78, 0x2f, 0x78, 0x4a, 0x57, 0x34, 0x4d, 0x37, 0x6a, 0x51, 0x33, 0x79, 0x6d, 0x42,
+  0x65, 0x58, 0x59, 0x6d, 0x67, 0x66, 0x49, 0x76, 0x2b, 0x2f, 0x51, 0x53, 0x32, 0x59, 0x34, 0x4d,
+  0x6d, 0x53, 0x63, 0x6b, 0x50, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43,
+  0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+
+/* Contains the intermediateCA certificate */
+#define ROOT_CRL_PEM_LENGTH 1109
+UA_Byte ROOT_CRL_PEM_DATA[1109] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x58, 0x35, 0x30, 0x39, 0x20,
+  0x43, 0x52, 0x4c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x44, 0x43, 0x6a, 0x43,
+  0x42, 0x38, 0x77, 0x49, 0x42, 0x41, 0x54, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69,
+  0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x73, 0x46, 0x41, 0x44, 0x42, 0x6d, 0x4d, 0x51, 0x73,
+  0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x45, 0x52, 0x54, 0x45,
+  0x4f, 0x4d, 0x41, 0x77, 0x47, 0x41, 0x31, 0x55, 0x45, 0x0a, 0x43, 0x41, 0x77, 0x46, 0x55, 0x33,
+  0x52, 0x68, 0x64, 0x47, 0x55, 0x78, 0x44, 0x54, 0x41, 0x4c, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41,
+  0x63, 0x4d, 0x42, 0x45, 0x4e, 0x70, 0x64, 0x48, 0x6b, 0x78, 0x46, 0x54, 0x41, 0x54, 0x42, 0x67,
+  0x4e, 0x56, 0x42, 0x41, 0x6f, 0x4d, 0x44, 0x45, 0x39, 0x79, 0x5a, 0x32, 0x46, 0x75, 0x61, 0x58,
+  0x70, 0x68, 0x64, 0x47, 0x6c, 0x76, 0x62, 0x6a, 0x45, 0x51, 0x0a, 0x4d, 0x41, 0x34, 0x47, 0x41,
+  0x31, 0x55, 0x45, 0x43, 0x77, 0x77, 0x48, 0x54, 0x33, 0x4a, 0x6e, 0x56, 0x57, 0x35, 0x70, 0x64,
+  0x44, 0x45, 0x50, 0x4d, 0x41, 0x30, 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x77, 0x77, 0x47, 0x55,
+  0x6d, 0x39, 0x76, 0x64, 0x45, 0x4e, 0x42, 0x46, 0x77, 0x30, 0x79, 0x4e, 0x44, 0x41, 0x35, 0x4d,
+  0x54, 0x45, 0x78, 0x4d, 0x6a, 0x41, 0x77, 0x4d, 0x6a, 0x42, 0x61, 0x0a, 0x46, 0x77, 0x30, 0x79,
+  0x4e, 0x44, 0x45, 0x77, 0x4d, 0x54, 0x45, 0x78, 0x4d, 0x6a, 0x41, 0x77, 0x4d, 0x6a, 0x42, 0x61,
+  0x4d, 0x43, 0x63, 0x77, 0x4a, 0x51, 0x49, 0x55, 0x54, 0x32, 0x55, 0x75, 0x68, 0x65, 0x71, 0x72,
+  0x77, 0x30, 0x34, 0x50, 0x76, 0x54, 0x56, 0x79, 0x32, 0x73, 0x46, 0x44, 0x4e, 0x56, 0x4e, 0x38,
+  0x5a, 0x30, 0x63, 0x58, 0x44, 0x54, 0x49, 0x30, 0x4d, 0x44, 0x6b, 0x78, 0x0a, 0x4d, 0x54, 0x45,
+  0x79, 0x4d, 0x44, 0x41, 0x77, 0x4f, 0x56, 0x71, 0x67, 0x4d, 0x44, 0x41, 0x75, 0x4d, 0x42, 0x38,
+  0x47, 0x41, 0x31, 0x55, 0x64, 0x49, 0x77, 0x51, 0x59, 0x4d, 0x42, 0x61, 0x41, 0x46, 0x4e, 0x4a,
+  0x62, 0x31, 0x69, 0x6c, 0x6b, 0x73, 0x4b, 0x79, 0x30, 0x4c, 0x51, 0x39, 0x50, 0x33, 0x62, 0x31,
+  0x6c, 0x57, 0x59, 0x4c, 0x48, 0x51, 0x66, 0x51, 0x6d, 0x4d, 0x41, 0x73, 0x47, 0x0a, 0x41, 0x31,
+  0x55, 0x64, 0x46, 0x41, 0x51, 0x45, 0x41, 0x67, 0x49, 0x51, 0x41, 0x44, 0x41, 0x4e, 0x42, 0x67,
+  0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x73, 0x46, 0x41, 0x41,
+  0x4f, 0x43, 0x41, 0x67, 0x45, 0x41, 0x59, 0x30, 0x58, 0x6c, 0x44, 0x31, 0x34, 0x4b, 0x71, 0x32,
+  0x51, 0x41, 0x70, 0x77, 0x61, 0x70, 0x68, 0x56, 0x53, 0x58, 0x4b, 0x33, 0x53, 0x39, 0x0a, 0x55,
+  0x58, 0x7a, 0x57, 0x41, 0x48, 0x2b, 0x2f, 0x68, 0x39, 0x61, 0x38, 0x46, 0x58, 0x2b, 0x65, 0x45,
+  0x61, 0x6f, 0x68, 0x6f, 0x6a, 0x47, 0x51, 0x36, 0x62, 0x57, 0x34, 0x72, 0x68, 0x42, 0x4e, 0x5a,
+  0x75, 0x4f, 0x2b, 0x57, 0x31, 0x38, 0x79, 0x78, 0x6b, 0x47, 0x33, 0x2f, 0x61, 0x55, 0x75, 0x68,
+  0x30, 0x58, 0x65, 0x77, 0x58, 0x4a, 0x6f, 0x46, 0x67, 0x39, 0x4a, 0x2f, 0x6e, 0x51, 0x6c, 0x0a,
+  0x6a, 0x67, 0x5a, 0x70, 0x70, 0x46, 0x6f, 0x54, 0x6b, 0x4a, 0x6d, 0x49, 0x53, 0x64, 0x2f, 0x75,
+  0x34, 0x65, 0x70, 0x4b, 0x6b, 0x31, 0x63, 0x4d, 0x2f, 0x71, 0x33, 0x32, 0x6e, 0x42, 0x63, 0x70,
+  0x58, 0x7a, 0x6a, 0x6f, 0x5a, 0x33, 0x66, 0x57, 0x6a, 0x43, 0x37, 0x55, 0x5a, 0x4b, 0x62, 0x46,
+  0x32, 0x63, 0x31, 0x43, 0x4e, 0x53, 0x61, 0x44, 0x6a, 0x64, 0x35, 0x65, 0x59, 0x2b, 0x36, 0x53,
+  0x0a, 0x59, 0x6c, 0x4b, 0x36, 0x45, 0x47, 0x66, 0x6b, 0x57, 0x58, 0x74, 0x66, 0x30, 0x68, 0x50,
+  0x46, 0x42, 0x4f, 0x39, 0x69, 0x69, 0x65, 0x32, 0x33, 0x68, 0x41, 0x71, 0x58, 0x4a, 0x6e, 0x67,
+  0x46, 0x56, 0x75, 0x67, 0x50, 0x53, 0x39, 0x78, 0x68, 0x38, 0x6d, 0x47, 0x53, 0x64, 0x39, 0x6e,
+  0x4d, 0x32, 0x6e, 0x50, 0x68, 0x46, 0x43, 0x49, 0x67, 0x50, 0x6a, 0x37, 0x41, 0x32, 0x73, 0x58,
+  0x76, 0x0a, 0x78, 0x79, 0x33, 0x37, 0x36, 0x48, 0x67, 0x6b, 0x2b, 0x66, 0x73, 0x55, 0x59, 0x39,
+  0x51, 0x6d, 0x66, 0x42, 0x41, 0x55, 0x46, 0x6e, 0x6c, 0x2b, 0x2b, 0x36, 0x79, 0x6c, 0x54, 0x39,
+  0x6c, 0x4d, 0x4e, 0x62, 0x78, 0x2b, 0x50, 0x5a, 0x73, 0x33, 0x30, 0x78, 0x78, 0x64, 0x48, 0x6d,
+  0x4f, 0x6f, 0x61, 0x38, 0x69, 0x4a, 0x73, 0x46, 0x56, 0x4a, 0x67, 0x34, 0x71, 0x4c, 0x33, 0x31,
+  0x39, 0x6a, 0x0a, 0x55, 0x63, 0x4b, 0x49, 0x67, 0x41, 0x6e, 0x56, 0x48, 0x6e, 0x41, 0x4a, 0x32,
+  0x59, 0x42, 0x61, 0x30, 0x4a, 0x30, 0x56, 0x79, 0x38, 0x33, 0x38, 0x30, 0x77, 0x48, 0x64, 0x43,
+  0x54, 0x50, 0x5a, 0x32, 0x43, 0x74, 0x77, 0x2f, 0x76, 0x62, 0x74, 0x75, 0x54, 0x56, 0x54, 0x4b,
+  0x36, 0x62, 0x44, 0x4b, 0x37, 0x72, 0x76, 0x6a, 0x58, 0x58, 0x4c, 0x34, 0x7a, 0x56, 0x66, 0x71,
+  0x7a, 0x32, 0x78, 0x0a, 0x30, 0x63, 0x6e, 0x66, 0x70, 0x64, 0x55, 0x49, 0x57, 0x37, 0x4a, 0x36,
+  0x68, 0x64, 0x4e, 0x70, 0x58, 0x77, 0x33, 0x76, 0x4c, 0x67, 0x4c, 0x66, 0x76, 0x57, 0x6b, 0x59,
+  0x4b, 0x65, 0x79, 0x35, 0x61, 0x79, 0x72, 0x7a, 0x36, 0x32, 0x37, 0x45, 0x4c, 0x32, 0x47, 0x36,
+  0x65, 0x77, 0x51, 0x53, 0x78, 0x71, 0x71, 0x53, 0x4c, 0x73, 0x6b, 0x67, 0x52, 0x52, 0x55, 0x74,
+  0x6a, 0x4e, 0x66, 0x79, 0x0a, 0x38, 0x2b, 0x71, 0x34, 0x47, 0x49, 0x32, 0x71, 0x47, 0x4e, 0x71,
+  0x4d, 0x48, 0x75, 0x79, 0x32, 0x39, 0x53, 0x70, 0x31, 0x74, 0x4c, 0x78, 0x76, 0x73, 0x71, 0x56,
+  0x6e, 0x30, 0x52, 0x55, 0x58, 0x46, 0x42, 0x44, 0x69, 0x62, 0x6c, 0x31, 0x5a, 0x74, 0x67, 0x4f,
+  0x65, 0x2b, 0x33, 0x2f, 0x4c, 0x2f, 0x58, 0x7a, 0x6a, 0x76, 0x73, 0x45, 0x78, 0x66, 0x73, 0x77,
+  0x4e, 0x54, 0x73, 0x50, 0x4f, 0x0a, 0x2b, 0x54, 0x49, 0x69, 0x42, 0x55, 0x71, 0x5a, 0x4a, 0x4a,
+  0x4c, 0x78, 0x61, 0x6d, 0x65, 0x6c, 0x61, 0x69, 0x64, 0x53, 0x45, 0x4d, 0x4e, 0x67, 0x6a, 0x69,
+  0x77, 0x75, 0x33, 0x62, 0x45, 0x79, 0x4e, 0x65, 0x6d, 0x63, 0x6b, 0x6c, 0x31, 0x74, 0x70, 0x64,
+  0x6a, 0x67, 0x36, 0x2b, 0x79, 0x36, 0x68, 0x56, 0x71, 0x6b, 0x74, 0x76, 0x65, 0x37, 0x4a, 0x42,
+  0x33, 0x45, 0x64, 0x67, 0x4f, 0x4c, 0x0a, 0x45, 0x4c, 0x68, 0x7a, 0x50, 0x41, 0x54, 0x38, 0x48,
+  0x52, 0x61, 0x75, 0x43, 0x6b, 0x71, 0x47, 0x41, 0x67, 0x61, 0x57, 0x62, 0x58, 0x43, 0x38, 0x31,
+  0x65, 0x6d, 0x56, 0x55, 0x52, 0x51, 0x4e, 0x42, 0x71, 0x74, 0x55, 0x30, 0x30, 0x75, 0x77, 0x4a,
+  0x45, 0x75, 0x4c, 0x35, 0x73, 0x47, 0x32, 0x4c, 0x4c, 0x53, 0x43, 0x50, 0x2f, 0x78, 0x30, 0x52,
+  0x76, 0x46, 0x63, 0x73, 0x32, 0x79, 0x68, 0x0a, 0x73, 0x4a, 0x6f, 0x59, 0x4d, 0x31, 0x61, 0x6f,
+  0x6c, 0x43, 0x52, 0x2f, 0x32, 0x52, 0x33, 0x2f, 0x72, 0x2b, 0x57, 0x39, 0x55, 0x52, 0x39, 0x37,
+  0x59, 0x72, 0x59, 0x74, 0x75, 0x4a, 0x62, 0x6a, 0x52, 0x42, 0x71, 0x69, 0x56, 0x4d, 0x49, 0x52,
+  0x70, 0x53, 0x2f, 0x49, 0x62, 0x49, 0x77, 0x72, 0x50, 0x72, 0x5a, 0x45, 0x47, 0x75, 0x58, 0x67,
+  0x35, 0x44, 0x48, 0x56, 0x33, 0x6e, 0x36, 0x63, 0x0a, 0x66, 0x6d, 0x58, 0x2f, 0x76, 0x4b, 0x45,
+  0x62, 0x6d, 0x72, 0x74, 0x49, 0x6c, 0x57, 0x6a, 0x45, 0x36, 0x67, 0x49, 0x3d, 0x0a, 0x2d, 0x2d,
+  0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x58, 0x35, 0x30, 0x39, 0x20, 0x43, 0x52, 0x4c, 0x2d,
+  0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+
+#define ROOT_EMPTY_CRL_PEM_LENGTH 1052
+UA_Byte ROOT_EMPTY_CRL_PEM_DATA[1052] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x58, 0x35, 0x30, 0x39, 0x20,
+  0x43, 0x52, 0x4c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x34, 0x54, 0x43,
+  0x42, 0x79, 0x67, 0x49, 0x42, 0x41, 0x54, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69,
+  0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x73, 0x46, 0x41, 0x44, 0x42, 0x6d, 0x4d, 0x51, 0x73,
+  0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x45, 0x52, 0x54, 0x45,
+  0x4f, 0x4d, 0x41, 0x77, 0x47, 0x41, 0x31, 0x55, 0x45, 0x0a, 0x43, 0x41, 0x77, 0x46, 0x55, 0x33,
+  0x52, 0x68, 0x64, 0x47, 0x55, 0x78, 0x44, 0x54, 0x41, 0x4c, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41,
+  0x63, 0x4d, 0x42, 0x45, 0x4e, 0x70, 0x64, 0x48, 0x6b, 0x78, 0x46, 0x54, 0x41, 0x54, 0x42, 0x67,
+  0x4e, 0x56, 0x42, 0x41, 0x6f, 0x4d, 0x44, 0x45, 0x39, 0x79, 0x5a, 0x32, 0x46, 0x75, 0x61, 0x58,
+  0x70, 0x68, 0x64, 0x47, 0x6c, 0x76, 0x62, 0x6a, 0x45, 0x51, 0x0a, 0x4d, 0x41, 0x34, 0x47, 0x41,
+  0x31, 0x55, 0x45, 0x43, 0x77, 0x77, 0x48, 0x54, 0x33, 0x4a, 0x6e, 0x56, 0x57, 0x35, 0x70, 0x64,
+  0x44, 0x45, 0x50, 0x4d, 0x41, 0x30, 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x77, 0x77, 0x47, 0x55,
+  0x6d, 0x39, 0x76, 0x64, 0x45, 0x4e, 0x42, 0x46, 0x77, 0x30, 0x79, 0x4e, 0x44, 0x41, 0x35, 0x4d,
+  0x54, 0x45, 0x78, 0x4d, 0x6a, 0x41, 0x30, 0x4e, 0x44, 0x56, 0x61, 0x0a, 0x46, 0x77, 0x30, 0x79,
+  0x4e, 0x44, 0x45, 0x77, 0x4d, 0x54, 0x45, 0x78, 0x4d, 0x6a, 0x41, 0x30, 0x4e, 0x44, 0x56, 0x61,
+  0x6f, 0x44, 0x41, 0x77, 0x4c, 0x6a, 0x41, 0x66, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x53, 0x4d, 0x45,
+  0x47, 0x44, 0x41, 0x57, 0x67, 0x42, 0x54, 0x53, 0x57, 0x39, 0x59, 0x70, 0x5a, 0x4c, 0x43, 0x73,
+  0x74, 0x43, 0x30, 0x50, 0x54, 0x39, 0x32, 0x39, 0x5a, 0x56, 0x6d, 0x43, 0x0a, 0x78, 0x30, 0x48,
+  0x30, 0x4a, 0x6a, 0x41, 0x4c, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x52, 0x51, 0x45, 0x42, 0x41, 0x49,
+  0x43, 0x45, 0x41, 0x4d, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63,
+  0x4e, 0x41, 0x51, 0x45, 0x4c, 0x42, 0x51, 0x41, 0x44, 0x67, 0x67, 0x49, 0x42, 0x41, 0x42, 0x59,
+  0x65, 0x48, 0x74, 0x57, 0x61, 0x5a, 0x33, 0x6b, 0x4c, 0x46, 0x45, 0x30, 0x63, 0x0a, 0x77, 0x66,
+  0x66, 0x42, 0x4b, 0x37, 0x32, 0x62, 0x50, 0x48, 0x6c, 0x6f, 0x34, 0x31, 0x79, 0x2f, 0x6d, 0x48,
+  0x38, 0x65, 0x52, 0x63, 0x47, 0x66, 0x57, 0x46, 0x6a, 0x45, 0x6d, 0x50, 0x58, 0x49, 0x67, 0x36,
+  0x71, 0x31, 0x44, 0x79, 0x37, 0x66, 0x54, 0x6f, 0x54, 0x69, 0x44, 0x71, 0x72, 0x52, 0x6e, 0x49,
+  0x41, 0x68, 0x53, 0x44, 0x6e, 0x4c, 0x6a, 0x56, 0x64, 0x4f, 0x34, 0x74, 0x52, 0x66, 0x0a, 0x73,
+  0x6a, 0x64, 0x72, 0x58, 0x2f, 0x32, 0x67, 0x52, 0x30, 0x4e, 0x6f, 0x57, 0x66, 0x48, 0x63, 0x78,
+  0x58, 0x61, 0x6b, 0x41, 0x42, 0x4e, 0x31, 0x51, 0x35, 0x45, 0x4e, 0x39, 0x61, 0x4f, 0x74, 0x35,
+  0x45, 0x2b, 0x6d, 0x4d, 0x4b, 0x46, 0x59, 0x46, 0x74, 0x4a, 0x55, 0x50, 0x79, 0x76, 0x67, 0x36,
+  0x57, 0x63, 0x7a, 0x44, 0x57, 0x52, 0x50, 0x6d, 0x75, 0x32, 0x67, 0x69, 0x44, 0x6c, 0x6d, 0x0a,
+  0x31, 0x4c, 0x5a, 0x31, 0x35, 0x56, 0x67, 0x49, 0x77, 0x78, 0x64, 0x55, 0x6d, 0x39, 0x48, 0x35,
+  0x32, 0x6e, 0x44, 0x4a, 0x35, 0x54, 0x64, 0x38, 0x4e, 0x4b, 0x6e, 0x53, 0x43, 0x67, 0x58, 0x4b,
+  0x62, 0x52, 0x33, 0x47, 0x61, 0x4e, 0x79, 0x66, 0x75, 0x74, 0x73, 0x73, 0x58, 0x72, 0x74, 0x6d,
+  0x58, 0x33, 0x42, 0x53, 0x55, 0x78, 0x54, 0x62, 0x6c, 0x5a, 0x48, 0x4e, 0x31, 0x6b, 0x4b, 0x33,
+  0x0a, 0x44, 0x52, 0x71, 0x79, 0x74, 0x79, 0x44, 0x52, 0x61, 0x72, 0x4b, 0x49, 0x37, 0x52, 0x58,
+  0x52, 0x48, 0x35, 0x46, 0x79, 0x55, 0x32, 0x76, 0x4d, 0x79, 0x49, 0x4c, 0x5a, 0x2b, 0x7a, 0x6b,
+  0x45, 0x51, 0x69, 0x75, 0x68, 0x36, 0x62, 0x54, 0x79, 0x43, 0x2b, 0x57, 0x52, 0x37, 0x42, 0x30,
+  0x72, 0x44, 0x6a, 0x6f, 0x38, 0x4c, 0x78, 0x72, 0x30, 0x72, 0x72, 0x31, 0x2b, 0x78, 0x59, 0x67,
+  0x43, 0x0a, 0x32, 0x4c, 0x50, 0x68, 0x59, 0x63, 0x36, 0x4e, 0x71, 0x6b, 0x6f, 0x76, 0x73, 0x78,
+  0x6a, 0x63, 0x33, 0x34, 0x37, 0x72, 0x2f, 0x7a, 0x4e, 0x32, 0x58, 0x45, 0x6d, 0x4b, 0x74, 0x67,
+  0x46, 0x44, 0x59, 0x49, 0x71, 0x65, 0x59, 0x5a, 0x47, 0x31, 0x75, 0x4b, 0x36, 0x65, 0x53, 0x59,
+  0x4c, 0x32, 0x4d, 0x48, 0x69, 0x32, 0x39, 0x77, 0x33, 0x49, 0x4a, 0x55, 0x4a, 0x64, 0x57, 0x44,
+  0x41, 0x4d, 0x0a, 0x48, 0x46, 0x55, 0x64, 0x58, 0x64, 0x77, 0x43, 0x63, 0x2f, 0x62, 0x67, 0x49,
+  0x6b, 0x6c, 0x72, 0x35, 0x31, 0x4d, 0x45, 0x69, 0x39, 0x4d, 0x42, 0x70, 0x4a, 0x39, 0x55, 0x43,
+  0x77, 0x55, 0x41, 0x68, 0x2b, 0x78, 0x6b, 0x63, 0x42, 0x48, 0x70, 0x4d, 0x76, 0x6f, 0x34, 0x38,
+  0x34, 0x75, 0x6c, 0x6f, 0x61, 0x36, 0x6d, 0x77, 0x74, 0x36, 0x32, 0x69, 0x79, 0x57, 0x36, 0x70,
+  0x6e, 0x4c, 0x58, 0x0a, 0x78, 0x74, 0x4e, 0x6f, 0x61, 0x53, 0x6a, 0x4b, 0x2b, 0x52, 0x43, 0x4f,
+  0x4b, 0x74, 0x57, 0x64, 0x61, 0x7a, 0x70, 0x73, 0x77, 0x36, 0x39, 0x45, 0x44, 0x6d, 0x39, 0x76,
+  0x70, 0x4e, 0x32, 0x47, 0x34, 0x4e, 0x52, 0x47, 0x6f, 0x6a, 0x62, 0x4b, 0x59, 0x6a, 0x66, 0x33,
+  0x44, 0x6e, 0x2b, 0x6e, 0x43, 0x6d, 0x54, 0x64, 0x36, 0x71, 0x4c, 0x75, 0x41, 0x63, 0x53, 0x62,
+  0x4d, 0x31, 0x62, 0x77, 0x0a, 0x4b, 0x43, 0x65, 0x64, 0x70, 0x56, 0x6f, 0x55, 0x6c, 0x6a, 0x72,
+  0x43, 0x68, 0x50, 0x62, 0x50, 0x55, 0x39, 0x30, 0x2b, 0x46, 0x50, 0x2b, 0x59, 0x54, 0x33, 0x6e,
+  0x6a, 0x51, 0x2f, 0x2b, 0x52, 0x36, 0x68, 0x59, 0x55, 0x78, 0x31, 0x6e, 0x53, 0x62, 0x6c, 0x7a,
+  0x37, 0x4f, 0x6d, 0x75, 0x2b, 0x62, 0x2b, 0x57, 0x35, 0x79, 0x71, 0x72, 0x72, 0x69, 0x6f, 0x30,
+  0x38, 0x78, 0x50, 0x64, 0x37, 0x0a, 0x2f, 0x51, 0x70, 0x37, 0x32, 0x30, 0x52, 0x35, 0x43, 0x61,
+  0x6a, 0x34, 0x4d, 0x70, 0x57, 0x65, 0x44, 0x42, 0x65, 0x78, 0x32, 0x68, 0x41, 0x51, 0x32, 0x39,
+  0x44, 0x30, 0x39, 0x70, 0x53, 0x66, 0x5a, 0x35, 0x63, 0x52, 0x32, 0x63, 0x4c, 0x4a, 0x6b, 0x70,
+  0x50, 0x53, 0x66, 0x4f, 0x76, 0x62, 0x76, 0x74, 0x4f, 0x56, 0x61, 0x6c, 0x30, 0x6d, 0x36, 0x6c,
+  0x34, 0x30, 0x48, 0x4a, 0x52, 0x6c, 0x0a, 0x2f, 0x56, 0x67, 0x2f, 0x63, 0x42, 0x51, 0x67, 0x46,
+  0x47, 0x54, 0x39, 0x66, 0x6d, 0x45, 0x4c, 0x36, 0x38, 0x5a, 0x37, 0x48, 0x61, 0x31, 0x76, 0x34,
+  0x44, 0x61, 0x7a, 0x47, 0x44, 0x32, 0x2b, 0x71, 0x52, 0x58, 0x69, 0x45, 0x2b, 0x49, 0x5a, 0x53,
+  0x55, 0x47, 0x7a, 0x33, 0x4a, 0x4e, 0x7a, 0x59, 0x6d, 0x42, 0x48, 0x75, 0x53, 0x43, 0x51, 0x6d,
+  0x39, 0x66, 0x2f, 0x74, 0x69, 0x4a, 0x35, 0x0a, 0x53, 0x51, 0x46, 0x78, 0x6b, 0x47, 0x38, 0x49,
+  0x32, 0x45, 0x33, 0x68, 0x73, 0x6c, 0x38, 0x4b, 0x33, 0x65, 0x4d, 0x4d, 0x61, 0x6b, 0x45, 0x43,
+  0x66, 0x34, 0x79, 0x53, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x58, 0x35,
+  0x30, 0x39, 0x20, 0x43, 0x52, 0x4c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+
+#define INTERMEDIATE_CERT_DER_LENGTH 2057
+UA_Byte INTERMEDIATE_CERT_DER_DATA[2057] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49,
+  0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x46,
+  0x77, 0x6a, 0x43, 0x43, 0x41, 0x36, 0x71, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x55,
+  0x54, 0x32, 0x55, 0x75, 0x68, 0x65, 0x71, 0x72, 0x77, 0x30, 0x34, 0x50, 0x76, 0x54, 0x56, 0x79,
+  0x32, 0x73, 0x46, 0x44, 0x4e, 0x56, 0x4e, 0x38, 0x5a, 0x30, 0x63, 0x77, 0x44, 0x51, 0x59, 0x4a,
+  0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x4c, 0x0a, 0x42, 0x51, 0x41,
+  0x77, 0x5a, 0x6a, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x68, 0x4d,
+  0x43, 0x52, 0x45, 0x55, 0x78, 0x44, 0x6a, 0x41, 0x4d, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x67,
+  0x4d, 0x42, 0x56, 0x4e, 0x30, 0x59, 0x58, 0x52, 0x6c, 0x4d, 0x51, 0x30, 0x77, 0x43, 0x77, 0x59,
+  0x44, 0x56, 0x51, 0x51, 0x48, 0x44, 0x41, 0x52, 0x44, 0x61, 0x58, 0x52, 0x35, 0x0a, 0x4d, 0x52,
+  0x55, 0x77, 0x45, 0x77, 0x59, 0x44, 0x56, 0x51, 0x51, 0x4b, 0x44, 0x41, 0x78, 0x50, 0x63, 0x6d,
+  0x64, 0x68, 0x62, 0x6d, 0x6c, 0x36, 0x59, 0x58, 0x52, 0x70, 0x62, 0x32, 0x34, 0x78, 0x45, 0x44,
+  0x41, 0x4f, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x73, 0x4d, 0x42, 0x30, 0x39, 0x79, 0x5a, 0x31,
+  0x56, 0x75, 0x61, 0x58, 0x51, 0x78, 0x44, 0x7a, 0x41, 0x4e, 0x42, 0x67, 0x4e, 0x56, 0x0a, 0x42,
+  0x41, 0x4d, 0x4d, 0x42, 0x6c, 0x4a, 0x76, 0x62, 0x33, 0x52, 0x44, 0x51, 0x54, 0x41, 0x65, 0x46,
+  0x77, 0x30, 0x79, 0x4e, 0x44, 0x41, 0x35, 0x4d, 0x54, 0x45, 0x78, 0x4d, 0x54, 0x55, 0x33, 0x4d,
+  0x7a, 0x5a, 0x61, 0x46, 0x77, 0x30, 0x7a, 0x4e, 0x44, 0x41, 0x35, 0x4d, 0x44, 0x6b, 0x78, 0x4d,
+  0x54, 0x55, 0x33, 0x4d, 0x7a, 0x5a, 0x61, 0x4d, 0x47, 0x34, 0x78, 0x43, 0x7a, 0x41, 0x4a, 0x0a,
+  0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x59, 0x54, 0x41, 0x6b, 0x52, 0x46, 0x4d, 0x51, 0x34, 0x77,
+  0x44, 0x41, 0x59, 0x44, 0x56, 0x51, 0x51, 0x49, 0x44, 0x41, 0x56, 0x54, 0x64, 0x47, 0x46, 0x30,
+  0x5a, 0x54, 0x45, 0x4e, 0x4d, 0x41, 0x73, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x77, 0x77, 0x45,
+  0x51, 0x32, 0x6c, 0x30, 0x65, 0x54, 0x45, 0x56, 0x4d, 0x42, 0x4d, 0x47, 0x41, 0x31, 0x55, 0x45,
+  0x0a, 0x43, 0x67, 0x77, 0x4d, 0x54, 0x33, 0x4a, 0x6e, 0x59, 0x57, 0x35, 0x70, 0x65, 0x6d, 0x46,
+  0x30, 0x61, 0x57, 0x39, 0x75, 0x4d, 0x52, 0x41, 0x77, 0x44, 0x67, 0x59, 0x44, 0x56, 0x51, 0x51,
+  0x4c, 0x44, 0x41, 0x64, 0x50, 0x63, 0x6d, 0x64, 0x56, 0x62, 0x6d, 0x6c, 0x30, 0x4d, 0x52, 0x63,
+  0x77, 0x46, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, 0x35, 0x4a, 0x62, 0x6e, 0x52,
+  0x6c, 0x0a, 0x63, 0x6d, 0x31, 0x6c, 0x5a, 0x47, 0x6c, 0x68, 0x64, 0x47, 0x56, 0x44, 0x51, 0x54,
+  0x43, 0x43, 0x41, 0x69, 0x49, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76,
+  0x63, 0x4e, 0x41, 0x51, 0x45, 0x42, 0x42, 0x51, 0x41, 0x44, 0x67, 0x67, 0x49, 0x50, 0x41, 0x44,
+  0x43, 0x43, 0x41, 0x67, 0x6f, 0x43, 0x67, 0x67, 0x49, 0x42, 0x41, 0x4e, 0x31, 0x4e, 0x4f, 0x55,
+  0x72, 0x63, 0x0a, 0x66, 0x68, 0x4e, 0x51, 0x4a, 0x46, 0x74, 0x42, 0x4a, 0x55, 0x39, 0x51, 0x47,
+  0x35, 0x34, 0x4f, 0x2f, 0x46, 0x63, 0x67, 0x61, 0x4a, 0x4a, 0x2b, 0x53, 0x69, 0x79, 0x73, 0x4c,
+  0x36, 0x4d, 0x49, 0x37, 0x50, 0x42, 0x4e, 0x55, 0x45, 0x31, 0x56, 0x6a, 0x6d, 0x59, 0x59, 0x38,
+  0x35, 0x2f, 0x34, 0x57, 0x43, 0x57, 0x58, 0x66, 0x69, 0x47, 0x39, 0x75, 0x58, 0x79, 0x42, 0x6c,
+  0x6b, 0x31, 0x55, 0x0a, 0x62, 0x70, 0x5a, 0x61, 0x4b, 0x72, 0x76, 0x51, 0x59, 0x4b, 0x64, 0x59,
+  0x52, 0x50, 0x5a, 0x39, 0x48, 0x71, 0x66, 0x76, 0x42, 0x43, 0x6b, 0x6d, 0x68, 0x4a, 0x53, 0x36,
+  0x6e, 0x4a, 0x57, 0x75, 0x38, 0x53, 0x39, 0x41, 0x43, 0x4a, 0x34, 0x47, 0x47, 0x51, 0x6d, 0x63,
+  0x54, 0x69, 0x68, 0x71, 0x35, 0x6f, 0x72, 0x5a, 0x6f, 0x57, 0x73, 0x75, 0x32, 0x2b, 0x46, 0x7a,
+  0x4d, 0x71, 0x45, 0x6b, 0x0a, 0x4d, 0x69, 0x2f, 0x47, 0x52, 0x6a, 0x2b, 0x4d, 0x53, 0x70, 0x6f,
+  0x57, 0x39, 0x68, 0x55, 0x74, 0x44, 0x6a, 0x42, 0x33, 0x6a, 0x74, 0x63, 0x4b, 0x31, 0x73, 0x68,
+  0x38, 0x53, 0x46, 0x74, 0x66, 0x48, 0x49, 0x44, 0x42, 0x66, 0x31, 0x4b, 0x53, 0x4c, 0x5a, 0x46,
+  0x6b, 0x4c, 0x6a, 0x55, 0x43, 0x4a, 0x75, 0x65, 0x6b, 0x6d, 0x67, 0x31, 0x47, 0x78, 0x63, 0x34,
+  0x70, 0x37, 0x6f, 0x78, 0x65, 0x0a, 0x6f, 0x45, 0x43, 0x49, 0x6b, 0x57, 0x4e, 0x54, 0x30, 0x52,
+  0x4e, 0x53, 0x64, 0x4a, 0x6f, 0x2b, 0x73, 0x4f, 0x63, 0x6d, 0x6a, 0x59, 0x38, 0x6a, 0x32, 0x77,
+  0x43, 0x4e, 0x69, 0x7a, 0x6c, 0x32, 0x76, 0x36, 0x42, 0x43, 0x72, 0x41, 0x57, 0x6f, 0x75, 0x4d,
+  0x68, 0x6f, 0x78, 0x6a, 0x6c, 0x54, 0x41, 0x33, 0x33, 0x66, 0x43, 0x73, 0x2b, 0x2b, 0x6c, 0x58,
+  0x6b, 0x4d, 0x2b, 0x79, 0x38, 0x6e, 0x0a, 0x46, 0x7a, 0x41, 0x6f, 0x75, 0x67, 0x68, 0x4b, 0x62,
+  0x56, 0x31, 0x43, 0x69, 0x71, 0x59, 0x6a, 0x65, 0x68, 0x36, 0x6d, 0x56, 0x6a, 0x38, 0x68, 0x69,
+  0x30, 0x39, 0x32, 0x55, 0x66, 0x33, 0x6a, 0x62, 0x43, 0x78, 0x6c, 0x4a, 0x73, 0x6f, 0x73, 0x46,
+  0x2b, 0x4a, 0x65, 0x78, 0x54, 0x59, 0x56, 0x64, 0x41, 0x4e, 0x36, 0x74, 0x72, 0x50, 0x75, 0x4c,
+  0x2f, 0x4a, 0x51, 0x4b, 0x66, 0x4b, 0x54, 0x0a, 0x4a, 0x39, 0x74, 0x31, 0x44, 0x62, 0x71, 0x6e,
+  0x44, 0x74, 0x38, 0x50, 0x75, 0x43, 0x55, 0x45, 0x67, 0x63, 0x44, 0x76, 0x71, 0x48, 0x51, 0x4a,
+  0x58, 0x58, 0x34, 0x53, 0x33, 0x59, 0x66, 0x65, 0x57, 0x62, 0x6e, 0x74, 0x51, 0x63, 0x36, 0x62,
+  0x5a, 0x34, 0x4a, 0x5a, 0x44, 0x5a, 0x63, 0x46, 0x35, 0x6f, 0x67, 0x39, 0x47, 0x69, 0x6f, 0x61,
+  0x5a, 0x2b, 0x75, 0x55, 0x45, 0x63, 0x4e, 0x62, 0x0a, 0x47, 0x4d, 0x32, 0x76, 0x33, 0x31, 0x5a,
+  0x44, 0x74, 0x31, 0x45, 0x46, 0x41, 0x7a, 0x74, 0x6d, 0x74, 0x46, 0x74, 0x72, 0x70, 0x68, 0x52,
+  0x50, 0x79, 0x5a, 0x4e, 0x61, 0x76, 0x39, 0x73, 0x63, 0x52, 0x77, 0x75, 0x50, 0x37, 0x51, 0x72,
+  0x49, 0x62, 0x63, 0x66, 0x45, 0x63, 0x63, 0x51, 0x55, 0x70, 0x33, 0x61, 0x2f, 0x62, 0x62, 0x31,
+  0x49, 0x51, 0x50, 0x4b, 0x2b, 0x4b, 0x59, 0x50, 0x67, 0x0a, 0x31, 0x50, 0x61, 0x67, 0x58, 0x57,
+  0x59, 0x44, 0x62, 0x69, 0x6c, 0x55, 0x42, 0x4a, 0x57, 0x6d, 0x69, 0x32, 0x52, 0x31, 0x69, 0x52,
+  0x4b, 0x78, 0x39, 0x59, 0x4e, 0x61, 0x68, 0x34, 0x45, 0x51, 0x49, 0x6f, 0x49, 0x72, 0x61, 0x61,
+  0x66, 0x54, 0x6a, 0x78, 0x73, 0x6f, 0x6e, 0x50, 0x2f, 0x30, 0x55, 0x79, 0x62, 0x6b, 0x71, 0x65,
+  0x6e, 0x73, 0x4b, 0x4d, 0x47, 0x71, 0x58, 0x54, 0x2f, 0x55, 0x0a, 0x64, 0x34, 0x52, 0x33, 0x36,
+  0x50, 0x31, 0x64, 0x44, 0x43, 0x6b, 0x6b, 0x4e, 0x2b, 0x4b, 0x59, 0x64, 0x55, 0x42, 0x4d, 0x44,
+  0x72, 0x76, 0x66, 0x69, 0x51, 0x34, 0x47, 0x64, 0x4e, 0x6a, 0x4c, 0x5a, 0x61, 0x2b, 0x49, 0x32,
+  0x75, 0x50, 0x50, 0x6c, 0x55, 0x6e, 0x76, 0x72, 0x38, 0x7a, 0x67, 0x43, 0x73, 0x45, 0x77, 0x4f,
+  0x7a, 0x75, 0x46, 0x32, 0x5a, 0x73, 0x32, 0x4f, 0x6f, 0x32, 0x50, 0x0a, 0x50, 0x52, 0x63, 0x7a,
+  0x50, 0x50, 0x5a, 0x44, 0x2b, 0x61, 0x36, 0x46, 0x64, 0x74, 0x39, 0x44, 0x65, 0x74, 0x73, 0x47,
+  0x77, 0x36, 0x35, 0x32, 0x49, 0x47, 0x38, 0x65, 0x49, 0x59, 0x70, 0x33, 0x63, 0x47, 0x2f, 0x4b,
+  0x43, 0x74, 0x66, 0x6b, 0x6f, 0x30, 0x76, 0x58, 0x6f, 0x46, 0x4a, 0x73, 0x43, 0x4e, 0x4b, 0x36,
+  0x2f, 0x45, 0x6e, 0x65, 0x31, 0x4e, 0x66, 0x72, 0x45, 0x6e, 0x7a, 0x79, 0x0a, 0x32, 0x30, 0x67,
+  0x7a, 0x7a, 0x39, 0x4a, 0x55, 0x6d, 0x35, 0x7a, 0x68, 0x73, 0x38, 0x54, 0x68, 0x59, 0x63, 0x34,
+  0x75, 0x35, 0x6f, 0x41, 0x2f, 0x78, 0x48, 0x6f, 0x79, 0x76, 0x79, 0x57, 0x46, 0x38, 0x74, 0x39,
+  0x31, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41, 0x47, 0x6a, 0x59, 0x44, 0x42, 0x65, 0x4d, 0x41, 0x38,
+  0x47, 0x41, 0x31, 0x55, 0x64, 0x45, 0x77, 0x45, 0x42, 0x2f, 0x77, 0x51, 0x46, 0x0a, 0x4d, 0x41,
+  0x4d, 0x42, 0x41, 0x66, 0x38, 0x77, 0x43, 0x77, 0x59, 0x44, 0x56, 0x52, 0x30, 0x50, 0x42, 0x41,
+  0x51, 0x44, 0x41, 0x67, 0x45, 0x47, 0x4d, 0x42, 0x30, 0x47, 0x41, 0x31, 0x55, 0x64, 0x44, 0x67,
+  0x51, 0x57, 0x42, 0x42, 0x52, 0x6c, 0x76, 0x43, 0x32, 0x55, 0x61, 0x31, 0x32, 0x64, 0x34, 0x59,
+  0x51, 0x31, 0x4f, 0x51, 0x79, 0x2b, 0x32, 0x43, 0x76, 0x4c, 0x6e, 0x4c, 0x47, 0x72, 0x0a, 0x41,
+  0x44, 0x41, 0x66, 0x42, 0x67, 0x4e, 0x56, 0x48, 0x53, 0x4d, 0x45, 0x47, 0x44, 0x41, 0x57, 0x67,
+  0x42, 0x54, 0x53, 0x57, 0x39, 0x59, 0x70, 0x5a, 0x4c, 0x43, 0x73, 0x74, 0x43, 0x30, 0x50, 0x54,
+  0x39, 0x32, 0x39, 0x5a, 0x56, 0x6d, 0x43, 0x78, 0x30, 0x48, 0x30, 0x4a, 0x6a, 0x41, 0x4e, 0x42,
+  0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x73, 0x46, 0x0a,
+  0x41, 0x41, 0x4f, 0x43, 0x41, 0x67, 0x45, 0x41, 0x67, 0x65, 0x48, 0x74, 0x75, 0x57, 0x4b, 0x38,
+  0x35, 0x31, 0x68, 0x4f, 0x48, 0x58, 0x55, 0x52, 0x62, 0x59, 0x71, 0x43, 0x75, 0x37, 0x4f, 0x58,
+  0x6c, 0x35, 0x61, 0x73, 0x69, 0x2b, 0x61, 0x39, 0x44, 0x59, 0x72, 0x4b, 0x66, 0x34, 0x4c, 0x50,
+  0x71, 0x35, 0x50, 0x78, 0x72, 0x48, 0x38, 0x2b, 0x64, 0x56, 0x33, 0x6c, 0x49, 0x44, 0x6a, 0x38,
+  0x0a, 0x59, 0x47, 0x5a, 0x6c, 0x34, 0x34, 0x64, 0x37, 0x34, 0x6f, 0x6c, 0x38, 0x4a, 0x72, 0x71,
+  0x2f, 0x4b, 0x59, 0x64, 0x39, 0x34, 0x71, 0x53, 0x46, 0x76, 0x71, 0x30, 0x39, 0x39, 0x43, 0x66,
+  0x42, 0x6c, 0x53, 0x65, 0x61, 0x6d, 0x44, 0x4d, 0x71, 0x4a, 0x30, 0x54, 0x4d, 0x76, 0x68, 0x4d,
+  0x62, 0x37, 0x38, 0x68, 0x75, 0x7a, 0x48, 0x4f, 0x63, 0x59, 0x73, 0x72, 0x73, 0x6e, 0x4c, 0x4f,
+  0x77, 0x0a, 0x45, 0x32, 0x6f, 0x46, 0x43, 0x65, 0x41, 0x45, 0x2b, 0x78, 0x77, 0x2f, 0x68, 0x2f,
+  0x53, 0x4c, 0x75, 0x62, 0x76, 0x6e, 0x59, 0x6d, 0x43, 0x43, 0x5a, 0x67, 0x4f, 0x50, 0x54, 0x4f,
+  0x32, 0x74, 0x51, 0x5a, 0x72, 0x34, 0x4d, 0x39, 0x75, 0x44, 0x6e, 0x52, 0x37, 0x7a, 0x49, 0x66,
+  0x38, 0x6c, 0x59, 0x47, 0x56, 0x33, 0x50, 0x6d, 0x43, 0x6e, 0x78, 0x63, 0x78, 0x2b, 0x4a, 0x68,
+  0x76, 0x65, 0x0a, 0x6d, 0x74, 0x47, 0x62, 0x6b, 0x2f, 0x6d, 0x35, 0x6a, 0x73, 0x68, 0x52, 0x6c,
+  0x2b, 0x44, 0x30, 0x62, 0x53, 0x64, 0x76, 0x52, 0x36, 0x52, 0x56, 0x37, 0x71, 0x4b, 0x72, 0x70,
+  0x4c, 0x50, 0x5a, 0x38, 0x74, 0x42, 0x79, 0x46, 0x2b, 0x53, 0x2b, 0x63, 0x45, 0x4d, 0x6f, 0x6b,
+  0x6f, 0x47, 0x35, 0x6d, 0x63, 0x59, 0x38, 0x68, 0x75, 0x39, 0x38, 0x7a, 0x36, 0x79, 0x65, 0x73,
+  0x43, 0x73, 0x70, 0x0a, 0x79, 0x43, 0x64, 0x46, 0x74, 0x55, 0x45, 0x34, 0x69, 0x77, 0x64, 0x70,
+  0x4b, 0x2f, 0x55, 0x56, 0x48, 0x61, 0x31, 0x39, 0x44, 0x52, 0x72, 0x6f, 0x48, 0x64, 0x41, 0x48,
+  0x61, 0x36, 0x37, 0x79, 0x38, 0x79, 0x73, 0x50, 0x46, 0x69, 0x34, 0x65, 0x76, 0x63, 0x50, 0x32,
+  0x44, 0x65, 0x48, 0x50, 0x70, 0x32, 0x6f, 0x78, 0x4a, 0x73, 0x2b, 0x38, 0x4b, 0x73, 0x73, 0x4c,
+  0x44, 0x31, 0x30, 0x6f, 0x0a, 0x78, 0x6a, 0x4a, 0x37, 0x6b, 0x43, 0x64, 0x6e, 0x70, 0x78, 0x4a,
+  0x5a, 0x64, 0x49, 0x74, 0x41, 0x39, 0x76, 0x54, 0x44, 0x75, 0x69, 0x48, 0x57, 0x79, 0x66, 0x69,
+  0x79, 0x4a, 0x75, 0x35, 0x6f, 0x30, 0x71, 0x4e, 0x4d, 0x49, 0x50, 0x50, 0x57, 0x4d, 0x76, 0x51,
+  0x46, 0x45, 0x74, 0x6f, 0x61, 0x76, 0x34, 0x42, 0x67, 0x2b, 0x32, 0x74, 0x66, 0x4b, 0x70, 0x61,
+  0x52, 0x41, 0x33, 0x57, 0x64, 0x0a, 0x42, 0x65, 0x53, 0x2f, 0x37, 0x4d, 0x45, 0x6e, 0x36, 0x65,
+  0x72, 0x37, 0x73, 0x43, 0x64, 0x2b, 0x42, 0x35, 0x2b, 0x4d, 0x79, 0x4b, 0x78, 0x46, 0x4f, 0x66,
+  0x75, 0x52, 0x74, 0x5a, 0x70, 0x6c, 0x71, 0x35, 0x41, 0x42, 0x4c, 0x69, 0x37, 0x53, 0x35, 0x64,
+  0x76, 0x6d, 0x6e, 0x79, 0x48, 0x37, 0x51, 0x2f, 0x76, 0x4b, 0x53, 0x51, 0x53, 0x75, 0x39, 0x34,
+  0x66, 0x66, 0x52, 0x78, 0x61, 0x4c, 0x0a, 0x56, 0x69, 0x63, 0x6e, 0x6f, 0x6f, 0x4a, 0x4d, 0x38,
+  0x44, 0x6e, 0x47, 0x6c, 0x70, 0x43, 0x75, 0x35, 0x35, 0x61, 0x50, 0x46, 0x56, 0x6e, 0x54, 0x46,
+  0x6a, 0x37, 0x30, 0x43, 0x47, 0x61, 0x50, 0x72, 0x61, 0x4b, 0x72, 0x69, 0x6a, 0x62, 0x68, 0x35,
+  0x4e, 0x4a, 0x51, 0x43, 0x7a, 0x6c, 0x62, 0x31, 0x2f, 0x65, 0x52, 0x48, 0x31, 0x6c, 0x4d, 0x55,
+  0x6b, 0x31, 0x57, 0x37, 0x6d, 0x41, 0x68, 0x0a, 0x75, 0x39, 0x33, 0x44, 0x2b, 0x79, 0x2f, 0x65,
+  0x72, 0x46, 0x4f, 0x75, 0x2f, 0x6a, 0x58, 0x73, 0x44, 0x6e, 0x69, 0x34, 0x4a, 0x4c, 0x68, 0x72,
+  0x4d, 0x65, 0x34, 0x45, 0x7a, 0x6d, 0x78, 0x75, 0x2b, 0x6c, 0x7a, 0x6b, 0x6b, 0x58, 0x43, 0x68,
+  0x36, 0x39, 0x36, 0x58, 0x6a, 0x59, 0x49, 0x45, 0x62, 0x41, 0x42, 0x6f, 0x66, 0x62, 0x45, 0x4c,
+  0x30, 0x74, 0x46, 0x56, 0x50, 0x6e, 0x68, 0x37, 0x0a, 0x51, 0x55, 0x42, 0x37, 0x65, 0x59, 0x4a,
+  0x63, 0x67, 0x6b, 0x61, 0x42, 0x6e, 0x39, 0x64, 0x6b, 0x31, 0x38, 0x61, 0x73, 0x6f, 0x78, 0x73,
+  0x54, 0x41, 0x51, 0x73, 0x30, 0x6b, 0x41, 0x61, 0x52, 0x71, 0x79, 0x70, 0x73, 0x63, 0x4a, 0x46,
+  0x44, 0x56, 0x6d, 0x67, 0x74, 0x45, 0x78, 0x53, 0x4e, 0x54, 0x72, 0x4a, 0x78, 0x50, 0x62, 0x7a,
+  0x52, 0x33, 0x6d, 0x72, 0x2f, 0x69, 0x6f, 0x64, 0x6d, 0x0a, 0x5a, 0x7a, 0x57, 0x37, 0x54, 0x39,
+  0x59, 0x33, 0x4f, 0x4e, 0x45, 0x31, 0x67, 0x79, 0x74, 0x38, 0x75, 0x51, 0x53, 0x44, 0x58, 0x62,
+  0x4d, 0x6c, 0x6b, 0x71, 0x6d, 0x55, 0x76, 0x49, 0x61, 0x6f, 0x42, 0x4d, 0x79, 0x43, 0x4c, 0x56,
+  0x31, 0x31, 0x6a, 0x44, 0x66, 0x6a, 0x6b, 0x51, 0x47, 0x78, 0x41, 0x53, 0x77, 0x3d, 0x0a, 0x2d,
+  0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43,
+  0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+
+/* Contains the application certificate */
+#define INTERMEDIATE_CRL_PEM_LENGTH 1121
+UA_Byte INTERMEDIATE_CRL_PEM_DATA[1121] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x58, 0x35, 0x30, 0x39, 0x20,
+  0x43, 0x52, 0x4c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x44, 0x45, 0x6a, 0x43,
+  0x42, 0x2b, 0x77, 0x49, 0x42, 0x41, 0x54, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69,
+  0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x73, 0x46, 0x41, 0x44, 0x42, 0x75, 0x4d, 0x51, 0x73,
+  0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x45, 0x52, 0x54, 0x45,
+  0x4f, 0x4d, 0x41, 0x77, 0x47, 0x41, 0x31, 0x55, 0x45, 0x0a, 0x43, 0x41, 0x77, 0x46, 0x55, 0x33,
+  0x52, 0x68, 0x64, 0x47, 0x55, 0x78, 0x44, 0x54, 0x41, 0x4c, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41,
+  0x63, 0x4d, 0x42, 0x45, 0x4e, 0x70, 0x64, 0x48, 0x6b, 0x78, 0x46, 0x54, 0x41, 0x54, 0x42, 0x67,
+  0x4e, 0x56, 0x42, 0x41, 0x6f, 0x4d, 0x44, 0x45, 0x39, 0x79, 0x5a, 0x32, 0x46, 0x75, 0x61, 0x58,
+  0x70, 0x68, 0x64, 0x47, 0x6c, 0x76, 0x62, 0x6a, 0x45, 0x51, 0x0a, 0x4d, 0x41, 0x34, 0x47, 0x41,
+  0x31, 0x55, 0x45, 0x43, 0x77, 0x77, 0x48, 0x54, 0x33, 0x4a, 0x6e, 0x56, 0x57, 0x35, 0x70, 0x64,
+  0x44, 0x45, 0x58, 0x4d, 0x42, 0x55, 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x77, 0x77, 0x4f, 0x53,
+  0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x74, 0x5a, 0x57, 0x52, 0x70, 0x59, 0x58, 0x52, 0x6c, 0x51,
+  0x30, 0x45, 0x58, 0x44, 0x54, 0x49, 0x30, 0x4d, 0x44, 0x6b, 0x78, 0x0a, 0x4d, 0x54, 0x45, 0x30,
+  0x4d, 0x44, 0x49, 0x7a, 0x4d, 0x6c, 0x6f, 0x58, 0x44, 0x54, 0x49, 0x30, 0x4d, 0x54, 0x41, 0x78,
+  0x4d, 0x54, 0x45, 0x30, 0x4d, 0x44, 0x49, 0x7a, 0x4d, 0x6c, 0x6f, 0x77, 0x4a, 0x7a, 0x41, 0x6c,
+  0x41, 0x68, 0x51, 0x49, 0x69, 0x49, 0x59, 0x35, 0x35, 0x39, 0x4e, 0x34, 0x73, 0x6f, 0x6d, 0x6b,
+  0x2b, 0x49, 0x76, 0x32, 0x63, 0x51, 0x44, 0x44, 0x64, 0x6e, 0x67, 0x4d, 0x0a, 0x6f, 0x52, 0x63,
+  0x4e, 0x4d, 0x6a, 0x51, 0x77, 0x4f, 0x54, 0x45, 0x78, 0x4d, 0x54, 0x51, 0x77, 0x4d, 0x6a, 0x49,
+  0x32, 0x57, 0x71, 0x41, 0x77, 0x4d, 0x43, 0x34, 0x77, 0x48, 0x77, 0x59, 0x44, 0x56, 0x52, 0x30,
+  0x6a, 0x42, 0x42, 0x67, 0x77, 0x46, 0x6f, 0x41, 0x55, 0x5a, 0x62, 0x77, 0x74, 0x6c, 0x47, 0x74,
+  0x64, 0x6e, 0x65, 0x47, 0x45, 0x4e, 0x54, 0x6b, 0x4d, 0x76, 0x74, 0x67, 0x72, 0x0a, 0x79, 0x35,
+  0x79, 0x78, 0x71, 0x77, 0x41, 0x77, 0x43, 0x77, 0x59, 0x44, 0x56, 0x52, 0x30, 0x55, 0x42, 0x41,
+  0x51, 0x43, 0x41, 0x68, 0x41, 0x46, 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49,
+  0x62, 0x33, 0x44, 0x51, 0x45, 0x42, 0x43, 0x77, 0x55, 0x41, 0x41, 0x34, 0x49, 0x43, 0x41, 0x51,
+  0x41, 0x73, 0x6b, 0x45, 0x4f, 0x65, 0x36, 0x4d, 0x56, 0x36, 0x62, 0x54, 0x79, 0x6c, 0x0a, 0x41,
+  0x56, 0x50, 0x48, 0x71, 0x47, 0x55, 0x69, 0x42, 0x64, 0x41, 0x53, 0x76, 0x75, 0x68, 0x33, 0x6e,
+  0x6a, 0x68, 0x48, 0x4f, 0x6d, 0x5a, 0x42, 0x43, 0x32, 0x31, 0x77, 0x34, 0x51, 0x71, 0x73, 0x7a,
+  0x43, 0x32, 0x48, 0x65, 0x38, 0x33, 0x4d, 0x58, 0x66, 0x63, 0x41, 0x7a, 0x4b, 0x6b, 0x51, 0x55,
+  0x61, 0x6d, 0x4c, 0x5a, 0x45, 0x76, 0x43, 0x4d, 0x32, 0x2f, 0x77, 0x4e, 0x74, 0x58, 0x6c, 0x0a,
+  0x59, 0x55, 0x67, 0x79, 0x66, 0x53, 0x70, 0x52, 0x4e, 0x6b, 0x70, 0x56, 0x6e, 0x6a, 0x4a, 0x66,
+  0x35, 0x4f, 0x6d, 0x6a, 0x50, 0x75, 0x53, 0x75, 0x46, 0x76, 0x39, 0x69, 0x64, 0x78, 0x46, 0x68,
+  0x34, 0x66, 0x44, 0x35, 0x37, 0x71, 0x41, 0x38, 0x2f, 0x51, 0x70, 0x4f, 0x31, 0x61, 0x61, 0x44,
+  0x65, 0x71, 0x4d, 0x41, 0x74, 0x47, 0x37, 0x72, 0x53, 0x77, 0x4a, 0x69, 0x2b, 0x67, 0x7a, 0x69,
+  0x0a, 0x36, 0x35, 0x38, 0x36, 0x6d, 0x73, 0x33, 0x58, 0x72, 0x72, 0x7a, 0x51, 0x2b, 0x33, 0x69,
+  0x54, 0x69, 0x50, 0x52, 0x49, 0x44, 0x45, 0x4b, 0x71, 0x2b, 0x72, 0x69, 0x69, 0x2b, 0x52, 0x4b,
+  0x68, 0x41, 0x4b, 0x64, 0x79, 0x57, 0x63, 0x2f, 0x79, 0x6f, 0x4a, 0x6c, 0x4b, 0x75, 0x30, 0x2f,
+  0x6f, 0x42, 0x6b, 0x73, 0x63, 0x77, 0x67, 0x65, 0x58, 0x42, 0x61, 0x52, 0x33, 0x4c, 0x4f, 0x6b,
+  0x5a, 0x0a, 0x53, 0x6b, 0x2b, 0x73, 0x76, 0x70, 0x4a, 0x6f, 0x32, 0x36, 0x75, 0x59, 0x4d, 0x45,
+  0x52, 0x36, 0x43, 0x31, 0x70, 0x37, 0x42, 0x48, 0x79, 0x43, 0x78, 0x62, 0x59, 0x4c, 0x4a, 0x30,
+  0x58, 0x61, 0x4d, 0x46, 0x51, 0x54, 0x54, 0x57, 0x76, 0x37, 0x37, 0x34, 0x6f, 0x33, 0x63, 0x4a,
+  0x42, 0x53, 0x45, 0x58, 0x79, 0x74, 0x2b, 0x58, 0x78, 0x52, 0x69, 0x75, 0x6e, 0x6c, 0x43, 0x49,
+  0x42, 0x31, 0x0a, 0x75, 0x46, 0x77, 0x36, 0x43, 0x44, 0x44, 0x2f, 0x57, 0x63, 0x76, 0x72, 0x43,
+  0x76, 0x59, 0x55, 0x77, 0x71, 0x63, 0x43, 0x77, 0x31, 0x2b, 0x53, 0x47, 0x66, 0x46, 0x2b, 0x68,
+  0x51, 0x74, 0x6f, 0x77, 0x4d, 0x33, 0x6a, 0x4c, 0x73, 0x33, 0x71, 0x50, 0x57, 0x59, 0x61, 0x2b,
+  0x66, 0x67, 0x69, 0x58, 0x33, 0x71, 0x70, 0x38, 0x72, 0x53, 0x77, 0x65, 0x39, 0x32, 0x69, 0x5a,
+  0x76, 0x44, 0x4e, 0x0a, 0x7a, 0x4e, 0x72, 0x6f, 0x34, 0x64, 0x5a, 0x4a, 0x46, 0x42, 0x59, 0x65,
+  0x61, 0x55, 0x70, 0x30, 0x46, 0x48, 0x6c, 0x6e, 0x71, 0x56, 0x2b, 0x46, 0x6c, 0x72, 0x77, 0x32,
+  0x5a, 0x6c, 0x38, 0x41, 0x48, 0x53, 0x4e, 0x33, 0x69, 0x75, 0x70, 0x53, 0x33, 0x74, 0x74, 0x2b,
+  0x39, 0x56, 0x31, 0x76, 0x63, 0x75, 0x45, 0x34, 0x2b, 0x70, 0x78, 0x64, 0x68, 0x73, 0x32, 0x44,
+  0x4c, 0x78, 0x38, 0x46, 0x0a, 0x78, 0x6d, 0x6d, 0x39, 0x41, 0x67, 0x66, 0x50, 0x32, 0x49, 0x71,
+  0x33, 0x62, 0x47, 0x4c, 0x4a, 0x69, 0x42, 0x32, 0x76, 0x39, 0x74, 0x4d, 0x76, 0x70, 0x63, 0x32,
+  0x63, 0x4e, 0x61, 0x45, 0x58, 0x33, 0x4b, 0x34, 0x4a, 0x48, 0x4f, 0x48, 0x78, 0x38, 0x6a, 0x6b,
+  0x65, 0x34, 0x6b, 0x6f, 0x66, 0x66, 0x4f, 0x44, 0x70, 0x77, 0x36, 0x70, 0x48, 0x71, 0x71, 0x61,
+  0x64, 0x73, 0x47, 0x54, 0x63, 0x0a, 0x6d, 0x55, 0x56, 0x75, 0x4f, 0x45, 0x66, 0x35, 0x47, 0x72,
+  0x70, 0x77, 0x37, 0x67, 0x54, 0x68, 0x70, 0x41, 0x52, 0x2b, 0x38, 0x37, 0x32, 0x45, 0x66, 0x41,
+  0x43, 0x58, 0x72, 0x4a, 0x6f, 0x33, 0x63, 0x73, 0x45, 0x2b, 0x48, 0x74, 0x49, 0x2b, 0x50, 0x69,
+  0x4b, 0x48, 0x58, 0x37, 0x6f, 0x38, 0x47, 0x75, 0x61, 0x49, 0x63, 0x56, 0x6d, 0x77, 0x42, 0x74,
+  0x59, 0x33, 0x35, 0x52, 0x75, 0x44, 0x0a, 0x4e, 0x56, 0x6f, 0x34, 0x58, 0x36, 0x36, 0x49, 0x52,
+  0x47, 0x6d, 0x65, 0x38, 0x4a, 0x56, 0x58, 0x64, 0x50, 0x4c, 0x35, 0x6b, 0x76, 0x6b, 0x78, 0x6e,
+  0x63, 0x4f, 0x72, 0x73, 0x77, 0x30, 0x42, 0x75, 0x61, 0x48, 0x61, 0x63, 0x76, 0x41, 0x58, 0x6f,
+  0x2b, 0x79, 0x42, 0x49, 0x66, 0x4e, 0x78, 0x6b, 0x54, 0x37, 0x67, 0x35, 0x78, 0x69, 0x46, 0x74,
+  0x58, 0x49, 0x41, 0x70, 0x36, 0x74, 0x72, 0x0a, 0x36, 0x63, 0x36, 0x52, 0x30, 0x6e, 0x78, 0x70,
+  0x63, 0x7a, 0x77, 0x6c, 0x68, 0x43, 0x55, 0x39, 0x34, 0x37, 0x4c, 0x48, 0x34, 0x62, 0x51, 0x74,
+  0x66, 0x33, 0x6e, 0x51, 0x6f, 0x30, 0x4e, 0x6e, 0x6e, 0x39, 0x73, 0x74, 0x44, 0x39, 0x38, 0x67,
+  0x31, 0x33, 0x6e, 0x63, 0x54, 0x59, 0x59, 0x73, 0x73, 0x32, 0x73, 0x78, 0x35, 0x64, 0x61, 0x5a,
+  0x75, 0x56, 0x53, 0x45, 0x79, 0x57, 0x64, 0x72, 0x0a, 0x4e, 0x6a, 0x66, 0x7a, 0x56, 0x33, 0x5a,
+  0x49, 0x4d, 0x77, 0x4a, 0x4f, 0x2f, 0x2b, 0x39, 0x6f, 0x67, 0x4e, 0x51, 0x45, 0x37, 0x42, 0x69,
+  0x75, 0x35, 0x78, 0x2f, 0x55, 0x62, 0x41, 0x3d, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45,
+  0x4e, 0x44, 0x20, 0x58, 0x35, 0x30, 0x39, 0x20, 0x43, 0x52, 0x4c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+  0x0a
+};
+
+#define INTERMEDIATE_EMPTY_CRL_PEM_LENGTH 1064
+UA_Byte INTERMEDIATE_EMPTY_CRL_PEM_DATA[1064] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x58, 0x35, 0x30, 0x39, 0x20,
+  0x43, 0x52, 0x4c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x43, 0x36, 0x54, 0x43,
+  0x42, 0x30, 0x67, 0x49, 0x42, 0x41, 0x54, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69,
+  0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x73, 0x46, 0x41, 0x44, 0x42, 0x75, 0x4d, 0x51, 0x73,
+  0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x45, 0x77, 0x4a, 0x45, 0x52, 0x54, 0x45,
+  0x4f, 0x4d, 0x41, 0x77, 0x47, 0x41, 0x31, 0x55, 0x45, 0x0a, 0x43, 0x41, 0x77, 0x46, 0x55, 0x33,
+  0x52, 0x68, 0x64, 0x47, 0x55, 0x78, 0x44, 0x54, 0x41, 0x4c, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41,
+  0x63, 0x4d, 0x42, 0x45, 0x4e, 0x70, 0x64, 0x48, 0x6b, 0x78, 0x46, 0x54, 0x41, 0x54, 0x42, 0x67,
+  0x4e, 0x56, 0x42, 0x41, 0x6f, 0x4d, 0x44, 0x45, 0x39, 0x79, 0x5a, 0x32, 0x46, 0x75, 0x61, 0x58,
+  0x70, 0x68, 0x64, 0x47, 0x6c, 0x76, 0x62, 0x6a, 0x45, 0x51, 0x0a, 0x4d, 0x41, 0x34, 0x47, 0x41,
+  0x31, 0x55, 0x45, 0x43, 0x77, 0x77, 0x48, 0x54, 0x33, 0x4a, 0x6e, 0x56, 0x57, 0x35, 0x70, 0x64,
+  0x44, 0x45, 0x58, 0x4d, 0x42, 0x55, 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x77, 0x77, 0x4f, 0x53,
+  0x57, 0x35, 0x30, 0x5a, 0x58, 0x4a, 0x74, 0x5a, 0x57, 0x52, 0x70, 0x59, 0x58, 0x52, 0x6c, 0x51,
+  0x30, 0x45, 0x58, 0x44, 0x54, 0x49, 0x30, 0x4d, 0x44, 0x6b, 0x78, 0x0a, 0x4d, 0x54, 0x45, 0x79,
+  0x4d, 0x44, 0x51, 0x77, 0x4e, 0x6c, 0x6f, 0x58, 0x44, 0x54, 0x49, 0x30, 0x4d, 0x54, 0x41, 0x78,
+  0x4d, 0x54, 0x45, 0x79, 0x4d, 0x44, 0x51, 0x77, 0x4e, 0x6c, 0x71, 0x67, 0x4d, 0x44, 0x41, 0x75,
+  0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x64, 0x49, 0x77, 0x51, 0x59, 0x4d, 0x42, 0x61, 0x41,
+  0x46, 0x47, 0x57, 0x38, 0x4c, 0x5a, 0x52, 0x72, 0x58, 0x5a, 0x33, 0x68, 0x0a, 0x68, 0x44, 0x55,
+  0x35, 0x44, 0x4c, 0x37, 0x59, 0x4b, 0x38, 0x75, 0x63, 0x73, 0x61, 0x73, 0x41, 0x4d, 0x41, 0x73,
+  0x47, 0x41, 0x31, 0x55, 0x64, 0x46, 0x41, 0x51, 0x45, 0x41, 0x67, 0x49, 0x51, 0x41, 0x6a, 0x41,
+  0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x73,
+  0x46, 0x41, 0x41, 0x4f, 0x43, 0x41, 0x67, 0x45, 0x41, 0x64, 0x2b, 0x45, 0x39, 0x0a, 0x65, 0x56,
+  0x4b, 0x44, 0x58, 0x4a, 0x6b, 0x62, 0x4c, 0x6b, 0x61, 0x65, 0x35, 0x41, 0x42, 0x70, 0x36, 0x4d,
+  0x79, 0x4e, 0x44, 0x43, 0x6d, 0x54, 0x75, 0x39, 0x44, 0x6b, 0x2f, 0x56, 0x75, 0x4b, 0x72, 0x56,
+  0x79, 0x78, 0x4e, 0x39, 0x69, 0x4c, 0x36, 0x52, 0x34, 0x69, 0x62, 0x41, 0x79, 0x52, 0x6a, 0x43,
+  0x2b, 0x7a, 0x57, 0x6e, 0x42, 0x39, 0x6b, 0x66, 0x54, 0x73, 0x4b, 0x36, 0x77, 0x77, 0x0a, 0x6c,
+  0x6a, 0x4b, 0x74, 0x31, 0x30, 0x75, 0x67, 0x47, 0x62, 0x67, 0x76, 0x33, 0x37, 0x72, 0x57, 0x57,
+  0x78, 0x49, 0x45, 0x71, 0x57, 0x72, 0x68, 0x69, 0x35, 0x50, 0x58, 0x4d, 0x76, 0x63, 0x6b, 0x49,
+  0x62, 0x59, 0x47, 0x35, 0x63, 0x77, 0x5a, 0x59, 0x7a, 0x61, 0x2f, 0x4f, 0x6b, 0x36, 0x2b, 0x66,
+  0x34, 0x31, 0x61, 0x2b, 0x76, 0x51, 0x4d, 0x43, 0x48, 0x4a, 0x4a, 0x72, 0x6a, 0x44, 0x58, 0x0a,
+  0x32, 0x41, 0x79, 0x6e, 0x6d, 0x45, 0x2b, 0x6b, 0x45, 0x72, 0x59, 0x52, 0x32, 0x54, 0x6d, 0x61,
+  0x74, 0x4c, 0x7a, 0x49, 0x72, 0x62, 0x4f, 0x4f, 0x32, 0x66, 0x56, 0x61, 0x46, 0x36, 0x6d, 0x2f,
+  0x61, 0x6f, 0x6b, 0x33, 0x2b, 0x70, 0x54, 0x64, 0x2f, 0x39, 0x4b, 0x7a, 0x61, 0x68, 0x52, 0x48,
+  0x4f, 0x34, 0x4e, 0x55, 0x34, 0x78, 0x6b, 0x58, 0x38, 0x4a, 0x74, 0x5a, 0x69, 0x30, 0x4b, 0x54,
+  0x0a, 0x68, 0x56, 0x6e, 0x44, 0x2f, 0x6a, 0x6a, 0x51, 0x36, 0x62, 0x54, 0x33, 0x58, 0x6a, 0x35,
+  0x4a, 0x53, 0x45, 0x38, 0x6f, 0x35, 0x72, 0x59, 0x71, 0x4a, 0x2f, 0x74, 0x4c, 0x55, 0x47, 0x2b,
+  0x4d, 0x4d, 0x39, 0x4e, 0x31, 0x4c, 0x75, 0x32, 0x6a, 0x4f, 0x57, 0x6e, 0x6d, 0x4e, 0x78, 0x55,
+  0x44, 0x72, 0x4b, 0x70, 0x56, 0x6b, 0x6c, 0x59, 0x76, 0x37, 0x59, 0x6e, 0x52, 0x61, 0x33, 0x41,
+  0x64, 0x0a, 0x5a, 0x4d, 0x2b, 0x7a, 0x75, 0x34, 0x35, 0x56, 0x4e, 0x69, 0x76, 0x4b, 0x4f, 0x30,
+  0x79, 0x59, 0x33, 0x7a, 0x35, 0x74, 0x73, 0x4a, 0x74, 0x48, 0x48, 0x34, 0x36, 0x4a, 0x69, 0x46,
+  0x49, 0x79, 0x54, 0x68, 0x43, 0x67, 0x35, 0x42, 0x6c, 0x68, 0x70, 0x47, 0x51, 0x6a, 0x54, 0x41,
+  0x73, 0x72, 0x68, 0x64, 0x49, 0x61, 0x47, 0x4d, 0x50, 0x64, 0x39, 0x49, 0x6d, 0x58, 0x73, 0x44,
+  0x65, 0x2f, 0x0a, 0x4c, 0x35, 0x51, 0x79, 0x58, 0x41, 0x4f, 0x58, 0x62, 0x4e, 0x31, 0x33, 0x74,
+  0x39, 0x64, 0x74, 0x72, 0x72, 0x76, 0x76, 0x70, 0x6b, 0x38, 0x48, 0x34, 0x5a, 0x48, 0x43, 0x73,
+  0x61, 0x4f, 0x39, 0x53, 0x36, 0x36, 0x43, 0x43, 0x67, 0x4a, 0x7a, 0x59, 0x47, 0x55, 0x47, 0x34,
+  0x75, 0x54, 0x35, 0x79, 0x61, 0x54, 0x61, 0x75, 0x54, 0x34, 0x50, 0x67, 0x77, 0x6b, 0x2f, 0x78,
+  0x68, 0x32, 0x55, 0x0a, 0x74, 0x59, 0x52, 0x72, 0x4f, 0x39, 0x2b, 0x72, 0x51, 0x50, 0x4d, 0x62,
+  0x4d, 0x45, 0x79, 0x33, 0x52, 0x74, 0x45, 0x67, 0x44, 0x79, 0x4c, 0x59, 0x70, 0x38, 0x6b, 0x69,
+  0x6d, 0x44, 0x77, 0x71, 0x5a, 0x6d, 0x31, 0x45, 0x53, 0x72, 0x4a, 0x6e, 0x51, 0x6b, 0x7a, 0x71,
+  0x76, 0x64, 0x78, 0x74, 0x46, 0x5a, 0x64, 0x54, 0x4b, 0x7a, 0x62, 0x32, 0x2b, 0x2b, 0x46, 0x6c,
+  0x79, 0x5a, 0x45, 0x73, 0x0a, 0x56, 0x6d, 0x51, 0x73, 0x78, 0x70, 0x75, 0x4d, 0x4c, 0x67, 0x6a,
+  0x73, 0x57, 0x35, 0x30, 0x49, 0x39, 0x2b, 0x46, 0x2f, 0x63, 0x68, 0x6a, 0x48, 0x37, 0x64, 0x77,
+  0x65, 0x77, 0x37, 0x36, 0x39, 0x72, 0x50, 0x4c, 0x44, 0x62, 0x45, 0x79, 0x36, 0x4d, 0x6f, 0x74,
+  0x4c, 0x62, 0x72, 0x67, 0x48, 0x69, 0x61, 0x66, 0x67, 0x44, 0x54, 0x61, 0x37, 0x6a, 0x76, 0x52,
+  0x46, 0x55, 0x36, 0x54, 0x56, 0x0a, 0x78, 0x2f, 0x77, 0x68, 0x61, 0x6e, 0x50, 0x2f, 0x7a, 0x59,
+  0x34, 0x65, 0x49, 0x4c, 0x72, 0x4f, 0x62, 0x43, 0x7a, 0x31, 0x4e, 0x50, 0x4c, 0x52, 0x6f, 0x35,
+  0x70, 0x54, 0x6c, 0x6d, 0x49, 0x7a, 0x58, 0x36, 0x4d, 0x2f, 0x37, 0x79, 0x51, 0x45, 0x79, 0x34,
+  0x34, 0x6a, 0x2f, 0x4a, 0x39, 0x53, 0x35, 0x62, 0x4d, 0x6a, 0x4e, 0x67, 0x2b, 0x75, 0x36, 0x72,
+  0x43, 0x30, 0x54, 0x77, 0x53, 0x55, 0x0a, 0x6b, 0x64, 0x41, 0x68, 0x68, 0x64, 0x61, 0x48, 0x4e,
+  0x75, 0x52, 0x4d, 0x35, 0x6a, 0x4f, 0x68, 0x6a, 0x57, 0x35, 0x4d, 0x46, 0x63, 0x71, 0x56, 0x36,
+  0x4e, 0x35, 0x4d, 0x46, 0x6e, 0x34, 0x38, 0x69, 0x79, 0x52, 0x4b, 0x46, 0x54, 0x50, 0x78, 0x37,
+  0x54, 0x4b, 0x68, 0x46, 0x38, 0x34, 0x6d, 0x64, 0x53, 0x2b, 0x56, 0x39, 0x2b, 0x43, 0x47, 0x52,
+  0x51, 0x53, 0x65, 0x46, 0x70, 0x70, 0x38, 0x0a, 0x4a, 0x6e, 0x69, 0x49, 0x73, 0x6a, 0x71, 0x50,
+  0x59, 0x6a, 0x68, 0x6e, 0x34, 0x6f, 0x74, 0x38, 0x52, 0x37, 0x6b, 0x64, 0x68, 0x79, 0x74, 0x38,
+  0x31, 0x69, 0x31, 0x56, 0x53, 0x6e, 0x78, 0x33, 0x73, 0x70, 0x74, 0x33, 0x7a, 0x77, 0x30, 0x3d,
+  0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x58, 0x35, 0x30, 0x39, 0x20, 0x43,
+  0x52, 0x4c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+
+#define APPLICATION_KEY_DER_LENGTH 1704
+UA_Byte APPLICATION_KEY_DER_DATA[1704] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41,
+  0x54, 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x45,
+  0x76, 0x67, 0x49, 0x42, 0x41, 0x44, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47,
+  0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x45, 0x46, 0x41, 0x41, 0x53, 0x43, 0x42, 0x4b, 0x67, 0x77,
+  0x67, 0x67, 0x53, 0x6b, 0x41, 0x67, 0x45, 0x41, 0x41, 0x6f, 0x49, 0x42, 0x41, 0x51, 0x44, 0x55,
+  0x55, 0x6a, 0x55, 0x6c, 0x68, 0x39, 0x46, 0x73, 0x6f, 0x70, 0x49, 0x6d, 0x0a, 0x50, 0x4b, 0x5a,
+  0x44, 0x59, 0x66, 0x46, 0x75, 0x76, 0x2f, 0x58, 0x70, 0x46, 0x68, 0x58, 0x55, 0x36, 0x63, 0x4f,
+  0x74, 0x4f, 0x30, 0x6e, 0x75, 0x65, 0x79, 0x4d, 0x4b, 0x65, 0x5a, 0x4a, 0x39, 0x66, 0x50, 0x78,
+  0x4b, 0x36, 0x52, 0x62, 0x4e, 0x49, 0x52, 0x65, 0x7a, 0x6e, 0x79, 0x78, 0x61, 0x44, 0x2b, 0x44,
+  0x2f, 0x4d, 0x6c, 0x72, 0x46, 0x44, 0x54, 0x73, 0x7a, 0x44, 0x66, 0x71, 0x4b, 0x0a, 0x4c, 0x61,
+  0x50, 0x70, 0x4d, 0x42, 0x49, 0x52, 0x44, 0x48, 0x76, 0x32, 0x51, 0x52, 0x68, 0x59, 0x73, 0x52,
+  0x49, 0x57, 0x30, 0x61, 0x69, 0x46, 0x70, 0x66, 0x70, 0x38, 0x38, 0x30, 0x68, 0x53, 0x74, 0x42,
+  0x41, 0x69, 0x52, 0x2f, 0x43, 0x59, 0x4f, 0x73, 0x37, 0x6e, 0x34, 0x34, 0x5a, 0x66, 0x73, 0x50,
+  0x6f, 0x75, 0x75, 0x4f, 0x34, 0x66, 0x79, 0x33, 0x6a, 0x5a, 0x6f, 0x37, 0x79, 0x75, 0x0a, 0x35,
+  0x6e, 0x65, 0x4c, 0x4f, 0x47, 0x46, 0x32, 0x72, 0x75, 0x73, 0x72, 0x7a, 0x75, 0x42, 0x35, 0x62,
+  0x45, 0x6f, 0x71, 0x44, 0x58, 0x6c, 0x67, 0x62, 0x7a, 0x35, 0x74, 0x31, 0x49, 0x4f, 0x54, 0x58,
+  0x49, 0x4d, 0x62, 0x62, 0x52, 0x52, 0x41, 0x4f, 0x39, 0x63, 0x52, 0x54, 0x50, 0x48, 0x75, 0x72,
+  0x4c, 0x67, 0x53, 0x73, 0x45, 0x63, 0x37, 0x6e, 0x58, 0x6e, 0x35, 0x79, 0x43, 0x59, 0x37, 0x0a,
+  0x68, 0x54, 0x2f, 0x34, 0x6c, 0x2f, 0x50, 0x61, 0x7a, 0x65, 0x70, 0x68, 0x70, 0x4e, 0x77, 0x6b,
+  0x33, 0x44, 0x72, 0x31, 0x4d, 0x4b, 0x53, 0x4a, 0x70, 0x32, 0x42, 0x59, 0x69, 0x34, 0x73, 0x45,
+  0x7a, 0x6a, 0x77, 0x4b, 0x69, 0x44, 0x4f, 0x41, 0x4b, 0x65, 0x67, 0x58, 0x6a, 0x52, 0x6f, 0x4d,
+  0x6a, 0x79, 0x42, 0x64, 0x61, 0x6b, 0x56, 0x63, 0x67, 0x62, 0x35, 0x35, 0x6d, 0x77, 0x64, 0x7a,
+  0x0a, 0x48, 0x30, 0x65, 0x36, 0x78, 0x64, 0x70, 0x64, 0x71, 0x45, 0x79, 0x49, 0x42, 0x6b, 0x4f,
+  0x48, 0x39, 0x65, 0x51, 0x67, 0x32, 0x32, 0x73, 0x2b, 0x75, 0x68, 0x70, 0x39, 0x38, 0x56, 0x71,
+  0x46, 0x41, 0x35, 0x7a, 0x6b, 0x52, 0x61, 0x32, 0x73, 0x74, 0x74, 0x35, 0x58, 0x36, 0x62, 0x76,
+  0x53, 0x37, 0x4d, 0x62, 0x33, 0x47, 0x31, 0x42, 0x54, 0x66, 0x47, 0x4e, 0x4f, 0x7a, 0x4f, 0x5a,
+  0x55, 0x0a, 0x42, 0x6f, 0x56, 0x4a, 0x2f, 0x30, 0x74, 0x50, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41,
+  0x45, 0x43, 0x67, 0x67, 0x45, 0x41, 0x55, 0x52, 0x4e, 0x52, 0x4d, 0x78, 0x4d, 0x68, 0x62, 0x39,
+  0x50, 0x47, 0x62, 0x69, 0x35, 0x7a, 0x71, 0x4d, 0x42, 0x69, 0x51, 0x70, 0x47, 0x76, 0x74, 0x41,
+  0x46, 0x59, 0x64, 0x64, 0x53, 0x4d, 0x41, 0x58, 0x37, 0x6c, 0x31, 0x4e, 0x69, 0x56, 0x67, 0x56,
+  0x37, 0x36, 0x0a, 0x42, 0x73, 0x77, 0x75, 0x78, 0x4f, 0x59, 0x72, 0x37, 0x45, 0x6d, 0x71, 0x4e,
+  0x4d, 0x39, 0x66, 0x7a, 0x73, 0x5a, 0x49, 0x65, 0x76, 0x70, 0x39, 0x2b, 0x63, 0x66, 0x37, 0x4a,
+  0x70, 0x77, 0x38, 0x59, 0x76, 0x35, 0x5a, 0x6e, 0x47, 0x5a, 0x63, 0x52, 0x38, 0x46, 0x57, 0x4a,
+  0x71, 0x73, 0x6c, 0x77, 0x6c, 0x78, 0x66, 0x56, 0x58, 0x4a, 0x61, 0x34, 0x53, 0x6f, 0x48, 0x74,
+  0x43, 0x58, 0x73, 0x0a, 0x4a, 0x4a, 0x53, 0x59, 0x6f, 0x70, 0x61, 0x49, 0x38, 0x34, 0x42, 0x6c,
+  0x57, 0x4e, 0x77, 0x6a, 0x69, 0x43, 0x2f, 0x61, 0x34, 0x50, 0x4f, 0x43, 0x44, 0x6f, 0x63, 0x53,
+  0x6a, 0x7a, 0x7a, 0x38, 0x68, 0x47, 0x63, 0x43, 0x47, 0x42, 0x6e, 0x2f, 0x38, 0x61, 0x4f, 0x4b,
+  0x72, 0x74, 0x42, 0x52, 0x48, 0x46, 0x79, 0x7a, 0x46, 0x30, 0x72, 0x4d, 0x34, 0x66, 0x75, 0x6f,
+  0x77, 0x61, 0x51, 0x57, 0x0a, 0x47, 0x71, 0x42, 0x77, 0x36, 0x43, 0x46, 0x41, 0x4a, 0x6a, 0x46,
+  0x33, 0x64, 0x4e, 0x2f, 0x61, 0x4d, 0x66, 0x7a, 0x71, 0x35, 0x37, 0x42, 0x32, 0x67, 0x69, 0x67,
+  0x49, 0x32, 0x36, 0x41, 0x4b, 0x39, 0x70, 0x62, 0x32, 0x5a, 0x4c, 0x74, 0x4f, 0x45, 0x59, 0x49,
+  0x52, 0x2b, 0x46, 0x51, 0x56, 0x4b, 0x33, 0x57, 0x6f, 0x36, 0x75, 0x66, 0x2f, 0x48, 0x67, 0x59,
+  0x4a, 0x47, 0x38, 0x2b, 0x75, 0x0a, 0x43, 0x33, 0x2f, 0x67, 0x70, 0x4d, 0x5a, 0x49, 0x58, 0x6a,
+  0x67, 0x6b, 0x66, 0x30, 0x78, 0x74, 0x32, 0x41, 0x37, 0x39, 0x2f, 0x54, 0x74, 0x30, 0x37, 0x69,
+  0x39, 0x62, 0x73, 0x5a, 0x4b, 0x54, 0x6a, 0x67, 0x78, 0x76, 0x2b, 0x73, 0x41, 0x70, 0x32, 0x69,
+  0x79, 0x74, 0x6a, 0x6f, 0x6e, 0x34, 0x65, 0x74, 0x41, 0x4d, 0x49, 0x49, 0x49, 0x70, 0x58, 0x36,
+  0x4c, 0x46, 0x75, 0x68, 0x6f, 0x68, 0x0a, 0x52, 0x54, 0x76, 0x6e, 0x45, 0x57, 0x2f, 0x4f, 0x5a,
+  0x37, 0x4a, 0x70, 0x44, 0x32, 0x53, 0x35, 0x77, 0x50, 0x37, 0x4d, 0x54, 0x36, 0x48, 0x4c, 0x2b,
+  0x72, 0x35, 0x50, 0x6c, 0x64, 0x52, 0x47, 0x39, 0x35, 0x63, 0x61, 0x39, 0x55, 0x47, 0x5a, 0x69,
+  0x51, 0x4b, 0x42, 0x67, 0x51, 0x44, 0x65, 0x72, 0x77, 0x66, 0x59, 0x63, 0x72, 0x37, 0x30, 0x75,
+  0x51, 0x59, 0x55, 0x4d, 0x74, 0x32, 0x53, 0x0a, 0x66, 0x51, 0x54, 0x46, 0x31, 0x77, 0x39, 0x68,
+  0x36, 0x66, 0x36, 0x75, 0x6d, 0x41, 0x77, 0x31, 0x45, 0x51, 0x31, 0x52, 0x42, 0x35, 0x71, 0x38,
+  0x6b, 0x6a, 0x6d, 0x61, 0x41, 0x59, 0x62, 0x2b, 0x32, 0x2b, 0x75, 0x69, 0x59, 0x70, 0x4c, 0x53,
+  0x4b, 0x64, 0x56, 0x67, 0x4a, 0x66, 0x44, 0x38, 0x67, 0x37, 0x49, 0x39, 0x32, 0x64, 0x76, 0x4f,
+  0x78, 0x5a, 0x39, 0x66, 0x59, 0x6a, 0x73, 0x59, 0x0a, 0x6a, 0x56, 0x4a, 0x33, 0x6e, 0x68, 0x59,
+  0x42, 0x44, 0x79, 0x6a, 0x73, 0x6c, 0x2b, 0x71, 0x2b, 0x73, 0x78, 0x68, 0x56, 0x48, 0x61, 0x37,
+  0x44, 0x2f, 0x61, 0x44, 0x31, 0x66, 0x47, 0x4f, 0x48, 0x4a, 0x2b, 0x79, 0x4c, 0x44, 0x79, 0x75,
+  0x49, 0x49, 0x41, 0x47, 0x4d, 0x79, 0x51, 0x31, 0x47, 0x51, 0x36, 0x30, 0x37, 0x48, 0x47, 0x30,
+  0x56, 0x38, 0x61, 0x50, 0x69, 0x49, 0x34, 0x59, 0x47, 0x0a, 0x48, 0x37, 0x6b, 0x49, 0x49, 0x6b,
+  0x31, 0x77, 0x37, 0x39, 0x52, 0x74, 0x46, 0x71, 0x67, 0x39, 0x6b, 0x48, 0x34, 0x68, 0x30, 0x4e,
+  0x77, 0x48, 0x46, 0x77, 0x4b, 0x42, 0x67, 0x51, 0x44, 0x30, 0x46, 0x6b, 0x66, 0x2f, 0x4f, 0x64,
+  0x74, 0x48, 0x57, 0x6a, 0x6c, 0x72, 0x2f, 0x76, 0x54, 0x77, 0x68, 0x73, 0x4e, 0x36, 0x37, 0x66,
+  0x54, 0x74, 0x2f, 0x4c, 0x62, 0x6d, 0x65, 0x53, 0x41, 0x45, 0x0a, 0x57, 0x5a, 0x39, 0x58, 0x79,
+  0x74, 0x79, 0x4c, 0x64, 0x5a, 0x76, 0x46, 0x67, 0x2b, 0x64, 0x39, 0x4f, 0x55, 0x65, 0x31, 0x42,
+  0x54, 0x31, 0x61, 0x41, 0x31, 0x56, 0x50, 0x72, 0x59, 0x65, 0x4c, 0x35, 0x69, 0x6d, 0x30, 0x52,
+  0x6c, 0x78, 0x67, 0x57, 0x47, 0x53, 0x36, 0x65, 0x78, 0x67, 0x71, 0x6d, 0x73, 0x71, 0x2b, 0x41,
+  0x79, 0x6c, 0x32, 0x38, 0x6f, 0x41, 0x57, 0x56, 0x2f, 0x73, 0x46, 0x0a, 0x4a, 0x45, 0x47, 0x71,
+  0x52, 0x66, 0x6c, 0x48, 0x41, 0x32, 0x4f, 0x77, 0x72, 0x31, 0x62, 0x53, 0x63, 0x55, 0x6e, 0x55,
+  0x6f, 0x76, 0x57, 0x54, 0x79, 0x72, 0x4c, 0x70, 0x30, 0x4a, 0x31, 0x52, 0x51, 0x57, 0x6d, 0x52,
+  0x7a, 0x4d, 0x53, 0x4d, 0x71, 0x74, 0x34, 0x48, 0x65, 0x58, 0x6f, 0x67, 0x57, 0x4a, 0x6b, 0x73,
+  0x62, 0x6e, 0x6f, 0x4c, 0x6d, 0x49, 0x39, 0x35, 0x56, 0x64, 0x69, 0x64, 0x0a, 0x58, 0x70, 0x4a,
+  0x43, 0x64, 0x57, 0x79, 0x41, 0x69, 0x51, 0x4b, 0x42, 0x67, 0x46, 0x68, 0x4b, 0x37, 0x41, 0x42,
+  0x74, 0x56, 0x72, 0x74, 0x76, 0x6c, 0x54, 0x4a, 0x7a, 0x44, 0x4a, 0x6c, 0x6c, 0x69, 0x6e, 0x76,
+  0x72, 0x44, 0x6f, 0x56, 0x54, 0x49, 0x78, 0x45, 0x55, 0x35, 0x6c, 0x6f, 0x77, 0x48, 0x61, 0x69,
+  0x51, 0x4c, 0x46, 0x45, 0x79, 0x5a, 0x54, 0x5a, 0x6a, 0x2f, 0x71, 0x4f, 0x55, 0x0a, 0x6a, 0x54,
+  0x52, 0x41, 0x67, 0x31, 0x68, 0x6a, 0x44, 0x2b, 0x42, 0x6b, 0x69, 0x73, 0x32, 0x45, 0x5a, 0x69,
+  0x72, 0x52, 0x38, 0x36, 0x35, 0x6a, 0x65, 0x78, 0x4a, 0x31, 0x76, 0x31, 0x71, 0x33, 0x78, 0x67,
+  0x66, 0x35, 0x6e, 0x56, 0x33, 0x6b, 0x4a, 0x65, 0x54, 0x52, 0x51, 0x31, 0x6c, 0x44, 0x5a, 0x35,
+  0x56, 0x77, 0x42, 0x48, 0x68, 0x66, 0x57, 0x75, 0x2b, 0x61, 0x31, 0x31, 0x65, 0x69, 0x0a, 0x67,
+  0x38, 0x36, 0x4c, 0x51, 0x45, 0x5a, 0x6a, 0x38, 0x6c, 0x6c, 0x67, 0x36, 0x69, 0x74, 0x2b, 0x37,
+  0x2f, 0x4f, 0x74, 0x44, 0x4b, 0x2b, 0x54, 0x74, 0x4e, 0x67, 0x59, 0x48, 0x36, 0x37, 0x54, 0x36,
+  0x79, 0x69, 0x48, 0x65, 0x55, 0x38, 0x62, 0x4f, 0x49, 0x33, 0x63, 0x57, 0x75, 0x36, 0x32, 0x47,
+  0x4e, 0x7a, 0x4e, 0x6c, 0x45, 0x41, 0x58, 0x41, 0x6f, 0x47, 0x42, 0x41, 0x4d, 0x42, 0x58, 0x0a,
+  0x43, 0x6e, 0x62, 0x78, 0x5a, 0x58, 0x7a, 0x4e, 0x65, 0x54, 0x42, 0x44, 0x34, 0x55, 0x6e, 0x6b,
+  0x4f, 0x41, 0x67, 0x58, 0x6d, 0x51, 0x6b, 0x73, 0x4f, 0x67, 0x68, 0x56, 0x62, 0x45, 0x68, 0x68,
+  0x51, 0x7a, 0x49, 0x51, 0x4e, 0x6b, 0x68, 0x69, 0x37, 0x64, 0x50, 0x77, 0x42, 0x43, 0x74, 0x6d,
+  0x52, 0x72, 0x34, 0x37, 0x6d, 0x63, 0x50, 0x6a, 0x6d, 0x6f, 0x64, 0x46, 0x36, 0x2b, 0x6a, 0x75,
+  0x0a, 0x2f, 0x76, 0x41, 0x43, 0x2f, 0x65, 0x6f, 0x68, 0x33, 0x59, 0x59, 0x68, 0x56, 0x38, 0x4c,
+  0x43, 0x35, 0x58, 0x35, 0x6a, 0x79, 0x58, 0x6e, 0x6b, 0x7a, 0x39, 0x42, 0x4c, 0x6c, 0x67, 0x2f,
+  0x51, 0x4b, 0x54, 0x70, 0x2f, 0x46, 0x31, 0x62, 0x42, 0x4d, 0x66, 0x35, 0x5a, 0x76, 0x4f, 0x58,
+  0x70, 0x78, 0x63, 0x38, 0x63, 0x64, 0x72, 0x33, 0x32, 0x58, 0x5a, 0x50, 0x6f, 0x41, 0x76, 0x2b,
+  0x7a, 0x0a, 0x74, 0x76, 0x66, 0x67, 0x54, 0x77, 0x57, 0x31, 0x34, 0x32, 0x34, 0x71, 0x61, 0x48,
+  0x55, 0x79, 0x75, 0x38, 0x6b, 0x4b, 0x61, 0x58, 0x76, 0x58, 0x78, 0x54, 0x39, 0x4d, 0x79, 0x58,
+  0x77, 0x41, 0x75, 0x4f, 0x70, 0x4c, 0x30, 0x36, 0x74, 0x5a, 0x41, 0x6f, 0x47, 0x42, 0x41, 0x4e,
+  0x75, 0x61, 0x68, 0x64, 0x65, 0x75, 0x61, 0x51, 0x6d, 0x6d, 0x6f, 0x6f, 0x51, 0x72, 0x70, 0x38,
+  0x52, 0x45, 0x0a, 0x46, 0x6a, 0x63, 0x53, 0x6e, 0x7a, 0x64, 0x43, 0x41, 0x64, 0x50, 0x37, 0x79,
+  0x74, 0x63, 0x58, 0x71, 0x77, 0x51, 0x62, 0x4c, 0x53, 0x64, 0x76, 0x48, 0x54, 0x73, 0x54, 0x57,
+  0x71, 0x64, 0x6b, 0x67, 0x34, 0x55, 0x70, 0x51, 0x5a, 0x4c, 0x4d, 0x4f, 0x61, 0x37, 0x32, 0x4b,
+  0x6b, 0x2b, 0x47, 0x42, 0x77, 0x67, 0x45, 0x2f, 0x6c, 0x39, 0x4f, 0x6f, 0x61, 0x32, 0x37, 0x65,
+  0x69, 0x79, 0x45, 0x0a, 0x38, 0x4f, 0x75, 0x43, 0x65, 0x55, 0x41, 0x32, 0x37, 0x57, 0x6b, 0x55,
+  0x54, 0x31, 0x31, 0x6f, 0x7a, 0x58, 0x65, 0x43, 0x72, 0x61, 0x55, 0x71, 0x4f, 0x55, 0x43, 0x4e,
+  0x6e, 0x33, 0x37, 0x4a, 0x46, 0x30, 0x43, 0x31, 0x77, 0x51, 0x63, 0x4d, 0x7a, 0x76, 0x65, 0x69,
+  0x69, 0x79, 0x45, 0x58, 0x33, 0x61, 0x67, 0x64, 0x51, 0x6f, 0x57, 0x67, 0x34, 0x55, 0x52, 0x67,
+  0x37, 0x36, 0x79, 0x4d, 0x0a, 0x30, 0x48, 0x2f, 0x48, 0x45, 0x77, 0x73, 0x33, 0x46, 0x45, 0x56,
+  0x55, 0x55, 0x35, 0x6a, 0x6f, 0x43, 0x69, 0x79, 0x51, 0x2f, 0x65, 0x65, 0x30, 0x0a, 0x2d, 0x2d,
+  0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b,
+  0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
+};
+
+#define APPLICATION_CERT_DER_LENGTH 1732
+UA_Byte APPLICATION_CERT_DER_DATA[1732] = {
+  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49,
+  0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x45,
+  0x30, 0x6a, 0x43, 0x43, 0x41, 0x72, 0x71, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x55,
+  0x43, 0x49, 0x69, 0x47, 0x4f, 0x65, 0x66, 0x54, 0x65, 0x4c, 0x4b, 0x4a, 0x70, 0x50, 0x69, 0x4c,
+  0x39, 0x6e, 0x45, 0x41, 0x77, 0x33, 0x5a, 0x34, 0x44, 0x4b, 0x45, 0x77, 0x44, 0x51, 0x59, 0x4a,
+  0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x4c, 0x0a, 0x42, 0x51, 0x41,
+  0x77, 0x62, 0x6a, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x68, 0x4d,
+  0x43, 0x52, 0x45, 0x55, 0x78, 0x44, 0x6a, 0x41, 0x4d, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x67,
+  0x4d, 0x42, 0x56, 0x4e, 0x30, 0x59, 0x58, 0x52, 0x6c, 0x4d, 0x51, 0x30, 0x77, 0x43, 0x77, 0x59,
+  0x44, 0x56, 0x51, 0x51, 0x48, 0x44, 0x41, 0x52, 0x44, 0x61, 0x58, 0x52, 0x35, 0x0a, 0x4d, 0x52,
+  0x55, 0x77, 0x45, 0x77, 0x59, 0x44, 0x56, 0x51, 0x51, 0x4b, 0x44, 0x41, 0x78, 0x50, 0x63, 0x6d,
+  0x64, 0x68, 0x62, 0x6d, 0x6c, 0x36, 0x59, 0x58, 0x52, 0x70, 0x62, 0x32, 0x34, 0x78, 0x45, 0x44,
+  0x41, 0x4f, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x73, 0x4d, 0x42, 0x30, 0x39, 0x79, 0x5a, 0x31,
+  0x56, 0x75, 0x61, 0x58, 0x51, 0x78, 0x46, 0x7a, 0x41, 0x56, 0x42, 0x67, 0x4e, 0x56, 0x0a, 0x42,
+  0x41, 0x4d, 0x4d, 0x44, 0x6b, 0x6c, 0x75, 0x64, 0x47, 0x56, 0x79, 0x62, 0x57, 0x56, 0x6b, 0x61,
+  0x57, 0x46, 0x30, 0x5a, 0x55, 0x4e, 0x42, 0x4d, 0x42, 0x34, 0x58, 0x44, 0x54, 0x49, 0x30, 0x4d,
+  0x44, 0x6b, 0x78, 0x4d, 0x54, 0x45, 0x30, 0x4d, 0x44, 0x41, 0x31, 0x4e, 0x46, 0x6f, 0x58, 0x44,
+  0x54, 0x4d, 0x30, 0x4d, 0x44, 0x6b, 0x77, 0x4f, 0x54, 0x45, 0x30, 0x4d, 0x44, 0x41, 0x31, 0x0a,
+  0x4e, 0x46, 0x6f, 0x77, 0x61, 0x7a, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45,
+  0x42, 0x68, 0x4d, 0x43, 0x52, 0x45, 0x55, 0x78, 0x44, 0x6a, 0x41, 0x4d, 0x42, 0x67, 0x4e, 0x56,
+  0x42, 0x41, 0x67, 0x4d, 0x42, 0x56, 0x4e, 0x30, 0x59, 0x58, 0x52, 0x6c, 0x4d, 0x51, 0x30, 0x77,
+  0x43, 0x77, 0x59, 0x44, 0x56, 0x51, 0x51, 0x48, 0x44, 0x41, 0x52, 0x44, 0x61, 0x58, 0x52, 0x35,
+  0x0a, 0x4d, 0x52, 0x55, 0x77, 0x45, 0x77, 0x59, 0x44, 0x56, 0x51, 0x51, 0x4b, 0x44, 0x41, 0x78,
+  0x50, 0x63, 0x6d, 0x64, 0x68, 0x62, 0x6d, 0x6c, 0x36, 0x59, 0x58, 0x52, 0x70, 0x62, 0x32, 0x34,
+  0x78, 0x45, 0x44, 0x41, 0x4f, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x73, 0x4d, 0x42, 0x30, 0x39,
+  0x79, 0x5a, 0x31, 0x56, 0x75, 0x61, 0x58, 0x51, 0x78, 0x46, 0x44, 0x41, 0x53, 0x42, 0x67, 0x4e,
+  0x56, 0x0a, 0x42, 0x41, 0x4d, 0x4d, 0x43, 0x30, 0x46, 0x77, 0x63, 0x47, 0x78, 0x70, 0x59, 0x32,
+  0x46, 0x30, 0x61, 0x57, 0x39, 0x75, 0x4d, 0x49, 0x49, 0x42, 0x49, 0x6a, 0x41, 0x4e, 0x42, 0x67,
+  0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x45, 0x46, 0x41, 0x41,
+  0x4f, 0x43, 0x41, 0x51, 0x38, 0x41, 0x4d, 0x49, 0x49, 0x42, 0x43, 0x67, 0x4b, 0x43, 0x41, 0x51,
+  0x45, 0x41, 0x0a, 0x31, 0x46, 0x49, 0x31, 0x4a, 0x59, 0x66, 0x52, 0x62, 0x4b, 0x4b, 0x53, 0x4a,
+  0x6a, 0x79, 0x6d, 0x51, 0x32, 0x48, 0x78, 0x62, 0x72, 0x2f, 0x31, 0x36, 0x52, 0x59, 0x56, 0x31,
+  0x4f, 0x6e, 0x44, 0x72, 0x54, 0x74, 0x4a, 0x37, 0x6e, 0x73, 0x6a, 0x43, 0x6e, 0x6d, 0x53, 0x66,
+  0x58, 0x7a, 0x38, 0x53, 0x75, 0x6b, 0x57, 0x7a, 0x53, 0x45, 0x58, 0x73, 0x35, 0x38, 0x73, 0x57,
+  0x67, 0x2f, 0x67, 0x0a, 0x2f, 0x7a, 0x4a, 0x61, 0x78, 0x51, 0x30, 0x37, 0x4d, 0x77, 0x33, 0x36,
+  0x69, 0x69, 0x32, 0x6a, 0x36, 0x54, 0x41, 0x53, 0x45, 0x51, 0x78, 0x37, 0x39, 0x6b, 0x45, 0x59,
+  0x57, 0x4c, 0x45, 0x53, 0x46, 0x74, 0x47, 0x6f, 0x68, 0x61, 0x58, 0x36, 0x66, 0x50, 0x4e, 0x49,
+  0x55, 0x72, 0x51, 0x51, 0x49, 0x6b, 0x66, 0x77, 0x6d, 0x44, 0x72, 0x4f, 0x35, 0x2b, 0x4f, 0x47,
+  0x58, 0x37, 0x44, 0x36, 0x0a, 0x4c, 0x72, 0x6a, 0x75, 0x48, 0x38, 0x74, 0x34, 0x32, 0x61, 0x4f,
+  0x38, 0x72, 0x75, 0x5a, 0x33, 0x69, 0x7a, 0x68, 0x68, 0x64, 0x71, 0x37, 0x72, 0x4b, 0x38, 0x37,
+  0x67, 0x65, 0x57, 0x78, 0x4b, 0x4b, 0x67, 0x31, 0x35, 0x59, 0x47, 0x38, 0x2b, 0x62, 0x64, 0x53,
+  0x44, 0x6b, 0x31, 0x79, 0x44, 0x47, 0x32, 0x30, 0x55, 0x51, 0x44, 0x76, 0x58, 0x45, 0x55, 0x7a,
+  0x78, 0x37, 0x71, 0x79, 0x34, 0x0a, 0x45, 0x72, 0x42, 0x48, 0x4f, 0x35, 0x31, 0x35, 0x2b, 0x63,
+  0x67, 0x6d, 0x4f, 0x34, 0x55, 0x2f, 0x2b, 0x4a, 0x66, 0x7a, 0x32, 0x73, 0x33, 0x71, 0x59, 0x61,
+  0x54, 0x63, 0x4a, 0x4e, 0x77, 0x36, 0x39, 0x54, 0x43, 0x6b, 0x69, 0x61, 0x64, 0x67, 0x57, 0x49,
+  0x75, 0x4c, 0x42, 0x4d, 0x34, 0x38, 0x43, 0x6f, 0x67, 0x7a, 0x67, 0x43, 0x6e, 0x6f, 0x46, 0x34,
+  0x30, 0x61, 0x44, 0x49, 0x38, 0x67, 0x0a, 0x58, 0x57, 0x70, 0x46, 0x58, 0x49, 0x47, 0x2b, 0x65,
+  0x5a, 0x73, 0x48, 0x63, 0x78, 0x39, 0x48, 0x75, 0x73, 0x58, 0x61, 0x58, 0x61, 0x68, 0x4d, 0x69,
+  0x41, 0x5a, 0x44, 0x68, 0x2f, 0x58, 0x6b, 0x49, 0x4e, 0x74, 0x72, 0x50, 0x72, 0x6f, 0x61, 0x66,
+  0x66, 0x46, 0x61, 0x68, 0x51, 0x4f, 0x63, 0x35, 0x45, 0x57, 0x74, 0x72, 0x4c, 0x62, 0x65, 0x56,
+  0x2b, 0x6d, 0x37, 0x30, 0x75, 0x7a, 0x47, 0x0a, 0x39, 0x78, 0x74, 0x51, 0x55, 0x33, 0x78, 0x6a,
+  0x54, 0x73, 0x7a, 0x6d, 0x56, 0x41, 0x61, 0x46, 0x53, 0x66, 0x39, 0x4c, 0x54, 0x77, 0x49, 0x44,
+  0x41, 0x51, 0x41, 0x42, 0x6f, 0x32, 0x73, 0x77, 0x61, 0x54, 0x41, 0x6e, 0x42, 0x67, 0x4e, 0x56,
+  0x48, 0x52, 0x45, 0x45, 0x49, 0x44, 0x41, 0x65, 0x68, 0x68, 0x78, 0x31, 0x63, 0x6d, 0x34, 0x36,
+  0x64, 0x57, 0x35, 0x6a, 0x62, 0x32, 0x35, 0x6d, 0x0a, 0x61, 0x57, 0x64, 0x31, 0x63, 0x6d, 0x56,
+  0x6b, 0x4f, 0x6d, 0x46, 0x77, 0x63, 0x47, 0x78, 0x70, 0x59, 0x32, 0x46, 0x30, 0x61, 0x57, 0x39,
+  0x75, 0x4d, 0x42, 0x30, 0x47, 0x41, 0x31, 0x55, 0x64, 0x44, 0x67, 0x51, 0x57, 0x42, 0x42, 0x53,
+  0x4e, 0x74, 0x2f, 0x68, 0x36, 0x7a, 0x4f, 0x62, 0x54, 0x76, 0x46, 0x33, 0x7a, 0x67, 0x75, 0x65,
+  0x5a, 0x75, 0x44, 0x75, 0x38, 0x51, 0x43, 0x4a, 0x30, 0x0a, 0x6f, 0x7a, 0x41, 0x66, 0x42, 0x67,
+  0x4e, 0x56, 0x48, 0x53, 0x4d, 0x45, 0x47, 0x44, 0x41, 0x57, 0x67, 0x42, 0x52, 0x6c, 0x76, 0x43,
+  0x32, 0x55, 0x61, 0x31, 0x32, 0x64, 0x34, 0x59, 0x51, 0x31, 0x4f, 0x51, 0x79, 0x2b, 0x32, 0x43,
+  0x76, 0x4c, 0x6e, 0x4c, 0x47, 0x72, 0x41, 0x44, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b,
+  0x69, 0x47, 0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x73, 0x46, 0x0a, 0x41, 0x41, 0x4f, 0x43, 0x41,
+  0x67, 0x45, 0x41, 0x72, 0x62, 0x55, 0x4c, 0x61, 0x54, 0x44, 0x46, 0x39, 0x69, 0x30, 0x70, 0x66,
+  0x34, 0x7a, 0x6d, 0x62, 0x55, 0x53, 0x69, 0x64, 0x34, 0x6f, 0x57, 0x7a, 0x6e, 0x45, 0x42, 0x77,
+  0x55, 0x5a, 0x69, 0x6e, 0x37, 0x59, 0x69, 0x54, 0x76, 0x67, 0x38, 0x73, 0x34, 0x41, 0x31, 0x43,
+  0x42, 0x76, 0x2f, 0x31, 0x75, 0x72, 0x75, 0x41, 0x62, 0x39, 0x6d, 0x0a, 0x4a, 0x52, 0x52, 0x59,
+  0x35, 0x37, 0x61, 0x32, 0x65, 0x6c, 0x7a, 0x68, 0x31, 0x37, 0x45, 0x76, 0x51, 0x39, 0x72, 0x30,
+  0x4a, 0x48, 0x6e, 0x49, 0x66, 0x73, 0x35, 0x41, 0x56, 0x68, 0x57, 0x2f, 0x4e, 0x45, 0x62, 0x6e,
+  0x75, 0x5a, 0x73, 0x39, 0x59, 0x6a, 0x53, 0x6c, 0x6a, 0x55, 0x58, 0x74, 0x44, 0x64, 0x47, 0x63,
+  0x6b, 0x6f, 0x48, 0x61, 0x34, 0x53, 0x4d, 0x55, 0x44, 0x44, 0x2f, 0x44, 0x0a, 0x76, 0x78, 0x4e,
+  0x46, 0x44, 0x31, 0x6f, 0x72, 0x67, 0x2b, 0x79, 0x39, 0x75, 0x2b, 0x2f, 0x6b, 0x64, 0x52, 0x4d,
+  0x64, 0x67, 0x66, 0x6d, 0x5a, 0x45, 0x69, 0x32, 0x59, 0x55, 0x62, 0x57, 0x68, 0x51, 0x53, 0x37,
+  0x78, 0x34, 0x34, 0x31, 0x57, 0x73, 0x52, 0x30, 0x33, 0x32, 0x66, 0x4d, 0x54, 0x42, 0x44, 0x2b,
+  0x64, 0x6b, 0x33, 0x38, 0x77, 0x42, 0x31, 0x4e, 0x2b, 0x42, 0x6e, 0x56, 0x54, 0x0a, 0x54, 0x43,
+  0x50, 0x4c, 0x68, 0x43, 0x74, 0x6c, 0x76, 0x6d, 0x54, 0x46, 0x68, 0x34, 0x47, 0x48, 0x38, 0x71,
+  0x48, 0x79, 0x57, 0x79, 0x77, 0x47, 0x48, 0x6a, 0x76, 0x38, 0x6e, 0x45, 0x45, 0x65, 0x70, 0x47,
+  0x72, 0x68, 0x49, 0x49, 0x56, 0x66, 0x7a, 0x53, 0x57, 0x38, 0x51, 0x66, 0x53, 0x66, 0x4b, 0x6c,
+  0x6a, 0x4d, 0x30, 0x36, 0x62, 0x76, 0x71, 0x4d, 0x58, 0x31, 0x2f, 0x46, 0x6b, 0x70, 0x0a, 0x38,
+  0x76, 0x48, 0x41, 0x4e, 0x53, 0x67, 0x54, 0x69, 0x57, 0x2f, 0x4b, 0x58, 0x59, 0x7a, 0x33, 0x36,
+  0x67, 0x71, 0x59, 0x57, 0x70, 0x44, 0x2f, 0x32, 0x41, 0x74, 0x57, 0x35, 0x75, 0x44, 0x4e, 0x58,
+  0x56, 0x62, 0x76, 0x70, 0x5a, 0x48, 0x4b, 0x57, 0x59, 0x76, 0x34, 0x30, 0x67, 0x63, 0x73, 0x2f,
+  0x59, 0x6b, 0x37, 0x66, 0x6a, 0x33, 0x38, 0x44, 0x65, 0x76, 0x4b, 0x46, 0x57, 0x35, 0x49, 0x0a,
+  0x65, 0x71, 0x6c, 0x43, 0x55, 0x59, 0x6f, 0x50, 0x30, 0x2f, 0x41, 0x37, 0x47, 0x77, 0x43, 0x45,
+  0x63, 0x58, 0x4a, 0x2f, 0x6b, 0x4a, 0x70, 0x5a, 0x50, 0x30, 0x45, 0x6d, 0x45, 0x37, 0x41, 0x51,
+  0x6a, 0x6c, 0x61, 0x46, 0x6e, 0x44, 0x41, 0x51, 0x54, 0x71, 0x50, 0x57, 0x57, 0x2f, 0x4b, 0x72,
+  0x73, 0x68, 0x2f, 0x61, 0x42, 0x65, 0x39, 0x2b, 0x5a, 0x41, 0x54, 0x46, 0x71, 0x50, 0x4f, 0x72,
+  0x0a, 0x38, 0x32, 0x43, 0x43, 0x6d, 0x63, 0x4f, 0x59, 0x73, 0x32, 0x45, 0x2f, 0x2f, 0x6d, 0x77,
+  0x30, 0x76, 0x59, 0x6d, 0x4c, 0x78, 0x68, 0x38, 0x4f, 0x61, 0x50, 0x37, 0x30, 0x62, 0x63, 0x4f,
+  0x65, 0x65, 0x37, 0x64, 0x67, 0x51, 0x66, 0x4c, 0x53, 0x77, 0x75, 0x68, 0x71, 0x51, 0x44, 0x79,
+  0x61, 0x44, 0x57, 0x2b, 0x67, 0x77, 0x75, 0x61, 0x61, 0x2f, 0x79, 0x7a, 0x71, 0x6b, 0x63, 0x4f,
+  0x6c, 0x0a, 0x6c, 0x44, 0x30, 0x2f, 0x73, 0x51, 0x6e, 0x59, 0x68, 0x6a, 0x50, 0x53, 0x72, 0x62,
+  0x49, 0x33, 0x36, 0x41, 0x54, 0x4a, 0x2f, 0x73, 0x36, 0x34, 0x4f, 0x41, 0x6e, 0x6d, 0x74, 0x70,
+  0x4a, 0x53, 0x6d, 0x68, 0x51, 0x50, 0x67, 0x4a, 0x59, 0x63, 0x5a, 0x6a, 0x65, 0x32, 0x49, 0x6c,
+  0x48, 0x42, 0x36, 0x77, 0x34, 0x38, 0x4c, 0x5a, 0x48, 0x34, 0x57, 0x79, 0x57, 0x4e, 0x30, 0x61,
+  0x52, 0x4b, 0x0a, 0x32, 0x36, 0x70, 0x43, 0x53, 0x67, 0x49, 0x6a, 0x58, 0x74, 0x64, 0x7a, 0x43,
+  0x47, 0x71, 0x48, 0x57, 0x53, 0x6c, 0x72, 0x55, 0x57, 0x59, 0x70, 0x6c, 0x77, 0x71, 0x46, 0x73,
+  0x59, 0x33, 0x77, 0x6b, 0x34, 0x35, 0x6c, 0x58, 0x66, 0x53, 0x32, 0x30, 0x62, 0x6c, 0x45, 0x4d,
+  0x30, 0x47, 0x41, 0x55, 0x7a, 0x2f, 0x56, 0x58, 0x33, 0x78, 0x58, 0x35, 0x6d, 0x51, 0x69, 0x64,
+  0x41, 0x65, 0x72, 0x0a, 0x4a, 0x67, 0x47, 0x68, 0x46, 0x5a, 0x68, 0x2f, 0x55, 0x73, 0x56, 0x50,
+  0x37, 0x41, 0x66, 0x4c, 0x4c, 0x6e, 0x75, 0x4f, 0x57, 0x68, 0x70, 0x35, 0x4d, 0x67, 0x58, 0x70,
+  0x6b, 0x38, 0x72, 0x7a, 0x38, 0x50, 0x31, 0x4e, 0x69, 0x50, 0x4a, 0x49, 0x38, 0x6d, 0x57, 0x6c,
+  0x6f, 0x55, 0x61, 0x75, 0x34, 0x4d, 0x6c, 0x35, 0x2b, 0x70, 0x71, 0x5a, 0x66, 0x76, 0x39, 0x57,
+  0x35, 0x68, 0x76, 0x74, 0x0a, 0x48, 0x4a, 0x79, 0x31, 0x41, 0x59, 0x32, 0x2b, 0x35, 0x58, 0x53,
+  0x70, 0x58, 0x7a, 0x2f, 0x36, 0x71, 0x66, 0x61, 0x4a, 0x41, 0x4d, 0x67, 0x2b, 0x38, 0x78, 0x71,
+  0x66, 0x32, 0x64, 0x67, 0x55, 0x74, 0x77, 0x5a, 0x72, 0x42, 0x55, 0x2b, 0x5a, 0x52, 0x6e, 0x79,
+  0x47, 0x6e, 0x32, 0x33, 0x6a, 0x67, 0x35, 0x67, 0x3d, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45,
+  0x4e, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d,
+  0x2d, 0x2d, 0x2d, 0x0a
+};
+
 _UA_END_DECLS
 
 #endif /* CERTIFICATES_H_ */
diff --git a/tests/encryption/check_crl_validation.c b/tests/encryption/check_crl_validation.c
new file mode 100644
index 00000000000..c9af7c63a71
--- /dev/null
+++ b/tests/encryption/check_crl_validation.c
@@ -0,0 +1,337 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2024 (c) Fraunhofer IOSB (Author: Noel Graf)
+ *
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/pki_default.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include "certificates.h"
+#include "check.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static void setup1(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    UA_ByteString rootCa;
+    rootCa.length = ROOT_CERT_DER_LENGTH;
+    rootCa.data = ROOT_CERT_DER_DATA;
+
+    UA_ByteString rootCaCrl;
+    rootCaCrl.length = ROOT_EMPTY_CRL_PEM_LENGTH;
+    rootCaCrl.data = ROOT_EMPTY_CRL_PEM_DATA;
+
+    UA_ByteString intermediateCa;
+    intermediateCa.length = INTERMEDIATE_CERT_DER_LENGTH;
+    intermediateCa.data = INTERMEDIATE_CERT_DER_DATA;
+
+    UA_ByteString intermediateCaCrl;
+    intermediateCaCrl.length = INTERMEDIATE_EMPTY_CRL_PEM_LENGTH;
+    intermediateCaCrl.data = INTERMEDIATE_EMPTY_CRL_PEM_DATA;
+
+    /* Load the trustlist */
+    size_t trustListSize = 2;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
+    trustList[0] = intermediateCa;
+    trustList[1] = rootCa;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 2;
+    UA_STACKARRAY(UA_ByteString, issuerList, issuerListSize);
+    issuerList[0] = intermediateCa;
+    issuerList[1] = rootCa;
+
+    /* Loading of a revocation list currently unsupported */
+    size_t revocationListSize = 2;
+    UA_STACKARRAY(UA_ByteString, revocationList, revocationListSize);
+    revocationList[0] = rootCaCrl;
+    revocationList[1] = intermediateCaCrl;
+
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   trustList, trustListSize,
+                                                   issuerList, issuerListSize,
+                                                   revocationList, revocationListSize);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void setup2(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    UA_ByteString rootCa;
+    rootCa.length = ROOT_CERT_DER_LENGTH;
+    rootCa.data = ROOT_CERT_DER_DATA;
+
+    UA_ByteString rootCaCrl;
+    rootCaCrl.length = ROOT_EMPTY_CRL_PEM_LENGTH;
+    rootCaCrl.data = ROOT_EMPTY_CRL_PEM_DATA;
+
+    UA_ByteString intermediateCa;
+    intermediateCa.length = INTERMEDIATE_CERT_DER_LENGTH;
+    intermediateCa.data = INTERMEDIATE_CERT_DER_DATA;
+
+    UA_ByteString intermediateCaCrl;
+    intermediateCaCrl.length = INTERMEDIATE_CRL_PEM_LENGTH;
+    intermediateCaCrl.data = INTERMEDIATE_CRL_PEM_DATA;
+
+    /* Load the trustlist */
+    size_t trustListSize = 2;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
+    trustList[0] = intermediateCa;
+    trustList[1] = rootCa;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 2;
+    UA_STACKARRAY(UA_ByteString, issuerList, issuerListSize);
+    issuerList[0] = intermediateCa;
+    issuerList[1] = rootCa;
+
+    /* Loading of a revocation list currently unsupported */
+    size_t revocationListSize = 2;
+    UA_STACKARRAY(UA_ByteString, revocationList, revocationListSize);
+    revocationList[0] = rootCaCrl;
+    revocationList[1] = intermediateCaCrl;
+
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   trustList, trustListSize,
+                                                   issuerList, issuerListSize,
+                                                   revocationList, revocationListSize);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void setup3(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CERT_DER_LENGTH;
+    certificate.data = CERT_DER_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = KEY_DER_LENGTH;
+    privateKey.data = KEY_DER_DATA;
+
+    UA_ByteString rootCa;
+    rootCa.length = ROOT_CERT_DER_LENGTH;
+    rootCa.data = ROOT_CERT_DER_DATA;
+
+    UA_ByteString rootCaCrl;
+    rootCaCrl.length = ROOT_CRL_PEM_LENGTH;
+    rootCaCrl.data = ROOT_CRL_PEM_DATA;
+
+    UA_ByteString intermediateCa;
+    intermediateCa.length = INTERMEDIATE_CERT_DER_LENGTH;
+    intermediateCa.data = INTERMEDIATE_CERT_DER_DATA;
+
+    UA_ByteString intermediateCaCrl;
+    intermediateCaCrl.length = INTERMEDIATE_EMPTY_CRL_PEM_LENGTH;
+    intermediateCaCrl.data = INTERMEDIATE_EMPTY_CRL_PEM_DATA;
+
+    /* Load the trustlist */
+    size_t trustListSize = 2;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
+    trustList[0] = intermediateCa;
+    trustList[1] = rootCa;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 2;
+    UA_STACKARRAY(UA_ByteString, issuerList, issuerListSize);
+    issuerList[0] = rootCa;
+    issuerList[1] = intermediateCa;
+
+    /* Loading of a revocation list currently unsupported */
+    size_t revocationListSize = 2;
+    UA_STACKARRAY(UA_ByteString, revocationList, revocationListSize);
+    revocationList[0] = rootCaCrl;
+    revocationList[1] = intermediateCaCrl;
+
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   trustList, trustListSize,
+                                                   issuerList, issuerListSize,
+                                                   revocationList, revocationListSize);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(encryption_connect_valid) {
+/* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = APPLICATION_CERT_DER_LENGTH;
+    certificate.data = APPLICATION_CERT_DER_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = APPLICATION_KEY_DER_LENGTH;
+    privateKey.data = APPLICATION_KEY_DER_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* Load the trustlist */
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Secure client initialization */
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                         trustList, trustListSize,
+                                         revocationList, revocationListSize);
+    cc->certificateVerification.clear(&cc->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    ck_assert(client != NULL);
+
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(encryption_connect_revoked) {
+    UA_ByteString certificate;
+    certificate.length = APPLICATION_CERT_DER_LENGTH;
+    certificate.data = APPLICATION_CERT_DER_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = APPLICATION_KEY_DER_LENGTH;
+    privateKey.data = APPLICATION_KEY_DER_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* Load the trustlist */
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Secure client initialization */
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                         trustList, trustListSize,
+                                         revocationList, revocationListSize);
+    cc->certificateVerification.clear(&cc->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    ck_assert(client != NULL);
+
+    /* Secure client connect */
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+static Suite* testSuite_encryption(void) {
+    Suite *s = suite_create("Certificate Revocation List");
+    TCase *tc_encryption_valid = tcase_create("Certificate Revocation Valid");
+    tcase_add_checked_fixture(tc_encryption_valid, setup1, teardown);
+    TCase *tc_encryption_revoked = tcase_create("Certificate Revocation Revoked");
+    tcase_add_checked_fixture(tc_encryption_revoked, setup2, teardown);
+    TCase *tc_encryption_revoked2 = tcase_create("Certificate Revocation Revoked2");
+    tcase_add_checked_fixture(tc_encryption_revoked2, setup3, teardown);
+#ifdef UA_ENABLE_ENCRYPTION
+    tcase_add_test(tc_encryption_valid, encryption_connect_valid);
+    tcase_add_test(tc_encryption_revoked, encryption_connect_revoked);
+    tcase_add_test(tc_encryption_revoked2, encryption_connect_revoked);
+#endif /* UA_ENABLE_ENCRYPTION */
+    suite_add_tcase(s,tc_encryption_valid);
+    suite_add_tcase(s,tc_encryption_revoked);
+    suite_add_tcase(s,tc_encryption_revoked2);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_encryption();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr,CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From af1abb2e8355e238187a1e771059f26555466364 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 22 Sep 2024 22:03:39 +0200
Subject: [PATCH 1640/1963] refactor(plugins): Better cleanup of the OpenSSL
 CertificateVerification plugin

---
 plugins/crypto/openssl/ua_pki_openssl.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 87b91e03c1e..c741efcf820 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -118,9 +118,7 @@ UA_CertificateVerification_clear (UA_CertificateVerification * cv) {
     UA_CertContext_sk_free (context);
     UA_free (context);
 
-    cv->context = NULL;
-
-    return;
+    memset(cv, 0, sizeof(UA_CertificateVerification));
 }
 
 static UA_StatusCode

From ee79096b6570337543dcecfe9d0bcf4fb93234d4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 22 Sep 2024 22:04:14 +0200
Subject: [PATCH 1641/1963] fix(plugin): Always clean up the previously
 configured certificate verification plugin

---
 plugins/ua_config_default.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index c4c8f4ffec7..8ab5f547f28 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -184,6 +184,8 @@ setDefaultConfig(UA_ServerConfig *conf) {
 
     /* Certificate Verification that accepts every certificate. Can be
      * overwritten when the policy is specialized. */
+    if(conf->certificateVerification.clear)
+        conf->certificateVerification.clear(&conf->certificateVerification);
     UA_CertificateVerification_AcceptAll(&conf->certificateVerification);
 
     /* * Global Node Lifecycle * */
@@ -685,6 +687,8 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
         return retval;
     }
 
+    if(conf->certificateVerification.clear)
+        conf->certificateVerification.clear(&conf->certificateVerification);
     retval = UA_CertificateVerification_Trustlist(&conf->certificateVerification,
                                                   trustList, trustListSize,
                                                   issuerList, issuerListSize,
@@ -758,6 +762,8 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
 
     /* Certificate Verification that accepts every certificate. Can be
      * overwritten when the policy is specialized. */
+    if(config->certificateVerification.clear)
+        config->certificateVerification.clear(&config->certificateVerification);
     UA_CertificateVerification_AcceptAll(&config->certificateVerification);
     UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
                    "AcceptAll Certificate Verification. "
@@ -816,6 +822,8 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
+    if(config->certificateVerification.clear)
+        config->certificateVerification.clear(&config->certificateVerification);
     retval = UA_CertificateVerification_Trustlist(&config->certificateVerification,
                                                   trustList, trustListSize,
                                                   NULL, 0,

From 19ecf3e5627ae1d0c20ce661aee8e0164b03d86c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 22 Sep 2024 22:11:45 +0200
Subject: [PATCH 1642/1963] refactor(plugin): Manual OpenSSL certificate
 verification steps

The previous certificate verification relied on many OpenSSL internals
and a forest of feature-flags.  The new code is about the same size and
makes the certificate verification steps explicit.

The only downside is that we no longer auto-retrieve revocation lists if
a distribution point is defined in a CA certificate. But revocation is
handled by a GDS in OPC UA. And we don't want our certificate
verification to do synchronous HTTP calls in the background.
---
 plugins/crypto/openssl/ua_pki_openssl.c | 369 +++++++++++++-----------
 1 file changed, 195 insertions(+), 174 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index c741efcf820..dbfc94e4bad 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -390,196 +390,217 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
 
 #endif  /* end of __linux__ */
 
-static UA_StatusCode
-UA_X509_Store_CTX_Error_To_UAError (int opensslErr) {
-    UA_StatusCode ret;
-    
-    switch (opensslErr) {
-        case X509_V_ERR_CERT_HAS_EXPIRED:
-        case X509_V_ERR_CERT_NOT_YET_VALID:
-        case X509_V_ERR_CRL_NOT_YET_VALID:
-        case X509_V_ERR_CRL_HAS_EXPIRED:
-        case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-        case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-        case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD:
-        case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD:
-            ret = UA_STATUSCODE_BADCERTIFICATETIMEINVALID;
-            break;
-        case X509_V_ERR_CERT_REVOKED:
-            ret = UA_STATUSCODE_BADCERTIFICATEREVOKED;
-            break;
-        case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
-        case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
-        case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-            ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
-            break;
-        case X509_V_ERR_CERT_SIGNATURE_FAILURE:
-        case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
-            ret = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
-            break;
-        case X509_V_ERR_UNABLE_TO_GET_CRL:
-            ret = UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN;
-            break;
-        default:
-            ret = UA_STATUSCODE_BADCERTIFICATEINVALID;
-            break;
-        }
-    return ret;
-    }
-
-static UA_StatusCode
-UA_CertificateVerification_Verify (void *                verificationContext,
-                                   const UA_ByteString * certificate) {
-    X509_STORE_CTX*       storeCtx;
-    X509_STORE*           store;
-    CertContext *         ctx;
-    UA_StatusCode         ret;
-    int                   opensslRet;
-    X509 *                certificateX509 = NULL;
+static const unsigned char openssl_PEM_PRE[28] = "-----BEGIN CERTIFICATE-----";
+
+/* Extract the leaf certificate from a bytestring that may contain an entire chain */
+static X509 *
+openSSLLoadLeafCertificate(UA_ByteString cert, size_t *offset) {
+    if(cert.length <= *offset)
+        return NULL;
+    cert.length -= *offset;
+    cert.data += *offset;
+
+    /* Detect DER encoding. Extract the encoding length and cut. */
+    if(cert.length >= 4 && cert.data[0] == 0x30 && cert.data[1] == 0x82) {
+        /* The certificate length is encoded after the magic bytes */
+        size_t certLen = 4; /* Magic numbers + length bytes */
+        certLen += (size_t)(((uint16_t)cert.data[2]) << 8);
+        certLen += cert.data[3];
+        if(certLen > cert.length)
+            return NULL;
+        cert.length = certLen;
+        *offset += certLen;
+        const UA_Byte *dataPtr = cert.data;
+        return d2i_X509(NULL, &dataPtr, (long)cert.length);
+    }
+
+    /* Assume PEM encoding. Detect multiple certificates and cut. */
+    if(cert.length > 27 * 4) {
+        const unsigned char *match =
+            UA_Bstrstr(openssl_PEM_PRE, 27, &cert.data[27*2], cert.length - (27*2));
+        if(match)
+            cert.length = (uintptr_t)(match - cert.data);
+    }
+    *offset += cert.length;
+
+    BIO *bio = BIO_new_mem_buf((void *) cert.data, (int)cert.length);
+    X509 *result = PEM_read_bio_X509(bio, NULL, NULL, NULL);
+    BIO_free(bio);
+    return result;
+}
 
-    if (verificationContext == NULL) {
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-    ctx = (CertContext *) verificationContext;
-  
-    store = X509_STORE_new();
-    storeCtx = X509_STORE_CTX_new();
-    
-    if (store == NULL || storeCtx == NULL) {
-        ret = UA_STATUSCODE_BADOUTOFMEMORY;
-        goto cleanup;
-    }
-#ifdef __linux__ 
-    ret = UA_ReloadCertFromFolder (ctx);
-    if (ret != UA_STATUSCODE_GOOD) {
-        goto cleanup;
-    }
-#endif
+/* The bytestring might contain an entire certificate chain. The first
+ * stack-element is the leaf certificate itself. The remaining ones are
+ * potential issuer certificates. */
+static STACK_OF(X509) *
+openSSLLoadCertificateStack(const UA_ByteString cert) {
+    size_t offset = 0;
+    X509 *x509 = NULL;
+    STACK_OF(X509) *result = sk_X509_new_null();
+    if(!result)
+        return NULL;
+    while((x509 = openSSLLoadLeafCertificate(cert, &offset))) {
+        sk_X509_push(result, x509);
+    }
+    return result;
+}
 
-    certificateX509 = UA_OpenSSL_LoadCertificate(certificate);
-    if (certificateX509 == NULL) {
-        ret = UA_STATUSCODE_BADCERTIFICATEINVALID;
-        goto cleanup;
-    } 
-
-    X509_STORE_set_flags(store, 0);
-    opensslRet = X509_STORE_CTX_init (storeCtx, store, certificateX509, 
-                                      ctx->skIssue);
-    if (opensslRet != 1) {
-        ret = UA_STATUSCODE_BADINTERNALERROR;
-        goto cleanup;
-    }
-#if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT < 0x10100000L
-	(void) X509_STORE_CTX_trusted_stack (storeCtx, ctx->skTrusted);
-#else
-	(void) X509_STORE_CTX_set0_trusted_stack (storeCtx, ctx->skTrusted);
-#endif
+/* Return the first matching issuer candidate AFTER prev */
+static X509 *
+openSSLFindNextIssuer(CertContext *ctx, STACK_OF(X509) *stack, X509 *x509, X509 *prev) {
+    /* First check issuers from the stack - provided in the same bytestring as
+     * the certificate. This can also return x509 itself. */
+    do {
+        int size = sk_X509_num(stack);
+        for(int i = 0; i < size; i++) {
+            X509 *candidate = sk_X509_value(stack, i);
+            if(X509_check_issued(candidate, x509) != 0)
+                continue;
+            if(prev == NULL)
+                return candidate;
+            prev = NULL;
+        }
+        /* Switch to search in the ctx->skIssue list */
+        stack = (stack != ctx->skIssue) ? ctx->skIssue : NULL;
+    } while(stack);
+    return NULL;
+}
 
-    /* Set crls to ctx */
-    if (sk_X509_CRL_num (ctx->skCrls) > 0) {
-        X509_STORE_CTX_set0_crls (storeCtx, ctx->skCrls);
+static UA_Boolean
+openSSLCheckRevoked(CertContext *ctx, X509 *cert) {
+    const ASN1_INTEGER *sn = X509_get0_serialNumber(cert);
+    const X509_NAME *in = X509_get_issuer_name(cert);
+    int size = sk_X509_CRL_num(ctx->skCrls);
+    for(int i = 0; i < size; i++) {
+        /* The crl contains a list of serial numbers from the same issuer */
+        X509_CRL *crl = sk_X509_CRL_value(ctx->skCrls, i);
+        if(X509_NAME_cmp(in, X509_CRL_get_issuer(crl)) != 0)
+            continue;
+        STACK_OF(X509_REVOKED) *rs = X509_CRL_get_REVOKED(crl);
+        int rsize = sk_X509_REVOKED_num(rs);
+        for(int j = 0; j < rsize; j++) {
+            X509_REVOKED *r = sk_X509_REVOKED_value(rs, j);
+            if(ASN1_INTEGER_cmp(sn, X509_REVOKED_get0_serialNumber(r)) == 0)
+                return true;
+        }
     }
+    return false;
+}
 
-    /* Set flag to check if the certificate has an invalid signature */
-    X509_STORE_CTX_set_flags (storeCtx, X509_V_FLAG_CHECK_SS_SIGNATURE);
-
-    if (X509_check_issued(certificateX509,certificateX509) != X509_V_OK) {
-        X509_STORE_CTX_set_flags (storeCtx, X509_V_FLAG_CRL_CHECK);
-    }
+#define UA_OPENSSL_MAX_CHAIN_LENGTH 10
 
-    /* This condition will check whether the certificate is a User certificate or a CA certificate.
-     * If the KU_KEY_CERT_SIGN and KU_CRL_SIGN of key_usage are set, then the certificate shall be
-     * condidered as CA Certificate and cannot be used to establish a connection. Refer the test case
-     * CTT/Security/Security Certificate Validation/029.js for more details */
-     /** \todo Can the ca-parameter of X509_check_purpose can be used? */
-    if(X509_check_purpose(certificateX509, X509_PURPOSE_CRL_SIGN, 0) && X509_check_ca(certificateX509)) {
-        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
-    }
+static UA_StatusCode
+openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
+                    X509 *x509, int depth) {
+    /* Maxiumum chain length */
+    if(depth == UA_OPENSSL_MAX_CHAIN_LENGTH)
+        return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
+
+    /* Verification Step: Validity Period */
+    ASN1_TIME *notBefore = X509_get_notBefore(x509);
+    ASN1_TIME *notAfter = X509_get_notAfter(x509);
+    if(X509_cmp_current_time(notBefore) != -1 || X509_cmp_current_time(notAfter) != 1)
+        return UA_STATUSCODE_BADCERTIFICATETIMEINVALID;
+
+    /* Verification Step: Revocation Check */
+    if(openSSLCheckRevoked(ctx, x509))
+        return UA_STATUSCODE_BADCERTIFICATEREVOKED;
+
+    /* Is the certificate in the trust list? If yes, then we are done. */
+    for(int i = 0; i < sk_X509_num(ctx->skTrusted); i++) {
+        if(X509_cmp(x509, sk_X509_value(ctx->skTrusted, i)) == 0)
+            return UA_STATUSCODE_GOOD;
+    }
+
+    /* Return the most specific error code. BADCERTIFICATECHAININCOMPLETE is
+     * returned only if all possible chains are incomplete. */
+    X509 *issuer = NULL;
+    UA_StatusCode ret = UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
+    while(ret != UA_STATUSCODE_GOOD) {
+        /* Find the issuer. We jump back here to find a different path if a
+         * subsequent check fails. */
+        issuer = openSSLFindNextIssuer(ctx, stack, x509, issuer);
+        if(!issuer)
+            break;
 
-    opensslRet = X509_verify_cert (storeCtx);
-    if (opensslRet == 1) {
-        ret = UA_STATUSCODE_GOOD;
+        /* Detect (endless) loops of issuers */
+        for(int i = 0; i < depth; i++) {
+            if(old_issuers[i] == issuer)
+                return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
+        }
+        old_issuers[depth] = issuer;
+
+        /* Verification Step: Signature */
+        int opensslRet = X509_verify(x509, X509_get0_pubkey(issuer));
+        if(opensslRet == -1) {
+            return UA_STATUSCODE_BADCERTIFICATEINVALID; /* Ill-formed signature */
+        } else if(opensslRet == 0) {
+            ret = UA_STATUSCODE_BADCERTIFICATEINVALID;  /* Wrong issuer, try again */
+            continue;
+        }
 
-        /* Check if the not trusted certificate has a CRL file. If there is no CRL file available for the corresponding
-         * parent certificate then return status code UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN. Refer the test
-         * case CTT/Security/Security Certificate Validation/002.js */
-        if (X509_check_issued(certificateX509,certificateX509) != X509_V_OK) {
-            /* Free X509_STORE_CTX and reuse it for certification verification */
-            if (storeCtx != NULL) {
-               X509_STORE_CTX_free(storeCtx);
-            }
+        /* We have found the issuer certificate used for the signature. Recurse
+         * to the next certificate in the chain (verify the current issuer). */
+        ret = openSSL_verifyChain(ctx, stack, old_issuers, issuer, depth + 1);
 
-            /* Initialised X509_STORE_CTX sructure*/
-            storeCtx = X509_STORE_CTX_new();
+        /* Problems where x509 != leaf are reported as "untrusted" without the
+         * detailed reason */
+        if(ret != UA_STATUSCODE_GOOD &&
+           ret != UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE)
+            ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
+    }
 
-            /* Sets up X509_STORE_CTX structure for a subsequent verification operation */
-            X509_STORE_set_flags(store, 0);
-            X509_STORE_CTX_init (storeCtx, store, certificateX509,ctx->skIssue);
+    return ret;
+}
 
-            /* Set trust list to ctx */
-            (void) X509_STORE_CTX_trusted_stack (storeCtx, ctx->skTrusted);
+/* This follows Part 6, 6.1.3 Determining if a Certificate is trusted.
+ * It defines a sequence of steps for certificate verification. */
+static UA_StatusCode
+UA_CertificateVerification_Verify(void *verificationContext,
+                                  const UA_ByteString *certificate) {
+    if(!verificationContext || !certificate)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
-            /* Set crls to ctx */
-            X509_STORE_CTX_set0_crls (storeCtx, ctx->skCrls);
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    CertContext *ctx = (CertContext *)verificationContext;
 
-            /* Set flags for CRL check */
-            X509_STORE_CTX_set_flags (storeCtx, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
+#ifdef __linux__ 
+    ret = UA_ReloadCertFromFolder(ctx);
+    if(ret != UA_STATUSCODE_GOOD)
+        return ret;
+#endif
 
-            opensslRet = X509_verify_cert (storeCtx);
-            if (opensslRet != 1) {
-                opensslRet = X509_STORE_CTX_get_error (storeCtx);
-                if (opensslRet == X509_V_ERR_UNABLE_TO_GET_CRL) {
-                    ret = UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN;
-                } else {
-                    ret = UA_X509_Store_CTX_Error_To_UAError (opensslRet);
-                }
-            }
-        }
+    /* Verification Step: Certificate Structure */
+    STACK_OF(X509) *stack = openSSLLoadCertificateStack(*certificate);
+    if(!stack || sk_X509_num(stack) < 1) {
+        if(stack)
+            sk_X509_pop_free(stack, X509_free);
+        return UA_STATUSCODE_BADCERTIFICATEINVALID;
+    }
+
+    /* Verification Step: Certificate Usage
+     * Check whether the certificate is a User certificate or a CA certificate.
+     * If the KU_KEY_CERT_SIGN and KU_CRL_SIGN of key_usage are set, then the
+     * certificate shall be condidered as CA Certificate and cannot be used to
+     * establish a connection. Refer the test case CTT/Security/Security
+     * Certificate Validation/029.js for more details */
+    X509 *leaf = sk_X509_value(stack, 0);
+    if(X509_check_purpose(leaf, X509_PURPOSE_CRL_SIGN, 0) && X509_check_ca(leaf)) {
+        sk_X509_pop_free(stack, X509_free);
+        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
     }
-    else {
-        opensslRet = X509_STORE_CTX_get_error (storeCtx);
-
-        /* Check the issued certificate of a CA that is not trusted but available */
-        if(opensslRet == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN){
-            int                     trusted_cert_len = sk_X509_num(ctx->skTrusted);
-            int                     cmpVal;
-            X509                    *trusted_cert;
-            const ASN1_OCTET_STRING *trusted_cert_keyid;
-            const ASN1_OCTET_STRING *remote_cert_keyid;
-
-            for (int i = 0; i < trusted_cert_len; i++) {
-                trusted_cert = sk_X509_value(ctx->skTrusted, i);
-
-                /* Fetch the Subject key identifier of the certificate in trust list */
-                trusted_cert_keyid = X509_get0_subject_key_id(trusted_cert);
-
-                /* Fetch the Subject key identifier of the remote certificate */
-                remote_cert_keyid = X509_get0_subject_key_id(certificateX509);
-
-                if(trusted_cert_keyid && remote_cert_keyid) {
-                    /* Check remote certificate is present in the trust list */
-                    cmpVal = ASN1_OCTET_STRING_cmp(trusted_cert_keyid, remote_cert_keyid);
-                    if(cmpVal == 0) {
-                        ret = UA_STATUSCODE_GOOD;
-                        goto cleanup;
-                    }
-                }
-            }
-        }
 
-        /* Return expected OPCUA error code */
-        ret = UA_X509_Store_CTX_Error_To_UAError (opensslRet);
-    }
-cleanup:
-    if (store != NULL) {
-        X509_STORE_free (store);
-    }
-    if (storeCtx != NULL) {
-        X509_STORE_CTX_free (storeCtx);
-    }
-    if (certificateX509 != NULL) {
-        X509_free (certificateX509);
-    }
+    /* These steps are performed outside of this method.
+     * Because we need the server or client context.
+     * - Security Policy
+     * - Host Name
+     * - URI */
+
+    /* Verification Step: Build Certificate Chain
+     * We perform the checks for each certificate inside. */
+    X509 *old_issuers[UA_OPENSSL_MAX_CHAIN_LENGTH];
+    ret = openSSL_verifyChain(ctx, stack, old_issuers, leaf, 0);
+    sk_X509_pop_free(stack, X509_free);
     return ret;
 }
 

From fec7e11f144ec24dbfef651d3bcc7f1b24f6ae9a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 23 Sep 2024 17:49:27 +0200
Subject: [PATCH 1643/1963] fix(tests): Extend tests for writing the
 DisplayName for different locales

---
 tests/server/check_services_attributes.c | 32 +++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index d5429c2127c..a974b6b98bb 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -711,15 +711,45 @@ START_TEST(WriteSingleAttributeBrowseName) {
 } END_TEST
 
 START_TEST(WriteSingleAttributeDisplayName) {
+    /* Write a new locale. The server continues to respond with the old locale. */
     UA_WriteValue wValue;
     UA_WriteValue_init(&wValue);
-    UA_LocalizedText testValue = UA_LOCALIZEDTEXT("en-EN", "the.answer");
+    UA_LocalizedText testValue = UA_LOCALIZEDTEXT("en-EN", "the.answer.123");
     UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
     wValue.value.hasValue = true;
     wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
     wValue.attributeId = UA_ATTRIBUTEID_DISPLAYNAME;
     UA_StatusCode retval = UA_Server_write(server, &wValue);
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Read back the display name and compare. We continue to receive the original locale. */
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = UA_NODEID_STRING(1, "the.answer");
+    rvi.attributeId = UA_ATTRIBUTEID_DISPLAYNAME;
+    UA_DataValue resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
+    ck_assert(UA_Variant_hasScalarType(&resp.value, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]));
+    ck_assert(UA_order(&testValue, resp.value.data, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]) != UA_ORDER_EQ);
+    UA_DataValue_clear(&resp);
+
+    /* Update the original locale. The server continues to respond with the old locale. */
+    UA_WriteValue_init(&wValue);
+    testValue = UA_LOCALIZEDTEXT("locale", "the.answer.123");
+    UA_Variant_setScalar(&wValue.value.value, &testValue, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]);
+    wValue.value.hasValue = true;
+    wValue.nodeId = UA_NODEID_STRING(1, "the.answer");
+    wValue.attributeId = UA_ATTRIBUTEID_DISPLAYNAME;
+    retval = UA_Server_write(server, &wValue);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Read back the new display name and compare */
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = UA_NODEID_STRING(1, "the.answer");
+    rvi.attributeId = UA_ATTRIBUTEID_DISPLAYNAME;
+    resp = UA_Server_read(server, &rvi, UA_TIMESTAMPSTORETURN_NEITHER);
+    ck_assert(UA_Variant_hasScalarType(&resp.value, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]));
+    ck_assert(UA_order(&testValue, resp.value.data, &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]) == UA_ORDER_EQ);
+    UA_DataValue_clear(&resp);
 } END_TEST
 
 START_TEST(WriteSingleAttributeDescription) {

From 01086d6de8091351dbc768b731e968976baa7e23 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 24 Sep 2024 20:46:26 +0200
Subject: [PATCH 1644/1963] refactor(plugins): Refactor mbedTLS certificate
 verification to include intermediate steps

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 410 +++++++++++-------------
 1 file changed, 180 insertions(+), 230 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index b5cb09c6321..ac3bf38814e 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -3,7 +3,7 @@
  *
  *    Copyright 2018 (c) Mark Giraud, Fraunhofer IOSB
  *    Copyright 2019 (c) Kalycito Infotech Private Limited
- *    Copyright 2019 (c) Julius Pfrommer, Fraunhofer IOSB
+ *    Copyright 2019, 2024 (c) Julius Pfrommer, Fraunhofer IOSB
  */
 
 #include <open62541/util.h>
@@ -16,11 +16,7 @@
 #include <mbedtls/x509_crt.h>
 #include <mbedtls/error.h>
 #include <mbedtls/version.h>
-
-#define REMOTECERTIFICATETRUSTED 1
-#define ISSUERKNOWN              2
-#define DUALPARENT               3
-#define PARENTFOUND              4
+#include <string.h>
 
 /* Find binary substring. Taken and adjusted from
  * http://tungchingkai.blogspot.com/2011/07/binary-strstr.html */
@@ -236,251 +232,204 @@ reloadCertificates(CertInfo *ci) {
 
 #endif
 
-static UA_StatusCode
-certificateVerification_verify(void *verificationContext,
-                               const UA_ByteString *certificate) {
-    CertInfo *ci = (CertInfo*)verificationContext;
-    if(!ci)
-        return UA_STATUSCODE_BADINTERNALERROR;
-
-#ifdef __linux__ /* Reload certificates if folder paths are specified */
-    UA_StatusCode certFlag = reloadCertificates(ci);
-    if(certFlag != UA_STATUSCODE_GOOD) {
-        return certFlag;
-    }
+/* We need to access some private fields below */
+#ifndef MBEDTLS_PRIVATE
+#define MBEDTLS_PRIVATE(x) x
 #endif
 
-    if(ci->trustListFolder.length == 0 &&
-       ci->issuerListFolder.length == 0 &&
-       ci->revocationListFolder.length == 0 &&
-       ci->certificateTrustList.raw.len == 0 &&
-       ci->certificateIssuerList.raw.len == 0 &&
-       ci->certificateRevocationList.raw.len == 0) {
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
-                       "PKI plugin unconfigured. Accepting the certificate.");
-        return UA_STATUSCODE_GOOD;
-    }
-
-    /* Parse the certificate */
-    mbedtls_x509_crt remoteCertificate;
-
-    /* Temporary Object to parse the trustList */
-    mbedtls_x509_crt *tempCert = NULL;
-
-    /* Temporary Object to parse the revocationList */
-    mbedtls_x509_crl *tempCrl = NULL;
-
-    /* Temporary Object to identify the parent CA when there is no intermediate CA */
-    mbedtls_x509_crt *parentCert = NULL;
-
-    /* Temporary Object to identify the parent CA when there is intermediate CA */
-    mbedtls_x509_crt *parentCert_2 = NULL;
-
-    /* Flag value to identify if the issuer certificate is found */
-    int issuerKnown = 0;
-
-    /* Flag value to identify if the parent certificate found */
-    int parentFound = 0;
-
-    mbedtls_x509_crt_init(&remoteCertificate);
-    int mbedErr = mbedtls_x509_crt_parse(&remoteCertificate, certificate->data,
-                                         certificate->length);
-    if(mbedErr) {
-        /* char errBuff[300]; */
-        /* mbedtls_strerror(mbedErr, errBuff, 300); */
-        /* UA_LOG_WARNING(data->policyContext->securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY, */
-        /*                "Could not parse the remote certificate with error: %s", errBuff); */
-        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
-    }
-
-    /* Verify */
-    mbedtls_x509_crt_profile crtProfile = {
-        MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA1) | MBEDTLS_X509_ID_FLAG(MBEDTLS_MD_SHA256),
-        0xFFFFFF, 0x000000, 128 * 8 // in bits
-    }; // TODO: remove magic numbers
-
-    uint32_t flags = 0;
-    mbedErr = mbedtls_x509_crt_verify_with_profile(&remoteCertificate,
-                                                   &ci->certificateTrustList,
-                                                   &ci->certificateRevocationList,
-                                                   &crtProfile, NULL, &flags, NULL, NULL);
-
-    /* Flag to check if the remote certificate is trusted or not */
-    int TRUSTED = 0;
-
-    /* Check if the remoteCertificate is present in the trustList while mbedErr value is not zero */
-    if(mbedErr && !(flags & MBEDTLS_X509_BADCERT_EXPIRED) && !(flags & MBEDTLS_X509_BADCERT_FUTURE)) {
-        for(tempCert = &ci->certificateTrustList; tempCert != NULL; tempCert = tempCert->next) {
-            if(remoteCertificate.raw.len == tempCert->raw.len &&
-               memcmp(remoteCertificate.raw.p, tempCert->raw.p, remoteCertificate.raw.len) == 0) {
-                TRUSTED = REMOTECERTIFICATETRUSTED;
-                break;
-            }
+/* Return the first matching issuer candidate AFTER prev */
+static mbedtls_x509_crt *
+mbedtlsFindNextIssuer(CertInfo *ci, mbedtls_x509_crt *stack,
+                      mbedtls_x509_crt *cert, mbedtls_x509_crt *prev) {
+    char inbuf[512], snbuf[512];
+    if(mbedtls_x509_dn_gets(inbuf, 512, &cert->issuer) < 0)
+        return NULL;
+    do {
+        for(mbedtls_x509_crt *i = stack; i; i = i->next) {
+            /* Compare issuer name and subject name */
+            if(mbedtls_x509_dn_gets(snbuf, 512, &i->subject) < 0)
+                continue;
+            if(strncmp(inbuf, snbuf, 512) != 0)
+                continue;
+            /* Skip when the key does not match the signature */
+            if(!mbedtls_pk_can_do(&i->pk, cert->MBEDTLS_PRIVATE(sig_pk)))
+                continue;
+            if(prev == NULL)
+                return i;
+            prev = NULL; /* This was the last issuer we tried to verify */
         }
+        /* Switch from the stack that came with the cert to the ctx->skIssue list */
+        stack = (stack != &ci->certificateIssuerList) ? &ci->certificateIssuerList : NULL;
+    } while(stack);
+    return NULL;
+}
+
+static UA_Boolean
+mbedtlsCheckRevoked(CertInfo *ci, mbedtls_x509_crt *cert) {
+    char inbuf[512], inbuf2[512];
+    if(mbedtls_x509_dn_gets(inbuf, 512, &cert->issuer) < 0)
+        return true;
+    for(mbedtls_x509_crl *crl = &ci->certificateRevocationList; crl; crl = crl->next) {
+        /* Is the CRL for the issuer of the certificate? */
+        if(mbedtls_x509_dn_gets(inbuf2, 512, &crl->issuer) < 0)
+            return true;
+        if(strncmp(inbuf, inbuf2, 512) != 0)
+            continue;
+        /* Is the serial number of the certificate contained in the CRL? */
+        if(mbedtls_x509_crt_is_revoked(cert, crl) != 0)
+            return true;
     }
+    return false;
+}
 
-    /* If the remote certificate is present in the trustList then check if the issuer certificate
-     * of remoteCertificate is present in issuerList */
-    if(TRUSTED && mbedErr) {
-        mbedErr = mbedtls_x509_crt_verify_with_profile(&remoteCertificate,
-                                                       &ci->certificateIssuerList,
-                                                       &ci->certificateRevocationList,
-                                                       &crtProfile, NULL, &flags, NULL, NULL);
-
-        /* Check if the parent certificate has a CRL file available */
-        if(!mbedErr) {
-            /* Flag value to identify if that there is an intermediate CA present */
-            int dualParent = 0;
-
-            /* Identify the topmost parent certificate for the remoteCertificate */
-            for(parentCert = &ci->certificateIssuerList; parentCert != NULL; parentCert = parentCert->next ) {
-                if(memcmp(remoteCertificate.issuer_raw.p, parentCert->subject_raw.p, parentCert->subject_raw.len) == 0) {
-                    for(parentCert_2 = &ci->certificateTrustList; parentCert_2 != NULL; parentCert_2 = parentCert_2->next) {
-                        if(memcmp(parentCert->issuer_raw.p, parentCert_2->subject_raw.p, parentCert_2->subject_raw.len) == 0) {
-                            dualParent = DUALPARENT;
-                            break;
-                        }
-                    }
-                    parentFound = PARENTFOUND;
-                }
-
-                if(parentFound == PARENTFOUND)
-                    break;
-            }
+/* Verify that the public key of the issuer was used to sign the certificate */
+static UA_Boolean
+mbedtlsCheckSignature(const mbedtls_x509_crt *cert, mbedtls_x509_crt *issuer) {
+    size_t hash_len;
+    unsigned char hash[MBEDTLS_MD_MAX_SIZE];
+    mbedtls_md_type_t md = cert->MBEDTLS_PRIVATE(sig_md);
+#if !defined(MBEDTLS_USE_PSA_CRYPTO)
+    const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(md);
+    hash_len = mbedtls_md_get_size(md_info);
+    if(mbedtls_md(md_info, cert->tbs.p, cert->tbs.len, hash) != 0)
+        return false;
+#else
+    if(psa_hash_compute(mbedtls_md_psa_alg_from_type(md), cert->tbs.p,
+                        cert->tbs.len, hash, sizeof(hash), &hash_len) != PSA_SUCCESS)
+        return false;
+#endif
+    const mbedtls_x509_buf *sig = &cert->MBEDTLS_PRIVATE(sig);
+    void *sig_opts = cert->MBEDTLS_PRIVATE(sig_opts);
+    mbedtls_pk_type_t pktype = cert->MBEDTLS_PRIVATE(sig_pk);
+    return (mbedtls_pk_verify_ext(pktype, sig_opts, &issuer->pk, md,
+                                  hash, hash_len, sig->p, sig->len) == 0);
+}
 
-            /* Check if there is an intermediate certificate between the topmost parent
-             * certificate and child certificate
-             * If yes the topmost parent certificate is to be checked whether it has a
-             * CRL file avaiable */
-            if(dualParent == DUALPARENT && parentFound == PARENTFOUND) {
-                parentCert = parentCert_2;
-            }
+#define UA_MBEDTLS_MAX_CHAIN_LENGTH 10
 
-            /* If a parent certificate is found traverse the revocationList and identify
-             * if there is any CRL file that corresponds to the parentCertificate */
-            if(parentFound == PARENTFOUND) {
-                tempCrl = &ci->certificateRevocationList;
-                while(tempCrl != NULL) {
-                    if(tempCrl->version != 0 &&
-                       tempCrl->issuer_raw.len == parentCert->subject_raw.len &&
-                       memcmp(tempCrl->issuer_raw.p,
-                              parentCert->subject_raw.p,
-                              tempCrl->issuer_raw.len) == 0) {
-                        issuerKnown = ISSUERKNOWN;
-                        break;
-                    }
-
-                    tempCrl = tempCrl->next;
-                }
-
-                /* If the CRL file corresponding to the parent certificate is not present
-                 * then return UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN */
-                if(issuerKnown) {
-                    flags = 0;
-                    mbedErr = mbedtls_x509_crt_verify_with_profile(parentCert,
-                                                                   &ci->certificateIssuerList,
-                                                                   &ci->certificateRevocationList,
-                                                                   &crtProfile, NULL, &flags, NULL, NULL);
-                } else {
-                    return UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN;
-                }
+static UA_StatusCode
+mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old_issuers,
+                   mbedtls_x509_crt *cert, int depth) {
+    /* Maxiumum chain length */
+    if(depth == UA_MBEDTLS_MAX_CHAIN_LENGTH)
+        return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
+
+    /* Verification Step: Validity Period */
+    if(mbedtls_x509_time_is_future(&cert->valid_from) ||
+       mbedtls_x509_time_is_past(&cert->valid_to))
+        return (depth == 0) ? UA_STATUSCODE_BADCERTIFICATETIMEINVALID :
+            UA_STATUSCODE_BADCERTIFICATEISSUERTIMEINVALID;
+
+    /* Verification Step: Revocation Check */
+    if(mbedtlsCheckRevoked(ci, cert))
+        return (depth == 0) ? UA_STATUSCODE_BADCERTIFICATEREVOKED :
+            UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED;
+
+    /* Return the most specific error code. BADCERTIFICATECHAININCOMPLETE is
+     * returned only if all possible chains are incomplete. */
+    mbedtls_x509_crt *issuer = NULL;
+    UA_StatusCode ret = UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
+    while(ret != UA_STATUSCODE_GOOD) {
+        /* Find the issuer. This can return the same certificate if it is
+         * self-signed (subject == issuer). We come back here to try a different
+         * "path" if a subsequent verification fails. */
+        issuer = mbedtlsFindNextIssuer(ci, stack, cert, issuer);
+        if(!issuer)
+            break;
+
+        /* Verification Step: Signature */
+        if(!mbedtlsCheckSignature(cert, issuer)) {
+            ret = UA_STATUSCODE_BADCERTIFICATEINVALID;  /* Wrong issuer, try again */
+            continue;
+        }
 
-            }
+        /* The certificate is self-signed. We have arrived at the top of the
+         * chain. We check whether the certificate is trusted below. This is the
+         * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
+         * This sinals that the chain is complete (but can be still
+         * untrusted). */
+        if(issuer == cert || (cert->tbs.len == issuer->tbs.len &&
+                              memcmp(cert->tbs.p, issuer->tbs.p, cert->tbs.len) == 0)) {
+            ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
+            continue;
+        }
 
+        /* Detect (endless) loops of issuers. The last one can be skipped by the
+         * check for self-signed just before. */
+        for(int i = 0; i < depth - 1; i++) {
+            if(old_issuers[i] == issuer)
+                return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
         }
+        old_issuers[depth] = issuer;
 
+        /* We have found the issuer certificate used for the signature. Recurse
+         * to the next certificate in the chain (verify the current issuer). */
+        ret = mbedtlsVerifyChain(ci, stack, old_issuers, issuer, depth + 1);
     }
-    else if(!mbedErr && !TRUSTED) {
-        /* This else if section is to identify if the parent certificate which is present in trustList
-         * has CRL file corresponding to it */
-
-        /* Identify the parent certificate of the remoteCertificate */
-        for(parentCert = &ci->certificateTrustList; parentCert != NULL; parentCert = parentCert->next) {
-            if(memcmp(remoteCertificate.issuer_raw.p, parentCert->subject_raw.p, parentCert->subject_raw.len) == 0) {
-                parentFound = PARENTFOUND;
-                break;
-            }
 
+    /* The chain is complete, but we haven't yet identified a trusted
+     * certificate "on the way down". Can we trust this certificate? */
+    if(ret == UA_STATUSCODE_BADCERTIFICATEUNTRUSTED) {
+        for(mbedtls_x509_crt *t = &ci->certificateTrustList; t; t = t->next) {
+            if(cert->tbs.len == t->tbs.len &&
+               memcmp(cert->tbs.p, t->tbs.p, cert->tbs.len) == 0)
+                return UA_STATUSCODE_GOOD;
         }
+    }
 
-        /* If the parent certificate is found traverse the revocationList and identify
-         * if there is any CRL file that corresponds to the parentCertificate */
-        if(parentFound == PARENTFOUND &&
-            memcmp(remoteCertificate.issuer_raw.p, remoteCertificate.subject_raw.p, remoteCertificate.subject_raw.len) != 0) {
-            tempCrl = &ci->certificateRevocationList;
-            while(tempCrl != NULL) {
-                if(tempCrl->version != 0 &&
-                   tempCrl->issuer_raw.len == parentCert->subject_raw.len &&
-                   memcmp(tempCrl->issuer_raw.p,
-                          parentCert->subject_raw.p,
-                          tempCrl->issuer_raw.len) == 0) {
-                    issuerKnown = ISSUERKNOWN;
-                    break;
-                }
-
-                tempCrl = tempCrl->next;
-            }
-
-            /* If the CRL file corresponding to the parent certificate is not present
-             * then return UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN */
-            if(issuerKnown) {
-                flags = 0;
-                mbedErr = mbedtls_x509_crt_verify_with_profile(parentCert,
-                                                               &ci->certificateIssuerList,
-                                                               &ci->certificateRevocationList,
-                                                               &crtProfile, NULL, &flags, NULL, NULL);
-            } else {
-                return UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN;
-            }
+    return ret;
+}
 
-        }
+/* This follows Part 6, 6.1.3 Determining if a Certificate is trusted.
+ * It defines a sequence of steps for certificate verification. */
+static UA_StatusCode
+certificateVerification_verify(void *verificationContext,
+                                const UA_ByteString *certificate) {
+    if(!verificationContext || !certificate)
+        return UA_STATUSCODE_BADINTERNALERROR;
 
-    }
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    CertInfo *ci = (CertInfo*)verificationContext;
 
-    // TODO: Extend verification
-
-    /* This condition will check whether the certificate is a User certificate
-     * or a CA certificate. If the MBEDTLS_X509_KU_KEY_CERT_SIGN and
-     * MBEDTLS_X509_KU_CRL_SIGN of key_usage are set, then the certificate
-     * shall be condidered as CA Certificate and cannot be used to establish a
-     * connection. Refer the test case CTT/Security/Security Certificate Validation/029.js
-     * for more details */
-#if MBEDTLS_VERSION_NUMBER >= 0x02060000 && MBEDTLS_VERSION_NUMBER < 0x03000000
-    if((remoteCertificate.key_usage & MBEDTLS_X509_KU_KEY_CERT_SIGN) &&
-       (remoteCertificate.key_usage & MBEDTLS_X509_KU_CRL_SIGN)) {
-        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
-    }
-#else
-    if((remoteCertificate.private_key_usage & MBEDTLS_X509_KU_KEY_CERT_SIGN) &&
-       (remoteCertificate.private_key_usage & MBEDTLS_X509_KU_CRL_SIGN)) {
-        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
-    }
+#ifdef __linux__ /* Reload certificates if folder paths are specified */
+    ret = reloadCertificates(ci);
+    if(ret != UA_STATUSCODE_GOOD)
+        return ret;
 #endif
 
-
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    if(mbedErr) {
-#if UA_LOGLEVEL <= 400
-        char buff[100];
-        int len = mbedtls_x509_crt_verify_info(buff, 100, "", flags);
-        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SECURITYPOLICY,
-                       "Verifying the certificate failed with error: %.*s", len-1, buff);
-#endif
-        if(flags & (uint32_t)MBEDTLS_X509_BADCERT_NOT_TRUSTED) {
-            retval = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
-        } else if(flags & (uint32_t)MBEDTLS_X509_BADCERT_FUTURE ||
-                  flags & (uint32_t)MBEDTLS_X509_BADCERT_EXPIRED) {
-            retval = UA_STATUSCODE_BADCERTIFICATETIMEINVALID;
-        } else if(flags & (uint32_t)MBEDTLS_X509_BADCERT_REVOKED ||
-                  flags & (uint32_t)MBEDTLS_X509_BADCRL_EXPIRED) {
-            retval = UA_STATUSCODE_BADCERTIFICATEREVOKED;
-        } else {
-            retval = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
-        }
+    /* Verification Step: Certificate Structure
+     * This parses the entire certificate chain contained in the bytestring. */
+    mbedtls_x509_crt cert;
+    mbedtls_x509_crt_init(&cert);
+    int mbedErr = mbedtls_x509_crt_parse(&cert, certificate->data,
+                                         certificate->length);
+    if(mbedErr)
+        return UA_STATUSCODE_BADCERTIFICATEINVALID;
+
+    /* Verification Step: Certificate Usage
+     * Check whether the certificate is a User certificate or a CA certificate.
+     * If the KU_KEY_CERT_SIGN and KU_CRL_SIGN of key_usage are set, then the
+     * certificate shall be condidered as CA Certificate and cannot be used to
+     * establish a connection. Refer the test case CTT/Security/Security
+     * Certificate Validation/029.js for more details */
+    unsigned int ca_flags = MBEDTLS_X509_KU_KEY_CERT_SIGN | MBEDTLS_X509_KU_CRL_SIGN;
+    if(mbedtls_x509_crt_check_key_usage(&cert, ca_flags)) {
+        mbedtls_x509_crt_free(&cert);
+        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
     }
 
-    mbedtls_x509_crt_free(&remoteCertificate);
-    return retval;
+    /* These steps are performed outside of this method.
+     * Because we need the server or client context.
+     * - Security Policy
+     * - Host Name
+     * - URI */
+
+    /* Verification Step: Build Certificate Chain
+     * We perform the checks for each certificate inside. */
+    mbedtls_x509_crt *old_issuers[UA_MBEDTLS_MAX_CHAIN_LENGTH];
+    ret = mbedtlsVerifyChain(ci, &cert, old_issuers, &cert, 0);
+    mbedtls_x509_crt_free(&cert);
+    return ret;
 }
 
 static UA_StatusCode
@@ -619,4 +568,5 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
 }
 
 #endif
-#endif
+
+#endif /* UA_ENABLE_ENCRYPTION_MBEDTLS */

From c63520c407632b4e0c2a4d5520e193cb61a28f9a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 27 Sep 2024 20:46:20 +0200
Subject: [PATCH 1645/1963] refactor(plugins): Use the same certificate
 verification logic for mbedTLS and OpenSSL

Walk the tree to find a complete chain of unrevoked and current
certificates.  The chain must end in a self-signed certificate.
Then, on the "way down", check that at least one certificate
in the chain is trusted.
---
 plugins/crypto/openssl/ua_pki_openssl.c | 61 ++++++++++++++-----------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index dbfc94e4bad..3c05aaa2777 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -491,26 +491,22 @@ openSSLCheckRevoked(CertContext *ctx, X509 *cert) {
 
 static UA_StatusCode
 openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
-                    X509 *x509, int depth) {
+                    X509 *cert, int depth) {
     /* Maxiumum chain length */
     if(depth == UA_OPENSSL_MAX_CHAIN_LENGTH)
         return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
 
     /* Verification Step: Validity Period */
-    ASN1_TIME *notBefore = X509_get_notBefore(x509);
-    ASN1_TIME *notAfter = X509_get_notAfter(x509);
+    ASN1_TIME *notBefore = X509_get_notBefore(cert);
+    ASN1_TIME *notAfter = X509_get_notAfter(cert);
     if(X509_cmp_current_time(notBefore) != -1 || X509_cmp_current_time(notAfter) != 1)
-        return UA_STATUSCODE_BADCERTIFICATETIMEINVALID;
+        return (depth == 0) ? UA_STATUSCODE_BADCERTIFICATETIMEINVALID :
+            UA_STATUSCODE_BADCERTIFICATEISSUERTIMEINVALID;
 
     /* Verification Step: Revocation Check */
-    if(openSSLCheckRevoked(ctx, x509))
-        return UA_STATUSCODE_BADCERTIFICATEREVOKED;
-
-    /* Is the certificate in the trust list? If yes, then we are done. */
-    for(int i = 0; i < sk_X509_num(ctx->skTrusted); i++) {
-        if(X509_cmp(x509, sk_X509_value(ctx->skTrusted, i)) == 0)
-            return UA_STATUSCODE_GOOD;
-    }
+    if(openSSLCheckRevoked(ctx, cert))
+        return (depth == 0) ? UA_STATUSCODE_BADCERTIFICATEREVOKED :
+            UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED;
 
     /* Return the most specific error code. BADCERTIFICATECHAININCOMPLETE is
      * returned only if all possible chains are incomplete. */
@@ -519,19 +515,12 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
     while(ret != UA_STATUSCODE_GOOD) {
         /* Find the issuer. We jump back here to find a different path if a
          * subsequent check fails. */
-        issuer = openSSLFindNextIssuer(ctx, stack, x509, issuer);
+        issuer = openSSLFindNextIssuer(ctx, stack, cert, issuer);
         if(!issuer)
             break;
 
-        /* Detect (endless) loops of issuers */
-        for(int i = 0; i < depth; i++) {
-            if(old_issuers[i] == issuer)
-                return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
-        }
-        old_issuers[depth] = issuer;
-
         /* Verification Step: Signature */
-        int opensslRet = X509_verify(x509, X509_get0_pubkey(issuer));
+        int opensslRet = X509_verify(cert, X509_get0_pubkey(issuer));
         if(opensslRet == -1) {
             return UA_STATUSCODE_BADCERTIFICATEINVALID; /* Ill-formed signature */
         } else if(opensslRet == 0) {
@@ -539,15 +528,35 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
             continue;
         }
 
+        /* The certificate is self-signed. We have arrived at the top of the
+         * chain. We check whether the certificate is trusted below. This is the
+         * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
+         * This sinals that the chain is complete (but can be still
+         * untrusted). */
+        if(cert == issuer || X509_cmp(cert, issuer) == 0) {
+            ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
+            continue;
+        }
+
+        /* Detect (endless) loops of issuers. The last one can be skipped by the
+         * check for self-signed just before. */
+        for(int i = 0; i < depth; i++) {
+            if(old_issuers[i] == issuer)
+                return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
+        }
+        old_issuers[depth] = issuer;
+
         /* We have found the issuer certificate used for the signature. Recurse
          * to the next certificate in the chain (verify the current issuer). */
         ret = openSSL_verifyChain(ctx, stack, old_issuers, issuer, depth + 1);
+    }
 
-        /* Problems where x509 != leaf are reported as "untrusted" without the
-         * detailed reason */
-        if(ret != UA_STATUSCODE_GOOD &&
-           ret != UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE)
-            ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
+    /* Is the certificate in the trust list? If yes, then we are done. */
+    if(ret == UA_STATUSCODE_BADCERTIFICATEUNTRUSTED) {
+        for(int i = 0; i < sk_X509_num(ctx->skTrusted); i++) {
+            if(X509_cmp(cert, sk_X509_value(ctx->skTrusted, i)) == 0)
+                return UA_STATUSCODE_GOOD;
+        }
     }
 
     return ret;

From 41647d019f1c5ebefce142e9230778cfcdff71a7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Sep 2024 23:35:45 +0200
Subject: [PATCH 1646/1963] feat(pubsub): Silence errors on PubSub connections
 with a timeout to avoid logging floods

---
 src/pubsub/ua_pubsub.h            |  2 ++
 src/pubsub/ua_pubsub_connection.c | 11 ++++++++---
 src/pubsub/ua_pubsub_eventloop.c  | 11 ++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub.h b/src/pubsub/ua_pubsub.h
index 51a86e1e18a..cb8e094bbd3 100644
--- a/src/pubsub/ua_pubsub.h
+++ b/src/pubsub/ua_pubsub.h
@@ -162,6 +162,8 @@ typedef struct UA_PubSubConnection {
 
     UA_UInt16 configurationFreezeCounter;
 
+    UA_DateTime silenceErrorUntil; /* Avoid generating too many logs */
+
     UA_Boolean deleteFlag; /* To be deleted - in addition to the PubSubState */
     UA_DelayedCallback dc; /* For delayed freeing */
 } UA_PubSubConnection;
diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index b763ca1ddb9..1c333b69ee0 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -65,9 +65,14 @@ decodeNetworkMessage(UA_Server *server, UA_ByteString *buffer, size_t *pos,
 
 loops_exit:
     if(!processed) {
-        UA_LOG_INFO_CONNECTION(server->config.logging, connection,
-                               "Dataset reader not found. Check PublisherId, "
-                               "WriterGroupId and DatasetWriterId");
+        UA_DateTime nowM = UA_DateTime_nowMonotonic();
+        if(connection->silenceErrorUntil < nowM) {
+            UA_LOG_INFO_CONNECTION(server->config.logging, connection,
+                                   "Dataset reader not found. Check PublisherId, "
+                                   "WriterGroupId and DatasetWriterId. "
+                                   "(This error is now silenced for 10s.)");
+            connection->silenceErrorUntil = nowM + (UA_DateTime)(10.0 * UA_DATETIME_SEC);
+        }
         /* Possible multicast scenario: there are multiple connections (with one
          * or more ReaderGroups) within a multicast group every connection
          * receives all network messages, even if some of them are not meant for
diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index a542eec7183..2d1db067f7a 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -253,9 +253,14 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 
     if(!processed) {
-        UA_LOG_WARNING_CONNECTION(server->config.logging, psc,
-                                  "Message received that could not be processed. "
-                                  "Check PublisherID, WriterGroupID and DatasetWriterID.");
+        UA_DateTime nowM = UA_DateTime_nowMonotonic();
+        if(psc->silenceErrorUntil < nowM) {
+            UA_LOG_WARNING_CONNECTION(server->config.logging, psc,
+                                      "Message received that could not be processed. "
+                                      "Check PublisherID, WriterGroupID and DatasetWriterID. "
+                                      "(This error is now silenced for 10s.)");
+            psc->silenceErrorUntil = nowM + (UA_DateTime)(10.0 * UA_DATETIME_SEC);
+        }
     }
 
     UA_UNLOCK(&server->serviceMutex);

From 420205d914b5c80b165aa7dce680bd856936b027 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Sep 2024 00:31:31 +0200
Subject: [PATCH 1647/1963] fix(server): Fix handling of ternary logic NULL in
 EventFilters

---
 src/server/ua_subscription_events_filter.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 945d67b0ef3..38ed7e8b219 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -29,9 +29,9 @@ static UA_Ternary
 UA_Ternary_and(UA_Ternary first, UA_Ternary second) {
     if(first == UA_TERNARY_FALSE || second == UA_TERNARY_FALSE)
         return UA_TERNARY_FALSE;
-    if(first == UA_TERNARY_TRUE && second == UA_TERNARY_TRUE)
-        return UA_TERNARY_TRUE;
-    return UA_TERNARY_NULL;
+    if(first == UA_TERNARY_NULL || second == UA_TERNARY_NULL)
+        return UA_TERNARY_NULL;
+    return UA_TERNARY_TRUE;
 }
 
 static UA_Ternary
@@ -39,7 +39,7 @@ UA_Ternary_or(UA_Ternary first, UA_Ternary second) {
     if(first == UA_TERNARY_TRUE || second == UA_TERNARY_TRUE)
         return UA_TERNARY_TRUE;
     if(first == UA_TERNARY_NULL || second == UA_TERNARY_NULL)
-        return UA_TERNARY_TRUE;
+        return UA_TERNARY_NULL;
     return UA_TERNARY_FALSE;
 }
 

From dfe4eea31e725010336894be5c7bf21fa3764166 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Sep 2024 00:27:51 +0200
Subject: [PATCH 1648/1963] fix(core): Fix type access when comparing
 ExtensionObjects

---
 src/ua_types.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_types.c b/src/ua_types.c
index c2c14cccac0..2fff32e18bb 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -1436,7 +1436,7 @@ extensionObjectOrder(const UA_ExtensionObject *p1, const UA_ExtensionObject *p2,
     case UA_EXTENSIONOBJECT_DECODED:
     default: {
             const UA_DataType *type1 = p1->content.decoded.type;
-            const UA_DataType *type2 = p1->content.decoded.type;
+            const UA_DataType *type2 = p2->content.decoded.type;
             if(type1 != type2)
                 return ((uintptr_t)type1 < (uintptr_t)type2) ? UA_ORDER_LESS : UA_ORDER_MORE;
             if(!type1)

From c47f6cf02a73a3b84511674a31daa0024dcb771c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Sep 2024 15:39:47 +0200
Subject: [PATCH 1649/1963] fix(client): Fix a length check in
 ua_client_connect.c

---
 src/client/ua_client_connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 7b1b2f7db4f..dd76b57d0ae 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -206,7 +206,7 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
         UA_ByteString signData = UA_BYTESTRING_NULL;
         size_t signDataSize =
             channel->remoteCertificate.length + client->serverSessionNonce.length;
-        if(dataToSignSize > MAX_DATA_SIZE) {
+        if(signDataSize > MAX_DATA_SIZE) {
             retval = UA_STATUSCODE_BADINTERNALERROR;
             goto cleanup;
         }

From 72799b04143b1b480a64999ff13db15e82e4fc05 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Sep 2024 15:40:33 +0200
Subject: [PATCH 1650/1963] refactor(pubsub): Unify identical switch cases

---
 src/pubsub/ua_pubsub_dataset.c |  2 --
 src/pubsub/ua_pubsub_writer.c  | 14 ++++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 34b0592144f..7248146beda 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -669,8 +669,6 @@ UA_PublishedDataSet_create(UA_Server *server,
     result.configurationVersion.minorVersion = UA_PubSubConfigurationVersionTimeDifference();
     switch(newConfig->publishedDataSetType) {
     case UA_PUBSUB_DATASET_PUBLISHEDEVENTS_TEMPLATE:
-        res = UA_STATUSCODE_BADNOTSUPPORTED;
-        break;
     case UA_PUBSUB_DATASET_PUBLISHEDEVENTS:
         res = UA_STATUSCODE_BADNOTSUPPORTED;
         break;
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 4e915beb83a..5a735fb4ebb 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -854,21 +854,15 @@ UA_DataSetWriter_generateDataSetMessage(UA_Server *server,
         if((u64)jsonDsm->dataSetMessageContentMask &
            (u64)UA_JSONDATASETMESSAGECONTENTMASK_METADATAVERSION) {
             dataSetMessage->header.configVersionMajorVersionEnabled = true;
-            if(heartbeat){
-                dataSetMessage->header.configVersionMajorVersion = 0;
-            } else {
-                dataSetMessage->header.configVersionMajorVersion =
-                currentDataSet->dataSetMetaData.configurationVersion.majorVersion;
-            }
-       }
-        if((u64)jsonDsm->dataSetMessageContentMask &
-           (u64)UA_JSONDATASETMESSAGECONTENTMASK_METADATAVERSION) {
             dataSetMessage->header.configVersionMinorVersionEnabled = true;
             if(heartbeat){
+                dataSetMessage->header.configVersionMajorVersion = 0;
                 dataSetMessage->header.configVersionMinorVersion = 0;
             } else {
+                dataSetMessage->header.configVersionMajorVersion =
+                    currentDataSet->dataSetMetaData.configurationVersion.majorVersion;
                 dataSetMessage->header.configVersionMinorVersion =
-                currentDataSet->dataSetMetaData.configurationVersion.minorVersion;
+                    currentDataSet->dataSetMetaData.configurationVersion.minorVersion;
             }
        }
 

From c166551073e048d60c262d7465b943ab6abf50cb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 30 Sep 2024 15:41:17 +0200
Subject: [PATCH 1651/1963] refactor(server): Small simplifications suggested
 by static code analysis

---
 src/server/ua_server_utils.c               |  3 ---
 src/server/ua_services_nodemanagement.c    | 12 ++++++------
 src/server/ua_subscription_monitoreditem.c |  5 ++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/server/ua_server_utils.c b/src/server/ua_server_utils.c
index f70f21efce1..ac0acd5b45a 100644
--- a/src/server/ua_server_utils.c
+++ b/src/server/ua_server_utils.c
@@ -36,9 +36,6 @@ getNodeType(UA_Server *server, const UA_NodeHead *head) {
     UA_Boolean inverse;
     switch(head->nodeClass) {
     case UA_NODECLASS_OBJECT:
-        parentRefIndex = UA_REFERENCETYPEINDEX_HASTYPEDEFINITION;
-        inverse = false;
-        break;
     case UA_NODECLASS_VARIABLE:
         parentRefIndex = UA_REFERENCETYPEINDEX_HASTYPEDEFINITION;
         inverse = false;
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 5a4ca440648..40908b79501 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -375,10 +375,11 @@ typeCheckVariableNode(UA_Server *server, UA_Session *session,
     }
 
     /* Type-check the value */
-    if(retval == UA_STATUSCODE_GOOD &&
-       !compatibleValue(server, session, &node->dataType, node->valueRank,
-                        node->arrayDimensionsSize, node->arrayDimensions,
-                        &value.value, NULL, &reason)) {
+    UA_Boolean compatible =
+        compatibleValue(server, session, &node->dataType,
+            node->valueRank, node->arrayDimensionsSize,
+            node->arrayDimensions, &value.value, NULL, &reason);
+    if(!compatible) {
         UA_LOG_NODEID_INFO(&node->head.nodeId,
            UA_LOG_INFO_SESSION(server->config.logging, session,
                                "AddNode (%.*s): The VariableNode value has "
@@ -1587,10 +1588,9 @@ addNode_finish(UA_Server *server, UA_Session *session, const UA_NodeId *nodeId)
     }
 
  cleanup:
+    UA_NODESTORE_RELEASE(server, node);
     if(type)
         UA_NODESTORE_RELEASE(server, type);
-    if(node)
-        UA_NODESTORE_RELEASE(server, node);
     if(retval != UA_STATUSCODE_GOOD)
         deleteNode(server, *nodeId, true);
     return retval;
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 95ca6b3dfab..1055e5cc138 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -276,9 +276,9 @@ UA_Notification_enqueueAndTrigger(UA_Server *server, UA_Notification *n) {
         mon->triggeredUntil > UA_DateTime_nowMonotonic())) {
         UA_Notification_enqueueSub(n);
         mon->triggeredUntil = UA_INT64_MIN;
-        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, mon->subscription,
+        UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                                   "Notification enqueued (Queue size %lu)",
-                                  (long unsigned)mon->subscription->notificationQueueSize);
+                                  (long unsigned)sub->notificationQueueSize);
     }
 
     /* Insert into the MonitoredItem. This checks the queue size and
@@ -430,7 +430,6 @@ UA_Server_registerMonitoredItem(UA_Server *server, UA_MonitoredItem *mon) {
     UA_Subscription *sub = mon->subscription;
     if(sub) {
         mon->monitoredItemId = ++sub->lastMonitoredItemId;
-        mon->subscription = sub;
         sub->monitoredItemsSize++;
         LIST_INSERT_HEAD(&sub->monitoredItems, mon, listEntry);
     } else {

From ba22a985236ac2bded77e47fdcabe7b6303d3b15 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 27 Sep 2024 22:54:10 +0200
Subject: [PATCH 1652/1963] fix(plugins): More thorough validation that the
 issuer is a valid CA

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c     | 94 ++++++++++++++-------
 plugins/crypto/openssl/ua_pki_openssl.c     | 28 ++++--
 tests/encryption/check_save_rejected_cert.c |  2 +-
 3 files changed, 84 insertions(+), 40 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 298e92e8936..0d3c2fa915b 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -15,6 +15,7 @@
 #include "securitypolicy_mbedtls_common.h"
 
 #include <mbedtls/x509.h>
+#include <mbedtls/oid.h>
 #include <mbedtls/x509_crt.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/error.h>
@@ -236,31 +237,63 @@ reloadCertificates(const UA_CertificateVerification *cv, CertInfo *ci) {
 
 #endif
 
+#define UA_MBEDTLS_MAX_CHAIN_LENGTH 10
+#define UA_MBEDTLS_MAX_DN_LENGTH 256
+
 /* We need to access some private fields below */
 #ifndef MBEDTLS_PRIVATE
 #define MBEDTLS_PRIVATE(x) x
 #endif
 
-/* Return the first matching issuer candidate AFTER prev */
+/* Is the certificate a CA? */
+static UA_Boolean
+mbedtlsCheckCA(mbedtls_x509_crt *cert) {
+    /* The Basic Constraints extension must be set and the cert acts as CA */
+    if(!(cert->MBEDTLS_PRIVATE(ext_types) & MBEDTLS_X509_EXT_BASIC_CONSTRAINTS) ||
+       !cert->MBEDTLS_PRIVATE(ca_istrue))
+        return false;
+
+    /* The Key Usage extension must be set to cert signing and CRL issuing */
+    if(!(cert->MBEDTLS_PRIVATE(ext_types) & MBEDTLS_X509_EXT_KEY_USAGE) ||
+       mbedtls_x509_crt_check_key_usage(cert, MBEDTLS_X509_KU_KEY_CERT_SIGN) != 0 ||
+       mbedtls_x509_crt_check_key_usage(cert, MBEDTLS_X509_KU_CRL_SIGN) != 0)
+        return false;
+
+    return true;
+}
+
+static UA_Boolean
+mbedtlsSameName(UA_String name, const mbedtls_x509_name *name2) {
+    char buf[UA_MBEDTLS_MAX_DN_LENGTH];
+    int len = mbedtls_x509_dn_gets(buf, UA_MBEDTLS_MAX_DN_LENGTH, name2);
+    if(len < 0)
+        return false;
+    UA_String nameString = {(size_t)len, (UA_Byte*)buf};
+    return UA_String_equal(&name, &nameString);
+}
+
+/* Return the first matching issuer candidate AFTER prev.
+ * This can return the cert itself if self-signed. */
 static mbedtls_x509_crt *
 mbedtlsFindNextIssuer(CertInfo *ci, mbedtls_x509_crt *stack,
                       mbedtls_x509_crt *cert, mbedtls_x509_crt *prev) {
-    char inbuf[512], snbuf[512];
-    if(mbedtls_x509_dn_gets(inbuf, 512, &cert->issuer) < 0)
+    char inbuf[UA_MBEDTLS_MAX_DN_LENGTH];
+    int nameLen = mbedtls_x509_dn_gets(inbuf, UA_MBEDTLS_MAX_DN_LENGTH, &cert->issuer);
+    if(nameLen < 0)
         return NULL;
+    UA_String issuerName = {(size_t)nameLen, (UA_Byte*)inbuf};
     do {
         for(mbedtls_x509_crt *i = stack; i; i = i->next) {
-            /* Compare issuer name and subject name */
-            if(mbedtls_x509_dn_gets(snbuf, 512, &i->subject) < 0)
-                continue;
-            if(strncmp(inbuf, snbuf, 512) != 0)
-                continue;
-            /* Skip when the key does not match the signature */
-            if(!mbedtls_pk_can_do(&i->pk, cert->MBEDTLS_PRIVATE(sig_pk)))
+            if(prev) {
+                if(prev == i)
+                    prev = NULL; /* This was the last issuer we tried to verify */
                 continue;
-            if(prev == NULL)
+            }
+            /* Compare issuer name and subject name.
+             * Skip when the key does not match the signature. */
+            if(mbedtlsSameName(issuerName, &i->subject) &&
+               mbedtls_pk_can_do(&i->pk, cert->MBEDTLS_PRIVATE(sig_pk)))
                 return i;
-            prev = NULL; /* This was the last issuer we tried to verify */
         }
         /* Switch from the stack that came with the cert to the ctx->skIssue list */
         stack = (stack != &ci->certificateIssuerList) ? &ci->certificateIssuerList : NULL;
@@ -270,17 +303,16 @@ mbedtlsFindNextIssuer(CertInfo *ci, mbedtls_x509_crt *stack,
 
 static UA_Boolean
 mbedtlsCheckRevoked(CertInfo *ci, mbedtls_x509_crt *cert) {
-    char inbuf[512], inbuf2[512];
-    if(mbedtls_x509_dn_gets(inbuf, 512, &cert->issuer) < 0)
+    char inbuf[UA_MBEDTLS_MAX_DN_LENGTH];
+    int nameLen = mbedtls_x509_dn_gets(inbuf, UA_MBEDTLS_MAX_DN_LENGTH, &cert->issuer);
+    if(nameLen < 0)
         return true;
+    UA_String issuerName = {(size_t)nameLen, (UA_Byte*)inbuf};
     for(mbedtls_x509_crl *crl = &ci->certificateRevocationList; crl; crl = crl->next) {
-        /* Is the CRL for the issuer of the certificate? */
-        if(mbedtls_x509_dn_gets(inbuf2, 512, &crl->issuer) < 0)
-            return true;
-        if(strncmp(inbuf, inbuf2, 512) != 0)
-            continue;
-        /* Is the serial number of the certificate contained in the CRL? */
-        if(mbedtls_x509_crt_is_revoked(cert, crl) != 0)
+        /* Is the CRL for certificates from the cert issuer?
+         * Is the serial number of the certificate contained in the CRL? */
+        if(mbedtlsSameName(issuerName, &crl->issuer) &&
+           mbedtls_x509_crt_is_revoked(cert, crl) != 0)
             return true;
     }
     return false;
@@ -309,8 +341,6 @@ mbedtlsCheckSignature(const mbedtls_x509_crt *cert, mbedtls_x509_crt *issuer) {
                                   hash, hash_len, sig->p, sig->len) == 0);
 }
 
-#define UA_MBEDTLS_MAX_CHAIN_LENGTH 10
-
 static UA_StatusCode
 mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old_issuers,
                    mbedtls_x509_crt *cert, int depth) {
@@ -341,6 +371,13 @@ mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old
         if(!issuer)
             break;
 
+        /* Verification Step: Certificate Usage
+         * Can the issuer act as CA? Omit for self-signed leaf certificates. */
+        if((depth > 0 || issuer != cert) && !mbedtlsCheckCA(issuer)) {
+            ret = UA_STATUSCODE_BADCERTIFICATEISSUERUSENOTALLOWED;
+            continue;
+        }
+
         /* Verification Step: Signature */
         if(!mbedtlsCheckSignature(cert, issuer)) {
             ret = UA_STATUSCODE_BADCERTIFICATEINVALID;  /* Wrong issuer, try again */
@@ -350,7 +387,7 @@ mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old
         /* The certificate is self-signed. We have arrived at the top of the
          * chain. We check whether the certificate is trusted below. This is the
          * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
-         * This sinals that the chain is complete (but can be still
+         * This signals that the chain is complete (but can be still
          * untrusted). */
         if(issuer == cert || (cert->tbs.len == issuer->tbs.len &&
                               memcmp(cert->tbs.p, issuer->tbs.p, cert->tbs.len) == 0)) {
@@ -412,12 +449,9 @@ certificateVerification_verify(const UA_CertificateVerification *cv,
 
     /* Verification Step: Certificate Usage
      * Check whether the certificate is a User certificate or a CA certificate.
-     * If the KU_KEY_CERT_SIGN and KU_CRL_SIGN of key_usage are set, then the
-     * certificate shall be condidered as CA Certificate and cannot be used to
-     * establish a connection. Refer the test case CTT/Security/Security
-     * Certificate Validation/029.js for more details */
-    unsigned int ca_flags = MBEDTLS_X509_KU_KEY_CERT_SIGN | MBEDTLS_X509_KU_CRL_SIGN;
-    if(mbedtls_x509_crt_check_key_usage(&cert, ca_flags)) {
+     * Refer the test case CTT/Security/Security Certificate Validation/029.js
+     * for more details. */
+    if(mbedtlsCheckCA(&cert)) {
         mbedtls_x509_crt_free(&cert);
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
     }
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 525823e8474..30e0782b245 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -467,11 +467,16 @@ openSSLFindNextIssuer(CertContext *ctx, STACK_OF(X509) *stack, X509 *x509, X509
         int size = sk_X509_num(stack);
         for(int i = 0; i < size; i++) {
             X509 *candidate = sk_X509_value(stack, i);
-            if(X509_check_issued(candidate, x509) != 0)
+            if(prev) {
+                if(prev == candidate)
+                    prev = NULL; /* This was the last issuer we tried to verify */
                 continue;
-            if(prev == NULL)
+            }
+            /* This checks subject/issuer name and the key usage of the issuer.
+             * It does not verify the validity period and if the issuer key was
+             * used for the signature. We check that afterwards. */
+            if(X509_check_issued(candidate, x509) == 0)
                 return candidate;
-            prev = NULL;
         }
         /* Switch to search in the ctx->skIssue list */
         stack = (stack != ctx->skIssue) ? ctx->skIssue : NULL;
@@ -532,6 +537,13 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
         if(!issuer)
             break;
 
+        /* Verification Step: Certificate Usage
+         * Can the issuer act as CA? Omit for self-signed leaf certificates. */
+        if((depth > 0 || issuer != cert) && !X509_check_ca(issuer)) {
+            ret = UA_STATUSCODE_BADCERTIFICATEISSUERUSENOTALLOWED;
+            continue;
+        }
+
         /* Verification Step: Signature */
         int opensslRet = X509_verify(cert, X509_get0_pubkey(issuer));
         if(opensslRet == -1) {
@@ -544,7 +556,7 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
         /* The certificate is self-signed. We have arrived at the top of the
          * chain. We check whether the certificate is trusted below. This is the
          * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
-         * This sinals that the chain is complete (but can be still
+         * This signals that the chain is complete (but can be still
          * untrusted). */
         if(cert == issuer || X509_cmp(cert, issuer) == 0) {
             ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
@@ -602,12 +614,10 @@ UA_CertificateVerification_Verify(const UA_CertificateVerification *cv,
 
     /* Verification Step: Certificate Usage
      * Check whether the certificate is a User certificate or a CA certificate.
-     * If the KU_KEY_CERT_SIGN and KU_CRL_SIGN of key_usage are set, then the
-     * certificate shall be condidered as CA Certificate and cannot be used to
-     * establish a connection. Refer the test case CTT/Security/Security
-     * Certificate Validation/029.js for more details */
+     * Refer the test case CTT/Security/Security Certificate Validation/029.js
+     * for more details. */
     X509 *leaf = sk_X509_value(stack, 0);
-    if(X509_check_purpose(leaf, X509_PURPOSE_CRL_SIGN, 0) && X509_check_ca(leaf)) {
+    if(X509_check_ca(leaf)) {
         sk_X509_pop_free(stack, X509_free);
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
     }
diff --git a/tests/encryption/check_save_rejected_cert.c b/tests/encryption/check_save_rejected_cert.c
index 33348107cbf..b23c55ac55b 100644
--- a/tests/encryption/check_save_rejected_cert.c
+++ b/tests/encryption/check_save_rejected_cert.c
@@ -466,7 +466,7 @@ START_TEST(encryption_connect_reject_cert) {
 #ifdef __linux__
     /* Secure client connect */
     retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCERTIFICATETIMEINVALID);
 
     char rejectedFileName [256] = {0};
     strcat(rejectedFileName, "./");

From e063ab1cf649b15aa777f07101486178fe524154 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 2 Oct 2024 10:25:28 +0200
Subject: [PATCH 1653/1963] fix(tests): Correct certificate validation chain
 for the SKS unit tests

---
 tests/pubsub/check_pubsub_sks_client.c | 32 +++++++++++++++++------
 tests/pubsub/check_pubsub_sks_pull.c   | 35 +++++++++++++++++++-------
 tests/pubsub/check_pubsub_sks_push.c   | 34 +++++++++++++++++--------
 3 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index 3e96d646af2..554dbc67fb8 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -11,6 +11,7 @@
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
+#include <open62541/plugin/pki_default.h>
 
 #include "ua_pubsub.h"
 #include "ua_pubsub_keystorage.h"
@@ -148,10 +149,23 @@ skssetup(void) {
     privateKey.length = KEY_DER_LENGTH;
     privateKey.data = KEY_DER_DATA;
 
-    size_t trustListSize = 0;
-    UA_ByteString *trustList = NULL;
-    size_t issuerListSize = 0;
-    UA_ByteString *issuerList = NULL;
+    UA_ByteString rootCa = {ROOT_CERT_DER_LENGTH, ROOT_CERT_DER_DATA};
+    UA_ByteString rootCaCrl = {ROOT_CRL_PEM_LENGTH, ROOT_CRL_PEM_DATA};
+    UA_ByteString intermediateCa = {INTERMEDIATE_CERT_DER_LENGTH, INTERMEDIATE_CERT_DER_DATA};
+    UA_ByteString intermediateCaCrl = {INTERMEDIATE_EMPTY_CRL_PEM_LENGTH, INTERMEDIATE_EMPTY_CRL_PEM_DATA};
+
+    /* Load the trustlist */
+    size_t trustListSize = 2;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
+    trustList[0] = intermediateCa;
+    trustList[1] = rootCa;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 2;
+    UA_STACKARRAY(UA_ByteString, issuerList, issuerListSize);
+    issuerList[0] = rootCa;
+    issuerList[1] = intermediateCa;
+
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
@@ -456,12 +470,12 @@ newEncryptedClientConfig(const char *username, const char *password) {
 
     /* Load certificate and private key */
     UA_ByteString certificate;
-    certificate.length = CERT_DER_LENGTH;
-    certificate.data = CERT_DER_DATA;
+    certificate.length = APPLICATION_CERT_DER_LENGTH;
+    certificate.data = APPLICATION_CERT_DER_DATA;
 
     UA_ByteString privateKey;
-    privateKey.length = KEY_DER_LENGTH;
-    privateKey.data = KEY_DER_DATA;
+    privateKey.length = APPLICATION_KEY_DER_LENGTH;
+    privateKey.data = APPLICATION_KEY_DER_DATA;
 
     /* Secure client initialization */
 
@@ -474,6 +488,8 @@ newEncryptedClientConfig(const char *username, const char *password) {
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
 
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
     UA_UserNameIdentityToken* identityToken = UA_UserNameIdentityToken_new();
     identityToken->userName = UA_STRING_ALLOC(username);
     identityToken->password = UA_STRING_ALLOC(password);
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index 0916a03d576..f7b0bb8f0da 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -11,6 +11,7 @@
 #include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
+#include <open62541/plugin/pki_default.h>
 
 #include "ua_pubsub.h"
 #include "ua_pubsub_keystorage.h"
@@ -113,12 +114,27 @@ setup(void) {
     privateKey.length = KEY_DER_LENGTH;
     privateKey.data = KEY_DER_DATA;
 
-    size_t trustListSize = 0;
-    UA_ByteString *trustList = NULL;
-    size_t issuerListSize = 0;
-    UA_ByteString *issuerList = NULL;
+    UA_ByteString rootCa = {ROOT_CERT_DER_LENGTH, ROOT_CERT_DER_DATA};
+    UA_ByteString rootCaCrl = {ROOT_CRL_PEM_LENGTH, ROOT_CRL_PEM_DATA};
+    UA_ByteString intermediateCa = {INTERMEDIATE_CERT_DER_LENGTH, INTERMEDIATE_CERT_DER_DATA};
+    UA_ByteString intermediateCaCrl = {INTERMEDIATE_EMPTY_CRL_PEM_LENGTH, INTERMEDIATE_EMPTY_CRL_PEM_DATA};
+
+    /* Load the trustlist */
+    size_t trustListSize = 2;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
+    trustList[0] = intermediateCa;
+    trustList[1] = rootCa;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 2;
+    UA_STACKARRAY(UA_ByteString, issuerList, issuerListSize);
+    issuerList[0] = rootCa;
+    issuerList[1] = intermediateCa;
+
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
+
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     sksServer = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(sksServer);
@@ -192,13 +208,12 @@ encyrptedclientconnect(UA_Client *client) {
 
     /* Load certificate and private key */
     UA_ByteString certificate;
-    certificate.length = CERT_DER_LENGTH;
-    certificate.data = CERT_DER_DATA;
-    ck_assert_uint_ne(certificate.length, 0);
+    certificate.length = APPLICATION_CERT_DER_LENGTH;
+    certificate.data = APPLICATION_CERT_DER_DATA;
 
     UA_ByteString privateKey;
-    privateKey.length = KEY_DER_LENGTH;
-    privateKey.data = KEY_DER_DATA;
+    privateKey.length = APPLICATION_KEY_DER_LENGTH;
+    privateKey.data = APPLICATION_KEY_DER_DATA;
     ck_assert_uint_ne(privateKey.length, 0);
 
     /* Secure client initialization */
@@ -212,6 +227,8 @@ encyrptedclientconnect(UA_Client *client) {
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
     ck_assert(client != NULL);
 
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index 3dd0273848d..5d8fb1fcb64 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -12,6 +12,7 @@
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
+#include <open62541/plugin/pki_default.h>
 
 #include "../encryption/certificates.h"
 #include "ua_pubsub.h"
@@ -74,14 +75,12 @@ encyrptedclientconnect(UA_Client *client) {
 
     /* Load certificate and private key */
     UA_ByteString certificate;
-    certificate.length = CERT_DER_LENGTH;
-    certificate.data = CERT_DER_DATA;
-    ck_assert_uint_ne(certificate.length, 0);
+    certificate.length = APPLICATION_CERT_DER_LENGTH;
+    certificate.data = APPLICATION_CERT_DER_DATA;
 
     UA_ByteString privateKey;
-    privateKey.length = KEY_DER_LENGTH;
-    privateKey.data = KEY_DER_DATA;
-    ck_assert_uint_ne(privateKey.length, 0);
+    privateKey.length = APPLICATION_KEY_DER_LENGTH;
+    privateKey.data = APPLICATION_KEY_DER_DATA;
 
     /* Secure client initialization */
     UA_ClientConfig *cc = UA_Client_getConfig(client);
@@ -94,6 +93,8 @@ encyrptedclientconnect(UA_Client *client) {
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
     ck_assert(client != NULL);
 
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
     /* Secure client connect */
     return UA_Client_connect(client, "opc.tcp://localhost:4840");
 }
@@ -195,10 +196,23 @@ setup(void) {
     privateKey.length = KEY_DER_LENGTH;
     privateKey.data = KEY_DER_DATA;
 
-    size_t trustListSize = 0;
-    UA_ByteString *trustList = NULL;
-    size_t issuerListSize = 0;
-    UA_ByteString *issuerList = NULL;
+    UA_ByteString rootCa = {ROOT_CERT_DER_LENGTH, ROOT_CERT_DER_DATA};
+    UA_ByteString rootCaCrl = {ROOT_CRL_PEM_LENGTH, ROOT_CRL_PEM_DATA};
+    UA_ByteString intermediateCa = {INTERMEDIATE_CERT_DER_LENGTH, INTERMEDIATE_CERT_DER_DATA};
+    UA_ByteString intermediateCaCrl = {INTERMEDIATE_EMPTY_CRL_PEM_LENGTH, INTERMEDIATE_EMPTY_CRL_PEM_DATA};
+
+    /* Load the trustlist */
+    size_t trustListSize = 2;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize);
+    trustList[0] = intermediateCa;
+    trustList[1] = rootCa;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 2;
+    UA_STACKARRAY(UA_ByteString, issuerList, issuerListSize);
+    issuerList[0] = rootCa;
+    issuerList[1] = intermediateCa;
+
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 

From f9d4c1631032f1d1232cb75ab38d74081e87882f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 27 Sep 2024 22:54:10 +0200
Subject: [PATCH 1654/1963] fix(plugins): More thorough validation that the
 issuer is a valid CA

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 94 +++++++++++++++++--------
 plugins/crypto/openssl/ua_pki_openssl.c | 28 +++++---
 2 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index ac3bf38814e..2abc1bf4323 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -13,6 +13,7 @@
 #ifdef UA_ENABLE_ENCRYPTION_MBEDTLS
 
 #include <mbedtls/x509.h>
+#include <mbedtls/oid.h>
 #include <mbedtls/x509_crt.h>
 #include <mbedtls/error.h>
 #include <mbedtls/version.h>
@@ -232,31 +233,63 @@ reloadCertificates(CertInfo *ci) {
 
 #endif
 
+#define UA_MBEDTLS_MAX_CHAIN_LENGTH 10
+#define UA_MBEDTLS_MAX_DN_LENGTH 256
+
 /* We need to access some private fields below */
 #ifndef MBEDTLS_PRIVATE
 #define MBEDTLS_PRIVATE(x) x
 #endif
 
-/* Return the first matching issuer candidate AFTER prev */
+/* Is the certificate a CA? */
+static UA_Boolean
+mbedtlsCheckCA(mbedtls_x509_crt *cert) {
+    /* The Basic Constraints extension must be set and the cert acts as CA */
+    if(!(cert->MBEDTLS_PRIVATE(ext_types) & MBEDTLS_X509_EXT_BASIC_CONSTRAINTS) ||
+       !cert->MBEDTLS_PRIVATE(ca_istrue))
+        return false;
+
+    /* The Key Usage extension must be set to cert signing and CRL issuing */
+    if(!(cert->MBEDTLS_PRIVATE(ext_types) & MBEDTLS_X509_EXT_KEY_USAGE) ||
+       mbedtls_x509_crt_check_key_usage(cert, MBEDTLS_X509_KU_KEY_CERT_SIGN) != 0 ||
+       mbedtls_x509_crt_check_key_usage(cert, MBEDTLS_X509_KU_CRL_SIGN) != 0)
+        return false;
+
+    return true;
+}
+
+static UA_Boolean
+mbedtlsSameName(UA_String name, const mbedtls_x509_name *name2) {
+    char buf[UA_MBEDTLS_MAX_DN_LENGTH];
+    int len = mbedtls_x509_dn_gets(buf, UA_MBEDTLS_MAX_DN_LENGTH, name2);
+    if(len < 0)
+        return false;
+    UA_String nameString = {(size_t)len, (UA_Byte*)buf};
+    return UA_String_equal(&name, &nameString);
+}
+
+/* Return the first matching issuer candidate AFTER prev.
+ * This can return the cert itself if self-signed. */
 static mbedtls_x509_crt *
 mbedtlsFindNextIssuer(CertInfo *ci, mbedtls_x509_crt *stack,
                       mbedtls_x509_crt *cert, mbedtls_x509_crt *prev) {
-    char inbuf[512], snbuf[512];
-    if(mbedtls_x509_dn_gets(inbuf, 512, &cert->issuer) < 0)
+    char inbuf[UA_MBEDTLS_MAX_DN_LENGTH];
+    int nameLen = mbedtls_x509_dn_gets(inbuf, UA_MBEDTLS_MAX_DN_LENGTH, &cert->issuer);
+    if(nameLen < 0)
         return NULL;
+    UA_String issuerName = {(size_t)nameLen, (UA_Byte*)inbuf};
     do {
         for(mbedtls_x509_crt *i = stack; i; i = i->next) {
-            /* Compare issuer name and subject name */
-            if(mbedtls_x509_dn_gets(snbuf, 512, &i->subject) < 0)
-                continue;
-            if(strncmp(inbuf, snbuf, 512) != 0)
-                continue;
-            /* Skip when the key does not match the signature */
-            if(!mbedtls_pk_can_do(&i->pk, cert->MBEDTLS_PRIVATE(sig_pk)))
+            if(prev) {
+                if(prev == i)
+                    prev = NULL; /* This was the last issuer we tried to verify */
                 continue;
-            if(prev == NULL)
+            }
+            /* Compare issuer name and subject name.
+             * Skip when the key does not match the signature. */
+            if(mbedtlsSameName(issuerName, &i->subject) &&
+               mbedtls_pk_can_do(&i->pk, cert->MBEDTLS_PRIVATE(sig_pk)))
                 return i;
-            prev = NULL; /* This was the last issuer we tried to verify */
         }
         /* Switch from the stack that came with the cert to the ctx->skIssue list */
         stack = (stack != &ci->certificateIssuerList) ? &ci->certificateIssuerList : NULL;
@@ -266,17 +299,16 @@ mbedtlsFindNextIssuer(CertInfo *ci, mbedtls_x509_crt *stack,
 
 static UA_Boolean
 mbedtlsCheckRevoked(CertInfo *ci, mbedtls_x509_crt *cert) {
-    char inbuf[512], inbuf2[512];
-    if(mbedtls_x509_dn_gets(inbuf, 512, &cert->issuer) < 0)
+    char inbuf[UA_MBEDTLS_MAX_DN_LENGTH];
+    int nameLen = mbedtls_x509_dn_gets(inbuf, UA_MBEDTLS_MAX_DN_LENGTH, &cert->issuer);
+    if(nameLen < 0)
         return true;
+    UA_String issuerName = {(size_t)nameLen, (UA_Byte*)inbuf};
     for(mbedtls_x509_crl *crl = &ci->certificateRevocationList; crl; crl = crl->next) {
-        /* Is the CRL for the issuer of the certificate? */
-        if(mbedtls_x509_dn_gets(inbuf2, 512, &crl->issuer) < 0)
-            return true;
-        if(strncmp(inbuf, inbuf2, 512) != 0)
-            continue;
-        /* Is the serial number of the certificate contained in the CRL? */
-        if(mbedtls_x509_crt_is_revoked(cert, crl) != 0)
+        /* Is the CRL for certificates from the cert issuer?
+         * Is the serial number of the certificate contained in the CRL? */
+        if(mbedtlsSameName(issuerName, &crl->issuer) &&
+           mbedtls_x509_crt_is_revoked(cert, crl) != 0)
             return true;
     }
     return false;
@@ -305,8 +337,6 @@ mbedtlsCheckSignature(const mbedtls_x509_crt *cert, mbedtls_x509_crt *issuer) {
                                   hash, hash_len, sig->p, sig->len) == 0);
 }
 
-#define UA_MBEDTLS_MAX_CHAIN_LENGTH 10
-
 static UA_StatusCode
 mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old_issuers,
                    mbedtls_x509_crt *cert, int depth) {
@@ -337,6 +367,13 @@ mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old
         if(!issuer)
             break;
 
+        /* Verification Step: Certificate Usage
+         * Can the issuer act as CA? Omit for self-signed leaf certificates. */
+        if((depth > 0 || issuer != cert) && !mbedtlsCheckCA(issuer)) {
+            ret = UA_STATUSCODE_BADCERTIFICATEISSUERUSENOTALLOWED;
+            continue;
+        }
+
         /* Verification Step: Signature */
         if(!mbedtlsCheckSignature(cert, issuer)) {
             ret = UA_STATUSCODE_BADCERTIFICATEINVALID;  /* Wrong issuer, try again */
@@ -346,7 +383,7 @@ mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old
         /* The certificate is self-signed. We have arrived at the top of the
          * chain. We check whether the certificate is trusted below. This is the
          * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
-         * This sinals that the chain is complete (but can be still
+         * This signals that the chain is complete (but can be still
          * untrusted). */
         if(issuer == cert || (cert->tbs.len == issuer->tbs.len &&
                               memcmp(cert->tbs.p, issuer->tbs.p, cert->tbs.len) == 0)) {
@@ -408,12 +445,9 @@ certificateVerification_verify(void *verificationContext,
 
     /* Verification Step: Certificate Usage
      * Check whether the certificate is a User certificate or a CA certificate.
-     * If the KU_KEY_CERT_SIGN and KU_CRL_SIGN of key_usage are set, then the
-     * certificate shall be condidered as CA Certificate and cannot be used to
-     * establish a connection. Refer the test case CTT/Security/Security
-     * Certificate Validation/029.js for more details */
-    unsigned int ca_flags = MBEDTLS_X509_KU_KEY_CERT_SIGN | MBEDTLS_X509_KU_CRL_SIGN;
-    if(mbedtls_x509_crt_check_key_usage(&cert, ca_flags)) {
+     * Refer the test case CTT/Security/Security Certificate Validation/029.js
+     * for more details. */
+    if(mbedtlsCheckCA(&cert)) {
         mbedtls_x509_crt_free(&cert);
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
     }
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 3c05aaa2777..d7bb1297e5d 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -454,11 +454,16 @@ openSSLFindNextIssuer(CertContext *ctx, STACK_OF(X509) *stack, X509 *x509, X509
         int size = sk_X509_num(stack);
         for(int i = 0; i < size; i++) {
             X509 *candidate = sk_X509_value(stack, i);
-            if(X509_check_issued(candidate, x509) != 0)
+            if(prev) {
+                if(prev == candidate)
+                    prev = NULL; /* This was the last issuer we tried to verify */
                 continue;
-            if(prev == NULL)
+            }
+            /* This checks subject/issuer name and the key usage of the issuer.
+             * It does not verify the validity period and if the issuer key was
+             * used for the signature. We check that afterwards. */
+            if(X509_check_issued(candidate, x509) == 0)
                 return candidate;
-            prev = NULL;
         }
         /* Switch to search in the ctx->skIssue list */
         stack = (stack != ctx->skIssue) ? ctx->skIssue : NULL;
@@ -519,6 +524,13 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
         if(!issuer)
             break;
 
+        /* Verification Step: Certificate Usage
+         * Can the issuer act as CA? Omit for self-signed leaf certificates. */
+        if((depth > 0 || issuer != cert) && !X509_check_ca(issuer)) {
+            ret = UA_STATUSCODE_BADCERTIFICATEISSUERUSENOTALLOWED;
+            continue;
+        }
+
         /* Verification Step: Signature */
         int opensslRet = X509_verify(cert, X509_get0_pubkey(issuer));
         if(opensslRet == -1) {
@@ -531,7 +543,7 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
         /* The certificate is self-signed. We have arrived at the top of the
          * chain. We check whether the certificate is trusted below. This is the
          * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
-         * This sinals that the chain is complete (but can be still
+         * This signals that the chain is complete (but can be still
          * untrusted). */
         if(cert == issuer || X509_cmp(cert, issuer) == 0) {
             ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
@@ -589,12 +601,10 @@ UA_CertificateVerification_Verify(void *verificationContext,
 
     /* Verification Step: Certificate Usage
      * Check whether the certificate is a User certificate or a CA certificate.
-     * If the KU_KEY_CERT_SIGN and KU_CRL_SIGN of key_usage are set, then the
-     * certificate shall be condidered as CA Certificate and cannot be used to
-     * establish a connection. Refer the test case CTT/Security/Security
-     * Certificate Validation/029.js for more details */
+     * Refer the test case CTT/Security/Security Certificate Validation/029.js
+     * for more details. */
     X509 *leaf = sk_X509_value(stack, 0);
-    if(X509_check_purpose(leaf, X509_PURPOSE_CRL_SIGN, 0) && X509_check_ca(leaf)) {
+    if(X509_check_ca(leaf)) {
         sk_X509_pop_free(stack, X509_free);
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
     }

From 47336a788068960d8171a29ded8698ee81ba5703 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Wed, 2 Oct 2024 21:47:05 +0200
Subject: [PATCH 1655/1963] refactor(build): Bump version to v1.3.13

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbced8259ea..3ff203aeee4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 12)
+set(OPEN62541_VER_PATCH 13)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 3a4f28776bf24078fd0c52fc8e8dd3a63e549e39 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 2 Oct 2024 21:52:40 +0200
Subject: [PATCH 1656/1963] refactor(build): Bump version to v1.4.5

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c26ef2d3884..fbf1e58a971 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 4)
+set(OPEN62541_VER_PATCH 5)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 0a485919909f9db2be916b5ee7c57c3e98c85aa9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 11:12:07 +0200
Subject: [PATCH 1657/1963] fix(plugins): Disable the Basic128Rsa15 and
 Basic256 SecurityPolicy

---
 .../mbedtls/ua_securitypolicy_basic128rsa15.c |  4 ++
 .../mbedtls/ua_securitypolicy_basic256.c      |  5 ++
 .../crypto/openssl/ua_openssl_basic128rsa15.c |  4 ++
 plugins/crypto/openssl/ua_openssl_basic256.c  |  5 ++
 plugins/ua_config_default.c                   | 68 ++++++++++---------
 .../check_encryption_basic128rsa15.c          | 31 ++++++++-
 tests/encryption/check_encryption_basic256.c  | 26 +++++++
 7 files changed, 109 insertions(+), 34 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
index e708c78fdc1..5ede408d31b 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
@@ -746,6 +746,10 @@ UA_SecurityPolicy_Basic128Rsa15(UA_SecurityPolicy *policy, const UA_ByteString l
     memset(policy, 0, sizeof(UA_SecurityPolicy));
     policy->logger = logger;
 
+    UA_LOG_WARNING(logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                   "!! WARNING !! The Basic128Rsa15 SecurityPolicy is unsecure. "
+                   "There are known attacks that break the encryption.");
+
     policy->policyUri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15\0");
 
     UA_SecurityPolicyAsymmetricModule *const asymmetricModule = &policy->asymmetricModule;
diff --git a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
index bf0196bb7f8..fd4ddc008a4 100644
--- a/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
+++ b/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
@@ -667,6 +667,11 @@ policyContext_newContext_sp_basic256(UA_SecurityPolicy *securityPolicy,
 UA_StatusCode
 UA_SecurityPolicy_Basic256(UA_SecurityPolicy *policy, const UA_ByteString localCertificate,
                            const UA_ByteString localPrivateKey, const UA_Logger *logger) {
+
+    UA_LOG_WARNING(logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                   "!! WARNING !! The Basic256 SecurityPolicy is unsecure. "
+                   "There are known attacks that break the encryption.");
+
     memset(policy, 0, sizeof(UA_SecurityPolicy));
     policy->logger = logger;
 
diff --git a/plugins/crypto/openssl/ua_openssl_basic128rsa15.c b/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
index 71affd31655..7e47e4d0729 100644
--- a/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
+++ b/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
@@ -500,6 +500,10 @@ UA_SecurityPolicy_Basic128Rsa15 (UA_SecurityPolicy * policy,
                                  const UA_ByteString localPrivateKey, 
                                  const UA_Logger *   logger) {
 
+    UA_LOG_WARNING(logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                   "!! WARNING !! The Basic128Rsa15 SecurityPolicy is unsecure. "
+                   "There are known attacks that break the encryption.");
+
     UA_SecurityPolicyAsymmetricModule * const asymmetricModule = &policy->asymmetricModule;
     UA_SecurityPolicySymmetricModule * const  symmetricModule = &policy->symmetricModule;  
     UA_SecurityPolicyChannelModule * const    channelModule = &policy->channelModule;  
diff --git a/plugins/crypto/openssl/ua_openssl_basic256.c b/plugins/crypto/openssl/ua_openssl_basic256.c
index e54042a7a02..a3c8903364c 100644
--- a/plugins/crypto/openssl/ua_openssl_basic256.c
+++ b/plugins/crypto/openssl/ua_openssl_basic256.c
@@ -501,6 +501,11 @@ UA_SecurityPolicy_Basic256 (UA_SecurityPolicy * policy,
                             const UA_ByteString localCertificate,
                             const UA_ByteString localPrivateKey, 
                             const UA_Logger *   logger) {
+
+    UA_LOG_WARNING(logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                   "!! WARNING !! The Basic256 SecurityPolicy is unsecure. "
+                   "There are known attacks that break the encryption.");
+
     UA_SecurityPolicyAsymmetricModule * const asymmetricModule = &policy->asymmetricModule;
     UA_SecurityPolicySymmetricModule * const  symmetricModule = &policy->symmetricModule; 
     UA_SecurityPolicyChannelModule * const    channelModule = &policy->channelModule;  
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 8ab5f547f28..b1445975c63 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -639,19 +639,21 @@ UA_ServerConfig_addAllSecurityPolicies(UA_ServerConfig *config,
                        UA_StatusCode_name(retval));
     }
 
-    retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate, &localPrivateKey);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate, &localPrivateKey);
-    if(retval != UA_STATUSCODE_GOOD) {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
+    /* Basic128Rsa15 should no longer be used */
+    /* retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate, &localPrivateKey); */
+    /* if(retval != UA_STATUSCODE_GOOD) { */
+    /*     UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND, */
+    /*                    "Could not add SecurityPolicy#Basic128Rsa15 with error code %s", */
+    /*                    UA_StatusCode_name(retval)); */
+    /* } */
+
+    /* Basic256 should no longer be used */
+    /* retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate, &localPrivateKey); */
+    /* if(retval != UA_STATUSCODE_GOOD) { */
+    /*     UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND, */
+    /*                    "Could not add SecurityPolicy#Basic256 with error code %s", */
+    /*                    UA_StatusCode_name(retval)); */
+    /* } */
 
     retval = UA_ServerConfig_addSecurityPolicyBasic256Sha256(config, &localCertificate, &localPrivateKey);
     if(retval != UA_STATUSCODE_GOOD) {
@@ -838,25 +840,27 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = sp;
                   
-    retval = UA_SecurityPolicy_Basic128Rsa15(&config->securityPolicies[config->securityPoliciesSize],
-                                             localCertificate, privateKey, &config->logger);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->securityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    retval = UA_SecurityPolicy_Basic256(&config->securityPolicies[config->securityPoliciesSize],
-                                        localCertificate, privateKey, &config->logger);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->securityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
+    /* Basic128Rsa15 should no longer be used */
+    /* retval = UA_SecurityPolicy_Basic128Rsa15(&config->securityPolicies[config->securityPoliciesSize], */
+    /*                                          localCertificate, privateKey, &config->logger); */
+    /* if(retval == UA_STATUSCODE_GOOD) { */
+    /*     ++config->securityPoliciesSize; */
+    /* } else { */
+    /*     UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND, */
+    /*                    "Could not add SecurityPolicy#Basic128Rsa15 with error code %s", */
+    /*                    UA_StatusCode_name(retval)); */
+    /* } */
+
+    /* Basic256 should no longer be used */
+    /* retval = UA_SecurityPolicy_Basic256(&config->securityPolicies[config->securityPoliciesSize], */
+    /*                                     localCertificate, privateKey, &config->logger); */
+    /* if(retval == UA_STATUSCODE_GOOD) { */
+    /*     ++config->securityPoliciesSize; */
+    /* } else { */
+    /*     UA_LOG_WARNING(&config->logger, UA_LOGCATEGORY_USERLAND, */
+    /*                    "Could not add SecurityPolicy#Basic256 with error code %s", */
+    /*                    UA_StatusCode_name(retval)); */
+    /* } */
 
     retval = UA_SecurityPolicy_Basic256Sha256(&config->securityPolicies[config->securityPoliciesSize],
                                               localCertificate, privateKey, &config->logger);
diff --git a/tests/encryption/check_encryption_basic128rsa15.c b/tests/encryption/check_encryption_basic128rsa15.c
index 9c547fa5411..80bb043163f 100644
--- a/tests/encryption/check_encryption_basic128rsa15.c
+++ b/tests/encryption/check_encryption_basic128rsa15.c
@@ -75,6 +75,11 @@ static void setup(void) {
     config->certificateVerification.clear(&config->certificateVerification);
     UA_CertificateVerification_AcceptAll(&config->certificateVerification);
 
+    /* Manually add the Basic128Rsa15 SecurityPolicy.
+     * It does not get added by default as it is considered unsecure. */
+    UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &certificate, &privateKey);
+    UA_ServerConfig_addAllEndpoints(config);
+
     /* Set the ApplicationUri used in the certificate */
     UA_String_clear(&config->applicationDescription.applicationUri);
     config->applicationDescription.applicationUri =
@@ -118,7 +123,9 @@ START_TEST(encryption_connect) {
      * security mode as none to see the server's capability
      * and certificate */
     client = UA_Client_new();
-    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(cc);
+
     ck_assert(client != NULL);
     UA_StatusCode retval = UA_Client_getEndpoints(client, "opc.tcp://localhost:4840",
                                                   &endpointArraySize, &endpointArray);
@@ -147,12 +154,22 @@ START_TEST(encryption_connect) {
 
     /* Secure client initialization */
     client = UA_Client_new();
-    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc = UA_Client_getConfig(client);
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
     cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
+    /* Manually add the Basic128Rsa15 SecurityPolicy.
+     * It does not get added by default as it is considered unsecure. */
+    cc->securityPolicies = (UA_SecurityPolicy *)
+        UA_realloc(cc->securityPolicies, sizeof(UA_SecurityPolicy) *
+                   (cc->securityPoliciesSize + 1));
+    UA_SecurityPolicy_Basic128Rsa15(&cc->securityPolicies[cc->securityPoliciesSize],
+                                    certificate, privateKey, &cc->logger);
+    cc->securityPoliciesSize++;
+
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15");
     ck_assert(client != NULL);
@@ -236,6 +253,16 @@ START_TEST(encryption_connect_pem) {
                                          revocationList, revocationListSize);
     cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
+    /* Manually add the Basic128Rsa15 SecurityPolicy.
+     * It does not get added by default as it is considered unsecure. */
+    cc->securityPolicies = (UA_SecurityPolicy *)
+        UA_realloc(cc->securityPolicies, sizeof(UA_SecurityPolicy) *
+                   (cc->securityPoliciesSize + 1));
+    UA_SecurityPolicy_Basic128Rsa15(&cc->securityPolicies[cc->securityPoliciesSize],
+                                    certificate, privateKey, &cc->logger);
+    cc->securityPoliciesSize++;
+
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15");
     ck_assert(client != NULL);
diff --git a/tests/encryption/check_encryption_basic256.c b/tests/encryption/check_encryption_basic256.c
index 48d14a4978b..57335b2d29e 100644
--- a/tests/encryption/check_encryption_basic256.c
+++ b/tests/encryption/check_encryption_basic256.c
@@ -10,6 +10,7 @@
 #include <open62541/client_config_default.h>
 #include <open62541/client_highlevel.h>
 #include <open62541/plugin/securitypolicy.h>
+#include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/plugin/pki_default.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
@@ -78,6 +79,11 @@ static void setup(void) {
     config->certificateVerification.clear(&config->certificateVerification);
     UA_CertificateVerification_AcceptAll(&config->certificateVerification);
 
+    /* Manually add the Basic256 SecurityPolicy.
+     * It does not get added by default as it is considered unsecure. */
+    UA_ServerConfig_addSecurityPolicyBasic256(config, &certificate, &privateKey);
+    UA_ServerConfig_addAllEndpoints(config);
+
     /* Set the ApplicationUri used in the certificate */
     UA_String_clear(&config->applicationDescription.applicationUri);
     config->applicationDescription.applicationUri =
@@ -156,6 +162,16 @@ START_TEST(encryption_connect) {
                                          revocationList, revocationListSize);
     cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
+    /* Manually add the Basic256 SecurityPolicy.
+     * It does not get added by default as it is considered unsecure. */
+    cc->securityPolicies = (UA_SecurityPolicy *)
+        UA_realloc(cc->securityPolicies, sizeof(UA_SecurityPolicy) *
+                   (cc->securityPoliciesSize + 1));
+    UA_SecurityPolicy_Basic256(&cc->securityPolicies[cc->securityPoliciesSize],
+                               certificate, privateKey, &cc->logger);
+    cc->securityPoliciesSize++;
+
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
     ck_assert(client != NULL);
@@ -239,6 +255,16 @@ START_TEST(encryption_connect_pem) {
                                          revocationList, revocationListSize);
     cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
+    /* Manually add the Basic256 SecurityPolicy.
+     * It does not get added by default as it is considered unsecure. */
+    cc->securityPolicies = (UA_SecurityPolicy *)
+        UA_realloc(cc->securityPolicies, sizeof(UA_SecurityPolicy) *
+                   (cc->securityPoliciesSize + 1));
+    UA_SecurityPolicy_Basic256(&cc->securityPolicies[cc->securityPoliciesSize],
+                               certificate, privateKey, &cc->logger);
+    cc->securityPoliciesSize++;
+
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
     ck_assert(client != NULL);

From 43afb0471a81c71dfb1d1e33589308762d5a6d18 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 11:17:08 +0200
Subject: [PATCH 1658/1963] refactor(build): Bump version to 1.3.14

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ff203aeee4..bcf1fea7e06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 13)
+set(OPEN62541_VER_PATCH 14)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From f9e660dc75ae6cd9839148b42e2612f67ac66d57 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 23:34:16 +0200
Subject: [PATCH 1659/1963] refactor(core): Remove const annotation in
 SecureChannel

We need it non-const for some of the crypto operations.
---
 src/ua_securechannel.c | 2 +-
 src/ua_securechannel.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 16203166173..d8beed471af 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -36,7 +36,7 @@ UA_SecureChannel_init(UA_SecureChannel *channel) {
 
 UA_StatusCode
 UA_SecureChannel_setSecurityPolicy(UA_SecureChannel *channel,
-                                   const UA_SecurityPolicy *securityPolicy,
+                                   UA_SecurityPolicy *securityPolicy,
                                    const UA_ByteString *remoteCertificate) {
     /* Is a policy already configured? */
     UA_CHECK_ERROR(!channel->securityPolicy, return UA_STATUSCODE_BADINTERNALERROR,
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 4c5a0a180f5..424d65b34e0 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -123,7 +123,7 @@ struct UA_SecureChannel {
                                                * See the renewState. */
 
     /* The endpoint and context of the channel */
-    const UA_SecurityPolicy *securityPolicy;
+    UA_SecurityPolicy *securityPolicy;
     void *channelContext; /* For interaction with the security policy */
 
     /* Asymmetric encryption info */
@@ -181,7 +181,7 @@ UA_SecureChannel_processHELACK(UA_SecureChannel *channel,
 
 UA_StatusCode
 UA_SecureChannel_setSecurityPolicy(UA_SecureChannel *channel,
-                                   const UA_SecurityPolicy *securityPolicy,
+                                   UA_SecurityPolicy *securityPolicy,
                                    const UA_ByteString *remoteCertificate);
 
 UA_Boolean

From 2fd84ab53da63e531fc3a8b998559bfc5e50c79b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 20:19:17 +0200
Subject: [PATCH 1660/1963] fix(server): Clear the SecureChannel only after
 logging and statistics counting

---
 src/server/ua_server_binary.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 7569d8b6d52..889e52847cd 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -142,10 +142,6 @@ setBinaryProtocolManagerState(UA_Server *server,
 static void
 deleteServerSecureChannel(UA_BinaryProtocolManager *bpm,
                           UA_SecureChannel *channel) {
-    /* Clean up the SecureChannel. This is the only place where
-     * UA_SecureChannel_clear must be called within the server code-base. */
-    UA_SecureChannel_clear(channel);
-
     /* Detach the channel from the server list */
     TAILQ_REMOVE(&bpm->channels, (channel_entry*)channel, pointers);
 
@@ -178,6 +174,9 @@ deleteServerSecureChannel(UA_BinaryProtocolManager *bpm,
         break;
     }
 
+    /* Clean up the SecureChannel. This is the only place where
+     * UA_SecureChannel_clear must be called within the server code-base. */
+    UA_SecureChannel_clear(channel);
     UA_free(channel);
 }
 

From 6c7a51e892f18e2acfddc45b941aefc2d4df9fd1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 20:36:38 +0200
Subject: [PATCH 1661/1963] fix(client): Don't starting sending the old
 AuthenticationToken right away during reconnect

Instead wait until the ActivateSession request.
---
 src/client/ua_client.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 9916fb512e1..d64e1786319 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -330,10 +330,14 @@ sendRequest(UA_Client *client, const void *request,
         return client->connectStatus;
 
     /* Adjusting the request header. The const attribute is violated, but we
-     * only touch the following members: */
+     * reset to the original state before returning. Use the AuthenticationToken
+     * only once the session is active (or to activate / close it). */
     UA_RequestHeader *rr = (UA_RequestHeader*)(uintptr_t)request;
     UA_NodeId oldToken = rr->authenticationToken; /* Put back in place later */
-    rr->authenticationToken = client->authenticationToken;
+    if(client->sessionState == UA_SESSIONSTATE_ACTIVATED ||
+       requestType == &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST] ||
+       requestType == &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST])
+        rr->authenticationToken = client->authenticationToken;
     rr->timestamp = UA_DateTime_now();
 
     /* Create a unique handle >100,000 if not manually defined. The handle is

From e4f728648fd069542b20fd9a857e76c7cb387489 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 14:27:36 +0200
Subject: [PATCH 1662/1963] refactor(client): Refactor the endpoint and
 UserIdentityToken selection

This no writes into the client config. Instead the selected endpoint is
stored internally in the client. The UserIdentityToken is selected from
this endpoint at runtime.
---
 src/client/ua_client.c                        |   4 +-
 src/client/ua_client_connect.c                | 435 +++++++++---------
 src/client/ua_client_internal.h               |   3 +-
 .../encryption/check_username_connect_none.c  |   2 +-
 tests/server/check_server_password.c          |   2 +-
 5 files changed, 224 insertions(+), 222 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index d64e1786319..388c94949c5 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -212,7 +212,7 @@ UA_Client_clear(UA_Client *client) {
 
     UA_Client_disconnect(client);
     UA_String_clear(&client->discoveryUrl);
-    UA_ApplicationDescription_clear(&client->serverDescription);
+    UA_EndpointDescription_clear(&client->endpoint);
 
     UA_String_clear(&client->serverSessionNonce);
     UA_String_clear(&client->clientSessionNonce);
@@ -1091,7 +1091,7 @@ getConnectionttribute(UA_Client *client, const UA_QualifiedName key,
 
     if(UA_QualifiedName_equal(&key, &connectionAttributes[0])) {
         /* ServerDescription */
-        UA_Variant_setScalar(&localAttr, &client->serverDescription,
+        UA_Variant_setScalar(&localAttr, &client->endpoint.server,
                              &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
     } else if(UA_QualifiedName_equal(&key, &connectionAttributes[1])) {
         /* SecurityPolicyUri */
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index dd76b57d0ae..1452c1ee8b7 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -34,14 +34,16 @@
 
 static void initConnect(UA_Client *client);
 static UA_StatusCode createSessionAsync(UA_Client *client);
+static UA_UserTokenPolicy *
+findUserTokenPolicy(UA_Client *client, UA_EndpointDescription *endpoint);
 
 /* Get the EndpointUrl to be used right now.
  * This is adjusted during the discovery process.
  * We fall back if connecting to an EndpointUrl fails. */
 static UA_String
 getEndpointUrl(UA_Client *client) {
-    if(client->config.endpoint.endpointUrl.length > 0) {
-        return client->config.endpoint.endpointUrl;
+    if(client->endpoint.endpointUrl.length > 0) {
+        return client->endpoint.endpointUrl;
     } else if(client->discoveryUrl.length > 0) {
         return client->discoveryUrl;
     } else {
@@ -63,19 +65,19 @@ fallbackEndpointUrl(UA_Client* client) {
         return UA_STATUSCODE_BADCONNECTIONREJECTED;
     }
 
-    if(client->config.endpoint.endpointUrl.length > 0) {
+    if(client->endpoint.endpointUrl.length > 0) {
         /* Overwrite the EndpointUrl of the Endpoint */
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Could not open a TCP connection to the Endpoint at %.*s. "
                        "Overriding the endpoint description with the initial "
                        "EndpointUrl at %.*s.",
-                       (int)client->config.endpoint.endpointUrl.length,
-                       client->config.endpoint.endpointUrl.data,
+                       (int)client->endpoint.endpointUrl.length,
+                       client->endpoint.endpointUrl.data,
                        (int)client->config.endpointUrl.length,
                        client->config.endpointUrl.data);
-        UA_String_clear(&client->config.endpoint.endpointUrl);
+        UA_String_clear(&client->endpoint.endpointUrl);
         return UA_String_copy(&client->config.endpointUrl,
-                              &client->config.endpoint.endpointUrl);
+                              &client->endpoint.endpointUrl);
     } else {
         /* Overwrite the DiscoveryUrl returned by FindServers */
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
@@ -93,6 +95,8 @@ fallbackEndpointUrl(UA_Client* client) {
 
 static UA_SecurityPolicy *
 getSecurityPolicy(UA_Client *client, UA_String policyUri) {
+    if(policyUri.length == 0)
+        policyUri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
     for(size_t i = 0; i < client->config.securityPoliciesSize; i++) {
         if(UA_String_equal(&policyUri, &client->config.securityPolicies[i].policyUri))
             return &client->config.securityPolicies[i];
@@ -113,11 +117,10 @@ getAuthSecurityPolicy(UA_Client *client, UA_String policyUri) {
 
 /* The endpoint is unconfigured if the description is all zeroed-out */
 static UA_Boolean
-endpointUnconfigured(UA_Client *client) {
+endpointUnconfigured(const UA_EndpointDescription *endpoint) {
     UA_EndpointDescription tmp;
     UA_EndpointDescription_init(&tmp);
-    return UA_equal(&tmp, &client->config.endpoint,
-                    &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+    return UA_equal(&tmp, endpoint, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 }
 
 UA_Boolean
@@ -130,9 +133,12 @@ isFullyConnected(UA_Client *client) {
     if(client->channel.state != UA_SECURECHANNELSTATE_OPEN)
         return false;
 
-    /* Handshake ongoing or not yet done */
-    if(client->endpointsHandshake || endpointUnconfigured(client) ||
-       client->findServersHandshake || client->discoveryUrl.length == 0)
+    /* GetEndpoints handshake ongoing or not yet done */
+    if(client->endpointsHandshake || endpointUnconfigured(&client->endpoint))
+        return false;
+
+    /* FindServers handshake ongoing or not yet done */
+    if(client->findServersHandshake || client->discoveryUrl.length == 0)
         return false;
 
     return true;
@@ -148,6 +154,13 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
        channel->securityMode != UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
         return UA_STATUSCODE_GOOD;
 
+    UA_UserTokenPolicy *utp = findUserTokenPolicy(client, &client->endpoint);
+    if(!utp) {
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
+                       "Could not find a matching UserTokenPolicy in the endpoint");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     const UA_SecurityPolicy *sp = channel->securityPolicy;
     UA_SignatureData *sd = &request->clientSignature;
     const UA_SecurityPolicySignatureAlgorithm *signAlg =
@@ -183,11 +196,15 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
     if(retval != UA_STATUSCODE_GOOD)
         goto cleanup;
 
-    /* Prepare the userTokenSignature */
-    if(client->config.userTokenPolicy.tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
-        /* Get the correct securityPolicy for authentication */
-        UA_SecurityPolicy *utsp =
-            getAuthSecurityPolicy(client, client->config.authSecurityPolicyUri);
+    /* Prepare the UserTokenSignature */
+    if(utp->tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
+        /* Get the SecurityPolicy for authentication. If the UserTokenPolicy
+         * does not define it, the SecurityPolicyUri of the overall endpoint is
+         * used. The SecurityPolicy must be retrieved with getAuthSecurityPolicy
+         * as it can use a certificate different from the SecureChannel. */
+        UA_String securityPolicyUri = (utp->securityPolicyUri.length > 0) ?
+            utp->securityPolicyUri : client->endpoint.securityPolicyUri;
+        UA_SecurityPolicy *utsp = getAuthSecurityPolicy(client, securityPolicyUri);
         if(!utsp) {
             UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "The configured SecurityPolicy for certificate "
@@ -254,7 +271,7 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
 }
 
 static UA_StatusCode
-encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPolicy,
+encryptUserIdentityToken(UA_Client *client, const UA_String userTokenSecurityPolicy,
                          UA_ExtensionObject *userIdentityToken) {
     UA_IssuedIdentityToken *iit = NULL;
     UA_UserNameIdentityToken *unit = NULL;
@@ -272,12 +289,12 @@ encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPo
 
     /* No encryption */
     const UA_String none = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
-    if(userTokenSecurityPolicy->length == 0 ||
-       UA_String_equal(userTokenSecurityPolicy, &none)) {
+    if(userTokenSecurityPolicy.length == 0 ||
+       UA_String_equal(&userTokenSecurityPolicy, &none)) {
         return UA_STATUSCODE_GOOD;
     }
 
-    UA_SecurityPolicy *sp = getSecurityPolicy(client, *userTokenSecurityPolicy);
+    UA_SecurityPolicy *sp = getSecurityPolicy(client, userTokenSecurityPolicy);
     if(!sp) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                        "Could not find the required SecurityPolicy for the UserToken");
@@ -288,7 +305,7 @@ encryptUserIdentityToken(UA_Client *client, const UA_String *userTokenSecurityPo
 
     void *channelContext;
     UA_StatusCode retval = sp->channelModule.
-        newContext(sp, &client->config.endpoint.serverCertificate, &channelContext);
+        newContext(sp, &client->endpoint.serverCertificate, &channelContext);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                        "Could not instantiate the SecurityPolicy for the UserToken");
@@ -770,6 +787,13 @@ activateSessionAsync(UA_Client *client) {
         return UA_STATUSCODE_BADSESSIONCLOSED;
     }
 
+    const UA_UserTokenPolicy *utp = findUserTokenPolicy(client, &client->endpoint);
+    if(!utp) {
+        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
+                       "Could not find a matching UserTokenPolicy in the endpoint");
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
     UA_ActivateSessionRequest request;
     UA_ActivateSessionRequest_init(&request);
     UA_StatusCode retval =
@@ -802,15 +826,12 @@ activateSessionAsync(UA_Client *client) {
 
     /* Set the correct PolicyId from the endpoint */
     UA_String_clear((UA_String*)request.userIdentityToken.content.decoded.data);
-    retval = UA_String_copy(&client->config.userTokenPolicy.policyId,
+    retval = UA_String_copy(&utp->policyId,
                             (UA_String*)request.userIdentityToken.content.decoded.data);
 
 #ifdef UA_ENABLE_ENCRYPTION
     /* Encrypt the UserIdentityToken */
-    const UA_String *userTokenPolicy = &client->channel.securityPolicy->policyUri;
-    if(client->config.userTokenPolicy.securityPolicyUri.length > 0)
-        userTokenPolicy = &client->config.userTokenPolicy.securityPolicyUri;
-    retval |= encryptUserIdentityToken(client, userTokenPolicy, &request.userIdentityToken);
+    retval |= encryptUserIdentityToken(client, utp->securityPolicyUri, &request.userIdentityToken);
     retval |= signActivateSessionRequest(client, &client->channel, &request);
 #endif
 
@@ -832,6 +853,129 @@ activateSessionAsync(UA_Client *client) {
     return retval;
 }
 
+static const UA_String binaryTransport =
+    UA_STRING_STATIC("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
+
+/* Find a matching endpoint -- the UserTokenPolicy is matched later */
+static UA_Boolean
+matchEndpoint(UA_Client *client, const UA_EndpointDescription *endpoint, unsigned i) {
+    /* Matching ApplicationUri if defined */
+    if(client->config.applicationUri.length > 0 &&
+       !UA_String_equal(&client->config.applicationUri,
+                        &endpoint->server.applicationUri)) {
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                    "Rejecting endpoint %u: application uri not match", i);
+        return false;
+    }
+
+    /* Look out for binary transport endpoints.
+     * Note: Siemens returns empty ProfileUrl, we will accept it as binary. */
+    if(endpoint->transportProfileUri.length != 0 &&
+       !UA_String_equal(&endpoint->transportProfileUri, &binaryTransport)) {
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                    "Rejecting endpoint %u: transport profile does not match", i);
+        return false;
+    }
+
+    /* Valid SecurityMode? */
+    if(endpoint->securityMode < 1 || endpoint->securityMode > 3) {
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                    "Rejecting endpoint %u: invalid security mode", i);
+        return false;
+    }
+
+    /* Selected SecurityMode? */
+    if(client->config.securityMode > 0 &&
+       client->config.securityMode != endpoint->securityMode) {
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                    "Rejecting endpoint %u: security mode does not match", i);
+        return false;
+    }
+
+    /* Matching SecurityPolicy? */
+    if(client->config.securityPolicyUri.length > 0 &&
+       !UA_String_equal(&client->config.securityPolicyUri, &endpoint->securityPolicyUri)) {
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                    "Rejecting endpoint %u: security policy does not match the configuration", i);
+        return false;
+    }
+
+    /* SecurityPolicy available? */
+    if(!getSecurityPolicy(client, endpoint->securityPolicyUri)) {
+        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                    "Rejecting endpoint %u: security policy not available", i);
+        return false;
+    }
+
+    return true;
+}
+
+/* Match the policy with the configured user token */
+static UA_Boolean
+matchUserToken(UA_Client *client,
+               const UA_UserTokenPolicy *tokenPolicy) {
+    const UA_DataType *tokenType =
+        client->config.userIdentityToken.content.decoded.type;
+
+    if(tokenPolicy->tokenType == UA_USERTOKENTYPE_ANONYMOUS &&
+       (tokenType == &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN] || !tokenType))
+        return true;
+
+    if(tokenPolicy->tokenType == UA_USERTOKENTYPE_USERNAME &&
+       tokenType == &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN])
+        return true;
+
+    if(tokenPolicy->tokenType == UA_USERTOKENTYPE_CERTIFICATE &&
+       tokenType == &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN])
+        return true;
+
+    if(tokenPolicy->tokenType == UA_USERTOKENTYPE_ISSUEDTOKEN &&
+       tokenType == &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN])
+        return true;
+
+    return false;
+}
+
+/* Returns the locally configured UserTokenPolicy (if it exists) or a match from
+ * the EndpointDescription. If localTokenPolicy != NULL, then we require an
+ * exact match with the configured UserTokenPolicy. */
+static UA_UserTokenPolicy *
+findUserTokenPolicy(UA_Client *client, UA_EndpointDescription *endpoint) {
+    /* Was a UserTokenPolicy configured? Then we need an exact match. */
+    UA_UserTokenPolicy *requiredTokenPolicy = NULL;
+    UA_UserTokenPolicy tmp;
+    UA_UserTokenPolicy_init(&tmp);
+    if(!UA_equal(&tmp, &client->config.userTokenPolicy, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]))
+        requiredTokenPolicy = &client->config.userTokenPolicy;
+
+    for(size_t j = 0; j < endpoint->userIdentityTokensSize; ++j) {
+        /* Is the SecurityPolicy available? */
+        UA_UserTokenPolicy *tokenPolicy = &endpoint->userIdentityTokens[j];
+        if(!getSecurityPolicy(client, tokenPolicy->securityPolicyUri))
+            continue;
+
+        /* Required SecurityPolicyUri in the configuration? */
+        if(!UA_String_isEmpty(&client->config.authSecurityPolicyUri) &&
+           !UA_String_equal(&client->config.authSecurityPolicyUri,
+                            &tokenPolicy->securityPolicyUri))
+            continue;
+
+        /* Match (entire) UserTokenPolicy if defined in the configuration? */
+        if(requiredTokenPolicy &&
+           !UA_equal(requiredTokenPolicy, tokenPolicy, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]))
+            continue;
+
+        /* Match with the configured UserToken */
+        if(!matchUserToken(client, tokenPolicy))
+            continue;
+
+        /* Found a match? */
+        return tokenPolicy;
+    }
+
+    return NULL;
+}
+
 /* Combination of UA_Client_getEndpointsInternal and getEndpoints */
 static void
 responseGetEndpoints(UA_Client *client, void *userdata,
@@ -868,10 +1012,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
 
     const size_t notFound = (size_t)-1;
     size_t bestEndpointIndex = notFound;
-    size_t bestTokenIndex = notFound;
     UA_Byte bestEndpointLevel = 0;
-    const UA_String binaryTransport =
-        UA_STRING("http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary");
 
     /* Find a matching combination of Endpoint and UserTokenPolicy */
     for(size_t i = 0; i < resp->endpointsSize; ++i) {
@@ -881,201 +1022,57 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         if(endpoint->securityLevel < bestEndpointLevel)
             continue;
 
-        /* Filter by the ApplicationURI if defined */
-        if(client->config.applicationUri.length > 0 &&
-           !UA_String_equal(&client->config.applicationUri,
-                            &endpoint->server.applicationUri))
+        /* Does the endpoint match the client configuration? */
+        if(!matchEndpoint(client, endpoint, (unsigned)i))
             continue;
 
-        /* Look out for binary transport endpoints.
-         * Note: Siemens returns empty ProfileUrl, we will accept it as binary. */
-        if(endpoint->transportProfileUri.length != 0 &&
-           !UA_String_equal(&endpoint->transportProfileUri, &binaryTransport))
-            continue;
-
-        /* Valid SecurityMode? */
-        if(endpoint->securityMode < 1 || endpoint->securityMode > 3) {
-            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                        "Rejecting endpoint %lu: invalid security mode",
-                        (long unsigned)i);
-            continue;
-        }
-
-        /* Selected SecurityMode? */
-        if(client->config.securityMode > 0 &&
-           client->config.securityMode != endpoint->securityMode) {
-            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                        "Rejecting endpoint %lu: security mode doesn't match",
-                        (long unsigned)i);
-            continue;
-        }
-
-        /* Matching SecurityPolicy? */
-        if(client->config.securityPolicyUri.length > 0 &&
-           !UA_String_equal(&client->config.securityPolicyUri,
-                            &endpoint->securityPolicyUri)) {
+        /* Do we want a session? If yes, then the endpoint needs to have a
+         * UserTokenPolicy that matches the configuration. */
+        if(!client->config.noSession && !findUserTokenPolicy(client, endpoint)) {
             UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                        "Rejecting endpoint %lu: security policy doesn't match",
+                        "Rejecting endpoint %lu: No matching UserTokenPolicy",
                         (long unsigned)i);
             continue;
         }
 
-        /* SecurityPolicy available? */
-        if(!getSecurityPolicy(client, endpoint->securityPolicyUri)) {
-            UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                        "Rejecting endpoint %lu: security policy not available",
-                        (long unsigned)i);
-            continue;
-        }
-
-        /* We have found a matching endpoint.
-         * But maybe not a amtching user token policy. */
+        /* Best endpoint so far */
+        bestEndpointLevel = endpoint->securityLevel;
         bestEndpointIndex = i;
-
-        /* Compare the available UserTokenPolicies */
-        for(size_t j = 0; j < endpoint->userIdentityTokensSize; ++j) {
-            UA_UserTokenPolicy *tokenPolicy = &endpoint->userIdentityTokens[j];
-            const UA_DataType *tokenType =
-                client->config.userIdentityToken.content.decoded.type;
-
-            /* Usertokens also have a security policy... */
-            if(tokenPolicy->tokenType != UA_USERTOKENTYPE_ANONYMOUS &&
-               tokenPolicy->securityPolicyUri.length > 0 &&
-               !getSecurityPolicy(client, tokenPolicy->securityPolicyUri)) {
-                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                            "Rejecting UserTokenPolicy %lu in endpoint %lu: "
-                            "security policy '%.*s' not available",
-                            (long unsigned)j, (long unsigned)i,
-                            (int)tokenPolicy->securityPolicyUri.length,
-                            tokenPolicy->securityPolicyUri.data);
-                continue;
-            }
-
-            if(tokenPolicy->tokenType > 3) {
-                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                            "Rejecting UserTokenPolicy %lu in endpoint %lu: "
-                            "invalid token type",
-                            (long unsigned)j, (long unsigned)i);
-                continue;
-            }
-
-            if(tokenPolicy->tokenType == UA_USERTOKENTYPE_ANONYMOUS &&
-               tokenType != &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN] &&
-               tokenType != NULL) {
-                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                            "Rejecting UserTokenPolicy %lu (anonymous) in endpoint %lu: "
-                            "configuration doesn't match",
-                            (long unsigned)j, (long unsigned)i);
-                continue;
-            }
-            if(tokenPolicy->tokenType == UA_USERTOKENTYPE_USERNAME &&
-               tokenType != &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]) {
-                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                            "Rejecting UserTokenPolicy %lu (username) in endpoint %lu: "
-                            "configuration doesn't match",
-                            (long unsigned)j, (long unsigned)i);
-                continue;
-            }
-            if(tokenPolicy->tokenType == UA_USERTOKENTYPE_CERTIFICATE &&
-               tokenType != &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]) {
-                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                            "Rejecting UserTokenPolicy %lu (certificate) in endpoint %lu: "
-                            "configuration doesn't match",
-                            (long unsigned)j, (long unsigned)i);
-                continue;
-            }
-            if(tokenPolicy->tokenType == UA_USERTOKENTYPE_ISSUEDTOKEN &&
-               tokenType != &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]) {
-                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                            "Rejecting UserTokenPolicy %lu (token) in endpoint %lu: "
-                            "configuration doesn't match",
-                            (long unsigned)j, (long unsigned)i);
-                continue;
-            }
-
-            /* Endpoint with matching UserTokenPolicy found */
-
-            /* If not explicit PolicyUri for authentication is configured, use
-             * that from the TokenPolicy or (if that is not defined) from the
-             * Endpoint SecurityPolicy. */
-            UA_String *securityPolicyUri = &tokenPolicy->securityPolicyUri;
-            if(securityPolicyUri->length == 0)
-                securityPolicyUri = &endpoint->securityPolicyUri;
-            if(UA_String_isEmpty(&client->config.authSecurityPolicyUri))
-                UA_String_copy(securityPolicyUri, &client->config.authSecurityPolicyUri);
-
-            /* Update tracking */
-            bestEndpointLevel = endpoint->securityLevel;
-            bestTokenIndex = j;
-
-            /* Stop search for the UserTokenPolicy. But we go on searching for
-             * an endpoints with a better security level. */
-            break;
-        }
     }
 
+    /* No matching endpoint found */
     if(bestEndpointIndex == notFound) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "No suitable endpoint found");
-        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        client->connectStatus = UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
         closeSecureChannel(client);
         UA_UNLOCK(&client->clientMutex);
         return;
     }
 
-    if(!client->config.noSession && bestTokenIndex == notFound) {
-        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                     "No suitable UserTokenPolicy found for the possible endpoints");
-        client->connectStatus = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-        closeSecureChannel(client);
-        UA_UNLOCK(&client->clientMutex);
-        return;
-    }
-
-    /* Move the application description and endpoint information to the client config */
-    UA_EndpointDescription *endpoint = &resp->endpoints[bestEndpointIndex];
-    UA_ApplicationDescription_clear(&client->serverDescription);
-    UA_ApplicationDescription_copy(&endpoint->server, &client->serverDescription);
-    UA_EndpointDescription_clear(&client->config.endpoint);
-    client->config.endpoint = *endpoint;
+    /* Store the endpoint description in the client. It contains the
+     * ApplicationDescription and the UserTokenPolicies. We continue to look up
+     * the matching UserTokenPolicy from there. */
+    UA_EndpointDescription_clear(&client->endpoint);
+    client->endpoint = resp->endpoints[bestEndpointIndex];
+    UA_EndpointDescription_init(&resp->endpoints[bestEndpointIndex]);
 
 #if UA_LOGLEVEL <= 300
     const char *securityModeNames[3] = {"None", "Sign", "SignAndEncrypt"};
     UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                "Selected endpoint %lu in URL %.*s with SecurityMode "
+                "Selected endpoint with EndpointUrl %.*s, SecurityMode "
                 "%s and SecurityPolicy %.*s",
-                (long unsigned)bestEndpointIndex, (int)endpoint->endpointUrl.length,
-                endpoint->endpointUrl.data, securityModeNames[endpoint->securityMode - 1],
-                (int)endpoint->securityPolicyUri.length, endpoint->securityPolicyUri.data);
+                (int)client->endpoint.endpointUrl.length,
+                client->endpoint.endpointUrl.data,
+                securityModeNames[client->endpoint.securityMode - 1],
+                (int)client->endpoint.securityPolicyUri.length,
+                client->endpoint.securityPolicyUri.data);
 #endif
 
-    /* Move the UserTokenPolicy information to the client config */
-    if(bestTokenIndex != notFound) {
-        UA_UserTokenPolicy *tokenPolicy = &endpoint->userIdentityTokens[bestTokenIndex];
-        UA_assert(tokenPolicy);
-        UA_UserTokenPolicy_clear(&client->config.userTokenPolicy);
-        client->config.userTokenPolicy = *tokenPolicy;
-        UA_UserTokenPolicy_init(tokenPolicy);
-#if UA_LOGLEVEL <= 300
-        UA_String *securityPolicyUri = &tokenPolicy->securityPolicyUri;
-        const char *userTokenTypeNames[4] =
-            {"Anonymous", "UserName", "Certificate", "IssuedToken"};
-        UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                    "Selected UserTokenPolicy %.*s with UserTokenType %s "
-                    "and SecurityPolicy %.*s",
-                    (int)tokenPolicy->policyId.length, tokenPolicy->policyId.data,
-                    userTokenTypeNames[tokenPolicy->tokenType],
-                    (int)securityPolicyUri->length, securityPolicyUri->data);
-#endif
-    }
-
-    /* Don't clean up later -- was moved to the client config */
-    UA_EndpointDescription_init(endpoint);
-
-    /* Close the SecureChannel -- a different SecurityMode or SecurityPolicy is
-     * defined by the Endpoint. */
-    if(client->config.endpoint.securityMode != client->channel.securityMode ||
-       !UA_String_equal(&client->config.endpoint.securityPolicyUri,
+    /* A different SecurityMode or SecurityPolicy is defined by the Endpoint.
+     * Close the SecureChannel and reconnect. */
+    if(client->endpoint.securityMode != client->channel.securityMode ||
+       !UA_String_equal(&client->endpoint.securityPolicyUri,
                         &client->channel.securityPolicy->policyUri)) {
         closeSecureChannel(client);
         UA_UNLOCK(&client->clientMutex);
@@ -1086,8 +1083,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
      * Close the SecureChannel to reopen with the EndpointUrl. If an endpoint
      * was selected, then we use the endpointUrl for the HEL message. */
     if(client->discoveryUrl.length > 0 &&
-       !UA_String_equal(&client->discoveryUrl,
-                        &client->config.endpoint.endpointUrl)) {
+       !UA_String_equal(&client->discoveryUrl, &client->endpoint.endpointUrl)) {
         closeSecureChannel(client);
         UA_UNLOCK(&client->clientMutex);
         return;
@@ -1318,7 +1314,7 @@ createSessionAsync(UA_Client *client) {
     request.clientNonce = client->clientSessionNonce;
     request.requestedSessionTimeout = client->config.requestedSessionTimeout;
     request.maxResponseMessageSize = UA_INT32_MAX;
-    request.endpointUrl = client->config.endpoint.endpointUrl;
+    request.endpointUrl = client->endpoint.endpointUrl;
     request.clientDescription = client->config.clientDescription;
     request.sessionName = client->config.sessionName;
     if(client->channel.securityMode == UA_MESSAGESECURITYMODE_SIGN ||
@@ -1344,13 +1340,8 @@ createSessionAsync(UA_Client *client) {
 static UA_StatusCode
 initSecurityPolicy(UA_Client *client) {
     /* Find the SecurityPolicy */
-    UA_SecurityPolicy *sp = NULL;
-    if(client->config.endpoint.securityPolicyUri.length == 0) {
-        sp = getSecurityPolicy(client,
-                               UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None"));
-    } else {
-        sp = getSecurityPolicy(client, client->config.endpoint.securityPolicyUri);
-    }
+    UA_SecurityPolicy *sp =
+        getSecurityPolicy(client, client->endpoint.securityPolicyUri);
 
     /* Unknown SecurityPolicy -- we would never select such an endpoint */
     if(!sp)
@@ -1362,13 +1353,13 @@ initSecurityPolicy(UA_Client *client) {
             UA_STATUSCODE_GOOD : UA_STATUSCODE_BADINTERNALERROR;
 
     /* Set the SecurityMode -- none if no endpoint is selected so far */
-    client->channel.securityMode = client->config.endpoint.securityMode;
+    client->channel.securityMode = client->endpoint.securityMode;
     if(client->channel.securityMode == UA_MESSAGESECURITYMODE_INVALID)
         client->channel.securityMode = UA_MESSAGESECURITYMODE_NONE;
 
     /* Instantiate the SecurityPolicy context with the remote certificate */
     return UA_SecureChannel_setSecurityPolicy(&client->channel, sp,
-                                              &client->config.endpoint.serverCertificate);
+                                              &client->endpoint.serverCertificate);
 }
 
 static void
@@ -1440,7 +1431,7 @@ connectActivity(UA_Client *client) {
 
     /* GetEndpoints to identify the remote side and/or reset the SecureChannel
      * with encryption */
-    if(endpointUnconfigured(client)) {
+    if(endpointUnconfigured(&client->endpoint)) {
         client->connectStatus = requestGetEndpoints(client);
         return;
     }
@@ -1492,8 +1483,8 @@ verifyClientSecureChannelHeader(void *application, UA_SecureChannel *channel,
     /* If encryption is used, check that the server certificate for the
      * endpoint is used for the SecureChannel */
     UA_ByteString serverCert = getLeafCertificate(asymHeader->senderCertificate);
-    if(client->config.endpoint.serverCertificate.length > 0 &&
-       !UA_String_equal(&client->config.endpoint.serverCertificate, &serverCert)) {
+    if(client->endpoint.serverCertificate.length > 0 &&
+       !UA_String_equal(&client->endpoint.serverCertificate, &serverCert)) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "The server certificate is different from the EndpointDescription");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
@@ -1666,6 +1657,14 @@ initConnect(UA_Client *client) {
         return;
     }
 
+    /* An exact endpoint was configured. Use it. */
+    if(!endpointUnconfigured(&client->config.endpoint)) {
+        UA_EndpointDescription_clear(&client->endpoint);
+        client->connectStatus =
+            UA_EndpointDescription_copy(&client->config.endpoint, &client->endpoint);
+        UA_CHECK_STATUS(client->connectStatus, return);
+    }
+
     /* Start the EventLoop if not already started */
     client->connectStatus = __UA_Client_startup(client);
     UA_CHECK_STATUS(client->connectStatus, return);
@@ -2198,8 +2197,10 @@ cleanupSession(UA_Client *client) {
 
 static void
 disconnectSecureChannel(UA_Client *client, UA_Boolean sync) {
-    /* Clean the DiscoveryUrl when the connection is explicitly closed */
+    /* Clean the DiscoveryUrl and endpoint description when the connection is
+     * explicitly closed */
     UA_String_clear(&client->discoveryUrl);
+    UA_EndpointDescription_clear(&client->endpoint);
 
     /* Close the SecureChannel */
     closeSecureChannel(client);
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index f03df801f26..6ed8f28e879 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -132,7 +132,8 @@ struct UA_Client {
      * EndpointUrl != DiscoveryUrl. */
     UA_String discoveryUrl;
 
-    UA_ApplicationDescription serverDescription;
+    /* Contains the Server description, etc. */
+    UA_EndpointDescription endpoint;
 
     /* SecureChannel */
     UA_SecureChannel channel;
diff --git a/tests/encryption/check_username_connect_none.c b/tests/encryption/check_username_connect_none.c
index 3db48f7dd60..2a74a84d2c2 100644
--- a/tests/encryption/check_username_connect_none.c
+++ b/tests/encryption/check_username_connect_none.c
@@ -88,7 +88,7 @@ START_TEST(none_policy_connect_fail) {
     UA_StatusCode retval =
         UA_Client_connectUsername(client, "opc.tcp://localhost:4840", "user1", "password");
 
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADIDENTITYTOKENINVALID);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADIDENTITYTOKENREJECTED);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);
diff --git a/tests/server/check_server_password.c b/tests/server/check_server_password.c
index 61e0ce6d6d0..a282190077d 100644
--- a/tests/server/check_server_password.c
+++ b/tests/server/check_server_password.c
@@ -231,7 +231,7 @@ START_TEST(Password_none) {
     UA_ClientConfig_setDefault(config);
 
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADIDENTITYTOKENINVALID);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADIDENTITYTOKENREJECTED);
     UA_Client_disconnect(client);
     UA_Client_delete(client);
 } END_TEST

From 7ebb8cc329c93d044fb7d30c68ad2bf9334ef582 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 19:10:31 +0200
Subject: [PATCH 1663/1963] refactor(client): Improve the documentation of
 endpoint and userTokenPolicy in the client config

---
 include/open62541/client.h | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 31dcbe39547..6913f3f70e3 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -116,27 +116,16 @@ struct UA_ClientConfig {
                               * connection when the Session is lost. */
 
     /**
-     * If either endpoint or userTokenPolicy has been set (at least one non-zero
-     * byte in either structure), then the selected Endpoint and UserTokenPolicy
-     * overwrite the settings in the basic connection configuration. The
-     * userTokenPolicy array in the EndpointDescription is ignored. The selected
-     * userTokenPolicy is set in the dedicated configuration field.
-     *
-     * If the advanced configuration is not set, the client will write to it the
-     * selected Endpoint and UserTokenPolicy during GetEndpoints.
-     *
-     * The information in the advanced configuration is used during reconnect
-     * when the SecureChannel was broken. */
+     * If either endpoint or userTokenPolicy has been set, then they are used
+     * directly. Otherwise this information comes from the GetEndpoints response
+     * from the server (filtered and selected for the SecurityMode, etc.). */
     UA_EndpointDescription endpoint;
     UA_UserTokenPolicy userTokenPolicy;
 
     /**
      * If the EndpointDescription has not been defined, the ApplicationURI
-     * constrains the servers considered in the FindServers service and the
-     * Endpoints considered in the GetEndpoints service.
-     *
-     * If empty the applicationURI is not used to filter.
-     */
+     * filters the servers considered in the FindServers service and the
+     * Endpoints considered in the GetEndpoints service. */
     UA_String applicationUri;
 
     /**
@@ -179,6 +168,7 @@ struct UA_ClientConfig {
      * secure channel is selected.*/
     size_t authSecurityPoliciesSize;
     UA_SecurityPolicy *authSecurityPolicies;
+
     /* SecurityPolicyUri for the Authentication. */
     UA_String authSecurityPolicyUri;
 

From 93a4b986e9f257b262bff588495accc651fdd7d8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 19:11:21 +0200
Subject: [PATCH 1664/1963] refactor(client): Improve the documentation of
 securityMode in the client config

---
 include/open62541/client.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 6913f3f70e3..7ab9ace17c7 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -101,9 +101,9 @@ struct UA_ClientConfig {
      * message. */
     UA_ExtensionObject userIdentityToken; /* Configured User-Identity Token */
     UA_MessageSecurityMode securityMode;  /* None, Sign, SignAndEncrypt. The
-                                           * default is invalid. This indicates
-                                           * the client to select any matching
-                                           * endpoint. */
+                                           * default is "invalid". This
+                                           * indicates the client to select any
+                                           * matching endpoint. */
     UA_String securityPolicyUri; /* SecurityPolicy for the SecureChannel. An
                                   * empty string indicates the client to select
                                   * any matching SecurityPolicy. */

From a2950d7209c9b7c2f7c7e7672f65e19c03bca13f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 4 Oct 2024 09:20:23 +0200
Subject: [PATCH 1665/1963] refactor(client): Small cleanup in
 responseFindServers

---
 src/client/ua_client_connect.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 1452c1ee8b7..6026971c3ea 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1121,7 +1121,6 @@ static void
 responseFindServers(UA_Client *client, void *userdata,
                     UA_UInt32 requestId, void *response) {
     client->findServersHandshake = false;
-
     UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Received FindServersResponse");
 
@@ -1135,6 +1134,7 @@ responseFindServers(UA_Client *client, void *userdata,
                        UA_StatusCode_name(fsr->responseHeader.serviceResult),
                        (int)client->config.endpointUrl.length,
                        client->config.endpointUrl.data);
+        UA_String_clear(&client->discoveryUrl);
         UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
         return;
     }
@@ -1145,18 +1145,14 @@ responseFindServers(UA_Client *client, void *userdata,
 
         /* Filter by the ApplicationURI if defined */
         if(client->config.applicationUri.length > 0 &&
-           !UA_String_equal(&client->config.applicationUri,
-                            &server->applicationUri))
+           !UA_String_equal(&client->config.applicationUri, &server->applicationUri))
             continue;
 
         for(size_t j = 0; j < server->discoveryUrlsSize; j++) {
             if(UA_String_equal(&client->config.endpointUrl, &server->discoveryUrls[j])) {
-                UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                            "The initially defined EndpointURL %.*s "
-                            "is valid for the server",
-                            (int)client->config.endpointUrl.length,
-                            client->config.endpointUrl.data);
-                UA_String_copy(&client->config.endpointUrl, &client->discoveryUrl);
+                UA_String_clear(&client->discoveryUrl);
+                client->discoveryUrl = server->discoveryUrls[j];
+                UA_String_init(&server->discoveryUrls[j]);
                 return;
             }
         }
@@ -1173,8 +1169,7 @@ responseFindServers(UA_Client *client, void *userdata,
 
         /* Filter by the ApplicationURI if defined */
         if(client->config.applicationUri.length > 0 &&
-           !UA_String_equal(&client->config.applicationUri,
-                            &server->applicationUri))
+           !UA_String_equal(&client->config.applicationUri, &server->applicationUri))
             continue;
 
         for(size_t j = 0; j < server->discoveryUrlsSize; j++) {
@@ -1183,8 +1178,7 @@ responseFindServers(UA_Client *client, void *userdata,
             UA_String hostname, path;
             UA_UInt16 port;
             UA_StatusCode res =
-                UA_parseEndpointUrl(&server->discoveryUrls[j], &hostname,
-                                    &port, &path);
+                UA_parseEndpointUrl(&server->discoveryUrls[j], &hostname, &port, &path);
             if(res != UA_STATUSCODE_GOOD)
                 continue;
 
@@ -1194,11 +1188,12 @@ responseFindServers(UA_Client *client, void *userdata,
             UA_String_init(&server->discoveryUrls[j]);
 
             UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                        "Use the EndpointURL %.*s returned from FindServers",
+                        "Use the EndpointURL %.*s returned from FindServers and reconnect",
                         (int)client->discoveryUrl.length, client->discoveryUrl.data);
 
             /* Close the SecureChannel to build it up new with the correct
-             * EndpointURL in the HEL/ACK handshake */
+             * EndpointURL in the HEL/ACK handshake. In closeSecureChannel the
+             * received client->endpoint is reset also. */
             closeSecureChannel(client);
             return;
         }

From 2f1d82ed851356b5e097699706878867d39f8104 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 4 Oct 2024 13:23:56 +0200
Subject: [PATCH 1666/1963] fix(pubsub): Fix potential double free in the SKS
 client config

---
 src/pubsub/ua_pubsub_keystorage.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 6ec48e8567c..799cca43275 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -503,6 +503,8 @@ sksClientCleanupCb(void *client, void *context) {
          * be freed in UA_PubSubKeyStorage_delete. */
         sksClient->config.securityPolicies = NULL;
         sksClient->config.securityPoliciesSize = 0;
+        sksClient->config.authSecurityPolicies = NULL;
+        sksClient->config.authSecurityPoliciesSize = 0;
         sksClient->config.certificateVerification.context = NULL;
         sksClient->config.logging = NULL;
         sksClient->config.clientContext = NULL;

From b540d891476a49f2f31eeac9f26df83325d87f26 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 4 Oct 2024 16:12:16 +0200
Subject: [PATCH 1667/1963] fix(plugins): Don't enable Basic128Rsa15 and
 Basic256 SecurityPolicies by default for authentication

---
 plugins/ua_config_default.c | 38 +++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index aaf2a9c51b6..aa73b6a948f 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -1330,25 +1330,27 @@ UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->authSecurityPolicies = sp;
 
-    retval = UA_SecurityPolicy_Basic128Rsa15(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                                           certificateAuth, privateKeyAuth, config->logging);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->authSecurityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
+    /* Basic128Rsa15 is unsecure and should not be used */
+    /* retval = UA_SecurityPolicy_Basic128Rsa15(&config->authSecurityPolicies[config->authSecurityPoliciesSize], */
+    /*                                                        certificateAuth, privateKeyAuth, config->logging); */
+    /* if(retval == UA_STATUSCODE_GOOD) { */
+    /*     ++config->authSecurityPoliciesSize; */
+    /* } else { */
+    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
+    /*                    "Could not add SecurityPolicy#Basic128Rsa15 with error code %s", */
+    /*                    UA_StatusCode_name(retval)); */
+    /* } */
 
-    retval = UA_SecurityPolicy_Basic256(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                        certificateAuth, privateKeyAuth, config->logging);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->authSecurityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
+    /* Basic256 is unsecure and should not be used */
+    /* retval = UA_SecurityPolicy_Basic256(&config->authSecurityPolicies[config->authSecurityPoliciesSize], */
+    /*                                     certificateAuth, privateKeyAuth, config->logging); */
+    /* if(retval == UA_STATUSCODE_GOOD) { */
+    /*     ++config->authSecurityPoliciesSize; */
+    /* } else { */
+    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
+    /*                    "Could not add SecurityPolicy#Basic256 with error code %s", */
+    /*                    UA_StatusCode_name(retval)); */
+    /* } */
 
     retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
                                                    certificateAuth, privateKeyAuth, config->logging);

From 0feab11c3f4da51676cd37dd80460938d2637b11 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 4 Oct 2024 20:23:03 +0200
Subject: [PATCH 1668/1963] refactor(plugin): Set the
 AuthenticationSecurityPolicies by default

---
 plugins/ua_config_default.c | 148 +++++++++++++++++++++---------------
 1 file changed, 85 insertions(+), 63 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index aa73b6a948f..0c22c991372 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -1183,6 +1183,83 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
 
 #ifdef UA_ENABLE_ENCRYPTION
 
+static UA_StatusCode
+clientConfig_setAuthenticationSecurityPolicies(UA_ClientConfig *config,
+                                               UA_ByteString certificateAuth,
+                                               UA_ByteString privateKeyAuth) {
+    UA_SecurityPolicy *sp = (UA_SecurityPolicy*)
+        UA_realloc(config->authSecurityPolicies, sizeof(UA_SecurityPolicy) * 3);
+    if(!sp)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    config->authSecurityPolicies = sp;
+
+    /* Clean up old SecurityPolicies */
+    for(size_t i = 0; i < config->authSecurityPoliciesSize; i++) {
+        config->authSecurityPolicies[i].clear(&config->authSecurityPolicies[i]);
+    }
+    config->authSecurityPoliciesSize = 0;
+
+    /* Basic128Rsa15 is unsecure and should not be used */
+    /* sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize]; */
+    /* retval = UA_SecurityPolicy_Basic128Rsa15(sp, certificateAuth, privateKeyAuth, config->logging); */
+    /* if(retval == UA_STATUSCODE_GOOD) { */
+    /*     ++config->authSecurityPoliciesSize; */
+    /* } else { */
+    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
+    /*                    "Could not add SecurityPolicy#Basic128Rsa15 with error code %s", */
+    /*                    UA_StatusCode_name(retval)); */
+    /* } */
+
+    /* Basic256 is unsecure and should not be used */
+    /* sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize]; */
+    /* retval = UA_SecurityPolicy_Basic256(sp, certificateAuth, privateKeyAuth, config->logging); */
+    /* if(retval == UA_STATUSCODE_GOOD) { */
+    /*     ++config->authSecurityPoliciesSize; */
+    /* } else { */
+    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
+    /*                    "Could not add SecurityPolicy#Basic256 with error code %s", */
+    /*                    UA_StatusCode_name(retval)); */
+    /* } */
+
+    UA_StatusCode retval;
+    sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize];
+    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(sp, certificateAuth, privateKeyAuth, config->logging);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->authSecurityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize];
+    retval = UA_SecurityPolicy_Basic256Sha256(sp, certificateAuth, privateKeyAuth, config->logging);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->authSecurityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize];
+    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(sp, certificateAuth, privateKeyAuth, config->logging);
+    if(retval == UA_STATUSCODE_GOOD) {
+        ++config->authSecurityPoliciesSize;
+    } else {
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+
+    if(config->authSecurityPoliciesSize == 0) {
+        UA_free(config->authSecurityPolicies);
+        config->authSecurityPolicies = NULL;
+    }
+
+    return retval;
+}
+
 UA_StatusCode
 UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
                                      UA_ByteString localCertificate, UA_ByteString privateKey,
@@ -1287,6 +1364,12 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
                        UA_StatusCode_name(retval));
     }
 
+    /* Set the same certificate also for authentication.
+     * Can be overridden with a different certificate. */
+    if(config->authSecurityPoliciesSize == 0)
+        clientConfig_setAuthenticationSecurityPolicies(config, localCertificate,
+                                                       decryptedPrivateKey);
+
     UA_ByteString_memZero(&decryptedPrivateKey);
     UA_ByteString_clear(&decryptedPrivateKey);
 
@@ -1309,6 +1392,7 @@ UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
                    "Certificate authentication with LibreSSL as crypto backend is not supported.");
     return UA_STATUSCODE_BADNOTIMPLEMENTED;
 #endif
+
     /* Create UserIdentityToken */
     UA_X509IdentityToken* identityToken = UA_X509IdentityToken_new();
     if(!identityToken)
@@ -1324,68 +1408,6 @@ UA_ClientConfig_setAuthenticationCert(UA_ClientConfig *config,
     config->userIdentityToken.content.decoded.data = identityToken;
 
     /* Populate SecurityPolicies */
-    UA_SecurityPolicy *sp = (UA_SecurityPolicy*)
-        UA_realloc(config->authSecurityPolicies, sizeof(UA_SecurityPolicy) * 5);
-    if(!sp)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    config->authSecurityPolicies = sp;
-
-    /* Basic128Rsa15 is unsecure and should not be used */
-    /* retval = UA_SecurityPolicy_Basic128Rsa15(&config->authSecurityPolicies[config->authSecurityPoliciesSize], */
-    /*                                                        certificateAuth, privateKeyAuth, config->logging); */
-    /* if(retval == UA_STATUSCODE_GOOD) { */
-    /*     ++config->authSecurityPoliciesSize; */
-    /* } else { */
-    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
-    /*                    "Could not add SecurityPolicy#Basic128Rsa15 with error code %s", */
-    /*                    UA_StatusCode_name(retval)); */
-    /* } */
-
-    /* Basic256 is unsecure and should not be used */
-    /* retval = UA_SecurityPolicy_Basic256(&config->authSecurityPolicies[config->authSecurityPoliciesSize], */
-    /*                                     certificateAuth, privateKeyAuth, config->logging); */
-    /* if(retval == UA_STATUSCODE_GOOD) { */
-    /*     ++config->authSecurityPoliciesSize; */
-    /* } else { */
-    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
-    /*                    "Could not add SecurityPolicy#Basic256 with error code %s", */
-    /*                    UA_StatusCode_name(retval)); */
-    /* } */
-
-    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                                   certificateAuth, privateKeyAuth, config->logging);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->authSecurityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    retval = UA_SecurityPolicy_Basic256Sha256(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                              certificateAuth, privateKeyAuth, config->logging);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->authSecurityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->authSecurityPolicies[config->authSecurityPoliciesSize],
-                                                   certificateAuth, privateKeyAuth, config->logging);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->authSecurityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    if(config->authSecurityPoliciesSize == 0) {
-        UA_free(config->authSecurityPolicies);
-        config->authSecurityPolicies = NULL;
-    }
-    return UA_STATUSCODE_GOOD;
+    return clientConfig_setAuthenticationSecurityPolicies(config, certificateAuth, privateKeyAuth);
 }
 #endif

From 257252e28a2664bb391b2824a873b0517abd4ef5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 4 Oct 2024 20:23:44 +0200
Subject: [PATCH 1669/1963] refactor(server): Silence a noisy warning in
 discovery

---
 src/server/ua_services_discovery.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 1270d63c8f1..3e28e013a0a 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -294,11 +294,8 @@ getDefaultEncryptedSecurityPolicy(UA_Server *server) {
         if(!UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &sp->policyUri))
             return sp;
     }
-    UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_CLIENT,
-                   "Could not find a SecurityPolicy with encryption for the "
-                   "UserTokenPolicy. Using an unencrypted policy.");
     return server->config.securityPoliciesSize > 0 ?
-        &server->config.securityPolicies[0]: NULL;
+        &server->config.securityPolicies[0] : NULL;
 }
 
 const char *securityModeStrs[4] = {"-invalid", "-none", "-sign", "-sign+encrypt"};

From 8def851476113888950237991a652e2c5c28e1e6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 4 Oct 2024 20:24:27 +0200
Subject: [PATCH 1670/1963] feat(server): Decrypt received IssuedIdentityToken

---
 src/server/ua_services_session.c | 60 ++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 85235e13766..23b29f3e034 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -533,22 +533,23 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
 
 #ifdef UA_ENABLE_ENCRYPTION
 static UA_StatusCode
-decryptUserNamePW(UA_Server *server, UA_Session *session,
-                  const UA_SecurityPolicy *sp,
-                  UA_UserNameIdentityToken *userToken) {
+decryptUserToken(UA_Server *server, UA_Session *session,
+                 UA_SecureChannel *channel, const UA_SecurityPolicy *sp,
+                 const UA_String encryptionAlgorithm, UA_String *encrypted) {
     /* If SecurityPolicy is None there shall be no EncryptionAlgorithm  */
     if(UA_String_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI)) {
-        if(userToken->encryptionAlgorithm.length > 0)
+        if(encryptionAlgorithm.length > 0)
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
-
-        UA_LOG_WARNING_SESSION(server->config.logging, session, "ActivateSession: "
-                               "Received an unencrypted username/passwort. "
-                               "Is the server misconfigured to allow that?");
+        if(channel->securityMode == UA_MESSAGESECURITYMODE_NONE) {
+            UA_LOG_WARNING_SESSION(server->config.logging, session, "ActivateSession: "
+                                   "Received an unencrypted UserToken. "
+                                   "Is the server misconfigured to allow that?");
+        }
         return UA_STATUSCODE_GOOD;
     }
 
     /* Test if the correct encryption algorithm is used */
-    if(!UA_String_equal(&userToken->encryptionAlgorithm,
+    if(!UA_String_equal(&encryptionAlgorithm,
                         &sp->asymmetricModule.cryptoModule.encryptionAlgorithm.uri))
         return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
@@ -580,13 +581,12 @@ decryptUserNamePW(UA_Server *server, UA_Session *session,
     res = UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
     /* Decrypt the secret */
-    if(UA_ByteString_copy(&userToken->password, &secret) != UA_STATUSCODE_GOOD ||
+    if(UA_ByteString_copy(encrypted, &secret) != UA_STATUSCODE_GOOD ||
        asymEnc->decrypt(tempChannelContext, &secret) != UA_STATUSCODE_GOOD)
         goto cleanup;
 
     /* The secret starts with a UInt32 length for the content */
-    if(UA_UInt32_decodeBinary(&secret, &offset,
-                              &secretLen) != UA_STATUSCODE_GOOD)
+    if(UA_UInt32_decodeBinary(&secret, &offset, &secretLen) != UA_STATUSCODE_GOOD)
         goto cleanup;
 
     /* The decrypted data must be large enough to include the Encrypted Token
@@ -616,9 +616,9 @@ decryptUserNamePW(UA_Server *server, UA_Session *session,
      * decrypted password. The encryptionAlgorithm and policyId fields are left
      * in the UserToken as an indication for the AccessControl plugin that
      * evaluates the decrypted content. */
-    memcpy(userToken->password.data,
+    memcpy(encrypted->data,
            &secret.data[sizeof(UA_UInt32)], secretLen - sn->length);
-    userToken->password.length = secretLen - sn->length;
+    encrypted->length = secretLen - sn->length;
     res = UA_STATUSCODE_GOOD;
 
  cleanup:
@@ -642,7 +642,7 @@ static UA_StatusCode
 checkActivateSessionX509(UA_Server *server, UA_Session *session,
                          const UA_SecurityPolicy *sp, UA_X509IdentityToken* token,
                          const UA_SignatureData *tokenSignature) {
-    /* The SecurityPolicy must be None */
+    /* The SecurityPolicy must not be None for the signature */
     if(UA_String_equal(&sp->policyUri, &UA_SECURITY_POLICY_NONE_URI))
         return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
@@ -753,29 +753,37 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
         goto rejected;
     }
 
+    /* Decrypt (or validate the signature) of the UserToken. The DataType of the
+     * UserToken was already checked in selectEndpointAndTokenPolicy */
 #ifdef UA_ENABLE_ENCRYPTION
     if(utp->tokenType == UA_USERTOKENTYPE_USERNAME) {
         /* If it is a UserNameIdentityToken, the password may be encrypted */
        UA_UserNameIdentityToken *userToken = (UA_UserNameIdentityToken *)
            req->userIdentityToken.content.decoded.data;
        resp->responseHeader.serviceResult =
-           decryptUserNamePW(server, session, tokenSp, userToken);
-       if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
-           goto securityRejected;
+           decryptUserToken(server, session, channel, tokenSp,
+                            userToken->encryptionAlgorithm, &userToken->password);
     } else if(utp->tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
         /* If it is a X509IdentityToken, check the userTokenSignature. Note this
          * only validates that the user has the corresponding private key for
-         * the given user cetificate. Checking whether the user certificate is
+         * the given user certificate. Checking whether the user certificate is
          * trusted has to be implemented in the access control plugin. The
          * entire token is forwarded in the call to ActivateSession. */
-        UA_X509IdentityToken* token = (UA_X509IdentityToken*)
+        UA_X509IdentityToken* x509token = (UA_X509IdentityToken*)
             req->userIdentityToken.content.decoded.data;
-       resp->responseHeader.serviceResult =
-           checkActivateSessionX509(server, session, tokenSp,
-                                    token, &req->userTokenSignature);
-       if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
-           goto securityRejected;
-    }
+        resp->responseHeader.serviceResult =
+            checkActivateSessionX509(server, session, tokenSp,
+                                     x509token, &req->userTokenSignature);
+    } else if(utp->tokenType == UA_USERTOKENTYPE_ISSUEDTOKEN) {
+        /* IssuedTokens are encrypted */
+       UA_IssuedIdentityToken *issuedToken = (UA_IssuedIdentityToken*)
+           req->userIdentityToken.content.decoded.data;
+       resp->responseHeader.serviceResult = decryptUserToken(
+           server, session, channel, tokenSp, issuedToken->encryptionAlgorithm,
+           &issuedToken->tokenData);
+    } /* else Anonymous */
+    if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
+        goto securityRejected;
 #endif
 
     /* Callback into userland access control */

From 8312860037b48f4b1b0dabcb3ff5573b23ad52a9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 4 Oct 2024 21:19:51 +0200
Subject: [PATCH 1671/1963] refactor(client): Pull out activate session signing
 and encryption into dedicated methods

---
 src/client/ua_client_connect.c | 293 ++++++++++++++++-----------------
 1 file changed, 139 insertions(+), 154 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 6026971c3ea..458837f8c91 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -146,21 +146,11 @@ isFullyConnected(UA_Client *client) {
 
 #ifdef UA_ENABLE_ENCRYPTION
 
-/* Function to create a signature using remote certificate and nonce */
+/* Function to create a signature using remote certificate and nonce.
+ * This uses the SecurityPolicy of the SecureChannel. */
 static UA_StatusCode
-signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
-                           UA_ActivateSessionRequest *request) {
-    if(channel->securityMode != UA_MESSAGESECURITYMODE_SIGN &&
-       channel->securityMode != UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
-        return UA_STATUSCODE_GOOD;
-
-    UA_UserTokenPolicy *utp = findUserTokenPolicy(client, &client->endpoint);
-    if(!utp) {
-        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
-                       "Could not find a matching UserTokenPolicy in the endpoint");
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
-
+signClientSignature(UA_Client *client, UA_ActivateSessionRequest *request) {
+    UA_SecureChannel *channel = &client->channel;
     const UA_SecurityPolicy *sp = channel->securityPolicy;
     UA_SignatureData *sd = &request->clientSignature;
     const UA_SecurityPolicySignatureAlgorithm *signAlg =
@@ -177,101 +167,71 @@ signActivateSessionRequest(UA_Client *client, UA_SecureChannel *channel,
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    /* Allocate a temporary buffer */
-    UA_ByteString dataToSign;
-    size_t dataToSignSize =
+    /* Create a temporary buffer */
+    size_t signDataSize =
         channel->remoteCertificate.length + client->serverSessionNonce.length;
-    if(dataToSignSize > MAX_DATA_SIZE)
+    if(signDataSize > MAX_DATA_SIZE)
         return UA_STATUSCODE_BADINTERNALERROR;
-    retval = UA_ByteString_allocBuffer(&dataToSign, dataToSignSize);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval; /* sd->signature is cleaned up with the response */
-
-    /* Sign the clientSignature */
-    memcpy(dataToSign.data, channel->remoteCertificate.data,
-           channel->remoteCertificate.length);
-    memcpy(dataToSign.data + channel->remoteCertificate.length,
-           client->serverSessionNonce.data, client->serverSessionNonce.length);
-    retval = signAlg->sign(channel->channelContext, &dataToSign, &sd->signature);
-    if(retval != UA_STATUSCODE_GOOD)
-        goto cleanup;
-
-    /* Prepare the UserTokenSignature */
-    if(utp->tokenType == UA_USERTOKENTYPE_CERTIFICATE) {
-        /* Get the SecurityPolicy for authentication. If the UserTokenPolicy
-         * does not define it, the SecurityPolicyUri of the overall endpoint is
-         * used. The SecurityPolicy must be retrieved with getAuthSecurityPolicy
-         * as it can use a certificate different from the SecureChannel. */
-        UA_String securityPolicyUri = (utp->securityPolicyUri.length > 0) ?
-            utp->securityPolicyUri : client->endpoint.securityPolicyUri;
-        UA_SecurityPolicy *utsp = getAuthSecurityPolicy(client, securityPolicyUri);
-        if(!utsp) {
-            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
-                         "The configured SecurityPolicy for certificate "
-                         "authentication could not be found");
-            retval = UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
-            goto cleanup;
-        }
+    UA_Byte buf[MAX_DATA_SIZE];
+    UA_ByteString signData = {signDataSize, buf};
 
-        UA_SignatureData *utsd = &request->userTokenSignature;
-        UA_X509IdentityToken *token = (UA_X509IdentityToken *)
-            request->userIdentityToken.content.decoded.data;
-        UA_SecurityPolicySignatureAlgorithm *utpSignAlg =
-            &utsp->asymmetricModule.cryptoModule.signatureAlgorithm;
-
-        /* Check the size of the content for signing */
-        UA_ByteString signData = UA_BYTESTRING_NULL;
-        size_t signDataSize =
-            channel->remoteCertificate.length + client->serverSessionNonce.length;
-        if(signDataSize > MAX_DATA_SIZE) {
-            retval = UA_STATUSCODE_BADINTERNALERROR;
-            goto cleanup;
-        }
-
-        /* Copy the algorithm identifier */
-        retval = UA_String_copy(&utpSignAlg->uri, &utsd->algorithm);
-        if(retval != UA_STATUSCODE_GOOD)
-            goto cleanup;
-
-        /* We need a channel context with the user certificate in order to reuse
-         * the code for signing. */
-        void *tmpCtx;
-        retval = utsp->channelModule.newContext(utsp, &token->certificateData, &tmpCtx);
-        if(retval != UA_STATUSCODE_GOOD)
-            goto cleanup;
+    /* Sign the ClientSignature */
+    memcpy(buf, channel->remoteCertificate.data, channel->remoteCertificate.length);
+    memcpy(buf + channel->remoteCertificate.length, client->serverSessionNonce.data,
+           client->serverSessionNonce.length);
+    return signAlg->sign(channel->channelContext, &signData, &sd->signature);
+}
 
-        /* Allocate memory for the signature */
-        retval = UA_ByteString_allocBuffer(&utsd->signature,
-                                           utpSignAlg->getLocalSignatureSize(tmpCtx));
-        if(retval != UA_STATUSCODE_GOOD)
-            goto cleanup_utp;
+static UA_StatusCode
+signUserTokenSignature(UA_Client *client, UA_SecurityPolicy *utsp,
+                       UA_ActivateSessionRequest *request) {
+    /* Check the size of the content for signing and create a temporary buffer */
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    size_t signDataSize =
+        client->channel.remoteCertificate.length + client->serverSessionNonce.length;
+    if(signDataSize > MAX_DATA_SIZE)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    UA_Byte buf[MAX_DATA_SIZE];
+    UA_ByteString signData = {signDataSize, buf};
+
+    /* Copy the algorithm identifier */
+    UA_SecurityPolicySignatureAlgorithm *utpSignAlg =
+        &utsp->asymmetricModule.cryptoModule.signatureAlgorithm;
+    UA_SignatureData *utsd = &request->userTokenSignature;
+    retval = UA_String_copy(&utpSignAlg->uri, &utsd->algorithm);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
 
-        /* Allocate a temporary buffer for the data to be signed */
-        retval = UA_ByteString_allocBuffer(&signData, signDataSize);
-        if(retval != UA_STATUSCODE_GOOD)
-            goto cleanup_utp;
+    /* We need a channel context with the user certificate in order to reuse the
+     * code for signing. */
+    void *tmpCtx;
+    retval = utsp->channelModule.newContext(utsp, &client->channel.remoteCertificate, &tmpCtx);
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
 
-        /* Create the userTokenSignature */
-        memcpy(signData.data, channel->remoteCertificate.data,
-               channel->remoteCertificate.length);
-        memcpy(signData.data + channel->remoteCertificate.length,
-               client->serverSessionNonce.data, client->serverSessionNonce.length);
-        retval = utpSignAlg->sign(tmpCtx, &signData, &utsd->signature);
+    /* Allocate memory for the signature */
+    retval = UA_ByteString_allocBuffer(&utsd->signature,
+                                       utpSignAlg->getLocalSignatureSize(tmpCtx));
+    if(retval != UA_STATUSCODE_GOOD)
+        goto cleanup_utp;
 
-        /* Clean up */
-    cleanup_utp:
-        UA_ByteString_clear(&signData);
-        utsp->channelModule.deleteContext(tmpCtx);
-    }
+    /* Create the userTokenSignature */
+    memcpy(buf, client->channel.remoteCertificate.data,
+           client->channel.remoteCertificate.length);
+    memcpy(buf + client->channel.remoteCertificate.length,
+           client->serverSessionNonce.data, client->serverSessionNonce.length);
+    retval = utpSignAlg->sign(tmpCtx, &signData, &utsd->signature);
 
     /* Clean up */
- cleanup:
-    UA_ByteString_clear(&dataToSign);
+ cleanup_utp:
+    utsp->channelModule.deleteContext(tmpCtx);
     return retval;
 }
 
+/* UserName and IssuedIdentity are transferred encrypted.
+ * X509 and Anonymous are not. */
 static UA_StatusCode
-encryptUserIdentityToken(UA_Client *client, const UA_String userTokenSecurityPolicy,
+encryptUserIdentityToken(UA_Client *client, UA_SecurityPolicy *utsp,
                          UA_ExtensionObject *userIdentityToken) {
     UA_IssuedIdentityToken *iit = NULL;
     UA_UserNameIdentityToken *unit = NULL;
@@ -287,25 +247,11 @@ encryptUserIdentityToken(UA_Client *client, const UA_String userTokenSecurityPol
         return UA_STATUSCODE_GOOD;
     }
 
-    /* No encryption */
-    const UA_String none = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
-    if(userTokenSecurityPolicy.length == 0 ||
-       UA_String_equal(&userTokenSecurityPolicy, &none)) {
-        return UA_STATUSCODE_GOOD;
-    }
-
-    UA_SecurityPolicy *sp = getSecurityPolicy(client, userTokenSecurityPolicy);
-    if(!sp) {
-        UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
-                       "Could not find the required SecurityPolicy for the UserToken");
-        return UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
-    }
-
     /* Create a temp channel context */
 
     void *channelContext;
-    UA_StatusCode retval = sp->channelModule.
-        newContext(sp, &client->endpoint.serverCertificate, &channelContext);
+    UA_StatusCode retval = utsp->channelModule.
+        newContext(utsp, &client->endpoint.serverCertificate, &channelContext);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                        "Could not instantiate the SecurityPolicy for the UserToken");
@@ -313,12 +259,11 @@ encryptUserIdentityToken(UA_Client *client, const UA_String userTokenSecurityPol
     }
 
     /* Compute the encrypted length (at least one byte padding) */
-    size_t plainTextBlockSize = sp->asymmetricModule.cryptoModule.
+    size_t plainTextBlockSize = utsp->asymmetricModule.cryptoModule.
         encryptionAlgorithm.getRemotePlainTextBlockSize(channelContext);
-    size_t encryptedBlockSize = sp->asymmetricModule.cryptoModule.
+    size_t encryptedBlockSize = utsp->asymmetricModule.cryptoModule.
         encryptionAlgorithm.getRemoteBlockSize(channelContext);
-    UA_UInt32 length = (UA_UInt32)(tokenData->length +
-                                   client->serverSessionNonce.length);
+    UA_UInt32 length = (UA_UInt32)(tokenData->length + client->serverSessionNonce.length);
     UA_UInt32 totalLength = length + 4; /* Including the length field */
     size_t blocks = totalLength / plainTextBlockSize;
     if(totalLength % plainTextBlockSize != 0)
@@ -329,7 +274,7 @@ encryptUserIdentityToken(UA_Client *client, const UA_String userTokenSecurityPol
     UA_ByteString encrypted;
     retval = UA_ByteString_allocBuffer(&encrypted, encryptedLength);
     if(retval != UA_STATUSCODE_GOOD) {
-        sp->channelModule.deleteContext(channelContext);
+        utsp->channelModule.deleteContext(channelContext);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -352,24 +297,22 @@ encryptUserIdentityToken(UA_Client *client, const UA_String userTokenSecurityPol
         encrypted.data[i] = 0;
     encrypted.length = paddedLength;
 
-    retval = sp->asymmetricModule.cryptoModule.encryptionAlgorithm.
+    retval = utsp->asymmetricModule.cryptoModule.encryptionAlgorithm.
         encrypt(channelContext, &encrypted);
     encrypted.length = encryptedLength;
+    UA_ByteString_clear(tokenData);
+    *tokenData = encrypted;
+
+    /* Delete the temporary channel context */
+    utsp->channelModule.deleteContext(channelContext);
 
     if(iit) {
-        retval |= UA_String_copy(&sp->asymmetricModule.cryptoModule.encryptionAlgorithm.uri,
+        retval |= UA_String_copy(&utsp->asymmetricModule.cryptoModule.encryptionAlgorithm.uri,
                                  &iit->encryptionAlgorithm);
     } else {
-        retval |= UA_String_copy(&sp->asymmetricModule.cryptoModule.encryptionAlgorithm.uri,
+        retval |= UA_String_copy(&utsp->asymmetricModule.cryptoModule.encryptionAlgorithm.uri,
                                  &unit->encryptionAlgorithm);
     }
-
-    UA_ByteString_clear(tokenData);
-    *tokenData = encrypted;
-
-    /* Delete the temp channel context */
-    sp->channelModule.deleteContext(channelContext);
-
     return retval;
 }
 
@@ -794,14 +737,12 @@ activateSessionAsync(UA_Client *client) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
+    /* Initialize the request */
     UA_ActivateSessionRequest request;
     UA_ActivateSessionRequest_init(&request);
-    UA_StatusCode retval =
-        UA_ExtensionObject_copy(&client->config.userIdentityToken,
-                                &request.userIdentityToken);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
 
+    /* Set the requested LocaleIds */
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
     if(client->config.sessionLocaleIdsSize && client->config.sessionLocaleIds) {
         retval = UA_Array_copy(client->config.sessionLocaleIds,
                                client->config.sessionLocaleIdsSize,
@@ -811,38 +752,80 @@ activateSessionAsync(UA_Client *client) {
         request.localeIdsSize = client->config.sessionLocaleIdsSize;
     }
 
-    /* If not token is set, use anonymous */
-    if(request.userIdentityToken.encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
-        UA_AnonymousIdentityToken *t = UA_AnonymousIdentityToken_new();
-        if(!t) {
-            UA_ActivateSessionRequest_clear(&request);
-            return UA_STATUSCODE_BADOUTOFMEMORY;
+    /* Set the User Identity Token. If not defined use an anonymous token. Use
+     * the PolicyId from the UserTokenPolicy. All token types have the PolicyId
+     * string as the first element. */
+    UA_AnonymousIdentityToken anonToken;
+    retval = UA_ExtensionObject_copy(&client->config.userIdentityToken,
+                                     &request.userIdentityToken);
+    if(request.userIdentityToken.encoding != UA_EXTENSIONOBJECT_ENCODED_NOBODY) {
+        UA_String *policyId = (UA_String*)request.userIdentityToken.content.decoded.data;
+        UA_String_clear(policyId);
+        retval = UA_String_copy(&utp->policyId, policyId);
+    } else {
+        UA_AnonymousIdentityToken_init(&anonToken);
+        UA_ExtensionObject_setValueNoDelete(&request.userIdentityToken, &anonToken,
+                                            &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+        anonToken.policyId = utp->policyId;
+    }
+    if(retval != UA_STATUSCODE_GOOD)
+        return retval;
+
+#ifdef UA_ENABLE_ENCRYPTION
+    UA_SecurityPolicy *utsp = NULL;
+    UA_SecureChannel *channel = &client->channel;
+
+    /* Does the UserTokenPolicy have encryption? If not specifically defined in
+     * the UserTokenPolicy, then the SecurityPolicy of the underlying endpoint
+     * (SecureChannel) is used. */
+    UA_String tokenSecurityPolicyUri = (utp->securityPolicyUri.length > 0) ?
+        utp->securityPolicyUri : client->endpoint.securityPolicyUri;
+    const UA_String none = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
+    if(UA_String_equal(&none, &tokenSecurityPolicyUri)) {
+        if(UA_String_equal(&none, &client->channel.securityPolicy->policyUri) &&
+           request.userIdentityToken.content.decoded.type !=
+           &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
+            UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                           "!!! Warning !!! AuthenticationToken is transmitted "
+                           "without encryption");
         }
-        request.userIdentityToken.content.decoded.data = t;
-        request.userIdentityToken.content.decoded.type =
-            &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN];
-        request.userIdentityToken.encoding = UA_EXTENSIONOBJECT_DECODED;
+        goto utp_done;
     }
 
-    /* Set the correct PolicyId from the endpoint */
-    UA_String_clear((UA_String*)request.userIdentityToken.content.decoded.data);
-    retval = UA_String_copy(&utp->policyId,
-                            (UA_String*)request.userIdentityToken.content.decoded.data);
+    /* Get the SecurityPolicy for authentication */
+    utsp = getAuthSecurityPolicy(client, tokenSecurityPolicyUri);
+    if(!utsp) {
+        UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                     "UserTokenPolicy %.*s not available for authentication",
+                     (int)tokenSecurityPolicyUri.length, tokenSecurityPolicyUri.data);
+        retval = UA_STATUSCODE_BADSECURITYPOLICYREJECTED;
+        goto utp_done;
+    }
 
-#ifdef UA_ENABLE_ENCRYPTION
     /* Encrypt the UserIdentityToken */
-    retval |= encryptUserIdentityToken(client, utp->securityPolicyUri, &request.userIdentityToken);
-    retval |= signActivateSessionRequest(client, &client->channel, &request);
+    retval = encryptUserIdentityToken(client, utsp, &request.userIdentityToken);
+
+    /* Create the UserTokenSignature if this is possible for the token.
+     * The certificate is already loaded into the utsp. */
+    if(utp->tokenType == UA_USERTOKENTYPE_CERTIFICATE)
+        retval |= signUserTokenSignature(client, utsp, &request);
+
+ utp_done:
+    /* Create the client signature with the SecurityPolicy of the SecurteChannel */
+    if(channel->securityMode == UA_MESSAGESECURITYMODE_SIGN ||
+       channel->securityMode == UA_MESSAGESECURITYMODE_SIGNANDENCRYPT)
+        retval |= signClientSignature(client, &request);
 #endif
 
-    if(retval == UA_STATUSCODE_GOOD)
+    /* Send the request */
+    if(UA_LIKELY(retval == UA_STATUSCODE_GOOD))
         retval = __Client_AsyncService(client, &request,
                                        &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST],
                                        (UA_ClientAsyncServiceCallback)responseActivateSession,
                                        &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE],
                                        NULL, NULL);
 
-    UA_ActivateSessionRequest_clear(&request);
+    /* On success, advance the session state */
     if(retval == UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_ACTIVATE_REQUESTED;
     else
@@ -850,6 +833,8 @@ activateSessionAsync(UA_Client *client) {
                      "ActivateSession failed when sending the request with error code %s",
                      UA_StatusCode_name(retval));
 
+    /* Clean up */
+    UA_ActivateSessionRequest_clear(&request);
     return retval;
 }
 
@@ -936,9 +921,9 @@ matchUserToken(UA_Client *client,
     return false;
 }
 
-/* Returns the locally configured UserTokenPolicy (if it exists) or a match from
- * the EndpointDescription. If localTokenPolicy != NULL, then we require an
- * exact match with the configured UserTokenPolicy. */
+/* Returns a matching UserTokenPolicy from the EndpointDescription. If a
+ * UserTokenPolicy is configured in the client config, then we need an exact
+ * match. */
 static UA_UserTokenPolicy *
 findUserTokenPolicy(UA_Client *client, UA_EndpointDescription *endpoint) {
     /* Was a UserTokenPolicy configured? Then we need an exact match. */

From 92d69c2785e37020cac4de4d2492b6c8b33453ec Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 5 Oct 2024 21:49:46 +0200
Subject: [PATCH 1672/1963] refactor(client): Use SO_REUSEADDR sockets for the
 client listening for reverse connections

The client is often restarted in short order. Then the socket was blocked
for 2 minutes.
---
 src/client/ua_client_connect.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 458837f8c91..4f4d4eda2c6 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -2067,7 +2067,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
 
     client->channel.connectionManager = cm;
 
-    UA_KeyValuePair params[3];
+    UA_KeyValuePair params[4];
     bool booleanTrue = true;
     params[0].key = UA_QUALIFIEDNAME(0, "port");
     UA_Variant_setScalar(&params[0].value, &port, &UA_TYPES[UA_TYPES_UINT16]);
@@ -2076,10 +2076,12 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
             listenHostnamesLength, &UA_TYPES[UA_TYPES_STRING]);
     params[2].key = UA_QUALIFIEDNAME(0, "listen");
     UA_Variant_setScalar(&params[2].value, &booleanTrue, &UA_TYPES[UA_TYPES_BOOLEAN]);
+    params[3].key = UA_QUALIFIEDNAME(0, "reuse");
+    UA_Variant_setScalar(&params[3].value, &booleanTrue, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     UA_KeyValueMap paramMap;
     paramMap.map = params;
-    paramMap.mapSize = 3;
+    paramMap.mapSize = 4;
 
     UA_UNLOCK(&client->clientMutex);
     res = cm->openConnection(cm, &paramMap, client, NULL, __Client_reverseConnectCallback);

From 8c1536866515ffb03bc3d74ff7ed694cf5d569b8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 5 Oct 2024 21:52:27 +0200
Subject: [PATCH 1673/1963] fix (client): The client can listen on multiple
 sockets for reverse connections

Listening on "localhost" is now possible for IPv4 and IPv6 at the same
time.
---
 src/client/ua_client_connect.c  | 122 +++++++++++++++++++++-----------
 src/client/ua_client_internal.h |   4 ++
 2 files changed, 83 insertions(+), 43 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 4f4d4eda2c6..fbaaf6de6c1 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -30,7 +30,6 @@
 #define UA_MINMESSAGESIZE 8192
 #define UA_SESSION_LOCALNONCELENGTH 32
 #define MAX_DATA_SIZE 4096
-#define REVERSE_CONNECT_INDICATOR (void *)(uintptr_t)0xFFFFFFFF
 
 static void initConnect(UA_Client *client);
 static UA_StatusCode createSessionAsync(UA_Client *client);
@@ -1360,6 +1359,7 @@ connectActivity(UA_Client *client) {
     switch(client->channel.state) {
         /* Nothing to do if the connection has not opened fully */
     case UA_SECURECHANNELSTATE_CONNECTING:
+    case UA_SECURECHANNELSTATE_REVERSE_CONNECTED:
     case UA_SECURECHANNELSTATE_CLOSING:
     case UA_SECURECHANNELSTATE_HEL_SENT:
     case UA_SECURECHANNELSTATE_OPN_SENT:
@@ -1582,8 +1582,6 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         /* The connection is now open on the TCP level. Set the SecureChannel
          * state to reflect this. Otherwise later consistency checks for the
          * received messages fail. */
-        if(client->channel.state == UA_SECURECHANNELSTATE_REVERSE_LISTENING)
-            client->channel.state = UA_SECURECHANNELSTATE_REVERSE_CONNECTED;
         if(client->channel.state < UA_SECURECHANNELSTATE_CONNECTED)
             client->channel.state = UA_SECURECHANNELSTATE_CONNECTED;
     } else /* state == UA_CONNECTIONSTATE_OPENING */ {
@@ -1946,60 +1944,96 @@ UA_Client_activateSessionAsync(UA_Client *client,
 }
 
 static void
-__Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                         void *application, void **connectionContext,
-                         UA_ConnectionState state, const UA_KeyValueMap *params,
-                         UA_ByteString msg) {
+disconnectListenSockets(UA_Client *client) {
+    UA_ConnectionManager *cm = client->reverseConnectionCM;
+    for(size_t i = 0; i < 16; i++) {
+        if(client->reverseConnectionIds[i] != 0) {
+            cm->closeConnection(cm, client->reverseConnectionIds[i]);
+        }
+    }
+}
 
+/* ConnectionContext meaning:
+ * - NULL: New listen connection
+ * - &client->channel: Established active socket to a server
+ * - &client->reverseConnectionIds[*] == connectionId: Established listen socket
+ * - &client->reverseConnectionIds[*] != connectionId: New active socket */
+static void
+__Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                                void *application, void **connectionContext,
+                                UA_ConnectionState state, const UA_KeyValueMap *params,
+                                UA_ByteString msg) {
     UA_Client *client = (UA_Client*)application;
-
     UA_LOCK(&client->clientMutex);
 
-    /* This is the first call for the listening socket, attach the
-     * REVERSE_CONNECT_INDICATOR marker and set the ID to the channel */
-    if(!client->channel.connectionId) {
-        client->channel.connectionId = connectionId;
-        *connectionContext = REVERSE_CONNECT_INDICATOR;
-    }
-
-    /* Last call for the listening connection while it is being closed. Only
-     * notify a state change if no reverse connection is being or has been
-     * established by now */
-    if(*connectionContext == REVERSE_CONNECT_INDICATOR &&
-       state == UA_CONNECTIONSTATE_CLOSING) {
-        if(client->channel.connectionId == connectionId) {
-            client->channel.state = UA_SECURECHANNELSTATE_CLOSED;
-            notifyClientState(client);
+    if(!*connectionContext) {
+        /* Store the new listen connection */
+        size_t i = 0;
+        for(; i < 16; i++) {
+            if(client->reverseConnectionIds[i] == 0) {
+                client->reverseConnectionIds[i] = connectionId;
+                client->reverseConnectionCM = cm;
+                *connectionContext = &client->reverseConnectionIds[i];
+                if(client->channel.state == UA_SECURECHANNELSTATE_CLOSED)
+                    client->channel.state = UA_SECURECHANNELSTATE_REVERSE_LISTENING;
+                break;
+            }
         }
-        UA_UNLOCK(&client->clientMutex);
-        return;
-    }
+        /* All slots are full, close */
+        if(i == 16) {
+            cm->closeConnection(cm, connectionId);
+            UA_UNLOCK(&client->clientMutex);
+            return;
+        }
+    } else if(*connectionContext == &client->channel ||
+              *(uintptr_t*)*connectionContext != connectionId) {
+        /* Active socket */
+
+        /* New active socket */
+        if(*connectionContext != &client->channel) {
+            /* The client already has an active connection */
+            if(client->channel.connectionId) {
+                cm->closeConnection(cm, connectionId);
+                UA_UNLOCK(&client->clientMutex);
+                return;
+            }
 
-    /* Second callback for the listening socket, it is now listening for
-     * incoming connections */
-    if(client->channel.connectionId == connectionId &&
-       *connectionContext == REVERSE_CONNECT_INDICATOR) {
-        client->channel.state = UA_SECURECHANNELSTATE_REVERSE_LISTENING;
-        notifyClientState(client);
-    }
+            /* Set the connection the SecureChannel */
+            client->channel.connectionId = connectionId;
+            client->channel.connectionManager = cm;
+            *connectionContext = &client->channel;
 
-    /* This is a connection initiated by a server, disconnect the listener and
-     * reset secure channel information */
-    if(client->channel.connectionId != connectionId) {
-        cm->closeConnection(cm, client->channel.connectionId);
-        client->channel.connectionId = 0;
-        *connectionContext = NULL;
-    }
+            /* Don't keep the listen sockets when an active connection is open */
+            disconnectListenSockets(client);
 
-    /* Forward all calls belonging to the reverse connection estblished by the
-     * server to the regular network callback */
-    if(*connectionContext != REVERSE_CONNECT_INDICATOR) {
+            /* Set the channel state. The notification callback is called within
+             * __Client_reverseConnectCallback. */
+            if(client->channel.state == UA_SECURECHANNELSTATE_REVERSE_LISTENING)
+                client->channel.state = UA_SECURECHANNELSTATE_REVERSE_CONNECTED;
+        }
+
+        /* Handle the active connection in the normal network callback */
         UA_UNLOCK(&client->clientMutex);
         __Client_networkCallback(cm, connectionId, application,
                                  connectionContext, state, params, msg);
         return;
     }
 
+    /* Close the listen socket. Was this the last one? */
+    if(state == UA_CONNECTIONSTATE_CLOSING) {
+        UA_Byte count = 0;
+        for(size_t i = 0; i < 16; i++) {
+            if(client->reverseConnectionIds[i] == connectionId)
+                client->reverseConnectionIds[i] = 0;
+            if(client->reverseConnectionIds[i] != 0)
+                count++;
+        }
+        /* The last connection was closed */
+        if(count == 0 && client->channel.connectionId == 0)
+            client->channel.state = UA_SECURECHANNELSTATE_CLOSED;
+    }
+
+    notifyClientState(client);
     UA_UNLOCK(&client->clientMutex);
 }
 
@@ -2118,6 +2152,8 @@ closeSecureChannel(UA_Client *client) {
     UA_LOG_DEBUG_CHANNEL(client->config.logging, &client->channel,
                          "Closing the channel");
 
+    disconnectListenSockets(client);
+
     /* Send CLO if the SecureChannel is open */
     if(client->channel.state == UA_SECURECHANNELSTATE_OPEN) {
         UA_LOG_DEBUG_CHANNEL(client->config.logging, &client->channel,
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 6ed8f28e879..53a05f3c6dc 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -140,6 +140,10 @@ struct UA_Client {
     UA_UInt32 requestId; /* Unique, internally defined for each request */
     UA_DateTime nextChannelRenewal;
 
+    /* Reverse connect (listen) connections */
+    UA_ConnectionManager *reverseConnectionCM;
+    uintptr_t reverseConnectionIds[16];
+
     /* Session */
     UA_SessionState sessionState;
     UA_NodeId authenticationToken;

From 1f19dca8ce1f73860083586c6bfdda1d1bf70a6e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 3 Oct 2024 13:49:22 +0200
Subject: [PATCH 1674/1963] refactor(build): Bump version to v1.4.6

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbf1e58a971..c18a457aaaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 5)
+set(OPEN62541_VER_PATCH 6)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 96fbfc8612b7851afb4990569e6b3dc2c0f46ba0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Oct 2024 21:50:12 +0200
Subject: [PATCH 1675/1963] fix(tests): Add a missing include to
 check_crl_validation.c (required for clang)

---
 tests/encryption/check_crl_validation.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/encryption/check_crl_validation.c b/tests/encryption/check_crl_validation.c
index c9af7c63a71..9c4c08d5e45 100644
--- a/tests/encryption/check_crl_validation.c
+++ b/tests/encryption/check_crl_validation.c
@@ -13,6 +13,8 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 
+#include <stdlib.h>
+
 #include "certificates.h"
 #include "check.h"
 #include "thread_wrapper.h"

From db91b23259ac7ef183b1051eb6e0b4581c23d297 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Oct 2024 23:06:02 +0200
Subject: [PATCH 1676/1963] fix(plugins): Manually classify certificates as CA
 for OpenSSL

Replace the builtin method with manual classification. We now require
the KU_CRL_SIGN flag to detect a CA. Before we rejected the leaf
certificates generated by some vendors.
---
 plugins/crypto/openssl/ua_pki_openssl.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index d7bb1297e5d..84eb66040b4 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -471,6 +471,26 @@ openSSLFindNextIssuer(CertContext *ctx, STACK_OF(X509) *stack, X509 *x509, X509
     return NULL;
 }
 
+/* Is the certificate a CA? */
+static UA_Boolean
+openSSLCheckCA(X509 *cert) {
+    uint32_t flags = X509_get_extension_flags(cert);
+    /* The basic constraints must be set with the CA flag true */
+    if(!(flags & EXFLAG_CA))
+        return false;
+
+    /* The Key Usage extension must be set */
+    if(!(flags & EXFLAG_KUSAGE))
+        return false;
+
+    /* The Key Usage must include cert signing and CRL issuing */
+    uint32_t usage = X509_get_key_usage(cert);
+    if(!(usage & KU_KEY_CERT_SIGN) || !(usage & KU_CRL_SIGN))
+        return false;
+
+    return true;
+}
+
 static UA_Boolean
 openSSLCheckRevoked(CertContext *ctx, X509 *cert) {
     const ASN1_INTEGER *sn = X509_get0_serialNumber(cert);
@@ -526,7 +546,7 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
 
         /* Verification Step: Certificate Usage
          * Can the issuer act as CA? Omit for self-signed leaf certificates. */
-        if((depth > 0 || issuer != cert) && !X509_check_ca(issuer)) {
+        if((depth > 0 || issuer != cert) && !openSSLCheckCA(issuer)) {
             ret = UA_STATUSCODE_BADCERTIFICATEISSUERUSENOTALLOWED;
             continue;
         }
@@ -604,7 +624,7 @@ UA_CertificateVerification_Verify(void *verificationContext,
      * Refer the test case CTT/Security/Security Certificate Validation/029.js
      * for more details. */
     X509 *leaf = sk_X509_value(stack, 0);
-    if(X509_check_ca(leaf)) {
+    if(openSSLCheckCA(leaf)) {
         sk_X509_pop_free(stack, X509_free);
         return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
     }

From b9473527623125b5ca264dae4551f8cc414b3bc3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Oct 2024 21:47:15 +0200
Subject: [PATCH 1677/1963] refactor(core): Validate Variant ArrayLength
 against its ArrayDimensions during binary decode

This lead to the fuzzer complaing since we hade the check for _encode
but not for _decode. This is not a direct memory issue per se. But the
consistency check allows early discovery of problematic values and
can potentially remove bugs where the user relies on the array
dimensions and the array length to match.
---
 src/ua_types_encoding_binary.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index 7e1509267a6..ac3f7165b16 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -1093,9 +1093,18 @@ DECODE_BINARY(Variant) {
     }
 
     /* Decode array dimensions */
-    if(isArray && (encodingByte & (u8)UA_VARIANT_ENCODINGMASKTYPE_DIMENSIONS) > 0)
+    if(isArray && (encodingByte & (u8)UA_VARIANT_ENCODINGMASKTYPE_DIMENSIONS) > 0) {
         ret |= Array_decodeBinary((void**)&dst->arrayDimensions, &dst->arrayDimensionsSize,
                                   &UA_TYPES[UA_TYPES_INT32], ctx);
+        /* Validate array length against array dimensions */
+        size_t totalSize = 1;
+        for(size_t i = 0; i < dst->arrayDimensionsSize; ++i) {
+            if(dst->arrayDimensions[i] == 0)
+                return UA_STATUSCODE_BADDECODINGERROR;
+            totalSize *= dst->arrayDimensions[i];
+        }
+        UA_CHECK(totalSize == dst->arrayLength, ret = UA_STATUSCODE_BADDECODINGERROR);
+    }
 
     ctx->depth--;
     return ret;

From a83bc45ccd6294a18fcfcd657492cdb3da423e3d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Oct 2024 22:01:14 +0200
Subject: [PATCH 1678/1963] refactor(tests): Remove misleading comments -
 Revocation lists are supported

---
 tests/encryption/check_crl_validation.c                 | 3 ---
 tests/encryption/check_encryption_aes128sha256rsaoaep.c | 6 +++---
 tests/encryption/check_encryption_aes256sha256rsapss.c  | 6 +++---
 tests/encryption/check_encryption_basic128rsa15.c       | 6 +++---
 tests/encryption/check_encryption_basic256.c            | 6 +++---
 tests/encryption/check_encryption_basic256sha256.c      | 6 +++---
 tests/encryption/check_encryption_key_password.c        | 2 +-
 tests/encryption/check_save_rejected_cert.c             | 2 +-
 8 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/tests/encryption/check_crl_validation.c b/tests/encryption/check_crl_validation.c
index d929fb2886a..2c943103696 100644
--- a/tests/encryption/check_crl_validation.c
+++ b/tests/encryption/check_crl_validation.c
@@ -69,7 +69,6 @@ static void setup1(void) {
     issuerList[0] = intermediateCa;
     issuerList[1] = rootCa;
 
-    /* Loading of a revocation list currently unsupported */
     size_t revocationListSize = 2;
     UA_STACKARRAY(UA_ByteString, revocationList, revocationListSize);
     revocationList[0] = rootCaCrl;
@@ -132,7 +131,6 @@ static void setup2(void) {
     issuerList[0] = intermediateCa;
     issuerList[1] = rootCa;
 
-    /* Loading of a revocation list currently unsupported */
     size_t revocationListSize = 2;
     UA_STACKARRAY(UA_ByteString, revocationList, revocationListSize);
     revocationList[0] = rootCaCrl;
@@ -195,7 +193,6 @@ static void setup3(void) {
     issuerList[0] = rootCa;
     issuerList[1] = intermediateCa;
 
-    /* Loading of a revocation list currently unsupported */
     size_t revocationListSize = 2;
     UA_STACKARRAY(UA_ByteString, revocationList, revocationListSize);
     revocationList[0] = rootCaCrl;
diff --git a/tests/encryption/check_encryption_aes128sha256rsaoaep.c b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
index e2ac183ab98..71f1e2330b9 100644
--- a/tests/encryption/check_encryption_aes128sha256rsaoaep.c
+++ b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
@@ -64,7 +64,7 @@ static void setup(void) {
         trustList[i] = loadFile(argv[i+3]);
     */
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
@@ -132,7 +132,7 @@ START_TEST(encryption_connect) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
@@ -215,7 +215,7 @@ START_TEST(encryption_connect_pem) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
diff --git a/tests/encryption/check_encryption_aes256sha256rsapss.c b/tests/encryption/check_encryption_aes256sha256rsapss.c
index 1a34d8b9f21..d70b1d9b0ac 100644
--- a/tests/encryption/check_encryption_aes256sha256rsapss.c
+++ b/tests/encryption/check_encryption_aes256sha256rsapss.c
@@ -64,7 +64,7 @@ static void setup(void) {
         trustList[i] = loadFile(argv[i+3]);
     */
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
@@ -132,7 +132,7 @@ START_TEST(encryption_connect) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
@@ -215,7 +215,7 @@ START_TEST(encryption_connect_pem) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
diff --git a/tests/encryption/check_encryption_basic128rsa15.c b/tests/encryption/check_encryption_basic128rsa15.c
index e65c89fcc65..d7f3a1671b1 100644
--- a/tests/encryption/check_encryption_basic128rsa15.c
+++ b/tests/encryption/check_encryption_basic128rsa15.c
@@ -62,7 +62,7 @@ static void setup(void) {
         trustList[i] = loadFile(argv[i+3]);
     */
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
@@ -142,7 +142,7 @@ START_TEST(encryption_connect) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
@@ -242,7 +242,7 @@ START_TEST(encryption_connect_pem) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
diff --git a/tests/encryption/check_encryption_basic256.c b/tests/encryption/check_encryption_basic256.c
index 47e746479a0..bebfbbe1ab0 100644
--- a/tests/encryption/check_encryption_basic256.c
+++ b/tests/encryption/check_encryption_basic256.c
@@ -66,7 +66,7 @@ static void setup(void) {
         trustList[i] = loadFile(argv[i+3]);
     */
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
@@ -144,7 +144,7 @@ START_TEST(encryption_connect) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
@@ -244,7 +244,7 @@ START_TEST(encryption_connect_pem) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
diff --git a/tests/encryption/check_encryption_basic256sha256.c b/tests/encryption/check_encryption_basic256sha256.c
index 125c6c041ab..7da5f4b355b 100644
--- a/tests/encryption/check_encryption_basic256sha256.c
+++ b/tests/encryption/check_encryption_basic256sha256.c
@@ -64,7 +64,7 @@ static void setup(void) {
         trustList[i] = loadFile(argv[i+3]);
     */
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
@@ -132,7 +132,7 @@ START_TEST(encryption_connect) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
@@ -215,7 +215,7 @@ START_TEST(encryption_connect_pem) {
     UA_Array_delete(endpointArray, endpointArraySize,
                     &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 
-    /* TODO test trustList Load revocationList is not supported now
+    /* Revocation lists are supported, but not used here
     if(argc > MIN_ARGS) {
         trustListSize = (size_t)argc-MIN_ARGS;
         retval = UA_ByteString_allocBuffer(trustList, trustListSize);
diff --git a/tests/encryption/check_encryption_key_password.c b/tests/encryption/check_encryption_key_password.c
index 2ed1da362ea..bd3946b54da 100644
--- a/tests/encryption/check_encryption_key_password.c
+++ b/tests/encryption/check_encryption_key_password.c
@@ -62,7 +62,7 @@ static void setup(void) {
     size_t issuerListSize = 0;
     UA_ByteString *issuerList = NULL;
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
diff --git a/tests/encryption/check_save_rejected_cert.c b/tests/encryption/check_save_rejected_cert.c
index b23c55ac55b..e2e0dc16e0f 100644
--- a/tests/encryption/check_save_rejected_cert.c
+++ b/tests/encryption/check_save_rejected_cert.c
@@ -371,7 +371,7 @@ static void setup(void) {
     size_t issuerListSize = 0;
     UA_ByteString *issuerList = NULL;
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 

From c5f214ee4ccc5200e6a9fd132b02ac619e418769 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 22 Oct 2024 23:05:46 +0200
Subject: [PATCH 1679/1963] refactor(examples): Remove misleading comments -
 revocation lists are supported

---
 .../access_control_encrypt/client_access_control_encrypt.c   | 3 ++-
 examples/ci_server.c                                         | 3 +--
 examples/encryption/client_encryption.c                      | 3 ++-
 examples/encryption/client_encryption_tpm_keystore.c         | 5 +++--
 examples/encryption/server_encryption.c                      | 2 +-
 examples/encryption/server_encryption_tpm_keystore.c         | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/access_control_encrypt/client_access_control_encrypt.c b/examples/access_control_encrypt/client_access_control_encrypt.c
index 2697dbef03e..2c3979bbc13 100644
--- a/examples/access_control_encrypt/client_access_control_encrypt.c
+++ b/examples/access_control_encrypt/client_access_control_encrypt.c
@@ -31,7 +31,7 @@ int main(int argc, char* argv[]) {
     UA_ByteString certificate = loadFile(argv[2]);
     UA_ByteString privateKey  = loadFile(argv[3]);
 
-    /* Load the trustList. Load revocationList is not supported now */
+    /* Load the trustList */
     size_t trustListSize = 0;
     if(argc > MIN_ARGS)
         trustListSize = (size_t)argc-MIN_ARGS;
@@ -39,6 +39,7 @@ int main(int argc, char* argv[]) {
     for(size_t trustListCount = 0; trustListCount < trustListSize; trustListCount++)
         trustList[trustListCount] = loadFile(argv[trustListCount+4]);
 
+    /* Revocation lists are supported, but not used for the example here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
diff --git a/examples/ci_server.c b/examples/ci_server.c
index f1d61f36f18..ea1b133ed02 100644
--- a/examples/ci_server.c
+++ b/examples/ci_server.c
@@ -165,11 +165,10 @@ int main(int argc, char* argv[]) {
     size_t issuerListSize = 0;
     UA_ByteString *issuerList = NULL;
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used for the example here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
-
      retval = UA_ServerConfig_setDefaultWithSecurityPolicies(config, port,
                                                        &certificate, &privateKey,
                                                        trustList, trustListSize,
diff --git a/examples/encryption/client_encryption.c b/examples/encryption/client_encryption.c
index e9aab9c9486..5366318d999 100644
--- a/examples/encryption/client_encryption.c
+++ b/examples/encryption/client_encryption.c
@@ -30,7 +30,7 @@ int main(int argc, char* argv[]) {
     UA_ByteString certificate = loadFile(argv[2]);
     UA_ByteString privateKey  = loadFile(argv[3]);
 
-    /* Load the trustList. Load revocationList is not supported now */
+    /* Load the trustlist */
     size_t trustListSize = 0;
     if(argc > MIN_ARGS)
         trustListSize = (size_t)argc-MIN_ARGS;
@@ -38,6 +38,7 @@ int main(int argc, char* argv[]) {
     for(size_t trustListCount = 0; trustListCount < trustListSize; trustListCount++)
         trustList[trustListCount] = loadFile(argv[trustListCount+4]);
 
+    /* Revocation lists are supported, but not used for the example here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
diff --git a/examples/encryption/client_encryption_tpm_keystore.c b/examples/encryption/client_encryption_tpm_keystore.c
index a55d1da6425..c819c5d3722 100644
--- a/examples/encryption/client_encryption_tpm_keystore.c
+++ b/examples/encryption/client_encryption_tpm_keystore.c
@@ -375,7 +375,7 @@ int main(int argc, char* argv[]) {
     certificate.data = certificate_out_data->data;
     certificate.length = certificate_out_data->length;
 
-    /* Load the trustList. Load revocationList is not supported now */
+    /* Load the trust list */
     size_t trustListSize = 0;
     if(argc > MIN_ARGS)
         trustListSize = (size_t)argc-MIN_ARGS;
@@ -383,6 +383,7 @@ int main(int argc, char* argv[]) {
     for(size_t trustListCount = 0; trustListCount < trustListSize; trustListCount++)
         trustList[trustListCount] = loadFile(argv[trustListCount+7]);
 
+    /* Revocation lists are supported, but not used for the example here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
@@ -432,4 +433,4 @@ int main(int argc, char* argv[]) {
     UA_Variant_clear(&value);
     UA_Client_delete(client);
     return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
-}
\ No newline at end of file
+}
diff --git a/examples/encryption/server_encryption.c b/examples/encryption/server_encryption.c
index 3e9f9cebc17..5ebbeb971f9 100644
--- a/examples/encryption/server_encryption.c
+++ b/examples/encryption/server_encryption.c
@@ -83,7 +83,7 @@ int main(int argc, char* argv[]) {
     size_t issuerListSize = 0;
     UA_ByteString *issuerList = NULL;
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used for the example here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 
diff --git a/examples/encryption/server_encryption_tpm_keystore.c b/examples/encryption/server_encryption_tpm_keystore.c
index 6c13960d8c8..f1554cd9dbe 100644
--- a/examples/encryption/server_encryption_tpm_keystore.c
+++ b/examples/encryption/server_encryption_tpm_keystore.c
@@ -393,7 +393,7 @@ int main(int argc, char* argv[]) {
     size_t issuerListSize = 0;
     UA_ByteString *issuerList = NULL;
 
-    /* Loading of a revocation list currently unsupported */
+    /* Revocation lists are supported, but not used for the example here */
     UA_ByteString *revocationList = NULL;
     size_t revocationListSize = 0;
 

From ca2eb3ebe145fd2e90425dda8602128e878fc5bc Mon Sep 17 00:00:00 2001
From: Joe Riemersma <joepaz200@gmail.com>
Date: Tue, 22 Oct 2024 13:14:57 +0100
Subject: [PATCH 1680/1963] fix(server): allow different SecurityPolicy for
 UserTokenPolicy and Endpoint Description

---
 src/server/ua_services_session.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 23b29f3e034..6abb969c449 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -464,9 +464,6 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
         for(size_t j = 0; j < identPoliciesSize ; j++) {
             const UA_UserTokenPolicy *pol = &identPolicies[j];
 
-            if(!UA_String_equal(&desc->securityPolicyUri, &pol->securityPolicyUri))
-                continue;
-
             /* Part 4, Section 5.6.3.2, Table 17: A NULL or empty
              * UserIdentityToken should be treated as Anonymous */
             if(identityToken->encoding == UA_EXTENSIONOBJECT_ENCODED_NOBODY &&

From c9228e92c7005c7279db03d8ef17784bc3349b9f Mon Sep 17 00:00:00 2001
From: Andreas Eckerstorfer <99019163+keba-estr@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:34:47 +0200
Subject: [PATCH 1681/1963] fix(pubsub): include GroupVersion data type in
 pubsub informaiton model (#6789)

The data type of the mandatory entry GroupVersion in the PubSub info
model was uninitialized because of a missing read callback.
---
 src/pubsub/ua_pubsub_ns0.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 792ef6ba644..4db6844fa3f 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1312,6 +1312,26 @@ writeContentMask(UA_Server *server, const UA_NodeId *sessionId,
     return UA_STATUSCODE_GOOD;
 }
 
+static UA_StatusCode
+readGroupVersion(UA_Server *server, const UA_NodeId *sessionId,
+                void *sessionContext, const UA_NodeId *nodeId,
+                void *nodeContext, UA_Boolean includeSourceTimeStamp,
+                const UA_NumericRange *range, UA_DataValue *value) {
+    UA_WriterGroup *writerGroup = (UA_WriterGroup*)nodeContext;
+    if((writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED &&
+        writerGroup->config.messageSettings.encoding != UA_EXTENSIONOBJECT_DECODED_NODELETE) ||
+       writerGroup->config.messageSettings.content.decoded.type !=
+       &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE])
+        return UA_STATUSCODE_BADINTERNALERROR;
+    UA_UadpWriterGroupMessageDataType *wgm = (UA_UadpWriterGroupMessageDataType*)
+        writerGroup->config.messageSettings.content.decoded.data;
+
+    UA_Variant_setScalarCopy(&value->value, &wgm->groupVersion,
+                             &UA_TYPES[UA_DATATYPEKIND_UINT32]);
+    value->hasValue = true;
+    return UA_STATUSCODE_GOOD;
+}
+
 UA_StatusCode
 addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
@@ -1410,6 +1430,22 @@ addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup) {
         writeAccessLevelAttribute(server, contentMaskId,
                                   UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_READ);
 
+    }
+    UA_NodeId groupVersionId =
+        findSingleChildNode(server, UA_QUALIFIEDNAME(0, "GroupVersion"),
+                            UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), messageSettingsId);
+    if(!UA_NodeId_isNull(&groupVersionId)) {
+        /* Set the callback */
+        UA_DataSource ds;
+        ds.read = readGroupVersion;
+        ds.write = NULL;
+        setVariableNode_dataSource(server, groupVersionId, ds);
+        setNodeContext(server, groupVersionId, writerGroup);
+
+        /* Read only */
+        writeAccessLevelAttribute(server, groupVersionId,
+                                  UA_ACCESSLEVELMASK_READ);
+
     }
 
     /* Add reference to methods */

From 68bf6a3919a6ab48c4a5a9cde5738606bc189b0b Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Thu, 24 Oct 2024 10:06:50 +0200
Subject: [PATCH 1682/1963] fix(pubsub): Only check message timeout if message
 is valid (#6786)

This issue has already been resolved on the master branch with commit
c4686f6351ec192f75dadb5ac570b07b3fbda5d3.
---
 src/pubsub/ua_pubsub_reader.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 9eb28711a99..0d58a89a3d9 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -848,17 +848,6 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
 
     UA_LOG_DEBUG_READER(server->config.logging, dsr, "Received a network message");
 
-#ifdef UA_ENABLE_PUBSUB_MONITORING
-    UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
-#endif
-
-    if(dsr->state != UA_PUBSUBSTATE_OPERATIONAL &&
-       dsr->state != UA_PUBSUBSTATE_PREOPERATIONAL) {
-        UA_LOG_WARNING_READER(server->config.logging, dsr,
-                            "Received a network message but not operational");
-        return;
-    }
-
     if(!msg->header.dataSetMessageValid) {
         UA_LOG_INFO_READER(server->config.logging, dsr,
                            "DataSetMessage is discarded: message is not valid");
@@ -882,6 +871,17 @@ UA_DataSetReader_process(UA_Server *server, UA_ReaderGroup *rg,
         return;
     }
 
+#ifdef UA_ENABLE_PUBSUB_MONITORING
+    UA_DataSetReader_checkMessageReceiveTimeout(server, dsr);
+#endif
+
+    if(dsr->state != UA_PUBSUBSTATE_OPERATIONAL &&
+       dsr->state != UA_PUBSUBSTATE_PREOPERATIONAL) {
+        UA_LOG_WARNING_READER(server->config.logging, dsr,
+                            "Received a network message but not operational");
+        return;
+    }
+
     /* Process message with raw encoding. We have no field-count information for
      * the message. */
     if(msg->header.fieldEncoding == UA_FIELDENCODING_RAWDATA) {

From 3faba7129cff3fdaced7bfa91dbcfe14555414ff Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 3 Nov 2024 22:03:14 +0100
Subject: [PATCH 1683/1963] refactor(core): Encode string as empty (instead of
 NULL) when the data-pointer is > NULL

Before we required the data pointer to be exactly the UA_EMPTY_ARRAY_SENTINEL.
But there can be situations where the data pointers goes to "" (empty
string with the \0 ending). Then the string should be empty -- and not
null (length -1).
---
 src/ua_types_encoding_binary.c |  2 +-
 tests/check_types_builtin.c    | 48 ++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index 3ed6a59e9dd..b134c4e8329 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -436,7 +436,7 @@ Array_encodeBinary(const void *src, size_t length, const UA_DataType *type, Ctx
         return UA_STATUSCODE_BADINTERNALERROR;
     if(length > 0)
         signed_length = (i32)length;
-    else if(src == UA_EMPTY_ARRAY_SENTINEL)
+    else if(src >= UA_EMPTY_ARRAY_SENTINEL) /* src != NULL */
         signed_length = 0;
 
     /* Encode the array length */
diff --git a/tests/check_types_builtin.c b/tests/check_types_builtin.c
index 7570de39df1..5b99f549b25 100644
--- a/tests/check_types_builtin.c
+++ b/tests/check_types_builtin.c
@@ -946,6 +946,53 @@ START_TEST(UA_String_encodeShallWorkOnExample) {
 }
 END_TEST
 
+START_TEST(UA_String_encodeShallWorkOnEmpty) {
+    // given
+    UA_String src = UA_STRING_NULL;
+    UA_Byte data[] = { 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+                       0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+                       0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 };
+    UA_ByteString dst = { 24, data };
+    UA_Byte *pos = dst.data;
+    const UA_Byte *end = &dst.data[dst.length];
+
+    // when
+    UA_StatusCode retval = UA_String_encodeBinary(&src, &pos, end);
+
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(data[0], 0xFF);
+
+    ///////
+
+    // given
+    src = UA_STRING("");
+    pos = dst.data;
+    end = &dst.data[dst.length];
+
+    // when
+    retval = UA_String_encodeBinary(&src, &pos, end);
+
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(data[0], 0x00);
+
+    ///////
+
+    // given
+    src.data = (UA_Byte*)"";
+    pos = dst.data;
+    end = &dst.data[dst.length];
+
+    // when
+    retval = UA_String_encodeBinary(&src, &pos, end);
+
+    // then
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(data[0], 0x00);
+}
+END_TEST
+
 START_TEST(UA_ExpandedNodeId_encodeShallWorkOnExample) {
     // given
     UA_ExpandedNodeId src = UA_EXPANDEDNODEID_NUMERIC(0, 15);
@@ -1757,6 +1804,7 @@ static Suite *testSuite_builtin(void) {
     tcase_add_test(tc_encode, UA_Float_encodeShallWorkOnExample);
     tcase_add_test(tc_encode, UA_Double_encodeShallWorkOnExample);
     tcase_add_test(tc_encode, UA_String_encodeShallWorkOnExample);
+    tcase_add_test(tc_encode, UA_String_encodeShallWorkOnEmpty);
     tcase_add_test(tc_encode, UA_ExpandedNodeId_encodeShallWorkOnExample);
     tcase_add_test(tc_encode, UA_DataValue_encodeShallWorkOnExampleWithoutVariant);
     tcase_add_test(tc_encode, UA_DataValue_encodeShallWorkOnExampleWithVariant);

From 805c1ab17a1d4b4ecca2f1c9b11b9185cac2346a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 4 Nov 2024 17:11:19 +0100
Subject: [PATCH 1684/1963] fix(plugins): Reenable writing rejected
 certificates to a reject folder

---
 CMakeLists.txt                                |  3 -
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       | 53 ++++++++++++---
 .../openssl/securitypolicy_openssl_common.h   |  2 +
 plugins/crypto/openssl/ua_pki_openssl.c       | 66 +++++++++++++++----
 4 files changed, 102 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c18a457aaaf..212693da5a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,10 +161,8 @@ if(UA_ENABLE_ENCRYPTION STREQUAL "OFF" OR ${_tmp} GREATER -1)
         set(UA_ENABLE_ENCRYPTION_MBEDTLS ON)
     elseif(UA_ENABLE_ENCRYPTION STREQUAL "OPENSSL")
         set(UA_ENABLE_ENCRYPTION_OPENSSL ON)
-        set(UA_ENABLE_CERT_REJECTED_DIR OFF)
     elseif(UA_ENABLE_ENCRYPTION STREQUAL "LIBRESSL")
         set(UA_ENABLE_ENCRYPTION_LIBRESSL ON)
-        set(UA_ENABLE_CERT_REJECTED_DIR OFF)
     endif()
 # Only for backward compatability
 elseif(UA_ENABLE_ENCRYPTION)
@@ -181,7 +179,6 @@ else()
     if(UA_ENABLE_ENCRYPTION_OPENSSL)
         set(UA_ENABLE_ENCRYPTION "OPENSSL")
         set(UA_ENABLE_ENCRYPTION_MBEDTLS OFF)
-        set(UA_ENABLE_CERT_REJECTED_DIR OFF)
     endif()
 endif()
 
diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 0d3c2fa915b..5af9923488d 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -429,8 +429,9 @@ certificateVerification_verify(const UA_CertificateVerification *cv,
     if(!cv || !certificate)
         return UA_STATUSCODE_BADINTERNALERROR;
 
-    UA_StatusCode ret = UA_STATUSCODE_GOOD;
     CertInfo *ci = (CertInfo*)cv->context;
+    UA_StatusCode ret = UA_STATUSCODE_GOOD;
+    mbedtls_x509_crt *old_issuers[UA_MBEDTLS_MAX_CHAIN_LENGTH];
 
 #ifdef __linux__ /* Reload certificates if folder paths are specified */
     ret = reloadCertificates(cv, ci);
@@ -444,16 +445,18 @@ certificateVerification_verify(const UA_CertificateVerification *cv,
     mbedtls_x509_crt_init(&cert);
     int mbedErr = mbedtls_x509_crt_parse(&cert, certificate->data,
                                          certificate->length);
-    if(mbedErr)
-        return UA_STATUSCODE_BADCERTIFICATEINVALID;
+    if(mbedErr) {
+        ret = UA_STATUSCODE_BADCERTIFICATEINVALID;
+        goto errout;
+    }
 
     /* Verification Step: Certificate Usage
      * Check whether the certificate is a User certificate or a CA certificate.
      * Refer the test case CTT/Security/Security Certificate Validation/029.js
      * for more details. */
     if(mbedtlsCheckCA(&cert)) {
-        mbedtls_x509_crt_free(&cert);
-        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
+        ret = UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
+        goto errout;
     }
 
     /* These steps are performed outside of this method.
@@ -464,9 +467,45 @@ certificateVerification_verify(const UA_CertificateVerification *cv,
 
     /* Verification Step: Build Certificate Chain
      * We perform the checks for each certificate inside. */
-    mbedtls_x509_crt *old_issuers[UA_MBEDTLS_MAX_CHAIN_LENGTH];
     ret = mbedtlsVerifyChain(ci, &cert, old_issuers, &cert, 0);
+
+ errout:
     mbedtls_x509_crt_free(&cert);
+
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+    if(ret != UA_STATUSCODE_GOOD &&
+       ci->rejectedListFolder.length > 0) {
+            char rejectedFileName[256] = {0};
+            UA_ByteString thumbprint;
+            UA_ByteString_allocBuffer(&thumbprint, UA_SHA1_LENGTH);
+            if(mbedtls_thumbprint_sha1(certificate, &thumbprint) == UA_STATUSCODE_GOOD) {
+                static const char hex2char[] = "0123456789ABCDEF";
+                for(size_t pos = 0, namePos = 0; pos < thumbprint.length; pos++) {
+                    rejectedFileName[namePos++] = hex2char[(thumbprint.data[pos] & 0xf0) >> 4];
+                    rejectedFileName[namePos++] = hex2char[thumbprint.data[pos] & 0x0f];
+                }
+                strcat(rejectedFileName, ".der");
+            } else {
+                UA_UInt64 dt = (UA_UInt64) UA_DateTime_now();
+                sprintf(rejectedFileName, "cert_%" PRIu64 ".der", dt);
+            }
+            UA_ByteString_clear(&thumbprint);
+            char *rejectedFullFileName = (char *)
+                calloc(ci->rejectedListFolder.length + 1 /* '/' */ + strlen(rejectedFileName) + 1, sizeof(char));
+            if(!rejectedFullFileName)
+                return ret;
+            memcpy(rejectedFullFileName, ci->rejectedListFolder.data, ci->rejectedListFolder.length);
+            rejectedFullFileName[ci->rejectedListFolder.length] = '/';
+            memcpy(&rejectedFullFileName[ci->rejectedListFolder.length + 1], rejectedFileName, strlen(rejectedFileName));
+            FILE * fp_rejectedFile = fopen(rejectedFullFileName, "wb");
+            if(fp_rejectedFile) {
+                fwrite(certificate->data, sizeof(certificate->data[0]), certificate->length, fp_rejectedFile);
+                fclose(fp_rejectedFile);
+            }
+            free(rejectedFullFileName);
+    }
+#endif
+
     return ret;
 }
 
@@ -514,9 +553,7 @@ certificateVerification_clear(UA_CertificateVerification *cv) {
     UA_String_clear(&ci->trustListFolder);
     UA_String_clear(&ci->issuerListFolder);
     UA_String_clear(&ci->revocationListFolder);
-#ifdef UA_ENABLE_CERT_REJECTED_DIR
     UA_String_clear(&ci->rejectedListFolder);
-#endif
     UA_free(ci);
     cv->context = NULL;
 }
diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.h b/plugins/crypto/openssl/securitypolicy_openssl_common.h
index 7bfd01ad6c0..7a8b63b2e98 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.h
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.h
@@ -18,6 +18,8 @@
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 
+#define UA_SHA1_LENGTH 20
+
 _UA_BEGIN_DECLS
 
 void saveDataToFile(const char *fileName, const UA_ByteString *str);
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 7a834f78aff..1ad873604d2 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -617,6 +617,7 @@ UA_CertificateVerification_Verify(const UA_CertificateVerification *cv,
 
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     CertContext *ctx = (CertContext *)cv->context;
+    X509 *old_issuers[UA_OPENSSL_MAX_CHAIN_LENGTH];
 
 #ifdef __linux__ 
     ret = UA_ReloadCertFromFolder(ctx);
@@ -627,9 +628,8 @@ UA_CertificateVerification_Verify(const UA_CertificateVerification *cv,
     /* Verification Step: Certificate Structure */
     STACK_OF(X509) *stack = openSSLLoadCertificateStack(*certificate);
     if(!stack || sk_X509_num(stack) < 1) {
-        if(stack)
-            sk_X509_pop_free(stack, X509_free);
-        return UA_STATUSCODE_BADCERTIFICATEINVALID;
+        ret = UA_STATUSCODE_BADCERTIFICATEINVALID;
+        goto errout;
     }
 
     /* Verification Step: Certificate Usage
@@ -638,8 +638,8 @@ UA_CertificateVerification_Verify(const UA_CertificateVerification *cv,
      * for more details. */
     X509 *leaf = sk_X509_value(stack, 0);
     if(openSSLCheckCA(leaf)) {
-        sk_X509_pop_free(stack, X509_free);
-        return UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
+        ret = UA_STATUSCODE_BADCERTIFICATEUSENOTALLOWED;
+        goto errout;
     }
 
     /* These steps are performed outside of this method.
@@ -650,9 +650,46 @@ UA_CertificateVerification_Verify(const UA_CertificateVerification *cv,
 
     /* Verification Step: Build Certificate Chain
      * We perform the checks for each certificate inside. */
-    X509 *old_issuers[UA_OPENSSL_MAX_CHAIN_LENGTH];
     ret = openSSL_verifyChain(ctx, stack, old_issuers, leaf, 0);
-    sk_X509_pop_free(stack, X509_free);
+
+ errout:
+    if(stack)
+        sk_X509_pop_free(stack, X509_free);
+
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+    if(ret != UA_STATUSCODE_GOOD &&
+       ctx->rejectedListFolder.length > 0) {
+            char rejectedFileName[256] = {0};
+            UA_ByteString thumbprint;
+            UA_ByteString_allocBuffer(&thumbprint, UA_SHA1_LENGTH);
+            if(UA_Openssl_X509_GetCertificateThumbprint(certificate, &thumbprint, true) == UA_STATUSCODE_GOOD) {
+                static const char hex2char[] = "0123456789ABCDEF";
+                for(size_t pos = 0, namePos = 0; pos < thumbprint.length; pos++) {
+                    rejectedFileName[namePos++] = hex2char[(thumbprint.data[pos] & 0xf0) >> 4];
+                    rejectedFileName[namePos++] = hex2char[thumbprint.data[pos] & 0x0f];
+                }
+                strcat(rejectedFileName, ".der");
+            } else {
+                UA_UInt64 dt = (UA_UInt64) UA_DateTime_now();
+                sprintf(rejectedFileName, "cert_%" PRIu64 ".der", dt);
+            }
+            UA_ByteString_clear(&thumbprint);
+            char *rejectedFullFileName = (char *)
+                calloc(ctx->rejectedListFolder.length + 1 /* '/' */ + strlen(rejectedFileName) + 1, sizeof(char));
+            if(!rejectedFullFileName)
+                return ret;
+            memcpy(rejectedFullFileName, ctx->rejectedListFolder.data, ctx->rejectedListFolder.length);
+            rejectedFullFileName[ctx->rejectedListFolder.length] = '/';
+            memcpy(&rejectedFullFileName[ctx->rejectedListFolder.length + 1], rejectedFileName, strlen(rejectedFileName));
+            FILE * fp_rejectedFile = fopen(rejectedFullFileName, "wb");
+            if(fp_rejectedFile) {
+                fwrite(certificate->data, sizeof(certificate->data[0]), certificate->length, fp_rejectedFile);
+                fclose(fp_rejectedFile);
+            }
+            free(rejectedFullFileName);
+    }
+#endif
+
     return ret;
 }
 
@@ -850,10 +887,14 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification * cv,
 
 #ifdef __linux__ /* Linux only so far */
 UA_StatusCode
-UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
-                                       const char *                 trustListFolder,
-                                       const char *                 issuerListFolder,
-                                       const char *                 revocationListFolder) {
+UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
+                                       const char *trustListFolder,
+                                       const char *issuerListFolder,
+                                       const char *revocationListFolder
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+                                       , const char *rejectedListFolder
+#endif
+                                       ) {
     UA_StatusCode ret;
     if (cv == NULL) {
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -886,6 +927,9 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
     context->trustListFolder = UA_STRING_ALLOC(trustListFolder);
     context->issuerListFolder = UA_STRING_ALLOC(issuerListFolder);
     context->revocationListFolder = UA_STRING_ALLOC(revocationListFolder);
+#ifdef UA_ENABLE_CERT_REJECTED_DIR
+    context->rejectedListFolder = UA_STRING_ALLOC(rejectedListFolder);
+#endif
 
     return UA_STATUSCODE_GOOD;
 }

From 5eaaf9c74579903713a13ccfe2170020c36c4657 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Nov 2024 20:53:03 +0100
Subject: [PATCH 1685/1963] refactor(server): Search for the last '#' in
 securityPolicyUriPostfix

There might be strange cases where the URI has several #.
And searching from the back is faster.
---
 src/server/ua_services_discovery.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 3e28e013a0a..d5b8319e0b9 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -302,10 +302,10 @@ const char *securityModeStrs[4] = {"-invalid", "-none", "-sign", "-sign+encrypt"
 
 static UA_String
 securityPolicyUriPostfix(const UA_String uri) {
-    for(size_t i = 0; i < uri.length; i++) {
-        if(uri.data[i] != '#')
+    for(UA_Byte *b = uri.data + uri.length - 1; b >= uri.data; b--) {
+        if(*b != '#')
             continue;
-        UA_String postfix = {uri.length - i, &uri.data[i]};
+        UA_String postfix = {uri.length - (size_t)(b - uri.data), b};
         return postfix;
     }
     return uri;

From c36d3b919b63abf2f348c94c6701dab9c4534d36 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Nov 2024 20:55:26 +0100
Subject: [PATCH 1686/1963] refactor(server): Expose securityPolicyUriPostfix
 in the internal API

---
 src/server/ua_server_internal.h    | 3 +++
 src/server/ua_services_discovery.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index 2fa2758cebd..f0c40e33e46 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -539,6 +539,9 @@ UA_ServerComponent *
 UA_DiscoveryManager_new(UA_Server *server);
 #endif
 
+UA_String
+securityPolicyUriPostfix(const UA_String uri);
+
 UA_ServerComponent *
 UA_BinaryProtocolManager_new(UA_Server *server);
 
diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index d5b8319e0b9..50afaa32dee 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -300,7 +300,7 @@ getDefaultEncryptedSecurityPolicy(UA_Server *server) {
 
 const char *securityModeStrs[4] = {"-invalid", "-none", "-sign", "-sign+encrypt"};
 
-static UA_String
+UA_String
 securityPolicyUriPostfix(const UA_String uri) {
     for(UA_Byte *b = uri.data + uri.length - 1; b >= uri.data; b--) {
         if(*b != '#')

From be89dbdbc169fb4590041bbc6e6f5d7a2201c9e2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 5 Nov 2024 21:15:23 +0100
Subject: [PATCH 1687/1963] refactor(server): Check the postfix of the
 UserTokenPolicy PolicyId also

---
 src/server/ua_services_session.c | 68 +++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 6abb969c449..afb8c9b9a48 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -439,8 +439,9 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
                              const UA_EndpointDescription **ed,
                              const UA_UserTokenPolicy **utp,
                              const UA_SecurityPolicy **tokenSp) {
-    for(size_t i = 0; i < server->config.endpointsSize; ++i) {
-        const UA_EndpointDescription *desc = &server->config.endpoints[i];
+    UA_ServerConfig *sc = &server->config;
+    for(size_t i = 0; i < sc->endpointsSize; ++i) {
+        const UA_EndpointDescription *desc = &sc->endpoints[i];
 
         /* Match the Security Mode */
         if(desc->securityMode != channel->securityMode)
@@ -455,8 +456,8 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
         size_t identPoliciesSize = desc->userIdentityTokensSize;
         const UA_UserTokenPolicy *identPolicies = desc->userIdentityTokens;
         if(identPoliciesSize == 0) {
-            identPoliciesSize = server->config.accessControl.userTokenPoliciesSize;
-            identPolicies = server->config.accessControl.userTokenPolicies;
+            identPoliciesSize = sc->accessControl.userTokenPoliciesSize;
+            identPolicies = sc->accessControl.userTokenPolicies;
         }
 
         /* Match the UserTokenType */
@@ -497,32 +498,53 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
             UA_AnonymousIdentityToken *token = (UA_AnonymousIdentityToken*)
                 identityToken->content.decoded.data;
 
-            /* In setCurrentEndPointsArray we prepend the policyId with the
-             * security mode to make it unique. Remove that here. */
+            /* Select the SecurityPolicy used to encrypt the token.
+             * The default is to use the SecurityPolicy of the SecureChannel. */
+            *tokenSp = channel->securityPolicy;
+#ifdef UA_ENABLE_ENCRYPTION
+            if(identPolicies == sc->accessControl.userTokenPolicies) {
+                /* If the standard UserTokenPolicies from the AccessControl
+                 * plugin are used, use the same logic as in
+                 * updateEndpointUserIdentityToken (ua_services_discovery.c). */
+                if(pol->tokenType != UA_USERTOKENTYPE_ANONYMOUS &&
+                   !(sc->allowNonePolicyPassword && pol->tokenType == UA_USERTOKENTYPE_USERNAME) &&
+                   UA_String_equal(&channel->securityPolicy->policyUri, &UA_SECURITY_POLICY_NONE_URI))
+                    *tokenSp = getDefaultEncryptedSecurityPolicy(server);
+            } else if(pol->securityPolicyUri.length > 0) {
+                /* Manually defined UserTokenPolicy. Lookup by URI */
+                *tokenSp = getSecurityPolicyByUri(server, &pol->securityPolicyUri);
+            }
+            if(!*tokenSp)
+                continue;
+
+            /* Anonymous tokens don't need encryption. All other tokens require
+             * encryption with the exception of Username/Password if also the
+             * allowNonePolicyPassword option has been set. */
+            if(pol->tokenType != UA_USERTOKENTYPE_ANONYMOUS &&
+               !(sc->allowNonePolicyPassword && pol->tokenType == UA_USERTOKENTYPE_USERNAME) &&
+               UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &(*tokenSp)->policyUri))
+                continue;
+#endif
+
+            /* In setCurrentEndPointsArray we prepend the PolicyId with the
+             * SecurityMode of the endpoint and the postfix of the
+             * SecurityPolicyUri to make it unique. Check the SecurityPolicyUri
+             * postfix. */
             if(pol->policyId.length > token->policyId.length)
                 continue;
-            UA_String tmpId = token->policyId;
-            tmpId.length = pol->policyId.length;
-            if(!UA_String_equal(&tmpId, &pol->policyId))
+            UA_String policyPrefix = token->policyId;
+            policyPrefix.length = pol->policyId.length;
+            if(!UA_String_equal(&policyPrefix, &pol->policyId))
+                continue;
+
+            UA_String secPolPostfix = securityPolicyUriPostfix((*tokenSp)->policyUri);
+            UA_String utPolPostfix = securityPolicyUriPostfix(token->policyId);
+            if(!UA_String_equal(&secPolPostfix, &utPolPostfix))
                 continue;
 
             /* Match found */
             *ed = desc;
             *utp = pol;
-
-            /* Set the SecurityPolicy used to encrypt the token. If the
-             * userTokenPolicy doesn't specify a security policy the security
-             * policy of the secure channel is used. */
-            *tokenSp = channel->securityPolicy;
-            if(pol->securityPolicyUri.length > 0)
-                *tokenSp = getSecurityPolicyByUri(server, &pol->securityPolicyUri);
-
-#ifdef UA_ENABLE_ENCRYPTION
-            if(!*tokenSp || (!server->config.allowNonePolicyPassword &&
-               ((*tokenSp)->localCertificate.length == 0 ||
-               UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &(*tokenSp)->policyUri))))
-                *tokenSp = getDefaultEncryptedSecurityPolicy(server);
-#endif
             return;
         }
     }

From 16264590a66395c4c7ca14d452cc5c7533055020 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Nov 2024 08:22:44 +0100
Subject: [PATCH 1688/1963] fix(server): Consider allowNonePolicyPassword in
 GetEndpoints

Remove all UserTokenPolicies that would allow an unencrypted password
transmitted.
---
 src/server/ua_services_discovery.c   | 60 +++++++++++++++++-----------
 tests/client/check_activateSession.c |  3 ++
 tests/client/check_client.c          |  1 +
 tests/server/check_accesscontrol.c   |  3 ++
 tests/server/check_server_password.c |  1 +
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 50afaa32dee..b9fe2ac96fd 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -294,8 +294,7 @@ getDefaultEncryptedSecurityPolicy(UA_Server *server) {
         if(!UA_String_equal(&UA_SECURITY_POLICY_NONE_URI, &sp->policyUri))
             return sp;
     }
-    return server->config.securityPoliciesSize > 0 ?
-        &server->config.securityPolicies[0] : NULL;
+    return NULL; /* No encrypted policy found */
 }
 
 const char *securityModeStrs[4] = {"-invalid", "-none", "-sign", "-sign+encrypt"};
@@ -321,30 +320,45 @@ updateEndpointUserIdentityToken(UA_Server *server, UA_EndpointDescription *ed) {
     /* Copy the UserTokenPolicies from the AccessControl plugin, but only the matching ones to the securityPolicyUri.
      * TODO: Different instances of the AccessControl plugin per Endpoint */
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    for(size_t i = 0; i < server->config.accessControl.userTokenPoliciesSize; i++) {
-        UA_UserTokenPolicy *utp = &server->config.accessControl.userTokenPolicies[i];
-        if(UA_String_equal(&ed->securityPolicyUri, &utp->securityPolicyUri)) {
-             res = UA_Array_appendCopy((void**)&ed->userIdentityTokens,
-                                &ed->userIdentityTokensSize,
-                                utp,
-                                &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
-            if(res != UA_STATUSCODE_GOOD)
-                return res;
-        }
-    }
-
-    for(size_t i = 0; i < ed->userIdentityTokensSize; i++) {
-        /* Use the securityPolicy of the SecureChannel. But not if the
-         * SecureChannel is unencrypted and there is a non-anonymous token. */
-        UA_UserTokenPolicy *utp = &ed->userIdentityTokens[i];
+    UA_ServerConfig *sc = &server->config;
+    for(size_t i = 0; i < sc->accessControl.userTokenPoliciesSize; i++) {
+        UA_UserTokenPolicy *utp = &sc->accessControl.userTokenPolicies[i];
+        res = UA_Array_appendCopy((void**)&ed->userIdentityTokens,
+                                  &ed->userIdentityTokensSize, utp,
+                                  &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+        if(res != UA_STATUSCODE_GOOD)
+            return res;
+
+        /* Select the SecurityPolicy for the UserTokenType.
+         * If not set, the SecurityPolicy of the SecureChannel is used. */
+        utp = &ed->userIdentityTokens[ed->userIdentityTokensSize - 1];
         UA_String_clear(&utp->securityPolicyUri);
-        if((!server->config.allowNonePolicyPassword || ed->userIdentityTokens[i].tokenType != UA_USERTOKENTYPE_USERNAME) &&
-           UA_String_equal(&ed->securityPolicyUri, &UA_SECURITY_POLICY_NONE_URI) &&
-           utp->tokenType != UA_USERTOKENTYPE_ANONYMOUS) {
+#ifdef UA_ENABLE_ENCRYPTION
+        /* Anonymous tokens don't need encryption. All other tokens require
+         * encryption with the exception of Username/Password if also the
+         * allowNonePolicyPassword option has been set. The same logic is used
+         * in selectEndpointAndTokenPolicy (ua_services_session.c). */
+        if(utp->tokenType != UA_USERTOKENTYPE_ANONYMOUS &&
+           !(sc->allowNonePolicyPassword && utp->tokenType == UA_USERTOKENTYPE_USERNAME) &&
+           UA_String_equal(&ed->securityPolicyUri, &UA_SECURITY_POLICY_NONE_URI)) {
             UA_SecurityPolicy *encSP = getDefaultEncryptedSecurityPolicy(server);
-            if(encSP)
-                res |= UA_String_copy(&encSP->policyUri, &utp->securityPolicyUri);
+            if(!encSP) {
+                /* No encrypted SecurityPolicy available */
+                UA_LOG_WARNING(sc->logging, UA_LOGCATEGORY_CLIENT,
+                               "Removing a UserTokenPolicy that would allow the "
+                               "password to be transmitted without encryption "
+                               "(Can be enabled via config->allowNonePolicyPassword)");
+                UA_StatusCode res2 =
+                    UA_Array_resize((void **)&ed->userIdentityTokens,
+                                    &ed->userIdentityTokensSize,
+                                    ed->userIdentityTokensSize - 1,
+                                    &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+                (void)res2;
+                continue;
+            }
+            res |= UA_String_copy(&encSP->policyUri, &utp->securityPolicyUri);
         }
+#endif
 
         /* Append the SecurityMode and SecurityPolicy postfix to the PolicyId to
          * make it unique */
diff --git a/tests/client/check_activateSession.c b/tests/client/check_activateSession.c
index edd23716d6e..348ee9cacf8 100644
--- a/tests/client/check_activateSession.c
+++ b/tests/client/check_activateSession.c
@@ -168,6 +168,9 @@ START_TEST(Client_activateSession) {
 END_TEST
 
 START_TEST(Client_activateSession_username) {
+    UA_ServerConfig *sc = UA_Server_getConfig(server);
+    sc->allowNonePolicyPassword = true;
+
     UA_Client *client = UA_Client_new();
     UA_ClientConfig *config = UA_Client_getConfig(client);
     UA_ClientConfig_setDefault(config);
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 0e95e57e3ac..28f64f513da 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -69,6 +69,7 @@ static void setup(void) {
     UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
     UA_AccessControl_default(config, true, &sp->policyUri,
                              usernamePasswordsSize, usernamePasswords);
+    config->allowNonePolicyPassword = true;
 
     UA_Server_run_startup(server);
     addVariable(VARLENGTH);
diff --git a/tests/server/check_accesscontrol.c b/tests/server/check_accesscontrol.c
index a0a66db566f..9ecd23ded98 100644
--- a/tests/server/check_accesscontrol.c
+++ b/tests/server/check_accesscontrol.c
@@ -34,6 +34,9 @@ static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
 
+    UA_ServerConfig *sc = UA_Server_getConfig(server);
+    sc->allowNonePolicyPassword = true;
+
     /* Instatiate a new AccessControl plugin that knows username/pw */
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_SecurityPolicy *sp = &config->securityPolicies[config->securityPoliciesSize-1];
diff --git a/tests/server/check_server_password.c b/tests/server/check_server_password.c
index a282190077d..614682b0c9c 100644
--- a/tests/server/check_server_password.c
+++ b/tests/server/check_server_password.c
@@ -144,6 +144,7 @@ static void setup(void) {
     ck_assert_msg(server, "UA_Server_new");
     UA_ServerConfig *config = UA_Server_getConfig(server);
     UA_ServerConfig_setDefault(config);
+    config->allowNonePolicyPassword = true;
     UA_String policy = UA_STRING_STATIC("http://opcfoundation.org/UA/SecurityPolicy#None");
     UA_UsernamePasswordLogin login[] = {
         { UA_STRING_STATIC("user"),

From f1bffdb0f011a1e8dce0d7d2e50618be1386efb2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 6 Nov 2024 20:27:13 +0100
Subject: [PATCH 1689/1963] fix(build): Enable building static library on Win32

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 212693da5a5..ff22f36a7cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1318,7 +1318,7 @@ if(UA_ENABLE_AMALGAMATION)
                       open62541-generator-statuscode
                       open62541-amalgamation-source)
 
-    add_library(open62541 SHARED $<TARGET_OBJECTS:open62541-object>)
+    add_library(open62541 $<TARGET_OBJECTS:open62541-object>)
     # the only directory that needs to be included if open62541 (amalgameted) target from
     # the build directory is ${PROJECT_BINARY_DIR}, that contains the generated open62541.h
     target_include_directories(open62541 PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)

From 8ab3b49f3f01a8d3345e4a39b4ff4546b73a2928 Mon Sep 17 00:00:00 2001
From: Eugene Melekhov <melekhove@gmail.com>
Date: Fri, 8 Nov 2024 10:07:14 +0300
Subject: [PATCH 1690/1963] fix(pubsub): fix setting writer group messsage &
 transport settings (#6814)

---
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |  9 +++-
 src/pubsub/ua_pubsub_config.c                 |  6 ++-
 src/pubsub/ua_pubsub_ns0.c                    | 54 ++++++++++++++++---
 tests/pubsub/check_pubsub_publisherid.c       |  8 ++-
 4 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 22619715d79..65ee93f58ef 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -47,7 +47,8 @@
 #include <stdio.h>
 
 #define CONNECTION_NAME              "MQTT Publisher Connection"
-#define TRANSPORT_PROFILE_URI        "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
+#define TRANSPORT_PROFILE_URI_UADP   "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp"
+#define TRANSPORT_PROFILE_URI_JSON   "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json"
 #define MQTT_CLIENT_ID               "TESTCLIENTPUBSUBMQTT"
 #define CONNECTIONOPTION_NAME        "mqttClientId"
 #define PUBLISHER_TOPIC              "customTopic"
@@ -104,7 +105,11 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(connectionConfig));
     connectionConfig.name = UA_STRING(CONNECTION_NAME);
-    connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
+    if(useJson) {
+        connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI_JSON);
+    } else {
+        connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI_UADP);
+    }
     connectionConfig.enabled = UA_TRUE;
 
     /* configure address of the mqtt broker (local on default port) */
diff --git a/src/pubsub/ua_pubsub_config.c b/src/pubsub/ua_pubsub_config.c
index 327895eff49..d13fd1d2514 100644
--- a/src/pubsub/ua_pubsub_config.c
+++ b/src/pubsub/ua_pubsub_config.c
@@ -290,10 +290,14 @@ setWriterGroupEncodingType(UA_Server *server,
         config->encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     } else if(writerGroupParameters->messageSettings.content.decoded.type ==
               &UA_TYPES[UA_TYPES_JSONWRITERGROUPMESSAGEDATATYPE]) {
-        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
+#ifdef UA_ENABLE_JSON_ENCODING
+        config->encodingMimeType = UA_PUBSUB_ENCODING_JSON;
+#else
+        UA_LOG_ERROR(psm->logging, UA_LOGCATEGORY_PUBSUB,
                      "[UA_PubSubManager_setWriterGroupEncodingType] "
                      "encoding type: JSON (not implemented!)");
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
+#endif
     } else {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "[UA_PubSubManager_setWriterGroupEncodingType] "
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 4db6844fa3f..329fe70317e 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -380,23 +380,65 @@ addWriterGroupConfig(UA_Server *server, UA_NodeId connectionId,
     writerGroupConfig.publishingInterval = writerGroup->publishingInterval;
     writerGroupConfig.enabled = writerGroup->enabled;
     writerGroupConfig.writerGroupId = writerGroup->writerGroupId;
-    //TODO remove hard coded UADP
-    writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
     writerGroupConfig.priority = writerGroup->priority;
 
-    UA_UadpWriterGroupMessageDataType writerGroupMessage;
     UA_ExtensionObject *eoWG = &writerGroup->messageSettings;
+    UA_UadpWriterGroupMessageDataType uadpWriterGroupMessage;
+    UA_JsonWriterGroupMessageDataType jsonWriterGroupMessage;
     if(eoWG->encoding == UA_EXTENSIONOBJECT_DECODED){
         writerGroupConfig.messageSettings.encoding  = UA_EXTENSIONOBJECT_DECODED;
         if(eoWG->content.decoded.type == &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE]){
-            if(UA_UadpWriterGroupMessageDataType_copy((UA_UadpWriterGroupMessageDataType *) eoWG->content.decoded.data,
-                                                        &writerGroupMessage) != UA_STATUSCODE_GOOD){
+            writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_UADP;
+            if(UA_UadpWriterGroupMessageDataType_copy(
+                    (UA_UadpWriterGroupMessageDataType *)eoWG->content.decoded.data,
+                    &uadpWriterGroupMessage) != UA_STATUSCODE_GOOD) {
                 return UA_STATUSCODE_BADOUTOFMEMORY;
             }
             writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_UADPWRITERGROUPMESSAGEDATATYPE];
-            writerGroupConfig.messageSettings.content.decoded.data = &writerGroupMessage;
+            writerGroupConfig.messageSettings.content.decoded.data = &uadpWriterGroupMessage;
+        } else if(eoWG->content.decoded.type == &UA_TYPES[UA_TYPES_JSONWRITERGROUPMESSAGEDATATYPE]) {
+            writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_JSON;
+            if(UA_JsonWriterGroupMessageDataType_copy(
+                   (UA_JsonWriterGroupMessageDataType *)eoWG->content.decoded.data,
+                   &jsonWriterGroupMessage) != UA_STATUSCODE_GOOD) {
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+            writerGroupConfig.messageSettings.content.decoded.type = &UA_TYPES[UA_TYPES_JSONWRITERGROUPMESSAGEDATATYPE];
+            writerGroupConfig.messageSettings.content.decoded.data = &jsonWriterGroupMessage;
+        }
+    }
+
+    eoWG = &writerGroup->transportSettings;
+    UA_BrokerWriterGroupTransportDataType brokerWriterGroupTransport;
+    UA_DatagramWriterGroupTransportDataType datagramWriterGroupTransport;
+    if(eoWG->encoding == UA_EXTENSIONOBJECT_DECODED) {
+        writerGroupConfig.transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+        if(eoWG->content.decoded.type == &UA_TYPES[UA_TYPES_BROKERWRITERGROUPTRANSPORTDATATYPE]) {
+            if(UA_BrokerWriterGroupTransportDataType_copy(
+                    (UA_BrokerWriterGroupTransportDataType*)eoWG->content.decoded.data,
+                    &brokerWriterGroupTransport) != UA_STATUSCODE_GOOD) {
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+            writerGroupConfig.transportSettings.content.decoded.type = &UA_TYPES[UA_TYPES_BROKERWRITERGROUPTRANSPORTDATATYPE];
+            writerGroupConfig.transportSettings.content.decoded.data = &brokerWriterGroupTransport;
+        } else if(eoWG->content.decoded.type == &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORTDATATYPE]) {
+            if(UA_DatagramWriterGroupTransportDataType_copy(
+                   (UA_DatagramWriterGroupTransportDataType *)eoWG->content.decoded.data,
+                   &datagramWriterGroupTransport) != UA_STATUSCODE_GOOD) {
+                return UA_STATUSCODE_BADOUTOFMEMORY;
+            }
+            writerGroupConfig.transportSettings.content.decoded.type = &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORTDATATYPE];
+            writerGroupConfig.transportSettings.content.decoded.data = &datagramWriterGroupTransport;
         }
     }
+    if (writerGroupConfig.encodingMimeType == UA_PUBSUB_ENCODING_JSON
+        && (writerGroupConfig.transportSettings.encoding != UA_EXTENSIONOBJECT_DECODED ||
+        writerGroupConfig.transportSettings.content.decoded.type !=
+            &UA_TYPES[UA_TYPES_BROKERWRITERGROUPTRANSPORTDATATYPE])) {
+        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
+                     "JSON encoding is supported only for MQTT transport");
+        return UA_STATUSCODE_BADCONFIGURATIONERROR;
+    }
 
     return UA_WriterGroup_create(server, connectionId, &writerGroupConfig, writerGroupId);
 }
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index c779bca20ad..4e7c8fdb511 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -28,6 +28,12 @@ static void setup(void) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
     ck_assert(config != 0);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_ServerConfig_setDefault(config));
+
+    /* Silence the log, because this test might produce an enormous amount of noise */
+    UA_Logger logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_ERROR);
+    logger.clear = config->logging->clear;
+    *config->logging = logger;
+
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_Server_run_startup(server));
 }
 
@@ -371,7 +377,7 @@ static void ValidatePublishSubscribe(
             tmpValue = TestValue + (UA_Int32)i;
             if(UseFastPath) {
                 ck_assert(fastPathSubscriberValues[i] != 0);
-                if(tmpValue != *(UA_Int32 *)fastPathSubscriberValues[i]->value.data) {
+                if(tmpValue != *((UA_Int32 *)fastPathSubscriberValues[i]->value.data)) {
                     done = false;
                     break;
                 }

From 772932dc548d575ea98af79067ed76e4eb42efde Mon Sep 17 00:00:00 2001
From: Leonardo <leonardotazzini@hotmail.com>
Date: Mon, 11 Nov 2024 14:25:44 +0100
Subject: [PATCH 1691/1963] fix(build): unit test compilation under MSVC

---
 tests/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ad0b7d7fde0..35e13defa67 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,10 @@
 if(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W1") # Reduce warnings level
+    add_compile_options(
+        $<$<CONFIG:>:/MD>
+        $<$<CONFIG:Debug>:/MDd>
+        $<$<CONFIG:Release>:/MD>
+    )    
 else()
     add_compile_options(-Wno-unused-variable -Wno-unused-function)
 endif()

From 405d90e1b63c9a7c58def42f95e0756cb2b968d1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 13 Nov 2024 14:30:18 +0100
Subject: [PATCH 1692/1963] refactor(server): Don't extend the DiscoveryUrls in
 the configuration with EndpointUrls from requests

---
 src/server/ua_services_discovery.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index b9fe2ac96fd..1e4c1b91505 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -491,27 +491,6 @@ Service_GetEndpoints(UA_Server *server, UA_Session *session,
         setCurrentEndPointsArray(server, request->endpointUrl,
                                  request->profileUris, request->profileUrisSize,
                                  &response->endpoints, &response->endpointsSize);
-
-    /* Check if the ServerUrl is already present in the DiscoveryUrl array.
-     * Add if not already there. */
-    UA_SecureChannel *channel = session->header.channel;
-    for(size_t i = 0; i < server->config.applicationDescription.discoveryUrlsSize; i++) {
-        if(UA_String_equal(&channel->endpointUrl,
-                           &server->config.applicationDescription.discoveryUrls[i])) {
-            return;
-        }
-    }
-    if(server->config.applicationDescription.discoveryUrls == NULL){
-        server->config.applicationDescription.discoveryUrls = (UA_String*)UA_Array_new(1, &UA_TYPES[UA_TYPES_STRING]);
-        server->config.applicationDescription.discoveryUrlsSize = 0;
-    }
-    UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    retval = UA_Array_appendCopy((void**)&server->config.applicationDescription.discoveryUrls,
-                        &server->config.applicationDescription.discoveryUrlsSize,
-                        &request->endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
-    if(retval != UA_STATUSCODE_GOOD)
-        UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
-                     "Error adding the ServerUrl to theDiscoverUrl list.");
 }
 
 #ifdef UA_ENABLE_DISCOVERY

From a450dcf781c7fa1337c83ba8d084a168143e5be0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Wed, 13 Nov 2024 15:54:17 +0100
Subject: [PATCH 1693/1963] refactor(build): Bump version to v1.4.7

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff22f36a7cc..6746979af00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 6)
+set(OPEN62541_VER_PATCH 7)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From d4c5aaa2a755d846d8517f96995d318a66742d42 Mon Sep 17 00:00:00 2001
From: Eugene Melekhov <melekhove@gmail.com>
Date: Wed, 13 Nov 2024 20:34:36 +0300
Subject: [PATCH 1694/1963] fix(pubsub): Fix MQTT subscribe ReaderGroup config
 copying (#6808) (#6850)

---
 .../pubsub/tutorial_pubsub_mqtt_publish.c     |  2 +-
 .../pubsub/tutorial_pubsub_mqtt_subscribe.c   | 57 +++++++++++++++---
 src/pubsub/ua_pubsub_readergroup.c            |  2 +
 tests/pubsub/check_pubsub_mqtt.c              | 60 +++++++++++++++++--
 4 files changed, 107 insertions(+), 14 deletions(-)

diff --git a/examples/pubsub/tutorial_pubsub_mqtt_publish.c b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
index 65ee93f58ef..b051c7a112e 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_publish.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_publish.c
@@ -110,7 +110,7 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
     } else {
         connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI_UADP);
     }
-    connectionConfig.enabled = UA_TRUE;
+    connectionConfig.enabled = true;
 
     /* configure address of the mqtt broker (local on default port) */
     UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING(addressUrl)};
diff --git a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
index ec199a88d8f..b5cc100e530 100644
--- a/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
+++ b/examples/pubsub/tutorial_pubsub_mqtt_subscribe.c
@@ -7,10 +7,15 @@
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server.h>
 #include <open62541/server_pubsub.h>
+#if defined(UA_ENABLE_PUBSUB_ENCRYPTION)
 #include <open62541/plugin/securitypolicy_default.h>
+#endif
+
+#include <stdio.h>
 
 #define CONNECTION_NAME               "MQTT Subscriber Connection"
-#define TRANSPORT_PROFILE_URI         "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt"
+#define TRANSPORT_PROFILE_URI_UADP    "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-uadp"
+#define TRANSPORT_PROFILE_URI_JSON    "http://opcfoundation.org/UA-Profile/Transport/pubsub-mqtt-json"
 #define MQTT_CLIENT_ID                "TESTCLIENTPUBSUBMQTTSUBSCRIBE"
 #define CONNECTIONOPTION_NAME         "mqttClientId"
 #define SUBSCRIBER_TOPIC              "customTopic"
@@ -49,11 +54,7 @@ UA_Byte encryptingKey[UA_AES128CTR_KEY_LENGTH] = {0};
 UA_Byte keyNonce[UA_AES128CTR_KEYNONCE_LENGTH] = {0};
 #endif
 
-#ifdef UA_ENABLE_JSON_ENCODING
-static UA_Boolean useJson = true;
-#else
 static UA_Boolean useJson = false;
-#endif
 
 UA_NodeId connectionIdent;
 UA_NodeId subscribedDataSetIdent;
@@ -71,7 +72,11 @@ addPubSubConnection(UA_Server *server, char *addressUrl) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(connectionConfig));
     connectionConfig.name = UA_STRING(CONNECTION_NAME);
-    connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI);
+    if(useJson) {
+        connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI_JSON);
+    } else {
+        connectionConfig.transportProfileUri = UA_STRING(TRANSPORT_PROFILE_URI_UADP);
+    }
     connectionConfig.enabled = UA_TRUE;
 
     /* configure address of the mqtt broker (local on default port) */
@@ -146,8 +151,8 @@ addReaderGroup(UA_Server *server) {
         readerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_JSON;
 
     /* configure the mqtt publish topic */
-    UA_BrokerWriterGroupTransportDataType brokerTransportSettings;
-    memset(&brokerTransportSettings, 0, sizeof(UA_BrokerWriterGroupTransportDataType));
+    UA_BrokerDataSetReaderTransportDataType brokerTransportSettings;
+    memset(&brokerTransportSettings, 0, sizeof(UA_BrokerDataSetReaderTransportDataType));
     /* Assign the Topic at which MQTT publish should happen */
     /*ToDo: Pass the topic as argument from the reader group */
     brokerTransportSettings.queueName = UA_STRING(SUBSCRIBER_TOPIC);
@@ -359,12 +364,48 @@ static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
     pMetaData->fields[3].valueRank = -1; /* scalar */
 }
 
+static void usage(void) {
+    printf("Usage: tutorial_pubsub_mqtt_subscribe [--url <opc.mqtt://hostname:port>] "
+           "[--json]\n"
+           "  Defaults are:\n"
+           "  - Url: opc.mqtt://127.0.0.1:1883\n"
+           "  - JSON: Off\n");
+}
+
 /**
  * Followed by the main server code, making use of the above definitions */
 
 int main(int argc, char **argv) {
     char *addressUrl = BROKER_ADDRESS_URL;
 
+    /* Parse arguments */
+    for(int argpos = 1; argpos < argc; argpos++) {
+        if(strcmp(argv[argpos], "--help") == 0) {
+            usage();
+            return 0;
+        }
+
+        if(strcmp(argv[argpos], "--json") == 0) {
+#ifdef UA_ENABLE_JSON_ENCODING
+            useJson = true;
+#else 
+            printf("Json encoding not enabled (UA_ENABLE_JSON_ENCODING)\n");
+            useJson = false;
+#endif
+            continue;
+        }
+
+        if(strcmp(argv[argpos], "--url") == 0) {
+            if(argpos + 1 == argc) {
+                usage();
+                return -1;
+            }
+            argpos++;
+            addressUrl = argv[argpos];
+            continue;
+        }
+    }
+
     /* Return value initialized to Status Good */
     UA_Server *server = UA_Server_new();
 
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 23513329eac..444ba98112f 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -58,6 +58,7 @@ UA_ReaderGroupConfig_copy(const UA_ReaderGroupConfig *src,
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     res |= UA_String_copy(&src->name, &dst->name);
     res |= UA_KeyValueMap_copy(&src->groupProperties, &dst->groupProperties);
+    res |= UA_ExtensionObject_copy(&src->transportSettings, &dst->transportSettings);
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     res = UA_String_copy(&src->securityGroupId, &dst->securityGroupId);
 #endif
@@ -70,6 +71,7 @@ void
 UA_ReaderGroupConfig_clear(UA_ReaderGroupConfig *readerGroupConfig) {
     UA_String_clear(&readerGroupConfig->name);
     UA_KeyValueMap_clear(&readerGroupConfig->groupProperties);
+    UA_ExtensionObject_clear(&readerGroupConfig->transportSettings);
 #ifdef UA_ENABLE_PUBSUB_ENCRYPTION
     UA_String_clear(&readerGroupConfig->securityGroupId);
 #endif
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index 26b03fab5f2..d3f96822561 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -56,9 +56,7 @@ static void setup(void) {
     connectionConfig.publisherId.uint16 = 2234;
 
     /* configure options, set mqtt client id */
-    const int connectionOptionsCount = 1;
-
-    UA_KeyValuePair connectionOptions[connectionOptionsCount];
+    UA_KeyValuePair connectionOptions[1];
 
     size_t connectionOptionIndex = 0;
     connectionOptions[connectionOptionIndex].key = UA_QUALIFIEDNAME(0, CONNECTIONOPTION_NAME);
@@ -224,8 +222,8 @@ START_TEST(SinglePublishSubscribeDateTime){
         readerGroupConfig.name = UA_STRING("ReaderGroup1");
 
         /* configure the mqtt publish topic */
-        UA_BrokerWriterGroupTransportDataType brokerTransportSettingsSubscriber;
-        memset(&brokerTransportSettingsSubscriber, 0, sizeof(UA_BrokerWriterGroupTransportDataType));
+        UA_BrokerDataSetReaderTransportDataType brokerTransportSettingsSubscriber;
+        memset(&brokerTransportSettingsSubscriber, 0, sizeof(UA_BrokerDataSetReaderTransportDataType));
 
         brokerTransportSettingsSubscriber.queueName = UA_STRING(SUBSCRIBE_TOPIC);
         brokerTransportSettingsSubscriber.resourceUri = UA_STRING_NULL;
@@ -325,10 +323,62 @@ START_TEST(SinglePublishSubscribeDateTime){
 
     } END_TEST
 
+START_TEST(CreateReaderGroup) {
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+
+    // add reader group
+    UA_ReaderGroupConfig readerGroupConfig;
+    memset(&readerGroupConfig, 0, sizeof(UA_ReaderGroupConfig));
+    readerGroupConfig.name = UA_STRING("ReaderGroup1");
+
+    /* configure the mqtt publish topic */
+    UA_BrokerDataSetReaderTransportDataType transportSettingsData;
+    memset(&transportSettingsData, 0, sizeof(UA_BrokerDataSetReaderTransportDataType));
+
+    transportSettingsData.queueName = UA_STRING(SUBSCRIBE_TOPIC);
+    transportSettingsData.resourceUri = UA_STRING_NULL;
+    transportSettingsData.authenticationProfileUri = UA_STRING_NULL;
+
+    transportSettingsData.requestedDeliveryGuarantee =
+        UA_BROKERTRANSPORTQUALITYOFSERVICE_BESTEFFORT;
+
+    UA_ExtensionObject transportSettings;
+    memset(&transportSettings, 0, sizeof(UA_ExtensionObject));
+    transportSettings.encoding = UA_EXTENSIONOBJECT_DECODED;
+    transportSettings.content.decoded.type =
+        &UA_TYPES[UA_TYPES_BROKERDATASETREADERTRANSPORTDATATYPE];
+    transportSettings.content.decoded.data = &transportSettingsData;
+
+    readerGroupConfig.transportSettings = transportSettings;
+
+    retval = UA_Server_addReaderGroup(server, connectionIdent, &readerGroupConfig,
+                                      &readerGroupIdent);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    // Check if reader group was created correctly (Issue #6808)
+    memset(&transportSettingsData, 0,
+           sizeof(UA_BrokerDataSetReaderTransportDataType));
+
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupIdent);
+    ck_assert(rg != 0);
+    UA_ExtensionObject *ts = &rg->config.transportSettings;
+
+    ck_assert((ts->encoding == UA_EXTENSIONOBJECT_DECODED ||
+               ts->encoding == UA_EXTENSIONOBJECT_DECODED_NODELETE) &&
+                  ts->content.decoded.type ==
+                      &UA_TYPES[UA_TYPES_BROKERDATASETREADERTRANSPORTDATATYPE]);
+    UA_String *topic =
+        &((UA_BrokerDataSetReaderTransportDataType *)ts->content.decoded.data)->queueName;
+    ck_assert(topic->data != 0 && topic->length != 0 &&
+              strncmp(SUBSCRIBE_TOPIC, (const char *)topic->data,
+                      strlen(SUBSCRIBE_TOPIC)) == 0);
+} END_TEST
+
 int main(void) {
     TCase *tc_pubsub_subscribe_mqtt = tcase_create("PubSub subscribe mqtt");
     tcase_add_checked_fixture(tc_pubsub_subscribe_mqtt, setup, teardown);
     tcase_add_test(tc_pubsub_subscribe_mqtt, SinglePublishSubscribeDateTime);
+    tcase_add_test(tc_pubsub_subscribe_mqtt, CreateReaderGroup);
 
     Suite *s = suite_create("PubSub subscribe via mqtt");
     suite_add_tcase(s, tc_pubsub_subscribe_mqtt);

From 3f641e5a2d2738eb429c3cd80d0f0f61e982b7c4 Mon Sep 17 00:00:00 2001
From: Leonardo <electro-logic@users.noreply.github.com>
Date: Fri, 15 Nov 2024 14:19:49 +0100
Subject: [PATCH 1695/1963] refactor(tools): Add visual studio temp files to
 .gitignore (#6872)

also added Visual Studio CMakeSettings.json
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 2a71f818fb0..2383ba58d20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,8 +83,10 @@ Makefile
 Pipfile
 Pipfile.lock
 .vscode
+/.vs
 **/libxml2
 debian/*
+/CMakeSettings.json
 
 # clangd cache
 .cache/

From 633e2108127edac476448fa47dc7ecea7db7d7b4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Nov 2024 22:58:02 +0100
Subject: [PATCH 1696/1963] refactor(core): Make SecureChannel message
 processing less indirect

---
 src/client/ua_client.c          |   4 +-
 src/client/ua_client_connect.c  |  22 +-
 src/client/ua_client_internal.h |   2 +-
 src/server/ua_server_binary.c   |  50 +++-
 src/ua_securechannel.c          | 510 ++++++++++++++++----------------
 src/ua_securechannel.h          |  54 ++--
 tests/check_securechannel.c     |  45 +--
 7 files changed, 373 insertions(+), 314 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 388c94949c5..167f77eef2f 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -506,11 +506,9 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
 }
 
 UA_StatusCode
-processServiceResponse(void *application, UA_SecureChannel *channel,
+processServiceResponse(UA_Client *client, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message) {
-    UA_Client *client = (UA_Client*)application;
-
     if(!UA_SecureChannel_isConnected(channel)) {
         if(messageType == UA_MESSAGETYPE_MSG) {
             UA_LOG_DEBUG_CHANNEL(client->config.logging, channel, "Discard MSG message "
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index fbaaf6de6c1..c4094c60cb3 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1591,9 +1591,23 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 
     /* Received a message. Process the message with the SecureChannel. */
-    UA_StatusCode res =
-        UA_SecureChannel_processBuffer(&client->channel, client,
-                                       processServiceResponse, &msg);
+    UA_StatusCode res = UA_SecureChannel_loadBuffer(&client->channel, msg);
+    while(UA_LIKELY(res == UA_STATUSCODE_GOOD)) {
+        UA_MessageType messageType;
+        UA_UInt32 requestId = 0;
+        UA_ByteString payload = UA_BYTESTRING_NULL;
+        UA_Boolean copied = false;
+        res = UA_SecureChannel_getCompleteMessage(&client->channel, &messageType, &requestId,
+                                                  &payload, &copied);
+        if(res != UA_STATUSCODE_GOOD || payload.length == 0)
+            break;
+        res = processServiceResponse(client, &client->channel,
+                                     messageType, requestId, &payload);
+        if(copied)
+            UA_ByteString_clear(&payload);
+    }
+    res |= UA_SecureChannel_persistBuffer(&client->channel);
+
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "Processing the message returned the error code %s",
@@ -1656,6 +1670,7 @@ initConnect(UA_Client *client) {
     client->channel.config = client->config.localConnectionConfig;
     client->channel.certificateVerification = &client->config.certificateVerification;
     client->channel.processOPNHeader = verifyClientSecureChannelHeader;
+    client->channel.processOPNHeaderApplication = client;
 
     /* Initialize the SecurityPolicy */
     client->connectStatus = initSecurityPolicy(client);
@@ -2062,6 +2077,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     client->channel.config = client->config.localConnectionConfig;
     client->channel.certificateVerification = &client->config.certificateVerification;
     client->channel.processOPNHeader = verifyClientSecureChannelHeader;
+    client->channel.processOPNHeaderApplication = client;
     client->channel.connectionId = 0;
 
     client->connectStatus = initSecurityPolicy(client);
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 53a05f3c6dc..ae138f52ba1 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -194,7 +194,7 @@ UA_StatusCode
 __Client_renewSecureChannel(UA_Client *client);
 
 UA_StatusCode
-processServiceResponse(void *application, UA_SecureChannel *channel,
+processServiceResponse(UA_Client *client, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message);
 
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 889e52847cd..e6483d8c441 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -952,11 +952,9 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
 
 /* Takes decoded messages starting at the nodeid of the content type. */
 static UA_StatusCode
-processSecureChannelMessage(void *application, UA_SecureChannel *channel,
+processSecureChannelMessage(UA_Server *server, UA_SecureChannel *channel,
                             UA_MessageType messagetype, UA_UInt32 requestId,
                             UA_ByteString *message) {
-    UA_Server *server = (UA_Server*)application;
-
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     switch(messagetype) {
     case UA_MESSAGETYPE_HEL:
@@ -1034,9 +1032,12 @@ purgeFirstChannelWithoutSession(UA_BinaryProtocolManager *bpm) {
 static UA_StatusCode
 configServerSecureChannel(void *application, UA_SecureChannel *channel,
                           const UA_AsymmetricAlgorithmSecurityHeader *asymHeader) {
+    if(channel->securityPolicy)
+        return UA_STATUSCODE_GOOD;
+
     /* Iterate over available endpoints and choose the correct one */
+    UA_Server *server = (UA_Server *)application;
     UA_SecurityPolicy *securityPolicy = NULL;
-    UA_Server *const server = (UA_Server *const) application;
     for(size_t i = 0; i < server->config.securityPoliciesSize; ++i) {
         UA_SecurityPolicy *policy = &server->config.securityPolicies[i];
         if(!UA_ByteString_equal(&asymHeader->securityPolicyUri, &policy->policyUri))
@@ -1106,6 +1107,7 @@ createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *c
     entry->channel.config = connConfig;
     entry->channel.certificateVerification = &config->secureChannelPKI;
     entry->channel.processOPNHeader = configServerSecureChannel;
+    entry->channel.processOPNHeaderApplication = server;
     entry->channel.connectionManager = cm;
     entry->channel.connectionId = connectionId;
 
@@ -1277,8 +1279,24 @@ serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_debug_dumpCompleteChunk(server, channel->connection, message);
 #endif
 
-    retval = UA_SecureChannel_processBuffer(channel, bpm->server,
-                                            processSecureChannelMessage, &msg);
+    /* Process all complete messages */
+    retval = UA_SecureChannel_loadBuffer(channel, msg);
+    while(UA_LIKELY(retval == UA_STATUSCODE_GOOD)) {
+        UA_MessageType messageType;
+        UA_UInt32 requestId = 0;
+        UA_ByteString payload = UA_BYTESTRING_NULL;
+        UA_Boolean copied = false;
+        retval = UA_SecureChannel_getCompleteMessage(channel, &messageType, &requestId,
+                                                     &payload, &copied);
+        if(retval != UA_STATUSCODE_GOOD || payload.length == 0)
+            break;
+        retval = processSecureChannelMessage(bpm->server, channel,
+                                             messageType, requestId, &payload);
+        if(copied)
+            UA_ByteString_clear(&payload);
+    }
+    retval |= UA_SecureChannel_persistBuffer(channel);
+
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_CHANNEL(bpm->logging, channel,
                                "Processing the message failed with error %s",
@@ -1744,8 +1762,23 @@ serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
 
     /* The connection is fully opened and we have a SecureChannel.
      * Process the received buffer */
-    retval = UA_SecureChannel_processBuffer(context->channel, bpm->server,
-                                            processSecureChannelMessage, &msg);
+    retval = UA_SecureChannel_loadBuffer(context->channel, msg);
+    while(UA_LIKELY(retval == UA_STATUSCODE_GOOD)) {
+        UA_MessageType messageType;
+        UA_UInt32 requestId = 0;
+        UA_ByteString payload = UA_BYTESTRING_NULL;
+        UA_Boolean copied = false;
+        retval = UA_SecureChannel_getCompleteMessage(context->channel, &messageType,
+                                                     &requestId, &payload, &copied);
+        if(retval != UA_STATUSCODE_GOOD || payload.length == 0)
+            break;
+        retval = processSecureChannelMessage(bpm->server, context->channel,
+                                             messageType, requestId, &payload);
+        if(copied)
+            UA_ByteString_clear(&payload);
+    }
+    retval |= UA_SecureChannel_persistBuffer(context->channel);
+
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_CHANNEL(bpm->logging, context->channel,
                                "Processing the message failed with error %s",
@@ -1758,7 +1791,6 @@ serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         error.reason = UA_STRING_NULL;
         UA_SecureChannel_sendError(context->channel, &error);
         UA_SecureChannel_shutdown(context->channel, UA_SHUTDOWNREASON_ABORT);
-
         setReverseConnectState(bpm->server, context, UA_SECURECHANNELSTATE_CLOSING);
         return;
     }
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index d8beed471af..431e56dec39 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -30,8 +30,7 @@ void
 UA_SecureChannel_init(UA_SecureChannel *channel) {
     /* Normal linked lists are initialized by zeroing out */
     memset(channel, 0, sizeof(UA_SecureChannel));
-    SIMPLEQ_INIT(&channel->completeChunks);
-    SIMPLEQ_INIT(&channel->decryptedChunks);
+    TAILQ_INIT(&channel->chunks);
 }
 
 UA_StatusCode
@@ -131,19 +130,21 @@ UA_Chunk_delete(UA_Chunk *chunk) {
 }
 
 static void
-deleteChunks(UA_ChunkQueue *queue) {
-    UA_Chunk *chunk;
-    while((chunk = SIMPLEQ_FIRST(queue))) {
-        SIMPLEQ_REMOVE_HEAD(queue, pointers);
+deleteChunks(UA_SecureChannel *channel) {
+    UA_Chunk *chunk, *chunk_tmp;
+    TAILQ_FOREACH_SAFE(chunk, &channel->chunks, pointers, chunk_tmp) {
+        TAILQ_REMOVE(&channel->chunks, chunk, pointers);
         UA_Chunk_delete(chunk);
     }
+    channel->chunksCount = 0;
+    channel->chunksLength = 0;
 }
 
 void
 UA_SecureChannel_deleteBuffered(UA_SecureChannel *channel) {
-    deleteChunks(&channel->completeChunks);
-    deleteChunks(&channel->decryptedChunks);
-    UA_ByteString_clear(&channel->incompleteChunk);
+    deleteChunks(channel);
+    if(channel->unprocessedCopied)
+        UA_ByteString_clear(&channel->unprocessed);
 }
 
 void
@@ -587,7 +588,7 @@ processSequenceNumberSym(UA_SecureChannel *channel, UA_UInt32 sequenceNumber) {
 #endif
 
 static UA_StatusCode
-unpackPayloadOPN(UA_SecureChannel *channel, UA_Chunk *chunk, void *application) {
+unpackPayloadOPN(UA_SecureChannel *channel, UA_Chunk *chunk) {
     UA_assert(chunk->bytes.length >= UA_SECURECHANNEL_MESSAGE_MIN_LENGTH);
     size_t offset = UA_SECURECHANNEL_MESSAGEHEADER_LENGTH; /* Skip the message header */
     UA_UInt32 secureChannelId;
@@ -610,13 +611,10 @@ unpackPayloadOPN(UA_SecureChannel *channel, UA_Chunk *chunk, void *application)
     }
 
     /* New channel, create a security policy context and attach */
-    if(!channel->securityPolicy) {
-        if(channel->processOPNHeader)
-            res = channel->processOPNHeader(application, channel, &asymHeader);
-        if(!channel->securityPolicy)
-            res = UA_STATUSCODE_BADINTERNALERROR;
-        UA_CHECK_STATUS(res, goto error);
-    }
+    UA_assert(channel->processOPNHeader);
+    res = channel->processOPNHeader(channel->processOPNHeaderApplication,
+                                    channel, &asymHeader);
+    UA_CHECK_STATUS(res, goto error);
 
     /* On the client side, take the SecureChannelId from the first response */
     if(secureChannelId != 0 && channel->securityToken.channelId == 0)
@@ -716,287 +714,289 @@ unpackPayloadMSG(UA_SecureChannel *channel, UA_Chunk *chunk) {
 }
 
 static UA_StatusCode
-assembleProcessMessage(UA_SecureChannel *channel, void *application,
-                       UA_ProcessMessageCallback callback) {
-    UA_Chunk *chunk = SIMPLEQ_FIRST(&channel->decryptedChunks);
-    UA_assert(chunk != NULL);
+extractCompleteChunk(UA_SecureChannel *channel, UA_Chunk *chunk) {
+    /* At least 8 byte needed for the header */
+    size_t offset = channel->unprocessedOffset;
+    size_t remaining = channel->unprocessed.length - offset;
+    if(remaining < UA_SECURECHANNEL_MESSAGEHEADER_LENGTH)
+        return UA_STATUSCODE_GOOD;
 
-    UA_StatusCode res = UA_STATUSCODE_GOOD;
-    if(chunk->chunkType == UA_CHUNKTYPE_FINAL) {
-        SIMPLEQ_REMOVE_HEAD(&channel->decryptedChunks, pointers);
-        UA_assert(chunk->chunkType == UA_CHUNKTYPE_FINAL);
-        res = callback(application, channel, chunk->messageType,
-                       chunk->requestId, &chunk->bytes);
-        UA_Chunk_delete(chunk);
-        return res;
-    }
+    /* Decoding the header cannot fail */
+    UA_TcpMessageHeader hdr;
+    UA_StatusCode res =
+        UA_decodeBinaryInternal(&channel->unprocessed, &offset, &hdr,
+                                &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER], NULL);
+    UA_assert(res == UA_STATUSCODE_GOOD);
+    (void)res; /* pacify compilers if assert is ignored */
+    UA_MessageType msgType = (UA_MessageType)
+        (hdr.messageTypeAndChunkType & UA_BITMASK_MESSAGETYPE);
+    UA_ChunkType chunkType = (UA_ChunkType)
+        (hdr.messageTypeAndChunkType & UA_BITMASK_CHUNKTYPE);
 
-    UA_UInt32 requestId = chunk->requestId;
-    UA_MessageType messageType = chunk->messageType;
-    UA_ChunkType chunkType = chunk->chunkType;
-    UA_assert(chunkType == UA_CHUNKTYPE_INTERMEDIATE);
-
-    size_t messageSize = 0;
-    SIMPLEQ_FOREACH(chunk, &channel->decryptedChunks, pointers) {
-        /* Consistency check */
-        if(requestId != chunk->requestId)
-            return UA_STATUSCODE_BADINTERNALERROR;
-        if(chunkType != chunk->chunkType && chunk->chunkType != UA_CHUNKTYPE_FINAL)
-            return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
-        if(chunk->messageType != messageType)
+    /* The message size is not allowed */
+    if(hdr.messageSize < UA_SECURECHANNEL_MESSAGE_MIN_LENGTH)
+        return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
+    if(hdr.messageSize > channel->config.recvBufferSize)
+        return UA_STATUSCODE_BADTCPMESSAGETOOLARGE;
+
+    /* Incomplete chunk. Continue processing later. */
+    if(hdr.messageSize > remaining)
+        return UA_STATUSCODE_GOOD;
+
+    /* Set the chunk information */
+    chunk->bytes.data = channel->unprocessed.data + channel->unprocessedOffset;
+    chunk->bytes.length = hdr.messageSize;
+    chunk->messageType = msgType;
+    chunk->chunkType = chunkType;
+    chunk->requestId = 0;
+    chunk->copied = false;
+
+    /* Increase the unprocessed offset */
+    channel->unprocessedOffset += hdr.messageSize;
+
+    /* Validate, decrypt and unpack the chunk payload */
+    switch(msgType) {
+    case UA_MESSAGETYPE_OPN:
+        if(chunkType != UA_CHUNKTYPE_FINAL)
             return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
+        if(channel->state != UA_SECURECHANNELSTATE_OPEN &&
+           channel->state != UA_SECURECHANNELSTATE_OPN_SENT &&
+           channel->state != UA_SECURECHANNELSTATE_ACK_SENT)
+            return UA_STATUSCODE_BADINVALIDSTATE;
+        res = unpackPayloadOPN(channel, chunk);
+        break;
 
-        /* Sum up the lengths */
-        messageSize += chunk->bytes.length;
-        if(chunk->chunkType == UA_CHUNKTYPE_FINAL)
-            break;
-    }
+    case UA_MESSAGETYPE_MSG:
+    case UA_MESSAGETYPE_CLO:
+        if(chunkType != UA_CHUNKTYPE_FINAL &&
+           chunkType != UA_CHUNKTYPE_INTERMEDIATE &&
+           chunkType != UA_CHUNKTYPE_ABORT)
+            return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
+        if(channel->state != UA_SECURECHANNELSTATE_OPEN)
+            return UA_STATUSCODE_BADINVALIDSTATE;
+        res = unpackPayloadMSG(channel, chunk);
+        break;
 
-    /* Allocate memory for the full message */
-    UA_ByteString payload;
-    res = UA_ByteString_allocBuffer(&payload, messageSize);
-    UA_CHECK_STATUS(res, return res);
+    case UA_MESSAGETYPE_RHE:
+    case UA_MESSAGETYPE_HEL:
+    case UA_MESSAGETYPE_ACK:
+    case UA_MESSAGETYPE_ERR:
+        if(chunkType != UA_CHUNKTYPE_FINAL)
+            return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
+        /* Hide the message header */
+        chunk->bytes.data += UA_SECURECHANNEL_MESSAGEHEADER_LENGTH;
+        chunk->bytes.length -= UA_SECURECHANNEL_MESSAGEHEADER_LENGTH;
+        break;
 
-    /* Assemble the full message */
-    size_t offset = 0;
-    while(true) {
-        chunk = SIMPLEQ_FIRST(&channel->decryptedChunks);
-        memcpy(&payload.data[offset], chunk->bytes.data, chunk->bytes.length);
-        offset += chunk->bytes.length;
-        SIMPLEQ_REMOVE_HEAD(&channel->decryptedChunks, pointers);
-        UA_ChunkType ct = chunk->chunkType;
-        UA_Chunk_delete(chunk);
-        if(ct == UA_CHUNKTYPE_FINAL)
-            break;
+    default:
+        res = UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
+        break;
     }
-
-    /* Process the assembled message */
-    res = callback(application, channel, messageType, requestId, &payload);
-    UA_ByteString_clear(&payload);
     return res;
 }
 
-static UA_StatusCode
-persistCompleteChunks(UA_ChunkQueue *queue) {
-    UA_Chunk *chunk;
-    SIMPLEQ_FOREACH(chunk, queue, pointers) {
-        if(chunk->copied)
-            continue;
-        UA_ByteString copy;
-        UA_StatusCode res = UA_ByteString_copy(&chunk->bytes, &copy);
-        UA_CHECK_STATUS(res, return res);
-        chunk->bytes = copy;
-        chunk->copied = true;
+UA_StatusCode
+UA_SecureChannel_loadBuffer(UA_SecureChannel *channel, const UA_ByteString buffer) {
+    /* Append to the previous unprocessed buffer */
+    if(channel->unprocessed.length > 0) {
+        UA_assert(channel->unprocessedCopied == true);
+
+        UA_Byte *t = (UA_Byte*)
+            UA_realloc(channel->unprocessed.data,
+                       channel->unprocessed.length + buffer.length);
+        if(!t)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+
+        memcpy(t + channel->unprocessed.length, buffer.data, buffer.length);
+        channel->unprocessed.data = t;
+        channel->unprocessed.length += buffer.length;
+        return UA_STATUSCODE_GOOD;
     }
-    return UA_STATUSCODE_GOOD;
-}
 
-static UA_StatusCode
-persistIncompleteChunk(UA_SecureChannel *channel, const UA_ByteString *buffer,
-                       size_t offset) {
-    UA_assert(channel->incompleteChunk.length == 0);
-    UA_assert(offset < buffer->length);
-    size_t length = buffer->length - offset;
-    UA_StatusCode res = UA_ByteString_allocBuffer(&channel->incompleteChunk, length);
-    UA_CHECK_STATUS(res, return res);
-    memcpy(channel->incompleteChunk.data, &buffer->data[offset], length);
+    /* Use the new buffer directly */
+    channel->unprocessed = buffer;
+    channel->unprocessedCopied = false;
     return UA_STATUSCODE_GOOD;
 }
 
-/* Processes chunks and puts them into the payloads queue. Once a final chunk is
- * put into the queue, the message is assembled and the callback is called. The
- * queue will be cleared for the next message. */
-static UA_StatusCode
-processChunks(UA_SecureChannel *channel, void *application,
-              UA_ProcessMessageCallback callback) {
-    UA_Chunk *chunk;
+UA_StatusCode
+UA_SecureChannel_getCompleteMessage(UA_SecureChannel *channel,
+                                    UA_MessageType *messageType, UA_UInt32 *requestId,
+                                    UA_ByteString *payload, UA_Boolean *copied) {
+    UA_Chunk chunk, *pchunk;
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    while((chunk = SIMPLEQ_FIRST(&channel->completeChunks))) {
-        /* Remove from the complete-chunk queue */
-        SIMPLEQ_REMOVE_HEAD(&channel->completeChunks, pointers);
-
-        /* Check, decrypt and unpack the payload */
-        if(chunk->messageType == UA_MESSAGETYPE_OPN) {
-            if(channel->state != UA_SECURECHANNELSTATE_OPEN &&
-               channel->state != UA_SECURECHANNELSTATE_OPN_SENT &&
-               channel->state != UA_SECURECHANNELSTATE_ACK_SENT)
-                res = UA_STATUSCODE_BADINVALIDSTATE;
-            else
-                res = unpackPayloadOPN(channel, chunk, application);
-        } else if(chunk->messageType == UA_MESSAGETYPE_MSG ||
-                  chunk->messageType == UA_MESSAGETYPE_CLO) {
-            if(channel->state == UA_SECURECHANNELSTATE_CLOSED)
-                res = UA_STATUSCODE_BADSECURECHANNELCLOSED;
-            else
-                res = unpackPayloadMSG(channel, chunk);
-        } else {
-            chunk->bytes.data += UA_SECURECHANNEL_MESSAGEHEADER_LENGTH;
-            chunk->bytes.length -= UA_SECURECHANNEL_MESSAGEHEADER_LENGTH;
-        }
-
-        if(res != UA_STATUSCODE_GOOD) {
-            UA_Chunk_delete(chunk);
-            return res;
-        }
-
-        /* Add to the decrypted-chunk queue */
-        SIMPLEQ_INSERT_TAIL(&channel->decryptedChunks, chunk, pointers);
 
-        /* Check the resource limits */
-        channel->decryptedChunksCount++;
-        channel->decryptedChunksLength += chunk->bytes.length;
+ extract_chunk:
+    /* Extract+decode the next chunk from the buffer */
+    memset(&chunk, 0, sizeof(UA_Chunk));
+    res = extractCompleteChunk(channel, &chunk);
+    if(chunk.bytes.length == 0 || res != UA_STATUSCODE_GOOD)
+        return res; /* Error or no complete chunk could be extracted */
+
+    /* Process the chunk */
+    switch(chunk.chunkType) {
+    case UA_CHUNKTYPE_ABORT:
+        /* Remove all chunks received so far. Then continue extracting chunks. */
+        deleteChunks(channel);
+        if(chunk.copied)
+            UA_ByteString_clear(&chunk.bytes);
+        goto extract_chunk;
+
+    case UA_CHUNKTYPE_INTERMEDIATE:
+        /* Validate the resource limits */
         if((channel->config.localMaxChunkCount != 0 &&
-            channel->decryptedChunksCount > channel->config.localMaxChunkCount) ||
+            channel->chunksCount >= channel->config.localMaxChunkCount) ||
            (channel->config.localMaxMessageSize != 0 &&
-            channel->decryptedChunksLength > channel->config.localMaxMessageSize)) {
+            channel->chunksLength + chunk.bytes.length > channel->config.localMaxMessageSize)) {
+            if(chunk.copied)
+                UA_ByteString_clear(&chunk.bytes);
             return UA_STATUSCODE_BADTCPMESSAGETOOLARGE;
         }
 
-        /* Waiting for additional chunks */
-        if(chunk->chunkType == UA_CHUNKTYPE_INTERMEDIATE)
-            continue;
-
-        /* Final chunk or abort. Reset the counters. */
-        channel->decryptedChunksCount = 0;
-        channel->decryptedChunksLength = 0;
-
-        /* Abort the message, remove all decrypted chunks
-         * TODO: Log a warning with the error code */
-        if(chunk->chunkType == UA_CHUNKTYPE_ABORT) {
-            while((chunk = SIMPLEQ_FIRST(&channel->decryptedChunks))) {
-                SIMPLEQ_REMOVE_HEAD(&channel->decryptedChunks, pointers);
-                UA_Chunk_delete(chunk);
-            }
-            continue;
+        /* Add the chunk to the queue. Then continue extracting more chunks. */
+        pchunk = (UA_Chunk*)UA_malloc(sizeof(UA_Chunk));
+        if(!pchunk) {
+            if(chunk.copied)
+                UA_ByteString_clear(&chunk.bytes);
+            return UA_STATUSCODE_BADOUTOFMEMORY;
         }
+        *pchunk = chunk;
+        TAILQ_INSERT_TAIL(&channel->chunks, pchunk, pointers);
+        channel->chunksCount++;
+        channel->chunksLength += pchunk->bytes.length;
+        goto extract_chunk;
 
-        /* The decrypted queue contains a full message. Process it. */
-        UA_assert(chunk->chunkType == UA_CHUNKTYPE_FINAL);
-        res = assembleProcessMessage(channel, application, callback);
-        UA_CHECK_STATUS(res, return res);
+    case UA_CHUNKTYPE_FINAL:
+    default:
+        UA_assert(chunk.chunkType == UA_CHUNKTYPE_FINAL); /* Was checked before */
+        break; /* A final chunk was received -- assemble the message */
     }
 
-    return UA_STATUSCODE_GOOD;
-}
-
-static UA_StatusCode
-extractCompleteChunk(UA_SecureChannel *channel, const UA_ByteString *buffer,
-                     size_t *offset, UA_Boolean *done) {
-    /* At least 8 byte needed for the header. Wait for the next chunk. */
-    size_t initial_offset = *offset;
-    size_t remaining = buffer->length - initial_offset;
-    if(remaining < UA_SECURECHANNEL_MESSAGEHEADER_LENGTH) {
-        *done = true;
-        return UA_STATUSCODE_GOOD;
+    /* Compute the message size */
+    size_t messageSize = chunk.bytes.length;
+    UA_Chunk *first = NULL;
+    TAILQ_FOREACH(pchunk, &channel->chunks, pointers) {
+        if(chunk.requestId != pchunk->requestId)
+            continue;
+        if(chunk.messageType != pchunk->messageType) {
+            if(chunk.copied)
+                UA_ByteString_clear(&chunk.bytes);
+            return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
+        }
+        if(!first)
+            first = pchunk;
+        messageSize += pchunk->bytes.length;
     }
 
-    /* Decoding cannot fail */
-    UA_TcpMessageHeader hdr;
-    UA_StatusCode res =
-        UA_decodeBinaryInternal(buffer, &initial_offset, &hdr,
-                                &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER], NULL);
-    UA_assert(res == UA_STATUSCODE_GOOD);
-    (void)res; /* pacify compilers if assert is ignored */
-    UA_MessageType msgType = (UA_MessageType)
-        (hdr.messageTypeAndChunkType & UA_BITMASK_MESSAGETYPE);
-    UA_ChunkType chunkType = (UA_ChunkType)
-        (hdr.messageTypeAndChunkType & UA_BITMASK_CHUNKTYPE);
-
-    /* The message size is not allowed */
-    if(hdr.messageSize < UA_SECURECHANNEL_MESSAGE_MIN_LENGTH)
-        return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
-    if(hdr.messageSize > channel->config.recvBufferSize)
+    /* Validate the assembled message size */
+    if(channel->config.localMaxMessageSize != 0 &&
+       channel->chunksLength > channel->config.localMaxMessageSize) {
+        if(chunk.copied)
+            UA_ByteString_clear(&chunk.bytes);
         return UA_STATUSCODE_BADTCPMESSAGETOOLARGE;
-
-    /* Incomplete chunk */
-    if(hdr.messageSize > remaining) {
-        *done = true;
-        return UA_STATUSCODE_GOOD;
     }
 
-    /* ByteString with only this chunk. */
-    UA_ByteString chunkPayload;
-    chunkPayload.data = &buffer->data[*offset];
-    chunkPayload.length = hdr.messageSize;
-
-    if(msgType == UA_MESSAGETYPE_RHE || msgType == UA_MESSAGETYPE_HEL || msgType == UA_MESSAGETYPE_ACK ||
-       msgType == UA_MESSAGETYPE_ERR || msgType == UA_MESSAGETYPE_OPN) {
-        if(chunkType != UA_CHUNKTYPE_FINAL)
-            return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
-    } else {
-        /* Only messages on SecureChannel-level with symmetric encryption afterwards */
-        if(msgType != UA_MESSAGETYPE_MSG &&
-           msgType != UA_MESSAGETYPE_CLO)
-            return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
+    /* Assemble the full payload and store it in chunk.bytes */
+    if(messageSize > chunk.bytes.length) {
+        UA_assert(first != NULL);
 
-        /* Check the chunk type before decrypting */
-        if(chunkType != UA_CHUNKTYPE_FINAL &&
-           chunkType != UA_CHUNKTYPE_INTERMEDIATE &&
-           chunkType != UA_CHUNKTYPE_ABORT)
-            return UA_STATUSCODE_BADTCPMESSAGETYPEINVALID;
-    }
+        /* Allocate the full memory and initialize with the first chunk content.
+         * Use realloc to speed up. */
+        UA_ByteString message;
+        if(first->copied) {
+            message.data = (UA_Byte*)UA_realloc(first->bytes.data, messageSize);
+        } else {
+            message.data = (UA_Byte*)UA_malloc(messageSize);
+            if(message.data)
+                memcpy(message.data, first->bytes.data, first->bytes.length);
+        }
+        if(!message.data) {
+            if(chunk.copied)
+                UA_ByteString_clear(&chunk.bytes);
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
+        message.length = first->bytes.length;
+
+        /* Remove the the first chunk */
+        pchunk = TAILQ_NEXT(first, pointers);
+        first->copied = false;
+        channel->chunksCount--;
+        channel->chunksLength -= first->bytes.length;
+        TAILQ_REMOVE(&channel->chunks, first, pointers);
+        UA_Chunk_delete(first);
+
+        /* Copy over the content from the remaining intermediate chunks.
+         * And remove them right away. */
+        UA_Chunk *next;
+        for(; pchunk; pchunk = next) {
+            next = TAILQ_NEXT(pchunk, pointers);
+            if(chunk.requestId != pchunk->requestId)
+                continue;
+            memcpy(message.data + message.length, pchunk->bytes.data, pchunk->bytes.length);
+            message.length += pchunk->bytes.length;
+            channel->chunksCount--;
+            channel->chunksLength -= pchunk->bytes.length;
+            TAILQ_REMOVE(&channel->chunks, pchunk, pointers);
+            UA_Chunk_delete(pchunk);
+        }
 
-    /* Add the chunk; forward the offset */
-    *offset += hdr.messageSize;
-    UA_Chunk *chunk = (UA_Chunk*)UA_malloc(sizeof(UA_Chunk));
-    UA_CHECK_MEM(chunk, return UA_STATUSCODE_BADOUTOFMEMORY);
+        /* Copy over the content from the final chunk */
+        memcpy(message.data + message.length, chunk.bytes.data, chunk.bytes.length);
+        message.length += chunk.bytes.length;
+        UA_assert(message.length == messageSize);
 
-    chunk->bytes = chunkPayload;
-    chunk->messageType = msgType;
-    chunk->chunkType = chunkType;
-    chunk->requestId = 0;
-    chunk->copied = false;
+        /* Set assembled message as the content of the final chunk */
+        if(chunk.copied)
+            UA_ByteString_clear(&chunk.bytes);
+        chunk.bytes = message;
+        chunk.copied = true;
+    }
 
-    SIMPLEQ_INSERT_TAIL(&channel->completeChunks, chunk, pointers);
+    /* Return the assembled message */
+    *requestId = chunk.requestId;
+    *messageType = chunk.messageType;
+    *payload = chunk.bytes;
+    *copied = chunk.copied;
     return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
-UA_SecureChannel_processBuffer(UA_SecureChannel *channel, void *application,
-                               UA_ProcessMessageCallback callback,
-                               const UA_ByteString *buffer) {
-    /* Prepend the incomplete last chunk. This is usually done in the
-     * networklayer. But we test for a buffered incomplete chunk here again to
-     * work around "lazy" network layers. */
-    UA_ByteString appended = channel->incompleteChunk;
-    if(appended.length > 0) {
-        channel->incompleteChunk = UA_BYTESTRING_NULL;
-        UA_Byte *t = (UA_Byte*)UA_realloc(appended.data, appended.length + buffer->length);
-        UA_CHECK_MEM(t, UA_ByteString_clear(&appended);
-                     return UA_STATUSCODE_BADOUTOFMEMORY);
-        memcpy(&t[appended.length], buffer->data, buffer->length);
-        appended.data = t;
-        appended.length += buffer->length;
-        buffer = &appended;
-    }
+UA_SecureChannel_persistBuffer(UA_SecureChannel *channel) {
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
 
-    /* Loop over the received chunks */
-    size_t offset = 0;
-    UA_Boolean done = false;
-    UA_StatusCode res;
-    while(!done) {
-        res = extractCompleteChunk(channel, buffer, &offset, &done);
-        UA_CHECK_STATUS(res, goto cleanup);
+    /* Persist the chunks */
+    UA_Chunk *chunk;
+    TAILQ_FOREACH(chunk, &channel->chunks, pointers) {
+        if(chunk->copied)
+            continue;
+        UA_ByteString tmp = UA_BYTESTRING_NULL;
+        res |= UA_ByteString_copy(&chunk->bytes, &tmp);
+        chunk->bytes = tmp;
+        chunk->copied = true;
     }
 
-    /* Buffer half-received chunk. Before processing the messages so that
-     * processing is reentrant. */
-    if(offset < buffer->length) {
-        res = persistIncompleteChunk(channel, buffer, offset);
-        UA_CHECK_STATUS(res, goto cleanup);
+    /* No unprocessed bytes remaining */
+    UA_assert(channel->unprocessed.length >= channel->unprocessedOffset);
+    if(channel->unprocessed.length == channel->unprocessedOffset) {
+        if(channel->unprocessedCopied)
+            UA_ByteString_clear(&channel->unprocessed);
+        else
+            UA_ByteString_init(&channel->unprocessed);
+        channel->unprocessedOffset = 0;
+        return res;
     }
 
-    /* Process whatever we can. Chunks of completed and processed messages are
-     * removed. */
-    res = processChunks(channel, application, callback);
-    UA_CHECK_STATUS(res, goto cleanup);
-
-    /* Persist full chunks that still point to the buffer. Can only return
-     * UA_STATUSCODE_BADOUTOFMEMORY as an error code. So merging res works. */
-    res |= persistCompleteChunks(&channel->completeChunks);
-    res |= persistCompleteChunks(&channel->decryptedChunks);
-
- cleanup:
-    UA_ByteString_clear(&appended);
+    /* Allocate a new unprocessed ByteString.
+     * tmp is the empty string if malloc fails. */
+    UA_ByteString tmp = UA_BYTESTRING_NULL;
+    UA_ByteString remaining = channel->unprocessed;
+    remaining.data += channel->unprocessedOffset;
+    remaining.length -= channel->unprocessedOffset;
+    res |= UA_ByteString_copy(&remaining, &tmp);
+    if(channel->unprocessedCopied)
+        UA_ByteString_clear(&channel->unprocessed);
+    channel->unprocessed = tmp;
+    channel->unprocessedOffset = 0;
+    channel->unprocessedCopied = true;
     return res;
 }
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 424d65b34e0..4faea8cead6 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -69,7 +69,7 @@ typedef struct UA_SessionHeader {
 
 /* For chunked requests */
 typedef struct UA_Chunk {
-    SIMPLEQ_ENTRY(UA_Chunk) pointers;
+    TAILQ_ENTRY(UA_Chunk) pointers;
     UA_ByteString bytes;
     UA_MessageType messageType;
     UA_ChunkType chunkType;
@@ -78,7 +78,7 @@ typedef struct UA_Chunk {
                         * memory allocated for the chunk separately */
 } UA_Chunk;
 
-typedef SIMPLEQ_HEAD(UA_ChunkQueue, UA_Chunk) UA_ChunkQueue;
+typedef TAILQ_HEAD(UA_ChunkQueue, UA_Chunk) UA_ChunkQueue;
 
 typedef enum {
     UA_SECURECHANNELRENEWSTATE_NORMAL,
@@ -145,20 +145,18 @@ struct UA_SecureChannel {
     /* Sessions that are bound to the SecureChannel */
     SLIST_HEAD(, UA_SessionHeader) sessions;
 
-    /* If a buffer is received, first all chunks are put into the completeChunks
-     * queue. Then they are processed in order. This ensures that processing
-     * buffers is reentrant with the correct processing order. (This has lead to
-     * problems in the client in the past.) */
-    UA_ChunkQueue completeChunks; /* Received full chunks that have not been
-                                   * decrypted so far */
-    UA_ChunkQueue decryptedChunks; /* Received chunks that were decrypted but
-                                    * not processed */
-    size_t decryptedChunksCount;
-    size_t decryptedChunksLength;
-    UA_ByteString incompleteChunk; /* A half-received chunk (TCP is a
-                                    * streaming protocol) is stored here */
+    /* (Decrypted) chunks waiting to be processed */
+    UA_ChunkQueue chunks;
+    size_t chunksCount;
+    size_t chunksLength;
+
+    /* Received buffer from which no chunks have been extracted so far */
+    UA_ByteString unprocessed;
+    size_t unprocessedOffset;
+    UA_Boolean unprocessedCopied;
 
     UA_CertificateVerification *certificateVerification;
+    void *processOPNHeaderApplication;
     UA_StatusCode (*processOPNHeader)(void *application, UA_SecureChannel *channel,
                                       const UA_AsymmetricAlgorithmSecurityHeader *asymHeader);
 };
@@ -269,21 +267,27 @@ UA_MessageContext_abort(UA_MessageContext *mc);
  * Receive Message
  * --------------- */
 
-typedef UA_StatusCode
-(UA_ProcessMessageCallback)(void *application, UA_SecureChannel *channel,
-                            UA_MessageType messageType, UA_UInt32 requestId,
-                            UA_ByteString *message);
-
-/* Process a received buffer. The callback function is called with the message
- * body if the message is complete. The message is removed afterwards. Returns
- * if an irrecoverable error occured.
+/* Process a received buffer. This always has these three steps:
+ *
+ * 1. loadBuffer: The chunks in the SecureChannel are cut into chunks.
+ *    The chunks can still point to the buffer.
+ * 2. getCompleteMessage: Assemble chunks into a complete message. This is
+ *    repeated until an error occours or an empty message is returned.
+ * 3. persistBuffer: Make a copy of the remaining unpprocessed bytestring. So
+ *    that the NetworkManager can reuse or free the packet memory.
  *
  * Note that only MSG and CLO messages are decrypted. HEL/ACK/OPN/... are
  * forwarded verbatim to the application. */
 UA_StatusCode
-UA_SecureChannel_processBuffer(UA_SecureChannel *channel, void *application,
-                               UA_ProcessMessageCallback callback,
-                               const UA_ByteString *buffer);
+UA_SecureChannel_loadBuffer(UA_SecureChannel *channel, const UA_ByteString buffer);
+
+UA_StatusCode
+UA_SecureChannel_getCompleteMessage(UA_SecureChannel *channel,
+                                    UA_MessageType *messageType, UA_UInt32 *requestId,
+                                    UA_ByteString *payload, UA_Boolean *copied);
+
+UA_StatusCode
+UA_SecureChannel_persistBuffer(UA_SecureChannel *channel);
 
 /* Internal methods in ua_securechannel_crypto.h */
 
diff --git a/tests/check_securechannel.c b/tests/check_securechannel.c
index 29593fd73a7..c9f74f59e7c 100644
--- a/tests/check_securechannel.c
+++ b/tests/check_securechannel.c
@@ -474,18 +474,26 @@ START_TEST(SecureChannel_sendSymmetricMessage_invalidParameters) {
 } END_TEST
 
 static UA_StatusCode
-process_callback(void *application, UA_SecureChannel *channel,
-                 UA_MessageType messageType, UA_UInt32 requestId,
-                 UA_ByteString *message) {
-    ck_assert_ptr_ne(message, NULL);
-    ck_assert_ptr_ne(application, NULL);
-    if(message == NULL || application == NULL)
-        return UA_STATUSCODE_BADINTERNALERROR;
-    ck_assert_uint_ne(message->length, 0);
-    ck_assert_ptr_ne(message->data, NULL);
-    int *chunks_processed = (int *)application;
-    ++*chunks_processed;
-    return UA_STATUSCODE_GOOD;
+UA_SecureChannel_processBuffer(UA_SecureChannel *channel, int *chunks_processed,
+                               const UA_ByteString buffer) {
+    UA_StatusCode res = UA_SecureChannel_loadBuffer(channel, buffer);
+    while(UA_LIKELY(res == UA_STATUSCODE_GOOD)) {
+        UA_MessageType messageType;
+        UA_UInt32 requestId = 0;
+        UA_ByteString payload = UA_BYTESTRING_NULL;
+        UA_Boolean copied = false;
+        res = UA_SecureChannel_getCompleteMessage(channel, &messageType, &requestId,
+                                                  &payload, &copied);
+        if(res != UA_STATUSCODE_GOOD || payload.length == 0)
+            break;
+        ck_assert_uint_ne(payload.length, 0);
+        ck_assert_ptr_ne(payload.data, NULL);
+        ++*chunks_processed;
+        if(copied)
+            UA_ByteString_clear(&payload);
+    }
+    res |= UA_SecureChannel_persistBuffer(channel);
+    return res;
 }
 
 START_TEST(SecureChannel_assemblePartialChunks) {
@@ -496,18 +504,19 @@ START_TEST(SecureChannel_assemblePartialChunks) {
                              "\x10\x00\x00\x00@\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff";
     buffer.length = 32;
 
-    UA_StatusCode retval = UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, process_callback, &buffer);
+    UA_StatusCode retval =
+        UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, buffer);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected success");
     ck_assert_int_eq(chunks_processed, 1);
 
     buffer.length = 16;
 
-    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, process_callback, &buffer);
+    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, buffer);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected success");
     ck_assert_int_eq(chunks_processed, 1);
 
     buffer.data = &buffer.data[16];
-    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, process_callback, &buffer);
+    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, buffer);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected success");
     ck_assert_int_eq(chunks_processed, 2);
 
@@ -519,20 +528,20 @@ START_TEST(SecureChannel_assemblePartialChunks) {
                              "\x10\x00\x00\x00@\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff";
     buffer.length = 48;
 
-    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, process_callback, &buffer);
+    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, buffer);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected success");
     ck_assert_int_eq(chunks_processed, 3);
 
     buffer.data = &buffer.data[48];
     buffer.length = 32;
 
-    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, process_callback, &buffer);
+    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, buffer);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected success");
     ck_assert_int_eq(chunks_processed, 4);
 
     buffer.data = &buffer.data[32];
     buffer.length = 16;
-    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, process_callback, &buffer);
+    UA_SecureChannel_processBuffer(&testChannel, &chunks_processed, buffer);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected success");
     ck_assert_int_eq(chunks_processed, 5);
 } END_TEST

From 155dfb06b8ebcd2b322f8af80976f253f16c1025 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 16 Nov 2024 23:20:16 +0100
Subject: [PATCH 1697/1963] fix(core): Stop processing after a synchronous
 response

Before it was possible that two responses were received at the same
time. If the client is waiting for the first response, then the second
was processed also before returning the control flow to the client.

This lead to situations where a PublishResponse was processed before
notifying the client about a MonitoredItem handle established just
before.

This fixes #5226.
---
 src/client/ua_client.c         |  4 ++++
 src/client/ua_client_connect.c | 30 ++++++++++++++++++++++++++++++
 src/ua_securechannel.c         |  7 +++++++
 src/ua_securechannel.h         |  1 +
 4 files changed, 42 insertions(+)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 167f77eef2f..74686b362b9 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -500,7 +500,11 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
         UA_clear(response, ac->responseType);
         UA_free(ac);
     } else {
+        /* Return a special status code after processing a synchronous message.
+         * This makes the client return control immediately. */
         ac->syncResponse = NULL; /* Indicate that response was received */
+        if(retval == UA_STATUSCODE_GOOD)
+            retval = UA_STATUSCODE_GOODCOMPLETESASYNCHRONOUSLY;
     }
     return retval;
 }
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index c4094c60cb3..23a5736c663 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1512,6 +1512,9 @@ verifyClientApplicationURI(const UA_Client *client) {
 #endif
 }
 
+static void
+delayedNetworkCallback(void *application, void *context);
+
 static void
 __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                          void *application, void **connectionContext,
@@ -1605,6 +1608,21 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                                      messageType, requestId, &payload);
         if(copied)
             UA_ByteString_clear(&payload);
+
+        /* Abort after synchronous processing of a message.
+         * Add a delayed callback to process the remaining buffer ASAP. */
+        if(res == UA_STATUSCODE_GOODCOMPLETESASYNCHRONOUSLY) {
+            if(client->channel.unprocessed.length > client->channel.unprocessedOffset &&
+               client->channel.unprocessedDelayed.callback == NULL) {
+                client->channel.unprocessedDelayed.callback = delayedNetworkCallback;
+                client->channel.unprocessedDelayed.application = client;
+                client->channel.unprocessedDelayed.context = &client->channel;
+                UA_EventLoop *el = client->config.eventLoop;
+                el->addDelayedCallback(el, &client->channel.unprocessedDelayed);
+            }
+            res = UA_STATUSCODE_GOOD;
+            break;
+        }
     }
     res |= UA_SecureChannel_persistBuffer(&client->channel);
 
@@ -1639,6 +1657,18 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_UNLOCK(&client->clientMutex);
 }
 
+static void
+delayedNetworkCallback(void *application, void *context) {
+    UA_Client *client = (UA_Client*)application;
+    client->channel.unprocessedDelayed.callback = NULL;
+    if(client->channel.state == UA_SECURECHANNELSTATE_CONNECTED)
+        __Client_networkCallback(client->channel.connectionManager,
+                                 client->channel.connectionId,
+                                 client, &context,
+                                 UA_CONNECTIONSTATE_ESTABLISHED,
+                                 &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
+}
+
 /* Initialize a TCP connection. Writes the result to client->connectStatus. */
 static void
 initConnect(UA_Client *client) {
diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 431e56dec39..75698737f27 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -184,6 +184,13 @@ UA_SecureChannel_clear(UA_SecureChannel *channel) {
         channel->channelContext = NULL;
     }
 
+    /* Remove remaining delayed callback */
+    if(channel->connectionManager &&
+       channel->connectionManager->eventSource.eventLoop) {
+        UA_EventLoop *el = channel->connectionManager->eventSource.eventLoop;
+        el->removeDelayedCallback(el, &channel->unprocessedDelayed);
+    }
+
     /* The EventLoop connection is no longer valid */
     channel->connectionId = 0;
     channel->connectionManager = NULL;
diff --git a/src/ua_securechannel.h b/src/ua_securechannel.h
index 4faea8cead6..9a83a179a18 100644
--- a/src/ua_securechannel.h
+++ b/src/ua_securechannel.h
@@ -154,6 +154,7 @@ struct UA_SecureChannel {
     UA_ByteString unprocessed;
     size_t unprocessedOffset;
     UA_Boolean unprocessedCopied;
+    UA_DelayedCallback unprocessedDelayed;
 
     UA_CertificateVerification *certificateVerification;
     void *processOPNHeaderApplication;

From afcf6d04cdc5bacc92972d0b4e035416213e5471 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 20 Nov 2024 09:42:47 +0100
Subject: [PATCH 1698/1963] fix(server): Immediately set new SecureChannels to
 CONNECTED

Now they are correctly purged when too many connections are open.
This fixes the problem reported in #6863.
---
 src/server/ua_server_binary.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index e6483d8c441..06cb34df3cc 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1260,17 +1260,15 @@ serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             return;
         }
 
-        UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel created");
-
         /* Set the new channel as the new context for the connection */
         *connectionContext = (void*)channel;
-        return;
-    }
 
-    /* The connection has fully opened */
-    if(channel->state < UA_SECURECHANNELSTATE_CONNECTED)
+        /* Set the channel state to CONNECTED until the HEL message is received */
         channel->state = UA_SECURECHANNELSTATE_CONNECTED;
 
+        UA_LOG_INFO_CHANNEL(bpm->logging, channel, "SecureChannel created");
+    }
+
     /* Received a message on a normal connection */
 #ifdef UA_DEBUG_DUMP_PKGS
     UA_dump_hex_pkg(message->data, message->length);

From e0c31d83cbf92b8fe52e5aae473f89e8fbe1330f Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Thu, 11 Jan 2024 16:08:37 +0100
Subject: [PATCH 1699/1963] feat(plugins): Support certificate generation with
 mbedTLS. (#6145)

(cherry picked from commit 1f19a8e484f5e6ff3ec77793c67f433b6318810c)
---
 CMakeLists.txt                                |   7 +-
 examples/encryption/server_encryption.c       |   4 -
 .../mbedtls/ua_mbedtls_create_certificate.c   | 550 ++++++++++++++++++
 tests/CMakeLists.txt                          |   1 +
 4 files changed, 555 insertions(+), 7 deletions(-)
 create mode 100644 plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6746979af00..e4cc5f9aaf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1043,7 +1043,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION OR UA_ENABLE_AMAL
 endif()
 
 if(UA_ENABLE_PUBSUB_ENCRYPTION)
-  list(INSERT plugin_sources 1
+  list(APPEND plugin_sources
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c)
 endif()
@@ -1053,12 +1053,13 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENC
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_AMALGAMATION)
-list(INSERT plugin_sources 1
+list(APPEND plugin_sources
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
+     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
      ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c)
 endif()
 
@@ -1069,7 +1070,7 @@ list(INSERT plugin_sources 0
 endif()
 
 if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL OR UA_ENABLE_AMALGAMATION)
-list(INSERT plugin_sources 0
+list(APPEND plugin_sources
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/securitypolicy_openssl_common.h
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_version_abstraction.h
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/securitypolicy_openssl_common.c
diff --git a/examples/encryption/server_encryption.c b/examples/encryption/server_encryption.c
index 5ebbeb971f9..57b2db4245c 100644
--- a/examples/encryption/server_encryption.c
+++ b/examples/encryption/server_encryption.c
@@ -38,7 +38,6 @@ int main(int argc, char* argv[]) {
                      "Missing arguments. Arguments are "
                      "<server-certificate.der> <private-key.der> "
                      "[<trustlist1.crl>, ...]");
-#if defined(UA_ENABLE_ENCRYPTION_OPENSSL) || defined(UA_ENABLE_ENCRYPTION_LIBRESSL)
         UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND,
                     "Trying to create a certificate.");
         UA_String subject[3] = {UA_STRING_STATIC("C=DE"),
@@ -65,9 +64,6 @@ int main(int argc, char* argv[]) {
                 UA_StatusCode_name(statusCertGen));
             return EXIT_SUCCESS;
         }
-#else
-        return EXIT_SUCCESS;
-#endif
     }
 
 
diff --git a/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c b/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
new file mode 100644
index 00000000000..8d0692622a5
--- /dev/null
+++ b/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
@@ -0,0 +1,550 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright (c) 2023 Fraunhofer IOSB (Author: Noel Graf)
+ *
+ */
+
+#include <open62541/plugin/create_certificate.h>
+#include <time.h>
+
+#include "securitypolicy_mbedtls_common.h"
+#include "eventloop/posix/eventloop_posix.h"
+
+#if defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
+
+#include <mbedtls/x509_crt.h>
+#include <mbedtls/oid.h>
+#include <mbedtls/asn1write.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/platform.h>
+#include <mbedtls/version.h>
+
+#define SET_OID(x, oid) \
+    do { x.len = MBEDTLS_OID_SIZE(oid); x.p = (unsigned char *) oid; } while (0)
+
+#define MBEDTLS_ASN1_CHK_CLEANUP_ADD(g, f) \
+    do                                     \
+    {                                      \
+        if ((ret = (f)) < 0)               \
+        goto cleanup;                      \
+        else                               \
+        (g) += ret;                        \
+    } while (0)
+
+#if MBEDTLS_VERSION_NUMBER < 0x02170000
+#define MBEDTLS_X509_SAN_OTHER_NAME                      0
+#define MBEDTLS_X509_SAN_RFC822_NAME                     1
+#define MBEDTLS_X509_SAN_DNS_NAME                        2
+#define MBEDTLS_X509_SAN_X400_ADDRESS_NAME               3
+#define MBEDTLS_X509_SAN_DIRECTORY_NAME                  4
+#define MBEDTLS_X509_SAN_EDI_PARTY_NAME                  5
+#define MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER     6
+#define MBEDTLS_X509_SAN_IP_ADDRESS                      7
+#define MBEDTLS_X509_SAN_REGISTERED_ID                   8
+#endif
+
+#define MBEDTLS_SAN_MAX_LEN    64
+typedef struct mbedtls_write_san_node{
+    int type;
+    char* host;
+    size_t hostlen;
+} mbedtls_write_san_node;
+
+typedef struct mbedtls_write_san_list{
+    mbedtls_write_san_node node;
+    struct mbedtls_write_san_list* next;
+} mbedtls_write_san_list;
+
+static size_t mbedtls_get_san_list_deep(const mbedtls_write_san_list* sanlist);
+
+int mbedtls_x509write_crt_set_subject_alt_name(mbedtls_x509write_cert *ctx, const mbedtls_write_san_list* sanlist);
+
+#if MBEDTLS_VERSION_NUMBER < 0x03030000
+int mbedtls_x509write_crt_set_ext_key_usage(mbedtls_x509write_cert *ctx,
+                                            const mbedtls_asn1_sequence *exts);
+#endif
+
+static int write_certificate(mbedtls_x509write_cert *crt, UA_CertificateFormat certFormat,
+                             UA_ByteString *outCertificate, int (*f_rng)(void *, unsigned char *, size_t),
+                             void *p_rng);
+
+static int write_private_key(mbedtls_pk_context *key, UA_CertificateFormat keyFormat, UA_ByteString *outPrivateKey);
+
+UA_StatusCode
+UA_CreateCertificate(const UA_Logger *logger, const UA_String *subject,
+                     size_t subjectSize, const UA_String *subjectAltName,
+                     size_t subjectAltNameSize, UA_CertificateFormat certFormat,
+                     UA_KeyValueMap *params, UA_ByteString *outPrivateKey,
+                     UA_ByteString *outCertificate) {
+    if(!outPrivateKey || !outCertificate || !logger || !subjectAltName || !subject ||
+       subjectAltNameSize == 0 || subjectSize == 0 ||
+       (certFormat != UA_CERTIFICATEFORMAT_DER && certFormat != UA_CERTIFICATEFORMAT_PEM))
+        return UA_STATUSCODE_BADINVALIDARGUMENT;
+
+    /* Use the maximum size */
+    UA_UInt16 keySizeBits = 4096;
+    /* Default to 1 year */
+    UA_UInt16 expiresInDays = 365;
+
+    if(params) {
+        const UA_UInt16 *keySizeBitsValue = (const UA_UInt16 *)UA_KeyValueMap_getScalar(
+            params, UA_QUALIFIEDNAME(0, "key-size-bits"), &UA_TYPES[UA_TYPES_UINT16]);
+        if(keySizeBitsValue)
+            keySizeBits = *keySizeBitsValue;
+
+        const UA_UInt16 *expiresInDaysValue = (const UA_UInt16 *)UA_KeyValueMap_getScalar(
+            params, UA_QUALIFIEDNAME(0, "expires-in-days"), &UA_TYPES[UA_TYPES_UINT16]);
+        if(expiresInDaysValue)
+            expiresInDays = *expiresInDaysValue;
+    }
+
+    UA_ByteString_init(outPrivateKey);
+    UA_ByteString_init(outCertificate);
+
+    mbedtls_pk_context key;
+    mbedtls_ctr_drbg_context ctr_drbg;
+    mbedtls_entropy_context entropy;
+    const char *pers = "gen_key";
+    mbedtls_x509write_cert crt;
+
+    UA_StatusCode errRet = UA_STATUSCODE_GOOD;
+
+    /* Set to sane values */
+    mbedtls_pk_init(&key);
+    mbedtls_ctr_drbg_init(&ctr_drbg);
+    mbedtls_entropy_init(&entropy);
+    mbedtls_x509write_crt_init(&crt);
+
+    /* Seed the random number generator */
+    if (mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char *)pers, strlen(pers)) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Failed to initialize the random number generator.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        goto cleanup;
+    }
+
+    /* Generate an RSA key pair */
+    if (mbedtls_pk_setup(&key, mbedtls_pk_info_from_type(MBEDTLS_PK_RSA)) != 0 ||
+        mbedtls_rsa_gen_key(mbedtls_pk_rsa(key), mbedtls_ctr_drbg_random, &ctr_drbg, keySizeBits, 65537) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Failed to generate RSA key pair.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        goto cleanup;
+    }
+
+    /* Setting certificate values */
+    mbedtls_x509write_crt_set_version(&crt, MBEDTLS_X509_CRT_VERSION_3);
+    mbedtls_x509write_crt_set_md_alg(&crt, MBEDTLS_MD_SHA256);
+
+    size_t subject_char_len = 0;
+    for(size_t i = 0; i < subjectSize; i++) {
+        subject_char_len += subject[i].length;
+    }
+    char *subject_char = (char*)UA_malloc(subject_char_len + subjectSize);
+    if(!subject_char) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Cannot allocate memory for subject. Out of memory.");
+        errRet = UA_STATUSCODE_BADOUTOFMEMORY;
+        goto cleanup;
+    }
+
+    size_t pos = 0;
+    for(size_t i = 0; i < subjectSize; i++) {
+        subject_char_len += subject[i].length;
+        memcpy(subject_char + pos, subject[i].data, subject[i].length);
+        pos += subject[i].length;
+        if(i < subjectSize - 1)
+            subject_char[pos++] = ',';
+        else
+            subject_char[pos++] = '\0';
+    }
+
+    if((mbedtls_x509write_crt_set_subject_name(&crt, subject_char)) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Setting subject failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        UA_free(subject_char);
+        goto cleanup;
+    }
+
+    if((mbedtls_x509write_crt_set_issuer_name(&crt, subject_char)) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Setting issuer failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        UA_free(subject_char);
+        goto cleanup;
+    }
+
+    UA_free(subject_char);
+
+    mbedtls_write_san_list *cur = NULL;
+    mbedtls_write_san_list *cur_tmp = NULL;
+    mbedtls_write_san_list *head = NULL;
+    for(size_t i = 0; i < subjectAltNameSize; i++) {
+        char *sanType;
+        char *sanValue;
+        size_t sanValueLength;
+        char *subAlt = (char *)UA_malloc(subjectAltName[i].length + 1);
+        memcpy(subAlt, subjectAltName[i].data, subjectAltName[i].length);
+
+        /* null-terminate the copied string */
+        subAlt[subjectAltName[i].length] = 0;
+        /* split into SAN type and value */
+        sanType = strtok(subAlt, ":");
+        sanValue = (char *)subjectAltName[i].data + strlen(sanType) + 1;
+        sanValueLength = strlen(sanValue);
+
+        if(sanType) {
+            cur_tmp = (mbedtls_write_san_list*)mbedtls_calloc(1, sizeof(mbedtls_write_san_list));
+            cur_tmp->next = NULL;
+            cur_tmp->node.host = sanValue;
+            cur_tmp->node.hostlen = sanValueLength;
+
+            if(strcmp(sanType, "DNS") == 0) {
+                cur_tmp->node.type = MBEDTLS_X509_SAN_DNS_NAME;
+            } else if(strcmp(sanType, "URI") == 0) {
+                cur_tmp->node.type = MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER;
+            } else if(strcmp(sanType, "IP") == 0) {
+                uint8_t ip[4] = {0};
+                if(UA_inet_pton(AF_INET, sanValue, ip) <= 0) {
+                    UA_LOG_WARNING(logger, UA_LOGCATEGORY_SECURECHANNEL, "IP SAN preparation failed");
+                    mbedtls_free(cur_tmp);
+                    UA_free(subAlt);
+                    continue;
+                }
+                cur_tmp->node.type = MBEDTLS_X509_SAN_IP_ADDRESS;
+                cur_tmp->node.host = (char *)ip;
+                cur_tmp->node.hostlen = sizeof(ip);
+            } else if(strcmp(sanType, "RFC822") == 0) {
+                cur_tmp->node.type = MBEDTLS_X509_SAN_RFC822_NAME;
+            } else {
+                UA_LOG_WARNING(logger, UA_LOGCATEGORY_SECURECHANNEL, "Given an unsupported SAN");
+                mbedtls_free(cur_tmp);
+                UA_free(subAlt);
+                continue;
+            }
+        } else {
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_SECURECHANNEL, "Invalid Input format");
+            UA_free(subAlt);
+            continue;
+        }
+
+        if(!cur) {
+            cur = cur_tmp;
+            head = cur_tmp;
+        } else {
+            cur->next = cur_tmp;
+            cur = cur->next;
+        }
+
+        UA_free(subAlt);
+    }
+
+    if((mbedtls_x509write_crt_set_subject_alt_name(&crt, head)) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Setting subject alternative name failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        while(head != NULL) {
+            cur_tmp = head->next;
+            mbedtls_free(head);
+            head = cur_tmp;
+        }
+        goto cleanup;
+    }
+
+    while(head != NULL) {
+        cur_tmp = head->next;
+        mbedtls_free(head);
+        head = cur_tmp;
+    }
+
+#if MBEDTLS_VERSION_NUMBER >= 0x03040000
+    unsigned char *serial = (unsigned char *)"1";
+    size_t serial_len = 1;
+    mbedtls_x509write_crt_set_serial_raw(&crt, serial, serial_len);
+#else
+    mbedtls_mpi serial_mpi;
+    mbedtls_mpi_init(&serial_mpi);
+    mbedtls_mpi_lset(&serial_mpi, 1);
+    mbedtls_x509write_crt_set_serial(&crt, &serial_mpi);
+    mbedtls_mpi_free(&serial_mpi);
+#endif
+
+    /* Get the current time */
+    time_t rawTime;
+    struct tm *timeInfo;
+    time(&rawTime);
+    timeInfo = gmtime(&rawTime);
+
+    /* Format the current timestamp */
+    char current_timestamp[15];  // YYYYMMDDhhmmss + '\0'
+    strftime(current_timestamp, sizeof(current_timestamp), "%Y%m%d%H%M%S", timeInfo);
+
+    /* Calculate the future timestamp */
+    timeInfo->tm_mday += expiresInDays;
+    time_t future_time = mktime(timeInfo);
+
+    /* Format the future timestamp */
+    char future_timestamp[15];  // YYYYMMDDhhmmss + '\0'
+    strftime(future_timestamp, sizeof(future_timestamp), "%Y%m%d%H%M%S", gmtime(&future_time));
+
+    if(mbedtls_x509write_crt_set_validity(&crt, current_timestamp, future_timestamp) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Setting 'not before' and 'not after' failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        goto cleanup;
+    }
+
+    if(mbedtls_x509write_crt_set_basic_constraints(&crt, 0, -1) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Setting basic constraints failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        goto cleanup;
+    }
+
+    if(mbedtls_x509write_crt_set_key_usage(&crt, MBEDTLS_X509_KU_DIGITAL_SIGNATURE | MBEDTLS_X509_KU_NON_REPUDIATION
+                                            | MBEDTLS_X509_KU_KEY_ENCIPHERMENT | MBEDTLS_X509_KU_DATA_ENCIPHERMENT
+                                            | MBEDTLS_X509_KU_KEY_CERT_SIGN | MBEDTLS_X509_KU_CRL_SIGN) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Setting key usage failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        goto cleanup;
+    }
+
+    mbedtls_asn1_sequence *ext_key_usage;
+    ext_key_usage = (mbedtls_asn1_sequence *)mbedtls_calloc(1, sizeof(mbedtls_asn1_sequence));
+    ext_key_usage->buf.tag = MBEDTLS_ASN1_OID;
+    SET_OID(ext_key_usage->buf, MBEDTLS_OID_SERVER_AUTH);
+    ext_key_usage->next = (mbedtls_asn1_sequence *)mbedtls_calloc(1, sizeof(mbedtls_asn1_sequence));
+    ext_key_usage->next->buf.tag = MBEDTLS_ASN1_OID;
+    SET_OID(ext_key_usage->next->buf, MBEDTLS_OID_CLIENT_AUTH);
+
+    if(mbedtls_x509write_crt_set_ext_key_usage(&crt, ext_key_usage) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Setting extended key usage failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        mbedtls_free(ext_key_usage->next);
+        mbedtls_free(ext_key_usage);
+        goto cleanup;
+    }
+
+    mbedtls_free(ext_key_usage->next);
+    mbedtls_free(ext_key_usage);
+
+    mbedtls_x509write_crt_set_subject_key(&crt, &key);
+    mbedtls_x509write_crt_set_issuer_key(&crt, &key);
+
+
+    /* Write private key */
+    if ((write_private_key(&key, certFormat, outPrivateKey)) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Create Certificate: Writing private key failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        goto cleanup;
+    }
+
+    /* Write Certificate */
+    if ((write_certificate(&crt, certFormat, outCertificate,
+                                 mbedtls_ctr_drbg_random, &ctr_drbg)) != 0) {
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
+                     "Create Certificate: Writing certificate failed.");
+        errRet = UA_STATUSCODE_BADINTERNALERROR;
+        goto cleanup;
+    }
+
+    mbedtls_ctr_drbg_free(&ctr_drbg);
+    mbedtls_entropy_free(&entropy);
+    mbedtls_x509write_crt_free(&crt);
+    mbedtls_pk_free(&key);
+
+cleanup:
+    mbedtls_ctr_drbg_free(&ctr_drbg);
+    mbedtls_entropy_free(&entropy);
+    mbedtls_x509write_crt_free(&crt);
+    mbedtls_pk_free(&key);
+    return errRet;
+}
+
+static int write_private_key(mbedtls_pk_context *key, UA_CertificateFormat keyFormat, UA_ByteString *outPrivateKey) {
+    int ret;
+    unsigned char output_buf[16000];
+    unsigned char *c = output_buf;
+    size_t len = 0;
+
+    memset(output_buf, 0, 16000);
+    switch(keyFormat) {
+    case UA_CERTIFICATEFORMAT_DER: {
+        if((ret = mbedtls_pk_write_key_pem(key, output_buf, 16000)) != 0) {
+            return ret;
+        }
+
+        len = strlen((char *) output_buf);
+        break;
+    }
+    case UA_CERTIFICATEFORMAT_PEM: {
+        if((ret = mbedtls_pk_write_key_der(key, output_buf, 16000)) < 0) {
+            return ret;
+        }
+
+        len = ret;
+        c = output_buf + sizeof(output_buf) - len;
+        break;
+    }
+    }
+
+    outPrivateKey->length = len;
+    UA_ByteString_allocBuffer(outPrivateKey, outPrivateKey->length);
+    memcpy(outPrivateKey->data, c, outPrivateKey->length);
+
+    return 0;
+}
+
+static int write_certificate(mbedtls_x509write_cert *crt, UA_CertificateFormat certFormat,
+                      UA_ByteString *outCertificate, int (*f_rng)(void *, unsigned char *, size_t),
+                      void *p_rng) {
+    int ret;
+    unsigned char output_buf[4096];
+    unsigned char *c = output_buf;
+    size_t len = 0;
+
+    memset(output_buf, 0, 4096);
+    switch(certFormat) {
+    case UA_CERTIFICATEFORMAT_DER: {
+        if((ret = mbedtls_x509write_crt_der(crt, output_buf, 4096, f_rng, p_rng)) < 0) {
+            return ret;
+        }
+
+        len = ret;
+        c = output_buf + 4096 - len;
+        break;
+    }
+    case UA_CERTIFICATEFORMAT_PEM: {
+        if((ret = mbedtls_x509write_crt_pem(crt, output_buf, 4096, f_rng, p_rng)) < 0) {
+            return ret;
+        }
+
+        len = strlen((char *)output_buf);
+        break;
+    }
+    }
+
+    outCertificate->length = len;
+    UA_ByteString_allocBuffer(outCertificate, outCertificate->length);
+    memcpy(outCertificate->data, c, outCertificate->length);
+
+    return 0;
+}
+
+#if MBEDTLS_VERSION_NUMBER < 0x03030000
+int mbedtls_x509write_crt_set_ext_key_usage(mbedtls_x509write_cert *ctx,
+                                            const mbedtls_asn1_sequence *exts) {
+    unsigned char buf[256];
+    unsigned char *c = buf + sizeof(buf);
+    int ret;
+    size_t len = 0;
+    const mbedtls_asn1_sequence *last_ext = NULL;
+    const mbedtls_asn1_sequence *ext;
+
+    memset(buf, 0, sizeof(buf));
+
+    /* We need at least one extension: SEQUENCE SIZE (1..MAX) OF KeyPurposeId */
+    if(!exts) {
+        return MBEDTLS_ERR_X509_BAD_INPUT_DATA;
+    }
+
+    /* Iterate over exts backwards, so we write them out in the requested order */
+    while(last_ext != exts) {
+        for(ext = exts; ext->next != last_ext; ext = ext->next) {
+        }
+        if(ext->buf.tag != MBEDTLS_ASN1_OID) {
+            return MBEDTLS_ERR_X509_BAD_INPUT_DATA;
+        }
+        MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_raw_buffer(&c, buf, ext->buf.p, ext->buf.len));
+        MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, buf, ext->buf.len));
+        MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c, buf, MBEDTLS_ASN1_OID));
+        last_ext = ext;
+    }
+
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, buf, len));
+    MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c, buf, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE));
+
+    return mbedtls_x509write_crt_set_extension(ctx, MBEDTLS_OID_EXTENDED_KEY_USAGE,
+                                               MBEDTLS_OID_SIZE(MBEDTLS_OID_EXTENDED_KEY_USAGE), 1, c, len);
+}
+
+#endif
+
+static size_t mbedtls_get_san_list_deep(const mbedtls_write_san_list* sanlist) {
+    size_t ret = 0;
+    const mbedtls_write_san_list* cur = sanlist;
+    while (cur) {
+        ++ret;
+        cur = cur->next;
+    }
+
+    return ret;
+}
+
+int mbedtls_x509write_crt_set_subject_alt_name(mbedtls_x509write_cert *ctx, const mbedtls_write_san_list* sanlist) {
+    int	ret = 0;
+    size_t sandeep = 0;
+    const mbedtls_write_san_list* cur = sanlist;
+    unsigned char* buf;
+    unsigned char* pc;
+    size_t len;
+    size_t buflen = 0;
+
+    /* How many alt names to be written */
+    sandeep = mbedtls_get_san_list_deep(sanlist);
+    if (sandeep == 0)
+        return ret;
+
+    buflen = MBEDTLS_SAN_MAX_LEN * sandeep + sandeep;
+    buf = (unsigned char *)mbedtls_calloc(1, buflen);
+    if(!buf)
+        return MBEDTLS_ERR_ASN1_ALLOC_FAILED;
+
+    memset(buf, 0, buflen);
+    pc = buf + buflen;
+
+    len = 0;
+    while(cur) {
+        switch (cur->node.type) {
+        case MBEDTLS_X509_SAN_DNS_NAME:
+        case MBEDTLS_X509_SAN_RFC822_NAME:
+        case MBEDTLS_X509_SAN_UNIFORM_RESOURCE_IDENTIFIER:
+        case MBEDTLS_X509_SAN_IP_ADDRESS:
+            MBEDTLS_ASN1_CHK_CLEANUP_ADD(len,
+                                         mbedtls_asn1_write_raw_buffer(&pc, buf, (const unsigned char *)cur->node.host,
+                                                                       cur->node.hostlen));
+            MBEDTLS_ASN1_CHK_CLEANUP_ADD(len, mbedtls_asn1_write_len(&pc, buf, cur->node.hostlen));
+            MBEDTLS_ASN1_CHK_CLEANUP_ADD(len, mbedtls_asn1_write_tag(&pc, buf,
+                                                                     MBEDTLS_ASN1_CONTEXT_SPECIFIC | cur->node.type));
+            break;
+        default:
+            /* Error out on an unsupported SAN */
+            ret = MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE;
+            goto cleanup;
+        }
+
+        cur = cur->next;
+    }
+
+    MBEDTLS_ASN1_CHK_CLEANUP_ADD(len, mbedtls_asn1_write_len(&pc, buf, len));
+    MBEDTLS_ASN1_CHK_CLEANUP_ADD(len, mbedtls_asn1_write_tag(&pc, buf, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE));
+
+    ret = mbedtls_x509write_crt_set_extension(ctx, MBEDTLS_OID_SUBJECT_ALT_NAME,
+                                              MBEDTLS_OID_SIZE(MBEDTLS_OID_SUBJECT_ALT_NAME), 0, buf + buflen - len, len);
+
+    mbedtls_free(buf);
+    return ret;
+
+cleanup:
+    mbedtls_free(buf);
+    return ret;
+}
+
+#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 35e13defa67..941718a60ec 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -445,6 +445,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
     ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
     ua_add_test(encryption/check_username_connect_none.c)
     ua_add_test(encryption/check_encryption_key_password.c)
+    ua_add_test(encryption/check_cert_generation.c)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS AND UA_ENABLE_CERT_REJECTED_DIR)

From b46087274f114483ec9c7cdfad9822bb1f17d45c Mon Sep 17 00:00:00 2001
From: Goetz Goerisch <g.goerisch@vdw.de>
Date: Tue, 19 Nov 2024 14:52:47 +0100
Subject: [PATCH 1700/1963] fix(plugin): cert_gen mbedTLS fix header file
 include and add to build

Co-authored-by: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Signed-off-by: Goetz Goerisch <g.goerisch@vdw.de>
---
 plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c | 2 +-
 tests/CMakeLists.txt                                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c b/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
index 8d0692622a5..c828c7c3ec4 100644
--- a/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
+++ b/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
@@ -10,7 +10,7 @@
 #include <time.h>
 
 #include "securitypolicy_mbedtls_common.h"
-#include "eventloop/posix/eventloop_posix.h"
+#include "../../arch/eventloop_posix.h"
 
 #if defined(UA_ENABLE_ENCRYPTION_MBEDTLS)
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 941718a60ec..676074c285b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -123,7 +123,8 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes128sha256rsaoaep.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_aes256sha256rsapss.c
-       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c)
+       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+       ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)

From 7494e335e147c0840a83ce68c5f72c609939247e Mon Sep 17 00:00:00 2001
From: Goetz Goerisch <g.goerisch@vdw.de>
Date: Wed, 20 Nov 2024 15:48:33 +0100
Subject: [PATCH 1701/1963] fix(build): align inclusion of architecture.h

Co-authored-by: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Signed-off-by: Goetz Goerisch <g.goerisch@vdw.de>
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4cc5f9aaf2..295cd14898e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -545,7 +545,7 @@ endif()
 
 if(MINGW)
     # GCC stack protector support
-    list(APPEND open62541_LIBRARIES ssp)
+    list(APPEND open62541_LIBRARIES ws2_32 ssp)
 endif()
 
 #####################
@@ -877,6 +877,7 @@ endif()
 
 if (NOT "${UA_ARCHITECTURE}" STREQUAL "none")
     list(PREPEND lib_headers ${PROJECT_SOURCE_DIR}/arch/posix/ua_architecture.h)
+    list(PREPEND lib_headers ${PROJECT_SOURCE_DIR}/arch/win32/ua_architecture.h)
 endif()
 
 if(UA_ENABLE_PARSING)
@@ -964,7 +965,6 @@ set(architecture_sources)
 
 if(NOT "${UA_ARCHITECTURE}" STREQUAL "none")
     list(APPEND architecture_headers
-         ${PROJECT_SOURCE_DIR}/arch/win32/ua_architecture.h
          ${PROJECT_SOURCE_DIR}/arch/common/ua_timer.h
          ${PROJECT_SOURCE_DIR}/arch/eventloop_common.h
          ${PROJECT_SOURCE_DIR}/arch/eventloop_posix.h)

From 3457f1e4fdbe8a4ccf37dc7ff25b1dd8a933331c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 22 Nov 2024 19:09:17 +0100
Subject: [PATCH 1702/1963] fix(build): Remove CMake warnings concerning
 PRE_BUILD custom command options

---
 CMakeLists.txt                    | 5 +----
 doc/CMakeLists.txt                | 2 --
 tools/cmake/open62541Macros.cmake | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 295cd14898e..e9f002f1f83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1215,7 +1215,6 @@ ua_generate_datatypes(INTERNAL NAME "transport" TARGET_SUFFIX "transport" NAMESP
 # statuscode explanation
 add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
                           ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.c
-                   PRE_BUILD
                    COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
                            ${UA_FILE_STATUSCODES} ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes
                    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/generate_statuscode_descriptions.py
@@ -1235,7 +1234,6 @@ add_custom_target(open62541-generator-statuscode DEPENDS
 if(UA_ENABLE_AMALGAMATION)
     # single-file release
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/open62541.h
-                       PRE_BUILD
                        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
                                ${OPEN62541_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/open62541.h
                                ${exported_headers} ${plugin_headers}
@@ -1243,7 +1241,6 @@ if(UA_ENABLE_AMALGAMATION)
                                ${exported_headers} ${plugin_headers})
 
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/open62541.c
-                       PRE_BUILD
                        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/amalgamate.py
                                ${OPEN62541_VERSION} ${CMAKE_CURRENT_BINARY_DIR}/open62541.c
                                ${lib_headers} ${lib_sources} ${plugin_sources} ${architecture_headers} ${architecture_sources}
@@ -1267,7 +1264,7 @@ if(UA_ENABLE_NODESET_INJECTOR)
     message(STATUS "Nodesetinjector feature enabled")
     cmake_minimum_required(VERSION 3.20)
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
-                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c PRE_BUILD
+                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
                        COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/nodeset_injector/generate_nodesetinjector.py
                        ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector)
     add_custom_target(open62541-generator-nodesetinjector DEPENDS
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 68d89f27375..65bba0fa2e9 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -22,14 +22,12 @@ list(APPEND GENERATED_RST "")
 # Generated type definitions
 add_custom_command(OUTPUT ${DOC_SRC_DIR}/types_generated.rst
                    COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/src_generated/open62541/types_generated.rst ${DOC_SRC_DIR}
-                   PRE_BUILD
                    DEPENDS ${PROJECT_BINARY_DIR}/src_generated/open62541/types_generated.rst)
 list(APPEND GENERATED_RST ${DOC_SRC_DIR}/types_generated.rst)
 
 macro(generate_rst in out)
     add_custom_command(OUTPUT ${out}
                        DEPENDS ${PROJECT_SOURCE_DIR}/tools/c2rst.py ${in}
-                       PRE_BUILD
                        COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/c2rst.py ${in} ${out})
     list(APPEND GENERATED_RST "${out}")
 endmacro()
diff --git a/tools/cmake/open62541Macros.cmake b/tools/cmake/open62541Macros.cmake
index ef103c9bced..9ce8261366d 100644
--- a/tools/cmake/open62541Macros.cmake
+++ b/tools/cmake/open62541Macros.cmake
@@ -66,7 +66,6 @@ function(ua_generate_nodeid_header)
 
     # Header containing defines for all NodeIds
     add_custom_command(OUTPUT ${UA_GEN_ID_OUTPUT_DIR}/${UA_GEN_ID_NAME}.h
-        PRE_BUILD
         COMMAND ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_nodeid_header.py
         ${UA_GEN_ID_FILE_CSV}  ${UA_GEN_ID_OUTPUT_DIR}/${UA_GEN_ID_NAME} ${UA_GEN_ID_ID_PREFIX}
         DEPENDS ${open62541_TOOLS_DIR}/generate_nodeid_header.py
@@ -220,7 +219,6 @@ function(ua_generate_datatypes)
     add_custom_command(OUTPUT ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.c
         ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated.h
         ${UA_GEN_DT_OUTPUT_DIR}/${UA_GEN_DT_NAME}_generated_handling.h
-        PRE_BUILD
         COMMAND ${ARG_CONV_EXCL_ENV} ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/generate_datatypes.py
         ${NAMESPACE_MAP_TMP}
         ${SELECTED_TYPES_TMP}
@@ -398,7 +396,6 @@ function(ua_generate_nodeset)
 
     add_custom_command(OUTPUT ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c
                        ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h
-                       PRE_BUILD
                        COMMAND ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_compiler/nodeset_compiler.py
                        ${GEN_INTERNAL_HEADERS}
                        ${GEN_NS0}

From 563b2107c570bd2f7961f031e338692636c18a3a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 22 Nov 2024 20:00:40 +0100
Subject: [PATCH 1703/1963] refactor(build): Use the native Python3 support for
 CMake

---
 tools/cmake/FindPython/Support.cmake | 925 ---------------------------
 tools/cmake/FindPython3.cmake        | 146 -----
 2 files changed, 1071 deletions(-)
 delete mode 100644 tools/cmake/FindPython/Support.cmake
 delete mode 100644 tools/cmake/FindPython3.cmake

diff --git a/tools/cmake/FindPython/Support.cmake b/tools/cmake/FindPython/Support.cmake
deleted file mode 100644
index a73edac70c6..00000000000
--- a/tools/cmake/FindPython/Support.cmake
+++ /dev/null
@@ -1,925 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#
-# This file is a "template" file used by various FindPython modules.
-#
-
-cmake_policy (VERSION 3.7)
-
-#
-# Initial configuration
-#
-if (NOT DEFINED _PYTHON_PREFIX)
-  message (FATAL_ERROR "FindPython: INTERNAL ERROR")
-endif()
-if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
-  message (FATAL_ERROR "FindPython: INTERNAL ERROR")
-endif()
-if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 3)
-  set(_${_PYTHON_PREFIX}_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL 2)
-  set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-else()
-  message (FATAL_ERROR "FindPython: INTERNAL ERROR")
-endif()
-
-
-#
-# helper commands
-#
-macro (_PYTHON_DISPLAY_FAILURE _PYTHON_MSG)
-  if (${_PYTHON_PREFIX}_FIND_REQUIRED)
-    message (FATAL_ERROR "${_PYTHON_MSG}")
-  else()
-    if (NOT ${_PYTHON_PREFIX}_FIND_QUIETLY)
-      message(STATUS "${_PYTHON_MSG}")
-    endif ()
-  endif()
-
-  set (${_PYTHON_PREFIX}_FOUND FALSE)
-  string (TOUPPER "${_PYTHON_PREFIX}" _${_PYTHON_PREFIX}_UPPER_PREFIX)
-  set (${_PYTHON_UPPER_PREFIX}_FOUND FALSE)
-  return()
-endmacro()
-
-
-function (_PYTHON_GET_FRAMEWORKS _PYTHON_PGF_FRAMEWORK_PATHS _PYTHON_VERSION)
-  set (_PYTHON_FRAMEWORK_PATHS)
-  foreach (_PYTHON_FRAMEWORK IN LISTS Python_FRAMEWORKS)
-    list (APPEND _PYTHON_FRAMEWORK_PATHS
-            "${_PYTHON_FRAMEWORK}/Versions/${_PYTHON_VERSION}")
-  endforeach()
-  set (${_PYTHON_PGF_FRAMEWORK_PATHS} ${_PYTHON_FRAMEWORK_PATHS} PARENT_SCOPE)
-endfunction()
-
-
-function (_PYTHON_VALIDATE_INTERPRETER)
-  if (NOT ${_PYTHON_PREFIX}_EXECUTABLE)
-    return()
-  endif()
-
-  if (${_PYTHON_PREFIX}_EXECUTABLE MATCHES "python${CMAKE_EXECUTABLE_SUFFIX}$")
-    # executable found do not have version in name
-    # ensure major version is OK
-    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
-            "import sys; sys.stdout.write(str(sys.version_info[0]))"
-            RESULT_VARIABLE result
-            OUTPUT_VARIABLE version
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (result OR NOT version EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
-      # interpreter not usable or has wrong major version
-      set (${_PYTHON_PREFIX}_EXECUTABLE ${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND CACHE INTERNAL "" FORCE)
-      return()
-    endif()
-  endif()
-
-  if (CMAKE_SIZEOF_VOID_P AND "Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
-          AND NOT CMAKE_CROSSCOMPILING)
-    # In this case, interpreter must have same architecture as environment
-    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
-            "import sys, struct; sys.stdout.write(str(struct.calcsize(\"P\")))"
-            RESULT_VARIABLE result
-            OUTPUT_VARIABLE size
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (result OR NOT size EQUAL CMAKE_SIZEOF_VOID_P)
-      # interpreter not usable or has wrong architecture
-      set (${_PYTHON_PREFIX}_EXECUTABLE ${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND CACHE INTERNAL "" FORCE)
-      return()
-    endif()
-  endif()
-endfunction()
-
-
-function (_PYTHON_FIND_RUNTIME_LIBRARY _PYTHON_LIB)
-  string (REPLACE "_RUNTIME" "" _PYTHON_LIB "${_PYTHON_LIB}")
-  # look at runtime part on systems supporting it
-  if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR
-  (CMAKE_SYSTEM_NAME MATCHES "MSYS|CYGWIN"
-          AND ${_PYTHON_LIB} MATCHES "${CMAKE_IMPORT_LIBRARY_SUFFIX}$"))
-    set (CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
-    # MSYS has a special syntax for runtime libraries
-    if (CMAKE_SYSTEM_NAME MATCHES "MSYS")
-      list (APPEND CMAKE_FIND_LIBRARY_PREFIXES "msys-")
-    endif()
-    find_library (${ARGV})
-  endif()
-endfunction()
-
-
-function (_PYTHON_SET_LIBRARY_DIRS _PYTHON_SLD_RESULT)
-  unset (_PYTHON_DIRS)
-  set (_PYTHON_LIBS ${ARGV})
-  list (REMOVE_AT _PYTHON_LIBS 0)
-  foreach (_PYTHON_LIB IN LISTS _PYTHON_LIBS)
-    if (${_PYTHON_LIB})
-      get_filename_component (_PYTHON_DIR "${${_PYTHON_LIB}}" DIRECTORY)
-      list (APPEND _PYTHON_DIRS "${_PYTHON_DIR}")
-    endif()
-  endforeach()
-  if (_PYTHON_DIRS)
-    list (REMOVE_DUPLICATES _PYTHON_DIRS)
-  endif()
-  set (${_PYTHON_SLD_RESULT} ${_PYTHON_DIRS} PARENT_SCOPE)
-endfunction()
-
-
-# If major version is specified, it must be the same as internal major version
-if (DEFINED ${_PYTHON_PREFIX}_FIND_VERSION_MAJOR
-        AND NOT ${_PYTHON_PREFIX}_FIND_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
-  _python_display_failure ("Could NOT find ${_PYTHON_PREFIX}: Wrong major version specified is \"${${_PYTHON_PREFIX}_FIND_VERSION_MAJOR}\", but expected major version is \"${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}\"")
-endif()
-
-
-# handle components
-if (NOT ${_PYTHON_PREFIX}_FIND_COMPONENTS)
-  set (${_PYTHON_PREFIX}_FIND_COMPONENTS Interpreter)
-  set (${_PYTHON_PREFIX}_FIND_REQUIRED_Interpreter TRUE)
-endif()
-foreach (_${_PYTHON_PREFIX}_COMPONENT IN LISTS ${_PYTHON_PREFIX}_FIND_COMPONENTS)
-  set (${_PYTHON_PREFIX}_${_${_PYTHON_PREFIX}_COMPONENT}_FOUND FALSE)
-endforeach()
-unset (_${_PYTHON_PREFIX}_FIND_VERSIONS)
-
-# Set versions to search
-## default: search any version
-set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${_${_PYTHON_PREFIX}_VERSIONS})
-
-if (${_PYTHON_PREFIX}_FIND_VERSION_COUNT GREATER 1)
-  if (${_PYTHON_PREFIX}_FIND_VERSION_EXACT)
-    set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_FIND_VERSION_MAJOR}.${${_PYTHON_PREFIX}_FIND_VERSION_MINOR})
-  else()
-    unset (_${_PYTHON_PREFIX}_FIND_VERSIONS)
-    # add all compatible versions
-    foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_VERSIONS)
-      if (_${_PYTHON_PREFIX}_VERSION VERSION_GREATER_EQUAL ${_PYTHON_PREFIX}_FIND_VERSION)
-        list (APPEND _${_PYTHON_PREFIX}_FIND_VERSIONS ${_${_PYTHON_PREFIX}_VERSION})
-      endif()
-    endforeach()
-  endif()
-endif()
-
-# Anaconda distribution: define which architectures can be used
-if (CMAKE_SIZEOF_VOID_P)
-  # In this case, search only for 64bit or 32bit
-  math (EXPR _${_PYTHON_PREFIX}_ARCH "${CMAKE_SIZEOF_VOID_P} * 8")
-  set (_${_PYTHON_PREFIX}_ARCH2 ${_${_PYTHON_PREFIX}_ARCH})
-else()
-  # architecture unknown, search for both 64bit and 32bit
-  set (_${_PYTHON_PREFIX}_ARCH 64)
-  set (_${_PYTHON_PREFIX}_ARCH2 32)
-endif()
-
-# IronPython support
-if (CMAKE_SIZEOF_VOID_P)
-  # In this case, search only for 64bit or 32bit
-  math (EXPR _${_PYTHON_PREFIX}_ARCH "${CMAKE_SIZEOF_VOID_P} * 8")
-  set (_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES ipy${_${_PYTHON_PREFIX}_ARCH} ipy)
-else()
-  # architecture unknown, search for natural interpreter
-  set (_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES ipy)
-endif()
-
-# Apple frameworks handling
-include (${CMAKE_CURRENT_LIST_DIR}/../CMakeFindFrameworks.cmake)
-cmake_find_frameworks (Python)
-
-# Save CMAKE_FIND_FRAMEWORK
-if (DEFINED CMAKE_FIND_FRAMEWORK)
-  set (_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
-else()
-  unset (_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK)
-endif()
-# To avoid picking up the system elements pre-maturely.
-set (CMAKE_FIND_FRAMEWORK LAST)
-
-
-unset (_${_PYTHON_PREFIX}_REQUIRED_VARS)
-unset (_${_PYTHON_PREFIX}_CACHED_VARS)
-
-
-# first step, search for the interpreter
-if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
-  if (${_PYTHON_PREFIX}_FIND_REQUIRED_Interpreter)
-    list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_EXECUTABLE)
-    list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_EXECUTABLE)
-  endif()
-
-  set (_${_PYTHON_PREFIX}_HINTS "${${_PYTHON_PREFIX}_ROOT_DIR}" ENV ${_PYTHON_PREFIX}_ROOT_DIR)
-
-  # look-up for various versions and locations
-  foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
-    string (REPLACE "." "" _${_PYTHON_PREFIX}_VERSION_NO_DOTS ${_${_PYTHON_PREFIX}_VERSION})
-
-    _python_get_frameworks (_${_PYTHON_PREFIX}_FRAMEWORK_PATHS ${_${_PYTHON_PREFIX}_VERSION})
-
-    # try using HINTS
-    find_program (${_PYTHON_PREFIX}_EXECUTABLE
-            NAMES python${_${_PYTHON_PREFIX}_VERSION}
-            NAMES_PER_DIR
-            HINTS ${_${_PYTHON_PREFIX}_HINTS}
-            PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
-            PATH_SUFFIXES bin
-            NO_SYSTEM_ENVIRONMENT_PATH
-            NO_CMAKE_SYSTEM_PATH)
-    # try using registry
-    if (WIN32)
-      find_program (${_PYTHON_PREFIX}_EXECUTABLE
-              NAMES python${_${_PYTHON_PREFIX}_VERSION} python
-              ${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
-              NAMES_PER_DIR
-              HINTS ${_${_PYTHON_PREFIX}_HINTS}
-              PATHS [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-              [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-              [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH2}\\InstallPath]
-              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH2}\\InstallPath]
-              [HKEY_LOCAL_MACHINE\\SOFTWARE\\IronPython\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-              PATH_SUFFIXES bin
-              NO_SYSTEM_ENVIRONMENT_PATH
-              NO_CMAKE_SYSTEM_PATH)
-    endif()
-    # try in standard paths
-    find_program (${_PYTHON_PREFIX}_EXECUTABLE
-            NAMES python${_${_PYTHON_PREFIX}_VERSION})
-
-    _python_validate_interpreter ()
-    if (${_PYTHON_PREFIX}_EXECUTABLE)
-      break()
-    endif()
-  endforeach()
-
-  # try more generic names
-  if (NOT ${_PYTHON_PREFIX}_EXECUTABLE)
-    find_program (${_PYTHON_PREFIX}_EXECUTABLE
-            NAMES python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR} python
-            ${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
-            HINTS ${_${_PYTHON_PREFIX}_HINTS}
-            PATH_SUFFIXES bin)
-
-    _python_validate_interpreter ()
-  endif()
-
-  # retrieve exact version of executable found
-  if (${_PYTHON_PREFIX}_EXECUTABLE)
-    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
-            "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:3]]))"
-            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-            OUTPUT_VARIABLE ${_PYTHON_PREFIX}_VERSION
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (NOT _${_PYTHON_PREFIX}_RESULT)
-      string (REGEX MATCHALL "[0-9]+" _${_PYTHON_PREFIX}_VERSIONS "${${_PYTHON_PREFIX}_VERSION}")
-      list (GET _${_PYTHON_PREFIX}_VERSIONS 0 ${_PYTHON_PREFIX}_VERSION_MAJOR)
-      list (GET _${_PYTHON_PREFIX}_VERSIONS 1 ${_PYTHON_PREFIX}_VERSION_MINOR)
-      list (GET _${_PYTHON_PREFIX}_VERSIONS 2 ${_PYTHON_PREFIX}_VERSION_PATCH)
-    else()
-      # Interpreter is not usable
-      set (${_PYTHON_PREFIX}_EXECUTABLE ${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND CACHE INTERNAL "" FORCE)
-      unset (${_PYTHON_PREFIX}_VERSION)
-    endif()
-  endif()
-
-  if (${_PYTHON_PREFIX}_EXECUTABLE
-          AND ${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
-    set (${_PYTHON_PREFIX}_Interpreter_FOUND TRUE)
-    # Use interpreter version for future searches to ensure consistency
-    set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
-  endif()
-
-  if (${_PYTHON_PREFIX}_Interpreter_FOUND)
-    # retrieve interpreter identity
-    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -V
-            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-            OUTPUT_VARIABLE ${_PYTHON_PREFIX}_INTERPRETER_ID
-            ERROR_VARIABLE ${_PYTHON_PREFIX}_INTERPRETER_ID)
-    if (NOT _${_PYTHON_PREFIX}_RESULT)
-      if (${_PYTHON_PREFIX}_INTERPRETER_ID MATCHES "Anaconda")
-        set (${_PYTHON_PREFIX}_INTERPRETER_ID "Anaconda")
-      elseif (${_PYTHON_PREFIX}_INTERPRETER_ID MATCHES "Enthought")
-        set (${_PYTHON_PREFIX}_INTERPRETER_ID "Canopy")
-      else()
-        string (REGEX REPLACE "^([^ ]+).*" "\\1" ${_PYTHON_PREFIX}_INTERPRETER_ID "${${_PYTHON_PREFIX}_INTERPRETER_ID}")
-        if (${_PYTHON_PREFIX}_INTERPRETER_ID STREQUAL "Python")
-          # try to get a more precise ID
-          execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c "import sys; print(sys.copyright)"
-                  RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-                  OUTPUT_VARIABLE ${_PYTHON_PREFIX}_COPYRIGHT
-                  ERROR_QUIET)
-          if (${_PYTHON_PREFIX}_COPYRIGHT MATCHES "ActiveState")
-            set (${_PYTHON_PREFIX}_INTERPRETER_ID "ActivePython")
-          endif()
-        endif()
-      endif()
-    else()
-      set (${_PYTHON_PREFIX}_INTERPRETER_ID Python)
-    endif()
-  else()
-    unset (${_PYTHON_PREFIX}_INTERPRETER_ID)
-  endif()
-
-  # retrieve various package installation directories
-  execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c "import sys; from distutils import sysconfig;sys.stdout.write(';'.join([sysconfig.get_python_lib(plat_specific=False,standard_lib=True),sysconfig.get_python_lib(plat_specific=True,standard_lib=True),sysconfig.get_python_lib(plat_specific=False,standard_lib=False),sysconfig.get_python_lib(plat_specific=True,standard_lib=False)]))"
-
-          RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-          OUTPUT_VARIABLE _${_PYTHON_PREFIX}_LIBPATHS
-          ERROR_QUIET)
-  if (NOT _${_PYTHON_PREFIX}_RESULT)
-    list (GET _${_PYTHON_PREFIX}_LIBPATHS 0 ${_PYTHON_PREFIX}_STDLIB)
-    list (GET _${_PYTHON_PREFIX}_LIBPATHS 1 ${_PYTHON_PREFIX}_STDARCH)
-    list (GET _${_PYTHON_PREFIX}_LIBPATHS 2 ${_PYTHON_PREFIX}_SITELIB)
-    list (GET _${_PYTHON_PREFIX}_LIBPATHS 3 ${_PYTHON_PREFIX}_SITEARCH)
-  else()
-    unset (${_PYTHON_PREFIX}_STDLIB)
-    unset (${_PYTHON_PREFIX}_STDARCH)
-    unset (${_PYTHON_PREFIX}_SITELIB)
-    unset (${_PYTHON_PREFIX}_SITEARCH)
-  endif()
-
-  mark_as_advanced (${_PYTHON_PREFIX}_EXECUTABLE)
-endif()
-
-
-# second step, search for compiler (IronPython)
-if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
-  if (${_PYTHON_PREFIX}_FIND_REQUIRED_Compiler)
-    list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_COMPILER)
-    list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_COMPILER)
-  endif()
-
-  # IronPython specific artifacts
-  # If IronPython interpreter is found, use its path
-  unset (_${_PYTHON_PREFIX}_IRON_ROOT)
-  if (${_PYTHON_PREFIX}_Interpreter_FOUND AND ${_PYTHON_PREFIX}_INTERPRETER_ID STREQUAL "IronPython")
-    get_filename_component (_${_PYTHON_PREFIX}_IRON_ROOT "${${_PYTHON_PREFIX}_EXECUTABLE}" DIRECTORY)
-  endif()
-
-  # try using root dir and registry
-  foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
-    find_program (${_PYTHON_PREFIX}_COMPILER
-            NAMES ipyc
-            HINTS ${_${_PYTHON_PREFIX}_IRON_ROOT} ${_${_PYTHON_PREFIX}_HINTS}
-            PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\IronPython\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-            NO_SYSTEM_ENVIRONMENT_PATH
-            NO_CMAKE_SYSTEM_PATH)
-    if (${_PYTHON_PREFIX}_COMPILER)
-      break()
-    endif()
-  endforeach()
-  # try in standard paths
-  find_program (${_PYTHON_PREFIX}_COMPILER
-          NAMES ipyc)
-
-  if (${_PYTHON_PREFIX}_COMPILER)
-    # retrieve python environment version from compiler
-    set (_${_PYTHON_PREFIX}_VERSION_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PythonCompilerVersion.dir")
-    file (WRITE "${_${_PYTHON_PREFIX}_VERSION_DIR}/version.py" "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:3]]))\n")
-    execute_process (COMMAND "${${_PYTHON_PREFIX}_COMPILER}" /target:exe /embed "${_${_PYTHON_PREFIX}_VERSION_DIR}/version.py"
-            WORKING_DIRECTORY "${_${_PYTHON_PREFIX}_VERSION_DIR}"
-            OUTPUT_QUIET
-            ERROR_QUIET)
-    execute_process (COMMAND "${_${_PYTHON_PREFIX}_VERSION_DIR}/version"
-            WORKING_DIRECTORY "${_${_PYTHON_PREFIX}_VERSION_DIR}"
-            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_VERSION
-            ERROR_QUIET)
-    if (NOT _${_PYTHON_PREFIX}_RESULT)
-      string (REGEX MATCHALL "[0-9]+" _${_PYTHON_PREFIX}_VERSIONS "${_${_PYTHON_PREFIX}_VERSION}")
-      list (GET _${_PYTHON_PREFIX}_VERSIONS 0 _${_PYTHON_PREFIX}_VERSION_MAJOR)
-      list (GET _${_PYTHON_PREFIX}_VERSIONS 1 _${_PYTHON_PREFIX}_VERSION_MINOR)
-      list (GET _${_PYTHON_PREFIX}_VERSIONS 2 _${_PYTHON_PREFIX}_VERSION_PATCH)
-
-      if (NOT ${_PYTHON_PREFIX}_Interpreter_FOUND)
-        # set public version information
-        set (${_PYTHON_PREFIX}_VERSION ${_${_PYTHON_PREFIX}_VERSION})
-        set (${_PYTHON_PREFIX}_VERSION_MAJOR ${_${_PYTHON_PREFIX}_VERSION_MAJOR})
-        set (${_PYTHON_PREFIX}_VERSION_MINOR ${_${_PYTHON_PREFIX}_VERSION_MINOR})
-        set (${_PYTHON_PREFIX}_VERSION_PATCH ${_${_PYTHON_PREFIX}_VERSION_PATCH})
-      endif()
-    else()
-      # compiler not usable
-      set (${_PYTHON_PREFIX}_COMPILER ${_PYTHON_PREFIX}_COMPILER-NOTFOUND CACHE INTERNAL "" FORCE)
-    endif()
-    file (REMOVE_RECURSE "${_${_PYTHON_PREFIX}_VERSION_DIR}")
-  endif()
-
-  if (${_PYTHON_PREFIX}_COMPILER)
-    if (${_PYTHON_PREFIX}_Interpreter_FOUND)
-      # Compiler must be compatible with interpreter
-      if (${_${_PYTHON_PREFIX}_VERSION_MAJOR}.${_${_PYTHON_PREFIX}_VERSION_MINOR} VERSION_EQUAL ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
-        set (${_PYTHON_PREFIX}_Compiler_FOUND TRUE)
-      endif()
-    elseif (${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
-      set (${_PYTHON_PREFIX}_Compiler_FOUND TRUE)
-      # Use compiler version for future searches to ensure consistency
-      set (_${_PYTHON_PREFIX}_FIND_VERSIONS ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
-    endif()
-  endif()
-
-  if (${_PYTHON_PREFIX}_Compiler_FOUND)
-    set (${_PYTHON_PREFIX}_COMPILER_ID IronPython)
-  else()
-    unset (${_PYTHON_PREFIX}_COMPILER_ID)
-  endif()
-
-  mark_as_advanced (${_PYTHON_PREFIX}_COMPILER)
-endif()
-
-
-# third step, search for the development artifacts
-## Development environment is not compatible with IronPython interpreter
-if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
-        AND NOT ${_PYTHON_PREFIX}_INTERPRETER_ID STREQUAL "IronPython")
-  if (${_PYTHON_PREFIX}_FIND_REQUIRED_Development)
-    list (APPEND _${_PYTHON_PREFIX}_REQUIRED_VARS ${_PYTHON_PREFIX}_LIBRARY
-            ${_PYTHON_PREFIX}_INCLUDE_DIR)
-    list (APPEND _${_PYTHON_PREFIX}_CACHED_VARS ${_PYTHON_PREFIX}_LIBRARY
-            ${_PYTHON_PREFIX}_LIBRARY_RELEASE
-            ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
-            ${_PYTHON_PREFIX}_LIBRARY_DEBUG
-            ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG
-            ${_PYTHON_PREFIX}_INCLUDE_DIR)
-  endif()
-
-  # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
-  unset (_${_PYTHON_PREFIX}_CMAKE_FIND_LIBRARY_SUFFIXES)
-  if (DEFINED ${_PYTHON_PREFIX}_USE_STATIC_LIBS AND NOT WIN32)
-    set(_${_PYTHON_PREFIX}_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-    if(${_PYTHON_PREFIX}_USE_STATIC_LIBS)
-      set (CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
-    else()
-      list (REMOVE_ITEM CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
-    endif()
-  else()
-  endif()
-
-  # if python interpreter is found, use its location and version to ensure consistency
-  # between interpreter and development environment
-  unset (_${_PYTHON_PREFIX}_PREFIX)
-  if (${_PYTHON_PREFIX}_Interpreter_FOUND)
-    execute_process (COMMAND "${${_PYTHON_PREFIX}_EXECUTABLE}" -c
-            "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.PREFIX)"
-            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_PREFIX
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (_${_PYTHON_PREFIX}_RESULT)
-      unset (_${_PYTHON_PREFIX}_PREFIX)
-    endif()
-  endif()
-  set (_${_PYTHON_PREFIX}_HINTS "${_${_PYTHON_PREFIX}_PREFIX}" "${${_PYTHON_PREFIX}_ROOT_DIR}" ENV ${_PYTHON_PREFIX}_ROOT_DIR)
-
-  foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
-    string (REPLACE "." "" _${_PYTHON_PREFIX}_VERSION_NO_DOTS ${_${_PYTHON_PREFIX}_VERSION})
-
-    # try to use pythonX.Y-config tool
-    set (_${_PYTHON_PREFIX}_CONFIG_NAMES)
-    if (DEFINED CMAKE_LIBRARY_ARCHITECTURE)
-      set (_${_PYTHON_PREFIX}_CONFIG_NAMES "${CMAKE_LIBRARY_ARCHITECTURE}-python${_${_PYTHON_PREFIX}_VERSION}-config")
-    endif()
-    list (APPEND _${_PYTHON_PREFIX}_CONFIG_NAMES "python${_${_PYTHON_PREFIX}_VERSION}-config")
-    find_program (_${_PYTHON_PREFIX}_CONFIG
-            NAMES ${_${_PYTHON_PREFIX}_CONFIG_NAMES}
-            HINTS ${_${_PYTHON_PREFIX}_HINTS}
-            PATH_SUFFIXES bin)
-    unset (_${_PYTHON_PREFIX}_CONFIG_NAMES)
-
-    if (NOT _${_PYTHON_PREFIX}_CONFIG)
-      continue()
-    endif()
-
-    # retrieve root install directory
-    execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --prefix
-            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_PREFIX
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (_${_PYTHON_PREFIX}_RESULT)
-      # python-config is not usable
-      unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
-      continue()
-    endif()
-    set (_${_PYTHON_PREFIX}_HINTS "${_${_PYTHON_PREFIX}_PREFIX}" "${${_PYTHON_PREFIX}_ROOT_DIR}" ENV ${_PYTHON_PREFIX}_ROOT_DIR)
-
-    # retrieve library
-    execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --ldflags
-            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_FLAGS
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (NOT _${_PYTHON_PREFIX}_RESULT)
-      # retrieve library directory
-      string (REGEX MATCHALL "-L[^ ]+" _${_PYTHON_PREFIX}_LIB_DIRS "${_${_PYTHON_PREFIX}_FLAGS}")
-      string (REPLACE "-L" "" _${_PYTHON_PREFIX}_LIB_DIRS "${_${_PYTHON_PREFIX}_LIB_DIRS}")
-      list (REMOVE_DUPLICATES _${_PYTHON_PREFIX}_LIB_DIRS)
-      # retrieve library name
-      string (REGEX MATCHALL "-lpython[^ ]+" _${_PYTHON_PREFIX}_LIB_NAMES "${_${_PYTHON_PREFIX}_FLAGS}")
-      string (REPLACE "-l" "" _${_PYTHON_PREFIX}_LIB_NAMES "${_${_PYTHON_PREFIX}_LIB_NAMES}")
-      list (REMOVE_DUPLICATES _${_PYTHON_PREFIX}_LIB_NAMES)
-
-      find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
-              NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES}
-              NAMES_PER_DIR
-              HINTS ${_${_PYTHON_PREFIX}_HINTS} ${_${_PYTHON_PREFIX}_LIB_DIRS}
-              PATH_SUFFIXES lib
-              NO_SYSTEM_ENVIRONMENT_PATH
-              NO_CMAKE_SYSTEM_PATH)
-      # retrieve runtime library
-      if (${_PYTHON_PREFIX}_LIBRARY_RELEASE)
-        get_filename_component (_${_PYTHON_PREFIX}_PATH "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}" DIRECTORY)
-        _python_find_runtime_library (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
-                NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES}
-                NAMES_PER_DIR
-                HINTS ${_${_PYTHON_PREFIX}_PATH} ${_${_PYTHON_PREFIX}_HINTS}
-                PATH_SUFFIXES bin
-                NO_SYSTEM_ENVIRONMENT_PATH
-                NO_CMAKE_SYSTEM_PATH)
-      endif()
-    endif()
-
-    # retrieve include directory
-    execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --includes
-            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_FLAGS
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (NOT _${_PYTHON_PREFIX}_RESULT)
-      # retrieve include directory
-      string (REGEX MATCHALL "-I[^ ]+" _${_PYTHON_PREFIX}_INCLUDE_DIRS "${_${_PYTHON_PREFIX}_FLAGS}")
-      string (REPLACE "-I" "" _${_PYTHON_PREFIX}_INCLUDE_DIRS "${_${_PYTHON_PREFIX}_INCLUDE_DIRS}")
-      list (REMOVE_DUPLICATES _${_PYTHON_PREFIX}_INCLUDE_DIRS)
-
-      find_path (${_PYTHON_PREFIX}_INCLUDE_DIR
-              NAMES Python.h
-              HINTS ${_${_PYTHON_PREFIX}_INCLUDE_DIRS}
-              NO_SYSTEM_ENVIRONMENT_PATH
-              NO_CMAKE_SYSTEM_PATH)
-    endif()
-
-    if (${_PYTHON_PREFIX}_LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_INCLUDE_DIR)
-      break()
-    endif()
-  endforeach()
-
-  # Rely on HINTS and standard paths if config tool failed to locate artifacts
-  if (NOT (${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG) OR NOT ${_PYTHON_PREFIX}_INCLUDE_DIR)
-    foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
-      string (REPLACE "." "" _${_PYTHON_PREFIX}_VERSION_NO_DOTS ${_${_PYTHON_PREFIX}_VERSION})
-
-      _python_get_frameworks (_${_PYTHON_PREFIX}_FRAMEWORK_PATHS ${_${_PYTHON_PREFIX}_VERSION})
-
-      # search first in known locations
-      find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
-              NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}
-              python${_${_PYTHON_PREFIX}_VERSION}mu
-              python${_${_PYTHON_PREFIX}_VERSION}m
-              python${_${_PYTHON_PREFIX}_VERSION}u
-              python${_${_PYTHON_PREFIX}_VERSION}
-              NAMES_PER_DIR
-              HINTS ${_${_PYTHON_PREFIX}_HINTS}
-              PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
-              [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-              [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-              [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-              PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE} lib libs
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}mu
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}m
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}u
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config
-              NO_SYSTEM_ENVIRONMENT_PATH
-              NO_CMAKE_SYSTEM_PATH)
-      # search in all default paths
-      find_library (${_PYTHON_PREFIX}_LIBRARY_RELEASE
-              NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}
-              python${_${_PYTHON_PREFIX}_VERSION}mu
-              python${_${_PYTHON_PREFIX}_VERSION}m
-              python${_${_PYTHON_PREFIX}_VERSION}u
-              python${_${_PYTHON_PREFIX}_VERSION}
-              NAMES_PER_DIR
-              PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE} lib libs
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}mu
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}m
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}u
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config-${_${_PYTHON_PREFIX}_VERSION}
-              lib/python${_${_PYTHON_PREFIX}_VERSION}/config)
-      # retrieve runtime library
-      if (${_PYTHON_PREFIX}_LIBRARY_RELEASE)
-        get_filename_component (_${_PYTHON_PREFIX}_PATH "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}" DIRECTORY)
-        _python_find_runtime_library (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
-                NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}
-                python${_${_PYTHON_PREFIX}_VERSION}mu
-                python${_${_PYTHON_PREFIX}_VERSION}m
-                python${_${_PYTHON_PREFIX}_VERSION}u
-                python${_${_PYTHON_PREFIX}_VERSION}
-                NAMES_PER_DIR
-                HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS}
-                PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
-                [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-                [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                PATH_SUFFIXES bin)
-      endif()
-
-      if (WIN32)
-        # search for debug library
-        if (${_PYTHON_PREFIX}_LIBRARY_RELEASE)
-          # use library location as a hint
-          get_filename_component (_${_PYTHON_PREFIX}_PATH "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}" DIRECTORY)
-          find_library (${_PYTHON_PREFIX}_LIBRARY_DEBUG
-                  NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}_d
-                  NAMES_PER_DIR
-                  HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS}
-                  NO_DEFAULT_PATH)
-        else()
-          # search first in known locations
-          find_library (${_PYTHON_PREFIX}_LIBRARY_DEBUG
-                  NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}_d
-                  NAMES_PER_DIR
-                  HINTS ${_${_PYTHON_PREFIX}_HINTS}
-                  PATHS [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-                  [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-                  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                  PATH_SUFFIXES lib libs
-                  NO_SYSTEM_ENVIRONMENT_PATH
-                  NO_CMAKE_SYSTEM_PATH)
-          # search in all default paths
-          find_library (${_PYTHON_PREFIX}_LIBRARY_DEBUG
-                  NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}_d
-                  NAMES_PER_DIR
-                  PATH_SUFFIXES lib libs)
-        endif()
-        if (${_PYTHON_PREFIX}_LIBRARY_DEBUG)
-          get_filename_component (_${_PYTHON_PREFIX}_PATH "${${_PYTHON_PREFIX}_LIBRARY_DEBUG}" DIRECTORY)
-          _python_find_runtime_library (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG
-                  NAMES python${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}_d
-                  NAMES_PER_DIR
-                  HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS}
-                  PATHS [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-                  [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-                  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                  PATH_SUFFIXES bin)
-        endif()
-      endif()
-
-      # Don't search for include dir until library location is known
-      if (${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
-        unset (_${_PYTHON_PREFIX}_INCLUDE_HINTS)
-        foreach (_${_PYTHON_PREFIX}_LIB IN ITEMS ${_PYTHON_PREFIX}_LIBRARY_RELEASE ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
-          if (${_${_PYTHON_PREFIX}_LIB})
-            # Use the library's install prefix as a hint
-            if (${_${_PYTHON_PREFIX}_LIB} MATCHES "^(.+/Frameworks/Python.framework/Versions/[0-9.]+)")
-              list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${CMAKE_MATCH_1}")
-            elseif (${_${_PYTHON_PREFIX}_LIB} MATCHES "^(.+)/lib(64|32)?/python[0-9.]+/config")
-              list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${CMAKE_MATCH_1}")
-            elseif (DEFINED CMAKE_LIBRARY_ARCHITECTURE AND ${_${_PYTHON_PREFIX}_LIB} MATCHES "^(.+)/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-              list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${CMAKE_MATCH_1}")
-            else()
-              # assume library is in a directory under root
-              get_filename_component (_${_PYTHON_PREFIX}_PREFIX "${${_${_PYTHON_PREFIX}_LIB}}" DIRECTORY)
-              get_filename_component (_${_PYTHON_PREFIX}_PREFIX "${_${_PYTHON_PREFIX}_PREFIX}" DIRECTORY)
-              list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${_${_PYTHON_PREFIX}_PREFIX}")
-            endif()
-          endif()
-        endforeach()
-        list (REMOVE_DUPLICATES _${_PYTHON_PREFIX}_INCLUDE_HINTS)
-
-        find_path (${_PYTHON_PREFIX}_INCLUDE_DIR
-                NAMES Python.h
-                HINTS ${_${_PYTHON_PREFIX}_INCLUDE_HINTS} ${_${_PYTHON_PREFIX}_HINTS}
-                PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
-                [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-                [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_${_PYTHON_PREFIX}_VERSION}\\InstallPath]
-                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${_${_PYTHON_PREFIX}_VERSION_NO_DOTS}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                PATH_SUFFIXES include/python${_${_PYTHON_PREFIX}_VERSION}mu
-                include/python${_${_PYTHON_PREFIX}_VERSION}m
-                include/python${_${_PYTHON_PREFIX}_VERSION}u
-                include/python${_${_PYTHON_PREFIX}_VERSION}
-                include
-                NO_SYSTEM_ENVIRONMENT_PATH
-                NO_CMAKE_SYSTEM_PATH)
-      endif()
-
-      if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG) AND ${_PYTHON_PREFIX}_INCLUDE_DIR)
-        break()
-      endif()
-    endforeach()
-
-    # search header file in standard locations
-    find_path (${_PYTHON_PREFIX}_INCLUDE_DIR
-            NAMES Python.h)
-  endif()
-
-  if (${_PYTHON_PREFIX}_INCLUDE_DIR)
-    # retrieve version from header file
-    file (STRINGS "${${_PYTHON_PREFIX}_INCLUDE_DIR}/patchlevel.h" _${_PYTHON_PREFIX}_VERSION
-            REGEX "^#define[ \t]+PY_VERSION[ \t]+\"[^\"]+\"")
-    string (REGEX REPLACE "^#define[ \t]+PY_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
-            _${_PYTHON_PREFIX}_VERSION "${_${_PYTHON_PREFIX}_VERSION}")
-    string (REGEX MATCHALL "[0-9]+" _${_PYTHON_PREFIX}_VERSIONS "${_${_PYTHON_PREFIX}_VERSION}")
-    list (GET _${_PYTHON_PREFIX}_VERSIONS 0 _${_PYTHON_PREFIX}_VERSION_MAJOR)
-    list (GET _${_PYTHON_PREFIX}_VERSIONS 1 _${_PYTHON_PREFIX}_VERSION_MINOR)
-    list (GET _${_PYTHON_PREFIX}_VERSIONS 2 _${_PYTHON_PREFIX}_VERSION_PATCH)
-
-    if (NOT ${_PYTHON_PREFIX}_Interpreter_FOUND AND NOT ${_PYTHON_PREFIX}_Compiler_FOUND)
-      # set public version information
-      set (${_PYTHON_PREFIX}_VERSION ${_${_PYTHON_PREFIX}_VERSION})
-      set (${_PYTHON_PREFIX}_VERSION_MAJOR ${_${_PYTHON_PREFIX}_VERSION_MAJOR})
-      set (${_PYTHON_PREFIX}_VERSION_MINOR ${_${_PYTHON_PREFIX}_VERSION_MINOR})
-      set (${_PYTHON_PREFIX}_VERSION_PATCH ${_${_PYTHON_PREFIX}_VERSION_PATCH})
-    endif()
-  endif()
-
-  # define public variables
-  include (${CMAKE_CURRENT_LIST_DIR}/../SelectLibraryConfigurations.cmake)
-  select_library_configurations (${_PYTHON_PREFIX})
-  if (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE)
-    set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE}")
-  elseif (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG)
-    set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG}")
-  else()
-    set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY "$${_PYTHON_PREFIX}_RUNTIME_LIBRARY-NOTFOUND")
-  endif()
-
-  _python_set_library_dirs (${_PYTHON_PREFIX}_LIBRARY_DIRS
-          ${_PYTHON_PREFIX}_LIBRARY_RELEASE ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
-  if (UNIX)
-    if (${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$"
-            OR ${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$")
-      set (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DIRS ${${_PYTHON_PREFIX}_LIBRARY_DIRS})
-    endif()
-  else()
-    _python_set_library_dirs (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DIRS
-            ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG)
-  endif()
-
-  set (${_PYTHON_PREFIX}_INCLUDE_DIRS "${${_PYTHON_PREFIX}_INCLUDE_DIR}")
-
-  mark_as_advanced (${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE
-          ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG
-          ${_PYTHON_PREFIX}_INCLUDE_DIR)
-
-  if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
-          AND ${_PYTHON_PREFIX}_INCLUDE_DIR)
-    if (${_PYTHON_PREFIX}_Interpreter_FOUND OR ${_PYTHON_PREFIX}_Compiler_FOUND)
-      # development environment must be compatible with interpreter/compiler
-      if (${_${_PYTHON_PREFIX}_VERSION_MAJOR}.${_${_PYTHON_PREFIX}_VERSION_MINOR} VERSION_EQUAL ${${_PYTHON_PREFIX}_VERSION_MAJOR}.${${_PYTHON_PREFIX}_VERSION_MINOR})
-        set (${_PYTHON_PREFIX}_Development_FOUND TRUE)
-      endif()
-    elseif (${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
-      set (${_PYTHON_PREFIX}_Development_FOUND TRUE)
-    endif()
-  endif()
-
-  # Restore the original find library ordering
-  if (DEFINED _${_PYTHON_PREFIX}_CMAKE_FIND_LIBRARY_SUFFIXES)
-    set (CMAKE_FIND_LIBRARY_SUFFIXES ${_${_PYTHON_PREFIX}_CMAKE_FIND_LIBRARY_SUFFIXES})
-  endif()
-endif()
-
-# final validation
-if (${_PYTHON_PREFIX}_VERSION_MAJOR AND
-        NOT ${_PYTHON_PREFIX}_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
-  _python_display_failure ("Could NOT find ${_PYTHON_PREFIX}: Found unsuitable major version \"${${_PYTHON_PREFIX}_VERSION_MAJOR}\", but required major version is exact version \"${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}\"")
-endif()
-
-include (${CMAKE_CURRENT_LIST_DIR}/../FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args (${_PYTHON_PREFIX}
-        REQUIRED_VARS ${_${_PYTHON_PREFIX}_REQUIRED_VARS}
-        VERSION_VAR ${_PYTHON_PREFIX}_VERSION
-        HANDLE_COMPONENTS)
-
-# Create imported targets and helper functions
-if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
-        AND ${_PYTHON_PREFIX}_Interpreter_FOUND
-        AND NOT TARGET ${_PYTHON_PREFIX}::Interpreter)
-  add_executable (${_PYTHON_PREFIX}::Interpreter IMPORTED)
-  set_property (TARGET ${_PYTHON_PREFIX}::Interpreter
-          PROPERTY IMPORTED_LOCATION "${${_PYTHON_PREFIX}_EXECUTABLE}")
-endif()
-
-if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
-        AND ${_PYTHON_PREFIX}_Compiler_FOUND
-        AND NOT TARGET ${_PYTHON_PREFIX}::Compiler)
-  add_executable (${_PYTHON_PREFIX}::Compiler IMPORTED)
-  set_property (TARGET ${_PYTHON_PREFIX}::Compiler
-          PROPERTY IMPORTED_LOCATION "${${_PYTHON_PREFIX}_COMPILER}")
-endif()
-
-if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
-        AND ${_PYTHON_PREFIX}_Development_FOUND AND NOT TARGET ${_PYTHON_PREFIX}::Python)
-
-  if (${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$"
-          OR ${_PYTHON_PREFIX}_LIBRARY_DEBUG MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$"
-          OR ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE OR ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG)
-    set (_${_PYTHON_PREFIX}_LIBRARY_TYPE SHARED)
-  else()
-    set (_${_PYTHON_PREFIX}_LIBRARY_TYPE STATIC)
-  endif()
-
-  add_library (${_PYTHON_PREFIX}::Python ${_${_PYTHON_PREFIX}_LIBRARY_TYPE} IMPORTED)
-
-  set_property (TARGET ${_PYTHON_PREFIX}::Python
-          PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${${_PYTHON_PREFIX}_INCLUDE_DIR}")
-
-  if ((${_PYTHON_PREFIX}_LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE)
-          OR (${_PYTHON_PREFIX}_LIBRARY_DEBUG AND ${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG))
-    # System manage shared libraries in two parts: import and runtime
-    if (${_PYTHON_PREFIX}_LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
-      set_property (TARGET ${_PYTHON_PREFIX}::Python PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-      set_target_properties (${_PYTHON_PREFIX}::Python
-              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
-              IMPORTED_IMPLIB_RELEASE "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}"
-              IMPORTED_LOCATION_RELEASE "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY_RELEASE}")
-      set_target_properties (${_PYTHON_PREFIX}::Python
-              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
-              IMPORTED_IMPLIB_DEBUG "${${_PYTHON_PREFIX}_LIBRARY_DEBUG}"
-              IMPORTED_LOCATION_DEBUG "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY_DEBUG}")
-    else()
-      set_target_properties (${_PYTHON_PREFIX}::Python
-              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-              IMPORTED_IMPLIB "${${_PYTHON_PREFIX}_LIBRARY}"
-              IMPORTED_LOCATION "${${_PYTHON_PREFIX}_RUNTIME_LIBRARY}")
-    endif()
-  else()
-    if (${_PYTHON_PREFIX}_LIBRARY_RELEASE AND ${_PYTHON_PREFIX}_LIBRARY_DEBUG)
-      set_property (TARGET ${_PYTHON_PREFIX}::Python PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG)
-      set_target_properties (${_PYTHON_PREFIX}::Python
-              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
-              IMPORTED_LOCATION_RELEASE "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}")
-      set_target_properties (${_PYTHON_PREFIX}::Python
-              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
-              IMPORTED_LOCATION_DEBUG "${${_PYTHON_PREFIX}_LIBRARY_DEBUG}")
-    else()
-      set_target_properties (${_PYTHON_PREFIX}::Python
-              PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-              IMPORTED_LOCATION "${${_PYTHON_PREFIX}_LIBRARY}")
-    endif()
-  endif()
-
-  if (_${_PYTHON_PREFIX}_CONFIG AND _${_PYTHON_PREFIX}_LIBRARY_TYPE STREQUAL "STATIC")
-    # extend link information with dependent libraries
-    execute_process (COMMAND "${_${_PYTHON_PREFIX}_CONFIG}" --ldflags
-            RESULT_VARIABLE _${_PYTHON_PREFIX}_RESULT
-            OUTPUT_VARIABLE _${_PYTHON_PREFIX}_FLAGS
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (NOT _${_PYTHON_PREFIX}_RESULT)
-      string (REGEX MATCHALL "-[Ll][^ ]+" _${_PYTHON_PREFIX}_LINK_LIBRARIES "${_${_PYTHON_PREFIX}_FLAGS}")
-      # remove elements relative to python library itself
-      list (FILTER _${_PYTHON_PREFIX}_LINK_LIBRARIES EXCLUDE REGEX "-lpython")
-      foreach (_${_PYTHON_PREFIX}_DIR IN LISTS ${_PYTHON_PREFIX}_LIBRARY_DIRS)
-        list (FILTER _${_PYTHON_PREFIX}_LINK_LIBRARIES EXCLUDE REGEX "-L${${_PYTHON_PREFIX}_DIR}")
-      endforeach()
-      set_property (TARGET ${_PYTHON_PREFIX}::Python
-              PROPERTY INTERFACE_LINK_LIBRARIES ${_${_PYTHON_PREFIX}_LINK_LIBRARIES})
-    endif()
-  endif()
-
-  #
-  # PYTHON_ADD_LIBRARY (<name> [STATIC|SHARED|MODULE] src1 src2 ... srcN)
-  # It is used to build modules for python.
-  #
-  function (__${_PYTHON_PREFIX}_ADD_LIBRARY prefix name)
-    cmake_parse_arguments (PARSE_ARGV 2 PYTHON_ADD_LIBRARY
-            "STATIC;SHARED;MODULE" "" "")
-
-    unset (type)
-    if (NOT (PYTHON_ADD_LIBRARY_STATIC
-            OR PYTHON_ADD_LIBRARY_SHARED
-            OR PYTHON_ADD_LIBRARY_MODULE))
-      set (type MODULE)
-    endif()
-    add_library (${name} ${type} ${ARGN})
-    target_link_libraries (${name} PRIVATE ${prefix}::Python)
-
-    # customize library name to follow module name rules
-    get_property (type TARGET ${name} PROPERTY TYPE)
-    if (type STREQUAL "MODULE_LIBRARY")
-      set_property (TARGET ${name} PROPERTY PREFIX "")
-      if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-        set_property (TARGET ${name} PROPERTY SUFFIX ".pyd")
-      endif()
-    endif()
-  endfunction()
-endif()
-
-# final clean-up
-
-# Restore CMAKE_FIND_FRAMEWORK
-if (DEFINED _${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK)
-  set (CMAKE_FIND_FRAMEWORK ${_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK})
-  unset (_${_PYTHON_PREFIX}_CMAKE_FIND_FRAMEWORK)
-else()
-  unset (CMAKE_FIND_FRAMEWORK)
-endif()
-
-unset (_${_PYTHON_PREFIX}_CONFIG CACHE)
\ No newline at end of file
diff --git a/tools/cmake/FindPython3.cmake b/tools/cmake/FindPython3.cmake
deleted file mode 100644
index 325aff57905..00000000000
--- a/tools/cmake/FindPython3.cmake
+++ /dev/null
@@ -1,146 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindPython3
------------
-
-Find Python 3 interpreter, compiler and development environment (include
-directories and libraries).
-
-Three components are supported:
-
-* ``Interpreter``: search for Python 3 interpreter
-* ``Compiler``: search for Python 3 compiler. Only offered by IronPython.
-* ``Development``: search for development artifacts (include directories and
-  libraries)
-
-If no ``COMPONENTS`` is specified, ``Interpreter`` is assumed.
-
-To ensure consistent versions between components ``Interpreter``, ``Compiler``
-and ``Development``, specify all components at the same time::
-
-  find_package (Python3 COMPONENTS Interpreter Development)
-
-This module looks only for version 3 of Python. This module can be used
-concurrently with :module:`FindPython2` module to use both Python versions.
-
-The :module:`FindPython` module can be used if Python version does not matter
-for you.
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-This module defines the following :ref:`Imported Targets <Imported Targets>`:
-
-``Python3::Interpreter``
-  Python 3 interpreter. Target defined if component ``Interpreter`` is found.
-``Python3::Compiler``
-  Python 3 compiler. Target defined if component ``Compiler`` is found.
-``Python3::Python``
-  Python 3 library. Target defined if component ``Development`` is found.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module will set the following variables in your project
-(see :ref:`Standard Variable Names <CMake Developer Standard Variable Names>`):
-
-``Python3_FOUND``
-  System has the Python 3 requested components.
-``Python3_Interpreter_FOUND``
-  System has the Python 3 interpreter.
-``Python3_EXECUTABLE``
-  Path to the Python 3 interpreter.
-``Python3_INTERPRETER_ID``
-  A short string unique to the interpreter. Possible values include:
-    * Python
-    * ActivePython
-    * Anaconda
-    * Canopy
-    * IronPython
-``Python3_STDLIB``
-  Standard platform independent installation directory.
-
-  Information returned by
-  ``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=True)``.
-``Python3_STDARCH``
-  Standard platform dependent installation directory.
-
-  Information returned by
-  ``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=True)``.
-``Python3_SITELIB``
-  Third-party platform independent installation directory.
-
-  Information returned by
-  ``distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=False)``.
-``Python3_SITEARCH``
-  Third-party platform dependent installation directory.
-
-  Information returned by
-  ``distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=False)``.
-``Python3_Compiler_FOUND``
-  System has the Python 3 compiler.
-``Python3_COMPILER``
-  Path to the Python 3 compiler. Only offered by IronPython.
-``Python3_COMPILER_ID``
-  A short string unique to the compiler. Possible values include:
-    * IronPython
-``Python3_Development_FOUND``
-  System has the Python 3 development artifacts.
-``Python3_INCLUDE_DIRS``
-  The Python 3 include directories.
-``Python3_LIBRARIES``
-  The Python 3 libraries.
-``Python3_LIBRARY_DIRS``
-  The Python 3 library directories.
-``Python3_RUNTIME_LIBRARY_DIRS``
-  The Python 3 runtime library directories.
-``Python3_VERSION``
-  Python 3 version.
-``Python3_VERSION_MAJOR``
-  Python 3 major version.
-``Python3_VERSION_MINOR``
-  Python 3 minor version.
-``Python3_VERSION_PATCH``
-  Python 3 patch version.
-
-Hints
-^^^^^
-
-``Python3_ROOT_DIR``
-  Define the root directory of a Python 3 installation.
-
-``Python3_USE_STATIC_LIBS``
-  * If not defined, search for shared libraries and static libraries in that
-    order.
-  * If set to TRUE, search **only** for static libraries.
-  * If set to FALSE, search **only** for shared libraries.
-
-Commands
-^^^^^^^^
-
-This module defines the command ``Python3_add_library`` which have the same
-semantic as :command:`add_library` but take care of Python module naming rules
-(only applied if library is of type ``MODULE``) and add dependency to target
-``Python3::Python``::
-
-  Python3_add_library (my_module MODULE src1.cpp)
-
-If library type is not specified, ``MODULE`` is assumed.
-#]=======================================================================]
-
-
-set (_PYTHON_PREFIX Python3)
-
-set (_Python3_REQUIRED_VERSION_MAJOR 3)
-
-include (${CMAKE_CURRENT_LIST_DIR}/FindPython/Support.cmake)
-
-if (COMMAND __Python3_add_library)
-  macro (Python3_add_library)
-    __Python3_add_library (Python3 ${ARGV})
-  endmacro()
-endif()
-
-unset (_PYTHON_PREFIX)
\ No newline at end of file

From 7e4e0db5bda0912495de14ae9ac12bad4dc3b1a4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 22 Nov 2024 20:01:23 +0100
Subject: [PATCH 1704/1963] fix(build): Fix caching of UA_FILE_NS0 variable

The caching lead reconfigurations in the CMake GUI to be ignored.
---
 CMakeLists.txt | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9f002f1f83..56af8ab86b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1115,17 +1115,22 @@ endif()
 set(UA_FILE_NODESETS) # List of nodeset-xml files to be considered in the generated information model
 set(UA_NODESET_DIR ${PROJECT_SOURCE_DIR}/deps/ua-nodeset CACHE STRING "The path to the node-set directory (e.g. from https://github.com/OPCFoundation/UA-Nodeset)")
 
+unset(UA_FILE_NS0_PRIVATE)
+if(UA_FILE_NS0)
+    set(UA_FILE_NS0_PRIVATE "${UA_FILE_NS0}")
+endif()
+
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
     # Use the "full" schema files also for datatypes and statuscodes
     set(UA_SCHEMA_DIR ${UA_NODESET_DIR}/Schema CACHE INTERNAL "")
 
     # Set the full Nodeset for NS0
-    if(NOT UA_FILE_NS0)
-        set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.xml CACHE INTERNAL "")
+    if(NOT UA_FILE_NS0_PRIVATE)
+        set(UA_FILE_NS0_PRIVATE ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.xml)
     endif()
 
     # Check that the submodule was checked out or manually downloaded into the folder
-    if(NOT EXISTS "${UA_FILE_NS0}")
+    if(NOT EXISTS "${UA_FILE_NS0_PRIVATE}")
         message(STATUS "Submodule update")
         execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
                         RESULT_VARIABLE GIT_SUBMOD_RESULT)
@@ -1138,8 +1143,8 @@ else()
     set(UA_SCHEMA_DIR ${PROJECT_SOURCE_DIR}/tools/schema CACHE INTERNAL "")
 
     # Set the reduced Nodeset for NS0
-    if(NOT UA_FILE_NS0)
-        set(UA_FILE_NS0 ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.Reduced.xml CACHE INTERNAL "")
+    if(NOT UA_FILE_NS0_PRIVATE)
+        set(UA_FILE_NS0_PRIVATE ${UA_SCHEMA_DIR}/Opc.Ua.NodeSet2.Reduced.xml CACHE INTERNAL "")
     endif()
 
     # Set feature-specific datatypes definitions and nodesets
@@ -1189,7 +1194,7 @@ else()
     endif()
 endif()
 
-list(INSERT UA_FILE_NODESETS 0 "${UA_FILE_NS0}")
+list(INSERT UA_FILE_NODESETS 0 "${UA_FILE_NS0_PRIVATE}")
 set(UA_FILE_NODEIDS ${UA_SCHEMA_DIR}/NodeIds.csv)
 set(UA_FILE_STATUSCODES ${UA_SCHEMA_DIR}/StatusCode.csv)
 set(UA_FILE_TYPES_BSD ${UA_SCHEMA_DIR}/Opc.Ua.Types.bsd)

From cd9088a079b3176f985bf0fb47fcfc943957697f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 13:39:11 +0100
Subject: [PATCH 1705/1963] refactor(plugins): Refactor out mbedtlsSameBuf to
 compare mbedTLS buffers

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 2abc1bf4323..301939f7d39 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -268,6 +268,13 @@ mbedtlsSameName(UA_String name, const mbedtls_x509_name *name2) {
     return UA_String_equal(&name, &nameString);
 }
 
+static UA_Boolean
+mbedtlsSameBuf(mbedtls_x509_buf *a, mbedtls_x509_buf *b) {
+    if(a->len != b->len)
+        return false;
+    return (memcmp(a->p, b->p, a->len) == 0);
+}
+
 /* Return the first matching issuer candidate AFTER prev.
  * This can return the cert itself if self-signed. */
 static mbedtls_x509_crt *
@@ -385,8 +392,7 @@ mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old
          * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
          * This signals that the chain is complete (but can be still
          * untrusted). */
-        if(issuer == cert || (cert->tbs.len == issuer->tbs.len &&
-                              memcmp(cert->tbs.p, issuer->tbs.p, cert->tbs.len) == 0)) {
+        if(issuer == cert || mbedtlsSameBuf(&cert->tbs, &issuer->tbs)) {
             ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
             continue;
         }
@@ -408,8 +414,7 @@ mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old
      * certificate "on the way down". Can we trust this certificate? */
     if(ret == UA_STATUSCODE_BADCERTIFICATEUNTRUSTED) {
         for(mbedtls_x509_crt *t = &ci->certificateTrustList; t; t = t->next) {
-            if(cert->tbs.len == t->tbs.len &&
-               memcmp(cert->tbs.p, t->tbs.p, cert->tbs.len) == 0)
+            if(mbedtlsSameBuf(&cert->tbs, &t->tbs))
                 return UA_STATUSCODE_GOOD;
         }
     }

From ff7dc78d2d1b42b2527a63c52d289ba1cf4bb303 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 17:13:51 +0100
Subject: [PATCH 1706/1963] refactor(plugins): Small cleanups in
 ua_pki_mbedtls.c

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 301939f7d39..eab87c15733 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -19,6 +19,9 @@
 #include <mbedtls/version.h>
 #include <string.h>
 
+#define UA_MBEDTLS_MAX_CHAIN_LENGTH 10
+#define UA_MBEDTLS_MAX_DN_LENGTH 256
+
 /* Find binary substring. Taken and adjusted from
  * http://tungchingkai.blogspot.com/2011/07/binary-strstr.html */
 
@@ -225,17 +228,11 @@ reloadCertificates(CertInfo *ci) {
         }
     }
 
-    if(internalErrorFlag) {
-        retval = UA_STATUSCODE_BADINTERNALERROR;
-    }
-    return retval;
+    return (internalErrorFlag) ? UA_STATUSCODE_BADINTERNALERROR : retval;
 }
 
 #endif
 
-#define UA_MBEDTLS_MAX_CHAIN_LENGTH 10
-#define UA_MBEDTLS_MAX_DN_LENGTH 256
-
 /* We need to access some private fields below */
 #ifndef MBEDTLS_PRIVATE
 #define MBEDTLS_PRIVATE(x) x

From 3ebc92e66ae80357aa96f048be207da3348ae8af Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 17:35:53 +0100
Subject: [PATCH 1707/1963] fix(plugins): Also consider the trustlist to find
 issuers in ua_pki_mbedtls.c

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index eab87c15733..7991c8c2c2a 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -295,8 +295,15 @@ mbedtlsFindNextIssuer(CertInfo *ci, mbedtls_x509_crt *stack,
                mbedtls_pk_can_do(&i->pk, cert->MBEDTLS_PRIVATE(sig_pk)))
                 return i;
         }
-        /* Switch from the stack that came with the cert to the ctx->skIssue list */
-        stack = (stack != &ci->certificateIssuerList) ? &ci->certificateIssuerList : NULL;
+
+        /* Switch from the stack that came with the cert to the issuer list and
+         * then to the trust list. */
+        if(stack == &ci->certificateTrustList)
+            stack = NULL;
+        else if(stack == &ci->certificateIssuerList)
+            stack = &ci->certificateTrustList;
+        else
+            stack = &ci->certificateIssuerList;
     } while(stack);
     return NULL;
 }

From 2e516fd7bdc53e06dffd38a080835c25ea480cdf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 17:37:07 +0100
Subject: [PATCH 1708/1963] fix(plugins): Return detailed status codes for
 revocation checks in ua_pki_mbedtls.c

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 46 ++++++++++++++++---------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 7991c8c2c2a..b768de120af 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -308,21 +308,27 @@ mbedtlsFindNextIssuer(CertInfo *ci, mbedtls_x509_crt *stack,
     return NULL;
 }
 
-static UA_Boolean
+static UA_StatusCode
 mbedtlsCheckRevoked(CertInfo *ci, mbedtls_x509_crt *cert) {
+    /* Parse the Issuer Name */
     char inbuf[UA_MBEDTLS_MAX_DN_LENGTH];
     int nameLen = mbedtls_x509_dn_gets(inbuf, UA_MBEDTLS_MAX_DN_LENGTH, &cert->issuer);
     if(nameLen < 0)
-        return true;
+        return UA_STATUSCODE_BADINTERNALERROR;
     UA_String issuerName = {(size_t)nameLen, (UA_Byte*)inbuf};
+
+    /* Loop over the crl and match the Issuer Name */
+    UA_StatusCode res = UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN;
     for(mbedtls_x509_crl *crl = &ci->certificateRevocationList; crl; crl = crl->next) {
         /* Is the CRL for certificates from the cert issuer?
          * Is the serial number of the certificate contained in the CRL? */
-        if(mbedtlsSameName(issuerName, &crl->issuer) &&
-           mbedtls_x509_crt_is_revoked(cert, crl) != 0)
-            return true;
+        if(mbedtlsSameName(issuerName, &crl->issuer)) {
+            if(mbedtls_x509_crt_is_revoked(cert, crl) != 0)
+                return UA_STATUSCODE_BADCERTIFICATEREVOKED;
+            res = UA_STATUSCODE_GOOD; /* There was at least one crl that did not revoke (so far) */
+        }
     }
-    return false;
+    return res;
 }
 
 /* Verify that the public key of the issuer was used to sign the certificate */
@@ -361,11 +367,6 @@ mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old
         return (depth == 0) ? UA_STATUSCODE_BADCERTIFICATETIMEINVALID :
             UA_STATUSCODE_BADCERTIFICATEISSUERTIMEINVALID;
 
-    /* Verification Step: Revocation Check */
-    if(mbedtlsCheckRevoked(ci, cert))
-        return (depth == 0) ? UA_STATUSCODE_BADCERTIFICATEREVOKED :
-            UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED;
-
     /* Return the most specific error code. BADCERTIFICATECHAININCOMPLETE is
      * returned only if all possible chains are incomplete. */
     mbedtls_x509_crt *issuer = NULL;
@@ -395,15 +396,28 @@ mbedtlsVerifyChain(CertInfo *ci, mbedtls_x509_crt *stack, mbedtls_x509_crt **old
          * chain. We check whether the certificate is trusted below. This is the
          * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
          * This signals that the chain is complete (but can be still
-         * untrusted). */
+         * untrusted).
+         *
+         * Break here as we have reached the end of the chain. Omit the
+         * Revocation Check for self-signed certificates. */
         if(issuer == cert || mbedtlsSameBuf(&cert->tbs, &issuer->tbs)) {
             ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
-            continue;
+            break;
         }
 
-        /* Detect (endless) loops of issuers. The last one can be skipped by the
-         * check for self-signed just before. */
-        for(int i = 0; i < depth - 1; i++) {
+        /* Verification Step: Revocation Check */
+        ret = mbedtlsCheckRevoked(ci, cert);
+        if(depth > 0) {
+            if(ret == UA_STATUSCODE_BADCERTIFICATEREVOKED)
+                ret = UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED;
+            if(ret == UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN)
+                ret = UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN;
+        }
+        if(ret != UA_STATUSCODE_GOOD)
+            continue;
+
+        /* Detect (endless) loops of issuers */
+        for(int i = 0; i < depth; i++) {
             if(old_issuers[i] == issuer)
                 return UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE;
         }

From 486a65ee10d7cd0f4e77380c5c29d9484bc1730d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 20:08:23 +0100
Subject: [PATCH 1709/1963] fix(plugins): Also consider the trustlist to find
 issuers in ua_pki_openssl.c

---
 plugins/crypto/openssl/ua_pki_openssl.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 84eb66040b4..38cd710a808 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -465,8 +465,14 @@ openSSLFindNextIssuer(CertContext *ctx, STACK_OF(X509) *stack, X509 *x509, X509
             if(X509_check_issued(candidate, x509) == 0)
                 return candidate;
         }
-        /* Switch to search in the ctx->skIssue list */
-        stack = (stack != ctx->skIssue) ? ctx->skIssue : NULL;
+        /* Switch from the stack that came with the cert to the issuer list and
+         * then to the trust list. */
+        if(stack == ctx->skTrusted)
+            stack = NULL;
+        else if(stack == ctx->skIssue)
+            stack = ctx->skTrusted;
+        else
+            stack = ctx->skIssue;
     } while(stack);
     return NULL;
 }

From 80bbdd4170e1c8af83ad894cb2e1ee9ef2cc80ef Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 20:11:53 +0100
Subject: [PATCH 1710/1963] fix(plugins): Return detailed status codes for
 revocation checks in ua_pki_openssl.c

---
 plugins/crypto/openssl/ua_pki_openssl.c | 33 +++++++++++++++++--------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 38cd710a808..048dda550f1 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -497,11 +497,14 @@ openSSLCheckCA(X509 *cert) {
     return true;
 }
 
-static UA_Boolean
+static UA_StatusCode
 openSSLCheckRevoked(CertContext *ctx, X509 *cert) {
     const ASN1_INTEGER *sn = X509_get0_serialNumber(cert);
     const X509_NAME *in = X509_get_issuer_name(cert);
     int size = sk_X509_CRL_num(ctx->skCrls);
+
+    /* Loop over the crl and match the Issuer Name */
+    UA_StatusCode res = UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN;
     for(int i = 0; i < size; i++) {
         /* The crl contains a list of serial numbers from the same issuer */
         X509_CRL *crl = sk_X509_CRL_value(ctx->skCrls, i);
@@ -512,10 +515,11 @@ openSSLCheckRevoked(CertContext *ctx, X509 *cert) {
         for(int j = 0; j < rsize; j++) {
             X509_REVOKED *r = sk_X509_REVOKED_value(rs, j);
             if(ASN1_INTEGER_cmp(sn, X509_REVOKED_get0_serialNumber(r)) == 0)
-                return true;
+                return UA_STATUSCODE_BADCERTIFICATEREVOKED;
         }
+        res = UA_STATUSCODE_GOOD; /* There was at least one crl that did not revoke (so far) */
     }
-    return false;
+    return res;
 }
 
 #define UA_OPENSSL_MAX_CHAIN_LENGTH 10
@@ -534,11 +538,6 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
         return (depth == 0) ? UA_STATUSCODE_BADCERTIFICATETIMEINVALID :
             UA_STATUSCODE_BADCERTIFICATEISSUERTIMEINVALID;
 
-    /* Verification Step: Revocation Check */
-    if(openSSLCheckRevoked(ctx, cert))
-        return (depth == 0) ? UA_STATUSCODE_BADCERTIFICATEREVOKED :
-            UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED;
-
     /* Return the most specific error code. BADCERTIFICATECHAININCOMPLETE is
      * returned only if all possible chains are incomplete. */
     X509 *issuer = NULL;
@@ -570,11 +569,25 @@ openSSL_verifyChain(CertContext *ctx, STACK_OF(X509) *stack, X509 **old_issuers,
          * chain. We check whether the certificate is trusted below. This is the
          * only place where we return UA_STATUSCODE_BADCERTIFICATEUNTRUSTED.
          * This signals that the chain is complete (but can be still
-         * untrusted). */
+         * untrusted).
+         *
+         * Break here as we have reached the end of the chain. Omit the
+         * Revocation Check for self-signed certificates. */
         if(cert == issuer || X509_cmp(cert, issuer) == 0) {
             ret = UA_STATUSCODE_BADCERTIFICATEUNTRUSTED;
-            continue;
+            break;
+        }
+
+        /* Verification Step: Revocation Check */
+        ret = openSSLCheckRevoked(ctx, cert);
+        if(depth > 0) {
+            if(ret == UA_STATUSCODE_BADCERTIFICATEREVOKED)
+                ret = UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED;
+            if(ret == UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN)
+                ret = UA_STATUSCODE_BADCERTIFICATEISSUERREVOCATIONUNKNOWN;
         }
+        if(ret != UA_STATUSCODE_GOOD)
+            continue;
 
         /* Detect (endless) loops of issuers. The last one can be skipped by the
          * check for self-signed just before. */

From efbaac086e710ba1777fed1e05541923c10bda0d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 20:17:23 +0100
Subject: [PATCH 1711/1963] feat(plugins): Disable revocation lists checks in
 ua_pki_mbedtls.c if zero crl are loaded

Avoid breakage for users of the 1.3 release family but still log a warning.
---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index b768de120af..8ab41285f65 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -317,6 +317,13 @@ mbedtlsCheckRevoked(CertInfo *ci, mbedtls_x509_crt *cert) {
         return UA_STATUSCODE_BADINTERNALERROR;
     UA_String issuerName = {(size_t)nameLen, (UA_Byte*)inbuf};
 
+    if(ci->certificateRevocationList.raw.len == 0) {
+        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SECURITYPOLICY,
+                       "Zero revocation lists have been loaded. "
+                       "This seems intentional - omitting the check.");
+        return UA_STATUSCODE_GOOD;
+    }
+
     /* Loop over the crl and match the Issuer Name */
     UA_StatusCode res = UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN;
     for(mbedtls_x509_crl *crl = &ci->certificateRevocationList; crl; crl = crl->next) {

From 68142484a35a2a83ef083098ed533abbcc5e98f4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 20:17:58 +0100
Subject: [PATCH 1712/1963] feat(plugins): Disable revocation lists checks in
 ua_pki_openssl.c if zero crl are loaded

Avoid breakage for users of the 1.3 release family but still log a warning.
---
 plugins/crypto/openssl/ua_pki_openssl.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 048dda550f1..40cec466e7e 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -503,6 +503,13 @@ openSSLCheckRevoked(CertContext *ctx, X509 *cert) {
     const X509_NAME *in = X509_get_issuer_name(cert);
     int size = sk_X509_CRL_num(ctx->skCrls);
 
+    if(size == 0) {
+        UA_LOG_WARNING(UA_Log_Stdout, UA_LOGCATEGORY_SECURITYPOLICY,
+                       "Zero revocation lists have been loaded. "
+                       "This seems intentional - omitting the check.");
+        return UA_STATUSCODE_GOOD;
+    }
+
     /* Loop over the crl and match the Issuer Name */
     UA_StatusCode res = UA_STATUSCODE_BADCERTIFICATEREVOCATIONUNKNOWN;
     for(int i = 0; i < size; i++) {

From 3eed1a6d5c5b207c531b2d35ed88aa0a4a4541e5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 20:18:30 +0100
Subject: [PATCH 1713/1963] refactor(build): Bump version to v1.3.15

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcf1fea7e06..002efecb75b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 14)
+set(OPEN62541_VER_PATCH 15)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 9dff1293d100e0ff382f8ac38a7d361a94bacecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20V=C3=B6lker?= <jannis.voelker@basyskom.com>
Date: Mon, 25 Nov 2024 12:14:48 +0100
Subject: [PATCH 1714/1963] Fix amalgamation order

ua_securitypolicy_none.c requires UA_*_LoadCertificate() if encryption is enabled.
---
 CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56af8ab86b6..6d9e3cfcbb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1004,9 +1004,7 @@ set(plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
                    ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_default.c
                    ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_ziptree.c
                    ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_hashmap.c
-                   ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c
-                   ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_pki_none.c
-                   ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_securitypolicy_none.c)
+                   ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.c)
 
 # For file based server configuration
 if(UA_ENABLE_JSON_ENCODING)
@@ -1083,6 +1081,11 @@ list(APPEND plugin_sources
      ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_pki_openssl.c)
 endif()
 
+# ua_securitypolicy_none.c requires UA_*_LoadCertificate() if encryption is enabled
+list(APPEND plugin_sources
+    ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_pki_none.c
+    ${PROJECT_SOURCE_DIR}/plugins/crypto/ua_securitypolicy_none.c)
+
 if(UA_ENABLE_DISCOVERY)
     list(APPEND lib_headers ${PROJECT_SOURCE_DIR}/src/server/ua_discovery.h)
     list(APPEND lib_sources ${PROJECT_SOURCE_DIR}/src/server/ua_discovery.c)

From f42c264d8df6a1a4cfff33c879f9229721e858b4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 25 Nov 2024 13:09:34 +0100
Subject: [PATCH 1715/1963] refactor(build): Bump version to v1.4.8

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d9e3cfcbb1..3fcb9b14f2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 7)
+set(OPEN62541_VER_PATCH 8)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 06f3e3d430c39512a67c60bb1ef0a65d5b0b52d3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 23 Nov 2024 17:37:57 +0100
Subject: [PATCH 1716/1963] fix(core): Mask additional certificate verification
 statuscodes in the ERR response

---
 src/ua_securechannel.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 75698737f27..0de78dfc254 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -73,6 +73,8 @@ hideErrors(UA_TcpErrorMessage *const error) {
     case UA_STATUSCODE_BADCERTIFICATEUNTRUSTED:
     case UA_STATUSCODE_BADCERTIFICATEREVOKED:
     case UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED:
+    case UA_STATUSCODE_BADCERTIFICATECHAININCOMPLETE:
+    case UA_STATUSCODE_BADCERTIFICATEISSUERUSENOTALLOWED:
         error->error = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         error->reason = UA_STRING_NULL;
         break;

From 9e59f1abe22ce276fcffccb4ebb3a894e35ac3a6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 25 Nov 2024 16:54:03 +0100
Subject: [PATCH 1717/1963] refactor(plugins): Remove comparison of
 authorityKeyIdentifier / subjectKeyIdentifier not supported by CTT

The CTT example Security User X509/001.js expects that an issuer is
selected where the authorityKeyIdentifier / subjectKeyIdentifier do not
match. No longer use X509_check_issued, but rather manually check if the
issuer name and subject name match -- with no other checks beyond that.
---
 plugins/crypto/openssl/ua_pki_openssl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 5cfaa455b33..67b049e7505 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -462,6 +462,7 @@ static X509 *
 openSSLFindNextIssuer(CertContext *ctx, STACK_OF(X509) *stack, X509 *x509, X509 *prev) {
     /* First check issuers from the stack - provided in the same bytestring as
      * the certificate. This can also return x509 itself. */
+    X509_NAME *in = X509_get_issuer_name(x509);
     do {
         int size = sk_X509_num(stack);
         for(int i = 0; i < size; i++) {
@@ -474,7 +475,7 @@ openSSLFindNextIssuer(CertContext *ctx, STACK_OF(X509) *stack, X509 *x509, X509
             /* This checks subject/issuer name and the key usage of the issuer.
              * It does not verify the validity period and if the issuer key was
              * used for the signature. We check that afterwards. */
-            if(X509_check_issued(candidate, x509) == 0)
+            if(X509_NAME_cmp(in, X509_get_subject_name(candidate)) == 0)
                 return candidate;
         }
         /* Switch from the stack that came with the cert to the issuer list and

From 82117710f42e677ee8d67d330ac03f032b5a9e71 Mon Sep 17 00:00:00 2001
From: Sebastian Goll <goll@hmi-project.com>
Date: Tue, 26 Nov 2024 14:44:58 +0100
Subject: [PATCH 1718/1963] fix(core): avoid double decrement in
 UA_KeyValueMap_remove()

---
 src/ua_util.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ua_util.c b/src/ua_util.c
index 13eb0fba2e5..18ab6f94bbe 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -420,15 +420,16 @@ UA_KeyValueMap_remove(UA_KeyValueMap *map,
         m[i] = m[s-1];
         UA_KeyValuePair_init(&m[s-1]);
     }
-    
+
     /* Ignore the result. In case resize fails, keep the longer original array
-     * around. Resize never fails when reducing the size to zero. Reduce the
-     * size integer in any case. */
+     * around. Resize never fails when reducing the size to zero. */
     UA_StatusCode res =
         UA_Array_resize((void**)&map->map, &map->mapSize, map->mapSize - 1,
                           &UA_TYPES[UA_TYPES_KEYVALUEPAIR]);
-    (void)res;
-    map->mapSize--;
+    /* Adjust map->mapSize only when UA_Array_resize() failed. On success, the
+     * value has already been decremented by UA_Array_resize(). */
+    if(res != UA_STATUSCODE_GOOD)
+        map->mapSize--;
     return UA_STATUSCODE_GOOD;
 }
 

From d783ab5a3948709f87671c0511bb36260fd37f30 Mon Sep 17 00:00:00 2001
From: Sebastian Goll <goll@hmi-project.com>
Date: Tue, 26 Nov 2024 15:01:25 +0100
Subject: [PATCH 1719/1963] test(core): add test for removing keys from
 UA_KeyValueMap

---
 tests/check_utils.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/check_utils.c b/tests/check_utils.c
index 540f7e8652a..b3f8bccf502 100644
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -567,6 +567,22 @@ START_TEST(idOrderString) {
     ck_assert(UA_NodeId_order(&id_str_d, &id_str_c) == UA_ORDER_MORE);
 } END_TEST
 
+START_TEST(kvmRemove) {
+    UA_KeyValueMap *kvm = UA_KeyValueMap_new();
+
+    UA_UInt16 value_1 = 1;
+    UA_KeyValueMap_setScalar(kvm, UA_QUALIFIEDNAME(0, "value-1"), (void *)&value_1,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+    UA_UInt16 value_2 = 2;
+    UA_KeyValueMap_setScalar(kvm, UA_QUALIFIEDNAME(0, "value-2"), (void *)&value_2,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_KeyValueMap_remove(kvm, UA_QUALIFIEDNAME(0, "value-1"));
+    ck_assert(UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, "value-2")));
+
+    UA_KeyValueMap_delete(kvm);
+} END_TEST
+
 static Suite* testSuite_Utils(void) {
     Suite *s = suite_create("Utils");
     TCase *tc_endpointUrl_split = tcase_create("EndpointUrl_split");
@@ -598,6 +614,10 @@ static Suite* testSuite_Utils(void) {
     tcase_add_test(tc1, idOrderString);
     suite_add_tcase(s, tc2);
 
+    TCase *tc3 = tcase_create("test keyvaluemap");
+    tcase_add_test(tc3, kvmRemove);
+    suite_add_tcase(s, tc3);
+
     return s;
 }
 

From c65b593b82330883f4849e37c772a2ab25670894 Mon Sep 17 00:00:00 2001
From: Sebastian Goll <goll@hmi-project.com>
Date: Tue, 26 Nov 2024 15:11:33 +0100
Subject: [PATCH 1720/1963] test(core): add tests for most UA_KeyValueMap
 operations

---
 tests/check_utils.c | 60 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/tests/check_utils.c b/tests/check_utils.c
index b3f8bccf502..6d2080b5ed4 100644
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -567,6 +567,31 @@ START_TEST(idOrderString) {
     ck_assert(UA_NodeId_order(&id_str_d, &id_str_c) == UA_ORDER_MORE);
 } END_TEST
 
+START_TEST(kvmContain) {
+    UA_KeyValueMap *kvm = UA_KeyValueMap_new();
+
+    UA_UInt16 value_1 = 1;
+    UA_KeyValueMap_setScalar(kvm, UA_QUALIFIEDNAME(0, "value-1"), (void *)&value_1,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+
+    ck_assert(UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, "value-1")));
+    ck_assert(!UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, "value-2")));
+
+    UA_UInt16 value_2 = 2;
+    UA_KeyValueMap_setScalar(kvm, UA_QUALIFIEDNAME(0, "value-2"), (void *)&value_2,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+
+    ck_assert(UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, "value-1")));
+    ck_assert(UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, "value-2")));
+
+    UA_KeyValueMap_clear(kvm);
+
+    ck_assert(!UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, "value-1")));
+    ck_assert(!UA_KeyValueMap_contains(kvm, UA_QUALIFIEDNAME(0, "value-2")));
+
+    UA_KeyValueMap_delete(kvm);
+} END_TEST
+
 START_TEST(kvmRemove) {
     UA_KeyValueMap *kvm = UA_KeyValueMap_new();
 
@@ -583,6 +608,39 @@ START_TEST(kvmRemove) {
     UA_KeyValueMap_delete(kvm);
 } END_TEST
 
+START_TEST(kvmMerge) {
+    UA_KeyValueMap *kvm_1 = UA_KeyValueMap_new();
+    UA_UInt16 value_11 = 11;
+    UA_KeyValueMap_setScalar(kvm_1, UA_QUALIFIEDNAME(0, "value-1"), (void *)&value_11,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+    UA_UInt16 value_12 = 12;
+    UA_KeyValueMap_setScalar(kvm_1, UA_QUALIFIEDNAME(0, "value-2"), (void *)&value_12,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_KeyValueMap *kvm_2 = UA_KeyValueMap_new();
+    UA_UInt16 value_22 = 22;
+    UA_KeyValueMap_setScalar(kvm_2, UA_QUALIFIEDNAME(0, "value-2"), (void *)&value_22,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+    UA_UInt16 value_23 = 23;
+    UA_KeyValueMap_setScalar(kvm_2, UA_QUALIFIEDNAME(0, "value-3"), (void *)&value_23,
+                             &UA_TYPES[UA_TYPES_UINT16]);
+
+    UA_KeyValueMap_merge(kvm_1, kvm_2);
+
+    const UA_Variant *value_1 = UA_KeyValueMap_get(kvm_1, UA_QUALIFIEDNAME(0, "value-1"));
+    const UA_Variant *value_2 = UA_KeyValueMap_get(kvm_1, UA_QUALIFIEDNAME(0, "value-2"));
+    const UA_Variant *value_3 = UA_KeyValueMap_get(kvm_1, UA_QUALIFIEDNAME(0, "value-3"));
+    ck_assert(UA_Variant_hasScalarType(value_1, &UA_TYPES[UA_TYPES_UINT16]));
+    ck_assert(UA_Variant_hasScalarType(value_2, &UA_TYPES[UA_TYPES_UINT16]));
+    ck_assert(UA_Variant_hasScalarType(value_3, &UA_TYPES[UA_TYPES_UINT16]));
+    ck_assert(*((UA_UInt16 *) value_1->data) == 11);
+    ck_assert(*((UA_UInt16 *) value_2->data) == 22);
+    ck_assert(*((UA_UInt16 *) value_3->data) == 23);
+
+    UA_KeyValueMap_delete(kvm_1);
+    UA_KeyValueMap_delete(kvm_2);
+} END_TEST
+
 static Suite* testSuite_Utils(void) {
     Suite *s = suite_create("Utils");
     TCase *tc_endpointUrl_split = tcase_create("EndpointUrl_split");
@@ -615,7 +673,9 @@ static Suite* testSuite_Utils(void) {
     suite_add_tcase(s, tc2);
 
     TCase *tc3 = tcase_create("test keyvaluemap");
+    tcase_add_test(tc3, kvmContain);
     tcase_add_test(tc3, kvmRemove);
+    tcase_add_test(tc3, kvmMerge);
     suite_add_tcase(s, tc3);
 
     return s;

From 0cc73feb099d3c412ac3caf048ecea12e7251ceb Mon Sep 17 00:00:00 2001
From: Sebastian Goll <goll@hmi-project.com>
Date: Tue, 26 Nov 2024 15:21:56 +0100
Subject: [PATCH 1721/1963] fix(plugin): fix clearing previous plugin in
 UA_AccessControl_default()

---
 plugins/ua_accesscontrol_default.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 0d808819df8..8bf7e8a0dd6 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -301,7 +301,7 @@ UA_AccessControl_default(UA_ServerConfig *config,
     UA_AccessControl *ac = &config->accessControl;
 
     if(ac->clear)
-        clear_default(ac);
+        ac->clear(ac);
 
     ac->clear = clear_default;
     ac->activateSession = activateSession_default;

From ee8083a9a2526aeb01b91529e8c7cbe5e34b6934 Mon Sep 17 00:00:00 2001
From: Sebastian Goll <1277035+sgoll@users.noreply.github.com>
Date: Wed, 4 Dec 2024 19:49:42 +0100
Subject: [PATCH 1722/1963] fix(plugins): Fix generation of wrong private key
 format for MbedTLS

- Re-order case statements to match order in other code
- Use derived compile-time constant to avoid duplication
---
 .../mbedtls/ua_mbedtls_create_certificate.c   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c b/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
index c828c7c3ec4..c2f793b5393 100644
--- a/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
+++ b/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
@@ -374,23 +374,23 @@ static int write_private_key(mbedtls_pk_context *key, UA_CertificateFormat keyFo
     unsigned char *c = output_buf;
     size_t len = 0;
 
-    memset(output_buf, 0, 16000);
+    memset(output_buf, 0, sizeof(output_buf));
     switch(keyFormat) {
     case UA_CERTIFICATEFORMAT_DER: {
-        if((ret = mbedtls_pk_write_key_pem(key, output_buf, 16000)) != 0) {
+        if((ret = mbedtls_pk_write_key_der(key, output_buf, sizeof(output_buf))) < 0) {
             return ret;
         }
 
-        len = strlen((char *) output_buf);
+        len = ret;
+        c = output_buf + sizeof(output_buf) - len;
         break;
     }
     case UA_CERTIFICATEFORMAT_PEM: {
-        if((ret = mbedtls_pk_write_key_der(key, output_buf, 16000)) < 0) {
+        if((ret = mbedtls_pk_write_key_pem(key, output_buf, sizeof(output_buf))) != 0) {
             return ret;
         }
 
-        len = ret;
-        c = output_buf + sizeof(output_buf) - len;
+        len = strlen((char *)output_buf);
         break;
     }
     }
@@ -410,19 +410,19 @@ static int write_certificate(mbedtls_x509write_cert *crt, UA_CertificateFormat c
     unsigned char *c = output_buf;
     size_t len = 0;
 
-    memset(output_buf, 0, 4096);
+    memset(output_buf, 0, sizeof(output_buf));
     switch(certFormat) {
     case UA_CERTIFICATEFORMAT_DER: {
-        if((ret = mbedtls_x509write_crt_der(crt, output_buf, 4096, f_rng, p_rng)) < 0) {
+        if((ret = mbedtls_x509write_crt_der(crt, output_buf, sizeof(output_buf), f_rng, p_rng)) < 0) {
             return ret;
         }
 
         len = ret;
-        c = output_buf + 4096 - len;
+        c = output_buf + sizeof(output_buf) - len;
         break;
     }
     case UA_CERTIFICATEFORMAT_PEM: {
-        if((ret = mbedtls_x509write_crt_pem(crt, output_buf, 4096, f_rng, p_rng)) < 0) {
+        if((ret = mbedtls_x509write_crt_pem(crt, output_buf, sizeof(output_buf), f_rng, p_rng)) < 0) {
             return ret;
         }
 

From 1d8ba82e2c5d2a02c2da7a47d7f6ad9628ead10d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 4 Dec 2024 19:08:05 +0100
Subject: [PATCH 1723/1963] refactor(client): Simplify getEndpointUrl

---
 src/client/ua_client_connect.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 23a5736c663..45da870bf31 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -41,13 +41,11 @@ findUserTokenPolicy(UA_Client *client, UA_EndpointDescription *endpoint);
  * We fall back if connecting to an EndpointUrl fails. */
 static UA_String
 getEndpointUrl(UA_Client *client) {
-    if(client->endpoint.endpointUrl.length > 0) {
+    if(client->endpoint.endpointUrl.length > 0)
         return client->endpoint.endpointUrl;
-    } else if(client->discoveryUrl.length > 0) {
+    if(client->discoveryUrl.length > 0)
         return client->discoveryUrl;
-    } else {
-        return client->config.endpointUrl;
-    }
+    return client->config.endpointUrl;
 }
 
 /* If an EndpointUrl doesn't work (TCP connection fails), fall back to the

From 1c26a4fd64590e224942d2d8ad94cb8a522d54d0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 4 Dec 2024 19:37:15 +0100
Subject: [PATCH 1724/1963] fix(client): The server can send no
 ServerCertificate in the asym header for #None

Even if a ServerCertificate is defined for the Endpoint. Some servers in
the wild show this behavior. This was reported by @mario-reif in #6926.
---
 src/client/ua_client_connect.c            | 19 ++++++++----
 tests/client/check_client_securechannel.c | 36 +++++++++++++++++++++++
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 45da870bf31..a9b4d060514 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -523,8 +523,7 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
 
     /* Check whether the nonce was reused */
     if(client->channel.securityMode != UA_MESSAGESECURITYMODE_NONE &&
-       UA_ByteString_equal(&client->channel.remoteNonce,
-                           &response.serverNonce)) {
+       UA_ByteString_equal(&client->channel.remoteNonce, &response.serverNonce)) {
         UA_LOG_ERROR_CHANNEL(client->config.logging, &client->channel,
                              "The server reused the last nonce");
         client->connectStatus = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
@@ -1458,11 +1457,19 @@ verifyClientSecureChannelHeader(void *application, UA_SecureChannel *channel,
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
     }
 
-    /* If encryption is used, check that the server certificate for the
-     * endpoint is used for the SecureChannel */
+    /* Get the remote certificate.
+     * Omit the remainder if an entire certificate chain was sent. */
     UA_ByteString serverCert = getLeafCertificate(asymHeader->senderCertificate);
-    if(client->endpoint.serverCertificate.length > 0 &&
-       !UA_String_equal(&client->endpoint.serverCertificate, &serverCert)) {
+
+    /* If encryption is enabled, then a server certificate is defined.
+     * Otherwise the creation of the SecureChannel would have failed. */
+    UA_assert(channel->securityMode == UA_MESSAGESECURITYMODE_NONE ||
+              serverCert.length > 0);
+
+    /* If a server certificate is sent in the asymHeader, check that the same
+     * certificate was defined for the endpoint */
+    if(serverCert.length > 0 &&
+       !UA_String_equal(&serverCert, &client->endpoint.serverCertificate)) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "The server certificate is different from the EndpointDescription");
         return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index d4c37caf4cc..b3fcbc72e8a 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -220,6 +220,41 @@ START_TEST(SecureChannel_cableunplugged) {
 }
 END_TEST
 
+/* Some servers have a certificate in their endpoint which they do not use for
+ * #None SecureChannels. To be compatible with them, only check if the
+ * certificate matches IF it gets sent in th asymHeader of the OPN message. */
+START_TEST(SecureChannel_serverCert) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Copy the endpont and disconnect */
+    UA_EndpointDescription endpoint;
+    UA_EndpointDescription_copy(&client->endpoint, &endpoint);
+    UA_Client_disconnect(client);
+
+    /* Add a fake certificate information to the endpoint - which is not getting
+     * used during the connect with #None. */
+    endpoint.serverCertificate = UA_STRING_ALLOC("random 123");
+    client->config.endpoint = endpoint;
+
+    /* Reconnect */
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant_clear(&val);
+    UA_Client_delete(client);
+}
+END_TEST
+
 int main(void) {
     TCase *tc_sc = tcase_create("Client SecureChannel");
     tcase_add_checked_fixture(tc_sc, setup, teardown);
@@ -229,6 +264,7 @@ int main(void) {
     tcase_add_test(tc_sc, SecureChannel_networkfail);
     tcase_add_test(tc_sc, SecureChannel_reconnect);
     tcase_add_test(tc_sc, SecureChannel_cableunplugged);
+    tcase_add_test(tc_sc, SecureChannel_serverCert);
 
     Suite *s = suite_create("Client");
     suite_add_tcase(s, tc_sc);

From f7ad6e11a169b0e3343d0f045d717ce2da4e982e Mon Sep 17 00:00:00 2001
From: Maciej Stolarczyk <maciej.stolarczyk@mpl.mee.com>
Date: Tue, 3 Dec 2024 13:19:13 +0100
Subject: [PATCH 1725/1963] fix[pubsub]: Properly remove key rollover callback

---
 src/pubsub/ua_pubsub_keystorage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 799cca43275..c6b823622eb 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -68,7 +68,7 @@ UA_PubSubKeyStorage_delete(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     /* Remove callback */
-    if(!keyStorage->callBackId) {
+    if(!keyStorage->callBackId != 0) {
         removeCallback(server, keyStorage->callBackId);
         keyStorage->callBackId = 0;
     }

From a85c4cc6249f0e709b9b1372fbbcc5bc30a7eeb0 Mon Sep 17 00:00:00 2001
From: Costin Zanfir <costin.zanfir@proton.me>
Date: Fri, 6 Dec 2024 13:20:41 +0000
Subject: [PATCH 1726/1963] fix(plugin): add
 SecurityPolicy#Aes256_Sha256_RsaPss to json configuration plugin

Add the Aes256_Sha256_RsaPss security policy to
the json configuration plugin. The server_config.json5
example configuration file is updated as well.
---
 plugins/server_config.json5 | 5 +++++
 plugins/ua_config_json.c    | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/plugins/server_config.json5 b/plugins/server_config.json5
index 81be7fe9e80..1ecde898a8a 100644
--- a/plugins/server_config.json5
+++ b/plugins/server_config.json5
@@ -187,6 +187,11 @@
 //      policy: "http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep",
 //      certificate: "/path/to/certificate",
 //      privateKey: "/path/to/privateKey"
+//    },
+//    {
+//      policy: "http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss"",
+//      certificate: "/path/to/certificate",
+//      privateKey: "/path/to/privateKey"
 //    }
 //  ],
 
diff --git a/plugins/ua_config_json.c b/plugins/ua_config_json.c
index a7a454f1e15..8886e68a4e5 100644
--- a/plugins/ua_config_json.c
+++ b/plugins/ua_config_json.c
@@ -647,6 +647,7 @@ PARSE_JSON(SecurityPolciesField) {
     UA_String basic256uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256");
     UA_String basic256Sha256uri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
     UA_String aes128sha256rsaoaepuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
+    UA_String aes256sha256rsapssuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
 
     cj5_token tok = ctx->tokens[++ctx->index];
     for(size_t j = tok.size; j > 0; j--) {
@@ -742,6 +743,13 @@ PARSE_JSON(SecurityPolciesField) {
                                "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
                                UA_StatusCode_name(retval));
             }
+        } else if(UA_String_equal(&policy, &aes256sha256rsapssuri)) {
+             retval = UA_ServerConfig_addSecurityPolicyAes256Sha256RsaPss(config, &certificate, &privateKey);
+             if(retval != UA_STATUSCODE_GOOD) {
+                 UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
+                                "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+                               UA_StatusCode_name(retval));
+            }
         } else {
             UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, "Unknown Security Policy.");
         }

From 42b58674bcf6afc3a3465e81bf95523379c45ade Mon Sep 17 00:00:00 2001
From: Maciej Stolarczyk <stolarczyk.maciek@gmail.com>
Date: Mon, 9 Dec 2024 07:52:34 +0100
Subject: [PATCH 1727/1963] =?UTF-8?q?fix(pubsub):=20Don=E2=80=99t=20add=20?=
 =?UTF-8?q?the=20key=20rollover=20callback=20twice=20(#6933)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pubsub/ua_pubsub_keystorage.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index c6b823622eb..1eecb646d0d 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -208,7 +208,12 @@ UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
     if(!server || !keyStorage || !callback || timeToNextMs <= 0)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    // Check if the callback already exist
+    if(*callbackID != 0) {
+        return UA_STATUSCODE_GOOD;
+    }
+    
+    UA_LOCK_ASSERT(&psm->sc.server->serviceMutex);
 
     UA_DateTime dateTimeToNextKey = UA_DateTime_nowMonotonic() +
         (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);

From d5f4c5fcc893430f5fdc29d2547407c34f21bcdd Mon Sep 17 00:00:00 2001
From: Rolf Kalbermatter <15158041+RolfKal@users.noreply.github.com>
Date: Mon, 9 Dec 2024 10:34:01 +0100
Subject: [PATCH 1728/1963] fix(tools): Fix compilation for Microsoft C
 compiler

---
 tools/ua2json/ua2json.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tools/ua2json/ua2json.c b/tools/ua2json/ua2json.c
index 4e6211f4b52..627f1daa8f6 100644
--- a/tools/ua2json/ua2json.c
+++ b/tools/ua2json/ua2json.c
@@ -10,7 +10,6 @@
 #include <open62541/types_generated_handling.h>
 
 #include <stdio.h>
-#include <unistd.h>
 
 /* Internal headers */
 #include "ua_pubsub_networkmessage.h"
@@ -238,7 +237,7 @@ int main(int argc, char **argv) {
     /* Read input until EOF */
     size_t pos = 0;
     size_t length = 128;
-    while(true) {
+    do {
         if(pos >= buf.length) {
             length = length * 8;
             UA_Byte *r = (UA_Byte*)realloc(buf.data, length);
@@ -250,16 +249,14 @@ int main(int argc, char **argv) {
             buf.data = r;
         }
 
-        ssize_t c = read(fileno(in), &buf.data[pos], length - pos);
-        if(c == 0)
-            break;
-        if(c < 0) {
+        size_t c = fread(&buf.data[pos], sizeof(UA_Byte), length - pos, in);
+        if(ferror(in)) {
             fprintf(stderr, "Reading from input failed\n");
             goto cleanup;
         }
 
-        pos += (size_t)c;
-    }
+        pos += c;
+    } while (!feof(in));
 
     if(pos == 0) {
         fprintf(stderr, "No input\n");

From 0d3fc8f5d366281132609f0da557999e796124c1 Mon Sep 17 00:00:00 2001
From: Rolf Kalbermatter <15158041+RolfKal@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:14:18 +0100
Subject: [PATCH 1729/1963] fix(pubsub): missing parameter in UA_LOCK_ASSERT()
 macro

---
 src/pubsub/ua_pubsub_keystorage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 1eecb646d0d..5897c2d246f 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -213,7 +213,7 @@ UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
         return UA_STATUSCODE_GOOD;
     }
     
-    UA_LOCK_ASSERT(&psm->sc.server->serviceMutex);
+    UA_LOCK_ASSERT(&psm->sc.server->serviceMutex, 1);
 
     UA_DateTime dateTimeToNextKey = UA_DateTime_nowMonotonic() +
         (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);

From 077cf82ee50e5824e5cecf4a9f02ec38765b90a3 Mon Sep 17 00:00:00 2001
From: Rolf Kalbermatter <15158041+RolfKal@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:23:19 +0100
Subject: [PATCH 1730/1963] fis(pubsub): fix some copy past error after
 apparently changing an API to work on the server rather than the
 PubSubManager reference

---
 src/pubsub/ua_pubsub_keystorage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 5897c2d246f..36162e7d3db 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -213,7 +213,7 @@ UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
         return UA_STATUSCODE_GOOD;
     }
     
-    UA_LOCK_ASSERT(&psm->sc.server->serviceMutex, 1);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
     UA_DateTime dateTimeToNextKey = UA_DateTime_nowMonotonic() +
         (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);

From e391342741315359dde5eec4c41c7509e3ac2512 Mon Sep 17 00:00:00 2001
From: Rolf Kalbermatter <15158041+RolfKal@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:04:16 +0100
Subject: [PATCH 1731/1963] improve(eventloop): make conditional macros more
 clear for the Ehernet ConnectionManager which is only implemented on Linux

---
 include/open62541/plugin/eventloop.h | 2 ++
 plugins/ua_config_default.c          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 5a9d3217556..a5f048bb84a 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -556,6 +556,7 @@ UA_ConnectionManager_new_POSIX_TCP(const UA_String eventSourceName);
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName);
 
+#if defined(__linux__) /* Linux only so far */
 /**
  * Ethernet Connection Manager
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -604,6 +605,7 @@ UA_ConnectionManager_new_POSIX_UDP(const UA_String eventSourceName);
  * No additional parameters for sending over an Ethernet connection defined. */
 UA_EXPORT UA_ConnectionManager *
 UA_ConnectionManager_new_POSIX_Ethernet(const UA_String eventSourceName);
+#endif
 
 /**
  * MQTT Connection Manager
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 0c22c991372..8ff37094bd7 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -315,7 +315,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
             conf->eventLoop->registerEventSource(conf->eventLoop, (UA_EventSource *)udpCM);
 
         /* Add the Ethernet connection manager */
-#ifdef __linux__
+#if defined(UA_ARCHITECTURE_POSIX) && (defined(__linux__))
         UA_ConnectionManager *ethCM =
             UA_ConnectionManager_new_POSIX_Ethernet(UA_STRING("eth connection manager"));
         if(ethCM)

From efecf531eb199614de7e6e895aab447d1b5fa6c4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 22 Dec 2024 00:11:34 +0100
Subject: [PATCH 1732/1963] fix(pubsub): Always update the timed callback in
 UA_PubSubKeyStorage_addKeyRolloverCallback

---
 src/pubsub/ua_pubsub_keystorage.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 36162e7d3db..07af4710ed0 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -208,16 +208,14 @@ UA_PubSubKeyStorage_addKeyRolloverCallback(UA_Server *server,
     if(!server || !keyStorage || !callback || timeToNextMs <= 0)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    // Check if the callback already exist
-    if(*callbackID != 0) {
-        return UA_STATUSCODE_GOOD;
-    }
-    
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
+    UA_EventLoop *el = server->config.eventLoop;
+    if(*callbackID != 0)
+        el->removeCyclicCallback(el, *callbackID);
+
     UA_DateTime dateTimeToNextKey = UA_DateTime_nowMonotonic() +
         (UA_DateTime)(UA_DATETIME_MSEC * timeToNextMs);
-    UA_EventLoop *el = server->config.eventLoop;
     return el->addTimedCallback(el, (UA_Callback)callback, server, keyStorage,
                                 dateTimeToNextKey, callbackID);
 }

From 86aa417aabe9e52f519119edd7a794a49d3907cb Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Wed, 1 Jan 2025 17:31:42 +0100
Subject: [PATCH 1733/1963] refactor(examples): do not set an invalid IP in
 server_multicast.c

Currently an IP 42.42.42.42 is set and the comment suggests that
the network stack resets this to 0.0.0.0 in server_multicast.c.
Just set 0.0.0.0 directly.

This is a backport of 253fc8abd5855851acc0f0d7fa62c98d2487f4f2
to the 1.3 branch.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 examples/discovery/server_multicast.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/discovery/server_multicast.c b/examples/discovery/server_multicast.c
index 861e29e01a2..a31777b041f 100644
--- a/examples/discovery/server_multicast.c
+++ b/examples/discovery/server_multicast.c
@@ -241,7 +241,7 @@ int main(int argc, char **argv) {
     config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample Multicast Server");
 
     //setting custom outbound interface
-    config->mdnsInterfaceIP = UA_String_fromChars("42.42.42.42"); //this line will produce an error and set the interface to 0.0.0.0
+    config->mdnsInterfaceIP = UA_String_fromChars("0.0.0.0");
 
     // See http://www.opcfoundation.org/UA/schemas/1.03/ServerCapabilities.csv
     // For a LDS server, you should only indicate the LDS capability.

From 339cc19ff4d43c30ecfef2e3549555444a57e50a Mon Sep 17 00:00:00 2001
From: Florian La Roche <Florian.LaRoche@gmail.com>
Date: Wed, 1 Jan 2025 17:57:42 +0100
Subject: [PATCH 1734/1963] refactor(examples,tests): avoid spaces for mDNS
 records

Avoid spaces in mdnsServerName as this is used for mDNS records.

This is a backport of 711b0323845245a0f65d5b67f5f5ea40065462e1
into the 1.4 branch.

Signed-off-by: Florian La Roche <Florian.LaRoche@gmail.com>
---
 examples/discovery/server_multicast.c | 2 +-
 examples/discovery/server_register.c  | 2 +-
 tests/fuzz/corpus_generator.c         | 2 +-
 tests/fuzz/fuzz_tcp_message.cc        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/discovery/server_multicast.c b/examples/discovery/server_multicast.c
index 4f7fa3c9daf..66e8bac4b5d 100644
--- a/examples/discovery/server_multicast.c
+++ b/examples/discovery/server_multicast.c
@@ -238,7 +238,7 @@ int main(int argc, char **argv) {
     // Enable the mDNS announce and response functionality
     config->mdnsEnabled = true;
 
-    config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample Multicast Server");
+    config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample-Multicast-Server");
 
     //setting custom outbound interface
     config->mdnsInterfaceIP = UA_String_fromChars("0.0.0.0");
diff --git a/examples/discovery/server_register.c b/examples/discovery/server_register.c
index 476f10a675d..15b2ebc5206 100644
--- a/examples/discovery/server_register.c
+++ b/examples/discovery/server_register.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
     UA_String_clear(&config->applicationDescription.applicationUri);
     config->applicationDescription.applicationUri =
         UA_String_fromChars("urn:open62541.example.server_register");
-    config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample Server");
+    config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample-Server");
     // See http://www.opcfoundation.org/UA/schemas/1.04/ServerCapabilities.csv
     //config.serverCapabilitiesSize = 1;
     //UA_String caps = UA_String_fromChars("LDS");
diff --git a/tests/fuzz/corpus_generator.c b/tests/fuzz/corpus_generator.c
index 06db031c721..c1570a36152 100644
--- a/tests/fuzz/corpus_generator.c
+++ b/tests/fuzz/corpus_generator.c
@@ -55,7 +55,7 @@ static void start_server(void) {
     UA_ServerConfig *config = UA_Server_getConfig(server);
     config->applicationDescription.applicationType = UA_APPLICATIONTYPE_SERVER;
     config->mdnsEnabled = true;
-    config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample Multicast Server");
+    config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample-Multicast-Server");
 
     UA_Server_run_startup(server);
     pthread_create(&server_thread, NULL, serverloop, NULL);
diff --git a/tests/fuzz/fuzz_tcp_message.cc b/tests/fuzz/fuzz_tcp_message.cc
index 1452d26b61e..24fe71e6dfe 100644
--- a/tests/fuzz/fuzz_tcp_message.cc
+++ b/tests/fuzz/fuzz_tcp_message.cc
@@ -70,7 +70,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
     // Enable the mDNS announce and response functionality
     config->mdnsEnabled = true;
-    config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample Multicast Server");
+    config->mdnsConfig.mdnsServerName = UA_String_fromChars("Sample-Multicast-Server");
 
     retval = UA_Server_run_startup(server);
     if(retval != UA_STATUSCODE_GOOD) {

From 44189f782b20022ce5a9e09a382d8ce1faa75f87 Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 19 Nov 2024 21:40:31 +0100
Subject: [PATCH 1735/1963] feat(ci): build and upload amalgamation sources for
 releases

---
 .github/workflows/release.yml | 18 ++++++++++++++++++
 tools/ci.sh                   | 15 +++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..bb40f67ead5
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,18 @@
+name: Build Release Artifacts
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - run: sudo apt-get install -y -qq libmbedtls-dev
+      - run: source tools/ci.sh && build_release_amalgamation
+      - run: gh release upload ${{ github.ref_name }} build/open62541.{c,h}
+        env:
+          GH_TOKEN: ${{ github.token }}
diff --git a/tools/ci.sh b/tools/ci.sh
index b76f5415c3d..42fc9dbc6a7 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -85,6 +85,21 @@ function build_release {
     make ${MAKEOPTS}
 }
 
+function build_release_amalgamation {
+    mkdir -p build; cd build; rm -rf *
+    cmake -DCMAKE_BUILD_TYPE=None \
+          -DUA_ENABLE_AMALGAMATION=ON \
+          -DUA_NAMESPACE_ZERO=FULL \
+          -DUA_ENABLE_DATATYPES_ALL=ON \
+          -DUA_ENABLE_ENCRYPTION=MBEDTLS \
+          -DUA_ENABLE_PUBSUB=ON \
+          -DUA_ENABLE_PUBSUB_ENCRYPTION=ON \
+          -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
+          ..
+
+    make ${MAKEOPTS}
+}
+
 ######################
 # Build Amalgamation #
 ######################

From 185bcf2f9543656e8205fefe0f1d960c43a54e0b Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 10 Dec 2024 15:25:21 +0100
Subject: [PATCH 1736/1963] feat(ci): always run release workflow

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bb40f67ead5..9821174bb0d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,6 +1,7 @@
 name: Build Release Artifacts
 
 on:
+  push:
   release:
     types: [published]
 
@@ -16,3 +17,4 @@ jobs:
       - run: gh release upload ${{ github.ref_name }} build/open62541.{c,h}
         env:
           GH_TOKEN: ${{ github.token }}
+        if: github.event_name == 'release'

From 34d957c56194b4842102cd97ef4fb55a12d0521d Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Thu, 9 Jan 2025 13:56:33 +0100
Subject: [PATCH 1737/1963] fix(server): Consistency in the use of the Windows
 architecture flag

---
 arch/eventloop_posix.c                  |  8 ++++----
 arch/eventloop_posix_eth.c              |  2 +-
 arch/eventloop_posix_interrupt.c        | 12 ++++++------
 arch/eventloop_posix_select.c           |  2 +-
 arch/eventloop_posix_tcp.c              |  8 ++++----
 arch/eventloop_posix_udp.c              | 18 +++++++++---------
 examples/common.h                       |  2 +-
 examples/tutorial_server_method_async.c |  2 +-
 plugins/ua_config_default.c             |  2 +-
 src/server/ua_discovery_mdns.c          | 12 ++++++------
 src/ua_util.c                           |  2 +-
 src/ua_util_internal.h                  |  2 +-
 tests/check_eventloop_interrupt.c       |  2 +-
 tests/check_types_memory.c              |  8 ++++----
 tests/server/check_discovery.c          |  8 ++++----
 tests/testing-plugins/testing_clock.c   |  2 +-
 tests/testing-plugins/thread_wrapper.h  |  4 ++--
 17 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 856d9df9e6a..68a84725715 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -415,7 +415,7 @@ UA_EventLoopPOSIX_free(UA_EventLoopPOSIX *el) {
     /* Process remaining delayed callbacks */
     processDelayed(el);
 
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     /* Stop the Windows networking subsystem */
     WSACleanup();
 #endif
@@ -437,7 +437,7 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger) {
     UA_LOCK_INIT(&el->elMutex);
     UA_Timer_init(&el->timer);
 
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     /* Start the WSA networking subsystem on Windows */
     WSADATA wsaData;
     WSAStartup(MAKEWORD(2, 2), &wsaData);
@@ -519,7 +519,7 @@ cmpFD(const UA_FD *a, const UA_FD *b) {
 
 UA_StatusCode
 UA_EventLoopPOSIX_setNonBlocking(UA_FD sockfd) {
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
     int opts = fcntl(sockfd, F_GETFL);
     if(opts < 0 || fcntl(sockfd, F_SETFL, opts | O_NONBLOCK) < 0)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -545,7 +545,7 @@ UA_EventLoopPOSIX_setNoSigPipe(UA_FD sockfd) {
 UA_StatusCode
 UA_EventLoopPOSIX_setReusable(UA_FD sockfd) {
     int enableReuseVal = 1;
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
     int res = UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
                             (const char*)&enableReuseVal, sizeof(enableReuseVal));
     res |= UA_setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT,
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index 636e8fe2815..d5daed93675 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -328,7 +328,7 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
         return;
 
     /* Receive */
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
     ssize_t ret = UA_recv(rfd->fd, (char*)response.data,
                           response.length, MSG_DONTWAIT);
 #else
diff --git a/arch/eventloop_posix_interrupt.c b/arch/eventloop_posix_interrupt.c
index e5ce5019beb..6a6bada1fbc 100644
--- a/arch/eventloop_posix_interrupt.c
+++ b/arch/eventloop_posix_interrupt.c
@@ -182,13 +182,13 @@ triggerPOSIXInterruptEvent(int sig) {
     TAILQ_INSERT_TAIL(&singletonIM->triggered, rs, triggeredEntry);
     rs->triggered = true;
 
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     /* On WIN32 we have to re-arm the signal or it will go back to SIG_DFL */
     signal(sig, triggerPOSIXInterruptEvent);
 #endif
 
     /* Trigger the FD in the EventLoop for the self-pipe trick */
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     int err = send(singletonIM->writeFD, ".", 1, 0);
 #else
     ssize_t err = write(singletonIM->writeFD, ".", 1);
@@ -255,7 +255,7 @@ executeTriggeredPOSIXInterrupts(UA_EventSource *es, UA_RegisteredFD *rfd, short
 
     /* Re-arm the socket for the next signal by reading from it */
     char buf[128];
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     recv(rfd->fd, buf, 128, 0); /* ignore the result */
 #else
     ssize_t i;
@@ -355,7 +355,7 @@ deregisterPOSIXInterrupt(UA_InterruptManager *im, uintptr_t interruptHandle) {
     UA_UNLOCK(&el->elMutex);
 }
 
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
 /* Windows has no pipes. Use a local TCP connection for the self-pipe trick.
  * https://stackoverflow.com/a/3333565 */
 static int
@@ -404,7 +404,7 @@ startPOSIXInterruptManager(UA_EventSource *es) {
 #ifndef UA_HAVE_EPOLL
     /* Create pipe for self-signaling */
     UA_FD pipefd[2];
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     int err = pair(pipefd);
 #else
     int err = pipe(pipefd);
@@ -419,7 +419,7 @@ startPOSIXInterruptManager(UA_EventSource *es) {
     }
 
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
     /* Mark pipes as non-blocking */
     for(size_t i = 0; i < (sizeof(pipefd) / sizeof(*pipefd)); ++i) {
         res = UA_EventLoopPOSIX_setNonBlocking(pipefd[i]);
diff --git a/arch/eventloop_posix_select.c b/arch/eventloop_posix_select.c
index 992e02f597f..5c976d57b35 100644
--- a/arch/eventloop_posix_select.c
+++ b/arch/eventloop_posix_select.c
@@ -114,7 +114,7 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
     }
 
     struct timeval tmptv = {
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
         (time_t)(listenTimeout / UA_DATETIME_SEC),
         (suseconds_t)((listenTimeout % UA_DATETIME_SEC) / UA_DATETIME_USEC)
 #else
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index 152412790a9..dd380acc425 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -119,7 +119,7 @@ TCP_delayedClose(void *application, void *context) {
 static int
 getSockError(TCP_FD *conn) {
     int error = 0;
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
     socklen_t errlen = sizeof(int);
     int err = getsockopt(conn->rfd.fd, SOL_SOCKET, SO_ERROR, &error, &errlen);
 #else
@@ -191,7 +191,7 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn,
     UA_ByteString response = pcm->rxBuffer;
 
     /* Receive */
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
     ssize_t ret = UA_recv(conn->rfd.fd, (char*)response.data,
                           response.length, MSG_DONTWAIT);
 #else
@@ -558,7 +558,7 @@ TCP_registerListenSockets(UA_POSIXConnectionManager *pcm, const char *hostname,
 
     int retcode = getaddrinfo(hostname, portstr, &hints, &res);
     if(retcode != 0) {
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
         UA_LOG_SOCKET_ERRNO_WRAP(
         UA_LOG_WARNING(pcm->cm.eventSource.eventLoop->logger, UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Lookup for \"%s\" on port %u failed (%s)",
@@ -808,7 +808,7 @@ TCP_openActiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *p
     hints.ai_socktype = SOCK_STREAM;
     int error = getaddrinfo(hostname, portStr, &hints, &info);
     if(error != 0) {
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
         UA_LOG_SOCKET_ERRNO_WRAP(
         UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
                        "TCP\t| Lookup of %s failed (%s)",
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index dd160bc301c..66b791bde9a 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -51,7 +51,7 @@ typedef struct {
     void *context;
 
     struct sockaddr_storage sendAddr;
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     size_t sendAddrLength;
 #else
     socklen_t sendAddrLength;
@@ -65,7 +65,7 @@ typedef enum {
 } MultiCastType;
 
 typedef union {
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     struct ip_mreq ipv4;
 #else
     struct ip_mreqn ipv4;
@@ -97,7 +97,7 @@ multiCastType(struct addrinfo *info) {
     return MULTICASTTYPE_NONE;
 }
 
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
 
 #define ADDR_BUFFER_SIZE 15000 /* recommended size in the MSVC docs */
 
@@ -230,7 +230,7 @@ setMulticastInterface(const char *netif, struct addrinfo *info,
     return UA_STATUSCODE_GOOD;
 }
 
-#endif /* _WIN32 */
+#endif /* UA_ARCHITECTURE_WIN32 */
 
 static UA_StatusCode
 setupMulticastRequest(UA_FD socket, MulticastRequest *req, const UA_KeyValueMap *params,
@@ -239,7 +239,7 @@ setupMulticastRequest(UA_FD socket, MulticastRequest *req, const UA_KeyValueMap
     if(info->ai_family == AF_INET) {
         struct sockaddr_in *sin = (struct sockaddr_in *)info->ai_addr;
         req->ipv4.imr_multiaddr = sin->sin_addr;
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
         req->ipv4.imr_interface.s_addr = htonl(INADDR_ANY); /* default ANY */
 #else
         req->ipv4.imr_address.s_addr = htonl(INADDR_ANY); /* default ANY */
@@ -529,7 +529,7 @@ setupSendMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *params
     int result = -1;
     if(info->ai_family == AF_INET && multiCastType == MULTICASTTYPE_IPV4) {
         result = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
                             (const char *)&req.ipv4.imr_interface,
                             sizeof(struct in_addr));
 #else
@@ -538,7 +538,7 @@ setupSendMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *params
 #if UA_IPV6
     } else if(info->ai_family == AF_INET6 && multiCastType == MULTICASTTYPE_IPV6) {
         result = setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_IF,
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
                             (const char *)&req.ipv6.ipv6mr_interface,
 #else
                             &req.ipv6.ipv6mr_interface,
@@ -657,7 +657,7 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
 
     /* Receive */
     struct sockaddr_storage source;
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
     socklen_t sourceSize = (socklen_t)sizeof(struct sockaddr_storage);
     ssize_t ret = recvfrom(conn->rfd.fd, (char*)response.data, response.length,
                            MSG_DONTWAIT, (struct sockaddr*)&source, &sourceSize);
@@ -775,7 +775,7 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
     MultiCastType mc = multiCastType(info);
 
     /* Bind socket to the address */
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     /* On windows we need to bind the socket to INADDR_ANY before registering
      * for the multicast group */
     int ret = -1;
diff --git a/examples/common.h b/examples/common.h
index 156d2440f2d..75abc132f3e 100644
--- a/examples/common.h
+++ b/examples/common.h
@@ -7,7 +7,7 @@
 #include <errno.h>
 
 /* sleep_ms */
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
 # include <synchapi.h>
 # define sleep_ms(ms) Sleep(ms)
 #else
diff --git a/examples/tutorial_server_method_async.c b/examples/tutorial_server_method_async.c
index cd1d6112f2e..1a4c8d429e1 100644
--- a/examples/tutorial_server_method_async.c
+++ b/examples/tutorial_server_method_async.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include "common.h"
 
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
 #include <pthread.h>
 #define THREAD_HANDLE pthread_t
 #define THREAD_CREATE(handle, callback) do {            \
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 8ff37094bd7..8641e1fc844 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -25,7 +25,7 @@
 #include "../deps/mp_printf.h"
 
 #include <stdio.h>
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
 # include <winsock2.h>
 #else
 # include <unistd.h>
diff --git a/src/server/ua_discovery_mdns.c b/src/server/ua_discovery_mdns.c
index c53abd4d343..5f5e6ab23b7 100644
--- a/src/server/ua_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -19,7 +19,7 @@
 
 #include "../deps/mp_printf.h"
 
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
 /* inet_ntoa is deprecated on MSVC but used for compatibility */
 # define _WINSOCK_DEPRECATED_NO_WARNINGS
 # include <winsock2.h>
@@ -132,7 +132,7 @@ UA_DiscoveryManager_addEntryToServersOnNetwork(UA_DiscoveryManager *dm,
     return UA_STATUSCODE_GOOD;
 }
 
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
 
 /* see http://stackoverflow.com/a/10838854/869402 */
 static IP_ADAPTER_ADDRESSES *
@@ -178,7 +178,7 @@ getInterfaces(UA_DiscoveryManager *dm) {
     return adapter_addresses;
 }
 
-#endif /* _WIN32 */
+#endif /* UA_ARCHITECTURE_WIN32 */
 
 UA_StatusCode
 UA_DiscoveryManager_removeEntryFromServersOnNetwork(UA_DiscoveryManager *dm,
@@ -523,7 +523,7 @@ mdns_set_address_record_if(UA_DiscoveryManager *dm, const char *fullServiceDomai
 }
 
 /* Loop over network interfaces and run set_address_record on each */
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
 
 void mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
                              const char *localDomain) {
@@ -617,7 +617,7 @@ mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
     /* Clean up */
     freeifaddrs(ifaddr);
 }
-#else /* _WIN32 */
+#else /* UA_ARCHITECTURE_WIN32 */
 
 void
 mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
@@ -634,7 +634,7 @@ mdns_set_address_record(UA_DiscoveryManager *dm, const char *fullServiceDomain,
     }
 }
 
-#endif /* _WIN32 */
+#endif /* UA_ARCHITECTURE_WIN32 */
 
 typedef enum {
     UA_DISCOVERY_TCP,    /* OPC UA TCP mapping */
diff --git a/src/ua_util.c b/src/ua_util.c
index 18ab6f94bbe..2e84e4a497a 100644
--- a/src/ua_util.c
+++ b/src/ua_util.c
@@ -579,7 +579,7 @@ void
 UA_ByteString_memZero(UA_ByteString *bs) {
 #if defined(__STDC_LIB_EXT1__)
    memset_s(bs->data, bs->length, 0, bs->length);
-#elif defined(_WIN32)
+#elif defined(UA_ARCHITECTURE_WIN32)
    SecureZeroMemory(bs->data, bs->length);
 #else
    volatile unsigned char *volatile ptr =
diff --git a/src/ua_util_internal.h b/src/ua_util_internal.h
index 90020d00f33..6497a22fe39 100644
--- a/src/ua_util_internal.h
+++ b/src/ua_util_internal.h
@@ -182,7 +182,7 @@ isTrue(uint8_t expr) {
  * ----------------- */
 
 #ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
-# ifdef _WIN32
+# ifdef UA_ARCHITECTURE_WIN32
 #  include <io.h>
 #  define UA_fileExists(X) ( _access(X, 0) == 0)
 # else
diff --git a/tests/check_eventloop_interrupt.c b/tests/check_eventloop_interrupt.c
index 9cfd4326745..5c122bedeba 100644
--- a/tests/check_eventloop_interrupt.c
+++ b/tests/check_eventloop_interrupt.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <check.h>
 
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
 #define TESTSIG SIGUSR1
 #else
 #define TESTSIG SIGINT
diff --git a/tests/check_types_memory.c b/tests/check_types_memory.c
index 8e311c4f56a..f8d75ce4a9b 100644
--- a/tests/check_types_memory.c
+++ b/tests/check_types_memory.c
@@ -143,14 +143,14 @@ START_TEST(decodeScalarBasicTypeFromRandomBufferShallSucceed) {
     UA_UInt32 buflen = 256;
     UA_StatusCode retval = UA_ByteString_allocBuffer(&msg1, buflen); // fixed size
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     srand(42);
 #else
     srandom(42);
 #endif
     for(int n = 0;n < RANDOM_TESTS;n++) {
         for(UA_UInt32 i = 0;i < buflen;i++) {
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
             UA_UInt32 rnd;
             rnd = rand();
             msg1.data[i] = rnd;
@@ -179,7 +179,7 @@ START_TEST(decodeComplexTypeFromRandomBufferShallSurvive) {
     UA_UInt32 buflen = 256;
     UA_StatusCode retval = UA_ByteString_allocBuffer(&msg1, buflen); // fixed size
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     srand(42);
 #else
     srandom(42);
@@ -187,7 +187,7 @@ START_TEST(decodeComplexTypeFromRandomBufferShallSurvive) {
     // when
     for(int n = 0; n < RANDOM_TESTS; n++) {
         for(UA_UInt32 i = 0; i < buflen; i++) {
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
             UA_UInt32 rnd;
             rnd = rand();
             msg1.data[i] = rnd;
diff --git a/tests/server/check_discovery.c b/tests/server/check_discovery.c
index 37862a25446..51cb7bb6c49 100644
--- a/tests/server/check_discovery.c
+++ b/tests/server/check_discovery.c
@@ -15,14 +15,14 @@
 
 #include "testing_clock.h"
 #include "thread_wrapper.h"
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
 #include <sys/stat.h>
 #endif
 
 #include <check.h>
 #include <stdlib.h>
 
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
 #include <sys/stat.h>
 #endif
 
@@ -32,7 +32,7 @@
 #define checkWait registerTimeout + 11
 
 #ifdef UA_ENABLE_DISCOVERY_SEMAPHORE
-# ifndef _WIN32
+# ifndef UA_ARCHITECTURE_WIN32
 #  define SEMAPHORE_PATH "/tmp/open62541-unit-test-semaphore"
 # else
 #  define SEMAPHORE_PATH ".\\open62541-unit-test-semaphore"
@@ -246,7 +246,7 @@ unregisterServer(void) {
 static void
 Server_register_semaphore(void) {
     // create the semaphore
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
     int fd = open(SEMAPHORE_PATH, O_RDWR|O_CREAT, S_IRWXU | S_IRWXG | S_IRWXO);
     ck_assert_int_ne(fd, -1);
     close(fd);
diff --git a/tests/testing-plugins/testing_clock.c b/tests/testing-plugins/testing_clock.c
index 5a23452a6b6..867b6c5d145 100644
--- a/tests/testing-plugins/testing_clock.c
+++ b/tests/testing-plugins/testing_clock.c
@@ -31,7 +31,7 @@ UA_fakeSleep(UA_UInt32 duration) {
 
 void
 UA_realSleep(UA_UInt32 duration) {
-#ifdef _WIN32
+#ifdef UA_ARCHITECTURE_WIN32
     Sleep(duration);
 #else
     UA_UInt32 sec = duration / 1000;
diff --git a/tests/testing-plugins/thread_wrapper.h b/tests/testing-plugins/thread_wrapper.h
index 98ee2fd7adb..bc3deeeb6e7 100644
--- a/tests/testing-plugins/thread_wrapper.h
+++ b/tests/testing-plugins/thread_wrapper.h
@@ -6,7 +6,7 @@
 
 /* Threads */
 
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
 #include <pthread.h>
 #define THREAD_HANDLE pthread_t
 #define THREAD_CREATE(handle, callback) pthread_create(&handle, NULL, callback, NULL)
@@ -31,7 +31,7 @@
 /* Windows returns non-zero on success and pthread returns zero,
  * so compare to zero to achieve consistent return values */
 
-#ifndef _WIN32
+#ifndef UA_ARCHITECTURE_WIN32
 #define MUTEX_HANDLE pthread_mutex_t
 
 /* Will return UA_TRUE when zero */

From 087b80953d0fb8d089b30239d071d3af115865f8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Jan 2025 22:12:44 +0100
Subject: [PATCH 1738/1963] refactor(core): Use recursive locks

---
 include/open62541/config.h.in | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index baaa1fcb388..0fc00415054 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -341,7 +341,12 @@ extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
 
 /**
  * Locking for Multithreading
- * -------------------------- */
+ * --------------------------
+ * If locking is enabled, the locks must be reentrant. That is, the same thread
+ * must be able to take the same lock several times. This is required because we
+ * sometimes call a user-defined callback when the server-lock is still held.
+ * The user-defined code then should be able to call (public) methods which
+ * again take the server-lock. */
 
 #if UA_MULTITHREADING < 100
 
@@ -354,6 +359,7 @@ extern UA_THREAD_LOCAL void * (*UA_reallocSingleton)(void *ptr, size_t size);
 #elif defined(UA_ARCHITECTURE_WIN32)
 
 typedef struct {
+    /* Critical sections on win32 are always recursive */
     CRITICAL_SECTION mutex;
     int mutexCounter;
 } UA_Lock;
@@ -372,18 +378,18 @@ UA_LOCK_DESTROY(UA_Lock *lock) {
 static UA_INLINE void
 UA_LOCK(UA_Lock *lock) {
     EnterCriticalSection(&lock->mutex);
-    UA_assert(++(lock->mutexCounter) == 1);
+    ++lock->mutexCounter;
 }
 
 static UA_INLINE void
 UA_UNLOCK(UA_Lock *lock) {
-    UA_assert(--(lock->mutexCounter) == 0);
+    --lock->mutexCounter;
     LeaveCriticalSection(&lock->mutex);
 }
 
 static UA_INLINE void
 UA_LOCK_ASSERT(UA_Lock *lock, int num) {
-    UA_assert(lock->mutexCounter == num);
+    UA_assert(num <= 0 || lock->mutexCounter > 0);
 }
 
 #elif defined(UA_ARCHITECTURE_POSIX)
@@ -395,11 +401,14 @@ typedef struct {
     int mutexCounter;
 } UA_Lock;
 
-#define UA_LOCK_STATIC_INIT {PTHREAD_MUTEX_INITIALIZER, 0}
+#define UA_LOCK_STATIC_INIT {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, 0}
 
 static UA_INLINE void
 UA_LOCK_INIT(UA_Lock *lock) {
-    pthread_mutex_init(&lock->mutex, NULL);
+    pthread_mutexattr_t mattr;
+    pthread_mutexattr_init(&mattr);
+    pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_RECURSIVE);
+    pthread_mutex_init(&lock->mutex, &mattr);
     lock->mutexCounter = 0;
 }
 
@@ -411,20 +420,18 @@ UA_LOCK_DESTROY(UA_Lock *lock) {
 static UA_INLINE void
 UA_LOCK(UA_Lock *lock) {
     pthread_mutex_lock(&lock->mutex);
-    UA_assert(lock->mutexCounter == 0);
     lock->mutexCounter++;
 }
 
 static UA_INLINE void
 UA_UNLOCK(UA_Lock *lock) {
-    UA_assert(lock->mutexCounter == 1);
     lock->mutexCounter--;
     pthread_mutex_unlock(&lock->mutex);
 }
 
 static UA_INLINE void
 UA_LOCK_ASSERT(UA_Lock *lock, int num) {
-    UA_assert(lock->mutexCounter == num);
+    UA_assert(num <= 0 || lock->mutexCounter > 0);
 }
 
 #endif

From d3dcdea6a94a64980d1518f9a2053b632c8c5155 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Jan 2025 22:30:03 +0100
Subject: [PATCH 1739/1963] refactor(server): Simplify for recursive locks in
 ua_services_attribute.c

---
 src/server/ua_services_attribute.c | 41 +++++-------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 6c5079a6a7a..56f6f8d1bfd 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -74,18 +74,14 @@ attributeId2AttributeMask(UA_AttributeId id) {
 static UA_UInt32
 getUserWriteMask(UA_Server *server, const UA_Session *session,
                  const UA_NodeHead *head) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(session == &server->adminSession)
         return 0xFFFFFFFF; /* the local admin user has all rights */
-    UA_UInt32 mask = head->writeMask;
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_UNLOCK(&server->serviceMutex);
-    mask &= server->config.accessControl.
+    return head->writeMask & server->config.accessControl.
         getUserRightsMask(server, &server->config.accessControl,
                           session ? &session->sessionId : NULL,
                           session ? session->sessionHandle : NULL,
                           &head->nodeId, head->context);
-    UA_LOCK(&server->serviceMutex);
-    return mask;
 }
 
 static UA_Byte
@@ -99,36 +95,27 @@ getAccessLevel(UA_Server *server, const UA_Session *session,
 static UA_Byte
 getUserAccessLevel(UA_Server *server, const UA_Session *session,
                    const UA_VariableNode *node) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(session == &server->adminSession)
         return 0xFF; /* the local admin user has all rights */
-    UA_Byte retval = node->accessLevel;
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_UNLOCK(&server->serviceMutex);
-    retval &= server->config.accessControl.
+    return node->accessLevel & server->config.accessControl.
         getUserAccessLevel(server, &server->config.accessControl,
                            session ? &session->sessionId : NULL,
                            session ? session->sessionHandle : NULL,
                            &node->head.nodeId, node->head.context);
-    UA_LOCK(&server->serviceMutex);
-    return retval;
 }
 
 static UA_Boolean
 getUserExecutable(UA_Server *server, const UA_Session *session,
                   const UA_MethodNode *node) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(session == &server->adminSession)
         return true; /* the local admin user has all rights */
-    UA_LOCK_ASSERT(&server->serviceMutex, 1);
-    UA_UNLOCK(&server->serviceMutex);
-    UA_Boolean userExecutable = node->executable;
-    userExecutable &=
-        server->config.accessControl.
+    return node->executable & server->config.accessControl.
         getUserExecutable(server, &server->config.accessControl,
                           session ? &session->sessionId : NULL,
                           session ? session->sessionHandle : NULL,
                           &node->head.nodeId, node->head.context);
-    UA_LOCK(&server->serviceMutex);
-    return userExecutable;
 }
 
 /****************/
@@ -165,13 +152,11 @@ readValueAttributeFromNode(UA_Server *server, UA_Session *session,
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
     /* Update the value by the user callback */
     if(vn->value.data.callback.onRead) {
-        UA_UNLOCK(&server->serviceMutex);
         vn->value.data.callback.onRead(server,
                                        session ? &session->sessionId : NULL,
                                        session ? session->sessionHandle : NULL,
                                        &vn->head.nodeId, vn->head.context, rangeptr,
                                        &vn->value.data.value);
-        UA_LOCK(&server->serviceMutex);
         vn = (const UA_VariableNode*)
             UA_NODESTORE_GET_SELECTIVE(server, &vn->head.nodeId,
                                        UA_NODEATTRIBUTESMASK_VALUE,
@@ -209,14 +194,12 @@ readValueAttributeFromDataSource(UA_Server *server, UA_Session *session,
                                   timestamps == UA_TIMESTAMPSTORETURN_BOTH);
     UA_DataValue v2;
     UA_DataValue_init(&v2);
-    UA_UNLOCK(&server->serviceMutex);
     UA_StatusCode retval = vn->value.dataSource.
         read(server,
              session ? &session->sessionId : NULL,
              session ? session->sessionHandle : NULL,
              &vn->head.nodeId, vn->head.context,
              sourceTimeStamp, rangeptr, &v2);
-    UA_LOCK(&server->serviceMutex);
     if(v2.hasValue && v2.value.storageType == UA_VARIANT_DATA_NODELETE) {
         retval = UA_DataValue_copy(&v2, v);
         UA_DataValue_clear(&v2);
@@ -1486,21 +1469,17 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
             /* Callback after writing */
             if(retval == UA_STATUSCODE_GOOD &&
                node->value.data.callback.onWrite) {
-                UA_UNLOCK(&server->serviceMutex);
                 node->value.data.callback.
                     onWrite(server, &session->sessionId, session->sessionHandle,
                             &node->head.nodeId, node->head.context,
                             rangeptr, &adjustedValue);
-                UA_LOCK(&server->serviceMutex);
             }
         } else if(node->value.dataSource.write) {
             /* Write via the datasource callback */
-            UA_UNLOCK(&server->serviceMutex);
             retval = node->value.dataSource.
                 write(server, &session->sessionId, session->sessionHandle,
                       &node->head.nodeId, node->head.context,
                       rangeptr, &adjustedValue);
-            UA_LOCK(&server->serviceMutex);
         }
         break;
 
@@ -1532,12 +1511,10 @@ writeNodeValueAttribute(UA_Server *server, UA_Session *session,
     if(retval == UA_STATUSCODE_GOOD &&
        node->head.nodeClass == UA_NODECLASS_VARIABLE &&
        server->config.historyDatabase.setValue) {
-        UA_UNLOCK(&server->serviceMutex);
         server->config.historyDatabase.
             setValue(server, server->config.historyDatabase.context,
                      &session->sessionId, session->sessionHandle,
                      &node->head.nodeId, node->historizing, &adjustedValue);
-        UA_LOCK(&server->serviceMutex);
     }
 #endif
 
@@ -2008,7 +1985,6 @@ Service_HistoryRead(UA_Server *server, UA_Session *session,
                                     data, historyDataType);
         historyData[i] = data;
     }
-    UA_UNLOCK(&server->serviceMutex);
     readHistory(server, server->config.historyDatabase.context,
                 &session->sessionId, session->sessionHandle,
                 &request->requestHeader,
@@ -2017,7 +1993,6 @@ Service_HistoryRead(UA_Server *server, UA_Session *session,
                 request->releaseContinuationPoints,
                 request->nodesToReadSize, request->nodesToRead,
                 response, historyData);
-    UA_LOCK(&server->serviceMutex);
     UA_free(historyData);
 }
 
@@ -2053,14 +2028,12 @@ Service_HistoryUpdate(UA_Server *server, UA_Session *session,
                 response->results[i].statusCode = UA_STATUSCODE_BADNOTSUPPORTED;
                 continue;
             }
-            UA_UNLOCK(&server->serviceMutex);
             server->config.historyDatabase.
                 updateData(server, server->config.historyDatabase.context,
                            &session->sessionId, session->sessionHandle,
                            &request->requestHeader,
                            (UA_UpdateDataDetails*)updateDetailsData,
                            &response->results[i]);
-            UA_LOCK(&server->serviceMutex);
             continue;
         }
 
@@ -2069,14 +2042,12 @@ Service_HistoryUpdate(UA_Server *server, UA_Session *session,
                 response->results[i].statusCode = UA_STATUSCODE_BADNOTSUPPORTED;
                 continue;
             }
-            UA_UNLOCK(&server->serviceMutex);
             server->config.historyDatabase.
                 deleteRawModified(server, server->config.historyDatabase.context,
                                   &session->sessionId, session->sessionHandle,
                                   &request->requestHeader,
                                   (UA_DeleteRawModifiedDetails*)updateDetailsData,
                                   &response->results[i]);
-            UA_LOCK(&server->serviceMutex);
             continue;
         }
 

From e2023e15376ac61c68ab304885b78f3e453dde7a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Jan 2025 22:32:34 +0100
Subject: [PATCH 1740/1963] refactor(server): Simplify with recursive locks in
 ua_services_nodemanagement.c

---
 src/server/ua_services_nodemanagement.c | 28 -------------------------
 1 file changed, 28 deletions(-)

diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 40908b79501..51a20f81257 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -631,11 +631,9 @@ copyChild(UA_Server *server, UA_Session *session,
     if(!isMandatoryChild(server, session, &rd->nodeId.nodeId)) {
         if(!server->config.nodeLifecycle.createOptionalChild)
             return UA_STATUSCODE_GOOD;
-        UA_UNLOCK(&server->serviceMutex);
         UA_Boolean createChild = server->config.nodeLifecycle.
             createOptionalChild(server, &session->sessionId, session->sessionHandle,
                                 &rd->nodeId.nodeId, destinationNodeId, &rd->referenceTypeId);
-        UA_LOCK(&server->serviceMutex);
         if(!createChild)
             return UA_STATUSCODE_GOOD;
     }
@@ -684,12 +682,10 @@ copyChild(UA_Server *server, UA_Session *session,
         node->head.nodeId.namespaceIndex = destinationNodeId->namespaceIndex;
 
         if(server->config.nodeLifecycle.generateChildNodeId) {
-            UA_UNLOCK(&server->serviceMutex);
             retval = server->config.nodeLifecycle.
                 generateChildNodeId(server, &session->sessionId, session->sessionHandle,
                                     &rd->nodeId.nodeId, destinationNodeId,
                                     &rd->referenceTypeId, &node->head.nodeId);
-            UA_LOCK(&server->serviceMutex);
             if(retval != UA_STATUSCODE_GOOD) {
                 UA_NODESTORE_DELETE(server, node);
                 return retval;
@@ -1036,14 +1032,11 @@ addNode_raw(UA_Server *server, UA_Session *session, void *nodeContext,
     /* Do not check access for server */
     if(session != &server->adminSession && server->config.accessControl.allowAddNode) {
         UA_LOCK_ASSERT(&server->serviceMutex, 1);
-        UA_UNLOCK(&server->serviceMutex);
         if(!server->config.accessControl.
            allowAddNode(server, &server->config.accessControl,
                         &session->sessionId, session->sessionHandle, item)) {
-            UA_LOCK(&server->serviceMutex);
             return UA_STATUSCODE_BADUSERACCESSDENIED;
         }
-        UA_LOCK(&server->serviceMutex);
     }
 
     /* Check the namespaceindex */
@@ -1289,11 +1282,9 @@ recursiveCallConstructors(UA_Server *server, UA_Session *session,
 
     /* Call the global constructor */
     if(server->config.nodeLifecycle.constructor) {
-        UA_UNLOCK(&server->serviceMutex);
         retval = server->config.nodeLifecycle.
             constructor(server, &session->sessionId,
                         session->sessionHandle, nodeId, &context);
-        UA_LOCK(&server->serviceMutex);
         if(retval != UA_STATUSCODE_GOOD)
             return retval;
     }
@@ -1305,11 +1296,9 @@ recursiveCallConstructors(UA_Server *server, UA_Session *session,
     else if(type && node->head.nodeClass == UA_NODECLASS_VARIABLE)
         lifecycle = &type->variableTypeNode.lifecycle;
     if(lifecycle && lifecycle->constructor) {
-        UA_UNLOCK(&server->serviceMutex);
         retval = lifecycle->constructor(server, &session->sessionId,
                                         session->sessionHandle, &type->head.nodeId,
                                         type->head.context, nodeId, &context);
-        UA_LOCK(&server->serviceMutex);
         if(retval != UA_STATUSCODE_GOOD)
             goto global_destructor;
     }
@@ -1326,19 +1315,15 @@ recursiveCallConstructors(UA_Server *server, UA_Session *session,
     /* Fail. Call the destructors. */
   local_destructor:
     if(lifecycle && lifecycle->destructor) {
-        UA_UNLOCK(&server->serviceMutex);
         lifecycle->destructor(server, &session->sessionId, session->sessionHandle,
                               &type->head.nodeId, type->head.context, nodeId, &context);
-        UA_LOCK(&server->serviceMutex);
     }
 
   global_destructor:
     if(server->config.nodeLifecycle.destructor) {
-        UA_UNLOCK(&server->serviceMutex);
         server->config.nodeLifecycle.destructor(server, &session->sessionId,
                                                 session->sessionHandle,
                                                 nodeId, context);
-        UA_LOCK(&server->serviceMutex);
     }
     return retval;
 }
@@ -1830,12 +1815,10 @@ deconstructNodeSet(UA_Server *server, UA_Session *session,
 
                /* Call the destructor */
                if(lifecycle->destructor) {
-                  UA_UNLOCK(&server->serviceMutex);
                   lifecycle->destructor(server,
                                         &session->sessionId, session->sessionHandle,
                                         &type->head.nodeId, type->head.context,
                                         &member->head.nodeId, &context);
-                  UA_LOCK(&server->serviceMutex);
                }
 
                /* Release the type node */
@@ -1845,11 +1828,9 @@ deconstructNodeSet(UA_Server *server, UA_Session *session,
 
         /* Call the global destructor */
         if(server->config.nodeLifecycle.destructor) {
-            UA_UNLOCK(&server->serviceMutex);
             server->config.nodeLifecycle.destructor(server, &session->sessionId,
                                                     session->sessionHandle,
                                                     &member->head.nodeId, context);
-            UA_LOCK(&server->serviceMutex);
         }
 
         /* Release the node. Don't access the node context from here on. */
@@ -1965,15 +1946,12 @@ deleteNodeOperation(UA_Server *server, UA_Session *session, void *context,
 
     /* Do not check access for server */
     if(session != &server->adminSession && server->config.accessControl.allowDeleteNode) {
-        UA_UNLOCK(&server->serviceMutex);
         if(!server->config.accessControl.
            allowDeleteNode(server, &server->config.accessControl,
                            &session->sessionId, session->sessionHandle, item)) {
-            UA_LOCK(&server->serviceMutex);
             *result = UA_STATUSCODE_BADUSERACCESSDENIED;
             return;
         }
-        UA_LOCK(&server->serviceMutex);
     }
 
     const UA_Node *node = UA_NODESTORE_GET(server, &item->nodeId);
@@ -2119,15 +2097,12 @@ Operation_addReference(UA_Server *server, UA_Session *session, void *context,
 
     /* Check access rights */
     if(session != &server->adminSession && server->config.accessControl.allowAddReference) {
-        UA_UNLOCK(&server->serviceMutex);
         if (!server->config.accessControl.
                 allowAddReference(server, &server->config.accessControl,
                                   &session->sessionId, session->sessionHandle, item)) {
-            UA_LOCK(&server->serviceMutex);
             *retval = UA_STATUSCODE_BADUSERACCESSDENIED;
             return;
         }
-        UA_LOCK(&server->serviceMutex);
     }
 
     /* TODO: Currently no expandednodeids are allowed */
@@ -2290,15 +2265,12 @@ Operation_deleteReference(UA_Server *server, UA_Session *session, void *context,
     if(session != &server->adminSession &&
        server->config.accessControl.allowDeleteReference) {
         UA_LOCK_ASSERT(&server->serviceMutex, 1);
-        UA_UNLOCK(&server->serviceMutex);
         if (!server->config.accessControl.
                 allowDeleteReference(server, &server->config.accessControl,
                                      &session->sessionId, session->sessionHandle, item)){
-            UA_LOCK(&server->serviceMutex);
             *retval = UA_STATUSCODE_BADUSERACCESSDENIED;
             return;
         }
-        UA_LOCK(&server->serviceMutex);
     }
 
     // TODO: Check consistency constraints, remove the references.

From f95ebddcdf701e90dd2db1d18825ce932606c8d7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Jan 2025 22:33:19 +0100
Subject: [PATCH 1741/1963] refactor(server): Simplify with recursive locks in
 ua_services_method.c

---
 src/server/ua_services_method.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index d8f8e8ecfe0..17367729f33 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -266,13 +266,11 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
     /* Verify access rights */
     UA_Boolean executable = method->executable;
     if(session != &server->adminSession) {
-        UA_UNLOCK(&server->serviceMutex);
         executable = executable && server->config.accessControl.
             getUserExecutableOnObject(server, &server->config.accessControl,
                                       &session->sessionId, session->sessionHandle,
                                       &request->methodId, method->head.context,
                                       &request->objectId, object->head.context);
-        UA_LOCK(&server->serviceMutex);
     }
 
     if(!executable) {
@@ -349,13 +347,11 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
     UA_NODESTORE_RELEASE(server, (const UA_Node*)outputArguments);
 
     /* Call the method */
-    UA_UNLOCK(&server->serviceMutex);
     result->statusCode = method->method(server, &session->sessionId, session->sessionHandle,
                                         &method->head.nodeId, method->head.context,
                                         &object->head.nodeId, object->head.context,
                                         request->inputArgumentsSize, mutableInputArgs,
                                         result->outputArgumentsSize, result->outputArguments);
-    UA_LOCK(&server->serviceMutex);
     /* TODO: Verify Output matches the argument definition */
 }
 

From a90da1a56ec2c9f54c6d8a8d1d34922a7785379e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Jan 2025 22:39:04 +0100
Subject: [PATCH 1742/1963] refactor(arch): Simplify with recursive locking in
 the EventLoop

---
 arch/common/ua_timer.c     |  2 --
 arch/eventloop_posix.c     | 10 ----------
 arch/eventloop_posix_eth.c |  6 +-----
 arch/eventloop_posix_tcp.c | 12 ------------
 arch/eventloop_posix_udp.c |  8 --------
 5 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index 549d439ac75..438e5eb5d96 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -204,9 +204,7 @@ processEntryCallback(void *context, UA_TimerEntry *te) {
      * Instead, whenever t->processTree != NULL, the entries are only marked for
      * deletion by setting elm->callback to NULL. */
     if(te->callback) {
-        UA_UNLOCK(&t->timerMutex);
         te->callback(te->application, te->data);
-        UA_LOCK(&t->timerMutex);
     }
 
     /* Remove and free the entry if marked for deletion or a one-time timed
diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 68a84725715..48675e052aa 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -110,9 +110,7 @@ processDelayed(UA_EventLoopPOSIX *el) {
          * StatusCode during "add" and don't validate. So test here. */
         if(!dc->callback)
             continue;
-        UA_UNLOCK(&el->elMutex);
         dc->callback(dc->application, dc->context);
-        UA_LOCK(&el->elMutex);
     }
 }
 
@@ -148,9 +146,7 @@ UA_EventLoopPOSIX_start(UA_EventLoopPOSIX *el) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_EventSource *es = el->eventLoop.eventSources;
     while(es) {
-        UA_UNLOCK(&el->elMutex);
         res |= es->start(es);
-        UA_LOCK(&el->elMutex);
         es = es->next;
     }
 
@@ -213,9 +209,7 @@ UA_EventLoopPOSIX_stop(UA_EventLoopPOSIX *el) {
     for(; es; es = es->next) {
         if(es->state == UA_EVENTSOURCESTATE_STARTING ||
            es->state == UA_EVENTSOURCESTATE_STARTED) {
-            UA_UNLOCK(&el->elMutex);
             es->stop(es);
-            UA_LOCK(&el->elMutex);
         }
     }
 
@@ -255,9 +249,7 @@ UA_EventLoopPOSIX_run(UA_EventLoopPOSIX *el, UA_UInt32 timeout) {
     UA_DateTime dateBefore =
         el->eventLoop.dateTime_nowMonotonic(&el->eventLoop);
 
-    UA_UNLOCK(&el->elMutex);
     UA_DateTime dateNext = UA_Timer_process(&el->timer, dateBefore);
-    UA_LOCK(&el->elMutex);
 
     /* Process delayed callbacks here:
      * - Removes closed sockets already here instead of polling them again.
@@ -403,9 +395,7 @@ UA_EventLoopPOSIX_free(UA_EventLoopPOSIX *el) {
     /* Deregister and delete all the EventSources */
     while(el->eventLoop.eventSources) {
         UA_EventSource *es = el->eventLoop.eventSources;
-        UA_UNLOCK(&el->elMutex);
         UA_EventLoopPOSIX_deregisterEventSource(el, es);
-        UA_LOCK(&el->elMutex);
         es->free(es);
     }
 
diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index d5daed93675..f2a1564e4cf 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -253,12 +253,10 @@ ETH_close(UA_POSIXConnectionManager *pcm, ETH_FD *conn) {
     pcm->fdsSize--;
 
     /* Signal closing to the application */
-    UA_UNLOCK(&el->elMutex);
     conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
                         conn->application, &conn->context,
                         UA_CONNECTIONSTATE_CLOSING,
                         &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-    UA_LOCK(&el->elMutex);
 
     /* Close the socket */
     int ret = UA_close(conn->rfd.fd);
@@ -411,10 +409,8 @@ ETH_connectionSocketCallback(UA_ConnectionManager *cm, UA_RegisteredFD *rfd,
     /* Callback to the application layer with the Ethernet header hidden */
     response.data += headerSize;
     response.length -= headerSize;
-    UA_UNLOCK(&el->elMutex);
     conn->applicationCB(cm, (uintptr_t)rfd->fd, conn->application, &conn->context,
                         UA_CONNECTIONSTATE_ESTABLISHED, &map, response);
-    UA_LOCK(&el->elMutex);
     response.data -= headerSize;
     response.length += headerSize;
     UA_ByteString_clear(&response);
@@ -695,10 +691,10 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
     pcm->fdsSize++;
 
     /* Register the listen socket in the application */
-    UA_UNLOCK(&el->elMutex);
     connectionCallback(cm, (uintptr_t)sockfd, application, &conn->context,
                        UA_CONNECTIONSTATE_ESTABLISHED, &UA_KEYVALUEMAP_NULL,
                        UA_BYTESTRING_NULL);
+    UA_UNLOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 
  cleanup:
diff --git a/arch/eventloop_posix_tcp.c b/arch/eventloop_posix_tcp.c
index dd380acc425..12919afffdb 100644
--- a/arch/eventloop_posix_tcp.c
+++ b/arch/eventloop_posix_tcp.c
@@ -89,12 +89,10 @@ TCP_delayedClose(void *application, void *context) {
     pcm->fdsSize--;
 
     /* Signal closing to the application */
-    UA_UNLOCK(&el->elMutex);
     conn->applicationCB(cm, (uintptr_t)conn->rfd.fd,
                         conn->application, &conn->context,
                         UA_CONNECTIONSTATE_CLOSING,
                         &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-    UA_LOCK(&el->elMutex);
 
     /* Close the socket */
     int ret = UA_close(conn->rfd.fd);
@@ -173,12 +171,10 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn,
         UA_EventLoopPOSIX_modifyFD(el, &conn->rfd);
 
         /* A new socket has opened. Signal it to the application. */
-        UA_UNLOCK(&el->elMutex);
         conn->applicationCB(cm, (uintptr_t)conn->rfd.fd,
                             conn->application, &conn->context,
                             UA_CONNECTIONSTATE_ESTABLISHED,
                             &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-        UA_LOCK(&el->elMutex);
         return;
     }
 
@@ -221,12 +217,10 @@ TCP_connectionSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn,
 
     /* Callback to the application layer */
     response.length = (size_t)ret; /* Set the length of the received buffer */
-    UA_UNLOCK(&el->elMutex);
     conn->applicationCB(cm, (uintptr_t)conn->rfd.fd,
                         conn->application, &conn->context,
                         UA_CONNECTIONSTATE_ESTABLISHED,
                         &UA_KEYVALUEMAP_NULL, response);
-    UA_LOCK(&el->elMutex);
 }
 
 /* Gets called when a new connection opens or if the listenSocket is closed */
@@ -335,12 +329,10 @@ TCP_listenSocketCallback(UA_ConnectionManager *cm, TCP_FD *conn, short event) {
     kvm.map = &kvp;
 
     /* The socket has opened. Signal it to the application. */
-    UA_UNLOCK(&el->elMutex);
     newConn->applicationCB(cm, (uintptr_t)newsockfd,
                            newConn->application, &newConn->context,
                            UA_CONNECTIONSTATE_ESTABLISHED,
                            &kvm, UA_BYTESTRING_NULL);
-    UA_LOCK(&el->elMutex);
 }
 
 static UA_StatusCode
@@ -523,12 +515,10 @@ TCP_registerListenSocket(UA_POSIXConnectionManager *pcm, struct addrinfo *ai,
     UA_KeyValueMap paramMap = {2, params};
 
     /* Announce the listen-socket in the application */
-    UA_UNLOCK(&el->elMutex);
     connectionCallback(&pcm->cm, (uintptr_t)listenSocket,
                        application, &newConn->context,
                        UA_CONNECTIONSTATE_ESTABLISHED,
                        &paramMap, UA_BYTESTRING_NULL);
-    UA_LOCK(&el->elMutex);
 
     return UA_STATUSCODE_GOOD;
 }
@@ -905,12 +895,10 @@ TCP_openActiveConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *p
                 (unsigned)newSock, hostname, portStr);
 
     /* Signal the new connection to the application as asynchonously opening */
-    UA_UNLOCK(&el->elMutex);
     connectionCallback(&pcm->cm, (uintptr_t)newSock,
                        application, &newConn->context,
                        UA_CONNECTIONSTATE_OPENING, &UA_KEYVALUEMAP_NULL,
                        UA_BYTESTRING_NULL);
-    UA_LOCK(&el->elMutex);
 
     return UA_STATUSCODE_GOOD;
 }
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 66b791bde9a..1f0a0239993 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -591,12 +591,10 @@ UDP_close(UA_POSIXConnectionManager *pcm, UDP_FD *conn) {
     pcm->fdsSize--;
 
     /* Signal closing to the application */
-    UA_UNLOCK(&el->elMutex);
     conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
                         conn->application, &conn->context,
                         UA_CONNECTIONSTATE_CLOSING,
                         &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-    UA_LOCK(&el->elMutex);
 
     /* Close the socket */
     int ret = UA_close(conn->rfd.fd);
@@ -718,12 +716,10 @@ UDP_connectionSocketCallback(UA_POSIXConnectionManager *pcm, UDP_FD *conn,
                  sourceAddr, sourcePort);
 
     /* Callback to the application layer */
-    UA_UNLOCK(&el->elMutex);
     conn->applicationCB(&pcm->cm, (uintptr_t)conn->rfd.fd,
                         conn->application, &conn->context,
                         UA_CONNECTIONSTATE_ESTABLISHED,
                         &kvm, response);
-    UA_LOCK(&el->elMutex);
 }
 
 static UA_StatusCode
@@ -876,12 +872,10 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
     pcm->fdsSize++;
 
     /* Register the listen socket in the application */
-    UA_UNLOCK(&el->elMutex);
     connectionCallback(&pcm->cm, (uintptr_t)newudpfd->rfd.fd,
                        application, &newudpfd->context,
                        UA_CONNECTIONSTATE_ESTABLISHED,
                        &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-    UA_LOCK(&el->elMutex);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1177,11 +1171,9 @@ UDP_openSendConnection(UA_POSIXConnectionManager *pcm, const UA_KeyValueMap *par
 
     /* Signal the connection as opening. The connection fully opens in the next
      * iteration of the EventLoop */
-    UA_UNLOCK(&el->elMutex);
     connectionCallback(&pcm->cm, (uintptr_t)newSock, application,
                        &conn->context, UA_CONNECTIONSTATE_ESTABLISHED,
                        &UA_KEYVALUEMAP_NULL, UA_BYTESTRING_NULL);
-    UA_LOCK(&el->elMutex);
 
     return UA_STATUSCODE_GOOD;
 }

From e8dbf7bc3aec565de7cca73b76907fd2f7d083f6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 13:14:41 +0100
Subject: [PATCH 1743/1963] refactor(server): Simplify with recursive locking
 in ua_services_session.c

---
 src/server/ua_services_session.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index afb8c9b9a48..4119ec3d988 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -48,11 +48,9 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
 
     /* Callback into userland access control */
     if(server->config.accessControl.closeSession) {
-        UA_UNLOCK(&server->serviceMutex);
         server->config.accessControl.
             closeSession(server, &server->config.accessControl,
                          &session->sessionId, session->sessionHandle);
-        UA_LOCK(&server->serviceMutex);
     }
 
     /* Detach the Session from the SecureChannel */
@@ -576,10 +574,7 @@ decryptUserToken(UA_Server *server, UA_Session *session,
      * TODO: We should not need a ChannelContext at all for asymmetric
      * decryption where the remote certificate is not used. */
     void *tempChannelContext = NULL;
-    UA_UNLOCK(&server->serviceMutex);
-    UA_StatusCode res =
-        sp->channelModule.newContext(sp, &sp->localCertificate, &tempChannelContext);
-    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = sp->channelModule.newContext(sp, &sp->localCertificate, &tempChannelContext);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: Failed to create a "
@@ -644,9 +639,7 @@ decryptUserToken(UA_Server *server, UA_Session *session,
     UA_ByteString_clear(&secret);
 
     /* Remove the temporary channel context */
-    UA_UNLOCK(&server->serviceMutex);
     sp->channelModule.deleteContext(tempChannelContext);
-    UA_LOCK(&server->serviceMutex);
 
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_SESSION(server->config.logging, session,
@@ -668,10 +661,7 @@ checkActivateSessionX509(UA_Server *server, UA_Session *session,
     /* We need a channel context with the user certificate in order to reuse
      * the signature checking code. */
     void *tempChannelContext;
-    UA_UNLOCK(&server->serviceMutex);
-    UA_StatusCode res = sp->channelModule.
-        newContext(sp, &token->certificateData, &tempChannelContext);
-    UA_LOCK(&server->serviceMutex);
+    UA_StatusCode res = sp->channelModule. newContext(sp, &token->certificateData, &tempChannelContext);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: Failed to create a context "
@@ -691,9 +681,7 @@ checkActivateSessionX509(UA_Server *server, UA_Session *session,
     }
 
     /* Delete the temporary channel context */
-    UA_UNLOCK(&server->serviceMutex);
     sp->channelModule.deleteContext(tempChannelContext);
-    UA_LOCK(&server->serviceMutex);
     return res;
 }
 #endif
@@ -806,12 +794,10 @@ Service_ActivateSession(UA_Server *server, UA_SecureChannel *channel,
 #endif
 
     /* Callback into userland access control */
-    UA_UNLOCK(&server->serviceMutex);
     resp->responseHeader.serviceResult = server->config.accessControl.
         activateSession(server, &server->config.accessControl, ed,
                         &channel->remoteCertificate, &session->sessionId,
                         &req->userIdentityToken, &session->sessionHandle);
-    UA_LOCK(&server->serviceMutex);
     if(resp->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_SESSION(server->config.logging, session,
                                "ActivateSession: The AccessControl "

From a91646b68e73bb6dcd05bd557bd8c3ccb77f14a2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 13:22:30 +0100
Subject: [PATCH 1744/1963] refactor(server): Simplify subscriptions with
 recursive locking strategy

---
 src/server/ua_services_subscription.c      | 3 ---
 src/server/ua_subscription_datachange.c    | 2 --
 src/server/ua_subscription_monitoreditem.c | 4 ----
 3 files changed, 9 deletions(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 27219c2ebff..c3cbeffbf2b 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -485,17 +485,14 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     /* Check with AccessControl if the transfer is allowed */
     if(server->config.accessControl.allowTransferSubscription) {
         UA_LOCK_ASSERT(&server->serviceMutex, 1);
-        UA_UNLOCK(&server->serviceMutex);
         if(!server->config.accessControl.
            allowTransferSubscription(server, &server->config.accessControl,
                                      oldSession ? &oldSession->sessionId : NULL,
                                      oldSession ? oldSession->sessionHandle : NULL,
                                      &session->sessionId, session->sessionHandle)) {
-            UA_LOCK(&server->serviceMutex);
             result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
             return;
         }
-        UA_LOCK(&server->serviceMutex);
     } else {
         result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
         return;
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index ff0ec730861..2cf6bc3ebe7 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -190,12 +190,10 @@ UA_MonitoredItem_processSampledValue(UA_Server *server, UA_MonitoredItem *mon,
         UA_LocalMonitoredItem *localMon = (UA_LocalMonitoredItem*) mon;
         void *nodeContext = NULL;
         getNodeContext(server, mon->itemToMonitor.nodeId, &nodeContext);
-        UA_UNLOCK(&server->serviceMutex);
         localMon->callback.dataChangeCallback(server,
                                               mon->monitoredItemId, localMon->context,
                                               &mon->itemToMonitor.nodeId, nodeContext,
                                               mon->itemToMonitor.attributeId, value);
-        UA_LOCK(&server->serviceMutex);
     }
 }
 
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 1055e5cc138..520324d5daa 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -446,14 +446,12 @@ UA_Server_registerMonitoredItem(UA_Server *server, UA_MonitoredItem *mon) {
 
         void *targetContext = NULL;
         getNodeContext(server, mon->itemToMonitor.nodeId, &targetContext);
-        UA_UNLOCK(&server->serviceMutex);
         server->config.monitoredItemRegisterCallback(server,
                                                      session ? &session->sessionId : NULL,
                                                      session ? session->sessionHandle : NULL,
                                                      &mon->itemToMonitor.nodeId,
                                                      targetContext,
                                                      mon->itemToMonitor.attributeId, false);
-        UA_LOCK(&server->serviceMutex);
     }
 
     mon->registered = true;
@@ -479,14 +477,12 @@ UA_Server_unregisterMonitoredItem(UA_Server *server, UA_MonitoredItem *mon) {
 
         void *targetContext = NULL;
         getNodeContext(server, mon->itemToMonitor.nodeId, &targetContext);
-        UA_UNLOCK(&server->serviceMutex);
         server->config.monitoredItemRegisterCallback(server,
                                                      session ? &session->sessionId : NULL,
                                                      session ? session->sessionHandle : NULL,
                                                      &mon->itemToMonitor.nodeId,
                                                      targetContext,
                                                      mon->itemToMonitor.attributeId, true);
-        UA_LOCK(&server->serviceMutex);
     }
 
     /* Deregister in Subscription and server */

From d78e7fd6d98e78c7c063f2728cb5fb85614ad245 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 13:25:03 +0100
Subject: [PATCH 1745/1963] refactor(server): Simplified recursive locking in
 ua_services_view.c

---
 src/server/ua_services_view.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 0bafe865e32..fda99b2ea26 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -785,17 +785,14 @@ browse(struct BrowseContext *bc) {
     /* Check AccessControl rights */
     if(bc->session != &bc->server->adminSession) {
         UA_LOCK_ASSERT(&bc->server->serviceMutex, 1);
-        UA_UNLOCK(&bc->server->serviceMutex);
         if(!bc->server->config.accessControl.
            allowBrowseNode(bc->server, &bc->server->config.accessControl,
                            &bc->session->sessionId, bc->session->sessionHandle,
                            &descr->nodeId, node->head.context)) {
-            UA_LOCK(&bc->server->serviceMutex);
             UA_NODESTORE_RELEASE(bc->server, node);
             bc->status = UA_STATUSCODE_BADUSERACCESSDENIED;
             return;
         }
-        UA_LOCK(&bc->server->serviceMutex);
     }
 
     /* Browse the node */

From 5132259717a9d941dfeb3fbbd5e12fe2de6f902a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 13:26:11 +0100
Subject: [PATCH 1746/1963] refactor(server): Simplified recursive locking in
 ua_services_discovery.c

---
 src/server/ua_services_discovery.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index 1e4c1b91505..eaf23f2562e 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -617,12 +617,8 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
             return;
         }
 
-        if(dm->registerServerCallback) {
-            UA_UNLOCK(&server->serviceMutex);
-            dm->registerServerCallback(requestServer,
-                                       dm->registerServerCallbackData);
-            UA_LOCK(&server->serviceMutex);
-        }
+        if(dm->registerServerCallback)
+            dm->registerServerCallback(requestServer, dm->registerServerCallbackData);
 
         // server found, remove from list
         LIST_REMOVE(registeredServer_entry, pointers);
@@ -657,12 +653,8 @@ process_RegisterServer(UA_Server *server, UA_Session *session,
     // Previously we only called it if it was a new register call. It may be the case that this endpoint
     // registered before, then crashed, restarts and registeres again. In that case the entry is not deleted
     // and the callback would not be called.
-    if(dm->registerServerCallback) {
-        UA_UNLOCK(&server->serviceMutex);
-        dm->registerServerCallback(requestServer,
-                                   dm->registerServerCallbackData);
-        UA_LOCK(&server->serviceMutex);
-    }
+    if(dm->registerServerCallback)
+        dm->registerServerCallback(requestServer, dm->registerServerCallbackData);
 
     // copy the data from the request into the list
     UA_RegisteredServer_copy(requestServer, &registeredServer_entry->registeredServer);

From 4e6403a625b3239d0dbe9ac25b732cb554b0859f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 13:32:46 +0100
Subject: [PATCH 1747/1963] refactor(server): Use simplified recursive locks in
 ua_server.c

---
 src/server/ua_server.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 10f42757282..f2ecc89b2cf 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -387,9 +387,7 @@ UA_Server_init(UA_Server *server) {
     UA_CHECK_STATUS(res, goto cleanup);
 
 #ifdef UA_ENABLE_NODESET_INJECTOR
-    UA_UNLOCK(&server->serviceMutex);
     res = UA_Server_injectNodesets(server);
-    UA_LOCK(&server->serviceMutex);
     UA_CHECK_STATUS(res, goto cleanup);
 #endif
 
@@ -544,19 +542,16 @@ UA_Server_updateCertificate(UA_Server *server,
     UA_CHECK(server && oldCertificate && newCertificate && newPrivateKey,
              return UA_STATUSCODE_BADINTERNALERROR);
 
+    UA_LOCK(&server->serviceMutex);
+
     if(closeSessions) {
         session_list_entry *current;
         LIST_FOREACH(current, &server->sessions, pointers) {
             UA_SessionHeader *header = &current->session.header;
-            if(UA_ByteString_equal(oldCertificate,
-                                    &header->channel->securityPolicy->localCertificate)) {
-                UA_LOCK(&server->serviceMutex);
+            if(UA_ByteString_equal(oldCertificate, &header->channel->securityPolicy->localCertificate))
                 UA_Server_removeSessionByToken(server, &header->authenticationToken,
                                                UA_SHUTDOWNREASON_CLOSE);
-                UA_UNLOCK(&server->serviceMutex);
-            }
         }
-
     }
 
     /* Gracefully close all SecureChannels. And restart the
@@ -571,6 +566,7 @@ UA_Server_updateCertificate(UA_Server *server,
     }
 
     size_t i = 0;
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
     while(i < server->config.endpointsSize) {
         UA_EndpointDescription *ed = &server->config.endpoints[i];
         if(UA_ByteString_equal(&ed->serverCertificate, oldCertificate)) {
@@ -578,13 +574,18 @@ UA_Server_updateCertificate(UA_Server *server,
             UA_String_copy(newCertificate, &ed->serverCertificate);
             UA_SecurityPolicy *sp = getSecurityPolicyByUri(server,
                             &server->config.endpoints[i].securityPolicyUri);
-            UA_CHECK_MEM(sp, return UA_STATUSCODE_BADINTERNALERROR);
+            if(!sp) {
+                res = UA_STATUSCODE_BADINTERNALERROR;
+                break;
+            }
             sp->updateCertificateAndPrivateKey(sp, *newCertificate, *newPrivateKey);
         }
         i++;
     }
 
-    return UA_STATUSCODE_GOOD;
+    UA_UNLOCK(&server->serviceMutex);
+
+    return res;
 }
 
 /***************************/
@@ -651,15 +652,11 @@ UA_Server_getStatistics(UA_Server *server) {
 void
 setServerLifecycleState(UA_Server *server, UA_LifecycleState state) {
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
-
     if(server->state == state)
         return;
     server->state = state;
-    if(server->config.notifyLifecycleState) {
-        UA_UNLOCK(&server->serviceMutex);
+    if(server->config.notifyLifecycleState)
         server->config.notifyLifecycleState(server, server->state);
-        UA_LOCK(&server->serviceMutex);
-    }
 }
 
 UA_LifecycleState
@@ -891,9 +888,7 @@ UA_Server_run_shutdown(UA_Server *server) {
     UA_EventLoop *el = server->config.eventLoop;
     while(!testStoppedCondition(server) &&
           res == UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&server->serviceMutex);
         res = el->run(el, 100);
-        UA_LOCK(&server->serviceMutex);
     }
 
     /* Stop the EventLoop. Iterate until stopped. */
@@ -901,9 +896,7 @@ UA_Server_run_shutdown(UA_Server *server) {
     while(el->state != UA_EVENTLOOPSTATE_STOPPED &&
           el->state != UA_EVENTLOOPSTATE_FRESH &&
           res == UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&server->serviceMutex);
         res = el->run(el, 100);
-        UA_LOCK(&server->serviceMutex);
     }
 
     /* Set server lifecycle state to stopped if not already the case */

From 8f0f9cb01fa85edbe764cf6a4599f6f7f85f4bca Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 13:34:36 +0100
Subject: [PATCH 1748/1963] fix(server): Remove a wrong UA_UNLOCK in
 ua_server_ns0_diagnostics.c

---
 src/server/ua_server_ns0_diagnostics.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index a7c057fbb6e..10e09d2f364 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -249,10 +249,8 @@ setSessionSubscriptionDiagnostics(UA_Server *server, UA_Session *session,
     /* Allocate the output array */
     UA_SubscriptionDiagnosticsDataType *sd = (UA_SubscriptionDiagnosticsDataType*)
         UA_Array_new(sdSize, &UA_TYPES[UA_TYPES_SUBSCRIPTIONDIAGNOSTICSDATATYPE]);
-    if(!sd) {
-        UA_UNLOCK(&server->serviceMutex);
+    if(!sd)
         return UA_STATUSCODE_BADOUTOFMEMORY;
-    }
 
     /* Collect the statistics */
     size_t i = 0;

From 7be32a58a06ed8a0b8c76cf950dedc5f2c0dc327 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 13:47:38 +0100
Subject: [PATCH 1749/1963] refactor(client): Simplify with recursive locking

---
 src/client/ua_client.c               | 13 +-----
 src/client/ua_client_connect.c       | 13 +-----
 src/client/ua_client_subscriptions.c | 60 ++++++++++++----------------
 3 files changed, 28 insertions(+), 58 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 74686b362b9..92119e8fa96 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -307,11 +307,9 @@ notifyClientState(UA_Client *client) {
     client->oldChannelState = client->channel.state;
     client->oldSessionState = client->sessionState;
 
-    UA_UNLOCK(&client->clientMutex);
     if(client->config.stateCallback)
         client->config.stateCallback(client, client->channel.state,
                                      client->sessionState, client->connectStatus);
-    UA_LOCK(&client->clientMutex);
 }
 
 /****************/
@@ -489,10 +487,8 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
 
     /* Call the async callback. This is the only thread with access to ac. So we
      * can just unlock for the callback into userland. */
-    UA_UNLOCK(&client->clientMutex);
     if(ac->callback)
         ac->callback(client, ac->userdata, requestId, response);
-    UA_LOCK(&client->clientMutex);
 
     /* Clean up */
     UA_NodeId_clear(&responseTypeId);
@@ -627,9 +623,7 @@ __Client_Service(UA_Client *client, const void *request,
     while(true) {
         /* Unlock before dropping into the EventLoop. The client lock is
          * re-taken in the network callback if an event occurs. */
-        UA_UNLOCK(&client->clientMutex);
         retval = el->run(el, timeout_remaining);
-        UA_LOCK(&client->clientMutex);
 
         /* Was the response received? In that case we can directly return. The
          * ac was already removed from the internal linked list. */
@@ -698,9 +692,7 @@ __Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
         UA_Response response;
         UA_init(&response, ac->responseType);
         response.responseHeader.serviceResult = statusCode;
-        UA_UNLOCK(&client->clientMutex);
         ac->callback(client, ac->userdata, ac->requestId, &response);
-        UA_LOCK(&client->clientMutex);
 
         /* Clean up the response. The user callback might move data into it. For
          * whatever reasons. */
@@ -945,11 +937,8 @@ backgroundConnectivityCallback(UA_Client *client, void *userdata,
                                UA_UInt32 requestId, const UA_ReadResponse *response) {
     UA_LOCK(&client->clientMutex);
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADTIMEOUT) {
-        if(client->config.inactivityCallback) {
-            UA_UNLOCK(&client->clientMutex);
+        if(client->config.inactivityCallback)
             client->config.inactivityCallback(client);
-            UA_LOCK(&client->clientMutex);
-        }
     }
     client->pendingConnectivityCheck = false;
     client->lastConnectivityCheck = UA_DateTime_nowMonotonic();
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index a9b4d060514..6e693738f3d 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1750,10 +1750,7 @@ initConnect(UA_Client *client) {
         paramMap.mapSize = 2;
 
         /* Open the client TCP connection */
-        UA_UNLOCK(&client->clientMutex);
-        UA_StatusCode res =
-            cm->openConnection(cm, &paramMap, client, NULL, __Client_networkCallback);
-        UA_LOCK(&client->clientMutex);
+        UA_StatusCode res = cm->openConnection(cm, &paramMap, client, NULL, __Client_networkCallback);
         if(res == UA_STATUSCODE_GOOD)
             break;
     }
@@ -1807,9 +1804,7 @@ connectSync(UA_Client *client) {
         }
 
         /* Drop into the EventLoop */
-        UA_UNLOCK(&client->clientMutex);
         UA_StatusCode res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
-        UA_LOCK(&client->clientMutex);
         if(res != UA_STATUSCODE_GOOD) {
             client->connectStatus = res;
             closeSecureChannel(client);
@@ -1884,9 +1879,7 @@ activateSessionSync(UA_Client *client) {
         }
 
         /* Drop into the EventLoop */
-        UA_UNLOCK(&client->clientMutex);
         res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
-        UA_LOCK(&client->clientMutex);
         if(res != UA_STATUSCODE_GOOD) {
             client->connectStatus = res;
             closeSecureChannel(client);
@@ -2168,9 +2161,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     paramMap.map = params;
     paramMap.mapSize = 4;
 
-    UA_UNLOCK(&client->clientMutex);
     res = cm->openConnection(cm, &paramMap, client, NULL, __Client_reverseConnectCallback);
-    UA_LOCK(&client->clientMutex);
 
     /* Opening the TCP connection failed */
     if(res != UA_STATUSCODE_GOOD) {
@@ -2283,11 +2274,9 @@ disconnectSecureChannel(UA_Client *client, UA_Boolean sync) {
     if(sync && el &&
        el->state != UA_EVENTLOOPSTATE_FRESH &&
        el->state != UA_EVENTLOOPSTATE_STOPPED) {
-        UA_UNLOCK(&client->clientMutex);
         while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
             el->run(el, 100);
         }
-        UA_LOCK(&client->clientMutex);
     }
 
     notifyClientState(client);
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 5d5285e575f..45f3e02b1e0 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -79,15 +79,17 @@ ua_Subscriptions_create_handler(UA_Client *client, void *data,
         goto cleanup;
     }
 
-    /* Prepare the internal representation */
     UA_LOCK(&client->clientMutex);
+
+    /* Prepare the internal representation */
     ua_Subscriptions_create(client, newSub, response);
-    UA_UNLOCK(&client->clientMutex);
 
 cleanup:
     if(cc->userCallback)
         cc->userCallback(client, cc->userData, requestId, response);
     UA_free(cc);
+
+    UA_UNLOCK(&client->clientMutex);
 }
 
 UA_CreateSubscriptionResponse
@@ -205,8 +207,8 @@ UA_Client_Subscriptions_modify(UA_Client *client,
     /* Find the internal representation */
     UA_LOCK(&client->clientMutex);
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
-    UA_UNLOCK(&client->clientMutex);
     if(!sub) {
+        UA_UNLOCK(&client->clientMutex);
         response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return response;
     }
@@ -217,7 +219,6 @@ UA_Client_Subscriptions_modify(UA_Client *client,
                         &response, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 
     /* Adjust the internal representation. Lookup again for thread-safety. */
-    UA_LOCK(&client->clientMutex);
     sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
         response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
@@ -237,21 +238,27 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
     /* Find the internal representation */
     UA_LOCK(&client->clientMutex);
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
-    UA_UNLOCK(&client->clientMutex);
-    if(!sub)
+    if(!sub) {
+        UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
+    }
 
     CustomCallback *cc = (CustomCallback *)UA_calloc(1, sizeof(CustomCallback));
-    if(!cc)
+    if(!cc) {
+        UA_UNLOCK(&client->clientMutex);
         return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
 
     cc->clientData = (void *)(uintptr_t)request.subscriptionId;
     cc->userData = userdata;
     cc->userCallback = callback;
 
-    return __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
-                                    ua_Subscriptions_modify_handler, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE],
-                                    cc, requestId);
+    UA_StatusCode res =
+        __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
+                                 ua_Subscriptions_modify_handler, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE],
+                                 cc, requestId);
+    UA_UNLOCK(&client->clientMutex);
+    return res;
 }
 
 static void *
@@ -283,9 +290,7 @@ __Client_Subscription_deleteInternal(UA_Client *client,
     if(sub->deleteCallback) {
         void *subC = sub->context;
         UA_UInt32 subId = sub->subscriptionId;
-        UA_UNLOCK(&client->clientMutex);
         sub->deleteCallback(client, subId, subC);
-        UA_LOCK(&client->clientMutex);
     }
 
     /* Remove */
@@ -338,10 +343,10 @@ ua_Subscriptions_delete_handler(UA_Client *client, void *data,
     DeleteSubscriptionCallback *dsc =
         (DeleteSubscriptionCallback*)data;
 
-    /* Delete */
     UA_LOCK(&client->clientMutex);
+
+    /* Delete */
     __Client_Subscription_processDelete(client, &dsc->request, response);
-    UA_UNLOCK(&client->clientMutex);
 
     /* Userland Callback */
     dsc->userCallback(client, dsc->userData, requestId, response);
@@ -349,6 +354,8 @@ ua_Subscriptions_delete_handler(UA_Client *client, void *data,
     /* Cleanup */
     UA_DeleteSubscriptionsRequest_clear(&dsc->request);
     UA_free(dsc);
+
+    UA_UNLOCK(&client->clientMutex);
 }
 
 UA_StatusCode
@@ -431,9 +438,7 @@ MonitoredItem_delete(UA_Client *client, UA_Client_Subscription *sub,
         void *monC = mon->context;
         UA_UInt32 subId = sub->subscriptionId;
         UA_UInt32 monId = mon->monitoredItemId;
-        UA_UNLOCK(&client->clientMutex);
         mon->deleteCallback(client, subId, subC, monId, monC);
-        UA_LOCK(&client->clientMutex);
     }
     UA_free(mon);
 }
@@ -480,10 +485,8 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
         if(response->results[i].statusCode != UA_STATUSCODE_GOOD) {
             void *subC = sub->context;
             UA_UInt32 subId = sub->subscriptionId;
-            UA_UNLOCK(&client->clientMutex);
             if(deleteCallbacks[i])
                 deleteCallbacks[i](client, subId, subC, 0, data->contexts[i]);
-            UA_LOCK(&client->clientMutex);
             continue;
         }
 
@@ -492,10 +495,8 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
         if(!newMon) {
             void *subC = sub->context;
             UA_UInt32 subId = sub->subscriptionId;
-            UA_UNLOCK(&client->clientMutex);
             if(deleteCallbacks[i])
                 deleteCallbacks[i](client, subId, subC, 0, data->contexts[i]);
-            UA_LOCK(&client->clientMutex);
             continue;
         }
 
@@ -520,11 +521,9 @@ ua_MonitoredItems_create(UA_Client *client, MonitoredItems_CreateData *data,
  cleanup:
     for(size_t i = 0; i < request->itemsToCreateSize; i++) {
         void *subC = sub ? sub->context : NULL;
-        UA_UNLOCK(&client->clientMutex);
         if(deleteCallbacks[i])
             deleteCallbacks[i](client, data->request.subscriptionId,
                                subC, 0, data->contexts[i]);
-        UA_LOCK(&client->clientMutex);
     }
 }
 
@@ -535,14 +534,16 @@ ua_MonitoredItems_create_async_handler(UA_Client *client, void *d, UA_UInt32 req
     MonitoredItems_CreateData *data = (MonitoredItems_CreateData *)d;
 
     UA_LOCK(&client->clientMutex);
+
     ua_MonitoredItems_create(client, data, response);
     MonitoredItems_CreateData_clear(client, data);
-    UA_UNLOCK(&client->clientMutex);
 
     if(data->userCallback)
         data->userCallback(client, data->userData, requestId, response);
 
     UA_free(data);
+
+    UA_UNLOCK(&client->clientMutex);
 }
 
 static UA_StatusCode
@@ -840,11 +841,12 @@ ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId
     ua_MonitoredItems_delete(client, sub, request, response);
 
 cleanup:
-    UA_UNLOCK(&client->clientMutex);
     if(cc->userCallback)
         cc->userCallback(client, cc->userData, requestId, response);
     UA_DeleteMonitoredItemsRequest_delete(request);
     UA_free(cc);
+
+    UA_UNLOCK(&client->clientMutex);
 }
 
 UA_DeleteMonitoredItemsResponse
@@ -1083,9 +1085,7 @@ processDataChangeNotification(UA_Client *client, UA_Client_Subscription *sub,
             void *monC = mon->context;
             UA_UInt32 subId = sub->subscriptionId;
             UA_UInt32 monId = mon->monitoredItemId;
-            UA_UNLOCK(&client->clientMutex);
             mon->handler.dataChangeCallback(client, subId, subC, monId, monC, &min->value);
-            UA_LOCK(&client->clientMutex);
         }
     }
 }
@@ -1123,11 +1123,9 @@ processEventNotification(UA_Client *client, UA_Client_Subscription *sub,
         void *monC = mon->context;
         UA_UInt32 subId = sub->subscriptionId;
         UA_UInt32 monId = mon->monitoredItemId;
-        UA_UNLOCK(&client->clientMutex);
         mon->handler.eventCallback(client, subId, subC, monId, monC,
                                    eventFieldList->eventFieldsSize,
                                    eventFieldList->eventFields);
-        UA_LOCK(&client->clientMutex);
     }
 }
 
@@ -1160,10 +1158,8 @@ processNotificationMessage(UA_Client *client, UA_Client_Subscription *sub,
         if(sub->statusChangeCallback) {
             void *subC = sub->context;
             UA_UInt32 subId = sub->subscriptionId;
-            UA_UNLOCK(&client->clientMutex);
             sub->statusChangeCallback(client, subId, subC,
                                       (UA_StatusChangeNotification*)msg->content.decoded.data);
-            UA_LOCK(&client->clientMutex);
         } else {
             UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Dropped a StatusChangeNotification since no "
@@ -1239,9 +1235,7 @@ __Client_Subscriptions_processPublishResponse(UA_Client *client, UA_PublishReque
         if(client->config.subscriptionInactivityCallback) {
             void *subC = sub->context;
             UA_UInt32 subId = sub->subscriptionId;
-            UA_UNLOCK(&client->clientMutex);
             client->config.subscriptionInactivityCallback(client, subId, subC);
-            UA_LOCK(&client->clientMutex);
         }
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Received Timeout for Publish Response");
@@ -1359,9 +1353,7 @@ __Client_Subscriptions_backgroundPublishInactivityCheck(UA_Client *client) {
             if(client->config.subscriptionInactivityCallback) {
                 void *subC = sub->context;
                 UA_UInt32 subId = sub->subscriptionId;
-                UA_UNLOCK(&client->clientMutex);
                 client->config.subscriptionInactivityCallback(client, subId, subC);
-                UA_LOCK(&client->clientMutex);
             }
             UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Inactivity for Subscription %" PRIu32 ".", sub->subscriptionId);

From e4c1488d827d954f77102a9f4f5ccc05cabc1921 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 14:06:27 +0100
Subject: [PATCH 1750/1963] refactor(client): Locking in a sync/async response
 callback is no longer required

---
 src/client/ua_client_connect.c       | 18 ++--------
 src/client/ua_client_subscriptions.c | 53 +++++++++++++++-------------
 2 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 6e693738f3d..f4ca577476c 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -657,7 +657,7 @@ UA_Client_renewSecureChannel(UA_Client *client) {
 static void
 responseActivateSession(UA_Client *client, void *userdata,
                         UA_UInt32 requestId, void *response) {
-    UA_LOCK(&client->clientMutex);
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
 
     UA_ActivateSessionResponse *ar = (UA_ActivateSessionResponse*)response;
     if(ar->responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
@@ -672,7 +672,6 @@ responseActivateSession(UA_Client *client, void *userdata,
                          UA_StatusCode_name(ar->responseHeader.serviceResult));
             client->connectStatus = ar->responseHeader.serviceResult;
             closeSecureChannel(client);
-            UA_UNLOCK(&client->clientMutex);
             return;
         }
 
@@ -682,7 +681,6 @@ responseActivateSession(UA_Client *client, void *userdata,
             UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Session to be activated no longer exists. Create a new Session.");
             client->connectStatus = createSessionAsync(client);
-            UA_UNLOCK(&client->clientMutex);
             return;
         }
 
@@ -693,7 +691,6 @@ responseActivateSession(UA_Client *client, void *userdata,
                      UA_StatusCode_name(ar->responseHeader.serviceResult));
         client->connectStatus = ar->responseHeader.serviceResult;
         closeSecureChannel(client);
-        UA_UNLOCK(&client->clientMutex);
         return;
     }
 
@@ -710,8 +707,6 @@ responseActivateSession(UA_Client *client, void *userdata,
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     __Client_Subscriptions_backgroundPublish(client);
 #endif
-
-    UA_UNLOCK(&client->clientMutex);
 }
 
 static UA_StatusCode
@@ -961,7 +956,7 @@ findUserTokenPolicy(UA_Client *client, UA_EndpointDescription *endpoint) {
 static void
 responseGetEndpoints(UA_Client *client, void *userdata,
                      UA_UInt32 requestId, void *response) {
-    UA_LOCK(&client->clientMutex);
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
 
     client->endpointsHandshake = false;
 
@@ -984,7 +979,6 @@ responseGetEndpoints(UA_Client *client, void *userdata,
         }
 
         UA_GetEndpointsResponse_clear(resp);
-        UA_UNLOCK(&client->clientMutex);
         return;
     }
 
@@ -1027,7 +1021,6 @@ responseGetEndpoints(UA_Client *client, void *userdata,
                      "No suitable endpoint found");
         client->connectStatus = UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
         closeSecureChannel(client);
-        UA_UNLOCK(&client->clientMutex);
         return;
     }
 
@@ -1056,7 +1049,6 @@ responseGetEndpoints(UA_Client *client, void *userdata,
        !UA_String_equal(&client->endpoint.securityPolicyUri,
                         &client->channel.securityPolicy->policyUri)) {
         closeSecureChannel(client);
-        UA_UNLOCK(&client->clientMutex);
         return;
     }
 
@@ -1066,13 +1058,11 @@ responseGetEndpoints(UA_Client *client, void *userdata,
     if(client->discoveryUrl.length > 0 &&
        !UA_String_equal(&client->discoveryUrl, &client->endpoint.endpointUrl)) {
         closeSecureChannel(client);
-        UA_UNLOCK(&client->clientMutex);
         return;
     }
 
     /* Nothing to do. We have selected an endpoint that we can use to open a
      * Session on the current SecureChannel. */
-    UA_UNLOCK(&client->clientMutex);
 }
 
 static UA_StatusCode
@@ -1216,7 +1206,7 @@ requestFindServers(UA_Client *client) {
 static void
 createSessionCallback(UA_Client *client, void *userdata,
                       UA_UInt32 requestId, void *response) {
-    UA_LOCK(&client->clientMutex);
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
 
     UA_CreateSessionResponse *sessionResponse = (UA_CreateSessionResponse*)response;
     UA_StatusCode res = sessionResponse->responseHeader.serviceResult;
@@ -1258,8 +1248,6 @@ createSessionCallback(UA_Client *client, void *userdata,
     client->connectStatus = res;
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_CLOSED;
-
-    UA_UNLOCK(&client->clientMutex);
 }
 
 static UA_StatusCode
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 45f3e02b1e0..dd1fc26828a 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -71,6 +71,8 @@ ua_Subscriptions_create(UA_Client *client, UA_Client_Subscription *newSub,
 static void
 ua_Subscriptions_create_handler(UA_Client *client, void *data,
                                 UA_UInt32 requestId, void *r) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_CreateSubscriptionResponse *response = (UA_CreateSubscriptionResponse *)r;
     CustomCallback *cc = (CustomCallback *)data;
     UA_Client_Subscription *newSub = (UA_Client_Subscription *)cc->clientData;
@@ -79,8 +81,6 @@ ua_Subscriptions_create_handler(UA_Client *client, void *data,
         goto cleanup;
     }
 
-    UA_LOCK(&client->clientMutex);
-
     /* Prepare the internal representation */
     ua_Subscriptions_create(client, newSub, response);
 
@@ -88,8 +88,6 @@ ua_Subscriptions_create_handler(UA_Client *client, void *data,
     if(cc->userCallback)
         cc->userCallback(client, cc->userData, requestId, response);
     UA_free(cc);
-
-    UA_UNLOCK(&client->clientMutex);
 }
 
 UA_CreateSubscriptionResponse
@@ -98,12 +96,15 @@ UA_Client_Subscriptions_create(UA_Client *client,
                                void *subscriptionContext,
                                UA_Client_StatusChangeNotificationCallback statusChangeCallback,
                                UA_Client_DeleteSubscriptionCallback deleteCallback) {
+    UA_LOCK(&client->clientMutex);
+
     UA_CreateSubscriptionResponse response;
     UA_Client_Subscription *sub = (UA_Client_Subscription *)
         UA_malloc(sizeof(UA_Client_Subscription));
     if(!sub) {
         UA_CreateSubscriptionResponse_init(&response);
         response.responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+        UA_UNLOCK(&client->clientMutex);
         return response;
     }
     sub->context = subscriptionContext;
@@ -111,18 +112,17 @@ UA_Client_Subscriptions_create(UA_Client *client,
     sub->deleteCallback = deleteCallback;
 
     /* Send the request as a synchronous service call */
-    __UA_Client_Service(client,
-                        &request, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
-    if (response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
-        UA_free (sub);
+    __Client_Service(client, &request, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST],
+                     &response, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
+    if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
+        UA_free(sub);
+        UA_UNLOCK(&client->clientMutex);
         return response;
     }
 
-    UA_LOCK(&client->clientMutex);
     ua_Subscriptions_create(client, sub, &response);
-    UA_UNLOCK(&client->clientMutex);
 
+    UA_UNLOCK(&client->clientMutex);
     return response;
 }
 
@@ -179,11 +179,11 @@ ua_Subscriptions_modify(UA_Client *client, UA_Client_Subscription *sub,
 static void
 ua_Subscriptions_modify_handler(UA_Client *client, void *data, UA_UInt32 requestId,
                                 void *r) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
     UA_ModifySubscriptionResponse *response = (UA_ModifySubscriptionResponse *)r;
     CustomCallback *cc = (CustomCallback *)data;
-    UA_LOCK(&client->clientMutex);
-    UA_Client_Subscription *sub =
-        findSubscription(client, (UA_UInt32)(uintptr_t)cc->clientData);
+    UA_Client_Subscription *sub = findSubscription(client, (UA_UInt32)(uintptr_t)cc->clientData);
     if(sub) {
         ua_Subscriptions_modify(client, sub, response);
     } else {
@@ -191,7 +191,6 @@ ua_Subscriptions_modify_handler(UA_Client *client, void *data, UA_UInt32 request
                     "No internal representation of subscription %" PRIu32,
                     (UA_UInt32)(uintptr_t)cc->clientData);
     }
-    UA_UNLOCK(&client->clientMutex);
 
     if(cc->userCallback)
         cc->userCallback(client, cc->userData, requestId, response);
@@ -214,9 +213,9 @@ UA_Client_Subscriptions_modify(UA_Client *client,
     }
 
     /* Call the service */
-    __UA_Client_Service(client,
-                        &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
+    __Client_Service(client,
+                     &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
+                     &response, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 
     /* Adjust the internal representation. Lookup again for thread-safety. */
     sub = findSubscription(client, request.subscriptionId);
@@ -235,8 +234,9 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
                                      const UA_ModifySubscriptionRequest request,
                                      UA_ClientAsyncServiceCallback callback,
                                      void *userdata, UA_UInt32 *requestId) {
-    /* Find the internal representation */
     UA_LOCK(&client->clientMutex);
+
+    /* Find the internal representation */
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
         UA_UNLOCK(&client->clientMutex);
@@ -254,9 +254,10 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
     cc->userCallback = callback;
 
     UA_StatusCode res =
-        __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
-                                 ua_Subscriptions_modify_handler, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE],
-                                 cc, requestId);
+        __Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST],
+                              ua_Subscriptions_modify_handler, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE],
+                              cc, requestId);
+
     UA_UNLOCK(&client->clientMutex);
     return res;
 }
@@ -385,14 +386,16 @@ UA_Client_Subscriptions_delete_async(UA_Client *client,
 UA_DeleteSubscriptionsResponse
 UA_Client_Subscriptions_delete(UA_Client *client,
                                const UA_DeleteSubscriptionsRequest request) {
+    UA_LOCK(&client->clientMutex);
+
     /* Send the request */
     UA_DeleteSubscriptionsResponse response;
-    __UA_Client_Service(client, &request, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST],
-                        &response, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
+    __Client_Service(client, &request, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST],
+                     &response, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
 
     /* Process */
-    UA_LOCK(&client->clientMutex);
     __Client_Subscription_processDelete(client, &request, &response);
+
     UA_UNLOCK(&client->clientMutex);
     return response;
 }

From d2814476f59eb289826903d4d1a90a5ffc54b82d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 10 Jan 2025 14:24:57 +0100
Subject: [PATCH 1751/1963] refactor(pubsub): Simplify by the use of recursive
 locks

---
 src/pubsub/ua_pubsub_eventloop.c   |  14 ----
 src/pubsub/ua_pubsub_keystorage.c  |   3 +-
 src/pubsub/ua_pubsub_ns0.c         | 124 ++++++++++++-----------------
 src/pubsub/ua_pubsub_writergroup.c |   9 +--
 4 files changed, 56 insertions(+), 94 deletions(-)

diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index 2d1db067f7a..b325e35ea2c 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -357,9 +357,7 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
                                    "instead of opening a receiving channel.");
         }
 
-        UA_UNLOCK(&server->serviceMutex);
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubRecvChannelCallback);
-        UA_LOCK(&server->serviceMutex);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an UDP channel for receiving");
@@ -386,9 +384,7 @@ UA_PubSubConnection_connectUDP(UA_Server *server, UA_PubSubConnection *c,
         }
 
         listen = false;
-        UA_UNLOCK(&server->serviceMutex);
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
-        UA_LOCK(&server->serviceMutex);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an UDP recv channel");
@@ -434,9 +430,7 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c,
 
     /* Open recv channels */
     if(c->recvChannelsSize == 0) {
-        UA_UNLOCK(&server->serviceMutex);
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubRecvChannelCallback);
-        UA_LOCK(&server->serviceMutex);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an ETH recv channel");
@@ -447,9 +441,7 @@ UA_PubSubConnection_connectETH(UA_Server *server, UA_PubSubConnection *c,
     /* Open send channels */
     if(c->sendChannel == 0) {
         listen = false;
-        UA_UNLOCK(&server->serviceMutex);
         res = c->cm->openConnection(c->cm, &kvm, server, c, PubSubSendChannelCallback);
-        UA_LOCK(&server->serviceMutex);
         if(res != UA_STATUSCODE_GOOD) {
             UA_LOG_ERROR_CONNECTION(server->config.logging, c,
                                     "Could not open an ETH channel for sending");
@@ -651,9 +643,7 @@ UA_WriterGroup_connectUDPUnicast(UA_Server *server, UA_WriterGroup *wg,
 
     /* Connect */
     UA_ConnectionManager *cm = wg->linkedConnection->cm;
-    UA_UNLOCK(&server->serviceMutex);
     res = cm->openConnection(cm, &kvm, server, wg, WriterGroupChannelCallback);
-    UA_LOCK(&server->serviceMutex);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Could not open a UDP send channel");
@@ -711,9 +701,7 @@ UA_WriterGroup_connectMQTT(UA_Server *server, UA_WriterGroup *wg,
     UA_Variant_setScalar(&kvp[4].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     /* Connect */
-    UA_UNLOCK(&server->serviceMutex);
     res = c->cm->openConnection(c->cm, &kvm, server, wg, WriterGroupChannelCallback);
-    UA_LOCK(&server->serviceMutex);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_WRITERGROUP(server->config.logging, wg,
                                  "Could not open the MQTT connection");
@@ -978,9 +966,7 @@ UA_ReaderGroup_connectMQTT(UA_Server *server, UA_ReaderGroup *rg,
     UA_Variant_setScalar(&kvp[4].value, &validate, &UA_TYPES[UA_TYPES_BOOLEAN]);
 
     /* Connect */
-    UA_UNLOCK(&server->serviceMutex);
     res = c->cm->openConnection(c->cm, &kvm, server, rg, ReaderGroupChannelCallback);
-    UA_LOCK(&server->serviceMutex);
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_READERGROUP(server->config.logging, rg,
                                  "Could not open the MQTT connection");
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index 07af4710ed0..f38e57f36a7 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -593,12 +593,13 @@ storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
                      UA_StatusCode_name(retval));
     }
     /* call user callback to notify about the status */
-    UA_UNLOCK(&server->serviceMutex);
     if(ks->sksConfig.userNotifyCallback)
         ks->sksConfig.userNotifyCallback(server, retval, ks->sksConfig.context);
     ks->sksConfig.reqId = 0;
     UA_Client_disconnectAsync(client);
     addDelayedSksClientCleanupCb(client, ctx);
+
+    UA_UNLOCK(&server->serviceMutex);
 }
 
 static UA_StatusCode
diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 329fe70317e..f3b51e13cc0 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -232,9 +232,8 @@ static void
 onRead(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
        const UA_NodeId *nodeid, void *context,
        const UA_NumericRange *range, const UA_DataValue *data) {
-    UA_LOCK(&server->serviceMutex);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     onReadLocked(server, sessionId, sessionContext, nodeid, context, range, data);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -293,9 +292,8 @@ static void
 onWrite(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
         const UA_NodeId *nodeId, void *nodeContext,
         const UA_NumericRange *range, const UA_DataValue *data) {
-    UA_LOCK(&server->serviceMutex);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     onWriteLocked(server, sessionId, sessionContext, nodeId, nodeContext, range, data);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 static UA_StatusCode
@@ -849,13 +847,11 @@ addPubSubConnectionAction(UA_Server *server,
                           const UA_NodeId *objectId, void *objectContext,
                           size_t inputSize, const UA_Variant *input,
                           size_t outputSize, UA_Variant *output) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = addPubSubConnectionLocked(server, sessionId, sessionHandle,
-                                                  methodId, methodContext,
-                                                  objectId, objectContext,
-                                                  inputSize, input, outputSize, output);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    return addPubSubConnectionLocked(server, sessionId, sessionHandle,
+                                     methodId, methodContext,
+                                     objectId, objectContext,
+                                     inputSize, input, outputSize, output);
 }
 
 static UA_StatusCode
@@ -978,12 +974,10 @@ addDataSetReaderAction(UA_Server *server,
                        const UA_NodeId *objectId, void *objectContext,
                        size_t inputSize, const UA_Variant *input,
                        size_t outputSize, UA_Variant *output){
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = addDataSetReaderLocked(server, sessionId, sessionHandle,
-                                               methodId, methodContext, objectId, objectContext,
-                                               inputSize, input, outputSize, output);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    return addDataSetReaderLocked(server, sessionId, sessionHandle,
+                                  methodId, methodContext, objectId, objectContext,
+                                  inputSize, input, outputSize, output);
 }
 
 static UA_StatusCode
@@ -1504,26 +1498,25 @@ addWriterGroupRepresentation(UA_Server *server, UA_WriterGroup *writerGroup) {
 
 static UA_StatusCode
 addWriterGroupAction(UA_Server *server,
-                             const UA_NodeId *sessionId, void *sessionHandle,
-                             const UA_NodeId *methodId, void *methodContext,
-                             const UA_NodeId *objectId, void *objectContext,
-                             size_t inputSize, const UA_Variant *input,
-                             size_t outputSize, UA_Variant *output){
-    UA_LOCK(&server->serviceMutex);
+                     const UA_NodeId *sessionId, void *sessionHandle,
+                     const UA_NodeId *methodId, void *methodContext,
+                     const UA_NodeId *objectId, void *objectContext,
+                     size_t inputSize, const UA_Variant *input,
+                     size_t outputSize, UA_Variant *output){
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_WriterGroupDataType *writerGroup = ((UA_WriterGroupDataType *) input[0].data);
     UA_NodeId writerGroupId;
     retVal |= addWriterGroupConfig(server, *objectId, writerGroup, &writerGroupId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "addWriterGroup failed");
-        UA_UNLOCK(&server->serviceMutex);
         return retVal;
     }
     // TODO: Need to handle the UA_Server_setWriterGroupOperational based on the
     // status variable in information model
 
     UA_Variant_setScalarCopy(output, &writerGroupId, &UA_TYPES[UA_TYPES_NODEID]);
-    UA_UNLOCK(&server->serviceMutex);
     return retVal;
 }
 
@@ -1609,12 +1602,10 @@ addReserveIdsAction(UA_Server *server,
                     const UA_NodeId *objectId, void *objectContext,
                     size_t inputSize, const UA_Variant *input,
                     size_t outputSize, UA_Variant *output) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = addReserveIdsLocked(server, sessionId, sessionHandle,
-                                            methodId, methodContext, objectId, objectContext,
-                                            inputSize, input, outputSize, output);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    return addReserveIdsLocked(server, sessionId, sessionHandle,
+                               methodId, methodContext, objectId, objectContext,
+                               inputSize, input, outputSize, output);
 }
 
 /**********************************************/
@@ -1656,22 +1647,21 @@ addReaderGroupAction(UA_Server *server,
                      const UA_NodeId *methodId, void *methodContext,
                      const UA_NodeId *objectId, void *objectContext,
                      size_t inputSize, const UA_Variant *input,
-                     size_t outputSize, UA_Variant *output){
-    UA_LOCK(&server->serviceMutex);
+                     size_t outputSize, UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     UA_ReaderGroupDataType *readerGroup = ((UA_ReaderGroupDataType *) input->data);
     UA_NodeId readerGroupId;
     retVal |= addReaderGroupConfig(server, *objectId, readerGroup, &readerGroupId);
     if(retVal != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER, "addReaderGroup failed");
-        UA_UNLOCK(&server->serviceMutex);
         return retVal;
     }
     // TODO: Need to handle the UA_Server_setReaderGroupOperational based on the
     // status variable in information model
 
     UA_Variant_setScalarCopy(output, &readerGroupId, &UA_TYPES[UA_TYPES_NODEID]);
-    UA_UNLOCK(&server->serviceMutex);
     return retVal;
 }
 
@@ -1910,12 +1900,10 @@ addDataSetWriterAction(UA_Server *server,
                        const UA_NodeId *objectId, void *objectContext,
                        size_t inputSize, const UA_Variant *input,
                        size_t outputSize, UA_Variant *output) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = addDataSetWriterLocked(server, sessionId, sessionHandle,
-                                               methodId, methodContext, objectId, objectContext,
-                                               inputSize, input, outputSize, output);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    return addDataSetWriterLocked(server, sessionId, sessionHandle,
+                                  methodId, methodContext, objectId, objectContext,
+                                  inputSize, input, outputSize, output);
 }
 
 static UA_StatusCode
@@ -2029,13 +2017,11 @@ setSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessi
                       const UA_NodeId *methodId, void *methodContext,
                       const UA_NodeId *objectId, void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize, UA_Variant *output) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = setSecurityKeysLocked(server, sessionId, sessionHandle,
-                                              methodId, methodContext,
-                                              objectId, objectContext, inputSize,
-                                              input, outputSize, output);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    return setSecurityKeysLocked(server, sessionId, sessionHandle,
+                                 methodId, methodContext,
+                                 objectId, objectContext, inputSize,
+                                 input, outputSize, output);
 }
 
 static UA_StatusCode
@@ -2174,13 +2160,11 @@ getSecurityKeysAction(UA_Server *server, const UA_NodeId *sessionId, void *sessi
                       const UA_NodeId *methodId, void *methodContext,
                       const UA_NodeId *objectId, void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize, UA_Variant *output) {
-    UA_LOCK(&server->serviceMutex);
-    UA_StatusCode res = getSecurityKeysLocked(server, sessionId, sessionHandle,
-                                              methodId, methodContext,
-                                              objectId, objectContext, inputSize,
-                                              input, outputSize, output);
-    UA_UNLOCK(&server->serviceMutex);
-    return res;
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+    return getSecurityKeysLocked(server, sessionId, sessionHandle,
+                                 methodId, methodContext,
+                                 objectId, objectContext, inputSize,
+                                 input, outputSize, output);
 }
 #endif
 
@@ -2193,7 +2177,7 @@ connectionTypeDestructor(UA_Server *server,
                          const UA_NodeId *sessionId, void *sessionContext,
                          const UA_NodeId *typeId, void *typeContext,
                          const UA_NodeId *nodeId, void **nodeContext) {
-    UA_LOCK(&server->serviceMutex);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "Connection destructor called!");
     UA_NodeId publisherIdNode =
@@ -2203,7 +2187,6 @@ connectionTypeDestructor(UA_Server *server,
     getNodeContext(server, publisherIdNode, (void **)&ctx);
     if(!UA_NodeId_isNull(&publisherIdNode))
         UA_free(ctx);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2211,9 +2194,9 @@ writerGroupTypeDestructor(UA_Server *server,
                           const UA_NodeId *sessionId, void *sessionContext,
                           const UA_NodeId *typeId, void *typeContext,
                           const UA_NodeId *nodeId, void **nodeContext) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "WriterGroup destructor called!");
-    UA_LOCK(&server->serviceMutex);
     UA_NodeId intervalNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublishingInterval"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
@@ -2221,7 +2204,6 @@ writerGroupTypeDestructor(UA_Server *server,
     getNodeContext(server, intervalNode, (void **)&ctx);
     if(!UA_NodeId_isNull(&intervalNode))
         UA_free(ctx);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2238,9 +2220,9 @@ dataSetWriterTypeDestructor(UA_Server *server,
                             const UA_NodeId *sessionId, void *sessionContext,
                             const UA_NodeId *typeId, void *typeContext,
                             const UA_NodeId *nodeId, void **nodeContext) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "DataSetWriter destructor called!");
-    UA_LOCK(&server->serviceMutex);
     UA_NodeId dataSetWriterIdNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetWriterId"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
@@ -2248,7 +2230,6 @@ dataSetWriterTypeDestructor(UA_Server *server,
     getNodeContext(server, dataSetWriterIdNode, (void **)&ctx);
     if(!UA_NodeId_isNull(&dataSetWriterIdNode))
         UA_free(ctx);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2256,9 +2237,9 @@ dataSetReaderTypeDestructor(UA_Server *server,
                             const UA_NodeId *sessionId, void *sessionContext,
                             const UA_NodeId *typeId, void *typeContext,
                             const UA_NodeId *nodeId, void **nodeContext) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "DataSetReader destructor called!");
-    UA_LOCK(&server->serviceMutex);
     UA_NodeId publisherIdNode =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublisherId"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
@@ -2266,17 +2247,16 @@ dataSetReaderTypeDestructor(UA_Server *server,
     getNodeContext(server, publisherIdNode, (void **)&ctx);
     if(!UA_NodeId_isNull(&publisherIdNode))
         UA_free(ctx);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
 publishedDataItemsTypeDestructor(UA_Server *server,
-                            const UA_NodeId *sessionId, void *sessionContext,
-                            const UA_NodeId *typeId, void *typeContext,
-                            const UA_NodeId *nodeId, void **nodeContext) {
+                                 const UA_NodeId *sessionId, void *sessionContext,
+                                 const UA_NodeId *typeId, void *typeContext,
+                                 const UA_NodeId *nodeId, void **nodeContext) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "PublishedDataItems destructor called!");
-    UA_LOCK(&server->serviceMutex);
     void *childContext;
     UA_NodeId node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublishedData"),
                                          UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
@@ -2296,7 +2276,6 @@ publishedDataItemsTypeDestructor(UA_Server *server,
     getNodeContext(server, node, (void**)&childContext);
     if(!UA_NodeId_isNull(&node))
         UA_free(childContext);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 static void
@@ -2304,9 +2283,9 @@ standaloneSubscribedDataSetTypeDestructor(UA_Server *server,
                             const UA_NodeId *sessionId, void *sessionContext,
                             const UA_NodeId *typeId, void *typeContext,
                             const UA_NodeId *nodeId, void **nodeContext) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_USERLAND,
                 "Standalone SubscribedDataSet destructor called!");
-    UA_LOCK(&server->serviceMutex);
     void *childContext;
     UA_NodeId node =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
@@ -2320,7 +2299,6 @@ standaloneSubscribedDataSetTypeDestructor(UA_Server *server,
     getNodeContext(server, node, (void**)&childContext);
     if(!UA_NodeId_equal(&UA_NODEID_NULL , &node))
         UA_free(childContext);
-    UA_UNLOCK(&server->serviceMutex);
 }
 
 /*************************************/
@@ -2338,11 +2316,10 @@ UA_loadPubSubConfigMethodCallback(UA_Server *server,
                                   const UA_NodeId *objectId, void *objectContext,
                                   size_t inputSize, const UA_Variant *input,
                                   size_t outputSize, UA_Variant *output) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     if(inputSize == 1) {
-        UA_LOCK(&server->serviceMutex);
         UA_ByteString *inputStr = (UA_ByteString*)input->data;
         UA_StatusCode res = UA_PubSubManager_loadPubSubConfigFromByteString(server, *inputStr);
-        UA_UNLOCK(&server->serviceMutex);
         return res;
     } else if(inputSize > 1) {
         return UA_STATUSCODE_BADTOOMANYARGUMENTS;
@@ -2360,9 +2337,8 @@ UA_deletePubSubConfigMethodCallback(UA_Server *server,
                                     const UA_NodeId *objectId, void *objectContext,
                                     size_t inputSize, const UA_Variant *input,
                                     size_t outputSize, UA_Variant *output) {
-    UA_LOCK(&server->serviceMutex);
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_PubSubManager_delete(server, &server->pubSubManager);
-    UA_UNLOCK(&server->serviceMutex);
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index b355c2ac603..667567d084d 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -72,9 +72,7 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *wg) {
 
     /* Run once after creation. The Publish callback itself takes the server
      * mutex. So we release it first. */
-    UA_UNLOCK(&server->serviceMutex);
     UA_WriterGroup_publishCallback(server, wg);
-    UA_LOCK(&server->serviceMutex);
     return retval;
 }
 
@@ -1255,6 +1253,7 @@ sampleOffsetPublishingValues(UA_Server *server, UA_WriterGroup *wg) {
 static void
 publishWithOffsets(UA_Server *server, UA_WriterGroup *writerGroup,
                    UA_PubSubConnection *connection) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
     UA_assert(writerGroup->configurationFrozen);
 
     /* Fixed size but no direct value access. Sample to get recent values into
@@ -1360,6 +1359,8 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     UA_assert(writerGroup != NULL);
     UA_assert(server != NULL);
 
+    UA_LOCK(&server->serviceMutex);
+
     UA_LOG_DEBUG_WRITERGROUP(server->config.logging, writerGroup, "Publish Callback");
 
     /* Find the connection associated with the writer */
@@ -1367,7 +1368,6 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     if(!connection) {
         UA_LOG_ERROR_WRITERGROUP(server->config.logging, writerGroup,
                                  "Publish failed. PubSubConnection invalid");
-        UA_LOCK(&server->serviceMutex);
         UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_ERROR,
                                       UA_STATUSCODE_BADNOTCONNECTED);
         UA_UNLOCK(&server->serviceMutex);
@@ -1377,11 +1377,10 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     /* Realtime path - update the buffer message and send directly */
     if(writerGroup->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) {
         publishWithOffsets(server, writerGroup, connection);
+        UA_UNLOCK(&server->serviceMutex);
         return;
     }
 
-    UA_LOCK(&server->serviceMutex);
-
     /* Nothing to do? */
     if(writerGroup->writersCount == 0) {
         UA_UNLOCK(&server->serviceMutex);

From 684a8c50f13e19881e2671223ffcd0ae525ee6ba Mon Sep 17 00:00:00 2001
From: Florian La Roche <f.laroche@pilz.de>
Date: Tue, 14 Jan 2025 17:35:22 +0100
Subject: [PATCH 1752/1963] refactor(server): use ".local" for mDNS published
 records

If we publish mDNS records in src/server/ua_discovery_mdns.c,
always add a ".local." suffix for all entries.

Signed-off-by: Florian La Roche <f.laroche@pilz.de>
---
 src/server/ua_discovery_mdns.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_discovery_mdns.c b/src/server/ua_discovery_mdns.c
index 5f5e6ab23b7..e8b2a746712 100644
--- a/src/server/ua_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -1298,10 +1298,9 @@ UA_Discovery_addRecord(UA_DiscoveryManager *dm, const UA_String *servername,
 
     /* The first 63 characters of the hostname (or less) */
     size_t maxHostnameLen = UA_MIN(hostnameLen, 63);
-    char localDomain[65];
+    char localDomain[71];
     memcpy(localDomain, hostname->data, maxHostnameLen);
-    localDomain[maxHostnameLen] = '.';
-    localDomain[maxHostnameLen+1] = '\0';
+    strcpy(localDomain + maxHostnameLen, ".local.");
 
     /* [servername]-[hostname]._opcua-tcp._tcp.local. 86400 IN SRV 0 5 port [hostname]. */
     r = mdnsd_unique(dm->mdnsDaemon, fullServiceDomain,

From cb1bd47c3a573cdeb4e34378d9b00412383c3946 Mon Sep 17 00:00:00 2001
From: marwinglaser <marwin.glaser@iosb.fraunhofer.de>
Date: Wed, 15 Jan 2025 09:15:25 +0100
Subject: [PATCH 1753/1963] fix(ci): make codecov run for release branches
 (#7020)

---
 .github/workflows/coverage.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index a7d198e4805..1548d87bbe7 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -1,13 +1,11 @@
 name: "Coverage Test"
 on:
   push:
-    branches: [ main, master ]
+    branches: [ main, master, 1.* ]
     tags:
       - v1.*
   pull_request:
-    branches: [ main, master ]
-    tags:
-      - v1.*
+    branches: [ main, master, 1.* ]
 
 jobs:
   run:

From 403f4628c4aa4cb87a789d1063c1c79338384bcc Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.von-arnim@isw.uni-stuttgart.de>
Date: Tue, 10 Dec 2024 15:49:16 +0100
Subject: [PATCH 1754/1963] fix(plugin): Convert PEM to DER for rsa policies

---
 plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c | 6 +++---
 plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c b/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
index c502cd75f58..8a2c2db3b67 100644
--- a/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
+++ b/plugins/crypto/openssl/ua_openssl_aes128sha256rsaoaep.c
@@ -589,9 +589,9 @@ UA_SecurityPolicy_Aes128Sha256RsaOaep(UA_SecurityPolicy *policy,
     channelModule->compareCertificate =
         UA_ChannelM_Aes128Sha256RsaOaep_compareCertificate;
 
-    /* Copy the certificate and add a NULL to the end */
-
-    retval = UA_copyCertificate(&policy->localCertificate, &localCertificate);
+    /* Load and convert to DER if necessary */
+    retval =
+        UA_OpenSSL_LoadLocalCertificate(&localCertificate, &policy->localCertificate);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
diff --git a/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c b/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
index 49ea9f6e1d8..51745bd53f6 100644
--- a/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
+++ b/plugins/crypto/openssl/ua_openssl_aes256sha256rsapss.c
@@ -641,9 +641,9 @@ UA_SecurityPolicy_Aes256Sha256RsaPss(UA_SecurityPolicy *policy,
     channelModule->compareCertificate =
         UA_ChannelM_Aes256Sha256RsaPss_compareCertificate;
 
-    /* Copy the certificate and add a NULL to the end */
-
-    retval = UA_copyCertificate(&policy->localCertificate, &localCertificate);
+    /* Load and convert to DER if necessary */
+    retval =
+        UA_OpenSSL_LoadLocalCertificate(&localCertificate, &policy->localCertificate);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 

From 10256ed52842762016c738b88cd133272ae995d3 Mon Sep 17 00:00:00 2001
From: Goetz Goerisch <g.goerisch@vdw.de>
Date: Thu, 23 Jan 2025 15:23:12 +0100
Subject: [PATCH 1755/1963] fix(core): allow recursive locking with musl libc

* refactor(core): Use recursive locks [93838cd37c166464b324d648ea52d916429c478d] introduced recursive locking.

* PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is not defined in musl libc
* use PTHREAD_MUTEX_INITIALIZER on musl libc systems

Signed-off-by: Goetz Goerisch <g.goerisch@vdw.de>
---
 include/open62541/config.h.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index 0fc00415054..e0578c2aae5 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -401,7 +401,11 @@ typedef struct {
     int mutexCounter;
 } UA_Lock;
 
+#if defined(__GLIBC__)
 #define UA_LOCK_STATIC_INIT {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, 0}
+#else
+#define UA_LOCK_STATIC_INIT {PTHREAD_MUTEX_INITIALIZER, 0}
+#endif
 
 static UA_INLINE void
 UA_LOCK_INIT(UA_Lock *lock) {

From 8fb31b2e96381e7abb8b60a50cfc106712bc3c0b Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 24 Jan 2025 12:56:48 +0100
Subject: [PATCH 1756/1963] fix(example): Allow connection with username and
 password without encryption

---
 examples/access_control/server_access_control.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/access_control/server_access_control.c b/examples/access_control/server_access_control.c
index 4b6cd8005d6..3b99e7b77ec 100644
--- a/examples/access_control/server_access_control.c
+++ b/examples/access_control/server_access_control.c
@@ -65,6 +65,8 @@ setCustomAccessControl(UA_ServerConfig *config) {
 int main(void) {
     UA_Server *server = UA_Server_new();
     UA_ServerConfig *config = UA_Server_getConfig(server);
+    /* Allow clients without encryption support to connect with username and password. Not recommended!  */
+    config->allowNonePolicyPassword = true;
     setCustomAccessControl(config);
 
     UA_StatusCode retval = UA_Server_runUntilInterrupt(server);

From f691be7cca34d9d325c201861b698bf115b64bf6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Jan 2025 19:13:39 +0100
Subject: [PATCH 1757/1963] fix(core): The static initialization of a mutex
 must also be the recursive one

---
 include/open62541/config.h.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index e0578c2aae5..ebd0c2a2e01 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -404,7 +404,7 @@ typedef struct {
 #if defined(__GLIBC__)
 #define UA_LOCK_STATIC_INIT {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, 0}
 #else
-#define UA_LOCK_STATIC_INIT {PTHREAD_MUTEX_INITIALIZER, 0}
+#define UA_LOCK_STATIC_INIT {PTHREAD_RECURSIVE_MUTEX_INITIALIZER, 0}
 #endif
 
 static UA_INLINE void

From b1151d37b7dc145ff3746ac847075172f9f36da0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Jan 2025 19:14:35 +0100
Subject: [PATCH 1758/1963] feat(el): Expose the EventLoop mutex in its API

---
 arch/eventloop_posix.c               | 15 +++++++++++++++
 include/open62541/plugin/eventloop.h | 12 ++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 48675e052aa..57d4234440f 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -417,6 +417,18 @@ UA_EventLoopPOSIX_free(UA_EventLoopPOSIX *el) {
     return UA_STATUSCODE_GOOD;
 }
 
+static void
+UA_EventLoopPOSIX_lock(UA_EventLoop *public_el) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
+    UA_LOCK(&el->elMutex);
+}
+
+static void
+UA_EventLoopPOSIX_unlock(UA_EventLoop *public_el) {
+    UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
+    UA_UNLOCK(&el->elMutex);
+}
+
 UA_EventLoop *
 UA_EventLoop_new_POSIX(const UA_Logger *logger) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)
@@ -462,6 +474,9 @@ UA_EventLoop_new_POSIX(const UA_Logger *logger) {
         (UA_StatusCode (*)(UA_EventLoop*, UA_EventSource*))
         UA_EventLoopPOSIX_deregisterEventSource;
 
+    el->eventLoop.lock = UA_EventLoopPOSIX_lock;
+    el->eventLoop.unlock = UA_EventLoopPOSIX_unlock;
+
     return &el->eventLoop;
 }
 
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index a5f048bb84a..22351999f72 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -198,6 +198,18 @@ struct UA_EventLoop {
     /* Stops the EventSource before deregistrering it */
     UA_StatusCode
     (*deregisterEventSource)(UA_EventLoop *el, UA_EventSource *es);
+
+    /* Locking
+     * ~~~~~~~
+     *
+     * For multi-threading the EventLoop is protected by a mutex. The mutex is
+     * expected to be recursive (can be taken more than once from the same
+     * thread). A common approach to avoid deadlocks is to establish an absolute
+     * ordering between the locks. Where the "lower" locks needs to be taken
+     * before the "upper" lock. The EventLoop-mutex is exposed here to allow it
+     * to be taken from the outside. */
+    void (*lock)(UA_EventLoop *el);
+    void (*unlock)(UA_EventLoop *el);
 };
 
 /**

From 92bbbe5b0dae0f72e15300bcb44f3e0d3cc77bfb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Jan 2025 19:14:54 +0100
Subject: [PATCH 1759/1963] refactor(server): Take the EventLoop first for the
 server

---
 src/server/ua_discovery.c                     |   8 +-
 src/server/ua_discovery_mdns.c                |   4 +-
 src/server/ua_server.c                        |  75 +++++----
 src/server/ua_server_async.c                  |   8 +-
 src/server/ua_server_binary.c                 |  27 ++--
 src/server/ua_server_internal.h               |  10 ++
 src/server/ua_server_ns0.c                    |  31 ++--
 src/server/ua_server_ns0_diagnostics.c        |  28 ++--
 src/server/ua_services_attribute.c            |  28 ++--
 src/server/ua_services_method.c               |   4 +-
 src/server/ua_services_monitoreditem.c        |  10 +-
 src/server/ua_services_nodemanagement.c       |  79 +++++-----
 src/server/ua_services_session.c              |   4 +-
 src/server/ua_services_view.c                 |  22 +--
 src/server/ua_session.c                       |  30 ++--
 src/server/ua_subscription.c                  |   9 +-
 .../ua_subscription_alarms_conditions.c       | 142 +++++++++---------
 src/server/ua_subscription_datachange.c       |   4 +-
 src/server/ua_subscription_events.c           |   8 +-
 19 files changed, 276 insertions(+), 255 deletions(-)

diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
index 8c8360e97a2..046e955cf6c 100644
--- a/src/server/ua_discovery.c
+++ b/src/server/ua_discovery.c
@@ -514,10 +514,10 @@ UA_Server_registerDiscovery(UA_Server *server, UA_ClientConfig *cc,
     UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "Registering at the DiscoveryServer: %.*s",
                 (int)discoveryServerUrl.length, discoveryServerUrl.data);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res =
         UA_Server_register(server, cc, false, discoveryServerUrl, semaphoreFilePath);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -527,10 +527,10 @@ UA_Server_deregisterDiscovery(UA_Server *server, UA_ClientConfig *cc,
     UA_LOG_INFO(server->config.logging, UA_LOGCATEGORY_SERVER,
                 "Deregistering at the DiscoveryServer: %.*s",
                 (int)discoveryServerUrl.length, discoveryServerUrl.data);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res =
         UA_Server_register(server, cc, true, discoveryServerUrl, UA_STRING_NULL);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/server/ua_discovery_mdns.c b/src/server/ua_discovery_mdns.c
index e8b2a746712..27a7adab671 100644
--- a/src/server/ua_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -1068,14 +1068,14 @@ void
 UA_Server_setServerOnNetworkCallback(UA_Server *server,
                                      UA_Server_serverOnNetworkCallback cb,
                                      void* data) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DiscoveryManager *dm = (UA_DiscoveryManager*)
         getServerComponentByName(server, UA_STRING("discovery"));
     if(dm) {
         dm->serverOnNetworkCallback = cb;
         dm->serverOnNetworkCallbackData = data;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 static void
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index f2ecc89b2cf..667cb08c680 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -87,9 +87,9 @@ UA_UInt16 UA_Server_addNamespace(UA_Server *server, const char* name) {
     UA_String nameString;
     nameString.length = strlen(name);
     nameString.data = (UA_Byte*)(uintptr_t)name;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_UInt16 retVal = addNamespace(server, nameString);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retVal;
 }
 
@@ -130,18 +130,18 @@ getNamespaceByIndex(UA_Server *server, const size_t namespaceIndex,
 UA_StatusCode
 UA_Server_getNamespaceByName(UA_Server *server, const UA_String namespaceUri,
                              size_t *foundIndex) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = getNamespaceByName(server, namespaceUri, foundIndex);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
 UA_StatusCode
 UA_Server_getNamespaceByIndex(UA_Server *server, const size_t namespaceIndex,
                               UA_String *foundUri) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = getNamespaceByIndex(server, namespaceIndex, foundUri);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -253,7 +253,7 @@ UA_Server_delete(UA_Server *server) {
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     session_list_entry *current, *temp;
     LIST_FOREACH_SAFE(current, &server->sessions, pointers, temp) {
@@ -297,7 +297,7 @@ UA_Server_delete(UA_Server *server) {
     ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
              removeServerComponent, server);
 
-    UA_UNLOCK(&server->serviceMutex); /* The timer has its own mutex */
+    unlockServer(server); /* The timer has its own mutex */
 
     /* Clean up the config */
     UA_ServerConfig_clean(&server->config);
@@ -315,10 +315,10 @@ UA_Server_delete(UA_Server *server) {
  * sessions. */
 static void
 serverHouseKeeping(UA_Server *server, void *_) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DateTime nowMonotonic = UA_DateTime_nowMonotonic();
     UA_Server_cleanupSessions(server, nowMonotonic);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 /********************/
@@ -348,7 +348,7 @@ UA_Server_init(UA_Server *server) {
 #endif
 
     UA_LOCK_INIT(&server->serviceMutex);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Initialize the adminSession */
     UA_Session_init(&server->adminSession);
@@ -407,11 +407,11 @@ UA_Server_init(UA_Server *server) {
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
 #endif /* UA_ENABLE_PUBSUB */
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return server;
 
  cleanup:
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_Server_delete(server);
     return NULL;
 }
@@ -459,11 +459,11 @@ setServerShutdown(UA_Server *server) {
 UA_StatusCode
 UA_Server_addTimedCallback(UA_Server *server, UA_ServerCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = server->config.eventLoop->
         addTimedCallback(server->config.eventLoop, (UA_Callback)callback,
                          server, data, date, callbackId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -481,9 +481,9 @@ UA_StatusCode
 UA_Server_addRepeatedCallback(UA_Server *server, UA_ServerCallback callback,
                               void *data, UA_Double interval_ms,
                               UA_UInt64 *callbackId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = addRepeatedCallback(server, callback, data, interval_ms, callbackId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -499,10 +499,10 @@ changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId,
 UA_StatusCode
 UA_Server_changeRepeatedCallbackInterval(UA_Server *server, UA_UInt64 callbackId,
                                          UA_Double interval_ms) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval =
         changeRepeatedCallbackInterval(server, callbackId, interval_ms);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -517,9 +517,9 @@ removeCallback(UA_Server *server, UA_UInt64 callbackId) {
 
 void
 UA_Server_removeCallback(UA_Server *server, UA_UInt64 callbackId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     removeCallback(server, callbackId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 static void
@@ -542,7 +542,7 @@ UA_Server_updateCertificate(UA_Server *server,
     UA_CHECK(server && oldCertificate && newCertificate && newPrivateKey,
              return UA_STATUSCODE_BADINTERNALERROR);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     if(closeSessions) {
         session_list_entry *current;
@@ -583,7 +583,7 @@ UA_Server_updateCertificate(UA_Server *server,
         i++;
     }
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     return res;
 }
@@ -721,12 +721,12 @@ UA_Server_run_startup(UA_Server *server) {
     }
 
     /* Take the server lock */
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Does the ApplicationURI match the local certificates? */
 #ifdef UA_ENABLE_ENCRYPTION
     retVal = verifyServerApplicationURI(server);
-    UA_CHECK_STATUS(retVal, UA_UNLOCK(&server->serviceMutex); return retVal);
+    UA_CHECK_STATUS(retVal, unlockServer(server); return retVal);
 #endif
 
     /* Are there enough SecureChannels possible for the max number of sessions? */
@@ -740,7 +740,7 @@ UA_Server_run_startup(UA_Server *server) {
     /* Add a regular callback for housekeeping tasks. With a 1s interval. */
     retVal = addRepeatedCallback(server, serverHouseKeeping,
                                  NULL, 1000.0, &server->houseKeepingCallbackId);
-    UA_CHECK_STATUS_ERROR(retVal, UA_UNLOCK(&server->serviceMutex); return retVal,
+    UA_CHECK_STATUS_ERROR(retVal, unlockServer(server); return retVal,
                           config->logging, UA_LOGCATEGORY_SERVER,
                           "Could not create the server housekeeping task");
 
@@ -790,7 +790,7 @@ UA_Server_run_startup(UA_Server *server) {
         /* Stop all server components that have already been started */
         ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
                  stopServerComponent, server);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -798,7 +798,7 @@ UA_Server_run_startup(UA_Server *server) {
      * UA_Server_run_shutdown(server) to stop the server. */
     setServerLifecycleState(server, UA_LIFECYCLESTATE_STARTED);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -845,12 +845,12 @@ UA_Server_run_shutdown(UA_Server *server) {
     if(server == NULL)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     if(server->state != UA_LIFECYCLESTATE_STARTED) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "The server is not started, cannot be shut down");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -879,7 +879,7 @@ UA_Server_run_shutdown(UA_Server *server) {
 
     /* Only stop the EventLoop if it is coupled to the server lifecycle  */
     if(server->config.externalEventLoop) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -902,7 +902,7 @@ UA_Server_run_shutdown(UA_Server *server) {
     /* Set server lifecycle state to stopped if not already the case */
     setServerLifecycleState(server, UA_LIFECYCLESTATE_STOPPED);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -921,3 +921,14 @@ UA_Server_run(UA_Server *server, const volatile UA_Boolean *running) {
     return UA_Server_run_shutdown(server);
 }
 
+void lockServer(UA_Server *server) {
+    if(UA_LIKELY(server->config.eventLoop != NULL))
+        server->config.eventLoop->lock(server->config.eventLoop);
+    UA_LOCK(&server->serviceMutex);
+}
+
+void unlockServer(UA_Server *server) {
+    if(UA_LIKELY(server->config.eventLoop != NULL))
+        server->config.eventLoop->unlock(server->config.eventLoop);
+    UA_UNLOCK(&server->serviceMutex);
+}
diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 24e3b30a35c..d9aca065db6 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -161,9 +161,9 @@ checkTimeouts(UA_Server *server, void *_) {
     UA_UNLOCK(&am->queueLock);
 
     /* Integrate async results and send out complete responses */
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     processAsyncResults(server);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 void
@@ -395,11 +395,11 @@ setMethodNodeAsync(UA_Server *server, UA_Session *session,
 UA_StatusCode
 UA_Server_setMethodNodeAsync(UA_Server *server, const UA_NodeId id,
                              UA_Boolean isAsync) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res =
         UA_Server_editNode(server, &server->adminSession, &id,
                            (UA_EditNodeCallback)setMethodNodeAsync, &isAsync);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 06cb34df3cc..e02851b697d 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -715,7 +715,7 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
     UA_StatusCode channelRes = UA_STATUSCODE_GOOD;
     UA_ResponseHeader *rh = &response->responseHeader;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* If it is an unencrypted (#None) channel, only allow the discovery services */
     if(server->config.securityPolicyNoneDiscoveryOnly &&
@@ -807,7 +807,7 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
             Service_Publish(server, session, &request->publishRequest, requestId);
 
         /* Don't send a response */
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         goto update_statistics;
     }
 #endif
@@ -824,7 +824,7 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
          * statistic. */
         if(UA_LIKELY(finished))
             goto send_response;
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         goto update_statistics;
     }
 #endif
@@ -834,7 +834,7 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
 
     /* Upon success, send the response. Otherwise a ServiceFault. */
  send_response:
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     channelRes = sendResponse(server, session, channel,
                               requestId, response, responseType);
 
@@ -1373,7 +1373,7 @@ createServerConnection(UA_BinaryProtocolManager *bpm, const UA_String *serverUrl
 static void
 secureChannelHouseKeeping(UA_Server *server, void *context) {
     UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)context;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     UA_DateTime nowMonotonic = UA_DateTime_nowMonotonic();
     channel_entry *entry;
@@ -1409,7 +1409,7 @@ secureChannelHouseKeeping(UA_Server *server, void *context) {
             UA_SecureChannel_shutdown(&entry->channel, UA_SHUTDOWNREASON_TIMEOUT);
         }
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 /**********************/
@@ -1469,7 +1469,7 @@ sendRHEMessage(UA_Server *server, uintptr_t connectionId,
 
 static void
 retryReverseConnectCallback(UA_Server *server, void *context) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)context;
 
@@ -1483,7 +1483,7 @@ retryReverseConnectCallback(UA_Server *server, void *context) {
         attemptReverseConnect(bpm, rc);
     }
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 UA_StatusCode
@@ -1607,7 +1607,7 @@ UA_Server_addReverseConnect(UA_Server *server, UA_String url,
     newContext->stateCallback = stateCallback;
     newContext->callbackContext = callbackContext;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Register the retry callback */
     setReverseConnectRetryCallback(bpm, true);
@@ -1621,7 +1621,7 @@ UA_Server_addReverseConnect(UA_Server *server, UA_String url,
     /* Attempt to connect right away */
     res = attemptReverseConnect(bpm, newContext);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -1629,7 +1629,7 @@ UA_StatusCode
 UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
     UA_StatusCode result = UA_STATUSCODE_BADNOTFOUND;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     UA_ServerComponent *sc =
         getServerComponentByName(server, UA_STRING("binary"));
@@ -1637,7 +1637,7 @@ UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
     if(!bpm) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_SERVER,
                      "No BinaryProtocolManager configured");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -1665,8 +1665,7 @@ UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
     if(LIST_EMPTY(&bpm->reverseConnects))
         setReverseConnectRetryCallback(bpm, false);
 
-    UA_UNLOCK(&server->serviceMutex);
-
+    unlockServer(server);
     return result;
 }
 
diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index f0c40e33e46..fe5fcc66a89 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -369,6 +369,16 @@ UA_Server_processServiceOperations(UA_Server *server, UA_Session *session,
                                    const UA_DataType *responseOperationsType)
     UA_FUNC_ATTR_WARN_UNUSED_RESULT;
 
+/*********************/
+/* Locking/Unlocking */
+/*********************/
+
+/* In order to prevent deadlocks between the EventLoop mutex and the
+ * server-mutex, we always take the EventLoop mutex first. */
+
+void lockServer(UA_Server *server);
+void unlockServer(UA_Server *server);
+
 /******************************************/
 /* Internal function calls, without locks */
 /******************************************/
diff --git a/src/server/ua_server_ns0.c b/src/server/ua_server_ns0.c
index acc956110bc..8aa611f5147 100644
--- a/src/server/ua_server_ns0.c
+++ b/src/server/ua_server_ns0.c
@@ -649,29 +649,29 @@ resendData(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext,
     UA_UInt32 subscriptionId = *((UA_UInt32*)(input[0].data));
 
     /* Get the Session */
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Session *session = getSessionById(server, sessionId);
     if(!session) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     /* Get the Subscription */
     UA_Subscription *subscription = getSubscriptionById(server, subscriptionId);
     if(!subscription) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
     }
 
     /* The Subscription is not attached to this Session */
     if(subscription->session != session) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADUSERACCESSDENIED;
     }
 
     UA_Subscription_resendData(server, subscription);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 static UA_StatusCode
@@ -685,15 +685,16 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
     UA_Variant_setArray(&output[1], UA_Array_new(0, &UA_TYPES[UA_TYPES_UINT32]),
                         0, &UA_TYPES[UA_TYPES_UINT32]);
 
+    lockServer(server);
+
     /* Get the Session */
-    UA_LOCK(&server->serviceMutex);
     UA_Session *session = getSessionById(server, sessionId);
     if(!session) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
     if(inputSize == 0 || !input[0].data) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
     }
 
@@ -701,13 +702,13 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
     UA_UInt32 subscriptionId = *((UA_UInt32*)(input[0].data));
     UA_Subscription *subscription = getSubscriptionById(server, subscriptionId);
     if(!subscription) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
     }
 
     /* The Subscription is not attached to this Session */
     if(subscription->session != session) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADUSERACCESSDENIED;
     }
 
@@ -718,7 +719,7 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
         ++sizeOfOutput;
     }
     if(sizeOfOutput == 0) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -726,13 +727,13 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
     UA_UInt32 *clientHandles = (UA_UInt32*)
         UA_Array_new(sizeOfOutput, &UA_TYPES[UA_TYPES_UINT32]);
     if(!clientHandles) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
     UA_UInt32 *serverHandles = (UA_UInt32*)
         UA_Array_new(sizeOfOutput, &UA_TYPES[UA_TYPES_UINT32]);
     if(!serverHandles) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         UA_free(clientHandles);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
@@ -747,7 +748,7 @@ readMonitoredItems(UA_Server *server, const UA_NodeId *sessionId, void *sessionC
     UA_Variant_setArray(&output[0], serverHandles, sizeOfOutput, &UA_TYPES[UA_TYPES_UINT32]);
     UA_Variant_setArray(&output[1], clientHandles, sizeOfOutput, &UA_TYPES[UA_TYPES_UINT32]);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 #endif /* defined(UA_ENABLE_METHODCALLS) && defined(UA_ENABLE_SUBSCRIPTIONS) */
@@ -915,10 +916,8 @@ initNS0(UA_Server *server) {
     UA_StatusCode retVal = createNS0_base(server);
 
 #ifdef UA_GENERATED_NAMESPACE_ZERO
-    UA_UNLOCK(&server->serviceMutex);
     /* Load nodes and references generated from the XML ns0 definition */
     retVal |= namespace0_generated(server);
-    UA_LOCK(&server->serviceMutex);
 #else
     /* Create a minimal server object */
     retVal |= minimalServerObject(server);
diff --git a/src/server/ua_server_ns0_diagnostics.c b/src/server/ua_server_ns0_diagnostics.c
index 10e09d2f364..361e6db7882 100644
--- a/src/server/ua_server_ns0_diagnostics.c
+++ b/src/server/ua_server_ns0_diagnostics.c
@@ -123,7 +123,7 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
                                  const UA_NodeId *nodeId, void *nodeContext,
                                  UA_Boolean sourceTimestamp,
                                  const UA_NumericRange *range, UA_DataValue *value) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Get the current session */
     size_t sdSize = 0;
@@ -136,7 +136,7 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
     UA_SubscriptionDiagnosticsDataType *sd = (UA_SubscriptionDiagnosticsDataType*)
         UA_Array_new(sdSize, &UA_TYPES[UA_TYPES_SUBSCRIPTIONDIAGNOSTICSDATATYPE]);
     if(!sd) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -155,7 +155,7 @@ readSubscriptionDiagnosticsArray(UA_Server *server,
     UA_Variant_setArray(&value->value, sd, sdSize,
                         &UA_TYPES[UA_TYPES_SUBSCRIPTIONDIAGNOSTICSDATATYPE]);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -313,7 +313,7 @@ readSessionDiagnosticsArray(UA_Server *server,
     if(!sd)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Collect the statistics */
     size_t i = 0;
@@ -328,7 +328,7 @@ readSessionDiagnosticsArray(UA_Server *server,
     UA_Variant_setArray(&value->value, sd, server->sessionCount,
                         &UA_TYPES[UA_TYPES_SESSIONDIAGNOSTICSDATATYPE]);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -354,12 +354,12 @@ readSessionDiagnostics(UA_Server *server,
                        const UA_NodeId *nodeId, void *nodeContext,
                        UA_Boolean sourceTimestamp,
                        const UA_NumericRange *range, UA_DataValue *value) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Get the Session */
     UA_Session *session = getSessionById(server, sessionId);
     if(!session) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -367,7 +367,7 @@ readSessionDiagnostics(UA_Server *server,
     UA_QualifiedName bn;
     UA_StatusCode res = readWithReadValue(server, nodeId, UA_ATTRIBUTEID_BROWSENAME, &bn);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return res;
     }
 
@@ -441,7 +441,7 @@ readSessionDiagnostics(UA_Server *server,
 
  cleanup:
     UA_QualifiedName_clear(&bn);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -458,7 +458,7 @@ readSessionSecurityDiagnostics(UA_Server *server,
     if(!sd)
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Collect the statistics */
     size_t i = 0;
@@ -473,7 +473,7 @@ readSessionSecurityDiagnostics(UA_Server *server,
     UA_Variant_setArray(&value->value, sd, server->sessionCount,
                         &UA_TYPES[UA_TYPES_SESSIONSECURITYDIAGNOSTICSDATATYPE]);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -547,7 +547,7 @@ readDiagnostics(UA_Server *server, const UA_NodeId *sessionId, void *sessionCont
     void *data = NULL;
     const UA_DataType *type = &UA_TYPES[UA_TYPES_UINT32]; /* Default */
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     switch(nodeId->identifier.numeric) {
     case UA_NS0ID_SERVER_SERVERDIAGNOSTICS_SERVERDIAGNOSTICSSUMMARY:
@@ -593,7 +593,7 @@ readDiagnostics(UA_Server *server, const UA_NodeId *sessionId, void *sessionCont
         data = &server->serverDiagnosticsSummary.rejectedRequestsCount;
         break;
     default:
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -601,7 +601,7 @@ readDiagnostics(UA_Server *server, const UA_NodeId *sessionId, void *sessionCont
     if(res == UA_STATUSCODE_GOOD)
         value->hasValue = true;
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 56f6f8d1bfd..c32217f9967 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -718,9 +718,9 @@ readWithReadValue(UA_Server *server, const UA_NodeId *nodeId,
 UA_DataValue
 UA_Server_read(UA_Server *server, const UA_ReadValueId *item,
                UA_TimestampsToReturn timestamps) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataValue dv = readWithSession(server, &server->adminSession, item, timestamps);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return dv;
 }
 
@@ -729,9 +729,9 @@ UA_Server_read(UA_Server *server, const UA_ReadValueId *item,
 UA_StatusCode
 __UA_Server_read(UA_Server *server, const UA_NodeId *nodeId,
                  const UA_AttributeId attributeId, void *v) {
-   UA_LOCK(&server->serviceMutex);
+   lockServer(server);
    UA_StatusCode retval = readWithReadValue(server, nodeId, attributeId, v);
-   UA_UNLOCK(&server->serviceMutex);
+   unlockServer(server);
    return retval;
 }
 
@@ -776,9 +776,9 @@ UA_StatusCode
 UA_Server_readObjectProperty(UA_Server *server, const UA_NodeId objectId,
                              const UA_QualifiedName propertyName,
                              UA_Variant *value) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = readObjectProperty(server, objectId, propertyName, value);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -1832,9 +1832,9 @@ Service_Write(UA_Server *server, UA_Session *session,
 UA_StatusCode
 UA_Server_write(UA_Server *server, const UA_WriteValue *value) {
     UA_StatusCode res = UA_STATUSCODE_GOOD;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Operation_Write(server, &server->adminSession, NULL, value, &res);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -1843,10 +1843,10 @@ UA_StatusCode
 __UA_Server_write(UA_Server *server, const UA_NodeId *nodeId,
                   const UA_AttributeId attributeId,
                   const UA_DataType *attr_type, const void *attr) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = writeAttribute(server, &server->adminSession,
                                        nodeId, attributeId, attr, attr_type);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -2061,9 +2061,9 @@ UA_StatusCode
 UA_Server_writeObjectProperty(UA_Server *server, const UA_NodeId objectId,
                               const UA_QualifiedName propertyName,
                               const UA_Variant value) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retVal = writeObjectProperty(server, objectId, propertyName, value);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retVal;
 }
 
@@ -2113,10 +2113,10 @@ UA_StatusCode UA_EXPORT
 UA_Server_writeObjectProperty_scalar(UA_Server *server, const UA_NodeId objectId,
                                      const UA_QualifiedName propertyName,
                                      const void *value, const UA_DataType *type) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = 
         writeObjectProperty_scalar(server, objectId, propertyName, value, type);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 17367729f33..4a7d7ceb57f 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -519,9 +519,9 @@ UA_CallMethodResult
 UA_Server_call(UA_Server *server, const UA_CallMethodRequest *request) {
     UA_CallMethodResult result;
     UA_CallMethodResult_init(&result);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Operation_CallMethod(server, &server->adminSession, NULL, request, &result);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return result;
 }
 
diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 23e24e01742..74e1987451c 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -585,9 +585,9 @@ UA_Server_createDataChangeMonitoredItem(UA_Server *server,
 
     UA_MonitoredItemCreateResult result;
     UA_MonitoredItemCreateResult_init(&result);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Operation_CreateMonitoredItem(server, &server->adminSession, &cmc, &item, &result);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return result;
 }
 
@@ -810,16 +810,16 @@ Service_DeleteMonitoredItems(UA_Server *server, UA_Session *session,
 
 UA_StatusCode
 UA_Server_deleteMonitoredItem(UA_Server *server, UA_UInt32 monitoredItemId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_MonitoredItem *mon, *mon_tmp;
     LIST_FOREACH_SAFE(mon, &server->localMonitoredItems, listEntry, mon_tmp) {
         if(mon->monitoredItemId != monitoredItemId)
             continue;
         UA_MonitoredItem_delete(server, mon);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_GOOD;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_BADMONITOREDITEMIDINVALID;
 }
 
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 51a20f81257..13dfdf2b599 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -28,9 +28,9 @@
 UA_StatusCode
 UA_Server_getNodeContext(UA_Server *server, UA_NodeId nodeId,
                          void **nodeContext) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = getNodeContext(server, nodeId, nodeContext);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -77,9 +77,9 @@ setNodeContext(UA_Server *server, UA_NodeId nodeId,
 UA_StatusCode
 UA_Server_setNodeContext(UA_Server *server, UA_NodeId nodeId,
                          void *nodeContext) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = setNodeContext(server, nodeId, nodeContext);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -1422,11 +1422,11 @@ checkSetIsDynamicVariable(UA_Server *server, UA_Session *session,
 UA_StatusCode
 UA_Server_setVariableNodeDynamic(UA_Server *server, const UA_NodeId nodeId,
                                  UA_Boolean isDynamic) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res =
         UA_Server_editNode(server, &server->adminSession, &nodeId,
                            (UA_EditNodeCallback)setVariableNodeDynamic, &isDynamic);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -1662,12 +1662,12 @@ __UA_Server_addNode(UA_Server *server, const UA_NodeClass nodeClass,
                     const UA_NodeAttributes *attr,
                     const UA_DataType *attributeType,
                     void *nodeContext, UA_NodeId *outNewNodeId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode reval =
         addNode(server, nodeClass, *requestedNewNodeId, *parentNodeId,
                 *referenceTypeId, browseName, *typeDefinition, attr,
                 attributeType, nodeContext, outNewNodeId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return reval;
 }
 
@@ -1697,20 +1697,20 @@ UA_Server_addNode_begin(UA_Server *server, const UA_NodeClass nodeClass,
                         const UA_NodeId typeDefinition, const void *attr,
                         const UA_DataType *attributeType, void *nodeContext,
                         UA_NodeId *outNewNodeId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res =
         addNode_begin(server, nodeClass, requestedNewNodeId, parentNodeId,
                       referenceTypeId, browseName, typeDefinition, attr,
                       attributeType, nodeContext, outNewNodeId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
 UA_StatusCode
 UA_Server_addNode_finish(UA_Server *server, const UA_NodeId nodeId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = addNode_finish(server, &server->adminSession, &nodeId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2037,9 +2037,9 @@ Service_DeleteNodes(UA_Server *server, UA_Session *session,
 UA_StatusCode
 UA_Server_deleteNode(UA_Server *server, const UA_NodeId nodeId,
                      UA_Boolean deleteReferences) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = deleteNode(server, nodeId, deleteReferences);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2248,9 +2248,9 @@ UA_Server_addReference(UA_Server *server, const UA_NodeId sourceId,
     item.targetNodeId = targetId;
 
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Operation_addReference(server, &server->adminSession, NULL, &item, &retval);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2341,10 +2341,10 @@ UA_Server_deleteReference(UA_Server *server, const UA_NodeId sourceNodeId,
                           const UA_NodeId referenceTypeId, UA_Boolean isForward,
                           const UA_ExpandedNodeId targetNodeId,
                           UA_Boolean deleteBidirectional) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = deleteReference(server, sourceNodeId, referenceTypeId,
                                         isForward, targetNodeId, deleteBidirectional);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -2375,13 +2375,13 @@ UA_StatusCode
 UA_Server_setVariableNode_valueCallback(UA_Server *server,
                                         const UA_NodeId nodeId,
                                         const UA_ValueCallback callback) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = UA_Server_editNode(server, &server->adminSession, &nodeId,
                                               (UA_EditNodeCallback)setValueCallback,
                                               /* cast away const because
                                                * callback uses const anyway */
                                               (UA_ValueCallback *)(uintptr_t) &callback);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2415,7 +2415,8 @@ UA_Server_addDataSourceVariableNode(UA_Server *server, const UA_NodeId requested
         outNewNodeId = &newNodeId;
     }
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
+
     /* Create the node and add it to the nodestore */
     UA_StatusCode retval = addNode_raw(server, &server->adminSession, nodeContext,
                                        &item, outNewNodeId);
@@ -2437,7 +2438,7 @@ UA_Server_addDataSourceVariableNode(UA_Server *server, const UA_NodeId requested
     retval = addNode_finish(server, &server->adminSession, outNewNodeId);
 
  cleanup:
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     if(outNewNodeId == &newNodeId)
         UA_NodeId_clear(&newNodeId);
 
@@ -2469,9 +2470,9 @@ setVariableNode_dataSource(UA_Server *server, const UA_NodeId nodeId,
 UA_StatusCode
 UA_Server_setVariableNode_dataSource(UA_Server *server, const UA_NodeId nodeId,
                                      const UA_DataSource dataSource) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = setVariableNode_dataSource(server, nodeId, dataSource);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2515,10 +2516,10 @@ UA_StatusCode
 UA_Server_setVariableNode_valueBackend(UA_Server *server, const UA_NodeId nodeId,
                                        const UA_ValueBackend valueBackend){
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     switch(valueBackend.backendType){
         case UA_VALUEBACKENDTYPE_NONE:
-            UA_UNLOCK(&server->serviceMutex);
+            unlockServer(server);
             return UA_STATUSCODE_BADCONFIGURATIONERROR;
         case UA_VALUEBACKENDTYPE_DATA_SOURCE_CALLBACK:
             retval = UA_Server_editNode(server, &server->adminSession, &nodeId,
@@ -2542,7 +2543,7 @@ UA_Server_setVariableNode_valueBackend(UA_Server *server, const UA_NodeId nodeId
     // (UA_ValueCallback *)(uintptr_t) &callback);
 
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2677,14 +2678,14 @@ UA_Server_addMethodNode_finish(UA_Server *server, const UA_NodeId nodeId,
                                const UA_Argument* inputArguments,
                                size_t outputArgumentsSize,
                                const UA_Argument* outputArguments) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval =
         UA_Server_addMethodNodeEx_finish(server, nodeId, method,
                                          inputArgumentsSize, inputArguments,
                                          UA_NODEID_NULL, NULL,
                                          outputArgumentsSize, outputArguments,
                                          UA_NODEID_NULL, NULL);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2743,7 +2744,7 @@ UA_Server_addMethodNodeEx(UA_Server *server, const UA_NodeId requestedNewNodeId,
                           const UA_NodeId outputArgumentsRequestedNewNodeId,
                           UA_NodeId *outputArgumentsOutNewNodeId,
                           void *nodeContext, UA_NodeId *outNewNodeId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = addMethodNode(server, requestedNewNodeId,
                                       parentNodeId, referenceTypeId,
                                       browseName, &attr, method,
@@ -2755,7 +2756,7 @@ UA_Server_addMethodNodeEx(UA_Server *server, const UA_NodeId requestedNewNodeId,
                                       outputArgumentsRequestedNewNodeId,
                                       outputArgumentsOutNewNodeId,
                                       nodeContext, outNewNodeId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -2782,9 +2783,9 @@ UA_StatusCode
 UA_Server_setMethodNodeCallback(UA_Server *server,
                                 const UA_NodeId methodNodeId,
                                 UA_MethodCallback methodCallback) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retVal = setMethodNode_callback(server, methodNodeId, methodCallback);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retVal;
 }
 
@@ -2792,22 +2793,22 @@ UA_StatusCode
 UA_Server_getMethodNodeCallback(UA_Server *server,
                                 const UA_NodeId methodNodeId,
                                 UA_MethodCallback *outMethodCallback) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     const UA_Node *node = UA_NODESTORE_GET(server, &methodNodeId);
     if(!node) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNODEIDUNKNOWN;
     }
 
     if(node->head.nodeClass != UA_NODECLASS_METHOD) {
         UA_NODESTORE_RELEASE(server, node);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNODECLASSINVALID;
     }
 
     *outMethodCallback = node->methodNode.method;
     UA_NODESTORE_RELEASE(server, node);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -2847,8 +2848,8 @@ setNodeTypeLifecycle(UA_Server *server, UA_NodeId nodeId,
 UA_StatusCode
 UA_Server_setNodeTypeLifecycle(UA_Server *server, UA_NodeId nodeId,
                                UA_NodeTypeLifecycle lifecycle) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = setNodeTypeLifecycle(server, nodeId, lifecycle);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 4119ec3d988..4b9c049e9a2 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -19,9 +19,9 @@
 /* Delayed callback to free the session memory */
 static void
 removeSessionCallback(UA_Server *server, session_list_entry *entry) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Session_clear(&entry->session, server);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_free(entry);
 }
 
diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index fda99b2ea26..7c665d01d05 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -432,14 +432,14 @@ browseRecursive(UA_Server *server, size_t startNodesSize, const UA_NodeId *start
 UA_StatusCode
 UA_Server_browseRecursive(UA_Server *server, const UA_BrowseDescription *bd,
                           size_t *resultsSize, UA_ExpandedNodeId **results) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Set the list of relevant reference types */
     UA_ReferenceTypeSet refTypes;
     UA_StatusCode retval = referenceTypeIndices(server, &bd->referenceTypeId,
                                                 &refTypes, bd->includeSubtypes);
     if(retval != UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return retval;
     }
 
@@ -447,7 +447,7 @@ UA_Server_browseRecursive(UA_Server *server, const UA_BrowseDescription *bd,
     retval = browseRecursive(server, 1, &bd->nodeId, bd->browseDirection,
                              &refTypes, bd->nodeClassMask, false, resultsSize, results);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -987,9 +987,9 @@ UA_Server_browse(UA_Server *server, UA_UInt32 maxReferences,
                  const UA_BrowseDescription *bd) {
     UA_BrowseResult result;
     UA_BrowseResult_init(&result);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Operation_Browse(server, &server->adminSession, &maxReferences, bd, &result);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return result;
 }
 
@@ -1096,10 +1096,10 @@ UA_Server_browseNext(UA_Server *server, UA_Boolean releaseContinuationPoint,
                      const UA_ByteString *continuationPoint) {
     UA_BrowseResult result;
     UA_BrowseResult_init(&result);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Operation_BrowseNext(server, &server->adminSession, &releaseContinuationPoint,
                          continuationPoint, &result);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return result;
 }
 
@@ -1372,9 +1372,9 @@ translateBrowsePathToNodeIds(UA_Server *server,
 UA_BrowsePathResult
 UA_Server_translateBrowsePathToNodeIds(UA_Server *server,
                                        const UA_BrowsePath *browsePath) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_BrowsePathResult result = translateBrowsePathToNodeIds(server, browsePath);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return result;
 }
 
@@ -1441,9 +1441,9 @@ browseSimplifiedBrowsePath(UA_Server *server, const UA_NodeId origin,
 UA_BrowsePathResult
 UA_Server_browseSimplifiedBrowsePath(UA_Server *server, const UA_NodeId origin,
                            size_t browsePathSize, const UA_QualifiedName *browsePath) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_BrowsePathResult bpr = browseSimplifiedBrowsePath(server, origin, browsePathSize, browsePath);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return bpr;
 }
 
diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index 9eb8f42c79c..db2d7f0e196 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -235,7 +235,7 @@ UA_Session_queuePublishReq(UA_Session *session, UA_PublishResponseEntry* entry,
 
 UA_StatusCode
 UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     session_list_entry *entry;
     UA_StatusCode res = UA_STATUSCODE_BADSESSIONIDINVALID;
     LIST_FOREACH(entry, &server->sessions, pointers) {
@@ -245,7 +245,7 @@ UA_Server_closeSession(UA_Server *server, const UA_NodeId *sessionId) {
             break;
         }
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -273,13 +273,13 @@ UA_Server_setSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
                               const UA_QualifiedName key, const UA_Variant *value) {
     if(protectedAttribute(key))
         return UA_STATUSCODE_BADNOTWRITABLE;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Session *session = getSessionById(server, sessionId);
     UA_StatusCode res = UA_STATUSCODE_BADSESSIONIDINVALID;
     if(session)
         res = UA_KeyValueMap_set(session->attributes,
                                  key, value);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -288,15 +288,15 @@ UA_Server_deleteSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
                                  const UA_QualifiedName key) {
     if(protectedAttribute(key))
         return UA_STATUSCODE_BADNOTWRITABLE;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Session *session = getSessionById(server, sessionId);
     if(!session) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADSESSIONIDINVALID;
     }
     UA_StatusCode res =
         UA_KeyValueMap_remove(session->attributes, key);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -352,18 +352,18 @@ getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
 UA_StatusCode
 UA_Server_getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
                               const UA_QualifiedName key, UA_Variant *outValue) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = getSessionAttribute(server, sessionId, key, outValue, false);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
 UA_StatusCode
 UA_Server_getSessionAttributeCopy(UA_Server *server, const UA_NodeId *sessionId,
                                   const UA_QualifiedName key, UA_Variant *outValue) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = getSessionAttribute(server, sessionId, key, outValue, true);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -373,22 +373,22 @@ UA_Server_getSessionAttribute_scalar(UA_Server *server,
                                      const UA_QualifiedName key,
                                      const UA_DataType *type,
                                      void *outValue) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     UA_Variant attr;
     UA_StatusCode res = getSessionAttribute(server, sessionId, key, &attr, false);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return res;
     }
 
     if(!UA_Variant_hasScalarType(&attr, type)) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
     memcpy(outValue, attr.data, type->memSize);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index 9f8d0d6bb2e..f7955b9d927 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -415,10 +415,10 @@ sendStatusChangeDelete(UA_Server *server, UA_Subscription *sub,
 
 static void
 delayedPublishNotifications(UA_Server *server, UA_Subscription *sub) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     sub->delayedCallbackRegistered = false;
     UA_Subscription_publish(server, sub);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 /* Try to publish now. Enqueue a "next publish" as a delayed callback if not
@@ -706,9 +706,10 @@ UA_Session_ensurePublishQueueSpace(UA_Server* server, UA_Session* session) {
 
 static void
 sampleAndPublishCallback(UA_Server *server, UA_Subscription *sub) {
-    UA_LOCK(&server->serviceMutex);
     UA_assert(sub);
 
+    lockServer(server);
+
     UA_LOG_DEBUG_SUBSCRIPTION(server->config.logging, sub,
                               "Sample and Publish Callback");
 
@@ -722,7 +723,7 @@ sampleAndPublishCallback(UA_Server *server, UA_Subscription *sub) {
     /* Publish the queued notifications */
     UA_Subscription_publish(server, sub);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 UA_StatusCode
diff --git a/src/server/ua_subscription_alarms_conditions.c b/src/server/ua_subscription_alarms_conditions.c
index ab1e2df022d..059c1f6246d 100644
--- a/src/server/ua_subscription_alarms_conditions.c
+++ b/src/server/ua_subscription_alarms_conditions.c
@@ -248,12 +248,12 @@ UA_Server_setConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeI
                                                const UA_NodeId conditionSource, UA_Boolean removeBranch,
                                                UA_TwoStateVariableChangeCallback callback,
                                                UA_TwoStateVariableCallbackType callbackType) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Get Condition */
     UA_Condition *c = getCondition(server, &conditionSource, &condition);
     if(!c) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
@@ -274,11 +274,11 @@ UA_Server_setConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeI
         c->callbacks.activeStateCallback = callback;
         break;
     default:
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -290,7 +290,7 @@ getConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeId *branch,
     UA_StatusCode res = UA_STATUSCODE_GOOD;
 
     /* That callbacks are defined in the userland. Release the server lock before. */
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     /* TODO log warning when the callback wasn't set */
     switch(callbackType) {
@@ -322,7 +322,7 @@ getConditionTwoStateVariableCallback(UA_Server *server, const UA_NodeId *branch,
         res = UA_STATUSCODE_BADNOTFOUND;
         break;
     }
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     return res;
 }
@@ -359,10 +359,10 @@ UA_Server_callConditionTwoStateVariableCallback(UA_Server *server, const UA_Node
                                                 const UA_NodeId *conditionSource,
                                                 UA_Boolean *removeBranch,
                                                 UA_TwoStateVariableCallbackType callbackType) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = callConditionTwoStateVariableCallback(server, condition, conditionSource,
                                                               removeBranch, callbackType);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -406,9 +406,9 @@ getFieldParentNodeId(UA_Server *server, const UA_NodeId *field, UA_NodeId *paren
 
 static UA_StatusCode
 UA_Server_getFieldParentNodeId(UA_Server *server, const UA_NodeId *field, UA_NodeId *parent) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = getFieldParentNodeId(server, field, parent);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -488,9 +488,9 @@ getNodeIdValueOfConditionField(UA_Server *server, const UA_NodeId *condition,
 static UA_StatusCode
 UA_Server_getNodeIdValueOfConditionField(UA_Server *server, const UA_NodeId *condition,
                                          UA_QualifiedName fieldName, UA_NodeId *outNodeId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = getNodeIdValueOfConditionField(server, condition, fieldName, outNodeId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -499,7 +499,7 @@ UA_Server_getNodeIdValueOfConditionField(UA_Server *server, const UA_NodeId *con
 static UA_StatusCode
 UA_Server_getConditionBranchNodeId(UA_Server *server, const UA_ByteString *eventId,
                          UA_NodeId *outConditionBranchNodeId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     *outConditionBranchNodeId = UA_NODEID_NULL;
     /* The function checks the BranchId based on the event Id, if BranchId ==
@@ -518,11 +518,11 @@ UA_Server_getConditionBranchNodeId(UA_Server *server, const UA_ByteString *event
                     continue;
                 if(UA_NodeId_isNull(&branch->conditionBranchId)) {
                     res = UA_NodeId_copy(&cond->conditionId, outConditionBranchNodeId);
-                    UA_UNLOCK(&server->serviceMutex);
+                    unlockServer(server);
                     return res;
                 } else {
                     res = UA_NodeId_copy(&branch->conditionBranchId, outConditionBranchNodeId);
-                    UA_UNLOCK(&server->serviceMutex);
+                    unlockServer(server);
                     return res;
                 }
                 goto out;
@@ -531,7 +531,7 @@ UA_Server_getConditionBranchNodeId(UA_Server *server, const UA_ByteString *event
     }
 
  out:
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -539,17 +539,17 @@ static UA_StatusCode
 UA_Server_getConditionLastSeverity(UA_Server *server, const UA_NodeId *conditionSource,
                          const UA_NodeId *conditionId, UA_UInt16 *outLastSeverity,
                          UA_DateTime *outLastSeveritySourceTimeStamp) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     *outLastSeverity = cond->lastSeverity;
     *outLastSeveritySourceTimeStamp = cond->lastSeveritySourceTimeStamp;
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -557,17 +557,17 @@ static UA_StatusCode
 UA_Server_updateConditionLastSeverity(UA_Server *server, const UA_NodeId *conditionSource,
                                       const UA_NodeId *conditionId, UA_UInt16 lastSeverity,
                                       UA_DateTime lastSeveritySourceTimeStamp) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     cond->lastSeverity = lastSeverity;
     cond->lastSeveritySourceTimeStamp =  lastSeveritySourceTimeStamp;
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -575,18 +575,18 @@ static UA_StatusCode
 UA_Server_getConditionActiveState(UA_Server *server, const UA_NodeId *conditionSource,
                                   const UA_NodeId *conditionId, UA_ActiveState *outLastActiveState,
                                   UA_ActiveState *outCurrentActiveState, UA_Boolean *outIsLimitAlarm) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     *outLastActiveState = cond->lastActiveState;
     *outCurrentActiveState = cond->currentActiveState;
     *outIsLimitAlarm = cond->isLimitAlarm;
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -594,18 +594,18 @@ static UA_StatusCode
 UA_Server_updateConditionActiveState(UA_Server *server, const UA_NodeId *conditionSource,
                                      const UA_NodeId *conditionId, const UA_ActiveState lastActiveState,
                                      const UA_ActiveState currentActiveState, UA_Boolean isLimitAlarm) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Condition *cond = getCondition(server, conditionSource, conditionId);
     if(!cond) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Entry not found in list!");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     cond->lastActiveState = lastActiveState;
     cond->currentActiveState = currentActiveState;
     cond->isLimitAlarm = isLimitAlarm;
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -717,9 +717,9 @@ isRetained(UA_Server *server, const UA_NodeId *condition) {
 
 static UA_Boolean
 UA_Server_isRetained(UA_Server *server, const UA_NodeId *condition) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Boolean res = isRetained(server, condition);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -762,9 +762,9 @@ isTwoStateVariableInTrueState(UA_Server *server, const UA_NodeId *condition,
 static UA_Boolean
 UA_Server_isTwoStateVariableInTrueState(UA_Server *server, const UA_NodeId *condition,
                                         const UA_QualifiedName *twoStateVariable) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Boolean res = isTwoStateVariableInTrueState(server, condition, twoStateVariable);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -827,9 +827,9 @@ enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
 static UA_StatusCode
 UA_Server_enteringDisabledState(UA_Server *server, const UA_NodeId *conditionId,
                                 const UA_NodeId *conditionSource) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = enteringDisabledState(server, conditionId, conditionSource);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -888,9 +888,9 @@ enteringEnabledState(UA_Server *server,
 static UA_StatusCode
 UA_Server_enteringEnabledState(UA_Server *server, const UA_NodeId *conditionId,
                                const UA_NodeId *conditionSource) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = enteringEnabledState(server, conditionId, conditionSource);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -1552,10 +1552,10 @@ acknowledgeMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     /* Check if ConditionType is subType of AcknowledgeableConditionType TODO Over Kill*/
     UA_NodeId AcknowledgeableConditionTypeId =
         UA_NODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Boolean found = isNodeInTree_singleRef(server, &eventType, &AcknowledgeableConditionTypeId,
                                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     if(!found) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of AcknowledgeableConditionType!");
@@ -1632,10 +1632,10 @@ confirmMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     /* Check if ConditionType is subType of AcknowledgeableConditionType. */
     UA_NodeId AcknowledgeableConditionTypeId =
         UA_NODEID_NUMERIC(0, UA_NS0ID_ACKNOWLEDGEABLECONDITIONTYPE);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Boolean found = isNodeInTree_singleRef(server, &eventType, &AcknowledgeableConditionTypeId,
                                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     if(!found) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of AcknowledgeableConditionType!");
@@ -1833,14 +1833,14 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     //TODO implement logic for subscription array
     /* Check if valid subscriptionId */
     UA_Session *session = getSessionById(server, sessionId);
     UA_Subscription *subscription =
         UA_Session_getSubscriptionById(session, *((UA_UInt32 *)input[0].data));
     if(!subscription) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
     }
 
@@ -1849,14 +1849,14 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                                                   &server->refreshEvents[REFRESHEVENT_START_IDX],
                                                   &server->refreshEvents[REFRESHEVENT_END_IDX]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",
-                                   UA_UNLOCK(&server->serviceMutex););
+                                   unlockServer(server););
 
     /* Trigger RefreshStartEvent and RefreshEndEvent for the each monitoredItem
      * in the subscription */
     UA_MonitoredItem *monitoredItem =
         UA_Subscription_getMonitoredItem(subscription, *((UA_UInt32 *)input[1].data));
     if(!monitoredItem) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADMONITOREDITEMIDINVALID;
     }
 
@@ -1864,8 +1864,8 @@ refresh2MethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     retval = refreshLogic(server, &server->refreshEvents[REFRESHEVENT_START_IDX],
                           &server->refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",
-                                   UA_UNLOCK(&server->serviceMutex););
-    UA_UNLOCK(&server->serviceMutex);
+                                   unlockServer(server););
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -1876,7 +1876,7 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
                       void *objectContext, size_t inputSize,
                       const UA_Variant *input, size_t outputSize,
                       UA_Variant *output) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     //TODO implement logic for subscription array
     /* Check if valid subscriptionId */
@@ -1884,7 +1884,7 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
     UA_Subscription *subscription =
         UA_Session_getSubscriptionById(session, *((UA_UInt32 *)input[0].data));
     if(!subscription) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
     }
 
@@ -1893,7 +1893,7 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
         setRefreshMethodEvents(server, &server->refreshEvents[REFRESHEVENT_START_IDX],
                                &server->refreshEvents[REFRESHEVENT_END_IDX]);
     CONDITION_ASSERT_RETURN_RETVAL(retval, "Create Event RefreshStart or RefreshEnd failed",
-                                   UA_UNLOCK(&server->serviceMutex););
+                                   unlockServer(server););
 
     /* Trigger RefreshStartEvent and RefreshEndEvent for the each monitoredItem
      * in the subscription */
@@ -1903,9 +1903,9 @@ refreshMethodCallback(UA_Server *server, const UA_NodeId *sessionId,
         retval = refreshLogic(server, &server->refreshEvents[REFRESHEVENT_START_IDX],
                               &server->refreshEvents[REFRESHEVENT_END_IDX], monitoredItem);
         CONDITION_ASSERT_RETURN_RETVAL(retval, "Could not refresh Condition",
-                                       UA_UNLOCK(&server->serviceMutex););
+                                       unlockServer(server););
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -2538,10 +2538,10 @@ UA_Server_createCondition(UA_Server *server,
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     retval = addCondition_finish(server, *outNodeId, conditionType, conditionName,
                                conditionSource, hierarchialReferenceType);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2557,10 +2557,10 @@ UA_Server_addCondition_begin(UA_Server *server, const UA_NodeId conditionId,
 
     /* Make sure the conditionType is a Subtype of ConditionType */
     UA_NodeId conditionTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_CONDITIONTYPE);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_Boolean found = isNodeInTree_singleRef(server, &conditionType, &conditionTypeId,
                                               UA_REFERENCETYPEINDEX_HASSUBTYPE);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     if(!found) {
         UA_LOG_ERROR(server->config.logging, UA_LOGCATEGORY_USERLAND,
                      "Condition Type must be a subtype of ConditionType!");
@@ -2584,19 +2584,19 @@ UA_StatusCode
 UA_Server_addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
                               const UA_NodeId conditionSource,
                               const UA_NodeId hierarchialReferenceType) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     const UA_Node *node = UA_NODESTORE_GET(server, &conditionId);
 
     if(!node) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNODEIDUNKNOWN;
     }
 
     const UA_Node *type = getNodeType(server, &node->head);
     if(!type) {
         UA_NODESTORE_RELEASE(server, node);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADTYPEDEFINITIONINVALID;
     }
 
@@ -2607,7 +2607,7 @@ UA_Server_addCondition_finish(UA_Server *server, const UA_NodeId conditionId,
     UA_NODESTORE_RELEASE(server, type);
     UA_NODESTORE_RELEASE(server, node);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2773,10 +2773,10 @@ UA_StatusCode
 UA_Server_addConditionOptionalField(UA_Server *server, const UA_NodeId condition,
                                     const UA_NodeId conditionType, const UA_QualifiedName fieldName,
                                     UA_NodeId *outOptionalNode) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = addConditionOptionalField(server, condition, conditionType,
                                                   fieldName, outOptionalNode);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -2806,9 +2806,9 @@ setConditionField(UA_Server *server, const UA_NodeId condition,
 UA_StatusCode
 UA_Server_setConditionField(UA_Server *server, const UA_NodeId condition,
                             const UA_Variant* value, const UA_QualifiedName fieldName) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = setConditionField(server, condition, value, fieldName);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -2853,10 +2853,10 @@ UA_Server_setConditionVariableFieldProperty(UA_Server *server, const UA_NodeId c
                                             const UA_Variant* value,
                                             const UA_QualifiedName variableFieldName,
                                             const UA_QualifiedName variablePropertyName) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = setConditionVariableFieldProperty(server, condition, value,
                                                           variableFieldName, variablePropertyName);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -2901,9 +2901,9 @@ triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
 UA_StatusCode
 UA_Server_triggerConditionEvent(UA_Server *server, const UA_NodeId condition,
                                 const UA_NodeId conditionSource, UA_ByteString *outEventId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = triggerConditionEvent(server, condition, conditionSource, outEventId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -2914,7 +2914,7 @@ UA_Server_deleteCondition(UA_Server *server, const UA_NodeId condition,
     UA_Boolean found = false; /* Delete from internal list */
     UA_ConditionSource *source, *tmp_source;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     LIST_FOREACH_SAFE(source, &server->conditionSources, listEntry, tmp_source) {
         if(!UA_NodeId_equal(&source->conditionSourceId, &conditionSource))
             continue;
@@ -2936,7 +2936,7 @@ UA_Server_deleteCondition(UA_Server *server, const UA_NodeId condition,
         }
         break;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     if(!found)
         return UA_STATUSCODE_BADNOTFOUND;
@@ -3086,9 +3086,9 @@ setLimitState(UA_Server *server, const UA_NodeId conditionId,
 UA_StatusCode
 UA_Server_setLimitState(UA_Server *server, const UA_NodeId conditionId,
                         UA_Double limitValue) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = setLimitState(server, conditionId, limitValue);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index 2cf6bc3ebe7..4744377c19a 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -199,9 +199,9 @@ UA_MonitoredItem_processSampledValue(UA_Server *server, UA_MonitoredItem *mon,
 
 void
 UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     monitoredItem_sampleCallback(server, mon);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 void
diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index 71eca8733c7..d058b66caab 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -98,9 +98,9 @@ createEvent(UA_Server *server, const UA_NodeId eventType, UA_NodeId *outNodeId)
 UA_StatusCode
 UA_Server_createEvent(UA_Server *server, const UA_NodeId eventType,
                       UA_NodeId *outNodeId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = createEvent(server, eventType, outNodeId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -433,10 +433,10 @@ UA_StatusCode
 UA_Server_triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
                        const UA_NodeId origin, UA_ByteString *outEventId,
                        const UA_Boolean deleteEventNode) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res =
         triggerEvent(server, eventNodeId, origin, outEventId, deleteEventNode);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 #endif /* UA_ENABLE_SUBSCRIPTIONS_EVENTS */

From e4301ba6cfeb2bbaf7423848758550d937862ff8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Jan 2025 20:05:08 +0100
Subject: [PATCH 1760/1963] refactor(pubsub): Take the EventLoop lock before
 the server lock

---
 src/pubsub/ua_pubsub_connection.c    | 18 +++----
 src/pubsub/ua_pubsub_dataset.c       | 32 ++++++------
 src/pubsub/ua_pubsub_eventloop.c     | 40 +++++++--------
 src/pubsub/ua_pubsub_keystorage.c    | 14 ++---
 src/pubsub/ua_pubsub_manager.c       |  8 +--
 src/pubsub/ua_pubsub_reader.c        | 30 +++++------
 src/pubsub/ua_pubsub_readergroup.c   | 46 ++++++++---------
 src/pubsub/ua_pubsub_securitygroup.c |  8 +--
 src/pubsub/ua_pubsub_writer.c        | 18 +++----
 src/pubsub/ua_pubsub_writergroup.c   | 76 ++++++++++++++--------------
 10 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/src/pubsub/ua_pubsub_connection.c b/src/pubsub/ua_pubsub_connection.c
index 1c333b69ee0..035702f082a 100644
--- a/src/pubsub/ua_pubsub_connection.c
+++ b/src/pubsub/ua_pubsub_connection.c
@@ -124,13 +124,13 @@ UA_Server_getPubSubConnectionConfig(UA_Server *server, const UA_NodeId connectio
                                     UA_PubSubConnectionConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubConnection *currentPubSubConnection =
         UA_PubSubConnection_findConnectionbyId(server, connection);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     if(currentPubSubConnection)
         res = UA_PubSubConnectionConfig_copy(&currentPubSubConnection->config, config);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -218,9 +218,9 @@ UA_PubSubConnection_create(UA_Server *server, const UA_PubSubConnectionConfig *c
 UA_StatusCode
 UA_Server_addPubSubConnection(UA_Server *server, const UA_PubSubConnectionConfig *cc,
                               UA_NodeId *cId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = UA_PubSubConnection_create(server, cc, cId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -228,9 +228,9 @@ static void
 delayedPubSubConnection_delete(void *application, void *context) {
     UA_Server *server = (UA_Server*)application;
     UA_PubSubConnection *c = (UA_PubSubConnection*)context;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubConnection_delete(server, c);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 /* Clean up the PubSubConnection. If no EventLoop connection is attached we can
@@ -303,15 +303,15 @@ UA_PubSubConnection_delete(UA_Server *server, UA_PubSubConnection *c) {
 
 UA_StatusCode
 UA_Server_removePubSubConnection(UA_Server *server, const UA_NodeId connection) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubConnection *psc =
         UA_PubSubConnection_findConnectionbyId(server, connection);
     if(!psc) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_PubSubConnection_delete(server, psc);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_GOOD;
 }
 
diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 7248146beda..3ce12a67897 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -81,9 +81,9 @@ getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
 UA_StatusCode
 UA_Server_getPublishedDataSetConfig(UA_Server *server, const UA_NodeId pds,
                                     UA_PublishedDataSetConfig *config) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = getPublishedDataSetConfig(server, pds, config);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -92,12 +92,12 @@ UA_Server_getPublishedDataSetMetaData(UA_Server *server, const UA_NodeId pds,
                                       UA_DataSetMetaDataType *metaData) {
     if(!metaData)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     if(currentPDS)
         res = UA_DataSetMetaDataType_copy(&currentPDS->dataSetMetaData, metaData);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -414,10 +414,10 @@ UA_DataSetFieldResult
 UA_Server_addDataSetField(UA_Server *server, const UA_NodeId publishedDataSet,
                           const UA_DataSetFieldConfig *fieldConfig,
                           UA_NodeId *fieldIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetFieldResult res =
         UA_DataSetField_create(server, publishedDataSet, fieldConfig, fieldIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -510,17 +510,17 @@ UA_DataSetField_remove(UA_Server *server, UA_DataSetField *currentField) {
 
 UA_DataSetFieldResult
 UA_Server_removeDataSetField(UA_Server *server, const UA_NodeId dsf) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetFieldResult res;
     memset(&res, 0, sizeof(UA_DataSetFieldResult));
     UA_DataSetField *field = UA_DataSetField_findDSFbyId(server, dsf);
     if(!field) {
         res.result = UA_STATUSCODE_BADNOTFOUND;
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return res;
     }
     res = UA_DataSetField_remove(server, field);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -545,12 +545,12 @@ UA_Server_getDataSetFieldConfig(UA_Server *server, const UA_NodeId dsf,
                                 UA_DataSetFieldConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetField *currentDataSetField = UA_DataSetField_findDSFbyId(server, dsf);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     if(currentDataSetField)
         res = UA_DataSetFieldConfig_copy(&currentDataSetField->config, config);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -718,10 +718,10 @@ UA_AddPublishedDataSetResult
 UA_Server_addPublishedDataSet(UA_Server *server,
                               const UA_PublishedDataSetConfig *publishedDataSetConfig,
                               UA_NodeId *pdsIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_AddPublishedDataSetResult res =
         UA_PublishedDataSet_create(server, publishedDataSetConfig, pdsIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -762,14 +762,14 @@ UA_PublishedDataSet_remove(UA_Server *server, UA_PublishedDataSet *publishedData
 
 UA_StatusCode
 UA_Server_removePublishedDataSet(UA_Server *server, const UA_NodeId pds) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PublishedDataSet *currentPDS = UA_PublishedDataSet_findPDSbyId(server, pds);
     if(!currentPDS) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_PublishedDataSet_remove(server, currentPDS);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/pubsub/ua_pubsub_eventloop.c b/src/pubsub/ua_pubsub_eventloop.c
index b325e35ea2c..6d2474d334a 100644
--- a/src/pubsub/ua_pubsub_eventloop.c
+++ b/src/pubsub/ua_pubsub_eventloop.c
@@ -151,7 +151,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_Server *server = (UA_Server*)application;
     UA_PubSubConnection *psc = (UA_PubSubConnection*)*connectionContext;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* The connection is closing in the EventLoop. This is the last callback
      * from that connection. Clean up the SecureChannel in the client. */
@@ -162,7 +162,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         /* PSC marked for deletion and the last EventLoop connection has closed */
         if(psc->deleteFlag && psc->recvChannelsSize == 0 && psc->sendChannel == 0) {
             UA_PubSubConnection_delete(server, psc);
-            UA_UNLOCK(&server->serviceMutex);
+            unlockServer(server);
             return;
         }
 
@@ -173,7 +173,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         if(psc->state == UA_PUBSUBSTATE_OPERATIONAL)
             UA_PubSubConnection_connect(server, psc, false);
 
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
@@ -186,13 +186,13 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                                   "No more space for an additional EventLoop connection");
         if(psc->cm)
             psc->cm->closeConnection(psc->cm, connectionId);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
     /* No message received */
     if(!recv || msg.length == 0) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
@@ -263,7 +263,7 @@ PubSubChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         }
     }
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 static void
@@ -526,7 +526,7 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_Server *server = (UA_Server*)application;
     UA_WriterGroup *wg = (UA_WriterGroup*)*connectionContext;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* The connection is closing in the EventLoop. This is the last callback
      * from that connection. Clean up the SecureChannel in the client. */
@@ -538,7 +538,7 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
             /* PSC marked for deletion and the last EventLoop connection has closed */
             if(wg->deleteFlag) {
                 UA_WriterGroup_remove(server, wg);
-                UA_UNLOCK(&server->serviceMutex);
+                unlockServer(server);
                 return;
             }
         }
@@ -550,7 +550,7 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         if(wg->state == UA_PUBSUBSTATE_OPERATIONAL)
             UA_WriterGroup_connect(server, wg, false);
 
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
@@ -558,7 +558,7 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     if(wg->sendChannel && wg->sendChannel != connectionId) {
         UA_LOG_WARNING_WRITERGROUP(server->config.logging, wg,
                                   "WriterGroup is already bound to a different channel");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
     wg->sendChannel = connectionId;
@@ -569,7 +569,7 @@ WriterGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                                       UA_STATUSCODE_GOOD);
     
     /* Send-channels don't receive messages */
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 static UA_StatusCode
@@ -826,7 +826,7 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     UA_Server *server = (UA_Server*)application;
     UA_ReaderGroup *rg = (UA_ReaderGroup*)*connectionContext;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* The connection is closing in the EventLoop. This is the last callback
      * from that connection. Clean up the SecureChannel in the client. */
@@ -837,13 +837,13 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         /* PSC marked for deletion and the last EventLoop connection has closed */
         if(rg->deleteFlag && rg->recvChannelsSize == 0) {
             UA_ReaderGroup_remove(server, rg);
-            UA_UNLOCK(&server->serviceMutex);
+            unlockServer(server);
             return;
         }
 
         /* Reconnect if still operational */
         UA_ReaderGroup_setPubSubState(server, rg, rg->state, UA_STATUSCODE_GOOD);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
@@ -855,13 +855,13 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         UA_PubSubConnection *c = rg->linkedConnection;
         if(c && c->cm)
             c->cm->closeConnection(c->cm, connectionId);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
     /* No message received */
     if(msg.length == 0) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
@@ -878,14 +878,14 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     if(rg->state != UA_PUBSUBSTATE_OPERATIONAL) {
         UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                    "Received a messaage for a non-operational ReaderGroup");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
     /* ReaderGroup with realtime processing */
     if(rg->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) {
         UA_ReaderGroup_decodeAndProcessRT(server, rg, &msg);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
@@ -906,14 +906,14 @@ ReaderGroupChannelCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING_READERGROUP(server->config.logging, rg,
                                   "Verify, decrypt and decode network message failed");
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
     /* Process the decoded message */
     UA_ReaderGroup_process(server, rg, &nm);
     UA_NetworkMessage_clear(&nm);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 static UA_StatusCode
diff --git a/src/pubsub/ua_pubsub_keystorage.c b/src/pubsub/ua_pubsub_keystorage.c
index f38e57f36a7..ba3d926e29b 100644
--- a/src/pubsub/ua_pubsub_keystorage.c
+++ b/src/pubsub/ua_pubsub_keystorage.c
@@ -374,7 +374,7 @@ nextGetSecuritykeysCallback(UA_Server *server, UA_PubSubKeyStorage *keyStorage)
 void
 UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *keyStorage) {
     /* Callbacks from the EventLoop are initially unlocked */
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval =
         UA_PubSubKeyStorage_addKeyRolloverCallback(server, keyStorage,
                                      (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback,
@@ -407,7 +407,7 @@ UA_PubSubKeyStorage_keyRolloverCallback(UA_Server *server, UA_PubSubKeyStorage *
             server->config.eventLoop, (UA_Callback)nextGetSecuritykeysCallback, server,
             keyStorage, dateTimeToNextGetSecurityKeys, NULL);
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 UA_StatusCode
@@ -528,7 +528,7 @@ storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
     UA_Server *server = ctx->server;
     UA_StatusCode retval = response->responseHeader.serviceResult;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     /* check if the call to getSecurityKeys was a success */
     if(response->resultsSize != 0)
         retval = response->results->statusCode;
@@ -599,7 +599,7 @@ storeFetchedKeys(UA_Client *client, void *userdata, UA_UInt32 requestId,
     UA_Client_disconnectAsync(client);
     addDelayedSksClientCleanupCb(client, ctx);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 static UA_StatusCode
@@ -728,10 +728,10 @@ UA_Server_setSksClient(UA_Server *server, UA_String securityGroupId,
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
     UA_StatusCode retval = UA_STATUSCODE_BADNOTFOUND;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
     if(!ks) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return retval;
     }
 
@@ -751,7 +751,7 @@ UA_Server_setSksClient(UA_Server *server, UA_String securityGroupId,
     if(ks->keyListSize == 0) {
         retval = getSecurityKeysAndStoreFetchedKeys(server, ks);
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
diff --git a/src/pubsub/ua_pubsub_manager.c b/src/pubsub/ua_pubsub_manager.c
index ca5443b6e5b..c64eff29fd7 100644
--- a/src/pubsub/ua_pubsub_manager.c
+++ b/src/pubsub/ua_pubsub_manager.c
@@ -303,9 +303,9 @@ UA_StatusCode
 UA_Server_addStandaloneSubscribedDataSet(UA_Server *server,
                                          const UA_StandaloneSubscribedDataSetConfig *sdsConfig,
                                          UA_NodeId *sdsIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = addStandaloneSubscribedDataSet(server, sdsConfig, sdsIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -350,9 +350,9 @@ removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
 
 UA_StatusCode
 UA_Server_removeStandaloneSubscribedDataSet(UA_Server *server, const UA_NodeId sds) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = removeStandaloneSubscribedDataSet(server, sds);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 0d58a89a3d9..9b622d279cf 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -256,10 +256,10 @@ UA_StatusCode
 UA_Server_addDataSetReader(UA_Server *server, UA_NodeId readerGroupIdentifier,
                            const UA_DataSetReaderConfig *dataSetReaderConfig,
                            UA_NodeId *readerIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = UA_DataSetReader_create(server, readerGroupIdentifier,
                                                 dataSetReaderConfig, readerIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -337,14 +337,14 @@ UA_DataSetReader_remove(UA_Server *server, UA_DataSetReader *dsr) {
 
 UA_StatusCode
 UA_Server_removeDataSetReader(UA_Server *server, UA_NodeId readerIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, readerIdentifier);
     if(!dsr) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_DataSetReader_remove(server, dsr);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -423,15 +423,15 @@ UA_Server_DataSetReader_updateConfig(UA_Server *server, UA_NodeId dataSetReaderI
     if(config == NULL)
        return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
     if(!dsr || !rg) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = DataSetReader_updateConfig(server, rg, dsr, config);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -440,12 +440,12 @@ UA_Server_DataSetReader_getConfig(UA_Server *server, UA_NodeId dataSetReaderIden
                                  UA_DataSetReaderConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
     if(dsr)
         res = UA_DataSetReaderConfig_copy(&dsr->config, config);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -511,14 +511,14 @@ UA_Server_DataSetReader_getState(UA_Server *server, UA_NodeId dataSetReaderIdent
     if(!server || !state)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     UA_DataSetReader *dsr = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
     if(dsr) {
         res = UA_STATUSCODE_GOOD;
         *state = dsr->state;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -662,15 +662,15 @@ UA_Server_DataSetReader_createTargetVariables(UA_Server *server,
                                               UA_NodeId dataSetReaderIdentifier,
                                               size_t targetVariablesSize,
                                               const UA_FieldTargetVariable *targetVariables) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetReader *dataSetReader = UA_ReaderGroup_findDSRbyId(server, dataSetReaderIdentifier);
     if(!dataSetReader) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
     UA_StatusCode res = DataSetReader_createTargetVariables(server, dataSetReader,
                                                             targetVariablesSize, targetVariables);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/pubsub/ua_pubsub_readergroup.c b/src/pubsub/ua_pubsub_readergroup.c
index 444ba98112f..af9f8324d50 100644
--- a/src/pubsub/ua_pubsub_readergroup.c
+++ b/src/pubsub/ua_pubsub_readergroup.c
@@ -180,11 +180,11 @@ UA_StatusCode
 UA_Server_addReaderGroup(UA_Server *server, UA_NodeId connectionIdentifier,
                          const UA_ReaderGroupConfig *readerGroupConfig,
                          UA_NodeId *readerGroupIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res =
         UA_ReaderGroup_create(server, connectionIdentifier,
                               readerGroupConfig, readerGroupIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -257,15 +257,15 @@ UA_ReaderGroup_remove(UA_Server *server, UA_ReaderGroup *rg) {
 
 UA_StatusCode
 UA_Server_removeReaderGroup(UA_Server *server, UA_NodeId groupIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_ReaderGroup* readerGroup =
         UA_ReaderGroup_findRGbyId(server, groupIdentifier);
     if(!readerGroup) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_ReaderGroup_remove(server, readerGroup);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -275,20 +275,20 @@ UA_Server_ReaderGroup_getConfig(UA_Server *server, UA_NodeId readerGroupIdentifi
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /* Identify the readergroup through the readerGroupIdentifier */
     UA_ReaderGroup *currentReaderGroup =
         UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
     if(!currentReaderGroup) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
     UA_StatusCode ret =
         UA_ReaderGroupConfig_copy(&currentReaderGroup->config, config);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return ret;
 }
 
@@ -297,7 +297,7 @@ UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifie
                                UA_PubSubState *state) {
     if((server == NULL) || (state == NULL))
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *rg =
         UA_ReaderGroup_findRGbyId(server, readerGroupIdentifier);
@@ -305,7 +305,7 @@ UA_Server_ReaderGroup_getState(UA_Server *server, UA_NodeId readerGroupIdentifie
         *state = rg->state;
         ret = UA_STATUSCODE_GOOD;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return ret;
 }
 
@@ -482,7 +482,7 @@ UA_ReaderGroup_setPubSubState(UA_Server *server,
 UA_StatusCode
 UA_Server_setReaderGroupOperational(UA_Server *server,
                                     const UA_NodeId readerGroupId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
     if(rg) {
@@ -491,7 +491,7 @@ UA_Server_setReaderGroupOperational(UA_Server *server,
             UA_StatusCode retval = UA_PubSubKeyStorage_activateKeyToChannelContext(
                 server, rg->identifier, rg->config.securityGroupId);
             if(retval != UA_STATUSCODE_GOOD) {
-                UA_UNLOCK(&server->serviceMutex);
+                unlockServer(server);
                 return retval;
             }
         }
@@ -499,20 +499,20 @@ UA_Server_setReaderGroupOperational(UA_Server *server,
         ret = UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_OPERATIONAL,
                                             UA_STATUSCODE_GOOD);
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return ret;
 }
 
 UA_StatusCode
 UA_Server_setReaderGroupDisabled(UA_Server *server,
                                  const UA_NodeId readerGroupId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode ret = UA_STATUSCODE_BADNOTFOUND;
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
     if(rg)
         ret = UA_ReaderGroup_setPubSubState(server, rg, UA_PUBSUBSTATE_DISABLED,
                                             UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return ret;
 }
 
@@ -563,11 +563,11 @@ UA_Server_setReaderGroupEncryptionKeys(UA_Server *server,
                                        const UA_ByteString signingKey,
                                        const UA_ByteString encryptingKey,
                                        const UA_ByteString keyNonce) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = setReaderGroupEncryptionKeys(server, readerGroup,
                                                      securityTokenId, signingKey,
                                                      encryptingKey, keyNonce);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 #endif
@@ -680,14 +680,14 @@ UA_ReaderGroup_freezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
 UA_StatusCode
 UA_Server_freezeReaderGroupConfiguration(UA_Server *server,
                                          const UA_NodeId readerGroupId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
     if(!rg) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_ReaderGroup_freezeConfiguration(server, rg);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -719,14 +719,14 @@ UA_ReaderGroup_unfreezeConfiguration(UA_Server *server, UA_ReaderGroup *rg) {
 UA_StatusCode
 UA_Server_unfreezeReaderGroupConfiguration(UA_Server *server,
                                            const UA_NodeId readerGroupId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroupId);
     if(!rg) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_ReaderGroup_unfreezeConfiguration(server, rg);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/pubsub/ua_pubsub_securitygroup.c b/src/pubsub/ua_pubsub_securitygroup.c
index 24ee95ad348..b503ea761f8 100644
--- a/src/pubsub/ua_pubsub_securitygroup.c
+++ b/src/pubsub/ua_pubsub_securitygroup.c
@@ -277,10 +277,10 @@ UA_StatusCode
 UA_Server_addSecurityGroup(UA_Server *server, UA_NodeId securityGroupFolderNodeId,
                            const UA_SecurityGroupConfig *securityGroupConfig,
                            UA_NodeId *securityGroupNodeId) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = addSecurityGroup(server, securityGroupFolderNodeId,
                                             securityGroupConfig, securityGroupNodeId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return retval;
 }
 
@@ -340,7 +340,7 @@ removeSecurityGroup(UA_Server *server, UA_SecurityGroup *securityGroup) {
 
 UA_StatusCode
 UA_Server_removeSecurityGroup(UA_Server *server, const UA_NodeId securityGroup) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroup);
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     if(sg) {
@@ -348,7 +348,7 @@ UA_Server_removeSecurityGroup(UA_Server *server, const UA_NodeId securityGroup)
     } else {
         res = UA_STATUSCODE_BADBOUNDNOTFOUND;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 5a735fb4ebb..104b181b31c 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -42,12 +42,12 @@ UA_Server_getDataSetWriterConfig(UA_Server *server, const UA_NodeId dsw,
                                  UA_DataSetWriterConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetWriter *currentDataSetWriter = UA_DataSetWriter_findDSWbyId(server, dsw);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     if(currentDataSetWriter)
         res = UA_DataSetWriterConfig_copy(&currentDataSetWriter->config, config);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -56,7 +56,7 @@ UA_Server_DataSetWriter_getState(UA_Server *server, UA_NodeId dataSetWriterIdent
                                UA_PubSubState *state) {
     if((server == NULL) || (state == NULL))
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetWriter *currentDataSetWriter =
         UA_DataSetWriter_findDSWbyId(server, dataSetWriterIdentifier);
     UA_StatusCode res = UA_STATUSCODE_GOOD;
@@ -65,7 +65,7 @@ UA_Server_DataSetWriter_getState(UA_Server *server, UA_NodeId dataSetWriterIdent
     } else {
         res = UA_STATUSCODE_BADNOTFOUND;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -314,12 +314,12 @@ UA_Server_addDataSetWriter(UA_Server *server,
                            const UA_NodeId writerGroup, const UA_NodeId dataSet,
                            const UA_DataSetWriterConfig *dataSetWriterConfig,
                            UA_NodeId *writerIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     /* Delete the reserved IDs if the related session no longer exists. */
     UA_PubSubManager_freeIds(server);
     UA_StatusCode res = UA_DataSetWriter_create(server, writerGroup, dataSet,
                                                 dataSetWriterConfig, writerIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -500,14 +500,14 @@ UA_DataSetWriter_remove(UA_Server *server, UA_DataSetWriter *dataSetWriter) {
 
 UA_StatusCode
 UA_Server_removeDataSetWriter(UA_Server *server, const UA_NodeId dsw) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_DataSetWriter *dataSetWriter = UA_DataSetWriter_findDSWbyId(server, dsw);
     if(!dataSetWriter) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_DataSetWriter_remove(server, dataSetWriter);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
diff --git a/src/pubsub/ua_pubsub_writergroup.c b/src/pubsub/ua_pubsub_writergroup.c
index 667567d084d..50cdfe6880f 100644
--- a/src/pubsub/ua_pubsub_writergroup.c
+++ b/src/pubsub/ua_pubsub_writergroup.c
@@ -211,10 +211,10 @@ UA_StatusCode
 UA_Server_addWriterGroup(UA_Server *server, const UA_NodeId connection,
                          const UA_WriterGroupConfig *writerGroupConfig,
                          UA_NodeId *writerGroupIdentifier) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = UA_WriterGroup_create(server, connection, writerGroupConfig,
                                               writerGroupIdentifier);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -288,14 +288,14 @@ UA_WriterGroup_remove(UA_Server *server, UA_WriterGroup *wg) {
 
 UA_StatusCode
 UA_Server_removeWriterGroup(UA_Server *server, const UA_NodeId writerGroup) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_WriterGroup_remove(server, wg);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -450,14 +450,14 @@ UA_WriterGroup_freezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
 UA_StatusCode
 UA_Server_freezeWriterGroupConfiguration(UA_Server *server,
                                          const UA_NodeId writerGroup) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_WriterGroup_freezeConfiguration(server, wg);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -487,21 +487,21 @@ UA_WriterGroup_unfreezeConfiguration(UA_Server *server, UA_WriterGroup *wg) {
 UA_StatusCode
 UA_Server_unfreezeWriterGroupConfiguration(UA_Server *server,
                                            const UA_NodeId writerGroup) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(!wg) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     UA_StatusCode res = UA_WriterGroup_unfreezeConfiguration(server, wg);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
 UA_StatusCode
 UA_Server_setWriterGroupOperational(UA_Server *server,
                                     const UA_NodeId writerGroup) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(wg) {
@@ -510,7 +510,7 @@ UA_Server_setWriterGroupOperational(UA_Server *server,
             res = UA_PubSubKeyStorage_activateKeyToChannelContext(
                 server, wg->identifier, wg->config.securityGroupId);
             if(res != UA_STATUSCODE_GOOD) {
-                UA_UNLOCK(&server->serviceMutex);
+                unlockServer(server);
                 return res;
             }
         }
@@ -519,20 +519,20 @@ UA_Server_setWriterGroupOperational(UA_Server *server,
         res = UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_OPERATIONAL,
                                             UA_STATUSCODE_GOOD);
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
 UA_StatusCode
 UA_Server_setWriterGroupDisabled(UA_Server *server,
                                  const UA_NodeId writerGroup) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     if(wg)
         res = UA_WriterGroup_setPubSubState(server, wg, UA_PUBSUBSTATE_DISABLED,
                                             UA_STATUSCODE_BADRESOURCEUNAVAILABLE);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -558,12 +558,12 @@ UA_Server_getWriterGroupConfig(UA_Server *server, const UA_NodeId writerGroup,
                                UA_WriterGroupConfig *config) {
     if(!config)
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_WriterGroup *currentWG = UA_WriterGroup_findWGbyId(server, writerGroup);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     if(currentWG)
         res = UA_WriterGroupConfig_copy(&currentWG->config, config);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -618,15 +618,15 @@ UA_WriterGroup_updateConfig(UA_Server *server, UA_WriterGroup *wg,
 UA_StatusCode
 UA_Server_updateWriterGroupConfig(UA_Server *server, UA_NodeId writerGroupIdentifier,
                                   const UA_WriterGroupConfig *config) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroupIdentifier);
     if(!wg) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
     UA_StatusCode res = UA_WriterGroup_updateConfig(server, wg, config);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
@@ -635,7 +635,7 @@ UA_Server_WriterGroup_getState(UA_Server *server, UA_NodeId writerGroupIdentifie
                                UA_PubSubState *state) {
     if((server == NULL) || (state == NULL))
         return UA_STATUSCODE_BADINVALIDARGUMENT;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_WriterGroup *currentWriterGroup =
         UA_WriterGroup_findWGbyId(server, writerGroupIdentifier);
     UA_StatusCode res = UA_STATUSCODE_GOOD;
@@ -644,22 +644,22 @@ UA_Server_WriterGroup_getState(UA_Server *server, UA_NodeId writerGroupIdentifie
     } else {
         res = UA_STATUSCODE_BADNOTFOUND;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 
 UA_StatusCode
 UA_Server_WriterGroup_publish(UA_Server *server, const UA_NodeId writerGroupIdentifier){
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     //search WriterGroup ToDo create lookup table for more efficiency
     UA_WriterGroup *writerGroup;
     writerGroup = UA_WriterGroup_findWGbyId(server, writerGroupIdentifier);
     if(writerGroup == NULL){
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_WriterGroup_publishCallback(server, writerGroup);
     return UA_STATUSCODE_GOOD;
 }
@@ -667,16 +667,16 @@ UA_Server_WriterGroup_publish(UA_Server *server, const UA_NodeId writerGroupIden
 UA_StatusCode
 UA_WriterGroup_lastPublishTimestamp(UA_Server *server, const UA_NodeId writerGroupId,
                                     UA_DateTime *timestamp){
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     //search WriterGroup ToDo create lookup table for more efficiency
     UA_WriterGroup *writerGroup;
     writerGroup = UA_WriterGroup_findWGbyId(server, writerGroupId);
     if(writerGroup == NULL){
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return UA_STATUSCODE_BADNOTFOUND;
     }
     *timestamp = writerGroup->lastPublishTimeStamp;
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return UA_STATUSCODE_BADNOTFOUND;
 }
 
@@ -738,10 +738,10 @@ UA_Server_setWriterGroupEncryptionKeys(UA_Server *server, const UA_NodeId writer
                                        const UA_ByteString signingKey,
                                        const UA_ByteString encryptingKey,
                                        const UA_ByteString keyNonce) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode res = setWriterGroupEncryptionKeys(server, writerGroup, securityTokenId,
                                                      signingKey, encryptingKey, keyNonce);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     return res;
 }
 #endif
@@ -1208,7 +1208,7 @@ sendNetworkMessageBinary(UA_Server *server, UA_PubSubConnection *connection, UA_
 
 static void
 sampleOffsetPublishingValues(UA_Server *server, UA_WriterGroup *wg) {
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     size_t fieldPos = 0;
     UA_DataSetWriter *dsw;
@@ -1247,7 +1247,7 @@ sampleOffsetPublishingValues(UA_Server *server, UA_WriterGroup *wg) {
         }
     }
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 static void
@@ -1359,7 +1359,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
     UA_assert(writerGroup != NULL);
     UA_assert(server != NULL);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     UA_LOG_DEBUG_WRITERGROUP(server->config.logging, writerGroup, "Publish Callback");
 
@@ -1370,20 +1370,20 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
                                  "Publish failed. PubSubConnection invalid");
         UA_WriterGroup_setPubSubState(server, writerGroup, UA_PUBSUBSTATE_ERROR,
                                       UA_STATUSCODE_BADNOTCONNECTED);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
     /* Realtime path - update the buffer message and send directly */
     if(writerGroup->config.rtLevel & UA_PUBSUB_RT_FIXED_SIZE) {
         publishWithOffsets(server, writerGroup, connection);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
     /* Nothing to do? */
     if(writerGroup->writersCount == 0) {
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
         return;
     }
 
@@ -1474,7 +1474,7 @@ UA_WriterGroup_publishCallback(UA_Server *server, UA_WriterGroup *writerGroup) {
         UA_DataSetMessage_clear(&dsmStore[i]);
     }
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 }
 
 #endif /* UA_ENABLE_PUBSUB */

From c32272cef1d07a7589aca137902ff843999b2ba1 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Jan 2025 20:09:39 +0100
Subject: [PATCH 1761/1963] refactor(client): Take the EventLoop lock before
 the client lock

---
 src/client/ua_client.c               | 80 +++++++++++++++-----------
 src/client/ua_client_connect.c       | 86 ++++++++++++++--------------
 src/client/ua_client_discovery.c     | 24 ++++----
 src/client/ua_client_internal.h      |  6 ++
 src/client/ua_client_subscriptions.c | 78 ++++++++++++-------------
 5 files changed, 146 insertions(+), 128 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 92119e8fa96..ce4cb356058 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -244,14 +244,14 @@ UA_Client_delete(UA_Client* client) {
 void
 UA_Client_getState(UA_Client *client, UA_SecureChannelState *channelState,
                    UA_SessionState *sessionState, UA_StatusCode *connectStatus) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     if(channelState)
         *channelState = client->channel.state;
     if(sessionState)
         *sessionState = client->sessionState;
     if(connectStatus)
         *connectStatus = client->connectStatus;
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 UA_ClientConfig *
@@ -668,9 +668,9 @@ void
 __UA_Client_Service(UA_Client *client, const void *request,
                     const UA_DataType *requestType, void *response,
                     const UA_DataType *responseType) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     __Client_Service(client, request, requestType, response, responseType);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 /***********************************/
@@ -723,7 +723,7 @@ __Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode) {
 UA_StatusCode
 UA_Client_modifyAsyncCallback(UA_Client *client, UA_UInt32 requestId,
                               void *userdata, UA_ClientAsyncServiceCallback callback) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     AsyncServiceCall *ac;
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     LIST_FOREACH(ac, &client->asyncServiceCalls, pointers) {
@@ -734,7 +734,7 @@ UA_Client_modifyAsyncCallback(UA_Client *client, UA_UInt32 requestId,
             break;
         }
     }
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -800,11 +800,11 @@ __UA_Client_AsyncService(UA_Client *client, const void *request,
                          UA_ClientAsyncServiceCallback callback,
                          const UA_DataType *responseType,
                          void *userdata, UA_UInt32 *requestId) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res =
         __Client_AsyncService(client, request, requestType, callback, responseType,
                               userdata, requestId);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -827,16 +827,16 @@ cancelByRequestHandle(UA_Client *client, UA_UInt32 requestHandle, UA_UInt32 *can
 UA_StatusCode
 UA_Client_cancelByRequestHandle(UA_Client *client, UA_UInt32 requestHandle,
                                 UA_UInt32 *cancelCount) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = cancelByRequestHandle(client, requestHandle, cancelCount);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
 UA_StatusCode
 UA_Client_cancelByRequestId(UA_Client *client, UA_UInt32 requestId,
                             UA_UInt32 *cancelCount) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = UA_STATUSCODE_BADNOTFOUND;
     AsyncServiceCall *ac;
     LIST_FOREACH(ac, &client->asyncServiceCalls, pointers) {
@@ -845,7 +845,7 @@ UA_Client_cancelByRequestId(UA_Client *client, UA_UInt32 requestId,
         res = cancelByRequestHandle(client, ac->requestHandle, cancelCount);
         break;
     }
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -858,11 +858,11 @@ UA_Client_addTimedCallback(UA_Client *client, UA_ClientCallback callback,
                            void *data, UA_DateTime date, UA_UInt64 *callbackId) {
     if(!client->config.eventLoop)
         return UA_STATUSCODE_BADINTERNALERROR;
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = client->config.eventLoop->
         addTimedCallback(client->config.eventLoop, (UA_Callback)callback,
                          client, data, date, callbackId);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -871,12 +871,12 @@ UA_Client_addRepeatedCallback(UA_Client *client, UA_ClientCallback callback,
                               void *data, UA_Double interval_ms, UA_UInt64 *callbackId) {
     if(!client->config.eventLoop)
         return UA_STATUSCODE_BADINTERNALERROR;
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = client->config.eventLoop->
         addCyclicCallback(client->config.eventLoop, (UA_Callback)callback,
                           client, data, interval_ms, NULL,
                           UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME, callbackId);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -885,11 +885,11 @@ UA_Client_changeRepeatedCallbackInterval(UA_Client *client, UA_UInt64 callbackId
                                          UA_Double interval_ms) {
     if(!client->config.eventLoop)
         return UA_STATUSCODE_BADINTERNALERROR;
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = client->config.eventLoop->
         modifyCyclicCallback(client->config.eventLoop, callbackId, interval_ms,
                              NULL, UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -897,10 +897,10 @@ void
 UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId) {
     if(!client->config.eventLoop)
         return;
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     client->config.eventLoop->
         removeCyclicCallback(client->config.eventLoop, callbackId);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 /**********************/
@@ -935,14 +935,14 @@ asyncServiceTimeoutCheck(UA_Client *client) {
 static void
 backgroundConnectivityCallback(UA_Client *client, void *userdata,
                                UA_UInt32 requestId, const UA_ReadResponse *response) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     if(response->responseHeader.serviceResult == UA_STATUSCODE_BADTIMEOUT) {
         if(client->config.inactivityCallback)
             client->config.inactivityCallback(client);
     }
     client->pendingConnectivityCheck = false;
     client->lastConnectivityCheck = UA_DateTime_nowMonotonic();
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 static void
@@ -979,7 +979,7 @@ __Client_backgroundConnectivity(UA_Client *client) {
 /* Regular housekeeping activities in the client -- called via a cyclic callback */
 static void
 clientHouseKeeping(UA_Client *client, void *_) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
                  "Internally check the the client state and "
@@ -1005,7 +1005,7 @@ clientHouseKeeping(UA_Client *client, void *_) {
     /* Log and notify user if the client state has changed */
     notifyClientState(client);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 UA_StatusCode
@@ -1042,9 +1042,9 @@ __UA_Client_startup(UA_Client *client) {
 UA_StatusCode
 UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
     /* Make sure the EventLoop has been started */
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode rv = __UA_Client_startup(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     UA_CHECK_STATUS(rv, return rv);
 
     /* All timers and network events are triggered in the EventLoop. Release the
@@ -1110,18 +1110,18 @@ getConnectionttribute(UA_Client *client, const UA_QualifiedName key,
 UA_StatusCode
 UA_Client_getConnectionAttribute(UA_Client *client, const UA_QualifiedName key,
                                  UA_Variant *outValue) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = getConnectionttribute(client, key, outValue, false);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
 UA_StatusCode
 UA_Client_getConnectionAttributeCopy(UA_Client *client, const UA_QualifiedName key,
                                      UA_Variant *outValue) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = getConnectionttribute(client, key, outValue, true);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -1130,22 +1130,34 @@ UA_Client_getConnectionAttribute_scalar(UA_Client *client,
                                         const UA_QualifiedName key,
                                         const UA_DataType *type,
                                         void *outValue) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     UA_Variant attr;
     UA_StatusCode res = getConnectionttribute(client, key, &attr, false);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return res;
     }
 
     if(!UA_Variant_hasScalarType(&attr, type)) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADNOTFOUND;
     }
 
     memcpy(outValue, attr.data, type->memSize);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return UA_STATUSCODE_GOOD;
 }
+
+void lockClient(UA_Client *client) {
+    if(UA_LIKELY(client->config.eventLoop != NULL))
+        client->config.eventLoop->lock(client->config.eventLoop);
+    UA_LOCK(&client->clientMutex);
+}
+
+void unlockClient(UA_Client *client) {
+    if(UA_LIKELY(client->config.eventLoop != NULL))
+        client->config.eventLoop->unlock(client->config.eventLoop);
+    UA_UNLOCK(&client->clientMutex);
+}
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index f4ca577476c..be433557dac 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -648,9 +648,9 @@ __Client_renewSecureChannel(UA_Client *client) {
 
 UA_StatusCode
 UA_Client_renewSecureChannel(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = __Client_renewSecureChannel(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -1515,7 +1515,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                          UA_ByteString msg) {
     /* Take the client lock */
     UA_Client *client = (UA_Client*)application;
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     UA_LOG_TRACE(client->config.logging, UA_LOGCATEGORY_CLIENT, "Client network callback");
 
@@ -1529,7 +1529,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                          "Cannot open a connection, the SecureChannel is already used");
             client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
             notifyClientState(client);
-            UA_UNLOCK(&client->clientMutex);
+            unlockClient(client);
             return;
         }
 
@@ -1638,7 +1638,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * If the connectStatus is still good (the SecureChannel was fully
          * opened before), then a reconnect is attempted. */
         closeSecureChannel(client);
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return;
     }
 
@@ -1647,7 +1647,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     if(!isFullyConnected(client))
         connectActivity(client);
     notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 static void
@@ -1831,9 +1831,9 @@ connectSecureChannel(UA_Client *client, const char *endpointUrl) {
 
 UA_StatusCode
 __UA_Client_connect(UA_Client *client, UA_Boolean async) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     connectInternal(client, async);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return client->connectStatus;
 }
 
@@ -1881,37 +1881,37 @@ activateSessionSync(UA_Client *client) {
 
 UA_StatusCode
 UA_Client_activateCurrentSession(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = activateSessionSync(client);
     notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res != UA_STATUSCODE_GOOD ? res : client->connectStatus;
 }
 
 UA_StatusCode
 UA_Client_activateCurrentSessionAsync(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = activateSessionAsync(client);
     notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res != UA_STATUSCODE_GOOD ? res : client->connectStatus;
 }
 
 UA_StatusCode
 UA_Client_getSessionAuthenticationToken(UA_Client *client, UA_NodeId *authenticationToken,
                                         UA_ByteString *serverNonce) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     if(client->sessionState != UA_SESSIONSTATE_CREATED &&
        client->sessionState != UA_SESSIONSTATE_ACTIVATED) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "There is no current session");
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADSESSIONCLOSED;
     }
 
     UA_StatusCode res = UA_NodeId_copy(&client->authenticationToken, authenticationToken);
     res |= UA_ByteString_copy(&client->serverSessionNonce, serverNonce);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -1946,15 +1946,15 @@ UA_StatusCode
 UA_Client_activateSession(UA_Client *client,
                           const UA_NodeId authenticationToken,
                           const UA_ByteString serverNonce) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = switchSession(client, authenticationToken, serverNonce);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return res;
     }
     res = activateSessionSync(client);
     notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res != UA_STATUSCODE_GOOD ? res : client->connectStatus;
 }
 
@@ -1962,15 +1962,15 @@ UA_StatusCode
 UA_Client_activateSessionAsync(UA_Client *client,
                                const UA_NodeId authenticationToken,
                                const UA_ByteString serverNonce) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res = switchSession(client, authenticationToken, serverNonce);
     if(res != UA_STATUSCODE_GOOD) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return res;
     }
     res = activateSessionAsync(client);
     notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res != UA_STATUSCODE_GOOD ? res : client->connectStatus;
 }
 
@@ -1995,7 +1995,7 @@ __Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId
                                 UA_ConnectionState state, const UA_KeyValueMap *params,
                                 UA_ByteString msg) {
     UA_Client *client = (UA_Client*)application;
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     if(!*connectionContext) {
         /* Store the new listen connection */
@@ -2013,7 +2013,7 @@ __Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId
         /* All slots are full, close */
         if(i == 16) {
             cm->closeConnection(cm, connectionId);
-            UA_UNLOCK(&client->clientMutex);
+            unlockClient(client);
             return;
         }
     } else if(*connectionContext == &client->channel ||
@@ -2025,7 +2025,7 @@ __Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId
             /* The client already has an active connection */
             if(client->channel.connectionId) {
                 cm->closeConnection(cm, connectionId);
-                UA_UNLOCK(&client->clientMutex);
+                unlockClient(client);
                 return;
             }
 
@@ -2044,7 +2044,7 @@ __Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId
         }
 
         /* Handle the active connection in the normal network callback */
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         __Client_networkCallback(cm, connectionId, application,
                                  connectionContext, state, params, msg);
         return;
@@ -2065,7 +2065,7 @@ __Client_reverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId
     }
 
     notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 UA_StatusCode
@@ -2073,13 +2073,13 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
                                           const UA_String *listenHostnames,
                                           size_t listenHostnamesLength,
                                           UA_UInt16 port) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     if(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Unable to listen for reverse connect while the client "
                        "is connected or already listening");
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADINVALIDSTATE;
     }
 
@@ -2104,13 +2104,13 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     if(!el) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "No EventLoop configured");
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
     if(el->state != UA_EVENTLOOPSTATE_STARTED) {
         res = el->start(el);
-        UA_CHECK_STATUS(res, UA_UNLOCK(&client->clientMutex); return res);
+        UA_CHECK_STATUS(res, unlockClient(client); return res);
     }
 
     UA_ConnectionManager *cm = NULL;
@@ -2127,7 +2127,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Could not find a TCP connection manager, unable to "
                        "listen for reverse connect");
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
 
@@ -2158,7 +2158,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
         res = UA_STATUSCODE_BADCONNECTIONCLOSED;
     }
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -2272,50 +2272,50 @@ disconnectSecureChannel(UA_Client *client, UA_Boolean sync) {
 
 UA_StatusCode
 UA_Client_disconnectSecureChannel(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     disconnectSecureChannel(client, true);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
 UA_Client_disconnectSecureChannelAsync(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     disconnectSecureChannel(client, false);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
 UA_Client_disconnect(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     if(client->sessionState == UA_SESSIONSTATE_ACTIVATED)
         sendCloseSession(client);
     cleanupSession(client);
     disconnectSecureChannel(client, true);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return UA_STATUSCODE_GOOD;
 }
 
 static void
 closeSessionCallback(UA_Client *client, void *userdata,
                      UA_UInt32 requestId, void *response) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     cleanupSession(client);
     disconnectSecureChannel(client, false);
     notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 UA_StatusCode
 UA_Client_disconnectAsync(UA_Client *client) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     if(client->sessionState == UA_SESSIONSTATE_CLOSED ||
        client->sessionState == UA_SESSIONSTATE_CLOSING) {
         disconnectSecureChannel(client, false);
         notifyClientState(client);
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -2337,6 +2337,6 @@ UA_Client_disconnectAsync(UA_Client *client) {
     }
 
     notifyClientState(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
diff --git a/src/client/ua_client_discovery.c b/src/client/ua_client_discovery.c
index 4dbcd30e90b..f430a51b93b 100644
--- a/src/client/ua_client_discovery.c
+++ b/src/client/ua_client_discovery.c
@@ -76,13 +76,13 @@ UA_StatusCode
 UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
                        size_t *endpointDescriptionsSize,
                        UA_EndpointDescription** endpointDescriptions) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     UA_Boolean connected = (client->channel.state == UA_SECURECHANNELSTATE_OPEN);
     /* Client is already connected to a different server */
     if(connected && strncmp((const char*)client->config.endpoint.endpointUrl.data, serverUrl,
                             client->config.endpoint.endpointUrl.length) != 0) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
@@ -91,13 +91,13 @@ UA_Client_getEndpoints(UA_Client *client, const char *serverUrl,
     if(!connected) {
         retval = connectSecureChannel(client, serverUrl);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_UNLOCK(&client->clientMutex);
+            unlockClient(client);
             return retval;
         }
     }
     retval = getEndpointsInternal(client, url, endpointDescriptionsSize,
                                   endpointDescriptions);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 
     if(!connected)
         UA_Client_disconnect(client);
@@ -110,12 +110,12 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
                       size_t localeIdsSize, UA_String *localeIds,
                       size_t *registeredServersSize,
                       UA_ApplicationDescription **registeredServers) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_Boolean connected = (client->channel.state == UA_SECURECHANNELSTATE_OPEN);
     /* Client is already connected to a different server */
     if(connected && strncmp((const char*)client->config.endpoint.endpointUrl.data, serverUrl,
                             client->config.endpoint.endpointUrl.length) != 0) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
@@ -123,7 +123,7 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
     if(!connected) {
         retval = connectSecureChannel(client, serverUrl);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_UNLOCK(&client->clientMutex);
+            unlockClient(client);
             return retval;
         }
     }
@@ -141,7 +141,7 @@ UA_Client_findServers(UA_Client *client, const char *serverUrl,
     __Client_Service(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST],
                      &response, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 
     /* Process the response */
     retval = response.responseHeader.serviceResult;
@@ -167,13 +167,13 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
                                UA_UInt32 startingRecordId, UA_UInt32 maxRecordsToReturn,
                                size_t serverCapabilityFilterSize, UA_String *serverCapabilityFilter,
                                size_t *serverOnNetworkSize, UA_ServerOnNetwork **serverOnNetwork) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     UA_Boolean connected = (client->channel.state == UA_SECURECHANNELSTATE_OPEN);
     /* Client is already connected to a different server */
     if(connected && strncmp((const char*)client->config.endpoint.endpointUrl.data, serverUrl,
                             client->config.endpoint.endpointUrl.length) != 0) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
@@ -181,7 +181,7 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
     if(!connected) {
         retval = connectSecureChannel(client, serverUrl);
         if(retval != UA_STATUSCODE_GOOD) {
-            UA_LOCK(&client->clientMutex);
+            lockClient(client);
             return retval;
         }
     }
@@ -199,7 +199,7 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
     __Client_Service(client, &request, &UA_TYPES[UA_TYPES_FINDSERVERSONNETWORKREQUEST],
                      &response, &UA_TYPES[UA_TYPES_FINDSERVERSONNETWORKRESPONSE]);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 
     /* Process the response */
     retval = response.responseHeader.serviceResult;
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index ae138f52ba1..44aa0f158a4 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -175,6 +175,12 @@ struct UA_Client {
 #endif
 };
 
+/* In order to prevent deadlocks between the EventLoop mutex and the
+ * client-mutex, we always take the EventLoop mutex first. */
+
+void lockClient(UA_Client *client);
+void unlockClient(UA_Client *client);
+
 UA_StatusCode
 __Client_AsyncService(UA_Client *client, const void *request,
                       const UA_DataType *requestType,
diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index dd1fc26828a..1249a5ff665 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -96,7 +96,7 @@ UA_Client_Subscriptions_create(UA_Client *client,
                                void *subscriptionContext,
                                UA_Client_StatusChangeNotificationCallback statusChangeCallback,
                                UA_Client_DeleteSubscriptionCallback deleteCallback) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     UA_CreateSubscriptionResponse response;
     UA_Client_Subscription *sub = (UA_Client_Subscription *)
@@ -104,7 +104,7 @@ UA_Client_Subscriptions_create(UA_Client *client,
     if(!sub) {
         UA_CreateSubscriptionResponse_init(&response);
         response.responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return response;
     }
     sub->context = subscriptionContext;
@@ -116,13 +116,13 @@ UA_Client_Subscriptions_create(UA_Client *client,
                      &response, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD) {
         UA_free(sub);
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return response;
     }
 
     ua_Subscriptions_create(client, sub, &response);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return response;
 }
 
@@ -204,10 +204,10 @@ UA_Client_Subscriptions_modify(UA_Client *client,
     UA_ModifySubscriptionResponse_init(&response);
 
     /* Find the internal representation */
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return response;
     }
@@ -221,11 +221,11 @@ UA_Client_Subscriptions_modify(UA_Client *client,
     sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
         response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return response;
     }
     ua_Subscriptions_modify(client, sub, &response);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return response;
 }
 
@@ -234,18 +234,18 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
                                      const UA_ModifySubscriptionRequest request,
                                      UA_ClientAsyncServiceCallback callback,
                                      void *userdata, UA_UInt32 *requestId) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     /* Find the internal representation */
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
     }
 
     CustomCallback *cc = (CustomCallback *)UA_calloc(1, sizeof(CustomCallback));
     if(!cc) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADOUTOFMEMORY;
     }
 
@@ -258,7 +258,7 @@ UA_Client_Subscriptions_modify_async(UA_Client *client,
                               ua_Subscriptions_modify_handler, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE],
                               cc, requestId);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -344,7 +344,7 @@ ua_Subscriptions_delete_handler(UA_Client *client, void *data,
     DeleteSubscriptionCallback *dsc =
         (DeleteSubscriptionCallback*)data;
 
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     /* Delete */
     __Client_Subscription_processDelete(client, &dsc->request, response);
@@ -356,7 +356,7 @@ ua_Subscriptions_delete_handler(UA_Client *client, void *data,
     UA_DeleteSubscriptionsRequest_clear(&dsc->request);
     UA_free(dsc);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 UA_StatusCode
@@ -386,7 +386,7 @@ UA_Client_Subscriptions_delete_async(UA_Client *client,
 UA_DeleteSubscriptionsResponse
 UA_Client_Subscriptions_delete(UA_Client *client,
                                const UA_DeleteSubscriptionsRequest request) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     /* Send the request */
     UA_DeleteSubscriptionsResponse response;
@@ -396,7 +396,7 @@ UA_Client_Subscriptions_delete(UA_Client *client,
     /* Process */
     __Client_Subscription_processDelete(client, &request, &response);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return response;
 }
 
@@ -536,7 +536,7 @@ ua_MonitoredItems_create_async_handler(UA_Client *client, void *d, UA_UInt32 req
     UA_CreateMonitoredItemsResponse *response = (UA_CreateMonitoredItemsResponse *)r;
     MonitoredItems_CreateData *data = (MonitoredItems_CreateData *)d;
 
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     ua_MonitoredItems_create(client, data, response);
     MonitoredItems_CreateData_clear(client, data);
@@ -546,7 +546,7 @@ ua_MonitoredItems_create_async_handler(UA_Client *client, void *d, UA_UInt32 req
 
     UA_free(data);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 static UA_StatusCode
@@ -680,10 +680,10 @@ UA_Client_MonitoredItems_createDataChanges(UA_Client *client,
                                            UA_Client_DataChangeNotificationCallback *callbacks,
                                            UA_Client_DeleteMonitoredItemCallback *deleteCallbacks) {
     UA_CreateMonitoredItemsResponse response;
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     ua_Client_MonitoredItems_create(client, &request, contexts, (void **)callbacks,
                                     deleteCallbacks, &response);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return response;
 }
 
@@ -695,11 +695,11 @@ UA_Client_MonitoredItems_createDataChanges_async(UA_Client *client,
                                                  UA_Client_DeleteMonitoredItemCallback *deleteCallbacks,
                                                  UA_ClientAsyncServiceCallback createCallback,
                                                  void *userdata, UA_UInt32 *requestId) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res =
         createDataChanges_async(client, request, contexts, (void **)callbacks,
                                 deleteCallbacks, createCallback, userdata, requestId);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -741,10 +741,10 @@ UA_Client_MonitoredItems_createEvents(UA_Client *client,
                                       UA_Client_EventNotificationCallback *callback,
                                       UA_Client_DeleteMonitoredItemCallback *deleteCallback) {
     UA_CreateMonitoredItemsResponse response;
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     ua_Client_MonitoredItems_create(client, &request, contexts, (void **)callback,
                                     deleteCallback, &response);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return response;
 }
 
@@ -757,11 +757,11 @@ UA_Client_MonitoredItems_createEvents_async(UA_Client *client,
                                             UA_Client_DeleteMonitoredItemCallback *deleteCallbacks,
                                             UA_ClientAsyncServiceCallback createCallback,
                                             void *userdata, UA_UInt32 *requestId) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_StatusCode res =
         createDataChanges_async(client, request, contexts, (void **)callbacks, deleteCallbacks,
                                 createCallback, userdata, requestId);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     return res;
 }
 
@@ -827,7 +827,7 @@ ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId
     UA_DeleteMonitoredItemsRequest *request =
         (UA_DeleteMonitoredItemsRequest *)cc->clientData;
 
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     if(response->responseHeader.serviceResult != UA_STATUSCODE_GOOD)
         goto cleanup;
@@ -849,7 +849,7 @@ ua_MonitoredItems_delete_handler(UA_Client *client, void *d, UA_UInt32 requestId
     UA_DeleteMonitoredItemsRequest_delete(request);
     UA_free(cc);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 UA_DeleteMonitoredItemsResponse
@@ -864,7 +864,7 @@ UA_Client_MonitoredItems_delete(UA_Client *client,
     if(response.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
         return response;
 
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     /* Find the internal subscription representation */
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
@@ -872,14 +872,14 @@ UA_Client_MonitoredItems_delete(UA_Client *client,
         UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT,
                     "No internal representation of subscription %" PRIu32,
                     request.subscriptionId);
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return response;
     }
 
     /* Remove MonitoredItems in the internal representation */
     ua_MonitoredItems_delete(client, sub, &request, &response);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 
     return response;
 }
@@ -964,10 +964,10 @@ UA_Client_MonitoredItems_modify(UA_Client *client,
     UA_ModifyMonitoredItemsResponse response;
     UA_ModifyMonitoredItemsResponse_init(&response);
 
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         response.responseHeader.serviceResult = UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
         return response;
     }
@@ -980,7 +980,7 @@ UA_Client_MonitoredItems_modify(UA_Client *client,
                      &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], &response,
                      &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     UA_ModifyMonitoredItemsRequest_clear(&modifiedRequest);
     return response;
 }
@@ -990,10 +990,10 @@ UA_Client_MonitoredItems_modify_async(UA_Client *client,
                                       const UA_ModifyMonitoredItemsRequest request,
                                       UA_ClientAsyncServiceCallback callback,
                                       void *userdata, UA_UInt32 *requestId) {
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     UA_Client_Subscription *sub = findSubscription(client, request.subscriptionId);
     if(!sub) {
-        UA_UNLOCK(&client->clientMutex);
+        unlockClient(client);
         return UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID;
     }
 
@@ -1005,7 +1005,7 @@ UA_Client_MonitoredItems_modify_async(UA_Client *client,
         client, &modifiedRequest, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST],
         callback, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE], userdata, requestId);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     UA_ModifyMonitoredItemsRequest_clear(&modifiedRequest);
     return statusCode;
 }
@@ -1302,7 +1302,7 @@ processPublishResponseAsync(UA_Client *client, void *userdata,
     UA_PublishRequest *req = (UA_PublishRequest*)userdata;
     UA_PublishResponse *res = (UA_PublishResponse*)response;
 
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
 
     /* Process the response */
     __Client_Subscriptions_processPublishResponse(client, req, res);
@@ -1313,7 +1313,7 @@ processPublishResponseAsync(UA_Client *client, void *userdata,
     /* Fill up the outstanding publish requests */
     __Client_Subscriptions_backgroundPublish(client);
 
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
 }
 
 void

From 3b2d62c13ddd903eac12863c0621a81090725aeb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 25 Jan 2025 21:12:59 +0100
Subject: [PATCH 1762/1963] fix(core): JSON-encode Variant ArrayDimensions as
 UInt32 (unsigned)

---
 src/ua_types_encoding_json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 015b09158d8..05cd0487943 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -1101,7 +1101,7 @@ ENCODE_JSON(Variant) {
             if(hasDimensions) {
                 ret |= writeJsonKey(ctx, UA_JSONKEY_DIMENSION);
                 ret |= encodeJsonArray(ctx, src->arrayDimensions, src->arrayDimensionsSize,
-                                       &UA_TYPES[UA_TYPES_INT32]);
+                                       &UA_TYPES[UA_TYPES_UINT32]);
             }
         } else {
             /* Special case of non-reversible array with dimensions */

From 1321281968e213acf52b413e4764bc91eda1fe2a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Jan 2025 00:11:13 +0100
Subject: [PATCH 1763/1963] refactor(tests): Lock the EventLoop before
 client/server in the tests

---
 tests/client/check_client_discovery.c         |   4 +-
 tests/pubsub/check_pubsub_configuration.c     |   8 +-
 tests/pubsub/check_pubsub_publisherid.c       |   4 +-
 tests/pubsub/check_pubsub_sks_client.c        |  16 +--
 tests/pubsub/check_pubsub_sks_keystorage.c    |  44 ++++----
 tests/pubsub/check_pubsub_sks_push.c          |  16 +--
 .../pubsub/check_pubsub_sks_securitygroups.c  |  20 ++--
 tests/server/check_server_historical_data.c   |  12 +-
 .../check_server_historical_data_circular.c   |   8 +-
 tests/server/check_server_readspeed.c         |   8 +-
 tests/server/check_services_subscriptions.c   | 104 +++++++++---------
 .../server/check_subscription_event_filter.c  |   4 +-
 tests/server/check_subscription_events.c      |  32 +++---
 13 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/tests/client/check_client_discovery.c b/tests/client/check_client_discovery.c
index b1bbe6bc5e2..ba457cdc9a6 100644
--- a/tests/client/check_client_discovery.c
+++ b/tests/client/check_client_discovery.c
@@ -51,9 +51,9 @@ START_TEST(Client_connect_badEndpointUrl) {
     /* Open a Session when possible */
     client->config.noSession = false;
 
-    UA_LOCK(&client->clientMutex);
+    lockClient(client);
     connectSync(client);
-    UA_UNLOCK(&client->clientMutex);
+    unlockClient(client);
     ck_assert_uint_eq(client->connectStatus, UA_STATUSCODE_GOOD);
 
     UA_Client_disconnect(client);
diff --git a/tests/pubsub/check_pubsub_configuration.c b/tests/pubsub/check_pubsub_configuration.c
index d6ce23b90c4..16521e2fed5 100644
--- a/tests/pubsub/check_pubsub_configuration.c
+++ b/tests/pubsub/check_pubsub_configuration.c
@@ -34,9 +34,9 @@ static void teardown(void) {
 START_TEST(AddPublisherUsingBinaryFile) {
     UA_ByteString publisherConfiguration = loadFile("../../tests/pubsub/check_publisher_configuration.bin");
     ck_assert(publisherConfiguration.length > 0);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retVal = UA_PubSubManager_loadPubSubConfigFromByteString(server, publisherConfiguration);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_PubSubConnection *connection;
     UA_WriterGroup *writerGroup;
@@ -69,9 +69,9 @@ START_TEST(AddPublisherUsingBinaryFile) {
 START_TEST(AddSubscriberUsingBinaryFile) {
     UA_ByteString subscriberConfiguration = loadFile("../../tests/pubsub/check_subscriber_configuration.bin");
     ck_assert(subscriberConfiguration.length > 0);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retVal = UA_PubSubManager_loadPubSubConfigFromByteString(server, subscriberConfiguration);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     UA_PubSubConnection *connection;
     UA_ReaderGroup *readerGroup;
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index 4e7c8fdb511..ff2f90e799f 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -1566,9 +1566,9 @@ START_TEST(Test_string_publisherId_file_config) {
     UA_PubSubConfigurationDataType_clear(&config);
 }
     /* load and apply config from ByteString buffer */
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     ck_assert_int_eq(UA_STATUSCODE_GOOD, UA_PubSubManager_loadPubSubConfigFromByteString(server, encodedConfigDataBuffer));
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     /* groups are already operational */
     /* check that publish/subscribe works -> set some test values */
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index 554dbc67fb8..ed59cba5395 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -534,11 +534,11 @@ START_TEST(AddValidSksClientwithWriterGroup) {
                   "Expected Statuscode to be Good, but failed with: %s ",
                   UA_StatusCode_name(retval));
     ck_assert(wg->keyStorage->keyListSize > 0);
-    UA_LOCK(&sksServer->serviceMutex);
+    lockServer(sksServer);
     UA_PubSubKeyListItem *sksKsItr =
         UA_PubSubKeyStorage_findKeyStorage(sksServer, securityGroupId)
             ->currentItem;
-    UA_UNLOCK(&sksServer->serviceMutex);
+    unlockServer(sksServer);
     UA_PubSubKeyListItem *wgKsItr = TAILQ_FIRST(&wg->keyStorage->keyList);
     for(size_t i = 0; i < wg->keyStorage->keyListSize; i++) {
         ck_assert_msg(UA_ByteString_equal(&sksKsItr->key, &wgKsItr->key) == UA_TRUE,
@@ -580,11 +580,11 @@ START_TEST(AddValidSksClientwithReaderGroup) {
                   "Expected Statuscode to be Good, but failed with: %s ",
                   UA_StatusCode_name(retval));
     ck_assert(rg->keyStorage->keyListSize > 0);
-    UA_LOCK(&sksServer->serviceMutex);
+    lockServer(sksServer);
     UA_PubSubKeyListItem *sksKsItr =
         UA_PubSubKeyStorage_findKeyStorage(sksServer, securityGroupId)
             ->currentItem;
-    UA_UNLOCK(&sksServer->serviceMutex);
+    unlockServer(sksServer);
     UA_PubSubKeyListItem *rgKsItr = TAILQ_FIRST(&rg->keyStorage->keyList);
     for(size_t i = 0; i < rg->keyStorage->keyListSize; i++) {
         ck_assert_msg(UA_ByteString_equal(&sksKsItr->key, &rgKsItr->key) == UA_TRUE,
@@ -860,14 +860,14 @@ START_TEST(FetchNextbatchOfKeys) {
     }
     ck_assert(retryCnt < MAX_RETRIES);
 
-    UA_LOCK(&publisherApp->serviceMutex);
+    lockServer(publisherApp);
     UA_PubSubKeyStorage *pubKs = UA_PubSubKeyStorage_findKeyStorage(
         publisherApp, securityGroupId);
-    UA_UNLOCK(&publisherApp->serviceMutex);
-    UA_LOCK(&subscriberApp->serviceMutex);
+    unlockServer(publisherApp);
+    lockServer(subscriberApp);
     UA_PubSubKeyStorage *subKs = UA_PubSubKeyStorage_findKeyStorage(
         subscriberApp, securityGroupId);
-    UA_UNLOCK(&subscriberApp->serviceMutex);
+    unlockServer(subscriberApp);
     retval = UA_Server_setWriterGroupOperational(publisherApp, writerGroupId);
     ck_assert(retval == UA_STATUSCODE_GOOD);
 
diff --git a/tests/pubsub/check_pubsub_sks_keystorage.c b/tests/pubsub/check_pubsub_sks_keystorage.c
index 5fce7e45af0..604b533df84 100644
--- a/tests/pubsub/check_pubsub_sks_keystorage.c
+++ b/tests/pubsub/check_pubsub_sks_keystorage.c
@@ -123,7 +123,7 @@ createKeyStoragewithkeys(UA_UInt32 currentTokenId, UA_UInt32 keysize,
     addTestWriterGroup(SecurityGroupId);
     addTestReaderGroup(SecurityGroupId);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyStorage *tKeyStorage =
         UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
 
@@ -160,7 +160,7 @@ createKeyStoragewithkeys(UA_UInt32 currentTokenId, UA_UInt32 keysize,
     retval = UA_PubSubKeyStorage_addKeyRolloverCallback(
         server, tKeyStorage, (UA_ServerCallback)UA_PubSubKeyStorage_keyRolloverCallback, callbackTime,
         &tKeyStorage->callBackId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     return tKeyStorage;
 }
@@ -225,7 +225,7 @@ START_TEST(TestPubSubKeyStorage_initialize) {
         UA_calloc(1, sizeof(UA_PubSubKeyStorage));
     ck_assert_ptr_ne(tKeyStorage, NULL);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     retval =
         UA_PubSubKeyStorage_init(server, tKeyStorage,
@@ -244,7 +244,7 @@ START_TEST(TestPubSubKeyStorage_initialize) {
     /*check if the keystorage is in the Server Keystorage list*/
     ck_assert_ptr_eq(server->pubSubManager.pubSubKeyList.lh_first, tKeyStorage);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorageSetKeys){
@@ -253,7 +253,7 @@ START_TEST(TestPubSubKeyStorageSetKeys){
     UA_Duration msTimeToNextKey = 2000;
     UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
     UA_PubSubKeyStorage *tKeyStorage = createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey, 0, testSecurityGroupId);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyListItem *keyListIterator;
     ck_assert_ptr_ne(tKeyStorage, NULL);
     ck_assert_msg(UA_ByteString_equal(&currentKey, &tKeyStorage->keyList.tqh_first->key), "Expected CurrentKey to be equal to the first key in the KeyList");
@@ -267,7 +267,7 @@ START_TEST(TestPubSubKeyStorageSetKeys){
     ck_assert_msg(UA_ByteString_equal(&futureKey[futureKeySize - 1], &keyListIterator->key), "Expected lastItem to be equal to the last FutureKey");
     ck_assert_msg(futureKeySize + 1 == tKeyStorage->keyListSize,"Expected KeyListSize to be equal to FutureKeySize + 1");
     ck_assert_msg(tKeyStorage->keyLifeTime == msTimeToNextKey, "Expected keyLifetime to be equal to the Keystorage->keyLifeTime");
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorage_MovetoNextKeyCallback){
@@ -277,11 +277,11 @@ START_TEST(TestPubSubKeyStorage_MovetoNextKeyCallback){
     UA_String testSecurityGroupId = UA_STRING("TestSecurityGroup");
 
     UA_PubSubKeyStorage *tKeyStorage = createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey, 0, testSecurityGroupId);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     ck_assert_ptr_ne(tKeyStorage, NULL);
     UA_PubSubKeyListItem *nextCurrentKey = TAILQ_NEXT(tKeyStorage->currentItem, keyListEntry);
     UA_fakeSleep(2000);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     UA_Server_run_iterate(server,false);
     ck_assert_ptr_eq(nextCurrentKey, tKeyStorage->currentItem);
@@ -313,7 +313,7 @@ START_TEST(TestPubSubKeystorage_ImportedKey){
     UA_ByteString_copy(&buffer, &expect_buf);
 
     createKeyStoragewithkeys(currentTokenId, futureKeySize, msTimeToNextKey,0, testSecurityGroupId);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
 
     /*encrypt and sign with Writer channelContext*/
 
@@ -338,62 +338,62 @@ START_TEST(TestPubSubKeystorage_ImportedKey){
     UA_ByteString_clear(&signature);
     UA_ByteString_clear(&buffer);
 
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorage_InitWithWriterGroup){
     addTestWriterGroup(SecurityGroupId);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     ck_assert_ptr_ne(wg->keyStorage, NULL);
     ck_assert_ptr_eq(ks, wg->keyStorage);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 START_TEST(TestPubSubKeyStorage_InitWithReaderGroup){
     addTestReaderGroup(SecurityGroupId);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     ck_assert_ptr_ne(rg->keyStorage, NULL);
     ck_assert_ptr_eq(ks, rg->keyStorage);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 START_TEST(TestAddingNewGroupToExistingKeyStorage){
     addTestWriterGroup(SecurityGroupId);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     ck_assert_msg(ks->referenceCount == 1, "Expected the reference Count to be exactly 1 after adding one Group");
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     addTestReaderGroup(SecurityGroupId);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     ck_assert_msg(ks->referenceCount == 2, "Expected the reference Count to be exactly 2 after adding second Group same SecurityGroupId");
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup);
     UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, readerGroup);
     ck_assert_ptr_eq(ks, rg->keyStorage);
     ck_assert_ptr_eq(ks, wg->keyStorage);
     ck_assert_ptr_eq(rg->keyStorage, wg->keyStorage);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 START_TEST(TestRemoveAPubSubGroupWithKeyStorage){
     addTestWriterGroup(SecurityGroupId);
     addTestReaderGroup(SecurityGroupId);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     UA_UInt32 refCountBefore = ks->referenceCount;
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_Server_removeWriterGroup(server, writerGroup);
     --refCountBefore;
     ck_assert_msg(ks->referenceCount == refCountBefore, "Expected keyStroage referenceCount to be One less then before after removing a Group");
     UA_Server_removeReaderGroup(server, readerGroup);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     ks = NULL;
     ks = UA_PubSubKeyStorage_findKeyStorage(server, SecurityGroupId);
     ck_assert_ptr_eq(ks, NULL);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 int
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index 5d8fb1fcb64..18913abe06e 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -296,9 +296,9 @@ START_TEST(TestSetSecurityKeys_GOOD) {
 
     UA_StatusCode retval = encyrptedclientconnect(client);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n",
@@ -324,9 +324,9 @@ START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingList){
 
     UA_StatusCode retval = encyrptedclientconnect(client);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
@@ -347,9 +347,9 @@ START_TEST(TestSetSecurityKeys_UpdateCurrentKeyFromExistingListAndAddNewFutureKe
     size_t keyListSize;
     UA_StatusCode retval = encyrptedclientconnect(client);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
@@ -380,9 +380,9 @@ START_TEST(TestSetSecurityKeys_ReplaceExistingKeyListWithFetchedKeyList){
 
     UA_StatusCode retval = encyrptedclientconnect(client);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, securityGroupId);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     retval = callSetSecurityKey(client, securityGroupId, currentTokenId, futureKeySize);
     ck_assert_msg(retval == UA_STATUSCODE_GOOD, "Expected StatusCode Good but erorr code : %s \n", UA_StatusCode_name(retval));
diff --git a/tests/pubsub/check_pubsub_sks_securitygroups.c b/tests/pubsub/check_pubsub_sks_securitygroups.c
index 4f4c9c42a74..274aed00b41 100644
--- a/tests/pubsub/check_pubsub_sks_securitygroups.c
+++ b/tests/pubsub/check_pubsub_sks_securitygroups.c
@@ -154,7 +154,7 @@ START_TEST(AddSecurityGroupWithvalidConfig) {
                                         &securityGroupNodeId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
     ck_assert(UA_NodeId_equal(&sg->securityGroupNodeId, &securityGroupNodeId) == UA_TRUE);
@@ -164,7 +164,7 @@ START_TEST(AddSecurityGroupWithvalidConfig) {
 #endif
     ck_assert(UA_String_equal(&sg->securityGroupId, &config.securityGroupName) ==
               UA_TRUE);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL
     /*check properties*/
@@ -246,17 +246,17 @@ START_TEST(RemoveSecurityGroup) {
                                         &securityGroupNodeId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     UA_Server_removeSecurityGroup(server, securityGroupNodeId);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_eq(sg, NULL);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 START_TEST(AddSecurityGroupWithKeyManagement){
@@ -277,7 +277,7 @@ START_TEST(AddSecurityGroupWithKeyManagement){
                                         &securityGroupNodeId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, sg->securityGroupId);
@@ -292,7 +292,7 @@ START_TEST(AddSecurityGroupWithKeyManagement){
         iterator = TAILQ_NEXT(iterator, keyListEntry);
         expectKeyId++;
     }
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 } END_TEST
 
 START_TEST(SecurityGroupPeriodicInsertNewKeys){
@@ -313,7 +313,7 @@ START_TEST(SecurityGroupPeriodicInsertNewKeys){
                                         &securityGroupNodeId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_SecurityGroup *sg = UA_SecurityGroup_findSGbyId(server, securityGroupNodeId);
     ck_assert_ptr_ne(sg, NULL);
     UA_PubSubKeyStorage *ks = UA_PubSubKeyStorage_findKeyStorage(server, sg->securityGroupId);
@@ -321,7 +321,7 @@ START_TEST(SecurityGroupPeriodicInsertNewKeys){
 
     UA_UInt32 expectKeyId = 1;
     UA_PubSubKeyListItem *preLastItem = TAILQ_LAST(&ks->keyList, keyListItems);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     for (size_t i = 0; i < ks->keyListSize; i++) {
         UA_fakeSleep(500);
         UA_Server_run_iterate(server, false);
diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c
index 8b9b792ca6b..b84f84689d1 100644
--- a/tests/server/check_server_historical_data.c
+++ b/tests/server/check_server_historical_data.c
@@ -269,9 +269,9 @@ requestHistory(UA_DateTime start,
     request.nodesToReadSize = 1;
     request.nodesToRead = valueId;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_HistoryRead(server, &server->adminSession, &request, response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_HistoryReadRequest_clear(&request);
 }
 
@@ -468,9 +468,9 @@ deleteHistory(UA_DateTime start,
 
     UA_HistoryUpdateResponse response;
     UA_HistoryUpdateResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_HistoryUpdate(server, &server->adminSession, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_HistoryUpdateRequest_clear(&request);
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     if (response.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
@@ -522,9 +522,9 @@ updateHistory(UA_PerformUpdateType updateType, UA_DateTime *updateData, UA_Statu
 
     UA_HistoryUpdateResponse response;
     UA_HistoryUpdateResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_HistoryUpdate(server, &server->adminSession, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_HistoryUpdateRequest_clear(&request);
     UA_StatusCode ret = UA_STATUSCODE_GOOD;
     if (response.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
diff --git a/tests/server/check_server_historical_data_circular.c b/tests/server/check_server_historical_data_circular.c
index 8bb10919caf..5100708738e 100644
--- a/tests/server/check_server_historical_data_circular.c
+++ b/tests/server/check_server_historical_data_circular.c
@@ -160,9 +160,9 @@ requestHistory(UA_DateTime start,
     request.nodesToReadSize = 1;
     request.nodesToRead = valueId;
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_HistoryRead(server, &server->adminSession, &request, response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_HistoryReadRequest_clear(&request);
 }
 
@@ -176,9 +176,9 @@ START_TEST(Server_HistorizingStrategyValueSet) {
     setting.historizingBackend = UA_HistoryDataBackend_Memory_Circular(3, 10);
     setting.maxHistoryDataResponseSize = 10;
     setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_VALUESET;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     retval = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
 
     // Fill the data overcoming the buffer size and starting to write new values replacing the old ones.
diff --git a/tests/server/check_server_readspeed.c b/tests/server/check_server_readspeed.c
index 4c6ffd39369..ba7a2246601 100644
--- a/tests/server/check_server_readspeed.c
+++ b/tests/server/check_server_readspeed.c
@@ -81,9 +81,9 @@ START_TEST(readSpeed) {
         /* Set the NodeId */
         rvi.nodeId = readNodeIds[i % READNODES];
 
-        UA_LOCK(&server->serviceMutex);
+        lockServer(server);
         Service_Read(server, &server->adminSession, &request, &res);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
 
         UA_ReadResponse_clear(&res);
     }
@@ -161,9 +161,9 @@ START_TEST(readSpeedWithEncoding) {
         size_t offset = 0;
         retval |= UA_decodeBinaryInternal(&request_msg, &offset, &req, &UA_TYPES[UA_TYPES_READREQUEST], NULL);
 
-        UA_LOCK(&server->serviceMutex);
+        lockServer(server);
         Service_Read(server, &server->adminSession, &req, &res);
-        UA_UNLOCK(&server->serviceMutex);
+        unlockServer(server);
 
         UA_Byte *rpos = response_msg.data;
         const UA_Byte *rend = &response_msg.data[response_msg.length];
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index 13f9b9a5b12..4c12a9fd885 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -35,9 +35,9 @@ createSession(void) {
     UA_CreateSessionRequest request;
     UA_CreateSessionRequest_init(&request);
     request.requestedSessionTimeout = UA_UINT32_MAX;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_StatusCode retval = UA_Server_createSession(server, NULL, &request, &session);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(retval, 0);
 }
 
@@ -71,9 +71,9 @@ createSubscription(void) {
     UA_CreateSubscriptionResponse response;
     UA_CreateSubscriptionResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateSubscription(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     subscriptionId = response.subscriptionId;
 
@@ -104,9 +104,9 @@ createMonitoredItem(void) {
     UA_CreateMonitoredItemsResponse response;
     UA_CreateMonitoredItemsResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateMonitoredItems(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
     ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
@@ -126,9 +126,9 @@ START_TEST(Server_createSubscription) {
 
     UA_CreateSubscriptionResponse response;
     UA_CreateSubscriptionResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateSubscription(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     subscriptionId = response.subscriptionId;
 
@@ -154,9 +154,9 @@ START_TEST(Server_modifySubscription) {
     UA_ModifySubscriptionResponse response;
     UA_ModifySubscriptionResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_ModifySubscription(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
 
     UA_ModifySubscriptionResponse_clear(&response);
@@ -175,9 +175,9 @@ START_TEST(Server_setPublishingMode) {
     UA_SetPublishingModeResponse response;
     UA_SetPublishingModeResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_SetPublishingMode(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
 
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
@@ -198,9 +198,9 @@ START_TEST(Server_republish) {
     UA_RepublishResponse response;
     UA_RepublishResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_Republish(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_BADMESSAGENOTAVAILABLE);
 
     UA_RepublishResponse_clear(&response);
@@ -217,9 +217,9 @@ START_TEST(Server_republish_invalid) {
     UA_RepublishResponse response;
     UA_RepublishResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_Republish(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_BADSUBSCRIPTIONIDINVALID);
 
     UA_RepublishResponse_clear(&response);
@@ -238,9 +238,9 @@ START_TEST(Server_deleteSubscription) {
     UA_DeleteSubscriptionsResponse del_response;
     UA_DeleteSubscriptionsResponse_init(&del_response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_DeleteSubscriptions(server, session, &del_request, &del_response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(del_response.resultsSize, 1);
     ck_assert_uint_eq(del_response.results[0], UA_STATUSCODE_GOOD);
 
@@ -256,9 +256,9 @@ START_TEST(Server_publishCallback) {
     UA_CreateSubscriptionRequest_init(&request);
     request.publishingEnabled = true;
     UA_CreateSubscriptionResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateSubscription(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     UA_UInt32 subscriptionId1 = response.subscriptionId;
     UA_CreateSubscriptionResponse_clear(&response);
@@ -267,9 +267,9 @@ START_TEST(Server_publishCallback) {
     UA_CreateSubscriptionRequest_init(&request);
     request.publishingEnabled = true;
     UA_CreateSubscriptionResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateSubscription(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     UA_UInt32 subscriptionId2 = response.subscriptionId;
     UA_Double publishingInterval = response.revisedPublishingInterval;
@@ -301,9 +301,9 @@ START_TEST(Server_publishCallback) {
     UA_DeleteSubscriptionsResponse del_response;
     UA_DeleteSubscriptionsResponse_init(&del_response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_DeleteSubscriptions(server, session, &del_request, &del_response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(del_response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(del_response.resultsSize, 2);
     ck_assert_uint_eq(del_response.results[0], UA_STATUSCODE_GOOD);
@@ -344,9 +344,9 @@ START_TEST(Server_modifyMonitoredItems) {
     UA_ModifyMonitoredItemsResponse response;
     UA_ModifyMonitoredItemsResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_ModifyMonitoredItems(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
     ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
@@ -364,9 +364,9 @@ START_TEST(Server_overflow) {
     UA_CreateSubscriptionRequest_init(&createSubscriptionRequest);
     createSubscriptionRequest.publishingEnabled = true;
     UA_CreateSubscriptionResponse_init(&createSubscriptionResponse);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateSubscription(server, session, &createSubscriptionRequest, &createSubscriptionResponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(createSubscriptionResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     UA_UInt32 localSubscriptionId = createSubscriptionResponse.subscriptionId;
     UA_Double publishingInterval = createSubscriptionResponse.revisedPublishingInterval;
@@ -398,9 +398,9 @@ START_TEST(Server_overflow) {
     UA_CreateMonitoredItemsResponse createMonitoredItemsResponse;
     UA_CreateMonitoredItemsResponse_init(&createMonitoredItemsResponse);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateMonitoredItems(server, session, &createMonitoredItemsRequest, &createMonitoredItemsResponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(createMonitoredItemsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(createMonitoredItemsResponse.resultsSize, 1);
     ck_assert_uint_eq(createMonitoredItemsResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
@@ -473,10 +473,10 @@ START_TEST(Server_overflow) {
     UA_ModifyMonitoredItemsResponse modifyMonitoredItemsResponse;
     UA_ModifyMonitoredItemsResponse_init(&modifyMonitoredItemsResponse);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_ModifyMonitoredItems(server, session, &modifyMonitoredItemsRequest,
                                  &modifyMonitoredItemsResponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.resultsSize, 1);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
@@ -505,10 +505,10 @@ START_TEST(Server_overflow) {
 
     UA_ModifyMonitoredItemsResponse_init(&modifyMonitoredItemsResponse);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_ModifyMonitoredItems(server, session, &modifyMonitoredItemsRequest,
                                  &modifyMonitoredItemsResponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.resultsSize, 1);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
@@ -536,10 +536,10 @@ START_TEST(Server_overflow) {
 
     UA_ModifyMonitoredItemsResponse_init(&modifyMonitoredItemsResponse);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_ModifyMonitoredItems(server, session, &modifyMonitoredItemsRequest,
                                  &modifyMonitoredItemsResponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.resultsSize, 1);
     ck_assert_uint_eq(modifyMonitoredItemsResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
@@ -563,10 +563,10 @@ START_TEST(Server_overflow) {
     UA_DeleteSubscriptionsResponse deleteSubscriptionsResponse;
     UA_DeleteSubscriptionsResponse_init(&deleteSubscriptionsResponse);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_DeleteSubscriptions(server, session, &deleteSubscriptionsRequest,
                                 &deleteSubscriptionsResponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(deleteSubscriptionsResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(deleteSubscriptionsResponse.resultsSize, 1);
     ck_assert_uint_eq(deleteSubscriptionsResponse.results[0], UA_STATUSCODE_GOOD);
@@ -590,9 +590,9 @@ START_TEST(Server_setMonitoringMode) {
     UA_SetMonitoringModeResponse response;
     UA_SetMonitoringModeResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_SetMonitoringMode(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
     ck_assert_uint_eq(response.results[0], UA_STATUSCODE_GOOD);
@@ -614,9 +614,9 @@ START_TEST(Server_deleteMonitoredItems) {
     UA_DeleteMonitoredItemsResponse response;
     UA_DeleteMonitoredItemsResponse_init(&response);
 
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_DeleteMonitoredItems(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
     ck_assert_uint_eq(response.results[0], UA_STATUSCODE_GOOD);
@@ -635,9 +635,9 @@ START_TEST(Server_lifeTimeCount) {
     request.requestedLifetimeCount = 3;
     request.requestedMaxKeepAliveCount = 1;
     UA_CreateSubscriptionResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateSubscription(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.revisedMaxKeepAliveCount, 1);
     ck_assert_uint_eq(response.revisedLifetimeCount, 3);
@@ -649,9 +649,9 @@ START_TEST(Server_lifeTimeCount) {
     request.requestedLifetimeCount = 4;
     request.requestedMaxKeepAliveCount = 2;
     UA_CreateSubscriptionResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateSubscription(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.revisedMaxKeepAliveCount, 2);
     /* revisedLifetimeCount is revised to 3*MaxKeepAliveCount == 3 */
@@ -684,9 +684,9 @@ START_TEST(Server_lifeTimeCount) {
 
     UA_CreateMonitoredItemsResponse mresponse;
     UA_CreateMonitoredItemsResponse_init(&mresponse);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateMonitoredItems(server, session, &mrequest, &mresponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(mresponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(mresponse.resultsSize, 1);
     ck_assert_uint_eq(mresponse.results[0].statusCode, UA_STATUSCODE_GOOD);
@@ -800,9 +800,9 @@ START_TEST(Server_invalidPublishingInterval) {
     request.publishingEnabled = true;
     request.requestedPublishingInterval = -5.0; // Must be positive
     UA_CreateSubscriptionResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateSubscription(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert(response.revisedPublishingInterval ==
               server->config.publishingIntervalLimits.min);
@@ -840,9 +840,9 @@ START_TEST(Server_negativeSamplingInterval) {
 
     UA_CreateMonitoredItemsResponse response;
     UA_CreateMonitoredItemsResponse_init(&response);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_CreateMonitoredItems(server, session, &request, &response);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(response.resultsSize, 1);
     ck_assert_uint_eq(response.results[0].statusCode, UA_STATUSCODE_GOOD);
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index cf8020ef443..cc187128c9a 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -230,10 +230,10 @@ removeSubscription(void) {
 
     UA_DeleteSubscriptionsResponse deleteSubscriptionsResponse;
     UA_DeleteSubscriptionsResponse_init(&deleteSubscriptionsResponse);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_DeleteSubscriptions(server, &server->adminSession, &deleteSubscriptionsRequest,
                                 &deleteSubscriptionsResponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_DeleteSubscriptionsResponse_clear(&deleteSubscriptionsResponse);
 }
 
diff --git a/tests/server/check_subscription_events.c b/tests/server/check_subscription_events.c
index bd331f4b5c7..58da6fbec6c 100644
--- a/tests/server/check_subscription_events.c
+++ b/tests/server/check_subscription_events.c
@@ -150,10 +150,10 @@ removeSubscription(void) {
 
     UA_DeleteSubscriptionsResponse deleteSubscriptionsResponse;
     UA_DeleteSubscriptionsResponse_init(&deleteSubscriptionsResponse);
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     Service_DeleteSubscriptions(server, &server->adminSession, &deleteSubscriptionsRequest,
                                 &deleteSubscriptionsResponse);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     UA_DeleteSubscriptionsResponse_clear(&deleteSubscriptionsResponse);
 }
 
@@ -734,10 +734,10 @@ START_TEST(evaluateFilterWhereClause) {
             ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         }
     }
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     retval = evaluateWhereClause(server, &server->adminSession,
                                  &eventNodeId, &contentFilter, &contentFilterResult);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
 
@@ -768,10 +768,10 @@ START_TEST(evaluateFilterWhereClause) {
             ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         }
     }
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     retval = evaluateWhereClause(server, &server->adminSession,
                                  &eventNodeId, &contentFilter, &contentFilterResult);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED);
     UA_ContentFilterResult_clear(&contentFilterResult);
 
@@ -795,21 +795,21 @@ START_TEST(evaluateFilterWhereClause) {
             ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         }
     }
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     retval = evaluateWhereClause(server, &server->adminSession,
                                  &eventNodeId, &contentFilter,
                                  &contentFilterResult);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERATORUNSUPPORTED);
     UA_ContentFilterResult_clear(&contentFilterResult);
 
     /* No operand provided */
     contentFilterElement.filterOperator = UA_FILTEROPERATOR_OFTYPE;
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     UA_ContentFilterElementResult elmRes =
         UA_ContentFilterElementValidation(server, 0, 1, &contentFilterElement);
     retval = elmRes.statusCode;
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADFILTEROPERANDCOUNTMISMATCH);
     UA_ContentFilterElementResult_clear(&elmRes);
 
@@ -843,10 +843,10 @@ START_TEST(evaluateFilterWhereClause) {
             ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         }
     }
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     retval = evaluateWhereClause(server, &server->adminSession,
                                  &eventNodeId, &contentFilter, &contentFilterResult);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
 
@@ -873,10 +873,10 @@ START_TEST(evaluateFilterWhereClause) {
             ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         }
     }
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     retval = evaluateWhereClause(server, &server->adminSession,
                                  &eventNodeId, &contentFilter, &contentFilterResult);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_ContentFilterResult_clear(&contentFilterResult);
 
@@ -902,10 +902,10 @@ START_TEST(evaluateFilterWhereClause) {
             ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
         }
     }
-    UA_LOCK(&server->serviceMutex);
+    lockServer(server);
     retval = evaluateWhereClause(server, &server->adminSession,
                                  &eventNodeId, &contentFilter, &contentFilterResult);
-    UA_UNLOCK(&server->serviceMutex);
+    unlockServer(server);
     ck_assert_uint_eq(retval, UA_STATUSCODE_BADNOMATCH);
     UA_ContentFilterResult_clear(&contentFilterResult);
 }

From e1bb9436c718c44cd788b26c8770817b84307407 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Jan 2025 22:22:57 +0100
Subject: [PATCH 1764/1963] fix(core): Fix an inter overrun in the JSON
 decoding

---
 src/ua_types_encoding_json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index 05cd0487943..dba183e2130 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2156,7 +2156,7 @@ getExtensionObjectType(ParseCtx *ctx) {
         return NULL;
 
     size_t oldIndex = ctx->index;
-    ctx->index = (UA_UInt16)typeIdIndex;
+    ctx->index = typeIdIndex;
 
     /* Decode the type NodeId */
     UA_NodeId typeId;

From 4f6d0c980f0b1bcf0664aa326d290817c17b0d5b Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 26 Jan 2025 22:23:03 +0100
Subject: [PATCH 1765/1963] refactor(core): Make the intent explicit in the
 JSON encoding

The check finds out if the value has been decoded. Then it needs the
type pointer set also.
---
 src/ua_types_encoding_json.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index dba183e2130..c656eb000d8 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -938,9 +938,7 @@ ENCODE_JSON(ExtensionObject) {
         return writeChars(ctx, "null", 4);
 
     /* Must have a type set if data is decoded */
-    if(src->encoding != UA_EXTENSIONOBJECT_ENCODED_BYTESTRING &&
-       src->encoding != UA_EXTENSIONOBJECT_ENCODED_XML &&
-       !src->content.decoded.type)
+    if(src->encoding >= UA_EXTENSIONOBJECT_DECODED && !src->content.decoded.type)
         return UA_STATUSCODE_BADENCODINGERROR;
 
     status ret = writeJsonObjStart(ctx);

From 018d2584e9e81860c2360c1c408c648eb6e1b0e0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 29 Jan 2025 08:14:44 +0100
Subject: [PATCH 1766/1963] refactor(core): Remove UA_LOCK_STATIC_INIT and its
 only user

There is no cross-plattform way to statically initialize a recursive
lock.
---
 include/open62541/config.h.in |  6 ------
 plugins/ua_log_stdout.c       | 16 ++--------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index ebd0c2a2e01..e2461802370 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -401,12 +401,6 @@ typedef struct {
     int mutexCounter;
 } UA_Lock;
 
-#if defined(__GLIBC__)
-#define UA_LOCK_STATIC_INIT {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, 0}
-#else
-#define UA_LOCK_STATIC_INIT {PTHREAD_RECURSIVE_MUTEX_INITIALIZER, 0}
-#endif
-
 static UA_INLINE void
 UA_LOCK_INIT(UA_Lock *lock) {
     pthread_mutexattr_t mattr;
diff --git a/plugins/ua_log_stdout.c b/plugins/ua_log_stdout.c
index a0b117807cf..5e8821c2893 100644
--- a/plugins/ua_log_stdout.c
+++ b/plugins/ua_log_stdout.c
@@ -42,12 +42,9 @@ logCategoryNames[UA_LOGCATEGORIES] =
     {"network", "channel", "session", "server", "client",
      "userland", "securitypolicy", "eventloop", "pubsub", "discovery"};
 
-/* Protect crosstalk during logging via global lock.
- * Use a spinlock on non-POSIX as we cannot statically initialize a global lock. */
+/* Protect crosstalk during logging via global lock. Use a spinlock as we cannot
+ * statically initialize a global lock across all platforms. */
 #if UA_MULTITHREADING >= 100
-# ifdef UA_ARCHITECTURE_POSIX
-UA_Lock logLock = UA_LOCK_STATIC_INIT;
-# else
 void * volatile logSpinLock = NULL;
 static UA_INLINE void spinLock(void) {
     while(UA_atomic_cmpxchg(&logSpinLock, NULL, (void*)0x1) != NULL) {}
@@ -55,7 +52,6 @@ static UA_INLINE void spinLock(void) {
 static UA_INLINE void spinUnLock(void) {
     UA_atomic_xchg(&logSpinLock, NULL);
 }
-# endif
 #endif
 
 #ifdef __clang__
@@ -78,11 +74,7 @@ UA_Log_Stdout_log(void *context, UA_LogLevel level, UA_LogCategory category,
 
     /* Lock */
 #if UA_MULTITHREADING >= 100
-# ifdef UA_ARCHITECTURE_POSIX
-    UA_LOCK(&logLock);
-# else
     spinLock();
-# endif
 #endif
 
     /* Log */
@@ -96,11 +88,7 @@ UA_Log_Stdout_log(void *context, UA_LogLevel level, UA_LogCategory category,
 
     /* Unlock */
 #if UA_MULTITHREADING >= 100
-# ifdef UA_ARCHITECTURE_POSIX
-    UA_UNLOCK(&logLock);
-# else
     spinUnLock();
-# endif
 #endif
 }
 

From 2119e7cd2046b92513077db5eb8a68f400a83eee Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Feb 2025 12:55:40 +0100
Subject: [PATCH 1767/1963] fix(server): Unlock the server before executing an
 async method

---
 src/server/ua_services_method.c     | 8 +++++++-
 tests/server/check_server_asyncop.c | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 4a7d7ceb57f..19723eaede2 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -346,12 +346,18 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
     /* Release the output arguments node */
     UA_NODESTORE_RELEASE(server, (const UA_Node*)outputArguments);
 
-    /* Call the method */
+    /* Call the method. If this is an async method, unlock the server lock for
+     * the duration of the (long-running) call. */
+    if(method->async)
+        unlockServer(server);
     result->statusCode = method->method(server, &session->sessionId, session->sessionHandle,
                                         &method->head.nodeId, method->head.context,
                                         &object->head.nodeId, object->head.context,
                                         request->inputArgumentsSize, mutableInputArgs,
                                         result->outputArgumentsSize, result->outputArguments);
+    if(method->async)
+        lockServer(server);
+
     /* TODO: Verify Output matches the argument definition */
 }
 
diff --git a/tests/server/check_server_asyncop.c b/tests/server/check_server_asyncop.c
index 4352f28b7f8..f2add91fd5a 100644
--- a/tests/server/check_server_asyncop.c
+++ b/tests/server/check_server_asyncop.c
@@ -13,6 +13,8 @@
 #include "testing_clock.h"
 #include "thread_wrapper.h"
 
+#include "ua_server_internal.h"
+
 #include <check.h>
 #include <stdlib.h>
 
@@ -28,6 +30,11 @@ methodCallback(UA_Server *serverArg,
                const UA_NodeId *objectId, void *objectContext,
                size_t inputSize, const UA_Variant *input,
                size_t outputSize, UA_Variant *output) {
+    UA_NodeId asyncId = UA_NODEID_STRING(1, "asyncMethod");
+    if(UA_NodeId_equal(methodId, &asyncId))
+        ck_assert(server->serviceMutex.mutexCounter == 0);
+    else
+        ck_assert(server->serviceMutex.mutexCounter > 0);
     return UA_STATUSCODE_GOOD;
 }
 

From 3e0be8ebac11f27f2ea5021a7c17a662fb999577 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Feb 2025 19:16:22 +0100
Subject: [PATCH 1768/1963] refactor(client): Allow client EventLoops that do
 not expose lock/unlock

---
 src/client/ua_client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index ce4cb356058..30f2e9b423b 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -1151,13 +1151,13 @@ UA_Client_getConnectionAttribute_scalar(UA_Client *client,
 }
 
 void lockClient(UA_Client *client) {
-    if(UA_LIKELY(client->config.eventLoop != NULL))
+    if(UA_LIKELY(client->config.eventLoop && client->config.eventLoop->lock))
         client->config.eventLoop->lock(client->config.eventLoop);
     UA_LOCK(&client->clientMutex);
 }
 
 void unlockClient(UA_Client *client) {
-    if(UA_LIKELY(client->config.eventLoop != NULL))
+    if(UA_LIKELY(client->config.eventLoop && client->config.eventLoop->unlock))
         client->config.eventLoop->unlock(client->config.eventLoop);
     UA_UNLOCK(&client->clientMutex);
 }

From ad911c11e85e8f9dde28f32b444c89e54e1c0bec Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Feb 2025 19:16:33 +0100
Subject: [PATCH 1769/1963] refactor(server): Allow server EventLoops that do
 not expose lock/unlock

---
 src/server/ua_server.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index 667cb08c680..d085ab5dff9 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -922,13 +922,13 @@ UA_Server_run(UA_Server *server, const volatile UA_Boolean *running) {
 }
 
 void lockServer(UA_Server *server) {
-    if(UA_LIKELY(server->config.eventLoop != NULL))
+    if(UA_LIKELY(server->config.eventLoop && server->config.eventLoop->lock))
         server->config.eventLoop->lock(server->config.eventLoop);
     UA_LOCK(&server->serviceMutex);
 }
 
 void unlockServer(UA_Server *server) {
-    if(UA_LIKELY(server->config.eventLoop != NULL))
+    if(UA_LIKELY(server->config.eventLoop && server->config.eventLoop->unlock))
         server->config.eventLoop->unlock(server->config.eventLoop);
     UA_UNLOCK(&server->serviceMutex);
 }

From abc76d3374fee1633c4afcafd72d710d88a6e604 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 2 Feb 2025 19:16:51 +0100
Subject: [PATCH 1770/1963] refactor(core): Bump version to v1.4.10

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fcb9b14f2c..d0e9d75e2a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 8)
+set(OPEN62541_VER_PATCH 10)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 79f87e33ae239c6fb44bba9abb3842430437d250 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 3 Feb 2025 12:06:51 +0100
Subject: [PATCH 1771/1963] fix(core): Call pthread_mutexattr_destroy for mutex
 attribute

---
 include/open62541/config.h.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index e2461802370..c47b999e6d7 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -407,6 +407,7 @@ UA_LOCK_INIT(UA_Lock *lock) {
     pthread_mutexattr_init(&mattr);
     pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_RECURSIVE);
     pthread_mutex_init(&lock->mutex, &mattr);
+    pthread_mutexattr_destroy(&mattr);
     lock->mutexCounter = 0;
 }
 

From 3b04d45209ae523a15c0a7048769f481319c7239 Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 17 Dec 2024 17:54:06 +0100
Subject: [PATCH 1772/1963] fix(ci): remove python-six dependency from
 doc_upload workflow

(cherry picked from commit 152763151379d2b654a0f04f28d9f1dd8606adc4)
---
 .github/workflows/doc_upload.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/doc_upload.yml b/.github/workflows/doc_upload.yml
index 679b89c80b4..6ea694a35df 100644
--- a/.github/workflows/doc_upload.yml
+++ b/.github/workflows/doc_upload.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y -qq python3-sphinx graphviz python-six texlive-fonts-recommended texlive-latex-extra texlive-plain-generic texlive-latex-recommended latexmk texlive-fonts-extra
+          sudo apt-get install -y -qq python3-sphinx graphviz texlive-fonts-recommended texlive-latex-extra texlive-plain-generic texlive-latex-recommended latexmk texlive-fonts-extra
           pip install sphinx-rtd-theme
       - name: Build Documentation
         run: source tools/ci.sh && build_docs_pdf

From 77741e223f61e9ebe02576d95c6a6c628fe8d5dd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 4 Feb 2025 08:42:23 +0100
Subject: [PATCH 1773/1963] fix(server): methodNode->async is only defined when
 multithreading is enabled

---
 src/server/ua_services_method.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 19723eaede2..616cbf2b494 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -348,15 +348,19 @@ callWithMethodAndObject(UA_Server *server, UA_Session *session,
 
     /* Call the method. If this is an async method, unlock the server lock for
      * the duration of the (long-running) call. */
+#if UA_MULTITHREADING >= 100
     if(method->async)
         unlockServer(server);
+#endif
     result->statusCode = method->method(server, &session->sessionId, session->sessionHandle,
                                         &method->head.nodeId, method->head.context,
                                         &object->head.nodeId, object->head.context,
                                         request->inputArgumentsSize, mutableInputArgs,
                                         result->outputArgumentsSize, result->outputArguments);
+#if UA_MULTITHREADING >= 100
     if(method->async)
         lockServer(server);
+#endif
 
     /* TODO: Verify Output matches the argument definition */
 }

From b67950d3ce1660cb081896f65f2c10ad09c390ea Mon Sep 17 00:00:00 2001
From: RolfKal <rolf.kalbermatter@kalbermatter.nl>
Date: Tue, 4 Feb 2025 19:37:40 +0100
Subject: [PATCH 1774/1963] fix(tools): Fix regular expression replacement
 parameter escapement

---
 tools/nodeset_compiler/type_parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nodeset_compiler/type_parser.py b/tools/nodeset_compiler/type_parser.py
index 07b25155e8b..1efcffba5c1 100644
--- a/tools/nodeset_compiler/type_parser.py
+++ b/tools/nodeset_compiler/type_parser.py
@@ -441,7 +441,7 @@ def createSymbolicNameTable(self, f):
             fileContent = fileContent.decode("utf-8")
 
         # Remove the uax namespace from tags. UaModeler adds this namespace to some elements
-        fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\g<1>\g<2>\g<3>>", fileContent)
+        fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\\g<1>\\g<2>\\g<3>>", fileContent)
 
         nodesets = dom.parseString(fileContent).getElementsByTagName("UANodeSet")
         if len(nodesets) == 0 or len(nodesets) > 1:

From a06985e3c954f1780f2d973527d6d854761009ab Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 4 Feb 2025 16:21:13 +0100
Subject: [PATCH 1775/1963] fix(pubsub): Add DataSetWriters to the end of the
 writers queue

This ensures that NetworkMessage contains DataSetMessages in the
expected order.

This was typically not a problem, because the DataSetWriter is
identified by its ID that is communicated as part of the DataSetMessage.
---
 src/pubsub/ua_pubsub_writer.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_writer.c b/src/pubsub/ua_pubsub_writer.c
index 104b181b31c..7ec118c58d7 100644
--- a/src/pubsub/ua_pubsub_writer.c
+++ b/src/pubsub/ua_pubsub_writer.c
@@ -294,8 +294,16 @@ UA_DataSetWriter_create(UA_Server *server,
 
     newDataSetWriter->linkedWriterGroup = wg->identifier;
 
-    /* Add the new writer to the group */
-    LIST_INSERT_HEAD(&wg->writers, newDataSetWriter, listEntry);
+    /* Add the new writer to the group. Add to the end of the linked list to
+     * ensure the order in the generated NetworkMessage is as expected. */
+    UA_DataSetWriter *after = LIST_FIRST(&wg->writers);
+    if(!after) {
+        LIST_INSERT_HEAD(&wg->writers, newDataSetWriter, listEntry);
+    } else {
+        while(LIST_NEXT(after, listEntry))
+            after = LIST_NEXT(after, listEntry);
+        LIST_INSERT_AFTER(after, newDataSetWriter, listEntry);
+    }
     wg->writersCount++;
 
 #ifdef UA_ENABLE_PUBSUB_INFORMATIONMODEL

From bddc86fd96357c32a3b50879a07d3675c51f1b46 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 4 Feb 2025 16:27:37 +0100
Subject: [PATCH 1776/1963] refactor(pubsub): Add new DataSetReaders to the end
 of the readers list

This is for consistency, as the DataSetMessages get match to the
DataSetReaders via the embedded PublisherId.
---
 src/pubsub/ua_pubsub_reader.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pubsub/ua_pubsub_reader.c b/src/pubsub/ua_pubsub_reader.c
index 9b622d279cf..33d1377dfa9 100644
--- a/src/pubsub/ua_pubsub_reader.c
+++ b/src/pubsub/ua_pubsub_reader.c
@@ -171,8 +171,18 @@ UA_DataSetReader_create(UA_Server *server, UA_NodeId readerGroupIdentifier,
     }
 #endif /* UA_ENABLE_PUBSUB_MONITORING */
 
-    /* Add the new reader to the group */
-    LIST_INSERT_HEAD(&readerGroup->readers, newDataSetReader, listEntry);
+    /* Add the new reader to the group. Add to the end of the linked list to
+     * ensure the order for the realtime offsets is as expected. The received
+     * DataSetMessages are matched via UA_DataSetReader_checkIdentifier for the
+     * non-RT path. */
+    UA_DataSetReader *after = LIST_FIRST(&readerGroup->readers);
+    if(!after) {
+        LIST_INSERT_HEAD(&readerGroup->readers, newDataSetReader, listEntry);
+    } else {
+        while(LIST_NEXT(after, listEntry))
+            after = LIST_NEXT(after, listEntry);
+        LIST_INSERT_AFTER(after, newDataSetReader, listEntry);
+    }
     readerGroup->readersCount++;
 
     if(!UA_String_isEmpty(&newDataSetReader->config.linkedStandaloneSubscribedDataSetName)) {

From 2dbec45c6b9a438c284f9e453045a8cdb6bed901 Mon Sep 17 00:00:00 2001
From: RolfKal <rolf.kalbermatter@kalbermatter.nl>
Date: Tue, 4 Feb 2025 20:11:27 +0100
Subject: [PATCH 1777/1963] fix(tools): improve findCheck function for cmake to
 work better when the Check program is normally installed as an executable

---
 tools/cmake/FindCheck.cmake | 67 +++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/tools/cmake/FindCheck.cmake b/tools/cmake/FindCheck.cmake
index 3eccef70061..4906d28c23a 100644
--- a/tools/cmake/FindCheck.cmake
+++ b/tools/cmake/FindCheck.cmake
@@ -21,6 +21,27 @@ if(WIN32)
   if(DEFINED VCPKG_INSTALLED_DIR)
     set(CHECK_INSTALL_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
     # find_package(check CONFIG REQUIRED)
+  else()
+    if(NOT CHECK_INSTALL_DIR)
+      if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+        file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
+      else()
+        set(_progfiles_x86 "ProgramFiles(x86)")
+        if(NOT "$ENV{${_progfiles_x86}}" STREQUAL "")
+          # under windows 64 bit machine
+          file(TO_CMAKE_PATH "$ENV{${_progfiles_x86}}" _programfiles)
+        else()
+          # under windows 32 bit machine
+          file(TO_CMAKE_PATH "$ENV{ProgramFiles}" _programfiles)
+        endif()
+        unset(_progfiles_x86)
+      endif()
+      if(EXISTS ${_programfiles}/Check/lib/check.lib)
+        MESSAGE(STATUS "${_programfiles}/Check/lib/check.lib exists")
+        set(CHECK_INSTALL_DIR "${_programfiles}/Check")
+      endif()
+      unset (_programfiles)
+    endif()
   endif()
 else()
     # Take care about check.pc settings
@@ -30,29 +51,31 @@ endif()
 
 # Look for CHECK include dir and libraries
 IF( NOT CHECK_FOUND )
-	IF ( CHECK_INSTALL_DIR )
-		MESSAGE ( STATUS "Using override CHECK_INSTALL_DIR to find check" )
-		SET ( CHECK_INCLUDE_DIR  "${CHECK_INSTALL_DIR}/include" )
-		FIND_LIBRARY( CHECK_LIBRARIES NAMES check PATHS "${CHECK_INSTALL_DIR}/lib" )
-	ELSE ( CHECK_INSTALL_DIR )
-		FIND_PATH( CHECK_INCLUDE_DIR check.h )
-		FIND_LIBRARY( CHECK_LIBRARIES NAMES check )
-	ENDIF ( CHECK_INSTALL_DIR )
+    IF ( CHECK_INSTALL_DIR )
+      MESSAGE ( STATUS "Using override CHECK_INSTALL_DIR to find check: ${CHECK_INSTALL_DIR}" )
+      SET ( CHECK_INCLUDE_DIR "${CHECK_INSTALL_DIR}/include" )
+#     Find_library() always returns the 64-bit version in "C:/Program Files/Check/lib" no matter what path is passed in
+#     FIND_LIBRARY( CHECK_LIBRARIES NAMES check PATHS "${CHECK_INSTALL_DIR}/lib" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH )
+      SET ( CHECK_LIBRARIES "${CHECK_INSTALL_DIR}/lib/check.lib" )
+    ELSE ( CHECK_INSTALL_DIR )
+      FIND_PATH( CHECK_INCLUDE_DIR check.h )
+      FIND_LIBRARY( CHECK_LIBRARIES NAMES check )
+    ENDIF ( CHECK_INSTALL_DIR )
 
-	IF ( CHECK_INCLUDE_DIR AND CHECK_LIBRARIES )
-		SET( CHECK_FOUND 1 )
-		IF ( NOT Check_FIND_QUIETLY )
-			MESSAGE ( STATUS "Found CHECK: ${CHECK_LIBRARIES}" )
-		ENDIF ( NOT Check_FIND_QUIETLY )
-	ELSE ( CHECK_INCLUDE_DIR AND CHECK_LIBRARIES )
-		IF ( Check_FIND_REQUIRED )
-			MESSAGE( FATAL_ERROR "Could NOT find CHECK" )
-		ELSE ( Check_FIND_REQUIRED )
-			IF ( NOT Check_FIND_QUIETLY )
-				MESSAGE( STATUS "Could NOT find CHECK" )	
-			ENDIF ( NOT Check_FIND_QUIETLY )
-		ENDIF ( Check_FIND_REQUIRED )
-	ENDIF ( CHECK_INCLUDE_DIR AND CHECK_LIBRARIES )
+    IF ( CHECK_INCLUDE_DIR AND CHECK_LIBRARIES )
+      SET( CHECK_FOUND 1 )
+      IF ( NOT Check_FIND_QUIETLY )
+        MESSAGE ( STATUS "Found CHECK: ${CHECK_LIBRARIES}" )
+      ENDIF ( NOT Check_FIND_QUIETLY )
+    ELSE ( CHECK_INCLUDE_DIR AND CHECK_LIBRARIES )
+      IF ( Check_FIND_REQUIRED )
+        MESSAGE( FATAL_ERROR "Could NOT find CHECK" )
+      ELSE ( Check_FIND_REQUIRED )
+        IF ( NOT Check_FIND_QUIETLY )
+          MESSAGE( STATUS "Could NOT find CHECK" )
+        ENDIF ( NOT Check_FIND_QUIETLY )
+      ENDIF ( Check_FIND_REQUIRED )
+    ENDIF ( CHECK_INCLUDE_DIR AND CHECK_LIBRARIES )
 ENDIF( NOT CHECK_FOUND )
 
 # Hide advanced variables from CMake GUIs

From aaf6ebdf99573166fb165323ea426e560f4c8cc7 Mon Sep 17 00:00:00 2001
From: RolfKal <rolf.kalbermatter@kalbermatter.nl>
Date: Tue, 4 Feb 2025 20:13:13 +0100
Subject: [PATCH 1778/1963] improve(test): make ua_add_test() accept extra
 parameters for additional libraries to link with

---
 tests/CMakeLists.txt                  | 50 +++++++++++++++------------
 tests/nodeset-compiler/CMakeLists.txt | 10 +++---
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 676074c285b..8f40f7f7049 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,7 @@ if(MSVC)
         $<$<CONFIG:>:/MD>
         $<$<CONFIG:Debug>:/MDd>
         $<$<CONFIG:Release>:/MD>
-    )    
+    )
 else()
     add_compile_options(-Wno-unused-variable -Wno-unused-function)
 endif()
@@ -13,7 +13,7 @@ endif()
 find_package(Check REQUIRED)
 set(LIBS ${CHECK_LIBRARIES} ${open62541_LIBRARIES})
 if(NOT WIN32 AND NOT APPLE AND NOT (CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD"))
-  list(APPEND LIBS subunit)
+    list(APPEND LIBS subunit)
 endif()
 
 include_directories(${CHECK_INCLUDE_DIR})
@@ -90,7 +90,7 @@ set(test_plugin_sources
     )
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
+    list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
 endif()
 
 if(UA_ENABLE_MQTT)
@@ -105,19 +105,19 @@ if(UA_ENABLE_HISTORIZING)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION)
-  list(INSERT test_plugin_sources 0
+    list(INSERT test_plugin_sources 0
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.h
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_mbedtls_common.c)
 endif()
 
 if(UA_ENABLE_PUBSUB_ENCRYPTION)
-  list(INSERT test_plugin_sources 1
+    list(INSERT test_plugin_sources 1
     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_pubsub_aes128ctr.c
     ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/securitypolicy_pubsub_aes256ctr.c)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_MBEDTLS)
-  list(INSERT test_plugin_sources 1
+    list(INSERT test_plugin_sources 1
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic128rsa15.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256.c
        ${PROJECT_SOURCE_DIR}/plugins/crypto/mbedtls/ua_securitypolicy_basic256sha256.c
@@ -128,7 +128,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
 endif()
 
 if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
-  list(INSERT test_plugin_sources 0
+    list(INSERT test_plugin_sources 0
               ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/securitypolicy_openssl_common.h
               ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/securitypolicy_openssl_common.c
               ${PROJECT_SOURCE_DIR}/plugins/crypto/openssl/ua_openssl_basic128rsa15.c
@@ -213,8 +213,16 @@ function(ua_add_test test_path_relative)
     string(REPLACE "/" ";" QUALIFIED_PATHNAME ${PATH_WITHOUT_EXTENSION})
     list(POP_BACK QUALIFIED_PATHNAME TEST_NAME)
 
-    add_executable(${TEST_NAME} ${test_path_relative} ${ARGN} $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
-    target_link_libraries(${TEST_NAME} ${LIBS})
+    set(options)
+    set(oneValueArgs)
+    set(multiValueArgs EXTRASOURCES EXTRALIBS)
+    cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    add_executable(${TEST_NAME} ${test_path_relative} ${arg_EXTRASOURCES} $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
+    add_dependencies(${TEST_NAME} open62541-testplugins)
+    target_link_libraries(${TEST_NAME} ${LIBS} ${arg_EXTRALIBS})
+    target_compile_definitions(${TEST_NAME} PRIVATE -DUA_UNITTEST)
+    set_target_properties(${TEST_NAME} PROPERTIES FOLDER "tests")
     add_test_valgrind(${TEST_NAME} ${TESTS_BINARY_DIR}/${TEST_NAME})
     if(UA_ENABLE_NODESET_INJECTOR)
         set(UA_NODESETINJECTOR_TEST_NAMES ${TEST_NAME} ${UA_NODESETINJECTOR_TEST_NAMES} PARENT_SCOPE)
@@ -273,13 +281,11 @@ ua_add_test(server/check_services_attributes.c)
 ua_add_test(server/check_services_nodemanagement.c)
 ua_add_test(server/check_server_callbacks.c)
 
-add_executable(check_server_password server/check_server_password.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-target_link_libraries(check_server_password ${LIBS} -lcrypt)
+    ua_add_test(server/check_server_password.c EXTRALIBS -lcrypt)
 else()
-target_link_libraries(check_server_password ${LIBS})
+    ua_add_test(server/check_server_password.c)
 endif()
-add_test_valgrind(server_password ${TESTS_BINARY_DIR}/check_server_password)
 
 if (UA_MULTITHREADING GREATER_EQUAL 100)
     ua_add_test(multithreading/check_mt_addVariableNode.c)
@@ -294,15 +300,15 @@ if (UA_MULTITHREADING GREATER_EQUAL 100)
 endif()
 
 if(UA_ENABLE_METHODCALLS)
-  ua_add_test(server/check_services_call.c)
+    ua_add_test(server/check_services_call.c)
 endif()
 
 if(UA_ENABLE_SUBSCRIPTIONS)
-  ua_add_test(server/check_services_subscriptions.c)
-  ua_add_test(server/check_monitoreditem_filter.c)
+    ua_add_test(server/check_services_subscriptions.c)
+    ua_add_test(server/check_monitoreditem_filter.c)
 if(UA_ENABLE_SUBSCRIPTIONS_EVENTS)
-  ua_add_test(server/check_subscription_events.c)
-  ua_add_test(server/check_subscription_event_filter.c)
+    ua_add_test(server/check_subscription_events.c)
+    ua_add_test(server/check_subscription_event_filter.c)
 endif()
 endif()
 
@@ -320,7 +326,7 @@ ua_add_test(server/check_server_userspace.c)
 ua_add_test(server/check_node_inheritance.c)
 
 if(UA_ENABLE_SUBSCRIPTIONS)
-  ua_add_test(server/check_local_monitored_item.c)
+    ua_add_test(server/check_local_monitored_item.c)
 endif()
 
 if(UA_ENABLE_PUBSUB)
@@ -413,8 +419,8 @@ ua_add_test(client/check_client_async_connect.c)
 ua_add_test(client/check_client_highlevel.c)
 
 if(UA_ENABLE_SUBSCRIPTIONS)
-  ua_add_test(client/check_client_subscriptions.c)
-  ua_add_test(client/check_subscriptionWithactivateSession.c)
+    ua_add_test(client/check_client_subscriptions.c)
+    ua_add_test(client/check_subscriptionWithactivateSession.c)
 endif()
 
 if(UA_ENABLE_HISTORIZING)
@@ -474,7 +480,7 @@ endif()
 
 # Tests for interfaces
 if(UA_NAMESPACE_ZERO STREQUAL "FULL")
-    ua_add_test(server/check_interfaces.c ${NODESET_COMPILER_OUTPUT_DIR}/namespace_tests_interfaces_generated.c)
+    ua_add_test(server/check_interfaces.c EXTRASOURCES ${NODESET_COMPILER_OUTPUT_DIR}/namespace_tests_interfaces_generated.c)
     target_include_directories(check_interfaces PRIVATE ${NODESET_COMPILER_OUTPUT_DIR})
 endif()
 
diff --git a/tests/nodeset-compiler/CMakeLists.txt b/tests/nodeset-compiler/CMakeLists.txt
index 3458c154d8c..c074c2178c3 100644
--- a/tests/nodeset-compiler/CMakeLists.txt
+++ b/tests/nodeset-compiler/CMakeLists.txt
@@ -29,7 +29,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         INTERNAL
     )
 
-    ua_add_test(check_nodeset_compiler_adi.c
+    ua_add_test(check_nodeset_compiler_adi.c EXTRASOURCES
                 ${UA_NODESET_TESTS_DI_SOURCES}
                 ${UA_NODESET_TESTS_ADI_SOURCES}
                 ${UA_TYPES_TESTS_DI_SOURCES}
@@ -47,7 +47,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         INTERNAL
     )
 
-    ua_add_test(check_nodeset_compiler_plc.c
+    ua_add_test(check_nodeset_compiler_plc.c EXTRASOURCES
                 ${UA_NODESET_TESTS_DI_SOURCES}
                 ${UA_NODESET_TESTS_PLC_SOURCES}
                 ${UA_TYPES_TESTS_DI_SOURCES}
@@ -65,7 +65,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
             INTERNAL
     )
 
-    ua_add_test(check_nodeset_compiler_autoid.c
+    ua_add_test(check_nodeset_compiler_autoid.c EXTRASOURCES
                 ${UA_NODESET_TESTS_DI_SOURCES}
                 ${UA_NODESET_TESTS_AUTOID_SOURCES}
                 ${UA_TYPES_TESTS_DI_SOURCES}
@@ -81,7 +81,7 @@ endif()
         FILES_BSD "${PROJECT_SOURCE_DIR}/tests/nodeset-compiler/testtypes.bsd"
 )
 
-ua_add_test(check_nodeset_compiler_optstructs_union.c
+ua_add_test(check_nodeset_compiler_optstructs_union.c EXTRASOURCES
             ${UA_NODESET_TESTS_DI_SOURCES}
             ${UA_NODESET_TESTS_PLC_SOURCES}
             ${UA_TYPES_TESTS_DI_SOURCES}
@@ -100,7 +100,7 @@ if(UA_NAMESPACE_ZERO STREQUAL "FULL")
         DEPENDS "tests-di"
     )
 
-    ua_add_test(check_nodeset_compiler_testnodeset.c
+    ua_add_test(check_nodeset_compiler_testnodeset.c EXTRASOURCES
                 ${UA_NODESET_TESTS_DI_SOURCES}
                 ${UA_NODESET_TESTS_TESTNODESET_SOURCES}
                 ${UA_TYPES_TESTS_DI_SOURCES}

From 6a0ed7d623ddef85f084cfa738b1730ed02eb470 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 3 Feb 2025 21:01:35 +0100
Subject: [PATCH 1779/1963] feat(client): Check if the "CreatedAt" timestamp of
 the SecurityToken matches the current system clock - consistently use
 monotonic clock internally

---
 src/client/ua_client_connect.c            | 30 +++++++++++++++++------
 tests/client/check_client_securechannel.c | 19 ++++++++++++++
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index be433557dac..093cb41e2ec 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -531,13 +531,6 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
         return;
     }
 
-    /* Response.securityToken.revisedLifetime is UInt32 we need to cast it to
-     * DateTime=Int64 we take 75% of lifetime to start renewing as described in
-     * standard */
-    client->nextChannelRenewal = UA_DateTime_nowMonotonic()
-            + (UA_DateTime) (response.securityToken.revisedLifetime
-                    * (UA_Double) UA_DATETIME_MSEC * 0.75);
-
     /* Move the nonce out of the response */
     UA_ByteString_clear(&client->channel.remoteNonce);
     client->channel.remoteNonce = response.serverNonce;
@@ -550,6 +543,29 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
     client->channel.securityToken = response.securityToken;
     client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NEWTOKEN_CLIENT;
 
+    /* Log a warning if the SecurityToken is not "fresh". Use the normal system
+     * clock to do the comparison. */
+    UA_EventLoop *el = client->config.eventLoop;
+    UA_DateTime wallClockNow = el->dateTime_now(el);
+    if(wallClockNow - client->channel.securityToken.createdAt >= UA_DATETIME_SEC * 10 ||
+       wallClockNow - client->channel.securityToken.createdAt <= -UA_DATETIME_SEC * 10)
+        UA_LOG_WARNING_CHANNEL(client->config.logging, &client->channel, "The \"CreatedAt\" "
+                               "timestamp of the received ChannelSecurityToken does not match "
+                               "with the local system clock");
+
+    /* The internal "monotonic" clock is used by the SecureChannel to validate
+     * that the SecurityToken is still valid. The monotonic clock is independent
+     * from the system clock getting changed or synchronized to a master clock
+     * during runtime. */
+    client->channel.securityToken.createdAt = el->dateTime_nowMonotonic(el);
+
+    /* Response.securityToken.revisedLifetime is UInt32, we need to cast it to
+     * DateTime=Int64. After 75% of the lifetime the renewal takes place as
+     * described in standard */
+    client->nextChannelRenewal = client->channel.securityToken.createdAt +
+        (UA_DateTime) (response.securityToken.revisedLifetime *
+                       (UA_Double) UA_DATETIME_MSEC * 0.75);
+
     /* Compute the new local keys. The remote keys are updated when a message
      * with the new SecurityToken is received. */
     retval = UA_SecureChannel_generateLocalKeys(&client->channel);
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index b3fcbc72e8a..e9ee573ae4c 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -255,6 +255,24 @@ START_TEST(SecureChannel_serverCert) {
 }
 END_TEST
 
+/* The monotonic clock is 24h in the future */
+static UA_DateTime
+dateTime_nowMonotonicWithOffset(UA_EventLoop *el) {
+    return UA_DateTime_now() + (UA_DATETIME_SEC * 24 * 3600);
+}
+
+/* Simulate a deviation between the "wallclock" and the monotonic clock */
+START_TEST(SecureChannel_differentMonotonicClock) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Client_delete(client);
+}
+END_TEST
+
 int main(void) {
     TCase *tc_sc = tcase_create("Client SecureChannel");
     tcase_add_checked_fixture(tc_sc, setup, teardown);
@@ -265,6 +283,7 @@ int main(void) {
     tcase_add_test(tc_sc, SecureChannel_reconnect);
     tcase_add_test(tc_sc, SecureChannel_cableunplugged);
     tcase_add_test(tc_sc, SecureChannel_serverCert);
+    tcase_add_test(tc_sc, SecureChannel_differentMonotonicClock);
 
     Suite *s = suite_create("Client");
     suite_add_tcase(s, tc_sc);

From 0ad559eb25d7c5ad51f349697e1fcc2e704bcdfc Mon Sep 17 00:00:00 2001
From: RolfKal <rolf.kalbermatter@kalbermatter.nl>
Date: Wed, 5 Feb 2025 21:56:41 +0100
Subject: [PATCH 1780/1963] fix(tools): Fix regular expression replacement
 parameter escapement

---
 tools/generate_bsd.py             | 2 +-
 tools/nodeset_compiler/nodeset.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/generate_bsd.py b/tools/generate_bsd.py
index 5c6f44f0f76..eac1f5a2b28 100644
--- a/tools/generate_bsd.py
+++ b/tools/generate_bsd.py
@@ -40,7 +40,7 @@
     fileContent = fileContent.decode("utf-8")
 
 # Remove the uax namespace from tags. UaModeler adds this namespace to some elements
-fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\g<1>\g<2>\g<3>>", fileContent)
+fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\\g<1>\\g<2>\\g<3>>", fileContent)
 
 nodesets = dom.parseString(fileContent).getElementsByTagName("UANodeSet")
 if len(nodesets) == 0 or len(nodesets) > 1:
diff --git a/tools/nodeset_compiler/nodeset.py b/tools/nodeset_compiler/nodeset.py
index b8fee666119..7e1c0b41c92 100644
--- a/tools/nodeset_compiler/nodeset.py
+++ b/tools/nodeset_compiler/nodeset.py
@@ -252,7 +252,7 @@ def addNodeSet(self, xmlfile, hidden=False, typesArray="UA_TYPES"):
             fileContent = fileContent.decode("utf-8")
 
         # Remove the uax namespace from tags. UaModeler adds this namespace to some elements
-        fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\g<1>\g<2>\g<3>>", fileContent)
+        fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\\g<1>\\g<2>\\g<3>>", fileContent)
 
         nodesets = dom.parseString(fileContent).getElementsByTagName("UANodeSet")
         if len(nodesets) == 0 or len(nodesets) > 1:
@@ -420,7 +420,7 @@ def generateParser(self, existing, infiles , bsdFile):
                 fileContent = fileContent.decode("utf-8")
 
             # Remove the uax namespace from tags. UaModeler adds this namespace to some elements
-            fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\g<1>\g<2>\g<3>>", fileContent)
+            fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\\g<1>\\g<2>\\g<3>>", fileContent)
 
             nodesets = dom.parseString(fileContent).getElementsByTagName("UANodeSet")
             if len(nodesets) == 0 or len(nodesets) > 1:
@@ -448,7 +448,7 @@ def generateParser(self, existing, infiles , bsdFile):
                 fileContent = fileContent.decode("utf-8")
 
             # Remove the uax namespace from tags. UaModeler adds this namespace to some elements
-            fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\g<1>\g<2>\g<3>>", fileContent)
+            fileContent = re.sub(r"<([/]?)uax:(.+?)([/]?)>", "<\\g<1>\\g<2>\\g<3>>", fileContent)
 
             nodesets = dom.parseString(fileContent).getElementsByTagName("UANodeSet")
             if len(nodesets) == 0 or len(nodesets) > 1:

From 1c69d81e02c1a374b22b80cab303376b955c58ed Mon Sep 17 00:00:00 2001
From: marwinglaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 18 Feb 2025 22:59:17 +0100
Subject: [PATCH 1781/1963] fix(doc) rewrite and overhaul sphinx configuration
 (#7106)

* refactor(docs): add requirements.txt

* refactor(ci): install sphinx from requirements.txt

* refactor(docs): rewrite sphinx' conf.py

* refactor(ci): remove unused build_docs function

* feat(ci): configure dependabot to update sphinx and theme

* feat(docs): show version in project name

* fixup! refactor(docs): rewrite sphinx' conf.py

* feat(docs): try determining git branch to show as version

* fixup! feat(docs): try determining git branch to show as version

* fixup! fixup! feat(docs): try determining git branch to show as version
---
 .github/dependabot.yml           |   4 +
 .github/workflows/doc_upload.yml |   4 +-
 doc/conf.py                      | 291 ++++++-------------------------
 doc/requirements.txt             |   2 +
 tools/ci.sh                      |  13 --
 5 files changed, 57 insertions(+), 257 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6c905a63a0b..008631185d2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,3 +9,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: pip
+    directory: /doc
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/doc_upload.yml b/.github/workflows/doc_upload.yml
index 6ea694a35df..11ae5522105 100644
--- a/.github/workflows/doc_upload.yml
+++ b/.github/workflows/doc_upload.yml
@@ -20,8 +20,8 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y -qq python3-sphinx graphviz texlive-fonts-recommended texlive-latex-extra texlive-plain-generic texlive-latex-recommended latexmk texlive-fonts-extra
-          pip install sphinx-rtd-theme
+          sudo apt-get install -y -qq graphviz texlive-fonts-recommended texlive-latex-extra texlive-plain-generic texlive-latex-recommended latexmk texlive-fonts-extra
+          pip install -r doc/requirements.txt
       - name: Build Documentation
         run: source tools/ci.sh && build_docs_pdf
       - name: Checkout Website Repository
diff --git a/doc/conf.py b/doc/conf.py
index 768945d04bd..09348568526 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,215 +1,71 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this 
+# License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# -*- coding: utf-8 -*-
+# Configuration file for the Sphinx documentation builder.
 #
-# open62541 documentation build configuration file, created by
-# sphinx-quickstart on Sat May 23 19:39:37 2015.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-import os
-import shlex
-import sphinx_rtd_theme
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = ['sphinx.ext.graphviz']
-
-numfig = True
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'toc'
+# For the full list of built-in configuration values, see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
 
-# General information about the project.
-project = u'open62541'
-author = u'The open62541 authors'
+import subprocess
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}"
-# The full version, including alpha/beta/rc tags.
-release = "${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}${OPEN62541_VER_LABEL}"
-# The full version, including alpha/beta/rc tags.
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = "en"
 
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+def try_get_branch():
+    try:
+        git_res = subprocess.run(['git', 'branch', '--show-current'], capture_output=True, text=True)
+        if git_res.returncode != 0:
+            return None
+        return git_res.stdout.rstrip()
+    except OSError:
+        return None
 
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-#exclude_patterns = ["client_config.rst", "server_config.rst"]
 
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
+# -- Project information -----------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+version = try_get_branch() or '${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}' or "unknown"
+release = '${OPEN62541_VER_MAJOR}.${OPEN62541_VER_MINOR}.${OPEN62541_VER_PATCH}${OPEN62541_VER_LABEL}'
 
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
+project = 'open62541 (' + version + ')'
+copyright = '2025, The open62541 authors'
+author = 'The open62541 authors'
 
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
+# -- General configuration ---------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
 
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+extensions = [
+    'sphinx.ext.graphviz',
+    'sphinx_rtd_theme',
+]
 
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+templates_path = ['_templates']
+exclude_patterns = []
 
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+language = 'en'
 
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
+master_doc = 'toc'
 
+numfig = True
 
-# -- Options for HTML output ----------------------------------------------
+# -- Options for HTML output -------------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
 html_theme = 'sphinx_rtd_theme'
+html_static_path = ['_static']
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-html_logo = "open62541_html.png"
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['.']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-html_use_smartypants = True
+html_logo = 'open62541_html.png'
 
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+pygments_style = 'sphinx' # TODO makes code blocks ugly (overrides sphinx_rtd_theme)
 
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Language to be used for generating the HTML full-text search index.
-# Sphinx supports the following languages:
-#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
-#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-#html_search_language = 'en'
-
-# A dictionary with options for the search language support, empty by default.
-# Now only 'ja' uses this config value
-#html_search_options = {'type': 'default'}
-
-# The name of a javascript file (relative to the configuration directory) that
-# implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
+# -- Options for LaTeX output ---------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-latex-output
 
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'doc/open62541doc'
+latex_logo = 'open62541.png'
 
-# -- Options for LaTeX output ---------------------------------------------
+latex_documents = [
+  # (startdocname,   targetname,      title,                     author, theme,    toctree_only)
+    (master_doc,     'open62541.tex', 'open62541 Documentation', author, 'manual', False),
+]
 
 latex_elements = {
 # The paper size ('letterpaper' or 'a4paper').
@@ -267,67 +123,18 @@
 #'figure_align': 'htbp',
 }
 
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  (master_doc, 'open62541.tex', u'open62541 Documentation',
-   u'The open62541 authors', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-latex_logo = "open62541.png"
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
 # -- Options for manual page output ---------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-manual-page-output
 
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'open62541', u'open62541 Documentation',
-     [author], 1)
+  # (source start file, name,        description,               authors,  manual section)
+    (master_doc,        'open62541', 'open62541 Documentation', [author], 1)
 ]
 
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
 # -- Options for Texinfo output -------------------------------------------
+# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-texinfo-output
 
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'open62541', u'open62541 Documentation',
-   author, 'open62541', 'One line description of project.',
-   'Miscellaneous'),
+# (source start file, target name, title,                     author, dir menu entry, description,                        category)
+  (master_doc,        'open62541', 'open62541 Documentation', author, 'open62541',    'One line description of project.', 'Miscellaneous'),
 ]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000000..52635ffbecb
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,2 @@
+sphinx >= 5.3, < 9
+sphinx-rtd-theme >= 1.2, < 4
diff --git a/tools/ci.sh b/tools/ci.sh
index 42fc9dbc6a7..3f73d1dfc0d 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -27,19 +27,6 @@ function cpplint {
     make ${MAKEOPTS} cpplint
 }
 
-#######################
-# Build Documentation #
-#######################
-
-function build_docs {
-    mkdir -p build; cd build; rm -rf *
-    cmake -DCMAKE_BUILD_TYPE=Release \
-          -DUA_BUILD_EXAMPLES=ON \
-          -DUA_FORCE_WERROR=ON \
-          ..
-    make doc
-}
-
 #####################################
 # Build Documentation including PDF #
 #####################################

From b3f73d3ea525e73433b8f27302b338b9988aafab Mon Sep 17 00:00:00 2001
From: Noel Graf <69737119+NoelGraf@users.noreply.github.com>
Date: Wed, 19 Feb 2025 14:12:40 +0100
Subject: [PATCH 1782/1963] refactor(ex): Move the server json configuration
 example to the examples folder (#7116)

---
 examples/CMakeLists.txt                                         | 2 +-
 .../server_file_based_config.c                                  | 0
 .../json_config/server_json_config.json5                        | 0
 tools/ci.sh                                                     | 2 +-
 tools/examples_with_valgrind.py                                 | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename examples/{file_based_server => json_config}/server_file_based_config.c (100%)
 rename plugins/server_config.json5 => examples/json_config/server_json_config.json5 (100%)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index ecb0ba303eb..1bfa30e9b00 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -157,7 +157,7 @@ add_example(server_inheritance server_inheritance.c)
 add_example(server_loglevel server_loglevel.c)
 
 if(UA_ENABLE_JSON_ENCODING)
-    add_example(server_file_based_config file_based_server/server_file_based_config.c)
+    add_example(server_file_based_config json_config/server_file_based_config.c)
 endif()
 
 if(UA_ENABLE_HISTORIZING)
diff --git a/examples/file_based_server/server_file_based_config.c b/examples/json_config/server_file_based_config.c
similarity index 100%
rename from examples/file_based_server/server_file_based_config.c
rename to examples/json_config/server_file_based_config.c
diff --git a/plugins/server_config.json5 b/examples/json_config/server_json_config.json5
similarity index 100%
rename from plugins/server_config.json5
rename to examples/json_config/server_json_config.json5
diff --git a/tools/ci.sh b/tools/ci.sh
index 3f73d1dfc0d..0dd365af98f 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -365,7 +365,7 @@ function examples_valgrind {
     python3 ../tools/certs/create_self-signed.py -c client
 
     # copy json server config
-    cp ../plugins/server_config.json5 server_config.json5
+    cp ../examples/json_config/server_json_config.json5 server_json_config.json5
 
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
diff --git a/tools/examples_with_valgrind.py b/tools/examples_with_valgrind.py
index fc80a88186a..3f86b3aa143 100644
--- a/tools/examples_with_valgrind.py
+++ b/tools/examples_with_valgrind.py
@@ -17,7 +17,7 @@
         "server_encryption":"server_cert.der server_key.der client_cert.der",
         "server_loglevel":"--loglevel=1",
         "ci_server":"4840 server_cert.der server_key.der client_cert.der",
-        "server_file_based_config":"server_config.json5"
+        "server_file_based_config":"server_json_config.json5"
         }
 
 server_needed_examples = {

From 29bd3d9840f1efa8723319349a90fb257fc40e86 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Tue, 18 Feb 2025 14:40:18 +0100
Subject: [PATCH 1783/1963] fix(pubsub): Correct documentation of beforeWrite
 callback

Remove a misleading comment about the content of the variable
externalDataValue in the PubSub beforeWrite callback.
The beforeWrite callback is called with the data pointer containing the
data before the update. It may be used for a double buffer
implementation.
The original code change that changed the usage of the beforeWrite
callback was done with commit
06da5d07bd9a653d32e7a6ed06deae994d29953c.
---
 CHANGELOG                         | 13 +++++++++++++
 include/open62541/server_pubsub.h |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index bfb988edd63..3361721d49a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,19 @@
 This changelog reports changes visible through the public API. Internal refactorings and bug
 fixes are not reported here.
 
+2025-02-18 Andreas Eckerstorfer <estr at keba.com>
+
+ * PubSub beforeWrite callback
+
+   A misleading comment about the content of the variable
+   externalDataValue in the PubSub beforeWrite callback has been
+   removed. Please review your beforeWrite callback implementation.
+   The beforeWrite callback is called with the data pointer
+   containing the data before the update. It may be used for a
+   double buffer implementation.
+   The original code change was done with commit
+   06da5d07bd9a653d32e7a6ed06deae994d29953c.
+
 2023-07-02 Jonas Green <jgr at hms.se>
 
  * Decoding variant with array of structure
diff --git a/include/open62541/server_pubsub.h b/include/open62541/server_pubsub.h
index 615b729da6a..bbc61d3a984 100644
--- a/include/open62541/server_pubsub.h
+++ b/include/open62541/server_pubsub.h
@@ -652,7 +652,7 @@ typedef struct {
     /* If realtime-handling is required, set this pointer non-NULL and it will be used
      * to memcpy the value instead of using the Write service.
      * If the beforeWrite method pointer is set, it will be called before a memcpy update
-     * to the value. But param externalDataValue already contains the new value.
+     * to the value.
      * If the afterWrite method pointer is set, it will be called after a memcpy update
      * to the value. */
     UA_DataValue **externalDataValue;

From 823a98d5ac3b197fce9e991c88e33364f1140f7a Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 14 Feb 2025 14:05:13 +0100
Subject: [PATCH 1784/1963] feat(tools): Installation of the generated
 autoinject library

---
 CMakeLists.txt                                |  1 +
 examples/CMakeLists.txt                       |  1 +
 examples/nodeset/CMakeLists.txt               |  1 +
 tools/cmake/open62541Macros.cmake             |  6 +++
 tools/nodeset_injector/CMakeLists.txt         | 39 +++++++++++++++++--
 .../autoinjectConfig.cmake.in                 |  4 ++
 6 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 tools/nodeset_injector/autoinjectConfig.cmake.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0e9d75e2a5..cdd05b9059f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1280,6 +1280,7 @@ if(UA_ENABLE_NODESET_INJECTOR)
                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h)
     set(UA_NODESETINJECTOR_GENERATORS "")
     set(UA_NODESETINJECTOR_SOURCE_FILES "")
+    set(UA_NODESETINJECTOR_HEADER_FILES "")
     set(UA_NODESETINJECTOR_EXAMPLE_NAMES "")
     set(UA_NODESETINJECTOR_TEST_NAMES "")
 endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 1bfa30e9b00..92ea8242b4c 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -264,5 +264,6 @@ endif()
 if(UA_ENABLE_NODESET_INJECTOR)
     set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
     set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+    set(UA_NODESETINJECTOR_HEADER_FILES ${UA_NODESETINJECTOR_HEADER_FILES} PARENT_SCOPE)
     set(UA_NODESETINJECTOR_EXAMPLE_NAMES ${UA_NODESETINJECTOR_EXAMPLE_NAMES} PARENT_SCOPE)
 endif()
diff --git a/examples/nodeset/CMakeLists.txt b/examples/nodeset/CMakeLists.txt
index e03719455ab..9de9ebb0898 100644
--- a/examples/nodeset/CMakeLists.txt
+++ b/examples/nodeset/CMakeLists.txt
@@ -126,5 +126,6 @@ endif()
 if(UA_ENABLE_NODESET_INJECTOR)
     set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
     set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+    set(UA_NODESETINJECTOR_HEADER_FILES ${UA_NODESETINJECTOR_HEADER_FILES} PARENT_SCOPE)
     set(UA_NODESETINJECTOR_EXAMPLE_NAMES ${UA_NODESETINJECTOR_EXAMPLE_NAMES} PARENT_SCOPE)
 endif()
diff --git a/tools/cmake/open62541Macros.cmake b/tools/cmake/open62541Macros.cmake
index 9ce8261366d..6e08a7a31d5 100644
--- a/tools/cmake/open62541Macros.cmake
+++ b/tools/cmake/open62541Macros.cmake
@@ -248,6 +248,8 @@ function(ua_generate_datatypes)
         set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
         list(APPEND UA_NODESETINJECTOR_SOURCE_FILES  ${PROJECT_BINARY_DIR}/src_generated/open62541/${UA_GEN_DT_NAME}_generated.c)
         set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+        list(APPEND UA_NODESETINJECTOR_HEADER_FILES  ${PROJECT_BINARY_DIR}/src_generated/open62541/${UA_GEN_DT_NAME}_generated.h)
+        set(UA_NODESETINJECTOR_HEADER_FILES ${UA_NODESETINJECTOR_HEADER_FILES} PARENT_SCOPE)
     endif()
 
     string(TOUPPER "${UA_GEN_DT_NAME}" GEN_NAME_UPPER)
@@ -460,6 +462,9 @@ function(ua_generate_nodeset)
 
                 list(APPEND UA_NODESETINJECTOR_SOURCE_FILES  ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c)
                 set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+
+                list(APPEND UA_NODESETINJECTOR_HEADER_FILES  ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h)
+                set(UA_NODESETINJECTOR_HEADER_FILES ${UA_NODESETINJECTOR_HEADER_FILES} PARENT_SCOPE)
             endif()
         endif()
     endif()
@@ -713,4 +718,5 @@ function(ua_generate_nodeset_and_datatypes)
 
     set(UA_NODESETINJECTOR_GENERATORS ${UA_NODESETINJECTOR_GENERATORS} PARENT_SCOPE)
     set(UA_NODESETINJECTOR_SOURCE_FILES ${UA_NODESETINJECTOR_SOURCE_FILES} PARENT_SCOPE)
+    set(UA_NODESETINJECTOR_HEADER_FILES ${UA_NODESETINJECTOR_HEADER_FILES} PARENT_SCOPE)
 endfunction()
diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
index b1d6b8d8574..e2da533f849 100644
--- a/tools/nodeset_injector/CMakeLists.txt
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -283,11 +283,42 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
 endforeach()
 
 
-add_library(autoinject_library ${UA_NODESETINJECTOR_SOURCE_FILES} ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c)
-target_link_libraries(autoinject_library open62541)
+add_library(autoinject ${UA_NODESETINJECTOR_SOURCE_FILES} ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c)
+set_target_properties(autoinject PROPERTIES PUBLIC_HEADER "${UA_NODESETINJECTOR_HEADER_FILES}")
+target_link_libraries(autoinject open62541)
+
+# Create alias so that it can be found under open62541::autoinject
+add_library(open62541::autoinject ALIAS autoinject)
+
+# Define installation for the library
+install(TARGETS autoinject
+        EXPORT open62541Targets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/autoinject
+        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+install(EXPORT open62541Targets
+        FILE open62541Targets.cmake
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/open62541"
+        NAMESPACE open62541::)
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/autoinjectConfig.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/autoinjectConfig.cmake
+        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/open62541
+)
+
+install(FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/autoinjectConfig.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/open62541
+)
+
 foreach(EXAMPLE_NAME ${UA_NODESETINJECTOR_EXAMPLE_NAMES})
     if(UA_NODESETINJECTOR_GENERATORS)
-        target_link_libraries(${EXAMPLE_NAME} autoinject_library)
+        target_link_libraries(${EXAMPLE_NAME} autoinject)
         add_dependencies(${EXAMPLE_NAME} ${UA_NODESETINJECTOR_GENERATORS})
     endif()
 endforeach()
@@ -295,7 +326,7 @@ endforeach()
 if(UA_BUILD_UNIT_TESTS)
     foreach(TEST_NAME ${UA_NODESETINJECTOR_TEST_NAMES})
         if(UA_NODESETINJECTOR_GENERATORS)
-            target_link_libraries(${TEST_NAME} autoinject_library)
+            target_link_libraries(${TEST_NAME} autoinject)
             add_dependencies(${TEST_NAME} ${UA_NODESETINJECTOR_GENERATORS})
         endif()
     endforeach()
diff --git a/tools/nodeset_injector/autoinjectConfig.cmake.in b/tools/nodeset_injector/autoinjectConfig.cmake.in
new file mode 100644
index 00000000000..800078b546f
--- /dev/null
+++ b/tools/nodeset_injector/autoinjectConfig.cmake.in
@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/open62541Targets.cmake")
+check_required_components(open62541)

From dbd2844f75c0abb38f3335dbecb2789e85582ed9 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 14 Feb 2025 15:23:16 +0100
Subject: [PATCH 1785/1963] feat(doc): Extended documentation for the
 NodesetInjector feature

---
 doc/nodeset_compiler.rst | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/nodeset_compiler.rst b/doc/nodeset_compiler.rst
index 9cf7712cc4f..ebb5c6adbb0 100644
--- a/doc/nodeset_compiler.rst
+++ b/doc/nodeset_compiler.rst
@@ -518,3 +518,23 @@ The following nodesets are currently supported:
 DI, CNC, ISA95-JOBCONTROL, OpenSCS, AMB, AutoID, POWERLINK, IA, Machinery,
 PackML, PNEM, PLCopen, MachineTool, PROFINET, MachineVision, FDT,
 CommercialKitchenEquipment, PNRIO, Scales, Weihenstephan, Pumps, CAS, TMC, IJT
+
+When the open62541 library is installed on the system, the automatically generated autoinject library is installed alongside it.
+Additionally, the header files for the specified nodesets will be accessible on the system.
+
+Integrating the autoinject library into an existing CMake project is straightforward.
+To achieve this, the CMake configuration should include the following:
+
+.. code-block:: cmake
+
+    set(open62541_LIBRARIES "")
+    find_package(open62541 REQUIRED)
+    list(APPEND open62541_LIBRARIES open62541::open62541 open62541::autoinject)
+
+The generated namespace header files can also be included and used with the following code:
+
+.. code-block:: c
+
+    #include <autoinject/namespace_di_generated.h>
+    #include <autoinject/namespace_amb_generated.h>
+    #include <autoinject/namespace_machinery_generated.h>

From 4f16121d38ce21d18af43e136a6c6fdb65d193d6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 22 Feb 2025 04:31:48 +0100
Subject: [PATCH 1786/1963] refactor(server): Collect async responses only once
 per second

---
 src/server/ua_server_async.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index d9aca065db6..cb4166e7803 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -178,7 +178,7 @@ UA_AsyncManager_init(UA_AsyncManager *am, UA_Server *server) {
     /* Add a regular callback for cleanup and sending finished responses at a
      * 100s interval. */
     addRepeatedCallback(server, (UA_ServerCallback)checkTimeouts,
-                        NULL, 100.0, &am->checkTimeoutCallbackId);
+                        NULL, 1000.0, &am->checkTimeoutCallbackId);
 }
 
 void

From c4193c53f5c3a3f38e6926d4fc04822d0cbbdffd Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 6 Mar 2025 17:34:47 +0100
Subject: [PATCH 1787/1963] fix(arch): Batch timed events by slightly adjusting
 the "nextTime" timestamp

This prevents frequent calls to (e)poll with near-zero timeout values.
This was reported in #7102.
---
 arch/common/ua_timer.c | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/arch/common/ua_timer.c b/arch/common/ua_timer.c
index 438e5eb5d96..75fb07dad52 100644
--- a/arch/common/ua_timer.c
+++ b/arch/common/ua_timer.c
@@ -49,6 +49,29 @@ UA_Timer_init(UA_Timer *t) {
     UA_LOCK_INIT(&t->timerMutex);
 }
 
+/* Global variables, only used behind the mutex */
+static UA_DateTime earliest, latest, adjustedNextTime;
+
+static void *
+findTimer2Batch(void *context, UA_TimerEntry *compare) {
+    UA_TimerEntry *te = (UA_TimerEntry*)context;
+
+    /* NextTime deviation within interval? */
+    if(compare->nextTime < earliest || compare->nextTime > latest)
+        return NULL;
+
+    /* Check if one interval is a multiple of the other */
+    if(te->interval < compare->interval && compare->interval % te->interval != 0)
+        return NULL;
+    if(te->interval > compare->interval && te->interval % compare->interval != 0)
+        return NULL;
+
+    adjustedNextTime = compare->nextTime; /* Candidate found */
+
+    /* Abort when a perfect match is found */
+    return (te->interval == compare->interval) ? te : NULL;
+}
+
 static UA_StatusCode
 addCallback(UA_Timer *t, UA_ApplicationCallback callback, void *application,
             void *data, UA_DateTime nextTime, UA_UInt64 interval,
@@ -63,7 +86,7 @@ addCallback(UA_Timer *t, UA_ApplicationCallback callback, void *application,
         return UA_STATUSCODE_BADOUTOFMEMORY;
 
     /* Set the repeated callback */
-    te->interval = (UA_UInt64)interval;
+    te->interval = interval;
     te->id = ++t->idCounter;
     te->callback = callback;
     te->application = application;
@@ -71,6 +94,20 @@ addCallback(UA_Timer *t, UA_ApplicationCallback callback, void *application,
     te->nextTime = nextTime;
     te->timerPolicy = timerPolicy;
 
+    /* Adjust the nextTime to batch cyclic callbacks. Look in an interval around
+     * the original nextTime. Deviate from the original nextTime by at most 1/4
+     * of the interval and at most by 1s. */
+    if(timerPolicy == UA_TIMER_HANDLE_CYCLEMISS_WITH_CURRENTTIME && interval != 0) {
+        UA_UInt64 deviate = te->interval / 4;
+        if(deviate > UA_DATETIME_SEC)
+            deviate = UA_DATETIME_SEC;
+        earliest = te->nextTime - deviate;
+        latest = te->nextTime + deviate;
+        adjustedNextTime = te->nextTime;
+        ZIP_ITER(UA_TimerIdTree, &t->idTree, findTimer2Batch, te);
+        te->nextTime = adjustedNextTime;
+    }
+
     /* Set the output identifier */
     if(callbackId)
         *callbackId = te->id;

From 622318fcca8851a8d32811997da65c87222e5f0c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 6 Mar 2025 17:38:01 +0100
Subject: [PATCH 1788/1963] refactor(server): Set the max timeout value for the
 EventLoop to 500ms

---
 src/server/ua_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index d085ab5dff9..c64ed55b039 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -647,7 +647,7 @@ UA_Server_getStatistics(UA_Server *server) {
 /* Main Server Loop */
 /********************/
 
-#define UA_MAXTIMEOUT 200 /* Max timeout in ms between main-loop iterations */
+#define UA_MAXTIMEOUT 500 /* Max timeout in ms between main-loop iterations */
 
 void
 setServerLifecycleState(UA_Server *server, UA_LifecycleState state) {

From cdb5fa035b1a123703fe84cec29b22057eadbf72 Mon Sep 17 00:00:00 2001
From: estr Eckerstorfer Andreas <estr@keba.com>
Date: Mon, 10 Mar 2025 07:38:08 +0100
Subject: [PATCH 1789/1963] fix(server): Fix comment about timeout interval

The interval for checking for timeout of asynchronous operations
is 1 second, not 100 seconds.
---
 src/server/ua_server_async.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index cb4166e7803..6e0e31321f0 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -176,7 +176,7 @@ UA_AsyncManager_init(UA_AsyncManager *am, UA_Server *server) {
     UA_LOCK_INIT(&am->queueLock);
 
     /* Add a regular callback for cleanup and sending finished responses at a
-     * 100s interval. */
+     * 1s interval. */
     addRepeatedCallback(server, (UA_ServerCallback)checkTimeouts,
                         NULL, 1000.0, &am->checkTimeoutCallbackId);
 }

From 2aa764b640c3f049e71e64661ff10eb1f513878c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 14 Mar 2025 21:08:14 +0100
Subject: [PATCH 1790/1963] refactor(build): Bump version to v1.4.11

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdd05b9059f..bc3f94b54a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 10)
+set(OPEN62541_VER_PATCH 11)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 491667a5788c9479682bbb7ce8c557428da88770 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 3 Feb 2025 21:01:35 +0100
Subject: [PATCH 1791/1963] feat(client): Check if the "CreatedAt" timestamp of
 the SecurityToken matches the current system clock - consistently use
 monotonic clock internally

---
 src/client/ua_client_connect.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 5048262be47..84e85b7cffc 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -396,13 +396,6 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
         return;
     }
 
-    /* Response.securityToken.revisedLifetime is UInt32 we need to cast it to
-     * DateTime=Int64 we take 75% of lifetime to start renewing as described in
-     * standard */
-    client->nextChannelRenewal = UA_DateTime_nowMonotonic()
-            + (UA_DateTime) (response.securityToken.revisedLifetime
-                    * (UA_Double) UA_DATETIME_MSEC * 0.75);
-
     /* Move the nonce out of the response */
     UA_ByteString_clear(&client->channel.remoteNonce);
     client->channel.remoteNonce = response.serverNonce;
@@ -415,6 +408,28 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
     client->channel.securityToken = response.securityToken;
     client->channel.renewState = UA_SECURECHANNELRENEWSTATE_NEWTOKEN_CLIENT;
 
+    /* Log a warning if the SecurityToken is not "fresh". Use the normal system
+     * clock to do the comparison. */
+    UA_DateTime wallClockNow = UA_DateTime_now();
+    if(wallClockNow - client->channel.securityToken.createdAt >= UA_DATETIME_SEC * 10 ||
+       wallClockNow - client->channel.securityToken.createdAt <= -UA_DATETIME_SEC * 10)
+        UA_LOG_WARNING_CHANNEL(&client->config.logger, &client->channel, "The \"CreatedAt\" "
+                               "timestamp of the received ChannelSecurityToken does not match "
+                               "with the local system clock");
+
+    /* The internal "monotonic" clock is used by the SecureChannel to validate
+     * that the SecurityToken is still valid. The monotonic clock is independent
+     * from the system clock getting changed or synchronized to a master clock
+     * during runtime. */
+    client->channel.securityToken.createdAt = UA_DateTime_nowMonotonic();
+
+    /* Response.securityToken.revisedLifetime is UInt32, we need to cast it to
+     * DateTime=Int64. After 75% of the lifetime the renewal takes place as
+     * described in standard */
+    client->nextChannelRenewal = client->channel.securityToken.createdAt +
+        (UA_DateTime) (response.securityToken.revisedLifetime *
+                       (UA_Double) UA_DATETIME_MSEC * 0.75);
+
     /* Compute the new local keys. The remote keys are updated when a message
      * with the new SecurityToken is received. */
     retval = UA_SecureChannel_generateLocalKeys(&client->channel);

From 5ec7bef0922a29de62a76ccb90a040091ba07f2b Mon Sep 17 00:00:00 2001
From: klausholstjacobsen <klaus.holst.jacobsen@gmail.com>
Date: Tue, 3 Dec 2024 20:24:12 +0100
Subject: [PATCH 1792/1963] fix(arch): Add qnx support

---
 arch/eventloop_posix.h        |  5 ++++-
 arch/eventloop_posix_udp.c    | 11 +++++++----
 include/open62541/config.h.in | 10 ++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/arch/eventloop_posix.h b/arch/eventloop_posix.h
index 4c296b29e95..705d76b1737 100644
--- a/arch/eventloop_posix.h
+++ b/arch/eventloop_posix.h
@@ -23,7 +23,10 @@
 
 #include "common/ua_timer.h"
 #include "../deps/mp_printf.h"
-#include "../deps/open62541_queue.h"
+
+#if !defined(__QNX__)
+# include "../deps/open62541_queue.h"
+#endif
 
 /* epoll_pwait returns bogus data with the tc compiler */
 #if defined(__linux__) && !defined(__TINYC__)
diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 1f0a0239993..8d111ac9ebf 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -65,7 +65,7 @@ typedef enum {
 } MultiCastType;
 
 typedef union {
-#ifdef UA_ARCHITECTURE_WIN32
+#if !defined(ip_mreqn)
     struct ip_mreq ipv4;
 #else
     struct ip_mreqn ipv4;
@@ -221,12 +221,15 @@ setMulticastInterface(const char *netif, struct addrinfo *info,
         return UA_STATUSCODE_BADINTERNALERROR;
 
     /* Write the interface index */
-    if(info->ai_family == AF_INET)
+    if(info->ai_family == AF_INET) {
+#if defined(ip_mreqn)
         req->ipv4.imr_ifindex = idx;
+#endif
 #if UA_IPV6
-    else /* if(info->ai_family == AF_INET6) */
+    } else { /* if(info->ai_family == AF_INET6) */
         req->ipv6.ipv6mr_interface = idx;
 #endif
+    }
     return UA_STATUSCODE_GOOD;
 }
 
@@ -239,7 +242,7 @@ setupMulticastRequest(UA_FD socket, MulticastRequest *req, const UA_KeyValueMap
     if(info->ai_family == AF_INET) {
         struct sockaddr_in *sin = (struct sockaddr_in *)info->ai_addr;
         req->ipv4.imr_multiaddr = sin->sin_addr;
-#ifdef UA_ARCHITECTURE_WIN32
+#if !defined(ip_mreqn)
         req->ipv4.imr_interface.s_addr = htonl(INADDR_ANY); /* default ANY */
 #else
         req->ipv4.imr_address.s_addr = htonl(INADDR_ANY); /* default ANY */
diff --git a/include/open62541/config.h.in b/include/open62541/config.h.in
index c47b999e6d7..ed58f47d743 100644
--- a/include/open62541/config.h.in
+++ b/include/open62541/config.h.in
@@ -121,6 +121,16 @@
 # endif
 #endif
 
+
+/**
+ * QNX Flags
+ * -------------------
+ * Defining _QNX_SOURCE will ensure proper qnx types and other features 
+ * are available. */
+#if defined(__QNX__)
+# define _QNX_SOURCE 1
+#endif
+
 /**
  * POSIX Feature Flags
  * -------------------

From c377d97691910284aadd5951c4430890f1c8c1aa Mon Sep 17 00:00:00 2001
From: klausholstjacobsen <klaus.holst.jacobsen@gmail.com>
Date: Fri, 17 Jan 2025 07:27:33 +0100
Subject: [PATCH 1793/1963] feat(arch): added qnx to readme file

---
 arch/Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/Readme.md b/arch/Readme.md
index d3a23cdb3ea..5ab8c3acc51 100644
--- a/arch/Readme.md
+++ b/arch/Readme.md
@@ -9,7 +9,7 @@ The arch-specific code covers:
 Currently open62541 supports
 
 - Windows
-- POSIX (Linux, BSD, Mac, etc.)
+- POSIX (Linux, BSD, Mac, QNX, etc.)
 
 Previously (until v1.3) there was additional support for:
 

From c5f59df0a1a38632e96cef13222c2cab0cde6bf0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 22 Mar 2025 20:44:56 +0100
Subject: [PATCH 1794/1963] refactor(build): Simplify the hardened build setup
 / Remove workaround for CMake < 3.9

---
 CMakeLists.txt | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc3f94b54a5..e8f2e0c2981 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -629,29 +629,18 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") # GCC and Clang, possibly more
     endif()
 
-    if(NOT MINGW AND NOT UA_BUILD_OSS_FUZZ)
-        if(UA_ENABLE_HARDENING)
-            check_add_cc_flag("-fstack-protector-strong") # more performant stack protector, available since gcc 4.9
-            check_add_cc_flag("-fstack-clash-protection") # increased reliability of stack overflow detection, available since gcc 8
-            # future use (control flow integrity protection)
-            if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-                check_add_cc_flag("-mcet")
-                check_add_cc_flag("-fcf-protection")
-            endif()
-        endif()
-
-        # IPO requires too much memory for unit tests
-        # GCC docu recommends to compile all files with the same options, therefore ignore it completely
-        if(NOT UA_BUILD_UNIT_TESTS AND NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-            # needed to check if IPO is supported (check needs cmake > 3.9)
-            if("${CMAKE_VERSION}" VERSION_GREATER 3.9)
-                cmake_policy(SET CMP0069 NEW) # needed as long as required cmake < 3.9
-                include(CheckIPOSupported)
-                check_ipo_supported(RESULT CC_HAS_IPO) # Inter Procedural Optimization / Link Time Optimization (should be same as -flto)
-                if(CC_HAS_IPO)
-                    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
-                endif()
-            endif()
+    if(UA_ENABLE_HARDENING)
+        check_add_cc_flag("-fhardened") # See the GCC docs on which precise flags this enables
+    endif()
+
+    # Inter Procedural Optimization / Link Time Optimization (should be same as -flto)
+    # IPO requires too much memory for unit tests
+    # GCC docu recommends to compile all files with the same options, therefore ignore it completely
+    if(NOT UA_BUILD_UNIT_TESTS AND NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
+        include(CheckIPOSupported)
+        check_ipo_supported(RESULT CC_HAS_IPO)
+        if(CC_HAS_IPO)
+            set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
         endif()
     endif()
 
@@ -676,10 +665,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_FLAGS}")
     endif()
 
-    if(NOT MINGW AND UA_ENABLE_HARDENING AND ((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")))
-        check_add_cc_flag("-D_FORTIFY_SOURCE=2") # run-time buffer overflow detection (needs at least -O1)
-    endif()
-
     # Strip release builds
     if(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel" OR CMAKE_BUILD_TYPE STREQUAL "Release")
         check_add_cc_flag("-ffunction-sections")

From 041d6a21735524355b55bcea93627708b15f09cf Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Mar 2025 20:59:25 +0100
Subject: [PATCH 1795/1963] fix(core): Fix a busy-loop when timeouts are less
 than 1ms (fixes #7102)

---
 arch/eventloop_posix_epoll.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/arch/eventloop_posix_epoll.c b/arch/eventloop_posix_epoll.c
index fe25fd8a26e..26a978b4160 100644
--- a/arch/eventloop_posix_epoll.c
+++ b/arch/eventloop_posix_epoll.c
@@ -68,12 +68,20 @@ UA_StatusCode
 UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
     UA_assert(listenTimeout >= 0);
 
+    /* If there is a positive timeout, wait at least one millisecond, the
+     * minimum for blocking epoll_wait. This prevents a busy-loop, as the
+     * open62541 library allows even smaller timeouts, which can result in a
+     * zero timeout due to rounding to an integer here. */
+    int timeout = (int)(listenTimeout / UA_DATETIME_MSEC);
+    if(timeout == 0 && listenTimeout > 0)
+        timeout = 1;
+
     /* Poll the registered sockets */
     struct epoll_event epoll_events[64];
-    int epollfd = el->epollfd;
     UA_UNLOCK(&el->elMutex);
-    int events = epoll_wait(epollfd, epoll_events, 64,
-                            (int)(listenTimeout / UA_DATETIME_MSEC));
+    int events = epoll_wait(el->epollfd, epoll_events, 64, timeout);
+    UA_LOCK(&el->elMutex);
+
     /* TODO: Replace with pwait2 for higher-precision timeouts once this is
      * available in the standard library.
      *
@@ -83,7 +91,6 @@ UA_EventLoopPOSIX_pollFDs(UA_EventLoopPOSIX *el, UA_DateTime listenTimeout) {
      * };
      * int events = epoll_pwait2(epollfd, epoll_events, 64,
      *                        precisionTimeout, NULL); */
-    UA_LOCK(&el->elMutex);
 
     /* Handle error conditions */
     if(events == -1) {

From 86e04099fab7eabd26c9c654c0311cf0c5ba2002 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 23 Mar 2025 21:12:53 +0100
Subject: [PATCH 1796/1963] refactor(ci): Disable Debian package builds on
 Azure

These are now built in Debian's Salsa CI infrastructure
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5bf4fffc47d..967a9e2f95a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,4 +9,4 @@ trigger:
 
 jobs:
     - template: ./.azure-pipelines/azure-pipelines-win.yml
-    - template: ./.azure-pipelines/azure-pipelines-dist.yml
\ No newline at end of file
+#    - template: ./.azure-pipelines/azure-pipelines-dist.yml
\ No newline at end of file

From cac50b94619db1c2b433df93a372b48d48314b6e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 25 Mar 2025 12:45:10 +0100
Subject: [PATCH 1797/1963] fix(tests): Increase timeouts for a failing client
 SecureChannel unit test

---
 tests/client/check_client_securechannel.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index e9ee573ae4c..efbbb6f58dc 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -120,7 +120,8 @@ START_TEST(SecureChannel_timeout_fail) {
 
     UA_ClientConfig *cconfig = UA_Client_getConfig(client);
     UA_fakeSleep(cconfig->secureChannelLifeTime + 1);
-    UA_realSleep(200 + 1); // UA_MAXTIMEOUT+1 wait to be sure UA_Server_run_iterate can be completely executed
+    /* TODO: Manually trigger an eventloop iteration (stop sleeping in select) for the server thread */
+    UA_realSleep(500 + 1); // UA_MAXTIMEOUT+1 wait to be sure UA_Server_run_iterate can be completely executed
 
     UA_Variant val;
     UA_Variant_init(&val);

From df61c22fde5f5dd3ac5be21f8f979c48ed70e57a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 25 Mar 2025 16:45:44 +0100
Subject: [PATCH 1798/1963] fix(deps): Update musl time methods. Prefix to
 avoid name clash (fix #7139)

---
 deps/libc_time.c                        | 58 +++++++++++++++++--------
 deps/libc_time.h                        | 11 +++--
 plugins/crypto/openssl/ua_pki_openssl.c |  6 +--
 src/ua_types.c                          | 12 ++---
 src/ua_types_encoding_json.c            |  4 +-
 src/ua_types_encoding_xml.c             |  4 +-
 6 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/deps/libc_time.c b/deps/libc_time.c
index 795aada1bc2..47d3f185ba5 100644
--- a/deps/libc_time.c
+++ b/deps/libc_time.c
@@ -11,11 +11,13 @@
 #define DAYS_PER_100Y (365*100 + 24)
 #define DAYS_PER_4Y   (365*4   + 1)
 
-int __secs_to_tm(long long t, struct mytm *tm) {
+int
+musl_secs_to_tm(long long t, struct musl_tm *tm) {
     long long days, secs, years;
     int remdays, remsecs, remyears;
     int qc_cycles, c_cycles, q_cycles;
     int months;
+    int wday, yday, leap;
     static const char days_in_month[] = {31,30,31,30,31,31,30,31,30,31,31,29};
 
     /* Reject time_t values whose year would overflow int */
@@ -30,6 +32,9 @@ int __secs_to_tm(long long t, struct mytm *tm) {
         --days;
     }
 
+    wday = (3+days)%7;
+    if (wday < 0) wday += 7;
+
     qc_cycles = (int)(days / DAYS_PER_400Y);
     remdays = (int)(days % DAYS_PER_400Y);
     if (remdays < 0) {
@@ -49,21 +54,29 @@ int __secs_to_tm(long long t, struct mytm *tm) {
     if (remyears == 4) --remyears;
     remdays -= remyears * 365;
 
+    leap = !remyears && (q_cycles || !c_cycles);
+    yday = remdays + 31 + 28 + leap;
+    if (yday >= 365+leap) yday -= 365+leap;
+
     years = remyears + 4*q_cycles + 100*c_cycles + 400LL*qc_cycles;
 
-    for (months=0; days_in_month[months] <= remdays; ++months)
+    for (months=0; days_in_month[months] <= remdays; months++)
         remdays -= days_in_month[months];
 
+    if (months >= 10) {
+        months -= 12;
+        years++;
+    }
+
     if (years+100 > INT_MAX || years+100 < INT_MIN)
         return -1;
 
     tm->tm_year = (int)(years + 100);
     tm->tm_mon = months + 2;
-    if (tm->tm_mon >= 12) {
-        tm->tm_mon -=12;
-        ++tm->tm_year;
-    }
     tm->tm_mday = remdays + 1;
+    tm->tm_wday = wday;
+    tm->tm_yday = yday;
+
     tm->tm_hour = remsecs / 3600;
     tm->tm_min = remsecs / 60 % 60;
     tm->tm_sec = remsecs % 60;
@@ -77,7 +90,7 @@ static const int secs_through_month[] =
      243*86400, 273*86400, 304*86400, 334*86400 };
 
 static int
-__month_to_secs(int month, int is_leap) {
+musl_month_to_secs(int month, int is_leap) {
     int t = secs_through_month[month];
     if (is_leap && month >= 2)
         t+=86400;
@@ -85,14 +98,22 @@ __month_to_secs(int month, int is_leap) {
 }
 
 static long long
-__year_to_secs(const long long year, int *is_leap) {
-    int cycles, centuries, leaps, rem;
-    int is_leap_val = 0;
-    if (!is_leap) {
-        is_leap = &is_leap_val;
+musl_year_to_secs(const long long year, int *is_leap) {
+    if (year-2ULL <= 136) {
+        int y = (int)year;
+        int leaps = (y-68)>>2;
+        if (!((y-68)&3)) {
+            leaps--;
+            if (is_leap) *is_leap = 1;
+        } else if (is_leap) *is_leap = 0;
+        return 31536000*(y-70) + 86400*leaps;
     }
+
+    int cycles, centuries, leaps, rem, dummy;
+
+    if (!is_leap) is_leap = &dummy;
     cycles = (int)((year-100) / 400);
-    rem = (int)((year-100) % 400);
+    rem = (year-100) % 400;
     if (rem < 0) {
         cycles--;
         rem += 400;
@@ -113,8 +134,8 @@ __year_to_secs(const long long year, int *is_leap) {
             *is_leap = 0;
             leaps = 0;
         } else {
-            leaps = (rem / (int)4U);
-            rem %= (int)4U;
+            leaps = rem / 4U;
+            rem %= 4U;
             *is_leap = !rem;
         }
     }
@@ -124,7 +145,8 @@ __year_to_secs(const long long year, int *is_leap) {
     return (year-100) * 31536000LL + leaps * 86400LL + 946684800 + 86400;
 }
 
-long long __tm_to_secs(const struct mytm *tm) {
+long long
+musl_tm_to_secs(const struct musl_tm *tm) {
     int is_leap;
     long long year = tm->tm_year;
     int month = tm->tm_mon;
@@ -137,8 +159,8 @@ long long __tm_to_secs(const struct mytm *tm) {
         }
         year += adj;
     }
-    long long t = __year_to_secs(year, &is_leap);
-    t += __month_to_secs(month, is_leap);
+    long long t = musl_year_to_secs(year, &is_leap);
+    t += musl_month_to_secs(month, is_leap);
     t += 86400LL * (tm->tm_mday-1);
     t += 3600LL * tm->tm_hour;
     t += 60LL * tm->tm_min;
diff --git a/deps/libc_time.h b/deps/libc_time.h
index 2c5bd5e5118..89922bc4d3c 100644
--- a/deps/libc_time.h
+++ b/deps/libc_time.h
@@ -1,16 +1,21 @@
 #ifndef LIBC_TIME_H_
 #define LIBC_TIME_H_
 
-struct mytm {
+struct musl_tm {
     int tm_sec;
     int tm_min;
     int tm_hour;
     int tm_mday;
     int tm_mon;
     int tm_year;
+    int tm_wday;
+    int tm_yday;
+    /* int tm_isdst; */
+    /* long __tm_gmtoff; */
+    /* const char *__tm_zone; */
 };
 
-int __secs_to_tm(long long t, struct mytm *tm);
-long long __tm_to_secs(const struct mytm *tm);
+int musl_secs_to_tm(long long t, struct musl_tm *tm);
+long long musl_tm_to_secs(const struct musl_tm *tm);
 
 #endif /* LIBC_TIME_H_ */
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 67b049e7505..da3bc3c73ce 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -808,8 +808,8 @@ UA_GetCertificate_ExpirationDate(UA_DateTime *expiryDateTime,
     ASN1_TIME_to_tm(not_after, &dtTime);
     X509_free(x509);
 
-    struct mytm dateTime;
-    memset(&dateTime, 0, sizeof(struct mytm));
+    struct musl_tm dateTime;
+    memset(&dateTime, 0, sizeof(struct musl_tm));
     dateTime.tm_year = dtTime.tm_year;
     dateTime.tm_mon = dtTime.tm_mon;
     dateTime.tm_mday = dtTime.tm_mday;
@@ -817,7 +817,7 @@ UA_GetCertificate_ExpirationDate(UA_DateTime *expiryDateTime,
     dateTime.tm_min = dtTime.tm_min;
     dateTime.tm_sec = dtTime.tm_sec;
 
-    long long sec_epoch = __tm_to_secs(&dateTime);
+    long long sec_epoch = musl_tm_to_secs(&dateTime);
     *expiryDateTime = UA_DATETIME_UNIX_EPOCH;
     *expiryDateTime += sec_epoch * UA_DATETIME_SEC;
     return UA_STATUSCODE_GOOD;
diff --git a/src/ua_types.c b/src/ua_types.c
index 78e0ab95c99..909b7ecd57f 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -216,9 +216,9 @@ UA_DateTime_toStruct(UA_DateTime t) {
         frac += UA_DATETIME_SEC;
     }
 
-    struct mytm ts;
-    memset(&ts, 0, sizeof(struct mytm));
-    __secs_to_tm(secSinceUnixEpoch, &ts);
+    struct musl_tm ts;
+    memset(&ts, 0, sizeof(struct musl_tm));
+    musl_secs_to_tm(secSinceUnixEpoch, &ts);
 
     UA_DateTimeStruct dateTimeStruct;
     dateTimeStruct.year   = (i16)(ts.tm_year + 1900);
@@ -236,15 +236,15 @@ UA_DateTime_toStruct(UA_DateTime t) {
 UA_DateTime
 UA_DateTime_fromStruct(UA_DateTimeStruct ts) {
     /* Seconds since the Unix epoch */
-    struct mytm tm;
-    memset(&tm, 0, sizeof(struct mytm));
+    struct musl_tm tm;
+    memset(&tm, 0, sizeof(struct musl_tm));
     tm.tm_year = ts.year - 1900;
     tm.tm_mon = ts.month - 1;
     tm.tm_mday = ts.day;
     tm.tm_hour = ts.hour;
     tm.tm_min = ts.min;
     tm.tm_sec = ts.sec;
-    long long sec_epoch = __tm_to_secs(&tm);
+    long long sec_epoch = musl_tm_to_secs(&tm);
 
     UA_DateTime t = UA_DATETIME_UNIX_EPOCH;
     t += sec_epoch * UA_DATETIME_SEC;
diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index c656eb000d8..e4a7466a060 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -2006,7 +2006,7 @@ DECODE_JSON(DateTime) {
     if(tokenSize == 0 || tokenData[tokenSize-1] != 'Z')
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    struct mytm dts;
+    struct musl_tm dts;
     memset(&dts, 0, sizeof(dts));
 
     size_t pos = 0;
@@ -2074,7 +2074,7 @@ DECODE_JSON(DateTime) {
     dts.tm_sec = (UA_UInt16)sec;
 
     /* Compute the seconds since the Unix epoch */
-    long long sinceunix = __tm_to_secs(&dts);
+    long long sinceunix = musl_tm_to_secs(&dts);
 
     /* Are we within the range that can be represented? */
     long long sinceunix_min =
diff --git a/src/ua_types_encoding_xml.c b/src/ua_types_encoding_xml.c
index f0e1028c319..85c1620ba58 100644
--- a/src/ua_types_encoding_xml.c
+++ b/src/ua_types_encoding_xml.c
@@ -623,7 +623,7 @@ DECODE_XML(DateTime) {
     if(ctx->length == 0 || ctx->data[ctx->length - 1] != 'Z')
         return UA_STATUSCODE_BADDECODINGERROR;
 
-    struct mytm dts;
+    struct musl_tm dts;
     memset(&dts, 0, sizeof(dts));
 
     size_t pos = 0;
@@ -691,7 +691,7 @@ DECODE_XML(DateTime) {
     dts.tm_sec = (UA_UInt16)sec;
 
     /* Compute the seconds since the Unix epoch */
-    long long sinceunix = __tm_to_secs(&dts);
+    long long sinceunix = musl_tm_to_secs(&dts);
 
     /* Are we within the range that can be represented? */
     long long sinceunix_min =

From 870f3eeb923e2d06c7d9dacb7a7209443b21a3ca Mon Sep 17 00:00:00 2001
From: Sebastian Goll <goll@hmi-project.com>
Date: Thu, 27 Mar 2025 08:40:50 +0100
Subject: [PATCH 1799/1963] fix(server): lock server state while copying out
 statistics

This is necessary to prevent concurrent processes updating the data while we
copy it out into `UA_ServerStatistics`.
---
 include/open62541/server.h | 2 +-
 src/server/ua_server.c     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/open62541/server.h b/include/open62541/server.h
index 397663de620..81660788b5b 100644
--- a/include/open62541/server.h
+++ b/include/open62541/server.h
@@ -1920,7 +1920,7 @@ typedef struct {
    UA_SessionStatistics ss;
 } UA_ServerStatistics;
 
-UA_ServerStatistics UA_EXPORT
+UA_ServerStatistics UA_EXPORT UA_THREADSAFE
 UA_Server_getStatistics(UA_Server *server);
 
 /**
diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index c64ed55b039..e0d4a3d706c 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -632,6 +632,7 @@ verifyServerApplicationURI(const UA_Server *server) {
 UA_ServerStatistics
 UA_Server_getStatistics(UA_Server *server) {
     UA_ServerStatistics stat;
+    lockServer(server);
     stat.scs = server->secureChannelStatistics;
     UA_ServerDiagnosticsSummaryDataType *sds = &server->serverDiagnosticsSummary;
     stat.ss.currentSessionCount = server->activeSessionCount;
@@ -640,6 +641,7 @@ UA_Server_getStatistics(UA_Server *server) {
     stat.ss.rejectedSessionCount = sds->rejectedSessionCount;
     stat.ss.sessionTimeoutCount = sds->sessionTimeoutCount;
     stat.ss.sessionAbortCount = sds->sessionAbortCount;
+    unlockServer(server);
     return stat;
 }
 

From d4efff5c4d1457c37d1b112f4f55d6f83efe5d9c Mon Sep 17 00:00:00 2001
From: Sebastian Goll <goll@hmi-project.com>
Date: Fri, 28 Mar 2025 13:41:52 +0100
Subject: [PATCH 1800/1963] fix(server): add debug assertions for critical
 sections regarding statistics

This makes sure that we only update server statistics when we hold the service
mutex.
---
 src/server/ua_server_binary.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index e02851b697d..cc181109109 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -142,6 +142,8 @@ setBinaryProtocolManagerState(UA_Server *server,
 static void
 deleteServerSecureChannel(UA_BinaryProtocolManager *bpm,
                           UA_SecureChannel *channel) {
+    UA_LOCK_ASSERT(&bpm->server->serviceMutex, 1);
+
     /* Detach the channel from the server list */
     TAILQ_REMOVE(&bpm->channels, (channel_entry*)channel, pointers);
 
@@ -670,6 +672,8 @@ sendResponse(UA_Server *server, UA_Session *session, UA_SecureChannel *channel,
 UA_StatusCode
 getBoundSession(UA_Server *server, const UA_SecureChannel *channel,
                 const UA_NodeId *token, UA_Session **session) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_DateTime now = UA_DateTime_nowMonotonic();
     UA_SessionHeader *sh;
     SLIST_FOREACH(sh, &channel->sessions, next) {
@@ -1072,6 +1076,8 @@ configServerSecureChannel(void *application, UA_SecureChannel *channel,
 static UA_StatusCode
 createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *cm,
                           uintptr_t connectionId, UA_SecureChannel **outChannel) {
+    UA_LOCK_ASSERT(&bpm->server->serviceMutex, 1);
+
     UA_Server *server = bpm->server;
     UA_ServerConfig *config = &server->config;
 

From 4e9da650bac832a66aa2e9b2aedc58ad3b411ba6 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 31 Mar 2025 15:50:18 +0200
Subject: [PATCH 1801/1963] refactor(server): Simplify locking logic in
 ua_server_binary.c

---
 src/server/ua_server_binary.c | 68 ++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index cc181109109..b2de3b271ff 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -469,6 +469,8 @@ getServicePointers(UA_UInt32 requestTypeId, const UA_DataType **requestType,
 /* HEL -> Open up the connection */
 static UA_StatusCode
 processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *msg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_ConnectionManager *cm = channel->connectionManager;
     if(!cm || (channel->state != UA_SECURECHANNELSTATE_CONNECTED &&
                channel->state != UA_SECURECHANNELSTATE_RHE_SENT))
@@ -541,6 +543,8 @@ processHEL(UA_Server *server, UA_SecureChannel *channel, const UA_ByteString *ms
 static UA_StatusCode
 processOPN(UA_Server *server, UA_SecureChannel *channel,
            const UA_UInt32 requestId, const UA_ByteString *msg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(channel->state != UA_SECURECHANNELSTATE_ACK_SENT &&
        channel->state != UA_SECURECHANNELSTATE_OPEN)
         return UA_STATUSCODE_BADINTERNALERROR;
@@ -714,13 +718,13 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
                   const UA_DataType *requestType, UA_Response *response,
                   const UA_DataType *responseType, UA_Boolean sessionRequired,
                   size_t counterOffset) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_Session anonymousSession;
     UA_Session *session = NULL;
     UA_StatusCode channelRes = UA_STATUSCODE_GOOD;
     UA_ResponseHeader *rh = &response->responseHeader;
 
-    lockServer(server);
-
     /* If it is an unencrypted (#None) channel, only allow the discovery services */
     if(server->config.securityPolicyNoneDiscoveryOnly &&
        UA_String_equal(&channel->securityPolicy->policyUri, &securityPolicyNone ) &&
@@ -753,7 +757,8 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
     /* Get the Session bound to the SecureChannel (not necessarily activated) */
     if(!UA_NodeId_isNull(&request->requestHeader.authenticationToken)) {
         rh->serviceResult = getBoundSession(server, channel,
-                      &request->requestHeader.authenticationToken, &session);
+                                            &request->requestHeader.authenticationToken,
+                                            &session);
         if(rh->serviceResult != UA_STATUSCODE_GOOD)
             goto send_response;
     }
@@ -811,7 +816,6 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
             Service_Publish(server, session, &request->publishRequest, requestId);
 
         /* Don't send a response */
-        unlockServer(server);
         goto update_statistics;
     }
 #endif
@@ -828,7 +832,6 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
          * statistic. */
         if(UA_LIKELY(finished))
             goto send_response;
-        unlockServer(server);
         goto update_statistics;
     }
 #endif
@@ -838,7 +841,6 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
 
     /* Upon success, send the response. Otherwise a ServiceFault. */
  send_response:
-    unlockServer(server);
     channelRes = sendResponse(server, session, channel,
                               requestId, response, responseType);
 
@@ -865,6 +867,8 @@ processMSGDecoded(UA_Server *server, UA_SecureChannel *channel, UA_UInt32 reques
 static UA_StatusCode
 processMSG(UA_Server *server, UA_SecureChannel *channel,
            UA_UInt32 requestId, const UA_ByteString *msg) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     if(channel->state != UA_SECURECHANNELSTATE_OPEN)
         return UA_STATUSCODE_BADINTERNALERROR;
     /* Decode the nodeid */
@@ -959,6 +963,8 @@ static UA_StatusCode
 processSecureChannelMessage(UA_Server *server, UA_SecureChannel *channel,
                             UA_MessageType messagetype, UA_UInt32 requestId,
                             UA_ByteString *message) {
+    UA_LOCK_ASSERT(&server->serviceMutex, 1);
+
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     switch(messagetype) {
     case UA_MESSAGETYPE_HEL:
@@ -1173,13 +1179,14 @@ addDiscoveryUrl(UA_Server *server, const UA_String hostname, UA_UInt16 port) {
 }
 
 /* Callback of a TCP socket (server socket or an active connection) */
-void
-serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                      void *application, void **connectionContext,
-                      UA_ConnectionState state,
-                      const UA_KeyValueMap *params,
-                      UA_ByteString msg) {
+static void
+serverNetworkCallbackLocked(UA_ConnectionManager *cm, uintptr_t connectionId,
+                            void *application, void **connectionContext,
+                            UA_ConnectionState state,
+                            const UA_KeyValueMap *params,
+                            UA_ByteString msg) {
     UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)application;
+    UA_LOCK_ASSERT(&bpm->server->serviceMutex, 1);
 
     /* A server socket that is not yet registered in the server. Register it and
      * set the connection context to the pointer in the
@@ -1315,6 +1322,19 @@ serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     }
 }
 
+void
+serverNetworkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                      void *application, void **connectionContext,
+                      UA_ConnectionState state,
+                      const UA_KeyValueMap *params,
+                      UA_ByteString msg) {
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)application;
+    lockServer(bpm->server);
+    serverNetworkCallbackLocked(cm, connectionId, application, connectionContext,
+                                state, params, msg);
+    unlockServer(bpm->server);
+}
+
 static UA_StatusCode
 createServerConnection(UA_BinaryProtocolManager *bpm, const UA_String *serverUrl) {
     UA_Server *server = bpm->server;
@@ -1675,13 +1695,15 @@ UA_Server_removeReverseConnect(UA_Server *server, UA_UInt64 handle) {
     return result;
 }
 
-void
-serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
-                             void *application, void **connectionContext,
-                             UA_ConnectionState state, const UA_KeyValueMap *params,
-                             UA_ByteString msg) {
+static void
+serverReverseConnectCallbackLocked(UA_ConnectionManager *cm, uintptr_t connectionId,
+                                   void *application, void **connectionContext,
+                                   UA_ConnectionState state, const UA_KeyValueMap *params,
+                                   UA_ByteString msg) {
     (void)params;
     UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)application;
+    UA_LOCK_ASSERT(&bpm->server->serviceMutex, 1);
+
     UA_LOG_DEBUG(bpm->logging, UA_LOGCATEGORY_SERVER,
                  "Activity for reverse connect %lu with state %d",
                  (long unsigned)connectionId, state);
@@ -1802,6 +1824,18 @@ serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     setReverseConnectState(bpm->server, context, context->channel->state);
 }
 
+void
+serverReverseConnectCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
+                             void *application, void **connectionContext,
+                             UA_ConnectionState state, const UA_KeyValueMap *params,
+                             UA_ByteString msg) {
+    UA_BinaryProtocolManager *bpm = (UA_BinaryProtocolManager*)application;
+    lockServer(bpm->server);
+    serverReverseConnectCallbackLocked(cm, connectionId, application, connectionContext,
+                                       state, params, msg);
+    unlockServer(bpm->server);
+}
+
 /***************************/
 /* Binary Protocol Manager */
 /***************************/

From 79bc02fc813821b7825d744c2d9b43be379a2af2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 31 Mar 2025 19:01:35 +0200
Subject: [PATCH 1802/1963] fix(tests): Fix the application-context setup in
 fuzz_binary_message.cc

---
 tests/fuzz/fuzz_binary_message.cc | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/tests/fuzz/fuzz_binary_message.cc b/tests/fuzz/fuzz_binary_message.cc
index ea8758e807b..419bf5a6613 100644
--- a/tests/fuzz/fuzz_binary_message.cc
+++ b/tests/fuzz/fuzz_binary_message.cc
@@ -5,9 +5,6 @@
  *    Copyright 2019 (c) fortiss (Author: Stefan Profanter)
  */
 
-
-#include "custom_memory_manager.h"
-
 #include <open62541/plugin/log_stdout.h>
 #include <open62541/server_config_default.h>
 #include <open62541/types.h>
@@ -17,6 +14,13 @@
 
 #define RECEIVE_BUFFER_SIZE 65535
 
+static void *
+_removeServerComponent(void *application, UA_ServerComponent *sc) {
+    UA_assert(sc->state == UA_LIFECYCLESTATE_STOPPED);
+    sc->free((UA_Server*)application, sc);
+    return NULL;
+}
+
 /*
 ** Main entry point.  The fuzzer invokes this function with each
 ** fuzzed input.
@@ -26,10 +30,6 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     if(size <= 4)
         return 0;
 
-    if(!UA_memoryManager_setLimitFromLast4Bytes(data, size))
-        return 0;
-    size -= 4;
-
     /* less debug output */
     UA_ServerConfig initialConfig;
     memset(&initialConfig, 0, sizeof(UA_ServerConfig));
@@ -60,14 +60,21 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     }
     memcpy(msg.data, data, size);
 
+    /* Remove all remaining server components (must be all stopped) */
+    ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
+             _removeServerComponent, server);
+    ZIP_INIT(&server->serverComponents);
+
+    UA_ServerComponent *bpm = UA_BinaryProtocolManager_new(server);
+    addServerComponent(server, bpm, NULL);
+
     void *ctx = NULL;
-    serverNetworkCallback(&testConnectionManagerTCP, 0, server,
-                              &ctx, UA_CONNECTIONSTATE_ESTABLISHED,
-                              &UA_KEYVALUEMAP_NULL, msg);
+    serverNetworkCallback(&testConnectionManagerTCP, 0, bpm,
+                          &ctx, UA_CONNECTIONSTATE_ESTABLISHED,
+                          &UA_KEYVALUEMAP_NULL, msg);
 
     // if we got an invalid chunk, the message is not deleted, so delete it here
     UA_ByteString_clear(&msg);
-    UA_Server_run_shutdown(server);
     UA_Server_delete(server);
     return 0;
 }

From 087039e43d1d5fa36e0f0a22aa50450810e038fc Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 18 Feb 2025 17:02:34 +0100
Subject: [PATCH 1803/1963] feat(ci): remove ubuntu-20.04 ci

See https://github.com/actions/runner-images/issues/11101
---
 .github/workflows/build_linux.yml      |  2 +-
 .github/workflows/build_ubuntu2204.yml | 29 --------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 .github/workflows/build_ubuntu2204.yml

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 59a26d4fe99..bbbaf7bb2f7 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -98,7 +98,7 @@ jobs:
             cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev
             cmd_action: build_clang_analyzer
     name: ${{matrix.build_name}}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
       with:
diff --git a/.github/workflows/build_ubuntu2204.yml b/.github/workflows/build_ubuntu2204.yml
deleted file mode 100644
index 216c0665c08..00000000000
--- a/.github/workflows/build_ubuntu2204.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Linux Build & Test with OpenSSL3.0
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        include: 
-          - build_name: "Encryption (OpenSSL3.0) Build & Unit Tests (gcc)"
-            cmd_deps: sudo apt-get install -y -qq openssl
-            cmd_action: unit_tests_encryption OPENSSL
-    name: ${{matrix.build_name}}
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-    - name: Install Dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y -qq python3-sphinx graphviz check
-        ${{ matrix.cmd_deps }}
-    - name: ${{matrix.build_name}}
-      run: source tools/ci.sh && ${{matrix.cmd_action}}
-      env:
-        ETHERNET_INTERFACE: eth0
-

From 22d60f142a87a3aa12593f90a205009e7a90894a Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 11 Mar 2025 11:52:21 +0100
Subject: [PATCH 1804/1963] fix(ci): update tpm2-tss and tpm2-pkcs11 to fix TPM
 Tool Build

---
 .github/workflows/build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index bbbaf7bb2f7..acec9fd74c3 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -53,7 +53,7 @@ jobs:
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-tss.git
                 cd ${HOME}/tpm2-tss
-                git checkout 2.4.6
+                git checkout 3.2.3
                 ./bootstrap && ./configure --with-udevrulesdir=/etc/udev/rules.d --with-udevrulesprefix=70-
                 make -j$(nproc)
                 sudo make install
@@ -63,7 +63,7 @@ jobs:
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-pkcs11.git
                 cd ${HOME}/tpm2-pkcs11
-                git checkout 1.6.0
+                git checkout 1.7.0
                 ./bootstrap && ./configure
                 make -j$(nproc)
                 sudo make install

From 07677796816070c30589a796d07c4c815a364cde Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 11 Mar 2025 12:04:48 +0100
Subject: [PATCH 1805/1963] fix(ci): switch to clang-14 to fix clang build

---
 .github/workflows/build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index acec9fd74c3..5a28d453fda 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -24,8 +24,8 @@ jobs:
             cmd_deps: ""
             cmd_action: unit_tests_alarms
           - build_name: "Debug Build & Unit Tests (clang)"
-            cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 mosquitto
-            cmd_action: CC=clang-11 CXX=clang++-11 unit_tests
+            cmd_deps: sudo apt-get install -y -qq clang-14 clang-tools-14 mosquitto
+            cmd_action: CC=clang-14 CXX=clang++-14 unit_tests
           - build_name: "Debug Build & Unit Tests (tcc)"
             cmd_deps: sudo apt-get install -y -qq tcc mosquitto
             cmd_action: CC=tcc unit_tests

From d293259ffbade21451d925da32f10b47b88163fe Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Tue, 17 Oct 2023 09:48:06 +0200
Subject: [PATCH 1806/1963] fix(ci): Fix an ill-defined regex in
 valgrind_check_error.py

(cherry picked from commit 7f97400486f17e90e4702040e65d0dc9aadf86e4)
---
 tools/valgrind_check_error.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/valgrind_check_error.py b/tools/valgrind_check_error.py
index e192cecce3f..3bbc2c5e13e 100755
--- a/tools/valgrind_check_error.py
+++ b/tools/valgrind_check_error.py
@@ -60,7 +60,7 @@ def execute(command):
 
 # Try to parse the output. Look for the following line:
 # ==17054== FILE DESCRIPTORS: 5 open at exit.
-descriptors_re = re.compile(r".*==(\d+)==\s+FILE DESCRIPTORS: (\d+) open at exit\..*")
+descriptors_re = re.compile(r".*==(\d+)==\s+FILE DESCRIPTORS: (\d+) open(\s\(\d std\))? at exit\..*")
 m = descriptors_re.match(log_content)
 
 if not m:

From f279e939428ac551acf9f9d134f2291648aa68d6 Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 18 Mar 2025 15:50:59 +0100
Subject: [PATCH 1807/1963] fix(ci): disable pubsub ethernet support for tcc

---
 tools/ci.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index b08de97e1d5..2e1a59b5d1d 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -130,6 +130,12 @@ function set_capabilities {
 } 
 
 function unit_tests {
+    if [ "${CC:-x}" = "tcc" ]; then
+        PUBSUB_ETHERNET=OFF
+    else
+        PUBSUB_ETHERNET=ON
+    fi
+
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
@@ -140,7 +146,7 @@ function unit_tests {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
+          -DUA_ENABLE_PUBSUB_ETH_UADP=${PUBSUB_ETHERNET} \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \

From 5c1882c109937b75680ec43542c6e5c538e45280 Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 25 Mar 2025 13:58:10 +0100
Subject: [PATCH 1808/1963] fix(ci): suppress invalid valgrind report in
 pthread_create in tests

---
 tools/valgrind_suppressions.supp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tools/valgrind_suppressions.supp b/tools/valgrind_suppressions.supp
index 591ffa6647e..b079729b214 100644
--- a/tools/valgrind_suppressions.supp
+++ b/tools/valgrind_suppressions.supp
@@ -10,6 +10,24 @@
 }
 
 
+{
+   <ubuntu2204_pthread_create>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:calloc
+   fun:calloc
+   fun:allocate_dtv
+   fun:_dl_allocate_tls
+   fun:allocate_stack
+   fun:pthread_create@@GLIBC_2.34
+   ...
+   fun:setup*
+   fun:srunner_run_setup
+   ...
+   fun:srunner_run_tagged
+   fun:main
+}
+
 
 # Custom suppressions added by @Pro
 

From e1b2fee9f574da1e5e5a76556f4f7710fb841bcb Mon Sep 17 00:00:00 2001
From: marwinglaser <marwin.glaser@iosb.fraunhofer.de>
Date: Wed, 16 Apr 2025 00:08:22 +0200
Subject: [PATCH 1809/1963] fic(ci) run linux CI in an ubuntu container (#7225)

* Revert "fix(ci): suppress invalid valgrind report in pthread_create in tests"

This reverts commit 5c1882c109937b75680ec43542c6e5c538e45280.

* Revert "fix(ci): disable pubsub ethernet support for tcc"

This reverts commit f279e939428ac551acf9f9d134f2291648aa68d6.

* Revert "fix(ci): Fix an ill-defined regex in valgrind_check_error.py"

This reverts commit d293259ffbade21451d925da32f10b47b88163fe.

* Revert "fix(ci): switch to clang-14 to fix clang build"

This reverts commit 07677796816070c30589a796d07c4c815a364cde.

* Revert "fix(ci): update tpm2-tss and tpm2-pkcs11 to fix TPM Tool Build"

This reverts commit 22d60f142a87a3aa12593f90a205009e7a90894a.

* Revert "feat(ci): remove ubuntu-20.04 ci"

This reverts commit 087039e43d1d5fa36e0f0a22aa50450810e038fc.

* feat(ci): use ubuntu 20.04 container

* fix(ci): workaround IPv6 being disabled in GHA container networks

* refactor(tests): move TEST_MQTT_SERVER to environment variable
---
 .github/workflows/build_linux.yml           | 36 ++++++++++++-----
 .github/workflows/build_ubuntu2204.yml      | 43 +++++++++++++++++++++
 tests/pubsub/check_pubsub_connection_mqtt.c | 22 ++++++-----
 tools/ci.sh                                 |  8 +---
 tools/valgrind_check_error.py               |  2 +-
 tools/valgrind_suppressions.supp            | 18 ---------
 6 files changed, 85 insertions(+), 44 deletions(-)
 create mode 100644 .github/workflows/build_ubuntu2204.yml

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 5a28d453fda..132149ec9fe 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -9,7 +9,6 @@ jobs:
       matrix:
         include: 
           - build_name: "Debug Build & Unit Tests (gcc)"
-            cmd_deps: sudo apt-get install -y -qq mosquitto
             cmd_action: unit_tests
           - build_name: "Debug Build & Unit Tests without Subscriptions (gcc)"
             cmd_deps: ""
@@ -24,10 +23,10 @@ jobs:
             cmd_deps: ""
             cmd_action: unit_tests_alarms
           - build_name: "Debug Build & Unit Tests (clang)"
-            cmd_deps: sudo apt-get install -y -qq clang-14 clang-tools-14 mosquitto
-            cmd_action: CC=clang-14 CXX=clang++-14 unit_tests
+            cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11
+            cmd_action: CC=clang-11 CXX=clang++-11 unit_tests
           - build_name: "Debug Build & Unit Tests (tcc)"
-            cmd_deps: sudo apt-get install -y -qq tcc mosquitto
+            cmd_deps: sudo apt-get install -y -qq tcc
             cmd_action: CC=tcc unit_tests
           - build_name: "Encryption (MbedTLS) Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
@@ -53,7 +52,7 @@ jobs:
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-tss.git
                 cd ${HOME}/tpm2-tss
-                git checkout 3.2.3
+                git checkout 2.4.6
                 ./bootstrap && ./configure --with-udevrulesdir=/etc/udev/rules.d --with-udevrulesprefix=70-
                 make -j$(nproc)
                 sudo make install
@@ -63,7 +62,7 @@ jobs:
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-pkcs11.git
                 cd ${HOME}/tpm2-pkcs11
-                git checkout 1.7.0
+                git checkout 1.6.0
                 ./bootstrap && ./configure
                 make -j$(nproc)
                 sudo make install
@@ -98,17 +97,36 @@ jobs:
             cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev
             cmd_action: build_clang_analyzer
     name: ${{matrix.build_name}}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/marwinglaser/ci:ubuntu-20.04
+      options: --privileged
+    services:
+      mosquitto:
+        image: eclipse-mosquitto:1.6-openssl
+    env:
+      OPEN62541_TEST_MQTT_BROKER: opc.mqtt://mosquitto:1883
     steps:
-    - uses: actions/checkout@v2
+    - name: Work around disabled ipv6 on actions container networks
+      run: |
+        IPV6="$(cat /proc/sys/net/ipv6/conf/eth0/disable_ipv6)"
+        echo "Current IPv6 status on eth0: $IPV6"
+        [ "$IPV6" = "1" ] || exit
+
+        echo 0 | sudo tee /proc/sys/net/ipv6/conf/eth0/disable_ipv6 > /dev/null
+        IPV6="$(cat /proc/sys/net/ipv6/conf/eth0/disable_ipv6)"
+        echo "New IPv6 status on eth0: $IPV6"
+        [ "$IPV6" = "0" ] || { echo "Failed to enable IPv6 on eth0"; exit 1; }
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y -qq python3-sphinx graphviz check
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq cmake libcap2-bin pkg-config libssl-dev python3-sphinx graphviz check
         ${{ matrix.cmd_deps }}
     - name: ${{matrix.build_name}}
+      shell: bash
       run: source tools/ci.sh && ${{matrix.cmd_action}}
       env:
         ETHERNET_INTERFACE: eth0
diff --git a/.github/workflows/build_ubuntu2204.yml b/.github/workflows/build_ubuntu2204.yml
new file mode 100644
index 00000000000..77e4dfeadea
--- /dev/null
+++ b/.github/workflows/build_ubuntu2204.yml
@@ -0,0 +1,43 @@
+name: Linux Build & Test with OpenSSL3.0
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include: 
+          - build_name: "Encryption (OpenSSL3.0) Build & Unit Tests (gcc)"
+            cmd_deps: sudo apt-get install -y -qq openssl
+            cmd_action: unit_tests_encryption OPENSSL
+    name: ${{matrix.build_name}}
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/marwinglaser/ci:ubuntu-22.04
+      options: --privileged
+    steps:
+    - name: Work around disabled ipv6 on actions container networks
+      run: |
+        IPV6="$(cat /proc/sys/net/ipv6/conf/eth0/disable_ipv6)"
+        echo "Current IPv6 status on eth0: $IPV6"
+        [ "$IPV6" = "1" ] || exit
+
+        echo 0 | sudo tee /proc/sys/net/ipv6/conf/eth0/disable_ipv6 > /dev/null
+        IPV6="$(cat /proc/sys/net/ipv6/conf/eth0/disable_ipv6)"
+        echo "New IPv6 status on eth0: $IPV6"
+        [ "$IPV6" = "0" ] || { echo "Failed to enable IPv6 on eth0"; exit 1; }
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install Dependencies
+      run: |
+        sudo apt-get update
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq cmake pkg-config libssl-dev python3-sphinx graphviz check
+        ${{ matrix.cmd_deps }}
+    - name: ${{matrix.build_name}}
+      shell: bash
+      run: source tools/ci.sh && ${{matrix.cmd_action}}
+      env:
+        ETHERNET_INTERFACE: eth0
+
diff --git a/tests/pubsub/check_pubsub_connection_mqtt.c b/tests/pubsub/check_pubsub_connection_mqtt.c
index 834caa5c219..a836a8d3515 100644
--- a/tests/pubsub/check_pubsub_connection_mqtt.c
+++ b/tests/pubsub/check_pubsub_connection_mqtt.c
@@ -15,13 +15,17 @@
 #include "ua_server_internal.h"
 
 #include <check.h>
-
-//#define TEST_MQTT_SERVER "opc.mqtt://test.mosquitto.org:1883"
-#define TEST_MQTT_SERVER "opc.mqtt://localhost:1883"
+#include <stdlib.h>
 
 UA_Server *server = NULL;
 UA_ServerConfig *config = NULL;
 
+static char* get_mqtt_broker_address(void) {
+    char* broker = getenv("OPEN62541_TEST_MQTT_BROKER");
+    if (!broker) broker = "opc.mqtt://localhost:1883";
+    return broker;
+}
+
 static void setup(void) {
     server = UA_Server_new();
     config = UA_Server_getConfig(server);
@@ -39,7 +43,7 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("Mqtt Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL, UA_STRING(TEST_MQTT_SERVER)};
+        {UA_STRING_NULL, UA_STRING(get_mqtt_broker_address())};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
@@ -60,7 +64,7 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("Mqtt Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL, UA_STRING(TEST_MQTT_SERVER)};
+        {UA_STRING_NULL, UA_STRING(get_mqtt_broker_address())};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
@@ -86,7 +90,7 @@ START_TEST(AddConnectionWithInvalidAddress){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("MQTT Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL, UA_STRING("opc.mqtt://127.0..1:1883/")};
+        {UA_STRING_NULL, UA_STRING(get_mqtt_broker_address())};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
@@ -104,7 +108,7 @@ START_TEST(AddConnectionWithUnknownTransportURL){
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("MQTT Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL, UA_STRING(TEST_MQTT_SERVER)};
+        {UA_STRING_NULL, UA_STRING(get_mqtt_broker_address())};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
@@ -124,7 +128,7 @@ START_TEST(AddConnectionWithNullConfig){
 
 START_TEST(AddSingleConnectionWithMaximalConfiguration){
     UA_NetworkAddressUrlDataType networkAddressUrlData =
-        {UA_STRING("127.0.0.1"), UA_STRING(TEST_MQTT_SERVER)};
+        {UA_STRING("127.0.0.1"), UA_STRING(get_mqtt_broker_address())};
     UA_Variant address;
     UA_Variant_setScalar(&address, &networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     UA_KeyValuePair connectionOptions[3];
@@ -156,7 +160,7 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
 
 START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
     UA_NetworkAddressUrlDataType networkAddressUrlData =
-        {UA_STRING("127.0.0.1"), UA_STRING(TEST_MQTT_SERVER)};
+        {UA_STRING("127.0.0.1"), UA_STRING(get_mqtt_broker_address())};
     UA_Variant address;
     UA_Variant_setScalar(&address, &networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     UA_KeyValuePair connectionOptions[3];
diff --git a/tools/ci.sh b/tools/ci.sh
index 2e1a59b5d1d..b08de97e1d5 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -130,12 +130,6 @@ function set_capabilities {
 } 
 
 function unit_tests {
-    if [ "${CC:-x}" = "tcc" ]; then
-        PUBSUB_ETHERNET=OFF
-    else
-        PUBSUB_ETHERNET=ON
-    fi
-
     mkdir -p build; cd build; rm -rf *
     cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
@@ -146,7 +140,7 @@ function unit_tests {
           -DUA_ENABLE_HISTORIZING=ON \
           -DUA_ENABLE_JSON_ENCODING=ON \
           -DUA_ENABLE_PUBSUB=ON \
-          -DUA_ENABLE_PUBSUB_ETH_UADP=${PUBSUB_ETHERNET} \
+          -DUA_ENABLE_PUBSUB_ETH_UADP=ON \
           -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \
           -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
diff --git a/tools/valgrind_check_error.py b/tools/valgrind_check_error.py
index 3bbc2c5e13e..e192cecce3f 100755
--- a/tools/valgrind_check_error.py
+++ b/tools/valgrind_check_error.py
@@ -60,7 +60,7 @@ def execute(command):
 
 # Try to parse the output. Look for the following line:
 # ==17054== FILE DESCRIPTORS: 5 open at exit.
-descriptors_re = re.compile(r".*==(\d+)==\s+FILE DESCRIPTORS: (\d+) open(\s\(\d std\))? at exit\..*")
+descriptors_re = re.compile(r".*==(\d+)==\s+FILE DESCRIPTORS: (\d+) open at exit\..*")
 m = descriptors_re.match(log_content)
 
 if not m:
diff --git a/tools/valgrind_suppressions.supp b/tools/valgrind_suppressions.supp
index b079729b214..591ffa6647e 100644
--- a/tools/valgrind_suppressions.supp
+++ b/tools/valgrind_suppressions.supp
@@ -10,24 +10,6 @@
 }
 
 
-{
-   <ubuntu2204_pthread_create>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   fun:calloc
-   fun:calloc
-   fun:allocate_dtv
-   fun:_dl_allocate_tls
-   fun:allocate_stack
-   fun:pthread_create@@GLIBC_2.34
-   ...
-   fun:setup*
-   fun:srunner_run_setup
-   ...
-   fun:srunner_run_tagged
-   fun:main
-}
-
 
 # Custom suppressions added by @Pro
 

From 352c729e18a4807c27b200eb364e9e5bd8ba55b9 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Tue, 15 Apr 2025 23:53:04 +0200
Subject: [PATCH 1810/1963] fix(client) adjust client connect process order

---
 src/client/ua_client_connect.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 093cb41e2ec..4af65f4545f 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1777,15 +1777,15 @@ void
 connectSync(UA_Client *client) {
     UA_LOCK_ASSERT(&client->clientMutex, 1);
 
-    UA_DateTime now = UA_DateTime_nowMonotonic();
-    UA_DateTime maxDate = now + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
-
     /* Initialize the connection */
     initConnect(client);
     notifyClientState(client);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return;
 
+    UA_DateTime now = UA_DateTime_nowMonotonic();
+    UA_DateTime maxDate = now + ((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC);
+
     /* EventLoop is started. Otherwise initConnect would have failed. */
     UA_EventLoop *el = client->config.eventLoop;
     UA_assert(el);

From 92b2276d9fdf6ca561ceeffcbfda40ce356b84be Mon Sep 17 00:00:00 2001
From: Miikka <107539518+maikrou@users.noreply.github.com>
Date: Sat, 19 Apr 2025 16:28:36 +0300
Subject: [PATCH 1811/1963] fix(server): Don't allow duplicate ServerUrl for
 discovery (#7212)

---
 src/server/ua_services_discovery.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index eaf23f2562e..c58f3a2438d 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -449,9 +449,18 @@ setCurrentEndPointsArray(UA_Server *server, const UA_String endpointUrl,
                 /* Mirror back the requested EndpointUrl and also add it to the
                  * array of discovery urls */
                 retval |= UA_String_copy(&endpointUrl, &ed->endpointUrl);
-                retval |= UA_Array_appendCopy((void**)&ed->server.discoveryUrls,
-                                              &ed->server.discoveryUrlsSize,
-                                              &endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
+
+                /* Check if the ServerUrl is already present in the DiscoveryUrl array */
+                size_t k = 0;
+                for(; k < ed->server.discoveryUrlsSize; k++) {
+                    if(UA_String_equal(&ed->endpointUrl, &ed->server.discoveryUrls[k]))
+                        break;
+                }
+                if(k == ed->server.discoveryUrlsSize) {
+                    retval |= UA_Array_appendCopy(
+                        (void **)&ed->server.discoveryUrls, &ed->server.discoveryUrlsSize,
+                        &endpointUrl, &UA_TYPES[UA_TYPES_STRING]);
+                }
             }
             if(retval != UA_STATUSCODE_GOOD)
                 goto error;

From 59de3ab03c144f4acf024ed8c0bd8b00aca8ff5e Mon Sep 17 00:00:00 2001
From: Miikka <107539518+maikrou@users.noreply.github.com>
Date: Sat, 19 Apr 2025 16:30:31 +0300
Subject: [PATCH 1812/1963] fix(core): Potential null pointer access with
 encryption disabled (#7213)

---
 src/ua_securechannel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 0de78dfc254..80890301a51 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -610,7 +610,7 @@ unpackPayloadOPN(UA_SecureChannel *channel, UA_Chunk *chunk) {
     UA_CHECK_STATUS(res, return res);
 
     if(asymHeader.senderCertificate.length > 0) {
-        if(channel->certificateVerification)
+        if(channel->certificateVerification && channel->certificateVerification->verifyCertificate)
             res = channel->certificateVerification->
                 verifyCertificate(channel->certificateVerification,
                                   &asymHeader.senderCertificate);

From 64684d5d50cd790bf353b1d9cf2ed09a536c5598 Mon Sep 17 00:00:00 2001
From: Miikka <107539518+maikrou@users.noreply.github.com>
Date: Sat, 19 Apr 2025 16:35:11 +0300
Subject: [PATCH 1813/1963] fix(util): Fix local variable not referenced
 compiler warning (#7208)

---
 src/server/ua_subscription_events_filter.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/ua_subscription_events_filter.c b/src/server/ua_subscription_events_filter.c
index 38ed7e8b219..7df198feba4 100644
--- a/src/server/ua_subscription_events_filter.c
+++ b/src/server/ua_subscription_events_filter.c
@@ -286,7 +286,9 @@ static UA_INLINE UA_Byte uppercase(UA_Byte in) { return in | 32; }
 
 static UA_StatusCode
 castImplicitFromString(const UA_Variant *in, const UA_DataType *outType, UA_Variant *out) {
+#if defined(UA_ENABLE_PARSING) || defined(UA_ENABLE_JSON_ENCODING)
     UA_StatusCode res = UA_STATUSCODE_GOOD;
+#endif
     if(outType == &UA_TYPES[UA_TYPES_BOOLEAN]) {
         /* String -> Boolean
          *

From fd7623b41206a8417a5047f822b4f7618092d4d6 Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Wed, 16 Apr 2025 15:08:30 +0200
Subject: [PATCH 1814/1963] fix(ci): add new dependencies

---
 .github/workflows/build_linux.yml      | 6 +++---
 .github/workflows/build_ubuntu2204.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index e2c8a466111..7a427546384 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -97,10 +97,10 @@ jobs:
             cmd_deps: sudo apt-get install -y -qq valgrind openssl
             cmd_action: unit_tests_valgrind OPENSSL
           - build_name: "Valgrind Examples with MbedTLS (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev
+            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev python3-netifaces
             cmd_action: examples_valgrind MBEDTLS
           - build_name: "Valgrind Examples with OpenSSL (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind openssl libmbedtls-dev
+            cmd_deps: sudo apt-get install -y -qq valgrind openssl libmbedtls-dev python3-netifaces
             cmd_action: examples_valgrind OPENSSL
           - build_name: "Clang Static Analyzer"
             cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev
@@ -135,7 +135,7 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq cmake libcap2-bin pkg-config libssl-dev python3-sphinx graphviz check
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential cmake libcap2-bin pkg-config libssl-dev python3-sphinx graphviz check libxml2-dev
         ${{ matrix.cmd_deps }}
     - name: ${{matrix.build_name}}
       shell: bash
diff --git a/.github/workflows/build_ubuntu2204.yml b/.github/workflows/build_ubuntu2204.yml
index 77e4dfeadea..1b3982bdd20 100644
--- a/.github/workflows/build_ubuntu2204.yml
+++ b/.github/workflows/build_ubuntu2204.yml
@@ -33,7 +33,7 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq cmake pkg-config libssl-dev python3-sphinx graphviz check
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq cmake pkg-config libcap2-bin libssl-dev python3-sphinx graphviz check
         ${{ matrix.cmd_deps }}
     - name: ${{matrix.build_name}}
       shell: bash

From 4669a6c9947a2a1d6e8bb2be2ba31e56e507734f Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 15 Apr 2025 16:49:13 +0200
Subject: [PATCH 1815/1963] refactor(tests): move TEST_MQTT_SERVER to
 environment variable in new tests

---
 tests/check_eventloop_mqtt.c     | 28 ++++++++++++++++++++++++----
 tests/pubsub/check_pubsub_mqtt.c |  9 +++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/tests/check_eventloop_mqtt.c b/tests/check_eventloop_mqtt.c
index 4952f5cfca5..e8904bbf53e 100644
--- a/tests/check_eventloop_mqtt.c
+++ b/tests/check_eventloop_mqtt.c
@@ -6,16 +6,35 @@
 #include <open62541/plugin/log_stdout.h>
 #include "open62541/types.h"
 #include "open62541/types_generated.h"
-
-/* The test suite requires an MQTT server listening at localhost:1883 */
+#include "open62541/util.h"
 
 #include "testing_clock.h"
+#include <stdio.h>
 #include <time.h>
 #include <stdlib.h>
 #include <check.h>
 
 unsigned int messageCount = 0;
 
+UA_String broker_hostname = {0, NULL};
+UA_UInt16 broker_port = 0;
+
+static char* get_mqtt_broker_address(void) {
+    char* broker = getenv("OPEN62541_TEST_MQTT_BROKER");
+    if (!broker) broker = "opc.mqtt://localhost:1883";
+    return broker;
+}
+
+static void setup(void) {
+    UA_String broker = UA_STRING(get_mqtt_broker_address());
+    if (UA_parseEndpointUrl(&broker, &broker_hostname, &broker_port, NULL) == UA_STATUSCODE_BADTCPENDPOINTURLINVALID) {
+        printf("Failed to parse OPEN62541_TEST_MQTT_BROKER");
+        exit(1);
+    }
+}
+
+static void teardown(void) {}
+
 static void
 connectionCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
                    void *application, void **connectionContext,
@@ -45,8 +64,8 @@ START_TEST(connectSubscribePublish) {
     el->registerEventSource(el, &mcm->eventSource);
     el->start(el);
 
-    UA_UInt16 port = 1883;
-    UA_String hostname = UA_STRING("localhost");
+    UA_UInt16 port = broker_port;
+    UA_String hostname = broker_hostname;
     UA_String topic = UA_STRING("mytopic");
     UA_Boolean subscribe = true;
 
@@ -110,6 +129,7 @@ START_TEST(connectSubscribePublish) {
 int main(void) {
     Suite *s  = suite_create("Test MQTT TCP EventLoop");
     TCase *tc = tcase_create("test cases");
+    tcase_add_checked_fixture(tc, setup, teardown);
     tcase_add_test(tc, connectSubscribePublish);
     suite_add_tcase(s, tc);
 
diff --git a/tests/pubsub/check_pubsub_mqtt.c b/tests/pubsub/check_pubsub_mqtt.c
index d3f96822561..77d86b4cac5 100644
--- a/tests/pubsub/check_pubsub_mqtt.c
+++ b/tests/pubsub/check_pubsub_mqtt.c
@@ -13,7 +13,6 @@
 #include <check.h>
 #include <stdlib.h>
 
-#define TEST_MQTT_SERVER "opc.mqtt://localhost:1883"
 #define MQTT_CLIENT_ID               "TESTCLIENTPUBSUBMQTT"
 #define CONNECTIONOPTION_NAME        "mqttClientId"
 #define SUBSCRIBE_TOPIC              "customTopic"
@@ -31,6 +30,12 @@ UA_NodeId writerGroupIdent;
 
 UA_DataSetReaderConfig readerConfig;
 
+static char* get_mqtt_broker_address(void) {
+    char* broker = getenv("OPEN62541_TEST_MQTT_BROKER");
+    if (!broker) broker = "opc.mqtt://localhost:1883";
+    return broker;
+}
+
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
@@ -47,7 +52,7 @@ static void setup(void) {
     connectionConfig.enabled = UA_TRUE;
 
     /* configure address of the mqtt broker (local on default port) */
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING(TEST_MQTT_SERVER)};
+    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING(get_mqtt_broker_address())};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     /* Changed to static publisherId from random generation to identify

From 48d8d5b465f4cd14ff0d9bb0bd33f0396626f885 Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 22 Apr 2025 13:31:30 +0200
Subject: [PATCH 1816/1963] refactor(build): remove cmake 3.20 requirement

---
 CMakeLists.txt                        | 1 -
 tools/nodeset_injector/CMakeLists.txt | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8f2e0c2981..5df1de86aa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1255,7 +1255,6 @@ ua_generate_nodeset(NAME "ns0" FILE ${UA_FILE_NODESETS}
 
 if(UA_ENABLE_NODESET_INJECTOR)
     message(STATUS "Nodesetinjector feature enabled")
-    cmake_minimum_required(VERSION 3.20)
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
                        ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
                        COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/nodeset_injector/generate_nodesetinjector.py
diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
index e2da533f849..a1c8d52110a 100644
--- a/tools/nodeset_injector/CMakeLists.txt
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -283,6 +283,8 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
 endforeach()
 
 
+# TODO: remove when CMP0118 is NEW (cmake 3.20)
+set_source_files_properties(${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h PROPERTIES GENERATED 1)
 add_library(autoinject ${UA_NODESETINJECTOR_SOURCE_FILES} ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c)
 set_target_properties(autoinject PROPERTIES PUBLIC_HEADER "${UA_NODESETINJECTOR_HEADER_FILES}")
 target_link_libraries(autoinject open62541)

From a540be9ce8a64fe856600a404755e4ddf986e9d2 Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Tue, 22 Apr 2025 17:19:26 +0200
Subject: [PATCH 1817/1963] fix(test): client async connect is not instant

Some tests assume that async TCP connect(2) system call succeeds
immediately when run over loopback device.  This behavior depends
on the implementation of the kernel, in OpenBSD this is often not
the case.
Allow the test client to iterate until the connection is established.
Adapt the assertion how many iterations are needed.
---
 tests/client/check_client.c               | 4 ++--
 tests/client/check_client_async_connect.c | 6 +++---
 tests/client/check_client_subscriptions.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 22b02cdc8d3..4c083a5340d 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -180,7 +180,7 @@ START_TEST(Client_renewSecureChannel) {
     UA_fakeSleep((UA_UInt32)((UA_Double)cc->secureChannelLifeTime * 0.8));
 
     /* Make the client renew the channel */
-    retval = UA_Client_run_iterate(client, 0);
+    retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     /* Now read */
@@ -224,7 +224,7 @@ START_TEST(Client_renewSecureChannelWithActiveSubscription) {
     for(int i = 0; i < 15; ++i) {
         UA_fakeSleep(1000);
         UA_Server_run_iterate(server, true);
-        retval = UA_Client_run_iterate(client, 0);
+        retval = UA_Client_run_iterate(client, 1);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     }
 
diff --git a/tests/client/check_client_async_connect.c b/tests/client/check_client_async_connect.c
index e9045ff73cc..2a5d2472baa 100644
--- a/tests/client/check_client_async_connect.c
+++ b/tests/client/check_client_async_connect.c
@@ -90,8 +90,8 @@ START_TEST(Client_connect_async) {
     UA_BrowseRequest_clear(&bReq);
     ck_assert_uint_eq(connected, true);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    /* With default setting the client uses 7 iterations to connect */
-    ck_assert_uint_eq(asyncCounter, 10-7);
+    /* With default setting the client uses 7 or 8 iterations to connect */
+    ck_assert(asyncCounter == 10-7 || asyncCounter == 10-8);
     UA_Client_disconnectAsync(client);
     while(connected) {
         UA_Server_run_iterate(server, false);
@@ -149,7 +149,7 @@ START_TEST(Client_no_connection) {
     //simulating unconnected server
     UA_Client_recvTesting_result = UA_STATUSCODE_BADCONNECTIONCLOSED;
     UA_Server_run_iterate(server, false);
-    retval = UA_Client_run_iterate(client, 0);  /* Open connection */
+    retval = UA_Client_run_iterate(client, 1);  /* Open connection */
     UA_Server_run_iterate(server, false);
     retval |= UA_Client_run_iterate(client, 0); /* Send HEL */
     UA_Server_run_iterate(server, false);
diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 6eb101e41d5..8c81e39adce 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -209,7 +209,7 @@ START_TEST(Client_subscription_async) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_Server_run_iterate(server, true);
-    UA_Client_run_iterate(client, 0);
+    UA_Client_run_iterate(client, 1);
 
     ck_assert_uint_eq(response.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     UA_UInt32 subId = response.subscriptionId;

From 4874837ea15fd83a346684bfc2c1be1ec664695d Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <alexander.bluhm@gmx.net>
Date: Wed, 20 Jul 2022 13:07:38 +0200
Subject: [PATCH 1818/1963] fix(client): use after free in client
 asyncServiceCalls

Commit de9d691906547c9fc99e0a77198a80fe5bba54b1 fixed a use after
free in UA_Client_AsyncService_cancel().  Move all elements to a
local list before iterating over the callbacks.  Commit
713cdb419f0f844517afc549c7c1ef48d8498cfb fixed the same bug in in
asyncServiceTimeoutCheck().  After timeout, remove the async service
calls from the global list and store them in a local one.  Call
UA_Client_AsyncService_cancel() and UA_free() while traversing this
local list.  Otherwise the callback could free a global list element
that asyncServiceTimeoutCheck() is referencing.
---
 src/client/ua_client.c          | 26 +++++++++++++++++++++++---
 src/client/ua_client_internal.h |  4 +++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 778d1a6365d..cfbadfa9e2a 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -515,8 +515,17 @@ UA_Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
 }
 
 void UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode) {
+    /* Make this function reentrant. One of the async callbacks could indirectly
+     * operate on the list. Moving all elements to a local list before iterating
+     * that. */
+    UA_AsyncServiceList asyncServiceCalls = client->asyncServiceCalls;
+    LIST_INIT(&client->asyncServiceCalls);
+    if(asyncServiceCalls.lh_first)
+        asyncServiceCalls.lh_first->pointers.le_prev = &asyncServiceCalls.lh_first;
+
+    /* Cancel and remove the elements from the local list */
     AsyncServiceCall *ac, *ac_tmp;
-    LIST_FOREACH_SAFE(ac, &client->asyncServiceCalls, pointers, ac_tmp) {
+    LIST_FOREACH_SAFE(ac, &asyncServiceCalls, pointers, ac_tmp) {
         LIST_REMOVE(ac, pointers);
         UA_Client_AsyncService_cancel(client, ac, statusCode);
         UA_free(ac);
@@ -627,17 +636,28 @@ UA_Client_removeCallback(UA_Client *client, UA_UInt64 callbackId) {
 
 static void
 asyncServiceTimeoutCheck(UA_Client *client) {
+    /* Make this function reentrant. One of the async callbacks could indirectly
+     * operate on the list. Moving all elements to a local list before iterating
+     * that. */
+    UA_AsyncServiceList asyncServiceCalls;
     AsyncServiceCall *ac, *ac_tmp;
     UA_DateTime now = UA_DateTime_nowMonotonic();
+    LIST_INIT(&asyncServiceCalls);
     LIST_FOREACH_SAFE(ac, &client->asyncServiceCalls, pointers, ac_tmp) {
         if(!ac->timeout)
            continue;
         if(ac->start + (UA_DateTime)(ac->timeout * UA_DATETIME_MSEC) <= now) {
             LIST_REMOVE(ac, pointers);
-            UA_Client_AsyncService_cancel(client, ac, UA_STATUSCODE_BADTIMEOUT);
-            UA_free(ac);
+            LIST_INSERT_HEAD(&asyncServiceCalls, ac, pointers);
         }
     }
+
+    /* Cancel and remove the elements from the local list */
+    LIST_FOREACH_SAFE(ac, &asyncServiceCalls, pointers, ac_tmp) {
+        LIST_REMOVE(ac, pointers);
+        UA_Client_AsyncService_cancel(client, ac, UA_STATUSCODE_BADTIMEOUT);
+        UA_free(ac);
+    }
 }
 
 static void
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index f4a58c777dc..96901a13008 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -95,6 +95,8 @@ void
 UA_Client_AsyncService_cancel(UA_Client *client, AsyncServiceCall *ac,
                               UA_StatusCode statusCode);
 
+typedef LIST_HEAD(UA_AsyncServiceList, AsyncServiceCall) UA_AsyncServiceList;
+
 void
 UA_Client_AsyncService_removeAll(UA_Client *client, UA_StatusCode statusCode);
 
@@ -147,7 +149,7 @@ struct UA_Client {
     UA_Boolean pendingConnectivityCheck;
 
     /* Async Service */
-    LIST_HEAD(, AsyncServiceCall) asyncServiceCalls;
+    UA_AsyncServiceList asyncServiceCalls;
 
     /* Subscriptions */
 #ifdef UA_ENABLE_SUBSCRIPTIONS

From b42ecc8e9a514d35978cdcf488260839596d5ae7 Mon Sep 17 00:00:00 2001
From: "Jens R." <jennesde@gmail.com>
Date: Wed, 7 May 2025 15:11:02 +0200
Subject: [PATCH 1819/1963] mbedtls createcertificate: fix length calculation

In createcertificate, strlen() was used on a not null terminated string. This could result in using uninitialized memory for SAN attributes or even segfaults.
---
 plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c b/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
index c2f793b5393..cbefecfdddd 100644
--- a/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
+++ b/plugins/crypto/mbedtls/ua_mbedtls_create_certificate.c
@@ -195,7 +195,7 @@ UA_CreateCertificate(const UA_Logger *logger, const UA_String *subject,
         /* split into SAN type and value */
         sanType = strtok(subAlt, ":");
         sanValue = (char *)subjectAltName[i].data + strlen(sanType) + 1;
-        sanValueLength = strlen(sanValue);
+        sanValueLength = subjectAltName[i].length - strlen(sanType) - 1;
 
         if(sanType) {
             cur_tmp = (mbedtls_write_san_list*)mbedtls_calloc(1, sizeof(mbedtls_write_san_list));

From 7a8db31626f092c6f87cae39990cbf6ca2a1b6de Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Thu, 15 May 2025 16:27:26 +0200
Subject: [PATCH 1820/1963] refactor(build): Bump version to v1.4.12

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5df1de86aa6..7eafdd58b40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 11)
+set(OPEN62541_VER_PATCH 12)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From bcb02196fbed8ba2fd77eb0d119372b6f74c9760 Mon Sep 17 00:00:00 2001
From: Marvin Gnad <marvin.gnad@gmail.com>
Date: Mon, 19 May 2025 13:41:53 +0200
Subject: [PATCH 1821/1963] fix(plugin): fix namelist allocated from scandir
 not freed

---
 plugins/crypto/openssl/ua_pki_openssl.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index da3bc3c73ce..fdcdf0a90b1 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -324,6 +324,10 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             UA_ByteString_clear (&strCert);
         }
+        for (i = 0; i < numCertificates; i++) {
+            free(dirlist[i]);
+        }
+        free(dirlist);
     }
 
     if (ctx->issuerListFolder.length > 0) {
@@ -359,6 +363,10 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             UA_ByteString_clear (&strCert);
         }
+        for (i = 0; i < numCertificates; i++) {
+            free(dirlist[i]);
+        }
+        free(dirlist);
     }
 
     if (ctx->revocationListFolder.length > 0) {
@@ -394,6 +402,10 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             UA_ByteString_clear (&strCert);
         }
+        for (i = 0; i < numCertificates; i++) {
+            free(dirlist[i]);
+        }
+        free(dirlist);
     }
 
     ret = UA_STATUSCODE_GOOD;

From 890d6ef808bdf917d3b14e0d206cf0c8ac1ed482 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@iosb.fraunhofer.de>
Date: Mon, 19 May 2025 12:02:01 +0200
Subject: [PATCH 1822/1963] refactor(build): update linux build matrix and
 dependencies

---
 .github/workflows/build_linux.yml | 285 +++++++++++++++++++++---------
 1 file changed, 199 insertions(+), 86 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 7a427546384..f63ae1c39ae 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -7,61 +7,103 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - build_name: "Debug Build & Unit Tests (gcc)"
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
+        build:
+          - name: "Debug Build & Unit Tests (gcc)"
             cmd_action: unit_tests
-          - build_name: "Debug Build & Unit Tests (gcc, 32bit)"
+
+          - name: "Debug Build & Unit Tests (gcc, 32bit)"
             cmd_deps: |
-                sudo dpkg --add-architecture i386
-                sudo apt-get update
-                sudo apt-get install -y -qq gcc-multilib libsubunit-dev:i386 check:i386 libxml2-dev:i386
+              sudo dpkg --add-architecture i386
+              sudo apt-get update
+              sudo apt-get install -y -qq gcc-multilib libsubunit-dev:i386 check:i386 libxml2-dev:i386
             cmd_action: unit_tests_32
-          - build_name: "Debug Build & Unit Tests without Subscriptions (gcc)"
-            cmd_deps: ""
+
+          - name: "Debug Build & Unit Tests without Subscriptions (gcc)"
             cmd_action: unit_tests_nosub
-          - build_name: "Debug Build & Unit Tests with Diagnostics (gcc)"
-            cmd_deps: ""
+
+          - name: "Debug Build & Unit Tests with Diagnostics (gcc)"
             cmd_action: unit_tests_diag
-          - build_name: "Debug Build & Unit Tests with multithreading (gcc)"
-            cmd_deps: ""
+
+          - name: "Debug Build & Unit Tests with multithreading (gcc)"
             cmd_action: unit_tests_mt
-          - build_name: "Debug Build & Unit Tests with Alarms&Conditions (gcc)"
-            cmd_deps: ""
+
+          - name: "Debug Build & Unit Tests with Alarms&Conditions (gcc)"
             cmd_action: unit_tests_alarms
-          - build_name: "Debug Build & Unit Tests (clang)"
-            cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11
-            cmd_action: CC=clang-11 CXX=clang++-11 unit_tests
-          - build_name: "Debug Build & Unit Tests (tcc)"
+
+          - name: "Debug Build & Unit Tests (tcc)"
             cmd_deps: sudo apt-get install -y -qq tcc
             cmd_action: CC=tcc unit_tests
-          - build_name: "Encryption (MbedTLS) Build & Unit Tests (gcc)"
+
+          - name: "Encryption (MbedTLS) Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
             cmd_action: unit_tests_encryption MBEDTLS
-          - build_name: "PubSub Encryption (MbedTLS) Build & Unit Tests (gcc)"
+
+          - name: "PubSub Encryption (MbedTLS) Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
             cmd_action: unit_tests_encryption_mbedtls_pubsub
-          - build_name: "PubSub SKS Build & Unit Tests (gcc)"
+
+          - name: "PubSub SKS Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev
             cmd_action: unit_tests_pubsub_sks
-          - build_name: "Encryption (OpenSSL) Build & Unit Tests (gcc)"
+
+          - name: "Encryption (OpenSSL) Build & Unit Tests (gcc)"
             cmd_deps: sudo apt-get install -y -qq openssl
             cmd_action: unit_tests_encryption OPENSSL
-          - build_name: "Encryption (LibreSSL) Build & Unit Tests (gcc)"
+
+          - name: "Encryption (LibreSSL) Build & Unit Tests (gcc)"
             cmd_deps: |
-                sudo apt-get install -y -qq curl
-                curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.7.2.tar.gz --output libressl.tar.gz
-                tar -xvz -f libressl.tar.gz
-                cd libressl-3.7.2
-                ./configure
-                sudo make install
+              sudo apt-get install -y -qq curl
+              curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.9.1.tar.gz --output libressl.tar.gz
+              tar -xvz -f libressl.tar.gz
+              cd libressl-3.9.1
+              ./configure
+              sudo make install
             cmd_action: unit_tests_encryption LIBRESSL
-          - build_name: "TPM Tool Build"
-            cmd_deps: |
+
+          - name: "Release Build"
+            cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
+            cmd_action: build_release
+
+          - name: "Amalgamation Build"
+            cmd_action: build_amalgamation
+
+          - name: "Amalgamation Build with Multithreading"
+            cmd_action: build_amalgamation_mt
+
+          - name: "Build All Companion Specifications"
+            cmd_action: build_all_companion_specs
+
+        include:          
+          # Clang builds for specific Ubuntu versions
+          - os: ubuntu-20.04
+            build:
+              name: "Debug Build & Unit Tests (clang-11)"
+              cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11
+              cmd_action: CC=clang-11 CXX=clang++-11 unit_tests
+
+          - os: ubuntu-22.04
+            build:
+              name: "Debug Build & Unit Tests (clang-15)"
+              cmd_deps: sudo apt-get install -y -qq clang-15 clang-tools-15 && sudo sysctl -w vm.mmap_rnd_bits=28
+              cmd_action: CC=clang-15 CXX=clang++-15 unit_tests
+
+          - os: ubuntu-24.04
+            build:
+              name: "Debug Build & Unit Tests (clang-18)"
+              cmd_deps: sudo apt-get install -y -qq clang-18 clang-tools-18 && sudo sysctl -w vm.mmap_rnd_bits=28
+              cmd_action: CC=clang-18 CXX=clang++-18 unit_tests          
+          
+          # TPM Tool Builds for specific Ubuntu versions
+          - os: ubuntu-20.04
+            build:
+              name: "TPM Tool Build ubuntu-20.04"
+              cmd_deps: |
                 sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-tss.git
                 cd ${HOME}/tpm2-tss
-                git checkout 2.4.6
+                git checkout 3.2.3
                 ./bootstrap && ./configure --with-udevrulesdir=/etc/udev/rules.d --with-udevrulesprefix=70-
                 make -j$(nproc)
                 sudo make install
@@ -71,7 +113,7 @@ jobs:
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-pkcs11.git
                 cd ${HOME}/tpm2-pkcs11
-                git checkout 1.6.0
+                git checkout 1.7.0
                 ./bootstrap && ./configure
                 make -j$(nproc)
                 sudo make install
@@ -80,38 +122,106 @@ jobs:
                 cd ${HOME}/tpm2-pkcs11/tools/
                 sudo pip3 install pyasn1_modules
                 pip3 install .
-            cmd_action: build_tpm_tool
-          - build_name: "Release Build"
-            cmd_deps: sudo apt-get install -y -qq libmbedtls-dev
-            cmd_action: build_release
-          - build_name: Amalgamation Build
-            cmd_deps: ""
-            cmd_action: build_amalgamation
-          - build_name: Amalgamation Build with Multithreading
-            cmd_deps: ""
-            cmd_action: build_amalgamation_mt
-          - build_name: "Valgrind Build & Unit Tests with MbedTLS (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev
-            cmd_action: unit_tests_valgrind MBEDTLS
-          - build_name: "Valgrind Build & Unit Tests with OpenSSL (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind openssl
-            cmd_action: unit_tests_valgrind OPENSSL
-          - build_name: "Valgrind Examples with MbedTLS (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev python3-netifaces
-            cmd_action: examples_valgrind MBEDTLS
-          - build_name: "Valgrind Examples with OpenSSL (gcc)"
-            cmd_deps: sudo apt-get install -y -qq valgrind openssl libmbedtls-dev python3-netifaces
-            cmd_action: examples_valgrind OPENSSL
-          - build_name: "Clang Static Analyzer"
-            cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev
-            cmd_action: build_clang_analyzer
-          - build_name: "Build All Companion Specifications"
-            cmd_deps: ""
-            cmd_action: build_all_companion_specs
-    name: ${{matrix.build_name}}
+              cmd_action: build_tpm_tool          
+          - os: ubuntu-22.04
+            build:
+              name: "TPM Tool Build ubuntu-22.04"
+              cmd_deps: |
+                sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev
+                cd ${HOME}
+                git clone https://github.com/tpm2-software/tpm2-tss.git
+                cd ${HOME}/tpm2-tss
+                git checkout 3.2.3
+                ./bootstrap && ./configure --with-udevrulesdir=/etc/udev/rules.d --with-udevrulesprefix=70-
+                make -j$(nproc)
+                sudo make install
+                sudo ldconfig
+                sudo udevadm control --reload-rules && sudo udevadm trigger
+                sudo apt-get install -y -qq tpm2-tools opensc
+                cd ${HOME}
+                git clone https://github.com/tpm2-software/tpm2-pkcs11.git
+                cd ${HOME}/tpm2-pkcs11
+                git checkout 1.7.0
+                ./bootstrap && ./configure
+                make -j$(nproc)
+                sudo make install
+                sudo ldconfig
+                sudo cp ${HOME}/tpm2-pkcs11/src/pkcs11.h /usr/include
+                cd ${HOME}/tpm2-pkcs11/tools/
+                sudo pip3 install pyasn1_modules
+                pip3 install .
+              cmd_action: build_tpm_tool          
+          - os: ubuntu-24.04
+            build:
+              name: "TPM Tool Build ubuntu-24.04"
+              cmd_deps: |
+                sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev libltdl-dev python3-pyasn1-modules
+                cd ${HOME}
+                git clone https://github.com/tpm2-software/tpm2-tss.git
+                cd ${HOME}/tpm2-tss
+                git checkout 4.1.3
+                ./bootstrap && ./configure --with-udevrulesdir=/etc/udev/rules.d --with-udevrulesprefix=70-
+                make -j$(nproc)
+                sudo make install
+                sudo ldconfig
+                sudo udevadm control --reload-rules && sudo udevadm trigger
+                sudo apt-get install -y -qq tpm2-tools python3-tpm2-pytss opensc
+                cd ${HOME}
+                git clone https://github.com/tpm2-software/tpm2-pkcs11.git
+                cd ${HOME}/tpm2-pkcs11
+                git checkout 1.9.1
+                ./bootstrap && ./configure
+                make -j$(nproc)
+                sudo make install
+                sudo ldconfig
+                sudo cp ${HOME}/tpm2-pkcs11/src/pkcs11.h /usr/include
+                cd ${HOME}/tpm2-pkcs11/tools/
+                pip3 install --break-system-packages .
+              cmd_action: build_tpm_tool   
+                 
+          # Valgrind tests for specific Ubuntu versions
+          - os: ubuntu-24.04
+            build:
+              name: "Valgrind Build & Unit Tests with MbedTLS (gcc)"
+              cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev
+              cmd_action: unit_tests_valgrind MBEDTLS          
+          - os: ubuntu-24.04
+            build:
+              name: "Valgrind Build & Unit Tests with OpenSSL (gcc)"
+              cmd_deps: sudo apt-get install -y -qq valgrind openssl
+              cmd_action: unit_tests_valgrind OPENSSL          
+          - os: ubuntu-24.04
+            build:
+              name: "Valgrind Examples with MbedTLS and mDNSD (gcc)"
+              cmd_deps: sudo apt-get install -y -qq valgrind libmbedtls-dev python3-netifaces
+              cmd_action: examples_valgrind MBEDTLS MDNSD          
+          - os: ubuntu-24.04
+            build:
+              name: "Valgrind Examples with OpenSSL and avahi-mdns(gcc)"
+              cmd_deps: sudo apt-get install -y -qq valgrind openssl libmbedtls-dev python3-netifaces libavahi-client-dev libavahi-common-dev
+              cmd_action: examples_valgrind OPENSSL AVAHI          
+              
+          # Clang Static Analyzer Builds
+          - os: ubuntu-20.04
+            build:
+              name: "Clang Static Analyzer (clang11)"
+              cmd_deps: sudo apt-get install -y -qq clang-11 clang-tools-11 libmbedtls-dev
+              cmd_action: CC=clang-11 CXX=clang++-11 build_clang_analyzer 11          
+          - os: ubuntu-22.04
+            build:
+              name: "Clang Static Analyzer (clang15)"
+              cmd_deps: sudo apt-get install -y -qq clang-15 clang-tools-15 libmbedtls-dev
+              cmd_action: CC=clang-15 CXX=clang++-15 build_clang_analyzer 15          
+          - os: ubuntu-24.04
+            build:
+              name: "Clang Static Analyzer (clang18)"
+              cmd_deps: sudo apt-get install -y -qq clang-18 clang-tools-18 libmbedtls-dev
+              cmd_action: CC=clang-18 CXX=clang++-18 build_clang_analyzer 18
+
+    name: ${{ matrix.os }}-${{ matrix.build.name }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/marwinglaser/ci:ubuntu-20.04
+      image: ghcr.io/marwinglaser/ci:${{ matrix.os }}
       options: --privileged
     services:
       mosquitto:
@@ -119,26 +229,29 @@ jobs:
     env:
       OPEN62541_TEST_MQTT_BROKER: opc.mqtt://mosquitto:1883
     steps:
-    - name: Work around disabled ipv6 on actions container networks
-      run: |
-        IPV6="$(cat /proc/sys/net/ipv6/conf/eth0/disable_ipv6)"
-        echo "Current IPv6 status on eth0: $IPV6"
-        [ "$IPV6" = "1" ] || exit
-
-        echo 0 | sudo tee /proc/sys/net/ipv6/conf/eth0/disable_ipv6 > /dev/null
-        IPV6="$(cat /proc/sys/net/ipv6/conf/eth0/disable_ipv6)"
-        echo "New IPv6 status on eth0: $IPV6"
-        [ "$IPV6" = "0" ] || { echo "Failed to enable IPv6 on eth0"; exit 1; }
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-    - name: Install Dependencies
-      run: |
-        sudo apt-get update
-        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential cmake libcap2-bin pkg-config libssl-dev python3-sphinx graphviz check libxml2-dev
-        ${{ matrix.cmd_deps }}
-    - name: ${{matrix.build_name}}
-      shell: bash
-      run: source tools/ci.sh && ${{matrix.cmd_action}}
-      env:
-        ETHERNET_INTERFACE: eth0
+      - name: Work around disabled ipv6 on actions container networks
+        run: |
+          IPV6="$(cat /proc/sys/net/ipv6/conf/eth0/disable_ipv6)"
+          echo "Current IPv6 status on eth0: $IPV6"
+          [ "$IPV6" = "1" ] || exit
+
+          echo 0 | sudo tee /proc/sys/net/ipv6/conf/eth0/disable_ipv6 > /dev/null
+          IPV6="$(cat /proc/sys/net/ipv6/conf/eth0/disable_ipv6)"
+          echo "New IPv6 status on eth0: $IPV6"
+          [ "$IPV6" = "0" ] || { echo "Failed to enable IPv6 on eth0"; exit 1; }      
+      - uses: actions/checkout@v4
+        if: matrix.build.os == '' || matrix.build.os == matrix.os
+        with:
+          submodules: true
+      - name: Install Dependencies
+        if: matrix.build.os == '' || matrix.build.os == matrix.os
+        run: |
+          sudo apt-get update
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential cmake libcap2-bin pkg-config libssl-dev python3-sphinx graphviz check libxml2-dev libpcap-dev
+          ${{ matrix.build.cmd_deps }}      
+      - name: ${{ matrix.build.name }}
+        if: matrix.build.os == '' || matrix.build.os == matrix.os
+        shell: bash
+        run: source tools/ci/ci.sh && ${{ matrix.build.cmd_action }}
+        env:
+          ETHERNET_INTERFACE: eth0

From d25bce1a77e067a1fd370af40d31d030fff1ce28 Mon Sep 17 00:00:00 2001
From: andreasebner <andreas.ebner@mni.thm.de>
Date: Wed, 21 May 2025 08:57:44 +0200
Subject: [PATCH 1823/1963] fix(ci) update path to build scripts

---
 .github/workflows/build_linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index f63ae1c39ae..4f135b5f1c8 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -252,6 +252,6 @@ jobs:
       - name: ${{ matrix.build.name }}
         if: matrix.build.os == '' || matrix.build.os == matrix.os
         shell: bash
-        run: source tools/ci/ci.sh && ${{ matrix.build.cmd_action }}
+        run: source tools/ci.sh && ${{ matrix.build.cmd_action }}
         env:
           ETHERNET_INTERFACE: eth0

From 749e611a6072673af0495ee45f19a25438a3c8ba Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 24 Apr 2025 18:02:12 +0200
Subject: [PATCH 1824/1963] fix(arch): Don't use UA_EventLoopPOSIX_setReusable
 for raw ETH sockets

---
 arch/eventloop_posix_eth.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_eth.c b/arch/eventloop_posix_eth.c
index f2a1564e4cf..bd9ad33f9e1 100644
--- a/arch/eventloop_posix_eth.c
+++ b/arch/eventloop_posix_eth.c
@@ -635,7 +635,9 @@ ETH_openConnection(UA_ConnectionManager *cm, const UA_KeyValueMap *params,
         UA_UNLOCK(&el->elMutex);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    res |= UA_EventLoopPOSIX_setReusable(sockfd);
+
+    /* SO_REUSEADDR is unnecessary (and unsupported on some Linux systems):
+     * res |= UA_EventLoopPOSIX_setReusable(sockfd); */
     res |= UA_EventLoopPOSIX_setNonBlocking(sockfd);
     res |= UA_EventLoopPOSIX_setNoSigPipe(sockfd);
     if(res != UA_STATUSCODE_GOOD)

From d463bfff456308a181d0082607d70da42311c30e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 24 Apr 2025 18:34:41 +0200
Subject: [PATCH 1825/1963] fix(ci): Exclude the unit tests from clang-analyzer
 checks

---
 tools/ci.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 0dd365af98f..eab12bbdc88 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -419,7 +419,11 @@ function build_clang_analyzer {
           -DUA_ENABLE_PUBSUB_MONITORING=ON \
           -DUA_FORCE_WERROR=ON \
           ..
-    scan-build-11 --status-bugs make ${MAKEOPTS}
+    scan-build-$version \
+          --status-bugs \
+          --exclude ../src/util \
+          --exclude ../tests \
+          make ${MAKEOPTS}
 }
 
 ###################################################

From 0f3a97746fe11cedc6111cfb10f10f572794d9d4 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <ebner.andreas@outlook.com>
Date: Wed, 21 May 2025 22:20:28 +0200
Subject: [PATCH 1826/1963] fix(tests): update NaN checks for UA_Float and
 UA_Double to accommodate architecture variations

---
 tests/check_types_builtin_xml.c | 38 +++++++--------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/tests/check_types_builtin_xml.c b/tests/check_types_builtin_xml.c
index 9566bed4773..85a0c98f48c 100644
--- a/tests/check_types_builtin_xml.c
+++ b/tests/check_types_builtin_xml.c
@@ -1667,22 +1667,13 @@ START_TEST(UA_Float_xml_nan_decode) {
     UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_FLOAT], NULL);
 
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-#if !defined(__TINYC__) && (defined(__clang__) || (!defined(__aarch64__) && !defined(__amd64__)))
-    // gcc 32-bit and linux clang specific
-    // 0 11111111 10000000000000000000000
-    // 7f c0 00 00
     ck_assert_int_eq(((u8*)&out)[0], 0x00);
     ck_assert_int_eq(((u8*)&out)[1], 0x00);
     ck_assert_int_eq(((u8*)&out)[2], 0xc0);
-    ck_assert_int_eq(((u8*)&out)[3], 0x7f);
-#else
-    // 1 11111111 10000000000000000000000
-    // ff c0 00 00
-    ck_assert_int_eq(((u8*)&out)[0], 0x00);
-    ck_assert_int_eq(((u8*)&out)[1], 0x00);
-    ck_assert_int_eq(((u8*)&out)[2], 0xc0);
-    ck_assert_int_eq(((u8*)&out)[3], 0xff);
-#endif
+
+    /* Some 32bit architectures have a different "native" NaN.
+     * NaN can have different valid representations. */
+    ck_assert(((u8*)&out)[3] == 0x7f || ((u8*)&out)[3] == 0xff);
 
     UA_Float val = out;
     ck_assert(val != val); /* Check if not a number */
@@ -1804,10 +1795,6 @@ START_TEST(UA_Double_nan_xml_decode) {
     UA_StatusCode retval = UA_decodeXml(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
 
     ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
-#if !defined(__TINYC__) && (defined(__clang__) || (!defined(__aarch64__) && !defined(__amd64__)))
-    // gcc 32-bit and linux clang specific
-    // 0 11111111111 1000000000000000000000000000000000000000000000000000
-    // ff f8 00 00 00 00 00 00
     ck_assert_int_eq(((u8*)&out)[0], 0x00);
     ck_assert_int_eq(((u8*)&out)[1], 0x00);
     ck_assert_int_eq(((u8*)&out)[2], 0x00);
@@ -1815,19 +1802,10 @@ START_TEST(UA_Double_nan_xml_decode) {
     ck_assert_int_eq(((u8*)&out)[4], 0x00);
     ck_assert_int_eq(((u8*)&out)[5], 0x00);
     ck_assert_int_eq(((u8*)&out)[6], 0xf8);
-    ck_assert_int_eq(((u8*)&out)[7], 0x7f);
-#else
-    // 1 11111111111 1000000000000000000000000000000000000000000000000000
-    // ff f8 00 00 00 00 00 00
-    ck_assert_int_eq(((u8*)&out)[0], 0x00);
-    ck_assert_int_eq(((u8*)&out)[1], 0x00);
-    ck_assert_int_eq(((u8*)&out)[2], 0x00);
-    ck_assert_int_eq(((u8*)&out)[3], 0x00);
-    ck_assert_int_eq(((u8*)&out)[4], 0x00);
-    ck_assert_int_eq(((u8*)&out)[5], 0x00);
-    ck_assert_int_eq(((u8*)&out)[6], 0xf8);
-    ck_assert_int_eq(((u8*)&out)[7], 0xff);
-#endif
+
+    /* Some 32bit architectures have a different "native" NaN.
+     * NaN can have different valid representations. */
+    ck_assert(((u8*)&out)[7] == 0x7f || ((u8*)&out)[7] == 0xff);
 
     UA_Double val = out;
     ck_assert(val != val); /* Check if not a number */

From 30a9716c82b7a05d0df5a3131c5d7a63a5107144 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Tue, 17 Oct 2023 09:48:06 +0200
Subject: [PATCH 1827/1963] fix(ci): Fix an ill-defined regex in
 valgrind_check_error.py

(cherry picked from commit 7f97400486f17e90e4702040e65d0dc9aadf86e4)
---
 tools/valgrind_check_error.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/valgrind_check_error.py b/tools/valgrind_check_error.py
index a263f6aac26..c6c3da1ed5b 100755
--- a/tools/valgrind_check_error.py
+++ b/tools/valgrind_check_error.py
@@ -60,7 +60,7 @@ def execute(command):
 
 # Try to parse the output. Look for the following line:
 # ==17054== FILE DESCRIPTORS: 5 open at exit.
-descriptors_re = re.compile(r".*==(\d+)==\s+FILE DESCRIPTORS: (\d+) open at exit\..*")
+descriptors_re = re.compile(r".*==(\d+)==\s+FILE DESCRIPTORS: (\d+) open(\s\(\d std\))? at exit\..*")
 m = descriptors_re.match(log_content)
 
 if not m:

From 1f1ba9a3768306f30002e39a0755c27aa40fb0cc Mon Sep 17 00:00:00 2001
From: Marwin Glaser <marwin.glaser@iosb.fraunhofer.de>
Date: Tue, 25 Mar 2025 13:58:10 +0100
Subject: [PATCH 1828/1963] fix(ci): suppress invalid valgrind report in
 pthread_create in tests

---
 tools/valgrind_suppressions.supp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tools/valgrind_suppressions.supp b/tools/valgrind_suppressions.supp
index 591ffa6647e..b079729b214 100644
--- a/tools/valgrind_suppressions.supp
+++ b/tools/valgrind_suppressions.supp
@@ -10,6 +10,24 @@
 }
 
 
+{
+   <ubuntu2204_pthread_create>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:calloc
+   fun:calloc
+   fun:allocate_dtv
+   fun:_dl_allocate_tls
+   fun:allocate_stack
+   fun:pthread_create@@GLIBC_2.34
+   ...
+   fun:setup*
+   fun:srunner_run_setup
+   ...
+   fun:srunner_run_tagged
+   fun:main
+}
+
 
 # Custom suppressions added by @Pro
 

From 9d19f677894932082b8689359c0da7f04564323e Mon Sep 17 00:00:00 2001
From: julepp <64079453+julepp@users.noreply.github.com>
Date: Wed, 21 May 2025 23:02:18 +0200
Subject: [PATCH 1829/1963] fix(nc): Correctly parse prefix of opaque NodeIds

---
 tools/nodeset_compiler/datatypes.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index 1b0b04108d7..222e5a5d5ff 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -37,7 +37,7 @@ def unicode(s):
 
     string_types = str
 else:
-    string_types = basestring 
+    string_types = basestring
 
 def getNextElementNode(xmlvalue):
     if xmlvalue is None:
@@ -350,7 +350,7 @@ def __parseXMLSingleValue(self, xmlvalue, parentDataTypeNode, parent, parser, al
                 else:
                     logger.error(str(parent.id) + ": Could not parse <SwitchFiled> for Union.")
                     return self
-                
+
 
             childValue = ebodypart.firstChild
             if not childValue.nodeType == ebodypart.ELEMENT_NODE:
@@ -685,7 +685,7 @@ def setFromIdString(self, idstring):
                     self.ns = namespaceMapping[self.ns]
             elif p[:2] == "i=":
                 self.i = int(p[2:])
-            elif p[:2] == "o=":
+            elif p[:2] == "b=":
                 self.b = p[2:]
             elif p[:2] == "g=":
                 tmp = []

From 8c2f0309dd7176f548dc92ef5e56c0f1237d7856 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <ebner.andreas@outlook.com>
Date: Wed, 21 May 2025 23:32:38 +0200
Subject: [PATCH 1830/1963] fix(ci): parameterize clang analyzer version in
 build script

---
 tools/ci.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index eab12bbdc88..c74de434f48 100644
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -405,8 +405,9 @@ function examples_valgrind {
 ##############################
 
 function build_clang_analyzer {
+    local version=$1
     mkdir -p build; cd build; rm -rf *
-    scan-build-11 cmake -DCMAKE_BUILD_TYPE=Debug \
+    scan-build-$version cmake -DCMAKE_BUILD_TYPE=Debug \
           -DUA_BUILD_EXAMPLES=ON \
           -DUA_BUILD_UNIT_TESTS=ON \
           -DUA_ENABLE_ENCRYPTION=MBEDTLS \

From c297fdaa1c62a8ccf839f9e4411cb06e84d684d9 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Sun, 25 May 2025 16:02:55 +0200
Subject: [PATCH 1831/1963] fix(server) make valgrind suppression more generic
 to skip skstest false positive report

---
 tools/valgrind_suppressions.supp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/valgrind_suppressions.supp b/tools/valgrind_suppressions.supp
index b079729b214..1fcc91683a0 100644
--- a/tools/valgrind_suppressions.supp
+++ b/tools/valgrind_suppressions.supp
@@ -21,7 +21,7 @@
    fun:allocate_stack
    fun:pthread_create@@GLIBC_2.34
    ...
-   fun:setup*
+   fun:*setup*
    fun:srunner_run_setup
    ...
    fun:srunner_run_tagged

From c981ba296afef013e765771a737396036adedc50 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@iosb.fraunhofer.de>
Date: Sun, 25 May 2025 16:14:15 +0200
Subject: [PATCH 1832/1963] feat(server) update nodeset loader submodule
 reference

---
 deps/nodesetLoader | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
index a6ef45054ff..fbedde3f81c 160000
--- a/deps/nodesetLoader
+++ b/deps/nodesetLoader
@@ -1 +1 @@
-Subproject commit a6ef45054ff74e0d798fccc257e4646355dadb6a
+Subproject commit fbedde3f81c6c517ce0656661c13e46503b19342

From 62122caa5fb08185c873078b4fd45807c0404d2d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 27 May 2025 23:10:02 +0200
Subject: [PATCH 1833/1963] fix(server): Check the NodeClass before processing
 an async method

---
 src/server/ua_services_method.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 3418e5855de..0bcdf07941a 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -350,6 +350,13 @@ Operation_CallMethodAsync(UA_Server *server, UA_Session *session, UA_UInt32 requ
         goto cleanup;
     }
 
+    /* Check the NodeClass */
+    if(method->head.nodeClass != UA_NODECLASS_METHOD ||
+       object->head.nodeClass != UA_NODECLASS_OBJECT) {
+        opResult->statusCode = UA_STATUSCODE_BADNODECLASSINVALID;
+        goto cleanup;
+    }
+
     /* <-- Async method call --> */
 
     /* No AsyncResponse allocated so far */

From ce345f9f73c3f5a84c4921c92a35e03629f9993f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 27 May 2025 19:29:52 +0200
Subject: [PATCH 1834/1963] fix(server): Check access rights for async method
 execution

---
 src/server/ua_services_method.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/server/ua_services_method.c b/src/server/ua_services_method.c
index 0bcdf07941a..6381df7a314 100644
--- a/src/server/ua_services_method.c
+++ b/src/server/ua_services_method.c
@@ -357,6 +357,21 @@ Operation_CallMethodAsync(UA_Server *server, UA_Session *session, UA_UInt32 requ
         goto cleanup;
     }
 
+    /* Check the access rights */
+    UA_Boolean executable = method->methodNode.executable;
+    if(session != &server->adminSession) {
+        executable = executable && server->config.accessControl.
+            getUserExecutableOnObject(server, &server->config.accessControl,
+                                      &session->sessionId, session->sessionHandle,
+                                      &opRequest->methodId, method->head.context,
+                                      &opRequest->objectId, object->head.context);
+    }
+
+    if(!executable) {
+        opResult->statusCode = UA_STATUSCODE_BADNOTEXECUTABLE;
+        goto cleanup;
+    }
+
     /* <-- Async method call --> */
 
     /* No AsyncResponse allocated so far */

From e3524be566ab118cd0aa86927cdcd04f687f9fe5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Fri, 11 Apr 2025 19:14:44 +0200
Subject: [PATCH 1835/1963] refactor(tools): Cosmetic cleanup of
 tools/nodeset_injector/CMakeLists.txt

(cherry picked from commit cc152571621509c90b1af6a877f0f48e69b52e65)
---
 tools/nodeset_injector/CMakeLists.txt | 84 +++++++++++----------------
 1 file changed, 34 insertions(+), 50 deletions(-)

diff --git a/tools/nodeset_injector/CMakeLists.txt b/tools/nodeset_injector/CMakeLists.txt
index a1c8d52110a..e91ff9f54dc 100644
--- a/tools/nodeset_injector/CMakeLists.txt
+++ b/tools/nodeset_injector/CMakeLists.txt
@@ -1,11 +1,13 @@
 foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
+
     string(TOLOWER "${MODEL}" NODESET_NAME)
 
     # only one xml file
     # no dependency
-    if(MODEL STREQUAL "DEXPI" OR MODEL STREQUAL "Safety" OR MODEL STREQUAL "CNC" OR MODEL STREQUAL "BACnet"
-       OR MODEL STREQUAL "AMB" OR MODEL STREQUAL "MachineVision" OR MODEL STREQUAL "RSL" OR MODEL STREQUAL "I4AAS"
-       OR MODEL STREQUAL "PackML" OR MODEL STREQUAL "MTConnect")
+    if(MODEL STREQUAL "DEXPI" OR MODEL STREQUAL "Safety" OR MODEL STREQUAL "CNC" OR MODEL STREQUAL "BACnet" OR
+       MODEL STREQUAL "AMB" OR MODEL STREQUAL "MachineVision" OR MODEL STREQUAL "RSL" OR MODEL STREQUAL "I4AAS" OR
+       MODEL STREQUAL "PackML" OR MODEL STREQUAL "MTConnect")
+
         # get csv file
         file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.csv")
         foreach(file ${files})
@@ -14,6 +16,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 set(csv_file ${file})
             endif()
         endforeach()
+
         # get xml file
         file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.xml")
         foreach(file ${files})
@@ -23,20 +26,16 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
             endif()
         endforeach()
 
-        ua_generate_nodeset_and_datatypes(
-                NAME "${NODESET_NAME}"
-                FILE_CSV "${csv_file}"
-                IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
-                FILE_NS "${xml_file}"
-                INTERNAL
-                AUTOLOAD
-        )
+        ua_generate_nodeset_and_datatypes(NAME "${NODESET_NAME}" FILE_CSV "${csv_file}"
+                                          IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
+                                          FILE_NS "${xml_file}" INTERNAL AUTOLOAD)
 
     # only one xml file
     # di as dependency
-    elseif(MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK"
-       OR MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT" OR MODEL STREQUAL "Robotics"
-       OR MODEL STREQUAL "CommercialKitchenEquipment" OR MODEL STREQUAL "Machinery")
+    elseif(MODEL STREQUAL "CSPPlusForMachine" OR MODEL STREQUAL "POWERLINK" OR
+           MODEL STREQUAL "IA" OR MODEL STREQUAL "FDT" OR MODEL STREQUAL "Robotics" OR
+           MODEL STREQUAL "CommercialKitchenEquipment" OR MODEL STREQUAL "Machinery")
+
         # get csv file
         file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.csv")
         foreach(file ${files})
@@ -45,6 +44,7 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 set(csv_file ${file})
             endif()
         endforeach()
+
         # get xml file
         file(GLOB files "${UA_NODESET_DIR}/${MODEL}/*.xml")
         foreach(file ${files})
@@ -54,28 +54,18 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
             endif()
         endforeach()
 
-        ua_generate_nodeset_and_datatypes(
-                NAME "${NODESET_NAME}"
-                FILE_CSV "${csv_file}"
-                IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
-                FILE_NS "${xml_file}"
-                INTERNAL
-                AUTOLOAD
-                DEPENDS "di"
-        )
+        ua_generate_nodeset_and_datatypes(NAME "${NODESET_NAME}" FILE_CSV "${csv_file}"
+                                          IMPORT_BSD "UA_TYPES#${UA_NODESET_DIR}/Schema/Opc.Ua.Types.bsd"
+                                          FILE_NS "${xml_file}" INTERNAL AUTOLOAD DEPENDS "di")
 
     # more dependencies
     elseif(MODEL STREQUAL "CAS")
-        ua_generate_nodeset_and_datatypes(
-                NAME "${NODESET_NAME}"
-                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
-                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
-                INTERNAL
-                AUTOLOAD
-                DEPENDS "di"
-                DEPENDS "machinery"
-                DEPENDS "ia"
-        )
+
+        ua_generate_nodeset_and_datatypes(NAME "${NODESET_NAME}"
+                                          FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
+                                          FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                                          INTERNAL AUTOLOAD DEPENDS "di" DEPENDS "machinery" DEPENDS "ia")
+
     elseif(MODEL STREQUAL "TMC")
         ua_generate_nodeset_and_datatypes(
                 NAME "${NODESET_NAME}"
@@ -257,25 +247,19 @@ foreach(MODEL ${UA_INFORMATION_MODEL_AUTOLOAD})
                 AUTOLOAD
         )
     elseif(MODEL STREQUAL "PADIM")
-        ua_generate_nodeset_and_datatypes(
-                NAME "irdi"
-                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.IRDI.NodeSet2.xml"
-                INTERNAL
-                AUTOLOAD
-        )
+
+        ua_generate_nodeset_and_datatypes(NAME "irdi"
+                                          FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.IRDI.NodeSet2.xml"
+                                          INTERNAL AUTOLOAD)
 
         set(TMP_NSURI "http://opcfoundation.org/UA/${MODEL}/")
-        configure_file(${PROJECT_SOURCE_DIR}/tools/nodeset_injector/empty.bsd.template "${CMAKE_BINARY_DIR}/bsd_files_gen/Opc.Ua.${MODEL}.Types.bsd")
-        ua_generate_nodeset_and_datatypes(
-                NAME "${NODESET_NAME}"
-                FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
-                FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
-                FILE_BSD "${CMAKE_BINARY_DIR}/bsd_files_gen/Opc.Ua.${MODEL}.Types.bsd"
-                INTERNAL
-                AUTOLOAD
-                DEPENDS "di"
-                DEPENDS "irdi"
-        )
+        configure_file(${PROJECT_SOURCE_DIR}/tools/nodeset_injector/empty.bsd.template
+                       "${CMAKE_BINARY_DIR}/bsd_files_gen/Opc.Ua.${MODEL}.Types.bsd")
+        ua_generate_nodeset_and_datatypes(NAME "${NODESET_NAME}"
+                                          FILE_NS "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeSet2.xml"
+                                          FILE_CSV "${UA_NODESET_DIR}/${MODEL}/Opc.Ua.${MODEL}.NodeIds.csv"
+                                          FILE_BSD "${CMAKE_BINARY_DIR}/bsd_files_gen/Opc.Ua.${MODEL}.Types.bsd"
+                                          INTERNAL AUTOLOAD DEPENDS "di" DEPENDS "irdi")
     else()
         MESSAGE(WARNING "The specified nodeset '${MODEL}' is not supported or is misspelled.")
     endif()

From 82f6e65635cf3feae942b252f6efe8fa153a6459 Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Tue, 6 May 2025 13:01:08 +0200
Subject: [PATCH 1836/1963] refactor(tools): Simplify code generation in
 nodeset injector

(cherry picked from commit 2f80c19b85d6937472aad21fec269d69cb3c34e5)
---
 .../generate_nodesetinjector.py               |  52 +++++-
 .../generate_nodesetinjector_content.py       | 148 ------------------
 2 files changed, 45 insertions(+), 155 deletions(-)
 delete mode 100644 tools/nodeset_injector/generate_nodesetinjector_content.py

diff --git a/tools/nodeset_injector/generate_nodesetinjector.py b/tools/nodeset_injector/generate_nodesetinjector.py
index 7d94512386a..0b38aaa3b7a 100644
--- a/tools/nodeset_injector/generate_nodesetinjector.py
+++ b/tools/nodeset_injector/generate_nodesetinjector.py
@@ -11,10 +11,14 @@
 
 parser = argparse.ArgumentParser()
 parser.add_argument('outfile', help='outfile w/o extension')
+parser.add_argument('nodesets', nargs='+', help='List of Nodesets')
 args = parser.parse_args()
 
-fh = open(args.outfile + ".h", "wt", encoding='utf8')
-fc = open(args.outfile + ".c", "wt", encoding='utf8')
+# Normalize to lower case letters
+nodesets = [ns.lower().replace('-', '_') for ns in args.nodesets]
+
+fh = open(args.outfile + ".h", "w", encoding='utf8')
+fc = open(args.outfile + ".c", "w", encoding='utf8')
 
 def printh(string):
     print(string, end=u'\n', file=fh)
@@ -53,14 +57,48 @@ def printc(string):
  * Any manual changes will be overwritten. */
 
 #include "nodesetinjector.h"
-//<
+''')
+
+# Includes for each nodeset
+for ns in nodesets:
+    printc(u'''#include <open62541/namespace_{ns}_generated.h>'''.format(ns=ns))
+
+# Special case: PADIM requires IRDI beforehand
+if 'padim' in nodesets:
+    printc(u'''#include <open62541/namespace_irdi_generated.h>''')
 
+printc(u'''
 UA_StatusCode UA_Server_injectNodesets(UA_Server *server) {
-UA_StatusCode retval = UA_STATUSCODE_GOOD;
-UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Attaching the AUTOLOAD Nodesets to the server!");
-//>
+    UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Attaching the AUTOLOAD Nodesets to the server!");
+''')
 
-return retval;
+# Function calls for each nodeset
+for ns in nodesets:
+    # Special handling: Insert IRDI before PADIM
+    if ns == 'padim':
+        printc(u'''
+    /* namespace_irdi_generated */
+    retval |= namespace_irdi_generated(server);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Adding the namespace_irdi_generated failed. Please check previous error output.");
+        return retval;
+    }
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "The namespace_irdi_generated successfully added.");
+        ''')
+
+    printc(u'''
+    /* namespace_{ns}_generated */
+    retval |= namespace_{ns}_generated(server);
+    if(retval != UA_STATUSCODE_GOOD) {{
+        UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Adding the namespace_{ns}_generated failed. Please check previous error output.");
+        return retval;
+    }}
+    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "The namespace_{ns}_generated successfully added.");
+    '''.format(ns=ns))
+
+printc(u'''
+    return retval;
 }
 ''')
 
diff --git a/tools/nodeset_injector/generate_nodesetinjector_content.py b/tools/nodeset_injector/generate_nodesetinjector_content.py
deleted file mode 100644
index 470294d8782..00000000000
--- a/tools/nodeset_injector/generate_nodesetinjector_content.py
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/usr/bin/env python3
-
-### This Source Code Form is subject to the terms of the Mozilla Public
-### License, v. 2.0. If a copy of the MPL was not distributed with this
-### file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-###    Copyright 2023 (c) Fraunhofer IOSB (Author: Noel Graf)
-
-import argparse
-import re
-import os
-import platform
-
-parser = argparse.ArgumentParser()
-parser.add_argument('outfile', help='outfile w/o extension')
-parser.add_argument('namespace', help='namespace')
-args = parser.parse_args()
-
-include_line_counter = 0
-code_line_counter = 0
-existing_namespaces = []
-data = []
-
-
-def is_unix():
-    try:
-        # Check if the os.uname() function is available
-        os.uname()
-        return True
-    except:
-        return False
-
-
-def windows_exec():
-    import msvcrt
-
-    global include_line_counter
-    global code_line_counter
-    global existing_namespaces
-    global data
-
-    # Open the file in read-write mode
-    with open(args.outfile + ".c", "r+", encoding='utf8') as file:
-        # Lock the file
-        msvcrt.locking(file.fileno(), msvcrt.LK_LOCK, 1)
-
-        # Write to the file
-        write_code_generation(file)
-
-        # Unlock the file
-        msvcrt.locking(file.fileno(), msvcrt.LK_UNLCK, 1)
-
-
-def unix_exec():
-    import fcntl
-
-    global include_line_counter
-    global code_line_counter
-    global existing_namespaces
-    global data
-
-    with open(args.outfile + ".c", "r+", encoding='utf8') as file:
-            # Acquire a lock on the file
-            fcntl.flock(file, fcntl.LOCK_EX)
-
-            # Write to the file
-            write_code_generation(file)
-
-            # Release the lock on the file
-            fcntl.flock(file, fcntl.LOCK_UN)
-
-
-def print_include(string):
-    data[include_line_counter] = string
-
-
-def print_function_call(string):
-    data[code_line_counter] = string
-
-
-def generate_code():
-    #########################
-    # Print the header file #
-    #########################
-
-    print_include(u'''
-#include <open62541/{namespace}.h>
-//<
-'''.format(namespace=args.namespace))
-
-    #########################
-    # Print the source file #
-    #########################
-
-    print_function_call(u'''
-/* {namespace} */
-retval |= {namespace}(server);
-if(retval != UA_STATUSCODE_GOOD) {{
-UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Adding the {namespace} failed. Please check previous error output.");
-UA_Server_delete(server);
-return EXIT_FAILURE;
-}}
-UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "The {namespace} successfully added.");
-//>
-'''.format(namespace=args.namespace))
-
-
-def write_code_generation(file):
-    global include_line_counter
-    global code_line_counter
-    global existing_namespaces
-    global data
-
-    # Write to the file
-    lines = file.readlines()
-    line_counter = 0
-    # List which contains the existing namespaces
-    existing_namespaces = []
-    for line in lines:
-        namespaces = re.findall("namespace_.*_generated\(.*\)", line)
-        if namespaces:
-            namespaces = namespaces[0].split("(")[0]
-            existing_namespaces.append(namespaces)
-        if re.search("//<", line):
-            include_line_counter = line_counter
-        if re.search("//>", line):
-            code_line_counter = line_counter
-        line_counter += 1
-
-    if args.namespace not in existing_namespaces:
-        # Set the file descriptor to the beginning of the file
-        file.seek(0)
-        # read a list of lines into data
-        data = file.readlines()
-        generate_code()
-        # Set the file descriptor to the beginning of the file and delete content
-        file.seek(0)
-        file.truncate(0)
-        file.writelines(data)
-
-
-if platform.system == "Linux":
-    unix_exec()
-else:
-    if is_unix():
-        unix_exec()
-    else:
-        windows_exec()

From af7f9cd0c61fff4204bb9f154f6af19459ae3dcb Mon Sep 17 00:00:00 2001
From: Noel Graf <noel.gerome.graf@gmail.com>
Date: Fri, 23 May 2025 15:08:49 +0200
Subject: [PATCH 1837/1963] refactor(tools): Refactor cmake call for nodeset
 injector to match recent changes

---
 CMakeLists.txt                    | 5 +++--
 tools/cmake/open62541Macros.cmake | 6 +-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7eafdd58b40..a2bc2afb350 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1256,9 +1256,10 @@ ua_generate_nodeset(NAME "ns0" FILE ${UA_FILE_NODESETS}
 if(UA_ENABLE_NODESET_INJECTOR)
     message(STATUS "Nodesetinjector feature enabled")
     add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h
-                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
+                              ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
                        COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/nodeset_injector/generate_nodesetinjector.py
-                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector)
+                                                     ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector
+                                                     ${UA_INFORMATION_MODEL_AUTOLOAD})
     add_custom_target(open62541-generator-nodesetinjector DEPENDS
                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.c
                       ${PROJECT_BINARY_DIR}/src_generated/open62541/nodesetinjector.h)
diff --git a/tools/cmake/open62541Macros.cmake b/tools/cmake/open62541Macros.cmake
index 6e08a7a31d5..a18eb56a068 100644
--- a/tools/cmake/open62541Macros.cmake
+++ b/tools/cmake/open62541Macros.cmake
@@ -437,13 +437,9 @@ function(ua_generate_nodeset)
             if(NOT TARGET ${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection)
                 add_dependencies(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX} open62541-generator-nodesetinjector)
                 add_custom_target(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection
-                                  COMMAND ${Python3_EXECUTABLE} ${open62541_TOOLS_DIR}/nodeset_injector/generate_nodesetinjector_content.py
-                                  ${CMAKE_BINARY_DIR}/src_generated/open62541/nodesetinjector
-                                  "namespace${FILE_SUFFIX}"
                                   DEPENDS
                                   ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.c
-                                  ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h
-                                  )
+                                  ${UA_GEN_NS_OUTPUT_DIR}/namespace${FILE_SUFFIX}.h)
                 set_source_files_properties(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection PROPERTIES SYMBOLIC "true")
                 add_dependencies(${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX} ${UA_GEN_NS_TARGET_PREFIX}-${TARGET_SUFFIX}-autoinjection)
 

From 27e474453f2ca421ff8b0ff7e81686871c0e0bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20V=C3=B6lker?= <jannis.voelker@basyskom.com>
Date: Wed, 28 May 2025 08:44:36 +0200
Subject: [PATCH 1838/1963] fix(server): Fix event filter validation

- Also check the event filter for ModifyMonitoredItem
- Always return BadEventFilterInvalid for create/modify on fail
---
 src/server/ua_services_monitoreditem.c        | 26 +++++-
 .../server/check_subscription_event_filter.c  | 92 ++++++++++++++++++-
 2 files changed, 109 insertions(+), 9 deletions(-)

diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index 74e1987451c..d9640e7325e 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -272,8 +272,8 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
 static UA_StatusCode
 checkEventFilterParam(UA_Server *server, UA_Session *session,
                       const UA_MonitoredItem *mon,
-                      UA_MonitoringParameters *params,
-                      UA_MonitoredItemCreateResult *result) {
+                      const UA_MonitoringParameters *params,
+                      UA_ExtensionObject *filterResult) {
     /* Is an Event MonitoredItem? */
     if(mon->itemToMonitor.attributeId != UA_ATTRIBUTEID_EVENTNOTIFIER)
         return UA_STATUSCODE_GOOD;
@@ -329,7 +329,7 @@ checkEventFilterParam(UA_Server *server, UA_Session *session,
             tmp_efr.whereClauseResult.elementResultsSize = cf->elementsSize;
             tmp_efr.whereClauseResult.elementResults = whereRes;
             UA_EventFilterResult_copy(&tmp_efr, efr);
-            UA_ExtensionObject_setValue(&result->filterResult, efr,
+            UA_ExtensionObject_setValue(filterResult, efr,
                                         &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
         }
     }
@@ -481,8 +481,13 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session,
     result->statusCode |= checkAdjustMonitoredItemParams(server, session, newMon,
                                                          valueType, &newMon->parameters);
 #ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
-    result->statusCode |= checkEventFilterParam(server, session, newMon,
-                                                &newMon->parameters, result);
+    const UA_StatusCode eventFilterStatus = checkEventFilterParam(server, session, newMon,
+                                                                  &newMon->parameters,
+                                                                  &result->filterResult);
+
+    if(eventFilterStatus != UA_STATUSCODE_GOOD) {
+        result->statusCode = UA_STATUSCODE_BADEVENTFILTERINVALID;
+    }
 #endif
     if(result->statusCode != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO_SUBSCRIPTION(server->config.logging, cmc->sub,
@@ -625,6 +630,17 @@ Operation_ModifyMonitoredItem(UA_Server *server, UA_Session *session, UA_Subscri
         return;
     }
 
+#ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
+    const UA_StatusCode eventFilterStatus = checkEventFilterParam(server, session, mon,
+                                                                  &request->requestedParameters,
+                                                                  &result->filterResult);
+    if(eventFilterStatus != UA_STATUSCODE_GOOD) {
+        result->statusCode = UA_STATUSCODE_BADEVENTFILTERINVALID;
+        UA_MonitoringParameters_clear(&params);
+        return;
+    }
+#endif
+
     /* Store the old sampling interval */
     UA_Double oldSamplingInterval = mon->parameters.samplingInterval;
 
diff --git a/tests/server/check_subscription_event_filter.c b/tests/server/check_subscription_event_filter.c
index cc187128c9a..54e7b3fcde4 100644
--- a/tests/server/check_subscription_event_filter.c
+++ b/tests/server/check_subscription_event_filter.c
@@ -276,6 +276,25 @@ addMonitoredItem(UA_Client_EventNotificationCallback handler, UA_EventFilter *fi
                                                 &monitoredItemId, handler, NULL);
 }
 
+static UA_ModifyMonitoredItemsResponse
+modifyMonitoredItem(UA_EventFilter *filter, bool discardOldest) {
+    UA_ModifyMonitoredItemsRequest modifyRequest;
+    UA_ModifyMonitoredItemsRequest_init(&modifyRequest);
+    modifyRequest.subscriptionId = subscriptionId;
+    modifyRequest.itemsToModifySize = 1;
+    modifyRequest.itemsToModify = UA_MonitoredItemModifyRequest_new();
+    modifyRequest.itemsToModify->monitoredItemId = monitoredItemId;
+    modifyRequest.itemsToModify->requestedParameters.queueSize = 1;
+    modifyRequest.itemsToModify->requestedParameters.discardOldest = true;
+    UA_ExtensionObject_setValueNoDelete(&modifyRequest.itemsToModify->requestedParameters.filter,
+                                        filter, &UA_TYPES[UA_TYPES_EVENTFILTER]);
+
+    const UA_ModifyMonitoredItemsResponse response = UA_Client_MonitoredItems_modify(client, modifyRequest);
+    UA_ModifyMonitoredItemsRequest_clear(&modifyRequest);
+    return response;
+}
+
+
 static UA_StatusCode
 eventSetup(UA_NodeId *eventNodeId) {
     UA_StatusCode retval;
@@ -482,18 +501,33 @@ START_TEST(selectFilterValidation) {
     filter.selectClauses->browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "FOOBAR");
     UA_MonitoredItemCreateResult createResult;
     createResult = addMonitoredItem(handler_events_simple, &filter, true);
-    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADNODEIDUNKNOWN);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADEVENTFILTERINVALID);
+    ck_assert_int_eq(createResult.filterResult.encoding, UA_EXTENSIONOBJECT_DECODED);
+    ck_assert(createResult.filterResult.content.decoded.type == &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+    UA_EventFilterResult *eventFilterResult = (UA_EventFilterResult *)createResult.filterResult.content.decoded.data;
+    ck_assert_uint_eq(eventFilterResult->selectClauseResultsSize, 1);
+    ck_assert_uint_eq(eventFilterResult->selectClauseResults[0], UA_STATUSCODE_BADNODEIDUNKNOWN);
     UA_QualifiedName_clear(&filter.selectClauses->browsePath[0]);
     UA_MonitoredItemCreateResult_clear(&createResult);
 
     filter.selectClauses->browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "xx");
     createResult = addMonitoredItem(handler_events_simple, &filter, true);
-    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADNODEIDUNKNOWN);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADEVENTFILTERINVALID);
+    ck_assert_int_eq(createResult.filterResult.encoding, UA_EXTENSIONOBJECT_DECODED);
+    ck_assert(createResult.filterResult.content.decoded.type == &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+    eventFilterResult = (UA_EventFilterResult *)createResult.filterResult.content.decoded.data;
+    ck_assert_uint_eq(eventFilterResult->selectClauseResultsSize, 1);
+    ck_assert_uint_eq(eventFilterResult->selectClauseResults[0], UA_STATUSCODE_BADNODEIDUNKNOWN);
     UA_MonitoredItemCreateResult_clear(&createResult);
 
     UA_QualifiedName_clear(&filter.selectClauses->browsePath[0]);
     createResult = addMonitoredItem(handler_events_simple, &filter, true);
-    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADBROWSENAMEINVALID);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADEVENTFILTERINVALID);
+    ck_assert_int_eq(createResult.filterResult.encoding, UA_EXTENSIONOBJECT_DECODED);
+    ck_assert(createResult.filterResult.content.decoded.type == &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+    eventFilterResult = (UA_EventFilterResult *)createResult.filterResult.content.decoded.data;
+    ck_assert_uint_eq(eventFilterResult->selectClauseResultsSize, 1);
+    ck_assert_uint_eq(eventFilterResult->selectClauseResults[0], UA_STATUSCODE_BADBROWSENAMEINVALID);
     UA_MonitoredItemCreateResult_clear(&createResult);
     UA_EventFilter_clear(&filter);
 } END_TEST
@@ -630,7 +664,12 @@ START_TEST(ofTypeOperatorValidation_failure) {
 
     /*  add a monitored item (with filter) */
     UA_MonitoredItemCreateResult createResult = addMonitoredItem(handler_events_simple, &filter, true);
-    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADFILTEROPERANDINVALID);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_BADEVENTFILTERINVALID);
+    ck_assert_int_eq(createResult.filterResult.encoding, UA_EXTENSIONOBJECT_DECODED);
+    ck_assert(createResult.filterResult.content.decoded.type == &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+    UA_EventFilterResult *eventFilterResult = (UA_EventFilterResult *)createResult.filterResult.content.decoded.data;
+    ck_assert_uint_eq(eventFilterResult->whereClauseResult.elementResultsSize, 1);
+    ck_assert_uint_eq(eventFilterResult->whereClauseResult.elementResults[0].statusCode, UA_STATUSCODE_BADFILTEROPERANDINVALID);
     UA_MonitoredItemCreateResult_clear(&createResult);
     UA_EventFilter_clear(&filter);
 } END_TEST
@@ -839,6 +878,50 @@ START_TEST(inListOperatorValidation) {
     UA_EventFilter_clear(&filter);
 } END_TEST
 
+START_TEST(modifySelectFilterValidation) {
+    /* setup event filter */
+    UA_EventFilter filter;
+    UA_EventFilter_init(&filter);
+    filter.selectClausesSize = 1;
+    filter.selectClauses = UA_SimpleAttributeOperand_new();
+    filter.selectClauses->typeDefinitionId = UA_NODEID_NUMERIC(0, UA_NS0ID_BASEEVENTTYPE);
+    filter.selectClauses->browsePathSize = 1;
+    filter.selectClauses->browsePath = UA_QualifiedName_new();
+    filter.selectClauses->attributeId = UA_ATTRIBUTEID_VALUE;
+
+    /* Set up a valid monitored item */
+    filter.selectClauses->browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "Message");
+    UA_MonitoredItemCreateResult createResult = addMonitoredItem(handler_events_simple, &filter, true);
+    ck_assert_uint_eq(createResult.statusCode, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(createResult.filterResult.encoding, UA_EXTENSIONOBJECT_ENCODED_NOBODY);
+    monitoredItemId = createResult.monitoredItemId;
+    UA_QualifiedName_clear(&filter.selectClauses->browsePath[0]);
+
+    /* Attempt to update the monitored item's event filter with a different valid filter */
+    filter.selectClauses->browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "Time");
+    UA_ModifyMonitoredItemsResponse modifyResult = modifyMonitoredItem(&filter, true);
+    ck_assert_uint_eq(modifyResult.resultsSize, 1);
+    ck_assert_uint_eq(modifyResult.results->statusCode, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(modifyResult.results->filterResult.encoding, UA_EXTENSIONOBJECT_ENCODED_NOBODY);
+    UA_ModifyMonitoredItemsResponse_clear(&modifyResult);
+    UA_QualifiedName_clear(&filter.selectClauses->browsePath[0]);
+
+    /* Attempt to update the monitored item's event filter with an invalid event field */
+    filter.selectClauses->browsePath[0] = UA_QUALIFIEDNAME_ALLOC(0, "IDONOTEXIST");
+    modifyResult = modifyMonitoredItem(&filter, true);
+    ck_assert_uint_eq(modifyResult.resultsSize, 1);
+    ck_assert_uint_eq(modifyResult.results->statusCode, UA_STATUSCODE_BADEVENTFILTERINVALID);
+
+    /* Expect an EventFilterResult with a bad status code for the first select clause result */
+    ck_assert_int_eq(modifyResult.results->filterResult.encoding, UA_EXTENSIONOBJECT_DECODED);
+    ck_assert(modifyResult.results->filterResult.content.decoded.type == &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+    UA_EventFilterResult *eventFilterResult = (UA_EventFilterResult *)modifyResult.results->filterResult.content.decoded.data;
+    ck_assert_uint_eq(eventFilterResult->selectClauseResultsSize, 1);
+    ck_assert_uint_eq(eventFilterResult->selectClauseResults[0], UA_STATUSCODE_BADNODEIDUNKNOWN);
+    UA_ModifyMonitoredItemsResponse_clear(&modifyResult);
+    UA_EventFilter_clear(&filter);
+} END_TEST
+
 static Suite *testSuite_Client(void) {
     Suite *s = suite_create("Server Subscription Event Filters");
     TCase *tc_server = tcase_create("Basic Event Filters");
@@ -853,6 +936,7 @@ static Suite *testSuite_Client(void) {
     tcase_add_test(tc_server, orderedCompareOperatorValidation);
     tcase_add_test(tc_server, betweenOperatorValidation);
     tcase_add_test(tc_server, inListOperatorValidation);
+    tcase_add_test(tc_server, modifySelectFilterValidation);
     suite_add_tcase(s, tc_server);
     return s;
 }

From 932a8572e2c86a323577e1396c9aef7d78aa13a5 Mon Sep 17 00:00:00 2001
From: RolfKal <rolf.kalbermatter@kalbermatter.nl>
Date: Thu, 29 May 2025 11:34:28 +0200
Subject: [PATCH 1839/1963] refactor(crypto): Document that the crypto plugin
 initialization routines should clear an incoming certificate and remove the
 unnecessary clear() calls in the code

---
 include/open62541/plugin/pki.h                       |  2 ++
 plugins/include/open62541/plugin/pki_default.h       | 12 +++++++++---
 plugins/ua_config_default.c                          |  6 ------
 tests/client/check_client_encryption.c               |  1 -
 tests/encryption/check_crl_validation.c              |  2 --
 .../check_encryption_aes128sha256rsaoaep.c           |  2 --
 .../encryption/check_encryption_aes256sha256rsapss.c |  2 --
 tests/encryption/check_encryption_basic128rsa15.c    |  2 --
 tests/encryption/check_encryption_basic256.c         |  2 --
 tests/encryption/check_encryption_basic256sha256.c   |  2 --
 tests/encryption/check_encryption_key_password.c     |  1 -
 11 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/include/open62541/plugin/pki.h b/include/open62541/plugin/pki.h
index ce21872a634..e888a737bc2 100644
--- a/include/open62541/plugin/pki.h
+++ b/include/open62541/plugin/pki.h
@@ -27,6 +27,8 @@ _UA_BEGIN_DECLS
  *
  * Usually, implementations of the certificate verification plugin provide an
  * initialization method that takes a trust-list and a revocation-list as input.
+ * This initialization method should call the ``clear`` method if valid, before
+ * attempting to initialize it with new values.
  * The lifecycle of the plugin is attached to a server or client config. The
  * ``clear`` method is called automatically when the config is destroyed. */
 
diff --git a/plugins/include/open62541/plugin/pki_default.h b/plugins/include/open62541/plugin/pki_default.h
index a999fbbe626..6d943ca1cd7 100644
--- a/plugins/include/open62541/plugin/pki_default.h
+++ b/plugins/include/open62541/plugin/pki_default.h
@@ -12,14 +12,20 @@
 
 _UA_BEGIN_DECLS
 
-/* Default implementation that accepts all certificates */
+/* Default implementation that accepts all certificates
+ * Any plugin implementation should invalidate an existing certificate verification
+ * by first calling the internal clear() method if it is not NULL.
+ * Refer to the default implementation in src/plugins/crypto/ua_pki_none.c */
 UA_EXPORT void
 UA_CertificateVerification_AcceptAll(UA_CertificateVerification *cv);
 
 #ifdef UA_ENABLE_ENCRYPTION
 
-/* Accept certificates based on a trust-list and a revocation-list. Based on
- * mbedTLS. */
+/* Accept certificates based on a trust-list and a revocation-list. Based on mbedTLS.
+ * Any plugin implementation should invalidate an existing certificate verification
+ * by first calling the internal clear() method if it is not NULL.
+ * Refer to the default implementation in src/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+ * or src/plugins/crypto/openssl/ua_pki_openssl.c */
 UA_EXPORT UA_StatusCode
 UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
                                      const UA_ByteString *certificateTrustList,
diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 8641e1fc844..5481338112e 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -439,12 +439,8 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
 
     /* Certificate Verification that accepts every certificate. Can be
      * overwritten when the policy is specialized. */
-    if(conf->secureChannelPKI.clear)
-        conf->secureChannelPKI.clear(&conf->secureChannelPKI);
     UA_CertificateVerification_AcceptAll(&conf->secureChannelPKI);
 
-    if(conf->sessionPKI.clear)
-        conf->sessionPKI.clear(&conf->sessionPKI);
     UA_CertificateVerification_AcceptAll(&conf->sessionPKI);
 
     /* * Global Node Lifecycle * */
@@ -992,8 +988,6 @@ UA_ServerConfig_setDefaultWithSecurityPolicies(UA_ServerConfig *conf,
         return retval;
     }
 
-    if(conf->sessionPKI.clear)
-        conf->sessionPKI.clear(&conf->sessionPKI);
     retval = UA_CertificateVerification_Trustlist(&conf->sessionPKI,
                                                   trustList, trustListSize,
                                                   issuerList, issuerListSize,
diff --git a/tests/client/check_client_encryption.c b/tests/client/check_client_encryption.c
index f4a5073b6a9..2e8ec7fb1c0 100644
--- a/tests/client/check_client_encryption.c
+++ b/tests/client/check_client_encryption.c
@@ -107,7 +107,6 @@ START_TEST(encryption_reconnect_session) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
diff --git a/tests/encryption/check_crl_validation.c b/tests/encryption/check_crl_validation.c
index 2c943103696..c7acbef00ee 100644
--- a/tests/encryption/check_crl_validation.c
+++ b/tests/encryption/check_crl_validation.c
@@ -246,7 +246,6 @@ START_TEST(encryption_connect_valid) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
@@ -291,7 +290,6 @@ START_TEST(encryption_connect_revoked) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
diff --git a/tests/encryption/check_encryption_aes128sha256rsaoaep.c b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
index 71f1e2330b9..884fc3e5a2d 100644
--- a/tests/encryption/check_encryption_aes128sha256rsaoaep.c
+++ b/tests/encryption/check_encryption_aes128sha256rsaoaep.c
@@ -155,7 +155,6 @@ START_TEST(encryption_connect) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
@@ -238,7 +237,6 @@ START_TEST(encryption_connect_pem) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
diff --git a/tests/encryption/check_encryption_aes256sha256rsapss.c b/tests/encryption/check_encryption_aes256sha256rsapss.c
index d70b1d9b0ac..dbb9410b82e 100644
--- a/tests/encryption/check_encryption_aes256sha256rsapss.c
+++ b/tests/encryption/check_encryption_aes256sha256rsapss.c
@@ -155,7 +155,6 @@ START_TEST(encryption_connect) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
@@ -238,7 +237,6 @@ START_TEST(encryption_connect_pem) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
diff --git a/tests/encryption/check_encryption_basic128rsa15.c b/tests/encryption/check_encryption_basic128rsa15.c
index d7f3a1671b1..f9dd90bf2e2 100644
--- a/tests/encryption/check_encryption_basic128rsa15.c
+++ b/tests/encryption/check_encryption_basic128rsa15.c
@@ -165,7 +165,6 @@ START_TEST(encryption_connect) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
 
     /* Manually add the Basic128Rsa15 SecurityPolicy.
@@ -265,7 +264,6 @@ START_TEST(encryption_connect_pem) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
 
     /* Manually add the Basic128Rsa15 SecurityPolicy.
diff --git a/tests/encryption/check_encryption_basic256.c b/tests/encryption/check_encryption_basic256.c
index bebfbbe1ab0..479391c1c49 100644
--- a/tests/encryption/check_encryption_basic256.c
+++ b/tests/encryption/check_encryption_basic256.c
@@ -167,7 +167,6 @@ START_TEST(encryption_connect) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
 
     /* Manually add the Basic256 SecurityPolicy.
@@ -267,7 +266,6 @@ START_TEST(encryption_connect_pem) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
 
     /* Manually add the Basic256 SecurityPolicy.
diff --git a/tests/encryption/check_encryption_basic256sha256.c b/tests/encryption/check_encryption_basic256sha256.c
index 7da5f4b355b..aa69ae4f6b0 100644
--- a/tests/encryption/check_encryption_basic256sha256.c
+++ b/tests/encryption/check_encryption_basic256sha256.c
@@ -155,7 +155,6 @@ START_TEST(encryption_connect) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
@@ -238,7 +237,6 @@ START_TEST(encryption_connect_pem) {
     UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
                                          trustList, trustListSize,
                                          revocationList, revocationListSize);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
diff --git a/tests/encryption/check_encryption_key_password.c b/tests/encryption/check_encryption_key_password.c
index bd3946b54da..171658d5fbe 100644
--- a/tests/encryption/check_encryption_key_password.c
+++ b/tests/encryption/check_encryption_key_password.c
@@ -140,7 +140,6 @@ START_TEST(encryption_connect_pem) {
                                                   trustList, trustListSize,
                                                   revocationList, revocationListSize);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    cc->certificateVerification.clear(&cc->certificateVerification);
     UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
     cc->securityPolicyUri =
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");

From a5210dab33cf9b80922dfabde7fa2db499061bc8 Mon Sep 17 00:00:00 2001
From: RolfKal <rolf.kalbermatter@kalbermatter.nl>
Date: Thu, 29 May 2025 11:52:14 +0200
Subject: [PATCH 1840/1963] improve(crypto): avoid calling
 UA_CertificateVerification_Trustlist() with an empty trustlist

---
 plugins/ua_config_default.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 5481338112e..e8cd5a11c2e 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -1263,14 +1263,17 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    if(config->certificateVerification.clear)
-        config->certificateVerification.clear(&config->certificateVerification);
-    retval = UA_CertificateVerification_Trustlist(&config->certificateVerification,
-                                                  trustList, trustListSize,
-                                                  NULL, 0,
-                                                  revocationList, revocationListSize);
-    if(retval != UA_STATUSCODE_GOOD)
-        return retval;
+    if(trustListSize || revocationListSize) {
+        retval = UA_CertificateVerification_Trustlist(&config->certificateVerification,
+                                                      trustList, trustListSize,
+                                                      NULL, 0,
+                                                      revocationList, revocationListSize);
+        if(retval != UA_STATUSCODE_GOOD)
+            return retval;
+    } else {
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_SECURITYPOLICY,
+            "Empty trustlist and revocationlist passed, leaving the previously configured certificate verification in place");
+    }
 
     /* Populate SecurityPolicies */
     UA_SecurityPolicy *sp = (UA_SecurityPolicy*)

From d894352a47b040748eae39c3a0367872a5eab643 Mon Sep 17 00:00:00 2001
From: RolfKal <rolf.kalbermatter@kalbermatter.nl>
Date: Thu, 29 May 2025 11:55:26 +0200
Subject: [PATCH 1841/1963] refactor(crypto): move duplicate code into its own
 local function and call it where needed

---
 plugins/ua_config_default.c | 205 +++++++++++++++---------------------
 1 file changed, 84 insertions(+), 121 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index e8cd5a11c2e..d736c01820c 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -210,7 +210,11 @@ const UA_ConnectionConfig UA_ConnectionConfig_default = {
 #define APPLICATION_URI "urn:unconfigured:application"
 #define APPLICATION_URI_SERVER "urn:open62541.server.application"
 
-#define SECURITY_POLICY_SIZE 6
+#ifdef UA_INCLUDE_INSECURE_POLICIES
+# define SECURITY_POLICY_SIZE 5
+#else
+# define SECURITY_POLICY_SIZE 3
+#endif
 
 #define STRINGIFY(arg) #arg
 #define VERSION(MAJOR, MINOR, PATCH, LABEL) \
@@ -932,23 +936,25 @@ addAllSecurityPolicies(UA_ServerConfig *config, const UA_ByteString *certificate
                        UA_StatusCode_name(retval));
     }
 
+#ifdef UA_INCLUDE_INSECURE_POLICIES
     /* Basic128Rsa15 should no longer be used */
-    /* retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate, */
-    /*                                                         &decryptedPrivateKey); */
-    /* if(retval != UA_STATUSCODE_GOOD) { */
-    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
-    /*                    "Could not add SecurityPolicy#Basic128Rsa15 with error code %s", */
-    /*                    UA_StatusCode_name(retval)); */
-    /* } */
+    retval = UA_ServerConfig_addSecurityPolicyBasic128Rsa15(config, &localCertificate,
+                                                            &decryptedPrivateKey);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
+                       UA_StatusCode_name(retval));
+    }
 
     /* Basic256 should no longer be used */
-    /* retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate, */
-    /*                                                    &decryptedPrivateKey); */
-    /* if(retval != UA_STATUSCODE_GOOD) { */
-    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
-    /*                    "Could not add SecurityPolicy#Basic256 with error code %s", */
-    /*                    UA_StatusCode_name(retval)); */
-    /* } */
+    retval = UA_ServerConfig_addSecurityPolicyBasic256(config, &localCertificate,
+                                                       &decryptedPrivateKey);
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
+                       "Could not add SecurityPolicy#Basic256 with error code %s",
+                       UA_StatusCode_name(retval));
+    }
+#endif
 
     UA_ByteString_memZero(&decryptedPrivateKey);
     UA_ByteString_clear(&decryptedPrivateKey);
@@ -1178,73 +1184,80 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
 #ifdef UA_ENABLE_ENCRYPTION
 
 static UA_StatusCode
-clientConfig_setAuthenticationSecurityPolicies(UA_ClientConfig *config,
-                                               UA_ByteString certificateAuth,
-                                               UA_ByteString privateKeyAuth) {
-    UA_SecurityPolicy *sp = (UA_SecurityPolicy*)
-        UA_realloc(config->authSecurityPolicies, sizeof(UA_SecurityPolicy) * 3);
-    if(!sp)
-        return UA_STATUSCODE_BADOUTOFMEMORY;
-    config->authSecurityPolicies = sp;
-
-    /* Clean up old SecurityPolicies */
-    for(size_t i = 0; i < config->authSecurityPoliciesSize; i++) {
-        config->authSecurityPolicies[i].clear(&config->authSecurityPolicies[i]);
-    }
-    config->authSecurityPoliciesSize = 0;
+securityPolicies_addAll(UA_SecurityPolicy *sp, size_t *length,
+                        UA_ByteString certificate, UA_ByteString privateKey, UA_Logger *logging) {
+    UA_StatusCode retval;
+    size_t size = *length;
 
+#ifdef UA_INCLUDE_INSECURE_POLICIES
     /* Basic128Rsa15 is unsecure and should not be used */
-    /* sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize]; */
-    /* retval = UA_SecurityPolicy_Basic128Rsa15(sp, certificateAuth, privateKeyAuth, config->logging); */
-    /* if(retval == UA_STATUSCODE_GOOD) { */
-    /*     ++config->authSecurityPoliciesSize; */
-    /* } else { */
-    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
-    /*                    "Could not add SecurityPolicy#Basic128Rsa15 with error code %s", */
-    /*                    UA_StatusCode_name(retval)); */
-    /* } */
+    retval = UA_SecurityPolicy_Basic128Rsa15(&sp[size], certificate, privateKey, logging);
+    if(retval == UA_STATUSCODE_GOOD) {
+        size++;
+    } else {
+        UA_LOG_WARNING(logging, UA_LOGCATEGORY_USERLAND,
+            "Could not add SecurityPolicy#Basic128Rsa15 with error code %s",
+            UA_StatusCode_name(retval));
+    }
 
     /* Basic256 is unsecure and should not be used */
-    /* sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize]; */
-    /* retval = UA_SecurityPolicy_Basic256(sp, certificateAuth, privateKeyAuth, config->logging); */
-    /* if(retval == UA_STATUSCODE_GOOD) { */
-    /*     ++config->authSecurityPoliciesSize; */
-    /* } else { */
-    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
-    /*                    "Could not add SecurityPolicy#Basic256 with error code %s", */
-    /*                    UA_StatusCode_name(retval)); */
-    /* } */
-
-    UA_StatusCode retval;
-    sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize];
-    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(sp, certificateAuth, privateKeyAuth, config->logging);
+    retval = UA_SecurityPolicy_Basic256(&sp[size], certificate, privateKey, logging);
     if(retval == UA_STATUSCODE_GOOD) {
-        ++config->authSecurityPoliciesSize;
+        size++;
     } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
-                       UA_StatusCode_name(retval));
+        UA_LOG_WARNING(logging, UA_LOGCATEGORY_USERLAND,
+            "Could not add SecurityPolicy#Basic256 with error code %s",
+            UA_StatusCode_name(retval));
+    }
+#endif
+    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&sp[size], certificate, privateKey, logging);
+    if(retval == UA_STATUSCODE_GOOD) {
+        size++;
+    } else {
+        UA_LOG_WARNING(logging, UA_LOGCATEGORY_USERLAND,
+            "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
+            UA_StatusCode_name(retval));
     }
 
-    sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize];
-    retval = UA_SecurityPolicy_Basic256Sha256(sp, certificateAuth, privateKeyAuth, config->logging);
+    retval = UA_SecurityPolicy_Basic256Sha256(&sp[size], certificate, privateKey, logging);
     if(retval == UA_STATUSCODE_GOOD) {
-        ++config->authSecurityPoliciesSize;
+        size++;
     } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
-                       UA_StatusCode_name(retval));
+        UA_LOG_WARNING(logging, UA_LOGCATEGORY_USERLAND,
+            "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
+            UA_StatusCode_name(retval));
     }
 
-    sp = &config->authSecurityPolicies[config->authSecurityPoliciesSize];
-    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(sp, certificateAuth, privateKeyAuth, config->logging);
+    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&sp[size], certificate, privateKey, logging);
     if(retval == UA_STATUSCODE_GOOD) {
-        ++config->authSecurityPoliciesSize;
+        size++;
     } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
-                       UA_StatusCode_name(retval));
+        UA_LOG_WARNING(logging, UA_LOGCATEGORY_USERLAND,
+            "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
+            UA_StatusCode_name(retval));
     }
+    *length = size;
+    return retval;
+}
+
+static UA_StatusCode
+clientConfig_setAuthenticationSecurityPolicies(UA_ClientConfig *config,
+                                               UA_ByteString certificateAuth,
+                                               UA_ByteString privateKeyAuth) {
+    UA_SecurityPolicy *sp = (UA_SecurityPolicy*)
+        UA_realloc(config->authSecurityPolicies, sizeof(UA_SecurityPolicy) * SECURITY_POLICY_SIZE);
+    if(!sp)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    config->authSecurityPolicies = sp;
+
+    /* Clean up old SecurityPolicies */
+    for(size_t i = 0; i < config->authSecurityPoliciesSize; i++) {
+        config->authSecurityPolicies[i].clear(&config->authSecurityPolicies[i]);
+    }
+    config->authSecurityPoliciesSize = 0;
+
+    UA_StatusCode retval = securityPolicies_addAll(sp, &config->authSecurityPoliciesSize,
+                                                   certificateAuth, privateKeyAuth, config->logging);
 
     if(config->authSecurityPoliciesSize == 0) {
         UA_free(config->authSecurityPolicies);
@@ -1275,9 +1288,9 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
             "Empty trustlist and revocationlist passed, leaving the previously configured certificate verification in place");
     }
 
-    /* Populate SecurityPolicies */
+    /* Populate SecurityPolicies, append to pre existing and don't overwrite */
     UA_SecurityPolicy *sp = (UA_SecurityPolicy*)
-        UA_realloc(config->securityPolicies, sizeof(UA_SecurityPolicy) * SECURITY_POLICY_SIZE);
+        UA_realloc(config->securityPolicies, sizeof(UA_SecurityPolicy) * (config->securityPoliciesSize + SECURITY_POLICY_SIZE));
     if(!sp)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     config->securityPolicies = sp;
@@ -1308,58 +1321,8 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     if(keySuccess != UA_STATUSCODE_GOOD)
         return keySuccess;
 
-    /* Basic128Rsa15 should no longer be used */
-    /* retval = UA_SecurityPolicy_Basic128Rsa15(&config->securityPolicies[config->securityPoliciesSize], */
-    /*                                          localCertificate, decryptedPrivateKey, config->logging); */
-    /* if(retval == UA_STATUSCODE_GOOD) { */
-    /*     ++config->securityPoliciesSize; */
-    /* } else { */
-    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
-    /*                    "Could not add SecurityPolicy#Basic128Rsa15 with error code %s", */
-    /*                    UA_StatusCode_name(retval)); */
-    /* } */
-
-    /* Basic256 should no longer be used */
-    /* retval = UA_SecurityPolicy_Basic256(&config->securityPolicies[config->securityPoliciesSize], */
-    /*                                     localCertificate, decryptedPrivateKey, config->logging); */
-
-    /* if(retval == UA_STATUSCODE_GOOD) { */
-    /*     ++config->securityPoliciesSize; */
-    /* } else { */
-    /*     UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND, */
-    /*                    "Could not add SecurityPolicy#Basic256 with error code %s", */
-    /*                    UA_StatusCode_name(retval)); */
-    /* } */
-                  
-    retval = UA_SecurityPolicy_Aes256Sha256RsaPss(&config->securityPolicies[config->securityPoliciesSize],
-                                                  localCertificate, decryptedPrivateKey, config->logging);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->securityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes256Sha256RsaPss with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    retval = UA_SecurityPolicy_Basic256Sha256(&config->securityPolicies[config->securityPoliciesSize],
-                                              localCertificate, decryptedPrivateKey, config->logging);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->securityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Basic256Sha256 with error code %s",
-                       UA_StatusCode_name(retval));
-    }
-
-    retval = UA_SecurityPolicy_Aes128Sha256RsaOaep(&config->securityPolicies[config->securityPoliciesSize],
-                                                   localCertificate, decryptedPrivateKey, config->logging);
-    if(retval == UA_STATUSCODE_GOOD) {
-        ++config->securityPoliciesSize;
-    } else {
-        UA_LOG_WARNING(config->logging, UA_LOGCATEGORY_USERLAND,
-                       "Could not add SecurityPolicy#Aes128Sha256RsaOaep with error code %s",
-                       UA_StatusCode_name(retval));
-    }
+    retval = securityPolicies_addAll(sp, &config->securityPoliciesSize,
+                                     localCertificate, decryptedPrivateKey, config->logging);
 
     /* Set the same certificate also for authentication.
      * Can be overridden with a different certificate. */

From 7adf88dc3acf1a7a0aa4c3f978d84270907233f2 Mon Sep 17 00:00:00 2001
From: RolfKal <rolf.kalbermatter@kalbermatter.nl>
Date: Tue, 3 Jun 2025 21:58:06 +0200
Subject: [PATCH 1842/1963] improve(crypto): Fix unused local variable warning
 in clang

---
 plugins/ua_config_default.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index d736c01820c..0df86c58abc 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -1321,8 +1321,8 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
     if(keySuccess != UA_STATUSCODE_GOOD)
         return keySuccess;
 
-    retval = securityPolicies_addAll(sp, &config->securityPoliciesSize,
-                                     localCertificate, decryptedPrivateKey, config->logging);
+    securityPolicies_addAll(sp, &config->securityPoliciesSize,
+                            localCertificate, decryptedPrivateKey, config->logging);
 
     /* Set the same certificate also for authentication.
      * Can be overridden with a different certificate. */

From 1b7e853a7d0fd229bae6ab3660abeabc4d0b8332 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 8 Jun 2025 21:44:09 +0200
Subject: [PATCH 1843/1963] fix(client): Ensure delayed processing of network
 messages is executed

---
 src/client/ua_client_connect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 4af65f4545f..128a7fb3347 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1670,7 +1670,7 @@ static void
 delayedNetworkCallback(void *application, void *context) {
     UA_Client *client = (UA_Client*)application;
     client->channel.unprocessedDelayed.callback = NULL;
-    if(client->channel.state == UA_SECURECHANNELSTATE_CONNECTED)
+    if(client->channel.state >= UA_SECURECHANNELSTATE_CONNECTING)
         __Client_networkCallback(client->channel.connectionManager,
                                  client->channel.connectionId,
                                  client, &context,

From 8b171b25ffa3ef9842c2302f4cf51eec82545667 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 8 Jun 2025 21:45:29 +0200
Subject: [PATCH 1844/1963] fix(arch): Process delayed callbacks immediately
 via the nextCyclicTime

---
 arch/eventloop_posix.c               | 3 +++
 include/open62541/plugin/eventloop.h | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix.c b/arch/eventloop_posix.c
index 57d4234440f..5179e97482c 100644
--- a/arch/eventloop_posix.c
+++ b/arch/eventloop_posix.c
@@ -13,9 +13,12 @@
 /* Timer */
 /*********/
 
+/* Process delayed callbacks immediately */
 static UA_DateTime
 UA_EventLoopPOSIX_nextCyclicTime(UA_EventLoop *public_el) {
     UA_EventLoopPOSIX *el = (UA_EventLoopPOSIX*)public_el;
+    if(el->delayedCallbacks)
+        el->eventLoop.dateTime_nowMonotonic(&el->eventLoop);
     return UA_Timer_nextRepeatedTime(&el->timer);
 }
 
diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 22351999f72..8ae4e463718 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -143,7 +143,8 @@ struct UA_EventLoop {
      * A timed callback is executed only once. */
 
     /* Time of the next cyclic callback. Returns the max DateTime if no cyclic
-     * callback is registered. */
+     * callback is registered. Returns the current monotonic time if a delayed
+     * callback is registered for immediate execution. */
     UA_DateTime (*nextCyclicTime)(UA_EventLoop *el);
 
     /* The execution interval is in ms. Returns the callbackId if the pointer is

From 199a29d3bfd66c45cf016ed367ee118ef8034bf4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 9 Jun 2025 14:50:01 +0200
Subject: [PATCH 1845/1963] refactor(arch): Clarify the use of monotonic time
 for EventLoop timers

---
 include/open62541/plugin/eventloop.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/open62541/plugin/eventloop.h b/include/open62541/plugin/eventloop.h
index 8ae4e463718..7e05d9217b3 100644
--- a/include/open62541/plugin/eventloop.h
+++ b/include/open62541/plugin/eventloop.h
@@ -139,8 +139,9 @@ struct UA_EventLoop {
 
     /* Timed Callbacks
      * ~~~~~~~~~~~~~~~
-     * Cyclic callbacks are executed regularly with an interval.
-     * A timed callback is executed only once. */
+     * Cyclic callbacks are executed regularly with an interval. A timed
+     * callback is executed only once. The timer subsystem always uses the
+     * monotonic clock. */
 
     /* Time of the next cyclic callback. Returns the max DateTime if no cyclic
      * callback is registered. Returns the current monotonic time if a delayed

From cb011fd7f2d432a7bf930a498306cf443993b00c Mon Sep 17 00:00:00 2001
From: julepp <64079453+julepp@users.noreply.github.com>
Date: Mon, 23 Jun 2025 17:49:57 +0200
Subject: [PATCH 1846/1963] fix(tools): Fixed proper decoding of LocalizedText

---
 tools/nodeset_compiler/datatypes.py | 22 ++++++++++++++++------
 tools/nodeset_compiler/nodes.py     | 10 ++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index 222e5a5d5ff..e90a7739651 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -634,16 +634,26 @@ def parseXML(self, xmlvalue):
         #          <Locale>xx_XX</Locale>
         #          <Text>TextText</Text>
         #        <LocalizedText> or </AliasName>
+        # OR <LocalizedText Locale="en">Text</LocalizedText>
+
         if not isinstance(xmlvalue, dom.Element):
             self.text = xmlvalue
             return
         self.checkXML(xmlvalue)
-        tmp = xmlvalue.getElementsByTagName("Locale")
-        if len(tmp) > 0 and tmp[0].firstChild != None:
-            self.locale = tmp[0].firstChild.data.strip(' \t\n\r')
-        tmp = xmlvalue.getElementsByTagName("Text")
-        if len(tmp) > 0 and tmp[0].firstChild != None:
-            self.text = tmp[0].firstChild.data.strip(' \t\n\r')
+        tmp = xmlvalue.getAttribute("Locale")
+        if tmp != "":
+            self.locale = tmp
+        else:
+            tmp = xmlvalue.getElementsByTagName("Locale")
+            if len(tmp) > 0 and tmp[0].firstChild != None:
+                self.locale = tmp[0].firstChild.data.strip(' \t\n\r')
+        tmp = xmlvalue.firstChild
+        if tmp and tmp.nodeType == dom.Element.TEXT_NODE:
+            self.text = tmp.data.strip(' \t\n\r')
+        else:
+            tmp = xmlvalue.getElementsByTagName("Text")
+            if len(tmp) > 0 and tmp[0].firstChild != None:
+                self.text = tmp[0].firstChild.data.strip(' \t\n\r')
 
     def __str__(self):
         if self.locale is None and self.text is None:
diff --git a/tools/nodeset_compiler/nodes.py b/tools/nodeset_compiler/nodes.py
index bfcb957a213..96fd1a02763 100644
--- a/tools/nodeset_compiler/nodes.py
+++ b/tools/nodeset_compiler/nodes.py
@@ -113,9 +113,9 @@ def parseXML(self, xmlelement):
                 if x.localName == "BrowseName":
                     self.browseName = QualifiedName(x.firstChild.data)
                 elif x.localName == "DisplayName":
-                    self.displayName = LocalizedText(x.firstChild.data)
+                    self.displayName = LocalizedText(x)
                 elif x.localName == "Description":
-                    self.description = LocalizedText(x.firstChild.data)
+                    self.description = LocalizedText(x)
                 elif x.localName == "WriteMask":
                     self.writeMask = int(unicode(x.firstChild.data))
                 elif x.localName == "UserWriteMask":
@@ -201,15 +201,13 @@ def parseXML(self, xmlelement):
         for (at, av) in xmlelement.attributes.items():
             if at == "Symmetric":
                 self.symmetric = "false" not in av.lower()
-            elif at == "InverseName":
-                self.inverseName = str(av)
             elif at == "IsAbstract":
                 self.isAbstract = "false" not in av.lower()
 
         for x in xmlelement.childNodes:
             if x.nodeType == x.ELEMENT_NODE:
-                if x.localName == "InverseName" and x.firstChild:
-                    self.inverseName = str(unicode(x.firstChild.data))
+                if x.localName == "InverseName":
+                    self.inverseName = LocalizedText(x)
 
 class ObjectNode(Node):
     def __init__(self, xmlelement=None):

From f85d46cfba0b6dbfeeb4d0dd67ac074e20f34dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20V=C3=B6lker?= <jannis.voelker@basyskom.com>
Date: Wed, 18 Jun 2025 10:18:21 +0200
Subject: [PATCH 1847/1963] fix(client): Fix user token policy validation

If there is a separate authSecurityPolicies list, it should not be
required to have the token's policy in the securityPolicies list
in the client config if the endpoint uses a different policy.
---
 src/client/ua_client_connect.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 128a7fb3347..fd32ed17ff9 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -101,7 +101,6 @@ getSecurityPolicy(UA_Client *client, UA_String policyUri) {
     return NULL;
 }
 
-#ifdef UA_ENABLE_ENCRYPTION
 static UA_SecurityPolicy *
 getAuthSecurityPolicy(UA_Client *client, UA_String policyUri) {
     for(size_t i = 0; i < client->config.authSecurityPoliciesSize; i++) {
@@ -110,7 +109,6 @@ getAuthSecurityPolicy(UA_Client *client, UA_String policyUri) {
     }
     return NULL;
 }
-#endif
 
 /* The endpoint is unconfigured if the description is all zeroed-out */
 static UA_Boolean
@@ -943,13 +941,20 @@ findUserTokenPolicy(UA_Client *client, UA_EndpointDescription *endpoint) {
     for(size_t j = 0; j < endpoint->userIdentityTokensSize; ++j) {
         /* Is the SecurityPolicy available? */
         UA_UserTokenPolicy *tokenPolicy = &endpoint->userIdentityTokens[j];
-        if(!getSecurityPolicy(client, tokenPolicy->securityPolicyUri))
-            continue;
+
+        UA_String tokenPolicyUri = tokenPolicy->securityPolicyUri;
+        if(UA_String_isEmpty(&tokenPolicyUri))
+            tokenPolicyUri = endpoint->securityPolicyUri;
+
+        const UA_String none = UA_STRING_STATIC("http://opcfoundation.org/UA/SecurityPolicy#None");
+        /* activateSessionAsync() handles the None case separately without accessing authSecurityPolicies */
+        if(!UA_String_equal(&none, &tokenPolicyUri) && !getAuthSecurityPolicy(client, tokenPolicyUri))
+             continue;
 
         /* Required SecurityPolicyUri in the configuration? */
         if(!UA_String_isEmpty(&client->config.authSecurityPolicyUri) &&
            !UA_String_equal(&client->config.authSecurityPolicyUri,
-                            &tokenPolicy->securityPolicyUri))
+                            &tokenPolicyUri))
             continue;
 
         /* Match (entire) UserTokenPolicy if defined in the configuration? */

From 6e0bc85d52576866cf1cd31815bb9992ce850ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20V=C3=B6lker?= <jannis.voelker@basyskom.com>
Date: Fri, 20 Jun 2025 16:53:14 +0200
Subject: [PATCH 1848/1963] fix(client): Skip security policy check for
 anonymous identity token

---
 src/client/ua_client_connect.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index fd32ed17ff9..6b852ea80d5 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -780,6 +780,10 @@ activateSessionAsync(UA_Client *client) {
     UA_SecurityPolicy *utsp = NULL;
     UA_SecureChannel *channel = &client->channel;
 
+    if(request.userIdentityToken.content.decoded.type ==
+       &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN])
+        goto utp_done;
+
     /* Does the UserTokenPolicy have encryption? If not specifically defined in
      * the UserTokenPolicy, then the SecurityPolicy of the underlying endpoint
      * (SecureChannel) is used. */
@@ -787,9 +791,7 @@ activateSessionAsync(UA_Client *client) {
         utp->securityPolicyUri : client->endpoint.securityPolicyUri;
     const UA_String none = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#None");
     if(UA_String_equal(&none, &tokenSecurityPolicyUri)) {
-        if(UA_String_equal(&none, &client->channel.securityPolicy->policyUri) &&
-           request.userIdentityToken.content.decoded.type !=
-           &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
+        if(UA_String_equal(&none, &client->channel.securityPolicy->policyUri)) {
             UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "!!! Warning !!! AuthenticationToken is transmitted "
                            "without encryption");
@@ -946,10 +948,15 @@ findUserTokenPolicy(UA_Client *client, UA_EndpointDescription *endpoint) {
         if(UA_String_isEmpty(&tokenPolicyUri))
             tokenPolicyUri = endpoint->securityPolicyUri;
 
-        const UA_String none = UA_STRING_STATIC("http://opcfoundation.org/UA/SecurityPolicy#None");
-        /* activateSessionAsync() handles the None case separately without accessing authSecurityPolicies */
-        if(!UA_String_equal(&none, &tokenPolicyUri) && !getAuthSecurityPolicy(client, tokenPolicyUri))
-             continue;
+        /* Ignore missing auth security policy for anonymous tokens */
+        if(client->config.userIdentityToken.content.decoded.type &&
+           client->config.userIdentityToken.content.decoded.type !=
+               &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]) {
+            const UA_String none = UA_STRING_STATIC("http://opcfoundation.org/UA/SecurityPolicy#None");
+            /* activateSessionAsync() handles the None case separately without accessing authSecurityPolicies */
+            if(!UA_String_equal(&none, &tokenPolicyUri) && !getAuthSecurityPolicy(client, tokenPolicyUri))
+                continue;
+        }
 
         /* Required SecurityPolicyUri in the configuration? */
         if(!UA_String_isEmpty(&client->config.authSecurityPolicyUri) &&

From 45f676e499bdbc5d9f1f38b31212cb98e09bb8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20V=C3=B6lker?= <jannis.voelker@basyskom.com>
Date: Mon, 23 Jun 2025 11:50:54 +0200
Subject: [PATCH 1849/1963] improve(tests): Add unit tests for
 authSecurityPolicies usage

---
 tests/client/check_client_authentication.c | 109 +++++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/tests/client/check_client_authentication.c b/tests/client/check_client_authentication.c
index e827ed2deab..8108224791c 100644
--- a/tests/client/check_client_authentication.c
+++ b/tests/client/check_client_authentication.c
@@ -13,6 +13,7 @@
 #include <open62541/plugin/securitypolicy.h>
 #include <open62541/plugin/pki_default.h>
 #include <open62541/plugin/accesscontrol_default.h>
+#include <open62541/plugin/securitypolicy_default.h>
 #include <open62541/server.h>
 
 #include "client/ua_client_internal.h"
@@ -69,6 +70,14 @@ static void setup(void) {
                                                    issuerList, issuerListSize,
                                                    revocationList, revocationListSize);
 
+    /* Add username/password auth */
+    UA_UsernamePasswordLogin login;
+    login.password = UA_STRING("admin");
+    login.username = UA_STRING("admin");
+    config->accessControl.clear(&config->accessControl);
+    const UA_String userTokenPolicy = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    UA_AccessControl_default(config, true, &userTokenPolicy, 1, &login);
+
     UA_CertificateVerification_AcceptAll(&config->secureChannelPKI);
 
     UA_Server_run_startup(server);
@@ -172,12 +181,112 @@ START_TEST(Client_connect_invalid_certificate) {
     }
 END_TEST
 
+START_TEST(client_connect_none_username_basic256Sha256) {
+        /*
+         * Attempt to connect an endpoint with None security policy and username
+         * identity token with Basic256Sha256.
+         * The client is configured to only have the None security policy in
+         * securityPolicies and Basic256Sha256 in authSecurityPolicies.
+         */
+
+        /* Load client certificate and private key for the SecureChannel */
+        UA_ByteString certificate;
+        certificate.length = CLIENT_CERT_DER_LENGTH;
+        certificate.data = CLIENT_CERT_DER_DATA;
+
+        UA_ByteString privateKey;
+        privateKey.length = CLIENT_KEY_DER_LENGTH;
+        privateKey.data = CLIENT_KEY_DER_DATA;
+
+        UA_Client *client = UA_Client_new();
+        UA_ClientConfig *cc = UA_Client_getConfig(client);
+
+        /* Set securityMode and securityPolicyUri */
+        cc->securityMode = UA_MESSAGESECURITYMODE_NONE;
+        cc->securityPolicyUri = UA_String_fromChars("http://opcfoundation.org/UA/SecurityPolicy#None");
+
+        UA_ClientConfig_setDefault(cc);
+
+        /* Set the ApplicationUri used in the certificate */
+        UA_String_clear(&cc->clientDescription.applicationUri);
+        cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
+
+        /* Only use the relevant security policy in authSecurityPolicies */
+        for(size_t i = 0; i < cc->authSecurityPoliciesSize; ++i)
+            cc->authSecurityPolicies[i].clear(&cc->authSecurityPolicies[i]);
+        UA_free(cc->authSecurityPolicies);
+        cc->authSecurityPolicies = (UA_SecurityPolicy*)UA_calloc(1, sizeof(UA_SecurityPolicy));
+        cc->authSecurityPoliciesSize = 1;
+        UA_SecurityPolicy_Basic256Sha256(&cc->authSecurityPolicies[0], certificate, privateKey, cc->logging);
+
+        UA_StatusCode retval = UA_Client_connectUsername(client, "opc.tcp://localhost:4840", "admin", "admin");
+
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+        UA_Client_disconnect(client);
+        UA_Client_delete(client);
+    }
+END_TEST
+
+START_TEST(client_connect_basic256Sha256_anonymous) {
+        /*
+         * Attempt to connect an endpoint with Basic256Sha256 security policy
+         * and anonymous identity token.
+         * The client is configured to only have the None and Basic256Sha256 security
+         * policy in securityPolicies and an empty authSecurityPolicies array.
+         */
+
+        /* Load client certificate and private key for the SecureChannel */
+        UA_ByteString certificate;
+        certificate.length = CLIENT_CERT_DER_LENGTH;
+        certificate.data = CLIENT_CERT_DER_DATA;
+
+        UA_ByteString privateKey;
+        privateKey.length = CLIENT_KEY_DER_LENGTH;
+        privateKey.data = CLIENT_KEY_DER_DATA;
+
+        UA_Client *client = UA_Client_new();
+        UA_ClientConfig *cc = UA_Client_getConfig(client);
+
+        /* Set securityMode and securityPolicyUri */
+        cc->securityMode = UA_MESSAGESECURITYMODE_SIGNANDENCRYPT;
+        cc->securityPolicyUri = UA_String_fromChars("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+
+        UA_ClientConfig_setDefault(cc);
+        cc->securityPolicies = (UA_SecurityPolicy*)UA_realloc(cc->securityPolicies, sizeof(UA_SecurityPolicy) * 2);
+        UA_SecurityPolicy_Basic256Sha256(&cc->securityPolicies[1], certificate, privateKey, cc->logging);
+        cc->securityPoliciesSize = 2;
+
+        UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+
+        /* Set the ApplicationUri used in the certificate */
+        UA_String_clear(&cc->clientDescription.applicationUri);
+        cc->clientDescription.applicationUri = UA_STRING_ALLOC("urn:open62541.server.application");
+
+        /* Use empty security policies array */
+        for(size_t i = 0; i < cc->authSecurityPoliciesSize; ++i)
+            cc->authSecurityPolicies[i].clear(&cc->authSecurityPolicies[i]);
+        UA_free(cc->authSecurityPolicies);
+        cc->authSecurityPolicies = NULL;
+        cc->authSecurityPoliciesSize = 0;
+
+        UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+        UA_Client_disconnect(client);
+        UA_Client_delete(client);
+    }
+END_TEST
+
 static Suite* testSuite_Client(void) {
     Suite *s = suite_create("Client");
     TCase *tc_client = tcase_create("Client with Authentication");
     tcase_add_checked_fixture(tc_client, setup, teardown);
     tcase_add_test(tc_client, Client_connect_certificate);
     tcase_add_test(tc_client, Client_connect_invalid_certificate);
+    tcase_add_test(tc_client, client_connect_none_username_basic256Sha256);
+    tcase_add_test(tc_client, client_connect_basic256Sha256_anonymous);
     suite_add_tcase(s,tc_client);
     return s;
 }

From 78a181776a606f356781674de16a5c31bc1441dd Mon Sep 17 00:00:00 2001
From: Goetz Goerisch <g.goerisch@vdw.de>
Date: Mon, 30 Jun 2025 09:37:02 +0200
Subject: [PATCH 1850/1963] refactor(deps): bump libressl to 3.9.2

Signed-off-by: Goetz Goerisch <g.goerisch@vdw.de>
---
 .github/workflows/build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 4f135b5f1c8..58611f6620c 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -54,9 +54,9 @@ jobs:
           - name: "Encryption (LibreSSL) Build & Unit Tests (gcc)"
             cmd_deps: |
               sudo apt-get install -y -qq curl
-              curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.9.1.tar.gz --output libressl.tar.gz
+              curl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.9.2.tar.gz --output libressl.tar.gz
               tar -xvz -f libressl.tar.gz
-              cd libressl-3.9.1
+              cd libressl-3.9.2
               ./configure
               sudo make install
             cmd_action: unit_tests_encryption LIBRESSL

From 484348f3076da13a9d0971f3d66ffe57ab3b7a90 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 4 Aug 2025 13:42:37 +0200
Subject: [PATCH 1851/1963] refactor(build): Bump version number to v1.4.13

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2bc2afb350..3d5fcb36cf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 12)
+set(OPEN62541_VER_PATCH 13)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From bcc48f65925ab23b6a33a53c25d671501c3a9c9e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Sep 2024 23:02:32 +0200
Subject: [PATCH 1852/1963] fix(core): Ensure that only quiet NAN are used for
 float/double

This was problematic on MSVC where different NAN representations can be used as default.
---
 src/ua_types_encoding_binary.c | 46 +++++++++++++++++++++++-----------
 tests/check_types_builtin.c    |  4 ---
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index b134c4e8329..4c0ce5d5b12 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -281,16 +281,14 @@ DECODE_BINARY(UInt64) {
 /************************/
 
 /* Can we reuse the integer encoding mechanism by casting floating point
- * values? */
-#if (UA_FLOAT_IEEE754 == 1) && (UA_LITTLE_ENDIAN == UA_FLOAT_LITTLE_ENDIAN)
-# define Float_encodeBinary UInt32_encodeBinary
-# define Float_decodeBinary UInt32_decodeBinary
-# define Double_encodeBinary UInt64_encodeBinary
-# define Double_decodeBinary UInt64_decodeBinary
-#else
+ * values? For single float values we ensure that only quiet NAN are used.
+ * For float arrays we want to have the speed advantage of just memcpy (if
+ * the processor architecture uses IEE754). We get array-memcpy by the
+ * "overlayable" bit in the datatype description. */
 
+#if (UA_FLOAT_IEEE754 < 1) || (UA_LITTLE_ENDIAN != UA_FLOAT_LITTLE_ENDIAN)
 #include <math.h>
-
+#define UA_SLOW_IEEE754 1
 #pragma message "No native IEEE 754 format detected. Use slow generic encoding."
 
 /* Handling of IEEE754 floating point values was taken from Beej's Guide to
@@ -326,6 +324,8 @@ unpack754(uint64_t i, unsigned bits, unsigned expbits) {
     return result;
 }
 
+#endif
+
 /* Float */
 #define FLOAT_NAN 0xffc00000
 #define FLOAT_INF 0x7f800000
@@ -335,19 +335,26 @@ unpack754(uint64_t i, unsigned bits, unsigned expbits) {
 ENCODE_BINARY(Float) {
     UA_Float f = *src;
     u32 encoded;
-    /* cppcheck-suppress duplicateExpression */
-    if(f != f) encoded = FLOAT_NAN;
+    if(UA_UNLIKELY(f != f)) encoded = FLOAT_NAN; /* quit NAN */
+#ifndef UA_SLOW_IEEE754
+    else memcpy(&encoded, &f, sizeof(UA_Float));
+#else
     else if(f == 0.0f) encoded = signbit(f) ? FLOAT_NEG_ZERO : 0;
     else if(f/f != f/f) encoded = f > 0 ? FLOAT_INF : FLOAT_NEG_INF;
     else encoded = (u32)pack754(f, 32, 8);
+#endif
     return ENCODE_DIRECT(&encoded, UInt32);
 }
 
 DECODE_BINARY(Float) {
     u32 decoded;
     status ret = DECODE_DIRECT(&decoded, UInt32);
-    if(ret != UA_STATUSCODE_GOOD)
-        return ret;
+    UA_CHECK_STATUS(ret, return ret);
+#ifndef UA_SLOW_IEEE754
+    if(UA_UNLIKELY((decoded >= 0x7f800001 && decoded <= 0x7fffffff) ||
+                   (decoded >= 0xff800001))) decoded = FLOAT_NAN;
+    memcpy(dst, &decoded, sizeof(UA_Float));
+#else
     if(decoded == 0) *dst = 0.0f;
     else if(decoded == FLOAT_NEG_ZERO) *dst = -0.0f;
     else if(decoded == FLOAT_INF) *dst = INFINITY;
@@ -355,6 +362,7 @@ DECODE_BINARY(Float) {
     else if((decoded >= 0x7f800001 && decoded <= 0x7fffffff) ||
        (decoded >= 0xff800001)) *dst = NAN;
     else *dst = (UA_Float)unpack754(decoded, 32, 8);
+#endif
     return UA_STATUSCODE_GOOD;
 }
 
@@ -368,10 +376,14 @@ ENCODE_BINARY(Double) {
     UA_Double d = *src;
     u64 encoded;
     /* cppcheck-suppress duplicateExpression */
-    if(d != d) encoded = DOUBLE_NAN;
+    if(UA_UNLIKELY(d != d)) encoded = DOUBLE_NAN; /* quiet NAN*/
+#ifndef UA_SLOW_IEEE754
+    else memcpy(&encoded, &d, sizeof(UA_Double));
+#else
     else if(d == 0.0) encoded = signbit(d) ? DOUBLE_NEG_ZERO : 0;
     else if(d/d != d/d) encoded = d > 0 ? DOUBLE_INF : DOUBLE_NEG_INF;
     else encoded = pack754(d, 64, 11);
+ #endif
     return ENCODE_DIRECT(&encoded, UInt64);
 }
 
@@ -379,6 +391,11 @@ DECODE_BINARY(Double) {
     u64 decoded;
     status ret = DECODE_DIRECT(&decoded, UInt64);
     UA_CHECK_STATUS(ret, return ret);
+#ifndef UA_SLOW_IEEE754
+    if(UA_UNLIKELY((decoded >= 0x7ff0000000000001L && decoded <= 0x7fffffffffffffffL) ||
+                   (decoded >= 0xfff0000000000001L))) decoded = DOUBLE_NAN;
+    memcpy(dst, &decoded, sizeof(UA_Double));
+#else
     if(decoded == 0) *dst = 0.0;
     else if(decoded == DOUBLE_NEG_ZERO) *dst = -0.0;
     else if(decoded == DOUBLE_INF) *dst = INFINITY;
@@ -386,11 +403,10 @@ DECODE_BINARY(Double) {
     else if((decoded >= 0x7ff0000000000001L && decoded <= 0x7fffffffffffffffL) ||
        (decoded >= 0xfff0000000000001L)) *dst = NAN;
     else *dst = (UA_Double)unpack754(decoded, 64, 11);
+#endif
     return UA_STATUSCODE_GOOD;
 }
 
-#endif
-
 /******************/
 /* Array Handling */
 /******************/
diff --git a/tests/check_types_builtin.c b/tests/check_types_builtin.c
index 5b99f549b25..0eeda8e7365 100644
--- a/tests/check_types_builtin.c
+++ b/tests/check_types_builtin.c
@@ -875,10 +875,6 @@ START_TEST(UA_Float_encodeShallWorkOnExample) {
         {0x00, 0x00, 0x80, 0x7F}, // INF
         {0x00, 0x00, 0x80, 0xFF} // -INF
     };
-#if defined(_MSC_VER)
-    /* On Visual Studio, -NAN is encoded differently */
-    result[4][3] = 127;
-#endif
 
     UA_Byte data[] = {0x55, 0x55, 0x55,  0x55};
     UA_ByteString dst = {4, data};

From 3b55366332a4e394631b97a87c86a32716b6a737 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Oct 2025 23:02:27 +0200
Subject: [PATCH 1853/1963] fix(build): Pacify compiler warnings related to
 goto (but harmless)

---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d5fcb36cf6..b128f224e82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -592,6 +592,12 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
     # Use a strict subset of the C and C++ languages
     check_add_cc_flag("-Wc++-compat")
 
+    # Wc++-compat enables additional goto/jump restrictions.
+    # But modern compilers do a detailed analysis of values
+    # are actually used uninitialized after a jump:
+    # TODO: The following flag should not be required
+    check_add_cc_flag("-Wno-jump-misses-init")
+
     # Check that format strings (printf/scanf) are sane
     check_add_cc_flag("-Wformat")
     check_add_cc_flag("-Wformat-security")

From d55c27ec99779f11ad2e67a37dc4d85a62493a28 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Oct 2025 23:34:38 +0200
Subject: [PATCH 1854/1963] fix(plugins): Pacify a clang warning in
 ua_pki_mbedtls.c

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index ad4a62ceb92..46bbbcffa9f 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -44,7 +44,7 @@ UA_Bstrstr(const unsigned char *s1, size_t l1, const unsigned char *s2, size_t l
     const unsigned char *ss2 = s2;
     /* handle special case */
     if(l1 == 0)
-        return (NULL);
+        return NULL;
     if(l2 == 0)
         return s1;
 

From 706859188fb61166b8eab843445fa83b7d3515ff Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Thu, 9 Oct 2025 09:51:43 +0200
Subject: [PATCH 1855/1963] fix(client): Remove memleak in async processing

---
 src/client/ua_client_subscriptions.c | 50 ++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/client/ua_client_subscriptions.c b/src/client/ua_client_subscriptions.c
index 1249a5ff665..2e0c17809f2 100644
--- a/src/client/ua_client_subscriptions.c
+++ b/src/client/ua_client_subscriptions.c
@@ -154,9 +154,15 @@ UA_Client_Subscriptions_create_async(UA_Client *client,
     cc->clientData = sub;
 
     /* Send the request as asynchronous service call */
-    return __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST],
-                                    ua_Subscriptions_create_handler, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE],
-                                    cc, requestId);
+    UA_StatusCode res =
+        __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST],
+                                 ua_Subscriptions_create_handler, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE],
+                                 cc, requestId);
+    if (res != UA_STATUSCODE_GOOD) {
+        UA_free(cc);
+        UA_free(sub);
+    }
+    return res;
 }
 
 static UA_Client_Subscription *
@@ -378,9 +384,14 @@ UA_Client_Subscriptions_delete_async(UA_Client *client,
     }
 
     /* Make the async call */
-    return __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST],
-                                    ua_Subscriptions_delete_handler, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE],
-                                    dsc, requestId);
+    res = __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST],
+                                   ua_Subscriptions_delete_handler, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE],
+                                   dsc, requestId);
+    if (res != UA_STATUSCODE_GOOD) {
+        UA_DeleteSubscriptionsRequest_clear(&dsc->request);
+        UA_free(dsc);
+    }
+    return res;
 }
 
 UA_DeleteSubscriptionsResponse
@@ -666,11 +677,16 @@ createDataChanges_async(UA_Client *client, const UA_CreateMonitoredItemsRequest
         return res;
     }
 
-    return __Client_AsyncService(client, &data->request,
-                                 &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST],
-                                 ua_MonitoredItems_create_async_handler,
-                                 &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE],
-                                 data, requestId);
+    res = __Client_AsyncService(client, &data->request,
+                                &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST],
+                                ua_MonitoredItems_create_async_handler,
+                                &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE],
+                                data, requestId);
+    if (res != UA_STATUSCODE_GOOD) {
+        MonitoredItems_CreateData_clear(client, data);
+        UA_free(data);
+    }
+    return res;
 }
 
 UA_CreateMonitoredItemsResponse
@@ -905,9 +921,15 @@ UA_Client_MonitoredItems_delete_async(UA_Client *client,
     cc->userCallback = callback;
     cc->userData = userdata;
 
-    return __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST],
-                                    ua_MonitoredItems_delete_handler,
-                                    &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE], cc, requestId);
+    UA_StatusCode res =
+        __UA_Client_AsyncService(client, &request, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST],
+                                 ua_MonitoredItems_delete_handler,
+                                 &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE], cc, requestId);
+    if (res != UA_STATUSCODE_GOOD) {
+        UA_DeleteMonitoredItemsRequest_delete(req_copy);
+        UA_free(cc);
+    }
+    return res;
 }
 
 UA_StatusCode

From 02fbcc243cffe170b9dc5fe2e04982ee843b53a4 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 27 May 2025 20:30:59 +0200
Subject: [PATCH 1856/1963] feat(tests): Add a test for
 UA_Server_getSessionParameter

---
 tests/server/check_accesscontrol.c | 63 ++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/tests/server/check_accesscontrol.c b/tests/server/check_accesscontrol.c
index 9706e8af2a4..1c5f2ddc4f4 100644
--- a/tests/server/check_accesscontrol.c
+++ b/tests/server/check_accesscontrol.c
@@ -7,6 +7,7 @@
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
 #include <open62541/types.h>
+#include <open62541/plugin/accesscontrol_default.h>
 
 #include <check.h>
 
@@ -85,6 +86,64 @@ START_TEST(Client_pass_fail) {
     UA_Client_delete(client);
 } END_TEST
 
+static UA_Boolean
+allowBrowseNode(UA_Server *s, UA_AccessControl *ac,
+                const UA_NodeId *sessionId, void *sessionContext,
+                const UA_NodeId *nodeId, void *nodeContext) {
+    UA_Variant attribute;
+    UA_Variant_init(&attribute);
+    UA_Server_getSessionParameter(s, sessionId, "my_custom_attribute", &attribute);
+    return true;
+}
+
+static void setCustomAccessControl(UA_ServerConfig* config) {
+    UA_Boolean allowAnonymous = true;
+    UA_AccessControl_default(config, allowAnonymous, NULL, NULL, 0, NULL);
+    config->accessControl.allowBrowseNode = allowBrowseNode;
+}
+
+START_TEST(Server_sessionParameter) {
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    UA_ServerConfig_setDefault(config);
+    setCustomAccessControl(config);
+    UA_Server_run_startup(server);
+
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_BrowseDescription bd;
+    UA_BrowseDescription_init(&bd);
+    bd.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER);
+    bd.browseDirection = UA_BROWSEDIRECTION_BOTH;
+    bd.includeSubtypes = true;
+    bd.referenceTypeId = UA_NODEID_NUMERIC(0, UA_NS0ID_HIERARCHICALREFERENCES);
+
+    UA_BrowseRequest request;
+    UA_BrowseRequest_init(&request);
+    request.nodesToBrowse = &bd;
+    request.nodesToBrowseSize = 1;
+
+    UA_BrowseResponse br = UA_Client_Service_browse(client, request);
+    UA_assert(br.resultsSize == 1);
+    UA_assert(br.results[0].referencesSize > 0);
+    UA_assert(br.results[0].statusCode == UA_STATUSCODE_GOOD);
+    UA_BrowseResponse_clear(&br);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+} END_TEST
 
 static Suite* testSuite_Client(void) {
     Suite *s = suite_create("Client");
@@ -95,6 +154,10 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_client_user, Client_user_fail);
     tcase_add_test(tc_client_user, Client_pass_fail);
     suite_add_tcase(s,tc_client_user);
+
+    TCase *tc_server = tcase_create("Server-Side Access Control");
+    tcase_add_test(tc_server, Server_sessionParameter);
+    suite_add_tcase(s,tc_server);
     return s;
 }
 

From 199a59af17f3ef33aa7eb87bb81109d2a181b35a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Thu, 9 Oct 2025 08:39:43 +0200
Subject: [PATCH 1857/1963] fix(server): Fix a locking issue in
 browseWithContinuation

---
 src/server/ua_services_view.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index c8f632588a1..9b0436c2c51 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -675,14 +675,17 @@ browseWithContinuation(UA_Server *server, UA_Session *session,
         return true;
     }
 
-    if(session != &server->adminSession &&
-       !server->config.accessControl.
-         allowBrowseNode(server, &server->config.accessControl,
-                         &session->sessionId, session->sessionHandle,
-                         &descr->nodeId, node->head.context)) {
-        result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
-        UA_NODESTORE_RELEASE(server, node);
-        return true;
+    if(session != &server->adminSession) {
+        UA_UNLOCK(&server->serviceMutex);
+        UA_Boolean allowed = server->config.accessControl.allowBrowseNode(
+            server, &server->config.accessControl, &session->sessionId,
+            session->sessionHandle, &descr->nodeId, node->head.context);
+        UA_LOCK(&server->serviceMutex);
+        if(!allowed) {
+            result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
+            UA_NODESTORE_RELEASE(server, node);
+            return true;
+        }
     }
 
     RefResult rr;

From d10add6fc53d65a00964a774dd6329d00ba15123 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sun, 29 Sep 2024 23:02:32 +0200
Subject: [PATCH 1858/1963] fix(core): Ensure that only quiet NAN are used for
 float/double

This was problematic on MSVC where different NAN representations can be used as default.
---
 src/ua_types_encoding_binary.c | 46 +++++++++++++++++++++++-----------
 tests/check_types_builtin.c    |  4 ---
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index ac3f7165b16..65de4375803 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -281,16 +281,14 @@ DECODE_BINARY(UInt64) {
 /************************/
 
 /* Can we reuse the integer encoding mechanism by casting floating point
- * values? */
-#if (UA_FLOAT_IEEE754 == 1) && (UA_LITTLE_ENDIAN == UA_FLOAT_LITTLE_ENDIAN)
-# define Float_encodeBinary UInt32_encodeBinary
-# define Float_decodeBinary UInt32_decodeBinary
-# define Double_encodeBinary UInt64_encodeBinary
-# define Double_decodeBinary UInt64_decodeBinary
-#else
+ * values? For single float values we ensure that only quiet NAN are used.
+ * For float arrays we want to have the speed advantage of just memcpy (if
+ * the processor architecture uses IEE754). We get array-memcpy by the
+ * "overlayable" bit in the datatype description. */
 
+#if (UA_FLOAT_IEEE754 < 1) || (UA_LITTLE_ENDIAN != UA_FLOAT_LITTLE_ENDIAN)
 #include <math.h>
-
+#define UA_SLOW_IEEE754 1
 #pragma message "No native IEEE 754 format detected. Use slow generic encoding."
 
 /* Handling of IEEE754 floating point values was taken from Beej's Guide to
@@ -326,6 +324,8 @@ unpack754(uint64_t i, unsigned bits, unsigned expbits) {
     return result;
 }
 
+#endif
+
 /* Float */
 #define FLOAT_NAN 0xffc00000
 #define FLOAT_INF 0x7f800000
@@ -335,19 +335,26 @@ unpack754(uint64_t i, unsigned bits, unsigned expbits) {
 ENCODE_BINARY(Float) {
     UA_Float f = *src;
     u32 encoded;
-    /* cppcheck-suppress duplicateExpression */
-    if(f != f) encoded = FLOAT_NAN;
+    if(UA_UNLIKELY(f != f)) encoded = FLOAT_NAN; /* quit NAN */
+#ifndef UA_SLOW_IEEE754
+    else memcpy(&encoded, &f, sizeof(UA_Float));
+#else
     else if(f == 0.0f) encoded = signbit(f) ? FLOAT_NEG_ZERO : 0;
     else if(f/f != f/f) encoded = f > 0 ? FLOAT_INF : FLOAT_NEG_INF;
     else encoded = (u32)pack754(f, 32, 8);
+#endif
     return ENCODE_DIRECT(&encoded, UInt32);
 }
 
 DECODE_BINARY(Float) {
     u32 decoded;
     status ret = DECODE_DIRECT(&decoded, UInt32);
-    if(ret != UA_STATUSCODE_GOOD)
-        return ret;
+    UA_CHECK_STATUS(ret, return ret);
+#ifndef UA_SLOW_IEEE754
+    if(UA_UNLIKELY((decoded >= 0x7f800001 && decoded <= 0x7fffffff) ||
+                   (decoded >= 0xff800001))) decoded = FLOAT_NAN;
+    memcpy(dst, &decoded, sizeof(UA_Float));
+#else
     if(decoded == 0) *dst = 0.0f;
     else if(decoded == FLOAT_NEG_ZERO) *dst = -0.0f;
     else if(decoded == FLOAT_INF) *dst = INFINITY;
@@ -355,6 +362,7 @@ DECODE_BINARY(Float) {
     else if((decoded >= 0x7f800001 && decoded <= 0x7fffffff) ||
        (decoded >= 0xff800001)) *dst = NAN;
     else *dst = (UA_Float)unpack754(decoded, 32, 8);
+#endif
     return UA_STATUSCODE_GOOD;
 }
 
@@ -368,10 +376,14 @@ ENCODE_BINARY(Double) {
     UA_Double d = *src;
     u64 encoded;
     /* cppcheck-suppress duplicateExpression */
-    if(d != d) encoded = DOUBLE_NAN;
+    if(UA_UNLIKELY(d != d)) encoded = DOUBLE_NAN; /* quiet NAN*/
+#ifndef UA_SLOW_IEEE754
+    else memcpy(&encoded, &d, sizeof(UA_Double));
+#else
     else if(d == 0.0) encoded = signbit(d) ? DOUBLE_NEG_ZERO : 0;
     else if(d/d != d/d) encoded = d > 0 ? DOUBLE_INF : DOUBLE_NEG_INF;
     else encoded = pack754(d, 64, 11);
+ #endif
     return ENCODE_DIRECT(&encoded, UInt64);
 }
 
@@ -379,6 +391,11 @@ DECODE_BINARY(Double) {
     u64 decoded;
     status ret = DECODE_DIRECT(&decoded, UInt64);
     UA_CHECK_STATUS(ret, return ret);
+#ifndef UA_SLOW_IEEE754
+    if(UA_UNLIKELY((decoded >= 0x7ff0000000000001L && decoded <= 0x7fffffffffffffffL) ||
+                   (decoded >= 0xfff0000000000001L))) decoded = DOUBLE_NAN;
+    memcpy(dst, &decoded, sizeof(UA_Double));
+#else
     if(decoded == 0) *dst = 0.0;
     else if(decoded == DOUBLE_NEG_ZERO) *dst = -0.0;
     else if(decoded == DOUBLE_INF) *dst = INFINITY;
@@ -386,11 +403,10 @@ DECODE_BINARY(Double) {
     else if((decoded >= 0x7ff0000000000001L && decoded <= 0x7fffffffffffffffL) ||
        (decoded >= 0xfff0000000000001L)) *dst = NAN;
     else *dst = (UA_Double)unpack754(decoded, 64, 11);
+#endif
     return UA_STATUSCODE_GOOD;
 }
 
-#endif
-
 /******************/
 /* Array Handling */
 /******************/
diff --git a/tests/check_types_builtin.c b/tests/check_types_builtin.c
index ef124812bb5..a365cc1266c 100644
--- a/tests/check_types_builtin.c
+++ b/tests/check_types_builtin.c
@@ -809,10 +809,6 @@ START_TEST(UA_Float_encodeShallWorkOnExample) {
         {0x00, 0x00, 0x80, 0x7F}, // INF
         {0x00, 0x00, 0x80, 0xFF} // -INF
     };
-#if defined(_MSC_VER)
-    /* On Visual Studio, -NAN is encoded differently */
-    result[4][3] = 127;
-#endif
 
     UA_Byte data[] = {0x55, 0x55, 0x55,  0x55};
     UA_ByteString dst = {4, data};

From f1eed9d6aef91444a206cfae66f62b2dadf1bef0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Oct 2025 23:02:27 +0200
Subject: [PATCH 1859/1963] fix(build): Pacify compiler warnings related to
 goto (but harmless)

---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 002efecb75b..0aa73c0d09f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -690,6 +690,12 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST
     # Use a strict subset of the C and C++ languages
     check_add_cc_flag("-Wc++-compat")
 
+    # Wc++-compat enables additional goto/jump restrictions.
+    # But modern compilers do a detailed analysis of values
+    # are actually used uninitialized after a jump:
+    # TODO: The following flag should not be required
+    check_add_cc_flag("-Wno-jump-misses-init")
+
     # Check that format strings (printf/scanf) are sane
     check_add_cc_flag("-Wformat")
     check_add_cc_flag("-Wformat-security")

From 59d7cc5f2124b9721dd4e5c8f3056d3eb470455d Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 8 Oct 2025 23:34:38 +0200
Subject: [PATCH 1860/1963] fix(plugins): Pacify a clang warning in
 ua_pki_mbedtls.c

---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 8ab41285f65..bcd4c04f720 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -42,7 +42,7 @@ UA_Bstrstr(const unsigned char *s1, size_t l1, const unsigned char *s2, size_t l
     const unsigned char *ss2 = s2;
     /* handle special case */
     if(l1 == 0)
-        return (NULL);
+        return NULL;
     if(l2 == 0)
         return s1;
 

From e5a7dc0653de8513e045421457f908be194a68b8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 20 Oct 2025 14:07:58 +0200
Subject: [PATCH 1861/1963] refactor(build): Bump the release version to
 v1.3.16

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0aa73c0d09f..e9f0b9ea5b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 15)
+set(OPEN62541_VER_PATCH 16)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 76e425ee963e8c16c0414f2f6bd0c7a5761a92c3 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 20 Oct 2025 14:10:18 +0200
Subject: [PATCH 1862/1963] refactor(build): Bump version to v1.4.14

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b128f224e82..91bf382fd71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 13)
+set(OPEN62541_VER_PATCH 14)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 50514c8ddf790037b931c4cfd21cddabb3e036dc Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 5 Nov 2025 09:59:03 +0100
Subject: [PATCH 1863/1963] feat(tests): Add a test case for setting session
 attributes from issue #6724

---
 tests/server/check_accesscontrol.c | 46 ++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/server/check_accesscontrol.c b/tests/server/check_accesscontrol.c
index 8cabe3fb35e..630bfdfa4b1 100644
--- a/tests/server/check_accesscontrol.c
+++ b/tests/server/check_accesscontrol.c
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <open62541/client.h>
+#include <open62541/client_highlevel.h>
 #include <open62541/client_config_default.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
@@ -163,6 +164,50 @@ START_TEST(Server_sessionParameter) {
     UA_Server_delete(server);
 } END_TEST
 
+static UA_Byte
+customGetUserAccessLevel(UA_Server *server, UA_AccessControl *ac,
+                         const UA_NodeId *sessionId, void *sessionContext,
+                         const UA_NodeId *nodeId, void *nodeContext) {
+    UA_QualifiedName key = UA_QUALIFIEDNAME(1, "test");
+    UA_Variant variant;
+    double value = 11.11;
+    UA_Variant_setScalar(&variant, &value, &UA_TYPES[UA_TYPES_DOUBLE]);
+    UA_StatusCode status = UA_Server_setSessionAttribute(server, sessionId, key, &variant);
+    ck_assert_uint_eq(status, UA_STATUSCODE_GOOD);
+    return 0xFF;
+}
+
+START_TEST(Server_setSessionParameter) {
+    server = UA_Server_new();
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    setCustomAccessControl(config);
+    config->accessControl.getUserAccessLevel = customGetUserAccessLevel;
+
+    UA_Server_run_startup(server);
+
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant val;
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+} END_TEST
+
 static Suite* testSuite_Client(void) {
     Suite *s = suite_create("Client");
     TCase *tc_client_user = tcase_create("Client User/Password");
@@ -175,6 +220,7 @@ static Suite* testSuite_Client(void) {
 
     TCase *tc_server = tcase_create("Server-Side Access Control");
     tcase_add_test(tc_server, Server_sessionParameter);
+    tcase_add_test(tc_server, Server_setSessionParameter);
     suite_add_tcase(s,tc_server);
     return s;
 }

From 43f6df8696d32bd4dcaff9a0a838997bb26b9407 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 5 Nov 2025 09:59:37 +0100
Subject: [PATCH 1864/1963] refactor(server): Include the session attributes
 map directly in the session

---
 src/server/ua_session.c | 10 ++++------
 src/server/ua_session.h |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/server/ua_session.c b/src/server/ua_session.c
index db2d7f0e196..3e7b4a77da5 100644
--- a/src/server/ua_session.c
+++ b/src/server/ua_session.c
@@ -56,8 +56,7 @@ void UA_Session_clear(UA_Session *session, UA_Server* server) {
     session->continuationPoints = NULL;
     session->availableContinuationPoints = UA_MAXCONTINUATIONPOINTS;
 
-    UA_KeyValueMap_delete(session->attributes);
-    session->attributes = NULL;
+    UA_KeyValueMap_clear(&session->attributes);
 
     UA_Array_delete(session->localeIds, session->localeIdsSize,
                     &UA_TYPES[UA_TYPES_STRING]);
@@ -277,8 +276,7 @@ UA_Server_setSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
     UA_Session *session = getSessionById(server, sessionId);
     UA_StatusCode res = UA_STATUSCODE_BADSESSIONIDINVALID;
     if(session)
-        res = UA_KeyValueMap_set(session->attributes,
-                                 key, value);
+        res = UA_KeyValueMap_set(&session->attributes, key, value);
     unlockServer(server);
     return res;
 }
@@ -295,7 +293,7 @@ UA_Server_deleteSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
         return UA_STATUSCODE_BADSESSIONIDINVALID;
     }
     UA_StatusCode res =
-        UA_KeyValueMap_remove(session->attributes, key);
+        UA_KeyValueMap_remove(&session->attributes, key);
     unlockServer(server);
     return res;
 }
@@ -336,7 +334,7 @@ getSessionAttribute(UA_Server *server, const UA_NodeId *sessionId,
         attr = &localAttr;
     } else {
         /* Get from the actual key-value list */
-        attr = UA_KeyValueMap_get(session->attributes, key);
+        attr = UA_KeyValueMap_get(&session->attributes, key);
         if(!attr)
             return UA_STATUSCODE_BADNOTFOUND;
     }
diff --git a/src/server/ua_session.h b/src/server/ua_session.h
index 22551a1dd37..21bd4e4f87e 100644
--- a/src/server/ua_session.h
+++ b/src/server/ua_session.h
@@ -53,7 +53,7 @@ typedef struct {
     UA_UInt16         availableContinuationPoints;
     ContinuationPoint *continuationPoints;
 
-    UA_KeyValueMap *attributes;
+    UA_KeyValueMap attributes;
 
     /* Localization information */
     size_t localeIdsSize;

From 1aceacf57fcbea1054611fb066d521dd5981127a Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Wed, 5 Nov 2025 10:31:20 +0100
Subject: [PATCH 1865/1963] fix(plugins): Use the session parameters feature
 instead of storing data in the SessionContext

This fixes #7361
---
 plugins/ua_accesscontrol_default.c    | 60 ++++++++++++++++++++-------
 src/server/ua_services_subscription.c | 19 ++++++---
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index c3e9183486e..bc11203d7c0 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -53,6 +53,13 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
 
         /* No userdata atm */
         *sessionContext = NULL;
+
+        /* Set the clientUserId to the empty string for anonymous */
+        UA_String emptyStr = UA_STRING_NULL;
+        UA_Variant userIdVar;
+        UA_Variant_setScalar(&userIdVar, &emptyStr, &UA_TYPES[UA_TYPES_STRING]);
+        UA_Server_setSessionParameter(server, sessionId, "clientUserId", &userIdVar);
+
         return UA_STATUSCODE_GOOD;
     }
 
@@ -76,6 +83,13 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
 
         /* No userdata atm */
         *sessionContext = NULL;
+
+        /* Set the clientUserId to the empty string for anonymous */
+        UA_String emptyStr = UA_STRING_NULL;
+        UA_Variant userIdVar;
+        UA_Variant_setScalar(&userIdVar, &emptyStr, &UA_TYPES[UA_TYPES_STRING]);
+        UA_Server_setSessionParameter(server, sessionId, "clientUserId", &userIdVar);
+
         return UA_STATUSCODE_GOOD;
     }
 
@@ -99,8 +113,8 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         UA_Boolean match = false;
         if(context->loginCallback) {
             if(context->loginCallback(&userToken->userName, &userToken->password,
-               context->usernamePasswordLoginSize, context->usernamePasswordLogin,
-               sessionContext, context->loginContext) == UA_STATUSCODE_GOOD)
+                                      context->usernamePasswordLoginSize, context->usernamePasswordLogin,
+                                      sessionContext, context->loginContext) == UA_STATUSCODE_GOOD)
                 match = true;
         } else {
             for(size_t i = 0; i < context->usernamePasswordLoginSize; i++) {
@@ -114,11 +128,10 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         if(!match)
             return UA_STATUSCODE_BADUSERACCESSDENIED;
 
-        /* For the CTT, recognize whether two sessions are  */
-        UA_ByteString *username = UA_ByteString_new();
-        if(username)
-            UA_ByteString_copy(&userToken->userName, username);
-        *sessionContext = username;
+        /* Set the clientUserId to the username */
+        UA_Variant userIdVar;
+        UA_Variant_setScalar(&userIdVar, (void*)(uintptr_t)&userToken->userName, &UA_TYPES[UA_TYPES_STRING]);
+        UA_Server_setSessionParameter(server, sessionId, "clientUserId", &userIdVar);
         return UA_STATUSCODE_GOOD;
     }
 
@@ -133,9 +146,18 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         if(!context->verifyX509.verifyCertificate)
             return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
 
-        return context->verifyX509.
+        UA_Boolean verified =
+            context->verifyX509.
             verifyCertificate(context->verifyX509.context,
                               &userToken->certificateData);
+        if(!verified)
+            return false;
+
+        /* Set the clientUserId to the certificate data */
+        UA_Variant userIdVar;
+        UA_Variant_setScalar(&userIdVar, (void*)(uintptr_t)&userToken->certificateData, &UA_TYPES[UA_TYPES_BYTESTRING]);
+        UA_Server_setSessionParameter(server, sessionId, "clientUserId", &userIdVar);
+        return true;
     }
 
     /* Unsupported token type */
@@ -145,8 +167,6 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
 static void
 closeSession_default(UA_Server *server, UA_AccessControl *ac,
                      const UA_NodeId *sessionId, void *sessionContext) {
-    if(sessionContext)
-        UA_ByteString_delete((UA_ByteString*)sessionContext);
 }
 
 static UA_UInt32
@@ -218,12 +238,20 @@ static UA_Boolean
 allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
                                   const UA_NodeId *oldSessionId, void *oldSessionContext,
                                   const UA_NodeId *newSessionId, void *newSessionContext) {
-    if(oldSessionContext == newSessionContext)
-        return true;
-    if(oldSessionContext && newSessionContext)
-        return UA_ByteString_equal((UA_ByteString*)oldSessionContext,
-                                   (UA_ByteString*)newSessionContext);
-    return false;
+    UA_Variant userId1;
+    UA_Variant userId2;
+    UA_Variant_init(&userId1);
+    UA_Variant_init(&userId2);
+
+    UA_StatusCode res = UA_STATUSCODE_GOOD;
+    res |= UA_Server_getSessionParameter(server, oldSessionId, "userClientId", &userId1);
+    res |= UA_Server_getSessionParameter(server, newSessionId, "userClientId", &userId2);
+
+    UA_Boolean allow = (res == UA_STATUSCODE_GOOD &&
+                        UA_order(&userId1, &userId2, &UA_TYPES[UA_TYPES_VARIANT]) == UA_ORDER_EQ);
+    UA_Variant_clear(&userId1);
+    UA_Variant_clear(&userId2);
+    return allow;
 }
 #endif
 
diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index cb485c7705b..ecec4b151bc 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -482,12 +482,19 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     }
 
     /* Check with AccessControl if the transfer is allowed */
-    if(!server->config.accessControl.allowTransferSubscription ||
-       !server->config.accessControl.
-       allowTransferSubscription(server, &server->config.accessControl,
-                                 oldSession ? &oldSession->sessionId : NULL,
-                                 oldSession ? oldSession->sessionHandle : NULL,
-                                 &session->sessionId, session->sessionHandle)) {
+    UA_Boolean transferAllowed =
+        (server->config.accessControl.allowTransferSubscription != NULL);
+    if(transferAllowed) {
+        UA_UNLOCK(&server->serviceMutex);
+        transferAllowed = server->config.accessControl.
+            allowTransferSubscription(server, &server->config.accessControl,
+                                      oldSession ? &oldSession->sessionId : NULL,
+                                      oldSession ? oldSession->sessionHandle : NULL,
+                                      &session->sessionId, session->sessionHandle);
+        UA_LOCK(&server->serviceMutex);
+    }
+
+    if(!transferAllowed) {
         result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
         return;
     }

From eb9e459bfe1314d3ca16e0bdc8e32a5760418179 Mon Sep 17 00:00:00 2001
From: julepp <jeppard@hilscher.com>
Date: Wed, 5 Nov 2025 14:05:55 +0100
Subject: [PATCH 1866/1963] fix(nc): Reorder parsing of LocalizedText fields

---
 tools/nodeset_compiler/datatypes.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/nodeset_compiler/datatypes.py b/tools/nodeset_compiler/datatypes.py
index e90a7739651..ef9b59d97f3 100644
--- a/tools/nodeset_compiler/datatypes.py
+++ b/tools/nodeset_compiler/datatypes.py
@@ -647,13 +647,15 @@ def parseXML(self, xmlvalue):
             tmp = xmlvalue.getElementsByTagName("Locale")
             if len(tmp) > 0 and tmp[0].firstChild != None:
                 self.locale = tmp[0].firstChild.data.strip(' \t\n\r')
-        tmp = xmlvalue.firstChild
-        if tmp and tmp.nodeType == dom.Element.TEXT_NODE:
-            self.text = tmp.data.strip(' \t\n\r')
+
+        tmp = xmlvalue.getElementsByTagName("Text")
+        if len(tmp) > 0 and tmp[0].firstChild != None:
+            self.text = tmp[0].firstChild.data.strip(' \t\n\r')
         else:
-            tmp = xmlvalue.getElementsByTagName("Text")
-            if len(tmp) > 0 and tmp[0].firstChild != None:
-                self.text = tmp[0].firstChild.data.strip(' \t\n\r')
+            tmp = xmlvalue.firstChild
+            if tmp and tmp.nodeType == dom.Element.TEXT_NODE:
+                self.text = tmp.data.strip(' \t\n\r')
+
 
     def __str__(self):
         if self.locale is None and self.text is None:

From 46db7cf16dab610d11d7dfbc9defb1cb8687f538 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Fri, 7 Nov 2025 21:53:52 +0100
Subject: [PATCH 1867/1963] refactor(docs): Update the README.md to mention o6
 Automation and the 1.4 certification

---
 README.md | 104 ++++++++++++++----------------------------------------
 1 file changed, 27 insertions(+), 77 deletions(-)

diff --git a/README.md b/README.md
index 27bed7fab67..4271216e668 100644
--- a/README.md
+++ b/README.md
@@ -1,75 +1,23 @@
-# open62541
+<div align="center">
+  <a href="https://open62541.org">
+    <img alt="open62541 Logo" src="https://open62541.org/images/logo-open62541.svg" width="400px">
+  </a>
+</div>
+<br />
 
-open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications. The open62541 library is platform independent: All platform-specific functionality is implemented via exchangeable plugins for easy porting to different (embedded) targets.
+open62541 (<http://open62541.org>) is an open source implementation of OPC UA (OPC Unified Architecture / IEC 62541) written in the C language. The library is usable with all major compilers and provides the necessary tools to implement dedicated OPC UA clients and servers, or to integrate OPC UA-based communication into existing applications. See the [features overview](FEATURES.md) for full details.
+The open62541 library is platform independent: All platform-specific functionality is implemented via exchangeable plugins for easy porting to different (embedded) targets.
 
-open62541 is licensed under the Mozilla Public License v2.0 (MPLv2). This allows the open62541 library to be combined and distributed with any proprietary software. Only changes to the open62541 library itself need to be licensed under the MPLv2 when copied and distributed. The plugins, as well as the server and client examples are in the public domain (CC0 license). They can be reused under any license and changes do not have to be published.
+open62541 is licensed under the Mozilla Public License v2.0 (MPLv2). This allows the open62541 library to be combined and distributed with any proprietary software. Only changes to the open62541 library itself need to be licensed under the MPLv2 when copied and distributed. Some plugins and examples are in the public domain (CC0 license) and some are licensed under MPLv2. The CC0 licensed ones can be reused under any license and changes do not have to be published.
 
-The library is [available](https://github.com/open62541/open62541/releases) in standard source and binary form. In addition, the single-file source distribution merges the entire library into a single .c and .h file that can be easily added to existing projects. Example server and client implementations can be found in the [/examples](examples/) directory or further down on this page.
+The library is available in standard source and binary form. In addition, the single-file source distribution merges the entire library into a single .c and .h file that can be easily added to existing projects. Example server and client implementations can be found in the [/examples](examples/) directory or further down on this page.
 
 [![Open Hub Project Status](https://www.openhub.net/p/open62541/widgets/project_thin_badge.gif)](https://www.openhub.net/p/open62541/)
-[![Build Status](https://dev.azure.com/open62541/open62541/_apis/build/status/open62541.open62541?branchName=master)](https://dev.azure.com/open62541/open62541/_build/latest?definitionId=1&branchName=master)
 [![Build Status](https://ci.appveyor.com/api/projects/status/github/open62541/open62541?branch=master&svg=true)](https://ci.appveyor.com/project/open62541/open62541/branch/master)
 [![Code Scanning](https://github.com/open62541/open62541/actions/workflows/codeql.yml/badge.svg)](https://github.com/open62541/open62541/actions/workflows/codeql.yml)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/open62541.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:open62541)
 [![codecov](https://codecov.io/gh/open62541/open62541/branch/master/graph/badge.svg)](https://codecov.io/gh/open62541/open62541)
 
-## Features
-
-open62541 implements an OPC UA SDK with support for servers, clients and PubSub (publish-subscribe) communication.
-See the [features overview](FEATURES.md) for full details.
-
-- Core Stack
-  - OPC UA binary and JSON encoding
-  - TCP-based OPC UA SecureChannel
-  - Custom data types (generated from XML definitions)
-  - Portable C99 -- architecture-specific code is encapsulated behind standard interfaces
-  - Highly configurable with default plugins for encryption (OpenSSL, mbedTLS), access control, historizing, logging, etc.
-- Server
-  - Support for all OPC UA services (except the Query service -- not implemented by any SDK)
-  - Support for generating information models from standard XML definitions (Nodeset Compiler)
-  - Support for adding and removing nodes and references at runtime
-  - Support for subscriptions (data-change and event notifications)
-- Client
-  - Support for all OPC UA services
-  - Support for asynchronous service requests
-  - Background handling of subscriptions
-- PubSub
-  - PubSub message encoding (binary and JSON)
-  - Transport over UDP-multicast, Ethernet, MQTT
-  - Runtime configuration via the information model
-  - Configurable realtime fast-path
-
-## Commercial Use and Official Support
-
-open62541 is licensed under the MPLv2. That is, changes to files under MPLv2 fall under the same open-source license.
-But the library can be combined with private development from separate files, also if a static binary is produced, without the license affecting the private files.
-See the full [license document](LICENSE) for details.
-
-**Fraunhofer IOSB** maintains open62541 and provides **[official commercial support](https://www.iosb.fraunhofer.de/en/projects-and-products/open62541.html)**.
-Additional service providers are listed on [open62541.org](https://www.open62541.org/).
-
-## Official Certification
-
-The sample server (server_ctt) built using open62541 v1.0 is in conformance with the 'Micro Embedded Device Server' Profile of OPC Foundation supporting OPC UA client/server communication, subscriptions, method calls and security (encryption) with the security policies 'Basic128Rsa15', 'Basic256' and 'Basic256Sha256' and the facets 'method server' and 'node management'. See https://open62541.org/certified-sdk for more details.
-
-PubSub (UADP) is implemented in open62541. But the feature cannot be certified at this point in time (Sep-2019) due to the lack of official test cases and testing tools.
-
-During development, the Conformance Testing Tools (CTT) of the OPC Foundation are regularly applied.
-The CTT configuration and results are tracked at https://github.com/open62541/open62541-ctt. The OPC UA profiles under regular test in the CTT are currently:
-
-- Micro Embedded Device Server
-- Method Server Facet
-- Node Management Facet
-- Security Policies
-  - Basic128Rsa15
-  - Basic256
-  - Basic256Sha256
-- User Tokens
-  - Anonymous Facet
-  - User Name Password Server Facet
-
-See the page on [open62541 Features](FEATURES.md) for an in-depth look at the support for the conformance units that make up the OPC UA profiles.
-  
 ## Documentation and Support
 
 A general introduction to OPC UA and the open62541 documentation can be found at http://open62541.org.
@@ -82,8 +30,22 @@ For individual discussion and support, use the following channels:
 - [Issue Tracker](https://github.com/open62541/open62541/issues)
 - [Pull Requests](https://github.com/open62541/open62541/pulls)
 
+[o6 Automation GmbH](https://www.o6-automation.com/) employs the core contributors to open62541 and provides **[commercial support](https://www.o6-automation.com/services)**.
+The project is however open to outside contributions and **contributors retain their individual copyright**. This prevents future relicensing under different license conditions.
+
 We want to foster an open and welcoming community. Please take our [code of conduct](CODE_OF_CONDUCT.md) into regard.
 
+## Commercial Use
+
+open62541 is licensed under the MPLv2. That is, changes to files under MPLv2 fall under the same open-source license.
+But the library can be combined with private development from separate files, also if a static binary is produced, without the license affecting the private files.
+See the full [license document](LICENSE) for details.
+
+## Official Certification
+
+An example server built with open62541 v1.4 was certified for the 'Standard Server 2017 Profile' by the OPC Foundation.
+See https://open62541.org/certification for more details.
+
 ## Development
 
 As an open source project, new contributors are encouraged to help improve open62541. The file [CONTRIBUTING.md](CONTRIBUTING.md) aggregates good practices that we expect for code contributions. The following are good starting points for new contributors:
@@ -118,27 +80,15 @@ We emphasize code quality. The following quality metrics are continuously checke
 - Zero unresolved issues from fuzzing the library in Google's oss-fuzz infrastructure
 - Zero issues indicated by Valgrind (Linux), DrMemory (Windows) and Clang AddressSanitizer / MemorySanitizer for the CTT tests, unit tests and fuzzing
 
-## Installation and code usage
-
-For every release, we provide some pre-packed release packages which you can directly use in your compile infrastructure.
+## Installation and Examples
 
-Have a look at the [release page](https://github.com/open62541/open62541/releases) and the corresponding attached assets.
+On Debian/Ubuntu systems, a simple ```apt install libopen62541-1.4-dev``` installs the library and the development header files.
+Using the GCC compiler, just run ```gcc -std=c99 <server.c> -lopen62541 -o server```.
 
 A more detailed explanation on how to install the open62541 SDK is given in our [documentation](https://www.open62541.org/doc/master/building.html#building-the-library).
 In essence, clone the repository and initialize all the submodules using `git submodule update --init --recursive`. Then use CMake to configure your build.
 
-Furthermore we provide "pack branches" that are up-to-date with the corresponding base branches, and in addition have the git submodules in-place for a zip download.
-Here are some direct download links for the current pack branches:  
-
-  - [pack/master.zip](https://github.com/open62541/open62541/archive/pack/master.zip)
-  - [pack/1.0.zip](https://github.com/open62541/open62541/archive/pack/1.0.zip)
-
-## Examples
-
 A complete list of examples can be found in the [examples directory](https://github.com/open62541/open62541/tree/master/examples).
-To build the examples, we recommend to install open62541 as mentioned in the previous section.
-Using the GCC compiler, just run ```gcc -std=c99 <server.c> -lopen62541 -o server``` (under Windows you may need to add additionally link against the ```ws2_32``` 
-socket library).
 
 ### Example Server Implementation
 

From 0ba41ab3b3b123493354e37872e30cbdad0951c5 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 10 Nov 2025 20:41:05 +0100
Subject: [PATCH 1868/1963] refactor(doc): Add project links to the Readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4271216e668..812473321b0 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
   <a href="https://open62541.org">
     <img alt="open62541 Logo" src="https://open62541.org/images/logo-open62541.svg" width="400px">
   </a>
+  <br />
+  <a href=https://open62541.org">https://open62541.org</a> | <a href="https://www.o6-automation.com">https://www.o6-automation.com</a>
 </div>
 <br />
 

From f225a3cdf0f2f64cf497171d2cbdbbdbb2753ef9 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 10 Nov 2025 20:45:55 +0100
Subject: [PATCH 1869/1963] refactor(doc): Use links with target=_blank in the
 Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 812473321b0..9a627d031d2 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
     <img alt="open62541 Logo" src="https://open62541.org/images/logo-open62541.svg" width="400px">
   </a>
   <br />
-  <a href=https://open62541.org">https://open62541.org</a> | <a href="https://www.o6-automation.com">https://www.o6-automation.com</a>
+  <a href="https://open62541.org" target="_blank" rel="noopener">https://open62541.org</a> | <a href="https://www.o6-automation.com" target="_blank" rel="noopener">https://www.o6-automation.com</a>
 </div>
 <br />
 

From 7dad7d5955b7571ae9cd3cc2de0adb4ef19498a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Krecker?= <soekkle@freenet.de>
Date: Fri, 14 Nov 2025 10:15:55 +0100
Subject: [PATCH 1870/1963] test(sec): Add test for CA sign certs

Add a test for a client and server with PEM-Certifacates and CA.
---
 tests/CMakeLists.txt               |   1 +
 tests/encryption/certificates_ca.h | 258 +++++++++++++++++++++++++++++
 tests/encryption/check_ca_chain.c  | 202 ++++++++++++++++++++++
 3 files changed, 461 insertions(+)
 create mode 100644 tests/encryption/certificates_ca.h
 create mode 100644 tests/encryption/check_ca_chain.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8f40f7f7049..1a37ce04c4b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -432,6 +432,7 @@ endif()
 if(UA_ENABLE_ENCRYPTION)
     ua_add_test(client/check_client_encryption.c)
     ua_add_test(encryption/check_crl_validation.c)
+    ua_add_test(encryption/check_ca_chain.c)
 
     if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_MBEDTLS)
         ua_add_test(client/check_client_authentication.c)
diff --git a/tests/encryption/certificates_ca.h b/tests/encryption/certificates_ca.h
new file mode 100644
index 00000000000..2d14147b043
--- /dev/null
+++ b/tests/encryption/certificates_ca.h
@@ -0,0 +1,258 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2025 (c) Sören Krecker
+ *
+ */                                                                                      \
+
+#ifndef CERTIFICATES_H_
+#define CERTIFICATES_H_
+
+#include <open62541/types.h>
+
+_UA_BEGIN_DECLS
+
+#define CA_KEY_PEM_LENGTH 1704
+UA_Byte CA_KEY_PEM_DATA[CA_KEY_PEM_LENGTH] = "";
+
+#define CA_CERT_PEM_LENGTH 1355
+UA_Byte CA_CERT_PEM_DATA[CA_CERT_PEM_LENGTH+1] = 
+"-----BEGIN CERTIFICATE-----\n\
+MIIDujCCAqKgAwIBAgIDBiVBMA0GCSqGSIb3DQEBCwUAMGwxCzAJBgNVBAYTAkRF\n\
+MQ0wCwYDVQQHDARIZXJlMRIwEAYDVQQKDAlvcGVuNjI1NDExGDAWBgNVBAsMD09w\n\
+ZW42MjU0MVRlc3RDQTEgMB4GA1UEAwwXT3BlbjYyNTQxIFRlc3QgQ0EgUm9vdDEw\n\
+IBcNMjUxMTE0MTAwNjE0WhgPMjEyNTEwMjExMDA2MTRaMGwxCzAJBgNVBAYTAkRF\n\
+MQ0wCwYDVQQHDARIZXJlMRIwEAYDVQQKDAlvcGVuNjI1NDExGDAWBgNVBAsMD09w\n\
+ZW42MjU0MVRlc3RDQTEgMB4GA1UEAwwXT3BlbjYyNTQxIFRlc3QgQ0EgUm9vdDEw\n\
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBiOrgHZCaeFoUjo+Uv2W8\n\
+Y0L7cyktSVoboMDceQ7HDuaNUCY6Dn/zJPMSbBKZ/YEm+g+Ftr2U3n040fLbpJ9x\n\
+1i+hlPfRJbdFQxoAnMev5P5EEON/QMmC7xcb2xckJnQC2CCUTln/Ldm4N1o0FOAK\n\
+pe8eseyQYUVn/5YgYdLH1OLdbgcJazEEATJeuRkekFrBAB4amflRSqkK/bsXbD4Z\n\
+qhuwcYtYBkigxr/554jfqhjvW4bkY/9I3pK4Z5VRTU8mzuI6i7/XorNG/FIAxTRH\n\
+dsrsXKNDXkJzDOvC7ac7EHUrGPaidzg97KsLX2OAirpNiPjC8rMSlXEoN/wR54M/\n\
+AgMBAAGjYzBhMB0GA1UdDgQWBBQySi/xFbZZZLFKcZl2TNsDiRwD0zAfBgNVHSME\n\
+GDAWgBQySi/xFbZZZLFKcZl2TNsDiRwD0zAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud\n\
+DwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAexZmSuNO5NOxzQgF6PSX3Ep3\n\
+++FKI2oYwaQakLlgVyFn+EMlIOgAbgJyvv0LLKNvTyuB5kn2DKVehS1qdBWuslcX\n\
+FyjqTOup7ywXhl1DQJqnZrd8GcBIeumNGCk9nn4jCtVSrKjXwJ2y0fiCNEBFKLxE\n\
+4jfFi4GLomoWj1BQX2Jl1cAUmewR50T6wRk5UEWUmJDKz3EV3oCHdmE9DRexMh3z\n\
+AG1HdC9N5q/MbL0eK0KJCNvrmPnEl6QQpwWZuGMduPS86u/m2CNlug3yvRZApRpc\n\
+j5aRt4fReHLy1Nw7Bra+m7sSGVe/u3RbhyNTFMY9RwZAGZafjoNAO7geNReSyA==\n\
+-----END CERTIFICATE-----\n\
+";
+
+#define CLIENT_KEY_PEM_LENGTH 3133
+UA_Byte CLIENT_KEY_PEM_DATA[CLIENT_KEY_PEM_LENGTH+1] = 
+"-----BEGIN PRIVATE KEY-----\n\
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkh7qasDKpsXhD\n\
+kRzv0jKS8lkcbFm7ygFalicxqpbnFXdpXx5Wp3FdFOrxIVwlq+hwRO0tOM8nGtij\n\
+xzdVP6lLXdIvWkOGTJ+rGJQfhDL1snMoRjtsxlerc9JLDxe6ynaodmoMqsn5BT+P\n\
+nCM7BpwNLEvgTYU8EZJr233Kut0bTIRMe41DGNzTRxh3yV1hlBU7M2LUlJX9oYGF\n\
+vwe/lDfiIFEPORNs3QsXglZRYvPNGjmRPv85QoRPqbF509iw9JQ6Ax0ibmTnBSci\n\
+2XM6bfAgxEgXZj45N35I3jJhJegh4Nz9EEdsplijZ9puZvThcxwEH52PGWc54vO2\n\
+BPz9gpXvAgMBAAECggEADxM5TQDK9j3CuVzQ9sUJiZRMskGClqXDf6jVY4Qauoap\n\
+f81NgClscNfApSJmM99vTJDMMyy1h62P3wXFs05synEzbST180FkZIQRLQgVtpRz\n\
+X7kmVb5LUcmAIbd6zaHNGHzCanG1pYGjxBqi0b7hH9szV+nSb4wOoJ+mWXkgrDuu\n\
+F2gBVKn0KGM0oii6k2vIpCEWNsdwtvb1VwwWqJFbeLBnEIkVeDgABeb6bGWPQ5Jg\n\
+i2NqLkrZ0PADfNfuS17wLnt2oekuqTjEebPQe7S57Bl9+X2l7fs5VgfGWxC0IZVO\n\
+5iYrPk6hOkiXhJxrqpxlAOnOSaJnlJlVdte3A8iqkQKBgQDW565X8Ar0Aw73X2+b\n\
+OR0+7QruzaOqrwXPNKnYOPMVByDlbFD1+7yWxeP91QZ/L2AJyz6rRqbQ4pXXhNlG\n\
+mOFLXLIVEzClI7Ks1XtZp2eSFrMtLFnqiZeOoUMUsU98YZ4CQ4rteOoeI3Un17fz\n\
+wQ4hGsDDXxaw+LlTklDWNkgykQKBgQDD/ghCF7vJLgmaMN69bTUscMXZ8gX61Eu4\n\
+MyL362ldQoALqqGLSQ+PyQnqGD85Zr1i3TO9U3I43C1yvGi/f7KOh3S5W8f+2xXs\n\
+oRImTJgtuujLCkVmmFV3G6ruKJzH3gOU6LKhqSJU2asZFRAJtzJT+o1nw9Kn+Pm7\n\
+h8LhQlmAfwKBgB5ENuuvpPtEywDP8hn8a0AHhningZtyVvEdy6XmL2YQwPNO1AAw\n\
+2hip+jgvnmCfPXljpInew3O71bqqvScSNPi2L2aEc19uraVl05+G0jFi/Q0pp+g+\n\
+RJgT4iyx5C3yWZycAp77Xo2sFL3txbyQvfqvl+JsK/f0r7UzcCsbLgPhAoGBAIx8\n\
+zmyZ2JiXsHhfKXp9Co2FdL0KGDE49eHefeVaUJdx8JjsQYm24Dm/8KRlpwQ9WenB\n\
+B7JhW1HYuZcx6J/EKDi0bf3kBVLwtiF9P6ZGZxr4jJ/mB+NHtJOBOKAoamF2Cfk2\n\
+Z70roJlTwapkB6//Kks6IRxNKPYQqOo8oXuYdNF/AoGAAdJ6Vsg70tmEGTloEBWh\n\
+Ny3NrNS5GF6/68E4GERMKfE+b4qhx05bTJ90JqMHmkgIbQ+iULLTEniBttHv6C+X\n\
+ljOCaKc7F2HfvRHwGsauo+/dlzBeZB7nZ3SoPUWExxOTC90EQFQDNJvpO+ERUJII\n\
+d9gIrOfFBf4gSkxHRBGjt7w=\n\
+-----END PRIVATE KEY-----\n\
+-----BEGIN CERTIFICATE-----\n\
+MIID8DCCAtigAwIBAgIUXlIRaFT3iRMahnNIixZOIfD+Jf0wDQYJKoZIhvcNAQEL\n\
+BQAwbDELMAkGA1UEBhMCREUxDTALBgNVBAcMBEhlcmUxEjAQBgNVBAoMCW9wZW42\n\
+MjU0MTEYMBYGA1UECwwPT3BlbjYyNTQxVGVzdENBMSAwHgYDVQQDDBdPcGVuNjI1\n\
+NDEgVGVzdCBDQSBSb290MTAgFw0yNTExMTQxMDA2MTZaGA8yMTI1MTAyMTEwMDYx\n\
+NlowSjELMAkGA1UEBhMCREUxDTALBgNVBAcMBEhlcmUxEjAQBgNVBAoMCW9wZW42\n\
+MjU0MTEYMBYGA1UECwwPT3BlbjYyNTQxVGVzdENBMIIBIjANBgkqhkiG9w0BAQEF\n\
+AAOCAQ8AMIIBCgKCAQEApIe6mrAyqbF4Q5Ec79IykvJZHGxZu8oBWpYnMaqW5xV3\n\
+aV8eVqdxXRTq8SFcJavocETtLTjPJxrYo8c3VT+pS13SL1pDhkyfqxiUH4Qy9bJz\n\
+KEY7bMZXq3PSSw8Xusp2qHZqDKrJ+QU/j5wjOwacDSxL4E2FPBGSa9t9yrrdG0yE\n\
+THuNQxjc00cYd8ldYZQVOzNi1JSV/aGBhb8Hv5Q34iBRDzkTbN0LF4JWUWLzzRo5\n\
+kT7/OUKET6mxedPYsPSUOgMdIm5k5wUnItlzOm3wIMRIF2Y+OTd+SN4yYSXoIeDc\n\
+/RBHbKZYo2fabmb04XMcBB+djxlnOeLztgT8/YKV7wIDAQABo4GpMIGmMAkGA1Ud\n\
+EwQCMAAwHwYDVR0jBBgwFoAUMkov8RW2WWSxSnGZdkzbA4kcA9MwCwYDVR0PBAQD\n\
+AgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMCMDcGA1UdEQQwMC6CCWxvY2FsaG9zdIcE\n\
+fwAAAYYbVVJOOm9wZW42MjU0MS5jYXRlc3QuY2xpZW50MB0GA1UdDgQWBBSUILjz\n\
+za7Pw45YlZj13A//QziqxDANBgkqhkiG9w0BAQsFAAOCAQEAiMG/u/BUuJkllyLu\n\
+4ZnPrl0MeTMdYl4cq733crk0FtKu/FoTjaPKT7hB/z3HBw8fqkN1nNuW8FHJuB6O\n\
+W5sNmxO3ensE+tFqSHJR0+B992q8+fHUm85xd1uCLQEQN+rWVbeIl/XPqmTfzILJ\n\
+c1dZZmYIODGy42HhzcXLAG8pMq+UT/q+24sA6YOX/oL9EJ6NcrOCnIx4jrI6FwxG\n\
+ZkeGu48rSDRsFxdH64AOTWMMJquqQRPQvbHbeg708gAkNgUuJDRgGnyP0JsUMji9\n\
+KZ3eu27rJXkwP+1f8+1n6HnBsIr34AvljC1/1J83K5v3iL7GsfHLkipsm1AjLBwM\n\
+WikK+A==\n\
+-----END CERTIFICATE-----\n\
+";
+
+#define CLIENT_CERT_PEM_LENGTH 2783
+UA_Byte CLIENT_CERT_PEM_DATA[CLIENT_CERT_PEM_LENGTH+1] = 
+"-----BEGIN CERTIFICATE-----\n\
+MIID8DCCAtigAwIBAgIUXlIRaFT3iRMahnNIixZOIfD+Jf0wDQYJKoZIhvcNAQEL\n\
+BQAwbDELMAkGA1UEBhMCREUxDTALBgNVBAcMBEhlcmUxEjAQBgNVBAoMCW9wZW42\n\
+MjU0MTEYMBYGA1UECwwPT3BlbjYyNTQxVGVzdENBMSAwHgYDVQQDDBdPcGVuNjI1\n\
+NDEgVGVzdCBDQSBSb290MTAgFw0yNTExMTQxMDA2MTZaGA8yMTI1MTAyMTEwMDYx\n\
+NlowSjELMAkGA1UEBhMCREUxDTALBgNVBAcMBEhlcmUxEjAQBgNVBAoMCW9wZW42\n\
+MjU0MTEYMBYGA1UECwwPT3BlbjYyNTQxVGVzdENBMIIBIjANBgkqhkiG9w0BAQEF\n\
+AAOCAQ8AMIIBCgKCAQEApIe6mrAyqbF4Q5Ec79IykvJZHGxZu8oBWpYnMaqW5xV3\n\
+aV8eVqdxXRTq8SFcJavocETtLTjPJxrYo8c3VT+pS13SL1pDhkyfqxiUH4Qy9bJz\n\
+KEY7bMZXq3PSSw8Xusp2qHZqDKrJ+QU/j5wjOwacDSxL4E2FPBGSa9t9yrrdG0yE\n\
+THuNQxjc00cYd8ldYZQVOzNi1JSV/aGBhb8Hv5Q34iBRDzkTbN0LF4JWUWLzzRo5\n\
+kT7/OUKET6mxedPYsPSUOgMdIm5k5wUnItlzOm3wIMRIF2Y+OTd+SN4yYSXoIeDc\n\
+/RBHbKZYo2fabmb04XMcBB+djxlnOeLztgT8/YKV7wIDAQABo4GpMIGmMAkGA1Ud\n\
+EwQCMAAwHwYDVR0jBBgwFoAUMkov8RW2WWSxSnGZdkzbA4kcA9MwCwYDVR0PBAQD\n\
+AgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMCMDcGA1UdEQQwMC6CCWxvY2FsaG9zdIcE\n\
+fwAAAYYbVVJOOm9wZW42MjU0MS5jYXRlc3QuY2xpZW50MB0GA1UdDgQWBBSUILjz\n\
+za7Pw45YlZj13A//QziqxDANBgkqhkiG9w0BAQsFAAOCAQEAiMG/u/BUuJkllyLu\n\
+4ZnPrl0MeTMdYl4cq733crk0FtKu/FoTjaPKT7hB/z3HBw8fqkN1nNuW8FHJuB6O\n\
+W5sNmxO3ensE+tFqSHJR0+B992q8+fHUm85xd1uCLQEQN+rWVbeIl/XPqmTfzILJ\n\
+c1dZZmYIODGy42HhzcXLAG8pMq+UT/q+24sA6YOX/oL9EJ6NcrOCnIx4jrI6FwxG\n\
+ZkeGu48rSDRsFxdH64AOTWMMJquqQRPQvbHbeg708gAkNgUuJDRgGnyP0JsUMji9\n\
+KZ3eu27rJXkwP+1f8+1n6HnBsIr34AvljC1/1J83K5v3iL7GsfHLkipsm1AjLBwM\n\
+WikK+A==\n\
+-----END CERTIFICATE-----\n\
+-----BEGIN CERTIFICATE-----\n\
+MIIDujCCAqKgAwIBAgIDBiVBMA0GCSqGSIb3DQEBCwUAMGwxCzAJBgNVBAYTAkRF\n\
+MQ0wCwYDVQQHDARIZXJlMRIwEAYDVQQKDAlvcGVuNjI1NDExGDAWBgNVBAsMD09w\n\
+ZW42MjU0MVRlc3RDQTEgMB4GA1UEAwwXT3BlbjYyNTQxIFRlc3QgQ0EgUm9vdDEw\n\
+IBcNMjUxMTE0MTAwNjE0WhgPMjEyNTEwMjExMDA2MTRaMGwxCzAJBgNVBAYTAkRF\n\
+MQ0wCwYDVQQHDARIZXJlMRIwEAYDVQQKDAlvcGVuNjI1NDExGDAWBgNVBAsMD09w\n\
+ZW42MjU0MVRlc3RDQTEgMB4GA1UEAwwXT3BlbjYyNTQxIFRlc3QgQ0EgUm9vdDEw\n\
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBiOrgHZCaeFoUjo+Uv2W8\n\
+Y0L7cyktSVoboMDceQ7HDuaNUCY6Dn/zJPMSbBKZ/YEm+g+Ftr2U3n040fLbpJ9x\n\
+1i+hlPfRJbdFQxoAnMev5P5EEON/QMmC7xcb2xckJnQC2CCUTln/Ldm4N1o0FOAK\n\
+pe8eseyQYUVn/5YgYdLH1OLdbgcJazEEATJeuRkekFrBAB4amflRSqkK/bsXbD4Z\n\
+qhuwcYtYBkigxr/554jfqhjvW4bkY/9I3pK4Z5VRTU8mzuI6i7/XorNG/FIAxTRH\n\
+dsrsXKNDXkJzDOvC7ac7EHUrGPaidzg97KsLX2OAirpNiPjC8rMSlXEoN/wR54M/\n\
+AgMBAAGjYzBhMB0GA1UdDgQWBBQySi/xFbZZZLFKcZl2TNsDiRwD0zAfBgNVHSME\n\
+GDAWgBQySi/xFbZZZLFKcZl2TNsDiRwD0zAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud\n\
+DwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAexZmSuNO5NOxzQgF6PSX3Ep3\n\
+++FKI2oYwaQakLlgVyFn+EMlIOgAbgJyvv0LLKNvTyuB5kn2DKVehS1qdBWuslcX\n\
+FyjqTOup7ywXhl1DQJqnZrd8GcBIeumNGCk9nn4jCtVSrKjXwJ2y0fiCNEBFKLxE\n\
+4jfFi4GLomoWj1BQX2Jl1cAUmewR50T6wRk5UEWUmJDKz3EV3oCHdmE9DRexMh3z\n\
+AG1HdC9N5q/MbL0eK0KJCNvrmPnEl6QQpwWZuGMduPS86u/m2CNlug3yvRZApRpc\n\
+j5aRt4fReHLy1Nw7Bra+m7sSGVe/u3RbhyNTFMY9RwZAGZafjoNAO7geNReSyA==\n\
+-----END CERTIFICATE-----\n\
+";
+
+#define SERVER_KEY_PEM_LENGTH 3133
+UA_Byte SERVER_KEY_PEM_DATA[SERVER_KEY_PEM_LENGTH + 1] = 
+"-----BEGIN PRIVATE KEY-----\n\
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDehdmDANwB4ibU\n\
+QQSOz3Ntj0VW39xhxkkNIWEyxXDBBe4R0dhNYH/0jX7MeJrJ/YkzowZVx26sBegk\n\
+1xJZ8Qo4kUfnnY9T8rJPOFBDbHdeypW3nSAUrtQlNwga/0itNlpLiKo1skXGvx9W\n\
+NNedPv9cfaSgl2i9VPx/N5mIlNZss26mUCSMz8+9f0MmyFCEVobANGB0GTjdnCAP\n\
+dlYF7FsecjaEwlMZRtCrktMyhfIm+UhBNEBCMS1uwZTtFou/HKBOEOf8t/npaddP\n\
+dKvqGQCeVhOuqJV9dkadZu6cOsPZZqcBVvHzOhMEXHcKv3Nuh+ml1H4PyzEYCG7N\n\
+O0cFDsFrAgMBAAECggEABOcmF8DZGCGHgX29P/hKLsvNV1CvZmgcC/IEVj4LcfVT\n\
+fYkGHw5VQ2oqtQ6jOngfocehyBoQ0jF/H/CtMtYgx4ZL80qBcfQTAbPX8ORe7PPB\n\
+wL3xiwMfIYLI5u9hBpAABVIJjg1ThEGJyzh217wfnEYYboFniWRp+9OZymydHN/8\n\
+tmElAo/j05r/DhCKtQrAC1vMRJGqOGhHzVhq2Gj0GsoOEmWXyliWhijz4HdIFtPI\n\
+lleqPrRuj9OAxI9ExbfufUv2x6Zufwj8U3657lg6oI+L2SvICbqvnzdmKVdrTjJm\n\
+SDAzXHeEwF5L+Vwn79SnO1BVMj2fVRen9gd4X/V6gQKBgQD18eLjfefCuzuHs/9Q\n\
+SeWzh5hAmYIzRDvMd7y7pmQs09MvxYWyQ9EqJhkMiwSly0wOoRd0fzs62EuX8i2g\n\
+BcHeC/7xS+LKgjQKb+5HMEDpOyaoTszd+eVi7yQ1q3RpseJ8ZrPihmBuDGzvEI3k\n\
+5OsMV3nKwg64I9VzP05DxV7CuwKBgQDnntLFArEGAcOdefK0EcLkk2hsYEZk9z+r\n\
+POp//P85ru+3PjuIBlK/kDSg0X5dAO3cWdzefP2GCxpnVxd87Emz24TUuGskgYpN\n\
+JHrLXJBLuVCtMonzhetrf6GAyX3nsjSoX1aNiLSNlj4vZUA4BlEnEAbuak+x6b3J\n\
+naC1WC3JEQKBgG99qJnyAHcBQ3o/+ZRe+3cIF9fo/uHYo7cL7I2wXycHG2xDgVkP\n\
+bylJPf+2oXO7Fg5nrmdMKgCB/rqxuUcadQkArSCbgwLERW0Z0o2I7VQNUXfoyOwz\n\
+lW3k9KgzwkELt50nPZKJ0frxPQyel4RU1cyxdu+YSu3kqKVm5EbKmStzAoGBANXo\n\
+MwUpWC2RAYR09DVi1dfdXyn/u+NRCKbvai5ri5ZNPivAOKCGHnO2DTScZRQlYIcJ\n\
+ItcDHexmYqsfnpyLaAHH8SO3cZPUYtKdpx4azVRxv9VEgGy7uFCeHZxf+Xw6czEw\n\
+YzHxF7ZPE/0XiDh1dQsbXRtgaVuI3/LMNXhlCFvRAoGBAOTA+E725Il6hCS3ek0b\n\
+PtDluYK1VqwWkoH7GgTurU+cqLhtc1cadRARWZF5PBTjDshKFnD6HSu4Us6Mi6Ny\n\
+TngI4HA9cKKgK9YKEFQK+iFGitwqqCFXlqWf7ZYVRfkbG6BCVexnYEArdnrcjz6/\n\
+X+eLRhCn4+0tihxO40J9TIgk\n\
+-----END PRIVATE KEY-----\n\
+-----BEGIN CERTIFICATE-----\n\
+MIID8DCCAtigAwIBAgIUXlIRaFT3iRMahnNIixZOIfD+JfwwDQYJKoZIhvcNAQEL\n\
+BQAwbDELMAkGA1UEBhMCREUxDTALBgNVBAcMBEhlcmUxEjAQBgNVBAoMCW9wZW42\n\
+MjU0MTEYMBYGA1UECwwPT3BlbjYyNTQxVGVzdENBMSAwHgYDVQQDDBdPcGVuNjI1\n\
+NDEgVGVzdCBDQSBSb290MTAgFw0yNTExMTQxMDA2MTVaGA8yMTI1MTAyMTEwMDYx\n\
+NVowSjELMAkGA1UEBhMCREUxDTALBgNVBAcMBEhlcmUxEjAQBgNVBAoMCW9wZW42\n\
+MjU0MTEYMBYGA1UECwwPT3BlbjYyNTQxVGVzdENBMIIBIjANBgkqhkiG9w0BAQEF\n\
+AAOCAQ8AMIIBCgKCAQEA3oXZgwDcAeIm1EEEjs9zbY9FVt/cYcZJDSFhMsVwwQXu\n\
+EdHYTWB/9I1+zHiayf2JM6MGVcdurAXoJNcSWfEKOJFH552PU/KyTzhQQ2x3XsqV\n\
+t50gFK7UJTcIGv9IrTZaS4iqNbJFxr8fVjTXnT7/XH2koJdovVT8fzeZiJTWbLNu\n\
+plAkjM/PvX9DJshQhFaGwDRgdBk43ZwgD3ZWBexbHnI2hMJTGUbQq5LTMoXyJvlI\n\
+QTRAQjEtbsGU7RaLvxygThDn/Lf56WnXT3Sr6hkAnlYTrqiVfXZGnWbunDrD2Wan\n\
+AVbx8zoTBFx3Cr9zbofppdR+D8sxGAhuzTtHBQ7BawIDAQABo4GpMIGmMAkGA1Ud\n\
+EwQCMAAwHwYDVR0jBBgwFoAUMkov8RW2WWSxSnGZdkzbA4kcA9MwCwYDVR0PBAQD\n\
+AgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMDcGA1UdEQQwMC6CCWxvY2FsaG9zdIcE\n\
+fwAAAYYbdXJuOm9wZW42MjU0MS5jYXRlc3Quc2VydmVyMB0GA1UdDgQWBBRvw1l2\n\
+PIDfpNOeJjyzIcEzU6GWkzANBgkqhkiG9w0BAQsFAAOCAQEAYvCSHGM2IgwRp7pF\n\
+f8qSTpquCzM98WJTHyK9ASiAAqdHEtUo0Qo4K/44dieDnwSMSsGslgtAlRbvwMD4\n\
+okLAWWt5hEzUTpTZnoI1R9kdr8tc9coy+InYk++f6I6uI4cnNxqCCG7z2/xCS+bv\n\
+qCiCmW6rxglxGZ+4i0RAPW4u6TOJqrDj/wWjx5qKRepZnzncjHUGNjtFVbz6Oibq\n\
+2RyUw4EcdcrY2mgOorLp40JQdKsNfjJM6e/R4KxwlGca8REA52Nynecu0B+DQ+GL\n\
+awlxPnDv08iQyer7upDIsSScRXKbEj/IwK1AbvI+UHd8tY+AnfV5EdMnPa5oQMyP\n\
+OTH/LA==\n\
+-----END CERTIFICATE-----\n\
+";
+
+#define SERVER_CERT_PEM_LENGTH 2784
+UA_Byte SERVER_CERT_PEM_DATA[CLIENT_CERT_PEM_LENGTH+1] = 
+"-----BEGIN CERTIFICATE-----\n\
+MIID8DCCAtigAwIBAgIUXlIRaFT3iRMahnNIixZOIfD+JfwwDQYJKoZIhvcNAQEL\n\
+BQAwbDELMAkGA1UEBhMCREUxDTALBgNVBAcMBEhlcmUxEjAQBgNVBAoMCW9wZW42\n\
+MjU0MTEYMBYGA1UECwwPT3BlbjYyNTQxVGVzdENBMSAwHgYDVQQDDBdPcGVuNjI1\n\
+NDEgVGVzdCBDQSBSb290MTAgFw0yNTExMTQxMDA2MTVaGA8yMTI1MTAyMTEwMDYx\n\
+NVowSjELMAkGA1UEBhMCREUxDTALBgNVBAcMBEhlcmUxEjAQBgNVBAoMCW9wZW42\n\
+MjU0MTEYMBYGA1UECwwPT3BlbjYyNTQxVGVzdENBMIIBIjANBgkqhkiG9w0BAQEF\n\
+AAOCAQ8AMIIBCgKCAQEA3oXZgwDcAeIm1EEEjs9zbY9FVt/cYcZJDSFhMsVwwQXu\n\
+EdHYTWB/9I1+zHiayf2JM6MGVcdurAXoJNcSWfEKOJFH552PU/KyTzhQQ2x3XsqV\n\
+t50gFK7UJTcIGv9IrTZaS4iqNbJFxr8fVjTXnT7/XH2koJdovVT8fzeZiJTWbLNu\n\
+plAkjM/PvX9DJshQhFaGwDRgdBk43ZwgD3ZWBexbHnI2hMJTGUbQq5LTMoXyJvlI\n\
+QTRAQjEtbsGU7RaLvxygThDn/Lf56WnXT3Sr6hkAnlYTrqiVfXZGnWbunDrD2Wan\n\
+AVbx8zoTBFx3Cr9zbofppdR+D8sxGAhuzTtHBQ7BawIDAQABo4GpMIGmMAkGA1Ud\n\
+EwQCMAAwHwYDVR0jBBgwFoAUMkov8RW2WWSxSnGZdkzbA4kcA9MwCwYDVR0PBAQD\n\
+AgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMDcGA1UdEQQwMC6CCWxvY2FsaG9zdIcE\n\
+fwAAAYYbdXJuOm9wZW42MjU0MS5jYXRlc3Quc2VydmVyMB0GA1UdDgQWBBRvw1l2\n\
+PIDfpNOeJjyzIcEzU6GWkzANBgkqhkiG9w0BAQsFAAOCAQEAYvCSHGM2IgwRp7pF\n\
+f8qSTpquCzM98WJTHyK9ASiAAqdHEtUo0Qo4K/44dieDnwSMSsGslgtAlRbvwMD4\n\
+okLAWWt5hEzUTpTZnoI1R9kdr8tc9coy+InYk++f6I6uI4cnNxqCCG7z2/xCS+bv\n\
+qCiCmW6rxglxGZ+4i0RAPW4u6TOJqrDj/wWjx5qKRepZnzncjHUGNjtFVbz6Oibq\n\
+2RyUw4EcdcrY2mgOorLp40JQdKsNfjJM6e/R4KxwlGca8REA52Nynecu0B+DQ+GL\n\
+awlxPnDv08iQyer7upDIsSScRXKbEj/IwK1AbvI+UHd8tY+AnfV5EdMnPa5oQMyP\n\
+OTH/LA==\n\
+-----END CERTIFICATE-----\n\
+-----BEGIN CERTIFICATE-----\n\
+MIIDujCCAqKgAwIBAgIDBiVBMA0GCSqGSIb3DQEBCwUAMGwxCzAJBgNVBAYTAkRF\n\
+MQ0wCwYDVQQHDARIZXJlMRIwEAYDVQQKDAlvcGVuNjI1NDExGDAWBgNVBAsMD09w\n\
+ZW42MjU0MVRlc3RDQTEgMB4GA1UEAwwXT3BlbjYyNTQxIFRlc3QgQ0EgUm9vdDEw\n\
+IBcNMjUxMTE0MTAwNjE0WhgPMjEyNTEwMjExMDA2MTRaMGwxCzAJBgNVBAYTAkRF\n\
+MQ0wCwYDVQQHDARIZXJlMRIwEAYDVQQKDAlvcGVuNjI1NDExGDAWBgNVBAsMD09w\n\
+ZW42MjU0MVRlc3RDQTEgMB4GA1UEAwwXT3BlbjYyNTQxIFRlc3QgQ0EgUm9vdDEw\n\
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBiOrgHZCaeFoUjo+Uv2W8\n\
+Y0L7cyktSVoboMDceQ7HDuaNUCY6Dn/zJPMSbBKZ/YEm+g+Ftr2U3n040fLbpJ9x\n\
+1i+hlPfRJbdFQxoAnMev5P5EEON/QMmC7xcb2xckJnQC2CCUTln/Ldm4N1o0FOAK\n\
+pe8eseyQYUVn/5YgYdLH1OLdbgcJazEEATJeuRkekFrBAB4amflRSqkK/bsXbD4Z\n\
+qhuwcYtYBkigxr/554jfqhjvW4bkY/9I3pK4Z5VRTU8mzuI6i7/XorNG/FIAxTRH\n\
+dsrsXKNDXkJzDOvC7ac7EHUrGPaidzg97KsLX2OAirpNiPjC8rMSlXEoN/wR54M/\n\
+AgMBAAGjYzBhMB0GA1UdDgQWBBQySi/xFbZZZLFKcZl2TNsDiRwD0zAfBgNVHSME\n\
+GDAWgBQySi/xFbZZZLFKcZl2TNsDiRwD0zAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud\n\
+DwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAexZmSuNO5NOxzQgF6PSX3Ep3\n\
+++FKI2oYwaQakLlgVyFn+EMlIOgAbgJyvv0LLKNvTyuB5kn2DKVehS1qdBWuslcX\n\
+FyjqTOup7ywXhl1DQJqnZrd8GcBIeumNGCk9nn4jCtVSrKjXwJ2y0fiCNEBFKLxE\n\
+4jfFi4GLomoWj1BQX2Jl1cAUmewR50T6wRk5UEWUmJDKz3EV3oCHdmE9DRexMh3z\n\
+AG1HdC9N5q/MbL0eK0KJCNvrmPnEl6QQpwWZuGMduPS86u/m2CNlug3yvRZApRpc\n\
+j5aRt4fReHLy1Nw7Bra+m7sSGVe/u3RbhyNTFMY9RwZAGZafjoNAO7geNReSyA==\n\
+-----END CERTIFICATE-----\n\
+";
+_UA_END_DECLS
+
+#endif /* CERTIFICATES_H_ */
diff --git a/tests/encryption/check_ca_chain.c b/tests/encryption/check_ca_chain.c
new file mode 100644
index 00000000000..64f8f8e6553
--- /dev/null
+++ b/tests/encryption/check_ca_chain.c
@@ -0,0 +1,202 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2025 (c) Sören Krecker
+ *
+ */
+
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/client_highlevel.h>
+#include <open62541/plugin/pki_default.h>
+#include <open62541/plugin/securitypolicy.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include "client/ua_client_internal.h"
+#include "ua_server_internal.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "certificates_ca.h"
+#include "check.h"
+#include "testing_clock.h"
+#include "testing_networklayers.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static UA_StatusCode
+privateKeyPasswordClientCallback(UA_ClientConfig *cc, UA_ByteString *password) {
+    *password = UA_STRING_ALLOC("ca1passwd");
+    return UA_STATUSCODE_GOOD;
+}
+static UA_StatusCode
+privateKeyPasswordServerCallback(UA_ServerConfig *cc, UA_ByteString *password) {
+    *password = UA_STRING_ALLOC("ca1passwd");
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+setup(void) {
+    running = true;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = SERVER_CERT_PEM_LENGTH;
+    certificate.data = SERVER_CERT_PEM_DATA;
+
+    UA_ByteString privateKey;
+    privateKey.length = SERVER_KEY_PEM_LENGTH;
+    privateKey.data = SERVER_KEY_PEM_DATA;
+
+    /* Load the issuerList */
+    size_t issuerListSize = 1;
+    UA_STACKARRAY(UA_ByteString, issuerList, issuerListSize + 1);
+    issuerList[0].data = CA_CERT_PEM_DATA;
+    issuerList[0].length = CA_CERT_PEM_LENGTH;
+
+    /* Load the issuerList */
+    size_t trustListSize = 1;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize + 1);
+    trustList[0].data = CA_CERT_PEM_DATA;
+    trustList[0].length = CA_CERT_PEM_LENGTH;
+
+    /* Revocation lists are supported, but not used here */
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    server = UA_Server_new();
+    ck_assert(server != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(server);
+    config->privateKeyPasswordCallback = privateKeyPasswordServerCallback;
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    UA_ServerConfig_setDefaultWithSecurityPolicies(
+        config, 4840, &certificate, &privateKey, trustList, trustListSize, issuerList,
+        issuerListSize, revocationList, revocationListSize);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:open62541.catest.server");
+
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void
+teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(encryption_connect_Basic256Sha256_ca) {
+    UA_Client *client = NULL;
+    UA_EndpointDescription *endpointArray = NULL;
+    size_t endpointArraySize = 0;
+    size_t trustListSize = 1;
+    UA_STACKARRAY(UA_ByteString, trustList, trustListSize + 1);
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Load certificate and private key */
+    UA_ByteString certificate;
+    certificate.length = CLIENT_CERT_PEM_LENGTH;
+    certificate.data = CLIENT_CERT_PEM_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = CLIENT_KEY_PEM_LENGTH;
+    privateKey.data = CLIENT_KEY_PEM_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    trustList[0].length = SERVER_CERT_PEM_LENGTH;
+    trustList[0].data = SERVER_CERT_PEM_DATA;
+
+    /* The Get endpoint (discovery service) is done with
+     * security mode as none to see the server's capability
+     * and certificate */
+    client = UA_Client_new();
+    UA_ClientConfig_setDefault(UA_Client_getConfig(client));
+    ck_assert(client != NULL);
+    UA_StatusCode retval = UA_Client_getEndpoints(client, "opc.tcp://localhost:4840",
+                                                  &endpointArraySize, &endpointArray);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(endpointArraySize > 0);
+
+    UA_Array_delete(endpointArray, endpointArraySize,
+                    &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+
+    UA_Client_delete(client);
+
+    /* Secure client initialization */
+    client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    cc->privateKeyPasswordCallback = privateKeyPasswordClientCallback;
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey, trustList,
+                                         trustListSize, revocationList,
+                                         revocationListSize);
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    ck_assert(client != NULL);
+
+    /* Set the ApplicationUri used in the certificate */
+    UA_String_clear(&cc->clientDescription.applicationUri);
+    cc->clientDescription.applicationUri =
+        UA_STRING_ALLOC("URN:open62541.catest.client");
+
+    /*for(size_t deleteCount = 0; deleteCount < trustListSize; deleteCount++) {
+        UA_ByteString_clear(&trustList[deleteCount]);
+    }*/
+
+    /* Secure client connect */
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+static Suite *
+testSuite_encryption(void) {
+    Suite *s = suite_create("EncryptionCA");
+    TCase *tc_encryption = tcase_create("Encryption security policy with CA chain");
+    tcase_add_checked_fixture(tc_encryption, setup, teardown);
+#ifdef UA_ENABLE_ENCRYPTION
+    tcase_add_test(tc_encryption, encryption_connect_Basic256Sha256_ca);
+#endif /* UA_ENABLE_ENCRYPTION */
+    suite_add_tcase(s, tc_encryption);
+    return s;
+}
+
+int
+main(void) {
+    Suite *s = testSuite_encryption();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From ce6680751a072e88318878dbeb85f000a1165d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Krecker?= <soekkle@freenet.de>
Date: Fri, 14 Nov 2025 12:21:04 +0100
Subject: [PATCH 1871/1963] fix(client): Add workaround for PEM certificates

Certificates should be in DER format for OPC UA. Occassionally we run
into PEM certificates. As they are detected/supported in the
SecurityGroup, also detect PEM cerrtificates and isolate them from the
following certificate chain in `signClientSignature`.
---
 src/client/ua_client_connect.c | 71 ++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 6b852ea80d5..868ae46bb0d 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -141,6 +141,49 @@ isFullyConnected(UA_Client *client) {
 
 #ifdef UA_ENABLE_ENCRYPTION
 
+/* Find binary substring. Taken and adjusted from
+ * http://tungchingkai.blogspot.com/2011/07/binary-strstr.html */
+
+static const unsigned char *
+bstrchrClient(const unsigned char *s, const unsigned char ch, size_t l) {
+    /* find first occurrence of c in char s[] for length l*/
+    for(; l > 0; ++s, --l) {
+        if(*s == ch)
+            return s;
+    }
+    return NULL;
+}
+
+static const unsigned char *
+UA_BstrstrClient(const unsigned char *s1, size_t l1, const unsigned char *s2, size_t l2) {
+    /* find first occurrence of s2[] in s1[] for length l1*/
+    const unsigned char *ss1 = s1;
+    const unsigned char *ss2 = s2;
+    /* handle special case */
+    if(l1 == 0)
+        return (unsigned char *)NULL;
+    if(l2 == 0)
+        return s1;
+
+    /* match prefix */
+    for(; (s1 = bstrchrClient(s1, *s2, (uintptr_t)ss1 - (uintptr_t)s1 + (uintptr_t)l1)) !=
+              NULL &&
+        (uintptr_t)ss1 - (uintptr_t)s1 + (uintptr_t)l1 != 0;
+        ++s1) {
+
+        /* match rest of prefix */
+        const unsigned char *sc1, *sc2;
+        for(sc1 = s1, sc2 = s2;;)
+            if(++sc2 >= ss2 + l2)
+                return s1;
+            else if(*++sc1 != *sc2)
+                break;
+    }
+    return (unsigned char *)NULL;
+}
+
+static const unsigned char openssl_PEM_PRE[26] = "-----END CERTIFICATE-----";
+
 /* Function to create a signature using remote certificate and nonce.
  * This uses the SecurityPolicy of the SecureChannel. */
 static UA_StatusCode
@@ -162,17 +205,39 @@ signClientSignature(UA_Client *client, UA_ActivateSessionRequest *request) {
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
+    /* If we have a full certificate chain, isolate the first certificate */
+    size_t certLen = 0;
+    UA_ByteString rc = client->channel.remoteCertificate;
+    if(rc.length >= 4 && rc.data[0] == 0x30 && rc.data[1] == 0x82) {
+        /* DER certificate. The certificate length is encoded after the magic
+         * bytes. */
+        certLen = 4; /* Magic numbers + length bytes */
+        certLen += (size_t)(((uint16_t)rc.data[2]) << 8);
+        certLen += rc.data[3];
+    } else if(rc.length > 27 * 4) {
+        /* Try to find the delimiter of a PEM certificate. This is a workaround,
+         * as certificates should be in DER format. */
+        const unsigned char *match =
+            UA_BstrstrClient(rc.data, rc.length, openssl_PEM_PRE, 25);
+        if(!match)
+            return UA_STATUSCODE_BADINTERNALERROR;
+        certLen = (uintptr_t)(match - rc.data)+25;
+    }
+    if(certLen > rc.length)
+        return UA_STATUSCODE_BADINTERNALERROR;
+    rc.length = certLen;
+
     /* Create a temporary buffer */
     size_t signDataSize =
-        channel->remoteCertificate.length + client->serverSessionNonce.length;
+        rc.length + client->serverSessionNonce.length;
     if(signDataSize > MAX_DATA_SIZE)
         return UA_STATUSCODE_BADINTERNALERROR;
     UA_Byte buf[MAX_DATA_SIZE];
     UA_ByteString signData = {signDataSize, buf};
 
     /* Sign the ClientSignature */
-    memcpy(buf, channel->remoteCertificate.data, channel->remoteCertificate.length);
-    memcpy(buf + channel->remoteCertificate.length, client->serverSessionNonce.data,
+    memcpy(buf, rc.data, rc.length);
+    memcpy(buf + rc.length, client->serverSessionNonce.data,
            client->serverSessionNonce.length);
     return signAlg->sign(channel->channelContext, &signData, &sd->signature);
 }

From 0f0d7bc979543bb77f644c688ac410378cc2acca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20V=C3=B6lker?= <jannis.voelker@basyskom.com>
Date: Tue, 2 Dec 2025 14:04:36 +0100
Subject: [PATCH 1872/1963] fix(plugins): Extend expiresInDays range for
 OpenSSL cert creation on 32 bit

X509_time_adj() takes seconds as an int value.
On a 32 bit build, this artificially limits the possible time range.
---
 plugins/crypto/openssl/ua_openssl_create_certificate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/crypto/openssl/ua_openssl_create_certificate.c b/plugins/crypto/openssl/ua_openssl_create_certificate.c
index 0bea05ee3ec..2914a2468d9 100644
--- a/plugins/crypto/openssl/ua_openssl_create_certificate.c
+++ b/plugins/crypto/openssl/ua_openssl_create_certificate.c
@@ -216,7 +216,7 @@ UA_CreateCertificate(const UA_Logger *logger, const UA_String *subject,
         goto cleanup;
     }
 
-    if(X509_gmtime_adj(X509_get_notAfter(x509), (UA_Int64)60 * 60 * 24 * expiresInDays) ==
+    if(X509_time_adj_ex(X509_get_notAfter(x509), (int)expiresInDays, 0, NULL) ==
        NULL) {
         UA_LOG_ERROR(logger, UA_LOGCATEGORY_SECURECHANNEL,
                      "Create Certificate: Setting 'not before' failed.");

From 51ff6593ec45880342e039adb761f8ec79af2713 Mon Sep 17 00:00:00 2001
From: Marvin Gnad <marvin.gnad@gmail.com>
Date: Mon, 19 May 2025 13:41:53 +0200
Subject: [PATCH 1873/1963] fix(plugin): fix namelist allocated from scandir
 not freed

(cherry picked from commit bcb02196fbed8ba2fd77eb0d119372b6f74c9760)
---
 plugins/crypto/openssl/ua_pki_openssl.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 40cec466e7e..1ad5c1fc909 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -312,6 +312,10 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             UA_ByteString_clear (&strCert);
         }
+        for (i = 0; i < numCertificates; i++) {
+            free(dirlist[i]);
+        }
+        free(dirlist);
     }
 
     if (ctx->issuerListFolder.length > 0) {
@@ -347,6 +351,10 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             UA_ByteString_clear (&strCert);
         }
+        for (i = 0; i < numCertificates; i++) {
+            free(dirlist[i]);
+        }
+        free(dirlist);
     }
 
     if (ctx->revocationListFolder.length > 0) {
@@ -382,6 +390,10 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             UA_ByteString_clear (&strCert);
         }
+        for (i = 0; i < numCertificates; i++) {
+            free(dirlist[i]);
+        }
+        free(dirlist);
     }
 
     ret = UA_STATUSCODE_GOOD;

From 62c025b1557a580a84b2efb9153f564d6f1a188b Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Tue, 9 Dec 2025 09:28:21 +0100
Subject: [PATCH 1874/1963] fix(plugin): double allocation of certificate
 thumbprint

This code was introduced in 805c1ab17a1d4b4ecca2f1c9b11b9185cac2346a.
UA_Openssl_X509_GetCertificateThumbprint() will allocate the thumbprint
UA_ByteString itself, unlike mbedtls_thumbprint_sha1() (only when the
last argument is true). As such, for the OpenSSL plugin, do not allocate
the certificate thumbprint ourselves to fix double allocation.

Reported-by: xydan83 <aleksprog@hotmail.com>
Ref #7216
---
 plugins/crypto/openssl/ua_pki_openssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index fdcdf0a90b1..211450c3c48 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -699,7 +699,7 @@ UA_CertificateVerification_Verify(const UA_CertificateVerification *cv,
        ctx->rejectedListFolder.length > 0) {
             char rejectedFileName[256] = {0};
             UA_ByteString thumbprint;
-            UA_ByteString_allocBuffer(&thumbprint, UA_SHA1_LENGTH);
+            UA_ByteString_init(&thumbprint);
             if(UA_Openssl_X509_GetCertificateThumbprint(certificate, &thumbprint, true) == UA_STATUSCODE_GOOD) {
                 static const char hex2char[] = "0123456789ABCDEF";
                 for(size_t pos = 0, namePos = 0; pos < thumbprint.length; pos++) {

From 0a3036d93e4117551e021a20574193cc0f672365 Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Mon, 29 Dec 2025 02:05:19 +0300
Subject: [PATCH 1875/1963] fix(client): Prevent potential use of closed
 epollfd in synchronous disconnect (#7604)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In UA_Client_disconnectSecureChannel, the synchronous wait loop calls
el->run() repeatedly until the secure channel is closed. However, the
EventLoop may be stopped (and its epollfd closed) inside one of these
run() calls — e.g., due to connection shutdown callbacks. A subsequent
el->run() invocation would then operate on a closed file descriptor,
triggering warnings from static analyzers and risking undefined behavior
in edge cases.

Fix by checking the return status of el->run(). If it returns an error
(e.g., BADINTERNALERROR when epollfd < 0), break out of the loop instead
of continuing to call run().

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 src/client/ua_client_connect.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 868ae46bb0d..f6dd974fa09 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -2356,7 +2356,13 @@ disconnectSecureChannel(UA_Client *client, UA_Boolean sync) {
        el->state != UA_EVENTLOOPSTATE_FRESH &&
        el->state != UA_EVENTLOOPSTATE_STOPPED) {
         while(client->channel.state != UA_SECURECHANNELSTATE_CLOSED) {
-            el->run(el, 100);
+            UA_StatusCode runStatus = el->run(el, 100);
+            if(runStatus != UA_STATUSCODE_GOOD) {
+                UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_CLIENT,
+                             "EventLoop run returned %s during synchronous disconnect, "
+                             "stopping wait loop", UA_StatusCode_name(runStatus));
+                break;
+            }
         }
     }
 

From 1c4f1112057bb04f1c13e14dfc8457bb9990638e Mon Sep 17 00:00:00 2001
From: Anton Moryakov <ant.v.moryakov@gmail.com>
Date: Mon, 12 Jan 2026 20:22:01 +0300
Subject: [PATCH 1876/1963] src: pubsub: ua_pubsub_ns0.c: prevent NULL
 dereference in onReadLocked for PubSubConnection

The function UA_PubSubConnection_findConnectionbyId may return NULL if the
connection no longer exists. In the onReadLocked callback, the result was
dereferenced without a NULL check when reading the PublisherId property,
which could lead to a crash.

Added a missing NULL check, consistent with the handling of other PubSub
entities (DataSetReader, WriterGroup, etc.) in the same function.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 src/pubsub/ua_pubsub_ns0.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index f3b51e13cc0..51cd2f38f27 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -77,6 +77,8 @@ onReadLocked(UA_Server *server, const UA_NodeId *sessionId, void *sessionContext
     case UA_NS0ID_PUBSUBCONNECTIONTYPE: {
         UA_PubSubConnection *pubSubConnection =
             UA_PubSubConnection_findConnectionbyId(server, *myNodeId);
+        if(!pubSubConnection)
+            return;
         switch(nodeContext->elementClassiefier) {
         case UA_NS0ID_PUBSUBCONNECTIONTYPE_PUBLISHERID:
             switch (pubSubConnection->config.publisherIdType) {

From fb404ed1ef29a93cf365e41aa8a716854c44f193 Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Thu, 15 Jan 2026 11:57:24 +0300
Subject: [PATCH 1877/1963] fix(pubsub): Prevent NULL dereference in
 UA_PubSubDataSetField_sampleValue (#7632)

The function UA_NODESTORE_GET may return NULL if the referenced node no longer
exists (e.g., was deleted after PubSub configuration). Previously, the code
unconditionally dereferenced the returned pointer to access
rtNode->valueBackend.backend.external.value, which could cause a crash.

Added a NULL check after UA_NODESTORE_GET. If the node is not found, the
function returns a DataValue with status UA_STATUSCODE_BADNODEIDUNKNOWN,
consistent with OPC UA error handling practices.

This improves robustness of PubSub message generation when source nodes are
removed or misconfigured.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 src/pubsub/ua_pubsub_dataset.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_dataset.c b/src/pubsub/ua_pubsub_dataset.c
index 3ce12a67897..b8e0d350375 100644
--- a/src/pubsub/ua_pubsub_dataset.c
+++ b/src/pubsub/ua_pubsub_dataset.c
@@ -586,9 +586,24 @@ UA_PubSubDataSetField_sampleValue(UA_Server *server, UA_DataSetField *field,
     if(field->config.field.variable.rtValueSource.rtInformationModelNode) {
         const UA_VariableNode *rtNode = (const UA_VariableNode *)
             UA_NODESTORE_GET(server, &params->publishedVariable);
+        if(!rtNode) {
+            UA_DataValue_init(value);
+            value->hasStatus = true;
+            value->status = UA_STATUSCODE_BADNODEIDUNKNOWN;
+            return;
+        }
+        if(rtNode->head.nodeClass != UA_NODECLASS_VARIABLE ||
+        rtNode->valueBackend.backendType != UA_VALUEBACKENDTYPE_EXTERNAL ||
+        !rtNode->valueBackend.backend.external.value) {
+            UA_NODESTORE_RELEASE(server, (const UA_Node *)rtNode);
+            UA_DataValue_init(value);
+            value->hasStatus = true;
+            value->status = UA_STATUSCODE_BADINTERNALERROR;
+            return;
+        }
         *value = **rtNode->valueBackend.backend.external.value;
         value->value.storageType = UA_VARIANT_DATA_NODELETE;
-        UA_NODESTORE_RELEASE(server, (const UA_Node *) rtNode);
+        UA_NODESTORE_RELEASE(server, (const UA_Node *)rtNode);
     } else if(field->config.field.variable.rtValueSource.rtFieldSourceEnabled == false){
         UA_ReadValueId rvid;
         UA_ReadValueId_init(&rvid);

From 95dc4c1e9c8c4d3619f90b9c3fc3af194acb8b30 Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:43:56 +0300
Subject: [PATCH 1878/1963] fix(server): Check return value of
 addRepeatedCallback in UA_AsyncManager_init (#7631)

The function addRepeatedCallback may fail (e.g. due to out-of-memory) and
return a non-good StatusCode. Previously, the return value was ignored in
UA_AsyncManager_init, which could lead to the timeout cleanup callback
(checkTimeouts) never being registered.

As a result:
- Async operations would not be cleaned up on timeout,
- Stale operations could accumulate in queues,
- Memory leaks and performance degradation could occur silently.

Now the return status is checked. On failure, a warning is logged and
checkTimeoutCallbackId is set to zero to ensure safe cleanup.

This improves robustness and observability of the async method infrastructure.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 src/server/ua_server_async.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_server_async.c b/src/server/ua_server_async.c
index 6e0e31321f0..17013ce24ee 100644
--- a/src/server/ua_server_async.c
+++ b/src/server/ua_server_async.c
@@ -177,8 +177,15 @@ UA_AsyncManager_init(UA_AsyncManager *am, UA_Server *server) {
 
     /* Add a regular callback for cleanup and sending finished responses at a
      * 1s interval. */
-    addRepeatedCallback(server, (UA_ServerCallback)checkTimeouts,
-                        NULL, 1000.0, &am->checkTimeoutCallbackId);
+    UA_StatusCode res = addRepeatedCallback(server, (UA_ServerCallback)checkTimeouts,
+                    NULL, 1000.0, &am->checkTimeoutCallbackId);
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(server->config.logging, UA_LOGCATEGORY_SERVER,
+                    "Failed to register async timeout callback. "
+                    "Async operations will not be cleaned up on timeout. StatusCode: %s",
+                    UA_StatusCode_name(res));
+        am->checkTimeoutCallbackId = 0;
+    }
 }
 
 void

From 33001cb188c8079d3ac60e54e91948ca0deb5d34 Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Thu, 15 Jan 2026 16:08:47 +0100
Subject: [PATCH 1879/1963] fix(client): Fix build failure without historizing

---
 include/open62541/client.h       | 4 ++++
 src/client/ua_client_highlevel.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/include/open62541/client.h b/include/open62541/client.h
index 7ab9ace17c7..bec2ea74c5f 100644
--- a/include/open62541/client.h
+++ b/include/open62541/client.h
@@ -627,6 +627,8 @@ UA_Client_Service_write(UA_Client *client, const UA_WriteRequest request) {
 /*
  * Historical Access Service Set
  * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ */
+#ifdef UA_ENABLE_HISTORIZING
+
 static UA_INLINE UA_THREADSAFE UA_HistoryReadResponse
 UA_Client_Service_historyRead(UA_Client *client,
                               const UA_HistoryReadRequest request) {
@@ -647,6 +649,8 @@ UA_Client_Service_historyUpdate(UA_Client *client,
     return response;
 }
 
+#endif
+
 /*
  * Method Service Set
  * ^^^^^^^^^^^^^^^^^^ */
diff --git a/src/client/ua_client_highlevel.c b/src/client/ua_client_highlevel.c
index 5d1c57d44ff..581f6e81264 100644
--- a/src/client/ua_client_highlevel.c
+++ b/src/client/ua_client_highlevel.c
@@ -465,6 +465,7 @@ UA_Client_readArrayDimensionsAttribute(UA_Client *client, const UA_NodeId nodeId
 /*********************/
 /* Historical Access */
 /*********************/
+#ifdef UA_ENABLE_HISTORIZING
 
 static UA_HistoryReadResponse
 __UA_Client_HistoryRead(UA_Client *client, const UA_NodeId *nodeId,
@@ -729,6 +730,8 @@ UA_Client_HistoryUpdate_deleteRaw(UA_Client *client, const UA_NodeId *nodeId,
     return ret;
 }
 
+#endif
+
 /*******************/
 /* Async Functions */
 /*******************/

From 93ed51d70dcdd54774730df1c5f0bc9e2c12e53c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Sat, 17 Jan 2026 14:53:54 +0100
Subject: [PATCH 1880/1963] fix(core): Remove usage of the "enc() | enc()"
 pattern as the order of ORed method calls is undefined in C

Reported first by @Punzelar in #7643.
---
 src/ua_types_encoding_json.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/ua_types_encoding_json.c b/src/ua_types_encoding_json.c
index e4a7466a060..e36a3235d78 100644
--- a/src/ua_types_encoding_json.c
+++ b/src/ua_types_encoding_json.c
@@ -495,10 +495,14 @@ ENCODE_JSON(String) {
     if(!src->data)
         return writeChars(ctx, "null", 4);
 
-    if(src->length == 0)
-        return writeJsonQuote(ctx) | writeJsonQuote(ctx);
+    status ret = UA_STATUSCODE_GOOD;
+    if(src->length == 0) {
+        ret |= writeJsonQuote(ctx);
+        ret |= writeJsonQuote(ctx);
+        return ret;
+    }
 
-    UA_StatusCode ret = writeJsonQuote(ctx);
+    ret |= writeJsonQuote(ctx);
 
     const unsigned char *str = src->data;
     const unsigned char *pos = str;
@@ -1060,8 +1064,12 @@ ENCODE_JSON(Variant) {
     /* If type is 0 (NULL) the Variant contains a NULL value and the containing
      * JSON object shall be omitted or replaced by the JSON literal ‘null’ (when
      * an element of a JSON array). */
-    if(!src->type)
-        return writeJsonObjStart(ctx) | writeJsonObjEnd(ctx);
+    status ret = UA_STATUSCODE_GOOD;
+    if(!src->type) {
+        ret |= writeJsonObjStart(ctx);
+        ret |= writeJsonObjEnd(ctx);
+        return ret;
+    }
 
     /* Set the content type in the encoding mask */
     const UA_Boolean isBuiltin = (src->type->typeKind <= UA_DATATYPEKIND_DIAGNOSTICINFO);
@@ -1076,7 +1084,7 @@ ENCODE_JSON(Variant) {
     if(src->type == &UA_TYPES[UA_TYPES_VARIANT] && !isArray)
         wrapEO = true;
 
-    status ret = writeJsonObjStart(ctx);
+    ret = writeJsonObjStart(ctx);
 
     /* Write the type NodeId */
     if(ctx->useReversible) {

From 3a02b5c59d267a8286c4fb72d4308adc8e0f3e4c Mon Sep 17 00:00:00 2001
From: Antonios Christidis <a-christidis@ti.com>
Date: Tue, 20 Jan 2026 07:37:55 -0600
Subject: [PATCH 1881/1963] fix(pubsub): Implicit declaration of pthread_create

Include header file, to fix error of implicit declaration of
pthread_create.

Signed-off-by: Antonios Christidis <a-christidis@ti.com>
---
 examples/pubsub_realtime/server_pubsub_publisher_rt_level.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c b/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c
index 0ec133d1f2d..da4289a81d6 100644
--- a/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c
+++ b/examples/pubsub_realtime/server_pubsub_publisher_rt_level.c
@@ -7,6 +7,7 @@
 #include <open62541/server_pubsub.h>
 #include <open62541/types.h>
 
+#include <pthread.h>
 #include <signal.h>
 
 #define PUBSUB_CONFIG_PUBLISH_CYCLE_MS 100

From 362b51d918ba7b2bc3298f267dc01807abce85c1 Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Wed, 10 Dec 2025 09:36:55 +0100
Subject: [PATCH 1882/1963] fix(build): List private dependencies in .pc file

In the "normal" case of linking to open62541.so, only -lopen62541 is
needed in `Libs` because open62541's dependencies are not exposed via
its public header files.

All the other dependencies (`Requires.private` and `Libs.private`) only
matter using open62541.a (linking statically via `pkg-config --static`).
The crypto libraries and TMP2 library provide .pc files themselves, so
we can list them in `Requires.private`. The other (direct) open62541
dependencies are listed in `Libs.private`.

Also reorder the .pc file (`Libs` comes last and `Requires(.private)
comes` before `Cflags`).

Fixes: #7574
---
 CMakeLists.txt        | 22 +++++++++++-----------
 tools/open62541.pc.in |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91bf382fd71..6ef54a67847 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -493,13 +493,18 @@ endif()
 
 set(open62541_LIBRARIES "")
 set(open62541_PUBLIC_LIBRARIES "")
+set(pkgcfg_libsprivate "")
+set(pkgcfg_requiresprivate "")
 if("${UA_ARCHITECTURE}" STREQUAL "posix")
     list(APPEND open62541_LIBRARIES "m")
+    list(APPEND pkgcfg_libsprivate "-lm")
     if(UA_MULTITHREADING GREATER_EQUAL 100 OR UA_BUILD_UNIT_TESTS)
         list(APPEND open62541_PUBLIC_LIBRARIES "pthread")
+        list(APPEND pkgcfg_libsprivate "-lpthread")
     endif()
     if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD"))
         list(APPEND open62541_LIBRARIES "rt")
+        list(APPEND pkgcfg_libsprivate "-lrt")
     endif()
 elseif("${UA_ARCHITECTURE}" STREQUAL "win32")
     list(APPEND open62541_LIBRARIES "ws2_32")
@@ -511,6 +516,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL)
     # https://cmake.org/cmake/help/v3.13/module/FindOpenSSL.html
     find_package(OpenSSL REQUIRED)
     list(APPEND open62541_LIBRARIES "${OPENSSL_LIBRARIES}")
+    list(APPEND pkgcfg_requiresprivate "openssl")
     if(WIN32)
         # Add bestcrypt for windows systems
         list(APPEND open62541_LIBRARIES bcrypt)
@@ -521,6 +527,7 @@ if(UA_ENABLE_ENCRYPTION_LIBRESSL)
     # See https://github.com/libressl-portable/portable/blob/master/FindLibreSSL.cmake
     find_package(LibreSSL REQUIRED)
     list(APPEND open62541_LIBRARIES ${LIBRESSL_LIBRARIES})
+    list(APPEND pkgcfg_requiresprivate "openssl")
     if(WIN32)
         # Add bestcrypt for random generator and ws2_32 for crypto
         list(APPEND open62541_LIBRARIES ws2_32 bcrypt)
@@ -533,6 +540,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION)
     # defined in /tools/cmake/FindMbedTLS.cmake.
     find_package(MbedTLS REQUIRED)
     list(APPEND open62541_LIBRARIES ${MBEDTLS_LIBRARIES})
+    list(APPEND pkgcfg_requiresprivate "mbedtls")
     if(WIN32)
         # Add bestcrypt for windows systems
         list(APPEND open62541_LIBRARIES bcrypt)
@@ -541,6 +549,7 @@ endif()
 
 if(UA_ENABLE_TPM2_SECURITY)
     list(APPEND open62541_LIBRARIES ${TPM2_LIB})
+    list(APPEND pkgcfg_requiresprivate "tpm2-pkcs11")
 endif()
 
 if(MINGW)
@@ -1531,17 +1540,8 @@ if(UA_ENABLE_AMALGAMATION)
     set(PC_EXTRA_CFLAGS "-DUA_ENABLE_AMALGAMATION")
 endif()
 
-set(pkgcfgpubliclibs "")
-foreach(lib ${open62541_PUBLIC_LIBRARIES})
-    set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ")
-endforeach()
-
-if(BUILD_SHARED_LIBS)
-    foreach(lib ${open62541_LIBRARIES})
-        set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ")
-    endforeach()
-endif()
-
+string(REPLACE ";" " " pkgcfg_requiresprivate "${pkgcfg_requiresprivate}")
+string(REPLACE ";" " " pkgcfg_libsprivate "${pkgcfg_libsprivate}")
 configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open62541.pc @ONLY)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/tools/open62541.pc.in b/tools/open62541.pc.in
index 50abf00af4e..a5986013c8e 100644
--- a/tools/open62541.pc.in
+++ b/tools/open62541.pc.in
@@ -5,5 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 Name: open62541
 Description: open62541 is an open source C (C99) implementation of OPC UA
 Version: @OPEN62541_VER_MAJOR@.@OPEN62541_VER_MINOR@.@OPEN62541_VER_PATCH@@OPEN62541_VER_LABEL@
-Libs: -L${libdir} -lopen62541 @pkgcfgpubliclibs@
+Requires.private: @pkgcfg_requiresprivate@
 Cflags: -I${includedir} @PC_EXTRA_CFLAGS@
+Libs: -L${libdir} -lopen62541
+Libs.private: @pkgcfg_libsprivate@

From 7fc8628e7a5f3ece2219f3e6f55f4079f01beba3 Mon Sep 17 00:00:00 2001
From: dpazj <joepaz200@gmail.com>
Date: Wed, 14 Jan 2026 12:57:16 +0000
Subject: [PATCH 1883/1963] fix(server): Avoid comparing a scalar value and a
 null-array when detecting deadband value changes

---
 src/server/ua_subscription_datachange.c   | 13 +++-
 tests/server/check_monitoreditem_filter.c | 86 +++++++++++++++++++++++
 2 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index 4744377c19a..69ad922ec85 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -54,13 +54,20 @@ detectScalarDeadBand(const void *data1, const void *data2,
 static UA_Boolean
 detectVariantDeadband(const UA_Variant *value, const UA_Variant *oldValue,
                       const UA_Double deadbandValue) {
+    /* Be careful to avoid a NULL access. We could have the value a scalar and
+     * oldValue an empty array. Both define a type and arrayLength == 0. */
     if(value->arrayLength != oldValue->arrayLength)
         return true;
     if(value->type != oldValue->type)
         return true;
+    if(UA_Variant_isScalar(value) != UA_Variant_isScalar(oldValue))
+        return true;
+
+    /* Treat scalars as an array of length 1 and iterate */
     size_t length = 1;
     if(!UA_Variant_isScalar(value))
         length = value->arrayLength;
+
     uintptr_t data = (uintptr_t)value->data;
     uintptr_t oldData = (uintptr_t)oldValue->data;
     UA_UInt32 memSize = value->type->memSize;
@@ -102,6 +109,10 @@ detectValueChange(UA_Server *server, UA_MonitoredItem *mon, const UA_DataValue *
     UA_assert(trigger == UA_DATACHANGETRIGGER_STATUSVALUE ||
               trigger == UA_DATACHANGETRIGGER_STATUSVALUETIMESTAMP);
 
+    /* Can we compare values? */
+    if(dv->hasValue != mon->lastValue.hasValue)
+       return true;
+
     /* Test absolute deadband */
     if(dcf && dcf->deadbandType == UA_DEADBANDTYPE_ABSOLUTE &&
        dv->value.type != NULL && UA_DataType_isNumeric(dv->value.type))
@@ -118,8 +129,6 @@ detectValueChange(UA_Server *server, UA_MonitoredItem *mon, const UA_DataValue *
     }
 
     /* Has the value changed? */
-    if(dv->hasValue != mon->lastValue.hasValue)
-        return true;
     return !UA_equal(&dv->value, &mon->lastValue.value,
                      &UA_TYPES[UA_TYPES_VARIANT]);
 }
diff --git a/tests/server/check_monitoreditem_filter.c b/tests/server/check_monitoreditem_filter.c
index 5dbcd7a50c9..238442788af 100644
--- a/tests/server/check_monitoreditem_filter.c
+++ b/tests/server/check_monitoreditem_filter.c
@@ -10,6 +10,7 @@
 #include <open62541/client_highlevel.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
+#include <open62541/types_generated_handling.h>
 
 #include "client/ua_client_internal.h"
 
@@ -908,6 +909,86 @@ START_TEST(Server_MonitoredItemsAbsoluteFilterSetOnCreate) {
 }
 END_TEST
 
+static UA_StatusCode
+setEmptyArray(UA_Client *thisClient, UA_NodeId node) {
+    UA_Variant variant;
+    UA_Variant_init (&variant);
+    UA_Variant_setArray(&variant, NULL, 0, &UA_TYPES[UA_TYPES_DOUBLE]);
+    return UA_Client_writeValueAttribute(thisClient, node, &variant);
+}
+
+START_TEST(Server_MonitoredItemsAbsoluteFilterNULLValue) {
+    UA_DataValue_init(&lastValue);
+    /* define a monitored item with an absolute filter with deadbandvalue = 2.0 */
+    UA_MonitoredItemCreateRequest item = UA_MonitoredItemCreateRequest_default(outNodeId);
+    UA_DataChangeFilter filter;
+    UA_DataChangeFilter_init(&filter);
+    filter.trigger = UA_DATACHANGETRIGGER_STATUSVALUE;
+    filter.deadbandType = UA_DEADBANDTYPE_ABSOLUTE;
+    filter.deadbandValue = 2.0;
+    item.requestedParameters.filter.encoding = UA_EXTENSIONOBJECT_DECODED;
+    item.requestedParameters.filter.content.decoded.type = &UA_TYPES[UA_TYPES_DATACHANGEFILTER];
+    item.requestedParameters.filter.content.decoded.data = &filter;
+    UA_UInt32 newMonitoredItemIds[1];
+    UA_Client_DataChangeNotificationCallback callbacks[1];
+    callbacks[0] = dataChangeHandler;
+    UA_Client_DeleteMonitoredItemCallback deleteCallbacks[1] = {NULL};
+    void *contexts[1];
+    contexts[0] = NULL;
+
+    /* Set empty array value so that the initial value data ptr for the monitored item is NULL */
+    ck_assert_uint_eq(setEmptyArray(client, outNodeId), UA_STATUSCODE_GOOD);
+
+    UA_CreateMonitoredItemsRequest createRequest;
+    UA_CreateMonitoredItemsRequest_init(&createRequest);
+    createRequest.subscriptionId = subId;
+    createRequest.timestampsToReturn = UA_TIMESTAMPSTORETURN_BOTH;
+    createRequest.itemsToCreate = &item;
+    createRequest.itemsToCreateSize = 1;
+    UA_CreateMonitoredItemsResponse createResponse =
+       UA_Client_MonitoredItems_createDataChanges(client, createRequest, contexts,
+                                                   callbacks, deleteCallbacks);
+
+    ck_assert_uint_eq(createResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(createResponse.resultsSize, 1);
+    ck_assert_uint_eq(createResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
+    newMonitoredItemIds[0] = createResponse.results[0].monitoredItemId;
+    UA_CreateMonitoredItemsResponse_clear(&createResponse);
+
+    // Do we get initial value ?
+    notificationReceived = false;
+    countNotificationReceived = 0;
+    ck_assert_uint_eq(waitForNotification(1, 10), UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(notificationReceived, true);
+    ck_assert_uint_eq(countNotificationReceived, 1);
+    ck_assert(lastValue.value.data == NULL);
+
+    UA_DataValue *dv = &lastValue;
+
+    notificationReceived = false;
+    ck_assert_uint_eq(setDouble(client, outNodeId, 42.0), UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(waitForNotification(1, 10), UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(notificationReceived, true);
+    ck_assert_uint_eq(countNotificationReceived, 2);
+
+    // remove monitored item
+    UA_DeleteMonitoredItemsRequest deleteRequest;
+    UA_DeleteMonitoredItemsRequest_init(&deleteRequest);
+    deleteRequest.subscriptionId = subId;
+    deleteRequest.monitoredItemIds = newMonitoredItemIds;
+    deleteRequest.monitoredItemIdsSize = 1;
+
+    UA_DeleteMonitoredItemsResponse deleteResponse =
+        UA_Client_MonitoredItems_delete(client, deleteRequest);
+
+    ck_assert_uint_eq(deleteResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(deleteResponse.resultsSize, 1);
+    ck_assert_uint_eq(deleteResponse.results[0], UA_STATUSCODE_GOOD);
+
+    UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
+}
+END_TEST
+
 START_TEST(Server_MonitoredItemsPercentFilterSetOnCreateMissingEURange) {
     UA_DataValue_init(&lastValue);
     /* define a monitored item with an percent filter with deadbandvalue = 2.0 */
@@ -1124,11 +1205,16 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_server, Server_MonitoredItemsAbsoluteFilterSetOnCreateRemoveLater);
     tcase_add_test(tc_server, Server_MonitoredItemsPercentFilterSetOnCreateMissingEURange);
     tcase_add_test(tc_server, Server_MonitoredItemsPercentFilterSetLaterMissingEURange);
+
+
+    tcase_add_test(tc_server, Server_MonitoredItemsAbsoluteFilterNULLValue);
+
 #ifdef UA_ENABLE_DA
     tcase_add_test(tc_server, Server_MonitoredItemsPercentFilterSetOnCreate);
     tcase_add_test(tc_server, Server_MonitoredItemsPercentFilterSetOnCreateDeadBandValueOutOfRange);
 #endif /* UA_ENABLE_DA */
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
+
     suite_add_tcase(s, tc_server);
 
     return s;

From ff411f0734c4438e20ec89bc14c4c084d61ae73f Mon Sep 17 00:00:00 2001
From: dpazj <joepaz200@gmail.com>
Date: Wed, 14 Jan 2026 12:57:16 +0000
Subject: [PATCH 1884/1963] fix(server): Avoid comparing a scalar value and a
 null-array when detecting deadband value changes

---
 src/server/ua_subscription_datachange.c   | 13 +++-
 tests/server/check_monitoreditem_filter.c | 84 +++++++++++++++++++++++
 2 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_subscription_datachange.c b/src/server/ua_subscription_datachange.c
index 5fb1fe6dbb4..677b7d6de80 100644
--- a/src/server/ua_subscription_datachange.c
+++ b/src/server/ua_subscription_datachange.c
@@ -54,13 +54,20 @@ detectScalarDeadBand(const void *data1, const void *data2,
 static UA_Boolean
 detectVariantDeadband(const UA_Variant *value, const UA_Variant *oldValue,
                       const UA_Double deadbandValue) {
+    /* Be careful to avoid a NULL access. We could have the value a scalar and
+     * oldValue an empty array. Both define a type and arrayLength == 0. */
     if(value->arrayLength != oldValue->arrayLength)
         return true;
     if(value->type != oldValue->type)
         return true;
+    if(UA_Variant_isScalar(value) != UA_Variant_isScalar(oldValue))
+        return true;
+
+    /* Treat scalars as an array of length 1 and iterate */
     size_t length = 1;
     if(!UA_Variant_isScalar(value))
         length = value->arrayLength;
+
     uintptr_t data = (uintptr_t)value->data;
     uintptr_t oldData = (uintptr_t)oldValue->data;
     UA_UInt32 memSize = value->type->memSize;
@@ -103,6 +110,10 @@ detectValueChange(UA_Server *server, UA_MonitoredItem *mon,
     UA_assert(trigger == UA_DATACHANGETRIGGER_STATUSVALUE ||
               trigger == UA_DATACHANGETRIGGER_STATUSVALUETIMESTAMP);
 
+    /* Can we compare values? */
+    if(value->hasValue != mon->lastValue.hasValue)
+       return true;
+
     /* Test absolute deadband */
     if(dcf && dcf->deadbandType == UA_DEADBANDTYPE_ABSOLUTE &&
        value->value.type != NULL && UA_DataType_isNumeric(value->value.type))
@@ -119,8 +130,6 @@ detectValueChange(UA_Server *server, UA_MonitoredItem *mon,
     }
 
     /* Has the value changed? */
-    if(value->hasValue != mon->lastValue.hasValue)
-        return true;
     return (UA_order(&value->value, &mon->lastValue.value,
                      &UA_TYPES[UA_TYPES_VARIANT]) != UA_ORDER_EQ);
 }
diff --git a/tests/server/check_monitoreditem_filter.c b/tests/server/check_monitoreditem_filter.c
index 3176a74c13a..f43babe5335 100644
--- a/tests/server/check_monitoreditem_filter.c
+++ b/tests/server/check_monitoreditem_filter.c
@@ -10,6 +10,7 @@
 #include <open62541/client_highlevel.h>
 #include <open62541/server.h>
 #include <open62541/server_config_default.h>
+#include <open62541/types_generated_handling.h>
 
 #include "client/ua_client_internal.h"
 
@@ -915,6 +916,84 @@ START_TEST(Server_MonitoredItemsAbsoluteFilterSetOnCreate) {
 }
 END_TEST
 
+static UA_StatusCode
+setEmptyArray(UA_Client *thisClient, UA_NodeId node) {
+    UA_Variant variant;
+    UA_Variant_init (&variant);
+    UA_Variant_setArray(&variant, NULL, 0, &UA_TYPES[UA_TYPES_DOUBLE]);
+    return UA_Client_writeValueAttribute(thisClient, node, &variant);
+}
+
+START_TEST(Server_MonitoredItemsAbsoluteFilterNULLValue) {
+    UA_DataValue_init(&lastValue);
+    /* define a monitored item with an absolute filter with deadbandvalue = 2.0 */
+    UA_MonitoredItemCreateRequest item = UA_MonitoredItemCreateRequest_default(outNodeId);
+    UA_DataChangeFilter filter;
+    UA_DataChangeFilter_init(&filter);
+    filter.trigger = UA_DATACHANGETRIGGER_STATUSVALUE;
+    filter.deadbandType = UA_DEADBANDTYPE_ABSOLUTE;
+    filter.deadbandValue = 2.0;
+    item.requestedParameters.filter.encoding = UA_EXTENSIONOBJECT_DECODED;
+    item.requestedParameters.filter.content.decoded.type = &UA_TYPES[UA_TYPES_DATACHANGEFILTER];
+    item.requestedParameters.filter.content.decoded.data = &filter;
+    UA_UInt32 newMonitoredItemIds[1];
+    UA_Client_DataChangeNotificationCallback callbacks[1];
+    callbacks[0] = dataChangeHandler;
+    UA_Client_DeleteMonitoredItemCallback deleteCallbacks[1] = {NULL};
+    void *contexts[1];
+    contexts[0] = NULL;
+
+    /* Set empty array value so that the initial value data ptr for the monitored item is NULL */
+    ck_assert_uint_eq(setEmptyArray(client, outNodeId), UA_STATUSCODE_GOOD);
+
+    UA_CreateMonitoredItemsRequest createRequest;
+    UA_CreateMonitoredItemsRequest_init(&createRequest);
+    createRequest.subscriptionId = subId;
+    createRequest.timestampsToReturn = UA_TIMESTAMPSTORETURN_BOTH;
+    createRequest.itemsToCreate = &item;
+    createRequest.itemsToCreateSize = 1;
+    UA_CreateMonitoredItemsResponse createResponse =
+       UA_Client_MonitoredItems_createDataChanges(client, createRequest, contexts,
+                                                   callbacks, deleteCallbacks);
+
+    ck_assert_uint_eq(createResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(createResponse.resultsSize, 1);
+    ck_assert_uint_eq(createResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
+    newMonitoredItemIds[0] = createResponse.results[0].monitoredItemId;
+    UA_CreateMonitoredItemsResponse_clear(&createResponse);
+
+    // Do we get initial value ?
+    notificationReceived = false;
+    countNotificationReceived = 0;
+    ck_assert_uint_eq(waitForNotification(1, 10), UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(notificationReceived, true);
+    ck_assert_uint_eq(countNotificationReceived, 1);
+    ck_assert(lastValue.value.data == NULL);
+
+    notificationReceived = false;
+    ck_assert_uint_eq(setDouble(client, outNodeId, 42.0), UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(waitForNotification(1, 10), UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(notificationReceived, true);
+    ck_assert_uint_eq(countNotificationReceived, 2);
+
+    // remove monitored item
+    UA_DeleteMonitoredItemsRequest deleteRequest;
+    UA_DeleteMonitoredItemsRequest_init(&deleteRequest);
+    deleteRequest.subscriptionId = subId;
+    deleteRequest.monitoredItemIds = newMonitoredItemIds;
+    deleteRequest.monitoredItemIdsSize = 1;
+
+    UA_DeleteMonitoredItemsResponse deleteResponse =
+        UA_Client_MonitoredItems_delete(client, deleteRequest);
+
+    ck_assert_uint_eq(deleteResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(deleteResponse.resultsSize, 1);
+    ck_assert_uint_eq(deleteResponse.results[0], UA_STATUSCODE_GOOD);
+
+    UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
+}
+END_TEST
+
 START_TEST(Server_MonitoredItemsPercentFilterSetOnCreateMissingEURange) {
     UA_DataValue_init(&lastValue);
     /* define a monitored item with an percent filter with deadbandvalue = 2.0 */
@@ -1130,11 +1209,16 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_server, Server_MonitoredItemsAbsoluteFilterSetOnCreateRemoveLater);
     tcase_add_test(tc_server, Server_MonitoredItemsPercentFilterSetOnCreateMissingEURange);
     tcase_add_test(tc_server, Server_MonitoredItemsPercentFilterSetLaterMissingEURange);
+
+
+    tcase_add_test(tc_server, Server_MonitoredItemsAbsoluteFilterNULLValue);
+
 #ifdef UA_ENABLE_DA
     tcase_add_test(tc_server, Server_MonitoredItemsPercentFilterSetOnCreate);
     tcase_add_test(tc_server, Server_MonitoredItemsPercentFilterSetOnCreateDeadBandValueOutOfRange);
 #endif /* UA_ENABLE_DA */
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
+
     suite_add_tcase(s, tc_server);
 
     return s;

From bc39a9889eb26c1e9048c6488e228b2fa77c3aa7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Mon, 2 Feb 2026 20:57:54 +0100
Subject: [PATCH 1885/1963] refactor(docs): Update the description of the
 "Standard Server" certification of v1.4

---
 doc/index.rst | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/index.rst b/doc/index.rst
index 94cb3b0f0b4..be24f6efdcc 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -17,12 +17,10 @@ the MPLv2 when copied and distributed. The plugins, as well as the server and
 client examples are in the public domain (CC0 license). They can be reused under
 any license and changes do not have to be published.
 
-The sample server (server_ctt) built using open62541 v1.0 is in conformance with
-the 'Micro Embedded Device Server' Profile of OPC Foundation supporting OPC UA
-client/server communication, subscriptions, method calls and security
-(encryption) with the security policies 'Basic128Rsa15', 'Basic256' and
-'Basic256Sha256' and the facets 'method server' and 'node management'. See
-https://open62541.org/certified-sdk for more details.
+An example server based on the 1.4 release family of open62541 was certified by
+the OPC Foundation for the 'Standard Server 2017' profile. This shows open62541
+to be a good basis for products with certification requirements. See
+https://open62541.org/certification for more details.
 
 OPC Unified Architecture
 ------------------------

From 41f4deef34a9d0f94fcb830e2c831a9eb6236ade Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 2 Feb 2026 21:06:41 +0100
Subject: [PATCH 1886/1963] refactor(build): Bump version to v1.3.17

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9f0b9ea5b1..cf4c4fd65ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 16)
+set(OPEN62541_VER_PATCH 17)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 45e4cd3ef6c79a8e503d37c9f5c89fefe90d99db Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 2 Feb 2026 21:24:34 +0100
Subject: [PATCH 1887/1963] refactor(build): Bump version to v1.4.15

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ef54a67847..eb240d70156 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 14)
+set(OPEN62541_VER_PATCH 15)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 19b7436143ddbba4d69e39ecf2bbe113fb3d66e0 Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Tue, 10 Feb 2026 04:48:19 +0300
Subject: [PATCH 1888/1963] refactor(pubsub): Initialize 'rv' in
 UA_NetworkMessage_decodePayload to avoid undefined behavior (#7721)

The variable 'rv' was declared but not initialized. In the case where
dst->payloadHeaderEnabled is true and count == 0, no assignment to 'rv'
occurs before UA_CHECK_STATUS(rv, ...), leading to reading uninitialized stack data.

Fixed by initializing 'rv' to UA_STATUSCODE_GOOD and explicitly handling
the count == 0 case. Also added error checking inside the multi-message loop.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 src/pubsub/ua_pubsub_networkmessage.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index ea0765db144..9e54d4be96a 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -789,7 +789,7 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
     if(dst->networkMessageType != UA_NETWORKMESSAGE_DATASET)
         return UA_STATUSCODE_BADNOTIMPLEMENTED;
 
-    UA_StatusCode rv;
+    UA_StatusCode rv = UA_STATUSCODE_GOOD;
 
     UA_Byte count = 1;
     if(dst->payloadHeaderEnabled) {
@@ -802,6 +802,10 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
             }
         }
     }
+    if(count == 0) {
+        dst->payload.dataSetPayload.dataSetMessages = NULL;
+        return UA_STATUSCODE_GOOD;
+    }
 
     dst->payload.dataSetPayload.dataSetMessages = (UA_DataSetMessage*)
         UA_calloc(count, sizeof(UA_DataSetMessage));
@@ -818,6 +822,7 @@ UA_NetworkMessage_decodePayload(const UA_ByteString *src, size_t *offset, UA_Net
                                                 &dst->payload.dataSetPayload.dataSetMessages[i],
                                                 dst->payload.dataSetPayload.sizes[i], customTypes,
                                                 dsm);
+            UA_CHECK_STATUS(rv, return rv);
         }
     }
     UA_CHECK_STATUS(rv, return rv);

From 7195a7ae07d0887a7bb3f94c49bb4bac58552e4f Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Tue, 10 Feb 2026 04:49:42 +0300
Subject: [PATCH 1889/1963] refactor(plugins): Remove unreachable code in
 UA_Openssl_RSA_Private_Decrypt (#7719)

The second NULL check for 'privateKey' is redundant because the first
condition already covers it:

    if (data == NULL || privateKey == NULL)
        return ...;

Thus, the subsequent 'if (privateKey == NULL)' block is unreachable.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 plugins/crypto/openssl/securitypolicy_openssl_common.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/crypto/openssl/securitypolicy_openssl_common.c b/plugins/crypto/openssl/securitypolicy_openssl_common.c
index e1d36f51318..2ad615bbe65 100644
--- a/plugins/crypto/openssl/securitypolicy_openssl_common.c
+++ b/plugins/crypto/openssl/securitypolicy_openssl_common.c
@@ -233,10 +233,6 @@ UA_Openssl_RSA_Private_Decrypt (UA_ByteString *      data,
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
 
-    if (privateKey == NULL) {
-        return UA_STATUSCODE_BADINVALIDARGUMENT;
-    }
-
     size_t keySize = (size_t) UA_OpenSSL_RSA_Key_Size (privateKey);
     size_t cipherOffset = 0;
     size_t outOffset = 0;

From df6a96dbbc3a07ccf1bf69dc6a914a28f0cb444b Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Tue, 10 Feb 2026 04:52:25 +0300
Subject: [PATCH 1890/1963] refactor(plugins): Remove unreachable code in
 syslog logger (#7714)

The condition `if(logLevelSlot < 0 || logLevelSlot > 5)` is never true
because:
- UA_LOGLEVEL_TRACE (which would yield logLevelSlot = -1) is handled
  in the switch statement and causes an early return.
- All other valid log levels produce logLevelSlot values in [0, 4].

Thus, the fallback assignment `logLevelSlot = 5` is dead code and can
be safely removed without changing runtime behavior.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 plugins/ua_log_syslog.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/ua_log_syslog.c b/plugins/ua_log_syslog.c
index 9fb80067abb..3be3190bcb9 100644
--- a/plugins/ua_log_syslog.c
+++ b/plugins/ua_log_syslog.c
@@ -51,8 +51,6 @@ UA_Log_Syslog_log(void *context, UA_LogLevel level, UA_LogCategory category,
     }
 
     int logLevelSlot = ((int)level / 100) - 1;
-    if(logLevelSlot < 0 || logLevelSlot > 5)
-        logLevelSlot = 5; /* Set to fatal if the level is outside the range */
 
 #define LOGBUFSIZE 512
     char logbuf[LOGBUFSIZE];

From 3bc83a7eacaa7bbfa58edece2c2b01bde5d74797 Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Tue, 10 Feb 2026 04:53:37 +0300
Subject: [PATCH 1891/1963] refactor(server): Check for presence of binary
 protocol server-component UA_Server_run_startup (#7717)

The function getServerComponentByName may return NULL if the "binary"
component was not successfully created (e.g., due to memory allocation failure).
Previously, the returned pointer was dereferenced without a NULL check,
leading to a potential segmentation fault during server startup.

Added explicit NULL check and proper error handling with logging and cleanup.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 src/server/ua_server.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
index e0d4a3d706c..995deae88ac 100644
--- a/src/server/ua_server.c
+++ b/src/server/ua_server.c
@@ -786,6 +786,15 @@ UA_Server_run_startup(UA_Server *server) {
     /* Check that the binary protocol support component have been started */
     UA_ServerComponent *binaryProtocolManager =
         getServerComponentByName(server, UA_STRING("binary"));
+    if(!binaryProtocolManager) {
+        UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_SERVER,
+                     "Binary protocol support component not found.");
+        /* Stop all server components that have already been started */
+        ZIP_ITER(UA_ServerComponentTree, &server->serverComponents,
+                 stopServerComponent, server);
+        unlockServer(server);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
     if(binaryProtocolManager->state != UA_LIFECYCLESTATE_STARTED) {
         UA_LOG_ERROR(config->logging, UA_LOGCATEGORY_SERVER,
                        "The binary protocol support component could not been started.");

From 05b8129793062892edb90152f65c4a7a03bd28cb Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Wed, 11 Feb 2026 11:26:15 +0100
Subject: [PATCH 1892/1963] fix(server): track transferred subscriptions for
 correct diagnostics counter update

Add wasTransferred flag to UA_Subscription to prevent incorrect
currentSubscriptionCount decrements when a subscription is transferred
to another session and the old subscription object is deleted.

When a subscription is transferred, the old subscription object is
deleted but the subscription continues to exist under a new object.
The diagnostics counter should only be decremented when a subscription
is truly deleted, not when it's being replaced during a transfer.

Includes test case to verify the fix.

add author information
---
 src/server/ua_services_subscription.c       |   5 +
 src/server/ua_subscription.c                |   8 +-
 src/server/ua_subscription.h                |   4 +
 tests/server/check_services_subscriptions.c | 103 ++++++++++++++++++++
 4 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 48e9765e6e0..25c760da4f8 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -14,6 +14,7 @@
  *    Copyright 2017-2018 (c) Thomas Stalder, Blue Time Concept SA
  *    Copyright 2018 (c) Fabian Arndt, Root-Core
  *    Copyright 2017-2019 (c) HMS Industrial Networks AB (Author: Jonas Green)
+  *   Copyright 2026 (c) o6 Automation GmbH (Author: Andreas Ebner)
  */
 
 #include "ua_server_internal.h"
@@ -540,6 +541,10 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
 
     /* <-- The point of no return --> */
 
+    /* Mark the old subscription as transferred to prevent incorrect
+     * diagnostic counter updates when it is deleted */
+    sub->wasTransferred = true;
+
     /* Move over the MonitoredItems and adjust the backpointers */
     LIST_INIT(&newSub->monitoredItems);
     UA_MonitoredItem *mon, *mon_tmp;
diff --git a/src/server/ua_subscription.c b/src/server/ua_subscription.c
index f7955b9d927..f8e3404fd8c 100644
--- a/src/server/ua_subscription.c
+++ b/src/server/ua_subscription.c
@@ -15,6 +15,7 @@
  *    Copyright 2017 (c) Mattias Bornhager
  *    Copyright 2018 (c) Hilscher Gesellschaft für Systemautomation mbH (Author: Martin Lang)
  *    Copyright 2019 (c) HMS Industrial Networks AB (Author: Jonas Green)
+ *   Copyright 2026 (c) o6 Automation GmbH (Author: Andreas Ebner)
  */
 
 #include "ua_server_internal.h"
@@ -82,7 +83,12 @@ UA_Subscription_delete(UA_Server *server, UA_Subscription *sub) {
         LIST_REMOVE(sub, serverListEntry);
         UA_assert(server->subscriptionsSize > 0);
         server->subscriptionsSize--;
-        server->serverDiagnosticsSummary.currentSubscriptionCount--;
+        /* Only decrement the counter if this subscription was not transferred.
+         * Transferred subscriptions are replaced by a new subscription object
+         * that continues to exist, so the diagnostic counter should not change. */
+        if(!sub->wasTransferred) {
+            server->serverDiagnosticsSummary.currentSubscriptionCount--;
+        }
     }
 
     /* Delete monitored Items */
diff --git a/src/server/ua_subscription.h b/src/server/ua_subscription.h
index 4f03d624ee2..44aed8817ea 100644
--- a/src/server/ua_subscription.h
+++ b/src/server/ua_subscription.h
@@ -13,6 +13,7 @@
  *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart (for VDW and umati)
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Jan Hermes)
+ *    Copyright 2026 (c) o6 Automation GmbH (Author: Andreas Ebner)
  */
 
 #ifndef UA_SUBSCRIPTION_H_
@@ -244,6 +245,9 @@ struct UA_Subscription {
     /* Runtime information */
     UA_SubscriptionState state;
     UA_Boolean late;
+    UA_Boolean wasTransferred; /* Set to true when this subscription was
+                                * transferred to another session. Used to
+                                * prevent incorrect diagnostic counter updates. */
     UA_StatusCode statusChange; /* If set, a notification is generated and the
                                  * Subscription is deleted within
                                  * UA_Subscription_publish. */
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index 4c12a9fd885..51f4c6b8fa7 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -41,6 +41,20 @@ createSession(void) {
     ck_assert_uint_eq(retval, 0);
 }
 
+static UA_Session *
+createSecondSession(void) {
+    UA_Session *session2 = NULL;
+    UA_CreateSessionRequest request;
+    UA_CreateSessionRequest_init(&request);
+    request.requestedSessionTimeout = UA_UINT32_MAX;
+    lockServer(server);
+    UA_StatusCode retval = UA_Server_createSession(server, NULL, &request, &session2);
+    unlockServer(server);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert(session2 != NULL);
+    return session2;
+}
+
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
@@ -855,6 +869,94 @@ START_TEST(Server_negativeSamplingInterval) {
 }
 END_TEST
 
+START_TEST(Server_transferSubscriptionDiagnostics) {
+    /* Test that subscription diagnostics counter is correctly maintained
+     * when subscriptions are transferred between sessions */
+
+    /* Read initial subscription count */
+    UA_UInt32 initialCount = server->serverDiagnosticsSummary.currentSubscriptionCount;
+
+    /* Create a subscription in the first session */
+    createSubscription();
+    createMonitoredItem();
+    
+    /* Verify count increased by 1 */
+    UA_UInt32 countAfterCreate = server->serverDiagnosticsSummary.currentSubscriptionCount;
+    ck_assert_uint_eq(countAfterCreate, initialCount + 1);
+
+    /* Create a second session */
+    UA_Session *session2 = createSecondSession();
+
+    /* Verify count is still the same (creating session doesn't change subscription count) */
+    UA_UInt32 countAfterSession2 = server->serverDiagnosticsSummary.currentSubscriptionCount;
+    ck_assert_uint_eq(countAfterSession2, initialCount + 1);
+
+    /* Transfer the subscription from session1 to session2 */
+    UA_TransferSubscriptionsRequest transferRequest;
+    UA_TransferSubscriptionsRequest_init(&transferRequest);
+    transferRequest.subscriptionIdsSize = 1;
+    transferRequest.subscriptionIds = &subscriptionId;
+    transferRequest.sendInitialValues = false;
+
+    UA_TransferSubscriptionsResponse transferResponse;
+    UA_TransferSubscriptionsResponse_init(&transferResponse);
+
+    lockServer(server);
+    Service_TransferSubscriptions(server, session2, &transferRequest, &transferResponse);
+    unlockServer(server);
+    
+    ck_assert_uint_eq(transferResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(transferResponse.resultsSize, 1);
+    ck_assert_uint_eq(transferResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
+
+    UA_TransferSubscriptionsResponse_clear(&transferResponse);
+
+    /* Verify count is still the same after transfer */
+    UA_UInt32 countAfterTransfer = server->serverDiagnosticsSummary.currentSubscriptionCount;
+    ck_assert_uint_eq(countAfterTransfer, initialCount + 1);
+
+    /* Close the first session (subscription now belongs to session2) */
+    lockServer(server);
+    UA_Server_closeSession(server, &session->sessionId);
+    unlockServer(server);
+    session = NULL;
+
+    /* Verify count is still the same (subscription was transferred) */
+    UA_UInt32 countAfterSession1Close = server->serverDiagnosticsSummary.currentSubscriptionCount;
+    ck_assert_uint_eq(countAfterSession1Close, initialCount + 1);
+
+    /* Delete the subscription from session2 */
+    UA_DeleteSubscriptionsRequest delRequest;
+    UA_DeleteSubscriptionsRequest_init(&delRequest);
+    delRequest.subscriptionIdsSize = 1;
+    delRequest.subscriptionIds = &subscriptionId;
+
+    UA_DeleteSubscriptionsResponse delResponse;
+    UA_DeleteSubscriptionsResponse_init(&delResponse);
+
+    lockServer(server);
+    Service_DeleteSubscriptions(server, session2, &delRequest, &delResponse);
+    unlockServer(server);
+    
+    ck_assert_uint_eq(delResponse.resultsSize, 1);
+    ck_assert_uint_eq(delResponse.results[0], UA_STATUSCODE_GOOD);
+
+    UA_DeleteSubscriptionsResponse_clear(&delResponse);
+
+    /* Verify count decreased back to initial */
+    UA_UInt32 countAfterDelete = server->serverDiagnosticsSummary.currentSubscriptionCount;
+    ck_assert_uint_eq(countAfterDelete, initialCount);
+
+    /* Close session2 */
+    lockServer(server);
+    UA_Server_closeSession(server, &session2->sessionId);
+    unlockServer(server);
+
+    /* Recreate session for other tests */
+    createSession();
+}
+END_TEST
+
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
 static Suite* testSuite_Client(void) {
@@ -877,6 +979,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_server, Server_publishCallback);
     tcase_add_test(tc_server, Server_lifeTimeCount);
     tcase_add_test(tc_server, Server_invalidPublishingInterval);
+    tcase_add_test(tc_server, Server_transferSubscriptionDiagnostics);
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
     suite_add_tcase(s, tc_server);
 

From c87f22ce828f091432816d2f6cfc5490d9abbd2b Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Thu, 12 Feb 2026 10:29:49 +0100
Subject: [PATCH 1893/1963] fix(ci): disable deprecated Windows 2019 Azure
 Pipeline builds

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 967a9e2f95a..043ad13ba56 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,5 +8,5 @@ trigger:
      - '*'
 
 jobs:
-    - template: ./.azure-pipelines/azure-pipelines-win.yml
+#    - template: ./.azure-pipelines/azure-pipelines-win.yml
 #    - template: ./.azure-pipelines/azure-pipelines-dist.yml
\ No newline at end of file

From 62e4860787ac0b25886e011af745242fc60f64a4 Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Thu, 12 Feb 2026 16:29:57 +0300
Subject: [PATCH 1894/1963] refactor(arch): Check return value of getsockname
 in UDP_registerListenSocket (#7720)

The return value of getsockname() was not checked when retrieving the
dynamically assigned port after binding a UDP socket. If getsockname()
fails (e.g., due to EBADF or memory issues), the port variable would be
set from uninitialized memory, leading to undefined behavior.

Added proper error checking and logging using UA_LOG_SOCKET_ERRNO_WRAP.
Also improved robustness by using sockaddr_storage to support both IPv4
and IPv6 address families.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 arch/eventloop_posix_udp.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 8d111ac9ebf..55a7fa6fc5a 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -808,7 +808,14 @@ UDP_registerListenSocket(UA_POSIXConnectionManager *pcm, UA_UInt16 port,
         struct sockaddr_in sin;
         memset(&sin, 0, sizeof(sin));
         socklen_t len = sizeof(sin);
-        getsockname(listenSocket, (struct sockaddr *)&sin, &len);
+        if(getsockname(listenSocket, (struct sockaddr *)&sin, &len) != 0) {
+            UA_LOG_SOCKET_ERRNO_WRAP(
+                UA_LOG_WARNING(el->eventLoop.logger, UA_LOGCATEGORY_NETWORK,
+                            "UDP %u\t| getsockname failed (%s)",
+                            (unsigned)listenSocket, errno_str));
+            UA_close(listenSocket);
+            return UA_STATUSCODE_BADCONNECTIONREJECTED;
+        }
         port = ntohs(sin.sin_port);
     }
 

From cacefb6ea8c1a9064accc28ebf54146a934e53ac Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Mon, 16 Feb 2026 18:30:16 +0300
Subject: [PATCH 1895/1963] fix(pubsub): Prevent NULL dereference in
 UA_DataSetMessage_decodeBinary (#7629)

In the RAWDATA field encoding path of UA_DataSetMessage_decodeBinary,
UA_findDataTypeWithCustom may return NULL if a field's data type is not
found in the standard types or customTypes. Previously, the code
dereferenced the returned pointer unconditionally to access type->memSize,
which could lead to a crash.

Added an explicit NULL check and return UA_STATUSCODE_BADTYPEMISMATCH
with an error log if the type is unknown.

This fixes a potential security and stability issue when decoding malformed
or unsupported PubSub DataSet messages with RAWDATA encoding.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 src/pubsub/ua_pubsub_networkmessage.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_networkmessage.c b/src/pubsub/ua_pubsub_networkmessage.c
index 9e54d4be96a..5aa5fb093f5 100644
--- a/src/pubsub/ua_pubsub_networkmessage.c
+++ b/src/pubsub/ua_pubsub_networkmessage.c
@@ -1468,6 +1468,8 @@ UA_DataSetMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Data
                             const UA_DataType *type =
                                 UA_findDataTypeWithCustom(&dsm->fields[i].dataType,
                                                           customTypes);
+                            if (!type)
+                                return UA_STATUSCODE_BADTYPEMISMATCH;
                             dst->data.keyFrameData.rawFields.length += type->memSize;
                             UA_STACKARRAY(UA_Byte, value, type->memSize);
                             rv = UA_decodeBinaryInternal(&dst->data.keyFrameData.rawFields,

From b53cebc4dcc8a84d22a9e9acca36b41d38dc8f92 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Mon, 16 Feb 2026 12:33:59 +0100
Subject: [PATCH 1896/1963] fix(server): block transfer subscription for
 anonymous users including unit tests

- Modified allowTransferSubscription_default() to use UA_String_equal()
  for direct string comparison instead of UA_order()
- Added explicit check: userId->length == 0 means anonymous user
- Anonymous users are rejected from transferring subscriptions
- Added Server_transferSubscription_anonymous unit test
- Added createAuthenticatedSession() helper for authenticated tests
- Updated Server_transferSubscriptionDiagnostics to use authenticated sessions
- All 17 unit tests pass

This fix addresses the OPC UA CTT compliance requirement that
anonymous users should not be allowed to transfer subscriptions.
---
 plugins/ua_accesscontrol_default.c          | 31 ++++++++-
 tests/server/check_services_subscriptions.c | 69 ++++++++++++++++++++-
 2 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 39b15af0327..8c1e823999f 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -226,7 +226,8 @@ allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
                                   const UA_NodeId *newSessionId, void *newSessionContext) {
     if(!oldSessionId)
         return true;
-    /* Allow the transfer if the same user-id was used to activate both sessions */
+    
+    /* Get clientUserId for both sessions */
     UA_Variant session1UserId;
     UA_Variant_init(&session1UserId);
     UA_Server_getSessionAttribute(server, oldSessionId,
@@ -238,8 +239,32 @@ allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
                                   UA_QUALIFIEDNAME(0, "clientUserId"),
                                   &session2UserId);
 
-    return (UA_order(&session1UserId, &session2UserId,
-                     &UA_TYPES[UA_TYPES_VARIANT]) == UA_ORDER_EQ);
+    /* clientUserId is always a String type */
+    UA_Boolean result = false;
+    if(session1UserId.type == &UA_TYPES[UA_TYPES_STRING] &&
+       session2UserId.type == &UA_TYPES[UA_TYPES_STRING]) {
+        UA_String *userId1 = (UA_String*)session1UserId.data;
+        UA_String *userId2 = (UA_String*)session2UserId.data;
+        
+        /* Check if both sessions have the same userId */
+        if(UA_String_equal(userId1, userId2)) {
+            /* Anonymous users have empty userId */
+            if(userId1->length == 0) {
+                /* Reject transfer for anonymous users (empty userId).
+                 * According to OPC UA CTT, anonymous users
+                 * should not be allowed to transfer subscriptions. */
+                result = false;
+            } else {
+                /* Same authenticated user - allow transfer */
+                result = true;
+            }
+        }
+    }
+    
+    UA_Variant_clear(&session1UserId);
+    UA_Variant_clear(&session2UserId);
+    
+    return result;
 }
 #endif
 
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index 51f4c6b8fa7..e503def4999 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -55,6 +55,20 @@ createSecondSession(void) {
     return session2;
 }
 
+/* Create a session with authenticated user (for testing subscription transfer) */
+static UA_Session *
+createAuthenticatedSession(const char *userId) {
+    UA_Session *newSession = createSecondSession();
+    
+    /* Set clientUserIdOfSession to simulate authenticated user */
+    lockServer(server);
+    UA_String_clear(&newSession->clientUserIdOfSession);
+    newSession->clientUserIdOfSession = UA_STRING_ALLOC(userId);
+    unlockServer(server);
+    
+    return newSession;
+}
+
 static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
@@ -873,6 +887,12 @@ START_TEST(Server_transferSubscriptionDiagnostics) {
     /* Test that subscription diagnostics counter is correctly maintained
      * when subscriptions are transferred between sessions */
 
+    /* Set authenticated user for first session to allow transfer */
+    lockServer(server);
+    UA_String_clear(&session->clientUserIdOfSession);
+    session->clientUserIdOfSession = UA_STRING_ALLOC("testuser");
+    unlockServer(server);
+
     /* Read initial subscription count */
     UA_UInt32 initialCount = server->serverDiagnosticsSummary.currentSubscriptionCount;
 
@@ -884,8 +904,8 @@ START_TEST(Server_transferSubscriptionDiagnostics) {
     UA_UInt32 countAfterCreate = server->serverDiagnosticsSummary.currentSubscriptionCount;
     ck_assert_uint_eq(countAfterCreate, initialCount + 1);
 
-    /* Create a second session */
-    UA_Session *session2 = createSecondSession();
+    /* Create a second session with same authenticated user */
+    UA_Session *session2 = createAuthenticatedSession("testuser");
 
     /* Verify count is still the same (creating session doesn't change subscription count) */
     UA_UInt32 countAfterSession2 = server->serverDiagnosticsSummary.currentSubscriptionCount;
@@ -957,6 +977,50 @@ START_TEST(Server_transferSubscriptionDiagnostics) {
 }
 END_TEST
 
+/* Test anonymous user subscription transfer restriction */
+START_TEST(Server_transferSubscription_anonymous) {
+    /* Create subscription in first session (anonymous) */
+    createSubscription();
+    createMonitoredItem();
+    
+    /* Create second anonymous session */
+    UA_Session *session2 = NULL;
+    UA_CreateSessionRequest request;
+    UA_CreateSessionRequest_init(&request);
+    request.requestedSessionTimeout = UA_UINT32_MAX;
+    lockServer(server);
+    UA_StatusCode retval = UA_Server_createSession(server, NULL, &request, &session2);
+    unlockServer(server);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    
+    /* Attempt to transfer subscription from session to session2 */
+    UA_TransferSubscriptionsRequest transferRequest;
+    UA_TransferSubscriptionsRequest_init(&transferRequest);
+    transferRequest.subscriptionIdsSize = 1;
+    transferRequest.subscriptionIds = &subscriptionId;
+    transferRequest.sendInitialValues = false;
+    
+    UA_TransferSubscriptionsResponse transferResponse;
+    UA_TransferSubscriptionsResponse_init(&transferResponse);
+    
+    lockServer(server);
+    Service_TransferSubscriptions(server, session2, &transferRequest, &transferResponse);
+    unlockServer(server);
+    
+    /* Verify transfer was rejected with Bad_UserAccessDenied */
+    ck_assert_uint_eq(transferResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(transferResponse.resultsSize, 1);
+    ck_assert_uint_eq(transferResponse.results[0].statusCode, UA_STATUSCODE_BADUSERACCESSDENIED);
+    
+    UA_TransferSubscriptionsResponse_clear(&transferResponse);
+    
+    /* Cleanup: close second session */
+    lockServer(server);
+    UA_Server_closeSession(server, &session2->sessionId);
+    unlockServer(server);
+}
+END_TEST
+
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
 static Suite* testSuite_Client(void) {
@@ -980,6 +1044,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_server, Server_lifeTimeCount);
     tcase_add_test(tc_server, Server_invalidPublishingInterval);
     tcase_add_test(tc_server, Server_transferSubscriptionDiagnostics);
+    tcase_add_test(tc_server, Server_transferSubscription_anonymous);
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
     suite_add_tcase(s, tc_server);
 

From 946c2d66394b974682f0b0776d076c73ab4f2473 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Mon, 16 Feb 2026 12:37:17 +0100
Subject: [PATCH 1897/1963] refactor(server): simplify anonymous user check
 logic

- Check for anonymous users (length == 0) before string comparison
- Improves readability with flat if-else structure
- Same functionality, clearer control flow
---
 plugins/ua_accesscontrol_default.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 8c1e823999f..6f52a68aa30 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -246,18 +246,14 @@ allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
         UA_String *userId1 = (UA_String*)session1UserId.data;
         UA_String *userId2 = (UA_String*)session2UserId.data;
         
-        /* Check if both sessions have the same userId */
-        if(UA_String_equal(userId1, userId2)) {
-            /* Anonymous users have empty userId */
-            if(userId1->length == 0) {
-                /* Reject transfer for anonymous users (empty userId).
-                 * According to OPC UA CTT, anonymous users
-                 * should not be allowed to transfer subscriptions. */
-                result = false;
-            } else {
-                /* Same authenticated user - allow transfer */
-                result = true;
-            }
+        /* Anonymous users have empty userId - reject immediately.
+         * According to OPC UA CTT, anonymous users should not be
+         * allowed to transfer subscriptions. */
+        if(userId1->length == 0 || userId2->length == 0) {
+            result = false;
+        } else if(UA_String_equal(userId1, userId2)) {
+            /* Same authenticated user - allow transfer */
+            result = true;
         }
     }
     

From b03a5ce53b0942ef243fe9fcc37b2c61265039ab Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Tue, 17 Feb 2026 15:19:29 +0300
Subject: [PATCH 1898/1963] fix(pubsub): Add null check after UA_Array_new in
 addDataSetReaderConfig (#7736)

In addDataSetReaderConfig, the result of UA_Array_new was used without checking for NULL when copying DataSetMetaData fields. If memory allocation failed (e.g., due to OOM), the subsequent loop would dereference a null pointer, causing a crash.

Added a check for allocation failure when fieldsSize > 0, consistent with other parts of the codebase that handle UA_Array_new. Returns UA_STATUSCODE_BADOUTOFMEMORY and cleans up partially initialized config.

This improves robustness under low-memory conditions in PubSub subscriber setup.

Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
---
 src/pubsub/ua_pubsub_ns0.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 51cd2f38f27..1875be29ac9 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -613,6 +613,8 @@ addDataSetReaderConfig(UA_Server *server, UA_NodeId readerGroupId,
     pMetaData->fieldsSize = dataSetReader->dataSetMetaData.fieldsSize;
     pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
                         &UA_TYPES[UA_TYPES_FIELDMETADATA]);
+    if(pMetaData->fieldsSize > 0 && !pMetaData->fields)
+        return UA_STATUSCODE_BADOUTOFMEMORY;
     for(size_t i = 0; i < pMetaData->fieldsSize; i++){
         UA_FieldMetaData_init (&pMetaData->fields[i]);
         UA_NodeId_copy (&dataSetReader->dataSetMetaData.fields[i].dataType,

From 2488947ace18cea72daab377edc1de342c3c649e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@web.de>
Date: Tue, 17 Feb 2026 15:31:05 +0100
Subject: [PATCH 1899/1963] refactor(client): Don't close the SecureChannel
 when the servers sends a late response

---
 src/client/ua_client.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 30f2e9b423b..ac3af292a9e 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -400,11 +400,17 @@ processMSGResponse(UA_Client *client, UA_UInt32 requestId,
      * shall verify the RequestId and the SequenceNumber. If these checks fail a
      * Bad_SecurityChecksFailed error is reported. The RequestId only needs to
      * be verified by the Client since only the Client knows if it is valid or
-     * not.*/
+     * not.
+     *
+     * But! If an async request has timed out, the RequestId is no longer found.
+     * In theory the server should send an error back before the timeout. But
+     * not all do. In these cases we don't want to close the entire
+     * SecureChannel and just log a warning. The service callback has already
+     * been notified about the timeout before. */
     if(!ac) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Request with unknown RequestId %u", requestId);
-        return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        return UA_STATUSCODE_GOOD;
     }
 
     UA_Response asyncResponse;

From f63e2a819aff6e468242dc2e54ccbd5b75d63654 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Wed, 18 Feb 2026 18:17:22 +0100
Subject: [PATCH 1900/1963] refactor(build): Bump version to v1.4.16

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb240d70156..bac59a763cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 15)
+set(OPEN62541_VER_PATCH 16)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 7eee5e744ddbca78a73b97b3830b2d082054a70b Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Thu, 19 Feb 2026 16:42:51 +0100
Subject: [PATCH 1901/1963] fix(server): interpret a null or empty
 UserIdentityToken as anonymous

OPC UA Part 4, Section 5.6.3.2, Table 17 requires that a NULL or empty
UserIdentityToken shall be treated as Anonymous. In
selectEndpointAndTokenPolicy(), when a NULL token (ENCODED_NOBODY) matched
an anonymous UserTokenPolicy, *ed and *utp were set but *tokenSp was not.
Bad_IdentityTokenInvalid.

Fix: Set *tokenSp = channel->securityPolicy in the ENCODED_NOBODY early
return path, consistent with downstream master (commit a9d37877c).

Added regression test Client_activateSession_nullToken to
check_activateSession.c that sends an ActivateSession with a
default-initialized (NULL) UserIdentityToken and asserts the server
accepts it as Anonymous.
---
 src/server/ua_services_session.c     |  1 +
 tests/client/check_activateSession.c | 42 ++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index 4b9c049e9a2..fbf23dc3328 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -469,6 +469,7 @@ selectEndpointAndTokenPolicy(UA_Server *server, UA_SecureChannel *channel,
                pol->tokenType == UA_USERTOKENTYPE_ANONYMOUS) {
                 *ed = desc;
                 *utp = pol;
+                *tokenSp = channel->securityPolicy;
                 return;
             }
 
diff --git a/tests/client/check_activateSession.c b/tests/client/check_activateSession.c
index 348ee9cacf8..28079bf89a2 100644
--- a/tests/client/check_activateSession.c
+++ b/tests/client/check_activateSession.c
@@ -343,6 +343,47 @@ START_TEST(Client_switch) {
 }
 END_TEST
 
+/* Issue #14: A NULL or empty UserIdentityToken should be treated as Anonymous
+ * (OPC UA Part 4, Section 5.6.3.2, Table 17) */
+START_TEST(Client_activateSession_nullToken) {
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(config);
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Send ActivateSession with a NULL (default-initialized) UserIdentityToken.
+     * The encoding is UA_EXTENSIONOBJECT_ENCODED_NOBODY. Per spec, the server
+     * must interpret this as an Anonymous login. */
+    UA_ActivateSessionRequest req;
+    UA_ActivateSessionRequest_init(&req);
+    /* userIdentityToken left as default (ENCODED_NOBODY / NULL) */
+
+    UA_ActivateSessionResponse resp;
+    UA_ActivateSessionResponse_init(&resp);
+
+    __UA_Client_Service(client, &req,
+                        &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST],
+                        &resp,
+                        &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
+
+    ck_assert_uint_eq(resp.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+
+    UA_ActivateSessionRequest_clear(&req);
+    UA_ActivateSessionResponse_clear(&resp);
+
+    /* Verify the session is still functional after re-activation */
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_delete(client);
+}
+END_TEST
+
 START_TEST(Client_activateSessionClose) {
     // restart server
     teardown();
@@ -483,6 +524,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_client, Client_renewSecureChannelWithActiveSubscription);
 #endif
 
+    tcase_add_test(tc_client, Client_activateSession_nullToken);
     tcase_add_test(tc_client, Client_activateSessionClose);
     tcase_add_test(tc_client, Client_activateSessionTimeout);
     tcase_add_test(tc_client, Client_activateSessionLocaleIds);

From 59d47fcf1fe80237db72f263e62207e2cf1f94f3 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Mon, 23 Feb 2026 09:25:42 +0100
Subject: [PATCH 1902/1963] fix(server): enforce AccessLevel StatusWrite and
 TimestampWrite bits
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The server did not check the StatusWrite (0x20) and TimestampWrite
(0x40) bits of the AccessLevel attribute when writing the StatusCode
or SourceTimestamp of a Variable value. This allowed clients to write
those fields even when the corresponding access bits were not set.

Add checks for UA_ACCESSLEVELMASK_STATUSWRITE when the WriteValue
contains hasStatus, and for UA_ACCESSLEVELMASK_TIMESTAMPWRITE when it
contains hasSourceTimestamp (OPC UA Part 3, §8.55, Table 46).

Add unit tests that use a non-admin session to verify that:
- Writing StatusCode is rejected when StatusWrite bit is not set
- Writing SourceTimestamp is rejected when TimestampWrite bit is not set
- Both writes succeed when the corresponding bits are set
---
 src/server/ua_services_attribute.c            |  27 +++
 tests/server/check_server_historical_data.c   |   4 +-
 .../check_server_historical_data_circular.c   |   3 +-
 tests/server/check_services_attributes.c      | 188 ++++++++++++++++++
 4 files changed, 220 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index c32217f9967..f1c17afe98a 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -17,6 +17,7 @@
  *    Copyright 2017-2020 (c) HMS Industrial Networks AB (Author: Jonas Green)
  *    Copyright 2017 (c) Henrik Norrman
  *    Copyright 2020 (c) Christian von Arnim, ISW University of Stuttgart  (for VDW and umati)
+ *    Copyright 2026 (c) o6 Automation GmbH (Author: Andreas Ebner)
  */
 
 #include "ua_server_internal.h"
@@ -1711,6 +1712,32 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
                 retval = UA_STATUSCODE_BADUSERACCESSDENIED;
                 break;
             }
+            /* Writing the StatusCode requires the StatusWrite bit */
+            if(wvalue->value.hasStatus) {
+                accessLevel = getAccessLevel(server, session, &node->variableNode);
+                if(!(accessLevel & UA_ACCESSLEVELMASK_STATUSWRITE)) {
+                    retval = UA_STATUSCODE_BADNOTWRITABLE;
+                    break;
+                }
+                accessLevel = getUserAccessLevel(server, session, &node->variableNode);
+                if(!(accessLevel & UA_ACCESSLEVELMASK_STATUSWRITE)) {
+                    retval = UA_STATUSCODE_BADUSERACCESSDENIED;
+                    break;
+                }
+            }
+            /* Writing the SourceTimestamp requires the TimestampWrite bit */
+            if(wvalue->value.hasSourceTimestamp) {
+                accessLevel = getAccessLevel(server, session, &node->variableNode);
+                if(!(accessLevel & UA_ACCESSLEVELMASK_TIMESTAMPWRITE)) {
+                    retval = UA_STATUSCODE_BADNOTWRITABLE;
+                    break;
+                }
+                accessLevel = getUserAccessLevel(server, session, &node->variableNode);
+                if(!(accessLevel & UA_ACCESSLEVELMASK_TIMESTAMPWRITE)) {
+                    retval = UA_STATUSCODE_BADUSERACCESSDENIED;
+                    break;
+                }
+            }
         } else { /* UA_NODECLASS_VARIABLETYPE */
             CHECK_USERWRITEMASK(UA_WRITEMASK_VALUEFORVARIABLETYPE);
         }
diff --git a/tests/server/check_server_historical_data.c b/tests/server/check_server_historical_data.c
index b84f84689d1..6f2c1fe1984 100644
--- a/tests/server/check_server_historical_data.c
+++ b/tests/server/check_server_historical_data.c
@@ -74,7 +74,9 @@ static void setup(void) {
     attr.description = UA_LOCALIZEDTEXT("en-US","the answer");
     attr.displayName = UA_LOCALIZEDTEXT("en-US","the answer");
     attr.dataType = UA_TYPES[UA_TYPES_UINT32].typeId;
-    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD | UA_ACCESSLEVELMASK_HISTORYWRITE;
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE |
+        UA_ACCESSLEVELMASK_HISTORYREAD | UA_ACCESSLEVELMASK_HISTORYWRITE |
+        UA_ACCESSLEVELMASK_STATUSWRITE | UA_ACCESSLEVELMASK_TIMESTAMPWRITE;
     attr.historizing = true;
 
     /* Add the variable node to the information model */
diff --git a/tests/server/check_server_historical_data_circular.c b/tests/server/check_server_historical_data_circular.c
index 5100708738e..086b8c09bb2 100644
--- a/tests/server/check_server_historical_data_circular.c
+++ b/tests/server/check_server_historical_data_circular.c
@@ -69,7 +69,8 @@ static void setup(void) {
     attr.displayName = UA_LOCALIZEDTEXT("en-US","the answer");
     attr.dataType = UA_TYPES[UA_TYPES_UINT32].typeId;
     attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE |
-        UA_ACCESSLEVELMASK_HISTORYREAD | UA_ACCESSLEVELMASK_HISTORYWRITE;
+        UA_ACCESSLEVELMASK_HISTORYREAD | UA_ACCESSLEVELMASK_HISTORYWRITE |
+        UA_ACCESSLEVELMASK_STATUSWRITE | UA_ACCESSLEVELMASK_TIMESTAMPWRITE;
     attr.historizing = true;
 
     /* Add the variable node to the information model */
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index a974b6b98bb..1032a5c6ccf 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -1113,6 +1113,190 @@ START_TEST(WriteSingleDataSourceAttributeValue) {
     ck_assert_int_eq(retval, UA_STATUSCODE_BADWRITENOTSUPPORTED);
 } END_TEST
 
+/* OPC UA Part 3: Writing the StatusCode of a value requires
+ * the StatusWrite bit in the AccessLevel. Uses a non-admin session so that the
+ * server-side AccessLevel check is actually evaluated. */
+START_TEST(WriteValueStatusCodeWithoutStatusWriteBit) {
+    /* Remove StatusWrite bit, keep Read|Write */
+    UA_Server_writeAccessLevel(server, UA_NODEID_STRING(1, "the.answer"),
+                               UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE);
+
+    /* Create a non-admin session */
+    UA_Session *session = NULL;
+    UA_CreateSessionRequest req;
+    UA_CreateSessionRequest_init(&req);
+    req.requestedSessionTimeout = UA_UINT32_MAX;
+    lockServer(server);
+    ck_assert_int_eq(UA_Server_createSession(server, NULL, &req, &session),
+                     UA_STATUSCODE_GOOD);
+
+    /* Attempt to write with hasStatus = true */
+    UA_WriteRequest wReq;
+    UA_WriteRequest_init(&wReq);
+    UA_WriteValue wv;
+    UA_WriteValue_init(&wv);
+    UA_Int32 val = 42;
+    UA_Variant_setScalar(&wv.value.value, &val, &UA_TYPES[UA_TYPES_INT32]);
+    wv.value.hasValue = true;
+    wv.value.hasStatus = true;
+    wv.value.status = UA_STATUSCODE_GOOD;
+    wv.nodeId = UA_NODEID_STRING(1, "the.answer");
+    wv.attributeId = UA_ATTRIBUTEID_VALUE;
+    wReq.nodesToWrite = &wv;
+    wReq.nodesToWriteSize = 1;
+
+    UA_WriteResponse wResp;
+    UA_WriteResponse_init(&wResp);
+    Service_Write(server, session, &wReq, &wResp);
+    ck_assert_int_eq(wResp.resultsSize, 1);
+    ck_assert_int_eq(wResp.results[0], UA_STATUSCODE_BADNOTWRITABLE);
+    UA_WriteResponse_clear(&wResp);
+    unlockServer(server);
+
+    /* Restore default AccessLevel */
+    UA_Server_writeAccessLevel(server, UA_NODEID_STRING(1, "the.answer"),
+                               UA_ACCESSLEVELMASK_READ |
+                               UA_ACCESSLEVELMASK_STATUSWRITE |
+                               UA_ACCESSLEVELMASK_TIMESTAMPWRITE);
+} END_TEST
+
+/* OPC UA Part 3: Writing the SourceTimestamp of a value
+ * requires the TimestampWrite bit in the AccessLevel. */
+START_TEST(WriteValueTimestampWithoutTimestampWriteBit) {
+    /* Remove TimestampWrite bit, keep Read|Write */
+    UA_Server_writeAccessLevel(server, UA_NODEID_STRING(1, "the.answer"),
+                               UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE);
+
+    /* Create a non-admin session */
+    UA_Session *session = NULL;
+    UA_CreateSessionRequest req;
+    UA_CreateSessionRequest_init(&req);
+    req.requestedSessionTimeout = UA_UINT32_MAX;
+    lockServer(server);
+    ck_assert_int_eq(UA_Server_createSession(server, NULL, &req, &session),
+                     UA_STATUSCODE_GOOD);
+
+    /* Attempt to write with hasSourceTimestamp = true */
+    UA_WriteRequest wReq;
+    UA_WriteRequest_init(&wReq);
+    UA_WriteValue wv;
+    UA_WriteValue_init(&wv);
+    UA_Int32 val = 42;
+    UA_Variant_setScalar(&wv.value.value, &val, &UA_TYPES[UA_TYPES_INT32]);
+    wv.value.hasValue = true;
+    wv.value.hasSourceTimestamp = true;
+    wv.value.sourceTimestamp = 1337;
+    wv.nodeId = UA_NODEID_STRING(1, "the.answer");
+    wv.attributeId = UA_ATTRIBUTEID_VALUE;
+    wReq.nodesToWrite = &wv;
+    wReq.nodesToWriteSize = 1;
+
+    UA_WriteResponse wResp;
+    UA_WriteResponse_init(&wResp);
+    Service_Write(server, session, &wReq, &wResp);
+    ck_assert_int_eq(wResp.resultsSize, 1);
+    ck_assert_int_eq(wResp.results[0], UA_STATUSCODE_BADNOTWRITABLE);
+    UA_WriteResponse_clear(&wResp);
+    unlockServer(server);
+
+    /* Restore default AccessLevel */
+    UA_Server_writeAccessLevel(server, UA_NODEID_STRING(1, "the.answer"),
+                               UA_ACCESSLEVELMASK_READ |
+                               UA_ACCESSLEVELMASK_STATUSWRITE |
+                               UA_ACCESSLEVELMASK_TIMESTAMPWRITE);
+} END_TEST
+
+/* Verify that writing StatusCode succeeds when the StatusWrite bit is set. */
+START_TEST(WriteValueStatusCodeWithStatusWriteBit) {
+    /* Set Read|Write|StatusWrite */
+    UA_Server_writeAccessLevel(server, UA_NODEID_STRING(1, "the.answer"),
+                               UA_ACCESSLEVELMASK_READ |
+                               UA_ACCESSLEVELMASK_WRITE |
+                               UA_ACCESSLEVELMASK_STATUSWRITE);
+
+    UA_Session *session = NULL;
+    UA_CreateSessionRequest req;
+    UA_CreateSessionRequest_init(&req);
+    req.requestedSessionTimeout = UA_UINT32_MAX;
+    lockServer(server);
+    ck_assert_int_eq(UA_Server_createSession(server, NULL, &req, &session),
+                     UA_STATUSCODE_GOOD);
+
+    UA_WriteRequest wReq;
+    UA_WriteRequest_init(&wReq);
+    UA_WriteValue wv;
+    UA_WriteValue_init(&wv);
+    UA_Int32 val = 42;
+    UA_Variant_setScalar(&wv.value.value, &val, &UA_TYPES[UA_TYPES_INT32]);
+    wv.value.hasValue = true;
+    wv.value.hasStatus = true;
+    wv.value.status = UA_STATUSCODE_GOOD;
+    wv.nodeId = UA_NODEID_STRING(1, "the.answer");
+    wv.attributeId = UA_ATTRIBUTEID_VALUE;
+    wReq.nodesToWrite = &wv;
+    wReq.nodesToWriteSize = 1;
+
+    UA_WriteResponse wResp;
+    UA_WriteResponse_init(&wResp);
+    Service_Write(server, session, &wReq, &wResp);
+    ck_assert_int_eq(wResp.resultsSize, 1);
+    ck_assert_int_eq(wResp.results[0], UA_STATUSCODE_GOOD);
+    UA_WriteResponse_clear(&wResp);
+    unlockServer(server);
+
+    /* Restore default AccessLevel */
+    UA_Server_writeAccessLevel(server, UA_NODEID_STRING(1, "the.answer"),
+                               UA_ACCESSLEVELMASK_READ |
+                               UA_ACCESSLEVELMASK_STATUSWRITE |
+                               UA_ACCESSLEVELMASK_TIMESTAMPWRITE);
+} END_TEST
+
+/* Verify that writing SourceTimestamp succeeds when the TimestampWrite bit
+ * is set. */
+START_TEST(WriteValueTimestampWithTimestampWriteBit) {
+    /* Set Read|Write|TimestampWrite */
+    UA_Server_writeAccessLevel(server, UA_NODEID_STRING(1, "the.answer"),
+                               UA_ACCESSLEVELMASK_READ |
+                               UA_ACCESSLEVELMASK_WRITE |
+                               UA_ACCESSLEVELMASK_TIMESTAMPWRITE);
+
+    UA_Session *session = NULL;
+    UA_CreateSessionRequest req;
+    UA_CreateSessionRequest_init(&req);
+    req.requestedSessionTimeout = UA_UINT32_MAX;
+    lockServer(server);
+    ck_assert_int_eq(UA_Server_createSession(server, NULL, &req, &session),
+                     UA_STATUSCODE_GOOD);
+
+    UA_WriteRequest wReq;
+    UA_WriteRequest_init(&wReq);
+    UA_WriteValue wv;
+    UA_WriteValue_init(&wv);
+    UA_Int32 val = 42;
+    UA_Variant_setScalar(&wv.value.value, &val, &UA_TYPES[UA_TYPES_INT32]);
+    wv.value.hasValue = true;
+    wv.value.hasSourceTimestamp = true;
+    wv.value.sourceTimestamp = 1337;
+    wv.nodeId = UA_NODEID_STRING(1, "the.answer");
+    wv.attributeId = UA_ATTRIBUTEID_VALUE;
+    wReq.nodesToWrite = &wv;
+    wReq.nodesToWriteSize = 1;
+
+    UA_WriteResponse wResp;
+    UA_WriteResponse_init(&wResp);
+    Service_Write(server, session, &wReq, &wResp);
+    ck_assert_int_eq(wResp.resultsSize, 1);
+    ck_assert_int_eq(wResp.results[0], UA_STATUSCODE_GOOD);
+    UA_WriteResponse_clear(&wResp);
+    unlockServer(server);
+
+    /* Restore default AccessLevel */
+    UA_Server_writeAccessLevel(server, UA_NODEID_STRING(1, "the.answer"),
+                               UA_ACCESSLEVELMASK_READ |
+                               UA_ACCESSLEVELMASK_STATUSWRITE |
+                               UA_ACCESSLEVELMASK_TIMESTAMPWRITE);
+} END_TEST
+
 START_TEST(CheckDisplayNameLocalization) {
     /* Add a german localization for the DisplayName attribute */
     UA_WriteValue wValue;
@@ -1273,6 +1457,10 @@ static Suite * testSuite_services_attributes(void) {
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeHistorizing);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleAttributeExecutable);
     tcase_add_test(tc_writeSingleAttributes, WriteSingleDataSourceAttributeValue);
+    tcase_add_test(tc_writeSingleAttributes, WriteValueStatusCodeWithoutStatusWriteBit);
+    tcase_add_test(tc_writeSingleAttributes, WriteValueTimestampWithoutTimestampWriteBit);
+    tcase_add_test(tc_writeSingleAttributes, WriteValueStatusCodeWithStatusWriteBit);
+    tcase_add_test(tc_writeSingleAttributes, WriteValueTimestampWithTimestampWriteBit);
 
     suite_add_tcase(s, tc_writeSingleAttributes);
 

From 6e3a27c9f0003342e8c579af8457e19102cb6306 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Fri, 27 Feb 2026 17:18:07 +0100
Subject: [PATCH 1903/1963] fix(server): return Bad_WriteNotSupported for
 StatusWrite/TimestampWrite violations

---
 src/server/ua_services_attribute.c       | 4 ++--
 tests/server/check_services_attributes.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index f1c17afe98a..10909f56b6d 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -1716,7 +1716,7 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
             if(wvalue->value.hasStatus) {
                 accessLevel = getAccessLevel(server, session, &node->variableNode);
                 if(!(accessLevel & UA_ACCESSLEVELMASK_STATUSWRITE)) {
-                    retval = UA_STATUSCODE_BADNOTWRITABLE;
+                    retval = UA_STATUSCODE_BADWRITENOTSUPPORTED;
                     break;
                 }
                 accessLevel = getUserAccessLevel(server, session, &node->variableNode);
@@ -1729,7 +1729,7 @@ copyAttributeIntoNode(UA_Server *server, UA_Session *session,
             if(wvalue->value.hasSourceTimestamp) {
                 accessLevel = getAccessLevel(server, session, &node->variableNode);
                 if(!(accessLevel & UA_ACCESSLEVELMASK_TIMESTAMPWRITE)) {
-                    retval = UA_STATUSCODE_BADNOTWRITABLE;
+                    retval = UA_STATUSCODE_BADWRITENOTSUPPORTED;
                     break;
                 }
                 accessLevel = getUserAccessLevel(server, session, &node->variableNode);
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index 1032a5c6ccf..caecdfd4df1 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -1149,7 +1149,7 @@ START_TEST(WriteValueStatusCodeWithoutStatusWriteBit) {
     UA_WriteResponse_init(&wResp);
     Service_Write(server, session, &wReq, &wResp);
     ck_assert_int_eq(wResp.resultsSize, 1);
-    ck_assert_int_eq(wResp.results[0], UA_STATUSCODE_BADNOTWRITABLE);
+    ck_assert_int_eq(wResp.results[0], UA_STATUSCODE_BADWRITENOTSUPPORTED);
     UA_WriteResponse_clear(&wResp);
     unlockServer(server);
 
@@ -1195,7 +1195,7 @@ START_TEST(WriteValueTimestampWithoutTimestampWriteBit) {
     UA_WriteResponse_init(&wResp);
     Service_Write(server, session, &wReq, &wResp);
     ck_assert_int_eq(wResp.resultsSize, 1);
-    ck_assert_int_eq(wResp.results[0], UA_STATUSCODE_BADNOTWRITABLE);
+    ck_assert_int_eq(wResp.results[0], UA_STATUSCODE_BADWRITENOTSUPPORTED);
     UA_WriteResponse_clear(&wResp);
     unlockServer(server);
 

From c625d1dadedb930d1216145faa5731a4ef75535c Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Mon, 23 Feb 2026 10:32:15 +0100
Subject: [PATCH 1904/1963] fix(server): detach subscriptions on session
 timeout instead of deleting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a session timed out, the server unconditionally deleted all
subscriptions owned by that session. Per OPC UA Part 4, §5.13.7,
the subscription lifetime is independent of the session lifetime.
Subscriptions whose lifetime has not expired must survive the session
timeout so clients can recover them via TransferSubscriptions.

Detach subscriptions (instead of deleting them) when the shutdown
reason is UA_SHUTDOWNREASON_TIMEOUT. Detached subscriptions remain
in the server-wide list with session==NULL and self-destruct when
their own lifetime expires.
---
 src/server/ua_services_session.c            | 12 ++-
 tests/server/check_services_subscriptions.c | 84 +++++++++++++++++++++
 2 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_services_session.c b/src/server/ua_services_session.c
index fbf23dc3328..03c400d6201 100644
--- a/src/server/ua_services_session.c
+++ b/src/server/ua_services_session.c
@@ -11,6 +11,7 @@
  *    Copyright 2017-2018 (c) Mark Giraud, Fraunhofer IOSB
  *    Copyright 2019 (c) Kalycito Infotech Private Limited
  *    Copyright 2018-2020 (c) HMS Industrial Networks AB (Author: Jonas Green)
+ *    Copyright 2026 (c) o6 Automation GmbH (Author: Andreas Ebner)
  */
 
 #include "ua_server_internal.h"
@@ -32,11 +33,18 @@ UA_Server_removeSession(UA_Server *server, session_list_entry *sentry,
 
     UA_LOCK_ASSERT(&server->serviceMutex, 1);
 
-    /* Remove the Subscriptions */
+    /* When the session times out, detach
+     * subscriptions so they can be recovered via TransferSubscriptions. */
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     UA_Subscription *sub, *tempsub;
     TAILQ_FOREACH_SAFE(sub, &session->subscriptions, sessionListEntry, tempsub) {
-        UA_Subscription_delete(server, sub);
+        if(shutdownReason == UA_SHUTDOWNREASON_TIMEOUT) {
+            UA_LOG_INFO_SUBSCRIPTION(server->config.logging, sub,
+                                     "Detaching the Subscription from the timed-out Session");
+            UA_Session_detachSubscription(server, session, sub, true);
+        } else {
+            UA_Subscription_delete(server, sub);
+        }
     }
 
     UA_PublishResponseEntry *entry;
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index e503def4999..a8a48d2bd78 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -1021,6 +1021,89 @@ START_TEST(Server_transferSubscription_anonymous) {
 }
 END_TEST
 
+START_TEST(Server_subscriptionSurvivesSessionTimeout) {
+    /* Set authenticated user for the session to allow transfer */
+    lockServer(server);
+    UA_String_clear(&session->clientUserIdOfSession);
+    session->clientUserIdOfSession = UA_STRING_ALLOC("testuser");
+    unlockServer(server);
+
+    /* Create a subscription with a monitored item */
+    createSubscription();
+    createMonitoredItem();
+
+    /* Verify the subscription exists in the server-wide list */
+    lockServer(server);
+    UA_Subscription *sub = getSubscriptionById(server, subscriptionId);
+    unlockServer(server);
+    ck_assert_ptr_ne(sub, NULL);
+
+    /* Force the session to time out by setting validTill to a past value */
+    lockServer(server);
+    session->validTill = UA_DateTime_nowMonotonic() - UA_DATETIME_SEC;
+    UA_Server_cleanupSessions(server, UA_DateTime_nowMonotonic());
+    unlockServer(server);
+    session = NULL; /* Session has been removed */
+
+    /* The subscription must still exist in the server-wide list (detached) */
+    lockServer(server);
+    sub = getSubscriptionById(server, subscriptionId);
+    unlockServer(server);
+    ck_assert_ptr_ne(sub, NULL);
+    ck_assert_ptr_eq(sub->session, NULL); /* Detached from session */
+
+    /* Create a new session and transfer the subscription */
+    UA_Session *session2 = createAuthenticatedSession("testuser");
+
+    UA_TransferSubscriptionsRequest transferRequest;
+    UA_TransferSubscriptionsRequest_init(&transferRequest);
+    transferRequest.subscriptionIdsSize = 1;
+    transferRequest.subscriptionIds = &subscriptionId;
+    transferRequest.sendInitialValues = false;
+
+    UA_TransferSubscriptionsResponse transferResponse;
+    UA_TransferSubscriptionsResponse_init(&transferResponse);
+
+    lockServer(server);
+    Service_TransferSubscriptions(server, session2, &transferRequest, &transferResponse);
+    unlockServer(server);
+
+    ck_assert_uint_eq(transferResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(transferResponse.resultsSize, 1);
+    ck_assert_uint_eq(transferResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
+    UA_TransferSubscriptionsResponse_clear(&transferResponse);
+
+    /* Verify subscription is now attached to the new session */
+    lockServer(server);
+    sub = getSubscriptionById(server, subscriptionId);
+    unlockServer(server);
+    ck_assert_ptr_ne(sub, NULL);
+    ck_assert_ptr_eq(sub->session, session2);
+
+    /* Clean up: delete subscription and close session2 */
+    UA_DeleteSubscriptionsRequest delRequest;
+    UA_DeleteSubscriptionsRequest_init(&delRequest);
+    delRequest.subscriptionIdsSize = 1;
+    delRequest.subscriptionIds = &subscriptionId;
+
+    UA_DeleteSubscriptionsResponse delResponse;
+    UA_DeleteSubscriptionsResponse_init(&delResponse);
+
+    lockServer(server);
+    Service_DeleteSubscriptions(server, session2, &delRequest, &delResponse);
+    unlockServer(server);
+    ck_assert_uint_eq(delResponse.results[0], UA_STATUSCODE_GOOD);
+    UA_DeleteSubscriptionsResponse_clear(&delResponse);
+
+    lockServer(server);
+    UA_Server_closeSession(server, &session2->sessionId);
+    unlockServer(server);
+
+    /* Recreate session for other tests */
+    createSession();
+}
+END_TEST
+
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
 static Suite* testSuite_Client(void) {
@@ -1045,6 +1128,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_server, Server_invalidPublishingInterval);
     tcase_add_test(tc_server, Server_transferSubscriptionDiagnostics);
     tcase_add_test(tc_server, Server_transferSubscription_anonymous);
+    tcase_add_test(tc_server, Server_subscriptionSurvivesSessionTimeout);
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
     suite_add_tcase(s, tc_server);
 

From 019fa659532e3a08c881b49433c4726fc0f703ac Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Mon, 2 Mar 2026 15:17:21 +0100
Subject: [PATCH 1905/1963] fix(server): allow anonymous subscription transfer
 on secure channels with matching ApplicationUri

---
 plugins/ua_accesscontrol_default.c | 93 ++++++++++++++++++++++++++++--
 1 file changed, 89 insertions(+), 4 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 6f52a68aa30..e4471fdd444 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -147,6 +147,18 @@ activateSession_default(UA_Server *server, UA_AccessControl *ac,
         return UA_STATUSCODE_BADIDENTITYTOKENINVALID;
     }
 
+    /* Store the endpoint's SecurityPolicyUri as a custom session attribute.
+     * This is needed later in allowTransferSubscription_default to determine
+     * whether the session was established over a secure channel. */
+    if(endpointDescription) {
+        UA_Variant spUri;
+        UA_Variant_setScalar(&spUri, (void*)(uintptr_t)&endpointDescription->securityPolicyUri,
+                             &UA_TYPES[UA_TYPES_STRING]);
+        UA_Server_setSessionAttribute(server, sessionId,
+                                      UA_QUALIFIEDNAME(0, "channelSecurityPolicyUri"),
+                                      &spUri);
+    }
+
     return UA_STATUSCODE_GOOD;
 }
 
@@ -246,11 +258,84 @@ allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
         UA_String *userId1 = (UA_String*)session1UserId.data;
         UA_String *userId2 = (UA_String*)session2UserId.data;
         
-        /* Anonymous users have empty userId - reject immediately.
-         * According to OPC UA CTT, anonymous users should not be
-         * allowed to transfer subscriptions. */
         if(userId1->length == 0 || userId2->length == 0) {
-            result = false;
+            /* Anonymous user(s) detected.
+             * For anonymous users, the OPC UA specification requires
+             * checking the ApplicationUri from the clientDescription
+             * to verify that the same application is transferring the
+             * subscription (e.g. after a network interruption or client
+             * crash with reconnect on a different SecureChannel).
+             *
+             * Additionally, on unsecure connections (SecurityPolicy#None)
+             * the ApplicationUri is not verified against a certificate,
+             * so the transfer must be rejected.
+             *
+             * CTT Err-017: Reject anonymous transfer on unsecure channel
+             * CTT 019: Allow anonymous transfer on secure channels if
+             *          the ApplicationUri matches */
+
+            /* First check: Both sessions must use a secure channel
+             * (not SecurityPolicy#None). The securityPolicyUri was
+             * stored as a session attribute during ActivateSession. */
+            UA_Variant session1SpUri;
+            UA_Variant_init(&session1SpUri);
+            UA_Server_getSessionAttribute(server, oldSessionId,
+                                          UA_QUALIFIEDNAME(0, "channelSecurityPolicyUri"),
+                                          &session1SpUri);
+            UA_Variant session2SpUri;
+            UA_Variant_init(&session2SpUri);
+            UA_Server_getSessionAttribute(server, newSessionId,
+                                          UA_QUALIFIEDNAME(0, "channelSecurityPolicyUri"),
+                                          &session2SpUri);
+
+            UA_Boolean bothSecure = false;
+            if(session1SpUri.type == &UA_TYPES[UA_TYPES_STRING] &&
+               session2SpUri.type == &UA_TYPES[UA_TYPES_STRING]) {
+                UA_String *spUri1 = (UA_String*)session1SpUri.data;
+                UA_String *spUri2 = (UA_String*)session2SpUri.data;
+                /* Reject if either session uses SecurityPolicy#None */
+                if(!UA_String_equal(spUri1, &UA_SECURITY_POLICY_NONE_URI) &&
+                   !UA_String_equal(spUri2, &UA_SECURITY_POLICY_NONE_URI)) {
+                    bothSecure = true;
+                }
+            }
+
+            UA_Variant_clear(&session1SpUri);
+            UA_Variant_clear(&session2SpUri);
+
+            /* Second check: If both channels are secure, compare the
+             * ApplicationUri from the clientDescription. On secure
+             * connections the ApplicationUri is validated against
+             * the client certificate during CreateSession. */
+            if(bothSecure) {
+                UA_Variant session1Desc;
+                UA_Variant_init(&session1Desc);
+                UA_Server_getSessionAttribute(server, oldSessionId,
+                                              UA_QUALIFIEDNAME(0, "clientDescription"),
+                                              &session1Desc);
+                UA_Variant session2Desc;
+                UA_Variant_init(&session2Desc);
+                UA_Server_getSessionAttribute(server, newSessionId,
+                                              UA_QUALIFIEDNAME(0, "clientDescription"),
+                                              &session2Desc);
+
+                if(session1Desc.type == &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION] &&
+                   session2Desc.type == &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]) {
+                    UA_ApplicationDescription *desc1 =
+                        (UA_ApplicationDescription*)session1Desc.data;
+                    UA_ApplicationDescription *desc2 =
+                        (UA_ApplicationDescription*)session2Desc.data;
+                    if(desc1->applicationUri.length > 0 &&
+                       desc2->applicationUri.length > 0 &&
+                       UA_String_equal(&desc1->applicationUri,
+                                       &desc2->applicationUri)) {
+                        result = true;
+                    }
+                }
+
+                UA_Variant_clear(&session1Desc);
+                UA_Variant_clear(&session2Desc);
+            }
         } else if(UA_String_equal(userId1, userId2)) {
             /* Same authenticated user - allow transfer */
             result = true;

From a234e474d6b870c4525e82127c4bdddc40ec7371 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Mon, 2 Mar 2026 16:36:22 +0100
Subject: [PATCH 1906/1963] fix: remove CTT references from anonymous user
 transfer comment

---
 plugins/ua_accesscontrol_default.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index e4471fdd444..8bd8dfe7c3c 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -268,11 +268,7 @@ allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
              *
              * Additionally, on unsecure connections (SecurityPolicy#None)
              * the ApplicationUri is not verified against a certificate,
-             * so the transfer must be rejected.
-             *
-             * CTT Err-017: Reject anonymous transfer on unsecure channel
-             * CTT 019: Allow anonymous transfer on secure channels if
-             *          the ApplicationUri matches */
+             * so the transfer must be rejected. */
 
             /* First check: Both sessions must use a secure channel
              * (not SecurityPolicy#None). The securityPolicyUri was

From 1040c4110cd04463959f2d5450ff0510d59ab95d Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Fri, 6 Mar 2026 14:51:42 +0100
Subject: [PATCH 1907/1963] fix(server): use && instead of || to correctly
 guard anonymous-only TransferSubscription path

---
 plugins/ua_accesscontrol_default.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index 8bd8dfe7c3c..ed6bdffc6e3 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -258,8 +258,8 @@ allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
         UA_String *userId1 = (UA_String*)session1UserId.data;
         UA_String *userId2 = (UA_String*)session2UserId.data;
         
-        if(userId1->length == 0 || userId2->length == 0) {
-            /* Anonymous user(s) detected.
+        if(userId1->length == 0 && userId2->length == 0) {
+            /* Both users are anonymous.
              * For anonymous users, the OPC UA specification requires
              * checking the ApplicationUri from the clientDescription
              * to verify that the same application is transferring the

From 861ff6845da4972c5543004bc40b5a13cbfc79a1 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Mon, 23 Feb 2026 09:06:01 +0100
Subject: [PATCH 1908/1963] fix(server): return BadWaitingForInitialData for
 empty non-nullable variables

---
 src/server/ua_services_attribute.c       |  32 ++++
 src/server/ua_services_nodemanagement.c  |  12 +-
 tests/server/check_services_attributes.c | 195 +++++++++++++++++++++++
 3 files changed, 234 insertions(+), 5 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 10909f56b6d..5336ad4f5dc 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -210,6 +210,26 @@ readValueAttributeFromDataSource(UA_Server *server, UA_Session *session,
     return retval;
 }
 
+/* OPC UA Part 6: Non-nullable built-in types are Boolean and the 
+ * numeric types (SByte..Double), StatusCode and Enumerations.
+ * All remaining built-in types are nullable. */
+static bool
+isNullableDataType(UA_Server *server, const UA_NodeId *dataType) {
+    const UA_DataType *type = UA_Server_findDataType(server, dataType);
+    if(!type)
+        return true; /* Unknown type */
+    if(UA_DataType_isNumeric(type))
+        return false;
+    switch(type->typeKind) {
+        case UA_DATATYPEKIND_BOOLEAN:
+        case UA_DATATYPEKIND_STATUSCODE:
+        case UA_DATATYPEKIND_ENUM:
+            return false;
+        default:
+            return true;
+    }
+}
+
 static UA_StatusCode
 readValueAttributeComplete(UA_Server *server, UA_Session *session,
                            const UA_VariableNode *vn, UA_TimestampsToReturn timestamps,
@@ -591,6 +611,18 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
         v->status = retval;
     }
 
+    /* OPC UA Part 4:  StatusCode Good is only permitted for nullable
+     * DataTypes. Non-nullable must have a Bad StatusCode
+     * when no value is available. */
+    if(v->hasValue && UA_Variant_isEmpty(&v->value) &&
+       (node->head.nodeClass == UA_NODECLASS_VARIABLE ||
+        node->head.nodeClass == UA_NODECLASS_VARIABLETYPE) &&
+       !isNullableDataType(server, &node->variableNode.dataType)) {
+        v->hasValue = false;
+        v->hasStatus = true;
+        v->status = UA_STATUSCODE_BADWAITINGFORINITIALDATA;
+    }
+
     /* Always use the current time as the server-timestamp */
     if(timestampsToReturn == UA_TIMESTAMPSTORETURN_SERVER ||
        timestampsToReturn == UA_TIMESTAMPSTORETURN_BOTH) {
diff --git a/src/server/ua_services_nodemanagement.c b/src/server/ua_services_nodemanagement.c
index 13dfdf2b599..e4f65961660 100644
--- a/src/server/ua_services_nodemanagement.c
+++ b/src/server/ua_services_nodemanagement.c
@@ -16,6 +16,7 @@
  *    Copyright 2021 (c) Christian von Arnim, ISW University of Stuttgart  (for VDW and umati)
  *    Copyright 2017 (c) Henrik Norrman
  *    Copyright 2021 (c) Fraunhofer IOSB (Author: Andreas Ebner)
+ *    Copyright 2026 (c) o6 Automation GmbH (Author: Andreas Ebner)
  */
 
 #include "ua_server_internal.h"
@@ -412,16 +413,17 @@ useVariableTypeAttributes(UA_Server *server, UA_Session *session,
     /* If no value is set, see if the vt provides one and copy it. This needs to
      * be done before copying the datatype from the vt, as setting the datatype
      * triggers a typecheck. */
-    UA_Variant orig;
-    UA_StatusCode retval =
-        readWithReadValue(server, &node->head.nodeId, UA_ATTRIBUTEID_VALUE, &orig);
+    UA_DataValue origDv;
+    UA_DataValue_init(&origDv);
+    UA_StatusCode retval = readValueAttribute(server, session, node, &origDv);
     if(retval != UA_STATUSCODE_GOOD)
         return retval;
 
-    if(orig.type) {
+    if(origDv.hasValue && origDv.value.type) {
         /* A value is present */
-        UA_Variant_clear(&orig);
+        UA_DataValue_clear(&origDv);
     } else {
+        UA_DataValue_clear(&origDv);
         UA_DataValue v;
         UA_DataValue_init(&v);
         retval = readValueAttribute(server, session, (const UA_VariableNode*)vt, &v);
diff --git a/tests/server/check_services_attributes.c b/tests/server/check_services_attributes.c
index caecdfd4df1..abbddebfe46 100644
--- a/tests/server/check_services_attributes.c
+++ b/tests/server/check_services_attributes.c
@@ -1391,6 +1391,191 @@ START_TEST(CheckDescriptionLocalization) {
     UA_LocalizedText_clear(&lt);
 } END_TEST
 
+static UA_Server *nullValueServer = NULL;
+static UA_NodeId emptyUInt32NodeId;
+static UA_NodeId emptyStringNodeId;
+static UA_NodeId emptyByteStringNodeId;
+static UA_NodeId emptyDateTimeNodeId;
+static UA_NodeId emptyStructureNodeId;
+static UA_NodeId emptyDiagnosticInfoNodeId;
+
+static void setupNullValue(void) {
+    nullValueServer = UA_Server_new();
+    ck_assert(nullValueServer != NULL);
+    UA_ServerConfig *config = UA_Server_getConfig(nullValueServer);
+    UA_ServerConfig_setDefault(config);
+    /* Allow adding variables without a value so we can test the read path */
+    config->allowEmptyVariables = UA_RULEHANDLING_ACCEPT;
+
+    UA_VariableAttributes attr = UA_VariableAttributes_default;
+    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
+    attr.valueRank = UA_VALUERANK_SCALAR;
+    UA_StatusCode retval;
+
+    /* Non-nullable: UInt32 without value */
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "EmptyUInt32");
+    attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_UINT32);
+    retval = UA_Server_addVariableNode(
+        nullValueServer, UA_NODEID_NULL,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+        UA_QUALIFIEDNAME(1, "EmptyUInt32"),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+        attr, NULL, &emptyUInt32NodeId);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Nullable: String without value */
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "EmptyString");
+    attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_STRING);
+    retval = UA_Server_addVariableNode(
+        nullValueServer, UA_NODEID_NULL,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+        UA_QUALIFIEDNAME(1, "EmptyString"),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+        attr, NULL, &emptyStringNodeId);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Nullable: ByteString without value */
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "EmptyByteString");
+    attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_BYTESTRING);
+    retval = UA_Server_addVariableNode(
+        nullValueServer, UA_NODEID_NULL,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+        UA_QUALIFIEDNAME(1, "EmptyByteString"),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+        attr, NULL, &emptyByteStringNodeId);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Nullable: DateTime without value */
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "EmptyDateTime");
+    attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_DATETIME);
+    retval = UA_Server_addVariableNode(
+        nullValueServer, UA_NODEID_NULL,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+        UA_QUALIFIEDNAME(1, "EmptyDateTime"),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+        attr, NULL, &emptyDateTimeNodeId);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Nullable: Structure (ExtensionObject) without value */
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "EmptyStructure");
+    attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_STRUCTURE);
+    retval = UA_Server_addVariableNode(
+        nullValueServer, UA_NODEID_NULL,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+        UA_QUALIFIEDNAME(1, "EmptyStructure"),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+        attr, NULL, &emptyStructureNodeId);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* Nullable: DiagnosticInfo without value */
+    attr.displayName = UA_LOCALIZEDTEXT("en-US", "EmptyDiagnosticInfo");
+    attr.dataType = UA_NODEID_NUMERIC(0, UA_NS0ID_DIAGNOSTICINFO);
+    retval = UA_Server_addVariableNode(
+        nullValueServer, UA_NODEID_NULL,
+        UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
+        UA_QUALIFIEDNAME(1, "EmptyDiagnosticInfo"),
+        UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+        attr, NULL, &emptyDiagnosticInfoNodeId);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+}
+
+static void teardownNullValue(void) {
+    UA_NodeId_clear(&emptyUInt32NodeId);
+    UA_NodeId_clear(&emptyStringNodeId);
+    UA_NodeId_clear(&emptyByteStringNodeId);
+    UA_NodeId_clear(&emptyDateTimeNodeId);
+    UA_NodeId_clear(&emptyStructureNodeId);
+    UA_NodeId_clear(&emptyDiagnosticInfoNodeId);
+    UA_Server_delete(nullValueServer);
+}
+
+/* Non-nullable variable (UInt32) with no value must return Bad StatusCode. */
+START_TEST(ReadEmptyNonNullableValue) {
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = emptyUInt32NodeId;
+    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+
+    UA_DataValue dv = UA_Server_read(nullValueServer, &rvi,
+                                     UA_TIMESTAMPSTORETURN_NEITHER);
+    ck_assert(dv.hasStatus);
+    ck_assert_int_eq(dv.status, UA_STATUSCODE_BADWAITINGFORINITIALDATA);
+    ck_assert(!dv.hasValue || UA_Variant_isEmpty(&dv.value));
+    UA_DataValue_clear(&dv);
+} END_TEST
+
+/* String is nullable — empty variant with Good status is acceptable. */
+START_TEST(ReadEmptyNullableStringValue) {
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = emptyStringNodeId;
+    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+
+    UA_DataValue dv = UA_Server_read(nullValueServer, &rvi,
+                                     UA_TIMESTAMPSTORETURN_NEITHER);
+    /* Good status (no hasStatus or status==Good) is acceptable */
+    ck_assert(!dv.hasStatus || dv.status == UA_STATUSCODE_GOOD);
+    UA_DataValue_clear(&dv);
+} END_TEST
+
+/* ByteString is nullable — empty variant with Good status is acceptable. */
+START_TEST(ReadEmptyNullableByteStringValue) {
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = emptyByteStringNodeId;
+    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+
+    UA_DataValue dv = UA_Server_read(nullValueServer, &rvi,
+                                     UA_TIMESTAMPSTORETURN_NEITHER);
+    ck_assert(!dv.hasStatus || dv.status == UA_STATUSCODE_GOOD);
+    UA_DataValue_clear(&dv);
+} END_TEST
+
+/* DateTime is nullable per Part 6, Section 5.2.2 (Table 1). */
+START_TEST(ReadEmptyNullableDateTimeValue) {
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = emptyDateTimeNodeId;
+    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+
+    UA_DataValue dv = UA_Server_read(nullValueServer, &rvi,
+                                     UA_TIMESTAMPSTORETURN_NEITHER);
+    ck_assert(!dv.hasStatus || dv.status == UA_STATUSCODE_GOOD);
+    UA_DataValue_clear(&dv);
+} END_TEST
+
+/* Structure / ExtensionObject is nullable (Part 6, Section 5.2.2). */
+START_TEST(ReadEmptyNullableStructureValue) {
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = emptyStructureNodeId;
+    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+
+    UA_DataValue dv = UA_Server_read(nullValueServer, &rvi,
+                                     UA_TIMESTAMPSTORETURN_NEITHER);
+    ck_assert(!dv.hasStatus || dv.status == UA_STATUSCODE_GOOD);
+    UA_DataValue_clear(&dv);
+} END_TEST
+
+/* DiagnosticInfo is nullable (Part 6, Section 5.2.2). */
+START_TEST(ReadEmptyNullableDiagnosticInfoValue) {
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = emptyDiagnosticInfoNodeId;
+    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+
+    UA_DataValue dv = UA_Server_read(nullValueServer, &rvi,
+                                     UA_TIMESTAMPSTORETURN_NEITHER);
+    ck_assert(!dv.hasStatus || dv.status == UA_STATUSCODE_GOOD);
+    UA_DataValue_clear(&dv);
+} END_TEST
+
 static Suite * testSuite_services_attributes(void) {
     Suite *s = suite_create("services_attributes_read");
 
@@ -1470,6 +1655,16 @@ static Suite * testSuite_services_attributes(void) {
     tcase_add_test(tc_localization, CheckDescriptionLocalization);
     suite_add_tcase(s, tc_localization);
 
+    TCase *tc_nullValue = tcase_create("nullValueStatusCode");
+    tcase_add_checked_fixture(tc_nullValue, setupNullValue, teardownNullValue);
+    tcase_add_test(tc_nullValue, ReadEmptyNonNullableValue);
+    tcase_add_test(tc_nullValue, ReadEmptyNullableStringValue);
+    tcase_add_test(tc_nullValue, ReadEmptyNullableByteStringValue);
+    tcase_add_test(tc_nullValue, ReadEmptyNullableDateTimeValue);
+    tcase_add_test(tc_nullValue, ReadEmptyNullableStructureValue);
+    tcase_add_test(tc_nullValue, ReadEmptyNullableDiagnosticInfoValue);
+    suite_add_tcase(s, tc_nullValue);
+
     return s;
 }
 

From 0f2d70a7bf51f5cca8553fef463e3dca11aad0ba Mon Sep 17 00:00:00 2001
From: Moritz Bruder <mbruder@extern.o6-automation.com>
Date: Fri, 27 Feb 2026 16:50:28 +0100
Subject: [PATCH 1909/1963] fix(server): avoid returning
 BadWaitingForInitialData with other errors

---
 src/server/ua_services_attribute.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/server/ua_services_attribute.c b/src/server/ua_services_attribute.c
index 5336ad4f5dc..f0e49a5acba 100644
--- a/src/server/ua_services_attribute.c
+++ b/src/server/ua_services_attribute.c
@@ -613,8 +613,10 @@ ReadWithNode(const UA_Node *node, UA_Server *server, UA_Session *session,
 
     /* OPC UA Part 4:  StatusCode Good is only permitted for nullable
      * DataTypes. Non-nullable must have a Bad StatusCode
-     * when no value is available. */
-    if(v->hasValue && UA_Variant_isEmpty(&v->value) &&
+     * when no value is available. Only apply this check if no other
+     * error has occurred. */
+    if(retval == UA_STATUSCODE_GOOD &&
+       v->hasValue && UA_Variant_isEmpty(&v->value) &&
        (node->head.nodeClass == UA_NODECLASS_VARIABLE ||
         node->head.nodeClass == UA_NODECLASS_VARIABLETYPE) &&
        !isNullableDataType(server, &node->variableNode.dataType)) {

From d6fb639f29b964fc68f2e443b461f60456424810 Mon Sep 17 00:00:00 2001
From: "aaghash.r" <aaghash17@gmail.com>
Date: Tue, 10 Mar 2026 03:11:12 +0530
Subject: [PATCH 1910/1963] fix(client): update status codes for error masking

---
 src/client/ua_client.c                    | 1 -
 tests/client/check_client_securechannel.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index cfbadfa9e2a..73d291b9c11 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -437,7 +437,6 @@ receiveResponse(UA_Client *client, void *response, const UA_DataType *responseTy
                                    "Receiving the response failed with StatusCode %s",
                                    UA_StatusCode_name(retval));
             closeSecureChannel(client);
-            retval = UA_STATUSCODE_BADCONNECTIONCLOSED;
             break;
         }
         now = UA_DateTime_nowMonotonic();
diff --git a/tests/client/check_client_securechannel.c b/tests/client/check_client_securechannel.c
index a536912f507..f6bd96955e7 100644
--- a/tests/client/check_client_securechannel.c
+++ b/tests/client/check_client_securechannel.c
@@ -160,7 +160,7 @@ START_TEST(SecureChannel_networkfail) {
     UA_Variant_init(&val);
     UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);
-    ck_assert(retval == UA_STATUSCODE_BADCONNECTIONCLOSED);
+    ck_assert(retval == UA_STATUSCODE_BADSECURECHANNELCLOSED);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);
@@ -205,7 +205,7 @@ START_TEST(SecureChannel_cableunplugged) {
     client->connection.recv = UA_Client_recvTesting;
 
     /* Simulate network cable unplugged (no response from server) */
-    UA_Client_recvTesting_result = UA_STATUSCODE_BADINTERNALERROR;
+    UA_Client_recvTesting_result = UA_STATUSCODE_BADCONNECTIONCLOSED;
 
     UA_Variant_init(&val);
     retval = UA_Client_readValueAttribute(client, nodeId, &val);

From 92a2a0eb6d0203e49eca3896e7f36b869637530b Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Tue, 10 Mar 2026 10:30:17 +0100
Subject: [PATCH 1911/1963] refactor(ci): use open62541 CI images and remove
 redundant deps

---
 .github/workflows/build_linux.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 58611f6620c..86dea91e0ba 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -92,14 +92,14 @@ jobs:
             build:
               name: "Debug Build & Unit Tests (clang-18)"
               cmd_deps: sudo apt-get install -y -qq clang-18 clang-tools-18 && sudo sysctl -w vm.mmap_rnd_bits=28
-              cmd_action: CC=clang-18 CXX=clang++-18 unit_tests          
+              cmd_action: CC=clang-18 CXX=clang++-18 unit_tests
           
           # TPM Tool Builds for specific Ubuntu versions
           - os: ubuntu-20.04
             build:
               name: "TPM Tool Build ubuntu-20.04"
               cmd_deps: |
-                sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev
+                sudo apt-get install -y -qq acl autoconf autoconf-archive automake doxygen iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libsqlite3-dev libtool libyaml-dev procps python3-pip sqlite3 udev uthash-dev
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-tss.git
                 cd ${HOME}/tpm2-tss
@@ -127,7 +127,7 @@ jobs:
             build:
               name: "TPM Tool Build ubuntu-22.04"
               cmd_deps: |
-                sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev
+                sudo apt-get install -y -qq acl autoconf autoconf-archive automake doxygen iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libsqlite3-dev libtool libyaml-dev procps python3-pip sqlite3 udev uthash-dev
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-tss.git
                 cd ${HOME}/tpm2-tss
@@ -155,7 +155,7 @@ jobs:
             build:
               name: "TPM Tool Build ubuntu-24.04"
               cmd_deps: |
-                sudo apt-get install -y -qq acl autoconf autoconf-archive automake build-essential cmake doxygen gcc git iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libssl-dev libsqlite3-dev libtool libyaml-dev pkg-config procps python3-pip sqlite3 udev uthash-dev libltdl-dev python3-pyasn1-modules
+                sudo apt-get install -y -qq acl autoconf autoconf-archive automake doxygen iproute2 libcurl4-openssl-dev libjson-c-dev libcmocka0 libcmocka-dev libgcrypt20-dev libglib2.0-dev libini-config-dev libmbedtls-dev libsqlite3-dev libtool libyaml-dev procps python3-pip sqlite3 udev uthash-dev libltdl-dev python3-pyasn1-modules
                 cd ${HOME}
                 git clone https://github.com/tpm2-software/tpm2-tss.git
                 cd ${HOME}/tpm2-tss
@@ -221,7 +221,7 @@ jobs:
     name: ${{ matrix.os }}-${{ matrix.build.name }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/marwinglaser/ci:${{ matrix.os }}
+      image: ghcr.io/open62541/open62541-ci:${{ matrix.os }}
       options: --privileged
     services:
       mosquitto:
@@ -247,8 +247,7 @@ jobs:
         if: matrix.build.os == '' || matrix.build.os == matrix.os
         run: |
           sudo apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential cmake libcap2-bin pkg-config libssl-dev python3-sphinx graphviz check libxml2-dev libpcap-dev
-          ${{ matrix.build.cmd_deps }}      
+          ${{ matrix.build.cmd_deps }}
       - name: ${{ matrix.build.name }}
         if: matrix.build.os == '' || matrix.build.os == matrix.os
         shell: bash

From 7b8e6745952b09398bfd70abcfe67f0c979e6037 Mon Sep 17 00:00:00 2001
From: AntonMoryakov <128409352+AntonMoryakov@users.noreply.github.com>
Date: Fri, 13 Mar 2026 19:16:08 +0300
Subject: [PATCH 1912/1963] fix(pubsub): prevent null pointer dereference in
 removeGroupAction

---
 src/pubsub/ua_pubsub_ns0.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 1875be29ac9..0fdf0731d6a 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -1532,17 +1532,19 @@ removeGroupAction(UA_Server *server,
                   size_t inputSize, const UA_Variant *input,
                   size_t outputSize, UA_Variant *output){
     UA_NodeId nodeToRemove = *((UA_NodeId *)input->data);
-    if(UA_WriterGroup_findWGbyId(server, nodeToRemove)) {
-        UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, nodeToRemove);
+    UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, nodeToRemove);
+    if(wg) {
         if(wg->configurationFrozen)
             UA_Server_unfreezeWriterGroupConfiguration(server, nodeToRemove);
         return UA_Server_removeWriterGroup(server, nodeToRemove);
-    } else {
-        UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, nodeToRemove);
-        if(rg->configurationFrozen)
-            UA_Server_unfreezeReaderGroupConfiguration(server, nodeToRemove);
-        return UA_Server_removeReaderGroup(server, nodeToRemove);
     }
+    UA_ReaderGroup *rg = UA_ReaderGroup_findRGbyId(server, nodeToRemove);
+    if(!rg)
+        return UA_STATUSCODE_BADNODEIDUNKNOWN;
+
+    if(rg->configurationFrozen)
+        UA_Server_unfreezeReaderGroupConfiguration(server, nodeToRemove);
+    return UA_Server_removeReaderGroup(server, nodeToRemove);
 }
 
 /**********************************************/

From fbcc926fd6aa91b7a6c81784526c240b07302533 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Mon, 16 Mar 2026 15:07:42 +0100
Subject: [PATCH 1913/1963] fix(ex): handle return values of fseek and ftell
 while parsing a certificate file Currently, the return value of fseek is
 completely ignored, even on failure. The same case holds for ftell, where a
 negative return value due to some failure is just written to the length of
 `fileContents`. By introducing checks on the respective return values, those
 cases can be handled properly.

---
 examples/common.h | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/examples/common.h b/examples/common.h
index 75abc132f3e..8d1762e3db6 100644
--- a/examples/common.h
+++ b/examples/common.h
@@ -31,11 +31,28 @@ loadFile(const char *const path) {
     }
 
     /* Get the file length, allocate the data and read */
-    fseek(fp, 0, SEEK_END);
-    fileContents.length = (size_t)ftell(fp);
+    if(fseek(fp, 0, SEEK_END) != 0) {
+        fclose(fp);
+        errno = 0;
+        return fileContents;
+    }
+
+    long length = ftell(fp);
+    if(length < 0) {
+        fclose(fp);
+        errno = 0;
+        return fileContents;
+    }
+
+    fileContents.length = (size_t)length;
     fileContents.data = (UA_Byte *)UA_malloc(fileContents.length * sizeof(UA_Byte));
     if(fileContents.data) {
-        fseek(fp, 0, SEEK_SET);
+        if(fseek(fp, 0, SEEK_SET) != 0) {
+            fclose(fp);
+            UA_ByteString_clear(&fileContents);
+            errno = 0;
+            return fileContents;
+        }
         size_t read = fread(fileContents.data, sizeof(UA_Byte), fileContents.length, fp);
         if(read != fileContents.length)
             UA_ByteString_clear(&fileContents);

From c7b70d26fea33d115a2cfca774675ae9db6f5ce7 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Mon, 16 Mar 2026 15:08:29 +0100
Subject: [PATCH 1914/1963] fix(test): handle return values of fseek and ftell
 while parsing a certificate file Currently, the return value of fseek is
 completely ignored, even on failure. The same case holds for ftell, where a
 negative return value due to some failure is just written to the length of
 `fileContents`. By introducing checks on the respective return values, those
 cases can be handled properly.

---
 tests/common.h | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/tests/common.h b/tests/common.h
index b8e39d68c91..76db4b87d1e 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -22,11 +22,28 @@ loadFile(const char *const path) {
     }
 
     /* Get the file length, allocate the data and read */
-    fseek(fp, 0, SEEK_END);
-    fileContents.length = (size_t)ftell(fp);
+    if(fseek(fp, 0, SEEK_END) != 0) {
+        fclose(fp);
+        errno = 0;
+        return fileContents;
+    }
+
+    long length = ftell(fp);
+    if(length < 0) {
+        fclose(fp);
+        errno = 0;
+        return fileContents;
+    }
+
+    fileContents.length = (size_t)length;
     fileContents.data = (UA_Byte *)UA_malloc(fileContents.length * sizeof(UA_Byte));
     if(fileContents.data) {
-        fseek(fp, 0, SEEK_SET);
+        if(fseek(fp, 0, SEEK_SET) != 0) {
+            fclose(fp);
+            UA_ByteString_clear(&fileContents);
+            errno = 0;
+            return fileContents;
+        }
         size_t read = fread(fileContents.data, sizeof(UA_Byte), fileContents.length, fp);
         if(read != fileContents.length)
             UA_ByteString_clear(&fileContents);

From 3c1e63e9f3fece30a82a3609cfe36a0c8c1b1430 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Tue, 17 Mar 2026 10:37:18 +0100
Subject: [PATCH 1915/1963] fix(pubsub): prevent potential double-free in NS0
 type destructors In `publishedDataItemsTypeDestructor` and
 `standaloneSubscribedDataSetTypeDestructor`, `getNodeContext` was called
 unconditionally before checking whether `findSingleChildNode` returned a
 valid non-null NodeId. When `findSingleChildNode` fails and returns a null
 NodeId, `getNodeContext` also fails and leaves the childContext pointer
 unchanged, retaining the value written by the previous `getNodeContext` call
 in the same function. If a subsequent null-check guard were to pass
 spuriously, that same pointer could be freed a second time. Fix by moving
 `getNodeContext` inside the `UA_NodeId_isNull` guard so it is only called
 when a valid child node was actually found.

---
 src/pubsub/ua_pubsub_ns0.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/pubsub/ua_pubsub_ns0.c b/src/pubsub/ua_pubsub_ns0.c
index 0fdf0731d6a..f8062cc7dd5 100644
--- a/src/pubsub/ua_pubsub_ns0.c
+++ b/src/pubsub/ua_pubsub_ns0.c
@@ -2266,22 +2266,25 @@ publishedDataItemsTypeDestructor(UA_Server *server,
     void *childContext;
     UA_NodeId node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "PublishedData"),
                                          UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
-    getNodeContext(server, node, (void**)&childContext);
-    if(!UA_NodeId_isNull(&node))
+    if(!UA_NodeId_isNull(&node)) {
+        getNodeContext(server, node, (void**)&childContext);
         UA_free(childContext);
+    }
 
     node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "ConfigurationVersion"),
                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
                                *nodeId);
-    getNodeContext(server, node, (void**)&childContext);
-    if(!UA_NodeId_isNull(&node))
+    if(!UA_NodeId_isNull(&node)) {
+        getNodeContext(server, node, (void**)&childContext);
         UA_free(childContext);
+    }
 
     node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
-    getNodeContext(server, node, (void**)&childContext);
-    if(!UA_NodeId_isNull(&node))
+    if(!UA_NodeId_isNull(&node)) {
+        getNodeContext(server, node, (void**)&childContext);
         UA_free(childContext);
+    }
 }
 
 static void
@@ -2296,15 +2299,17 @@ standaloneSubscribedDataSetTypeDestructor(UA_Server *server,
     UA_NodeId node =
         findSingleChildNode(server, UA_QUALIFIEDNAME(0, "DataSetMetaData"),
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY), *nodeId);
-    getNodeContext(server, node, (void**)&childContext);
-    if(!UA_NodeId_equal(&UA_NODEID_NULL , &node))
+    if(!UA_NodeId_isNull(&node)) {
+        getNodeContext(server, node, (void**)&childContext);
         UA_free(childContext);
+    }
     node = findSingleChildNode(server, UA_QUALIFIEDNAME(0, "IsConnected"),
                                UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
                                *nodeId);
-    getNodeContext(server, node, (void**)&childContext);
-    if(!UA_NodeId_equal(&UA_NODEID_NULL , &node))
+    if(!UA_NodeId_isNull(&node)) {
+        getNodeContext(server, node, (void**)&childContext);
         UA_free(childContext);
+    }
 }
 
 /*************************************/

From 12a44097f824b803afe917d6a3d700bbcecaeb27 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Thu, 19 Mar 2026 16:01:54 +0100
Subject: [PATCH 1916/1963] fix(plugin): handle return values of fseek and
 ftell while parsing a certificate file Currently, the return value of fseek
 is completely ignored, even on failure. The same case holds for ftell, where
 a negative return value due to some failure is just written to the length of
 `fileContents`. By introducing checks on the respective return values, those
 cases can be handled properly.

---
 plugins/ua_config_json.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/plugins/ua_config_json.c b/plugins/ua_config_json.c
index 8886e68a4e5..0c755c171e6 100644
--- a/plugins/ua_config_json.c
+++ b/plugins/ua_config_json.c
@@ -1074,11 +1074,28 @@ loadCertificateFile(const char *const path) {
     }
 
     /* Get the file length, allocate the data and read */
-    fseek(fp, 0, SEEK_END);
-    fileContents.length = (size_t)ftell(fp);
+    if(fseek(fp, 0, SEEK_END) != 0) {
+        fclose(fp);
+        errno = 0;
+        return fileContents;
+    }
+
+    long length = ftell(fp);
+    if(length < 0) {
+        fclose(fp);
+        errno = 0;
+        return fileContents;
+    }
+
+    fileContents.length = (size_t)length;
     fileContents.data = (UA_Byte *)UA_malloc(fileContents.length * sizeof(UA_Byte));
     if(fileContents.data) {
-        fseek(fp, 0, SEEK_SET);
+        if(fseek(fp, 0, SEEK_SET) != 0) {
+            fclose(fp);
+            UA_ByteString_clear(&fileContents);
+            errno = 0;
+            return fileContents;
+        }
         size_t read = fread(fileContents.data, sizeof(UA_Byte), fileContents.length, fp);
         if(read != fileContents.length)
             UA_ByteString_clear(&fileContents);

From 9adf5cb2b7a6ed3ab42d87dad7dd6552a7bc7312 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Tue, 17 Mar 2026 15:52:31 +0100
Subject: [PATCH 1917/1963] refactor(server): eliminate intentional integer
 underflow in UA_Node_deleteReferencesSubset By replacing the for with a while
 loop with explicit incrementation of the counter only on advance, an
 intentional underflow of the counter is eliminated. This did not produce any
 bug, but the intent wasn't self-evident.

---
 src/server/ua_nodes.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/server/ua_nodes.c b/src/server/ua_nodes.c
index eca2c1decc4..f03b5818f48 100644
--- a/src/server/ua_nodes.c
+++ b/src/server/ua_nodes.c
@@ -1091,11 +1091,14 @@ UA_Node_deleteReference(UA_Node *node, UA_Byte refTypeIndex, UA_Boolean isForwar
 void
 UA_Node_deleteReferencesSubset(UA_Node *node, const UA_ReferenceTypeSet *keepSet) {
     UA_NodeHead *head = &node->head;
-    for(size_t i = 0; i < head->referencesSize; i++) {
+    size_t i = 0;
+    while (i < head->referencesSize) {
         /* Keep the references of this type? */
         UA_NodeReferenceKind *refs = &head->references[i];
-        if(UA_ReferenceTypeSet_contains(keepSet, refs->referenceTypeIndex))
+        if(UA_ReferenceTypeSet_contains(keepSet, refs->referenceTypeIndex)){
+            i++;
             continue;
+        }
 
         /* Remove all target entries. Don't remove entries from browseName tree.
          * The entire ReferenceKind will be removed anyway. */
@@ -1110,12 +1113,11 @@ UA_Node_deleteReferencesSubset(UA_Node *node, const UA_ReferenceTypeSet *keepSet
         }
 
         /* Move last references-kind entry to this position. Don't memcpy over
-         * the same position. Decrease i to repeat at this location. */
+         * the same position. Don't increment i: the swapped-in element must be
+         * checked on the next iteration. */
         head->referencesSize--;
-        if(i != head->referencesSize) {
+        if(i != head->referencesSize)
             head->references[i] = head->references[head->referencesSize];
-            i--;
-        }
     }
 
     if(head->referencesSize > 0) {

From bdd2fc79c072150a75ff12fde23dbb3205c02425 Mon Sep 17 00:00:00 2001
From: Roman Sinawski <r.sinawski@pilz.de>
Date: Mon, 20 Apr 2026 06:50:20 +0200
Subject: [PATCH 1918/1963] fix(core): Fix the case where the last chunk may
 exceed the max message size

---
 src/ua_securechannel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_securechannel.c b/src/ua_securechannel.c
index 80890301a51..03b94ef8bb5 100644
--- a/src/ua_securechannel.c
+++ b/src/ua_securechannel.c
@@ -899,7 +899,7 @@ UA_SecureChannel_getCompleteMessage(UA_SecureChannel *channel,
 
     /* Validate the assembled message size */
     if(channel->config.localMaxMessageSize != 0 &&
-       channel->chunksLength > channel->config.localMaxMessageSize) {
+       messageSize > channel->config.localMaxMessageSize) {
         if(chunk.copied)
             UA_ByteString_clear(&chunk.bytes);
         return UA_STATUSCODE_BADTCPMESSAGETOOLARGE;

From c132505de13914c4e6bd77046e3aab09696c068d Mon Sep 17 00:00:00 2001
From: Alexander Karzhenkov <karzhenkov@mail.ru>
Date: Mon, 27 Apr 2026 21:09:38 +0500
Subject: [PATCH 1919/1963] fix(plugins): Directly keep logging pointer in
 CertInfo structure for mbedTLS (#7995)

Prevents a crash during UA_Server_newWithConfig where the configuration relied on immutable pointers before.
---
 plugins/crypto/mbedtls/ua_pki_mbedtls.c       |   8 +-
 plugins/crypto/openssl/ua_pki_openssl.c       |  26 ++--
 tests/CMakeLists.txt                          |   2 +
 ...ck_encryption_basic256sha256_with_config.c | 122 ++++++++++++++++++
 4 files changed, 141 insertions(+), 17 deletions(-)
 create mode 100644 tests/encryption/check_encryption_basic256sha256_with_config.c

diff --git a/plugins/crypto/mbedtls/ua_pki_mbedtls.c b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
index 46bbbcffa9f..137157cd426 100644
--- a/plugins/crypto/mbedtls/ua_pki_mbedtls.c
+++ b/plugins/crypto/mbedtls/ua_pki_mbedtls.c
@@ -85,7 +85,7 @@ static UA_ByteString copyDataFormatAware(const UA_ByteString *data)
 }
 
 typedef struct {
-    UA_CertificateVerification *cv;
+    const UA_Logger *logging;
 
     /* If the folders are defined, we use them to reload the certificates during
      * runtime */
@@ -323,7 +323,7 @@ mbedtlsCheckRevoked(CertInfo *ci, mbedtls_x509_crt *cert) {
     UA_String issuerName = {(size_t)nameLen, (UA_Byte*)inbuf};
 
     if(ci->certificateRevocationList.raw.len == 0) {
-        UA_LOG_WARNING(ci->cv->logging, UA_LOGCATEGORY_SECURITYPOLICY,
+        UA_LOG_WARNING(ci->logging, UA_LOGCATEGORY_SECURITYPOLICY,
                        "Zero revocation lists have been loaded. "
                        "This seems intentional - omitting the check.");
         return UA_STATUSCODE_GOOD;
@@ -650,7 +650,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
     if(!ci)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     memset(ci, 0, sizeof(CertInfo));
-    ci->cv = cv;
+    ci->logging = cv->logging;
     mbedtls_x509_crt_init(&ci->certificateTrustList);
     mbedtls_x509_crl_init(&ci->certificateRevocationList);
     mbedtls_x509_crt_init(&ci->certificateIssuerList);
@@ -732,7 +732,7 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
     if(!ci)
         return UA_STATUSCODE_BADOUTOFMEMORY;
     memset(ci, 0, sizeof(CertInfo));
-    ci->cv = cv;
+    ci->logging = cv->logging;
     mbedtls_x509_crt_init(&ci->certificateTrustList);
     mbedtls_x509_crl_init(&ci->certificateRevocationList);
     mbedtls_x509_crt_init(&ci->certificateIssuerList);
diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
index 211450c3c48..3b987852211 100644
--- a/plugins/crypto/openssl/ua_pki_openssl.c
+++ b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -77,7 +77,7 @@ typedef struct {
     STACK_OF(X509) *      skTrusted;
     STACK_OF(X509_CRL) *  skCrls; /* Revocation list*/
 
-    UA_CertificateVerification *cv;
+    const UA_Logger *logging;
 } CertContext;
 
 static UA_StatusCode
@@ -107,7 +107,7 @@ UA_CertContext_Init (CertContext * context, UA_CertificateVerification *cv) {
     UA_ByteString_init (&context->revocationListFolder);
     UA_ByteString_init (&context->rejectedListFolder);
 
-    context->cv = cv;
+    context->logging = cv->logging;
 
     return UA_CertContext_sk_Init (context);
 }
@@ -127,7 +127,7 @@ UA_CertificateVerification_clear (UA_CertificateVerification * cv) {
     UA_ByteString_clear (&context->rejectedListFolder);
 
     UA_CertContext_sk_free (context);
-    context->cv = NULL;
+    context->logging = NULL;
     UA_free (context);
 
     memset(cv, 0, sizeof(UA_CertificateVerification));
@@ -291,7 +291,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     UA_ByteString_init (&strCert);
 
     if (ctx->trustListFolder.length > 0) {
-        UA_LOG_INFO(ctx->cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
+        UA_LOG_INFO(ctx->logging, UA_LOGCATEGORY_SERVER, "Reloading the trust-list");
 
         sk_X509_pop_free (ctx->skTrusted, X509_free);
         ctx->skTrusted = sk_X509_new_null();
@@ -312,12 +312,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO(ctx->cv->logging, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO(ctx->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skTrusted_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -331,7 +331,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->issuerListFolder.length > 0) {
-        UA_LOG_INFO(ctx->cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
+        UA_LOG_INFO(ctx->logging, UA_LOGCATEGORY_SERVER, "Reloading the issuer-list");
 
         sk_X509_pop_free (ctx->skIssue, X509_free);
         ctx->skIssue = sk_X509_new_null();
@@ -351,12 +351,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to load the certificate file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skIssuer_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the certificate file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -370,7 +370,7 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
     }
 
     if (ctx->revocationListFolder.length > 0) {
-        UA_LOG_INFO(ctx->cv->logging, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
+        UA_LOG_INFO(ctx->logging, UA_LOGCATEGORY_SERVER, "Reloading the revocation-list");
 
         sk_X509_CRL_pop_free (ctx->skCrls, X509_CRL_free);
         ctx->skCrls = sk_X509_CRL_new_null();
@@ -390,12 +390,12 @@ UA_ReloadCertFromFolder (CertContext * ctx) {
             }
             ret = UA_loadCertFromFile (certFile, &strCert);
             if (ret != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to load the revocation file %s", certFile);
                 continue;  /* continue or return ? */
             }
             if (UA_skCrls_Cert2X509 (&strCert, 1, ctx) != UA_STATUSCODE_GOOD) {
-                UA_LOG_INFO (ctx->cv->logging, UA_LOGCATEGORY_SERVER,
+                UA_LOG_INFO (ctx->logging, UA_LOGCATEGORY_SERVER,
                             "Failed to decode the revocation file %s", certFile);
                 UA_ByteString_clear (&strCert);
                 continue;  /* continue or return ? */
@@ -529,7 +529,7 @@ openSSLCheckRevoked(CertContext *ctx, X509 *cert) {
     int size = sk_X509_CRL_num(ctx->skCrls);
 
     if(size == 0) {
-        UA_LOG_WARNING(ctx->cv->logging, UA_LOGCATEGORY_SECURITYPOLICY,
+        UA_LOG_WARNING(ctx->logging, UA_LOGCATEGORY_SECURITYPOLICY,
                        "Zero revocation lists have been loaded. "
                        "This seems intentional - omitting the check.");
         return UA_STATUSCODE_GOOD;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1a37ce04c4b..1494090e000 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -449,6 +449,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS)
     ua_add_test(encryption/check_encryption_basic128rsa15.c)
     ua_add_test(encryption/check_encryption_basic256.c)
     ua_add_test(encryption/check_encryption_basic256sha256.c)
+    ua_add_test(encryption/check_encryption_basic256sha256_with_config.c)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
     ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
     ua_add_test(encryption/check_username_connect_none.c)
@@ -464,6 +465,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL OR UA_ENABLE_ENCRYPTION_LIBRESSL)
     ua_add_test(encryption/check_encryption_basic128rsa15.c)
     ua_add_test(encryption/check_encryption_basic256.c)
     ua_add_test(encryption/check_encryption_basic256sha256.c)
+    ua_add_test(encryption/check_encryption_basic256sha256_with_config.c)
     ua_add_test(encryption/check_encryption_aes128sha256rsaoaep.c)
     ua_add_test(encryption/check_encryption_aes256sha256rsapss.c)
     ua_add_test(encryption/check_encryption_key_password.c)
diff --git a/tests/encryption/check_encryption_basic256sha256_with_config.c b/tests/encryption/check_encryption_basic256sha256_with_config.c
new file mode 100644
index 00000000000..1887aeae8dd
--- /dev/null
+++ b/tests/encryption/check_encryption_basic256sha256_with_config.c
@@ -0,0 +1,122 @@
+#include <open62541/client.h>
+#include <open62541/client_config_default.h>
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+
+#include "certificates.h"
+#include "check.h"
+#include "thread_wrapper.h"
+
+UA_Server *server;
+UA_Boolean running;
+THREAD_HANDLE server_thread;
+
+const size_t trustListSize = 0;
+const UA_ByteString *const trustList = NULL;
+
+const size_t revocationListSize = 0;
+const UA_ByteString *const revocationList = NULL;
+
+static void initialize_server_config(UA_ServerConfig *config) {
+    const UA_ByteString certificate = {CERT_DER_LENGTH, CERT_DER_DATA};
+    const UA_ByteString privateKey = {KEY_DER_LENGTH, KEY_DER_DATA};
+
+    const size_t trustListSize = 1;
+    const UA_ByteString trustList[1] = {{ROOT_CERT_DER_LENGTH, ROOT_CERT_DER_DATA}};
+
+    const size_t issuerListSize = 1;
+    const UA_ByteString issuerList[1] = {{INTERMEDIATE_CERT_DER_LENGTH, INTERMEDIATE_CERT_DER_DATA}};
+
+    UA_ServerConfig_setDefaultWithSecurityPolicies(config, 4840, &certificate, &privateKey,
+                                                   trustList, trustListSize,
+                                                   issuerList, issuerListSize,
+                                                   revocationList, revocationListSize);
+
+    UA_String_clear(&config->applicationDescription.applicationUri);
+    config->applicationDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+}
+
+static UA_Server *create_server(void) {
+    static UA_ServerConfig config;
+    memset(&config, 0, sizeof(config));
+    initialize_server_config(&config);
+
+    /* move config into the server */
+    UA_Server *server = UA_Server_newWithConfig(&config);
+
+    /* config should no longer be used;
+     * if it was a stack variable, it would be destroyed on return;
+     * the following assignment should have no effect;
+     * however, it causes a crash in v1.4.16 */
+    config.secureChannelPKI.logging = (UA_Logger *)1;
+
+    return server;
+}
+
+THREAD_CALLBACK(serverloop) {
+    while(running)
+        UA_Server_run_iterate(server, true);
+    return 0;
+}
+
+static void setup(void) {
+    server = create_server();
+    ck_assert(server != NULL);
+
+    running = true;
+    UA_Server_run_startup(server);
+    THREAD_CREATE(server_thread, serverloop);
+}
+
+static void teardown(void) {
+    running = false;
+    THREAD_JOIN(server_thread);
+    UA_Server_run_shutdown(server);
+    UA_Server_delete(server);
+}
+
+START_TEST(encryption_connect) {
+    const UA_ByteString certificate = {APPLICATION_CERT_DER_LENGTH, APPLICATION_CERT_DER_DATA};
+    const UA_ByteString privateKey = {APPLICATION_KEY_DER_LENGTH, APPLICATION_KEY_DER_DATA};
+
+    UA_Client *client = UA_Client_new();
+    ck_assert(client != NULL);
+
+    UA_ClientConfig *config = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefaultEncryption(config, certificate, privateKey,
+                                         trustList, trustListSize,
+                                         revocationList, revocationListSize);
+
+    UA_String_clear(&config->clientDescription.applicationUri);
+    config->clientDescription.applicationUri =
+        UA_STRING_ALLOC("urn:unconfigured:application");
+
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+static Suite* testSuite_encryption(void) {
+    Suite *s = suite_create("Encryption");
+    TCase *tc_encryption = tcase_create("Encryption basic256sha256 (copy config)");
+    tcase_add_checked_fixture(tc_encryption, setup, teardown);
+#ifdef UA_ENABLE_ENCRYPTION
+    tcase_add_test(tc_encryption, encryption_connect);
+#endif /* UA_ENABLE_ENCRYPTION */
+    suite_add_tcase(s,tc_encryption);
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_encryption();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From cbc25384f0b3cba391fe721cb5902de44412cfa2 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Fri, 1 May 2026 11:43:06 +0200
Subject: [PATCH 1920/1963] refactor(client): Put all error handling that
 aborts the connection through a single setConnectStatus method

---
 src/client/ua_client.c          |  11 ++
 src/client/ua_client_connect.c  | 244 +++++++++++++++-----------------
 src/client/ua_client_internal.h |   1 +
 3 files changed, 130 insertions(+), 126 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index ac3af292a9e..c4a54725b61 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -270,6 +270,17 @@ static const char *sessionStateTexts[6] =
      "ActivateRequested", "Activated", "Closing"};
 #endif
 
+void
+setConnectStatus(UA_Client *client, UA_StatusCode status) {
+    UA_LOCK_ASSERT(&client->clientMutex, 1);
+
+    client->connectStatus = status;
+    if(status != UA_STATUSCODE_GOOD)
+        closeSecureChannel(client);
+
+    notifyClientState(client);
+}
+
 void
 notifyClientState(UA_Client *client) {
     UA_LOCK_ASSERT(&client->clientMutex, 1);
diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index f6dd974fa09..89d60192067 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -418,15 +418,14 @@ void
 processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
     size_t offset = 0;
     UA_TcpErrorMessage errMessage;
-    client->connectStatus =
+    UA_StatusCode res =
         UA_decodeBinaryInternal(chunk, &offset, &errMessage,
                                 &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE], NULL);
-    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR_CHANNEL(client->config.logging, &client->channel,
                              "Received an ERR response that could not be decoded "
-                             "with StatusCode %s",
-                             UA_StatusCode_name(client->connectStatus));
-        closeSecureChannel(client);
+                             "with StatusCode %s", UA_StatusCode_name(res));
+        setConnectStatus(client, res);
         return;
     }
 
@@ -434,8 +433,9 @@ processERRResponse(UA_Client *client, const UA_ByteString *chunk) {
                          "Received an ERR response with StatusCode %s and the following "
                          "reason: %.*s", UA_StatusCode_name(errMessage.error),
                          (int)errMessage.reason.length, errMessage.reason.data);
-    client->connectStatus = errMessage.error;
-    closeSecureChannel(client);
+
+    setConnectStatus(client, errMessage.error);
+
     UA_TcpErrorMessage_clear(&errMessage);
 }
 
@@ -445,31 +445,29 @@ processACKResponse(UA_Client *client, const UA_ByteString *chunk) {
     if(channel->state != UA_SECURECHANNELSTATE_HEL_SENT) {
         UA_LOG_ERROR_CHANNEL(client->config.logging, channel,
                              "SecureChannel not in the HEL-sent state");
-        client->connectStatus = UA_STATUSCODE_BADSECURECHANNELCLOSED;
-        closeSecureChannel(client);
+        setConnectStatus(client, UA_STATUSCODE_BADSECURECHANNELCLOSED);
         return;
     }
 
     /* Decode the message */
     size_t offset = 0;
     UA_TcpAcknowledgeMessage ackMessage;
-    client->connectStatus =
+    UA_StatusCode res =
         UA_decodeBinaryInternal(chunk, &offset, &ackMessage,
                                 &UA_TRANSPORT[UA_TRANSPORT_TCPACKNOWLEDGEMESSAGE], NULL);
-    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_NETWORK,
                      "Decoding ACK message failed");
-        closeSecureChannel(client);
+        setConnectStatus(client, res);
         return;
     }
 
-    client->connectStatus =
-        UA_SecureChannel_processHELACK(channel, &ackMessage);
-    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+    res = UA_SecureChannel_processHELACK(channel, &ackMessage);
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_NETWORK,
                      "Processing the ACK message failed with StatusCode %s",
-                     UA_StatusCode_name(client->connectStatus));
-        closeSecureChannel(client);
+                     UA_StatusCode_name(res));
+        setConnectStatus(client, res);
         return;
     }
 
@@ -500,9 +498,12 @@ sendHELMessage(UA_Client *client) {
 
     UA_Byte *bufPos = &message.data[8]; /* skip the header */
     const UA_Byte *bufEnd = &message.data[message.length];
-    client->connectStatus =
-        UA_encodeBinaryInternal(&hello, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE],
-                                &bufPos, &bufEnd, NULL, NULL);
+    retval = UA_encodeBinaryInternal(&hello, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE],
+                                     &bufPos, &bufEnd, NULL, NULL);
+    if(retval != UA_STATUSCODE_GOOD) {
+        cm->freeNetworkBuffer(cm, client->channel.connectionId, &message);
+        return retval;
+    }
 
     /* Encode the message header at offset 0 */
     UA_TcpMessageHeader messageHeader;
@@ -523,7 +524,7 @@ sendHELMessage(UA_Client *client) {
                                     &UA_KEYVALUEMAP_NULL, &message);
     if(retval != UA_STATUSCODE_GOOD) {
         UA_LOG_INFO(client->config.logging, UA_LOGCATEGORY_CLIENT, "Sending HEL failed");
-        closeSecureChannel(client);
+        setConnectStatus(client, retval);
         return retval;
     }
 
@@ -537,50 +538,53 @@ void processRHEMessage(UA_Client *client, const UA_ByteString *chunk) {
 
     size_t offset = 0; /* Go to the beginning of the TcpHelloMessage */
     UA_TcpReverseHelloMessage rheMessage;
-    UA_StatusCode retval =
-        UA_decodeBinaryInternal(chunk, &offset, &rheMessage,
-                                &UA_TRANSPORT[UA_TRANSPORT_TCPREVERSEHELLOMESSAGE], NULL);
-
-    if(retval != UA_STATUSCODE_GOOD) {
+    static const UA_DataType *rheType = &UA_TRANSPORT[UA_TRANSPORT_TCPREVERSEHELLOMESSAGE];
+    UA_StatusCode res = UA_decodeBinaryInternal(chunk, &offset, &rheMessage, rheType, NULL);
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                      "Decoding RHE message failed");
-        closeSecureChannel(client);
+        setConnectStatus(client, res);
         return;
     }
 
+    /* Set the internal DisocveryUrl */
     UA_String_clear(&client->discoveryUrl);
-    UA_String_copy(&rheMessage.endpointUrl, &client->discoveryUrl);
-
+    client->discoveryUrl = rheMessage.endpointUrl;
+    UA_String_init(&rheMessage.endpointUrl);
     UA_TcpReverseHelloMessage_clear(&rheMessage);
 
-    sendHELMessage(client);
+    /* Send the HEL message */
+    setConnectStatus(client, sendHELMessage(client));
 }
 
 void
 processOPNResponse(UA_Client *client, const UA_ByteString *message) {
-    /* Is the content of the expected type? */
-    size_t offset = 0;
-    UA_NodeId responseId;
+    UA_OpenSecureChannelResponse response;
     UA_NodeId expectedId =
         UA_NODEID_NUMERIC(0, UA_NS0ID_OPENSECURECHANNELRESPONSE_ENCODING_DEFAULTBINARY);
-    UA_StatusCode retval = UA_NodeId_decodeBinary(message, &offset, &responseId);
-    if(retval != UA_STATUSCODE_GOOD) {
-        closeSecureChannel(client);
-        return;
-    }
 
+    /* Decode the type NodeId */
+    size_t offset = 0;
+    UA_NodeId responseId;
+    UA_StatusCode res = UA_NodeId_decodeBinary(message, &offset, &responseId);
+    if(res != UA_STATUSCODE_GOOD)
+        goto finish_decode;
+
+    /* Is the response of the expected type? */
     if(!UA_NodeId_equal(&responseId, &expectedId)) {
-        UA_NodeId_clear(&responseId);
-        closeSecureChannel(client);
-        return;
+        res = UA_STATUSCODE_BADDECODINGERROR;
+        goto finish_decode;
     }
 
     /* Decode the response */
-    UA_OpenSecureChannelResponse response;
-    retval = UA_decodeBinaryInternal(message, &offset, &response,
-                                     &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE], NULL);
-    if(retval != UA_STATUSCODE_GOOD) {
-        closeSecureChannel(client);
+    res = UA_decodeBinaryInternal(message, &offset, &response,
+                                  &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE], NULL);
+
+    finish_decode:
+    if(res != UA_STATUSCODE_GOOD) {
+        UA_LOG_ERROR_CHANNEL(client->config.logging, &client->channel,
+                             "Could not decode the OpenSecureChannelResponse");
+        setConnectStatus(client, res);
         return;
     }
 
@@ -589,8 +593,7 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
        UA_ByteString_equal(&client->channel.remoteNonce, &response.serverNonce)) {
         UA_LOG_ERROR_CHANNEL(client->config.logging, &client->channel,
                              "The server reused the last nonce");
-        client->connectStatus = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
-        closeSecureChannel(client);
+        setConnectStatus(client, UA_STATUSCODE_BADSECURITYCHECKSFAILED);
         return;
     }
 
@@ -631,9 +634,9 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
 
     /* Compute the new local keys. The remote keys are updated when a message
      * with the new SecurityToken is received. */
-    retval = UA_SecureChannel_generateLocalKeys(&client->channel);
-    if(retval != UA_STATUSCODE_GOOD) {
-        closeSecureChannel(client);
+    res = UA_SecureChannel_generateLocalKeys(&client->channel);
+    if(res != UA_STATUSCODE_GOOD) {
+        setConnectStatus(client, res);
         return;
     }
 
@@ -654,17 +657,14 @@ processOPNResponse(UA_Client *client, const UA_ByteString *message) {
 }
 
 /* OPN messges to renew the channel are sent asynchronous */
-static void
+static UA_StatusCode
 sendOPNAsync(UA_Client *client, UA_Boolean renew) {
-    if(!UA_SecureChannel_isConnected(&client->channel)) {
-        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
-        return;
-    }
+    if(!UA_SecureChannel_isConnected(&client->channel))
+        return UA_STATUSCODE_BADINTERNALERROR;
 
-    client->connectStatus =
-        UA_SecureChannel_generateLocalNonce(&client->channel);
-    if(client->connectStatus != UA_STATUSCODE_GOOD)
-        return;
+    UA_StatusCode res = UA_SecureChannel_generateLocalNonce(&client->channel);
+    if(res != UA_STATUSCODE_GOOD)
+        return res;
 
     /* Prepare the OpenSecureChannelRequest */
     UA_OpenSecureChannelRequest opnSecRq;
@@ -690,15 +690,14 @@ sendOPNAsync(UA_Client *client, UA_Boolean renew) {
     /* Send the OPN message */
     UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_SECURECHANNEL,
                  "Requesting to open a SecureChannel");
-    client->connectStatus =
-        UA_SecureChannel_sendAsymmetricOPNMessage(&client->channel, requestId, &opnSecRq,
-                                                  &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
-    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+    static const UA_DataType *opnReqType = &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST];
+    res = UA_SecureChannel_sendAsymmetricOPNMessage(&client->channel, requestId,
+                                                    &opnSecRq, opnReqType);
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_SECURECHANNEL,
                       "Sending OPN message failed with error %s",
-                      UA_StatusCode_name(client->connectStatus));
-        closeSecureChannel(client);
-        return;
+                      UA_StatusCode_name(res));
+        return res;
     }
 
     /* Update the state */
@@ -708,6 +707,8 @@ sendOPNAsync(UA_Client *client, UA_Boolean renew) {
 
     UA_LOG_DEBUG(client->config.logging, UA_LOGCATEGORY_SECURECHANNEL,
                  "OPN message sent");
+
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode
@@ -720,9 +721,10 @@ __Client_renewSecureChannel(UA_Client *client) {
        client->nextChannelRenewal > UA_DateTime_nowMonotonic())
         return UA_STATUSCODE_GOODCALLAGAIN;
 
-    sendOPNAsync(client, true);
+    UA_StatusCode res = sendOPNAsync(client, true);
+    setConnectStatus(client, res);
 
-    return client->connectStatus;
+    return res;
 }
 
 UA_StatusCode
@@ -749,8 +751,7 @@ responseActivateSession(UA_Client *client, void *userdata,
                          "Session cannot be activated with StatusCode %s. "
                          "The client is configured not to create a new Session.",
                          UA_StatusCode_name(ar->responseHeader.serviceResult));
-            client->connectStatus = ar->responseHeader.serviceResult;
-            closeSecureChannel(client);
+            setConnectStatus(client, ar->responseHeader.serviceResult);
             return;
         }
 
@@ -759,7 +760,7 @@ responseActivateSession(UA_Client *client, void *userdata,
            ar->responseHeader.serviceResult == UA_STATUSCODE_BADSESSIONCLOSED) {
             UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                            "Session to be activated no longer exists. Create a new Session.");
-            client->connectStatus = createSessionAsync(client);
+            setConnectStatus(client, createSessionAsync(client));
             return;
         }
 
@@ -768,8 +769,7 @@ responseActivateSession(UA_Client *client, void *userdata,
                      "Session cannot be activated with StatusCode %s. "
                      "The client cannot recover from this, closing the connection.",
                      UA_StatusCode_name(ar->responseHeader.serviceResult));
-        client->connectStatus = ar->responseHeader.serviceResult;
-        closeSecureChannel(client);
+        setConnectStatus(client, ar->responseHeader.serviceResult);
         return;
     }
 
@@ -1064,11 +1064,10 @@ responseGetEndpoints(UA_Client *client, void *userdata,
          * If the SecureChannel is (intentionally or unintentionally) closed,
          * the connectStatus should come from there. */
         if(UA_SecureChannel_isConnected(&client->channel)) {
-           client->connectStatus = resp->responseHeader.serviceResult;
-           closeSecureChannel(client);
            UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                         "GetEndpointRequest failed with error code %s",
-                        UA_StatusCode_name(client->connectStatus));
+                        UA_StatusCode_name(resp->responseHeader.serviceResult));
+           setConnectStatus(client, resp->responseHeader.serviceResult);
         }
 
         UA_GetEndpointsResponse_clear(resp);
@@ -1112,8 +1111,7 @@ responseGetEndpoints(UA_Client *client, void *userdata,
     if(bestEndpointIndex == notFound) {
         UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                      "No suitable endpoint found");
-        client->connectStatus = UA_STATUSCODE_BADIDENTITYTOKENREJECTED;
-        closeSecureChannel(client);
+        setConnectStatus(client, UA_STATUSCODE_BADIDENTITYTOKENREJECTED);
         return;
     }
 
@@ -1338,7 +1336,7 @@ createSessionCallback(UA_Client *client, void *userdata,
     client->sessionState = UA_SESSIONSTATE_CREATED;
 
  cleanup:
-    client->connectStatus = res;
+    setConnectStatus(client, res);
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         client->sessionState = UA_SESSIONSTATE_CLOSED;
 }
@@ -1445,12 +1443,12 @@ connectActivity(UA_Client *client) {
 
         /* Send HEL */
     case UA_SECURECHANNELSTATE_CONNECTED:
-        client->connectStatus = sendHELMessage(client);
+        setConnectStatus(client, sendHELMessage(client));
         return;
 
         /* ACK receieved. Send OPN. */
     case UA_SECURECHANNELSTATE_ACK_RECEIVED:
-        sendOPNAsync(client, false); /* Send OPN */
+        setConnectStatus(client, sendOPNAsync(client, false)); /* Send OPN */
         return;
 
         /* The channel is open -> continue with the Session handling */
@@ -1461,14 +1459,14 @@ connectActivity(UA_Client *client) {
          * connection */
     case UA_SECURECHANNELSTATE_CLOSED:
         if(client->config.noReconnect)
-            client->connectStatus = UA_STATUSCODE_BADNOTCONNECTED;
+            setConnectStatus(client, UA_STATUSCODE_BADNOTCONNECTED);
         else
             initConnect(client); /* Sets the connectStatus internally */
         return;
 
         /* These states should never occur for the client */
     default:
-        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        setConnectStatus(client, UA_STATUSCODE_BADINTERNALERROR);
         return;
     }
 
@@ -1483,14 +1481,14 @@ connectActivity(UA_Client *client) {
      * endpoints may depend on the EndpointUrl used during the initial HEL/ACK
      * handshake. */
     if(client->discoveryUrl.length == 0) {
-        client->connectStatus = requestFindServers(client);
+        setConnectStatus(client, requestFindServers(client));
         return;
     }
 
     /* GetEndpoints to identify the remote side and/or reset the SecureChannel
      * with encryption */
     if(endpointUnconfigured(&client->endpoint)) {
-        client->connectStatus = requestGetEndpoints(client);
+        setConnectStatus(client, requestGetEndpoints(client));
         return;
     }
 
@@ -1502,12 +1500,12 @@ connectActivity(UA_Client *client) {
     switch(client->sessionState) {
         /* Send a CreateSessionRequest */
     case UA_SESSIONSTATE_CLOSED:
-        client->connectStatus = createSessionAsync(client);
+        setConnectStatus(client, createSessionAsync(client));
         return;
 
         /* Activate the Session */
     case UA_SESSIONSTATE_CREATED:
-        client->connectStatus = activateSessionAsync(client);
+        setConnectStatus(client, activateSessionAsync(client));
         return;
 
     case UA_SESSIONSTATE_CREATE_REQUESTED:
@@ -1518,7 +1516,7 @@ connectActivity(UA_Client *client) {
 
         /* These states should never occur for the client */
     default:
-        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        setConnectStatus(client, UA_STATUSCODE_BADINTERNALERROR);
         break;
     }
 }
@@ -1620,7 +1618,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
            client->channel.state != UA_SECURECHANNELSTATE_REVERSE_LISTENING) {
             UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "Cannot open a connection, the SecureChannel is already used");
-            client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+            setConnectStatus(client, UA_STATUSCODE_BADINTERNALERROR);
             notifyClientState(client);
             unlockClient(client);
             return;
@@ -1660,7 +1658,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * fails. Try to fall back on the initial EndpointUrl. */
         if(oldState == UA_SECURECHANNELSTATE_CONNECTING &&
            client->connectStatus == UA_STATUSCODE_GOOD)
-            client->connectStatus = fallbackEndpointUrl(client);
+            setConnectStatus(client, fallbackEndpointUrl(client));
 
         /* Try to reconnect */
         goto continue_connect;
@@ -1721,7 +1719,7 @@ __Client_networkCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
          * then the client cannot recover. Set the connectStatus to reflect
          * this. The application is notified when the socket has closed. */
         if(client->channel.state != UA_SECURECHANNELSTATE_OPEN)
-            client->connectStatus = res;
+            setConnectStatus(client, res);
 
         /* Close the SecureChannel, but don't notify the client right away.
          * Return immediately. notifyClientState will be called in the next
@@ -1765,17 +1763,22 @@ initConnect(UA_Client *client) {
         return;
     }
 
+    UA_StatusCode res;
+
     /* An exact endpoint was configured. Use it. */
     if(!endpointUnconfigured(&client->config.endpoint)) {
         UA_EndpointDescription_clear(&client->endpoint);
-        client->connectStatus =
-            UA_EndpointDescription_copy(&client->config.endpoint, &client->endpoint);
-        UA_CHECK_STATUS(client->connectStatus, return);
+        res = UA_EndpointDescription_copy(&client->config.endpoint, &client->endpoint);
+        if(res != UA_STATUSCODE_GOOD) {
+            setConnectStatus(client, res);
+            return;
+        }
     }
 
     /* Start the EventLoop if not already started */
-    client->connectStatus = __UA_Client_startup(client);
-    UA_CHECK_STATUS(client->connectStatus, return);
+    setConnectStatus(client, __UA_Client_startup(client));
+    if(client->connectStatus != UA_STATUSCODE_GOOD)
+        return;
 
     /* Consistency check the client's own ApplicationURI.
      * Problems are only logged. */
@@ -1789,7 +1792,7 @@ initConnect(UA_Client *client) {
     client->channel.processOPNHeaderApplication = client;
 
     /* Initialize the SecurityPolicy */
-    client->connectStatus = initSecurityPolicy(client);
+    setConnectStatus(client, initSecurityPolicy(client));
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return;
 
@@ -1798,13 +1801,13 @@ initConnect(UA_Client *client) {
     UA_String path = UA_STRING_NULL;
     UA_UInt16 port = 4840;
 
-    client->connectStatus =
-        UA_parseEndpointUrl(&client->config.endpointUrl, &hostname, &port, &path);
-    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+    res = UA_parseEndpointUrl(&client->config.endpointUrl, &hostname, &port, &path);
+    if(res != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_NETWORK,
                        "OPC UA URL is invalid: %.*s",
                        (int)client->config.endpointUrl.length,
                        client->config.endpointUrl.data);
+        setConnectStatus(client, res);
         return;
     }
 
@@ -1831,22 +1834,22 @@ initConnect(UA_Client *client) {
         paramMap.mapSize = 2;
 
         /* Open the client TCP connection */
-        UA_StatusCode res = cm->openConnection(cm, &paramMap, client, NULL, __Client_networkCallback);
+        res = cm->openConnection(cm, &paramMap, client, NULL, __Client_networkCallback);
         if(res == UA_STATUSCODE_GOOD)
             break;
     }
 
     /* The channel has not opened */
     if(client->channel.state == UA_SECURECHANNELSTATE_CLOSED)
-        client->connectStatus = UA_STATUSCODE_BADINTERNALERROR;
+        res = UA_STATUSCODE_BADINTERNALERROR;
 
     /* Opening the TCP connection failed */
-    if(client->connectStatus != UA_STATUSCODE_GOOD) {
+    if(res != UA_STATUSCODE_GOOD || client->connectStatus != UA_STATUSCODE_GOOD) {
         UA_LOG_WARNING(client->config.logging, UA_LOGCATEGORY_CLIENT,
                        "Could not open a TCP connection to %.*s",
                        (int)client->config.endpointUrl.length,
                        client->config.endpointUrl.data);
-        client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
+        setConnectStatus(client, UA_STATUSCODE_BADCONNECTIONCLOSED);
     }
 }
 
@@ -1870,28 +1873,21 @@ connectSync(UA_Client *client) {
     /* Run the EventLoop until connected, connect fail or timeout. Write the
      * iterate result to the connectStatus. So we do not attempt to restore a
      * failed connection during the sync connect. */
-    while(client->connectStatus == UA_STATUSCODE_GOOD &&
-          !isFullyConnected(client)) {
-
+    while(client->connectStatus == UA_STATUSCODE_GOOD && !isFullyConnected(client)) {
         /* Timeout -> abort */
         now = UA_DateTime_nowMonotonic();
         if(maxDate < now) {
             UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "The connection has timed out before it could be fully opened");
-            client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
-            closeSecureChannel(client);
+            setConnectStatus(client, UA_STATUSCODE_BADTIMEOUT);
             /* Continue to run. So the SecureChannel is fully closed in the next
              * EventLoop iteration. */
         }
 
         /* Drop into the EventLoop */
         UA_StatusCode res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
-        if(res != UA_STATUSCODE_GOOD) {
-            client->connectStatus = res;
-            closeSecureChannel(client);
-        }
-
-        notifyClientState(client);
+        if(res != UA_STATUSCODE_GOOD)
+            setConnectStatus(client, res);
     }
 }
 
@@ -1953,20 +1949,15 @@ activateSessionSync(UA_Client *client) {
         if(maxDate < now) {
             UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "The connection has timed out before it could be fully opened");
-            client->connectStatus = UA_STATUSCODE_BADTIMEOUT;
-            closeSecureChannel(client);
+            setConnectStatus(client, UA_STATUSCODE_BADTIMEOUT);
             /* Continue to run. So the SecureChannel is fully closed in the next
              * EventLoop iteration. */
         }
 
         /* Drop into the EventLoop */
         res = el->run(el, (UA_UInt32)((maxDate - now) / UA_DATETIME_MSEC));
-        if(res != UA_STATUSCODE_GOOD) {
-            client->connectStatus = res;
-            closeSecureChannel(client);
-        }
-
-        notifyClientState(client);
+        if(res != UA_STATUSCODE_GOOD)
+            setConnectStatus(client, res);
     }
 
     return client->connectStatus;
@@ -2189,7 +2180,7 @@ UA_Client_startListeningForReverseConnect(UA_Client *client,
     client->channel.processOPNHeaderApplication = client;
     client->channel.connectionId = 0;
 
-    client->connectStatus = initSecurityPolicy(client);
+    setConnectStatus(client, initSecurityPolicy(client));
     if(client->connectStatus != UA_STATUSCODE_GOOD)
         return client->connectStatus;
 
@@ -2346,7 +2337,8 @@ disconnectSecureChannel(UA_Client *client, UA_Boolean sync) {
     /* Close the SecureChannel */
     closeSecureChannel(client);
 
-    /* Manually set the status to closed to prevent an automatic reconnection */
+    /* Manually set the status to closed to prevent an automatic reconnection.
+     * Notify the client at the end. */
     if(client->connectStatus == UA_STATUSCODE_GOOD)
         client->connectStatus = UA_STATUSCODE_BADCONNECTIONCLOSED;
 
diff --git a/src/client/ua_client_internal.h b/src/client/ua_client_internal.h
index 44aa0f158a4..4dba9c86396 100644
--- a/src/client/ua_client_internal.h
+++ b/src/client/ua_client_internal.h
@@ -208,6 +208,7 @@ UA_StatusCode connectInternal(UA_Client *client, UA_Boolean async);
 UA_StatusCode connectSecureChannel(UA_Client *client, const char *endpointUrl);
 UA_Boolean isFullyConnected(UA_Client *client);
 void connectSync(UA_Client *client);
+void setConnectStatus(UA_Client *client, UA_StatusCode status);
 void notifyClientState(UA_Client *client);
 void processRHEMessage(UA_Client *client, const UA_ByteString *chunk);
 void processERRResponse(UA_Client *client, const UA_ByteString *chunk);

From 23b0fa89a451128dee32ade056eb4e07451b8eb7 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Mon, 4 May 2026 12:25:59 +0200
Subject: [PATCH 1921/1963] refactor(server): Add a clarifying comment for the
 connection context pointer

---
 src/server/ua_server_binary.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index b2de3b271ff..73bb2775dac 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1178,7 +1178,16 @@ addDiscoveryUrl(UA_Server *server, const UA_String hostname, UA_UInt16 port) {
     }
 }
 
-/* Callback of a TCP socket (server socket or an active connection) */
+/* Callback of a TCP socket (server socket or an active connection).
+ *
+ * The connectionContext points to one of two possible structures. A
+ * double-pointer is used here, so we get re-assign the context to a different
+ * memory location within the callback.
+ *
+ * - The server socket (listening) has an initial NULL context and then gets
+ *   assigned to the appropriate UA_ServerConnection slot.
+ * - The connection socket (active) initially points to the UA_ServerConnection
+ *   slot and then gets assigned to the new SecureChannel instance. */
 static void
 serverNetworkCallbackLocked(UA_ConnectionManager *cm, uintptr_t connectionId,
                             void *application, void **connectionContext,
@@ -1229,6 +1238,7 @@ serverNetworkCallbackLocked(UA_ConnectionManager *cm, uintptr_t connectionId,
         return;
     }
 
+    /* Either sc or channel applies. See the comment before this function. */
     UA_ServerConnection *sc = (UA_ServerConnection*)*connectionContext;
     UA_SecureChannel *channel = (UA_SecureChannel*)*connectionContext;
     UA_Boolean serverSocket = (sc >= bpm->serverConnections &&

From 944aca6fdee1007ffc51d48c6575a2c57d707a7a Mon Sep 17 00:00:00 2001
From: Andreas Ebner <andreas.ebner@o6-automation.com>
Date: Fri, 20 Feb 2026 14:20:26 +0100
Subject: [PATCH 1922/1963] fix(server): Variables with DataSource and
 SamplingInterval=0 receive DataChangeNotifications

When a MonitoredItem with SamplingInterval=0 targets a DataSource node,
the server was unconditionally installing an EVENT (backpointer) sampler.
Backpointer sampling only fires when the node is written via the OPC UA
Write service. DataSource nodes (e.g. Server/ServerStatus/CurrentTime)
compute their value on-the-fly in a read callback; they are never written
via Write, so no DataChangeNotification was ever enqueued.

A regression test is added to check_services_subscriptions.c that monitors
Server/ServerStatus/CurrentTime (i=2258) -- always available, no compile
flags required. The test verifies:
 - samplingType == UA_MONITOREDITEMSAMPLINGTYPE_PUBLISH (structural fix)
 - queue grows after each publish cycle (functional fix)
 - second notification has a strictly later DateTime value
---
 src/server/ua_server_internal.h             |   7 ++
 src/server/ua_services_monitoreditem.c      |  63 +++++++---
 src/server/ua_subscription_monitoreditem.c  |  50 +++++---
 tests/server/check_services_subscriptions.c | 130 ++++++++++++++++++++
 4 files changed, 213 insertions(+), 37 deletions(-)

diff --git a/src/server/ua_server_internal.h b/src/server/ua_server_internal.h
index fe5fcc66a89..a6332e61d7b 100644
--- a/src/server/ua_server_internal.h
+++ b/src/server/ua_server_internal.h
@@ -677,6 +677,13 @@ void
 Operation_Browse(UA_Server *server, UA_Session *session, const UA_UInt32 *maxrefs,
                  const UA_BrowseDescription *descr, UA_BrowseResult *result);
 
+/* External data either from a datasource callback or with a _beforeRead
+ * callback where fresh values get switched in on demand. Variables with an
+ * external data source require monitoring with a sampling interval. As we
+ * cannot just hook into the write service to get all changes. */
+UA_Boolean
+VariableNode_externalDataSource(const UA_VariableNode *vn);
+
 /************/
 /* AddNodes */
 /************/
diff --git a/src/server/ua_services_monitoreditem.c b/src/server/ua_services_monitoreditem.c
index d9640e7325e..1b66fb385ba 100644
--- a/src/server/ua_services_monitoreditem.c
+++ b/src/server/ua_services_monitoreditem.c
@@ -142,6 +142,25 @@ Service_SetTriggering(UA_Server *server, UA_Session *session,
             UA_MonitoredItem_addLink(sub, mon, request->linksToAdd[i]);
 }
 
+UA_Boolean
+VariableNode_externalDataSource(const UA_VariableNode *vn) {
+    switch(vn->valueBackend.backendType) {
+    case UA_VALUEBACKENDTYPE_INTERNAL:
+        return (vn->valueBackend.backend.internal.callback.onWrite != NULL);
+    case UA_VALUEBACKENDTYPE_DATA_SOURCE_CALLBACK:
+        return true;
+    case UA_VALUEBACKENDTYPE_EXTERNAL:
+        return true;
+    case UA_VALUEBACKENDTYPE_NONE:
+        if(vn->valueSource == UA_VALUESOURCE_DATA)
+            return (vn->value.data.callback.onWrite != NULL);
+        else
+            return true;
+    default:
+        return false;
+    }
+}
+
 /* Verify and adjust the parameters of a MonitoredItem */
 static UA_StatusCode
 checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
@@ -208,40 +227,44 @@ checkAdjustMonitoredItemParams(UA_Server *server, UA_Session *session,
         }
     }
 
-    /* Read the minimum sampling interval for the variable. The sampling
-     * interval of the MonitoredItem must not be less than that. */
+    /* Negative sampling interval: Publishing interval of the Subscription is
+     * the sampling interval. Note that the sampling interval selected here
+     * remains also when the Subscription's publish interval is adjusted
+     * afterwards. */
+    if(mon->subscription && params->samplingInterval < 0.0)
+        params->samplingInterval = mon->subscription->publishingInterval;
+
+    /* If the value comes from an "external" data source, sampling is required.
+     * Otherwise, for samplingInterval == 0, we add a hook for every write. */
+    UA_Boolean extValueSource = false;
+
+    /* VariableNodes can lower-bound the permissible sampling interval */
+    UA_Double minimumSamplingInterval = 0.0;
+
+    /* Use hasValueSource and minimumSamplingInterval from a VariableNode */
     if(mon->itemToMonitor.attributeId == UA_ATTRIBUTEID_VALUE) {
         const UA_Node *node = UA_NODESTORE_GET(server, &mon->itemToMonitor.nodeId);
         if(node) {
-            const UA_VariableNode *vn = &node->variableNode;
             if(node->head.nodeClass == UA_NODECLASS_VARIABLE) {
-                /* Take into account if the publishing interval is used for sampling */
-                UA_Double samplingInterval = params->samplingInterval;
-                if(samplingInterval < 0 && mon->subscription)
-                    samplingInterval = mon->subscription->publishingInterval;
-                /* Adjust if smaller than the allowed minimum for the variable */
-                if(samplingInterval < vn->minimumSamplingInterval)
-                    params->samplingInterval = vn->minimumSamplingInterval;
+                minimumSamplingInterval = node->variableNode.minimumSamplingInterval;
+                extValueSource = VariableNode_externalDataSource(&node->variableNode);
             }
             UA_NODESTORE_RELEASE(server, node);
         }
     }
-        
 
-    /* A negative number indicates that the sampling interval is the publishing
-     * interval of the Subscription. Note that the sampling interval selected
-     * here remains also when the Subscription's publish interval is adjusted
-     * afterwards. */
-    if(mon->subscription && params->samplingInterval < 0.0)
-        params->samplingInterval = mon->subscription->publishingInterval;
-
-    /* Adjust non-null sampling interval to lie within the configured limits */
-    if(params->samplingInterval != 0.0) {
+    /* Adjust non-null sampling interval to lie within the configured limits.
+     * Nodes with a value source require a >0.0 sampling interval. */
+    if(params->samplingInterval != 0.0 || extValueSource) {
         UA_BOUNDEDVALUE_SETWBOUNDS(server->config.samplingIntervalLimits,
                                    params->samplingInterval, params->samplingInterval);
         /* Check for NaN */
         if(mon->parameters.samplingInterval != mon->parameters.samplingInterval)
             params->samplingInterval = server->config.samplingIntervalLimits.min;
+
+        /* Minimum interval from the node */
+        if(params->samplingInterval < minimumSamplingInterval)
+            params->samplingInterval = minimumSamplingInterval;
     }
 
     /* Adjust the maximum queue size */
diff --git a/src/server/ua_subscription_monitoreditem.c b/src/server/ua_subscription_monitoreditem.c
index 520324d5daa..91a6f66b39f 100644
--- a/src/server/ua_subscription_monitoreditem.c
+++ b/src/server/ua_subscription_monitoreditem.c
@@ -710,34 +710,50 @@ UA_MonitoredItem_registerSampling(UA_Server *server, UA_MonitoredItem *mon) {
 
     UA_StatusCode res = UA_STATUSCODE_GOOD;
     UA_Subscription *sub = mon->subscription;
+
+    /* For SamplingInterval == 0 and Value attribute, check if the node is a
+     * DataSource. DataSource nodes (e.g. internal diagnostic nodes) compute
+     * their value on-the-fly via a read callback. The backpointer-based
+     * sampling only triggers on OPC UA write, which never happens for
+     * DataSources. Fall through to normal sampling instead. */
+    UA_Boolean extValueSource = false;
+    if(mon->parameters.samplingInterval == 0.0 &&
+       mon->itemToMonitor.attributeId == UA_ATTRIBUTEID_VALUE) {
+        const UA_Node *node = UA_NODESTORE_GET(server, &mon->itemToMonitor.nodeId);
+        if(node) {
+            if(node->head.nodeClass == UA_NODECLASS_VARIABLE)
+                extValueSource = VariableNode_externalDataSource(&node->variableNode);
+            UA_NODESTORE_RELEASE(server, node);
+        }
+    }
+
+    /* Add backpointer to the node for "event-based sampling" during write */
     if(mon->itemToMonitor.attributeId == UA_ATTRIBUTEID_EVENTNOTIFIER ||
-       mon->parameters.samplingInterval == 0.0) {
-        /* Add to the linked list in the node */
-        UA_Session *session = &server->adminSession;
-        if(sub)
-            session = sub->session;
+       (mon->parameters.samplingInterval == 0.0 && !extValueSource)) {
+        UA_Session *session = (sub) ? sub->session : &server->adminSession;
         res = UA_Server_editNode(server, session, &mon->itemToMonitor.nodeId,
                                  addMonitoredItemBackpointer, mon);
         if(res == UA_STATUSCODE_GOOD)
             mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_EVENT;
         return res;
-    } else if(sub && mon->parameters.samplingInterval == sub->publishingInterval) {
-        /* Add to the subscription for sampling before every publish */
+    }
+
+    /* Add backpointer to the subscription for sampling before every publish */
+    if(sub && (mon->parameters.samplingInterval == 0.0 ||
+               mon->parameters.samplingInterval == sub->publishingInterval)) {
         LIST_INSERT_HEAD(&sub->samplingMonitoredItems, mon,
                          sampling.subscriptionSampling);
         mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_PUBLISH;
-    } else {
-        /* DataChange MonitoredItems with a positive sampling interval have a
-         * repeated callback. Other MonitoredItems are attached to the Node in a
-         * linked list of backpointers. */
-        res = addRepeatedCallback(server,
-                                  (UA_ServerCallback)UA_MonitoredItem_sampleCallback,
-                                  mon, mon->parameters.samplingInterval,
-                                  &mon->sampling.callbackId);
-        if(res == UA_STATUSCODE_GOOD)
-            mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_CYCLIC;
+        return res;
     }
 
+    /* Standard sampling with a repeated callback */
+    res = addRepeatedCallback(server,
+                              (UA_ServerCallback)UA_MonitoredItem_sampleCallback,
+                              mon, mon->parameters.samplingInterval,
+                              &mon->sampling.callbackId);
+    if(res == UA_STATUSCODE_GOOD)
+        mon->samplingType = UA_MONITOREDITEMSAMPLINGTYPE_CYCLIC;
     return res;
 }
 
diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index a8a48d2bd78..8c1ae10bdde 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -1101,6 +1101,135 @@ START_TEST(Server_subscriptionSurvivesSessionTimeout) {
 
     /* Recreate session for other tests */
     createSession();
+}END_TEST
+
+/* DataSource nodes with SamplingInterval=0 must use PUBLISH (periodic) sampling,
+ * not EVENT (backpointer) sampling, because they are never written via the Write
+ * service; tested with Server/ServerStatus/CurrentTime (i=2258). */
+START_TEST(Server_dataSourceSamplingIntervalZero) {
+    /* Create a subscription */
+    UA_CreateSubscriptionRequest subRequest;
+    UA_CreateSubscriptionRequest_init(&subRequest);
+    subRequest.publishingEnabled = UA_TRUE;
+    subRequest.requestedPublishingInterval = defaultRequestedPublishingInterval;
+
+    UA_CreateSubscriptionResponse subResponse;
+    UA_CreateSubscriptionResponse_init(&subResponse);
+
+    lockServer(server);
+    Service_CreateSubscription(server, session, &subRequest, &subResponse);
+    unlockServer(server);
+    ck_assert_uint_eq(subResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    UA_UInt32 localSubId = subResponse.subscriptionId;
+    UA_Double publishingInterval = subResponse.revisedPublishingInterval;
+    UA_CreateSubscriptionResponse_clear(&subResponse);
+
+    /* Create a MonitoredItem on Server/ServerStatus/CurrentTime (i=2258)
+     * with SamplingInterval=0 */
+    UA_CreateMonitoredItemsRequest mrequest;
+    UA_CreateMonitoredItemsRequest_init(&mrequest);
+    mrequest.subscriptionId = localSubId;
+    mrequest.timestampsToReturn = UA_TIMESTAMPSTORETURN_BOTH;
+
+    UA_MonitoredItemCreateRequest item;
+    UA_MonitoredItemCreateRequest_init(&item);
+    UA_ReadValueId rvi;
+    UA_ReadValueId_init(&rvi);
+    rvi.nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME);
+    rvi.attributeId = UA_ATTRIBUTEID_VALUE;
+    item.itemToMonitor = rvi;
+    item.monitoringMode = UA_MONITORINGMODE_REPORTING;
+    UA_MonitoringParameters params;
+    UA_MonitoringParameters_init(&params);
+    params.samplingInterval = 0.0; /* key: SamplingInterval=0 on a DataSource node */
+    params.queueSize = 10;
+    params.discardOldest = UA_TRUE;
+    item.requestedParameters = params;
+    mrequest.itemsToCreateSize = 1;
+    mrequest.itemsToCreate = &item;
+
+    UA_CreateMonitoredItemsResponse mresponse;
+    UA_CreateMonitoredItemsResponse_init(&mresponse);
+
+    lockServer(server);
+    Service_CreateMonitoredItems(server, session, &mrequest, &mresponse);
+    unlockServer(server);
+    ck_assert_uint_eq(mresponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(mresponse.resultsSize, 1);
+    ck_assert_uint_eq(mresponse.results[0].statusCode, UA_STATUSCODE_GOOD);
+    UA_UInt32 localMonId = mresponse.results[0].monitoredItemId;
+    ck_assert_uint_gt(localMonId, 0);
+    /* The server may revise the sampling interval (e.g. to the publishing
+     * interval). Accept any non-negative value; the important structural
+     * assertion is that the item uses PUBLISH sampling, not EVENT sampling. */
+    ck_assert(mresponse.results[0].revisedSamplingInterval >= 0.0);
+
+    UA_MonitoredItemCreateRequest_clear(&item);
+    UA_CreateMonitoredItemsResponse_clear(&mresponse);
+
+    /* Locate the MonitoredItem and verify it is registered with PUBLISH sampling,
+     * not EVENT (backpointer) sampling. This is the structural assertion for the
+     * fix: a DataSource node with SamplingInterval=0 must land in
+     * sub->samplingMonitoredItems, not in the node's monitoredItems backpointer
+     * list. */
+    UA_Subscription *sub = NULL;
+    TAILQ_FOREACH(sub, &session->subscriptions, sessionListEntry) {
+        if(sub->subscriptionId == localSubId)
+            break;
+    }
+    ck_assert_ptr_ne(sub, NULL);
+
+    UA_MonitoredItem *mon = NULL;
+    UA_MonitoredItem *tmpMon;
+    LIST_FOREACH(tmpMon, &sub->samplingMonitoredItems, sampling.subscriptionSampling) {
+        if(tmpMon->monitoredItemId == localMonId) {
+            mon = tmpMon;
+            break;
+        }
+    }
+    ck_assert_ptr_ne(mon, NULL);
+    ck_assert_uint_eq(mon->samplingType, UA_MONITOREDITEMSAMPLINGTYPE_PUBLISH);
+
+    /* First publish cycle: capture the initial CurrentTime value */
+    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    UA_Server_run_iterate(server, false);
+    ck_assert_uint_ge(mon->queueSize, 1);
+
+    UA_Notification *notification = TAILQ_LAST(&mon->queue, NotificationQueue);
+    ck_assert_ptr_ne(notification, NULL);
+    ck_assert(notification->data.dataChange.value.hasValue);
+    ck_assert(notification->data.dataChange.value.value.type == &UA_TYPES[UA_TYPES_DATETIME]);
+    UA_DateTime t1 = *(UA_DateTime*)notification->data.dataChange.value.value.data;
+    UA_UInt32 queueBefore = mon->queueSize;
+
+    /* Advance the test clock and trigger a second publish cycle.
+     * readCurrentTime() returns UA_DateTime_now(), which is controlled by
+     * UA_fakeSleep, so the value in the second cycle will differ from t1 and
+     * a new DataChangeNotification must be enqueued. */
+    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    UA_Server_run_iterate(server, false);
+
+    ck_assert_uint_gt(mon->queueSize, queueBefore);
+    notification = TAILQ_LAST(&mon->queue, NotificationQueue);
+    ck_assert_ptr_ne(notification, NULL);
+    ck_assert(notification->data.dataChange.value.hasValue);
+    UA_DateTime t2 = *(UA_DateTime*)notification->data.dataChange.value.value.data;
+    ck_assert(t2 > t1);
+
+    /* Cleanup */
+    UA_DeleteSubscriptionsRequest delRequest;
+    UA_DeleteSubscriptionsRequest_init(&delRequest);
+    delRequest.subscriptionIdsSize = 1;
+    delRequest.subscriptionIds = &localSubId;
+
+    UA_DeleteSubscriptionsResponse delResponse;
+    UA_DeleteSubscriptionsResponse_init(&delResponse);
+
+    lockServer(server);
+    Service_DeleteSubscriptions(server, session, &delRequest, &delResponse);
+    unlockServer(server);
+    ck_assert_uint_eq(delResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    UA_DeleteSubscriptionsResponse_clear(&delResponse);
 }
 END_TEST
 
@@ -1129,6 +1258,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_server, Server_transferSubscriptionDiagnostics);
     tcase_add_test(tc_server, Server_transferSubscription_anonymous);
     tcase_add_test(tc_server, Server_subscriptionSurvivesSessionTimeout);
+    tcase_add_test(tc_server, Server_dataSourceSamplingIntervalZero);
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
     suite_add_tcase(s, tc_server);
 

From d7210120122f55ec30a112858ebca39fd1bf5a60 Mon Sep 17 00:00:00 2001
From: lonelybones <trillhash@protonmail.com>
Date: Tue, 31 Mar 2026 12:50:43 -0400
Subject: [PATCH 1923/1963] fix(server): guard securityPolicyUriPostfix against
 empty URI

securityPolicyUriPostfix iterates backward using raw pointer
arithmetic. When uri.length is 0 and uri.data is NULL, the
initial pointer wraps to 0xFFFFFFFFFFFFFFFF and the loop
dereferences wild memory. Add an early return for empty strings.
---
 src/server/ua_services_discovery.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/ua_services_discovery.c b/src/server/ua_services_discovery.c
index c58f3a2438d..cfd7a93c65a 100644
--- a/src/server/ua_services_discovery.c
+++ b/src/server/ua_services_discovery.c
@@ -301,6 +301,7 @@ const char *securityModeStrs[4] = {"-invalid", "-none", "-sign", "-sign+encrypt"
 
 UA_String
 securityPolicyUriPostfix(const UA_String uri) {
+    if(uri.length == 0) return uri;
     for(UA_Byte *b = uri.data + uri.length - 1; b >= uri.data; b--) {
         if(*b != '#')
             continue;

From 5977f7ea7b85eab899d8097517bd30a382b2ab9c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Thu, 4 Jun 2026 15:58:48 +0200
Subject: [PATCH 1924/1963] fix(client): Iterate while the client is CLOSING if
 the connection fails

---
 src/client/ua_client_connect.c | 25 +++++++------
 tests/client/check_client.c    | 66 ++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 10 deletions(-)

diff --git a/src/client/ua_client_connect.c b/src/client/ua_client_connect.c
index 89d60192067..f098f703436 100644
--- a/src/client/ua_client_connect.c
+++ b/src/client/ua_client_connect.c
@@ -1870,18 +1870,20 @@ connectSync(UA_Client *client) {
     UA_EventLoop *el = client->config.eventLoop;
     UA_assert(el);
 
-    /* Run the EventLoop until connected, connect fail or timeout. Write the
-     * iterate result to the connectStatus. So we do not attempt to restore a
-     * failed connection during the sync connect. */
-    while(client->connectStatus == UA_STATUSCODE_GOOD && !isFullyConnected(client)) {
+    /* Run the EventLoop until connected, connect fail or timeout. Continue
+     * to iterate when the channel is in CLOSING state so that the pending
+     * close callback is processed and the channel fully transitions to CLOSED
+     * before returning to the caller. */
+    while((client->connectStatus == UA_STATUSCODE_GOOD && !isFullyConnected(client)) ||
+          client->channel.state == UA_SECURECHANNELSTATE_CLOSING) {
         /* Timeout -> abort */
         now = UA_DateTime_nowMonotonic();
         if(maxDate < now) {
             UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "The connection has timed out before it could be fully opened");
             setConnectStatus(client, UA_STATUSCODE_BADTIMEOUT);
-            /* Continue to run. So the SecureChannel is fully closed in the next
-             * EventLoop iteration. */
+            /* Continue to run. The loop continues while the channel is
+             * CLOSING so the close callback is processed. */
         }
 
         /* Drop into the EventLoop */
@@ -1941,8 +1943,11 @@ activateSessionSync(UA_Client *client) {
     /* EventLoop is started. Otherwise activateSessionAsync would have failed. */
     UA_EventLoop *el = client->config.eventLoop;
     UA_assert(el);
-    while(client->sessionState != UA_SESSIONSTATE_ACTIVATED &&
-          client->connectStatus == UA_STATUSCODE_GOOD) {
+    /* Continue iterating while the session is being activated or the
+     * channel is draining (CLOSING) after a timeout. */
+    while((client->sessionState != UA_SESSIONSTATE_ACTIVATED &&
+          client->connectStatus == UA_STATUSCODE_GOOD) ||
+          client->channel.state == UA_SECURECHANNELSTATE_CLOSING) {
 
         /* Timeout -> abort */
         now = UA_DateTime_nowMonotonic();
@@ -1950,8 +1955,8 @@ activateSessionSync(UA_Client *client) {
             UA_LOG_ERROR(client->config.logging, UA_LOGCATEGORY_CLIENT,
                          "The connection has timed out before it could be fully opened");
             setConnectStatus(client, UA_STATUSCODE_BADTIMEOUT);
-            /* Continue to run. So the SecureChannel is fully closed in the next
-             * EventLoop iteration. */
+            /* Continue to run. The loop continues while the channel is
+             * CLOSING so the close callback is processed. */
         }
 
         /* Drop into the EventLoop */
diff --git a/tests/client/check_client.c b/tests/client/check_client.c
index 28f64f513da..f888fc4ea59 100644
--- a/tests/client/check_client.c
+++ b/tests/client/check_client.c
@@ -463,6 +463,71 @@ START_TEST(Client_closes_on_server_error) {
 }
 END_TEST
 
+/* Timed callback that advances the fake clock to trigger a timeout */
+static void
+timeoutTriggerCallback(void *application, void *data) {
+    UA_Boolean *fired = (UA_Boolean *)data;
+    if(!*fired) {
+        *fired = true;
+        UA_fakeSleep(10000); /* Advance clock by 10s past any short timeout */
+    }
+}
+
+START_TEST(Client_connectTimeoutRecovery) {
+    /* Reproducer for #7061: when connectSync / activateSessionSync times
+     * out, the channel must not be left in a half-closed (CLOSING) state
+     * that blocks the next connect attempt. */
+    teardown();
+    setup();
+    ck_assert_uint_eq(server->sessionCount, 0);
+
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *cconfig = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefault(cconfig);
+
+    /* Connect and disconnect to establish clean CLOSED state */
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Client_disconnect(client);
+    ck_assert(client->channel.state == UA_SECURECHANNELSTATE_CLOSED);
+
+    /* Short timeout: on a remote server this would trigger a timeout
+     * during the handshake. On localhost we use a fake-clock callback
+     * to trigger it artificially. */
+    cconfig->timeout = 100; /* 100ms */
+
+    /* Register a timed callback on the client's event loop. It fires
+     * during the first el->run inside connectSync and advances the
+     * fake clock by 10s, making the timeout check fire. */
+    UA_EventLoop *el = client->config.eventLoop;
+    UA_DateTime now = UA_DateTime_nowMonotonic();
+    UA_Boolean fired = false;
+    UA_UInt64 callbackId;
+    el->addTimedCallback(el, timeoutTriggerCallback, NULL, &fired,
+                         now + UA_DATETIME_MSEC, &callbackId);
+
+    /* Connect attempt should time out (or at least not leave CLOSING) */
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert(client->channel.state != UA_SECURECHANNELSTATE_CLOSING);
+
+    /* Second connect attempt must work (no stuck CLOSING channel) */
+    cconfig->timeout = 5000;
+    retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(server->sessionCount, 1);
+
+    UA_Variant val;
+    UA_Variant_init(&val);
+    UA_NodeId nodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS_STATE);
+    retval = UA_Client_readValueAttribute(client, nodeId, &val);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Variant_clear(&val);
+
+    UA_Client_delete(client);
+    ck_assert_uint_eq(server->sessionCount, 0);
+}
+END_TEST
+
 static Suite* testSuite_Client(void) {
     Suite *s = suite_create("Client");
     TCase *tc_client = tcase_create("Client Basic");
@@ -485,6 +550,7 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_client_reconnect, Client_reconnect);
     tcase_add_test(tc_client_reconnect, Client_activateSessionClose);
     tcase_add_test(tc_client_reconnect, Client_activateSessionTimeout);
+    tcase_add_test(tc_client_reconnect, Client_connectTimeoutRecovery);
     tcase_add_test(tc_client_reconnect, Client_activateSessionLocaleIds);
     suite_add_tcase(s,tc_client_reconnect);
     return s;

From 7f1822174b34dfaef3d1bf96e1986ce61d83311b Mon Sep 17 00:00:00 2001
From: neojaw <68939028+neojaw@users.noreply.github.com>
Date: Thu, 11 Jun 2026 08:21:19 +0200
Subject: [PATCH 1925/1963] fix(client): Correct SecureChannelState Log Output
 (#8099)

---
 src/client/ua_client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index c4a54725b61..0d0444fe4a0 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -263,8 +263,8 @@ UA_Client_getConfig(UA_Client *client) {
 
 #if UA_LOGLEVEL <= 300
 static const char *channelStateTexts[14] = {
-    "Fresh", "ReverseListening", "Connecting", "Connected", "ReverseConnected", "RHESent", "HELSent", "HELReceived", "ACKSent",
-    "AckReceived", "OPNSent", "Open", "Closing", "Closed"};
+    "Closed", "ReverseListening", "Connecting", "Connected", "ReverseConnected", "RHESent", "HELSent", "HELReceived", "ACKSent",
+    "AckReceived", "OPNSent", "Open", "Closing"};
 static const char *sessionStateTexts[6] =
     {"Closed", "CreateRequested", "Created",
      "ActivateRequested", "Activated", "Closing"};

From c9563e8ea4a8db2f64059c8ff7efe0b49a35bea3 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Thu, 7 May 2026 15:25:30 +0200
Subject: [PATCH 1926/1963] fix(server): Enforce default message and chunk size
 limits to prevent DoS

When tcpMaxMsgSize or tcpMaxChunks are configured as 0, the server treats the
limit as truly unbounded. A remote attacker can exploit this by sending
arbitrarily large messages or an unbounded number of chunks, exhausting server
memory and causing a denial of service.

Set safe defaults (512 MB per message, 16384 chunks) whenever the configured
value is zero, mirroring the existing behaviour for recv/sendBufferSize.

This commit mitigates a vulnerability reported by Lorenzo Cannella.

Internal Vulnerability Advisory: open62541-SA-2026-0002
---
 src/server/ua_server_binary.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/server/ua_server_binary.c b/src/server/ua_server_binary.c
index 73bb2775dac..56d92d15ba5 100644
--- a/src/server/ua_server_binary.c
+++ b/src/server/ua_server_binary.c
@@ -1114,6 +1114,15 @@ createServerSecureChannel(UA_BinaryProtocolManager *bpm, UA_ConnectionManager *c
     if(connConfig.sendBufferSize == 0)
         connConfig.sendBufferSize = 1 << 16; /* 64kB */
 
+    if(connConfig.localMaxMessageSize == 0)
+        connConfig.localMaxMessageSize = 1 << 29; /* 512 MB */
+    if(connConfig.remoteMaxMessageSize == 0)
+        connConfig.remoteMaxMessageSize = 1 << 29; /* 512 MB */
+    if(connConfig.localMaxChunkCount == 0)
+        connConfig.localMaxChunkCount = 1 << 14; /* 16384 */
+    if(connConfig.remoteMaxChunkCount == 0)
+        connConfig.remoteMaxChunkCount = 1 << 14; /* 16384 */
+
     /* Set up the new SecureChannel */
     UA_SecureChannel_init(&entry->channel);
     entry->channel.config = connConfig;

From 9d376abfbbf62638bfb9885a0a8bee4d3548a50b Mon Sep 17 00:00:00 2001
From: jaw <wenzel@neobotix.de>
Date: Mon, 22 Jun 2026 13:53:19 +0200
Subject: [PATCH 1927/1963] fix(deps): fix dtoa buffer offsets

---
 deps/dtoa.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/deps/dtoa.c b/deps/dtoa.c
index 2d7a0dca1e4..8b92c3910ed 100644
--- a/deps/dtoa.c
+++ b/deps/dtoa.c
@@ -351,7 +351,6 @@ unsigned dtoa(double d, char* buffer) {
     if(sign) {
         buffer[0] = '-';
         pos++;
-        buffer++;
     }
 
     if(exponent == ((1u << exponent_bits) - 1u)) {
@@ -368,5 +367,5 @@ unsigned dtoa(double d, char* buffer) {
     char digits[18];
     memset(digits, 0, 18);
     unsigned ndigits = grisu2(bits, digits, &K);
-    return pos + emit_digits(digits, ndigits, buffer, K, sign);
+    return pos + emit_digits(digits, ndigits, &buffer[pos], K, sign);
 }

From 650071e6c14fe42888e7b2c9df9b1e83875e0f8d Mon Sep 17 00:00:00 2001
From: jaw <wenzel@neobotix.de>
Date: Mon, 22 Jun 2026 13:54:03 +0200
Subject: [PATCH 1928/1963] feat(test): add tests for dtoa

---
 tests/check_utils.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/tests/check_utils.c b/tests/check_utils.c
index 6d2080b5ed4..72146159d6d 100644
--- a/tests/check_utils.c
+++ b/tests/check_utils.c
@@ -5,11 +5,21 @@
 #include <open62541/client.h>
 
 #include "ua_util_internal.h"
+#include <dtoa.h>
 
 #include <stdlib.h>
+#include <math.h>
 
 #include "check.h"
 
+/* vs2008 does not have INFINITY and NAN defined */
+#ifndef INFINITY
+# define INFINITY ((UA_Double)(DBL_MAX+DBL_MAX))
+#endif
+#ifndef NAN
+# define NAN ((UA_Double)(INFINITY-INFINITY))
+#endif
+
 START_TEST(EndpointUrl_split) {
     UA_String hostname = UA_STRING_NULL;
     UA_String path = UA_STRING_NULL;
@@ -203,6 +213,42 @@ START_TEST(readNumber) {
 END_TEST
 
 
+START_TEST(doubleToString) {
+    char buffer[256];
+
+    const double number_13_37 = 13.37;
+    const unsigned length_13_37 = dtoa(number_13_37, buffer);
+    buffer[length_13_37] = 0;
+    ck_assert_str_eq(buffer, "13.37");
+
+    const double number_neg_13_37 = -13.37;
+    const unsigned length_neg_13_37 = dtoa(number_neg_13_37, buffer);
+    buffer[length_neg_13_37] = 0;
+    ck_assert_str_eq(buffer, "-13.37");
+
+    const double number_inf = INFINITY;
+    const unsigned length_inf = dtoa(number_inf, buffer);
+    buffer[length_inf] = 0;
+    ck_assert_str_eq(buffer, "inf");
+
+    const double number_neginf = -INFINITY;
+    const unsigned length_neginf = dtoa(number_neginf, buffer);
+    buffer[length_neginf] = 0;
+    ck_assert_str_eq(buffer, "-inf");
+
+    const double number_nan = NAN;
+    const unsigned length_nan = dtoa(number_nan, buffer);
+    buffer[length_nan] = 0;
+    ck_assert_str_eq(buffer, "nan");
+
+    const double number_negnan = -NAN;
+    const unsigned length_negnan = dtoa(number_negnan, buffer);
+    buffer[length_negnan] = 0;
+    ck_assert_str_eq(buffer, "nan");
+}
+END_TEST
+
+
 START_TEST(stringCompare) {
 
     UA_String sa1 = UA_String_fromChars("A");
@@ -652,6 +698,7 @@ static Suite* testSuite_Utils(void) {
     TCase *tc_utils = tcase_create("Utils");
     tcase_add_test(tc_utils, readNumber);
     tcase_add_test(tc_utils, readNumberWithBase);
+    tcase_add_test(tc_utils, doubleToString);
     tcase_add_test(tc_utils, StatusCode_msg);
     tcase_add_test(tc_utils, stringCompare);
     suite_add_tcase(s,tc_utils);

From 20b9990c5ee88a654a508ee6337778ffbebca600 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Thu, 7 May 2026 15:42:56 +0200
Subject: [PATCH 1929/1963] fix(server): Apply allowBrowseNode access control
 in TranslateBrowsePathsToNodeIds

The TranslateBrowsePathsToNodeIds service did not call the allowBrowseNode
access-control callback when resolving path elements or terminal targets.
A client denied direct Browse access to a node could still use that node as a
waypoint or receive its NodeId as a path translation result, disclosing hidden
nodes and their children.

Add the same allowBrowseNode gate already applied in the Browse service to both
walkBrowsePathElement (intermediate nodes) and
Operation_TranslateBrowsePathToNodeIds (terminal nodes).

Internal Vulnerability Advisory: open62541-SA-2026-0004

Co-authored-by: keyme <kmm2003@users.noreply.github.com>
---
 src/server/ua_services_view.c | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/server/ua_services_view.c b/src/server/ua_services_view.c
index 9b0436c2c51..002a46c09c7 100644
--- a/src/server/ua_services_view.c
+++ b/src/server/ua_services_view.c
@@ -999,6 +999,25 @@ walkBrowsePathElement(UA_Server *server, UA_Session *session,
         if(!node)
             continue;
 
+        /* Check whether the session is allowed to browse this node.
+         * Mirrors the access-control gate applied in browseWithContinuation().
+         * Without this check, a client denied direct Browse on a node can
+         * still use it as a waypoint in TranslateBrowsePathsToNodeIds,
+         * disclosing hidden intermediate nodes and their children. */
+        if(session != &server->adminSession) {
+            UA_UNLOCK(&server->serviceMutex);
+            UA_Boolean canBrowse =
+                server->config.accessControl.allowBrowseNode(
+                    server, &server->config.accessControl,
+                    &session->sessionId, session->sessionHandle,
+                    &current->targets[i].nodeId, node->head.context);
+            UA_LOCK(&server->serviceMutex);
+            if(!canBrowse) {
+                UA_NODESTORE_RELEASE(server, node);
+                continue;
+            }
+        }
+
         /* Test whether the node fits the class mask */
         UA_Boolean skip = !matchClassMask(node, nodeClassMask);
 
@@ -1149,6 +1168,25 @@ Operation_TranslateBrowsePathToNodeIds(UA_Server *server, UA_Session *session,
         const UA_Node *node = UA_NODESTORE_GET(server, &next->targets[k].nodeId);
         if(!node)
             continue;
+
+        /* Check whether the session is allowed to browse the resolved target.
+         * Without this check, a client denied direct Browse on a terminal node
+         * can still have its NodeId disclosed as the result of path
+         * translation. */
+        if(session != &server->adminSession) {
+            UA_UNLOCK(&server->serviceMutex);
+            UA_Boolean canBrowse =
+                server->config.accessControl.allowBrowseNode(
+                    server, &server->config.accessControl,
+                    &session->sessionId, session->sessionHandle,
+                    &next->targets[k].nodeId, node->head.context);
+            UA_LOCK(&server->serviceMutex);
+            if(!canBrowse) {
+                UA_NODESTORE_RELEASE(server, node);
+                continue;
+            }
+        }
+
         UA_Boolean match = UA_QualifiedName_equal(browseNameFilter, &node->head.browseName);
         UA_NODESTORE_RELEASE(server, node);
         if(!match)

From 6f58e2cf84b6c76cda4bd9d4a503656cf8a0dd36 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Wed, 24 Jun 2026 18:34:11 +0200
Subject: [PATCH 1930/1963] fix(client): Return the precise statuscode when
 triggering a reconnect

---
 src/client/ua_client.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/client/ua_client.c b/src/client/ua_client.c
index 73d291b9c11..cca789eaaa7 100644
--- a/src/client/ua_client.c
+++ b/src/client/ua_client.c
@@ -436,6 +436,13 @@ receiveResponse(UA_Client *client, void *response, const UA_DataType *responseTy
             UA_LOG_WARNING_CHANNEL(&client->config.logger, &client->channel,
                                    "Receiving the response failed with StatusCode %s",
                                    UA_StatusCode_name(retval));
+            /* The receive itself can succeed while the channel was closed
+             * remotely (e.g. an ERR message during the handshake). Forward the
+             * detailed status code captured from the close so the reconnect is
+             * not silent. */
+            if(retval == UA_STATUSCODE_GOOD)
+                retval = (client->connectStatus != UA_STATUSCODE_GOOD) ?
+                    client->connectStatus : UA_STATUSCODE_BADCONNECTIONCLOSED;
             closeSecureChannel(client);
             break;
         }

From bdc949736874afbf76009641e9b70151a6cf867f Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Wed, 24 Jun 2026 18:34:55 +0200
Subject: [PATCH 1931/1963] fix(tests): Fix an endless loop on CI runs

---
 tests/encryption/check_crl_validation.c | 46 +++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/tests/encryption/check_crl_validation.c b/tests/encryption/check_crl_validation.c
index 9c4c08d5e45..e3172e9c70b 100644
--- a/tests/encryption/check_crl_validation.c
+++ b/tests/encryption/check_crl_validation.c
@@ -300,9 +300,49 @@ START_TEST(encryption_connect_revoked) {
         UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
     ck_assert(client != NULL);
 
-    /* Secure client connect */
+    /* Secure client connect. The application certificate is revoked by the
+     * intermediate CA's CRL, so the server rejects the handshake. */
+    UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURITYCHECKSFAILED);
+
+    UA_Client_disconnect(client);
+    UA_Client_delete(client);
+}
+END_TEST
+
+START_TEST(encryption_connect_issuer_revoked) {
+    UA_ByteString certificate;
+    certificate.length = APPLICATION_CERT_DER_LENGTH;
+    certificate.data = APPLICATION_CERT_DER_DATA;
+    ck_assert_uint_ne(certificate.length, 0);
+
+    UA_ByteString privateKey;
+    privateKey.length = APPLICATION_KEY_DER_LENGTH;
+    privateKey.data = APPLICATION_KEY_DER_DATA;
+    ck_assert_uint_ne(privateKey.length, 0);
+
+    /* Load the trustlist */
+    UA_ByteString *trustList = NULL;
+    size_t trustListSize = 0;
+    UA_ByteString *revocationList = NULL;
+    size_t revocationListSize = 0;
+
+    /* Secure client initialization */
+    UA_Client *client = UA_Client_new();
+    UA_ClientConfig *cc = UA_Client_getConfig(client);
+    UA_ClientConfig_setDefaultEncryption(cc, certificate, privateKey,
+                                         trustList, trustListSize,
+                                         revocationList, revocationListSize);
+    cc->certificateVerification.clear(&cc->certificateVerification);
+    UA_CertificateVerification_AcceptAll(&cc->certificateVerification);
+    cc->securityPolicyUri =
+        UA_STRING_ALLOC("http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
+    ck_assert(client != NULL);
+
+    /* Secure client connect. The intermediate CA certificate is revoked by the
+     * root CA's CRL, so the issuer of the application certificate is revoked. */
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCONNECTIONCLOSED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);
@@ -320,7 +360,7 @@ static Suite* testSuite_encryption(void) {
 #ifdef UA_ENABLE_ENCRYPTION
     tcase_add_test(tc_encryption_valid, encryption_connect_valid);
     tcase_add_test(tc_encryption_revoked, encryption_connect_revoked);
-    tcase_add_test(tc_encryption_revoked2, encryption_connect_revoked);
+    tcase_add_test(tc_encryption_revoked2, encryption_connect_issuer_revoked);
 #endif /* UA_ENABLE_ENCRYPTION */
     suite_add_tcase(s,tc_encryption_valid);
     suite_add_tcase(s,tc_encryption_revoked);

From 683bb385dc33b1fc73f8bc5908a7a685a8266c34 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Wed, 24 Jun 2026 18:35:21 +0200
Subject: [PATCH 1932/1963] fix(build): Ensure the check library is found on
 MacOS

---
 tools/cmake/FindCheck.cmake | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tools/cmake/FindCheck.cmake b/tools/cmake/FindCheck.cmake
index ed410c16b83..25c8bbf54c3 100644
--- a/tools/cmake/FindCheck.cmake
+++ b/tools/cmake/FindCheck.cmake
@@ -22,6 +22,19 @@ INCLUDE( FindPkgConfig )
 # Take care about check.pc settings
 PKG_SEARCH_MODULE( CHECK check )
 
+# pkg-config exports the plural CHECK_INCLUDE_DIRS and a bare library name.
+# Mirror them to the singular CHECK_INCLUDE_DIR and an absolute CHECK_LIBRARIES
+# that this module documents and the build expects.
+IF( CHECK_FOUND )
+	IF( NOT CHECK_INCLUDE_DIR )
+		SET( CHECK_INCLUDE_DIR ${CHECK_INCLUDE_DIRS} )
+	ENDIF()
+	FIND_LIBRARY( CHECK_LIBRARY NAMES check PATHS ${CHECK_LIBRARY_DIRS} )
+	IF( CHECK_LIBRARY )
+		SET( CHECK_LIBRARIES ${CHECK_LIBRARY} )
+	ENDIF()
+ENDIF()
+
 # Look for CHECK include dir and libraries
 IF( NOT CHECK_FOUND )
 	IF ( CHECK_INSTALL_DIR )

From c2d6072cbe09efd675c17733b20a4f6c654ff057 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Thu, 7 May 2026 15:26:33 +0200
Subject: [PATCH 1933/1963] fix(server): Deny transfer of detached
 subscriptions in default access control
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The default allowTransferSubscription callback unconditionally returns true
when oldSessionId is NULL. This occurs when a subscription becomes detached
from its session (e.g. via CloseSession(deleteSubscriptions=false)).

A remote client can exploit this to call TransferSubscriptions and gain full
ownership of a detached subscription — including its queued notifications —
without any authentication relationship to the original session owner.

Change the NULL check to return false, requiring an explicit security policy
override for deployments that intentionally allow anonymous subscription
transfers.

Internal Vulnerability Advisory: open62541-SA-2026-0005

Co-authored-by: keyme <kmm2003@users.noreply.github.com>
---
 plugins/ua_accesscontrol_default.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ua_accesscontrol_default.c b/plugins/ua_accesscontrol_default.c
index ed6bdffc6e3..d14fe708303 100644
--- a/plugins/ua_accesscontrol_default.c
+++ b/plugins/ua_accesscontrol_default.c
@@ -237,7 +237,7 @@ allowTransferSubscription_default(UA_Server *server, UA_AccessControl *ac,
                                   const UA_NodeId *oldSessionId, void *oldSessionContext,
                                   const UA_NodeId *newSessionId, void *newSessionContext) {
     if(!oldSessionId)
-        return true;
+        return false;
     
     /* Get clientUserId for both sessions */
     UA_Variant session1UserId;

From bbe99cf6068a078ea512f1110d6171ab00e7cf71 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Thu, 25 Jun 2026 11:54:20 +0200
Subject: [PATCH 1934/1963] test(server): update subscription-survives-timeout
 test for detached-transfer policy

---
 tests/server/check_services_subscriptions.c | 136 ++++++++++++++++++--
 1 file changed, 123 insertions(+), 13 deletions(-)

diff --git a/tests/server/check_services_subscriptions.c b/tests/server/check_services_subscriptions.c
index 8c1ae10bdde..556ca3ea6ef 100644
--- a/tests/server/check_services_subscriptions.c
+++ b/tests/server/check_services_subscriptions.c
@@ -1021,38 +1021,143 @@ START_TEST(Server_transferSubscription_anonymous) {
 }
 END_TEST
 
-START_TEST(Server_subscriptionSurvivesSessionTimeout) {
-    /* Set authenticated user for the session to allow transfer */
+/* Override hook: allow transfer of a detached subscription only when the new
+ * session authenticates as the expected user. */
+static const char *recoverOverrideExpectedUser = NULL;
+static UA_Boolean
+allowTransferSubscription_recoverOverride(UA_Server *server, UA_AccessControl *ac,
+                                         const UA_NodeId *oldSessionId,
+                                         void *oldSessionContext,
+                                         const UA_NodeId *newSessionId,
+                                         void *newSessionContext) {
+    /* Detached subscription: oldSessionId is null/zero after session timeout. */
+    if(oldSessionId && oldSessionId->identifierType != UA_NODEIDTYPE_NUMERIC)
+        return false;
+
+    UA_Variant newUserId;
+    UA_Variant_init(&newUserId);
+    UA_Server_getSessionAttribute(server, newSessionId,
+                                  UA_QUALIFIEDNAME(0, "clientUserId"),
+                                  &newUserId);
+    UA_Boolean result = false;
+    if(newUserId.type == &UA_TYPES[UA_TYPES_STRING] &&
+       recoverOverrideExpectedUser != NULL) {
+        UA_String *uid = (UA_String*)newUserId.data;
+        UA_String expected = UA_STRING((char*)(uintptr_t)recoverOverrideExpectedUser);
+        if(UA_String_equal(uid, &expected))
+            result = true;
+    }
+    UA_Variant_clear(&newUserId);
+    return result;
+}
+
+START_TEST(Server_subscriptionSurvivesSessionTimeoutButIsNotTransferable) {
+    /* Authenticated user to allow transfer */
+    lockServer(server);
+    UA_String_clear(&session->clientUserIdOfSession);
+    session->clientUserIdOfSession = UA_STRING_ALLOC("testuser");
+    unlockServer(server);
+
+    createSubscription();
+    createMonitoredItem();
+
+    /* Subscription exists */
+    lockServer(server);
+    UA_Subscription *sub = getSubscriptionById(server, subscriptionId);
+    unlockServer(server);
+    ck_assert_ptr_ne(sub, NULL);
+
+    /* Force session timeout */
+    lockServer(server);
+    session->validTill = UA_DateTime_nowMonotonic() - UA_DATETIME_SEC;
+    UA_Server_cleanupSessions(server, UA_DateTime_nowMonotonic());
+    unlockServer(server);
+    session = NULL;
+
+    /* Subscription survives in server-wide list, detached */
+    lockServer(server);
+    sub = getSubscriptionById(server, subscriptionId);
+    unlockServer(server);
+    ck_assert_ptr_ne(sub, NULL);
+    ck_assert_ptr_eq(sub->session, NULL);
+
+    /* Default policy denies transfer of a detached subscription even when the
+     * new session authenticates as the same user. */
+    UA_Session *session2 = createAuthenticatedSession("testuser");
+
+    UA_TransferSubscriptionsRequest transferRequest;
+    UA_TransferSubscriptionsRequest_init(&transferRequest);
+    transferRequest.subscriptionIdsSize = 1;
+    transferRequest.subscriptionIds = &subscriptionId;
+    transferRequest.sendInitialValues = false;
+
+    UA_TransferSubscriptionsResponse transferResponse;
+    UA_TransferSubscriptionsResponse_init(&transferResponse);
+
+    lockServer(server);
+    Service_TransferSubscriptions(server, session2, &transferRequest, &transferResponse);
+    unlockServer(server);
+
+    ck_assert_uint_eq(transferResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(transferResponse.resultsSize, 1);
+    ck_assert_uint_eq(transferResponse.results[0].statusCode,
+                      UA_STATUSCODE_BADUSERACCESSDENIED);
+    UA_TransferSubscriptionsResponse_clear(&transferResponse);
+
+    /* Subscription still detached; teardown() reaps it. */
+    lockServer(server);
+    sub = getSubscriptionById(server, subscriptionId);
+    unlockServer(server);
+    ck_assert_ptr_ne(sub, NULL);
+    ck_assert_ptr_eq(sub->session, NULL);
+
+    lockServer(server);
+    UA_Server_closeSession(server, &session2->sessionId);
+    unlockServer(server);
+
+    createSession();
+}END_TEST
+
+/* Companion to the previous test: a custom allowTransferSubscription hook
+ * re-enables transfer of a detached subscription for the same user. Documents
+ * that the default policy can be overridden for this scenario. */
+START_TEST(Server_subscriptionRecoverableWithOverride) {
+    /* Install override; restore the previous hook at the end. */
+    UA_AccessControl *ac = &server->config.accessControl;
+    UA_Boolean (*prevHook)(UA_Server *, UA_AccessControl *,
+                           const UA_NodeId *, void *,
+                           const UA_NodeId *, void *) = ac->allowTransferSubscription;
+    ac->allowTransferSubscription = allowTransferSubscription_recoverOverride;
+    recoverOverrideExpectedUser = "testuser";
+
     lockServer(server);
     UA_String_clear(&session->clientUserIdOfSession);
     session->clientUserIdOfSession = UA_STRING_ALLOC("testuser");
     unlockServer(server);
 
-    /* Create a subscription with a monitored item */
     createSubscription();
     createMonitoredItem();
 
-    /* Verify the subscription exists in the server-wide list */
     lockServer(server);
     UA_Subscription *sub = getSubscriptionById(server, subscriptionId);
     unlockServer(server);
     ck_assert_ptr_ne(sub, NULL);
 
-    /* Force the session to time out by setting validTill to a past value */
+    /* Force session timeout */
     lockServer(server);
     session->validTill = UA_DateTime_nowMonotonic() - UA_DATETIME_SEC;
     UA_Server_cleanupSessions(server, UA_DateTime_nowMonotonic());
     unlockServer(server);
-    session = NULL; /* Session has been removed */
+    session = NULL;
 
-    /* The subscription must still exist in the server-wide list (detached) */
+    /* Subscription detached */
     lockServer(server);
     sub = getSubscriptionById(server, subscriptionId);
     unlockServer(server);
     ck_assert_ptr_ne(sub, NULL);
-    ck_assert_ptr_eq(sub->session, NULL); /* Detached from session */
+    ck_assert_ptr_eq(sub->session, NULL);
 
-    /* Create a new session and transfer the subscription */
+    /* Override allows the same-user session to reclaim the detached subscription. */
     UA_Session *session2 = createAuthenticatedSession("testuser");
 
     UA_TransferSubscriptionsRequest transferRequest;
@@ -1073,14 +1178,18 @@ START_TEST(Server_subscriptionSurvivesSessionTimeout) {
     ck_assert_uint_eq(transferResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
     UA_TransferSubscriptionsResponse_clear(&transferResponse);
 
-    /* Verify subscription is now attached to the new session */
+    /* Re-attached to the new session */
     lockServer(server);
     sub = getSubscriptionById(server, subscriptionId);
     unlockServer(server);
     ck_assert_ptr_ne(sub, NULL);
     ck_assert_ptr_eq(sub->session, session2);
 
-    /* Clean up: delete subscription and close session2 */
+    /* Restore hook before cleanup so other tests see the default policy. */
+    ac->allowTransferSubscription = prevHook;
+    recoverOverrideExpectedUser = NULL;
+
+    /* Cleanup */
     UA_DeleteSubscriptionsRequest delRequest;
     UA_DeleteSubscriptionsRequest_init(&delRequest);
     delRequest.subscriptionIdsSize = 1;
@@ -1092,6 +1201,7 @@ START_TEST(Server_subscriptionSurvivesSessionTimeout) {
     lockServer(server);
     Service_DeleteSubscriptions(server, session2, &delRequest, &delResponse);
     unlockServer(server);
+    ck_assert_uint_eq(delResponse.resultsSize, 1);
     ck_assert_uint_eq(delResponse.results[0], UA_STATUSCODE_GOOD);
     UA_DeleteSubscriptionsResponse_clear(&delResponse);
 
@@ -1099,7 +1209,6 @@ START_TEST(Server_subscriptionSurvivesSessionTimeout) {
     UA_Server_closeSession(server, &session2->sessionId);
     unlockServer(server);
 
-    /* Recreate session for other tests */
     createSession();
 }END_TEST
 
@@ -1257,7 +1366,8 @@ static Suite* testSuite_Client(void) {
     tcase_add_test(tc_server, Server_invalidPublishingInterval);
     tcase_add_test(tc_server, Server_transferSubscriptionDiagnostics);
     tcase_add_test(tc_server, Server_transferSubscription_anonymous);
-    tcase_add_test(tc_server, Server_subscriptionSurvivesSessionTimeout);
+    tcase_add_test(tc_server, Server_subscriptionSurvivesSessionTimeoutButIsNotTransferable);
+    tcase_add_test(tc_server, Server_subscriptionRecoverableWithOverride);
     tcase_add_test(tc_server, Server_dataSourceSamplingIntervalZero);
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
     suite_add_tcase(s, tc_server);

From 9e0d23838e0777f5244dd5e3638147cf49d168c6 Mon Sep 17 00:00:00 2001
From: Tomer Dricker <tomerdricker@microsoft.com>
Date: Wed, 11 Feb 2026 00:00:00 +0000
Subject: [PATCH 1935/1963] fix(core): Fix integer overflow in array decoding

Rearrange the overflow check in Array_decodeBinary so that the
multiplication `type->memSize * length` cannot overflow before the
comparison. Instead of checking

    ctx->pos + (type->memSize * length) / 128 <= ctx->end

which overflows when the product exceeds SIZE_MAX, rewrite it as

    length / 128 <= remaining / type->memSize

where `remaining = ctx->end - ctx->pos`, keeping all operations in safe
size_t range.

Internal Vulnerability Advisory: open62541-SA-2026-0003
---
 src/ua_types_encoding_binary.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index 65de4375803..c814f390e8e 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -497,7 +497,8 @@ Array_decodeBinary(void *UA_RESTRICT *UA_RESTRICT dst, size_t *out_length,
      * sizeof(UA_DataValue) == 80 and an empty DataValue is encoded with just
      * one byte. We use 128 as the smallest power of 2 larger than 80. */
     size_t length = (size_t)signed_length;
-    UA_CHECK(ctx->pos + ((type->memSize * length) / 128) <= ctx->end,
+    size_t remaining = (size_t)(ctx->end - ctx->pos);
+    UA_CHECK(length / 128 <= remaining / type->memSize,
              return UA_STATUSCODE_BADDECODINGERROR);
 
     /* Allocate memory */

From 0eb7d97ada87eb1447356bd73832d22529681563 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Thu, 7 May 2026 15:27:17 +0200
Subject: [PATCH 1936/1963] fix(pubsub): Guard DataSetPayload JSON field count
 against UA_UInt16 overflow

The JSON decoder for PubSub DataSetPayload casts the token count to UA_UInt16
without bounds checking. If a malicious or malformed message provides more than
UA_UINT16_MAX/2 tokens, the cast silently truncates to a smaller value while the
actual allocation uses the full (large) length. This can lead to heap buffer
overflows and memory corruption.

Add an explicit bounds check before the cast, rejecting messages with a field
count that exceeds UA_UINT16_MAX.

See: open62541-SA-2026-0001
---
 src/pubsub/ua_pubsub_networkmessage_json.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pubsub/ua_pubsub_networkmessage_json.c b/src/pubsub/ua_pubsub_networkmessage_json.c
index e73af226c75..45b696c0dc3 100644
--- a/src/pubsub/ua_pubsub_networkmessage_json.c
+++ b/src/pubsub/ua_pubsub_networkmessage_json.c
@@ -286,6 +286,8 @@ DataSetPayload_decodeJsonInternal(void* dsmP, const UA_DataType *type,
     }
 
     size_t length = (size_t)parseCtx->tokenArray[parseCtx->index].size;
+    if(length > UA_UINT16_MAX)
+        return UA_STATUSCODE_BADDECODINGERROR;
     UA_String *fieldNames = (UA_String*)UA_calloc(length, sizeof(UA_String));
     dsm->data.keyFrameData.fieldNames = fieldNames;
     dsm->data.keyFrameData.fieldCount = (UA_UInt16)length;

From 840951bc8b7119a0a63d6d0876c4910ed71e4892 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Sat, 27 Jun 2026 08:34:09 +0200
Subject: [PATCH 1937/1963] fix(tests): Fix UDP JSON publish in MacOS

---
 tests/pubsub/check_pubsub_config_freeze.c     |  12 +-
 tests/pubsub/check_pubsub_connection_udp.c    |  18 +--
 tests/pubsub/check_pubsub_decryption.c        |   4 +-
 .../pubsub/check_pubsub_encrypted_rt_levels.c |   3 +-
 tests/pubsub/check_pubsub_encryption.c        |   3 +-
 tests/pubsub/check_pubsub_encryption_aes256.c |   3 +-
 tests/pubsub/check_pubsub_get_state.c         |   3 +-
 tests/pubsub/check_pubsub_informationmodel.c  |  31 ++---
 .../check_pubsub_informationmodel_methods.c   |  12 +-
 ...heck_pubsub_multiple_subscribe_rt_levels.c |   3 +-
 tests/pubsub/check_pubsub_publish.c           |   3 +-
 tests/pubsub/check_pubsub_publish_json.c      |  19 ++-
 tests/pubsub/check_pubsub_publish_rt_levels.c |   3 +-
 tests/pubsub/check_pubsub_publisherid.c       |   8 +-
 tests/pubsub/check_pubsub_publishspeed.c      |   4 +-
 tests/pubsub/check_pubsub_sks_client.c        |   7 +-
 tests/pubsub/check_pubsub_sks_keystorage.c    |   3 +-
 tests/pubsub/check_pubsub_sks_pull.c          |   4 +-
 tests/pubsub/check_pubsub_sks_push.c          |   4 +-
 tests/pubsub/check_pubsub_subscribe.c         |   5 +-
 .../check_pubsub_subscribe_config_freeze.c    |   8 +-
 .../pubsub/check_pubsub_subscribe_encrypted.c |   3 +-
 .../check_pubsub_subscribe_msgrcvtimeout.c    |   3 +-
 .../pubsub/check_pubsub_subscribe_rt_levels.c |   3 +-
 tests/pubsub/pubsub_test_helpers.h            | 109 ++++++++++++++++++
 25 files changed, 216 insertions(+), 62 deletions(-)
 create mode 100644 tests/pubsub/pubsub_test_helpers.h

diff --git a/tests/pubsub/check_pubsub_config_freeze.c b/tests/pubsub/check_pubsub_config_freeze.c
index 1f2e48bff78..ec5e9a1c228 100644
--- a/tests/pubsub/check_pubsub_config_freeze.c
+++ b/tests/pubsub/check_pubsub_config_freeze.c
@@ -8,6 +8,8 @@
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
+#include "pubsub_test_helpers.h"
+
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -37,7 +39,7 @@ START_TEST(CreateAndLockConfiguration) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
     &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -122,7 +124,7 @@ START_TEST(CreateAndLockConfigurationWithExternalAPI) {
         UA_StatusCode retVal = UA_STATUSCODE_GOOD;
         memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
         connectionConfig.name = UA_STRING("UADP Connection");
-        UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
         UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                              &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -191,7 +193,7 @@ START_TEST(CreateAndReleaseMultiplePDSLocks) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -266,7 +268,7 @@ START_TEST(CreateLockAndEditConfiguration) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -325,7 +327,7 @@ START_TEST(CreateConfigWithStaticFieldSource) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/tests/pubsub/check_pubsub_connection_udp.c b/tests/pubsub/check_pubsub_connection_udp.c
index 6b9b0de6e44..7b8071cda50 100644
--- a/tests/pubsub/check_pubsub_connection_udp.c
+++ b/tests/pubsub/check_pubsub_connection_udp.c
@@ -9,6 +9,8 @@
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
+#include "pubsub_test_helpers.h"
+
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -34,7 +36,7 @@ START_TEST(AddConnectionsWithMinimalValidConfiguration){
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -53,7 +55,8 @@ START_TEST(AddConnectionsWithMinimalValidIPv6Configuration){
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://[ff00::1:5]:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_IPV6_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -72,7 +75,7 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidConfiguration){
         UA_PubSubConnectionConfig connectionConfig;
         memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
         connectionConfig.name = UA_STRING("UADP Connection");
-        UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
         UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                              &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -95,7 +98,8 @@ START_TEST(AddRemoveAddConnectionWithMinimalValidIPv6Configuration){
         UA_PubSubConnectionConfig connectionConfig;
         memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
         connectionConfig.name = UA_STRING("UADP Connection");
-        UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://[ff00::1:5]:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressUrl =
+            UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_IPV6_4840);
         UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                              &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -152,7 +156,7 @@ START_TEST(AddConnectionWithUnknownTransportURL){
         UA_PubSubConnectionConfig connectionConfig;
         memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
         connectionConfig.name = UA_STRING("UADP Connection");
-        UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
         UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                              &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
         connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/unknown-udp-uadp");
@@ -170,7 +174,7 @@ START_TEST(AddConnectionWithNullConfig){
     } END_TEST
 
 START_TEST(AddSingleConnectionWithMaximalConfiguration){
-    UA_NetworkAddressUrlDataType networkAddressUrlData = {UA_STRING("127.0.0.1"), UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrlData = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant address;
     UA_Variant_setScalar(&address, &networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     UA_KeyValuePair connectionOptions[3];
@@ -202,7 +206,7 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
 } END_TEST
 
 START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
-    UA_NetworkAddressUrlDataType networkAddressUrlData = {UA_STRING("127.0.0.1"), UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrlData = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant address;
     UA_Variant_setScalar(&address, &networkAddressUrlData, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     UA_KeyValuePair connectionOptions[3];
diff --git a/tests/pubsub/check_pubsub_decryption.c b/tests/pubsub/check_pubsub_decryption.c
index 685635fa146..db97c6e8c17 100644
--- a/tests/pubsub/check_pubsub_decryption.c
+++ b/tests/pubsub/check_pubsub_decryption.c
@@ -10,6 +10,7 @@
 #include <open62541/server_pubsub.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -64,8 +65,7 @@ setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {
-        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
diff --git a/tests/pubsub/check_pubsub_encrypted_rt_levels.c b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
index 1ae94c9412b..d146d4476b2 100644
--- a/tests/pubsub/check_pubsub_encrypted_rt_levels.c
+++ b/tests/pubsub/check_pubsub_encrypted_rt_levels.c
@@ -11,6 +11,7 @@
 #include <open62541/plugin/securitypolicy_default.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_pubsub_networkmessage.h"
 #include "testing_clock.h"
 
@@ -50,7 +51,7 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.enabled = UA_TRUE;
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = 2234;
diff --git a/tests/pubsub/check_pubsub_encryption.c b/tests/pubsub/check_pubsub_encryption.c
index 03563bf0946..e9ae2f85d81 100644
--- a/tests/pubsub/check_pubsub_encryption.c
+++ b/tests/pubsub/check_pubsub_encryption.c
@@ -10,6 +10,7 @@
 #include <open62541/plugin/securitypolicy_default.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -45,7 +46,7 @@ static void setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/tests/pubsub/check_pubsub_encryption_aes256.c b/tests/pubsub/check_pubsub_encryption_aes256.c
index 3b7b375c7d8..8b95fab7623 100644
--- a/tests/pubsub/check_pubsub_encryption_aes256.c
+++ b/tests/pubsub/check_pubsub_encryption_aes256.c
@@ -10,6 +10,7 @@
 #include <open62541/plugin/securitypolicy_default.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -45,7 +46,7 @@ static void setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/tests/pubsub/check_pubsub_get_state.c b/tests/pubsub/check_pubsub_get_state.c
index 889aafcdea4..6f741723550 100644
--- a/tests/pubsub/check_pubsub_get_state.c
+++ b/tests/pubsub/check_pubsub_get_state.c
@@ -10,6 +10,7 @@
 #include <open62541/plugin/log_stdout.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_server_internal.h"
 #include <check.h>
 #include <assert.h>
@@ -56,7 +57,7 @@ static void AddConnection(
     connectionConfig.name = UA_STRING(pName);
     connectionConfig.enabled = UA_TRUE;
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
 
diff --git a/tests/pubsub/check_pubsub_informationmodel.c b/tests/pubsub/check_pubsub_informationmodel.c
index 3331667c487..fa12c0367d5 100644
--- a/tests/pubsub/check_pubsub_informationmodel.c
+++ b/tests/pubsub/check_pubsub_informationmodel.c
@@ -8,6 +8,8 @@
 
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
+
+#include "pubsub_test_helpers.h"
 #include <open62541/types.h>
 #include <open62541/types_generated.h>
 
@@ -66,7 +68,8 @@ static void addPubSubConnection(UA_String connectionName, UA_String addressUrl,
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = connectionName;
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, addressUrl};
+    UA_NetworkAddressUrlDataType networkAddressUrl =
+        {UA_PubSubTest_getMulticastInterface(), addressUrl};
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -133,8 +136,8 @@ findSingleChildNode(UA_Server *server_, UA_QualifiedName targetName, UA_NodeId r
 }
 
 static void setupBasicPubSubConfiguration(void){
-    addPubSubConnection(UA_STRING("Connection 1"), UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
-    addPubSubConnection(UA_STRING("Connection 2"), UA_STRING("opc.udp://224.0.0.22:4840/"), &connection2);
+    addPubSubConnection(UA_STRING("Connection 1"), UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
+    addPubSubConnection(UA_STRING("Connection 2"), UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection2);
     addPublishedDataSet(UA_STRING("PublishedDataSet 1"), &publishedDataSet1);
     addPublishedDataSet(UA_STRING("PublishedDataSet 2"), &publishedDataSet2);
     addWriterGroup(connection1, UA_STRING("WriterGroup 1"), 10, &writerGroup1);
@@ -158,7 +161,7 @@ static void setupBasicPubSubConfiguration(void){
 
 START_TEST(AddSignlePubSubConnectionAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_QualifiedName browseName;
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     retVal |= UA_Server_readBrowseName(server, connection1, &browseName);
@@ -169,13 +172,13 @@ START_TEST(AddSignlePubSubConnectionAndCheckInformationModelRepresentation){
 
 START_TEST(AddRemoveAddSignlePubSubConnectionAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_QualifiedName browseName;
     UA_StatusCode retVal;
     ck_assert_int_eq(UA_Server_removePubSubConnection(server, connection1), UA_STATUSCODE_GOOD);
     retVal = UA_Server_readBrowseName(server, connection1, &browseName);
     ck_assert_int_eq(retVal, UA_STATUSCODE_BADNODEIDUNKNOWN);
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     retVal = UA_Server_readBrowseName(server, connection1, &browseName);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
     ck_assert_int_eq(UA_String_equal(&browseName.name, &connectionName), UA_TRUE);
@@ -233,7 +236,7 @@ START_TEST(AddRemoveAddSinglePublishedDataSetAndCheckInformationModelRepresentat
 
 START_TEST(AddSingleWriterGroupAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_String pdsName = UA_STRING("PDS 1");
     addPublishedDataSet(pdsName, &publishedDataSet1);
     UA_String wgName = UA_STRING("WriterGroup 1");
@@ -247,7 +250,7 @@ START_TEST(AddSingleWriterGroupAndCheckInformationModelRepresentation){
 
 START_TEST(AddRemoveAddSingleWriterGroupAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_String pdsName = UA_STRING("PDS 1");
     addPublishedDataSet(pdsName, &publishedDataSet1);
     UA_String wgName = UA_STRING("WriterGroup 1");
@@ -268,7 +271,7 @@ START_TEST(AddRemoveAddSingleWriterGroupAndCheckInformationModelRepresentation){
 
 START_TEST(AddSingleDataSetWriterAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_String pdsName = UA_STRING("PDS 1");
     addPublishedDataSet(pdsName, &publishedDataSet1);
     UA_String wgName = UA_STRING("WriterGroup 1");
@@ -284,7 +287,7 @@ START_TEST(AddSingleDataSetWriterAndCheckInformationModelRepresentation){
 
 START_TEST(AddRemoveAddSingleDataSetWriterAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_String pdsName = UA_STRING("PDS 1");
     addPublishedDataSet(pdsName, &publishedDataSet1);
     UA_String wgName = UA_STRING("WriterGroup 1");
@@ -358,7 +361,7 @@ START_TEST(ReadAddressAndCompareWithInternalValue){
 
 START_TEST(AddSingleDataSetReaderAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_String rgName = UA_STRING("ReaderGroup 1");
     addReaderGroup(connection1, rgName, &readerGroup1);
     UA_String dsrName = UA_STRING("DataSetReader 1");
@@ -372,7 +375,7 @@ START_TEST(AddSingleDataSetReaderAndCheckInformationModelRepresentation){
 START_TEST(AddRemoveAddSingleDataSetReaderAndCheckInformationModelRepresentation){
     UA_StatusCode retVal;
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_String rgName = UA_STRING("ReaderGroup 1");
     addReaderGroup(connection1,  rgName, &readerGroup1);
     UA_String dsrName = UA_STRING("DataSetReader 1");
@@ -390,7 +393,7 @@ START_TEST(AddRemoveAddSingleDataSetReaderAndCheckInformationModelRepresentation
 
 START_TEST(AddSingleReaderGroupAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_String rgName = UA_STRING("ReaderGroup 1");
     addReaderGroup(connection1, rgName, &readerGroup1);
     UA_QualifiedName browseName;
@@ -401,7 +404,7 @@ START_TEST(AddSingleReaderGroupAndCheckInformationModelRepresentation){
 
 START_TEST(AddRemoveAddSingleReaderGroupAndCheckInformationModelRepresentation){
     UA_String connectionName = UA_STRING("Connection 1");
-    addPubSubConnection(connectionName, UA_STRING("opc.udp://224.0.0.22:4840/"), &connection1);
+    addPubSubConnection(connectionName, UA_STRING(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840), &connection1);
     UA_String rgName = UA_STRING("ReaderGroup 1");
     addReaderGroup(connection1, rgName, &readerGroup1);
     UA_QualifiedName browseName;
diff --git a/tests/pubsub/check_pubsub_informationmodel_methods.c b/tests/pubsub/check_pubsub_informationmodel_methods.c
index 8242b885825..4953538292e 100644
--- a/tests/pubsub/check_pubsub_informationmodel_methods.c
+++ b/tests/pubsub/check_pubsub_informationmodel_methods.c
@@ -8,6 +8,8 @@
 
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
+
+#include "pubsub_test_helpers.h"
 #include <open62541/client.h>
 #include <open62541/client_config_default.h>
 
@@ -90,7 +92,7 @@ static UA_NodeId addPubSubConnection(void){
     pubSubConnection.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
 
     UA_ExtensionObject eo;
-    UA_NetworkAddressUrlDataType networkAddressDataType = {UA_STRING(""), UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressDataType = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_NetworkAddressUrlDataType* identityToken = UA_NetworkAddressUrlDataType_new();
     UA_NetworkAddressUrlDataType_init(identityToken);
     UA_NetworkAddressUrlDataType_copy(&networkAddressDataType, identityToken);
@@ -239,7 +241,7 @@ START_TEST(AddandRemoveNewPubSubConnectionWithWriterGroup){
         pubSubConnection.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
 
         UA_ExtensionObject eo;
-        UA_NetworkAddressUrlDataType networkAddressDataType = {UA_STRING(""), UA_STRING("opc.udp://224.0.0.22:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressDataType = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
         UA_NetworkAddressUrlDataType* identityToken = UA_NetworkAddressUrlDataType_new();
         UA_NetworkAddressUrlDataType_init(identityToken);
         UA_NetworkAddressUrlDataType_copy(&networkAddressDataType, identityToken);
@@ -352,7 +354,7 @@ START_TEST(AddNewPubSubConnectionWithWriterGroupAndDataSetWriter){
         pubSubConnection.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
 
         UA_ExtensionObject eo;
-        UA_NetworkAddressUrlDataType networkAddressDataType = {UA_STRING(""), UA_STRING("opc.udp://224.0.0.22:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressDataType = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
         UA_NetworkAddressUrlDataType* identityToken = UA_NetworkAddressUrlDataType_new();
         UA_NetworkAddressUrlDataType_init(identityToken);
         UA_NetworkAddressUrlDataType_copy(&networkAddressDataType, identityToken);
@@ -936,7 +938,7 @@ START_TEST(AddNewPubSubConnectionWithReaderGroup){
         pubSubConnection.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
 
         UA_ExtensionObject eo;
-        UA_NetworkAddressUrlDataType networkAddressDataType = {UA_STRING(""), UA_STRING("opc.udp://224.0.0.22:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressDataType = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
         UA_NetworkAddressUrlDataType* identityToken = UA_NetworkAddressUrlDataType_new();
         UA_NetworkAddressUrlDataType_init(identityToken);
         UA_NetworkAddressUrlDataType_copy(&networkAddressDataType, identityToken);
@@ -1009,7 +1011,7 @@ START_TEST(AddNewPubSubConnectionWithReaderGroupandDataSetReader){
         pubSubConnection.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
 
         UA_ExtensionObject eo;
-        UA_NetworkAddressUrlDataType networkAddressDataType = {UA_STRING(""), UA_STRING("opc.udp://224.0.0.22:4840/")};
+        UA_NetworkAddressUrlDataType networkAddressDataType = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
         UA_NetworkAddressUrlDataType* identityToken = UA_NetworkAddressUrlDataType_new();
         UA_NetworkAddressUrlDataType_init(identityToken);
         UA_NetworkAddressUrlDataType_copy(&networkAddressDataType, identityToken);
diff --git a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
index b077733b8e0..00f2c0fe7f8 100644
--- a/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_multiple_subscribe_rt_levels.c
@@ -10,6 +10,7 @@
 #include <open62541/server_config_default.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_pubsub_networkmessage.h"
 #include "testing_clock.h"
 
@@ -33,7 +34,7 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.enabled = UA_TRUE;
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = 2234;
diff --git a/tests/pubsub/check_pubsub_publish.c b/tests/pubsub/check_pubsub_publish.c
index a6f40362d74..2d2b235e21f 100644
--- a/tests/pubsub/check_pubsub_publish.c
+++ b/tests/pubsub/check_pubsub_publish.c
@@ -9,6 +9,7 @@
 #include <open62541/server_pubsub.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -32,7 +33,7 @@ static void setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/tests/pubsub/check_pubsub_publish_json.c b/tests/pubsub/check_pubsub_publish_json.c
index 1954ee1e2d5..20fa852fb10 100644
--- a/tests/pubsub/check_pubsub_publish_json.c
+++ b/tests/pubsub/check_pubsub_publish_json.c
@@ -10,6 +10,7 @@
 #include <open62541/types.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 
 #include <check.h>
 #include <stdlib.h>
@@ -29,7 +30,7 @@ static void setup(void) {
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
     UA_NetworkAddressUrlDataType networkAddressUrl =
-        {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+        UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
@@ -57,6 +58,17 @@ START_TEST(SinglePublishDataSetField){
     writerGroupConfig.name = UA_STRING("WriterGroup 1");
     writerGroupConfig.publishingInterval = 10;
     writerGroupConfig.encodingMimeType = UA_PUBSUB_ENCODING_JSON;
+
+    UA_DatagramWriterGroupTransport2DataType udpTransportSettings;
+    memset(&udpTransportSettings, 0, sizeof(UA_DatagramWriterGroupTransport2DataType));
+    UA_NetworkAddressUrlDataType writerGroupAddress =
+        UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
+    UA_ExtensionObject_setValue(&udpTransportSettings.address, &writerGroupAddress,
+                         &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
+
+    UA_ExtensionObject_setValue(&writerGroupConfig.transportSettings, &udpTransportSettings,
+                         &UA_TYPES[UA_TYPES_DATAGRAMWRITERGROUPTRANSPORT2DATATYPE]);
+
     UA_StatusCode retVal =
         UA_Server_addWriterGroup(server, connection1, &writerGroupConfig, &writerGroup1);
     ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
@@ -93,6 +105,11 @@ START_TEST(SinglePublishDataSetField){
     UA_WriterGroup *wg = UA_WriterGroup_findWGbyId(server, writerGroup1);
     ck_assert(wg != 0);
     UA_WriterGroup_publishCallback(server, wg);
+
+    UA_PubSubState state;
+    retVal = UA_Server_WriterGroup_getState(server, writerGroup1, &state);
+    ck_assert_int_eq(retVal, UA_STATUSCODE_GOOD);
+    ck_assert_int_eq(state, UA_PUBSUBSTATE_OPERATIONAL);
 } END_TEST
 
 int main(void) {
diff --git a/tests/pubsub/check_pubsub_publish_rt_levels.c b/tests/pubsub/check_pubsub_publish_rt_levels.c
index 07bf1c36460..2cfb8ee46a1 100644
--- a/tests/pubsub/check_pubsub_publish_rt_levels.c
+++ b/tests/pubsub/check_pubsub_publish_rt_levels.c
@@ -9,6 +9,7 @@
 #include <open62541/server_config_default.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_pubsub_networkmessage.h"
 #include <server/ua_server_internal.h>
 
@@ -32,7 +33,7 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.enabled = UA_TRUE;
     connectionConfig.eventLoop = rtEventLoop;
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT32;
     connectionConfig.publisherId.uint32 = UA_UInt32_random();
diff --git a/tests/pubsub/check_pubsub_publisherid.c b/tests/pubsub/check_pubsub_publisherid.c
index ff2f90e799f..32d9f134cd8 100644
--- a/tests/pubsub/check_pubsub_publisherid.c
+++ b/tests/pubsub/check_pubsub_publisherid.c
@@ -5,6 +5,7 @@
 #include "testing_clock.h"
 #include "ua_server_internal.h"
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 
 #ifdef UA_ENABLE_PUBSUB_FILE_CONFIG
 #include "ua_util_internal.h"
@@ -66,7 +67,7 @@ static void AddConnection(
     connectionConfig.name = UA_STRING(pName);
     connectionConfig.enabled = UA_TRUE;
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType = publisherIdType;
@@ -1433,8 +1434,9 @@ START_TEST(Test_string_publisherId_file_config) {
     connection->transportProfileUri = UA_STRING_ALLOC("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     UA_NetworkAddressUrlDataType *addr = UA_NetworkAddressUrlDataType_new();
     ck_assert(addr != 0);
-    UA_NetworkAddressUrlDataType_init(addr);
-    addr->url = UA_STRING_ALLOC("opc.udp://224.0.0.22:4840/");
+    ck_assert_int_eq(UA_STATUSCODE_GOOD,
+                     UA_PubSubTest_initNetworkAddressUrlAlloc(
+                         addr, UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840));
     connection->address.encoding = UA_EXTENSIONOBJECT_DECODED;
     connection->address.content.decoded.type = &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE];
     connection->address.content.decoded.data = addr;
diff --git a/tests/pubsub/check_pubsub_publishspeed.c b/tests/pubsub/check_pubsub_publishspeed.c
index d62a4307c54..b9442004a9d 100644
--- a/tests/pubsub/check_pubsub_publishspeed.c
+++ b/tests/pubsub/check_pubsub_publishspeed.c
@@ -8,6 +8,8 @@
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
+#include "pubsub_test_helpers.h"
+
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -29,7 +31,7 @@ static void setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/tests/pubsub/check_pubsub_sks_client.c b/tests/pubsub/check_pubsub_sks_client.c
index ed59cba5395..d29f08f6dc8 100644
--- a/tests/pubsub/check_pubsub_sks_client.c
+++ b/tests/pubsub/check_pubsub_sks_client.c
@@ -14,6 +14,7 @@
 #include <open62541/plugin/pki_default.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_pubsub_keystorage.h"
 #include "ua_server_internal.h"
 
@@ -215,8 +216,7 @@ publishersetup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {
-        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
@@ -245,8 +245,7 @@ subscribersetup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {
-        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
diff --git a/tests/pubsub/check_pubsub_sks_keystorage.c b/tests/pubsub/check_pubsub_sks_keystorage.c
index 604b533df84..d9fda92dc8e 100644
--- a/tests/pubsub/check_pubsub_sks_keystorage.c
+++ b/tests/pubsub/check_pubsub_sks_keystorage.c
@@ -10,6 +10,7 @@
 #include <open62541/server_pubsub.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_pubsub_keystorage.h"
 #include "ua_server_internal.h"
 
@@ -198,7 +199,7 @@ setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/tests/pubsub/check_pubsub_sks_pull.c b/tests/pubsub/check_pubsub_sks_pull.c
index f7b0bb8f0da..277fa41cf36 100644
--- a/tests/pubsub/check_pubsub_sks_pull.c
+++ b/tests/pubsub/check_pubsub_sks_pull.c
@@ -14,6 +14,7 @@
 #include <open62541/plugin/pki_default.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_pubsub_keystorage.h"
 #include "ua_server_internal.h"
 
@@ -159,8 +160,7 @@ setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {
-        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
diff --git a/tests/pubsub/check_pubsub_sks_push.c b/tests/pubsub/check_pubsub_sks_push.c
index 18913abe06e..d932c5f1b64 100644
--- a/tests/pubsub/check_pubsub_sks_push.c
+++ b/tests/pubsub/check_pubsub_sks_push.c
@@ -16,6 +16,7 @@
 
 #include "../encryption/certificates.h"
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_pubsub_keystorage.h"
 #include "ua_server_internal.h"
 
@@ -240,8 +241,7 @@ setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {
-        UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
diff --git a/tests/pubsub/check_pubsub_subscribe.c b/tests/pubsub/check_pubsub_subscribe.c
index 81e0e02d533..bdea5567123 100644
--- a/tests/pubsub/check_pubsub_subscribe.c
+++ b/tests/pubsub/check_pubsub_subscribe.c
@@ -15,9 +15,10 @@
 #include "testing_clock.h"
 #include "open62541/types_generated_handling.h"
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_server_internal.h"
 
-#define MULTICAST_URL "opc.udp://224.0.0.22:4801/"
+#define MULTICAST_URL UA_PUBSUB_TEST_UDP_MULTICAST_URL_4801
 //#define MULTICAST_URL "opc.udp://[ff01::100]:4801/"
 
 #define UA_SUBSCRIBER_PORT       4801    /* Port for Subscriber*/
@@ -109,7 +110,7 @@ static void setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Test Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING(MULTICAST_URL)};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(MULTICAST_URL);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri =
diff --git a/tests/pubsub/check_pubsub_subscribe_config_freeze.c b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
index b9ab24baf03..9cf58dba355 100644
--- a/tests/pubsub/check_pubsub_subscribe_config_freeze.c
+++ b/tests/pubsub/check_pubsub_subscribe_config_freeze.c
@@ -8,6 +8,8 @@
 #include <open62541/server_config_default.h>
 #include <open62541/server_pubsub.h>
 
+#include "pubsub_test_helpers.h"
+
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -37,7 +39,7 @@ START_TEST(CreateAndLockConfiguration) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     retVal |= UA_Server_addPubSubConnection(server, &connectionConfig, &connection1);
@@ -89,7 +91,7 @@ START_TEST(CreateAndReleaseMultipleLocks) {
     UA_StatusCode retVal = UA_STATUSCODE_GOOD;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
@@ -152,7 +154,7 @@ START_TEST(CreateLockAndEditConfiguration) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/tests/pubsub/check_pubsub_subscribe_encrypted.c b/tests/pubsub/check_pubsub_subscribe_encrypted.c
index 8f7e9383ac1..1adce938ba8 100644
--- a/tests/pubsub/check_pubsub_subscribe_encrypted.c
+++ b/tests/pubsub/check_pubsub_subscribe_encrypted.c
@@ -11,6 +11,7 @@
 #include <open62541/types_generated_handling.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_server_internal.h"
 
 #include <check.h>
@@ -67,7 +68,7 @@ static void setup(void) {
     UA_PubSubConnectionConfig connectionConfig;
     memset(&connectionConfig, 0, sizeof(UA_PubSubConnectionConfig));
     connectionConfig.name = UA_STRING("UADP Test Connection");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4801/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4801);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
diff --git a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
index 1a5f624bdd5..b70f9817c6c 100644
--- a/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
+++ b/tests/pubsub/check_pubsub_subscribe_msgrcvtimeout.c
@@ -5,6 +5,7 @@
 #include "testing_clock.h"
 #include "ua_server_internal.h"
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 
 #include <check.h>
 #include <stdlib.h>
@@ -98,7 +99,7 @@ static void AddConnection(
     connectionConfig.name = UA_STRING(pName);
     connectionConfig.enabled = UA_TRUE;
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL, UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl,
                          &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
 
diff --git a/tests/pubsub/check_pubsub_subscribe_rt_levels.c b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
index 5c91fa8902c..9521df3a24e 100644
--- a/tests/pubsub/check_pubsub_subscribe_rt_levels.c
+++ b/tests/pubsub/check_pubsub_subscribe_rt_levels.c
@@ -11,6 +11,7 @@
 #include <open62541/plugin/log_stdout.h>
 
 #include "ua_pubsub.h"
+#include "pubsub_test_helpers.h"
 #include "ua_pubsub_networkmessage.h"
 #include "testing_clock.h"
 
@@ -46,7 +47,7 @@ addMinimalPubSubConfiguration(void){
     connectionConfig.name = UA_STRING("UDP-UADP Connection 1");
     connectionConfig.transportProfileUri = UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
     connectionConfig.enabled = UA_TRUE;
-    UA_NetworkAddressUrlDataType networkAddressUrl = {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
+    UA_NetworkAddressUrlDataType networkAddressUrl = UA_PUBSUB_TEST_NETWORKADDRESSURL(UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840);
     UA_Variant_setScalar(&connectionConfig.address, &networkAddressUrl, &UA_TYPES[UA_TYPES_NETWORKADDRESSURLDATATYPE]);
     connectionConfig.publisherIdType = UA_PUBLISHERIDTYPE_UINT16;
     connectionConfig.publisherId.uint16 = 2234;
diff --git a/tests/pubsub/pubsub_test_helpers.h b/tests/pubsub/pubsub_test_helpers.h
new file mode 100644
index 00000000000..82493aa93a1
--- /dev/null
+++ b/tests/pubsub/pubsub_test_helpers.h
@@ -0,0 +1,109 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef OPEN62541_PUBSUB_TEST_HELPERS_H
+#define OPEN62541_PUBSUB_TEST_HELPERS_H
+
+#include <open62541/types.h>
+#include <open62541/types_generated_handling.h>
+
+#ifdef __APPLE__
+# include <ifaddrs.h>
+# include <net/if.h>
+# include <netinet/in.h>
+# include <sys/socket.h>
+# include <sys/types.h>
+# include <string.h>
+#endif
+
+static UA_INLINE char *
+UA_PubSubTest_getUdpMulticastUrl4840(void) {
+    static char url[] = "opc.udp://224.0.0.22:4840/";
+    return url;
+}
+
+static UA_INLINE char *
+UA_PubSubTest_getUdpMulticastUrl4801(void) {
+    static char url[] = "opc.udp://224.0.0.22:4801/";
+    return url;
+}
+
+static UA_INLINE char *
+UA_PubSubTest_getUdpMulticastUrlIPv6_4840(void) {
+    static char url[] = "opc.udp://[ff00::1:5]:4840/";
+    return url;
+}
+
+#define UA_PUBSUB_TEST_UDP_MULTICAST_URL_4840 UA_PubSubTest_getUdpMulticastUrl4840()
+#define UA_PUBSUB_TEST_UDP_MULTICAST_URL_4801 UA_PubSubTest_getUdpMulticastUrl4801()
+#define UA_PUBSUB_TEST_UDP_MULTICAST_URL_IPV6_4840 UA_PubSubTest_getUdpMulticastUrlIPv6_4840()
+
+static UA_INLINE UA_String
+UA_PubSubTest_getMulticastInterface(void) {
+#ifdef __APPLE__
+    static char interfaceName[IF_NAMESIZE];
+    struct ifaddrs *ifaddr = NULL;
+
+    if(interfaceName[0] != '\0')
+        return UA_STRING(interfaceName);
+
+    if(getifaddrs(&ifaddr) != 0)
+        return UA_STRING_NULL;
+
+    struct ifaddrs *fallback = NULL;
+    for(struct ifaddrs *ifa = ifaddr; ifa; ifa = ifa->ifa_next) {
+        if(!ifa->ifa_addr || ifa->ifa_addr->sa_family != AF_INET)
+            continue;
+        if((ifa->ifa_flags & IFF_UP) == 0 || (ifa->ifa_flags & IFF_MULTICAST) == 0)
+            continue;
+
+        if((ifa->ifa_flags & IFF_LOOPBACK) == 0) {
+            fallback = ifa;
+            break;
+        }
+        if(!fallback)
+            fallback = ifa;
+    }
+
+    if(fallback) {
+        strncpy(interfaceName, fallback->ifa_name, sizeof(interfaceName) - 1);
+        interfaceName[sizeof(interfaceName) - 1] = '\0';
+    }
+
+    freeifaddrs(ifaddr);
+    return interfaceName[0] != '\0' ? UA_STRING(interfaceName) : UA_STRING_NULL;
+#else
+    return UA_STRING_NULL;
+#endif
+}
+
+#define UA_PUBSUB_TEST_NETWORKADDRESSURL(URL) \
+    {UA_PubSubTest_getMulticastInterface(), UA_STRING(URL)}
+
+static UA_INLINE void
+UA_PubSubTest_initNetworkAddressUrl(UA_NetworkAddressUrlDataType *address,
+                                    char *url) {
+    UA_NetworkAddressUrlDataType_init(address);
+    address->networkInterface = UA_PubSubTest_getMulticastInterface();
+    address->url = UA_STRING(url);
+}
+
+static UA_INLINE UA_StatusCode
+UA_PubSubTest_initNetworkAddressUrlAlloc(UA_NetworkAddressUrlDataType *address,
+                                         char *url) {
+    UA_NetworkAddressUrlDataType_init(address);
+    UA_String networkInterface = UA_PubSubTest_getMulticastInterface();
+    if(networkInterface.length > 0) {
+        address->networkInterface =
+            UA_String_fromChars((char*)networkInterface.data);
+        if(address->networkInterface.length == 0)
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    address->url = UA_String_fromChars(url);
+    if(address->url.length == 0 && url && url[0] != '\0')
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    return UA_STATUSCODE_GOOD;
+}
+
+#endif /* OPEN62541_PUBSUB_TEST_HELPERS_H */

From 86002d83ed14c7ab49a172201ebcfac29cff07a0 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Sat, 27 Jun 2026 09:38:20 +0200
Subject: [PATCH 1938/1963] feat(arch): Implement UDP interface selection on
 MacOS

---
 arch/eventloop_posix_udp.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/eventloop_posix_udp.c b/arch/eventloop_posix_udp.c
index 55a7fa6fc5a..9862caa1b3a 100644
--- a/arch/eventloop_posix_udp.c
+++ b/arch/eventloop_posix_udp.c
@@ -216,20 +216,26 @@ setMulticastInterface(const char *netif, struct addrinfo *info,
             break;
     }
 
-    freeifaddrs(ifaddr);
-    if(!ifa)
+    if(!ifa) {
+        freeifaddrs(ifaddr);
         return UA_STATUSCODE_BADINTERNALERROR;
+    }
 
     /* Write the interface index */
     if(info->ai_family == AF_INET) {
 #if defined(ip_mreqn)
         req->ipv4.imr_ifindex = idx;
+#elif defined(__APPLE__)
+        struct sockaddr_in *sin = (struct sockaddr_in*)ifa->ifa_addr;
+        req->ipv4.imr_interface = sin->sin_addr;
 #endif
 #if UA_IPV6
     } else { /* if(info->ai_family == AF_INET6) */
         req->ipv6.ipv6mr_interface = idx;
 #endif
     }
+
+    freeifaddrs(ifaddr);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -535,6 +541,8 @@ setupSendMultiCast(UA_FD fd, struct addrinfo *info, const UA_KeyValueMap *params
 #ifdef UA_ARCHITECTURE_WIN32
                             (const char *)&req.ipv4.imr_interface,
                             sizeof(struct in_addr));
+#elif defined(__APPLE__)
+                            &req.ipv4.imr_interface, sizeof(struct in_addr));
 #else
                             &req.ipv4, sizeof(req.ipv4));
 #endif

From 435ac16aae0df9ac0d80bd4733bae34d88c10325 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Sat, 27 Jun 2026 09:48:53 +0200
Subject: [PATCH 1939/1963] fix(build): Fix FindCheck for cross-arch builds

---
 tools/cmake/FindCheck.cmake | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/cmake/FindCheck.cmake b/tools/cmake/FindCheck.cmake
index 25c8bbf54c3..b02dc148369 100644
--- a/tools/cmake/FindCheck.cmake
+++ b/tools/cmake/FindCheck.cmake
@@ -22,16 +22,20 @@ INCLUDE( FindPkgConfig )
 # Take care about check.pc settings
 PKG_SEARCH_MODULE( CHECK check )
 
-# pkg-config exports the plural CHECK_INCLUDE_DIRS and a bare library name.
-# Mirror them to the singular CHECK_INCLUDE_DIR and an absolute CHECK_LIBRARIES
-# that this module documents and the build expects.
+# pkg-config exports the plural CHECK_INCLUDE_DIRS and linker flags with the
+# architecture-specific library directory. Mirror them to the singular
+# CHECK_INCLUDE_DIR and CHECK_LIBRARIES that this module documents and the build
+# expects. Do not resolve the library again with find_library(), because that can
+# pick a host-architecture library during multilib/cross builds.
 IF( CHECK_FOUND )
 	IF( NOT CHECK_INCLUDE_DIR )
 		SET( CHECK_INCLUDE_DIR ${CHECK_INCLUDE_DIRS} )
 	ENDIF()
-	FIND_LIBRARY( CHECK_LIBRARY NAMES check PATHS ${CHECK_LIBRARY_DIRS} )
-	IF( CHECK_LIBRARY )
-		SET( CHECK_LIBRARIES ${CHECK_LIBRARY} )
+	IF( CHECK_LDFLAGS )
+		SET( CHECK_LIBRARIES ${CHECK_LDFLAGS} )
+		IF( CHECK_LDFLAGS_OTHER )
+			LIST( APPEND CHECK_LIBRARIES ${CHECK_LDFLAGS_OTHER} )
+		ENDIF()
 	ENDIF()
 ENDIF()
 

From 3c0f4ac49046e54eca7aa6d6eb05cbc82ea2a3fb Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Sat, 27 Jun 2026 10:17:47 +0200
Subject: [PATCH 1940/1963] refactor(tests): Speed up
 check_server_reverseconnect.c

---
 tests/server/check_server_reverseconnect.c | 141 +++++++++++----------
 1 file changed, 71 insertions(+), 70 deletions(-)

diff --git a/tests/server/check_server_reverseconnect.c b/tests/server/check_server_reverseconnect.c
index b2565e197f1..9462117bbe4 100644
--- a/tests/server/check_server_reverseconnect.c
+++ b/tests/server/check_server_reverseconnect.c
@@ -32,12 +32,15 @@ static UA_UInt64 reverseConnectHandle = 0;
 static int numClientCallbackCalled = 0;
 static UA_SecureChannelState clientCallbackStates[100];
 
+#define REVERSE_RECONNECT_INTERVAL_TEST 10
+#define REVERSECONNECT_MAX_ITERATIONS 1000
+
 bool runServer = false;
 THREAD_HANDLE server_thread;
 
 THREAD_CALLBACK(serverloop) {
     while (runServer)
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
     return 0;
 }
 
@@ -66,6 +69,8 @@ static void setup(void) {
     server = UA_Server_new();
     ck_assert(server != NULL);
     UA_ServerConfig_setDefault(UA_Server_getConfig(server));
+    UA_Server_getConfig(server)->reverseReconnectInterval =
+        REVERSE_RECONNECT_INTERVAL_TEST;
 
     client = UA_Client_new();
     UA_ClientConfig_setDefault(UA_Client_getConfig(client));
@@ -96,6 +101,44 @@ static void serverStateCallback(UA_Server *s, UA_UInt64 handle,
                  "Reverse connect callback called with state %d", state);
 }
 
+static void
+iterateClient(UA_UInt32 fakeSleep) {
+    UA_Client_run_iterate(client, 0);
+    UA_fakeSleep(fakeSleep);
+}
+
+static void
+iterateClientServer(UA_UInt32 fakeSleep) {
+    UA_Server_run_iterate(server, false);
+    UA_Client_run_iterate(client, 0);
+    UA_fakeSleep(fakeSleep);
+}
+
+static void
+iterateClientUntilCallbacks(int callbacks, UA_UInt32 fakeSleep) {
+    for(size_t i = 0; i < REVERSECONNECT_MAX_ITERATIONS &&
+        numClientCallbackCalled < callbacks; ++i)
+        iterateClient(fakeSleep);
+}
+
+static void
+iterateClientServerUntilCallbacks(int serverCallbacks, int clientCallbacks,
+                                  UA_UInt32 fakeSleep) {
+    for(size_t i = 0; i < REVERSECONNECT_MAX_ITERATIONS &&
+        (numServerCallbackCalled < serverCallbacks ||
+         numClientCallbackCalled < clientCallbacks); ++i)
+        iterateClientServer(fakeSleep);
+}
+
+static void
+iterateServerUntilCallbacks(int serverCallbacks, UA_UInt32 fakeSleep) {
+    for(size_t i = 0; i < REVERSECONNECT_MAX_ITERATIONS &&
+        numServerCallbackCalled < serverCallbacks; ++i) {
+        UA_Server_run_iterate(server, false);
+        UA_fakeSleep(fakeSleep);
+    }
+}
+
 START_TEST(listenAndTeardown) {
     UA_StatusCode ret = UA_STATUSCODE_BADINTERNALERROR;
 
@@ -106,20 +149,18 @@ START_TEST(listenAndTeardown) {
     ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for(int i = 0; i < 10; ++i) {
-        UA_Client_run_iterate(client, 1);
-        UA_fakeSleep(1000);
-    }
+    iterateClientUntilCallbacks(1, 1000);
 
     ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
     ck_assert_uint_eq(ret, UA_STATUSCODE_BADINVALIDSTATE);
 
     UA_Client_disconnect(client);
+    iterateClientUntilCallbacks(2, 1);
 
-    ck_assert_int_ge(numClientCallbackCalled, 3);
+    ck_assert_int_ge(numClientCallbackCalled, 2);
     ck_assert_int_eq(clientCallbackStates[0], UA_SECURECHANNELSTATE_REVERSE_LISTENING);
-    ck_assert_int_eq(clientCallbackStates[1], UA_SECURECHANNELSTATE_CLOSING);
-    ck_assert_int_eq(clientCallbackStates[2], UA_SECURECHANNELSTATE_CLOSED);
+    ck_assert(clientCallbackStates[1] == UA_SECURECHANNELSTATE_CLOSING ||
+              clientCallbackStates[1] == UA_SECURECHANNELSTATE_CLOSED);
 
 } END_TEST
 
@@ -162,16 +203,7 @@ START_TEST(addBeforeStart) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for(int i = 0; i < 100; ++i) {
-        UA_Server_run_iterate(server, false);
-        UA_Client_run_iterate(client, 1);
-
-        if(numServerCallbackCalled == 5 &&
-           numClientCallbackCalled == 5)
-            break;
-
-        UA_fakeSleep(1000);
-    }
+    iterateClientServerUntilCallbacks(5, 5, 1);
 
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
@@ -201,27 +233,19 @@ START_TEST(addAfterStart) {
     ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for(int i = 0; i < 100; ++i) {
-        UA_Server_run_iterate(server, true);
-        UA_Client_run_iterate(client, 1);
+    iterateClientServer(1);
 
-        if(i == 10) {
-            ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
-                                              serverStateCallback, (void *)1234,
-                                              &reverseConnectHandle);
-
-            ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
-            ck_assert_uint_ne(reverseConnectHandle, 0);
-        }
+    ret = UA_Server_addReverseConnect(server, UA_STRING("opc.tcp://127.0.0.1:4841"),
+                                      serverStateCallback, (void *)1234,
+                                      &reverseConnectHandle);
 
-        if(i == 20)
-            UA_Server_removeReverseConnect(server, reverseConnectHandle);
+    ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
+    ck_assert_uint_ne(reverseConnectHandle, 0);
 
-        if(numServerCallbackCalled == 5)
-            break;
+    iterateClientServerUntilCallbacks(4, 0, 1);
 
-        UA_fakeSleep(1);
-    }
+    UA_Server_removeReverseConnect(server, reverseConnectHandle);
+    iterateServerUntilCallbacks(5, 1);
 
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
@@ -251,11 +275,10 @@ START_TEST(checkReconnect) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for(int i = 0; i < 100; ++i) {
-        UA_Server_run_iterate(server, true);
-        UA_Client_run_iterate(client, 1);
+    for(size_t i = 0; i < REVERSECONNECT_MAX_ITERATIONS; ++i) {
+        iterateClientServer(1);
 
-        if(i == 50) {
+        if(numServerCallbackCalled == 4) {
             ck_assert_int_eq(numServerCallbackCalled, 4);
             ck_assert_int_eq(serverCallbackStates[0], UA_SECURECHANNELSTATE_CONNECTING);
             ck_assert_int_eq(serverCallbackStates[1], UA_SECURECHANNELSTATE_RHE_SENT);
@@ -268,10 +291,7 @@ START_TEST(checkReconnect) {
             ret = UA_Client_disconnectAsync(client);
             ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-            for(int j = 0; j < 5; ++j) {
-                UA_Client_run_iterate(client, 1);
-                UA_Server_run_iterate(server, true);
-            }
+            iterateClientServerUntilCallbacks(6, 0, 1);
 
             ck_assert_int_eq(numServerCallbackCalled, 6);
             ck_assert_int_eq(serverCallbackStates[4], UA_SECURECHANNELSTATE_CLOSING);
@@ -280,33 +300,22 @@ START_TEST(checkReconnect) {
             ret = UA_Client_startListeningForReverseConnect(client, &listenHost, 1, 4841);
             ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-            UA_fakeSleep(UA_Server_getConfig(server)->reverseReconnectInterval + 1000);
+            UA_fakeSleep(UA_Server_getConfig(server)->reverseReconnectInterval + 1);
 
-            UA_EventLoop *serverLoop = UA_Server_getConfig(server)->eventLoop;
-            UA_DateTime next = serverLoop->run(serverLoop, 1);
-            UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-
-            for(int j = 0; j < 5; ++j) {
-                UA_Client_run_iterate(client, 1);
-                next = serverLoop->run(serverLoop, 1);
-                UA_fakeSleep((UA_UInt32)((next - UA_DateTime_now()) / UA_DATETIME_MSEC));
-            }
+            iterateClientServerUntilCallbacks(9, 0, 1);
 
             ck_assert_int_eq(numServerCallbackCalled, 9);
             ck_assert_int_eq(serverCallbackStates[6], UA_SECURECHANNELSTATE_RHE_SENT);
             ck_assert_int_eq(serverCallbackStates[7], UA_SECURECHANNELSTATE_ACK_SENT);
             ck_assert_int_eq(serverCallbackStates[8], UA_SECURECHANNELSTATE_OPEN);
+            break;
 
         }
+    }
 
-        if(i == 80)
-            UA_Server_removeReverseConnect(server, reverseConnectHandle);
+    UA_Server_removeReverseConnect(server, reverseConnectHandle);
 
-        if(numServerCallbackCalled == 10)
-            break;
-
-        UA_fakeSleep(1000);
-    }
+    iterateClientServerUntilCallbacks(10, 0, 1);
 
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
@@ -332,15 +341,7 @@ START_TEST(removeOnShutdownWithConnection) {
     ret = UA_Server_run_startup(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
-    for(int i = 0; i < 20; ++i) {
-        UA_Server_run_iterate(server, true);
-        UA_Client_run_iterate(client, 100);
-
-        if(numServerCallbackCalled == 5)
-            break;
-
-        UA_fakeSleep(1000);
-    }
+    iterateClientServerUntilCallbacks(5, 0, 1);
 
     ret = UA_Server_run_shutdown(server);
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
@@ -367,7 +368,7 @@ START_TEST(removeOnShutdownWithoutConnection) {
     ck_assert_uint_eq(ret, UA_STATUSCODE_GOOD);
 
     for(int i = 0; i < 20; ++i) {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         UA_fakeSleep(1);
 
         if(numServerCallbackCalled == 2)

From a90304eec5237b0676258eb5c8709e2bf34cd56e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Sat, 27 Jun 2026 10:39:53 +0200
Subject: [PATCH 1941/1963] refactor(tests): Speed up
 check_monitoreditem_filter.c

---
 tests/server/check_monitoreditem_filter.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/server/check_monitoreditem_filter.c b/tests/server/check_monitoreditem_filter.c
index 238442788af..7341720003c 100644
--- a/tests/server/check_monitoreditem_filter.c
+++ b/tests/server/check_monitoreditem_filter.c
@@ -38,7 +38,7 @@ UA_DataValue lastValue;
 
 THREAD_CALLBACK(serverloop) {
     while(running)
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
     return 0;
 }
 
@@ -174,14 +174,18 @@ setDouble(UA_Client *thisClient, UA_NodeId node, UA_Double value) {
 static UA_StatusCode
 waitForNotification(UA_UInt32 notifications, UA_UInt32 maxTries) {
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
+    UA_UInt32 initialNotifications = countNotificationReceived;
     pauseServer();
     for(UA_UInt32 i = 0; i < maxTries; ++i) {
         UA_fakeSleep((UA_UInt32)publishingInterval + 100);
         UA_Server_run_iterate(server, false);
-        retval = UA_Client_run_iterate(client, 1);
+        retval = UA_Client_run_iterate(client, 0);
         if(retval != UA_STATUSCODE_GOOD)
             break;
-        if(countNotificationReceived == notifications)
+        if(countNotificationReceived == notifications &&
+           (notifications == 0 ||
+            countNotificationReceived != initialNotifications ||
+            notificationReceived))
             break;
     }
     runServer();
@@ -967,7 +971,7 @@ START_TEST(Server_MonitoredItemsAbsoluteFilterNULLValue) {
 
     notificationReceived = false;
     ck_assert_uint_eq(setDouble(client, outNodeId, 42.0), UA_STATUSCODE_GOOD);
-    ck_assert_uint_eq(waitForNotification(1, 10), UA_STATUSCODE_GOOD);
+    ck_assert_uint_eq(waitForNotification(2, 10), UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(notificationReceived, true);
     ck_assert_uint_eq(countNotificationReceived, 2);
 

From dc52683a30b8979d7db20f1343edd891fb92470c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Sat, 27 Jun 2026 10:40:33 +0200
Subject: [PATCH 1942/1963] refactor(tests): Speed up
 check_client_subscriptions.c

---
 tests/client/check_client_subscriptions.c | 150 ++++++++++++++--------
 1 file changed, 94 insertions(+), 56 deletions(-)

diff --git a/tests/client/check_client_subscriptions.c b/tests/client/check_client_subscriptions.c
index 31706f7de0d..34b79bdb3ac 100644
--- a/tests/client/check_client_subscriptions.c
+++ b/tests/client/check_client_subscriptions.c
@@ -153,14 +153,14 @@ START_TEST(Client_subscription) {
     running = false;
     THREAD_JOIN(server_thread);
 
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
 
     notificationReceived = false;
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(notificationReceived, true);
@@ -203,7 +203,7 @@ START_TEST(Client_subscription_async) {
 
     response.responseHeader.serviceResult = 1;
     do {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 1);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     } while(response.responseHeader.serviceResult == 1);
@@ -227,7 +227,7 @@ START_TEST(Client_subscription_async) {
 
     modifySubscriptionResponse.responseHeader.serviceResult = 1;
     do {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 1);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     } while(modifySubscriptionResponse.responseHeader.serviceResult == 1);
@@ -253,7 +253,7 @@ START_TEST(Client_subscription_async) {
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     do {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 0);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     } while(monResponse.resultsSize == 0 &&
@@ -267,7 +267,7 @@ START_TEST(Client_subscription_async) {
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
 
     notificationReceived = false;
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(notificationReceived, true);
@@ -287,7 +287,7 @@ START_TEST(Client_subscription_async) {
 
     monDeleteResponse.responseHeader.serviceResult = 1;
     do {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 1);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     } while(monDeleteResponse.responseHeader.serviceResult == 1);
@@ -309,7 +309,7 @@ START_TEST(Client_subscription_async) {
 
     subDeleteResponse.responseHeader.serviceResult = 1;
     do {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 1);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     } while(subDeleteResponse.responseHeader.serviceResult == 1);
@@ -398,7 +398,7 @@ START_TEST(Client_subscription_createDataChanges) {
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     notificationReceived = false;
     countNotificationReceived = 0;
@@ -409,7 +409,7 @@ START_TEST(Client_subscription_createDataChanges) {
     ck_assert_uint_eq(countNotificationReceived, 2);
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     notificationReceived = false;
     retval = UA_Client_run_iterate(client, 1);
@@ -521,19 +521,33 @@ START_TEST(Client_subscription_modifyMonitoredItem) {
     newMonitoredItemIds[0] = createResponse.results[0].monitoredItemId;
     UA_CreateMonitoredItemsResponse_clear(&createResponse);
 
-    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    /* manually control the publish cycles */
+    running = false;
+    THREAD_JOIN(server_thread);
 
     /* Receive the initial value */
     notificationReceived = false;
     countNotificationReceived = 0;
-    retval = UA_Client_run_iterate(client, (UA_UInt16)(publishingInterval + 1));
+    retval = UA_Client_run_iterate(client, 0);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    UA_Server_run_iterate(server, false);
+    retval = UA_Client_run_iterate(client, 0);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    for(size_t i = 0; i < 10 && !notificationReceived; ++i) {
+        UA_Server_run_iterate(server, false);
+        retval = UA_Client_run_iterate(client, 0);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    }
     ck_assert_uint_eq(notificationReceived, true);
     ck_assert_uint_eq(countNotificationReceived, 1);
 
     /* No further update */
     notificationReceived = false;
-    retval = UA_Client_run_iterate(client, (UA_UInt16)(publishingInterval + 1));
+    retval = UA_Client_run_iterate(client, 0);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_Server_run_iterate(server, false);
+    retval = UA_Client_run_iterate(client, 0);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(notificationReceived, false);
     ck_assert_uint_eq(countNotificationReceived, 1);
@@ -550,19 +564,26 @@ START_TEST(Client_subscription_modifyMonitoredItem) {
     modifyRequest.itemsToModify = &modify1;
     modifyRequest.itemsToModifySize = 1;
 
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
     UA_ModifyMonitoredItemsResponse modifyResponse =
         UA_Client_MonitoredItems_modify(client, modifyRequest);
     ck_assert_uint_eq(modifyResponse.resultsSize, 1);
     ck_assert_uint_eq(modifyResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
     UA_ModifyMonitoredItemsResponse_clear(&modifyResponse);
 
-    /* Sleep longer than the publishing interval */
-    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    running = false;
+    THREAD_JOIN(server_thread);
 
-    /* Don't receive an immediate update */
+    /* Sleep longer than the publishing interval */
     notificationReceived = false;
     countNotificationReceived = 0;
-    retval = UA_Client_run_iterate(client, (UA_UInt16)(publishingInterval + 1));
+    retval = UA_Client_run_iterate(client, 0);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    UA_Server_run_iterate(server, false);
+    retval = UA_Client_run_iterate(client, 0);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(notificationReceived, false);
     ck_assert_uint_eq(countNotificationReceived, 0);
@@ -577,34 +598,45 @@ START_TEST(Client_subscription_modifyMonitoredItem) {
         &UA_TYPES[UA_TYPES_DATACHANGEFILTER];
     modify1.requestedParameters.filter.encoding = UA_EXTENSIONOBJECT_DECODED;
 
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
     modifyResponse = UA_Client_MonitoredItems_modify(client, modifyRequest);
     ck_assert_uint_eq(modifyResponse.resultsSize, 1);
     ck_assert_uint_eq(modifyResponse.results[0].statusCode, UA_STATUSCODE_GOOD);
     UA_ModifyMonitoredItemsResponse_clear(&modifyResponse);
 
-    /* Sleep longer than the publishing interval */
-    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_realSleep((UA_UInt32)publishingInterval + 1);
+    running = false;
+    THREAD_JOIN(server_thread);
 
+    /* Sleep longer than the publishing interval */
     notificationReceived = false;
     countNotificationReceived = 0;
-    retval = UA_Client_run_iterate(client, (UA_UInt16)(publishingInterval + 1));
+    retval = UA_Client_run_iterate(client, 0);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    UA_fakeSleep((UA_UInt32)publishingInterval + 1);
+    UA_Server_run_iterate(server, false);
+    retval = UA_Client_run_iterate(client, 0);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(notificationReceived, false);
     ck_assert_uint_eq(countNotificationReceived, 0);
 
     /* Sleep long enough to trigger the next sampling. */
     UA_fakeSleep((UA_UInt32)(publishingInterval * 0.6));
-    UA_realSleep((UA_UInt32)(publishingInterval * 0.6));
+    UA_Server_run_iterate(server, false);
 
     /* Sleep long enough to trigger the publish callback */
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    retval = UA_Client_run_iterate(client, (UA_UInt16)(publishingInterval + 1));
+    UA_Server_run_iterate(server, false);
+    retval = UA_Client_run_iterate(client, 0);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     /* No change here, as the value subscribed value has no source timestamp. */
     ck_assert_uint_eq(notificationReceived, false);
     ck_assert_uint_eq(countNotificationReceived, 0);
 
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
     /* Delete and clean up */
     UA_DeleteMonitoredItemsRequest deleteRequest;
     UA_DeleteMonitoredItemsRequest_init(&deleteRequest);
@@ -688,7 +720,7 @@ START_TEST(Client_subscription_createDataChanges_async) {
 
     createResponse.responseHeader.serviceResult = 1;
     do {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         retval = UA_Client_run_iterate(client, 1);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     } while(createResponse.responseHeader.serviceResult == 1);
@@ -706,7 +738,7 @@ START_TEST(Client_subscription_createDataChanges_async) {
     UA_CreateMonitoredItemsResponse_clear(&createResponse);
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     notificationReceived = false;
     countNotificationReceived = 0;
@@ -716,7 +748,7 @@ START_TEST(Client_subscription_createDataChanges_async) {
     ck_assert_uint_eq(countNotificationReceived, 2);
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     notificationReceived = false;
     retval = UA_Client_run_iterate(client, 1);
@@ -724,10 +756,6 @@ START_TEST(Client_subscription_createDataChanges_async) {
     ck_assert_uint_eq(notificationReceived, true);
     ck_assert_uint_eq(countNotificationReceived, 3);
 
-    /* run the server in an independent thread again */
-    running = true;
-    THREAD_CREATE(server_thread, serverloop);
-
     UA_DeleteMonitoredItemsRequest deleteRequest;
     UA_DeleteMonitoredItemsRequest_init(&deleteRequest);
     deleteRequest.subscriptionId = subId;
@@ -735,12 +763,18 @@ START_TEST(Client_subscription_createDataChanges_async) {
     deleteRequest.monitoredItemIdsSize = 3;
 
     UA_DeleteMonitoredItemsResponse deleteResponse;
+    UA_DeleteMonitoredItemsResponse_init(&deleteResponse);
     retval = UA_Client_MonitoredItems_delete_async(client, deleteRequest,
                                                    deleteMonitoredItemsCallback, &deleteResponse, &reqId);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_realSleep(500);  // need to wait until response is at the client
-    retval = UA_Client_run_iterate(client, 0);
-    ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+
+    for(size_t i = 0; i < 1000 &&
+        deleteResponse.responseHeader.serviceResult == UA_STATUSCODE_GOOD &&
+        deleteResponse.resultsSize == 0; ++i) {
+        UA_Server_run_iterate(server, false);
+        retval = UA_Client_run_iterate(client, 0);
+        ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
+    }
 
     ck_assert_uint_eq(deleteResponse.responseHeader.serviceResult, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(deleteResponse.resultsSize, 3);
@@ -750,6 +784,10 @@ START_TEST(Client_subscription_createDataChanges_async) {
 
     UA_DeleteMonitoredItemsResponse_clear(&deleteResponse);
 
+    /* run the server in an independent thread again */
+    running = true;
+    THREAD_CREATE(server_thread, serverloop);
+
     // Async subscription deletion is tested in Client_subscription_async
     // simplify test case using synchronous here
     retval = UA_Client_Subscriptions_deleteSingle(client, subId);
@@ -871,7 +909,7 @@ START_TEST(Client_subscription_priority) {
 
     /* Ensure that the subscription is late */
     UA_fakeSleep((UA_UInt32)(publishingInterval + 1));
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     /* run the server in an independent thread again */
     running = true;
@@ -956,7 +994,7 @@ START_TEST(Client_subscription_connectionClose) {
 
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     /* Send Publish requests */
     retval = UA_Client_run_iterate(client, 1);
@@ -965,7 +1003,7 @@ START_TEST(Client_subscription_connectionClose) {
     /* Still receiving on the MonitoredItem */
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
 
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     countNotificationReceived = 0;
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
@@ -1016,11 +1054,11 @@ START_TEST(Client_subscription_statusChange) {
 
     /* Send publish requests and receive them on the server side */
     UA_Client_run_iterate(client, 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     /* Server sends a StatusChange notification */
     UA_fakeSleep((UA_UInt32)response.revisedPublishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     /* Client receives the StatusChange */
     UA_Client_run_iterate(client, 1);
@@ -1081,7 +1119,7 @@ START_TEST(Client_subscription_writeBurst) {
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
 
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
@@ -1091,7 +1129,7 @@ START_TEST(Client_subscription_writeBurst) {
         retval = UA_Client_writeValueAttribute_async(client, myIntegerNodeId, &attr.value,
                                                      NULL, NULL, NULL);
         ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         UA_Client_run_iterate(client, 1);
         UA_fakeSleep(2);
     } while(UA_DateTime_nowMonotonic() - origTime < 1 * UA_DATETIME_SEC);
@@ -1199,9 +1237,9 @@ START_TEST(Client_subscription_detach) {
 
     /* Let the subscription run its course */
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     /* run the server in an independent thread again */
     running = true;
@@ -1241,20 +1279,20 @@ START_TEST(Client_subscription_without_notification) {
     running = false;
     THREAD_JOIN(server_thread);
 
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
 
     notificationReceived = false;
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(notificationReceived, true);
 
     notificationReceived = false;
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     retval = UA_Client_run_iterate(client, 1);
     ck_assert_uint_eq(retval, UA_STATUSCODE_GOOD);
     ck_assert_uint_eq(notificationReceived, false);
@@ -1369,21 +1407,21 @@ START_TEST(Client_subscription_async_sub) {
 
     while(!hasMon) {
         UA_Client_run_iterate(client, 1);
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
     }
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     UA_Client_run_iterate(client, 1);
 
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
     UA_Client_run_iterate(client, 1);
 
     ck_assert_uint_eq(notificationReceived, true);
     ck_assert_uint_eq(countNotificationReceived, 1);
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     notificationReceived = false;
     UA_Client_run_iterate(client, 1);
@@ -1391,7 +1429,7 @@ START_TEST(Client_subscription_async_sub) {
     ck_assert_uint_eq(countNotificationReceived, 2);
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     notificationReceived = false;
     UA_Client_run_iterate(client, 1);
@@ -1399,7 +1437,7 @@ START_TEST(Client_subscription_async_sub) {
     ck_assert_uint_eq(countNotificationReceived, 3);
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     notificationReceived = false;
     UA_Client_run_iterate(client, 1);
@@ -1407,7 +1445,7 @@ START_TEST(Client_subscription_async_sub) {
     ck_assert_uint_eq(countNotificationReceived, 4);
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     notificationReceived = false;
     UA_Client_run_iterate(client, 1);
@@ -1422,7 +1460,7 @@ START_TEST(Client_subscription_async_sub) {
     ck_assert_uint_lt(client->config.outStandingPublishRequests, 10);
     ck_assert_uint_eq(inactivityCallbackCalled, false);
 
-    UA_Client_run_iterate(client, (UA_UInt16)cc->timeout);
+    UA_Client_run_iterate(client, 0);
     ck_assert_uint_eq(inactivityCallbackCalled, true);
     ck_assert_uint_eq(sessState, UA_SESSIONSTATE_CREATED);
 
@@ -1459,12 +1497,12 @@ START_TEST(Client_subscription_reconnect) {
     THREAD_JOIN(server_thread);
 
     while(!hasMon) {
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
         UA_Client_run_iterate(client, 1);
     }
 
     UA_fakeSleep((UA_UInt32)publishingInterval + 1);
-    UA_Server_run_iterate(server, true);
+    UA_Server_run_iterate(server, false);
 
     countNotificationReceived = 0;
 
@@ -1492,7 +1530,7 @@ START_TEST(Client_subscription_reconnect) {
     while(!notificationReceived) {
         UA_fakeSleep((UA_UInt32)publishingInterval + 1);
         UA_Client_run_iterate(client, 1);
-        UA_Server_run_iterate(server, true);
+        UA_Server_run_iterate(server, false);
     }
 
     ck_assert_uint_eq(notificationReceived, true);

From c41d3d6ad0638e582a664203244aeb0398dbeeef Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Sat, 27 Jun 2026 11:19:44 +0200
Subject: [PATCH 1943/1963] fix(tests): Adjust expected status codes in
 check_crl_validation.c

---
 tests/encryption/check_crl_validation.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/encryption/check_crl_validation.c b/tests/encryption/check_crl_validation.c
index 9f5761af922..98c8b9d00cb 100644
--- a/tests/encryption/check_crl_validation.c
+++ b/tests/encryption/check_crl_validation.c
@@ -335,9 +335,9 @@ START_TEST(encryption_connect_issuer_revoked) {
     ck_assert(client != NULL);
 
     /* Secure client connect. The intermediate CA certificate is revoked by the
-     * root CA's CRL, so the issuer of the application certificate is revoked. */
+     * root CA's CRL, so the server rejects the handshake. */
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
-    ck_assert_uint_eq(retval, UA_STATUSCODE_BADCERTIFICATEISSUERREVOKED);
+    ck_assert_uint_eq(retval, UA_STATUSCODE_BADSECURITYCHECKSFAILED);
 
     UA_Client_disconnect(client);
     UA_Client_delete(client);

From db393f2c94374ee55d89ef46e5163686932222ee Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Sun, 28 Jun 2026 17:34:08 +0200
Subject: [PATCH 1944/1963] refactor(build): Bump version to v1.3.18

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf4c4fd65ee..d34a23b040a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 17)
+set(OPEN62541_VER_PATCH 18)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 17b65bc21791c1bcac4836443c37af12f8577882 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Sun, 28 Jun 2026 17:43:22 +0200
Subject: [PATCH 1945/1963] refactor(build): Bump version to v1.4.17

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bac59a763cd..520ed1a42f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 16)
+set(OPEN62541_VER_PATCH 17)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 7cf493ecca5a3cffef3191e65651f03694c3f7f5 Mon Sep 17 00:00:00 2001
From: lonelybones <trillhash@protonmail.com>
Date: Tue, 31 Mar 2026 08:55:30 -0400
Subject: [PATCH 1946/1963] fix(core): use correct size in memset after moving
 Variant array elements

Variant_setRange uses sizeof(elem_size) instead of elem_size in
the memset that zeros moved array elements. sizeof(elem_size)
always evaluates to sizeof(size_t), which is 8 on 64-bit. For
types with memSize > 8 (e.g. UA_String at 16 bytes), only half
the struct is zeroed, leaving heap pointers dangling. This causes
a double-free when both the source and the variant are cleared.
---
 src/ua_types.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ua_types.c b/src/ua_types.c
index 2fff32e18bb..f16bb0ec107 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -931,7 +931,7 @@ Variant_setRange(UA_Variant *v, void *array, size_t arraySize,
 
     /* If members were moved, initialize original array to prevent reuse */
     if(!copy && !v->type->pointerFree)
-        memset(array, 0, sizeof(elem_size)*arraySize);
+        memset(array, 0, elem_size*arraySize);
 
     return retval;
 }

From 9c1636a2325ef46a2cc463789b06b31e8da639f3 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Tue, 28 Apr 2026 10:24:00 +0200
Subject: [PATCH 1947/1963] fix(server): Cap default outstanding PublishRequest
 count per session

The default server configuration zero-initialises
maxPublishReqPerSession, which disables the per-session cap on
outstanding PublishRequest entries. A remote client that is allowed
to create a session and a subscription can therefore send an
unbounded number of PublishRequest messages, each of which allocates
a UA_PublishResponseEntry and appends it to the session's publish
queue. The resulting monotonic heap growth causes process memory
exhaustion and a denial of service.

Set a safe finite default of 512 outstanding PublishRequests per
session in setDefaultConfig() so that the cap is enforced out of the
box, while still allowing deployers to override it.

Internal Vulnerability Advisory: open62541-SA-2026-0010
Co-Authored-By: keyme <kmm2003@users.noreply.github.com>
---
 plugins/ua_config_default.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index b1445975c63..01c21455919 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -211,6 +211,7 @@ setDefaultConfig(UA_ServerConfig *conf) {
     conf->maxNotificationsPerPublish = 1000;
     conf->enableRetransmissionQueue = true;
     conf->maxRetransmissionQueueSize = 0; /* unlimited */
+    conf->maxPublishReqPerSession = 512; /* limit outstanding publish requests per session */
 # ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
     conf->maxEventsPerNode = 0; /* unlimited */
 # endif

From 0b6352e5e52d104a05f9e2147411ed8f27e2b86b Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Mon, 23 Mar 2026 17:09:00 +0100
Subject: [PATCH 1948/1963] fix(server): Skip event-field evaluation for
 subscriptions without an attached session

When an event subscription outlives the session that created it (e.g.
after CloseSession with deleteSubscriptions=false, or before a
TransferSubscriptions call), sub->session is NULL. The function then
passes a NULL session to filterEvent()/readWithSession(), which
dereferences the session when resolving SimpleAttributeOperands, leading
to a NULL pointer dereference and immediate process termination. A
subsequent TransferSubscriptions could also let a less-privileged
client inherit the queued event notifications.

Do not evaluate event fields while the subscription has no attached
session. The monitored item is effectively dormant and is skipped by
this guard; as soon as the subscription is re-bound to a session,
event evaluation resumes under that session's access rights.

Internal Vulnerability Advisory: open62541-SA-2026-0007
Co-Authored-By: keyme <kmm2003@users.noreply.github.com>
---
 src/server/ua_subscription_events.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/server/ua_subscription_events.c b/src/server/ua_subscription_events.c
index d058b66caab..26c7d250978 100644
--- a/src/server/ua_subscription_events.c
+++ b/src/server/ua_subscription_events.c
@@ -191,6 +191,16 @@ UA_MonitoredItem_addEvent(UA_Server *server, UA_MonitoredItem *mon,
      * not taken for local MonitoredItems (once they are enabled for Events). */
     UA_assert(mon->subscription);
     UA_Subscription *sub = mon->subscription;
+
+    /* Do not evaluate event fields for detached subscriptions. A NULL
+     * sub->session means the subscription outlived its session (e.g. after
+     * CloseSession with deleteSubscriptions=false, or before a
+     * TransferSubscriptions call). Filter resolution later in this function
+     * dereferences the session; using &server->adminSession here would bypass
+     * per-session access control and could leak event fields to a less
+     * privileged client that subsequently transfers the subscription. */
+    if(!sub->session)
+        return UA_STATUSCODE_GOOD;
     UA_Session *session = sub->session;
 
     UA_EventFilterResult res; /* FilterResult contains only statuscodes. Ignored

From f117b5ee30dc98b2aca279edfc2ca53b89482486 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Tue, 28 Apr 2026 10:24:00 +0200
Subject: [PATCH 1949/1963] fix(server): Cap default outstanding PublishRequest
 count per session

The default server configuration zero-initialises
maxPublishReqPerSession, which disables the per-session cap on
outstanding PublishRequest entries. A remote client that is allowed
to create a session and a subscription can therefore send an
unbounded number of PublishRequest messages, each of which allocates
a UA_PublishResponseEntry and appends it to the session's publish
queue. The resulting monotonic heap growth causes process memory
exhaustion and a denial of service.

Set a safe finite default of 512 outstanding PublishRequests per
session in setDefaultConfig() so that the cap enforced by
UA_Session_ensurePublishQueueSpace() is active in the default profile,
while still allowing deployers to override it.

Internal Vulnerability Advisory: open62541-SA-2026-0010
Co-Authored-By: keyme <kmm2003@users.noreply.github.com>
---
 plugins/ua_config_default.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/ua_config_default.c b/plugins/ua_config_default.c
index 0df86c58abc..f25ed26e87b 100644
--- a/plugins/ua_config_default.c
+++ b/plugins/ua_config_default.c
@@ -470,6 +470,7 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
     conf->maxNotificationsPerPublish = 1000;
     conf->enableRetransmissionQueue = true;
     conf->maxRetransmissionQueueSize = 0; /* unlimited */
+    conf->maxPublishReqPerSession = 512; /* limit outstanding publish requests per session */
 # ifdef UA_ENABLE_SUBSCRIPTIONS_EVENTS
     conf->maxEventsPerNode = 0; /* unlimited */
 # endif

From e025006b023c295eaef5d0f10c89adfffa8ab929 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Tue, 21 Jul 2026 11:33:55 +0200
Subject: [PATCH 1950/1963] fix(deps): always NUL-terminate cj5_get_str()
 output buffer

cj5_get_str() only wrote the terminating NUL on its success path. Every
error return (incomplete/invalid escape sequences, truncated \u
codepoints, invalid surrogate pairs) left the caller-supplied buffer
unterminated.

Callers in ua_config_json.c (e.g. BuildInfo_parseJson()) allocate the
buffer with UA_malloc() and pass it to strcmp()/UA_LOG_ERROR("%s", ...)
without checking cj5_get_str()'s return code, so a malformed escape in
a JSON5 config field name (e.g. "\u12") causes a heap out-of-bounds read
past the allocation.

Restructure cj5_get_str() around a single exit point so buf[outpos] = 0
is written unconditionally, before every return -- success or error.
Callers should still check the returned error code, but can no longer
read past the buffer if they don't.

Co-authored-by: Martin Mohl <Whit3rose@users.noreply.github.com>
---
 deps/cj5.c | 66 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/deps/cj5.c b/deps/cj5.c
index 87e06df12b6..3fd9beb2a64 100644
--- a/deps/cj5.c
+++ b/deps/cj5.c
@@ -671,19 +671,26 @@ cj5_error_code
 cj5_get_str(const cj5_result *r, unsigned int tok_index,
             char *buf, unsigned int *buflen) {
     const cj5_token *token = &r->tokens[tok_index];
-    if(token->type != CJ5_TOKEN_STRING)
+    if(token->type != CJ5_TOKEN_STRING) {
+        buf[0] = 0;
+        if(buflen)
+            *buflen = 0;
         return CJ5_ERROR_INVALID;
+    }
 
     const char *pos = &r->json5[token->start];
     const char *end = &r->json5[token->end + 1];
     unsigned int outpos = 0;
+    cj5_error_code error = CJ5_ERROR_NONE;
     for(; pos < end; pos++) {
         uint8_t c = (uint8_t)*pos;
 
         // Process an escape character
         if(c == '\\') {
-            if(pos + 1 >= end)
-                return CJ5_ERROR_INCOMPLETE;
+            if(pos + 1 >= end) {
+                error = CJ5_ERROR_INCOMPLETE;
+                goto done;
+            }
             pos++;
             c = (uint8_t)*pos;
             switch(c) {
@@ -698,33 +705,40 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
             case 't':  buf[outpos++] = '\t'; break;
             case 'u': {
                 // Parse the unicode code point
-                if(pos + 4 >= end)
-                    return CJ5_ERROR_INCOMPLETE;
+                if(pos + 4 >= end) {
+                    error = CJ5_ERROR_INCOMPLETE;
+                    goto done;
+                }
                 pos++;
                 uint32_t utf;
-                cj5_error_code err = parse_codepoint(pos, &utf);
-                if(err != CJ5_ERROR_NONE)
-                    return err;
+                error = parse_codepoint(pos, &utf);
+                if(error != CJ5_ERROR_NONE)
+                    goto done;
                 pos += 3;
 
                 if(0xD800 <= utf && utf <= 0xDBFF) {
                     // Parse a surrogate pair
-                    if(pos + 6 >= end)
-                        return CJ5_ERROR_INVALID;
-                    if(pos[1] != '\\' && pos[3] != 'u')
-                        return CJ5_ERROR_INVALID;
+                    if(pos + 6 >= end) {
+                        error = CJ5_ERROR_INVALID;
+                        goto done;
+                    }
+                    if(pos[1] != '\\' && pos[3] != 'u') {
+                        error = CJ5_ERROR_INVALID;
+                        goto done;
+                    }
                     pos += 3;
                     uint32_t trail;
-                    err = parse_codepoint(pos, &trail);
-                    if(err != CJ5_ERROR_NONE)
-                        return err;
+                    error = parse_codepoint(pos, &trail);
+                    if(error != CJ5_ERROR_NONE)
+                        goto done;
                     pos += 3;
                     utf = (utf << 10) + trail + SURROGATE_OFFSET;
                 } else if(0xDC00 <= utf && utf <= 0xDFFF) {
                     // Invalid Unicode '\\u%04X'
-                    return CJ5_ERROR_INVALID;
+                    error = CJ5_ERROR_INVALID;
+                    goto done;
                 }
-                
+
                 // Write the utf8 bytes of the code point
                 if(utf <= 0x7F) { // Plain ASCII
                     buf[outpos++] = (char)utf;
@@ -741,12 +755,14 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
                     buf[outpos++] = (char)(((utf >>  6) & 0x3F) | 0x80);
                     buf[outpos++] = (char)(((utf >>  0) & 0x3F) | 0x80);
                 } else {
-                    return CJ5_ERROR_INVALID; // Not a utf8 string
+                    error = CJ5_ERROR_INVALID; // Not a utf8 string
+                    goto done;
                 }
                 break;
             }
             default:
-                return CJ5_ERROR_INVALID;
+                error = CJ5_ERROR_INVALID;
+                goto done;
             }
             continue;
         }
@@ -755,20 +771,24 @@ cj5_get_str(const cj5_result *r, unsigned int tok_index,
         // quotes if the quote character is not the same as the surrounding
         // quote character, e.g. 'this is my "quote"'. This logic is in the
         // token parsing code and not in this "string extraction" method.
-        if(c < ' '   || c == 127)
-            return CJ5_ERROR_INVALID;
+        if(c < ' '   || c == 127) {
+            error = CJ5_ERROR_INVALID;
+            goto done;
+        }
 
         // Ascii character or utf8 byte
         buf[outpos++] = (char)c;
     }
 
-    // Terminate with \0
+ done:
+    // Always leave buf as a valid, NUL-terminated string, even when decoding
+    // fails midway. Callers still must check the returned error code.
     buf[outpos] = 0;
 
     // Set the output length
     if(buflen)
         *buflen = outpos;
-    return CJ5_ERROR_NONE;
+    return error;
 }
 
 void

From 509972ca0f3df91df6c0b5eca303447537dc18c5 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Tue, 21 Jul 2026 12:15:20 +0200
Subject: [PATCH 1951/1963] test(server): add regression coverage for the
 cj5_get_str() OOB read

Add unit tests to check_cj5.c that call cj5_get_str() directly with
unpaired/truncated UTF-16 surrogate escapes -- the actual reachable
trigger for the bug, since cj5_parse()'s tokenizer already rejects
most other malformed \u escapes before cj5_get_str() runs. These are
the deterministic regression guard: they fail under ASan on the
pre-fix cj5_get_str() and pass cleanly after.

Add check_server_config_json.c as an API-level smoke test through
UA_ServerConfig_updateFromFile()/UA_Server_newFromFile(), and
fuzz_config_json.cc since no fuzz target previously exercised the
config-file JSON parser at all.
---
 tests/CMakeLists.txt                    |   8 ++
 tests/check_cj5.c                       | 109 ++++++++++++++++++++++++
 tests/fuzz/CMakeLists.txt               |   5 ++
 tests/fuzz/fuzz_config_json.cc          |  35 ++++++++
 tests/server/check_server_config_json.c | 107 +++++++++++++++++++++++
 5 files changed, 264 insertions(+)
 create mode 100644 tests/fuzz/fuzz_config_json.cc
 create mode 100644 tests/server/check_server_config_json.c

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1494090e000..b62983de9f8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -93,6 +93,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
 endif()
 
+if(UA_ENABLE_JSON_ENCODING)
+    list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_config_json.c)
+endif()
+
 if(UA_ENABLE_MQTT)
     list(APPEND test_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
 endif()
@@ -275,6 +279,10 @@ endif()
 
 # Test Server
 
+if(UA_ENABLE_JSON_ENCODING)
+    ua_add_test(server/check_server_config_json.c)
+endif()
+
 ua_add_test(server/check_accesscontrol.c)
 ua_add_test(server/check_services_view.c)
 ua_add_test(server/check_services_attributes.c)
diff --git a/tests/check_cj5.c b/tests/check_cj5.c
index 36a41bc3124..a5c57d1a4e8 100644
--- a/tests/check_cj5.c
+++ b/tests/check_cj5.c
@@ -215,6 +215,107 @@ START_TEST(parseNegInf) {
     ck_assert_msg(val == -INFINITY, "val: %f", val);
 } END_TEST
 
+/* Regression tests for GHSA-38g6-5hfj-2fj7: cj5_get_str() must leave its
+ * output buffer NUL-terminated on every return path, not just on success.
+ * BuildInfo_parseJson() and its siblings in plugins/ua_config_json.c
+ * allocate the buffer with exactly UA_malloc(tok.size + 1) bytes and use it
+ * with strcmp()/"%s" logging without checking cj5_get_str()'s return code,
+ * so an unterminated buffer is read out of bounds.
+ *
+ * Note: cj5_parse()'s tokenizer already rejects most malformed \u escapes
+ * (e.g. "\u12") before cj5_get_str() is ever reached. The bug is only
+ * reachable through an unpaired/truncated UTF-16 surrogate pair, where the
+ * tokenizer's lookahead succeeds but cj5_get_str()'s stricter, token-local
+ * revalidation fails. */
+START_TEST(getStrTruncatedSurrogateIsTerminated) {
+    const char *json = "{'a':\"\\uD800\"}";
+    cj5_token tokens[16];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 16, NULL);
+    ck_assert_int_eq(r.error, CJ5_ERROR_NONE);
+
+    unsigned int idx = 2; /* the value string "\uD800" */
+    ck_assert_int_eq(tokens[idx].type, CJ5_TOKEN_STRING);
+
+    char *buf = (char*)malloc(tokens[idx].size + 1); /* exactly like UA_malloc(tok.size+1) */
+    unsigned int outlen = 0;
+    cj5_error_code err = cj5_get_str(&r, idx, buf, &outlen);
+    ck_assert_int_eq(err, CJ5_ERROR_INVALID);
+
+    /* buf must be a valid, in-bounds C string regardless of the error */
+    ck_assert_uint_eq(strlen(buf), outlen);
+    ck_assert_uint_le(outlen, tokens[idx].size);
+    ck_assert_int_ne(strcmp(buf, "productUri"), 0); /* the exact BuildInfo_parseJson() pattern */
+    free(buf);
+} END_TEST
+
+START_TEST(getStrUnpairedLowSurrogateIsTerminated) {
+    const char *json = "{'a':\"\\uDC00\"}";
+    cj5_token tokens[16];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 16, NULL);
+    ck_assert_int_eq(r.error, CJ5_ERROR_NONE);
+
+    unsigned int idx = 2;
+    char *buf = (char*)malloc(tokens[idx].size + 1);
+    unsigned int outlen = 0;
+    cj5_error_code err = cj5_get_str(&r, idx, buf, &outlen);
+    ck_assert_int_eq(err, CJ5_ERROR_INVALID);
+    ck_assert_uint_eq(strlen(buf), outlen);
+    free(buf);
+} END_TEST
+
+START_TEST(getStrSurrogateBadContinuationIsTerminated) {
+    const char *json = "{'a':\"\\uD800XX\"}";
+    cj5_token tokens[16];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 16, NULL);
+    ck_assert_int_eq(r.error, CJ5_ERROR_NONE);
+
+    unsigned int idx = 2;
+    char *buf = (char*)malloc(tokens[idx].size + 1);
+    unsigned int outlen = 0;
+    cj5_error_code err = cj5_get_str(&r, idx, buf, &outlen);
+    ck_assert_int_eq(err, CJ5_ERROR_INVALID);
+    ck_assert_uint_eq(strlen(buf), outlen);
+    free(buf);
+} END_TEST
+
+/* Direct unit test of the very first early-return path (wrong token type),
+ * which is not reachable through cj5_parse() from a real document but is
+ * part of cj5_get_str()'s public contract. */
+START_TEST(getStrWrongTokenTypeIsTerminated) {
+    const char *json = "{'a':42}";
+    cj5_token tokens[16];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 16, NULL);
+    ck_assert_int_eq(r.error, CJ5_ERROR_NONE);
+
+    unsigned int idx = 2; /* the NUMBER token 42, not a string */
+    ck_assert_int_eq(tokens[idx].type, CJ5_TOKEN_NUMBER);
+
+    char *buf = (char*)malloc(tokens[idx].size + 1);
+    unsigned int outlen = 0;
+    cj5_error_code err = cj5_get_str(&r, idx, buf, &outlen);
+    ck_assert_int_eq(err, CJ5_ERROR_INVALID);
+    ck_assert_uint_eq(strlen(buf), 0);
+    free(buf);
+} END_TEST
+
+/* Positive control: a valid surrogate pair must still decode correctly.
+ * Guards against the fix accidentally breaking legitimate Unicode input. */
+START_TEST(getStrValidSurrogatePairStillWorks) {
+    const char *json = "{'a':\"\\uD834\\uDD1E\"}"; /* U+1D11E, MUSICAL SYMBOL G CLEF */
+    cj5_token tokens[16];
+    cj5_result r = cj5_parse(json, (unsigned int)strlen(json), tokens, 16, NULL);
+    ck_assert_int_eq(r.error, CJ5_ERROR_NONE);
+
+    unsigned int idx = 2;
+    char *buf = (char*)malloc(tokens[idx].size + 1);
+    unsigned int outlen = 0;
+    cj5_error_code err = cj5_get_str(&r, idx, buf, &outlen);
+    ck_assert_int_eq(err, CJ5_ERROR_NONE);
+    ck_assert_uint_eq(outlen, 4); /* 4-byte UTF-8 encoding of U+1D11E */
+    ck_assert_uint_eq(strlen(buf), 4);
+    free(buf);
+} END_TEST
+
 static Suite *testSuite_builtin_json(void) {
     TCase *tc_parse= tcase_create("cj5_parse");
     tcase_add_test(tc_parse, parseObject);
@@ -235,8 +336,16 @@ static Suite *testSuite_builtin_json(void) {
     tcase_add_test(tc_parse, parseInf);
     tcase_add_test(tc_parse, parseNegInf);
 
+    TCase *tc_get_str = tcase_create("cj5_get_str_termination");
+    tcase_add_test(tc_get_str, getStrTruncatedSurrogateIsTerminated);
+    tcase_add_test(tc_get_str, getStrUnpairedLowSurrogateIsTerminated);
+    tcase_add_test(tc_get_str, getStrSurrogateBadContinuationIsTerminated);
+    tcase_add_test(tc_get_str, getStrWrongTokenTypeIsTerminated);
+    tcase_add_test(tc_get_str, getStrValidSurrogatePairStillWorks);
+
     Suite *s = suite_create("Test JSON decoding with the cj5 library");
     suite_add_tcase(s, tc_parse);
+    suite_add_tcase(s, tc_get_str);
     return s;
 }
 
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index 86c6d463cb2..a9b29947365 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -83,6 +83,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     list(APPEND fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_posix_eth.c)
 endif()
 
+if(UA_ENABLE_JSON_ENCODING)
+    list(APPEND fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_config_json.c)
+endif()
+
 if(UA_ENABLE_MQTT)
     list(APPEND fuzzing_plugin_sources ${PROJECT_SOURCE_DIR}/arch/eventloop_mqtt.c)
 endif()
@@ -134,6 +138,7 @@ add_fuzzer(fuzz_base64_decode fuzz_base64_decode.cc)
 if(UA_ENABLE_JSON_ENCODING)
     add_fuzzer(fuzz_json_decode fuzz_json_decode.cc)
     add_fuzzer(fuzz_json_decode_encode fuzz_json_decode_encode.cc)
+    add_fuzzer(fuzz_config_json fuzz_config_json.cc)
 endif()
 
 # Run fuzzer on existing corpus to avoid regression
diff --git a/tests/fuzz/fuzz_config_json.cc b/tests/fuzz/fuzz_config_json.cc
new file mode 100644
index 00000000000..5f51789b5f8
--- /dev/null
+++ b/tests/fuzz/fuzz_config_json.cc
@@ -0,0 +1,35 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Fuzzer for the JSON5 server-configuration file parser
+ * (plugins/ua_config_json.c). Added after GHSA-38g6-5hfj-2fj7: a heap
+ * out-of-bounds read reachable via a malformed field name in a nested
+ * configuration object. This code path previously had no fuzz coverage --
+ * fuzz_json_decode(.*)?.cc only exercise UA_decodeJson() for the OPC UA
+ * binary<->JSON type codec, an entirely separate parser.
+ */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/server_config_file_based.h>
+
+#include <string.h>
+
+extern "C" int
+LLVMFuzzerTestOneInput(uint8_t *data, size_t size) {
+    UA_ByteString buf;
+    buf.data = (UA_Byte*)data;
+    buf.length = size;
+
+    UA_ServerConfig config;
+    memset(&config, 0, sizeof(UA_ServerConfig));
+    UA_StatusCode retval = UA_ServerConfig_setDefault(&config);
+    if(retval != UA_STATUSCODE_GOOD)
+        return 0;
+
+    UA_ServerConfig_updateFromFile(&config, buf);
+    UA_ServerConfig_clean(&config);
+
+    return 0;
+}
diff --git a/tests/server/check_server_config_json.c b/tests/server/check_server_config_json.c
new file mode 100644
index 00000000000..e55281d4537
--- /dev/null
+++ b/tests/server/check_server_config_json.c
@@ -0,0 +1,107 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <open62541/server.h>
+#include <open62541/server_config_default.h>
+#include <open62541/server_config_file_based.h>
+
+#include <check.h>
+#include <string.h>
+
+/* API-level smoke test related to GHSA-38g6-5hfj-2fj7: a malformed field
+ * name inside a nested JSON5 config object (an unpaired UTF-16 surrogate
+ * escape) must not crash the process when loaded through the public
+ * config-loading API.
+ *
+ * This is NOT a reliable regression test for the underlying OOB read on
+ * this branch: BuildInfo_parseJson() only ever runs strcmp() against the
+ * unterminated buffer here (the "Unknown field name." log message on
+ * 1.4/1.5 is a static string, not "%s"-formatted with the field content),
+ * and strcmp() against a short literal like "productUri" almost always
+ * diverges within the first byte or two -- so it does not reliably walk
+ * past the end of the allocation. Verified empirically: running this same
+ * test against the pre-fix cj5_get_str() does NOT reproduce a crash here.
+ * tests/check_cj5.c's getStr*IsTerminated tests are the actual, deterministic
+ * regression guard, because they call strlen()/strcmp() on the buffer
+ * directly and always exercise the failure. Keep this test for API-level
+ * robustness coverage (e.g. against a future reintroduction of "%s"
+ * logging, as already happened on the unreleased master branch), not as
+ * the primary defense for this bug class.
+ *
+ * Note on the assertions below: an unrecognized field name is logged as an
+ * error and otherwise silently skipped -- it does *not* fail parsing or
+ * refuse to start the server. That is the parser's existing (separate,
+ * pre-existing) behavior for any unknown field, not something this
+ * regression test is meant to change; these tests only guard against a
+ * crash/OOB-read regression in cj5_get_str(), not against permissive
+ * unknown-field handling. */
+START_TEST(UpdateFromFile_MalformedNestedFieldName_NoCrash) {
+    const char *json = "{\"buildInfo\":{\"\\uD800\":0}}";
+    UA_ByteString jsonConfig = UA_STRING((char*)(uintptr_t)json);
+    jsonConfig.length = strlen(json);
+
+    UA_ServerConfig config;
+    memset(&config, 0, sizeof(UA_ServerConfig));
+    UA_StatusCode retval = UA_ServerConfig_setDefault(&config);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    /* The malformed field is skipped (logged, not rejected); parsing still
+     * reports success. What matters here is that this returns at all,
+     * without an OOB read/crash. */
+    retval = UA_ServerConfig_updateFromFile(&config, jsonConfig);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_ServerConfig_clean(&config);
+} END_TEST
+
+START_TEST(NewFromFile_MalformedNestedFieldName_NoCrash) {
+    const char *json = "{\"buildInfo\":{\"\\uD800\":0}}";
+    UA_ByteString jsonConfig = UA_STRING((char*)(uintptr_t)json);
+    jsonConfig.length = strlen(json);
+
+    UA_Server *server = UA_Server_newFromFile(jsonConfig);
+    ck_assert(server != NULL); /* malformed field is skipped, server still starts */
+    UA_Server_delete(server);
+} END_TEST
+
+START_TEST(UpdateFromFile_ValidBuildInfo_StillWorks) {
+    const char *json = "{\"buildInfo\":{\"productUri\":\"urn:test\"}}";
+    UA_ByteString jsonConfig = UA_STRING((char*)(uintptr_t)json);
+    jsonConfig.length = strlen(json);
+
+    UA_ServerConfig config;
+    memset(&config, 0, sizeof(UA_ServerConfig));
+    UA_StatusCode retval = UA_ServerConfig_setDefault(&config);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    retval = UA_ServerConfig_updateFromFile(&config, jsonConfig);
+    ck_assert_int_eq(retval, UA_STATUSCODE_GOOD);
+
+    UA_String expected = UA_STRING((char*)(uintptr_t)"urn:test");
+    ck_assert(UA_String_equal(&config.buildInfo.productUri, &expected));
+
+    UA_ServerConfig_clean(&config);
+} END_TEST
+
+static Suite *testSuite_ServerConfigJson(void) {
+    Suite *s = suite_create("Server config from JSON5 file");
+
+    TCase *tc = tcase_create("Malformed input regressions");
+    tcase_add_test(tc, UpdateFromFile_MalformedNestedFieldName_NoCrash);
+    tcase_add_test(tc, NewFromFile_MalformedNestedFieldName_NoCrash);
+    tcase_add_test(tc, UpdateFromFile_ValidBuildInfo_StillWorks);
+    suite_add_tcase(s, tc);
+
+    return s;
+}
+
+int main(void) {
+    Suite *s = testSuite_ServerConfigJson();
+    SRunner *sr = srunner_create(s);
+    srunner_set_fork_status(sr, CK_NOFORK);
+    srunner_run_all(sr, CK_NORMAL);
+    int number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+    return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}

From 7e2f35eedcf88d89ec441db7e0207ed57dbe1122 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Thu, 23 Jul 2026 12:20:29 +0200
Subject: [PATCH 1952/1963] fix(plugin): bounds-check token stream reads in
 JSON5 config parser

Every PARSE_JSON() function in ua_config_json.c indexed into the
tokens[MAX_TOKENS] array via ctx->tokens[++ctx->index] without checking
ctx->index against the actual number of parsed tokens. A field's
declared child count (cj5_token.size) can desync from the real token
count, e.g. an unrecognized field name whose value is skipped without
consuming its tokens, letting that walk run past the end of the
stack-allocated token array.

Add a nextToken() helper that advances ctx->index and returns a zeroed
size-0 sentinel once the stream is exhausted instead of reading out of
bounds, and route all 36 call sites through it (plus the equivalent
check at the top-level parseJSONConfig loop). Every call site already
handles an empty/mismatched token gracefully, so this only changes
behavior for malformed input.
---
 plugins/ua_config_json.c | 90 +++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/plugins/ua_config_json.c b/plugins/ua_config_json.c
index 0c755c171e6..b3c502e4b43 100644
--- a/plugins/ua_config_json.c
+++ b/plugins/ua_config_json.c
@@ -38,6 +38,22 @@ getJsonPart(cj5_token tok, const char *json) {
     }
 }
 
+/* Advances ctx->index and returns the next token, or a zeroed size-0
+ * sentinel once the stream is exhausted. A field's declared child count
+ * can desync from the actual token count, so this stays in bounds of
+ * `tokens[MAX_TOKENS]` even then. */
+static cj5_token
+nextToken(ParsingCtx *ctx) {
+    if(!ctx->tokens || ctx->index + 1 >= ctx->tokensSize) {
+        ctx->index = ctx->tokensSize;
+        cj5_token empty;
+        memset(&empty, 0, sizeof(empty));
+        return empty;
+    }
+    ctx->index++;
+    return ctx->tokens[ctx->index];
+}
+
 /* Forward declarations*/
 #define PARSE_JSON(TYPE) static UA_StatusCode                   \
     TYPE##_parseJson(ParsingCtx *ctx, void *configField, size_t *configFieldSize)
@@ -90,7 +106,7 @@ extern const parseJsonSignature parseJsonJumpTable[UA_SERVERCONFIGFIELDKINDS];
 
 /*----------------------Basic Types------------------------*/
 PARSE_JSON(Int64Field) {
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_ByteString buf = getJsonPart(tok, ctx->json);
     UA_Int64 out;
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_INT64], NULL);
@@ -101,7 +117,7 @@ PARSE_JSON(Int64Field) {
     return retval;
 }
 PARSE_JSON(UInt16Field) {
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_ByteString buf = getJsonPart(tok, ctx->json);
     UA_UInt16 out;
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_UINT16], NULL);
@@ -112,7 +128,7 @@ PARSE_JSON(UInt16Field) {
     return retval;
 }
 PARSE_JSON(UInt32Field) {
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_ByteString buf = getJsonPart(tok, ctx->json);
     UA_UInt32 out;
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_UINT32], NULL);
@@ -123,7 +139,7 @@ PARSE_JSON(UInt32Field) {
     return retval;
 }
 PARSE_JSON(UInt64Field) {
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_ByteString buf = getJsonPart(tok, ctx->json);
     UA_UInt64 out;
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_UINT64], NULL);
@@ -134,7 +150,7 @@ PARSE_JSON(UInt64Field) {
     return retval;
 }
 PARSE_JSON(StringField) {
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_ByteString buf = getJsonPart(tok, ctx->json);
     UA_String out;
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_STRING], NULL);
@@ -154,19 +170,19 @@ PARSE_JSON(LocalizedTextField) {
         text: "Test text"
     }
      */
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
     UA_String locale;
     UA_String text;
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field = (char*)UA_malloc(tok.size + 1);
             unsigned int str_len = 0;
             cj5_get_str(&ctx->result, (unsigned int)ctx->index, field, &str_len);
 
-            tok = ctx->tokens[++ctx->index];
+            tok = nextToken(ctx);
             UA_ByteString buf = getJsonPart(tok, ctx->json);
             if(strcmp(field, "locale") == 0)
                 retval |= UA_decodeJson(&buf, &locale, &UA_TYPES[UA_TYPES_STRING], NULL);
@@ -195,7 +211,7 @@ PARSE_JSON(LocalizedTextField) {
     return retval;
 }
 PARSE_JSON(DoubleField) {
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_ByteString buf = getJsonPart(tok, ctx->json);
     UA_Double out;
     UA_StatusCode retval = UA_decodeJson(&buf, &out, &UA_TYPES[UA_TYPES_DOUBLE], NULL);
@@ -206,7 +222,7 @@ PARSE_JSON(DoubleField) {
     return retval;
 }
 PARSE_JSON(BooleanField) {
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_ByteString buf = getJsonPart(tok, ctx->json);
     UA_Boolean out;
     if(tok.type != CJ5_TOKEN_BOOL) {
@@ -235,9 +251,9 @@ PARSE_JSON(DurationField) {
 }
 PARSE_JSON(DurationRangeField) {
     UA_DurationRange *field = (UA_DurationRange*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -261,9 +277,9 @@ PARSE_JSON(DurationRangeField) {
 }
 PARSE_JSON(UInt32RangeField) {
     UA_UInt32Range *field = (UA_UInt32Range*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -289,9 +305,9 @@ PARSE_JSON(UInt32RangeField) {
 /*----------------------Advanced Types------------------------*/
 PARSE_JSON(BuildInfo) {
     UA_BuildInfo *field = (UA_BuildInfo*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -323,9 +339,9 @@ PARSE_JSON(BuildInfo) {
 }
 PARSE_JSON(ApplicationDescriptionField) {
     UA_ApplicationDescription *field = (UA_ApplicationDescription*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -362,7 +378,7 @@ PARSE_JSON(StringArrayField) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Pointer to the array size is not set.");
         return UA_STATUSCODE_BADARGUMENTSMISSING;
     }
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_String *stringArray = (UA_String*)UA_malloc(sizeof(UA_String) * tok.size);
     size_t stringArraySize = 0;
     for(size_t j = tok.size; j > 0; j--) {
@@ -393,7 +409,7 @@ PARSE_JSON(UInt32ArrayField) {
         UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_USERLAND, "Pointer to the array size is not set.");
         return UA_STATUSCODE_BADARGUMENTSMISSING;
     }
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_UInt32 *numberArray = (UA_UInt32*)UA_malloc(sizeof(UA_UInt32) * tok.size);;
     size_t numberArraySize = 0;
     for(size_t j = tok.size; j > 0; j--) {
@@ -422,7 +438,7 @@ PARSE_JSON(UInt32ArrayField) {
     return retval;
 }
 PARSE_JSON(DateTimeField) {
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     UA_ByteString buf = getJsonPart(tok, ctx->json);
     UA_DateTime out;
     UA_DateTime_init(&out);
@@ -437,9 +453,9 @@ PARSE_JSON(DateTimeField) {
 PARSE_JSON(MdnsConfigurationField) {
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
     UA_ServerConfig *config = (UA_ServerConfig*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -473,9 +489,9 @@ PARSE_JSON(MdnsConfigurationField) {
 PARSE_JSON(SubscriptionConfigurationField) {
 #ifdef UA_ENABLE_SUBSCRIPTIONS
     UA_ServerConfig *config = (UA_ServerConfig*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -527,9 +543,9 @@ PARSE_JSON(SubscriptionConfigurationField) {
 
 PARSE_JSON(TcpConfigurationField) {
     UA_ServerConfig *config = (UA_ServerConfig*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -557,9 +573,9 @@ PARSE_JSON(TcpConfigurationField) {
 PARSE_JSON(PubsubConfigurationField) {
 #ifdef UA_ENABLE_PUBSUB
     UA_PubSubConfiguration *field = (UA_PubSubConfiguration*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -588,9 +604,9 @@ PARSE_JSON(PubsubConfigurationField) {
 PARSE_JSON(HistorizingConfigurationField) {
 #ifdef UA_ENABLE_HISTORIZING
     UA_ServerConfig *config = (UA_ServerConfig*)configField;
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size/2; j > 0; j--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch (tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -649,16 +665,16 @@ PARSE_JSON(SecurityPolciesField) {
     UA_String aes128sha256rsaoaepuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep");
     UA_String aes256sha256rsapssuri = UA_STRING("http://opcfoundation.org/UA/SecurityPolicy#Aes256_Sha256_RsaPss");
 
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t j = tok.size; j > 0; j--) {
 
         UA_String policy = {.length = 0, .data = NULL};
         UA_ByteString certificate = {.length = 0, .data = NULL};
         UA_ByteString privateKey = {.length = 0, .data = NULL};
 
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         for(size_t i = tok.size / 2; i > 0; i--) {
-            tok = ctx->tokens[++ctx->index];
+            tok = nextToken(ctx);
             switch(tok.type) {
             case CJ5_TOKEN_STRING: {
                 char *field_str = (char *)UA_malloc(tok.size + 1);
@@ -775,9 +791,9 @@ PARSE_JSON(SecurityPkiField) {
     UA_String issuerListFolder = {.length = 0, .data = NULL};
     UA_String revocationListFolder = {.length = 0, .data = NULL};
 
-    cj5_token tok = ctx->tokens[++ctx->index];
+    cj5_token tok = nextToken(ctx);
     for(size_t i = tok.size/2; i > 0; i--) {
-        tok = ctx->tokens[++ctx->index];
+        tok = nextToken(ctx);
         switch(tok.type) {
         case CJ5_TOKEN_STRING: {
             char *field_str = (char*)UA_malloc(tok.size + 1);
@@ -920,7 +936,7 @@ parseJSONConfig(UA_ServerConfig *config, UA_ByteString json_config) {
     if(ctx.tokens)
         serverConfigSize = (ctx.tokens[ctx.index-1].size/2);
     UA_StatusCode retval = UA_STATUSCODE_GOOD;
-    for (size_t j = serverConfigSize; j > 0; j--) {
+    for (size_t j = serverConfigSize; j > 0 && ctx.index < ctx.tokensSize; j--) {
         cj5_token tok = ctx.tokens[ctx.index];
         switch (tok.type) {
             case CJ5_TOKEN_STRING: {

From 8098907673099afe6b726de05675146066b24d9c Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Mon, 11 May 2026 10:55:31 +0200
Subject: [PATCH 1953/1963] fix(core): reject overflowing arrayDimensions
 product in Variant en/decoding

Multiplying attacker-controlled arrayDimensions values into a size_t
accumulator without an overflow check allows the product to wrap and
match a small arrayLength. Subsequent ranged read or write operations
then access memory outside the allocated array bounds.

Add checked multiplication at all sites where the dimension product is
computed: Variant binary decode, Variant binary encode, checkAdjustRange,
and computeStrides (as a defence-in-depth measure).

Internal Vulnerability Advisory: open62541-SA-2026-0012 and open62541-SA-2026-0013
Co-authored-by: Asher Davila <AsherDLL@users.noreply.github.com>
Co-authored-by: Malav Vyas <MalavVyas@users.noreply.github.com>
---
 src/ua_types.c                 | 10 +++++++++-
 src/ua_types_encoding_binary.c | 21 +++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/ua_types.c b/src/ua_types.c
index f16bb0ec107..9c1b76053f0 100644
--- a/src/ua_types.c
+++ b/src/ua_types.c
@@ -636,8 +636,11 @@ checkAdjustRange(const UA_Variant *v, UA_NumericRange *range) {
     /* Check that the number of elements in the variant matches the array
      * dimensions */
     size_t elements = 1;
-    for(size_t i = 0; i < dims_count; ++i)
+    for(size_t i = 0; i < dims_count; ++i) {
+        if(dims[i] != 0 && elements > SIZE_MAX / dims[i])
+            return UA_STATUSCODE_BADINTERNALERROR;
         elements *= dims[i];
+    }
     if(elements != v->arrayLength)
         return UA_STATUSCODE_BADINTERNALERROR;
 
@@ -700,6 +703,11 @@ computeStrides(const UA_Variant *v, const UA_NumericRange range,
             *block = running_dimssize * dimrange;
             *stride = running_dimssize * dims[k];
         }
+        /* Overflow in running_dimssize is only possible when the Variant has
+         * passed a corrupted state through checkAdjustRange. Guard here as a
+         * defence-in-depth measure. */
+        if(running_dimssize != 0 && dims[k] > SIZE_MAX / running_dimssize)
+            break;
         *first += running_dimssize * range.dimensions[k].min;
         running_dimssize *= dims[k];
     }
diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c
index c814f390e8e..3f03c2966e6 100644
--- a/src/ua_types_encoding_binary.c
+++ b/src/ua_types_encoding_binary.c
@@ -1000,8 +1000,17 @@ ENCODE_BINARY(Variant) {
     const UA_Boolean hasDimensions = isArray && src->arrayDimensionsSize > 0;
     if(isArray) {
         encoding |= (u8)UA_VARIANT_ENCODINGMASKTYPE_ARRAY;
-        if(hasDimensions)
+        if(hasDimensions) {
             encoding |= (u8)UA_VARIANT_ENCODINGMASKTYPE_DIMENSIONS;
+            size_t totalRequiredSize = 1;
+            for(size_t i = 0; i < src->arrayDimensionsSize; ++i) {
+                if(src->arrayDimensions[i] != 0 &&
+                   totalRequiredSize > SIZE_MAX / src->arrayDimensions[i])
+                    return UA_STATUSCODE_BADENCODINGERROR;
+                totalRequiredSize *= src->arrayDimensions[i];
+            }
+            if(totalRequiredSize != src->arrayLength) return UA_STATUSCODE_BADENCODINGERROR;
+        }
     }
 
     /* Encode the encoding byte */
@@ -1116,9 +1125,13 @@ DECODE_BINARY(Variant) {
         /* Validate array length against array dimensions */
         size_t totalSize = 1;
         for(size_t i = 0; i < dst->arrayDimensionsSize; ++i) {
-            if(dst->arrayDimensions[i] == 0)
-                return UA_STATUSCODE_BADDECODINGERROR;
-            totalSize *= dst->arrayDimensions[i];
+            if(dst->arrayDimensions[i] == 0) {
+                ret = UA_STATUSCODE_BADDECODINGERROR;
+            } else if(totalSize > SIZE_MAX / dst->arrayDimensions[i]) {
+                ret = UA_STATUSCODE_BADDECODINGERROR;
+            } else {
+                totalSize *= dst->arrayDimensions[i];
+            }
         }
         UA_CHECK(totalSize == dst->arrayLength, ret = UA_STATUSCODE_BADDECODINGERROR);
     }

From a1257feec0c539f191cb2d40f72f116a901d3322 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Mon, 11 May 2026 13:17:19 +0200
Subject: [PATCH 1954/1963] fix(pubsub): check message length before signature
 size subtraction

Add bounds check in verifyAndDecrypt() to prevent unsigned integer
underflow when buffer->length is smaller than the expected signature
size. Without this check, the subtraction wraps around producing a
large size_t that causes mbedtls to read unmapped memory.

Internal Vulnerability Advisory: open62541-SA-2026-0014
Co-authored-by: Abhinav Agarwal <abhinavagarwal1996@gmail.com>
---
 src/pubsub/ua_pubsub_security.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pubsub/ua_pubsub_security.c b/src/pubsub/ua_pubsub_security.c
index 42690177e56..25139f8be68 100644
--- a/src/pubsub/ua_pubsub_security.c
+++ b/src/pubsub/ua_pubsub_security.c
@@ -84,6 +84,11 @@ verifyAndDecrypt(const UA_Logger *logger, UA_ByteString *buffer,
     if(doValidate) {
         size_t sigSize = securityPolicy->symmetricModule.cryptoModule.
             signatureAlgorithm.getLocalSignatureSize(channelContext);
+        if(buffer->length < sigSize) {
+            UA_LOG_WARNING(logger, UA_LOGCATEGORY_SECURITYPOLICY,
+                           "PubSub receive. Message too short for signature");
+            return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
+        }
         UA_ByteString toBeVerified = {buffer->length - sigSize, buffer->data};
         UA_ByteString signature = {sigSize, buffer->data + buffer->length - sigSize};
 

From 2da371bcdaadeb23051635a60e38f31039af9fd8 Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Mon, 11 May 2026 13:21:15 +0200
Subject: [PATCH 1955/1963] fix(server): migrate samplingMonitoredItems in
 TransferSubscriptions

Operation_TransferSubscription() copies the UA_Subscription struct with
memcpy but only migrates monitoredItems, notificationQueue, and
retransmissionQueue. The samplingMonitoredItems list was not re-initialized
in the new subscription, leaving stale le_prev backpointers from items
with samplingType==PUBLISH pointing into the freed old subscription struct.
When UA_MonitoredItem_unregisterSampling() calls LIST_REMOVE, it writes
to freed memory (heap-use-after-free).

Add migration of samplingMonitoredItems to the new subscription after
the point of no return, matching the pattern used for monitoredItems.

Internal Vulnerability Advisory: open62541-SA-2026-0015
Co-authored-by: Abhinav Agarwal <abhinavagarwal1996@gmail.com>
---
 src/server/ua_services_subscription.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index ecec4b151bc..9ec6b40523b 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -549,6 +549,15 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     }
     sub->monitoredItemsSize = 0;
 
+    /* Move over the samplingMonitoredItems and adjust the backpointers */
+    LIST_INIT(&newSub->samplingMonitoredItems);
+    UA_MonitoredItem *smon, *smon_tmp;
+    LIST_FOREACH_SAFE(smon, &sub->samplingMonitoredItems, sampling.samplingListEntry, smon_tmp) {
+        LIST_REMOVE(smon, sampling.samplingListEntry);
+        LIST_INSERT_HEAD(&newSub->samplingMonitoredItems, smon,
+                         sampling.samplingListEntry);
+    }
+
     /* Move over the notification queue */
     TAILQ_INIT(&newSub->notificationQueue);
     UA_Notification *nn, *nn_tmp;

From bc30df3adab5cc61383cb7e7f551bfd6f7ac160c Mon Sep 17 00:00:00 2001
From: Niels Beier <niels.beier@o6-automation.com>
Date: Mon, 11 May 2026 13:23:51 +0200
Subject: [PATCH 1956/1963] fix(server): migrate samplingMonitoredItems in
 TransferSubscriptions

Operation_TransferSubscription() copies the UA_Subscription struct with
memcpy but only migrates monitoredItems, notificationQueue, and
retransmissionQueue. The samplingMonitoredItems list was not re-initialized
in the new subscription, leaving stale le_prev backpointers from items
with samplingType==PUBLISH pointing into the freed old subscription struct.
When UA_MonitoredItem_unregisterSampling() calls LIST_REMOVE, it writes
to freed memory (heap-use-after-free).

Add migration of samplingMonitoredItems to the new subscription after
the point of no return, matching the pattern used for monitoredItems.

Internal Vulnerability Advisory: open62541-SA-2026-0015
Co-authored-by: Abhinav Agarwal <abhinavagarwal1996@gmail.com>
---
 src/server/ua_services_subscription.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/server/ua_services_subscription.c b/src/server/ua_services_subscription.c
index 25c760da4f8..dea47f451d8 100644
--- a/src/server/ua_services_subscription.c
+++ b/src/server/ua_services_subscription.c
@@ -555,6 +555,15 @@ Operation_TransferSubscription(UA_Server *server, UA_Session *session,
     }
     sub->monitoredItemsSize = 0;
 
+    /* Move over the samplingMonitoredItems and adjust the backpointers */
+    LIST_INIT(&newSub->samplingMonitoredItems);
+    UA_MonitoredItem *smon, *smon_tmp;
+    LIST_FOREACH_SAFE(smon, &sub->samplingMonitoredItems, sampling.subscriptionSampling, smon_tmp) {
+        LIST_REMOVE(smon, sampling.subscriptionSampling);
+        LIST_INSERT_HEAD(&newSub->samplingMonitoredItems, smon,
+                         sampling.subscriptionSampling);
+    }
+
     /* Move over the notification queue */
     TAILQ_INIT(&newSub->notificationQueue);
     UA_Notification *nn, *nn_tmp;

From d3a9a59edede9c921c40526dbf1b43957fe29e65 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Sun, 3 May 2026 18:34:35 +0200
Subject: [PATCH 1957/1963] refactor(server): Move libmdnsd dependency to the
 upstream

---
 .gitmodules                    |  2 +-
 CMakeLists.txt                 | 88 ++++++++++++++++++++++------------
 deps/mdnsd                     |  2 +-
 src/server/ua_discovery.h      |  2 +-
 src/server/ua_discovery_mdns.c | 38 +++++++--------
 5 files changed, 77 insertions(+), 55 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 7265aaedf0d..8671b223e09 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "deps/mdnsd"]
 	path = deps/mdnsd
-	url = https://github.com/Pro/mdnsd.git
+	url = https://github.com/troglobit/mdnsd.git
 [submodule "deps/ua-nodeset"]
 	path = deps/ua-nodeset
 	url = https://github.com/OPCFoundation/UA-Nodeset
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 520ed1a42f4..edfcf4fcd5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -745,26 +745,6 @@ file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/src_generated")
 # Generate the config.h
 configure_file(include/open62541/config.h.in ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h)
 
-if(UA_ENABLE_DISCOVERY_MULTICAST)
-  include(GenerateExportHeader)
-    set(MDNSD_LOGLEVEL 300 CACHE STRING "Level at which logs shall be reported" FORCE)
-    
-    # create a "fake" empty library to generate the export header macros
-    if (APPLE)
-    	add_library(libmdnsd INTERFACE ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
-    else()
-    	add_library(libmdnsd ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
-    endif()
-    
-    set_property(TARGET libmdnsd PROPERTY LINKER_LANGUAGE C)
-    set_property(TARGET libmdnsd PROPERTY DEFINE_SYMBOL "MDNSD_DYNAMIC_LINKING_EXPORT")
-    configure_file("deps/mdnsd/libmdnsd/mdnsd_config_extra.in"
-                   "${PROJECT_BINARY_DIR}/src_generated/mdnsd_config_extra")
-    file(READ "${PROJECT_BINARY_DIR}/src_generated/mdnsd_config_extra" MDNSD_CONFIG_EXTRA)
-    generate_export_header(libmdnsd EXPORT_FILE_NAME "${PROJECT_BINARY_DIR}/src_generated/mdnsd_config.h"
-                           BASE_NAME MDNSD DEFINE_NO_DEPRECATED CUSTOM_CONTENT_FROM_VARIABLE MDNSD_CONFIG_EXTRA)
-endif()
-
 # Exported headers
 set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/open62541/config.h
                      ${PROJECT_BINARY_DIR}/src_generated/open62541/statuscodes.h
@@ -940,19 +920,64 @@ if(UA_DEBUG_DUMP_PKGS)
 endif()
 
 if(UA_ENABLE_DISCOVERY_MULTICAST)
+    # Copy mdnsd libmdnsd files into src_generated/mdnsd/ so they can be
+    # patched via regex (configure_file copies without variable substitution
+    # when COPYONLY is given, but using the plain copy lets downstream code
+    # run regex passes on the generated copies before compilation).
+    set(MDNSD_GENERATED_DIR "${PROJECT_BINARY_DIR}/src_generated/mdnsd")
+    file(MAKE_DIRECTORY "${MDNSD_GENERATED_DIR}")
+
+    set(MDNSD_LIBMDNSD_HEADERS 1035.h xht.h sdtxt.h inet.h mdnsd.h)
+    set(MDNSD_LIBMDNSD_SOURCES 1035.c xht.c sdtxt.c inet.c mdnsd.c log.c)
+
+    foreach(_f IN LISTS MDNSD_LIBMDNSD_HEADERS MDNSD_LIBMDNSD_SOURCES)
+        configure_file(
+            "${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/${_f}"
+            "${MDNSD_GENERATED_DIR}/${_f}"
+            COPYONLY)
+        file(READ "${MDNSD_GENERATED_DIR}/${_f}" _content)
+        # Ensure open62541/config.h (which sets _GNU_SOURCE etc.) is included
+        # before any system header, then remove any original config.h include.
+        string(PREPEND _content "#include \"open62541/config.h\"\n")
+        string(REGEX REPLACE "#include \"config\\.h\"\n?" "" _content "${_content}")
+        # Rename C++ keyword identifiers: 'class' -> 'clazz', 'new' -> 'new_'
+        string(REGEX REPLACE "([^A-Za-z0-9_])class([^A-Za-z0-9_])" "\\1clazz\\2" _content "${_content}")
+        string(REGEX REPLACE "([^A-Za-z0-9_])class([^A-Za-z0-9_])" "\\1clazz\\2" _content "${_content}")
+        string(REGEX REPLACE "([^A-Za-z0-9_])new([^A-Za-z0-9_])" "\\1new_\\2" _content "${_content}")
+        string(REGEX REPLACE "([^A-Za-z0-9_])new([^A-Za-z0-9_])" "\\1new_\\2" _content "${_content}")
+        file(WRITE "${MDNSD_GENERATED_DIR}/${_f}" "${_content}")
+    endforeach()
+
+    # Suppress warnings from the generated (upstream) mdnsd C files
+    set_source_files_properties(
+        ${MDNSD_GENERATED_DIR}/1035.c
+        ${MDNSD_GENERATED_DIR}/xht.c
+        ${MDNSD_GENERATED_DIR}/sdtxt.c
+        ${MDNSD_GENERATED_DIR}/inet.c
+        ${MDNSD_GENERATED_DIR}/mdnsd.c
+        ${MDNSD_GENERATED_DIR}/log.c
+        PROPERTIES COMPILE_FLAGS
+            "-Wno-c++-compat -Wno-variadic-macros -Wno-pedantic -Wno-implicit-function-declaration -Wno-nested-externs -Wno-int-to-pointer-cast")
+    # ua_discovery_mdns.c includes mdnsd.h which has GCC-style named variadic macros
+    set_source_files_properties(
+        ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_mdns.c
+        PROPERTIES COMPILE_FLAGS "-Wno-variadic-macros")
+
     # prepend in list, otherwise it complains that winsock2.h has to be included before windows.h
     list(APPEND lib_headers
-         ${PROJECT_BINARY_DIR}/src_generated/mdnsd_config.h
-         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/1035.h
-         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/xht.h
-         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/sdtxt.h
-         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.h)
+        ${MDNSD_GENERATED_DIR}/1035.h
+        ${MDNSD_GENERATED_DIR}/xht.h
+        ${MDNSD_GENERATED_DIR}/sdtxt.h
+        ${MDNSD_GENERATED_DIR}/inet.h
+        ${MDNSD_GENERATED_DIR}/mdnsd.h)
     list(APPEND lib_sources
-         ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_mdns.c
-         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/1035.c
-         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/xht.c
-         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/sdtxt.c
-         ${PROJECT_SOURCE_DIR}/deps/mdnsd/libmdnsd/mdnsd.c)
+        ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_mdns.c
+        ${MDNSD_GENERATED_DIR}/1035.c
+        ${MDNSD_GENERATED_DIR}/xht.c
+        ${MDNSD_GENERATED_DIR}/sdtxt.c
+        ${MDNSD_GENERATED_DIR}/inet.c
+        ${MDNSD_GENERATED_DIR}/mdnsd.c
+        ${MDNSD_GENERATED_DIR}/log.c)
 endif()
 
 if(UA_BUILD_FUZZING OR UA_BUILD_OSS_FUZZ)
@@ -1400,6 +1425,9 @@ else()
 
     # Private includes
     include_directories_private("${PROJECT_BINARY_DIR}")
+    if(UA_ENABLE_DISCOVERY_MULTICAST)
+        include_directories_private("${PROJECT_BINARY_DIR}/src_generated/mdnsd")
+    endif()
 
     if(UA_ENABLE_ENCRYPTION_MBEDTLS)
         include_directories_private(${MBEDTLS_INCLUDE_DIRS})
diff --git a/deps/mdnsd b/deps/mdnsd
index 488d24fb9d4..c1be962b37e 160000
--- a/deps/mdnsd
+++ b/deps/mdnsd
@@ -1 +1 @@
-Subproject commit 488d24fb9d427aec77df180268f0291eeee7fb8b
+Subproject commit c1be962b37e4b952625d9b0a873e5ca619b1a35a
diff --git a/src/server/ua_discovery.h b/src/server/ua_discovery.h
index b0031c7329f..777b52ab066 100644
--- a/src/server/ua_discovery.h
+++ b/src/server/ua_discovery.h
@@ -44,7 +44,7 @@ typedef struct {
 
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
 
-#include "mdnsd/libmdnsd/mdnsd.h"
+#include "mdnsd.h"
 #define UA_MAXMDNSRECVSOCKETS 8
 
 /**
diff --git a/src/server/ua_discovery_mdns.c b/src/server/ua_discovery_mdns.c
index 27a7adab671..2662d1ca742 100644
--- a/src/server/ua_discovery_mdns.c
+++ b/src/server/ua_discovery_mdns.c
@@ -9,12 +9,14 @@
 
 #include "ua_discovery.h"
 #include "ua_server_internal.h"
-
+#include <stdlib.h>
+#include "mdnsd.h"
+#include "inet.h"
 #ifdef UA_ENABLE_DISCOVERY_MULTICAST
 
 #ifndef UA_ENABLE_AMALGAMATION
-#include "mdnsd/libmdnsd/xht.h"
-#include "mdnsd/libmdnsd/sdtxt.h"
+#include "xht.h"
+#include "sdtxt.h"
 #endif
 
 #include "../deps/mp_printf.h"
@@ -743,16 +745,7 @@ MulticastDiscoveryCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
         return;
 
     char portStr[16];
-    UA_UInt16 myPort = *port;
-    for(size_t i = 0; i < 16; i++) {
-        if(myPort == 0) {
-            portStr[i] = 0;
-            break;
-        }
-        unsigned char rem = (unsigned char)(myPort % 10);
-        portStr[i] = (char)(rem + 48); /* to ascii */
-        myPort = myPort / 10;
-    }
+    snprintf(portStr, sizeof(portStr), "%u", (unsigned)*port);
 
     struct addrinfo *infoptr;
     int res = getaddrinfo((const char*)address->data, portStr, NULL, &infoptr);
@@ -762,10 +755,13 @@ MulticastDiscoveryCallback(UA_ConnectionManager *cm, uintptr_t connectionId,
     /* Parse and process the message */
     struct message mm;
     memset(&mm, 0, sizeof(struct message));
-    UA_Boolean rr = message_parse(&mm, (unsigned char*)msg.data, msg.length);
-    if(rr)
-        mdnsd_in(dm->mdnsDaemon, &mm, infoptr->ai_addr,
-                 (unsigned short)infoptr->ai_addrlen);
+    int rr = message_parse(&mm, (unsigned char*)msg.data);
+    if(rr == 0) { /* 0 = success in new mdnsd API */
+        inet_addr_t from;
+        memset(&from, 0, sizeof(from));
+        memcpy(&from, infoptr->ai_addr, infoptr->ai_addrlen);
+        mdnsd_in(dm->mdnsDaemon, &mm, &from);
+    }
     freeaddrinfo(infoptr);
 }
 
@@ -775,15 +771,13 @@ sendMulticastMessages(UA_DiscoveryManager *dm) {
         return;
     UA_ConnectionManager *cm = dm->cm;
 
-    struct sockaddr ip;
-    memset(&ip, 0, sizeof(struct sockaddr));
-    ip.sa_family = AF_INET; /* Ipv4 */
+    inet_addr_t to;
+    memset(&to, 0, sizeof(to));
 
     struct message mm;
     memset(&mm, 0, sizeof(struct message));
 
-    unsigned short sport = 0;
-    while(mdnsd_out(dm->mdnsDaemon, &mm, &ip, &sport) > 0) {
+    while(mdnsd_out(dm->mdnsDaemon, &mm, &to) > 0) {
         int len = message_packet_len(&mm);
         char* buf = (char*)message_packet(&mm);
         if(len > 0) {

From 1212e07118352e5e7bc83ff37a8eab85780c8574 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Fri, 3 Jul 2026 15:11:26 +0200
Subject: [PATCH 1958/1963] refactor(drivers): Fix variadic logging macro
 inside the mdnsd plugin

---
 CMakeLists.txt | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edfcf4fcd5f..4fa5e6878e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -945,6 +945,23 @@ if(UA_ENABLE_DISCOVERY_MULTICAST)
         string(REGEX REPLACE "([^A-Za-z0-9_])class([^A-Za-z0-9_])" "\\1clazz\\2" _content "${_content}")
         string(REGEX REPLACE "([^A-Za-z0-9_])new([^A-Za-z0-9_])" "\\1new_\\2" _content "${_content}")
         string(REGEX REPLACE "([^A-Za-z0-9_])new([^A-Za-z0-9_])" "\\1new_\\2" _content "${_content}")
+        if(_f STREQUAL "mdnsd.h")
+            string(REPLACE "#define DBG(fmt, args...)  mdnsd_log(LOG_DEBUG, \"%s(): \" fmt, __func__, ##args)"
+                           "#define DBG(fmt, ...)  mdnsd_log(LOG_DEBUG, \"%s(): \" fmt, __func__, __VA_ARGS__)"
+                           _content "${_content}")
+            string(REPLACE "#define INFO(fmt, args...) mdnsd_log(LOG_INFO, \"%s(): \" fmt, __func__, ##args)"
+                           "#define INFO(fmt, ...) mdnsd_log(LOG_INFO, \"%s(): \" fmt, __func__, __VA_ARGS__)"
+                           _content "${_content}")
+            string(REPLACE "#define NOTE(fmt, args...) mdnsd_log(LOG_NOTICE, fmt, ##args)"
+                           "#define NOTE(...) mdnsd_log(LOG_NOTICE, __VA_ARGS__)"
+                           _content "${_content}")
+            string(REPLACE "#define WARN(fmt, args...) mdnsd_log(LOG_WARNING, fmt, ##args)"
+                           "#define WARN(...) mdnsd_log(LOG_WARNING, __VA_ARGS__)"
+                           _content "${_content}")
+            string(REPLACE "#define ERR(fmt, args...)  mdnsd_log(LOG_ERR, fmt, ##args)"
+                           "#define ERR(...)  mdnsd_log(LOG_ERR, __VA_ARGS__)"
+                           _content "${_content}")
+        endif()
         file(WRITE "${MDNSD_GENERATED_DIR}/${_f}" "${_content}")
     endforeach()
 
@@ -957,7 +974,7 @@ if(UA_ENABLE_DISCOVERY_MULTICAST)
         ${MDNSD_GENERATED_DIR}/mdnsd.c
         ${MDNSD_GENERATED_DIR}/log.c
         PROPERTIES COMPILE_FLAGS
-            "-Wno-c++-compat -Wno-variadic-macros -Wno-pedantic -Wno-implicit-function-declaration -Wno-nested-externs -Wno-int-to-pointer-cast")
+            "-Wno-c++-compat -Wno-variadic-macros -Wno-pedantic -Wno-implicit-function-declaration -Wno-nested-externs -Wno-int-to-pointer-cast -Wno-format-nonliteral")
     # ua_discovery_mdns.c includes mdnsd.h which has GCC-style named variadic macros
     set_source_files_properties(
         ${PROJECT_SOURCE_DIR}/src/server/ua_discovery_mdns.c

From 14bd799529a467ee8df241cb2cb2b818d5fc6ee8 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Mon, 4 May 2026 07:39:31 +0200
Subject: [PATCH 1959/1963] refactor(tests): Move over the mdnsd fuzzers from
 pro's repository

---
 tests/fuzz/CMakeLists.txt       | 12 ++++---
 tests/fuzz/fuzz_mdns_message.cc | 53 +++++++++++++++++++++++++++++++
 tests/fuzz/fuzz_mdns_xht.cc     | 56 +++++++++++++++++++++++++++++++++
 tests/fuzz/oss-fuzz-copy.sh     |  3 --
 4 files changed, 116 insertions(+), 8 deletions(-)
 create mode 100644 tests/fuzz/fuzz_mdns_message.cc
 create mode 100644 tests/fuzz/fuzz_mdns_xht.cc

diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index a9b29947365..12b07071b0c 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -116,7 +116,8 @@ macro(add_fuzzer FUZZER_NAME FUZZER_SOURCE)
                                   $<TARGET_OBJECTS:open62541-fuzzplugins>)
     target_link_libraries(${FUZZER_NAME} ${LIBS})
     target_include_directories(${FUZZER_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src/server)
-    target_include_directories(${FUZZER_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/deps/mdnsd)
+    target_include_directories(${FUZZER_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src/client)
+    target_include_directories(${FUZZER_NAME} PRIVATE ${PROJECT_BINARY_DIR}/src_generated/mdnsd)
     assign_source_group(${FUZZER_SOURCE})
     list(APPEND FUZZER_TARGETS ${FUZZER_NAME})
 endmacro()
@@ -127,10 +128,11 @@ add_fuzzer(fuzz_tcp_message fuzz_tcp_message.cc)
 add_fuzzer(fuzz_binary_decode fuzz_binary_decode.cc)
 add_fuzzer(fuzz_src_ua_util fuzz_src_ua_util.cc)
 
-# Add fuzzer for mdns dependency. It's currently not fuzzed separately.
-# See also: https://github.com/google/oss-fuzz/pull/2928
-add_fuzzer(fuzz_mdns_message ${PROJECT_SOURCE_DIR}/deps/mdnsd/tests/fuzz/fuzz_mdns_message.cc)
-add_fuzzer(fuzz_mdns_xht ${PROJECT_SOURCE_DIR}/deps/mdnsd/tests/fuzz/fuzz_mdns_xht.cc)
+# Fuzzer for mdns dependency
+if(UA_ENABLE_DISCOVERY_MULTICAST)
+    add_fuzzer(fuzz_mdns_message fuzz_mdns_message.cc)
+    add_fuzzer(fuzz_mdns_xht fuzz_mdns_xht.cc)
+endif()
 
 add_fuzzer(fuzz_base64_encode fuzz_base64_encode.cc)
 add_fuzzer(fuzz_base64_decode fuzz_base64_decode.cc)
diff --git a/tests/fuzz/fuzz_mdns_message.cc b/tests/fuzz/fuzz_mdns_message.cc
new file mode 100644
index 00000000000..4a7c9f01fb9
--- /dev/null
+++ b/tests/fuzz/fuzz_mdns_message.cc
@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2019 (c) fortiss (Author: Stefan Profanter)
+ */
+
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <open62541/config.h>
+
+extern "C" {
+#include "mdnsd.h"
+#include "inet.h"
+}
+
+/*
+** Main entry point.  The fuzzer invokes this function with each
+** fuzzed input.
+*/
+extern "C" int
+LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+
+
+    struct message m;
+    memset(&m, 0, sizeof(struct message));
+
+    unsigned char *dataCopy = (unsigned char *)malloc(size);
+    if (!dataCopy) {
+        return 0;
+    }
+
+    memcpy(dataCopy, data, size);
+
+    int parseResult = message_parse(&m, dataCopy);
+
+    free(dataCopy);
+
+    if (!parseResult)
+        return 0;
+
+    mdns_daemon_t *d = mdnsd_new(QCLASS_IN, 1000);
+
+    inet_addr_t from = {};
+    inet_anyaddr(AF_INET, 2000, &from);
+    mdnsd_in(d, &m, &from);
+
+    mdnsd_free(d);
+
+    return 0;
+}
diff --git a/tests/fuzz/fuzz_mdns_xht.cc b/tests/fuzz/fuzz_mdns_xht.cc
new file mode 100644
index 00000000000..d8642aabd0a
--- /dev/null
+++ b/tests/fuzz/fuzz_mdns_xht.cc
@@ -0,0 +1,56 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2019 (c) fortiss (Author: Stefan Profanter)
+ */
+
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <open62541/config.h>
+
+extern "C" {
+#include "mdnsd.h"
+#include "xht.h"
+#include "sdtxt.h"
+}
+
+/*
+** Main entry point.  The fuzzer invokes this function with each
+** fuzzed input.
+*/
+extern "C" int
+LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+
+
+    size_t halfSize = size / 2;
+    size_t remainSize = size - halfSize;
+    const uint8_t *secondHalfData = data + halfSize;
+
+    // Cast away const for txt2sd (function doesn't modify input)
+    xht_t *sd = txt2sd((unsigned char *)data, halfSize);
+
+    uint8_t *dataCopy = (unsigned char *)malloc(remainSize);
+    if (!dataCopy) {
+        xht_free(sd);
+        return 0;
+    }
+    memcpy(dataCopy, secondHalfData, remainSize);
+    // make sure we have a valid null-terminated string
+    if (remainSize > 0)
+        dataCopy[remainSize-1] = 0;
+
+    xht_set(sd, (char*)dataCopy, dataCopy);
+
+    int len;
+    unsigned char* out = sd2txt(sd, &len);
+
+    free(out);
+    xht_free(sd);
+
+    free(dataCopy);
+
+    return 0;
+}
diff --git a/tests/fuzz/oss-fuzz-copy.sh b/tests/fuzz/oss-fuzz-copy.sh
index 7210ea5d46e..79a20a99b22 100755
--- a/tests/fuzz/oss-fuzz-copy.sh
+++ b/tests/fuzz/oss-fuzz-copy.sh
@@ -20,6 +20,3 @@ done
 cp $OUT/fuzz_binary_message_seed_corpus.zip $OUT/fuzz_tcp_message_seed_corpus.zip
 
 cp $SRC/open62541/tests/fuzz/*.dict $SRC/open62541/tests/fuzz/*.options $OUT/
-
-# Copy the fuzzer stuff from mdns
-SRC=$SRC/open62541/deps $SRC/open62541/deps/mdnsd/tests/fuzz/oss-fuzz-copy.sh

From fe0561b056fb384c75ad368dde6c19fa0281418e Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Tue, 5 May 2026 23:39:35 +0200
Subject: [PATCH 1960/1963] refactor(tests): Simplify and fix the mdns unit
 tests recently imported from the upstream project

---
 tests/fuzz/fuzz_mdns_message.cc | 22 ++++++++--------------
 tests/fuzz/fuzz_mdns_xht.cc     | 31 ++++++++++---------------------
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/tests/fuzz/fuzz_mdns_message.cc b/tests/fuzz/fuzz_mdns_message.cc
index 4a7c9f01fb9..1fb4c617baf 100644
--- a/tests/fuzz/fuzz_mdns_message.cc
+++ b/tests/fuzz/fuzz_mdns_message.cc
@@ -16,29 +16,24 @@ extern "C" {
 #include "inet.h"
 }
 
+unsigned char message_buf[MAX_PACKET_LEN];
+
 /*
 ** Main entry point.  The fuzzer invokes this function with each
 ** fuzzed input.
 */
 extern "C" int
 LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-
+    if(size >= MAX_PACKET_LEN)
+        return 0;
+    memcpy(message_buf, data, size);
+    message_buf[size] = 0; /* zero terminate */
 
     struct message m;
     memset(&m, 0, sizeof(struct message));
 
-    unsigned char *dataCopy = (unsigned char *)malloc(size);
-    if (!dataCopy) {
-        return 0;
-    }
-
-    memcpy(dataCopy, data, size);
-
-    int parseResult = message_parse(&m, dataCopy);
-
-    free(dataCopy);
-
-    if (!parseResult)
+    int parseResult = message_parse(&m, message_buf);
+    if(!parseResult)
         return 0;
 
     mdns_daemon_t *d = mdnsd_new(QCLASS_IN, 1000);
@@ -46,7 +41,6 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     inet_addr_t from = {};
     inet_anyaddr(AF_INET, 2000, &from);
     mdnsd_in(d, &m, &from);
-
     mdnsd_free(d);
 
     return 0;
diff --git a/tests/fuzz/fuzz_mdns_xht.cc b/tests/fuzz/fuzz_mdns_xht.cc
index d8642aabd0a..7c72ecc843c 100644
--- a/tests/fuzz/fuzz_mdns_xht.cc
+++ b/tests/fuzz/fuzz_mdns_xht.cc
@@ -17,40 +17,29 @@ extern "C" {
 #include "sdtxt.h"
 }
 
+unsigned char message_buf[MAX_PACKET_LEN];
+
 /*
 ** Main entry point.  The fuzzer invokes this function with each
 ** fuzzed input.
 */
 extern "C" int
 LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-
-
-    size_t halfSize = size / 2;
-    size_t remainSize = size - halfSize;
-    const uint8_t *secondHalfData = data + halfSize;
-
-    // Cast away const for txt2sd (function doesn't modify input)
-    xht_t *sd = txt2sd((unsigned char *)data, halfSize);
-
-    uint8_t *dataCopy = (unsigned char *)malloc(remainSize);
-    if (!dataCopy) {
-        xht_free(sd);
+    if(size >= MAX_PACKET_LEN)
         return 0;
-    }
-    memcpy(dataCopy, secondHalfData, remainSize);
-    // make sure we have a valid null-terminated string
-    if (remainSize > 0)
-        dataCopy[remainSize-1] = 0;
+    memcpy(message_buf, data, size);
+    message_buf[size] = 0; /* zero terminate */
 
-    xht_set(sd, (char*)dataCopy, dataCopy);
+    xht_t *sd = txt2sd(message_buf, size);
+    if(!sd)
+        return 0;
 
     int len;
-    unsigned char* out = sd2txt(sd, &len);
+    unsigned char *out = sd2txt(sd, &len);
+    assert(out != NULL);
 
     free(out);
     xht_free(sd);
 
-    free(dataCopy);
-
     return 0;
 }

From 2e7e5d3dbeea745820ce1fd5617ed63d20125f16 Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <julius.pfrommer@o6-automation.com>
Date: Fri, 24 Jul 2026 11:55:23 +0200
Subject: [PATCH 1961/1963] fix(deps): Fix a fuzzing issue in mdnsd's _cache()

---
 CMakeLists.txt | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fa5e6878e5..2fcdc49cc1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -962,6 +962,28 @@ if(UA_ENABLE_DISCOVERY_MULTICAST)
                            "#define ERR(...)  mdnsd_log(LOG_ERR, __VA_ARGS__)"
                            _content "${_content}")
         endif()
+        if(_f STREQUAL "mdnsd.c")
+            string(REPLACE
+[=[		c->rr.rdname = strdup(r->known.ns.name);]=]
+[=[		if (!r->known.ns.name) {
+			free(c->rr.rdata);
+			free(c->rr.name);
+			free(c);
+			return 1;
+		}
+		c->rr.rdname = strdup(r->known.ns.name);]=]
+                _content "${_content}")
+            string(REPLACE
+[=[		c->rr.rdname = strdup(r->known.srv.name);]=]
+[=[		if (!r->known.srv.name) {
+			free(c->rr.rdata);
+			free(c->rr.name);
+			free(c);
+			return 1;
+		}
+		c->rr.rdname = strdup(r->known.srv.name);]=]
+                _content "${_content}")
+        endif()
         file(WRITE "${MDNSD_GENERATED_DIR}/${_f}" "${_content}")
     endforeach()
 

From 50dce76e0fc457acd3c4d248216ebaecce97eb7c Mon Sep 17 00:00:00 2001
From: Julius Pfrommer <jpfr@users.noreply.github.com>
Date: Mon, 27 Jul 2026 13:18:45 +0200
Subject: [PATCH 1962/1963] refactor(build): Bump version to v1.4.18

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fcdc49cc1d..610aa043e9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
 set(OPEN62541_VER_MINOR 4)
-set(OPEN62541_VER_PATCH 17)
+set(OPEN62541_VER_PATCH 18)
 set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 

From 831bdc8c5b988ad854a69a461a6e5197c174d11e Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Thu, 30 Jul 2026 12:30:28 +0100
Subject: [PATCH 1963/1963] Add UA_EXPORT

---
 src/pubsub/ua_pubsub_networkmessage.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pubsub/ua_pubsub_networkmessage.h b/src/pubsub/ua_pubsub_networkmessage.h
index 4ca92a63ed2..5a9536b80a3 100644
--- a/src/pubsub/ua_pubsub_networkmessage.h
+++ b/src/pubsub/ua_pubsub_networkmessage.h
@@ -268,7 +268,7 @@ void UA_DataSetMessage_clear(UA_DataSetMessage* p);
 
 /* If dataToEncryptStart not-NULL, then it will be set to the start-position of
  * the payload in the buffer. */
-UA_StatusCode
+UA_EXPORT UA_StatusCode
 UA_NetworkMessage_encodeBinary(const UA_NetworkMessage* src,
                                UA_Byte **bufPos, const UA_Byte *bufEnd,
                                UA_Byte **dataToEncryptStart);
@@ -302,7 +302,7 @@ UA_StatusCode
 UA_NetworkMessage_decodeFooters(const UA_ByteString *src, size_t *offset,
                                 UA_NetworkMessage *dst);
 
-UA_StatusCode
+UA_EXPORT UA_StatusCode
 UA_NetworkMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
                                UA_NetworkMessage* dst, const UA_DataTypeArray *customTypes);
                                
@@ -311,7 +311,7 @@ UA_NetworkMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset,
                                      UA_NetworkMessage *dst);
 
 /* Also stores the offset if offsetBuffer != NULL */
-size_t
+UA_EXPORT size_t
 UA_NetworkMessage_calcSizeBinary(UA_NetworkMessage *p,
                                  UA_NetworkMessageOffsetBuffer *offsetBuffer);
 
@@ -324,23 +324,23 @@ UA_NetworkMessage_signEncrypt(UA_NetworkMessage *nm, UA_MessageSecurityMode secu
                               UA_Byte *sigStart);
 #endif
 
-void
+UA_EXPORT void
 UA_NetworkMessage_clear(UA_NetworkMessage* p);
 
 #ifdef UA_ENABLE_JSON_ENCODING
-UA_StatusCode
+UA_EXPORT UA_StatusCode
 UA_NetworkMessage_encodeJson(const UA_NetworkMessage *src,
                              UA_Byte **bufPos, const UA_Byte **bufEnd, UA_String *namespaces,
                              size_t namespaceSize, UA_String *serverUris,
                              size_t serverUriSize, UA_Boolean useReversible);
 
-size_t
+UA_EXPORT size_t
 UA_NetworkMessage_calcSizeJson(const UA_NetworkMessage *src,
                                UA_String *namespaces, size_t namespaceSize,
                                UA_String *serverUris, size_t serverUriSize,
                                UA_Boolean useReversible);
 
-UA_StatusCode UA_NetworkMessage_decodeJson(UA_NetworkMessage *dst, const UA_ByteString *src);
+UA_EXPORT UA_StatusCode UA_NetworkMessage_decodeJson(UA_NetworkMessage *dst, const UA_ByteString *src);
 #endif
 
 _UA_END_DECLS